From 09a75ec720d9f935b867e4901582a5555f7b38ea Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 9 Apr 2024 22:20:11 -0700
Subject: [PATCH 001/438] Fixed region view. Closes #2648.

---
 src/pages/api/websites/[websiteId]/metrics.ts  |  2 +-
 .../analytics/sessions/getSessionMetrics.ts    | 18 +++++++-----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/pages/api/websites/[websiteId]/metrics.ts b/src/pages/api/websites/[websiteId]/metrics.ts
index 02e3a0095a..f9893e7900 100644
--- a/src/pages/api/websites/[websiteId]/metrics.ts
+++ b/src/pages/api/websites/[websiteId]/metrics.ts
@@ -87,7 +87,7 @@ export default async (
     }
 
     if (SESSION_COLUMNS.includes(type)) {
-      const data = await getSessionMetrics(websiteId, column, filters, limit, offset);
+      const data = await getSessionMetrics(websiteId, type, filters, limit, offset);
 
       if (type === 'language') {
         const combined = {};
diff --git a/src/queries/analytics/sessions/getSessionMetrics.ts b/src/queries/analytics/sessions/getSessionMetrics.ts
index 77ccb4105f..e28f1fb2e7 100644
--- a/src/queries/analytics/sessions/getSessionMetrics.ts
+++ b/src/queries/analytics/sessions/getSessionMetrics.ts
@@ -1,17 +1,11 @@
 import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
 import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
-import { EVENT_TYPE, SESSION_COLUMNS } from 'lib/constants';
+import { EVENT_TYPE, FILTER_COLUMNS, SESSION_COLUMNS } from 'lib/constants';
 import { QueryFilters } from 'lib/types';
 
 export async function getSessionMetrics(
-  ...args: [
-    websiteId: string,
-    column: string,
-    filters: QueryFilters,
-    limit?: number,
-    offset?: number,
-  ]
+  ...args: [websiteId: string, type: string, filters: QueryFilters, limit?: number, offset?: number]
 ) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
@@ -21,11 +15,12 @@ export async function getSessionMetrics(
 
 async function relationalQuery(
   websiteId: string,
-  column: string,
+  type: string,
   filters: QueryFilters,
   limit: number = 500,
   offset: number = 0,
 ) {
+  const column = FILTER_COLUMNS[type] || type;
   const { parseFilters, rawQuery } = prisma;
   const { filterQuery, joinSession, params } = await parseFilters(
     websiteId,
@@ -34,7 +29,7 @@ async function relationalQuery(
       eventType: EVENT_TYPE.pageView,
     },
     {
-      joinSession: SESSION_COLUMNS.includes(column),
+      joinSession: SESSION_COLUMNS.includes(type),
     },
   );
   const includeCountry = column === 'city' || column === 'subdivision1';
@@ -63,11 +58,12 @@ async function relationalQuery(
 
 async function clickhouseQuery(
   websiteId: string,
-  column: string,
+  type: string,
   filters: QueryFilters,
   limit: number = 500,
   offset: number = 0,
 ): Promise<{ x: string; y: number }[]> {
+  const column = FILTER_COLUMNS[type] || type;
   const { parseFilters, rawQuery } = clickhouse;
   const { filterQuery, params } = await parseFilters(websiteId, {
     ...filters,

From 6973b2b760d1fa40c4af4ba383d9b5955b921973 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Wed, 10 Apr 2024 12:26:09 -0700
Subject: [PATCH 002/438] Pass start and end dates to filter component. Closes
 #2646.

---
 src/app/(main)/reports/[reportId]/FilterParameters.tsx      | 2 ++
 src/app/(main)/reports/[reportId]/FilterSelectForm.tsx      | 6 ++++--
 src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx | 5 ++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/app/(main)/reports/[reportId]/FilterParameters.tsx b/src/app/(main)/reports/[reportId]/FilterParameters.tsx
index 3118a6f4b8..ddbe4d1e81 100644
--- a/src/app/(main)/reports/[reportId]/FilterParameters.tsx
+++ b/src/app/(main)/reports/[reportId]/FilterParameters.tsx
@@ -55,6 +55,8 @@ export function FilterParameters() {
             <FilterSelectForm
               websiteId={websiteId}
               fields={fields.filter(({ name }) => !filters.find(f => f.name === name))}
+              startDate={dateRange?.startDate}
+              endDate={dateRange?.endDate}
               onChange={handleAdd}
             />
           </PopupForm>
diff --git a/src/app/(main)/reports/[reportId]/FilterSelectForm.tsx b/src/app/(main)/reports/[reportId]/FilterSelectForm.tsx
index b81c857672..77a36c3cc4 100644
--- a/src/app/(main)/reports/[reportId]/FilterSelectForm.tsx
+++ b/src/app/(main)/reports/[reportId]/FilterSelectForm.tsx
@@ -1,11 +1,12 @@
 import { useState } from 'react';
 import FieldSelectForm from './FieldSelectForm';
 import FieldFilterEditForm from './FieldFilterEditForm';
-import { useDateRange } from 'components/hooks';
 
 export interface FilterSelectFormProps {
   websiteId?: string;
   fields: any[];
+  startDate?: Date;
+  endDate?: Date;
   onChange?: (filter: { name: string; type: string; operator: string; value: string }) => void;
   allowFilterSelect?: boolean;
 }
@@ -13,11 +14,12 @@ export interface FilterSelectFormProps {
 export default function FilterSelectForm({
   websiteId,
   fields,
+  startDate,
+  endDate,
   onChange,
   allowFilterSelect,
 }: FilterSelectFormProps) {
   const [field, setField] = useState<{ name: string; label: string; type: string }>();
-  const [{ startDate, endDate }] = useDateRange(websiteId);
 
   if (!field) {
     return <FieldSelectForm fields={fields} onSelect={setField} showType={false} />;
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx b/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx
index dda7cb063a..a96717571b 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx
@@ -2,7 +2,7 @@ import classNames from 'classnames';
 import { Button, Icon, Icons, Popup, PopupTrigger, Text } from 'react-basics';
 import PopupForm from 'app/(main)/reports/[reportId]/PopupForm';
 import FilterSelectForm from 'app/(main)/reports/[reportId]/FilterSelectForm';
-import { useFields, useMessages, useNavigation } from 'components/hooks';
+import { useFields, useMessages, useNavigation, useDateRange } from 'components/hooks';
 import { OPERATOR_PREFIXES } from 'lib/constants';
 import styles from './WebsiteFilterButton.module.css';
 
@@ -16,6 +16,7 @@ export function WebsiteFilterButton({
   const { formatMessage, labels } = useMessages();
   const { renderUrl, router } = useNavigation();
   const { fields } = useFields();
+  const [{ startDate, endDate }] = useDateRange(websiteId);
 
   const handleAddFilter = ({ name, operator, value }) => {
     const prefix = OPERATOR_PREFIXES[operator];
@@ -38,6 +39,8 @@ export function WebsiteFilterButton({
               <FilterSelectForm
                 websiteId={websiteId}
                 fields={fields}
+                startDate={startDate}
+                endDate={endDate}
                 onChange={value => {
                   handleAddFilter(value);
                   close();

From 7899289b3c70d2c7cb46870704c85165f40856e9 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Fri, 5 Apr 2024 12:21:54 -0700
Subject: [PATCH 003/438] fix case sensitivity for psql getValues

---
 src/lib/prisma.ts                  | 8 ++++++++
 src/queries/analytics/getValues.ts | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/lib/prisma.ts b/src/lib/prisma.ts
index c35e0cde3f..c5e16ddca7 100644
--- a/src/lib/prisma.ts
+++ b/src/lib/prisma.ts
@@ -93,6 +93,13 @@ function getTimestampDiffQuery(field1: string, field2: string): string {
   }
 }
 
+function getSearchQuery(column: string): string {
+  const db = getDatabaseType();
+  const like = db === POSTGRESQL ? 'ilike' : 'like';
+
+  return `and ${column} ${like} {{search}}`;
+}
+
 function mapFilter(column: string, operator: string, name: string, type: string = '') {
   const db = getDatabaseType();
   const like = db === POSTGRESQL ? 'ilike' : 'like';
@@ -253,6 +260,7 @@ export default {
   getFilterQuery,
   getSearchParameters,
   getTimestampDiffQuery,
+  getSearchQuery,
   getQueryMode,
   pagedQuery,
   parseFilters,
diff --git a/src/queries/analytics/getValues.ts b/src/queries/analytics/getValues.ts
index 572fbac250..7cd349940f 100644
--- a/src/queries/analytics/getValues.ts
+++ b/src/queries/analytics/getValues.ts
@@ -18,11 +18,11 @@ async function relationalQuery(
   endDate: Date,
   search: string,
 ) {
-  const { rawQuery } = prisma;
+  const { rawQuery, getSearchQuery } = prisma;
   let searchQuery = '';
 
   if (search) {
-    searchQuery = `and ${column} LIKE {{search}}`;
+    searchQuery = getSearchQuery(column);
   }
 
   return rawQuery(

From 357c13fb1569865c3a8d387717d766415b253233 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Wed, 10 Apr 2024 16:05:59 -0700
Subject: [PATCH 004/438] Bump version v2.11.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bd27a4cfe5..887ed43dc2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "2.11.0",
+  "version": "2.11.1",
   "description": "A simple, fast, privacy-focused alternative to Google Analytics.",
   "author": "Umami Software, Inc. <hello@umami.is>",
   "license": "MIT",

From 10eb28ba04dcf8caaf9ebe80352d873efe86bb3c Mon Sep 17 00:00:00 2001
From: Floris Ankersmit <info@styxit.com>
Date: Thu, 11 Apr 2024 12:20:40 +0200
Subject: [PATCH 005/438] Add minimum database versions to readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9426642a8d..ae469eaaf3 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ A detailed getting started guide can be found at [https://umami.is/docs/](https:
 ### Requirements
 
 - A server with Node.js version 16.13 or newer
-- A database. Umami supports [MySQL](https://www.mysql.com/) and [Postgresql](https://www.postgresql.org/) databases.
+- A database. Umami supports [MySQL](https://www.mysql.com/) (minimum v8.0) and [Postgresql](https://www.postgresql.org/) (minimum v12.14) databases.
 
 ### Install Yarn
 

From 0ea97eb0bc5da610e9a740cac00c839a21bbe5ca Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Sun, 14 Apr 2024 00:58:57 -0700
Subject: [PATCH 006/438] Removed dev logging.

---
 src/pages/api/auth/login.ts | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/pages/api/auth/login.ts b/src/pages/api/auth/login.ts
index 23bdb15fc0..51c53184e8 100644
--- a/src/pages/api/auth/login.ts
+++ b/src/pages/api/auth/login.ts
@@ -1,5 +1,4 @@
 import redis from '@umami/redis-client';
-import debug from 'debug';
 import { saveAuth } from 'lib/auth';
 import { secret } from 'lib/crypto';
 import { useValidate } from 'lib/middleware';
@@ -16,9 +15,6 @@ import {
 import { getUserByUsername } from 'queries';
 import * as yup from 'yup';
 import { ROLES } from 'lib/constants';
-import { getIpAddress } from 'lib/detect';
-
-const log = debug('umami:auth');
 
 export interface LoginRequestBody {
   username: string;
@@ -68,13 +64,6 @@ export default async (
       });
     }
 
-    log(
-      `Login from ip ${getIpAddress(req)} with username "${username.replace(
-        /["\r\n]/g,
-        '',
-      )}" failed.`,
-    );
-
     return unauthorized(res, 'message.incorrect-username-password');
   }
 

From f3283d693d1559dff55771dbc751915c892f59de Mon Sep 17 00:00:00 2001
From: Gerard Nesta <gerardnll@users.noreply.github.com>
Date: Mon, 15 Apr 2024 11:00:45 +0200
Subject: [PATCH 007/438] Update ca-ES.json

---
 src/lang/ca-ES.json | 288 ++++++++++++++++++++++----------------------
 1 file changed, 144 insertions(+), 144 deletions(-)

diff --git a/src/lang/ca-ES.json b/src/lang/ca-ES.json
index 4b1c71bce7..39b215ccc5 100644
--- a/src/lang/ca-ES.json
+++ b/src/lang/ca-ES.json
@@ -1,238 +1,238 @@
 {
-  "label.access-code": "Access code",
+  "label.access-code": "Codi d'accés",
   "label.actions": "Accions",
-  "label.activity-log": "Activity log",
-  "label.add": "Add",
-  "label.add-description": "Add description",
-  "label.add-member": "Add member",
-  "label.add-website": "Afegeix lloc web",
+  "label.activity-log": "Registre d'activitat",
+  "label.add": "Afegir",
+  "label.add-description": "Afegir descripció",
+  "label.add-member": "Afegir membre",
+  "label.add-website": "Afegir lloc web",
   "label.admin": "Administrador",
-  "label.after": "After",
+  "label.after": "Després",
   "label.all": "Tots",
   "label.all-time": "Sempre",
-  "label.analytics": "Analytics",
-  "label.average": "Average",
+  "label.analytics": "Analítiques",
+  "label.average": "Mitjana",
   "label.average-visit-time": "Temps mitjà de visita",
   "label.back": "Enrere",
-  "label.before": "Before",
+  "label.before": "Abans",
   "label.bounce-rate": "Percentatge de rebot",
-  "label.breakdown": "Breakdown",
-  "label.browser": "Browser",
+  "label.breakdown": "Desglossament",
+  "label.browser": "Navegador",
   "label.browsers": "Navegadors",
   "label.cancel": "Cancel·la",
   "label.change-password": "Canvia la contrasenya",
-  "label.cities": "Cities",
-  "label.city": "City",
-  "label.clear-all": "Clear all",
-  "label.confirm": "Confirm",
+  "label.cities": "Ciutats",
+  "label.city": "Ciutat",
+  "label.clear-all": "Netejar tot",
+  "label.confirm": "Confirmar",
   "label.confirm-password": "Confirma la contrasenya",
-  "label.contains": "Contains",
-  "label.continue": "Continue",
+  "label.contains": "Conté",
+  "label.continue": "Continuar",
   "label.countries": "Països",
-  "label.country": "Country",
-  "label.create": "Create",
-  "label.create-report": "Create report",
-  "label.create-team": "Create team",
-  "label.create-user": "Create user",
-  "label.created": "Created",
-  "label.created-by": "Created By",
+  "label.country": "País",
+  "label.create": "Crear",
+  "label.create-report": "Crear informe",
+  "label.create-team": "Crear equip",
+  "label.create-user": "Crear usuari",
+  "label.created": "Creat",
+  "label.created-by": "Creat Per",
   "label.current-password": "Contrasenya actual",
   "label.custom-range": "Rang personalitzat",
   "label.dashboard": "Panell",
-  "label.data": "Data",
-  "label.date": "Date",
+  "label.data": "Dades",
+  "label.date": "Data",
   "label.date-range": "Interval de dates",
-  "label.day": "Day",
+  "label.day": "Dia",
   "label.default-date-range": "Interval de dates per defecte",
   "label.delete": "Esborra",
-  "label.delete-report": "Delete report",
-  "label.delete-team": "Delete team",
-  "label.delete-user": "Delete user",
+  "label.delete-report": "Eliminar informe",
+  "label.delete-team": "Eliminar equip",
+  "label.delete-user": "Eliminar usuari",
   "label.delete-website": "Esborra el lloc web",
-  "label.description": "Description",
+  "label.description": "Descripció",
   "label.desktop": "Escriptori",
-  "label.details": "Details",
-  "label.device": "Device",
+  "label.details": "Detalls",
+  "label.device": "Dispositiu",
   "label.devices": "Dispositius",
   "label.dismiss": "Descarta",
-  "label.does-not-contain": "Does not contain",
+  "label.does-not-contain": "No conté",
   "label.domain": "Domini",
-  "label.dropoff": "Dropoff",
+  "label.dropoff": "Abandonament",
   "label.edit": "Edita",
-  "label.edit-dashboard": "Edit dashboard",
-  "label.edit-member": "Edit member",
+  "label.edit-dashboard": "Edita panell",
+  "label.edit-member": "Edita membre",
   "label.enable-share-url": "Activa l'enllaç per compartir",
-  "label.event": "Event",
-  "label.event-data": "Event data",
+  "label.event": "Esdeveniment",
+  "label.event-data": "Dades de l'esdeveniment",
   "label.events": "Esdeveniments",
-  "label.false": "False",
-  "label.field": "Field",
-  "label.fields": "Fields",
-  "label.filter": "Filter",
+  "label.false": "Fals",
+  "label.field": "Camp",
+  "label.fields": "Camps",
+  "label.filter": "Filtre",
   "label.filter-combined": "Combinat",
   "label.filter-raw": "En cru",
-  "label.filters": "Filters",
-  "label.funnel": "Funnel",
-  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
-  "label.greater-than": "Greater than",
-  "label.greater-than-equals": "Greater than or equals",
+  "label.filters": "Filtres",
+  "label.funnel": "Embut",
+  "label.funnel-description": "Entengui la taxa de conversió i abandonament dels usuaris.",
+  "label.greater-than": "Més gran que",
+  "label.greater-than-equals": "Més gran que o igual a",
   "label.insights": "Insights",
-  "label.insights-description": "Dive deeper into your data by using segments and filters.",
-  "label.is": "Is",
-  "label.is-not": "Is not",
-  "label.is-not-set": "Is not set",
-  "label.is-set": "Is set",
-  "label.join": "Join",
-  "label.join-team": "Join team",
-  "label.language": "Language",
-  "label.languages": "Llengües",
+  "label.insights-description": "Aprofundeixi en les seves dades mitjançant l'ús de segments i filtres.",
+  "label.is": "És igual a",
+  "label.is-not": "No és igual a",
+  "label.is-not-set": "No està establert",
+  "label.is-set": "Està establert",
+  "label.join": "Unir",
+  "label.join-team": "Unir-se al equip",
+  "label.language": "Idioma",
+  "label.languages": "Idiomes",
   "label.laptop": "Portàtil",
   "label.last-days": "Últims {x} dies",
   "label.last-hours": "Últimes {x} hores",
-  "label.leave": "Leave",
-  "label.leave-team": "Leave team",
-  "label.less-than": "Less than",
-  "label.less-than-equals": "Less than or equals",
+  "label.leave": "Abandonar",
+  "label.leave-team": "Abandonar equip",
+  "label.less-than": "Menor que",
+  "label.less-than-equals": "Menor que o igual a",
   "label.login": "Connecta't",
   "label.logout": "Desconnecta't",
-  "label.manage": "Manage",
-  "label.max": "Max",
-  "label.member": "Member",
-  "label.members": "Members",
-  "label.min": "Min",
+  "label.manage": "Administrar",
+  "label.max": "Màx",
+  "label.member": "Membre",
+  "label.members": "Membres",
+  "label.min": "Mín",
   "label.mobile": "Mòbil",
   "label.more": "Més",
-  "label.my-account": "My account",
-  "label.my-websites": "My websites",
+  "label.my-account": "El meu compte",
+  "label.my-websites": "Els meus llocs web",
   "label.name": "Nom",
   "label.new-password": "Contrasenya nova",
-  "label.none": "None",
+  "label.none": "Cap",
   "label.number-of-records": "{x} {x, plural, one {record} other {records}}",
   "label.ok": "OK",
-  "label.os": "OS",
-  "label.overview": "Overview",
+  "label.os": "SO",
+  "label.overview": "Resum",
   "label.owner": "Propietari",
-  "label.page-of": "Page {current} of {total}",
+  "label.page-of": "Pàgina {current} de {total}",
   "label.page-views": "Pàgines vistes",
-  "label.pageTitle": "Page title",
+  "label.pageTitle": "Títol de la pàgina",
   "label.pages": "Pàgines",
   "label.password": "Contrasenya",
   "label.powered-by": "Funciona amb {name}",
   "label.profile": "Perfil",
-  "label.queries": "Queries",
-  "label.query": "Query",
-  "label.query-parameters": "Query parameters",
+  "label.queries": "Consultes",
+  "label.query": "Consulta",
+  "label.query-parameters": "Paràmetres de consulta",
   "label.realtime": "Temps real",
-  "label.referrer": "Referrer",
+  "label.referrer": "Referent",
   "label.referrers": "Referents",
   "label.refresh": "Refresca",
-  "label.regenerate": "Regenerate",
-  "label.region": "Region",
+  "label.regenerate": "Regenerar",
+  "label.region": "Regió",
   "label.regions": "Regions",
-  "label.remove": "Remove",
-  "label.remove-member": "Remove member",
-  "label.reports": "Reports",
+  "label.remove": "Treure",
+  "label.remove-member": "Eliminar membre",
+  "label.reports": "Informes",
   "label.required": "Obligatori",
   "label.reset": "Restableix",
   "label.reset-website": "Restableix estadístiques",
-  "label.retention": "Retention",
-  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
-  "label.role": "Role",
-  "label.run-query": "Run query",
+  "label.retention": "Retenció",
+  "label.retention-description": "Mesuri la retenció del seu lloc web fent un seguiment de la freqüència amb què tornen els usuaris.",
+  "label.role": "Rol",
+  "label.run-query": "Executar consulta",
   "label.save": "Desa",
-  "label.screens": "Screens",
-  "label.search": "Search",
-  "label.select": "Select",
-  "label.select-date": "Select date",
-  "label.select-role": "Select role",
-  "label.select-website": "Select website",
+  "label.screens": "Pantalles",
+  "label.search": "Buscar",
+  "label.select": "Seleccionar",
+  "label.select-date": "Seleccionar data",
+  "label.select-role": "Seleccionar rol",
+  "label.select-website": "Seleccionar lloc web",
   "label.sessions": "Sessions",
   "label.settings": "Configuració",
   "label.share-url": "Enllaç per compartir",
   "label.single-day": "Un sol dia",
-  "label.sum": "Sum",
+  "label.sum": "Suma",
   "label.tablet": "Tauleta",
-  "label.team": "Team",
-  "label.team-id": "Team ID",
-  "label.team-member": "Team member",
-  "label.team-name": "Team name",
-  "label.team-owner": "Team owner",
-  "label.team-view-only": "Team view only",
-  "label.team-websites": "Team websites",
-  "label.teams": "Teams",
-  "label.theme": "Theme",
+  "label.team": "Equip",
+  "label.team-id": "ID del equip",
+  "label.team-member": "Membre de l'equip",
+  "label.team-name": "Nom de l'equip",
+  "label.team-owner": "Propietari de l'equip",
+  "label.team-view-only": "Vista només de l'equip",
+  "label.team-websites": "Llocs web de l'equip",
+  "label.teams": "Equips",
+  "label.theme": "Tema",
   "label.this-month": "Aquest mes",
   "label.this-week": "Aquesta setmana",
   "label.this-year": "Aquest any",
   "label.timezone": "Zona horària",
-  "label.title": "Title",
+  "label.title": "Títol",
   "label.today": "Avui",
   "label.toggle-charts": "Mostra/amaga gràfics",
   "label.total": "Total",
-  "label.total-records": "Total records",
+  "label.total-records": "Total de registres",
   "label.tracking-code": "Codi de seguiment",
-  "label.transfer": "Transfer",
-  "label.transfer-website": "Transfer website",
-  "label.true": "True",
-  "label.type": "Type",
-  "label.unique": "Unique",
+  "label.transfer": "Transferir",
+  "label.transfer-website": "Transferir lloc web",
+  "label.true": "Cert",
+  "label.type": "Tipus",
+  "label.unique": "Únic",
   "label.unique-visitors": "Visitants únics",
   "label.unknown": "Desconegut",
-  "label.untitled": "Untitled",
+  "label.untitled": "Sense títol",
   "label.url": "URL",
   "label.urls": "URLs",
-  "label.user": "User",
+  "label.user": "Usuari",
   "label.username": "Nom d'usuari",
-  "label.users": "Users",
-  "label.value": "Value",
-  "label.view": "View",
+  "label.users": "Usuaris",
+  "label.value": "Valor",
+  "label.view": "Visualitzar",
   "label.view-details": "Veure els detalls",
-  "label.view-only": "View only",
+  "label.view-only": "Només veure",
   "label.views": "Vistes",
   "label.visitors": "Visitants",
-  "label.website": "Website",
-  "label.website-id": "Website ID",
+  "label.website": "Lloc web",
+  "label.website-id": "ID del lloc web",
   "label.websites": "Llocs web",
-  "label.window": "Window",
+  "label.window": "Finestra",
   "label.yesterday": "Ahir",
-  "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
+  "message.action-confirmation": "Escrigui {confirmation} al cuadre inferior per confirmar.",
   "message.active-users": "{x} {x, plural, one {visitant actual} other {visitants actuals}}",
-  "message.confirm-delete": "Segur que vols esborrar {target}?",
-  "message.confirm-leave": "Are you sure you want to leave {target}?",
-  "message.confirm-remove": "Are you sure you want to remove {target}?",
-  "message.confirm-reset": "Segur que vols restablir les estadístiques de {target}?",
-  "message.delete-team-warning": "Deleting a team will also delete all team websites.",
+  "message.confirm-delete": "Segur que vol esborrar {target}?",
+  "message.confirm-leave": "Segur que vol abandonar {target}?",
+  "message.confirm-remove": "Segur que vol eliminar {target}?",
+  "message.confirm-reset": "Segur que vol restablir les estadístiques de {target}?",
+  "message.delete-team-warning": "Al eliminar un equip també s'eliminaran tots els llocs web de l'equip.",
   "message.delete-website-warning": "També s'esborraran totes les dades relacionades.",
   "message.error": "S'ha produït un error.",
-  "message.event-log": "{event} on {url}",
+  "message.event-log": "{event} a {url}",
   "message.go-to-settings": "Vés a la configuració",
   "message.incorrect-username-password": "Nom d'usuari o contrasenya incorrectes.",
   "message.invalid-domain": "Domini invàlid",
-  "message.min-password-length": "Minimum length of {n} characters",
-  "message.new-version-available": "A new version of Umami {version} is available!",
+  "message.min-password-length": "Longitud mínima de {n} caràcters",
+  "message.new-version-available": "Una nova versió d'Umami {version} està disponible!",
   "message.no-data-available": "No hi ha dades disponibles.",
-  "message.no-event-data": "No event data is available.",
+  "message.no-event-data": "No hi ha dades d'esdeveniments disponibles.",
   "message.no-match-password": "Les contrasenyes no coincideixen",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-teams": "You have not created any teams.",
-  "message.no-users": "There are no users.",
+  "message.no-results-found": "No s'han trobat resultats.",
+  "message.no-team-websites": "Aquest equip no té cap lloc web.",
+  "message.no-teams": "No ha creat cap equip.",
+  "message.no-users": "No hi ha cap usuari.",
   "message.no-websites-configured": "No hi ha cap lloc web configurat.",
   "message.page-not-found": "No s'ha trobat la pàgina.",
-  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
+  "message.reset-website": "Per restablir aquest lloc web, escrigui {confirmation} al cuadre inferior per confirmar.",
   "message.reset-website-warning": "S'esborraran totes les estadístiques per aquest lloc web, però el codi de seguiment es mantindrà.",
   "message.saved": "S'ha desat amb èxit.",
   "message.share-url": "Aquest és l'enllaç públic per compartir de {target}.",
-  "message.team-already-member": "You are already a member of the team.",
-  "message.team-not-found": "Team not found.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
+  "message.team-already-member": "Ja és membre d'aquest equip.",
+  "message.team-not-found": "Equip no trobat.",
+  "message.team-websites-info": "Els llocs web poden ser visualitzats per qualsevol membre de l'equip.",
   "message.tracking-code": "Codi de seguiment",
-  "message.transfer-team-website-to-user": "Transfer this website to your account?",
-  "message.transfer-user-website-to-team": "Select the team to transfer this website to.",
-  "message.transfer-website": "Transfer website ownership to your account or another team.",
-  "message.triggered-event": "Triggered event",
-  "message.user-deleted": "User deleted.",
-  "message.viewed-page": "Viewed page",
+  "message.transfer-team-website-to-user": "Transferir aquest lloc web al seu compte?",
+  "message.transfer-user-website-to-team": "Seleccioni l'equip al qui transferir aquest lloc web.",
+  "message.transfer-website": "Transferir la propietat del lloc web al seu compte o a un altre equip.",
+  "message.triggered-event": "Esdeveniment desencadenat",
+  "message.user-deleted": "Usuari eliminat.",
+  "message.viewed-page": "Pàgina vista",
   "message.visitor-log": "Visitant de {country} usant {browser} a {os} {device}",
-  "message.visitors-dropped-off": "Visitors dropped off"
+  "message.visitors-dropped-off": "Els visitants han sortit"
 }

From a2e4ab7d46341439eca2189f6393f92989a9324c Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 15 Apr 2024 13:44:16 -0700
Subject: [PATCH 008/438] update kafka connection to upstash config

---
 src/lib/kafka.ts | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/lib/kafka.ts b/src/lib/kafka.ts
index 1032688824..da38baa44f 100644
--- a/src/lib/kafka.ts
+++ b/src/lib/kafka.ts
@@ -17,14 +17,9 @@ function getClient() {
   const ssl: { ssl?: tls.ConnectionOptions | boolean; sasl?: SASLOptions | Mechanism } =
     username && password
       ? {
-          ssl: {
-            checkServerIdentity: () => undefined,
-            ca: [process.env.CA_CERT],
-            key: process.env.CLIENT_KEY,
-            cert: process.env.CLIENT_CERT,
-          },
+          ssl: true,
           sasl: {
-            mechanism: 'plain',
+            mechanism: 'scram-sha-256',
             username,
             password,
           },

From bd360207a65391332ce8c20dbe71c363716bccb9 Mon Sep 17 00:00:00 2001
From: Cedric <cedigasser@gmail.com>
Date: Mon, 15 Apr 2024 23:25:15 +0200
Subject: [PATCH 009/438] fix(tracker): Remove domain name when parsing url

---
 src/tracker/index.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/tracker/index.js b/src/tracker/index.js
index 43a5150131..438c08d2a5 100644
--- a/src/tracker/index.js
+++ b/src/tracker/index.js
@@ -52,6 +52,12 @@
   };
 
   const parseURL = url => {
+    try {
+      const { pathname, search } = new URL(url);
+      url = pathname + search;
+    } catch {
+      /* empty */
+    }
     return excludeSearch ? url.split('?')[0] : url;
   };
 

From 0225e63abcf1160cf6bad0f7c8d06747a1bc69a6 Mon Sep 17 00:00:00 2001
From: Cedric <cedigasser@gmail.com>
Date: Mon, 15 Apr 2024 23:34:52 +0200
Subject: [PATCH 010/438] fix(tracker): Respect excludeSearch consistently

---
 src/tracker/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tracker/index.js b/src/tracker/index.js
index 438c08d2a5..cc6b8dbbfe 100644
--- a/src/tracker/index.js
+++ b/src/tracker/index.js
@@ -7,7 +7,7 @@
     document,
     history,
   } = window;
-  const { hostname, pathname, search } = location;
+  const { hostname, href } = location;
   const { currentScript, referrer } = document;
 
   if (!currentScript) return;
@@ -244,7 +244,7 @@
     };
   }
 
-  let currentUrl = `${pathname}${search}`;
+  let currentUrl = parseURL(href);
   let currentRef = referrer !== hostname ? referrer : '';
   let title = document.title;
   let cache;

From 7c2bb95786741bea522982e923c57ad615466f49 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Mon, 15 Apr 2024 23:42:41 -0700
Subject: [PATCH 011/438] Updated "Last X" date logic. Closes #2672.

---
 src/lib/date.ts | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/lib/date.ts b/src/lib/date.ts
index 1c0b95b297..861bbde2f2 100644
--- a/src/lib/date.ts
+++ b/src/lib/date.ts
@@ -154,7 +154,7 @@ export function parseDateRange(value: string | object, locale = 'en-US'): DateRa
   switch (unit) {
     case 'hour':
       return {
-        startDate: subHours(startOfHour(now), num),
+        startDate: num ? subHours(startOfHour(now), num - 1) : startOfHour(now),
         endDate: endOfHour(now),
         offset: 0,
         num: num || 1,
@@ -163,8 +163,8 @@ export function parseDateRange(value: string | object, locale = 'en-US'): DateRa
       };
     case 'day':
       return {
-        startDate: subDays(startOfDay(now), num),
-        endDate: subDays(endOfDay(now), num ? 1 : 0),
+        startDate: num ? subDays(startOfDay(now), num - 1) : startOfDay(now),
+        endDate: endOfDay(now),
         unit: num ? 'day' : 'hour',
         offset: 0,
         num: num || 1,
@@ -172,8 +172,10 @@ export function parseDateRange(value: string | object, locale = 'en-US'): DateRa
       };
     case 'week':
       return {
-        startDate: subWeeks(startOfWeek(now, { locale: dateLocale }), num),
-        endDate: subWeeks(endOfWeek(now, { locale: dateLocale }), num),
+        startDate: num
+          ? subWeeks(startOfWeek(now, { locale: dateLocale }), num - 1)
+          : startOfWeek(now, { locale: dateLocale }),
+        endDate: endOfWeek(now, { locale: dateLocale }),
         unit: 'day',
         offset: 0,
         num: num || 1,
@@ -181,8 +183,8 @@ export function parseDateRange(value: string | object, locale = 'en-US'): DateRa
       };
     case 'month':
       return {
-        startDate: subMonths(startOfMonth(now), num),
-        endDate: subMonths(endOfMonth(now), num ? 1 : 0),
+        startDate: num ? subMonths(startOfMonth(now), num - 1) : startOfMonth(now),
+        endDate: endOfMonth(now),
         unit: num ? 'month' : 'day',
         offset: 0,
         num: num || 1,
@@ -190,8 +192,8 @@ export function parseDateRange(value: string | object, locale = 'en-US'): DateRa
       };
     case 'year':
       return {
-        startDate: subYears(startOfYear(now), num),
-        endDate: subYears(endOfYear(now), num),
+        startDate: num ? subYears(startOfYear(now), num - 1) : startOfYear(now),
+        endDate: endOfYear(now),
         unit: 'month',
         offset: 0,
         num: num || 1,
@@ -286,19 +288,11 @@ export function getDateFromString(str: string) {
 export function getDateArray(data: any[], startDate: Date, endDate: Date, unit: string) {
   const arr = [];
   const { diff, add, start } = DATE_FUNCTIONS[unit];
-  const n = diff(endDate, startDate) + 1;
+  const n = diff(endDate, startDate);
 
-  function findData(date: Date) {
-    const d = data.find(({ x }) => {
-      return start(getDateFromString(x)).getTime() === date.getTime();
-    });
-
-    return d?.y || 0;
-  }
-
-  for (let i = 0; i < n; i++) {
+  for (let i = 0; i <= n; i++) {
     const t = start(add(startDate, i));
-    const y = findData(t);
+    const y = data.find(({ x }) => start(getDateFromString(x)).getTime() === t.getTime())?.y || 0;
 
     arr.push({ x: t, y });
   }

From 2a43d0b5957c957d97546413e04a708621be64fe Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Tue, 16 Apr 2024 20:53:33 -0700
Subject: [PATCH 012/438] Bump version v2.11.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c72a054f74..ad2bc79d26 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "2.12.0",
+  "version": "2.11.2",
   "description": "A simple, fast, privacy-focused alternative to Google Analytics.",
   "author": "Umami Software, Inc. <hello@umami.is>",
   "license": "MIT",

From c28de0fb1b870ab2d49117855fb93bb1f08c6c91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9D=A2=E6=9D=A1?=
 <2959393+ccbikai@users.noreply.github.com>
Date: Wed, 17 Apr 2024 04:43:28 +0000
Subject: [PATCH 013/438] chore: Update @netlify/plugin-nextjs to 5.x

---
 package.json |    2 +-
 yarn.lock    | 1114 ++------------------------------------------------
 2 files changed, 28 insertions(+), 1088 deletions(-)

diff --git a/package.json b/package.json
index ad2bc79d26..72bf596194 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
   },
   "devDependencies": {
     "@formatjs/cli": "^4.2.29",
-    "@netlify/plugin-nextjs": "^4.41.3",
+    "@netlify/plugin-nextjs": "^5.1.0",
     "@rollup/plugin-alias": "^5.0.0",
     "@rollup/plugin-commonjs": "^25.0.4",
     "@rollup/plugin-json": "^6.0.0",
diff --git a/yarn.lock b/yarn.lock
index 8373fbf0a1..64eb2654ad 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1530,11 +1530,6 @@
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
   integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
 
-"@fastify/accept-negotiator@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@fastify/accept-negotiator/-/accept-negotiator-1.1.0.tgz#c1c66b3b771c09742a54dd5bc87c582f6b0630ff"
-  integrity sha512-OIHZrb2ImZ7XG85HXOONLcJWGosv7sIvM2ifAPQVhg9Lv7qdmMBNVaai4QTdyuaqbKM5eO6sLSQOYI7wEQeCJQ==
-
 "@fontsource/inter@^4.5.15":
   version "4.5.15"
   resolved "https://registry.yarnpkg.com/@fontsource/inter/-/inter-4.5.15.tgz#eed1873d68755d3b52d6fcfcfa3493118430a512"
@@ -1725,11 +1720,6 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917"
   integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==
 
-"@ioredis/commands@^1.1.1":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@ioredis/commands/-/commands-1.2.0.tgz#6d61b3097470af1fdbbe622795b8921d42018e11"
-  integrity sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==
-
 "@isaacs/cliui@^8.0.2":
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
@@ -2011,209 +2001,10 @@
   resolved "https://registry.yarnpkg.com/@kurkle/color/-/color-0.3.2.tgz#5acd38242e8bde4f9986e7913c8fdf49d3aa199f"
   integrity sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==
 
-"@netlify/blobs@^2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@netlify/blobs/-/blobs-2.2.0.tgz#bf634e6f1a43df3fab2088b5093c9e8eda01b393"
-  integrity sha512-j2C0+IvWj9CLNGPoiA7ETquMFDExZTrv4CarjfE6Au0eY3zlinnnTVae7DE+VQFK+U0CDM/O0VvelNy1QbsdwQ==
-
-"@netlify/esbuild-android-64@0.14.39":
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/@netlify/esbuild-android-64/-/esbuild-android-64-0.14.39.tgz#7bd30aba94a92351d2c5e25e178ceb824f3c2f99"
-  integrity sha512-azq+lsvjRsKLap8ubIwSJXGyknUACqYu5h98Fvyoh40Qk4QXIVKl16JIJ4s+B7jy2k9qblEc5c4nxdDA3aGbVA==
-
-"@netlify/esbuild-android-arm64@0.14.39":
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/@netlify/esbuild-android-arm64/-/esbuild-android-arm64-0.14.39.tgz#0b3e11efaa9379792592173152eba2c9f8b933b0"
-  integrity sha512-WhIP7ePq4qMC1sxoaeB9SsJqSW6uzW7XDj/IuWl1l9r94nwxywU1sYdVLaF2mZr15njviazYjVr8x1d+ipwL3w==
-
-"@netlify/esbuild-darwin-64@0.14.39":
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/@netlify/esbuild-darwin-64/-/esbuild-darwin-64-0.14.39.tgz#bb4a3a244723351dabd3cd0553425d087901c408"
-  integrity sha512-eF4GvLYiDxtcyjFT55+h+8c8A2HltjeMezCqkt3AQSgOdu1nhlvwbBhIdg2dyM6gKEaEm5hBtTbicEDSwsLodA==
-
-"@netlify/esbuild-darwin-arm64@0.14.39":
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/@netlify/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.39.tgz#48e5abd7d32cdefe4db30026e21c5173afae3c8d"
-  integrity sha512-b7rtnX/VtYwNbUCxs3eulrCWJ+u2YvqDcXiIV1ka+od+N0fTx+4RrVkVp1lha9L0wEJYK9J7UWZOMLMyd1ynRg==
-
-"@netlify/esbuild-freebsd-64@0.14.39":
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/@netlify/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.39.tgz#d9650ba7ac0df826ad8928cc3b02e16d00c259b0"
-  integrity sha512-XtusxDJt2hUKUdggbTFolMx0kJL2zEa4STI7YwpB+ukEWoW5rODZjiLZbqqYLcjDH8k4YwHaMxs103L8eButEQ==
-
-"@netlify/esbuild-freebsd-arm64@0.14.39":
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/@netlify/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.39.tgz#4e1401e44f79e007dc43b6edac737d010685f9f0"
-  integrity sha512-A9XZKai+k6kfndCtN6Dh2usT28V0+OGxzFdZsANONPQiEUTrGZCgwcHWiVlVn7SeAwPR1tKZreTnvrfj8cj7hA==
-
-"@netlify/esbuild-linux-32@0.14.39":
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/@netlify/esbuild-linux-32/-/esbuild-linux-32-0.14.39.tgz#fb017e160d8caa72efa36cf9a2748cd01165a463"
-  integrity sha512-ZQnqk/82YRvINY+aF+LlGfRZ19c5mH0jaxsO046GpIOPx6PcXHG8JJ2lg+vLJVe4zFPohxzabcYpwFuT4cg/GA==
-
-"@netlify/esbuild-linux-64@0.14.39":
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/@netlify/esbuild-linux-64/-/esbuild-linux-64-0.14.39.tgz#d89f1aed0f3607b092ca2f57556725af3ceb8252"
-  integrity sha512-IQtswVw7GAKNX/3yV390wSfSXvMWy0d5cw8csAffwBk9gupftY2lzepK4Cn6uD/aqLt3Iku33FbHop/2nPGfQA==
-
-"@netlify/esbuild-linux-arm64@0.14.39":
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/@netlify/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.39.tgz#faf6e1e2587045df193d4893e4c30237e2cb84e9"
-  integrity sha512-4Jie4QV6pWWuGN7TAshNMGbdTA9+VbRkv3rPIxhgK5gBfmsAV1yRKsumE4Y77J0AZNRiOriyoec4zc1qkmI3zg==
-
-"@netlify/esbuild-linux-arm@0.14.39":
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/@netlify/esbuild-linux-arm/-/esbuild-linux-arm-0.14.39.tgz#bd43359c9e00caebf9bd8f47b8fc7606f5433618"
-  integrity sha512-QdOzQniOed0Bz1cTC9TMMwvtAqKayYv66H4edJlbvElC81yJZF/c9XhmYWJ6P5g4nkChZubQ5RcQwTLmrFGexg==
-
-"@netlify/esbuild-linux-mips64le@0.14.39":
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/@netlify/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.39.tgz#0d69730b40175406e943bbf519a4de85750e1ed3"
-  integrity sha512-Htozxr95tw4tSd86YNbCLs1eoYQzNu/cHpzFIkuJoztZueUhl8XpRvBdob7n3kEjW1gitLWAIn8XUwSt+aJ1Tg==
-
-"@netlify/esbuild-linux-ppc64le@0.14.39":
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/@netlify/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.39.tgz#18fd4c7190496382501bb95c3f015f7ec1b0acb2"
-  integrity sha512-tFy0ufWIdjeuk1rPHee00TZlhr9OSF00Ufb4ROFyt2ArKuMSkWRJuDgx6MtZcAnCIN4cybo/xWl3MKTM+scnww==
-
-"@netlify/esbuild-linux-riscv64@0.14.39":
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/@netlify/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.39.tgz#c9dc6af7e999ead24e2d68443c8c630094908930"
-  integrity sha512-ZzfKvwIxL7wQnYbVFpyNW0wotnLoKageUEM57RbjekesJoNQnqUR6Usm+LDZoB8iRsI58VX1IxnstP0cX8vOHw==
-
-"@netlify/esbuild-linux-s390x@0.14.39":
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/@netlify/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.39.tgz#8b87c0a09397b014e9f4fb3873c891ea0d81df40"
-  integrity sha512-yjC0mFwnuMRoh0WcF0h71MF71ytZBFEQQTRdgiGT0+gbC4UApBqnTkJdLx32RscBKi9skbMChiJ748hDJou6FA==
-
-"@netlify/esbuild-netbsd-64@0.14.39":
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/@netlify/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.39.tgz#3f049e25a6d00f17519220ab2f5e15f027edadae"
-  integrity sha512-mIq4znOoz3YfTVdv3sIWfR4Zx5JgMnT4srlhC5KYVHibhxvyDdin5txldYXmR4Zv4dZd6DSuWFsn441aUegHeA==
-
-"@netlify/esbuild-openbsd-64@0.14.39":
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/@netlify/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.39.tgz#02396cf8e8ca01484df58a191d301adc587397c9"
-  integrity sha512-+t6QdzJCngH19hV7ClpFAeFDI2ko/HNcFbiNwaXTMVLB3hWi1sJtn+fzZck5HfzN4qsajAVqZq4nwX69SSt25A==
-
-"@netlify/esbuild-sunos-64@0.14.39":
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/@netlify/esbuild-sunos-64/-/esbuild-sunos-64-0.14.39.tgz#97c3152aa7ceaf51247998c836f94773975e716e"
-  integrity sha512-HLfXG6i2p3wyyyWHeeP4ShGDJ1zRMnf9YLJLe2ezv2KqvcKw/Un/m/FBuDW1p13oSUO7ShISMzgc1dw1GGBEOQ==
-
-"@netlify/esbuild-windows-32@0.14.39":
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/@netlify/esbuild-windows-32/-/esbuild-windows-32-0.14.39.tgz#ccb2a234954714662a4cd1a573d5b271f5288273"
-  integrity sha512-ZpSQcKbVSCU3ln7mHpsL/5dWsUqCNdTnC5YAArnaOwdrlIunrsbo5j4MOZRRcGExb2uvTc/rb+D3mlGb8j1rkA==
-
-"@netlify/esbuild-windows-64@0.14.39":
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/@netlify/esbuild-windows-64/-/esbuild-windows-64-0.14.39.tgz#477c22c04a3299599924e9e4c909c0dec5612f56"
-  integrity sha512-I3gCdO8+6IDhT4Y1ZmV4o2Gg0oELv7N4kCcE4kqclz10fWHNjf19HQNHyBJe0AWnFV5ZfT154VVD31dqgwpgFw==
-
-"@netlify/esbuild-windows-arm64@0.14.39":
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/@netlify/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.39.tgz#10446d91ca603fa28067541cfa1526081c6ee09b"
-  integrity sha512-WX52W8U1lsfWcz6NWoSpDs57lgiiMHN23seq8G2bvxzGS/tvYD3dxVLLW5UPoKSnFDyVQT7b6Zkt6AkBten1yQ==
-
-"@netlify/esbuild@0.14.39":
-  version "0.14.39"
-  resolved "https://registry.yarnpkg.com/@netlify/esbuild/-/esbuild-0.14.39.tgz#66897af6d26336e5960b5ba74f1642f1d02a9c6a"
-  integrity sha512-C3xpwdT2xw6SnSb+hLQoxjtikAKiz6BjQjzlIaysHDpGbmIcmUHZ/X+dyLtCqAvf15WNK5GSBZYOlpgcOE0WZA==
-  optionalDependencies:
-    "@netlify/esbuild-android-64" "0.14.39"
-    "@netlify/esbuild-android-arm64" "0.14.39"
-    "@netlify/esbuild-darwin-64" "0.14.39"
-    "@netlify/esbuild-darwin-arm64" "0.14.39"
-    "@netlify/esbuild-freebsd-64" "0.14.39"
-    "@netlify/esbuild-freebsd-arm64" "0.14.39"
-    "@netlify/esbuild-linux-32" "0.14.39"
-    "@netlify/esbuild-linux-64" "0.14.39"
-    "@netlify/esbuild-linux-arm" "0.14.39"
-    "@netlify/esbuild-linux-arm64" "0.14.39"
-    "@netlify/esbuild-linux-mips64le" "0.14.39"
-    "@netlify/esbuild-linux-ppc64le" "0.14.39"
-    "@netlify/esbuild-linux-riscv64" "0.14.39"
-    "@netlify/esbuild-linux-s390x" "0.14.39"
-    "@netlify/esbuild-netbsd-64" "0.14.39"
-    "@netlify/esbuild-openbsd-64" "0.14.39"
-    "@netlify/esbuild-sunos-64" "0.14.39"
-    "@netlify/esbuild-windows-32" "0.14.39"
-    "@netlify/esbuild-windows-64" "0.14.39"
-    "@netlify/esbuild-windows-arm64" "0.14.39"
-
-"@netlify/functions@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@netlify/functions/-/functions-1.6.0.tgz#c373423e6fef0e6f7422ac0345e8bbf2cb692366"
-  integrity sha512-6G92AlcpFrQG72XU8YH8pg94eDnq7+Q0YJhb8x4qNpdGsvuzvrfHWBmqFGp/Yshmv4wex9lpsTRZOocdrA2erQ==
-  dependencies:
-    is-promise "^4.0.0"
-
-"@netlify/functions@^2.4.0":
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/@netlify/functions/-/functions-2.6.0.tgz#801a6fe8ceef2ce1512c637a28e53e6a3aae289b"
-  integrity sha512-vU20tij0fb4nRGACqb+5SQvKd50JYyTyEhQetCMHdakcJFzjLDivvRR16u1G2Oy4A7xNAtGJF1uz8reeOtTVcQ==
-  dependencies:
-    "@netlify/serverless-functions-api" "1.14.0"
-
-"@netlify/ipx@^1.4.6":
-  version "1.4.6"
-  resolved "https://registry.yarnpkg.com/@netlify/ipx/-/ipx-1.4.6.tgz#0bd308d70a1d2e1928e66cb49e36294f66f7b8b2"
-  integrity sha512-rnKR2LXhtnflitPX9CQIv+XSrNlYIqGsV54xrXifhbtHHjCjCw/lixsi8qwAXqEIgZBC9b4Y7prhHqRtC4oIjw==
-  dependencies:
-    "@netlify/functions" "^2.4.0"
-    etag "^1.8.1"
-    fs-extra "^11.0.0"
-    ipx "^1.3.1"
-    micromatch "^4.0.5"
-    mkdirp "^3.0.0"
-    murmurhash "^2.0.0"
-    node-fetch "^2.0.0"
-    ufo "^1.0.0"
-    unstorage "1.9.0"
-
-"@netlify/node-cookies@^0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@netlify/node-cookies/-/node-cookies-0.1.0.tgz#dda912ba618527695cf519fafa221c5e6777c612"
-  integrity sha512-OAs1xG+FfLX0LoRASpqzVntVV/RpYkgpI0VrUnw2u0Q1qiZUzcPffxRK8HF3gc4GjuhG5ahOEMJ9bswBiZPq0g==
-
-"@netlify/plugin-nextjs@^4.41.3":
-  version "4.41.3"
-  resolved "https://registry.yarnpkg.com/@netlify/plugin-nextjs/-/plugin-nextjs-4.41.3.tgz#f8274526147f652438cc6790b6819ca15d441dd3"
-  integrity sha512-l8TB61u7A1ZF22QpoyZtresSUsHOJGP9DatECnqlNab3lG8id1kz9Pso+nZVOznWOm98o7w51k2+TIf52x+DBQ==
-  dependencies:
-    "@netlify/blobs" "^2.2.0"
-    "@netlify/esbuild" "0.14.39"
-    "@netlify/functions" "^1.6.0"
-    "@netlify/ipx" "^1.4.6"
-    "@vercel/node-bridge" "^2.1.0"
-    chalk "^4.1.2"
-    chokidar "^3.5.3"
-    destr "^1.1.1"
-    execa "^5.1.1"
-    follow-redirects "^1.15.2"
-    fs-extra "^10.0.0"
-    globby "^11.0.4"
-    merge-stream "^2.0.0"
-    moize "^6.1.0"
-    node-fetch "^2.6.6"
-    node-stream-zip "^1.15.0"
-    outdent "^0.8.0"
-    p-limit "^3.1.0"
-    pathe "^0.3.0"
-    pretty-bytes "^5.6.0"
-    regexp-tree "^0.1.24"
-    semver "^7.3.5"
-    slash "^3.0.0"
-    tiny-glob "^0.2.9"
-
-"@netlify/serverless-functions-api@1.14.0":
-  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/@netlify/serverless-functions-api/-/serverless-functions-api-1.14.0.tgz#2bedff76cf898e24e48161aa2508776c4d261ed1"
-  integrity sha512-HUNETLNvNiC2J+SB/YuRwJA9+agPrc0azSoWVk8H85GC+YE114hcS5JW+dstpKwVerp2xILE3vNWN7IMXP5Q5Q==
-  dependencies:
-    "@netlify/node-cookies" "^0.1.0"
-    urlpattern-polyfill "8.0.2"
+"@netlify/plugin-nextjs@^5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@netlify/plugin-nextjs/-/plugin-nextjs-5.1.0.tgz#12fc0f7815b62cf091ea6bc98bc9f43ab103411d"
+  integrity sha512-nurSK6pMi36fVbuwLEiPIzMC/N2Dn/tHqA+seoStwHvGewsrXAphrjJ+8wq7eSCe+BEHCtGlwC1mNOeuqVkfbg==
 
 "@next/env@14.1.4":
   version "14.1.4"
@@ -2293,98 +2084,6 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@parcel/watcher-android-arm64@2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.3.0.tgz#d82e74bb564ebd4d8a88791d273a3d2bd61e27ab"
-  integrity sha512-f4o9eA3dgk0XRT3XhB0UWpWpLnKgrh1IwNJKJ7UJek7eTYccQ8LR7XUWFKqw6aEq5KUNlCcGvSzKqSX/vtWVVA==
-
-"@parcel/watcher-darwin-arm64@2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.3.0.tgz#c9cd03f8f233d512fcfc873d5b4e23f1569a82ad"
-  integrity sha512-mKY+oijI4ahBMc/GygVGvEdOq0L4DxhYgwQqYAz/7yPzuGi79oXrZG52WdpGA1wLBPrYb0T8uBaGFo7I6rvSKw==
-
-"@parcel/watcher-darwin-x64@2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.3.0.tgz#83c902994a2a49b9e1ab5050dba24876fdc2c219"
-  integrity sha512-20oBj8LcEOnLE3mgpy6zuOq8AplPu9NcSSSfyVKgfOhNAc4eF4ob3ldj0xWjGGbOF7Dcy1Tvm6ytvgdjlfUeow==
-
-"@parcel/watcher-freebsd-x64@2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.3.0.tgz#7a0f4593a887e2752b706aff2dae509aef430cf6"
-  integrity sha512-7LftKlaHunueAEiojhCn+Ef2CTXWsLgTl4hq0pkhkTBFI3ssj2bJXmH2L67mKpiAD5dz66JYk4zS66qzdnIOgw==
-
-"@parcel/watcher-linux-arm-glibc@2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.3.0.tgz#3fc90c3ebe67de3648ed2f138068722f9b1d47da"
-  integrity sha512-1apPw5cD2xBv1XIHPUlq0cO6iAaEUQ3BcY0ysSyD9Kuyw4MoWm1DV+W9mneWI+1g6OeP6dhikiFE6BlU+AToTQ==
-
-"@parcel/watcher-linux-arm64-glibc@2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.3.0.tgz#f7bbbf2497d85fd11e4c9e9c26ace8f10ea9bcbc"
-  integrity sha512-mQ0gBSQEiq1k/MMkgcSB0Ic47UORZBmWoAWlMrTW6nbAGoLZP+h7AtUM7H3oDu34TBFFvjy4JCGP43JlylkTQA==
-
-"@parcel/watcher-linux-arm64-musl@2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.3.0.tgz#de131a9fcbe1fa0854e9cbf4c55bed3b35bcff43"
-  integrity sha512-LXZAExpepJew0Gp8ZkJ+xDZaTQjLHv48h0p0Vw2VMFQ8A+RKrAvpFuPVCVwKJCr5SE+zvaG+Etg56qXvTDIedw==
-
-"@parcel/watcher-linux-x64-glibc@2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.3.0.tgz#193dd1c798003cdb5a1e59470ff26300f418a943"
-  integrity sha512-P7Wo91lKSeSgMTtG7CnBS6WrA5otr1K7shhSjKHNePVmfBHDoAOHYRXgUmhiNfbcGk0uMCHVcdbfxtuiZCHVow==
-
-"@parcel/watcher-linux-x64-musl@2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.3.0.tgz#6dbdb86d96e955ab0fe4a4b60734ec0025a689dd"
-  integrity sha512-+kiRE1JIq8QdxzwoYY+wzBs9YbJ34guBweTK8nlzLKimn5EQ2b2FSC+tAOpq302BuIMjyuUGvBiUhEcLIGMQ5g==
-
-"@parcel/watcher-wasm@2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher-wasm/-/watcher-wasm-2.3.0.tgz#73b66c6fbd2a3326ae86a1ec77eab7139d0dd725"
-  integrity sha512-ejBAX8H0ZGsD8lSICDNyMbSEtPMWgDL0WFCt/0z7hyf5v8Imz4rAM8xY379mBsECkq/Wdqa5WEDLqtjZ+6NxfA==
-  dependencies:
-    is-glob "^4.0.3"
-    micromatch "^4.0.5"
-    napi-wasm "^1.1.0"
-
-"@parcel/watcher-win32-arm64@2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.3.0.tgz#59da26a431da946e6c74fa6b0f30b120ea6650b6"
-  integrity sha512-35gXCnaz1AqIXpG42evcoP2+sNL62gZTMZne3IackM+6QlfMcJLy3DrjuL6Iks7Czpd3j4xRBzez3ADCj1l7Aw==
-
-"@parcel/watcher-win32-ia32@2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.3.0.tgz#3ee6a18b08929cd3b788e8cc9547fd9a540c013a"
-  integrity sha512-FJS/IBQHhRpZ6PiCjFt1UAcPr0YmCLHRbTc00IBTrelEjlmmgIVLeOx4MSXzx2HFEy5Jo5YdhGpxCuqCyDJ5ow==
-
-"@parcel/watcher-win32-x64@2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.3.0.tgz#14e7246289861acc589fd608de39fe5d8b4bb0a7"
-  integrity sha512-dLx+0XRdMnVI62kU3wbXvbIRhLck4aE28bIGKbRGS7BJNt54IIj9+c/Dkqb+7DJEbHUZAX1bwaoM8PqVlHJmCA==
-
-"@parcel/watcher@^2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.3.0.tgz#803517abbc3981a1a1221791d9f59dc0590d50f9"
-  integrity sha512-pW7QaFiL11O0BphO+bq3MgqeX/INAk9jgBldVDYjlQPO4VddoZnF22TcF9onMhnLVHuNqBJeRf+Fj7eezi/+rQ==
-  dependencies:
-    detect-libc "^1.0.3"
-    is-glob "^4.0.3"
-    micromatch "^4.0.5"
-    node-addon-api "^7.0.0"
-  optionalDependencies:
-    "@parcel/watcher-android-arm64" "2.3.0"
-    "@parcel/watcher-darwin-arm64" "2.3.0"
-    "@parcel/watcher-darwin-x64" "2.3.0"
-    "@parcel/watcher-freebsd-x64" "2.3.0"
-    "@parcel/watcher-linux-arm-glibc" "2.3.0"
-    "@parcel/watcher-linux-arm64-glibc" "2.3.0"
-    "@parcel/watcher-linux-arm64-musl" "2.3.0"
-    "@parcel/watcher-linux-x64-glibc" "2.3.0"
-    "@parcel/watcher-linux-x64-musl" "2.3.0"
-    "@parcel/watcher-win32-arm64" "2.3.0"
-    "@parcel/watcher-win32-ia32" "2.3.0"
-    "@parcel/watcher-win32-x64" "2.3.0"
-
 "@pkgjs/parseargs@^0.11.0":
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
@@ -3213,11 +2912,6 @@
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
   integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
 
-"@vercel/node-bridge@^2.1.0":
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/@vercel/node-bridge/-/node-bridge-2.2.2.tgz#f63466ab6a2588afdc6262c2d060289bfe8baa6b"
-  integrity sha512-haGBC8noyA5BfjCRXRH+VIkHCDVW5iD5UX24P2nOdilwUxI4qWsattS/co8QBGq64XsNLRAMdM5pQUE3zxkF9Q==
-
 "@vue/compiler-core@3.3.4", "@vue/compiler-core@^3.2.23":
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.3.4.tgz#7fbf591c1c19e1acd28ffd284526e98b4f581128"
@@ -3318,7 +3012,7 @@ acorn-walk@^8.1.1:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.1.tgz#2f10f5b69329d90ae18c58bf1fa8fccd8b959a43"
   integrity sha512-TgUZgYvqZprrl7YldZNoa9OciCAyZR+Ejm9eXzKCmjsF5IKp/wgQ7Z/ZpjpGTIUPwrHQIcYeI8qDh4PsEwxMbw==
 
-acorn@^8.10.0, acorn@^8.4.1:
+acorn@^8.4.1:
   version "8.11.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b"
   integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==
@@ -3433,7 +3127,7 @@ ansi-styles@^6.0.0, ansi-styles@^6.1.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
   integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
 
-anymatch@^3.0.3, anymatch@^3.1.3, anymatch@~3.1.2:
+anymatch@^3.0.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
   integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
@@ -3662,11 +3356,6 @@ axobject-query@^3.2.1:
   dependencies:
     dequal "^2.0.3"
 
-b4a@^1.6.4:
-  version "1.6.4"
-  resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.6.4.tgz#ef1c1422cae5ce6535ec191baeed7567443f36c9"
-  integrity sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==
-
 babel-jest@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.7.0.tgz#f4369919225b684c56085998ac63dbd05be020d5"
@@ -3794,20 +3483,6 @@ bcryptjs@^2.4.3:
   resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb"
   integrity sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==
 
-binary-extensions@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
-  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
-
-bl@^4.0.3:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
-  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
-  dependencies:
-    buffer "^5.5.0"
-    inherits "^2.0.4"
-    readable-stream "^3.4.0"
-
 blob-util@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/blob-util/-/blob-util-2.0.2.tgz#3b4e3c281111bb7f11128518006cdc60b403a1eb"
@@ -3838,7 +3513,7 @@ brace-expansion@^2.0.1:
   dependencies:
     balanced-match "^1.0.0"
 
-braces@^3.0.2, braces@~3.0.2:
+braces@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -3894,7 +3569,7 @@ buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-buffer@^5.5.0, buffer@^5.7.1:
+buffer@^5.7.1:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
   integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
@@ -4043,26 +3718,6 @@ check-more-types@^2.24.0:
   resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600"
   integrity sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==
 
-chokidar@^3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
-  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
-  dependencies:
-    anymatch "~3.1.2"
-    braces "~3.0.2"
-    glob-parent "~5.1.2"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.6.0"
-  optionalDependencies:
-    fsevents "~2.3.2"
-
-chownr@^1.1.1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
-  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
-
 chownr@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
@@ -4073,13 +3728,6 @@ ci-info@^3.2.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
   integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
 
-citty@^0.1.4, citty@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/citty/-/citty-0.1.5.tgz#fe37ceae5dc764af75eb2fece99d2bf527ea4e50"
-  integrity sha512-AS7n5NSc0OQVMV9v6wt3ByujNIrne0/cTjiC2MYqhvao57VNfiuVksTSr2p17nVOhEr2KtqiAkGwHcgMC/qUuQ==
-  dependencies:
-    consola "^3.2.3"
-
 cjs-module-lexer@^1.0.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107"
@@ -4139,15 +3787,6 @@ client-only@0.0.1:
   resolved "https://registry.yarnpkg.com/client-only/-/client-only-0.0.1.tgz#38bba5d403c41ab150bff64a95c85013cf73bca1"
   integrity sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==
 
-clipboardy@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-3.0.0.tgz#f3876247404d334c9ed01b6f269c11d09a5e3092"
-  integrity sha512-Su+uU5sr1jkUy1sGRpLKjKrvEOVXgSgiSInwa/qeID6aJ07yh+5NWc3h2QfjHjBnfX4LhtFcuAWKUsJ3r+fjbg==
-  dependencies:
-    arch "^2.2.0"
-    execa "^5.1.1"
-    is-wsl "^2.2.0"
-
 cliui@^8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
@@ -4157,7 +3796,7 @@ cliui@^8.0.1:
     strip-ansi "^6.0.1"
     wrap-ansi "^7.0.0"
 
-cluster-key-slot@1.1.2, cluster-key-slot@^1.1.0:
+cluster-key-slot@1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz#88ddaa46906e303b5de30d3153b7d9fe0a0c19ac"
   integrity sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==
@@ -4191,27 +3830,11 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
-color-name@^1.0.0, color-name@~1.1.4:
+color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color-string@^1.9.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4"
-  integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==
-  dependencies:
-    color-name "^1.0.0"
-    simple-swizzle "^0.2.2"
-
-color@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/color/-/color-4.2.3.tgz#d781ecb5e57224ee43ea9627560107c0e0c6463a"
-  integrity sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==
-  dependencies:
-    color-convert "^2.0.1"
-    color-string "^1.9.0"
-
 colord@^2.9.1, colord@^2.9.2, colord@^2.9.3:
   version "2.9.3"
   resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43"
@@ -4239,7 +3862,7 @@ commander@11.0.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-11.0.0.tgz#43e19c25dbedc8256203538e8d7e9346877a6f67"
   integrity sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==
 
-commander@2, commander@^2.20.0, commander@^2.20.3:
+commander@2, commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -4281,21 +3904,11 @@ concat-with-sourcemaps@^1.1.0:
   dependencies:
     source-map "^0.6.1"
 
-consola@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/consola/-/consola-3.2.3.tgz#0741857aa88cfa0d6fd53f1cff0375136e98502f"
-  integrity sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==
-
 convert-source-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
   integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
-cookie-es@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/cookie-es/-/cookie-es-1.0.0.tgz#4759684af168dfc54365b2c2dda0a8d7ee1e4865"
-  integrity sha512-mWYvfOLrfEc996hlKcdABeIiPHUPC6DM2QYZdGGOvhOTbA3tjm2eBwqlJpoFdjC89NI4Qt6h0Pu06Mp+1Pj5OQ==
-
 core-js-compat@^3.31.0, core-js-compat@^3.32.2:
   version "3.33.0"
   resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.33.0.tgz#24aa230b228406450b2277b7c8bfebae932df966"
@@ -4473,11 +4086,6 @@ cssesc@^3.0.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
-cssfilter@0.0.10:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/cssfilter/-/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae"
-  integrity sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw==
-
 cssnano-preset-default@^5.2.14:
   version "5.2.14"
   resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz#309def4f7b7e16d71ab2438052093330d9ab45d8"
@@ -4833,23 +4441,11 @@ decamelize@^5.0.0:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-5.0.1.tgz#db11a92e58c741ef339fb0a2868d8a06a9a7b1e9"
   integrity sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==
 
-decompress-response@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
-  integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==
-  dependencies:
-    mimic-response "^3.1.0"
-
 dedent@^1.0.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.5.1.tgz#4f3fc94c8b711e9bb2800d185cd6ad20f2a90aff"
   integrity sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==
 
-deep-extend@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
-
 deep-is@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
@@ -4878,11 +4474,6 @@ define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
-defu@^6.1.2, defu@^6.1.3:
-  version "6.1.3"
-  resolved "https://registry.yarnpkg.com/defu/-/defu-6.1.3.tgz#6d7f56bc61668e844f9f593ace66fd67ef1205fd"
-  integrity sha512-Vy2wmG3NTkmHNg/kzpuvHhkqeIx3ODWqasgCRbKtbXEN0G+HpEEv9BtJLp7ZG1CZloFaC41Ah3ZFbq7aqCqMeQ==
-
 del@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/del/-/del-5.1.0.tgz#d9487c94e367410e6eff2925ee58c0c84a75b3a7"
@@ -4916,26 +4507,11 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
-denque@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/denque/-/denque-2.1.0.tgz#e93e1a6569fb5e66f16a3c2a2964617d349d6ab1"
-  integrity sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==
-
 dequal@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
   integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
 
-destr@^1.1.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/destr/-/destr-1.2.2.tgz#7ba9befcafb645a50e76b260449c63927b51e22f"
-  integrity sha512-lrbCJwD9saUQrqUfXvl6qoM+QN3W7tLV5pAOs+OqOmopCCz/JkE05MHedJR1xfk4IAnZuJXPVuN5+7jNA2ZCiA==
-
-destr@^2.0.1, destr@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/destr/-/destr-2.0.2.tgz#8d3c0ee4ec0a76df54bc8b819bca215592a8c218"
-  integrity sha512-65AlobnZMiCET00KaFFjUefxDX0khFA/E4myqZ7a6Sq1yZtR8+FVIvilVX66vF2uobSumxooYZChiRPCKNqhmg==
-
 detect-browser@^5.2.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.3.0.tgz#9705ef2bddf46072d0f7265a1fe300e36fe7ceca"
@@ -4946,16 +4522,6 @@ detect-indent@^6.0.0:
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"
   integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==
 
-detect-libc@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==
-
-detect-libc@^2.0.0, detect-libc@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.2.tgz#8ccf2ba9315350e1241b88d0ac3b0e1fbd99605d"
-  integrity sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==
-
 detect-newline@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
@@ -5105,7 +4671,7 @@ emoji-regex@^9.2.2:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
   integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
 
-end-of-stream@^1.1.0, end-of-stream@^1.4.1:
+end-of-stream@^1.1.0:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
   integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
@@ -5594,11 +5160,6 @@ esutils@^2.0.2:
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-etag@^1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-  integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
-
 eventemitter2@6.4.7:
   version "6.4.7"
   resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.7.tgz#a7f6c4d7abf28a14c1ef3442f21cb306a054271d"
@@ -5644,7 +5205,7 @@ execa@7.2.0:
     signal-exit "^3.0.7"
     strip-final-newline "^3.0.0"
 
-execa@^5.0.0, execa@^5.1.1:
+execa@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
   integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
@@ -5671,11 +5232,6 @@ exit@^0.1.2:
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
   integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==
 
-expand-template@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
-  integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
-
 expect@^29.0.0, expect@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/expect/-/expect-29.7.0.tgz#578874590dcb3214514084c08115d8aee61e11bc"
@@ -5744,16 +5300,6 @@ fast-diff@^1.1.2:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
   integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
 
-fast-equals@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/fast-equals/-/fast-equals-3.0.3.tgz#8e6cb4e51ca1018d87dd41982ef92758b3e4197f"
-  integrity sha512-NCe8qxnZFARSHGztGMZOO/PC1qa5MIFB5Hp66WdzbCRAz8U8US3bx1UTgLS49efBQPcUtO9gf5oVEY8o7y/7Kg==
-
-fast-fifo@^1.1.0, fast-fifo@^1.2.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c"
-  integrity sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==
-
 fast-glob@^3.0.3, fast-glob@^3.2.7:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4"
@@ -5883,11 +5429,6 @@ flatted@^3.2.9:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
   integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
 
-follow-redirects@^1.15.2:
-  version "1.15.6"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
-  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
-
 for-each@^0.3.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
@@ -5929,12 +5470,7 @@ fraction.js@^4.3.6:
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7"
   integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==
 
-fs-constants@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
-  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
-
-fs-extra@10, fs-extra@^10.0.0, fs-extra@^10.0.1:
+fs-extra@10, fs-extra@^10.0.1:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
   integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
@@ -5943,15 +5479,6 @@ fs-extra@10, fs-extra@^10.0.0, fs-extra@^10.0.1:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-extra@^11.0.0:
-  version "11.2.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b"
-  integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
 fs-extra@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
@@ -6046,11 +5573,6 @@ get-package-type@^0.1.0:
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
   integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
 
-get-port-please@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/get-port-please/-/get-port-please-3.1.1.tgz#2556623cddb4801d823c0a6a15eec038abb483be"
-  integrity sha512-3UBAyM3u4ZBVYDsxOQfJDxEa6XTbpBDrOjp4mf7ExFRt5BKs/QywQQiJsh2B+hxcZLSapWqCRvElUe8DnKcFHA==
-
 get-stream@^5.0.0, get-stream@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
@@ -6093,12 +5615,7 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-github-from-package@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
-  integrity sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==
-
-glob-parent@^5.1.2, glob-parent@~5.1.2:
+glob-parent@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
@@ -6188,11 +5705,6 @@ globalthis@^1.0.3:
   dependencies:
     define-properties "^1.1.3"
 
-globalyzer@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.0.tgz#cb76da79555669a1519d5a8edf093afaa0bf1465"
-  integrity sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==
-
 globby@10.0.1:
   version "10.0.1"
   resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.1.tgz#4782c34cb75dd683351335c5829cc3420e606b22"
@@ -6221,7 +5733,7 @@ globby@^10.0.1:
     merge2 "^1.2.3"
     slash "^3.0.0"
 
-globby@^11.0.1, globby@^11.0.4, globby@^11.1.0:
+globby@^11.0.1, globby@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
   integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
@@ -6238,11 +5750,6 @@ globjoin@^0.1.4:
   resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43"
   integrity sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==
 
-globrex@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098"
-  integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==
-
 gonzales-pe@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.3.0.tgz#fe9dec5f3c557eead09ff868c65826be54d067b3"
@@ -6267,20 +5774,6 @@ graphemer@^1.4.0:
   resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
   integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
 
-h3@^1.7.1, h3@^1.8.1:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/h3/-/h3-1.9.0.tgz#c5f512a93026df9837db6f30c9ef51135dd46752"
-  integrity sha512-+F3ZqrNV/CFXXfZ2lXBINHi+rM4Xw3CDC5z2CDK3NMPocjonKipGLLDSkrqY9DOrioZNPTIdDMWfQKm//3X2DA==
-  dependencies:
-    cookie-es "^1.0.0"
-    defu "^6.1.3"
-    destr "^2.0.2"
-    iron-webcrypto "^1.0.0"
-    radix3 "^1.1.0"
-    ufo "^1.3.2"
-    uncrypto "^0.1.3"
-    unenv "^1.7.4"
-
 hard-rejection@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
@@ -6361,11 +5854,6 @@ html-tags@^3.3.1:
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.3.1.tgz#a04026a18c882e4bba8a01a3d39cfe465d40b5ce"
   integrity sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==
 
-http-shutdown@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/http-shutdown/-/http-shutdown-1.2.2.tgz#41bc78fc767637c4c95179bc492f312c0ae64c5f"
-  integrity sha512-S9wWkJ/VSY9/k4qcjG318bqJNruzE4HySUhFYknwmu6LBP97KLLfwNf+n4V1BHurvFNkSKLFnK/RsuUnRTf9Vw==
-
 http-signature@~1.3.6:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.3.6.tgz#cb6fbfdf86d1c974f343be94e87f7fc128662cf9"
@@ -6420,11 +5908,6 @@ ignore@^5.2.0, ignore@^5.2.4:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
   integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==
 
-image-meta@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/image-meta/-/image-meta-0.1.1.tgz#a84dc7d5f61c7d60e85ec0c3ac81beee8646039b"
-  integrity sha512-+oXiHwOEPr1IE5zY0tcBLED/CYcre15J4nwL50x3o0jxWqEkyjrusiKP3YSU+tr9fvJp33ZcP5Gpj2295g3aEw==
-
 immer@^9.0.12:
   version "9.0.21"
   resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.21.tgz#1e025ea31a40f24fb064f1fef23e931496330176"
@@ -6488,7 +5971,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.3, inherits@^2.0.4:
+inherits@2:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -6498,7 +5981,7 @@ ini@2.0.0:
   resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
   integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
 
-ini@^1.3.5, ini@~1.3.0:
+ini@^1.3.5:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
@@ -6542,49 +6025,11 @@ intl-messageformat@10.5.11:
     "@formatjs/icu-messageformat-parser" "2.7.6"
     tslib "^2.4.0"
 
-ioredis@^5.3.2:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-5.3.2.tgz#9139f596f62fc9c72d873353ac5395bcf05709f7"
-  integrity sha512-1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA==
-  dependencies:
-    "@ioredis/commands" "^1.1.1"
-    cluster-key-slot "^1.1.0"
-    debug "^4.3.4"
-    denque "^2.1.0"
-    lodash.defaults "^4.2.0"
-    lodash.isarguments "^3.1.0"
-    redis-errors "^1.2.0"
-    redis-parser "^3.0.0"
-    standard-as-callback "^2.1.0"
-
 ipaddr.js@^2.0.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.1.0.tgz#2119bc447ff8c257753b196fc5f1ce08a4cdf39f"
   integrity sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==
 
-ipx@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/ipx/-/ipx-1.3.1.tgz#2ff4aa9bc5be74f63cccd80d1df430fcc5e715b6"
-  integrity sha512-hWRLXdMDOz2q81T2x9lowFtAGO3E5b2HtC8xOOBTrlnxygHNaVrZqJ5c1P3T7tDkC3oCocYRRz0VBffvJKeQlw==
-  dependencies:
-    "@fastify/accept-negotiator" "^1.1.0"
-    consola "^3.2.3"
-    defu "^6.1.2"
-    destr "^2.0.1"
-    etag "^1.8.1"
-    image-meta "^0.1.1"
-    listhen "^1.5.5"
-    node-fetch-native "^1.4.0"
-    pathe "^1.1.1"
-    sharp "^0.32.6"
-    ufo "^1.3.1"
-    xss "^1.0.14"
-
-iron-webcrypto@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/iron-webcrypto/-/iron-webcrypto-1.0.0.tgz#e3b689c0c61b434a0a4cb82d0aeabbc8b672a867"
-  integrity sha512-anOK1Mktt8U1Xi7fCM3RELTuYbnFikQY5VtrDj7kPgpejV7d43tWKhzgioO0zpkazLEL/j/iayRqnJhrGfqUsg==
-
 is-array-buffer@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98"
@@ -6598,11 +6043,6 @@ is-arrayish@^0.2.1:
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
 
-is-arrayish@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
-  integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
-
 is-async-function@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.0.0.tgz#8e4418efd3e5d3a6ebb0164c05ef5afb69aa9646"
@@ -6617,13 +6057,6 @@ is-bigint@^1.0.1:
   dependencies:
     has-bigints "^1.0.1"
 
-is-binary-path@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
-  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
-  dependencies:
-    binary-extensions "^2.0.0"
-
 is-boolean-object@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
@@ -6677,11 +6110,6 @@ is-date-object@^1.0.1, is-date-object@^1.0.5:
   dependencies:
     has-tostringtag "^1.0.0"
 
-is-docker@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
-  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
-
 is-docker@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-3.0.0.tgz#90093aa3106277d8a77a5910dbae71747e15a200"
@@ -6721,7 +6149,7 @@ is-generator-function@^1.0.10:
   dependencies:
     has-tostringtag "^1.0.0"
 
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
@@ -6798,11 +6226,6 @@ is-plain-object@^5.0.0:
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
   integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
 
-is-promise@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-4.0.0.tgz#42ff9f84206c1991d26debf520dd5c01042dd2f3"
-  integrity sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==
-
 is-reference@1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7"
@@ -6891,13 +6314,6 @@ is-weakset@^2.0.3:
     call-bind "^1.0.7"
     get-intrinsic "^1.2.4"
 
-is-wsl@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
-  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
-  dependencies:
-    is-docker "^2.0.0"
-
 isarray@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
@@ -7358,11 +6774,6 @@ jest@^29.7.0:
     import-local "^3.0.2"
     jest-cli "^29.7.0"
 
-jiti@^1.20.0:
-  version "1.21.0"
-  resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.0.tgz#7c97f8fe045724e136a397f7340475244156105d"
-  integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==
-
 joycon@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/joycon/-/joycon-3.1.1.tgz#bce8596d6ae808f8b68168f5fc69280996894f03"
@@ -7624,29 +7035,6 @@ lint-staged@^14.0.1:
     string-argv "0.3.2"
     yaml "2.3.1"
 
-listhen@^1.2.2, listhen@^1.5.5:
-  version "1.5.5"
-  resolved "https://registry.yarnpkg.com/listhen/-/listhen-1.5.5.tgz#58915512af70f770aa3e9fb19367adf479bb58c4"
-  integrity sha512-LXe8Xlyh3gnxdv4tSjTjscD1vpr/2PRpzq8YIaMJgyKzRG8wdISlWVWnGThJfHnlJ6hmLt2wq1yeeix0TEbuoA==
-  dependencies:
-    "@parcel/watcher" "^2.3.0"
-    "@parcel/watcher-wasm" "2.3.0"
-    citty "^0.1.4"
-    clipboardy "^3.0.0"
-    consola "^3.2.3"
-    defu "^6.1.2"
-    get-port-please "^3.1.1"
-    h3 "^1.8.1"
-    http-shutdown "^1.2.2"
-    jiti "^1.20.0"
-    mlly "^1.4.2"
-    node-forge "^1.3.1"
-    pathe "^1.1.1"
-    std-env "^3.4.3"
-    ufo "^1.3.0"
-    untun "^0.1.2"
-    uqr "^0.1.2"
-
 listr2@6.6.1:
   version "6.6.1"
   resolved "https://registry.yarnpkg.com/listr2/-/listr2-6.6.1.tgz#08b2329e7e8ba6298481464937099f4a2cd7f95d"
@@ -7727,21 +7115,11 @@ lodash.debounce@^4.0.8:
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
 
-lodash.defaults@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
-  integrity sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==
-
 lodash.includes@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f"
   integrity sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==
 
-lodash.isarguments@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
-  integrity sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==
-
 lodash.isboolean@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
@@ -7858,11 +7236,6 @@ lower-case@^2.0.2:
   dependencies:
     tslib "^2.0.3"
 
-lru-cache@^10.0.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.1.0.tgz#2098d41c2dc56500e6c88584aa656c84de7d0484"
-  integrity sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==
-
 lru-cache@^10.2.0:
   version "10.2.0"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3"
@@ -8017,11 +7390,6 @@ merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-micro-memoize@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/micro-memoize/-/micro-memoize-4.1.2.tgz#ce719c1ba1e41592f1cd91c64c5f41dcbf135f36"
-  integrity sha512-+HzcV2H+rbSJzApgkj0NdTakkC+bnyeiUxgT6/m7mjcz1CmM22KYFKp+EVj1sWe4UYcnriJr5uqHQD/gMHLD+g==
-
 micromatch@4.0.5, micromatch@^4.0.4, micromatch@^4.0.5:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
@@ -8042,11 +7410,6 @@ mime-types@^2.1.12, mime-types@~2.1.19:
   dependencies:
     mime-db "1.52.0"
 
-mime@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-3.0.0.tgz#b374550dca3a0c18443b0c950a6a58f1931cf7a7"
-  integrity sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==
-
 mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
@@ -8057,11 +7420,6 @@ mimic-fn@^4.0.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc"
   integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==
 
-mimic-response@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
-  integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
-
 min-indent@^1.0.0, min-indent@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
@@ -8104,7 +7462,7 @@ minimist-options@4.1.0, minimist-options@^4.0.2:
     is-plain-obj "^1.1.0"
     kind-of "^6.0.3"
 
-minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.8:
+minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
@@ -8134,44 +7492,16 @@ minizlib@^2.1.1:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
-mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
-  integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
-
 mkdirp@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
-mkdirp@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50"
-  integrity sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==
-
-mlly@^1.2.0, mlly@^1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.4.2.tgz#7cf406aa319ff6563d25da6b36610a93f2a8007e"
-  integrity sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==
-  dependencies:
-    acorn "^8.10.0"
-    pathe "^1.1.1"
-    pkg-types "^1.0.3"
-    ufo "^1.3.0"
-
 mmdb-lib@2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mmdb-lib/-/mmdb-lib-2.1.0.tgz#c2456caaf4c7ffa056f77575da6d40988e9e878b"
   integrity sha512-tdDTZmnI5G4UoSctv2KxM/3VQt2XRj4CmR5R4VsAWsOUcS3LysHR34wtixWm/pXxXdkBDuN92auxkC0T2+qd1Q==
 
-moize@^6.1.0:
-  version "6.1.6"
-  resolved "https://registry.yarnpkg.com/moize/-/moize-6.1.6.tgz#ac2e723e74b951875fe2c0c3433405c2b098c3e6"
-  integrity sha512-vSKdIUO61iCmTqhdoIDrqyrtp87nWZUmBPniNjO0fX49wEYmyDO4lvlnFXiGcaH1JLE/s/9HbiK4LSHsbiUY6Q==
-  dependencies:
-    fast-equals "^3.0.1"
-    micro-memoize "^4.1.2"
-
 moment-timezone@^0.5.35:
   version "0.5.45"
   resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.45.tgz#cb685acd56bac10e69d93c536366eb65aa6bcf5c"
@@ -8184,11 +7514,6 @@ moment@^2.29.4:
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae"
   integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==
 
-mri@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b"
-  integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==
-
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
@@ -8199,11 +7524,6 @@ ms@^2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-murmurhash@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/murmurhash/-/murmurhash-2.0.1.tgz#4097720e08cf978872194ad84ea5be2dec9b610f"
-  integrity sha512-5vQEh3y+DG/lMPM0mCGPDnyV8chYg/g7rl6v3Gd8WMF9S429ox3Xk8qrk174kWhG767KQMqqxLD1WnGd77hiew==
-
 nanoclone@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/nanoclone/-/nanoclone-0.2.1.tgz#dd4090f8f1a110d26bb32c49ed2f5b9235209ed4"
@@ -8214,16 +7534,6 @@ nanoid@^3.3.6, nanoid@^3.3.7:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
   integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
 
-napi-build-utils@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
-  integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
-
-napi-wasm@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/napi-wasm/-/napi-wasm-1.1.0.tgz#bbe617823765ae9c1bc12ff5942370eae7b2ba4e"
-  integrity sha512-lHwIAJbmLSjF9VDRm9GoVOy9AGp3aIvkjv+Kvz9h16QR3uSVYH78PNQUnT2U4X53mhlnV2M7wrhibQ3GHicDmg==
-
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -8274,40 +7584,11 @@ no-case@^3.0.4:
     lower-case "^2.0.2"
     tslib "^2.0.3"
 
-node-abi@^3.3.0:
-  version "3.52.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.52.0.tgz#ffba0a85f54e552547e5849015f40f9514d5ba7c"
-  integrity sha512-JJ98b02z16ILv7859irtXn4oUaFWADtvkzy2c0IAatNVX2Mc9Yoh8z6hZInn3QwvMEYhHuQloYi+TTQy67SIdQ==
-  dependencies:
-    semver "^7.3.5"
-
-node-addon-api@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-6.1.0.tgz#ac8470034e58e67d0c6f1204a18ae6995d9c0d76"
-  integrity sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==
-
-node-addon-api@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.0.0.tgz#8136add2f510997b3b94814f4af1cce0b0e3962e"
-  integrity sha512-vgbBJTS4m5/KkE16t5Ly0WW9hz46swAstv0hYYwMtbG7AznRhNyfLRe8HZAiWIpcHzoO7HxhLuBQj9rJ/Ho0ZA==
-
 node-domexception@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5"
   integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==
 
-node-fetch-native@^1.2.0, node-fetch-native@^1.4.0, node-fetch-native@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/node-fetch-native/-/node-fetch-native-1.4.1.tgz#5a336e55b4e1b1e72b9927da09fecd2b374c9be5"
-  integrity sha512-NsXBU0UgBxo2rQLOeWNZqS3fvflWePMECr8CoSWoSTqCqGbVVsvl9vZu1HfQicYN0g5piV9Gh8RTEvo/uP752w==
-
-node-fetch@^2.0.0, node-fetch@^2.6.6:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
-  integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
-  dependencies:
-    whatwg-url "^5.0.0"
-
 node-fetch@^3.2.8:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.3.2.tgz#d1e889bacdf733b4ff3b2b243eb7a12866a0b78b"
@@ -8317,11 +7598,6 @@ node-fetch@^3.2.8:
     fetch-blob "^3.1.4"
     formdata-polyfill "^4.0.10"
 
-node-forge@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
-  integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
-
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
@@ -8337,11 +7613,6 @@ node-releases@^2.0.14:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
   integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
 
-node-stream-zip@^1.15.0:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/node-stream-zip/-/node-stream-zip-1.15.0.tgz#158adb88ed8004c6c49a396b50a6a5de3bca33ea"
-  integrity sha512-LN4fydt9TqhZhThkZIVQnF9cwjU3qmUH9h78Mx/K7d3VvfRqqwthLwJEUOEL0QPZ0XQmNN7be5Ggit5+4dq3Bw==
-
 normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -8362,7 +7633,7 @@ normalize-package-data@^3.0.2:
     semver "^7.3.4"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^3.0.0, normalize-path@~3.0.0:
+normalize-path@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
@@ -8484,15 +7755,6 @@ object.values@^1.1.6, object.values@^1.1.7:
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
-ofetch@^1.1.1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/ofetch/-/ofetch-1.3.3.tgz#588cb806a28e5c66c2c47dd8994f9059a036d8c0"
-  integrity sha512-s1ZCMmQWXy4b5K/TW9i/DtiN8Ku+xCiHcjQ6/J/nDdssirrQNOoB165Zu8EqLMA2lln1JUth9a0aW9Ap2ctrUg==
-  dependencies:
-    destr "^2.0.1"
-    node-fetch-native "^1.4.0"
-    ufo "^1.3.0"
-
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -8531,11 +7793,6 @@ ospath@^1.2.2:
   resolved "https://registry.yarnpkg.com/ospath/-/ospath-1.2.2.tgz#1276639774a3f8ef2572f7fe4280e0ea4550c07b"
   integrity sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==
 
-outdent@^0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/outdent/-/outdent-0.8.0.tgz#2ebc3e77bf49912543f1008100ff8e7f44428eb0"
-  integrity sha512-KiOAIsdpUTcAXuykya5fnVVT+/5uS0Q1mrkRHcF89tpieSmY33O/tmc54CqwA+bfhbtEfZUNLHaPUiB9X3jt1A==
-
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
@@ -8678,16 +7935,6 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
-pathe@^0.3.0:
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/pathe/-/pathe-0.3.9.tgz#4baff768f37f03e3d9341502865fb93116f65191"
-  integrity sha512-6Y6s0vT112P3jD8dGfuS6r+lpa0qqNrLyHPOwvXMnyNTQaYiwgau2DP3aNDsR13xqtGj7rrPo+jFUATpU6/s+g==
-
-pathe@^1.1.0, pathe@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.1.1.tgz#1dd31d382b974ba69809adc9a7a347e65d84829a"
-  integrity sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==
-
 pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
@@ -8703,7 +7950,7 @@ picocolors@^1.0.0:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1:
+picomatch@^2.0.4, picomatch@^2.2.3, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -8745,15 +7992,6 @@ pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
-pkg-types@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-1.0.3.tgz#988b42ab19254c01614d13f4f65a2cfc7880f868"
-  integrity sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==
-  dependencies:
-    jsonc-parser "^3.2.0"
-    mlly "^1.2.0"
-    pathe "^1.1.0"
-
 possible-typed-array-names@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f"
@@ -9337,24 +8575,6 @@ postcss@^8.4.31:
     picocolors "^1.0.0"
     source-map-js "^1.2.0"
 
-prebuild-install@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.1.tgz#de97d5b34a70a0c81334fd24641f2a1702352e45"
-  integrity sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==
-  dependencies:
-    detect-libc "^2.0.0"
-    expand-template "^2.0.3"
-    github-from-package "0.0.0"
-    minimist "^1.2.3"
-    mkdirp-classic "^0.5.3"
-    napi-build-utils "^1.0.1"
-    node-abi "^3.3.0"
-    pump "^3.0.0"
-    rc "^1.2.7"
-    simple-get "^4.0.0"
-    tar-fs "^2.0.0"
-    tunnel-agent "^0.6.0"
-
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@@ -9470,11 +8690,6 @@ queue-microtask@^1.2.2:
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
-queue-tick@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/queue-tick/-/queue-tick-1.0.1.tgz#f6f07ac82c1fd60f82e098b417a80e52f1f4c142"
-  integrity sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==
-
 quick-lru@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
@@ -9485,11 +8700,6 @@ quick-lru@^5.1.1:
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
   integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
 
-radix3@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/radix3/-/radix3-1.1.0.tgz#9745df67a49c522e94a33d0a93cf743f104b6e0d"
-  integrity sha512-pNsHDxbGORSvuSScqNJ+3Km6QAVqk8CfsCBIEoDgpqLrkD2f3QM4I7d1ozJJ172OmIcoUcerZaNWqtLkRXTV3A==
-
 raf-schd@^4.0.2:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/raf-schd/-/raf-schd-4.0.3.tgz#5d6c34ef46f8b2a0e880a8fcdb743efc5bfdbc1a"
@@ -9502,16 +8712,6 @@ randombytes@^2.1.0:
   dependencies:
     safe-buffer "^5.1.0"
 
-rc@^1.2.7:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
-  dependencies:
-    deep-extend "^0.6.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
 react-basics@^0.123.0:
   version "0.123.0"
   resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.123.0.tgz#8b18c1c1a235858dd0d1e329d5b1c3ac9ab48df3"
@@ -9693,22 +8893,6 @@ read-pkg@^6.0.0:
     parse-json "^5.2.0"
     type-fest "^1.0.1"
 
-readable-stream@^3.1.1, readable-stream@^3.4.0:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
-  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-readdirp@~3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
-  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
-  dependencies:
-    picomatch "^2.2.1"
-
 redent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
@@ -9725,18 +8909,6 @@ redent@^4.0.0:
     indent-string "^5.0.0"
     strip-indent "^4.0.0"
 
-redis-errors@^1.0.0, redis-errors@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/redis-errors/-/redis-errors-1.2.0.tgz#eb62d2adb15e4eaf4610c04afe1529384250abad"
-  integrity sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==
-
-redis-parser@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-3.0.0.tgz#b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"
-  integrity sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==
-  dependencies:
-    redis-errors "^1.0.0"
-
 redis@^4.5.1:
   version "4.6.10"
   resolved "https://registry.yarnpkg.com/redis/-/redis-4.6.10.tgz#07f6ea2b2c5455b098e76d1e8c9b3376114e9458"
@@ -9793,11 +8965,6 @@ regenerator-transform@^0.15.2:
   dependencies:
     "@babel/runtime" "^7.8.4"
 
-regexp-tree@^0.1.24:
-  version "0.1.27"
-  resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.27.tgz#2198f0ef54518ffa743fe74d983b56ffd631b6cd"
-  integrity sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==
-
 regexp.prototype.flags@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334"
@@ -10052,7 +9219,7 @@ safe-array-concat@^1.1.2:
     has-symbols "^1.0.3"
     isarray "^2.0.5"
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
+safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -10119,13 +9286,6 @@ semver@^7.3.4, semver@^7.3.7, semver@^7.5.3, semver@^7.5.4:
   dependencies:
     lru-cache "^6.0.0"
 
-semver@^7.3.5:
-  version "7.5.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
-  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
-  dependencies:
-    lru-cache "^6.0.0"
-
 serialize-javascript@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
@@ -10155,20 +9315,6 @@ set-function-name@^2.0.1, set-function-name@^2.0.2:
     functions-have-names "^1.2.3"
     has-property-descriptors "^1.0.2"
 
-sharp@^0.32.6:
-  version "0.32.6"
-  resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.32.6.tgz#6ad30c0b7cd910df65d5f355f774aa4fce45732a"
-  integrity sha512-KyLTWwgcR9Oe4d9HwCwNM2l7+J0dUQwn/yf7S0EnTtb0eVS4RxO0eUSvxPtzT4F3SY+C4K6fqdv/DO27sJ/v/w==
-  dependencies:
-    color "^4.2.3"
-    detect-libc "^2.0.2"
-    node-addon-api "^6.1.0"
-    prebuild-install "^7.1.1"
-    semver "^7.5.4"
-    simple-get "^4.0.1"
-    tar-fs "^3.0.4"
-    tunnel-agent "^0.6.0"
-
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -10218,27 +9364,6 @@ signal-exit@^4.0.1:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
   integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
 
-simple-concat@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f"
-  integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==
-
-simple-get@^4.0.0, simple-get@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543"
-  integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==
-  dependencies:
-    decompress-response "^6.0.0"
-    once "^1.3.1"
-    simple-concat "^1.0.0"
-
-simple-swizzle@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
-  integrity sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==
-  dependencies:
-    is-arrayish "^0.3.1"
-
 sisteransi@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
@@ -10384,29 +9509,11 @@ stack-utils@^2.0.3:
   dependencies:
     escape-string-regexp "^2.0.0"
 
-standard-as-callback@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/standard-as-callback/-/standard-as-callback-2.1.0.tgz#8953fc05359868a77b5b9739a665c5977bb7df45"
-  integrity sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==
-
-std-env@^3.4.3:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.6.0.tgz#94807562bddc68fa90f2e02c5fd5b6865bb4e98e"
-  integrity sha512-aFZ19IgVmhdB2uX599ve2kE6BIE3YMnQ6Gp6BURhW/oIzpXGKr878TQfAQZn1+i0Flcc/UKUy1gOlcfaUBCryg==
-
 streamsearch@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764"
   integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==
 
-streamx@^2.15.0:
-  version "2.15.6"
-  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.15.6.tgz#28bf36997ebc7bf6c08f9eba958735231b833887"
-  integrity sha512-q+vQL4AAz+FdfT137VF69Cc/APqUbxy+MDOImRrMvchJpigHj9GksgDU2LYbO9rx7RX6osWgxJB2WxhYv4SZAw==
-  dependencies:
-    fast-fifo "^1.1.0"
-    queue-tick "^1.0.1"
-
 string-argv@0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6"
@@ -10425,16 +9532,7 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -10507,21 +9605,7 @@ string.prototype.trimstart@^1.0.8:
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -10574,11 +9658,6 @@ strip-json-comments@^3.1.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==
-
 style-inject@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/style-inject/-/style-inject-0.3.0.tgz#d21c477affec91811cc82355832a700d22bf8dd3"
@@ -10763,45 +9842,6 @@ tapable@^2.2.0:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
-tar-fs@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
-  integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
-  dependencies:
-    chownr "^1.1.1"
-    mkdirp-classic "^0.5.2"
-    pump "^3.0.0"
-    tar-stream "^2.1.4"
-
-tar-fs@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-3.0.4.tgz#a21dc60a2d5d9f55e0089ccd78124f1d3771dbbf"
-  integrity sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==
-  dependencies:
-    mkdirp-classic "^0.5.2"
-    pump "^3.0.0"
-    tar-stream "^3.1.5"
-
-tar-stream@^2.1.4:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
-  integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
-  dependencies:
-    bl "^4.0.3"
-    end-of-stream "^1.4.1"
-    fs-constants "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^3.1.1"
-
-tar-stream@^3.1.5:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-3.1.6.tgz#6520607b55a06f4a2e2e04db360ba7d338cc5bab"
-  integrity sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==
-  dependencies:
-    b4a "^1.6.4"
-    fast-fifo "^1.2.0"
-    streamx "^2.15.0"
-
 tar@^6.1.2:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
@@ -10853,14 +9893,6 @@ through@^2.3.8:
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
 
-tiny-glob@^0.2.9:
-  version "0.2.9"
-  resolved "https://registry.yarnpkg.com/tiny-glob/-/tiny-glob-0.2.9.tgz#2212d441ac17928033b110f8b3640683129d31e2"
-  integrity sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==
-  dependencies:
-    globalyzer "0.1.0"
-    globrex "^0.1.2"
-
 tiny-invariant@^1.0.6:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.1.tgz#8560808c916ef02ecfd55e66090df23a4b7aa642"
@@ -10915,11 +9947,6 @@ tough-cookie@^4.1.3:
     universalify "^0.2.0"
     url-parse "^1.5.3"
 
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
-
 trim-newlines@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
@@ -11110,11 +10137,6 @@ typescript@^5.4.3:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.4.tgz#eb2471e7b0a5f1377523700a21669dce30c2d952"
   integrity sha512-dGE2Vv8cpVvw28v8HCPqyb08EzbBURxDpuhJvTrusShUfGnhHBafDsLdS1EhhxyL6BJQE+2cT3dDPAv+MQ6oLw==
 
-ufo@^1.0.0, ufo@^1.2.0, ufo@^1.3.0, ufo@^1.3.1, ufo@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.3.2.tgz#c7d719d0628a1c80c006d2240e0d169f6e3c0496"
-  integrity sha512-o+ORpgGwaYQXgqGDwd+hkS4PuZ3QnmqMMxRuajK/a38L6fTpcE5GPIfrf+L/KemFzfUpeUQc1rRS1iDBozvnFA==
-
 unbox-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
@@ -11125,27 +10147,11 @@ unbox-primitive@^1.0.2:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
-uncrypto@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/uncrypto/-/uncrypto-0.1.3.tgz#e1288d609226f2d02d8d69ee861fa20d8348ef2b"
-  integrity sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==
-
 undici-types@~5.26.4:
   version "5.26.5"
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
   integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
 
-unenv@^1.7.4:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/unenv/-/unenv-1.8.0.tgz#0f860d5278405700bd95d47b23bc01f3a735d68c"
-  integrity sha512-uIGbdCWZfhRRmyKj1UioCepQ0jpq638j/Cf0xFTn4zD1nGJ2lSdzYHLzfdXN791oo/0juUiSWW1fBklXMTsuqg==
-  dependencies:
-    consola "^3.2.3"
-    defu "^6.1.3"
-    mime "^3.0.0"
-    node-fetch-native "^1.4.1"
-    pathe "^1.1.1"
-
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
@@ -11184,37 +10190,11 @@ universalify@^2.0.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
   integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==
 
-unstorage@1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/unstorage/-/unstorage-1.9.0.tgz#0c1977f4e769a48344339ac97ec3f2feea94d43d"
-  integrity sha512-VpD8ZEYc/le8DZCrny3bnqKE4ZjioQxBRnWE+j5sGNvziPjeDlaS1NaFFHzl/kkXaO3r7UaF8MGQrs14+1B4pQ==
-  dependencies:
-    anymatch "^3.1.3"
-    chokidar "^3.5.3"
-    destr "^2.0.1"
-    h3 "^1.7.1"
-    ioredis "^5.3.2"
-    listhen "^1.2.2"
-    lru-cache "^10.0.0"
-    mri "^1.2.0"
-    node-fetch-native "^1.2.0"
-    ofetch "^1.1.1"
-    ufo "^1.2.0"
-
 untildify@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
   integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==
 
-untun@^0.1.2:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/untun/-/untun-0.1.3.tgz#5d10dee37a3a5737ff03d158be877dae0a0e58a6"
-  integrity sha512-4luGP9LMYszMRZwsvyUd9MrxgEGZdZuZgpVQHEEX0lCYFESasVRvZd0EYpCkOIbJKHMuv0LskpXc/8Un+MJzEQ==
-  dependencies:
-    citty "^0.1.5"
-    consola "^3.2.3"
-    pathe "^1.1.1"
-
 update-browserslist-db@^1.0.13:
   version "1.0.13"
   resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
@@ -11223,11 +10203,6 @@ update-browserslist-db@^1.0.13:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
-uqr@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/uqr/-/uqr-0.1.2.tgz#5c6cd5dcff9581f9bb35b982cb89e2c483a41d7d"
-  integrity sha512-MJu7ypHq6QasgF5YRTjqscSzQp/W11zoUk6kvmlH+fmWEs63Y0Eib13hYFwAzagRJcVY8WVnlV+eBDUGMJ5IbA==
-
 uri-js@^4.2.2:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
@@ -11243,11 +10218,6 @@ url-parse@^1.5.3:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
 
-urlpattern-polyfill@8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/urlpattern-polyfill/-/urlpattern-polyfill-8.0.2.tgz#99f096e35eff8bf4b5a2aa7d58a1523d6ebc7ce5"
-  integrity sha512-Qp95D4TPJl1kC9SKigDcqgyM2VDVO4RiJc2d4qe5GrYm+zbIQCWWKAFaJNQ4BhdFeDGwBmAxqJBwWSJDb9T3BQ==
-
 use-memo-one@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/use-memo-one/-/use-memo-one-1.1.3.tgz#2fd2e43a2169eabc7496960ace8c79efef975e99"
@@ -11258,7 +10228,7 @@ use-sync-external-store@1.2.0:
   resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a"
   integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==
 
-util-deprecate@^1.0.1, util-deprecate@^1.0.2:
+util-deprecate@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
@@ -11332,19 +10302,6 @@ web-streams-polyfill@^3.0.3:
   resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz#71c2718c52b45fd49dbeee88634b3a60ceab42a6"
   integrity sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==
 
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
-
-whatwg-url@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
-
 which-boxed-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
@@ -11409,7 +10366,7 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -11427,15 +10384,6 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
@@ -11488,14 +10436,6 @@ write-json-file@^4.3.0:
     sort-keys "^4.0.0"
     write-file-atomic "^3.0.0"
 
-xss@^1.0.14:
-  version "1.0.14"
-  resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.14.tgz#4f3efbde75ad0d82e9921cc3c95e6590dd336694"
-  integrity sha512-og7TEJhXvn1a7kzZGQ7ETjdQVS2UfZyTlsEdDOqvQF7GoxNfY+0YLCzBy1kPdsDDx4QuNAonQPddpsn6Xl/7sw==
-  dependencies:
-    commander "^2.20.3"
-    cssfilter "0.0.10"
-
 y18n@^5.0.5:
   version "5.0.8"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"

From 32cfb74c4985ebaa81643c6d7b9949657b9e0dc3 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Wed, 17 Apr 2024 00:10:02 -0700
Subject: [PATCH 014/438] Updated check-env script.

---
 scripts/check-env.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/scripts/check-env.js b/scripts/check-env.js
index a68fd822ad..db39bb79d5 100644
--- a/scripts/check-env.js
+++ b/scripts/check-env.js
@@ -23,13 +23,9 @@ if (!process.env.SKIP_DB_CHECK && !process.env.DATABASE_TYPE) {
 }
 
 if (process.env.CLICKHOUSE_URL) {
-  checkMissing(['CA_CERT', 'CLIENT_CERT', 'CLIENT_KEY', 'KAFKA_BROKER', 'KAFKA_URL', 'REDIS_URL']);
+  checkMissing(['KAFKA_BROKER', 'KAFKA_URL', 'REDIS_URL']);
 }
 
 if (process.env.CLOUD_MODE) {
   checkMissing(['CLOUD_URL']);
 }
-
-if (process.env.ENABLE_BLOCKER) {
-  checkMissing(['REDIS_URL']);
-}

From 7152b0b76dc98c7bf2c911ab90c7371a82137415 Mon Sep 17 00:00:00 2001
From: Giuseppe Pagano <giuseppe.pagano.p@gmail.com>
Date: Wed, 17 Apr 2024 22:41:14 +0200
Subject: [PATCH 015/438] feat: add host

---
 .../[websiteId]/WebsiteExpandedView.tsx       |  7 ++++
 .../websites/[websiteId]/WebsiteTableView.tsx |  4 ++-
 .../hooks/queries/useWebsitePageviews.ts      |  3 +-
 .../hooks/queries/useWebsiteStats.ts          |  3 +-
 src/components/hooks/useFields.ts             |  1 +
 src/components/messages.ts                    |  2 ++
 src/components/metrics/HostsTable.tsx         | 35 +++++++++++++++++++
 src/components/metrics/MetricsTable.tsx       |  3 +-
 src/lib/constants.ts                          |  4 ++-
 .../api/websites/[websiteId]/pageviews.ts     |  2 ++
 src/pages/api/websites/[websiteId]/stats.ts   |  2 ++
 11 files changed, 61 insertions(+), 5 deletions(-)
 create mode 100644 src/components/metrics/HostsTable.tsx

diff --git a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx
index ea037852e2..56197ea943 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx
@@ -9,6 +9,7 @@ import OSTable from 'components/metrics/OSTable';
 import PagesTable from 'components/metrics/PagesTable';
 import QueryParametersTable from 'components/metrics/QueryParametersTable';
 import ReferrersTable from 'components/metrics/ReferrersTable';
+import HostsTable from 'components/metrics/HostsTable';
 import ScreenTable from 'components/metrics/ScreenTable';
 import EventsTable from 'components/metrics/EventsTable';
 import SideNav from 'components/layout/SideNav';
@@ -20,6 +21,7 @@ const views = {
   url: PagesTable,
   title: PagesTable,
   referrer: ReferrersTable,
+  host: HostsTable,
   browser: BrowsersTable,
   os: OSTable,
   device: DevicesTable,
@@ -58,6 +60,11 @@ export default function WebsiteExpandedView({
       label: formatMessage(labels.referrers),
       url: renderUrl({ view: 'referrer' }),
     },
+    {
+      key: 'host',
+      label: formatMessage(labels.hosts),
+      url: renderUrl({ view: 'host' }),
+    },
     {
       key: 'browser',
       label: formatMessage(labels.browsers),
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx b/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx
index 7cc415e5cd..6825ed45cb 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx
@@ -2,6 +2,7 @@ import { useState } from 'react';
 import { Grid, GridRow } from 'components/layout/Grid';
 import PagesTable from 'components/metrics/PagesTable';
 import ReferrersTable from 'components/metrics/ReferrersTable';
+import HostsTable from 'components/metrics/HostsTable';
 import BrowsersTable from 'components/metrics/BrowsersTable';
 import OSTable from 'components/metrics/OSTable';
 import DevicesTable from 'components/metrics/DevicesTable';
@@ -26,9 +27,10 @@ export default function WebsiteTableView({
 
   return (
     <Grid>
-      <GridRow columns="two">
+      <GridRow columns="three">
         <PagesTable {...tableProps} />
         <ReferrersTable {...tableProps} />
+        <HostsTable {...tableProps} />
       </GridRow>
       <GridRow columns="three">
         <BrowsersTable {...tableProps} />
diff --git a/src/components/hooks/queries/useWebsitePageviews.ts b/src/components/hooks/queries/useWebsitePageviews.ts
index 2d6e3428be..7dd0565980 100644
--- a/src/components/hooks/queries/useWebsitePageviews.ts
+++ b/src/components/hooks/queries/useWebsitePageviews.ts
@@ -7,7 +7,7 @@ export function useWebsitePageviews(websiteId: string, options?: { [key: string]
   const { startDate, endDate, unit } = dateRange;
   const { timezone } = useTimezone();
   const {
-    query: { url, referrer, os, browser, device, country, region, city, title },
+    query: { url, referrer, host, os, browser, device, country, region, city, title },
   } = useNavigation();
 
   const params = {
@@ -17,6 +17,7 @@ export function useWebsitePageviews(websiteId: string, options?: { [key: string]
     timezone,
     url,
     referrer,
+    host,
     os,
     browser,
     device,
diff --git a/src/components/hooks/queries/useWebsiteStats.ts b/src/components/hooks/queries/useWebsiteStats.ts
index 2ada662f5e..a00b221dcc 100644
--- a/src/components/hooks/queries/useWebsiteStats.ts
+++ b/src/components/hooks/queries/useWebsiteStats.ts
@@ -5,7 +5,7 @@ export function useWebsiteStats(websiteId: string, options?: { [key: string]: st
   const [dateRange] = useDateRange(websiteId);
   const { startDate, endDate } = dateRange;
   const {
-    query: { url, referrer, title, os, browser, device, country, region, city },
+    query: { url, referrer, host, title, os, browser, device, country, region, city },
   } = useNavigation();
 
   const params = {
@@ -13,6 +13,7 @@ export function useWebsiteStats(websiteId: string, options?: { [key: string]: st
     endAt: +endDate,
     url,
     referrer,
+    host,
     title,
     os,
     browser,
diff --git a/src/components/hooks/useFields.ts b/src/components/hooks/useFields.ts
index 05d2b4588c..d08a234041 100644
--- a/src/components/hooks/useFields.ts
+++ b/src/components/hooks/useFields.ts
@@ -7,6 +7,7 @@ export function useFields() {
     { name: 'url', type: 'string', label: formatMessage(labels.url) },
     { name: 'title', type: 'string', label: formatMessage(labels.pageTitle) },
     { name: 'referrer', type: 'string', label: formatMessage(labels.referrer) },
+    { name: 'host', type: 'string', label: formatMessage(labels.host) },
     { name: 'query', type: 'string', label: formatMessage(labels.query) },
     { name: 'browser', type: 'string', label: formatMessage(labels.browser) },
     { name: 'os', type: 'string', label: formatMessage(labels.os) },
diff --git a/src/components/messages.ts b/src/components/messages.ts
index 79a6b92ca1..f31cd555b7 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -87,6 +87,7 @@ export const labels = defineMessages({
   refresh: { id: 'label.refresh', defaultMessage: 'Refresh' },
   pages: { id: 'label.pages', defaultMessage: 'Pages' },
   referrers: { id: 'label.referrers', defaultMessage: 'Referrers' },
+  hosts: { id: 'label.hosts', defaultMessage: 'Hosts' },
   screens: { id: 'label.screens', defaultMessage: 'Screens' },
   browsers: { id: 'label.browsers', defaultMessage: 'Browsers' },
   os: { id: 'label.os', defaultMessage: 'OS' },
@@ -196,6 +197,7 @@ export const labels = defineMessages({
   },
   dropoff: { id: 'label.dropoff', defaultMessage: 'Dropoff' },
   referrer: { id: 'label.referrer', defaultMessage: 'Referrer' },
+  host: { id: 'label.host', defaultMessage: 'Host' },
   country: { id: 'label.country', defaultMessage: 'Country' },
   region: { id: 'label.region', defaultMessage: 'Region' },
   city: { id: 'label.city', defaultMessage: 'City' },
diff --git a/src/components/metrics/HostsTable.tsx b/src/components/metrics/HostsTable.tsx
new file mode 100644
index 0000000000..d3a0f3bf39
--- /dev/null
+++ b/src/components/metrics/HostsTable.tsx
@@ -0,0 +1,35 @@
+import MetricsTable, { MetricsTableProps } from './MetricsTable';
+import FilterLink from 'components/common/FilterLink';
+import { useMessages } from 'components/hooks';
+import { Flexbox } from 'react-basics';
+
+export function HostsTable(props: MetricsTableProps) {
+  const { formatMessage, labels } = useMessages();
+
+  const renderLink = ({ x: host }) => {
+    return (
+      <Flexbox alignItems="center">
+        <FilterLink
+          id="host"
+          value={host}
+          externalUrl={`https://${host}`}
+          label={!host && formatMessage(labels.none)}
+        />
+      </Flexbox>
+    );
+  };
+
+  return (
+    <>
+      <MetricsTable
+        {...props}
+        title={formatMessage(labels.hosts)}
+        type="host"
+        metric={formatMessage(labels.views)}
+        renderLabel={renderLink}
+      />
+    </>
+  );
+}
+
+export default HostsTable;
diff --git a/src/components/metrics/MetricsTable.tsx b/src/components/metrics/MetricsTable.tsx
index 26355018ff..288835285b 100644
--- a/src/components/metrics/MetricsTable.tsx
+++ b/src/components/metrics/MetricsTable.tsx
@@ -48,7 +48,7 @@ export function MetricsTable({
   const [{ startDate, endDate }] = useDateRange(websiteId);
   const {
     renderUrl,
-    query: { url, referrer, title, os, browser, device, country, region, city },
+    query: { url, referrer, host, title, os, browser, device, country, region, city },
   } = useNavigation();
   const { formatMessage, labels } = useMessages();
   const { dir } = useLocale();
@@ -61,6 +61,7 @@ export function MetricsTable({
       endAt: +endDate,
       url,
       referrer,
+      host,
       os,
       title,
       browser,
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 66e17dfbe0..7d47e0c2df 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -31,7 +31,7 @@ export const FILTER_RANGE = 'filter-range';
 export const FILTER_REFERRERS = 'filter-referrers';
 export const FILTER_PAGES = 'filter-pages';
 export const UNIT_TYPES = ['year', 'month', 'hour', 'day'];
-export const EVENT_COLUMNS = ['url', 'referrer', 'title', 'query', 'event'];
+export const EVENT_COLUMNS = ['url', 'referrer', 'title', 'query', 'event', 'host'];
 
 export const SESSION_COLUMNS = [
   'browser',
@@ -42,11 +42,13 @@ export const SESSION_COLUMNS = [
   'country',
   'region',
   'city',
+  'host',
 ];
 
 export const FILTER_COLUMNS = {
   url: 'url_path',
   referrer: 'referrer_domain',
+  host: 'hostname',
   title: 'page_title',
   query: 'url_query',
   os: 'os',
diff --git a/src/pages/api/websites/[websiteId]/pageviews.ts b/src/pages/api/websites/[websiteId]/pageviews.ts
index 1967106431..c1c081748e 100644
--- a/src/pages/api/websites/[websiteId]/pageviews.ts
+++ b/src/pages/api/websites/[websiteId]/pageviews.ts
@@ -14,6 +14,7 @@ export interface WebsitePageviewRequestQuery {
   timezone?: string;
   url?: string;
   referrer?: string;
+  host?: string;
   title?: string;
   os?: string;
   browser?: string;
@@ -34,6 +35,7 @@ const schema = {
     timezone: TimezoneTest,
     url: yup.string(),
     referrer: yup.string(),
+    host: yup.string(),
     title: yup.string(),
     os: yup.string(),
     browser: yup.string(),
diff --git a/src/pages/api/websites/[websiteId]/stats.ts b/src/pages/api/websites/[websiteId]/stats.ts
index 81a6d83547..3d15e4384a 100644
--- a/src/pages/api/websites/[websiteId]/stats.ts
+++ b/src/pages/api/websites/[websiteId]/stats.ts
@@ -13,6 +13,7 @@ export interface WebsiteStatsRequestQuery {
   endAt: number;
   url?: string;
   referrer?: string;
+  host?: string;
   title?: string;
   query?: string;
   event?: string;
@@ -32,6 +33,7 @@ const schema = {
     endAt: yup.number().required(),
     url: yup.string(),
     referrer: yup.string(),
+    host: yup.string(),
     title: yup.string(),
     query: yup.string(),
     event: yup.string(),

From 4ca4be4445b5b42f2585d3e84fcd67eebac35f7a Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 18 Apr 2024 14:23:14 -0700
Subject: [PATCH 016/438] Added types for session data.

---
 package.json          |  2 +-
 src/lib/detect.ts     |  2 +-
 src/lib/middleware.ts |  4 ++--
 src/lib/session.ts    | 22 ++++------------------
 src/lib/types.ts      | 17 +++++++++++++++++
 5 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index ad2bc79d26..c72a054f74 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "2.11.2",
+  "version": "2.12.0",
   "description": "A simple, fast, privacy-focused alternative to Google Analytics.",
   "author": "Umami Software, Inc. <hello@umami.is>",
   "license": "MIT",
diff --git a/src/lib/detect.ts b/src/lib/detect.ts
index 25dee386bd..64f70e6ca5 100644
--- a/src/lib/detect.ts
+++ b/src/lib/detect.ts
@@ -132,7 +132,7 @@ export async function getClientInfo(req: NextApiRequestCollect) {
   const subdivision2 = location?.subdivision2;
   const city = location?.city;
   const browser = browserName(userAgent);
-  const os = detectOS(userAgent);
+  const os = detectOS(userAgent) as string;
   const device = getDevice(req.body?.payload?.screen, os);
 
   return { userAgent, browser, os, ip, country, subdivision1, subdivision2, city, device };
diff --git a/src/lib/middleware.ts b/src/lib/middleware.ts
index 6885de908f..8145ac1167 100644
--- a/src/lib/middleware.ts
+++ b/src/lib/middleware.ts
@@ -4,7 +4,7 @@ import redis from '@umami/redis-client';
 import { getAuthToken, parseShareToken } from 'lib/auth';
 import { ROLES } from 'lib/constants';
 import { secret } from 'lib/crypto';
-import { findSession } from 'lib/session';
+import { getSession } from 'lib/session';
 import {
   badRequest,
   createMiddleware,
@@ -27,7 +27,7 @@ export const useCors = createMiddleware(
 
 export const useSession = createMiddleware(async (req, res, next) => {
   try {
-    const session = await findSession(req as NextApiRequestCollect);
+    const session = await getSession(req as NextApiRequestCollect);
 
     if (!session) {
       log('useSession: Session not found');
diff --git a/src/lib/session.ts b/src/lib/session.ts
index 5f3020e17c..1f87ffcce8 100644
--- a/src/lib/session.ts
+++ b/src/lib/session.ts
@@ -6,23 +6,9 @@ import { createSession } from 'queries';
 import cache from './cache';
 import clickhouse from './clickhouse';
 import { loadSession, loadWebsite } from './load';
+import { SessionData } from 'lib/types';
 
-export async function findSession(req: NextApiRequestCollect): Promise<{
-  id: any;
-  websiteId: string;
-  visitId: string;
-  hostname: string;
-  browser: string;
-  os: any;
-  device: string;
-  screen: string;
-  language: string;
-  country: any;
-  subdivision1: any;
-  subdivision2: any;
-  city: any;
-  ownerId: string;
-}> {
+export async function getSession(req: NextApiRequestCollect): Promise<SessionData> {
   const { payload } = req.body;
 
   if (!payload) {
@@ -35,6 +21,7 @@ export async function findSession(req: NextApiRequestCollect): Promise<{
   if (cacheToken) {
     const result = await parseToken(cacheToken, secret());
 
+    // Token is valid
     if (result) {
       await checkUserBlock(result?.ownerId);
 
@@ -45,7 +32,6 @@ export async function findSession(req: NextApiRequestCollect): Promise<{
   // Verify payload
   const { website: websiteId, hostname, screen, language } = payload;
 
-  // Check the hostname value for legality to eliminate dirty data
   const validHostnameRegex = /^[\w-.]+$/;
   if (!validHostnameRegex.test(hostname)) {
     throw new Error('Invalid hostname.');
@@ -78,7 +64,7 @@ export async function findSession(req: NextApiRequestCollect): Promise<{
       visitId,
       hostname,
       browser,
-      os: os as any,
+      os,
       device,
       screen,
       language,
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 5c9a39c6e7..27db220f0c 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -230,3 +230,20 @@ export interface RealtimeData {
   countries?: any[];
   visitors?: any[];
 }
+
+export interface SessionData {
+  id: string;
+  websiteId: string;
+  visitId: string;
+  hostname: string;
+  browser: string;
+  os: string;
+  device: string;
+  screen: string;
+  language: string;
+  country: string;
+  subdivision1: string;
+  subdivision2: string;
+  city: string;
+  ownerId: string;
+}

From 81283ee9e4b072cc2b3644420b664ad0cc15acad Mon Sep 17 00:00:00 2001
From: Celil6p <vublayancanavar@gmail.com>
Date: Sat, 20 Apr 2024 22:30:40 +0300
Subject: [PATCH 017/438] Turkish language updated

---
 src/lang/tr-TR.json | 308 ++++++++++++++++++++++----------------------
 1 file changed, 154 insertions(+), 154 deletions(-)

diff --git a/src/lang/tr-TR.json b/src/lang/tr-TR.json
index cb8ef1fa6b..d4e46b634e 100644
--- a/src/lang/tr-TR.json
+++ b/src/lang/tr-TR.json
@@ -1,246 +1,246 @@
 {
-  "label.access-code": "Access code",
+  "label.access-code": "Erişim Kodu",
   "label.actions": "Hareketler",
-  "label.activity-log": "Activity log",
-  "label.add": "Add",
-  "label.add-description": "Add description",
-  "label.add-member": "Add member",
-  "label.add-step": "Add step",
+  "label.activity-log": "Aktivite Kaydı",
+  "label.add": "Ekle",
+  "label.add-description": "Açıklama ekle",
+  "label.add-member": "Üye ekle",
+  "label.add-step": "Adım ekle",
   "label.add-website": "Web sitesi ekle",
-  "label.admin": "Yönetici",
-  "label.after": "After",
+  "label.administrator": "Yönetici",
+  "label.after": "Sonra",
   "label.all": "Tümü",
-  "label.all-time": "All time",
-  "label.analytics": "Analytics",
-  "label.average": "Average",
+  "label.all-time": "Tüm zamanlar",
+  "label.analytics": "Analitik",
+  "label.average": "Ortalama",
   "label.average-visit-time": "Ortalama ziyaret süresi",
   "label.back": "Geri",
-  "label.before": "Before",
-  "label.bounce-rate": "Çıkma oranı",
-  "label.breakdown": "Breakdown",
-  "label.browser": "Browser",
+  "label.before": "Önce",
+  "label.bounce-rate": "Tek sayfa ziyaret oranı",
+  "label.breakdown": "Dağılım",
+  "label.browser": "Tarayıcı",
   "label.browsers": "Tarayıcılar",
   "label.cancel": "İptal",
   "label.change-password": "Şifre değiştir",
-  "label.cities": "Cities",
-  "label.city": "City",
-  "label.clear-all": "Clear all",
-  "label.confirm": "Confirm",
+  "label.cities": "Şehirler",
+  "label.city": "Şehir",
+  "label.clear-all": "Hepsini temizle",
+  "label.confirm": "Onayla",
   "label.confirm-password": "Parolayı onayla",
-  "label.contains": "Contains",
-  "label.continue": "Continue",
+  "label.contains": "İçeriği",
+  "label.continue": "Devam et",
   "label.countries": "Ülkeler",
-  "label.country": "Country",
-  "label.create": "Create",
-  "label.create-report": "Create report",
-  "label.create-team": "Create team",
-  "label.create-user": "Create user",
-  "label.created": "Created",
-  "label.created-by": "Created By",
+  "label.country": "Ülke",
+  "label.create": "Oluştur",
+  "label.create-report": "Rapor oluştur",
+  "label.create-team": "Takım oluştur",
+  "label.create-user": "Kullanıcı oluştur",
+  "label.created": "Oluşturuldu",
+  "label.created-by": "Tarafından oluşturldu",
   "label.current-password": "Mevcut parola",
   "label.custom-range": "Özelleştirilmiş aralık",
   "label.dashboard": "Kontrol Paneli",
-  "label.data": "Data",
-  "label.date": "Date",
+  "label.data": "Veri",
+  "label.date": "Tarih",
   "label.date-range": "Tarih aralığı",
-  "label.day": "Day",
+  "label.day": "Gün",
   "label.default-date-range": "Varsayılan tarih aralığı",
   "label.delete": "Sil",
-  "label.delete-report": "Delete report",
-  "label.delete-team": "Delete team",
-  "label.delete-user": "Delete user",
+  "label.delete-report": "Rapor sil",
+  "label.delete-team": "Takım sil",
+  "label.delete-user": "Kullanıcı sil",
   "label.delete-website": "Web sitesini sil",
-  "label.description": "Description",
+  "label.description": "Açıklama",
   "label.desktop": "Masaüstü",
-  "label.details": "Details",
-  "label.device": "Device",
+  "label.details": "Detaylar",
+  "label.device": "Cihaz",
   "label.devices": "Cihazlar",
   "label.dismiss": "Reddet",
-  "label.does-not-contain": "Does not contain",
+  "label.does-not-contain": "İçermez",
   "label.domain": "Alan adı",
-  "label.dropoff": "Dropoff",
+  "label.dropoff": "Bırakma",
   "label.edit": "Düzenle",
-  "label.edit-dashboard": "Edit dashboard",
-  "label.edit-member": "Edit member",
+  "label.edit-dashboard": "Kontrol panelini düzenle",
+  "label.edit-member": "Üyeyi düzenle",
   "label.enable-share-url": "Anonim paylaşım URL'i aktif",
-  "label.event": "Event",
-  "label.event-data": "Event data",
+  "label.event": "Olay",
+  "label.event-data": "Olay verisi",
   "label.events": "Olaylar",
-  "label.false": "False",
-  "label.field": "Field",
-  "label.fields": "Fields",
-  "label.filter": "Filter",
-  "label.filter-combined": "Birleşik",
-  "label.filter-raw": "Ham",
-  "label.filters": "Filters",
-  "label.funnel": "Funnel",
-  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
-  "label.greater-than": "Greater than",
-  "label.greater-than-equals": "Greater than or equals",
+  "label.false": "Yanlış",
+  "label.field": "Alan",
+  "label.fields": "Alanlar",
+  "label.filter": "Filtre",
+  "label.filter-combined": "Birleşik filtre",
+  "label.filter-raw": "Ham filtre",
+  "label.filters": "Filtreler",
+  "label.funnel": "Huni",
+  "label.funnel-description": "Kullanıcıların dönüşüm ve ayrılma oranlarını anlayın.",
+  "label.greater-than": "Büyüktür",
+  "label.greater-than-equals": "Büyük veya eşittir",
   "label.insights": "Insights",
-  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.insights-description": "Segmentleri ve filtreleri kullanarak verilerinizi derinlemesine inceleyin.",
   "label.is": "Is",
-  "label.is-not": "Is not",
-  "label.is-not-set": "Is not set",
-  "label.is-set": "Is set",
-  "label.join": "Join",
-  "label.join-team": "Join team",
-  "label.language": "Language",
-  "label.languages": "Languages",
+  "label.is-not": "Değil",
+  "label.is-not-set": "Ayarlanmamış",
+  "label.is-set": "Ayarlandı",
+  "label.join": "Katıl",
+  "label.join-team": "Takıma katıl",
+  "label.language": "Dil",
+  "label.languages": "Diller",
   "label.laptop": "Dizüstü",
   "label.last-days": "Son {x} gün",
   "label.last-hours": "Son {x} saat",
-  "label.last-months": "Last {x} months",
-  "label.leave": "Leave",
-  "label.leave-team": "Leave team",
-  "label.less-than": "Less than",
-  "label.less-than-equals": "Less than or equals",
+  "label.last-months": "Son {x} ay",
+  "label.leave": "Ayrıl",
+  "label.leave-team": "Takımdan Ayrıl",
+  "label.less-than": "Küçüktür",
+  "label.less-than-equals": "Küçük veya eşittir",
   "label.login": "Giriş Yap",
   "label.logout": "Çıkış Yap",
-  "label.manage": "Manage",
+  "label.manage": "Yönet",
   "label.max": "Max",
-  "label.member": "Member",
-  "label.members": "Members",
+  "label.member": "Üye",
+  "label.members": "Üyeler",
   "label.min": "Min",
   "label.mobile": "Mobil Cihaz",
   "label.more": "Detaylı göster",
-  "label.my-account": "My account",
-  "label.my-websites": "My websites",
+  "label.my-account": "Hesabım",
+  "label.my-websites": "Web sitelerim",
   "label.name": "İsim",
   "label.new-password": "Yeni parola",
-  "label.none": "None",
+  "label.none": "Yok",
   "label.number-of-records": "{x} {x, plural, one {record} other {records}}",
-  "label.ok": "OK",
+  "label.ok": "TAMAM",
   "label.os": "OS",
-  "label.overview": "Overview",
-  "label.owner": "Owner",
-  "label.page-of": "Page {current} of {total}",
+  "label.overview": "Genel bakış",
+  "label.owner": "Sahibi",
+  "label.page-of": "{total} sayfada {current} ",
   "label.page-views": "Sayfa görünümü",
-  "label.pageTitle": "Page title",
+  "label.pageTitle": "Sayfa başlığı",
   "label.pages": "Sayfalar",
   "label.password": "Parola",
   "label.powered-by": "Sağlayıcı: {name}",
   "label.profile": "Profil",
-  "label.queries": "Queries",
-  "label.query": "Query",
-  "label.query-parameters": "Query parameters",
+  "label.queries": "Sorgular",
+  "label.query": "Sorgu",
+  "label.query-parameters": "Sorgu parametreleri",
   "label.realtime": "Gerçek Zamanlı",
   "label.referrer": "Referrer",
   "label.referrers": "Yönlendirenler",
   "label.refresh": "Yenile",
-  "label.regenerate": "Regenerate",
-  "label.region": "Region",
-  "label.regions": "Regions",
-  "label.remove": "Remove",
-  "label.remove-member": "Remove member",
-  "label.reports": "Reports",
+  "label.regenerate": "Yeniden Oluştur",
+  "label.region": "Bölge",
+  "label.regions": "Bölgeler",
+  "label.remove": "Kaldır",
+  "label.remove-member": "Üyeyi kaldır",
+  "label.reports": "Raporlar",
   "label.required": "Zorunlu alan",
   "label.reset": "Sıfırla",
-  "label.reset-website": "Reset statistics",
-  "label.retention": "Retention",
-  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
-  "label.role": "Role",
-  "label.run-query": "Run query",
+  "label.reset-website": "İstatistikleri sıfırla",
+  "label.retention": "Geri dönüş",
+  "label.retention-description": "Kullanıcıların ne sıklıkla geri döndüğünü takip ederek web sitenizin kalıcılığını ölçün.",
+  "label.role": "Rol",
+  "label.run-query": "Sorgu çalıştır",
   "label.save": "Kaydet",
   "label.screens": "Ekranlar",
-  "label.search": "Search",
-  "label.select": "Select",
-  "label.select-date": "Select date",
-  "label.select-role": "Select role",
-  "label.select-website": "Select website",
+  "label.search": "Ara",
+  "label.select": "Seç",
+  "label.select-date": "Tarih seç",
+  "label.select-role": "Rol seç",
+  "label.select-website": "Web sitesi seç",
   "label.sessions": "Sessions",
   "label.settings": "Ayarlar",
   "label.share-url": "Paylaşım adresi",
   "label.single-day": "Tekil gün",
-  "label.steps": "Steps",
-  "label.sum": "Sum",
+  "label.steps": "Adımlar",
+  "label.sum": "Toplam",
   "label.tablet": "Tablet",
-  "label.team": "Team",
-  "label.team-id": "Team ID",
-  "label.team-member": "Team member",
-  "label.team-name": "Team name",
-  "label.team-owner": "Team owner",
-  "label.team-view-only": "Team view only",
-  "label.team-websites": "Team websites",
-  "label.teams": "Teams",
-  "label.theme": "Theme",
+  "label.team": "Takım",
+  "label.team-id": "Takım ID",
+  "label.team-member": "Takım üyesi",
+  "label.team-name": "Takım ismi",
+  "label.team-owner": "Takım sahibi",
+  "label.team-view-only": "Yalnızca ekip görünümü",
+  "label.team-websites": "Takım web siteleri",
+  "label.teams": "Takımlar",
+  "label.theme": "Tema",
   "label.this-month": "Bu ay",
   "label.this-week": "Bu hafta",
   "label.this-year": "Bu yıl",
   "label.timezone": "Zaman dilimi",
-  "label.title": "Title",
+  "label.title": "Başlık",
   "label.today": "Bugün",
-  "label.toggle-charts": "Toggle charts",
-  "label.total": "Total",
-  "label.total-records": "Total records",
+  "label.toggle-charts": "Grafikleri değiştir",
+  "label.total": "Toplam",
+  "label.total-records": "Toplam kayıt",
   "label.tracking-code": "İzleme kodu",
   "label.transfer": "Transfer",
-  "label.transfer-website": "Transfer website",
-  "label.true": "True",
-  "label.type": "Type",
-  "label.unique": "Unique",
+  "label.transfer-website": "Transfer web sitesi",
+  "label.true": "Doğru",
+  "label.type": "Tip",
+  "label.unique": "Benzersiz",
   "label.unique-visitors": "Tekil kullanıcı",
   "label.unknown": "Bilinmeyen",
-  "label.untitled": "Untitled",
-  "label.update": "Update",
+  "label.untitled": "İsimsiz",
+  "label.update": "Güncelle",
   "label.url": "URL",
   "label.urls": "URLs",
-  "label.user": "User",
+  "label.user": "Kullanıcı",
   "label.username": "Kullanıcı adı",
-  "label.users": "Users",
+  "label.users": "Kullanıcılar",
   "label.utm": "UTM",
-  "label.utm-description": "Track your campaigns through UTM parameters.",
-  "label.value": "Value",
-  "label.view": "View",
+  "label.utm-description": "Kampanyalarınızı UTM parametreleri aracılığıyla takip edin.",
+  "label.value": "Değer",
+  "label.view": "Görünüm",
   "label.view-details": "Detayı incele",
-  "label.view-only": "View only",
+  "label.view-only": "Sadece görünüm",
   "label.views": "Görüntüleme",
-  "label.views-per-visit": "Views per visit",
+  "label.views-per-visit": "Ziyaret başına görüntüleme",
   "label.visitors": "Ziyaretçi",
-  "label.visits": "Visits",
-  "label.website": "Website",
+  "label.visits": "Ziyaretler",
+  "label.website": "Web sitesi",
   "label.website-id": "Website ID",
   "label.websites": "Web siteleri",
-  "label.window": "Window",
-  "label.yesterday": "Yesterday",
-  "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
+  "label.window": "Pencere",
+  "label.yesterday": "Dün",
+  "message.action-confirmation": "Onaylamak için aşağıdaki kutuya {confirmation} yazın.",
   "message.active-users": "{x} aktif ziyaretçi",
   "message.confirm-delete": "{target} kaydını silmek istediğinizden emin misiniz?",
-  "message.confirm-leave": "Are you sure you want to leave {target}?",
-  "message.confirm-remove": "Are you sure you want to remove {target}?",
-  "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
-  "message.delete-team-warning": "Deleting a team will also delete all team websites.",
-  "message.delete-website-warning": "İlişkili tüm veriler de  silinecektir.",
+  "message.confirm-leave": "{target} kaydından ayrılmak istediğinizden emin misiniz?",
+  "message.confirm-remove": "{target} kaydını kaldırmak istediğinizden emin misiniz?",
+  "message.confirm-reset": "{target} istatistiklerini sıfırlamak istediğinizden emin misiniz?",
+  "message.delete-team-warning": "Bir takımı silmek tüm takım web sitelerini de silecektir.",
+  "message.delete-website-warning": "İlişkili tüm veriler de silinecektir.",
   "message.error": "Bir şeyler ters gitti!",
   "message.event-log": "{event} on {url}",
   "message.go-to-settings": "Ayarlara git",
   "message.incorrect-username-password": "Hatalı kullanıcı adı ya da parola.",
   "message.invalid-domain": "Geçersiz alan adı",
-  "message.min-password-length": "Minimum length of {n} characters",
-  "message.new-version-available": "A new version of Umami {version} is available!",
+  "message.min-password-length": "Minimum {n} karakter uzunluğu",
+  "message.new-version-available": "Yeni versiyon Umami {version} mevcut!",
   "message.no-data-available": "Henüz hiç veri yok.",
-  "message.no-event-data": "No event data is available.",
+  "message.no-event-data": "Hiçbir olay verisi mevcut değil.",
   "message.no-match-password": "Parolalar uyuşmuyor",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-teams": "You have not created any teams.",
-  "message.no-users": "There are no users.",
+  "message.no-results-found": "Hiçbir sonuç bulunamadı.",
+  "message.no-team-websites": "Bu takımın herhangi bir web sitesi yok.",
+  "message.no-teams": "Herhangi bir takım oluşturmadınız.",
+  "message.no-users": "Kullanıcı yok.",
   "message.no-websites-configured": "Henüz hiç web sitesi tanımlamadınız",
   "message.page-not-found": "Sayfa bulunamadı.",
-  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
-  "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
+  "message.reset-website": "Bu websitesini sıfılamak için aşağıdaki kutuya {confirmation} yazın.",
+  "message.reset-website-warning": "Bu web sitesi için tüm istatistikler silinecek, ancak izleme kodunuz bozulmadan kalacaktır.",
   "message.saved": "Başarıyla kaydedildi.",
   "message.share-url": "{target} için kullanılabilir anonim paylaşım adresidir.",
-  "message.team-already-member": "You are already a member of the team.",
-  "message.team-not-found": "Team not found.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
+  "message.team-already-member": "Zaten bu takımın üyesisiniz",
+  "message.team-not-found": "Takım bulunamadı",
+  "message.team-websites-info": "Web siteleri takımdaki herkes tarafından görüntülenebilir.",
   "message.tracking-code": "İzleme kodu",
-  "message.transfer-team-website-to-user": "Transfer this website to your account?",
-  "message.transfer-user-website-to-team": "Select the team to transfer this website to.",
-  "message.transfer-website": "Transfer website ownership to your account or another team.",
-  "message.triggered-event": "Triggered event",
-  "message.user-deleted": "User deleted.",
-  "message.viewed-page": "Viewed page",
+  "message.transfer-team-website-to-user": "Bu web sitesi hesbınıza aktarılsın mı?",
+  "message.transfer-user-website-to-team": "Bu web sitesinin aktarılacağı takımı seçin.",
+  "message.transfer-website": "Web sitesi sahipliğini hesabınıza veya başka bir takıma aktarın",
+  "message.triggered-event": "Tetiklenen olay",
+  "message.user-deleted": "Kullanıcı silindi.",
+  "message.viewed-page": "Görüntülenen sayfa",
   "message.visitor-log": "Yeni ziyaretçi: {country}, {os}, {device}, {browser}",
-  "message.visitors-dropped-off": "Visitors dropped off"
+  "message.visitors-dropped-off": "Bırakan ziyaretçiler"
 }

From 22ab8b8222625b7f13b8542495f51ed847504548 Mon Sep 17 00:00:00 2001
From: Rui Bin Choo <ruibinch@gmail.com>
Date: Sun, 21 Apr 2024 12:51:10 +0800
Subject: [PATCH 018/438] order event data in descending order by count

---
 src/queries/analytics/eventData/getEventDataEvents.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/queries/analytics/eventData/getEventDataEvents.ts b/src/queries/analytics/eventData/getEventDataEvents.ts
index f869deae49..76ad3fce85 100644
--- a/src/queries/analytics/eventData/getEventDataEvents.ts
+++ b/src/queries/analytics/eventData/getEventDataEvents.ts
@@ -33,7 +33,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
         and event_data.created_at between {{startDate}} and {{endDate}}
         and website_event.event_name = {{event}}
       group by website_event.event_name, event_data.data_key, event_data.data_type, event_data.string_value
-      order by 1 asc, 2 asc, 3 asc, 4 desc
+      order by 1 asc, 2 asc, 3 asc, 5 desc
       `,
       params,
     );
@@ -81,7 +81,7 @@ async function clickhouseQuery(
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
         and event_name = {event:String}
       group by data_key, data_type, string_value, event_name
-      order by 1 asc, 2 asc, 3 asc, 4 desc
+      order by 1 asc, 2 asc, 3 asc, 5 desc
       limit 500
       `,
       params,

From 5aa9b20ff72ed09993fdb06faadc53f596923d9f Mon Sep 17 00:00:00 2001
From: Sakib Hadziavdic <sakib@sake.ba>
Date: Mon, 22 Apr 2024 14:03:35 +0200
Subject: [PATCH 019/438] Add Bosnian language

---
 public/intl/country/bs-BA.json  |  251 +++++
 public/intl/language/bs-BA.json |  611 +++++++++++
 public/intl/messages/bs-BA.json | 1676 +++++++++++++++++++++++++++++++
 src/lang/bs-BA.json             |  246 +++++
 src/lib/lang.ts                 |    2 +
 5 files changed, 2786 insertions(+)
 create mode 100644 public/intl/country/bs-BA.json
 create mode 100644 public/intl/language/bs-BA.json
 create mode 100644 public/intl/messages/bs-BA.json
 create mode 100644 src/lang/bs-BA.json

diff --git a/public/intl/country/bs-BA.json b/public/intl/country/bs-BA.json
new file mode 100644
index 0000000000..068f7658df
--- /dev/null
+++ b/public/intl/country/bs-BA.json
@@ -0,0 +1,251 @@
+{
+  "AF": "Afganistan",
+  "AL": "Albanija",
+  "DZ": "Al\u017eir",
+  "VI": "Ameri\u010dka Djevi\u010danska ostrva",
+  "AS": "Ameri\u010dka Samoa",
+  "UM": "Ameri\u010dka Vanjska Ostrva",
+  "AD": "Andora",
+  "AO": "Angola",
+  "AI": "Angvila",
+  "AQ": "Antarktika",
+  "AG": "Antigva i Barbuda",
+  "AR": "Argentina",
+  "AM": "Armenija",
+  "AW": "Aruba",
+  "AU": "Australija",
+  "AT": "Austrija",
+  "AZ": "Azerbejd\u017ean",
+  "BS": "Bahami",
+  "BH": "Bahrein",
+  "BD": "Banglade\u0161",
+  "BB": "Barbados",
+  "BE": "Belgija",
+  "BZ": "Belize",
+  "BJ": "Benin",
+  "BM": "Bermuda",
+  "BY": "Bjelorusija",
+  "BW": "Bocvana",
+  "BO": "Bolivija",
+  "BA": "Bosna i Hercegovina",
+  "CX": "Bo\u017ei\u0107no ostrvo",
+  "BR": "Brazil",
+  "VG": "Britanska Djevi\u010danska ostrva",
+  "IO": "Britanska Teritorija u Indijskom Okeanu",
+  "BN": "Brunej",
+  "BG": "Bugarska",
+  "BF": "Burkina Faso",
+  "BI": "Burundi",
+  "BT": "Butan",
+  "CF": "Centralnoafri\u010dka Republika",
+  "ME": "Crna Gora",
+  "TD": "\u010cad",
+  "CZ": "\u010ce\u0161ka",
+  "CL": "\u010cile",
+  "DK": "Danska",
+  "CD": "Demokratska Republika Kongo",
+  "DM": "Dominika",
+  "DO": "Dominikanska Republika",
+  "DJ": "D\u017eibuti",
+  "EG": "Egipat",
+  "EC": "Ekvador",
+  "GQ": "Ekvatorijalna Gvineja",
+  "ER": "Eritreja",
+  "EE": "Estonija",
+  "SZ": "Esvatini",
+  "ET": "Etiopija",
+  "FO": "Farska ostrva",
+  "FJ": "Fid\u017ei",
+  "PH": "Filipini",
+  "FI": "Finska",
+  "FK": "Folklandska ostrva",
+  "FR": "Francuska",
+  "GF": "Francuska Gvajana",
+  "PF": "Francuska Polinezija",
+  "TF": "Francuske Ju\u017ene Teritorije",
+  "GA": "Gabon",
+  "GM": "Gambija",
+  "GH": "Gana",
+  "GG": "Gernzi",
+  "GI": "Gibraltar",
+  "GR": "Gr\u010dka",
+  "GD": "Grenada",
+  "GL": "Grenland",
+  "GE": "Gruzija",
+  "GU": "Guam",
+  "GP": "Gvadalupe",
+  "GY": "Gvajana",
+  "GT": "Gvatemala",
+  "GN": "Gvineja",
+  "GW": "Gvineja-Bisao",
+  "HT": "Haiti",
+  "HM": "Herd i arhipelag MekDonald",
+  "NL": "Holandija",
+  "HN": "Honduras",
+  "HK": "Hong Kong (SAR Kina)",
+  "HR": "Hrvatska",
+  "IN": "Indija",
+  "ID": "Indonezija",
+  "IQ": "Irak",
+  "IR": "Iran",
+  "IE": "Irska",
+  "IS": "Island",
+  "TL": "Isto\u010dni Timor",
+  "IT": "Italija",
+  "IL": "Izrael",
+  "JM": "Jamajka",
+  "JP": "Japan",
+  "YE": "Jemen",
+  "JE": "Jersey",
+  "JO": "Jordan",
+  "GS": "Ju\u017ena D\u017eord\u017eija i Ju\u017ena Sendvi\u010d ostrva",
+  "KR": "Ju\u017ena Koreja",
+  "SS": "Ju\u017eni Sudan",
+  "ZA": "Ju\u017enoafri\u010dka Republika",
+  "KY": "Kajmanska ostrva",
+  "KH": "Kambod\u017ea",
+  "CM": "Kamerun",
+  "CA": "Kanada",
+  "CV": "Kape Verde",
+  "BQ": "Karipska Holandija",
+  "QA": "Katar",
+  "KZ": "Kazahstan",
+  "KE": "Kenija",
+  "CN": "Kina",
+  "CY": "Kipar",
+  "KG": "Kirgistan",
+  "KI": "Kiribati",
+  "CC": "Kokosova (Keelingova) ostrva",
+  "CO": "Kolumbija",
+  "KM": "Komori",
+  "CG": "Kongo",
+  "CR": "Kostarika",
+  "CU": "Kuba",
+  "CK": "Kukova ostrva",
+  "CW": "Kurasao",
+  "KW": "Kuvajt",
+  "LA": "Laos",
+  "LV": "Latvija",
+  "LS": "Lesoto",
+  "LB": "Liban",
+  "LR": "Liberija",
+  "LY": "Libija",
+  "LI": "Lihten\u0161tajn",
+  "LT": "Litvanija",
+  "LU": "Luksemburg",
+  "MG": "Madagaskar",
+  "HU": "Ma\u0111arska",
+  "YT": "Majote",
+  "MO": "Makao (SAR Kina)",
+  "MW": "Malavi",
+  "MV": "Maldivi",
+  "MY": "Malezija",
+  "ML": "Mali",
+  "MT": "Malta",
+  "MA": "Maroko",
+  "MH": "Mar\u0161alova ostrva",
+  "MQ": "Martinik",
+  "MU": "Mauricijus",
+  "MR": "Mauritanija",
+  "MX": "Meksiko",
+  "FM": "Mikronezija",
+  "MM": "Mjanmar",
+  "MD": "Moldavija",
+  "MC": "Monako",
+  "MN": "Mongolija",
+  "MS": "Monserat",
+  "MZ": "Mozambik",
+  "NA": "Namibija",
+  "NR": "Nauru",
+  "NP": "Nepal",
+  "NE": "Niger",
+  "NG": "Nigerija",
+  "NI": "Nikaragva",
+  "NU": "Niue",
+  "NO": "Norve\u0161ka",
+  "NC": "Nova Kaledonija",
+  "NZ": "Novi Zeland",
+  "DE": "Njema\u010dka",
+  "CI": "Obala Slonova\u010de",
+  "AX": "Olandska ostrva",
+  "OM": "Oman",
+  "TC": "Ostrva Turks i Kaikos",
+  "WF": "Ostrva Valis i Futuna",
+  "BV": "Ostrvo Buve",
+  "IM": "Ostrvo Man",
+  "NF": "Ostrvo Norfolk",
+  "PK": "Pakistan",
+  "PW": "Palau",
+  "PS": "Palestinska Teritorija",
+  "PA": "Panama",
+  "PG": "Papua Nova Gvineja",
+  "PY": "Paragvaj",
+  "PE": "Peru",
+  "PN": "Pitkernska Ostrva",
+  "PL": "Poljska",
+  "PR": "Porto Riko",
+  "PT": "Portugal",
+  "RE": "Reunion",
+  "RW": "Ruanda",
+  "RO": "Rumunija",
+  "RU": "Rusija",
+  "SV": "Salvador",
+  "WS": "Samoa",
+  "SM": "San Marino",
+  "ST": "Sao Tome i Principe",
+  "SA": "Saudijska Arabija",
+  "SC": "Sej\u0161eli",
+  "SN": "Senegal",
+  "SL": "Sijera Leone",
+  "SG": "Singapur",
+  "SX": "Sint Marten",
+  "SY": "Sirija",
+  "US": "Sjedinjene Dr\u017eave",
+  "KP": "Sjeverna Koreja",
+  "MK": "Sjeverna Makedonija",
+  "MP": "Sjeverna Marijanska ostrva",
+  "SK": "Slova\u010dka",
+  "SI": "Slovenija",
+  "SB": "Solomonska Ostrva",
+  "SO": "Somalija",
+  "RS": "Srbija",
+  "SD": "Sudan",
+  "SR": "Surinam",
+  "SJ": "Svalbard i Jan Majen",
+  "SH": "Sveta Helena",
+  "LC": "Sveta Lucija",
+  "BL": "Sveti Bartolomej",
+  "KN": "Sveti Kits i Nevis",
+  "MF": "Sveti Martin",
+  "PM": "Sveti Petar i Mikelon",
+  "VC": "Sveti Vinsent i Grenadin",
+  "ES": "\u0160panija",
+  "LK": "\u0160ri Lanka",
+  "SE": "\u0160vedska",
+  "CH": "\u0160vicarska",
+  "TJ": "Tad\u017eikistan",
+  "TH": "Tajland",
+  "TW": "Tajvan",
+  "TZ": "Tanzanija",
+  "TG": "Togo",
+  "TK": "Tokelau",
+  "TO": "Tonga",
+  "TT": "Trinidad i Tobago",
+  "TN": "Tunis",
+  "TM": "Turkmenistan",
+  "TR": "Turska",
+  "TV": "Tuvalu",
+  "UG": "Uganda",
+  "AE": "Ujedinjeni Arapski Emirati",
+  "GB": "Ujedinjeno Kraljevstvo",
+  "UA": "Ukrajina",
+  "UY": "Urugvaj",
+  "UZ": "Uzbekistan",
+  "VU": "Vanuatu",
+  "VA": "Vatikan",
+  "VE": "Venecuela",
+  "VN": "Vijetnam",
+  "ZM": "Zambija",
+  "EH": "Zapadna Sahara",
+  "ZW": "Zimbabve"
+}
diff --git a/public/intl/language/bs-BA.json b/public/intl/language/bs-BA.json
new file mode 100644
index 0000000000..960e472225
--- /dev/null
+++ b/public/intl/language/bs-BA.json
@@ -0,0 +1,611 @@
+{
+  "ab": "abhazijski",
+  "ace": "a\u010dineski",
+  "ada": "adangmejski",
+  "ady": "adigejski",
+  "aa": "afarski",
+  "afh": "afrihili",
+  "af": "afrikanerski",
+  "agq": "aghem",
+  "ain": "ainu",
+  "ay": "ajmara",
+  "akk": "akadijski",
+  "ak": "akan",
+  "ach": "akoli",
+  "bss": "Akoose",
+  "akz": "Alabama",
+  "sq": "albanski",
+  "arq": "Algerian Arabic",
+  "ale": "aljut",
+  "ase": "American Sign Language",
+  "en_US": "ameri\u010dki engleski",
+  "am": "amharski",
+  "anp": "angika",
+  "njo": "Ao Naga",
+  "an": "aragone\u017eanski",
+  "aro": "Araona",
+  "arp": "arapaho",
+  "ar": "arapski",
+  "arn": "araukanski",
+  "arw": "aravak",
+  "arc": "armajski",
+  "rup": "aromanijski",
+  "frp": "Arpitan",
+  "as": "asemijski",
+  "ast": "asturijski",
+  "asa": "asu",
+  "cch": "atsam",
+  "en_AU": "australski engleski",
+  "de_AT": "austrijski njema\u010dki",
+  "awa": "avadhi",
+  "av": "avarski",
+  "ae": "avestanski",
+  "az": "azerbejd\u017eanski",
+  "bfq": "Badaga",
+  "ksf": "bafia",
+  "bfd": "Bafut",
+  "bqi": "Bakhtiari",
+  "ban": "balinezijski",
+  "bal": "balu\u010di",
+  "bm": "bambara",
+  "bax": "Bamun",
+  "bjn": "Banjar",
+  "bas": "basa",
+  "eu": "baskijski",
+  "ba": "ba\u0161kirski",
+  "bbc": "Batak Toba",
+  "bar": "Bavarian",
+  "bej": "beja",
+  "bem": "bemba",
+  "bez": "bena",
+  "bn": "bengalski",
+  "bew": "Betawi",
+  "zxx": "bez lingvisti\u010dkog sadr\u017eaja",
+  "bik": "bikol",
+  "bin": "bini",
+  "bpy": "Bishnupriya",
+  "bi": "bislama",
+  "be": "bjeloruski",
+  "byn": "blin",
+  "zbl": "blisimboli",
+  "brx": "bodo",
+  "bho": "bojpuri",
+  "bs": "bosanski",
+  "brh": "Brahui",
+  "bra": "braj",
+  "pt_BR": "Brazilian Portuguese",
+  "br": "bretonski",
+  "en_GB": "britanski engleski",
+  "bg": "bugarski",
+  "bug": "bugine\u017eanskii",
+  "bum": "Bulu",
+  "bua": "buriat",
+  "my": "burmanski",
+  "frc": "Cajun French",
+  "yue": "Cantonese",
+  "cps": "Capiznon",
+  "cay": "Cayuga",
+  "ceb": "cebuano",
+  "dtp": "Central Dusun",
+  "esu": "Central Yupik",
+  "shu": "Chadian Arabic",
+  "qug": "Chimborazo Highland Quichua",
+  "ksh": "Colognian",
+  "swb": "Comorian",
+  "cy": "cy",
+  "chg": "\u010dagatai",
+  "ch": "\u010damoro",
+  "ce": "\u010de\u010denski",
+  "chy": "\u010dejenski",
+  "cs": "\u010de\u0161ki",
+  "chb": "\u010dib\u010da",
+  "cgg": "\u010diga",
+  "chn": "\u010dinukski",
+  "chp": "\u010dipvijanski",
+  "chr": "\u010diroki",
+  "cho": "\u010doktavski",
+  "chk": "\u010dukeski",
+  "cv": "\u010duva\u0161ki",
+  "dak": "dakota",
+  "da": "danski",
+  "dar": "dargva",
+  "dzg": "Dazaga",
+  "del": "delaver",
+  "din": "dinka",
+  "dv": "divehijski",
+  "doi": "dogri",
+  "dgr": "dogrib",
+  "dsb": "donjolu\u017ei\u010dkosrpski",
+  "dua": "duala",
+  "gez": "d\u017eiz",
+  "dz": "d\u017eonga",
+  "dyu": "\u0111ula",
+  "efi": "efikski",
+  "arz": "Egyptian Arabic",
+  "eka": "ekajuk",
+  "elx": "elamitski",
+  "ebu": "embu",
+  "egl": "Emilian",
+  "en": "engleski",
+  "myv": "erzija",
+  "eo": "esperanto",
+  "et": "estonski",
+  "pt_PT": "European Portuguese",
+  "ee": "eve",
+  "ewo": "evondo",
+  "es_ES": "evropski \u0161panski",
+  "ext": "Extremaduran",
+  "fan": "fang",
+  "fat": "fanti",
+  "fo": "farski",
+  "phn": "feni\u010danski",
+  "fj": "fid\u017eijski",
+  "hif": "Fiji Hindi",
+  "fil": "filipinski",
+  "fi": "finski",
+  "nl_BE": "flamanski",
+  "fon": "fon",
+  "gur": "Frafra",
+  "fr": "francuski",
+  "fur": "friulijski",
+  "fy": "frizijski",
+  "ff": "fulah",
+  "gaa": "ga",
+  "gag": "gagau\u0161ki",
+  "gay": "gajo",
+  "gl": "galski",
+  "gan": "Gan Chinese",
+  "lg": "ganda",
+  "gba": "gbaja",
+  "aln": "Gheg Albanian",
+  "bbj": "Ghomala",
+  "glk": "Gilaki",
+  "gil": "gilbert\u0161ki",
+  "gom": "Goan Konkani",
+  "gon": "gondi",
+  "hsb": "gornjolu\u017ei\u010dkosrpski",
+  "de_CH": "gornjonjema\u010dki (\u0161vicarski)",
+  "gor": "gorontalo",
+  "got": "gotski",
+  "el": "gr\u010dki",
+  "grb": "grebo",
+  "ka": "gruzijski",
+  "gu": "gud\u017earati",
+  "guz": "gusii",
+  "gn": "gvarani",
+  "gwi": "Gwich\u02bcin",
+  "ht": "hai\u0107anski",
+  "hai": "haida",
+  "hak": "Hakka Chinese",
+  "ha": "hausa",
+  "haw": "havajski",
+  "he": "hebrejski",
+  "hz": "herero",
+  "hil": "hiligajnon",
+  "hi": "hindi",
+  "ho": "hiri motu",
+  "hit": "hitite",
+  "hmn": "hmong",
+  "nl": "holandski",
+  "hr": "hrvatski",
+  "hup": "hupa",
+  "iba": "iban",
+  "ibb": "Ibibio",
+  "io": "ido",
+  "ig": "igbo",
+  "ilo": "iloko",
+  "smn": "inari sami",
+  "id": "indonezijski",
+  "izh": "Ingrian",
+  "inh": "ingu\u0161etski",
+  "ia": "interlingva",
+  "ie": "interlingve",
+  "iu": "inuktitut",
+  "ik": "inupiak",
+  "ga": "irski",
+  "is": "islandski",
+  "frs": "isto\u010dni frizijski",
+  "it": "italijanski",
+  "sah": "jakut",
+  "jam": "Jamaican Creole English",
+  "yao": "jao",
+  "ja": "japanski",
+  "yap": "jape\u0161ki",
+  "jv": "javanski",
+  "hy": "jermenski",
+  "yi": "jidi\u0161",
+  "dyo": "jola-fonyi",
+  "yo": "jorubanski",
+  "jrb": "judeo-arapski",
+  "jpr": "judeo-persijski",
+  "jut": "Jutish",
+  "alt": "ju\u017eni altai",
+  "nr": "ju\u017eni ndebele",
+  "sma": "ju\u017eni sami",
+  "kbd": "kabardijski",
+  "kab": "kabile",
+  "kac": "ka\u010din",
+  "cad": "kado",
+  "kgp": "Kaingang",
+  "kkj": "Kako",
+  "kl": "kalalisutski",
+  "kln": "kalenjin",
+  "xal": "kalmik",
+  "kam": "kamba",
+  "kn": "kanada",
+  "en_CA": "kanadski engleski",
+  "fr_CA": "kanadski francuski",
+  "kbl": "Kanembu",
+  "kr": "kanuri",
+  "kaa": "kara-kalpa\u0161ki",
+  "krc": "kara\u010daj-balkar",
+  "krl": "karelijski",
+  "car": "karipski",
+  "kha": "kasi",
+  "ks": "ka\u0161miri",
+  "csb": "ka\u0161ubijanski",
+  "ca": "katalonski",
+  "kaw": "kavi",
+  "kk": "kaza\u010dki",
+  "ken": "Kenyang",
+  "khw": "Khowar",
+  "quc": "ki\u010de",
+  "ki": "kikuju",
+  "kmb": "kimbundu",
+  "krj": "Kinaray-a",
+  "zh": "kineski",
+  "zh_Hans": "kineski (pojednostavljeni)",
+  "zh_Hant": "kineski (tradicionalni)",
+  "rw": "kinjarvanda",
+  "ky": "kirgiski",
+  "kiu": "Kirmanjki",
+  "nwc": "klasi\u010dni nevari",
+  "syc": "klasi\u010dni sirijski",
+  "tlh": "klingonski",
+  "km": "kmerski",
+  "ses": "kojraboro seni",
+  "bkm": "Kom",
+  "kv": "komi",
+  "koi": "komi-permja\u010dki",
+  "kg": "kongo",
+  "swc": "kongoanski swahili",
+  "kok": "konkani",
+  "cop": "koptski",
+  "ko": "korejski",
+  "kw": "korni\u0161ki",
+  "kfo": "koro",
+  "co": "korzikanski",
+  "xh": "kosa",
+  "kos": "kosreanski",
+  "kho": "kotanizijski",
+  "avk": "Kotava",
+  "khq": "koyra chiini",
+  "kpe": "kpele",
+  "cr": "kri",
+  "crh": "krimeanski turski",
+  "kri": "Krio",
+  "mus": "kri\u0161ki",
+  "kj": "kuanjama",
+  "kum": "kumik",
+  "ku": "kurdski",
+  "kru": "kurukh",
+  "kut": "kutenai",
+  "qu": "kven\u010da",
+  "nmg": "kwasio",
+  "lad": "ladino",
+  "lkt": "lakota",
+  "lam": "lamba",
+  "lah": "landa",
+  "lag": "langi",
+  "lo": "lao\u0161ki",
+  "ltg": "Latgalian",
+  "es_419": "latinoameri\u010dki \u0161panski",
+  "la": "latinski",
+  "lzz": "Laz",
+  "lv": "letonski",
+  "lez": "lezgian",
+  "lij": "Ligurian",
+  "li": "limburgi\u0161",
+  "ln": "lingala",
+  "lfn": "Lingua Franca Nova",
+  "lzh": "Literary Chinese",
+  "lt": "litvanski",
+  "liv": "Livonian",
+  "jbo": "lojban",
+  "lmo": "Lombard",
+  "sli": "Lower Silesian",
+  "loz": "lozi",
+  "lu": "luba-katanga",
+  "lua": "luba-lulua",
+  "lui": "luiseno",
+  "lb": "luksembur\u0161ki",
+  "smj": "lule sami",
+  "lun": "lunda",
+  "luo": "luo",
+  "lus": "lu\u0161ai",
+  "luy": "luyia",
+  "mde": "Maba",
+  "jmc": "machame",
+  "mad": "madure\u0161ki",
+  "hu": "ma\u0111arski",
+  "maf": "Mafa",
+  "mag": "magahi",
+  "moh": "mahavski",
+  "vmf": "Main-Franconian",
+  "mai": "maitili",
+  "mak": "makasar",
+  "mk": "makedonski",
+  "mgh": "makhuwa-meetto",
+  "kde": "makonde",
+  "mg": "malagazijski",
+  "ml": "malajalam",
+  "ms": "malajski",
+  "mt": "malte\u0161ki",
+  "mnc": "man\u010du",
+  "mdr": "mandar",
+  "man": "mandingo",
+  "mni": "manipuri",
+  "gv": "manks",
+  "mi": "maorski",
+  "mr": "marati",
+  "chm": "mari",
+  "tzm": "marokanski tamazigt",
+  "mh": "mar\u0161alski",
+  "mwr": "marvari",
+  "mas": "masai",
+  "mfe": "mauricijski kreolski",
+  "mzn": "Mazanderani",
+  "byv": "Medumba",
+  "es_MX": "meksi\u010dki \u0161panski",
+  "men": "mende",
+  "mwv": "Mentawai",
+  "mer": "meru",
+  "mgo": "meta\u2019",
+  "mic": "mikmak",
+  "nan": "Min Nan Chinese",
+  "min": "minangkabau",
+  "xmf": "Mingrelian",
+  "mwl": "mirande\u0161ki",
+  "ar_001": "moderni standardni arapski",
+  "mdf": "mok\u0161a",
+  "ro_MD": "moldavski",
+  "lol": "mongo",
+  "mn": "mongolski",
+  "ary": "Moroccan Arabic",
+  "mos": "mosi",
+  "mua": "mundang",
+  "ttt": "Muslim Tat",
+  "mye": "Myene",
+  "naq": "nama",
+  "na": "nauru",
+  "nv": "navaho",
+  "ng": "ndonga",
+  "nap": "neapolitanski",
+  "ne": "nepalski",
+  "und": "nepoznati ili neva\u017ee\u0107i jezik",
+  "new": "nevari",
+  "sba": "Ngambay",
+  "nnh": "Ngiemboon",
+  "jgo": "ngomba",
+  "yrl": "Nheengatu",
+  "nia": "nias",
+  "nds": "niski nema\u010dki",
+  "niu": "niuean",
+  "nqo": "nko",
+  "nog": "nogai",
+  "no": "norve\u0161ki",
+  "nb": "norve\u0161ki bokmal",
+  "nn": "norve\u0161ki njorsk",
+  "nov": "Novial",
+  "nus": "nuer",
+  "nzi": "nzima",
+  "nym": "njamvezi",
+  "nyn": "njankole",
+  "ny": "njanja",
+  "tog": "njasa tonga",
+  "de": "njema\u010dki",
+  "nyo": "njoro",
+  "oj": "ojibva",
+  "or": "orijski",
+  "om": "oromo",
+  "osa": "osage",
+  "os": "osetski",
+  "ota": "otomanski turski",
+  "pal": "pahlavi",
+  "pfl": "Palatine German",
+  "pau": "palauanski",
+  "pi": "pali",
+  "pam": "pampanga",
+  "pa": "pand\u017eabski",
+  "pag": "pangasinski",
+  "pap": "papiamento",
+  "ps": "pa\u0161tunski",
+  "pdc": "Pennsylvania German",
+  "fa": "perzijski",
+  "pcd": "Picard",
+  "pms": "Piedmontese",
+  "pdt": "Plautdietsch",
+  "pl": "poljski",
+  "pon": "ponpejski",
+  "pnt": "Pontic",
+  "pt": "portugalski",
+  "oc": "provansalski",
+  "prg": "Prussian",
+  "raj": "ra\u0111astani",
+  "rap": "rapanui",
+  "rar": "rarotongan",
+  "rm": "reto-romanski",
+  "rif": "Riffian",
+  "rgn": "Romagnol",
+  "rom": "romani",
+  "rof": "rombo",
+  "rtm": "Rotuman",
+  "rug": "Roviana",
+  "rwk": "rua",
+  "ro": "rumunski",
+  "root": "run",
+  "rn": "rundi",
+  "ru": "ruski",
+  "rue": "Rusyn",
+  "ssy": "Saho",
+  "sam": "samaritanski aramejski",
+  "saq": "samburu",
+  "sm": "samoanski",
+  "sgs": "Samogitian",
+  "sad": "sandave",
+  "sg": "sango",
+  "sbp": "sangu",
+  "sa": "sanskrit",
+  "sat": "santali",
+  "sc": "sardinijski",
+  "sas": "sasak",
+  "sdc": "Sassarese Sardinian",
+  "stq": "Saterland Frisian",
+  "saz": "Saurashtra",
+  "sly": "Selayar",
+  "sel": "selkap",
+  "seh": "sena",
+  "see": "Seneca",
+  "srr": "serer",
+  "sei": "Seri",
+  "st": "sesoto",
+  "nso": "severni soto",
+  "frr": "severno-frizijski",
+  "ksb": "shambala",
+  "scn": "sicilijanski",
+  "ii": "si\u010duan ji",
+  "sid": "sidamo",
+  "bla": "siksika",
+  "szl": "Silesian",
+  "sd": "sindi",
+  "si": "singaleski",
+  "syr": "sirijski",
+  "nd": "sjeverni ndebele",
+  "se": "sjeverni sami",
+  "sms": "skoltski jezik",
+  "den": "slavski",
+  "sk": "slova\u010dki",
+  "sl": "slovena\u010dki",
+  "sog": "sod\u017eijenski",
+  "xog": "soga",
+  "so": "somalski",
+  "snk": "soninke",
+  "ckb": "soranski kurdski",
+  "azb": "South Azerbaijani",
+  "srn": "srananski tongo",
+  "enm": "srednji engleski",
+  "frm": "srednji francuski",
+  "dum": "srednji holandski",
+  "mga": "srednji irski",
+  "gmh": "srednji visoki nema\u010dki",
+  "sr": "srpski",
+  "sh": "srpskohrvatski",
+  "zgh": "standardni marokanski tamazigt",
+  "non": "stari norski",
+  "egy": "staroegipatski",
+  "ang": "staroengleski",
+  "fro": "starofrancuski",
+  "grc": "starogr\u010dki",
+  "sga": "staroirski",
+  "goh": "staronema\u010dki",
+  "peo": "staropersijski",
+  "pro": "staroprovansalski",
+  "cu": "staroslovenski",
+  "su": "sudanski",
+  "suk": "sukuma",
+  "sux": "sumerski",
+  "sus": "susu",
+  "sw": "svahili",
+  "ss": "svati",
+  "shn": "\u0161an",
+  "sco": "\u0161kotski",
+  "gd": "\u0161kotski galski",
+  "sn": "\u0161ona",
+  "es": "\u0161panski",
+  "fr_CH": "\u0161vajcarski francuski",
+  "gsw": "\u0161vajcarski njema\u010dki",
+  "sv": "\u0161vedski",
+  "tg": "tad\u017ei\u010dki",
+  "tl": "tagalski",
+  "shi": "tahelhit",
+  "ty": "tahi\u0107anski",
+  "dav": "taita",
+  "th": "tajlandski",
+  "tly": "Talysh",
+  "tmh": "tama\u0161ek",
+  "ta": "tamilski",
+  "trv": "Taroko",
+  "twq": "tasavak",
+  "tt": "tatarski",
+  "te": "telugu",
+  "ter": "tereno",
+  "teo": "teso",
+  "tet": "tetum",
+  "bo": "tibetanski",
+  "tig": "tigre",
+  "ti": "tigrinja",
+  "tem": "timne",
+  "tiv": "tiv",
+  "kcg": "tjap",
+  "tli": "tlingit",
+  "tpi": "tok pisin",
+  "tkl": "tokelau",
+  "to": "tonga",
+  "fit": "Tornedalen Finnish",
+  "tkr": "Tsakhur",
+  "tsd": "Tsakonian",
+  "tsi": "tsim\u0161ian",
+  "ts": "tsonga",
+  "tn": "tsvana",
+  "tcy": "Tulu",
+  "tum": "tumbuka",
+  "aeb": "Tunisian Arabic",
+  "tk": "turkmenski",
+  "tru": "Turoyo",
+  "tr": "turski",
+  "tvl": "tuvalu",
+  "tyv": "tuvinijski",
+  "tw": "tvi",
+  "udm": "udmurt",
+  "uga": "ugaritski",
+  "ug": "ujgurski",
+  "uk": "ukrajinski",
+  "umb": "umbundu",
+  "ur": "urdu",
+  "uz": "uzbe\u010dki",
+  "vai": "vai",
+  "wal": "valamo",
+  "wa": "valun",
+  "war": "varej",
+  "was": "va\u0161o",
+  "ve": "venda",
+  "vec": "Venetian",
+  "vep": "Veps",
+  "vi": "vijetnamski",
+  "mul": "vi\u0161e jezika",
+  "vo": "volap\u00fck",
+  "wo": "volof",
+  "vro": "V\u00f5ro",
+  "vot": "votski",
+  "vun": "vunjo",
+  "wae": "Walser",
+  "wbp": "Warlpiri",
+  "guc": "Wayuu",
+  "vls": "West Flemish",
+  "mrj": "Western Mari",
+  "wuu": "Wu Chinese",
+  "hsn": "Xiang Chinese",
+  "yav": "Yangben",
+  "ybb": "Yemba",
+  "zap": "zapote\u010dki",
+  "dje": "zarma",
+  "zza": "zaza",
+  "zea": "Zeelandic",
+  "kea": "zelenortski",
+  "zen": "zenaga",
+  "gbz": "Zoroastrian Dari",
+  "za": "zuang",
+  "zu": "zulu",
+  "zun": "zuni",
+  "kaj": "\u017eju"
+}
diff --git a/public/intl/messages/bs-BA.json b/public/intl/messages/bs-BA.json
new file mode 100644
index 0000000000..eb368d9ce2
--- /dev/null
+++ b/public/intl/messages/bs-BA.json
@@ -0,0 +1,1676 @@
+{
+  "label.access-code": [
+    {
+      "type": 0,
+      "value": "Pristupni kod"
+    }
+  ],
+  "label.actions": [
+    {
+      "type": 0,
+      "value": "Akcije"
+    }
+  ],
+  "label.activity-log": [
+    {
+      "type": 0,
+      "value": "Log aktivnosti"
+    }
+  ],
+  "label.add": [
+    {
+      "type": 0,
+      "value": "Dodaj"
+    }
+  ],
+  "label.add-description": [
+    {
+      "type": 0,
+      "value": "Dodaj opis"
+    }
+  ],
+  "label.add-member": [
+    {
+      "type": 0,
+      "value": "Dodaj člana"
+    }
+  ],
+  "label.add-step": [
+    {
+      "type": 0,
+      "value": "Dodaj korak"
+    }
+  ],
+  "label.add-website": [
+    {
+      "type": 0,
+      "value": "Dodaj web stranicu"
+    }
+  ],
+  "label.admin": [
+    {
+      "type": 0,
+      "value": "Administrator"
+    }
+  ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "Nakon"
+    }
+  ],
+  "label.all": [
+    {
+      "type": 0,
+      "value": "Sve"
+    }
+  ],
+  "label.all-time": [
+    {
+      "type": 0,
+      "value": "Cijelo vrijeme"
+    }
+  ],
+  "label.analytics": [
+    {
+      "type": 0,
+      "value": "Analitike"
+    }
+  ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Prosjek"
+    }
+  ],
+  "label.average-visit-time": [
+    {
+      "type": 0,
+      "value": "Prosječno vrijeme posjete"
+    }
+  ],
+  "label.back": [
+    {
+      "type": 0,
+      "value": "Nazad"
+    }
+  ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Prije"
+    }
+  ],
+  "label.bounce-rate": [
+    {
+      "type": 0,
+      "value": "Bounce rate"
+    }
+  ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Pregled po kategorijama"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
+  "label.browsers": [
+    {
+      "type": 0,
+      "value": "Browseri"
+    }
+  ],
+  "label.cancel": [
+    {
+      "type": 0,
+      "value": "Otkaži"
+    }
+  ],
+  "label.change-password": [
+    {
+      "type": 0,
+      "value": "Promijeni šifru"
+    }
+  ],
+  "label.cities": [
+    {
+      "type": 0,
+      "value": "Gradovi"
+    }
+  ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "Grad"
+    }
+  ],
+  "label.clear-all": [
+    {
+      "type": 0,
+      "value": "Očisti sve"
+    }
+  ],
+  "label.confirm": [
+    {
+      "type": 0,
+      "value": "Potvrdi"
+    }
+  ],
+  "label.confirm-password": [
+    {
+      "type": 0,
+      "value": "Potvrdi šifru"
+    }
+  ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Sadrži"
+    }
+  ],
+  "label.continue": [
+    {
+      "type": 0,
+      "value": "Nastavi"
+    }
+  ],
+  "label.countries": [
+    {
+      "type": 0,
+      "value": "Zemlje"
+    }
+  ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Zemlja"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Kreiraj"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Kreiraj izvještaj"
+    }
+  ],
+  "label.create-team": [
+    {
+      "type": 0,
+      "value": "Kreiraj tim"
+    }
+  ],
+  "label.create-user": [
+    {
+      "type": 0,
+      "value": "Kreiraj korisnika"
+    }
+  ],
+  "label.created": [
+    {
+      "type": 0,
+      "value": "Kreiraj"
+    }
+  ],
+  "label.created-by": [
+    {
+      "type": 0,
+      "value": "Kreirao"
+    }
+  ],
+  "label.current-password": [
+    {
+      "type": 0,
+      "value": "Trenutna šifra"
+    }
+  ],
+  "label.custom-range": [
+    {
+      "type": 0,
+      "value": "Proizvoljni raspon"
+    }
+  ],
+  "label.dashboard": [
+    {
+      "type": 0,
+      "value": "Dashboard"
+    }
+  ],
+  "label.data": [
+    {
+      "type": 0,
+      "value": "Podaci"
+    }
+  ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Datum"
+    }
+  ],
+  "label.date-range": [
+    {
+      "type": 0,
+      "value": "Datumski raspon"
+    }
+  ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Dan"
+    }
+  ],
+  "label.default-date-range": [
+    {
+      "type": 0,
+      "value": "Defaultni datumski raspon"
+    }
+  ],
+  "label.delete": [
+    {
+      "type": 0,
+      "value": "Izbriši"
+    }
+  ],
+  "label.delete-report": [
+    {
+      "type": 0,
+      "value": "Izbriši report"
+    }
+  ],
+  "label.delete-team": [
+    {
+      "type": 0,
+      "value": "Izbriši tim"
+    }
+  ],
+  "label.delete-user": [
+    {
+      "type": 0,
+      "value": "Izbriši korisnika"
+    }
+  ],
+  "label.delete-website": [
+    {
+      "type": 0,
+      "value": "Izbriši web stranicu"
+    }
+  ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Opis"
+    }
+  ],
+  "label.desktop": [
+    {
+      "type": 0,
+      "value": "Desktop"
+    }
+  ],
+  "label.details": [
+    {
+      "type": 0,
+      "value": "Detalji"
+    }
+  ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Uređaj"
+    }
+  ],
+  "label.devices": [
+    {
+      "type": 0,
+      "value": "Uređaji"
+    }
+  ],
+  "label.dismiss": [
+    {
+      "type": 0,
+      "value": "Odbaci"
+    }
+  ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Ne sadrži"
+    }
+  ],
+  "label.domain": [
+    {
+      "type": 0,
+      "value": "Domena"
+    }
+  ],
+  "label.dropoff": [
+    {
+      "type": 0,
+      "value": "Dropoff"
+    }
+  ],
+  "label.edit": [
+    {
+      "type": 0,
+      "value": "Uredi"
+    }
+  ],
+  "label.edit-dashboard": [
+    {
+      "type": 0,
+      "value": "Uredi dashboard"
+    }
+  ],
+  "label.edit-member": [
+    {
+      "type": 0,
+      "value": "Uredi člana"
+    }
+  ],
+  "label.enable-share-url": [
+    {
+      "type": 0,
+      "value": "Omogući URL za dijeljenje"
+    }
+  ],
+  "label.event": [
+    {
+      "type": 0,
+      "value": "Događaj"
+    }
+  ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Podaci o događaju"
+    }
+  ],
+  "label.events": [
+    {
+      "type": 0,
+      "value": "Događaji"
+    }
+  ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "Ne"
+    }
+  ],
+  "label.field": [
+    {
+      "type": 0,
+      "value": "Polje"
+    }
+  ],
+  "label.fields": [
+    {
+      "type": 0,
+      "value": "Polja"
+    }
+  ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
+  "label.filter-combined": [
+    {
+      "type": 0,
+      "value": "Kombinovano"
+    }
+  ],
+  "label.filter-raw": [
+    {
+      "type": 0,
+      "value": "Sirovo"
+    }
+  ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filtri"
+    }
+  ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Lijevak"
+    }
+  ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Razumite koverziju i drop-off učestalost korisnika."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Veće od"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Veće od ili jednako"
+    }
+  ],
+  "label.insights": [
+    {
+      "type": 0,
+      "value": "Uvidi"
+    }
+  ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Zaronite dublje u vaše podatke korištenjem segmenata i filtera"
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Jeste"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Nije"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Nije setano"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Jeste setano"
+    }
+  ],
+  "label.join": [
+    {
+      "type": 0,
+      "value": "Join"
+    }
+  ],
+  "label.join-team": [
+    {
+      "type": 0,
+      "value": "Join team"
+    }
+  ],
+  "label.language": [
+    {
+      "type": 0,
+      "value": "Jezik"
+    }
+  ],
+  "label.languages": [
+    {
+      "type": 0,
+      "value": "Jezici"
+    }
+  ],
+  "label.laptop": [
+    {
+      "type": 0,
+      "value": "Laptop"
+    }
+  ],
+  "label.last-days": [
+    {
+      "type": 0,
+      "value": "Zadnjih "
+    },
+    {
+      "type": 1,
+      "value": "x"
+    },
+    {
+      "type": 0,
+      "value": " dana"
+    }
+  ],
+  "label.last-hours": [
+    {
+      "type": 0,
+      "value": "Zadnjih "
+    },
+    {
+      "type": 1,
+      "value": "x"
+    },
+    {
+      "type": 0,
+      "value": " sati"
+    }
+  ],
+  "label.last-months": [
+    {
+      "type": 0,
+      "value": "Zadnjih "
+    },
+    {
+      "type": 1,
+      "value": "x"
+    },
+    {
+      "type": 0,
+      "value": " mjeseci"
+    }
+  ],
+  "label.leave": [
+    {
+      "type": 0,
+      "value": "Napusti"
+    }
+  ],
+  "label.leave-team": [
+    {
+      "type": 0,
+      "value": "Napusti tim"
+    }
+  ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Manje od"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Manje od ili jednako"
+    }
+  ],
+  "label.login": [
+    {
+      "type": 0,
+      "value": "Login"
+    }
+  ],
+  "label.logout": [
+    {
+      "type": 0,
+      "value": "Logout"
+    }
+  ],
+  "label.manage": [
+    {
+      "type": 0,
+      "value": "Manage"
+    }
+  ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
+  "label.member": [
+    {
+      "type": 0,
+      "value": "Član"
+    }
+  ],
+  "label.members": [
+    {
+      "type": 0,
+      "value": "Članovi"
+    }
+  ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
+  "label.mobile": [
+    {
+      "type": 0,
+      "value": "Mobile"
+    }
+  ],
+  "label.more": [
+    {
+      "type": 0,
+      "value": "Više"
+    }
+  ],
+  "label.my-account": [
+    {
+      "type": 0,
+      "value": "Moj račun"
+    }
+  ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "Moje web stranice"
+    }
+  ],
+  "label.name": [
+    {
+      "type": 0,
+      "value": "Ime"
+    }
+  ],
+  "label.new-password": [
+    {
+      "type": 0,
+      "value": "Nova šifra"
+    }
+  ],
+  "label.none": [
+    {
+      "type": 0,
+      "value": "None"
+    }
+  ],
+  "label.number-of-records": [
+    {
+      "type": 1,
+      "value": "x"
+    },
+    {
+      "type": 0,
+      "value": " "
+    },
+    {
+      "offset": 0,
+      "options": {
+        "one": {
+          "value": [
+            {
+              "type": 0,
+              "value": "record"
+            }
+          ]
+        },
+        "other": {
+          "value": [
+            {
+              "type": 0,
+              "value": "records"
+            }
+          ]
+        }
+      },
+      "pluralType": "cardinal",
+      "type": 6,
+      "value": "x"
+    }
+  ],
+  "label.ok": [
+    {
+      "type": 0,
+      "value": "OK"
+    }
+  ],
+  "label.os": [
+    {
+      "type": 0,
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Pregled"
+    }
+  ],
+  "label.owner": [
+    {
+      "type": 0,
+      "value": "Vlasnik"
+    }
+  ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Strana "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " od "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
+  "label.page-views": [
+    {
+      "type": 0,
+      "value": "Pregleda stranica"
+    }
+  ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Naslov stranice"
+    }
+  ],
+  "label.pages": [
+    {
+      "type": 0,
+      "value": "Stranice"
+    }
+  ],
+  "label.password": [
+    {
+      "type": 0,
+      "value": "Šifra"
+    }
+  ],
+  "label.powered-by": [
+    {
+      "type": 0,
+      "value": "Omogućeno s "
+    },
+    {
+      "type": 1,
+      "value": "name"
+    }
+  ],
+  "label.profile": [
+    {
+      "type": 0,
+      "value": "Profil"
+    }
+  ],
+  "label.queries": [
+    {
+      "type": 0,
+      "value": "Queryji"
+    }
+  ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
+  "label.query-parameters": [
+    {
+      "type": 0,
+      "value": "Query parametri"
+    }
+  ],
+  "label.realtime": [
+    {
+      "type": 0,
+      "value": "Realno vrijeme"
+    }
+  ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
+  "label.referrers": [
+    {
+      "type": 0,
+      "value": "Referrers"
+    }
+  ],
+  "label.refresh": [
+    {
+      "type": 0,
+      "value": "Refresh"
+    }
+  ],
+  "label.regenerate": [
+    {
+      "type": 0,
+      "value": "Regeneriši"
+    }
+  ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
+  "label.regions": [
+    {
+      "type": 0,
+      "value": "Regioni"
+    }
+  ],
+  "label.remove": [
+    {
+      "type": 0,
+      "value": "Ukloni"
+    }
+  ],
+  "label.remove-member": [
+    {
+      "type": 0,
+      "value": "Ukloni člana"
+    }
+  ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Izvještaji"
+    }
+  ],
+  "label.required": [
+    {
+      "type": 0,
+      "value": "Required"
+    }
+  ],
+  "label.reset": [
+    {
+      "type": 0,
+      "value": "Resetuj"
+    }
+  ],
+  "label.reset-website": [
+    {
+      "type": 0,
+      "value": "Resetuj web stranicu"
+    }
+  ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Izmjeri 'ljepljivost' svoje web stranice praćenjem koliko često set korisnici vraćaju."
+    }
+  ],
+  "label.role": [
+    {
+      "type": 0,
+      "value": "Rola"
+    }
+  ],
+  "label.run-query": [
+    {
+      "type": 0,
+      "value": "Pokreni query"
+    }
+  ],
+  "label.save": [
+    {
+      "type": 0,
+      "value": "Sačuvaj"
+    }
+  ],
+  "label.screens": [
+    {
+      "type": 0,
+      "value": "Ekrani"
+    }
+  ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Traži"
+    }
+  ],
+  "label.select": [
+    {
+      "type": 0,
+      "value": "Odaberi"
+    }
+  ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Odaberi datum"
+    }
+  ],
+  "label.select-role": [
+    {
+      "type": 0,
+      "value": "Odaberi rolu"
+    }
+  ],
+  "label.select-website": [
+    {
+      "type": 0,
+      "value": "Odaberi web stranicu"
+    }
+  ],
+  "label.sessions": [
+    {
+      "type": 0,
+      "value": "Sesije"
+    }
+  ],
+  "label.settings": [
+    {
+      "type": 0,
+      "value": "Postavke"
+    }
+  ],
+  "label.share-url": [
+    {
+      "type": 0,
+      "value": "Share URL"
+    }
+  ],
+  "label.single-day": [
+    {
+      "type": 0,
+      "value": "Jedan dan"
+    }
+  ],
+  "label.steps": [
+    {
+      "type": 0,
+      "value": "Koraci"
+    }
+  ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Suma"
+    }
+  ],
+  "label.tablet": [
+    {
+      "type": 0,
+      "value": "Tablet"
+    }
+  ],
+  "label.team": [
+    {
+      "type": 0,
+      "value": "Tim"
+    }
+  ],
+  "label.team-id": [
+    {
+      "type": 0,
+      "value": "Tim ID"
+    }
+  ],
+  "label.team-member": [
+    {
+      "type": 0,
+      "value": "Član tima"
+    }
+  ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Naziv tima"
+    }
+  ],
+  "label.team-owner": [
+    {
+      "type": 0,
+      "value": "Vlasnik tima"
+    }
+  ],
+  "label.team-view-only": [
+    {
+      "type": 0,
+      "value": "Samo tim može vidjeti"
+    }
+  ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Timske web stranice"
+    }
+  ],
+  "label.teams": [
+    {
+      "type": 0,
+      "value": "Timovi"
+    }
+  ],
+  "label.theme": [
+    {
+      "type": 0,
+      "value": "Teme"
+    }
+  ],
+  "label.this-month": [
+    {
+      "type": 0,
+      "value": "Ovaj mjesec"
+    }
+  ],
+  "label.this-week": [
+    {
+      "type": 0,
+      "value": "Ova sedmica"
+    }
+  ],
+  "label.this-year": [
+    {
+      "type": 0,
+      "value": "Ova godina"
+    }
+  ],
+  "label.timezone": [
+    {
+      "type": 0,
+      "value": "Vremenska zona"
+    }
+  ],
+  "label.title": [
+    {
+      "type": 0,
+      "value": "Naslov"
+    }
+  ],
+  "label.today": [
+    {
+      "type": 0,
+      "value": "Danas"
+    }
+  ],
+  "label.toggle-charts": [
+    {
+      "type": 0,
+      "value": "Uklj/isklj grafikone"
+    }
+  ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Ukupno"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Ukupno redova"
+    }
+  ],
+  "label.tracking-code": [
+    {
+      "type": 0,
+      "value": "Kod za praćenje"
+    }
+  ],
+  "label.transfer": [
+    {
+      "type": 0,
+      "value": "Transfer"
+    }
+  ],
+  "label.transfer-website": [
+    {
+      "type": 0,
+      "value": "Transfer web stranice"
+    }
+  ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "Da"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Tip"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Jedinstveno"
+    }
+  ],
+  "label.unique-visitors": [
+    {
+      "type": 0,
+      "value": "Jedinstvenih posjetitelja"
+    }
+  ],
+  "label.unknown": [
+    {
+      "type": 0,
+      "value": "Nepoznato"
+    }
+  ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Bezimeno"
+    }
+  ],
+  "label.update": [
+    {
+      "type": 0,
+      "value": "Update"
+    }
+  ],
+  "label.url": [
+    {
+      "type": 0,
+      "value": "URL"
+    }
+  ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
+  "label.user": [
+    {
+      "type": 0,
+      "value": "Korisnik"
+    }
+  ],
+  "label.username": [
+    {
+      "type": 0,
+      "value": "Korisničko ime"
+    }
+  ],
+  "label.users": [
+    {
+      "type": 0,
+      "value": "Korisnici"
+    }
+  ],
+  "label.utm": [
+    {
+      "type": 0,
+      "value": "UTM"
+    }
+  ],
+  "label.utm-description": [
+    {
+      "type": 0,
+      "value": "Pratite vaše kampanje kroz UTM parametre."
+    }
+  ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Vrijednost"
+    }
+  ],
+  "label.view": [
+    {
+      "type": 0,
+      "value": "Pregled"
+    }
+  ],
+  "label.view-details": [
+    {
+      "type": 0,
+      "value": "Pogledaj detalje"
+    }
+  ],
+  "label.view-only": [
+    {
+      "type": 0,
+      "value": "Samo gledanje"
+    }
+  ],
+  "label.views": [
+    {
+      "type": 0,
+      "value": "Pregledi"
+    }
+  ],
+  "label.views-per-visit": [
+    {
+      "type": 0,
+      "value": "Pregledi po posjeti"
+    }
+  ],
+  "label.visitors": [
+    {
+      "type": 0,
+      "value": "Posjetitelji"
+    }
+  ],
+  "label.visits": [
+    {
+      "type": 0,
+      "value": "Posjete"
+    }
+  ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Web stranica"
+    }
+  ],
+  "label.website-id": [
+    {
+      "type": 0,
+      "value": "ID web stranice"
+    }
+  ],
+  "label.websites": [
+    {
+      "type": 0,
+      "value": "Web stranice"
+    }
+  ],
+  "label.window": [
+    {
+      "type": 0,
+      "value": "Prozor"
+    }
+  ],
+  "label.yesterday": [
+    {
+      "type": 0,
+      "value": "Jučer"
+    }
+  ],
+  "message.action-confirmation": [
+    {
+      "type": 0,
+      "value": "Unesite "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " ispod da potvrdite."
+    }
+  ],
+  "message.active-users": [
+    {
+      "type": 1,
+      "value": "x"
+    },
+    {
+      "type": 0,
+      "value": " trenutno "
+    },
+    {
+      "offset": 0,
+      "options": {
+        "one": {
+          "value": [
+            {
+              "type": 0,
+              "value": "posjetitelj"
+            }
+          ]
+        },
+        "other": {
+          "value": [
+            {
+              "type": 0,
+              "value": "posjetitelja"
+            }
+          ]
+        }
+      },
+      "pluralType": "cardinal",
+      "type": 6,
+      "value": "x"
+    }
+  ],
+  "message.confirm-delete": [
+    {
+      "type": 0,
+      "value": "Jeste li sigurni da želite obrisati "
+    },
+    {
+      "type": 1,
+      "value": "target"
+    },
+    {
+      "type": 0,
+      "value": "?"
+    }
+  ],
+  "message.confirm-leave": [
+    {
+      "type": 0,
+      "value": "Jeste li sigurni da želite napustiti "
+    },
+    {
+      "type": 1,
+      "value": "target"
+    },
+    {
+      "type": 0,
+      "value": "?"
+    }
+  ],
+  "message.confirm-remove": [
+    {
+      "type": 0,
+      "value": "Jeste li sigurni da želite ukloniti "
+    },
+    {
+      "type": 1,
+      "value": "target"
+    },
+    {
+      "type": 0,
+      "value": "?"
+    }
+  ],
+  "message.confirm-reset": [
+    {
+      "type": 0,
+      "value": "Jeste li sigurni da želite resetovati "
+    },
+    {
+      "type": 1,
+      "value": "target"
+    },
+    {
+      "type": 0,
+      "value": "?"
+    }
+  ],
+  "message.delete-team-warning": [
+    {
+      "type": 0,
+      "value": "Brisanje tima će također obrisati sve web stranice tima."
+    }
+  ],
+  "message.delete-website-warning": [
+    {
+      "type": 0,
+      "value": "Svi podaci web stranice biće obrisani."
+    }
+  ],
+  "message.error": [
+    {
+      "type": 0,
+      "value": "Nešto je pošlo po zlu."
+    }
+  ],
+  "message.event-log": [
+    {
+      "type": 1,
+      "value": "event"
+    },
+    {
+      "type": 0,
+      "value": " na "
+    },
+    {
+      "type": 1,
+      "value": "url"
+    }
+  ],
+  "message.go-to-settings": [
+    {
+      "type": 0,
+      "value": "Idi na postavke"
+    }
+  ],
+  "message.incorrect-username-password": [
+    {
+      "type": 0,
+      "value": "Pogrešno korisničko ime i/ili šifra."
+    }
+  ],
+  "message.invalid-domain": [
+    {
+      "type": 0,
+      "value": "Nevalidna domena. Ne uključujte http/https."
+    }
+  ],
+  "message.min-password-length": [
+    {
+      "type": 0,
+      "value": "Minimalna dužina od "
+    },
+    {
+      "type": 1,
+      "value": "n"
+    },
+    {
+      "type": 0,
+      "value": " karaktera"
+    }
+  ],
+  "message.new-version-available": [
+    {
+      "type": 0,
+      "value": "Nova verzija Umami "
+    },
+    {
+      "type": 1,
+      "value": "version"
+    },
+    {
+      "type": 0,
+      "value": " je dostupna!"
+    }
+  ],
+  "message.no-data-available": [
+    {
+      "type": 0,
+      "value": "Nema dostupnih podataka."
+    }
+  ],
+  "message.no-event-data": [
+    {
+      "type": 0,
+      "value": "Nema dostupnih podataka o događajima."
+    }
+  ],
+  "message.no-match-password": [
+    {
+      "type": 0,
+      "value": "Šifre se ne poklapaju."
+    }
+  ],
+  "message.no-results-found": [
+    {
+      "type": 0,
+      "value": "Nema rezultata."
+    }
+  ],
+  "message.no-team-websites": [
+    {
+      "type": 0,
+      "value": "Ovaj tim nema nikakvih web stranica."
+    }
+  ],
+  "message.no-teams": [
+    {
+      "type": 0,
+      "value": "Niste kreirali nijedan tim."
+    }
+  ],
+  "message.no-users": [
+    {
+      "type": 0,
+      "value": "Nema nikakvih korisnika."
+    }
+  ],
+  "message.no-websites-configured": [
+    {
+      "type": 0,
+      "value": "Nemate iskonfigurisanu nijednu web stranicu."
+    }
+  ],
+  "message.page-not-found": [
+    {
+      "type": 0,
+      "value": "Stranica nije pronađena"
+    }
+  ],
+  "message.reset-website": [
+    {
+      "type": 0,
+      "value": "Da resetujete ovu web stranicu, upišite "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " dole da potvrdite."
+    }
+  ],
+  "message.reset-website-warning": [
+    {
+      "type": 0,
+      "value": "Sve statistike o ovoj web stranici će biti obrisane, ali vaše postavke neće biti dirane."
+    }
+  ],
+  "message.saved": [
+    {
+      "type": 0,
+      "value": "Sačuvano."
+    }
+  ],
+  "message.share-url": [
+    {
+      "type": 0,
+      "value": "Statistike vaše web stranice su javno dostupne na sljedećem URLu:"
+    }
+  ],
+  "message.team-already-member": [
+    {
+      "type": 0,
+      "value": "Već ste član tima."
+    }
+  ],
+  "message.team-not-found": [
+    {
+      "type": 0,
+      "value": "Tim nije pronađen."
+    }
+  ],
+  "message.team-websites-info": [
+    {
+      "type": 0,
+      "value": "Web stranice može vidjeti bilo ko iz tima."
+    }
+  ],
+  "message.tracking-code": [
+    {
+      "type": 0,
+      "value": "Da pratite statistike ove web stranice, stavite sljedeći kod u "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "..."
+        }
+      ],
+      "type": 8,
+      "value": "head"
+    },
+    {
+      "type": 0,
+      "value": " sekciju vašeg HTMLa."
+    }
+  ],
+  "message.transfer-team-website-to-user": [
+    {
+      "type": 0,
+      "value": "Prebacite ovu web stranicu na vaš račun?"
+    }
+  ],
+  "message.transfer-user-website-to-team": [
+    {
+      "type": 0,
+      "value": "Odaberite tim u koji želite prebaciti ovu web stranicu."
+    }
+  ],
+  "message.transfer-website": [
+    {
+      "type": 0,
+      "value": "Prebacite vlasništvo web stranice na vaš račun ili drugi tim."
+    }
+  ],
+  "message.triggered-event": [
+    {
+      "type": 0,
+      "value": "Trigerovani događaj"
+    }
+  ],
+  "message.user-deleted": [
+    {
+      "type": 0,
+      "value": "Korisnik obrisan."
+    }
+  ],
+  "message.viewed-page": [
+    {
+      "type": 0,
+      "value": "Pogledana stranica"
+    }
+  ],
+  "message.visitor-log": [
+    {
+      "type": 0,
+      "value": "Posjetitelj iz "
+    },
+    {
+      "type": 1,
+      "value": "country"
+    },
+    {
+      "type": 0,
+      "value": " koristi "
+    },
+    {
+      "type": 1,
+      "value": "browser"
+    },
+    {
+      "type": 0,
+      "value": " na "
+    },
+    {
+      "type": 1,
+      "value": "os"
+    },
+    {
+      "type": 0,
+      "value": " "
+    },
+    {
+      "type": 1,
+      "value": "device"
+    }
+  ],
+  "message.visitors-dropped-off": [
+    {
+      "type": 0,
+      "value": "Posjetitelji koji su napustili stranicu"
+    }
+  ]
+}
diff --git a/src/lang/bs-BA.json b/src/lang/bs-BA.json
new file mode 100644
index 0000000000..27318df0db
--- /dev/null
+++ b/src/lang/bs-BA.json
@@ -0,0 +1,246 @@
+{
+  "label.access-code": "Pristupni kod",
+  "label.actions": "Akcije",
+  "label.activity-log": "Log aktivnosti",
+  "label.add": "Dodaj",
+  "label.add-description": "Dodaj opis",
+  "label.add-member": "Dodaj člana",
+  "label.add-step": "Dodaj korak",
+  "label.add-website": "Dodaj web stranicu",
+  "label.admin": "Administrator",
+  "label.after": "Nakon",
+  "label.all": "Sve",
+  "label.all-time": "Cijelo vrijeme",
+  "label.analytics": "Analitike",
+  "label.average": "Prosjek",
+  "label.average-visit-time": "Prosječno vrijeme posjete",
+  "label.back": "Nazad",
+  "label.before": "Prije",
+  "label.bounce-rate": "Bounce rate",
+  "label.breakdown": "Pregled po kategorijama",
+  "label.browser": "Browser",
+  "label.browsers": "Browseri",
+  "label.cancel": "Otkaži",
+  "label.change-password": "Promijeni šifru",
+  "label.cities": "Gradovi",
+  "label.city": "Grad",
+  "label.clear-all": "Očisti sve",
+  "label.confirm": "Potvrdi",
+  "label.confirm-password": "Potvrdi šifru",
+  "label.contains": "Sadrži",
+  "label.continue": "Nastavi",
+  "label.countries": "Zemlje",
+  "label.country": "Zemlja",
+  "label.create": "Kreiraj",
+  "label.create-report": "Kreiraj izvještaj",
+  "label.create-team": "Kreiraj tim",
+  "label.create-user": "Kreiraj korisnika",
+  "label.created": "Kreiraj",
+  "label.created-by": "Kreirao",
+  "label.current-password": "Trenutna šifra",
+  "label.custom-range": "Proizvoljni raspon",
+  "label.dashboard": "Dashboard",
+  "label.data": "Podaci",
+  "label.date": "Datum",
+  "label.date-range": "Datumski raspon",
+  "label.day": "Dan",
+  "label.default-date-range": "Defaultni datumski raspon",
+  "label.delete": "Izbriši",
+  "label.delete-report": "Izbriši report",
+  "label.delete-team": "Izbriši tim",
+  "label.delete-user": "Izbriši korisnika",
+  "label.delete-website": "Izbriši web stranicu",
+  "label.description": "Opis",
+  "label.desktop": "Desktop",
+  "label.details": "Detalji",
+  "label.device": "Uređaj",
+  "label.devices": "Uređaji",
+  "label.dismiss": "Odbaci",
+  "label.does-not-contain": "Ne sadrži",
+  "label.domain": "Domena",
+  "label.dropoff": "Dropoff",
+  "label.edit": "Uredi",
+  "label.edit-dashboard": "Uredi dashboard",
+  "label.edit-member": "Uredi člana",
+  "label.enable-share-url": "Omogući URL za dijeljenje",
+  "label.event": "Događaj",
+  "label.event-data": "Podaci o događaju",
+  "label.events": "Događaji",
+  "label.false": "Ne",
+  "label.field": "Polje",
+  "label.fields": "Polja",
+  "label.filter": "Filter",
+  "label.filter-combined": "Kombinovano",
+  "label.filter-raw": "Sirovo",
+  "label.filters": "Filtri",
+  "label.funnel": "Lijevak",
+  "label.funnel-description": "Razumite koverziju i drop-off učestalost korisnika.",
+  "label.greater-than": "Veće od",
+  "label.greater-than-equals": "Veće od ili jednako",
+  "label.insights": "Uvidi",
+  "label.insights-description": "Zaronite dublje u vaše podatke korištenjem segmenata i filtera",
+  "label.is": "Jeste",
+  "label.is-not": "Nije",
+  "label.is-not-set": "Nije setano",
+  "label.is-set": "Jeste setano",
+  "label.join": "Učlani se",
+  "label.join-team": "Učlani se u tim",
+  "label.language": "Jezik",
+  "label.languages": "Jezici",
+  "label.laptop": "Laptop",
+  "label.last-days": "Zadnjih {x} dana",
+  "label.last-hours": "Zadnjih {x} sati",
+  "label.last-months": "Zadnjih {x} mjeseci",
+  "label.leave": "Napusti",
+  "label.leave-team": "Napusti tim",
+  "label.less-than": "Manje od",
+  "label.less-than-equals": "Manje od ili jednako",
+  "label.login": "Login",
+  "label.logout": "Logout",
+  "label.manage": "Manage",
+  "label.max": "Max",
+  "label.member": "Član",
+  "label.members": "Članovi",
+  "label.min": "Min",
+  "label.mobile": "Mobile",
+  "label.more": "Više",
+  "label.my-account": "Moj račun",
+  "label.my-websites": "Moje web stranice",
+  "label.name": "Ime",
+  "label.new-password": "Nova šifra",
+  "label.none": "None",
+  "label.number-of-records": "{x} {x, plural, one {record} other {records}}",
+  "label.ok": "OK",
+  "label.os": "OS",
+  "label.overview": "Pregled",
+  "label.owner": "Vlasnik",
+  "label.page-of": "Strana {current} od {total}",
+  "label.page-views": "Pregleda stranica",
+  "label.pageTitle": "Naslov stranice",
+  "label.pages": "Stranice",
+  "label.password": "Šifra",
+  "label.powered-by": "Omogućeno s {name}",
+  "label.profile": "Profil",
+  "label.queries": "Queryji",
+  "label.query": "Query",
+  "label.query-parameters": "Query parametri",
+  "label.realtime": "Realno vrijeme",
+  "label.referrer": "Referrer",
+  "label.referrers": "Referrers",
+  "label.refresh": "Refresh",
+  "label.regenerate": "Regeneriši",
+  "label.region": "Region",
+  "label.regions": "Regioni",
+  "label.remove": "Ukloni",
+  "label.remove-member": "Ukloni člana",
+  "label.reports": "Izvještaji",
+  "label.required": "Required",
+  "label.reset": "Resetuj",
+  "label.reset-website": "Resetuj web stranicu",
+  "label.retention": "Retention",
+  "label.retention-description": "Izmjeri 'ljepljivost' svoje web stranice praćenjem koliko često set korisnici vraćaju.",
+  "label.role": "Rola",
+  "label.run-query": "Pokreni query",
+  "label.save": "Sačuvaj",
+  "label.screens": "Ekrani",
+  "label.search": "Traži",
+  "label.select": "Odaberi",
+  "label.select-date": "Odaberi datum",
+  "label.select-role": "Odaberi rolu",
+  "label.select-website": "Odaberi web stranicu",
+  "label.sessions": "Sesije",
+  "label.settings": "Postavke",
+  "label.share-url": "Share URL",
+  "label.single-day": "Jedan dan",
+  "label.steps": "Koraci",
+  "label.sum": "Suma",
+  "label.tablet": "Tablet",
+  "label.team": "Tim",
+  "label.team-id": "Tim ID",
+  "label.team-member": "Član tima",
+  "label.team-name": "Naziv tima",
+  "label.team-owner": "Vlasnik tima",
+  "label.team-view-only": "Samo tim može vidjeti",
+  "label.team-websites": "Timske web stranice",
+  "label.teams": "Timovi",
+  "label.theme": "Teme",
+  "label.this-month": "Ovaj mjesec",
+  "label.this-week": "Ova sedmica",
+  "label.this-year": "Ova godina",
+  "label.timezone": "Vremenska zona",
+  "label.title": "Naslov",
+  "label.today": "Danas",
+  "label.toggle-charts": "Uklj/isklj grafikone",
+  "label.total": "Ukupno",
+  "label.total-records": "Ukupno redova",
+  "label.tracking-code": "Kod za praćenje",
+  "label.transfer": "Transfer",
+  "label.transfer-website": "Transfer web stranice",
+  "label.true": "Da",
+  "label.type": "Tip",
+  "label.unique": "Jedinstveno",
+  "label.unique-visitors": "Jedinstvenih posjetitelja",
+  "label.unknown": "Nepoznato",
+  "label.untitled": "Bezimeno",
+  "label.update": "Update",
+  "label.url": "URL",
+  "label.urls": "URLs",
+  "label.user": "Korisnik",
+  "label.username": "Korisničko ime",
+  "label.users": "Korisnici",
+  "label.utm": "UTM",
+  "label.utm-description": "Pratite vaše kampanje kroz UTM parametre.",
+  "label.value": "Vrijednost",
+  "label.view": "Pregled",
+  "label.view-details": "Pogledaj detalje",
+  "label.view-only": "Samo gledanje",
+  "label.views": "Pregledi",
+  "label.views-per-visit": "Pregledi po posjeti",
+  "label.visitors": "Posjetitelji",
+  "label.visits": "Posjete",
+  "label.website": "Web stranica",
+  "label.website-id": "ID web stranice",
+  "label.websites": "Web stranice",
+  "label.window": "Prozor",
+  "label.yesterday": "Jučer",
+  "message.action-confirmation": "Unesite {confirmation} ispod da potvrdite.",
+  "message.active-users": "{x} trenutno {x, plural, one {posjetitelj} other {posjetitelja}}",
+  "message.confirm-delete": "Jeste li sigurni da želite obrisati {target}?",
+  "message.confirm-leave": "Jeste li sigurni da želite napustiti {target}?",
+  "message.confirm-remove": "Jeste li sigurni da želite ukloniti {target}?",
+  "message.confirm-reset": "Jeste li sigurni da želite resetovati {target}?",
+  "message.delete-team-warning": "Brisanje tima će također obrisati sve web stranice tima.",
+  "message.delete-website-warning": "Svi podaci web stranice biće obrisani.",
+  "message.error": "Nešto je pošlo po zlu.",
+  "message.event-log": "{event} na {url}",
+  "message.go-to-settings": "Idi na postavke",
+  "message.incorrect-username-password": "Pogrešno korisničko ime i/ili šifra.",
+  "message.invalid-domain": "Nevalidna domena. Ne uključujte http/https.",
+  "message.min-password-length": "Minimalna dužina od {n} karaktera",
+  "message.new-version-available": "Nova verzija Umami {version} je dostupna!",
+  "message.no-data-available": "Nema dostupnih podataka.",
+  "message.no-event-data": "Nema dostupnih podataka o događajima.",
+  "message.no-match-password": "Šifre se ne poklapaju.",
+  "message.no-results-found": "Nema rezultata.",
+  "message.no-team-websites": "Ovaj tim nema nikakvih web stranica.",
+  "message.no-teams": "Niste kreirali nijedan tim.",
+  "message.no-users": "Nema nikakvih korisnika.",
+  "message.no-websites-configured": "Nemate iskonfigurisanu nijednu web stranicu.",
+  "message.page-not-found": "Stranica nije pronađena",
+  "message.reset-website": "Da resetujete ovu web stranicu, upišite {confirmation} dole da potvrdite.",
+  "message.reset-website-warning": "Sve statistike o ovoj web stranici će biti obrisane, ali vaše postavke neće biti dirane.",
+  "message.saved": "Sačuvano.",
+  "message.share-url": "Statistike vaše web stranice su javno dostupne na sljedećem URLu:",
+  "message.team-already-member": "Već ste član tima.",
+  "message.team-not-found": "Tim nije pronađen.",
+  "message.team-websites-info": "Web stranice može vidjeti bilo ko iz tima.",
+  "message.tracking-code": "Da pratite statistike ove web stranice, stavite sljedeći kod u <head>...</head> sekciju vašeg HTMLa.",
+  "message.transfer-team-website-to-user": "Prebacite ovu web stranicu na vaš račun?",
+  "message.transfer-user-website-to-team": "Odaberite tim u koji želite prebaciti ovu web stranicu.",
+  "message.transfer-website": "Prebacite vlasništvo web stranice na vaš račun ili drugi tim.",
+  "message.triggered-event": "Trigerovani događaj",
+  "message.user-deleted": "Korisnik obrisan.",
+  "message.viewed-page": "Pogledana stranica",
+  "message.visitor-log": "Posjetitelj iz {country} koristi {browser} na {os} {device}",
+  "message.visitors-dropped-off": "Posjetitelji koji su napustili stranicu"
+}
diff --git a/src/lib/lang.ts b/src/lib/lang.ts
index 2e86212ebd..2d9ac58c0e 100644
--- a/src/lib/lang.ts
+++ b/src/lib/lang.ts
@@ -2,6 +2,7 @@ import {
   arSA,
   be,
   bn,
+  bs,
   cs,
   sk,
   da,
@@ -48,6 +49,7 @@ export const languages = {
   'ar-SA': { label: 'العربية', dateLocale: arSA, dir: 'rtl' },
   'be-BY': { label: 'Беларуская', dateLocale: be },
   'bn-BD': { label: 'বাংলা', dateLocale: bn },
+  'bs-BA': { label: 'Bosanski', dateLocale: bs },
   'ca-ES': { label: 'Català', dateLocale: ca },
   'cs-CZ': { label: 'Čeština', dateLocale: cs },
   'da-DK': { label: 'Dansk', dateLocale: da },

From 436f55c1a5b3ad04d07626c3213b1313e49b16b7 Mon Sep 17 00:00:00 2001
From: mobeicanyue <81098819+mobeicanyue@users.noreply.github.com>
Date: Tue, 23 Apr 2024 02:16:22 +0800
Subject: [PATCH 020/438] Update zh-CN.json

---
 src/lang/zh-CN.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lang/zh-CN.json b/src/lang/zh-CN.json
index 02fc18ae12..772562b483 100644
--- a/src/lang/zh-CN.json
+++ b/src/lang/zh-CN.json
@@ -5,7 +5,7 @@
   "label.add": "添加",
   "label.add-description": "添加描述",
   "label.add-member": "添加成员",
-  "label.add-step": "Add step",
+  "label.add-step": "添加步骤",
   "label.add-website": "添加网站",
   "label.admin": "管理员",
   "label.after": "之后",
@@ -90,7 +90,7 @@
   "label.laptop": "笔记本",
   "label.last-days": "最近 {x} 天",
   "label.last-hours": "最近 {x} 小时",
-  "label.last-months": "Last {x} months",
+  "label.last-months": "最近 {x} 个月",
   "label.leave": "离开",
   "label.leave-team": "离开团队",
   "label.less-than": "少于",
@@ -182,22 +182,22 @@
   "label.unique-visitors": "独立访客",
   "label.unknown": "未知",
   "label.untitled": "未命名",
-  "label.update": "Update",
+  "label.update": "更新",
   "label.url": "网址",
   "label.urls": "网址",
   "label.user": "用户",
   "label.username": "用户名",
   "label.users": "用户",
   "label.utm": "UTM",
-  "label.utm-description": "Track your campaigns through UTM parameters.",
+  "label.utm-description": "通过UTM参数追踪您的广告活动。",
   "label.value": "值",
   "label.view": "查看",
   "label.view-details": "查看更多",
   "label.view-only": "仅浏览量",
   "label.views": "浏览量",
-  "label.views-per-visit": "Views per visit",
+  "label.views-per-visit": "每次访问的浏览量",
   "label.visitors": "访客",
-  "label.visits": "Visits",
+  "label.visits": "访问次数",
   "label.website": "网站",
   "label.website-id": "网站 ID",
   "label.websites": "网站",

From 758b289a510082f49fbd72c5fe647055be17425d Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 22 Apr 2024 12:58:58 -0700
Subject: [PATCH 021/438] fix bug for teams UTM report

---
 src/app/(main)/teams/[teamId]/reports/utm/page.tsx | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 src/app/(main)/teams/[teamId]/reports/utm/page.tsx

diff --git a/src/app/(main)/teams/[teamId]/reports/utm/page.tsx b/src/app/(main)/teams/[teamId]/reports/utm/page.tsx
new file mode 100644
index 0000000000..6070e7c52d
--- /dev/null
+++ b/src/app/(main)/teams/[teamId]/reports/utm/page.tsx
@@ -0,0 +1,3 @@
+import Page from 'app/(main)/reports/utm/page';
+
+export default Page;

From 4b40b4e9cf3a846dc95baded5e82c7806f623f55 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 22 Apr 2024 13:17:24 -0700
Subject: [PATCH 022/438] stay in team context for website header links

---
 .../[teamId]/websites/[websiteId]/event-data/page.tsx    | 3 +++
 .../[teamId]/websites/[websiteId]/realtime/page.tsx      | 3 +++
 .../teams/[teamId]/websites/[websiteId]/reports/page.tsx | 3 +++
 src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx    | 9 +++++++--
 4 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 src/app/(main)/teams/[teamId]/websites/[websiteId]/event-data/page.tsx
 create mode 100644 src/app/(main)/teams/[teamId]/websites/[websiteId]/realtime/page.tsx
 create mode 100644 src/app/(main)/teams/[teamId]/websites/[websiteId]/reports/page.tsx

diff --git a/src/app/(main)/teams/[teamId]/websites/[websiteId]/event-data/page.tsx b/src/app/(main)/teams/[teamId]/websites/[websiteId]/event-data/page.tsx
new file mode 100644
index 0000000000..87de2abe2c
--- /dev/null
+++ b/src/app/(main)/teams/[teamId]/websites/[websiteId]/event-data/page.tsx
@@ -0,0 +1,3 @@
+import Page from 'app/(main)/websites/[websiteId]/event-data/page';
+
+export default Page;
diff --git a/src/app/(main)/teams/[teamId]/websites/[websiteId]/realtime/page.tsx b/src/app/(main)/teams/[teamId]/websites/[websiteId]/realtime/page.tsx
new file mode 100644
index 0000000000..ffeaa9288f
--- /dev/null
+++ b/src/app/(main)/teams/[teamId]/websites/[websiteId]/realtime/page.tsx
@@ -0,0 +1,3 @@
+import Page from 'app/(main)/websites/[websiteId]/realtime/page';
+
+export default Page;
diff --git a/src/app/(main)/teams/[teamId]/websites/[websiteId]/reports/page.tsx b/src/app/(main)/teams/[teamId]/websites/[websiteId]/reports/page.tsx
new file mode 100644
index 0000000000..9a97b9c502
--- /dev/null
+++ b/src/app/(main)/teams/[teamId]/websites/[websiteId]/reports/page.tsx
@@ -0,0 +1,3 @@
+import Page from 'app/(main)/websites/[websiteId]/reports/page';
+
+export default Page;
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
index 3d02925060..dc0f4338eb 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
@@ -1,6 +1,6 @@
 import classNames from 'classnames';
 import Favicon from 'components/common/Favicon';
-import { useMessages, useWebsite } from 'components/hooks';
+import { useMessages, useTeamUrl, useWebsite } from 'components/hooks';
 import Icons from 'components/icons';
 import ActiveUsers from 'components/metrics/ActiveUsers';
 import Link from 'next/link';
@@ -19,6 +19,7 @@ export function WebsiteHeader({
   children?: ReactNode;
 }) {
   const { formatMessage, labels } = useMessages();
+  const { renderTeamUrl } = useTeamUrl();
   const pathname = usePathname();
   const { data: website } = useWebsite(websiteId);
   const { name, domain } = website || {};
@@ -62,7 +63,11 @@ export function WebsiteHeader({
                 : pathname.match(/^\/websites\/[\w-]+$/);
 
               return (
-                <Link key={label} href={`/websites/${websiteId}${path}`} shallow={true}>
+                <Link
+                  key={label}
+                  href={renderTeamUrl(`/websites/${websiteId}${path}`)}
+                  shallow={true}
+                >
                   <Button
                     variant="quiet"
                     className={classNames({

From 64d9a196cc154a7f825e15818165c2b1a63c30a2 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 22 Apr 2024 13:31:58 -0700
Subject: [PATCH 023/438] renderteamURL on create report

---
 .../websites/[websiteId]/reports/WebsiteReportsPage.tsx      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/reports/WebsiteReportsPage.tsx b/src/app/(main)/websites/[websiteId]/reports/WebsiteReportsPage.tsx
index 84ad57d08f..051f6ed393 100644
--- a/src/app/(main)/websites/[websiteId]/reports/WebsiteReportsPage.tsx
+++ b/src/app/(main)/websites/[websiteId]/reports/WebsiteReportsPage.tsx
@@ -1,18 +1,19 @@
 'use client';
 import Link from 'next/link';
 import { Button, Flexbox, Icon, Icons, Text } from 'react-basics';
-import { useMessages } from 'components/hooks';
+import { useMessages, useTeamUrl } from 'components/hooks';
 import WebsiteHeader from '../WebsiteHeader';
 import ReportsDataTable from 'app/(main)/reports/ReportsDataTable';
 
 export function WebsiteReportsPage({ websiteId }) {
   const { formatMessage, labels } = useMessages();
+  const { renderTeamUrl } = useTeamUrl();
 
   return (
     <>
       <WebsiteHeader websiteId={websiteId} />
       <Flexbox alignItems="center" justifyContent="end">
-        <Link href={`/reports/create`}>
+        <Link href={renderTeamUrl('/reports/create')}>
           <Button variant="primary">
             <Icon>
               <Icons.Plus />

From fde2be490057d59fa3cb8c124d48a9074170f936 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 22 Apr 2024 14:03:47 -0700
Subject: [PATCH 024/438] add minute to UNIT_TYPES. Fix yup validations when
 all-time filter returne start date = end date

---
 src/lib/constants.ts                         | 2 +-
 src/lib/schema.ts                            | 2 +-
 src/pages/api/event-data/events.ts           | 2 +-
 src/pages/api/event-data/fields.ts           | 2 +-
 src/pages/api/event-data/stats.ts            | 2 +-
 src/pages/api/users/[userId]/usage.ts        | 2 +-
 src/pages/api/websites/[websiteId]/events.ts | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 66e17dfbe0..ac9c2e8ddc 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -30,7 +30,7 @@ export const FILTER_DAY = 'filter-day';
 export const FILTER_RANGE = 'filter-range';
 export const FILTER_REFERRERS = 'filter-referrers';
 export const FILTER_PAGES = 'filter-pages';
-export const UNIT_TYPES = ['year', 'month', 'hour', 'day'];
+export const UNIT_TYPES = ['year', 'month', 'hour', 'day', 'minute'];
 export const EVENT_COLUMNS = ['url', 'referrer', 'title', 'query', 'event'];
 
 export const SESSION_COLUMNS = [
diff --git a/src/lib/schema.ts b/src/lib/schema.ts
index c09d262a12..5218af10f2 100644
--- a/src/lib/schema.ts
+++ b/src/lib/schema.ts
@@ -2,7 +2,7 @@ import * as yup from 'yup';
 
 export const dateRange = {
   startAt: yup.number().integer().required(),
-  endAt: yup.number().integer().moreThan(yup.ref('startAt')).required(),
+  endAt: yup.number().integer().min(yup.ref('startAt')).required(),
 };
 
 export const pageInfo = {
diff --git a/src/pages/api/event-data/events.ts b/src/pages/api/event-data/events.ts
index 19f0c8f164..bf0f409a60 100644
--- a/src/pages/api/event-data/events.ts
+++ b/src/pages/api/event-data/events.ts
@@ -17,7 +17,7 @@ const schema = {
   GET: yup.object().shape({
     websiteId: yup.string().uuid().required(),
     startAt: yup.number().integer().required(),
-    endAt: yup.number().integer().moreThan(yup.ref('startAt')).required(),
+    endAt: yup.number().integer().min(yup.ref('startAt')).required(),
     event: yup.string(),
   }),
 };
diff --git a/src/pages/api/event-data/fields.ts b/src/pages/api/event-data/fields.ts
index b2af751114..4353ee7303 100644
--- a/src/pages/api/event-data/fields.ts
+++ b/src/pages/api/event-data/fields.ts
@@ -17,7 +17,7 @@ const schema = {
   GET: yup.object().shape({
     websiteId: yup.string().uuid().required(),
     startAt: yup.number().integer().required(),
-    endAt: yup.number().integer().moreThan(yup.ref('startAt')).required(),
+    endAt: yup.number().integer().min(yup.ref('startAt')).required(),
     field: yup.string(),
   }),
 };
diff --git a/src/pages/api/event-data/stats.ts b/src/pages/api/event-data/stats.ts
index a2f9a11359..7e440b88d7 100644
--- a/src/pages/api/event-data/stats.ts
+++ b/src/pages/api/event-data/stats.ts
@@ -16,7 +16,7 @@ const schema = {
   GET: yup.object().shape({
     websiteId: yup.string().uuid().required(),
     startAt: yup.number().integer().required(),
-    endAt: yup.number().integer().moreThan(yup.ref('startAt')).required(),
+    endAt: yup.number().integer().min(yup.ref('startAt')).required(),
   }),
 };
 
diff --git a/src/pages/api/users/[userId]/usage.ts b/src/pages/api/users/[userId]/usage.ts
index 72b33e3eb1..806b4128c2 100644
--- a/src/pages/api/users/[userId]/usage.ts
+++ b/src/pages/api/users/[userId]/usage.ts
@@ -26,7 +26,7 @@ const schema = {
   GET: yup.object().shape({
     id: yup.string().uuid().required(),
     startAt: yup.number().integer().required(),
-    endAt: yup.number().integer().moreThan(yup.ref<number>('startAt')).required(),
+    endAt: yup.number().integer().min(yup.ref<number>('startAt')).required(),
   }),
 };
 
diff --git a/src/pages/api/websites/[websiteId]/events.ts b/src/pages/api/websites/[websiteId]/events.ts
index d07fd28f9d..311320767b 100644
--- a/src/pages/api/websites/[websiteId]/events.ts
+++ b/src/pages/api/websites/[websiteId]/events.ts
@@ -21,7 +21,7 @@ const schema = {
   GET: yup.object().shape({
     websiteId: yup.string().uuid().required(),
     startAt: yup.number().integer().required(),
-    endAt: yup.number().integer().moreThan(yup.ref('startAt')).required(),
+    endAt: yup.number().integer().min(yup.ref('startAt')).required(),
     unit: UnitTypeTest,
     timezone: TimezoneTest,
     url: yup.string(),

From cfbc4ebd72bbe45174a4689f2dd5947a0dab5079 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 23 Apr 2024 11:19:05 -0700
Subject: [PATCH 025/438] add filtering to event chart

---
 .../hooks/queries/useWebsiteEvents.ts         | 24 +++++++++-------
 src/pages/api/websites/[websiteId]/events.ts  | 28 +++++++++++++++----
 .../analytics/events/getEventMetrics.ts       |  6 ++--
 3 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/src/components/hooks/queries/useWebsiteEvents.ts b/src/components/hooks/queries/useWebsiteEvents.ts
index 9928147022..0cca1f95c3 100644
--- a/src/components/hooks/queries/useWebsiteEvents.ts
+++ b/src/components/hooks/queries/useWebsiteEvents.ts
@@ -1,18 +1,14 @@
-import useApi from './useApi';
-import { UseQueryOptions } from '@tanstack/react-query';
 import { useDateRange, useNavigation, useTimezone } from 'components/hooks';
 import { zonedTimeToUtc } from 'date-fns-tz';
+import useApi from './useApi';
 
-export function useWebsiteEvents(
-  websiteId: string,
-  options?: Omit<UseQueryOptions, 'queryKey' | 'queryFn'>,
-) {
+export function useWebsiteEvents(websiteId: string, options?: { [key: string]: string }) {
   const { get, useQuery } = useApi();
   const [dateRange] = useDateRange(websiteId);
   const { startDate, endDate, unit, offset } = dateRange;
   const { timezone } = useTimezone();
   const {
-    query: { url, event },
+    query: { url, referrer, os, browser, device, country, region, city, title, event },
   } = useNavigation();
 
   const params = {
@@ -20,14 +16,22 @@ export function useWebsiteEvents(
     endAt: +zonedTimeToUtc(endDate, timezone),
     unit,
     offset,
-    timezone,
     url,
+    referrer,
+    os,
+    browser,
+    device,
+    country,
+    region,
+    city,
+    title,
+    timezone,
     event,
   };
 
   return useQuery({
-    queryKey: ['events', { ...params }],
-    queryFn: () => get(`/websites/${websiteId}/events`, { ...params }),
+    queryKey: ['events', { websiteId, ...params }],
+    queryFn: () => get(`/websites/${websiteId}/events`, params),
     enabled: !!websiteId,
     ...options,
   });
diff --git a/src/pages/api/websites/[websiteId]/events.ts b/src/pages/api/websites/[websiteId]/events.ts
index 311320767b..b8aabdaded 100644
--- a/src/pages/api/websites/[websiteId]/events.ts
+++ b/src/pages/api/websites/[websiteId]/events.ts
@@ -1,6 +1,6 @@
 import { canViewWebsite } from 'lib/auth';
 import { useAuth, useCors, useValidate } from 'lib/middleware';
-import { getRequestDateRange } from 'lib/request';
+import { getRequestFilters, getRequestDateRange } from 'lib/request';
 import { NextApiRequestQueryBody, WebsiteMetric } from 'lib/types';
 import { TimezoneTest, UnitTypeTest } from 'lib/yup';
 import { NextApiResponse } from 'next';
@@ -15,6 +15,14 @@ export interface WebsiteEventsRequestQuery {
   unit?: string;
   timezone?: string;
   url: string;
+  referrer?: string;
+  title?: string;
+  os?: string;
+  browser?: string;
+  device?: string;
+  country?: string;
+  region: string;
+  city?: string;
 }
 
 const schema = {
@@ -25,6 +33,14 @@ const schema = {
     unit: UnitTypeTest,
     timezone: TimezoneTest,
     url: yup.string(),
+    referrer: yup.string(),
+    title: yup.string(),
+    os: yup.string(),
+    browser: yup.string(),
+    device: yup.string(),
+    country: yup.string(),
+    region: yup.string(),
+    city: yup.string(),
   }),
 };
 
@@ -36,7 +52,7 @@ export default async (
   await useAuth(req, res);
   await useValidate(schema, req, res);
 
-  const { websiteId, timezone, url } = req.query;
+  const { websiteId, timezone } = req.query;
   const { startDate, endDate, unit } = await getRequestDateRange(req);
 
   if (req.method === 'GET') {
@@ -44,13 +60,15 @@ export default async (
       return unauthorized(res);
     }
 
-    const events = await getEventMetrics(websiteId, {
+    const filters = {
+      ...getRequestFilters(req),
       startDate,
       endDate,
       timezone,
       unit,
-      url,
-    });
+    };
+
+    const events = await getEventMetrics(websiteId, filters);
 
     return ok(res, events);
   }
diff --git a/src/queries/analytics/events/getEventMetrics.ts b/src/queries/analytics/events/getEventMetrics.ts
index 53638fbde0..32cccd3e85 100644
--- a/src/queries/analytics/events/getEventMetrics.ts
+++ b/src/queries/analytics/events/getEventMetrics.ts
@@ -25,12 +25,12 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     `
     select
       event_name x,
-      ${getDateQuery('created_at', unit, timezone)} t,
+      ${getDateQuery('website_event.created_at', unit, timezone)} t,
       count(*) y
     from website_event
     ${joinSession}
-    where website_id = {{websiteId::uuid}}
-      and created_at between {{startDate}} and {{endDate}}
+    where website_event.website_id = {{websiteId::uuid}}
+      and website_event.created_at between {{startDate}} and {{endDate}}
       and event_type = {{eventType}}
       ${filterQuery}
     group by 1, 2

From 592c18190250f3d9acf4f2b92dad178c01b33467 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 25 Apr 2024 11:26:10 -0700
Subject: [PATCH 026/438] Updated redis methods.

---
 package.json     |  2 +-
 src/lib/cache.ts | 41 ++++++++++++++++-------------------------
 yarn.lock        |  8 ++++----
 3 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/package.json b/package.json
index c72a054f74..bf5f00ae61 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
     "@react-spring/web": "^9.7.3",
     "@tanstack/react-query": "^5.28.6",
     "@umami/prisma-client": "^0.14.0",
-    "@umami/redis-client": "^0.18.0",
+    "@umami/redis-client": "^0.20.0",
     "chalk": "^4.1.1",
     "chart.js": "^4.4.2",
     "chartjs-adapter-date-fns": "^3.0.0",
diff --git a/src/lib/cache.ts b/src/lib/cache.ts
index 974824993c..cb218ba0a4 100644
--- a/src/lib/cache.ts
+++ b/src/lib/cache.ts
@@ -3,57 +3,48 @@ import redis from '@umami/redis-client';
 import { getSession, getUser, getWebsite } from '../queries';
 
 async function fetchWebsite(websiteId: string): Promise<Website> {
-  return redis.client.getCache(`website:${websiteId}`, () => getWebsite(websiteId), 86400);
+  return redis.client.fetch(`website:${websiteId}`, () => getWebsite(websiteId), 86400);
 }
 
 async function storeWebsite(data: { id: any }) {
   const { id } = data;
   const key = `website:${id}`;
 
-  const obj = await redis.client.setCache(key, data);
-  await redis.client.expire(key, 86400);
-
-  return obj;
+  return redis.client.store(key, data, 86400);
 }
 
-async function deleteWebsite(id) {
-  return redis.client.deleteCache(`website:${id}`);
+async function deleteWebsite(id: any) {
+  return redis.client.remove(`website:${id}`);
 }
 
-async function fetchUser(id): Promise<User> {
-  return redis.client.getCache(`user:${id}`, () => getUser(id, { includePassword: true }), 86400);
+async function fetchUser(id: string): Promise<User> {
+  return redis.client.fetch(`user:${id}`, () => getUser(id, { includePassword: true }), 86400);
 }
 
-async function storeUser(data) {
+async function storeUser(data: { id: any }) {
   const { id } = data;
   const key = `user:${id}`;
 
-  const obj = await redis.client.setCache(key, data);
-  await redis.client.expire(key, 86400);
-
-  return obj;
+  return redis.client.store(key, data, 86400);
 }
 
-async function deleteUser(id) {
-  return redis.client.deleteCache(`user:${id}`);
+async function deleteUser(id: any) {
+  return redis.client.remove(`user:${id}`);
 }
 
-async function fetchSession(id) {
-  return redis.client.getCache(`session:${id}`, () => getSession(id), 86400);
+async function fetchSession(id: string) {
+  return redis.client.fetch(`session:${id}`, () => getSession(id), 86400);
 }
 
-async function storeSession(data) {
+async function storeSession(data: { id: any }) {
   const { id } = data;
   const key = `session:${id}`;
 
-  const obj = await redis.client.setCache(key, data);
-  await redis.client.expire(key, 86400);
-
-  return obj;
+  return redis.client.store(key, data, 86400);
 }
 
-async function deleteSession(id) {
-  return redis.client.deleteCache(`session:${id}`);
+async function deleteSession(id: any) {
+  return redis.client.remove(`session:${id}`);
 }
 
 async function fetchUserBlock(userId: string) {
diff --git a/yarn.lock b/yarn.lock
index 8373fbf0a1..38812c614f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3200,10 +3200,10 @@
     chalk "^4.1.2"
     debug "^4.3.4"
 
-"@umami/redis-client@^0.18.0":
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/@umami/redis-client/-/redis-client-0.18.0.tgz#6a2315a878f2688dae162d93e88dfc4e097fc48e"
-  integrity sha512-uDuX5w7ydlOZWrq0h6fADG3XWOhto9fAqrUVu85FUhdijWoGlv5f8adaL8FAah5jD+/Byw2VyGQaZO4VhboEZw==
+"@umami/redis-client@^0.20.0":
+  version "0.20.0"
+  resolved "https://registry.yarnpkg.com/@umami/redis-client/-/redis-client-0.20.0.tgz#93b4598d68983b1ad266a0a527c56533c6248bf2"
+  integrity sha512-ACpoO+M/J2eLWEtusjbslhR4le+rPN4h9x7TXjaVJ905icVE0Qgu5y+A7nxXjcYvlgkHk+8HPeVeeaw5P+rxqw==
   dependencies:
     debug "^4.3.4"
     redis "^4.5.1"

From 439f8a8aa342f1ee29445edf88dcc1c448bb7ddf Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 25 Apr 2024 22:26:20 -0700
Subject: [PATCH 027/438] Removed cache logic for websites.

---
 src/queries/admin/website.ts | 31 +++++--------------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

diff --git a/src/queries/admin/website.ts b/src/queries/admin/website.ts
index cef7f15d2e..949efb7157 100644
--- a/src/queries/admin/website.ts
+++ b/src/queries/admin/website.ts
@@ -1,5 +1,4 @@
 import { Prisma, Website } from '@prisma/client';
-import cache from 'lib/cache';
 import prisma from 'lib/prisma';
 import { FilterResult, WebsiteSearchFilter } from 'lib/types';
 import WebsiteFindManyArgs = Prisma.WebsiteFindManyArgs;
@@ -102,17 +101,9 @@ export async function getTeamWebsites(
 export async function createWebsite(
   data: Prisma.WebsiteCreateInput | Prisma.WebsiteUncheckedCreateInput,
 ): Promise<Website> {
-  return prisma.client.website
-    .create({
-      data,
-    })
-    .then(async data => {
-      if (cache.enabled) {
-        await cache.storeWebsite(data);
-      }
-
-      return data;
-    });
+  return prisma.client.website.create({
+    data,
+  });
 }
 
 export async function updateWebsite(
@@ -148,13 +139,7 @@ export async function resetWebsite(
         resetAt: new Date(),
       },
     }),
-  ]).then(async data => {
-    if (cache.enabled) {
-      await cache.storeWebsite(data[3]);
-    }
-
-    return data;
-  });
+  ]);
 }
 
 export async function deleteWebsite(
@@ -188,11 +173,5 @@ export async function deleteWebsite(
       : client.website.delete({
           where: { id: websiteId },
         }),
-  ]).then(async data => {
-    if (cache.enabled) {
-      await cache.deleteWebsite(websiteId);
-    }
-
-    return data;
-  });
+  ]);
 }

From 216304a191118a479387669ef83034b7f9f32f72 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 25 Apr 2024 23:21:12 -0700
Subject: [PATCH 028/438] Removed blocking logic and duplicate validations.

---
 src/lib/crypto.ts     |  6 +-----
 src/lib/session.ts    | 27 ++-------------------------
 src/lib/types.ts      |  1 -
 src/pages/api/send.ts | 11 +++++------
 4 files changed, 8 insertions(+), 37 deletions(-)

diff --git a/src/lib/crypto.ts b/src/lib/crypto.ts
index 1fbcf031db..689efe62ad 100644
--- a/src/lib/crypto.ts
+++ b/src/lib/crypto.ts
@@ -1,6 +1,6 @@
 import { startOfHour, startOfMonth } from 'date-fns';
 import { hash } from 'next-basics';
-import { v4, v5, validate } from 'uuid';
+import { v4, v5 } from 'uuid';
 
 export function secret() {
   return hash(process.env.APP_SECRET || process.env.DATABASE_URL);
@@ -23,7 +23,3 @@ export function uuid(...args: any) {
 
   return v5(hash(...args, salt()), v5.DNS);
 }
-
-export function isUuid(value: string) {
-  return validate(value);
-}
diff --git a/src/lib/session.ts b/src/lib/session.ts
index 1f87ffcce8..b675ec2f58 100644
--- a/src/lib/session.ts
+++ b/src/lib/session.ts
@@ -1,9 +1,8 @@
-import { isUuid, secret, uuid, visitSalt } from 'lib/crypto';
+import { secret, uuid, visitSalt } from 'lib/crypto';
 import { getClientInfo } from 'lib/detect';
 import { parseToken } from 'next-basics';
 import { NextApiRequestCollect } from 'pages/api/send';
 import { createSession } from 'queries';
-import cache from './cache';
 import clickhouse from './clickhouse';
 import { loadSession, loadWebsite } from './load';
 import { SessionData } from 'lib/types';
@@ -23,8 +22,6 @@ export async function getSession(req: NextApiRequestCollect): Promise<SessionDat
 
     // Token is valid
     if (result) {
-      await checkUserBlock(result?.ownerId);
-
       return result;
     }
   }
@@ -32,15 +29,6 @@ export async function getSession(req: NextApiRequestCollect): Promise<SessionDat
   // Verify payload
   const { website: websiteId, hostname, screen, language } = payload;
 
-  const validHostnameRegex = /^[\w-.]+$/;
-  if (!validHostnameRegex.test(hostname)) {
-    throw new Error('Invalid hostname.');
-  }
-
-  if (!isUuid(websiteId)) {
-    throw new Error('Invalid website ID.');
-  }
-
   // Find website
   const website = await loadWebsite(websiteId);
 
@@ -48,8 +36,6 @@ export async function getSession(req: NextApiRequestCollect): Promise<SessionDat
     throw new Error(`Website not found: ${websiteId}.`);
   }
 
-  await checkUserBlock(website.userId);
-
   const { userAgent, browser, os, ip, country, subdivision1, subdivision2, city, device } =
     await getClientInfo(req);
 
@@ -72,7 +58,6 @@ export async function getSession(req: NextApiRequestCollect): Promise<SessionDat
       subdivision1,
       subdivision2,
       city,
-      ownerId: website.userId,
     };
   }
 
@@ -103,13 +88,5 @@ export async function getSession(req: NextApiRequestCollect): Promise<SessionDat
     }
   }
 
-  return { ...session, ownerId: website.userId, visitId: visitId };
-}
-
-async function checkUserBlock(userId: string) {
-  if (process.env.ENABLE_BLOCKER && (await cache.fetchUserBlock(userId))) {
-    await cache.incrementUserBlock(userId);
-
-    throw new Error('Usage Limit.');
-  }
+  return { ...session, visitId: visitId };
 }
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 27db220f0c..712a6aac3b 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -245,5 +245,4 @@ export interface SessionData {
   subdivision1: string;
   subdivision2: string;
   city: string;
-  ownerId: string;
 }
diff --git a/src/pages/api/send.ts b/src/pages/api/send.ts
index df37ebe04e..fe4a2abd25 100644
--- a/src/pages/api/send.ts
+++ b/src/pages/api/send.ts
@@ -1,10 +1,5 @@
 import ipaddr from 'ipaddr.js';
 import { isbot } from 'isbot';
-import { COLLECTION_TYPE, HOSTNAME_REGEX, IP_REGEX } from 'lib/constants';
-import { secret, visitSalt, uuid } from 'lib/crypto';
-import { getIpAddress } from 'lib/detect';
-import { useCors, useSession, useValidate } from 'lib/middleware';
-import { CollectionType, YupRequest } from 'lib/types';
 import { NextApiRequest, NextApiResponse } from 'next';
 import {
   badRequest,
@@ -15,6 +10,11 @@ import {
   safeDecodeURI,
   send,
 } from 'next-basics';
+import { COLLECTION_TYPE, HOSTNAME_REGEX, IP_REGEX } from 'lib/constants';
+import { secret, visitSalt, uuid } from 'lib/crypto';
+import { getIpAddress } from 'lib/detect';
+import { useCors, useSession, useValidate } from 'lib/middleware';
+import { CollectionType, YupRequest } from 'lib/types';
 import { saveEvent, saveSessionData } from 'queries';
 import * as yup from 'yup';
 
@@ -41,7 +41,6 @@ export interface NextApiRequestCollect extends NextApiRequest {
     id: string;
     websiteId: string;
     visitId: string;
-    ownerId: string;
     hostname: string;
     browser: string;
     os: string;

From 0fc8828f8b9d00d5860deaeb30035cf77c518aa8 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 26 Apr 2024 00:31:38 -0700
Subject: [PATCH 029/438] Refactored caching logic.

---
 src/lib/cache.ts                              | 73 -------------------
 src/lib/clickhouse.ts                         |  4 +-
 src/lib/load.ts                               | 34 +++------
 src/lib/prisma.ts                             |  4 +-
 src/lib/session.ts                            |  6 +-
 src/queries/admin/user.ts                     | 13 +---
 .../analytics/sessions/createSession.ts       | 41 ++++-------
 7 files changed, 33 insertions(+), 142 deletions(-)
 delete mode 100644 src/lib/cache.ts

diff --git a/src/lib/cache.ts b/src/lib/cache.ts
deleted file mode 100644
index cb218ba0a4..0000000000
--- a/src/lib/cache.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { User, Website } from '@prisma/client';
-import redis from '@umami/redis-client';
-import { getSession, getUser, getWebsite } from '../queries';
-
-async function fetchWebsite(websiteId: string): Promise<Website> {
-  return redis.client.fetch(`website:${websiteId}`, () => getWebsite(websiteId), 86400);
-}
-
-async function storeWebsite(data: { id: any }) {
-  const { id } = data;
-  const key = `website:${id}`;
-
-  return redis.client.store(key, data, 86400);
-}
-
-async function deleteWebsite(id: any) {
-  return redis.client.remove(`website:${id}`);
-}
-
-async function fetchUser(id: string): Promise<User> {
-  return redis.client.fetch(`user:${id}`, () => getUser(id, { includePassword: true }), 86400);
-}
-
-async function storeUser(data: { id: any }) {
-  const { id } = data;
-  const key = `user:${id}`;
-
-  return redis.client.store(key, data, 86400);
-}
-
-async function deleteUser(id: any) {
-  return redis.client.remove(`user:${id}`);
-}
-
-async function fetchSession(id: string) {
-  return redis.client.fetch(`session:${id}`, () => getSession(id), 86400);
-}
-
-async function storeSession(data: { id: any }) {
-  const { id } = data;
-  const key = `session:${id}`;
-
-  return redis.client.store(key, data, 86400);
-}
-
-async function deleteSession(id: any) {
-  return redis.client.remove(`session:${id}`);
-}
-
-async function fetchUserBlock(userId: string) {
-  const key = `user:block:${userId}`;
-  return redis.client.get(key);
-}
-
-async function incrementUserBlock(userId: string) {
-  const key = `user:block:${userId}`;
-  return redis.client.incr(key);
-}
-
-export default {
-  fetchWebsite,
-  storeWebsite,
-  deleteWebsite,
-  fetchUser,
-  storeUser,
-  deleteUser,
-  fetchSession,
-  storeSession,
-  deleteSession,
-  fetchUserBlock,
-  incrementUserBlock,
-  enabled: !!redis.enabled,
-};
diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index 5bcf7ee0b4..c1b9d25f27 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -4,7 +4,7 @@ import debug from 'debug';
 import { CLICKHOUSE } from 'lib/db';
 import { QueryFilters, QueryOptions } from './types';
 import { OPERATORS } from './constants';
-import { loadWebsite } from './load';
+import { fetchWebsite } from './load';
 import { maxDate } from './date';
 import { filtersToArray } from './params';
 
@@ -106,7 +106,7 @@ function getFilterParams(filters: QueryFilters = {}) {
 }
 
 async function parseFilters(websiteId: string, filters: QueryFilters = {}, options?: QueryOptions) {
-  const website = await loadWebsite(websiteId);
+  const website = await fetchWebsite(websiteId);
 
   return {
     filterQuery: getFilterQuery(filters, options),
diff --git a/src/lib/load.ts b/src/lib/load.ts
index 78c0ac9c56..c0a878976f 100644
--- a/src/lib/load.ts
+++ b/src/lib/load.ts
@@ -1,12 +1,12 @@
-import cache from 'lib/cache';
-import { getSession, getUser, getWebsite } from 'queries';
-import { User, Website, Session } from '@prisma/client';
+import { getSession, getWebsite } from 'queries';
+import { Website, Session } from '@prisma/client';
+import redis from '@umami/redis-client';
 
-export async function loadWebsite(websiteId: string): Promise<Website> {
+export async function fetchWebsite(websiteId: string): Promise<Website> {
   let website;
 
-  if (cache.enabled) {
-    website = await cache.fetchWebsite(websiteId);
+  if (redis.enabled) {
+    website = await redis.client.fetch(`website:${websiteId}`, () => getWebsite(websiteId), 86400);
   } else {
     website = await getWebsite(websiteId);
   }
@@ -18,11 +18,11 @@ export async function loadWebsite(websiteId: string): Promise<Website> {
   return website;
 }
 
-export async function loadSession(sessionId: string): Promise<Session> {
+export async function fetchSession(sessionId: string): Promise<Session> {
   let session;
 
-  if (cache.enabled) {
-    session = await cache.fetchSession(sessionId);
+  if (redis.enabled) {
+    session = await redis.client.fetch(`session:${sessionId}`, () => getSession(sessionId), 86400);
   } else {
     session = await getSession(sessionId);
   }
@@ -33,19 +33,3 @@ export async function loadSession(sessionId: string): Promise<Session> {
 
   return session;
 }
-
-export async function loadUser(userId: string): Promise<User> {
-  let user;
-
-  if (cache.enabled) {
-    user = await cache.fetchUser(userId);
-  } else {
-    user = await getUser(userId);
-  }
-
-  if (!user || user.deletedAt) {
-    return null;
-  }
-
-  return user;
-}
diff --git a/src/lib/prisma.ts b/src/lib/prisma.ts
index c5e16ddca7..eb866899e5 100644
--- a/src/lib/prisma.ts
+++ b/src/lib/prisma.ts
@@ -3,7 +3,7 @@ import prisma from '@umami/prisma-client';
 import moment from 'moment-timezone';
 import { MYSQL, POSTGRESQL, getDatabaseType } from 'lib/db';
 import { SESSION_COLUMNS, OPERATORS, DEFAULT_PAGE_SIZE } from './constants';
-import { loadWebsite } from './load';
+import { fetchWebsite } from './load';
 import { maxDate } from './date';
 import { QueryFilters, QueryOptions, SearchFilter } from './types';
 import { filtersToArray } from './params';
@@ -152,7 +152,7 @@ async function parseFilters(
   filters: QueryFilters = {},
   options: QueryOptions = {},
 ) {
-  const website = await loadWebsite(websiteId);
+  const website = await fetchWebsite(websiteId);
   const joinSession = Object.keys(filters).find(key => SESSION_COLUMNS.includes(key));
 
   return {
diff --git a/src/lib/session.ts b/src/lib/session.ts
index b675ec2f58..cf30aa7124 100644
--- a/src/lib/session.ts
+++ b/src/lib/session.ts
@@ -4,7 +4,7 @@ import { parseToken } from 'next-basics';
 import { NextApiRequestCollect } from 'pages/api/send';
 import { createSession } from 'queries';
 import clickhouse from './clickhouse';
-import { loadSession, loadWebsite } from './load';
+import { fetchSession, fetchWebsite } from './load';
 import { SessionData } from 'lib/types';
 
 export async function getSession(req: NextApiRequestCollect): Promise<SessionData> {
@@ -30,7 +30,7 @@ export async function getSession(req: NextApiRequestCollect): Promise<SessionDat
   const { website: websiteId, hostname, screen, language } = payload;
 
   // Find website
-  const website = await loadWebsite(websiteId);
+  const website = await fetchWebsite(websiteId);
 
   if (!website) {
     throw new Error(`Website not found: ${websiteId}.`);
@@ -62,7 +62,7 @@ export async function getSession(req: NextApiRequestCollect): Promise<SessionDat
   }
 
   // Find session
-  let session = await loadSession(sessionId);
+  let session = await fetchSession(sessionId);
 
   // Create a session if not found
   if (!session) {
diff --git a/src/queries/admin/user.ts b/src/queries/admin/user.ts
index 274bb43da7..819f492d7e 100644
--- a/src/queries/admin/user.ts
+++ b/src/queries/admin/user.ts
@@ -1,5 +1,4 @@
 import { Prisma } from '@prisma/client';
-import cache from 'lib/cache';
 import { ROLES } from 'lib/constants';
 import prisma from 'lib/prisma';
 import { FilterResult, Role, User, UserSearchFilter } from 'lib/types';
@@ -221,15 +220,5 @@ export async function deleteUser(
         id: userId,
       },
     }),
-  ]).then(async data => {
-    if (cache.enabled) {
-      const ids = websites.map(a => a.id);
-
-      for (let i = 0; i < ids.length; i++) {
-        await cache.deleteWebsite(`website:${ids[i]}`);
-      }
-    }
-
-    return data;
-  });
+  ]);
 }
diff --git a/src/queries/analytics/sessions/createSession.ts b/src/queries/analytics/sessions/createSession.ts
index 65dbd7948a..7d61449904 100644
--- a/src/queries/analytics/sessions/createSession.ts
+++ b/src/queries/analytics/sessions/createSession.ts
@@ -1,5 +1,4 @@
 import { Prisma } from '@prisma/client';
-import cache from 'lib/cache';
 import prisma from 'lib/prisma';
 
 export async function createSession(data: Prisma.SessionCreateInput) {
@@ -18,28 +17,20 @@ export async function createSession(data: Prisma.SessionCreateInput) {
     city,
   } = data;
 
-  return prisma.client.session
-    .create({
-      data: {
-        id,
-        websiteId,
-        hostname,
-        browser,
-        os,
-        device,
-        screen,
-        language,
-        country,
-        subdivision1,
-        subdivision2,
-        city,
-      },
-    })
-    .then(async data => {
-      if (cache.enabled) {
-        await cache.storeSession(data);
-      }
-
-      return data;
-    });
+  return prisma.client.session.create({
+    data: {
+      id,
+      websiteId,
+      hostname,
+      browser,
+      os,
+      device,
+      screen,
+      language,
+      country,
+      subdivision1,
+      subdivision2,
+      city,
+    },
+  });
 }

From 4e2bfd7485474f841de140091ca73d8c097efd7e Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Sun, 28 Apr 2024 22:45:58 -0700
Subject: [PATCH 030/438] Update admin/website search.  Update param names.

---
 .../hooks/queries/useFilterQuery.ts           |  6 +--
 src/lib/prisma.ts                             |  4 +-
 src/lib/types.ts                              | 34 +++------------
 src/pages/api/admin/users.ts                  |  4 +-
 src/pages/api/admin/websites.ts               | 43 +++++++++++++++++--
 src/pages/api/teams/[teamId]/users/index.ts   |  4 +-
 .../api/teams/[teamId]/websites/index.ts      |  4 +-
 src/pages/api/teams/index.ts                  |  4 +-
 src/pages/api/users/[userId]/teams.ts         |  4 +-
 src/pages/api/users/index.ts                  |  4 +-
 src/pages/api/websites/[websiteId]/reports.ts |  4 +-
 src/pages/api/websites/index.ts               |  4 +-
 src/queries/admin/report.ts                   | 14 +++---
 src/queries/admin/team.ts                     |  8 ++--
 src/queries/admin/teamUser.ts                 |  6 +--
 src/queries/admin/user.ts                     |  6 +--
 src/queries/admin/website.ts                  | 14 +++---
 17 files changed, 90 insertions(+), 77 deletions(-)

diff --git a/src/components/hooks/queries/useFilterQuery.ts b/src/components/hooks/queries/useFilterQuery.ts
index 1ac6564ba2..5963d09974 100644
--- a/src/components/hooks/queries/useFilterQuery.ts
+++ b/src/components/hooks/queries/useFilterQuery.ts
@@ -1,14 +1,14 @@
 import { UseQueryOptions } from '@tanstack/react-query';
 import { useState } from 'react';
 import { useApi } from './useApi';
-import { FilterResult, SearchFilter, FilterQueryResult } from 'lib/types';
+import { PageResult, PageParams, FilterQueryResult } from 'lib/types';
 
 export function useFilterQuery<T = any>({
   queryKey,
   queryFn,
   ...options
 }: Omit<UseQueryOptions, 'queryFn'> & { queryFn: (params?: object) => any }): FilterQueryResult<T> {
-  const [params, setParams] = useState<T | SearchFilter>({
+  const [params, setParams] = useState<T | PageParams>({
     query: '',
     page: 1,
   });
@@ -21,7 +21,7 @@ export function useFilterQuery<T = any>({
   });
 
   return {
-    result: data as FilterResult<any>,
+    result: data as PageResult<any>,
     query,
     params,
     setParams,
diff --git a/src/lib/prisma.ts b/src/lib/prisma.ts
index eb866899e5..6250f2e546 100644
--- a/src/lib/prisma.ts
+++ b/src/lib/prisma.ts
@@ -5,7 +5,7 @@ import { MYSQL, POSTGRESQL, getDatabaseType } from 'lib/db';
 import { SESSION_COLUMNS, OPERATORS, DEFAULT_PAGE_SIZE } from './constants';
 import { fetchWebsite } from './load';
 import { maxDate } from './date';
-import { QueryFilters, QueryOptions, SearchFilter } from './types';
+import { QueryFilters, QueryOptions, PageParams } from './types';
 import { filtersToArray } from './params';
 
 const MYSQL_DATE_FORMATS = {
@@ -191,7 +191,7 @@ async function rawQuery(sql: string, data: object): Promise<any> {
   return prisma.rawQuery(query, params);
 }
 
-async function pagedQuery<T>(model: string, criteria: T, filters: SearchFilter) {
+async function pagedQuery<T>(model: string, criteria: T, filters: PageParams) {
   const { page = 1, pageSize, orderBy, sortDescending = false } = filters || {};
   const size = +pageSize || DEFAULT_PAGE_SIZE;
 
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 712a6aac3b..95758b6f69 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -24,31 +24,7 @@ export type DynamicDataType = ObjectValues<typeof DATA_TYPE>;
 export type KafkaTopic = ObjectValues<typeof KAFKA_TOPIC>;
 export type ReportType = ObjectValues<typeof REPORT_TYPES>;
 
-export interface WebsiteSearchFilter extends SearchFilter {
-  userId?: string;
-  teamId?: string;
-  includeTeams?: boolean;
-  onlyTeams?: boolean;
-}
-
-export interface UserSearchFilter extends SearchFilter {
-  teamId?: string;
-}
-
-export interface TeamSearchFilter extends SearchFilter {
-  userId?: string;
-}
-
-export interface TeamUserSearchFilter extends SearchFilter {
-  teamId?: string;
-}
-
-export interface ReportSearchFilter extends SearchFilter {
-  userId?: string;
-  websiteId?: string;
-}
-
-export interface SearchFilter {
+export interface PageParams {
   query?: string;
   page?: number;
   pageSize?: number;
@@ -56,7 +32,7 @@ export interface SearchFilter {
   sortDescending?: boolean;
 }
 
-export interface FilterResult<T> {
+export interface PageResult<T> {
   data: T;
   count: number;
   page: number;
@@ -66,10 +42,10 @@ export interface FilterResult<T> {
 }
 
 export interface FilterQueryResult<T> {
-  result: FilterResult<T>;
+  result: PageResult<T>;
   query: any;
-  params: SearchFilter;
-  setParams: Dispatch<SetStateAction<T | SearchFilter>>;
+  params: PageParams;
+  setParams: Dispatch<SetStateAction<T | PageParams>>;
 }
 
 export interface DynamicData {
diff --git a/src/pages/api/admin/users.ts b/src/pages/api/admin/users.ts
index 31b72ebf9d..4f03ec9f8b 100644
--- a/src/pages/api/admin/users.ts
+++ b/src/pages/api/admin/users.ts
@@ -1,13 +1,13 @@
 import { canViewUsers } from 'lib/auth';
 import { useAuth, useValidate } from 'lib/middleware';
-import { NextApiRequestQueryBody, Role, SearchFilter, User } from 'lib/types';
+import { NextApiRequestQueryBody, Role, PageParams, User } from 'lib/types';
 import { pageInfo } from 'lib/schema';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { getUsers } from 'queries';
 import * as yup from 'yup';
 
-export interface UsersRequestQuery extends SearchFilter {}
+export interface UsersRequestQuery extends PageParams {}
 export interface UsersRequestBody {
   userId: string;
   username: string;
diff --git a/src/pages/api/admin/websites.ts b/src/pages/api/admin/websites.ts
index 4fbcd5cc69..8669214466 100644
--- a/src/pages/api/admin/websites.ts
+++ b/src/pages/api/admin/websites.ts
@@ -1,13 +1,17 @@
 import { canViewAllWebsites } from 'lib/auth';
+import { ROLES } from 'lib/constants';
 import { useAuth, useCors, useValidate } from 'lib/middleware';
-import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
+import { pageInfo } from 'lib/schema';
+import { NextApiRequestQueryBody, PageParams } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { getWebsites } from 'queries';
 import * as yup from 'yup';
-import { pageInfo } from 'lib/schema';
 
-export interface WebsitesRequestQuery extends SearchFilter {}
+export interface WebsitesRequestQuery extends PageParams {
+  userId?: string;
+  includeTeams?: boolean;
+}
 
 export interface WebsitesRequestBody {
   name: string;
@@ -39,8 +43,29 @@ export default async (
       return unauthorized(res);
     }
 
+    const { userId, includeOwnedTeams } = req.query;
+
     const websites = await getWebsites(
       {
+        where: {
+          OR: [
+            ...(userId && [{ userId }]),
+            ...(userId &&
+              includeOwnedTeams && [
+                {
+                  team: {
+                    deletedAt: null,
+                    teamUser: {
+                      some: {
+                        role: ROLES.teamOwner,
+                        userId,
+                      },
+                    },
+                  },
+                },
+              ]),
+          ],
+        },
         include: {
           user: {
             select: {
@@ -48,6 +73,18 @@ export default async (
               id: true,
             },
           },
+          team: {
+            where: {
+              deletedAt: null,
+            },
+            include: {
+              teamUser: {
+                where: {
+                  role: ROLES.teamOwner,
+                },
+              },
+            },
+          },
         },
       },
       req.query,
diff --git a/src/pages/api/teams/[teamId]/users/index.ts b/src/pages/api/teams/[teamId]/users/index.ts
index 3a03feaf40..ccbf423af1 100644
--- a/src/pages/api/teams/[teamId]/users/index.ts
+++ b/src/pages/api/teams/[teamId]/users/index.ts
@@ -1,13 +1,13 @@
 import { canAddUserToTeam, canViewTeam } from 'lib/auth';
 import { useAuth, useValidate } from 'lib/middleware';
 import { pageInfo } from 'lib/schema';
-import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
+import { NextApiRequestQueryBody, PageParams } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { badRequest, methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { createTeamUser, getTeamUser, getTeamUsers } from 'queries';
 import * as yup from 'yup';
 
-export interface TeamUserRequestQuery extends SearchFilter {
+export interface TeamUserRequestQuery extends PageParams {
   teamId: string;
 }
 
diff --git a/src/pages/api/teams/[teamId]/websites/index.ts b/src/pages/api/teams/[teamId]/websites/index.ts
index fe24485705..75020fa44b 100644
--- a/src/pages/api/teams/[teamId]/websites/index.ts
+++ b/src/pages/api/teams/[teamId]/websites/index.ts
@@ -1,13 +1,13 @@
 import * as yup from 'yup';
 import { canViewTeam } from 'lib/auth';
 import { useAuth, useValidate } from 'lib/middleware';
-import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
+import { NextApiRequestQueryBody, PageParams } from 'lib/types';
 import { pageInfo } from 'lib/schema';
 import { NextApiResponse } from 'next';
 import { ok, unauthorized } from 'next-basics';
 import { getTeamWebsites } from 'queries';
 
-export interface TeamWebsiteRequestQuery extends SearchFilter {
+export interface TeamWebsiteRequestQuery extends PageParams {
   teamId: string;
 }
 
diff --git a/src/pages/api/teams/index.ts b/src/pages/api/teams/index.ts
index 08bf8f847f..1e683469b8 100644
--- a/src/pages/api/teams/index.ts
+++ b/src/pages/api/teams/index.ts
@@ -3,13 +3,13 @@ import { Team } from '@prisma/client';
 import { canCreateTeam } from 'lib/auth';
 import { uuid } from 'lib/crypto';
 import { useAuth, useValidate } from 'lib/middleware';
-import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
+import { NextApiRequestQueryBody, PageParams } from 'lib/types';
 import { pageInfo } from 'lib/schema';
 import { NextApiResponse } from 'next';
 import { getRandomChars, methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { createTeam } from 'queries';
 
-export interface TeamsRequestQuery extends SearchFilter {}
+export interface TeamsRequestQuery extends PageParams {}
 export interface TeamsRequestBody {
   name: string;
 }
diff --git a/src/pages/api/users/[userId]/teams.ts b/src/pages/api/users/[userId]/teams.ts
index ad4af64852..3f2af9e242 100644
--- a/src/pages/api/users/[userId]/teams.ts
+++ b/src/pages/api/users/[userId]/teams.ts
@@ -1,12 +1,12 @@
 import * as yup from 'yup';
 import { useAuth, useCors, useValidate } from 'lib/middleware';
-import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
+import { NextApiRequestQueryBody, PageParams } from 'lib/types';
 import { pageInfo } from 'lib/schema';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { getUserTeams } from 'queries';
 
-export interface UserTeamsRequestQuery extends SearchFilter {
+export interface UserTeamsRequestQuery extends PageParams {
   userId: string;
 }
 
diff --git a/src/pages/api/users/index.ts b/src/pages/api/users/index.ts
index 7f8c91749e..333670a983 100644
--- a/src/pages/api/users/index.ts
+++ b/src/pages/api/users/index.ts
@@ -2,14 +2,14 @@ import { canCreateUser } from 'lib/auth';
 import { ROLES } from 'lib/constants';
 import { uuid } from 'lib/crypto';
 import { useAuth, useValidate } from 'lib/middleware';
-import { NextApiRequestQueryBody, Role, SearchFilter, User } from 'lib/types';
+import { NextApiRequestQueryBody, Role, PageParams, User } from 'lib/types';
 import { pageInfo } from 'lib/schema';
 import { NextApiResponse } from 'next';
 import { badRequest, hashPassword, methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { createUser, getUserByUsername } from 'queries';
 import * as yup from 'yup';
 
-export interface UsersRequestQuery extends SearchFilter {}
+export interface UsersRequestQuery extends PageParams {}
 export interface UsersRequestBody {
   username: string;
   password: string;
diff --git a/src/pages/api/websites/[websiteId]/reports.ts b/src/pages/api/websites/[websiteId]/reports.ts
index 5bb1652bd3..72e5b0f27b 100644
--- a/src/pages/api/websites/[websiteId]/reports.ts
+++ b/src/pages/api/websites/[websiteId]/reports.ts
@@ -1,13 +1,13 @@
 import * as yup from 'yup';
 import { canViewWebsite } from 'lib/auth';
 import { useAuth, useCors, useValidate } from 'lib/middleware';
-import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
+import { NextApiRequestQueryBody, PageParams } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { getWebsiteReports } from 'queries';
 import { pageInfo } from 'lib/schema';
 
-export interface ReportsRequestQuery extends SearchFilter {
+export interface ReportsRequestQuery extends PageParams {
   websiteId: string;
 }
 
diff --git a/src/pages/api/websites/index.ts b/src/pages/api/websites/index.ts
index 0b7826ac38..c5eb72002c 100644
--- a/src/pages/api/websites/index.ts
+++ b/src/pages/api/websites/index.ts
@@ -1,7 +1,7 @@
 import { canCreateTeamWebsite, canCreateWebsite } from 'lib/auth';
 import { uuid } from 'lib/crypto';
 import { useAuth, useCors, useValidate } from 'lib/middleware';
-import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
+import { NextApiRequestQueryBody, PageParams } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { createWebsite } from 'queries';
@@ -9,7 +9,7 @@ import userWebsitesRoute from 'pages/api/users/[userId]/websites';
 import * as yup from 'yup';
 import { pageInfo } from 'lib/schema';
 
-export interface WebsitesRequestQuery extends SearchFilter {}
+export interface WebsitesRequestQuery extends PageParams {}
 
 export interface WebsitesRequestBody {
   name: string;
diff --git a/src/queries/admin/report.ts b/src/queries/admin/report.ts
index d6b28cc4e4..dc05a1d55b 100644
--- a/src/queries/admin/report.ts
+++ b/src/queries/admin/report.ts
@@ -1,6 +1,6 @@
 import { Prisma, Report } from '@prisma/client';
 import prisma from 'lib/prisma';
-import { FilterResult, ReportSearchFilter } from 'lib/types';
+import { PageResult, PageParams } from 'lib/types';
 import ReportFindManyArgs = Prisma.ReportFindManyArgs;
 
 async function findReport(criteria: Prisma.ReportFindUniqueArgs): Promise<Report> {
@@ -17,8 +17,8 @@ export async function getReport(reportId: string): Promise<Report> {
 
 export async function getReports(
   criteria: ReportFindManyArgs,
-  filters: ReportSearchFilter = {},
-): Promise<FilterResult<Report[]>> {
+  filters: PageParams = {},
+): Promise<PageResult<Report[]>> {
   const { query } = filters;
 
   const where: Prisma.ReportWhereInput = {
@@ -50,8 +50,8 @@ export async function getReports(
 
 export async function getUserReports(
   userId: string,
-  filters?: ReportSearchFilter,
-): Promise<FilterResult<Report[]>> {
+  filters?: PageParams,
+): Promise<PageResult<Report[]>> {
   return getReports(
     {
       where: {
@@ -72,8 +72,8 @@ export async function getUserReports(
 
 export async function getWebsiteReports(
   websiteId: string,
-  filters: ReportSearchFilter = {},
-): Promise<FilterResult<Report[]>> {
+  filters: PageParams = {},
+): Promise<PageResult<Report[]>> {
   return getReports(
     {
       where: {
diff --git a/src/queries/admin/team.ts b/src/queries/admin/team.ts
index 74b877de19..e516c44633 100644
--- a/src/queries/admin/team.ts
+++ b/src/queries/admin/team.ts
@@ -2,7 +2,7 @@ import { Prisma, Team } from '@prisma/client';
 import { ROLES } from 'lib/constants';
 import { uuid } from 'lib/crypto';
 import prisma from 'lib/prisma';
-import { FilterResult, TeamSearchFilter } from 'lib/types';
+import { PageResult, PageParams } from 'lib/types';
 import TeamFindManyArgs = Prisma.TeamFindManyArgs;
 
 export async function findTeam(criteria: Prisma.TeamFindUniqueArgs): Promise<Team> {
@@ -22,8 +22,8 @@ export async function getTeam(teamId: string, options: { includeMembers?: boolea
 
 export async function getTeams(
   criteria: TeamFindManyArgs,
-  filters: TeamSearchFilter = {},
-): Promise<FilterResult<Team[]>> {
+  filters: PageParams = {},
+): Promise<PageResult<Team[]>> {
   const { getSearchParameters } = prisma;
   const { query } = filters;
 
@@ -42,7 +42,7 @@ export async function getTeams(
   );
 }
 
-export async function getUserTeams(userId: string, filters: TeamSearchFilter = {}) {
+export async function getUserTeams(userId: string, filters: PageParams = {}) {
   return getTeams(
     {
       where: {
diff --git a/src/queries/admin/teamUser.ts b/src/queries/admin/teamUser.ts
index 43785b7871..d172dd5a10 100644
--- a/src/queries/admin/teamUser.ts
+++ b/src/queries/admin/teamUser.ts
@@ -1,7 +1,7 @@
 import { Prisma, TeamUser } from '@prisma/client';
 import { uuid } from 'lib/crypto';
 import prisma from 'lib/prisma';
-import { FilterResult, TeamUserSearchFilter } from 'lib/types';
+import { PageResult, PageParams } from 'lib/types';
 import TeamUserFindManyArgs = Prisma.TeamUserFindManyArgs;
 
 export async function findTeamUser(criteria: Prisma.TeamUserFindUniqueArgs): Promise<TeamUser> {
@@ -19,8 +19,8 @@ export async function getTeamUser(teamId: string, userId: string): Promise<TeamU
 
 export async function getTeamUsers(
   criteria: TeamUserFindManyArgs,
-  filters?: TeamUserSearchFilter,
-): Promise<FilterResult<TeamUser[]>> {
+  filters?: PageParams,
+): Promise<PageResult<TeamUser[]>> {
   const { query } = filters;
 
   const where: Prisma.TeamUserWhereInput = {
diff --git a/src/queries/admin/user.ts b/src/queries/admin/user.ts
index 819f492d7e..9e08511287 100644
--- a/src/queries/admin/user.ts
+++ b/src/queries/admin/user.ts
@@ -1,7 +1,7 @@
 import { Prisma } from '@prisma/client';
 import { ROLES } from 'lib/constants';
 import prisma from 'lib/prisma';
-import { FilterResult, Role, User, UserSearchFilter } from 'lib/types';
+import { PageResult, Role, User, PageParams } from 'lib/types';
 import { getRandomChars } from 'next-basics';
 import UserFindManyArgs = Prisma.UserFindManyArgs;
 
@@ -49,8 +49,8 @@ export async function getUserByUsername(username: string, options: GetUserOption
 
 export async function getUsers(
   criteria: UserFindManyArgs,
-  filters?: UserSearchFilter,
-): Promise<FilterResult<User[]>> {
+  filters?: PageParams,
+): Promise<PageResult<User[]>> {
   const { query } = filters;
 
   const where: Prisma.UserWhereInput = {
diff --git a/src/queries/admin/website.ts b/src/queries/admin/website.ts
index 949efb7157..1f513bd4f6 100644
--- a/src/queries/admin/website.ts
+++ b/src/queries/admin/website.ts
@@ -1,6 +1,6 @@
 import { Prisma, Website } from '@prisma/client';
 import prisma from 'lib/prisma';
-import { FilterResult, WebsiteSearchFilter } from 'lib/types';
+import { PageResult, PageParams } from 'lib/types';
 import WebsiteFindManyArgs = Prisma.WebsiteFindManyArgs;
 
 async function findWebsite(criteria: Prisma.WebsiteFindUniqueArgs): Promise<Website> {
@@ -25,8 +25,8 @@ export async function getSharedWebsite(shareId: string) {
 
 export async function getWebsites(
   criteria: WebsiteFindManyArgs,
-  filters: WebsiteSearchFilter,
-): Promise<FilterResult<Website[]>> {
+  filters: PageParams,
+): Promise<PageResult<Website[]>> {
   const { query } = filters;
 
   const where: Prisma.WebsiteWhereInput = {
@@ -53,8 +53,8 @@ export async function getAllWebsites(userId: string) {
 
 export async function getUserWebsites(
   userId: string,
-  filters?: WebsiteSearchFilter,
-): Promise<FilterResult<Website[]>> {
+  filters?: PageParams,
+): Promise<PageResult<Website[]>> {
   return getWebsites(
     {
       where: {
@@ -78,8 +78,8 @@ export async function getUserWebsites(
 
 export async function getTeamWebsites(
   teamId: string,
-  filters?: WebsiteSearchFilter,
-): Promise<FilterResult<Website[]>> {
+  filters?: PageParams,
+): Promise<PageResult<Website[]>> {
   return getWebsites(
     {
       where: {

From 2ba87cd4837aa753f8d11d81573d301b875e5cc2 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 2 May 2024 18:01:43 -0700
Subject: [PATCH 031/438] Removed usage limit reference.

---
 src/lib/middleware.ts | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/lib/middleware.ts b/src/lib/middleware.ts
index 8145ac1167..f13b5c723f 100644
--- a/src/lib/middleware.ts
+++ b/src/lib/middleware.ts
@@ -8,9 +8,8 @@ import { getSession } from 'lib/session';
 import {
   badRequest,
   createMiddleware,
-  forbidden,
+  notFound,
   parseSecureToken,
-  tooManyRequest,
   unauthorized,
 } from 'next-basics';
 import { NextApiRequestCollect } from 'pages/api/send';
@@ -36,11 +35,8 @@ export const useSession = createMiddleware(async (req, res, next) => {
 
     (req as any).session = session;
   } catch (e: any) {
-    if (e.message === 'Usage Limit.') {
-      return tooManyRequest(res, e.message);
-    }
-    if (e.message.startsWith('Website not found:')) {
-      return forbidden(res, e.message);
+    if (e.message.startsWith('Website not found')) {
+      return notFound(res, e.message);
     }
     return badRequest(res, e.message);
   }

From ab94f5d1cdb073538e224314d902c7cd1b2c8016 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 2 May 2024 19:44:26 -0700
Subject: [PATCH 032/438] Moved filter params into a hook. Close #2691.

---
 .../hooks/queries/useWebsiteEvents.ts         | 30 ++--------------
 .../hooks/queries/useWebsiteMetrics.ts        | 14 ++++++--
 .../hooks/queries/useWebsitePageviews.ts      | 34 +++++--------------
 .../hooks/queries/useWebsiteStats.ts          | 24 +++----------
 src/components/hooks/useFilterParams.ts       | 31 +++++++++++++++++
 src/components/metrics/MetricsTable.tsx       | 31 +++--------------
 6 files changed, 63 insertions(+), 101 deletions(-)
 create mode 100644 src/components/hooks/useFilterParams.ts

diff --git a/src/components/hooks/queries/useWebsiteEvents.ts b/src/components/hooks/queries/useWebsiteEvents.ts
index 0cca1f95c3..10d59d6173 100644
--- a/src/components/hooks/queries/useWebsiteEvents.ts
+++ b/src/components/hooks/queries/useWebsiteEvents.ts
@@ -1,36 +1,12 @@
-import { useDateRange, useNavigation, useTimezone } from 'components/hooks';
-import { zonedTimeToUtc } from 'date-fns-tz';
 import useApi from './useApi';
+import { useFilterParams } from '../useFilterParams';
 
 export function useWebsiteEvents(websiteId: string, options?: { [key: string]: string }) {
   const { get, useQuery } = useApi();
-  const [dateRange] = useDateRange(websiteId);
-  const { startDate, endDate, unit, offset } = dateRange;
-  const { timezone } = useTimezone();
-  const {
-    query: { url, referrer, os, browser, device, country, region, city, title, event },
-  } = useNavigation();
-
-  const params = {
-    startAt: +zonedTimeToUtc(startDate, timezone),
-    endAt: +zonedTimeToUtc(endDate, timezone),
-    unit,
-    offset,
-    url,
-    referrer,
-    os,
-    browser,
-    device,
-    country,
-    region,
-    city,
-    title,
-    timezone,
-    event,
-  };
+  const params = useFilterParams(websiteId);
 
   return useQuery({
-    queryKey: ['events', { websiteId, ...params }],
+    queryKey: ['websites:events', { websiteId, ...params }],
     queryFn: () => get(`/websites/${websiteId}/events`, params),
     enabled: !!websiteId,
     ...options,
diff --git a/src/components/hooks/queries/useWebsiteMetrics.ts b/src/components/hooks/queries/useWebsiteMetrics.ts
index 8e7d00db97..301b2e04c0 100644
--- a/src/components/hooks/queries/useWebsiteMetrics.ts
+++ b/src/components/hooks/queries/useWebsiteMetrics.ts
@@ -1,12 +1,15 @@
-import useApi from './useApi';
 import { UseQueryOptions } from '@tanstack/react-query';
+import useApi from './useApi';
+import { useFilterParams } from '../useFilterParams';
 
 export function useWebsiteMetrics(
   websiteId: string,
-  params?: { [key: string]: any },
+  type: string,
+  limit: number,
   options?: Omit<UseQueryOptions & { onDataLoad?: (data: any) => void }, 'queryKey' | 'queryFn'>,
 ) {
   const { get, useQuery } = useApi();
+  const params = useFilterParams(websiteId);
 
   return useQuery({
     queryKey: [
@@ -14,21 +17,26 @@ export function useWebsiteMetrics(
       {
         websiteId,
         ...params,
+        type,
+        limit,
       },
     ],
     queryFn: async () => {
       const filters = { ...params };
 
-      filters[params.type] = undefined;
+      filters[type] = undefined;
 
       const data = await get(`/websites/${websiteId}/metrics`, {
         ...filters,
+        type,
+        limit,
       });
 
       options?.onDataLoad?.(data);
 
       return data;
     },
+    enabled: !!websiteId,
     ...options,
   });
 }
diff --git a/src/components/hooks/queries/useWebsitePageviews.ts b/src/components/hooks/queries/useWebsitePageviews.ts
index 2d6e3428be..cd3f8bf31b 100644
--- a/src/components/hooks/queries/useWebsitePageviews.ts
+++ b/src/components/hooks/queries/useWebsitePageviews.ts
@@ -1,34 +1,18 @@
-import { zonedTimeToUtc } from 'date-fns-tz';
-import { useApi, useDateRange, useNavigation, useTimezone } from 'components/hooks';
+import { UseQueryOptions } from '@tanstack/react-query';
+import { useApi } from './useApi';
+import { useFilterParams } from '..//useFilterParams';
 
-export function useWebsitePageviews(websiteId: string, options?: { [key: string]: string }) {
+export function useWebsitePageviews(
+  websiteId: string,
+  options?: Omit<UseQueryOptions & { onDataLoad?: (data: any) => void }, 'queryKey' | 'queryFn'>,
+) {
   const { get, useQuery } = useApi();
-  const [dateRange] = useDateRange(websiteId);
-  const { startDate, endDate, unit } = dateRange;
-  const { timezone } = useTimezone();
-  const {
-    query: { url, referrer, os, browser, device, country, region, city, title },
-  } = useNavigation();
-
-  const params = {
-    startAt: +zonedTimeToUtc(startDate, timezone),
-    endAt: +zonedTimeToUtc(endDate, timezone),
-    unit,
-    timezone,
-    url,
-    referrer,
-    os,
-    browser,
-    device,
-    country,
-    region,
-    city,
-    title,
-  };
+  const params = useFilterParams(websiteId);
 
   return useQuery({
     queryKey: ['websites:pageviews', { websiteId, ...params }],
     queryFn: () => get(`/websites/${websiteId}/pageviews`, params),
+    enabled: !!websiteId,
     ...options,
   });
 }
diff --git a/src/components/hooks/queries/useWebsiteStats.ts b/src/components/hooks/queries/useWebsiteStats.ts
index 2ada662f5e..c2c4b74fd0 100644
--- a/src/components/hooks/queries/useWebsiteStats.ts
+++ b/src/components/hooks/queries/useWebsiteStats.ts
@@ -1,30 +1,14 @@
-import { useApi, useDateRange, useNavigation } from 'components/hooks';
+import { useApi } from './useApi';
+import { useFilterParams } from '../useFilterParams';
 
 export function useWebsiteStats(websiteId: string, options?: { [key: string]: string }) {
   const { get, useQuery } = useApi();
-  const [dateRange] = useDateRange(websiteId);
-  const { startDate, endDate } = dateRange;
-  const {
-    query: { url, referrer, title, os, browser, device, country, region, city },
-  } = useNavigation();
-
-  const params = {
-    startAt: +startDate,
-    endAt: +endDate,
-    url,
-    referrer,
-    title,
-    os,
-    browser,
-    device,
-    country,
-    region,
-    city,
-  };
+  const params = useFilterParams(websiteId);
 
   return useQuery({
     queryKey: ['websites:stats', { websiteId, ...params }],
     queryFn: () => get(`/websites/${websiteId}/stats`, params),
+    enabled: !!websiteId,
     ...options,
   });
 }
diff --git a/src/components/hooks/useFilterParams.ts b/src/components/hooks/useFilterParams.ts
new file mode 100644
index 0000000000..18178ce5b8
--- /dev/null
+++ b/src/components/hooks/useFilterParams.ts
@@ -0,0 +1,31 @@
+import { useNavigation } from './useNavigation';
+import { useDateRange } from './useDateRange';
+import { useTimezone } from './useTimezone';
+import { zonedTimeToUtc } from 'date-fns-tz';
+
+export function useFilterParams(websiteId: string) {
+  const [dateRange] = useDateRange(websiteId);
+  const { startDate, endDate, unit, offset } = dateRange;
+  const { timezone } = useTimezone();
+  const {
+    query: { url, referrer, title, os, browser, device, country, region, city, event },
+  } = useNavigation();
+
+  return {
+    startAt: +zonedTimeToUtc(startDate, timezone),
+    endAt: +zonedTimeToUtc(endDate, timezone),
+    unit,
+    offset,
+    timezone,
+    url,
+    referrer,
+    title,
+    os,
+    browser,
+    device,
+    country,
+    region,
+    city,
+    event,
+  };
+}
diff --git a/src/components/metrics/MetricsTable.tsx b/src/components/metrics/MetricsTable.tsx
index 26355018ff..cfabdd3056 100644
--- a/src/components/metrics/MetricsTable.tsx
+++ b/src/components/metrics/MetricsTable.tsx
@@ -6,7 +6,6 @@ import LinkButton from 'components/common/LinkButton';
 import { DEFAULT_ANIMATION_DURATION } from 'lib/constants';
 import { percentFilter } from 'lib/filters';
 import {
-  useDateRange,
   useNavigation,
   useWebsiteMetrics,
   useMessages,
@@ -45,34 +44,14 @@ export function MetricsTable({
 }: MetricsTableProps) {
   const [search, setSearch] = useState('');
   const { formatValue } = useFormat();
-  const [{ startDate, endDate }] = useDateRange(websiteId);
-  const {
-    renderUrl,
-    query: { url, referrer, title, os, browser, device, country, region, city },
-  } = useNavigation();
+  const { renderUrl } = useNavigation();
   const { formatMessage, labels } = useMessages();
   const { dir } = useLocale();
 
-  const { data, isLoading, isFetched, error } = useWebsiteMetrics(
-    websiteId,
-    {
-      type,
-      startAt: +startDate,
-      endAt: +endDate,
-      url,
-      referrer,
-      os,
-      title,
-      browser,
-      device,
-      country,
-      region,
-      city,
-      limit,
-      search,
-    },
-    { retryDelay: delay || DEFAULT_ANIMATION_DURATION, onDataLoad },
-  );
+  const { data, isLoading, isFetched, error } = useWebsiteMetrics(websiteId, type, limit, {
+    retryDelay: delay || DEFAULT_ANIMATION_DURATION,
+    onDataLoad,
+  });
 
   const filteredData = useMemo(() => {
     if (data) {

From e0510a815e9b38c0b073482f69e52dff8c3ff4db Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 2 May 2024 19:48:56 -0700
Subject: [PATCH 033/438] Fixed types.

---
 src/components/hooks/queries/useWebsiteEvents.ts    | 6 +++++-
 src/components/hooks/queries/useWebsitePageviews.ts | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/hooks/queries/useWebsiteEvents.ts b/src/components/hooks/queries/useWebsiteEvents.ts
index 10d59d6173..588d4fb568 100644
--- a/src/components/hooks/queries/useWebsiteEvents.ts
+++ b/src/components/hooks/queries/useWebsiteEvents.ts
@@ -1,7 +1,11 @@
 import useApi from './useApi';
 import { useFilterParams } from '../useFilterParams';
+import { UseQueryOptions } from '@tanstack/react-query';
 
-export function useWebsiteEvents(websiteId: string, options?: { [key: string]: string }) {
+export function useWebsiteEvents(
+  websiteId: string,
+  options?: Omit<UseQueryOptions, 'queryKey' | 'queryFn'>,
+) {
   const { get, useQuery } = useApi();
   const params = useFilterParams(websiteId);
 
diff --git a/src/components/hooks/queries/useWebsitePageviews.ts b/src/components/hooks/queries/useWebsitePageviews.ts
index cd3f8bf31b..0db1fe6388 100644
--- a/src/components/hooks/queries/useWebsitePageviews.ts
+++ b/src/components/hooks/queries/useWebsitePageviews.ts
@@ -4,7 +4,7 @@ import { useFilterParams } from '..//useFilterParams';
 
 export function useWebsitePageviews(
   websiteId: string,
-  options?: Omit<UseQueryOptions & { onDataLoad?: (data: any) => void }, 'queryKey' | 'queryFn'>,
+  options?: Omit<UseQueryOptions, 'queryKey' | 'queryFn'>,
 ) {
   const { get, useQuery } = useApi();
   const params = useFilterParams(websiteId);

From abb7da8c955f265e00a7d7eccb7e93a5a826d973 Mon Sep 17 00:00:00 2001
From: mobeicanyue <81098819+mobeicanyue@users.noreply.github.com>
Date: Fri, 3 May 2024 13:09:00 +0800
Subject: [PATCH 034/438] Update zh-CN.json

---
 src/lang/zh-CN.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lang/zh-CN.json b/src/lang/zh-CN.json
index 772562b483..4bf90fd165 100644
--- a/src/lang/zh-CN.json
+++ b/src/lang/zh-CN.json
@@ -152,7 +152,7 @@
   "label.settings": "设置",
   "label.share-url": "共享链接",
   "label.single-day": "单日",
-  "label.steps": "Steps",
+  "label.steps": "步骤",
   "label.sum": "总和",
   "label.tablet": "平板",
   "label.team": "团队",

From 8b5e690c3bf462c3b7487cd6adaba545bc7c02e7 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 2 May 2024 23:58:58 -0700
Subject: [PATCH 035/438] Updated language bundles.

---
 public/intl/messages/bs-BA.json |   4 +-
 public/intl/messages/ca-ES.json | 312 ++++++++++++++---------------
 public/intl/messages/tr-TR.json | 340 +++++++++++++++-----------------
 public/intl/messages/zh-CN.json |  16 +-
 4 files changed, 330 insertions(+), 342 deletions(-)

diff --git a/public/intl/messages/bs-BA.json b/public/intl/messages/bs-BA.json
index eb368d9ce2..1360efabae 100644
--- a/public/intl/messages/bs-BA.json
+++ b/public/intl/messages/bs-BA.json
@@ -506,13 +506,13 @@
   "label.join": [
     {
       "type": 0,
-      "value": "Join"
+      "value": "Učlani se"
     }
   ],
   "label.join-team": [
     {
       "type": 0,
-      "value": "Join team"
+      "value": "Učlani se u tim"
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/ca-ES.json b/public/intl/messages/ca-ES.json
index cd8d50ab1f..e6cb4c5eab 100644
--- a/public/intl/messages/ca-ES.json
+++ b/public/intl/messages/ca-ES.json
@@ -2,7 +2,7 @@
   "label.access-code": [
     {
       "type": 0,
-      "value": "Access code"
+      "value": "Codi d'accés"
     }
   ],
   "label.actions": [
@@ -14,37 +14,37 @@
   "label.activity-log": [
     {
       "type": 0,
-      "value": "Activity log"
+      "value": "Registre d'activitat"
     }
   ],
   "label.add": [
     {
       "type": 0,
-      "value": "Add"
+      "value": "Afegir"
     }
   ],
   "label.add-description": [
     {
       "type": 0,
-      "value": "Add description"
+      "value": "Afegir descripció"
     }
   ],
   "label.add-member": [
     {
       "type": 0,
-      "value": "Add member"
+      "value": "Afegir membre"
     }
   ],
   "label.add-step": [
     {
       "type": 0,
-      "value": "Add step"
+      "value": "Afegir pas"
     }
   ],
   "label.add-website": [
     {
       "type": 0,
-      "value": "Afegeix lloc web"
+      "value": "Afegir lloc web"
     }
   ],
   "label.admin": [
@@ -56,7 +56,7 @@
   "label.after": [
     {
       "type": 0,
-      "value": "After"
+      "value": "Després"
     }
   ],
   "label.all": [
@@ -74,13 +74,13 @@
   "label.analytics": [
     {
       "type": 0,
-      "value": "Analytics"
+      "value": "Analítiques"
     }
   ],
   "label.average": [
     {
       "type": 0,
-      "value": "Average"
+      "value": "Mitjana"
     }
   ],
   "label.average-visit-time": [
@@ -98,7 +98,7 @@
   "label.before": [
     {
       "type": 0,
-      "value": "Before"
+      "value": "Abans"
     }
   ],
   "label.bounce-rate": [
@@ -110,13 +110,13 @@
   "label.breakdown": [
     {
       "type": 0,
-      "value": "Breakdown"
+      "value": "Desglossament"
     }
   ],
   "label.browser": [
     {
       "type": 0,
-      "value": "Browser"
+      "value": "Navegador"
     }
   ],
   "label.browsers": [
@@ -140,25 +140,25 @@
   "label.cities": [
     {
       "type": 0,
-      "value": "Cities"
+      "value": "Ciutats"
     }
   ],
   "label.city": [
     {
       "type": 0,
-      "value": "City"
+      "value": "Ciutat"
     }
   ],
   "label.clear-all": [
     {
       "type": 0,
-      "value": "Clear all"
+      "value": "Netejar tot"
     }
   ],
   "label.confirm": [
     {
       "type": 0,
-      "value": "Confirm"
+      "value": "Confirmar"
     }
   ],
   "label.confirm-password": [
@@ -170,13 +170,13 @@
   "label.contains": [
     {
       "type": 0,
-      "value": "Contains"
+      "value": "Conté"
     }
   ],
   "label.continue": [
     {
       "type": 0,
-      "value": "Continue"
+      "value": "Continuar"
     }
   ],
   "label.countries": [
@@ -188,43 +188,43 @@
   "label.country": [
     {
       "type": 0,
-      "value": "Country"
+      "value": "País"
     }
   ],
   "label.create": [
     {
       "type": 0,
-      "value": "Create"
+      "value": "Crear"
     }
   ],
   "label.create-report": [
     {
       "type": 0,
-      "value": "Create report"
+      "value": "Crear informe"
     }
   ],
   "label.create-team": [
     {
       "type": 0,
-      "value": "Create team"
+      "value": "Crear equip"
     }
   ],
   "label.create-user": [
     {
       "type": 0,
-      "value": "Create user"
+      "value": "Crear usuari"
     }
   ],
   "label.created": [
     {
       "type": 0,
-      "value": "Created"
+      "value": "Creat"
     }
   ],
   "label.created-by": [
     {
       "type": 0,
-      "value": "Created By"
+      "value": "Creat Per"
     }
   ],
   "label.current-password": [
@@ -248,13 +248,13 @@
   "label.data": [
     {
       "type": 0,
-      "value": "Data"
+      "value": "Dades"
     }
   ],
   "label.date": [
     {
       "type": 0,
-      "value": "Date"
+      "value": "Data"
     }
   ],
   "label.date-range": [
@@ -266,7 +266,7 @@
   "label.day": [
     {
       "type": 0,
-      "value": "Day"
+      "value": "Dia"
     }
   ],
   "label.default-date-range": [
@@ -284,19 +284,19 @@
   "label.delete-report": [
     {
       "type": 0,
-      "value": "Delete report"
+      "value": "Eliminar informe"
     }
   ],
   "label.delete-team": [
     {
       "type": 0,
-      "value": "Delete team"
+      "value": "Eliminar equip"
     }
   ],
   "label.delete-user": [
     {
       "type": 0,
-      "value": "Delete user"
+      "value": "Eliminar usuari"
     }
   ],
   "label.delete-website": [
@@ -308,7 +308,7 @@
   "label.description": [
     {
       "type": 0,
-      "value": "Description"
+      "value": "Descripció"
     }
   ],
   "label.desktop": [
@@ -320,13 +320,13 @@
   "label.details": [
     {
       "type": 0,
-      "value": "Details"
+      "value": "Detalls"
     }
   ],
   "label.device": [
     {
       "type": 0,
-      "value": "Device"
+      "value": "Dispositiu"
     }
   ],
   "label.devices": [
@@ -344,7 +344,7 @@
   "label.does-not-contain": [
     {
       "type": 0,
-      "value": "Does not contain"
+      "value": "No conté"
     }
   ],
   "label.domain": [
@@ -356,7 +356,7 @@
   "label.dropoff": [
     {
       "type": 0,
-      "value": "Dropoff"
+      "value": "Abandonament"
     }
   ],
   "label.edit": [
@@ -368,13 +368,13 @@
   "label.edit-dashboard": [
     {
       "type": 0,
-      "value": "Edit dashboard"
+      "value": "Edita panell"
     }
   ],
   "label.edit-member": [
     {
       "type": 0,
-      "value": "Edit member"
+      "value": "Edita membre"
     }
   ],
   "label.enable-share-url": [
@@ -386,13 +386,13 @@
   "label.event": [
     {
       "type": 0,
-      "value": "Event"
+      "value": "Esdeveniment"
     }
   ],
   "label.event-data": [
     {
       "type": 0,
-      "value": "Event data"
+      "value": "Dades de l'esdeveniment"
     }
   ],
   "label.events": [
@@ -404,25 +404,25 @@
   "label.false": [
     {
       "type": 0,
-      "value": "False"
+      "value": "Fals"
     }
   ],
   "label.field": [
     {
       "type": 0,
-      "value": "Field"
+      "value": "Camp"
     }
   ],
   "label.fields": [
     {
       "type": 0,
-      "value": "Fields"
+      "value": "Camps"
     }
   ],
   "label.filter": [
     {
       "type": 0,
-      "value": "Filter"
+      "value": "Filtre"
     }
   ],
   "label.filter-combined": [
@@ -440,31 +440,31 @@
   "label.filters": [
     {
       "type": 0,
-      "value": "Filters"
+      "value": "Filtres"
     }
   ],
   "label.funnel": [
     {
       "type": 0,
-      "value": "Funnel"
+      "value": "Embut"
     }
   ],
   "label.funnel-description": [
     {
       "type": 0,
-      "value": "Understand the conversion and drop-off rate of users."
+      "value": "Entengui la taxa de conversió i abandonament dels usuaris."
     }
   ],
   "label.greater-than": [
     {
       "type": 0,
-      "value": "Greater than"
+      "value": "Més gran que"
     }
   ],
   "label.greater-than-equals": [
     {
       "type": 0,
-      "value": "Greater than or equals"
+      "value": "Més gran que o igual a"
     }
   ],
   "label.insights": [
@@ -476,55 +476,55 @@
   "label.insights-description": [
     {
       "type": 0,
-      "value": "Dive deeper into your data by using segments and filters."
+      "value": "Aprofundeixi en les seves dades mitjançant l'ús de segments i filtres."
     }
   ],
   "label.is": [
     {
       "type": 0,
-      "value": "Is"
+      "value": "És igual a"
     }
   ],
   "label.is-not": [
     {
       "type": 0,
-      "value": "Is not"
+      "value": "No és igual a"
     }
   ],
   "label.is-not-set": [
     {
       "type": 0,
-      "value": "Is not set"
+      "value": "No està establert"
     }
   ],
   "label.is-set": [
     {
       "type": 0,
-      "value": "Is set"
+      "value": "Està establert"
     }
   ],
   "label.join": [
     {
       "type": 0,
-      "value": "Join"
+      "value": "Unir"
     }
   ],
   "label.join-team": [
     {
       "type": 0,
-      "value": "Join team"
+      "value": "Unir-se al equip"
     }
   ],
   "label.language": [
     {
       "type": 0,
-      "value": "Language"
+      "value": "Idioma"
     }
   ],
   "label.languages": [
     {
       "type": 0,
-      "value": "Llengües"
+      "value": "Idiomes"
     }
   ],
   "label.laptop": [
@@ -564,7 +564,7 @@
   "label.last-months": [
     {
       "type": 0,
-      "value": "Last "
+      "value": "Últims "
     },
     {
       "type": 1,
@@ -572,31 +572,31 @@
     },
     {
       "type": 0,
-      "value": " months"
+      "value": " mesos"
     }
   ],
   "label.leave": [
     {
       "type": 0,
-      "value": "Leave"
+      "value": "Abandonar"
     }
   ],
   "label.leave-team": [
     {
       "type": 0,
-      "value": "Leave team"
+      "value": "Abandonar equip"
     }
   ],
   "label.less-than": [
     {
       "type": 0,
-      "value": "Less than"
+      "value": "Menor que"
     }
   ],
   "label.less-than-equals": [
     {
       "type": 0,
-      "value": "Less than or equals"
+      "value": "Menor que o igual a"
     }
   ],
   "label.login": [
@@ -614,31 +614,31 @@
   "label.manage": [
     {
       "type": 0,
-      "value": "Manage"
+      "value": "Administrar"
     }
   ],
   "label.max": [
     {
       "type": 0,
-      "value": "Max"
+      "value": "Màx"
     }
   ],
   "label.member": [
     {
       "type": 0,
-      "value": "Member"
+      "value": "Membre"
     }
   ],
   "label.members": [
     {
       "type": 0,
-      "value": "Members"
+      "value": "Membres"
     }
   ],
   "label.min": [
     {
       "type": 0,
-      "value": "Min"
+      "value": "Mín"
     }
   ],
   "label.mobile": [
@@ -656,13 +656,13 @@
   "label.my-account": [
     {
       "type": 0,
-      "value": "My account"
+      "value": "El meu compte"
     }
   ],
   "label.my-websites": [
     {
       "type": 0,
-      "value": "My websites"
+      "value": "Els meus llocs web"
     }
   ],
   "label.name": [
@@ -680,7 +680,7 @@
   "label.none": [
     {
       "type": 0,
-      "value": "None"
+      "value": "Cap"
     }
   ],
   "label.number-of-records": [
@@ -726,13 +726,13 @@
   "label.os": [
     {
       "type": 0,
-      "value": "OS"
+      "value": "SO"
     }
   ],
   "label.overview": [
     {
       "type": 0,
-      "value": "Overview"
+      "value": "Resum"
     }
   ],
   "label.owner": [
@@ -744,7 +744,7 @@
   "label.page-of": [
     {
       "type": 0,
-      "value": "Page "
+      "value": "Pàgina "
     },
     {
       "type": 1,
@@ -752,7 +752,7 @@
     },
     {
       "type": 0,
-      "value": " of "
+      "value": " de "
     },
     {
       "type": 1,
@@ -768,7 +768,7 @@
   "label.pageTitle": [
     {
       "type": 0,
-      "value": "Page title"
+      "value": "Títol de la pàgina"
     }
   ],
   "label.pages": [
@@ -802,19 +802,19 @@
   "label.queries": [
     {
       "type": 0,
-      "value": "Queries"
+      "value": "Consultes"
     }
   ],
   "label.query": [
     {
       "type": 0,
-      "value": "Query"
+      "value": "Consulta"
     }
   ],
   "label.query-parameters": [
     {
       "type": 0,
-      "value": "Query parameters"
+      "value": "Paràmetres de consulta"
     }
   ],
   "label.realtime": [
@@ -826,7 +826,7 @@
   "label.referrer": [
     {
       "type": 0,
-      "value": "Referrer"
+      "value": "Referent"
     }
   ],
   "label.referrers": [
@@ -844,13 +844,13 @@
   "label.regenerate": [
     {
       "type": 0,
-      "value": "Regenerate"
+      "value": "Regenerar"
     }
   ],
   "label.region": [
     {
       "type": 0,
-      "value": "Region"
+      "value": "Regió"
     }
   ],
   "label.regions": [
@@ -862,19 +862,19 @@
   "label.remove": [
     {
       "type": 0,
-      "value": "Remove"
+      "value": "Treure"
     }
   ],
   "label.remove-member": [
     {
       "type": 0,
-      "value": "Remove member"
+      "value": "Eliminar membre"
     }
   ],
   "label.reports": [
     {
       "type": 0,
-      "value": "Reports"
+      "value": "Informes"
     }
   ],
   "label.required": [
@@ -898,25 +898,25 @@
   "label.retention": [
     {
       "type": 0,
-      "value": "Retention"
+      "value": "Retenció"
     }
   ],
   "label.retention-description": [
     {
       "type": 0,
-      "value": "Measure your website stickiness by tracking how often users return."
+      "value": "Mesuri la retenció del seu lloc web fent un seguiment de la freqüència amb què tornen els usuaris."
     }
   ],
   "label.role": [
     {
       "type": 0,
-      "value": "Role"
+      "value": "Rol"
     }
   ],
   "label.run-query": [
     {
       "type": 0,
-      "value": "Run query"
+      "value": "Executar consulta"
     }
   ],
   "label.save": [
@@ -928,37 +928,37 @@
   "label.screens": [
     {
       "type": 0,
-      "value": "Screens"
+      "value": "Pantalles"
     }
   ],
   "label.search": [
     {
       "type": 0,
-      "value": "Search"
+      "value": "Buscar"
     }
   ],
   "label.select": [
     {
       "type": 0,
-      "value": "Select"
+      "value": "Seleccionar"
     }
   ],
   "label.select-date": [
     {
       "type": 0,
-      "value": "Select date"
+      "value": "Seleccionar data"
     }
   ],
   "label.select-role": [
     {
       "type": 0,
-      "value": "Select role"
+      "value": "Seleccionar rol"
     }
   ],
   "label.select-website": [
     {
       "type": 0,
-      "value": "Select website"
+      "value": "Seleccionar lloc web"
     }
   ],
   "label.sessions": [
@@ -988,13 +988,13 @@
   "label.steps": [
     {
       "type": 0,
-      "value": "Steps"
+      "value": "Pasos"
     }
   ],
   "label.sum": [
     {
       "type": 0,
-      "value": "Sum"
+      "value": "Suma"
     }
   ],
   "label.tablet": [
@@ -1006,55 +1006,55 @@
   "label.team": [
     {
       "type": 0,
-      "value": "Team"
+      "value": "Equip"
     }
   ],
   "label.team-id": [
     {
       "type": 0,
-      "value": "Team ID"
+      "value": "ID del equip"
     }
   ],
   "label.team-member": [
     {
       "type": 0,
-      "value": "Team member"
+      "value": "Membre de l'equip"
     }
   ],
   "label.team-name": [
     {
       "type": 0,
-      "value": "Team name"
+      "value": "Nom de l'equip"
     }
   ],
   "label.team-owner": [
     {
       "type": 0,
-      "value": "Team owner"
+      "value": "Propietari de l'equip"
     }
   ],
   "label.team-view-only": [
     {
       "type": 0,
-      "value": "Team view only"
+      "value": "Vista només de l'equip"
     }
   ],
   "label.team-websites": [
     {
       "type": 0,
-      "value": "Team websites"
+      "value": "Llocs web de l'equip"
     }
   ],
   "label.teams": [
     {
       "type": 0,
-      "value": "Teams"
+      "value": "Equips"
     }
   ],
   "label.theme": [
     {
       "type": 0,
-      "value": "Theme"
+      "value": "Tema"
     }
   ],
   "label.this-month": [
@@ -1084,7 +1084,7 @@
   "label.title": [
     {
       "type": 0,
-      "value": "Title"
+      "value": "Títol"
     }
   ],
   "label.today": [
@@ -1108,7 +1108,7 @@
   "label.total-records": [
     {
       "type": 0,
-      "value": "Total records"
+      "value": "Total de registres"
     }
   ],
   "label.tracking-code": [
@@ -1120,31 +1120,31 @@
   "label.transfer": [
     {
       "type": 0,
-      "value": "Transfer"
+      "value": "Transferir"
     }
   ],
   "label.transfer-website": [
     {
       "type": 0,
-      "value": "Transfer website"
+      "value": "Transferir lloc web"
     }
   ],
   "label.true": [
     {
       "type": 0,
-      "value": "True"
+      "value": "Cert"
     }
   ],
   "label.type": [
     {
       "type": 0,
-      "value": "Type"
+      "value": "Tipus"
     }
   ],
   "label.unique": [
     {
       "type": 0,
-      "value": "Unique"
+      "value": "Únic"
     }
   ],
   "label.unique-visitors": [
@@ -1162,13 +1162,13 @@
   "label.untitled": [
     {
       "type": 0,
-      "value": "Untitled"
+      "value": "Sense títol"
     }
   ],
   "label.update": [
     {
       "type": 0,
-      "value": "Update"
+      "value": "Actualitzar"
     }
   ],
   "label.url": [
@@ -1186,7 +1186,7 @@
   "label.user": [
     {
       "type": 0,
-      "value": "User"
+      "value": "Usuari"
     }
   ],
   "label.username": [
@@ -1198,7 +1198,7 @@
   "label.users": [
     {
       "type": 0,
-      "value": "Users"
+      "value": "Usuaris"
     }
   ],
   "label.utm": [
@@ -1210,19 +1210,19 @@
   "label.utm-description": [
     {
       "type": 0,
-      "value": "Track your campaigns through UTM parameters."
+      "value": "Rastreji les seves campanyes a través de paràmetres UTM."
     }
   ],
   "label.value": [
     {
       "type": 0,
-      "value": "Value"
+      "value": "Valor"
     }
   ],
   "label.view": [
     {
       "type": 0,
-      "value": "View"
+      "value": "Visualitzar"
     }
   ],
   "label.view-details": [
@@ -1234,7 +1234,7 @@
   "label.view-only": [
     {
       "type": 0,
-      "value": "View only"
+      "value": "Només veure"
     }
   ],
   "label.views": [
@@ -1258,19 +1258,19 @@
   "label.visits": [
     {
       "type": 0,
-      "value": "Visits"
+      "value": "Visites"
     }
   ],
   "label.website": [
     {
       "type": 0,
-      "value": "Website"
+      "value": "Lloc web"
     }
   ],
   "label.website-id": [
     {
       "type": 0,
-      "value": "Website ID"
+      "value": "ID del lloc web"
     }
   ],
   "label.websites": [
@@ -1282,7 +1282,7 @@
   "label.window": [
     {
       "type": 0,
-      "value": "Window"
+      "value": "Finestra"
     }
   ],
   "label.yesterday": [
@@ -1294,7 +1294,7 @@
   "message.action-confirmation": [
     {
       "type": 0,
-      "value": "Type "
+      "value": "Escrigui "
     },
     {
       "type": 1,
@@ -1302,7 +1302,7 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " al cuadre inferior per confirmar."
     }
   ],
   "message.active-users": [
@@ -1342,7 +1342,7 @@
   "message.confirm-delete": [
     {
       "type": 0,
-      "value": "Segur que vols esborrar "
+      "value": "Segur que vol esborrar "
     },
     {
       "type": 1,
@@ -1356,7 +1356,7 @@
   "message.confirm-leave": [
     {
       "type": 0,
-      "value": "Are you sure you want to leave "
+      "value": "Segur que vol abandonar "
     },
     {
       "type": 1,
@@ -1370,7 +1370,7 @@
   "message.confirm-remove": [
     {
       "type": 0,
-      "value": "Are you sure you want to remove "
+      "value": "Segur que vol eliminar "
     },
     {
       "type": 1,
@@ -1384,7 +1384,7 @@
   "message.confirm-reset": [
     {
       "type": 0,
-      "value": "Segur que vols restablir les estadístiques de "
+      "value": "Segur que vol restablir les estadístiques de "
     },
     {
       "type": 1,
@@ -1398,7 +1398,7 @@
   "message.delete-team-warning": [
     {
       "type": 0,
-      "value": "Deleting a team will also delete all team websites."
+      "value": "Al eliminar un equip també s'eliminaran tots els llocs web de l'equip."
     }
   ],
   "message.delete-website-warning": [
@@ -1420,7 +1420,7 @@
     },
     {
       "type": 0,
-      "value": " on "
+      "value": " a "
     },
     {
       "type": 1,
@@ -1448,7 +1448,7 @@
   "message.min-password-length": [
     {
       "type": 0,
-      "value": "Minimum length of "
+      "value": "Longitud mínima de "
     },
     {
       "type": 1,
@@ -1456,13 +1456,13 @@
     },
     {
       "type": 0,
-      "value": " characters"
+      "value": " caràcters"
     }
   ],
   "message.new-version-available": [
     {
       "type": 0,
-      "value": "A new version of Umami "
+      "value": "Una nova versió d'Umami "
     },
     {
       "type": 1,
@@ -1470,7 +1470,7 @@
     },
     {
       "type": 0,
-      "value": " is available!"
+      "value": " està disponible!"
     }
   ],
   "message.no-data-available": [
@@ -1482,7 +1482,7 @@
   "message.no-event-data": [
     {
       "type": 0,
-      "value": "No event data is available."
+      "value": "No hi ha dades d'esdeveniments disponibles."
     }
   ],
   "message.no-match-password": [
@@ -1494,25 +1494,25 @@
   "message.no-results-found": [
     {
       "type": 0,
-      "value": "No results were found."
+      "value": "No s'han trobat resultats."
     }
   ],
   "message.no-team-websites": [
     {
       "type": 0,
-      "value": "This team does not have any websites."
+      "value": "Aquest equip no té cap lloc web."
     }
   ],
   "message.no-teams": [
     {
       "type": 0,
-      "value": "You have not created any teams."
+      "value": "No ha creat cap equip."
     }
   ],
   "message.no-users": [
     {
       "type": 0,
-      "value": "There are no users."
+      "value": "No hi ha cap usuari."
     }
   ],
   "message.no-websites-configured": [
@@ -1530,7 +1530,7 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "To reset this website, type "
+      "value": "Per restablir aquest lloc web, escrigui "
     },
     {
       "type": 1,
@@ -1538,7 +1538,7 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " al cuadre inferior per confirmar."
     }
   ],
   "message.reset-website-warning": [
@@ -1570,19 +1570,19 @@
   "message.team-already-member": [
     {
       "type": 0,
-      "value": "You are already a member of the team."
+      "value": "Ja és membre d'aquest equip."
     }
   ],
   "message.team-not-found": [
     {
       "type": 0,
-      "value": "Team not found."
+      "value": "Equip no trobat."
     }
   ],
   "message.team-websites-info": [
     {
       "type": 0,
-      "value": "Websites can be viewed by anyone on the team."
+      "value": "Els llocs web poden ser visualitzats per qualsevol membre de l'equip."
     }
   ],
   "message.tracking-code": [
@@ -1594,37 +1594,37 @@
   "message.transfer-team-website-to-user": [
     {
       "type": 0,
-      "value": "Transfer this website to your account?"
+      "value": "Transferir aquest lloc web al seu compte?"
     }
   ],
   "message.transfer-user-website-to-team": [
     {
       "type": 0,
-      "value": "Select the team to transfer this website to."
+      "value": "Seleccioni l'equip al qui transferir aquest lloc web."
     }
   ],
   "message.transfer-website": [
     {
       "type": 0,
-      "value": "Transfer website ownership to your account or another team."
+      "value": "Transferir la propietat del lloc web al seu compte o a un altre equip."
     }
   ],
   "message.triggered-event": [
     {
       "type": 0,
-      "value": "Triggered event"
+      "value": "Esdeveniment desencadenat"
     }
   ],
   "message.user-deleted": [
     {
       "type": 0,
-      "value": "User deleted."
+      "value": "Usuari eliminat."
     }
   ],
   "message.viewed-page": [
     {
       "type": 0,
-      "value": "Viewed page"
+      "value": "Pàgina vista"
     }
   ],
   "message.visitor-log": [
@@ -1664,7 +1664,7 @@
   "message.visitors-dropped-off": [
     {
       "type": 0,
-      "value": "Visitors dropped off"
+      "value": "Els visitants han sortit"
     }
   ]
 }
diff --git a/public/intl/messages/tr-TR.json b/public/intl/messages/tr-TR.json
index b48a6b06ef..224426122e 100644
--- a/public/intl/messages/tr-TR.json
+++ b/public/intl/messages/tr-TR.json
@@ -2,7 +2,7 @@
   "label.access-code": [
     {
       "type": 0,
-      "value": "Access code"
+      "value": "Erişim Kodu"
     }
   ],
   "label.actions": [
@@ -14,31 +14,31 @@
   "label.activity-log": [
     {
       "type": 0,
-      "value": "Activity log"
+      "value": "Aktivite Kaydı"
     }
   ],
   "label.add": [
     {
       "type": 0,
-      "value": "Add"
+      "value": "Ekle"
     }
   ],
   "label.add-description": [
     {
       "type": 0,
-      "value": "Add description"
+      "value": "Açıklama ekle"
     }
   ],
   "label.add-member": [
     {
       "type": 0,
-      "value": "Add member"
+      "value": "Üye ekle"
     }
   ],
   "label.add-step": [
     {
       "type": 0,
-      "value": "Add step"
+      "value": "Adım ekle"
     }
   ],
   "label.add-website": [
@@ -47,7 +47,7 @@
       "value": "Web sitesi ekle"
     }
   ],
-  "label.admin": [
+  "label.administrator": [
     {
       "type": 0,
       "value": "Yönetici"
@@ -56,7 +56,7 @@
   "label.after": [
     {
       "type": 0,
-      "value": "After"
+      "value": "Sonra"
     }
   ],
   "label.all": [
@@ -68,19 +68,19 @@
   "label.all-time": [
     {
       "type": 0,
-      "value": "All time"
+      "value": "Tüm zamanlar"
     }
   ],
   "label.analytics": [
     {
       "type": 0,
-      "value": "Analytics"
+      "value": "Analitik"
     }
   ],
   "label.average": [
     {
       "type": 0,
-      "value": "Average"
+      "value": "Ortalama"
     }
   ],
   "label.average-visit-time": [
@@ -98,25 +98,25 @@
   "label.before": [
     {
       "type": 0,
-      "value": "Before"
+      "value": "Önce"
     }
   ],
   "label.bounce-rate": [
     {
       "type": 0,
-      "value": "Çıkma oranı"
+      "value": "Tek sayfa ziyaret oranı"
     }
   ],
   "label.breakdown": [
     {
       "type": 0,
-      "value": "Breakdown"
+      "value": "Dağılım"
     }
   ],
   "label.browser": [
     {
       "type": 0,
-      "value": "Browser"
+      "value": "Tarayıcı"
     }
   ],
   "label.browsers": [
@@ -140,25 +140,25 @@
   "label.cities": [
     {
       "type": 0,
-      "value": "Cities"
+      "value": "Şehirler"
     }
   ],
   "label.city": [
     {
       "type": 0,
-      "value": "City"
+      "value": "Şehir"
     }
   ],
   "label.clear-all": [
     {
       "type": 0,
-      "value": "Clear all"
+      "value": "Hepsini temizle"
     }
   ],
   "label.confirm": [
     {
       "type": 0,
-      "value": "Confirm"
+      "value": "Onayla"
     }
   ],
   "label.confirm-password": [
@@ -170,13 +170,13 @@
   "label.contains": [
     {
       "type": 0,
-      "value": "Contains"
+      "value": "İçeriği"
     }
   ],
   "label.continue": [
     {
       "type": 0,
-      "value": "Continue"
+      "value": "Devam et"
     }
   ],
   "label.countries": [
@@ -188,43 +188,43 @@
   "label.country": [
     {
       "type": 0,
-      "value": "Country"
+      "value": "Ülke"
     }
   ],
   "label.create": [
     {
       "type": 0,
-      "value": "Create"
+      "value": "Oluştur"
     }
   ],
   "label.create-report": [
     {
       "type": 0,
-      "value": "Create report"
+      "value": "Rapor oluştur"
     }
   ],
   "label.create-team": [
     {
       "type": 0,
-      "value": "Create team"
+      "value": "Takım oluştur"
     }
   ],
   "label.create-user": [
     {
       "type": 0,
-      "value": "Create user"
+      "value": "Kullanıcı oluştur"
     }
   ],
   "label.created": [
     {
       "type": 0,
-      "value": "Created"
+      "value": "Oluşturuldu"
     }
   ],
   "label.created-by": [
     {
       "type": 0,
-      "value": "Created By"
+      "value": "Tarafından oluşturldu"
     }
   ],
   "label.current-password": [
@@ -248,13 +248,13 @@
   "label.data": [
     {
       "type": 0,
-      "value": "Data"
+      "value": "Veri"
     }
   ],
   "label.date": [
     {
       "type": 0,
-      "value": "Date"
+      "value": "Tarih"
     }
   ],
   "label.date-range": [
@@ -266,7 +266,7 @@
   "label.day": [
     {
       "type": 0,
-      "value": "Day"
+      "value": "Gün"
     }
   ],
   "label.default-date-range": [
@@ -284,19 +284,19 @@
   "label.delete-report": [
     {
       "type": 0,
-      "value": "Delete report"
+      "value": "Rapor sil"
     }
   ],
   "label.delete-team": [
     {
       "type": 0,
-      "value": "Delete team"
+      "value": "Takım sil"
     }
   ],
   "label.delete-user": [
     {
       "type": 0,
-      "value": "Delete user"
+      "value": "Kullanıcı sil"
     }
   ],
   "label.delete-website": [
@@ -308,7 +308,7 @@
   "label.description": [
     {
       "type": 0,
-      "value": "Description"
+      "value": "Açıklama"
     }
   ],
   "label.desktop": [
@@ -320,13 +320,13 @@
   "label.details": [
     {
       "type": 0,
-      "value": "Details"
+      "value": "Detaylar"
     }
   ],
   "label.device": [
     {
       "type": 0,
-      "value": "Device"
+      "value": "Cihaz"
     }
   ],
   "label.devices": [
@@ -344,7 +344,7 @@
   "label.does-not-contain": [
     {
       "type": 0,
-      "value": "Does not contain"
+      "value": "İçermez"
     }
   ],
   "label.domain": [
@@ -356,7 +356,7 @@
   "label.dropoff": [
     {
       "type": 0,
-      "value": "Dropoff"
+      "value": "Bırakma"
     }
   ],
   "label.edit": [
@@ -368,13 +368,13 @@
   "label.edit-dashboard": [
     {
       "type": 0,
-      "value": "Edit dashboard"
+      "value": "Kontrol panelini düzenle"
     }
   ],
   "label.edit-member": [
     {
       "type": 0,
-      "value": "Edit member"
+      "value": "Üyeyi düzenle"
     }
   ],
   "label.enable-share-url": [
@@ -386,13 +386,13 @@
   "label.event": [
     {
       "type": 0,
-      "value": "Event"
+      "value": "Olay"
     }
   ],
   "label.event-data": [
     {
       "type": 0,
-      "value": "Event data"
+      "value": "Olay verisi"
     }
   ],
   "label.events": [
@@ -404,67 +404,67 @@
   "label.false": [
     {
       "type": 0,
-      "value": "False"
+      "value": "Yanlış"
     }
   ],
   "label.field": [
     {
       "type": 0,
-      "value": "Field"
+      "value": "Alan"
     }
   ],
   "label.fields": [
     {
       "type": 0,
-      "value": "Fields"
+      "value": "Alanlar"
     }
   ],
   "label.filter": [
     {
       "type": 0,
-      "value": "Filter"
+      "value": "Filtre"
     }
   ],
   "label.filter-combined": [
     {
       "type": 0,
-      "value": "Birleşik"
+      "value": "Birleşik filtre"
     }
   ],
   "label.filter-raw": [
     {
       "type": 0,
-      "value": "Ham"
+      "value": "Ham filtre"
     }
   ],
   "label.filters": [
     {
       "type": 0,
-      "value": "Filters"
+      "value": "Filtreler"
     }
   ],
   "label.funnel": [
     {
       "type": 0,
-      "value": "Funnel"
+      "value": "Huni"
     }
   ],
   "label.funnel-description": [
     {
       "type": 0,
-      "value": "Understand the conversion and drop-off rate of users."
+      "value": "Kullanıcıların dönüşüm ve ayrılma oranlarını anlayın."
     }
   ],
   "label.greater-than": [
     {
       "type": 0,
-      "value": "Greater than"
+      "value": "Büyüktür"
     }
   ],
   "label.greater-than-equals": [
     {
       "type": 0,
-      "value": "Greater than or equals"
+      "value": "Büyük veya eşittir"
     }
   ],
   "label.insights": [
@@ -476,7 +476,7 @@
   "label.insights-description": [
     {
       "type": 0,
-      "value": "Dive deeper into your data by using segments and filters."
+      "value": "Segmentleri ve filtreleri kullanarak verilerinizi derinlemesine inceleyin."
     }
   ],
   "label.is": [
@@ -488,43 +488,43 @@
   "label.is-not": [
     {
       "type": 0,
-      "value": "Is not"
+      "value": "Değil"
     }
   ],
   "label.is-not-set": [
     {
       "type": 0,
-      "value": "Is not set"
+      "value": "Ayarlanmamış"
     }
   ],
   "label.is-set": [
     {
       "type": 0,
-      "value": "Is set"
+      "value": "Ayarlandı"
     }
   ],
   "label.join": [
     {
       "type": 0,
-      "value": "Join"
+      "value": "Katıl"
     }
   ],
   "label.join-team": [
     {
       "type": 0,
-      "value": "Join team"
+      "value": "Takıma katıl"
     }
   ],
   "label.language": [
     {
       "type": 0,
-      "value": "Language"
+      "value": "Dil"
     }
   ],
   "label.languages": [
     {
       "type": 0,
-      "value": "Languages"
+      "value": "Diller"
     }
   ],
   "label.laptop": [
@@ -564,7 +564,7 @@
   "label.last-months": [
     {
       "type": 0,
-      "value": "Last "
+      "value": "Son "
     },
     {
       "type": 1,
@@ -572,31 +572,31 @@
     },
     {
       "type": 0,
-      "value": " months"
+      "value": " ay"
     }
   ],
   "label.leave": [
     {
       "type": 0,
-      "value": "Leave"
+      "value": "Ayrıl"
     }
   ],
   "label.leave-team": [
     {
       "type": 0,
-      "value": "Leave team"
+      "value": "Takımdan Ayrıl"
     }
   ],
   "label.less-than": [
     {
       "type": 0,
-      "value": "Less than"
+      "value": "Küçüktür"
     }
   ],
   "label.less-than-equals": [
     {
       "type": 0,
-      "value": "Less than or equals"
+      "value": "Küçük veya eşittir"
     }
   ],
   "label.login": [
@@ -614,7 +614,7 @@
   "label.manage": [
     {
       "type": 0,
-      "value": "Manage"
+      "value": "Yönet"
     }
   ],
   "label.max": [
@@ -626,13 +626,13 @@
   "label.member": [
     {
       "type": 0,
-      "value": "Member"
+      "value": "Üye"
     }
   ],
   "label.members": [
     {
       "type": 0,
-      "value": "Members"
+      "value": "Üyeler"
     }
   ],
   "label.min": [
@@ -656,13 +656,13 @@
   "label.my-account": [
     {
       "type": 0,
-      "value": "My account"
+      "value": "Hesabım"
     }
   ],
   "label.my-websites": [
     {
       "type": 0,
-      "value": "My websites"
+      "value": "Web sitelerim"
     }
   ],
   "label.name": [
@@ -680,7 +680,7 @@
   "label.none": [
     {
       "type": 0,
-      "value": "None"
+      "value": "Yok"
     }
   ],
   "label.number-of-records": [
@@ -720,7 +720,7 @@
   "label.ok": [
     {
       "type": 0,
-      "value": "OK"
+      "value": "TAMAM"
     }
   ],
   "label.os": [
@@ -732,19 +732,23 @@
   "label.overview": [
     {
       "type": 0,
-      "value": "Overview"
+      "value": "Genel bakış"
     }
   ],
   "label.owner": [
     {
       "type": 0,
-      "value": "Owner"
+      "value": "Sahibi"
     }
   ],
   "label.page-of": [
+    {
+      "type": 1,
+      "value": "total"
+    },
     {
       "type": 0,
-      "value": "Page "
+      "value": " sayfada "
     },
     {
       "type": 1,
@@ -752,11 +756,7 @@
     },
     {
       "type": 0,
-      "value": " of "
-    },
-    {
-      "type": 1,
-      "value": "total"
+      "value": " "
     }
   ],
   "label.page-views": [
@@ -768,7 +768,7 @@
   "label.pageTitle": [
     {
       "type": 0,
-      "value": "Page title"
+      "value": "Sayfa başlığı"
     }
   ],
   "label.pages": [
@@ -802,19 +802,19 @@
   "label.queries": [
     {
       "type": 0,
-      "value": "Queries"
+      "value": "Sorgular"
     }
   ],
   "label.query": [
     {
       "type": 0,
-      "value": "Query"
+      "value": "Sorgu"
     }
   ],
   "label.query-parameters": [
     {
       "type": 0,
-      "value": "Query parameters"
+      "value": "Sorgu parametreleri"
     }
   ],
   "label.realtime": [
@@ -844,37 +844,37 @@
   "label.regenerate": [
     {
       "type": 0,
-      "value": "Regenerate"
+      "value": "Yeniden Oluştur"
     }
   ],
   "label.region": [
     {
       "type": 0,
-      "value": "Region"
+      "value": "Bölge"
     }
   ],
   "label.regions": [
     {
       "type": 0,
-      "value": "Regions"
+      "value": "Bölgeler"
     }
   ],
   "label.remove": [
     {
       "type": 0,
-      "value": "Remove"
+      "value": "Kaldır"
     }
   ],
   "label.remove-member": [
     {
       "type": 0,
-      "value": "Remove member"
+      "value": "Üyeyi kaldır"
     }
   ],
   "label.reports": [
     {
       "type": 0,
-      "value": "Reports"
+      "value": "Raporlar"
     }
   ],
   "label.required": [
@@ -892,31 +892,31 @@
   "label.reset-website": [
     {
       "type": 0,
-      "value": "Reset statistics"
+      "value": "İstatistikleri sıfırla"
     }
   ],
   "label.retention": [
     {
       "type": 0,
-      "value": "Retention"
+      "value": "Geri dönüş"
     }
   ],
   "label.retention-description": [
     {
       "type": 0,
-      "value": "Measure your website stickiness by tracking how often users return."
+      "value": "Kullanıcıların ne sıklıkla geri döndüğünü takip ederek web sitenizin kalıcılığını ölçün."
     }
   ],
   "label.role": [
     {
       "type": 0,
-      "value": "Role"
+      "value": "Rol"
     }
   ],
   "label.run-query": [
     {
       "type": 0,
-      "value": "Run query"
+      "value": "Sorgu çalıştır"
     }
   ],
   "label.save": [
@@ -934,31 +934,31 @@
   "label.search": [
     {
       "type": 0,
-      "value": "Search"
+      "value": "Ara"
     }
   ],
   "label.select": [
     {
       "type": 0,
-      "value": "Select"
+      "value": "Seç"
     }
   ],
   "label.select-date": [
     {
       "type": 0,
-      "value": "Select date"
+      "value": "Tarih seç"
     }
   ],
   "label.select-role": [
     {
       "type": 0,
-      "value": "Select role"
+      "value": "Rol seç"
     }
   ],
   "label.select-website": [
     {
       "type": 0,
-      "value": "Select website"
+      "value": "Web sitesi seç"
     }
   ],
   "label.sessions": [
@@ -988,13 +988,13 @@
   "label.steps": [
     {
       "type": 0,
-      "value": "Steps"
+      "value": "Adımlar"
     }
   ],
   "label.sum": [
     {
       "type": 0,
-      "value": "Sum"
+      "value": "Toplam"
     }
   ],
   "label.tablet": [
@@ -1006,55 +1006,55 @@
   "label.team": [
     {
       "type": 0,
-      "value": "Team"
+      "value": "Takım"
     }
   ],
   "label.team-id": [
     {
       "type": 0,
-      "value": "Team ID"
+      "value": "Takım ID"
     }
   ],
   "label.team-member": [
     {
       "type": 0,
-      "value": "Team member"
+      "value": "Takım üyesi"
     }
   ],
   "label.team-name": [
     {
       "type": 0,
-      "value": "Team name"
+      "value": "Takım ismi"
     }
   ],
   "label.team-owner": [
     {
       "type": 0,
-      "value": "Team owner"
+      "value": "Takım sahibi"
     }
   ],
   "label.team-view-only": [
     {
       "type": 0,
-      "value": "Team view only"
+      "value": "Yalnızca ekip görünümü"
     }
   ],
   "label.team-websites": [
     {
       "type": 0,
-      "value": "Team websites"
+      "value": "Takım web siteleri"
     }
   ],
   "label.teams": [
     {
       "type": 0,
-      "value": "Teams"
+      "value": "Takımlar"
     }
   ],
   "label.theme": [
     {
       "type": 0,
-      "value": "Theme"
+      "value": "Tema"
     }
   ],
   "label.this-month": [
@@ -1084,7 +1084,7 @@
   "label.title": [
     {
       "type": 0,
-      "value": "Title"
+      "value": "Başlık"
     }
   ],
   "label.today": [
@@ -1096,19 +1096,19 @@
   "label.toggle-charts": [
     {
       "type": 0,
-      "value": "Toggle charts"
+      "value": "Grafikleri değiştir"
     }
   ],
   "label.total": [
     {
       "type": 0,
-      "value": "Total"
+      "value": "Toplam"
     }
   ],
   "label.total-records": [
     {
       "type": 0,
-      "value": "Total records"
+      "value": "Toplam kayıt"
     }
   ],
   "label.tracking-code": [
@@ -1126,25 +1126,25 @@
   "label.transfer-website": [
     {
       "type": 0,
-      "value": "Transfer website"
+      "value": "Transfer web sitesi"
     }
   ],
   "label.true": [
     {
       "type": 0,
-      "value": "True"
+      "value": "Doğru"
     }
   ],
   "label.type": [
     {
       "type": 0,
-      "value": "Type"
+      "value": "Tip"
     }
   ],
   "label.unique": [
     {
       "type": 0,
-      "value": "Unique"
+      "value": "Benzersiz"
     }
   ],
   "label.unique-visitors": [
@@ -1162,13 +1162,13 @@
   "label.untitled": [
     {
       "type": 0,
-      "value": "Untitled"
+      "value": "İsimsiz"
     }
   ],
   "label.update": [
     {
       "type": 0,
-      "value": "Update"
+      "value": "Güncelle"
     }
   ],
   "label.url": [
@@ -1186,7 +1186,7 @@
   "label.user": [
     {
       "type": 0,
-      "value": "User"
+      "value": "Kullanıcı"
     }
   ],
   "label.username": [
@@ -1198,7 +1198,7 @@
   "label.users": [
     {
       "type": 0,
-      "value": "Users"
+      "value": "Kullanıcılar"
     }
   ],
   "label.utm": [
@@ -1210,19 +1210,19 @@
   "label.utm-description": [
     {
       "type": 0,
-      "value": "Track your campaigns through UTM parameters."
+      "value": "Kampanyalarınızı UTM parametreleri aracılığıyla takip edin."
     }
   ],
   "label.value": [
     {
       "type": 0,
-      "value": "Value"
+      "value": "Değer"
     }
   ],
   "label.view": [
     {
       "type": 0,
-      "value": "View"
+      "value": "Görünüm"
     }
   ],
   "label.view-details": [
@@ -1234,7 +1234,7 @@
   "label.view-only": [
     {
       "type": 0,
-      "value": "View only"
+      "value": "Sadece görünüm"
     }
   ],
   "label.views": [
@@ -1246,7 +1246,7 @@
   "label.views-per-visit": [
     {
       "type": 0,
-      "value": "Views per visit"
+      "value": "Ziyaret başına görüntüleme"
     }
   ],
   "label.visitors": [
@@ -1258,13 +1258,13 @@
   "label.visits": [
     {
       "type": 0,
-      "value": "Visits"
+      "value": "Ziyaretler"
     }
   ],
   "label.website": [
     {
       "type": 0,
-      "value": "Website"
+      "value": "Web sitesi"
     }
   ],
   "label.website-id": [
@@ -1282,19 +1282,19 @@
   "label.window": [
     {
       "type": 0,
-      "value": "Window"
+      "value": "Pencere"
     }
   ],
   "label.yesterday": [
     {
       "type": 0,
-      "value": "Yesterday"
+      "value": "Dün"
     }
   ],
   "message.action-confirmation": [
     {
       "type": 0,
-      "value": "Type "
+      "value": "Onaylamak için aşağıdaki kutuya "
     },
     {
       "type": 1,
@@ -1302,7 +1302,7 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " yazın."
     }
   ],
   "message.active-users": [
@@ -1326,57 +1326,45 @@
     }
   ],
   "message.confirm-leave": [
-    {
-      "type": 0,
-      "value": "Are you sure you want to leave "
-    },
     {
       "type": 1,
       "value": "target"
     },
     {
       "type": 0,
-      "value": "?"
+      "value": " kaydından ayrılmak istediğinizden emin misiniz?"
     }
   ],
   "message.confirm-remove": [
-    {
-      "type": 0,
-      "value": "Are you sure you want to remove "
-    },
     {
       "type": 1,
       "value": "target"
     },
     {
       "type": 0,
-      "value": "?"
+      "value": " kaydını kaldırmak istediğinizden emin misiniz?"
     }
   ],
   "message.confirm-reset": [
-    {
-      "type": 0,
-      "value": "Are your sure you want to reset "
-    },
     {
       "type": 1,
       "value": "target"
     },
     {
       "type": 0,
-      "value": "'s statistics?"
+      "value": " istatistiklerini sıfırlamak istediğinizden emin misiniz?"
     }
   ],
   "message.delete-team-warning": [
     {
       "type": 0,
-      "value": "Deleting a team will also delete all team websites."
+      "value": "Bir takımı silmek tüm takım web sitelerini de silecektir."
     }
   ],
   "message.delete-website-warning": [
     {
       "type": 0,
-      "value": "İlişkili tüm veriler de  silinecektir."
+      "value": "İlişkili tüm veriler de silinecektir."
     }
   ],
   "message.error": [
@@ -1420,7 +1408,7 @@
   "message.min-password-length": [
     {
       "type": 0,
-      "value": "Minimum length of "
+      "value": "Minimum "
     },
     {
       "type": 1,
@@ -1428,13 +1416,13 @@
     },
     {
       "type": 0,
-      "value": " characters"
+      "value": " karakter uzunluğu"
     }
   ],
   "message.new-version-available": [
     {
       "type": 0,
-      "value": "A new version of Umami "
+      "value": "Yeni versiyon Umami "
     },
     {
       "type": 1,
@@ -1442,7 +1430,7 @@
     },
     {
       "type": 0,
-      "value": " is available!"
+      "value": " mevcut!"
     }
   ],
   "message.no-data-available": [
@@ -1454,7 +1442,7 @@
   "message.no-event-data": [
     {
       "type": 0,
-      "value": "No event data is available."
+      "value": "Hiçbir olay verisi mevcut değil."
     }
   ],
   "message.no-match-password": [
@@ -1466,25 +1454,25 @@
   "message.no-results-found": [
     {
       "type": 0,
-      "value": "No results were found."
+      "value": "Hiçbir sonuç bulunamadı."
     }
   ],
   "message.no-team-websites": [
     {
       "type": 0,
-      "value": "This team does not have any websites."
+      "value": "Bu takımın herhangi bir web sitesi yok."
     }
   ],
   "message.no-teams": [
     {
       "type": 0,
-      "value": "You have not created any teams."
+      "value": "Herhangi bir takım oluşturmadınız."
     }
   ],
   "message.no-users": [
     {
       "type": 0,
-      "value": "There are no users."
+      "value": "Kullanıcı yok."
     }
   ],
   "message.no-websites-configured": [
@@ -1502,7 +1490,7 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "To reset this website, type "
+      "value": "Bu websitesini sıfılamak için aşağıdaki kutuya "
     },
     {
       "type": 1,
@@ -1510,13 +1498,13 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " yazın."
     }
   ],
   "message.reset-website-warning": [
     {
       "type": 0,
-      "value": "All statistics for this website will be deleted, but your tracking code will remain intact."
+      "value": "Bu web sitesi için tüm istatistikler silinecek, ancak izleme kodunuz bozulmadan kalacaktır."
     }
   ],
   "message.saved": [
@@ -1538,19 +1526,19 @@
   "message.team-already-member": [
     {
       "type": 0,
-      "value": "You are already a member of the team."
+      "value": "Zaten bu takımın üyesisiniz"
     }
   ],
   "message.team-not-found": [
     {
       "type": 0,
-      "value": "Team not found."
+      "value": "Takım bulunamadı"
     }
   ],
   "message.team-websites-info": [
     {
       "type": 0,
-      "value": "Websites can be viewed by anyone on the team."
+      "value": "Web siteleri takımdaki herkes tarafından görüntülenebilir."
     }
   ],
   "message.tracking-code": [
@@ -1562,37 +1550,37 @@
   "message.transfer-team-website-to-user": [
     {
       "type": 0,
-      "value": "Transfer this website to your account?"
+      "value": "Bu web sitesi hesbınıza aktarılsın mı?"
     }
   ],
   "message.transfer-user-website-to-team": [
     {
       "type": 0,
-      "value": "Select the team to transfer this website to."
+      "value": "Bu web sitesinin aktarılacağı takımı seçin."
     }
   ],
   "message.transfer-website": [
     {
       "type": 0,
-      "value": "Transfer website ownership to your account or another team."
+      "value": "Web sitesi sahipliğini hesabınıza veya başka bir takıma aktarın"
     }
   ],
   "message.triggered-event": [
     {
       "type": 0,
-      "value": "Triggered event"
+      "value": "Tetiklenen olay"
     }
   ],
   "message.user-deleted": [
     {
       "type": 0,
-      "value": "User deleted."
+      "value": "Kullanıcı silindi."
     }
   ],
   "message.viewed-page": [
     {
       "type": 0,
-      "value": "Viewed page"
+      "value": "Görüntülenen sayfa"
     }
   ],
   "message.visitor-log": [
@@ -1632,7 +1620,7 @@
   "message.visitors-dropped-off": [
     {
       "type": 0,
-      "value": "Visitors dropped off"
+      "value": "Bırakan ziyaretçiler"
     }
   ]
 }
diff --git a/public/intl/messages/zh-CN.json b/public/intl/messages/zh-CN.json
index 61f55c6dac..144b4f170a 100644
--- a/public/intl/messages/zh-CN.json
+++ b/public/intl/messages/zh-CN.json
@@ -38,7 +38,7 @@
   "label.add-step": [
     {
       "type": 0,
-      "value": "Add step"
+      "value": "添加步骤"
     }
   ],
   "label.add-website": [
@@ -564,7 +564,7 @@
   "label.last-months": [
     {
       "type": 0,
-      "value": "Last "
+      "value": "最近 "
     },
     {
       "type": 1,
@@ -572,7 +572,7 @@
     },
     {
       "type": 0,
-      "value": " months"
+      "value": " 个月"
     }
   ],
   "label.leave": [
@@ -996,7 +996,7 @@
   "label.steps": [
     {
       "type": 0,
-      "value": "Steps"
+      "value": "步骤"
     }
   ],
   "label.sum": [
@@ -1176,7 +1176,7 @@
   "label.update": [
     {
       "type": 0,
-      "value": "Update"
+      "value": "更新"
     }
   ],
   "label.url": [
@@ -1218,7 +1218,7 @@
   "label.utm-description": [
     {
       "type": 0,
-      "value": "Track your campaigns through UTM parameters."
+      "value": "通过UTM参数追踪您的广告活动。"
     }
   ],
   "label.value": [
@@ -1254,7 +1254,7 @@
   "label.views-per-visit": [
     {
       "type": 0,
-      "value": "Views per visit"
+      "value": "每次访问的浏览量"
     }
   ],
   "label.visitors": [
@@ -1266,7 +1266,7 @@
   "label.visits": [
     {
       "type": 0,
-      "value": "Visits"
+      "value": "访问次数"
     }
   ],
   "label.website": [

From ca2a7f33545bc9aa6462a44db40b539773bcefee Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 3 May 2024 00:13:28 -0700
Subject: [PATCH 036/438] Added query parameters to filters.

---
 src/components/hooks/useFilterParams.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/hooks/useFilterParams.ts b/src/components/hooks/useFilterParams.ts
index 18178ce5b8..4fc36f39d8 100644
--- a/src/components/hooks/useFilterParams.ts
+++ b/src/components/hooks/useFilterParams.ts
@@ -8,7 +8,7 @@ export function useFilterParams(websiteId: string) {
   const { startDate, endDate, unit, offset } = dateRange;
   const { timezone } = useTimezone();
   const {
-    query: { url, referrer, title, os, browser, device, country, region, city, event },
+    query: { url, referrer, title, query, os, browser, device, country, region, city, event },
   } = useNavigation();
 
   return {
@@ -20,6 +20,7 @@ export function useFilterParams(websiteId: string) {
     url,
     referrer,
     title,
+    query,
     os,
     browser,
     device,

From 9c06bc9893558ce4d99589ed9e5a46e6fc32c611 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Fri, 3 May 2024 14:31:08 -0700
Subject: [PATCH 037/438] add team manager role

---
 .../teams/[teamId]/members/TeamMemberEditForm.tsx    |  4 ++++
 .../teams/[teamId]/members/TeamMembersPage.tsx       |  6 ++++--
 .../teams/[teamId]/members/TeamMembersTable.tsx      |  1 +
 .../settings/teams/[teamId]/team/TeamDetails.tsx     | 12 +++++++++---
 src/components/messages.ts                           |  2 ++
 src/components/metrics/PagesTable.tsx                |  6 +++++-
 src/lib/constants.ts                                 |  7 +++++++
 src/pages/api/teams/[teamId]/users/[userId].ts       |  2 +-
 src/pages/api/teams/[teamId]/users/index.ts          |  2 +-
 9 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/app/(main)/settings/teams/[teamId]/members/TeamMemberEditForm.tsx b/src/app/(main)/settings/teams/[teamId]/members/TeamMemberEditForm.tsx
index 0c22ac76c5..4018398961 100644
--- a/src/app/(main)/settings/teams/[teamId]/members/TeamMemberEditForm.tsx
+++ b/src/app/(main)/settings/teams/[teamId]/members/TeamMemberEditForm.tsx
@@ -40,6 +40,9 @@ export function TeamMemberEditForm({
   };
 
   const renderValue = (value: string) => {
+    if (value === ROLES.teamManager) {
+      return formatMessage(labels.manager);
+    }
     if (value === ROLES.teamMember) {
       return formatMessage(labels.member);
     }
@@ -58,6 +61,7 @@ export function TeamMemberEditForm({
               minWidth: '250px',
             }}
           >
+            <Item key={ROLES.teamManager}>{formatMessage(labels.manager)}</Item>
             <Item key={ROLES.teamMember}>{formatMessage(labels.member)}</Item>
             <Item key={ROLES.teamViewOnly}>{formatMessage(labels.viewOnly)}</Item>
           </Dropdown>
diff --git a/src/app/(main)/settings/teams/[teamId]/members/TeamMembersPage.tsx b/src/app/(main)/settings/teams/[teamId]/members/TeamMembersPage.tsx
index 3c16682607..de0c4c0a2e 100644
--- a/src/app/(main)/settings/teams/[teamId]/members/TeamMembersPage.tsx
+++ b/src/app/(main)/settings/teams/[teamId]/members/TeamMembersPage.tsx
@@ -12,8 +12,10 @@ export function TeamMembersPage({ teamId }: { teamId: string }) {
   const { formatMessage, labels } = useMessages();
 
   const canEdit =
-    team?.teamUser?.find(({ userId, role }) => role === ROLES.teamOwner && userId === user.id) &&
-    user.role !== ROLES.viewOnly;
+    team?.teamUser?.find(
+      ({ userId, role }) =>
+        (role === ROLES.teamOwner || role === ROLES.teamManager) && userId === user.id,
+    ) && user.role !== ROLES.viewOnly;
 
   return (
     <>
diff --git a/src/app/(main)/settings/teams/[teamId]/members/TeamMembersTable.tsx b/src/app/(main)/settings/teams/[teamId]/members/TeamMembersTable.tsx
index e72973b495..7d1efbf2dd 100644
--- a/src/app/(main)/settings/teams/[teamId]/members/TeamMembersTable.tsx
+++ b/src/app/(main)/settings/teams/[teamId]/members/TeamMembersTable.tsx
@@ -19,6 +19,7 @@ export function TeamMembersTable({
 
   const roles = {
     [ROLES.teamOwner]: formatMessage(labels.teamOwner),
+    [ROLES.teamManager]: formatMessage(labels.teamManager),
     [ROLES.teamMember]: formatMessage(labels.teamMember),
     [ROLES.teamViewOnly]: formatMessage(labels.viewOnly),
   };
diff --git a/src/app/(main)/settings/teams/[teamId]/team/TeamDetails.tsx b/src/app/(main)/settings/teams/[teamId]/team/TeamDetails.tsx
index 9d8ea52970..0c5fe991ea 100644
--- a/src/app/(main)/settings/teams/[teamId]/team/TeamDetails.tsx
+++ b/src/app/(main)/settings/teams/[teamId]/team/TeamDetails.tsx
@@ -15,18 +15,24 @@ export function TeamDetails({ teamId }: { teamId: string }) {
   const { user } = useLogin();
   const [tab, setTab] = useState('details');
 
-  const canEdit =
+  const isTeamOwner =
     !!team?.teamUser?.find(({ userId, role }) => role === ROLES.teamOwner && userId === user.id) &&
     user.role !== ROLES.viewOnly;
 
+  const canEdit =
+    !!team?.teamUser?.find(
+      ({ userId, role }) =>
+        (role === ROLES.teamOwner || role === ROLES.teamManager) && userId === user.id,
+    ) && user.role !== ROLES.viewOnly;
+
   return (
     <Flexbox direction="column">
       <PageHeader title={team?.name} icon={<Icons.Users />}>
-        {!canEdit && <TeamLeaveButton teamId={team.id} teamName={team.name} />}
+        {!isTeamOwner && <TeamLeaveButton teamId={team.id} teamName={team.name} />}
       </PageHeader>
       <Tabs selectedKey={tab} onSelect={(value: any) => setTab(value)} style={{ marginBottom: 30 }}>
         <Item key="details">{formatMessage(labels.details)}</Item>
-        {canEdit && <Item key="manage">{formatMessage(labels.manage)}</Item>}
+        {isTeamOwner && <Item key="manage">{formatMessage(labels.manage)}</Item>}
       </Tabs>
       {tab === 'details' && <TeamEditForm teamId={teamId} allowEdit={canEdit} />}
       {tab === 'manage' && <TeamManage teamId={teamId} />}
diff --git a/src/components/messages.ts b/src/components/messages.ts
index 79a6b92ca1..7a11aa8993 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -29,6 +29,7 @@ export const labels = defineMessages({
   createdBy: { id: 'label.created-by', defaultMessage: 'Created By' },
   edit: { id: 'label.edit', defaultMessage: 'Edit' },
   name: { id: 'label.name', defaultMessage: 'Name' },
+  manager: { id: 'label.manager', defaultMessage: 'Manager' },
   member: { id: 'label.member', defaultMessage: 'Member' },
   members: { id: 'label.members', defaultMessage: 'Members' },
   accessCode: { id: 'label.access-code', defaultMessage: 'Access code' },
@@ -43,6 +44,7 @@ export const labels = defineMessages({
   settings: { id: 'label.settings', defaultMessage: 'Settings' },
   owner: { id: 'label.owner', defaultMessage: 'Owner' },
   teamOwner: { id: 'label.team-owner', defaultMessage: 'Team owner' },
+  teamManager: { id: 'label.team-manager', defaultMessage: 'Team manager' },
   teamMember: { id: 'label.team-member', defaultMessage: 'Team member' },
   teamViewOnly: { id: 'label.team-view-only', defaultMessage: 'Team view only' },
   enableShareUrl: { id: 'label.enable-share-url', defaultMessage: 'Enable share URL' },
diff --git a/src/components/metrics/PagesTable.tsx b/src/components/metrics/PagesTable.tsx
index 4bc5c46126..b0da808066 100644
--- a/src/components/metrics/PagesTable.tsx
+++ b/src/components/metrics/PagesTable.tsx
@@ -38,7 +38,11 @@ export function PagesTable({ allowFilter, domainName, ...props }: PagesTableProp
         id={view}
         value={x}
         label={!x && formatMessage(labels.none)}
-        externalUrl={`${domainName.startsWith('http') ? domainName : `https://${domainName}`}${x}`}
+        externalUrl={
+          view === 'url'
+            ? `${domainName.startsWith('http') ? domainName : `https://${domainName}`}${x}`
+            : null
+        }
       />
     );
   };
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index ac9c2e8ddc..0b6f7d264f 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -132,6 +132,7 @@ export const ROLES = {
   user: 'user',
   viewOnly: 'view-only',
   teamOwner: 'team-owner',
+  teamManager: 'team-manager',
   teamMember: 'team-member',
   teamViewOnly: 'team-view-only',
 } as const;
@@ -162,6 +163,12 @@ export const ROLE_PERMISSIONS = {
     PERMISSIONS.websiteUpdate,
     PERMISSIONS.websiteDelete,
   ],
+  [ROLES.teamManager]: [
+    PERMISSIONS.teamUpdate,
+    PERMISSIONS.websiteCreate,
+    PERMISSIONS.websiteUpdate,
+    PERMISSIONS.websiteDelete,
+  ],
   [ROLES.teamMember]: [
     PERMISSIONS.websiteCreate,
     PERMISSIONS.websiteUpdate,
diff --git a/src/pages/api/teams/[teamId]/users/[userId].ts b/src/pages/api/teams/[teamId]/users/[userId].ts
index 4b52fe3ee7..c1e80b1a38 100644
--- a/src/pages/api/teams/[teamId]/users/[userId].ts
+++ b/src/pages/api/teams/[teamId]/users/[userId].ts
@@ -23,7 +23,7 @@ const schema = {
   POST: yup.object().shape({
     role: yup
       .string()
-      .matches(/team-member|team-view-only/i)
+      .matches(/team-member|team-view-only|team-manager/i)
       .required(),
   }),
 };
diff --git a/src/pages/api/teams/[teamId]/users/index.ts b/src/pages/api/teams/[teamId]/users/index.ts
index ccbf423af1..f25b99dae5 100644
--- a/src/pages/api/teams/[teamId]/users/index.ts
+++ b/src/pages/api/teams/[teamId]/users/index.ts
@@ -25,7 +25,7 @@ const schema = {
     userId: yup.string().uuid().required(),
     role: yup
       .string()
-      .matches(/team-member|team-view-only/i)
+      .matches(/team-member|team-view-only|team-manager/i)
       .required(),
   }),
 };

From 222e3d070545e2620a609d55bbc66f9671d9624b Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Fri, 3 May 2024 21:01:29 -0700
Subject: [PATCH 038/438] Change version.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d5a090dfd6..d68af5a63d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "2.12.0",
+  "version": "2.11.3",
   "description": "A simple, fast, privacy-focused alternative to Google Analytics.",
   "author": "Umami Software, Inc. <hello@umami.is>",
   "license": "MIT",

From 43907bd07554cdb20222d7f18e8af1279a5f0372 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 3 May 2024 23:21:27 -0700
Subject: [PATCH 039/438] Fixed metrics search.

---
 package.json                                      |  2 +-
 src/components/hooks/queries/useWebsiteMetrics.ts | 11 ++++-------
 src/components/metrics/MetricsTable.tsx           | 12 ++++++++----
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index d68af5a63d..d5a090dfd6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "2.11.3",
+  "version": "2.12.0",
   "description": "A simple, fast, privacy-focused alternative to Google Analytics.",
   "author": "Umami Software, Inc. <hello@umami.is>",
   "license": "MIT",
diff --git a/src/components/hooks/queries/useWebsiteMetrics.ts b/src/components/hooks/queries/useWebsiteMetrics.ts
index 301b2e04c0..dd201155b4 100644
--- a/src/components/hooks/queries/useWebsiteMetrics.ts
+++ b/src/components/hooks/queries/useWebsiteMetrics.ts
@@ -4,8 +4,7 @@ import { useFilterParams } from '../useFilterParams';
 
 export function useWebsiteMetrics(
   websiteId: string,
-  type: string,
-  limit: number,
+  query: { type: string; limit: number; search: string },
   options?: Omit<UseQueryOptions & { onDataLoad?: (data: any) => void }, 'queryKey' | 'queryFn'>,
 ) {
   const { get, useQuery } = useApi();
@@ -17,19 +16,17 @@ export function useWebsiteMetrics(
       {
         websiteId,
         ...params,
-        type,
-        limit,
+        ...query,
       },
     ],
     queryFn: async () => {
       const filters = { ...params };
 
-      filters[type] = undefined;
+      filters[query.type] = undefined;
 
       const data = await get(`/websites/${websiteId}/metrics`, {
         ...filters,
-        type,
-        limit,
+        ...query,
       });
 
       options?.onDataLoad?.(data);
diff --git a/src/components/metrics/MetricsTable.tsx b/src/components/metrics/MetricsTable.tsx
index cfabdd3056..857c136b29 100644
--- a/src/components/metrics/MetricsTable.tsx
+++ b/src/components/metrics/MetricsTable.tsx
@@ -48,10 +48,14 @@ export function MetricsTable({
   const { formatMessage, labels } = useMessages();
   const { dir } = useLocale();
 
-  const { data, isLoading, isFetched, error } = useWebsiteMetrics(websiteId, type, limit, {
-    retryDelay: delay || DEFAULT_ANIMATION_DURATION,
-    onDataLoad,
-  });
+  const { data, isLoading, isFetched, error } = useWebsiteMetrics(
+    websiteId,
+    { type, limit, search },
+    {
+      retryDelay: delay || DEFAULT_ANIMATION_DURATION,
+      onDataLoad,
+    },
+  );
 
   const filteredData = useMemo(() => {
     if (data) {

From 1dda711401076d15693607c2f27897a453040d65 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Sat, 4 May 2024 13:36:08 -0700
Subject: [PATCH 040/438] add date-fns-tz

---
 package.components.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.components.json b/package.components.json
index 41e72579f2..2ca9458d5c 100644
--- a/package.components.json
+++ b/package.components.json
@@ -11,6 +11,7 @@
     "@tanstack/react-query": "^4.33.0",
     "classnames": "^2.3.1",
     "colord": "^2.9.2",
+    "date-fns-tz": "^1.1.4",
     "immer": "^9.0.12",
     "moment-timezone": "^0.5.35",
     "next": "^13.4.0",

From 8fb436ab16afbb1781a287dcd52e5ed89c370321 Mon Sep 17 00:00:00 2001
From: Andrii Leitsius <leits.dev@gmail.com>
Date: Sun, 5 May 2024 14:33:20 +0300
Subject: [PATCH 041/438] Update uk-UA translation

---
 src/lang/uk-UA.json | 230 ++++++++++++++++++++++----------------------
 1 file changed, 115 insertions(+), 115 deletions(-)

diff --git a/src/lang/uk-UA.json b/src/lang/uk-UA.json
index 6b3e31d5c1..1042f3b46b 100644
--- a/src/lang/uk-UA.json
+++ b/src/lang/uk-UA.json
@@ -1,122 +1,122 @@
 {
-  "label.access-code": "Access code",
+  "label.access-code": "Код доступу",
   "label.actions": "Дії",
-  "label.activity-log": "Activity log",
-  "label.add": "Add",
-  "label.add-description": "Add description",
-  "label.add-member": "Add member",
-  "label.add-step": "Add step",
+  "label.activity-log": "Журнал активності",
+  "label.add": "Додати",
+  "label.add-description": "Додати опис",
+  "label.add-member": "Додати учасника",
+  "label.add-step": "Додати крок",
   "label.add-website": "Додати сайт",
   "label.admin": "Адміністратор",
-  "label.after": "After",
+  "label.after": "Після",
   "label.all": "Всі",
   "label.all-time": "Весь час",
-  "label.analytics": "Analytics",
-  "label.average": "Average",
+  "label.analytics": "Аналітика",
+  "label.average": "Середнє",
   "label.average-visit-time": "Середній час візиту",
   "label.back": "Назад",
-  "label.before": "Before",
+  "label.before": "Раніше",
   "label.bounce-rate": "Показник відмов",
-  "label.breakdown": "Breakdown",
-  "label.browser": "Browser",
+  "label.breakdown": "Розподіл",
+  "label.browser": "Браузер",
   "label.browsers": "Браузери",
   "label.cancel": "Відмінити",
   "label.change-password": "Змінити пароль",
-  "label.cities": "Cities",
-  "label.city": "City",
-  "label.clear-all": "Clear all",
-  "label.confirm": "Confirm",
+  "label.cities": "Міста",
+  "label.city": "Місто",
+  "label.clear-all": "Очистити все",
+  "label.confirm": "Підтвердити",
   "label.confirm-password": "Підтвердити пароль",
-  "label.contains": "Contains",
-  "label.continue": "Continue",
+  "label.contains": "Містить",
+  "label.continue": "Продовжити",
   "label.countries": "Країни",
-  "label.country": "Country",
-  "label.create": "Create",
-  "label.create-report": "Create report",
-  "label.create-team": "Create team",
-  "label.create-user": "Create user",
-  "label.created": "Created",
-  "label.created-by": "Created By",
+  "label.country": "Країна",
+  "label.create": "Створити",
+  "label.create-report": "Створити звіт",
+  "label.create-team": "Створити команду",
+  "label.create-user": "Створити користувача",
+  "label.created": "Створено",
+  "label.created-by": "Автор",
   "label.current-password": "Поточний пароль",
   "label.custom-range": "Довільний період",
   "label.dashboard": "Інформаційна панель",
-  "label.data": "Data",
-  "label.date": "Date",
+  "label.data": "Дані",
+  "label.date": "Дата",
   "label.date-range": "Діапазон дат",
-  "label.day": "Day",
+  "label.day": "День",
   "label.default-date-range": "Діапазон дат за замовчуванням",
   "label.delete": "Видалити",
-  "label.delete-report": "Delete report",
-  "label.delete-team": "Delete team",
-  "label.delete-user": "Delete user",
+  "label.delete-report": "Видалити звіт",
+  "label.delete-team": "Видалити команду",
+  "label.delete-user": "Видалити користувача",
   "label.delete-website": "Видалити сайт",
-  "label.description": "Description",
+  "label.description": "Опис",
   "label.desktop": "Настільний ПК",
-  "label.details": "Details",
-  "label.device": "Device",
+  "label.details": "Деталі",
+  "label.device": "Пристрій",
   "label.devices": "Пристрої",
   "label.dismiss": "Відхилити",
-  "label.does-not-contain": "Does not contain",
+  "label.does-not-contain": "Не містить",
   "label.domain": "Домен",
   "label.dropoff": "Dropoff",
   "label.edit": "Редагувати",
-  "label.edit-dashboard": "Edit dashboard",
-  "label.edit-member": "Edit member",
+  "label.edit-dashboard": "Редагувати панель",
+  "label.edit-member": "Редагувати учасника",
   "label.enable-share-url": "Дозволити ділитися посиланням",
-  "label.event": "Event",
-  "label.event-data": "Event data",
+  "label.event": "Подія",
+  "label.event-data": "Дані події",
   "label.events": "Події",
   "label.false": "False",
-  "label.field": "Field",
-  "label.fields": "Fields",
-  "label.filter": "Filter",
+  "label.field": "Поле",
+  "label.fields": "Поля",
+  "label.filter": "Фільтр",
   "label.filter-combined": "Об'єднані",
   "label.filter-raw": "Сирі дані",
-  "label.filters": "Filters",
+  "label.filters": "Фільтри",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
-  "label.greater-than": "Greater than",
-  "label.greater-than-equals": "Greater than or equals",
+  "label.greater-than": "Більше ніж",
+  "label.greater-than-equals": "Більше або рівно",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
-  "label.is": "Is",
-  "label.is-not": "Is not",
-  "label.is-not-set": "Is not set",
-  "label.is-set": "Is set",
-  "label.join": "Join",
-  "label.join-team": "Join team",
-  "label.language": "Language",
+  "label.is": "Є",
+  "label.is-not": "Не є",
+  "label.is-not-set": "Не встановлено",
+  "label.is-set": "Встановлено",
+  "label.join": "Приєднатись",
+  "label.join-team": "Приєднатись до команди",
+  "label.language": "Мова",
   "label.languages": "Мови",
   "label.laptop": "Ноутбук",
   "label.last-days": "Останні {x} днів",
   "label.last-hours": "Останні {x} годин",
-  "label.last-months": "Last {x} months",
-  "label.leave": "Leave",
-  "label.leave-team": "Leave team",
-  "label.less-than": "Less than",
-  "label.less-than-equals": "Less than or equals",
+  "label.last-months": "Останні {x} місяців",
+  "label.leave": "Покинути",
+  "label.leave-team": "Покинути",
+  "label.less-than": "Менше ніж",
+  "label.less-than-equals": "Менше або рівно",
   "label.login": "Увійти",
   "label.logout": "Вийти",
-  "label.manage": "Manage",
+  "label.manage": "Керувати",
   "label.max": "Max",
-  "label.member": "Member",
-  "label.members": "Members",
+  "label.member": "Учасник",
+  "label.members": "Учасники",
   "label.min": "Min",
   "label.mobile": "Мобільний",
   "label.more": "Більше",
-  "label.my-account": "My account",
-  "label.my-websites": "My websites",
+  "label.my-account": "Мої аккаунти",
+  "label.my-websites": "Мої вебсайти",
   "label.name": "Ім'я",
   "label.new-password": "Новий пароль",
   "label.none": "None",
   "label.number-of-records": "{x} {x, plural, one {record} other {records}}",
   "label.ok": "OK",
   "label.os": "OS",
-  "label.overview": "Overview",
+  "label.overview": "Огляд",
   "label.owner": "Власник",
-  "label.page-of": "Page {current} of {total}",
+  "label.page-of": "Сторінка {current} з {total}",
   "label.page-views": "Перегляди сторінок",
-  "label.pageTitle": "Page title",
+  "label.pageTitle": "Загловок сторінки",
   "label.pages": "Сторінки",
   "label.password": "Пароль",
   "label.powered-by": "На базі {name}",
@@ -129,46 +129,46 @@
   "label.referrers": "Джерела",
   "label.refresh": "Оновити",
   "label.regenerate": "Regenerate",
-  "label.region": "Region",
-  "label.regions": "Regions",
-  "label.remove": "Remove",
-  "label.remove-member": "Remove member",
-  "label.reports": "Reports",
+  "label.region": "Регіон",
+  "label.regions": "Регіони",
+  "label.remove": "Видалити",
+  "label.remove-member": "Видалити учасника",
+  "label.reports": "Звіти",
   "label.required": "Обов'язкове",
   "label.reset": "Скинути",
   "label.reset-website": "Скинути статистику сайту",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
-  "label.role": "Role",
+  "label.role": "Роль",
   "label.run-query": "Run query",
   "label.save": "Зберегти",
-  "label.screens": "Screens",
-  "label.search": "Search",
-  "label.select": "Select",
+  "label.screens": "Екрани",
+  "label.search": "Пошук",
+  "label.select": "Вибір",
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Select website",
-  "label.sessions": "Sessions",
+  "label.sessions": "Сесії",
   "label.settings": "Налаштування",
   "label.share-url": "Поділитися посилання",
   "label.single-day": "Один день",
-  "label.steps": "Steps",
-  "label.sum": "Sum",
+  "label.steps": "Кроки",
+  "label.sum": "Сума",
   "label.tablet": "Планшет",
-  "label.team": "Team",
-  "label.team-id": "Team ID",
-  "label.team-member": "Team member",
-  "label.team-name": "Team name",
-  "label.team-owner": "Team owner",
-  "label.team-view-only": "Team view only",
-  "label.team-websites": "Team websites",
-  "label.teams": "Teams",
-  "label.theme": "Theme",
+  "label.team": "Команда",
+  "label.team-id": "ID команди",
+  "label.team-member": "Учасник команди",
+  "label.team-name": "Назва команди",
+  "label.team-owner": "Власник команди",
+  "label.team-view-only": "Лише для перегляду командою",
+  "label.team-websites": "Вебсайти команди",
+  "label.teams": "Команди",
+  "label.theme": "Теми",
   "label.this-month": "Цього місяця",
   "label.this-week": "Цього тижня",
   "label.this-year": "Цього ріку",
   "label.timezone": "Часовий пояс",
-  "label.title": "Title",
+  "label.title": "Загловок",
   "label.today": "Сьогодні",
   "label.toggle-charts": "Переключити графіки",
   "label.total": "Total",
@@ -177,39 +177,39 @@
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
-  "label.type": "Type",
-  "label.unique": "Unique",
+  "label.type": "Типу",
+  "label.unique": "Унікальний",
   "label.unique-visitors": "Унікальні відвідувачі",
   "label.unknown": "Невідомо",
-  "label.untitled": "Untitled",
-  "label.update": "Update",
+  "label.untitled": "Без заголовку",
+  "label.update": "Оновити",
   "label.url": "URL",
   "label.urls": "URLs",
-  "label.user": "User",
+  "label.user": "Користувач",
   "label.username": "Ім'я користувача",
-  "label.users": "Users",
+  "label.users": "Користувачі",
   "label.utm": "UTM",
   "label.utm-description": "Track your campaigns through UTM parameters.",
-  "label.value": "Value",
-  "label.view": "View",
+  "label.value": "Значення",
+  "label.view": "Перегляд",
   "label.view-details": "Переглянути деталі",
-  "label.view-only": "View only",
+  "label.view-only": "Лише для перегляду",
   "label.views": "Перегляди",
-  "label.views-per-visit": "Views per visit",
+  "label.views-per-visit": "Перегляди за візит",
   "label.visitors": "Відвідувачі",
-  "label.visits": "Visits",
-  "label.website": "Website",
-  "label.website-id": "Website ID",
+  "label.visits": "Відвідування",
+  "label.website": "Вебсайт",
+  "label.website-id": "Вебсайт ID",
   "label.websites": "Сайти",
-  "label.window": "Window",
-  "label.yesterday": "Yesterday",
-  "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
+  "label.window": "Вікно",
+  "label.yesterday": "Вчора",
+  "message.action-confirmation": "Введі {confirmation} у поле нижче для підтвердження.",
   "message.active-users": "{x} поточних відвідувачів",
   "message.confirm-delete": "Ви впевнені, що бажаєте видалити {target}?",
-  "message.confirm-leave": "Are you sure you want to leave {target}?",
-  "message.confirm-remove": "Are you sure you want to remove {target}?",
+  "message.confirm-leave": "Ви впевнені, що хочете покинути {target}?",
+  "message.confirm-remove": "Ви впевнеі, що хочете видалити {target}?",
   "message.confirm-reset": "Ви впевнені, що бажаєте скинути статистику для {target}?",
-  "message.delete-team-warning": "Deleting a team will also delete all team websites.",
+  "message.delete-team-warning": "Видалення команди також видалить усі вебсайти команди.",
   "message.delete-website-warning": "Усі пов'язані дані будуть видалені також.",
   "message.error": "Щось пішло не так.",
   "message.event-log": "{event} on {url}",
@@ -221,26 +221,26 @@
   "message.no-data-available": "Немає даних.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Паролі не співпадають",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-teams": "You have not created any teams.",
-  "message.no-users": "There are no users.",
+  "message.no-results-found": "Результатів не знайдено.",
+  "message.no-team-websites": "Ця команди не має жодних вебсайтів.",
+  "message.no-teams": "Ви не створили жодної команди.",
+  "message.no-users": "Користувачів не має.",
   "message.no-websites-configured": "У вас немає налаштованих сайтів.",
   "message.page-not-found": "Сторінку не знайдено.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Вся статистика для цього сайту буде видалена, проте код відслідковування буде продовжувати працювати.",
   "message.saved": "Збережено успішно.",
   "message.share-url": "Це публічне посилання для {target}.",
-  "message.team-already-member": "You are already a member of the team.",
-  "message.team-not-found": "Team not found.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
+  "message.team-already-member": "Ви уже є учасником цієї команди.",
+  "message.team-not-found": "Команду не знайдено.",
+  "message.team-websites-info": "Вебсайти може переглядати кожен учаник команди.",
   "message.tracking-code": "Код для відслідковування",
   "message.transfer-team-website-to-user": "Transfer this website to your account?",
   "message.transfer-user-website-to-team": "Select the team to transfer this website to.",
   "message.transfer-website": "Transfer website ownership to your account or another team.",
   "message.triggered-event": "Triggered event",
-  "message.user-deleted": "User deleted.",
-  "message.viewed-page": "Viewed page",
+  "message.user-deleted": "Користувача видалено.",
+  "message.viewed-page": "Переглянута сторінка",
   "message.visitor-log": "Відвідувач з {country} використовуючи {browser} на {os} {device}",
   "message.visitors-dropped-off": "Visitors dropped off"
 }

From 60e7257656e8ed2cf071b386232ffdb96b8b1800 Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Sun, 5 May 2024 22:15:47 -0700
Subject: [PATCH 042/438] Goals report CH

---
 .../(main)/reports/[reportId]/ReportPage.tsx  |   2 +
 .../(main)/reports/create/ReportTemplates.tsx |   6 +
 .../reports/goals/GoalsAddForm.module.css     |   7 +
 src/app/(main)/reports/goals/GoalsAddForm.tsx |  95 ++++++++
 .../reports/goals/GoalsChart.module.css       |  87 +++++++
 src/app/(main)/reports/goals/GoalsChart.tsx   |  49 ++++
 .../reports/goals/GoalsParameters.module.css  |  26 ++
 .../(main)/reports/goals/GoalsParameters.tsx  | 123 ++++++++++
 .../reports/goals/GoalsReport.module.css      |  10 +
 src/app/(main)/reports/goals/GoalsReport.tsx  |  27 +++
 .../(main)/reports/goals/GoalsReportPage.tsx  |   6 +
 src/app/(main)/reports/goals/page.tsx         |  10 +
 src/app/(main)/reports/utm/page.tsx           |   2 +-
 src/components/messages.ts                    |   7 +
 src/lib/clickhouse.ts                         |   5 +-
 src/lib/constants.ts                          |   1 +
 src/pages/api/reports/[reportId].ts           |   2 +-
 src/pages/api/reports/goals.ts                |  70 ++++++
 src/pages/api/reports/index.ts                |   2 +-
 src/queries/analytics/reports/getGoals.ts     | 225 ++++++++++++++++++
 20 files changed, 758 insertions(+), 4 deletions(-)
 create mode 100644 src/app/(main)/reports/goals/GoalsAddForm.module.css
 create mode 100644 src/app/(main)/reports/goals/GoalsAddForm.tsx
 create mode 100644 src/app/(main)/reports/goals/GoalsChart.module.css
 create mode 100644 src/app/(main)/reports/goals/GoalsChart.tsx
 create mode 100644 src/app/(main)/reports/goals/GoalsParameters.module.css
 create mode 100644 src/app/(main)/reports/goals/GoalsParameters.tsx
 create mode 100644 src/app/(main)/reports/goals/GoalsReport.module.css
 create mode 100644 src/app/(main)/reports/goals/GoalsReport.tsx
 create mode 100644 src/app/(main)/reports/goals/GoalsReportPage.tsx
 create mode 100644 src/app/(main)/reports/goals/page.tsx
 create mode 100644 src/pages/api/reports/goals.ts
 create mode 100644 src/queries/analytics/reports/getGoals.ts

diff --git a/src/app/(main)/reports/[reportId]/ReportPage.tsx b/src/app/(main)/reports/[reportId]/ReportPage.tsx
index 7ecebd3182..f28942b721 100644
--- a/src/app/(main)/reports/[reportId]/ReportPage.tsx
+++ b/src/app/(main)/reports/[reportId]/ReportPage.tsx
@@ -4,6 +4,7 @@ import EventDataReport from '../event-data/EventDataReport';
 import InsightsReport from '../insights/InsightsReport';
 import RetentionReport from '../retention/RetentionReport';
 import UTMReport from '../utm/UTMReport';
+import GoalReport from '../goals/GoalsReport';
 import { useReport } from 'components/hooks';
 
 const reports = {
@@ -12,6 +13,7 @@ const reports = {
   insights: InsightsReport,
   retention: RetentionReport,
   utm: UTMReport,
+  goals: GoalReport,
 };
 
 export default function ReportPage({ reportId }: { reportId: string }) {
diff --git a/src/app/(main)/reports/create/ReportTemplates.tsx b/src/app/(main)/reports/create/ReportTemplates.tsx
index 1bd84aec58..ac29f5c31d 100644
--- a/src/app/(main)/reports/create/ReportTemplates.tsx
+++ b/src/app/(main)/reports/create/ReportTemplates.tsx
@@ -37,6 +37,12 @@ export function ReportTemplates({ showHeader = true }: { showHeader?: boolean })
       url: renderTeamUrl('/reports/utm'),
       icon: <Tag />,
     },
+    {
+      title: formatMessage(labels.goals),
+      description: formatMessage(labels.goalsDescription),
+      url: renderTeamUrl('/reports/goals'),
+      icon: <Tag />,
+    },
   ];
 
   return (
diff --git a/src/app/(main)/reports/goals/GoalsAddForm.module.css b/src/app/(main)/reports/goals/GoalsAddForm.module.css
new file mode 100644
index 0000000000..a254ff088e
--- /dev/null
+++ b/src/app/(main)/reports/goals/GoalsAddForm.module.css
@@ -0,0 +1,7 @@
+.dropdown {
+  width: 140px;
+}
+
+.input {
+  width: 200px;
+}
diff --git a/src/app/(main)/reports/goals/GoalsAddForm.tsx b/src/app/(main)/reports/goals/GoalsAddForm.tsx
new file mode 100644
index 0000000000..fdfa7aad9b
--- /dev/null
+++ b/src/app/(main)/reports/goals/GoalsAddForm.tsx
@@ -0,0 +1,95 @@
+import { useMessages } from 'components/hooks';
+import { useState } from 'react';
+import { Button, Dropdown, Flexbox, FormRow, Item, TextField } from 'react-basics';
+import styles from './GoalsAddForm.module.css';
+
+export function GoalsAddForm({
+  type: defaultType = 'url',
+  value: defaultValue = '',
+  goal: defaultGoal = 10,
+  onChange,
+}: {
+  type?: string;
+  value?: string;
+  goal?: number;
+  onChange?: (step: { type: string; value: string; goal: number }) => void;
+}) {
+  const [type, setType] = useState(defaultType);
+  const [value, setValue] = useState(defaultValue);
+  const [goal, setGoal] = useState(defaultGoal);
+  const { formatMessage, labels } = useMessages();
+  const items = [
+    { label: formatMessage(labels.url), value: 'url' },
+    { label: formatMessage(labels.event), value: 'event' },
+  ];
+  const isDisabled = !type || !value;
+
+  const handleSave = () => {
+    onChange({ type, value, goal });
+    setValue('');
+    setGoal(10);
+  };
+
+  const handleChange = (e, set) => {
+    set(e.target.value);
+  };
+
+  const handleKeyDown = e => {
+    if (e.key === 'Enter') {
+      e.stopPropagation();
+      handleSave();
+    }
+  };
+
+  const renderTypeValue = (value: any) => {
+    return items.find(item => item.value === value)?.label;
+  };
+
+  return (
+    <Flexbox direction="column" gap={10}>
+      <FormRow label={formatMessage(defaultValue ? labels.update : labels.add)}>
+        <Flexbox gap={10}>
+          <Dropdown
+            className={styles.dropdown}
+            items={items}
+            value={type}
+            renderValue={renderTypeValue}
+            onChange={(value: any) => setType(value)}
+          >
+            {({ value, label }) => {
+              return <Item key={value}>{label}</Item>;
+            }}
+          </Dropdown>
+          <TextField
+            className={styles.input}
+            value={value}
+            onChange={e => handleChange(e, setValue)}
+            autoFocus={true}
+            autoComplete="off"
+            onKeyDown={handleKeyDown}
+          />
+        </Flexbox>
+      </FormRow>
+      <FormRow label={formatMessage(labels.goal)}>
+        <Flexbox gap={10}>
+          <TextField
+            className={styles.input}
+            value={goal?.toString()}
+            onChange={e => handleChange(e, setGoal)}
+            autoFocus={true}
+            autoComplete="off"
+            onKeyDown={handleKeyDown}
+          />
+          .
+        </Flexbox>
+      </FormRow>
+      <FormRow>
+        <Button variant="primary" onClick={handleSave} disabled={isDisabled}>
+          {formatMessage(defaultValue ? labels.update : labels.add)}
+        </Button>
+      </FormRow>
+    </Flexbox>
+  );
+}
+
+export default GoalsAddForm;
diff --git a/src/app/(main)/reports/goals/GoalsChart.module.css b/src/app/(main)/reports/goals/GoalsChart.module.css
new file mode 100644
index 0000000000..c9f158d2fe
--- /dev/null
+++ b/src/app/(main)/reports/goals/GoalsChart.module.css
@@ -0,0 +1,87 @@
+.chart {
+  display: grid;
+}
+
+.num {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 100%;
+  width: 50px;
+  height: 50px;
+  font-size: 16px;
+  font-weight: 700;
+  color: var(--base800);
+  background: var(--base100);
+  z-index: 1;
+}
+
+.step {
+  display: grid;
+  grid-template-columns: max-content 1fr;
+  column-gap: 30px;
+  position: relative;
+  padding-bottom: 60px;
+}
+
+.card {
+  display: grid;
+  gap: 20px;
+  margin-top: 14px;
+}
+
+.header {
+  display: flex;
+  flex-direction: column;
+  gap: 20px;
+}
+
+.bar {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  background: var(--base900);
+  height: 30px;
+  border-radius: 5px;
+  overflow: hidden;
+  position: relative;
+}
+
+.label {
+  color: var(--base600);
+  font-weight: 700;
+  text-transform: uppercase;
+}
+
+.track {
+  background-color: var(--base100);
+  border-radius: 5px;
+}
+
+.item {
+  font-size: 20px;
+  color: var(--base900);
+  font-weight: 700;
+}
+
+.metric {
+  color: var(--base700);
+  display: flex;
+  justify-content: space-between;
+  gap: 10px;
+  margin: 10px 0;
+  text-transform: lowercase;
+}
+
+.visitors {
+  color: var(--base900);
+  font-size: 24px;
+  font-weight: 900;
+  margin-right: 10px;
+}
+
+.percent {
+  font-size: 20px;
+  font-weight: 700;
+  align-self: flex-end;
+}
diff --git a/src/app/(main)/reports/goals/GoalsChart.tsx b/src/app/(main)/reports/goals/GoalsChart.tsx
new file mode 100644
index 0000000000..7cebbe217d
--- /dev/null
+++ b/src/app/(main)/reports/goals/GoalsChart.tsx
@@ -0,0 +1,49 @@
+import { useContext } from 'react';
+import classNames from 'classnames';
+import { useMessages } from 'components/hooks';
+import { ReportContext } from '../[reportId]/Report';
+import { formatLongNumber } from 'lib/format';
+import styles from './GoalsChart.module.css';
+
+export function GoalsChart({ className }: { className?: string; isLoading?: boolean }) {
+  const { report } = useContext(ReportContext);
+  const { formatMessage, labels } = useMessages();
+
+  const { data } = report || {};
+
+  return (
+    <div className={classNames(styles.chart, className)}>
+      {data?.map(({ type, value, goal, result }, index: number) => {
+        return (
+          <div key={index} className={styles.step}>
+            <div className={styles.num}>{index + 1}</div>
+            <div className={styles.card}>
+              <div className={styles.header}>
+                <span className={styles.label}>
+                  {formatMessage(type === 'url' ? labels.viewedPage : labels.triggeredEvent)}
+                </span>
+                <span className={styles.item}>{value}</span>
+              </div>
+              <div className={styles.metric}>
+                <div>
+                  <span className={styles.visitors}>{formatLongNumber(result)}</span>
+                  {formatMessage(labels.visitors)}
+                </div>
+                <div>
+                  <span className={styles.visitors}>{formatLongNumber(goal)}</span>
+                  {formatMessage(labels.goal)}
+                </div>
+                <div className={styles.percent}>{(result / goal).toFixed(2)}%</div>
+              </div>
+              <div className={styles.track}>
+                <div className={styles.bar} style={{ width: `${result / goal}%` }}></div>
+              </div>
+            </div>
+          </div>
+        );
+      })}
+    </div>
+  );
+}
+
+export default GoalsChart;
diff --git a/src/app/(main)/reports/goals/GoalsParameters.module.css b/src/app/(main)/reports/goals/GoalsParameters.module.css
new file mode 100644
index 0000000000..421433f0eb
--- /dev/null
+++ b/src/app/(main)/reports/goals/GoalsParameters.module.css
@@ -0,0 +1,26 @@
+.item {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  width: 100%;
+}
+
+.type {
+  color: var(--base700);
+}
+
+.value {
+  display: flex;
+  align-self: center;
+  gap: 20px;
+}
+
+.goal {
+  color: var(--blue900);
+  background-color: var(--blue100);
+  font-size: 12px;
+  font-weight: 900;
+  padding: 2px 8px;
+  border-radius: 5px;
+  white-space: nowrap;
+}
diff --git a/src/app/(main)/reports/goals/GoalsParameters.tsx b/src/app/(main)/reports/goals/GoalsParameters.tsx
new file mode 100644
index 0000000000..b4743d2d1e
--- /dev/null
+++ b/src/app/(main)/reports/goals/GoalsParameters.tsx
@@ -0,0 +1,123 @@
+import { useMessages } from 'components/hooks';
+import Icons from 'components/icons';
+import { formatNumber } from 'lib/format';
+import { useContext } from 'react';
+import {
+  Button,
+  Form,
+  FormButtons,
+  FormRow,
+  Icon,
+  Popup,
+  PopupTrigger,
+  SubmitButton,
+} from 'react-basics';
+import BaseParameters from '../[reportId]/BaseParameters';
+import ParameterList from '../[reportId]/ParameterList';
+import PopupForm from '../[reportId]/PopupForm';
+import { ReportContext } from '../[reportId]/Report';
+import GoalsAddForm from './GoalsAddForm';
+import styles from './GoalsParameters.module.css';
+
+export function GoalsParameters() {
+  const { report, runReport, updateReport, isRunning } = useContext(ReportContext);
+  const { formatMessage, labels } = useMessages();
+
+  const { id, parameters } = report || {};
+  const { websiteId, dateRange, goals } = parameters || {};
+  const queryDisabled = !websiteId || !dateRange || goals?.length < 1;
+
+  const handleSubmit = (data: any, e: any) => {
+    e.stopPropagation();
+    e.preventDefault();
+
+    if (!queryDisabled) {
+      runReport(data);
+    }
+  };
+
+  const handleAddGoals = (goal: { type: string; value: string }) => {
+    updateReport({ parameters: { goals: parameters.goals.concat(goal) } });
+  };
+
+  const handleUpdateGoals = (
+    close: () => void,
+    index: number,
+    goal: { type: string; value: string },
+  ) => {
+    const goals = [...parameters.goals];
+    goals[index] = goal;
+    updateReport({ parameters: { goals } });
+    close();
+  };
+
+  const handleRemoveGoals = (index: number) => {
+    const goals = [...parameters.goals];
+    delete goals[index];
+    updateReport({ parameters: { goals: goals.filter(n => n) } });
+  };
+
+  const AddGoalsButton = () => {
+    return (
+      <PopupTrigger>
+        <Button>
+          <Icon>
+            <Icons.Plus />
+          </Icon>
+        </Button>
+        <Popup alignment="start">
+          <PopupForm>
+            <GoalsAddForm onChange={handleAddGoals} />
+          </PopupForm>
+        </Popup>
+      </PopupTrigger>
+    );
+  };
+
+  return (
+    <Form values={parameters} onSubmit={handleSubmit} preventSubmit={true}>
+      <BaseParameters allowWebsiteSelect={!id} />
+      <FormRow label={formatMessage(labels.goals)} action={<AddGoalsButton />}>
+        <ParameterList>
+          {goals.map((goal: { type: string; value: string; goal: number }, index: number) => {
+            return (
+              <PopupTrigger key={index}>
+                <ParameterList.Item
+                  className={styles.item}
+                  onRemove={() => handleRemoveGoals(index)}
+                >
+                  <div className={styles.value}>
+                    <div className={styles.type}>
+                      <Icon>{goal.type === 'url' ? <Icons.Eye /> : <Icons.Bolt />}</Icon>
+                    </div>
+                    <div>{goal.value}</div>
+                    <div className={styles.goal}>{formatNumber(goal.goal)}</div>
+                  </div>
+                </ParameterList.Item>
+                <Popup alignment="start">
+                  {(close: () => void) => (
+                    <PopupForm>
+                      <GoalsAddForm
+                        type={goal.type}
+                        value={goal.value}
+                        goal={goal.goal}
+                        onChange={handleUpdateGoals.bind(null, close, index)}
+                      />
+                    </PopupForm>
+                  )}
+                </Popup>
+              </PopupTrigger>
+            );
+          })}
+        </ParameterList>
+      </FormRow>
+      <FormButtons>
+        <SubmitButton variant="primary" disabled={queryDisabled} isLoading={isRunning}>
+          {formatMessage(labels.runQuery)}
+        </SubmitButton>
+      </FormButtons>
+    </Form>
+  );
+}
+
+export default GoalsParameters;
diff --git a/src/app/(main)/reports/goals/GoalsReport.module.css b/src/app/(main)/reports/goals/GoalsReport.module.css
new file mode 100644
index 0000000000..aed66b74ef
--- /dev/null
+++ b/src/app/(main)/reports/goals/GoalsReport.module.css
@@ -0,0 +1,10 @@
+.filters {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  border: 1px solid var(--base400);
+  border-radius: var(--border-radius);
+  line-height: 32px;
+  padding: 10px;
+  overflow: hidden;
+}
diff --git a/src/app/(main)/reports/goals/GoalsReport.tsx b/src/app/(main)/reports/goals/GoalsReport.tsx
new file mode 100644
index 0000000000..d6171c3184
--- /dev/null
+++ b/src/app/(main)/reports/goals/GoalsReport.tsx
@@ -0,0 +1,27 @@
+import GoalsChart from './GoalsChart';
+import GoalsParameters from './GoalsParameters';
+import Report from '../[reportId]/Report';
+import ReportHeader from '../[reportId]/ReportHeader';
+import ReportMenu from '../[reportId]/ReportMenu';
+import ReportBody from '../[reportId]/ReportBody';
+import Goals from 'assets/funnel.svg';
+import { REPORT_TYPES } from 'lib/constants';
+
+const defaultParameters = {
+  type: REPORT_TYPES.goals,
+  parameters: { goals: [] },
+};
+
+export default function GoalsReport({ reportId }: { reportId?: string }) {
+  return (
+    <Report reportId={reportId} defaultParameters={defaultParameters}>
+      <ReportHeader icon={<Goals />} />
+      <ReportMenu>
+        <GoalsParameters />
+      </ReportMenu>
+      <ReportBody>
+        <GoalsChart />
+      </ReportBody>
+    </Report>
+  );
+}
diff --git a/src/app/(main)/reports/goals/GoalsReportPage.tsx b/src/app/(main)/reports/goals/GoalsReportPage.tsx
new file mode 100644
index 0000000000..cbab8bd0a7
--- /dev/null
+++ b/src/app/(main)/reports/goals/GoalsReportPage.tsx
@@ -0,0 +1,6 @@
+'use client';
+import GoalReport from './GoalsReport';
+
+export default function GoalReportPage() {
+  return <GoalReport />;
+}
diff --git a/src/app/(main)/reports/goals/page.tsx b/src/app/(main)/reports/goals/page.tsx
new file mode 100644
index 0000000000..112ae47cfc
--- /dev/null
+++ b/src/app/(main)/reports/goals/page.tsx
@@ -0,0 +1,10 @@
+import GoalsReportPage from './GoalsReportPage';
+import { Metadata } from 'next';
+
+export default function () {
+  return <GoalsReportPage />;
+}
+
+export const metadata: Metadata = {
+  title: 'Goals Report',
+};
diff --git a/src/app/(main)/reports/utm/page.tsx b/src/app/(main)/reports/utm/page.tsx
index 12b6cc5b34..7fa506608d 100644
--- a/src/app/(main)/reports/utm/page.tsx
+++ b/src/app/(main)/reports/utm/page.tsx
@@ -6,5 +6,5 @@ export default function () {
 }
 
 export const metadata: Metadata = {
-  title: 'UTM Report',
+  title: 'Goals Report',
 };
diff --git a/src/components/messages.ts b/src/components/messages.ts
index 7a11aa8993..1413549fdd 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -235,6 +235,13 @@ export const labels = defineMessages({
   },
   steps: { id: 'label.steps', defaultMessage: 'Steps' },
   addStep: { id: 'label.add-step', defaultMessage: 'Add step' },
+  goal: { id: 'label.goal', defaultMessage: 'Goal' },
+  goals: { id: 'label.goals', defaultMessage: 'Goals' },
+  goalsDescription: {
+    id: 'label.goals-description',
+    defaultMessage: 'Track your goals for pageviews or events.',
+  },
+  count: { id: 'label.count', defaultMessage: 'Count' },
 });
 
 export const messages = defineMessages({
diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index c1b9d25f27..3563484178 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -119,7 +119,10 @@ async function parseFilters(websiteId: string, filters: QueryFilters = {}, optio
   };
 }
 
-async function rawQuery(query: string, params: Record<string, unknown> = {}): Promise<unknown> {
+async function rawQuery<T = unknown>(
+  query: string,
+  params: Record<string, unknown> = {},
+): Promise<T> {
   if (process.env.LOG_QUERY) {
     log('QUERY:\n', query);
     log('PARAMETERS:\n', params);
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 0b6f7d264f..697a48367f 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -111,6 +111,7 @@ export const DATA_TYPES = {
 
 export const REPORT_TYPES = {
   funnel: 'funnel',
+  goals: 'goals',
   insights: 'insights',
   retention: 'retention',
   utm: 'utm',
diff --git a/src/pages/api/reports/[reportId].ts b/src/pages/api/reports/[reportId].ts
index db7d0bcc7f..be2db82f57 100644
--- a/src/pages/api/reports/[reportId].ts
+++ b/src/pages/api/reports/[reportId].ts
@@ -27,7 +27,7 @@ const schema: YupRequest = {
     websiteId: yup.string().uuid().required(),
     type: yup
       .string()
-      .matches(/funnel|insights|retention|utm/i)
+      .matches(/funnel|insights|retention|utm|goals/i)
       .required(),
     name: yup.string().max(200).required(),
     description: yup.string().max(500),
diff --git a/src/pages/api/reports/goals.ts b/src/pages/api/reports/goals.ts
new file mode 100644
index 0000000000..bb7667751c
--- /dev/null
+++ b/src/pages/api/reports/goals.ts
@@ -0,0 +1,70 @@
+import { canViewWebsite } from 'lib/auth';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody } from 'lib/types';
+import { TimezoneTest } from 'lib/yup';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getGoals } from 'queries/analytics/reports/getGoals';
+import * as yup from 'yup';
+
+export interface RetentionRequestBody {
+  websiteId: string;
+  dateRange: { startDate: string; endDate: string; timezone: string };
+  goals: { type: string; value: string; goal: number }[];
+}
+
+const schema = {
+  POST: yup.object().shape({
+    websiteId: yup.string().uuid().required(),
+    dateRange: yup
+      .object()
+      .shape({
+        startDate: yup.date().required(),
+        endDate: yup.date().required(),
+        timezone: TimezoneTest,
+      })
+      .required(),
+    goals: yup
+      .array()
+      .of(
+        yup.object().shape({
+          type: yup.string().required(),
+          value: yup.string().required(),
+          goal: yup.number().required(),
+        }),
+      )
+      .min(1)
+      .required(),
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<any, RetentionRequestBody>,
+  res: NextApiResponse,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  if (req.method === 'POST') {
+    const {
+      websiteId,
+      dateRange: { startDate, endDate },
+      goals,
+    } = req.body;
+
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const data = await getGoals(websiteId, {
+      startDate: new Date(startDate),
+      endDate: new Date(endDate),
+      goals,
+    });
+
+    return ok(res, data);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/src/pages/api/reports/index.ts b/src/pages/api/reports/index.ts
index d231f0b7f5..186a18211f 100644
--- a/src/pages/api/reports/index.ts
+++ b/src/pages/api/reports/index.ts
@@ -27,7 +27,7 @@ const schema = {
     name: yup.string().max(200).required(),
     type: yup
       .string()
-      .matches(/funnel|insights|retention|utm/i)
+      .matches(/funnel|insights|retention|utm|goals/i)
       .required(),
     description: yup.string().max(500),
     parameters: yup
diff --git a/src/queries/analytics/reports/getGoals.ts b/src/queries/analytics/reports/getGoals.ts
new file mode 100644
index 0000000000..f275d60461
--- /dev/null
+++ b/src/queries/analytics/reports/getGoals.ts
@@ -0,0 +1,225 @@
+import clickhouse from 'lib/clickhouse';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import prisma from 'lib/prisma';
+
+export async function getGoals(
+  ...args: [
+    websiteId: string,
+    criteria: {
+      startDate: Date;
+      endDate: Date;
+      goals: { type: string; value: string; goal: number }[];
+    },
+  ]
+) {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(
+  websiteId: string,
+  criteria: {
+    startDate: Date;
+    endDate: Date;
+    goals: { type: string; value: string; goal: number }[];
+  },
+): Promise<any> {
+  const { startDate, endDate, goals } = criteria;
+  const { rawQuery } = prisma;
+
+  const hasUrl = goals.some(a => a.type === 'url');
+  const hasEvent = goals.some(a => a.type === 'event');
+
+  function getParameters(goals: { type: string; value: string; goal: number }[]) {
+    const urls = goals
+      .filter(a => a.type === 'url')
+      .reduce((acc, cv, i) => {
+        acc[`${cv.type}${i}`] = cv.value;
+        return acc;
+      }, {});
+
+    const events = goals
+      .filter(a => a.type === 'event')
+      .reduce((acc, cv, i) => {
+        acc[`${cv.type}${i}`] = cv.value;
+        return acc;
+      }, {});
+
+    return {
+      urls: { ...urls, startDate, endDate, websiteId },
+      events: { ...events, startDate, endDate, websiteId },
+    };
+  }
+
+  function getColumns(goals: { type: string; value: string; goal: number }[]) {
+    const urls = goals
+      .filter(a => a.type === 'url')
+      .map((a, i) => `COUNT(CASE WHEN url_path =  {{url${i}}} THEN 1 END) AS URL${i}`)
+      .join('\n');
+    const events = goals
+      .filter(a => a.type === 'event')
+      .map((a, i) => `COUNT(CASE WHEN url_path =  {{event${i}}} THEN 1 END) AS EVENT${i}`)
+      .join('\n');
+
+    return { urls, events };
+  }
+
+  function getWhere(goals: { type: string; value: string; goal: number }[]) {
+    const urls = goals
+      .filter(a => a.type === 'url')
+      .map((a, i) => `{{url${i}}}`)
+      .join(',');
+    const events = goals
+      .filter(a => a.type === 'event')
+      .map((a, i) => `{{event${i}}}`)
+      .join(',');
+
+    return { urls: `and url_path in (${urls})`, events: `and event_name in (${events})` };
+  }
+
+  const parameters = getParameters(goals);
+  const columns = getColumns(goals);
+  const where = getWhere(goals);
+
+  const urls = hasUrl
+    ? await rawQuery(
+        `
+  select
+    ${columns.urls}
+  from website_event
+    where websiteId = {{websiteId::uuid}}
+      ${where.urls}
+      and created_at between {{startDate}} and {{endDate}}
+  `,
+        parameters.urls,
+      )
+    : [];
+
+  const events = hasEvent
+    ? await rawQuery(
+        `
+  select
+    ${columns.events}
+  from website_event
+    where websiteId = {{websiteId::uuid}}
+      ${where.events}
+      and created_at between {{startDate}} and {{endDate}}
+  `,
+        parameters.events,
+      )
+    : [];
+
+  return [...urls, ...events];
+}
+
+async function clickhouseQuery(
+  websiteId: string,
+  criteria: {
+    startDate: Date;
+    endDate: Date;
+    goals: { type: string; value: string; goal: number }[];
+  },
+): Promise<{ type: string; value: string; goal: number; result: number }[]> {
+  const { startDate, endDate, goals } = criteria;
+  const { rawQuery } = clickhouse;
+
+  const urls = goals.filter(a => a.type === 'url');
+  const events = goals.filter(a => a.type === 'event');
+
+  const hasUrl = urls.length > 0;
+  const hasEvent = events.length > 0;
+
+  function getParameters(
+    urls: { type: string; value: string; goal: number }[],
+    events: { type: string; value: string; goal: number }[],
+  ) {
+    const urlParam = urls.reduce((acc, cv, i) => {
+      acc[`${cv.type}${i}`] = cv.value;
+      return acc;
+    }, {});
+
+    const eventParam = events.reduce((acc, cv, i) => {
+      acc[`${cv.type}${i}`] = cv.value;
+      return acc;
+    }, {});
+
+    return {
+      urls: { ...urlParam, startDate, endDate, websiteId },
+      events: { ...eventParam, startDate, endDate, websiteId },
+    };
+  }
+
+  function getColumns(
+    urls: { type: string; value: string; goal: number }[],
+    events: { type: string; value: string; goal: number }[],
+  ) {
+    const urlColumns = urls
+      .map((a, i) => `countIf(url_path = {url${i}:String}) AS URL${i},`)
+      .join('\n')
+      .slice(0, -1);
+    const eventColumns = events
+      .map((a, i) => `countIf(event_name = {event${i}:String}) AS EVENT${i}`)
+      .join('\n')
+      .slice(0, -1);
+
+    return { url: urlColumns, events: eventColumns };
+  }
+
+  function getWhere(
+    urls: { type: string; value: string; goal: number }[],
+    events: { type: string; value: string; goal: number }[],
+  ) {
+    const urlWhere = urls.map((a, i) => `{url${i}:String}`).join(',');
+    const eventWhere = events.map((a, i) => `{event${i}:String}`).join(',');
+
+    return { urls: `and url_path in (${urlWhere})`, events: `and event_name in (${eventWhere})` };
+  }
+
+  const parameters = getParameters(urls, events);
+  const columns = getColumns(urls, events);
+  const where = getWhere(urls, events);
+
+  const urlResults = hasUrl
+    ? await rawQuery<any>(
+        `
+  select
+    ${columns.url}
+  from website_event
+    where website_id = {websiteId:UUID}
+      ${where.urls}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+  `,
+        parameters.urls,
+      ).then(a => {
+        const results = a[0];
+
+        return Object.keys(results).map((key, i) => {
+          return { ...urls[i], result: results[key] };
+        });
+      })
+    : [];
+
+  const eventResults = hasEvent
+    ? await rawQuery<any>(
+        `
+  select
+    ${columns.events}
+  from website_event
+  where website_id = {websiteId:UUID}
+    ${where.events}
+    and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+  `,
+        parameters.events,
+      ).then(a => {
+        const results = a[0];
+
+        return Object.keys(results).map((key, i) => {
+          return { ...events[i], result: results[key] };
+        });
+      })
+    : [];
+
+  return [...urlResults, ...eventResults];
+}

From 4d66d400a949976bedde82ad3f531377b3118f46 Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Sun, 5 May 2024 22:28:18 -0700
Subject: [PATCH 043/438] Fix percentages.

---
 src/app/(main)/reports/goals/GoalsChart.tsx | 7 +++++--
 src/queries/analytics/reports/getGoals.ts   | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/app/(main)/reports/goals/GoalsChart.tsx b/src/app/(main)/reports/goals/GoalsChart.tsx
index 7cebbe217d..f20c4f9b36 100644
--- a/src/app/(main)/reports/goals/GoalsChart.tsx
+++ b/src/app/(main)/reports/goals/GoalsChart.tsx
@@ -33,10 +33,13 @@ export function GoalsChart({ className }: { className?: string; isLoading?: bool
                   <span className={styles.visitors}>{formatLongNumber(goal)}</span>
                   {formatMessage(labels.goal)}
                 </div>
-                <div className={styles.percent}>{(result / goal).toFixed(2)}%</div>
+                <div className={styles.percent}>{((result / goal) * 100).toFixed(2)}%</div>
               </div>
               <div className={styles.track}>
-                <div className={styles.bar} style={{ width: `${result / goal}%` }}></div>
+                <div
+                  className={styles.bar}
+                  style={{ width: `${result > goal ? 100 : (result / goal) * 100}%` }}
+                ></div>
               </div>
             </div>
           </div>
diff --git a/src/queries/analytics/reports/getGoals.ts b/src/queries/analytics/reports/getGoals.ts
index f275d60461..d26998d03a 100644
--- a/src/queries/analytics/reports/getGoals.ts
+++ b/src/queries/analytics/reports/getGoals.ts
@@ -196,7 +196,7 @@ async function clickhouseQuery(
         const results = a[0];
 
         return Object.keys(results).map((key, i) => {
-          return { ...urls[i], result: results[key] };
+          return { ...urls[i], goal: Number(urls[i].goal), result: Number(results[key]) };
         });
       })
     : [];
@@ -216,7 +216,7 @@ async function clickhouseQuery(
         const results = a[0];
 
         return Object.keys(results).map((key, i) => {
-          return { ...events[i], result: results[key] };
+          return { ...events[i], goal: Number(events[i].goal), result: Number(results[key]) };
         });
       })
     : [];

From fb16cae12ef9e70a6395439af21e7a4e4112c4b4 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@umami.is>
Date: Mon, 6 May 2024 11:16:54 -0700
Subject: [PATCH 044/438] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index ae469eaaf3..84d795698e 100644
--- a/README.md
+++ b/README.md
@@ -101,3 +101,5 @@ docker compose up --force-recreate
 ## License
 
 MIT
+
+<img referrerpolicy="no-referrer-when-downgrade" src="https://static.scarf.sh/a.png?x-pxid=40923c13-147d-4033-b602-1d4b2b5c34cd" />

From 7a75639dd3d7aeff46104b71ebfb3853fc0eee09 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@umami.is>
Date: Mon, 6 May 2024 21:24:17 -0700
Subject: [PATCH 045/438] Update README.md

---
 README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 84d795698e..6d9755d4de 100644
--- a/README.md
+++ b/README.md
@@ -72,13 +72,13 @@ docker compose up -d
 Alternatively, to pull just the Umami Docker image with PostgreSQL support:
 
 ```bash
-docker pull ghcr.io/umami-software/umami:postgresql-latest
+docker pull docker.umami.is/umami-software/umami:postgresql-latest
 ```
 
 Or with MySQL support:
 
 ```bash
-docker pull ghcr.io/umami-software/umami:mysql-latest
+docker pull docker.umami.is/umami-software/umami:mysql-latest
 ```
 
 ## Getting updates
@@ -102,4 +102,3 @@ docker compose up --force-recreate
 
 MIT
 
-<img referrerpolicy="no-referrer-when-downgrade" src="https://static.scarf.sh/a.png?x-pxid=40923c13-147d-4033-b602-1d4b2b5c34cd" />

From 8bdb3337167bd0fa447c17ad3317ded1b85c52bd Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 7 May 2024 17:26:15 -0700
Subject: [PATCH 046/438] Remove offset from query parameters.

---
 src/components/hooks/useFilterParams.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/hooks/useFilterParams.ts b/src/components/hooks/useFilterParams.ts
index 4fc36f39d8..fd76fd4786 100644
--- a/src/components/hooks/useFilterParams.ts
+++ b/src/components/hooks/useFilterParams.ts
@@ -5,7 +5,7 @@ import { zonedTimeToUtc } from 'date-fns-tz';
 
 export function useFilterParams(websiteId: string) {
   const [dateRange] = useDateRange(websiteId);
-  const { startDate, endDate, unit, offset } = dateRange;
+  const { startDate, endDate, unit } = dateRange;
   const { timezone } = useTimezone();
   const {
     query: { url, referrer, title, query, os, browser, device, country, region, city, event },
@@ -15,7 +15,6 @@ export function useFilterParams(websiteId: string) {
     startAt: +zonedTimeToUtc(startDate, timezone),
     endAt: +zonedTimeToUtc(endDate, timezone),
     unit,
-    offset,
     timezone,
     url,
     referrer,

From 42b475b0619c35301d178822e6114da8065310c4 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 7 May 2024 17:26:15 -0700
Subject: [PATCH 047/438] Remove offset from query parameters.

---
 src/components/hooks/useFilterParams.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/hooks/useFilterParams.ts b/src/components/hooks/useFilterParams.ts
index 4fc36f39d8..fd76fd4786 100644
--- a/src/components/hooks/useFilterParams.ts
+++ b/src/components/hooks/useFilterParams.ts
@@ -5,7 +5,7 @@ import { zonedTimeToUtc } from 'date-fns-tz';
 
 export function useFilterParams(websiteId: string) {
   const [dateRange] = useDateRange(websiteId);
-  const { startDate, endDate, unit, offset } = dateRange;
+  const { startDate, endDate, unit } = dateRange;
   const { timezone } = useTimezone();
   const {
     query: { url, referrer, title, query, os, browser, device, country, region, city, event },
@@ -15,7 +15,6 @@ export function useFilterParams(websiteId: string) {
     startAt: +zonedTimeToUtc(startDate, timezone),
     endAt: +zonedTimeToUtc(endDate, timezone),
     unit,
-    offset,
     timezone,
     url,
     referrer,

From 3c27f08a97554ea1bac0f479dab279d3caf4f532 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 7 May 2024 22:47:39 -0700
Subject: [PATCH 048/438] Render children for data tables.

---
 package.json                                  |  2 +-
 .../settings/websites/WebsitesDataTable.tsx   |  8 ++--
 .../settings/websites/WebsitesTable.tsx       |  5 ++-
 src/components/common/DataTable.module.css    | 14 -------
 src/components/common/DataTable.tsx           |  2 +-
 src/components/hooks/queries/useRealtime.ts   |  2 +-
 .../hooks/queries/useWebsiteValues.ts         |  2 +-
 yarn.lock                                     | 39 +++++++++++++++----
 8 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/package.json b/package.json
index d5a090dfd6..3d5b74ae2e 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
     "@react-spring/web": "^9.7.3",
     "@tanstack/react-query": "^5.28.6",
     "@umami/prisma-client": "^0.14.0",
-    "@umami/redis-client": "^0.20.0",
+    "@umami/redis-client": "^0.21.0",
     "chalk": "^4.1.1",
     "chart.js": "^4.4.2",
     "chartjs-adapter-date-fns": "^3.0.0",
diff --git a/src/app/(main)/settings/websites/WebsitesDataTable.tsx b/src/app/(main)/settings/websites/WebsitesDataTable.tsx
index 6ffe6fd011..b3472942b4 100644
--- a/src/app/(main)/settings/websites/WebsitesDataTable.tsx
+++ b/src/app/(main)/settings/websites/WebsitesDataTable.tsx
@@ -18,6 +18,10 @@ export function WebsitesDataTable({
 }) {
   const queryResult = useWebsites({ teamId });
 
+  if (!queryResult?.result?.data?.length) {
+    return children;
+  }
+
   return (
     <DataTable queryResult={queryResult}>
       {({ data }) => (
@@ -27,9 +31,7 @@ export function WebsitesDataTable({
           showActions={showActions}
           allowEdit={allowEdit}
           allowView={allowView}
-        >
-          {children}
-        </WebsitesTable>
+        />
       )}
     </DataTable>
   );
diff --git a/src/app/(main)/settings/websites/WebsitesTable.tsx b/src/app/(main)/settings/websites/WebsitesTable.tsx
index 022191cf35..dced90be50 100644
--- a/src/app/(main)/settings/websites/WebsitesTable.tsx
+++ b/src/app/(main)/settings/websites/WebsitesTable.tsx
@@ -23,6 +23,10 @@ export function WebsitesTable({
   const breakpoint = useBreakpoint();
   const { renderTeamUrl } = useTeamUrl();
 
+  if (!data?.length) {
+    return children;
+  }
+
   return (
     <GridTable data={data} cardMode={['xs', 'sm', 'md'].includes(breakpoint)}>
       <GridColumn name="name" label={formatMessage(labels.name)} />
@@ -55,7 +59,6 @@ export function WebsitesTable({
           }}
         </GridColumn>
       )}
-      {children}
     </GridTable>
   );
 }
diff --git a/src/components/common/DataTable.module.css b/src/components/common/DataTable.module.css
index 98d84c7599..9a7cffb769 100644
--- a/src/components/common/DataTable.module.css
+++ b/src/components/common/DataTable.module.css
@@ -1,22 +1,8 @@
-.table {
-  grid-template-rows: repeat(auto-fit, max-content);
-}
-
-.table td {
-  align-items: center;
-  max-height: max-content;
-}
-
 .search {
   max-width: 300px;
   margin: 20px 0;
 }
 
-.action {
-  justify-content: flex-end;
-  gap: 5px;
-}
-
 .body {
   display: flex;
   flex-direction: column;
diff --git a/src/components/common/DataTable.tsx b/src/components/common/DataTable.tsx
index 4bca7fc397..ed910def7d 100644
--- a/src/components/common/DataTable.tsx
+++ b/src/components/common/DataTable.tsx
@@ -4,8 +4,8 @@ import { Banner, Loading, SearchField } from 'react-basics';
 import { useMessages } from 'components/hooks';
 import Empty from 'components/common/Empty';
 import Pager from 'components/common/Pager';
-import styles from './DataTable.module.css';
 import { FilterQueryResult } from 'lib/types';
+import styles from './DataTable.module.css';
 
 const DEFAULT_SEARCH_DELAY = 600;
 
diff --git a/src/components/hooks/queries/useRealtime.ts b/src/components/hooks/queries/useRealtime.ts
index ccf6a62df8..92b03bd03f 100644
--- a/src/components/hooks/queries/useRealtime.ts
+++ b/src/components/hooks/queries/useRealtime.ts
@@ -1,6 +1,6 @@
 import { useMemo, useRef } from 'react';
 import { RealtimeData } from 'lib/types';
-import { useApi } from 'components/hooks';
+import { useApi } from './useApi';
 import { REALTIME_INTERVAL, REALTIME_RANGE } from 'lib/constants';
 import { startOfMinute, subMinutes } from 'date-fns';
 import { percentFilter } from 'lib/filters';
diff --git a/src/components/hooks/queries/useWebsiteValues.ts b/src/components/hooks/queries/useWebsiteValues.ts
index 02e26fc332..c5358df233 100644
--- a/src/components/hooks/queries/useWebsiteValues.ts
+++ b/src/components/hooks/queries/useWebsiteValues.ts
@@ -1,4 +1,4 @@
-import { useApi } from 'components/hooks';
+import { useApi } from './useApi';
 
 export function useWebsiteValues({
   websiteId,
diff --git a/yarn.lock b/yarn.lock
index 95cc310bfe..5720f25d98 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2899,10 +2899,10 @@
     chalk "^4.1.2"
     debug "^4.3.4"
 
-"@umami/redis-client@^0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@umami/redis-client/-/redis-client-0.20.0.tgz#93b4598d68983b1ad266a0a527c56533c6248bf2"
-  integrity sha512-ACpoO+M/J2eLWEtusjbslhR4le+rPN4h9x7TXjaVJ905icVE0Qgu5y+A7nxXjcYvlgkHk+8HPeVeeaw5P+rxqw==
+"@umami/redis-client@^0.21.0":
+  version "0.21.0"
+  resolved "https://registry.yarnpkg.com/@umami/redis-client/-/redis-client-0.21.0.tgz#96426b28860b8b06fae8825fc2f2d9575b64e863"
+  integrity sha512-PpdJunvT4sAsVWIeEl+cHU6iSV2r/Df9dof2gdUwSigfD88ACsVs1/BvlWERxk/T93rTgVJWSpLvdw/oMYvkcw==
   dependencies:
     debug "^4.3.4"
     redis "^4.5.1"
@@ -9532,7 +9532,16 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -9605,7 +9614,14 @@ string.prototype.trimstart@^1.0.8:
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -10366,7 +10382,7 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -10384,6 +10400,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

From 90bd72cf984761c545e60a99e68452b3039d543f Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 7 May 2024 23:09:19 -0700
Subject: [PATCH 049/438] Updated data table render check.

---
 src/app/(main)/reports/ReportsDataTable.tsx         |  7 +++++++
 src/app/(main)/settings/teams/TeamsDataTable.tsx    |  7 +++++++
 src/app/(main)/settings/users/UsersDataTable.tsx    | 13 ++++++++++++-
 .../(main)/settings/websites/WebsitesDataTable.tsx  |  2 +-
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/app/(main)/reports/ReportsDataTable.tsx b/src/app/(main)/reports/ReportsDataTable.tsx
index cf5953e856..7c99fb25f7 100644
--- a/src/app/(main)/reports/ReportsDataTable.tsx
+++ b/src/app/(main)/reports/ReportsDataTable.tsx
@@ -1,16 +1,23 @@
 import { useReports } from 'components/hooks';
 import ReportsTable from './ReportsTable';
 import DataTable from 'components/common/DataTable';
+import { ReactNode } from 'react';
 
 export default function ReportsDataTable({
   websiteId,
   teamId,
+  children,
 }: {
   websiteId?: string;
   teamId?: string;
+  children?: ReactNode;
 }) {
   const queryResult = useReports({ websiteId, teamId });
 
+  if (queryResult?.result?.data?.length === 0) {
+    return children;
+  }
+
   return (
     <DataTable queryResult={queryResult}>
       {({ data }) => <ReportsTable data={data} showDomain={!websiteId} />}
diff --git a/src/app/(main)/settings/teams/TeamsDataTable.tsx b/src/app/(main)/settings/teams/TeamsDataTable.tsx
index fe92b6a05c..6baeba3313 100644
--- a/src/app/(main)/settings/teams/TeamsDataTable.tsx
+++ b/src/app/(main)/settings/teams/TeamsDataTable.tsx
@@ -1,17 +1,24 @@
 import DataTable from 'components/common/DataTable';
 import TeamsTable from 'app/(main)/settings/teams/TeamsTable';
 import { useLogin, useTeams } from 'components/hooks';
+import { ReactNode } from 'react';
 
 export function TeamsDataTable({
   allowEdit,
   showActions,
+  children,
 }: {
   allowEdit?: boolean;
   showActions?: boolean;
+  children?: ReactNode;
 }) {
   const { user } = useLogin();
   const queryResult = useTeams(user.id);
 
+  if (queryResult?.result?.data?.length === 0) {
+    return children;
+  }
+
   return (
     <DataTable queryResult={queryResult}>
       {({ data }) => {
diff --git a/src/app/(main)/settings/users/UsersDataTable.tsx b/src/app/(main)/settings/users/UsersDataTable.tsx
index cfff4e71c4..681b4dc2d6 100644
--- a/src/app/(main)/settings/users/UsersDataTable.tsx
+++ b/src/app/(main)/settings/users/UsersDataTable.tsx
@@ -1,10 +1,21 @@
 import DataTable from 'components/common/DataTable';
 import { useUsers } from 'components/hooks';
 import UsersTable from './UsersTable';
+import { ReactNode } from 'react';
 
-export function UsersDataTable({ showActions }: { showActions?: boolean }) {
+export function UsersDataTable({
+  showActions,
+  children,
+}: {
+  showActions?: boolean;
+  children?: ReactNode;
+}) {
   const queryResult = useUsers();
 
+  if (queryResult?.result?.data?.length === 0) {
+    return children;
+  }
+
   return (
     <DataTable queryResult={queryResult}>
       {({ data }) => <UsersTable data={data} showActions={showActions} />}
diff --git a/src/app/(main)/settings/websites/WebsitesDataTable.tsx b/src/app/(main)/settings/websites/WebsitesDataTable.tsx
index b3472942b4..1780dfb4a3 100644
--- a/src/app/(main)/settings/websites/WebsitesDataTable.tsx
+++ b/src/app/(main)/settings/websites/WebsitesDataTable.tsx
@@ -18,7 +18,7 @@ export function WebsitesDataTable({
 }) {
   const queryResult = useWebsites({ teamId });
 
-  if (!queryResult?.result?.data?.length) {
+  if (queryResult?.result?.data?.length === 0) {
     return children;
   }
 

From f259130202f18c9260b7e2e6a46514d15b2ec76a Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Thu, 9 May 2024 11:55:54 -0700
Subject: [PATCH 050/438] add redis calls to website delete/reset

---
 src/queries/admin/website.ts | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/queries/admin/website.ts b/src/queries/admin/website.ts
index 1f513bd4f6..d191aa657d 100644
--- a/src/queries/admin/website.ts
+++ b/src/queries/admin/website.ts
@@ -1,4 +1,5 @@
 import { Prisma, Website } from '@prisma/client';
+import redis from '@umami/redis-client';
 import prisma from 'lib/prisma';
 import { PageResult, PageParams } from 'lib/types';
 import WebsiteFindManyArgs = Prisma.WebsiteFindManyArgs;
@@ -122,6 +123,7 @@ export async function resetWebsite(
   websiteId: string,
 ): Promise<[Prisma.BatchPayload, Prisma.BatchPayload, Website]> {
   const { client, transaction } = prisma;
+  const cloudMode = !!process.env.cloudMode;
 
   return transaction([
     client.eventData.deleteMany({
@@ -139,14 +141,20 @@ export async function resetWebsite(
         resetAt: new Date(),
       },
     }),
-  ]);
+  ]).then(async data => {
+    if (cloudMode) {
+      await redis.client.set(`website:${websiteId}`, data[3]);
+    }
+
+    return data;
+  });
 }
 
 export async function deleteWebsite(
   websiteId: string,
 ): Promise<[Prisma.BatchPayload, Prisma.BatchPayload, Website]> {
   const { client, transaction } = prisma;
-  const cloudMode = process.env.CLOUD_MODE;
+  const cloudMode = !!process.env.CLOUD_MODE;
 
   return transaction([
     client.eventData.deleteMany({
@@ -173,5 +181,11 @@ export async function deleteWebsite(
       : client.website.delete({
           where: { id: websiteId },
         }),
-  ]);
+  ]).then(async data => {
+    if (cloudMode) {
+      await redis.client.del(`website:${websiteId}`);
+    }
+
+    return data;
+  });
 }

From 4731c1cca32e6e64ecccab6139f4e39ab117f330 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Thu, 9 May 2024 11:55:54 -0700
Subject: [PATCH 051/438] add redis calls to website delete/reset

---
 src/queries/admin/website.ts | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/queries/admin/website.ts b/src/queries/admin/website.ts
index 1f513bd4f6..d191aa657d 100644
--- a/src/queries/admin/website.ts
+++ b/src/queries/admin/website.ts
@@ -1,4 +1,5 @@
 import { Prisma, Website } from '@prisma/client';
+import redis from '@umami/redis-client';
 import prisma from 'lib/prisma';
 import { PageResult, PageParams } from 'lib/types';
 import WebsiteFindManyArgs = Prisma.WebsiteFindManyArgs;
@@ -122,6 +123,7 @@ export async function resetWebsite(
   websiteId: string,
 ): Promise<[Prisma.BatchPayload, Prisma.BatchPayload, Website]> {
   const { client, transaction } = prisma;
+  const cloudMode = !!process.env.cloudMode;
 
   return transaction([
     client.eventData.deleteMany({
@@ -139,14 +141,20 @@ export async function resetWebsite(
         resetAt: new Date(),
       },
     }),
-  ]);
+  ]).then(async data => {
+    if (cloudMode) {
+      await redis.client.set(`website:${websiteId}`, data[3]);
+    }
+
+    return data;
+  });
 }
 
 export async function deleteWebsite(
   websiteId: string,
 ): Promise<[Prisma.BatchPayload, Prisma.BatchPayload, Website]> {
   const { client, transaction } = prisma;
-  const cloudMode = process.env.CLOUD_MODE;
+  const cloudMode = !!process.env.CLOUD_MODE;
 
   return transaction([
     client.eventData.deleteMany({
@@ -173,5 +181,11 @@ export async function deleteWebsite(
       : client.website.delete({
           where: { id: websiteId },
         }),
-  ]);
+  ]).then(async data => {
+    if (cloudMode) {
+      await redis.client.del(`website:${websiteId}`);
+    }
+
+    return data;
+  });
 }

From a92eb841b8e54c46965f411089031e68df61526e Mon Sep 17 00:00:00 2001
From: Eddu <frontedu@icloud.com>
Date: Thu, 9 May 2024 20:02:51 -0300
Subject: [PATCH 052/438] consistent spelling in Brazilian Portuguese

---
 src/lang/pt-BR.json | 330 ++++++++++++++++++++++----------------------
 1 file changed, 165 insertions(+), 165 deletions(-)

diff --git a/src/lang/pt-BR.json b/src/lang/pt-BR.json
index 0615494477..7fcfa087ac 100644
--- a/src/lang/pt-BR.json
+++ b/src/lang/pt-BR.json
@@ -1,88 +1,88 @@
 {
   "label.access-code": "Código de acesso",
   "label.actions": "Ações",
-  "label.activity-log": "Log de atividade",
-  "label.add": "Add",
-  "label.add-description": "Add description",
-  "label.add-member": "Add member",
-  "label.add-step": "Add step",
+  "label.activity-log": "Registro de atividades",
+  "label.add": "Adicionar",
+  "label.add-description": "Adicionar descrição",
+  "label.add-member": "Adicionar membro",
+  "label.add-step": "Adicionar etapa",
   "label.add-website": "Adicionar site",
   "label.admin": "Administrador",
   "label.after": "Depois",
   "label.all": "Todos",
   "label.all-time": "Todo o período",
-  "label.analytics": "Estatísticas",
-  "label.average": "Average",
-  "label.average-visit-time": "Tempo médio da visita",
+  "label.analytics": "Análise de dados",
+  "label.average": "Média",
+  "label.average-visit-time": "Tempo médio de visita",
   "label.back": "Voltar",
   "label.before": "Antes",
   "label.bounce-rate": "Taxa de rejeição",
-  "label.breakdown": "Breakdown",
-  "label.browser": "Browser",
+  "label.breakdown": "Detalhamento",
+  "label.browser": "Navegador",
   "label.browsers": "Navegadores",
   "label.cancel": "Cancelar",
-  "label.change-password": "Alterar a senha",
+  "label.change-password": "Alterar senha",
   "label.cities": "Cidades",
-  "label.city": "City",
+  "label.city": "Cidade",
   "label.clear-all": "Limpar tudo",
   "label.confirm": "Confirmar",
-  "label.confirm-password": "Confirme a nova senha",
-  "label.contains": "Contains",
+  "label.confirm-password": "Confirmar nova senha",
+  "label.contains": "Contém",
   "label.continue": "Continuar",
   "label.countries": "Países",
-  "label.country": "Country",
-  "label.create": "Create",
+  "label.country": "País",
+  "label.create": "Criar",
   "label.create-report": "Criar relatório",
   "label.create-team": "Criar time",
   "label.create-user": "Criar usuário",
-  "label.created": "Criado",
-  "label.created-by": "Created By",
+  "label.created": "Criado(a)",
+  "label.created-by": "Criado(a) por",
   "label.current-password": "Senha atual",
   "label.custom-range": "Intervalo personalizado",
-  "label.dashboard": "Painel",
-  "label.data": "Data",
-  "label.date": "Date",
+  "label.dashboard": "Painel de controle",
+  "label.data": "Dados",
+  "label.date": "Data",
   "label.date-range": "Intervalo de datas",
-  "label.day": "Day",
-  "label.default-date-range": "Intervalo de datas predefinido",
-  "label.delete": "Remover",
-  "label.delete-report": "Delete report",
-  "label.delete-team": "Remover time",
-  "label.delete-user": "Remover usuário",
-  "label.delete-website": "Remover site",
+  "label.day": "Dia",
+  "label.default-date-range": "Intervalo de datas padrão",
+  "label.delete": "Excluir",
+  "label.delete-report": "Excluir relatório",
+  "label.delete-team": "Excluir time",
+  "label.delete-user": "Excluir usuário",
+  "label.delete-website": "Excluir site",
   "label.description": "Descrição",
   "label.desktop": "Computador",
   "label.details": "Detalhes",
-  "label.device": "Device",
+  "label.device": "Dispositivo",
   "label.devices": "Dispositivos",
   "label.dismiss": "Dispensar",
-  "label.does-not-contain": "Does not contain",
+  "label.does-not-contain": "Não contém",
   "label.domain": "Domínio",
-  "label.dropoff": "Dropoff",
+  "label.dropoff": "Abandono",
   "label.edit": "Editar",
   "label.edit-dashboard": "Editar painel",
-  "label.edit-member": "Edit member",
-  "label.enable-share-url": "Ativar link de compartilhamento",
+  "label.edit-member": "Editar membro",
+  "label.enable-share-url": "Habilitar link de compartilhamento",
   "label.event": "Evento",
-  "label.event-data": "Event data",
+  "label.event-data": "Dados de evento",
   "label.events": "Eventos",
-  "label.false": "False",
+  "label.false": "Falso",
   "label.field": "Campo",
   "label.fields": "Campos",
-  "label.filter": "Filter",
-  "label.filter-combined": "Combinado",
-  "label.filter-raw": "Dados brutos",
-  "label.filters": "Filters",
+  "label.filter": "Filtro",
+  "label.filter-combined": "Filtro combinado",
+  "label.filter-raw": "Filtro de dados brutos",
+  "label.filters": "Filtros",
   "label.funnel": "Funil",
-  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.funnel-description": "Entenda a conversão e taxa de abandono dos usuários.",
   "label.greater-than": "Maior que",
-  "label.greater-than-equals": "Maior que ou igual",
-  "label.insights": "Insights",
-  "label.insights-description": "Dive deeper into your data by using segments and filters.",
-  "label.is": "Is",
-  "label.is-not": "Is not",
-  "label.is-not-set": "Is not set",
-  "label.is-set": "Is set",
+  "label.greater-than-equals": "Maior ou igual a",
+  "label.insights": "Informações",
+  "label.insights-description": "Explore seus dados em mais profundidade usando segmentos e filtros.",
+  "label.is": "É",
+  "label.is-not": "Não é",
+  "label.is-not-set": "Não está definido",
+  "label.is-set": "Está definido",
   "label.join": "Entrar",
   "label.join-team": "Entrar no time",
   "label.language": "Idioma",
@@ -90,157 +90,157 @@
   "label.laptop": "Notebook",
   "label.last-days": "Últimos {x} dias",
   "label.last-hours": "Últimas {x} horas",
-  "label.last-months": "Last {x} months",
+  "label.last-months": "Últimos {x} meses",
   "label.leave": "Sair",
   "label.leave-team": "Sair do time",
   "label.less-than": "Menor que",
-  "label.less-than-equals": "Menor que ou igual",
-  "label.login": "Iniciar sessão",
+  "label.less-than-equals": "Menor ou igual a",
+  "label.login": "Entrar",
   "label.logout": "Sair",
-  "label.manage": "Manage",
-  "label.max": "Max",
-  "label.member": "Member",
+  "label.manage": "Gerenciar",
+  "label.max": "Máximo",
+  "label.member": "Membro",
   "label.members": "Membros",
-  "label.min": "Min",
+  "label.min": "Mínimo",
   "label.mobile": "Celular",
   "label.more": "Mais",
-  "label.my-account": "My account",
-  "label.my-websites": "My websites",
+  "label.my-account": "Minha conta",
+  "label.my-websites": "Meus sites",
   "label.name": "Nome",
   "label.new-password": "Nova senha",
   "label.none": "Nenhum",
-  "label.number-of-records": "{x} {x, plural, one {record} other {records}}",
+  "label.number-of-records": "{x} {x, plural, one {registro} other {registros}}",
   "label.ok": "OK",
-  "label.os": "OS",
-  "label.overview": "Overview",
+  "label.os": "Sistema Operacional",
+  "label.overview": "Visão geral",
   "label.owner": "Proprietário",
-  "label.page-of": "Page {current} of {total}",
+  "label.page-of": "Página {current} de {total}",
   "label.page-views": "Visualizações de página",
-  "label.pageTitle": "Page title",
+  "label.pageTitle": "Título da página",
   "label.pages": "Páginas",
   "label.password": "Senha",
-  "label.powered-by": "Distribuído por {name}",
+  "label.powered-by": "Desenvolvido por {name}",
   "label.profile": "Perfil",
-  "label.queries": "Parâmetros",
-  "label.query": "Query",
-  "label.query-parameters": "Parâmetros de Consulta",
+  "label.queries": "Buscas",
+  "label.query": "Busca",
+  "label.query-parameters": "Parâmetros da busca",
   "label.realtime": "Tempo real",
-  "label.referrer": "Referrer",
+  "label.referrer": "Referência",
   "label.referrers": "Referências",
   "label.refresh": "Atualizar",
-  "label.regenerate": "Regerar",
-  "label.region": "Region",
+  "label.regenerate": "Gerar novamente",
+  "label.region": "Região",
   "label.regions": "Regiões",
   "label.remove": "Remover",
-  "label.remove-member": "Remove member",
-  "label.reports": "Reports",
+  "label.remove-member": "Remover membro",
+  "label.reports": "Relatórios",
   "label.required": "Obrigatório",
   "label.reset": "Redefinir",
   "label.reset-website": "Redefinir estatísticas",
-  "label.retention": "Retention",
-  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
-  "label.role": "Papel",
-  "label.run-query": "Executar query",
+  "label.retention": "Retenção",
+  "label.retention-description": "Analise a retenção de usuários do seu site acompanhando a frequência com que eles retornam.",
+  "label.role": "Função",
+  "label.run-query": "Executar busca",
   "label.save": "Salvar",
   "label.screens": "Telas",
-  "label.search": "Search",
-  "label.select": "Select",
+  "label.search": "Pesquisar",
+  "label.select": "Selecionar",
   "label.select-date": "Selecionar data",
-  "label.select-role": "Select role",
+  "label.select-role": "Selecionar função",
   "label.select-website": "Selecionar site",
   "label.sessions": "Sessões",
   "label.settings": "Configurações",
   "label.share-url": "Link de compartilhamento",
   "label.single-day": "Dia específico",
-  "label.steps": "Steps",
-  "label.sum": "Sum",
+  "label.steps": "Etapas",
+  "label.sum": "Soma",
   "label.tablet": "Tablet",
   "label.team": "Time",
   "label.team-id": "ID do Time",
-  "label.team-member": "Membro",
-  "label.team-name": "Team name",
-  "label.team-owner": "Proprietário",
-  "label.team-view-only": "Team view only",
-  "label.team-websites": "Team websites",
-  "label.teams": "Times",
-  "label.theme": "Tema",
-  "label.this-month": "Este mês",
-  "label.this-week": "Esta semana",
-  "label.this-year": "Este ano",
-  "label.timezone": "Fuso horário",
-  "label.title": "Título",
-  "label.today": "Hoje",
-  "label.toggle-charts": "Mostrar/Esconder gráficos",
-  "label.total": "Total",
-  "label.total-records": "Total records",
-  "label.tracking-code": "Código de rastreamento",
-  "label.transfer": "Transfer",
-  "label.transfer-website": "Transfer website",
-  "label.true": "True",
-  "label.type": "Tipo",
-  "label.unique": "Único",
-  "label.unique-visitors": "Visitantes únicos",
-  "label.unknown": "Desconhecido",
-  "label.untitled": "Sem título",
-  "label.update": "Update",
-  "label.url": "URL",
-  "label.urls": "URLs",
-  "label.user": "Usuário",
-  "label.username": "Nome de usuário",
-  "label.users": "Usuários",
-  "label.utm": "UTM",
-  "label.utm-description": "Track your campaigns through UTM parameters.",
-  "label.value": "Valor",
-  "label.view": "Ver",
-  "label.view-details": "Ver detalhes",
-  "label.view-only": "Somente visualização",
-  "label.views": "Visualizações",
-  "label.views-per-visit": "Views per visit",
-  "label.visitors": "Visitantes",
-  "label.visits": "Visits",
-  "label.website": "Website",
-  "label.website-id": "ID do Site",
-  "label.websites": "Sites",
-  "label.window": "Janela",
-  "label.yesterday": "Ontem",
-  "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
-  "message.active-users": "{x} {x, plural, one {visitante} other {visitantes}} neste momento",
-  "message.confirm-delete": "Deseja realmente remover {target}?",
-  "message.confirm-leave": "Você tem certeza que deseja sair de {target}?",
-  "message.confirm-remove": "Are you sure you want to remove {target}?",
-  "message.confirm-reset": "Você tem certeza que deseja redefinir as estatísticas de {target}?",
-  "message.delete-team-warning": "Deleting a team will also delete all team websites.",
-  "message.delete-website-warning": "Todos os dados associados também serão eliminados.",
-  "message.error": "Ocorreu um erro.",
-  "message.event-log": "{event} em {url}",
-  "message.go-to-settings": "Ir para as configurações",
-  "message.incorrect-username-password": "O nome de usuário e/ou senha está incorreto.",
-  "message.invalid-domain": "Domínio inválido",
-  "message.min-password-length": "Quantidade mínima de {n} caracteres",
-  "message.new-version-available": "Uma nova versão do Umami {version} está disponível!",
-  "message.no-data-available": "Sem dados disponíveis.",
-  "message.no-event-data": "Nenhum dado de evento está disponível.",
-  "message.no-match-password": "As senhas não correspondem",
-  "message.no-results-found": "Nenhum resultado foi encontrado.",
-  "message.no-team-websites": "Este time não possui nenhum site.",
-  "message.no-teams": "Você não criou nenhum time.",
-  "message.no-users": "Não há nenhum usuário.",
-  "message.no-websites-configured": "Nenhum site foi configurado ainda.",
-  "message.page-not-found": "Página não encontrada.",
-  "message.reset-website": "Para redefinir este site, digite {confirmation} na caixa abaixo para confirmar.",
-  "message.reset-website-warning": "Todas as estatísticas deste site serão removidas, mas seu código de rastreamento permanecerá intacto.",
-  "message.saved": "Salvo com sucesso.",
-  "message.share-url": "Este é o link público de compartilhamento para {target}.",
-  "message.team-already-member": "Você já um membro do time.",
-  "message.team-not-found": "Time não encontrado.",
-  "message.team-websites-info": "Os sites podem ser visualizados por qualquer membro da equipe.",
-  "message.tracking-code": "Código de rastreamento",
-  "message.transfer-team-website-to-user": "Transfer this website to your account?",
-  "message.transfer-user-website-to-team": "Select the team to transfer this website to.",
-  "message.transfer-website": "Transfer website ownership to your account or another team.",
-  "message.triggered-event": "Triggered event",
-  "message.user-deleted": "Usuário removido.",
-  "message.viewed-page": "Viewed page",
-  "message.visitor-log": "Visitante de {country} usando {browser} no {device} {os}",
-  "message.visitors-dropped-off": "Visitors dropped off"
+"label.team-member": "Membro do time",
+"label.team-name": "Nome do time",
+"label.team-owner": "Proprietário do time",
+"label.team-view-only": "Visualização apenas de time",
+"label.team-websites": "Sites do time",
+"label.teams": "Times",
+"label.theme": "Tema",
+"label.this-month": "Este mês",
+"label.this-week": "Esta semana",
+"label.this-year": "Este ano",
+"label.timezone": "Fuso horário",
+"label.title": "Título",
+"label.today": "Hoje",
+"label.toggle-charts": "Mostrar/Esconder gráficos",
+"label.total": "Total",
+"label.total-records": "Total de registros",
+"label.tracking-code": "Código de rastreamento",
+"label.transfer": "Transferir",
+"label.transfer-website": "Transferir site",
+"label.true": "Verdadeiro",
+"label.type": "Tipo",
+"label.unique": "Único",
+"label.unique-visitors": "Visitantes únicos",
+"label.unknown": "Desconhecido",
+"label.untitled": "Sem título",
+"label.update": "Atualizar",
+"label.url": "URL",
+"label.urls": "URLs",
+"label.user": "Usuário",
+"label.username": "Nome de usuário",
+"label.users": "Usuários",
+"label.utm": "UTM",
+"label.utm-description": "Rastreie suas campanhas por meio de parâmetros UTM.",
+"label.value": "Valor",
+"label.view": "Visualizar",
+"label.view-details": "Ver detalhes",
+"label.view-only": "Somente visualização",
+"label.views": "Visualizações",
+"label.views-per-visit": "Visualizações por visita",
+"label.visitors": "Visitantes",
+"label.visits": "Visitas",
+"label.website": "Site",
+"label.website-id": "ID do site",
+"label.websites": "Sites",
+"label.window": "Janela",
+"label.yesterday": "Ontem",
+"message.action-confirmation": "Digite {confirmation} na caixa abaixo para confirmar.",
+"message.active-users": "{x} {x, plural, one {visitante} other {visitantes}} neste momento",
+"message.confirm-delete": "Deseja realmente remover {target}?",
+"message.confirm-leave": "Você tem certeza que deseja sair de {target}?",
+"message.confirm-remove": "Tem certeza que deseja remover {target}?",
+"message.confirm-reset": "Tem certeza que deseja redefinir as estatísticas de {target}?",
+"message.delete-team-warning": "Excluir um time também excluirá todos os sites do time.",
+"message.delete-website-warning": "Todos os dados associados também serão excluídos.",
+"message.error": "Ocorreu um erro.",
+"message.event-log": "{event} em {url}",
+"message.go-to-settings": "Ir para as configurações",
+"message.incorrect-username-password": "Nome de usuário e/ou senha incorretos.",
+"message.invalid-domain": "Domínio inválido",
+"message.min-password-length": "Quantidade mínima de {n} caracteres",
+"message.new-version-available": "Uma nova versão do Umami {version} está disponível!",
+"message.no-data-available": "Sem dados disponíveis.",
+"message.no-event-data": "Nenhum dado de evento disponível.",
+"message.no-match-password": "As senhas não coincidem",
+"message.no-results-found": "Nenhum resultado foi encontrado.",
+"message.no-team-websites": "Este time não possui nenhum site.",
+"message.no-teams": "Você não criou nenhum time.",
+"message.no-users": "Não há usuários.",
+"message.no-websites-configured": "Nenhum site foi configurado ainda.",
+"message.page-not-found": "Página não encontrada.",
+"message.reset-website": "Para redefinir este site, digite {confirmation} na caixa abaixo para confirmar.",
+"message.reset-website-warning": "Todas as estatísticas deste site serão removidas, mas seu código de rastreamento permanecerá intacto.",
+"message.saved": "Salvo com sucesso.",
+"message.share-url": "Este é o link público de compartilhamento para {target}.",
+"message.team-already-member": "Você já é um membro do time.",
+"message.team-not-found": "Time não encontrado.",
+"message.team-websites-info": "Os sites podem ser visualizados por qualquer membro da equipe.",
+"message.tracking-code": "Código de rastreamento",
+"message.transfer-team-website-to-user": "Transferir este site para a sua conta?",
+"message.transfer-user-website-to-team": "Selecione o time para o qual deseja transferir este site.",
+"message.transfer-website": "Transferir a propriedade do site para a sua conta ou para outro time.",
+"message.triggered-event": "Evento disparado",
+"message.user-deleted": "Usuário removido.",
+"message.viewed-page": "Página visualizada",
+"message.visitor-log": "Visitante de {country} usando {browser} no {device} {os}",
+"message.visitors-dropped-off": "Visitantes que abandonaram"
 }

From cfe791ec8c0dfec5c5b5d425bd16b10e40e58338 Mon Sep 17 00:00:00 2001
From: Eddu <frontedu@icloud.com>
Date: Thu, 9 May 2024 20:16:15 -0300
Subject: [PATCH 053/438] =?UTF-8?q?pt-BR=20todas=20as=20apari=C3=A7=C3=B5e?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/pt-BR.json | 311 ++++++++++++++++++++++----------------------
 1 file changed, 156 insertions(+), 155 deletions(-)

diff --git a/src/lang/pt-BR.json b/src/lang/pt-BR.json
index 7fcfa087ac..8e3c9bfd4b 100644
--- a/src/lang/pt-BR.json
+++ b/src/lang/pt-BR.json
@@ -1,6 +1,6 @@
 {
   "label.access-code": "Código de acesso",
-  "label.actions": "Ações",
+  "label.actions": "Ações do usuário",
   "label.activity-log": "Registro de atividades",
   "label.add": "Adicionar",
   "label.add-description": "Adicionar descrição",
@@ -10,8 +10,8 @@
   "label.admin": "Administrador",
   "label.after": "Depois",
   "label.all": "Todos",
-  "label.all-time": "Todo o período",
-  "label.analytics": "Análise de dados",
+  "label.all-time": "Todos os períodos",
+  "label.analytics": "Análise",
   "label.average": "Média",
   "label.average-visit-time": "Tempo médio de visita",
   "label.back": "Voltar",
@@ -26,221 +26,222 @@
   "label.city": "Cidade",
   "label.clear-all": "Limpar tudo",
   "label.confirm": "Confirmar",
-  "label.confirm-password": "Confirmar nova senha",
+  "label.confirm-password": "Confirmar senha",
   "label.contains": "Contém",
   "label.continue": "Continuar",
   "label.countries": "Países",
   "label.country": "País",
   "label.create": "Criar",
   "label.create-report": "Criar relatório",
-  "label.create-team": "Criar time",
+  "label.create-team": "Criar equipe",
   "label.create-user": "Criar usuário",
-  "label.created": "Criado(a)",
-  "label.created-by": "Criado(a) por",
+  "label.created": "Criado",
+  "label.created-by": "Criado por",
   "label.current-password": "Senha atual",
-  "label.custom-range": "Intervalo personalizado",
-  "label.dashboard": "Painel de controle",
+  "label.custom-range": "Período personalizado",
+  "label.dashboard": "Painel",
   "label.data": "Dados",
   "label.date": "Data",
-  "label.date-range": "Intervalo de datas",
+  "label.date-range": "Período",
   "label.day": "Dia",
-  "label.default-date-range": "Intervalo de datas padrão",
+  "label.default-date-range": "Período padrão",
   "label.delete": "Excluir",
   "label.delete-report": "Excluir relatório",
-  "label.delete-team": "Excluir time",
+  "label.delete-team": "Excluir equipe",
   "label.delete-user": "Excluir usuário",
   "label.delete-website": "Excluir site",
   "label.description": "Descrição",
-  "label.desktop": "Computador",
+  "label.desktop": "Desktop",
   "label.details": "Detalhes",
   "label.device": "Dispositivo",
   "label.devices": "Dispositivos",
-  "label.dismiss": "Dispensar",
+  "label.dismiss": "Fechar",
   "label.does-not-contain": "Não contém",
   "label.domain": "Domínio",
   "label.dropoff": "Abandono",
   "label.edit": "Editar",
   "label.edit-dashboard": "Editar painel",
   "label.edit-member": "Editar membro",
-  "label.enable-share-url": "Habilitar link de compartilhamento",
+  "label.enable-share-url": "Ativar link para compartilhar",
   "label.event": "Evento",
-  "label.event-data": "Dados de evento",
-  "label.events": "Eventos",
-  "label.false": "Falso",
+  "label.event-data": "Dados do evento",
+  "label.events": "Tipos de eventos",
+  "label.false": "Não",
   "label.field": "Campo",
   "label.fields": "Campos",
   "label.filter": "Filtro",
-  "label.filter-combined": "Filtro combinado",
-  "label.filter-raw": "Filtro de dados brutos",
+  "label.filter-combined": "Combinado",
+  "label.filter-raw": "Bruto",
   "label.filters": "Filtros",
   "label.funnel": "Funil",
-  "label.funnel-description": "Entenda a conversão e taxa de abandono dos usuários.",
+  "label.funnel-description": "Entenda a taxa de conversão e abandono dos seus usuários.",
   "label.greater-than": "Maior que",
   "label.greater-than-equals": "Maior ou igual a",
-  "label.insights": "Informações",
-  "label.insights-description": "Explore seus dados em mais profundidade usando segmentos e filtros.",
-  "label.is": "É",
-  "label.is-not": "Não é",
-  "label.is-not-set": "Não está definido",
-  "label.is-set": "Está definido",
-  "label.join": "Entrar",
-  "label.join-team": "Entrar no time",
-  "label.language": "Idioma",
-  "label.languages": "Idiomas",
-  "label.laptop": "Notebook",
-  "label.last-days": "Últimos {x} dias",
-  "label.last-hours": "Últimas {x} horas",
-  "label.last-months": "Últimos {x} meses",
-  "label.leave": "Sair",
-  "label.leave-team": "Sair do time",
-  "label.less-than": "Menor que",
-  "label.less-than-equals": "Menor ou igual a",
-  "label.login": "Entrar",
-  "label.logout": "Sair",
-  "label.manage": "Gerenciar",
-  "label.max": "Máximo",
-  "label.member": "Membro",
-  "label.members": "Membros",
-  "label.min": "Mínimo",
-  "label.mobile": "Celular",
-  "label.more": "Mais",
-  "label.my-account": "Minha conta",
-  "label.my-websites": "Meus sites",
-  "label.name": "Nome",
-  "label.new-password": "Nova senha",
-  "label.none": "Nenhum",
-  "label.number-of-records": "{x} {x, plural, one {registro} other {registros}}",
-  "label.ok": "OK",
-  "label.os": "Sistema Operacional",
-  "label.overview": "Visão geral",
-  "label.owner": "Proprietário",
-  "label.page-of": "Página {current} de {total}",
-  "label.page-views": "Visualizações de página",
-  "label.pageTitle": "Título da página",
-  "label.pages": "Páginas",
-  "label.password": "Senha",
-  "label.powered-by": "Desenvolvido por {name}",
-  "label.profile": "Perfil",
-  "label.queries": "Buscas",
-  "label.query": "Busca",
-  "label.query-parameters": "Parâmetros da busca",
-  "label.realtime": "Tempo real",
-  "label.referrer": "Referência",
-  "label.referrers": "Referências",
-  "label.refresh": "Atualizar",
-  "label.regenerate": "Gerar novamente",
-  "label.region": "Região",
-  "label.regions": "Regiões",
-  "label.remove": "Remover",
-  "label.remove-member": "Remover membro",
-  "label.reports": "Relatórios",
-  "label.required": "Obrigatório",
-  "label.reset": "Redefinir",
-  "label.reset-website": "Redefinir estatísticas",
-  "label.retention": "Retenção",
-  "label.retention-description": "Analise a retenção de usuários do seu site acompanhando a frequência com que eles retornam.",
-  "label.role": "Função",
-  "label.run-query": "Executar busca",
-  "label.save": "Salvar",
-  "label.screens": "Telas",
-  "label.search": "Pesquisar",
-  "label.select": "Selecionar",
-  "label.select-date": "Selecionar data",
-  "label.select-role": "Selecionar função",
-  "label.select-website": "Selecionar site",
-  "label.sessions": "Sessões",
-  "label.settings": "Configurações",
-  "label.share-url": "Link de compartilhamento",
-  "label.single-day": "Dia específico",
-  "label.steps": "Etapas",
-  "label.sum": "Soma",
-  "label.tablet": "Tablet",
-  "label.team": "Time",
-  "label.team-id": "ID do Time",
-"label.team-member": "Membro do time",
-"label.team-name": "Nome do time",
-"label.team-owner": "Proprietário do time",
-"label.team-view-only": "Visualização apenas de time",
-"label.team-websites": "Sites do time",
-"label.teams": "Times",
+  "label.insights": "Insights",
+  "label.insights-description": "Explore seus dados em mais detalhes usando filtros",
+  "label.insights-description": "Explore seus dados em mais detalhes usando filtros e segmentação por períodos.", 
+"label.is": "É igual a",
+"label.is-not": "Não é igual a",
+"label.is-not-set": "Não definido",
+"label.is-set": "Definido",
+"label.join": "Participar",
+"label.join-team": "Participar da equipe",
+"label.language": "Idioma", 
+"label.languages": "Idiomas",
+"label.laptop": "Notebook",
+"label.last-days": "Últimos {x} dias",
+"label.last-hours": "Últimas {x} horas",
+"label.last-months": "Últimos {x} meses",
+"label.leave": "Sair", 
+"label.leave-team": "Sair da equipe",
+"label.less-than": "Menor que",
+"label.less-than-equals": "Menor ou igual a",
+"label.login": "Entrar", 
+"label.logout": "Sair",
+"label.manage": "Gerenciar",
+"label.max": "Máximo",
+"label.member": "Membro",
+"label.members": "Membros",
+"label.min": "Mínimo",
+"label.mobile": "Celular", 
+"label.more": "Mais",
+"label.my-account": "Minha conta",
+"label.my-websites": "Meus sites",
+"label.name": "Nome",
+"label.new-password": "Nova senha",
+"label.none": "Nenhum",
+"label.number-of-records": "{x} {x, plural, one {registro} other {registros}}",
+"label.ok": "OK",
+"label.os": "Sistema operacional",
+"label.overview": "Visão geral",
+"label.owner": "Proprietário",
+"label.page-of": "Página {current} de {total}", 
+"label.page-views": "Visualizações de página",
+"label.pageTitle": "Título", 
+"label.pages": "Páginas",
+"label.password": "Senha", 
+"label.powered-by": "Desenvolvido por {name}", 
+"label.profile": "Perfil",
+"label.queries": "Consultas",
+"label.query": "Consulta", 
+"label.query-parameters": "Parâmetros da consulta",
+"label.realtime": "Tempo real",
+"label.referrer": "Referência",
+"label.referrers": "Referências",
+"label.refresh": "Atualizar",
+"label.regenerate": "Gerar novamente",
+"label.region": "Estado",
+"label.regions": "Estados",
+"label.remove": "Remover",
+"label.remove-member": "Remover membro", 
+"label.reports": "Relatórios",
+"label.required": "Obrigatório",
+"label.reset": "Redefinir",
+"label.reset-website": "Redefinir dados",
+"label.retention": "Retenção",
+"label.retention-description": "Avalie a fidelidade dos seus usuários medindo a frequência com que eles retornam.",
+"label.role": "Função", 
+"label.run-query": "Executar consulta", 
+"label.save": "Salvar",
+"label.screens": "Tamanhos de tela", 
+"label.search": "Pesquisar",
+"label.select": "Selecionar",
+"label.select-date": "Selecionar data",
+"label.select-role": "Selecionar função",
+"label.select-website": "Selecionar site",
+"label.sessions": "Sessões",
+"label.settings": "Configurações",
+"label.share-url": "Link para compartilhar", 
+"label.single-day": "Apenas um dia",
+"label.steps": "Etapas",
+"label.sum": "Soma",
+"label.tablet": "Tablet",
+"label.team": "Equipe",
+"label.team-id": "ID da equipe",
+"label.team-member": "Membro da equipe",
+"label.team-name": "Nome da equipe", 
+"label.team-owner": "Proprietário da equipe", 
+"label.team-view-only": "Apenas visualização da equipe", 
+"label.team-websites": "Sites da equipe",
+"label.teams": "Equipes",
 "label.theme": "Tema",
-"label.this-month": "Este mês",
-"label.this-week": "Esta semana",
+"label.this-month": "Este mês", 
+"label.this-week": "Esta semana", 
 "label.this-year": "Este ano",
 "label.timezone": "Fuso horário",
 "label.title": "Título",
-"label.today": "Hoje",
-"label.toggle-charts": "Mostrar/Esconder gráficos",
+"label.today": "Hoje",    
+"label.toggle-charts": "Alternar gráficos",
 "label.total": "Total",
-"label.total-records": "Total de registros",
+"label.total-records": "Total de registros", 
 "label.tracking-code": "Código de rastreamento",
 "label.transfer": "Transferir",
 "label.transfer-website": "Transferir site",
-"label.true": "Verdadeiro",
-"label.type": "Tipo",
-"label.unique": "Único",
+"label.true": "Sim",
+"label.type": "Tipo", 
+"label.unique": "Únicos", 
 "label.unique-visitors": "Visitantes únicos",
 "label.unknown": "Desconhecido",
 "label.untitled": "Sem título",
-"label.update": "Atualizar",
-"label.url": "URL",
+"label.update": "Atualizar", 
+"label.url": "URL", 
 "label.urls": "URLs",
 "label.user": "Usuário",
-"label.username": "Nome de usuário",
+"label.username": "Nome de usuário", 
 "label.users": "Usuários",
 "label.utm": "UTM",
-"label.utm-description": "Rastreie suas campanhas por meio de parâmetros UTM.",
-"label.value": "Valor",
+"label.utm-description": "Acompanhe suas campanhas de publicidade através de parâmetros UTM.",
+"label.value": "Valor", 
 "label.view": "Visualizar",
-"label.view-details": "Ver detalhes",
+"label.view-details": "Ver mais",
 "label.view-only": "Somente visualização",
 "label.views": "Visualizações",
-"label.views-per-visit": "Visualizações por visita",
-"label.visitors": "Visitantes",
+"label.views-per-visit": "Visualizações por visita", 
+"label.visitors": "Visitantes", 
 "label.visits": "Visitas",
 "label.website": "Site",
-"label.website-id": "ID do site",
+"label.website-id": "ID do site", 
 "label.websites": "Sites",
 "label.window": "Janela",
-"label.yesterday": "Ontem",
-"message.action-confirmation": "Digite {confirmation} na caixa abaixo para confirmar.",
-"message.active-users": "{x} {x, plural, one {visitante} other {visitantes}} neste momento",
-"message.confirm-delete": "Deseja realmente remover {target}?",
-"message.confirm-leave": "Você tem certeza que deseja sair de {target}?",
-"message.confirm-remove": "Tem certeza que deseja remover {target}?",
-"message.confirm-reset": "Tem certeza que deseja redefinir as estatísticas de {target}?",
-"message.delete-team-warning": "Excluir um time também excluirá todos os sites do time.",
-"message.delete-website-warning": "Todos os dados associados também serão excluídos.",
+"label.yesterday": "Ontem", 
+"message.action-confirmation": "Digite {confirmation} na caixa abaixo para confirmar.", 
+"message.active-users": " Atualmente {x} usuários ativos",
+"message.confirm-delete": "Tem certeza de que deseja excluir {target}?",
+"message.confirm-leave": "Tem certeza de que deseja sair de {target}?", 
+"message.confirm-remove": "Tem certeza que deseja remover {target}?", 
+"message.confirm-reset": "Tem certeza que deseja redefinir os dados de {target}?",
+"message.delete-team-warning": "Excluir a equipe também excluirá todos os sites da equipe.",
+"message.delete-website-warning": "Todos os dados relacionados serão excluídos.",
 "message.error": "Ocorreu um erro.",
 "message.event-log": "{event} em {url}",
 "message.go-to-settings": "Ir para as configurações",
-"message.incorrect-username-password": "Nome de usuário e/ou senha incorretos.",
+"message.incorrect-username-password": "Nome de usuário ou senha incorretos.",
 "message.invalid-domain": "Domínio inválido",
-"message.min-password-length": "Quantidade mínima de {n} caracteres",
-"message.new-version-available": "Uma nova versão do Umami {version} está disponível!",
-"message.no-data-available": "Sem dados disponíveis.",
-"message.no-event-data": "Nenhum dado de evento disponível.",
-"message.no-match-password": "As senhas não coincidem",
-"message.no-results-found": "Nenhum resultado foi encontrado.",
-"message.no-team-websites": "Este time não possui nenhum site.",
-"message.no-teams": "Você não criou nenhum time.",
+"message.min-password-length": "A senha deve ter no mínimo {n} caracteres",
+"message.new-version-available": "Uma nova versão {version} do Umami está disponível!",
+"message.no-data-available": "Não há dados disponíveis.",
+"message.no-event-data": "Não há eventos disponíveis.",
+"message.no-match-password": "As senhas não coincidem.",
+"message.no-results-found": "Nenhum resultado encontrado.",
+"message.no-team-websites": "Esta equipe não possui sites.",
+"message.no-teams": "Você ainda não criou nenhuma equipe.",
 "message.no-users": "Não há usuários.",
-"message.no-websites-configured": "Nenhum site foi configurado ainda.",
+"message.no-websites-configured": "Você ainda não configurou nenhum site.",
 "message.page-not-found": "Página não encontrada.",
-"message.reset-website": "Para redefinir este site, digite {confirmation} na caixa abaixo para confirmar.",
-"message.reset-website-warning": "Todas as estatísticas deste site serão removidas, mas seu código de rastreamento permanecerá intacto.",
+"message.reset-website": "Se você tiver certeza de que deseja redefinir este site, digite {confirmation} na caixa de entrada abaixo para confirmar.",
+"message.reset-website-warning": "Todos os dados estatísticos deste site serão excluídos, mas seu código de rastreamento permanecerá o mesmo.",
 "message.saved": "Salvo com sucesso.",
-"message.share-url": "Este é o link público de compartilhamento para {target}.",
-"message.team-already-member": "Você já é um membro do time.",
-"message.team-not-found": "Time não encontrado.",
-"message.team-websites-info": "Os sites podem ser visualizados por qualquer membro da equipe.",
+"message.share-url": "Este é o link para compartilhar {target}.",
+"message.team-already-member": "Você já é membro desta equipe.",
+"message.team-not-found": "Equipe não encontrada.",
+"message.team-websites-info": "Qualquer membro da equipe pode visualizar os sites.",
 "message.tracking-code": "Código de rastreamento",
-"message.transfer-team-website-to-user": "Transferir este site para a sua conta?",
-"message.transfer-user-website-to-team": "Selecione o time para o qual deseja transferir este site.",
-"message.transfer-website": "Transferir a propriedade do site para a sua conta ou para outro time.",
+"message.transfer-team-website-to-user": "Transferir este site para sua conta?",
+"message.transfer-user-website-to-team": "Selecione para qual equipe deseja transferir este site.",
+"message.transfer-website": "Transfira a propriedade do site para sua conta ou para outra equipe.",
 "message.triggered-event": "Evento disparado",
-"message.user-deleted": "Usuário removido.",
+"message.user-deleted": "Usuário excluído.",
 "message.viewed-page": "Página visualizada",
-"message.visitor-log": "Visitante de {country} usando {browser} no {device} {os}",
-"message.visitors-dropped-off": "Visitantes que abandonaram"
+"message.visitor-log": "Visitante de {country} usando o navegador {browser} em um {device} com sistema operacional {os}.",
+"message.visitors-dropped-off": "Visitantes abandonados"
 }

From fed261023c31e2626316e7a4d8757c60f7492107 Mon Sep 17 00:00:00 2001
From: Eddu <frontedu@icloud.com>
Date: Thu, 9 May 2024 20:25:42 -0300
Subject: [PATCH 054/438] pt-br release

---
 src/lang/pt-BR.json | 333 ++++++++++++++++++++++----------------------
 1 file changed, 166 insertions(+), 167 deletions(-)

diff --git a/src/lang/pt-BR.json b/src/lang/pt-BR.json
index 8e3c9bfd4b..5c0425ea6a 100644
--- a/src/lang/pt-BR.json
+++ b/src/lang/pt-BR.json
@@ -78,170 +78,169 @@
   "label.greater-than": "Maior que",
   "label.greater-than-equals": "Maior ou igual a",
   "label.insights": "Insights",
-  "label.insights-description": "Explore seus dados em mais detalhes usando filtros",
-  "label.insights-description": "Explore seus dados em mais detalhes usando filtros e segmentação por períodos.", 
-"label.is": "É igual a",
-"label.is-not": "Não é igual a",
-"label.is-not-set": "Não definido",
-"label.is-set": "Definido",
-"label.join": "Participar",
-"label.join-team": "Participar da equipe",
-"label.language": "Idioma", 
-"label.languages": "Idiomas",
-"label.laptop": "Notebook",
-"label.last-days": "Últimos {x} dias",
-"label.last-hours": "Últimas {x} horas",
-"label.last-months": "Últimos {x} meses",
-"label.leave": "Sair", 
-"label.leave-team": "Sair da equipe",
-"label.less-than": "Menor que",
-"label.less-than-equals": "Menor ou igual a",
-"label.login": "Entrar", 
-"label.logout": "Sair",
-"label.manage": "Gerenciar",
-"label.max": "Máximo",
-"label.member": "Membro",
-"label.members": "Membros",
-"label.min": "Mínimo",
-"label.mobile": "Celular", 
-"label.more": "Mais",
-"label.my-account": "Minha conta",
-"label.my-websites": "Meus sites",
-"label.name": "Nome",
-"label.new-password": "Nova senha",
-"label.none": "Nenhum",
-"label.number-of-records": "{x} {x, plural, one {registro} other {registros}}",
-"label.ok": "OK",
-"label.os": "Sistema operacional",
-"label.overview": "Visão geral",
-"label.owner": "Proprietário",
-"label.page-of": "Página {current} de {total}", 
-"label.page-views": "Visualizações de página",
-"label.pageTitle": "Título", 
-"label.pages": "Páginas",
-"label.password": "Senha", 
-"label.powered-by": "Desenvolvido por {name}", 
-"label.profile": "Perfil",
-"label.queries": "Consultas",
-"label.query": "Consulta", 
-"label.query-parameters": "Parâmetros da consulta",
-"label.realtime": "Tempo real",
-"label.referrer": "Referência",
-"label.referrers": "Referências",
-"label.refresh": "Atualizar",
-"label.regenerate": "Gerar novamente",
-"label.region": "Estado",
-"label.regions": "Estados",
-"label.remove": "Remover",
-"label.remove-member": "Remover membro", 
-"label.reports": "Relatórios",
-"label.required": "Obrigatório",
-"label.reset": "Redefinir",
-"label.reset-website": "Redefinir dados",
-"label.retention": "Retenção",
-"label.retention-description": "Avalie a fidelidade dos seus usuários medindo a frequência com que eles retornam.",
-"label.role": "Função", 
-"label.run-query": "Executar consulta", 
-"label.save": "Salvar",
-"label.screens": "Tamanhos de tela", 
-"label.search": "Pesquisar",
-"label.select": "Selecionar",
-"label.select-date": "Selecionar data",
-"label.select-role": "Selecionar função",
-"label.select-website": "Selecionar site",
-"label.sessions": "Sessões",
-"label.settings": "Configurações",
-"label.share-url": "Link para compartilhar", 
-"label.single-day": "Apenas um dia",
-"label.steps": "Etapas",
-"label.sum": "Soma",
-"label.tablet": "Tablet",
-"label.team": "Equipe",
-"label.team-id": "ID da equipe",
-"label.team-member": "Membro da equipe",
-"label.team-name": "Nome da equipe", 
-"label.team-owner": "Proprietário da equipe", 
-"label.team-view-only": "Apenas visualização da equipe", 
-"label.team-websites": "Sites da equipe",
-"label.teams": "Equipes",
-"label.theme": "Tema",
-"label.this-month": "Este mês", 
-"label.this-week": "Esta semana", 
-"label.this-year": "Este ano",
-"label.timezone": "Fuso horário",
-"label.title": "Título",
-"label.today": "Hoje",    
-"label.toggle-charts": "Alternar gráficos",
-"label.total": "Total",
-"label.total-records": "Total de registros", 
-"label.tracking-code": "Código de rastreamento",
-"label.transfer": "Transferir",
-"label.transfer-website": "Transferir site",
-"label.true": "Sim",
-"label.type": "Tipo", 
-"label.unique": "Únicos", 
-"label.unique-visitors": "Visitantes únicos",
-"label.unknown": "Desconhecido",
-"label.untitled": "Sem título",
-"label.update": "Atualizar", 
-"label.url": "URL", 
-"label.urls": "URLs",
-"label.user": "Usuário",
-"label.username": "Nome de usuário", 
-"label.users": "Usuários",
-"label.utm": "UTM",
-"label.utm-description": "Acompanhe suas campanhas de publicidade através de parâmetros UTM.",
-"label.value": "Valor", 
-"label.view": "Visualizar",
-"label.view-details": "Ver mais",
-"label.view-only": "Somente visualização",
-"label.views": "Visualizações",
-"label.views-per-visit": "Visualizações por visita", 
-"label.visitors": "Visitantes", 
-"label.visits": "Visitas",
-"label.website": "Site",
-"label.website-id": "ID do site", 
-"label.websites": "Sites",
-"label.window": "Janela",
-"label.yesterday": "Ontem", 
-"message.action-confirmation": "Digite {confirmation} na caixa abaixo para confirmar.", 
-"message.active-users": " Atualmente {x} usuários ativos",
-"message.confirm-delete": "Tem certeza de que deseja excluir {target}?",
-"message.confirm-leave": "Tem certeza de que deseja sair de {target}?", 
-"message.confirm-remove": "Tem certeza que deseja remover {target}?", 
-"message.confirm-reset": "Tem certeza que deseja redefinir os dados de {target}?",
-"message.delete-team-warning": "Excluir a equipe também excluirá todos os sites da equipe.",
-"message.delete-website-warning": "Todos os dados relacionados serão excluídos.",
-"message.error": "Ocorreu um erro.",
-"message.event-log": "{event} em {url}",
-"message.go-to-settings": "Ir para as configurações",
-"message.incorrect-username-password": "Nome de usuário ou senha incorretos.",
-"message.invalid-domain": "Domínio inválido",
-"message.min-password-length": "A senha deve ter no mínimo {n} caracteres",
-"message.new-version-available": "Uma nova versão {version} do Umami está disponível!",
-"message.no-data-available": "Não há dados disponíveis.",
-"message.no-event-data": "Não há eventos disponíveis.",
-"message.no-match-password": "As senhas não coincidem.",
-"message.no-results-found": "Nenhum resultado encontrado.",
-"message.no-team-websites": "Esta equipe não possui sites.",
-"message.no-teams": "Você ainda não criou nenhuma equipe.",
-"message.no-users": "Não há usuários.",
-"message.no-websites-configured": "Você ainda não configurou nenhum site.",
-"message.page-not-found": "Página não encontrada.",
-"message.reset-website": "Se você tiver certeza de que deseja redefinir este site, digite {confirmation} na caixa de entrada abaixo para confirmar.",
-"message.reset-website-warning": "Todos os dados estatísticos deste site serão excluídos, mas seu código de rastreamento permanecerá o mesmo.",
-"message.saved": "Salvo com sucesso.",
-"message.share-url": "Este é o link para compartilhar {target}.",
-"message.team-already-member": "Você já é membro desta equipe.",
-"message.team-not-found": "Equipe não encontrada.",
-"message.team-websites-info": "Qualquer membro da equipe pode visualizar os sites.",
-"message.tracking-code": "Código de rastreamento",
-"message.transfer-team-website-to-user": "Transferir este site para sua conta?",
-"message.transfer-user-website-to-team": "Selecione para qual equipe deseja transferir este site.",
-"message.transfer-website": "Transfira a propriedade do site para sua conta ou para outra equipe.",
-"message.triggered-event": "Evento disparado",
-"message.user-deleted": "Usuário excluído.",
-"message.viewed-page": "Página visualizada",
-"message.visitor-log": "Visitante de {country} usando o navegador {browser} em um {device} com sistema operacional {os}.",
-"message.visitors-dropped-off": "Visitantes abandonados"
-}
+    "label.insights-description": "Explore seus dados em mais detalhes usando filtros",
+  "label.is": "É igual a",
+  "label.is-not": "Não é igual a",
+  "label.is-not-set": "Não definido",
+  "label.is-set": "Definido",
+  "label.join": "Participar",
+  "label.join-team": "Participar da equipe",
+  "label.language": "Idioma", 
+  "label.languages": "Idiomas",
+  "label.laptop": "Notebook",
+  "label.last-days": "Últimos {x} dias",
+  "label.last-hours": "Últimas {x} horas",
+  "label.last-months": "Últimos {x} meses",
+  "label.leave": "Sair", 
+  "label.leave-team": "Sair da equipe",
+  "label.less-than": "Menor que",
+  "label.less-than-equals": "Menor ou igual a",
+  "label.login": "Entrar", 
+  "label.logout": "Sair",
+  "label.manage": "Gerenciar",
+  "label.max": "Máximo",
+  "label.member": "Membro",
+  "label.members": "Membros",
+  "label.min": "Mínimo",
+  "label.mobile": "Celular", 
+  "label.more": "Mais",
+  "label.my-account": "Minha conta",
+  "label.my-websites": "Meus sites",
+  "label.name": "Nome",
+  "label.new-password": "Nova senha",
+  "label.none": "Nenhum",
+  "label.number-of-records": "{x} {x, plural, one {registro} other {registros}}",
+  "label.ok": "OK",
+  "label.os": "Sistema operacional",
+  "label.overview": "Visão geral",
+  "label.owner": "Proprietário",
+  "label.page-of": "Página {current} de {total}", 
+  "label.page-views": "Visualizações de página",
+  "label.pageTitle": "Título", 
+  "label.pages": "Páginas",
+  "label.password": "Senha", 
+  "label.powered-by": "Desenvolvido por {name}", 
+  "label.profile": "Perfil",
+  "label.queries": "Consultas",
+  "label.query": "Consulta", 
+  "label.query-parameters": "Parâmetros da consulta",
+  "label.realtime": "Tempo real",
+  "label.referrer": "Referência",
+  "label.referrers": "Referências",
+  "label.refresh": "Atualizar",
+  "label.regenerate": "Gerar novamente",
+  "label.region": "Estado",
+  "label.regions": "Estados",
+  "label.remove": "Remover",
+  "label.remove-member": "Remover membro", 
+  "label.reports": "Relatórios",
+  "label.required": "Obrigatório",
+  "label.reset": "Redefinir",
+  "label.reset-website": "Redefinir dados",
+  "label.retention": "Retenção",
+  "label.retention-description": "Avalie a fidelidade dos seus usuários medindo a frequência com que eles retornam.",
+  "label.role": "Função", 
+  "label.run-query": "Executar consulta", 
+  "label.save": "Salvar",
+  "label.screens": "Tamanhos de tela", 
+  "label.search": "Pesquisar",
+  "label.select": "Selecionar",
+  "label.select-date": "Selecionar data",
+  "label.select-role": "Selecionar função",
+  "label.select-website": "Selecionar site",
+  "label.sessions": "Sessões",
+  "label.settings": "Configurações",
+  "label.share-url": "Link para compartilhar", 
+  "label.single-day": "Apenas um dia",
+  "label.steps": "Etapas",
+  "label.sum": "Soma",
+  "label.tablet": "Tablet",
+  "label.team": "Equipe",
+  "label.team-id": "ID da equipe",
+  "label.team-member": "Membro da equipe",
+  "label.team-name": "Nome da equipe", 
+  "label.team-owner": "Proprietário da equipe", 
+  "label.team-view-only": "Apenas visualização da equipe", 
+  "label.team-websites": "Sites da equipe",
+  "label.teams": "Equipes",
+  "label.theme": "Tema",
+  "label.this-month": "Este mês", 
+  "label.this-week": "Esta semana", 
+  "label.this-year": "Este ano",
+  "label.timezone": "Fuso horário",
+  "label.title": "Título",
+  "label.today": "Hoje",    
+  "label.toggle-charts": "Alternar gráficos",
+  "label.total": "Total",
+  "label.total-records": "Total de registros", 
+  "label.tracking-code": "Código de rastreamento",
+  "label.transfer": "Transferir",
+  "label.transfer-website": "Transferir site",
+  "label.true": "Sim",
+  "label.type": "Tipo", 
+  "label.unique": "Únicos", 
+  "label.unique-visitors": "Visitantes únicos",
+  "label.unknown": "Desconhecido",
+  "label.untitled": "Sem título",
+  "label.update": "Atualizar", 
+  "label.url": "URL", 
+  "label.urls": "URLs",
+  "label.user": "Usuário",
+  "label.username": "Nome de usuário", 
+  "label.users": "Usuários",
+  "label.utm": "UTM",
+  "label.utm-description": "Acompanhe suas campanhas de publicidade através de parâmetros UTM.",
+  "label.value": "Valor", 
+  "label.view": "Visualizar",
+  "label.view-details": "Ver mais",
+  "label.view-only": "Somente visualização",
+  "label.views": "Visualizações",
+  "label.views-per-visit": "Visualizações por visita", 
+  "label.visitors": "Visitantes", 
+  "label.visits": "Visitas",
+  "label.website": "Site",
+  "label.website-id": "ID do site", 
+  "label.websites": "Sites",
+  "label.window": "Janela",
+  "label.yesterday": "Ontem", 
+  "message.action-confirmation": "Digite {confirmation} na caixa abaixo para confirmar.", 
+  "message.active-users": " Atualmente {x} usuários ativos",
+  "message.confirm-delete": "Tem certeza de que deseja excluir {target}?",
+  "message.confirm-leave": "Tem certeza de que deseja sair de {target}?", 
+  "message.confirm-remove": "Tem certeza que deseja remover {target}?", 
+  "message.confirm-reset": "Tem certeza que deseja redefinir os dados de {target}?",
+  "message.delete-team-warning": "Excluir a equipe também excluirá todos os sites da equipe.",
+  "message.delete-website-warning": "Todos os dados relacionados serão excluídos.",
+  "message.error": "Ocorreu um erro.",
+  "message.event-log": "{event} em {url}",
+  "message.go-to-settings": "Ir para as configurações",
+  "message.incorrect-username-password": "Nome de usuário ou senha incorretos.",
+  "message.invalid-domain": "Domínio inválido",
+  "message.min-password-length": "A senha deve ter no mínimo {n} caracteres",
+  "message.new-version-available": "Uma nova versão {version} do Umami está disponível!",
+  "message.no-data-available": "Não há dados disponíveis.",
+  "message.no-event-data": "Não há eventos disponíveis.",
+  "message.no-match-password": "As senhas não coincidem.",
+  "message.no-results-found": "Nenhum resultado encontrado.",
+  "message.no-team-websites": "Esta equipe não possui sites.",
+  "message.no-teams": "Você ainda não criou nenhuma equipe.",
+  "message.no-users": "Não há usuários.",
+  "message.no-websites-configured": "Você ainda não configurou nenhum site.",
+  "message.page-not-found": "Página não encontrada.",
+  "message.reset-website": "Se você tiver certeza de que deseja redefinir este site, digite {confirmation} na caixa de entrada abaixo para confirmar.",
+  "message.reset-website-warning": "Todos os dados estatísticos deste site serão excluídos, mas seu código de rastreamento permanecerá o mesmo.",
+  "message.saved": "Salvo com sucesso.",
+  "message.share-url": "Este é o link para compartilhar {target}.",
+  "message.team-already-member": "Você já é membro desta equipe.",
+  "message.team-not-found": "Equipe não encontrada.",
+  "message.team-websites-info": "Qualquer membro da equipe pode visualizar os sites.",
+  "message.tracking-code": "Código de rastreamento",
+  "message.transfer-team-website-to-user": "Transferir este site para sua conta?",
+  "message.transfer-user-website-to-team": "Selecione para qual equipe deseja transferir este site.",
+  "message.transfer-website": "Transfira a propriedade do site para sua conta ou para outra equipe.",
+  "message.triggered-event": "Evento disparado",
+  "message.user-deleted": "Usuário excluído.",
+  "message.viewed-page": "Página visualizada",
+  "message.visitor-log": "Visitante de {country} usando o navegador {browser} em um {device} com sistema operacional {os}.",
+  "message.visitors-dropped-off": "Visitantes abandonados"
+  }

From 92a45f9d91537205b43afa5ff92a2c290ce5ea17 Mon Sep 17 00:00:00 2001
From: Eddu <frontedu@icloud.com>
Date: Thu, 9 May 2024 23:07:13 -0300
Subject: [PATCH 055/438] pt-br release

---
 public/intl/messages/pt-BR.json | 320 ++++++++++++++++----------------
 1 file changed, 163 insertions(+), 157 deletions(-)

diff --git a/public/intl/messages/pt-BR.json b/public/intl/messages/pt-BR.json
index f142817f45..cde65c3848 100644
--- a/public/intl/messages/pt-BR.json
+++ b/public/intl/messages/pt-BR.json
@@ -14,31 +14,31 @@
   "label.activity-log": [
     {
       "type": 0,
-      "value": "Log de atividade"
+      "value": "Registro de atividades"
     }
   ],
   "label.add": [
     {
       "type": 0,
-      "value": "Add"
+      "value": "Adicionar"
     }
   ],
   "label.add-description": [
     {
       "type": 0,
-      "value": "Add description"
+      "value": "Adicionar descrição"
     }
   ],
   "label.add-member": [
     {
       "type": 0,
-      "value": "Add member"
+      "value": "Adicionar membro"
     }
   ],
   "label.add-step": [
     {
       "type": 0,
-      "value": "Add step"
+      "value": "Adicionar etapa"
     }
   ],
   "label.add-website": [
@@ -56,7 +56,7 @@
   "label.after": [
     {
       "type": 0,
-      "value": "Depois"
+      "value": "Depois de"
     }
   ],
   "label.all": [
@@ -74,19 +74,19 @@
   "label.analytics": [
     {
       "type": 0,
-      "value": "Estatísticas"
+      "value": "Análises"
     }
   ],
   "label.average": [
     {
       "type": 0,
-      "value": "Average"
+      "value": "Média"
     }
   ],
   "label.average-visit-time": [
     {
       "type": 0,
-      "value": "Tempo médio da visita"
+      "value": "Tempo médio de visita"
     }
   ],
   "label.back": [
@@ -98,7 +98,7 @@
   "label.before": [
     {
       "type": 0,
-      "value": "Antes"
+      "value": "Antes de"
     }
   ],
   "label.bounce-rate": [
@@ -110,13 +110,13 @@
   "label.breakdown": [
     {
       "type": 0,
-      "value": "Breakdown"
+      "value": "Detalhamento"
     }
   ],
   "label.browser": [
     {
       "type": 0,
-      "value": "Browser"
+      "value": "Navegador"
     }
   ],
   "label.browsers": [
@@ -134,7 +134,7 @@
   "label.change-password": [
     {
       "type": 0,
-      "value": "Alterar a senha"
+      "value": "Alterar senha"
     }
   ],
   "label.cities": [
@@ -146,7 +146,7 @@
   "label.city": [
     {
       "type": 0,
-      "value": "City"
+      "value": "Cidade"
     }
   ],
   "label.clear-all": [
@@ -164,13 +164,13 @@
   "label.confirm-password": [
     {
       "type": 0,
-      "value": "Confirme a nova senha"
+      "value": "Confirmar senha"
     }
   ],
   "label.contains": [
     {
       "type": 0,
-      "value": "Contains"
+      "value": "Contém"
     }
   ],
   "label.continue": [
@@ -188,13 +188,13 @@
   "label.country": [
     {
       "type": 0,
-      "value": "Country"
+      "value": "País"
     }
   ],
   "label.create": [
     {
       "type": 0,
-      "value": "Create"
+      "value": "Criar"
     }
   ],
   "label.create-report": [
@@ -206,7 +206,7 @@
   "label.create-team": [
     {
       "type": 0,
-      "value": "Criar time"
+      "value": "Criar equipe"
     }
   ],
   "label.create-user": [
@@ -224,7 +224,7 @@
   "label.created-by": [
     {
       "type": 0,
-      "value": "Created By"
+      "value": "Criado por"
     }
   ],
   "label.current-password": [
@@ -248,13 +248,13 @@
   "label.data": [
     {
       "type": 0,
-      "value": "Data"
+      "value": "Dados"
     }
   ],
   "label.date": [
     {
       "type": 0,
-      "value": "Date"
+      "value": "Data"
     }
   ],
   "label.date-range": [
@@ -266,43 +266,43 @@
   "label.day": [
     {
       "type": 0,
-      "value": "Day"
+      "value": "Dia"
     }
   ],
   "label.default-date-range": [
     {
       "type": 0,
-      "value": "Intervalo de datas predefinido"
+      "value": "Intervalo padrão de datas"
     }
   ],
   "label.delete": [
     {
       "type": 0,
-      "value": "Remover"
+      "value": "Excluir"
     }
   ],
   "label.delete-report": [
     {
       "type": 0,
-      "value": "Delete report"
+      "value": "Excluir relatório"
     }
   ],
   "label.delete-team": [
     {
       "type": 0,
-      "value": "Remover time"
+      "value": "Excluir equipe"
     }
   ],
   "label.delete-user": [
     {
       "type": 0,
-      "value": "Remover usuário"
+      "value": "Excluir usuário"
     }
   ],
   "label.delete-website": [
     {
       "type": 0,
-      "value": "Remover site"
+      "value": "Excluir site"
     }
   ],
   "label.description": [
@@ -314,7 +314,7 @@
   "label.desktop": [
     {
       "type": 0,
-      "value": "Computador"
+      "value": "Desktop"
     }
   ],
   "label.details": [
@@ -326,7 +326,7 @@
   "label.device": [
     {
       "type": 0,
-      "value": "Device"
+      "value": "Dispositivo"
     }
   ],
   "label.devices": [
@@ -344,7 +344,7 @@
   "label.does-not-contain": [
     {
       "type": 0,
-      "value": "Does not contain"
+      "value": "Não contém"
     }
   ],
   "label.domain": [
@@ -356,7 +356,7 @@
   "label.dropoff": [
     {
       "type": 0,
-      "value": "Dropoff"
+      "value": "Queda"
     }
   ],
   "label.edit": [
@@ -368,19 +368,19 @@
   "label.edit-dashboard": [
     {
       "type": 0,
-      "value": "Editar painel"
+      "value": "Editar dashboard"
     }
   ],
   "label.edit-member": [
     {
       "type": 0,
-      "value": "Edit member"
+      "value": "Editar membro"
     }
   ],
   "label.enable-share-url": [
     {
       "type": 0,
-      "value": "Ativar link de compartilhamento"
+      "value": "Habilitar URL de compartilhamento"
     }
   ],
   "label.event": [
@@ -392,7 +392,7 @@
   "label.event-data": [
     {
       "type": 0,
-      "value": "Event data"
+      "value": "Dados do evento"
     }
   ],
   "label.events": [
@@ -404,7 +404,7 @@
   "label.false": [
     {
       "type": 0,
-      "value": "False"
+      "value": "Falso"
     }
   ],
   "label.field": [
@@ -422,7 +422,7 @@
   "label.filter": [
     {
       "type": 0,
-      "value": "Filter"
+      "value": "Filtro"
     }
   ],
   "label.filter-combined": [
@@ -434,13 +434,13 @@
   "label.filter-raw": [
     {
       "type": 0,
-      "value": "Dados brutos"
+      "value": "Bruto"
     }
   ],
   "label.filters": [
     {
       "type": 0,
-      "value": "Filters"
+      "value": "Filtros"
     }
   ],
   "label.funnel": [
@@ -452,7 +452,7 @@
   "label.funnel-description": [
     {
       "type": 0,
-      "value": "Understand the conversion and drop-off rate of users."
+      "value": "Entenda a conversão e a taxa de abandono dos usuários."
     }
   ],
   "label.greater-than": [
@@ -464,7 +464,7 @@
   "label.greater-than-equals": [
     {
       "type": 0,
-      "value": "Maior que ou igual"
+      "value": "Maior que ou igual a"
     }
   ],
   "label.insights": [
@@ -476,43 +476,43 @@
   "label.insights-description": [
     {
       "type": 0,
-      "value": "Dive deeper into your data by using segments and filters."
+      "value": "Explore seus dados mais profundamente usando segmentos e filtros."
     }
   ],
   "label.is": [
     {
       "type": 0,
-      "value": "Is"
+      "value": "É"
     }
   ],
   "label.is-not": [
     {
       "type": 0,
-      "value": "Is not"
+      "value": "Não é"
     }
   ],
   "label.is-not-set": [
     {
       "type": 0,
-      "value": "Is not set"
+      "value": "Não está definido"
     }
   ],
   "label.is-set": [
     {
       "type": 0,
-      "value": "Is set"
+      "value": "Está definido"
     }
   ],
   "label.join": [
     {
       "type": 0,
-      "value": "Entrar"
+      "value": "Participar"
     }
   ],
   "label.join-team": [
     {
       "type": 0,
-      "value": "Entrar no time"
+      "value": "Entrar na equipe"
     }
   ],
   "label.language": [
@@ -530,7 +530,7 @@
   "label.laptop": [
     {
       "type": 0,
-      "value": "Notebook"
+      "value": "Laptop"
     }
   ],
   "label.last-days": [
@@ -564,7 +564,7 @@
   "label.last-months": [
     {
       "type": 0,
-      "value": "Last "
+      "value": "Últimos "
     },
     {
       "type": 1,
@@ -572,7 +572,7 @@
     },
     {
       "type": 0,
-      "value": " months"
+      "value": " meses"
     }
   ],
   "label.leave": [
@@ -584,49 +584,49 @@
   "label.leave-team": [
     {
       "type": 0,
-      "value": "Sair do time"
+      "value": "Sair da equipe"
     }
   ],
   "label.less-than": [
     {
       "type": 0,
-      "value": "Menor que"
+      "value": "Menos que"
     }
   ],
   "label.less-than-equals": [
     {
       "type": 0,
-      "value": "Menor que ou igual"
+      "value": "Menos que ou igual a"
     }
   ],
   "label.login": [
     {
       "type": 0,
-      "value": "Iniciar sessão"
+      "value": "Login"
     }
   ],
   "label.logout": [
     {
       "type": 0,
-      "value": "Sair"
+      "value": "Logout"
     }
   ],
   "label.manage": [
     {
       "type": 0,
-      "value": "Manage"
+      "value": "Gerenciar"
     }
   ],
   "label.max": [
     {
       "type": 0,
-      "value": "Max"
+      "value": "Máx"
     }
   ],
   "label.member": [
     {
       "type": 0,
-      "value": "Member"
+      "value": "Membro"
     }
   ],
   "label.members": [
@@ -638,7 +638,7 @@
   "label.min": [
     {
       "type": 0,
-      "value": "Min"
+      "value": "Mín"
     }
   ],
   "label.mobile": [
@@ -656,13 +656,13 @@
   "label.my-account": [
     {
       "type": 0,
-      "value": "My account"
+      "value": "Minha conta"
     }
   ],
   "label.my-websites": [
     {
       "type": 0,
-      "value": "My websites"
+      "value": "Meus sites"
     }
   ],
   "label.name": [
@@ -699,7 +699,7 @@
           "value": [
             {
               "type": 0,
-              "value": "record"
+              "value": "registro"
             }
           ]
         },
@@ -707,7 +707,7 @@
           "value": [
             {
               "type": 0,
-              "value": "records"
+              "value": "registro"
             }
           ]
         }
@@ -726,13 +726,13 @@
   "label.os": [
     {
       "type": 0,
-      "value": "OS"
+      "value": "SO"
     }
   ],
   "label.overview": [
     {
       "type": 0,
-      "value": "Overview"
+      "value": "Visão geral"
     }
   ],
   "label.owner": [
@@ -744,7 +744,7 @@
   "label.page-of": [
     {
       "type": 0,
-      "value": "Page "
+      "value": "Página "
     },
     {
       "type": 1,
@@ -752,7 +752,7 @@
     },
     {
       "type": 0,
-      "value": " of "
+      "value": " de "
     },
     {
       "type": 1,
@@ -768,7 +768,7 @@
   "label.pageTitle": [
     {
       "type": 0,
-      "value": "Page title"
+      "value": "Título da página"
     }
   ],
   "label.pages": [
@@ -786,7 +786,7 @@
   "label.powered-by": [
     {
       "type": 0,
-      "value": "Distribuído por "
+      "value": "Desenvolvido por "
     },
     {
       "type": 1,
@@ -802,19 +802,19 @@
   "label.queries": [
     {
       "type": 0,
-      "value": "Parâmetros"
+      "value": "Consultas"
     }
   ],
   "label.query": [
     {
       "type": 0,
-      "value": "Query"
+      "value": "Consulta"
     }
   ],
   "label.query-parameters": [
     {
       "type": 0,
-      "value": "Parâmetros de Consulta"
+      "value": "Parâmetros de consulta"
     }
   ],
   "label.realtime": [
@@ -826,13 +826,13 @@
   "label.referrer": [
     {
       "type": 0,
-      "value": "Referrer"
+      "value": "Referenciador"
     }
   ],
   "label.referrers": [
     {
       "type": 0,
-      "value": "Referências"
+      "value": "Referenciadores"
     }
   ],
   "label.refresh": [
@@ -850,7 +850,7 @@
   "label.region": [
     {
       "type": 0,
-      "value": "Region"
+      "value": "Região"
     }
   ],
   "label.regions": [
@@ -868,13 +868,13 @@
   "label.remove-member": [
     {
       "type": 0,
-      "value": "Remove member"
+      "value": "Remover membro"
     }
   ],
   "label.reports": [
     {
       "type": 0,
-      "value": "Reports"
+      "value": "Relatórios"
     }
   ],
   "label.required": [
@@ -892,31 +892,31 @@
   "label.reset-website": [
     {
       "type": 0,
-      "value": "Redefinir estatísticas"
+      "value": "Redefinir site"
     }
   ],
   "label.retention": [
     {
       "type": 0,
-      "value": "Retention"
+      "value": "Retenção"
     }
   ],
   "label.retention-description": [
     {
       "type": 0,
-      "value": "Measure your website stickiness by tracking how often users return."
+      "value": "Meça a aderência do seu website monitorando a frequência com que os usuários retornam."
     }
   ],
   "label.role": [
     {
       "type": 0,
-      "value": "Papel"
+      "value": "Função"
     }
   ],
   "label.run-query": [
     {
       "type": 0,
-      "value": "Executar query"
+      "value": "Executar consulta"
     }
   ],
   "label.save": [
@@ -934,13 +934,13 @@
   "label.search": [
     {
       "type": 0,
-      "value": "Search"
+      "value": "Buscar"
     }
   ],
   "label.select": [
     {
       "type": 0,
-      "value": "Select"
+      "value": "Selecionar"
     }
   ],
   "label.select-date": [
@@ -952,7 +952,7 @@
   "label.select-role": [
     {
       "type": 0,
-      "value": "Select role"
+      "value": "Selecionar função"
     }
   ],
   "label.select-website": [
@@ -976,25 +976,25 @@
   "label.share-url": [
     {
       "type": 0,
-      "value": "Link de compartilhamento"
+      "value": "Compartilhar URL"
     }
   ],
   "label.single-day": [
     {
       "type": 0,
-      "value": "Dia específico"
+      "value": "Dia único"
     }
   ],
   "label.steps": [
     {
       "type": 0,
-      "value": "Steps"
+      "value": "Passos"
     }
   ],
   "label.sum": [
     {
       "type": 0,
-      "value": "Sum"
+      "value": "Soma"
     }
   ],
   "label.tablet": [
@@ -1006,49 +1006,49 @@
   "label.team": [
     {
       "type": 0,
-      "value": "Time"
+      "value": "Equipe"
     }
   ],
   "label.team-id": [
     {
       "type": 0,
-      "value": "ID do Time"
+      "value": "ID da Equipe"
     }
   ],
   "label.team-member": [
     {
       "type": 0,
-      "value": "Membro"
+      "value": "Membro da equipe"
     }
   ],
   "label.team-name": [
     {
       "type": 0,
-      "value": "Team name"
+      "value": "Nome da equipe"
     }
   ],
   "label.team-owner": [
     {
       "type": 0,
-      "value": "Proprietário"
+      "value": "Proprietário da equipe"
     }
   ],
   "label.team-view-only": [
     {
       "type": 0,
-      "value": "Team view only"
+      "value": "Equipe Somente leitura"
     }
   ],
   "label.team-websites": [
     {
       "type": 0,
-      "value": "Team websites"
+      "value": "Sites daequipe"
     }
   ],
   "label.teams": [
     {
       "type": 0,
-      "value": "Times"
+      "value": "Equipes"
     }
   ],
   "label.theme": [
@@ -1096,7 +1096,7 @@
   "label.toggle-charts": [
     {
       "type": 0,
-      "value": "Mostrar/Esconder gráficos"
+      "value": "Alternar gráficos"
     }
   ],
   "label.total": [
@@ -1108,7 +1108,7 @@
   "label.total-records": [
     {
       "type": 0,
-      "value": "Total records"
+      "value": "Total de registros"
     }
   ],
   "label.tracking-code": [
@@ -1120,19 +1120,19 @@
   "label.transfer": [
     {
       "type": 0,
-      "value": "Transfer"
+      "value": "Transferir"
     }
   ],
   "label.transfer-website": [
     {
       "type": 0,
-      "value": "Transfer website"
+      "value": "Transferir site"
     }
   ],
   "label.true": [
     {
       "type": 0,
-      "value": "True"
+      "value": "Verdadeiro"
     }
   ],
   "label.type": [
@@ -1168,7 +1168,7 @@
   "label.update": [
     {
       "type": 0,
-      "value": "Update"
+      "value": "Atualizar"
     }
   ],
   "label.url": [
@@ -1210,7 +1210,7 @@
   "label.utm-description": [
     {
       "type": 0,
-      "value": "Track your campaigns through UTM parameters."
+      "value": "Acompanhe suas campanhas por meio de parâmetros UTM."
     }
   ],
   "label.value": [
@@ -1222,7 +1222,7 @@
   "label.view": [
     {
       "type": 0,
-      "value": "Ver"
+      "value": "Visualizar"
     }
   ],
   "label.view-details": [
@@ -1234,7 +1234,7 @@
   "label.view-only": [
     {
       "type": 0,
-      "value": "Somente visualização"
+      "value": "Somente leitura"
     }
   ],
   "label.views": [
@@ -1246,7 +1246,7 @@
   "label.views-per-visit": [
     {
       "type": 0,
-      "value": "Views per visit"
+      "value": "Visualizações por visita"
     }
   ],
   "label.visitors": [
@@ -1258,19 +1258,19 @@
   "label.visits": [
     {
       "type": 0,
-      "value": "Visits"
+      "value": "Visitas"
     }
   ],
   "label.website": [
     {
       "type": 0,
-      "value": "Website"
+      "value": "Site"
     }
   ],
   "label.website-id": [
     {
       "type": 0,
-      "value": "ID do Site"
+      "value": "ID do site"
     }
   ],
   "label.websites": [
@@ -1294,7 +1294,7 @@
   "message.action-confirmation": [
     {
       "type": 0,
-      "value": "Type "
+      "value": "Digite "
     },
     {
       "type": 1,
@@ -1302,7 +1302,7 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " na caixa abaixo para confirmar."
     }
   ],
   "message.active-users": [
@@ -1346,7 +1346,7 @@
   "message.confirm-delete": [
     {
       "type": 0,
-      "value": "Deseja realmente remover "
+      "value": "Tem certeza que deseja excluir "
     },
     {
       "type": 1,
@@ -1360,7 +1360,7 @@
   "message.confirm-leave": [
     {
       "type": 0,
-      "value": "Você tem certeza que deseja sair de "
+      "value": "Tem certeza que deseja sair de "
     },
     {
       "type": 1,
@@ -1374,7 +1374,7 @@
   "message.confirm-remove": [
     {
       "type": 0,
-      "value": "Are you sure you want to remove "
+      "value": "Tem certeza que deseja remover "
     },
     {
       "type": 1,
@@ -1388,7 +1388,7 @@
   "message.confirm-reset": [
     {
       "type": 0,
-      "value": "Você tem certeza que deseja redefinir as estatísticas de "
+      "value": "Tem certeza que deseja redefinir "
     },
     {
       "type": 1,
@@ -1402,19 +1402,19 @@
   "message.delete-team-warning": [
     {
       "type": 0,
-      "value": "Deleting a team will also delete all team websites."
+      "value": "Excluir uma equipe também excluirá todos os sites da equipe."
     }
   ],
   "message.delete-website-warning": [
     {
       "type": 0,
-      "value": "Todos os dados associados também serão eliminados."
+      "value": "Todos os dados do site serão excluídos."
     }
   ],
   "message.error": [
     {
       "type": 0,
-      "value": "Ocorreu um erro."
+      "value": "Algo deu errado."
     }
   ],
   "message.event-log": [
@@ -1434,25 +1434,25 @@
   "message.go-to-settings": [
     {
       "type": 0,
-      "value": "Ir para as configurações"
+      "value": "Ir para configurações"
     }
   ],
   "message.incorrect-username-password": [
     {
       "type": 0,
-      "value": "O nome de usuário e/ou senha está incorreto."
+      "value": "Nome de usuário e/ou senha incorretos."
     }
   ],
   "message.invalid-domain": [
     {
       "type": 0,
-      "value": "Domínio inválido"
+      "value": "Domínio inválido. Não inclua http/https."
     }
   ],
   "message.min-password-length": [
     {
       "type": 0,
-      "value": "Quantidade mínima de "
+      "value": "Tamanho mínimo de "
     },
     {
       "type": 1,
@@ -1480,7 +1480,7 @@
   "message.no-data-available": [
     {
       "type": 0,
-      "value": "Sem dados disponíveis."
+      "value": "Nenhum dado disponível."
     }
   ],
   "message.no-event-data": [
@@ -1492,43 +1492,43 @@
   "message.no-match-password": [
     {
       "type": 0,
-      "value": "As senhas não correspondem"
+      "value": "As senhas não coincidem."
     }
   ],
   "message.no-results-found": [
     {
       "type": 0,
-      "value": "Nenhum resultado foi encontrado."
+      "value": "Nenhum resultado encontrado."
     }
   ],
   "message.no-team-websites": [
     {
       "type": 0,
-      "value": "Este time não possui nenhum site."
+      "value": "Esta equipe não possui nenhum site."
     }
   ],
   "message.no-teams": [
     {
       "type": 0,
-      "value": "Você não criou nenhum time."
+      "value": "Você não criou nenhuma equipe."
     }
   ],
   "message.no-users": [
     {
       "type": 0,
-      "value": "Não há nenhum usuário."
+      "value": "Não há usuários."
     }
   ],
   "message.no-websites-configured": [
     {
       "type": 0,
-      "value": "Nenhum site foi configurado ainda."
+      "value": "Você não possui nenhum site configurado."
     }
   ],
   "message.page-not-found": [
     {
       "type": 0,
-      "value": "Página não encontrada."
+      "value": "Página não encontrada"
     }
   ],
   "message.reset-website": [
@@ -1548,39 +1548,31 @@
   "message.reset-website-warning": [
     {
       "type": 0,
-      "value": "Todas as estatísticas deste site serão removidas, mas seu código de rastreamento permanecerá intacto."
+      "value": "Todas as estatísticas deste site serão excluídas, mas suas configurações permanecerão intactas."
     }
   ],
   "message.saved": [
     {
       "type": 0,
-      "value": "Salvo com sucesso."
+      "value": "Salvo."
     }
   ],
   "message.share-url": [
     {
       "type": 0,
-      "value": "Este é o link público de compartilhamento para "
-    },
-    {
-      "type": 1,
-      "value": "target"
-    },
-    {
-      "type": 0,
-      "value": "."
+      "value": "As estatísticas do seu site estão publicamente disponíveis no seguinte URL:"
     }
   ],
   "message.team-already-member": [
     {
       "type": 0,
-      "value": "Você já um membro do time."
+      "value": "Você já é um membro da equipe."
     }
   ],
   "message.team-not-found": [
     {
       "type": 0,
-      "value": "Time não encontrado."
+      "value": "Equipe não encontrada."
     }
   ],
   "message.team-websites-info": [
@@ -1592,43 +1584,57 @@
   "message.tracking-code": [
     {
       "type": 0,
-      "value": "Código de rastreamento"
+      "value": "Para rastrear estatísticas para este site, coloque o código a seguir na seção "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "..."
+        }
+      ],
+      "type": 8,
+      "value": "head"
+    },
+    {
+      "type": 0,
+      "value": " do HTML."
     }
   ],
   "message.transfer-team-website-to-user": [
     {
       "type": 0,
-      "value": "Transfer this website to your account?"
+      "value": "Transferir este website para a sua conta?"
     }
   ],
   "message.transfer-user-website-to-team": [
     {
       "type": 0,
-      "value": "Select the team to transfer this website to."
+      "value": "Selecione a equipe para a qual deseja transferir este site."
     }
   ],
   "message.transfer-website": [
     {
       "type": 0,
-      "value": "Transfer website ownership to your account or another team."
+      "value": "Transfira a propriedade do site para sua conta ou outra equipe."
     }
   ],
   "message.triggered-event": [
     {
       "type": 0,
-      "value": "Triggered event"
+      "value": "Evento acionado"
     }
   ],
   "message.user-deleted": [
     {
       "type": 0,
-      "value": "Usuário removido."
+      "value": "Usuário excluído."
     }
   ],
   "message.viewed-page": [
     {
       "type": 0,
-      "value": "Viewed page"
+      "value": "Página visualizada"
     }
   ],
   "message.visitor-log": [
@@ -1654,7 +1660,7 @@
     },
     {
       "type": 1,
-      "value": "device"
+      "value": "os"
     },
     {
       "type": 0,
@@ -1662,13 +1668,13 @@
     },
     {
       "type": 1,
-      "value": "os"
+      "value": "device"
     }
   ],
   "message.visitors-dropped-off": [
     {
       "type": 0,
-      "value": "Visitors dropped off"
+      "value": "Visitantes abandonaram o site"
     }
   ]
 }

From 6060ff7be0587d5b4e573dd49bd21d4a96658841 Mon Sep 17 00:00:00 2001
From: Eddu <frontedu@icloud.com>
Date: Thu, 9 May 2024 23:43:24 -0300
Subject: [PATCH 056/438] spelling corrections

---
 public/intl/messages/pt-BR.json | 34 ++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/public/intl/messages/pt-BR.json b/public/intl/messages/pt-BR.json
index cde65c3848..c7cb8797fc 100644
--- a/public/intl/messages/pt-BR.json
+++ b/public/intl/messages/pt-BR.json
@@ -392,7 +392,7 @@
   "label.event-data": [
     {
       "type": 0,
-      "value": "Dados do evento"
+      "value": "Dados de eventos"
     }
   ],
   "label.events": [
@@ -470,13 +470,13 @@
   "label.insights": [
     {
       "type": 0,
-      "value": "Insights"
+      "value": "Compreensão"
     }
   ],
   "label.insights-description": [
     {
       "type": 0,
-      "value": "Explore seus dados mais profundamente usando segmentos e filtros."
+      "value": "Explore seus dados mais profundamente usando campos e filtros."
     }
   ],
   "label.is": [
@@ -608,7 +608,7 @@
   "label.logout": [
     {
       "type": 0,
-      "value": "Logout"
+      "value": "Sair"
     }
   ],
   "label.manage": [
@@ -650,7 +650,7 @@
   "label.more": [
     {
       "type": 0,
-      "value": "Mais"
+      "value": "Ver todos"
     }
   ],
   "label.my-account": [
@@ -726,7 +726,7 @@
   "label.os": [
     {
       "type": 0,
-      "value": "SO"
+      "value": "Sistema operacional"
     }
   ],
   "label.overview": [
@@ -738,7 +738,7 @@
   "label.owner": [
     {
       "type": 0,
-      "value": "Proprietário"
+      "value": "Criado por"
     }
   ],
   "label.page-of": [
@@ -802,19 +802,19 @@
   "label.queries": [
     {
       "type": 0,
-      "value": "Consultas"
+      "value": "Parâmetros"
     }
   ],
   "label.query": [
     {
       "type": 0,
-      "value": "Consulta"
+      "value": "Parâmetro"
     }
   ],
   "label.query-parameters": [
     {
       "type": 0,
-      "value": "Parâmetros de consulta"
+      "value": "Chave-valor de parâmetro"
     }
   ],
   "label.realtime": [
@@ -826,13 +826,13 @@
   "label.referrer": [
     {
       "type": 0,
-      "value": "Referenciador"
+      "value": "Origem"
     }
   ],
   "label.referrers": [
     {
       "type": 0,
-      "value": "Referenciadores"
+      "value": "Origens"
     }
   ],
   "label.refresh": [
@@ -892,7 +892,7 @@
   "label.reset-website": [
     {
       "type": 0,
-      "value": "Redefinir site"
+      "value": "Apagar dados do site"
     }
   ],
   "label.retention": [
@@ -916,7 +916,7 @@
   "label.run-query": [
     {
       "type": 0,
-      "value": "Executar consulta"
+      "value": "Realizar consulta"
     }
   ],
   "label.save": [
@@ -1030,7 +1030,7 @@
   "label.team-owner": [
     {
       "type": 0,
-      "value": "Proprietário da equipe"
+      "value": "Criador da equipe"
     }
   ],
   "label.team-view-only": [
@@ -1096,7 +1096,7 @@
   "label.toggle-charts": [
     {
       "type": 0,
-      "value": "Alternar gráficos"
+      "value": "Esconder gráficos"
     }
   ],
   "label.total": [
@@ -1560,7 +1560,7 @@
   "message.share-url": [
     {
       "type": 0,
-      "value": "As estatísticas do seu site estão publicamente disponíveis no seguinte URL:"
+      "value": "As estatísticas do seu site estão publicamente disponíveis na seguinte URL:"
     }
   ],
   "message.team-already-member": [

From 8b6b81cfeecab66e37bdbc25bfed4dc00481fa6e Mon Sep 17 00:00:00 2001
From: Eddu <frontedu@icloud.com>
Date: Thu, 9 May 2024 23:47:25 -0300
Subject: [PATCH 057/438] small spelling corrections

---
 public/intl/messages/pt-BR.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/intl/messages/pt-BR.json b/public/intl/messages/pt-BR.json
index c7cb8797fc..27a648d3c5 100644
--- a/public/intl/messages/pt-BR.json
+++ b/public/intl/messages/pt-BR.json
@@ -748,7 +748,7 @@
     },
     {
       "type": 1,
-      "value": "current"
+      "value": "átual"
     },
     {
       "type": 0,
@@ -1470,7 +1470,7 @@
     },
     {
       "type": 1,
-      "value": "version"
+      "value": "versão"
     },
     {
       "type": 0,
@@ -1644,7 +1644,7 @@
     },
     {
       "type": 1,
-      "value": "country"
+      "value": "país"
     },
     {
       "type": 0,
@@ -1652,7 +1652,7 @@
     },
     {
       "type": 1,
-      "value": "browser"
+      "value": "navegador"
     },
     {
       "type": 0,
@@ -1668,7 +1668,7 @@
     },
     {
       "type": 1,
-      "value": "device"
+      "value": "dispositivo"
     }
   ],
   "message.visitors-dropped-off": [

From 9f43ae67ef8fab7917847f9e4db793983798fee4 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 10 May 2024 11:15:23 -0700
Subject: [PATCH 058/438] Updated styling of goals report.

---
 .../[reportId]/ParameterList.module.css       | 19 ++++-
 .../reports/[reportId]/ParameterList.tsx      |  7 +-
 .../(main)/reports/create/ReportTemplates.tsx |  3 +-
 .../funnel/FunnelParameters.module.css        |  4 -
 .../reports/funnel/FunnelParameters.tsx       |  4 +-
 src/app/(main)/reports/goals/GoalsAddForm.tsx |  2 -
 .../reports/goals/GoalsChart.module.css       | 78 ++++++++++---------
 src/app/(main)/reports/goals/GoalsChart.tsx   | 27 ++++---
 .../reports/goals/GoalsParameters.module.css  | 18 +----
 .../(main)/reports/goals/GoalsParameters.tsx  | 11 +--
 src/app/(main)/reports/goals/GoalsReport.tsx  |  4 +-
 src/assets/target.svg                         |  1 +
 12 files changed, 93 insertions(+), 85 deletions(-)
 create mode 100644 src/assets/target.svg

diff --git a/src/app/(main)/reports/[reportId]/ParameterList.module.css b/src/app/(main)/reports/[reportId]/ParameterList.module.css
index fca087ca91..75860b2565 100644
--- a/src/app/(main)/reports/[reportId]/ParameterList.module.css
+++ b/src/app/(main)/reports/[reportId]/ParameterList.module.css
@@ -6,11 +6,24 @@
 
 .item {
   display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
+  gap: 12px;
+  width: 100%;
+  flex-wrap: nowrap;
   padding: 12px;
   border: 1px solid var(--base400);
   border-radius: var(--border-radius);
   box-shadow: 1px 1px 1px var(--base400);
 }
+
+.value {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  flex-wrap: wrap;
+  flex: 1;
+}
+
+.icon,
+.close {
+  height: 1.5rem;
+}
diff --git a/src/app/(main)/reports/[reportId]/ParameterList.tsx b/src/app/(main)/reports/[reportId]/ParameterList.tsx
index f2ac988fc6..d4b6477bb5 100644
--- a/src/app/(main)/reports/[reportId]/ParameterList.tsx
+++ b/src/app/(main)/reports/[reportId]/ParameterList.tsx
@@ -24,18 +24,21 @@ export function ParameterList({ children }: ParameterListProps) {
 const Item = ({
   children,
   className,
+  icon,
   onClick,
   onRemove,
 }: {
   children?: ReactNode;
   className?: string;
+  icon?: ReactNode;
   onClick?: () => void;
   onRemove?: () => void;
 }) => {
   return (
     <div className={classNames(styles.item, className)} onClick={onClick}>
-      {children}
-      <Icon onClick={onRemove}>
+      {icon && <Icon className={styles.icon}>{icon}</Icon>}
+      <div className={styles.value}>{children}</div>
+      <Icon className={styles.close} onClick={onRemove}>
         <Icons.Close />
       </Icon>
     </div>
diff --git a/src/app/(main)/reports/create/ReportTemplates.tsx b/src/app/(main)/reports/create/ReportTemplates.tsx
index ac29f5c31d..fdf5c5f527 100644
--- a/src/app/(main)/reports/create/ReportTemplates.tsx
+++ b/src/app/(main)/reports/create/ReportTemplates.tsx
@@ -5,6 +5,7 @@ import Funnel from 'assets/funnel.svg';
 import Lightbulb from 'assets/lightbulb.svg';
 import Magnet from 'assets/magnet.svg';
 import Tag from 'assets/tag.svg';
+import Target from 'assets/target.svg';
 import styles from './ReportTemplates.module.css';
 import { useMessages, useTeamUrl } from 'components/hooks';
 
@@ -41,7 +42,7 @@ export function ReportTemplates({ showHeader = true }: { showHeader?: boolean })
       title: formatMessage(labels.goals),
       description: formatMessage(labels.goalsDescription),
       url: renderTeamUrl('/reports/goals'),
-      icon: <Tag />,
+      icon: <Target />,
     },
   ];
 
diff --git a/src/app/(main)/reports/funnel/FunnelParameters.module.css b/src/app/(main)/reports/funnel/FunnelParameters.module.css
index 219b980763..0f27d515f2 100644
--- a/src/app/(main)/reports/funnel/FunnelParameters.module.css
+++ b/src/app/(main)/reports/funnel/FunnelParameters.module.css
@@ -5,10 +5,6 @@
   width: 100%;
 }
 
-.type {
-  color: var(--base700);
-}
-
 .value {
   display: flex;
   align-self: center;
diff --git a/src/app/(main)/reports/funnel/FunnelParameters.tsx b/src/app/(main)/reports/funnel/FunnelParameters.tsx
index 7b1fb0c810..ef4ffbfb55 100644
--- a/src/app/(main)/reports/funnel/FunnelParameters.tsx
+++ b/src/app/(main)/reports/funnel/FunnelParameters.tsx
@@ -93,12 +93,10 @@ export function FunnelParameters() {
               <PopupTrigger key={index}>
                 <ParameterList.Item
                   className={styles.item}
+                  icon={step.type === 'url' ? <Icons.Eye /> : <Icons.Bolt />}
                   onRemove={() => handleRemoveStep(index)}
                 >
                   <div className={styles.value}>
-                    <div className={styles.type}>
-                      <Icon>{step.type === 'url' ? <Icons.Eye /> : <Icons.Bolt />}</Icon>
-                    </div>
                     <div>{step.value}</div>
                   </div>
                 </ParameterList.Item>
diff --git a/src/app/(main)/reports/goals/GoalsAddForm.tsx b/src/app/(main)/reports/goals/GoalsAddForm.tsx
index fdfa7aad9b..a8a77c58e8 100644
--- a/src/app/(main)/reports/goals/GoalsAddForm.tsx
+++ b/src/app/(main)/reports/goals/GoalsAddForm.tsx
@@ -76,11 +76,9 @@ export function GoalsAddForm({
             className={styles.input}
             value={goal?.toString()}
             onChange={e => handleChange(e, setGoal)}
-            autoFocus={true}
             autoComplete="off"
             onKeyDown={handleKeyDown}
           />
-          .
         </Flexbox>
       </FormRow>
       <FormRow>
diff --git a/src/app/(main)/reports/goals/GoalsChart.module.css b/src/app/(main)/reports/goals/GoalsChart.module.css
index c9f158d2fe..799f5fddcd 100644
--- a/src/app/(main)/reports/goals/GoalsChart.module.css
+++ b/src/app/(main)/reports/goals/GoalsChart.module.css
@@ -1,27 +1,15 @@
 .chart {
   display: grid;
+  gap: 30px;
 }
 
-.num {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border-radius: 100%;
-  width: 50px;
-  height: 50px;
-  font-size: 16px;
-  font-weight: 700;
-  color: var(--base800);
-  background: var(--base100);
-  z-index: 1;
+.goal {
+  padding-bottom: 40px;
+  border-bottom: 1px solid var(--base400);
 }
 
-.step {
-  display: grid;
-  grid-template-columns: max-content 1fr;
-  column-gap: 30px;
-  position: relative;
-  padding-bottom: 60px;
+.goal:last-child {
+  border: 0;
 }
 
 .card {
@@ -36,28 +24,12 @@
   gap: 20px;
 }
 
-.bar {
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  background: var(--base900);
-  height: 30px;
-  border-radius: 5px;
-  overflow: hidden;
-  position: relative;
-}
-
 .label {
   color: var(--base600);
   font-weight: 700;
   text-transform: uppercase;
 }
 
-.track {
-  background-color: var(--base100);
-  border-radius: 5px;
-}
-
 .item {
   font-size: 20px;
   color: var(--base900);
@@ -73,7 +45,7 @@
   text-transform: lowercase;
 }
 
-.visitors {
+.value {
   color: var(--base900);
   font-size: 24px;
   font-weight: 900;
@@ -85,3 +57,39 @@
   font-weight: 700;
   align-self: flex-end;
 }
+
+.total {
+  color: var(--base700);
+}
+
+.bar {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  background: var(--base900);
+  height: 10px;
+  border-radius: 5px;
+  overflow: hidden;
+  position: relative;
+}
+
+.bar.level1 {
+  background: var(--red800);
+}
+.bar.level2 {
+  background: var(--orange200);
+}
+.bar.level3 {
+  background: var(--orange400);
+}
+.bar.level4 {
+  background: var(--orange600);
+}
+.bar.level5 {
+  background: var(--green600);
+}
+
+.track {
+  background-color: var(--base100);
+  border-radius: 5px;
+}
diff --git a/src/app/(main)/reports/goals/GoalsChart.tsx b/src/app/(main)/reports/goals/GoalsChart.tsx
index f20c4f9b36..910f138c57 100644
--- a/src/app/(main)/reports/goals/GoalsChart.tsx
+++ b/src/app/(main)/reports/goals/GoalsChart.tsx
@@ -14,9 +14,10 @@ export function GoalsChart({ className }: { className?: string; isLoading?: bool
   return (
     <div className={classNames(styles.chart, className)}>
       {data?.map(({ type, value, goal, result }, index: number) => {
+        const percent = result > goal ? 100 : (result / goal) * 100;
+
         return (
-          <div key={index} className={styles.step}>
-            <div className={styles.num}>{index + 1}</div>
+          <div key={index} className={styles.goal}>
             <div className={styles.card}>
               <div className={styles.header}>
                 <span className={styles.label}>
@@ -25,20 +26,24 @@ export function GoalsChart({ className }: { className?: string; isLoading?: bool
                 <span className={styles.item}>{value}</span>
               </div>
               <div className={styles.metric}>
-                <div>
-                  <span className={styles.visitors}>{formatLongNumber(result)}</span>
-                  {formatMessage(labels.visitors)}
-                </div>
-                <div>
-                  <span className={styles.visitors}>{formatLongNumber(goal)}</span>
-                  {formatMessage(labels.goal)}
+                <div className={styles.value}>
+                  {formatLongNumber(result)}
+                  <span className={styles.total}> / {formatLongNumber(goal)}</span>
                 </div>
                 <div className={styles.percent}>{((result / goal) * 100).toFixed(2)}%</div>
               </div>
               <div className={styles.track}>
                 <div
-                  className={styles.bar}
-                  style={{ width: `${result > goal ? 100 : (result / goal) * 100}%` }}
+                  className={classNames(
+                    classNames(styles.bar, {
+                      [styles.level1]: percent <= 20,
+                      [styles.level2]: percent > 20 && percent <= 40,
+                      [styles.level3]: percent > 40 && percent <= 60,
+                      [styles.level4]: percent > 60 && percent <= 80,
+                      [styles.level5]: percent > 80,
+                    }),
+                  )}
+                  style={{ width: `${percent}%` }}
                 ></div>
               </div>
             </div>
diff --git a/src/app/(main)/reports/goals/GoalsParameters.module.css b/src/app/(main)/reports/goals/GoalsParameters.module.css
index 421433f0eb..fbe47b84b7 100644
--- a/src/app/(main)/reports/goals/GoalsParameters.module.css
+++ b/src/app/(main)/reports/goals/GoalsParameters.module.css
@@ -1,18 +1,7 @@
-.item {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-  width: 100%;
-}
-
-.type {
-  color: var(--base700);
-}
-
 .value {
-  display: flex;
-  align-self: center;
-  gap: 20px;
+  width: 100%;
+  margin-bottom: 8px;
+  font-weight: 600;
 }
 
 .goal {
@@ -22,5 +11,4 @@
   font-weight: 900;
   padding: 2px 8px;
   border-radius: 5px;
-  white-space: nowrap;
 }
diff --git a/src/app/(main)/reports/goals/GoalsParameters.tsx b/src/app/(main)/reports/goals/GoalsParameters.tsx
index b4743d2d1e..55955973b9 100644
--- a/src/app/(main)/reports/goals/GoalsParameters.tsx
+++ b/src/app/(main)/reports/goals/GoalsParameters.tsx
@@ -83,15 +83,12 @@ export function GoalsParameters() {
             return (
               <PopupTrigger key={index}>
                 <ParameterList.Item
-                  className={styles.item}
+                  icon={goal.type === 'url' ? <Icons.Eye /> : <Icons.Bolt />}
                   onRemove={() => handleRemoveGoals(index)}
                 >
-                  <div className={styles.value}>
-                    <div className={styles.type}>
-                      <Icon>{goal.type === 'url' ? <Icons.Eye /> : <Icons.Bolt />}</Icon>
-                    </div>
-                    <div>{goal.value}</div>
-                    <div className={styles.goal}>{formatNumber(goal.goal)}</div>
+                  <div className={styles.value}>{goal.value}</div>
+                  <div className={styles.goal}>
+                    {formatMessage(labels.goal)}: {formatNumber(goal.goal)}
                   </div>
                 </ParameterList.Item>
                 <Popup alignment="start">
diff --git a/src/app/(main)/reports/goals/GoalsReport.tsx b/src/app/(main)/reports/goals/GoalsReport.tsx
index d6171c3184..020d7d0900 100644
--- a/src/app/(main)/reports/goals/GoalsReport.tsx
+++ b/src/app/(main)/reports/goals/GoalsReport.tsx
@@ -4,7 +4,7 @@ import Report from '../[reportId]/Report';
 import ReportHeader from '../[reportId]/ReportHeader';
 import ReportMenu from '../[reportId]/ReportMenu';
 import ReportBody from '../[reportId]/ReportBody';
-import Goals from 'assets/funnel.svg';
+import Target from 'assets/target.svg';
 import { REPORT_TYPES } from 'lib/constants';
 
 const defaultParameters = {
@@ -15,7 +15,7 @@ const defaultParameters = {
 export default function GoalsReport({ reportId }: { reportId?: string }) {
   return (
     <Report reportId={reportId} defaultParameters={defaultParameters}>
-      <ReportHeader icon={<Goals />} />
+      <ReportHeader icon={<Target />} />
       <ReportMenu>
         <GoalsParameters />
       </ReportMenu>
diff --git a/src/assets/target.svg b/src/assets/target.svg
new file mode 100644
index 0000000000..000f34c7d2
--- /dev/null
+++ b/src/assets/target.svg
@@ -0,0 +1 @@
+<svg clip-rule="evenodd" fill-rule="evenodd" height="512" stroke-linejoin="round" stroke-miterlimit="2" viewBox="0 0 24 24" width="512" xmlns="http://www.w3.org/2000/svg"><g id="Icon"><path d="m19.393 10.825c-.097-.403.151-.808.553-.905.402-.098.808.15.905.553.181.75.277 1.533.277 2.338 0 5.485-4.453 9.939-9.939 9.939-5.485 0-9.939-4.454-9.939-9.939 0-5.486 4.454-9.939 9.939-9.939.805 0 1.588.096 2.338.277.403.097.651.503.553.905-.097.402-.502.65-.905.553-.637-.154-1.302-.235-1.986-.235-4.658 0-8.439 3.781-8.439 8.439s3.781 8.439 8.439 8.439 8.439-3.781 8.439-8.439c0-.684-.081-1.349-.235-1.986z"/><path d="m14.764 12.811c0-.414.336-.75.75-.75.413 0 .75.336.75.75 0 2.8-2.274 5.074-5.075 5.074-2.8 0-5.074-2.274-5.074-5.074 0-2.801 2.274-5.075 5.074-5.075.414 0 .75.337.75.75 0 .414-.336.75-.75.75-1.973 0-3.574 1.602-3.574 3.575s1.601 3.574 3.574 3.574 3.575-1.601 3.575-3.574z"/><path d="m22.53 5.588-3.057 3.058c-.141.141-.332.22-.531.22h-3.058c-.414 0-.75-.336-.75-.75v-3.058c0-.199.079-.39.22-.531l3.058-3.057c.184-.184.45-.26.703-.2s.457.246.539.493l.646 1.937 1.937.646c.247.082.433.286.493.539s-.016.519-.2.703zm-1.918-.202-1.142-.381c-.224-.075-.4-.251-.475-.475l-.381-1.142-1.98 1.98v1.998h1.998z"/><path d="m15.354 7.585c.293-.293.768-.293 1.061 0s.293.768 0 1.061l-4.587 4.586c-.293.293-.768.293-1.06 0-.293-.292-.293-.767 0-1.06z"/></g></svg>
\ No newline at end of file

From abd0913e9b66cd9f8fc9480d3d0f351950023d8d Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 10 May 2024 14:06:13 -0700
Subject: [PATCH 059/438] Updated goals chart.

---
 src/app/(main)/reports/goals/GoalsChart.tsx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/app/(main)/reports/goals/GoalsChart.tsx b/src/app/(main)/reports/goals/GoalsChart.tsx
index 910f138c57..2476023434 100644
--- a/src/app/(main)/reports/goals/GoalsChart.tsx
+++ b/src/app/(main)/reports/goals/GoalsChart.tsx
@@ -25,13 +25,6 @@ export function GoalsChart({ className }: { className?: string; isLoading?: bool
                 </span>
                 <span className={styles.item}>{value}</span>
               </div>
-              <div className={styles.metric}>
-                <div className={styles.value}>
-                  {formatLongNumber(result)}
-                  <span className={styles.total}> / {formatLongNumber(goal)}</span>
-                </div>
-                <div className={styles.percent}>{((result / goal) * 100).toFixed(2)}%</div>
-              </div>
               <div className={styles.track}>
                 <div
                   className={classNames(
@@ -46,6 +39,13 @@ export function GoalsChart({ className }: { className?: string; isLoading?: bool
                   style={{ width: `${percent}%` }}
                 ></div>
               </div>
+              <div className={styles.metric}>
+                <div className={styles.value}>
+                  {formatLongNumber(result)}
+                  <span className={styles.total}> / {formatLongNumber(goal)}</span>
+                </div>
+                <div className={styles.percent}>{((result / goal) * 100).toFixed(2)}%</div>
+              </div>
             </div>
           </div>
         );

From 0db6ecf243f96dc56b2a9f919e22ebc265b3a7a8 Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Fri, 10 May 2024 23:15:56 -0700
Subject: [PATCH 060/438] fix usage get.

---
 src/pages/api/users/[userId]/usage.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/api/users/[userId]/usage.ts b/src/pages/api/users/[userId]/usage.ts
index 806b4128c2..66e9276884 100644
--- a/src/pages/api/users/[userId]/usage.ts
+++ b/src/pages/api/users/[userId]/usage.ts
@@ -24,7 +24,7 @@ export interface UserUsageRequestResponse {
 
 const schema = {
   GET: yup.object().shape({
-    id: yup.string().uuid().required(),
+    userId: yup.string().uuid().required(),
     startAt: yup.number().integer().required(),
     endAt: yup.number().integer().min(yup.ref<number>('startAt')).required(),
   }),

From ab39ae8511166c410d9aa26199ba0ba66b471363 Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Fri, 10 May 2024 23:15:56 -0700
Subject: [PATCH 061/438] fix usage get.

---
 src/pages/api/users/[userId]/usage.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/api/users/[userId]/usage.ts b/src/pages/api/users/[userId]/usage.ts
index 806b4128c2..66e9276884 100644
--- a/src/pages/api/users/[userId]/usage.ts
+++ b/src/pages/api/users/[userId]/usage.ts
@@ -24,7 +24,7 @@ export interface UserUsageRequestResponse {
 
 const schema = {
   GET: yup.object().shape({
-    id: yup.string().uuid().required(),
+    userId: yup.string().uuid().required(),
     startAt: yup.number().integer().required(),
     endAt: yup.number().integer().min(yup.ref<number>('startAt')).required(),
   }),

From 30c1933718c54eccf0809598c785ab80c376da0e Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Sat, 11 May 2024 21:52:40 -0700
Subject: [PATCH 062/438] Updated handling of env vars.

---
 next.config.js                                |  14 +-
 src/app/(main)/layout.module.css              |  12 -
 src/app/(main)/layout.tsx                     |   4 +
 .../websites/[websiteId]/ShareUrl.tsx         |  13 +-
 .../websites/[websiteId]/TrackingCode.tsx     |   6 +-
 .../websites/[websiteId]/WebsiteSettings.tsx  |   6 +-
 src/app/login/LoginPage.tsx                   |   2 +-
 yarn.lock                                     | 290 +++++++++++-------
 8 files changed, 192 insertions(+), 155 deletions(-)

diff --git a/next.config.js b/next.config.js
index f8850c60cf..8a0c6569b4 100644
--- a/next.config.js
+++ b/next.config.js
@@ -4,17 +4,18 @@ const path = require('path');
 const pkg = require('./package.json');
 
 const basePath = process.env.BASE_PATH || '';
-const forceSSL = process.env.FORCE_SSL || '';
 const collectApiEndpoint = process.env.COLLECT_API_ENDPOINT || '';
-const defaultLocale = process.env.DEFAULT_LOCALE || '';
-const trackerScriptName = process.env.TRACKER_SCRIPT_NAME || '';
 const cloudMode = process.env.CLOUD_MODE || '';
 const cloudUrl = process.env.CLOUD_URL || '';
-const frameAncestors = process.env.ALLOWED_FRAME_URLS || '';
+const defaultLocale = process.env.DEFAULT_LOCALE || '';
 const disableLogin = process.env.DISABLE_LOGIN || '';
 const disableUI = process.env.DISABLE_UI || '';
-const hostURL = process.env.HOST_URL || '';
+const forceSSL = process.env.FORCE_SSL || '';
+const frameAncestors = process.env.ALLOWED_FRAME_URLS || '';
 const privateMode = process.env.PRIVATE_MODE || '';
+const shareUrlHost = process.env.SHARE_HOST_URL || '';
+const trackerScriptHost = process.env.TRACKER_SCRIPT_HOST || '';
+const trackerScriptName = process.env.TRACKER_SCRIPT_NAME || '';
 
 const contentSecurityPolicy = [
   `default-src 'self'`,
@@ -120,8 +121,9 @@ const config = {
     defaultLocale,
     disableLogin,
     disableUI,
-    hostURL,
     privateMode,
+    shareUrlHost,
+    trackerScriptHost,
   },
   basePath,
   output: 'standalone',
diff --git a/src/app/(main)/layout.module.css b/src/app/(main)/layout.module.css
index 09b2eab723..58c1cacf63 100644
--- a/src/app/(main)/layout.module.css
+++ b/src/app/(main)/layout.module.css
@@ -19,15 +19,3 @@
   height: calc(100vh - 60px);
   overflow-y: auto;
 }
-
-.content {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  position: relative;
-  width: 100%;
-  max-width: 1320px;
-  margin: 0 auto;
-  padding: 0 20px;
-  min-height: calc(100vh - 60px);
-}
diff --git a/src/app/(main)/layout.tsx b/src/app/(main)/layout.tsx
index 0ecce22cd8..ba2219908d 100644
--- a/src/app/(main)/layout.tsx
+++ b/src/app/(main)/layout.tsx
@@ -5,6 +5,10 @@ import Page from 'components/layout/Page';
 import styles from './layout.module.css';
 
 export default function ({ children }) {
+  if (process.env.DISABLE_UI) {
+    return null;
+  }
+
   return (
     <App>
       <main className={styles.layout}>
diff --git a/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx b/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx
index 989f4def39..ded2105d14 100644
--- a/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx
+++ b/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx
@@ -15,14 +15,7 @@ import { WebsiteContext } from 'app/(main)/websites/[websiteId]/WebsiteProvider'
 
 const generateId = () => getRandomChars(16);
 
-export function ShareUrl({
-  hostUrl,
-  onSave,
-}: {
-  websiteId: string;
-  hostUrl?: string;
-  onSave?: () => void;
-}) {
+export function ShareUrl({ onSave }: { websiteId: string; onSave?: () => void }) {
   const website = useContext(WebsiteContext);
   const { domain, shareId } = website;
   const { formatMessage, labels, messages } = useMessages();
@@ -33,8 +26,8 @@ export function ShareUrl({
   });
   const { touch } = useModified();
 
-  const url = `${hostUrl || process.env.hostUrl || window?.location.origin}${
-    process.env.basePath
+  const url = `${process.env.shareUrlHost || window?.location.origin || ''}${
+    process.env.basePath || ''
   }/share/${id}/${domain}`;
 
   const handleGenerate = () => {
diff --git a/src/app/(main)/settings/websites/[websiteId]/TrackingCode.tsx b/src/app/(main)/settings/websites/[websiteId]/TrackingCode.tsx
index 662223492e..18672abf8f 100644
--- a/src/app/(main)/settings/websites/[websiteId]/TrackingCode.tsx
+++ b/src/app/(main)/settings/websites/[websiteId]/TrackingCode.tsx
@@ -3,7 +3,7 @@ import { useMessages, useConfig } from 'components/hooks';
 
 const SCRIPT_NAME = 'script.js';
 
-export function TrackingCode({ websiteId, hostUrl }: { websiteId: string; hostUrl?: string }) {
+export function TrackingCode({ websiteId }: { websiteId: string }) {
   const { formatMessage, messages } = useMessages();
   const config = useConfig();
 
@@ -12,8 +12,8 @@ export function TrackingCode({ websiteId, hostUrl }: { websiteId: string; hostUr
 
   const url = trackerScriptName?.startsWith('http')
     ? trackerScriptName
-    : `${hostUrl || process.env.hostUrl || window?.location.origin}${
-        process.env.basePath
+    : `${process.env.trackerScriptHost || window?.location.origin || ''}${
+        process.env.basePath || ''
       }/${trackerScriptName}`;
 
   const code = `<script defer src="${url}" data-website-id="${websiteId}"></script>`;
diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx
index 99f9faa1db..1a92f1f114 100644
--- a/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx
+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx
@@ -13,11 +13,9 @@ import WebsiteEditForm from './WebsiteEditForm';
 
 export function WebsiteSettings({
   websiteId,
-  hostUrl,
   openExternal = false,
 }: {
   websiteId: string;
-  hostUrl?: string;
   openExternal?: boolean;
 }) {
   const website = useContext(WebsiteContext);
@@ -62,8 +60,8 @@ export function WebsiteSettings({
         <Item key="data">{formatMessage(labels.data)}</Item>
       </Tabs>
       {tab === 'details' && <WebsiteEditForm websiteId={websiteId} onSave={handleSave} />}
-      {tab === 'tracking' && <TrackingCode websiteId={websiteId} hostUrl={hostUrl} />}
-      {tab === 'share' && <ShareUrl websiteId={websiteId} hostUrl={hostUrl} onSave={handleSave} />}
+      {tab === 'tracking' && <TrackingCode websiteId={websiteId} />}
+      {tab === 'share' && <ShareUrl websiteId={websiteId} onSave={handleSave} />}
       {tab === 'data' && <WebsiteData websiteId={websiteId} onSave={handleSave} />}
     </>
   );
diff --git a/src/app/login/LoginPage.tsx b/src/app/login/LoginPage.tsx
index 28a3c0247d..8ea0b4e20a 100644
--- a/src/app/login/LoginPage.tsx
+++ b/src/app/login/LoginPage.tsx
@@ -3,7 +3,7 @@ import LoginForm from './LoginForm';
 import styles from './LoginPage.module.css';
 
 export function LoginPage() {
-  if (process.env.loginDisabled) {
+  if (process.env.disableLogin) {
     return null;
   }
 
diff --git a/yarn.lock b/yarn.lock
index 5720f25d98..c4efa40993 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1127,9 +1127,9 @@
     regenerator-runtime "^0.14.0"
 
 "@babel/runtime@^7.23.2":
-  version "7.24.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.4.tgz#de795accd698007a66ba44add6cc86542aff1edd"
-  integrity sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.5.tgz#230946857c053a36ccc66e1dd03b17dd0c4ed02c"
+  integrity sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==
   dependencies:
     regenerator-runtime "^0.14.0"
 
@@ -1668,17 +1668,17 @@
     "@formatjs/ecma402-abstract" "1.4.0"
     tslib "^2.0.1"
 
-"@formatjs/intl@2.10.1":
-  version "2.10.1"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-2.10.1.tgz#75ae637070553bf7dfd213847ba8219f5ddae2b6"
-  integrity sha512-dsLG15U7xDi8yzKf4hcAWSsCaez3XrjTO2oaRHPyHtXLm1aEzYbDw6bClo/HMHu+iwS5GbDqT3DV+hYP2ylScg==
+"@formatjs/intl@2.10.2":
+  version "2.10.2"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-2.10.2.tgz#c074439ac2dbde4c2b3768b8108dfc3932b7fb30"
+  integrity sha512-raPGWr3JRv3neXV78SqPFrGC05fIbhhNzVghHNxFde27ls2KkXiMhtP7HBybjGpikVSjjhdhaZto+4p1vmm9bQ==
   dependencies:
     "@formatjs/ecma402-abstract" "1.18.2"
     "@formatjs/fast-memoize" "2.2.0"
     "@formatjs/icu-messageformat-parser" "2.7.6"
     "@formatjs/intl-displaynames" "6.6.6"
     "@formatjs/intl-listformat" "7.5.5"
-    intl-messageformat "10.5.11"
+    intl-messageformat "10.5.12"
     tslib "^2.4.0"
 
 "@formatjs/ts-transformer@3.9.4":
@@ -2002,19 +2002,19 @@
   integrity sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==
 
 "@netlify/plugin-nextjs@^5.1.0":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@netlify/plugin-nextjs/-/plugin-nextjs-5.1.0.tgz#12fc0f7815b62cf091ea6bc98bc9f43ab103411d"
-  integrity sha512-nurSK6pMi36fVbuwLEiPIzMC/N2Dn/tHqA+seoStwHvGewsrXAphrjJ+8wq7eSCe+BEHCtGlwC1mNOeuqVkfbg==
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/@netlify/plugin-nextjs/-/plugin-nextjs-5.2.2.tgz#3c283d335001f9e0fbcb4db75557e5fe1660db72"
+  integrity sha512-jV/P7o8+v1XaEGb7wvFfkF1fSLggAxjg7WYoBPkD3R93bsI6xmCDKBcUJ/6g7lqECRXt4dGKApSFtGk/pUmAHw==
 
 "@next/env@14.1.4":
   version "14.1.4"
   resolved "https://registry.yarnpkg.com/@next/env/-/env-14.1.4.tgz#432e80651733fbd67230bf262aee28be65252674"
   integrity sha512-e7X7bbn3Z6DWnDi75UWn+REgAbLEqxI8Tq2pkFOFAMpWAWApz/YCUhtWMWn410h8Q2fYiYL7Yg5OlxMOCfFjJQ==
 
-"@next/eslint-plugin-next@14.1.4":
-  version "14.1.4"
-  resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-14.1.4.tgz#d7372b5ffede0e466af8af2ff534386418827fc8"
-  integrity sha512-n4zYNLSyCo0Ln5b7qxqQeQ34OZKXwgbdcx6kmkQbywr+0k6M3Vinft0T72R6CDAcDrne2IAgSud4uWCzFgc5HA==
+"@next/eslint-plugin-next@14.2.3":
+  version "14.2.3"
+  resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-14.2.3.tgz#287ad8620e7061ba01e8d3313d464db6d217b6df"
+  integrity sha512-L3oDricIIjgj1AVnRdRor21gI7mShlSwU/1ZGHmqM3LzHhXXhdkrfeNY5zif25Bi5Dd7fiJHsbhoZCHfXYvlAw==
   dependencies:
     glob "10.3.10"
 
@@ -2273,9 +2273,9 @@
     picomatch "^2.3.1"
 
 "@rushstack/eslint-patch@^1.3.3":
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.10.1.tgz#7ca168b6937818e9a74b47ac4e2112b2e1a024cf"
-  integrity sha512-S3Kq8e7LqxkA9s7HKLqXGTGck1uwis5vAXan3FnU5yw1Ec5hsSGnq4s/UCaSqABPOnOTg7zASLyst7+ohgWexg==
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.10.2.tgz#053f1540703faa81dea2966b768ee5581c66aeda"
+  integrity sha512-hw437iINopmQuxWPSUEvqE56NCPsiU8N4AYtfHmJFckclktzK9YQJieD3XkDCDH4OjL+C7zgPUh73R/nrcHrqw==
 
 "@sinclair/typebox@^0.27.8":
   version "0.27.8"
@@ -2424,17 +2424,17 @@
   dependencies:
     tslib "^2.4.0"
 
-"@tanstack/query-core@5.29.0":
-  version "5.29.0"
-  resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-5.29.0.tgz#d0b3d12c07d5a47f42ab0c1ed4f317106f3d4b20"
-  integrity sha512-WgPTRs58hm9CMzEr5jpISe8HXa3qKQ8CxewdYZeVnA54JrPY9B1CZiwsCoLpLkf0dGRZq+LcX5OiJb0bEsOFww==
+"@tanstack/query-core@5.35.5":
+  version "5.35.5"
+  resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-5.35.5.tgz#7b4100dc9cc7fee314b8a1bcbf502a236d43ffe3"
+  integrity sha512-OMWvlEqG01RfGj+XZb/piDzPp0eZkkHWSDHt2LvE/fd1zWburP/xwm0ghk6Iv8cuPlP+ACFkZviKXK0OVt6lhg==
 
 "@tanstack/react-query@^5.28.6":
-  version "5.29.0"
-  resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-5.29.0.tgz#42b3a2de4ed1d63666f0af04392a34b5e70d49c0"
-  integrity sha512-yxlhHB73jaBla6h5B6zPaGmQjokkzAhMHN4veotkPNiQ3Ac/mCxgABRZPsJJrgCTvhpcncBZcDBFxaR2B37vug==
+  version "5.35.5"
+  resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-5.35.5.tgz#d41a087d58f42418824fa04aaca00ba93c99075c"
+  integrity sha512-sppX7L+PVn5GBV3In6zzj0zcKfnZRKhXbX1MfIfKo1OjIq2GMaopvAFOP0x1bRYTUk2ikrdYcQYOozX7PWkb8A==
   dependencies:
-    "@tanstack/query-core" "5.29.0"
+    "@tanstack/query-core" "5.35.5"
 
 "@trysound/sax@0.2.0":
   version "0.2.0"
@@ -2647,9 +2647,9 @@
   integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==
 
 "@types/node@*", "@types/node@^20.9.0":
-  version "20.12.6"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.6.tgz#72d068870518d7da1d97b49db401e2d6a1805294"
-  integrity sha512-3KurE8taB8GCvZBPngVbp0lk5CKi8M9f9k1rsADh0Evdz5SzJ+Q+Hx9uHoFGsLnLnd1xmkDQr2hVhlA0Mn0lKQ==
+  version "20.12.11"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.11.tgz#c4ef00d3507000d17690643278a60dc55a9dc9be"
+  integrity sha512-vDg9PZ/zi+Nqp6boSOT7plNuthRugEKixDv5sFTIpkE89MmNtEArAShI4mxuX2+UrLEe9pxC1vm2cjm9YlWbJw==
   dependencies:
     undici-types "~5.26.4"
 
@@ -2674,9 +2674,9 @@
   integrity sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==
 
 "@types/react-dom@^18.2.17":
-  version "18.2.24"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.24.tgz#8dda8f449ae436a7a6e91efed8035d4ab03ff759"
-  integrity sha512-cN6upcKd8zkGy4HU9F1+/s98Hrp6D4MOcippK4PoE8OZRngohHZpbJn1GsaDLz87MqvHNoT13nHvNqM9ocRHZg==
+  version "18.3.0"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.3.0.tgz#0cbc818755d87066ab6ca74fbedb2547d74a82b0"
+  integrity sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==
   dependencies:
     "@types/react" "*"
 
@@ -2698,9 +2698,9 @@
     "@types/react" "*"
 
 "@types/react@*", "@types/react@16 || 17 || 18", "@types/react@^18.2.41":
-  version "18.2.75"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.75.tgz#45d18f384939306d35312def1bf532eb38a68562"
-  integrity sha512-+DNnF7yc5y0bHkBTiLKqXFe+L4B3nvOphiMY3tuA5X10esmjqk7smyBZzbGTy2vsiy/Bnzj8yFIBL8xhRacoOg==
+  version "18.3.1"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.1.tgz#fed43985caa834a2084d002e4771e15dfcbdbe8e"
+  integrity sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw==
   dependencies:
     "@types/prop-types" "*"
     csstype "^3.0.2"
@@ -2773,7 +2773,18 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/parser@^5.4.2 || ^6.0.0", "@typescript-eslint/parser@^6.7.3":
+"@typescript-eslint/parser@^5.4.2 || ^6.0.0 || 7.0.0 - 7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.2.0.tgz#44356312aea8852a3a82deebdacd52ba614ec07a"
+  integrity sha512-5FKsVcHTk6TafQKQbuIVkXq58Fnbkd2wDL4LB7AURN7RUOu1utVP+G8+6u3ZhEroW3DF6hyo3ZEXxgKgp4KeCg==
+  dependencies:
+    "@typescript-eslint/scope-manager" "7.2.0"
+    "@typescript-eslint/types" "7.2.0"
+    "@typescript-eslint/typescript-estree" "7.2.0"
+    "@typescript-eslint/visitor-keys" "7.2.0"
+    debug "^4.3.4"
+
+"@typescript-eslint/parser@^6.7.3":
   version "6.21.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.21.0.tgz#af8fcf66feee2edc86bc5d1cf45e33b0630bf35b"
   integrity sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==
@@ -2800,6 +2811,14 @@
     "@typescript-eslint/types" "6.21.0"
     "@typescript-eslint/visitor-keys" "6.21.0"
 
+"@typescript-eslint/scope-manager@7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.2.0.tgz#cfb437b09a84f95a0930a76b066e89e35d94e3da"
+  integrity sha512-Qh976RbQM/fYtjx9hs4XkayYujB/aPwglw2choHmf3zBjB4qOywWSdt9+KLRdHubGcoSwBnXUH2sR3hkyaERRg==
+  dependencies:
+    "@typescript-eslint/types" "7.2.0"
+    "@typescript-eslint/visitor-keys" "7.2.0"
+
 "@typescript-eslint/type-utils@6.21.0":
   version "6.21.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz#6473281cfed4dacabe8004e8521cee0bd9d4c01e"
@@ -2820,6 +2839,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d"
   integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==
 
+"@typescript-eslint/types@7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.2.0.tgz#0feb685f16de320e8520f13cca30779c8b7c403f"
+  integrity sha512-XFtUHPI/abFhm4cbCDc5Ykc8npOKBSJePY3a3s+lwumt7XWJuzP5cZcfZ610MIPHjQjNsOLlYK8ASPaNG8UiyA==
+
 "@typescript-eslint/typescript-estree@5.62.0":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b"
@@ -2847,6 +2871,20 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
+"@typescript-eslint/typescript-estree@7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.2.0.tgz#5beda2876c4137f8440c5a84b4f0370828682556"
+  integrity sha512-cyxS5WQQCoBwSakpMrvMXuMDEbhOo9bNHHrNcEWis6XHx6KF518tkF1wBvKIn/tpq5ZpUYK7Bdklu8qY0MsFIA==
+  dependencies:
+    "@typescript-eslint/types" "7.2.0"
+    "@typescript-eslint/visitor-keys" "7.2.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    minimatch "9.0.3"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
 "@typescript-eslint/utils@6.21.0":
   version "6.21.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.21.0.tgz#4714e7a6b39e773c1c8e97ec587f520840cd8134"
@@ -2890,6 +2928,14 @@
     "@typescript-eslint/types" "6.21.0"
     eslint-visitor-keys "^3.4.1"
 
+"@typescript-eslint/visitor-keys@7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.2.0.tgz#5035f177752538a5750cca1af6044b633610bf9e"
+  integrity sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A==
+  dependencies:
+    "@typescript-eslint/types" "7.2.0"
+    eslint-visitor-keys "^3.4.1"
+
 "@umami/prisma-client@^0.14.0":
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/@umami/prisma-client/-/prisma-client-0.14.0.tgz#8489f23e7d766fdecb94790246b0b77b9d65223b"
@@ -4215,9 +4261,9 @@ cypress@*:
     yauzl "^2.10.0"
 
 cypress@^13.6.6:
-  version "13.7.2"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.7.2.tgz#61e841382abb20e0a9a063086ee0d850af3ef6bc"
-  integrity sha512-FF5hFI5wlRIHY8urLZjJjj/YvfCBrRpglbZCLr/cYcL9MdDe0+5usa8kTIrDHthlEc9lwihbkb5dmwqBDNS2yw==
+  version "13.9.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.9.0.tgz#b529cfa8f8c39ba163ed0501a25bb5b09c143652"
+  integrity sha512-atNjmYfHsvTuCaxTxLZr9xGoHz53LLui3266WWxXJHY7+N6OdwJdg/feEa3T+buez9dmUXHT1izCOklqG82uCQ==
   dependencies:
     "@cypress/request" "^3.0.0"
     "@cypress/xvfb" "^1.2.4"
@@ -4400,9 +4446,9 @@ dateformat@^5.0.3:
   integrity sha512-Kvr6HmPXUMerlLcLF+Pwq3K7apHpYmGDVqrxcDasBg86UcKeTSNWbEzU8bwdXnxnR44FtMhJAxI4Bov6Y/KUfA==
 
 dayjs@^1.10.4:
-  version "1.11.10"
-  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.10.tgz#68acea85317a6e164457d6d6947564029a6a16a0"
-  integrity sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==
+  version "1.11.11"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.11.tgz#dfe0e9d54c5f8b68ccf8ca5f72ac603e7e5ed59e"
+  integrity sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==
 
 debounce@^1.2.1:
   version "1.2.1"
@@ -4465,7 +4511,7 @@ define-data-property@^1.0.1, define-data-property@^1.1.4:
     es-errors "^1.3.0"
     gopd "^1.0.1"
 
-define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1:
+define-properties@^1.2.0, define-properties@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
   integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
@@ -4679,9 +4725,9 @@ end-of-stream@^1.1.0:
     once "^1.4.0"
 
 enhanced-resolve@^5.12.0:
-  version "5.16.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz#65ec88778083056cb32487faa9aef82ed0864787"
-  integrity sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==
+  version "5.16.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.16.1.tgz#e8bc63d51b826d6f1cbc0a150ecb5a8b0c62e567"
+  integrity sha512-4U5pNsuDl0EhuZpq46M5xPslstkviJuhrdobaRDBk2Jy2KO37FDAJl4lb2KlNabxT0m4MTK2UHNrsAcphE8nyw==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -4711,7 +4757,7 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.1, es-abstract@^1.23.2:
+es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.1, es-abstract@^1.23.2, es-abstract@^1.23.3:
   version "1.23.3"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0"
   integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==
@@ -4776,13 +4822,13 @@ es-errors@^1.1.0, es-errors@^1.2.1, es-errors@^1.3.0:
   integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
 
 es-iterator-helpers@^1.0.15, es-iterator-helpers@^1.0.17:
-  version "1.0.18"
-  resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.0.18.tgz#4d3424f46b24df38d064af6fbbc89274e29ea69d"
-  integrity sha512-scxAJaewsahbqTYrGKJihhViaM6DDZDDoucfvzNbK0pOren1g/daDQ3IAhzn+1G14rBG7w+i5N+qul60++zlKA==
+  version "1.0.19"
+  resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz#117003d0e5fec237b4b5c08aded722e0c6d50ca8"
+  integrity sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw==
   dependencies:
     call-bind "^1.0.7"
     define-properties "^1.2.1"
-    es-abstract "^1.23.0"
+    es-abstract "^1.23.3"
     es-errors "^1.3.0"
     es-set-tostringtag "^2.0.3"
     function-bind "^1.1.2"
@@ -4881,13 +4927,13 @@ escape-string-regexp@^4.0.0:
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
 eslint-config-next@^14.0.4:
-  version "14.1.4"
-  resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-14.1.4.tgz#22f2ba4c0993e991249d863656a64c204bae542c"
-  integrity sha512-cihIahbhYAWwXJwZkAaRPpUi5t9aOi/HdfWXOjZeUOqNWXHD8X22kd1KG58Dc3MVaRx3HoR/oMGk2ltcrqDn8g==
+  version "14.2.3"
+  resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-14.2.3.tgz#2fb0f7c4eccda530a4b5054438162b2303786d4f"
+  integrity sha512-ZkNztm3Q7hjqvB1rRlOX8P9E/cXRL9ajRcs8jufEtwMfTVYRqnmtnaSu57QqHyBlovMuiB8LEzfLBkh5RYV6Fg==
   dependencies:
-    "@next/eslint-plugin-next" "14.1.4"
+    "@next/eslint-plugin-next" "14.2.3"
     "@rushstack/eslint-patch" "^1.3.3"
-    "@typescript-eslint/parser" "^5.4.2 || ^6.0.0"
+    "@typescript-eslint/parser" "^5.4.2 || ^6.0.0 || 7.0.0 - 7.2.0"
     eslint-import-resolver-node "^0.3.6"
     eslint-import-resolver-typescript "^3.5.2"
     eslint-plugin-import "^2.28.1"
@@ -4943,9 +4989,9 @@ eslint-plugin-css-modules@^2.12.0:
     lodash "^4.17.2"
 
 eslint-plugin-cypress@^2.15.1:
-  version "2.15.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-2.15.1.tgz#336afa7e8e27451afaf65aa359c9509e0a4f3a7b"
-  integrity sha512-eLHLWP5Q+I4j2AWepYq0PgFEei9/s5LvjuSqWrxurkg1YZ8ltxdvMNmdSf0drnsNo57CTgYY/NIHHLRSWejR7w==
+  version "2.15.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-2.15.2.tgz#f22e12fad4c434edad7b298ef92bac8fa087ffa0"
+  integrity sha512-CtcFEQTDKyftpI22FVGpx8bkpKyYXBlNge6zSo0pl5/qJvBAnzaD76Vu2AsP16d6mTj478Ldn2mhgrWV+Xr0vQ==
   dependencies:
     globals "^13.20.0"
 
@@ -5014,9 +5060,9 @@ eslint-plugin-promise@^6.1.1:
   integrity sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==
 
 "eslint-plugin-react-hooks@^4.5.0 || 5.0.0-canary-7118f5dd7-20230705":
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3"
-  integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz#c829eb06c0e6f484b3fbb85a97e57784f328c596"
+  integrity sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==
 
 eslint-plugin-react@^7.33.2:
   version "7.34.1"
@@ -5595,9 +5641,9 @@ get-symbol-description@^1.0.2:
     get-intrinsic "^1.2.4"
 
 get-tsconfig@^4.5.0:
-  version "4.7.3"
-  resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.7.3.tgz#0498163d98f7b58484dd4906999c0c9d5f103f83"
-  integrity sha512-ZvkrzoUA0PQZM6fy6+/Hce561s+faD1rsNwhnO5FelNjyy7EMGJ3Rz1AQ8GYDWjhRs/7dBLOEJvhK8MiEJOAFg==
+  version "4.7.5"
+  resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.7.5.tgz#5e012498579e9a6947511ed0cd403272c7acbbaf"
+  integrity sha512-ZCuZCnlqNzjb4QprAzXKdpp/gh6KTxSJuw3IBsPnV/7fV4NxC9ckB+vPTt8w7fJA0TaSD7c55BR47JD6MEDyDw==
   dependencies:
     resolve-pkg-maps "^1.0.0"
 
@@ -5699,11 +5745,12 @@ globals@^13.19.0, globals@^13.20.0:
     type-fest "^0.20.2"
 
 globalthis@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
-  integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236"
+  integrity sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==
   dependencies:
-    define-properties "^1.1.3"
+    define-properties "^1.2.1"
+    gopd "^1.0.1"
 
 globby@10.0.1:
   version "10.0.1"
@@ -6015,10 +6062,10 @@ intl-messageformat-parser@^5.3.7:
   dependencies:
     "@formatjs/intl-numberformat" "^5.5.2"
 
-intl-messageformat@10.5.11:
-  version "10.5.11"
-  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.5.11.tgz#95d6a3b0b303f924d5d8c3f8d3ad057d1dc73c64"
-  integrity sha512-eYq5fkFBVxc7GIFDzpFQkDOZgNayNTQn4Oufe8jw6YY6OHVw70/4pA3FyCsQ0Gb2DnvEJEMmN2tOaXUGByM+kg==
+intl-messageformat@10.5.12:
+  version "10.5.12"
+  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.5.12.tgz#a0c1a20da896b7a1f4ba1b59c8ba5d9943c29c3f"
+  integrity sha512-izl0uxhy/melhw8gP2r8pGiVieviZmM4v5Oqx3c1/R7g9cwER2smmGfSjcIsp8Y3Q53bfciL/gkxacJRx/dUvg==
   dependencies:
     "@formatjs/ecma402-abstract" "1.18.2"
     "@formatjs/fast-memoize" "2.2.0"
@@ -6026,9 +6073,9 @@ intl-messageformat@10.5.11:
     tslib "^2.4.0"
 
 ipaddr.js@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.1.0.tgz#2119bc447ff8c257753b196fc5f1ce08a4cdf39f"
-  integrity sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.2.0.tgz#d33fa7bac284f4de7af949638c9d68157c6b92e8"
+  integrity sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==
 
 is-array-buffer@^3.0.4:
   version "3.0.4"
@@ -6320,9 +6367,9 @@ isarray@^2.0.5:
   integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
 
 isbot@^5.1.1:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/isbot/-/isbot-5.1.4.tgz#3123c0fbf98ae867dc74ab95e47a809c13621a82"
-  integrity sha512-KuqD/TAG/qtgCDnO8Ab1v5rGRK3jl9hb+2KfJt+roIPE7R4Hiq99VinR0qrLGFptdUNIkClYjuXEpVTGkD9V/A==
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/isbot/-/isbot-5.1.6.tgz#579a48515e92a3e064da63a41709815d8e641a30"
+  integrity sha512-Phksj1A0dBP/M/5xeOx0zWemKlZRQvrbNzI19/HWso0uodiOcR8YYCXN60IdzwbKsGj5LnxPkMy6FuBtgckMNw==
 
 isexe@^2.0.0:
   version "2.0.0"
@@ -7237,9 +7284,9 @@ lower-case@^2.0.2:
     tslib "^2.0.3"
 
 lru-cache@^10.2.0:
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3"
-  integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==
+  version "10.2.2"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.2.tgz#48206bc114c1252940c41b25b41af5b545aca878"
+  integrity sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==
 
 lru-cache@^5.1.1:
   version "5.1.1"
@@ -7304,12 +7351,12 @@ mathml-tag-names@^2.1.3:
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
 maxmind@^4.3.6:
-  version "4.3.18"
-  resolved "https://registry.yarnpkg.com/maxmind/-/maxmind-4.3.18.tgz#ad83f38d718ca5395c5d722933a109b7cb009226"
-  integrity sha512-5b9utU7ZxcGYTBaO7hCF0FXyfw3IpankLn+FnLW4RZS1zi97RBeSdfXJFJlk5UxNsMiFZlsdMT3lzvD+bD8MLQ==
+  version "4.3.19"
+  resolved "https://registry.yarnpkg.com/maxmind/-/maxmind-4.3.19.tgz#da97391185b41373961685419f0f12dfd7b97ff9"
+  integrity sha512-Bu/VEN7ZWAOCjifdZaXJQuN6/yO7+OK35pnJsqmz8sOndK3KQFvJoY+6HX09/MmLLqtCfa+sMK0iaQOaTejGNA==
   dependencies:
     mmdb-lib "2.1.0"
-    tiny-lru "11.2.5"
+    tiny-lru "11.2.6"
 
 md5@^2.3.0:
   version "2.3.0"
@@ -7480,9 +7527,9 @@ minipass@^5.0.0:
   integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
 
 "minipass@^5.0.0 || ^6.0.2 || ^7.0.0":
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
-  integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.1.tgz#f7f85aff59aa22f110b20e27692465cf3bf89481"
+  integrity sha512-UZ7eQ+h8ywIRAW1hIEl2AqdwzJucU/Kp59+8kkZeSvafXhZjul247BvIJjEVFVeON6d7lM46XX1HXCduKAS8VA==
 
 minizlib@^2.1.1:
   version "2.1.2"
@@ -7916,9 +7963,9 @@ path-parse@^1.0.7:
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-scurry@^1.10.1:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.2.tgz#8f6357eb1239d5fa1da8b9f70e9c080675458ba7"
-  integrity sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.0.tgz#332d64e9726bf667fb348e5a1c71005c09ad741a"
+  integrity sha512-LNHTaVkzaYaLGlO+0u3rQTz7QrHTFOuKyba9JMTQutkmtNew8dw8wOD7mTU/5fCPZzCWpfW0XnQKzY61P0aTaw==
   dependencies:
     lru-cache "^10.2.0"
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
@@ -8737,12 +8784,12 @@ react-beautiful-dnd@^13.1.0:
     use-memo-one "^1.1.1"
 
 react-dom@^18.2.0:
-  version "18.2.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d"
-  integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==
+  version "18.3.1"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.3.1.tgz#c2265d79511b57d479b3dd3fdfa51536494c5cb4"
+  integrity sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==
   dependencies:
     loose-envify "^1.1.0"
-    scheduler "^0.23.0"
+    scheduler "^0.23.2"
 
 react-error-boundary@^4.0.4:
   version "4.0.13"
@@ -8757,19 +8804,19 @@ react-hook-form@^7.34.2:
   integrity sha512-F/TroLjTICipmHeFlMrLtNLceO2xr1jU3CyiNla5zdwsGUGu2UOxxR4UyJgLlhMwLW/Wzp4cpJ7CPfgJIeKdSg==
 
 react-intl@^6.5.5:
-  version "6.6.5"
-  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-6.6.5.tgz#3dee5c4a9f866aebc8384a540a6d132a3fc694eb"
-  integrity sha512-OErDPbGqus0QKVj77MGCC9Plbnys3CDQrq6Lw41c60pmeTdn41AhoS1SIzXG6SUlyF7qNN2AVqfrrIvHUgSyLQ==
+  version "6.6.6"
+  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-6.6.6.tgz#67979f790263c5ebd95b6ea581110eea3e7b550f"
+  integrity sha512-dKXQNUrhZTlCp8uelYW8PHiM4saNKyLmHCfsJYWK0N/kZ/Ien35wjPHB8x9yQcTJbeN/hBOmb4x16iKUrdL9MA==
   dependencies:
     "@formatjs/ecma402-abstract" "1.18.2"
     "@formatjs/icu-messageformat-parser" "2.7.6"
-    "@formatjs/intl" "2.10.1"
+    "@formatjs/intl" "2.10.2"
     "@formatjs/intl-displaynames" "6.6.6"
     "@formatjs/intl-listformat" "7.5.5"
     "@types/hoist-non-react-statics" "^3.3.1"
     "@types/react" "16 || 17 || 18"
     hoist-non-react-statics "^3.3.2"
-    intl-messageformat "10.5.11"
+    intl-messageformat "10.5.12"
     tslib "^2.4.0"
 
 react-is@^16.13.1, react-is@^16.7.0:
@@ -8825,9 +8872,9 @@ react-window@^1.8.6:
     memoize-one ">=3.1.1 <6"
 
 react@^18.2.0:
-  version "18.2.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"
-  integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==
+  version "18.3.1"
+  resolved "https://registry.yarnpkg.com/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891"
+  integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==
   dependencies:
     loose-envify "^1.1.0"
 
@@ -9243,10 +9290,10 @@ safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-scheduler@^0.23.0:
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe"
-  integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==
+scheduler@^0.23.2:
+  version "0.23.2"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.2.tgz#414ba64a3b282892e944cf2108ecc078d115cdc3"
+  integrity sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==
   dependencies:
     loose-envify "^1.1.0"
 
@@ -9279,13 +9326,18 @@ semver@^6.0.0, semver@^6.3.0, semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.4, semver@^7.3.7, semver@^7.5.3, semver@^7.5.4:
+semver@^7.3.4, semver@^7.3.7:
   version "7.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
   integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
   dependencies:
     lru-cache "^6.0.0"
 
+semver@^7.5.3, semver@^7.5.4:
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13"
+  integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==
+
 serialize-javascript@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
@@ -9914,10 +9966,10 @@ tiny-invariant@^1.0.6:
   resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.1.tgz#8560808c916ef02ecfd55e66090df23a4b7aa642"
   integrity sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==
 
-tiny-lru@11.2.5:
-  version "11.2.5"
-  resolved "https://registry.yarnpkg.com/tiny-lru/-/tiny-lru-11.2.5.tgz#b138b99022aa26c567fa51a8dbf9e3e2959b2b30"
-  integrity sha512-JpqM0K33lG6iQGKiigcwuURAKZlq6rHXfrgeL4/I8/REoyJTGU+tEMszvT/oTRVHG2OiylhGDjqPp1jWMlr3bw==
+tiny-lru@11.2.6:
+  version "11.2.6"
+  resolved "https://registry.yarnpkg.com/tiny-lru/-/tiny-lru-11.2.6.tgz#86a4fd0ad615eac1639adf92010e8b944e209fdb"
+  integrity sha512-0PU3c9PjMnltZaFo2sGYv/nnJsMjG0Cxx8X6FXHPPGjFyoo1SJDxvUXW1207rdiSxYizf31roo+GrkIByQeZoA==
 
 tmp@~0.2.1:
   version "0.2.3"
@@ -9954,9 +10006,9 @@ toposort@^2.0.2:
   integrity sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==
 
 tough-cookie@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"
-  integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.4.tgz#945f1461b45b5a8c76821c33ea49c3ac192c1b36"
+  integrity sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==
   dependencies:
     psl "^1.1.33"
     punycode "^2.1.1"
@@ -10149,9 +10201,9 @@ typescript@^4.0, typescript@^4.5:
   integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
 typescript@^5.4.3:
-  version "5.4.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.4.tgz#eb2471e7b0a5f1377523700a21669dce30c2d952"
-  integrity sha512-dGE2Vv8cpVvw28v8HCPqyb08EzbBURxDpuhJvTrusShUfGnhHBafDsLdS1EhhxyL6BJQE+2cT3dDPAv+MQ6oLw==
+  version "5.4.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
+  integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==
 
 unbox-primitive@^1.0.2:
   version "1.0.2"

From b911fecd8b73162bae1699ba0cb0064f0cbf7c54 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Sat, 11 May 2024 22:03:41 -0700
Subject: [PATCH 063/438] Updated packages.

---
 package.json |   8 +-
 yarn.lock    | 232 ++++++++++++++++++++++++++-------------------------
 2 files changed, 123 insertions(+), 117 deletions(-)

diff --git a/package.json b/package.json
index 3d5b74ae2e..be5bb5ac00 100644
--- a/package.json
+++ b/package.json
@@ -64,9 +64,9 @@
     ".next/cache"
   ],
   "dependencies": {
-    "@clickhouse/client": "^0.2.2",
+    "@clickhouse/client": "^1.0.1",
     "@fontsource/inter": "^4.5.15",
-    "@prisma/client": "5.12.1",
+    "@prisma/client": "5.13.0",
     "@prisma/extension-read-replicas": "^0.3.0",
     "@react-spring/web": "^9.7.3",
     "@tanstack/react-query": "^5.28.6",
@@ -98,11 +98,11 @@
     "maxmind": "^4.3.6",
     "md5": "^2.3.0",
     "moment-timezone": "^0.5.35",
-    "next": "14.1.4",
+    "next": "14.2.3",
     "next-basics": "^0.39.0",
     "node-fetch": "^3.2.8",
     "npm-run-all": "^4.1.5",
-    "prisma": "5.12.1",
+    "prisma": "5.13.0",
     "react": "^18.2.0",
     "react-basics": "^0.123.0",
     "react-beautiful-dnd": "^13.1.0",
diff --git a/yarn.lock b/yarn.lock
index c4efa40993..80b8e4542f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1206,17 +1206,17 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@clickhouse/client-common@0.2.10":
-  version "0.2.10"
-  resolved "https://registry.yarnpkg.com/@clickhouse/client-common/-/client-common-0.2.10.tgz#62f454d2cc2ee27a325034a2cca47c6f5c90d22e"
-  integrity sha512-BvTY0IXS96y9RUeNCpKL4HUzHmY80L0lDcGN0lmUD6zjOqYMn78+xyHYJ/AIAX7JQsc+/KwFt2soZutQTKxoGQ==
+"@clickhouse/client-common@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@clickhouse/client-common/-/client-common-1.0.1.tgz#c7dde5eafaad8189649373ecc23354c7a32847b3"
+  integrity sha512-3L6e0foP6VOktScoi6XWMjJyOpKCWgLUYgPVxP2c7gm6Kotq+iRmmmXtXTSg7B7uozcLZycTtPfIw2d80SYsYw==
 
-"@clickhouse/client@^0.2.2":
-  version "0.2.10"
-  resolved "https://registry.yarnpkg.com/@clickhouse/client/-/client-0.2.10.tgz#519561f3a4fff837bb606c52abfe74e5e7e9abb3"
-  integrity sha512-ZwBgzjEAFN/ogS0ym5KHVbR7Hx/oYCX01qGp2baEyfN2HM73kf/7Vp3GvMHWRy+zUXISONEtFv7UTViOXnmFrg==
+"@clickhouse/client@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@clickhouse/client/-/client-1.0.1.tgz#364db28d9ef9beaf19104f962c2b06090cb10468"
+  integrity sha512-fluUNnE2R7COJ6rn6DorYfi4D+AQn3t2qeBtEq37bQV3pD4EbKrBfKAwJ13e1lmMWdQ2B9bJUTMqGsRIDdWhJw==
   dependencies:
-    "@clickhouse/client-common" "0.2.10"
+    "@clickhouse/client-common" "1.0.1"
 
 "@colors/colors@1.5.0":
   version "1.5.0"
@@ -2006,10 +2006,10 @@
   resolved "https://registry.yarnpkg.com/@netlify/plugin-nextjs/-/plugin-nextjs-5.2.2.tgz#3c283d335001f9e0fbcb4db75557e5fe1660db72"
   integrity sha512-jV/P7o8+v1XaEGb7wvFfkF1fSLggAxjg7WYoBPkD3R93bsI6xmCDKBcUJ/6g7lqECRXt4dGKApSFtGk/pUmAHw==
 
-"@next/env@14.1.4":
-  version "14.1.4"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-14.1.4.tgz#432e80651733fbd67230bf262aee28be65252674"
-  integrity sha512-e7X7bbn3Z6DWnDi75UWn+REgAbLEqxI8Tq2pkFOFAMpWAWApz/YCUhtWMWn410h8Q2fYiYL7Yg5OlxMOCfFjJQ==
+"@next/env@14.2.3":
+  version "14.2.3"
+  resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.3.tgz#d6def29d1c763c0afb397343a15a82e7d92353a0"
+  integrity sha512-W7fd7IbkfmeeY2gXrzJYDx8D2lWKbVoTIj1o1ScPHNzvp30s1AuoEFSdr39bC5sjxJaxTtq3OTCZboNp0lNWHA==
 
 "@next/eslint-plugin-next@14.2.3":
   version "14.2.3"
@@ -2018,50 +2018,50 @@
   dependencies:
     glob "10.3.10"
 
-"@next/swc-darwin-arm64@14.1.4":
-  version "14.1.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.1.4.tgz#a3bca0dc4393ac4cf3169bbf24df63441de66bb7"
-  integrity sha512-ubmUkbmW65nIAOmoxT1IROZdmmJMmdYvXIe8211send9ZYJu+SqxSnJM4TrPj9wmL6g9Atvj0S/2cFmMSS99jg==
-
-"@next/swc-darwin-x64@14.1.4":
-  version "14.1.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.1.4.tgz#ba3683d4e2d30099f3f2864dd7349a4d9f440140"
-  integrity sha512-b0Xo1ELj3u7IkZWAKcJPJEhBop117U78l70nfoQGo4xUSvv0PJSTaV4U9xQBLvZlnjsYkc8RwQN1HoH/oQmLlQ==
-
-"@next/swc-linux-arm64-gnu@14.1.4":
-  version "14.1.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.1.4.tgz#3519969293f16379954b7e196deb0c1eecbb2f8b"
-  integrity sha512-457G0hcLrdYA/u1O2XkRMsDKId5VKe3uKPvrKVOyuARa6nXrdhJOOYU9hkKKyQTMru1B8qEP78IAhf/1XnVqKA==
-
-"@next/swc-linux-arm64-musl@14.1.4":
-  version "14.1.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.1.4.tgz#4bb3196bd402b3f84cf5373ff1021f547264d62f"
-  integrity sha512-l/kMG+z6MB+fKA9KdtyprkTQ1ihlJcBh66cf0HvqGP+rXBbOXX0dpJatjZbHeunvEHoBBS69GYQG5ry78JMy3g==
-
-"@next/swc-linux-x64-gnu@14.1.4":
-  version "14.1.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.1.4.tgz#1b3372c98c83dcdab946cdb4ee06e068b8139ba3"
-  integrity sha512-BapIFZ3ZRnvQ1uWbmqEGJuPT9cgLwvKtxhK/L2t4QYO7l+/DxXuIGjvp1x8rvfa/x1FFSsipERZK70pewbtJtw==
-
-"@next/swc-linux-x64-musl@14.1.4":
-  version "14.1.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.1.4.tgz#8459088bdc872648ff78f121db596f2533df5808"
-  integrity sha512-mqVxTwk4XuBl49qn2A5UmzFImoL1iLm0KQQwtdRJRKl21ylQwwGCxJtIYo2rbfkZHoSKlh/YgztY0qH3wG1xIg==
-
-"@next/swc-win32-arm64-msvc@14.1.4":
-  version "14.1.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.1.4.tgz#84280a08c00cc3be24ddd3a12f4617b108e6dea6"
-  integrity sha512-xzxF4ErcumXjO2Pvg/wVGrtr9QQJLk3IyQX1ddAC/fi6/5jZCZ9xpuL9Tzc4KPWMFq8GGWFVDMshZOdHGdkvag==
-
-"@next/swc-win32-ia32-msvc@14.1.4":
-  version "14.1.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.1.4.tgz#23ff7f4bd0a27177428669ef6fa5c3923c738031"
-  integrity sha512-WZiz8OdbkpRw6/IU/lredZWKKZopUMhcI2F+XiMAcPja0uZYdMTZQRoQ0WZcvinn9xZAidimE7tN9W5v9Yyfyw==
-
-"@next/swc-win32-x64-msvc@14.1.4":
-  version "14.1.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.1.4.tgz#bccf5beccfde66d6c66fa4e2509118c796385eda"
-  integrity sha512-4Rto21sPfw555sZ/XNLqfxDUNeLhNYGO2dlPqsnuCg8N8a2a9u1ltqBOPQ4vj1Gf7eJC0W2hHG2eYUHuiXgY2w==
+"@next/swc-darwin-arm64@14.2.3":
+  version "14.2.3"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.3.tgz#db1a05eb88c0224089b815ad10ac128ec79c2cdb"
+  integrity sha512-3pEYo/RaGqPP0YzwnlmPN2puaF2WMLM3apt5jLW2fFdXD9+pqcoTzRk+iZsf8ta7+quAe4Q6Ms0nR0SFGFdS1A==
+
+"@next/swc-darwin-x64@14.2.3":
+  version "14.2.3"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.3.tgz#a3f8af05b5f9a52ac3082e66ac29e125ab1d7b9c"
+  integrity sha512-6adp7waE6P1TYFSXpY366xwsOnEXM+y1kgRpjSRVI2CBDOcbRjsJ67Z6EgKIqWIue52d2q/Mx8g9MszARj8IEA==
+
+"@next/swc-linux-arm64-gnu@14.2.3":
+  version "14.2.3"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.3.tgz#4e63f43879285b52554bfd39e6e0cc78a9b27bbf"
+  integrity sha512-cuzCE/1G0ZSnTAHJPUT1rPgQx1w5tzSX7POXSLaS7w2nIUJUD+e25QoXD/hMfxbsT9rslEXugWypJMILBj/QsA==
+
+"@next/swc-linux-arm64-musl@14.2.3":
+  version "14.2.3"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.3.tgz#ebdaed26214448b1e6f2c3e8b3cd29bfba387990"
+  integrity sha512-0D4/oMM2Y9Ta3nGuCcQN8jjJjmDPYpHX9OJzqk42NZGJocU2MqhBq5tWkJrUQOQY9N+In9xOdymzapM09GeiZw==
+
+"@next/swc-linux-x64-gnu@14.2.3":
+  version "14.2.3"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.3.tgz#19e3bcc137c3b582a1ab867106817e5c90a20593"
+  integrity sha512-ENPiNnBNDInBLyUU5ii8PMQh+4XLr4pG51tOp6aJ9xqFQ2iRI6IH0Ds2yJkAzNV1CfyagcyzPfROMViS2wOZ9w==
+
+"@next/swc-linux-x64-musl@14.2.3":
+  version "14.2.3"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.3.tgz#794a539b98e064169cf0ff7741b2a4fb16adec7d"
+  integrity sha512-BTAbq0LnCbF5MtoM7I/9UeUu/8ZBY0i8SFjUMCbPDOLv+un67e2JgyN4pmgfXBwy/I+RHu8q+k+MCkDN6P9ViQ==
+
+"@next/swc-win32-arm64-msvc@14.2.3":
+  version "14.2.3"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.3.tgz#eda9fa0fbf1ff9113e87ac2668ee67ce9e5add5a"
+  integrity sha512-AEHIw/dhAMLNFJFJIJIyOFDzrzI5bAjI9J26gbO5xhAKHYTZ9Or04BesFPXiAYXDNdrwTP2dQceYA4dL1geu8A==
+
+"@next/swc-win32-ia32-msvc@14.2.3":
+  version "14.2.3"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.3.tgz#7c1190e3f640ab16580c6bdbd7d0e766b9920457"
+  integrity sha512-vga40n1q6aYb0CLrM+eEmisfKCR45ixQYXuBXxOOmmoV8sYST9k7E3US32FsY+CkkF7NtzdcebiFT4CHuMSyZw==
+
+"@next/swc-win32-x64-msvc@14.2.3":
+  version "14.2.3"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.3.tgz#2be4e39ee25bfbd85be78eea17c0e7751dc4323c"
+  integrity sha512-Q1/zm43RWynxrO7lW4ehciQVj+5ePBhOK+/K2P7pLFX3JaJ/IZVC69SHidrmZSOkqz7ECIOhhy7XhAFG4JYyHA==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
@@ -2089,51 +2089,51 @@
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
   integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
 
-"@prisma/client@5.12.1":
-  version "5.12.1"
-  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.12.1.tgz#c26a674fea76754b3a9e8b90a11e617f90212f76"
-  integrity sha512-6/JnizEdlSBxDIdiLbrBdMW5NqDxOmhXAJaNXiPpgzAPr/nLZResT6MMpbOHLo5yAbQ1Vv5UU8PTPRzb0WIxdA==
+"@prisma/client@5.13.0":
+  version "5.13.0"
+  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.13.0.tgz#b9f1d0983d714e982675201d8222a9ecb4bdad4a"
+  integrity sha512-uYdfpPncbZ/syJyiYBwGZS8Gt1PTNoErNYMuqHDa2r30rNSFtgTA/LXsSk55R7pdRTMi5pHkeP9B14K6nHmwkg==
 
-"@prisma/debug@5.12.1":
-  version "5.12.1"
-  resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.12.1.tgz#007c8ad2e466d565bcd0671b8846c27f8700c722"
-  integrity sha512-kd/wNsR0klrv79o1ITsbWxYyh4QWuBidvxsXSParPsYSu0ircUmNk3q4ojsgNc3/81b0ozg76iastOG43tbf8A==
+"@prisma/debug@5.13.0":
+  version "5.13.0"
+  resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.13.0.tgz#d88b0f6fafa0c216e20e284ed9fc30f1cbe45786"
+  integrity sha512-699iqlEvzyCj9ETrXhs8o8wQc/eVW+FigSsHpiskSFydhjVuwTJEfj/nIYqTaWFYuxiWQRfm3r01meuW97SZaQ==
 
-"@prisma/engines-version@5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab":
-  version "5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab"
-  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab.tgz#c78d099a3fe86d446db7442e64e56987e39e7f32"
-  integrity sha512-6yvO8s80Tym61aB4QNtYZfWVmE3pwqe807jEtzm8C5VDe7nw8O1FGX3TXUaXmWV0fQTIAfRbeL2Gwrndabp/0g==
+"@prisma/engines-version@5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b":
+  version "5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b"
+  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b.tgz#a72a4fb83ba1fd01ad45f795aa55168f60d34723"
+  integrity sha512-AyUuhahTINGn8auyqYdmxsN+qn0mw3eg+uhkp8zwknXYIqoT3bChG4RqNY/nfDkPvzWAPBa9mrDyBeOnWSgO6A==
 
-"@prisma/engines@5.12.1":
-  version "5.12.1"
-  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.12.1.tgz#a50649427d627a9af962a188a84c65d61c6e2b3f"
-  integrity sha512-HQDdglLw2bZR/TXD2Y+YfDMvi5Q8H+acbswqOsWyq9pPjBLYJ6gzM+ptlTU/AV6tl0XSZLU1/7F4qaWa8bqpJA==
+"@prisma/engines@5.13.0":
+  version "5.13.0"
+  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.13.0.tgz#8994ebf7b4e35aee7746a8465ec22738379bcab6"
+  integrity sha512-hIFLm4H1boj6CBZx55P4xKby9jgDTeDG0Jj3iXtwaaHmlD5JmiDkZhh8+DYWkTGchu+rRF36AVROLnk0oaqhHw==
   dependencies:
-    "@prisma/debug" "5.12.1"
-    "@prisma/engines-version" "5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab"
-    "@prisma/fetch-engine" "5.12.1"
-    "@prisma/get-platform" "5.12.1"
+    "@prisma/debug" "5.13.0"
+    "@prisma/engines-version" "5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b"
+    "@prisma/fetch-engine" "5.13.0"
+    "@prisma/get-platform" "5.13.0"
 
 "@prisma/extension-read-replicas@^0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/@prisma/extension-read-replicas/-/extension-read-replicas-0.3.0.tgz#2842a7c928f957c1dd58a6256104797596d43426"
   integrity sha512-F9+rSmYday6GT2qjhJtkZcBOpLO5LtpvFcMGqrBDHf+78LEdSuxfFjOxYlNuqk4B+th62yxpbhfpmB9/Mca14Q==
 
-"@prisma/fetch-engine@5.12.1":
-  version "5.12.1"
-  resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.12.1.tgz#c38e9fa17fdc535b4c83cbb7645569ad0a511fa9"
-  integrity sha512-qSs3KcX1HKcea1A+hlJVK/ljj0PNIUHDxAayGMvgJBqmaN32P9tCidlKz1EGv6WoRFICYnk3Dd/YFLBwnFIozA==
+"@prisma/fetch-engine@5.13.0":
+  version "5.13.0"
+  resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.13.0.tgz#9b6945c7b38bb59e840f8905b20ea7a3d059ca55"
+  integrity sha512-Yh4W+t6YKyqgcSEB3odBXt7QyVSm0OQlBSldQF2SNXtmOgMX8D7PF/fvH6E6qBCpjB/yeJLy/FfwfFijoHI6sA==
   dependencies:
-    "@prisma/debug" "5.12.1"
-    "@prisma/engines-version" "5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab"
-    "@prisma/get-platform" "5.12.1"
+    "@prisma/debug" "5.13.0"
+    "@prisma/engines-version" "5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b"
+    "@prisma/get-platform" "5.13.0"
 
-"@prisma/get-platform@5.12.1":
-  version "5.12.1"
-  resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.12.1.tgz#33f427f6d744dee62a9e06858889691d78b50804"
-  integrity sha512-pgIR+pSvhYHiUcqXVEZS31NrFOTENC9yFUdEAcx7cdQBoZPmHVjtjN4Ss6NzVDMYPrKJJ51U14EhEoeuBlMioQ==
+"@prisma/get-platform@5.13.0":
+  version "5.13.0"
+  resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.13.0.tgz#99ef909a52b9d79b64d72d2d3d8210c4892b6572"
+  integrity sha512-B/WrQwYTzwr7qCLifQzYOmQhZcFmIFhR81xC45gweInSUn2hTEbfKUPd2keAog+y5WI5xLAFNJ3wkXplvSVkSw==
   dependencies:
-    "@prisma/debug" "5.12.1"
+    "@prisma/debug" "5.13.0"
 
 "@react-spring/animated@~9.7.3":
   version "9.7.3"
@@ -2417,11 +2417,17 @@
     "@svgr/plugin-jsx" "8.1.0"
     "@svgr/plugin-svgo" "8.1.0"
 
-"@swc/helpers@0.5.2":
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.2.tgz#85ea0c76450b61ad7d10a37050289eded783c27d"
-  integrity sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw==
+"@swc/counter@^0.1.3":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@swc/counter/-/counter-0.1.3.tgz#cc7463bd02949611c6329596fccd2b0ec782b0e9"
+  integrity sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==
+
+"@swc/helpers@0.5.5":
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.5.tgz#12689df71bfc9b21c4f4ca00ae55f2f16c8b77c0"
+  integrity sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==
   dependencies:
+    "@swc/counter" "^0.1.3"
     tslib "^2.4.0"
 
 "@tanstack/query-core@5.35.5":
@@ -7595,28 +7601,28 @@ next-basics@^0.39.0:
     jsonwebtoken "^9.0.0"
     pure-rand "^6.0.2"
 
-next@14.1.4:
-  version "14.1.4"
-  resolved "https://registry.yarnpkg.com/next/-/next-14.1.4.tgz#203310f7310578563fd5c961f0db4729ce7a502d"
-  integrity sha512-1WTaXeSrUwlz/XcnhGTY7+8eiaFvdet5z9u3V2jb+Ek1vFo0VhHKSAIJvDWfQpttWjnyw14kBeq28TPq7bTeEQ==
+next@14.2.3:
+  version "14.2.3"
+  resolved "https://registry.yarnpkg.com/next/-/next-14.2.3.tgz#f117dd5d5f20c307e7b8e4f9c1c97d961008925d"
+  integrity sha512-dowFkFTR8v79NPJO4QsBUtxv0g9BrS/phluVpMAt2ku7H+cbcBJlopXjkWlwxrk/xGqMemr7JkGPGemPrLLX7A==
   dependencies:
-    "@next/env" "14.1.4"
-    "@swc/helpers" "0.5.2"
+    "@next/env" "14.2.3"
+    "@swc/helpers" "0.5.5"
     busboy "1.6.0"
     caniuse-lite "^1.0.30001579"
     graceful-fs "^4.2.11"
     postcss "8.4.31"
     styled-jsx "5.1.1"
   optionalDependencies:
-    "@next/swc-darwin-arm64" "14.1.4"
-    "@next/swc-darwin-x64" "14.1.4"
-    "@next/swc-linux-arm64-gnu" "14.1.4"
-    "@next/swc-linux-arm64-musl" "14.1.4"
-    "@next/swc-linux-x64-gnu" "14.1.4"
-    "@next/swc-linux-x64-musl" "14.1.4"
-    "@next/swc-win32-arm64-msvc" "14.1.4"
-    "@next/swc-win32-ia32-msvc" "14.1.4"
-    "@next/swc-win32-x64-msvc" "14.1.4"
+    "@next/swc-darwin-arm64" "14.2.3"
+    "@next/swc-darwin-x64" "14.2.3"
+    "@next/swc-linux-arm64-gnu" "14.2.3"
+    "@next/swc-linux-arm64-musl" "14.2.3"
+    "@next/swc-linux-x64-gnu" "14.2.3"
+    "@next/swc-linux-x64-musl" "14.2.3"
+    "@next/swc-win32-arm64-msvc" "14.2.3"
+    "@next/swc-win32-ia32-msvc" "14.2.3"
+    "@next/swc-win32-x64-msvc" "14.2.3"
 
 nice-try@^1.0.4:
   version "1.0.5"
@@ -8653,12 +8659,12 @@ pretty-format@^29.0.0, pretty-format@^29.7.0:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
-prisma@5.12.1:
-  version "5.12.1"
-  resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.12.1.tgz#db4596253bb066afc9f08744642f200a398d8d51"
-  integrity sha512-SkMnb6wyIxTv9ACqiHBI2u9gD6y98qXRoCoLEnZsF6yee5Qg828G+ARrESN+lQHdw4maSZFFSBPPDpvSiVTo0Q==
+prisma@5.13.0:
+  version "5.13.0"
+  resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.13.0.tgz#1f06e20ccfb6038ad68869e6eacd3b346f9d0851"
+  integrity sha512-kGtcJaElNRAdAGsCNykFSZ7dBKpL14Cbs+VaQ8cECxQlRPDjBlMHNFYeYt0SKovAVy2Y65JXQwB3A5+zIQwnTg==
   dependencies:
-    "@prisma/engines" "5.12.1"
+    "@prisma/engines" "5.13.0"
 
 process@^0.11.10:
   version "0.11.10"

From 98a0a83ccf928d31ce9c49303a91177e93861b4f Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Sun, 12 May 2024 23:15:49 -0700
Subject: [PATCH 064/438] Updated handling of env vars.

---
 next.config.js                                | 26 +++++++++----------
 src/app/(main)/App.tsx                        |  2 +-
 src/app/(main)/console/TestConsole.tsx        |  2 +-
 .../realtime/RealtimeCountries.tsx            |  2 +-
 src/components/hooks/useCountryNames.ts       |  2 +-
 src/components/hooks/useLanguageNames.ts      |  2 +-
 src/components/hooks/useLocale.ts             |  4 ++-
 src/components/metrics/BrowsersTable.tsx      |  2 +-
 src/components/metrics/CitiesTable.tsx        |  2 +-
 src/components/metrics/CountriesTable.tsx     |  2 +-
 src/components/metrics/DevicesTable.tsx       |  4 ++-
 src/components/metrics/RegionsTable.tsx       |  2 +-
 src/components/metrics/WorldMap.tsx           |  2 +-
 13 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/next.config.js b/next.config.js
index 8a0c6569b4..92b66943d1 100644
--- a/next.config.js
+++ b/next.config.js
@@ -3,19 +3,19 @@ require('dotenv').config();
 const path = require('path');
 const pkg = require('./package.json');
 
-const basePath = process.env.BASE_PATH || '';
-const collectApiEndpoint = process.env.COLLECT_API_ENDPOINT || '';
-const cloudMode = process.env.CLOUD_MODE || '';
-const cloudUrl = process.env.CLOUD_URL || '';
-const defaultLocale = process.env.DEFAULT_LOCALE || '';
-const disableLogin = process.env.DISABLE_LOGIN || '';
-const disableUI = process.env.DISABLE_UI || '';
-const forceSSL = process.env.FORCE_SSL || '';
-const frameAncestors = process.env.ALLOWED_FRAME_URLS || '';
-const privateMode = process.env.PRIVATE_MODE || '';
-const shareUrlHost = process.env.SHARE_HOST_URL || '';
-const trackerScriptHost = process.env.TRACKER_SCRIPT_HOST || '';
-const trackerScriptName = process.env.TRACKER_SCRIPT_NAME || '';
+const basePath = process.env.BASE_PATH;
+const collectApiEndpoint = process.env.COLLECT_API_ENDPOINT;
+const cloudMode = process.env.CLOUD_MODE;
+const cloudUrl = process.env.CLOUD_URL;
+const defaultLocale = process.env.DEFAULT_LOCALE;
+const disableLogin = process.env.DISABLE_LOGIN;
+const disableUI = process.env.DISABLE_UI;
+const forceSSL = process.env.FORCE_SSL;
+const frameAncestors = process.env.ALLOWED_FRAME_URLS;
+const privateMode = process.env.PRIVATE_MODE;
+const shareUrlHost = process.env.SHARE_URL_HOST;
+const trackerScriptHost = process.env.TRACKER_SCRIPT_HOST;
+const trackerScriptName = process.env.TRACKER_SCRIPT_NAME;
 
 const contentSecurityPolicy = [
   `default-src 'self'`,
diff --git a/src/app/(main)/App.tsx b/src/app/(main)/App.tsx
index 406c2f1646..efb38043a0 100644
--- a/src/app/(main)/App.tsx
+++ b/src/app/(main)/App.tsx
@@ -27,7 +27,7 @@ export function App({ children }) {
       {children}
       <UpdateNotice user={user} config={config} />
       {process.env.NODE_ENV === 'production' && !pathname.includes('/share/') && (
-        <Script src={`${process.env.basePath}/telemetry.js`} />
+        <Script src={`${process.env.basePath || ''}/telemetry.js`} />
       )}
     </>
   );
diff --git a/src/app/(main)/console/TestConsole.tsx b/src/app/(main)/console/TestConsole.tsx
index 86a4792e30..37075cf987 100644
--- a/src/app/(main)/console/TestConsole.tsx
+++ b/src/app/(main)/console/TestConsole.tsx
@@ -80,7 +80,7 @@ export function TestConsole({ websiteId }: { websiteId: string }) {
           <Script
             async
             data-website-id={websiteId}
-            src={`${process.env.basePath}/script.js`}
+            src={`${process.env.basePath || ''}/script.js`}
             data-cache="true"
           />
           <div className={styles.actions}>
diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx
index 506d5733e2..2dd69146d7 100644
--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx
+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx
@@ -13,7 +13,7 @@ export function RealtimeCountries({ data }) {
     ({ x: code }) => (
       <span className={classNames(locale, styles.row)}>
         <img
-          src={`${process.env.basePath}/images/flags/${code?.toLowerCase() || 'xx'}.png`}
+          src={`${process.env.basePath || ''}/images/flags/${code?.toLowerCase() || 'xx'}.png`}
           alt={code}
         />
         {countryNames[code]}
diff --git a/src/components/hooks/useCountryNames.ts b/src/components/hooks/useCountryNames.ts
index acfada442c..17b594b6f3 100644
--- a/src/components/hooks/useCountryNames.ts
+++ b/src/components/hooks/useCountryNames.ts
@@ -10,7 +10,7 @@ export function useCountryNames(locale: string) {
   const [list, setList] = useState(countryNames[locale] || enUS);
 
   async function loadData(locale: string) {
-    const { data } = await httpGet(`${process.env.basePath}/intl/country/${locale}.json`);
+    const { data } = await httpGet(`${process.env.basePath || ''}/intl/country/${locale}.json`);
 
     if (data) {
       countryNames[locale] = data;
diff --git a/src/components/hooks/useLanguageNames.ts b/src/components/hooks/useLanguageNames.ts
index d4bfbf2fb0..276faa1499 100644
--- a/src/components/hooks/useLanguageNames.ts
+++ b/src/components/hooks/useLanguageNames.ts
@@ -10,7 +10,7 @@ export function useLanguageNames(locale) {
   const [list, setList] = useState(languageNames[locale] || enUS);
 
   async function loadData(locale) {
-    const { data } = await httpGet(`${process.env.basePath}/intl/language/${locale}.json`);
+    const { data } = await httpGet(`${process.env.basePath || ''}/intl/language/${locale}.json`);
 
     if (data) {
       languageNames[locale] = data;
diff --git a/src/components/hooks/useLocale.ts b/src/components/hooks/useLocale.ts
index 5e4e1ce841..69e7cc4170 100644
--- a/src/components/hooks/useLocale.ts
+++ b/src/components/hooks/useLocale.ts
@@ -19,7 +19,9 @@ export function useLocale() {
   const dateLocale = getDateLocale(locale);
 
   async function loadMessages(locale: string) {
-    const { ok, data } = await httpGet(`${process.env.basePath}/intl/messages/${locale}.json`);
+    const { ok, data } = await httpGet(
+      `${process.env.basePath || ''}/intl/messages/${locale}.json`,
+    );
 
     if (ok) {
       messages[locale] = data;
diff --git a/src/components/metrics/BrowsersTable.tsx b/src/components/metrics/BrowsersTable.tsx
index c0c741cf47..004b5e43a5 100644
--- a/src/components/metrics/BrowsersTable.tsx
+++ b/src/components/metrics/BrowsersTable.tsx
@@ -11,7 +11,7 @@ export function BrowsersTable(props: MetricsTableProps) {
     return (
       <FilterLink id="browser" value={browser} label={formatBrowser(browser)}>
         <img
-          src={`${process.env.basePath}/images/browsers/${browser || 'unknown'}.png`}
+          src={`${process.env.basePath || ''}/images/browsers/${browser || 'unknown'}.png`}
           alt={browser}
           width={16}
           height={16}
diff --git a/src/components/metrics/CitiesTable.tsx b/src/components/metrics/CitiesTable.tsx
index d275e65049..ee2d100510 100644
--- a/src/components/metrics/CitiesTable.tsx
+++ b/src/components/metrics/CitiesTable.tsx
@@ -20,7 +20,7 @@ export function CitiesTable(props: MetricsTableProps) {
       <FilterLink id="city" value={city} label={renderLabel(city, country)}>
         {country && (
           <img
-            src={`${process.env.basePath}/images/flags/${country?.toLowerCase() || 'xx'}.png`}
+            src={`${process.env.basePath || ''}/images/flags/${country?.toLowerCase() || 'xx'}.png`}
             alt={country}
           />
         )}
diff --git a/src/components/metrics/CountriesTable.tsx b/src/components/metrics/CountriesTable.tsx
index e38666bfd4..3e7c0af016 100644
--- a/src/components/metrics/CountriesTable.tsx
+++ b/src/components/metrics/CountriesTable.tsx
@@ -27,7 +27,7 @@ export function CountriesTable({
         label={formatCountry(code)}
       >
         <img
-          src={`${process.env.basePath}/images/flags/${code?.toLowerCase() || 'xx'}.png`}
+          src={`${process.env.basePath || ''}/images/flags/${code?.toLowerCase() || 'xx'}.png`}
           alt={code}
         />
       </FilterLink>
diff --git a/src/components/metrics/DevicesTable.tsx b/src/components/metrics/DevicesTable.tsx
index 4df331a4b6..e3db60ea00 100644
--- a/src/components/metrics/DevicesTable.tsx
+++ b/src/components/metrics/DevicesTable.tsx
@@ -11,7 +11,9 @@ export function DevicesTable(props: MetricsTableProps) {
     return (
       <FilterLink id="device" value={labels[device] && device} label={formatDevice(device)}>
         <img
-          src={`${process.env.basePath}/images/device/${device?.toLowerCase() || 'unknown'}.png`}
+          src={`${process.env.basePath || ''}/images/device/${
+            device?.toLowerCase() || 'unknown'
+          }.png`}
           alt={device}
           width={16}
           height={16}
diff --git a/src/components/metrics/RegionsTable.tsx b/src/components/metrics/RegionsTable.tsx
index 65c91f211d..6e6d7d96de 100644
--- a/src/components/metrics/RegionsTable.tsx
+++ b/src/components/metrics/RegionsTable.tsx
@@ -20,7 +20,7 @@ export function RegionsTable(props: MetricsTableProps) {
     return (
       <FilterLink id="region" className={locale} value={code} label={renderLabel(code, country)}>
         <img
-          src={`${process.env.basePath}/images/flags/${country?.toLowerCase() || 'xx'}.png`}
+          src={`${process.env.basePath || ''}/images/flags/${country?.toLowerCase() || 'xx'}.png`}
           alt={code}
         />
       </FilterLink>
diff --git a/src/components/metrics/WorldMap.tsx b/src/components/metrics/WorldMap.tsx
index 31d55dd094..27d0f57c06 100644
--- a/src/components/metrics/WorldMap.tsx
+++ b/src/components/metrics/WorldMap.tsx
@@ -54,7 +54,7 @@ export function WorldMap({ data = [], className }: { data?: any[]; className?: s
     >
       <ComposableMap projection="geoMercator">
         <ZoomableGroup zoom={0.8} minZoom={0.7} center={[0, 40]}>
-          <Geographies geography={`${process.env.basePath}${MAP_FILE}`}>
+          <Geographies geography={`${process.env.basePath || ''}${MAP_FILE}`}>
             {({ geographies }) => {
               return geographies.map(geo => {
                 const code = ISO_COUNTRIES[geo.id];

From 0014e5a649a022172bfdd2257fa315ec078cf968 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 13 May 2024 13:33:41 -0700
Subject: [PATCH 065/438] fix param names for includeTeams

---
 src/pages/api/admin/websites.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/api/admin/websites.ts b/src/pages/api/admin/websites.ts
index 8669214466..58a5958673 100644
--- a/src/pages/api/admin/websites.ts
+++ b/src/pages/api/admin/websites.ts
@@ -43,7 +43,7 @@ export default async (
       return unauthorized(res);
     }
 
-    const { userId, includeOwnedTeams } = req.query;
+    const { userId, includeTeams } = req.query;
 
     const websites = await getWebsites(
       {
@@ -51,7 +51,7 @@ export default async (
           OR: [
             ...(userId && [{ userId }]),
             ...(userId &&
-              includeOwnedTeams && [
+              includeTeams && [
                 {
                   team: {
                     deletedAt: null,

From 25dd94b551fe52b1a36dda6acd19d22a8c6c04df Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Mon, 13 May 2024 15:43:53 -0700
Subject: [PATCH 066/438] Fix usage.

---
 src/pages/api/users/[userId]/usage.ts |  4 ++--
 src/queries/admin/website.ts          | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/pages/api/users/[userId]/usage.ts b/src/pages/api/users/[userId]/usage.ts
index 66e9276884..9d2bc37eab 100644
--- a/src/pages/api/users/[userId]/usage.ts
+++ b/src/pages/api/users/[userId]/usage.ts
@@ -2,7 +2,7 @@ import { useAuth, useCors, useValidate } from 'lib/middleware';
 import { NextApiRequestQueryBody } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { getAllWebsites, getEventDataUsage, getEventUsage } from 'queries';
+import { getAllUserWebsitesIncludingTeamOwner, getEventDataUsage, getEventUsage } from 'queries';
 import * as yup from 'yup';
 
 export interface UserUsageRequestQuery {
@@ -50,7 +50,7 @@ export default async (
     const startDate = new Date(+startAt);
     const endDate = new Date(+endAt);
 
-    const websites = await getAllWebsites(userId);
+    const websites = await getAllUserWebsitesIncludingTeamOwner(userId);
 
     const websiteIds = websites.map(a => a.id);
 
diff --git a/src/queries/admin/website.ts b/src/queries/admin/website.ts
index d191aa657d..37dd5f482a 100644
--- a/src/queries/admin/website.ts
+++ b/src/queries/admin/website.ts
@@ -3,6 +3,7 @@ import redis from '@umami/redis-client';
 import prisma from 'lib/prisma';
 import { PageResult, PageParams } from 'lib/types';
 import WebsiteFindManyArgs = Prisma.WebsiteFindManyArgs;
+import { ROLES } from 'lib/constants';
 
 async function findWebsite(criteria: Prisma.WebsiteFindUniqueArgs): Promise<Website> {
   return prisma.client.website.findUnique(criteria);
@@ -52,6 +53,27 @@ export async function getAllWebsites(userId: string) {
   });
 }
 
+export async function getAllUserWebsitesIncludingTeamOwner(userId: string) {
+  return prisma.client.website.findMany({
+    where: {
+      OR: [
+        { userId },
+        {
+          team: {
+            deletedAt: null,
+            teamUser: {
+              some: {
+                role: ROLES.teamOwner,
+                userId,
+              },
+            },
+          },
+        },
+      ],
+    },
+  });
+}
+
 export async function getUserWebsites(
   userId: string,
   filters?: PageParams,

From d057b15460c93077d81aca045e51d1cdf549c17c Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Mon, 13 May 2024 15:43:53 -0700
Subject: [PATCH 067/438] Fix usage.

---
 src/pages/api/users/[userId]/usage.ts |  4 ++--
 src/queries/admin/website.ts          | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/pages/api/users/[userId]/usage.ts b/src/pages/api/users/[userId]/usage.ts
index 66e9276884..9d2bc37eab 100644
--- a/src/pages/api/users/[userId]/usage.ts
+++ b/src/pages/api/users/[userId]/usage.ts
@@ -2,7 +2,7 @@ import { useAuth, useCors, useValidate } from 'lib/middleware';
 import { NextApiRequestQueryBody } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { getAllWebsites, getEventDataUsage, getEventUsage } from 'queries';
+import { getAllUserWebsitesIncludingTeamOwner, getEventDataUsage, getEventUsage } from 'queries';
 import * as yup from 'yup';
 
 export interface UserUsageRequestQuery {
@@ -50,7 +50,7 @@ export default async (
     const startDate = new Date(+startAt);
     const endDate = new Date(+endAt);
 
-    const websites = await getAllWebsites(userId);
+    const websites = await getAllUserWebsitesIncludingTeamOwner(userId);
 
     const websiteIds = websites.map(a => a.id);
 
diff --git a/src/queries/admin/website.ts b/src/queries/admin/website.ts
index d191aa657d..37dd5f482a 100644
--- a/src/queries/admin/website.ts
+++ b/src/queries/admin/website.ts
@@ -3,6 +3,7 @@ import redis from '@umami/redis-client';
 import prisma from 'lib/prisma';
 import { PageResult, PageParams } from 'lib/types';
 import WebsiteFindManyArgs = Prisma.WebsiteFindManyArgs;
+import { ROLES } from 'lib/constants';
 
 async function findWebsite(criteria: Prisma.WebsiteFindUniqueArgs): Promise<Website> {
   return prisma.client.website.findUnique(criteria);
@@ -52,6 +53,27 @@ export async function getAllWebsites(userId: string) {
   });
 }
 
+export async function getAllUserWebsitesIncludingTeamOwner(userId: string) {
+  return prisma.client.website.findMany({
+    where: {
+      OR: [
+        { userId },
+        {
+          team: {
+            deletedAt: null,
+            teamUser: {
+              some: {
+                role: ROLES.teamOwner,
+                userId,
+              },
+            },
+          },
+        },
+      ],
+    },
+  });
+}
+
 export async function getUserWebsites(
   userId: string,
   filters?: PageParams,

From e701d6976b4cb236b46efdb2d1c79636c3166480 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 14 May 2024 09:39:04 -0700
Subject: [PATCH 068/438] update getAllwebsites, match usage query with api /
 cloud call

---
 src/pages/api/users/[userId]/usage.ts |  3 +--
 src/queries/admin/website.ts          | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/pages/api/users/[userId]/usage.ts b/src/pages/api/users/[userId]/usage.ts
index 9d2bc37eab..90cfb9ee7f 100644
--- a/src/pages/api/users/[userId]/usage.ts
+++ b/src/pages/api/users/[userId]/usage.ts
@@ -7,8 +7,7 @@ import * as yup from 'yup';
 
 export interface UserUsageRequestQuery {
   id: string;
-  startAt: string;
-  endAt: string;
+  params: { startAt: string; endAt: string };
 }
 
 export interface UserUsageRequestResponse {
diff --git a/src/queries/admin/website.ts b/src/queries/admin/website.ts
index 37dd5f482a..a3bcac7b81 100644
--- a/src/queries/admin/website.ts
+++ b/src/queries/admin/website.ts
@@ -48,7 +48,19 @@ export async function getWebsites(
 export async function getAllWebsites(userId: string) {
   return prisma.client.website.findMany({
     where: {
-      userId,
+      OR: [
+        { userId },
+        {
+          team: {
+            deletedAt: null,
+            teamUser: {
+              some: {
+                userId,
+              },
+            },
+          },
+        },
+      ],
     },
   });
 }

From 49b1d0a1252357a39620ed7688f3b89e839b1634 Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Tue, 14 May 2024 12:01:27 -0700
Subject: [PATCH 069/438] fix usage.

---
 src/pages/api/users/[userId]/usage.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pages/api/users/[userId]/usage.ts b/src/pages/api/users/[userId]/usage.ts
index 90cfb9ee7f..547de3383a 100644
--- a/src/pages/api/users/[userId]/usage.ts
+++ b/src/pages/api/users/[userId]/usage.ts
@@ -6,8 +6,9 @@ import { getAllUserWebsitesIncludingTeamOwner, getEventDataUsage, getEventUsage
 import * as yup from 'yup';
 
 export interface UserUsageRequestQuery {
-  id: string;
-  params: { startAt: string; endAt: string };
+  userId: string;
+  startAt: string;
+  endAt: string;
 }
 
 export interface UserUsageRequestResponse {
@@ -44,7 +45,7 @@ export default async (
       return unauthorized(res);
     }
 
-    const { id: userId, startAt, endAt } = req.query;
+    const { userId, startAt, endAt } = req.query;
 
     const startDate = new Date(+startAt);
     const endDate = new Date(+endAt);

From 213f96380eb0df099ae897a935e3715dbe05c55a Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Tue, 14 May 2024 17:13:16 -0700
Subject: [PATCH 070/438] fix admin/website

---
 src/pages/api/admin/websites.ts | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/pages/api/admin/websites.ts b/src/pages/api/admin/websites.ts
index 58a5958673..686de6cb4b 100644
--- a/src/pages/api/admin/websites.ts
+++ b/src/pages/api/admin/websites.ts
@@ -10,7 +10,7 @@ import * as yup from 'yup';
 
 export interface WebsitesRequestQuery extends PageParams {
   userId?: string;
-  includeTeams?: boolean;
+  includeOwnedTeams?: boolean;
 }
 
 export interface WebsitesRequestBody {
@@ -43,27 +43,28 @@ export default async (
       return unauthorized(res);
     }
 
-    const { userId, includeTeams } = req.query;
+    const { userId, includeOwnedTeams } = req.query;
 
     const websites = await getWebsites(
       {
         where: {
           OR: [
             ...(userId && [{ userId }]),
-            ...(userId &&
-              includeTeams && [
-                {
-                  team: {
-                    deletedAt: null,
-                    teamUser: {
-                      some: {
-                        role: ROLES.teamOwner,
-                        userId,
+            ...(userId && includeOwnedTeams
+              ? [
+                  {
+                    team: {
+                      deletedAt: null,
+                      teamUser: {
+                        some: {
+                          role: ROLES.teamOwner,
+                          userId,
+                        },
                       },
                     },
                   },
-                },
-              ]),
+                ]
+              : []),
           ],
         },
         include: {

From edefdfb4b1f65eb12da363841b8dae7cdda061c4 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 14 May 2024 17:19:10 -0700
Subject: [PATCH 071/438] filter usagewebsites

---
 src/pages/api/users/[userId]/usage.ts    | 7 ++++++-
 src/pages/api/users/[userId]/websites.ts | 1 -
 src/queries/admin/website.ts             | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/pages/api/users/[userId]/usage.ts b/src/pages/api/users/[userId]/usage.ts
index 547de3383a..b500039517 100644
--- a/src/pages/api/users/[userId]/usage.ts
+++ b/src/pages/api/users/[userId]/usage.ts
@@ -62,6 +62,7 @@ export default async (
       websiteName: a.name,
       websiteEventUsage: websiteEventUsage.find(b => a.id === b.websiteId)?.count || 0,
       eventDataUsage: eventDataUsage.find(b => a.id === b.websiteId)?.count || 0,
+      deletedAt: a.deletedAt,
     }));
 
     const usage = websiteUsage.reduce(
@@ -74,9 +75,13 @@ export default async (
       { websiteEventUsage: 0, eventDataUsage: 0 },
     );
 
+    const filteredWebsiteUsage = websiteUsage.filter(
+      a => !a.deletedAt && (a.websiteEventUsage > 0 || a.eventDataUsage > 0),
+    );
+
     return ok(res, {
       ...usage,
-      websites: websiteUsage,
+      websites: filteredWebsiteUsage,
     });
   }
 
diff --git a/src/pages/api/users/[userId]/websites.ts b/src/pages/api/users/[userId]/websites.ts
index f443deb8a7..88a2bad1ef 100644
--- a/src/pages/api/users/[userId]/websites.ts
+++ b/src/pages/api/users/[userId]/websites.ts
@@ -9,7 +9,6 @@ import * as yup from 'yup';
 const schema = {
   GET: yup.object().shape({
     userId: yup.string().uuid().required(),
-    teamId: yup.string().uuid(),
     ...pageInfo,
   }),
 };
diff --git a/src/queries/admin/website.ts b/src/queries/admin/website.ts
index a3bcac7b81..eb07f77991 100644
--- a/src/queries/admin/website.ts
+++ b/src/queries/admin/website.ts
@@ -61,6 +61,7 @@ export async function getAllWebsites(userId: string) {
           },
         },
       ],
+      deletedAt: null,
     },
   });
 }

From 0d51f5bb7ca61b8f51a3c14a1d5500521027636c Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 13 May 2024 13:33:41 -0700
Subject: [PATCH 072/438] fix param names for includeTeams

---
 src/pages/api/admin/websites.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/api/admin/websites.ts b/src/pages/api/admin/websites.ts
index 8669214466..58a5958673 100644
--- a/src/pages/api/admin/websites.ts
+++ b/src/pages/api/admin/websites.ts
@@ -43,7 +43,7 @@ export default async (
       return unauthorized(res);
     }
 
-    const { userId, includeOwnedTeams } = req.query;
+    const { userId, includeTeams } = req.query;
 
     const websites = await getWebsites(
       {
@@ -51,7 +51,7 @@ export default async (
           OR: [
             ...(userId && [{ userId }]),
             ...(userId &&
-              includeOwnedTeams && [
+              includeTeams && [
                 {
                   team: {
                     deletedAt: null,

From c80be88d14e5c718aa6fa8ac56fb2c1a159cbdee Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 14 May 2024 09:39:04 -0700
Subject: [PATCH 073/438] update getAllwebsites, match usage query with api /
 cloud call

---
 src/pages/api/users/[userId]/usage.ts |  3 +--
 src/queries/admin/website.ts          | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/pages/api/users/[userId]/usage.ts b/src/pages/api/users/[userId]/usage.ts
index 9d2bc37eab..90cfb9ee7f 100644
--- a/src/pages/api/users/[userId]/usage.ts
+++ b/src/pages/api/users/[userId]/usage.ts
@@ -7,8 +7,7 @@ import * as yup from 'yup';
 
 export interface UserUsageRequestQuery {
   id: string;
-  startAt: string;
-  endAt: string;
+  params: { startAt: string; endAt: string };
 }
 
 export interface UserUsageRequestResponse {
diff --git a/src/queries/admin/website.ts b/src/queries/admin/website.ts
index 37dd5f482a..a3bcac7b81 100644
--- a/src/queries/admin/website.ts
+++ b/src/queries/admin/website.ts
@@ -48,7 +48,19 @@ export async function getWebsites(
 export async function getAllWebsites(userId: string) {
   return prisma.client.website.findMany({
     where: {
-      userId,
+      OR: [
+        { userId },
+        {
+          team: {
+            deletedAt: null,
+            teamUser: {
+              some: {
+                userId,
+              },
+            },
+          },
+        },
+      ],
     },
   });
 }

From 4b421d08d0a70588e06c4ae091711b7acd3a1058 Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Tue, 14 May 2024 12:01:27 -0700
Subject: [PATCH 074/438] fix usage.

---
 src/pages/api/users/[userId]/usage.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pages/api/users/[userId]/usage.ts b/src/pages/api/users/[userId]/usage.ts
index 90cfb9ee7f..547de3383a 100644
--- a/src/pages/api/users/[userId]/usage.ts
+++ b/src/pages/api/users/[userId]/usage.ts
@@ -6,8 +6,9 @@ import { getAllUserWebsitesIncludingTeamOwner, getEventDataUsage, getEventUsage
 import * as yup from 'yup';
 
 export interface UserUsageRequestQuery {
-  id: string;
-  params: { startAt: string; endAt: string };
+  userId: string;
+  startAt: string;
+  endAt: string;
 }
 
 export interface UserUsageRequestResponse {
@@ -44,7 +45,7 @@ export default async (
       return unauthorized(res);
     }
 
-    const { id: userId, startAt, endAt } = req.query;
+    const { userId, startAt, endAt } = req.query;
 
     const startDate = new Date(+startAt);
     const endDate = new Date(+endAt);

From b3bcfa5bd1d7b639a6fe7bdb079748102d50634b Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 14 May 2024 17:19:10 -0700
Subject: [PATCH 075/438] filter usagewebsites

---
 src/pages/api/users/[userId]/usage.ts    | 7 ++++++-
 src/pages/api/users/[userId]/websites.ts | 1 -
 src/queries/admin/website.ts             | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/pages/api/users/[userId]/usage.ts b/src/pages/api/users/[userId]/usage.ts
index 547de3383a..b500039517 100644
--- a/src/pages/api/users/[userId]/usage.ts
+++ b/src/pages/api/users/[userId]/usage.ts
@@ -62,6 +62,7 @@ export default async (
       websiteName: a.name,
       websiteEventUsage: websiteEventUsage.find(b => a.id === b.websiteId)?.count || 0,
       eventDataUsage: eventDataUsage.find(b => a.id === b.websiteId)?.count || 0,
+      deletedAt: a.deletedAt,
     }));
 
     const usage = websiteUsage.reduce(
@@ -74,9 +75,13 @@ export default async (
       { websiteEventUsage: 0, eventDataUsage: 0 },
     );
 
+    const filteredWebsiteUsage = websiteUsage.filter(
+      a => !a.deletedAt && (a.websiteEventUsage > 0 || a.eventDataUsage > 0),
+    );
+
     return ok(res, {
       ...usage,
-      websites: websiteUsage,
+      websites: filteredWebsiteUsage,
     });
   }
 
diff --git a/src/pages/api/users/[userId]/websites.ts b/src/pages/api/users/[userId]/websites.ts
index f443deb8a7..88a2bad1ef 100644
--- a/src/pages/api/users/[userId]/websites.ts
+++ b/src/pages/api/users/[userId]/websites.ts
@@ -9,7 +9,6 @@ import * as yup from 'yup';
 const schema = {
   GET: yup.object().shape({
     userId: yup.string().uuid().required(),
-    teamId: yup.string().uuid(),
     ...pageInfo,
   }),
 };
diff --git a/src/queries/admin/website.ts b/src/queries/admin/website.ts
index a3bcac7b81..eb07f77991 100644
--- a/src/queries/admin/website.ts
+++ b/src/queries/admin/website.ts
@@ -61,6 +61,7 @@ export async function getAllWebsites(userId: string) {
           },
         },
       ],
+      deletedAt: null,
     },
   });
 }

From 36928d4f04b616ad8ec8ff954f8531598b336f30 Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Tue, 14 May 2024 17:13:16 -0700
Subject: [PATCH 076/438] fix admin/website

---
 src/pages/api/admin/websites.ts | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/pages/api/admin/websites.ts b/src/pages/api/admin/websites.ts
index 58a5958673..686de6cb4b 100644
--- a/src/pages/api/admin/websites.ts
+++ b/src/pages/api/admin/websites.ts
@@ -10,7 +10,7 @@ import * as yup from 'yup';
 
 export interface WebsitesRequestQuery extends PageParams {
   userId?: string;
-  includeTeams?: boolean;
+  includeOwnedTeams?: boolean;
 }
 
 export interface WebsitesRequestBody {
@@ -43,27 +43,28 @@ export default async (
       return unauthorized(res);
     }
 
-    const { userId, includeTeams } = req.query;
+    const { userId, includeOwnedTeams } = req.query;
 
     const websites = await getWebsites(
       {
         where: {
           OR: [
             ...(userId && [{ userId }]),
-            ...(userId &&
-              includeTeams && [
-                {
-                  team: {
-                    deletedAt: null,
-                    teamUser: {
-                      some: {
-                        role: ROLES.teamOwner,
-                        userId,
+            ...(userId && includeOwnedTeams
+              ? [
+                  {
+                    team: {
+                      deletedAt: null,
+                      teamUser: {
+                        some: {
+                          role: ROLES.teamOwner,
+                          userId,
+                        },
                       },
                     },
                   },
-                },
-              ]),
+                ]
+              : []),
           ],
         },
         include: {

From 71c9d31f3bbae2de49ab18e309c7751acbac20be Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Wed, 15 May 2024 14:55:05 -0700
Subject: [PATCH 077/438] Update pt-BR. Reverted hostUrl change.

---
 next.config.js                                |   4 -
 public/intl/messages/pt-BR.json               | 256 ++++++++----------
 .../websites/[websiteId]/ShareUrl.tsx         |   4 +-
 .../websites/[websiteId]/TrackingCode.tsx     |   4 +-
 4 files changed, 119 insertions(+), 149 deletions(-)

diff --git a/next.config.js b/next.config.js
index 92b66943d1..9be316cf7c 100644
--- a/next.config.js
+++ b/next.config.js
@@ -13,8 +13,6 @@ const disableUI = process.env.DISABLE_UI;
 const forceSSL = process.env.FORCE_SSL;
 const frameAncestors = process.env.ALLOWED_FRAME_URLS;
 const privateMode = process.env.PRIVATE_MODE;
-const shareUrlHost = process.env.SHARE_URL_HOST;
-const trackerScriptHost = process.env.TRACKER_SCRIPT_HOST;
 const trackerScriptName = process.env.TRACKER_SCRIPT_NAME;
 
 const contentSecurityPolicy = [
@@ -122,8 +120,6 @@ const config = {
     disableLogin,
     disableUI,
     privateMode,
-    shareUrlHost,
-    trackerScriptHost,
   },
   basePath,
   output: 'standalone',
diff --git a/public/intl/messages/pt-BR.json b/public/intl/messages/pt-BR.json
index 27a648d3c5..7c41e5efff 100644
--- a/public/intl/messages/pt-BR.json
+++ b/public/intl/messages/pt-BR.json
@@ -8,7 +8,7 @@
   "label.actions": [
     {
       "type": 0,
-      "value": "Ações"
+      "value": "Ações do usuário"
     }
   ],
   "label.activity-log": [
@@ -56,7 +56,7 @@
   "label.after": [
     {
       "type": 0,
-      "value": "Depois de"
+      "value": "Depois"
     }
   ],
   "label.all": [
@@ -68,13 +68,13 @@
   "label.all-time": [
     {
       "type": 0,
-      "value": "Todo o período"
+      "value": "Todos os períodos"
     }
   ],
   "label.analytics": [
     {
       "type": 0,
-      "value": "Análises"
+      "value": "Análise"
     }
   ],
   "label.average": [
@@ -98,7 +98,7 @@
   "label.before": [
     {
       "type": 0,
-      "value": "Antes de"
+      "value": "Antes"
     }
   ],
   "label.bounce-rate": [
@@ -236,7 +236,7 @@
   "label.custom-range": [
     {
       "type": 0,
-      "value": "Intervalo personalizado"
+      "value": "Período personalizado"
     }
   ],
   "label.dashboard": [
@@ -260,7 +260,7 @@
   "label.date-range": [
     {
       "type": 0,
-      "value": "Intervalo de datas"
+      "value": "Período"
     }
   ],
   "label.day": [
@@ -272,7 +272,7 @@
   "label.default-date-range": [
     {
       "type": 0,
-      "value": "Intervalo padrão de datas"
+      "value": "Período padrão"
     }
   ],
   "label.delete": [
@@ -338,7 +338,7 @@
   "label.dismiss": [
     {
       "type": 0,
-      "value": "Dispensar"
+      "value": "Fechar"
     }
   ],
   "label.does-not-contain": [
@@ -356,7 +356,7 @@
   "label.dropoff": [
     {
       "type": 0,
-      "value": "Queda"
+      "value": "Abandono"
     }
   ],
   "label.edit": [
@@ -368,7 +368,7 @@
   "label.edit-dashboard": [
     {
       "type": 0,
-      "value": "Editar dashboard"
+      "value": "Editar painel"
     }
   ],
   "label.edit-member": [
@@ -380,7 +380,7 @@
   "label.enable-share-url": [
     {
       "type": 0,
-      "value": "Habilitar URL de compartilhamento"
+      "value": "Ativar link para compartilhar"
     }
   ],
   "label.event": [
@@ -392,19 +392,19 @@
   "label.event-data": [
     {
       "type": 0,
-      "value": "Dados de eventos"
+      "value": "Dados do evento"
     }
   ],
   "label.events": [
     {
       "type": 0,
-      "value": "Eventos"
+      "value": "Tipos de eventos"
     }
   ],
   "label.false": [
     {
       "type": 0,
-      "value": "Falso"
+      "value": "Não"
     }
   ],
   "label.field": [
@@ -452,7 +452,7 @@
   "label.funnel-description": [
     {
       "type": 0,
-      "value": "Entenda a conversão e a taxa de abandono dos usuários."
+      "value": "Entenda a taxa de conversão e abandono dos seus usuários."
     }
   ],
   "label.greater-than": [
@@ -464,43 +464,43 @@
   "label.greater-than-equals": [
     {
       "type": 0,
-      "value": "Maior que ou igual a"
+      "value": "Maior ou igual a"
     }
   ],
   "label.insights": [
     {
       "type": 0,
-      "value": "Compreensão"
+      "value": "Insights"
     }
   ],
   "label.insights-description": [
     {
       "type": 0,
-      "value": "Explore seus dados mais profundamente usando campos e filtros."
+      "value": "Explore seus dados em mais detalhes usando filtros"
     }
   ],
   "label.is": [
     {
       "type": 0,
-      "value": "É"
+      "value": "É igual a"
     }
   ],
   "label.is-not": [
     {
       "type": 0,
-      "value": "Não é"
+      "value": "Não é igual a"
     }
   ],
   "label.is-not-set": [
     {
       "type": 0,
-      "value": "Não está definido"
+      "value": "Não definido"
     }
   ],
   "label.is-set": [
     {
       "type": 0,
-      "value": "Está definido"
+      "value": "Definido"
     }
   ],
   "label.join": [
@@ -512,7 +512,7 @@
   "label.join-team": [
     {
       "type": 0,
-      "value": "Entrar na equipe"
+      "value": "Participar da equipe"
     }
   ],
   "label.language": [
@@ -530,7 +530,7 @@
   "label.laptop": [
     {
       "type": 0,
-      "value": "Laptop"
+      "value": "Notebook"
     }
   ],
   "label.last-days": [
@@ -590,19 +590,19 @@
   "label.less-than": [
     {
       "type": 0,
-      "value": "Menos que"
+      "value": "Menor que"
     }
   ],
   "label.less-than-equals": [
     {
       "type": 0,
-      "value": "Menos que ou igual a"
+      "value": "Menor ou igual a"
     }
   ],
   "label.login": [
     {
       "type": 0,
-      "value": "Login"
+      "value": "Entrar"
     }
   ],
   "label.logout": [
@@ -620,7 +620,7 @@
   "label.max": [
     {
       "type": 0,
-      "value": "Máx"
+      "value": "Máximo"
     }
   ],
   "label.member": [
@@ -638,7 +638,7 @@
   "label.min": [
     {
       "type": 0,
-      "value": "Mín"
+      "value": "Mínimo"
     }
   ],
   "label.mobile": [
@@ -650,7 +650,7 @@
   "label.more": [
     {
       "type": 0,
-      "value": "Ver todos"
+      "value": "Mais"
     }
   ],
   "label.my-account": [
@@ -707,7 +707,7 @@
           "value": [
             {
               "type": 0,
-              "value": "registro"
+              "value": "registros"
             }
           ]
         }
@@ -738,7 +738,7 @@
   "label.owner": [
     {
       "type": 0,
-      "value": "Criado por"
+      "value": "Proprietário"
     }
   ],
   "label.page-of": [
@@ -748,7 +748,7 @@
     },
     {
       "type": 1,
-      "value": "átual"
+      "value": "current"
     },
     {
       "type": 0,
@@ -768,7 +768,7 @@
   "label.pageTitle": [
     {
       "type": 0,
-      "value": "Título da página"
+      "value": "Título"
     }
   ],
   "label.pages": [
@@ -802,19 +802,19 @@
   "label.queries": [
     {
       "type": 0,
-      "value": "Parâmetros"
+      "value": "Consultas"
     }
   ],
   "label.query": [
     {
       "type": 0,
-      "value": "Parâmetro"
+      "value": "Consulta"
     }
   ],
   "label.query-parameters": [
     {
       "type": 0,
-      "value": "Chave-valor de parâmetro"
+      "value": "Parâmetros da consulta"
     }
   ],
   "label.realtime": [
@@ -826,13 +826,13 @@
   "label.referrer": [
     {
       "type": 0,
-      "value": "Origem"
+      "value": "Referência"
     }
   ],
   "label.referrers": [
     {
       "type": 0,
-      "value": "Origens"
+      "value": "Referências"
     }
   ],
   "label.refresh": [
@@ -844,19 +844,19 @@
   "label.regenerate": [
     {
       "type": 0,
-      "value": "Regerar"
+      "value": "Gerar novamente"
     }
   ],
   "label.region": [
     {
       "type": 0,
-      "value": "Região"
+      "value": "Estado"
     }
   ],
   "label.regions": [
     {
       "type": 0,
-      "value": "Regiões"
+      "value": "Estados"
     }
   ],
   "label.remove": [
@@ -892,7 +892,7 @@
   "label.reset-website": [
     {
       "type": 0,
-      "value": "Apagar dados do site"
+      "value": "Redefinir dados"
     }
   ],
   "label.retention": [
@@ -904,7 +904,7 @@
   "label.retention-description": [
     {
       "type": 0,
-      "value": "Meça a aderência do seu website monitorando a frequência com que os usuários retornam."
+      "value": "Avalie a fidelidade dos seus usuários medindo a frequência com que eles retornam."
     }
   ],
   "label.role": [
@@ -916,7 +916,7 @@
   "label.run-query": [
     {
       "type": 0,
-      "value": "Realizar consulta"
+      "value": "Executar consulta"
     }
   ],
   "label.save": [
@@ -928,13 +928,13 @@
   "label.screens": [
     {
       "type": 0,
-      "value": "Telas"
+      "value": "Tamanhos de tela"
     }
   ],
   "label.search": [
     {
       "type": 0,
-      "value": "Buscar"
+      "value": "Pesquisar"
     }
   ],
   "label.select": [
@@ -976,19 +976,19 @@
   "label.share-url": [
     {
       "type": 0,
-      "value": "Compartilhar URL"
+      "value": "Link para compartilhar"
     }
   ],
   "label.single-day": [
     {
       "type": 0,
-      "value": "Dia único"
+      "value": "Apenas um dia"
     }
   ],
   "label.steps": [
     {
       "type": 0,
-      "value": "Passos"
+      "value": "Etapas"
     }
   ],
   "label.sum": [
@@ -1012,7 +1012,7 @@
   "label.team-id": [
     {
       "type": 0,
-      "value": "ID da Equipe"
+      "value": "ID da equipe"
     }
   ],
   "label.team-member": [
@@ -1030,19 +1030,19 @@
   "label.team-owner": [
     {
       "type": 0,
-      "value": "Criador da equipe"
+      "value": "Proprietário da equipe"
     }
   ],
   "label.team-view-only": [
     {
       "type": 0,
-      "value": "Equipe Somente leitura"
+      "value": "Apenas visualização da equipe"
     }
   ],
   "label.team-websites": [
     {
       "type": 0,
-      "value": "Sites daequipe"
+      "value": "Sites da equipe"
     }
   ],
   "label.teams": [
@@ -1096,7 +1096,7 @@
   "label.toggle-charts": [
     {
       "type": 0,
-      "value": "Esconder gráficos"
+      "value": "Alternar gráficos"
     }
   ],
   "label.total": [
@@ -1132,7 +1132,7 @@
   "label.true": [
     {
       "type": 0,
-      "value": "Verdadeiro"
+      "value": "Sim"
     }
   ],
   "label.type": [
@@ -1144,7 +1144,7 @@
   "label.unique": [
     {
       "type": 0,
-      "value": "Único"
+      "value": "Únicos"
     }
   ],
   "label.unique-visitors": [
@@ -1210,7 +1210,7 @@
   "label.utm-description": [
     {
       "type": 0,
-      "value": "Acompanhe suas campanhas por meio de parâmetros UTM."
+      "value": "Acompanhe suas campanhas de publicidade através de parâmetros UTM."
     }
   ],
   "label.value": [
@@ -1228,13 +1228,13 @@
   "label.view-details": [
     {
       "type": 0,
-      "value": "Ver detalhes"
+      "value": "Ver mais"
     }
   ],
   "label.view-only": [
     {
       "type": 0,
-      "value": "Somente leitura"
+      "value": "Somente visualização"
     }
   ],
   "label.views": [
@@ -1306,47 +1306,23 @@
     }
   ],
   "message.active-users": [
-    {
-      "type": 1,
-      "value": "x"
-    },
     {
       "type": 0,
-      "value": " "
+      "value": " Atualmente "
     },
     {
-      "offset": 0,
-      "options": {
-        "one": {
-          "value": [
-            {
-              "type": 0,
-              "value": "visitante"
-            }
-          ]
-        },
-        "other": {
-          "value": [
-            {
-              "type": 0,
-              "value": "visitantes"
-            }
-          ]
-        }
-      },
-      "pluralType": "cardinal",
-      "type": 6,
+      "type": 1,
       "value": "x"
     },
     {
       "type": 0,
-      "value": " neste momento"
+      "value": " usuários ativos"
     }
   ],
   "message.confirm-delete": [
     {
       "type": 0,
-      "value": "Tem certeza que deseja excluir "
+      "value": "Tem certeza de que deseja excluir "
     },
     {
       "type": 1,
@@ -1360,7 +1336,7 @@
   "message.confirm-leave": [
     {
       "type": 0,
-      "value": "Tem certeza que deseja sair de "
+      "value": "Tem certeza de que deseja sair de "
     },
     {
       "type": 1,
@@ -1388,7 +1364,7 @@
   "message.confirm-reset": [
     {
       "type": 0,
-      "value": "Tem certeza que deseja redefinir "
+      "value": "Tem certeza que deseja redefinir os dados de "
     },
     {
       "type": 1,
@@ -1402,19 +1378,19 @@
   "message.delete-team-warning": [
     {
       "type": 0,
-      "value": "Excluir uma equipe também excluirá todos os sites da equipe."
+      "value": "Excluir a equipe também excluirá todos os sites da equipe."
     }
   ],
   "message.delete-website-warning": [
     {
       "type": 0,
-      "value": "Todos os dados do site serão excluídos."
+      "value": "Todos os dados relacionados serão excluídos."
     }
   ],
   "message.error": [
     {
       "type": 0,
-      "value": "Algo deu errado."
+      "value": "Ocorreu um erro."
     }
   ],
   "message.event-log": [
@@ -1434,25 +1410,25 @@
   "message.go-to-settings": [
     {
       "type": 0,
-      "value": "Ir para configurações"
+      "value": "Ir para as configurações"
     }
   ],
   "message.incorrect-username-password": [
     {
       "type": 0,
-      "value": "Nome de usuário e/ou senha incorretos."
+      "value": "Nome de usuário ou senha incorretos."
     }
   ],
   "message.invalid-domain": [
     {
       "type": 0,
-      "value": "Domínio inválido. Não inclua http/https."
+      "value": "Domínio inválido"
     }
   ],
   "message.min-password-length": [
     {
       "type": 0,
-      "value": "Tamanho mínimo de "
+      "value": "A senha deve ter no mínimo "
     },
     {
       "type": 1,
@@ -1466,27 +1442,27 @@
   "message.new-version-available": [
     {
       "type": 0,
-      "value": "Uma nova versão do Umami "
+      "value": "Uma nova versão "
     },
     {
       "type": 1,
-      "value": "versão"
+      "value": "version"
     },
     {
       "type": 0,
-      "value": " está disponível!"
+      "value": " do Umami está disponível!"
     }
   ],
   "message.no-data-available": [
     {
       "type": 0,
-      "value": "Nenhum dado disponível."
+      "value": "Não há dados disponíveis."
     }
   ],
   "message.no-event-data": [
     {
       "type": 0,
-      "value": "Nenhum dado de evento está disponível."
+      "value": "Não há eventos disponíveis."
     }
   ],
   "message.no-match-password": [
@@ -1504,13 +1480,13 @@
   "message.no-team-websites": [
     {
       "type": 0,
-      "value": "Esta equipe não possui nenhum site."
+      "value": "Esta equipe não possui sites."
     }
   ],
   "message.no-teams": [
     {
       "type": 0,
-      "value": "Você não criou nenhuma equipe."
+      "value": "Você ainda não criou nenhuma equipe."
     }
   ],
   "message.no-users": [
@@ -1522,19 +1498,19 @@
   "message.no-websites-configured": [
     {
       "type": 0,
-      "value": "Você não possui nenhum site configurado."
+      "value": "Você ainda não configurou nenhum site."
     }
   ],
   "message.page-not-found": [
     {
       "type": 0,
-      "value": "Página não encontrada"
+      "value": "Página não encontrada."
     }
   ],
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Para redefinir este site, digite "
+      "value": "Se você tiver certeza de que deseja redefinir este site, digite "
     },
     {
       "type": 1,
@@ -1542,31 +1518,39 @@
     },
     {
       "type": 0,
-      "value": " na caixa abaixo para confirmar."
+      "value": " na caixa de entrada abaixo para confirmar."
     }
   ],
   "message.reset-website-warning": [
     {
       "type": 0,
-      "value": "Todas as estatísticas deste site serão excluídas, mas suas configurações permanecerão intactas."
+      "value": "Todos os dados estatísticos deste site serão excluídos, mas seu código de rastreamento permanecerá o mesmo."
     }
   ],
   "message.saved": [
     {
       "type": 0,
-      "value": "Salvo."
+      "value": "Salvo com sucesso."
     }
   ],
   "message.share-url": [
     {
       "type": 0,
-      "value": "As estatísticas do seu site estão publicamente disponíveis na seguinte URL:"
+      "value": "Este é o link para compartilhar "
+    },
+    {
+      "type": 1,
+      "value": "target"
+    },
+    {
+      "type": 0,
+      "value": "."
     }
   ],
   "message.team-already-member": [
     {
       "type": 0,
-      "value": "Você já é um membro da equipe."
+      "value": "Você já é membro desta equipe."
     }
   ],
   "message.team-not-found": [
@@ -1578,51 +1562,37 @@
   "message.team-websites-info": [
     {
       "type": 0,
-      "value": "Os sites podem ser visualizados por qualquer membro da equipe."
+      "value": "Qualquer membro da equipe pode visualizar os sites."
     }
   ],
   "message.tracking-code": [
     {
       "type": 0,
-      "value": "Para rastrear estatísticas para este site, coloque o código a seguir na seção "
-    },
-    {
-      "children": [
-        {
-          "type": 0,
-          "value": "..."
-        }
-      ],
-      "type": 8,
-      "value": "head"
-    },
-    {
-      "type": 0,
-      "value": " do HTML."
+      "value": "Código de rastreamento"
     }
   ],
   "message.transfer-team-website-to-user": [
     {
       "type": 0,
-      "value": "Transferir este website para a sua conta?"
+      "value": "Transferir este site para sua conta?"
     }
   ],
   "message.transfer-user-website-to-team": [
     {
       "type": 0,
-      "value": "Selecione a equipe para a qual deseja transferir este site."
+      "value": "Selecione para qual equipe deseja transferir este site."
     }
   ],
   "message.transfer-website": [
     {
       "type": 0,
-      "value": "Transfira a propriedade do site para sua conta ou outra equipe."
+      "value": "Transfira a propriedade do site para sua conta ou para outra equipe."
     }
   ],
   "message.triggered-event": [
     {
       "type": 0,
-      "value": "Evento acionado"
+      "value": "Evento disparado"
     }
   ],
   "message.user-deleted": [
@@ -1644,37 +1614,41 @@
     },
     {
       "type": 1,
-      "value": "país"
+      "value": "country"
     },
     {
       "type": 0,
-      "value": " usando "
+      "value": " usando o navegador "
     },
     {
       "type": 1,
-      "value": "navegador"
+      "value": "browser"
     },
     {
       "type": 0,
-      "value": " no "
+      "value": " em um "
     },
     {
       "type": 1,
-      "value": "os"
+      "value": "device"
     },
     {
       "type": 0,
-      "value": " "
+      "value": " com sistema operacional "
     },
     {
       "type": 1,
-      "value": "dispositivo"
+      "value": "os"
+    },
+    {
+      "type": 0,
+      "value": "."
     }
   ],
   "message.visitors-dropped-off": [
     {
       "type": 0,
-      "value": "Visitantes abandonaram o site"
+      "value": "Visitantes abandonados"
     }
   ]
 }
diff --git a/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx b/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx
index ded2105d14..e567334613 100644
--- a/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx
+++ b/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx
@@ -15,7 +15,7 @@ import { WebsiteContext } from 'app/(main)/websites/[websiteId]/WebsiteProvider'
 
 const generateId = () => getRandomChars(16);
 
-export function ShareUrl({ onSave }: { websiteId: string; onSave?: () => void }) {
+export function ShareUrl({ hostUrl, onSave }: { hostUrl?: string; onSave?: () => void }) {
   const website = useContext(WebsiteContext);
   const { domain, shareId } = website;
   const { formatMessage, labels, messages } = useMessages();
@@ -26,7 +26,7 @@ export function ShareUrl({ onSave }: { websiteId: string; onSave?: () => void })
   });
   const { touch } = useModified();
 
-  const url = `${process.env.shareUrlHost || window?.location.origin || ''}${
+  const url = `${hostUrl || window?.location.origin || ''}${
     process.env.basePath || ''
   }/share/${id}/${domain}`;
 
diff --git a/src/app/(main)/settings/websites/[websiteId]/TrackingCode.tsx b/src/app/(main)/settings/websites/[websiteId]/TrackingCode.tsx
index 18672abf8f..95fb7068ca 100644
--- a/src/app/(main)/settings/websites/[websiteId]/TrackingCode.tsx
+++ b/src/app/(main)/settings/websites/[websiteId]/TrackingCode.tsx
@@ -3,7 +3,7 @@ import { useMessages, useConfig } from 'components/hooks';
 
 const SCRIPT_NAME = 'script.js';
 
-export function TrackingCode({ websiteId }: { websiteId: string }) {
+export function TrackingCode({ websiteId, hostUrl }: { websiteId: string; hostUrl?: string }) {
   const { formatMessage, messages } = useMessages();
   const config = useConfig();
 
@@ -12,7 +12,7 @@ export function TrackingCode({ websiteId }: { websiteId: string }) {
 
   const url = trackerScriptName?.startsWith('http')
     ? trackerScriptName
-    : `${process.env.trackerScriptHost || window?.location.origin || ''}${
+    : `${hostUrl || window?.location.origin || ''}${
         process.env.basePath || ''
       }/${trackerScriptName}`;
 

From 394997e1d7c44083fe8c66656620357ccf290308 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Wed, 15 May 2024 15:02:50 -0700
Subject: [PATCH 078/438] Updated lang files.

---
 public/intl/messages/uk-UA.json | 236 ++++++++++++++++----------------
 1 file changed, 118 insertions(+), 118 deletions(-)

diff --git a/public/intl/messages/uk-UA.json b/public/intl/messages/uk-UA.json
index 56b46ea61f..ae947f9abe 100644
--- a/public/intl/messages/uk-UA.json
+++ b/public/intl/messages/uk-UA.json
@@ -2,7 +2,7 @@
   "label.access-code": [
     {
       "type": 0,
-      "value": "Access code"
+      "value": "Код доступу"
     }
   ],
   "label.actions": [
@@ -14,31 +14,31 @@
   "label.activity-log": [
     {
       "type": 0,
-      "value": "Activity log"
+      "value": "Журнал активності"
     }
   ],
   "label.add": [
     {
       "type": 0,
-      "value": "Add"
+      "value": "Додати"
     }
   ],
   "label.add-description": [
     {
       "type": 0,
-      "value": "Add description"
+      "value": "Додати опис"
     }
   ],
   "label.add-member": [
     {
       "type": 0,
-      "value": "Add member"
+      "value": "Додати учасника"
     }
   ],
   "label.add-step": [
     {
       "type": 0,
-      "value": "Add step"
+      "value": "Додати крок"
     }
   ],
   "label.add-website": [
@@ -56,7 +56,7 @@
   "label.after": [
     {
       "type": 0,
-      "value": "After"
+      "value": "Після"
     }
   ],
   "label.all": [
@@ -74,13 +74,13 @@
   "label.analytics": [
     {
       "type": 0,
-      "value": "Analytics"
+      "value": "Аналітика"
     }
   ],
   "label.average": [
     {
       "type": 0,
-      "value": "Average"
+      "value": "Середнє"
     }
   ],
   "label.average-visit-time": [
@@ -98,7 +98,7 @@
   "label.before": [
     {
       "type": 0,
-      "value": "Before"
+      "value": "Раніше"
     }
   ],
   "label.bounce-rate": [
@@ -110,13 +110,13 @@
   "label.breakdown": [
     {
       "type": 0,
-      "value": "Breakdown"
+      "value": "Розподіл"
     }
   ],
   "label.browser": [
     {
       "type": 0,
-      "value": "Browser"
+      "value": "Браузер"
     }
   ],
   "label.browsers": [
@@ -140,25 +140,25 @@
   "label.cities": [
     {
       "type": 0,
-      "value": "Cities"
+      "value": "Міста"
     }
   ],
   "label.city": [
     {
       "type": 0,
-      "value": "City"
+      "value": "Місто"
     }
   ],
   "label.clear-all": [
     {
       "type": 0,
-      "value": "Clear all"
+      "value": "Очистити все"
     }
   ],
   "label.confirm": [
     {
       "type": 0,
-      "value": "Confirm"
+      "value": "Підтвердити"
     }
   ],
   "label.confirm-password": [
@@ -170,13 +170,13 @@
   "label.contains": [
     {
       "type": 0,
-      "value": "Contains"
+      "value": "Містить"
     }
   ],
   "label.continue": [
     {
       "type": 0,
-      "value": "Continue"
+      "value": "Продовжити"
     }
   ],
   "label.countries": [
@@ -188,43 +188,43 @@
   "label.country": [
     {
       "type": 0,
-      "value": "Country"
+      "value": "Країна"
     }
   ],
   "label.create": [
     {
       "type": 0,
-      "value": "Create"
+      "value": "Створити"
     }
   ],
   "label.create-report": [
     {
       "type": 0,
-      "value": "Create report"
+      "value": "Створити звіт"
     }
   ],
   "label.create-team": [
     {
       "type": 0,
-      "value": "Create team"
+      "value": "Створити команду"
     }
   ],
   "label.create-user": [
     {
       "type": 0,
-      "value": "Create user"
+      "value": "Створити користувача"
     }
   ],
   "label.created": [
     {
       "type": 0,
-      "value": "Created"
+      "value": "Створено"
     }
   ],
   "label.created-by": [
     {
       "type": 0,
-      "value": "Created By"
+      "value": "Автор"
     }
   ],
   "label.current-password": [
@@ -248,13 +248,13 @@
   "label.data": [
     {
       "type": 0,
-      "value": "Data"
+      "value": "Дані"
     }
   ],
   "label.date": [
     {
       "type": 0,
-      "value": "Date"
+      "value": "Дата"
     }
   ],
   "label.date-range": [
@@ -266,7 +266,7 @@
   "label.day": [
     {
       "type": 0,
-      "value": "Day"
+      "value": "День"
     }
   ],
   "label.default-date-range": [
@@ -284,19 +284,19 @@
   "label.delete-report": [
     {
       "type": 0,
-      "value": "Delete report"
+      "value": "Видалити звіт"
     }
   ],
   "label.delete-team": [
     {
       "type": 0,
-      "value": "Delete team"
+      "value": "Видалити команду"
     }
   ],
   "label.delete-user": [
     {
       "type": 0,
-      "value": "Delete user"
+      "value": "Видалити користувача"
     }
   ],
   "label.delete-website": [
@@ -308,7 +308,7 @@
   "label.description": [
     {
       "type": 0,
-      "value": "Description"
+      "value": "Опис"
     }
   ],
   "label.desktop": [
@@ -320,13 +320,13 @@
   "label.details": [
     {
       "type": 0,
-      "value": "Details"
+      "value": "Деталі"
     }
   ],
   "label.device": [
     {
       "type": 0,
-      "value": "Device"
+      "value": "Пристрій"
     }
   ],
   "label.devices": [
@@ -344,7 +344,7 @@
   "label.does-not-contain": [
     {
       "type": 0,
-      "value": "Does not contain"
+      "value": "Не містить"
     }
   ],
   "label.domain": [
@@ -368,13 +368,13 @@
   "label.edit-dashboard": [
     {
       "type": 0,
-      "value": "Edit dashboard"
+      "value": "Редагувати панель"
     }
   ],
   "label.edit-member": [
     {
       "type": 0,
-      "value": "Edit member"
+      "value": "Редагувати учасника"
     }
   ],
   "label.enable-share-url": [
@@ -386,13 +386,13 @@
   "label.event": [
     {
       "type": 0,
-      "value": "Event"
+      "value": "Подія"
     }
   ],
   "label.event-data": [
     {
       "type": 0,
-      "value": "Event data"
+      "value": "Дані події"
     }
   ],
   "label.events": [
@@ -410,19 +410,19 @@
   "label.field": [
     {
       "type": 0,
-      "value": "Field"
+      "value": "Поле"
     }
   ],
   "label.fields": [
     {
       "type": 0,
-      "value": "Fields"
+      "value": "Поля"
     }
   ],
   "label.filter": [
     {
       "type": 0,
-      "value": "Filter"
+      "value": "Фільтр"
     }
   ],
   "label.filter-combined": [
@@ -440,7 +440,7 @@
   "label.filters": [
     {
       "type": 0,
-      "value": "Filters"
+      "value": "Фільтри"
     }
   ],
   "label.funnel": [
@@ -458,13 +458,13 @@
   "label.greater-than": [
     {
       "type": 0,
-      "value": "Greater than"
+      "value": "Більше ніж"
     }
   ],
   "label.greater-than-equals": [
     {
       "type": 0,
-      "value": "Greater than or equals"
+      "value": "Більше або рівно"
     }
   ],
   "label.insights": [
@@ -482,43 +482,43 @@
   "label.is": [
     {
       "type": 0,
-      "value": "Is"
+      "value": "Є"
     }
   ],
   "label.is-not": [
     {
       "type": 0,
-      "value": "Is not"
+      "value": "Не є"
     }
   ],
   "label.is-not-set": [
     {
       "type": 0,
-      "value": "Is not set"
+      "value": "Не встановлено"
     }
   ],
   "label.is-set": [
     {
       "type": 0,
-      "value": "Is set"
+      "value": "Встановлено"
     }
   ],
   "label.join": [
     {
       "type": 0,
-      "value": "Join"
+      "value": "Приєднатись"
     }
   ],
   "label.join-team": [
     {
       "type": 0,
-      "value": "Join team"
+      "value": "Приєднатись до команди"
     }
   ],
   "label.language": [
     {
       "type": 0,
-      "value": "Language"
+      "value": "Мова"
     }
   ],
   "label.languages": [
@@ -564,7 +564,7 @@
   "label.last-months": [
     {
       "type": 0,
-      "value": "Last "
+      "value": "Останні "
     },
     {
       "type": 1,
@@ -572,31 +572,31 @@
     },
     {
       "type": 0,
-      "value": " months"
+      "value": " місяців"
     }
   ],
   "label.leave": [
     {
       "type": 0,
-      "value": "Leave"
+      "value": "Покинути"
     }
   ],
   "label.leave-team": [
     {
       "type": 0,
-      "value": "Leave team"
+      "value": "Покинути"
     }
   ],
   "label.less-than": [
     {
       "type": 0,
-      "value": "Less than"
+      "value": "Менше ніж"
     }
   ],
   "label.less-than-equals": [
     {
       "type": 0,
-      "value": "Less than or equals"
+      "value": "Менше або рівно"
     }
   ],
   "label.login": [
@@ -614,7 +614,7 @@
   "label.manage": [
     {
       "type": 0,
-      "value": "Manage"
+      "value": "Керувати"
     }
   ],
   "label.max": [
@@ -626,13 +626,13 @@
   "label.member": [
     {
       "type": 0,
-      "value": "Member"
+      "value": "Учасник"
     }
   ],
   "label.members": [
     {
       "type": 0,
-      "value": "Members"
+      "value": "Учасники"
     }
   ],
   "label.min": [
@@ -656,13 +656,13 @@
   "label.my-account": [
     {
       "type": 0,
-      "value": "My account"
+      "value": "Мої аккаунти"
     }
   ],
   "label.my-websites": [
     {
       "type": 0,
-      "value": "My websites"
+      "value": "Мої вебсайти"
     }
   ],
   "label.name": [
@@ -732,7 +732,7 @@
   "label.overview": [
     {
       "type": 0,
-      "value": "Overview"
+      "value": "Огляд"
     }
   ],
   "label.owner": [
@@ -744,7 +744,7 @@
   "label.page-of": [
     {
       "type": 0,
-      "value": "Page "
+      "value": "Сторінка "
     },
     {
       "type": 1,
@@ -752,7 +752,7 @@
     },
     {
       "type": 0,
-      "value": " of "
+      "value": " з "
     },
     {
       "type": 1,
@@ -768,7 +768,7 @@
   "label.pageTitle": [
     {
       "type": 0,
-      "value": "Page title"
+      "value": "Загловок сторінки"
     }
   ],
   "label.pages": [
@@ -850,31 +850,31 @@
   "label.region": [
     {
       "type": 0,
-      "value": "Region"
+      "value": "Регіон"
     }
   ],
   "label.regions": [
     {
       "type": 0,
-      "value": "Regions"
+      "value": "Регіони"
     }
   ],
   "label.remove": [
     {
       "type": 0,
-      "value": "Remove"
+      "value": "Видалити"
     }
   ],
   "label.remove-member": [
     {
       "type": 0,
-      "value": "Remove member"
+      "value": "Видалити учасника"
     }
   ],
   "label.reports": [
     {
       "type": 0,
-      "value": "Reports"
+      "value": "Звіти"
     }
   ],
   "label.required": [
@@ -910,7 +910,7 @@
   "label.role": [
     {
       "type": 0,
-      "value": "Role"
+      "value": "Роль"
     }
   ],
   "label.run-query": [
@@ -928,19 +928,19 @@
   "label.screens": [
     {
       "type": 0,
-      "value": "Screens"
+      "value": "Екрани"
     }
   ],
   "label.search": [
     {
       "type": 0,
-      "value": "Search"
+      "value": "Пошук"
     }
   ],
   "label.select": [
     {
       "type": 0,
-      "value": "Select"
+      "value": "Вибір"
     }
   ],
   "label.select-date": [
@@ -964,7 +964,7 @@
   "label.sessions": [
     {
       "type": 0,
-      "value": "Sessions"
+      "value": "Сесії"
     }
   ],
   "label.settings": [
@@ -988,13 +988,13 @@
   "label.steps": [
     {
       "type": 0,
-      "value": "Steps"
+      "value": "Кроки"
     }
   ],
   "label.sum": [
     {
       "type": 0,
-      "value": "Sum"
+      "value": "Сума"
     }
   ],
   "label.tablet": [
@@ -1006,55 +1006,55 @@
   "label.team": [
     {
       "type": 0,
-      "value": "Team"
+      "value": "Команда"
     }
   ],
   "label.team-id": [
     {
       "type": 0,
-      "value": "Team ID"
+      "value": "ID команди"
     }
   ],
   "label.team-member": [
     {
       "type": 0,
-      "value": "Team member"
+      "value": "Учасник команди"
     }
   ],
   "label.team-name": [
     {
       "type": 0,
-      "value": "Team name"
+      "value": "Назва команди"
     }
   ],
   "label.team-owner": [
     {
       "type": 0,
-      "value": "Team owner"
+      "value": "Власник команди"
     }
   ],
   "label.team-view-only": [
     {
       "type": 0,
-      "value": "Team view only"
+      "value": "Лише для перегляду командою"
     }
   ],
   "label.team-websites": [
     {
       "type": 0,
-      "value": "Team websites"
+      "value": "Вебсайти команди"
     }
   ],
   "label.teams": [
     {
       "type": 0,
-      "value": "Teams"
+      "value": "Команди"
     }
   ],
   "label.theme": [
     {
       "type": 0,
-      "value": "Theme"
+      "value": "Теми"
     }
   ],
   "label.this-month": [
@@ -1084,7 +1084,7 @@
   "label.title": [
     {
       "type": 0,
-      "value": "Title"
+      "value": "Загловок"
     }
   ],
   "label.today": [
@@ -1138,13 +1138,13 @@
   "label.type": [
     {
       "type": 0,
-      "value": "Type"
+      "value": "Типу"
     }
   ],
   "label.unique": [
     {
       "type": 0,
-      "value": "Unique"
+      "value": "Унікальний"
     }
   ],
   "label.unique-visitors": [
@@ -1162,13 +1162,13 @@
   "label.untitled": [
     {
       "type": 0,
-      "value": "Untitled"
+      "value": "Без заголовку"
     }
   ],
   "label.update": [
     {
       "type": 0,
-      "value": "Update"
+      "value": "Оновити"
     }
   ],
   "label.url": [
@@ -1186,7 +1186,7 @@
   "label.user": [
     {
       "type": 0,
-      "value": "User"
+      "value": "Користувач"
     }
   ],
   "label.username": [
@@ -1198,7 +1198,7 @@
   "label.users": [
     {
       "type": 0,
-      "value": "Users"
+      "value": "Користувачі"
     }
   ],
   "label.utm": [
@@ -1216,13 +1216,13 @@
   "label.value": [
     {
       "type": 0,
-      "value": "Value"
+      "value": "Значення"
     }
   ],
   "label.view": [
     {
       "type": 0,
-      "value": "View"
+      "value": "Перегляд"
     }
   ],
   "label.view-details": [
@@ -1234,7 +1234,7 @@
   "label.view-only": [
     {
       "type": 0,
-      "value": "View only"
+      "value": "Лише для перегляду"
     }
   ],
   "label.views": [
@@ -1246,7 +1246,7 @@
   "label.views-per-visit": [
     {
       "type": 0,
-      "value": "Views per visit"
+      "value": "Перегляди за візит"
     }
   ],
   "label.visitors": [
@@ -1258,19 +1258,19 @@
   "label.visits": [
     {
       "type": 0,
-      "value": "Visits"
+      "value": "Відвідування"
     }
   ],
   "label.website": [
     {
       "type": 0,
-      "value": "Website"
+      "value": "Вебсайт"
     }
   ],
   "label.website-id": [
     {
       "type": 0,
-      "value": "Website ID"
+      "value": "Вебсайт ID"
     }
   ],
   "label.websites": [
@@ -1282,19 +1282,19 @@
   "label.window": [
     {
       "type": 0,
-      "value": "Window"
+      "value": "Вікно"
     }
   ],
   "label.yesterday": [
     {
       "type": 0,
-      "value": "Yesterday"
+      "value": "Вчора"
     }
   ],
   "message.action-confirmation": [
     {
       "type": 0,
-      "value": "Type "
+      "value": "Введі "
     },
     {
       "type": 1,
@@ -1302,7 +1302,7 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " у поле нижче для підтвердження."
     }
   ],
   "message.active-users": [
@@ -1332,7 +1332,7 @@
   "message.confirm-leave": [
     {
       "type": 0,
-      "value": "Are you sure you want to leave "
+      "value": "Ви впевнені, що хочете покинути "
     },
     {
       "type": 1,
@@ -1346,7 +1346,7 @@
   "message.confirm-remove": [
     {
       "type": 0,
-      "value": "Are you sure you want to remove "
+      "value": "Ви впевнеі, що хочете видалити "
     },
     {
       "type": 1,
@@ -1374,7 +1374,7 @@
   "message.delete-team-warning": [
     {
       "type": 0,
-      "value": "Deleting a team will also delete all team websites."
+      "value": "Видалення команди також видалить усі вебсайти команди."
     }
   ],
   "message.delete-website-warning": [
@@ -1470,25 +1470,25 @@
   "message.no-results-found": [
     {
       "type": 0,
-      "value": "No results were found."
+      "value": "Результатів не знайдено."
     }
   ],
   "message.no-team-websites": [
     {
       "type": 0,
-      "value": "This team does not have any websites."
+      "value": "Ця команди не має жодних вебсайтів."
     }
   ],
   "message.no-teams": [
     {
       "type": 0,
-      "value": "You have not created any teams."
+      "value": "Ви не створили жодної команди."
     }
   ],
   "message.no-users": [
     {
       "type": 0,
-      "value": "There are no users."
+      "value": "Користувачів не має."
     }
   ],
   "message.no-websites-configured": [
@@ -1546,19 +1546,19 @@
   "message.team-already-member": [
     {
       "type": 0,
-      "value": "You are already a member of the team."
+      "value": "Ви уже є учасником цієї команди."
     }
   ],
   "message.team-not-found": [
     {
       "type": 0,
-      "value": "Team not found."
+      "value": "Команду не знайдено."
     }
   ],
   "message.team-websites-info": [
     {
       "type": 0,
-      "value": "Websites can be viewed by anyone on the team."
+      "value": "Вебсайти може переглядати кожен учаник команди."
     }
   ],
   "message.tracking-code": [
@@ -1594,13 +1594,13 @@
   "message.user-deleted": [
     {
       "type": 0,
-      "value": "User deleted."
+      "value": "Користувача видалено."
     }
   ],
   "message.viewed-page": [
     {
       "type": 0,
-      "value": "Viewed page"
+      "value": "Переглянута сторінка"
     }
   ],
   "message.visitor-log": [

From 37eb157ab5b6e783d833b1edbf1a9743db290dfe Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 16 May 2024 22:24:15 -0700
Subject: [PATCH 079/438] Added bash build script.

---
 ignore-build-step.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 ignore-build-step.sh

diff --git a/ignore-build-step.sh b/ignore-build-step.sh
new file mode 100644
index 0000000000..da63c205a1
--- /dev/null
+++ b/ignore-build-step.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+echo "VERCEL_GIT_COMMIT_REF: $VERCEL_GIT_COMMIT_REF"
+
+if [[ "$VERCEL_GIT_COMMIT_REF" != "analytics" ]] ; then
+  # Proceed with the build
+    echo "✅ - Build can proceed"
+  exit 1;
+
+else
+  # Don't build
+  echo "🛑 - Build cancelled"
+  exit 0;
+fi
\ No newline at end of file

From 76cab03bb231632cfde4290ed578ab937326de45 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 17 May 2024 01:42:36 -0700
Subject: [PATCH 080/438] Bootstrap User Journey report.

---
 ignore-build-step.sh                          |  14 --
 .../(main)/reports/create/ReportTemplates.tsx |   7 +
 .../reports/journey/JourneyParameters.tsx     |  36 +++++
 .../(main)/reports/journey/JourneyReport.tsx  |  28 ++++
 .../reports/journey/JourneyReportPage.tsx     |   5 +
 .../reports/journey/JourneyView.module.css    |  14 ++
 .../(main)/reports/journey/JourneyView.tsx    |  13 ++
 src/app/(main)/reports/journey/page.tsx       |  10 ++
 src/app/(main)/reports/utm/UTMView.tsx        |   1 +
 .../websites/[websiteId]/WebsiteSettings.tsx  |   2 +-
 src/assets/path.svg                           |   1 +
 src/components/charts/Chart.tsx               |   4 +-
 src/components/messages.ts                    |   7 +-
 src/lib/constants.ts                          |   1 +
 src/pages/api/reports/[reportId].ts           |   2 +-
 src/pages/api/reports/journey.ts              |  54 +++++++
 src/queries/analytics/reports/getJourney.ts   | 148 ++++++++++++++++++
 src/queries/index.ts                          |   1 +
 18 files changed, 329 insertions(+), 19 deletions(-)
 delete mode 100644 ignore-build-step.sh
 create mode 100644 src/app/(main)/reports/journey/JourneyParameters.tsx
 create mode 100644 src/app/(main)/reports/journey/JourneyReport.tsx
 create mode 100644 src/app/(main)/reports/journey/JourneyReportPage.tsx
 create mode 100644 src/app/(main)/reports/journey/JourneyView.module.css
 create mode 100644 src/app/(main)/reports/journey/JourneyView.tsx
 create mode 100644 src/app/(main)/reports/journey/page.tsx
 create mode 100644 src/assets/path.svg
 create mode 100644 src/pages/api/reports/journey.ts
 create mode 100644 src/queries/analytics/reports/getJourney.ts

diff --git a/ignore-build-step.sh b/ignore-build-step.sh
deleted file mode 100644
index da63c205a1..0000000000
--- a/ignore-build-step.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-echo "VERCEL_GIT_COMMIT_REF: $VERCEL_GIT_COMMIT_REF"
-
-if [[ "$VERCEL_GIT_COMMIT_REF" != "analytics" ]] ; then
-  # Proceed with the build
-    echo "✅ - Build can proceed"
-  exit 1;
-
-else
-  # Don't build
-  echo "🛑 - Build cancelled"
-  exit 0;
-fi
\ No newline at end of file
diff --git a/src/app/(main)/reports/create/ReportTemplates.tsx b/src/app/(main)/reports/create/ReportTemplates.tsx
index fdf5c5f527..0777cc1f96 100644
--- a/src/app/(main)/reports/create/ReportTemplates.tsx
+++ b/src/app/(main)/reports/create/ReportTemplates.tsx
@@ -6,6 +6,7 @@ import Lightbulb from 'assets/lightbulb.svg';
 import Magnet from 'assets/magnet.svg';
 import Tag from 'assets/tag.svg';
 import Target from 'assets/target.svg';
+import Path from 'assets/path.svg';
 import styles from './ReportTemplates.module.css';
 import { useMessages, useTeamUrl } from 'components/hooks';
 
@@ -44,6 +45,12 @@ export function ReportTemplates({ showHeader = true }: { showHeader?: boolean })
       url: renderTeamUrl('/reports/goals'),
       icon: <Target />,
     },
+    {
+      title: formatMessage(labels.journey),
+      description: formatMessage(labels.journeyDescription),
+      url: renderTeamUrl('/reports/journey'),
+      icon: <Path />,
+    },
   ];
 
   return (
diff --git a/src/app/(main)/reports/journey/JourneyParameters.tsx b/src/app/(main)/reports/journey/JourneyParameters.tsx
new file mode 100644
index 0000000000..b0544168b2
--- /dev/null
+++ b/src/app/(main)/reports/journey/JourneyParameters.tsx
@@ -0,0 +1,36 @@
+import { useContext } from 'react';
+import { useMessages } from 'components/hooks';
+import { Form, FormButtons, SubmitButton } from 'react-basics';
+import { ReportContext } from '../[reportId]/Report';
+import BaseParameters from '../[reportId]/BaseParameters';
+
+export function JourneyParameters() {
+  const { report, runReport, isRunning } = useContext(ReportContext);
+  const { formatMessage, labels } = useMessages();
+
+  const { id, parameters } = report || {};
+  const { websiteId, dateRange } = parameters || {};
+  const queryDisabled = !websiteId || !dateRange;
+
+  const handleSubmit = (data: any, e: any) => {
+    e.stopPropagation();
+    e.preventDefault();
+
+    if (!queryDisabled) {
+      runReport(data);
+    }
+  };
+
+  return (
+    <Form values={parameters} onSubmit={handleSubmit} preventSubmit={true}>
+      <BaseParameters showDateSelect={true} allowWebsiteSelect={!id} />
+      <FormButtons>
+        <SubmitButton variant="primary" disabled={queryDisabled} isLoading={isRunning}>
+          {formatMessage(labels.runQuery)}
+        </SubmitButton>
+      </FormButtons>
+    </Form>
+  );
+}
+
+export default JourneyParameters;
diff --git a/src/app/(main)/reports/journey/JourneyReport.tsx b/src/app/(main)/reports/journey/JourneyReport.tsx
new file mode 100644
index 0000000000..7b8927b4dc
--- /dev/null
+++ b/src/app/(main)/reports/journey/JourneyReport.tsx
@@ -0,0 +1,28 @@
+'use client';
+import Report from '../[reportId]/Report';
+import ReportHeader from '../[reportId]/ReportHeader';
+import ReportMenu from '../[reportId]/ReportMenu';
+import ReportBody from '../[reportId]/ReportBody';
+import JourneyParameters from './JourneyParameters';
+import JourneyView from './JourneyView';
+import Path from 'assets/path.svg';
+import { REPORT_TYPES } from 'lib/constants';
+
+const defaultParameters = {
+  type: REPORT_TYPES.journey,
+  parameters: {},
+};
+
+export default function JourneyReport({ reportId }: { reportId?: string }) {
+  return (
+    <Report reportId={reportId} defaultParameters={defaultParameters}>
+      <ReportHeader icon={<Path />} />
+      <ReportMenu>
+        <JourneyParameters />
+      </ReportMenu>
+      <ReportBody>
+        <JourneyView />
+      </ReportBody>
+    </Report>
+  );
+}
diff --git a/src/app/(main)/reports/journey/JourneyReportPage.tsx b/src/app/(main)/reports/journey/JourneyReportPage.tsx
new file mode 100644
index 0000000000..0f4b78cadd
--- /dev/null
+++ b/src/app/(main)/reports/journey/JourneyReportPage.tsx
@@ -0,0 +1,5 @@
+import JourneyReport from './JourneyReport';
+
+export default function JourneyReportPage() {
+  return <JourneyReport />;
+}
diff --git a/src/app/(main)/reports/journey/JourneyView.module.css b/src/app/(main)/reports/journey/JourneyView.module.css
new file mode 100644
index 0000000000..fa7cc0b429
--- /dev/null
+++ b/src/app/(main)/reports/journey/JourneyView.module.css
@@ -0,0 +1,14 @@
+.title {
+  font-size: 24px;
+  line-height: 36px;
+  font-weight: 700;
+}
+
+.row {
+  display: grid;
+  grid-template-columns: 50% 50%;
+  gap: 20px;
+  border-bottom: 1px solid var(--base300);
+  padding-bottom: 30px;
+  margin-bottom: 30px;
+}
diff --git a/src/app/(main)/reports/journey/JourneyView.tsx b/src/app/(main)/reports/journey/JourneyView.tsx
new file mode 100644
index 0000000000..6905d74cb0
--- /dev/null
+++ b/src/app/(main)/reports/journey/JourneyView.tsx
@@ -0,0 +1,13 @@
+import { useContext } from 'react';
+import { ReportContext } from '../[reportId]/Report';
+
+export default function JourneyView() {
+  const { report } = useContext(ReportContext);
+  const { data } = report || {};
+
+  if (!data) {
+    return null;
+  }
+
+  return <div>{JSON.stringify(data)}</div>;
+}
diff --git a/src/app/(main)/reports/journey/page.tsx b/src/app/(main)/reports/journey/page.tsx
new file mode 100644
index 0000000000..447747cc3a
--- /dev/null
+++ b/src/app/(main)/reports/journey/page.tsx
@@ -0,0 +1,10 @@
+import { Metadata } from 'next';
+import JourneyReportPage from './JourneyReportPage';
+
+export default function () {
+  return <JourneyReportPage />;
+}
+
+export const metadata: Metadata = {
+  title: 'Journey Report',
+};
diff --git a/src/app/(main)/reports/utm/UTMView.tsx b/src/app/(main)/reports/utm/UTMView.tsx
index e59b60ebe8..f10a68d8c0 100644
--- a/src/app/(main)/reports/utm/UTMView.tsx
+++ b/src/app/(main)/reports/utm/UTMView.tsx
@@ -34,6 +34,7 @@ export default function UTMView() {
             {
               data: items.map(({ value }) => value),
               backgroundColor: CHART_COLORS,
+              borderWidth: 0,
             },
           ],
         };
diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx
index 1a92f1f114..11f662b19c 100644
--- a/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx
+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx
@@ -61,7 +61,7 @@ export function WebsiteSettings({
       </Tabs>
       {tab === 'details' && <WebsiteEditForm websiteId={websiteId} onSave={handleSave} />}
       {tab === 'tracking' && <TrackingCode websiteId={websiteId} />}
-      {tab === 'share' && <ShareUrl websiteId={websiteId} onSave={handleSave} />}
+      {tab === 'share' && <ShareUrl onSave={handleSave} />}
       {tab === 'data' && <WebsiteData websiteId={websiteId} onSave={handleSave} />}
     </>
   );
diff --git a/src/assets/path.svg b/src/assets/path.svg
new file mode 100644
index 0000000000..29501565ec
--- /dev/null
+++ b/src/assets/path.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" fill="none" viewBox="0 0 64 64"><path fill="#000" d="m56.4 47.6-6-6c-.8-.8-2-.8-2.8 0s-.8 2 0 2.8l2.6 2.6H18.5c-3.6 0-6.5-2.9-6.5-6.5s2.9-6.5 6.5-6.5h27C51.3 34 56 29.3 56 23.5S51.3 13 45.5 13H22.7c-.9-3.4-4-6-7.7-6-4.4 0-8 3.6-8 8s3.6 8 8 8c3.7 0 6.8-2.6 7.7-6h22.8c3.6 0 6.5 2.9 6.5 6.5S49.1 30 45.5 30h-27C12.7 30 8 34.7 8 40.5S12.7 51 18.5 51h31.7l-2.6 2.6c-.8.8-.8 2 0 2.8.4.4.9.6 1.4.6s1-.2 1.4-.6l6-6c.8-.8.8-2 0-2.8M15 19c-2.2 0-4-1.8-4-4s1.8-4 4-4 4 1.8 4 4-1.8 4-4 4"/></svg>
\ No newline at end of file
diff --git a/src/components/charts/Chart.tsx b/src/components/charts/Chart.tsx
index 40829cac07..d5d22874b1 100644
--- a/src/components/charts/Chart.tsx
+++ b/src/components/charts/Chart.tsx
@@ -1,7 +1,7 @@
 import { useState, useRef, useEffect, useMemo, ReactNode } from 'react';
 import { Loading } from 'react-basics';
 import classNames from 'classnames';
-import ChartJS, { LegendItem } from 'chart.js/auto';
+import ChartJS, { LegendItem, ChartOptions } from 'chart.js/auto';
 import HoverTooltip from 'components/common/HoverTooltip';
 import Legend from 'components/metrics/Legend';
 import { DEFAULT_ANIMATION_DURATION } from 'lib/constants';
@@ -17,7 +17,7 @@ export interface ChartProps {
   onUpdate?: (chart: any) => void;
   onTooltip?: (model: any) => void;
   className?: string;
-  chartOptions?: { [key: string]: any };
+  chartOptions?: ChartOptions;
   tooltip?: ReactNode;
 }
 
diff --git a/src/components/messages.ts b/src/components/messages.ts
index 1413549fdd..238ebf5242 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -239,9 +239,14 @@ export const labels = defineMessages({
   goals: { id: 'label.goals', defaultMessage: 'Goals' },
   goalsDescription: {
     id: 'label.goals-description',
-    defaultMessage: 'Track your goals for pageviews or events.',
+    defaultMessage: 'Track your goals for pageviews and events.',
   },
   count: { id: 'label.count', defaultMessage: 'Count' },
+  journey: { id: 'label.journey', defaultMessage: 'Journey' },
+  journeyDescription: {
+    id: 'label.journey-description',
+    defaultMessage: 'Understand how users nagivate through your website.',
+  },
 });
 
 export const messages = defineMessages({
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 697a48367f..0386266064 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -115,6 +115,7 @@ export const REPORT_TYPES = {
   insights: 'insights',
   retention: 'retention',
   utm: 'utm',
+  journey: 'journey',
 } as const;
 
 export const REPORT_PARAMETERS = {
diff --git a/src/pages/api/reports/[reportId].ts b/src/pages/api/reports/[reportId].ts
index be2db82f57..3a7c4c536b 100644
--- a/src/pages/api/reports/[reportId].ts
+++ b/src/pages/api/reports/[reportId].ts
@@ -27,7 +27,7 @@ const schema: YupRequest = {
     websiteId: yup.string().uuid().required(),
     type: yup
       .string()
-      .matches(/funnel|insights|retention|utm|goals/i)
+      .matches(/funnel|insights|retention|utm|goals|journey/i)
       .required(),
     name: yup.string().max(200).required(),
     description: yup.string().max(500),
diff --git a/src/pages/api/reports/journey.ts b/src/pages/api/reports/journey.ts
new file mode 100644
index 0000000000..84246f05b8
--- /dev/null
+++ b/src/pages/api/reports/journey.ts
@@ -0,0 +1,54 @@
+import { canViewWebsite } from 'lib/auth';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getJourney } from 'queries';
+import * as yup from 'yup';
+
+export interface RetentionRequestBody {
+  websiteId: string;
+  dateRange: { startDate: string; endDate: string };
+}
+
+const schema = {
+  POST: yup.object().shape({
+    websiteId: yup.string().uuid().required(),
+    dateRange: yup
+      .object()
+      .shape({
+        startDate: yup.date().required(),
+        endDate: yup.date().required(),
+      })
+      .required(),
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<any, RetentionRequestBody>,
+  res: NextApiResponse,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  if (req.method === 'POST') {
+    const {
+      websiteId,
+      dateRange: { startDate, endDate },
+    } = req.body;
+
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const data = await getJourney(websiteId, {
+      startDate: new Date(startDate),
+      endDate: new Date(endDate),
+    });
+
+    return ok(res, data);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/src/queries/analytics/reports/getJourney.ts b/src/queries/analytics/reports/getJourney.ts
new file mode 100644
index 0000000000..088f7ee888
--- /dev/null
+++ b/src/queries/analytics/reports/getJourney.ts
@@ -0,0 +1,148 @@
+import clickhouse from 'lib/clickhouse';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import prisma from 'lib/prisma';
+
+export async function getJourney(
+  ...args: [
+    websiteId: string,
+    filters: {
+      startDate: Date;
+      endDate: Date;
+    },
+  ]
+) {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(
+  websiteId: string,
+  filters: {
+    startDate: Date;
+    endDate: Date;
+  },
+): Promise<
+  {
+    e1: string;
+    e2: string;
+    e3: string;
+    e4: string;
+    e5: string;
+    count: string;
+  }[]
+> {
+  const { startDate, endDate } = filters;
+  const { rawQuery } = prisma;
+
+  return rawQuery(
+    `
+    WITH events AS (
+      select distinct
+          session_id,
+          referrer_path,
+          COALESCE(event_name, url_path) event,
+          ROW_NUMBER() OVER (PARTITION BY session_id ORDER BY created_at) AS event_number
+      from website_event 
+      where website_id = {{websiteId::uuid}}
+          and created_at between {{startDate}} and {{endDate}}
+          and referrer_path != url_path), 
+    sequences as (
+      SELECT s.e1,
+            s.e2,
+            s.e3,
+            s.e4,
+            s.e5,
+            count(*) count
+      FROM (
+          SELECT session_id,
+              MAX(CASE WHEN event_number = 1 THEN event ELSE NULL END) AS e1,
+              MAX(CASE WHEN event_number = 2 THEN event ELSE NULL END) AS e2,
+              MAX(CASE WHEN event_number = 3 THEN event ELSE NULL END) AS e3,
+              MAX(CASE WHEN event_number = 4 THEN event ELSE NULL END) AS e4,
+              MAX(CASE WHEN event_number = 5 THEN event ELSE NULL END) AS e5
+          FROM events
+          group by session_id) s
+      group by s.e1,
+            s.e2,
+            s.e3,
+            s.e4,
+            s.e5)
+    select *
+    from sequences
+    order by count desc
+    limit 100
+    `,
+    {
+      websiteId,
+      startDate,
+      endDate,
+    },
+  );
+}
+
+async function clickhouseQuery(
+  websiteId: string,
+  filters: {
+    startDate: Date;
+    endDate: Date;
+  },
+): Promise<
+  {
+    e1: string;
+    e2: string;
+    e3: string;
+    e4: string;
+    e5: string;
+    count: string;
+  }[]
+> {
+  const { startDate, endDate } = filters;
+  const { rawQuery } = clickhouse;
+
+  return rawQuery(
+    `
+    WITH events AS (
+      select distinct
+          session_id,
+          referrer_path,
+          coalesce(nullIf(event_name, ''), url_path) event,
+          row_number() OVER (PARTITION BY session_id ORDER BY created_at) AS event_number
+      from umami.website_event 
+      where website_id = {websiteId:UUID}
+          and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+          and referrer_path != url_path),
+    sequences as (
+        SELECT s.e1,
+            s.e2,
+            s.e3,
+            s.e4,
+            s.e5,
+            count(*) count
+        FROM (
+          SELECT session_id,
+              max(CASE WHEN event_number = 1 THEN event ELSE NULL END) AS e1,
+              max(CASE WHEN event_number = 2 THEN event ELSE NULL END) AS e2,
+              max(CASE WHEN event_number = 3 THEN event ELSE NULL END) AS e3,
+              max(CASE WHEN event_number = 4 THEN event ELSE NULL END) AS e4,
+              max(CASE WHEN event_number = 5 THEN event ELSE NULL END) AS e5
+          FROM events
+          group by session_id) s
+        group by s.e1,
+            s.e2,
+            s.e3,
+            s.e4,
+            s.e5)
+    select *
+    from sequences
+    order by count desc
+    limit 100
+    `,
+    {
+      websiteId,
+      startDate,
+      endDate,
+    },
+  );
+}
diff --git a/src/queries/index.ts b/src/queries/index.ts
index f0002881bf..8cef080aa1 100644
--- a/src/queries/index.ts
+++ b/src/queries/index.ts
@@ -12,6 +12,7 @@ export * from './analytics/eventData/getEventDataStats';
 export * from './analytics/eventData/getEventDataUsage';
 export * from './analytics/events/saveEvent';
 export * from './analytics/reports/getFunnel';
+export * from './analytics/reports/getJourney';
 export * from './analytics/reports/getRetention';
 export * from './analytics/reports/getInsights';
 export * from './analytics/reports/getUTM';

From 79a93ed9fc3e99fce9f89456796acb9bd4d0c0d5 Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Mon, 20 May 2024 21:10:46 -0700
Subject: [PATCH 081/438] add event_data to goal.

---
 src/app/(main)/reports/goals/GoalsAddForm.tsx | 54 +++++++++++-
 src/app/(main)/reports/goals/GoalsChart.tsx   | 27 ++++--
 .../reports/goals/GoalsParameters.module.css  | 11 +++
 .../(main)/reports/goals/GoalsParameters.tsx  | 75 ++++++++++------
 src/components/messages.ts                    | 11 ++-
 src/pages/api/reports/goals.ts                | 16 +++-
 src/queries/analytics/reports/getGoals.ts     | 85 ++++++++++++++++---
 7 files changed, 231 insertions(+), 48 deletions(-)

diff --git a/src/app/(main)/reports/goals/GoalsAddForm.tsx b/src/app/(main)/reports/goals/GoalsAddForm.tsx
index a8a77c58e8..a82eea28c9 100644
--- a/src/app/(main)/reports/goals/GoalsAddForm.tsx
+++ b/src/app/(main)/reports/goals/GoalsAddForm.tsx
@@ -6,27 +6,48 @@ import styles from './GoalsAddForm.module.css';
 export function GoalsAddForm({
   type: defaultType = 'url',
   value: defaultValue = '',
+  property: defaultProperty = '',
+  operator: defaultAggregae = null,
   goal: defaultGoal = 10,
   onChange,
 }: {
   type?: string;
   value?: string;
+  operator?: string;
+  property?: string;
   goal?: number;
-  onChange?: (step: { type: string; value: string; goal: number }) => void;
+  onChange?: (step: {
+    type: string;
+    value: string;
+    goal: number;
+    operator?: string;
+    property?: string;
+  }) => void;
 }) {
   const [type, setType] = useState(defaultType);
   const [value, setValue] = useState(defaultValue);
+  const [operator, setOperator] = useState(defaultAggregae);
+  const [property, setProperty] = useState(defaultProperty);
   const [goal, setGoal] = useState(defaultGoal);
   const { formatMessage, labels } = useMessages();
   const items = [
     { label: formatMessage(labels.url), value: 'url' },
     { label: formatMessage(labels.event), value: 'event' },
+    { label: formatMessage(labels.eventData), value: 'event-data' },
+  ];
+  const operators = [
+    { label: formatMessage(labels.count), value: 'count' },
+    { label: formatMessage(labels.average), value: 'average' },
+    { label: formatMessage(labels.sum), value: 'sum' },
   ];
   const isDisabled = !type || !value;
 
   const handleSave = () => {
-    onChange({ type, value, goal });
+    onChange(
+      type === 'event-data' ? { type, value, goal, operator, property } : { type, value, goal },
+    );
     setValue('');
+    setProperty('');
     setGoal(10);
   };
 
@@ -45,6 +66,10 @@ export function GoalsAddForm({
     return items.find(item => item.value === value)?.label;
   };
 
+  const renderoperatorValue = (value: any) => {
+    return operators.find(item => item.value === value)?.label;
+  };
+
   return (
     <Flexbox direction="column" gap={10}>
       <FormRow label={formatMessage(defaultValue ? labels.update : labels.add)}>
@@ -70,6 +95,31 @@ export function GoalsAddForm({
           />
         </Flexbox>
       </FormRow>
+      {type === 'event-data' && (
+        <FormRow label={formatMessage(labels.property)}>
+          <Flexbox gap={10}>
+            <Dropdown
+              className={styles.dropdown}
+              items={operators}
+              value={operator}
+              renderValue={renderoperatorValue}
+              onChange={(value: any) => setOperator(value)}
+            >
+              {({ value, label }) => {
+                return <Item key={value}>{label}</Item>;
+              }}
+            </Dropdown>
+            <TextField
+              className={styles.input}
+              value={property}
+              onChange={e => handleChange(e, setProperty)}
+              autoFocus={true}
+              autoComplete="off"
+              onKeyDown={handleKeyDown}
+            />
+          </Flexbox>
+        </FormRow>
+      )}
       <FormRow label={formatMessage(labels.goal)}>
         <Flexbox gap={10}>
           <TextField
diff --git a/src/app/(main)/reports/goals/GoalsChart.tsx b/src/app/(main)/reports/goals/GoalsChart.tsx
index 2476023434..dedbd07cb5 100644
--- a/src/app/(main)/reports/goals/GoalsChart.tsx
+++ b/src/app/(main)/reports/goals/GoalsChart.tsx
@@ -11,19 +11,36 @@ export function GoalsChart({ className }: { className?: string; isLoading?: bool
 
   const { data } = report || {};
 
+  const getLabel = type => {
+    let label = '';
+    switch (type) {
+      case 'url':
+        label = labels.viewedPage;
+        break;
+      case 'event':
+        label = labels.triggeredEvent;
+        break;
+      default:
+        label = labels.collectedData;
+        break;
+    }
+
+    return label;
+  };
+
   return (
     <div className={classNames(styles.chart, className)}>
-      {data?.map(({ type, value, goal, result }, index: number) => {
+      {data?.map(({ type, value, goal, result, property, operator }, index: number) => {
         const percent = result > goal ? 100 : (result / goal) * 100;
 
         return (
           <div key={index} className={styles.goal}>
             <div className={styles.card}>
               <div className={styles.header}>
-                <span className={styles.label}>
-                  {formatMessage(type === 'url' ? labels.viewedPage : labels.triggeredEvent)}
-                </span>
-                <span className={styles.item}>{value}</span>
+                <span className={styles.label}>{formatMessage(getLabel(type))}</span>
+                <span className={styles.item}>{`${value}${
+                  type === 'event-data' ? `:(${operator}):${property}` : ''
+                }`}</span>
               </div>
               <div className={styles.track}>
                 <div
diff --git a/src/app/(main)/reports/goals/GoalsParameters.module.css b/src/app/(main)/reports/goals/GoalsParameters.module.css
index fbe47b84b7..cd72f524e8 100644
--- a/src/app/(main)/reports/goals/GoalsParameters.module.css
+++ b/src/app/(main)/reports/goals/GoalsParameters.module.css
@@ -4,6 +4,16 @@
   font-weight: 600;
 }
 
+.eventData {
+  color: var(--orange900);
+  background-color: var(--orange100);
+  font-size: 12px;
+  font-weight: 900;
+  padding: 2px 8px;
+  border-radius: 5px;
+  width: fit-content;
+}
+
 .goal {
   color: var(--blue900);
   background-color: var(--blue100);
@@ -11,4 +21,5 @@
   font-weight: 900;
   padding: 2px 8px;
   border-radius: 5px;
+  width: fit-content;
 }
diff --git a/src/app/(main)/reports/goals/GoalsParameters.tsx b/src/app/(main)/reports/goals/GoalsParameters.tsx
index 55955973b9..8d85dc2043 100644
--- a/src/app/(main)/reports/goals/GoalsParameters.tsx
+++ b/src/app/(main)/reports/goals/GoalsParameters.tsx
@@ -4,6 +4,7 @@ import { formatNumber } from 'lib/format';
 import { useContext } from 'react';
 import {
   Button,
+  Flexbox,
   Form,
   FormButtons,
   FormRow,
@@ -79,33 +80,53 @@ export function GoalsParameters() {
       <BaseParameters allowWebsiteSelect={!id} />
       <FormRow label={formatMessage(labels.goals)} action={<AddGoalsButton />}>
         <ParameterList>
-          {goals.map((goal: { type: string; value: string; goal: number }, index: number) => {
-            return (
-              <PopupTrigger key={index}>
-                <ParameterList.Item
-                  icon={goal.type === 'url' ? <Icons.Eye /> : <Icons.Bolt />}
-                  onRemove={() => handleRemoveGoals(index)}
-                >
-                  <div className={styles.value}>{goal.value}</div>
-                  <div className={styles.goal}>
-                    {formatMessage(labels.goal)}: {formatNumber(goal.goal)}
-                  </div>
-                </ParameterList.Item>
-                <Popup alignment="start">
-                  {(close: () => void) => (
-                    <PopupForm>
-                      <GoalsAddForm
-                        type={goal.type}
-                        value={goal.value}
-                        goal={goal.goal}
-                        onChange={handleUpdateGoals.bind(null, close, index)}
-                      />
-                    </PopupForm>
-                  )}
-                </Popup>
-              </PopupTrigger>
-            );
-          })}
+          {goals.map(
+            (
+              goal: {
+                type: string;
+                value: string;
+                goal: number;
+                operator?: string;
+                property?: string;
+              },
+              index: number,
+            ) => {
+              return (
+                <PopupTrigger key={index}>
+                  <ParameterList.Item
+                    icon={goal.type === 'url' ? <Icons.Eye /> : <Icons.Bolt />}
+                    onRemove={() => handleRemoveGoals(index)}
+                  >
+                    <Flexbox direction="column" gap={5}>
+                      <div className={styles.value}>{goal.value}</div>
+                      {goal.type === 'event-data' && (
+                        <div className={styles.eventData}>
+                          {formatMessage(labels[goal.operator])}: {goal.property}
+                        </div>
+                      )}
+                      <div className={styles.goal}>
+                        {formatMessage(labels.goal)}: {formatNumber(goal.goal)}
+                      </div>
+                    </Flexbox>
+                  </ParameterList.Item>
+                  <Popup alignment="start">
+                    {(close: () => void) => (
+                      <PopupForm>
+                        <GoalsAddForm
+                          type={goal.type}
+                          value={goal.value}
+                          goal={goal.goal}
+                          operator={goal.operator}
+                          property={goal.property}
+                          onChange={handleUpdateGoals.bind(null, close, index)}
+                        />
+                      </PopupForm>
+                    )}
+                  </Popup>
+                </PopupTrigger>
+              );
+            },
+          )}
         </ParameterList>
       </FormRow>
       <FormButtons>
diff --git a/src/components/messages.ts b/src/components/messages.ts
index 238ebf5242..0844847655 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -95,6 +95,9 @@ export const labels = defineMessages({
   devices: { id: 'label.devices', defaultMessage: 'Devices' },
   countries: { id: 'label.countries', defaultMessage: 'Countries' },
   languages: { id: 'label.languages', defaultMessage: 'Languages' },
+  count: { id: 'label.count', defaultMessage: 'Count' },
+  average: { id: 'label.average', defaultMessage: 'Average' },
+  sum: { id: 'label.sum', defaultMessage: 'Sum' },
   event: { id: 'label.event', defaultMessage: 'Event' },
   events: { id: 'label.events', defaultMessage: 'Events' },
   query: { id: 'label.query', defaultMessage: 'Query' },
@@ -107,6 +110,7 @@ export const labels = defineMessages({
   views: { id: 'label.views', defaultMessage: 'Views' },
   none: { id: 'label.none', defaultMessage: 'None' },
   clearAll: { id: 'label.clear-all', defaultMessage: 'Clear all' },
+  property: { id: 'label.property', defaultMessage: 'Property' },
   today: { id: 'label.today', defaultMessage: 'Today' },
   lastHours: { id: 'label.last-hours', defaultMessage: 'Last {x} hours' },
   yesterday: { id: 'label.yesterday', defaultMessage: 'Yesterday' },
@@ -178,8 +182,6 @@ export const labels = defineMessages({
   before: { id: 'label.before', defaultMessage: 'Before' },
   after: { id: 'label.after', defaultMessage: 'After' },
   total: { id: 'label.total', defaultMessage: 'Total' },
-  sum: { id: 'label.sum', defaultMessage: 'Sum' },
-  average: { id: 'label.average', defaultMessage: 'Average' },
   min: { id: 'label.min', defaultMessage: 'Min' },
   max: { id: 'label.max', defaultMessage: 'Max' },
   unique: { id: 'label.unique', defaultMessage: 'Unique' },
@@ -220,6 +222,10 @@ export const labels = defineMessages({
     id: 'message.viewed-page',
     defaultMessage: 'Viewed page',
   },
+  collectedData: {
+    id: 'message.collected-data',
+    defaultMessage: 'Collected data',
+  },
   triggeredEvent: {
     id: 'message.triggered-event',
     defaultMessage: 'Triggered event',
@@ -241,7 +247,6 @@ export const labels = defineMessages({
     id: 'label.goals-description',
     defaultMessage: 'Track your goals for pageviews and events.',
   },
-  count: { id: 'label.count', defaultMessage: 'Count' },
   journey: { id: 'label.journey', defaultMessage: 'Journey' },
   journeyDescription: {
     id: 'label.journey-description',
diff --git a/src/pages/api/reports/goals.ts b/src/pages/api/reports/goals.ts
index bb7667751c..f775dc3c88 100644
--- a/src/pages/api/reports/goals.ts
+++ b/src/pages/api/reports/goals.ts
@@ -28,9 +28,23 @@ const schema = {
       .array()
       .of(
         yup.object().shape({
-          type: yup.string().required(),
+          type: yup
+            .string()
+            .matches(/url|event|event-data/i)
+            .required(),
           value: yup.string().required(),
           goal: yup.number().required(),
+          operator: yup
+            .string()
+            .matches(/count|sum|average/i)
+            .when('type', {
+              is: 'eventData',
+              then: yup.string().required(),
+            }),
+          property: yup.string().when('type', {
+            is: 'eventData',
+            then: yup.string().required(),
+          }),
         }),
       )
       .min(1)
diff --git a/src/queries/analytics/reports/getGoals.ts b/src/queries/analytics/reports/getGoals.ts
index d26998d03a..66c1d9518d 100644
--- a/src/queries/analytics/reports/getGoals.ts
+++ b/src/queries/analytics/reports/getGoals.ts
@@ -8,7 +8,7 @@ export async function getGoals(
     criteria: {
       startDate: Date;
       endDate: Date;
-      goals: { type: string; value: string; goal: number }[];
+      goals: { type: string; value: string; goal: number; operator?: string }[];
     },
   ]
 ) {
@@ -23,7 +23,7 @@ async function relationalQuery(
   criteria: {
     startDate: Date;
     endDate: Date;
-    goals: { type: string; value: string; goal: number }[];
+    goals: { type: string; value: string; goal: number; operator?: string }[];
   },
 ): Promise<any> {
   const { startDate, endDate, goals } = criteria;
@@ -119,7 +119,7 @@ async function clickhouseQuery(
   criteria: {
     startDate: Date;
     endDate: Date;
-    goals: { type: string; value: string; goal: number }[];
+    goals: { type: string; value: string; goal: number; operator?: string; property?: string }[];
   },
 ): Promise<{ type: string; value: string; goal: number; result: number }[]> {
   const { startDate, endDate, goals } = criteria;
@@ -127,13 +127,22 @@ async function clickhouseQuery(
 
   const urls = goals.filter(a => a.type === 'url');
   const events = goals.filter(a => a.type === 'event');
+  const eventData = goals.filter(a => a.type === 'event-data');
 
   const hasUrl = urls.length > 0;
   const hasEvent = events.length > 0;
+  const hasEventData = eventData.length > 0;
 
   function getParameters(
     urls: { type: string; value: string; goal: number }[],
     events: { type: string; value: string; goal: number }[],
+    eventData: {
+      type: string;
+      value: string;
+      goal: number;
+      operator?: string;
+      property?: string;
+    }[],
   ) {
     const urlParam = urls.reduce((acc, cv, i) => {
       acc[`${cv.type}${i}`] = cv.value;
@@ -145,41 +154,77 @@ async function clickhouseQuery(
       return acc;
     }, {});
 
+    const eventDataParam = eventData.reduce((acc, cv, i) => {
+      acc[`eventData${i}`] = cv.value;
+      acc[`property${i}`] = cv.property;
+      return acc;
+    }, {});
+
     return {
       urls: { ...urlParam, startDate, endDate, websiteId },
       events: { ...eventParam, startDate, endDate, websiteId },
+      eventData: { ...eventDataParam, startDate, endDate, websiteId },
     };
   }
 
   function getColumns(
     urls: { type: string; value: string; goal: number }[],
     events: { type: string; value: string; goal: number }[],
+    eventData: {
+      type: string;
+      value: string;
+      goal: number;
+      operator?: string;
+      property?: string;
+    }[],
   ) {
     const urlColumns = urls
       .map((a, i) => `countIf(url_path = {url${i}:String}) AS URL${i},`)
       .join('\n')
       .slice(0, -1);
     const eventColumns = events
-      .map((a, i) => `countIf(event_name = {event${i}:String}) AS EVENT${i}`)
+      .map((a, i) => `countIf(event_name = {event${i}:String}) AS EVENT${i},`)
+      .join('\n')
+      .slice(0, -1);
+    const eventDataColumns = eventData
+      .map(
+        (a, i) =>
+          `${a.operator === 'average' ? 'avg' : a.operator}If(${
+            a.operator !== 'count' ? 'number_value, ' : ''
+          }event_name = {eventData${i}:String} AND data_key = {property${i}:String}) AS EVENT_DATA${i},`,
+      )
       .join('\n')
       .slice(0, -1);
 
-    return { url: urlColumns, events: eventColumns };
+    return { url: urlColumns, events: eventColumns, eventData: eventDataColumns };
   }
 
   function getWhere(
     urls: { type: string; value: string; goal: number }[],
     events: { type: string; value: string; goal: number }[],
+    eventData: {
+      type: string;
+      value: string;
+      goal: number;
+      operator?: string;
+      property?: string;
+    }[],
   ) {
     const urlWhere = urls.map((a, i) => `{url${i}:String}`).join(',');
     const eventWhere = events.map((a, i) => `{event${i}:String}`).join(',');
+    const eventDataNameWhere = eventData.map((a, i) => `{eventData${i}:String}`).join(',');
+    const eventDataKeyWhere = eventData.map((a, i) => `{property${i}:String}`).join(',');
 
-    return { urls: `and url_path in (${urlWhere})`, events: `and event_name in (${eventWhere})` };
+    return {
+      urls: `and url_path in (${urlWhere})`,
+      events: `and event_name in (${eventWhere})`,
+      eventData: `and event_name in (${eventDataNameWhere}) and data_key in (${eventDataKeyWhere})`,
+    };
   }
 
-  const parameters = getParameters(urls, events);
-  const columns = getColumns(urls, events);
-  const where = getWhere(urls, events);
+  const parameters = getParameters(urls, events, eventData);
+  const columns = getColumns(urls, events, eventData);
+  const where = getWhere(urls, events, eventData);
 
   const urlResults = hasUrl
     ? await rawQuery<any>(
@@ -221,5 +266,25 @@ async function clickhouseQuery(
       })
     : [];
 
-  return [...urlResults, ...eventResults];
+  const eventDataResults = hasEventData
+    ? await rawQuery<any>(
+        `
+  select
+    ${columns.eventData}
+  from event_data
+  where website_id = {websiteId:UUID}
+    ${where.eventData}
+    and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+  `,
+        parameters.eventData,
+      ).then(a => {
+        const results = a[0];
+
+        return Object.keys(results).map((key, i) => {
+          return { ...eventData[i], goal: Number(eventData[i].goal), result: Number(results[key]) };
+        });
+      })
+    : [];
+
+  return [...urlResults, ...eventResults, ...eventDataResults];
 }

From 5c9abe966bddc12964e78bd938c28bbc3c012193 Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Mon, 20 May 2024 23:58:40 -0700
Subject: [PATCH 082/438] add psql.

---
 src/queries/analytics/reports/getGoals.ts | 189 ++++++++++++++++------
 1 file changed, 138 insertions(+), 51 deletions(-)

diff --git a/src/queries/analytics/reports/getGoals.ts b/src/queries/analytics/reports/getGoals.ts
index 66c1d9518d..cecdd10c62 100644
--- a/src/queries/analytics/reports/getGoals.ts
+++ b/src/queries/analytics/reports/getGoals.ts
@@ -29,89 +29,176 @@ async function relationalQuery(
   const { startDate, endDate, goals } = criteria;
   const { rawQuery } = prisma;
 
-  const hasUrl = goals.some(a => a.type === 'url');
-  const hasEvent = goals.some(a => a.type === 'event');
-
-  function getParameters(goals: { type: string; value: string; goal: number }[]) {
-    const urls = goals
-      .filter(a => a.type === 'url')
-      .reduce((acc, cv, i) => {
-        acc[`${cv.type}${i}`] = cv.value;
-        return acc;
-      }, {});
-
-    const events = goals
-      .filter(a => a.type === 'event')
-      .reduce((acc, cv, i) => {
-        acc[`${cv.type}${i}`] = cv.value;
-        return acc;
-      }, {});
+  const urls = goals.filter(a => a.type === 'url');
+  const events = goals.filter(a => a.type === 'event');
+  const eventData = goals.filter(a => a.type === 'event-data');
+
+  const hasUrl = urls.length > 0;
+  const hasEvent = events.length > 0;
+  const hasEventData = eventData.length > 0;
+
+  function getParameters(
+    urls: { type: string; value: string; goal: number }[],
+    events: { type: string; value: string; goal: number }[],
+    eventData: {
+      type: string;
+      value: string;
+      goal: number;
+      operator?: string;
+      property?: string;
+    }[],
+  ) {
+    const urlParam = urls.reduce((acc, cv, i) => {
+      acc[`${cv.type}${i}`] = cv.value;
+      return acc;
+    }, {});
+
+    const eventParam = events.reduce((acc, cv, i) => {
+      acc[`${cv.type}${i}`] = cv.value;
+      return acc;
+    }, {});
+
+    const eventDataParam = eventData.reduce((acc, cv, i) => {
+      acc[`eventData${i}`] = cv.value;
+      acc[`property${i}`] = cv.property;
+      acc[`eventData${i + 999}`] = cv.value;
+      acc[`property${i + 999}`] = cv.property;
+      return acc;
+    }, {});
 
     return {
-      urls: { ...urls, startDate, endDate, websiteId },
-      events: { ...events, startDate, endDate, websiteId },
+      urls: { ...urlParam, startDate, endDate, websiteId },
+      events: { ...eventParam, startDate, endDate, websiteId },
+      eventData: { ...eventDataParam, startDate, endDate, websiteId },
     };
   }
 
-  function getColumns(goals: { type: string; value: string; goal: number }[]) {
-    const urls = goals
-      .filter(a => a.type === 'url')
-      .map((a, i) => `COUNT(CASE WHEN url_path =  {{url${i}}} THEN 1 END) AS URL${i}`)
-      .join('\n');
-    const events = goals
-      .filter(a => a.type === 'event')
-      .map((a, i) => `COUNT(CASE WHEN url_path =  {{event${i}}} THEN 1 END) AS EVENT${i}`)
-      .join('\n');
-
-    return { urls, events };
+  function getColumns(
+    urls: { type: string; value: string; goal: number }[],
+    events: { type: string; value: string; goal: number }[],
+    eventData: {
+      type: string;
+      value: string;
+      goal: number;
+      operator?: string;
+      property?: string;
+    }[],
+  ) {
+    const urlColumns = urls
+      .map((a, i) => `COUNT(CASE WHEN url_path = {{url${i}}} THEN 1 END) AS URL${i},`)
+      .join('\n')
+      .slice(0, -1);
+    const eventColumns = events
+      .map((a, i) => `COUNT(CASE WHEN url_path = {{event${i}}} THEN 1 END) AS EVENT${i},`)
+      .join('\n')
+      .slice(0, -1);
+    const eventDataColumns = eventData
+      .map(
+        (a, i) =>
+          `${
+            a.operator === 'average' ? 'avg' : a.operator
+          }(CASE WHEN event_name = {{eventData${i}}} AND data_key = {{property${i}}} THEN ${
+            a.operator === 'count' ? '1' : 'number_value'
+          } END) AS EVENT_DATA${i},`,
+      )
+      .join('\n')
+      .slice(0, -1);
+
+    return { urls: urlColumns, events: eventColumns, eventData: eventDataColumns };
   }
 
-  function getWhere(goals: { type: string; value: string; goal: number }[]) {
-    const urls = goals
-      .filter(a => a.type === 'url')
-      .map((a, i) => `{{url${i}}}`)
-      .join(',');
-    const events = goals
-      .filter(a => a.type === 'event')
-      .map((a, i) => `{{event${i}}}`)
-      .join(',');
-
-    return { urls: `and url_path in (${urls})`, events: `and event_name in (${events})` };
+  function getWhere(
+    urls: { type: string; value: string; goal: number }[],
+    events: { type: string; value: string; goal: number }[],
+    eventData: {
+      type: string;
+      value: string;
+      goal: number;
+      operator?: string;
+      property?: string;
+    }[],
+  ) {
+    const urlWhere = urls.map((a, i) => `{{url${i}}}`).join(',');
+    const eventWhere = events.map((a, i) => `{{event${i}}}`).join(',');
+    const eventDataNameWhere = eventData.map((a, i) => `{{eventData${i + 999}}}`).join(',');
+    const eventDataKeyWhere = eventData.map((a, i) => `{{property${i + 999}}}`).join(',');
+
+    return {
+      urls: `and url_path in (${urlWhere})`,
+      events: `and event_name in (${eventWhere})`,
+      eventData: `and event_name in (${eventDataNameWhere}) and data_key in (${eventDataKeyWhere})`,
+    };
   }
 
-  const parameters = getParameters(goals);
-  const columns = getColumns(goals);
-  const where = getWhere(goals);
+  const parameters = getParameters(urls, events, eventData);
+  const columns = getColumns(urls, events, eventData);
+  const where = getWhere(urls, events, eventData);
 
-  const urls = hasUrl
+  const urlResults = hasUrl
     ? await rawQuery(
         `
   select
     ${columns.urls}
   from website_event
-    where websiteId = {{websiteId::uuid}}
+    where website_id = {{websiteId::uuid}}
       ${where.urls}
       and created_at between {{startDate}} and {{endDate}}
   `,
         parameters.urls,
-      )
+      ).then(a => {
+        const results = a[0];
+
+        return Object.keys(results).map((key, i) => ({
+          ...urls[i],
+          goal: Number(urls[i].goal),
+          result: Number(results[key]),
+        }));
+      })
     : [];
 
-  const events = hasEvent
+  const eventResults = hasEvent
     ? await rawQuery(
         `
   select
     ${columns.events}
   from website_event
-    where websiteId = {{websiteId::uuid}}
+    where website_id = {{websiteId::uuid}}
       ${where.events}
       and created_at between {{startDate}} and {{endDate}}
   `,
         parameters.events,
-      )
+      ).then(a => {
+        const results = a[0];
+
+        return Object.keys(results).map((key, i) => {
+          return { ...events[i], goal: Number(events[i].goal), result: Number(results[key]) };
+        });
+      })
+    : [];
+
+  const eventDataResults = hasEventData
+    ? await rawQuery(
+        `
+  select
+    ${columns.eventData}
+  from website_event w
+      join event_data d
+      on d.website_event_id = w.event_id
+    where w.website_id = {{websiteId::uuid}}
+      ${where.eventData}
+      and w.created_at between {{startDate}} and {{endDate}}
+  `,
+        parameters.eventData,
+      ).then(a => {
+        const results = a[0];
+
+        return Object.keys(results).map((key, i) => {
+          return { ...eventData[i], goal: Number(eventData[i].goal), result: Number(results[key]) };
+        });
+      })
     : [];
 
-  return [...urls, ...events];
+  return [...urlResults, ...eventResults, ...eventDataResults];
 }
 
 async function clickhouseQuery(

From 7add6d583a1296f3d4be273aed81a0ddd290020a Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Tue, 21 May 2024 10:44:27 -0700
Subject: [PATCH 083/438] fix params

---
 src/queries/analytics/reports/getGoals.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/queries/analytics/reports/getGoals.ts b/src/queries/analytics/reports/getGoals.ts
index cecdd10c62..21ab2f7f21 100644
--- a/src/queries/analytics/reports/getGoals.ts
+++ b/src/queries/analytics/reports/getGoals.ts
@@ -61,8 +61,6 @@ async function relationalQuery(
     const eventDataParam = eventData.reduce((acc, cv, i) => {
       acc[`eventData${i}`] = cv.value;
       acc[`property${i}`] = cv.property;
-      acc[`eventData${i + 999}`] = cv.value;
-      acc[`property${i + 999}`] = cv.property;
       return acc;
     }, {});
 
@@ -120,8 +118,8 @@ async function relationalQuery(
   ) {
     const urlWhere = urls.map((a, i) => `{{url${i}}}`).join(',');
     const eventWhere = events.map((a, i) => `{{event${i}}}`).join(',');
-    const eventDataNameWhere = eventData.map((a, i) => `{{eventData${i + 999}}}`).join(',');
-    const eventDataKeyWhere = eventData.map((a, i) => `{{property${i + 999}}}`).join(',');
+    const eventDataNameWhere = eventData.map((a, i) => `{{eventData${i}}}`).join(',');
+    const eventDataKeyWhere = eventData.map((a, i) => `{{property${i}}}`).join(',');
 
     return {
       urls: `and url_path in (${urlWhere})`,

From 8e00a278db2788bf01822a480de1e3d0e2f43074 Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Tue, 21 May 2024 11:14:38 -0700
Subject: [PATCH 084/438] fix eent query

---
 src/queries/analytics/reports/getGoals.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/queries/analytics/reports/getGoals.ts b/src/queries/analytics/reports/getGoals.ts
index 21ab2f7f21..83b0ce971c 100644
--- a/src/queries/analytics/reports/getGoals.ts
+++ b/src/queries/analytics/reports/getGoals.ts
@@ -87,7 +87,7 @@ async function relationalQuery(
       .join('\n')
       .slice(0, -1);
     const eventColumns = events
-      .map((a, i) => `COUNT(CASE WHEN url_path = {{event${i}}} THEN 1 END) AS EVENT${i},`)
+      .map((a, i) => `COUNT(CASE WHEN event_name = {{event${i}}} THEN 1 END) AS EVENT${i},`)
       .join('\n')
       .slice(0, -1);
     const eventDataColumns = eventData

From 6589bc6ecb10a4afabeb73cc97c1819340fb78b0 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 21 May 2024 21:15:31 -0700
Subject: [PATCH 085/438] Redesigned filter bar.

---
 .../websites/[websiteId]/WebsiteDetails.tsx       | 12 ++++++++++--
 .../websites/[websiteId]/WebsiteFilterButton.tsx  | 10 ++++++++--
 .../(main)/websites/[websiteId]/WebsiteHeader.tsx |  5 +++++
 .../[websiteId]/WebsiteMetricsBar.module.css      |  6 ------
 .../websites/[websiteId]/WebsiteMetricsBar.tsx    | 14 +++-----------
 .../[websiteId]/compare/WebsiteComparePage.tsx    | 13 +++++++++++++
 .../(main)/websites/[websiteId]/compare/page.tsx  | 10 ++++++++++
 src/assets/compare.svg                            |  1 +
 src/assets/target.svg                             |  2 +-
 src/components/icons.ts                           |  2 ++
 src/components/messages.ts                        |  1 +
 src/components/metrics/FilterTags.module.css      | 15 ++++++++++++---
 src/components/metrics/FilterTags.tsx             |  2 ++
 src/components/metrics/MetricCard.module.css      |  9 ++++++++-
 src/components/metrics/MetricCard.tsx             |  6 +++---
 src/declaration.d.ts                              |  1 +
 src/lib/clickhouse.ts                             |  5 +----
 .../analytics/pageviews/getPageviewMetrics.ts     | 10 +++++-----
 18 files changed, 86 insertions(+), 38 deletions(-)
 create mode 100644 src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
 create mode 100644 src/app/(main)/websites/[websiteId]/compare/page.tsx
 create mode 100644 src/assets/compare.svg

diff --git a/src/app/(main)/websites/[websiteId]/WebsiteDetails.tsx b/src/app/(main)/websites/[websiteId]/WebsiteDetails.tsx
index 1a131da13c..8c8ab2f225 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteDetails.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteDetails.tsx
@@ -9,6 +9,7 @@ import WebsiteExpandedView from './WebsiteExpandedView';
 import WebsiteHeader from './WebsiteHeader';
 import WebsiteMetricsBar from './WebsiteMetricsBar';
 import WebsiteTableView from './WebsiteTableView';
+import { FILTER_COLUMNS } from 'lib/constants';
 
 export default function WebsiteDetails({ websiteId }: { websiteId: string }) {
   const { data: website, isLoading, error } = useWebsite(websiteId);
@@ -20,13 +21,20 @@ export default function WebsiteDetails({ websiteId }: { websiteId: string }) {
   }
 
   const showLinks = !pathname.includes('/share/');
-  const { view, ...params } = query;
+  const { view } = query;
+
+  const params = Object.keys(query).reduce((obj, key) => {
+    if (FILTER_COLUMNS[key]) {
+      obj[key] = query[key];
+    }
+    return obj;
+  }, {});
 
   return (
     <>
       <WebsiteHeader websiteId={websiteId} showLinks={showLinks} />
       <FilterTags websiteId={websiteId} params={params} />
-      <WebsiteMetricsBar websiteId={websiteId} sticky={true} />
+      <WebsiteMetricsBar websiteId={websiteId} />
       <WebsiteChart websiteId={websiteId} />
       {!website && <Loading icon="dots" style={{ minHeight: 300 }} />}
       {website && (
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx b/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx
index a96717571b..1d0c7a6a4a 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx
@@ -9,9 +9,15 @@ import styles from './WebsiteFilterButton.module.css';
 export function WebsiteFilterButton({
   websiteId,
   className,
+  position = 'bottom',
+  alignment = 'end',
+  showText = true,
 }: {
   websiteId: string;
   className?: string;
+  position?: 'bottom' | 'top' | 'left' | 'right';
+  alignment?: 'end' | 'center' | 'start';
+  showText?: boolean;
 }) {
   const { formatMessage, labels } = useMessages();
   const { renderUrl, router } = useNavigation();
@@ -30,9 +36,9 @@ export function WebsiteFilterButton({
         <Icon>
           <Icons.Plus />
         </Icon>
-        <Text>{formatMessage(labels.filter)}</Text>
+        {showText && <Text>{formatMessage(labels.filter)}</Text>}
       </Button>
-      <Popup position="bottom" alignment="end">
+      <Popup position={position} alignment={alignment}>
         {(close: () => void) => {
           return (
             <PopupForm>
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
index dc0f4338eb..0cbaeb44d7 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
@@ -30,6 +30,11 @@ export function WebsiteHeader({
       icon: <Icons.Overview />,
       path: '',
     },
+    {
+      label: formatMessage(labels.compare),
+      icon: <Icons.Compare />,
+      path: '/compare',
+    },
     {
       label: formatMessage(labels.realtime),
       icon: <Icons.Clock />,
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.module.css b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.module.css
index db48bd550f..e986396138 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.module.css
+++ b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.module.css
@@ -38,9 +38,3 @@
     border-bottom: 1px solid var(--base300);
   }
 }
-
-@media screen and (max-width: 768px) {
-  .button {
-    display: none;
-  }
-}
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
index e4acea3bf1..06947a515b 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
@@ -5,18 +5,10 @@ import MetricCard from 'components/metrics/MetricCard';
 import MetricsBar from 'components/metrics/MetricsBar';
 import { formatShortTime } from 'lib/format';
 import WebsiteFilterButton from './WebsiteFilterButton';
-import styles from './WebsiteMetricsBar.module.css';
 import useWebsiteStats from 'components/hooks/queries/useWebsiteStats';
+import styles from './WebsiteMetricsBar.module.css';
 
-export function WebsiteMetricsBar({
-  websiteId,
-  showFilter = true,
-  sticky,
-}: {
-  websiteId: string;
-  showFilter?: boolean;
-  sticky?: boolean;
-}) {
+export function WebsiteMetricsBar({ websiteId, sticky }: { websiteId: string; sticky?: boolean }) {
   const { formatMessage, labels } = useMessages();
   const { ref, isSticky } = useSticky({ enabled: sticky });
   const { data, isLoading, isFetched, error } = useWebsiteStats(websiteId);
@@ -89,7 +81,7 @@ export function WebsiteMetricsBar({
         )}
       </MetricsBar>
       <div className={styles.actions}>
-        {showFilter && <WebsiteFilterButton websiteId={websiteId} className={styles.button} />}
+        <WebsiteFilterButton websiteId={websiteId} />
         <WebsiteDateFilter websiteId={websiteId} />
       </div>
     </div>
diff --git a/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx b/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
new file mode 100644
index 0000000000..2fe971ae19
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
@@ -0,0 +1,13 @@
+import WebsiteHeader from '../WebsiteHeader';
+import WebsiteMetricsBar from '../WebsiteMetricsBar';
+
+export function WebsiteComparePage({ websiteId }) {
+  return (
+    <>
+      <WebsiteHeader websiteId={websiteId} />
+      <WebsiteMetricsBar websiteId={websiteId} />
+    </>
+  );
+}
+
+export default WebsiteComparePage;
diff --git a/src/app/(main)/websites/[websiteId]/compare/page.tsx b/src/app/(main)/websites/[websiteId]/compare/page.tsx
new file mode 100644
index 0000000000..b3009fcaaa
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/compare/page.tsx
@@ -0,0 +1,10 @@
+import WebsiteComparePage from './WebsiteComparePage';
+import { Metadata } from 'next';
+
+export default function ({ params: { websiteId } }) {
+  return <WebsiteComparePage websiteId={websiteId} />;
+}
+
+export const metadata: Metadata = {
+  title: 'Website Comparison',
+};
diff --git a/src/assets/compare.svg b/src/assets/compare.svg
new file mode 100644
index 0000000000..e037c24350
--- /dev/null
+++ b/src/assets/compare.svg
@@ -0,0 +1 @@
+<svg height="512" viewBox="0 0 24 24" width="512" xmlns="http://www.w3.org/2000/svg"><path d="M6 22a1 1 0 0 1-.71-.29l-4-4a1 1 0 0 1 0-1.42l4-4a1 1 0 0 1 1.42 1.42L4.41 16H22a1 1 0 0 1 0 2H4.41l2.3 2.29a1 1 0 0 1 0 1.42A1 1 0 0 1 6 22zm12-10a1 1 0 0 1-.71-.29 1 1 0 0 1 0-1.42L19.59 8H2a1 1 0 0 1 0-2h17.59l-2.3-2.29a1 1 0 0 1 1.42-1.42l4 4a1 1 0 0 1 0 1.42l-4 4A1 1 0 0 1 18 12z"/></svg>
\ No newline at end of file
diff --git a/src/assets/target.svg b/src/assets/target.svg
index 000f34c7d2..c2e47e32da 100644
--- a/src/assets/target.svg
+++ b/src/assets/target.svg
@@ -1 +1 @@
-<svg clip-rule="evenodd" fill-rule="evenodd" height="512" stroke-linejoin="round" stroke-miterlimit="2" viewBox="0 0 24 24" width="512" xmlns="http://www.w3.org/2000/svg"><g id="Icon"><path d="m19.393 10.825c-.097-.403.151-.808.553-.905.402-.098.808.15.905.553.181.75.277 1.533.277 2.338 0 5.485-4.453 9.939-9.939 9.939-5.485 0-9.939-4.454-9.939-9.939 0-5.486 4.454-9.939 9.939-9.939.805 0 1.588.096 2.338.277.403.097.651.503.553.905-.097.402-.502.65-.905.553-.637-.154-1.302-.235-1.986-.235-4.658 0-8.439 3.781-8.439 8.439s3.781 8.439 8.439 8.439 8.439-3.781 8.439-8.439c0-.684-.081-1.349-.235-1.986z"/><path d="m14.764 12.811c0-.414.336-.75.75-.75.413 0 .75.336.75.75 0 2.8-2.274 5.074-5.075 5.074-2.8 0-5.074-2.274-5.074-5.074 0-2.801 2.274-5.075 5.074-5.075.414 0 .75.337.75.75 0 .414-.336.75-.75.75-1.973 0-3.574 1.602-3.574 3.575s1.601 3.574 3.574 3.574 3.575-1.601 3.575-3.574z"/><path d="m22.53 5.588-3.057 3.058c-.141.141-.332.22-.531.22h-3.058c-.414 0-.75-.336-.75-.75v-3.058c0-.199.079-.39.22-.531l3.058-3.057c.184-.184.45-.26.703-.2s.457.246.539.493l.646 1.937 1.937.646c.247.082.433.286.493.539s-.016.519-.2.703zm-1.918-.202-1.142-.381c-.224-.075-.4-.251-.475-.475l-.381-1.142-1.98 1.98v1.998h1.998z"/><path d="m15.354 7.585c.293-.293.768-.293 1.061 0s.293.768 0 1.061l-4.587 4.586c-.293.293-.768.293-1.06 0-.293-.292-.293-.767 0-1.06z"/></g></svg>
\ No newline at end of file
+<svg clip-rule="evenodd" fill-rule="evenodd" height="512" stroke-linejoin="round" stroke-miterlimit="2" viewBox="0 0 24 24" width="512" xmlns="http://www.w3.org/2000/svg"><path d="M19.393 10.825a.75.75 0 0 1 1.458-.352c.181.75.277 1.533.277 2.338 0 5.485-4.453 9.939-9.939 9.939-5.485 0-9.939-4.454-9.939-9.939 0-5.486 4.454-9.939 9.939-9.939.805 0 1.588.096 2.338.277a.75.75 0 1 1-.352 1.458A8.442 8.442 0 0 0 2.75 12.811a8.442 8.442 0 0 0 8.439 8.439 8.442 8.442 0 0 0 8.204-10.425z"/><path d="M14.764 12.811a.75.75 0 0 1 1.5 0c0 2.8-2.274 5.074-5.075 5.074a5.077 5.077 0 0 1-5.074-5.074 5.077 5.077 0 0 1 5.074-5.075.75.75 0 0 1 0 1.5 3.575 3.575 0 1 0 3.575 3.575zm7.766-7.223-3.057 3.058a.75.75 0 0 1-.531.22h-3.058a.75.75 0 0 1-.75-.75V5.058a.75.75 0 0 1 .22-.531l3.058-3.057a.75.75 0 0 1 1.242.293L20.3 3.7l1.937.646a.75.75 0 0 1 .293 1.242zm-1.918-.202-1.142-.381a.753.753 0 0 1-.475-.475l-.381-1.142-1.98 1.98v1.998h1.998z"/><path d="M15.354 7.585a.75.75 0 1 1 1.061 1.061l-4.587 4.586a.749.749 0 1 1-1.06-1.06z"/></svg>
\ No newline at end of file
diff --git a/src/components/icons.ts b/src/components/icons.ts
index 3cbb09d25f..8e5a481cbf 100644
--- a/src/components/icons.ts
+++ b/src/components/icons.ts
@@ -6,6 +6,7 @@ import Bolt from 'assets/bolt.svg';
 import Calendar from 'assets/calendar.svg';
 import Change from 'assets/change.svg';
 import Clock from 'assets/clock.svg';
+import Compare from 'assets/compare.svg';
 import Dashboard from 'assets/dashboard.svg';
 import Eye from 'assets/eye.svg';
 import Gear from 'assets/gear.svg';
@@ -32,6 +33,7 @@ const icons = {
   Calendar,
   Change,
   Clock,
+  Compare,
   Dashboard,
   Eye,
   Gear,
diff --git a/src/components/messages.ts b/src/components/messages.ts
index 238ebf5242..6231c6f3fd 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -247,6 +247,7 @@ export const labels = defineMessages({
     id: 'label.journey-description',
     defaultMessage: 'Understand how users nagivate through your website.',
   },
+  compare: { id: 'label.compare', defaultMessage: 'Compare' },
 });
 
 export const messages = defineMessages({
diff --git a/src/components/metrics/FilterTags.module.css b/src/components/metrics/FilterTags.module.css
index fe5c345cef..ea7714f47c 100644
--- a/src/components/metrics/FilterTags.module.css
+++ b/src/components/metrics/FilterTags.module.css
@@ -2,6 +2,12 @@
   display: flex;
   align-items: center;
   gap: 10px;
+  background: var(--base75);
+  padding: 10px 20px;
+  border: 1px solid var(--base400);
+  border-radius: 8px;
+  margin-bottom: 20px;
+  flex-wrap: wrap;
 }
 
 .label {
@@ -12,12 +18,13 @@
   display: flex;
   flex-direction: row;
   align-items: center;
-  gap: 10px;
-  background: var(--base75);
+  gap: 4px;
+  font-size: 12px;
+  background: var(--base50);
   border: 1px solid var(--base400);
   border-radius: var(--border-radius);
   box-shadow: 1px 1px 1px var(--base500);
-  padding: 8px 16px;
+  padding: 6px 14px;
   cursor: pointer;
 }
 
@@ -27,6 +34,8 @@
 
 .close {
   font-weight: 700;
+  align-self: center;
+  margin-left: auto;
 }
 
 .name,
diff --git a/src/components/metrics/FilterTags.tsx b/src/components/metrics/FilterTags.tsx
index 35d12556a7..ee136ae396 100644
--- a/src/components/metrics/FilterTags.tsx
+++ b/src/components/metrics/FilterTags.tsx
@@ -13,6 +13,7 @@ import FieldFilterEditForm from 'app/(main)/reports/[reportId]/FieldFilterEditFo
 import { OPERATOR_PREFIXES } from 'lib/constants';
 import { isSearchOperator, parseParameterValue } from 'lib/params';
 import styles from './FilterTags.module.css';
+import WebsiteFilterButton from 'app/(main)/websites/[websiteId]/WebsiteFilterButton';
 
 export function FilterTags({
   websiteId,
@@ -100,6 +101,7 @@ export function FilterTags({
           </PopupTrigger>
         );
       })}
+      <WebsiteFilterButton websiteId={websiteId} alignment="center" showText={false} />
       <Button className={styles.close} variant="quiet" onClick={handleResetFilter}>
         <Icon>
           <Icons.Close />
diff --git a/src/components/metrics/MetricCard.module.css b/src/components/metrics/MetricCard.module.css
index 8ddecc1049..03cddd38f8 100644
--- a/src/components/metrics/MetricCard.module.css
+++ b/src/components/metrics/MetricCard.module.css
@@ -2,10 +2,17 @@
   display: flex;
   flex-direction: column;
   justify-content: center;
-  min-height: 90px;
   min-width: 140px;
 }
 
+.card:first-child {
+  padding-left: 0;
+}
+
+.card:last-child {
+  border: 0;
+}
+
 .value {
   display: flex;
   align-items: center;
diff --git a/src/components/metrics/MetricCard.tsx b/src/components/metrics/MetricCard.tsx
index 2359b0e20c..0db164a261 100644
--- a/src/components/metrics/MetricCard.tsx
+++ b/src/components/metrics/MetricCard.tsx
@@ -27,9 +27,6 @@ export const MetricCard = ({
 
   return (
     <div className={classNames(styles.card, className)}>
-      <animated.div className={styles.value} title={props?.x as any}>
-        {props?.x?.to(x => format(x))}
-      </animated.div>
       <div className={styles.label}>
         {label}
         {~~change !== 0 && !hideComparison && (
@@ -45,6 +42,9 @@ export const MetricCard = ({
           </animated.span>
         )}
       </div>
+      <animated.div className={styles.value} title={props?.x as any}>
+        {props?.x?.to(x => format(x))}
+      </animated.div>
     </div>
   );
 };
diff --git a/src/declaration.d.ts b/src/declaration.d.ts
index 986adf2723..d968c14d5e 100644
--- a/src/declaration.d.ts
+++ b/src/declaration.d.ts
@@ -1,4 +1,5 @@
 declare module 'cors';
+declare module 'dateformat';
 declare module 'debug';
 declare module 'chartjs-adapter-date-fns';
 declare module 'md5';
diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index 3563484178..e5cb40c02c 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -119,10 +119,7 @@ async function parseFilters(websiteId: string, filters: QueryFilters = {}, optio
   };
 }
 
-async function rawQuery<T = unknown>(
-  query: string,
-  params: Record<string, unknown> = {},
-): Promise<T> {
+async function rawQuery(query: string, params: Record<string, unknown> = {}): Promise<unknown[]> {
   if (process.env.LOG_QUERY) {
     log('QUERY:\n', query);
     log('PARAMETERS:\n', params);
diff --git a/src/queries/analytics/pageviews/getPageviewMetrics.ts b/src/queries/analytics/pageviews/getPageviewMetrics.ts
index eaf4ae324a..5f609c126e 100644
--- a/src/queries/analytics/pageviews/getPageviewMetrics.ts
+++ b/src/queries/analytics/pageviews/getPageviewMetrics.ts
@@ -33,8 +33,8 @@ async function relationalQuery(
 
   let excludeDomain = '';
   if (column === 'referrer_domain') {
-    excludeDomain =
-      'and (website_event.referrer_domain != {{websiteDomain}} or website_event.referrer_domain is null)';
+    excludeDomain = `and website_event.referrer_domain != {{websiteDomain}}
+      and website_event.referrer_domain is not null`;
   }
 
   return rawQuery(
@@ -72,7 +72,7 @@ async function clickhouseQuery(
 
   let excludeDomain = '';
   if (column === 'referrer_domain') {
-    excludeDomain = 'and referrer_domain != {websiteDomain:String}';
+    excludeDomain = `and referrer_domain != {websiteDomain:String} and referrer_domain != ''`;
   }
 
   return rawQuery(
@@ -90,8 +90,8 @@ async function clickhouseQuery(
     offset ${offset}
     `,
     params,
-  ).then(a => {
-    return Object.values(a).map(a => {
+  ).then((result: any) => {
+    return Object.values(result).map((a: any) => {
       return { x: a.x, y: Number(a.y) };
     });
   });

From df66acaacf7902e7ec88ad4fe58872ae1053603a Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 23 May 2024 00:17:20 -0700
Subject: [PATCH 086/438] Updated metrics components for compare mode.

---
 public/intl/messages/am-ET.json               |  12 +-
 public/intl/messages/ar-SA.json               |  12 +-
 public/intl/messages/be-BY.json               |  12 +-
 public/intl/messages/bn-BD.json               |  12 +-
 public/intl/messages/bs-BA.json               |  12 +-
 public/intl/messages/ca-ES.json               |  12 +-
 public/intl/messages/cs-CZ.json               |  12 +-
 public/intl/messages/da-DK.json               |  12 +-
 public/intl/messages/de-CH.json               |  12 +-
 public/intl/messages/de-DE.json               |  12 +-
 public/intl/messages/el-GR.json               |  12 +-
 public/intl/messages/en-GB.json               |  12 +-
 public/intl/messages/en-US.json               |  12 +-
 public/intl/messages/es-ES.json               |  12 +-
 public/intl/messages/es-MX.json               |   2 +-
 public/intl/messages/fa-IR.json               |  12 +-
 public/intl/messages/fi-FI.json               |  12 +-
 public/intl/messages/fo-FO.json               |  12 +-
 public/intl/messages/fr-FR.json               |  12 +-
 public/intl/messages/ga-ES.json               |  12 +-
 public/intl/messages/he-IL.json               |  12 +-
 public/intl/messages/hi-IN.json               |  12 +-
 public/intl/messages/hr-HR.json               |  12 +-
 public/intl/messages/hu-HU.json               |  12 +-
 public/intl/messages/id-ID.json               |  12 +-
 public/intl/messages/it-IT.json               |  12 +-
 public/intl/messages/ja-JP.json               |  12 +-
 public/intl/messages/km-KH.json               |  12 +-
 public/intl/messages/ko-KR.json               |  12 +-
 public/intl/messages/lt-LT.json               |  12 +-
 public/intl/messages/mn-MN.json               |  12 +-
 public/intl/messages/ms-MY.json               |  12 +-
 public/intl/messages/my-MM.json               |  12 +-
 public/intl/messages/nb-NO.json               |  12 +-
 public/intl/messages/nl-NL.json               |  12 +-
 public/intl/messages/pl-PL.json               |  12 +-
 public/intl/messages/pt-BR.json               |  12 +-
 public/intl/messages/pt-PT.json               |  12 +-
 public/intl/messages/ro-RO.json               |  12 +-
 public/intl/messages/ru-RU.json               |  12 +-
 public/intl/messages/si-LK.json               |  12 +-
 public/intl/messages/sk-SK.json               |  12 +-
 public/intl/messages/sl-SI.json               |  12 +-
 public/intl/messages/sv-SE.json               |  12 +-
 public/intl/messages/ta-IN.json               |  12 +-
 public/intl/messages/th-TH.json               |  12 +-
 public/intl/messages/tr-TR.json               |  12 +-
 public/intl/messages/uk-UA.json               |  12 +-
 public/intl/messages/ur-PK.json               |  12 +-
 public/intl/messages/vi-VN.json               |  12 +-
 public/intl/messages/zh-CN.json               |  12 +-
 public/intl/messages/zh-TW.json               |  12 +-
 .../[websiteId]/WebsiteMetricsBar.module.css  |  15 +-
 .../[websiteId]/WebsiteMetricsBar.tsx         | 149 +++++++++++-------
 .../compare/WebsiteComparePage.tsx            |  16 +-
 .../[websiteId]/realtime/RealtimeHeader.tsx   |   8 +-
 .../hooks/queries/useWebsiteStats.ts          |  10 +-
 src/components/messages.ts                    |   4 +-
 src/components/metrics/MetricCard.module.css  |  36 +++--
 src/components/metrics/MetricCard.tsx         |  53 ++++---
 src/lang/am-ET.json                           |   2 +-
 src/lang/ar-SA.json                           |   2 +-
 src/lang/be-BY.json                           |   2 +-
 src/lang/bn-BD.json                           |   2 +-
 src/lang/bs-BA.json                           |   2 +-
 src/lang/ca-ES.json                           |   2 +-
 src/lang/cs-CZ.json                           |   2 +-
 src/lang/da-DK.json                           |   2 +-
 src/lang/de-CH.json                           |   2 +-
 src/lang/de-DE.json                           |   2 +-
 src/lang/el-GR.json                           |   2 +-
 src/lang/en-GB.json                           |   2 +-
 src/lang/en-US.json                           |   2 +-
 src/lang/es-ES.json                           |   2 +-
 src/lang/fa-IR.json                           |   2 +-
 src/lang/fi-FI.json                           |   2 +-
 src/lang/fo-FO.json                           |   2 +-
 src/lang/fr-FR.json                           |   2 +-
 src/lang/ga-ES.json                           |   2 +-
 src/lang/he-IL.json                           |   2 +-
 src/lang/hi-IN.json                           |   2 +-
 src/lang/hr-HR.json                           |   2 +-
 src/lang/hu-HU.json                           |   2 +-
 src/lang/id-ID.json                           |   2 +-
 src/lang/it-IT.json                           |   2 +-
 src/lang/ja-JP.json                           |   2 +-
 src/lang/km-KH.json                           |   2 +-
 src/lang/ko-KR.json                           |   2 +-
 src/lang/lt-LT.json                           |   2 +-
 src/lang/mn-MN.json                           |   2 +-
 src/lang/ms-MY.json                           |   2 +-
 src/lang/my-MM.json                           |   2 +-
 src/lang/nb-NO.json                           |   2 +-
 src/lang/nl-NL.json                           |   2 +-
 src/lang/pl-PL.json                           |   2 +-
 src/lang/pt-BR.json                           |  74 ++++-----
 src/lang/pt-PT.json                           |   2 +-
 src/lang/ro-RO.json                           |   2 +-
 src/lang/ru-RU.json                           |   2 +-
 src/lang/si-LK.json                           |   2 +-
 src/lang/sk-SK.json                           |   2 +-
 src/lang/sl-SI.json                           |   2 +-
 src/lang/sv-SE.json                           |   2 +-
 src/lang/ta-IN.json                           |   2 +-
 src/lang/th-TH.json                           |   2 +-
 src/lang/tr-TR.json                           |   2 +-
 src/lang/uk-UA.json                           |   2 +-
 src/lang/ur-PK.json                           |   2 +-
 src/lang/vi-VN.json                           |   2 +-
 src/lang/zh-CN.json                           |   2 +-
 src/lang/zh-TW.json                           |   2 +-
 src/pages/api/websites/[websiteId]/stats.ts   |   4 +-
 .../analytics/eventData/getEventDataEvents.ts |   8 +-
 .../analytics/eventData/getEventDataFields.ts |   4 +-
 .../analytics/eventData/getEventDataStats.ts  |   4 +-
 .../analytics/eventData/getEventDataUsage.ts  |   4 +-
 src/queries/analytics/getWebsiteStats.ts      |  12 +-
 117 files changed, 602 insertions(+), 513 deletions(-)

diff --git a/public/intl/messages/am-ET.json b/public/intl/messages/am-ET.json
index 931935a292..a3b652bbb3 100644
--- a/public/intl/messages/am-ET.json
+++ b/public/intl/messages/am-ET.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Average visit time"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Visit duration"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/ar-SA.json b/public/intl/messages/ar-SA.json
index 300d3e1a67..15f9647cac 100644
--- a/public/intl/messages/ar-SA.json
+++ b/public/intl/messages/ar-SA.json
@@ -83,12 +83,6 @@
       "value": "المتوسط"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "متوسط وقت الزيارة"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "متوسط وقت الزيارة"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/be-BY.json b/public/intl/messages/be-BY.json
index 4b8c964fbb..22557a24e9 100644
--- a/public/intl/messages/be-BY.json
+++ b/public/intl/messages/be-BY.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Сярэдняя даўжыня наведвання"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Сярэдняя даўжыня наведвання"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/bn-BD.json b/public/intl/messages/bn-BD.json
index 05de48d279..81661e3b74 100644
--- a/public/intl/messages/bn-BD.json
+++ b/public/intl/messages/bn-BD.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "গড় পরিদর্শনের সময়"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "গড় পরিদর্শনের সময়"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/bs-BA.json b/public/intl/messages/bs-BA.json
index 1360efabae..314e689e42 100644
--- a/public/intl/messages/bs-BA.json
+++ b/public/intl/messages/bs-BA.json
@@ -83,12 +83,6 @@
       "value": "Prosjek"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Prosječno vrijeme posjete"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Pregledi po posjeti"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Prosječno vrijeme posjete"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/ca-ES.json b/public/intl/messages/ca-ES.json
index e6cb4c5eab..911dd04b56 100644
--- a/public/intl/messages/ca-ES.json
+++ b/public/intl/messages/ca-ES.json
@@ -83,12 +83,6 @@
       "value": "Mitjana"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Temps mitjà de visita"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Temps mitjà de visita"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/cs-CZ.json b/public/intl/messages/cs-CZ.json
index f87ddeda63..c329fa5853 100644
--- a/public/intl/messages/cs-CZ.json
+++ b/public/intl/messages/cs-CZ.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Průměrný čas návštěvy"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Průměrný čas návštěvy"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/da-DK.json b/public/intl/messages/da-DK.json
index 332b98e8e4..c242aaf3a8 100644
--- a/public/intl/messages/da-DK.json
+++ b/public/intl/messages/da-DK.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Gennemsnitlig besøgstid"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Gennemsnitlig besøgstid"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/de-CH.json b/public/intl/messages/de-CH.json
index 9b913cea6d..69c48a1fb2 100644
--- a/public/intl/messages/de-CH.json
+++ b/public/intl/messages/de-CH.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Durchschn. Bsuechsziit"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Durchschn. Bsuechsziit"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/de-DE.json b/public/intl/messages/de-DE.json
index 9a21c400a1..2faf7770e1 100644
--- a/public/intl/messages/de-DE.json
+++ b/public/intl/messages/de-DE.json
@@ -83,12 +83,6 @@
       "value": "Durchschnitt"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Durchschn. Besuchszeit"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Durchschn. Besuchszeit"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/el-GR.json b/public/intl/messages/el-GR.json
index 7c58f14c79..5c39e267cc 100644
--- a/public/intl/messages/el-GR.json
+++ b/public/intl/messages/el-GR.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Μέσος χρόνος επίσκεψης"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Μέσος χρόνος επίσκεψης"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/en-GB.json b/public/intl/messages/en-GB.json
index 43c9019e9f..b7beda36b4 100644
--- a/public/intl/messages/en-GB.json
+++ b/public/intl/messages/en-GB.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Average visit time"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Visit duration"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/en-US.json b/public/intl/messages/en-US.json
index 1cb11f91ca..42f3bbd9dc 100644
--- a/public/intl/messages/en-US.json
+++ b/public/intl/messages/en-US.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Average visit time"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Visit duration"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/es-ES.json b/public/intl/messages/es-ES.json
index 32b3494022..be0835ae08 100644
--- a/public/intl/messages/es-ES.json
+++ b/public/intl/messages/es-ES.json
@@ -83,12 +83,6 @@
       "value": "Media"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Tiempo promedio de visita"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Tiempo promedio de visita"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/es-MX.json b/public/intl/messages/es-MX.json
index c3ef099df7..8051cde5ee 100644
--- a/public/intl/messages/es-MX.json
+++ b/public/intl/messages/es-MX.json
@@ -71,7 +71,7 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
+  "label.visit-duration": [
     {
       "type": 0,
       "value": "Tiempo promedio de visita"
diff --git a/public/intl/messages/fa-IR.json b/public/intl/messages/fa-IR.json
index 8c894c6a32..cc0e81c093 100644
--- a/public/intl/messages/fa-IR.json
+++ b/public/intl/messages/fa-IR.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "میانگین زمان بازدید"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "میانگین زمان بازدید"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/fi-FI.json b/public/intl/messages/fi-FI.json
index f855dba3f0..13a597f4d9 100644
--- a/public/intl/messages/fi-FI.json
+++ b/public/intl/messages/fi-FI.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Keskimääräinen vierailuaika"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Keskimääräinen vierailuaika"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/fo-FO.json b/public/intl/messages/fo-FO.json
index be7442eb39..b3d6258905 100644
--- a/public/intl/messages/fo-FO.json
+++ b/public/intl/messages/fo-FO.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Miðal vitjurnartíð "
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Miðal vitjurnartíð "
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/fr-FR.json b/public/intl/messages/fr-FR.json
index e33b7bf2d5..4e5f3ed55b 100644
--- a/public/intl/messages/fr-FR.json
+++ b/public/intl/messages/fr-FR.json
@@ -83,12 +83,6 @@
       "value": "Moyenne"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Temps de visite moyen"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1237,6 +1231,12 @@
       "value": "Vues par visite"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Temps de visite moyen"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/ga-ES.json b/public/intl/messages/ga-ES.json
index 4bc03ce0bb..1ce652f98f 100644
--- a/public/intl/messages/ga-ES.json
+++ b/public/intl/messages/ga-ES.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Tempo medio de visita"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1257,6 +1251,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Tempo medio de visita"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/he-IL.json b/public/intl/messages/he-IL.json
index 92aef8a034..af8a6fb1b0 100644
--- a/public/intl/messages/he-IL.json
+++ b/public/intl/messages/he-IL.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "זמן ביקור ממוצע"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1241,6 +1235,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "זמן ביקור ממוצע"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/hi-IN.json b/public/intl/messages/hi-IN.json
index ec46318147..e4c8a2ba51 100644
--- a/public/intl/messages/hi-IN.json
+++ b/public/intl/messages/hi-IN.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "औसत दृश्य समय"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "औसत दृश्य समय"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/hr-HR.json b/public/intl/messages/hr-HR.json
index 032456f879..9933e8400e 100644
--- a/public/intl/messages/hr-HR.json
+++ b/public/intl/messages/hr-HR.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Average visit time"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Visit duration"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/hu-HU.json b/public/intl/messages/hu-HU.json
index 08fd319a45..3fccf7a74a 100644
--- a/public/intl/messages/hu-HU.json
+++ b/public/intl/messages/hu-HU.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Átlagos látogatási idő"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Átlagos látogatási idő"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/id-ID.json b/public/intl/messages/id-ID.json
index 8898f1ec09..7dfe2e2f61 100644
--- a/public/intl/messages/id-ID.json
+++ b/public/intl/messages/id-ID.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Waktu kunjungan rata-rata"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1241,6 +1235,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Waktu kunjungan rata-rata"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/it-IT.json b/public/intl/messages/it-IT.json
index 471cf31f5f..d1568bae86 100644
--- a/public/intl/messages/it-IT.json
+++ b/public/intl/messages/it-IT.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Tempo medio di visita"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Tempo medio di visita"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/ja-JP.json b/public/intl/messages/ja-JP.json
index ed869857cc..55c3cae0b4 100644
--- a/public/intl/messages/ja-JP.json
+++ b/public/intl/messages/ja-JP.json
@@ -83,12 +83,6 @@
       "value": "平均"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "平均滞在時間"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "平均滞在時間"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/km-KH.json b/public/intl/messages/km-KH.json
index 63ad4841a8..7ddac46863 100644
--- a/public/intl/messages/km-KH.json
+++ b/public/intl/messages/km-KH.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "មើលជាមធ្យម"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1241,6 +1235,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "មើលជាមធ្យម"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/ko-KR.json b/public/intl/messages/ko-KR.json
index e9fc0c0da6..48dfbb3bf3 100644
--- a/public/intl/messages/ko-KR.json
+++ b/public/intl/messages/ko-KR.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "평균 방문 시간"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1253,6 +1247,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "평균 방문 시간"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/lt-LT.json b/public/intl/messages/lt-LT.json
index 261e2f9490..727e0c518f 100644
--- a/public/intl/messages/lt-LT.json
+++ b/public/intl/messages/lt-LT.json
@@ -83,12 +83,6 @@
       "value": "Vidurkis"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Vidutinė vizito trukmė"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1354,6 +1348,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Vidutinė vizito trukmė"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/mn-MN.json b/public/intl/messages/mn-MN.json
index 4833490201..484b6752da 100644
--- a/public/intl/messages/mn-MN.json
+++ b/public/intl/messages/mn-MN.json
@@ -83,12 +83,6 @@
       "value": "Дундаж"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Зочилсон дундаж хугацаа"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Зочилсон дундаж хугацаа"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/ms-MY.json b/public/intl/messages/ms-MY.json
index 58034742e4..7d9b836996 100644
--- a/public/intl/messages/ms-MY.json
+++ b/public/intl/messages/ms-MY.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Purata tempoh masa lawatan"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1241,6 +1235,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Purata tempoh masa lawatan"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/my-MM.json b/public/intl/messages/my-MM.json
index 18c1a2b9a7..f56429aa4a 100644
--- a/public/intl/messages/my-MM.json
+++ b/public/intl/messages/my-MM.json
@@ -83,12 +83,6 @@
       "value": "ပျမ်းမျှ"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "ဝဘက်ဘ်ဆိုဒ်တွင် ပျမ်းမျှကုန်ဆုံးချိန်"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "ဝဘက်ဘ်ဆိုဒ်တွင် ပျမ်းမျှကုန်ဆုံးချိန်"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/nb-NO.json b/public/intl/messages/nb-NO.json
index 2f7132ef7c..7b110ee4eb 100644
--- a/public/intl/messages/nb-NO.json
+++ b/public/intl/messages/nb-NO.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Gjennomsnittlig besøkstid"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Gjennomsnittlig besøkstid"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/nl-NL.json b/public/intl/messages/nl-NL.json
index c0a3add4ba..5b0cfdbf1b 100644
--- a/public/intl/messages/nl-NL.json
+++ b/public/intl/messages/nl-NL.json
@@ -83,12 +83,6 @@
       "value": "Gemiddelde"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Gemiddelde bezoektijd"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Gemiddelde bezoektijd"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/pl-PL.json b/public/intl/messages/pl-PL.json
index 547a70a981..4a5a41ee6a 100644
--- a/public/intl/messages/pl-PL.json
+++ b/public/intl/messages/pl-PL.json
@@ -83,12 +83,6 @@
       "value": "Średnia"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Średni czas wizyty"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Średni czas wizyty"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/pt-BR.json b/public/intl/messages/pt-BR.json
index 7c41e5efff..6e3bb03ef6 100644
--- a/public/intl/messages/pt-BR.json
+++ b/public/intl/messages/pt-BR.json
@@ -83,12 +83,6 @@
       "value": "Média"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Tempo médio de visita"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Visualizações por visita"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Tempo médio de visita"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/pt-PT.json b/public/intl/messages/pt-PT.json
index 3e16a55e21..1b19e8d37c 100644
--- a/public/intl/messages/pt-PT.json
+++ b/public/intl/messages/pt-PT.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Tempo médio de visita"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Tempo médio de visita"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/ro-RO.json b/public/intl/messages/ro-RO.json
index da1413f6c1..6a0b77fe34 100644
--- a/public/intl/messages/ro-RO.json
+++ b/public/intl/messages/ro-RO.json
@@ -83,12 +83,6 @@
       "value": "Mediu"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Timp mediu de vizitare"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Timp mediu de vizitare"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/ru-RU.json b/public/intl/messages/ru-RU.json
index 4b97f22546..4f851f4698 100644
--- a/public/intl/messages/ru-RU.json
+++ b/public/intl/messages/ru-RU.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Среднее время посещения"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Среднее время посещения"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/si-LK.json b/public/intl/messages/si-LK.json
index 67e32f90c2..749d830b15 100644
--- a/public/intl/messages/si-LK.json
+++ b/public/intl/messages/si-LK.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Average visit time"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Visit duration"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/sk-SK.json b/public/intl/messages/sk-SK.json
index f4e8a5e465..ff9d4e65f3 100644
--- a/public/intl/messages/sk-SK.json
+++ b/public/intl/messages/sk-SK.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Priemerný čas návštevy"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Priemerný čas návštevy"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/sl-SI.json b/public/intl/messages/sl-SI.json
index e96723ae0e..b209116649 100644
--- a/public/intl/messages/sl-SI.json
+++ b/public/intl/messages/sl-SI.json
@@ -83,12 +83,6 @@
       "value": "Povprečno"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Povprečni čas obiska"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Povprečni čas obiska"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/sv-SE.json b/public/intl/messages/sv-SE.json
index 45dc754d73..28992e10fc 100644
--- a/public/intl/messages/sv-SE.json
+++ b/public/intl/messages/sv-SE.json
@@ -83,12 +83,6 @@
       "value": "Genomsnitt"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Genomsnittlig besökstid"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Genomsnittlig besökstid"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/ta-IN.json b/public/intl/messages/ta-IN.json
index b1fcd700ac..70d7b87eb5 100644
--- a/public/intl/messages/ta-IN.json
+++ b/public/intl/messages/ta-IN.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "சராசரி வருகை நேரம்"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "சராசரி வருகை நேரம்"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/th-TH.json b/public/intl/messages/th-TH.json
index 1206840bbf..351d30f876 100644
--- a/public/intl/messages/th-TH.json
+++ b/public/intl/messages/th-TH.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "ระยะเวลาเข้าชมเฉลี่ย"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1241,6 +1235,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "ระยะเวลาเข้าชมเฉลี่ย"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/tr-TR.json b/public/intl/messages/tr-TR.json
index 224426122e..c0caf470b7 100644
--- a/public/intl/messages/tr-TR.json
+++ b/public/intl/messages/tr-TR.json
@@ -83,12 +83,6 @@
       "value": "Ortalama"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Ortalama ziyaret süresi"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Ziyaret başına görüntüleme"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Ortalama ziyaret süresi"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/uk-UA.json b/public/intl/messages/uk-UA.json
index ae947f9abe..4d69375600 100644
--- a/public/intl/messages/uk-UA.json
+++ b/public/intl/messages/uk-UA.json
@@ -83,12 +83,6 @@
       "value": "Середнє"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Середній час візиту"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Перегляди за візит"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Середній час візиту"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/ur-PK.json b/public/intl/messages/ur-PK.json
index 184043b44b..0316d2994e 100644
--- a/public/intl/messages/ur-PK.json
+++ b/public/intl/messages/ur-PK.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "وزٹ کا اوسط وقت"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1249,6 +1243,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "وزٹ کا اوسط وقت"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/vi-VN.json b/public/intl/messages/vi-VN.json
index fe5943acec..0cc0c183e5 100644
--- a/public/intl/messages/vi-VN.json
+++ b/public/intl/messages/vi-VN.json
@@ -83,12 +83,6 @@
       "value": "Average"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Thời gian truy cập trung bình"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1241,6 +1235,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Thời gian truy cập trung bình"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/zh-CN.json b/public/intl/messages/zh-CN.json
index 144b4f170a..e42400229f 100644
--- a/public/intl/messages/zh-CN.json
+++ b/public/intl/messages/zh-CN.json
@@ -83,12 +83,6 @@
       "value": "平均"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "平均访问时间"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1257,6 +1251,12 @@
       "value": "每次访问的浏览量"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "平均访问时间"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/zh-TW.json b/public/intl/messages/zh-TW.json
index e703beb93e..a39aea19bb 100644
--- a/public/intl/messages/zh-TW.json
+++ b/public/intl/messages/zh-TW.json
@@ -83,12 +83,6 @@
       "value": "平均"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "平均造訪時間"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -1253,6 +1247,12 @@
       "value": "Views per visit"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "平均造訪時間"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.module.css b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.module.css
index e986396138..4d40edf8c3 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.module.css
+++ b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.module.css
@@ -1,6 +1,6 @@
 .container {
   display: grid;
-  grid-template-columns: 1fr max-content;
+  grid-template-columns: 2fr 1fr;
   justify-content: space-between;
   align-items: center;
   background: var(--base50);
@@ -15,6 +15,19 @@
   flex-direction: row;
   justify-content: flex-end;
   gap: 10px;
+  flex-wrap: wrap;
+}
+
+.vs {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  flex-basis: 100%;
+  gap: 10px;
+}
+
+.dropdown {
+  min-width: 200px;
 }
 
 @media screen and (max-width: 1200px) {
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
index 06947a515b..11c856856b 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
@@ -1,3 +1,4 @@
+import { useState } from 'react';
 import classNames from 'classnames';
 import { useMessages, useSticky } from 'components/hooks';
 import WebsiteDateFilter from 'components/input/WebsiteDateFilter';
@@ -7,21 +8,65 @@ import { formatShortTime } from 'lib/format';
 import WebsiteFilterButton from './WebsiteFilterButton';
 import useWebsiteStats from 'components/hooks/queries/useWebsiteStats';
 import styles from './WebsiteMetricsBar.module.css';
+import { Dropdown, Item } from 'react-basics';
 
-export function WebsiteMetricsBar({ websiteId, sticky }: { websiteId: string; sticky?: boolean }) {
+export function WebsiteMetricsBar({
+  websiteId,
+  sticky,
+  compareMode = false,
+}: {
+  websiteId: string;
+  sticky?: boolean;
+  compareMode?: boolean;
+}) {
   const { formatMessage, labels } = useMessages();
+  const [compare, setCompare] = useState('prev');
   const { ref, isSticky } = useSticky({ enabled: sticky });
-  const { data, isLoading, isFetched, error } = useWebsiteStats(websiteId);
+  const { data, isLoading, isFetched, error } = useWebsiteStats(websiteId, compare);
 
   const { pageviews, visitors, visits, bounces, totaltime } = data || {};
-  const num = Math.min(data && visitors.value, data && bounces.value);
-  const diffs = data && {
-    pageviews: pageviews.value - pageviews.change,
-    visitors: visitors.value - visitors.change,
-    visits: visits.value - visits.change,
-    bounces: bounces.value - bounces.change,
-    totaltime: totaltime.value - totaltime.change,
-  };
+
+  const metrics = data
+    ? [
+        {
+          ...pageviews,
+          label: formatMessage(labels.views),
+          change: pageviews.value - pageviews.prev,
+        },
+        {
+          ...visits,
+          label: formatMessage(labels.visits),
+          change: visits.value - visits.prev,
+        },
+        {
+          ...visitors,
+          label: formatMessage(labels.visitors),
+          change: visitors.value - visitors.prev,
+        },
+        {
+          label: formatMessage(labels.bounceRate),
+          value: (Math.min(visitors.value, bounces.value) / visitors.value) * 100,
+          prev: (Math.min(visitors.prev, bounces.prev) / visitors.prev) * 100,
+          change:
+            (Math.min(visitors.value, bounces.value) / visitors.value) * 100 -
+            (Math.min(visitors.prev, bounces.prev) / visitors.prev) * 100,
+          format: n => Number(n).toFixed(0) + '%',
+          reverseColors: true,
+        },
+        {
+          label: formatMessage(labels.visitDuration),
+          value: totaltime.value / visits.value,
+          prev: totaltime.prev / visits.prev,
+          change: totaltime.value / visits.value - totaltime.prev / visits.prev,
+          format: n => `${+n < 0 ? '-' : ''}${formatShortTime(Math.abs(~~n), ['m', 's'], ' ')}`,
+        },
+      ]
+    : [];
+
+  const items = [
+    { label: formatMessage(labels.previousPeriod), value: 'prev' },
+    { label: formatMessage(labels.yearOverYear), value: 'yoy' },
+  ];
 
   return (
     <div
@@ -31,58 +76,44 @@ export function WebsiteMetricsBar({ websiteId, sticky }: { websiteId: string; st
         [styles.isSticky]: isSticky,
       })}
     >
-      <MetricsBar isLoading={isLoading} isFetched={isFetched} error={error}>
-        {pageviews && visitors && (
-          <>
-            <MetricCard
-              label={formatMessage(labels.views)}
-              value={pageviews.value}
-              change={pageviews.change}
-            />
-            <MetricCard
-              label={formatMessage(labels.visits)}
-              value={visits.value}
-              change={visits.change}
-            />
-            <MetricCard
-              label={formatMessage(labels.visitors)}
-              value={visitors.value}
-              change={visitors.change}
-            />
-            <MetricCard
-              label={formatMessage(labels.bounceRate)}
-              value={visitors.value ? (num / visitors.value) * 100 : 0}
-              change={
-                visitors.value && visitors.change
-                  ? (num / visitors.value) * 100 -
-                      (Math.min(diffs.visitors, diffs.bounces) / diffs.visitors) * 100 || 0
-                  : 0
-              }
-              format={n => Number(n).toFixed(0) + '%'}
-              reverseColors
-            />
-            <MetricCard
-              label={formatMessage(labels.averageVisitTime)}
-              value={
-                totaltime.value && pageviews.value
-                  ? totaltime.value / (pageviews.value - bounces.value)
-                  : 0
-              }
-              change={
-                totaltime.value && pageviews.value
-                  ? (diffs.totaltime / (diffs.pageviews - diffs.bounces) -
-                      totaltime.value / (pageviews.value - bounces.value)) *
-                      -1 || 0
-                  : 0
-              }
-              format={n => `${+n < 0 ? '-' : ''}${formatShortTime(Math.abs(~~n), ['m', 's'], ' ')}`}
-            />
-          </>
-        )}
-      </MetricsBar>
+      <div>
+        <MetricsBar isLoading={isLoading} isFetched={isFetched} error={error}>
+          {metrics.map(({ label, value, prev, change, format, reverseColors }) => {
+            return (
+              <MetricCard
+                key={label}
+                value={value}
+                previousValue={prev}
+                label={label}
+                change={change}
+                format={format}
+                reverseColors={reverseColors}
+                showPrevious={compareMode}
+              />
+            );
+          })}
+        </MetricsBar>
+      </div>
       <div className={styles.actions}>
         <WebsiteFilterButton websiteId={websiteId} />
         <WebsiteDateFilter websiteId={websiteId} />
+        {compareMode && (
+          <div className={styles.vs}>
+            <b>VS</b>
+            <Dropdown
+              className={styles.dropdown}
+              items={items}
+              value={compare}
+              renderValue={value => items.find(i => i.value === value)?.label}
+              alignment="end"
+              onChange={(e: any) => setCompare(e)}
+            >
+              {items.map(({ label, value }) => (
+                <Item key={value}>{label}</Item>
+              ))}
+            </Dropdown>
+          </div>
+        )}
       </div>
     </div>
   );
diff --git a/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx b/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
index 2fe971ae19..eb893a05c3 100644
--- a/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
+++ b/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
@@ -1,11 +1,25 @@
+'use client';
 import WebsiteHeader from '../WebsiteHeader';
 import WebsiteMetricsBar from '../WebsiteMetricsBar';
+import FilterTags from 'components/metrics/FilterTags';
+import { useNavigation } from 'components/hooks';
+import { FILTER_COLUMNS } from 'lib/constants';
 
 export function WebsiteComparePage({ websiteId }) {
+  const { query } = useNavigation();
+
+  const params = Object.keys(query).reduce((obj, key) => {
+    if (FILTER_COLUMNS[key]) {
+      obj[key] = query[key];
+    }
+    return obj;
+  }, {});
+
   return (
     <>
       <WebsiteHeader websiteId={websiteId} />
-      <WebsiteMetricsBar websiteId={websiteId} />
+      <FilterTags websiteId={websiteId} params={params} />
+      <WebsiteMetricsBar websiteId={websiteId} compareMode={true} />
     </>
   );
 }
diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx
index 80d3d8c624..cef6e7426f 100644
--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx
+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx
@@ -14,25 +14,25 @@ export function RealtimeHeader({ data }: { data: RealtimeData }) {
           className={styles.card}
           label={formatMessage(labels.views)}
           value={pageviews?.length}
-          hideComparison
+          showChange
         />
         <MetricCard
           className={styles.card}
           label={formatMessage(labels.visitors)}
           value={visitors?.length}
-          hideComparison
+          showChange
         />
         <MetricCard
           className={styles.card}
           label={formatMessage(labels.events)}
           value={events?.length}
-          hideComparison
+          showChange
         />
         <MetricCard
           className={styles.card}
           label={formatMessage(labels.countries)}
           value={countries?.length}
-          hideComparison
+          showChange
         />
       </div>
     </div>
diff --git a/src/components/hooks/queries/useWebsiteStats.ts b/src/components/hooks/queries/useWebsiteStats.ts
index c2c4b74fd0..b24399fa91 100644
--- a/src/components/hooks/queries/useWebsiteStats.ts
+++ b/src/components/hooks/queries/useWebsiteStats.ts
@@ -1,13 +1,17 @@
 import { useApi } from './useApi';
 import { useFilterParams } from '../useFilterParams';
 
-export function useWebsiteStats(websiteId: string, options?: { [key: string]: string }) {
+export function useWebsiteStats(
+  websiteId: string,
+  compare?: string,
+  options?: { [key: string]: string },
+) {
   const { get, useQuery } = useApi();
   const params = useFilterParams(websiteId);
 
   return useQuery({
-    queryKey: ['websites:stats', { websiteId, ...params }],
-    queryFn: () => get(`/websites/${websiteId}/stats`, params),
+    queryKey: ['websites:stats', { websiteId, ...params, compare }],
+    queryFn: () => get(`/websites/${websiteId}/stats`, { ...params, compare }),
     enabled: !!websiteId,
     ...options,
   });
diff --git a/src/components/messages.ts b/src/components/messages.ts
index 17f7b035d3..f4d986ff7b 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -134,7 +134,7 @@ export const labels = defineMessages({
   uniqueVisitors: { id: 'label.unique-visitors', defaultMessage: 'Unique visitors' },
   bounceRate: { id: 'label.bounce-rate', defaultMessage: 'Bounce rate' },
   viewsPerVisit: { id: 'label.views-per-visit', defaultMessage: 'Views per visit' },
-  averageVisitTime: { id: 'label.average-visit-time', defaultMessage: 'Average visit time' },
+  visitDuration: { id: 'label.visit-duration', defaultMessage: 'Visit duration' },
   desktop: { id: 'label.desktop', defaultMessage: 'Desktop' },
   laptop: { id: 'label.laptop', defaultMessage: 'Laptop' },
   tablet: { id: 'label.tablet', defaultMessage: 'Tablet' },
@@ -253,6 +253,8 @@ export const labels = defineMessages({
     defaultMessage: 'Understand how users nagivate through your website.',
   },
   compare: { id: 'label.compare', defaultMessage: 'Compare' },
+  previousPeriod: { id: 'label.previous-period', defaultMessage: 'Previous period' },
+  yearOverYear: { id: 'label.year-over-year', defaultMessage: 'Year over year' },
 });
 
 export const messages = defineMessages({
diff --git a/src/components/metrics/MetricCard.module.css b/src/components/metrics/MetricCard.module.css
index 03cddd38f8..92c5712c6c 100644
--- a/src/components/metrics/MetricCard.module.css
+++ b/src/components/metrics/MetricCard.module.css
@@ -2,7 +2,16 @@
   display: flex;
   flex-direction: column;
   justify-content: center;
-  min-width: 140px;
+  min-width: 150px;
+}
+
+.card.compare {
+  gap: 10px;
+}
+
+.card.compare .change {
+  font-size: 16px;
+  padding: 5px 10px;
 }
 
 .card:first-child {
@@ -14,30 +23,33 @@
 }
 
 .value {
-  display: flex;
-  align-items: center;
-  font-size: 36px;
+  font-size: 40px;
   font-weight: 700;
   white-space: nowrap;
-  min-height: 60px;
   color: var(--base900);
+  line-height: 1.5;
+}
+
+.value.prev {
+  color: var(--base800);
 }
 
 .label {
-  display: flex;
-  align-items: center;
   font-weight: 700;
-  gap: 10px;
   white-space: nowrap;
-  min-height: 30px;
   color: var(--base800);
 }
 
 .change {
-  font-size: 12px;
+  display: flex;
+  align-items: center;
+  gap: 5px;
+  font-size: 13px;
+  font-weight: 700;
   padding: 0 5px;
   border-radius: 5px;
   color: var(--base500);
+  align-self: flex-start;
 }
 
 .change.positive {
@@ -49,7 +61,3 @@
   color: var(--red700);
   background: var(--red100);
 }
-
-.change.plusSign::before {
-  content: '+';
-}
diff --git a/src/components/metrics/MetricCard.tsx b/src/components/metrics/MetricCard.tsx
index 0db164a261..2bb38fbaab 100644
--- a/src/components/metrics/MetricCard.tsx
+++ b/src/components/metrics/MetricCard.tsx
@@ -1,15 +1,19 @@
 import classNames from 'classnames';
+import { Icon, Icons } from 'react-basics';
 import { useSpring, animated } from '@react-spring/web';
 import { formatNumber } from 'lib/format';
 import styles from './MetricCard.module.css';
 
 export interface MetricCardProps {
   value: number;
+  previousValue?: number;
   change?: number;
-  label: string;
+  label?: string;
   reverseColors?: boolean;
   format?: typeof formatNumber;
-  hideComparison?: boolean;
+  showLabel?: boolean;
+  showChange?: boolean;
+  showPrevious?: boolean;
   className?: string;
 }
 
@@ -19,32 +23,43 @@ export const MetricCard = ({
   label,
   reverseColors = false,
   format = formatNumber,
-  hideComparison = false,
+  showLabel = true,
+  showChange = true,
+  showPrevious = false,
   className,
 }: MetricCardProps) => {
   const props = useSpring({ x: Number(value) || 0, from: { x: 0 } });
   const changeProps = useSpring({ x: Number(change) || 0, from: { x: 0 } });
+  const prevProps = useSpring({ x: Number(value - change) || 0, from: { x: 0 } });
+  const positive = change * (reverseColors ? -1 : 1) >= 0;
+  const negative = change * (reverseColors ? -1 : 1) < 0;
 
   return (
-    <div className={classNames(styles.card, className)}>
-      <div className={styles.label}>
-        {label}
-        {~~change !== 0 && !hideComparison && (
-          <animated.span
-            className={classNames(styles.change, {
-              [styles.positive]: change * (reverseColors ? -1 : 1) >= 0,
-              [styles.negative]: change * (reverseColors ? -1 : 1) < 0,
-              [styles.plusSign]: change > 0,
-            })}
-            title={changeProps?.x as any}
-          >
-            {changeProps?.x?.to(x => format(x))}
-          </animated.span>
-        )}
-      </div>
+    <div className={classNames(styles.card, className, showPrevious && styles.compare)}>
+      {showLabel && <div className={styles.label}>{label}</div>}
       <animated.div className={styles.value} title={props?.x as any}>
         {props?.x?.to(x => format(x))}
       </animated.div>
+      {showChange && (
+        <div
+          className={classNames(styles.change, {
+            [styles.positive]: positive,
+            [styles.negative]: negative,
+          })}
+        >
+          <Icon rotate={positive ? -45 : 45} size={showPrevious ? 'sm' : 'xs'}>
+            <Icons.ArrowRight />
+          </Icon>
+          <animated.span title={changeProps?.x as any}>
+            {changeProps?.x?.to(x => format(Math.abs(x)))}
+          </animated.span>
+        </div>
+      )}
+      {showPrevious && (
+        <animated.div className={classNames(styles.value, styles.prev)} title={prevProps?.x as any}>
+          {prevProps?.x?.to(x => format(x))}
+        </animated.div>
+      )}
     </div>
   );
 };
diff --git a/src/lang/am-ET.json b/src/lang/am-ET.json
index e289ddc5fb..9546ffdd93 100644
--- a/src/lang/am-ET.json
+++ b/src/lang/am-ET.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Average visit time",
+  "label.visit-duration": "Average visit time",
   "label.back": "Back",
   "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
diff --git a/src/lang/ar-SA.json b/src/lang/ar-SA.json
index d01ff65fd7..aff31f678a 100644
--- a/src/lang/ar-SA.json
+++ b/src/lang/ar-SA.json
@@ -13,7 +13,7 @@
   "label.all-time": "كل الوقت",
   "label.analytics": "تحليلات",
   "label.average": "المتوسط",
-  "label.average-visit-time": "متوسط وقت الزيارة",
+  "label.visit-duration": "متوسط وقت الزيارة",
   "label.back": "للخلف",
   "label.before": "قبل",
   "label.bounce-rate": "معدل الارتداد",
diff --git a/src/lang/be-BY.json b/src/lang/be-BY.json
index b68c8dab49..a831fe0fa6 100644
--- a/src/lang/be-BY.json
+++ b/src/lang/be-BY.json
@@ -13,7 +13,7 @@
   "label.all-time": "Увесь час",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Сярэдняя даўжыня наведвання",
+  "label.visit-duration": "Сярэдняя даўжыня наведвання",
   "label.back": "Назад",
   "label.before": "Before",
   "label.bounce-rate": "Паказчык адмоваў",
diff --git a/src/lang/bn-BD.json b/src/lang/bn-BD.json
index f94292159f..7436a002b5 100644
--- a/src/lang/bn-BD.json
+++ b/src/lang/bn-BD.json
@@ -13,7 +13,7 @@
   "label.all-time": "সব সময়",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "গড় পরিদর্শনের সময়",
+  "label.visit-duration": "গড় পরিদর্শনের সময়",
   "label.back": "পেছনে",
   "label.before": "Before",
   "label.bounce-rate": "বহিষ্কারের হার",
diff --git a/src/lang/bs-BA.json b/src/lang/bs-BA.json
index 27318df0db..3eda0f854a 100644
--- a/src/lang/bs-BA.json
+++ b/src/lang/bs-BA.json
@@ -13,7 +13,7 @@
   "label.all-time": "Cijelo vrijeme",
   "label.analytics": "Analitike",
   "label.average": "Prosjek",
-  "label.average-visit-time": "Prosječno vrijeme posjete",
+  "label.visit-duration": "Prosječno vrijeme posjete",
   "label.back": "Nazad",
   "label.before": "Prije",
   "label.bounce-rate": "Bounce rate",
diff --git a/src/lang/ca-ES.json b/src/lang/ca-ES.json
index 4a1dee619c..a12fd3c8e8 100644
--- a/src/lang/ca-ES.json
+++ b/src/lang/ca-ES.json
@@ -13,7 +13,7 @@
   "label.all-time": "Sempre",
   "label.analytics": "Analítiques",
   "label.average": "Mitjana",
-  "label.average-visit-time": "Temps mitjà de visita",
+  "label.visit-duration": "Temps mitjà de visita",
   "label.back": "Enrere",
   "label.before": "Abans",
   "label.bounce-rate": "Percentatge de rebot",
diff --git a/src/lang/cs-CZ.json b/src/lang/cs-CZ.json
index 7f3599c9b8..64153d7d02 100644
--- a/src/lang/cs-CZ.json
+++ b/src/lang/cs-CZ.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Průměrný čas návštěvy",
+  "label.visit-duration": "Průměrný čas návštěvy",
   "label.back": "Zpět",
   "label.before": "Before",
   "label.bounce-rate": "Okamžité opuštění",
diff --git a/src/lang/da-DK.json b/src/lang/da-DK.json
index fe6d483f01..d38d2a821d 100644
--- a/src/lang/da-DK.json
+++ b/src/lang/da-DK.json
@@ -13,7 +13,7 @@
   "label.all-time": "Altid",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Gennemsnitlig besøgstid",
+  "label.visit-duration": "Gennemsnitlig besøgstid",
   "label.back": "Tilbage",
   "label.before": "Before",
   "label.bounce-rate": "Afvisningsprocent",
diff --git a/src/lang/de-CH.json b/src/lang/de-CH.json
index a99826310f..dca1e35164 100644
--- a/src/lang/de-CH.json
+++ b/src/lang/de-CH.json
@@ -13,7 +13,7 @@
   "label.all-time": "Gesamte Zitruum",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Durchschn. Bsuechsziit",
+  "label.visit-duration": "Durchschn. Bsuechsziit",
   "label.back": "Zrugg",
   "label.before": "Before",
   "label.bounce-rate": "Absprungsrate",
diff --git a/src/lang/de-DE.json b/src/lang/de-DE.json
index 3272abaf1a..b0a296b51d 100644
--- a/src/lang/de-DE.json
+++ b/src/lang/de-DE.json
@@ -13,7 +13,7 @@
   "label.all-time": "Gesamter Zeitraum",
   "label.analytics": "Analytics",
   "label.average": "Durchschnitt",
-  "label.average-visit-time": "Durchschn. Besuchszeit",
+  "label.visit-duration": "Durchschn. Besuchszeit",
   "label.back": "Zurück",
   "label.before": "Vor",
   "label.bounce-rate": "Absprungrate",
diff --git a/src/lang/el-GR.json b/src/lang/el-GR.json
index 1c1fd1b22d..3d44bd005d 100644
--- a/src/lang/el-GR.json
+++ b/src/lang/el-GR.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Μέσος χρόνος επίσκεψης",
+  "label.visit-duration": "Μέσος χρόνος επίσκεψης",
   "label.back": "Πίσω",
   "label.before": "Before",
   "label.bounce-rate": "Ποσοστό αναπήδησης",
diff --git a/src/lang/en-GB.json b/src/lang/en-GB.json
index 3df625f8e1..82e60c5e0e 100644
--- a/src/lang/en-GB.json
+++ b/src/lang/en-GB.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Average visit time",
+  "label.visit-duration": "Average visit time",
   "label.back": "Back",
   "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
diff --git a/src/lang/en-US.json b/src/lang/en-US.json
index 5ceb39d183..77e6daa1e6 100644
--- a/src/lang/en-US.json
+++ b/src/lang/en-US.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Average visit time",
+  "label.visit-duration": "Average visit time",
   "label.back": "Back",
   "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
diff --git a/src/lang/es-ES.json b/src/lang/es-ES.json
index 43e74e2146..85796f426e 100644
--- a/src/lang/es-ES.json
+++ b/src/lang/es-ES.json
@@ -13,7 +13,7 @@
   "label.all-time": "Todos los tiempos",
   "label.analytics": "Analíticas",
   "label.average": "Media",
-  "label.average-visit-time": "Tiempo promedio de visita",
+  "label.visit-duration": "Tiempo promedio de visita",
   "label.back": "Atrás",
   "label.before": "Antes",
   "label.bounce-rate": "Porcentaje de rebote",
diff --git a/src/lang/fa-IR.json b/src/lang/fa-IR.json
index 70c60f0181..cab0ffa41e 100644
--- a/src/lang/fa-IR.json
+++ b/src/lang/fa-IR.json
@@ -13,7 +13,7 @@
   "label.all-time": "همه زمان",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "میانگین زمان بازدید",
+  "label.visit-duration": "میانگین زمان بازدید",
   "label.back": "برگشت",
   "label.before": "Before",
   "label.bounce-rate": "نرخ Bounce",
diff --git a/src/lang/fi-FI.json b/src/lang/fi-FI.json
index f827c482ac..0389cf82b3 100644
--- a/src/lang/fi-FI.json
+++ b/src/lang/fi-FI.json
@@ -13,7 +13,7 @@
   "label.all-time": "Alusta lähtien",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Keskimääräinen vierailuaika",
+  "label.visit-duration": "Keskimääräinen vierailuaika",
   "label.back": "Takaisin",
   "label.before": "Before",
   "label.bounce-rate": "Välitön poistuminen",
diff --git a/src/lang/fo-FO.json b/src/lang/fo-FO.json
index 6b9e42d0c3..d13d40ec60 100644
--- a/src/lang/fo-FO.json
+++ b/src/lang/fo-FO.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Miðal vitjurnartíð ",
+  "label.visit-duration": "Miðal vitjurnartíð ",
   "label.back": "Aftur",
   "label.before": "Before",
   "label.bounce-rate": "Bounce prosenttal",
diff --git a/src/lang/fr-FR.json b/src/lang/fr-FR.json
index bd71a85f8f..b52ae875ab 100644
--- a/src/lang/fr-FR.json
+++ b/src/lang/fr-FR.json
@@ -13,7 +13,7 @@
   "label.all-time": "Toutes les données",
   "label.analytics": "Analytics",
   "label.average": "Moyenne",
-  "label.average-visit-time": "Temps de visite moyen",
+  "label.visit-duration": "Temps de visite moyen",
   "label.back": "Retour",
   "label.before": "Avant",
   "label.bounce-rate": "Taux de rebond",
diff --git a/src/lang/ga-ES.json b/src/lang/ga-ES.json
index fa9a1cc5a7..cdf1393240 100644
--- a/src/lang/ga-ES.json
+++ b/src/lang/ga-ES.json
@@ -13,7 +13,7 @@
   "label.all-time": "Sempre",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Tempo medio de visita",
+  "label.visit-duration": "Tempo medio de visita",
   "label.back": "Atrás",
   "label.before": "Before",
   "label.bounce-rate": "Proporción de rebote",
diff --git a/src/lang/he-IL.json b/src/lang/he-IL.json
index 3c422a76f5..f513c807e9 100644
--- a/src/lang/he-IL.json
+++ b/src/lang/he-IL.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "זמן ביקור ממוצע",
+  "label.visit-duration": "זמן ביקור ממוצע",
   "label.back": "חזרה",
   "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
diff --git a/src/lang/hi-IN.json b/src/lang/hi-IN.json
index 791111c834..2e2e79f717 100644
--- a/src/lang/hi-IN.json
+++ b/src/lang/hi-IN.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "औसत दृश्य समय",
+  "label.visit-duration": "औसत दृश्य समय",
   "label.back": "पीछे",
   "label.before": "Before",
   "label.bounce-rate": "उछाल दर",
diff --git a/src/lang/hr-HR.json b/src/lang/hr-HR.json
index 7ba496c756..ea48849039 100644
--- a/src/lang/hr-HR.json
+++ b/src/lang/hr-HR.json
@@ -13,7 +13,7 @@
   "label.all-time": "Svo vrijeme",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Average visit time",
+  "label.visit-duration": "Average visit time",
   "label.back": "Natrag ",
   "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
diff --git a/src/lang/hu-HU.json b/src/lang/hu-HU.json
index b73b36a77e..74f0ce6fe0 100644
--- a/src/lang/hu-HU.json
+++ b/src/lang/hu-HU.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Átlagos látogatási idő",
+  "label.visit-duration": "Átlagos látogatási idő",
   "label.back": "Vissza",
   "label.before": "Before",
   "label.bounce-rate": "Visszafordulási arány",
diff --git a/src/lang/id-ID.json b/src/lang/id-ID.json
index 64d17d9a93..faf773157b 100644
--- a/src/lang/id-ID.json
+++ b/src/lang/id-ID.json
@@ -13,7 +13,7 @@
   "label.all-time": "Semua waktu",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Waktu kunjungan rata-rata",
+  "label.visit-duration": "Waktu kunjungan rata-rata",
   "label.back": "Kembali",
   "label.before": "Before",
   "label.bounce-rate": "Rasio pentalan",
diff --git a/src/lang/it-IT.json b/src/lang/it-IT.json
index 9425d5e691..084f86eef0 100644
--- a/src/lang/it-IT.json
+++ b/src/lang/it-IT.json
@@ -13,7 +13,7 @@
   "label.all-time": "Sempre",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Tempo medio di visita",
+  "label.visit-duration": "Tempo medio di visita",
   "label.back": "Indietro",
   "label.before": "Before",
   "label.bounce-rate": "Frequenza di rimbalzo",
diff --git a/src/lang/ja-JP.json b/src/lang/ja-JP.json
index b646bd51e3..5c8747ba97 100644
--- a/src/lang/ja-JP.json
+++ b/src/lang/ja-JP.json
@@ -13,7 +13,7 @@
   "label.all-time": "すべての時間帯",
   "label.analytics": "アナリティクス",
   "label.average": "平均",
-  "label.average-visit-time": "平均滞在時間",
+  "label.visit-duration": "平均滞在時間",
   "label.back": "戻る",
   "label.before": "直前",
   "label.bounce-rate": "直帰率",
diff --git a/src/lang/km-KH.json b/src/lang/km-KH.json
index 17ddd91457..6bb9f47638 100644
--- a/src/lang/km-KH.json
+++ b/src/lang/km-KH.json
@@ -13,7 +13,7 @@
   "label.all-time": "គ្រប់ពេល",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "មើលជាមធ្យម",
+  "label.visit-duration": "មើលជាមធ្យម",
   "label.back": "ថយក្រោយ",
   "label.before": "Before",
   "label.bounce-rate": "ចំនួនវិលត្រឡប់",
diff --git a/src/lang/ko-KR.json b/src/lang/ko-KR.json
index f64f03aa62..1bfb9ca068 100644
--- a/src/lang/ko-KR.json
+++ b/src/lang/ko-KR.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "평균 방문 시간",
+  "label.visit-duration": "평균 방문 시간",
   "label.back": "뒤로",
   "label.before": "Before",
   "label.bounce-rate": "이탈률",
diff --git a/src/lang/lt-LT.json b/src/lang/lt-LT.json
index 0d8f53e99e..2fc0f5e13b 100644
--- a/src/lang/lt-LT.json
+++ b/src/lang/lt-LT.json
@@ -13,7 +13,7 @@
   "label.all-time": "Visas laikotarpis",
   "label.analytics": "Analytics",
   "label.average": "Vidurkis",
-  "label.average-visit-time": "Vidutinė vizito trukmė",
+  "label.visit-duration": "Vidutinė vizito trukmė",
   "label.back": "Atgal",
   "label.before": "Prieš",
   "label.bounce-rate": "Atmetimo rodiklis",
diff --git a/src/lang/mn-MN.json b/src/lang/mn-MN.json
index bd001addea..340f4bcd7b 100644
--- a/src/lang/mn-MN.json
+++ b/src/lang/mn-MN.json
@@ -13,7 +13,7 @@
   "label.all-time": "Бүх цаг үеийн",
   "label.analytics": "Analytics",
   "label.average": "Дундаж",
-  "label.average-visit-time": "Зочилсон дундаж хугацаа",
+  "label.visit-duration": "Зочилсон дундаж хугацаа",
   "label.back": "Буцах",
   "label.before": "Өмнө",
   "label.bounce-rate": "Нэг хуудас үзээд гарсан",
diff --git a/src/lang/ms-MY.json b/src/lang/ms-MY.json
index 6fef993140..73124486ca 100644
--- a/src/lang/ms-MY.json
+++ b/src/lang/ms-MY.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Purata tempoh masa lawatan",
+  "label.visit-duration": "Purata tempoh masa lawatan",
   "label.back": "Kembali",
   "label.before": "Before",
   "label.bounce-rate": "Kadar lantunan",
diff --git a/src/lang/my-MM.json b/src/lang/my-MM.json
index bf8e0217e2..8883c71e46 100644
--- a/src/lang/my-MM.json
+++ b/src/lang/my-MM.json
@@ -13,7 +13,7 @@
   "label.all-time": "အချိန်အစမှအခုထိ",
   "label.analytics": "အန်နလစ်တစ်",
   "label.average": "ပျမ်းမျှ",
-  "label.average-visit-time": "ဝဘက်ဘ်ဆိုဒ်တွင် ပျမ်းမျှကုန်ဆုံးချိန်",
+  "label.visit-duration": "ဝဘက်ဘ်ဆိုဒ်တွင် ပျမ်းမျှကုန်ဆုံးချိန်",
   "label.back": "နောက်သို့",
   "label.before": "မတိုင်မီ",
   "label.bounce-rate": "Bounce နှုန်း",
diff --git a/src/lang/nb-NO.json b/src/lang/nb-NO.json
index a0fe6575f9..4915972361 100644
--- a/src/lang/nb-NO.json
+++ b/src/lang/nb-NO.json
@@ -13,7 +13,7 @@
   "label.all-time": "Noensinne",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Gjennomsnittlig besøkstid",
+  "label.visit-duration": "Gjennomsnittlig besøkstid",
   "label.back": "Tilbake",
   "label.before": "Before",
   "label.bounce-rate": "Avvisningsfrekvens",
diff --git a/src/lang/nl-NL.json b/src/lang/nl-NL.json
index 4335345a79..1d11ed5a5e 100644
--- a/src/lang/nl-NL.json
+++ b/src/lang/nl-NL.json
@@ -13,7 +13,7 @@
   "label.all-time": "Onbeperkt",
   "label.analytics": "Analytics",
   "label.average": "Gemiddelde",
-  "label.average-visit-time": "Gemiddelde bezoektijd",
+  "label.visit-duration": "Gemiddelde bezoektijd",
   "label.back": "Terug",
   "label.before": "Voor",
   "label.bounce-rate": "Bouncepercentage",
diff --git a/src/lang/pl-PL.json b/src/lang/pl-PL.json
index 7eae7baaf6..bd649cfd21 100644
--- a/src/lang/pl-PL.json
+++ b/src/lang/pl-PL.json
@@ -13,7 +13,7 @@
   "label.all-time": "Cały czas",
   "label.analytics": "Analityka",
   "label.average": "Średnia",
-  "label.average-visit-time": "Średni czas wizyty",
+  "label.visit-duration": "Średni czas wizyty",
   "label.back": "Powrót",
   "label.before": "Przed",
   "label.bounce-rate": "Współczynnik odrzuceń",
diff --git a/src/lang/pt-BR.json b/src/lang/pt-BR.json
index 5c0425ea6a..b84deb2d3c 100644
--- a/src/lang/pt-BR.json
+++ b/src/lang/pt-BR.json
@@ -13,7 +13,7 @@
   "label.all-time": "Todos os períodos",
   "label.analytics": "Análise",
   "label.average": "Média",
-  "label.average-visit-time": "Tempo médio de visita",
+  "label.visit-duration": "Tempo médio de visita",
   "label.back": "Voltar",
   "label.before": "Antes",
   "label.bounce-rate": "Taxa de rejeição",
@@ -78,31 +78,31 @@
   "label.greater-than": "Maior que",
   "label.greater-than-equals": "Maior ou igual a",
   "label.insights": "Insights",
-    "label.insights-description": "Explore seus dados em mais detalhes usando filtros",
+  "label.insights-description": "Explore seus dados em mais detalhes usando filtros",
   "label.is": "É igual a",
   "label.is-not": "Não é igual a",
   "label.is-not-set": "Não definido",
   "label.is-set": "Definido",
   "label.join": "Participar",
   "label.join-team": "Participar da equipe",
-  "label.language": "Idioma", 
+  "label.language": "Idioma",
   "label.languages": "Idiomas",
   "label.laptop": "Notebook",
   "label.last-days": "Últimos {x} dias",
   "label.last-hours": "Últimas {x} horas",
   "label.last-months": "Últimos {x} meses",
-  "label.leave": "Sair", 
+  "label.leave": "Sair",
   "label.leave-team": "Sair da equipe",
   "label.less-than": "Menor que",
   "label.less-than-equals": "Menor ou igual a",
-  "label.login": "Entrar", 
+  "label.login": "Entrar",
   "label.logout": "Sair",
   "label.manage": "Gerenciar",
   "label.max": "Máximo",
   "label.member": "Membro",
   "label.members": "Membros",
   "label.min": "Mínimo",
-  "label.mobile": "Celular", 
+  "label.mobile": "Celular",
   "label.more": "Mais",
   "label.my-account": "Minha conta",
   "label.my-websites": "Meus sites",
@@ -114,15 +114,15 @@
   "label.os": "Sistema operacional",
   "label.overview": "Visão geral",
   "label.owner": "Proprietário",
-  "label.page-of": "Página {current} de {total}", 
+  "label.page-of": "Página {current} de {total}",
   "label.page-views": "Visualizações de página",
-  "label.pageTitle": "Título", 
+  "label.pageTitle": "Título",
   "label.pages": "Páginas",
-  "label.password": "Senha", 
-  "label.powered-by": "Desenvolvido por {name}", 
+  "label.password": "Senha",
+  "label.powered-by": "Desenvolvido por {name}",
   "label.profile": "Perfil",
   "label.queries": "Consultas",
-  "label.query": "Consulta", 
+  "label.query": "Consulta",
   "label.query-parameters": "Parâmetros da consulta",
   "label.realtime": "Tempo real",
   "label.referrer": "Referência",
@@ -132,17 +132,17 @@
   "label.region": "Estado",
   "label.regions": "Estados",
   "label.remove": "Remover",
-  "label.remove-member": "Remover membro", 
+  "label.remove-member": "Remover membro",
   "label.reports": "Relatórios",
   "label.required": "Obrigatório",
   "label.reset": "Redefinir",
   "label.reset-website": "Redefinir dados",
   "label.retention": "Retenção",
   "label.retention-description": "Avalie a fidelidade dos seus usuários medindo a frequência com que eles retornam.",
-  "label.role": "Função", 
-  "label.run-query": "Executar consulta", 
+  "label.role": "Função",
+  "label.run-query": "Executar consulta",
   "label.save": "Salvar",
-  "label.screens": "Tamanhos de tela", 
+  "label.screens": "Tamanhos de tela",
   "label.search": "Pesquisar",
   "label.select": "Selecionar",
   "label.select-date": "Selecionar data",
@@ -150,7 +150,7 @@
   "label.select-website": "Selecionar site",
   "label.sessions": "Sessões",
   "label.settings": "Configurações",
-  "label.share-url": "Link para compartilhar", 
+  "label.share-url": "Link para compartilhar",
   "label.single-day": "Apenas um dia",
   "label.steps": "Etapas",
   "label.sum": "Soma",
@@ -158,56 +158,56 @@
   "label.team": "Equipe",
   "label.team-id": "ID da equipe",
   "label.team-member": "Membro da equipe",
-  "label.team-name": "Nome da equipe", 
-  "label.team-owner": "Proprietário da equipe", 
-  "label.team-view-only": "Apenas visualização da equipe", 
+  "label.team-name": "Nome da equipe",
+  "label.team-owner": "Proprietário da equipe",
+  "label.team-view-only": "Apenas visualização da equipe",
   "label.team-websites": "Sites da equipe",
   "label.teams": "Equipes",
   "label.theme": "Tema",
-  "label.this-month": "Este mês", 
-  "label.this-week": "Esta semana", 
+  "label.this-month": "Este mês",
+  "label.this-week": "Esta semana",
   "label.this-year": "Este ano",
   "label.timezone": "Fuso horário",
   "label.title": "Título",
-  "label.today": "Hoje",    
+  "label.today": "Hoje",
   "label.toggle-charts": "Alternar gráficos",
   "label.total": "Total",
-  "label.total-records": "Total de registros", 
+  "label.total-records": "Total de registros",
   "label.tracking-code": "Código de rastreamento",
   "label.transfer": "Transferir",
   "label.transfer-website": "Transferir site",
   "label.true": "Sim",
-  "label.type": "Tipo", 
-  "label.unique": "Únicos", 
+  "label.type": "Tipo",
+  "label.unique": "Únicos",
   "label.unique-visitors": "Visitantes únicos",
   "label.unknown": "Desconhecido",
   "label.untitled": "Sem título",
-  "label.update": "Atualizar", 
-  "label.url": "URL", 
+  "label.update": "Atualizar",
+  "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Usuário",
-  "label.username": "Nome de usuário", 
+  "label.username": "Nome de usuário",
   "label.users": "Usuários",
   "label.utm": "UTM",
   "label.utm-description": "Acompanhe suas campanhas de publicidade através de parâmetros UTM.",
-  "label.value": "Valor", 
+  "label.value": "Valor",
   "label.view": "Visualizar",
   "label.view-details": "Ver mais",
   "label.view-only": "Somente visualização",
   "label.views": "Visualizações",
-  "label.views-per-visit": "Visualizações por visita", 
-  "label.visitors": "Visitantes", 
+  "label.views-per-visit": "Visualizações por visita",
+  "label.visitors": "Visitantes",
   "label.visits": "Visitas",
   "label.website": "Site",
-  "label.website-id": "ID do site", 
+  "label.website-id": "ID do site",
   "label.websites": "Sites",
   "label.window": "Janela",
-  "label.yesterday": "Ontem", 
-  "message.action-confirmation": "Digite {confirmation} na caixa abaixo para confirmar.", 
+  "label.yesterday": "Ontem",
+  "message.action-confirmation": "Digite {confirmation} na caixa abaixo para confirmar.",
   "message.active-users": " Atualmente {x} usuários ativos",
   "message.confirm-delete": "Tem certeza de que deseja excluir {target}?",
-  "message.confirm-leave": "Tem certeza de que deseja sair de {target}?", 
-  "message.confirm-remove": "Tem certeza que deseja remover {target}?", 
+  "message.confirm-leave": "Tem certeza de que deseja sair de {target}?",
+  "message.confirm-remove": "Tem certeza que deseja remover {target}?",
   "message.confirm-reset": "Tem certeza que deseja redefinir os dados de {target}?",
   "message.delete-team-warning": "Excluir a equipe também excluirá todos os sites da equipe.",
   "message.delete-website-warning": "Todos os dados relacionados serão excluídos.",
@@ -243,4 +243,4 @@
   "message.viewed-page": "Página visualizada",
   "message.visitor-log": "Visitante de {country} usando o navegador {browser} em um {device} com sistema operacional {os}.",
   "message.visitors-dropped-off": "Visitantes abandonados"
-  }
+}
diff --git a/src/lang/pt-PT.json b/src/lang/pt-PT.json
index 36966c9839..02504a9a4f 100644
--- a/src/lang/pt-PT.json
+++ b/src/lang/pt-PT.json
@@ -13,7 +13,7 @@
   "label.all-time": "Todo o tempo",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Tempo médio de visita",
+  "label.visit-duration": "Tempo médio de visita",
   "label.back": "Voltar",
   "label.before": "Before",
   "label.bounce-rate": "Taxa de rejeição",
diff --git a/src/lang/ro-RO.json b/src/lang/ro-RO.json
index 296f51b776..e6c9cad45f 100644
--- a/src/lang/ro-RO.json
+++ b/src/lang/ro-RO.json
@@ -13,7 +13,7 @@
   "label.all-time": "Pentru tot timpul",
   "label.analytics": "Analytics",
   "label.average": "Mediu",
-  "label.average-visit-time": "Timp mediu de vizitare",
+  "label.visit-duration": "Timp mediu de vizitare",
   "label.back": "Înapoi",
   "label.before": "Înainte",
   "label.bounce-rate": "Rata de respingere",
diff --git a/src/lang/ru-RU.json b/src/lang/ru-RU.json
index 3d1d8e74f9..25065a4fc3 100644
--- a/src/lang/ru-RU.json
+++ b/src/lang/ru-RU.json
@@ -13,7 +13,7 @@
   "label.all-time": "Все время",
   "label.analytics": "Аналитика",
   "label.average": "Average",
-  "label.average-visit-time": "Среднее время посещения",
+  "label.visit-duration": "Среднее время посещения",
   "label.back": "Назад",
   "label.before": "Before",
   "label.bounce-rate": "Отказы",
diff --git a/src/lang/si-LK.json b/src/lang/si-LK.json
index 6f672ab5ca..087efa5612 100644
--- a/src/lang/si-LK.json
+++ b/src/lang/si-LK.json
@@ -13,7 +13,7 @@
   "label.all-time": "හැම වෙලාවෙම",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Average visit time",
+  "label.visit-duration": "Average visit time",
   "label.back": "ආපසු",
   "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
diff --git a/src/lang/sk-SK.json b/src/lang/sk-SK.json
index d978281a11..10a547d12f 100644
--- a/src/lang/sk-SK.json
+++ b/src/lang/sk-SK.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Priemerný čas návštevy",
+  "label.visit-duration": "Priemerný čas návštevy",
   "label.back": "Späť",
   "label.before": "Before",
   "label.bounce-rate": "Okamžité opustenie",
diff --git a/src/lang/sl-SI.json b/src/lang/sl-SI.json
index 9ba94e3bc1..0b3761f5bb 100644
--- a/src/lang/sl-SI.json
+++ b/src/lang/sl-SI.json
@@ -13,7 +13,7 @@
   "label.all-time": "Ves čas",
   "label.analytics": "Analitika",
   "label.average": "Povprečno",
-  "label.average-visit-time": "Povprečni čas obiska",
+  "label.visit-duration": "Povprečni čas obiska",
   "label.back": "Nazaj",
   "label.before": "Pred",
   "label.bounce-rate": "Odbojna stopnja",
diff --git a/src/lang/sv-SE.json b/src/lang/sv-SE.json
index 87e9094231..8a72e3d689 100644
--- a/src/lang/sv-SE.json
+++ b/src/lang/sv-SE.json
@@ -13,7 +13,7 @@
   "label.all-time": "Sedan början",
   "label.analytics": "Webbplats Analys",
   "label.average": "Genomsnitt",
-  "label.average-visit-time": "Genomsnittlig besökstid",
+  "label.visit-duration": "Genomsnittlig besökstid",
   "label.back": "Tillbaka",
   "label.before": "Före",
   "label.bounce-rate": "Avvisningsfrekvens",
diff --git a/src/lang/ta-IN.json b/src/lang/ta-IN.json
index 4e40c49020..770bc2721d 100644
--- a/src/lang/ta-IN.json
+++ b/src/lang/ta-IN.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "சராசரி வருகை நேரம்",
+  "label.visit-duration": "சராசரி வருகை நேரம்",
   "label.back": "பின்னால்",
   "label.before": "Before",
   "label.bounce-rate": "துள்ளல் விகிதம்",
diff --git a/src/lang/th-TH.json b/src/lang/th-TH.json
index a5ebeefb7a..6f8b4a327d 100644
--- a/src/lang/th-TH.json
+++ b/src/lang/th-TH.json
@@ -13,7 +13,7 @@
   "label.all-time": "ทุกช่วงเวลา",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "ระยะเวลาเข้าชมเฉลี่ย",
+  "label.visit-duration": "ระยะเวลาเข้าชมเฉลี่ย",
   "label.back": "ย้อนกลับ",
   "label.before": "Before",
   "label.bounce-rate": "อัตราตีกลับ",
diff --git a/src/lang/tr-TR.json b/src/lang/tr-TR.json
index d4e46b634e..2859105240 100644
--- a/src/lang/tr-TR.json
+++ b/src/lang/tr-TR.json
@@ -13,7 +13,7 @@
   "label.all-time": "Tüm zamanlar",
   "label.analytics": "Analitik",
   "label.average": "Ortalama",
-  "label.average-visit-time": "Ortalama ziyaret süresi",
+  "label.visit-duration": "Ortalama ziyaret süresi",
   "label.back": "Geri",
   "label.before": "Önce",
   "label.bounce-rate": "Tek sayfa ziyaret oranı",
diff --git a/src/lang/uk-UA.json b/src/lang/uk-UA.json
index 1042f3b46b..3d393d300e 100644
--- a/src/lang/uk-UA.json
+++ b/src/lang/uk-UA.json
@@ -13,7 +13,7 @@
   "label.all-time": "Весь час",
   "label.analytics": "Аналітика",
   "label.average": "Середнє",
-  "label.average-visit-time": "Середній час візиту",
+  "label.visit-duration": "Середній час візиту",
   "label.back": "Назад",
   "label.before": "Раніше",
   "label.bounce-rate": "Показник відмов",
diff --git a/src/lang/ur-PK.json b/src/lang/ur-PK.json
index 862971f537..b7f018c739 100644
--- a/src/lang/ur-PK.json
+++ b/src/lang/ur-PK.json
@@ -13,7 +13,7 @@
   "label.all-time": "تمام وقت",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "وزٹ کا اوسط وقت",
+  "label.visit-duration": "وزٹ کا اوسط وقت",
   "label.back": "پیچھے",
   "label.before": "Before",
   "label.bounce-rate": "اچھال کی شرح",
diff --git a/src/lang/vi-VN.json b/src/lang/vi-VN.json
index e9a47c616d..dbf3bf95a2 100644
--- a/src/lang/vi-VN.json
+++ b/src/lang/vi-VN.json
@@ -13,7 +13,7 @@
   "label.all-time": "Toàn thời gian",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.average-visit-time": "Thời gian truy cập trung bình",
+  "label.visit-duration": "Thời gian truy cập trung bình",
   "label.back": "Quay về",
   "label.before": "Before",
   "label.bounce-rate": "Tỷ lệ thoát trang",
diff --git a/src/lang/zh-CN.json b/src/lang/zh-CN.json
index 4bf90fd165..62ab1aeae6 100644
--- a/src/lang/zh-CN.json
+++ b/src/lang/zh-CN.json
@@ -13,7 +13,7 @@
   "label.all-time": "所有时间段",
   "label.analytics": "分析",
   "label.average": "平均",
-  "label.average-visit-time": "平均访问时间",
+  "label.visit-duration": "平均访问时间",
   "label.back": "返回",
   "label.before": "之前",
   "label.bounce-rate": "跳出率",
diff --git a/src/lang/zh-TW.json b/src/lang/zh-TW.json
index 01c08b8b68..edad4a5c23 100644
--- a/src/lang/zh-TW.json
+++ b/src/lang/zh-TW.json
@@ -13,7 +13,7 @@
   "label.all-time": "所有時間",
   "label.analytics": "分析",
   "label.average": "平均",
-  "label.average-visit-time": "平均造訪時間",
+  "label.visit-duration": "平均造訪時間",
   "label.back": "返回",
   "label.before": "之前",
   "label.bounce-rate": "跳出率",
diff --git a/src/pages/api/websites/[websiteId]/stats.ts b/src/pages/api/websites/[websiteId]/stats.ts
index 81a6d83547..9108e0628b 100644
--- a/src/pages/api/websites/[websiteId]/stats.ts
+++ b/src/pages/api/websites/[websiteId]/stats.ts
@@ -22,6 +22,7 @@ export interface WebsiteStatsRequestQuery {
   country?: string;
   region?: string;
   city?: string;
+  compare?: string;
 }
 
 import * as yup from 'yup';
@@ -41,6 +42,7 @@ const schema = {
     country: yup.string(),
     region: yup.string(),
     city: yup.string(),
+    compare: yup.string(),
   }),
 };
 
@@ -77,7 +79,7 @@ export default async (
     const stats = Object.keys(metrics[0]).reduce((obj, key) => {
       obj[key] = {
         value: Number(metrics[0][key]) || 0,
-        change: Number(metrics[0][key]) - Number(prevPeriod[0][key]) || 0,
+        prev: Number(prevPeriod[0][key]) || 0,
       };
       return obj;
     }, {});
diff --git a/src/queries/analytics/eventData/getEventDataEvents.ts b/src/queries/analytics/eventData/getEventDataEvents.ts
index 76ad3fce85..e5647debd0 100644
--- a/src/queries/analytics/eventData/getEventDataEvents.ts
+++ b/src/queries/analytics/eventData/getEventDataEvents.ts
@@ -85,8 +85,8 @@ async function clickhouseQuery(
       limit 500
       `,
       params,
-    ).then(a => {
-      return Object.values(a).map(a => {
+    ).then(result => {
+      return Object.values(result).map((a: any) => {
         return {
           eventName: a.eventName,
           fieldName: a.fieldName,
@@ -113,8 +113,8 @@ async function clickhouseQuery(
     limit 500
     `,
     params,
-  ).then(a => {
-    return Object.values(a).map(a => {
+  ).then(result => {
+    return Object.values(result).map((a: any) => {
       return {
         eventName: a.eventName,
         fieldName: a.fieldName,
diff --git a/src/queries/analytics/eventData/getEventDataFields.ts b/src/queries/analytics/eventData/getEventDataFields.ts
index 6ec3b35a8d..f669ad39f6 100644
--- a/src/queries/analytics/eventData/getEventDataFields.ts
+++ b/src/queries/analytics/eventData/getEventDataFields.ts
@@ -62,8 +62,8 @@ async function clickhouseQuery(
     limit 500
     `,
     params,
-  ).then(a => {
-    return Object.values(a).map(a => {
+  ).then(result => {
+    return Object.values(result).map((a: any) => {
       return {
         fieldName: a.fieldName,
         dataType: Number(a.dataType),
diff --git a/src/queries/analytics/eventData/getEventDataStats.ts b/src/queries/analytics/eventData/getEventDataStats.ts
index 978f561bc9..09bef107c6 100644
--- a/src/queries/analytics/eventData/getEventDataStats.ts
+++ b/src/queries/analytics/eventData/getEventDataStats.ts
@@ -68,8 +68,8 @@ async function clickhouseQuery(
       ) as t
     `,
     params,
-  ).then(a => {
-    return Object.values(a).map(a => {
+  ).then(result => {
+    return Object.values(result).map((a: any) => {
       return {
         events: Number(a.events),
         fields: Number(a.fields),
diff --git a/src/queries/analytics/eventData/getEventDataUsage.ts b/src/queries/analytics/eventData/getEventDataUsage.ts
index 7866a60087..2a19f33e6d 100644
--- a/src/queries/analytics/eventData/getEventDataUsage.ts
+++ b/src/queries/analytics/eventData/getEventDataUsage.ts
@@ -30,8 +30,8 @@ function clickhouseQuery(
       startDate,
       endDate,
     },
-  ).then(a => {
-    return Object.values(a).map(a => {
+  ).then(result => {
+    return Object.values(result).map((a: any) => {
       return { websiteId: a.websiteId, count: Number(a.count) };
     });
   });
diff --git a/src/queries/analytics/getWebsiteStats.ts b/src/queries/analytics/getWebsiteStats.ts
index bc006a2ebe..6257e166c9 100644
--- a/src/queries/analytics/getWebsiteStats.ts
+++ b/src/queries/analytics/getWebsiteStats.ts
@@ -92,13 +92,13 @@ async function clickhouseQuery(
     `,
     params,
   ).then(result => {
-    return Object.values(result).map(n => {
+    return Object.values(result).map((a: any) => {
       return {
-        pageviews: Number(n.pageviews),
-        visitors: Number(n.visitors),
-        visits: Number(n.visits),
-        bounces: Number(n.bounces),
-        totaltime: Number(n.totaltime),
+        pageviews: Number(a.pageviews),
+        visitors: Number(a.visitors),
+        visits: Number(a.visits),
+        bounces: Number(a.bounces),
+        totaltime: Number(a.totaltime),
       };
     });
   });

From 24af06f3aa9d763be3c4e3f6a7308a3bdf5f5bd3 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 23 May 2024 00:58:31 -0700
Subject: [PATCH 087/438] Metrics bar styling.

---
 src/app/(main)/websites/[websiteId]/WebsiteDetails.tsx       | 2 +-
 src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx  | 5 ++---
 .../(main)/websites/[websiteId]/WebsiteMetricsBar.module.css | 5 ++---
 src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx    | 3 +++
 .../websites/[websiteId]/compare/WebsiteComparePage.tsx      | 2 ++
 src/components/metrics/MetricCard.module.css                 | 4 ++++
 src/components/metrics/MetricCard.tsx                        | 3 ++-
 7 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/WebsiteDetails.tsx b/src/app/(main)/websites/[websiteId]/WebsiteDetails.tsx
index 8c8ab2f225..1fd6992f61 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteDetails.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteDetails.tsx
@@ -34,7 +34,7 @@ export default function WebsiteDetails({ websiteId }: { websiteId: string }) {
     <>
       <WebsiteHeader websiteId={websiteId} showLinks={showLinks} />
       <FilterTags websiteId={websiteId} params={params} />
-      <WebsiteMetricsBar websiteId={websiteId} />
+      <WebsiteMetricsBar websiteId={websiteId} showChange={true} sticky={true} />
       <WebsiteChart websiteId={websiteId} />
       {!website && <Loading icon="dots" style={{ minHeight: 300 }} />}
       {website && (
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx b/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx
index 1d0c7a6a4a..785f0f367c 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx
@@ -1,4 +1,3 @@
-import classNames from 'classnames';
 import { Button, Icon, Icons, Popup, PopupTrigger, Text } from 'react-basics';
 import PopupForm from 'app/(main)/reports/[reportId]/PopupForm';
 import FilterSelectForm from 'app/(main)/reports/[reportId]/FilterSelectForm';
@@ -31,8 +30,8 @@ export function WebsiteFilterButton({
   };
 
   return (
-    <PopupTrigger>
-      <Button className={classNames(className, styles.button)} variant="quiet">
+    <PopupTrigger className={className}>
+      <Button className={styles.button} variant="quiet">
         <Icon>
           <Icons.Plus />
         </Icon>
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.module.css b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.module.css
index 4d40edf8c3..6c5a0e569e 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.module.css
+++ b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.module.css
@@ -11,9 +11,8 @@
 
 .actions {
   display: flex;
-  align-items: center;
-  flex-direction: row;
-  justify-content: flex-end;
+  flex-direction: column;
+  align-items: flex-end;
   gap: 10px;
   flex-wrap: wrap;
 }
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
index 11c856856b..1b00ed1a4f 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
@@ -13,10 +13,12 @@ import { Dropdown, Item } from 'react-basics';
 export function WebsiteMetricsBar({
   websiteId,
   sticky,
+  showChange = false,
   compareMode = false,
 }: {
   websiteId: string;
   sticky?: boolean;
+  showChange?: boolean;
   compareMode?: boolean;
 }) {
   const { formatMessage, labels } = useMessages();
@@ -88,6 +90,7 @@ export function WebsiteMetricsBar({
                 change={change}
                 format={format}
                 reverseColors={reverseColors}
+                showChange={compareMode || showChange}
                 showPrevious={compareMode}
               />
             );
diff --git a/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx b/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
index eb893a05c3..b9a214f8ef 100644
--- a/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
+++ b/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
@@ -4,6 +4,7 @@ import WebsiteMetricsBar from '../WebsiteMetricsBar';
 import FilterTags from 'components/metrics/FilterTags';
 import { useNavigation } from 'components/hooks';
 import { FILTER_COLUMNS } from 'lib/constants';
+import WebsiteChart from '../WebsiteChart';
 
 export function WebsiteComparePage({ websiteId }) {
   const { query } = useNavigation();
@@ -20,6 +21,7 @@ export function WebsiteComparePage({ websiteId }) {
       <WebsiteHeader websiteId={websiteId} />
       <FilterTags websiteId={websiteId} params={params} />
       <WebsiteMetricsBar websiteId={websiteId} compareMode={true} />
+      <WebsiteChart websiteId={websiteId} />
     </>
   );
 }
diff --git a/src/components/metrics/MetricCard.module.css b/src/components/metrics/MetricCard.module.css
index 92c5712c6c..1498c38a88 100644
--- a/src/components/metrics/MetricCard.module.css
+++ b/src/components/metrics/MetricCard.module.css
@@ -61,3 +61,7 @@
   color: var(--red700);
   background: var(--red100);
 }
+
+.hide {
+  visibility: hidden;
+}
diff --git a/src/components/metrics/MetricCard.tsx b/src/components/metrics/MetricCard.tsx
index 2bb38fbaab..e727f925bc 100644
--- a/src/components/metrics/MetricCard.tsx
+++ b/src/components/metrics/MetricCard.tsx
@@ -24,7 +24,7 @@ export const MetricCard = ({
   reverseColors = false,
   format = formatNumber,
   showLabel = true,
-  showChange = true,
+  showChange = false,
   showPrevious = false,
   className,
 }: MetricCardProps) => {
@@ -45,6 +45,7 @@ export const MetricCard = ({
           className={classNames(styles.change, {
             [styles.positive]: positive,
             [styles.negative]: negative,
+            [styles.hide]: ~~change === 0,
           })}
         >
           <Icon rotate={positive ? -45 : 45} size={showPrevious ? 'sm' : 'xs'}>

From 8cf7985dac56f4b6adb95448a3ed0ffb6be2fd3b Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 23 May 2024 19:35:29 -0700
Subject: [PATCH 088/438] Progress check-in for date compare.

---
 src/app/(main)/profile/DateRangeSetting.tsx   |  6 +--
 .../websites/[websiteId]/WebsiteChart.tsx     | 28 +++++++++---
 .../[websiteId]/WebsiteFilterButton.tsx       |  4 +-
 .../[websiteId]/WebsiteMetricsBar.tsx         | 13 +++---
 .../compare/WebsiteComparePage.tsx            |  2 +-
 .../event-data/EventDataMetricsBar.tsx        |  2 +-
 .../event-data/WebsiteEventData.tsx           |  2 +-
 src/components/charts/BarChart.tsx            |  2 +-
 src/components/charts/Chart.tsx               | 20 +++++----
 .../hooks/queries/useWebsitePageviews.ts      |  5 ++-
 src/components/hooks/useDateRange.ts          | 18 ++++++--
 src/components/hooks/useFilterParams.ts       |  2 +-
 src/components/input/RefreshButton.tsx        |  2 +-
 src/components/input/WebsiteDateFilter.tsx    |  6 +--
 src/components/metrics/EventsChart.tsx        |  4 +-
 src/components/metrics/FilterTags.tsx         |  2 +-
 src/components/metrics/MetricCard.module.css  | 10 ++---
 src/components/metrics/MetricCard.tsx         |  2 +-
 src/components/metrics/PageviewsChart.tsx     | 26 ++++++++++-
 src/lib/constants.ts                          |  1 +
 src/lib/date.ts                               | 10 +++++
 .../api/websites/[websiteId]/pageviews.ts     | 43 +++++++++++++++++--
 src/pages/api/websites/[websiteId]/stats.ts   | 18 ++++----
 .../analytics/pageviews/getPageviewStats.ts   |  2 +-
 src/store/websites.ts                         | 14 ++++++
 25 files changed, 182 insertions(+), 62 deletions(-)

diff --git a/src/app/(main)/profile/DateRangeSetting.tsx b/src/app/(main)/profile/DateRangeSetting.tsx
index c57a209a65..25b5afbd7e 100644
--- a/src/app/(main)/profile/DateRangeSetting.tsx
+++ b/src/app/(main)/profile/DateRangeSetting.tsx
@@ -7,11 +7,11 @@ import styles from './DateRangeSetting.module.css';
 
 export function DateRangeSetting() {
   const { formatMessage, labels } = useMessages();
-  const [dateRange, setDateRange] = useDateRange();
+  const { dateRange, saveDateRange } = useDateRange();
   const { value } = dateRange;
 
-  const handleChange = (value: string | DateRange) => setDateRange(value);
-  const handleReset = () => setDateRange(DEFAULT_DATE_RANGE);
+  const handleChange = (value: string | DateRange) => saveDateRange(value);
+  const handleReset = () => saveDateRange(DEFAULT_DATE_RANGE);
 
   return (
     <Flexbox gap={10} width={300}>
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx b/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
index 470bd7922e..5144adcc7d 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
@@ -4,17 +4,33 @@ import { getDateArray } from 'lib/date';
 import useWebsitePageviews from 'components/hooks/queries/useWebsitePageviews';
 import { useDateRange } from 'components/hooks';
 
-export function WebsiteChart({ websiteId }: { websiteId: string }) {
-  const [dateRange] = useDateRange(websiteId);
+export function WebsiteChart({
+  websiteId,
+  compareMode = false,
+}: {
+  websiteId: string;
+  compareMode: boolean;
+}) {
+  const { dateRange, dateCompare } = useDateRange(websiteId);
   const { startDate, endDate, unit } = dateRange;
-  const { data, isLoading } = useWebsitePageviews(websiteId);
+  const { data, isLoading } = useWebsitePageviews(websiteId, compareMode ? dateCompare : undefined);
+  const { pageviews, sessions, compare } = (data || {}) as any;
 
   const chartData = useMemo(() => {
     if (data) {
-      return {
-        pageviews: getDateArray(data.pageviews, startDate, endDate, unit),
-        sessions: getDateArray(data.sessions, startDate, endDate, unit),
+      const result = {
+        pageviews: getDateArray(pageviews, startDate, endDate, unit),
+        sessions: getDateArray(sessions, startDate, endDate, unit),
       };
+
+      if (compare) {
+        result['compare'] = {
+          pageviews: result.pageviews.map(({ x }, i) => ({ x, y: compare.pageviews[i].y })),
+          sessions: result.sessions.map(({ x }, i) => ({ x, y: compare.sessions[i].y })),
+        };
+      }
+
+      return result;
     }
     return { pageviews: [], sessions: [] };
   }, [data, startDate, endDate, unit]);
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx b/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx
index 785f0f367c..a6229e9584 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx
@@ -21,7 +21,9 @@ export function WebsiteFilterButton({
   const { formatMessage, labels } = useMessages();
   const { renderUrl, router } = useNavigation();
   const { fields } = useFields();
-  const [{ startDate, endDate }] = useDateRange(websiteId);
+  const {
+    dateRange: { startDate, endDate },
+  } = useDateRange(websiteId);
 
   const handleAddFilter = ({ name, operator, value }) => {
     const prefix = OPERATOR_PREFIXES[operator];
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
index 1b00ed1a4f..90abc814a0 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
@@ -1,4 +1,3 @@
-import { useState } from 'react';
 import classNames from 'classnames';
 import { useMessages, useSticky } from 'components/hooks';
 import WebsiteDateFilter from 'components/input/WebsiteDateFilter';
@@ -9,6 +8,7 @@ import WebsiteFilterButton from './WebsiteFilterButton';
 import useWebsiteStats from 'components/hooks/queries/useWebsiteStats';
 import styles from './WebsiteMetricsBar.module.css';
 import { Dropdown, Item } from 'react-basics';
+import useStore, { setWebsiteDateCompare } from 'store/websites';
 
 export function WebsiteMetricsBar({
   websiteId,
@@ -22,9 +22,12 @@ export function WebsiteMetricsBar({
   compareMode?: boolean;
 }) {
   const { formatMessage, labels } = useMessages();
-  const [compare, setCompare] = useState('prev');
+  const dateCompare = useStore(state => state[websiteId]?.dateCompare);
   const { ref, isSticky } = useSticky({ enabled: sticky });
-  const { data, isLoading, isFetched, error } = useWebsiteStats(websiteId, compare);
+  const { data, isLoading, isFetched, error } = useWebsiteStats(
+    websiteId,
+    compareMode && dateCompare,
+  );
 
   const { pageviews, visitors, visits, bounces, totaltime } = data || {};
 
@@ -106,10 +109,10 @@ export function WebsiteMetricsBar({
             <Dropdown
               className={styles.dropdown}
               items={items}
-              value={compare}
+              value={dateCompare || 'prev'}
               renderValue={value => items.find(i => i.value === value)?.label}
               alignment="end"
-              onChange={(e: any) => setCompare(e)}
+              onChange={(value: any) => setWebsiteDateCompare(websiteId, value)}
             >
               {items.map(({ label, value }) => (
                 <Item key={value}>{label}</Item>
diff --git a/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx b/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
index b9a214f8ef..da33069186 100644
--- a/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
+++ b/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
@@ -21,7 +21,7 @@ export function WebsiteComparePage({ websiteId }) {
       <WebsiteHeader websiteId={websiteId} />
       <FilterTags websiteId={websiteId} params={params} />
       <WebsiteMetricsBar websiteId={websiteId} compareMode={true} />
-      <WebsiteChart websiteId={websiteId} />
+      <WebsiteChart websiteId={websiteId} compareMode={true} />
     </>
   );
 }
diff --git a/src/app/(main)/websites/[websiteId]/event-data/EventDataMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/event-data/EventDataMetricsBar.tsx
index fceb86aae8..86417c96d3 100644
--- a/src/app/(main)/websites/[websiteId]/event-data/EventDataMetricsBar.tsx
+++ b/src/app/(main)/websites/[websiteId]/event-data/EventDataMetricsBar.tsx
@@ -7,7 +7,7 @@ import styles from './EventDataMetricsBar.module.css';
 export function EventDataMetricsBar({ websiteId }: { websiteId: string }) {
   const { formatMessage, labels } = useMessages();
   const { get, useQuery } = useApi();
-  const [dateRange] = useDateRange(websiteId);
+  const { dateRange } = useDateRange(websiteId);
   const { startDate, endDate } = dateRange;
 
   const { data, error, isLoading, isFetched } = useQuery({
diff --git a/src/app/(main)/websites/[websiteId]/event-data/WebsiteEventData.tsx b/src/app/(main)/websites/[websiteId]/event-data/WebsiteEventData.tsx
index 27ccd96ca5..d7d24ceed1 100644
--- a/src/app/(main)/websites/[websiteId]/event-data/WebsiteEventData.tsx
+++ b/src/app/(main)/websites/[websiteId]/event-data/WebsiteEventData.tsx
@@ -6,7 +6,7 @@ import { useDateRange, useApi, useNavigation } from 'components/hooks';
 import styles from './WebsiteEventData.module.css';
 
 function useData(websiteId: string, event: string) {
-  const [dateRange] = useDateRange(websiteId);
+  const { dateRange } = useDateRange(websiteId);
   const { startDate, endDate } = dateRange;
   const { get, useQuery } = useApi();
   const { data, error, isLoading } = useQuery({
diff --git a/src/components/charts/BarChart.tsx b/src/components/charts/BarChart.tsx
index 635bb10def..cfcbe74350 100644
--- a/src/components/charts/BarChart.tsx
+++ b/src/components/charts/BarChart.tsx
@@ -26,7 +26,7 @@ export function BarChart(props: BarChartProps) {
     stacked = false,
   } = props;
 
-  const options = useMemo(() => {
+  const options: any = useMemo(() => {
     return {
       scales: {
         x: {
diff --git a/src/components/charts/Chart.tsx b/src/components/charts/Chart.tsx
index d5d22874b1..47d29c071e 100644
--- a/src/components/charts/Chart.tsx
+++ b/src/components/charts/Chart.tsx
@@ -79,15 +79,19 @@ export function Chart({
   };
 
   const updateChart = (data: any) => {
-    chart.current.data.datasets.forEach((dataset: { data: any }, index: string | number) => {
-      if (data?.datasets[index]) {
-        dataset.data = data?.datasets[index]?.data;
-
-        if (chart.current.legend.legendItems[index]) {
-          chart.current.legend.legendItems[index].text = data?.datasets[index]?.label;
+    if (data.datasets.length === chart.current.data.datasets.length) {
+      chart.current.data.datasets.forEach((dataset: { data: any }, index: string | number) => {
+        if (data?.datasets[index]) {
+          dataset.data = data?.datasets[index]?.data;
+
+          if (chart.current.legend.legendItems[index]) {
+            chart.current.legend.legendItems[index].text = data?.datasets[index]?.label;
+          }
         }
-      }
-    });
+      });
+    } else {
+      chart.current.data.datasets = data.datasets;
+    }
 
     chart.current.options = options;
 
diff --git a/src/components/hooks/queries/useWebsitePageviews.ts b/src/components/hooks/queries/useWebsitePageviews.ts
index 0db1fe6388..c9260bcbfb 100644
--- a/src/components/hooks/queries/useWebsitePageviews.ts
+++ b/src/components/hooks/queries/useWebsitePageviews.ts
@@ -4,14 +4,15 @@ import { useFilterParams } from '..//useFilterParams';
 
 export function useWebsitePageviews(
   websiteId: string,
+  compare?: string,
   options?: Omit<UseQueryOptions, 'queryKey' | 'queryFn'>,
 ) {
   const { get, useQuery } = useApi();
   const params = useFilterParams(websiteId);
 
   return useQuery({
-    queryKey: ['websites:pageviews', { websiteId, ...params }],
-    queryFn: () => get(`/websites/${websiteId}/pageviews`, params),
+    queryKey: ['websites:pageviews', { websiteId, ...params, compare }],
+    queryFn: () => get(`/websites/${websiteId}/pageviews`, { ...params, compare }),
     enabled: !!websiteId,
     ...options,
   });
diff --git a/src/components/hooks/useDateRange.ts b/src/components/hooks/useDateRange.ts
index e022d9604f..248070f47f 100644
--- a/src/components/hooks/useDateRange.ts
+++ b/src/components/hooks/useDateRange.ts
@@ -1,19 +1,25 @@
 import { getMinimumUnit, parseDateRange } from 'lib/date';
 import { setItem } from 'next-basics';
-import { DATE_RANGE_CONFIG, DEFAULT_DATE_RANGE } from 'lib/constants';
-import websiteStore, { setWebsiteDateRange } from 'store/websites';
+import { DATE_RANGE_CONFIG, DEFAULT_DATE_COMPARE, DEFAULT_DATE_RANGE } from 'lib/constants';
+import websiteStore, { setWebsiteDateRange, setWebsiteDateCompare } from 'store/websites';
 import appStore, { setDateRange } from 'store/app';
 import { DateRange } from 'lib/types';
 import { useLocale } from './useLocale';
 import { useApi } from './queries/useApi';
 
-export function useDateRange(websiteId?: string): [DateRange, (value: string | DateRange) => void] {
+export function useDateRange(websiteId?: string): {
+  dateRange: DateRange;
+  saveDateRange: (value: string | DateRange) => void;
+  dateCompare: string;
+  saveDateCompare: (value: string) => void;
+} {
   const { get } = useApi();
   const { locale } = useLocale();
   const websiteConfig = websiteStore(state => state[websiteId]?.dateRange);
   const defaultConfig = DEFAULT_DATE_RANGE;
   const globalConfig = appStore(state => state.dateRange);
   const dateRange = parseDateRange(websiteConfig || globalConfig || defaultConfig, locale);
+  const dateCompare = websiteStore(state => state[websiteId]?.dateCompare || DEFAULT_DATE_COMPARE);
 
   const saveDateRange = async (value: DateRange | string) => {
     if (websiteId) {
@@ -45,7 +51,11 @@ export function useDateRange(websiteId?: string): [DateRange, (value: string | D
     }
   };
 
-  return [dateRange, saveDateRange];
+  const saveDateCompare = (value: string) => {
+    setWebsiteDateCompare(websiteId, value);
+  };
+
+  return { dateRange, saveDateRange, dateCompare, saveDateCompare };
 }
 
 export default useDateRange;
diff --git a/src/components/hooks/useFilterParams.ts b/src/components/hooks/useFilterParams.ts
index fd76fd4786..ac934d8c83 100644
--- a/src/components/hooks/useFilterParams.ts
+++ b/src/components/hooks/useFilterParams.ts
@@ -4,7 +4,7 @@ import { useTimezone } from './useTimezone';
 import { zonedTimeToUtc } from 'date-fns-tz';
 
 export function useFilterParams(websiteId: string) {
-  const [dateRange] = useDateRange(websiteId);
+  const { dateRange } = useDateRange(websiteId);
   const { startDate, endDate, unit } = dateRange;
   const { timezone } = useTimezone();
   const {
diff --git a/src/components/input/RefreshButton.tsx b/src/components/input/RefreshButton.tsx
index 4515a5749c..cd68c40af0 100644
--- a/src/components/input/RefreshButton.tsx
+++ b/src/components/input/RefreshButton.tsx
@@ -12,7 +12,7 @@ export function RefreshButton({
   isLoading?: boolean;
 }) {
   const { formatMessage, labels } = useMessages();
-  const [dateRange] = useDateRange(websiteId);
+  const { dateRange } = useDateRange(websiteId);
 
   function handleClick() {
     if (!isLoading && dateRange) {
diff --git a/src/components/input/WebsiteDateFilter.tsx b/src/components/input/WebsiteDateFilter.tsx
index 3cb8876625..12718b3d04 100644
--- a/src/components/input/WebsiteDateFilter.tsx
+++ b/src/components/input/WebsiteDateFilter.tsx
@@ -8,17 +8,17 @@ import { DateRange } from 'lib/types';
 
 export function WebsiteDateFilter({ websiteId }: { websiteId: string }) {
   const { dir } = useLocale();
-  const [dateRange, setDateRange] = useDateRange(websiteId);
+  const { dateRange, saveDateRange } = useDateRange(websiteId);
   const { value, startDate, endDate, offset } = dateRange;
   const disableForward =
     value === 'all' || isAfter(getOffsetDateRange(dateRange, 1).startDate, new Date());
 
   const handleChange = (value: string | DateRange) => {
-    setDateRange(value);
+    saveDateRange(value);
   };
 
   const handleIncrement = (increment: number) => {
-    setDateRange(getOffsetDateRange(dateRange, increment));
+    saveDateRange(getOffsetDateRange(dateRange, increment));
   };
 
   return (
diff --git a/src/components/metrics/EventsChart.tsx b/src/components/metrics/EventsChart.tsx
index eb2fb703c9..842ae60568 100644
--- a/src/components/metrics/EventsChart.tsx
+++ b/src/components/metrics/EventsChart.tsx
@@ -13,7 +13,9 @@ export interface EventsChartProps {
 }
 
 export function EventsChart({ websiteId, className }: EventsChartProps) {
-  const [{ startDate, endDate, unit }] = useDateRange(websiteId);
+  const {
+    dateRange: { startDate, endDate, unit },
+  } = useDateRange(websiteId);
   const { locale } = useLocale();
   const { data, isLoading } = useWebsiteEvents(websiteId);
 
diff --git a/src/components/metrics/FilterTags.tsx b/src/components/metrics/FilterTags.tsx
index ee136ae396..60cf90c18d 100644
--- a/src/components/metrics/FilterTags.tsx
+++ b/src/components/metrics/FilterTags.tsx
@@ -24,7 +24,7 @@ export function FilterTags({
 }) {
   const { formatMessage, labels } = useMessages();
   const { formatValue } = useFormat();
-  const [dateRange] = useDateRange(websiteId);
+  const { dateRange } = useDateRange(websiteId);
   const {
     router,
     renderUrl,
diff --git a/src/components/metrics/MetricCard.module.css b/src/components/metrics/MetricCard.module.css
index 1498c38a88..ee8f55b17e 100644
--- a/src/components/metrics/MetricCard.module.css
+++ b/src/components/metrics/MetricCard.module.css
@@ -5,13 +5,9 @@
   min-width: 150px;
 }
 
-.card.compare {
-  gap: 10px;
-}
-
 .card.compare .change {
   font-size: 16px;
-  padding: 5px 10px;
+  margin: 10px 0;
 }
 
 .card:first-child {
@@ -23,7 +19,7 @@
 }
 
 .value {
-  font-size: 40px;
+  font-size: 36px;
   font-weight: 700;
   white-space: nowrap;
   color: var(--base900);
@@ -46,7 +42,7 @@
   gap: 5px;
   font-size: 13px;
   font-weight: 700;
-  padding: 0 5px;
+  padding: 0.1em 0.5em;
   border-radius: 5px;
   color: var(--base500);
   align-self: flex-start;
diff --git a/src/components/metrics/MetricCard.tsx b/src/components/metrics/MetricCard.tsx
index e727f925bc..907263afd7 100644
--- a/src/components/metrics/MetricCard.tsx
+++ b/src/components/metrics/MetricCard.tsx
@@ -48,7 +48,7 @@ export const MetricCard = ({
             [styles.hide]: ~~change === 0,
           })}
         >
-          <Icon rotate={positive ? -45 : 45} size={showPrevious ? 'sm' : 'xs'}>
+          <Icon rotate={positive || reverseColors ? -45 : 45} size={showPrevious ? 'md' : 'xs'}>
             <Icons.ArrowRight />
           </Icon>
           <animated.span title={changeProps?.x as any}>
diff --git a/src/components/metrics/PageviewsChart.tsx b/src/components/metrics/PageviewsChart.tsx
index 347bf155fc..e82ba3067a 100644
--- a/src/components/metrics/PageviewsChart.tsx
+++ b/src/components/metrics/PageviewsChart.tsx
@@ -5,8 +5,12 @@ import { renderDateLabels } from 'lib/charts';
 
 export interface PageviewsChartProps extends BarChartProps {
   data: {
-    sessions: any[];
     pageviews: any[];
+    sessions: any[];
+    compare?: {
+      pageviews: any[];
+      sessions: any[];
+    };
   };
   unit: string;
   isLoading?: boolean;
@@ -36,7 +40,25 @@ export function PageviewsChart({ data, unit, isLoading, ...props }: PageviewsCha
           borderWidth: 1,
           ...colors.chart.views,
         },
-      ],
+        data.compare
+          ? {
+              type: 'line',
+              label: formatMessage(labels.visitors),
+              data: data.compare.pageviews,
+              borderWidth: 2,
+              borderColor: '#f15bb5',
+            }
+          : null,
+        data.compare
+          ? {
+              type: 'line',
+              label: formatMessage(labels.visits),
+              data: data.compare.sessions,
+              borderWidth: 2,
+              borderColor: '#9b5de5',
+            }
+          : null,
+      ].filter(n => n),
     };
   }, [data, locale]);
 
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 0386266064..745673e96c 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -20,6 +20,7 @@ export const DEFAULT_DATE_RANGE = '24hour';
 export const DEFAULT_WEBSITE_LIMIT = 10;
 export const DEFAULT_RESET_DATE = '2000-01-01';
 export const DEFAULT_PAGE_SIZE = 10;
+export const DEFAULT_DATE_COMPARE = 'prev';
 
 export const REALTIME_RANGE = 30;
 export const REALTIME_INTERVAL = 5000;
diff --git a/src/lib/date.ts b/src/lib/date.ts
index 861bbde2f2..de76f7f327 100644
--- a/src/lib/date.ts
+++ b/src/lib/date.ts
@@ -326,3 +326,13 @@ export function getDateLength(startDate: Date, endDate: Date, unit: string | num
   const { diff } = DATE_FUNCTIONS[unit];
   return diff(endDate, startDate) + 1;
 }
+
+export function getCompareDate(compare: string, startDate: Date, endDate: Date) {
+  if (compare === 'yoy') {
+    return { startDate: subYears(startDate, 1), endDate: subYears(endDate, 1) };
+  }
+
+  const diff = differenceInMinutes(endDate, startDate);
+
+  return { startDate: subMinutes(startDate, diff), endDate: subMinutes(endDate, diff) };
+}
diff --git a/src/pages/api/websites/[websiteId]/pageviews.ts b/src/pages/api/websites/[websiteId]/pageviews.ts
index 1967106431..5b63151585 100644
--- a/src/pages/api/websites/[websiteId]/pageviews.ts
+++ b/src/pages/api/websites/[websiteId]/pageviews.ts
@@ -1,3 +1,4 @@
+import * as yup from 'yup';
 import { canViewWebsite } from 'lib/auth';
 import { useAuth, useCors, useValidate } from 'lib/middleware';
 import { getRequestFilters, getRequestDateRange } from 'lib/request';
@@ -5,6 +6,8 @@ import { NextApiRequestQueryBody, WebsitePageviews } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { getPageviewStats, getSessionStats } from 'queries';
+import { TimezoneTest, UnitTypeTest } from 'lib/yup';
+import { getCompareDate } from 'lib/date';
 
 export interface WebsitePageviewRequestQuery {
   websiteId: string;
@@ -21,10 +24,9 @@ export interface WebsitePageviewRequestQuery {
   country?: string;
   region: string;
   city?: string;
+  compare?: string;
 }
 
-import { TimezoneTest, UnitTypeTest } from 'lib/yup';
-import * as yup from 'yup';
 const schema = {
   GET: yup.object().shape({
     websiteId: yup.string().uuid().required(),
@@ -41,6 +43,7 @@ const schema = {
     country: yup.string(),
     region: yup.string(),
     city: yup.string(),
+    compare: yup.string(),
   }),
 };
 
@@ -52,7 +55,7 @@ export default async (
   await useAuth(req, res);
   await useValidate(schema, req, res);
 
-  const { websiteId, timezone } = req.query;
+  const { websiteId, timezone, compare } = req.query;
 
   if (req.method === 'GET') {
     if (!(await canViewWebsite(req.auth, websiteId))) {
@@ -74,6 +77,40 @@ export default async (
       getSessionStats(websiteId, filters),
     ]);
 
+    if (compare) {
+      const { startDate: compareStartDate, endDate: compareEndDate } = getCompareDate(
+        compare,
+        startDate,
+        endDate,
+      );
+
+      const [comparePageviews, compareSessions] = await Promise.all([
+        getPageviewStats(websiteId, {
+          ...filters,
+          startDate: compareStartDate,
+          endDate: compareEndDate,
+        }),
+        getSessionStats(websiteId, {
+          ...filters,
+          startDate: compareStartDate,
+          endDate: compareEndDate,
+        }),
+      ]);
+
+      return ok(res, {
+        pageviews,
+        sessions,
+        startDate,
+        endDate,
+        compare: {
+          pageviews: comparePageviews,
+          sessions: compareSessions,
+          startDate: compareStartDate,
+          endDate: compareEndDate,
+        },
+      });
+    }
+
     return ok(res, { pageviews, sessions });
   }
 
diff --git a/src/pages/api/websites/[websiteId]/stats.ts b/src/pages/api/websites/[websiteId]/stats.ts
index 9108e0628b..1ce616e7ac 100644
--- a/src/pages/api/websites/[websiteId]/stats.ts
+++ b/src/pages/api/websites/[websiteId]/stats.ts
@@ -1,4 +1,4 @@
-import { subMinutes, differenceInMinutes } from 'date-fns';
+import * as yup from 'yup';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { canViewWebsite } from 'lib/auth';
@@ -6,6 +6,7 @@ import { useAuth, useCors, useValidate } from 'lib/middleware';
 import { NextApiRequestQueryBody, WebsiteStats } from 'lib/types';
 import { getRequestFilters, getRequestDateRange } from 'lib/request';
 import { getWebsiteStats } from 'queries';
+import { getCompareDate } from 'lib/date';
 
 export interface WebsiteStatsRequestQuery {
   websiteId: string;
@@ -25,7 +26,6 @@ export interface WebsiteStatsRequestQuery {
   compare?: string;
 }
 
-import * as yup from 'yup';
 const schema = {
   GET: yup.object().shape({
     websiteId: yup.string().uuid().required(),
@@ -54,7 +54,7 @@ export default async (
   await useAuth(req, res);
   await useValidate(schema, req, res);
 
-  const { websiteId } = req.query;
+  const { websiteId, compare } = req.query;
 
   if (req.method === 'GET') {
     if (!(await canViewWebsite(req.auth, websiteId))) {
@@ -62,9 +62,11 @@ export default async (
     }
 
     const { startDate, endDate } = await getRequestDateRange(req);
-    const diff = differenceInMinutes(endDate, startDate);
-    const prevStartDate = subMinutes(startDate, diff);
-    const prevEndDate = subMinutes(endDate, diff);
+    const { startDate: compareStartDate, endDate: compareEndDate } = getCompareDate(
+      compare,
+      startDate,
+      endDate,
+    );
 
     const filters = getRequestFilters(req);
 
@@ -72,8 +74,8 @@ export default async (
 
     const prevPeriod = await getWebsiteStats(websiteId, {
       ...filters,
-      startDate: prevStartDate,
-      endDate: prevEndDate,
+      startDate: compareStartDate,
+      endDate: compareEndDate,
     });
 
     const stats = Object.keys(metrics[0]).reduce((obj, key) => {
diff --git a/src/queries/analytics/pageviews/getPageviewStats.ts b/src/queries/analytics/pageviews/getPageviewStats.ts
index 3f29c75fe4..a37a15662f 100644
--- a/src/queries/analytics/pageviews/getPageviewStats.ts
+++ b/src/queries/analytics/pageviews/getPageviewStats.ts
@@ -67,7 +67,7 @@ async function clickhouseQuery(
     `,
     params,
   ).then(result => {
-    return Object.values(result).map(a => {
+    return Object.values(result).map((a: any) => {
       return { x: a.x, y: Number(a.y) };
     });
   });
diff --git a/src/store/websites.ts b/src/store/websites.ts
index a9f6b44da7..1c5c21fc85 100644
--- a/src/store/websites.ts
+++ b/src/store/websites.ts
@@ -18,4 +18,18 @@ export function setWebsiteDateRange(websiteId: string, dateRange: DateRange) {
   );
 }
 
+export function setWebsiteDateCompare(websiteId: string, dateCompare: string) {
+  store.setState(
+    produce(state => {
+      if (!state[websiteId]) {
+        state[websiteId] = {};
+      }
+
+      state[websiteId].dateCompare = dateCompare;
+
+      return state;
+    }),
+  );
+}
+
 export default store;

From 16e1949d244e58cde1a5bd840af1d43c8b71692e Mon Sep 17 00:00:00 2001
From: shubhusion <shubham27.sharma03@gmail.com>
Date: Fri, 24 May 2024 12:26:46 +0530
Subject: [PATCH 089/438] Create logo-white.svg.svg

---
 src/assets/logo-white.svg.svg | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 src/assets/logo-white.svg.svg

diff --git a/src/assets/logo-white.svg.svg b/src/assets/logo-white.svg.svg
new file mode 100644
index 0000000000..12a76d3471
--- /dev/null
+++ b/src/assets/logo-white.svg.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 428 389.11">
+  <circle cx="214.15" cy="181" r="171" fill="none" stroke="white" stroke-miterlimit="10" stroke-width="20"/>
+  <path d="M413 134.11H15.29a15 15 0 0 0-15 15v15.3C.12 168 0 171.52 0 175.11c0 118.19 95.81 214 214 214 116.4 0 211.1-92.94 213.93-208.67 0-.44.07-.88.07-1.33v-30a15 15 0 0 0-15-15Z" fill="white"/>
+</svg>

From 47c4e6fd57d8008ad2441c832f15a3facfc84e40 Mon Sep 17 00:00:00 2001
From: shubhusion <shubham27.sharma03@gmail.com>
Date: Fri, 24 May 2024 12:28:18 +0530
Subject: [PATCH 090/438] modified logo

---
 src/assets/{logo-white.svg.svg => logo-white.svg} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/assets/{logo-white.svg.svg => logo-white.svg} (100%)

diff --git a/src/assets/logo-white.svg.svg b/src/assets/logo-white.svg
similarity index 100%
rename from src/assets/logo-white.svg.svg
rename to src/assets/logo-white.svg

From 51f7e187b73097c80558f3cefcf8c3dd0f776bca Mon Sep 17 00:00:00 2001
From: SHUBHAM SHARMA <96301987+shubhusion@users.noreply.github.com>
Date: Fri, 24 May 2024 12:40:00 +0530
Subject: [PATCH 091/438] Update README.md

---
 README.md | 53 ++++++++++++++++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index 6d9755d4de..9ca0bf8a74 100644
--- a/README.md
+++ b/README.md
@@ -1,49 +1,56 @@
-# umami
+<p align="center">
+  <img src="https://github.com/shubhusion/umami/blob/master/src/assets/logo-white.svg" alt="Umami Logo" width="100">
+</p>
 
-Umami is a simple, fast, privacy-focused alternative to Google Analytics.
+# Umami
 
-## Getting started
+> Umami is a simple, fast, privacy-focused alternative to Google Analytics.
+
+[![GitHub Release][release-shield]][releases-url]
+[![MIT License][license-shield]][license-url]
+[![Build Status][build-shield]][build-url]
+
+## Getting Started
 
 A detailed getting started guide can be found at [https://umami.is/docs/](https://umami.is/docs/)
 
-## Installing from source
+## Installing from Source
 
 ### Requirements
 
 - A server with Node.js version 16.13 or newer
-- A database. Umami supports [MySQL](https://www.mysql.com/) (minimum v8.0) and [Postgresql](https://www.postgresql.org/) (minimum v12.14) databases.
+- A database. Umami supports [MySQL](https://www.mysql.com/) (minimum v8.0) and [PostgreSQL](https://www.postgresql.org/) (minimum v12.14) databases.
 
 ### Install Yarn
 
-```
+```bash
 npm install -g yarn
 ```
 
-### Get the source code and install packages
+### Get the Source Code and Install Packages
 
-```
+```bash
 git clone https://github.com/umami-software/umami.git
 cd umami
 yarn install
 ```
 
-### Configure umami
+### Configure Umami
 
-Create an `.env` file with the following
+Create an `.env` file with the following:
 
-```
+```bash
 DATABASE_URL=connection-url
 ```
 
-The connection url is in the following format:
+The connection URL is in the following format:
 
-```
+```bash
 postgresql://username:mypassword@localhost:5432/mydb
-
 mysql://username:mypassword@localhost:3306/mydb
 ```
 
-### Build the application
+### Build the Application
 
 ```bash
 yarn build
@@ -51,19 +58,17 @@ yarn build
 
 The build step will also create tables in your database if you are installing for the first time. It will also create a login user with username **admin** and password **umami**.
 
-### Start the application
+### Start the Application
 
 ```bash
 yarn start
 ```
 
-By default this will launch the application on `http://localhost:3000`. You will need to either
-[proxy](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/) requests from your web server
-or change the [port](https://nextjs.org/docs/api-reference/cli#production) to serve the application directly.
+By default, this will launch the application on `http://localhost:3000`. You will need to either [proxy](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/) requests from your web server or change the [port](https://nextjs.org/docs/api-reference/cli#production) to serve the application directly.
 
 ## Installing with Docker
 
-To build the umami container and start up a Postgres database, run:
+To build the Umami container and start up a Postgres database, run:
 
 ```bash
 docker compose up -d
@@ -81,7 +86,7 @@ Or with MySQL support:
 docker pull docker.umami.is/umami-software/umami:mysql-latest
 ```
 
-## Getting updates
+## Getting Updates
 
 To get the latest features, simply do a pull, install any new dependencies, and rebuild:
 
@@ -102,3 +107,9 @@ docker compose up --force-recreate
 
 MIT
 
+[release-shield]: https://img.shields.io/github/release/umami-software/umami.svg
+[releases-url]: https://github.com/umami-software/umami/releases
+[license-shield]: https://img.shields.io/github/license/umami-software/umami.svg
+[license-url]: https://github.com/umami-software/umami/blob/master/LICENSE
+[build-shield]: https://img.shields.io/github/actions/workflow/status/umami-software/umami/ci.yml
+[build-url]: https://github.com/umami-software/umami/actions

From d46b27409480bc1f3cd8f21786c86894c8c72f5d Mon Sep 17 00:00:00 2001
From: SHUBHAM SHARMA <96301987+shubhusion@users.noreply.github.com>
Date: Sat, 25 May 2024 00:10:11 +0530
Subject: [PATCH 092/438] Update logo-white.svg

---
 src/assets/logo-white.svg | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/assets/logo-white.svg b/src/assets/logo-white.svg
index 12a76d3471..b5a46790b2 100644
--- a/src/assets/logo-white.svg
+++ b/src/assets/logo-white.svg
@@ -1,4 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 428 389.11">
-  <circle cx="214.15" cy="181" r="171" fill="none" stroke="white" stroke-miterlimit="10" stroke-width="20"/>
-  <path d="M413 134.11H15.29a15 15 0 0 0-15 15v15.3C.12 168 0 171.52 0 175.11c0 118.19 95.81 214 214 214 116.4 0 211.1-92.94 213.93-208.67 0-.44.07-.88.07-1.33v-30a15 15 0 0 0-15-15Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 428 389.11"><circle cx="214.15" cy="181" r="171" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="20"></circle><path d="M413 134.11H15.29a15 15 0 0 0-15 15v15.3C.12 168 0 171.52 0 175.11c0 118.19 95.81 214 214 214 116.4 0 211.1-92.94 213.93-208.67 0-.44.07-.88.07-1.33v-30a15 15 0 0 0-15-15Z"></path></svg>

From 754ca24ca5f8e3d632a6837b0b884591b85df729 Mon Sep 17 00:00:00 2001
From: SHUBHAM SHARMA <96301987+shubhusion@users.noreply.github.com>
Date: Sat, 25 May 2024 00:13:55 +0530
Subject: [PATCH 093/438] Update logo-white.svg

---
 src/assets/logo-white.svg | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/assets/logo-white.svg b/src/assets/logo-white.svg
index b5a46790b2..12a76d3471 100644
--- a/src/assets/logo-white.svg
+++ b/src/assets/logo-white.svg
@@ -1 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 428 389.11"><circle cx="214.15" cy="181" r="171" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="20"></circle><path d="M413 134.11H15.29a15 15 0 0 0-15 15v15.3C.12 168 0 171.52 0 175.11c0 118.19 95.81 214 214 214 116.4 0 211.1-92.94 213.93-208.67 0-.44.07-.88.07-1.33v-30a15 15 0 0 0-15-15Z"></path></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 428 389.11">
+  <circle cx="214.15" cy="181" r="171" fill="none" stroke="white" stroke-miterlimit="10" stroke-width="20"/>
+  <path d="M413 134.11H15.29a15 15 0 0 0-15 15v15.3C.12 168 0 171.52 0 175.11c0 118.19 95.81 214 214 214 116.4 0 211.1-92.94 213.93-208.67 0-.44.07-.88.07-1.33v-30a15 15 0 0 0-15-15Z" fill="white"/>
+</svg>

From 3222033f364853e18c4bfd5ad950a79db83d4906 Mon Sep 17 00:00:00 2001
From: SHUBHAM SHARMA <96301987+shubhusion@users.noreply.github.com>
Date: Sat, 25 May 2024 00:18:10 +0530
Subject: [PATCH 094/438] Update README.md

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 9ca0bf8a74..44874a5ed4 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,14 @@
 [![MIT License][license-shield]][license-url]
 [![Build Status][build-shield]][build-url]
 
+## Demo
+
+Explore Umami's features by trying out our demo installation:
+
+[Umami Demo](https://demo.umami.is/)
+
+Please note that the demo is provided for exploration purposes only and may not include the latest features or configurations. For a more accurate representation, consider installing Umami on your own server.
+
 ## Getting Started
 
 A detailed getting started guide can be found at [https://umami.is/docs/](https://umami.is/docs/)

From a5337a0734d1f333606a66118fb83d1897be58cb Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 24 May 2024 18:33:39 -0700
Subject: [PATCH 095/438] Updated rendering order.

---
 src/components/metrics/PageviewsChart.tsx | 44 +++++++++++++----------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/components/metrics/PageviewsChart.tsx b/src/components/metrics/PageviewsChart.tsx
index e82ba3067a..191b1490ee 100644
--- a/src/components/metrics/PageviewsChart.tsx
+++ b/src/components/metrics/PageviewsChart.tsx
@@ -33,32 +33,38 @@ export function PageviewsChart({ data, unit, isLoading, ...props }: PageviewsCha
           data: data.sessions,
           borderWidth: 1,
           ...colors.chart.visitors,
+          order: 3,
         },
         {
           label: formatMessage(labels.views),
           data: data.pageviews,
           borderWidth: 1,
           ...colors.chart.views,
+          order: 4,
         },
-        data.compare
-          ? {
-              type: 'line',
-              label: formatMessage(labels.visitors),
-              data: data.compare.pageviews,
-              borderWidth: 2,
-              borderColor: '#f15bb5',
-            }
-          : null,
-        data.compare
-          ? {
-              type: 'line',
-              label: formatMessage(labels.visits),
-              data: data.compare.sessions,
-              borderWidth: 2,
-              borderColor: '#9b5de5',
-            }
-          : null,
-      ].filter(n => n),
+        ...(data.compare
+          ? [
+              {
+                type: 'line',
+                label: `${formatMessage(labels.visits)} (VS)`,
+                data: data.compare.pageviews,
+                borderWidth: 2,
+                backgroundColor: '#8601B0',
+                borderColor: '#8601B0',
+                order: 1,
+              },
+              {
+                type: 'line',
+                label: `${formatMessage(labels.visitors)} (VS)`,
+                data: data.compare.sessions,
+                borderWidth: 2,
+                backgroundColor: '#f15bb5',
+                borderColor: '#f15bb5',
+                order: 2,
+              },
+            ]
+          : []),
+      ],
     };
   }, [data, locale]);
 

From 154b5593150ee470857507d730fb65439209e9cc Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 24 May 2024 19:44:50 -0700
Subject: [PATCH 096/438] Render correct tooltip label.

---
 src/app/(main)/websites/[websiteId]/WebsiteChart.tsx | 12 ++++++++++--
 src/components/charts/BarChartTooltip.tsx            |  4 +++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx b/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
index 5144adcc7d..d36cdad691 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
@@ -25,8 +25,16 @@ export function WebsiteChart({
 
       if (compare) {
         result['compare'] = {
-          pageviews: result.pageviews.map(({ x }, i) => ({ x, y: compare.pageviews[i].y })),
-          sessions: result.sessions.map(({ x }, i) => ({ x, y: compare.sessions[i].y })),
+          pageviews: result.pageviews.map(({ x }, i) => ({
+            x,
+            y: compare.pageviews[i].y,
+            d: compare.pageviews[i].x,
+          })),
+          sessions: result.sessions.map(({ x }, i) => ({
+            x,
+            y: compare.sessions[i].y,
+            d: compare.pageviews[i].x,
+          })),
         };
       }
 
diff --git a/src/components/charts/BarChartTooltip.tsx b/src/components/charts/BarChartTooltip.tsx
index b81d55fe17..fed5af9247 100644
--- a/src/components/charts/BarChartTooltip.tsx
+++ b/src/components/charts/BarChartTooltip.tsx
@@ -21,7 +21,9 @@ export default function BarChartTooltip({ tooltip, unit }) {
 
   return (
     <Flexbox direction="column" gap={10}>
-      <div>{formatDate(new Date(dataPoints[0].raw.x), formats[unit], locale)}</div>
+      <div>
+        {formatDate(new Date(dataPoints[0].raw.d || dataPoints[0].raw.x), formats[unit], locale)}
+      </div>
       <div>
         <StatusLight color={labelColors?.[0]?.backgroundColor}>
           {formatLongNumber(dataPoints[0].raw.y)} {dataPoints[0].dataset.label}

From db06a0d25665556d67f2481837280a2a90a11a05 Mon Sep 17 00:00:00 2001
From: SHUBHAM SHARMA <96301987+shubhusion@users.noreply.github.com>
Date: Sat, 25 May 2024 19:48:58 +0530
Subject: [PATCH 097/438] Update README.md

---
 README.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/README.md b/README.md
index 44874a5ed4..4579b8f496 100644
--- a/README.md
+++ b/README.md
@@ -110,11 +110,6 @@ To update the Docker image, simply pull the new images and rebuild:
 docker compose pull
 docker compose up --force-recreate
 ```
-
-## License
-
-MIT
-
 [release-shield]: https://img.shields.io/github/release/umami-software/umami.svg
 [releases-url]: https://github.com/umami-software/umami/releases
 [license-shield]: https://img.shields.io/github/license/umami-software/umami.svg

From 65b1992c461b10d53b0ed9a9344399815218b865 Mon Sep 17 00:00:00 2001
From: SHUBHAM SHARMA <96301987+shubhusion@users.noreply.github.com>
Date: Sat, 25 May 2024 19:56:32 +0530
Subject: [PATCH 098/438] Update README.md

---
 README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/README.md b/README.md
index 4579b8f496..177b977f3a 100644
--- a/README.md
+++ b/README.md
@@ -110,9 +110,25 @@ To update the Docker image, simply pull the new images and rebuild:
 docker compose pull
 docker compose up --force-recreate
 ```
+
+## Contact
+
+[![GitHub][github-shield]][github-url]
+[![Twitter][twitter-shield]][twitter-url]
+[![LinkedIn][linkedin-shield]][linkedin-url]
+[![Discord][discord-shield]][discord-url]
+
 [release-shield]: https://img.shields.io/github/release/umami-software/umami.svg
 [releases-url]: https://github.com/umami-software/umami/releases
 [license-shield]: https://img.shields.io/github/license/umami-software/umami.svg
 [license-url]: https://github.com/umami-software/umami/blob/master/LICENSE
 [build-shield]: https://img.shields.io/github/actions/workflow/status/umami-software/umami/ci.yml
 [build-url]: https://github.com/umami-software/umami/actions
+[github-shield]: https://img.shields.io/badge/GitHub--blue?style=social&logo=github
+[github-url]: https://github.com/umami-software/umami
+[twitter-shield]: https://img.shields.io/badge/Twitter--blue?style=social&logo=twitter
+[twitter-url]: https://twitter.com/umami_software
+[linkedin-shield]: https://img.shields.io/badge/LinkedIn--blue?style=social&logo=linkedin
+[linkedin-url]: https://linkedin.com/company/umami-software
+[discord-shield]: https://img.shields.io/badge/Discord--blue?style=social&logo=discord
+[discord-url]: https://discord.com/invite/4dz4zcXYrQ

From fdf28920e6e53bf1cb22818d891ead0fc8960de8 Mon Sep 17 00:00:00 2001
From: SHUBHAM SHARMA <96301987+shubhusion@users.noreply.github.com>
Date: Sat, 25 May 2024 20:02:00 +0530
Subject: [PATCH 099/438] Update README.md

---
 README.md | 41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 177b977f3a..18c5635a68 100644
--- a/README.md
+++ b/README.md
@@ -2,27 +2,31 @@
   <img src="https://github.com/shubhusion/umami/blob/master/src/assets/logo-white.svg" alt="Umami Logo" width="100">
 </p>
 
-# Umami
+# 🌐 Umami
 
-> Umami is a simple, fast, privacy-focused alternative to Google Analytics.
+> **Umami** is a simple, fast, privacy-focused alternative to Google Analytics.
 
-[![GitHub Release][release-shield]][releases-url]
-[![MIT License][license-shield]][license-url]
-[![Build Status][build-shield]][build-url]
+[![GitHub Release][release-shield]][releases-url] [![MIT License][license-shield]][license-url] [![Build Status][build-shield]][build-url]
 
-## Demo
+---
+
+## 🎉 Demo
 
 Explore Umami's features by trying out our demo installation:
 
-[Umami Demo](https://demo.umami.is/)
+👉 [Umami Demo](https://demo.umami.is/) 👈
 
 Please note that the demo is provided for exploration purposes only and may not include the latest features or configurations. For a more accurate representation, consider installing Umami on your own server.
 
-## Getting Started
+---
+
+## 🚀 Getting Started
 
 A detailed getting started guide can be found at [https://umami.is/docs/](https://umami.is/docs/)
 
-## Installing from Source
+---
+
+## 🛠 Installing from Source
 
 ### Requirements
 
@@ -74,7 +78,9 @@ yarn start
 
 By default, this will launch the application on `http://localhost:3000`. You will need to either [proxy](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/) requests from your web server or change the [port](https://nextjs.org/docs/api-reference/cli#production) to serve the application directly.
 
-## Installing with Docker
+---
+
+## 🐳 Installing with Docker
 
 To build the Umami container and start up a Postgres database, run:
 
@@ -94,7 +100,9 @@ Or with MySQL support:
 docker pull docker.umami.is/umami-software/umami:mysql-latest
 ```
 
-## Getting Updates
+---
+
+## 🔄 Getting Updates
 
 To get the latest features, simply do a pull, install any new dependencies, and rebuild:
 
@@ -111,12 +119,11 @@ docker compose pull
 docker compose up --force-recreate
 ```
 
-## Contact
+---
+
+## 📞 Contact
 
-[![GitHub][github-shield]][github-url]
-[![Twitter][twitter-shield]][twitter-url]
-[![LinkedIn][linkedin-shield]][linkedin-url]
-[![Discord][discord-shield]][discord-url]
+[![GitHub][github-shield]][github-url] [![Twitter][twitter-shield]][twitter-url] [![LinkedIn][linkedin-shield]][linkedin-url] [![Discord][discord-shield]][discord-url]
 
 [release-shield]: https://img.shields.io/github/release/umami-software/umami.svg
 [releases-url]: https://github.com/umami-software/umami/releases
@@ -132,3 +139,5 @@ docker compose up --force-recreate
 [linkedin-url]: https://linkedin.com/company/umami-software
 [discord-shield]: https://img.shields.io/badge/Discord--blue?style=social&logo=discord
 [discord-url]: https://discord.com/invite/4dz4zcXYrQ
+
+---

From 9c532f26abb02f70b8f4b30c90e0eebcf6ab6e7f Mon Sep 17 00:00:00 2001
From: SHUBHAM SHARMA <96301987+shubhusion@users.noreply.github.com>
Date: Sat, 25 May 2024 20:07:21 +0530
Subject: [PATCH 100/438] Update README.md

---
 README.md | 47 ++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 18c5635a68..8e0df60be6 100644
--- a/README.md
+++ b/README.md
@@ -2,11 +2,25 @@
   <img src="https://github.com/shubhusion/umami/blob/master/src/assets/logo-white.svg" alt="Umami Logo" width="100">
 </p>
 
-# 🌐 Umami
+<h1 align="center">🌐 Umami</h1>
 
-> **Umami** is a simple, fast, privacy-focused alternative to Google Analytics.
+<p align="center"><b>Empowering insights. Preserving privacy.</b></p>
 
-[![GitHub Release][release-shield]][releases-url] [![MIT License][license-shield]][license-url] [![Build Status][build-shield]][build-url]
+<p align="center">
+  <i>Umami is a simple, fast, privacy-focused alternative to Google Analytics.</i>
+</p>
+
+<p align="center">
+  <a href="https://github.com/umami-software/umami/releases">
+    <img src="https://img.shields.io/github/release/umami-software/umami.svg" alt="GitHub Release">
+  </a>
+  <a href="https://github.com/umami-software/umami/blob/master/LICENSE">
+    <img src="https://img.shields.io/github/license/umami-software/umami.svg" alt="MIT License">
+  </a>
+  <a href="https://github.com/umami-software/umami/actions">
+    <img src="https://img.shields.io/github/actions/workflow/status/umami-software/umami/ci.yml" alt="Build Status">
+  </a>
+</p>
 
 ---
 
@@ -16,13 +30,13 @@ Explore Umami's features by trying out our demo installation:
 
 👉 [Umami Demo](https://demo.umami.is/) 👈
 
-Please note that the demo is provided for exploration purposes only and may not include the latest features or configurations. For a more accurate representation, consider installing Umami on your own server.
+*Please note that the demo is provided for exploration purposes only and may not include the latest features or configurations. For a more accurate representation, consider installing Umami on your own server.*
 
 ---
 
 ## 🚀 Getting Started
 
-A detailed getting started guide can be found at [https://umami.is/docs/](https://umami.is/docs/)
+A detailed getting started guide can be found at [umami.is/docs](https://umami.is/docs/).
 
 ---
 
@@ -55,7 +69,7 @@ Create an `.env` file with the following:
 DATABASE_URL=connection-url
 ```
 
-The connection URL is in the following format:
+The connection URL format:
 
 ```bash
 postgresql://username:mypassword@localhost:5432/mydb
@@ -68,7 +82,7 @@ mysql://username:mypassword@localhost:3306/mydb
 yarn build
 ```
 
-The build step will also create tables in your database if you are installing for the first time. It will also create a login user with username **admin** and password **umami**.
+*The build step will create tables in your database if you are installing for the first time. It will also create a login user with username **admin** and password **umami**.*
 
 ### Start the Application
 
@@ -76,7 +90,7 @@ The build step will also create tables in your database if you are installing fo
 yarn start
 ```
 
-By default, this will launch the application on `http://localhost:3000`. You will need to either [proxy](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/) requests from your web server or change the [port](https://nextjs.org/docs/api-reference/cli#production) to serve the application directly.
+*By default, this will launch the application on `http://localhost:3000`. You will need to either [proxy](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/) requests from your web server or change the [port](https://nextjs.org/docs/api-reference/cli#production) to serve the application directly.*
 
 ---
 
@@ -123,7 +137,20 @@ docker compose up --force-recreate
 
 ## 📞 Contact
 
-[![GitHub][github-shield]][github-url] [![Twitter][twitter-shield]][twitter-url] [![LinkedIn][linkedin-shield]][linkedin-url] [![Discord][discord-shield]][discord-url]
+<p align="center">
+  <a href="https://github.com/umami-software/umami">
+    <img src="https://img.shields.io/badge/GitHub--blue?style=social&logo=github" alt="GitHub">
+  </a>
+  <a href="https://twitter.com/umami_software">
+    <img src="https://img.shields.io/badge/Twitter--blue?style=social&logo=twitter" alt="Twitter">
+  </a>
+  <a href="https://linkedin.com/company/umami-software">
+    <img src="https://img.shields.io/badge/LinkedIn--blue?style=social&logo=linkedin" alt="LinkedIn">
+  </a>
+  <a href="https://discord.com/invite/4dz4zcXYrQ">
+    <img src="https://img.shields.io/badge/Discord--blue?style=social&logo=discord" alt="Discord">
+  </a>
+</p>
 
 [release-shield]: https://img.shields.io/github/release/umami-software/umami.svg
 [releases-url]: https://github.com/umami-software/umami/releases
@@ -139,5 +166,3 @@ docker compose up --force-recreate
 [linkedin-url]: https://linkedin.com/company/umami-software
 [discord-shield]: https://img.shields.io/badge/Discord--blue?style=social&logo=discord
 [discord-url]: https://discord.com/invite/4dz4zcXYrQ
-
----

From e1de8f30c21903bc0a34926fe90688e618ea89f4 Mon Sep 17 00:00:00 2001
From: SHUBHAM SHARMA <96301987+shubhusion@users.noreply.github.com>
Date: Sat, 25 May 2024 20:08:33 +0530
Subject: [PATCH 101/438] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8e0df60be6..95996c2b6c 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
   <img src="https://github.com/shubhusion/umami/blob/master/src/assets/logo-white.svg" alt="Umami Logo" width="100">
 </p>
 
-<h1 align="center">🌐 Umami</h1>
+<h1 align="center"> Umami</h1>
 
 <p align="center"><b>Empowering insights. Preserving privacy.</b></p>
 

From 46724280ca00a0eca2a4fe86c53f8adee9a7ef2f Mon Sep 17 00:00:00 2001
From: SHUBHAM SHARMA <96301987+shubhusion@users.noreply.github.com>
Date: Sat, 25 May 2024 20:10:17 +0530
Subject: [PATCH 102/438] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 95996c2b6c..062a9dc09e 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@
 
 Explore Umami's features by trying out our demo installation:
 
-👉 [Umami Demo](https://demo.umami.is/) 👈
+👉 [Umami Demo](https://analytics.umami.is/share/LGazGOecbDtaIwDr/umami.is) 👈
 
 *Please note that the demo is provided for exploration purposes only and may not include the latest features or configurations. For a more accurate representation, consider installing Umami on your own server.*
 

From 2df45f30d08b99477a8b6009c4787352f6266e3d Mon Sep 17 00:00:00 2001
From: SHUBHAM SHARMA <96301987+shubhusion@users.noreply.github.com>
Date: Sat, 25 May 2024 20:10:47 +0530
Subject: [PATCH 103/438] Update README.md

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 062a9dc09e..8536af3c72 100644
--- a/README.md
+++ b/README.md
@@ -30,8 +30,6 @@ Explore Umami's features by trying out our demo installation:
 
 👉 [Umami Demo](https://analytics.umami.is/share/LGazGOecbDtaIwDr/umami.is) 👈
 
-*Please note that the demo is provided for exploration purposes only and may not include the latest features or configurations. For a more accurate representation, consider installing Umami on your own server.*
-
 ---
 
 ## 🚀 Getting Started

From 89dcdf703fc01e12647c988b802e825c2e682f27 Mon Sep 17 00:00:00 2001
From: SHUBHAM SHARMA <96301987+shubhusion@users.noreply.github.com>
Date: Sat, 25 May 2024 20:13:28 +0530
Subject: [PATCH 104/438] Update README.md

---
 README.md | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 8536af3c72..358fa392ad 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
   <img src="https://github.com/shubhusion/umami/blob/master/src/assets/logo-white.svg" alt="Umami Logo" width="100">
 </p>
 
-<h1 align="center"> Umami</h1>
+<h1 align="center">Umami</h1>
 
 <p align="center"><b>Empowering insights. Preserving privacy.</b></p>
 
@@ -20,18 +20,13 @@
   <a href="https://github.com/umami-software/umami/actions">
     <img src="https://img.shields.io/github/actions/workflow/status/umami-software/umami/ci.yml" alt="Build Status">
   </a>
+  <a href="https://analytics.umami.is/share/LGazGOecbDtaIwDr/umami.is" style="text-decoration: none;">
+    <img src="https://img.shields.io/badge/Try%20Demo%20Now-Click%20Here-brightgreen" alt="Umami Demo">
+  </a>
 </p>
 
 ---
 
-## 🎉 Demo
-
-Explore Umami's features by trying out our demo installation:
-
-👉 [Umami Demo](https://analytics.umami.is/share/LGazGOecbDtaIwDr/umami.is) 👈
-
----
-
 ## 🚀 Getting Started
 
 A detailed getting started guide can be found at [umami.is/docs](https://umami.is/docs/).

From 13e11ee37148dfa5936ea3eda5f84ab4e54dd106 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Sat, 25 May 2024 09:31:38 -0700
Subject: [PATCH 105/438] Added tables to compare screen.

---
 .../websites/[websiteId]/WebsiteChart.tsx     |  10 +-
 ...siteDetails.tsx => WebsiteDetailsPage.tsx} |  25 +---
 .../websites/[websiteId]/WebsiteTableView.tsx |   9 +-
 .../compare/WebsiteComparePage.tsx            |   7 +-
 .../compare/WebsiteCompareTables.module.css   |   7 +
 .../compare/WebsiteCompareTables.tsx          | 137 ++++++++++++++++++
 src/app/(main)/websites/[websiteId]/page.tsx  |   4 +-
 src/app/share/[...shareId]/SharePage.tsx      |   4 +-
 src/components/charts/Chart.tsx               |   4 +-
 src/components/input/WebsiteDateFilter.tsx    |  18 +--
 src/components/layout/Grid.module.css         |   4 +
 src/components/layout/Grid.tsx                |   5 +-
 src/components/metrics/ListTable.tsx          |  14 +-
 src/components/metrics/MetricsTable.tsx       |   5 +-
 src/components/metrics/PagesTable.tsx         |  12 +-
 15 files changed, 199 insertions(+), 66 deletions(-)
 rename src/app/(main)/websites/[websiteId]/{WebsiteDetails.tsx => WebsiteDetailsPage.tsx} (58%)
 create mode 100644 src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.module.css
 create mode 100644 src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.tsx

diff --git a/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx b/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
index d36cdad691..48da23776c 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
@@ -9,7 +9,7 @@ export function WebsiteChart({
   compareMode = false,
 }: {
   websiteId: string;
-  compareMode: boolean;
+  compareMode?: boolean;
 }) {
   const { dateRange, dateCompare } = useDateRange(websiteId);
   const { startDate, endDate, unit } = dateRange;
@@ -27,13 +27,13 @@ export function WebsiteChart({
         result['compare'] = {
           pageviews: result.pageviews.map(({ x }, i) => ({
             x,
-            y: compare.pageviews[i].y,
-            d: compare.pageviews[i].x,
+            y: compare.pageviews[i]?.y,
+            d: compare.pageviews[i]?.x,
           })),
           sessions: result.sessions.map(({ x }, i) => ({
             x,
-            y: compare.sessions[i].y,
-            d: compare.pageviews[i].x,
+            y: compare.sessions[i]?.y,
+            d: compare.sessions[i]?.x,
           })),
         };
       }
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteDetails.tsx b/src/app/(main)/websites/[websiteId]/WebsiteDetailsPage.tsx
similarity index 58%
rename from src/app/(main)/websites/[websiteId]/WebsiteDetails.tsx
rename to src/app/(main)/websites/[websiteId]/WebsiteDetailsPage.tsx
index 1fd6992f61..2988494e7f 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteDetails.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteDetailsPage.tsx
@@ -1,25 +1,19 @@
 'use client';
-import { Loading } from 'react-basics';
 import { usePathname } from 'next/navigation';
-import Page from 'components/layout/Page';
 import FilterTags from 'components/metrics/FilterTags';
-import { useNavigation, useWebsite } from 'components/hooks';
+import { useNavigation } from 'components/hooks';
 import WebsiteChart from './WebsiteChart';
 import WebsiteExpandedView from './WebsiteExpandedView';
 import WebsiteHeader from './WebsiteHeader';
 import WebsiteMetricsBar from './WebsiteMetricsBar';
 import WebsiteTableView from './WebsiteTableView';
+import WebsiteProvider from './WebsiteProvider';
 import { FILTER_COLUMNS } from 'lib/constants';
 
-export default function WebsiteDetails({ websiteId }: { websiteId: string }) {
-  const { data: website, isLoading, error } = useWebsite(websiteId);
+export default function WebsiteDetailsPage({ websiteId }: { websiteId: string }) {
   const pathname = usePathname();
   const { query } = useNavigation();
 
-  if (isLoading || error) {
-    return <Page isLoading={isLoading} error={error} />;
-  }
-
   const showLinks = !pathname.includes('/share/');
   const { view } = query;
 
@@ -31,18 +25,13 @@ export default function WebsiteDetails({ websiteId }: { websiteId: string }) {
   }, {});
 
   return (
-    <>
+    <WebsiteProvider websiteId={websiteId}>
       <WebsiteHeader websiteId={websiteId} showLinks={showLinks} />
       <FilterTags websiteId={websiteId} params={params} />
       <WebsiteMetricsBar websiteId={websiteId} showChange={true} sticky={true} />
       <WebsiteChart websiteId={websiteId} />
-      {!website && <Loading icon="dots" style={{ minHeight: 300 }} />}
-      {website && (
-        <>
-          {!view && <WebsiteTableView websiteId={websiteId} domainName={website.domain} />}
-          {view && <WebsiteExpandedView websiteId={websiteId} domainName={website.domain} />}
-        </>
-      )}
-    </>
+      {!view && <WebsiteTableView websiteId={websiteId} />}
+      {view && <WebsiteExpandedView websiteId={websiteId} />}
+    </WebsiteProvider>
   );
 }
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx b/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx
index 7cc415e5cd..e530f2bae7 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx
@@ -10,17 +10,10 @@ import CountriesTable from 'components/metrics/CountriesTable';
 import EventsTable from 'components/metrics/EventsTable';
 import EventsChart from 'components/metrics/EventsChart';
 
-export default function WebsiteTableView({
-  websiteId,
-  domainName,
-}: {
-  websiteId: string;
-  domainName: string;
-}) {
+export default function WebsiteTableView({ websiteId }: { websiteId: string }) {
   const [countryData, setCountryData] = useState();
   const tableProps = {
     websiteId,
-    domainName,
     limit: 10,
   };
 
diff --git a/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx b/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
index da33069186..092ebe94b3 100644
--- a/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
+++ b/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
@@ -5,6 +5,8 @@ import FilterTags from 'components/metrics/FilterTags';
 import { useNavigation } from 'components/hooks';
 import { FILTER_COLUMNS } from 'lib/constants';
 import WebsiteChart from '../WebsiteChart';
+import WebsiteCompareTables from './WebsiteCompareTables';
+import WebsiteProvider from '../WebsiteProvider';
 
 export function WebsiteComparePage({ websiteId }) {
   const { query } = useNavigation();
@@ -17,12 +19,13 @@ export function WebsiteComparePage({ websiteId }) {
   }, {});
 
   return (
-    <>
+    <WebsiteProvider websiteId={websiteId}>
       <WebsiteHeader websiteId={websiteId} />
       <FilterTags websiteId={websiteId} params={params} />
       <WebsiteMetricsBar websiteId={websiteId} compareMode={true} />
       <WebsiteChart websiteId={websiteId} compareMode={true} />
-    </>
+      <WebsiteCompareTables websiteId={websiteId} />
+    </WebsiteProvider>
   );
 }
 
diff --git a/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.module.css b/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.module.css
new file mode 100644
index 0000000000..4595f57386
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.module.css
@@ -0,0 +1,7 @@
+.container {
+  margin-bottom: 60px;
+}
+
+.nav {
+  width: 200px;
+}
diff --git a/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.tsx b/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.tsx
new file mode 100644
index 0000000000..f58197700d
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.tsx
@@ -0,0 +1,137 @@
+import SideNav from 'components/layout/SideNav';
+import { useMessages, useNavigation } from 'components/hooks';
+import PagesTable from 'components/metrics/PagesTable';
+import ReferrersTable from 'components/metrics/ReferrersTable';
+import BrowsersTable from 'components/metrics/BrowsersTable';
+import OSTable from 'components/metrics/OSTable';
+import DevicesTable from 'components/metrics/DevicesTable';
+import ScreenTable from 'components/metrics/ScreenTable';
+import CountriesTable from 'components/metrics/CountriesTable';
+import RegionsTable from 'components/metrics/RegionsTable';
+import CitiesTable from 'components/metrics/CitiesTable';
+import LanguagesTable from 'components/metrics/LanguagesTable';
+import EventsTable from 'components/metrics/EventsTable';
+import QueryParametersTable from 'components/metrics/QueryParametersTable';
+import { Grid, GridRow } from 'components/layout/Grid';
+import styles from './WebsiteCompareTables.module.css';
+import { useContext, useState } from 'react';
+import MetricsTable from 'components/metrics/MetricsTable';
+import FilterLink from 'components/common/FilterLink';
+import { WebsiteContext } from '../WebsiteProvider';
+
+const views = {
+  url: PagesTable,
+  title: PagesTable,
+  referrer: ReferrersTable,
+  browser: BrowsersTable,
+  os: OSTable,
+  device: DevicesTable,
+  screen: ScreenTable,
+  country: CountriesTable,
+  region: RegionsTable,
+  city: CitiesTable,
+  language: LanguagesTable,
+  event: EventsTable,
+  query: QueryParametersTable,
+};
+
+export function WebsiteCompareTables({ websiteId }: { websiteId: string }) {
+  const { domain } = useContext(WebsiteContext);
+  const [data, setData] = useState([]);
+  const { formatMessage, labels } = useMessages();
+  const {
+    renderUrl,
+    query: { view },
+  } = useNavigation();
+  const Component: typeof MetricsTable = views[view] || (() => null);
+
+  const items = [
+    {
+      key: 'url',
+      label: formatMessage(labels.pages),
+      url: renderUrl({ view: 'url' }),
+    },
+    {
+      key: 'referrer',
+      label: formatMessage(labels.referrers),
+      url: renderUrl({ view: 'referrer' }),
+    },
+    {
+      key: 'browser',
+      label: formatMessage(labels.browsers),
+      url: renderUrl({ view: 'browser' }),
+    },
+    {
+      key: 'os',
+      label: formatMessage(labels.os),
+      url: renderUrl({ view: 'os' }),
+    },
+    {
+      key: 'device',
+      label: formatMessage(labels.devices),
+      url: renderUrl({ view: 'device' }),
+    },
+    {
+      key: 'country',
+      label: formatMessage(labels.countries),
+      url: renderUrl({ view: 'country' }),
+    },
+    {
+      key: 'region',
+      label: formatMessage(labels.regions),
+      url: renderUrl({ view: 'region' }),
+    },
+    {
+      key: 'city',
+      label: formatMessage(labels.cities),
+      url: renderUrl({ view: 'city' }),
+    },
+    {
+      key: 'language',
+      label: formatMessage(labels.languages),
+      url: renderUrl({ view: 'language' }),
+    },
+    {
+      key: 'screen',
+      label: formatMessage(labels.screens),
+      url: renderUrl({ view: 'screen' }),
+    },
+    {
+      key: 'event',
+      label: formatMessage(labels.events),
+      url: renderUrl({ view: 'event' }),
+    },
+    {
+      key: 'query',
+      label: formatMessage(labels.queryParameters),
+      url: renderUrl({ view: 'query' }),
+    },
+  ];
+
+  const renderLabel = ({ x, y }, index) => {
+    return (
+      <FilterLink
+        id={view}
+        value={x}
+        label={!x && formatMessage(labels.none)}
+        externalUrl={
+          view === 'url' ? `${domain.startsWith('http') ? domain : `https://${domain}`}${x}` : null
+        }
+      >
+        {y} : {data[index]?.y} !
+      </FilterLink>
+    );
+  };
+
+  return (
+    <Grid className={styles.container}>
+      <GridRow columns="compare">
+        <SideNav className={styles.nav} items={items} selectedKey={view} shallow={true} />
+        <Component websiteId={websiteId} limit={20} showMore={false} onDataLoad={setData} />
+        <Component websiteId={websiteId} limit={20} showMore={false} renderLabel={renderLabel} />
+      </GridRow>
+    </Grid>
+  );
+}
+
+export default WebsiteCompareTables;
diff --git a/src/app/(main)/websites/[websiteId]/page.tsx b/src/app/(main)/websites/[websiteId]/page.tsx
index ddb6c833b1..49bca9b6f4 100644
--- a/src/app/(main)/websites/[websiteId]/page.tsx
+++ b/src/app/(main)/websites/[websiteId]/page.tsx
@@ -1,8 +1,8 @@
-import WebsiteDetails from './WebsiteDetails';
+import WebsiteDetailsPage from './WebsiteDetailsPage';
 import { Metadata } from 'next';
 
 export default function WebsitePage({ params: { websiteId } }) {
-  return <WebsiteDetails websiteId={websiteId} />;
+  return <WebsiteDetailsPage websiteId={websiteId} />;
 }
 
 export const metadata: Metadata = {
diff --git a/src/app/share/[...shareId]/SharePage.tsx b/src/app/share/[...shareId]/SharePage.tsx
index b49d36ec68..4ac6af378a 100644
--- a/src/app/share/[...shareId]/SharePage.tsx
+++ b/src/app/share/[...shareId]/SharePage.tsx
@@ -1,5 +1,5 @@
 'use client';
-import WebsiteDetails from 'app/(main)/websites/[websiteId]/WebsiteDetails';
+import WebsiteDetailsPage from '../../(main)/websites/[websiteId]/WebsiteDetailsPage';
 import { useShareToken } from 'components/hooks';
 import Page from 'components/layout/Page';
 import Header from './Header';
@@ -17,7 +17,7 @@ export default function SharePage({ shareId }) {
     <div className={styles.container}>
       <Page>
         <Header />
-        <WebsiteDetails websiteId={shareToken.websiteId} />
+        <WebsiteDetailsPage websiteId={shareToken.websiteId} />
         <Footer />
       </Page>
     </div>
diff --git a/src/components/charts/Chart.tsx b/src/components/charts/Chart.tsx
index 47d29c071e..6ba601597f 100644
--- a/src/components/charts/Chart.tsx
+++ b/src/components/charts/Chart.tsx
@@ -98,9 +98,9 @@ export function Chart({
     // Allow config changes before update
     onUpdate?.(chart.current);
 
-    setLegendItems(chart.current.legend.legendItems);
-
     chart.current.update(updateMode);
+
+    setLegendItems(chart.current.legend.legendItems);
   };
 
   useEffect(() => {
diff --git a/src/components/input/WebsiteDateFilter.tsx b/src/components/input/WebsiteDateFilter.tsx
index 12718b3d04..4f2dee0aed 100644
--- a/src/components/input/WebsiteDateFilter.tsx
+++ b/src/components/input/WebsiteDateFilter.tsx
@@ -23,6 +23,15 @@ export function WebsiteDateFilter({ websiteId }: { websiteId: string }) {
 
   return (
     <div className={styles.container}>
+      <DateFilter
+        className={styles.dropdown}
+        value={value}
+        startDate={startDate}
+        endDate={endDate}
+        offset={offset}
+        onChange={handleChange}
+        showAllTime={true}
+      />
       {value !== 'all' && !value.startsWith('range') && (
         <div className={styles.buttons}>
           <Button onClick={() => handleIncrement(-1)}>
@@ -37,15 +46,6 @@ export function WebsiteDateFilter({ websiteId }: { websiteId: string }) {
           </Button>
         </div>
       )}
-      <DateFilter
-        className={styles.dropdown}
-        value={value}
-        startDate={startDate}
-        endDate={endDate}
-        offset={offset}
-        onChange={handleChange}
-        showAllTime={true}
-      />
     </div>
   );
 }
diff --git a/src/components/layout/Grid.module.css b/src/components/layout/Grid.module.css
index f72a5f126a..de99b75261 100644
--- a/src/components/layout/Grid.module.css
+++ b/src/components/layout/Grid.module.css
@@ -8,6 +8,10 @@
   border-top: 1px solid var(--base300);
 }
 
+.row.compare {
+  grid-template-columns: max-content 1fr 1fr;
+}
+
 .col {
   padding: 20px;
   min-height: 430px;
diff --git a/src/components/layout/Grid.tsx b/src/components/layout/Grid.tsx
index 2a34fdc4fa..ec7f4fda16 100644
--- a/src/components/layout/Grid.tsx
+++ b/src/components/layout/Grid.tsx
@@ -1,6 +1,7 @@
 import { CSSProperties } from 'react';
 import classNames from 'classnames';
 import { mapChildren } from 'react-basics';
+// eslint-disable-next-line css-modules/no-unused-class
 import styles from './Grid.module.css';
 
 export interface GridProps {
@@ -19,13 +20,13 @@ export function Grid({ className, style, children }: GridProps) {
 
 export function GridRow(props: {
   [x: string]: any;
-  columns?: 'one' | 'two' | 'three' | 'one-two' | 'two-one';
+  columns?: 'one' | 'two' | 'three' | 'one-two' | 'two-one' | 'compare';
   className?: string;
   children?: any;
 }) {
   const { columns = 'two', className, children, ...otherProps } = props;
   return (
-    <div {...otherProps} className={classNames(styles.row, className)}>
+    <div {...otherProps} className={classNames(styles.row, className, { [styles[columns]]: true })}>
       {mapChildren(children, child => {
         return <div className={classNames(styles.col, { [styles[columns]]: true })}>{child}</div>;
       })}
diff --git a/src/components/metrics/ListTable.tsx b/src/components/metrics/ListTable.tsx
index 133905e13c..14f2c9900b 100644
--- a/src/components/metrics/ListTable.tsx
+++ b/src/components/metrics/ListTable.tsx
@@ -14,7 +14,7 @@ export interface ListTableProps {
   title?: string;
   metric?: string;
   className?: string;
-  renderLabel?: (row: any) => ReactNode;
+  renderLabel?: (row: any, index: number) => ReactNode;
   animate?: boolean;
   virtualize?: boolean;
   showPercentage?: boolean;
@@ -34,13 +34,13 @@ export function ListTable({
 }: ListTableProps) {
   const { formatMessage, labels } = useMessages();
 
-  const getRow = row => {
+  const getRow = (row: { x: any; y: any; z: any }, index: number) => {
     const { x: label, y: value, z: percent } = row;
 
     return (
       <AnimatedRow
         key={label}
-        label={renderLabel ? renderLabel(row) : label ?? formatMessage(labels.unknown)}
+        label={renderLabel ? renderLabel(row, index) : label ?? formatMessage(labels.unknown)}
         value={value}
         percent={percent}
         animate={animate && !virtualize}
@@ -50,7 +50,7 @@ export function ListTable({
   };
 
   const Row = ({ index, style }) => {
-    return <div style={style}>{getRow(data[index])}</div>;
+    return <div style={style}>{getRow(data[index], index)}</div>;
   };
 
   return (
@@ -71,7 +71,7 @@ export function ListTable({
             {Row}
           </FixedSizeList>
         ) : (
-          data.map(row => getRow(row))
+          data.map(getRow)
         )}
       </div>
     </div>
@@ -97,9 +97,7 @@ const AnimatedRow = ({ label, value = 0, percent, animate, showPercentage = true
       {showPercentage && (
         <div className={styles.percent}>
           <animated.div className={styles.bar} style={{ width: props.width.to(n => `${n}%`) }} />
-          <animated.span className={styles.percentValue}>
-            {props.width.to(n => `${n?.toFixed?.(0)}%`)}
-          </animated.span>
+          <animated.span>{props.width.to(n => `${n?.toFixed?.(0)}%`)}</animated.span>
         </div>
       )}
     </div>
diff --git a/src/components/metrics/MetricsTable.tsx b/src/components/metrics/MetricsTable.tsx
index 857c136b29..6da0e289f1 100644
--- a/src/components/metrics/MetricsTable.tsx
+++ b/src/components/metrics/MetricsTable.tsx
@@ -18,7 +18,6 @@ import styles from './MetricsTable.module.css';
 
 export interface MetricsTableProps extends ListTableProps {
   websiteId: string;
-  domainName: string;
   type?: string;
   className?: string;
   dataFilter?: (data: any) => any;
@@ -27,6 +26,7 @@ export interface MetricsTableProps extends ListTableProps {
   onDataLoad?: (data: any) => void;
   onSearch?: (search: string) => void;
   allowSearch?: boolean;
+  showMore?: boolean;
   children?: ReactNode;
 }
 
@@ -39,6 +39,7 @@ export function MetricsTable({
   onDataLoad,
   delay = null,
   allowSearch = false,
+  showMore = true,
   children,
   ...props
 }: MetricsTableProps) {
@@ -98,7 +99,7 @@ export function MetricsTable({
       )}
       {!data && isLoading && !isFetched && <Loading icon="dots" />}
       <div className={styles.footer}>
-        {data && !error && limit && (
+        {showMore && data && !error && limit && (
           <LinkButton href={renderUrl({ view: type })} variant="quiet">
             <Text>{formatMessage(labels.more)}</Text>
             <Icon size="sm" rotate={dir === 'rtl' ? 180 : 0}>
diff --git a/src/components/metrics/PagesTable.tsx b/src/components/metrics/PagesTable.tsx
index b0da808066..ca3f6be5c4 100644
--- a/src/components/metrics/PagesTable.tsx
+++ b/src/components/metrics/PagesTable.tsx
@@ -4,18 +4,21 @@ import MetricsTable, { MetricsTableProps } from './MetricsTable';
 import { useMessages } from 'components/hooks';
 import { useNavigation } from 'components/hooks';
 import { emptyFilter } from 'lib/filters';
+import { useContext } from 'react';
+import { WebsiteContext } from 'app/(main)/websites/[websiteId]/WebsiteProvider';
 
 export interface PagesTableProps extends MetricsTableProps {
   allowFilter?: boolean;
 }
 
-export function PagesTable({ allowFilter, domainName, ...props }: PagesTableProps) {
+export function PagesTable({ allowFilter, ...props }: PagesTableProps) {
   const {
     router,
     renderUrl,
     query: { view = 'url' },
   } = useNavigation();
   const { formatMessage, labels } = useMessages();
+  const { domain } = useContext(WebsiteContext);
 
   const handleSelect = (key: any) => {
     router.push(renderUrl({ view: key }), { scroll: true });
@@ -39,9 +42,7 @@ export function PagesTable({ allowFilter, domainName, ...props }: PagesTableProp
         value={x}
         label={!x && formatMessage(labels.none)}
         externalUrl={
-          view === 'url'
-            ? `${domainName.startsWith('http') ? domainName : `https://${domainName}`}${x}`
-            : null
+          view === 'url' ? `${domain.startsWith('http') ? domain : `https://${domain}`}${x}` : null
         }
       />
     );
@@ -50,12 +51,11 @@ export function PagesTable({ allowFilter, domainName, ...props }: PagesTableProp
   return (
     <MetricsTable
       {...props}
-      domainName={domainName}
       title={formatMessage(labels.pages)}
       type={view}
       metric={formatMessage(labels.views)}
       dataFilter={emptyFilter}
-      renderLabel={renderLink}
+      renderLabel={props.renderLabel || renderLink}
     >
       {allowFilter && <FilterButtons items={buttons} selectedKey={view} onSelect={handleSelect} />}
     </MetricsTable>

From b7a7d4de4d370d86d635fab9b9c621adce1978c7 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Sun, 26 May 2024 17:26:15 -0700
Subject: [PATCH 106/438] Added comparison tables.

---
 README.md                                     |  24 ++--
 package.json                                  |   6 +-
 .../[websiteId]/WebsiteMetricsBar.tsx         |   2 +-
 .../compare/WebsiteCompareTables.module.css   |   7 +
 .../compare/WebsiteCompareTables.tsx          |  68 ++++++----
 .../hooks/queries/useWebsiteMetrics.ts        |   8 +-
 src/components/messages.ts                    |   4 +-
 src/components/metrics/ChangeLabel.module.css |  31 +++++
 src/components/metrics/ChangeLabel.tsx        |  44 +++++++
 src/components/metrics/ListTable.module.css   |   6 +-
 src/components/metrics/ListTable.tsx          |   6 +-
 src/components/metrics/MetricCard.module.css  |  26 ----
 src/components/metrics/MetricCard.tsx         |  21 +--
 src/components/metrics/MetricsTable.tsx       |   4 +-
 src/components/metrics/PagesTable.tsx         |   2 +-
 src/components/metrics/PageviewsChart.tsx     |   4 +-
 src/pages/api/send.ts                         |   2 +-
 yarn.lock                                     | 123 +++++++-----------
 18 files changed, 220 insertions(+), 168 deletions(-)
 create mode 100644 src/components/metrics/ChangeLabel.module.css
 create mode 100644 src/components/metrics/ChangeLabel.tsx

diff --git a/README.md b/README.md
index 358fa392ad..33a5aac39a 100644
--- a/README.md
+++ b/README.md
@@ -1,27 +1,25 @@
 <p align="center">
-  <img src="https://github.com/shubhusion/umami/blob/master/src/assets/logo-white.svg" alt="Umami Logo" width="100">
+  <img src="https://umami.is/images/umami-logo.png" alt="Umami Logo" width="100">
 </p>
 
 <h1 align="center">Umami</h1>
 
-<p align="center"><b>Empowering insights. Preserving privacy.</b></p>
-
 <p align="center">
   <i>Umami is a simple, fast, privacy-focused alternative to Google Analytics.</i>
 </p>
 
 <p align="center">
   <a href="https://github.com/umami-software/umami/releases">
-    <img src="https://img.shields.io/github/release/umami-software/umami.svg" alt="GitHub Release">
+    <img src="https://img.shields.io/github/release/umami-software/umami.svg" alt="GitHub Release" />
   </a>
   <a href="https://github.com/umami-software/umami/blob/master/LICENSE">
-    <img src="https://img.shields.io/github/license/umami-software/umami.svg" alt="MIT License">
+    <img src="https://img.shields.io/github/license/umami-software/umami.svg" alt="MIT License" />
   </a>
   <a href="https://github.com/umami-software/umami/actions">
-    <img src="https://img.shields.io/github/actions/workflow/status/umami-software/umami/ci.yml" alt="Build Status">
+    <img src="https://img.shields.io/github/actions/workflow/status/umami-software/umami/ci.yml" alt="Build Status" />
   </a>
   <a href="https://analytics.umami.is/share/LGazGOecbDtaIwDr/umami.is" style="text-decoration: none;">
-    <img src="https://img.shields.io/badge/Try%20Demo%20Now-Click%20Here-brightgreen" alt="Umami Demo">
+    <img src="https://img.shields.io/badge/Try%20Demo%20Now-Click%20Here-brightgreen" alt="Umami Demo" />
   </a>
 </p>
 
@@ -128,20 +126,20 @@ docker compose up --force-recreate
 
 ---
 
-## 📞 Contact
+## 🛟 Support
 
 <p align="center">
   <a href="https://github.com/umami-software/umami">
-    <img src="https://img.shields.io/badge/GitHub--blue?style=social&logo=github" alt="GitHub">
+    <img src="https://img.shields.io/badge/GitHub--blue?style=social&logo=github" alt="GitHub" />
   </a>
   <a href="https://twitter.com/umami_software">
-    <img src="https://img.shields.io/badge/Twitter--blue?style=social&logo=twitter" alt="Twitter">
+    <img src="https://img.shields.io/badge/Twitter--blue?style=social&logo=twitter" alt="Twitter" />
   </a>
   <a href="https://linkedin.com/company/umami-software">
-    <img src="https://img.shields.io/badge/LinkedIn--blue?style=social&logo=linkedin" alt="LinkedIn">
+    <img src="https://img.shields.io/badge/LinkedIn--blue?style=social&logo=linkedin" alt="LinkedIn" />
   </a>
-  <a href="https://discord.com/invite/4dz4zcXYrQ">
-    <img src="https://img.shields.io/badge/Discord--blue?style=social&logo=discord" alt="Discord">
+  <a href="https://umami.is/discord">
+    <img src="https://img.shields.io/badge/Discord--blue?style=social&logo=discord" alt="Discord" />
   </a>
 </p>
 
diff --git a/package.json b/package.json
index be5bb5ac00..7f5c7c489e 100644
--- a/package.json
+++ b/package.json
@@ -64,9 +64,9 @@
     ".next/cache"
   ],
   "dependencies": {
-    "@clickhouse/client": "^1.0.1",
+    "@clickhouse/client": "^1.0.2",
     "@fontsource/inter": "^4.5.15",
-    "@prisma/client": "5.13.0",
+    "@prisma/client": "5.14.0",
     "@prisma/extension-read-replicas": "^0.3.0",
     "@react-spring/web": "^9.7.3",
     "@tanstack/react-query": "^5.28.6",
@@ -102,7 +102,7 @@
     "next-basics": "^0.39.0",
     "node-fetch": "^3.2.8",
     "npm-run-all": "^4.1.5",
-    "prisma": "5.13.0",
+    "prisma": "5.14.0",
     "react": "^18.2.0",
     "react-basics": "^0.123.0",
     "react-beautiful-dnd": "^13.1.0",
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
index 90abc814a0..5a6478482b 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
@@ -70,7 +70,7 @@ export function WebsiteMetricsBar({
 
   const items = [
     { label: formatMessage(labels.previousPeriod), value: 'prev' },
-    { label: formatMessage(labels.yearOverYear), value: 'yoy' },
+    { label: formatMessage(labels.previousYear), value: 'yoy' },
   ];
 
   return (
diff --git a/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.module.css b/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.module.css
index 4595f57386..c4821e886a 100644
--- a/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.module.css
+++ b/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.module.css
@@ -4,4 +4,11 @@
 
 .nav {
   width: 200px;
+  margin-top: 40px;
+}
+
+.title {
+  color: var(--base800);
+  text-align: center;
+  font-weight: 700;
 }
diff --git a/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.tsx b/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.tsx
index f58197700d..1b21103da9 100644
--- a/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.tsx
+++ b/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.tsx
@@ -1,5 +1,6 @@
+import { useState } from 'react';
 import SideNav from 'components/layout/SideNav';
-import { useMessages, useNavigation } from 'components/hooks';
+import { useDateRange, useMessages, useNavigation } from 'components/hooks';
 import PagesTable from 'components/metrics/PagesTable';
 import ReferrersTable from 'components/metrics/ReferrersTable';
 import BrowsersTable from 'components/metrics/BrowsersTable';
@@ -13,11 +14,12 @@ import LanguagesTable from 'components/metrics/LanguagesTable';
 import EventsTable from 'components/metrics/EventsTable';
 import QueryParametersTable from 'components/metrics/QueryParametersTable';
 import { Grid, GridRow } from 'components/layout/Grid';
-import styles from './WebsiteCompareTables.module.css';
-import { useContext, useState } from 'react';
 import MetricsTable from 'components/metrics/MetricsTable';
-import FilterLink from 'components/common/FilterLink';
-import { WebsiteContext } from '../WebsiteProvider';
+import useStore from 'store/websites';
+import { getCompareDate } from 'lib/date';
+import { formatNumber } from 'lib/format';
+import ChangeLabel from 'components/metrics/ChangeLabel';
+import styles from './WebsiteCompareTables.module.css';
 
 const views = {
   url: PagesTable,
@@ -36,14 +38,15 @@ const views = {
 };
 
 export function WebsiteCompareTables({ websiteId }: { websiteId: string }) {
-  const { domain } = useContext(WebsiteContext);
   const [data, setData] = useState([]);
+  const { dateRange } = useDateRange(websiteId);
+  const dateCompare = useStore(state => state[websiteId]?.dateCompare);
   const { formatMessage, labels } = useMessages();
   const {
     renderUrl,
     query: { view },
   } = useNavigation();
-  const Component: typeof MetricsTable = views[view] || (() => null);
+  const Component: typeof MetricsTable = views[view || 'url'] || (() => null);
 
   const items = [
     {
@@ -108,27 +111,48 @@ export function WebsiteCompareTables({ websiteId }: { websiteId: string }) {
     },
   ];
 
-  const renderLabel = ({ x, y }, index) => {
-    return (
-      <FilterLink
-        id={view}
-        value={x}
-        label={!x && formatMessage(labels.none)}
-        externalUrl={
-          view === 'url' ? `${domain.startsWith('http') ? domain : `https://${domain}`}${x}` : null
-        }
-      >
-        {y} : {data[index]?.y} !
-      </FilterLink>
-    );
+  const renderChange = ({ x, y }) => {
+    const prev = data.find(d => d.x === x)?.y;
+    const value = y - prev;
+    const change = Math.abs(((y - prev) / prev) * 100);
+
+    return !isNaN(change) && <ChangeLabel value={value}>{formatNumber(change)}%</ChangeLabel>;
+  };
+
+  const { startDate, endDate } = getCompareDate(
+    dateCompare,
+    dateRange.startDate,
+    dateRange.endDate,
+  );
+
+  const params = {
+    startAt: startDate.getTime(),
+    endAt: endDate.getTime(),
   };
 
   return (
     <Grid className={styles.container}>
       <GridRow columns="compare">
         <SideNav className={styles.nav} items={items} selectedKey={view} shallow={true} />
-        <Component websiteId={websiteId} limit={20} showMore={false} onDataLoad={setData} />
-        <Component websiteId={websiteId} limit={20} showMore={false} renderLabel={renderLabel} />
+        <div>
+          <div className={styles.title}>{formatMessage(labels.previous)}</div>
+          <Component
+            websiteId={websiteId}
+            limit={20}
+            showMore={false}
+            onDataLoad={setData}
+            params={params}
+          />
+        </div>
+        <div>
+          <div className={styles.title}> {formatMessage(labels.current)}</div>
+          <Component
+            websiteId={websiteId}
+            limit={20}
+            showMore={false}
+            renderChange={renderChange}
+          />
+        </div>
       </GridRow>
     </Grid>
   );
diff --git a/src/components/hooks/queries/useWebsiteMetrics.ts b/src/components/hooks/queries/useWebsiteMetrics.ts
index dd201155b4..088b31ac45 100644
--- a/src/components/hooks/queries/useWebsiteMetrics.ts
+++ b/src/components/hooks/queries/useWebsiteMetrics.ts
@@ -4,7 +4,7 @@ import { useFilterParams } from '../useFilterParams';
 
 export function useWebsiteMetrics(
   websiteId: string,
-  query: { type: string; limit: number; search: string },
+  queryParams: { type: string; limit: number; search: string; startAt?: number; endAt?: number },
   options?: Omit<UseQueryOptions & { onDataLoad?: (data: any) => void }, 'queryKey' | 'queryFn'>,
 ) {
   const { get, useQuery } = useApi();
@@ -16,17 +16,17 @@ export function useWebsiteMetrics(
       {
         websiteId,
         ...params,
-        ...query,
+        ...queryParams,
       },
     ],
     queryFn: async () => {
       const filters = { ...params };
 
-      filters[query.type] = undefined;
+      filters[queryParams.type] = undefined;
 
       const data = await get(`/websites/${websiteId}/metrics`, {
         ...filters,
-        ...query,
+        ...queryParams,
       });
 
       options?.onDataLoad?.(data);
diff --git a/src/components/messages.ts b/src/components/messages.ts
index f4d986ff7b..53e69401c9 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -253,8 +253,10 @@ export const labels = defineMessages({
     defaultMessage: 'Understand how users nagivate through your website.',
   },
   compare: { id: 'label.compare', defaultMessage: 'Compare' },
+  current: { id: 'label.current', defaultMessage: 'Current' },
+  previous: { id: 'label.previous', defaultMessage: 'Previous' },
   previousPeriod: { id: 'label.previous-period', defaultMessage: 'Previous period' },
-  yearOverYear: { id: 'label.year-over-year', defaultMessage: 'Year over year' },
+  previousYear: { id: 'label.previous-year', defaultMessage: 'Previous year' },
 });
 
 export const messages = defineMessages({
diff --git a/src/components/metrics/ChangeLabel.module.css b/src/components/metrics/ChangeLabel.module.css
new file mode 100644
index 0000000000..110f9a0da2
--- /dev/null
+++ b/src/components/metrics/ChangeLabel.module.css
@@ -0,0 +1,31 @@
+.label {
+  display: flex;
+  align-items: center;
+  gap: 5px;
+  font-size: 13px;
+  font-weight: 700;
+  padding: 0.1em 0.5em;
+  border-radius: 5px;
+  color: var(--base500);
+  align-self: flex-start;
+}
+
+.positive {
+  color: var(--green700);
+  background: var(--green100);
+}
+
+.negative {
+  color: var(--red700);
+  background: var(--red100);
+}
+
+.neutral {
+  color: var(--base700);
+  background: var(--base100);
+}
+
+.new {
+  color: var(--blue900);
+  background: var(--blue100);
+}
diff --git a/src/components/metrics/ChangeLabel.tsx b/src/components/metrics/ChangeLabel.tsx
new file mode 100644
index 0000000000..6eefc55bae
--- /dev/null
+++ b/src/components/metrics/ChangeLabel.tsx
@@ -0,0 +1,44 @@
+import classNames from 'classnames';
+import { Icon, Icons } from 'react-basics';
+import { ReactNode } from 'react';
+import styles from './ChangeLabel.module.css';
+
+export function ChangeLabel({
+  value,
+  size,
+  reverseColors,
+  className,
+  children,
+}: {
+  value: number;
+  size?: 'xs' | 'sm' | 'md' | 'lg';
+  reverseColors?: boolean;
+  showPercentage?: boolean;
+  className?: string;
+  children?: ReactNode;
+}) {
+  const positive = value * (reverseColors ? -1 : 1) >= 0;
+  const negative = value * (reverseColors ? -1 : 1) < 0;
+  const isNew = isNaN(value);
+
+  return (
+    <div
+      className={classNames(styles.label, className, {
+        [styles.positive]: positive,
+        [styles.negative]: negative,
+        [styles.neutral]: value === 0,
+        [styles.new]: isNew,
+      })}
+      title={value.toString()}
+    >
+      {!isNew && (
+        <Icon rotate={value === 0 ? 0 : positive || reverseColors ? -45 : 45} size={size}>
+          <Icons.ArrowRight />
+        </Icon>
+      )}
+      {children || value}
+    </div>
+  );
+}
+
+export default ChangeLabel;
diff --git a/src/components/metrics/ListTable.module.css b/src/components/metrics/ListTable.module.css
index 9c3d5cff6f..405819b1cc 100644
--- a/src/components/metrics/ListTable.module.css
+++ b/src/components/metrics/ListTable.module.css
@@ -72,9 +72,11 @@
 }
 
 .value {
-  width: 50px;
+  display: flex;
+  align-items: center;
+  gap: 10px;
   text-align: end;
-  margin-inline-end: 10px;
+  margin-inline-end: 5px;
   font-weight: 600;
 }
 
diff --git a/src/components/metrics/ListTable.tsx b/src/components/metrics/ListTable.tsx
index 14f2c9900b..59ded49179 100644
--- a/src/components/metrics/ListTable.tsx
+++ b/src/components/metrics/ListTable.tsx
@@ -15,6 +15,7 @@ export interface ListTableProps {
   metric?: string;
   className?: string;
   renderLabel?: (row: any, index: number) => ReactNode;
+  renderChange?: (row: any, index: number) => ReactNode;
   animate?: boolean;
   virtualize?: boolean;
   showPercentage?: boolean;
@@ -27,6 +28,7 @@ export function ListTable({
   metric,
   className,
   renderLabel,
+  renderChange,
   animate = true,
   virtualize = false,
   showPercentage = true,
@@ -45,6 +47,7 @@ export function ListTable({
         percent={percent}
         animate={animate && !virtualize}
         showPercentage={showPercentage}
+        change={renderChange ? renderChange(row, index) : null}
       />
     );
   };
@@ -78,7 +81,7 @@ export function ListTable({
   );
 }
 
-const AnimatedRow = ({ label, value = 0, percent, animate, showPercentage = true }) => {
+const AnimatedRow = ({ label, value = 0, percent, change, animate, showPercentage = true }) => {
   const props = useSpring({
     width: percent,
     y: value,
@@ -90,6 +93,7 @@ const AnimatedRow = ({ label, value = 0, percent, animate, showPercentage = true
     <div className={styles.row}>
       <div className={styles.label}>{label}</div>
       <div className={styles.value}>
+        {change}
         <animated.div className={styles.value} title={props?.y as any}>
           {props.y?.to(formatLongNumber)}
         </animated.div>
diff --git a/src/components/metrics/MetricCard.module.css b/src/components/metrics/MetricCard.module.css
index ee8f55b17e..93e6c6d72d 100644
--- a/src/components/metrics/MetricCard.module.css
+++ b/src/components/metrics/MetricCard.module.css
@@ -35,29 +35,3 @@
   white-space: nowrap;
   color: var(--base800);
 }
-
-.change {
-  display: flex;
-  align-items: center;
-  gap: 5px;
-  font-size: 13px;
-  font-weight: 700;
-  padding: 0.1em 0.5em;
-  border-radius: 5px;
-  color: var(--base500);
-  align-self: flex-start;
-}
-
-.change.positive {
-  color: var(--green700);
-  background: var(--green100);
-}
-
-.change.negative {
-  color: var(--red700);
-  background: var(--red100);
-}
-
-.hide {
-  visibility: hidden;
-}
diff --git a/src/components/metrics/MetricCard.tsx b/src/components/metrics/MetricCard.tsx
index 907263afd7..ecb4f2dcdf 100644
--- a/src/components/metrics/MetricCard.tsx
+++ b/src/components/metrics/MetricCard.tsx
@@ -1,7 +1,7 @@
 import classNames from 'classnames';
-import { Icon, Icons } from 'react-basics';
 import { useSpring, animated } from '@react-spring/web';
 import { formatNumber } from 'lib/format';
+import ChangeLabel from 'components/metrics/ChangeLabel';
 import styles from './MetricCard.module.css';
 
 export interface MetricCardProps {
@@ -31,30 +31,19 @@ export const MetricCard = ({
   const props = useSpring({ x: Number(value) || 0, from: { x: 0 } });
   const changeProps = useSpring({ x: Number(change) || 0, from: { x: 0 } });
   const prevProps = useSpring({ x: Number(value - change) || 0, from: { x: 0 } });
-  const positive = change * (reverseColors ? -1 : 1) >= 0;
-  const negative = change * (reverseColors ? -1 : 1) < 0;
 
   return (
     <div className={classNames(styles.card, className, showPrevious && styles.compare)}>
       {showLabel && <div className={styles.label}>{label}</div>}
-      <animated.div className={styles.value} title={props?.x as any}>
+      <animated.div className={styles.value} title={value.toString()}>
         {props?.x?.to(x => format(x))}
       </animated.div>
       {showChange && (
-        <div
-          className={classNames(styles.change, {
-            [styles.positive]: positive,
-            [styles.negative]: negative,
-            [styles.hide]: ~~change === 0,
-          })}
-        >
-          <Icon rotate={positive || reverseColors ? -45 : 45} size={showPrevious ? 'md' : 'xs'}>
-            <Icons.ArrowRight />
-          </Icon>
-          <animated.span title={changeProps?.x as any}>
+        <ChangeLabel className={styles.change} value={change} reverseColors={reverseColors}>
+          <animated.span title={change.toString()}>
             {changeProps?.x?.to(x => format(Math.abs(x)))}
           </animated.span>
-        </div>
+        </ChangeLabel>
       )}
       {showPrevious && (
         <animated.div className={classNames(styles.value, styles.prev)} title={prevProps?.x as any}>
diff --git a/src/components/metrics/MetricsTable.tsx b/src/components/metrics/MetricsTable.tsx
index 6da0e289f1..4ca3ff522e 100644
--- a/src/components/metrics/MetricsTable.tsx
+++ b/src/components/metrics/MetricsTable.tsx
@@ -27,6 +27,7 @@ export interface MetricsTableProps extends ListTableProps {
   onSearch?: (search: string) => void;
   allowSearch?: boolean;
   showMore?: boolean;
+  params?: { [key: string]: any };
   children?: ReactNode;
 }
 
@@ -40,6 +41,7 @@ export function MetricsTable({
   delay = null,
   allowSearch = false,
   showMore = true,
+  params,
   children,
   ...props
 }: MetricsTableProps) {
@@ -51,7 +53,7 @@ export function MetricsTable({
 
   const { data, isLoading, isFetched, error } = useWebsiteMetrics(
     websiteId,
-    { type, limit, search },
+    { type, limit, search, ...params },
     {
       retryDelay: delay || DEFAULT_ANIMATION_DURATION,
       onDataLoad,
diff --git a/src/components/metrics/PagesTable.tsx b/src/components/metrics/PagesTable.tsx
index ca3f6be5c4..d29952d4f3 100644
--- a/src/components/metrics/PagesTable.tsx
+++ b/src/components/metrics/PagesTable.tsx
@@ -55,7 +55,7 @@ export function PagesTable({ allowFilter, ...props }: PagesTableProps) {
       type={view}
       metric={formatMessage(labels.views)}
       dataFilter={emptyFilter}
-      renderLabel={props.renderLabel || renderLink}
+      renderLabel={renderLink}
     >
       {allowFilter && <FilterButtons items={buttons} selectedKey={view} onSelect={handleSelect} />}
     </MetricsTable>
diff --git a/src/components/metrics/PageviewsChart.tsx b/src/components/metrics/PageviewsChart.tsx
index 191b1490ee..dabc2ce3b4 100644
--- a/src/components/metrics/PageviewsChart.tsx
+++ b/src/components/metrics/PageviewsChart.tsx
@@ -46,7 +46,7 @@ export function PageviewsChart({ data, unit, isLoading, ...props }: PageviewsCha
           ? [
               {
                 type: 'line',
-                label: `${formatMessage(labels.visits)} (VS)`,
+                label: `${formatMessage(labels.visits)} (${formatMessage(labels.previous)})`,
                 data: data.compare.pageviews,
                 borderWidth: 2,
                 backgroundColor: '#8601B0',
@@ -55,7 +55,7 @@ export function PageviewsChart({ data, unit, isLoading, ...props }: PageviewsCha
               },
               {
                 type: 'line',
-                label: `${formatMessage(labels.visitors)} (VS)`,
+                label: `${formatMessage(labels.visitors)} (${formatMessage(labels.previous)})`,
                 data: data.compare.sessions,
                 borderWidth: 2,
                 backgroundColor: '#f15bb5',
diff --git a/src/pages/api/send.ts b/src/pages/api/send.ts
index fe4a2abd25..11ba10d741 100644
--- a/src/pages/api/send.ts
+++ b/src/pages/api/send.ts
@@ -87,7 +87,7 @@ export default async (req: NextApiRequestCollect, res: NextApiResponse) => {
 
   if (req.method === 'POST') {
     if (!process.env.DISABLE_BOT_CHECK && isbot(req.headers['user-agent'])) {
-      return ok(res);
+      return ok(res, { beep: 'boop' });
     }
 
     await useValidate(schema, req, res);
diff --git a/yarn.lock b/yarn.lock
index 80b8e4542f..4ba6684d2f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1206,17 +1206,17 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@clickhouse/client-common@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@clickhouse/client-common/-/client-common-1.0.1.tgz#c7dde5eafaad8189649373ecc23354c7a32847b3"
-  integrity sha512-3L6e0foP6VOktScoi6XWMjJyOpKCWgLUYgPVxP2c7gm6Kotq+iRmmmXtXTSg7B7uozcLZycTtPfIw2d80SYsYw==
+"@clickhouse/client-common@1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@clickhouse/client-common/-/client-common-1.0.2.tgz#0fe0a4b33101c08d85c1279e4d74b2a92d42d996"
+  integrity sha512-5oI2URFsXlzoysv5lAxoTUAnAHjXnaJ+1Jz3HUARR06Hkbr1sN0pGxfGwgjEd8E/lI4+UNdNEZicG2rlFnWSaA==
 
-"@clickhouse/client@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@clickhouse/client/-/client-1.0.1.tgz#364db28d9ef9beaf19104f962c2b06090cb10468"
-  integrity sha512-fluUNnE2R7COJ6rn6DorYfi4D+AQn3t2qeBtEq37bQV3pD4EbKrBfKAwJ13e1lmMWdQ2B9bJUTMqGsRIDdWhJw==
+"@clickhouse/client@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@clickhouse/client/-/client-1.0.2.tgz#7d9675e697ce697f1e6777f4c66ca6d3384e7325"
+  integrity sha512-PaK0GLjIrlCpXevrp9gliOrurna6MjMMFBgZhDh6Zup8IuJCjQru4LkNsWUl3hJ2nua6+Ygag14iB8ILbeaIjg==
   dependencies:
-    "@clickhouse/client-common" "1.0.1"
+    "@clickhouse/client-common" "1.0.2"
 
 "@colors/colors@1.5.0":
   version "1.5.0"
@@ -2089,51 +2089,51 @@
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
   integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
 
-"@prisma/client@5.13.0":
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.13.0.tgz#b9f1d0983d714e982675201d8222a9ecb4bdad4a"
-  integrity sha512-uYdfpPncbZ/syJyiYBwGZS8Gt1PTNoErNYMuqHDa2r30rNSFtgTA/LXsSk55R7pdRTMi5pHkeP9B14K6nHmwkg==
+"@prisma/client@5.14.0":
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.14.0.tgz#dadca5bb1137ddcebb454bbdaf89423823d3363f"
+  integrity sha512-akMSuyvLKeoU4LeyBAUdThP/uhVP3GuLygFE3MlYzaCb3/J8SfsYBE5PkaFuLuVpLyA6sFoW+16z/aPhNAESqg==
 
-"@prisma/debug@5.13.0":
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.13.0.tgz#d88b0f6fafa0c216e20e284ed9fc30f1cbe45786"
-  integrity sha512-699iqlEvzyCj9ETrXhs8o8wQc/eVW+FigSsHpiskSFydhjVuwTJEfj/nIYqTaWFYuxiWQRfm3r01meuW97SZaQ==
+"@prisma/debug@5.14.0":
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.14.0.tgz#1227c705893c38284f7c63d72441480ebaa12605"
+  integrity sha512-iq56qBZuFfX3fCxoxT8gBX33lQzomBU0qIUaEj1RebsKVz1ob/BVH1XSBwwwvRVtZEV1b7Fxx2eVu34Ge/mg3w==
 
-"@prisma/engines-version@5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b":
-  version "5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b"
-  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b.tgz#a72a4fb83ba1fd01ad45f795aa55168f60d34723"
-  integrity sha512-AyUuhahTINGn8auyqYdmxsN+qn0mw3eg+uhkp8zwknXYIqoT3bChG4RqNY/nfDkPvzWAPBa9mrDyBeOnWSgO6A==
+"@prisma/engines-version@5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48":
+  version "5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48"
+  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48.tgz#019c3c75a5c3276e580685fe48cdbfd181176858"
+  integrity sha512-ip6pNkRo1UxWv+6toxNcYvItNYaqQjXdFNGJ+Nuk2eYtRoEdoF13wxo7/jsClJFFenMPVNVqXQDV0oveXnR1cA==
 
-"@prisma/engines@5.13.0":
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.13.0.tgz#8994ebf7b4e35aee7746a8465ec22738379bcab6"
-  integrity sha512-hIFLm4H1boj6CBZx55P4xKby9jgDTeDG0Jj3iXtwaaHmlD5JmiDkZhh8+DYWkTGchu+rRF36AVROLnk0oaqhHw==
+"@prisma/engines@5.14.0":
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.14.0.tgz#2ee91dd2220a726c27c906fbea788bbb3efdac6e"
+  integrity sha512-lgxkKZ6IEygVcw6IZZUlPIfLQ9hjSYAtHjZ5r64sCLDgVzsPFCi2XBBJgzPMkOQ5RHzUD4E/dVdpn9+ez8tk1A==
   dependencies:
-    "@prisma/debug" "5.13.0"
-    "@prisma/engines-version" "5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b"
-    "@prisma/fetch-engine" "5.13.0"
-    "@prisma/get-platform" "5.13.0"
+    "@prisma/debug" "5.14.0"
+    "@prisma/engines-version" "5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48"
+    "@prisma/fetch-engine" "5.14.0"
+    "@prisma/get-platform" "5.14.0"
 
 "@prisma/extension-read-replicas@^0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/@prisma/extension-read-replicas/-/extension-read-replicas-0.3.0.tgz#2842a7c928f957c1dd58a6256104797596d43426"
   integrity sha512-F9+rSmYday6GT2qjhJtkZcBOpLO5LtpvFcMGqrBDHf+78LEdSuxfFjOxYlNuqk4B+th62yxpbhfpmB9/Mca14Q==
 
-"@prisma/fetch-engine@5.13.0":
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.13.0.tgz#9b6945c7b38bb59e840f8905b20ea7a3d059ca55"
-  integrity sha512-Yh4W+t6YKyqgcSEB3odBXt7QyVSm0OQlBSldQF2SNXtmOgMX8D7PF/fvH6E6qBCpjB/yeJLy/FfwfFijoHI6sA==
+"@prisma/fetch-engine@5.14.0":
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.14.0.tgz#45297c118d4ec3fea55129886edd5a429da1f6da"
+  integrity sha512-VrheA9y9DMURK5vu8OJoOgQpxOhas3qF0IBHJ8G/0X44k82kc8E0w98HCn2nhnbOOMwbWsJWXfLC2/F8n5u0gQ==
   dependencies:
-    "@prisma/debug" "5.13.0"
-    "@prisma/engines-version" "5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b"
-    "@prisma/get-platform" "5.13.0"
+    "@prisma/debug" "5.14.0"
+    "@prisma/engines-version" "5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48"
+    "@prisma/get-platform" "5.14.0"
 
-"@prisma/get-platform@5.13.0":
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.13.0.tgz#99ef909a52b9d79b64d72d2d3d8210c4892b6572"
-  integrity sha512-B/WrQwYTzwr7qCLifQzYOmQhZcFmIFhR81xC45gweInSUn2hTEbfKUPd2keAog+y5WI5xLAFNJ3wkXplvSVkSw==
+"@prisma/get-platform@5.14.0":
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.14.0.tgz#69112d3dde61905f59a65ed818f153e153ca40f0"
+  integrity sha512-/yAyBvcEjRv41ynZrhdrPtHgk47xLRRq/o5eWGcUpBJ1YrUZTYB8EoPiopnP7iQrMATK8stXQdPOoVlrzuTQZw==
   dependencies:
-    "@prisma/debug" "5.13.0"
+    "@prisma/debug" "5.14.0"
 
 "@react-spring/animated@~9.7.3":
   version "9.7.3"
@@ -8659,12 +8659,12 @@ pretty-format@^29.0.0, pretty-format@^29.7.0:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
-prisma@5.13.0:
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.13.0.tgz#1f06e20ccfb6038ad68869e6eacd3b346f9d0851"
-  integrity sha512-kGtcJaElNRAdAGsCNykFSZ7dBKpL14Cbs+VaQ8cECxQlRPDjBlMHNFYeYt0SKovAVy2Y65JXQwB3A5+zIQwnTg==
+prisma@5.14.0:
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.14.0.tgz#ffc4696a43b044b636c3303b7aa98c13c2ade4dd"
+  integrity sha512-gCNZco7y5XtjrnQYeDJTiVZmT/ncqCr5RY1/Cf8X2wgLRmyh9ayPAGBNziI4qEE4S6SxCH5omQLVo9lmURaJ/Q==
   dependencies:
-    "@prisma/engines" "5.13.0"
+    "@prisma/engines" "5.14.0"
 
 process@^0.11.10:
   version "0.11.10"
@@ -9590,16 +9590,7 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -9672,14 +9663,7 @@ string.prototype.trimstart@^1.0.8:
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -10440,7 +10424,7 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -10458,15 +10442,6 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

From 8b304b7ca2c17cca2e797ccb288a965486fd6cbe Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Sun, 26 May 2024 21:30:03 -0700
Subject: [PATCH 107/438] Show percentages in metrics bar.

---
 .../[websiteId]/WebsiteMetricsBar.tsx         | 16 ++++++++-----
 src/components/metrics/MetricCard.tsx         | 23 +++++++++++--------
 src/components/metrics/PageviewsChart.tsx     |  2 +-
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
index 5a6478482b..b74482a47f 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
@@ -3,7 +3,7 @@ import { useMessages, useSticky } from 'components/hooks';
 import WebsiteDateFilter from 'components/input/WebsiteDateFilter';
 import MetricCard from 'components/metrics/MetricCard';
 import MetricsBar from 'components/metrics/MetricsBar';
-import { formatShortTime } from 'lib/format';
+import { formatShortTime, formatLongNumber } from 'lib/format';
 import WebsiteFilterButton from './WebsiteFilterButton';
 import useWebsiteStats from 'components/hooks/queries/useWebsiteStats';
 import styles from './WebsiteMetricsBar.module.css';
@@ -37,16 +37,19 @@ export function WebsiteMetricsBar({
           ...pageviews,
           label: formatMessage(labels.views),
           change: pageviews.value - pageviews.prev,
+          formatValue: formatLongNumber,
         },
         {
           ...visits,
           label: formatMessage(labels.visits),
           change: visits.value - visits.prev,
+          formatValue: formatLongNumber,
         },
         {
           ...visitors,
           label: formatMessage(labels.visitors),
           change: visitors.value - visitors.prev,
+          formatValue: formatLongNumber,
         },
         {
           label: formatMessage(labels.bounceRate),
@@ -55,7 +58,7 @@ export function WebsiteMetricsBar({
           change:
             (Math.min(visitors.value, bounces.value) / visitors.value) * 100 -
             (Math.min(visitors.prev, bounces.prev) / visitors.prev) * 100,
-          format: n => Number(n).toFixed(0) + '%',
+          formatValue: n => Number(n).toFixed(0) + '%',
           reverseColors: true,
         },
         {
@@ -63,7 +66,8 @@ export function WebsiteMetricsBar({
           value: totaltime.value / visits.value,
           prev: totaltime.prev / visits.prev,
           change: totaltime.value / visits.value - totaltime.prev / visits.prev,
-          format: n => `${+n < 0 ? '-' : ''}${formatShortTime(Math.abs(~~n), ['m', 's'], ' ')}`,
+          formatValue: n =>
+            `${+n < 0 ? '-' : ''}${formatShortTime(Math.abs(~~n), ['m', 's'], ' ')}`,
         },
       ]
     : [];
@@ -78,12 +82,12 @@ export function WebsiteMetricsBar({
       ref={ref}
       className={classNames(styles.container, {
         [styles.sticky]: sticky,
-        [styles.isSticky]: isSticky,
+        [styles.isSticky]: sticky && isSticky,
       })}
     >
       <div>
         <MetricsBar isLoading={isLoading} isFetched={isFetched} error={error}>
-          {metrics.map(({ label, value, prev, change, format, reverseColors }) => {
+          {metrics.map(({ label, value, prev, change, formatValue, reverseColors }) => {
             return (
               <MetricCard
                 key={label}
@@ -91,7 +95,7 @@ export function WebsiteMetricsBar({
                 previousValue={prev}
                 label={label}
                 change={change}
-                format={format}
+                formatValue={formatValue}
                 reverseColors={reverseColors}
                 showChange={compareMode || showChange}
                 showPrevious={compareMode}
diff --git a/src/components/metrics/MetricCard.tsx b/src/components/metrics/MetricCard.tsx
index ecb4f2dcdf..3c4899c4fa 100644
--- a/src/components/metrics/MetricCard.tsx
+++ b/src/components/metrics/MetricCard.tsx
@@ -10,7 +10,7 @@ export interface MetricCardProps {
   change?: number;
   label?: string;
   reverseColors?: boolean;
-  format?: typeof formatNumber;
+  formatValue?: typeof formatNumber;
   showLabel?: boolean;
   showChange?: boolean;
   showPrevious?: boolean;
@@ -22,32 +22,35 @@ export const MetricCard = ({
   change = 0,
   label,
   reverseColors = false,
-  format = formatNumber,
+  formatValue = formatNumber,
   showLabel = true,
   showChange = false,
   showPrevious = false,
   className,
 }: MetricCardProps) => {
+  const diff = value - change;
+  const pct = ((value - diff) / diff) * 100;
   const props = useSpring({ x: Number(value) || 0, from: { x: 0 } });
-  const changeProps = useSpring({ x: Number(change) || 0, from: { x: 0 } });
-  const prevProps = useSpring({ x: Number(value - change) || 0, from: { x: 0 } });
+  const changeProps = useSpring({ x: Number(pct) || 0, from: { x: 0 } });
+  const prevProps = useSpring({ x: Number(diff) || 0, from: { x: 0 } });
 
   return (
     <div className={classNames(styles.card, className, showPrevious && styles.compare)}>
       {showLabel && <div className={styles.label}>{label}</div>}
-      <animated.div className={styles.value} title={value.toString()}>
-        {props?.x?.to(x => format(x))}
+      <animated.div className={styles.value} title={formatValue(value)}>
+        {props?.x?.to(x => formatValue(x))}
       </animated.div>
       {showChange && (
         <ChangeLabel className={styles.change} value={change} reverseColors={reverseColors}>
-          <animated.span title={change.toString()}>
-            {changeProps?.x?.to(x => format(Math.abs(x)))}
+          <animated.span title={formatValue(change)}>
+            {changeProps?.x?.to(x => Math.abs(~~x))}
           </animated.span>
+          %
         </ChangeLabel>
       )}
       {showPrevious && (
-        <animated.div className={classNames(styles.value, styles.prev)} title={prevProps?.x as any}>
-          {prevProps?.x?.to(x => format(x))}
+        <animated.div className={classNames(styles.value, styles.prev)} title={formatValue(diff)}>
+          {prevProps?.x?.to(x => formatValue(x))}
         </animated.div>
       )}
     </div>
diff --git a/src/components/metrics/PageviewsChart.tsx b/src/components/metrics/PageviewsChart.tsx
index dabc2ce3b4..400b96ba3b 100644
--- a/src/components/metrics/PageviewsChart.tsx
+++ b/src/components/metrics/PageviewsChart.tsx
@@ -46,7 +46,7 @@ export function PageviewsChart({ data, unit, isLoading, ...props }: PageviewsCha
           ? [
               {
                 type: 'line',
-                label: `${formatMessage(labels.visits)} (${formatMessage(labels.previous)})`,
+                label: `${formatMessage(labels.views)} (${formatMessage(labels.previous)})`,
                 data: data.compare.pageviews,
                 borderWidth: 2,
                 backgroundColor: '#8601B0',

From b8b1ff8fd426eadf5168eb4797785c0c769d9dc0 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Sun, 26 May 2024 21:57:43 -0700
Subject: [PATCH 108/438] Remove journey report.

---
 src/app/(main)/reports/create/ReportTemplates.tsx | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/app/(main)/reports/create/ReportTemplates.tsx b/src/app/(main)/reports/create/ReportTemplates.tsx
index 0777cc1f96..fdf5c5f527 100644
--- a/src/app/(main)/reports/create/ReportTemplates.tsx
+++ b/src/app/(main)/reports/create/ReportTemplates.tsx
@@ -6,7 +6,6 @@ import Lightbulb from 'assets/lightbulb.svg';
 import Magnet from 'assets/magnet.svg';
 import Tag from 'assets/tag.svg';
 import Target from 'assets/target.svg';
-import Path from 'assets/path.svg';
 import styles from './ReportTemplates.module.css';
 import { useMessages, useTeamUrl } from 'components/hooks';
 
@@ -45,12 +44,6 @@ export function ReportTemplates({ showHeader = true }: { showHeader?: boolean })
       url: renderTeamUrl('/reports/goals'),
       icon: <Target />,
     },
-    {
-      title: formatMessage(labels.journey),
-      description: formatMessage(labels.journeyDescription),
-      url: renderTeamUrl('/reports/journey'),
-      icon: <Path />,
-    },
   ];
 
   return (

From cbd5f7b55613f6f18f08eeeea322ab319c91dd36 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Sun, 26 May 2024 22:08:23 -0700
Subject: [PATCH 109/438] Added redirect for teams.

---
 .../teams/[teamId]/websites/[websiteId]/compare/page.tsx       | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 src/app/(main)/teams/[teamId]/websites/[websiteId]/compare/page.tsx

diff --git a/src/app/(main)/teams/[teamId]/websites/[websiteId]/compare/page.tsx b/src/app/(main)/teams/[teamId]/websites/[websiteId]/compare/page.tsx
new file mode 100644
index 0000000000..65b9537e39
--- /dev/null
+++ b/src/app/(main)/teams/[teamId]/websites/[websiteId]/compare/page.tsx
@@ -0,0 +1,3 @@
+import Page from 'app/(main)/websites/[websiteId]/compare/page';
+
+export default Page;

From 9c2917a53f71920728abda4131eb37d3a178015b Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Sun, 26 May 2024 22:49:22 -0700
Subject: [PATCH 110/438] add goals page for teams

---
 src/app/(main)/teams/[teamId]/reports/goals/page.tsx | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 src/app/(main)/teams/[teamId]/reports/goals/page.tsx

diff --git a/src/app/(main)/teams/[teamId]/reports/goals/page.tsx b/src/app/(main)/teams/[teamId]/reports/goals/page.tsx
new file mode 100644
index 0000000000..34aab933fe
--- /dev/null
+++ b/src/app/(main)/teams/[teamId]/reports/goals/page.tsx
@@ -0,0 +1,3 @@
+import Page from 'app/(main)/reports/goals/page';
+
+export default Page;

From 377a22f1ea4a89f49cd592187c5aef63765eaac5 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Sun, 26 May 2024 23:04:18 -0700
Subject: [PATCH 111/438] Switch file based redirect to rewrites.

---
 next.config.js                                |  4 +++
 .../(main)/reports/create/ReportTemplates.tsx |  7 +++++
 .../(main)/teams/[teamId]/dashboard/page.tsx  |  3 --
 .../[teamId]/reports/[reportId]/page.tsx      |  3 --
 .../teams/[teamId]/reports/create/page.tsx    |  3 --
 .../[teamId]/reports/event-data/page.tsx      |  3 --
 .../teams/[teamId]/reports/funnel/page.tsx    |  3 --
 .../teams/[teamId]/reports/insights/page.tsx  |  3 --
 .../(main)/teams/[teamId]/reports/page.tsx    |  8 ------
 .../teams/[teamId]/reports/retention/page.tsx |  3 --
 .../teams/[teamId]/reports/utm/page.tsx       |  3 --
 .../[teamId]/settings/TeamSettingsLayout.tsx  | 28 -------------------
 .../(main)/teams/[teamId]/settings/layout.tsx | 10 -------
 .../teams/[teamId]/settings/members/page.tsx  |  3 --
 .../teams/[teamId]/settings/team/page.tsx     |  3 --
 .../settings/websites/[websiteId]/page.tsx    |  3 --
 .../teams/[teamId]/settings/websites/page.tsx |  3 --
 .../websites/[websiteId]/compare/page.tsx     |  3 --
 .../websites/[websiteId]/event-data/page.tsx  |  3 --
 .../[teamId]/websites/[websiteId]/page.tsx    |  3 --
 .../websites/[websiteId]/realtime/page.tsx    |  3 --
 .../websites/[websiteId]/reports/page.tsx     |  3 --
 .../(main)/teams/[teamId]/websites/page.tsx   |  3 --
 23 files changed, 11 insertions(+), 100 deletions(-)
 delete mode 100644 src/app/(main)/teams/[teamId]/dashboard/page.tsx
 delete mode 100644 src/app/(main)/teams/[teamId]/reports/[reportId]/page.tsx
 delete mode 100644 src/app/(main)/teams/[teamId]/reports/create/page.tsx
 delete mode 100644 src/app/(main)/teams/[teamId]/reports/event-data/page.tsx
 delete mode 100644 src/app/(main)/teams/[teamId]/reports/funnel/page.tsx
 delete mode 100644 src/app/(main)/teams/[teamId]/reports/insights/page.tsx
 delete mode 100644 src/app/(main)/teams/[teamId]/reports/page.tsx
 delete mode 100644 src/app/(main)/teams/[teamId]/reports/retention/page.tsx
 delete mode 100644 src/app/(main)/teams/[teamId]/reports/utm/page.tsx
 delete mode 100644 src/app/(main)/teams/[teamId]/settings/TeamSettingsLayout.tsx
 delete mode 100644 src/app/(main)/teams/[teamId]/settings/layout.tsx
 delete mode 100644 src/app/(main)/teams/[teamId]/settings/members/page.tsx
 delete mode 100644 src/app/(main)/teams/[teamId]/settings/team/page.tsx
 delete mode 100644 src/app/(main)/teams/[teamId]/settings/websites/[websiteId]/page.tsx
 delete mode 100644 src/app/(main)/teams/[teamId]/settings/websites/page.tsx
 delete mode 100644 src/app/(main)/teams/[teamId]/websites/[websiteId]/compare/page.tsx
 delete mode 100644 src/app/(main)/teams/[teamId]/websites/[websiteId]/event-data/page.tsx
 delete mode 100644 src/app/(main)/teams/[teamId]/websites/[websiteId]/page.tsx
 delete mode 100644 src/app/(main)/teams/[teamId]/websites/[websiteId]/realtime/page.tsx
 delete mode 100644 src/app/(main)/teams/[teamId]/websites/[websiteId]/reports/page.tsx
 delete mode 100644 src/app/(main)/teams/[teamId]/websites/page.tsx

diff --git a/next.config.js b/next.config.js
index 9be316cf7c..7554e2262d 100644
--- a/next.config.js
+++ b/next.config.js
@@ -167,6 +167,10 @@ const config = {
         source: '/telemetry.js',
         destination: '/api/scripts/telemetry',
       },
+      {
+        source: '/teams/:teamId/:path*',
+        destination: '/:path*',
+      },
     ];
   },
   async redirects() {
diff --git a/src/app/(main)/reports/create/ReportTemplates.tsx b/src/app/(main)/reports/create/ReportTemplates.tsx
index fdf5c5f527..0777cc1f96 100644
--- a/src/app/(main)/reports/create/ReportTemplates.tsx
+++ b/src/app/(main)/reports/create/ReportTemplates.tsx
@@ -6,6 +6,7 @@ import Lightbulb from 'assets/lightbulb.svg';
 import Magnet from 'assets/magnet.svg';
 import Tag from 'assets/tag.svg';
 import Target from 'assets/target.svg';
+import Path from 'assets/path.svg';
 import styles from './ReportTemplates.module.css';
 import { useMessages, useTeamUrl } from 'components/hooks';
 
@@ -44,6 +45,12 @@ export function ReportTemplates({ showHeader = true }: { showHeader?: boolean })
       url: renderTeamUrl('/reports/goals'),
       icon: <Target />,
     },
+    {
+      title: formatMessage(labels.journey),
+      description: formatMessage(labels.journeyDescription),
+      url: renderTeamUrl('/reports/journey'),
+      icon: <Path />,
+    },
   ];
 
   return (
diff --git a/src/app/(main)/teams/[teamId]/dashboard/page.tsx b/src/app/(main)/teams/[teamId]/dashboard/page.tsx
deleted file mode 100644
index bf8f2fed68..0000000000
--- a/src/app/(main)/teams/[teamId]/dashboard/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/dashboard/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/reports/[reportId]/page.tsx b/src/app/(main)/teams/[teamId]/reports/[reportId]/page.tsx
deleted file mode 100644
index 0f51aa88fd..0000000000
--- a/src/app/(main)/teams/[teamId]/reports/[reportId]/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/reports/[reportId]/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/reports/create/page.tsx b/src/app/(main)/teams/[teamId]/reports/create/page.tsx
deleted file mode 100644
index c1e777574e..0000000000
--- a/src/app/(main)/teams/[teamId]/reports/create/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/reports/create/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/reports/event-data/page.tsx b/src/app/(main)/teams/[teamId]/reports/event-data/page.tsx
deleted file mode 100644
index 77a6c44dc5..0000000000
--- a/src/app/(main)/teams/[teamId]/reports/event-data/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/reports/event-data/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/reports/funnel/page.tsx b/src/app/(main)/teams/[teamId]/reports/funnel/page.tsx
deleted file mode 100644
index be91966c87..0000000000
--- a/src/app/(main)/teams/[teamId]/reports/funnel/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/reports/funnel/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/reports/insights/page.tsx b/src/app/(main)/teams/[teamId]/reports/insights/page.tsx
deleted file mode 100644
index f8a91c6566..0000000000
--- a/src/app/(main)/teams/[teamId]/reports/insights/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/reports/insights/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/reports/page.tsx b/src/app/(main)/teams/[teamId]/reports/page.tsx
deleted file mode 100644
index 5404e128ab..0000000000
--- a/src/app/(main)/teams/[teamId]/reports/page.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import Page from 'app/(main)/reports/page';
-import { Metadata } from 'next';
-
-export default Page;
-
-export const metadata: Metadata = {
-  title: 'Team Reports',
-};
diff --git a/src/app/(main)/teams/[teamId]/reports/retention/page.tsx b/src/app/(main)/teams/[teamId]/reports/retention/page.tsx
deleted file mode 100644
index 62f8e5bf65..0000000000
--- a/src/app/(main)/teams/[teamId]/reports/retention/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/reports/retention/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/reports/utm/page.tsx b/src/app/(main)/teams/[teamId]/reports/utm/page.tsx
deleted file mode 100644
index 6070e7c52d..0000000000
--- a/src/app/(main)/teams/[teamId]/reports/utm/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/reports/utm/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/settings/TeamSettingsLayout.tsx b/src/app/(main)/teams/[teamId]/settings/TeamSettingsLayout.tsx
deleted file mode 100644
index 5f894228e4..0000000000
--- a/src/app/(main)/teams/[teamId]/settings/TeamSettingsLayout.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-'use client';
-import { ReactNode } from 'react';
-import MenuLayout from 'components/layout/MenuLayout';
-import { useMessages } from 'components/hooks';
-
-export default function ({ children, teamId }: { children: ReactNode; teamId: string }) {
-  const { formatMessage, labels } = useMessages();
-
-  const items = [
-    {
-      key: 'team',
-      label: formatMessage(labels.team),
-      url: `/teams/${teamId}/settings/team`,
-    },
-    {
-      key: 'websites',
-      label: formatMessage(labels.websites),
-      url: `/teams/${teamId}/settings/websites`,
-    },
-    {
-      key: 'members',
-      label: formatMessage(labels.members),
-      url: `/teams/${teamId}/settings/members`,
-    },
-  ].filter(n => n);
-
-  return <MenuLayout items={items}>{children}</MenuLayout>;
-}
diff --git a/src/app/(main)/teams/[teamId]/settings/layout.tsx b/src/app/(main)/teams/[teamId]/settings/layout.tsx
deleted file mode 100644
index b32d39e855..0000000000
--- a/src/app/(main)/teams/[teamId]/settings/layout.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import TeamSettingsLayout from './TeamSettingsLayout';
-import { Metadata } from 'next';
-
-export default function ({ children, params: { teamId } }) {
-  return <TeamSettingsLayout teamId={teamId}>{children}</TeamSettingsLayout>;
-}
-
-export const metadata: Metadata = {
-  title: 'Team Settings',
-};
diff --git a/src/app/(main)/teams/[teamId]/settings/members/page.tsx b/src/app/(main)/teams/[teamId]/settings/members/page.tsx
deleted file mode 100644
index a4045ab43a..0000000000
--- a/src/app/(main)/teams/[teamId]/settings/members/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/settings/teams/[teamId]/members/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/settings/team/page.tsx b/src/app/(main)/teams/[teamId]/settings/team/page.tsx
deleted file mode 100644
index c36e667c3b..0000000000
--- a/src/app/(main)/teams/[teamId]/settings/team/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/settings/teams/[teamId]/team/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/settings/websites/[websiteId]/page.tsx b/src/app/(main)/teams/[teamId]/settings/websites/[websiteId]/page.tsx
deleted file mode 100644
index ad1a97dd90..0000000000
--- a/src/app/(main)/teams/[teamId]/settings/websites/[websiteId]/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/settings/websites/[websiteId]/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/settings/websites/page.tsx b/src/app/(main)/teams/[teamId]/settings/websites/page.tsx
deleted file mode 100644
index 897c60fecd..0000000000
--- a/src/app/(main)/teams/[teamId]/settings/websites/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/settings/teams/[teamId]/websites/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/websites/[websiteId]/compare/page.tsx b/src/app/(main)/teams/[teamId]/websites/[websiteId]/compare/page.tsx
deleted file mode 100644
index 65b9537e39..0000000000
--- a/src/app/(main)/teams/[teamId]/websites/[websiteId]/compare/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/websites/[websiteId]/compare/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/websites/[websiteId]/event-data/page.tsx b/src/app/(main)/teams/[teamId]/websites/[websiteId]/event-data/page.tsx
deleted file mode 100644
index 87de2abe2c..0000000000
--- a/src/app/(main)/teams/[teamId]/websites/[websiteId]/event-data/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/websites/[websiteId]/event-data/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/websites/[websiteId]/page.tsx b/src/app/(main)/teams/[teamId]/websites/[websiteId]/page.tsx
deleted file mode 100644
index 224ff4d500..0000000000
--- a/src/app/(main)/teams/[teamId]/websites/[websiteId]/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/websites/[websiteId]/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/websites/[websiteId]/realtime/page.tsx b/src/app/(main)/teams/[teamId]/websites/[websiteId]/realtime/page.tsx
deleted file mode 100644
index ffeaa9288f..0000000000
--- a/src/app/(main)/teams/[teamId]/websites/[websiteId]/realtime/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/websites/[websiteId]/realtime/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/websites/[websiteId]/reports/page.tsx b/src/app/(main)/teams/[teamId]/websites/[websiteId]/reports/page.tsx
deleted file mode 100644
index 9a97b9c502..0000000000
--- a/src/app/(main)/teams/[teamId]/websites/[websiteId]/reports/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/websites/[websiteId]/reports/page';
-
-export default Page;
diff --git a/src/app/(main)/teams/[teamId]/websites/page.tsx b/src/app/(main)/teams/[teamId]/websites/page.tsx
deleted file mode 100644
index 553c852ac5..0000000000
--- a/src/app/(main)/teams/[teamId]/websites/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/websites/page';
-
-export default Page;

From 1c8ae90457afe4e7e9a1fc6c15c7b6bf3b423dbb Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Mon, 27 May 2024 21:23:06 -0700
Subject: [PATCH 112/438] Updated change labels.

---
 src/components/metrics/ChangeLabel.module.css |  5 -----
 src/components/metrics/ChangeLabel.tsx        | 13 +++++++------
 src/components/metrics/MetricCard.tsx         | 16 +++++++++-------
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/components/metrics/ChangeLabel.module.css b/src/components/metrics/ChangeLabel.module.css
index 110f9a0da2..802a9931d8 100644
--- a/src/components/metrics/ChangeLabel.module.css
+++ b/src/components/metrics/ChangeLabel.module.css
@@ -24,8 +24,3 @@
   color: var(--base700);
   background: var(--base100);
 }
-
-.new {
-  color: var(--blue900);
-  background: var(--blue100);
-}
diff --git a/src/components/metrics/ChangeLabel.tsx b/src/components/metrics/ChangeLabel.tsx
index 6eefc55bae..14eb1a8b81 100644
--- a/src/components/metrics/ChangeLabel.tsx
+++ b/src/components/metrics/ChangeLabel.tsx
@@ -6,12 +6,14 @@ import styles from './ChangeLabel.module.css';
 export function ChangeLabel({
   value,
   size,
+  title,
   reverseColors,
   className,
   children,
 }: {
   value: number;
   size?: 'xs' | 'sm' | 'md' | 'lg';
+  title?: string;
   reverseColors?: boolean;
   showPercentage?: boolean;
   className?: string;
@@ -19,20 +21,19 @@ export function ChangeLabel({
 }) {
   const positive = value * (reverseColors ? -1 : 1) >= 0;
   const negative = value * (reverseColors ? -1 : 1) < 0;
-  const isNew = isNaN(value);
+  const neutral = value === 0 || isNaN(value);
 
   return (
     <div
       className={classNames(styles.label, className, {
         [styles.positive]: positive,
         [styles.negative]: negative,
-        [styles.neutral]: value === 0,
-        [styles.new]: isNew,
+        [styles.neutral]: neutral,
       })}
-      title={value.toString()}
+      title={title}
     >
-      {!isNew && (
-        <Icon rotate={value === 0 ? 0 : positive || reverseColors ? -45 : 45} size={size}>
+      {!neutral && (
+        <Icon rotate={value === 0 ? 0 : positive || reverseColors ? -90 : 90} size={size}>
           <Icons.ArrowRight />
         </Icon>
       )}
diff --git a/src/components/metrics/MetricCard.tsx b/src/components/metrics/MetricCard.tsx
index 3c4899c4fa..5b11156e0a 100644
--- a/src/components/metrics/MetricCard.tsx
+++ b/src/components/metrics/MetricCard.tsx
@@ -37,19 +37,21 @@ export const MetricCard = ({
   return (
     <div className={classNames(styles.card, className, showPrevious && styles.compare)}>
       {showLabel && <div className={styles.label}>{label}</div>}
-      <animated.div className={styles.value} title={formatValue(value)}>
+      <animated.div className={styles.value} title={value.toString()}>
         {props?.x?.to(x => formatValue(x))}
       </animated.div>
       {showChange && (
-        <ChangeLabel className={styles.change} value={change} reverseColors={reverseColors}>
-          <animated.span title={formatValue(change)}>
-            {changeProps?.x?.to(x => Math.abs(~~x))}
-          </animated.span>
-          %
+        <ChangeLabel
+          className={styles.change}
+          value={change}
+          title={formatValue(change)}
+          reverseColors={reverseColors}
+        >
+          <animated.span>{changeProps?.x?.to(x => `${Math.abs(~~x)}%`)}</animated.span>
         </ChangeLabel>
       )}
       {showPrevious && (
-        <animated.div className={classNames(styles.value, styles.prev)} title={formatValue(diff)}>
+        <animated.div className={classNames(styles.value, styles.prev)} title={diff.toString()}>
           {prevProps?.x?.to(x => formatValue(x))}
         </animated.div>
       )}

From cfe2389b8e38540723362f620db10e62f1881e90 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 27 May 2024 23:14:38 -0700
Subject: [PATCH 113/438] update admin get websites with includeAllTeams

---
 src/pages/api/admin/websites.ts | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/pages/api/admin/websites.ts b/src/pages/api/admin/websites.ts
index 686de6cb4b..d7dd6b74ce 100644
--- a/src/pages/api/admin/websites.ts
+++ b/src/pages/api/admin/websites.ts
@@ -11,6 +11,7 @@ import * as yup from 'yup';
 export interface WebsitesRequestQuery extends PageParams {
   userId?: string;
   includeOwnedTeams?: boolean;
+  includeAllTeams?: boolean;
 }
 
 export interface WebsitesRequestBody {
@@ -43,7 +44,7 @@ export default async (
       return unauthorized(res);
     }
 
-    const { userId, includeOwnedTeams } = req.query;
+    const { userId, includeOwnedTeams, includeAllTeams } = req.query;
 
     const websites = await getWebsites(
       {
@@ -65,6 +66,20 @@ export default async (
                   },
                 ]
               : []),
+            ...(userId && includeAllTeams
+              ? [
+                  {
+                    team: {
+                      deletedAt: null,
+                      teamUser: {
+                        some: {
+                          userId,
+                        },
+                      },
+                    },
+                  },
+                ]
+              : []),
           ],
         },
         include: {

From 70533e3310049270a8ac4334dabf66617813ba20 Mon Sep 17 00:00:00 2001
From: Atanas Bahchevanov <a.bahchevanov@yahoo.com>
Date: Wed, 29 May 2024 02:32:45 +0300
Subject: [PATCH 114/438] Feature: Localization - Bulgarian language

---
 src/lang/bg-BG.json | 246 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 246 insertions(+)
 create mode 100644 src/lang/bg-BG.json

diff --git a/src/lang/bg-BG.json b/src/lang/bg-BG.json
new file mode 100644
index 0000000000..42ceac35fa
--- /dev/null
+++ b/src/lang/bg-BG.json
@@ -0,0 +1,246 @@
+{
+    "label.access-code": "Код за достъп",
+    "label.actions": "Действия",
+    "label.activity-log": "Активностти",
+    "label.add": "Добави",
+    "label.add-description": "Добави описание",
+    "label.add-member": "Добави член",
+    "label.add-step": "Добави стъпка",
+    "label.add-website": "Добави уебсайт",
+    "label.admin": "Администратор",
+    "label.after": "След",
+    "label.all": "Всички",
+    "label.all-time": "За всички времена",
+    "label.analytics": "Анализи",
+    "label.average": "Средно",
+    "label.average-visit-time": "Средно време на посещение",
+    "label.back": "Назад",
+    "label.before": "Преди",
+    "label.bounce-rate": "Kоефициент на отказ",
+    "label.breakdown": "Разбивка",
+    "label.browser": "Браузър",
+    "label.browsers": "Браузъри",
+    "label.cancel": "Отмени",
+    "label.change-password": "Смени парола",
+    "label.cities": "Градове",
+    "label.city": "Град",
+    "label.clear-all": "Изчисти всички",
+    "label.confirm": "Потвърди",
+    "label.confirm-password": "Потвърди парола",
+    "label.contains": "Съдържа",
+    "label.continue": "Продължи",
+    "label.countries": "Държави",
+    "label.country": "Държава",
+    "label.create": "Създай",
+    "label.create-report": "Създай отчет",
+    "label.create-team": "Създай екип",
+    "label.create-user": "Създай потребител",
+    "label.created": "Създадено",
+    "label.created-by": "Създадено от",
+    "label.current-password": "Текуща парола",
+    "label.custom-range": "Обхват",
+    "label.dashboard": "Табло",
+    "label.data": "Данни",
+    "label.date": "Дата",
+    "label.date-range": "Диапазон от дати",
+    "label.day": "Ден",
+    "label.default-date-range": "Диапазон от дати по подразбиране",
+    "label.delete": "Изтрий",
+    "label.delete-report": "Изтрий отчет",
+    "label.delete-team": "Изтрий екип",
+    "label.delete-user": "Изтрий потребител",
+    "label.delete-website": "Изтрий уебсайт",
+    "label.description": "Описание",
+    "label.desktop": "Десктоп",
+    "label.details": "Детайли",
+    "label.device": "Устройство",
+    "label.devices": "Устройства",
+    "label.dismiss": "Отхвърли",
+    "label.does-not-contain": "Не съдържа",
+    "label.domain": "Домейн",
+    "label.dropoff": "Отпадане",
+    "label.edit": "Редактирай",
+    "label.edit-dashboard": "Редактирай табло",
+    "label.edit-member": "Редактирай член",
+    "label.enable-share-url": "Активирай Линк за споделяне",
+    "label.event": "Събитие",
+    "label.event-data": "Данни за събитие",
+    "label.events": "Събития",
+    "label.false": "Грешно",
+    "label.field": "Поле",
+    "label.fields": "Полета",
+    "label.filter": "Филтър",
+    "label.filter-combined": "Комбиниран",
+    "label.filter-raw": "Суров",
+    "label.filters": "Филтри",
+    "label.funnel": "Фуния",
+    "label.funnel-description": "Разберете процента на конверсия и отпадане на потребителите.",
+    "label.greater-than": "По-голямо от",
+    "label.greater-than-equals": "По-голямо или равно на",
+    "label.insights": "Изводи",
+    "label.insights-description": "Навлезте по-дълбоко в данните си, като използвате сегменти и филтри.",
+    "label.is": "Е",
+    "label.is-not": "Не е",
+    "label.is-not-set": "Не е зададено",
+    "label.is-set": "Зададено е",
+    "label.join": "Присъедини се",
+    "label.join-team": "Присъедини се към екип",
+    "label.language": "Език",
+    "label.languages": "Езици",
+    "label.laptop": "Лаптоп",
+    "label.last-days": "Последните {x} дни",
+    "label.last-hours": "Последните {x} часа",
+    "label.last-months": "Последните {x} месеца",
+    "label.leave": "Напусни",
+    "label.leave-team": "Напусни екип",
+    "label.less-than": "По-малко от",
+    "label.less-than-equals": "По-малко или равно на",
+    "label.login": "Вход",
+    "label.logout": "Изход",
+    "label.manage": "Управлявай",
+    "label.max": "Максимум",
+    "label.member": "Член",
+    "label.members": "Членове",
+    "label.min": "Минимум",
+    "label.mobile": "Мобилен",
+    "label.more": "Още",
+    "label.my-account": "Моят акаунт",
+    "label.my-websites": "Моите уебсайтове",
+    "label.name": "Име",
+    "label.new-password": "Нова парола",
+    "label.none": "Няма",
+    "label.number-of-records": "{x} {x, plural, един {record} други {records}}",
+    "label.ok": "Добре",
+    "label.os": "ОС",
+    "label.overview": "Общ преглед",
+    "label.owner": "Собственик",
+    "label.page-of": "Страница {current} от {total}",
+    "label.page-views": "Прегледи на страницата",
+    "label.pageTitle": "Заглавие на страница",
+    "label.pages": "Страници",
+    "label.password": "Парола",
+    "label.powered-by": "Поддържано от {name}",
+    "label.profile": "Профил",
+    "label.queries": "Запитвания",
+    "label.query": "Запитване",
+    "label.query-parameters": "Параметри на търсене",
+    "label.realtime": "В реално време",
+    "label.referrer": "Референт",
+    "label.referrers": "Референти",
+    "label.refresh": "Обнови",
+    "label.regenerate": "Регенерирай",
+    "label.region": "Регион",
+    "label.regions": "Региони",
+    "label.remove": "Премахни",
+    "label.remove-member": "Премахни член",
+    "label.reports": "Отчети",
+    "label.required": "Задължително",
+    "label.reset": "Нулирай",
+    "label.reset-website": "Нулирай уебсайт",
+    "label.retention": "Привързване",
+    "label.retention-description": "Измерете привързаността към вашия уебсайт, като проследявате колко често потребителите се връщат.",
+    "label.role": "Роля",
+    "label.run-query": "Изпълни запитване",
+    "label.save": "Запази",
+    "label.screens": "Екрани",
+    "label.search": "Търсене",
+    "label.select": "Избери",
+    "label.select-date": "Избери дата",
+    "label.select-role": "Избери роля",
+    "label.select-website": "Избери уебсайт",
+    "label.sessions": "Сесии",
+    "label.settings": "Настройки",
+    "label.share-url": "Сподели Линк",
+    "label.single-day": "Един ден",
+    "label.steps": "Стъпки",
+    "label.sum": "Сума",
+    "label.tablet": "Таблет",
+    "label.team": "Екип",
+    "label.team-id": "ID на екип",
+    "label.team-member": "Член на екипа",
+    "label.team-name": "Име на екипа",
+    "label.team-owner": "Собственик на екипа",
+    "label.team-view-only": "Видимо само за членове на екипа",
+    "label.team-websites": "Уебсайтове на екипа",
+    "label.teams": "Екипи",
+    "label.theme": "Тема",
+    "label.this-month": "Този месец",
+    "label.this-week": "Тази седмица",
+    "label.this-year": "Тази година",
+    "label.timezone": "Часова зона",
+    "label.title": "Заглавие",
+    "label.today": "Днес",
+    "label.toggle-charts": "Виж диаграми",
+    "label.total": "Общо",
+    "label.total-records": "Общо записи",
+    "label.tracking-code": "Код за проследяване",
+    "label.transfer": "Прехвърли",
+    "label.transfer-website": "Прехвърляне на уебсайт",
+    "label.true": "Вярно",
+    "label.type": "Вид",
+    "label.unique": "Уникален",
+    "label.unique-visitors": "Уникални посетители",
+    "label.unknown": "Неизвестен",
+    "label.untitled": "Без заглавие",
+    "label.update": "Актуализирай",
+    "label.url": "URL адрес",
+    "label.urls": "URL адреси",
+    "label.user": "Потребител",
+    "label.username": "Потребителско име",
+    "label.users": "Потребители",
+    "label.utm": "UTM",
+    "label.utm-description": "Следете кампаниите си чрез UTM параметри.",
+    "label.value": "Стойност",
+    "label.view": "Преглед",
+    "label.view-details": "Преглед на детайлите",
+    "label.view-only": "Само за преглед",
+    "label.views": "Прегледи",
+    "label.views-per-visit": "Прегледи на посещение",
+    "label.visitors": "Посетители",
+    "label.visits": "Посещения",
+    "label.website": "Уебсайт",
+    "label.website-id": "Идентификатор на уебсайт",
+    "label.websites": "Уебсайтове",
+    "label.window": "Прозорец",
+    "label.yesterday": "Вчера",
+    "message.action-confirmation": "Въведете {confirmation} в полето по-долу, за да потвърдите.",
+    "message.active-users": "{x} {x, plural, активен един {visitor} активни други {visitors}}",
+    "message.confirm-delete": "Сигурни ли сте, че искате да изтриете {target}?",
+    "message.confirm-leave": "Сигурни ли сте, че искате да напуснете {target}?",
+    "message.confirm-remove": "Сигурни ли сте, че искате да премахнете {target}?",
+    "message.confirm-reset": "Сигурни ли сте, че искате да нулирате {target}?",
+    "message.delete-team-warning": "Изтриването на екип ще изтрие и всички уебсайтове създадени от екипа.",
+    "message.delete-website-warning": "Всички данни за уебсайта ще бъдат изтрити.",
+    "message.error": "Възникна грешка.",
+    "message.event-log": "{event} на {url}",
+    "message.go-to-settings": "Отидете в настройките",
+    "message.incorrect-username-password": "Неправилно потребителско име и/или парола.",
+    "message.invalid-domain": "Невалиден домейн. Не включвайте http/https.",
+    "message.min-password-length": "Минимална дължина от {n} символа",
+    "message.new-version-available": "Има нова версия на Umami {version}!",
+    "message.no-data-available": "Няма налични данни.",
+    "message.no-event-data": "Няма налични данни за събитие.",
+    "message.no-match-password": "Паролите не съвпадат.",
+    "message.no-results-found": "Няма намерени резултати.",
+    "message.no-team-websites": "Този екип няма никакви уебсайтове.",
+    "message.no-teams": "Няма създадени екипи.",
+    "message.no-users": "Няма потребители.",
+    "message.no-websites-configured": "Нямате конфигурирани уебсайтове.",
+    "message.page-not-found": "Страницата не е намерена",
+    "message.reset-website": "За да нулирате този уебсайт, въведете {confirmation} в полето по-долу, за да потвърдите.",
+    "message.reset-website-warning": "Всички статистически данни за този уебсайт ще бъдат изтрити, но вашите настройки ще останат непроменени.",
+    "message.saved": "Запазено.",
+    "message.share-url": "Статистиката за вашия уебсайт е публично достъпна на следния URL адрес:",
+    "message.team-already-member": "Вече сте член на екипа.",
+    "message.team-not-found": "Екипът не е намерен.",
+    "message.team-websites-info": "Уебсайтовете могат да бъдат преглеждани от всеки член на екипа.",
+    "message.tracking-code": "За активирате проследяването на статистиката във вашият уебсайт, поставете следния код в секцията <head>...</head> намираща се в вашия HTML.",
+    "message.transfer-team-website-to-user": "Искате да прехвърлите този уебсайт към вашия акаунт?",
+    "message.transfer-user-website-to-team": "Изберете екипът на който да бъде прехвърлен уебсайта.",
+    "message.transfer-website": "Прехвърли собствеността на уебсайта към вашия акаунт или към друг екип.",
+    "message.triggered-event": "Активирано събитие",
+    "message.user-deleted": "Потребителят е изтрит.",
+    "message.viewed-page": "Страницата е видяна",
+    "message.visitor-log": "Посетител от {country}, използващ {browser} на {os} {device}",
+    "message.visitors-dropped-off": "Спад на посетителите"
+    }
\ No newline at end of file

From 7b0b11ffaa1030c9ff1a7127f6e62f8eb57aef55 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 28 May 2024 22:15:44 -0700
Subject: [PATCH 115/438] Fixed label display on metrics. Removed compare for
 all time.

---
 .../websites/[websiteId]/WebsiteChartList.tsx      |  2 +-
 .../websites/[websiteId]/WebsiteDetailsPage.tsx    |  2 +-
 .../websites/[websiteId]/WebsiteMetricsBar.tsx     | 14 +++++++++-----
 .../[websiteId]/realtime/RealtimeHeader.tsx        |  4 ----
 src/components/input/WebsiteDateFilter.tsx         | 10 ++++++++--
 src/lib/load.ts                                    |  4 ++--
 src/pages/api/send.ts                              |  1 -
 src/queries/analytics/reports/getRetention.ts      |  4 ++--
 8 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/WebsiteChartList.tsx b/src/app/(main)/websites/[websiteId]/WebsiteChartList.tsx
index 6484e38350..b4a02db799 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteChartList.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteChartList.tsx
@@ -47,7 +47,7 @@ export default function WebsiteChartList({
                 </Button>
               </Link>
             </WebsiteHeader>
-            <WebsiteMetricsBar websiteId={id} showFilter={false} />
+            <WebsiteMetricsBar websiteId={id} />
             {showCharts && <WebsiteChart websiteId={id} />}
           </div>
         ) : null;
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteDetailsPage.tsx b/src/app/(main)/websites/[websiteId]/WebsiteDetailsPage.tsx
index 2988494e7f..2439040af3 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteDetailsPage.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteDetailsPage.tsx
@@ -28,7 +28,7 @@ export default function WebsiteDetailsPage({ websiteId }: { websiteId: string })
     <WebsiteProvider websiteId={websiteId}>
       <WebsiteHeader websiteId={websiteId} showLinks={showLinks} />
       <FilterTags websiteId={websiteId} params={params} />
-      <WebsiteMetricsBar websiteId={websiteId} showChange={true} sticky={true} />
+      <WebsiteMetricsBar websiteId={websiteId} showFilter={true} showChange={true} sticky={true} />
       <WebsiteChart websiteId={websiteId} />
       {!view && <WebsiteTableView websiteId={websiteId} />}
       {view && <WebsiteExpandedView websiteId={websiteId} />}
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
index b74482a47f..15fa1a84d4 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
@@ -1,5 +1,5 @@
 import classNames from 'classnames';
-import { useMessages, useSticky } from 'components/hooks';
+import { useDateRange, useMessages, useSticky } from 'components/hooks';
 import WebsiteDateFilter from 'components/input/WebsiteDateFilter';
 import MetricCard from 'components/metrics/MetricCard';
 import MetricsBar from 'components/metrics/MetricsBar';
@@ -15,12 +15,15 @@ export function WebsiteMetricsBar({
   sticky,
   showChange = false,
   compareMode = false,
+  showFilter = false,
 }: {
   websiteId: string;
   sticky?: boolean;
   showChange?: boolean;
   compareMode?: boolean;
+  showFilter?: boolean;
 }) {
+  const { dateRange } = useDateRange(websiteId);
   const { formatMessage, labels } = useMessages();
   const dateCompare = useStore(state => state[websiteId]?.dateCompare);
   const { ref, isSticky } = useSticky({ enabled: sticky });
@@ -28,6 +31,7 @@ export function WebsiteMetricsBar({
     websiteId,
     compareMode && dateCompare,
   );
+  const isAllTime = dateRange.value === 'all';
 
   const { pageviews, visitors, visits, bounces, totaltime } = data || {};
 
@@ -97,16 +101,16 @@ export function WebsiteMetricsBar({
                 change={change}
                 formatValue={formatValue}
                 reverseColors={reverseColors}
-                showChange={compareMode || showChange}
-                showPrevious={compareMode}
+                showChange={!isAllTime && (compareMode || showChange)}
+                showPrevious={!isAllTime && compareMode}
               />
             );
           })}
         </MetricsBar>
       </div>
       <div className={styles.actions}>
-        <WebsiteFilterButton websiteId={websiteId} />
-        <WebsiteDateFilter websiteId={websiteId} />
+        {showFilter && <WebsiteFilterButton websiteId={websiteId} />}
+        <WebsiteDateFilter websiteId={websiteId} showAllTime={false} />
         {compareMode && (
           <div className={styles.vs}>
             <b>VS</b>
diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx
index cef6e7426f..2c135150bd 100644
--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx
+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx
@@ -14,25 +14,21 @@ export function RealtimeHeader({ data }: { data: RealtimeData }) {
           className={styles.card}
           label={formatMessage(labels.views)}
           value={pageviews?.length}
-          showChange
         />
         <MetricCard
           className={styles.card}
           label={formatMessage(labels.visitors)}
           value={visitors?.length}
-          showChange
         />
         <MetricCard
           className={styles.card}
           label={formatMessage(labels.events)}
           value={events?.length}
-          showChange
         />
         <MetricCard
           className={styles.card}
           label={formatMessage(labels.countries)}
           value={countries?.length}
-          showChange
         />
       </div>
     </div>
diff --git a/src/components/input/WebsiteDateFilter.tsx b/src/components/input/WebsiteDateFilter.tsx
index 4f2dee0aed..486f5de144 100644
--- a/src/components/input/WebsiteDateFilter.tsx
+++ b/src/components/input/WebsiteDateFilter.tsx
@@ -6,7 +6,13 @@ import DateFilter from './DateFilter';
 import styles from './WebsiteDateFilter.module.css';
 import { DateRange } from 'lib/types';
 
-export function WebsiteDateFilter({ websiteId }: { websiteId: string }) {
+export function WebsiteDateFilter({
+  websiteId,
+  showAllTime = true,
+}: {
+  websiteId: string;
+  showAllTime?: boolean;
+}) {
   const { dir } = useLocale();
   const { dateRange, saveDateRange } = useDateRange(websiteId);
   const { value, startDate, endDate, offset } = dateRange;
@@ -30,7 +36,7 @@ export function WebsiteDateFilter({ websiteId }: { websiteId: string }) {
         endDate={endDate}
         offset={offset}
         onChange={handleChange}
-        showAllTime={true}
+        showAllTime={showAllTime}
       />
       {value !== 'all' && !value.startsWith('range') && (
         <div className={styles.buttons}>
diff --git a/src/lib/load.ts b/src/lib/load.ts
index c0a878976f..7812ea0db2 100644
--- a/src/lib/load.ts
+++ b/src/lib/load.ts
@@ -3,7 +3,7 @@ import { Website, Session } from '@prisma/client';
 import redis from '@umami/redis-client';
 
 export async function fetchWebsite(websiteId: string): Promise<Website> {
-  let website;
+  let website = null;
 
   if (redis.enabled) {
     website = await redis.client.fetch(`website:${websiteId}`, () => getWebsite(websiteId), 86400);
@@ -19,7 +19,7 @@ export async function fetchWebsite(websiteId: string): Promise<Website> {
 }
 
 export async function fetchSession(sessionId: string): Promise<Session> {
-  let session;
+  let session = null;
 
   if (redis.enabled) {
     session = await redis.client.fetch(`session:${sessionId}`, () => getSession(sessionId), 86400);
diff --git a/src/pages/api/send.ts b/src/pages/api/send.ts
index 11ba10d741..ab565e6e70 100644
--- a/src/pages/api/send.ts
+++ b/src/pages/api/send.ts
@@ -144,7 +144,6 @@ export default async (req: NextApiRequestCollect, res: NextApiResponse) => {
         eventData: data,
         ...session,
         sessionId: session.id,
-        visitId: session.visitId,
       });
     }
 
diff --git a/src/queries/analytics/reports/getRetention.ts b/src/queries/analytics/reports/getRetention.ts
index fce7841d6f..de495cc48f 100644
--- a/src/queries/analytics/reports/getRetention.ts
+++ b/src/queries/analytics/reports/getRetention.ts
@@ -172,8 +172,8 @@ async function clickhouseQuery(
       startDate,
       endDate,
     },
-  ).then(a => {
-    return Object.values(a).map(a => {
+  ).then(result => {
+    return Object.values(result).map((a: any) => {
       return {
         date: a.date,
         day: Number(a.day),

From bb5191f30ab045f6d3a36a172a031765c2c23ab8 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Wed, 29 May 2024 22:55:21 -0700
Subject: [PATCH 116/438] Added lang bg-BG.

---
 public/intl/country/bg-BG.json  |  251 +++++
 public/intl/language/bg-BG.json |  611 +++++++++++
 public/intl/messages/bg-BG.json | 1676 +++++++++++++++++++++++++++++++
 src/lang/bg-BG.json             |  490 ++++-----
 src/lib/lang.ts                 |    2 +
 5 files changed, 2785 insertions(+), 245 deletions(-)
 create mode 100644 public/intl/country/bg-BG.json
 create mode 100644 public/intl/language/bg-BG.json
 create mode 100644 public/intl/messages/bg-BG.json

diff --git a/public/intl/country/bg-BG.json b/public/intl/country/bg-BG.json
new file mode 100644
index 0000000000..c99edb5da5
--- /dev/null
+++ b/public/intl/country/bg-BG.json
@@ -0,0 +1,251 @@
+{
+  "AU": "\u0410\u0432\u0441\u0442\u0440\u0430\u043b\u0438\u044f",
+  "AT": "\u0410\u0432\u0441\u0442\u0440\u0438\u044f",
+  "AZ": "\u0410\u0437\u0435\u0440\u0431\u0430\u0439\u0434\u0436\u0430\u043d",
+  "AL": "\u0410\u043b\u0431\u0430\u043d\u0438\u044f",
+  "DZ": "\u0410\u043b\u0436\u0438\u0440",
+  "AS": "\u0410\u043c\u0435\u0440\u0438\u043a\u0430\u043d\u0441\u043a\u0430 \u0421\u0430\u043c\u043e\u0430",
+  "VI": "\u0410\u043c\u0435\u0440\u0438\u043a\u0430\u043d\u0441\u043a\u0438 \u0412\u0438\u0440\u0434\u0436\u0438\u043d\u0441\u043a\u0438 \u043e\u0441\u0442\u0440\u043e\u0432\u0438",
+  "AO": "\u0410\u043d\u0433\u043e\u043b\u0430",
+  "AI": "\u0410\u043d\u0433\u0443\u0438\u043b\u0430",
+  "AD": "\u0410\u043d\u0434\u043e\u0440\u0430",
+  "AQ": "\u0410\u043d\u0442\u0430\u0440\u043a\u0442\u0438\u043a\u0430",
+  "AG": "\u0410\u043d\u0442\u0438\u0433\u0443\u0430 \u0438 \u0411\u0430\u0440\u0431\u0443\u0434\u0430",
+  "AR": "\u0410\u0440\u0436\u0435\u043d\u0442\u0438\u043d\u0430",
+  "AM": "\u0410\u0440\u043c\u0435\u043d\u0438\u044f",
+  "AW": "\u0410\u0440\u0443\u0431\u0430",
+  "AF": "\u0410\u0444\u0433\u0430\u043d\u0438\u0441\u0442\u0430\u043d",
+  "BD": "\u0411\u0430\u043d\u0433\u043b\u0430\u0434\u0435\u0448",
+  "BB": "\u0411\u0430\u0440\u0431\u0430\u0434\u043e\u0441",
+  "BS": "\u0411\u0430\u0445\u0430\u043c\u0441\u043a\u0438 \u043e\u0441\u0442\u0440\u043e\u0432\u0438",
+  "BH": "\u0411\u0430\u0445\u0440\u0435\u0439\u043d",
+  "BY": "\u0411\u0435\u043b\u0430\u0440\u0443\u0441",
+  "BE": "\u0411\u0435\u043b\u0433\u0438\u044f",
+  "BZ": "\u0411\u0435\u043b\u0438\u0437",
+  "BJ": "\u0411\u0435\u043d\u0438\u043d",
+  "BM": "\u0411\u0435\u0440\u043c\u0443\u0434\u0441\u043a\u0438 \u043e\u0441\u0442\u0440\u043e\u0432\u0438",
+  "BO": "\u0411\u043e\u043b\u0438\u0432\u0438\u044f",
+  "BA": "\u0411\u043e\u0441\u043d\u0430 \u0438 \u0425\u0435\u0440\u0446\u0435\u0433\u043e\u0432\u0438\u043d\u0430",
+  "BW": "\u0411\u043e\u0442\u0441\u0432\u0430\u043d\u0430",
+  "BR": "\u0411\u0440\u0430\u0437\u0438\u043b\u0438\u044f",
+  "IO": "\u0411\u0440\u0438\u0442\u0430\u043d\u0441\u043a\u0430 \u0442\u0435\u0440\u0438\u0442\u043e\u0440\u0438\u044f \u0432 \u0418\u043d\u0434\u0438\u0439\u0441\u043a\u0438\u044f \u043e\u043a\u0435\u0430\u043d",
+  "VG": "\u0411\u0440\u0438\u0442\u0430\u043d\u0441\u043a\u0438 \u0412\u0438\u0440\u0434\u0436\u0438\u043d\u0441\u043a\u0438 \u043e\u0441\u0442\u0440\u043e\u0432\u0438",
+  "BN": "\u0411\u0440\u0443\u043d\u0435\u0439 \u0414\u0430\u0440\u0443\u0441\u0441\u0430\u043b\u0430\u043c",
+  "BF": "\u0411\u0443\u0440\u043a\u0438\u043d\u0430 \u0424\u0430\u0441\u043e",
+  "BI": "\u0411\u0443\u0440\u0443\u043d\u0434\u0438",
+  "BT": "\u0411\u0443\u0442\u0430\u043d",
+  "BG": "\u0411\u044a\u043b\u0433\u0430\u0440\u0438\u044f",
+  "VU": "\u0412\u0430\u043d\u0443\u0430\u0442\u0443",
+  "VA": "\u0412\u0430\u0442\u0438\u043a\u0430\u043d",
+  "VE": "\u0412\u0435\u043d\u0435\u0446\u0443\u0435\u043b\u0430",
+  "VN": "\u0412\u0438\u0435\u0442\u043d\u0430\u043c",
+  "GA": "\u0413\u0430\u0431\u043e\u043d",
+  "GM": "\u0413\u0430\u043c\u0431\u0438\u044f",
+  "GH": "\u0413\u0430\u043d\u0430",
+  "GY": "\u0413\u0430\u044f\u043d\u0430",
+  "GP": "\u0413\u0432\u0430\u0434\u0435\u043b\u0443\u043f\u0430",
+  "GT": "\u0413\u0432\u0430\u0442\u0435\u043c\u0430\u043b\u0430",
+  "GN": "\u0413\u0432\u0438\u043d\u0435\u044f",
+  "GW": "\u0413\u0432\u0438\u043d\u0435\u044f-\u0411\u0438\u0441\u0430\u0443",
+  "DE": "\u0413\u0435\u0440\u043c\u0430\u043d\u0438\u044f",
+  "GI": "\u0413\u0438\u0431\u0440\u0430\u043b\u0442\u0430\u0440",
+  "GD": "\u0413\u0440\u0435\u043d\u0430\u0434\u0430",
+  "GL": "\u0413\u0440\u0435\u043d\u043b\u0430\u043d\u0434\u0438\u044f",
+  "GE": "\u0413\u0440\u0443\u0437\u0438\u044f",
+  "GU": "\u0413\u0443\u0430\u043c",
+  "GG": "\u0413\u044a\u0440\u043d\u0437\u0438",
+  "GR": "\u0413\u044a\u0440\u0446\u0438\u044f",
+  "DK": "\u0414\u0430\u043d\u0438\u044f",
+  "DJ": "\u0414\u0436\u0438\u0431\u0443\u0442\u0438",
+  "JE": "\u0414\u0436\u044a\u0440\u0441\u0438",
+  "DM": "\u0414\u043e\u043c\u0438\u043d\u0438\u043a\u0430",
+  "DO": "\u0414\u043e\u043c\u0438\u043d\u0438\u043a\u0430\u043d\u0441\u043a\u0430 \u0440\u0435\u043f\u0443\u0431\u043b\u0438\u043a\u0430",
+  "EG": "\u0415\u0433\u0438\u043f\u0435\u0442",
+  "EC": "\u0415\u043a\u0432\u0430\u0434\u043e\u0440",
+  "GQ": "\u0415\u043a\u0432\u0430\u0442\u043e\u0440\u0438\u0430\u043b\u043d\u0430 \u0413\u0432\u0438\u043d\u0435\u044f",
+  "ER": "\u0415\u0440\u0438\u0442\u0440\u0435\u044f",
+  "SZ": "\u0415\u0441\u0432\u0430\u0442\u0438\u043d\u0438",
+  "EE": "\u0415\u0441\u0442\u043e\u043d\u0438\u044f",
+  "ET": "\u0415\u0442\u0438\u043e\u043f\u0438\u044f",
+  "ZM": "\u0417\u0430\u043c\u0431\u0438\u044f",
+  "EH": "\u0417\u0430\u043f\u0430\u0434\u043d\u0430 \u0421\u0430\u0445\u0430\u0440\u0430",
+  "ZW": "\u0417\u0438\u043c\u0431\u0430\u0431\u0432\u0435",
+  "IL": "\u0418\u0437\u0440\u0430\u0435\u043b",
+  "TL": "\u0418\u0437\u0442\u043e\u0447\u0435\u043d \u0422\u0438\u043c\u043e\u0440",
+  "IN": "\u0418\u043d\u0434\u0438\u044f",
+  "ID": "\u0418\u043d\u0434\u043e\u043d\u0435\u0437\u0438\u044f",
+  "IQ": "\u0418\u0440\u0430\u043a",
+  "IR": "\u0418\u0440\u0430\u043d",
+  "IE": "\u0418\u0440\u043b\u0430\u043d\u0434\u0438\u044f",
+  "IS": "\u0418\u0441\u043b\u0430\u043d\u0434\u0438\u044f",
+  "ES": "\u0418\u0441\u043f\u0430\u043d\u0438\u044f",
+  "IT": "\u0418\u0442\u0430\u043b\u0438\u044f",
+  "YE": "\u0419\u0435\u043c\u0435\u043d",
+  "JO": "\u0419\u043e\u0440\u0434\u0430\u043d\u0438\u044f",
+  "CV": "\u041a\u0430\u0431\u043e \u0412\u0435\u0440\u0434\u0435",
+  "KZ": "\u041a\u0430\u0437\u0430\u0445\u0441\u0442\u0430\u043d",
+  "KY": "\u041a\u0430\u0439\u043c\u0430\u043d\u043e\u0432\u0438 \u043e\u0441\u0442\u0440\u043e\u0432\u0438",
+  "KH": "\u041a\u0430\u043c\u0431\u043e\u0434\u0436\u0430",
+  "CM": "\u041a\u0430\u043c\u0435\u0440\u0443\u043d",
+  "CA": "\u041a\u0430\u043d\u0430\u0434\u0430",
+  "BQ": "\u041a\u0430\u0440\u0438\u0431\u0441\u043a\u0430 \u041d\u0438\u0434\u0435\u0440\u043b\u0430\u043d\u0434\u0438\u044f",
+  "QA": "\u041a\u0430\u0442\u0430\u0440",
+  "KE": "\u041a\u0435\u043d\u0438\u044f",
+  "CY": "\u041a\u0438\u043f\u044a\u0440",
+  "KG": "\u041a\u0438\u0440\u0433\u0438\u0437\u0441\u0442\u0430\u043d",
+  "KI": "\u041a\u0438\u0440\u0438\u0431\u0430\u0442\u0438",
+  "CN": "\u041a\u0438\u0442\u0430\u0439",
+  "CC": "\u041a\u043e\u043a\u043e\u0441\u043e\u0432\u0438 \u043e\u0441\u0442\u0440\u043e\u0432\u0438 (\u043e\u0441\u0442\u0440\u043e\u0432\u0438 \u041a\u0438\u0439\u043b\u0438\u043d\u0433)",
+  "CO": "\u041a\u043e\u043b\u0443\u043c\u0431\u0438\u044f",
+  "KM": "\u041a\u043e\u043c\u043e\u0440\u0441\u043a\u0438 \u043e\u0441\u0442\u0440\u043e\u0432\u0438",
+  "CG": "\u041a\u043e\u043d\u0433\u043e (\u0411\u0440\u0430\u0437\u0430\u0432\u0438\u043b)",
+  "CD": "\u041a\u043e\u043d\u0433\u043e (\u041a\u0438\u043d\u0448\u0430\u0441\u0430)",
+  "CR": "\u041a\u043e\u0441\u0442\u0430 \u0420\u0438\u043a\u0430",
+  "CI": "\u041a\u043e\u0442 \u0434\u2019\u0418\u0432\u043e\u0430\u0440",
+  "CU": "\u041a\u0443\u0431\u0430",
+  "KW": "\u041a\u0443\u0432\u0435\u0439\u0442",
+  "CW": "\u041a\u044e\u0440\u0430\u0441\u0430\u043e",
+  "LA": "\u041b\u0430\u043e\u0441",
+  "LV": "\u041b\u0430\u0442\u0432\u0438\u044f",
+  "LS": "\u041b\u0435\u0441\u043e\u0442\u043e",
+  "LR": "\u041b\u0438\u0431\u0435\u0440\u0438\u044f",
+  "LY": "\u041b\u0438\u0431\u0438\u044f",
+  "LB": "\u041b\u0438\u0432\u0430\u043d",
+  "LT": "\u041b\u0438\u0442\u0432\u0430",
+  "LI": "\u041b\u0438\u0445\u0442\u0435\u043d\u0449\u0430\u0439\u043d",
+  "LU": "\u041b\u044e\u043a\u0441\u0435\u043c\u0431\u0443\u0440\u0433",
+  "MR": "\u041c\u0430\u0432\u0440\u0438\u0442\u0430\u043d\u0438\u044f",
+  "MU": "\u041c\u0430\u0432\u0440\u0438\u0446\u0438\u0439",
+  "MG": "\u041c\u0430\u0434\u0430\u0433\u0430\u0441\u043a\u0430\u0440",
+  "YT": "\u041c\u0430\u0439\u043e\u0442",
+  "MO": "\u041c\u0430\u043a\u0430\u043e, \u0421\u0410\u0420 \u043d\u0430 \u041a\u0438\u0442\u0430\u0439",
+  "MW": "\u041c\u0430\u043b\u0430\u0432\u0438",
+  "MY": "\u041c\u0430\u043b\u0430\u0439\u0437\u0438\u044f",
+  "MV": "\u041c\u0430\u043b\u0434\u0438\u0432\u0438",
+  "ML": "\u041c\u0430\u043b\u0438",
+  "MT": "\u041c\u0430\u043b\u0442\u0430",
+  "MA": "\u041c\u0430\u0440\u043e\u043a\u043e",
+  "MQ": "\u041c\u0430\u0440\u0442\u0438\u043d\u0438\u043a\u0430",
+  "MH": "\u041c\u0430\u0440\u0448\u0430\u043b\u043e\u0432\u0438 \u043e\u0441\u0442\u0440\u043e\u0432\u0438",
+  "MX": "\u041c\u0435\u043a\u0441\u0438\u043a\u043e",
+  "MM": "\u041c\u0438\u0430\u043d\u043c\u0430\u0440 (\u0411\u0438\u0440\u043c\u0430)",
+  "FM": "\u041c\u0438\u043a\u0440\u043e\u043d\u0435\u0437\u0438\u044f",
+  "MZ": "\u041c\u043e\u0437\u0430\u043c\u0431\u0438\u043a",
+  "MD": "\u041c\u043e\u043b\u0434\u043e\u0432\u0430",
+  "MC": "\u041c\u043e\u043d\u0430\u043a\u043e",
+  "MN": "\u041c\u043e\u043d\u0433\u043e\u043b\u0438\u044f",
+  "MS": "\u041c\u043e\u043d\u0442\u0441\u0435\u0440\u0430\u0442",
+  "NA": "\u041d\u0430\u043c\u0438\u0431\u0438\u044f",
+  "NR": "\u041d\u0430\u0443\u0440\u0443",
+  "NP": "\u041d\u0435\u043f\u0430\u043b",
+  "NE": "\u041d\u0438\u0433\u0435\u0440",
+  "NG": "\u041d\u0438\u0433\u0435\u0440\u0438\u044f",
+  "NL": "\u041d\u0438\u0434\u0435\u0440\u043b\u0430\u043d\u0434\u0438\u044f",
+  "NI": "\u041d\u0438\u043a\u0430\u0440\u0430\u0433\u0443\u0430",
+  "NU": "\u041d\u0438\u0443\u0435",
+  "NZ": "\u041d\u043e\u0432\u0430 \u0417\u0435\u043b\u0430\u043d\u0434\u0438\u044f",
+  "NC": "\u041d\u043e\u0432\u0430 \u041a\u0430\u043b\u0435\u0434\u043e\u043d\u0438\u044f",
+  "NO": "\u041d\u043e\u0440\u0432\u0435\u0433\u0438\u044f",
+  "AE": "\u041e\u0431\u0435\u0434\u0438\u043d\u0435\u043d\u0438 \u0430\u0440\u0430\u0431\u0441\u043a\u0438 \u0435\u043c\u0438\u0440\u0441\u0442\u0432\u0430",
+  "GB": "\u041e\u0431\u0435\u0434\u0438\u043d\u0435\u043d\u043e\u0442\u043e \u043a\u0440\u0430\u043b\u0441\u0442\u0432\u043e",
+  "AX": "\u041e\u043b\u0430\u043d\u0434\u0441\u043a\u0438 \u043e\u0441\u0442\u0440\u043e\u0432\u0438",
+  "OM": "\u041e\u043c\u0430\u043d",
+  "BV": "\u043e\u0441\u0442\u0440\u043e\u0432 \u0411\u0443\u0432\u0435",
+  "IM": "\u043e\u0441\u0442\u0440\u043e\u0432 \u041c\u0430\u043d",
+  "NF": "\u043e\u0441\u0442\u0440\u043e\u0432 \u041d\u043e\u0440\u0444\u043e\u043b\u043a",
+  "CX": "\u043e\u0441\u0442\u0440\u043e\u0432 \u0420\u043e\u0436\u0434\u0435\u0441\u0442\u0432\u043e",
+  "CK": "\u043e\u0441\u0442\u0440\u043e\u0432\u0438 \u041a\u0443\u043a",
+  "PN": "\u041e\u0441\u0442\u0440\u043e\u0432\u0438 \u041f\u0438\u0442\u043a\u0435\u0440\u043d",
+  "TC": "\u043e\u0441\u0442\u0440\u043e\u0432\u0438 \u0422\u044a\u0440\u043a\u0441 \u0438 \u041a\u0430\u0439\u043a\u043e\u0441",
+  "HM": "\u043e\u0441\u0442\u0440\u043e\u0432\u0438 \u0425\u044a\u0440\u0434 \u0438 \u041c\u0430\u043a\u0434\u043e\u043d\u0430\u043b\u0434",
+  "UM": "\u041e\u0442\u0434\u0430\u043b\u0435\u0447\u0435\u043d\u0438 \u043e\u0441\u0442\u0440\u043e\u0432\u0438 \u043d\u0430 \u0421\u0410\u0429",
+  "PK": "\u041f\u0430\u043a\u0438\u0441\u0442\u0430\u043d",
+  "PW": "\u041f\u0430\u043b\u0430\u0443",
+  "PS": "\u041f\u0430\u043b\u0435\u0441\u0442\u0438\u043d\u0441\u043a\u0438 \u0442\u0435\u0440\u0438\u0442\u043e\u0440\u0438\u0438",
+  "PA": "\u041f\u0430\u043d\u0430\u043c\u0430",
+  "PG": "\u041f\u0430\u043f\u0443\u0430-\u041d\u043e\u0432\u0430 \u0413\u0432\u0438\u043d\u0435\u044f",
+  "PY": "\u041f\u0430\u0440\u0430\u0433\u0432\u0430\u0439",
+  "PE": "\u041f\u0435\u0440\u0443",
+  "PL": "\u041f\u043e\u043b\u0448\u0430",
+  "PT": "\u041f\u043e\u0440\u0442\u0443\u0433\u0430\u043b\u0438\u044f",
+  "PR": "\u041f\u0443\u0435\u0440\u0442\u043e \u0420\u0438\u043a\u043e",
+  "RE": "\u0420\u0435\u044e\u043d\u0438\u043e\u043d",
+  "RW": "\u0420\u0443\u0430\u043d\u0434\u0430",
+  "RO": "\u0420\u0443\u043c\u044a\u043d\u0438\u044f",
+  "RU": "\u0420\u0443\u0441\u0438\u044f",
+  "SV": "\u0421\u0430\u043b\u0432\u0430\u0434\u043e\u0440",
+  "WS": "\u0421\u0430\u043c\u043e\u0430",
+  "SM": "\u0421\u0430\u043d \u041c\u0430\u0440\u0438\u043d\u043e",
+  "ST": "\u0421\u0430\u043e \u0422\u043e\u043c\u0435 \u0438 \u041f\u0440\u0438\u043d\u0441\u0438\u043f\u0438",
+  "SA": "\u0421\u0430\u0443\u0434\u0438\u0442\u0441\u043a\u0430 \u0410\u0440\u0430\u0431\u0438\u044f",
+  "SJ": "\u0421\u0432\u0430\u043b\u0431\u0430\u0440\u0434 \u0438 \u042f\u043d \u041c\u0430\u0439\u0435\u043d",
+  "SH": "\u0421\u0432\u0435\u0442\u0430 \u0415\u043b\u0435\u043d\u0430",
+  "KP": "\u0421\u0435\u0432\u0435\u0440\u043d\u0430 \u041a\u043e\u0440\u0435\u044f",
+  "MK": "\u0421\u0435\u0432\u0435\u0440\u043d\u0430 \u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0438\u044f",
+  "MP": "\u0421\u0435\u0432\u0435\u0440\u043d\u0438 \u041c\u0430\u0440\u0438\u0430\u043d\u0441\u043a\u0438 \u043e\u0441\u0442\u0440\u043e\u0432\u0438",
+  "VC": "\u0421\u0435\u0439\u043d\u0442 \u0412\u0438\u043d\u0441\u044a\u043d\u0442 \u0438 \u0413\u0440\u0435\u043d\u0430\u0434\u0438\u043d\u0438",
+  "KN": "\u0421\u0435\u0439\u043d\u0442 \u041a\u0438\u0442\u0441 \u0438 \u041d\u0435\u0432\u0438\u0441",
+  "LC": "\u0421\u0435\u0439\u043d\u0442 \u041b\u0443\u0441\u0438\u044f",
+  "SC": "\u0421\u0435\u0439\u0448\u0435\u043b\u0438",
+  "BL": "\u0421\u0435\u043d \u0411\u0430\u0440\u0442\u0435\u043b\u0435\u043c\u0438",
+  "MF": "\u0421\u0435\u043d \u041c\u0430\u0440\u0442\u0435\u043d",
+  "PM": "\u0421\u0435\u043d \u041f\u0438\u0435\u0440 \u0438 \u041c\u0438\u043a\u0435\u043b\u043e\u043d",
+  "SN": "\u0421\u0435\u043d\u0435\u0433\u0430\u043b",
+  "SL": "\u0421\u0438\u0435\u0440\u0430 \u041b\u0435\u043e\u043d\u0435",
+  "SG": "\u0421\u0438\u043d\u0433\u0430\u043f\u0443\u0440",
+  "SX": "\u0421\u0438\u043d\u0442 \u041c\u0430\u0440\u0442\u0435\u043d",
+  "SY": "\u0421\u0438\u0440\u0438\u044f",
+  "SK": "\u0421\u043b\u043e\u0432\u0430\u043a\u0438\u044f",
+  "SI": "\u0421\u043b\u043e\u0432\u0435\u043d\u0438\u044f",
+  "SB": "\u0421\u043e\u043b\u043e\u043c\u043e\u043d\u043e\u0432\u0438 \u043e\u0441\u0442\u0440\u043e\u0432\u0438",
+  "SO": "\u0421\u043e\u043c\u0430\u043b\u0438\u044f",
+  "SD": "\u0421\u0443\u0434\u0430\u043d",
+  "SR": "\u0421\u0443\u0440\u0438\u043d\u0430\u043c",
+  "US": "\u0421\u044a\u0435\u0434\u0438\u043d\u0435\u043d\u0438 \u0449\u0430\u0442\u0438",
+  "RS": "\u0421\u044a\u0440\u0431\u0438\u044f",
+  "TJ": "\u0422\u0430\u0434\u0436\u0438\u043a\u0438\u0441\u0442\u0430\u043d",
+  "TW": "\u0422\u0430\u0439\u0432\u0430\u043d",
+  "TH": "\u0422\u0430\u0439\u043b\u0430\u043d\u0434",
+  "TZ": "\u0422\u0430\u043d\u0437\u0430\u043d\u0438\u044f",
+  "TG": "\u0422\u043e\u0433\u043e",
+  "TK": "\u0422\u043e\u043a\u0435\u043b\u0430\u0443",
+  "TO": "\u0422\u043e\u043d\u0433\u0430",
+  "TT": "\u0422\u0440\u0438\u043d\u0438\u0434\u0430\u0434 \u0438 \u0422\u043e\u0431\u0430\u0433\u043e",
+  "TV": "\u0422\u0443\u0432\u0430\u043b\u0443",
+  "TN": "\u0422\u0443\u043d\u0438\u0441",
+  "TM": "\u0422\u0443\u0440\u043a\u043c\u0435\u043d\u0438\u0441\u0442\u0430\u043d",
+  "TR": "\u0422\u0443\u0440\u0446\u0438\u044f",
+  "UG": "\u0423\u0433\u0430\u043d\u0434\u0430",
+  "UZ": "\u0423\u0437\u0431\u0435\u043a\u0438\u0441\u0442\u0430\u043d",
+  "UA": "\u0423\u043a\u0440\u0430\u0439\u043d\u0430",
+  "HU": "\u0423\u043d\u0433\u0430\u0440\u0438\u044f",
+  "WF": "\u0423\u043e\u043b\u0438\u0441 \u0438 \u0424\u0443\u0442\u0443\u043d\u0430",
+  "UY": "\u0423\u0440\u0443\u0433\u0432\u0430\u0439",
+  "FO": "\u0424\u0430\u0440\u044c\u043e\u0440\u0441\u043a\u0438 \u043e\u0441\u0442\u0440\u043e\u0432\u0438",
+  "FJ": "\u0424\u0438\u0434\u0436\u0438",
+  "PH": "\u0424\u0438\u043b\u0438\u043f\u0438\u043d\u0438",
+  "FI": "\u0424\u0438\u043d\u043b\u0430\u043d\u0434\u0438\u044f",
+  "FK": "\u0424\u043e\u043b\u043a\u043b\u0430\u043d\u0434\u0441\u043a\u0438 \u043e\u0441\u0442\u0440\u043e\u0432\u0438",
+  "FR": "\u0424\u0440\u0430\u043d\u0446\u0438\u044f",
+  "GF": "\u0424\u0440\u0435\u043d\u0441\u043a\u0430 \u0413\u0432\u0438\u0430\u043d\u0430",
+  "PF": "\u0424\u0440\u0435\u043d\u0441\u043a\u0430 \u041f\u043e\u043b\u0438\u043d\u0435\u0437\u0438\u044f",
+  "TF": "\u0424\u0440\u0435\u043d\u0441\u043a\u0438 \u044e\u0436\u043d\u0438 \u0442\u0435\u0440\u0438\u0442\u043e\u0440\u0438\u0438",
+  "HT": "\u0425\u0430\u0438\u0442\u0438",
+  "HN": "\u0425\u043e\u043d\u0434\u0443\u0440\u0430\u0441",
+  "HK": "\u0425\u043e\u043d\u043a\u043e\u043d\u0433, \u0421\u0410\u0420 \u043d\u0430 \u041a\u0438\u0442\u0430\u0439",
+  "HR": "\u0425\u044a\u0440\u0432\u0430\u0442\u0438\u044f",
+  "CF": "\u0426\u0435\u043d\u0442\u0440\u0430\u043b\u043d\u043e\u0430\u0444\u0440\u0438\u043a\u0430\u043d\u0441\u043a\u0430 \u0440\u0435\u043f\u0443\u0431\u043b\u0438\u043a\u0430",
+  "TD": "\u0427\u0430\u0434",
+  "ME": "\u0427\u0435\u0440\u043d\u0430 \u0433\u043e\u0440\u0430",
+  "CZ": "\u0427\u0435\u0445\u0438\u044f",
+  "CL": "\u0427\u0438\u043b\u0438",
+  "CH": "\u0428\u0432\u0435\u0439\u0446\u0430\u0440\u0438\u044f",
+  "SE": "\u0428\u0432\u0435\u0446\u0438\u044f",
+  "LK": "\u0428\u0440\u0438 \u041b\u0430\u043d\u043a\u0430",
+  "SS": "\u042e\u0436\u0435\u043d \u0421\u0443\u0434\u0430\u043d",
+  "ZA": "\u042e\u0436\u043d\u0430 \u0410\u0444\u0440\u0438\u043a\u0430",
+  "GS": "\u042e\u0436\u043d\u0430 \u0414\u0436\u043e\u0440\u0434\u0436\u0438\u044f \u0438 \u042e\u0436\u043d\u0438 \u0421\u0430\u043d\u0434\u0432\u0438\u0447\u0435\u0432\u0438 \u043e\u0441\u0442\u0440\u043e\u0432\u0438",
+  "KR": "\u042e\u0436\u043d\u0430 \u041a\u043e\u0440\u0435\u044f",
+  "JM": "\u042f\u043c\u0430\u0439\u043a\u0430",
+  "JP": "\u042f\u043f\u043e\u043d\u0438\u044f"
+}
diff --git a/public/intl/language/bg-BG.json b/public/intl/language/bg-BG.json
new file mode 100644
index 0000000000..09ec733206
--- /dev/null
+++ b/public/intl/language/bg-BG.json
@@ -0,0 +1,611 @@
+{
+  "ab": "\u0430\u0431\u0445\u0430\u0437\u043a\u0438",
+  "awa": "\u0430\u0432\u0430\u0434\u0438",
+  "av": "\u0430\u0432\u0430\u0440\u0441\u043a\u0438",
+  "ae": "\u0430\u0432\u0435\u0441\u0442\u0441\u043a\u0438",
+  "en_AU": "\u0430\u0432\u0441\u0442\u0440\u0430\u043b\u0438\u0439\u0441\u043a\u0438 \u0430\u043d\u0433\u043b\u0438\u0439\u0441\u043a\u0438",
+  "de_AT": "\u0430\u0432\u0441\u0442\u0440\u0438\u0439\u0441\u043a\u0438 \u043d\u0435\u043c\u0441\u043a\u0438",
+  "agq": "\u0430\u0433\u0435\u043c",
+  "ada": "\u0430\u0434\u0430\u043d\u0433\u043c\u0435",
+  "ady": "\u0430\u0434\u0438\u0433\u0435",
+  "az": "\u0430\u0437\u0435\u0440\u0431\u0430\u0439\u0434\u0436\u0430\u043d\u0441\u043a\u0438",
+  "ay": "\u0430\u0439\u043c\u0430\u0440\u0430",
+  "ain": "\u0430\u0439\u043d\u0443",
+  "akk": "\u0430\u043a\u0430\u0434\u0441\u043a\u0438",
+  "ak": "\u0430\u043a\u0430\u043d",
+  "ach": "\u0430\u043a\u043e\u043b\u0438",
+  "sq": "\u0430\u043b\u0431\u0430\u043d\u0441\u043a\u0438",
+  "ale": "\u0430\u043b\u0435\u0443\u0442\u0441\u043a\u0438",
+  "en_US": "\u0430\u043c\u0435\u0440\u0438\u043a\u0430\u043d\u0441\u043a\u0438 \u0430\u043d\u0433\u043b\u0438\u0439\u0441\u043a\u0438",
+  "am": "\u0430\u043c\u0445\u0430\u0440\u0441\u043a\u0438",
+  "anp": "\u0430\u043d\u0433\u0438\u043a\u0430",
+  "en": "\u0430\u043d\u0433\u043b\u0438\u0439\u0441\u043a\u0438",
+  "ar": "\u0430\u0440\u0430\u0431\u0441\u043a\u0438",
+  "arw": "\u0430\u0440\u0430\u0432\u0430\u043a",
+  "an": "\u0430\u0440\u0430\u0433\u043e\u043d\u0441\u043a\u0438",
+  "arc": "\u0430\u0440\u0430\u043c\u0435\u0439\u0441\u043a\u0438",
+  "arp": "\u0430\u0440\u0430\u043f\u0430\u0445\u043e",
+  "hy": "\u0430\u0440\u043c\u0435\u043d\u0441\u043a\u0438",
+  "rup": "\u0430\u0440\u0443\u043c\u044a\u043d\u0441\u043a\u0438",
+  "as": "\u0430\u0441\u0430\u043c\u0441\u043a\u0438",
+  "ast": "\u0430\u0441\u0442\u0443\u0440\u0441\u043a\u0438",
+  "asa": "\u0430\u0441\u0443",
+  "cch": "\u0430\u0442\u0441\u0430\u043c",
+  "aa": "\u0430\u0444\u0430\u0440",
+  "af": "\u0430\u0444\u0440\u0438\u043a\u0430\u043d\u0441",
+  "afh": "\u0430\u0444\u0440\u0438\u0445\u0438\u043b\u0438",
+  "ace": "\u0430\u0447\u0438\u043d\u0441\u043a\u0438",
+  "ban": "\u0431\u0430\u043b\u0438\u043d\u0435\u0439\u0441\u043a\u0438",
+  "bal": "\u0431\u0430\u043b\u0443\u0447\u0438",
+  "bm": "\u0431\u0430\u043c\u0431\u0430\u0440\u0430",
+  "bas": "\u0431\u0430\u0441\u0430",
+  "eu": "\u0431\u0430\u0441\u043a\u0438",
+  "ksf": "\u0431\u0430\u0444\u0438\u044f",
+  "ba": "\u0431\u0430\u0448\u043a\u0438\u0440\u0441\u043a\u0438",
+  "zxx": "\u0431\u0435\u0437 \u043b\u0438\u043d\u0433\u0432\u0438\u0441\u0442\u0438\u0447\u043d\u043e \u0441\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435",
+  "be": "\u0431\u0435\u043b\u0430\u0440\u0443\u0441\u043a\u0438",
+  "bem": "\u0431\u0435\u043c\u0431\u0430",
+  "bez": "\u0431\u0435\u043d\u0430",
+  "bn": "\u0431\u0435\u043d\u0433\u0430\u043b\u0441\u043a\u0438",
+  "bej": "\u0431\u0435\u044f",
+  "bik": "\u0431\u0438\u043a\u043e\u043b\u0441\u043a\u0438",
+  "byn": "\u0431\u0438\u043b\u0435\u043d\u0441\u043a\u0438",
+  "bin": "\u0431\u0438\u043d\u0438",
+  "my": "\u0431\u0438\u0440\u043c\u0430\u043d\u0441\u043a\u0438",
+  "bi": "\u0431\u0438\u0441\u043b\u0430\u043c\u0430",
+  "zbl": "\u0431\u043b\u0438\u0441 \u0441\u0438\u043c\u0432\u043e\u043b\u0438",
+  "brx": "\u0431\u043e\u0434\u043e",
+  "bho": "\u0431\u043e\u0436\u043f\u0443\u0440\u0438",
+  "bs": "\u0431\u043e\u0441\u043d\u0435\u043d\u0441\u043a\u0438",
+  "bra": "\u0431\u0440\u0430\u0434\u0436",
+  "br": "\u0431\u0440\u0435\u0442\u043e\u043d\u0441\u043a\u0438",
+  "en_GB": "\u0431\u0440\u0438\u0442\u0430\u043d\u0441\u043a\u0438 \u0430\u043d\u0433\u043b\u0438\u0439\u0441\u043a\u0438",
+  "bug": "\u0431\u0443\u0433\u0438\u043d\u0441\u043a\u0438",
+  "bua": "\u0431\u0443\u0440\u044f\u0442\u0441\u043a\u0438",
+  "bg": "\u0431\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438",
+  "vai": "\u0432\u0430\u0438",
+  "wal": "\u0432\u0430\u043b\u0430\u043c\u043e",
+  "wa": "\u0432\u0430\u043b\u043e\u043d\u0441\u043a\u0438",
+  "war": "\u0432\u0430\u0440\u0430\u0439",
+  "ve": "\u0432\u0435\u043d\u0434\u0430",
+  "vi": "\u0432\u0438\u0435\u0442\u043d\u0430\u043c\u0441\u043a\u0438",
+  "vo": "\u0432\u043e\u043b\u0430\u043f\u044e\u043a",
+  "wo": "\u0432\u043e\u043b\u043e\u0444",
+  "vot": "\u0432\u043e\u0442\u0438\u043a",
+  "vun": "\u0432\u0443\u043d\u0434\u0436\u043e",
+  "gaa": "\u0433\u0430",
+  "gag": "\u0433\u0430\u0433\u0430\u0443\u0437\u043a\u0438",
+  "gay": "\u0433\u0430\u0439\u043e",
+  "gl": "\u0433\u0430\u043b\u0438\u0441\u0438\u0439\u0441\u043a\u0438",
+  "lg": "\u0433\u0430\u043d\u0434\u0430",
+  "gba": "\u0433\u0431\u0430\u044f",
+  "gwi": "\u0433\u0432\u0438\u0447\u0438\u043d",
+  "gez": "\u0433\u0438\u0438\u0437",
+  "gil": "\u0433\u0438\u043b\u0431\u0435\u0440\u0442\u0441\u043a\u0438",
+  "gon": "\u0433\u043e\u043d\u0434\u0438",
+  "hsb": "\u0433\u043e\u0440\u043d\u043e\u043b\u0443\u0436\u0438\u0448\u043a\u0438",
+  "gor": "\u0433\u043e\u0440\u043e\u043d\u0442\u0430\u043b\u043e",
+  "got": "\u0433\u043e\u0442\u0438\u0447\u0435\u0441\u043a\u0438",
+  "grb": "\u0433\u0440\u0435\u0431\u043e",
+  "kl": "\u0433\u0440\u0435\u043d\u043b\u0430\u043d\u0434\u0441\u043a\u0438",
+  "ka": "\u0433\u0440\u0443\u0437\u0438\u043d\u0441\u043a\u0438",
+  "el": "\u0433\u0440\u044a\u0446\u043a\u0438",
+  "gn": "\u0433\u0443\u0430\u0440\u0430\u043d\u0438",
+  "gu": "\u0433\u0443\u0434\u0436\u0430\u0440\u0430\u0442\u0438",
+  "guz": "\u0433\u0443\u0441\u0438\u0438",
+  "dak": "\u0434\u0430\u043a\u043e\u0442\u0441\u043a\u0438",
+  "dar": "\u0434\u0430\u0440\u0433\u0432\u0430",
+  "da": "\u0434\u0430\u0442\u0441\u043a\u0438",
+  "del": "\u0434\u0435\u043b\u0430\u0443\u0435\u0440",
+  "dje": "\u0434\u0436\u0435\u0440\u043c\u0430",
+  "dz": "\u0434\u0437\u043e\u043d\u0445\u0430",
+  "dv": "\u0434\u0438\u0432\u0435\u0445\u0438",
+  "din": "\u0434\u0438\u043d\u043a\u0430",
+  "dyo": "\u0434\u0438\u043e\u043b\u0430",
+  "dyu": "\u0434\u0438\u0443\u043b\u0430",
+  "doi": "\u0434\u043e\u0433\u0440\u0438",
+  "dgr": "\u0434\u043e\u0433\u0440\u0438\u0431",
+  "dsb": "\u0434\u043e\u043b\u043d\u043e\u043b\u0443\u0436\u0438\u0448\u043a\u0438",
+  "nds": "\u0434\u043e\u043b\u043d\u043e\u0441\u0430\u043a\u0441\u043e\u043d\u0441\u043a\u0438",
+  "grc": "\u0434\u0440\u0435\u0432\u043d\u043e\u0433\u0440\u044a\u0446\u043a\u0438",
+  "dua": "\u0434\u0443\u0430\u043b\u0430",
+  "ee": "\u0435\u0432\u0435",
+  "ewo": "\u0435\u0432\u043e\u043d\u0434\u043e",
+  "jrb": "\u0435\u0432\u0440\u0435\u0439\u0441\u043a\u043e-\u0430\u0440\u0430\u0431\u0441\u043a\u0438",
+  "jpr": "\u0435\u0432\u0440\u0435\u0439\u0441\u043a\u043e-\u043f\u0435\u0440\u0441\u0438\u0439\u0441\u043a\u0438",
+  "egy": "\u0435\u0433\u0438\u043f\u0435\u0442\u0441\u043a\u0438",
+  "eka": "\u0435\u043a\u0430\u0436\u0443\u043a",
+  "elx": "\u0435\u043b\u0430\u043c\u0438\u0442\u0441\u043a\u0438",
+  "ebu": "\u0435\u043c\u0431\u0443",
+  "myv": "\u0435\u0440\u0437\u0438\u0430",
+  "eo": "\u0435\u0441\u043f\u0435\u0440\u0430\u043d\u0442\u043e",
+  "et": "\u0435\u0441\u0442\u043e\u043d\u0441\u043a\u0438",
+  "efi": "\u0435\u0444\u0438\u043a",
+  "chn": "\u0436\u0430\u0440\u0433\u043e\u043d \u0447\u0438\u043d\u0443\u0443\u043a",
+  "kaj": "\u0436\u0436\u0438",
+  "zza": "\u0437\u0430\u0437\u0430",
+  "zap": "\u0437\u0430\u043f\u043e\u0442\u0435\u043a",
+  "zen": "\u0437\u0435\u043d\u0430\u0433\u0430",
+  "za": "\u0437\u0443\u0430\u043d\u0433",
+  "zu": "\u0437\u0443\u043b\u0443\u0441\u043a\u0438",
+  "zun": "\u0437\u0443\u043d\u0438",
+  "iba": "\u0438\u0431\u0430\u043d",
+  "he": "\u0438\u0432\u0440\u0438\u0442",
+  "ig": "\u0438\u0433\u0431\u043e",
+  "yi": "\u0438\u0434\u0438\u0448",
+  "io": "\u0438\u0434\u043e",
+  "frs": "\u0438\u0437\u0442\u043e\u0447\u0435\u043d \u0444\u0440\u0438\u0437\u0441\u043a\u0438",
+  "ilo": "\u0438\u043b\u043e\u043a\u043e",
+  "smn": "\u0438\u043d\u0430\u0440\u0438-\u0441\u0430\u0430\u043c\u0441\u043a\u0438",
+  "inh": "\u0438\u043d\u0433\u0443\u0448\u0435\u0442\u0441\u043a\u0438",
+  "id": "\u0438\u043d\u0434\u043e\u043d\u0435\u0437\u0438\u0439\u0441\u043a\u0438",
+  "ia": "\u0438\u043d\u0442\u0435\u0440\u043b\u0438\u043d\u0433\u0432\u0430",
+  "iu": "\u0438\u043d\u0443\u043a\u0442\u0438\u0442\u0443\u0442",
+  "ik": "\u0438\u043d\u0443\u043f\u0438\u0430\u043a",
+  "ga": "\u0438\u0440\u043b\u0430\u043d\u0434\u0441\u043a\u0438",
+  "is": "\u0438\u0441\u043b\u0430\u043d\u0434\u0441\u043a\u0438",
+  "es": "\u0438\u0441\u043f\u0430\u043d\u0441\u043a\u0438",
+  "it": "\u0438\u0442\u0430\u043b\u0438\u0430\u043d\u0441\u043a\u0438",
+  "yo": "\u0439\u043e\u0440\u0443\u0431\u0430",
+  "kbd": "\u043a\u0430\u0431\u0430\u0440\u0434\u0438\u0430\u043d",
+  "kab": "\u043a\u0430\u0431\u0438\u043b\u0441\u043a\u0438",
+  "kea": "\u043a\u0430\u0431\u043e\u0432\u0435\u0440\u0434\u0438\u0430\u043d\u0441\u043a\u0438",
+  "kaw": "\u043a\u0430\u0432\u0438",
+  "cad": "\u043a\u0430\u0434\u0434\u043e",
+  "kk": "\u043a\u0430\u0437\u0430\u0445\u0441\u043a\u0438",
+  "kln": "\u043a\u0430\u043b\u0435\u043d\u0434\u0436\u0438\u043d",
+  "xal": "\u043a\u0430\u043b\u043c\u0438\u043a",
+  "kam": "\u043a\u0430\u043c\u0431\u0430",
+  "en_CA": "\u043a\u0430\u043d\u0430\u0434\u0441\u043a\u0438 \u0430\u043d\u0433\u043b\u0438\u0439\u0441\u043a\u0438",
+  "fr_CA": "\u043a\u0430\u043d\u0430\u0434\u0441\u043a\u0438 \u0444\u0440\u0435\u043d\u0441\u043a\u0438",
+  "kn": "\u043a\u0430\u043d\u043d\u0430\u0434\u0430",
+  "yue": "\u043a\u0430\u043d\u0442\u043e\u043d\u0441\u043a\u0438",
+  "kr": "\u043a\u0430\u043d\u0443\u0440\u0438",
+  "kaa": "\u043a\u0430\u0440\u0430\u043a\u0430\u043b\u043f\u0430\u0448\u043a\u0438",
+  "krc": "\u043a\u0430\u0440\u0430\u0447\u0430\u0439-\u0431\u0430\u043b\u043a\u0430\u0440\u0441\u043a\u0438",
+  "krl": "\u043a\u0430\u0440\u0435\u043b\u0441\u043a\u0438",
+  "car": "\u043a\u0430\u0440\u0438\u0431\u0441\u043a\u0438",
+  "ca": "\u043a\u0430\u0442\u0430\u043b\u043e\u043d\u0441\u043a\u0438",
+  "kac": "\u043a\u0430\u0447\u0438\u043d\u0441\u043a\u0438",
+  "ks": "\u043a\u0430\u0448\u043c\u0438\u0440\u0441\u043a\u0438",
+  "csb": "\u043a\u0430\u0448\u0443\u0431\u0441\u043a\u0438",
+  "kj": "\u043a\u0432\u0430\u043d\u044f\u043c\u0430",
+  "nmg": "\u043a\u0432\u0430\u0441\u0438\u043e",
+  "qu": "\u043a\u0435\u0447\u0443\u0430",
+  "ki": "\u043a\u0438\u043a\u0443\u044e",
+  "kmb": "\u043a\u0438\u043c\u0431\u0443\u043d\u0434\u0443",
+  "rw": "\u043a\u0438\u043d\u044f\u0440\u0443\u0430\u043d\u0434\u0430",
+  "ky": "\u043a\u0438\u0440\u0433\u0438\u0437\u043a\u0438",
+  "zh": "\u043a\u0438\u0442\u0430\u0439\u0441\u043a\u0438",
+  "quc": "\u043a\u0438\u0447\u0435",
+  "nwc": "\u043a\u043b\u0430\u0441\u0438\u0447\u0435\u0441\u043a\u0438 \u043d\u0435\u0432\u0430\u0440\u0438",
+  "syc": "\u043a\u043b\u0430\u0441\u0438\u0447\u0435\u0441\u043a\u0438 \u0441\u0438\u0440\u0438\u0439\u0441\u043a\u0438",
+  "tlh": "\u043a\u043b\u0438\u043d\u0433\u043e\u043d",
+  "khq": "\u043a\u043e\u0439\u0440\u0430 \u0447\u0438\u0438\u043d\u0438",
+  "ses": "\u043a\u043e\u0439\u0440\u0430\u0431\u043e\u0440\u043e \u0441\u0435\u043d\u0438",
+  "kv": "\u041a\u043e\u043c\u0438",
+  "koi": "\u043a\u043e\u043c\u0438-\u043f\u0435\u0440\u043c\u044f\u0446\u043a\u0438",
+  "swb": "\u043a\u043e\u043c\u043e\u0440\u0441\u043a\u0438",
+  "kg": "\u043a\u043e\u043d\u0433\u043e\u0430\u043d\u0441\u043a\u0438",
+  "swc": "\u043a\u043e\u043d\u0433\u043e\u0430\u043d\u0441\u043a\u0438 \u0441\u0443\u0430\u0445\u0438\u043b\u0438",
+  "kok": "\u043a\u043e\u043d\u043a\u0430\u043d\u0438",
+  "cop": "\u043a\u043e\u043f\u0442\u0441\u043a\u0438",
+  "ko": "\u043a\u043e\u0440\u0435\u0439\u0441\u043a\u0438",
+  "kw": "\u043a\u043e\u0440\u043d\u0443\u043e\u043b\u0441\u043a\u0438",
+  "kfo": "\u043a\u043e\u0440\u043e",
+  "co": "\u043a\u043e\u0440\u0441\u0438\u043a\u0430\u043d\u0441\u043a\u0438",
+  "kos": "\u043a\u043e\u0441\u0440\u0430\u0435\u043d",
+  "kho": "\u043a\u043e\u0442\u0441\u043a\u0438",
+  "kpe": "\u043a\u043f\u0435\u043b\u0435",
+  "cr": "\u043a\u0440\u0438\u0438",
+  "mus": "\u043a\u0440\u0438\u043a",
+  "crh": "\u043a\u0440\u0438\u043c\u0441\u043a\u043e\u0442\u0430\u0442\u0430\u0440\u0441\u043a\u0438",
+  "xh": "\u043a\u0441\u043e\u0441\u0430",
+  "kum": "\u043a\u0443\u043c\u0438\u043a\u0441\u043a\u0438",
+  "kru": "\u043a\u0443\u0440\u0443\u043a",
+  "kut": "\u043a\u0443\u0442\u0435\u043d\u0430\u0439",
+  "kha": "\u043a\u0445\u0430\u0441\u0438",
+  "km": "\u043a\u0445\u043c\u0435\u0440\u0441\u043a\u0438",
+  "ku": "\u043a\u044e\u0440\u0434\u0441\u043a\u0438",
+  "ckb": "\u043a\u044e\u0440\u0434\u0441\u043a\u0438 (\u0441\u043e\u0440\u0430\u043d\u0438)",
+  "lad": "\u043b\u0430\u0434\u0438\u043d\u043e",
+  "lkt": "\u043b\u0430\u043a\u043e\u0442\u0430",
+  "lam": "\u043b\u0430\u043c\u0431\u0430",
+  "lag": "\u043b\u0430\u043d\u0433\u0438",
+  "lo": "\u043b\u0430\u043e\u0441\u043a\u0438",
+  "lv": "\u043b\u0430\u0442\u0432\u0438\u0439\u0441\u043a\u0438",
+  "la": "\u043b\u0430\u0442\u0438\u043d\u0441\u043a\u0438",
+  "lah": "\u043b\u0430\u0445\u043d\u0434\u0430",
+  "lez": "\u043b\u0435\u0437\u0433\u0438\u043d\u0441\u043a\u0438",
+  "li": "\u043b\u0438\u043c\u0431\u0443\u0440\u0433\u0441\u043a\u0438",
+  "ln": "\u043b\u0438\u043d\u0433\u0430\u043b\u0430",
+  "lt": "\u043b\u0438\u0442\u043e\u0432\u0441\u043a\u0438",
+  "jbo": "\u043b\u043e\u0434\u0436\u0431\u0430\u043d",
+  "loz": "\u043b\u043e\u0437\u0438",
+  "lu": "\u043b\u0443\u0431\u0430 \u043a\u0430\u0442\u0430\u043d\u0433\u0430",
+  "lua": "\u043b\u0443\u0431\u0430-\u043b\u0443\u043b\u0443\u0430",
+  "lui": "\u043b\u0443\u0438\u0441\u0435\u043d\u044c\u043e",
+  "smj": "\u043b\u0443\u043b\u0435-\u0441\u0430\u0430\u043c\u0441\u043a\u0438",
+  "lun": "\u043b\u0443\u043d\u0434\u0430",
+  "luo": "\u043b\u0443\u043e",
+  "lus": "\u043b\u0443\u0448\u0430\u0438",
+  "luy": "\u043b\u0443\u044f",
+  "lb": "\u043b\u044e\u043a\u0441\u0435\u043c\u0431\u0443\u0440\u0433\u0441\u043a\u0438",
+  "mag": "\u043c\u0430\u0433\u0430\u0445\u0438",
+  "mad": "\u043c\u0430\u0434\u0443\u0440\u0441\u043a\u0438",
+  "mai": "\u043c\u0430\u0439\u0442\u0445\u0438\u043b\u0438",
+  "mak": "\u043c\u0430\u043a\u0430\u0441\u0430\u0440",
+  "mk": "\u043c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438",
+  "kde": "\u043c\u0430\u043a\u043e\u043d\u0434\u0435",
+  "mgh": "\u043c\u0430\u043a\u0443\u0430 \u043c\u0435\u0442\u043e",
+  "ms": "\u043c\u0430\u043b\u0430\u0439\u0441\u043a\u0438",
+  "ml": "\u043c\u0430\u043b\u0430\u044f\u043b\u0430\u043c",
+  "mg": "\u043c\u0430\u043b\u0433\u0430\u0448\u043a\u0438",
+  "mt": "\u043c\u0430\u043b\u0442\u0438\u0439\u0441\u043a\u0438",
+  "mdr": "\u043c\u0430\u043d\u0434\u0430\u0440",
+  "man": "\u043c\u0430\u043d\u0434\u0438\u043d\u0433\u043e",
+  "mni": "\u043c\u0430\u043d\u0438\u043f\u0443\u0440\u0438",
+  "gv": "\u043c\u0430\u043d\u043a\u0441\u043a\u0438",
+  "mnc": "\u043c\u0430\u043d\u0447\u0436\u0443\u0440\u0441\u043a\u0438",
+  "mi": "\u043c\u0430\u043e\u0440\u0441\u043a\u0438",
+  "arn": "\u043c\u0430\u043f\u0443\u0447\u0435",
+  "mr": "\u043c\u0430\u0440\u0430\u0442\u0438",
+  "mwr": "\u043c\u0430\u0440\u0432\u0430\u0440\u0438",
+  "chm": "\u043c\u0430\u0440\u0438\u0439\u0441\u043a\u0438",
+  "mh": "\u043c\u0430\u0440\u0448\u0430\u043b\u0435\u0437\u0435",
+  "mas": "\u043c\u0430\u0441\u0430\u0439\u0441\u043a\u0438",
+  "jmc": "\u043c\u0430\u0447\u0430\u043c\u0435",
+  "es_MX": "\u043c\u0435\u043a\u0441\u0438\u043a\u0430\u043d\u0441\u043a\u0438 \u0438\u0441\u043f\u0430\u043d\u0441\u043a\u0438",
+  "men": "\u043c\u0435\u043d\u0434\u0435",
+  "mer": "\u043c\u0435\u0440\u0443",
+  "mgo": "\u043c\u0435\u0442\u0430",
+  "mic": "\u043c\u0438\u043a\u043c\u0430\u043a",
+  "min": "\u043c\u0438\u043d\u0430\u043d\u0433\u0431\u0430\u0443",
+  "mwl": "\u043c\u0438\u0440\u0430\u043d\u0434\u0438\u0439\u0441\u043a\u0438",
+  "mul": "\u043c\u043d\u043e\u0433\u043e\u0435\u0437\u0438\u0447\u043d\u0438",
+  "mdf": "\u043c\u043e\u043a\u0448\u0430",
+  "ro_MD": "\u043c\u043e\u043b\u0434\u043e\u0432\u0441\u043a\u0438",
+  "lol": "\u043c\u043e\u043d\u0433\u043e",
+  "mn": "\u043c\u043e\u043d\u0433\u043e\u043b\u0441\u043a\u0438",
+  "mfe": "\u043c\u043e\u0440\u0438\u0441\u0438\u0435\u043d",
+  "mos": "\u043c\u043e\u0441\u0438",
+  "moh": "\u043c\u043e\u0445\u043e\u0443\u043a",
+  "mua": "\u043c\u0443\u043d\u0434\u0430\u043d\u0433",
+  "nv": "\u043d\u0430\u0432\u0430\u0445\u043e",
+  "naq": "\u043d\u0430\u043c\u0430",
+  "na": "\u043d\u0430\u0443\u0440\u0443",
+  "jgo": "\u043d\u0433\u043e\u043c\u0431\u0430",
+  "ng": "\u043d\u0434\u043e\u043d\u0433\u0430",
+  "nap": "\u043d\u0435\u0430\u043f\u043e\u043b\u0438\u0442\u0430\u043d\u0441\u043a\u0438",
+  "new": "\u043d\u0435\u0432\u0430\u0440\u0441\u043a\u0438",
+  "de": "\u043d\u0435\u043c\u0441\u043a\u0438",
+  "und": "\u043d\u0435\u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d",
+  "ne": "\u043d\u0435\u043f\u0430\u043b\u0441\u043a\u0438",
+  "nzi": "\u043d\u0437\u0438\u043c\u0430",
+  "nym": "\u043d\u0438\u0430\u043c\u0432\u0435\u0437\u0438",
+  "nyn": "\u043d\u0438\u0430\u043d\u043a\u043e\u043b\u0435",
+  "tog": "\u043d\u0438\u0430\u043d\u0441\u0430 \u0442\u043e\u043d\u0433\u0430",
+  "nia": "\u043d\u0438\u0430\u0441",
+  "nl": "\u043d\u0438\u0434\u0435\u0440\u043b\u0430\u043d\u0434\u0441\u043a\u0438",
+  "niu": "\u043d\u0438\u0443\u0435\u0430\u043d",
+  "nqo": "\u043d\u043a\u043e",
+  "nog": "\u043d\u043e\u0433\u0430\u0438",
+  "no": "\u043d\u043e\u0440\u0432\u0435\u0436\u043a\u0438",
+  "nb": "\u043d\u043e\u0440\u0432\u0435\u0436\u043a\u0438 \u0431\u0443\u043a\u043c\u043e\u043b",
+  "nn": "\u043d\u043e\u0440\u0432\u0435\u0436\u043a\u0438 \u043d\u044e\u043d\u043e\u0448\u043a",
+  "nus": "\u043d\u0443\u0435\u0440",
+  "nyo": "\u043d\u0443\u043e\u0440\u043e",
+  "oj": "\u043e\u0434\u0436\u0438\u0431\u0432\u0430",
+  "ie": "\u043e\u043a\u0441\u0438\u0434\u0435\u043d\u0442\u0430\u043b",
+  "oc": "\u043e\u043a\u0441\u0438\u0442\u0430\u043d\u0441\u043a\u0438",
+  "zh_Hans": "\u043e\u043f\u0440\u043e\u0441\u0442\u0435\u043d \u043a\u0438\u0442\u0430\u0439\u0441\u043a\u0438",
+  "or": "\u043e\u0440\u0438\u044f",
+  "om": "\u043e\u0440\u043e\u043c\u043e",
+  "osa": "\u043e\u0441\u0435\u0434\u0436\u0438",
+  "os": "\u043e\u0441\u0435\u0442\u0441\u043a\u0438",
+  "ota": "\u043e\u0442\u043e\u043c\u0430\u043d\u0441\u043a\u0438 \u0442\u0443\u0440\u0441\u043a\u0438",
+  "pau": "\u043f\u0430\u043b\u0430\u0443\u0430\u043d",
+  "pi": "\u043f\u0430\u043b\u0438",
+  "pam": "\u043f\u0430\u043c\u043f\u0430\u043d\u0433\u0430",
+  "pag": "\u043f\u0430\u043d\u0433\u0430\u0441\u0438\u043d\u0430\u043d",
+  "pap": "\u043f\u0430\u043f\u0438\u0430\u043c\u0435\u043d\u0442\u0443",
+  "pa": "\u043f\u0435\u043d\u0434\u0436\u0430\u0431\u0441\u043a\u0438",
+  "fa": "\u043f\u0435\u0440\u0441\u0438\u0439\u0441\u043a\u0438",
+  "pal": "\u043f\u0435\u0445\u043b\u0435\u0432\u0438\u0439\u0441\u043a\u0438",
+  "pl": "\u043f\u043e\u043b\u0441\u043a\u0438",
+  "pt": "\u043f\u043e\u0440\u0442\u0443\u0433\u0430\u043b\u0441\u043a\u0438",
+  "pon": "\u043f\u043e\u0445\u043d\u043f\u0435\u0438\u0430\u043d",
+  "pro": "\u043f\u0440\u043e\u0432\u0430\u043d\u0441\u0430\u043b\u0441\u043a\u0438",
+  "ps": "\u043f\u0443\u0449\u0443",
+  "raj": "\u0440\u0430\u0434\u0436\u0430\u0441\u0442\u0430\u043d\u0441\u043a\u0438",
+  "rap": "\u0440\u0430\u043f\u0430 \u043d\u0443\u0438",
+  "rar": "\u0440\u0430\u043f\u043e\u0442\u043e\u043d\u0433\u0430\u043d",
+  "rwk": "\u0440\u0432\u0430",
+  "rm": "\u0440\u0435\u0442\u043e\u0440\u043e\u043c\u0430\u043d\u0441\u043a\u0438",
+  "rof": "\u0440\u043e\u043c\u0431\u043e",
+  "root": "\u0440\u043e\u043e\u0442",
+  "ro": "\u0440\u0443\u043c\u044a\u043d\u0441\u043a\u0438",
+  "rn": "\u0440\u0443\u043d\u0434\u0438",
+  "ru": "\u0440\u0443\u0441\u043a\u0438",
+  "sam": "\u0441\u0430\u043c\u0430\u0440\u0438\u0442\u0430\u043d\u0441\u043a\u0438 \u0430\u0440\u0430\u043c\u0435\u0439\u0441\u043a\u0438",
+  "saq": "\u0441\u0430\u043c\u0431\u0443\u0440\u0443",
+  "sm": "\u0441\u0430\u043c\u043e\u0430\u043d\u0441\u043a\u0438",
+  "sg": "\u0441\u0430\u043d\u0433\u043e",
+  "sbp": "\u0441\u0430\u043d\u0433\u0443",
+  "sad": "\u0441\u0430\u043d\u0434\u0432\u0435",
+  "sa": "\u0441\u0430\u043d\u043a\u0441\u043a\u0440\u0438\u0442\u0441\u043a\u0438",
+  "sat": "\u0441\u0430\u043d\u0442\u0430\u043b\u0438",
+  "sc": "\u0441\u0430\u0440\u0434\u0438\u043d\u0441\u043a\u0438",
+  "sas": "\u0441\u0430\u0441\u0430\u043a",
+  "ceb": "\u0441\u0435\u0431\u0443\u0430\u043d\u043e",
+  "nd": "\u0441\u0435\u0432\u0435\u0440\u0435\u043d \u043d\u0434\u0435\u0431\u0435\u043b\u0435",
+  "nso": "\u0441\u0435\u0432\u0435\u0440\u0435\u043d \u0441\u043e\u0442\u043e",
+  "frr": "\u0441\u0435\u0432\u0435\u0440\u0435\u043d \u0444\u0440\u0438\u0437\u0441\u043a\u0438",
+  "se": "\u0441\u0435\u0432\u0435\u0440\u043d\u043e\u0441\u0430\u0430\u043c\u0441\u043a\u0438",
+  "sel": "\u0441\u0435\u043b\u043a\u0443\u043f",
+  "seh": "\u0441\u0435\u043d\u0430",
+  "srr": "\u0441\u0435\u0440\u0435\u0440",
+  "st": "\u0441\u0435\u0441\u0443\u0442\u043e",
+  "sid": "\u0441\u0438\u0434\u0430\u043c\u043e",
+  "bla": "\u0441\u0438\u043a\u0441\u0438\u043a\u0430",
+  "sd": "\u0441\u0438\u043d\u0434\u0445\u0438",
+  "si": "\u0441\u0438\u043d\u0445\u0430\u043b\u0441\u043a\u0438",
+  "syr": "\u0441\u0438\u0440\u0438\u0439\u0441\u043a\u0438",
+  "scn": "\u0441\u0438\u0446\u0438\u043b\u0438\u0430\u043d\u0441\u043a\u0438",
+  "sms": "\u0441\u043a\u043e\u043b\u0442-\u0441\u0430\u0430\u043c\u0441\u043a\u0438",
+  "den": "\u0441\u043b\u0435\u0439\u0432\u0438",
+  "sk": "\u0441\u043b\u043e\u0432\u0430\u0448\u043a\u0438",
+  "sl": "\u0441\u043b\u043e\u0432\u0435\u043d\u0441\u043a\u0438",
+  "xog": "\u0441\u043e\u0433\u0430",
+  "sog": "\u0441\u043e\u0433\u0434\u0438\u0439\u0441\u043a\u0438",
+  "so": "\u0441\u043e\u043c\u0430\u043b\u0438\u0439\u0441\u043a\u0438",
+  "snk": "\u0441\u043e\u043d\u0438\u043d\u043a\u0435",
+  "srn": "\u0441\u0440\u0430\u043d\u0430\u043d \u0442\u043e\u043d\u0433\u043e",
+  "enm": "\u0441\u0440\u0435\u0434\u043d\u043e\u0432\u0435\u043a\u043e\u0432\u0435\u043d \u0430\u043d\u0433\u043b\u0438\u0439\u0441\u043a\u0438",
+  "mga": "\u0441\u0440\u0435\u0434\u043d\u043e\u0432\u0435\u043a\u043e\u0432\u0435\u043d \u0438\u0440\u043b\u0430\u043d\u0434\u0441\u043a\u0438",
+  "gmh": "\u0441\u0440\u0435\u0434\u043d\u043e\u0432\u0435\u043a\u043e\u0432\u0435\u043d \u043d\u0435\u043c\u0441\u043a\u0438",
+  "frm": "\u0441\u0440\u0435\u0434\u043d\u043e\u0432\u0435\u043a\u043e\u0432\u0435\u043d \u0444\u0440\u0435\u043d\u0441\u043a\u0438",
+  "dum": "\u0441\u0440\u0435\u0434\u043d\u043e\u0432\u0435\u043a\u043e\u0432\u0435\u043d \u0445\u043e\u043b\u0430\u043d\u0434\u0441\u043a\u0438",
+  "sr": "\u0441\u0440\u044a\u0431\u0441\u043a\u0438",
+  "zgh": "\u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u0435\u043d \u043c\u0430\u0440\u043e\u043a\u0430\u043d\u0441\u043a\u0438 \u0442\u0430\u043c\u0430\u0437\u0438\u0433\u0442",
+  "ang": "\u0441\u0442\u0430\u0440\u043e\u0430\u043d\u0433\u043b\u0438\u0439\u0441\u043a\u0438",
+  "goh": "\u0441\u0442\u0430\u0440\u043e\u0432\u0438\u0441\u043e\u043a\u043e\u043d\u0435\u043c\u0441\u043a\u0438",
+  "sga": "\u0441\u0442\u0430\u0440\u043e\u0438\u0440\u043b\u0430\u043d\u0434\u0441\u043a\u0438",
+  "non": "\u0441\u0442\u0430\u0440\u043e\u043d\u043e\u0440\u0432\u0435\u0436\u0441\u043a\u0438",
+  "peo": "\u0441\u0442\u0430\u0440\u043e\u043f\u0435\u0440\u0441\u0438\u0439\u0441\u043a\u0438",
+  "fro": "\u0441\u0442\u0430\u0440\u043e\u0444\u0440\u0435\u043d\u0441\u043a\u0438",
+  "ss": "\u0441\u0443\u0430\u0437\u0438",
+  "sw": "\u0441\u0443\u0430\u0445\u0438\u043b\u0438",
+  "suk": "\u0441\u0443\u043a\u0443\u043c\u0430",
+  "su": "\u0441\u0443\u043d\u0434\u0430\u043d\u0441\u043a\u0438",
+  "sus": "\u0441\u0443\u0441\u0443",
+  "ar_001": "\u0441\u044a\u0432\u0440\u0435\u043c\u0435\u043d\u0435\u043d \u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u0435\u043d \u0430\u0440\u0430\u0431\u0441\u043a\u0438",
+  "sh": "\u0441\u044a\u0440\u0431\u043e\u0445\u044a\u0440\u0432\u0430\u0442\u0441\u043a\u0438",
+  "ii": "\u0441\u044a\u0447\u0443\u0430\u043d\u0441\u043a\u0438 \u0438",
+  "tl": "\u0442\u0430\u0433\u0430\u043b\u043e\u0433",
+  "tg": "\u0442\u0430\u0434\u0436\u0438\u043a\u0441\u043a\u0438",
+  "dav": "\u0442\u0430\u0438\u0442\u0430",
+  "ty": "\u0442\u0430\u0438\u0442\u044f\u043d\u0441\u043a\u0438",
+  "th": "\u0442\u0430\u0439\u0441\u043a\u0438",
+  "tmh": "\u0442\u0430\u043c\u0430\u0448\u0435\u043a",
+  "ta": "\u0442\u0430\u043c\u0438\u043b\u0441\u043a\u0438",
+  "twq": "\u0442\u0430\u0441\u0430\u0432\u0430\u043a",
+  "tt": "\u0442\u0430\u0442\u0430\u0440\u0441\u043a\u0438",
+  "shi": "\u0442\u0430\u0448\u0435\u043b\u0445\u0438\u0442",
+  "te": "\u0442\u0435\u043b\u0443\u0433\u0443",
+  "tem": "\u0442\u0435\u043c\u043d\u0435",
+  "ter": "\u0442\u0435\u0440\u0435\u043d\u043e",
+  "teo": "\u0442\u0435\u0441\u043e",
+  "tet": "\u0442\u0435\u0442\u0443\u043c",
+  "bo": "\u0442\u0438\u0431\u0435\u0442\u0441\u043a\u0438",
+  "tiv": "\u0442\u0438\u0432",
+  "tig": "\u0442\u0438\u0433\u0440\u0435",
+  "ti": "\u0442\u0438\u0433\u0440\u0438\u043d\u044f",
+  "tli": "\u0442\u043b\u0438\u043d\u0433\u0438\u0442",
+  "tpi": "\u0442\u043e\u043a \u043f\u0438\u0441\u0438\u043d",
+  "tkl": "\u0442\u043e\u043a\u0435\u043b\u0430\u0439\u0441\u043a\u0438",
+  "to": "\u0442\u043e\u043d\u0433\u0430",
+  "zh_Hant": "\u0442\u0440\u0430\u0434\u0438\u0446\u0438\u043e\u043d\u0435\u043d \u043a\u0438\u0442\u0430\u0439\u0441\u043a\u0438",
+  "tn": "\u0442\u0441\u0432\u0430\u043d\u0430",
+  "ts": "\u0442\u0441\u043e\u043d\u0433\u0430",
+  "kcg": "\u0442\u0443\u0430\u043f",
+  "tvl": "\u0442\u0443\u0432\u0430\u043b\u0443\u0430\u043d\u0441\u043a\u0438",
+  "tyv": "\u0442\u0443\u0432\u0438\u043d\u0441\u043a\u0438",
+  "tw": "\u0442\u0443\u0438",
+  "tum": "\u0442\u0443\u043c\u0431\u0443\u043a\u0430",
+  "tk": "\u0442\u0443\u0440\u043a\u043c\u0435\u043d\u0441\u043a\u0438",
+  "tr": "\u0442\u0443\u0440\u0441\u043a\u0438",
+  "was": "\u0443\u0430\u0448\u043e",
+  "uga": "\u0443\u0433\u0430\u0440\u0438\u0442\u0441\u043a\u0438",
+  "udm": "\u0443\u0434\u043c\u0443\u0440\u0442\u0441\u043a\u0438",
+  "cy": "\u0443\u0435\u043b\u0441\u043a\u0438",
+  "uz": "\u0443\u0437\u0431\u0435\u043a\u0441\u043a\u0438",
+  "ug": "\u0443\u0439\u0433\u0443\u0440\u0441\u043a\u0438",
+  "uk": "\u0443\u043a\u0440\u0430\u0438\u043d\u0441\u043a\u0438",
+  "umb": "\u0443\u043c\u0431\u0443\u043d\u0434\u0443",
+  "hu": "\u0443\u043d\u0433\u0430\u0440\u0441\u043a\u0438",
+  "ur": "\u0443\u0440\u0434\u0443",
+  "fan": "\u0444\u0430\u043d\u0433",
+  "fat": "\u0444\u0430\u043d\u0442\u0438",
+  "fo": "\u0444\u0430\u0440\u044c\u043e\u0440\u0441\u043a\u0438",
+  "fj": "\u0444\u0438\u0434\u0436\u0438\u0439\u0441\u043a\u0438",
+  "fil": "\u0444\u0438\u043b\u0438\u043f\u0438\u043d\u0441\u043a\u0438",
+  "phn": "\u0444\u0438\u043d\u0438\u043a\u0438\u0439\u0441\u043a\u0438",
+  "fi": "\u0444\u0438\u043d\u0441\u043a\u0438",
+  "nl_BE": "\u0444\u043b\u0430\u043c\u0430\u043d\u0434\u0441\u043a\u0438",
+  "fon": "\u0444\u043e\u043d",
+  "fr": "\u0444\u0440\u0435\u043d\u0441\u043a\u0438",
+  "fy": "\u0444\u0440\u0438\u0437\u0438\u0439\u0441\u043a\u0438",
+  "fur": "\u0444\u0440\u0438\u0443\u043b\u0438\u0430\u043d\u0441\u043a\u0438",
+  "ff": "\u0444\u0443\u043b\u0430",
+  "haw": "\u0445\u0430\u0432\u0430\u0439\u0441\u043a\u0438",
+  "ht": "\u0445\u0430\u0438\u0442\u044f\u043d\u0441\u043a\u0438",
+  "hai": "\u0445\u0430\u0439\u0434\u0430",
+  "ha": "\u0445\u0430\u0443\u0437\u0430",
+  "hz": "\u0445\u0435\u0440\u0435\u0440\u043e",
+  "hil": "\u0445\u0438\u043b\u0438\u0433\u0430\u0439\u043d\u043e\u043d",
+  "hi": "\u0445\u0438\u043d\u0434\u0438",
+  "ho": "\u0445\u0438\u0440\u0438 \u043c\u043e\u0442\u0443",
+  "hit": "\u0445\u0438\u0442\u0441\u043a\u0438",
+  "hmn": "\u0445\u043c\u043e\u043d\u0433",
+  "hup": "\u0445\u0443\u043f\u0430",
+  "hr": "\u0445\u044a\u0440\u0432\u0430\u0442\u0441\u043a\u0438",
+  "tzm": "\u0446\u0435\u043d\u0442\u0440\u0430\u043b\u043d\u043e\u0430\u0442\u043b\u0430\u0441\u043a\u0438 \u0442\u0430\u043c\u0430\u0437\u0438\u0433\u0442",
+  "rom": "\u0446\u0438\u0433\u0430\u043d\u0441\u043a\u0438 \u0435\u0437\u0438\u043a",
+  "tsi": "\u0446\u0438\u043c\u0448\u0438\u0430\u043d\u0441\u043a\u0438",
+  "cu": "\u0446\u044a\u0440\u043a\u043e\u0432\u043d\u043e \u0441\u043b\u0430\u0432\u044f\u043d\u0441\u043a\u0438",
+  "chg": "\u0447\u0430\u0433\u0430\u0442\u0430\u0439",
+  "ch": "\u0447\u0430\u043c\u043e\u0440\u043e",
+  "chy": "\u0447\u0435\u0439\u0435\u043d\u0441\u043a\u0438",
+  "chr": "\u0447\u0435\u0440\u043e\u043a\u0438",
+  "ce": "\u0447\u0435\u0447\u0435\u043d\u0441\u043a\u0438",
+  "cs": "\u0447\u0435\u0448\u043a\u0438",
+  "chb": "\u0447\u0438\u0431\u0447\u0430",
+  "cgg": "\u0447\u0438\u0433\u0430",
+  "chp": "\u0447\u0438\u0438\u043f\u0443\u0432\u0441\u043a\u0438",
+  "ny": "\u0447\u0438\u043d\u044f\u043d\u0434\u0436\u0430",
+  "cho": "\u0447\u043e\u043a\u0442\u043e",
+  "cv": "\u0447\u0443\u0432\u0430\u0448\u043a\u0438",
+  "chk": "\u0447\u0443\u0443\u043a",
+  "ksb": "\u0448\u0430\u043c\u0431\u0430\u043b\u0430",
+  "shn": "\u0448\u0430\u043d",
+  "sv": "\u0448\u0432\u0435\u0434\u0441\u043a\u0438",
+  "de_CH": "\u0448\u0432\u0435\u0439\u0446\u0430\u0440\u0441\u043a\u0438 \u0433\u043e\u0440\u043d\u043e\u0433\u0435\u0440\u043c\u0430\u043d\u0441\u043a\u0438",
+  "gsw": "\u0448\u0432\u0435\u0439\u0446\u0430\u0440\u0441\u043a\u0438 \u043d\u0435\u043c\u0441\u043a\u0438",
+  "fr_CH": "\u0448\u0432\u0435\u0439\u0446\u0430\u0440\u0441\u043a\u0438 \u0444\u0440\u0435\u043d\u0441\u043a\u0438",
+  "sn": "\u0448\u043e\u043d\u0430",
+  "sco": "\u0448\u043e\u0442\u043b\u0430\u043d\u0434\u0441\u043a\u0438",
+  "gd": "\u0448\u043e\u0442\u043b\u0430\u043d\u0434\u0441\u043a\u0438 \u0433\u0430\u043b\u0441\u043a\u0438",
+  "sux": "\u0448\u0443\u043c\u0435\u0440\u0441\u043a\u0438",
+  "nr": "\u044e\u0436\u0435\u043d \u043d\u0434\u0435\u0431\u0435\u043b\u0435",
+  "alt": "\u044e\u0436\u043d\u043e\u0430\u043b\u0442\u0430\u0439\u0441\u043a\u0438",
+  "sma": "\u044e\u0436\u043d\u043e\u0441\u0430\u0430\u043c\u0441\u043a\u0438",
+  "jv": "\u044f\u0432\u0430\u043d\u0441\u043a\u0438",
+  "sah": "\u044f\u043a\u0443\u0442\u0441\u043a\u0438",
+  "yao": "\u044f\u043e",
+  "yap": "\u044f\u043f\u0435\u0437\u0435",
+  "ja": "\u044f\u043f\u043e\u043d\u0441\u043a\u0438",
+  "bss": "Akoose",
+  "akz": "Alabama",
+  "arq": "Algerian Arabic",
+  "ase": "American Sign Language",
+  "njo": "Ao Naga",
+  "aro": "Araona",
+  "frp": "Arpitan",
+  "bfq": "Badaga",
+  "bfd": "Bafut",
+  "bqi": "Bakhtiari",
+  "bax": "Bamun",
+  "bjn": "Banjar",
+  "bbc": "Batak Toba",
+  "bar": "Bavarian",
+  "bew": "Betawi",
+  "bpy": "Bishnupriya",
+  "brh": "Brahui",
+  "pt_BR": "Brazilian Portuguese",
+  "bum": "Bulu",
+  "frc": "Cajun French",
+  "cps": "Capiznon",
+  "cay": "Cayuga",
+  "dtp": "Central Dusun",
+  "esu": "Central Yupik",
+  "shu": "Chadian Arabic",
+  "qug": "Chimborazo Highland Quichua",
+  "ksh": "Colognian",
+  "dzg": "Dazaga",
+  "arz": "Egyptian Arabic",
+  "egl": "Emilian",
+  "pt_PT": "European Portuguese",
+  "es_ES": "European Spanish",
+  "ext": "Extremaduran",
+  "hif": "Fiji Hindi",
+  "gur": "Frafra",
+  "gan": "Gan Chinese",
+  "aln": "Gheg Albanian",
+  "bbj": "Ghomala",
+  "glk": "Gilaki",
+  "gom": "Goan Konkani",
+  "hak": "Hakka Chinese",
+  "ibb": "Ibibio",
+  "izh": "Ingrian",
+  "jam": "Jamaican Creole English",
+  "jut": "Jutish",
+  "kgp": "Kaingang",
+  "kkj": "Kako",
+  "kbl": "Kanembu",
+  "ken": "Kenyang",
+  "khw": "Khowar",
+  "krj": "Kinaray-a",
+  "kiu": "Kirmanjki",
+  "bkm": "Kom",
+  "avk": "Kotava",
+  "kri": "Krio",
+  "ltg": "Latgalian",
+  "es_419": "Latin American Spanish",
+  "lzz": "Laz",
+  "lij": "Ligurian",
+  "lfn": "Lingua Franca Nova",
+  "lzh": "Literary Chinese",
+  "liv": "Livonian",
+  "lmo": "Lombard",
+  "sli": "Lower Silesian",
+  "mde": "Maba",
+  "maf": "Mafa",
+  "vmf": "Main-Franconian",
+  "mzn": "Mazanderani",
+  "byv": "Medumba",
+  "mwv": "Mentawai",
+  "nan": "Min Nan Chinese",
+  "xmf": "Mingrelian",
+  "ary": "Moroccan Arabic",
+  "ttt": "Muslim Tat",
+  "mye": "Myene",
+  "sba": "Ngambay",
+  "nnh": "Ngiemboon",
+  "yrl": "Nheengatu",
+  "nov": "Novial",
+  "pfl": "Palatine German",
+  "pdc": "Pennsylvania German",
+  "pcd": "Picard",
+  "pms": "Piedmontese",
+  "pdt": "Plautdietsch",
+  "pnt": "Pontic",
+  "prg": "Prussian",
+  "rif": "Riffian",
+  "rgn": "Romagnol",
+  "rtm": "Rotuman",
+  "rug": "Roviana",
+  "rue": "Rusyn",
+  "ssy": "Saho",
+  "sgs": "Samogitian",
+  "sdc": "Sassarese Sardinian",
+  "stq": "Saterland Frisian",
+  "saz": "Saurashtra",
+  "sly": "Selayar",
+  "see": "Seneca",
+  "sei": "Seri",
+  "szl": "Silesian",
+  "azb": "South Azerbaijani",
+  "tly": "Talysh",
+  "trv": "Taroko",
+  "fit": "Tornedalen Finnish",
+  "tkr": "Tsakhur",
+  "tsd": "Tsakonian",
+  "tcy": "Tulu",
+  "aeb": "Tunisian Arabic",
+  "tru": "Turoyo",
+  "vec": "Venetian",
+  "vep": "Veps",
+  "vro": "V\u00f5ro",
+  "wae": "Walser",
+  "wbp": "Warlpiri",
+  "guc": "Wayuu",
+  "vls": "West Flemish",
+  "mrj": "Western Mari",
+  "wuu": "Wu Chinese",
+  "hsn": "Xiang Chinese",
+  "yav": "Yangben",
+  "ybb": "Yemba",
+  "zea": "Zeelandic",
+  "gbz": "Zoroastrian Dari"
+}
diff --git a/public/intl/messages/bg-BG.json b/public/intl/messages/bg-BG.json
new file mode 100644
index 0000000000..d2bd50f80e
--- /dev/null
+++ b/public/intl/messages/bg-BG.json
@@ -0,0 +1,1676 @@
+{
+  "label.access-code": [
+    {
+      "type": 0,
+      "value": "Код за достъп"
+    }
+  ],
+  "label.actions": [
+    {
+      "type": 0,
+      "value": "Действия"
+    }
+  ],
+  "label.activity-log": [
+    {
+      "type": 0,
+      "value": "Активностти"
+    }
+  ],
+  "label.add": [
+    {
+      "type": 0,
+      "value": "Добави"
+    }
+  ],
+  "label.add-description": [
+    {
+      "type": 0,
+      "value": "Добави описание"
+    }
+  ],
+  "label.add-member": [
+    {
+      "type": 0,
+      "value": "Добави член"
+    }
+  ],
+  "label.add-step": [
+    {
+      "type": 0,
+      "value": "Добави стъпка"
+    }
+  ],
+  "label.add-website": [
+    {
+      "type": 0,
+      "value": "Добави уебсайт"
+    }
+  ],
+  "label.admin": [
+    {
+      "type": 0,
+      "value": "Администратор"
+    }
+  ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "След"
+    }
+  ],
+  "label.all": [
+    {
+      "type": 0,
+      "value": "Всички"
+    }
+  ],
+  "label.all-time": [
+    {
+      "type": 0,
+      "value": "За всички времена"
+    }
+  ],
+  "label.analytics": [
+    {
+      "type": 0,
+      "value": "Анализи"
+    }
+  ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Средно"
+    }
+  ],
+  "label.average-visit-time": [
+    {
+      "type": 0,
+      "value": "Средно време на посещение"
+    }
+  ],
+  "label.back": [
+    {
+      "type": 0,
+      "value": "Назад"
+    }
+  ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Преди"
+    }
+  ],
+  "label.bounce-rate": [
+    {
+      "type": 0,
+      "value": "Kоефициент на отказ"
+    }
+  ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Разбивка"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Браузър"
+    }
+  ],
+  "label.browsers": [
+    {
+      "type": 0,
+      "value": "Браузъри"
+    }
+  ],
+  "label.cancel": [
+    {
+      "type": 0,
+      "value": "Отмени"
+    }
+  ],
+  "label.change-password": [
+    {
+      "type": 0,
+      "value": "Смени парола"
+    }
+  ],
+  "label.cities": [
+    {
+      "type": 0,
+      "value": "Градове"
+    }
+  ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "Град"
+    }
+  ],
+  "label.clear-all": [
+    {
+      "type": 0,
+      "value": "Изчисти всички"
+    }
+  ],
+  "label.confirm": [
+    {
+      "type": 0,
+      "value": "Потвърди"
+    }
+  ],
+  "label.confirm-password": [
+    {
+      "type": 0,
+      "value": "Потвърди парола"
+    }
+  ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Съдържа"
+    }
+  ],
+  "label.continue": [
+    {
+      "type": 0,
+      "value": "Продължи"
+    }
+  ],
+  "label.countries": [
+    {
+      "type": 0,
+      "value": "Държави"
+    }
+  ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Държава"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Създай"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Създай отчет"
+    }
+  ],
+  "label.create-team": [
+    {
+      "type": 0,
+      "value": "Създай екип"
+    }
+  ],
+  "label.create-user": [
+    {
+      "type": 0,
+      "value": "Създай потребител"
+    }
+  ],
+  "label.created": [
+    {
+      "type": 0,
+      "value": "Създадено"
+    }
+  ],
+  "label.created-by": [
+    {
+      "type": 0,
+      "value": "Създадено от"
+    }
+  ],
+  "label.current-password": [
+    {
+      "type": 0,
+      "value": "Текуща парола"
+    }
+  ],
+  "label.custom-range": [
+    {
+      "type": 0,
+      "value": "Обхват"
+    }
+  ],
+  "label.dashboard": [
+    {
+      "type": 0,
+      "value": "Табло"
+    }
+  ],
+  "label.data": [
+    {
+      "type": 0,
+      "value": "Данни"
+    }
+  ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Дата"
+    }
+  ],
+  "label.date-range": [
+    {
+      "type": 0,
+      "value": "Диапазон от дати"
+    }
+  ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Ден"
+    }
+  ],
+  "label.default-date-range": [
+    {
+      "type": 0,
+      "value": "Диапазон от дати по подразбиране"
+    }
+  ],
+  "label.delete": [
+    {
+      "type": 0,
+      "value": "Изтрий"
+    }
+  ],
+  "label.delete-report": [
+    {
+      "type": 0,
+      "value": "Изтрий отчет"
+    }
+  ],
+  "label.delete-team": [
+    {
+      "type": 0,
+      "value": "Изтрий екип"
+    }
+  ],
+  "label.delete-user": [
+    {
+      "type": 0,
+      "value": "Изтрий потребител"
+    }
+  ],
+  "label.delete-website": [
+    {
+      "type": 0,
+      "value": "Изтрий уебсайт"
+    }
+  ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Описание"
+    }
+  ],
+  "label.desktop": [
+    {
+      "type": 0,
+      "value": "Десктоп"
+    }
+  ],
+  "label.details": [
+    {
+      "type": 0,
+      "value": "Детайли"
+    }
+  ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Устройство"
+    }
+  ],
+  "label.devices": [
+    {
+      "type": 0,
+      "value": "Устройства"
+    }
+  ],
+  "label.dismiss": [
+    {
+      "type": 0,
+      "value": "Отхвърли"
+    }
+  ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Не съдържа"
+    }
+  ],
+  "label.domain": [
+    {
+      "type": 0,
+      "value": "Домейн"
+    }
+  ],
+  "label.dropoff": [
+    {
+      "type": 0,
+      "value": "Отпадане"
+    }
+  ],
+  "label.edit": [
+    {
+      "type": 0,
+      "value": "Редактирай"
+    }
+  ],
+  "label.edit-dashboard": [
+    {
+      "type": 0,
+      "value": "Редактирай табло"
+    }
+  ],
+  "label.edit-member": [
+    {
+      "type": 0,
+      "value": "Редактирай член"
+    }
+  ],
+  "label.enable-share-url": [
+    {
+      "type": 0,
+      "value": "Активирай Линк за споделяне"
+    }
+  ],
+  "label.event": [
+    {
+      "type": 0,
+      "value": "Събитие"
+    }
+  ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Данни за събитие"
+    }
+  ],
+  "label.events": [
+    {
+      "type": 0,
+      "value": "Събития"
+    }
+  ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "Грешно"
+    }
+  ],
+  "label.field": [
+    {
+      "type": 0,
+      "value": "Поле"
+    }
+  ],
+  "label.fields": [
+    {
+      "type": 0,
+      "value": "Полета"
+    }
+  ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Филтър"
+    }
+  ],
+  "label.filter-combined": [
+    {
+      "type": 0,
+      "value": "Комбиниран"
+    }
+  ],
+  "label.filter-raw": [
+    {
+      "type": 0,
+      "value": "Суров"
+    }
+  ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Филтри"
+    }
+  ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Фуния"
+    }
+  ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Разберете процента на конверсия и отпадане на потребителите."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "По-голямо от"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "По-голямо или равно на"
+    }
+  ],
+  "label.insights": [
+    {
+      "type": 0,
+      "value": "Изводи"
+    }
+  ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Навлезте по-дълбоко в данните си, като използвате сегменти и филтри."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Е"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Не е"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Не е зададено"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Зададено е"
+    }
+  ],
+  "label.join": [
+    {
+      "type": 0,
+      "value": "Присъедини се"
+    }
+  ],
+  "label.join-team": [
+    {
+      "type": 0,
+      "value": "Присъедини се към екип"
+    }
+  ],
+  "label.language": [
+    {
+      "type": 0,
+      "value": "Език"
+    }
+  ],
+  "label.languages": [
+    {
+      "type": 0,
+      "value": "Езици"
+    }
+  ],
+  "label.laptop": [
+    {
+      "type": 0,
+      "value": "Лаптоп"
+    }
+  ],
+  "label.last-days": [
+    {
+      "type": 0,
+      "value": "Последните "
+    },
+    {
+      "type": 1,
+      "value": "x"
+    },
+    {
+      "type": 0,
+      "value": " дни"
+    }
+  ],
+  "label.last-hours": [
+    {
+      "type": 0,
+      "value": "Последните "
+    },
+    {
+      "type": 1,
+      "value": "x"
+    },
+    {
+      "type": 0,
+      "value": " часа"
+    }
+  ],
+  "label.last-months": [
+    {
+      "type": 0,
+      "value": "Последните "
+    },
+    {
+      "type": 1,
+      "value": "x"
+    },
+    {
+      "type": 0,
+      "value": " месеца"
+    }
+  ],
+  "label.leave": [
+    {
+      "type": 0,
+      "value": "Напусни"
+    }
+  ],
+  "label.leave-team": [
+    {
+      "type": 0,
+      "value": "Напусни екип"
+    }
+  ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "По-малко от"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "По-малко или равно на"
+    }
+  ],
+  "label.login": [
+    {
+      "type": 0,
+      "value": "Вход"
+    }
+  ],
+  "label.logout": [
+    {
+      "type": 0,
+      "value": "Изход"
+    }
+  ],
+  "label.manage": [
+    {
+      "type": 0,
+      "value": "Управлявай"
+    }
+  ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Максимум"
+    }
+  ],
+  "label.member": [
+    {
+      "type": 0,
+      "value": "Член"
+    }
+  ],
+  "label.members": [
+    {
+      "type": 0,
+      "value": "Членове"
+    }
+  ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Минимум"
+    }
+  ],
+  "label.mobile": [
+    {
+      "type": 0,
+      "value": "Мобилен"
+    }
+  ],
+  "label.more": [
+    {
+      "type": 0,
+      "value": "Още"
+    }
+  ],
+  "label.my-account": [
+    {
+      "type": 0,
+      "value": "Моят акаунт"
+    }
+  ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "Моите уебсайтове"
+    }
+  ],
+  "label.name": [
+    {
+      "type": 0,
+      "value": "Име"
+    }
+  ],
+  "label.new-password": [
+    {
+      "type": 0,
+      "value": "Нова парола"
+    }
+  ],
+  "label.none": [
+    {
+      "type": 0,
+      "value": "Няма"
+    }
+  ],
+  "label.number-of-records": [
+    {
+      "type": 1,
+      "value": "x"
+    },
+    {
+      "type": 0,
+      "value": " "
+    },
+    {
+      "offset": 0,
+      "options": {
+        "one": {
+          "value": [
+            {
+              "type": 0,
+              "value": "един"
+            }
+          ]
+        },
+        "other": {
+          "value": [
+            {
+              "type": 0,
+              "value": "други"
+            }
+          ]
+        }
+      },
+      "pluralType": "cardinal",
+      "type": 6,
+      "value": "x"
+    }
+  ],
+  "label.ok": [
+    {
+      "type": 0,
+      "value": "Добре"
+    }
+  ],
+  "label.os": [
+    {
+      "type": 0,
+      "value": "ОС"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Общ преглед"
+    }
+  ],
+  "label.owner": [
+    {
+      "type": 0,
+      "value": "Собственик"
+    }
+  ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Страница "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " от "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
+  "label.page-views": [
+    {
+      "type": 0,
+      "value": "Прегледи на страницата"
+    }
+  ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Заглавие на страница"
+    }
+  ],
+  "label.pages": [
+    {
+      "type": 0,
+      "value": "Страници"
+    }
+  ],
+  "label.password": [
+    {
+      "type": 0,
+      "value": "Парола"
+    }
+  ],
+  "label.powered-by": [
+    {
+      "type": 0,
+      "value": "Поддържано от "
+    },
+    {
+      "type": 1,
+      "value": "name"
+    }
+  ],
+  "label.profile": [
+    {
+      "type": 0,
+      "value": "Профил"
+    }
+  ],
+  "label.queries": [
+    {
+      "type": 0,
+      "value": "Запитвания"
+    }
+  ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Запитване"
+    }
+  ],
+  "label.query-parameters": [
+    {
+      "type": 0,
+      "value": "Параметри на търсене"
+    }
+  ],
+  "label.realtime": [
+    {
+      "type": 0,
+      "value": "В реално време"
+    }
+  ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Референт"
+    }
+  ],
+  "label.referrers": [
+    {
+      "type": 0,
+      "value": "Референти"
+    }
+  ],
+  "label.refresh": [
+    {
+      "type": 0,
+      "value": "Обнови"
+    }
+  ],
+  "label.regenerate": [
+    {
+      "type": 0,
+      "value": "Регенерирай"
+    }
+  ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Регион"
+    }
+  ],
+  "label.regions": [
+    {
+      "type": 0,
+      "value": "Региони"
+    }
+  ],
+  "label.remove": [
+    {
+      "type": 0,
+      "value": "Премахни"
+    }
+  ],
+  "label.remove-member": [
+    {
+      "type": 0,
+      "value": "Премахни член"
+    }
+  ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Отчети"
+    }
+  ],
+  "label.required": [
+    {
+      "type": 0,
+      "value": "Задължително"
+    }
+  ],
+  "label.reset": [
+    {
+      "type": 0,
+      "value": "Нулирай"
+    }
+  ],
+  "label.reset-website": [
+    {
+      "type": 0,
+      "value": "Нулирай уебсайт"
+    }
+  ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Привързване"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Измерете привързаността към вашия уебсайт, като проследявате колко често потребителите се връщат."
+    }
+  ],
+  "label.role": [
+    {
+      "type": 0,
+      "value": "Роля"
+    }
+  ],
+  "label.run-query": [
+    {
+      "type": 0,
+      "value": "Изпълни запитване"
+    }
+  ],
+  "label.save": [
+    {
+      "type": 0,
+      "value": "Запази"
+    }
+  ],
+  "label.screens": [
+    {
+      "type": 0,
+      "value": "Екрани"
+    }
+  ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Търсене"
+    }
+  ],
+  "label.select": [
+    {
+      "type": 0,
+      "value": "Избери"
+    }
+  ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Избери дата"
+    }
+  ],
+  "label.select-role": [
+    {
+      "type": 0,
+      "value": "Избери роля"
+    }
+  ],
+  "label.select-website": [
+    {
+      "type": 0,
+      "value": "Избери уебсайт"
+    }
+  ],
+  "label.sessions": [
+    {
+      "type": 0,
+      "value": "Сесии"
+    }
+  ],
+  "label.settings": [
+    {
+      "type": 0,
+      "value": "Настройки"
+    }
+  ],
+  "label.share-url": [
+    {
+      "type": 0,
+      "value": "Сподели Линк"
+    }
+  ],
+  "label.single-day": [
+    {
+      "type": 0,
+      "value": "Един ден"
+    }
+  ],
+  "label.steps": [
+    {
+      "type": 0,
+      "value": "Стъпки"
+    }
+  ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Сума"
+    }
+  ],
+  "label.tablet": [
+    {
+      "type": 0,
+      "value": "Таблет"
+    }
+  ],
+  "label.team": [
+    {
+      "type": 0,
+      "value": "Екип"
+    }
+  ],
+  "label.team-id": [
+    {
+      "type": 0,
+      "value": "ID на екип"
+    }
+  ],
+  "label.team-member": [
+    {
+      "type": 0,
+      "value": "Член на екипа"
+    }
+  ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Име на екипа"
+    }
+  ],
+  "label.team-owner": [
+    {
+      "type": 0,
+      "value": "Собственик на екипа"
+    }
+  ],
+  "label.team-view-only": [
+    {
+      "type": 0,
+      "value": "Видимо само за членове на екипа"
+    }
+  ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Уебсайтове на екипа"
+    }
+  ],
+  "label.teams": [
+    {
+      "type": 0,
+      "value": "Екипи"
+    }
+  ],
+  "label.theme": [
+    {
+      "type": 0,
+      "value": "Тема"
+    }
+  ],
+  "label.this-month": [
+    {
+      "type": 0,
+      "value": "Този месец"
+    }
+  ],
+  "label.this-week": [
+    {
+      "type": 0,
+      "value": "Тази седмица"
+    }
+  ],
+  "label.this-year": [
+    {
+      "type": 0,
+      "value": "Тази година"
+    }
+  ],
+  "label.timezone": [
+    {
+      "type": 0,
+      "value": "Часова зона"
+    }
+  ],
+  "label.title": [
+    {
+      "type": 0,
+      "value": "Заглавие"
+    }
+  ],
+  "label.today": [
+    {
+      "type": 0,
+      "value": "Днес"
+    }
+  ],
+  "label.toggle-charts": [
+    {
+      "type": 0,
+      "value": "Виж диаграми"
+    }
+  ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Общо"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Общо записи"
+    }
+  ],
+  "label.tracking-code": [
+    {
+      "type": 0,
+      "value": "Код за проследяване"
+    }
+  ],
+  "label.transfer": [
+    {
+      "type": 0,
+      "value": "Прехвърли"
+    }
+  ],
+  "label.transfer-website": [
+    {
+      "type": 0,
+      "value": "Прехвърляне на уебсайт"
+    }
+  ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "Вярно"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Вид"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Уникален"
+    }
+  ],
+  "label.unique-visitors": [
+    {
+      "type": 0,
+      "value": "Уникални посетители"
+    }
+  ],
+  "label.unknown": [
+    {
+      "type": 0,
+      "value": "Неизвестен"
+    }
+  ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Без заглавие"
+    }
+  ],
+  "label.update": [
+    {
+      "type": 0,
+      "value": "Актуализирай"
+    }
+  ],
+  "label.url": [
+    {
+      "type": 0,
+      "value": "URL адрес"
+    }
+  ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URL адреси"
+    }
+  ],
+  "label.user": [
+    {
+      "type": 0,
+      "value": "Потребител"
+    }
+  ],
+  "label.username": [
+    {
+      "type": 0,
+      "value": "Потребителско име"
+    }
+  ],
+  "label.users": [
+    {
+      "type": 0,
+      "value": "Потребители"
+    }
+  ],
+  "label.utm": [
+    {
+      "type": 0,
+      "value": "UTM"
+    }
+  ],
+  "label.utm-description": [
+    {
+      "type": 0,
+      "value": "Следете кампаниите си чрез UTM параметри."
+    }
+  ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Стойност"
+    }
+  ],
+  "label.view": [
+    {
+      "type": 0,
+      "value": "Преглед"
+    }
+  ],
+  "label.view-details": [
+    {
+      "type": 0,
+      "value": "Преглед на детайлите"
+    }
+  ],
+  "label.view-only": [
+    {
+      "type": 0,
+      "value": "Само за преглед"
+    }
+  ],
+  "label.views": [
+    {
+      "type": 0,
+      "value": "Прегледи"
+    }
+  ],
+  "label.views-per-visit": [
+    {
+      "type": 0,
+      "value": "Прегледи на посещение"
+    }
+  ],
+  "label.visitors": [
+    {
+      "type": 0,
+      "value": "Посетители"
+    }
+  ],
+  "label.visits": [
+    {
+      "type": 0,
+      "value": "Посещения"
+    }
+  ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Уебсайт"
+    }
+  ],
+  "label.website-id": [
+    {
+      "type": 0,
+      "value": "Идентификатор на уебсайт"
+    }
+  ],
+  "label.websites": [
+    {
+      "type": 0,
+      "value": "Уебсайтове"
+    }
+  ],
+  "label.window": [
+    {
+      "type": 0,
+      "value": "Прозорец"
+    }
+  ],
+  "label.yesterday": [
+    {
+      "type": 0,
+      "value": "Вчера"
+    }
+  ],
+  "message.action-confirmation": [
+    {
+      "type": 0,
+      "value": "Въведете "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " в полето по-долу, за да потвърдите."
+    }
+  ],
+  "message.active-users": [
+    {
+      "type": 1,
+      "value": "x"
+    },
+    {
+      "type": 0,
+      "value": " "
+    },
+    {
+      "offset": 0,
+      "options": {
+        "one": {
+          "value": [
+            {
+              "type": 0,
+              "value": "активен един"
+            }
+          ]
+        },
+        "other": {
+          "value": [
+            {
+              "type": 0,
+              "value": "активни други"
+            }
+          ]
+        }
+      },
+      "pluralType": "cardinal",
+      "type": 6,
+      "value": "x"
+    }
+  ],
+  "message.confirm-delete": [
+    {
+      "type": 0,
+      "value": "Сигурни ли сте, че искате да изтриете "
+    },
+    {
+      "type": 1,
+      "value": "target"
+    },
+    {
+      "type": 0,
+      "value": "?"
+    }
+  ],
+  "message.confirm-leave": [
+    {
+      "type": 0,
+      "value": "Сигурни ли сте, че искате да напуснете "
+    },
+    {
+      "type": 1,
+      "value": "target"
+    },
+    {
+      "type": 0,
+      "value": "?"
+    }
+  ],
+  "message.confirm-remove": [
+    {
+      "type": 0,
+      "value": "Сигурни ли сте, че искате да премахнете "
+    },
+    {
+      "type": 1,
+      "value": "target"
+    },
+    {
+      "type": 0,
+      "value": "?"
+    }
+  ],
+  "message.confirm-reset": [
+    {
+      "type": 0,
+      "value": "Сигурни ли сте, че искате да нулирате "
+    },
+    {
+      "type": 1,
+      "value": "target"
+    },
+    {
+      "type": 0,
+      "value": "?"
+    }
+  ],
+  "message.delete-team-warning": [
+    {
+      "type": 0,
+      "value": "Изтриването на екип ще изтрие и всички уебсайтове създадени от екипа."
+    }
+  ],
+  "message.delete-website-warning": [
+    {
+      "type": 0,
+      "value": "Всички данни за уебсайта ще бъдат изтрити."
+    }
+  ],
+  "message.error": [
+    {
+      "type": 0,
+      "value": "Възникна грешка."
+    }
+  ],
+  "message.event-log": [
+    {
+      "type": 1,
+      "value": "event"
+    },
+    {
+      "type": 0,
+      "value": " на "
+    },
+    {
+      "type": 1,
+      "value": "url"
+    }
+  ],
+  "message.go-to-settings": [
+    {
+      "type": 0,
+      "value": "Отидете в настройките"
+    }
+  ],
+  "message.incorrect-username-password": [
+    {
+      "type": 0,
+      "value": "Неправилно потребителско име и/или парола."
+    }
+  ],
+  "message.invalid-domain": [
+    {
+      "type": 0,
+      "value": "Невалиден домейн. Не включвайте http/https."
+    }
+  ],
+  "message.min-password-length": [
+    {
+      "type": 0,
+      "value": "Минимална дължина от "
+    },
+    {
+      "type": 1,
+      "value": "n"
+    },
+    {
+      "type": 0,
+      "value": " символа"
+    }
+  ],
+  "message.new-version-available": [
+    {
+      "type": 0,
+      "value": "Има нова версия на Umami "
+    },
+    {
+      "type": 1,
+      "value": "version"
+    },
+    {
+      "type": 0,
+      "value": "!"
+    }
+  ],
+  "message.no-data-available": [
+    {
+      "type": 0,
+      "value": "Няма налични данни."
+    }
+  ],
+  "message.no-event-data": [
+    {
+      "type": 0,
+      "value": "Няма налични данни за събитие."
+    }
+  ],
+  "message.no-match-password": [
+    {
+      "type": 0,
+      "value": "Паролите не съвпадат."
+    }
+  ],
+  "message.no-results-found": [
+    {
+      "type": 0,
+      "value": "Няма намерени резултати."
+    }
+  ],
+  "message.no-team-websites": [
+    {
+      "type": 0,
+      "value": "Този екип няма никакви уебсайтове."
+    }
+  ],
+  "message.no-teams": [
+    {
+      "type": 0,
+      "value": "Няма създадени екипи."
+    }
+  ],
+  "message.no-users": [
+    {
+      "type": 0,
+      "value": "Няма потребители."
+    }
+  ],
+  "message.no-websites-configured": [
+    {
+      "type": 0,
+      "value": "Нямате конфигурирани уебсайтове."
+    }
+  ],
+  "message.page-not-found": [
+    {
+      "type": 0,
+      "value": "Страницата не е намерена"
+    }
+  ],
+  "message.reset-website": [
+    {
+      "type": 0,
+      "value": "За да нулирате този уебсайт, въведете "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " в полето по-долу, за да потвърдите."
+    }
+  ],
+  "message.reset-website-warning": [
+    {
+      "type": 0,
+      "value": "Всички статистически данни за този уебсайт ще бъдат изтрити, но вашите настройки ще останат непроменени."
+    }
+  ],
+  "message.saved": [
+    {
+      "type": 0,
+      "value": "Запазено."
+    }
+  ],
+  "message.share-url": [
+    {
+      "type": 0,
+      "value": "Статистиката за вашия уебсайт е публично достъпна на следния URL адрес:"
+    }
+  ],
+  "message.team-already-member": [
+    {
+      "type": 0,
+      "value": "Вече сте член на екипа."
+    }
+  ],
+  "message.team-not-found": [
+    {
+      "type": 0,
+      "value": "Екипът не е намерен."
+    }
+  ],
+  "message.team-websites-info": [
+    {
+      "type": 0,
+      "value": "Уебсайтовете могат да бъдат преглеждани от всеки член на екипа."
+    }
+  ],
+  "message.tracking-code": [
+    {
+      "type": 0,
+      "value": "За активирате проследяването на статистиката във вашият уебсайт, поставете следния код в секцията "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "..."
+        }
+      ],
+      "type": 8,
+      "value": "head"
+    },
+    {
+      "type": 0,
+      "value": " намираща се в вашия HTML."
+    }
+  ],
+  "message.transfer-team-website-to-user": [
+    {
+      "type": 0,
+      "value": "Искате да прехвърлите този уебсайт към вашия акаунт?"
+    }
+  ],
+  "message.transfer-user-website-to-team": [
+    {
+      "type": 0,
+      "value": "Изберете екипът на който да бъде прехвърлен уебсайта."
+    }
+  ],
+  "message.transfer-website": [
+    {
+      "type": 0,
+      "value": "Прехвърли собствеността на уебсайта към вашия акаунт или към друг екип."
+    }
+  ],
+  "message.triggered-event": [
+    {
+      "type": 0,
+      "value": "Активирано събитие"
+    }
+  ],
+  "message.user-deleted": [
+    {
+      "type": 0,
+      "value": "Потребителят е изтрит."
+    }
+  ],
+  "message.viewed-page": [
+    {
+      "type": 0,
+      "value": "Страницата е видяна"
+    }
+  ],
+  "message.visitor-log": [
+    {
+      "type": 0,
+      "value": "Посетител от "
+    },
+    {
+      "type": 1,
+      "value": "country"
+    },
+    {
+      "type": 0,
+      "value": ", използващ "
+    },
+    {
+      "type": 1,
+      "value": "browser"
+    },
+    {
+      "type": 0,
+      "value": " на "
+    },
+    {
+      "type": 1,
+      "value": "os"
+    },
+    {
+      "type": 0,
+      "value": " "
+    },
+    {
+      "type": 1,
+      "value": "device"
+    }
+  ],
+  "message.visitors-dropped-off": [
+    {
+      "type": 0,
+      "value": "Спад на посетителите"
+    }
+  ]
+}
diff --git a/src/lang/bg-BG.json b/src/lang/bg-BG.json
index 42ceac35fa..f293ed8841 100644
--- a/src/lang/bg-BG.json
+++ b/src/lang/bg-BG.json
@@ -1,246 +1,246 @@
 {
-    "label.access-code": "Код за достъп",
-    "label.actions": "Действия",
-    "label.activity-log": "Активностти",
-    "label.add": "Добави",
-    "label.add-description": "Добави описание",
-    "label.add-member": "Добави член",
-    "label.add-step": "Добави стъпка",
-    "label.add-website": "Добави уебсайт",
-    "label.admin": "Администратор",
-    "label.after": "След",
-    "label.all": "Всички",
-    "label.all-time": "За всички времена",
-    "label.analytics": "Анализи",
-    "label.average": "Средно",
-    "label.average-visit-time": "Средно време на посещение",
-    "label.back": "Назад",
-    "label.before": "Преди",
-    "label.bounce-rate": "Kоефициент на отказ",
-    "label.breakdown": "Разбивка",
-    "label.browser": "Браузър",
-    "label.browsers": "Браузъри",
-    "label.cancel": "Отмени",
-    "label.change-password": "Смени парола",
-    "label.cities": "Градове",
-    "label.city": "Град",
-    "label.clear-all": "Изчисти всички",
-    "label.confirm": "Потвърди",
-    "label.confirm-password": "Потвърди парола",
-    "label.contains": "Съдържа",
-    "label.continue": "Продължи",
-    "label.countries": "Държави",
-    "label.country": "Държава",
-    "label.create": "Създай",
-    "label.create-report": "Създай отчет",
-    "label.create-team": "Създай екип",
-    "label.create-user": "Създай потребител",
-    "label.created": "Създадено",
-    "label.created-by": "Създадено от",
-    "label.current-password": "Текуща парола",
-    "label.custom-range": "Обхват",
-    "label.dashboard": "Табло",
-    "label.data": "Данни",
-    "label.date": "Дата",
-    "label.date-range": "Диапазон от дати",
-    "label.day": "Ден",
-    "label.default-date-range": "Диапазон от дати по подразбиране",
-    "label.delete": "Изтрий",
-    "label.delete-report": "Изтрий отчет",
-    "label.delete-team": "Изтрий екип",
-    "label.delete-user": "Изтрий потребител",
-    "label.delete-website": "Изтрий уебсайт",
-    "label.description": "Описание",
-    "label.desktop": "Десктоп",
-    "label.details": "Детайли",
-    "label.device": "Устройство",
-    "label.devices": "Устройства",
-    "label.dismiss": "Отхвърли",
-    "label.does-not-contain": "Не съдържа",
-    "label.domain": "Домейн",
-    "label.dropoff": "Отпадане",
-    "label.edit": "Редактирай",
-    "label.edit-dashboard": "Редактирай табло",
-    "label.edit-member": "Редактирай член",
-    "label.enable-share-url": "Активирай Линк за споделяне",
-    "label.event": "Събитие",
-    "label.event-data": "Данни за събитие",
-    "label.events": "Събития",
-    "label.false": "Грешно",
-    "label.field": "Поле",
-    "label.fields": "Полета",
-    "label.filter": "Филтър",
-    "label.filter-combined": "Комбиниран",
-    "label.filter-raw": "Суров",
-    "label.filters": "Филтри",
-    "label.funnel": "Фуния",
-    "label.funnel-description": "Разберете процента на конверсия и отпадане на потребителите.",
-    "label.greater-than": "По-голямо от",
-    "label.greater-than-equals": "По-голямо или равно на",
-    "label.insights": "Изводи",
-    "label.insights-description": "Навлезте по-дълбоко в данните си, като използвате сегменти и филтри.",
-    "label.is": "Е",
-    "label.is-not": "Не е",
-    "label.is-not-set": "Не е зададено",
-    "label.is-set": "Зададено е",
-    "label.join": "Присъедини се",
-    "label.join-team": "Присъедини се към екип",
-    "label.language": "Език",
-    "label.languages": "Езици",
-    "label.laptop": "Лаптоп",
-    "label.last-days": "Последните {x} дни",
-    "label.last-hours": "Последните {x} часа",
-    "label.last-months": "Последните {x} месеца",
-    "label.leave": "Напусни",
-    "label.leave-team": "Напусни екип",
-    "label.less-than": "По-малко от",
-    "label.less-than-equals": "По-малко или равно на",
-    "label.login": "Вход",
-    "label.logout": "Изход",
-    "label.manage": "Управлявай",
-    "label.max": "Максимум",
-    "label.member": "Член",
-    "label.members": "Членове",
-    "label.min": "Минимум",
-    "label.mobile": "Мобилен",
-    "label.more": "Още",
-    "label.my-account": "Моят акаунт",
-    "label.my-websites": "Моите уебсайтове",
-    "label.name": "Име",
-    "label.new-password": "Нова парола",
-    "label.none": "Няма",
-    "label.number-of-records": "{x} {x, plural, един {record} други {records}}",
-    "label.ok": "Добре",
-    "label.os": "ОС",
-    "label.overview": "Общ преглед",
-    "label.owner": "Собственик",
-    "label.page-of": "Страница {current} от {total}",
-    "label.page-views": "Прегледи на страницата",
-    "label.pageTitle": "Заглавие на страница",
-    "label.pages": "Страници",
-    "label.password": "Парола",
-    "label.powered-by": "Поддържано от {name}",
-    "label.profile": "Профил",
-    "label.queries": "Запитвания",
-    "label.query": "Запитване",
-    "label.query-parameters": "Параметри на търсене",
-    "label.realtime": "В реално време",
-    "label.referrer": "Референт",
-    "label.referrers": "Референти",
-    "label.refresh": "Обнови",
-    "label.regenerate": "Регенерирай",
-    "label.region": "Регион",
-    "label.regions": "Региони",
-    "label.remove": "Премахни",
-    "label.remove-member": "Премахни член",
-    "label.reports": "Отчети",
-    "label.required": "Задължително",
-    "label.reset": "Нулирай",
-    "label.reset-website": "Нулирай уебсайт",
-    "label.retention": "Привързване",
-    "label.retention-description": "Измерете привързаността към вашия уебсайт, като проследявате колко често потребителите се връщат.",
-    "label.role": "Роля",
-    "label.run-query": "Изпълни запитване",
-    "label.save": "Запази",
-    "label.screens": "Екрани",
-    "label.search": "Търсене",
-    "label.select": "Избери",
-    "label.select-date": "Избери дата",
-    "label.select-role": "Избери роля",
-    "label.select-website": "Избери уебсайт",
-    "label.sessions": "Сесии",
-    "label.settings": "Настройки",
-    "label.share-url": "Сподели Линк",
-    "label.single-day": "Един ден",
-    "label.steps": "Стъпки",
-    "label.sum": "Сума",
-    "label.tablet": "Таблет",
-    "label.team": "Екип",
-    "label.team-id": "ID на екип",
-    "label.team-member": "Член на екипа",
-    "label.team-name": "Име на екипа",
-    "label.team-owner": "Собственик на екипа",
-    "label.team-view-only": "Видимо само за членове на екипа",
-    "label.team-websites": "Уебсайтове на екипа",
-    "label.teams": "Екипи",
-    "label.theme": "Тема",
-    "label.this-month": "Този месец",
-    "label.this-week": "Тази седмица",
-    "label.this-year": "Тази година",
-    "label.timezone": "Часова зона",
-    "label.title": "Заглавие",
-    "label.today": "Днес",
-    "label.toggle-charts": "Виж диаграми",
-    "label.total": "Общо",
-    "label.total-records": "Общо записи",
-    "label.tracking-code": "Код за проследяване",
-    "label.transfer": "Прехвърли",
-    "label.transfer-website": "Прехвърляне на уебсайт",
-    "label.true": "Вярно",
-    "label.type": "Вид",
-    "label.unique": "Уникален",
-    "label.unique-visitors": "Уникални посетители",
-    "label.unknown": "Неизвестен",
-    "label.untitled": "Без заглавие",
-    "label.update": "Актуализирай",
-    "label.url": "URL адрес",
-    "label.urls": "URL адреси",
-    "label.user": "Потребител",
-    "label.username": "Потребителско име",
-    "label.users": "Потребители",
-    "label.utm": "UTM",
-    "label.utm-description": "Следете кампаниите си чрез UTM параметри.",
-    "label.value": "Стойност",
-    "label.view": "Преглед",
-    "label.view-details": "Преглед на детайлите",
-    "label.view-only": "Само за преглед",
-    "label.views": "Прегледи",
-    "label.views-per-visit": "Прегледи на посещение",
-    "label.visitors": "Посетители",
-    "label.visits": "Посещения",
-    "label.website": "Уебсайт",
-    "label.website-id": "Идентификатор на уебсайт",
-    "label.websites": "Уебсайтове",
-    "label.window": "Прозорец",
-    "label.yesterday": "Вчера",
-    "message.action-confirmation": "Въведете {confirmation} в полето по-долу, за да потвърдите.",
-    "message.active-users": "{x} {x, plural, активен един {visitor} активни други {visitors}}",
-    "message.confirm-delete": "Сигурни ли сте, че искате да изтриете {target}?",
-    "message.confirm-leave": "Сигурни ли сте, че искате да напуснете {target}?",
-    "message.confirm-remove": "Сигурни ли сте, че искате да премахнете {target}?",
-    "message.confirm-reset": "Сигурни ли сте, че искате да нулирате {target}?",
-    "message.delete-team-warning": "Изтриването на екип ще изтрие и всички уебсайтове създадени от екипа.",
-    "message.delete-website-warning": "Всички данни за уебсайта ще бъдат изтрити.",
-    "message.error": "Възникна грешка.",
-    "message.event-log": "{event} на {url}",
-    "message.go-to-settings": "Отидете в настройките",
-    "message.incorrect-username-password": "Неправилно потребителско име и/или парола.",
-    "message.invalid-domain": "Невалиден домейн. Не включвайте http/https.",
-    "message.min-password-length": "Минимална дължина от {n} символа",
-    "message.new-version-available": "Има нова версия на Umami {version}!",
-    "message.no-data-available": "Няма налични данни.",
-    "message.no-event-data": "Няма налични данни за събитие.",
-    "message.no-match-password": "Паролите не съвпадат.",
-    "message.no-results-found": "Няма намерени резултати.",
-    "message.no-team-websites": "Този екип няма никакви уебсайтове.",
-    "message.no-teams": "Няма създадени екипи.",
-    "message.no-users": "Няма потребители.",
-    "message.no-websites-configured": "Нямате конфигурирани уебсайтове.",
-    "message.page-not-found": "Страницата не е намерена",
-    "message.reset-website": "За да нулирате този уебсайт, въведете {confirmation} в полето по-долу, за да потвърдите.",
-    "message.reset-website-warning": "Всички статистически данни за този уебсайт ще бъдат изтрити, но вашите настройки ще останат непроменени.",
-    "message.saved": "Запазено.",
-    "message.share-url": "Статистиката за вашия уебсайт е публично достъпна на следния URL адрес:",
-    "message.team-already-member": "Вече сте член на екипа.",
-    "message.team-not-found": "Екипът не е намерен.",
-    "message.team-websites-info": "Уебсайтовете могат да бъдат преглеждани от всеки член на екипа.",
-    "message.tracking-code": "За активирате проследяването на статистиката във вашият уебсайт, поставете следния код в секцията <head>...</head> намираща се в вашия HTML.",
-    "message.transfer-team-website-to-user": "Искате да прехвърлите този уебсайт към вашия акаунт?",
-    "message.transfer-user-website-to-team": "Изберете екипът на който да бъде прехвърлен уебсайта.",
-    "message.transfer-website": "Прехвърли собствеността на уебсайта към вашия акаунт или към друг екип.",
-    "message.triggered-event": "Активирано събитие",
-    "message.user-deleted": "Потребителят е изтрит.",
-    "message.viewed-page": "Страницата е видяна",
-    "message.visitor-log": "Посетител от {country}, използващ {browser} на {os} {device}",
-    "message.visitors-dropped-off": "Спад на посетителите"
-    }
\ No newline at end of file
+  "label.access-code": "Код за достъп",
+  "label.actions": "Действия",
+  "label.activity-log": "Активностти",
+  "label.add": "Добави",
+  "label.add-description": "Добави описание",
+  "label.add-member": "Добави член",
+  "label.add-step": "Добави стъпка",
+  "label.add-website": "Добави уебсайт",
+  "label.admin": "Администратор",
+  "label.after": "След",
+  "label.all": "Всички",
+  "label.all-time": "За всички времена",
+  "label.analytics": "Анализи",
+  "label.average": "Средно",
+  "label.average-visit-time": "Средно време на посещение",
+  "label.back": "Назад",
+  "label.before": "Преди",
+  "label.bounce-rate": "Kоефициент на отказ",
+  "label.breakdown": "Разбивка",
+  "label.browser": "Браузър",
+  "label.browsers": "Браузъри",
+  "label.cancel": "Отмени",
+  "label.change-password": "Смени парола",
+  "label.cities": "Градове",
+  "label.city": "Град",
+  "label.clear-all": "Изчисти всички",
+  "label.confirm": "Потвърди",
+  "label.confirm-password": "Потвърди парола",
+  "label.contains": "Съдържа",
+  "label.continue": "Продължи",
+  "label.countries": "Държави",
+  "label.country": "Държава",
+  "label.create": "Създай",
+  "label.create-report": "Създай отчет",
+  "label.create-team": "Създай екип",
+  "label.create-user": "Създай потребител",
+  "label.created": "Създадено",
+  "label.created-by": "Създадено от",
+  "label.current-password": "Текуща парола",
+  "label.custom-range": "Обхват",
+  "label.dashboard": "Табло",
+  "label.data": "Данни",
+  "label.date": "Дата",
+  "label.date-range": "Диапазон от дати",
+  "label.day": "Ден",
+  "label.default-date-range": "Диапазон от дати по подразбиране",
+  "label.delete": "Изтрий",
+  "label.delete-report": "Изтрий отчет",
+  "label.delete-team": "Изтрий екип",
+  "label.delete-user": "Изтрий потребител",
+  "label.delete-website": "Изтрий уебсайт",
+  "label.description": "Описание",
+  "label.desktop": "Десктоп",
+  "label.details": "Детайли",
+  "label.device": "Устройство",
+  "label.devices": "Устройства",
+  "label.dismiss": "Отхвърли",
+  "label.does-not-contain": "Не съдържа",
+  "label.domain": "Домейн",
+  "label.dropoff": "Отпадане",
+  "label.edit": "Редактирай",
+  "label.edit-dashboard": "Редактирай табло",
+  "label.edit-member": "Редактирай член",
+  "label.enable-share-url": "Активирай Линк за споделяне",
+  "label.event": "Събитие",
+  "label.event-data": "Данни за събитие",
+  "label.events": "Събития",
+  "label.false": "Грешно",
+  "label.field": "Поле",
+  "label.fields": "Полета",
+  "label.filter": "Филтър",
+  "label.filter-combined": "Комбиниран",
+  "label.filter-raw": "Суров",
+  "label.filters": "Филтри",
+  "label.funnel": "Фуния",
+  "label.funnel-description": "Разберете процента на конверсия и отпадане на потребителите.",
+  "label.greater-than": "По-голямо от",
+  "label.greater-than-equals": "По-голямо или равно на",
+  "label.insights": "Изводи",
+  "label.insights-description": "Навлезте по-дълбоко в данните си, като използвате сегменти и филтри.",
+  "label.is": "Е",
+  "label.is-not": "Не е",
+  "label.is-not-set": "Не е зададено",
+  "label.is-set": "Зададено е",
+  "label.join": "Присъедини се",
+  "label.join-team": "Присъедини се към екип",
+  "label.language": "Език",
+  "label.languages": "Езици",
+  "label.laptop": "Лаптоп",
+  "label.last-days": "Последните {x} дни",
+  "label.last-hours": "Последните {x} часа",
+  "label.last-months": "Последните {x} месеца",
+  "label.leave": "Напусни",
+  "label.leave-team": "Напусни екип",
+  "label.less-than": "По-малко от",
+  "label.less-than-equals": "По-малко или равно на",
+  "label.login": "Вход",
+  "label.logout": "Изход",
+  "label.manage": "Управлявай",
+  "label.max": "Максимум",
+  "label.member": "Член",
+  "label.members": "Членове",
+  "label.min": "Минимум",
+  "label.mobile": "Мобилен",
+  "label.more": "Още",
+  "label.my-account": "Моят акаунт",
+  "label.my-websites": "Моите уебсайтове",
+  "label.name": "Име",
+  "label.new-password": "Нова парола",
+  "label.none": "Няма",
+  "label.number-of-records": "{x} {x, plural, one {един} other {други}}",
+  "label.ok": "Добре",
+  "label.os": "ОС",
+  "label.overview": "Общ преглед",
+  "label.owner": "Собственик",
+  "label.page-of": "Страница {current} от {total}",
+  "label.page-views": "Прегледи на страницата",
+  "label.pageTitle": "Заглавие на страница",
+  "label.pages": "Страници",
+  "label.password": "Парола",
+  "label.powered-by": "Поддържано от {name}",
+  "label.profile": "Профил",
+  "label.queries": "Запитвания",
+  "label.query": "Запитване",
+  "label.query-parameters": "Параметри на търсене",
+  "label.realtime": "В реално време",
+  "label.referrer": "Референт",
+  "label.referrers": "Референти",
+  "label.refresh": "Обнови",
+  "label.regenerate": "Регенерирай",
+  "label.region": "Регион",
+  "label.regions": "Региони",
+  "label.remove": "Премахни",
+  "label.remove-member": "Премахни член",
+  "label.reports": "Отчети",
+  "label.required": "Задължително",
+  "label.reset": "Нулирай",
+  "label.reset-website": "Нулирай уебсайт",
+  "label.retention": "Привързване",
+  "label.retention-description": "Измерете привързаността към вашия уебсайт, като проследявате колко често потребителите се връщат.",
+  "label.role": "Роля",
+  "label.run-query": "Изпълни запитване",
+  "label.save": "Запази",
+  "label.screens": "Екрани",
+  "label.search": "Търсене",
+  "label.select": "Избери",
+  "label.select-date": "Избери дата",
+  "label.select-role": "Избери роля",
+  "label.select-website": "Избери уебсайт",
+  "label.sessions": "Сесии",
+  "label.settings": "Настройки",
+  "label.share-url": "Сподели Линк",
+  "label.single-day": "Един ден",
+  "label.steps": "Стъпки",
+  "label.sum": "Сума",
+  "label.tablet": "Таблет",
+  "label.team": "Екип",
+  "label.team-id": "ID на екип",
+  "label.team-member": "Член на екипа",
+  "label.team-name": "Име на екипа",
+  "label.team-owner": "Собственик на екипа",
+  "label.team-view-only": "Видимо само за членове на екипа",
+  "label.team-websites": "Уебсайтове на екипа",
+  "label.teams": "Екипи",
+  "label.theme": "Тема",
+  "label.this-month": "Този месец",
+  "label.this-week": "Тази седмица",
+  "label.this-year": "Тази година",
+  "label.timezone": "Часова зона",
+  "label.title": "Заглавие",
+  "label.today": "Днес",
+  "label.toggle-charts": "Виж диаграми",
+  "label.total": "Общо",
+  "label.total-records": "Общо записи",
+  "label.tracking-code": "Код за проследяване",
+  "label.transfer": "Прехвърли",
+  "label.transfer-website": "Прехвърляне на уебсайт",
+  "label.true": "Вярно",
+  "label.type": "Вид",
+  "label.unique": "Уникален",
+  "label.unique-visitors": "Уникални посетители",
+  "label.unknown": "Неизвестен",
+  "label.untitled": "Без заглавие",
+  "label.update": "Актуализирай",
+  "label.url": "URL адрес",
+  "label.urls": "URL адреси",
+  "label.user": "Потребител",
+  "label.username": "Потребителско име",
+  "label.users": "Потребители",
+  "label.utm": "UTM",
+  "label.utm-description": "Следете кампаниите си чрез UTM параметри.",
+  "label.value": "Стойност",
+  "label.view": "Преглед",
+  "label.view-details": "Преглед на детайлите",
+  "label.view-only": "Само за преглед",
+  "label.views": "Прегледи",
+  "label.views-per-visit": "Прегледи на посещение",
+  "label.visitors": "Посетители",
+  "label.visits": "Посещения",
+  "label.website": "Уебсайт",
+  "label.website-id": "Идентификатор на уебсайт",
+  "label.websites": "Уебсайтове",
+  "label.window": "Прозорец",
+  "label.yesterday": "Вчера",
+  "message.action-confirmation": "Въведете {confirmation} в полето по-долу, за да потвърдите.",
+  "message.active-users": "{x} {x, plural, one {активен един} other {активни други}}",
+  "message.confirm-delete": "Сигурни ли сте, че искате да изтриете {target}?",
+  "message.confirm-leave": "Сигурни ли сте, че искате да напуснете {target}?",
+  "message.confirm-remove": "Сигурни ли сте, че искате да премахнете {target}?",
+  "message.confirm-reset": "Сигурни ли сте, че искате да нулирате {target}?",
+  "message.delete-team-warning": "Изтриването на екип ще изтрие и всички уебсайтове създадени от екипа.",
+  "message.delete-website-warning": "Всички данни за уебсайта ще бъдат изтрити.",
+  "message.error": "Възникна грешка.",
+  "message.event-log": "{event} на {url}",
+  "message.go-to-settings": "Отидете в настройките",
+  "message.incorrect-username-password": "Неправилно потребителско име и/или парола.",
+  "message.invalid-domain": "Невалиден домейн. Не включвайте http/https.",
+  "message.min-password-length": "Минимална дължина от {n} символа",
+  "message.new-version-available": "Има нова версия на Umami {version}!",
+  "message.no-data-available": "Няма налични данни.",
+  "message.no-event-data": "Няма налични данни за събитие.",
+  "message.no-match-password": "Паролите не съвпадат.",
+  "message.no-results-found": "Няма намерени резултати.",
+  "message.no-team-websites": "Този екип няма никакви уебсайтове.",
+  "message.no-teams": "Няма създадени екипи.",
+  "message.no-users": "Няма потребители.",
+  "message.no-websites-configured": "Нямате конфигурирани уебсайтове.",
+  "message.page-not-found": "Страницата не е намерена",
+  "message.reset-website": "За да нулирате този уебсайт, въведете {confirmation} в полето по-долу, за да потвърдите.",
+  "message.reset-website-warning": "Всички статистически данни за този уебсайт ще бъдат изтрити, но вашите настройки ще останат непроменени.",
+  "message.saved": "Запазено.",
+  "message.share-url": "Статистиката за вашия уебсайт е публично достъпна на следния URL адрес:",
+  "message.team-already-member": "Вече сте член на екипа.",
+  "message.team-not-found": "Екипът не е намерен.",
+  "message.team-websites-info": "Уебсайтовете могат да бъдат преглеждани от всеки член на екипа.",
+  "message.tracking-code": "За активирате проследяването на статистиката във вашият уебсайт, поставете следния код в секцията <head>...</head> намираща се в вашия HTML.",
+  "message.transfer-team-website-to-user": "Искате да прехвърлите този уебсайт към вашия акаунт?",
+  "message.transfer-user-website-to-team": "Изберете екипът на който да бъде прехвърлен уебсайта.",
+  "message.transfer-website": "Прехвърли собствеността на уебсайта към вашия акаунт или към друг екип.",
+  "message.triggered-event": "Активирано събитие",
+  "message.user-deleted": "Потребителят е изтрит.",
+  "message.viewed-page": "Страницата е видяна",
+  "message.visitor-log": "Посетител от {country}, използващ {browser} на {os} {device}",
+  "message.visitors-dropped-off": "Спад на посетителите"
+}
diff --git a/src/lib/lang.ts b/src/lib/lang.ts
index 2d9ac58c0e..48176d0a90 100644
--- a/src/lib/lang.ts
+++ b/src/lib/lang.ts
@@ -2,6 +2,7 @@ import {
   arSA,
   be,
   bn,
+  bg,
   bs,
   cs,
   sk,
@@ -48,6 +49,7 @@ import {
 export const languages = {
   'ar-SA': { label: 'العربية', dateLocale: arSA, dir: 'rtl' },
   'be-BY': { label: 'Беларуская', dateLocale: be },
+  'bg-BG': { label: 'български език', dateLocale: bg },
   'bn-BD': { label: 'বাংলা', dateLocale: bn },
   'bs-BA': { label: 'Bosanski', dateLocale: bs },
   'ca-ES': { label: 'Català', dateLocale: ca },

From b012a3641ca85c08e5cafe8590f2c6e1f4b949a2 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Wed, 29 May 2024 23:34:07 -0700
Subject: [PATCH 117/438] Fixed lang files.

---
 src/lang/am-ET.json | 2 +-
 src/lang/en-GB.json | 2 +-
 src/lang/en-US.json | 2 +-
 src/lang/hr-HR.json | 2 +-
 src/lang/si-LK.json | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lang/am-ET.json b/src/lang/am-ET.json
index 9546ffdd93..5e28634225 100644
--- a/src/lang/am-ET.json
+++ b/src/lang/am-ET.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "Average visit time",
+  "label.visit-duration": "Visit duration",
   "label.back": "Back",
   "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
diff --git a/src/lang/en-GB.json b/src/lang/en-GB.json
index 82e60c5e0e..dbe239fbde 100644
--- a/src/lang/en-GB.json
+++ b/src/lang/en-GB.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "Average visit time",
+  "label.visit-duration": "Visit duration",
   "label.back": "Back",
   "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
diff --git a/src/lang/en-US.json b/src/lang/en-US.json
index 77e6daa1e6..114ed1d099 100644
--- a/src/lang/en-US.json
+++ b/src/lang/en-US.json
@@ -13,7 +13,7 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "Average visit time",
+  "label.visit-duration": "Visit duration",
   "label.back": "Back",
   "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
diff --git a/src/lang/hr-HR.json b/src/lang/hr-HR.json
index ea48849039..62adcbcb58 100644
--- a/src/lang/hr-HR.json
+++ b/src/lang/hr-HR.json
@@ -13,7 +13,7 @@
   "label.all-time": "Svo vrijeme",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "Average visit time",
+  "label.visit-duration": "Visit duration",
   "label.back": "Natrag ",
   "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
diff --git a/src/lang/si-LK.json b/src/lang/si-LK.json
index 087efa5612..d3dc4c4f44 100644
--- a/src/lang/si-LK.json
+++ b/src/lang/si-LK.json
@@ -13,7 +13,7 @@
   "label.all-time": "හැම වෙලාවෙම",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "Average visit time",
+  "label.visit-duration": "Visit duration",
   "label.back": "ආපසු",
   "label.before": "Before",
   "label.bounce-rate": "Bounce rate",

From f666136d2af4617912f7ca5a0cffd2784cea0d6b Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 30 May 2024 01:29:29 -0700
Subject: [PATCH 118/438] Merge language changes in bn-BD. Closes #2729

---
 public/intl/messages/bn-BD.json | 50 ++++++++++++++++-----------------
 src/lang/bn-BD.json             | 50 ++++++++++++++++-----------------
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/public/intl/messages/bn-BD.json b/public/intl/messages/bn-BD.json
index 81661e3b74..aa9e8c902a 100644
--- a/public/intl/messages/bn-BD.json
+++ b/public/intl/messages/bn-BD.json
@@ -2,7 +2,7 @@
   "label.access-code": [
     {
       "type": 0,
-      "value": "Access code"
+      "value": "এক্সেস কোড"
     }
   ],
   "label.actions": [
@@ -14,31 +14,31 @@
   "label.activity-log": [
     {
       "type": 0,
-      "value": "Activity log"
+      "value": "একটিভিটি দেখুন"
     }
   ],
   "label.add": [
     {
       "type": 0,
-      "value": "Add"
+      "value": "যুক্ত করুন"
     }
   ],
   "label.add-description": [
     {
       "type": 0,
-      "value": "Add description"
+      "value": "বর্ননা যোগ করুন"
     }
   ],
   "label.add-member": [
     {
       "type": 0,
-      "value": "Add member"
+      "value": "সদস্য যোগ করুন"
     }
   ],
   "label.add-step": [
     {
       "type": 0,
-      "value": "Add step"
+      "value": "পদ যোগ করুন"
     }
   ],
   "label.add-website": [
@@ -56,7 +56,7 @@
   "label.after": [
     {
       "type": 0,
-      "value": "After"
+      "value": "পরে"
     }
   ],
   "label.all": [
@@ -92,31 +92,31 @@
   "label.before": [
     {
       "type": 0,
-      "value": "Before"
+      "value": "পূর্বে"
     }
   ],
   "label.bounce-rate": [
     {
       "type": 0,
-      "value": "বহিষ্কারের হার"
+      "value": "উপরে উঠার হার"
     }
   ],
   "label.breakdown": [
     {
       "type": 0,
-      "value": "Breakdown"
+      "value": "ভাঙ্গন"
     }
   ],
   "label.browser": [
     {
       "type": 0,
-      "value": "Browser"
+      "value": "ব্রাউজার"
     }
   ],
   "label.browsers": [
     {
       "type": 0,
-      "value": "ব্রাউজার"
+      "value": "ব্রাউজার সমূহ"
     }
   ],
   "label.cancel": [
@@ -134,25 +134,25 @@
   "label.cities": [
     {
       "type": 0,
-      "value": "Cities"
+      "value": "শহরসমূহ"
     }
   ],
   "label.city": [
     {
       "type": 0,
-      "value": "City"
+      "value": "শহর"
     }
   ],
   "label.clear-all": [
     {
       "type": 0,
-      "value": "Clear all"
+      "value": "সব মুছে ফেলুন"
     }
   ],
   "label.confirm": [
     {
       "type": 0,
-      "value": "Confirm"
+      "value": "নিশ্চিত করুন"
     }
   ],
   "label.confirm-password": [
@@ -164,55 +164,55 @@
   "label.contains": [
     {
       "type": 0,
-      "value": "Contains"
+      "value": "রয়েছে"
     }
   ],
   "label.continue": [
     {
       "type": 0,
-      "value": "Continue"
+      "value": "পরবর্তিতে"
     }
   ],
   "label.countries": [
     {
       "type": 0,
-      "value": "দেশ"
+      "value": "দেশসমূহ"
     }
   ],
   "label.country": [
     {
       "type": 0,
-      "value": "Country"
+      "value": "দেশ"
     }
   ],
   "label.create": [
     {
       "type": 0,
-      "value": "Create"
+      "value": "তৈরি করুন"
     }
   ],
   "label.create-report": [
     {
       "type": 0,
-      "value": "Create report"
+      "value": "রিপোর্ট তৈরি করুন"
     }
   ],
   "label.create-team": [
     {
       "type": 0,
-      "value": "Create team"
+      "value": "দল তৈরি করুন"
     }
   ],
   "label.create-user": [
     {
       "type": 0,
-      "value": "Create user"
+      "value": "ব্যবহারকারী তৈরি করুন"
     }
   ],
   "label.created": [
     {
       "type": 0,
-      "value": "Created"
+      "value": "তৈরি করা হয়েছে"
     }
   ],
   "label.created-by": [
diff --git a/src/lang/bn-BD.json b/src/lang/bn-BD.json
index 7436a002b5..fd91a3f4f3 100644
--- a/src/lang/bn-BD.json
+++ b/src/lang/bn-BD.json
@@ -1,41 +1,41 @@
 {
-  "label.access-code": "Access code",
+  "label.access-code": "এক্সেস কোড",
   "label.actions": "অ্যাকশনস",
-  "label.activity-log": "Activity log",
-  "label.add": "Add",
-  "label.add-description": "Add description",
-  "label.add-member": "Add member",
-  "label.add-step": "Add step",
+  "label.activity-log": "একটিভিটি দেখুন",
+  "label.add": "যুক্ত করুন",
+  "label.add-description": "বর্ননা যোগ করুন",
+  "label.add-member": "সদস্য যোগ করুন",
+  "label.add-step": "পদ যোগ করুন",
   "label.add-website": "ওয়েবসাইট যুক্ত করুন",
   "label.admin": "অ্যাডমিন",
-  "label.after": "After",
+  "label.after": "পরে",
   "label.all": "সবগুলো",
   "label.all-time": "সব সময়",
   "label.analytics": "Analytics",
   "label.average": "Average",
   "label.visit-duration": "গড় পরিদর্শনের সময়",
   "label.back": "পেছনে",
-  "label.before": "Before",
-  "label.bounce-rate": "বহিষ্কারের হার",
-  "label.breakdown": "Breakdown",
-  "label.browser": "Browser",
-  "label.browsers": "ব্রাউজার",
+  "label.before": "পূর্বে",
+  "label.bounce-rate": "উপরে উঠার হার",
+  "label.breakdown": "ভাঙ্গন",
+  "label.browser": "ব্রাউজার",
+  "label.browsers": "ব্রাউজার সমূহ",
   "label.cancel": "বাতিল",
   "label.change-password": "পাসওয়ার্ড পরিবর্তন করুন",
-  "label.cities": "Cities",
-  "label.city": "City",
-  "label.clear-all": "Clear all",
-  "label.confirm": "Confirm",
+  "label.cities": "শহরসমূহ",
+  "label.city": "শহর",
+  "label.clear-all": "সব মুছে ফেলুন",
+  "label.confirm": "নিশ্চিত করুন",
   "label.confirm-password": "পাসওয়ার্ড নিশ্চিত করুন",
-  "label.contains": "Contains",
-  "label.continue": "Continue",
-  "label.countries": "দেশ",
-  "label.country": "Country",
-  "label.create": "Create",
-  "label.create-report": "Create report",
-  "label.create-team": "Create team",
-  "label.create-user": "Create user",
-  "label.created": "Created",
+  "label.contains": "রয়েছে",
+  "label.continue": "পরবর্তিতে",
+  "label.countries": "দেশসমূহ",
+  "label.country": "দেশ",
+  "label.create": "তৈরি করুন",
+  "label.create-report": "রিপোর্ট তৈরি করুন",
+  "label.create-team": "দল তৈরি করুন",
+  "label.create-user": "ব্যবহারকারী তৈরি করুন",
+  "label.created": "তৈরি করা হয়েছে",
   "label.created-by": "Created By",
   "label.current-password": "বর্তমান পাসওয়ার্ড",
   "label.custom-range": "কাস্টম রেঞ্জ",

From 06c62a199c84c5b4bb89ebe99856f922cb3bb443 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 31 May 2024 19:25:04 -0700
Subject: [PATCH 119/438] Add filter to compare page.

---
 src/app/(main)/reports/create/ReportTemplates.tsx          | 7 -------
 .../websites/[websiteId]/compare/WebsiteComparePage.tsx    | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/app/(main)/reports/create/ReportTemplates.tsx b/src/app/(main)/reports/create/ReportTemplates.tsx
index 0777cc1f96..fdf5c5f527 100644
--- a/src/app/(main)/reports/create/ReportTemplates.tsx
+++ b/src/app/(main)/reports/create/ReportTemplates.tsx
@@ -6,7 +6,6 @@ import Lightbulb from 'assets/lightbulb.svg';
 import Magnet from 'assets/magnet.svg';
 import Tag from 'assets/tag.svg';
 import Target from 'assets/target.svg';
-import Path from 'assets/path.svg';
 import styles from './ReportTemplates.module.css';
 import { useMessages, useTeamUrl } from 'components/hooks';
 
@@ -45,12 +44,6 @@ export function ReportTemplates({ showHeader = true }: { showHeader?: boolean })
       url: renderTeamUrl('/reports/goals'),
       icon: <Target />,
     },
-    {
-      title: formatMessage(labels.journey),
-      description: formatMessage(labels.journeyDescription),
-      url: renderTeamUrl('/reports/journey'),
-      icon: <Path />,
-    },
   ];
 
   return (
diff --git a/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx b/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
index 092ebe94b3..1455b76fac 100644
--- a/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
+++ b/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
@@ -22,7 +22,7 @@ export function WebsiteComparePage({ websiteId }) {
     <WebsiteProvider websiteId={websiteId}>
       <WebsiteHeader websiteId={websiteId} />
       <FilterTags websiteId={websiteId} params={params} />
-      <WebsiteMetricsBar websiteId={websiteId} compareMode={true} />
+      <WebsiteMetricsBar websiteId={websiteId} compareMode={true} showFilter={true} />
       <WebsiteChart websiteId={websiteId} compareMode={true} />
       <WebsiteCompareTables websiteId={websiteId} />
     </WebsiteProvider>

From 8a722ff01396882c5303f1a8480b5a526f33a600 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Sat, 1 Jun 2024 11:45:06 -0700
Subject: [PATCH 120/438] Render view for user journey report.

---
 .../(main)/reports/create/ReportTemplates.tsx |  7 ++
 .../reports/journey/JourneyView.module.css    | 80 ++++++++++++++--
 .../(main)/reports/journey/JourneyView.tsx    | 94 ++++++++++++++++++-
 src/queries/analytics/reports/getJourney.ts   | 39 ++++----
 4 files changed, 186 insertions(+), 34 deletions(-)

diff --git a/src/app/(main)/reports/create/ReportTemplates.tsx b/src/app/(main)/reports/create/ReportTemplates.tsx
index fdf5c5f527..0777cc1f96 100644
--- a/src/app/(main)/reports/create/ReportTemplates.tsx
+++ b/src/app/(main)/reports/create/ReportTemplates.tsx
@@ -6,6 +6,7 @@ import Lightbulb from 'assets/lightbulb.svg';
 import Magnet from 'assets/magnet.svg';
 import Tag from 'assets/tag.svg';
 import Target from 'assets/target.svg';
+import Path from 'assets/path.svg';
 import styles from './ReportTemplates.module.css';
 import { useMessages, useTeamUrl } from 'components/hooks';
 
@@ -44,6 +45,12 @@ export function ReportTemplates({ showHeader = true }: { showHeader?: boolean })
       url: renderTeamUrl('/reports/goals'),
       icon: <Target />,
     },
+    {
+      title: formatMessage(labels.journey),
+      description: formatMessage(labels.journeyDescription),
+      url: renderTeamUrl('/reports/journey'),
+      icon: <Path />,
+    },
   ];
 
   return (
diff --git a/src/app/(main)/reports/journey/JourneyView.module.css b/src/app/(main)/reports/journey/JourneyView.module.css
index fa7cc0b429..4d5a96a4c8 100644
--- a/src/app/(main)/reports/journey/JourneyView.module.css
+++ b/src/app/(main)/reports/journey/JourneyView.module.css
@@ -1,14 +1,74 @@
-.title {
-  font-size: 24px;
-  line-height: 36px;
+.container {
+  height: 900px;
+  position: relative;
+}
+
+.view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  gap: 60px;
+  overflow: auto;
+}
+
+.header {
+  display: flex;
+  margin-bottom: 20px;
+}
+
+.num {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 100%;
+  width: 50px;
+  height: 50px;
+  font-size: 16px;
   font-weight: 700;
+  color: var(--base100);
+  background: var(--base800);
+  z-index: 1;
+  margin: 0 auto;
+}
+
+.column {
+  min-width: 300px;
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+
+.item {
+  cursor: pointer;
+  padding: 10px 20px;
+  background: var(--base75);
+  border-radius: 5px;
+}
+
+.item:hover:not(.highlight) {
+  color: var(--base900);
+  background: var(--base100);
+}
+
+.highlight {
+  color: var(--base75);
+  background: var(--base900);
+  font-weight: 400;
+}
+
+.behind {
+  color: var(--base400);
+}
+
+.ahead {
+  color: var(--base400);
 }
 
-.row {
-  display: grid;
-  grid-template-columns: 50% 50%;
-  gap: 20px;
-  border-bottom: 1px solid var(--base300);
-  padding-bottom: 30px;
-  margin-bottom: 30px;
+.current {
+  color: var(--base500);
 }
diff --git a/src/app/(main)/reports/journey/JourneyView.tsx b/src/app/(main)/reports/journey/JourneyView.tsx
index 6905d74cb0..ff1941dc03 100644
--- a/src/app/(main)/reports/journey/JourneyView.tsx
+++ b/src/app/(main)/reports/journey/JourneyView.tsx
@@ -1,13 +1,103 @@
-import { useContext } from 'react';
+import { useContext, useMemo, useState } from 'react';
 import { ReportContext } from '../[reportId]/Report';
+import { firstBy } from 'thenby';
+import styles from './JourneyView.module.css';
+import classNames from 'classnames';
+import { useEscapeKey } from 'components/hooks';
 
 export default function JourneyView() {
+  const [selected, setSelected] = useState(null);
   const { report } = useContext(ReportContext);
   const { data } = report || {};
+  useEscapeKey(() => setSelected(null));
+
+  const columns = useMemo(() => {
+    if (!data) {
+      return [];
+    }
+    return Array(data[0].items.length)
+      .fill(undefined)
+      .map((col = {}, index) => {
+        data.forEach(({ items, count }) => {
+          const item = items[index];
+
+          if (item) {
+            if (!col[item]) {
+              col[item] = {
+                item,
+                total: +count,
+                index,
+                paths: [
+                  data.filter((d, i) => {
+                    return d.items[index] === item && i !== index;
+                  }),
+                ],
+              };
+            } else {
+              col[item].total += +count;
+            }
+          }
+        });
+
+        return Object.keys(col)
+          .map(key => col[key])
+          .sort(firstBy('total', -1));
+      });
+  }, [data]);
+
+  const handleClick = (item: string, index: number, paths: any[]) => {
+    if (item !== selected?.item || index !== selected?.index) {
+      setSelected({ item, index, paths });
+    } else {
+      setSelected(null);
+    }
+  };
 
   if (!data) {
     return null;
   }
 
-  return <div>{JSON.stringify(data)}</div>;
+  return (
+    <div className={styles.container}>
+      <div className={styles.view}>
+        {columns.map((column, index) => {
+          const current = index === selected?.index;
+          const behind = index <= selected?.index - 1;
+          const ahead = index > selected?.index;
+
+          return (
+            <div
+              key={index}
+              className={classNames(styles.column, {
+                [styles.current]: current,
+                [styles.behind]: behind,
+                [styles.ahead]: ahead,
+              })}
+            >
+              <div className={styles.header}>
+                <div className={styles.num}>{index + 1}</div>
+              </div>
+              {column.map(({ item, total, paths }) => {
+                const highlight = selected?.paths.find(arr => {
+                  return arr.find(a => a.items[index] === item);
+                });
+
+                return (
+                  <div
+                    key={item}
+                    className={classNames(styles.item, {
+                      [styles.highlight]: highlight,
+                    })}
+                    onClick={() => handleClick(item, index, paths)}
+                  >
+                    {item} ({total})
+                  </div>
+                );
+              })}
+            </div>
+          );
+        })}
+      </div>
+    </div>
+  );
 }
diff --git a/src/queries/analytics/reports/getJourney.ts b/src/queries/analytics/reports/getJourney.ts
index 088f7ee888..a02bf9bf71 100644
--- a/src/queries/analytics/reports/getJourney.ts
+++ b/src/queries/analytics/reports/getJourney.ts
@@ -2,6 +2,15 @@ import clickhouse from 'lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import prisma from 'lib/prisma';
 
+interface JourneyResult {
+  e1: string;
+  e2: string;
+  e3: string;
+  e4: string;
+  e5: string;
+  count: string;
+}
+
 export async function getJourney(
   ...args: [
     websiteId: string,
@@ -23,16 +32,7 @@ async function relationalQuery(
     startDate: Date;
     endDate: Date;
   },
-): Promise<
-  {
-    e1: string;
-    e2: string;
-    e3: string;
-    e4: string;
-    e5: string;
-    count: string;
-  }[]
-> {
+): Promise<JourneyResult[]> {
   const { startDate, endDate } = filters;
   const { rawQuery } = prisma;
 
@@ -79,7 +79,7 @@ async function relationalQuery(
       startDate,
       endDate,
     },
-  );
+  ).then(parseResult);
 }
 
 async function clickhouseQuery(
@@ -88,16 +88,7 @@ async function clickhouseQuery(
     startDate: Date;
     endDate: Date;
   },
-): Promise<
-  {
-    e1: string;
-    e2: string;
-    e3: string;
-    e4: string;
-    e5: string;
-    count: string;
-  }[]
-> {
+): Promise<JourneyResult[]> {
   const { startDate, endDate } = filters;
   const { rawQuery } = clickhouse;
 
@@ -144,5 +135,9 @@ async function clickhouseQuery(
       startDate,
       endDate,
     },
-  );
+  ).then(parseResult);
+}
+
+function parseResult(data: any) {
+  return data.map(({ e1, e2, e3, e4, e5, count }) => ({ items: [e1, e2, e3, e4, e5], count }));
 }

From 4b67d10f045337bebb0c9569c8f101de38e86220 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Sat, 1 Jun 2024 14:06:17 -0700
Subject: [PATCH 121/438] Fixed teams urls.

---
 .../(main)/reports/[reportId]/ReportHeader.tsx |  2 +-
 .../teams/[teamId]/reports/goals/page.tsx      |  3 ---
 src/app/(main)/websites/WebsitesPage.tsx       |  5 ++++-
 src/app/(main)/websites/page.tsx               |  4 ++--
 src/components/common/Favicon.module.css       |  3 ---
 src/components/common/Favicon.tsx              |  3 ---
 src/components/metrics/ReferrersTable.tsx      | 18 ++++++++----------
 .../analytics/sessions/getSessionStats.ts      |  4 ++--
 8 files changed, 17 insertions(+), 25 deletions(-)
 delete mode 100644 src/app/(main)/teams/[teamId]/reports/goals/page.tsx
 delete mode 100644 src/components/common/Favicon.module.css

diff --git a/src/app/(main)/reports/[reportId]/ReportHeader.tsx b/src/app/(main)/reports/[reportId]/ReportHeader.tsx
index 2936d806ca..7ab80fcdfb 100644
--- a/src/app/(main)/reports/[reportId]/ReportHeader.tsx
+++ b/src/app/(main)/reports/[reportId]/ReportHeader.tsx
@@ -60,7 +60,7 @@ export function ReportHeader({ icon }) {
         <div className={styles.type}>
           <Breadcrumb
             data={[
-              { label: formatMessage(labels.reports), url: '/reports' },
+              { label: formatMessage(labels.reports), url: renderTeamUrl('/reports') },
               {
                 label: formatMessage(
                   labels[Object.keys(REPORT_TYPES).find(key => REPORT_TYPES[key] === report?.type)],
diff --git a/src/app/(main)/teams/[teamId]/reports/goals/page.tsx b/src/app/(main)/teams/[teamId]/reports/goals/page.tsx
deleted file mode 100644
index 34aab933fe..0000000000
--- a/src/app/(main)/teams/[teamId]/reports/goals/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import Page from 'app/(main)/reports/goals/page';
-
-export default Page;
diff --git a/src/app/(main)/websites/WebsitesPage.tsx b/src/app/(main)/websites/WebsitesPage.tsx
index 8d8ee2e261..d6f8524b21 100644
--- a/src/app/(main)/websites/WebsitesPage.tsx
+++ b/src/app/(main)/websites/WebsitesPage.tsx
@@ -1,8 +1,11 @@
 'use client';
 import WebsitesHeader from 'app/(main)/settings/websites/WebsitesHeader';
 import WebsitesDataTable from 'app/(main)/settings/websites/WebsitesDataTable';
+import { useTeamUrl } from 'components/hooks';
+
+export default function WebsitesPage() {
+  const { teamId } = useTeamUrl();
 
-export default function WebsitesPage({ teamId }: { teamId: string }) {
   return (
     <>
       <WebsitesHeader teamId={teamId} allowCreate={false} />
diff --git a/src/app/(main)/websites/page.tsx b/src/app/(main)/websites/page.tsx
index ee49cb8af8..859516c9d9 100644
--- a/src/app/(main)/websites/page.tsx
+++ b/src/app/(main)/websites/page.tsx
@@ -1,8 +1,8 @@
 import WebsitesPage from './WebsitesPage';
 import { Metadata } from 'next';
 
-export default function ({ params: { teamId, userId } }) {
-  return <WebsitesPage teamId={teamId} userId={userId} />;
+export default function () {
+  return <WebsitesPage />;
 }
 
 export const metadata: Metadata = {
diff --git a/src/components/common/Favicon.module.css b/src/components/common/Favicon.module.css
deleted file mode 100644
index f8972ad19f..0000000000
--- a/src/components/common/Favicon.module.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.favicon {
-  margin-inline-end: 8px;
-}
diff --git a/src/components/common/Favicon.tsx b/src/components/common/Favicon.tsx
index cdaeaf4bf6..e78bdbc7de 100644
--- a/src/components/common/Favicon.tsx
+++ b/src/components/common/Favicon.tsx
@@ -1,5 +1,3 @@
-import styles from './Favicon.module.css';
-
 function getHostName(url: string) {
   const match = url.match(/^(?:https?:\/\/)?(?:[^@\n]+@)?(?:www\.)?([^:/\n?=]+)/im);
   return match && match.length > 1 ? match[1] : null;
@@ -14,7 +12,6 @@ export function Favicon({ domain, ...props }) {
 
   return hostName ? (
     <img
-      className={styles.favicon}
       src={`https://icons.duckduckgo.com/ip3/${hostName}.ico`}
       width={16}
       height={16}
diff --git a/src/components/metrics/ReferrersTable.tsx b/src/components/metrics/ReferrersTable.tsx
index 7dceedd8a3..d83c4d1228 100644
--- a/src/components/metrics/ReferrersTable.tsx
+++ b/src/components/metrics/ReferrersTable.tsx
@@ -1,23 +1,21 @@
-import MetricsTable, { MetricsTableProps } from './MetricsTable';
 import FilterLink from 'components/common/FilterLink';
 import Favicon from 'components/common/Favicon';
 import { useMessages } from 'components/hooks';
-import { Flexbox } from 'react-basics';
+import MetricsTable, { MetricsTableProps } from './MetricsTable';
 
 export function ReferrersTable(props: MetricsTableProps) {
   const { formatMessage, labels } = useMessages();
 
   const renderLink = ({ x: referrer }) => {
     return (
-      <Flexbox alignItems="center">
+      <FilterLink
+        id="referrer"
+        value={referrer}
+        externalUrl={`https://${referrer}`}
+        label={!referrer && formatMessage(labels.none)}
+      >
         <Favicon domain={referrer} />
-        <FilterLink
-          id="referrer"
-          value={referrer}
-          externalUrl={`https://${referrer}`}
-          label={!referrer && formatMessage(labels.none)}
-        />
-      </Flexbox>
+      </FilterLink>
     );
   };
 
diff --git a/src/queries/analytics/sessions/getSessionStats.ts b/src/queries/analytics/sessions/getSessionStats.ts
index c977187df5..e3af7ba6d1 100644
--- a/src/queries/analytics/sessions/getSessionStats.ts
+++ b/src/queries/analytics/sessions/getSessionStats.ts
@@ -66,8 +66,8 @@ async function clickhouseQuery(
     order by t
     `,
     params,
-  ).then(a => {
-    return Object.values(a).map(a => {
+  ).then(result => {
+    return Object.values(result).map((a: any) => {
       return { x: a.x, y: Number(a.y) };
     });
   });

From 111c93be200567089442409bf970b7c2a71b8d2d Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Sat, 1 Jun 2024 19:55:44 -0700
Subject: [PATCH 122/438] Fixed all time not showing.

---
 src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
index 15fa1a84d4..b258a19f96 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
@@ -110,7 +110,7 @@ export function WebsiteMetricsBar({
       </div>
       <div className={styles.actions}>
         {showFilter && <WebsiteFilterButton websiteId={websiteId} />}
-        <WebsiteDateFilter websiteId={websiteId} showAllTime={false} />
+        <WebsiteDateFilter websiteId={websiteId} showAllTime={!compareMode} />
         {compareMode && (
           <div className={styles.vs}>
             <b>VS</b>

From b41ab4ec2a4834de1f0dfe2c80641bafa89c45d4 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 3 Jun 2024 09:33:58 -0700
Subject: [PATCH 123/438] remove Journey report

---
 .../(main)/reports/create/ReportTemplates.tsx | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/app/(main)/reports/create/ReportTemplates.tsx b/src/app/(main)/reports/create/ReportTemplates.tsx
index 0777cc1f96..bcbb989ad2 100644
--- a/src/app/(main)/reports/create/ReportTemplates.tsx
+++ b/src/app/(main)/reports/create/ReportTemplates.tsx
@@ -1,14 +1,13 @@
-import Link from 'next/link';
-import { Button, Icons, Text, Icon } from 'react-basics';
-import PageHeader from 'components/layout/PageHeader';
 import Funnel from 'assets/funnel.svg';
 import Lightbulb from 'assets/lightbulb.svg';
 import Magnet from 'assets/magnet.svg';
 import Tag from 'assets/tag.svg';
 import Target from 'assets/target.svg';
-import Path from 'assets/path.svg';
-import styles from './ReportTemplates.module.css';
 import { useMessages, useTeamUrl } from 'components/hooks';
+import PageHeader from 'components/layout/PageHeader';
+import Link from 'next/link';
+import { Button, Icon, Icons, Text } from 'react-basics';
+import styles from './ReportTemplates.module.css';
 
 export function ReportTemplates({ showHeader = true }: { showHeader?: boolean }) {
   const { formatMessage, labels } = useMessages();
@@ -45,12 +44,12 @@ export function ReportTemplates({ showHeader = true }: { showHeader?: boolean })
       url: renderTeamUrl('/reports/goals'),
       icon: <Target />,
     },
-    {
-      title: formatMessage(labels.journey),
-      description: formatMessage(labels.journeyDescription),
-      url: renderTeamUrl('/reports/journey'),
-      icon: <Path />,
-    },
+    // {
+    //   title: formatMessage(labels.journey),
+    //   description: formatMessage(labels.journeyDescription),
+    //   url: renderTeamUrl('/reports/journey'),
+    //   icon: <Path />,
+    // },
   ];
 
   return (

From d40807e6727b845fbf610bae844a51689179246a Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 3 Jun 2024 12:26:03 -0700
Subject: [PATCH 124/438] fix getReports for website, user, team

---
 src/app/(main)/reports/ReportsPage.tsx |  5 ++++-
 src/app/(main)/reports/page.tsx        |  4 ++--
 src/pages/api/reports/index.ts         | 28 +++++++++++++++++++++-----
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/app/(main)/reports/ReportsPage.tsx b/src/app/(main)/reports/ReportsPage.tsx
index a76a6a47ad..5b031cfae0 100644
--- a/src/app/(main)/reports/ReportsPage.tsx
+++ b/src/app/(main)/reports/ReportsPage.tsx
@@ -2,8 +2,11 @@
 import { Metadata } from 'next';
 import ReportsHeader from './ReportsHeader';
 import ReportsDataTable from './ReportsDataTable';
+import { useTeamUrl } from 'components/hooks';
+
+export default function ReportsPage() {
+  const { teamId } = useTeamUrl();
 
-export default function ReportsPage({ teamId }: { teamId: string }) {
   return (
     <>
       <ReportsHeader />
diff --git a/src/app/(main)/reports/page.tsx b/src/app/(main)/reports/page.tsx
index 4b495aca81..ef4e56ada0 100644
--- a/src/app/(main)/reports/page.tsx
+++ b/src/app/(main)/reports/page.tsx
@@ -1,8 +1,8 @@
 import ReportsPage from './ReportsPage';
 import { Metadata } from 'next';
 
-export default function ({ params: { teamId } }: { params: { teamId: string } }) {
-  return <ReportsPage teamId={teamId} />;
+export default function () {
+  return <ReportsPage />;
 }
 
 export const metadata: Metadata = {
diff --git a/src/pages/api/reports/index.ts b/src/pages/api/reports/index.ts
index 186a18211f..f9d4cca4de 100644
--- a/src/pages/api/reports/index.ts
+++ b/src/pages/api/reports/index.ts
@@ -66,11 +66,29 @@ export default async (
     const data = await getReports(
       {
         where: {
-          userId: !teamId && !websiteId ? userId : undefined,
-          websiteId,
-          website: {
-            teamId,
-          },
+          OR: [
+            ...(websiteId ? [{ websiteId }] : []),
+            ...(teamId
+              ? [
+                  {
+                    website: {
+                      deletedAt: null,
+                      teamId,
+                    },
+                  },
+                ]
+              : []),
+            ...(userId
+              ? [
+                  {
+                    website: {
+                      deletedAt: null,
+                      userId,
+                    },
+                  },
+                ]
+              : []),
+          ],
         },
         include: {
           website: {

From bafa3ad8c9904a47c8e722785e1bfde9c3bbf16d Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 3 Jun 2024 12:38:37 -0700
Subject: [PATCH 125/438] fix userId getReport query

---
 src/pages/api/reports/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/api/reports/index.ts b/src/pages/api/reports/index.ts
index f9d4cca4de..0698188c8c 100644
--- a/src/pages/api/reports/index.ts
+++ b/src/pages/api/reports/index.ts
@@ -78,7 +78,7 @@ export default async (
                   },
                 ]
               : []),
-            ...(userId
+            ...(userId && !websiteId && !teamId
               ? [
                   {
                     website: {

From 7a9b6a521dfc5bb2c5ae78fd7e57bcff871d2b02 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 3 Jun 2024 12:26:03 -0700
Subject: [PATCH 126/438] fix getReports for website, user, team

---
 src/app/(main)/reports/ReportsPage.tsx |  5 ++++-
 src/app/(main)/reports/page.tsx        |  4 ++--
 src/pages/api/reports/index.ts         | 28 +++++++++++++++++++++-----
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/app/(main)/reports/ReportsPage.tsx b/src/app/(main)/reports/ReportsPage.tsx
index a76a6a47ad..5b031cfae0 100644
--- a/src/app/(main)/reports/ReportsPage.tsx
+++ b/src/app/(main)/reports/ReportsPage.tsx
@@ -2,8 +2,11 @@
 import { Metadata } from 'next';
 import ReportsHeader from './ReportsHeader';
 import ReportsDataTable from './ReportsDataTable';
+import { useTeamUrl } from 'components/hooks';
+
+export default function ReportsPage() {
+  const { teamId } = useTeamUrl();
 
-export default function ReportsPage({ teamId }: { teamId: string }) {
   return (
     <>
       <ReportsHeader />
diff --git a/src/app/(main)/reports/page.tsx b/src/app/(main)/reports/page.tsx
index 4b495aca81..ef4e56ada0 100644
--- a/src/app/(main)/reports/page.tsx
+++ b/src/app/(main)/reports/page.tsx
@@ -1,8 +1,8 @@
 import ReportsPage from './ReportsPage';
 import { Metadata } from 'next';
 
-export default function ({ params: { teamId } }: { params: { teamId: string } }) {
-  return <ReportsPage teamId={teamId} />;
+export default function () {
+  return <ReportsPage />;
 }
 
 export const metadata: Metadata = {
diff --git a/src/pages/api/reports/index.ts b/src/pages/api/reports/index.ts
index 186a18211f..f9d4cca4de 100644
--- a/src/pages/api/reports/index.ts
+++ b/src/pages/api/reports/index.ts
@@ -66,11 +66,29 @@ export default async (
     const data = await getReports(
       {
         where: {
-          userId: !teamId && !websiteId ? userId : undefined,
-          websiteId,
-          website: {
-            teamId,
-          },
+          OR: [
+            ...(websiteId ? [{ websiteId }] : []),
+            ...(teamId
+              ? [
+                  {
+                    website: {
+                      deletedAt: null,
+                      teamId,
+                    },
+                  },
+                ]
+              : []),
+            ...(userId
+              ? [
+                  {
+                    website: {
+                      deletedAt: null,
+                      userId,
+                    },
+                  },
+                ]
+              : []),
+          ],
         },
         include: {
           website: {

From d24634ffbb89071619c1819dbf85b18b8bfe6c44 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 3 Jun 2024 12:38:37 -0700
Subject: [PATCH 127/438] fix userId getReport query

---
 src/pages/api/reports/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/api/reports/index.ts b/src/pages/api/reports/index.ts
index f9d4cca4de..0698188c8c 100644
--- a/src/pages/api/reports/index.ts
+++ b/src/pages/api/reports/index.ts
@@ -78,7 +78,7 @@ export default async (
                   },
                 ]
               : []),
-            ...(userId
+            ...(userId && !websiteId && !teamId
               ? [
                   {
                     website: {

From 3a6971e173747f2c889976ef5c77734868bae0da Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Mon, 3 Jun 2024 20:00:54 -0700
Subject: [PATCH 128/438] Ensure website id is passed to tracker.

---
 src/tracker/index.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/tracker/index.js b/src/tracker/index.js
index cc6b8dbbfe..97bf3bb06a 100644
--- a/src/tracker/index.js
+++ b/src/tracker/index.js
@@ -193,17 +193,21 @@
   /* Tracking functions */
 
   const trackingDisabled = () =>
+    !website ||
     (localStorage && localStorage.getItem('umami.disabled')) ||
     (domain && !domains.includes(hostname));
 
   const send = async (payload, type = 'event') => {
     if (trackingDisabled()) return;
+
     const headers = {
       'Content-Type': 'application/json',
     };
+
     if (typeof cache !== 'undefined') {
       headers['x-umami-cache'] = cache;
     }
+
     try {
       const res = await fetch(endpoint, {
         method: 'POST',

From 0333bec98682f8e426d27782995baedc0201c6b9 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 3 Jun 2024 23:40:38 -0700
Subject: [PATCH 129/438] finish clickhouse journeys query

---
 .../(main)/reports/[reportId]/ReportPage.tsx  |   8 +-
 .../reports/journey/JourneyParameters.tsx     |  24 +++-
 .../(main)/reports/journey/JourneyReport.tsx  |   2 +-
 .../(main)/reports/journey/JourneyView.tsx    |   5 +-
 src/components/messages.ts                    |   2 +
 src/pages/api/reports/index.ts                |   2 +-
 src/pages/api/reports/journey.ts              |  12 ++
 src/queries/analytics/reports/getJourney.ts   | 136 ++++++++++++++----
 8 files changed, 150 insertions(+), 41 deletions(-)

diff --git a/src/app/(main)/reports/[reportId]/ReportPage.tsx b/src/app/(main)/reports/[reportId]/ReportPage.tsx
index f28942b721..0965b20d3e 100644
--- a/src/app/(main)/reports/[reportId]/ReportPage.tsx
+++ b/src/app/(main)/reports/[reportId]/ReportPage.tsx
@@ -1,11 +1,12 @@
 'use client';
-import FunnelReport from '../funnel/FunnelReport';
+import { useReport } from 'components/hooks';
 import EventDataReport from '../event-data/EventDataReport';
+import FunnelReport from '../funnel/FunnelReport';
+import GoalReport from '../goals/GoalsReport';
 import InsightsReport from '../insights/InsightsReport';
+import JourneyReport from '../journey/JourneyReport';
 import RetentionReport from '../retention/RetentionReport';
 import UTMReport from '../utm/UTMReport';
-import GoalReport from '../goals/GoalsReport';
-import { useReport } from 'components/hooks';
 
 const reports = {
   funnel: FunnelReport,
@@ -14,6 +15,7 @@ const reports = {
   retention: RetentionReport,
   utm: UTMReport,
   goals: GoalReport,
+  journey: JourneyReport,
 };
 
 export default function ReportPage({ reportId }: { reportId: string }) {
diff --git a/src/app/(main)/reports/journey/JourneyParameters.tsx b/src/app/(main)/reports/journey/JourneyParameters.tsx
index b0544168b2..f140da1339 100644
--- a/src/app/(main)/reports/journey/JourneyParameters.tsx
+++ b/src/app/(main)/reports/journey/JourneyParameters.tsx
@@ -1,6 +1,6 @@
 import { useContext } from 'react';
 import { useMessages } from 'components/hooks';
-import { Form, FormButtons, SubmitButton } from 'react-basics';
+import { Form, FormButtons, FormInput, FormRow, SubmitButton, TextField } from 'react-basics';
 import { ReportContext } from '../[reportId]/Report';
 import BaseParameters from '../[reportId]/BaseParameters';
 
@@ -9,8 +9,8 @@ export function JourneyParameters() {
   const { formatMessage, labels } = useMessages();
 
   const { id, parameters } = report || {};
-  const { websiteId, dateRange } = parameters || {};
-  const queryDisabled = !websiteId || !dateRange;
+  const { websiteId, dateRange, steps } = parameters || {};
+  const queryDisabled = !websiteId || !dateRange || !steps;
 
   const handleSubmit = (data: any, e: any) => {
     e.stopPropagation();
@@ -24,6 +24,24 @@ export function JourneyParameters() {
   return (
     <Form values={parameters} onSubmit={handleSubmit} preventSubmit={true}>
       <BaseParameters showDateSelect={true} allowWebsiteSelect={!id} />
+      <FormRow label={`${formatMessage(labels.steps)} (3 to 7)`}>
+        <FormInput
+          name="steps"
+          rules={{ required: formatMessage(labels.required), pattern: /[0-9]+/, min: 3, max: 7 }}
+        >
+          <TextField autoComplete="off" />
+        </FormInput>
+      </FormRow>
+      <FormRow label={formatMessage(labels.startStep)}>
+        <FormInput name="startStep">
+          <TextField autoComplete="off" />
+        </FormInput>
+      </FormRow>
+      <FormRow label={formatMessage(labels.endStep)}>
+        <FormInput name="endStep">
+          <TextField autoComplete="off" />
+        </FormInput>
+      </FormRow>
       <FormButtons>
         <SubmitButton variant="primary" disabled={queryDisabled} isLoading={isRunning}>
           {formatMessage(labels.runQuery)}
diff --git a/src/app/(main)/reports/journey/JourneyReport.tsx b/src/app/(main)/reports/journey/JourneyReport.tsx
index 7b8927b4dc..9048b3d136 100644
--- a/src/app/(main)/reports/journey/JourneyReport.tsx
+++ b/src/app/(main)/reports/journey/JourneyReport.tsx
@@ -10,7 +10,7 @@ import { REPORT_TYPES } from 'lib/constants';
 
 const defaultParameters = {
   type: REPORT_TYPES.journey,
-  parameters: {},
+  parameters: { steps: 5 },
 };
 
 export default function JourneyReport({ reportId }: { reportId?: string }) {
diff --git a/src/app/(main)/reports/journey/JourneyView.tsx b/src/app/(main)/reports/journey/JourneyView.tsx
index ff1941dc03..921d82dde2 100644
--- a/src/app/(main)/reports/journey/JourneyView.tsx
+++ b/src/app/(main)/reports/journey/JourneyView.tsx
@@ -8,14 +8,13 @@ import { useEscapeKey } from 'components/hooks';
 export default function JourneyView() {
   const [selected, setSelected] = useState(null);
   const { report } = useContext(ReportContext);
-  const { data } = report || {};
+  const { data, parameters } = report || {};
   useEscapeKey(() => setSelected(null));
-
   const columns = useMemo(() => {
     if (!data) {
       return [];
     }
-    return Array(data[0].items.length)
+    return Array(Number(parameters.steps))
       .fill(undefined)
       .map((col = {}, index) => {
         data.forEach(({ items, count }) => {
diff --git a/src/components/messages.ts b/src/components/messages.ts
index 53e69401c9..a4c43af22b 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -240,6 +240,8 @@ export const labels = defineMessages({
     defaultMessage: 'Track your campaigns through UTM parameters.',
   },
   steps: { id: 'label.steps', defaultMessage: 'Steps' },
+  startStep: { id: 'label.start-step', defaultMessage: 'Start Step' },
+  endStep: { id: 'label.end-step', defaultMessage: 'End Step' },
   addStep: { id: 'label.add-step', defaultMessage: 'Add step' },
   goal: { id: 'label.goal', defaultMessage: 'Goal' },
   goals: { id: 'label.goals', defaultMessage: 'Goals' },
diff --git a/src/pages/api/reports/index.ts b/src/pages/api/reports/index.ts
index 0698188c8c..63e9c1d570 100644
--- a/src/pages/api/reports/index.ts
+++ b/src/pages/api/reports/index.ts
@@ -27,7 +27,7 @@ const schema = {
     name: yup.string().max(200).required(),
     type: yup
       .string()
-      .matches(/funnel|insights|retention|utm|goals/i)
+      .matches(/funnel|insights|retention|utm|goals|journey/i)
       .required(),
     description: yup.string().max(500),
     parameters: yup
diff --git a/src/pages/api/reports/journey.ts b/src/pages/api/reports/journey.ts
index 84246f05b8..dd3bd57bc7 100644
--- a/src/pages/api/reports/journey.ts
+++ b/src/pages/api/reports/journey.ts
@@ -9,6 +9,9 @@ import * as yup from 'yup';
 export interface RetentionRequestBody {
   websiteId: string;
   dateRange: { startDate: string; endDate: string };
+  steps: number;
+  startStep?: string;
+  endStep?: string;
 }
 
 const schema = {
@@ -21,6 +24,9 @@ const schema = {
         endDate: yup.date().required(),
       })
       .required(),
+    steps: yup.number().min(3).max(7).required(),
+    startStep: yup.string(),
+    endStep: yup.string(),
   }),
 };
 
@@ -36,6 +42,9 @@ export default async (
     const {
       websiteId,
       dateRange: { startDate, endDate },
+      steps,
+      startStep,
+      endStep,
     } = req.body;
 
     if (!(await canViewWebsite(req.auth, websiteId))) {
@@ -45,6 +54,9 @@ export default async (
     const data = await getJourney(websiteId, {
       startDate: new Date(startDate),
       endDate: new Date(endDate),
+      steps,
+      startStep,
+      endStep,
     });
 
     return ok(res, data);
diff --git a/src/queries/analytics/reports/getJourney.ts b/src/queries/analytics/reports/getJourney.ts
index a02bf9bf71..e7696f8df9 100644
--- a/src/queries/analytics/reports/getJourney.ts
+++ b/src/queries/analytics/reports/getJourney.ts
@@ -8,6 +8,8 @@ interface JourneyResult {
   e3: string;
   e4: string;
   e5: string;
+  e6: string;
+  e7: string;
   count: string;
 }
 
@@ -17,6 +19,9 @@ export async function getJourney(
     filters: {
       startDate: Date;
       endDate: Date;
+      steps: number;
+      startStep?: string;
+      endStep?: string;
     },
   ]
 ) {
@@ -49,14 +54,14 @@ async function relationalQuery(
           and created_at between {{startDate}} and {{endDate}}
           and referrer_path != url_path), 
     sequences as (
-      SELECT s.e1,
+      select s.e1,
             s.e2,
             s.e3,
             s.e4,
             s.e5,
             count(*) count
       FROM (
-          SELECT session_id,
+          select session_id,
               MAX(CASE WHEN event_number = 1 THEN event ELSE NULL END) AS e1,
               MAX(CASE WHEN event_number = 2 THEN event ELSE NULL END) AS e2,
               MAX(CASE WHEN event_number = 3 THEN event ELSE NULL END) AS e3,
@@ -87,46 +92,99 @@ async function clickhouseQuery(
   filters: {
     startDate: Date;
     endDate: Date;
+    steps: number;
+    startStep?: string;
+    endStep?: string;
   },
 ): Promise<JourneyResult[]> {
-  const { startDate, endDate } = filters;
+  const { startDate, endDate, steps, startStep, endStep } = filters;
   const { rawQuery } = clickhouse;
+  const { sequenceQuery, startStepQuery, endStepQuery, params } = getJourneyQuery(
+    steps,
+    startStep,
+    endStep,
+  );
+
+  function getJourneyQuery(
+    steps: number,
+    startStep?: string,
+    endStep?: string,
+  ): {
+    sequenceQuery: string;
+    startStepQuery: string;
+    endStepQuery: string;
+    params: { [key: string]: string };
+  } {
+    const params = {};
+    let sequenceQuery = '';
+    let startStepQuery = '';
+    let endStepQuery = '';
+
+    // create sequence query
+    let selectQuery = '';
+    let maxQuery = '';
+    let groupByQuery = '';
+
+    for (let i = 1; i <= steps; i++) {
+      const endQuery = i < steps ? ',' : '';
+      selectQuery += `s.e${i},`;
+      maxQuery += `\nmax(CASE WHEN event_number = ${i} THEN event ELSE NULL END) AS e${i}${endQuery}`;
+      groupByQuery += `s.e${i}${endQuery} `;
+    }
+
+    sequenceQuery = `\nsequences as (
+          select ${selectQuery}
+          count(*) count
+      FROM (
+        select visit_id,
+            ${maxQuery}
+        FROM events
+        group by visit_id) s
+      group by ${groupByQuery})
+    `;
+
+    // create start Step params query
+    if (startStep) {
+      startStepQuery = `and e1 = {startStep:String}`;
+      params['startStep'] = startStep;
+    }
+
+    // create end Step params query
+    if (endStep) {
+      for (let i = 1; i < steps; i++) {
+        const startQuery = i === 1 ? 'and (' : '\nor ';
+        endStepQuery += `${startQuery}(e${i} = {endStep:String} and e${i + 1} is null) `;
+      }
+      endStepQuery += `\nor (e${steps} = {endStep:String}))`;
+
+      params['endStep'] = endStep;
+    }
+
+    return {
+      sequenceQuery,
+      startStepQuery,
+      endStepQuery,
+      params,
+    };
+  }
 
   return rawQuery(
     `
     WITH events AS (
       select distinct
-          session_id,
+          visit_id,
           referrer_path,
           coalesce(nullIf(event_name, ''), url_path) event,
-          row_number() OVER (PARTITION BY session_id ORDER BY created_at) AS event_number
-      from umami.website_event 
+          row_number() OVER (PARTITION BY visit_id ORDER BY created_at) AS event_number
+      from umami.website_event
       where website_id = {websiteId:UUID}
-          and created_at between {startDate:DateTime64} and {endDate:DateTime64}
-          and referrer_path != url_path),
-    sequences as (
-        SELECT s.e1,
-            s.e2,
-            s.e3,
-            s.e4,
-            s.e5,
-            count(*) count
-        FROM (
-          SELECT session_id,
-              max(CASE WHEN event_number = 1 THEN event ELSE NULL END) AS e1,
-              max(CASE WHEN event_number = 2 THEN event ELSE NULL END) AS e2,
-              max(CASE WHEN event_number = 3 THEN event ELSE NULL END) AS e3,
-              max(CASE WHEN event_number = 4 THEN event ELSE NULL END) AS e4,
-              max(CASE WHEN event_number = 5 THEN event ELSE NULL END) AS e5
-          FROM events
-          group by session_id) s
-        group by s.e1,
-            s.e2,
-            s.e3,
-            s.e4,
-            s.e5)
+        and created_at between {startDate:DateTime64} and {endDate:DateTime64}),
+    ${sequenceQuery}
     select *
     from sequences
+    where 1 = 1
+    ${startStepQuery}
+    ${endStepQuery}
     order by count desc
     limit 100
     `,
@@ -134,10 +192,28 @@ async function clickhouseQuery(
       websiteId,
       startDate,
       endDate,
+      ...params,
     },
   ).then(parseResult);
 }
 
+function combineSequentialDuplicates(array: any) {
+  if (array.length === 0) return array;
+
+  const result = [array[0]];
+
+  for (let i = 1; i < array.length; i++) {
+    if (array[i] !== array[i - 1]) {
+      result.push(array[i]);
+    }
+  }
+
+  return result;
+}
+
 function parseResult(data: any) {
-  return data.map(({ e1, e2, e3, e4, e5, count }) => ({ items: [e1, e2, e3, e4, e5], count }));
+  return data.map(({ e1, e2, e3, e4, e5, e6, e7, count }) => ({
+    items: combineSequentialDuplicates([e1, e2, e3, e4, e5, e6, e7]),
+    count,
+  }));
 }

From 5dccfe33926bf9a83dd6867a86c857b3becc5321 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 4 Jun 2024 13:47:36 -0700
Subject: [PATCH 130/438] update journeys relational query

---
 src/queries/analytics/reports/getJourney.ts | 111 +++++++++++++++-----
 1 file changed, 82 insertions(+), 29 deletions(-)

diff --git a/src/queries/analytics/reports/getJourney.ts b/src/queries/analytics/reports/getJourney.ts
index e7696f8df9..34d166a597 100644
--- a/src/queries/analytics/reports/getJourney.ts
+++ b/src/queries/analytics/reports/getJourney.ts
@@ -36,46 +36,99 @@ async function relationalQuery(
   filters: {
     startDate: Date;
     endDate: Date;
+    steps: number;
+    startStep?: string;
+    endStep?: string;
   },
 ): Promise<JourneyResult[]> {
-  const { startDate, endDate } = filters;
+  const { startDate, endDate, steps, startStep, endStep } = filters;
   const { rawQuery } = prisma;
+  const { sequenceQuery, startStepQuery, endStepQuery, params } = getJourneyQuery(
+    steps,
+    startStep,
+    endStep,
+  );
+
+  function getJourneyQuery(
+    steps: number,
+    startStep?: string,
+    endStep?: string,
+  ): {
+    sequenceQuery: string;
+    startStepQuery: string;
+    endStepQuery: string;
+    params: { [key: string]: string };
+  } {
+    const params = {};
+    let sequenceQuery = '';
+    let startStepQuery = '';
+    let endStepQuery = '';
+
+    // create sequence query
+    let selectQuery = '';
+    let maxQuery = '';
+    let groupByQuery = '';
+
+    for (let i = 1; i <= steps; i++) {
+      const endQuery = i < steps ? ',' : '';
+      selectQuery += `s.e${i},`;
+      maxQuery += `\nmax(CASE WHEN event_number = ${i} THEN event ELSE NULL END) AS e${i}${endQuery}`;
+      groupByQuery += `s.e${i}${endQuery} `;
+    }
+
+    sequenceQuery = `\nsequences as (
+          select ${selectQuery}
+          count(*) count
+      FROM (
+        select visit_id,
+            ${maxQuery}
+        FROM events
+        group by visit_id) s
+      group by ${groupByQuery})
+    `;
+
+    // create start Step params query
+    if (startStep) {
+      startStepQuery = `and e1 = {{startStep}}`;
+      params['startStep'] = startStep;
+    }
+
+    // create end Step params query
+    if (endStep) {
+      for (let i = 1; i < steps; i++) {
+        const startQuery = i === 1 ? 'and (' : '\nor ';
+        endStepQuery += `${startQuery}(e${i} = {{endStep}} and e${i + 1} is null) `;
+      }
+      endStepQuery += `\nor (e${steps} = {{endStep}}))`;
+
+      params['endStep'] = endStep;
+    }
+
+    return {
+      sequenceQuery,
+      startStepQuery,
+      endStepQuery,
+      params,
+    };
+  }
 
   return rawQuery(
     `
     WITH events AS (
       select distinct
-          session_id,
+          visit_id,
           referrer_path,
-          COALESCE(event_name, url_path) event,
-          ROW_NUMBER() OVER (PARTITION BY session_id ORDER BY created_at) AS event_number
-      from website_event 
+          coalesce(nullIf(event_name, ''), url_path) event,
+          row_number() OVER (PARTITION BY visit_id ORDER BY created_at) AS event_number
+      from website_event
       where website_id = {{websiteId::uuid}}
-          and created_at between {{startDate}} and {{endDate}}
-          and referrer_path != url_path), 
-    sequences as (
-      select s.e1,
-            s.e2,
-            s.e3,
-            s.e4,
-            s.e5,
-            count(*) count
-      FROM (
-          select session_id,
-              MAX(CASE WHEN event_number = 1 THEN event ELSE NULL END) AS e1,
-              MAX(CASE WHEN event_number = 2 THEN event ELSE NULL END) AS e2,
-              MAX(CASE WHEN event_number = 3 THEN event ELSE NULL END) AS e3,
-              MAX(CASE WHEN event_number = 4 THEN event ELSE NULL END) AS e4,
-              MAX(CASE WHEN event_number = 5 THEN event ELSE NULL END) AS e5
-          FROM events
-          group by session_id) s
-      group by s.e1,
-            s.e2,
-            s.e3,
-            s.e4,
-            s.e5)
+        and created_at between {{startDate}} and {{endDate}}),
+    ${sequenceQuery}
     select *
     from sequences
+    where 1 = 1
+    ${startStepQuery}
+    ${endStepQuery}
     order by count desc
     limit 100
     `,
@@ -83,6 +136,7 @@ async function relationalQuery(
       websiteId,
       startDate,
       endDate,
+      ...params,
     },
   ).then(parseResult);
 }
@@ -173,7 +227,6 @@ async function clickhouseQuery(
     WITH events AS (
       select distinct
           visit_id,
-          referrer_path,
           coalesce(nullIf(event_name, ''), url_path) event,
           row_number() OVER (PARTITION BY visit_id ORDER BY created_at) AS event_number
       from umami.website_event

From cd3beefd4d7ba3737f903b54dfb1805955b04ae7 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 4 Jun 2024 16:07:25 -0700
Subject: [PATCH 131/438] fix path icon fill in dark mode

---
 src/assets/path.svg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/path.svg b/src/assets/path.svg
index 29501565ec..eb9e24ba90 100644
--- a/src/assets/path.svg
+++ b/src/assets/path.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" fill="none" viewBox="0 0 64 64"><path fill="#000" d="m56.4 47.6-6-6c-.8-.8-2-.8-2.8 0s-.8 2 0 2.8l2.6 2.6H18.5c-3.6 0-6.5-2.9-6.5-6.5s2.9-6.5 6.5-6.5h27C51.3 34 56 29.3 56 23.5S51.3 13 45.5 13H22.7c-.9-3.4-4-6-7.7-6-4.4 0-8 3.6-8 8s3.6 8 8 8c3.7 0 6.8-2.6 7.7-6h22.8c3.6 0 6.5 2.9 6.5 6.5S49.1 30 45.5 30h-27C12.7 30 8 34.7 8 40.5S12.7 51 18.5 51h31.7l-2.6 2.6c-.8.8-.8 2 0 2.8.4.4.9.6 1.4.6s1-.2 1.4-.6l6-6c.8-.8.8-2 0-2.8M15 19c-2.2 0-4-1.8-4-4s1.8-4 4-4 4 1.8 4 4-1.8 4-4 4"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" fill="none" viewBox="0 0 64 64"><path d="m56.4 47.6-6-6c-.8-.8-2-.8-2.8 0s-.8 2 0 2.8l2.6 2.6H18.5c-3.6 0-6.5-2.9-6.5-6.5s2.9-6.5 6.5-6.5h27C51.3 34 56 29.3 56 23.5S51.3 13 45.5 13H22.7c-.9-3.4-4-6-7.7-6-4.4 0-8 3.6-8 8s3.6 8 8 8c3.7 0 6.8-2.6 7.7-6h22.8c3.6 0 6.5 2.9 6.5 6.5S49.1 30 45.5 30h-27C12.7 30 8 34.7 8 40.5S12.7 51 18.5 51h31.7l-2.6 2.6c-.8.8-.8 2 0 2.8.4.4.9.6 1.4.6s1-.2 1.4-.6l6-6c.8-.8.8-2 0-2.8M15 19c-2.2 0-4-1.8-4-4s1.8-4 4-4 4 1.8 4 4-1.8 4-4 4"/></svg>
\ No newline at end of file

From d0607303a112a074a4ef48f1dd7c39ab6dd0be54 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 4 Jun 2024 19:53:49 -0700
Subject: [PATCH 132/438] Journey view update.

---
 .../reports/[reportId]/Report.module.css      |  1 +
 .../reports/[reportId]/ReportBody.module.css  |  2 +-
 .../(main)/reports/[reportId]/ReportBody.tsx  |  2 +-
 .../reports/journey/JourneyView.module.css    | 21 +++++--
 .../(main)/reports/journey/JourneyView.tsx    | 60 ++++++++++---------
 src/components/layout/Page.module.css         |  1 +
 6 files changed, 51 insertions(+), 36 deletions(-)

diff --git a/src/app/(main)/reports/[reportId]/Report.module.css b/src/app/(main)/reports/[reportId]/Report.module.css
index be5bb815bc..db65d00162 100644
--- a/src/app/(main)/reports/[reportId]/Report.module.css
+++ b/src/app/(main)/reports/[reportId]/Report.module.css
@@ -3,4 +3,5 @@
   grid-template-rows: max-content 1fr;
   grid-template-columns: max-content 1fr;
   margin-bottom: 60px;
+  height: 100%;
 }
diff --git a/src/app/(main)/reports/[reportId]/ReportBody.module.css b/src/app/(main)/reports/[reportId]/ReportBody.module.css
index 5fb4259a66..9af1070ab7 100644
--- a/src/app/(main)/reports/[reportId]/ReportBody.module.css
+++ b/src/app/(main)/reports/[reportId]/ReportBody.module.css
@@ -1,5 +1,5 @@
 .body {
   padding-inline-start: 20px;
-  grid-row: 2/3;
+  grid-row: 2 / 3;
   grid-column: 2 / 3;
 }
diff --git a/src/app/(main)/reports/[reportId]/ReportBody.tsx b/src/app/(main)/reports/[reportId]/ReportBody.tsx
index 6f4627f687..9a740c5ec7 100644
--- a/src/app/(main)/reports/[reportId]/ReportBody.tsx
+++ b/src/app/(main)/reports/[reportId]/ReportBody.tsx
@@ -1,6 +1,6 @@
-import styles from './ReportBody.module.css';
 import { useContext } from 'react';
 import { ReportContext } from './Report';
+import styles from './ReportBody.module.css';
 
 export function ReportBody({ children }) {
   const { report } = useContext(ReportContext);
diff --git a/src/app/(main)/reports/journey/JourneyView.module.css b/src/app/(main)/reports/journey/JourneyView.module.css
index 4d5a96a4c8..29ebb800af 100644
--- a/src/app/(main)/reports/journey/JourneyView.module.css
+++ b/src/app/(main)/reports/journey/JourneyView.module.css
@@ -1,5 +1,6 @@
 .container {
-  height: 900px;
+  width: 100%;
+  height: 100%;
   position: relative;
 }
 
@@ -12,13 +13,13 @@
   display: flex;
   flex-direction: row;
   flex-wrap: nowrap;
-  gap: 60px;
   overflow: auto;
+  gap: 100px;
 }
 
 .header {
   display: flex;
-  margin-bottom: 20px;
+  min-height: 70px;
 }
 
 .num {
@@ -37,7 +38,11 @@
 }
 
 .column {
-  min-width: 300px;
+  display: flex;
+  flex-direction: column;
+}
+
+.nodes {
   display: flex;
   flex-direction: column;
   gap: 10px;
@@ -48,14 +53,18 @@
   padding: 10px 20px;
   background: var(--base75);
   border-radius: 5px;
+  display: flex;
+  align-items: center;
+  min-width: 300px;
+  min-height: 60px;
 }
 
-.item:hover:not(.highlight) {
+.item:hover:not(.selected) {
   color: var(--base900);
   background: var(--base100);
 }
 
-.highlight {
+.selected {
   color: var(--base75);
   background: var(--base900);
   font-weight: 400;
diff --git a/src/app/(main)/reports/journey/JourneyView.tsx b/src/app/(main)/reports/journey/JourneyView.tsx
index 921d82dde2..00172f370c 100644
--- a/src/app/(main)/reports/journey/JourneyView.tsx
+++ b/src/app/(main)/reports/journey/JourneyView.tsx
@@ -1,15 +1,17 @@
 import { useContext, useMemo, useState } from 'react';
 import { ReportContext } from '../[reportId]/Report';
 import { firstBy } from 'thenby';
-import styles from './JourneyView.module.css';
 import classNames from 'classnames';
 import { useEscapeKey } from 'components/hooks';
+import styles from './JourneyView.module.css';
 
 export default function JourneyView() {
-  const [selected, setSelected] = useState(null);
+  const [selectedNode, setSelectedNode] = useState(null);
   const { report } = useContext(ReportContext);
   const { data, parameters } = report || {};
-  useEscapeKey(() => setSelected(null));
+
+  useEscapeKey(() => setSelectedNode(null));
+
   const columns = useMemo(() => {
     if (!data) {
       return [];
@@ -26,6 +28,9 @@ export default function JourneyView() {
                 item,
                 total: +count,
                 index,
+                selected: !!selectedNode?.paths.find(arr => {
+                  return arr.find(a => a.items[index] === item);
+                }),
                 paths: [
                   data.filter((d, i) => {
                     return d.items[index] === item && i !== index;
@@ -42,13 +47,13 @@ export default function JourneyView() {
           .map(key => col[key])
           .sort(firstBy('total', -1));
       });
-  }, [data]);
+  }, [data, selectedNode]);
 
   const handleClick = (item: string, index: number, paths: any[]) => {
-    if (item !== selected?.item || index !== selected?.index) {
-      setSelected({ item, index, paths });
+    if (item !== selectedNode?.item || index !== selectedNode?.index) {
+      setSelectedNode({ item, index, paths });
     } else {
-      setSelected(null);
+      setSelectedNode(null);
     }
   };
 
@@ -59,10 +64,10 @@ export default function JourneyView() {
   return (
     <div className={styles.container}>
       <div className={styles.view}>
-        {columns.map((column, index) => {
-          const current = index === selected?.index;
-          const behind = index <= selected?.index - 1;
-          const ahead = index > selected?.index;
+        {columns.map((nodes, index) => {
+          const current = index === selectedNode?.index;
+          const behind = index <= selectedNode?.index - 1;
+          const ahead = index > selectedNode?.index;
 
           return (
             <div
@@ -76,23 +81,22 @@ export default function JourneyView() {
               <div className={styles.header}>
                 <div className={styles.num}>{index + 1}</div>
               </div>
-              {column.map(({ item, total, paths }) => {
-                const highlight = selected?.paths.find(arr => {
-                  return arr.find(a => a.items[index] === item);
-                });
-
-                return (
-                  <div
-                    key={item}
-                    className={classNames(styles.item, {
-                      [styles.highlight]: highlight,
-                    })}
-                    onClick={() => handleClick(item, index, paths)}
-                  >
-                    {item} ({total})
-                  </div>
-                );
-              })}
+              <div className={styles.nodes}>
+                {nodes.map(({ item, total, selected, paths }, i) => {
+                  return (
+                    <div
+                      id={`node_${index}_${i}`}
+                      key={item}
+                      className={classNames(styles.item, {
+                        [styles.selected]: selected,
+                      })}
+                      onClick={() => handleClick(item, index, paths)}
+                    >
+                      {item} ({total})
+                    </div>
+                  );
+                })}
+              </div>
             </div>
           );
         })}
diff --git a/src/components/layout/Page.module.css b/src/components/layout/Page.module.css
index 52893157cf..d149812272 100644
--- a/src/components/layout/Page.module.css
+++ b/src/components/layout/Page.module.css
@@ -4,6 +4,7 @@
   flex-direction: column;
   position: relative;
   width: 100%;
+  height: 100%;
   max-width: 1320px;
   margin: 0 auto;
   padding: 0 20px;

From 9abb201d865fb6226b21b43723af4c17da977006 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Wed, 5 Jun 2024 15:09:33 -0700
Subject: [PATCH 133/438] Fixed change labels display.

---
 .../(main)/websites/[websiteId]/WebsiteMetricsBar.tsx |  2 +-
 src/components/metrics/ChangeLabel.tsx                | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
index b258a19f96..246a54b8b0 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
@@ -62,7 +62,7 @@ export function WebsiteMetricsBar({
           change:
             (Math.min(visitors.value, bounces.value) / visitors.value) * 100 -
             (Math.min(visitors.prev, bounces.prev) / visitors.prev) * 100,
-          formatValue: n => Number(n).toFixed(0) + '%',
+          formatValue: n => Math.round(+n) + '%',
           reverseColors: true,
         },
         {
diff --git a/src/components/metrics/ChangeLabel.tsx b/src/components/metrics/ChangeLabel.tsx
index 14eb1a8b81..7e7cb77b59 100644
--- a/src/components/metrics/ChangeLabel.tsx
+++ b/src/components/metrics/ChangeLabel.tsx
@@ -19,21 +19,22 @@ export function ChangeLabel({
   className?: string;
   children?: ReactNode;
 }) {
-  const positive = value * (reverseColors ? -1 : 1) >= 0;
-  const negative = value * (reverseColors ? -1 : 1) < 0;
+  const positive = value >= 0;
+  const negative = value < 0;
   const neutral = value === 0 || isNaN(value);
+  const good = reverseColors ? negative : positive;
 
   return (
     <div
       className={classNames(styles.label, className, {
-        [styles.positive]: positive,
-        [styles.negative]: negative,
+        [styles.positive]: good,
+        [styles.negative]: !good,
         [styles.neutral]: neutral,
       })}
       title={title}
     >
       {!neutral && (
-        <Icon rotate={value === 0 ? 0 : positive || reverseColors ? -90 : 90} size={size}>
+        <Icon rotate={positive ? -90 : 90} size={size}>
           <Icons.ArrowRight />
         </Icon>
       )}

From d5e14fb5a86de6f5c6985793adc4efc207ce2855 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Thu, 6 Jun 2024 22:30:58 -0700
Subject: [PATCH 134/438] Journey report view with nodes and lines.

---
 .../reports/journey/JourneyView.module.css    | 145 ++++++++++++++++
 .../(main)/reports/journey/JourneyView.tsx    | 162 ++++++++++++++----
 src/lib/data.ts                               |   4 +
 3 files changed, 280 insertions(+), 31 deletions(-)

diff --git a/src/app/(main)/reports/journey/JourneyView.module.css b/src/app/(main)/reports/journey/JourneyView.module.css
index 29ebb800af..a9d94251ee 100644
--- a/src/app/(main)/reports/journey/JourneyView.module.css
+++ b/src/app/(main)/reports/journey/JourneyView.module.css
@@ -2,6 +2,9 @@
   width: 100%;
   height: 100%;
   position: relative;
+
+  --journey-line-color: var(--base600);
+  --journey-active-color: var(--primary400);
 }
 
 .view {
@@ -43,18 +46,22 @@
 }
 
 .nodes {
+  position: relative;
   display: flex;
   flex-direction: column;
   gap: 10px;
+  height: 100%;
 }
 
 .item {
+  position: relative;
   cursor: pointer;
   padding: 10px 20px;
   background: var(--base75);
   border-radius: 5px;
   display: flex;
   align-items: center;
+  justify-content: space-between;
   min-width: 300px;
   min-height: 60px;
 }
@@ -70,6 +77,10 @@
   font-weight: 400;
 }
 
+.item.active {
+  background: var(--primary400);
+}
+
 .behind {
   color: var(--base400);
 }
@@ -81,3 +92,137 @@
 .current {
   color: var(--base500);
 }
+
+.name {
+  font-weight: 500;
+}
+
+.count {
+  border-radius: 4px;
+  padding: 5px 10px;
+  background: var(--base200);
+}
+
+.selected .count {
+  color: var(--base50);
+  background: var(--base800);
+}
+
+.line {
+  position: absolute;
+  left: -100px;
+  width: 100px;
+}
+
+.line.flat:before {
+  content: '';
+  position: absolute;
+  width: 97px;
+  left: 3px;
+  border-top: 3px solid var(--journey-line-color);
+}
+
+.line.fromUp:before {
+  content: '';
+  position: absolute;
+  top: -30px;
+  left: 50px;
+  margin-top: 3px;
+  margin-left: -3px;
+  border: 0;
+  border-bottom-left-radius: 100%;
+  border-left: 3px solid var(--journey-line-color);
+  border-bottom: 3px solid var(--journey-line-color);
+  width: 50px;
+  height: 30px;
+}
+
+.line.fromDown:before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 50px;
+  margin-left: -3px;
+  border: 0;
+  border-top-left-radius: 100%;
+  border-left: 3px solid var(--journey-line-color);
+  border-top: 3px solid var(--journey-line-color);
+  width: 50px;
+  height: 30px;
+}
+
+.line.fromUp:after,
+.line.fromDown:after {
+  content: '';
+  position: absolute;
+  top: -6px;
+  right: -6px;
+  margin: 0;
+  bottom: 0;
+  border-radius: 100%;
+  border: 3px solid var(--journey-line-color);
+  background: var(--base50);
+  width: 13px;
+  height: 13px;
+}
+
+.line.toUp:before {
+  content: '';
+  position: absolute;
+  top: -30px;
+  margin-top: 3px;
+  right: -350px;
+  border: 0;
+  border-bottom-right-radius: 100%;
+  border-right: 3px solid var(--journey-line-color);
+  border-bottom: 3px solid var(--journey-line-color);
+  width: 50px;
+  height: 30px;
+}
+
+.line.toDown:before {
+  content: '';
+  position: absolute;
+  top: 0;
+  right: -350px;
+  border: 0;
+  border-top-right-radius: 100%;
+  border-right: 3px solid var(--journey-line-color);
+  border-top: 3px solid var(--journey-line-color);
+  width: 50px;
+  height: 30px;
+}
+
+.line.toUp:after,
+.line.toDown:after {
+  content: '';
+  position: absolute;
+  top: -6px;
+  right: -306px;
+  margin: 0;
+  bottom: 0;
+  border-radius: 100%;
+  border: 3px solid var(--journey-line-color);
+  background: var(--base50);
+  width: 13px;
+  height: 13px;
+}
+
+.bar {
+  position: absolute;
+  left: -100px;
+  width: 50px;
+  height: 20px;
+  border-right: 3px solid var(--journey-line-color);
+}
+
+.item.active .bar,
+.item.active .line:before,
+.item.active .line:after {
+  border-color: var(--journey-active-color);
+  z-index: 1;
+}
+
+.item.active .count {
+  background: var(--primary600);
+}
diff --git a/src/app/(main)/reports/journey/JourneyView.tsx b/src/app/(main)/reports/journey/JourneyView.tsx
index 00172f370c..1b9333c343 100644
--- a/src/app/(main)/reports/journey/JourneyView.tsx
+++ b/src/app/(main)/reports/journey/JourneyView.tsx
@@ -1,12 +1,19 @@
 import { useContext, useMemo, useState } from 'react';
-import { ReportContext } from '../[reportId]/Report';
 import { firstBy } from 'thenby';
 import classNames from 'classnames';
 import { useEscapeKey } from 'components/hooks';
+import { objectToArray } from 'lib/data';
+import { ReportContext } from '../[reportId]/Report';
+// eslint-disable-next-line css-modules/no-unused-class
 import styles from './JourneyView.module.css';
 
+const NODE_HEIGHT = 60;
+const NODE_GAP = 10;
+const BAR_OFFSET = 3;
+
 export default function JourneyView() {
   const [selectedNode, setSelectedNode] = useState(null);
+  const [activeNode, setActiveNode] = useState(null);
   const { report } = useContext(ReportContext);
   const { data, parameters } = report || {};
 
@@ -18,34 +25,63 @@ export default function JourneyView() {
     }
     return Array(Number(parameters.steps))
       .fill(undefined)
-      .map((col = {}, index) => {
+      .map((column = {}, index) => {
         data.forEach(({ items, count }) => {
-          const item = items[index];
+          const name = items[index];
+          const selectedNodes = selectedNode?.paths ?? [];
+
+          if (name) {
+            if (!column[name]) {
+              const selected = !!selectedNodes.find(a => a.items[index] === name);
+              const paths = data.filter((d, i) => {
+                return i !== index && d.items[index] === name;
+              });
+              const from =
+                index > 0 &&
+                selected &&
+                paths.reduce((obj, path) => {
+                  const { items, count } = path;
+                  const name = items[index - 1];
+                  if (!obj[name]) {
+                    obj[name] = { name, count: +count };
+                  } else {
+                    obj[name].count += +count;
+                  }
+                  return obj;
+                }, {});
+              const to =
+                selected &&
+                paths.reduce((obj, path) => {
+                  const { items, count } = path;
+                  const name = items[index + 1];
+                  if (name) {
+                    if (!obj[name]) {
+                      obj[name] = { name, count: +count };
+                    } else {
+                      obj[name].count += +count;
+                    }
+                  }
+                  return obj;
+                }, {});
 
-          if (item) {
-            if (!col[item]) {
-              col[item] = {
-                item,
+              column[name] = {
+                name,
                 total: +count,
-                index,
-                selected: !!selectedNode?.paths.find(arr => {
-                  return arr.find(a => a.items[index] === item);
-                }),
-                paths: [
-                  data.filter((d, i) => {
-                    return d.items[index] === item && i !== index;
-                  }),
-                ],
+                columnIndex: index,
+                selected,
+                paths,
+                from: objectToArray(from),
+                to: objectToArray(to),
               };
             } else {
-              col[item].total += +count;
+              column[name].total += +count;
             }
           }
         });
 
-        return Object.keys(col)
-          .map(key => col[key])
-          .sort(firstBy('total', -1));
+        return {
+          nodes: objectToArray(column).sort(firstBy('total', -1)),
+        };
       });
   }, [data, selectedNode]);
 
@@ -61,17 +97,19 @@ export default function JourneyView() {
     return null;
   }
 
+  //console.log({ columns, selectedNode, activeNode });
+
   return (
     <div className={styles.container}>
       <div className={styles.view}>
-        {columns.map((nodes, index) => {
-          const current = index === selectedNode?.index;
-          const behind = index <= selectedNode?.index - 1;
-          const ahead = index > selectedNode?.index;
+        {columns.map((column, columnIndex) => {
+          const current = columnIndex === selectedNode?.index;
+          const behind = columnIndex <= selectedNode?.index - 1;
+          const ahead = columnIndex > selectedNode?.index;
 
           return (
             <div
-              key={index}
+              key={columnIndex}
               className={classNames(styles.column, {
                 [styles.current]: current,
                 [styles.behind]: behind,
@@ -79,20 +117,82 @@ export default function JourneyView() {
               })}
             >
               <div className={styles.header}>
-                <div className={styles.num}>{index + 1}</div>
+                <div className={styles.num}>{columnIndex + 1}</div>
               </div>
               <div className={styles.nodes}>
-                {nodes.map(({ item, total, selected, paths }, i) => {
+                {column.nodes.map(({ name, total, selected, paths, from, to }, nodeIndex) => {
+                  const active =
+                    selected && activeNode?.paths.find(path => path.items[columnIndex] === name);
+                  const bars = [];
+                  const lines = from?.reduce(
+                    (obj: { flat: boolean; fromUp: boolean; fromDown: boolean }, { name }: any) => {
+                      const fromIndex = columns[columnIndex - 1]?.nodes.findIndex(node => {
+                        return node.name === name && node.selected;
+                      });
+
+                      if (fromIndex > -1) {
+                        if (nodeIndex === fromIndex) {
+                          obj.flat = true;
+                        } else if (nodeIndex > fromIndex) {
+                          obj.fromUp = true;
+                          bars.push([fromIndex, nodeIndex, 1]);
+                        } else if (nodeIndex < fromIndex) {
+                          obj.fromDown = true;
+                          bars.push([nodeIndex, fromIndex, 0]);
+                        }
+                      }
+
+                      return obj;
+                    },
+                    {},
+                  );
+
+                  to?.reduce((obj: { toUp: boolean; toDown: boolean }, { name }: any) => {
+                    const toIndex = columns[columnIndex + 1]?.nodes.findIndex(node => {
+                      return node.name === name && node.selected;
+                    });
+
+                    if (toIndex > -1) {
+                      if (nodeIndex > toIndex) {
+                        obj.toUp = true;
+                      } else if (nodeIndex < toIndex) {
+                        obj.toDown = true;
+                      }
+                    }
+
+                    return obj;
+                  }, lines);
+
                   return (
                     <div
-                      id={`node_${index}_${i}`}
-                      key={item}
+                      key={name}
                       className={classNames(styles.item, {
                         [styles.selected]: selected,
+                        [styles.active]: active,
                       })}
-                      onClick={() => handleClick(item, index, paths)}
+                      onClick={() => handleClick(name, columnIndex, paths)}
+                      onMouseEnter={() => selected && setActiveNode({ name, columnIndex, paths })}
+                      onMouseLeave={() => selected && setActiveNode(null)}
                     >
-                      {item} ({total})
+                      <div className={styles.name}>{name}</div>
+                      <div className={styles.count}>{total}</div>
+                      {Object.keys(lines).map(key => {
+                        return <div key={key} className={classNames(styles.line, styles[key])} />;
+                      })}
+                      {columnIndex < columns.length &&
+                        bars.map(([a, b, d], i) => {
+                          const height = (b - a - 1) * (NODE_HEIGHT + NODE_GAP) + NODE_GAP;
+                          return (
+                            <div
+                              key={i}
+                              className={styles.bar}
+                              style={{
+                                height: height + BAR_OFFSET,
+                                top: d ? -height : NODE_HEIGHT,
+                              }}
+                            />
+                          );
+                        })}
                     </div>
                   );
                 })}
diff --git a/src/lib/data.ts b/src/lib/data.ts
index 24c76dd04c..cf2722b5c0 100644
--- a/src/lib/data.ts
+++ b/src/lib/data.ts
@@ -88,3 +88,7 @@ function getKeyName(key: string, parentKey: string) {
 
   return `${parentKey}.${key}`;
 }
+
+export function objectToArray(obj: object) {
+  return Object.keys(obj).map(key => obj[key]);
+}

From 8b410096bdb760482cf86997abe202dff82f99b8 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Fri, 7 Jun 2024 10:30:14 -0700
Subject: [PATCH 135/438] prevent report date range from overflowing

---
 src/app/(main)/reports/[reportId]/BaseParameters.module.css | 3 +++
 src/app/(main)/reports/[reportId]/BaseParameters.tsx        | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 src/app/(main)/reports/[reportId]/BaseParameters.module.css

diff --git a/src/app/(main)/reports/[reportId]/BaseParameters.module.css b/src/app/(main)/reports/[reportId]/BaseParameters.module.css
new file mode 100644
index 0000000000..4750c7d736
--- /dev/null
+++ b/src/app/(main)/reports/[reportId]/BaseParameters.module.css
@@ -0,0 +1,3 @@
+.dropdown div {
+  max-height: 300px;
+}
diff --git a/src/app/(main)/reports/[reportId]/BaseParameters.tsx b/src/app/(main)/reports/[reportId]/BaseParameters.tsx
index 49c3347e85..77de51f33d 100644
--- a/src/app/(main)/reports/[reportId]/BaseParameters.tsx
+++ b/src/app/(main)/reports/[reportId]/BaseParameters.tsx
@@ -5,6 +5,7 @@ import DateFilter from 'components/input/DateFilter';
 import WebsiteSelect from 'components/input/WebsiteSelect';
 import { useMessages, useTeamUrl, useWebsite } from 'components/hooks';
 import { ReportContext } from './Report';
+import styles from './BaseParameters.module.css';
 
 export interface BaseParametersProps {
   showWebsiteSelect?: boolean;
@@ -48,7 +49,7 @@ export function BaseParameters({
         </FormRow>
       )}
       {showDateSelect && (
-        <FormRow label={formatMessage(labels.dateRange)}>
+        <FormRow label={formatMessage(labels.dateRange)} className={styles.dropdown}>
           {allowDateSelect && (
             <DateFilter
               value={value}

From e8a605af39724b8c6fa6e4a30767f4689150d2e8 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Fri, 7 Jun 2024 11:45:49 -0700
Subject: [PATCH 136/438] add dropped off node

---
 src/queries/analytics/reports/getJourney.ts | 34 ++++++++++++++++++---
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/queries/analytics/reports/getJourney.ts b/src/queries/analytics/reports/getJourney.ts
index 34d166a597..24879a86fa 100644
--- a/src/queries/analytics/reports/getJourney.ts
+++ b/src/queries/analytics/reports/getJourney.ts
@@ -43,7 +43,7 @@ async function relationalQuery(
 ): Promise<JourneyResult[]> {
   const { startDate, endDate, steps, startStep, endStep } = filters;
   const { rawQuery } = prisma;
-  const { sequenceQuery, startStepQuery, endStepQuery, params } = getJourneyQuery(
+  const { sequenceQuery, startStepQuery, endStepQuery, finalSelectQuery, params } = getJourneyQuery(
     steps,
     startStep,
     endStep,
@@ -57,12 +57,14 @@ async function relationalQuery(
     sequenceQuery: string;
     startStepQuery: string;
     endStepQuery: string;
+    finalSelectQuery: string;
     params: { [key: string]: string };
   } {
     const params = {};
     let sequenceQuery = '';
     let startStepQuery = '';
     let endStepQuery = '';
+    let finalSelectQuery = '';
 
     // create sequence query
     let selectQuery = '';
@@ -104,10 +106,18 @@ async function relationalQuery(
       params['endStep'] = endStep;
     }
 
+    // create final select query
+    for (let i = 1; i < steps; i++) {
+      finalSelectQuery += `\nCASE WHEN e${i} IS NOT NULL and e${
+        i + 1
+      } IS NULL THEN 'dropped off' ELSE e${i + 1} END AS e${i + 1},`;
+    }
+
     return {
       sequenceQuery,
       startStepQuery,
       endStepQuery,
+      finalSelectQuery,
       params,
     };
   }
@@ -124,7 +134,9 @@ async function relationalQuery(
       where website_id = {{websiteId::uuid}}
         and created_at between {{startDate}} and {{endDate}}),
     ${sequenceQuery}
-    select *
+    select e1,
+        ${finalSelectQuery}
+        count
     from sequences
     where 1 = 1
     ${startStepQuery}
@@ -153,7 +165,7 @@ async function clickhouseQuery(
 ): Promise<JourneyResult[]> {
   const { startDate, endDate, steps, startStep, endStep } = filters;
   const { rawQuery } = clickhouse;
-  const { sequenceQuery, startStepQuery, endStepQuery, params } = getJourneyQuery(
+  const { sequenceQuery, startStepQuery, endStepQuery, finalSelectQuery, params } = getJourneyQuery(
     steps,
     startStep,
     endStep,
@@ -167,12 +179,14 @@ async function clickhouseQuery(
     sequenceQuery: string;
     startStepQuery: string;
     endStepQuery: string;
+    finalSelectQuery: string;
     params: { [key: string]: string };
   } {
     const params = {};
     let sequenceQuery = '';
     let startStepQuery = '';
     let endStepQuery = '';
+    let finalSelectQuery = '';
 
     // create sequence query
     let selectQuery = '';
@@ -207,17 +221,25 @@ async function clickhouseQuery(
     if (endStep) {
       for (let i = 1; i < steps; i++) {
         const startQuery = i === 1 ? 'and (' : '\nor ';
-        endStepQuery += `${startQuery}(e${i} = {endStep:String} and e${i + 1} is null) `;
+        endStepQuery += `${startQuery}(e${i} = {endStep:String} and e${i + 1} = 'dropped off') `;
       }
       endStepQuery += `\nor (e${steps} = {endStep:String}))`;
 
       params['endStep'] = endStep;
     }
 
+    // create final select query
+    for (let i = 1; i < steps; i++) {
+      finalSelectQuery += `\nCASE WHEN e${i} IS NOT NULL and e${
+        i + 1
+      } IS NULL THEN 'dropped off' ELSE e${i + 1} END AS e${i + 1},`;
+    }
+
     return {
       sequenceQuery,
       startStepQuery,
       endStepQuery,
+      finalSelectQuery,
       params,
     };
   }
@@ -233,7 +255,9 @@ async function clickhouseQuery(
       where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}),
     ${sequenceQuery}
-    select *
+    select e1,
+        ${finalSelectQuery}
+        count
     from sequences
     where 1 = 1
     ${startStepQuery}

From 8362d883d1c0c8a46491a3fe89f97cde8e6b4e87 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Fri, 7 Jun 2024 22:44:00 -0700
Subject: [PATCH 137/438] Refactored line rendering.

---
 .../reports/journey/JourneyView.module.css    | 177 ++++++++++--------
 .../(main)/reports/journey/JourneyView.tsx    | 114 +++++------
 2 files changed, 143 insertions(+), 148 deletions(-)

diff --git a/src/app/(main)/reports/journey/JourneyView.module.css b/src/app/(main)/reports/journey/JourneyView.module.css
index a9d94251ee..b4297b5f91 100644
--- a/src/app/(main)/reports/journey/JourneyView.module.css
+++ b/src/app/(main)/reports/journey/JourneyView.module.css
@@ -5,6 +5,7 @@
 
   --journey-line-color: var(--base600);
   --journey-active-color: var(--primary400);
+  --journey-faded-color: var(--base300);
 }
 
 .view {
@@ -71,16 +72,21 @@
   background: var(--base100);
 }
 
-.selected {
+.item.selected {
   color: var(--base75);
   background: var(--base900);
   font-weight: 400;
 }
 
 .item.active {
+  color: var(--light50);
   background: var(--primary400);
 }
 
+.item.active .count {
+  background: var(--primary600);
+}
+
 .behind {
   color: var(--base400);
 }
@@ -110,119 +116,136 @@
 
 .line {
   position: absolute;
+  bottom: 0;
   left: -100px;
   width: 100px;
 }
 
-.line.flat:before {
-  content: '';
-  position: absolute;
-  width: 97px;
-  left: 3px;
-  border-top: 3px solid var(--journey-line-color);
+.line.up {
+  bottom: 0;
 }
 
-.line.fromUp:before {
-  content: '';
-  position: absolute;
-  top: -30px;
-  left: 50px;
-  margin-top: 3px;
-  margin-left: -3px;
-  border: 0;
-  border-bottom-left-radius: 100%;
-  border-left: 3px solid var(--journey-line-color);
-  border-bottom: 3px solid var(--journey-line-color);
-  width: 50px;
-  height: 30px;
+.line.down {
+  top: 0;
 }
 
-.line.fromDown:before {
-  content: '';
+.segment {
   position: absolute;
-  top: 0;
-  left: 50px;
-  margin-left: -3px;
-  border: 0;
-  border-top-left-radius: 100%;
-  border-left: 3px solid var(--journey-line-color);
-  border-top: 3px solid var(--journey-line-color);
+}
+
+.start {
+  left: 0;
   width: 50px;
   height: 30px;
+  border: 0;
 }
 
-.line.fromUp:after,
-.line.fromDown:after {
-  content: '';
-  position: absolute;
-  top: -6px;
-  right: -6px;
-  margin: 0;
-  bottom: 0;
-  border-radius: 100%;
-  border: 3px solid var(--journey-line-color);
-  background: var(--base50);
-  width: 13px;
-  height: 13px;
+.mid {
+  top: 60px;
+  width: 50px;
+  border-right: 3px solid var(--journey-line-color);
 }
 
-.line.toUp:before {
-  content: '';
-  position: absolute;
-  top: -30px;
-  margin-top: 3px;
-  right: -350px;
-  border: 0;
-  border-bottom-right-radius: 100%;
-  border-right: 3px solid var(--journey-line-color);
-  border-bottom: 3px solid var(--journey-line-color);
+.end {
+  right: 0;
   width: 50px;
   height: 30px;
+  border: 0;
 }
 
-.line.toDown:before {
-  content: '';
-  position: absolute;
-  top: 0;
-  right: -350px;
-  border: 0;
+.up .start {
+  top: 30px;
   border-top-right-radius: 100%;
+  border-top: 3px solid var(--journey-line-color);
   border-right: 3px solid var(--journey-line-color);
+}
+
+.up .end {
+  width: 53px;
+  bottom: 27px;
+  right: 0;
+  border-bottom-left-radius: 100%;
+  border-bottom: 3px solid var(--journey-line-color);
+  border-left: 3px solid var(--journey-line-color);
+}
+
+.down .start {
+  bottom: 27px;
+  border-bottom-right-radius: 100%;
+  border-bottom: 3px solid var(--journey-line-color);
+  border-right: 3px solid var(--journey-line-color);
+}
+
+.down .end {
+  width: 53px;
+  top: 30px;
+  right: 0;
+  border-top-left-radius: 100%;
   border-top: 3px solid var(--journey-line-color);
+  border-left: 3px solid var(--journey-line-color);
+}
+
+.flat .start {
+  top: 30px;
   width: 50px;
-  height: 30px;
+  border-top: 3px solid var(--journey-line-color);
+}
+
+.flat .end {
+  right: 0;
+  bottom: 27px;
+  width: 50px;
+  border-bottom: 3px solid var(--journey-line-color);
 }
 
-.line.toUp:after,
-.line.toDown:after {
+.start:before,
+.end:before {
   content: '';
   position: absolute;
-  top: -6px;
-  right: -306px;
-  margin: 0;
-  bottom: 0;
   border-radius: 100%;
   border: 3px solid var(--journey-line-color);
-  background: var(--base50);
+  background: var(--light50);
   width: 13px;
   height: 13px;
 }
 
-.bar {
-  position: absolute;
-  left: -100px;
-  width: 50px;
-  height: 20px;
-  border-right: 3px solid var(--journey-line-color);
+.line:not(.active) .start:before,
+.line:not(.active) .end:before {
+  display: none;
 }
 
-.item.active .bar,
-.item.active .line:before,
-.item.active .line:after {
+.up .start:before,
+.flat .start:before {
+  left: -8px;
+  top: -8px;
+}
+
+.up .end:before,
+.flat .end:before {
+  right: -8px;
+  bottom: -8px;
+}
+
+.down .start:before {
+  left: -8px;
+  bottom: -8px;
+}
+
+.down .end:before {
+  right: -8px;
+  top: -8px;
+}
+
+.line.active .segment,
+.line.active .segment:before {
   border-color: var(--journey-active-color);
   z-index: 1;
 }
 
-.item.active .count {
-  background: var(--primary600);
+.column.active .line:not(.active) .segment {
+  border-color: var(--journey-faded-color);
+}
+
+.column.active .line:not(.active) .segment:before {
+  display: none;
 }
diff --git a/src/app/(main)/reports/journey/JourneyView.tsx b/src/app/(main)/reports/journey/JourneyView.tsx
index 1b9333c343..fe2d772969 100644
--- a/src/app/(main)/reports/journey/JourneyView.tsx
+++ b/src/app/(main)/reports/journey/JourneyView.tsx
@@ -9,7 +9,7 @@ import styles from './JourneyView.module.css';
 
 const NODE_HEIGHT = 60;
 const NODE_GAP = 10;
-const BAR_OFFSET = 3;
+const LINE_WIDTH = 3;
 
 export default function JourneyView() {
   const [selectedNode, setSelectedNode] = useState(null);
@@ -49,20 +49,6 @@ export default function JourneyView() {
                   }
                   return obj;
                 }, {});
-              const to =
-                selected &&
-                paths.reduce((obj, path) => {
-                  const { items, count } = path;
-                  const name = items[index + 1];
-                  if (name) {
-                    if (!obj[name]) {
-                      obj[name] = { name, count: +count };
-                    } else {
-                      obj[name].count += +count;
-                    }
-                  }
-                  return obj;
-                }, {});
 
               column[name] = {
                 name,
@@ -71,7 +57,6 @@ export default function JourneyView() {
                 selected,
                 paths,
                 from: objectToArray(from),
-                to: objectToArray(to),
               };
             } else {
               column[name].total += +count;
@@ -103,65 +88,30 @@ export default function JourneyView() {
     <div className={styles.container}>
       <div className={styles.view}>
         {columns.map((column, columnIndex) => {
-          const current = columnIndex === selectedNode?.index;
-          const behind = columnIndex <= selectedNode?.index - 1;
-          const ahead = columnIndex > selectedNode?.index;
-
           return (
             <div
               key={columnIndex}
-              className={classNames(styles.column, {
-                [styles.current]: current,
-                [styles.behind]: behind,
-                [styles.ahead]: ahead,
-              })}
+              className={classNames(styles.column, { [styles.active]: activeNode })}
             >
               <div className={styles.header}>
                 <div className={styles.num}>{columnIndex + 1}</div>
               </div>
               <div className={styles.nodes}>
-                {column.nodes.map(({ name, total, selected, paths, from, to }, nodeIndex) => {
+                {column.nodes.map(({ name, total, selected, paths, from }, nodeIndex) => {
                   const active =
                     selected && activeNode?.paths.find(path => path.items[columnIndex] === name);
-                  const bars = [];
-                  const lines = from?.reduce(
-                    (obj: { flat: boolean; fromUp: boolean; fromDown: boolean }, { name }: any) => {
-                      const fromIndex = columns[columnIndex - 1]?.nodes.findIndex(node => {
-                        return node.name === name && node.selected;
-                      });
-
-                      if (fromIndex > -1) {
-                        if (nodeIndex === fromIndex) {
-                          obj.flat = true;
-                        } else if (nodeIndex > fromIndex) {
-                          obj.fromUp = true;
-                          bars.push([fromIndex, nodeIndex, 1]);
-                        } else if (nodeIndex < fromIndex) {
-                          obj.fromDown = true;
-                          bars.push([nodeIndex, fromIndex, 0]);
-                        }
-                      }
-
-                      return obj;
-                    },
-                    {},
-                  );
 
-                  to?.reduce((obj: { toUp: boolean; toDown: boolean }, { name }: any) => {
-                    const toIndex = columns[columnIndex + 1]?.nodes.findIndex(node => {
+                  const lines = from?.reduce((arr, { name }: any) => {
+                    const fromIndex = columns[columnIndex - 1]?.nodes.findIndex(node => {
                       return node.name === name && node.selected;
                     });
 
-                    if (toIndex > -1) {
-                      if (nodeIndex > toIndex) {
-                        obj.toUp = true;
-                      } else if (nodeIndex < toIndex) {
-                        obj.toDown = true;
-                      }
+                    if (fromIndex > -1) {
+                      arr.push([fromIndex, nodeIndex]);
                     }
 
-                    return obj;
-                  }, lines);
+                    return arr;
+                  }, []);
 
                   return (
                     <div
@@ -176,21 +126,43 @@ export default function JourneyView() {
                     >
                       <div className={styles.name}>{name}</div>
                       <div className={styles.count}>{total}</div>
-                      {Object.keys(lines).map(key => {
-                        return <div key={key} className={classNames(styles.line, styles[key])} />;
-                      })}
                       {columnIndex < columns.length &&
-                        bars.map(([a, b, d], i) => {
-                          const height = (b - a - 1) * (NODE_HEIGHT + NODE_GAP) + NODE_GAP;
+                        lines.map(([fromIndex, nodeIndex], i) => {
+                          const height =
+                            (Math.abs(nodeIndex - fromIndex) + 1) * (NODE_HEIGHT + NODE_GAP) -
+                            NODE_GAP;
+                          const midHeight =
+                            (Math.abs(nodeIndex - fromIndex) - 1) * (NODE_HEIGHT + NODE_GAP) +
+                            NODE_GAP +
+                            LINE_WIDTH;
+                          const nodeName = columns[columnIndex - 1]?.nodes[fromIndex].name;
+
                           return (
                             <div
-                              key={i}
-                              className={styles.bar}
-                              style={{
-                                height: height + BAR_OFFSET,
-                                top: d ? -height : NODE_HEIGHT,
-                              }}
-                            />
+                              key={`${fromIndex}${nodeIndex}${i}`}
+                              className={classNames(styles.line, {
+                                [styles.active]:
+                                  active &&
+                                  activeNode?.paths.find(
+                                    path =>
+                                      path.items[columnIndex] === name &&
+                                      path.items[columnIndex - 1] === nodeName,
+                                  ),
+                                [styles.up]: fromIndex < nodeIndex,
+                                [styles.down]: fromIndex > nodeIndex,
+                                [styles.flat]: fromIndex === nodeIndex,
+                              })}
+                              style={{ height }}
+                            >
+                              <div className={classNames(styles.segment, styles.start)} />
+                              <div
+                                className={classNames(styles.segment, styles.mid)}
+                                style={{
+                                  height: midHeight,
+                                }}
+                              />
+                              <div className={classNames(styles.segment, styles.end)} />
+                            </div>
                           );
                         })}
                     </div>

From edd679295c22bb9c9aa58c89ef89e7bfba2f2f5f Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Fri, 7 Jun 2024 22:59:14 -0700
Subject: [PATCH 138/438] Revert "add dropped off node"

This reverts commit e8a605af39724b8c6fa6e4a30767f4689150d2e8.
---
 src/queries/analytics/reports/getJourney.ts | 34 +++------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

diff --git a/src/queries/analytics/reports/getJourney.ts b/src/queries/analytics/reports/getJourney.ts
index 24879a86fa..34d166a597 100644
--- a/src/queries/analytics/reports/getJourney.ts
+++ b/src/queries/analytics/reports/getJourney.ts
@@ -43,7 +43,7 @@ async function relationalQuery(
 ): Promise<JourneyResult[]> {
   const { startDate, endDate, steps, startStep, endStep } = filters;
   const { rawQuery } = prisma;
-  const { sequenceQuery, startStepQuery, endStepQuery, finalSelectQuery, params } = getJourneyQuery(
+  const { sequenceQuery, startStepQuery, endStepQuery, params } = getJourneyQuery(
     steps,
     startStep,
     endStep,
@@ -57,14 +57,12 @@ async function relationalQuery(
     sequenceQuery: string;
     startStepQuery: string;
     endStepQuery: string;
-    finalSelectQuery: string;
     params: { [key: string]: string };
   } {
     const params = {};
     let sequenceQuery = '';
     let startStepQuery = '';
     let endStepQuery = '';
-    let finalSelectQuery = '';
 
     // create sequence query
     let selectQuery = '';
@@ -106,18 +104,10 @@ async function relationalQuery(
       params['endStep'] = endStep;
     }
 
-    // create final select query
-    for (let i = 1; i < steps; i++) {
-      finalSelectQuery += `\nCASE WHEN e${i} IS NOT NULL and e${
-        i + 1
-      } IS NULL THEN 'dropped off' ELSE e${i + 1} END AS e${i + 1},`;
-    }
-
     return {
       sequenceQuery,
       startStepQuery,
       endStepQuery,
-      finalSelectQuery,
       params,
     };
   }
@@ -134,9 +124,7 @@ async function relationalQuery(
       where website_id = {{websiteId::uuid}}
         and created_at between {{startDate}} and {{endDate}}),
     ${sequenceQuery}
-    select e1,
-        ${finalSelectQuery}
-        count
+    select *
     from sequences
     where 1 = 1
     ${startStepQuery}
@@ -165,7 +153,7 @@ async function clickhouseQuery(
 ): Promise<JourneyResult[]> {
   const { startDate, endDate, steps, startStep, endStep } = filters;
   const { rawQuery } = clickhouse;
-  const { sequenceQuery, startStepQuery, endStepQuery, finalSelectQuery, params } = getJourneyQuery(
+  const { sequenceQuery, startStepQuery, endStepQuery, params } = getJourneyQuery(
     steps,
     startStep,
     endStep,
@@ -179,14 +167,12 @@ async function clickhouseQuery(
     sequenceQuery: string;
     startStepQuery: string;
     endStepQuery: string;
-    finalSelectQuery: string;
     params: { [key: string]: string };
   } {
     const params = {};
     let sequenceQuery = '';
     let startStepQuery = '';
     let endStepQuery = '';
-    let finalSelectQuery = '';
 
     // create sequence query
     let selectQuery = '';
@@ -221,25 +207,17 @@ async function clickhouseQuery(
     if (endStep) {
       for (let i = 1; i < steps; i++) {
         const startQuery = i === 1 ? 'and (' : '\nor ';
-        endStepQuery += `${startQuery}(e${i} = {endStep:String} and e${i + 1} = 'dropped off') `;
+        endStepQuery += `${startQuery}(e${i} = {endStep:String} and e${i + 1} is null) `;
       }
       endStepQuery += `\nor (e${steps} = {endStep:String}))`;
 
       params['endStep'] = endStep;
     }
 
-    // create final select query
-    for (let i = 1; i < steps; i++) {
-      finalSelectQuery += `\nCASE WHEN e${i} IS NOT NULL and e${
-        i + 1
-      } IS NULL THEN 'dropped off' ELSE e${i + 1} END AS e${i + 1},`;
-    }
-
     return {
       sequenceQuery,
       startStepQuery,
       endStepQuery,
-      finalSelectQuery,
       params,
     };
   }
@@ -255,9 +233,7 @@ async function clickhouseQuery(
       where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}),
     ${sequenceQuery}
-    select e1,
-        ${finalSelectQuery}
-        count
+    select *
     from sequences
     where 1 = 1
     ${startStepQuery}

From 3234120bfb954d30f55336a51e6275200b57ea7e Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Sat, 8 Jun 2024 21:43:29 -0700
Subject: [PATCH 139/438] Changed steps to dropdown.

---
 .../reports/journey/JourneyParameters.tsx     |  15 +-
 .../(main)/reports/journey/JourneyView.tsx    | 157 +++++++++---------
 src/queries/analytics/reports/getJourney.ts   |   4 +-
 3 files changed, 96 insertions(+), 80 deletions(-)

diff --git a/src/app/(main)/reports/journey/JourneyParameters.tsx b/src/app/(main)/reports/journey/JourneyParameters.tsx
index f140da1339..eca9c42d56 100644
--- a/src/app/(main)/reports/journey/JourneyParameters.tsx
+++ b/src/app/(main)/reports/journey/JourneyParameters.tsx
@@ -1,6 +1,15 @@
 import { useContext } from 'react';
 import { useMessages } from 'components/hooks';
-import { Form, FormButtons, FormInput, FormRow, SubmitButton, TextField } from 'react-basics';
+import {
+  Dropdown,
+  Form,
+  FormButtons,
+  FormInput,
+  FormRow,
+  Item,
+  SubmitButton,
+  TextField,
+} from 'react-basics';
 import { ReportContext } from '../[reportId]/Report';
 import BaseParameters from '../[reportId]/BaseParameters';
 
@@ -24,12 +33,12 @@ export function JourneyParameters() {
   return (
     <Form values={parameters} onSubmit={handleSubmit} preventSubmit={true}>
       <BaseParameters showDateSelect={true} allowWebsiteSelect={!id} />
-      <FormRow label={`${formatMessage(labels.steps)} (3 to 7)`}>
+      <FormRow label={formatMessage(labels.steps)}>
         <FormInput
           name="steps"
           rules={{ required: formatMessage(labels.required), pattern: /[0-9]+/, min: 3, max: 7 }}
         >
-          <TextField autoComplete="off" />
+          <Dropdown items={[3, 4, 5, 6, 7]}>{item => <Item key={item}>{item}</Item>}</Dropdown>
         </FormInput>
       </FormRow>
       <FormRow label={formatMessage(labels.startStep)}>
diff --git a/src/app/(main)/reports/journey/JourneyView.tsx b/src/app/(main)/reports/journey/JourneyView.tsx
index fe2d772969..26815430fb 100644
--- a/src/app/(main)/reports/journey/JourneyView.tsx
+++ b/src/app/(main)/reports/journey/JourneyView.tsx
@@ -31,8 +31,8 @@ export default function JourneyView() {
           const selectedNodes = selectedNode?.paths ?? [];
 
           if (name) {
+            const selected = !!selectedNodes.find(a => a.items[index] === name);
             if (!column[name]) {
-              const selected = !!selectedNodes.find(a => a.items[index] === name);
               const paths = data.filter((d, i) => {
                 return i !== index && d.items[index] === name;
               });
@@ -43,23 +43,26 @@ export default function JourneyView() {
                   const { items, count } = path;
                   const name = items[index - 1];
                   if (!obj[name]) {
-                    obj[name] = { name, count: +count };
+                    obj[name] = { name, count };
                   } else {
-                    obj[name].count += +count;
+                    obj[name].count += count;
                   }
                   return obj;
                 }, {});
 
               column[name] = {
                 name,
-                total: +count,
+                count,
+                total: count,
                 columnIndex: index,
                 selected,
+                selectedCount: count,
                 paths,
                 from: objectToArray(from),
               };
             } else {
-              column[name].total += +count;
+              column[name].selectedCount += selected ? count : 0;
+              column[name].total += count;
             }
           }
         });
@@ -97,77 +100,81 @@ export default function JourneyView() {
                 <div className={styles.num}>{columnIndex + 1}</div>
               </div>
               <div className={styles.nodes}>
-                {column.nodes.map(({ name, total, selected, paths, from }, nodeIndex) => {
-                  const active =
-                    selected && activeNode?.paths.find(path => path.items[columnIndex] === name);
-
-                  const lines = from?.reduce((arr, { name }: any) => {
-                    const fromIndex = columns[columnIndex - 1]?.nodes.findIndex(node => {
-                      return node.name === name && node.selected;
-                    });
-
-                    if (fromIndex > -1) {
-                      arr.push([fromIndex, nodeIndex]);
-                    }
-
-                    return arr;
-                  }, []);
-
-                  return (
-                    <div
-                      key={name}
-                      className={classNames(styles.item, {
-                        [styles.selected]: selected,
-                        [styles.active]: active,
-                      })}
-                      onClick={() => handleClick(name, columnIndex, paths)}
-                      onMouseEnter={() => selected && setActiveNode({ name, columnIndex, paths })}
-                      onMouseLeave={() => selected && setActiveNode(null)}
-                    >
-                      <div className={styles.name}>{name}</div>
-                      <div className={styles.count}>{total}</div>
-                      {columnIndex < columns.length &&
-                        lines.map(([fromIndex, nodeIndex], i) => {
-                          const height =
-                            (Math.abs(nodeIndex - fromIndex) + 1) * (NODE_HEIGHT + NODE_GAP) -
-                            NODE_GAP;
-                          const midHeight =
-                            (Math.abs(nodeIndex - fromIndex) - 1) * (NODE_HEIGHT + NODE_GAP) +
-                            NODE_GAP +
-                            LINE_WIDTH;
-                          const nodeName = columns[columnIndex - 1]?.nodes[fromIndex].name;
-
-                          return (
-                            <div
-                              key={`${fromIndex}${nodeIndex}${i}`}
-                              className={classNames(styles.line, {
-                                [styles.active]:
-                                  active &&
-                                  activeNode?.paths.find(
-                                    path =>
-                                      path.items[columnIndex] === name &&
-                                      path.items[columnIndex - 1] === nodeName,
-                                  ),
-                                [styles.up]: fromIndex < nodeIndex,
-                                [styles.down]: fromIndex > nodeIndex,
-                                [styles.flat]: fromIndex === nodeIndex,
-                              })}
-                              style={{ height }}
-                            >
-                              <div className={classNames(styles.segment, styles.start)} />
-                              <div
-                                className={classNames(styles.segment, styles.mid)}
-                                style={{
-                                  height: midHeight,
-                                }}
-                              />
-                              <div className={classNames(styles.segment, styles.end)} />
-                            </div>
-                          );
+                {column.nodes.map(
+                  ({ name, total, selected, paths, from, selectedCount }, nodeIndex) => {
+                    const active =
+                      selected && activeNode?.paths.find(path => path.items[columnIndex] === name);
+
+                    const lines = from?.reduce((arr, { name }: any) => {
+                      const fromIndex = columns[columnIndex - 1]?.nodes.findIndex(node => {
+                        return node.name === name && node.selected;
+                      });
+
+                      if (fromIndex > -1) {
+                        arr.push([fromIndex, nodeIndex]);
+                      }
+
+                      return arr;
+                    }, []);
+
+                    return (
+                      <div
+                        key={name}
+                        className={classNames(styles.item, {
+                          [styles.selected]: selected,
+                          [styles.active]: active,
                         })}
-                    </div>
-                  );
-                })}
+                        onClick={() => handleClick(name, columnIndex, paths)}
+                        onMouseEnter={() => selected && setActiveNode({ name, columnIndex, paths })}
+                        onMouseLeave={() => selected && setActiveNode(null)}
+                      >
+                        <div className={styles.name}>{name}</div>
+                        <div className={styles.count}>
+                          {selected || active ? selectedCount : total}
+                        </div>
+                        {columnIndex < columns.length &&
+                          lines.map(([fromIndex, nodeIndex], i) => {
+                            const height =
+                              (Math.abs(nodeIndex - fromIndex) + 1) * (NODE_HEIGHT + NODE_GAP) -
+                              NODE_GAP;
+                            const midHeight =
+                              (Math.abs(nodeIndex - fromIndex) - 1) * (NODE_HEIGHT + NODE_GAP) +
+                              NODE_GAP +
+                              LINE_WIDTH;
+                            const nodeName = columns[columnIndex - 1]?.nodes[fromIndex].name;
+
+                            return (
+                              <div
+                                key={`${fromIndex}${nodeIndex}${i}`}
+                                className={classNames(styles.line, {
+                                  [styles.active]:
+                                    active &&
+                                    activeNode?.paths.find(
+                                      path =>
+                                        path.items[columnIndex] === name &&
+                                        path.items[columnIndex - 1] === nodeName,
+                                    ),
+                                  [styles.up]: fromIndex < nodeIndex,
+                                  [styles.down]: fromIndex > nodeIndex,
+                                  [styles.flat]: fromIndex === nodeIndex,
+                                })}
+                                style={{ height }}
+                              >
+                                <div className={classNames(styles.segment, styles.start)} />
+                                <div
+                                  className={classNames(styles.segment, styles.mid)}
+                                  style={{
+                                    height: midHeight,
+                                  }}
+                                />
+                                <div className={classNames(styles.segment, styles.end)} />
+                              </div>
+                            );
+                          })}
+                      </div>
+                    );
+                  },
+                )}
               </div>
             </div>
           );
diff --git a/src/queries/analytics/reports/getJourney.ts b/src/queries/analytics/reports/getJourney.ts
index 34d166a597..04e3654902 100644
--- a/src/queries/analytics/reports/getJourney.ts
+++ b/src/queries/analytics/reports/getJourney.ts
@@ -10,7 +10,7 @@ interface JourneyResult {
   e5: string;
   e6: string;
   e7: string;
-  count: string;
+  count: number;
 }
 
 export async function getJourney(
@@ -267,6 +267,6 @@ function combineSequentialDuplicates(array: any) {
 function parseResult(data: any) {
   return data.map(({ e1, e2, e3, e4, e5, e6, e7, count }) => ({
     items: combineSequentialDuplicates([e1, e2, e3, e4, e5, e6, e7]),
-    count,
+    count: +count,
   }));
 }

From f6e8522f6ad57e41bed0e96ad84a626fef27914c Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 10 Jun 2024 12:47:31 -0700
Subject: [PATCH 140/438] change bounce rate to use visits

---
 src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
index 246a54b8b0..a6e7ad4085 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
@@ -57,11 +57,11 @@ export function WebsiteMetricsBar({
         },
         {
           label: formatMessage(labels.bounceRate),
-          value: (Math.min(visitors.value, bounces.value) / visitors.value) * 100,
-          prev: (Math.min(visitors.prev, bounces.prev) / visitors.prev) * 100,
+          value: (Math.min(visits.value, bounces.value) / visits.value) * 100,
+          prev: (Math.min(visits.prev, bounces.prev) / visits.prev) * 100,
           change:
-            (Math.min(visitors.value, bounces.value) / visitors.value) * 100 -
-            (Math.min(visitors.prev, bounces.prev) / visitors.prev) * 100,
+            (Math.min(visits.value, bounces.value) / visits.value) * 100 -
+            (Math.min(visits.prev, bounces.prev) / visits.prev) * 100,
           formatValue: n => Math.round(+n) + '%',
           reverseColors: true,
         },

From 895398bebf724ab1a3810ff3fe41701ccbc5ad7e Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 10 Jun 2024 12:47:31 -0700
Subject: [PATCH 141/438] change bounce rate to use visits

---
 src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
index b258a19f96..646b20e3d4 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
@@ -57,11 +57,11 @@ export function WebsiteMetricsBar({
         },
         {
           label: formatMessage(labels.bounceRate),
-          value: (Math.min(visitors.value, bounces.value) / visitors.value) * 100,
-          prev: (Math.min(visitors.prev, bounces.prev) / visitors.prev) * 100,
+          value: (Math.min(visits.value, bounces.value) / visits.value) * 100,
+          prev: (Math.min(visits.prev, bounces.prev) / visits.prev) * 100,
           change:
-            (Math.min(visitors.value, bounces.value) / visitors.value) * 100 -
-            (Math.min(visitors.prev, bounces.prev) / visitors.prev) * 100,
+            (Math.min(visits.value, bounces.value) / visits.value) * 100 -
+            (Math.min(visits.prev, bounces.prev) / visits.prev) * 100,
           formatValue: n => Number(n).toFixed(0) + '%',
           reverseColors: true,
         },

From 1d9079f6adea49c08763fcd23b3d4277be5c86eb Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 10 Jun 2024 13:20:24 -0700
Subject: [PATCH 142/438] fix change label

---
 .../(main)/websites/[websiteId]/WebsiteMetricsBar.tsx |  2 +-
 src/components/metrics/ChangeLabel.tsx                | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
index 646b20e3d4..a6e7ad4085 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
@@ -62,7 +62,7 @@ export function WebsiteMetricsBar({
           change:
             (Math.min(visits.value, bounces.value) / visits.value) * 100 -
             (Math.min(visits.prev, bounces.prev) / visits.prev) * 100,
-          formatValue: n => Number(n).toFixed(0) + '%',
+          formatValue: n => Math.round(+n) + '%',
           reverseColors: true,
         },
         {
diff --git a/src/components/metrics/ChangeLabel.tsx b/src/components/metrics/ChangeLabel.tsx
index 14eb1a8b81..7e7cb77b59 100644
--- a/src/components/metrics/ChangeLabel.tsx
+++ b/src/components/metrics/ChangeLabel.tsx
@@ -19,21 +19,22 @@ export function ChangeLabel({
   className?: string;
   children?: ReactNode;
 }) {
-  const positive = value * (reverseColors ? -1 : 1) >= 0;
-  const negative = value * (reverseColors ? -1 : 1) < 0;
+  const positive = value >= 0;
+  const negative = value < 0;
   const neutral = value === 0 || isNaN(value);
+  const good = reverseColors ? negative : positive;
 
   return (
     <div
       className={classNames(styles.label, className, {
-        [styles.positive]: positive,
-        [styles.negative]: negative,
+        [styles.positive]: good,
+        [styles.negative]: !good,
         [styles.neutral]: neutral,
       })}
       title={title}
     >
       {!neutral && (
-        <Icon rotate={value === 0 ? 0 : positive || reverseColors ? -90 : 90} size={size}>
+        <Icon rotate={positive ? -90 : 90} size={size}>
           <Icons.ArrowRight />
         </Icon>
       )}

From 8f015e870d6e051ab417dbe5c87943f317ee54f0 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 10 Jun 2024 15:47:59 -0700
Subject: [PATCH 143/438] add Journey report

---
 src/app/(main)/reports/create/ReportTemplates.tsx | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/app/(main)/reports/create/ReportTemplates.tsx b/src/app/(main)/reports/create/ReportTemplates.tsx
index bcbb989ad2..e37efc0367 100644
--- a/src/app/(main)/reports/create/ReportTemplates.tsx
+++ b/src/app/(main)/reports/create/ReportTemplates.tsx
@@ -1,6 +1,7 @@
 import Funnel from 'assets/funnel.svg';
 import Lightbulb from 'assets/lightbulb.svg';
 import Magnet from 'assets/magnet.svg';
+import Path from 'assets/path.svg';
 import Tag from 'assets/tag.svg';
 import Target from 'assets/target.svg';
 import { useMessages, useTeamUrl } from 'components/hooks';
@@ -44,12 +45,12 @@ export function ReportTemplates({ showHeader = true }: { showHeader?: boolean })
       url: renderTeamUrl('/reports/goals'),
       icon: <Target />,
     },
-    // {
-    //   title: formatMessage(labels.journey),
-    //   description: formatMessage(labels.journeyDescription),
-    //   url: renderTeamUrl('/reports/journey'),
-    //   icon: <Path />,
-    // },
+    {
+      title: formatMessage(labels.journey),
+      description: formatMessage(labels.journeyDescription),
+      url: renderTeamUrl('/reports/journey'),
+      icon: <Path />,
+    },
   ];
 
   return (

From 632ecd1a1b7c8ac0b7b6c26581ef85ac8a024aa4 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Wed, 12 Jun 2024 22:36:09 -0700
Subject: [PATCH 144/438] update insights query

---
 .../(main)/reports/insights/InsightsTable.tsx | 30 ++++++-
 src/lib/clickhouse.ts                         |  2 +-
 src/queries/analytics/reports/getInsights.ts  | 87 +++++++++++--------
 3 files changed, 82 insertions(+), 37 deletions(-)

diff --git a/src/app/(main)/reports/insights/InsightsTable.tsx b/src/app/(main)/reports/insights/InsightsTable.tsx
index 2cccc24c3f..692d7824b8 100644
--- a/src/app/(main)/reports/insights/InsightsTable.tsx
+++ b/src/app/(main)/reports/insights/InsightsTable.tsx
@@ -3,6 +3,7 @@ import { GridTable, GridColumn } from 'react-basics';
 import { useFormat, useMessages } from 'components/hooks';
 import { ReportContext } from '../[reportId]/Report';
 import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
+import { formatShortTime } from 'lib/format';
 
 export function InsightsTable() {
   const [fields, setFields] = useState([]);
@@ -31,6 +32,12 @@ export function InsightsTable() {
           </GridColumn>
         );
       })}
+      <GridColumn name="views" label={formatMessage(labels.views)} width="100px" alignment="end">
+        {row => row?.views?.toLocaleString()}
+      </GridColumn>
+      <GridColumn name="visits" label={formatMessage(labels.visits)} width="100px" alignment="end">
+        {row => row?.visits?.toLocaleString()}
+      </GridColumn>
       <GridColumn
         name="visitors"
         label={formatMessage(labels.visitors)}
@@ -39,8 +46,27 @@ export function InsightsTable() {
       >
         {row => row?.visitors?.toLocaleString()}
       </GridColumn>
-      <GridColumn name="views" label={formatMessage(labels.views)} width="100px" alignment="end">
-        {row => row?.views?.toLocaleString()}
+      <GridColumn
+        name="bounceRate"
+        label={formatMessage(labels.bounceRate)}
+        width="100px"
+        alignment="end"
+      >
+        {row => {
+          const n = (Math.min(row?.visits, row?.bounces) / row?.visits) * 100;
+          return Math.round(+n) + '%';
+        }}
+      </GridColumn>
+      <GridColumn
+        name="visitDuration"
+        label={formatMessage(labels.visitDuration)}
+        width="100px"
+        alignment="end"
+      >
+        {row => {
+          const n = row?.totaltime / row?.visits;
+          return `${+n < 0 ? '-' : ''}${formatShortTime(Math.abs(~~n), ['m', 's'], ' ')}`;
+        }}
       </GridColumn>
     </GridTable>
   );
diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index e5cb40c02c..c1b9d25f27 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -119,7 +119,7 @@ async function parseFilters(websiteId: string, filters: QueryFilters = {}, optio
   };
 }
 
-async function rawQuery(query: string, params: Record<string, unknown> = {}): Promise<unknown[]> {
+async function rawQuery(query: string, params: Record<string, unknown> = {}): Promise<unknown> {
   if (process.env.LOG_QUERY) {
     log('QUERY:\n', query);
     log('PARAMETERS:\n', params);
diff --git a/src/queries/analytics/reports/getInsights.ts b/src/queries/analytics/reports/getInsights.ts
index 282ed7557d..7313e43697 100644
--- a/src/queries/analytics/reports/getInsights.ts
+++ b/src/queries/analytics/reports/getInsights.ts
@@ -23,7 +23,7 @@ async function relationalQuery(
     y: number;
   }[]
 > {
-  const { parseFilters, rawQuery } = prisma;
+  const { getTimestampDiffQuery, parseFilters, rawQuery } = prisma;
   const { filterQuery, joinSession, params } = await parseFilters(
     websiteId,
     {
@@ -37,15 +37,31 @@ async function relationalQuery(
 
   return rawQuery(
     `
-    select 
+    select
+      sum(t.c) as "views",
+      count(distinct t.session_id) as "visitors",
+      count(distinct t.visit_id) as "visits",
+      sum(case when t.c = 1 then 1 else 0 end) as "bounces",
+      sum(${getTimestampDiffQuery('t.min_time', 't.max_time')}) as "totaltime",
       ${parseFields(fields)}
-    from website_event
-      ${joinSession}
-    where website_event.website_id = {{websiteId::uuid}}
-      and website_event.created_at between {{startDate}} and {{endDate}}
-      and website_event.event_type = {{eventType}}
-      ${filterQuery}
-    ${parseGroupBy(fields)}
+    from (
+      select
+        ${parseFields(fields)},
+        website_event.session_id,
+        website_event.visit_id,
+        count(*) as "c",
+        min(website_event.created_at) as "min_time",
+        max(website_event.created_at) as "max_time"
+      from website_event
+        ${joinSession}
+      where website_event.website_id = {{websiteId::uuid}}
+        and website_event.created_at between {{startDate}} and {{endDate}}
+        and event_type = {{eventType}}
+        ${filterQuery}
+      group by ${parseFields(fields)}, 
+        website_event.session_id, website_event.visit_id
+    ) as t
+    group by ${parseFields(fields)}
     order by 1 desc, 2 desc
     limit 500
     `,
@@ -71,14 +87,30 @@ async function clickhouseQuery(
 
   return rawQuery(
     `
-    select 
+    select
+      sum(t.c) as "views",
+      count(distinct t.session_id) as "visitors",
+      count(distinct t.visit_id) as "visits",
+      sum(if(t.c = 1, 1, 0)) as "bounces",
+      sum(max_time-min_time) as "totaltime",
       ${parseFields(fields)}
-    from website_event
-    where website_id = {websiteId:UUID}
-      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
-      and event_type = {eventType:UInt32}
-      ${filterQuery}
-    ${parseGroupBy(fields)}
+    from (
+      select
+        ${parseFields(fields)},
+        session_id,
+        visit_id,
+        count(*) c,
+        min(created_at) min_time,
+        max(created_at) max_time
+      from website_event
+      where website_id = {websiteId:UUID}
+        and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+        and event_type = {eventType:UInt32}
+        ${filterQuery}
+      group by ${parseFields(fields)}, 
+        session_id, visit_id
+    ) as t
+    group by ${parseFields(fields)}
     order by 1 desc, 2 desc
     limit 500
     `,
@@ -89,27 +121,14 @@ async function clickhouseQuery(
         ...a,
         views: Number(a.views),
         visitors: Number(a.visitors),
+        visits: Number(a.visits),
+        bounces: Number(a.bounces),
+        totaltime: Number(a.totaltime),
       };
     });
   });
 }
 
-function parseFields(fields: any[]) {
-  const query = fields.reduce(
-    (arr, field) => {
-      const { name } = field;
-
-      return arr.concat(`${FILTER_COLUMNS[name]} as "${name}"`);
-    },
-    ['count(*) as views', 'count(distinct website_event.session_id) as visitors'],
-  );
-
-  return query.join(',\n');
-}
-
-function parseGroupBy(fields: { name: any }[]) {
-  if (!fields.length) {
-    return '';
-  }
-  return `group by ${fields.map(({ name }) => FILTER_COLUMNS[name]).join(',')}`;
+function parseFields(fields: { name: any }[]) {
+  return `${fields.map(({ name }) => FILTER_COLUMNS[name]).join(',')}`;
 }

From fdc7c39fe4075180fc26bf0104d2d723b84e4a72 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Wed, 12 Jun 2024 23:23:12 -0700
Subject: [PATCH 145/438] fix missing websitechart

---
 src/app/(main)/reports/[reportId]/Report.module.css | 2 +-
 src/components/layout/Page.module.css               | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/app/(main)/reports/[reportId]/Report.module.css b/src/app/(main)/reports/[reportId]/Report.module.css
index db65d00162..6aa6a9b329 100644
--- a/src/app/(main)/reports/[reportId]/Report.module.css
+++ b/src/app/(main)/reports/[reportId]/Report.module.css
@@ -3,5 +3,5 @@
   grid-template-rows: max-content 1fr;
   grid-template-columns: max-content 1fr;
   margin-bottom: 60px;
-  height: 100%;
+  height: 90vh;
 }
diff --git a/src/components/layout/Page.module.css b/src/components/layout/Page.module.css
index d149812272..52893157cf 100644
--- a/src/components/layout/Page.module.css
+++ b/src/components/layout/Page.module.css
@@ -4,7 +4,6 @@
   flex-direction: column;
   position: relative;
   width: 100%;
-  height: 100%;
   max-width: 1320px;
   margin: 0 auto;
   padding: 0 20px;

From 3825031a366b2375c62e8cff633b36fa2254c10b Mon Sep 17 00:00:00 2001
From: Krzysztof Rewak <krzysztof.rewak@blumilk.pl>
Date: Thu, 13 Jun 2024 17:37:41 +0200
Subject: [PATCH 146/438] update Polish translations

---
 src/lang/pl-PL.json | 108 ++++++++++++++++++++++----------------------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/src/lang/pl-PL.json b/src/lang/pl-PL.json
index 7eae7baaf6..b76309bf56 100644
--- a/src/lang/pl-PL.json
+++ b/src/lang/pl-PL.json
@@ -4,8 +4,8 @@
   "label.activity-log": "Dziennik aktywności",
   "label.add": "Dodaj",
   "label.add-description": "Dodaj opis",
-  "label.add-member": "Add member",
-  "label.add-step": "Add step",
+  "label.add-member": "Dodaj członka",
+  "label.add-step": "Dodaj krok",
   "label.add-website": "Dodaj witrynę",
   "label.admin": "Administrator",
   "label.after": "Po",
@@ -18,71 +18,71 @@
   "label.before": "Przed",
   "label.bounce-rate": "Współczynnik odrzuceń",
   "label.breakdown": "Rozbicie",
-  "label.browser": "Browser",
+  "label.browser": "Przeglądarka",
   "label.browsers": "Przeglądarki",
   "label.cancel": "Anuluj",
   "label.change-password": "Zmień hasło",
   "label.cities": "Miasta",
-  "label.city": "City",
+  "label.city": "Miasto",
   "label.clear-all": "Wyczyść wszystko",
   "label.confirm": "Potwierdź",
   "label.confirm-password": "Potwierdź hasło",
   "label.contains": "Zawiera",
   "label.continue": "Kontynuuj",
   "label.countries": "Kraje",
-  "label.country": "Country",
-  "label.create": "Create",
-  "label.create-report": "Stwórz raport",
+  "label.country": "Państwo",
+  "label.create": "Utwórz",
+  "label.create-report": "Utwórz raport",
   "label.create-team": "Utwórz zespół",
   "label.create-user": "Utwórz użytkownika",
   "label.created": "Utworzony",
-  "label.created-by": "Created By",
+  "label.created-by": "Utworzony przez",
   "label.current-password": "Aktualne hasło",
   "label.custom-range": "Zakres niestandardowy",
   "label.dashboard": "Panel",
-  "label.data": "Data",
-  "label.date": "Date",
+  "label.data": "Dane",
+  "label.date": "Data",
   "label.date-range": "Zakres dat",
-  "label.day": "Day",
+  "label.day": "Dzień",
   "label.default-date-range": "Domyślny zakres dat",
   "label.delete": "Usuń",
-  "label.delete-report": "Delete report",
+  "label.delete-report": "Usuń raport",
   "label.delete-team": "Usuń zespół",
   "label.delete-user": "Usuń użytkownika",
   "label.delete-website": "Usuń witrynę",
   "label.description": "Opis",
   "label.desktop": "Komputer",
   "label.details": "Szczegóły",
-  "label.device": "Device",
+  "label.device": "Urządzenie",
   "label.devices": "Urządzenia",
   "label.dismiss": "Odrzuć",
   "label.does-not-contain": "Nie zawiera",
   "label.domain": "Domena",
-  "label.dropoff": "Dropoff",
+  "label.dropoff": "Odpływ",
   "label.edit": "Edytuj",
   "label.edit-dashboard": "Edytuj panel",
-  "label.edit-member": "Edit member",
+  "label.edit-member": "Edytuj członka",
   "label.enable-share-url": "Włącz udostępnianie adresu URL",
-  "label.event": "Event",
+  "label.event": "Zdarzenie",
   "label.event-data": "Dane zdarzenia",
   "label.events": "Zdarzenia",
   "label.false": "Fałsz",
   "label.field": "Pole",
   "label.fields": "Pola",
-  "label.filter": "Filter",
+  "label.filter": "Filtruj",
   "label.filter-combined": "Połączone",
   "label.filter-raw": "Surowe dane",
   "label.filters": "Filtry",
   "label.funnel": "Lejek",
-  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.funnel-description": "Zrozum wskaźniki konwersji i odpływu użytkowników.",
   "label.greater-than": "Większe niż",
   "label.greater-than-equals": "Większe niż lub równe",
-  "label.insights": "Insights",
-  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.insights": "Analiza",
+  "label.insights-description": "Poznaj lepiej swoje dane, korzystając z segmentów i filtrów.",
   "label.is": "Równe",
   "label.is-not": "Nie jest równe",
-  "label.is-not-set": "Is not set",
-  "label.is-set": "Is set",
+  "label.is-not-set": "Nieustawione",
+  "label.is-set": "Ustawione",
   "label.join": "Dołącz",
   "label.join-team": "Dołącz do zespołu",
   "label.language": "Język",
@@ -90,7 +90,7 @@
   "label.laptop": "Laptop",
   "label.last-days": "Ostatnie {x} dni",
   "label.last-hours": "Ostatnie {x} godzin",
-  "label.last-months": "Last {x} months",
+  "label.last-months": "Osatnie {x} miesięcy",
   "label.leave": "Opuść",
   "label.leave-team": "Opuść zespół",
   "label.less-than": "Mniejsze niż",
@@ -99,24 +99,24 @@
   "label.logout": "Wyloguj",
   "label.manage": "Manage",
   "label.max": "Maks",
-  "label.member": "Member",
+  "label.member": "Członek",
   "label.members": "Członkowie",
   "label.min": "Min",
   "label.mobile": "Smartfon",
   "label.more": "Więcej",
-  "label.my-account": "My account",
-  "label.my-websites": "My websites",
+  "label.my-account": "Moje konto",
+  "label.my-websites": "Moje witryny",
   "label.name": "Nazwa",
   "label.new-password": "Nowe hasło",
   "label.none": "Brak",
-  "label.number-of-records": "{x} {x, plural, one {record} other {records}}",
+  "label.number-of-records": "{x} {x, plural, one {rekord} other {rekordy}}",
   "label.ok": "OK",
   "label.os": "OS",
   "label.overview": "Przegląd",
   "label.owner": "Właściciel",
-  "label.page-of": "Page {current} of {total}",
+  "label.page-of": "Strona {current} z {total}",
   "label.page-views": "Wyświetlenia strony",
-  "label.pageTitle": "Page title",
+  "label.pageTitle": "Tytuł strony",
   "label.pages": "Strony",
   "label.password": "Hasło",
   "label.powered-by": "Obsługiwane przez {name}",
@@ -137,31 +137,31 @@
   "label.required": "Wymagany",
   "label.reset": "Zresetuj",
   "label.reset-website": "Zresetuj statystyki",
-  "label.retention": "Retention",
-  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
-  "label.role": "Role",
+  "label.retention": "Retencja",
+  "label.retention-description": "Mierz przyciągającą siłę swojej strony internetowej, śledząc, jak często użytkownicy powracają.",
+  "label.role": "Rola",
   "label.run-query": "Uruchom zapytanie",
   "label.save": "Zapisz",
   "label.screens": "Ekrany",
-  "label.search": "Search",
-  "label.select": "Select",
+  "label.search": "Szukaj",
+  "label.select": "Wybierz",
   "label.select-date": "Wybierz datę",
-  "label.select-role": "Select role",
+  "label.select-role": "Wybierz rolę",
   "label.select-website": "Wybierz witrynę",
   "label.sessions": "Sesje",
   "label.settings": "Ustawienia",
   "label.share-url": "Udostępnij adres URL",
   "label.single-day": "W tym dniu",
-  "label.steps": "Steps",
+  "label.steps": "Kroki",
   "label.sum": "Suma",
   "label.tablet": "Tablet",
   "label.team": "Zespół",
   "label.team-id": "ID zespołu",
   "label.team-member": "Członek zespołu",
-  "label.team-name": "Team name",
+  "label.team-name": "Nazwa zespołu",
   "label.team-owner": "Właściciel zespołu",
-  "label.team-view-only": "Team view only",
-  "label.team-websites": "Team websites",
+  "label.team-view-only": "Tylko do odczytu dla zespołu",
+  "label.team-websites": "Witryny zespołu",
   "label.teams": "Zespoły",
   "label.theme": "Motyw",
   "label.this-month": "W tym miesiącu",
@@ -182,42 +182,42 @@
   "label.unique-visitors": "Unikalni odwiedzający",
   "label.unknown": "Nieznany",
   "label.untitled": "Bez tytułu",
-  "label.update": "Update",
+  "label.update": "Aktualizuj",
   "label.url": "Link",
   "label.urls": "Linki",
   "label.user": "Użytkownik",
   "label.username": "Nazwa użytkownika",
   "label.users": "Użytkownicy",
   "label.utm": "UTM",
-  "label.utm-description": "Track your campaigns through UTM parameters.",
+  "label.utm-description": "Śledź swoje kampanie za pomocą parametrów UTM.",
   "label.value": "Wartość",
   "label.view": "Zobacz",
   "label.view-details": "Pokaż szczegóły",
   "label.view-only": "Tylko do odczytu",
   "label.views": "Wyświetlenia",
-  "label.views-per-visit": "Views per visit",
+  "label.views-per-visit": "Widoków na wizytę",
   "label.visitors": "Odwiedzający",
-  "label.visits": "Visits",
+  "label.visits": "Odwiedząjący",
   "label.website": "Witryna",
   "label.website-id": "ID witryny",
   "label.websites": "Witryny",
   "label.window": "Okno",
   "label.yesterday": "Wczoraj",
-  "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
+  "message.action-confirmation": "Wpisz {confirmation}, aby potwierdzić.",
   "message.active-users": "{x} aktualnie {x, plural, one {odwiedzający} other {odwiedzających}}",
   "message.confirm-delete": "Czy na pewno chcesz usunąć {target}?",
   "message.confirm-leave": "Czy na pewno chcesz opuścić {target}?",
-  "message.confirm-remove": "Are you sure you want to remove {target}?",
+  "message.confirm-remove": "Czy na pewno chcesz usunąć {target}?",
   "message.confirm-reset": "Czy na pewno chcesz zresetować statystyki {target}?",
-  "message.delete-team-warning": "Deleting a team will also delete all team websites.",
+  "message.delete-team-warning": "Usunięcie zespołu usunie wszystkie jego witryny.",
   "message.delete-website-warning": "Wszystkie powiązane dane również zostaną usunięte.",
   "message.error": "Coś poszło nie tak.",
   "message.event-log": "{event} na {url}",
   "message.go-to-settings": "Przejdź do ustawień",
-  "message.incorrect-username-password": "Nieprawidłowa nazwa użytkownika/hasło.",
+  "message.incorrect-username-password": "Nieprawidłowa nazwa użytkownika lub hasło.",
   "message.invalid-domain": "Nieprawidłowa witryna",
   "message.min-password-length": "Minimalna długość {n} znaków",
-  "message.new-version-available": "A new version of Umami {version} is available!",
+  "message.new-version-available": "Nowa wersja Umami {version} jest dostępna!",
   "message.no-data-available": "Brak dostępnych danych.",
   "message.no-event-data": "Brak dostępnych danych o zdarzeniach.",
   "message.no-match-password": "Hasła się nie zgadzają",
@@ -235,12 +235,12 @@
   "message.team-not-found": "Nie znaleziono zespołu.",
   "message.team-websites-info": "Strony internetowe mogą być przeglądane przez każdego członka zespołu.",
   "message.tracking-code": "Kod śledzenia",
-  "message.transfer-team-website-to-user": "Transfer this website to your account?",
-  "message.transfer-user-website-to-team": "Select the team to transfer this website to.",
-  "message.transfer-website": "Transfer website ownership to your account or another team.",
-  "message.triggered-event": "Triggered event",
+  "message.transfer-team-website-to-user": "Czy przenieść tę witrynę do Twoje konta?",
+  "message.transfer-user-website-to-team": "Wybierz zespół, do którego chcesz przenieść tę witrynę.",
+  "message.transfer-website": "Przenieś własność witryny na swoje konto lub do innego zespołu.",
+  "message.triggered-event": "Zdarzenie wyzwalające",
   "message.user-deleted": "Użytkownik usunięty.",
-  "message.viewed-page": "Viewed page",
+  "message.viewed-page": "Obejrzana strona",
   "message.visitor-log": "Odwiedzający z {country} używa {browser} na {os} {device}",
-  "message.visitors-dropped-off": "Visitors dropped off"
+  "message.visitors-dropped-off": "Odpływ użytkowników"
 }

From 1463482e89ae2c71da4ebd58b5cab2f0f95d6d25 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 13 Jun 2024 22:15:31 -0700
Subject: [PATCH 147/438] Updated journey counts.

---
 .../reports/journey/JourneyView.module.css    |  28 ++-
 .../(main)/reports/journey/JourneyView.tsx    | 192 ++++++++++--------
 2 files changed, 121 insertions(+), 99 deletions(-)

diff --git a/src/app/(main)/reports/journey/JourneyView.module.css b/src/app/(main)/reports/journey/JourneyView.module.css
index b4297b5f91..f4571cdad2 100644
--- a/src/app/(main)/reports/journey/JourneyView.module.css
+++ b/src/app/(main)/reports/journey/JourneyView.module.css
@@ -147,7 +147,6 @@
 }
 
 .end {
-  right: 0;
   width: 50px;
   height: 30px;
   border: 0;
@@ -161,7 +160,7 @@
 }
 
 .up .end {
-  width: 53px;
+  width: 52px;
   bottom: 27px;
   right: 0;
   border-bottom-left-radius: 100%;
@@ -177,7 +176,7 @@
 }
 
 .down .end {
-  width: 53px;
+  width: 52px;
   top: 30px;
   right: 0;
   border-top-left-radius: 100%;
@@ -186,16 +185,15 @@
 }
 
 .flat .start {
+  left: 0;
   top: 30px;
-  width: 50px;
   border-top: 3px solid var(--journey-line-color);
 }
 
 .flat .end {
   right: 0;
-  bottom: 27px;
-  width: 50px;
-  border-bottom: 3px solid var(--journey-line-color);
+  top: 30px;
+  border-top: 3px solid var(--journey-line-color);
 }
 
 .start:before,
@@ -214,14 +212,12 @@
   display: none;
 }
 
-.up .start:before,
-.flat .start:before {
+.up .start:before {
   left: -8px;
   top: -8px;
 }
 
-.up .end:before,
-.flat .end:before {
+.up .end:before {
   right: -8px;
   bottom: -8px;
 }
@@ -236,6 +232,16 @@
   top: -8px;
 }
 
+.flat .start:before {
+  left: -8px;
+  top: -8px;
+}
+
+.flat .end:before {
+  right: -8px;
+  top: -8px;
+}
+
 .line.active .segment,
 .line.active .segment:before {
   border-color: var(--journey-active-color);
diff --git a/src/app/(main)/reports/journey/JourneyView.tsx b/src/app/(main)/reports/journey/JourneyView.tsx
index 26815430fb..d9a4334602 100644
--- a/src/app/(main)/reports/journey/JourneyView.tsx
+++ b/src/app/(main)/reports/journey/JourneyView.tsx
@@ -23,61 +23,69 @@ export default function JourneyView() {
     if (!data) {
       return [];
     }
+
+    const selectedPaths = selectedNode?.paths ?? [];
+    const activePaths = activeNode?.paths ?? [];
+
     return Array(Number(parameters.steps))
       .fill(undefined)
-      .map((column = {}, index) => {
+      .map((nodes = {}, index) => {
         data.forEach(({ items, count }) => {
           const name = items[index];
-          const selectedNodes = selectedNode?.paths ?? [];
 
           if (name) {
-            const selected = !!selectedNodes.find(a => a.items[index] === name);
-            if (!column[name]) {
+            const selected = !!selectedPaths.find(path => path.items[index] === name);
+            const active = selected && !!activePaths.find(path => path.items[index] === name);
+
+            if (!nodes[name]) {
               const paths = data.filter((d, i) => {
                 return i !== index && d.items[index] === name;
               });
+
               const from =
                 index > 0 &&
                 selected &&
                 paths.reduce((obj, path) => {
                   const { items, count } = path;
                   const name = items[index - 1];
+
                   if (!obj[name]) {
                     obj[name] = { name, count };
                   } else {
                     obj[name].count += count;
                   }
+
                   return obj;
                 }, {});
 
-              column[name] = {
+              nodes[name] = {
                 name,
                 count,
                 total: count,
                 columnIndex: index,
                 selected,
-                selectedCount: count,
+                active,
                 paths,
                 from: objectToArray(from),
               };
             } else {
-              column[name].selectedCount += selected ? count : 0;
-              column[name].total += count;
+              nodes[name].total += count;
             }
           }
         });
 
         return {
-          nodes: objectToArray(column).sort(firstBy('total', -1)),
+          nodes: objectToArray(nodes).sort(firstBy('total', -1)),
         };
       });
-  }, [data, selectedNode]);
+  }, [data, selectedNode, activeNode]);
 
-  const handleClick = (item: string, index: number, paths: any[]) => {
-    if (item !== selectedNode?.item || index !== selectedNode?.index) {
-      setSelectedNode({ item, index, paths });
+  const handleClick = (name: string, index: number, paths: any[]) => {
+    if (name !== selectedNode?.name || index !== selectedNode?.index) {
+      setSelectedNode({ name, index, paths });
     } else {
       setSelectedNode(null);
+      setActiveNode(null);
     }
   };
 
@@ -85,7 +93,7 @@ export default function JourneyView() {
     return null;
   }
 
-  //console.log({ columns, selectedNode, activeNode });
+  //console.log({ data, columns, selectedNode, activeNode });
 
   return (
     <div className={styles.container}>
@@ -100,81 +108,89 @@ export default function JourneyView() {
                 <div className={styles.num}>{columnIndex + 1}</div>
               </div>
               <div className={styles.nodes}>
-                {column.nodes.map(
-                  ({ name, total, selected, paths, from, selectedCount }, nodeIndex) => {
-                    const active =
-                      selected && activeNode?.paths.find(path => path.items[columnIndex] === name);
-
-                    const lines = from?.reduce((arr, { name }: any) => {
-                      const fromIndex = columns[columnIndex - 1]?.nodes.findIndex(node => {
-                        return node.name === name && node.selected;
-                      });
-
-                      if (fromIndex > -1) {
-                        arr.push([fromIndex, nodeIndex]);
-                      }
-
-                      return arr;
-                    }, []);
-
-                    return (
-                      <div
-                        key={name}
-                        className={classNames(styles.item, {
-                          [styles.selected]: selected,
-                          [styles.active]: active,
-                        })}
-                        onClick={() => handleClick(name, columnIndex, paths)}
-                        onMouseEnter={() => selected && setActiveNode({ name, columnIndex, paths })}
-                        onMouseLeave={() => selected && setActiveNode(null)}
-                      >
-                        <div className={styles.name}>{name}</div>
-                        <div className={styles.count}>
-                          {selected || active ? selectedCount : total}
-                        </div>
-                        {columnIndex < columns.length &&
-                          lines.map(([fromIndex, nodeIndex], i) => {
-                            const height =
-                              (Math.abs(nodeIndex - fromIndex) + 1) * (NODE_HEIGHT + NODE_GAP) -
-                              NODE_GAP;
-                            const midHeight =
-                              (Math.abs(nodeIndex - fromIndex) - 1) * (NODE_HEIGHT + NODE_GAP) +
-                              NODE_GAP +
-                              LINE_WIDTH;
-                            const nodeName = columns[columnIndex - 1]?.nodes[fromIndex].name;
-
-                            return (
-                              <div
-                                key={`${fromIndex}${nodeIndex}${i}`}
-                                className={classNames(styles.line, {
-                                  [styles.active]:
-                                    active &&
-                                    activeNode?.paths.find(
-                                      path =>
-                                        path.items[columnIndex] === name &&
-                                        path.items[columnIndex - 1] === nodeName,
-                                    ),
-                                  [styles.up]: fromIndex < nodeIndex,
-                                  [styles.down]: fromIndex > nodeIndex,
-                                  [styles.flat]: fromIndex === nodeIndex,
-                                })}
-                                style={{ height }}
-                              >
-                                <div className={classNames(styles.segment, styles.start)} />
-                                <div
-                                  className={classNames(styles.segment, styles.mid)}
-                                  style={{
-                                    height: midHeight,
-                                  }}
-                                />
-                                <div className={classNames(styles.segment, styles.end)} />
-                              </div>
-                            );
-                          })}
+                {column.nodes.map(({ name, total, selected, active, paths, from }, nodeIndex) => {
+                  const previousNodes = columns[columnIndex - 1]?.nodes;
+                  let selectedCount = from?.length ? 0 : total;
+                  let activeCount = selectedCount;
+
+                  const lines = from?.reduce((arr, { name, count }: any) => {
+                    const fromIndex = previousNodes.findIndex(node => {
+                      return node.name === name && node.selected;
+                    });
+
+                    if (fromIndex > -1) {
+                      arr.push([fromIndex, nodeIndex]);
+                      selectedCount += count;
+                    }
+
+                    if (
+                      previousNodes.findIndex(node => {
+                        return node.name === name && node.active;
+                      }) > -1
+                    ) {
+                      activeCount += count;
+                    }
+
+                    return arr;
+                  }, []);
+
+                  return (
+                    <div
+                      key={name}
+                      className={classNames(styles.item, {
+                        [styles.selected]: selected,
+                        [styles.active]: active,
+                      })}
+                      onClick={() => handleClick(name, columnIndex, paths)}
+                      onMouseEnter={() => selected && setActiveNode({ name, columnIndex, paths })}
+                      onMouseLeave={() => selected && setActiveNode(null)}
+                    >
+                      <div className={styles.name}>{name}</div>
+                      <div className={styles.count}>
+                        {selected ? (active ? activeCount : selectedCount) : total}
                       </div>
-                    );
-                  },
-                )}
+                      {columnIndex < columns.length &&
+                        lines.map(([fromIndex, nodeIndex], i) => {
+                          const height =
+                            (Math.abs(nodeIndex - fromIndex) + 1) * (NODE_HEIGHT + NODE_GAP) -
+                            NODE_GAP;
+                          const midHeight =
+                            (Math.abs(nodeIndex - fromIndex) - 1) * (NODE_HEIGHT + NODE_GAP) +
+                            NODE_GAP +
+                            LINE_WIDTH;
+                          const nodeName = columns[columnIndex - 1]?.nodes[fromIndex].name;
+
+                          return (
+                            <div
+                              key={`${fromIndex}${nodeIndex}${i}`}
+                              className={classNames(styles.line, {
+                                [styles.active]:
+                                  active &&
+                                  activeNode?.paths.find(
+                                    path =>
+                                      path.items[columnIndex] === name &&
+                                      path.items[columnIndex - 1] === nodeName,
+                                  ),
+                                [styles.up]: fromIndex < nodeIndex,
+                                [styles.down]: fromIndex > nodeIndex,
+                                [styles.flat]: fromIndex === nodeIndex,
+                              })}
+                              style={{ height }}
+                            >
+                              <div className={classNames(styles.segment, styles.start)} />
+                              <div
+                                className={classNames(styles.segment, styles.mid)}
+                                style={{
+                                  height: midHeight,
+                                }}
+                              />
+                              <div className={classNames(styles.segment, styles.end)} />
+                            </div>
+                          );
+                        })}
+                    </div>
+                  );
+                })}
               </div>
             </div>
           );

From 117229f9f14edd11b3aa76c96b5f34ff8af5e9ca Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Fri, 14 Jun 2024 12:35:12 -0700
Subject: [PATCH 148/438] Add entry / exit filters

---
 .../(main)/reports/journey/JourneyView.tsx    |  2 -
 .../[websiteId]/WebsiteExpandedView.tsx       | 12 ++++++
 src/components/messages.ts                    |  2 +
 src/components/metrics/PagesTable.tsx         | 17 ++++++---
 src/lib/constants.ts                          |  4 +-
 .../analytics/pageviews/getPageviewMetrics.ts | 38 ++++++++++++++++++-
 6 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/src/app/(main)/reports/journey/JourneyView.tsx b/src/app/(main)/reports/journey/JourneyView.tsx
index d9a4334602..f11e8aa3f1 100644
--- a/src/app/(main)/reports/journey/JourneyView.tsx
+++ b/src/app/(main)/reports/journey/JourneyView.tsx
@@ -93,8 +93,6 @@ export default function JourneyView() {
     return null;
   }
 
-  //console.log({ data, columns, selectedNode, activeNode });
-
   return (
     <div className={styles.container}>
       <div className={styles.view}>
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx
index ea037852e2..db4db73f0d 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx
@@ -18,6 +18,8 @@ import styles from './WebsiteExpandedView.module.css';
 
 const views = {
   url: PagesTable,
+  entry: PagesTable,
+  exit: PagesTable,
   title: PagesTable,
   referrer: ReferrersTable,
   browser: BrowsersTable,
@@ -53,6 +55,16 @@ export default function WebsiteExpandedView({
       label: formatMessage(labels.pages),
       url: renderUrl({ view: 'url' }),
     },
+    {
+      key: 'entry',
+      label: formatMessage(labels.entry),
+      url: renderUrl({ view: 'entry' }),
+    },
+    {
+      key: 'exit',
+      label: formatMessage(labels.exit),
+      url: renderUrl({ view: 'exit' }),
+    },
     {
       key: 'referrer',
       label: formatMessage(labels.referrers),
diff --git a/src/components/messages.ts b/src/components/messages.ts
index a4c43af22b..dd5eb9ddcc 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -88,6 +88,8 @@ export const labels = defineMessages({
   leaveTeam: { id: 'label.leave-team', defaultMessage: 'Leave team' },
   refresh: { id: 'label.refresh', defaultMessage: 'Refresh' },
   pages: { id: 'label.pages', defaultMessage: 'Pages' },
+  entry: { id: 'label.entry', defaultMessage: 'Entry URL' },
+  exit: { id: 'label.exit', defaultMessage: 'Exit URL' },
   referrers: { id: 'label.referrers', defaultMessage: 'Referrers' },
   screens: { id: 'label.screens', defaultMessage: 'Screens' },
   browsers: { id: 'label.browsers', defaultMessage: 'Browsers' },
diff --git a/src/components/metrics/PagesTable.tsx b/src/components/metrics/PagesTable.tsx
index d29952d4f3..f9ded4781f 100644
--- a/src/components/metrics/PagesTable.tsx
+++ b/src/components/metrics/PagesTable.tsx
@@ -1,11 +1,10 @@
-import FilterLink from 'components/common/FilterLink';
+import { WebsiteContext } from 'app/(main)/websites/[websiteId]/WebsiteProvider';
 import FilterButtons from 'components/common/FilterButtons';
-import MetricsTable, { MetricsTableProps } from './MetricsTable';
-import { useMessages } from 'components/hooks';
-import { useNavigation } from 'components/hooks';
+import FilterLink from 'components/common/FilterLink';
+import { useMessages, useNavigation } from 'components/hooks';
 import { emptyFilter } from 'lib/filters';
 import { useContext } from 'react';
-import { WebsiteContext } from 'app/(main)/websites/[websiteId]/WebsiteProvider';
+import MetricsTable, { MetricsTableProps } from './MetricsTable';
 
 export interface PagesTableProps extends MetricsTableProps {
   allowFilter?: boolean;
@@ -29,6 +28,14 @@ export function PagesTable({ allowFilter, ...props }: PagesTableProps) {
       label: 'URL',
       key: 'url',
     },
+    {
+      label: formatMessage(labels.entry),
+      key: 'entry',
+    },
+    {
+      label: formatMessage(labels.exit),
+      key: 'exit',
+    },
     {
       label: formatMessage(labels.title),
       key: 'title',
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 745673e96c..f8447b8b7e 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -32,7 +32,7 @@ export const FILTER_RANGE = 'filter-range';
 export const FILTER_REFERRERS = 'filter-referrers';
 export const FILTER_PAGES = 'filter-pages';
 export const UNIT_TYPES = ['year', 'month', 'hour', 'day', 'minute'];
-export const EVENT_COLUMNS = ['url', 'referrer', 'title', 'query', 'event'];
+export const EVENT_COLUMNS = ['url', 'entry', 'exit', 'referrer', 'title', 'query', 'event'];
 
 export const SESSION_COLUMNS = [
   'browser',
@@ -47,6 +47,8 @@ export const SESSION_COLUMNS = [
 
 export const FILTER_COLUMNS = {
   url: 'url_path',
+  entry: 'url_path',
+  exit: 'url_path',
   referrer: 'referrer_domain',
   title: 'page_title',
   query: 'url_query',
diff --git a/src/queries/analytics/pageviews/getPageviewMetrics.ts b/src/queries/analytics/pageviews/getPageviewMetrics.ts
index 5f609c126e..67ccb04aab 100644
--- a/src/queries/analytics/pageviews/getPageviewMetrics.ts
+++ b/src/queries/analytics/pageviews/getPageviewMetrics.ts
@@ -1,7 +1,7 @@
-import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
-import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
 import { EVENT_TYPE, FILTER_COLUMNS, SESSION_COLUMNS } from 'lib/constants';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import prisma from 'lib/prisma';
 import { QueryFilters } from 'lib/types';
 
 export async function getPageviewMetrics(
@@ -31,17 +31,34 @@ async function relationalQuery(
     { joinSession: SESSION_COLUMNS.includes(type) },
   );
 
+  let entryExitQuery = '';
   let excludeDomain = '';
   if (column === 'referrer_domain') {
     excludeDomain = `and website_event.referrer_domain != {{websiteDomain}}
       and website_event.referrer_domain is not null`;
   }
 
+  if (type === 'entry' || type === 'exit') {
+    const aggregrate = type === 'entry' ? 'min' : 'max';
+
+    entryExitQuery = `
+    JOIN (select visit_id,
+        ${aggregrate}(created_at) target_created_at
+    from website_event
+    where website_event.website_id = {{websiteId::uuid}}
+      and website_event.created_at between {{startDate}} and {{endDate}}
+      and event_type = {{eventType}}
+    group by visit_id) x
+    ON x.visit_id = website_event.visit_id
+        and x.target_created_at = website_event.created_at`;
+  }
+
   return rawQuery(
     `
     select ${column} x, count(*) y
     from website_event
     ${joinSession}
+    ${entryExitQuery}
     where website_event.website_id = {{websiteId::uuid}}
       and website_event.created_at between {{startDate}} and {{endDate}}
       and event_type = {{eventType}}
@@ -70,15 +87,32 @@ async function clickhouseQuery(
     eventType: column === 'event_name' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
   });
 
+  let entryExitQuery = '';
   let excludeDomain = '';
   if (column === 'referrer_domain') {
     excludeDomain = `and referrer_domain != {websiteDomain:String} and referrer_domain != ''`;
   }
 
+  if (type === 'entry' || type === 'exit') {
+    const aggregrate = type === 'entry' ? 'min' : 'max';
+
+    entryExitQuery = `
+    JOIN (select visit_id,
+        ${aggregrate}(created_at) target_created_at
+    from website_event
+    where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      and event_type = {eventType:UInt32}
+    group by visit_id) x
+    ON x.visit_id = website_event.visit_id
+        and x.target_created_at = website_event.created_at`;
+  }
+
   return rawQuery(
     `
     select ${column} x, count(*) y
     from website_event
+    ${entryExitQuery}
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}
       and event_type = {eventType:UInt32}

From 8493db1402f1ee21e9b0b5164b573a197e590506 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Fri, 14 Jun 2024 12:41:05 -0700
Subject: [PATCH 149/438] fix scroll and expanded view items

---
 .../websites/[websiteId]/WebsiteExpandedView.tsx       | 10 ----------
 src/components/metrics/PagesTable.tsx                  |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx
index db4db73f0d..617015f1d6 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx
@@ -55,16 +55,6 @@ export default function WebsiteExpandedView({
       label: formatMessage(labels.pages),
       url: renderUrl({ view: 'url' }),
     },
-    {
-      key: 'entry',
-      label: formatMessage(labels.entry),
-      url: renderUrl({ view: 'entry' }),
-    },
-    {
-      key: 'exit',
-      label: formatMessage(labels.exit),
-      url: renderUrl({ view: 'exit' }),
-    },
     {
       key: 'referrer',
       label: formatMessage(labels.referrers),
diff --git a/src/components/metrics/PagesTable.tsx b/src/components/metrics/PagesTable.tsx
index f9ded4781f..9a18458d69 100644
--- a/src/components/metrics/PagesTable.tsx
+++ b/src/components/metrics/PagesTable.tsx
@@ -20,7 +20,7 @@ export function PagesTable({ allowFilter, ...props }: PagesTableProps) {
   const { domain } = useContext(WebsiteContext);
 
   const handleSelect = (key: any) => {
-    router.push(renderUrl({ view: key }), { scroll: true });
+    router.push(renderUrl({ view: key }), { scroll: false });
   };
 
   const buttons = [

From dd47ca9e339bcf3e0741ebf93b578a659b318801 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Fri, 14 Jun 2024 13:06:32 -0700
Subject: [PATCH 150/438] fix filterlink logic for entry / exit

---
 src/components/metrics/PagesTable.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/metrics/PagesTable.tsx b/src/components/metrics/PagesTable.tsx
index 9a18458d69..767c4764b4 100644
--- a/src/components/metrics/PagesTable.tsx
+++ b/src/components/metrics/PagesTable.tsx
@@ -45,11 +45,13 @@ export function PagesTable({ allowFilter, ...props }: PagesTableProps) {
   const renderLink = ({ x }) => {
     return (
       <FilterLink
-        id={view}
+        id={view === 'entry' || view === 'exit' ? 'url' : view}
         value={x}
         label={!x && formatMessage(labels.none)}
         externalUrl={
-          view === 'url' ? `${domain.startsWith('http') ? domain : `https://${domain}`}${x}` : null
+          view !== 'title'
+            ? `${domain.startsWith('http') ? domain : `https://${domain}`}${x}`
+            : null
         }
       />
     );

From 84548a669e771a6b1a14a999e5484b7bf48c02a1 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 14 Jun 2024 18:33:54 -0700
Subject: [PATCH 151/438] Added drop-off info to journey.

---
 .../reports/journey/JourneyView.module.css    | 25 +++++++++++++--
 .../(main)/reports/journey/JourneyView.tsx    | 32 ++++++++++++++++---
 2 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/src/app/(main)/reports/journey/JourneyView.module.css b/src/app/(main)/reports/journey/JourneyView.module.css
index f4571cdad2..dcc1e467ee 100644
--- a/src/app/(main)/reports/journey/JourneyView.module.css
+++ b/src/app/(main)/reports/journey/JourneyView.module.css
@@ -22,8 +22,29 @@
 }
 
 .header {
+  margin-bottom: 20px;
+}
+
+.stats {
   display: flex;
-  min-height: 70px;
+  align-items: center;
+  justify-content: center;
+  gap: 20px;
+  width: 100%;
+}
+
+.visitors {
+  font-weight: 600;
+  font-size: 16px;
+  text-transform: lowercase;
+}
+
+.dropoff {
+  font-weight: 600;
+  color: var(--base800);
+  background: var(--base200);
+  padding: 4px 8px;
+  border-radius: 5px;
 }
 
 .num {
@@ -38,7 +59,7 @@
   color: var(--base100);
   background: var(--base800);
   z-index: 1;
-  margin: 0 auto;
+  margin: 0 auto 20px;
 }
 
 .column {
diff --git a/src/app/(main)/reports/journey/JourneyView.tsx b/src/app/(main)/reports/journey/JourneyView.tsx
index d9a4334602..b013a3e193 100644
--- a/src/app/(main)/reports/journey/JourneyView.tsx
+++ b/src/app/(main)/reports/journey/JourneyView.tsx
@@ -1,7 +1,8 @@
 import { useContext, useMemo, useState } from 'react';
+import { TooltipPopup } from 'react-basics';
 import { firstBy } from 'thenby';
 import classNames from 'classnames';
-import { useEscapeKey } from 'components/hooks';
+import { useEscapeKey, useMessages } from 'components/hooks';
 import { objectToArray } from 'lib/data';
 import { ReportContext } from '../[reportId]/Report';
 // eslint-disable-next-line css-modules/no-unused-class
@@ -16,6 +17,7 @@ export default function JourneyView() {
   const [activeNode, setActiveNode] = useState(null);
   const { report } = useContext(ReportContext);
   const { data, parameters } = report || {};
+  const { formatMessage, labels } = useMessages();
 
   useEscapeKey(() => setSelectedNode(null));
 
@@ -74,8 +76,16 @@ export default function JourneyView() {
           }
         });
 
+        const nodesArray = objectToArray(nodes).sort(firstBy('total', -1));
+
         return {
-          nodes: objectToArray(nodes).sort(firstBy('total', -1)),
+          nodes: nodesArray,
+          visitors: nodesArray.reduce((sum, { selected, total }) => {
+            if (!selectedNode || (selectedNode && selected)) {
+              sum += total;
+            }
+            return sum;
+          }, 0),
         };
       });
   }, [data, selectedNode, activeNode]);
@@ -99,6 +109,10 @@ export default function JourneyView() {
     <div className={styles.container}>
       <div className={styles.view}>
         {columns.map((column, columnIndex) => {
+          const previousTotal = columns[columnIndex - 1]?.visitors ?? 0;
+          const dropOff =
+            previousTotal > 0 ? ((column.visitors - previousTotal) / previousTotal) * 100 : 0;
+
           return (
             <div
               key={columnIndex}
@@ -106,6 +120,12 @@ export default function JourneyView() {
             >
               <div className={styles.header}>
                 <div className={styles.num}>{columnIndex + 1}</div>
+                <div className={styles.stats}>
+                  <div className={styles.visitors}>
+                    {column.visitors} {formatMessage(labels.visitors)}
+                  </div>
+                  {columnIndex > 0 && <div className={styles.dropoff}>{`${~~dropOff}%`}</div>}
+                </div>
               </div>
               <div className={styles.nodes}>
                 {column.nodes.map(({ name, total, selected, active, paths, from }, nodeIndex) => {
@@ -146,9 +166,11 @@ export default function JourneyView() {
                       onMouseLeave={() => selected && setActiveNode(null)}
                     >
                       <div className={styles.name}>{name}</div>
-                      <div className={styles.count}>
-                        {selected ? (active ? activeCount : selectedCount) : total}
-                      </div>
+                      <TooltipPopup label="hi" disabled={!selected}>
+                        <div className={styles.count}>
+                          {selected ? (active ? activeCount : selectedCount) : total}
+                        </div>
+                      </TooltipPopup>
                       {columnIndex < columns.length &&
                         lines.map(([fromIndex, nodeIndex], i) => {
                           const height =

From 2204ffa9c3050a8ff2deeccce1fc5f4b65343001 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 14 Jun 2024 20:44:47 -0700
Subject: [PATCH 152/438] Refactored journey rendering.

---
 .../reports/journey/JourneyView.module.css    |  10 +-
 .../(main)/reports/journey/JourneyView.tsx    | 332 ++++++++++--------
 2 files changed, 188 insertions(+), 154 deletions(-)

diff --git a/src/app/(main)/reports/journey/JourneyView.module.css b/src/app/(main)/reports/journey/JourneyView.module.css
index dcc1e467ee..d5c779b6ba 100644
--- a/src/app/(main)/reports/journey/JourneyView.module.css
+++ b/src/app/(main)/reports/journey/JourneyView.module.css
@@ -104,10 +104,6 @@
   background: var(--primary400);
 }
 
-.item.active .count {
-  background: var(--primary600);
-}
-
 .behind {
   color: var(--base400);
 }
@@ -130,11 +126,15 @@
   background: var(--base200);
 }
 
-.selected .count {
+.item.selected .count {
   color: var(--base50);
   background: var(--base800);
 }
 
+.item.selected.active .count {
+  background: var(--primary600);
+}
+
 .line {
   position: absolute;
   bottom: 0;
diff --git a/src/app/(main)/reports/journey/JourneyView.tsx b/src/app/(main)/reports/journey/JourneyView.tsx
index 08a51ce2df..7a52954315 100644
--- a/src/app/(main)/reports/journey/JourneyView.tsx
+++ b/src/app/(main)/reports/journey/JourneyView.tsx
@@ -28,66 +28,114 @@ export default function JourneyView() {
 
     const selectedPaths = selectedNode?.paths ?? [];
     const activePaths = activeNode?.paths ?? [];
+    const columns = [];
+
+    for (let columnIndex = 0; columnIndex < +parameters.steps; columnIndex++) {
+      const nodes = {};
+
+      data.forEach(({ items, count }: any, nodeIndex: any) => {
+        const name = items[columnIndex];
+
+        if (name) {
+          const selected = !!selectedPaths.find(path => path.items[columnIndex] === name);
+          const active = selected && !!activePaths.find(path => path.items[columnIndex] === name);
+
+          if (!nodes[name]) {
+            const paths = data.filter((d, i) => {
+              return i !== columnIndex && d.items[columnIndex] === name;
+            });
+
+            const from =
+              columnIndex > 0 &&
+              selected &&
+              paths.reduce((obj, path) => {
+                const { items, count } = path;
+                const name = items[columnIndex - 1];
+
+                if (!obj[name]) {
+                  obj[name] = { name, count };
+                } else {
+                  obj[name].count += count;
+                }
+
+                return obj;
+              }, {});
+
+            nodes[name] = {
+              name,
+              count,
+              totalCount: count,
+              nodeIndex,
+              columnIndex,
+              selected,
+              active,
+              paths,
+              from: objectToArray(from),
+            };
+          } else {
+            nodes[name].totalCount += count;
+          }
+        }
+      });
+
+      columns.push({
+        nodes: objectToArray(nodes).sort(firstBy('total', -1)),
+      });
+    }
 
-    return Array(Number(parameters.steps))
-      .fill(undefined)
-      .map((nodes = {}, index) => {
-        data.forEach(({ items, count }) => {
-          const name = items[index];
-
-          if (name) {
-            const selected = !!selectedPaths.find(path => path.items[index] === name);
-            const active = selected && !!activePaths.find(path => path.items[index] === name);
-
-            if (!nodes[name]) {
-              const paths = data.filter((d, i) => {
-                return i !== index && d.items[index] === name;
-              });
-
-              const from =
-                index > 0 &&
-                selected &&
-                paths.reduce((obj, path) => {
-                  const { items, count } = path;
-                  const name = items[index - 1];
-
-                  if (!obj[name]) {
-                    obj[name] = { name, count };
-                  } else {
-                    obj[name].count += count;
-                  }
-
-                  return obj;
-                }, {});
-
-              nodes[name] = {
-                name,
-                count,
-                total: count,
-                columnIndex: index,
-                selected,
-                active,
-                paths,
-                from: objectToArray(from),
-              };
-            } else {
-              nodes[name].total += count;
-            }
+    columns.forEach((column, columnIndex) => {
+      const nodes = column.nodes.map((node, nodeIndex) => {
+        const { from, totalCount } = node;
+        const previousNodes = columns[columnIndex - 1]?.nodes;
+        let selectedCount = from?.length ? 0 : totalCount;
+        let activeCount = selectedCount;
+
+        const lines = from?.reduce((arr: any[][], { name, count }: any) => {
+          const fromIndex = previousNodes.findIndex((node: { name: any; selected: any }) => {
+            return node.name === name && node.selected;
+          });
+
+          if (fromIndex > -1) {
+            arr.push([fromIndex, nodeIndex]);
+            selectedCount += count;
           }
-        });
-
-        const nodesArray = objectToArray(nodes).sort(firstBy('total', -1));
-
-        return {
-          nodes: nodesArray,
-          visitors: nodesArray.reduce((sum, { selected, total }) => {
-            if (!selectedNode || (selectedNode && selected)) {
-              sum += total;
-            }
-            return sum;
-          }, 0),
-        };
+
+          if (
+            previousNodes.findIndex(node => {
+              return node.name === name && node.active;
+            }) > -1
+          ) {
+            activeCount += count;
+          }
+
+          return arr;
+        }, []);
+
+        return { ...node, selectedCount, activeCount, lines };
       });
+
+      const visitorCount = nodes.reduce(
+        (sum: number, { selected, selectedCount, active, activeCount, totalCount }) => {
+          if (!selectedNode) {
+            sum += totalCount;
+          } else if (!activeNode && selected) {
+            sum += selectedCount;
+          } else if (active) {
+            sum += activeCount;
+          }
+          return sum;
+        },
+        0,
+      );
+
+      const previousTotal = columns[columnIndex - 1]?.visitorCount ?? 0;
+      const dropOff =
+        previousTotal > 0 ? ((visitorCount - previousTotal) / previousTotal) * 100 : 0;
+
+      Object.assign(column, { nodes, visitorCount, dropOff });
+    });
+
+    return columns;
   }, [data, selectedNode, activeNode]);
 
   const handleClick = (name: string, index: number, paths: any[]) => {
@@ -95,8 +143,8 @@ export default function JourneyView() {
       setSelectedNode({ name, index, paths });
     } else {
       setSelectedNode(null);
-      setActiveNode(null);
     }
+    setActiveNode(null);
   };
 
   if (!data) {
@@ -107,110 +155,96 @@ export default function JourneyView() {
     <div className={styles.container}>
       <div className={styles.view}>
         {columns.map((column, columnIndex) => {
-          const previousTotal = columns[columnIndex - 1]?.visitors ?? 0;
-          const dropOff =
-            previousTotal > 0 ? ((column.visitors - previousTotal) / previousTotal) * 100 : 0;
-
+          const dropOffPercent = `${~~column.dropOff}%`;
           return (
             <div
               key={columnIndex}
-              className={classNames(styles.column, { [styles.active]: activeNode })}
+              className={classNames(styles.column, {
+                [styles.selected]: selectedNode,
+                [styles.active]: activeNode,
+              })}
             >
               <div className={styles.header}>
                 <div className={styles.num}>{columnIndex + 1}</div>
                 <div className={styles.stats}>
                   <div className={styles.visitors}>
-                    {column.visitors} {formatMessage(labels.visitors)}
+                    {column.visitorCount} {formatMessage(labels.visitors)}
                   </div>
-                  {columnIndex > 0 && <div className={styles.dropoff}>{`${~~dropOff}%`}</div>}
+                  {columnIndex > 0 && <div className={styles.dropoff}>{dropOffPercent}</div>}
                 </div>
               </div>
               <div className={styles.nodes}>
-                {column.nodes.map(({ name, total, selected, active, paths, from }, nodeIndex) => {
-                  const previousNodes = columns[columnIndex - 1]?.nodes;
-                  let selectedCount = from?.length ? 0 : total;
-                  let activeCount = selectedCount;
-
-                  const lines = from?.reduce((arr, { name, count }: any) => {
-                    const fromIndex = previousNodes.findIndex(node => {
-                      return node.name === name && node.selected;
-                    });
-
-                    if (fromIndex > -1) {
-                      arr.push([fromIndex, nodeIndex]);
-                      selectedCount += count;
-                    }
-
-                    if (
-                      previousNodes.findIndex(node => {
-                        return node.name === name && node.active;
-                      }) > -1
-                    ) {
-                      activeCount += count;
-                    }
-
-                    return arr;
-                  }, []);
-
-                  return (
-                    <div
-                      key={name}
-                      className={classNames(styles.item, {
-                        [styles.selected]: selected,
-                        [styles.active]: active,
-                      })}
-                      onClick={() => handleClick(name, columnIndex, paths)}
-                      onMouseEnter={() => selected && setActiveNode({ name, columnIndex, paths })}
-                      onMouseLeave={() => selected && setActiveNode(null)}
-                    >
-                      <div className={styles.name}>{name}</div>
-                      <TooltipPopup label="hi" disabled={!selected}>
-                        <div className={styles.count}>
-                          {selected ? (active ? activeCount : selectedCount) : total}
-                        </div>
-                      </TooltipPopup>
-                      {columnIndex < columns.length &&
-                        lines.map(([fromIndex, nodeIndex], i) => {
-                          const height =
-                            (Math.abs(nodeIndex - fromIndex) + 1) * (NODE_HEIGHT + NODE_GAP) -
-                            NODE_GAP;
-                          const midHeight =
-                            (Math.abs(nodeIndex - fromIndex) - 1) * (NODE_HEIGHT + NODE_GAP) +
-                            NODE_GAP +
-                            LINE_WIDTH;
-                          const nodeName = columns[columnIndex - 1]?.nodes[fromIndex].name;
-
-                          return (
-                            <div
-                              key={`${fromIndex}${nodeIndex}${i}`}
-                              className={classNames(styles.line, {
-                                [styles.active]:
-                                  active &&
-                                  activeNode?.paths.find(
-                                    path =>
-                                      path.items[columnIndex] === name &&
-                                      path.items[columnIndex - 1] === nodeName,
-                                  ),
-                                [styles.up]: fromIndex < nodeIndex,
-                                [styles.down]: fromIndex > nodeIndex,
-                                [styles.flat]: fromIndex === nodeIndex,
-                              })}
-                              style={{ height }}
-                            >
-                              <div className={classNames(styles.segment, styles.start)} />
-                              <div
-                                className={classNames(styles.segment, styles.mid)}
-                                style={{
-                                  height: midHeight,
-                                }}
-                              />
-                              <div className={classNames(styles.segment, styles.end)} />
-                            </div>
-                          );
+                {column.nodes.map(
+                  ({
+                    name,
+                    totalCount,
+                    selected,
+                    active,
+                    paths,
+                    activeCount,
+                    selectedCount,
+                    lines,
+                  }) => {
+                    return (
+                      <div
+                        key={name}
+                        className={classNames(styles.item, {
+                          [styles.selected]: selected,
+                          [styles.active]: active,
                         })}
-                    </div>
-                  );
-                })}
+                        onClick={() => handleClick(name, columnIndex, paths)}
+                        onMouseEnter={() => selected && setActiveNode({ name, columnIndex, paths })}
+                        onMouseLeave={() => selected && setActiveNode(null)}
+                      >
+                        <div className={styles.name}>{name}</div>
+                        <TooltipPopup label={dropOffPercent} disabled={!selected}>
+                          <div className={styles.count}>
+                            {selected ? (active ? activeCount : selectedCount) : totalCount}
+                          </div>
+                        </TooltipPopup>
+                        {columnIndex < columns.length &&
+                          lines.map(([fromIndex, nodeIndex], i) => {
+                            const height =
+                              (Math.abs(nodeIndex - fromIndex) + 1) * (NODE_HEIGHT + NODE_GAP) -
+                              NODE_GAP;
+                            const midHeight =
+                              (Math.abs(nodeIndex - fromIndex) - 1) * (NODE_HEIGHT + NODE_GAP) +
+                              NODE_GAP +
+                              LINE_WIDTH;
+                            const nodeName = columns[columnIndex - 1]?.nodes[fromIndex].name;
+
+                            return (
+                              <div
+                                key={`${fromIndex}${nodeIndex}${i}`}
+                                className={classNames(styles.line, {
+                                  [styles.active]:
+                                    active &&
+                                    activeNode?.paths.find(
+                                      path =>
+                                        path.items[columnIndex] === name &&
+                                        path.items[columnIndex - 1] === nodeName,
+                                    ),
+                                  [styles.up]: fromIndex < nodeIndex,
+                                  [styles.down]: fromIndex > nodeIndex,
+                                  [styles.flat]: fromIndex === nodeIndex,
+                                })}
+                                style={{ height }}
+                              >
+                                <div className={classNames(styles.segment, styles.start)} />
+                                <div
+                                  className={classNames(styles.segment, styles.mid)}
+                                  style={{
+                                    height: midHeight,
+                                  }}
+                                />
+                                <div className={classNames(styles.segment, styles.end)} />
+                              </div>
+                            );
+                          })}
+                      </div>
+                    );
+                  },
+                )}
               </div>
             </div>
           );

From 21ff3d1280b95e545145fba5a5c655234fc64bd7 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 14 Jun 2024 20:49:29 -0700
Subject: [PATCH 153/438] Fix flickering in journey nodes.

---
 .../reports/journey/JourneyView.module.css    |   5 +-
 .../(main)/reports/journey/JourneyView.tsx    | 102 +++++++++---------
 2 files changed, 57 insertions(+), 50 deletions(-)

diff --git a/src/app/(main)/reports/journey/JourneyView.module.css b/src/app/(main)/reports/journey/JourneyView.module.css
index d5c779b6ba..f6b50b6921 100644
--- a/src/app/(main)/reports/journey/JourneyView.module.css
+++ b/src/app/(main)/reports/journey/JourneyView.module.css
@@ -71,10 +71,13 @@
   position: relative;
   display: flex;
   flex-direction: column;
-  gap: 10px;
   height: 100%;
 }
 
+.wrapper {
+  padding-bottom: 10px;
+}
+
 .item {
   position: relative;
   cursor: pointer;
diff --git a/src/app/(main)/reports/journey/JourneyView.tsx b/src/app/(main)/reports/journey/JourneyView.tsx
index 7a52954315..9b91793809 100644
--- a/src/app/(main)/reports/journey/JourneyView.tsx
+++ b/src/app/(main)/reports/journey/JourneyView.tsx
@@ -188,59 +188,63 @@ export default function JourneyView() {
                     return (
                       <div
                         key={name}
-                        className={classNames(styles.item, {
-                          [styles.selected]: selected,
-                          [styles.active]: active,
-                        })}
-                        onClick={() => handleClick(name, columnIndex, paths)}
+                        className={styles.wrapper}
                         onMouseEnter={() => selected && setActiveNode({ name, columnIndex, paths })}
                         onMouseLeave={() => selected && setActiveNode(null)}
                       >
-                        <div className={styles.name}>{name}</div>
-                        <TooltipPopup label={dropOffPercent} disabled={!selected}>
-                          <div className={styles.count}>
-                            {selected ? (active ? activeCount : selectedCount) : totalCount}
-                          </div>
-                        </TooltipPopup>
-                        {columnIndex < columns.length &&
-                          lines.map(([fromIndex, nodeIndex], i) => {
-                            const height =
-                              (Math.abs(nodeIndex - fromIndex) + 1) * (NODE_HEIGHT + NODE_GAP) -
-                              NODE_GAP;
-                            const midHeight =
-                              (Math.abs(nodeIndex - fromIndex) - 1) * (NODE_HEIGHT + NODE_GAP) +
-                              NODE_GAP +
-                              LINE_WIDTH;
-                            const nodeName = columns[columnIndex - 1]?.nodes[fromIndex].name;
-
-                            return (
-                              <div
-                                key={`${fromIndex}${nodeIndex}${i}`}
-                                className={classNames(styles.line, {
-                                  [styles.active]:
-                                    active &&
-                                    activeNode?.paths.find(
-                                      path =>
-                                        path.items[columnIndex] === name &&
-                                        path.items[columnIndex - 1] === nodeName,
-                                    ),
-                                  [styles.up]: fromIndex < nodeIndex,
-                                  [styles.down]: fromIndex > nodeIndex,
-                                  [styles.flat]: fromIndex === nodeIndex,
-                                })}
-                                style={{ height }}
-                              >
-                                <div className={classNames(styles.segment, styles.start)} />
-                                <div
-                                  className={classNames(styles.segment, styles.mid)}
-                                  style={{
-                                    height: midHeight,
-                                  }}
-                                />
-                                <div className={classNames(styles.segment, styles.end)} />
-                              </div>
-                            );
+                        <div
+                          className={classNames(styles.item, {
+                            [styles.selected]: selected,
+                            [styles.active]: active,
                           })}
+                          onClick={() => handleClick(name, columnIndex, paths)}
+                        >
+                          <div className={styles.name}>{name}</div>
+                          <TooltipPopup label={dropOffPercent} disabled={!selected}>
+                            <div className={styles.count}>
+                              {selected ? (active ? activeCount : selectedCount) : totalCount}
+                            </div>
+                          </TooltipPopup>
+                          {columnIndex < columns.length &&
+                            lines.map(([fromIndex, nodeIndex], i) => {
+                              const height =
+                                (Math.abs(nodeIndex - fromIndex) + 1) * (NODE_HEIGHT + NODE_GAP) -
+                                NODE_GAP;
+                              const midHeight =
+                                (Math.abs(nodeIndex - fromIndex) - 1) * (NODE_HEIGHT + NODE_GAP) +
+                                NODE_GAP +
+                                LINE_WIDTH;
+                              const nodeName = columns[columnIndex - 1]?.nodes[fromIndex].name;
+
+                              return (
+                                <div
+                                  key={`${fromIndex}${nodeIndex}${i}`}
+                                  className={classNames(styles.line, {
+                                    [styles.active]:
+                                      active &&
+                                      activeNode?.paths.find(
+                                        path =>
+                                          path.items[columnIndex] === name &&
+                                          path.items[columnIndex - 1] === nodeName,
+                                      ),
+                                    [styles.up]: fromIndex < nodeIndex,
+                                    [styles.down]: fromIndex > nodeIndex,
+                                    [styles.flat]: fromIndex === nodeIndex,
+                                  })}
+                                  style={{ height }}
+                                >
+                                  <div className={classNames(styles.segment, styles.start)} />
+                                  <div
+                                    className={classNames(styles.segment, styles.mid)}
+                                    style={{
+                                      height: midHeight,
+                                    }}
+                                  />
+                                  <div className={classNames(styles.segment, styles.end)} />
+                                </div>
+                              );
+                            })}
+                        </div>
                       </div>
                     );
                   },

From d765f5f1a0ea580245080e644d57a0800bf76ece Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Sat, 15 Jun 2024 02:28:52 -0700
Subject: [PATCH 154/438] Added toggle button to report menu.

---
 .../reports/[reportId]/ReportMenu.module.css  | 31 +++++++++++++++++++
 .../(main)/reports/[reportId]/ReportMenu.tsx  | 18 +++++++++--
 .../reports/journey/JourneyView.module.css    |  5 +--
 3 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/src/app/(main)/reports/[reportId]/ReportMenu.module.css b/src/app/(main)/reports/[reportId]/ReportMenu.module.css
index ee1c608529..82d7fcb09e 100644
--- a/src/app/(main)/reports/[reportId]/ReportMenu.module.css
+++ b/src/app/(main)/reports/[reportId]/ReportMenu.module.css
@@ -1,7 +1,38 @@
 .menu {
+  position: relative;
   width: 300px;
   padding-inline-end: 20px;
   border-inline-end: 1px solid var(--base300);
   grid-row: 2 / 3;
   grid-column: 1 / 2;
 }
+
+.button {
+  display: flex;
+  place-content: center;
+  border: 1px solid var(--base400);
+  border-right: 0;
+  width: 30px;
+  padding: 5px;
+  right: 0;
+  position: absolute;
+  cursor: pointer;
+  z-index: 1;
+  border-radius: 4px 0 0 4px;
+}
+
+.button:hover {
+  background: var(--base75);
+}
+
+.menu.collapsed {
+  width: 0;
+  padding: 0;
+}
+
+.menu.collapsed .button {
+  left: 1px;
+  border-left: 0;
+  border-right: 1px solid var(--base300);
+  border-radius: 0 4px 4px 0;
+}
diff --git a/src/app/(main)/reports/[reportId]/ReportMenu.tsx b/src/app/(main)/reports/[reportId]/ReportMenu.tsx
index 9478a90394..e8c0ff021a 100644
--- a/src/app/(main)/reports/[reportId]/ReportMenu.tsx
+++ b/src/app/(main)/reports/[reportId]/ReportMenu.tsx
@@ -1,15 +1,27 @@
-import styles from './ReportMenu.module.css';
-import { useContext } from 'react';
+import { useContext, useState } from 'react';
 import { ReportContext } from './Report';
+import styles from './ReportMenu.module.css';
+import { Icon, Icons } from 'react-basics';
+import classNames from 'classnames';
 
 export function ReportMenu({ children }) {
+  const [collapsed, setCollapsed] = useState(true);
   const { report } = useContext(ReportContext);
 
   if (!report) {
     return null;
   }
 
-  return <div className={styles.menu}>{children}</div>;
+  return (
+    <div className={classNames(styles.menu, collapsed && styles.collapsed)}>
+      <div className={styles.button} onClick={() => setCollapsed(!collapsed)}>
+        <Icon rotate={collapsed ? -90 : 90}>
+          <Icons.ChevronDown />
+        </Icon>
+      </div>
+      {!collapsed && children}
+    </div>
+  );
 }
 
 export default ReportMenu;
diff --git a/src/app/(main)/reports/journey/JourneyView.module.css b/src/app/(main)/reports/journey/JourneyView.module.css
index f6b50b6921..fbd00be21d 100644
--- a/src/app/(main)/reports/journey/JourneyView.module.css
+++ b/src/app/(main)/reports/journey/JourneyView.module.css
@@ -31,6 +31,7 @@
   justify-content: center;
   gap: 20px;
   width: 100%;
+  height: 40px;
 }
 
 .visitors {
@@ -41,8 +42,8 @@
 
 .dropoff {
   font-weight: 600;
-  color: var(--base800);
-  background: var(--base200);
+  color: var(--blue800);
+  background: var(--blue100);
   padding: 4px 8px;
   border-radius: 5px;
 }

From 6f182fe5a029732ce0ab6a0253978e4d66f3d51c Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Sat, 15 Jun 2024 02:53:23 -0700
Subject: [PATCH 155/438] Fixed toggle button positioning.

---
 .../(main)/reports/[reportId]/ReportMenu.module.css  | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/app/(main)/reports/[reportId]/ReportMenu.module.css b/src/app/(main)/reports/[reportId]/ReportMenu.module.css
index 82d7fcb09e..eb41b768ff 100644
--- a/src/app/(main)/reports/[reportId]/ReportMenu.module.css
+++ b/src/app/(main)/reports/[reportId]/ReportMenu.module.css
@@ -8,17 +8,17 @@
 }
 
 .button {
+  position: absolute;
+  right: 0;
   display: flex;
   place-content: center;
   border: 1px solid var(--base400);
   border-right: 0;
   width: 30px;
   padding: 5px;
-  right: 0;
-  position: absolute;
   cursor: pointer;
-  z-index: 1;
   border-radius: 4px 0 0 4px;
+  z-index: 1;
 }
 
 .button:hover {
@@ -31,8 +31,6 @@
 }
 
 .menu.collapsed .button {
-  left: 1px;
-  border-left: 0;
-  border-right: 1px solid var(--base300);
-  border-radius: 0 4px 4px 0;
+  right: 0;
+  border-radius: 4px 0 0 4px;
 }

From 263e92c888f7845558dbd5f131e7e336cbc4c44d Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Sat, 15 Jun 2024 22:48:14 -0700
Subject: [PATCH 156/438] Updated language. Fixed CSS.

---
 public/intl/messages/pl-PL.json               | 118 +++++++++---------
 .../(main)/reports/[reportId]/ReportMenu.tsx  |   2 +-
 .../reports/journey/JourneyView.module.css    |   2 +
 3 files changed, 62 insertions(+), 60 deletions(-)

diff --git a/public/intl/messages/pl-PL.json b/public/intl/messages/pl-PL.json
index 4a5a41ee6a..53cf77ea2a 100644
--- a/public/intl/messages/pl-PL.json
+++ b/public/intl/messages/pl-PL.json
@@ -32,13 +32,13 @@
   "label.add-member": [
     {
       "type": 0,
-      "value": "Add member"
+      "value": "Dodaj członka"
     }
   ],
   "label.add-step": [
     {
       "type": 0,
-      "value": "Add step"
+      "value": "Dodaj krok"
     }
   ],
   "label.add-website": [
@@ -110,7 +110,7 @@
   "label.browser": [
     {
       "type": 0,
-      "value": "Browser"
+      "value": "Przeglądarka"
     }
   ],
   "label.browsers": [
@@ -140,7 +140,7 @@
   "label.city": [
     {
       "type": 0,
-      "value": "City"
+      "value": "Miasto"
     }
   ],
   "label.clear-all": [
@@ -182,19 +182,19 @@
   "label.country": [
     {
       "type": 0,
-      "value": "Country"
+      "value": "Państwo"
     }
   ],
   "label.create": [
     {
       "type": 0,
-      "value": "Create"
+      "value": "Utwórz"
     }
   ],
   "label.create-report": [
     {
       "type": 0,
-      "value": "Stwórz raport"
+      "value": "Utwórz raport"
     }
   ],
   "label.create-team": [
@@ -218,7 +218,7 @@
   "label.created-by": [
     {
       "type": 0,
-      "value": "Created By"
+      "value": "Utworzony przez"
     }
   ],
   "label.current-password": [
@@ -242,13 +242,13 @@
   "label.data": [
     {
       "type": 0,
-      "value": "Data"
+      "value": "Dane"
     }
   ],
   "label.date": [
     {
       "type": 0,
-      "value": "Date"
+      "value": "Data"
     }
   ],
   "label.date-range": [
@@ -260,7 +260,7 @@
   "label.day": [
     {
       "type": 0,
-      "value": "Day"
+      "value": "Dzień"
     }
   ],
   "label.default-date-range": [
@@ -278,7 +278,7 @@
   "label.delete-report": [
     {
       "type": 0,
-      "value": "Delete report"
+      "value": "Usuń raport"
     }
   ],
   "label.delete-team": [
@@ -320,7 +320,7 @@
   "label.device": [
     {
       "type": 0,
-      "value": "Device"
+      "value": "Urządzenie"
     }
   ],
   "label.devices": [
@@ -350,7 +350,7 @@
   "label.dropoff": [
     {
       "type": 0,
-      "value": "Dropoff"
+      "value": "Odpływ"
     }
   ],
   "label.edit": [
@@ -368,7 +368,7 @@
   "label.edit-member": [
     {
       "type": 0,
-      "value": "Edit member"
+      "value": "Edytuj członka"
     }
   ],
   "label.enable-share-url": [
@@ -380,7 +380,7 @@
   "label.event": [
     {
       "type": 0,
-      "value": "Event"
+      "value": "Zdarzenie"
     }
   ],
   "label.event-data": [
@@ -416,7 +416,7 @@
   "label.filter": [
     {
       "type": 0,
-      "value": "Filter"
+      "value": "Filtruj"
     }
   ],
   "label.filter-combined": [
@@ -446,7 +446,7 @@
   "label.funnel-description": [
     {
       "type": 0,
-      "value": "Understand the conversion and drop-off rate of users."
+      "value": "Zrozum wskaźniki konwersji i odpływu użytkowników."
     }
   ],
   "label.greater-than": [
@@ -464,13 +464,13 @@
   "label.insights": [
     {
       "type": 0,
-      "value": "Insights"
+      "value": "Analiza"
     }
   ],
   "label.insights-description": [
     {
       "type": 0,
-      "value": "Dive deeper into your data by using segments and filters."
+      "value": "Poznaj lepiej swoje dane, korzystając z segmentów i filtrów."
     }
   ],
   "label.is": [
@@ -488,13 +488,13 @@
   "label.is-not-set": [
     {
       "type": 0,
-      "value": "Is not set"
+      "value": "Nieustawione"
     }
   ],
   "label.is-set": [
     {
       "type": 0,
-      "value": "Is set"
+      "value": "Ustawione"
     }
   ],
   "label.join": [
@@ -558,7 +558,7 @@
   "label.last-months": [
     {
       "type": 0,
-      "value": "Last "
+      "value": "Osatnie "
     },
     {
       "type": 1,
@@ -566,7 +566,7 @@
     },
     {
       "type": 0,
-      "value": " months"
+      "value": " miesięcy"
     }
   ],
   "label.leave": [
@@ -620,7 +620,7 @@
   "label.member": [
     {
       "type": 0,
-      "value": "Member"
+      "value": "Członek"
     }
   ],
   "label.members": [
@@ -650,13 +650,13 @@
   "label.my-account": [
     {
       "type": 0,
-      "value": "My account"
+      "value": "Moje konto"
     }
   ],
   "label.my-websites": [
     {
       "type": 0,
-      "value": "My websites"
+      "value": "Moje witryny"
     }
   ],
   "label.name": [
@@ -693,7 +693,7 @@
           "value": [
             {
               "type": 0,
-              "value": "record"
+              "value": "rekord"
             }
           ]
         },
@@ -701,7 +701,7 @@
           "value": [
             {
               "type": 0,
-              "value": "records"
+              "value": "rekordy"
             }
           ]
         }
@@ -738,7 +738,7 @@
   "label.page-of": [
     {
       "type": 0,
-      "value": "Page "
+      "value": "Strona "
     },
     {
       "type": 1,
@@ -746,7 +746,7 @@
     },
     {
       "type": 0,
-      "value": " of "
+      "value": " z "
     },
     {
       "type": 1,
@@ -762,7 +762,7 @@
   "label.pageTitle": [
     {
       "type": 0,
-      "value": "Page title"
+      "value": "Tytuł strony"
     }
   ],
   "label.pages": [
@@ -892,19 +892,19 @@
   "label.retention": [
     {
       "type": 0,
-      "value": "Retention"
+      "value": "Retencja"
     }
   ],
   "label.retention-description": [
     {
       "type": 0,
-      "value": "Measure your website stickiness by tracking how often users return."
+      "value": "Mierz przyciągającą siłę swojej strony internetowej, śledząc, jak często użytkownicy powracają."
     }
   ],
   "label.role": [
     {
       "type": 0,
-      "value": "Role"
+      "value": "Rola"
     }
   ],
   "label.run-query": [
@@ -928,13 +928,13 @@
   "label.search": [
     {
       "type": 0,
-      "value": "Search"
+      "value": "Szukaj"
     }
   ],
   "label.select": [
     {
       "type": 0,
-      "value": "Select"
+      "value": "Wybierz"
     }
   ],
   "label.select-date": [
@@ -946,7 +946,7 @@
   "label.select-role": [
     {
       "type": 0,
-      "value": "Select role"
+      "value": "Wybierz rolę"
     }
   ],
   "label.select-website": [
@@ -982,7 +982,7 @@
   "label.steps": [
     {
       "type": 0,
-      "value": "Steps"
+      "value": "Kroki"
     }
   ],
   "label.sum": [
@@ -1018,7 +1018,7 @@
   "label.team-name": [
     {
       "type": 0,
-      "value": "Team name"
+      "value": "Nazwa zespołu"
     }
   ],
   "label.team-owner": [
@@ -1030,13 +1030,13 @@
   "label.team-view-only": [
     {
       "type": 0,
-      "value": "Team view only"
+      "value": "Tylko do odczytu dla zespołu"
     }
   ],
   "label.team-websites": [
     {
       "type": 0,
-      "value": "Team websites"
+      "value": "Witryny zespołu"
     }
   ],
   "label.teams": [
@@ -1162,7 +1162,7 @@
   "label.update": [
     {
       "type": 0,
-      "value": "Update"
+      "value": "Aktualizuj"
     }
   ],
   "label.url": [
@@ -1204,7 +1204,7 @@
   "label.utm-description": [
     {
       "type": 0,
-      "value": "Track your campaigns through UTM parameters."
+      "value": "Śledź swoje kampanie za pomocą parametrów UTM."
     }
   ],
   "label.value": [
@@ -1240,7 +1240,7 @@
   "label.views-per-visit": [
     {
       "type": 0,
-      "value": "Views per visit"
+      "value": "Widoków na wizytę"
     }
   ],
   "label.visit-duration": [
@@ -1258,7 +1258,7 @@
   "label.visits": [
     {
       "type": 0,
-      "value": "Visits"
+      "value": "Odwiedząjący"
     }
   ],
   "label.website": [
@@ -1294,7 +1294,7 @@
   "message.action-confirmation": [
     {
       "type": 0,
-      "value": "Type "
+      "value": "Wpisz "
     },
     {
       "type": 1,
@@ -1302,7 +1302,7 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": ", aby potwierdzić."
     }
   ],
   "message.active-users": [
@@ -1370,7 +1370,7 @@
   "message.confirm-remove": [
     {
       "type": 0,
-      "value": "Are you sure you want to remove "
+      "value": "Czy na pewno chcesz usunąć "
     },
     {
       "type": 1,
@@ -1398,7 +1398,7 @@
   "message.delete-team-warning": [
     {
       "type": 0,
-      "value": "Deleting a team will also delete all team websites."
+      "value": "Usunięcie zespołu usunie wszystkie jego witryny."
     }
   ],
   "message.delete-website-warning": [
@@ -1436,7 +1436,7 @@
   "message.incorrect-username-password": [
     {
       "type": 0,
-      "value": "Nieprawidłowa nazwa użytkownika/hasło."
+      "value": "Nieprawidłowa nazwa użytkownika lub hasło."
     }
   ],
   "message.invalid-domain": [
@@ -1462,7 +1462,7 @@
   "message.new-version-available": [
     {
       "type": 0,
-      "value": "A new version of Umami "
+      "value": "Nowa wersja Umami "
     },
     {
       "type": 1,
@@ -1470,7 +1470,7 @@
     },
     {
       "type": 0,
-      "value": " is available!"
+      "value": " jest dostępna!"
     }
   ],
   "message.no-data-available": [
@@ -1594,25 +1594,25 @@
   "message.transfer-team-website-to-user": [
     {
       "type": 0,
-      "value": "Transfer this website to your account?"
+      "value": "Czy przenieść tę witrynę do Twoje konta?"
     }
   ],
   "message.transfer-user-website-to-team": [
     {
       "type": 0,
-      "value": "Select the team to transfer this website to."
+      "value": "Wybierz zespół, do którego chcesz przenieść tę witrynę."
     }
   ],
   "message.transfer-website": [
     {
       "type": 0,
-      "value": "Transfer website ownership to your account or another team."
+      "value": "Przenieś własność witryny na swoje konto lub do innego zespołu."
     }
   ],
   "message.triggered-event": [
     {
       "type": 0,
-      "value": "Triggered event"
+      "value": "Zdarzenie wyzwalające"
     }
   ],
   "message.user-deleted": [
@@ -1624,7 +1624,7 @@
   "message.viewed-page": [
     {
       "type": 0,
-      "value": "Viewed page"
+      "value": "Obejrzana strona"
     }
   ],
   "message.visitor-log": [
@@ -1664,7 +1664,7 @@
   "message.visitors-dropped-off": [
     {
       "type": 0,
-      "value": "Visitors dropped off"
+      "value": "Odpływ użytkowników"
     }
   ]
 }
diff --git a/src/app/(main)/reports/[reportId]/ReportMenu.tsx b/src/app/(main)/reports/[reportId]/ReportMenu.tsx
index e8c0ff021a..5cca5640aa 100644
--- a/src/app/(main)/reports/[reportId]/ReportMenu.tsx
+++ b/src/app/(main)/reports/[reportId]/ReportMenu.tsx
@@ -5,7 +5,7 @@ import { Icon, Icons } from 'react-basics';
 import classNames from 'classnames';
 
 export function ReportMenu({ children }) {
-  const [collapsed, setCollapsed] = useState(true);
+  const [collapsed, setCollapsed] = useState(false);
   const { report } = useContext(ReportContext);
 
   if (!report) {
diff --git a/src/app/(main)/reports/journey/JourneyView.module.css b/src/app/(main)/reports/journey/JourneyView.module.css
index fbd00be21d..e6f910a7c3 100644
--- a/src/app/(main)/reports/journey/JourneyView.module.css
+++ b/src/app/(main)/reports/journey/JourneyView.module.css
@@ -19,6 +19,7 @@
   flex-wrap: nowrap;
   overflow: auto;
   gap: 100px;
+  padding-right: 20px;
 }
 
 .header {
@@ -89,6 +90,7 @@
   align-items: center;
   justify-content: space-between;
   min-width: 300px;
+  max-width: 300px;
   min-height: 60px;
 }
 

From 02e5dfb901c8fa0de30f682371931243e3541bb9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 16 Jun 2024 12:49:18 +0000
Subject: [PATCH 157/438] Bump braces from 3.0.2 to 3.0.3

Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: braces
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 47 ++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 11 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 95cc310bfe..6c42d1fe39 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3514,11 +3514,11 @@ brace-expansion@^2.0.1:
     balanced-match "^1.0.0"
 
 braces@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 browserslist@^4.0.0, browserslist@^4.21.10, browserslist@^4.21.4, browserslist@^4.21.9, browserslist@^4.22.1:
   version "4.22.1"
@@ -5387,10 +5387,10 @@ file-entry-cache@^7.0.0:
   dependencies:
     flat-cache "^3.2.0"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
 
@@ -9532,7 +9532,16 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -9605,7 +9614,14 @@ string.prototype.trimstart@^1.0.8:
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -10366,7 +10382,7 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -10384,6 +10400,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

From 9aff134368a9339bfb6c954f426bf8f2a82c7095 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Sun, 16 Jun 2024 22:16:36 -0700
Subject: [PATCH 158/438] fix bigint conversion error

---
 src/queries/analytics/reports/getJourney.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/queries/analytics/reports/getJourney.ts b/src/queries/analytics/reports/getJourney.ts
index 04e3654902..eec500aad6 100644
--- a/src/queries/analytics/reports/getJourney.ts
+++ b/src/queries/analytics/reports/getJourney.ts
@@ -267,6 +267,6 @@ function combineSequentialDuplicates(array: any) {
 function parseResult(data: any) {
   return data.map(({ e1, e2, e3, e4, e5, e6, e7, count }) => ({
     items: combineSequentialDuplicates([e1, e2, e3, e4, e5, e6, e7]),
-    count: +count,
+    count: +Number(count),
   }));
 }

From 3c259109aa18379b4185d444c33d1ef387dc9514 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 17 Jun 2024 11:17:28 -0700
Subject: [PATCH 159/438] fix insights column name bug

---
 src/queries/analytics/reports/getInsights.ts | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/queries/analytics/reports/getInsights.ts b/src/queries/analytics/reports/getInsights.ts
index 7313e43697..c1a4f1f156 100644
--- a/src/queries/analytics/reports/getInsights.ts
+++ b/src/queries/analytics/reports/getInsights.ts
@@ -43,7 +43,7 @@ async function relationalQuery(
       count(distinct t.visit_id) as "visits",
       sum(case when t.c = 1 then 1 else 0 end) as "bounces",
       sum(${getTimestampDiffQuery('t.min_time', 't.max_time')}) as "totaltime",
-      ${parseFields(fields)}
+      ${parseFieldsByName(fields)}
     from (
       select
         ${parseFields(fields)},
@@ -58,10 +58,10 @@ async function relationalQuery(
         and website_event.created_at between {{startDate}} and {{endDate}}
         and event_type = {{eventType}}
         ${filterQuery}
-      group by ${parseFields(fields)}, 
+      group by ${parseFieldsByName(fields)}, 
         website_event.session_id, website_event.visit_id
     ) as t
-    group by ${parseFields(fields)}
+    group by ${parseFieldsByName(fields)}
     order by 1 desc, 2 desc
     limit 500
     `,
@@ -93,7 +93,7 @@ async function clickhouseQuery(
       count(distinct t.visit_id) as "visits",
       sum(if(t.c = 1, 1, 0)) as "bounces",
       sum(max_time-min_time) as "totaltime",
-      ${parseFields(fields)}
+      ${parseFieldsByName(fields)}
     from (
       select
         ${parseFields(fields)},
@@ -107,10 +107,10 @@ async function clickhouseQuery(
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
         and event_type = {eventType:UInt32}
         ${filterQuery}
-      group by ${parseFields(fields)}, 
+      group by ${parseFieldsByName(fields)}, 
         session_id, visit_id
     ) as t
-    group by ${parseFields(fields)}
+    group by ${parseFieldsByName(fields)}
     order by 1 desc, 2 desc
     limit 500
     `,
@@ -130,5 +130,9 @@ async function clickhouseQuery(
 }
 
 function parseFields(fields: { name: any }[]) {
-  return `${fields.map(({ name }) => FILTER_COLUMNS[name]).join(',')}`;
+  return fields.map(({ name }) => `${FILTER_COLUMNS[name]} as "${name}"`).join(',');
+}
+
+function parseFieldsByName(fields: { name: any }[]) {
+  return `${fields.map(({ name }) => name).join(',')}`;
 }

From 45d6b16b0dc7c2a7ca185d6e2c764dfd23e67f09 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 17 Jun 2024 14:20:33 -0700
Subject: [PATCH 160/438] fix journeys path counts bug

---
 src/app/(main)/reports/journey/JourneyView.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/app/(main)/reports/journey/JourneyView.tsx b/src/app/(main)/reports/journey/JourneyView.tsx
index 9b91793809..3e04538794 100644
--- a/src/app/(main)/reports/journey/JourneyView.tsx
+++ b/src/app/(main)/reports/journey/JourneyView.tsx
@@ -41,9 +41,7 @@ export default function JourneyView() {
           const active = selected && !!activePaths.find(path => path.items[columnIndex] === name);
 
           if (!nodes[name]) {
-            const paths = data.filter((d, i) => {
-              return i !== columnIndex && d.items[columnIndex] === name;
-            });
+            const paths = data.filter(d => d.items[columnIndex] === name);
 
             const from =
               columnIndex > 0 &&

From 4c88a97698d3eeccfffa50b19d312238bcd189ac Mon Sep 17 00:00:00 2001
From: Ivan Gnusarkov <ivankapitan@live.ru>
Date: Tue, 18 Jun 2024 14:10:35 +0700
Subject: [PATCH 161/438] added error message when db connection check fails

---
 scripts/check-db.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/check-db.js b/scripts/check-db.js
index 757843ac37..cdfeafa327 100644
--- a/scripts/check-db.js
+++ b/scripts/check-db.js
@@ -44,7 +44,7 @@ async function checkConnection() {
 
     success('Database connection successful.');
   } catch (e) {
-    throw new Error('Unable to connect to the database.');
+    throw new Error('Unable to connect to the database: ' + e.message);
   }
 }
 

From f56849a4316e8eee6ab8d1fb014bd1ec1a9ca8ed Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 18 Jun 2024 22:38:36 -0700
Subject: [PATCH 162/438] Fixed path counts. Updated number display.

---
 .../reports/[reportId]/ReportMenu.module.css  |   2 +
 .../reports/journey/JourneyView.module.css    |  40 +++----
 .../(main)/reports/journey/JourneyView.tsx    | 106 +++++++++---------
 3 files changed, 67 insertions(+), 81 deletions(-)

diff --git a/src/app/(main)/reports/[reportId]/ReportMenu.module.css b/src/app/(main)/reports/[reportId]/ReportMenu.module.css
index eb41b768ff..21368411bd 100644
--- a/src/app/(main)/reports/[reportId]/ReportMenu.module.css
+++ b/src/app/(main)/reports/[reportId]/ReportMenu.module.css
@@ -1,6 +1,7 @@
 .menu {
   position: relative;
   width: 300px;
+  padding-top: 20px;
   padding-inline-end: 20px;
   border-inline-end: 1px solid var(--base300);
   grid-row: 2 / 3;
@@ -9,6 +10,7 @@
 
 .button {
   position: absolute;
+  top: 0;
   right: 0;
   display: flex;
   place-content: center;
diff --git a/src/app/(main)/reports/journey/JourneyView.module.css b/src/app/(main)/reports/journey/JourneyView.module.css
index e6f910a7c3..0975d2c0f8 100644
--- a/src/app/(main)/reports/journey/JourneyView.module.css
+++ b/src/app/(main)/reports/journey/JourneyView.module.css
@@ -80,7 +80,7 @@
   padding-bottom: 10px;
 }
 
-.item {
+.node {
   position: relative;
   cursor: pointer;
   padding: 10px 20px;
@@ -89,37 +89,35 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  min-width: 300px;
+  width: 300px;
   max-width: 300px;
-  min-height: 60px;
+  height: 60px;
+  max-height: 60px;
 }
 
-.item:hover:not(.selected) {
+.node:hover:not(.selected) {
   color: var(--base900);
   background: var(--base100);
 }
 
-.item.selected {
+.node.selected {
   color: var(--base75);
   background: var(--base900);
   font-weight: 400;
 }
 
-.item.active {
+.node.active {
   color: var(--light50);
   background: var(--primary400);
 }
 
-.behind {
-  color: var(--base400);
-}
-
-.ahead {
-  color: var(--base400);
+.node.selected .count {
+  color: var(--base50);
+  background: var(--base800);
 }
 
-.current {
-  color: var(--base500);
+.node.selected.active .count {
+  background: var(--primary600);
 }
 
 .name {
@@ -132,20 +130,12 @@
   background: var(--base200);
 }
 
-.item.selected .count {
-  color: var(--base50);
-  background: var(--base800);
-}
-
-.item.selected.active .count {
-  background: var(--primary600);
-}
-
 .line {
   position: absolute;
   bottom: 0;
   left: -100px;
   width: 100px;
+  pointer-events: none;
 }
 
 .line.up {
@@ -230,8 +220,8 @@
   border-radius: 100%;
   border: 3px solid var(--journey-line-color);
   background: var(--light50);
-  width: 13px;
-  height: 13px;
+  width: 14px;
+  height: 14px;
 }
 
 .line:not(.active) .start:before,
diff --git a/src/app/(main)/reports/journey/JourneyView.tsx b/src/app/(main)/reports/journey/JourneyView.tsx
index 3e04538794..73338c83ed 100644
--- a/src/app/(main)/reports/journey/JourneyView.tsx
+++ b/src/app/(main)/reports/journey/JourneyView.tsx
@@ -5,8 +5,8 @@ import classNames from 'classnames';
 import { useEscapeKey, useMessages } from 'components/hooks';
 import { objectToArray } from 'lib/data';
 import { ReportContext } from '../[reportId]/Report';
-// eslint-disable-next-line css-modules/no-unused-class
 import styles from './JourneyView.module.css';
+import { formatLongNumber } from 'lib/format';
 
 const NODE_HEIGHT = 60;
 const NODE_GAP = 10;
@@ -37,27 +37,11 @@ export default function JourneyView() {
         const name = items[columnIndex];
 
         if (name) {
-          const selected = !!selectedPaths.find(path => path.items[columnIndex] === name);
-          const active = selected && !!activePaths.find(path => path.items[columnIndex] === name);
+          const selected = !!selectedPaths.find(({ items }) => items[columnIndex] === name);
+          const active = selected && !!activePaths.find(({ items }) => items[columnIndex] === name);
 
           if (!nodes[name]) {
-            const paths = data.filter(d => d.items[columnIndex] === name);
-
-            const from =
-              columnIndex > 0 &&
-              selected &&
-              paths.reduce((obj, path) => {
-                const { items, count } = path;
-                const name = items[columnIndex - 1];
-
-                if (!obj[name]) {
-                  obj[name] = { name, count };
-                } else {
-                  obj[name].count += count;
-                }
-
-                return obj;
-              }, {});
+            const paths = data.filter(({ items }) => items[columnIndex] === name);
 
             nodes[name] = {
               name,
@@ -68,7 +52,9 @@ export default function JourneyView() {
               selected,
               active,
               paths,
-              from: objectToArray(from),
+              pathMap: paths.map(({ items, count }) => ({
+                [`${columnIndex}:${items.join(':')}`]: count,
+              })),
             };
           } else {
             nodes[name].totalCount += count;
@@ -82,43 +68,45 @@ export default function JourneyView() {
     }
 
     columns.forEach((column, columnIndex) => {
-      const nodes = column.nodes.map((node, nodeIndex) => {
-        const { from, totalCount } = node;
+      const nodes = column.nodes.map((currentNode, currentNodeIndex) => {
         const previousNodes = columns[columnIndex - 1]?.nodes;
-        let selectedCount = from?.length ? 0 : totalCount;
+        let selectedCount = previousNodes ? 0 : currentNode.totalCount;
         let activeCount = selectedCount;
 
-        const lines = from?.reduce((arr: any[][], { name, count }: any) => {
-          const fromIndex = previousNodes.findIndex((node: { name: any; selected: any }) => {
-            return node.name === name && node.selected;
-          });
-
-          if (fromIndex > -1) {
-            arr.push([fromIndex, nodeIndex]);
-            selectedCount += count;
-          }
-
-          if (
-            previousNodes.findIndex(node => {
-              return node.name === name && node.active;
-            }) > -1
-          ) {
-            activeCount += count;
-          }
-
-          return arr;
-        }, []);
-
-        return { ...node, selectedCount, activeCount, lines };
+        const lines =
+          previousNodes?.reduce((arr: any[][], previousNode: any, previousNodeIndex: number) => {
+            const fromCount = selectedNode?.paths.reduce((sum, path) => {
+              if (
+                previousNode.name === path.items[columnIndex - 1] &&
+                currentNode.name === path.items[columnIndex]
+              ) {
+                sum += path.count;
+              }
+              return sum;
+            }, 0);
+
+            if (currentNode.selected && previousNode.selected && fromCount) {
+              arr.push([previousNodeIndex, currentNodeIndex]);
+              selectedCount += fromCount;
+
+              if (previousNode.active) {
+                activeCount += fromCount;
+              }
+            }
+
+            return arr;
+          }, []) || [];
+
+        return { ...currentNode, selectedCount, activeCount, lines };
       });
 
       const visitorCount = nodes.reduce(
         (sum: number, { selected, selectedCount, active, activeCount, totalCount }) => {
           if (!selectedNode) {
             sum += totalCount;
-          } else if (!activeNode && selected) {
+          } else if (!activeNode && selectedNode && selected) {
             sum += selectedCount;
-          } else if (active) {
+          } else if (activeNode && active) {
             sum += activeCount;
           }
           return sum;
@@ -136,9 +124,9 @@ export default function JourneyView() {
     return columns;
   }, [data, selectedNode, activeNode]);
 
-  const handleClick = (name: string, index: number, paths: any[]) => {
-    if (name !== selectedNode?.name || index !== selectedNode?.index) {
-      setSelectedNode({ name, index, paths });
+  const handleClick = (name: string, columnIndex: number, paths: any[]) => {
+    if (name !== selectedNode?.name || columnIndex !== selectedNode?.columnIndex) {
+      setSelectedNode({ name, columnIndex, paths });
     } else {
       setSelectedNode(null);
     }
@@ -165,8 +153,8 @@ export default function JourneyView() {
               <div className={styles.header}>
                 <div className={styles.num}>{columnIndex + 1}</div>
                 <div className={styles.stats}>
-                  <div className={styles.visitors}>
-                    {column.visitorCount} {formatMessage(labels.visitors)}
+                  <div className={styles.visitors} title={column.visitorCount}>
+                    {formatLongNumber(column.visitorCount)} {formatMessage(labels.visitors)}
                   </div>
                   {columnIndex > 0 && <div className={styles.dropoff}>{dropOffPercent}</div>}
                 </div>
@@ -183,6 +171,12 @@ export default function JourneyView() {
                     selectedCount,
                     lines,
                   }) => {
+                    const nodeCount = selected
+                      ? active
+                        ? activeCount
+                        : selectedCount
+                      : totalCount;
+
                     return (
                       <div
                         key={name}
@@ -191,7 +185,7 @@ export default function JourneyView() {
                         onMouseLeave={() => selected && setActiveNode(null)}
                       >
                         <div
-                          className={classNames(styles.item, {
+                          className={classNames(styles.node, {
                             [styles.selected]: selected,
                             [styles.active]: active,
                           })}
@@ -199,8 +193,8 @@ export default function JourneyView() {
                         >
                           <div className={styles.name}>{name}</div>
                           <TooltipPopup label={dropOffPercent} disabled={!selected}>
-                            <div className={styles.count}>
-                              {selected ? (active ? activeCount : selectedCount) : totalCount}
+                            <div className={styles.count} title={nodeCount}>
+                              {formatLongNumber(nodeCount)}
                             </div>
                           </TooltipPopup>
                           {columnIndex < columns.length &&

From 74a3cb6dac9800fb793dd4e52751bb9fe1c8d3c7 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 18 Jun 2024 23:09:29 -0700
Subject: [PATCH 163/438] Only show hosts in expanded view.

---
 .../websites/[websiteId]/WebsiteExpandedView.tsx       | 10 +++++-----
 .../(main)/websites/[websiteId]/WebsiteTableView.tsx   |  4 +---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx
index a96ab8be33..86a7717fa8 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx
@@ -62,11 +62,6 @@ export default function WebsiteExpandedView({
       label: formatMessage(labels.referrers),
       url: renderUrl({ view: 'referrer' }),
     },
-    {
-      key: 'host',
-      label: formatMessage(labels.hosts),
-      url: renderUrl({ view: 'host' }),
-    },
     {
       key: 'browser',
       label: formatMessage(labels.browsers),
@@ -117,6 +112,11 @@ export default function WebsiteExpandedView({
       label: formatMessage(labels.queryParameters),
       url: renderUrl({ view: 'query' }),
     },
+    {
+      key: 'host',
+      label: formatMessage(labels.hosts),
+      url: renderUrl({ view: 'host' }),
+    },
   ];
 
   const DetailsComponent = views[view] || (() => null);
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx b/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx
index 35b575722c..e530f2bae7 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx
@@ -2,7 +2,6 @@ import { useState } from 'react';
 import { Grid, GridRow } from 'components/layout/Grid';
 import PagesTable from 'components/metrics/PagesTable';
 import ReferrersTable from 'components/metrics/ReferrersTable';
-import HostsTable from 'components/metrics/HostsTable';
 import BrowsersTable from 'components/metrics/BrowsersTable';
 import OSTable from 'components/metrics/OSTable';
 import DevicesTable from 'components/metrics/DevicesTable';
@@ -20,10 +19,9 @@ export default function WebsiteTableView({ websiteId }: { websiteId: string }) {
 
   return (
     <Grid>
-      <GridRow columns="three">
+      <GridRow columns="two">
         <PagesTable {...tableProps} />
         <ReferrersTable {...tableProps} />
-        <HostsTable {...tableProps} />
       </GridRow>
       <GridRow columns="three">
         <BrowsersTable {...tableProps} />

From cda3ba345b2444b7254c43bc6ce11009fbbc214e Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 18 Jun 2024 23:12:12 -0700
Subject: [PATCH 164/438] Build new lang files.

---
 public/intl/messages/am-ET.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/ar-SA.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/be-BY.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/bg-BG.json | 138 ++++++++++++++++++++++++++++++--
 public/intl/messages/bn-BD.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/bs-BA.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/ca-ES.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/cs-CZ.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/da-DK.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/de-CH.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/de-DE.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/el-GR.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/en-GB.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/en-US.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/es-ES.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/fa-IR.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/fi-FI.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/fo-FO.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/fr-FR.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/ga-ES.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/he-IL.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/hi-IN.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/hr-HR.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/hu-HU.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/id-ID.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/it-IT.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/ja-JP.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/km-KH.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/ko-KR.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/lt-LT.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/mn-MN.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/ms-MY.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/my-MM.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/nb-NO.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/nl-NL.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/pl-PL.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/pt-BR.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/pt-PT.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/ro-RO.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/ru-RU.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/si-LK.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/sk-SK.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/sl-SI.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/sv-SE.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/ta-IN.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/th-TH.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/tr-TR.json | 130 +++++++++++++++++++++++++++++-
 public/intl/messages/uk-UA.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/ur-PK.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/vi-VN.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/zh-CN.json | 126 +++++++++++++++++++++++++++++
 public/intl/messages/zh-TW.json | 126 +++++++++++++++++++++++++++++
 src/lang/am-ET.json             |  23 +++++-
 src/lang/ar-SA.json             |  23 +++++-
 src/lang/be-BY.json             |  23 +++++-
 src/lang/bg-BG.json             |  23 +++++-
 src/lang/bn-BD.json             |  23 +++++-
 src/lang/bs-BA.json             |  23 +++++-
 src/lang/ca-ES.json             |  23 +++++-
 src/lang/cs-CZ.json             |  23 +++++-
 src/lang/da-DK.json             |  23 +++++-
 src/lang/de-CH.json             |  23 +++++-
 src/lang/de-DE.json             |  23 +++++-
 src/lang/el-GR.json             |  23 +++++-
 src/lang/en-GB.json             |  23 +++++-
 src/lang/en-US.json             |  23 +++++-
 src/lang/es-ES.json             |  23 +++++-
 src/lang/fa-IR.json             |  23 +++++-
 src/lang/fi-FI.json             |  23 +++++-
 src/lang/fo-FO.json             |  23 +++++-
 src/lang/fr-FR.json             |  23 +++++-
 src/lang/ga-ES.json             |  23 +++++-
 src/lang/he-IL.json             |  23 +++++-
 src/lang/hi-IN.json             |  23 +++++-
 src/lang/hr-HR.json             |  23 +++++-
 src/lang/hu-HU.json             |  23 +++++-
 src/lang/id-ID.json             |  23 +++++-
 src/lang/it-IT.json             |  23 +++++-
 src/lang/ja-JP.json             |  23 +++++-
 src/lang/km-KH.json             |  23 +++++-
 src/lang/ko-KR.json             |  23 +++++-
 src/lang/lt-LT.json             |  23 +++++-
 src/lang/mn-MN.json             |  23 +++++-
 src/lang/ms-MY.json             |  23 +++++-
 src/lang/my-MM.json             |  23 +++++-
 src/lang/nb-NO.json             |  23 +++++-
 src/lang/nl-NL.json             |  23 +++++-
 src/lang/pl-PL.json             |  23 +++++-
 src/lang/pt-BR.json             |  23 +++++-
 src/lang/pt-PT.json             |  23 +++++-
 src/lang/ro-RO.json             |  23 +++++-
 src/lang/ru-RU.json             |  23 +++++-
 src/lang/si-LK.json             |  23 +++++-
 src/lang/sk-SK.json             |  23 +++++-
 src/lang/sl-SI.json             |  23 +++++-
 src/lang/sv-SE.json             |  23 +++++-
 src/lang/ta-IN.json             |  23 +++++-
 src/lang/th-TH.json             |  23 +++++-
 src/lang/tr-TR.json             |  25 +++++-
 src/lang/uk-UA.json             |  23 +++++-
 src/lang/ur-PK.json             |  23 +++++-
 src/lang/vi-VN.json             |  23 +++++-
 src/lang/zh-CN.json             |  23 +++++-
 src/lang/zh-TW.json             |  23 +++++-
 104 files changed, 7705 insertions(+), 61 deletions(-)

diff --git a/public/intl/messages/am-ET.json b/public/intl/messages/am-ET.json
index a3b652bbb3..6565c98b20 100644
--- a/public/intl/messages/am-ET.json
+++ b/public/intl/messages/am-ET.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Enable share URL"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Events"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Profile"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "Single day"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/ar-SA.json b/public/intl/messages/ar-SA.json
index 15f9647cac..721584d5a1 100644
--- a/public/intl/messages/ar-SA.json
+++ b/public/intl/messages/ar-SA.json
@@ -149,6 +149,12 @@
       "value": "مسح الكل"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "تابع"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "أُنشئ من قبل"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "فعّل مشاركة الرابط"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "الأحداث"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "فهم معدل التحويل والانقطاع عن المستخدمين."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "أكبَر مِن أو يساوي"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "انضم للفريق"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "التحكم"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "الملف الشخصي"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "يوم واحد"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "معرّف الفريق"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/be-BY.json b/public/intl/messages/be-BY.json
index 22557a24e9..9af4e89523 100644
--- a/public/intl/messages/be-BY.json
+++ b/public/intl/messages/be-BY.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Дазволіць дзяліцца спасылкай"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Падзеі"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Профіль"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "Адзін дзень"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/bg-BG.json b/public/intl/messages/bg-BG.json
index d2bd50f80e..bf5f15dcd5 100644
--- a/public/intl/messages/bg-BG.json
+++ b/public/intl/messages/bg-BG.json
@@ -83,12 +83,6 @@
       "value": "Средно"
     }
   ],
-  "label.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Средно време на посещение"
-    }
-  ],
   "label.back": [
     {
       "type": 0,
@@ -155,6 +149,12 @@
       "value": "Изчисти всички"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -179,6 +179,12 @@
       "value": "Продължи"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -227,6 +233,12 @@
       "value": "Създадено от"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -383,6 +395,18 @@
       "value": "Активирай Линк за споделяне"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -401,6 +425,12 @@
       "value": "Събития"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -455,6 +485,24 @@
       "value": "Разберете процента на конверсия и отпадане на потребителите."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -467,6 +515,18 @@
       "value": "По-голямо или равно на"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -515,6 +575,18 @@
       "value": "Присъедини се към екип"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -617,6 +689,12 @@
       "value": "Управлявай"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -793,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Профил"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -985,6 +1087,12 @@
       "value": "Един ден"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1015,6 +1123,12 @@
       "value": "ID на екип"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1249,6 +1363,12 @@
       "value": "Прегледи на посещение"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Visit duration"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/bn-BD.json b/public/intl/messages/bn-BD.json
index aa9e8c902a..827271e3b6 100644
--- a/public/intl/messages/bn-BD.json
+++ b/public/intl/messages/bn-BD.json
@@ -149,6 +149,12 @@
       "value": "সব মুছে ফেলুন"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "পরবর্তিতে"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "শেয়ার ইউআরএল শেয়ার করুন"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "ঘটনা"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": " দ্বারা চালিত"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "প্রোফাইল"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "একদিন"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/bs-BA.json b/public/intl/messages/bs-BA.json
index 314e689e42..f3edb77352 100644
--- a/public/intl/messages/bs-BA.json
+++ b/public/intl/messages/bs-BA.json
@@ -149,6 +149,12 @@
       "value": "Očisti sve"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Nastavi"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Kreirao"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Omogući URL za dijeljenje"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Događaji"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Razumite koverziju i drop-off učestalost korisnika."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Veće od ili jednako"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Učlani se u tim"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Profil"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "Jedan dan"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Tim ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/ca-ES.json b/public/intl/messages/ca-ES.json
index 911dd04b56..f9b63535f0 100644
--- a/public/intl/messages/ca-ES.json
+++ b/public/intl/messages/ca-ES.json
@@ -149,6 +149,12 @@
       "value": "Netejar tot"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continuar"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Creat Per"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Activa l'enllaç per compartir"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Esdeveniments"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Entengui la taxa de conversió i abandonament dels usuaris."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Més gran que o igual a"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Unir-se al equip"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Administrar"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Perfil"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "Un sol dia"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "ID del equip"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/cs-CZ.json b/public/intl/messages/cs-CZ.json
index c329fa5853..a2500688a0 100644
--- a/public/intl/messages/cs-CZ.json
+++ b/public/intl/messages/cs-CZ.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Povolit sdílení URL"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Události"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Profil"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "Jeden den"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/da-DK.json b/public/intl/messages/da-DK.json
index c242aaf3a8..d9a6903f80 100644
--- a/public/intl/messages/da-DK.json
+++ b/public/intl/messages/da-DK.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Aktivér delings-URL"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Hændelser"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Profil"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "Enkelt dag"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/de-CH.json b/public/intl/messages/de-CH.json
index 69c48a1fb2..32d3b4434c 100644
--- a/public/intl/messages/de-CH.json
+++ b/public/intl/messages/de-CH.json
@@ -149,6 +149,12 @@
       "value": "Alles lösche"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Wiiter"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Freigab-URL aktiviere"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Ereigniss"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Team biträte"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Profil"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "Ein Tag"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/de-DE.json b/public/intl/messages/de-DE.json
index 2faf7770e1..9a9b6d14f7 100644
--- a/public/intl/messages/de-DE.json
+++ b/public/intl/messages/de-DE.json
@@ -149,6 +149,12 @@
       "value": "Alles löschen"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Weiter"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Freigabe-URL aktivieren"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Ereignisse"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Größer oder gleich"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Team beitreten"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Profil"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "Ein Tag"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Team-ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/el-GR.json b/public/intl/messages/el-GR.json
index 5c39e267cc..f44bd026a0 100644
--- a/public/intl/messages/el-GR.json
+++ b/public/intl/messages/el-GR.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Ενεργοποίηση κοινής χρήσης URL"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Γεγονότα"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Προφίλ"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "Ημερήσια"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/en-GB.json b/public/intl/messages/en-GB.json
index b7beda36b4..efb8f1be4d 100644
--- a/public/intl/messages/en-GB.json
+++ b/public/intl/messages/en-GB.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Enable share URL"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Events"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Profile"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "Single day"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/en-US.json b/public/intl/messages/en-US.json
index 42f3bbd9dc..bf911728a8 100644
--- a/public/intl/messages/en-US.json
+++ b/public/intl/messages/en-US.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Enable share URL"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Events"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Profile"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "Single day"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/es-ES.json b/public/intl/messages/es-ES.json
index be0835ae08..40ddded568 100644
--- a/public/intl/messages/es-ES.json
+++ b/public/intl/messages/es-ES.json
@@ -149,6 +149,12 @@
       "value": "Limpiar todo"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continuar"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Habilitar compartir URL"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Eventos"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Comprender conversión y abandono de usuarios."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Mayor que o igual a"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Unirse al equipo"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Administrar"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Perfil"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "Un solo día"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "ID del equipo"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/fa-IR.json b/public/intl/messages/fa-IR.json
index cc0e81c093..cb10df4b1e 100644
--- a/public/intl/messages/fa-IR.json
+++ b/public/intl/messages/fa-IR.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "فعال کردن اشتراک گذاری URL"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "رویدادها"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "پروفایل"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "یک روز"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/fi-FI.json b/public/intl/messages/fi-FI.json
index 13a597f4d9..e43a185500 100644
--- a/public/intl/messages/fi-FI.json
+++ b/public/intl/messages/fi-FI.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Ota jakamisen URL-osoite käyttöön"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Tapahtumat"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Profiili"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "Yksi päivä"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/fo-FO.json b/public/intl/messages/fo-FO.json
index b3d6258905..1b2d4f0721 100644
--- a/public/intl/messages/fo-FO.json
+++ b/public/intl/messages/fo-FO.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Virkja deili leinki"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Hendingar/tiltøk"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Vangi"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "Einkultur dagur"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/fr-FR.json b/public/intl/messages/fr-FR.json
index 4e5f3ed55b..44fd708bee 100644
--- a/public/intl/messages/fr-FR.json
+++ b/public/intl/messages/fr-FR.json
@@ -149,6 +149,12 @@
       "value": "Réinitialiser"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continuer"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Crée par"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Activer l'URL de partage"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Évènements"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Suivi des conversions et des taux d'abandons."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Supérieur ou égal à"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Rejoindre une équipe"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -599,6 +677,12 @@
       "value": "Gérer"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -775,12 +859,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Profil"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -967,6 +1075,12 @@
       "value": "Journée"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -997,6 +1111,12 @@
       "value": "ID d'équipe"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1331,6 +1451,12 @@
       "value": " actuellement"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/ga-ES.json b/public/intl/messages/ga-ES.json
index 1ce652f98f..690083ae05 100644
--- a/public/intl/messages/ga-ES.json
+++ b/public/intl/messages/ga-ES.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Activar URL de compartición"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Eventos"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Perfil"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -987,6 +1095,12 @@
       "value": "Un só día"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1017,6 +1131,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1347,6 +1467,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/he-IL.json b/public/intl/messages/he-IL.json
index af8a6fb1b0..740dfffaa5 100644
--- a/public/intl/messages/he-IL.json
+++ b/public/intl/messages/he-IL.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "הפעלת URL שיתוף"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "אירועים"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -603,6 +681,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -779,12 +863,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "פרופיל"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -971,6 +1079,12 @@
       "value": "יום בודד"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1001,6 +1115,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1331,6 +1451,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/hi-IN.json b/public/intl/messages/hi-IN.json
index e4c8a2ba51..2c178669b5 100644
--- a/public/intl/messages/hi-IN.json
+++ b/public/intl/messages/hi-IN.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "शेयर URL सक्षम करें"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "स्पर्धाएँ"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": " द्वारा संचालित"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "प्रोफ़ाइल"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "एक दिन"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/hr-HR.json b/public/intl/messages/hr-HR.json
index 9933e8400e..974bdebd71 100644
--- a/public/intl/messages/hr-HR.json
+++ b/public/intl/messages/hr-HR.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Omogući dijeljenje poveznice"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Events"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Profil"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "Jedan dan"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/hu-HU.json b/public/intl/messages/hu-HU.json
index 3fccf7a74a..227ef208a0 100644
--- a/public/intl/messages/hu-HU.json
+++ b/public/intl/messages/hu-HU.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "URL-megosztás engedélyezése"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Események"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Profil"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "Egy nap"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1343,6 +1463,12 @@
       "value": " jelenleg"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/id-ID.json b/public/intl/messages/id-ID.json
index 7dfe2e2f61..dbe78a5018 100644
--- a/public/intl/messages/id-ID.json
+++ b/public/intl/messages/id-ID.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Aktifkan URL berbagi"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Perihal"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -603,6 +681,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -779,12 +863,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Profil"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -971,6 +1079,12 @@
       "value": "Sehari"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1001,6 +1115,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1307,6 +1427,12 @@
       "value": " pengunjung saat ini"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/it-IT.json b/public/intl/messages/it-IT.json
index d1568bae86..21b70650dc 100644
--- a/public/intl/messages/it-IT.json
+++ b/public/intl/messages/it-IT.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Abilita URL di condivisione"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Eventi"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Profilo"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "Singolo giorno"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1343,6 +1463,12 @@
       "value": " online"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/ja-JP.json b/public/intl/messages/ja-JP.json
index 55c3cae0b4..c11311c455 100644
--- a/public/intl/messages/ja-JP.json
+++ b/public/intl/messages/ja-JP.json
@@ -149,6 +149,12 @@
       "value": "すべてクリア"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "続ける"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "共有URLを有効にする"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "イベント"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "ユーザーのコンバージョン率と離脱率を分析します。"
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "以上"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "チームに参加"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "管理"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "プロフィール"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "一日"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "チームID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 1,
diff --git a/public/intl/messages/km-KH.json b/public/intl/messages/km-KH.json
index 7ddac46863..d8f7d50123 100644
--- a/public/intl/messages/km-KH.json
+++ b/public/intl/messages/km-KH.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "បើកការចែករំលែក URL"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "ព្រឹត្តិការណ៍"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -603,6 +681,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -779,12 +863,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "ប្រវត្តិរូប"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -971,6 +1079,12 @@
       "value": "ថ្ងៃតែមួយ"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1001,6 +1115,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1311,6 +1431,12 @@
       "value": " នាក់ ឥលូវនេះ"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/ko-KR.json b/public/intl/messages/ko-KR.json
index 48dfbb3bf3..da196a3c96 100644
--- a/public/intl/messages/ko-KR.json
+++ b/public/intl/messages/ko-KR.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "URL 공유 활성화"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "이벤트"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -791,12 +875,36 @@
       "value": "에서 구동되고 있습니다."
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "프로필"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -983,6 +1091,12 @@
       "value": "하루"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1013,6 +1127,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1319,6 +1439,12 @@
       "value": "명의 사용자가 보는 중입니다."
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 1,
diff --git a/public/intl/messages/lt-LT.json b/public/intl/messages/lt-LT.json
index 727e0c518f..891aed6ffa 100644
--- a/public/intl/messages/lt-LT.json
+++ b/public/intl/messages/lt-LT.json
@@ -149,6 +149,12 @@
       "value": "Išvalyti visus"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Įjungti bendrinimą su nuoroda"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Įvykiai"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Prisijungti į komandą"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -716,6 +794,12 @@
       "value": "Tvarkyti"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -892,12 +976,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Profilis"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -1084,6 +1192,12 @@
       "value": "Viena diena"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1114,6 +1228,12 @@
       "value": "Komandos ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1464,6 +1584,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/mn-MN.json b/public/intl/messages/mn-MN.json
index 484b6752da..b11d88c12e 100644
--- a/public/intl/messages/mn-MN.json
+++ b/public/intl/messages/mn-MN.json
@@ -149,6 +149,12 @@
       "value": "Бүгдийг арилгах"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Үргэлжлүүлэх"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Хуваалцах холбоос идэвхжүүлэх"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Үйлдэл"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Хэрэглэгчдийн шилжилт, уналтын хэмжээг шинжлэх."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Их буюу тэнцүү"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Багт нэгдэх"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": " дээр суурилсан"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Бүртгэл"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "Нэг өдөр"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Багийн ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1347,6 +1467,12 @@
       "value": " байна"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/ms-MY.json b/public/intl/messages/ms-MY.json
index 7d9b836996..996af333db 100644
--- a/public/intl/messages/ms-MY.json
+++ b/public/intl/messages/ms-MY.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Aktifkan url berkongsi"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Peristiwa"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -603,6 +681,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -779,12 +863,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Profil"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -971,6 +1079,12 @@
       "value": "Satu hari"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1001,6 +1115,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1331,6 +1451,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/my-MM.json b/public/intl/messages/my-MM.json
index f56429aa4a..34f83c029f 100644
--- a/public/intl/messages/my-MM.json
+++ b/public/intl/messages/my-MM.json
@@ -149,6 +149,12 @@
       "value": "အားလုံးကိုဖျက်မည်"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "ဆက်သွားမည်"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "ဝေငှခြင်းကိုလင့်ကို ဖွင့်မည်"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "အဖြစ်အပျက်များ"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "ထက်ပို၍ကြီးသည်သို့မဟုတ်တူသည်"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "အသင်းဝင်မည်"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": " ထောက်ပံ့သည်"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "ပရိုဖိုင်း"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "တစ်ရက်အတွင်း"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "အသင်း အိုင်ဒီ"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 1,
diff --git a/public/intl/messages/nb-NO.json b/public/intl/messages/nb-NO.json
index 7b110ee4eb..eeb648c482 100644
--- a/public/intl/messages/nb-NO.json
+++ b/public/intl/messages/nb-NO.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Aktiver delings-URL"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Arrangementer"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Profil"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "Enkelt dag"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1343,6 +1463,12 @@
       "value": " nå"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/nl-NL.json b/public/intl/messages/nl-NL.json
index 5b0cfdbf1b..16f2de07f9 100644
--- a/public/intl/messages/nl-NL.json
+++ b/public/intl/messages/nl-NL.json
@@ -149,6 +149,12 @@
       "value": "Filters wissen"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Doorgaan"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Gemaakt Door"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Sta delen via openbare URL toe"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Gebeurtenissen"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Ontdek de conversie- en uitvalpercentages van gebruikers."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Groter of gelijk aan"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Word lid van een team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Beheren"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Profiel"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "Enkele dag"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/pl-PL.json b/public/intl/messages/pl-PL.json
index 53cf77ea2a..29e99d4fe6 100644
--- a/public/intl/messages/pl-PL.json
+++ b/public/intl/messages/pl-PL.json
@@ -149,6 +149,12 @@
       "value": "Wyczyść wszystko"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Kontynuuj"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Utworzony przez"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Włącz udostępnianie adresu URL"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Zdarzenia"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Zrozum wskaźniki konwersji i odpływu użytkowników."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Większe niż lub równe"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Dołącz do zespołu"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Profil"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "W tym dniu"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "ID zespołu"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/pt-BR.json b/public/intl/messages/pt-BR.json
index 6e3bb03ef6..149af775da 100644
--- a/public/intl/messages/pt-BR.json
+++ b/public/intl/messages/pt-BR.json
@@ -149,6 +149,12 @@
       "value": "Limpar tudo"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continuar"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Criado por"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Ativar link para compartilhar"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Tipos de eventos"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Entenda a taxa de conversão e abandono dos seus usuários."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Maior ou igual a"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Participar da equipe"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Gerenciar"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Perfil"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "Apenas um dia"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "ID da equipe"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1319,6 +1439,12 @@
       "value": " usuários ativos"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/pt-PT.json b/public/intl/messages/pt-PT.json
index 1b19e8d37c..340ebb8852 100644
--- a/public/intl/messages/pt-PT.json
+++ b/public/intl/messages/pt-PT.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Ativar link de partilha"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Eventos"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Perfil"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "Dia único"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1343,6 +1463,12 @@
       "value": " neste momento"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/ro-RO.json b/public/intl/messages/ro-RO.json
index 6a0b77fe34..67d0929bcf 100644
--- a/public/intl/messages/ro-RO.json
+++ b/public/intl/messages/ro-RO.json
@@ -149,6 +149,12 @@
       "value": "Șterge tot"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continuă"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Activare adresă URL de distribuire"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Evenimente"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Înțelege rata de conversie și rata de abandon a utilizatorilor."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Mai mare sau egal cu"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Alătură-te echipei"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Administrează"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Profil"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "O singură zi"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "ID Echipa"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/ru-RU.json b/public/intl/messages/ru-RU.json
index 4f851f4698..1d0a86a1e7 100644
--- a/public/intl/messages/ru-RU.json
+++ b/public/intl/messages/ru-RU.json
@@ -149,6 +149,12 @@
       "value": "Очистить все"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Продолжить"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Разрешить делиться ссылкой"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "События"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Присоединиться к команде"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Профиль"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "Один день"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "ID команды"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1315,6 +1435,12 @@
       "value": " текущих посетителей"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/si-LK.json b/public/intl/messages/si-LK.json
index 749d830b15..d7cfd7bf43 100644
--- a/public/intl/messages/si-LK.json
+++ b/public/intl/messages/si-LK.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "බෙදාගැනීමේ URL සබල කරන්න"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Events"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "පැතිකඩ"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "තනි දවස"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 1,
diff --git a/public/intl/messages/sk-SK.json b/public/intl/messages/sk-SK.json
index ff9d4e65f3..2be1f01521 100644
--- a/public/intl/messages/sk-SK.json
+++ b/public/intl/messages/sk-SK.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Povoliť zdielanie URL"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Udalosti"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Profil"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "Jeden deň"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/sl-SI.json b/public/intl/messages/sl-SI.json
index b209116649..83c383c1aa 100644
--- a/public/intl/messages/sl-SI.json
+++ b/public/intl/messages/sl-SI.json
@@ -149,6 +149,12 @@
       "value": "Počisti vse"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Nadaljuj"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Uredi povezavo za deljenje"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Dogodki"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Večje ali enako kot"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Pridruži se ekipi"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Profil"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "En dan"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "ID ekipe"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/sv-SE.json b/public/intl/messages/sv-SE.json
index 28992e10fc..a6336a3044 100644
--- a/public/intl/messages/sv-SE.json
+++ b/public/intl/messages/sv-SE.json
@@ -149,6 +149,12 @@
       "value": "Rensa alla"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Fortsätt"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Aktivera delningslänk"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Händelser"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Förstå omvandlingen och bortfallsfrekvensen för användare."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Större än eller lika med"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Gå med i team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Profil"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "En dag"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1343,6 +1463,12 @@
       "value": " just nu"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/ta-IN.json b/public/intl/messages/ta-IN.json
index 70d7b87eb5..4afcb8db74 100644
--- a/public/intl/messages/ta-IN.json
+++ b/public/intl/messages/ta-IN.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "கள முகவரியை பகிரலாம்"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "நிகழ்வுகள்"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": " ஆல் இயக்கப்படுகிறது"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "சுயவிவரம்"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "ஒரு நாள்"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/th-TH.json b/public/intl/messages/th-TH.json
index 351d30f876..32d5e677d2 100644
--- a/public/intl/messages/th-TH.json
+++ b/public/intl/messages/th-TH.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "เปิดใช้งานการแชร์ลิงก์"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "เหตุการณ์"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -603,6 +681,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -779,12 +863,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "โปรไฟล์"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -971,6 +1079,12 @@
       "value": "วันที่"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1001,6 +1115,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1335,6 +1455,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/tr-TR.json b/public/intl/messages/tr-TR.json
index c0caf470b7..ac49dd47d5 100644
--- a/public/intl/messages/tr-TR.json
+++ b/public/intl/messages/tr-TR.json
@@ -47,10 +47,10 @@
       "value": "Web sitesi ekle"
     }
   ],
-  "label.administrator": [
+  "label.admin": [
     {
       "type": 0,
-      "value": "Yönetici"
+      "value": "Administrator"
     }
   ],
   "label.after": [
@@ -149,6 +149,12 @@
       "value": "Hepsini temizle"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Devam et"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Tarafından oluşturldu"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Anonim paylaşım URL'i aktif"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Olaylar"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Kullanıcıların dönüşüm ve ayrılma oranlarını anlayın."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Büyük veya eşittir"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Takıma katıl"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Yönet"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Profil"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "Tekil gün"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Takım ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1315,6 +1435,12 @@
       "value": " aktif ziyaretçi"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 1,
diff --git a/public/intl/messages/uk-UA.json b/public/intl/messages/uk-UA.json
index 4d69375600..3f091b5f2a 100644
--- a/public/intl/messages/uk-UA.json
+++ b/public/intl/messages/uk-UA.json
@@ -149,6 +149,12 @@
       "value": "Очистити все"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Продовжити"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Автор"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Дозволити ділитися посиланням"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Події"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Більше або рівно"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Приєднатись до команди"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Керувати"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Профіль"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "Один день"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "ID команди"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1315,6 +1435,12 @@
       "value": " поточних відвідувачів"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/ur-PK.json b/public/intl/messages/ur-PK.json
index 0316d2994e..18fce7ebb7 100644
--- a/public/intl/messages/ur-PK.json
+++ b/public/intl/messages/ur-PK.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "شیئر یو آر ایل کو فعال کریں"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "واقعات"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -787,12 +871,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "پروفائل"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -979,6 +1087,12 @@
       "value": "ایک دن"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1009,6 +1123,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1339,6 +1459,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/vi-VN.json b/public/intl/messages/vi-VN.json
index 0cc0c183e5..50409fab26 100644
--- a/public/intl/messages/vi-VN.json
+++ b/public/intl/messages/vi-VN.json
@@ -149,6 +149,12 @@
       "value": "Clear all"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "Continue"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "Bật khả năng chia sẻ URL"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "Sự kiện"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "Understand the conversion and drop-off rate of users."
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "Greater than or equals"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "Join team"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -603,6 +681,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -779,12 +863,36 @@
       "value": "name"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "Hồ sơ"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -971,6 +1079,12 @@
       "value": "Trong ngày"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1001,6 +1115,12 @@
       "value": "Team ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1331,6 +1451,12 @@
       "value": "x"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/zh-CN.json b/public/intl/messages/zh-CN.json
index e42400229f..e66a8eb158 100644
--- a/public/intl/messages/zh-CN.json
+++ b/public/intl/messages/zh-CN.json
@@ -149,6 +149,12 @@
       "value": "清除全部"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "继续"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "创建者"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "启用共享链接"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "行为类别"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "了解用户的转换率和退出率。"
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "大于或等于"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "加入团队"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "管理"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -795,12 +879,36 @@
       "value": " 提供支持"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "个人资料"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -987,6 +1095,12 @@
       "value": "单日"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1017,6 +1131,12 @@
       "value": "团队 ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1327,6 +1447,12 @@
       "value": " 人"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/public/intl/messages/zh-TW.json b/public/intl/messages/zh-TW.json
index a39aea19bb..d6514ab4df 100644
--- a/public/intl/messages/zh-TW.json
+++ b/public/intl/messages/zh-TW.json
@@ -149,6 +149,12 @@
       "value": "全部清除"
     }
   ],
+  "label.compare": [
+    {
+      "type": 0,
+      "value": "Compare"
+    }
+  ],
   "label.confirm": [
     {
       "type": 0,
@@ -173,6 +179,12 @@
       "value": "繼續"
     }
   ],
+  "label.count": [
+    {
+      "type": 0,
+      "value": "Count"
+    }
+  ],
   "label.countries": [
     {
       "type": 0,
@@ -221,6 +233,12 @@
       "value": "Created By"
     }
   ],
+  "label.current": [
+    {
+      "type": 0,
+      "value": "Current"
+    }
+  ],
   "label.current-password": [
     {
       "type": 0,
@@ -377,6 +395,18 @@
       "value": "啟用分享網址"
     }
   ],
+  "label.end-step": [
+    {
+      "type": 0,
+      "value": "End Step"
+    }
+  ],
+  "label.entry": [
+    {
+      "type": 0,
+      "value": "Entry URL"
+    }
+  ],
   "label.event": [
     {
       "type": 0,
@@ -395,6 +425,12 @@
       "value": "事件"
     }
   ],
+  "label.exit": [
+    {
+      "type": 0,
+      "value": "Exit URL"
+    }
+  ],
   "label.false": [
     {
       "type": 0,
@@ -449,6 +485,24 @@
       "value": "瞭解使用者的轉換率和退出率"
     }
   ],
+  "label.goal": [
+    {
+      "type": 0,
+      "value": "Goal"
+    }
+  ],
+  "label.goals": [
+    {
+      "type": 0,
+      "value": "Goals"
+    }
+  ],
+  "label.goals-description": [
+    {
+      "type": 0,
+      "value": "Track your goals for pageviews and events."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -461,6 +515,18 @@
       "value": "大於或等於"
     }
   ],
+  "label.host": [
+    {
+      "type": 0,
+      "value": "Host"
+    }
+  ],
+  "label.hosts": [
+    {
+      "type": 0,
+      "value": "Hosts"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
@@ -509,6 +575,18 @@
       "value": "加入團隊"
     }
   ],
+  "label.journey": [
+    {
+      "type": 0,
+      "value": "Journey"
+    }
+  ],
+  "label.journey-description": [
+    {
+      "type": 0,
+      "value": "Understand how users nagivate through your website."
+    }
+  ],
   "label.language": [
     {
       "type": 0,
@@ -611,6 +689,12 @@
       "value": "Manage"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -791,12 +875,36 @@
       "value": " 提供"
     }
   ],
+  "label.previous": [
+    {
+      "type": 0,
+      "value": "Previous"
+    }
+  ],
+  "label.previous-period": [
+    {
+      "type": 0,
+      "value": "Previous period"
+    }
+  ],
+  "label.previous-year": [
+    {
+      "type": 0,
+      "value": "Previous year"
+    }
+  ],
   "label.profile": [
     {
       "type": 0,
       "value": "個人資料"
     }
   ],
+  "label.property": [
+    {
+      "type": 0,
+      "value": "Property"
+    }
+  ],
   "label.queries": [
     {
       "type": 0,
@@ -983,6 +1091,12 @@
       "value": "單日"
     }
   ],
+  "label.start-step": [
+    {
+      "type": 0,
+      "value": "Start Step"
+    }
+  ],
   "label.steps": [
     {
       "type": 0,
@@ -1013,6 +1127,12 @@
       "value": "團隊 ID"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1323,6 +1443,12 @@
       "value": " 個活躍的訪客"
     }
   ],
+  "message.collected-data": [
+    {
+      "type": 0,
+      "value": "Collected data"
+    }
+  ],
   "message.confirm-delete": [
     {
       "type": 0,
diff --git a/src/lang/am-ET.json b/src/lang/am-ET.json
index 5e28634225..323fe4e88b 100644
--- a/src/lang/am-ET.json
+++ b/src/lang/am-ET.json
@@ -13,7 +13,6 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "Visit duration",
   "label.back": "Back",
   "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "Confirm password",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "Countries",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Current password",
   "label.custom-range": "Custom range",
   "label.dashboard": "Dashboard",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edit dashboard",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "Enable share URL",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event Data",
   "label.events": "Events",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "Laptop",
@@ -98,6 +110,7 @@
   "label.login": "Login",
   "label.logout": "Logout",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "Pages",
   "label.password": "Password",
   "label.powered-by": "Powered by {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Profile",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "Settings",
   "label.share-url": "Share URL",
   "label.single-day": "Single day",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "Views",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Visit duration",
   "label.visitors": "Visitors",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Yesterday",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} current {x, plural, one {visitor} other {visitors}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Are you sure you want to delete {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/ar-SA.json b/src/lang/ar-SA.json
index aff31f678a..a9fd02cfa4 100644
--- a/src/lang/ar-SA.json
+++ b/src/lang/ar-SA.json
@@ -13,7 +13,6 @@
   "label.all-time": "كل الوقت",
   "label.analytics": "تحليلات",
   "label.average": "المتوسط",
-  "label.visit-duration": "متوسط وقت الزيارة",
   "label.back": "للخلف",
   "label.before": "قبل",
   "label.bounce-rate": "معدل الارتداد",
@@ -25,10 +24,12 @@
   "label.cities": "المدن",
   "label.city": "المدينة",
   "label.clear-all": "مسح الكل",
+  "label.compare": "Compare",
   "label.confirm": "تأكيد",
   "label.confirm-password": "تأكيد كلمة المرور",
   "label.contains": "يحتوي",
   "label.continue": "تابع",
+  "label.count": "Count",
   "label.countries": "الدول",
   "label.country": "الدولة",
   "label.create": "أنشِئ",
@@ -37,6 +38,7 @@
   "label.create-user": "أنشِئ مستخدم",
   "label.created": "أُنشئت",
   "label.created-by": "أُنشئ من قبل",
+  "label.current": "Current",
   "label.current-password": "كلمة المرور الحالية",
   "label.custom-range": "فترة مخصّصة",
   "label.dashboard": "الشاشة الرئيسية",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "عدّل لوحة التحكم",
   "label.edit-member": "عدّل العضو",
   "label.enable-share-url": "فعّل مشاركة الرابط",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "الحدث",
   "label.event-data": "تاريخ الحدث",
   "label.events": "الأحداث",
+  "label.exit": "Exit URL",
   "label.false": "خطأ",
   "label.field": "الحقل",
   "label.fields": "الحقول",
@@ -75,8 +80,13 @@
   "label.filters": "التصفيات",
   "label.funnel": "قمع",
   "label.funnel-description": "فهم معدل التحويل والانقطاع عن المستخدمين.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "أكبَر مِن",
   "label.greater-than-equals": "أكبَر مِن أو يساوي",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "نتائج التحليلات",
   "label.insights-description": "تعمق في بياناتك باستخدام الشرائح والتصفيات.",
   "label.is": "هو",
@@ -85,6 +95,8 @@
   "label.is-set": "ضُبط",
   "label.join": "انضم",
   "label.join-team": "انضم للفريق",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "اللغة",
   "label.languages": "اللغات",
   "label.laptop": "لابتوب",
@@ -98,6 +110,7 @@
   "label.login": "تسجيل الدخول",
   "label.logout": "تسجيل الخروج",
   "label.manage": "التحكم",
+  "label.manager": "Manager",
   "label.max": "الحد الأقصى",
   "label.member": "عضو",
   "label.members": "الأعضاء",
@@ -120,7 +133,11 @@
   "label.pages": "الصفحات",
   "label.password": "كلمة المرور",
   "label.powered-by": "مشغل بواسطة {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "الملف الشخصي",
+  "label.property": "Property",
   "label.queries": "استعلامات",
   "label.query": "استعلام",
   "label.query-parameters": "متغيرات الرابط",
@@ -152,11 +169,13 @@
   "label.settings": "الإعدادات",
   "label.share-url": "مشاركة الرابط",
   "label.single-day": "يوم واحد",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "المجموع",
   "label.tablet": "تابلت",
   "label.team": "الفريق",
   "label.team-id": "معرّف الفريق",
+  "label.team-manager": "Team manager",
   "label.team-member": "عضو الفريق",
   "label.team-name": "اسم الفريق",
   "label.team-owner": "مدير الفريق",
@@ -196,6 +215,7 @@
   "label.view-only": "عرض فقط",
   "label.views": "المشاهدات",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "متوسط وقت الزيارة",
   "label.visitors": "الزوار",
   "label.visits": "Visits",
   "label.website": "الموقع",
@@ -205,6 +225,7 @@
   "label.yesterday": "الأمس",
   "message.action-confirmation": "اكتب {confirmation} في المربع أدناه للتأكيد.",
   "message.active-users": "{x} حاليا {x, plural, one {زائر واحد} other {زوار}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "هل أنت متأكد من حذف {target}?",
   "message.confirm-leave": "هل أنت متأكد من مغادرة {target}?",
   "message.confirm-remove": "هل انت متأكد من حذف {target}?",
diff --git a/src/lang/be-BY.json b/src/lang/be-BY.json
index a831fe0fa6..3a4a033581 100644
--- a/src/lang/be-BY.json
+++ b/src/lang/be-BY.json
@@ -13,7 +13,6 @@
   "label.all-time": "Увесь час",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "Сярэдняя даўжыня наведвання",
   "label.back": "Назад",
   "label.before": "Before",
   "label.bounce-rate": "Паказчык адмоваў",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "Падцвердзіць пароль",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "Краіны",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Бягучы пароль",
   "label.custom-range": "Карыстацкі дыяпазон",
   "label.dashboard": "Інфармацыйная панэль",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Змяніць інфармацыйную панэль",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "Дазволіць дзяліцца спасылкай",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Падзеі",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Мова",
   "label.languages": "Мовы",
   "label.laptop": "Ноўтбук",
@@ -98,6 +110,7 @@
   "label.login": "Login",
   "label.logout": "Выйсці",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "Старонкі",
   "label.password": "Пароль",
   "label.powered-by": "Зроблена {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Профіль",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "Налады",
   "label.share-url": "Падзяліцца спасылкай",
   "label.single-day": "Адзін дзень",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "Планшэт",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "Прагляды",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Сярэдняя даўжыня наведвання",
   "label.visitors": "Наведвальнікі",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Учора",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} тякучых {x, plural, one {наведвальнік} other {наведвальнікаў}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Вы дакладна хочаце выдаліць {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/bg-BG.json b/src/lang/bg-BG.json
index f293ed8841..9b22b466f4 100644
--- a/src/lang/bg-BG.json
+++ b/src/lang/bg-BG.json
@@ -13,7 +13,6 @@
   "label.all-time": "За всички времена",
   "label.analytics": "Анализи",
   "label.average": "Средно",
-  "label.average-visit-time": "Средно време на посещение",
   "label.back": "Назад",
   "label.before": "Преди",
   "label.bounce-rate": "Kоефициент на отказ",
@@ -25,10 +24,12 @@
   "label.cities": "Градове",
   "label.city": "Град",
   "label.clear-all": "Изчисти всички",
+  "label.compare": "Compare",
   "label.confirm": "Потвърди",
   "label.confirm-password": "Потвърди парола",
   "label.contains": "Съдържа",
   "label.continue": "Продължи",
+  "label.count": "Count",
   "label.countries": "Държави",
   "label.country": "Държава",
   "label.create": "Създай",
@@ -37,6 +38,7 @@
   "label.create-user": "Създай потребител",
   "label.created": "Създадено",
   "label.created-by": "Създадено от",
+  "label.current": "Current",
   "label.current-password": "Текуща парола",
   "label.custom-range": "Обхват",
   "label.dashboard": "Табло",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Редактирай табло",
   "label.edit-member": "Редактирай член",
   "label.enable-share-url": "Активирай Линк за споделяне",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Събитие",
   "label.event-data": "Данни за събитие",
   "label.events": "Събития",
+  "label.exit": "Exit URL",
   "label.false": "Грешно",
   "label.field": "Поле",
   "label.fields": "Полета",
@@ -75,8 +80,13 @@
   "label.filters": "Филтри",
   "label.funnel": "Фуния",
   "label.funnel-description": "Разберете процента на конверсия и отпадане на потребителите.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "По-голямо от",
   "label.greater-than-equals": "По-голямо или равно на",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Изводи",
   "label.insights-description": "Навлезте по-дълбоко в данните си, като използвате сегменти и филтри.",
   "label.is": "Е",
@@ -85,6 +95,8 @@
   "label.is-set": "Зададено е",
   "label.join": "Присъедини се",
   "label.join-team": "Присъедини се към екип",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Език",
   "label.languages": "Езици",
   "label.laptop": "Лаптоп",
@@ -98,6 +110,7 @@
   "label.login": "Вход",
   "label.logout": "Изход",
   "label.manage": "Управлявай",
+  "label.manager": "Manager",
   "label.max": "Максимум",
   "label.member": "Член",
   "label.members": "Членове",
@@ -120,7 +133,11 @@
   "label.pages": "Страници",
   "label.password": "Парола",
   "label.powered-by": "Поддържано от {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Профил",
+  "label.property": "Property",
   "label.queries": "Запитвания",
   "label.query": "Запитване",
   "label.query-parameters": "Параметри на търсене",
@@ -152,11 +169,13 @@
   "label.settings": "Настройки",
   "label.share-url": "Сподели Линк",
   "label.single-day": "Един ден",
+  "label.start-step": "Start Step",
   "label.steps": "Стъпки",
   "label.sum": "Сума",
   "label.tablet": "Таблет",
   "label.team": "Екип",
   "label.team-id": "ID на екип",
+  "label.team-manager": "Team manager",
   "label.team-member": "Член на екипа",
   "label.team-name": "Име на екипа",
   "label.team-owner": "Собственик на екипа",
@@ -196,6 +215,7 @@
   "label.view-only": "Само за преглед",
   "label.views": "Прегледи",
   "label.views-per-visit": "Прегледи на посещение",
+  "label.visit-duration": "Visit duration",
   "label.visitors": "Посетители",
   "label.visits": "Посещения",
   "label.website": "Уебсайт",
@@ -205,6 +225,7 @@
   "label.yesterday": "Вчера",
   "message.action-confirmation": "Въведете {confirmation} в полето по-долу, за да потвърдите.",
   "message.active-users": "{x} {x, plural, one {активен един} other {активни други}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Сигурни ли сте, че искате да изтриете {target}?",
   "message.confirm-leave": "Сигурни ли сте, че искате да напуснете {target}?",
   "message.confirm-remove": "Сигурни ли сте, че искате да премахнете {target}?",
diff --git a/src/lang/bn-BD.json b/src/lang/bn-BD.json
index fd91a3f4f3..43b41420c8 100644
--- a/src/lang/bn-BD.json
+++ b/src/lang/bn-BD.json
@@ -13,7 +13,6 @@
   "label.all-time": "সব সময়",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "গড় পরিদর্শনের সময়",
   "label.back": "পেছনে",
   "label.before": "পূর্বে",
   "label.bounce-rate": "উপরে উঠার হার",
@@ -25,10 +24,12 @@
   "label.cities": "শহরসমূহ",
   "label.city": "শহর",
   "label.clear-all": "সব মুছে ফেলুন",
+  "label.compare": "Compare",
   "label.confirm": "নিশ্চিত করুন",
   "label.confirm-password": "পাসওয়ার্ড নিশ্চিত করুন",
   "label.contains": "রয়েছে",
   "label.continue": "পরবর্তিতে",
+  "label.count": "Count",
   "label.countries": "দেশসমূহ",
   "label.country": "দেশ",
   "label.create": "তৈরি করুন",
@@ -37,6 +38,7 @@
   "label.create-user": "ব্যবহারকারী তৈরি করুন",
   "label.created": "তৈরি করা হয়েছে",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "বর্তমান পাসওয়ার্ড",
   "label.custom-range": "কাস্টম রেঞ্জ",
   "label.dashboard": "ড্যাশবোর্ড",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edit dashboard",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "শেয়ার ইউআরএল শেয়ার করুন",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "ঘটনা",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "ভাষা",
   "label.languages": "ভাষা",
   "label.laptop": "ল্যাপটপ",
@@ -98,6 +110,7 @@
   "label.login": "লগিন",
   "label.logout": "লগ আউট",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "পৃষ্ঠাগুলি",
   "label.password": "পাসওয়ার্ড",
   "label.powered-by": "{name} দ্বারা চালিত",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "প্রোফাইল",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "সেটিংস",
   "label.share-url": "ইউআরএল শেয়ার করুন",
   "label.single-day": "একদিন",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "ট্যাবলেট",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "ভিউস",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "গড় পরিদর্শনের সময়",
   "label.visitors": "পরিদর্শনার্থী",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Yesterday",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} বর্তমান  {x, plural, one {visitor} other {visitors}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "আপনি কি নিশ্চিত যে আপনি {target} মুছতে চান?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/bs-BA.json b/src/lang/bs-BA.json
index 3eda0f854a..04fb89ee4b 100644
--- a/src/lang/bs-BA.json
+++ b/src/lang/bs-BA.json
@@ -13,7 +13,6 @@
   "label.all-time": "Cijelo vrijeme",
   "label.analytics": "Analitike",
   "label.average": "Prosjek",
-  "label.visit-duration": "Prosječno vrijeme posjete",
   "label.back": "Nazad",
   "label.before": "Prije",
   "label.bounce-rate": "Bounce rate",
@@ -25,10 +24,12 @@
   "label.cities": "Gradovi",
   "label.city": "Grad",
   "label.clear-all": "Očisti sve",
+  "label.compare": "Compare",
   "label.confirm": "Potvrdi",
   "label.confirm-password": "Potvrdi šifru",
   "label.contains": "Sadrži",
   "label.continue": "Nastavi",
+  "label.count": "Count",
   "label.countries": "Zemlje",
   "label.country": "Zemlja",
   "label.create": "Kreiraj",
@@ -37,6 +38,7 @@
   "label.create-user": "Kreiraj korisnika",
   "label.created": "Kreiraj",
   "label.created-by": "Kreirao",
+  "label.current": "Current",
   "label.current-password": "Trenutna šifra",
   "label.custom-range": "Proizvoljni raspon",
   "label.dashboard": "Dashboard",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Uredi dashboard",
   "label.edit-member": "Uredi člana",
   "label.enable-share-url": "Omogući URL za dijeljenje",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Događaj",
   "label.event-data": "Podaci o događaju",
   "label.events": "Događaji",
+  "label.exit": "Exit URL",
   "label.false": "Ne",
   "label.field": "Polje",
   "label.fields": "Polja",
@@ -75,8 +80,13 @@
   "label.filters": "Filtri",
   "label.funnel": "Lijevak",
   "label.funnel-description": "Razumite koverziju i drop-off učestalost korisnika.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Veće od",
   "label.greater-than-equals": "Veće od ili jednako",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Uvidi",
   "label.insights-description": "Zaronite dublje u vaše podatke korištenjem segmenata i filtera",
   "label.is": "Jeste",
@@ -85,6 +95,8 @@
   "label.is-set": "Jeste setano",
   "label.join": "Učlani se",
   "label.join-team": "Učlani se u tim",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Jezik",
   "label.languages": "Jezici",
   "label.laptop": "Laptop",
@@ -98,6 +110,7 @@
   "label.login": "Login",
   "label.logout": "Logout",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Član",
   "label.members": "Članovi",
@@ -120,7 +133,11 @@
   "label.pages": "Stranice",
   "label.password": "Šifra",
   "label.powered-by": "Omogućeno s {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.property": "Property",
   "label.queries": "Queryji",
   "label.query": "Query",
   "label.query-parameters": "Query parametri",
@@ -152,11 +169,13 @@
   "label.settings": "Postavke",
   "label.share-url": "Share URL",
   "label.single-day": "Jedan dan",
+  "label.start-step": "Start Step",
   "label.steps": "Koraci",
   "label.sum": "Suma",
   "label.tablet": "Tablet",
   "label.team": "Tim",
   "label.team-id": "Tim ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Član tima",
   "label.team-name": "Naziv tima",
   "label.team-owner": "Vlasnik tima",
@@ -196,6 +215,7 @@
   "label.view-only": "Samo gledanje",
   "label.views": "Pregledi",
   "label.views-per-visit": "Pregledi po posjeti",
+  "label.visit-duration": "Prosječno vrijeme posjete",
   "label.visitors": "Posjetitelji",
   "label.visits": "Posjete",
   "label.website": "Web stranica",
@@ -205,6 +225,7 @@
   "label.yesterday": "Jučer",
   "message.action-confirmation": "Unesite {confirmation} ispod da potvrdite.",
   "message.active-users": "{x} trenutno {x, plural, one {posjetitelj} other {posjetitelja}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Jeste li sigurni da želite obrisati {target}?",
   "message.confirm-leave": "Jeste li sigurni da želite napustiti {target}?",
   "message.confirm-remove": "Jeste li sigurni da želite ukloniti {target}?",
diff --git a/src/lang/ca-ES.json b/src/lang/ca-ES.json
index a12fd3c8e8..5824492c3e 100644
--- a/src/lang/ca-ES.json
+++ b/src/lang/ca-ES.json
@@ -13,7 +13,6 @@
   "label.all-time": "Sempre",
   "label.analytics": "Analítiques",
   "label.average": "Mitjana",
-  "label.visit-duration": "Temps mitjà de visita",
   "label.back": "Enrere",
   "label.before": "Abans",
   "label.bounce-rate": "Percentatge de rebot",
@@ -25,10 +24,12 @@
   "label.cities": "Ciutats",
   "label.city": "Ciutat",
   "label.clear-all": "Netejar tot",
+  "label.compare": "Compare",
   "label.confirm": "Confirmar",
   "label.confirm-password": "Confirma la contrasenya",
   "label.contains": "Conté",
   "label.continue": "Continuar",
+  "label.count": "Count",
   "label.countries": "Països",
   "label.country": "País",
   "label.create": "Crear",
@@ -37,6 +38,7 @@
   "label.create-user": "Crear usuari",
   "label.created": "Creat",
   "label.created-by": "Creat Per",
+  "label.current": "Current",
   "label.current-password": "Contrasenya actual",
   "label.custom-range": "Rang personalitzat",
   "label.dashboard": "Panell",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edita panell",
   "label.edit-member": "Edita membre",
   "label.enable-share-url": "Activa l'enllaç per compartir",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Esdeveniment",
   "label.event-data": "Dades de l'esdeveniment",
   "label.events": "Esdeveniments",
+  "label.exit": "Exit URL",
   "label.false": "Fals",
   "label.field": "Camp",
   "label.fields": "Camps",
@@ -75,8 +80,13 @@
   "label.filters": "Filtres",
   "label.funnel": "Embut",
   "label.funnel-description": "Entengui la taxa de conversió i abandonament dels usuaris.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Més gran que",
   "label.greater-than-equals": "Més gran que o igual a",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Aprofundeixi en les seves dades mitjançant l'ús de segments i filtres.",
   "label.is": "És igual a",
@@ -85,6 +95,8 @@
   "label.is-set": "Està establert",
   "label.join": "Unir",
   "label.join-team": "Unir-se al equip",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Idioma",
   "label.languages": "Idiomes",
   "label.laptop": "Portàtil",
@@ -98,6 +110,7 @@
   "label.login": "Connecta't",
   "label.logout": "Desconnecta't",
   "label.manage": "Administrar",
+  "label.manager": "Manager",
   "label.max": "Màx",
   "label.member": "Membre",
   "label.members": "Membres",
@@ -120,7 +133,11 @@
   "label.pages": "Pàgines",
   "label.password": "Contrasenya",
   "label.powered-by": "Funciona amb {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Perfil",
+  "label.property": "Property",
   "label.queries": "Consultes",
   "label.query": "Consulta",
   "label.query-parameters": "Paràmetres de consulta",
@@ -152,11 +169,13 @@
   "label.settings": "Configuració",
   "label.share-url": "Enllaç per compartir",
   "label.single-day": "Un sol dia",
+  "label.start-step": "Start Step",
   "label.steps": "Pasos",
   "label.sum": "Suma",
   "label.tablet": "Tauleta",
   "label.team": "Equip",
   "label.team-id": "ID del equip",
+  "label.team-manager": "Team manager",
   "label.team-member": "Membre de l'equip",
   "label.team-name": "Nom de l'equip",
   "label.team-owner": "Propietari de l'equip",
@@ -196,6 +215,7 @@
   "label.view-only": "Només veure",
   "label.views": "Vistes",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Temps mitjà de visita",
   "label.visitors": "Visitants",
   "label.visits": "Visites",
   "label.website": "Lloc web",
@@ -205,6 +225,7 @@
   "label.yesterday": "Ahir",
   "message.action-confirmation": "Escrigui {confirmation} al cuadre inferior per confirmar.",
   "message.active-users": "{x} {x, plural, one {visitant actual} other {visitants actuals}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Segur que vol esborrar {target}?",
   "message.confirm-leave": "Segur que vol abandonar {target}?",
   "message.confirm-remove": "Segur que vol eliminar {target}?",
diff --git a/src/lang/cs-CZ.json b/src/lang/cs-CZ.json
index 64153d7d02..9c6d3ba197 100644
--- a/src/lang/cs-CZ.json
+++ b/src/lang/cs-CZ.json
@@ -13,7 +13,6 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "Průměrný čas návštěvy",
   "label.back": "Zpět",
   "label.before": "Before",
   "label.bounce-rate": "Okamžité opuštění",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "Potvrdit heslo",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "Země",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Aktuální heslo",
   "label.custom-range": "Vlastní rozsah",
   "label.dashboard": "Přehled",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edit dashboard",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "Povolit sdílení URL",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Události",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "Přenosný počítač",
@@ -98,6 +110,7 @@
   "label.login": "Přihlásit",
   "label.logout": "Odhlásit",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "Stránky",
   "label.password": "Heslo",
   "label.powered-by": "Běží na {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "Nastavení",
   "label.share-url": "Sdílet URL",
   "label.single-day": "Jeden den",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "Zobrazení",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Průměrný čas návštěvy",
   "label.visitors": "Návštěvy",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Yesterday",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} aktuálně {x, plural, one {návštěvník} other {návštěvníci}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Opravdu smazat {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/da-DK.json b/src/lang/da-DK.json
index d38d2a821d..a0cbe5e650 100644
--- a/src/lang/da-DK.json
+++ b/src/lang/da-DK.json
@@ -13,7 +13,6 @@
   "label.all-time": "Altid",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "Gennemsnitlig besøgstid",
   "label.back": "Tilbage",
   "label.before": "Before",
   "label.bounce-rate": "Afvisningsprocent",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "Godkendt adgangskode",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "Lande",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Nuværende adgangskode",
   "label.custom-range": "Tilpasset interval",
   "label.dashboard": "Betjeningspanel",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edit dashboard",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "Aktivér delings-URL",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Hændelser",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Sprog",
   "label.languages": "Sprog",
   "label.laptop": "Laptop",
@@ -98,6 +110,7 @@
   "label.login": "Log ind",
   "label.logout": "Log ud",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "Sider",
   "label.password": "Adgangskode",
   "label.powered-by": "Drevet af {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "Indstillinger",
   "label.share-url": "Del URL",
   "label.single-day": "Enkelt dag",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "Visninger",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Gennemsnitlig besøgstid",
   "label.visitors": "Besøgende",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Yesterday",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} nuværende {x, plural, one {bruger} other {brugere}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Er du sikker på at du vil slette {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/de-CH.json b/src/lang/de-CH.json
index dca1e35164..bdd37cdc8d 100644
--- a/src/lang/de-CH.json
+++ b/src/lang/de-CH.json
@@ -13,7 +13,6 @@
   "label.all-time": "Gesamte Zitruum",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "Durchschn. Bsuechsziit",
   "label.back": "Zrugg",
   "label.before": "Before",
   "label.bounce-rate": "Absprungsrate",
@@ -25,10 +24,12 @@
   "label.cities": "Städt",
   "label.city": "City",
   "label.clear-all": "Alles lösche",
+  "label.compare": "Compare",
   "label.confirm": "Bestätige",
   "label.confirm-password": "Passwort widerhole",
   "label.contains": "Contains",
   "label.continue": "Wiiter",
+  "label.count": "Count",
   "label.countries": "Länder",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Benutzer erstelle",
   "label.created": "Erstellt",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Jetzigs Passwort",
   "label.custom-range": "Benutzerdefinierte Bereich",
   "label.dashboard": "Übersicht",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Dashboard bearbeite",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "Freigab-URL aktiviere",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Ereigniss",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Biträte",
   "label.join-team": "Team biträte",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Sprach",
   "label.languages": "Sprache",
   "label.laptop": "Laptop",
@@ -98,6 +110,7 @@
   "label.login": "Aamelde",
   "label.logout": "Abmelde",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Mitglieder",
@@ -120,7 +133,11 @@
   "label.pages": "Siite",
   "label.password": "Passwort",
   "label.powered-by": "Betribe dur {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.property": "Property",
   "label.queries": "Abfrage",
   "label.query": "Query",
   "label.query-parameters": "Abfragparameter",
@@ -152,11 +169,13 @@
   "label.settings": "Istellige",
   "label.share-url": "Freigab-URL",
   "label.single-day": "Ein Tag",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team Mitglied",
   "label.team-name": "Team name",
   "label.team-owner": "Team Bsitzer",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "Ufrüef",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Durchschn. Bsuechsziit",
   "label.visitors": "Bsuecher",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Gester",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} {x, plural, one {aktive Bsuecher} other {aktivi Bsuecher}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Sind Sie sich sicher, {target} zlösche?",
   "message.confirm-leave": "Sind Sie sich sicher, {target} zverlah?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/de-DE.json b/src/lang/de-DE.json
index b0a296b51d..aca4b863f9 100644
--- a/src/lang/de-DE.json
+++ b/src/lang/de-DE.json
@@ -13,7 +13,6 @@
   "label.all-time": "Gesamter Zeitraum",
   "label.analytics": "Analytics",
   "label.average": "Durchschnitt",
-  "label.visit-duration": "Durchschn. Besuchszeit",
   "label.back": "Zurück",
   "label.before": "Vor",
   "label.bounce-rate": "Absprungrate",
@@ -25,10 +24,12 @@
   "label.cities": "Städte",
   "label.city": "Stadt",
   "label.clear-all": "Alles löschen",
+  "label.compare": "Compare",
   "label.confirm": "Bestätigen",
   "label.confirm-password": "Passwort wiederholen",
   "label.contains": "Enthält",
   "label.continue": "Weiter",
+  "label.count": "Count",
   "label.countries": "Länder",
   "label.country": "Land",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Benutzer erstellen",
   "label.created": "Erstellt",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Derzeitiges Passwort",
   "label.custom-range": "Benutzerdefinierter Bereich",
   "label.dashboard": "Übersicht",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Dashboard bearbeiten",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "Freigabe-URL aktivieren",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Eventdaten",
   "label.events": "Ereignisse",
+  "label.exit": "Exit URL",
   "label.false": "Falsch",
   "label.field": "Feld",
   "label.fields": "Felder",
@@ -75,8 +80,13 @@
   "label.filters": "Filter",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Größer als",
   "label.greater-than-equals": "Größer oder gleich",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Ist",
@@ -85,6 +95,8 @@
   "label.is-set": "Ist gesetzt",
   "label.join": "Beitreten",
   "label.join-team": "Team beitreten",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Sprache",
   "label.languages": "Sprachen",
   "label.laptop": "Laptop",
@@ -98,6 +110,7 @@
   "label.login": "Anmelden",
   "label.logout": "Abmelden",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Mitglieder",
@@ -120,7 +133,11 @@
   "label.pages": "Seiten",
   "label.password": "Passwort",
   "label.powered-by": "Betrieben durch {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.property": "Property",
   "label.queries": "Abfragen",
   "label.query": "Abfrage",
   "label.query-parameters": "Abfrageparameter",
@@ -152,11 +169,13 @@
   "label.settings": "Einstellungen",
   "label.share-url": "Freigabe-URL",
   "label.single-day": "Ein Tag",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Summe",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-id": "Team-ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team-Mitglied",
   "label.team-name": "Name des Teams",
   "label.team-owner": "Team-Eigentümer",
@@ -196,6 +215,7 @@
   "label.view-only": "Nur ansehen",
   "label.views": "Aufrufe",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Durchschn. Besuchszeit",
   "label.visitors": "Besucher",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Gestern",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} {x, plural, one {aktiver Besucher} other {aktive Besucher}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Sind Sie sich sicher, {target} zu löschen?",
   "message.confirm-leave": "Sind Sie sicher, dass die {target} verlassen möchten?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/el-GR.json b/src/lang/el-GR.json
index 3d44bd005d..8155b97af7 100644
--- a/src/lang/el-GR.json
+++ b/src/lang/el-GR.json
@@ -13,7 +13,6 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "Μέσος χρόνος επίσκεψης",
   "label.back": "Πίσω",
   "label.before": "Before",
   "label.bounce-rate": "Ποσοστό αναπήδησης",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "Επιβεβαίωση κωδικού",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "Χώρες",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Τωρινός κωδικός πρόσβασης",
   "label.custom-range": "Προσαρμοσμένο εύρος",
   "label.dashboard": "Πίνακας",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edit dashboard",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "Ενεργοποίηση κοινής χρήσης URL",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Γεγονότα",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "Λάπτοπ",
@@ -98,6 +110,7 @@
   "label.login": "Είσοδος",
   "label.logout": "Αποσύνδεση",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "Σελίδες",
   "label.password": "Κωδικός",
   "label.powered-by": "Με την υποστήριξη του {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Προφίλ",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "Ρυθμίσεις",
   "label.share-url": "Κοινοποίηση διεύθυνσης URL",
   "label.single-day": "Ημερήσια",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "Τάμπλετ",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "Προβολές",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Μέσος χρόνος επίσκεψης",
   "label.visitors": "Επισκέπτες",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Yesterday",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} ενεργοί {x, plural, one {επισκέπτης} other {επισκέπτες}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Είστε βέβαιοι ότι θέλετε να διαγράψετε το {target};",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/en-GB.json b/src/lang/en-GB.json
index dbe239fbde..aeefe43997 100644
--- a/src/lang/en-GB.json
+++ b/src/lang/en-GB.json
@@ -13,7 +13,6 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "Visit duration",
   "label.back": "Back",
   "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "Confirm password",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "Countries",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Current password",
   "label.custom-range": "Custom range",
   "label.dashboard": "Dashboard",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edit dashboard",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "Enable share URL",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Events",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "Laptop",
@@ -98,6 +110,7 @@
   "label.login": "Login",
   "label.logout": "Logout",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "Pages",
   "label.password": "Password",
   "label.powered-by": "Powered by {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Profile",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "Settings",
   "label.share-url": "Share URL",
   "label.single-day": "Single day",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "Views",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Visit duration",
   "label.visitors": "Visitors",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Yesterday",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} current {x, plural, one {visitor} other {visitors}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Are you sure you want to delete {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/en-US.json b/src/lang/en-US.json
index 114ed1d099..7487e220a2 100644
--- a/src/lang/en-US.json
+++ b/src/lang/en-US.json
@@ -13,7 +13,6 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "Visit duration",
   "label.back": "Back",
   "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "Confirm password",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "Countries",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Current password",
   "label.custom-range": "Custom range",
   "label.dashboard": "Dashboard",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edit dashboard",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "Enable share URL",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Events",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "Laptop",
@@ -98,6 +110,7 @@
   "label.login": "Login",
   "label.logout": "Logout",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "Pages",
   "label.password": "Password",
   "label.powered-by": "Powered by {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Profile",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "Settings",
   "label.share-url": "Share URL",
   "label.single-day": "Single day",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "Views",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Visit duration",
   "label.visitors": "Visitors",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Yesterday",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} current {x, plural, one {visitor} other {visitors}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Are you sure you want to delete {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/es-ES.json b/src/lang/es-ES.json
index 85796f426e..bdcb3e0ad0 100644
--- a/src/lang/es-ES.json
+++ b/src/lang/es-ES.json
@@ -13,7 +13,6 @@
   "label.all-time": "Todos los tiempos",
   "label.analytics": "Analíticas",
   "label.average": "Media",
-  "label.visit-duration": "Tiempo promedio de visita",
   "label.back": "Atrás",
   "label.before": "Antes",
   "label.bounce-rate": "Porcentaje de rebote",
@@ -25,10 +24,12 @@
   "label.cities": "Ciudades",
   "label.city": "Ciudad",
   "label.clear-all": "Limpiar todo",
+  "label.compare": "Compare",
   "label.confirm": "Confirmar",
   "label.confirm-password": "Confirmar contraseña",
   "label.contains": "Contiene",
   "label.continue": "Continuar",
+  "label.count": "Count",
   "label.countries": "Países",
   "label.country": "País",
   "label.create": "Crear",
@@ -37,6 +38,7 @@
   "label.create-user": "Crear usuario",
   "label.created": "Creado",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Contraseña actual",
   "label.custom-range": "Intervalo personalizado",
   "label.dashboard": "Panel de control",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Editar panel",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "Habilitar compartir URL",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Evento",
   "label.event-data": "Datos de evento",
   "label.events": "Eventos",
+  "label.exit": "Exit URL",
   "label.false": "Falso",
   "label.field": "Campo",
   "label.fields": "Campos",
@@ -75,8 +80,13 @@
   "label.filters": "Filtros",
   "label.funnel": "Funnel",
   "label.funnel-description": "Comprender conversión y abandono de usuarios.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Mayor que",
   "label.greater-than-equals": "Mayor que o igual a",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Profundice en sus datos mediante el uso de segmentos y filtros.",
   "label.is": "Es igual a",
@@ -85,6 +95,8 @@
   "label.is-set": "Está establecido",
   "label.join": "Unir",
   "label.join-team": "Unirse al equipo",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Idioma",
   "label.languages": "Idiomas",
   "label.laptop": "Portátil",
@@ -98,6 +110,7 @@
   "label.login": "Iniciar sesión",
   "label.logout": "Cerrar sesión",
   "label.manage": "Administrar",
+  "label.manager": "Manager",
   "label.max": "Máx",
   "label.member": "Miembro",
   "label.members": "Miembros",
@@ -120,7 +133,11 @@
   "label.pages": "Páginas",
   "label.password": "Contraseña",
   "label.powered-by": "Analíticas de {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Perfil",
+  "label.property": "Property",
   "label.queries": "Consultas",
   "label.query": "Consulta",
   "label.query-parameters": "Parámetros de petición",
@@ -152,11 +169,13 @@
   "label.settings": "Ajustes",
   "label.share-url": "Compartir URL",
   "label.single-day": "Un solo día",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Suma",
   "label.tablet": "Tableta",
   "label.team": "Equipo",
   "label.team-id": "ID del equipo",
+  "label.team-manager": "Team manager",
   "label.team-member": "Miembro del equipo",
   "label.team-name": "Nombre del equipo",
   "label.team-owner": "Admin. del equipo",
@@ -196,6 +215,7 @@
   "label.view-only": "Ver sólo",
   "label.views": "Vistas",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Tiempo promedio de visita",
   "label.visitors": "Visitantes",
   "label.visits": "Visits",
   "label.website": "Sitio web",
@@ -205,6 +225,7 @@
   "label.yesterday": "Ayer",
   "message.action-confirmation": "Escriba {confirmation} en el cuadro a continuación para confirmar.",
   "message.active-users": "{x} {x, plural, one {activo} other {activos}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "¿Seguro que quieres eliminar {target}?",
   "message.confirm-leave": "¿Seguro que quieres abandonar {target}?",
   "message.confirm-remove": "¿Estás seguro de que desea eliminar {target}?",
diff --git a/src/lang/fa-IR.json b/src/lang/fa-IR.json
index cab0ffa41e..8eb2df241d 100644
--- a/src/lang/fa-IR.json
+++ b/src/lang/fa-IR.json
@@ -13,7 +13,6 @@
   "label.all-time": "همه زمان",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "میانگین زمان بازدید",
   "label.back": "برگشت",
   "label.before": "Before",
   "label.bounce-rate": "نرخ Bounce",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "تایید رمز",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "کشورها",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "رمز فعلی",
   "label.custom-range": "محدوده‌ی دلخواه",
   "label.dashboard": "داشبورد",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edit dashboard",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "فعال کردن اشتراک گذاری URL",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "رویدادها",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "زبان",
   "label.languages": "زبان‌ها",
   "label.laptop": "لپ‌تاپ",
@@ -98,6 +110,7 @@
   "label.login": "ورود",
   "label.logout": "خروج",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "صفحه‌ها",
   "label.password": "رمز",
   "label.powered-by": "قدرت گرفته توسط {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "پروفایل",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "تنظیمات",
   "label.share-url": "به اشتراک گذاری URL",
   "label.single-day": "یک روز",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "تبلت",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "بازدید",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "میانگین زمان بازدید",
   "label.visitors": "بازدیدکننده",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Yesterday",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} هم اکنون {x, plural, one {یک} other {از میان}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "آیا مطمئن هستید می‌خواهید {target} را حذف کنید?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/fi-FI.json b/src/lang/fi-FI.json
index 0389cf82b3..f6d18b35e5 100644
--- a/src/lang/fi-FI.json
+++ b/src/lang/fi-FI.json
@@ -13,7 +13,6 @@
   "label.all-time": "Alusta lähtien",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "Keskimääräinen vierailuaika",
   "label.back": "Takaisin",
   "label.before": "Before",
   "label.bounce-rate": "Välitön poistuminen",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "Vahvista salasana",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "Maat",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Nykyinen salasana",
   "label.custom-range": "Mukautettu ajanjakso",
   "label.dashboard": "Ohjauspaneeli",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edit dashboard",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "Ota jakamisen URL-osoite käyttöön",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Tapahtumat",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Kieli",
   "label.languages": "Kielet",
   "label.laptop": "Kannettava tietokone",
@@ -98,6 +110,7 @@
   "label.login": "Kirjaudu sisään",
   "label.logout": "Kirjaudu ulos",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "Sivut",
   "label.password": "Salasana",
   "label.powered-by": "Voimanlähteenä {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Profiili",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "Asetukset",
   "label.share-url": "Jaa URL",
   "label.single-day": "Yksi päivä",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "Tabletti",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "Näyttökerrat",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Keskimääräinen vierailuaika",
   "label.visitors": "Vierailijat",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Yesterday",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} {x, plural, one {vierailija} other {vierailijaa}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Haluatko varmasti poistaa sivuston {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/fo-FO.json b/src/lang/fo-FO.json
index d13d40ec60..98646d2832 100644
--- a/src/lang/fo-FO.json
+++ b/src/lang/fo-FO.json
@@ -13,7 +13,6 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "Miðal vitjurnartíð ",
   "label.back": "Aftur",
   "label.before": "Before",
   "label.bounce-rate": "Bounce prosenttal",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "Vátta loyniorð",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "Lond",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Núverandi loyniorð",
   "label.custom-range": "Tillaga  spenni",
   "label.dashboard": "Yvirlitsskíggi",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edit dashboard",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "Virkja deili leinki",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Hendingar/tiltøk",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "Fartelda",
@@ -98,6 +110,7 @@
   "label.login": "Rita inn",
   "label.logout": "Rita út",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "Síðir",
   "label.password": "Loyniorð",
   "label.powered-by": "Powered by {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Vangi",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "Stillingar",
   "label.share-url": "Deil leinku",
   "label.single-day": "Einkultur dagur",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "Teldil",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "Sýningar",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Miðal vitjurnartíð ",
   "label.visitors": "Vitjandi",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Yesterday",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} í løtuni {x, plural, one {vitjandi} other { vitjandi }}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Ert tú sikkur at tú ynskir at strika {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/fr-FR.json b/src/lang/fr-FR.json
index b52ae875ab..23c6652588 100644
--- a/src/lang/fr-FR.json
+++ b/src/lang/fr-FR.json
@@ -13,7 +13,6 @@
   "label.all-time": "Toutes les données",
   "label.analytics": "Analytics",
   "label.average": "Moyenne",
-  "label.visit-duration": "Temps de visite moyen",
   "label.back": "Retour",
   "label.before": "Avant",
   "label.bounce-rate": "Taux de rebond",
@@ -25,10 +24,12 @@
   "label.cities": "Villes",
   "label.city": "Ville",
   "label.clear-all": "Réinitialiser",
+  "label.compare": "Compare",
   "label.confirm": "Confirmer",
   "label.confirm-password": "Confirmation du mot de passe",
   "label.contains": "Contient",
   "label.continue": "Continuer",
+  "label.count": "Count",
   "label.countries": "Pays",
   "label.country": "Pays",
   "label.create": "Créer",
@@ -37,6 +38,7 @@
   "label.create-user": "Créer un utilisateur",
   "label.created": "Créé",
   "label.created-by": "Crée par",
+  "label.current": "Current",
   "label.current-password": "Mot de passe actuel",
   "label.custom-range": "Période personnalisée",
   "label.dashboard": "Tableau de bord",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Modifier le tableau de bord",
   "label.edit-member": "Modifier le membre",
   "label.enable-share-url": "Activer l'URL de partage",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Évènement",
   "label.event-data": "Données d'évènements",
   "label.events": "Évènements",
+  "label.exit": "Exit URL",
   "label.false": "Faux",
   "label.field": "Champ",
   "label.fields": "Champs",
@@ -75,8 +80,13 @@
   "label.filters": "Filtres",
   "label.funnel": "Entonnoir",
   "label.funnel-description": "Suivi des conversions et des taux d'abandons.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Supérieur à",
   "label.greater-than-equals": "Supérieur ou égal à",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Analyse précise des données en utilisant des segments et des filtres.",
   "label.is": "Est",
@@ -85,6 +95,8 @@
   "label.is-set": "Est défini",
   "label.join": "Rejoindre",
   "label.join-team": "Rejoindre une équipe",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Langue",
   "label.languages": "Langues",
   "label.laptop": "Portable",
@@ -98,6 +110,7 @@
   "label.login": "Connexion",
   "label.logout": "Déconnexion",
   "label.manage": "Gérer",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Membre",
   "label.members": "Membres",
@@ -120,7 +133,11 @@
   "label.pages": "Pages",
   "label.password": "Mot de passe",
   "label.powered-by": "Propulsé par {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.property": "Property",
   "label.queries": "Requêtes",
   "label.query": "Requête",
   "label.query-parameters": "Paramètres de requête",
@@ -152,11 +169,13 @@
   "label.settings": "Paramètres",
   "label.share-url": "URL de partage",
   "label.single-day": "Journée",
+  "label.start-step": "Start Step",
   "label.steps": "Étapes",
   "label.sum": "Somme",
   "label.tablet": "Tablette",
   "label.team": "Équipe",
   "label.team-id": "ID d'équipe",
+  "label.team-manager": "Team manager",
   "label.team-member": "Membre de l'équipe",
   "label.team-name": "Nom de l'équipe",
   "label.team-owner": "Propriétaire de l'équipe",
@@ -196,6 +215,7 @@
   "label.view-only": "Consultation",
   "label.views": "Vues",
   "label.views-per-visit": "Vues par visite",
+  "label.visit-duration": "Temps de visite moyen",
   "label.visitors": "Visiteurs",
   "label.visits": "Visites",
   "label.website": "Site",
@@ -205,6 +225,7 @@
   "label.yesterday": "Hier",
   "message.action-confirmation": "Taper {confirmation} ci-dessous pour confirmer.",
   "message.active-users": "{x} {x, plural, one {visiteur} other {visiteurs}} actuellement",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Êtes-vous sûr de vouloir supprimer {target} ?",
   "message.confirm-leave": "Êtes-vous sûr de vouloir quitter {target} ?",
   "message.confirm-remove": "Êtes-vous sûr de vouloir retirer {target} ?",
diff --git a/src/lang/ga-ES.json b/src/lang/ga-ES.json
index cdf1393240..9e04806129 100644
--- a/src/lang/ga-ES.json
+++ b/src/lang/ga-ES.json
@@ -13,7 +13,6 @@
   "label.all-time": "Sempre",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "Tempo medio de visita",
   "label.back": "Atrás",
   "label.before": "Before",
   "label.bounce-rate": "Proporción de rebote",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "Confirmar contrasinal",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "Países",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Contrasinal actual",
   "label.custom-range": "Rango personalizado",
   "label.dashboard": "Taboleiro",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edit dashboard",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "Activar URL de compartición",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Eventos",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Idioma",
   "label.languages": "Idiomas",
   "label.laptop": "Portátil",
@@ -98,6 +110,7 @@
   "label.login": "Acceder",
   "label.logout": "Pechar sesión",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "Páxinas",
   "label.password": "Contrasinal",
   "label.powered-by": "Funciona grazas a {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Perfil",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "Axustes",
   "label.share-url": "Compartir URL",
   "label.single-day": "Un só día",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "Tableta",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "Visualizacións",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Tempo medio de visita",
   "label.visitors": "Visitantes",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Yesterday",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} actual {x, plural, one {visitante} other {visitantes}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Tes a certeza de querer eliminar {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/he-IL.json b/src/lang/he-IL.json
index f513c807e9..584d5f5d43 100644
--- a/src/lang/he-IL.json
+++ b/src/lang/he-IL.json
@@ -13,7 +13,6 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "זמן ביקור ממוצע",
   "label.back": "חזרה",
   "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "אישור סיסמה",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "מדינות",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "סיסמה נוכחית",
   "label.custom-range": "טווח מותאם",
   "label.dashboard": "דשבורד",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edit dashboard",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "הפעלת URL שיתוף",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "אירועים",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "לפטופ",
@@ -98,6 +110,7 @@
   "label.login": "התחברות",
   "label.logout": "התנתקות",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "דפים",
   "label.password": "סיסמה",
   "label.powered-by": "Powered by {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "פרופיל",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "הגדרות",
   "label.share-url": "שיתוף URL",
   "label.single-day": "יום בודד",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "טאבלט",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "צפיות",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "זמן ביקור ממוצע",
   "label.visitors": "מבקרים",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Yesterday",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} נוכחיים {x, plural, one {מבקר} other {מבקרים}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "האם באמת למחוק את {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/hi-IN.json b/src/lang/hi-IN.json
index 2e2e79f717..0cf024e332 100644
--- a/src/lang/hi-IN.json
+++ b/src/lang/hi-IN.json
@@ -13,7 +13,6 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "औसत दृश्य समय",
   "label.back": "पीछे",
   "label.before": "Before",
   "label.bounce-rate": "उछाल दर",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "पासवर्ड की पुष्टि कीजिये",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "देश",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "वर्तमान पासवर्ड",
   "label.custom-range": "कस्टम रेंज",
   "label.dashboard": "नियंत्रण-पट्ट",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edit dashboard",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "शेयर URL सक्षम करें",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "स्पर्धाएँ",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "लैपटॉप",
@@ -98,6 +110,7 @@
   "label.login": "लॉग इन",
   "label.logout": "लॉग आउट",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "पृष्ठों",
   "label.password": "पासवर्ड",
   "label.powered-by": "{name} द्वारा संचालित",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "प्रोफ़ाइल",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "समायोजन",
   "label.share-url": "यूआरएल साझा करें",
   "label.single-day": "एक दिन",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "टैबलेट",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "दृश्य",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "औसत दृश्य समय",
   "label.visitors": "आगंतुकों",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Yesterday",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} मौजूद {x, plural, one {आगंतुक} other {आगंतुकों}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "क्या आप वाकई में {target} हटाना चाहते हैं?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/hr-HR.json b/src/lang/hr-HR.json
index 62adcbcb58..bc69742664 100644
--- a/src/lang/hr-HR.json
+++ b/src/lang/hr-HR.json
@@ -13,7 +13,6 @@
   "label.all-time": "Svo vrijeme",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "Visit duration",
   "label.back": "Natrag ",
   "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "Potvrdi lozinku",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "Countries",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Trenutna lozinka",
   "label.custom-range": "Prilagođeni raspon",
   "label.dashboard": "Nadzorna ploča",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edit dashboard",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "Omogući dijeljenje poveznice",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Podaci događaja",
   "label.events": "Events",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Jezik",
   "label.languages": "Languages",
   "label.laptop": "Laptop",
@@ -98,6 +110,7 @@
   "label.login": "Prijava",
   "label.logout": "Odjava",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "Pages",
   "label.password": "Lozinka",
   "label.powered-by": "Powered by {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "Postavke",
   "label.share-url": "Podijeli poveznicu",
   "label.single-day": "Jedan dan",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "Views",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Visit duration",
   "label.visitors": "Visitors",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Jučer",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} Trenutno {x, plural, one {posjetitelj} other {posjetitelja}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Jeste li sigurni da želite obrisati {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/hu-HU.json b/src/lang/hu-HU.json
index 74f0ce6fe0..111ce00fa1 100644
--- a/src/lang/hu-HU.json
+++ b/src/lang/hu-HU.json
@@ -13,7 +13,6 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "Átlagos látogatási idő",
   "label.back": "Vissza",
   "label.before": "Before",
   "label.bounce-rate": "Visszafordulási arány",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "Jelszó megerősítése",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "Országok",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Jelenlegi jelszó",
   "label.custom-range": "Egyedi tartomány",
   "label.dashboard": "Áttekintés",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edit dashboard",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "URL-megosztás engedélyezése",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Események",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "Laptop",
@@ -98,6 +110,7 @@
   "label.login": "Bejelentkezés",
   "label.logout": "Kijelentkezés",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "Oldalak",
   "label.password": "Jelszó",
   "label.powered-by": "Működteti az {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "Beállítások",
   "label.share-url": "URL megosztása",
   "label.single-day": "Egy nap",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "Táblagép",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "Megtekintések",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Átlagos látogatási idő",
   "label.visitors": "Látogatók",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Yesterday",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} {x, plural, one {látogató} other {latógató}} jelenleg",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Biztos, hogy törölni szeretnéd {target} elemet?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/id-ID.json b/src/lang/id-ID.json
index faf773157b..0f2c705aa0 100644
--- a/src/lang/id-ID.json
+++ b/src/lang/id-ID.json
@@ -13,7 +13,6 @@
   "label.all-time": "Semua waktu",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "Waktu kunjungan rata-rata",
   "label.back": "Kembali",
   "label.before": "Before",
   "label.bounce-rate": "Rasio pentalan",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "Konfirmasi kata sandi",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "Negara",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Kata sandi sekarang",
   "label.custom-range": "Rentang khusus",
   "label.dashboard": "Dasbor",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edit dashboard",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "Aktifkan URL berbagi",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Perihal",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Bahasa",
   "label.languages": "Bahasa",
   "label.laptop": "Laptop",
@@ -98,6 +110,7 @@
   "label.login": "Masuk",
   "label.logout": "Keluar",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "Halaman",
   "label.password": "Kata sandi",
   "label.powered-by": "Didukung oleh {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "Pengaturan",
   "label.share-url": "Bagikan URL",
   "label.single-day": "Sehari",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "Tampilan",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Waktu kunjungan rata-rata",
   "label.visitors": "Pengunjung",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Yesterday",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} pengunjung saat ini",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Apakah kamu yakin ingin menghapus {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/it-IT.json b/src/lang/it-IT.json
index 084f86eef0..3e73781894 100644
--- a/src/lang/it-IT.json
+++ b/src/lang/it-IT.json
@@ -13,7 +13,6 @@
   "label.all-time": "Sempre",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "Tempo medio di visita",
   "label.back": "Indietro",
   "label.before": "Before",
   "label.bounce-rate": "Frequenza di rimbalzo",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "Conferma password",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "Nazioni",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Password attuale",
   "label.custom-range": "Personalizzato",
   "label.dashboard": "Pannello di Controllo",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edit dashboard",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "Abilita URL di condivisione",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Eventi",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Lingua",
   "label.languages": "Lingue",
   "label.laptop": "Portatile",
@@ -98,6 +110,7 @@
   "label.login": "Accedi",
   "label.logout": "Esci",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "Pagine",
   "label.password": "Password",
   "label.powered-by": "Powered by {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Profilo",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "Impostazioni",
   "label.share-url": "Condividi link",
   "label.single-day": "Singolo giorno",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "Visualizzazioni",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Tempo medio di visita",
   "label.visitors": "Visitatori",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Ieri",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} {x, plural, one {visitatore} other {visitatori}} online",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Sei sicuro di voler eliminare {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/ja-JP.json b/src/lang/ja-JP.json
index 5c8747ba97..ef0cce1dd6 100644
--- a/src/lang/ja-JP.json
+++ b/src/lang/ja-JP.json
@@ -13,7 +13,6 @@
   "label.all-time": "すべての時間帯",
   "label.analytics": "アナリティクス",
   "label.average": "平均",
-  "label.visit-duration": "平均滞在時間",
   "label.back": "戻る",
   "label.before": "直前",
   "label.bounce-rate": "直帰率",
@@ -25,10 +24,12 @@
   "label.cities": "都市",
   "label.city": "都市",
   "label.clear-all": "すべてクリア",
+  "label.compare": "Compare",
   "label.confirm": "確認",
   "label.confirm-password": "パスワード(確認)",
   "label.contains": "コンテンツ",
   "label.continue": "続ける",
+  "label.count": "Count",
   "label.countries": "国名",
   "label.country": "国",
   "label.create": "作成",
@@ -37,6 +38,7 @@
   "label.create-user": "ユーザーの作成",
   "label.created": "作成されました",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "現在のパスワード",
   "label.custom-range": "範囲指定",
   "label.dashboard": "ダッシュボード",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "ダッシュボードの編集",
   "label.edit-member": "メンバーの編集",
   "label.enable-share-url": "共有URLを有効にする",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "イベント",
   "label.event-data": "イベントデータ",
   "label.events": "イベント",
+  "label.exit": "Exit URL",
   "label.false": "偽",
   "label.field": "フィールド",
   "label.fields": "フィールド",
@@ -75,8 +80,13 @@
   "label.filters": "フィルター",
   "label.funnel": "ファネル",
   "label.funnel-description": "ユーザーのコンバージョン率と離脱率を分析します。",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "超過",
   "label.greater-than-equals": "以上",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "インサイト",
   "label.insights-description": "セグメントとフィルタを使用して、データをさらに詳しく分析します。",
   "label.is": "に等しい",
@@ -85,6 +95,8 @@
   "label.is-set": "設定済み",
   "label.join": "参加",
   "label.join-team": "チームに参加",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "言語",
   "label.languages": "言語",
   "label.laptop": "ノートPC",
@@ -98,6 +110,7 @@
   "label.login": "ログイン",
   "label.logout": "ログアウト",
   "label.manage": "管理",
+  "label.manager": "Manager",
   "label.max": "最大",
   "label.member": "メンバー",
   "label.members": "メンバー",
@@ -120,7 +133,11 @@
   "label.pages": "ページ",
   "label.password": "パスワード",
   "label.powered-by": "Powered by {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "プロフィール",
+  "label.property": "Property",
   "label.queries": "クエリ",
   "label.query": "クエリ",
   "label.query-parameters": "クエリパラメーター",
@@ -152,11 +169,13 @@
   "label.settings": "設定",
   "label.share-url": "共有URL",
   "label.single-day": "一日",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "合計",
   "label.tablet": "タブレット",
   "label.team": "チーム",
   "label.team-id": "チームID",
+  "label.team-manager": "Team manager",
   "label.team-member": "チームメンバー",
   "label.team-name": "チーム名",
   "label.team-owner": "チーム所有者",
@@ -196,6 +215,7 @@
   "label.view-only": "表示のみ",
   "label.views": "表示",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "平均滞在時間",
   "label.visitors": "訪問者",
   "label.visits": "Visits",
   "label.website": "Webサイト",
@@ -205,6 +225,7 @@
   "label.yesterday": "昨日",
   "message.action-confirmation": "承認する場合は、下のフォームに「{confirmation}」と入力してください。",
   "message.active-users": "{x} {x, plural, one {アクティブな訪問者} other {アクティブな訪問者}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "{target}を削除してもよろしいですか？",
   "message.confirm-leave": "{target}から離脱してもよろしいですか？",
   "message.confirm-remove": "{target}を削除してもよろしいですか？",
diff --git a/src/lang/km-KH.json b/src/lang/km-KH.json
index 6bb9f47638..9a374a0673 100644
--- a/src/lang/km-KH.json
+++ b/src/lang/km-KH.json
@@ -13,7 +13,6 @@
   "label.all-time": "គ្រប់ពេល",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "មើលជាមធ្យម",
   "label.back": "ថយក្រោយ",
   "label.before": "Before",
   "label.bounce-rate": "ចំនួនវិលត្រឡប់",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "បញ្ជាក់ពាក្យសម្ងាត់",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "ប្រទេស",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "ពាក្យសម្ងាត់បច្ចុប្បន្ន",
   "label.custom-range": "កំណត់ដោយខ្លួនឯង",
   "label.dashboard": "ផ្ទាំងគ្រប់គ្រង",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "កែផ្ទាំងគ្រប់គ្រង",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "បើកការចែករំលែក URL",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "ព្រឹត្តិការណ៍",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "ភាសា",
   "label.languages": "ភាសា",
   "label.laptop": "កុំព្យូទ័រយួរដៃ",
@@ -98,6 +110,7 @@
   "label.login": "Login",
   "label.logout": "ចេញ",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "ទំព័រ",
   "label.password": "ពាក្យសម្ងាត់​",
   "label.powered-by": "ដំណើរការដោយ {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "ប្រវត្តិរូប",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "ប៉ារ៉ាម៉ែត្រ Query",
@@ -152,11 +169,13 @@
   "label.settings": "ការកំណត់",
   "label.share-url": "ចែករំលែក URL",
   "label.single-day": "ថ្ងៃតែមួយ",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "ថេប្លេត",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "អ្នកចូលមើល",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "មើលជាមធ្យម",
   "label.visitors": "អ្នកទស្សនា",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "ម្សិលមិញ",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "មានអ្នកមើល {x} នាក់ ឥលូវនេះ",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "តើអ្នកប្រាកដថាចង់លុប {target} ទេ?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/ko-KR.json b/src/lang/ko-KR.json
index 1bfb9ca068..c1a3093371 100644
--- a/src/lang/ko-KR.json
+++ b/src/lang/ko-KR.json
@@ -13,7 +13,6 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "평균 방문 시간",
   "label.back": "뒤로",
   "label.before": "Before",
   "label.bounce-rate": "이탈률",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "비밀번호 확인",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "국가",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "현재 비밀번호",
   "label.custom-range": "범위 지정",
   "label.dashboard": "대시보드",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edit dashboard",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "URL 공유 활성화",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "이벤트",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "노트북",
@@ -98,6 +110,7 @@
   "label.login": "로그인",
   "label.logout": "로그아웃",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "페이지",
   "label.password": "비밀번호",
   "label.powered-by": "이 시스템은 {name}에서 구동되고 있습니다.",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "프로필",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "설정",
   "label.share-url": "공유 URL",
   "label.single-day": "하루",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "태블릿",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "조회수",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "평균 방문 시간",
   "label.visitors": "방문객",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Yesterday",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x}명의 사용자가 보는 중입니다.",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "{target}을(를) 삭제하시겠습니까?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/lt-LT.json b/src/lang/lt-LT.json
index 2fc0f5e13b..f96e643e64 100644
--- a/src/lang/lt-LT.json
+++ b/src/lang/lt-LT.json
@@ -13,7 +13,6 @@
   "label.all-time": "Visas laikotarpis",
   "label.analytics": "Analytics",
   "label.average": "Vidurkis",
-  "label.visit-duration": "Vidutinė vizito trukmė",
   "label.back": "Atgal",
   "label.before": "Prieš",
   "label.bounce-rate": "Atmetimo rodiklis",
@@ -25,10 +24,12 @@
   "label.cities": "Miestai",
   "label.city": "Miestas",
   "label.clear-all": "Išvalyti visus",
+  "label.compare": "Compare",
   "label.confirm": "Patvirtinti",
   "label.confirm-password": "Patvirtinti slaptažodį",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "Šalys",
   "label.country": "Šalis",
   "label.create": "Sukurti",
@@ -37,6 +38,7 @@
   "label.create-user": "Sukurti vartotoją",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Dabartinis slaptažodis",
   "label.custom-range": "Pasirinktinis intervalas",
   "label.dashboard": "Švieslentė",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Redaguoti švieslentę",
   "label.edit-member": "Redaguoti narį",
   "label.enable-share-url": "Įjungti bendrinimą su nuoroda",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Įvykis",
   "label.event-data": "Įvykių duomenys",
   "label.events": "Įvykiai",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Laukelis",
   "label.fields": "Laukeliai",
@@ -75,8 +80,13 @@
   "label.filters": "Filtrai",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Įžvalgos",
   "label.insights-description": "Pasinerkite giliau į savo duomenis naudodami segmentus ir filtrus.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Prisijungti",
   "label.join-team": "Prisijungti į komandą",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Kalba",
   "label.languages": "Kalbos",
   "label.laptop": "Laptop",
@@ -98,6 +110,7 @@
   "label.login": "Prisijungti",
   "label.logout": "Atsijungti",
   "label.manage": "Tvarkyti",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Narys",
   "label.members": "Nariai",
@@ -120,7 +133,11 @@
   "label.pages": "Puslapiai",
   "label.password": "Slaptažodis",
   "label.powered-by": "Powered by {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Profilis",
+  "label.property": "Property",
   "label.queries": "Užklausos",
   "label.query": "Užklausa",
   "label.query-parameters": "Užklausų parametrai",
@@ -152,11 +169,13 @@
   "label.settings": "Nustatymai",
   "label.share-url": "Pasidalinti nuoroda",
   "label.single-day": "Viena diena",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Suma",
   "label.tablet": "Planšetė",
   "label.team": "Komanda",
   "label.team-id": "Komandos ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Komandos narys",
   "label.team-name": "Komandos pavadinimas",
   "label.team-owner": "Komandos savininkas",
@@ -196,6 +215,7 @@
   "label.view-only": "Tik peržiūrėti",
   "label.views": "Peržiūros",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Vidutinė vizito trukmė",
   "label.visitors": "Lankytojai",
   "label.visits": "Visits",
   "label.website": "Svetainė",
@@ -205,6 +225,7 @@
   "label.yesterday": "Vakar",
   "message.action-confirmation": "Įrašykite {confirmation} žemiau, kad patvirtintumėte.",
   "message.active-users": "{x, plural, =0 {# aktyvių vartotojų} zero {# aktyvių vartotojų} one {# aktyvus vartotojas} other {# aktyvūs vartotojai}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Ar esate tikri, jog norite ištrinti svetainę {target}?",
   "message.confirm-leave": "Ar esate tikri, jog norite palikti {target}?",
   "message.confirm-remove": "Ar esate tikri, jog norite ištrinti {target}?",
diff --git a/src/lang/mn-MN.json b/src/lang/mn-MN.json
index 340f4bcd7b..47e08bca3f 100644
--- a/src/lang/mn-MN.json
+++ b/src/lang/mn-MN.json
@@ -13,7 +13,6 @@
   "label.all-time": "Бүх цаг үеийн",
   "label.analytics": "Analytics",
   "label.average": "Дундаж",
-  "label.visit-duration": "Зочилсон дундаж хугацаа",
   "label.back": "Буцах",
   "label.before": "Өмнө",
   "label.bounce-rate": "Нэг хуудас үзээд гарсан",
@@ -25,10 +24,12 @@
   "label.cities": "Хотууд",
   "label.city": "Хот",
   "label.clear-all": "Бүгдийг арилгах",
+  "label.compare": "Compare",
   "label.confirm": "Батлах",
   "label.confirm-password": "Шинэ нууц үгээ давтах",
   "label.contains": "Агуулах",
   "label.continue": "Үргэлжлүүлэх",
+  "label.count": "Count",
   "label.countries": "Улс",
   "label.country": "Улс",
   "label.create": "Үүсгэх",
@@ -37,6 +38,7 @@
   "label.create-user": "Хэрэглэгч үүсгэх",
   "label.created": "Үүсгэсэн",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Ашиглаж буй нууц үг",
   "label.custom-range": "Дурын хугацаа",
   "label.dashboard": "Хянах самбар",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Хянах самбар засах",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "Хуваалцах холбоос идэвхжүүлэх",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Үйлдэл",
   "label.event-data": "Үйлдлийн өгөгдөл",
   "label.events": "Үйлдэл",
+  "label.exit": "Exit URL",
   "label.false": "Худал",
   "label.field": "Талбар",
   "label.fields": "Талбар",
@@ -75,8 +80,13 @@
   "label.filters": "Шүүлтүүр",
   "label.funnel": "Цутгал",
   "label.funnel-description": "Хэрэглэгчдийн шилжилт, уналтын хэмжээг шинжлэх.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Их",
   "label.greater-than-equals": "Их буюу тэнцүү",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Шинжлэх",
   "label.insights-description": "Өгөгдлөө хэсэгчлэн хуваах, шүүх байдлаар задлан шинжлэх.",
   "label.is": "Бол",
@@ -85,6 +95,8 @@
   "label.is-set": "Утга оноосон",
   "label.join": "Нэгдэх",
   "label.join-team": "Багт нэгдэх",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Хэл",
   "label.languages": "Хэл",
   "label.laptop": "Зөөврийн компьютер",
@@ -98,6 +110,7 @@
   "label.login": "Нэвтрэх",
   "label.logout": "Гарах",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Гишүүд",
@@ -120,7 +133,11 @@
   "label.pages": "Хуудас",
   "label.password": "Нууц үг",
   "label.powered-by": "{name} дээр суурилсан",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Бүртгэл",
+  "label.property": "Property",
   "label.queries": "Query-нүүд",
   "label.query": "Query",
   "label.query-parameters": "Query параметр",
@@ -152,11 +169,13 @@
   "label.settings": "Тохиргоо",
   "label.share-url": "Хуваалцах холбоос",
   "label.single-day": "Нэг өдөр",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Нийлбэр",
   "label.tablet": "Таблет",
   "label.team": "Баг",
   "label.team-id": "Багийн ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Багийн гишүүн",
   "label.team-name": "Багийн нэр",
   "label.team-owner": "Багийн эзэмшигч",
@@ -196,6 +215,7 @@
   "label.view-only": "Зөвхөн үзэх",
   "label.views": "Үзсэн",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Зочилсон дундаж хугацаа",
   "label.visitors": "Зочин",
   "label.visits": "Visits",
   "label.website": "Веб",
@@ -205,6 +225,7 @@
   "label.yesterday": "Өчигдөр",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "одоо {x} {x, plural, one {зочин} other {зочин}} байна",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Та {target}-г устгахдаа итгэлтэй байна уу?",
   "message.confirm-leave": "Та {target}-с гарахдаа итгэлтэй байна уу?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/ms-MY.json b/src/lang/ms-MY.json
index 73124486ca..bf28b05cfe 100644
--- a/src/lang/ms-MY.json
+++ b/src/lang/ms-MY.json
@@ -13,7 +13,6 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "Purata tempoh masa lawatan",
   "label.back": "Kembali",
   "label.before": "Before",
   "label.bounce-rate": "Kadar lantunan",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "Sahkan kata laluan",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "Negara",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Kata laluan semasa",
   "label.custom-range": "Julat khas",
   "label.dashboard": "Papan pemuka",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edit dashboard",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "Aktifkan url berkongsi",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Peristiwa",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "Laptop",
@@ -98,6 +110,7 @@
   "label.login": "Log masuk",
   "label.logout": "Log keluar",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "Halaman",
   "label.password": "Kata laluan",
   "label.powered-by": "Disediakan oleh {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "Tetapan",
   "label.share-url": "Kongsikan URL",
   "label.single-day": "Satu hari",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "Lawatan",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Purata tempoh masa lawatan",
   "label.visitors": "Pelawat",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Yesterday",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} semasa {x, plural, one {pelawat} other {pelawat}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Pastikah anda ingin memadam {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/my-MM.json b/src/lang/my-MM.json
index 8883c71e46..dffbe43e48 100644
--- a/src/lang/my-MM.json
+++ b/src/lang/my-MM.json
@@ -13,7 +13,6 @@
   "label.all-time": "အချိန်အစမှအခုထိ",
   "label.analytics": "အန်နလစ်တစ်",
   "label.average": "ပျမ်းမျှ",
-  "label.visit-duration": "ဝဘက်ဘ်ဆိုဒ်တွင် ပျမ်းမျှကုန်ဆုံးချိန်",
   "label.back": "နောက်သို့",
   "label.before": "မတိုင်မီ",
   "label.bounce-rate": "Bounce နှုန်း",
@@ -25,10 +24,12 @@
   "label.cities": "မြို့များ",
   "label.city": "City",
   "label.clear-all": "အားလုံးကိုဖျက်မည်",
+  "label.compare": "Compare",
   "label.confirm": "အတည်ပြုသည်",
   "label.confirm-password": "စကားဝှက်အတည်ပြုသည်",
   "label.contains": "ပါဝင်သည်",
   "label.continue": "ဆက်သွားမည်",
+  "label.count": "Count",
   "label.countries": "နိုင်ငံများ",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "အသုံးပြုသူထည့်မည်",
   "label.created": "ပြုလုပ်ပြီးသော",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "လက်ရှိစကားဝှက်",
   "label.custom-range": "အချိန်အပိုင်းအခြားရွေးရန်",
   "label.dashboard": "ဒက်ရှ်ဘုတ်",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "ဒက်ရှ်ဘုတ်ကို ပြုပြင်မည်",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "ဝေငှခြင်းကိုလင့်ကို ဖွင့်မည်",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "အဖြစ်အပျက်",
   "label.event-data": "အဖြစ်အပျက် ဒေတာ",
   "label.events": "အဖြစ်အပျက်များ",
+  "label.exit": "Exit URL",
   "label.false": "မှားသည်",
   "label.field": "Field အမည်",
   "label.fields": "Field အမည်များ",
@@ -75,8 +80,13 @@
   "label.filters": "Filter များ",
   "label.funnel": "ဖန်နယ်",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "ထက်ပို၍ကြီးသည်",
   "label.greater-than-equals": "ထက်ပို၍ကြီးသည်သို့မဟုတ်တူသည်",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "အသေးစိတ်သိမြင်နိုင်ရန်",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "ဝင်မည်",
   "label.join-team": "အသင်းဝင်မည်",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "ဘာသာစကား",
   "label.languages": "ဘာသာစကားများ",
   "label.laptop": "လက်တော့ပ်",
@@ -98,6 +110,7 @@
   "label.login": "လော့ဂ်အင်",
   "label.logout": "လော့ဂ်အောက်လုပ်မည်",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "အများဆုံး",
   "label.member": "Member",
   "label.members": "အဖွဲ့ဝင်များ",
@@ -120,7 +133,11 @@
   "label.pages": "စာမျက်နှာများ",
   "label.password": "စကားဝှက်",
   "label.powered-by": "{name} ထောက်ပံ့သည်",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "ပရိုဖိုင်း",
+  "label.property": "Property",
   "label.queries": "Queries (ကွာရီများ)",
   "label.query": "Query (ကွာရီ)",
   "label.query-parameters": "Query parameters (ကွာရီပါရာမီတာများ)",
@@ -152,11 +169,13 @@
   "label.settings": "ဆက်တင်များ",
   "label.share-url": "URL ကိုရှဲမည်",
   "label.single-day": "တစ်ရက်အတွင်း",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "ပေါင်းလဒ်",
   "label.tablet": "တက်ဘလက်",
   "label.team": "အသင်း",
   "label.team-id": "အသင်း အိုင်ဒီ",
+  "label.team-manager": "Team manager",
   "label.team-member": "အသင်းဝင်",
   "label.team-name": "Team name",
   "label.team-owner": "အသင်းကိုပိုင်ဆိုင်သူ",
@@ -196,6 +215,7 @@
   "label.view-only": "ဝင်ရောက်ကြည့်ရှုမှုများသာ",
   "label.views": "ဝင်ရောက်ကြည့်ရှုမှုများ",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "ဝဘက်ဘ်ဆိုဒ်တွင် ပျမ်းမျှကုန်ဆုံးချိန်",
   "label.visitors": "ဝင်ရောက်ကြည့်ရှုသူများ",
   "label.visits": "Visits",
   "label.website": "ဝက်ဘ်ဆိုဒ်",
@@ -205,6 +225,7 @@
   "label.yesterday": "မနေ့က",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} လက်ရှိအသုံးပြုနေသူ {x, plural, one {ယောက်} other {ယောက်}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "{target} ကို ဖျက်ရန် သေချာပါသလား?",
   "message.confirm-leave": "{target} ကို ထွက်ရန် သေချာပါသလား?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/nb-NO.json b/src/lang/nb-NO.json
index 4915972361..ca360d0950 100644
--- a/src/lang/nb-NO.json
+++ b/src/lang/nb-NO.json
@@ -13,7 +13,6 @@
   "label.all-time": "Noensinne",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "Gjennomsnittlig besøkstid",
   "label.back": "Tilbake",
   "label.before": "Before",
   "label.bounce-rate": "Avvisningsfrekvens",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "Godkjenn passord",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "Land",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Nåværende passord",
   "label.custom-range": "Egendefinert utvalg",
   "label.dashboard": "Dashbord",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edit dashboard",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "Aktiver delings-URL",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Arrangementer",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Språk",
   "label.languages": "Språk",
   "label.laptop": "Bærbar",
@@ -98,6 +110,7 @@
   "label.login": "Logg inn",
   "label.logout": "Logg ut",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "Sider",
   "label.password": "Passord",
   "label.powered-by": "Drevet av {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "Innstillinger",
   "label.share-url": "Del URL",
   "label.single-day": "Enkelt dag",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "Nettbrett",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "Visninger",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Gjennomsnittlig besøkstid",
   "label.visitors": "Besøkende",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Yesterday",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} {x, plural, one {besøkende} other {besøkende}} nå",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Er du sikker på at du vil slette {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/nl-NL.json b/src/lang/nl-NL.json
index 1d11ed5a5e..6208147309 100644
--- a/src/lang/nl-NL.json
+++ b/src/lang/nl-NL.json
@@ -13,7 +13,6 @@
   "label.all-time": "Onbeperkt",
   "label.analytics": "Analytics",
   "label.average": "Gemiddelde",
-  "label.visit-duration": "Gemiddelde bezoektijd",
   "label.back": "Terug",
   "label.before": "Voor",
   "label.bounce-rate": "Bouncepercentage",
@@ -25,10 +24,12 @@
   "label.cities": "Steden",
   "label.city": "Stad",
   "label.clear-all": "Filters wissen",
+  "label.compare": "Compare",
   "label.confirm": "Bevestigen",
   "label.confirm-password": "Wachtwoord bevestigen",
   "label.contains": "Bevat",
   "label.continue": "Doorgaan",
+  "label.count": "Count",
   "label.countries": "Landen",
   "label.country": "Land",
   "label.create": "Aanmaken",
@@ -37,6 +38,7 @@
   "label.create-user": "Gebruiker maken",
   "label.created": "Gemaakt",
   "label.created-by": "Gemaakt Door",
+  "label.current": "Current",
   "label.current-password": "Huidig wachtwoord",
   "label.custom-range": "Aangepast bereik",
   "label.dashboard": "Overzicht",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Dashboard aanpassen",
   "label.edit-member": "Gebruiker aanpassen",
   "label.enable-share-url": "Sta delen via openbare URL toe",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Gebeurtenis",
   "label.event-data": "Datum gebeurtenis",
   "label.events": "Gebeurtenissen",
+  "label.exit": "Exit URL",
   "label.false": "Onwaar",
   "label.field": "Veld",
   "label.fields": "Velden",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Ontdek de conversie- en uitvalpercentages van gebruikers.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Groter dan",
   "label.greater-than-equals": "Groter of gelijk aan",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Inzichten",
   "label.insights-description": "Verken je gegevens verder door segmenten en filters te gebruiken.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is ingesteld",
   "label.join": "Lid worden",
   "label.join-team": "Word lid van een team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Taal",
   "label.languages": "Talen",
   "label.laptop": "Laptop",
@@ -98,6 +110,7 @@
   "label.login": "Inloggen",
   "label.logout": "Uitloggen",
   "label.manage": "Beheren",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Gebruiker",
   "label.members": "Gebruikers",
@@ -120,7 +133,11 @@
   "label.pages": "Pagina's",
   "label.password": "Wachtwoord",
   "label.powered-by": "mogelijk gemaakt door {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Profiel",
+  "label.property": "Property",
   "label.queries": "Parameters",
   "label.query": "Query",
   "label.query-parameters": "URL-parameters",
@@ -152,11 +169,13 @@
   "label.settings": "Instellingen",
   "label.share-url": "URL delen",
   "label.single-day": "Enkele dag",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Som",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Teamlid",
   "label.team-name": "Teamnaam",
   "label.team-owner": "Teameigenaar",
@@ -196,6 +215,7 @@
   "label.view-only": "Alleen inzien",
   "label.views": "Weergaven",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Gemiddelde bezoektijd",
   "label.visitors": "Bezoekers",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Gisteren",
   "message.action-confirmation": "Typ {confirmation} in het veld hieronder om te bevestigen.",
   "message.active-users": "{x} actieve {x, plural, one {bezoeker} other {bezoekers}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Weet je zeker dat je {target} wilt verwijderen?",
   "message.confirm-leave": "Weet je zeker dat je {target} wilt verlaten?",
   "message.confirm-remove": "Weet je zeker dat je {target} wilt verwijderen?",
diff --git a/src/lang/pl-PL.json b/src/lang/pl-PL.json
index e5a6deb21d..8068d9b360 100644
--- a/src/lang/pl-PL.json
+++ b/src/lang/pl-PL.json
@@ -13,7 +13,6 @@
   "label.all-time": "Cały czas",
   "label.analytics": "Analityka",
   "label.average": "Średnia",
-  "label.visit-duration": "Średni czas wizyty",
   "label.back": "Powrót",
   "label.before": "Przed",
   "label.bounce-rate": "Współczynnik odrzuceń",
@@ -25,10 +24,12 @@
   "label.cities": "Miasta",
   "label.city": "Miasto",
   "label.clear-all": "Wyczyść wszystko",
+  "label.compare": "Compare",
   "label.confirm": "Potwierdź",
   "label.confirm-password": "Potwierdź hasło",
   "label.contains": "Zawiera",
   "label.continue": "Kontynuuj",
+  "label.count": "Count",
   "label.countries": "Kraje",
   "label.country": "Państwo",
   "label.create": "Utwórz",
@@ -37,6 +38,7 @@
   "label.create-user": "Utwórz użytkownika",
   "label.created": "Utworzony",
   "label.created-by": "Utworzony przez",
+  "label.current": "Current",
   "label.current-password": "Aktualne hasło",
   "label.custom-range": "Zakres niestandardowy",
   "label.dashboard": "Panel",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edytuj panel",
   "label.edit-member": "Edytuj członka",
   "label.enable-share-url": "Włącz udostępnianie adresu URL",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Zdarzenie",
   "label.event-data": "Dane zdarzenia",
   "label.events": "Zdarzenia",
+  "label.exit": "Exit URL",
   "label.false": "Fałsz",
   "label.field": "Pole",
   "label.fields": "Pola",
@@ -75,8 +80,13 @@
   "label.filters": "Filtry",
   "label.funnel": "Lejek",
   "label.funnel-description": "Zrozum wskaźniki konwersji i odpływu użytkowników.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Większe niż",
   "label.greater-than-equals": "Większe niż lub równe",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Analiza",
   "label.insights-description": "Poznaj lepiej swoje dane, korzystając z segmentów i filtrów.",
   "label.is": "Równe",
@@ -85,6 +95,8 @@
   "label.is-set": "Ustawione",
   "label.join": "Dołącz",
   "label.join-team": "Dołącz do zespołu",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Język",
   "label.languages": "Języki",
   "label.laptop": "Laptop",
@@ -98,6 +110,7 @@
   "label.login": "Zaloguj się",
   "label.logout": "Wyloguj",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Maks",
   "label.member": "Członek",
   "label.members": "Członkowie",
@@ -120,7 +133,11 @@
   "label.pages": "Strony",
   "label.password": "Hasło",
   "label.powered-by": "Obsługiwane przez {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.property": "Property",
   "label.queries": "Zapytania",
   "label.query": "Zapytanie",
   "label.query-parameters": "Parametry zapytania",
@@ -152,11 +169,13 @@
   "label.settings": "Ustawienia",
   "label.share-url": "Udostępnij adres URL",
   "label.single-day": "W tym dniu",
+  "label.start-step": "Start Step",
   "label.steps": "Kroki",
   "label.sum": "Suma",
   "label.tablet": "Tablet",
   "label.team": "Zespół",
   "label.team-id": "ID zespołu",
+  "label.team-manager": "Team manager",
   "label.team-member": "Członek zespołu",
   "label.team-name": "Nazwa zespołu",
   "label.team-owner": "Właściciel zespołu",
@@ -196,6 +215,7 @@
   "label.view-only": "Tylko do odczytu",
   "label.views": "Wyświetlenia",
   "label.views-per-visit": "Widoków na wizytę",
+  "label.visit-duration": "Średni czas wizyty",
   "label.visitors": "Odwiedzający",
   "label.visits": "Odwiedząjący",
   "label.website": "Witryna",
@@ -205,6 +225,7 @@
   "label.yesterday": "Wczoraj",
   "message.action-confirmation": "Wpisz {confirmation}, aby potwierdzić.",
   "message.active-users": "{x} aktualnie {x, plural, one {odwiedzający} other {odwiedzających}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Czy na pewno chcesz usunąć {target}?",
   "message.confirm-leave": "Czy na pewno chcesz opuścić {target}?",
   "message.confirm-remove": "Czy na pewno chcesz usunąć {target}?",
diff --git a/src/lang/pt-BR.json b/src/lang/pt-BR.json
index b84deb2d3c..c1f9c708ff 100644
--- a/src/lang/pt-BR.json
+++ b/src/lang/pt-BR.json
@@ -13,7 +13,6 @@
   "label.all-time": "Todos os períodos",
   "label.analytics": "Análise",
   "label.average": "Média",
-  "label.visit-duration": "Tempo médio de visita",
   "label.back": "Voltar",
   "label.before": "Antes",
   "label.bounce-rate": "Taxa de rejeição",
@@ -25,10 +24,12 @@
   "label.cities": "Cidades",
   "label.city": "Cidade",
   "label.clear-all": "Limpar tudo",
+  "label.compare": "Compare",
   "label.confirm": "Confirmar",
   "label.confirm-password": "Confirmar senha",
   "label.contains": "Contém",
   "label.continue": "Continuar",
+  "label.count": "Count",
   "label.countries": "Países",
   "label.country": "País",
   "label.create": "Criar",
@@ -37,6 +38,7 @@
   "label.create-user": "Criar usuário",
   "label.created": "Criado",
   "label.created-by": "Criado por",
+  "label.current": "Current",
   "label.current-password": "Senha atual",
   "label.custom-range": "Período personalizado",
   "label.dashboard": "Painel",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Editar painel",
   "label.edit-member": "Editar membro",
   "label.enable-share-url": "Ativar link para compartilhar",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Evento",
   "label.event-data": "Dados do evento",
   "label.events": "Tipos de eventos",
+  "label.exit": "Exit URL",
   "label.false": "Não",
   "label.field": "Campo",
   "label.fields": "Campos",
@@ -75,8 +80,13 @@
   "label.filters": "Filtros",
   "label.funnel": "Funil",
   "label.funnel-description": "Entenda a taxa de conversão e abandono dos seus usuários.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Maior que",
   "label.greater-than-equals": "Maior ou igual a",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Explore seus dados em mais detalhes usando filtros",
   "label.is": "É igual a",
@@ -85,6 +95,8 @@
   "label.is-set": "Definido",
   "label.join": "Participar",
   "label.join-team": "Participar da equipe",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Idioma",
   "label.languages": "Idiomas",
   "label.laptop": "Notebook",
@@ -98,6 +110,7 @@
   "label.login": "Entrar",
   "label.logout": "Sair",
   "label.manage": "Gerenciar",
+  "label.manager": "Manager",
   "label.max": "Máximo",
   "label.member": "Membro",
   "label.members": "Membros",
@@ -120,7 +133,11 @@
   "label.pages": "Páginas",
   "label.password": "Senha",
   "label.powered-by": "Desenvolvido por {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Perfil",
+  "label.property": "Property",
   "label.queries": "Consultas",
   "label.query": "Consulta",
   "label.query-parameters": "Parâmetros da consulta",
@@ -152,11 +169,13 @@
   "label.settings": "Configurações",
   "label.share-url": "Link para compartilhar",
   "label.single-day": "Apenas um dia",
+  "label.start-step": "Start Step",
   "label.steps": "Etapas",
   "label.sum": "Soma",
   "label.tablet": "Tablet",
   "label.team": "Equipe",
   "label.team-id": "ID da equipe",
+  "label.team-manager": "Team manager",
   "label.team-member": "Membro da equipe",
   "label.team-name": "Nome da equipe",
   "label.team-owner": "Proprietário da equipe",
@@ -196,6 +215,7 @@
   "label.view-only": "Somente visualização",
   "label.views": "Visualizações",
   "label.views-per-visit": "Visualizações por visita",
+  "label.visit-duration": "Tempo médio de visita",
   "label.visitors": "Visitantes",
   "label.visits": "Visitas",
   "label.website": "Site",
@@ -205,6 +225,7 @@
   "label.yesterday": "Ontem",
   "message.action-confirmation": "Digite {confirmation} na caixa abaixo para confirmar.",
   "message.active-users": " Atualmente {x} usuários ativos",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Tem certeza de que deseja excluir {target}?",
   "message.confirm-leave": "Tem certeza de que deseja sair de {target}?",
   "message.confirm-remove": "Tem certeza que deseja remover {target}?",
diff --git a/src/lang/pt-PT.json b/src/lang/pt-PT.json
index 02504a9a4f..d497bb3a8f 100644
--- a/src/lang/pt-PT.json
+++ b/src/lang/pt-PT.json
@@ -13,7 +13,6 @@
   "label.all-time": "Todo o tempo",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "Tempo médio de visita",
   "label.back": "Voltar",
   "label.before": "Before",
   "label.bounce-rate": "Taxa de rejeição",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "Confirmar senha",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "Países",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Senha atual",
   "label.custom-range": "Intervalo personalizado",
   "label.dashboard": "Painel",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edit dashboard",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "Ativar link de partilha",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Eventos",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Língua",
   "label.languages": "Línguas",
   "label.laptop": "Portátil",
@@ -98,6 +110,7 @@
   "label.login": "Iniciar sessão",
   "label.logout": "Sair",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "Páginas",
   "label.password": "Senha",
   "label.powered-by": "Distribuído por {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Perfil",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "Definições",
   "label.share-url": "Partilhar link",
   "label.single-day": "Dia único",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "Visualizações",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Tempo médio de visita",
   "label.visitors": "Visitantes",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Yesterday",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} {x, plural, one {visitante} other {visitantes}} neste momento",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Tem a certeza que pretende eliminar {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/ro-RO.json b/src/lang/ro-RO.json
index e6c9cad45f..107303ae94 100644
--- a/src/lang/ro-RO.json
+++ b/src/lang/ro-RO.json
@@ -13,7 +13,6 @@
   "label.all-time": "Pentru tot timpul",
   "label.analytics": "Analytics",
   "label.average": "Mediu",
-  "label.visit-duration": "Timp mediu de vizitare",
   "label.back": "Înapoi",
   "label.before": "Înainte",
   "label.bounce-rate": "Rata de respingere",
@@ -25,10 +24,12 @@
   "label.cities": "Orașe",
   "label.city": "Oraș",
   "label.clear-all": "Șterge tot",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "Confirmare parolă",
   "label.contains": "Conține",
   "label.continue": "Continuă",
+  "label.count": "Count",
   "label.countries": "Țări",
   "label.country": "Țară",
   "label.create": "Crează",
@@ -37,6 +38,7 @@
   "label.create-user": "Crează utilizator",
   "label.created": "Creat",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Parola curentă",
   "label.custom-range": "Interval personalizat",
   "label.dashboard": "Tablou de bord",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Editare tablou de bord",
   "label.edit-member": "Editare membru",
   "label.enable-share-url": "Activare adresă URL de distribuire",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Eveniment",
   "label.event-data": "Date despre eveniment",
   "label.events": "Evenimente",
+  "label.exit": "Exit URL",
   "label.false": "Fals",
   "label.field": "Câmp",
   "label.fields": "Câmpuri",
@@ -75,8 +80,13 @@
   "label.filters": "Filtre",
   "label.funnel": "Parcursul utilizatorului",
   "label.funnel-description": "Înțelege rata de conversie și rata de abandon a utilizatorilor.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Mai mare decât",
   "label.greater-than-equals": "Mai mare sau egal cu",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Perspective",
   "label.insights-description": "Aprofundează datele utilizând segmente și filtre.",
   "label.is": "Este",
@@ -85,6 +95,8 @@
   "label.is-set": "Este setat",
   "label.join": "Alătură-te",
   "label.join-team": "Alătură-te echipei",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Limbă",
   "label.languages": "Limbi",
   "label.laptop": "Laptop",
@@ -98,6 +110,7 @@
   "label.login": "Autentificare",
   "label.logout": "Ieșire din cont",
   "label.manage": "Administrează",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Membru",
   "label.members": "Membri",
@@ -120,7 +133,11 @@
   "label.pages": "Pagini",
   "label.password": "Parolă",
   "label.powered-by": "Cu sprijinul {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.property": "Property",
   "label.queries": "Interogări",
   "label.query": "Interogare",
   "label.query-parameters": "Parametri de interogare",
@@ -152,11 +169,13 @@
   "label.settings": "Setări",
   "label.share-url": "Partajare URL",
   "label.single-day": "O singură zi",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sumă",
   "label.tablet": "Tabletă",
   "label.team": "Echipă",
   "label.team-id": "ID Echipa",
+  "label.team-manager": "Team manager",
   "label.team-member": "Membru echipă",
   "label.team-name": "Nume echipă",
   "label.team-owner": "Titular echipă",
@@ -196,6 +215,7 @@
   "label.view-only": "Doar vizualizare",
   "label.views": "Vizualizări",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Timp mediu de vizitare",
   "label.visitors": "Vizitatori",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Ieri",
   "message.action-confirmation": "Scrie {confirmation} în câmpul de mai jos pentru a confirma.",
   "message.active-users": "{x} {x, plural, one {vizitator activ} other {vizitatori activi}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Ești sigur că vrei să ștergi {target}?",
   "message.confirm-leave": "Ești sigur că vrei să părăsești {target}?",
   "message.confirm-remove": "Ești sigur că vrei să ștergi {target}?",
diff --git a/src/lang/ru-RU.json b/src/lang/ru-RU.json
index 25065a4fc3..535d22921d 100644
--- a/src/lang/ru-RU.json
+++ b/src/lang/ru-RU.json
@@ -13,7 +13,6 @@
   "label.all-time": "Все время",
   "label.analytics": "Аналитика",
   "label.average": "Average",
-  "label.visit-duration": "Среднее время посещения",
   "label.back": "Назад",
   "label.before": "Before",
   "label.bounce-rate": "Отказы",
@@ -25,10 +24,12 @@
   "label.cities": "Города",
   "label.city": "City",
   "label.clear-all": "Очистить все",
+  "label.compare": "Compare",
   "label.confirm": "Подтвердить",
   "label.confirm-password": "Подтвердить пароль",
   "label.contains": "Contains",
   "label.continue": "Продолжить",
+  "label.count": "Count",
   "label.countries": "Страны",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Создать пользователя",
   "label.created": "Создано",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Текущий пароль",
   "label.custom-range": "Другой период",
   "label.dashboard": "Информационная панель",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Редактировать дашборд",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "Разрешить делиться ссылкой",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "События",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Присоединиться",
   "label.join-team": "Присоединиться к команде",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Язык",
   "label.languages": "Языки",
   "label.laptop": "Ноутбук",
@@ -98,6 +110,7 @@
   "label.login": "Войти",
   "label.logout": "Выйти",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Участники",
@@ -120,7 +133,11 @@
   "label.pages": "Страницы",
   "label.password": "Пароль",
   "label.powered-by": "На движке {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Профиль",
+  "label.property": "Property",
   "label.queries": "Запросы",
   "label.query": "Query",
   "label.query-parameters": "Параметры запроса",
@@ -152,11 +169,13 @@
   "label.settings": "Настройки",
   "label.share-url": "Поделиться ссылкой",
   "label.single-day": "Один день",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "Планшет",
   "label.team": "Команда",
   "label.team-id": "ID команды",
+  "label.team-manager": "Team manager",
   "label.team-member": "Член команды",
   "label.team-name": "Team name",
   "label.team-owner": "Владелец команды",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "Просмотры",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Среднее время посещения",
   "label.visitors": "Посетители",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Вчера",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} текущих посетителей",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Вы уверены, что хотите удалить {target}?",
   "message.confirm-leave": "Вы уверены, что хотите уйти {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/si-LK.json b/src/lang/si-LK.json
index d3dc4c4f44..03b42df782 100644
--- a/src/lang/si-LK.json
+++ b/src/lang/si-LK.json
@@ -13,7 +13,6 @@
   "label.all-time": "හැම වෙලාවෙම",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "Visit duration",
   "label.back": "ආපසු",
   "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "මුරපදය සත්‍යාපනය කරන්න",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "Countries",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "වත්මන් මුරපදය",
   "label.custom-range": "අභිරුචි පරාසය",
   "label.dashboard": "උපකරණ පුවරුව",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edit dashboard",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "බෙදාගැනීමේ URL සබල කරන්න",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "සිදුවීම් දත්ත",
   "label.events": "Events",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "භාෂාව",
   "label.languages": "Languages",
   "label.laptop": "Laptop",
@@ -98,6 +110,7 @@
   "label.login": "ලොග් වෙන්න",
   "label.logout": "පිටවීම",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "Pages",
   "label.password": "මුරපදය",
   "label.powered-by": "Powered by {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "පැතිකඩ",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "සැකසුම්",
   "label.share-url": "බෙදාගැනීමේ URL",
   "label.single-day": "තනි දවස",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "Views",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Visit duration",
   "label.visitors": "Visitors",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "ඊයේ",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} දැන් {x, plural, one {අමුත්තා} other {අමුත්තන්}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "{target} මකා දැමීම ගැන විශ්වාසද?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/sk-SK.json b/src/lang/sk-SK.json
index 10a547d12f..3d5b8fbb13 100644
--- a/src/lang/sk-SK.json
+++ b/src/lang/sk-SK.json
@@ -13,7 +13,6 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "Priemerný čas návštevy",
   "label.back": "Späť",
   "label.before": "Before",
   "label.bounce-rate": "Okamžité opustenie",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "Potvrdiť heslo",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "Zem",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Aktuálne heslo",
   "label.custom-range": "Vlastný rozsah",
   "label.dashboard": "Prehlad",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edit dashboard",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "Povoliť zdielanie URL",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Udalosti",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "Prenosný počítač",
@@ -98,6 +110,7 @@
   "label.login": "Prihlásiť",
   "label.logout": "Odhlásiť",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "Stránky",
   "label.password": "Heslo",
   "label.powered-by": "Powered by {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "Nastavenia",
   "label.share-url": "Zdielanie URL",
   "label.single-day": "Jeden deň",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "Zobrazení",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Priemerný čas návštevy",
   "label.visitors": "Návštevy",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Yesterday",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} aktuálne {x, plural, one {návštevník} other {návštěvníci}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Naozaj zmazať {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/sl-SI.json b/src/lang/sl-SI.json
index 0b3761f5bb..01fc7f30b4 100644
--- a/src/lang/sl-SI.json
+++ b/src/lang/sl-SI.json
@@ -13,7 +13,6 @@
   "label.all-time": "Ves čas",
   "label.analytics": "Analitika",
   "label.average": "Povprečno",
-  "label.visit-duration": "Povprečni čas obiska",
   "label.back": "Nazaj",
   "label.before": "Pred",
   "label.bounce-rate": "Odbojna stopnja",
@@ -25,10 +24,12 @@
   "label.cities": "Mesta",
   "label.city": "Mesto",
   "label.clear-all": "Počisti vse",
+  "label.compare": "Compare",
   "label.confirm": "Potrdi",
   "label.confirm-password": "Potrdi geslo",
   "label.contains": "Vsebuje",
   "label.continue": "Nadaljuj",
+  "label.count": "Count",
   "label.countries": "Države",
   "label.country": "Država",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Ustvari uporabnika",
   "label.created": "Ustvarjeno",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Trenutno geslo",
   "label.custom-range": "Obdobje po meri",
   "label.dashboard": "Nadzorna plošča",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Uredi nadzorno ploščo",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "Uredi povezavo za deljenje",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Dogodek",
   "label.event-data": "Podatki dogodka",
   "label.events": "Dogodki",
+  "label.exit": "Exit URL",
   "label.false": "Napačno",
   "label.field": "Polje",
   "label.fields": "Polja",
@@ -75,8 +80,13 @@
   "label.filters": "Filtri",
   "label.funnel": "Prodajni lijak",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Večje od",
   "label.greater-than-equals": "Večje ali enako kot",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Vpogled",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Je",
@@ -85,6 +95,8 @@
   "label.is-set": "Je nastavljeno",
   "label.join": "Pridruži se",
   "label.join-team": "Pridruži se ekipi",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Jezik",
   "label.languages": "Jeziki",
   "label.laptop": "Prenosni računalnik",
@@ -98,6 +110,7 @@
   "label.login": "Prijava",
   "label.logout": "Odjava",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Največ",
   "label.member": "Member",
   "label.members": "Člani",
@@ -120,7 +133,11 @@
   "label.pages": "Strani",
   "label.password": "Geslo",
   "label.powered-by": "Poganja {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.property": "Property",
   "label.queries": "Poizvedbe",
   "label.query": "Poizvedba",
   "label.query-parameters": "Parametri poizvedbe",
@@ -152,11 +169,13 @@
   "label.settings": "Nastavitve",
   "label.share-url": "Deli povezavo",
   "label.single-day": "En dan",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Seštevek",
   "label.tablet": "Tablični računalnik",
   "label.team": "Ekipa",
   "label.team-id": "ID ekipe",
+  "label.team-manager": "Team manager",
   "label.team-member": "Član ekipe",
   "label.team-name": "Ime ekipe",
   "label.team-owner": "Lastnik ekipe",
@@ -196,6 +215,7 @@
   "label.view-only": "Samo ogledovanje",
   "label.views": "Obiski",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Povprečni čas obiska",
   "label.visitors": "Obiskovalci",
   "label.visits": "Visits",
   "label.website": "Spletno mesto",
@@ -205,6 +225,7 @@
   "label.yesterday": "Včeraj",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} trenutni {x, plural, one {obiskovalec} other {obiskovalcev}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Ste prepričani, da želite izbrisati {target}?",
   "message.confirm-leave": "Ste prepričani, da želite zapustiti {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/sv-SE.json b/src/lang/sv-SE.json
index 8a72e3d689..92c9df03c6 100644
--- a/src/lang/sv-SE.json
+++ b/src/lang/sv-SE.json
@@ -13,7 +13,6 @@
   "label.all-time": "Sedan början",
   "label.analytics": "Webbplats Analys",
   "label.average": "Genomsnitt",
-  "label.visit-duration": "Genomsnittlig besökstid",
   "label.back": "Tillbaka",
   "label.before": "Före",
   "label.bounce-rate": "Avvisningsfrekvens",
@@ -25,10 +24,12 @@
   "label.cities": "Städer",
   "label.city": "Stad",
   "label.clear-all": "Rensa alla",
+  "label.compare": "Compare",
   "label.confirm": "Bekräfta",
   "label.confirm-password": "Bekräfta lösenord",
   "label.contains": "Innehåller",
   "label.continue": "Fortsätt",
+  "label.count": "Count",
   "label.countries": "Länder",
   "label.country": "Land",
   "label.create": "Skapa",
@@ -37,6 +38,7 @@
   "label.create-user": "Skapa användare",
   "label.created": "Skapad",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Nuvarande lösenord",
   "label.custom-range": "Anpassat urval",
   "label.dashboard": "Översikt",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Redigera översikt",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "Aktivera delningslänk",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Händelse",
   "label.event-data": "Händelsedata",
   "label.events": "Händelser",
+  "label.exit": "Exit URL",
   "label.false": "Falskt",
   "label.field": "Fält",
   "label.fields": "Fältar",
@@ -75,8 +80,13 @@
   "label.filters": "Filter",
   "label.funnel": "Funnel",
   "label.funnel-description": "Förstå omvandlingen och bortfallsfrekvensen för användare.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Större än",
   "label.greater-than-equals": "Större än eller lika med",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insikter",
   "label.insights-description": "Dyk djupare in i din data genom att använda olika segment och filter.",
   "label.is": "Är",
@@ -85,6 +95,8 @@
   "label.is-set": "Är inställd",
   "label.join": "Gå med",
   "label.join-team": "Gå med i team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Språk",
   "label.languages": "Språk",
   "label.laptop": "Bärbar",
@@ -98,6 +110,7 @@
   "label.login": "Logga in",
   "label.logout": "Logga ut",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Medlemmar",
@@ -120,7 +133,11 @@
   "label.pages": "Sidor",
   "label.password": "Lösenord",
   "label.powered-by": "Drivs av {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.property": "Property",
   "label.queries": "Frågor",
   "label.query": "Fråga",
   "label.query-parameters": "Frågeparametrar",
@@ -152,11 +169,13 @@
   "label.settings": "Inställningar",
   "label.share-url": "Delningslänk",
   "label.single-day": "En dag",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Summa",
   "label.tablet": "Surfplatta",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team-medlem",
   "label.team-name": "Team namn",
   "label.team-owner": "Team-ägare",
@@ -196,6 +215,7 @@
   "label.view-only": "Endast visning",
   "label.views": "Visningar",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Genomsnittlig besökstid",
   "label.visitors": "Besökare",
   "label.visits": "Visits",
   "label.website": "Webbplats",
@@ -205,6 +225,7 @@
   "label.yesterday": "Igår",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} {x, plural, one {besökare} other {besökare}} just nu",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Är du säker på att du vill radera {target}?",
   "message.confirm-leave": "Är du säker på att du vill lämna {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/ta-IN.json b/src/lang/ta-IN.json
index 770bc2721d..99558b11d8 100644
--- a/src/lang/ta-IN.json
+++ b/src/lang/ta-IN.json
@@ -13,7 +13,6 @@
   "label.all-time": "All time",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "சராசரி வருகை நேரம்",
   "label.back": "பின்னால்",
   "label.before": "Before",
   "label.bounce-rate": "துள்ளல் விகிதம்",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "கடவுச்சொல்லை உறுதிப்படுத்தவும்",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "நாடுகள்",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "தற்போதைய கடவுச்சொல்",
   "label.custom-range": "தனிப்பயன் வேறுபாட்டெல்லை",
   "label.dashboard": "முகப்பு",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edit dashboard",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "கள முகவரியை பகிரலாம்",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "நிகழ்வுகள்",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "மடிக்கணினி",
@@ -98,6 +110,7 @@
   "label.login": "உள்நுழைய",
   "label.logout": "வெளியேறு",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "பக்கங்கள்",
   "label.password": "கடவுச்சொல்",
   "label.powered-by": "{name} ஆல் இயக்கப்படுகிறது",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "சுயவிவரம்",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "அமைப்புகள்",
   "label.share-url": "வலைத்தள களத்தைப் பகிரவும்",
   "label.single-day": "ஒரு நாள்",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "கையடக்க கணினி",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "பார்வைகள்",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "சராசரி வருகை நேரம்",
   "label.visitors": "பார்வையாளர்கள்",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Yesterday",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} தற்போதைய {x, plural, one {ஒன்று} other {மற்ற}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "நீங்கள் நிச்சயமாக {target} நீக்க விரும்புகிறீர்களா?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/th-TH.json b/src/lang/th-TH.json
index 6f8b4a327d..253f420c82 100644
--- a/src/lang/th-TH.json
+++ b/src/lang/th-TH.json
@@ -13,7 +13,6 @@
   "label.all-time": "ทุกช่วงเวลา",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "ระยะเวลาเข้าชมเฉลี่ย",
   "label.back": "ย้อนกลับ",
   "label.before": "Before",
   "label.bounce-rate": "อัตราตีกลับ",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "ยืนยันรหัสผ่าน",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "ประเทศ",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "รหัสผ่านปัจจุบัน",
   "label.custom-range": "กำหนดช่วงเวลา",
   "label.dashboard": "แดชบอร์ด",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edit dashboard",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "เปิดใช้งานการแชร์ลิงก์",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "เหตุการณ์",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "ภาษา",
   "label.languages": "ภาษา",
   "label.laptop": "แล็ปท็อป",
@@ -98,6 +110,7 @@
   "label.login": "เข้าสู่ระบบ",
   "label.logout": "ออกจากระบบ",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "หน้าเพจ",
   "label.password": "รหัสผ่าน",
   "label.powered-by": "ขับเคลื่อนโดย {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "โปรไฟล์",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "ตั้งค่า",
   "label.share-url": "แชร์ลิงก์",
   "label.single-day": "วันที่",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "แท็บเล็ต",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "การเข้าชม",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "ระยะเวลาเข้าชมเฉลี่ย",
   "label.visitors": "ผู้เข้าชม",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Yesterday",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "มีผู้ใช้งาน {x} {x, plural, one {คนในขณะนี้} other {คนในขณะนี้}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "คุณแน่ใจหรือไม่ว่าต้องการลบ {target} ?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/tr-TR.json b/src/lang/tr-TR.json
index 2859105240..49e71b9a31 100644
--- a/src/lang/tr-TR.json
+++ b/src/lang/tr-TR.json
@@ -7,13 +7,12 @@
   "label.add-member": "Üye ekle",
   "label.add-step": "Adım ekle",
   "label.add-website": "Web sitesi ekle",
-  "label.administrator": "Yönetici",
+  "label.admin": "Administrator",
   "label.after": "Sonra",
   "label.all": "Tümü",
   "label.all-time": "Tüm zamanlar",
   "label.analytics": "Analitik",
   "label.average": "Ortalama",
-  "label.visit-duration": "Ortalama ziyaret süresi",
   "label.back": "Geri",
   "label.before": "Önce",
   "label.bounce-rate": "Tek sayfa ziyaret oranı",
@@ -25,10 +24,12 @@
   "label.cities": "Şehirler",
   "label.city": "Şehir",
   "label.clear-all": "Hepsini temizle",
+  "label.compare": "Compare",
   "label.confirm": "Onayla",
   "label.confirm-password": "Parolayı onayla",
   "label.contains": "İçeriği",
   "label.continue": "Devam et",
+  "label.count": "Count",
   "label.countries": "Ülkeler",
   "label.country": "Ülke",
   "label.create": "Oluştur",
@@ -37,6 +38,7 @@
   "label.create-user": "Kullanıcı oluştur",
   "label.created": "Oluşturuldu",
   "label.created-by": "Tarafından oluşturldu",
+  "label.current": "Current",
   "label.current-password": "Mevcut parola",
   "label.custom-range": "Özelleştirilmiş aralık",
   "label.dashboard": "Kontrol Paneli",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Kontrol panelini düzenle",
   "label.edit-member": "Üyeyi düzenle",
   "label.enable-share-url": "Anonim paylaşım URL'i aktif",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Olay",
   "label.event-data": "Olay verisi",
   "label.events": "Olaylar",
+  "label.exit": "Exit URL",
   "label.false": "Yanlış",
   "label.field": "Alan",
   "label.fields": "Alanlar",
@@ -75,8 +80,13 @@
   "label.filters": "Filtreler",
   "label.funnel": "Huni",
   "label.funnel-description": "Kullanıcıların dönüşüm ve ayrılma oranlarını anlayın.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Büyüktür",
   "label.greater-than-equals": "Büyük veya eşittir",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Segmentleri ve filtreleri kullanarak verilerinizi derinlemesine inceleyin.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Ayarlandı",
   "label.join": "Katıl",
   "label.join-team": "Takıma katıl",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Dil",
   "label.languages": "Diller",
   "label.laptop": "Dizüstü",
@@ -98,6 +110,7 @@
   "label.login": "Giriş Yap",
   "label.logout": "Çıkış Yap",
   "label.manage": "Yönet",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Üye",
   "label.members": "Üyeler",
@@ -120,7 +133,11 @@
   "label.pages": "Sayfalar",
   "label.password": "Parola",
   "label.powered-by": "Sağlayıcı: {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.property": "Property",
   "label.queries": "Sorgular",
   "label.query": "Sorgu",
   "label.query-parameters": "Sorgu parametreleri",
@@ -152,11 +169,13 @@
   "label.settings": "Ayarlar",
   "label.share-url": "Paylaşım adresi",
   "label.single-day": "Tekil gün",
+  "label.start-step": "Start Step",
   "label.steps": "Adımlar",
   "label.sum": "Toplam",
   "label.tablet": "Tablet",
   "label.team": "Takım",
   "label.team-id": "Takım ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Takım üyesi",
   "label.team-name": "Takım ismi",
   "label.team-owner": "Takım sahibi",
@@ -196,6 +215,7 @@
   "label.view-only": "Sadece görünüm",
   "label.views": "Görüntüleme",
   "label.views-per-visit": "Ziyaret başına görüntüleme",
+  "label.visit-duration": "Ortalama ziyaret süresi",
   "label.visitors": "Ziyaretçi",
   "label.visits": "Ziyaretler",
   "label.website": "Web sitesi",
@@ -205,6 +225,7 @@
   "label.yesterday": "Dün",
   "message.action-confirmation": "Onaylamak için aşağıdaki kutuya {confirmation} yazın.",
   "message.active-users": "{x} aktif ziyaretçi",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "{target} kaydını silmek istediğinizden emin misiniz?",
   "message.confirm-leave": "{target} kaydından ayrılmak istediğinizden emin misiniz?",
   "message.confirm-remove": "{target} kaydını kaldırmak istediğinizden emin misiniz?",
diff --git a/src/lang/uk-UA.json b/src/lang/uk-UA.json
index 3d393d300e..43cff47906 100644
--- a/src/lang/uk-UA.json
+++ b/src/lang/uk-UA.json
@@ -13,7 +13,6 @@
   "label.all-time": "Весь час",
   "label.analytics": "Аналітика",
   "label.average": "Середнє",
-  "label.visit-duration": "Середній час візиту",
   "label.back": "Назад",
   "label.before": "Раніше",
   "label.bounce-rate": "Показник відмов",
@@ -25,10 +24,12 @@
   "label.cities": "Міста",
   "label.city": "Місто",
   "label.clear-all": "Очистити все",
+  "label.compare": "Compare",
   "label.confirm": "Підтвердити",
   "label.confirm-password": "Підтвердити пароль",
   "label.contains": "Містить",
   "label.continue": "Продовжити",
+  "label.count": "Count",
   "label.countries": "Країни",
   "label.country": "Країна",
   "label.create": "Створити",
@@ -37,6 +38,7 @@
   "label.create-user": "Створити користувача",
   "label.created": "Створено",
   "label.created-by": "Автор",
+  "label.current": "Current",
   "label.current-password": "Поточний пароль",
   "label.custom-range": "Довільний період",
   "label.dashboard": "Інформаційна панель",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Редагувати панель",
   "label.edit-member": "Редагувати учасника",
   "label.enable-share-url": "Дозволити ділитися посиланням",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Подія",
   "label.event-data": "Дані події",
   "label.events": "Події",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Поле",
   "label.fields": "Поля",
@@ -75,8 +80,13 @@
   "label.filters": "Фільтри",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Більше ніж",
   "label.greater-than-equals": "Більше або рівно",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Є",
@@ -85,6 +95,8 @@
   "label.is-set": "Встановлено",
   "label.join": "Приєднатись",
   "label.join-team": "Приєднатись до команди",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Мова",
   "label.languages": "Мови",
   "label.laptop": "Ноутбук",
@@ -98,6 +110,7 @@
   "label.login": "Увійти",
   "label.logout": "Вийти",
   "label.manage": "Керувати",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Учасник",
   "label.members": "Учасники",
@@ -120,7 +133,11 @@
   "label.pages": "Сторінки",
   "label.password": "Пароль",
   "label.powered-by": "На базі {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Профіль",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "Налаштування",
   "label.share-url": "Поділитися посилання",
   "label.single-day": "Один день",
+  "label.start-step": "Start Step",
   "label.steps": "Кроки",
   "label.sum": "Сума",
   "label.tablet": "Планшет",
   "label.team": "Команда",
   "label.team-id": "ID команди",
+  "label.team-manager": "Team manager",
   "label.team-member": "Учасник команди",
   "label.team-name": "Назва команди",
   "label.team-owner": "Власник команди",
@@ -196,6 +215,7 @@
   "label.view-only": "Лише для перегляду",
   "label.views": "Перегляди",
   "label.views-per-visit": "Перегляди за візит",
+  "label.visit-duration": "Середній час візиту",
   "label.visitors": "Відвідувачі",
   "label.visits": "Відвідування",
   "label.website": "Вебсайт",
@@ -205,6 +225,7 @@
   "label.yesterday": "Вчора",
   "message.action-confirmation": "Введі {confirmation} у поле нижче для підтвердження.",
   "message.active-users": "{x} поточних відвідувачів",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Ви впевнені, що бажаєте видалити {target}?",
   "message.confirm-leave": "Ви впевнені, що хочете покинути {target}?",
   "message.confirm-remove": "Ви впевнеі, що хочете видалити {target}?",
diff --git a/src/lang/ur-PK.json b/src/lang/ur-PK.json
index b7f018c739..7d649148ab 100644
--- a/src/lang/ur-PK.json
+++ b/src/lang/ur-PK.json
@@ -13,7 +13,6 @@
   "label.all-time": "تمام وقت",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "وزٹ کا اوسط وقت",
   "label.back": "پیچھے",
   "label.before": "Before",
   "label.bounce-rate": "اچھال کی شرح",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "پاس ورڈ کی تصدیق کریں",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "ممالک",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "موجودہ پاس ورڈ",
   "label.custom-range": "اپنی مرضی کی حد",
   "label.dashboard": "ڈیش بورڈ",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edit dashboard",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "شیئر یو آر ایل کو فعال کریں",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "واقعات",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Language",
   "label.languages": "زبانیں",
   "label.laptop": "لیپ ٹاپ",
@@ -98,6 +110,7 @@
   "label.login": "لاگ ان",
   "label.logout": "لاگ آوٹ",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "صفحات",
   "label.password": "پاس ورڈ",
   "label.powered-by": "تقویت یافتہ بذریعہ {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "پروفائل",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "ترتیبات",
   "label.share-url": "URL کا اشتراک کریں",
   "label.single-day": "ایک دن",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "ٹیبلیٹ",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "مناظر",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "وزٹ کا اوسط وقت",
   "label.visitors": "زائرین",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Yesterday",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} موجودہ {x, plural, one {زائر} other {زائرین}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "کیا آپ واقعی {target} کو حذف کرنا چاہتے ہیں؟",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/vi-VN.json b/src/lang/vi-VN.json
index dbf3bf95a2..1be8684bdb 100644
--- a/src/lang/vi-VN.json
+++ b/src/lang/vi-VN.json
@@ -13,7 +13,6 @@
   "label.all-time": "Toàn thời gian",
   "label.analytics": "Analytics",
   "label.average": "Average",
-  "label.visit-duration": "Thời gian truy cập trung bình",
   "label.back": "Quay về",
   "label.before": "Before",
   "label.bounce-rate": "Tỷ lệ thoát trang",
@@ -25,10 +24,12 @@
   "label.cities": "Cities",
   "label.city": "City",
   "label.clear-all": "Clear all",
+  "label.compare": "Compare",
   "label.confirm": "Confirm",
   "label.confirm-password": "Xác nhận mật khẩu",
   "label.contains": "Contains",
   "label.continue": "Continue",
+  "label.count": "Count",
   "label.countries": "Quốc gia",
   "label.country": "Country",
   "label.create": "Create",
@@ -37,6 +38,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "Mật khẩu hiện tại",
   "label.custom-range": "Phạm vi ngày tuỳ chọn",
   "label.dashboard": "Bảng điều khiển",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "Edit dashboard",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "Bật khả năng chia sẻ URL",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Sự kiện",
+  "label.exit": "Exit URL",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -75,8 +80,13 @@
   "label.filters": "Filters",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
   "label.is": "Is",
@@ -85,6 +95,8 @@
   "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "Language",
   "label.languages": "Ngôn ngữ",
   "label.laptop": "Laptop",
@@ -98,6 +110,7 @@
   "label.login": "Đăng nhập",
   "label.logout": "Đăng xuất",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "Max",
   "label.member": "Member",
   "label.members": "Members",
@@ -120,7 +133,11 @@
   "label.pages": "Trang",
   "label.password": "Mật khẩu",
   "label.powered-by": "Bản quyền thuộc về {name}",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "Hồ sơ",
+  "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
@@ -152,11 +169,13 @@
   "label.settings": "Cài đặt",
   "label.share-url": "Chia sẻ URL",
   "label.single-day": "Trong ngày",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "Máy tính bảng",
   "label.team": "Team",
   "label.team-id": "Team ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "Team member",
   "label.team-name": "Team name",
   "label.team-owner": "Team owner",
@@ -196,6 +215,7 @@
   "label.view-only": "View only",
   "label.views": "Xem",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "Thời gian truy cập trung bình",
   "label.visitors": "Khách",
   "label.visits": "Visits",
   "label.website": "Website",
@@ -205,6 +225,7 @@
   "label.yesterday": "Yesterday",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} hiện tại {x, plural, one {một} other {trên}}",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "Bạn có chắc chắn muốn xoá {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-remove": "Are you sure you want to remove {target}?",
diff --git a/src/lang/zh-CN.json b/src/lang/zh-CN.json
index 62ab1aeae6..bcdd3612b6 100644
--- a/src/lang/zh-CN.json
+++ b/src/lang/zh-CN.json
@@ -13,7 +13,6 @@
   "label.all-time": "所有时间段",
   "label.analytics": "分析",
   "label.average": "平均",
-  "label.visit-duration": "平均访问时间",
   "label.back": "返回",
   "label.before": "之前",
   "label.bounce-rate": "跳出率",
@@ -25,10 +24,12 @@
   "label.cities": "市/县",
   "label.city": "市/县",
   "label.clear-all": "清除全部",
+  "label.compare": "Compare",
   "label.confirm": "确认",
   "label.confirm-password": "确认密码",
   "label.contains": "包含",
   "label.continue": "继续",
+  "label.count": "Count",
   "label.countries": "国家/地区",
   "label.country": "国家/地区",
   "label.create": "创建",
@@ -37,6 +38,7 @@
   "label.create-user": "创建用户",
   "label.created": "已创建",
   "label.created-by": "创建者",
+  "label.current": "Current",
   "label.current-password": "目前密码",
   "label.custom-range": "自定义时间段",
   "label.dashboard": "仪表板",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "编辑仪表板",
   "label.edit-member": "编辑成员",
   "label.enable-share-url": "启用共享链接",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "事件",
   "label.event-data": "事件数据",
   "label.events": "行为类别",
+  "label.exit": "Exit URL",
   "label.false": "否",
   "label.field": "字段",
   "label.fields": "字段",
@@ -75,8 +80,13 @@
   "label.filters": "筛选",
   "label.funnel": "分析",
   "label.funnel-description": "了解用户的转换率和退出率。",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "大于",
   "label.greater-than-equals": "大于或等于",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "见解",
   "label.insights-description": "通过使用筛选器和划分时间段来更深入地研究数据。",
   "label.is": "等于",
@@ -85,6 +95,8 @@
   "label.is-set": "已设置",
   "label.join": "加入",
   "label.join-team": "加入团队",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "语言",
   "label.languages": "语言",
   "label.laptop": "笔记本",
@@ -98,6 +110,7 @@
   "label.login": "登录",
   "label.logout": "退出",
   "label.manage": "管理",
+  "label.manager": "Manager",
   "label.max": "最大",
   "label.member": "成员",
   "label.members": "成员",
@@ -120,7 +133,11 @@
   "label.pages": "网页",
   "label.password": "密码",
   "label.powered-by": "由 {name} 提供支持",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "个人资料",
+  "label.property": "Property",
   "label.queries": "查询",
   "label.query": "查询",
   "label.query-parameters": "查询参数",
@@ -152,11 +169,13 @@
   "label.settings": "设置",
   "label.share-url": "共享链接",
   "label.single-day": "单日",
+  "label.start-step": "Start Step",
   "label.steps": "步骤",
   "label.sum": "总和",
   "label.tablet": "平板",
   "label.team": "团队",
   "label.team-id": "团队 ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "团队成员",
   "label.team-name": "团队名称",
   "label.team-owner": "团队所有者",
@@ -196,6 +215,7 @@
   "label.view-only": "仅浏览量",
   "label.views": "浏览量",
   "label.views-per-visit": "每次访问的浏览量",
+  "label.visit-duration": "平均访问时间",
   "label.visitors": "访客",
   "label.visits": "访问次数",
   "label.website": "网站",
@@ -205,6 +225,7 @@
   "label.yesterday": "昨天",
   "message.action-confirmation": "在下面的框中输入 {confirmation} 以确认。",
   "message.active-users": "当前在线 {x} 人",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "你确定要删除 {target} 吗？",
   "message.confirm-leave": "你确定要离开 {target} 吗？",
   "message.confirm-remove": "您确定要移除 {target} ？",
diff --git a/src/lang/zh-TW.json b/src/lang/zh-TW.json
index edad4a5c23..9d8329e9af 100644
--- a/src/lang/zh-TW.json
+++ b/src/lang/zh-TW.json
@@ -13,7 +13,6 @@
   "label.all-time": "所有時間",
   "label.analytics": "分析",
   "label.average": "平均",
-  "label.visit-duration": "平均造訪時間",
   "label.back": "返回",
   "label.before": "之前",
   "label.bounce-rate": "跳出率",
@@ -25,10 +24,12 @@
   "label.cities": "城市",
   "label.city": "城市",
   "label.clear-all": "全部清除",
+  "label.compare": "Compare",
   "label.confirm": "確認",
   "label.confirm-password": "確認密碼",
   "label.contains": "包含",
   "label.continue": "繼續",
+  "label.count": "Count",
   "label.countries": "國家",
   "label.country": "國家",
   "label.create": "建立",
@@ -37,6 +38,7 @@
   "label.create-user": "建立使用者",
   "label.created": "已建立",
   "label.created-by": "Created By",
+  "label.current": "Current",
   "label.current-password": "目前密碼",
   "label.custom-range": "自訂範圍",
   "label.dashboard": "儀表板",
@@ -63,9 +65,12 @@
   "label.edit-dashboard": "編輯儀表板",
   "label.edit-member": "Edit member",
   "label.enable-share-url": "啟用分享網址",
+  "label.end-step": "End Step",
+  "label.entry": "Entry URL",
   "label.event": "事件",
   "label.event-data": "事件資料",
   "label.events": "事件",
+  "label.exit": "Exit URL",
   "label.false": "否",
   "label.field": "欄位",
   "label.fields": "欄位",
@@ -75,8 +80,13 @@
   "label.filters": "篩選器",
   "label.funnel": "漏斗",
   "label.funnel-description": "瞭解使用者的轉換率和退出率",
+  "label.goal": "Goal",
+  "label.goals": "Goals",
+  "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "大於",
   "label.greater-than-equals": "大於或等於",
+  "label.host": "Host",
+  "label.hosts": "Hosts",
   "label.insights": "洞察",
   "label.insights-description": "透過使用區段和篩選器來深入探索你的數據",
   "label.is": "是",
@@ -85,6 +95,8 @@
   "label.is-set": "已設定",
   "label.join": "加入",
   "label.join-team": "加入團隊",
+  "label.journey": "Journey",
+  "label.journey-description": "Understand how users nagivate through your website.",
   "label.language": "語言",
   "label.languages": "語言",
   "label.laptop": "筆記型電腦",
@@ -98,6 +110,7 @@
   "label.login": "登入",
   "label.logout": "登出",
   "label.manage": "Manage",
+  "label.manager": "Manager",
   "label.max": "最大",
   "label.member": "Member",
   "label.members": "成員",
@@ -120,7 +133,11 @@
   "label.pages": "頁面",
   "label.password": "密碼",
   "label.powered-by": "由 {name} 提供",
+  "label.previous": "Previous",
+  "label.previous-period": "Previous period",
+  "label.previous-year": "Previous year",
   "label.profile": "個人資料",
+  "label.property": "Property",
   "label.queries": "查詢",
   "label.query": "查詢",
   "label.query-parameters": "查詢參數",
@@ -152,11 +169,13 @@
   "label.settings": "設定",
   "label.share-url": "分享網址",
   "label.single-day": "單日",
+  "label.start-step": "Start Step",
   "label.steps": "Steps",
   "label.sum": "總和",
   "label.tablet": "平板",
   "label.team": "團隊",
   "label.team-id": "團隊 ID",
+  "label.team-manager": "Team manager",
   "label.team-member": "團隊成員",
   "label.team-name": "團隊名稱",
   "label.team-owner": "團隊擁有者",
@@ -196,6 +215,7 @@
   "label.view-only": "僅供檢視",
   "label.views": "檢視",
   "label.views-per-visit": "Views per visit",
+  "label.visit-duration": "平均造訪時間",
   "label.visitors": "訪客",
   "label.visits": "Visits",
   "label.website": "網站",
@@ -205,6 +225,7 @@
   "label.yesterday": "昨天",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "目前有 {x} 個活躍的訪客",
+  "message.collected-data": "Collected data",
   "message.confirm-delete": "您確定要刪除 {target} 嗎？",
   "message.confirm-leave": "您確定要離開 {target} 嗎？",
   "message.confirm-remove": "Are you sure you want to remove {target}?",

From 3f477c5d5077898bbac320484cedc07f21d2b2c1 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Wed, 19 Jun 2024 09:50:39 -0700
Subject: [PATCH 165/438] fix host filtering

---
 src/components/hooks/useFilterParams.ts         | 3 ++-
 src/lib/constants.ts                            | 2 +-
 src/lib/types.ts                                | 1 +
 src/pages/api/websites/[websiteId]/events.ts    | 4 +++-
 src/pages/api/websites/[websiteId]/metrics.ts   | 2 ++
 src/pages/api/websites/[websiteId]/pageviews.ts | 4 ++--
 src/pages/api/websites/[websiteId]/stats.ts     | 4 ++--
 7 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/components/hooks/useFilterParams.ts b/src/components/hooks/useFilterParams.ts
index ac934d8c83..343aea9fae 100644
--- a/src/components/hooks/useFilterParams.ts
+++ b/src/components/hooks/useFilterParams.ts
@@ -8,7 +8,7 @@ export function useFilterParams(websiteId: string) {
   const { startDate, endDate, unit } = dateRange;
   const { timezone } = useTimezone();
   const {
-    query: { url, referrer, title, query, os, browser, device, country, region, city, event },
+    query: { url, referrer, title, query, host, os, browser, device, country, region, city, event },
   } = useNavigation();
 
   return {
@@ -20,6 +20,7 @@ export function useFilterParams(websiteId: string) {
     referrer,
     title,
     query,
+    host,
     os,
     browser,
     device,
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index f7200ce312..a8b2b0f550 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -33,7 +33,7 @@ export const FILTER_REFERRERS = 'filter-referrers';
 export const FILTER_PAGES = 'filter-pages';
 
 export const UNIT_TYPES = ['year', 'month', 'hour', 'day', 'minute'];
-export const EVENT_COLUMNS = ['url', 'entry', 'exit', 'referrer', 'title', 'query', 'event', 'host'];
+export const EVENT_COLUMNS = ['url', 'entry', 'exit', 'referrer', 'title', 'query', 'event'];
 
 export const SESSION_COLUMNS = [
   'browser',
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 95758b6f69..94b983c6c5 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -181,6 +181,7 @@ export interface QueryFilters {
   referrer?: string;
   title?: string;
   query?: string;
+  host?: string;
   os?: string;
   browser?: string;
   device?: string;
diff --git a/src/pages/api/websites/[websiteId]/events.ts b/src/pages/api/websites/[websiteId]/events.ts
index b8aabdaded..08cade1208 100644
--- a/src/pages/api/websites/[websiteId]/events.ts
+++ b/src/pages/api/websites/[websiteId]/events.ts
@@ -1,6 +1,6 @@
 import { canViewWebsite } from 'lib/auth';
 import { useAuth, useCors, useValidate } from 'lib/middleware';
-import { getRequestFilters, getRequestDateRange } from 'lib/request';
+import { getRequestDateRange, getRequestFilters } from 'lib/request';
 import { NextApiRequestQueryBody, WebsiteMetric } from 'lib/types';
 import { TimezoneTest, UnitTypeTest } from 'lib/yup';
 import { NextApiResponse } from 'next';
@@ -17,6 +17,7 @@ export interface WebsiteEventsRequestQuery {
   url: string;
   referrer?: string;
   title?: string;
+  host?: string;
   os?: string;
   browser?: string;
   device?: string;
@@ -35,6 +36,7 @@ const schema = {
     url: yup.string(),
     referrer: yup.string(),
     title: yup.string(),
+    host: yup.string(),
     os: yup.string(),
     browser: yup.string(),
     device: yup.string(),
diff --git a/src/pages/api/websites/[websiteId]/metrics.ts b/src/pages/api/websites/[websiteId]/metrics.ts
index 4a881ef91b..3dac217b21 100644
--- a/src/pages/api/websites/[websiteId]/metrics.ts
+++ b/src/pages/api/websites/[websiteId]/metrics.ts
@@ -17,6 +17,7 @@ export interface WebsiteMetricsRequestQuery {
   referrer?: string;
   title?: string;
   query?: string;
+  host?: string;
   os?: string;
   browser?: string;
   device?: string;
@@ -40,6 +41,7 @@ const schema = {
     referrer: yup.string(),
     title: yup.string(),
     query: yup.string(),
+    host: yup.string(),
     os: yup.string(),
     browser: yup.string(),
     device: yup.string(),
diff --git a/src/pages/api/websites/[websiteId]/pageviews.ts b/src/pages/api/websites/[websiteId]/pageviews.ts
index bc363228b0..badb8a47da 100644
--- a/src/pages/api/websites/[websiteId]/pageviews.ts
+++ b/src/pages/api/websites/[websiteId]/pageviews.ts
@@ -17,8 +17,8 @@ export interface WebsitePageviewRequestQuery {
   timezone?: string;
   url?: string;
   referrer?: string;
-  host?: string;
   title?: string;
+  host?: string;
   os?: string;
   browser?: string;
   device?: string;
@@ -37,8 +37,8 @@ const schema = {
     timezone: TimezoneTest,
     url: yup.string(),
     referrer: yup.string(),
-    host: yup.string(),
     title: yup.string(),
+    host: yup.string(),
     os: yup.string(),
     browser: yup.string(),
     device: yup.string(),
diff --git a/src/pages/api/websites/[websiteId]/stats.ts b/src/pages/api/websites/[websiteId]/stats.ts
index 3f6c4e340b..0189627a59 100644
--- a/src/pages/api/websites/[websiteId]/stats.ts
+++ b/src/pages/api/websites/[websiteId]/stats.ts
@@ -14,10 +14,10 @@ export interface WebsiteStatsRequestQuery {
   endAt: number;
   url?: string;
   referrer?: string;
-  host?: string;
   title?: string;
   query?: string;
   event?: string;
+  host?: string;
   os?: string;
   browser?: string;
   device?: string;
@@ -34,10 +34,10 @@ const schema = {
     endAt: yup.number().required(),
     url: yup.string(),
     referrer: yup.string(),
-    host: yup.string(),
     title: yup.string(),
     query: yup.string(),
     event: yup.string(),
+    host: yup.string(),
     os: yup.string(),
     browser: yup.string(),
     device: yup.string(),

From 5bad3b63afa76ee9600a2798d30c2df3201a8ee6 Mon Sep 17 00:00:00 2001
From: Alex Kotliarskyi <alex.frantic@gmail.com>
Date: Wed, 19 Jun 2024 19:36:00 -0700
Subject: [PATCH 166/438] Update Ukrainian translations

---
 src/lang/uk-UA.json | 300 ++++++++++++++++++++++----------------------
 1 file changed, 150 insertions(+), 150 deletions(-)

diff --git a/src/lang/uk-UA.json b/src/lang/uk-UA.json
index 6b3e31d5c1..ea881595a4 100644
--- a/src/lang/uk-UA.json
+++ b/src/lang/uk-UA.json
@@ -1,246 +1,246 @@
 {
-  "label.access-code": "Access code",
+  "label.access-code": "Код доступу",
   "label.actions": "Дії",
-  "label.activity-log": "Activity log",
-  "label.add": "Add",
-  "label.add-description": "Add description",
-  "label.add-member": "Add member",
-  "label.add-step": "Add step",
+  "label.activity-log": "Журнал",
+  "label.add": "Додати",
+  "label.add-description": "Додати опис",
+  "label.add-member": "Додати учасника",
+  "label.add-step": "Додати крок",
   "label.add-website": "Додати сайт",
   "label.admin": "Адміністратор",
-  "label.after": "After",
+  "label.after": "Після",
   "label.all": "Всі",
   "label.all-time": "Весь час",
-  "label.analytics": "Analytics",
-  "label.average": "Average",
+  "label.analytics": "Аналітика",
+  "label.average": "Середній",
   "label.average-visit-time": "Середній час візиту",
   "label.back": "Назад",
-  "label.before": "Before",
+  "label.before": "До",
   "label.bounce-rate": "Показник відмов",
-  "label.breakdown": "Breakdown",
-  "label.browser": "Browser",
+  "label.breakdown": "Розподіл",
+  "label.browser": "Браузер",
   "label.browsers": "Браузери",
   "label.cancel": "Відмінити",
   "label.change-password": "Змінити пароль",
-  "label.cities": "Cities",
-  "label.city": "City",
-  "label.clear-all": "Clear all",
-  "label.confirm": "Confirm",
+  "label.cities": "Міста",
+  "label.city": "Місто",
+  "label.clear-all": "Очистити все",
+  "label.confirm": "Підтвердити",
   "label.confirm-password": "Підтвердити пароль",
-  "label.contains": "Contains",
-  "label.continue": "Continue",
+  "label.contains": "Містить",
+  "label.continue": "Продовжити",
   "label.countries": "Країни",
-  "label.country": "Country",
-  "label.create": "Create",
-  "label.create-report": "Create report",
-  "label.create-team": "Create team",
-  "label.create-user": "Create user",
-  "label.created": "Created",
-  "label.created-by": "Created By",
+  "label.country": "Країна",
+  "label.create": "Створити",
+  "label.create-report": "Створити звіт",
+  "label.create-team": "Створити команду",
+  "label.create-user": "Створити користувача",
+  "label.created": "Створено",
+  "label.created-by": "Створено",
   "label.current-password": "Поточний пароль",
   "label.custom-range": "Довільний період",
   "label.dashboard": "Інформаційна панель",
-  "label.data": "Data",
-  "label.date": "Date",
+  "label.data": "Дані",
+  "label.date": "Дата",
   "label.date-range": "Діапазон дат",
-  "label.day": "Day",
+  "label.day": "День",
   "label.default-date-range": "Діапазон дат за замовчуванням",
   "label.delete": "Видалити",
-  "label.delete-report": "Delete report",
-  "label.delete-team": "Delete team",
-  "label.delete-user": "Delete user",
+  "label.delete-report": "Видалити звіт",
+  "label.delete-team": "Видалити команду",
+  "label.delete-user": "Видалити користувача",
   "label.delete-website": "Видалити сайт",
-  "label.description": "Description",
+  "label.description": "Опис",
   "label.desktop": "Настільний ПК",
-  "label.details": "Details",
-  "label.device": "Device",
+  "label.details": "Деталі",
+  "label.device": "Пристрій",
   "label.devices": "Пристрої",
   "label.dismiss": "Відхилити",
-  "label.does-not-contain": "Does not contain",
+  "label.does-not-contain": "Не містить",
   "label.domain": "Домен",
-  "label.dropoff": "Dropoff",
+  "label.dropoff": "Відсів",
   "label.edit": "Редагувати",
-  "label.edit-dashboard": "Edit dashboard",
-  "label.edit-member": "Edit member",
+  "label.edit-dashboard": "Редагувати інформаційну панель",
+  "label.edit-member": "Редагувати учасника",
   "label.enable-share-url": "Дозволити ділитися посиланням",
-  "label.event": "Event",
-  "label.event-data": "Event data",
+  "label.event": "Подія",
+  "label.event-data": "Дані події",
   "label.events": "Події",
   "label.false": "False",
-  "label.field": "Field",
-  "label.fields": "Fields",
-  "label.filter": "Filter",
+  "label.field": "Поле",
+  "label.fields": "Поля",
+  "label.filter": "Фільтр",
   "label.filter-combined": "Об'єднані",
   "label.filter-raw": "Сирі дані",
-  "label.filters": "Filters",
-  "label.funnel": "Funnel",
-  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
-  "label.greater-than": "Greater than",
-  "label.greater-than-equals": "Greater than or equals",
-  "label.insights": "Insights",
-  "label.insights-description": "Dive deeper into your data by using segments and filters.",
-  "label.is": "Is",
-  "label.is-not": "Is not",
-  "label.is-not-set": "Is not set",
-  "label.is-set": "Is set",
-  "label.join": "Join",
-  "label.join-team": "Join team",
-  "label.language": "Language",
+  "label.filters": "Фільтри",
+  "label.funnel": "Воронка",
+  "label.funnel-description": "Зрозуміти рівень конверсії та відсіву користувачів.",
+  "label.greater-than": "Більше ніж",
+  "label.greater-than-equals": "Більше або дорівнює",
+  "label.insights": "Інсайти",
+  "label.insights-description": "Зануртеся глибше у свої дані за допомогою сегментів та фільтрів.",
+  "label.is": "Є",
+  "label.is-not": "Не є",
+  "label.is-not-set": "Не встановлено",
+  "label.is-set": "Встановлено",
+  "label.join": "Приєднатись",
+  "label.join-team": "Приєднатись до команди",
+  "label.language": "Мова",
   "label.languages": "Мови",
   "label.laptop": "Ноутбук",
   "label.last-days": "Останні {x} днів",
   "label.last-hours": "Останні {x} годин",
-  "label.last-months": "Last {x} months",
-  "label.leave": "Leave",
-  "label.leave-team": "Leave team",
-  "label.less-than": "Less than",
-  "label.less-than-equals": "Less than or equals",
+  "label.last-months": "Останні {x} місяців",
+  "label.leave": "Покинути",
+  "label.leave-team": "Покинути команду",
+  "label.less-than": "Менше ніж",
+  "label.less-than-equals": "Менше або дорівнює",
   "label.login": "Увійти",
   "label.logout": "Вийти",
-  "label.manage": "Manage",
-  "label.max": "Max",
-  "label.member": "Member",
-  "label.members": "Members",
-  "label.min": "Min",
+  "label.manage": "Керувати",
+  "label.max": "Макс.",
+  "label.member": "Учасник",
+  "label.members": "Учасники",
+  "label.min": "Мін.",
   "label.mobile": "Мобільний",
   "label.more": "Більше",
-  "label.my-account": "My account",
-  "label.my-websites": "My websites",
+  "label.my-account": "Мій обліковий запис",
+  "label.my-websites": "Мої сайти",
   "label.name": "Ім'я",
   "label.new-password": "Новий пароль",
-  "label.none": "None",
+  "label.none": "Нічого",
   "label.number-of-records": "{x} {x, plural, one {record} other {records}}",
   "label.ok": "OK",
-  "label.os": "OS",
-  "label.overview": "Overview",
+  "label.os": "ОС",
+  "label.overview": "Огляд",
   "label.owner": "Власник",
-  "label.page-of": "Page {current} of {total}",
+  "label.page-of": "Сторінка {current} з {total}",
   "label.page-views": "Перегляди сторінок",
-  "label.pageTitle": "Page title",
+  "label.pageTitle": "Заголовок сторінки",
   "label.pages": "Сторінки",
   "label.password": "Пароль",
   "label.powered-by": "На базі {name}",
   "label.profile": "Профіль",
-  "label.queries": "Queries",
-  "label.query": "Query",
-  "label.query-parameters": "Query parameters",
+  "label.queries": "Запити",
+  "label.query": "Запит",
+  "label.query-parameters": "Параметри запиту",
   "label.realtime": "У реальному часі",
-  "label.referrer": "Referrer",
+  "label.referrer": "Джерело",
   "label.referrers": "Джерела",
   "label.refresh": "Оновити",
-  "label.regenerate": "Regenerate",
-  "label.region": "Region",
-  "label.regions": "Regions",
-  "label.remove": "Remove",
-  "label.remove-member": "Remove member",
-  "label.reports": "Reports",
+  "label.regenerate": "Згенерувати знову",
+  "label.region": "Регіон",
+  "label.regions": "Регіони",
+  "label.remove": "Видалити",
+  "label.remove-member": "Видалити користувача",
+  "label.reports": "Звіти",
   "label.required": "Обов'язкове",
   "label.reset": "Скинути",
   "label.reset-website": "Скинути статистику сайту",
-  "label.retention": "Retention",
-  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
-  "label.role": "Role",
-  "label.run-query": "Run query",
+  "label.retention": "Липкість",
+  "label.retention-description": "Виміряйте липкість вашого сайту, відстежуючи, як часто користувачі повертаються на нього.",
+  "label.role": "Роль",
+  "label.run-query": "Виконати запит",
   "label.save": "Зберегти",
-  "label.screens": "Screens",
-  "label.search": "Search",
-  "label.select": "Select",
-  "label.select-date": "Select date",
-  "label.select-role": "Select role",
-  "label.select-website": "Select website",
-  "label.sessions": "Sessions",
+  "label.screens": "Екрани",
+  "label.search": "Пошук",
+  "label.select": "Вибрати",
+  "label.select-date": "Вибрати дату",
+  "label.select-role": "Вибрати роль",
+  "label.select-website": "Вибрати сайт",
+  "label.sessions": "Сесії",
   "label.settings": "Налаштування",
   "label.share-url": "Поділитися посилання",
   "label.single-day": "Один день",
-  "label.steps": "Steps",
-  "label.sum": "Sum",
+  "label.steps": "Кроки",
+  "label.sum": "Сума",
   "label.tablet": "Планшет",
-  "label.team": "Team",
-  "label.team-id": "Team ID",
-  "label.team-member": "Team member",
-  "label.team-name": "Team name",
-  "label.team-owner": "Team owner",
-  "label.team-view-only": "Team view only",
-  "label.team-websites": "Team websites",
-  "label.teams": "Teams",
-  "label.theme": "Theme",
+  "label.team": "Команда",
+  "label.team-id": "Ідентифікатор команди",
+  "label.team-member": "Учасник команди",
+  "label.team-name": "Назва команди",
+  "label.team-owner": "Власник команди",
+  "label.team-view-only": "Тільки для командного перегляду",
+  "label.team-websites": "Сайти команди",
+  "label.teams": "Команди",
+  "label.theme": "Тема",
   "label.this-month": "Цього місяця",
   "label.this-week": "Цього тижня",
   "label.this-year": "Цього ріку",
   "label.timezone": "Часовий пояс",
-  "label.title": "Title",
+  "label.title": "Заголовок",
   "label.today": "Сьогодні",
   "label.toggle-charts": "Переключити графіки",
-  "label.total": "Total",
-  "label.total-records": "Total records",
+  "label.total": "Всього",
+  "label.total-records": "Всього записів",
   "label.tracking-code": "Код для відслідковування",
-  "label.transfer": "Transfer",
-  "label.transfer-website": "Transfer website",
+  "label.transfer": "Передати",
+  "label.transfer-website": "Передати сайт",
   "label.true": "True",
-  "label.type": "Type",
-  "label.unique": "Unique",
+  "label.type": "Тип",
+  "label.unique": "Унікальний",
   "label.unique-visitors": "Унікальні відвідувачі",
   "label.unknown": "Невідомо",
-  "label.untitled": "Untitled",
-  "label.update": "Update",
+  "label.untitled": "Без заголовку",
+  "label.update": "Оновлення",
   "label.url": "URL",
   "label.urls": "URLs",
-  "label.user": "User",
+  "label.user": "Користувач",
   "label.username": "Ім'я користувача",
-  "label.users": "Users",
+  "label.users": "Користувачі",
   "label.utm": "UTM",
-  "label.utm-description": "Track your campaigns through UTM parameters.",
-  "label.value": "Value",
-  "label.view": "View",
+  "label.utm-description": "Відстежуйте свої кампанії за допомогою параметрів UTM.",
+  "label.value": "Значення",
+  "label.view": "Перегляд",
   "label.view-details": "Переглянути деталі",
-  "label.view-only": "View only",
+  "label.view-only": "Тільки для перегляду",
   "label.views": "Перегляди",
-  "label.views-per-visit": "Views per visit",
+  "label.views-per-visit": "Перегляди за одне відвідування",
   "label.visitors": "Відвідувачі",
-  "label.visits": "Visits",
-  "label.website": "Website",
-  "label.website-id": "Website ID",
+  "label.visits": "Відвідування",
+  "label.website": "Сайт",
+  "label.website-id": "Ідентифікатор сайту",
   "label.websites": "Сайти",
-  "label.window": "Window",
-  "label.yesterday": "Yesterday",
-  "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
+  "label.window": "Вікно",
+  "label.yesterday": "Вчора",
+  "message.action-confirmation": "Введіть {confirmation} у полі нижче, щоб підтвердити.",
   "message.active-users": "{x} поточних відвідувачів",
   "message.confirm-delete": "Ви впевнені, що бажаєте видалити {target}?",
-  "message.confirm-leave": "Are you sure you want to leave {target}?",
-  "message.confirm-remove": "Are you sure you want to remove {target}?",
+  "message.confirm-leave": "Ви впевнені, що бажаєте покинути {target}?",
+  "message.confirm-remove": "Ви впевнені, що бажаєте видалити {target}?",
   "message.confirm-reset": "Ви впевнені, що бажаєте скинути статистику для {target}?",
-  "message.delete-team-warning": "Deleting a team will also delete all team websites.",
+  "message.delete-team-warning": "Видалення команди також призведе до видалення всіх її веб-сайтів.",
   "message.delete-website-warning": "Усі пов'язані дані будуть видалені також.",
   "message.error": "Щось пішло не так.",
-  "message.event-log": "{event} on {url}",
+  "message.event-log": "{event} на {url}",
   "message.go-to-settings": "Перейти до налаштувань",
   "message.incorrect-username-password": "Невірне ім'я користувача або пароль.",
   "message.invalid-domain": "Некоректний домен",
-  "message.min-password-length": "Minimum length of {n} characters",
-  "message.new-version-available": "A new version of Umami {version} is available!",
+  "message.min-password-length": "Мінімальна довжина {n} символів",
+  "message.new-version-available": "Вийшла нова версія Umami {version}!",
   "message.no-data-available": "Немає даних.",
-  "message.no-event-data": "No event data is available.",
+  "message.no-event-data": "Дані про події відсутні.",
   "message.no-match-password": "Паролі не співпадають",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-teams": "You have not created any teams.",
-  "message.no-users": "There are no users.",
+  "message.no-results-found": "Не знайдено жодного результату.",
+  "message.no-team-websites": "У цієї команди немає жодного веб-сайту.",
+  "message.no-teams": "Ви не створили жодної команди.",
+  "message.no-users": "Немає жодного користувача.",
   "message.no-websites-configured": "У вас немає налаштованих сайтів.",
   "message.page-not-found": "Сторінку не знайдено.",
-  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
+  "message.reset-website": "Щоб скинути налаштування цього веб-сайту, введіть {confirmation} у полі нижче для підтвердження.",
   "message.reset-website-warning": "Вся статистика для цього сайту буде видалена, проте код відслідковування буде продовжувати працювати.",
   "message.saved": "Збережено успішно.",
   "message.share-url": "Це публічне посилання для {target}.",
-  "message.team-already-member": "You are already a member of the team.",
-  "message.team-not-found": "Team not found.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
+  "message.team-already-member": "Ви вже є членом команди.",
+  "message.team-not-found": "Команду не знайдено.",
+  "message.team-websites-info": "Веб-сайти може переглядати будь-хто з команди.",
   "message.tracking-code": "Код для відслідковування",
-  "message.transfer-team-website-to-user": "Transfer this website to your account?",
-  "message.transfer-user-website-to-team": "Select the team to transfer this website to.",
-  "message.transfer-website": "Transfer website ownership to your account or another team.",
-  "message.triggered-event": "Triggered event",
-  "message.user-deleted": "User deleted.",
-  "message.viewed-page": "Viewed page",
+  "message.transfer-team-website-to-user": "Перенести цей сайт до свого облікового запису?",
+  "message.transfer-user-website-to-team": "Виберіть команду, до якої ви хочете передати цей веб-сайт.",
+  "message.transfer-website": "Передайте право власності на сайт своєму акаунту або іншій команді.",
+  "message.triggered-event": "Подія, що спрацювала",
+  "message.user-deleted": "Користувача видалено.",
+  "message.viewed-page": "Переглянута сторінка",
   "message.visitor-log": "Відвідувач з {country} використовуючи {browser} на {os} {device}",
-  "message.visitors-dropped-off": "Visitors dropped off"
+  "message.visitors-dropped-off": "Користувачі що відсіялись"
 }

From f3efe0c9c330c6439d1050416baa2fa2fb390f28 Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Wed, 19 Jun 2024 21:41:45 -0700
Subject: [PATCH 167/438] Add revenue.

---
 src/app/(main)/console/TestConsole.tsx        |   1 +
 .../(main)/reports/[reportId]/ReportPage.tsx  |   2 +
 .../(main)/reports/create/ReportTemplates.tsx |   6 +
 .../(main)/reports/revenue/RevenueChart.tsx   |  98 +++++++++
 .../reports/revenue/RevenueParameters.tsx     |  51 +++++
 .../reports/revenue/RevenueReport.module.css  |  10 +
 .../(main)/reports/revenue/RevenueReport.tsx  |  27 +++
 .../reports/revenue/RevenueReportPage.tsx     |   6 +
 src/app/(main)/reports/revenue/page.tsx       |  10 +
 src/components/hooks/queries/useReport.ts     |   2 +-
 src/components/messages.ts                    |   9 +
 src/lib/clickhouse.ts                         |   5 +-
 src/lib/constants.ts                          |   1 +
 src/pages/api/reports/[reportId].ts           |   2 +-
 src/pages/api/reports/index.ts                |   2 +-
 src/pages/api/reports/revenue.ts              |  71 +++++++
 src/queries/analytics/reports/getRevenue.ts   | 189 ++++++++++++++++++
 17 files changed, 488 insertions(+), 4 deletions(-)
 create mode 100644 src/app/(main)/reports/revenue/RevenueChart.tsx
 create mode 100644 src/app/(main)/reports/revenue/RevenueParameters.tsx
 create mode 100644 src/app/(main)/reports/revenue/RevenueReport.module.css
 create mode 100644 src/app/(main)/reports/revenue/RevenueReport.tsx
 create mode 100644 src/app/(main)/reports/revenue/RevenueReportPage.tsx
 create mode 100644 src/app/(main)/reports/revenue/page.tsx
 create mode 100644 src/pages/api/reports/revenue.ts
 create mode 100644 src/queries/analytics/reports/getRevenue.ts

diff --git a/src/app/(main)/console/TestConsole.tsx b/src/app/(main)/console/TestConsole.tsx
index 37075cf987..d0afb14cec 100644
--- a/src/app/(main)/console/TestConsole.tsx
+++ b/src/app/(main)/console/TestConsole.tsx
@@ -29,6 +29,7 @@ export function TestConsole({ websiteId }: { websiteId: string }) {
       boolean: true,
       booleanError: 'true',
       time: new Date(),
+      user: `user${Math.round(Math.random() * 10)}`,
       number: 1,
       number2: Math.random() * 100,
       time2: new Date().toISOString(),
diff --git a/src/app/(main)/reports/[reportId]/ReportPage.tsx b/src/app/(main)/reports/[reportId]/ReportPage.tsx
index 0965b20d3e..da1a0342e6 100644
--- a/src/app/(main)/reports/[reportId]/ReportPage.tsx
+++ b/src/app/(main)/reports/[reportId]/ReportPage.tsx
@@ -7,6 +7,7 @@ import InsightsReport from '../insights/InsightsReport';
 import JourneyReport from '../journey/JourneyReport';
 import RetentionReport from '../retention/RetentionReport';
 import UTMReport from '../utm/UTMReport';
+import RevenueReport from '../revenue/RevenueReport';
 
 const reports = {
   funnel: FunnelReport,
@@ -16,6 +17,7 @@ const reports = {
   utm: UTMReport,
   goals: GoalReport,
   journey: JourneyReport,
+  revenue: RevenueReport,
 };
 
 export default function ReportPage({ reportId }: { reportId: string }) {
diff --git a/src/app/(main)/reports/create/ReportTemplates.tsx b/src/app/(main)/reports/create/ReportTemplates.tsx
index e37efc0367..2314f7d6a6 100644
--- a/src/app/(main)/reports/create/ReportTemplates.tsx
+++ b/src/app/(main)/reports/create/ReportTemplates.tsx
@@ -51,6 +51,12 @@ export function ReportTemplates({ showHeader = true }: { showHeader?: boolean })
       url: renderTeamUrl('/reports/journey'),
       icon: <Path />,
     },
+    {
+      title: formatMessage(labels.revenue),
+      description: formatMessage(labels.revenueDescription),
+      url: renderTeamUrl('/reports/revenue'),
+      icon: <Path />,
+    },
   ];
 
   return (
diff --git a/src/app/(main)/reports/revenue/RevenueChart.tsx b/src/app/(main)/reports/revenue/RevenueChart.tsx
new file mode 100644
index 0000000000..602ab31c57
--- /dev/null
+++ b/src/app/(main)/reports/revenue/RevenueChart.tsx
@@ -0,0 +1,98 @@
+import BarChart, { BarChartProps } from 'components/charts/BarChart';
+import { useLocale, useMessages } from 'components/hooks';
+import MetricCard from 'components/metrics/MetricCard';
+import MetricsBar from 'components/metrics/MetricsBar';
+import { renderDateLabels } from 'lib/charts';
+import { formatLongNumber } from 'lib/format';
+import { useContext, useMemo } from 'react';
+import { ReportContext } from '../[reportId]/Report';
+
+export interface PageviewsChartProps extends BarChartProps {
+  isLoading?: boolean;
+}
+
+export function RevenueChart({ isLoading, ...props }: PageviewsChartProps) {
+  const { formatMessage, labels } = useMessages();
+  const { locale } = useLocale();
+  const { report } = useContext(ReportContext);
+  const { data, parameters } = report || {};
+
+  const chartData = useMemo(() => {
+    if (!data) {
+      return {};
+    }
+
+    return {
+      datasets: [
+        {
+          label: formatMessage(labels.average),
+          data: data?.chart.map(a => ({ x: a.time, y: a.avg })),
+          borderWidth: 2,
+          backgroundColor: '#8601B0',
+          borderColor: '#8601B0',
+          order: 1,
+        },
+        {
+          label: formatMessage(labels.total),
+          data: data?.chart.map(a => ({ x: a.time, y: a.sum })),
+          borderWidth: 2,
+          backgroundColor: '#f15bb5',
+          borderColor: '#f15bb5',
+          order: 2,
+        },
+      ],
+    };
+  }, [data, locale]);
+
+  const metricData = useMemo(() => {
+    if (!data) {
+      return [];
+    }
+
+    const { sum, avg, count, uniqueCount } = data.total;
+
+    return [
+      {
+        value: sum,
+        label: formatMessage(labels.total),
+        formatValue: formatLongNumber,
+      },
+      {
+        value: avg,
+        label: formatMessage(labels.average),
+        formatValue: formatLongNumber,
+      },
+      {
+        value: count,
+        label: formatMessage(labels.transactions),
+        formatValue: formatLongNumber,
+      },
+      {
+        value: uniqueCount,
+        label: formatMessage(labels.uniqueCustomers),
+        formatValue: formatLongNumber,
+      },
+    ] as any;
+  }, [data, locale]);
+
+  return (
+    <>
+      <MetricsBar isFetched={data}>
+        {metricData?.map(({ label, value, formatValue }) => {
+          return <MetricCard key={label} value={value} label={label} formatValue={formatValue} />;
+        })}
+      </MetricsBar>
+      {data && (
+        <BarChart
+          {...props}
+          data={chartData}
+          unit={parameters?.dateRange.unit}
+          isLoading={isLoading}
+          renderXLabel={renderDateLabels(parameters?.dateRange.unit, locale)}
+        />
+      )}
+    </>
+  );
+}
+
+export default RevenueChart;
diff --git a/src/app/(main)/reports/revenue/RevenueParameters.tsx b/src/app/(main)/reports/revenue/RevenueParameters.tsx
new file mode 100644
index 0000000000..ef6ed20939
--- /dev/null
+++ b/src/app/(main)/reports/revenue/RevenueParameters.tsx
@@ -0,0 +1,51 @@
+import { useMessages } from 'components/hooks';
+import { useContext } from 'react';
+import { Form, FormButtons, FormInput, FormRow, SubmitButton, TextField } from 'react-basics';
+import BaseParameters from '../[reportId]/BaseParameters';
+import { ReportContext } from '../[reportId]/Report';
+
+export function RevenueParameters() {
+  const { report, runReport, isRunning } = useContext(ReportContext);
+  const { formatMessage, labels } = useMessages();
+
+  const { id, parameters } = report || {};
+  const { websiteId, dateRange } = parameters || {};
+  const queryDisabled = !websiteId || !dateRange;
+
+  const handleSubmit = (data: any, e: any) => {
+    e.stopPropagation();
+    e.preventDefault();
+
+    if (!queryDisabled) {
+      runReport(data);
+    }
+  };
+
+  return (
+    <Form values={parameters} onSubmit={handleSubmit} preventSubmit={true}>
+      <BaseParameters showDateSelect={true} allowWebsiteSelect={!id} />
+      <FormRow label={formatMessage(labels.event)}>
+        <FormInput name="eventName" rules={{ required: formatMessage(labels.required) }}>
+          <TextField autoComplete="off" />
+        </FormInput>
+      </FormRow>
+      <FormRow label={formatMessage(labels.revenueProperty)}>
+        <FormInput name="revenueProperty" rules={{ required: formatMessage(labels.required) }}>
+          <TextField autoComplete="off" />
+        </FormInput>
+      </FormRow>
+      <FormRow label={formatMessage(labels.userProperty)}>
+        <FormInput name="userProperty">
+          <TextField autoComplete="off" />
+        </FormInput>
+      </FormRow>
+      <FormButtons>
+        <SubmitButton variant="primary" disabled={queryDisabled} isLoading={isRunning}>
+          {formatMessage(labels.runQuery)}
+        </SubmitButton>
+      </FormButtons>
+    </Form>
+  );
+}
+
+export default RevenueParameters;
diff --git a/src/app/(main)/reports/revenue/RevenueReport.module.css b/src/app/(main)/reports/revenue/RevenueReport.module.css
new file mode 100644
index 0000000000..aed66b74ef
--- /dev/null
+++ b/src/app/(main)/reports/revenue/RevenueReport.module.css
@@ -0,0 +1,10 @@
+.filters {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  border: 1px solid var(--base400);
+  border-radius: var(--border-radius);
+  line-height: 32px;
+  padding: 10px;
+  overflow: hidden;
+}
diff --git a/src/app/(main)/reports/revenue/RevenueReport.tsx b/src/app/(main)/reports/revenue/RevenueReport.tsx
new file mode 100644
index 0000000000..d82f424ac2
--- /dev/null
+++ b/src/app/(main)/reports/revenue/RevenueReport.tsx
@@ -0,0 +1,27 @@
+import RevenueChart from './RevenueChart';
+import RevenueParameters from './RevenueParameters';
+import Report from '../[reportId]/Report';
+import ReportHeader from '../[reportId]/ReportHeader';
+import ReportMenu from '../[reportId]/ReportMenu';
+import ReportBody from '../[reportId]/ReportBody';
+import Target from 'assets/target.svg';
+import { REPORT_TYPES } from 'lib/constants';
+
+const defaultParameters = {
+  type: REPORT_TYPES.revenue,
+  parameters: { Revenue: [] },
+};
+
+export default function RevenueReport({ reportId }: { reportId?: string }) {
+  return (
+    <Report reportId={reportId} defaultParameters={defaultParameters}>
+      <ReportHeader icon={<Target />} />
+      <ReportMenu>
+        <RevenueParameters />
+      </ReportMenu>
+      <ReportBody>
+        <RevenueChart />
+      </ReportBody>
+    </Report>
+  );
+}
diff --git a/src/app/(main)/reports/revenue/RevenueReportPage.tsx b/src/app/(main)/reports/revenue/RevenueReportPage.tsx
new file mode 100644
index 0000000000..e48c29d2e0
--- /dev/null
+++ b/src/app/(main)/reports/revenue/RevenueReportPage.tsx
@@ -0,0 +1,6 @@
+'use client';
+import RevenueReport from './RevenueReport';
+
+export default function RevenueReportPage() {
+  return <RevenueReport />;
+}
diff --git a/src/app/(main)/reports/revenue/page.tsx b/src/app/(main)/reports/revenue/page.tsx
new file mode 100644
index 0000000000..a8b79f0863
--- /dev/null
+++ b/src/app/(main)/reports/revenue/page.tsx
@@ -0,0 +1,10 @@
+import RevenueReportPage from './RevenueReportPage';
+import { Metadata } from 'next';
+
+export default function () {
+  return <RevenueReportPage />;
+}
+
+export const metadata: Metadata = {
+  title: 'Revenue Report',
+};
diff --git a/src/components/hooks/queries/useReport.ts b/src/components/hooks/queries/useReport.ts
index 3aacabb40b..2e63e4e6b8 100644
--- a/src/components/hooks/queries/useReport.ts
+++ b/src/components/hooks/queries/useReport.ts
@@ -6,7 +6,7 @@ import { useMessages } from '../useMessages';
 
 export function useReport(
   reportId: string,
-  defaultParameters: { type: string; parameters: { [key: string]: any } },
+  defaultParameters?: { type: string; parameters: { [key: string]: any } },
 ) {
   const [report, setReport] = useState(null);
   const [isRunning, setIsRunning] = useState(false);
diff --git a/src/components/messages.ts b/src/components/messages.ts
index 15fccda671..fa515c665f 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -114,6 +114,8 @@ export const labels = defineMessages({
   none: { id: 'label.none', defaultMessage: 'None' },
   clearAll: { id: 'label.clear-all', defaultMessage: 'Clear all' },
   property: { id: 'label.property', defaultMessage: 'Property' },
+  revenueProperty: { id: 'label.revenue-property', defaultMessage: 'Revenue Property' },
+  userProperty: { id: 'label.user-property', defaultMessage: 'User Property' },
   today: { id: 'label.today', defaultMessage: 'Today' },
   lastHours: { id: 'label.last-hours', defaultMessage: 'Last {x} hours' },
   yesterday: { id: 'label.yesterday', defaultMessage: 'Yesterday' },
@@ -155,6 +157,11 @@ export const labels = defineMessages({
     id: 'label.funnel-description',
     defaultMessage: 'Understand the conversion and drop-off rate of users.',
   },
+  revenue: { id: 'label.revenue', defaultMessage: 'Revenue' },
+  revenueDescription: {
+    id: 'label.revenue-description',
+    defaultMessage: 'Look into your revenue across time.',
+  },
   url: { id: 'label.url', defaultMessage: 'URL' },
   urls: { id: 'label.urls', defaultMessage: 'URLs' },
   add: { id: 'label.add', defaultMessage: 'Add' },
@@ -222,6 +229,8 @@ export const labels = defineMessages({
   select: { id: 'label.select', defaultMessage: 'Select' },
   myAccount: { id: 'label.my-account', defaultMessage: 'My account' },
   transfer: { id: 'label.transfer', defaultMessage: 'Transfer' },
+  transactions: { id: 'label.transactions', defaultMessage: 'Transactions' },
+  uniqueCustomers: { id: 'label.uniqueCustomers', defaultMessage: 'Unique Customers' },
   viewedPage: {
     id: 'message.viewed-page',
     defaultMessage: 'Viewed page',
diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index c1b9d25f27..3563484178 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -119,7 +119,10 @@ async function parseFilters(websiteId: string, filters: QueryFilters = {}, optio
   };
 }
 
-async function rawQuery(query: string, params: Record<string, unknown> = {}): Promise<unknown> {
+async function rawQuery<T = unknown>(
+  query: string,
+  params: Record<string, unknown> = {},
+): Promise<T> {
   if (process.env.LOG_QUERY) {
     log('QUERY:\n', query);
     log('PARAMETERS:\n', params);
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index a8b2b0f550..71274c7558 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -122,6 +122,7 @@ export const REPORT_TYPES = {
   retention: 'retention',
   utm: 'utm',
   journey: 'journey',
+  revenue: 'revenue',
 } as const;
 
 export const REPORT_PARAMETERS = {
diff --git a/src/pages/api/reports/[reportId].ts b/src/pages/api/reports/[reportId].ts
index 3a7c4c536b..91b5fb51f9 100644
--- a/src/pages/api/reports/[reportId].ts
+++ b/src/pages/api/reports/[reportId].ts
@@ -27,7 +27,7 @@ const schema: YupRequest = {
     websiteId: yup.string().uuid().required(),
     type: yup
       .string()
-      .matches(/funnel|insights|retention|utm|goals|journey/i)
+      .matches(/funnel|insights|retention|utm|goals|journey|revenue/i)
       .required(),
     name: yup.string().max(200).required(),
     description: yup.string().max(500),
diff --git a/src/pages/api/reports/index.ts b/src/pages/api/reports/index.ts
index 63e9c1d570..38996b7a4e 100644
--- a/src/pages/api/reports/index.ts
+++ b/src/pages/api/reports/index.ts
@@ -27,7 +27,7 @@ const schema = {
     name: yup.string().max(200).required(),
     type: yup
       .string()
-      .matches(/funnel|insights|retention|utm|goals|journey/i)
+      .matches(/funnel|insights|retention|utm|goals|journey|revenue/i)
       .required(),
     description: yup.string().max(500),
     parameters: yup
diff --git a/src/pages/api/reports/revenue.ts b/src/pages/api/reports/revenue.ts
new file mode 100644
index 0000000000..ac4dc6b364
--- /dev/null
+++ b/src/pages/api/reports/revenue.ts
@@ -0,0 +1,71 @@
+import { canViewWebsite } from 'lib/auth';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody } from 'lib/types';
+import { TimezoneTest, UnitTypeTest } from 'lib/yup';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getRevenue } from 'queries/analytics/reports/getRevenue';
+import * as yup from 'yup';
+
+export interface RetentionRequestBody {
+  websiteId: string;
+  dateRange: { startDate: string; endDate: string; unit?: string; timezone?: string };
+  eventName: string;
+  revenueProperty: string;
+  userProperty: string;
+}
+
+const schema = {
+  POST: yup.object().shape({
+    websiteId: yup.string().uuid().required(),
+    dateRange: yup
+      .object()
+      .shape({
+        startDate: yup.date().required(),
+        endDate: yup.date().required(),
+        unit: UnitTypeTest,
+        timezone: TimezoneTest,
+      })
+      .required(),
+    eventName: yup.string().required(),
+    revenueProperty: yup.string().required(),
+    userProperty: yup.string(),
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<any, RetentionRequestBody>,
+  res: NextApiResponse,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  if (req.method === 'POST') {
+    const {
+      websiteId,
+      dateRange: { startDate, endDate, unit, timezone },
+      eventName,
+      revenueProperty,
+      userProperty,
+    } = req.body;
+
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const data = await getRevenue(websiteId, {
+      startDate: new Date(startDate),
+      endDate: new Date(endDate),
+      unit,
+      timezone,
+      eventName,
+      revenueProperty,
+      userProperty,
+    });
+
+    return ok(res, data);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/src/queries/analytics/reports/getRevenue.ts b/src/queries/analytics/reports/getRevenue.ts
new file mode 100644
index 0000000000..6b151bb72f
--- /dev/null
+++ b/src/queries/analytics/reports/getRevenue.ts
@@ -0,0 +1,189 @@
+import clickhouse from 'lib/clickhouse';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import prisma from 'lib/prisma';
+
+export async function getRevenue(
+  ...args: [
+    websiteId: string,
+    criteria: {
+      startDate: Date;
+      endDate: Date;
+      unit: string;
+      timezone: string;
+      eventName: string;
+      revenueProperty: string;
+      userProperty: string;
+    },
+  ]
+) {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(
+  websiteId: string,
+  criteria: {
+    startDate: Date;
+    endDate: Date;
+    unit: string;
+    timezone: string;
+    eventName: string;
+    revenueProperty: string;
+    userProperty: string;
+  },
+): Promise<{
+  chart: { time: string; sum: number; avg: number; count: number; uniqueCount: number }[];
+  total: { sum: number; avg: number; count: number; uniqueCount: number };
+}> {
+  const {
+    startDate,
+    endDate,
+    eventName,
+    revenueProperty,
+    userProperty,
+    timezone = 'UTC',
+    unit = 'day',
+  } = criteria;
+  const { getDateQuery, rawQuery } = prisma;
+
+  const chartRes = await rawQuery(
+    `
+    select
+      ${getDateQuery('website_event.created_at', unit, timezone)} time,
+      sum(case when data_key = {{revenueProperty}} then number_value else 0 end) sum,
+      avg(case when data_key = {{revenueProperty}} then number_value else 0 end) avg,
+      count(case when data_key = {{revenueProperty}} then 1 else 0 end) count,
+      count(distinct {{userProperty}}) uniqueCount
+    from event_data
+    where website_event.website_id = {{websiteId::uuid}}
+      and website_event.created_at between {{startDate}} and {{endDate}}
+      and event_name = {{eventType}}
+      and data_key in ({{revenueProperty}} , {{userProperty}})
+    group by 1
+    `,
+    { websiteId, startDate, endDate, eventName, revenueProperty, userProperty },
+  );
+
+  const totalRes = await rawQuery(
+    `
+    select
+      sum(case when data_key = {{revenueProperty}} then number_value else 0 end) sum,
+      avg(case when data_key = {{revenueProperty}} then number_value else 0 end) avg,
+      count(case when data_key = {{revenueProperty}} then 1 else 0 end) count,
+      count(distinct {{userProperty}}) uniqueCount
+    from event_data
+    where website_event.website_id = {{websiteId::uuid}}
+      and website_event.created_at between {{startDate}} and {{endDate}}
+      and event_name = {{eventType}}
+      and data_key in ({{revenueProperty}} , {{userProperty}})
+    group by 1
+    `,
+    { websiteId, startDate, endDate, eventName, revenueProperty, userProperty },
+  );
+
+  return { chart: chartRes, total: totalRes };
+}
+
+async function clickhouseQuery(
+  websiteId: string,
+  criteria: {
+    startDate: Date;
+    endDate: Date;
+    eventName: string;
+    revenueProperty: string;
+    userProperty: string;
+    unit: string;
+    timezone: string;
+  },
+): Promise<{
+  chart: { time: string; sum: number; avg: number; count: number; uniqueCount: number }[];
+  total: { sum: number; avg: number; count: number; uniqueCount: number };
+}> {
+  const {
+    startDate,
+    endDate,
+    eventName,
+    revenueProperty,
+    userProperty = '',
+    timezone = 'UTC',
+    unit = 'day',
+  } = criteria;
+  const { getDateStringQuery, getDateQuery, rawQuery } = clickhouse;
+
+  const chartRes = await rawQuery<{
+    time: string;
+    sum: number;
+    avg: number;
+    count: number;
+    uniqueCount: number;
+  }>(
+    `
+    select
+      ${getDateStringQuery('g.time', unit)} as time, 
+      g.sum as sum,
+      g.avg as avg,
+      g.count as count,
+      g.uniqueCount as uniqueCount
+    from (
+      select 
+        ${getDateQuery('created_at', unit, timezone)} as time,
+        sumIf(number_value, data_key = {revenueProperty:String}) as sum,
+        avgIf(number_value, data_key = {revenueProperty:String}) as avg,
+        countIf(data_key = {revenueProperty:String}) as count,
+        uniqExactIf(string_value, data_key = {userProperty:String}) as uniqueCount
+      from event_data
+      where website_id = {websiteId:UUID}
+        and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+        and event_name = {eventName:String}
+        and data_key in ({revenueProperty:String}, {userProperty:String})
+      group by time
+    ) as g
+    order by time
+    `,
+    { websiteId, startDate, endDate, eventName, revenueProperty, userProperty },
+  ).then(result => {
+    return Object.values(result).map((a: any) => {
+      return {
+        time: a.time,
+        sum: Number(a.sum),
+        avg: Number(a.avg),
+        count: Number(a.count),
+        uniqueCount: Number(!a.avg ? 0 : a.uniqueCount),
+      };
+    });
+  });
+
+  const totalRes = await rawQuery<{
+    sum: number;
+    avg: number;
+    count: number;
+    uniqueCount: number;
+  }>(
+    `
+      select 
+        sumIf(number_value, data_key = {revenueProperty:String}) as sum,
+        avgIf(number_value, data_key = {revenueProperty:String}) as avg,
+        countIf(data_key = {revenueProperty:String}) as count,
+        uniqExactIf(string_value, data_key = {userProperty:String}) as uniqueCount
+      from event_data
+      where website_id = {websiteId:UUID}
+        and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+        and event_name = {eventName:String}
+        and data_key in ({revenueProperty:String}, {userProperty:String})
+    `,
+    { websiteId, startDate, endDate, eventName, revenueProperty, userProperty },
+  ).then(results => {
+    const result = results[0];
+
+    return {
+      sum: Number(result.sum),
+      avg: Number(result.avg),
+      count: Number(result.count),
+      uniqueCount: Number(!result.avg ? 0 : result.uniqueCount),
+    };
+  });
+
+  return { chart: chartRes, total: totalRes };
+}

From 5108b91f802a2a1b25785bc455fdd480a4319f0c Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Wed, 19 Jun 2024 21:47:27 -0700
Subject: [PATCH 168/438] Refactored realtime.

---
 .../[websiteId]/realtime/RealtimeHeader.tsx   |  10 +-
 .../[websiteId]/realtime/RealtimeLog.tsx      |  24 ++--
 .../[websiteId]/realtime/RealtimeUrls.tsx     |  68 ++++------
 .../realtime/WebsiteRealtimePage.tsx          |  12 +-
 src/components/hooks/queries/useRealtime.ts   |  76 +-----------
 src/components/hooks/useFields.ts             |   2 +-
 src/components/metrics/PageviewsChart.tsx     |  16 +--
 src/components/metrics/RealtimeChart.tsx      |  27 +---
 src/lib/clickhouse.ts                         |   2 +-
 src/lib/constants.ts                          |  13 +-
 src/lib/types.ts                              |  19 ++-
 src/pages/api/realtime/[websiteId].ts         |  14 +--
 src/queries/analytics/events/getEvents.ts     |  17 +--
 src/queries/analytics/getRealtimeData.ts      | 116 +++++++++++++-----
 src/queries/analytics/reports/getGoals.ts     |   6 +-
 src/queries/analytics/sessions/getSessions.ts |  14 ++-
 16 files changed, 207 insertions(+), 229 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx
index 2c135150bd..c27143aac5 100644
--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx
+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx
@@ -5,7 +5,7 @@ import styles from './RealtimeHeader.module.css';
 
 export function RealtimeHeader({ data }: { data: RealtimeData }) {
   const { formatMessage, labels } = useMessages();
-  const { pageviews, visitors, events, countries } = data || {};
+  const { totals }: any = data || {};
 
   return (
     <div className={styles.header}>
@@ -13,22 +13,22 @@ export function RealtimeHeader({ data }: { data: RealtimeData }) {
         <MetricCard
           className={styles.card}
           label={formatMessage(labels.views)}
-          value={pageviews?.length}
+          value={totals.views}
         />
         <MetricCard
           className={styles.card}
           label={formatMessage(labels.visitors)}
-          value={visitors?.length}
+          value={totals.visitors}
         />
         <MetricCard
           className={styles.card}
           label={formatMessage(labels.events)}
-          value={events?.length}
+          value={totals.events}
         />
         <MetricCard
           className={styles.card}
           label={formatMessage(labels.countries)}
-          value={countries?.length}
+          value={totals.countries}
         />
       </div>
     </div>
diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
index c26d06294a..cbdeb1ac43 100644
--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
@@ -54,20 +54,20 @@ export function RealtimeLog({ data }: { data: RealtimeData }) {
     },
   ];
 
-  const getTime = ({ timestamp }) => format(timestamp, 'h:mm:ss');
+  const getTime = ({ timestamp }) => format(timestamp * 1000, 'h:mm:ss');
 
   const getColor = ({ id, sessionId }) => stringToColor(sessionId || id);
 
   const getIcon = ({ __type }) => icons[__type];
 
   const getDetail = (log: {
-    __type: any;
-    eventName: any;
-    urlPath: any;
-    browser: any;
-    os: any;
-    country: any;
-    device: any;
+    __type: string;
+    eventName: string;
+    urlPath: string;
+    browser: string;
+    os: string;
+    country: string;
+    device: string;
   }) => {
     const { __type, eventName, urlPath: url, browser, os, country, device } = log;
 
@@ -141,8 +141,12 @@ export function RealtimeLog({ data }: { data: RealtimeData }) {
       return [];
     }
 
-    const { pageviews, visitors, events } = data;
-    let logs = [...pageviews, ...visitors, ...events].sort(thenby.firstBy('createdAt', -1));
+    const { events, visitors } = data;
+
+    let logs = [
+      ...events.map(e => ({ __type: e.eventName ? TYPE_EVENT : TYPE_PAGEVIEW, ...e })),
+      ...visitors.map(v => ({ __type: TYPE_SESSION, ...v })),
+    ].sort(thenby.firstBy('timestamp', -1));
 
     if (search) {
       logs = logs.filter(({ eventName, urlPath, browser, os, country, device }) => {
diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeUrls.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeUrls.tsx
index 094839c2aa..15b40f0154 100644
--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeUrls.tsx
+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeUrls.tsx
@@ -1,4 +1,4 @@
-import { Key, useContext, useMemo, useState } from 'react';
+import { Key, useContext, useState } from 'react';
 import { ButtonGroup, Button, Flexbox } from 'react-basics';
 import thenby from 'thenby';
 import { percentFilter } from 'lib/filters';
@@ -11,7 +11,7 @@ import { WebsiteContext } from '../WebsiteProvider';
 export function RealtimeUrls({ data }: { data: RealtimeData }) {
   const website = useContext(WebsiteContext);
   const { formatMessage, labels } = useMessages();
-  const { pageviews } = data || {};
+  const { referrers, urls } = data || {};
   const [filter, setFilter] = useState<Key>(FILTER_REFERRERS);
   const limit = 15;
 
@@ -35,47 +35,29 @@ export function RealtimeUrls({ data }: { data: RealtimeData }) {
     );
   };
 
-  const [referrers = [], pages = []] = useMemo(() => {
-    if (pageviews) {
-      const referrers = percentFilter(
-        pageviews
-          .reduce((arr, { referrerDomain }) => {
-            if (referrerDomain) {
-              const row = arr.find(({ x }) => x === referrerDomain);
-
-              if (!row) {
-                arr.push({ x: referrerDomain, y: 1 });
-              } else {
-                row.y += 1;
-              }
-            }
-            return arr;
-          }, [])
-          .sort(thenby.firstBy('y', -1))
-          .slice(0, limit),
-      );
-
-      const pages = percentFilter(
-        pageviews
-          .reduce((arr, { urlPath }) => {
-            const row = arr.find(({ x }) => x === urlPath);
-
-            if (!row) {
-              arr.push({ x: urlPath, y: 1 });
-            } else {
-              row.y += 1;
-            }
-            return arr;
-          }, [])
-          .sort(thenby.firstBy('y', -1))
-          .slice(0, limit),
-      );
-
-      return [referrers, pages];
-    }
+  const domains = percentFilter(
+    Object.keys(referrers)
+      .map(key => {
+        return {
+          x: key,
+          y: referrers[key],
+        };
+      })
+      .sort(thenby.firstBy('y', -1))
+      .slice(0, limit),
+  );
 
-    return [];
-  }, [pageviews]);
+  const pages = percentFilter(
+    Object.keys(urls)
+      .map(key => {
+        return {
+          x: key,
+          y: urls[key],
+        };
+      })
+      .sort(thenby.firstBy('y', -1))
+      .slice(0, limit),
+  );
 
   return (
     <>
@@ -89,7 +71,7 @@ export function RealtimeUrls({ data }: { data: RealtimeData }) {
           title={formatMessage(labels.referrers)}
           metric={formatMessage(labels.views)}
           renderLabel={renderLink}
-          data={referrers}
+          data={domains}
         />
       )}
       {filter === FILTER_PAGES && (
diff --git a/src/app/(main)/websites/[websiteId]/realtime/WebsiteRealtimePage.tsx b/src/app/(main)/websites/[websiteId]/realtime/WebsiteRealtimePage.tsx
index 8c1e3800a5..d88695478d 100644
--- a/src/app/(main)/websites/[websiteId]/realtime/WebsiteRealtimePage.tsx
+++ b/src/app/(main)/websites/[websiteId]/realtime/WebsiteRealtimePage.tsx
@@ -1,4 +1,5 @@
 'use client';
+import { firstBy } from 'thenby';
 import { Grid, GridRow } from 'components/layout/Grid';
 import Page from 'components/layout/Page';
 import RealtimeChart from 'components/metrics/RealtimeChart';
@@ -10,6 +11,7 @@ import RealtimeUrls from './RealtimeUrls';
 import RealtimeCountries from './RealtimeCountries';
 import WebsiteHeader from '../WebsiteHeader';
 import WebsiteProvider from '../WebsiteProvider';
+import { percentFilter } from 'lib/filters';
 
 export function WebsiteRealtimePage({ websiteId }) {
   const { data, isLoading, error } = useRealtime(websiteId);
@@ -18,6 +20,12 @@ export function WebsiteRealtimePage({ websiteId }) {
     return <Page isLoading={isLoading} error={error} />;
   }
 
+  const countries = percentFilter(
+    Object.keys(data.countries)
+      .map(key => ({ x: key, y: data.countries[key] }))
+      .sort(firstBy('y', -1)),
+  );
+
   return (
     <WebsiteProvider websiteId={websiteId}>
       <WebsiteHeader websiteId={websiteId} />
@@ -29,8 +37,8 @@ export function WebsiteRealtimePage({ websiteId }) {
           <RealtimeLog data={data} />
         </GridRow>
         <GridRow columns="one-two">
-          <RealtimeCountries data={data?.countries} />
-          <WorldMap data={data?.countries} />
+          <RealtimeCountries data={countries} />
+          <WorldMap data={countries} />
         </GridRow>
       </Grid>
     </WebsiteProvider>
diff --git a/src/components/hooks/queries/useRealtime.ts b/src/components/hooks/queries/useRealtime.ts
index 92b03bd03f..d5186ee0da 100644
--- a/src/components/hooks/queries/useRealtime.ts
+++ b/src/components/hooks/queries/useRealtime.ts
@@ -1,87 +1,21 @@
-import { useMemo, useRef } from 'react';
 import { RealtimeData } from 'lib/types';
 import { useApi } from './useApi';
-import { REALTIME_INTERVAL, REALTIME_RANGE } from 'lib/constants';
-import { startOfMinute, subMinutes } from 'date-fns';
-import { percentFilter } from 'lib/filters';
-import thenby from 'thenby';
-
-function mergeData(state = [], data = [], time: number) {
-  const ids = state.map(({ id }) => id);
-  return state
-    .concat(data.filter(({ id }) => !ids.includes(id)))
-    .filter(({ timestamp }) => timestamp >= time);
-}
+import { REALTIME_INTERVAL } from 'lib/constants';
+import { useTimezone } from 'components/hooks';
 
 export function useRealtime(websiteId: string) {
-  const currentData = useRef({
-    pageviews: [],
-    sessions: [],
-    events: [],
-    countries: [],
-    visitors: [],
-    timestamp: 0,
-  });
   const { get, useQuery } = useApi();
+  const { timezone } = useTimezone();
   const { data, isLoading, error } = useQuery<RealtimeData>({
     queryKey: ['realtime', websiteId],
     queryFn: async () => {
-      const state = currentData.current;
-      const data = await get(`/realtime/${websiteId}`, { startAt: state?.timestamp || 0 });
-      const date = subMinutes(startOfMinute(new Date()), REALTIME_RANGE);
-      const time = date.getTime();
-      const { pageviews, sessions, events, timestamp } = data;
-
-      return {
-        pageviews: mergeData(state?.pageviews, pageviews, time),
-        sessions: mergeData(state?.sessions, sessions, time),
-        events: mergeData(state?.events, events, time),
-        timestamp,
-      };
+      return get(`/realtime/${websiteId}`, { timezone });
     },
     enabled: !!websiteId,
     refetchInterval: REALTIME_INTERVAL,
   });
 
-  const realtimeData: RealtimeData = useMemo(() => {
-    if (!data) {
-      return { pageviews: [], sessions: [], events: [], countries: [], visitors: [], timestamp: 0 };
-    }
-
-    data.countries = percentFilter(
-      data.sessions
-        .reduce((arr, data) => {
-          if (!arr.find(({ id }) => id === data.id)) {
-            return arr.concat(data);
-          }
-          return arr;
-        }, [])
-        .reduce((arr: { x: any; y: number }[], { country }: any) => {
-          if (country) {
-            const row = arr.find(({ x }) => x === country);
-
-            if (!row) {
-              arr.push({ x: country, y: 1 });
-            } else {
-              row.y += 1;
-            }
-          }
-          return arr;
-        }, [])
-        .sort(thenby.firstBy('y', -1)),
-    );
-
-    data.visitors = data.sessions.reduce((arr, val) => {
-      if (!arr.find(({ id }) => id === val.id)) {
-        return arr.concat(val);
-      }
-      return arr;
-    }, []);
-
-    return data;
-  }, [data]);
-
-  return { data: realtimeData, isLoading, error };
+  return { data, isLoading, error };
 }
 
 export default useRealtime;
diff --git a/src/components/hooks/useFields.ts b/src/components/hooks/useFields.ts
index d08a234041..e6fc54b3dc 100644
--- a/src/components/hooks/useFields.ts
+++ b/src/components/hooks/useFields.ts
@@ -7,7 +7,6 @@ export function useFields() {
     { name: 'url', type: 'string', label: formatMessage(labels.url) },
     { name: 'title', type: 'string', label: formatMessage(labels.pageTitle) },
     { name: 'referrer', type: 'string', label: formatMessage(labels.referrer) },
-    { name: 'host', type: 'string', label: formatMessage(labels.host) },
     { name: 'query', type: 'string', label: formatMessage(labels.query) },
     { name: 'browser', type: 'string', label: formatMessage(labels.browser) },
     { name: 'os', type: 'string', label: formatMessage(labels.os) },
@@ -15,6 +14,7 @@ export function useFields() {
     { name: 'country', type: 'string', label: formatMessage(labels.country) },
     { name: 'region', type: 'string', label: formatMessage(labels.region) },
     { name: 'city', type: 'string', label: formatMessage(labels.city) },
+    { name: 'host', type: 'string', label: formatMessage(labels.host) },
   ];
 
   return { fields };
diff --git a/src/components/metrics/PageviewsChart.tsx b/src/components/metrics/PageviewsChart.tsx
index 400b96ba3b..3d77e54679 100644
--- a/src/components/metrics/PageviewsChart.tsx
+++ b/src/components/metrics/PageviewsChart.tsx
@@ -5,11 +5,11 @@ import { renderDateLabels } from 'lib/charts';
 
 export interface PageviewsChartProps extends BarChartProps {
   data: {
-    pageviews: any[];
-    sessions: any[];
+    views: any[];
+    visitors: any[];
     compare?: {
-      pageviews: any[];
-      sessions: any[];
+      views: any[];
+      visitors: any[];
     };
   };
   unit: string;
@@ -30,14 +30,14 @@ export function PageviewsChart({ data, unit, isLoading, ...props }: PageviewsCha
       datasets: [
         {
           label: formatMessage(labels.visitors),
-          data: data.sessions,
+          data: data.visitors,
           borderWidth: 1,
           ...colors.chart.visitors,
           order: 3,
         },
         {
           label: formatMessage(labels.views),
-          data: data.pageviews,
+          data: data.views,
           borderWidth: 1,
           ...colors.chart.views,
           order: 4,
@@ -47,7 +47,7 @@ export function PageviewsChart({ data, unit, isLoading, ...props }: PageviewsCha
               {
                 type: 'line',
                 label: `${formatMessage(labels.views)} (${formatMessage(labels.previous)})`,
-                data: data.compare.pageviews,
+                data: data.compare.views,
                 borderWidth: 2,
                 backgroundColor: '#8601B0',
                 borderColor: '#8601B0',
@@ -56,7 +56,7 @@ export function PageviewsChart({ data, unit, isLoading, ...props }: PageviewsCha
               {
                 type: 'line',
                 label: `${formatMessage(labels.visitors)} (${formatMessage(labels.previous)})`,
-                data: data.compare.sessions,
+                data: data.compare.visitors,
                 borderWidth: 2,
                 backgroundColor: '#f15bb5',
                 borderColor: '#f15bb5',
diff --git a/src/components/metrics/RealtimeChart.tsx b/src/components/metrics/RealtimeChart.tsx
index 1ca0719a37..0dd8f7c0cf 100644
--- a/src/components/metrics/RealtimeChart.tsx
+++ b/src/components/metrics/RealtimeChart.tsx
@@ -1,29 +1,10 @@
 import { useMemo, useRef } from 'react';
-import { format, startOfMinute, subMinutes, isBefore } from 'date-fns';
+import { startOfMinute, subMinutes, isBefore } from 'date-fns';
 import PageviewsChart from './PageviewsChart';
 import { getDateArray } from 'lib/date';
 import { DEFAULT_ANIMATION_DURATION, REALTIME_RANGE } from 'lib/constants';
 import { RealtimeData } from 'lib/types';
 
-function mapData(data: any[]) {
-  let last = 0;
-  const arr = [];
-
-  data?.reduce((obj, { timestamp }) => {
-    const t = startOfMinute(new Date(timestamp));
-    if (t.getTime() > last) {
-      obj = { x: format(t, 'yyyy-LL-dd HH:mm:00'), y: 1 };
-      arr.push(obj);
-      last = t.getTime();
-    } else {
-      obj.y += 1;
-    }
-    return obj;
-  }, {});
-
-  return arr;
-}
-
 export interface RealtimeChartProps {
   data: RealtimeData;
   unit: string;
@@ -37,12 +18,12 @@ export function RealtimeChart({ data, unit, ...props }: RealtimeChartProps) {
 
   const chartData = useMemo(() => {
     if (!data) {
-      return { pageviews: [], sessions: [] };
+      return { views: [], visitors: [] };
     }
 
     return {
-      pageviews: getDateArray(mapData(data.pageviews), startDate, endDate, unit),
-      sessions: getDateArray(mapData(data.visitors), startDate, endDate, unit),
+      views: getDateArray(data.series.views, startDate, endDate, unit),
+      visitors: getDateArray(data.series.visitors, startDate, endDate, unit),
     };
   }, [data, startDate, endDate, unit]);
 
diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index c1b9d25f27..9d1f661f76 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -9,7 +9,7 @@ import { maxDate } from './date';
 import { filtersToArray } from './params';
 
 export const CLICKHOUSE_DATE_FORMATS = {
-  minute: '%Y-%m-%d %H:%M:00',
+  minute: '%Y-%m-%d %H:%i:00',
   hour: '%Y-%m-%d %H:00:00',
   day: '%Y-%m-%d',
   month: '%Y-%m-01',
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index f7200ce312..ed4ae1dc8b 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -23,7 +23,7 @@ export const DEFAULT_PAGE_SIZE = 10;
 export const DEFAULT_DATE_COMPARE = 'prev';
 
 export const REALTIME_RANGE = 30;
-export const REALTIME_INTERVAL = 5000;
+export const REALTIME_INTERVAL = 10000;
 
 export const FILTER_COMBINED = 'filter-combined';
 export const FILTER_RAW = 'filter-raw';
@@ -33,7 +33,16 @@ export const FILTER_REFERRERS = 'filter-referrers';
 export const FILTER_PAGES = 'filter-pages';
 
 export const UNIT_TYPES = ['year', 'month', 'hour', 'day', 'minute'];
-export const EVENT_COLUMNS = ['url', 'entry', 'exit', 'referrer', 'title', 'query', 'event', 'host'];
+export const EVENT_COLUMNS = [
+  'url',
+  'entry',
+  'exit',
+  'referrer',
+  'title',
+  'query',
+  'event',
+  'host',
+];
 
 export const SESSION_COLUMNS = [
   'browser',
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 95758b6f69..32cd95399b 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -199,12 +199,23 @@ export interface QueryOptions {
 }
 
 export interface RealtimeData {
-  pageviews: any[];
-  sessions: any[];
+  countries: { [key: string]: number };
   events: any[];
+  pageviews: any[];
+  referrers: { [key: string]: number };
   timestamp: number;
-  countries?: any[];
-  visitors?: any[];
+  series: {
+    views: any[];
+    visitors: any[];
+  };
+  totals: {
+    views: number;
+    visitors: number;
+    events: number;
+    countries: number;
+  };
+  urls: { [key: string]: number };
+  visitors: any[];
 }
 
 export interface SessionData {
diff --git a/src/pages/api/realtime/[websiteId].ts b/src/pages/api/realtime/[websiteId].ts
index d315bf18a5..eeecae894a 100644
--- a/src/pages/api/realtime/[websiteId].ts
+++ b/src/pages/api/realtime/[websiteId].ts
@@ -10,13 +10,13 @@ import { REALTIME_RANGE } from 'lib/constants';
 
 export interface RealtimeRequestQuery {
   websiteId: string;
-  startAt: number;
+  timezone: string;
 }
 
 const schema = {
   GET: yup.object().shape({
     websiteId: yup.string().uuid().required(),
-    startAt: yup.number().integer().required(),
+    timezone: yup.string().required(),
   }),
 };
 
@@ -28,19 +28,15 @@ export default async (
   await useValidate(schema, req, res);
 
   if (req.method === 'GET') {
-    const { websiteId, startAt } = req.query;
+    const { websiteId, timezone } = req.query;
 
     if (!(await canViewWebsite(req.auth, websiteId))) {
       return unauthorized(res);
     }
 
-    let startTime = subMinutes(startOfMinute(new Date()), REALTIME_RANGE);
+    const startDate = subMinutes(startOfMinute(new Date()), REALTIME_RANGE);
 
-    if (+startAt > startTime.getTime()) {
-      startTime = new Date(+startAt);
-    }
-
-    const data = await getRealtimeData(websiteId, startTime);
+    const data = await getRealtimeData(websiteId, { startDate, timezone });
 
     return ok(res, data);
   }
diff --git a/src/queries/analytics/events/getEvents.ts b/src/queries/analytics/events/getEvents.ts
index 9ef279734c..b727540d62 100644
--- a/src/queries/analytics/events/getEvents.ts
+++ b/src/queries/analytics/events/getEvents.ts
@@ -1,31 +1,34 @@
 import clickhouse from 'lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import prisma from 'lib/prisma';
+import { QueryFilters } from 'lib/types';
 
-export function getEvents(...args: [websiteId: string, startDate: Date, eventType: number]) {
+export function getEvents(...args: [websiteId: string, filters: QueryFilters]) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
   });
 }
 
-function relationalQuery(websiteId: string, startDate: Date, eventType: number) {
+function relationalQuery(websiteId: string, filters: QueryFilters) {
+  const { startDate } = filters;
+
   return prisma.client.websiteEvent.findMany({
     where: {
       websiteId,
-      eventType,
       createdAt: {
         gte: startDate,
       },
     },
     orderBy: {
-      createdAt: 'asc',
+      createdAt: 'desc',
     },
   });
 }
 
-function clickhouseQuery(websiteId: string, startDate: Date, eventType: number) {
+function clickhouseQuery(websiteId: string, filters: QueryFilters) {
   const { rawQuery } = clickhouse;
+  const { startDate } = filters;
 
   return rawQuery(
     `
@@ -41,13 +44,11 @@ function clickhouseQuery(websiteId: string, startDate: Date, eventType: number)
     from website_event
     where website_id = {websiteId:UUID}
       and created_at >= {startDate:DateTime64}
-      and event_type = {eventType:UInt32}
-    order by created_at asc
+    order by created_at desc
     `,
     {
       websiteId,
       startDate,
-      eventType,
     },
   );
 }
diff --git a/src/queries/analytics/getRealtimeData.ts b/src/queries/analytics/getRealtimeData.ts
index 868a5c70e7..b42fbc50af 100644
--- a/src/queries/analytics/getRealtimeData.ts
+++ b/src/queries/analytics/getRealtimeData.ts
@@ -1,43 +1,91 @@
-import { getSessions, getEvents } from 'queries/index';
-import { EVENT_TYPE } from 'lib/constants';
-
-export async function getRealtimeData(websiteId: string, startDate: Date) {
-  const [pageviews, sessions, events] = await Promise.all([
-    getEvents(websiteId, startDate, EVENT_TYPE.pageView),
-    getSessions(websiteId, startDate),
-    getEvents(websiteId, startDate, EVENT_TYPE.customEvent),
+import { getSessions, getEvents, getPageviewStats, getSessionStats } from 'queries/index';
+
+const MAX_SIZE = 50;
+
+function increment(data: object, key: string) {
+  if (key) {
+    if (!data[key]) {
+      data[key] = 1;
+    } else {
+      data[key] += 1;
+    }
+  }
+}
+
+export async function getRealtimeData(
+  websiteId: string,
+  criteria: { startDate: Date; timezone: string },
+) {
+  const { startDate, timezone } = criteria;
+  const filters = { startDate, endDate: new Date(), unit: 'minute', timezone };
+  const [events, sessions, pageviews, sessionviews] = await Promise.all([
+    getEvents(websiteId, { startDate }),
+    getSessions(websiteId, { startDate }),
+    getPageviewStats(websiteId, filters),
+    getSessionStats(websiteId, filters),
   ]);
 
-  const decorate = (type: string, data: any[]) => {
-    return data.map((values: { [key: string]: any }) => ({
-      ...values,
-      __type: type,
-      timestamp: values.timestamp ? values.timestamp * 1000 : new Date(values.createdAt).getTime(),
-    }));
-  };
+  const uniques = new Set();
+
+  const sessionStats = sessions.reduce(
+    (obj: { visitors: any; countries: any }, session: { id: any; country: any }) => {
+      const { countries, visitors } = obj;
+      const { id, country } = session;
+
+      if (!uniques.has(id)) {
+        uniques.add(id);
+        increment(countries, country);
 
-  const set = new Set();
-  const uniques = (type: string, data: any[]) => {
-    return data.reduce((arr, values: { [key: string]: any }) => {
-      if (!set.has(values.id)) {
-        set.add(values.id);
-
-        return arr.concat({
-          ...values,
-          __type: type,
-          timestamp: values.timestamp
-            ? values.timestamp * 1000
-            : new Date(values.createdAt).getTime(),
-        });
+        if (visitors.length < MAX_SIZE) {
+          visitors.push(session);
+        }
       }
-      return arr;
-    }, []);
-  };
+
+      return obj;
+    },
+    {
+      countries: {},
+      visitors: [],
+    },
+  );
+
+  const eventStats = events.reduce(
+    (
+      obj: { urls: any; referrers: any; events: any },
+      event: { urlPath: any; referrerDomain: any },
+    ) => {
+      const { urls, referrers, events } = obj;
+      const { urlPath, referrerDomain } = event;
+
+      increment(urls, urlPath);
+      increment(referrers, referrerDomain);
+
+      if (events.length < MAX_SIZE) {
+        events.push(event);
+      }
+
+      return obj;
+    },
+    {
+      urls: {},
+      referrers: {},
+      events: [],
+    },
+  );
 
   return {
-    pageviews: decorate('pageview', pageviews),
-    sessions: uniques('session', sessions),
-    events: decorate('event', events),
+    ...sessionStats,
+    ...eventStats,
+    series: {
+      views: pageviews,
+      visitors: sessionviews,
+    },
+    totals: {
+      views: events.filter(e => !e.eventName).length,
+      visitors: uniques.size,
+      events: events.filter(e => e.eventName).length,
+      countries: Object.keys(sessionStats.countries).length,
+    },
     timestamp: Date.now(),
   };
 }
diff --git a/src/queries/analytics/reports/getGoals.ts b/src/queries/analytics/reports/getGoals.ts
index 83b0ce971c..2bb29d8ea8 100644
--- a/src/queries/analytics/reports/getGoals.ts
+++ b/src/queries/analytics/reports/getGoals.ts
@@ -312,7 +312,7 @@ async function clickhouseQuery(
   const where = getWhere(urls, events, eventData);
 
   const urlResults = hasUrl
-    ? await rawQuery<any>(
+    ? await rawQuery(
         `
   select
     ${columns.url}
@@ -332,7 +332,7 @@ async function clickhouseQuery(
     : [];
 
   const eventResults = hasEvent
-    ? await rawQuery<any>(
+    ? await rawQuery(
         `
   select
     ${columns.events}
@@ -352,7 +352,7 @@ async function clickhouseQuery(
     : [];
 
   const eventDataResults = hasEventData
-    ? await rawQuery<any>(
+    ? await rawQuery(
         `
   select
     ${columns.eventData}
diff --git a/src/queries/analytics/sessions/getSessions.ts b/src/queries/analytics/sessions/getSessions.ts
index b92e3af997..71a5bee618 100644
--- a/src/queries/analytics/sessions/getSessions.ts
+++ b/src/queries/analytics/sessions/getSessions.ts
@@ -1,15 +1,18 @@
 import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
 import { runQuery, PRISMA, CLICKHOUSE } from 'lib/db';
+import { QueryFilters } from 'lib/types';
 
-export async function getSessions(...args: [websiteId: string, startAt: Date]) {
+export async function getSessions(...args: [websiteId: string, filters: QueryFilters]) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
   });
 }
 
-async function relationalQuery(websiteId: string, startDate: Date) {
+async function relationalQuery(websiteId: string, filters: QueryFilters) {
+  const { startDate } = filters;
+
   return prisma.client.session.findMany({
     where: {
       websiteId,
@@ -18,13 +21,14 @@ async function relationalQuery(websiteId: string, startDate: Date) {
       },
     },
     orderBy: {
-      createdAt: 'asc',
+      createdAt: 'desc',
     },
   });
 }
 
-async function clickhouseQuery(websiteId: string, startDate: Date) {
+async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
   const { rawQuery } = clickhouse;
+  const { startDate } = filters;
 
   return rawQuery(
     `
@@ -46,7 +50,7 @@ async function clickhouseQuery(websiteId: string, startDate: Date) {
     from website_event
     where website_id = {websiteId:UUID}
     and created_at >= {startDate:DateTime64}
-    order by created_at asc
+    order by created_at desc
     `,
     {
       websiteId,

From b1024c71de182488a4dcf0cf6bc2a0e7faf1e1c2 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Wed, 19 Jun 2024 22:12:35 -0700
Subject: [PATCH 169/438] Update types.

---
 src/lib/types.ts                      | 13 -------------
 src/pages/api/realtime/[websiteId].ts |  7 ++-----
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/src/lib/types.ts b/src/lib/types.ts
index d567113459..e659655202 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -149,19 +149,6 @@ export interface WebsiteStats {
   totalTime: { value: number; change: number };
 }
 
-export interface RealtimeInit {
-  websites: Website[];
-  token: string;
-  data: RealtimeUpdate;
-}
-
-export interface RealtimeUpdate {
-  pageviews: any[];
-  sessions: any[];
-  events: any[];
-  timestamp: number;
-}
-
 export interface DateRange {
   value: string;
   startDate: Date;
diff --git a/src/pages/api/realtime/[websiteId].ts b/src/pages/api/realtime/[websiteId].ts
index eeecae894a..82854f1c17 100644
--- a/src/pages/api/realtime/[websiteId].ts
+++ b/src/pages/api/realtime/[websiteId].ts
@@ -1,7 +1,7 @@
 import { startOfMinute, subMinutes } from 'date-fns';
 import { canViewWebsite } from 'lib/auth';
 import { useAuth, useValidate } from 'lib/middleware';
-import { NextApiRequestQueryBody, RealtimeInit } from 'lib/types';
+import { NextApiRequestQueryBody } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { getRealtimeData } from 'queries';
@@ -20,10 +20,7 @@ const schema = {
   }),
 };
 
-export default async (
-  req: NextApiRequestQueryBody<RealtimeRequestQuery>,
-  res: NextApiResponse<RealtimeInit>,
-) => {
+export default async (req: NextApiRequestQueryBody<RealtimeRequestQuery>, res: NextApiResponse) => {
   await useAuth(req, res);
   await useValidate(schema, req, res);
 

From 3217ef3df3615413995dd2fdcb5150d0179b18c8 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Wed, 19 Jun 2024 22:22:18 -0700
Subject: [PATCH 170/438] Fixed chart.

---
 src/components/metrics/PageviewsChart.tsx | 30 +++++++++++------------
 src/components/metrics/RealtimeChart.tsx  |  6 ++---
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/components/metrics/PageviewsChart.tsx b/src/components/metrics/PageviewsChart.tsx
index 3d77e54679..782ff6fa00 100644
--- a/src/components/metrics/PageviewsChart.tsx
+++ b/src/components/metrics/PageviewsChart.tsx
@@ -3,20 +3,20 @@ import BarChart, { BarChartProps } from 'components/charts/BarChart';
 import { useLocale, useTheme, useMessages } from 'components/hooks';
 import { renderDateLabels } from 'lib/charts';
 
-export interface PageviewsChartProps extends BarChartProps {
+export interface PagepageviewsChartProps extends BarChartProps {
   data: {
-    views: any[];
-    visitors: any[];
+    pageviews: any[];
+    sessions: any[];
     compare?: {
-      views: any[];
-      visitors: any[];
+      pageviews: any[];
+      sessions: any[];
     };
   };
   unit: string;
   isLoading?: boolean;
 }
 
-export function PageviewsChart({ data, unit, isLoading, ...props }: PageviewsChartProps) {
+export function PagepageviewsChart({ data, unit, isLoading, ...props }: PagepageviewsChartProps) {
   const { formatMessage, labels } = useMessages();
   const { colors } = useTheme();
   const { locale } = useLocale();
@@ -29,15 +29,15 @@ export function PageviewsChart({ data, unit, isLoading, ...props }: PageviewsCha
     return {
       datasets: [
         {
-          label: formatMessage(labels.visitors),
-          data: data.visitors,
+          label: formatMessage(labels.sessions),
+          data: data.sessions,
           borderWidth: 1,
           ...colors.chart.visitors,
           order: 3,
         },
         {
-          label: formatMessage(labels.views),
-          data: data.views,
+          label: formatMessage(labels.pageviews),
+          data: data.pageviews,
           borderWidth: 1,
           ...colors.chart.views,
           order: 4,
@@ -46,8 +46,8 @@ export function PageviewsChart({ data, unit, isLoading, ...props }: PageviewsCha
           ? [
               {
                 type: 'line',
-                label: `${formatMessage(labels.views)} (${formatMessage(labels.previous)})`,
-                data: data.compare.views,
+                label: `${formatMessage(labels.pageviews)} (${formatMessage(labels.previous)})`,
+                data: data.compare.pageviews,
                 borderWidth: 2,
                 backgroundColor: '#8601B0',
                 borderColor: '#8601B0',
@@ -55,8 +55,8 @@ export function PageviewsChart({ data, unit, isLoading, ...props }: PageviewsCha
               },
               {
                 type: 'line',
-                label: `${formatMessage(labels.visitors)} (${formatMessage(labels.previous)})`,
-                data: data.compare.visitors,
+                label: `${formatMessage(labels.sessions)} (${formatMessage(labels.previous)})`,
+                data: data.compare.sessions,
                 borderWidth: 2,
                 backgroundColor: '#f15bb5',
                 borderColor: '#f15bb5',
@@ -79,4 +79,4 @@ export function PageviewsChart({ data, unit, isLoading, ...props }: PageviewsCha
   );
 }
 
-export default PageviewsChart;
+export default PagepageviewsChart;
diff --git a/src/components/metrics/RealtimeChart.tsx b/src/components/metrics/RealtimeChart.tsx
index 0dd8f7c0cf..b24eedb50c 100644
--- a/src/components/metrics/RealtimeChart.tsx
+++ b/src/components/metrics/RealtimeChart.tsx
@@ -18,12 +18,12 @@ export function RealtimeChart({ data, unit, ...props }: RealtimeChartProps) {
 
   const chartData = useMemo(() => {
     if (!data) {
-      return { views: [], visitors: [] };
+      return { pageviews: [], sessions: [] };
     }
 
     return {
-      views: getDateArray(data.series.views, startDate, endDate, unit),
-      visitors: getDateArray(data.series.visitors, startDate, endDate, unit),
+      pageviews: getDateArray(data.series.views, startDate, endDate, unit),
+      sessions: getDateArray(data.series.visitors, startDate, endDate, unit),
     };
   }, [data, startDate, endDate, unit]);
 

From fedbb50950cd15fa440a47b2bd1854479ccb3fb0 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 20 Jun 2024 09:30:47 -0700
Subject: [PATCH 171/438] Updated lang files.

---
 public/intl/messages/uk-UA.json | 176 +++++++++++++-------------------
 src/lang/uk-UA.json             |   2 +-
 2 files changed, 71 insertions(+), 107 deletions(-)

diff --git a/public/intl/messages/uk-UA.json b/public/intl/messages/uk-UA.json
index 3f091b5f2a..6ea471a6b3 100644
--- a/public/intl/messages/uk-UA.json
+++ b/public/intl/messages/uk-UA.json
@@ -14,7 +14,7 @@
   "label.activity-log": [
     {
       "type": 0,
-      "value": "Журнал активності"
+      "value": "Журнал"
     }
   ],
   "label.add": [
@@ -80,7 +80,7 @@
   "label.average": [
     {
       "type": 0,
-      "value": "Середнє"
+      "value": "Середній"
     }
   ],
   "label.back": [
@@ -92,7 +92,7 @@
   "label.before": [
     {
       "type": 0,
-      "value": "Раніше"
+      "value": "До"
     }
   ],
   "label.bounce-rate": [
@@ -230,7 +230,7 @@
   "label.created-by": [
     {
       "type": 0,
-      "value": "Автор"
+      "value": "Створено"
     }
   ],
   "label.current": [
@@ -368,7 +368,7 @@
   "label.dropoff": [
     {
       "type": 0,
-      "value": "Dropoff"
+      "value": "Відсів"
     }
   ],
   "label.edit": [
@@ -377,24 +377,6 @@
       "value": "Редагувати"
     }
   ],
-  "label.edit-dashboard": [
-    {
-      "type": 0,
-      "value": "Редагувати панель"
-    }
-  ],
-  "label.edit-member": [
-    {
-      "type": 0,
-      "value": "Редагувати учасника"
-    }
-  ],
-  "label.enable-share-url": [
-    {
-      "type": 0,
-      "value": "Дозволити ділитися посиланням"
-    }
-  ],
   "label.end-step": [
     {
       "type": 0,
@@ -476,13 +458,13 @@
   "label.funnel": [
     {
       "type": 0,
-      "value": "Funnel"
+      "value": "Воронка"
     }
   ],
   "label.funnel-description": [
     {
       "type": 0,
-      "value": "Understand the conversion and drop-off rate of users."
+      "value": "Зрозуміти рівень конверсії та відсіву користувачів."
     }
   ],
   "label.goal": [
@@ -530,13 +512,13 @@
   "label.insights": [
     {
       "type": 0,
-      "value": "Insights"
+      "value": "Інсайти"
     }
   ],
   "label.insights-description": [
     {
       "type": 0,
-      "value": "Dive deeper into your data by using segments and filters."
+      "value": "Зануртеся глибше у свої дані за допомогою сегментів та фільтрів."
     }
   ],
   "label.is": [
@@ -656,7 +638,7 @@
   "label.leave-team": [
     {
       "type": 0,
-      "value": "Покинути"
+      "value": "Покинути команду"
     }
   ],
   "label.less-than": [
@@ -668,7 +650,7 @@
   "label.less-than-equals": [
     {
       "type": 0,
-      "value": "Менше або рівно"
+      "value": "Менше або дорівнює"
     }
   ],
   "label.login": [
@@ -689,16 +671,10 @@
       "value": "Керувати"
     }
   ],
-  "label.manager": [
-    {
-      "type": 0,
-      "value": "Manager"
-    }
-  ],
   "label.max": [
     {
       "type": 0,
-      "value": "Max"
+      "value": "Макс."
     }
   ],
   "label.member": [
@@ -716,7 +692,7 @@
   "label.min": [
     {
       "type": 0,
-      "value": "Min"
+      "value": "Мін."
     }
   ],
   "label.mobile": [
@@ -734,13 +710,13 @@
   "label.my-account": [
     {
       "type": 0,
-      "value": "Мої аккаунти"
+      "value": "Мій обліковий запис"
     }
   ],
   "label.my-websites": [
     {
       "type": 0,
-      "value": "Мої вебсайти"
+      "value": "Мої сайти"
     }
   ],
   "label.name": [
@@ -758,7 +734,7 @@
   "label.none": [
     {
       "type": 0,
-      "value": "None"
+      "value": "Нічого"
     }
   ],
   "label.number-of-records": [
@@ -804,7 +780,7 @@
   "label.os": [
     {
       "type": 0,
-      "value": "OS"
+      "value": "ОС"
     }
   ],
   "label.overview": [
@@ -846,7 +822,7 @@
   "label.pageTitle": [
     {
       "type": 0,
-      "value": "Загловок сторінки"
+      "value": "Заголовок сторінки"
     }
   ],
   "label.pages": [
@@ -904,19 +880,19 @@
   "label.queries": [
     {
       "type": 0,
-      "value": "Queries"
+      "value": "Запити"
     }
   ],
   "label.query": [
     {
       "type": 0,
-      "value": "Query"
+      "value": "Запит"
     }
   ],
   "label.query-parameters": [
     {
       "type": 0,
-      "value": "Query parameters"
+      "value": "Параметри запиту"
     }
   ],
   "label.realtime": [
@@ -928,7 +904,7 @@
   "label.referrer": [
     {
       "type": 0,
-      "value": "Referrer"
+      "value": "Джерело"
     }
   ],
   "label.referrers": [
@@ -946,7 +922,7 @@
   "label.regenerate": [
     {
       "type": 0,
-      "value": "Regenerate"
+      "value": "Згенерувати знову"
     }
   ],
   "label.region": [
@@ -970,7 +946,7 @@
   "label.remove-member": [
     {
       "type": 0,
-      "value": "Видалити учасника"
+      "value": "Видалити користувача"
     }
   ],
   "label.reports": [
@@ -1000,13 +976,13 @@
   "label.retention": [
     {
       "type": 0,
-      "value": "Retention"
+      "value": "Липкість"
     }
   ],
   "label.retention-description": [
     {
       "type": 0,
-      "value": "Measure your website stickiness by tracking how often users return."
+      "value": "Виміряйте липкість вашого сайту, відстежуючи, як часто користувачі повертаються на нього."
     }
   ],
   "label.role": [
@@ -1018,7 +994,7 @@
   "label.run-query": [
     {
       "type": 0,
-      "value": "Run query"
+      "value": "Виконати запит"
     }
   ],
   "label.save": [
@@ -1042,25 +1018,25 @@
   "label.select": [
     {
       "type": 0,
-      "value": "Вибір"
+      "value": "Вибрати"
     }
   ],
   "label.select-date": [
     {
       "type": 0,
-      "value": "Select date"
+      "value": "Вибрати дату"
     }
   ],
   "label.select-role": [
     {
       "type": 0,
-      "value": "Select role"
+      "value": "Вибрати роль"
     }
   ],
   "label.select-website": [
     {
       "type": 0,
-      "value": "Select website"
+      "value": "Вибрати сайт"
     }
   ],
   "label.sessions": [
@@ -1120,13 +1096,7 @@
   "label.team-id": [
     {
       "type": 0,
-      "value": "ID команди"
-    }
-  ],
-  "label.team-manager": [
-    {
-      "type": 0,
-      "value": "Team manager"
+      "value": "Ідентифікатор команди"
     }
   ],
   "label.team-member": [
@@ -1150,13 +1120,13 @@
   "label.team-view-only": [
     {
       "type": 0,
-      "value": "Лише для перегляду командою"
+      "value": "Тільки для командного перегляду"
     }
   ],
   "label.team-websites": [
     {
       "type": 0,
-      "value": "Вебсайти команди"
+      "value": "Сайти команди"
     }
   ],
   "label.teams": [
@@ -1168,7 +1138,7 @@
   "label.theme": [
     {
       "type": 0,
-      "value": "Теми"
+      "value": "Тема"
     }
   ],
   "label.this-month": [
@@ -1198,7 +1168,7 @@
   "label.title": [
     {
       "type": 0,
-      "value": "Загловок"
+      "value": "Заголовок"
     }
   ],
   "label.today": [
@@ -1216,13 +1186,13 @@
   "label.total": [
     {
       "type": 0,
-      "value": "Total"
+      "value": "Всього"
     }
   ],
   "label.total-records": [
     {
       "type": 0,
-      "value": "Total records"
+      "value": "Всього записів"
     }
   ],
   "label.tracking-code": [
@@ -1234,13 +1204,13 @@
   "label.transfer": [
     {
       "type": 0,
-      "value": "Transfer"
+      "value": "Передати"
     }
   ],
   "label.transfer-website": [
     {
       "type": 0,
-      "value": "Transfer website"
+      "value": "Передати сайт"
     }
   ],
   "label.true": [
@@ -1252,7 +1222,7 @@
   "label.type": [
     {
       "type": 0,
-      "value": "Типу"
+      "value": "Тип"
     }
   ],
   "label.unique": [
@@ -1282,7 +1252,7 @@
   "label.update": [
     {
       "type": 0,
-      "value": "Оновити"
+      "value": "Оновлення"
     }
   ],
   "label.url": [
@@ -1324,7 +1294,7 @@
   "label.utm-description": [
     {
       "type": 0,
-      "value": "Track your campaigns through UTM parameters."
+      "value": "Відстежуйте свої кампанії за допомогою параметрів UTM."
     }
   ],
   "label.value": [
@@ -1348,7 +1318,7 @@
   "label.view-only": [
     {
       "type": 0,
-      "value": "Лише для перегляду"
+      "value": "Тільки для перегляду"
     }
   ],
   "label.views": [
@@ -1360,13 +1330,7 @@
   "label.views-per-visit": [
     {
       "type": 0,
-      "value": "Перегляди за візит"
-    }
-  ],
-  "label.visit-duration": [
-    {
-      "type": 0,
-      "value": "Середній час візиту"
+      "value": "Перегляди за одне відвідування"
     }
   ],
   "label.visitors": [
@@ -1384,13 +1348,13 @@
   "label.website": [
     {
       "type": 0,
-      "value": "Вебсайт"
+      "value": "Сайт"
     }
   ],
   "label.website-id": [
     {
       "type": 0,
-      "value": "Вебсайт ID"
+      "value": "Ідентифікатор сайту"
     }
   ],
   "label.websites": [
@@ -1414,7 +1378,7 @@
   "message.action-confirmation": [
     {
       "type": 0,
-      "value": "Введі "
+      "value": "Введіть "
     },
     {
       "type": 1,
@@ -1422,7 +1386,7 @@
     },
     {
       "type": 0,
-      "value": " у поле нижче для підтвердження."
+      "value": " у полі нижче, щоб підтвердити."
     }
   ],
   "message.active-users": [
@@ -1458,7 +1422,7 @@
   "message.confirm-leave": [
     {
       "type": 0,
-      "value": "Ви впевнені, що хочете покинути "
+      "value": "Ви впевнені, що бажаєте покинути "
     },
     {
       "type": 1,
@@ -1472,7 +1436,7 @@
   "message.confirm-remove": [
     {
       "type": 0,
-      "value": "Ви впевнеі, що хочете видалити "
+      "value": "Ви впевнені, що бажаєте видалити "
     },
     {
       "type": 1,
@@ -1500,7 +1464,7 @@
   "message.delete-team-warning": [
     {
       "type": 0,
-      "value": "Видалення команди також видалить усі вебсайти команди."
+      "value": "Видалення команди також призведе до видалення всіх її веб-сайтів."
     }
   ],
   "message.delete-website-warning": [
@@ -1522,7 +1486,7 @@
     },
     {
       "type": 0,
-      "value": " on "
+      "value": " на "
     },
     {
       "type": 1,
@@ -1550,7 +1514,7 @@
   "message.min-password-length": [
     {
       "type": 0,
-      "value": "Minimum length of "
+      "value": "Мінімальна довжина "
     },
     {
       "type": 1,
@@ -1558,13 +1522,13 @@
     },
     {
       "type": 0,
-      "value": " characters"
+      "value": " символів"
     }
   ],
   "message.new-version-available": [
     {
       "type": 0,
-      "value": "A new version of Umami "
+      "value": "Вийшла нова версія Umami "
     },
     {
       "type": 1,
@@ -1572,7 +1536,7 @@
     },
     {
       "type": 0,
-      "value": " is available!"
+      "value": "!"
     }
   ],
   "message.no-data-available": [
@@ -1584,7 +1548,7 @@
   "message.no-event-data": [
     {
       "type": 0,
-      "value": "No event data is available."
+      "value": "Дані про події відсутні."
     }
   ],
   "message.no-match-password": [
@@ -1596,13 +1560,13 @@
   "message.no-results-found": [
     {
       "type": 0,
-      "value": "Результатів не знайдено."
+      "value": "Не знайдено жодного результату."
     }
   ],
   "message.no-team-websites": [
     {
       "type": 0,
-      "value": "Ця команди не має жодних вебсайтів."
+      "value": "У цієї команди немає жодного веб-сайту."
     }
   ],
   "message.no-teams": [
@@ -1614,7 +1578,7 @@
   "message.no-users": [
     {
       "type": 0,
-      "value": "Користувачів не має."
+      "value": "Немає жодного користувача."
     }
   ],
   "message.no-websites-configured": [
@@ -1632,7 +1596,7 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "To reset this website, type "
+      "value": "Щоб скинути налаштування цього веб-сайту, введіть "
     },
     {
       "type": 1,
@@ -1640,7 +1604,7 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " у полі нижче для підтвердження."
     }
   ],
   "message.reset-website-warning": [
@@ -1672,7 +1636,7 @@
   "message.team-already-member": [
     {
       "type": 0,
-      "value": "Ви уже є учасником цієї команди."
+      "value": "Ви вже є членом команди."
     }
   ],
   "message.team-not-found": [
@@ -1684,7 +1648,7 @@
   "message.team-websites-info": [
     {
       "type": 0,
-      "value": "Вебсайти може переглядати кожен учаник команди."
+      "value": "Веб-сайти може переглядати будь-хто з команди."
     }
   ],
   "message.tracking-code": [
@@ -1696,25 +1660,25 @@
   "message.transfer-team-website-to-user": [
     {
       "type": 0,
-      "value": "Transfer this website to your account?"
+      "value": "Перенести цей сайт до свого облікового запису?"
     }
   ],
   "message.transfer-user-website-to-team": [
     {
       "type": 0,
-      "value": "Select the team to transfer this website to."
+      "value": "Виберіть команду, до якої ви хочете передати цей веб-сайт."
     }
   ],
   "message.transfer-website": [
     {
       "type": 0,
-      "value": "Transfer website ownership to your account or another team."
+      "value": "Передайте право власності на сайт своєму акаунту або іншій команді."
     }
   ],
   "message.triggered-event": [
     {
       "type": 0,
-      "value": "Triggered event"
+      "value": "Подія, що спрацювала"
     }
   ],
   "message.user-deleted": [
@@ -1766,7 +1730,7 @@
   "message.visitors-dropped-off": [
     {
       "type": 0,
-      "value": "Visitors dropped off"
+      "value": "Користувачі що відсіялись"
     }
   ]
 }
diff --git a/src/lang/uk-UA.json b/src/lang/uk-UA.json
index 3bbbd6ae90..ec658b7ef6 100644
--- a/src/lang/uk-UA.json
+++ b/src/lang/uk-UA.json
@@ -101,7 +101,7 @@
   "label.last-hours": "Останні {x} годин",
   "label.last-months": "Останні {x} місяців",
   "label.leave": "Покинути",
-<<"label.leave-team": "Покинути команду",
+  "label.leave-team": "Покинути команду",
   "label.less-than": "Менше ніж",
   "label.less-than-equals": "Менше або дорівнює",
   "label.login": "Увійти",

From 8a4fe95a72c1dd027051a51e0514dc2d5c84795d Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 20 Jun 2024 09:43:20 -0700
Subject: [PATCH 172/438] Remove revenue report from release.

---
 src/app/(main)/reports/create/ReportTemplates.tsx | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/app/(main)/reports/create/ReportTemplates.tsx b/src/app/(main)/reports/create/ReportTemplates.tsx
index 2314f7d6a6..e37efc0367 100644
--- a/src/app/(main)/reports/create/ReportTemplates.tsx
+++ b/src/app/(main)/reports/create/ReportTemplates.tsx
@@ -51,12 +51,6 @@ export function ReportTemplates({ showHeader = true }: { showHeader?: boolean })
       url: renderTeamUrl('/reports/journey'),
       icon: <Path />,
     },
-    {
-      title: formatMessage(labels.revenue),
-      description: formatMessage(labels.revenueDescription),
-      url: renderTeamUrl('/reports/revenue'),
-      icon: <Path />,
-    },
   ];
 
   return (

From 29694352e7fbe25a738bad8f91ef417b0ef993d4 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Thu, 20 Jun 2024 12:11:49 -0700
Subject: [PATCH 173/438] add timestamp column to prisma realtime queries

---
 src/queries/analytics/events/getEvents.ts     | 29 ++++++++++++-------
 src/queries/analytics/sessions/getSessions.ts | 29 ++++++++++++-------
 2 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/src/queries/analytics/events/getEvents.ts b/src/queries/analytics/events/getEvents.ts
index b727540d62..c333242e35 100644
--- a/src/queries/analytics/events/getEvents.ts
+++ b/src/queries/analytics/events/getEvents.ts
@@ -13,17 +13,26 @@ export function getEvents(...args: [websiteId: string, filters: QueryFilters]) {
 function relationalQuery(websiteId: string, filters: QueryFilters) {
   const { startDate } = filters;
 
-  return prisma.client.websiteEvent.findMany({
-    where: {
-      websiteId,
-      createdAt: {
-        gte: startDate,
+  return prisma.client.websiteEvent
+    .findMany({
+      where: {
+        websiteId,
+        createdAt: {
+          gte: startDate,
+        },
       },
-    },
-    orderBy: {
-      createdAt: 'desc',
-    },
-  });
+      orderBy: {
+        createdAt: 'desc',
+      },
+    })
+    .then(a => {
+      return Object.values(a).map(a => {
+        return {
+          ...a,
+          timestamp: new Date(a.createdAt).getTime() / 1000,
+        };
+      });
+    });
 }
 
 function clickhouseQuery(websiteId: string, filters: QueryFilters) {
diff --git a/src/queries/analytics/sessions/getSessions.ts b/src/queries/analytics/sessions/getSessions.ts
index 71a5bee618..a11edd39bd 100644
--- a/src/queries/analytics/sessions/getSessions.ts
+++ b/src/queries/analytics/sessions/getSessions.ts
@@ -13,17 +13,26 @@ export async function getSessions(...args: [websiteId: string, filters: QueryFil
 async function relationalQuery(websiteId: string, filters: QueryFilters) {
   const { startDate } = filters;
 
-  return prisma.client.session.findMany({
-    where: {
-      websiteId,
-      createdAt: {
-        gte: startDate,
+  return prisma.client.session
+    .findMany({
+      where: {
+        websiteId,
+        createdAt: {
+          gte: startDate,
+        },
       },
-    },
-    orderBy: {
-      createdAt: 'desc',
-    },
-  });
+      orderBy: {
+        createdAt: 'desc',
+      },
+    })
+    .then(a => {
+      return Object.values(a).map(a => {
+        return {
+          ...a,
+          timestamp: new Date(a.createdAt).getTime() / 1000,
+        };
+      });
+    });
 }
 
 async function clickhouseQuery(websiteId: string, filters: QueryFilters) {

From bfe494f507e2822543547b00b453beda013d7a2d Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 20 Jun 2024 21:10:42 -0700
Subject: [PATCH 174/438] Fixed chart labels.

---
 src/components/metrics/PageviewsChart.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/metrics/PageviewsChart.tsx b/src/components/metrics/PageviewsChart.tsx
index 782ff6fa00..6ca0309494 100644
--- a/src/components/metrics/PageviewsChart.tsx
+++ b/src/components/metrics/PageviewsChart.tsx
@@ -29,14 +29,14 @@ export function PagepageviewsChart({ data, unit, isLoading, ...props }: Pagepage
     return {
       datasets: [
         {
-          label: formatMessage(labels.sessions),
+          label: formatMessage(labels.visitors),
           data: data.sessions,
           borderWidth: 1,
           ...colors.chart.visitors,
           order: 3,
         },
         {
-          label: formatMessage(labels.pageviews),
+          label: formatMessage(labels.views),
           data: data.pageviews,
           borderWidth: 1,
           ...colors.chart.views,
@@ -46,7 +46,7 @@ export function PagepageviewsChart({ data, unit, isLoading, ...props }: Pagepage
           ? [
               {
                 type: 'line',
-                label: `${formatMessage(labels.pageviews)} (${formatMessage(labels.previous)})`,
+                label: `${formatMessage(labels.views)} (${formatMessage(labels.previous)})`,
                 data: data.compare.pageviews,
                 borderWidth: 2,
                 backgroundColor: '#8601B0',
@@ -55,7 +55,7 @@ export function PagepageviewsChart({ data, unit, isLoading, ...props }: Pagepage
               },
               {
                 type: 'line',
-                label: `${formatMessage(labels.sessions)} (${formatMessage(labels.previous)})`,
+                label: `${formatMessage(labels.visitors)} (${formatMessage(labels.previous)})`,
                 data: data.compare.sessions,
                 borderWidth: 2,
                 backgroundColor: '#f15bb5',

From 32f0d23de4da1721003cc332fc40a8ccff47abfb Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Thu, 20 Jun 2024 23:26:36 -0700
Subject: [PATCH 175/438] fix null toString event data bug

---
 src/components/metrics/MetricCard.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/metrics/MetricCard.tsx b/src/components/metrics/MetricCard.tsx
index 5b11156e0a..a5fd758ec3 100644
--- a/src/components/metrics/MetricCard.tsx
+++ b/src/components/metrics/MetricCard.tsx
@@ -37,7 +37,7 @@ export const MetricCard = ({
   return (
     <div className={classNames(styles.card, className, showPrevious && styles.compare)}>
       {showLabel && <div className={styles.label}>{label}</div>}
-      <animated.div className={styles.value} title={value.toString()}>
+      <animated.div className={styles.value} title={value?.toString()}>
         {props?.x?.to(x => formatValue(x))}
       </animated.div>
       {showChange && (

From b0c9197f2dbfab7fd07ab66f243696cec4f16539 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 21 Jun 2024 12:49:57 -0700
Subject: [PATCH 176/438] Fixed teams settings.

---
 next.config.js                                |  4 +++
 src/app/(main)/teams/[teamId]/layout.tsx      |  7 ++++-
 .../[teamId]/settings/TeamSettingsLayout.tsx  | 29 +++++++++++++++++++
 .../members/TeamMemberEditButton.tsx          |  0
 .../settings}/members/TeamMemberEditForm.tsx  |  0
 .../members/TeamMemberRemoveButton.tsx        |  0
 .../members/TeamMembersDataTable.tsx          |  0
 .../settings}/members/TeamMembersPage.tsx     |  0
 .../settings}/members/TeamMembersTable.tsx    |  0
 .../[teamId]/settings}/members/page.tsx       |  0
 .../settings}/team/TeamDeleteForm.tsx         |  0
 .../[teamId]/settings}/team/TeamDetails.tsx   |  2 +-
 .../[teamId]/settings}/team/TeamEditForm.tsx  |  0
 .../[teamId]/settings}/team/TeamManage.tsx    |  0
 .../[teamId]/settings}/team/TeamPage.tsx      |  0
 .../[teamId]/settings}/team/page.tsx          |  0
 .../websites/TeamWebsiteRemoveButton.tsx      |  0
 .../websites/TeamWebsitesDataTable.tsx        |  0
 .../settings}/websites/TeamWebsitesPage.tsx   |  0
 .../settings}/websites/TeamWebsitesTable.tsx  |  0
 .../[teamId]/settings}/websites/page.tsx      |  0
 21 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 src/app/(main)/teams/[teamId]/settings/TeamSettingsLayout.tsx
 rename src/app/(main)/{settings/teams/[teamId] => teams/[teamId]/settings}/members/TeamMemberEditButton.tsx (100%)
 rename src/app/(main)/{settings/teams/[teamId] => teams/[teamId]/settings}/members/TeamMemberEditForm.tsx (100%)
 rename src/app/(main)/{settings/teams/[teamId] => teams/[teamId]/settings}/members/TeamMemberRemoveButton.tsx (100%)
 rename src/app/(main)/{settings/teams/[teamId] => teams/[teamId]/settings}/members/TeamMembersDataTable.tsx (100%)
 rename src/app/(main)/{settings/teams/[teamId] => teams/[teamId]/settings}/members/TeamMembersPage.tsx (100%)
 rename src/app/(main)/{settings/teams/[teamId] => teams/[teamId]/settings}/members/TeamMembersTable.tsx (100%)
 rename src/app/(main)/{settings/teams/[teamId] => teams/[teamId]/settings}/members/page.tsx (100%)
 rename src/app/(main)/{settings/teams/[teamId] => teams/[teamId]/settings}/team/TeamDeleteForm.tsx (100%)
 rename src/app/(main)/{settings/teams/[teamId] => teams/[teamId]/settings}/team/TeamDetails.tsx (95%)
 rename src/app/(main)/{settings/teams/[teamId] => teams/[teamId]/settings}/team/TeamEditForm.tsx (100%)
 rename src/app/(main)/{settings/teams/[teamId] => teams/[teamId]/settings}/team/TeamManage.tsx (100%)
 rename src/app/(main)/{settings/teams/[teamId] => teams/[teamId]/settings}/team/TeamPage.tsx (100%)
 rename src/app/(main)/{settings/teams/[teamId] => teams/[teamId]/settings}/team/page.tsx (100%)
 rename src/app/(main)/{settings/teams/[teamId] => teams/[teamId]/settings}/websites/TeamWebsiteRemoveButton.tsx (100%)
 rename src/app/(main)/{settings/teams/[teamId] => teams/[teamId]/settings}/websites/TeamWebsitesDataTable.tsx (100%)
 rename src/app/(main)/{settings/teams/[teamId] => teams/[teamId]/settings}/websites/TeamWebsitesPage.tsx (100%)
 rename src/app/(main)/{settings/teams/[teamId] => teams/[teamId]/settings}/websites/TeamWebsitesTable.tsx (100%)
 rename src/app/(main)/{settings/teams/[teamId] => teams/[teamId]/settings}/websites/page.tsx (100%)

diff --git a/next.config.js b/next.config.js
index 7554e2262d..d7546d7529 100644
--- a/next.config.js
+++ b/next.config.js
@@ -167,6 +167,10 @@ const config = {
         source: '/telemetry.js',
         destination: '/api/scripts/telemetry',
       },
+      {
+        source: '/teams/:teamId/settings/:path*',
+        destination: '/teams/:teamId/settings/:path*',
+      },
       {
         source: '/teams/:teamId/:path*',
         destination: '/:path*',
diff --git a/src/app/(main)/teams/[teamId]/layout.tsx b/src/app/(main)/teams/[teamId]/layout.tsx
index c804c7463b..e10cdb9431 100644
--- a/src/app/(main)/teams/[teamId]/layout.tsx
+++ b/src/app/(main)/teams/[teamId]/layout.tsx
@@ -1,8 +1,13 @@
 import TeamProvider from './TeamProvider';
 import { Metadata } from 'next';
+import TeamSettingsLayout from './settings/TeamSettingsLayout';
 
 export default function ({ children, params: { teamId } }) {
-  return <TeamProvider teamId={teamId}>{children}</TeamProvider>;
+  return (
+    <TeamProvider teamId={teamId}>
+      <TeamSettingsLayout>{children}</TeamSettingsLayout>
+    </TeamProvider>
+  );
 }
 
 export const metadata: Metadata = {
diff --git a/src/app/(main)/teams/[teamId]/settings/TeamSettingsLayout.tsx b/src/app/(main)/teams/[teamId]/settings/TeamSettingsLayout.tsx
new file mode 100644
index 0000000000..f7df620a71
--- /dev/null
+++ b/src/app/(main)/teams/[teamId]/settings/TeamSettingsLayout.tsx
@@ -0,0 +1,29 @@
+'use client';
+import { ReactNode } from 'react';
+import { useMessages, useTeamUrl } from 'components/hooks';
+import MenuLayout from 'components/layout/MenuLayout';
+
+export default function TeamSettingsLayout({ children }: { children: ReactNode }) {
+  const { formatMessage, labels } = useMessages();
+  const { teamId } = useTeamUrl();
+
+  const items = [
+    {
+      key: 'team',
+      label: formatMessage(labels.team),
+      url: `/teams/${teamId}/settings/team`,
+    },
+    {
+      key: 'websites',
+      label: formatMessage(labels.websites),
+      url: `/teams/${teamId}/settings/websites`,
+    },
+    {
+      key: 'members',
+      label: formatMessage(labels.members),
+      url: `/teams/${teamId}/settings/members`,
+    },
+  ].filter(n => n);
+
+  return <MenuLayout items={items}>{children}</MenuLayout>;
+}
diff --git a/src/app/(main)/settings/teams/[teamId]/members/TeamMemberEditButton.tsx b/src/app/(main)/teams/[teamId]/settings/members/TeamMemberEditButton.tsx
similarity index 100%
rename from src/app/(main)/settings/teams/[teamId]/members/TeamMemberEditButton.tsx
rename to src/app/(main)/teams/[teamId]/settings/members/TeamMemberEditButton.tsx
diff --git a/src/app/(main)/settings/teams/[teamId]/members/TeamMemberEditForm.tsx b/src/app/(main)/teams/[teamId]/settings/members/TeamMemberEditForm.tsx
similarity index 100%
rename from src/app/(main)/settings/teams/[teamId]/members/TeamMemberEditForm.tsx
rename to src/app/(main)/teams/[teamId]/settings/members/TeamMemberEditForm.tsx
diff --git a/src/app/(main)/settings/teams/[teamId]/members/TeamMemberRemoveButton.tsx b/src/app/(main)/teams/[teamId]/settings/members/TeamMemberRemoveButton.tsx
similarity index 100%
rename from src/app/(main)/settings/teams/[teamId]/members/TeamMemberRemoveButton.tsx
rename to src/app/(main)/teams/[teamId]/settings/members/TeamMemberRemoveButton.tsx
diff --git a/src/app/(main)/settings/teams/[teamId]/members/TeamMembersDataTable.tsx b/src/app/(main)/teams/[teamId]/settings/members/TeamMembersDataTable.tsx
similarity index 100%
rename from src/app/(main)/settings/teams/[teamId]/members/TeamMembersDataTable.tsx
rename to src/app/(main)/teams/[teamId]/settings/members/TeamMembersDataTable.tsx
diff --git a/src/app/(main)/settings/teams/[teamId]/members/TeamMembersPage.tsx b/src/app/(main)/teams/[teamId]/settings/members/TeamMembersPage.tsx
similarity index 100%
rename from src/app/(main)/settings/teams/[teamId]/members/TeamMembersPage.tsx
rename to src/app/(main)/teams/[teamId]/settings/members/TeamMembersPage.tsx
diff --git a/src/app/(main)/settings/teams/[teamId]/members/TeamMembersTable.tsx b/src/app/(main)/teams/[teamId]/settings/members/TeamMembersTable.tsx
similarity index 100%
rename from src/app/(main)/settings/teams/[teamId]/members/TeamMembersTable.tsx
rename to src/app/(main)/teams/[teamId]/settings/members/TeamMembersTable.tsx
diff --git a/src/app/(main)/settings/teams/[teamId]/members/page.tsx b/src/app/(main)/teams/[teamId]/settings/members/page.tsx
similarity index 100%
rename from src/app/(main)/settings/teams/[teamId]/members/page.tsx
rename to src/app/(main)/teams/[teamId]/settings/members/page.tsx
diff --git a/src/app/(main)/settings/teams/[teamId]/team/TeamDeleteForm.tsx b/src/app/(main)/teams/[teamId]/settings/team/TeamDeleteForm.tsx
similarity index 100%
rename from src/app/(main)/settings/teams/[teamId]/team/TeamDeleteForm.tsx
rename to src/app/(main)/teams/[teamId]/settings/team/TeamDeleteForm.tsx
diff --git a/src/app/(main)/settings/teams/[teamId]/team/TeamDetails.tsx b/src/app/(main)/teams/[teamId]/settings/team/TeamDetails.tsx
similarity index 95%
rename from src/app/(main)/settings/teams/[teamId]/team/TeamDetails.tsx
rename to src/app/(main)/teams/[teamId]/settings/team/TeamDetails.tsx
index 0c5fe991ea..70858ee4f5 100644
--- a/src/app/(main)/settings/teams/[teamId]/team/TeamDetails.tsx
+++ b/src/app/(main)/teams/[teamId]/settings/team/TeamDetails.tsx
@@ -5,7 +5,7 @@ import PageHeader from 'components/layout/PageHeader';
 import { ROLES } from 'lib/constants';
 import { useContext, useState } from 'react';
 import { Flexbox, Item, Tabs } from 'react-basics';
-import TeamLeaveButton from '../../TeamLeaveButton';
+import TeamLeaveButton from 'app/(main)/settings/teams/TeamLeaveButton';
 import TeamManage from './TeamManage';
 import TeamEditForm from './TeamEditForm';
 
diff --git a/src/app/(main)/settings/teams/[teamId]/team/TeamEditForm.tsx b/src/app/(main)/teams/[teamId]/settings/team/TeamEditForm.tsx
similarity index 100%
rename from src/app/(main)/settings/teams/[teamId]/team/TeamEditForm.tsx
rename to src/app/(main)/teams/[teamId]/settings/team/TeamEditForm.tsx
diff --git a/src/app/(main)/settings/teams/[teamId]/team/TeamManage.tsx b/src/app/(main)/teams/[teamId]/settings/team/TeamManage.tsx
similarity index 100%
rename from src/app/(main)/settings/teams/[teamId]/team/TeamManage.tsx
rename to src/app/(main)/teams/[teamId]/settings/team/TeamManage.tsx
diff --git a/src/app/(main)/settings/teams/[teamId]/team/TeamPage.tsx b/src/app/(main)/teams/[teamId]/settings/team/TeamPage.tsx
similarity index 100%
rename from src/app/(main)/settings/teams/[teamId]/team/TeamPage.tsx
rename to src/app/(main)/teams/[teamId]/settings/team/TeamPage.tsx
diff --git a/src/app/(main)/settings/teams/[teamId]/team/page.tsx b/src/app/(main)/teams/[teamId]/settings/team/page.tsx
similarity index 100%
rename from src/app/(main)/settings/teams/[teamId]/team/page.tsx
rename to src/app/(main)/teams/[teamId]/settings/team/page.tsx
diff --git a/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsiteRemoveButton.tsx b/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsiteRemoveButton.tsx
similarity index 100%
rename from src/app/(main)/settings/teams/[teamId]/websites/TeamWebsiteRemoveButton.tsx
rename to src/app/(main)/teams/[teamId]/settings/websites/TeamWebsiteRemoveButton.tsx
diff --git a/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesDataTable.tsx b/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesDataTable.tsx
similarity index 100%
rename from src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesDataTable.tsx
rename to src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesDataTable.tsx
diff --git a/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesPage.tsx b/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesPage.tsx
similarity index 100%
rename from src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesPage.tsx
rename to src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesPage.tsx
diff --git a/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesTable.tsx b/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesTable.tsx
similarity index 100%
rename from src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesTable.tsx
rename to src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesTable.tsx
diff --git a/src/app/(main)/settings/teams/[teamId]/websites/page.tsx b/src/app/(main)/teams/[teamId]/settings/websites/page.tsx
similarity index 100%
rename from src/app/(main)/settings/teams/[teamId]/websites/page.tsx
rename to src/app/(main)/teams/[teamId]/settings/websites/page.tsx

From 2109d3225eb9daa896a595c98714d0d711107756 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Sat, 22 Jun 2024 16:23:06 -0700
Subject: [PATCH 177/438] Fixed team data not refreshing.

---
 src/app/(main)/teams/[teamId]/settings/team/TeamEditForm.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/(main)/teams/[teamId]/settings/team/TeamEditForm.tsx b/src/app/(main)/teams/[teamId]/settings/team/TeamEditForm.tsx
index fc192df131..c2029ca6d7 100644
--- a/src/app/(main)/teams/[teamId]/settings/team/TeamEditForm.tsx
+++ b/src/app/(main)/teams/[teamId]/settings/team/TeamEditForm.tsx
@@ -11,7 +11,7 @@ import {
 } from 'react-basics';
 import { getRandomChars } from 'next-basics';
 import { useContext, useRef, useState } from 'react';
-import { useApi, useMessages } from 'components/hooks';
+import { useApi, useMessages, useModified } from 'components/hooks';
 import { TeamContext } from 'app/(main)/teams/[teamId]/TeamProvider';
 
 const generateId = () => getRandomChars(16);
@@ -26,12 +26,14 @@ export function TeamEditForm({ teamId, allowEdit }: { teamId: string; allowEdit?
   const ref = useRef(null);
   const [accessCode, setAccessCode] = useState(team.accessCode);
   const { showToast } = useToasts();
+  const { touch } = useModified();
   const cloudMode = !!process.env.cloudMode;
 
   const handleSubmit = async (data: any) => {
     mutate(data, {
       onSuccess: async () => {
         ref.current.reset(data);
+        touch('teams');
         showToast({ message: formatMessage(messages.saved), variant: 'success' });
       },
     });

From 7342d52c68955119ebd76a30f3ddce783749bb0a Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Sun, 23 Jun 2024 21:59:50 -0700
Subject: [PATCH 178/438] Fixed team settings not found.

---
 next.config.js                                              | 6 +-----
 .../teams/[teamId]/settings/websites/[websiteId]/page.tsx   | 5 +++++
 2 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 src/app/(main)/teams/[teamId]/settings/websites/[websiteId]/page.tsx

diff --git a/next.config.js b/next.config.js
index d7546d7529..acb83a9217 100644
--- a/next.config.js
+++ b/next.config.js
@@ -168,11 +168,7 @@ const config = {
         destination: '/api/scripts/telemetry',
       },
       {
-        source: '/teams/:teamId/settings/:path*',
-        destination: '/teams/:teamId/settings/:path*',
-      },
-      {
-        source: '/teams/:teamId/:path*',
+        source: '/teams/:teamId/:path((?!settings).*)*',
         destination: '/:path*',
       },
     ];
diff --git a/src/app/(main)/teams/[teamId]/settings/websites/[websiteId]/page.tsx b/src/app/(main)/teams/[teamId]/settings/websites/[websiteId]/page.tsx
new file mode 100644
index 0000000000..a689529687
--- /dev/null
+++ b/src/app/(main)/teams/[teamId]/settings/websites/[websiteId]/page.tsx
@@ -0,0 +1,5 @@
+import Page from 'app/(main)/settings/websites/[websiteId]/page';
+
+export default function ({ params }) {
+  return <Page params={params} />;
+}

From 84e670858cb5d645cd5826159068391f92fca8ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9D=A2=E6=9D=A1?=
 <2959393+ccbikai@users.noreply.github.com>
Date: Mon, 24 Jun 2024 19:40:04 +0800
Subject: [PATCH 179/438] Update Chinesi(zh-CN) translations

---
 src/lang/zh-CN.json | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/lang/zh-CN.json b/src/lang/zh-CN.json
index bcdd3612b6..6eb49fcf4b 100644
--- a/src/lang/zh-CN.json
+++ b/src/lang/zh-CN.json
@@ -24,12 +24,12 @@
   "label.cities": "市/县",
   "label.city": "市/县",
   "label.clear-all": "清除全部",
-  "label.compare": "Compare",
+  "label.compare": "对比",
   "label.confirm": "确认",
   "label.confirm-password": "确认密码",
   "label.contains": "包含",
   "label.continue": "继续",
-  "label.count": "Count",
+  "label.count": "数量",
   "label.countries": "国家/地区",
   "label.country": "国家/地区",
   "label.create": "创建",
@@ -38,7 +38,7 @@
   "label.create-user": "创建用户",
   "label.created": "已创建",
   "label.created-by": "创建者",
-  "label.current": "Current",
+  "label.current": "当前",
   "label.current-password": "目前密码",
   "label.custom-range": "自定义时间段",
   "label.dashboard": "仪表板",
@@ -65,12 +65,12 @@
   "label.edit-dashboard": "编辑仪表板",
   "label.edit-member": "编辑成员",
   "label.enable-share-url": "启用共享链接",
-  "label.end-step": "End Step",
-  "label.entry": "Entry URL",
+  "label.end-step": "最后一步",
+  "label.entry": "首次访问 URL",
   "label.event": "事件",
   "label.event-data": "事件数据",
   "label.events": "行为类别",
-  "label.exit": "Exit URL",
+  "label.exit": "退出 URL",
   "label.false": "否",
   "label.field": "字段",
   "label.fields": "字段",
@@ -80,13 +80,13 @@
   "label.filters": "筛选",
   "label.funnel": "分析",
   "label.funnel-description": "了解用户的转换率和退出率。",
-  "label.goal": "Goal",
-  "label.goals": "Goals",
-  "label.goals-description": "Track your goals for pageviews and events.",
+  "label.goal": "目标",
+  "label.goals": "目标",
+  "label.goals-description": "追踪您的页面浏览量和事件目标。",
   "label.greater-than": "大于",
   "label.greater-than-equals": "大于或等于",
-  "label.host": "Host",
-  "label.hosts": "Hosts",
+  "label.host": "主机",
+  "label.hosts": "主机",
   "label.insights": "见解",
   "label.insights-description": "通过使用筛选器和划分时间段来更深入地研究数据。",
   "label.is": "等于",
@@ -95,8 +95,8 @@
   "label.is-set": "已设置",
   "label.join": "加入",
   "label.join-team": "加入团队",
-  "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey": "轨迹",
+  "label.journey-description": "了解用户如何浏览您网站的哪些页面。",
   "label.language": "语言",
   "label.languages": "语言",
   "label.laptop": "笔记本",
@@ -110,7 +110,7 @@
   "label.login": "登录",
   "label.logout": "退出",
   "label.manage": "管理",
-  "label.manager": "Manager",
+  "label.manager": "管理者",
   "label.max": "最大",
   "label.member": "成员",
   "label.members": "成员",
@@ -123,7 +123,7 @@
   "label.new-password": "新密码",
   "label.none": "无",
   "label.number-of-records": "{x} {x, plural, one {record} other {records}}",
-  "label.ok": "OK",
+  "label.ok": "好的",
   "label.os": "操作系统",
   "label.overview": "概览",
   "label.owner": "所有者",
@@ -133,11 +133,11 @@
   "label.pages": "网页",
   "label.password": "密码",
   "label.powered-by": "由 {name} 提供支持",
-  "label.previous": "Previous",
-  "label.previous-period": "Previous period",
-  "label.previous-year": "Previous year",
+  "label.previous": "之前",
+  "label.previous-period": "前一周期",
+  "label.previous-year": "前一年",
   "label.profile": "个人资料",
-  "label.property": "Property",
+  "label.property": "属性",
   "label.queries": "查询",
   "label.query": "查询",
   "label.query-parameters": "查询参数",
@@ -169,13 +169,13 @@
   "label.settings": "设置",
   "label.share-url": "共享链接",
   "label.single-day": "单日",
-  "label.start-step": "Start Step",
+  "label.start-step": "第一步",
   "label.steps": "步骤",
   "label.sum": "总和",
   "label.tablet": "平板",
   "label.team": "团队",
   "label.team-id": "团队 ID",
-  "label.team-manager": "Team manager",
+  "label.team-manager": "团队管理",
   "label.team-member": "团队成员",
   "label.team-name": "团队名称",
   "label.team-owner": "团队所有者",
@@ -225,7 +225,7 @@
   "label.yesterday": "昨天",
   "message.action-confirmation": "在下面的框中输入 {confirmation} 以确认。",
   "message.active-users": "当前在线 {x} 人",
-  "message.collected-data": "Collected data",
+  "message.collected-data": "收集数据",
   "message.confirm-delete": "你确定要删除 {target} 吗？",
   "message.confirm-leave": "你确定要离开 {target} 吗？",
   "message.confirm-remove": "您确定要移除 {target} ？",

From 43f231eca4d631fe22ea3e4e0b3a8e646d31da7f Mon Sep 17 00:00:00 2001
From: Yannick Decat <17177411+mho22@users.noreply.github.com>
Date: Tue, 25 Jun 2024 15:33:19 +0200
Subject: [PATCH 180/438] Updated start-env with new NextStartOptions

Corrected error with port and hostname argument and removed unneeded array.
---
 scripts/start-env.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/start-env.js b/scripts/start-env.js
index e9fe2a4b4e..a2f2b43fc1 100644
--- a/scripts/start-env.js
+++ b/scripts/start-env.js
@@ -2,7 +2,6 @@ require('dotenv').config();
 const cli = require('next/dist/cli/next-start');
 
 cli.nextStart({
-  '--port': process.env.PORT || 3000,
-  '--hostname': process.env.HOSTNAME || '0.0.0.0',
-  _: [],
+  'port': process.env.PORT || 3000,
+  'hostname': process.env.HOSTNAME || '0.0.0.0'
 });

From 0b0cd9e272a493c00c0a997b016b58501c57e25b Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Mon, 24 Jun 2024 09:29:42 -0700
Subject: [PATCH 181/438] Fixed overflowing journey label.

---
 src/app/(main)/reports/journey/JourneyView.module.css | 2 +-
 src/app/(main)/reports/journey/JourneyView.tsx        | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/app/(main)/reports/journey/JourneyView.module.css b/src/app/(main)/reports/journey/JourneyView.module.css
index 0975d2c0f8..908f02cb0b 100644
--- a/src/app/(main)/reports/journey/JourneyView.module.css
+++ b/src/app/(main)/reports/journey/JourneyView.module.css
@@ -121,7 +121,7 @@
 }
 
 .name {
-  font-weight: 500;
+  max-width: 200px;
 }
 
 .count {
diff --git a/src/app/(main)/reports/journey/JourneyView.tsx b/src/app/(main)/reports/journey/JourneyView.tsx
index 73338c83ed..ae980a6e46 100644
--- a/src/app/(main)/reports/journey/JourneyView.tsx
+++ b/src/app/(main)/reports/journey/JourneyView.tsx
@@ -1,5 +1,5 @@
 import { useContext, useMemo, useState } from 'react';
-import { TooltipPopup } from 'react-basics';
+import { TextOverflow, TooltipPopup } from 'react-basics';
 import { firstBy } from 'thenby';
 import classNames from 'classnames';
 import { useEscapeKey, useMessages } from 'components/hooks';
@@ -191,7 +191,9 @@ export default function JourneyView() {
                           })}
                           onClick={() => handleClick(name, columnIndex, paths)}
                         >
-                          <div className={styles.name}>{name}</div>
+                          <div className={styles.name} title={name}>
+                            <TextOverflow> {name}</TextOverflow>
+                          </div>
                           <TooltipPopup label={dropOffPercent} disabled={!selected}>
                             <div className={styles.count} title={nodeCount}>
                               {formatLongNumber(nodeCount)}

From 05e4555334639953e376f3537b396916d2c1bb59 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 25 Jun 2024 09:31:02 -0700
Subject: [PATCH 182/438] Bump version v2.12.1.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7f5c7c489e..d002388f8a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "2.12.0",
+  "version": "2.12.1",
   "description": "A simple, fast, privacy-focused alternative to Google Analytics.",
   "author": "Umami Software, Inc. <hello@umami.is>",
   "license": "MIT",

From e6d4c536aed693f0fa9c32d6cff7df2855a66a2a Mon Sep 17 00:00:00 2001
From: Gerard Nesta <gerardnll@users.noreply.github.com>
Date: Thu, 27 Jun 2024 12:35:14 +0200
Subject: [PATCH 183/438] Update ca-ES.json

---
 src/lang/ca-ES.json | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/lang/ca-ES.json b/src/lang/ca-ES.json
index 5824492c3e..219fa9807e 100644
--- a/src/lang/ca-ES.json
+++ b/src/lang/ca-ES.json
@@ -24,12 +24,12 @@
   "label.cities": "Ciutats",
   "label.city": "Ciutat",
   "label.clear-all": "Netejar tot",
-  "label.compare": "Compare",
+  "label.compare": "Comparar",
   "label.confirm": "Confirmar",
   "label.confirm-password": "Confirma la contrasenya",
   "label.contains": "Conté",
   "label.continue": "Continuar",
-  "label.count": "Count",
+  "label.count": "Recompte",
   "label.countries": "Països",
   "label.country": "País",
   "label.create": "Crear",
@@ -38,7 +38,7 @@
   "label.create-user": "Crear usuari",
   "label.created": "Creat",
   "label.created-by": "Creat Per",
-  "label.current": "Current",
+  "label.current": "Actual",
   "label.current-password": "Contrasenya actual",
   "label.custom-range": "Rang personalitzat",
   "label.dashboard": "Panell",
@@ -65,12 +65,12 @@
   "label.edit-dashboard": "Edita panell",
   "label.edit-member": "Edita membre",
   "label.enable-share-url": "Activa l'enllaç per compartir",
-  "label.end-step": "End Step",
-  "label.entry": "Entry URL",
+  "label.end-step": "Pas Final",
+  "label.entry": "URL d'entrada",
   "label.event": "Esdeveniment",
   "label.event-data": "Dades de l'esdeveniment",
   "label.events": "Esdeveniments",
-  "label.exit": "Exit URL",
+  "label.exit": "URL de sortida",
   "label.false": "Fals",
   "label.field": "Camp",
   "label.fields": "Camps",
@@ -80,13 +80,13 @@
   "label.filters": "Filtres",
   "label.funnel": "Embut",
   "label.funnel-description": "Entengui la taxa de conversió i abandonament dels usuaris.",
-  "label.goal": "Goal",
-  "label.goals": "Goals",
-  "label.goals-description": "Track your goals for pageviews and events.",
+  "label.goal": "Meta",
+  "label.goals": "Metes",
+  "label.goals-description": "Feu un seguiment de les seves metes per a pàgines vistes i esdeveniments.",
   "label.greater-than": "Més gran que",
   "label.greater-than-equals": "Més gran que o igual a",
-  "label.host": "Host",
-  "label.hosts": "Hosts",
+  "label.host": "Amfitrió",
+  "label.hosts": "Amfitrions",
   "label.insights": "Insights",
   "label.insights-description": "Aprofundeixi en les seves dades mitjançant l'ús de segments i filtres.",
   "label.is": "És igual a",
@@ -95,8 +95,8 @@
   "label.is-set": "Està establert",
   "label.join": "Unir",
   "label.join-team": "Unir-se al equip",
-  "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey": "Trajecte",
+  "label.journey-description": "Entengui com naveguen els usuaris pel seu lloc web.",
   "label.language": "Idioma",
   "label.languages": "Idiomes",
   "label.laptop": "Portàtil",
@@ -122,7 +122,7 @@
   "label.name": "Nom",
   "label.new-password": "Contrasenya nova",
   "label.none": "Cap",
-  "label.number-of-records": "{x} {x, plural, one {record} other {records}}",
+  "label.number-of-records": "{x} {x, plural, one {registre} other {registres}}",
   "label.ok": "OK",
   "label.os": "SO",
   "label.overview": "Resum",
@@ -133,11 +133,11 @@
   "label.pages": "Pàgines",
   "label.password": "Contrasenya",
   "label.powered-by": "Funciona amb {name}",
-  "label.previous": "Previous",
-  "label.previous-period": "Previous period",
-  "label.previous-year": "Previous year",
+  "label.previous": "Anterior",
+  "label.previous-period": "Període anterior",
+  "label.previous-year": "Any anterior",
   "label.profile": "Perfil",
-  "label.property": "Property",
+  "label.property": "Propietat",
   "label.queries": "Consultes",
   "label.query": "Consulta",
   "label.query-parameters": "Paràmetres de consulta",
@@ -169,7 +169,7 @@
   "label.settings": "Configuració",
   "label.share-url": "Enllaç per compartir",
   "label.single-day": "Un sol dia",
-  "label.start-step": "Start Step",
+  "label.start-step": "Pas inicial",
   "label.steps": "Pasos",
   "label.sum": "Suma",
   "label.tablet": "Tauleta",
@@ -214,7 +214,7 @@
   "label.view-details": "Veure els detalls",
   "label.view-only": "Només veure",
   "label.views": "Vistes",
-  "label.views-per-visit": "Views per visit",
+  "label.views-per-visit": "Vistes per visita",
   "label.visit-duration": "Temps mitjà de visita",
   "label.visitors": "Visitants",
   "label.visits": "Visites",
@@ -225,7 +225,7 @@
   "label.yesterday": "Ahir",
   "message.action-confirmation": "Escrigui {confirmation} al cuadre inferior per confirmar.",
   "message.active-users": "{x} {x, plural, one {visitant actual} other {visitants actuals}}",
-  "message.collected-data": "Collected data",
+  "message.collected-data": "Dades recol·lectades",
   "message.confirm-delete": "Segur que vol esborrar {target}?",
   "message.confirm-leave": "Segur que vol abandonar {target}?",
   "message.confirm-remove": "Segur que vol eliminar {target}?",

From 5fc596ff411116491f4abbae93522d8881e159f4 Mon Sep 17 00:00:00 2001
From: Gerard Nesta <gerardnll@users.noreply.github.com>
Date: Thu, 27 Jun 2024 12:39:21 +0200
Subject: [PATCH 184/438] Update ca-ES.json

---
 src/lang/ca-ES.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lang/ca-ES.json b/src/lang/ca-ES.json
index 219fa9807e..dae977fc2c 100644
--- a/src/lang/ca-ES.json
+++ b/src/lang/ca-ES.json
@@ -263,5 +263,5 @@
   "message.user-deleted": "Usuari eliminat.",
   "message.viewed-page": "Pàgina vista",
   "message.visitor-log": "Visitant de {country} usant {browser} a {os} {device}",
-  "message.visitors-dropped-off": "Els visitants han sortit"
+  "message.visitors-dropped-off": "Visitants han sortit"
 }

From a124b698be0af196b00a71133b84efb39808c60c Mon Sep 17 00:00:00 2001
From: mommocmoc <mommocmoc@gmail.com>
Date: Fri, 28 Jun 2024 01:57:44 +0900
Subject: [PATCH 185/438] Update ko-KR.json

Update Korean translation
---
 src/lang/ko-KR.json | 384 ++++++++++++++++++++++----------------------
 1 file changed, 192 insertions(+), 192 deletions(-)

diff --git a/src/lang/ko-KR.json b/src/lang/ko-KR.json
index c1a3093371..b3bee85f7a 100644
--- a/src/lang/ko-KR.json
+++ b/src/lang/ko-KR.json
@@ -1,267 +1,267 @@
 {
-  "label.access-code": "Access code",
+  "label.access-code": "액세스 코드",
   "label.actions": "액션",
-  "label.activity-log": "Activity log",
-  "label.add": "Add",
-  "label.add-description": "Add description",
-  "label.add-member": "Add member",
-  "label.add-step": "Add step",
+  "label.activity-log": "활동 기록",
+  "label.add": "추가",
+  "label.add-description": "설명 추가",
+  "label.add-member": "멤버 추가",
+  "label.add-step": "단계 추가",
   "label.add-website": "웹사이트 추가",
   "label.admin": "관리자",
-  "label.after": "After",
+  "label.after": "이후",
   "label.all": "전체",
-  "label.all-time": "All time",
-  "label.analytics": "Analytics",
-  "label.average": "Average",
+  "label.all-time": "전체 시간",
+  "label.analytics": "분석",
+  "label.average": "평균",
   "label.back": "뒤로",
-  "label.before": "Before",
+  "label.before": "이전",
   "label.bounce-rate": "이탈률",
-  "label.breakdown": "Breakdown",
-  "label.browser": "Browser",
+  "label.breakdown": "세부 사항",
+  "label.browser": "브라우저",
   "label.browsers": "브라우저",
   "label.cancel": "취소",
-  "label.change-password": "비밀번호 변경",
-  "label.cities": "Cities",
-  "label.city": "City",
-  "label.clear-all": "Clear all",
-  "label.compare": "Compare",
-  "label.confirm": "Confirm",
+  "label.change-password": "비밀번호 변경하기",
+  "label.cities": "도시",
+  "label.city": "도시",
+  "label.clear-all": "모두 지우기",
+  "label.compare": "비교",
+  "label.confirm": "확인",
   "label.confirm-password": "비밀번호 확인",
-  "label.contains": "Contains",
-  "label.continue": "Continue",
-  "label.count": "Count",
+  "label.contains": "포함",
+  "label.continue": "계속",
+  "label.count": "수",
   "label.countries": "국가",
-  "label.country": "Country",
-  "label.create": "Create",
-  "label.create-report": "Create report",
-  "label.create-team": "Create team",
-  "label.create-user": "Create user",
-  "label.created": "Created",
-  "label.created-by": "Created By",
-  "label.current": "Current",
+  "label.country": "국가",
+  "label.create": "생성",
+  "label.create-report": "리포트 생성",
+  "label.create-team": "팀 생성",
+  "label.create-user": "사용자 생성",
+  "label.created": "생성됨",
+  "label.created-by": "작성자",
+  "label.current": "현재",
   "label.current-password": "현재 비밀번호",
   "label.custom-range": "범위 지정",
   "label.dashboard": "대시보드",
-  "label.data": "Data",
-  "label.date": "Date",
+  "label.data": "데이터",
+  "label.date": "날짜",
   "label.date-range": "날짜 범위",
-  "label.day": "Day",
+  "label.day": "일",
   "label.default-date-range": "기본 날짜 범위",
   "label.delete": "삭제",
-  "label.delete-report": "Delete report",
-  "label.delete-team": "Delete team",
-  "label.delete-user": "Delete user",
+  "label.delete-report": "리포트 삭제",
+  "label.delete-team": "팀 삭제",
+  "label.delete-user": "사용자 삭제",
   "label.delete-website": "웹사이트 삭제",
-  "label.description": "Description",
+  "label.description": "설명",
   "label.desktop": "데스크탑",
-  "label.details": "Details",
-  "label.device": "Device",
+  "label.details": "세부 사항",
+  "label.device": "기기",
   "label.devices": "기기",
   "label.dismiss": "무시하기",
-  "label.does-not-contain": "Does not contain",
+  "label.does-not-contain": "포함하지 않음",
   "label.domain": "도메인",
-  "label.dropoff": "Dropoff",
+  "label.dropoff": "이탈",
   "label.edit": "편집",
-  "label.edit-dashboard": "Edit dashboard",
-  "label.edit-member": "Edit member",
+  "label.edit-dashboard": "대시보드 편집",
+  "label.edit-member": "회원 편집",
   "label.enable-share-url": "URL 공유 활성화",
-  "label.end-step": "End Step",
-  "label.entry": "Entry URL",
-  "label.event": "Event",
-  "label.event-data": "Event data",
+  "label.end-step": "종료 단계",
+  "label.entry": "입장 URL",
+  "label.event": "이벤트",
+  "label.event-data": "이벤트 데이터",
   "label.events": "이벤트",
-  "label.exit": "Exit URL",
-  "label.false": "False",
-  "label.field": "Field",
-  "label.fields": "Fields",
-  "label.filter": "Filter",
+  "label.exit": "퇴장 URL",
+  "label.false": "거짓",
+  "label.field": "필드",
+  "label.fields": "필드",
+  "label.filter": "필터",
   "label.filter-combined": "합쳐서 보기",
   "label.filter-raw": "전체 보기",
-  "label.filters": "Filters",
-  "label.funnel": "Funnel",
-  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
-  "label.goal": "Goal",
-  "label.goals": "Goals",
-  "label.goals-description": "Track your goals for pageviews and events.",
-  "label.greater-than": "Greater than",
-  "label.greater-than-equals": "Greater than or equals",
-  "label.host": "Host",
-  "label.hosts": "Hosts",
-  "label.insights": "Insights",
-  "label.insights-description": "Dive deeper into your data by using segments and filters.",
-  "label.is": "Is",
-  "label.is-not": "Is not",
-  "label.is-not-set": "Is not set",
-  "label.is-set": "Is set",
-  "label.join": "Join",
-  "label.join-team": "Join team",
-  "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
-  "label.language": "Language",
-  "label.languages": "Languages",
+  "label.filters": "필터",
+  "label.funnel": "퍼널",
+  "label.funnel-description": "사용자 전환율 및 이탈률을 살펴보세요.",
+  "label.goal": "목표",
+  "label.goals": "목표",
+  "label.goals-description": "페이지뷰 및 이벤트 목표를 추적합니다.",
+  "label.greater-than": "이상",
+  "label.greater-than-equals": "이상",
+  "label.host": "호스트",
+  "label.hosts": "호스트",
+  "label.insights": "인사이트",
+  "label.insights-description": "세그먼트 및 필터를 사용하여 데이터를 더 자세히 살펴보세요.",
+  "label.is": "해당",
+  "label.is-not": "해당하지 않음",
+  "label.is-not-set": "설정되지 않음",
+  "label.is-set": "설정됨",
+  "label.join": "가입",
+  "label.join-team": "팀 가입",
+  "label.journey": "여정",
+  "label.journey-description": "사용자가 웹사이트를 탐색하는 경로를 살펴보세요.",
+  "label.language": "언어",
+  "label.languages": "언어",
   "label.laptop": "노트북",
-  "label.last-days": "최근 {x} 일간",
+  "label.last-days": "최근 {x} 일",
   "label.last-hours": "최근 {x} 시간",
-  "label.last-months": "Last {x} months",
-  "label.leave": "Leave",
-  "label.leave-team": "Leave team",
-  "label.less-than": "Less than",
-  "label.less-than-equals": "Less than or equals",
+  "label.last-months": "최근 {x} 개월",
+  "label.leave": "떠나기",
+  "label.leave-team": "팀 떠나기",
+  "label.less-than": "미만",
+  "label.less-than-equals": "이하",
   "label.login": "로그인",
   "label.logout": "로그아웃",
-  "label.manage": "Manage",
-  "label.manager": "Manager",
-  "label.max": "Max",
-  "label.member": "Member",
-  "label.members": "Members",
-  "label.min": "Min",
+  "label.manage": "관리",
+  "label.manager": "관리자",
+  "label.max": "최대",
+  "label.member": "멤버",
+  "label.members": "멤버",
+  "label.min": "최소",
   "label.mobile": "모바일",
   "label.more": "더 보기",
-  "label.my-account": "My account",
-  "label.my-websites": "My websites",
+  "label.my-account": "내 계정",
+  "label.my-websites": "내 웹사이트",
   "label.name": "이름",
   "label.new-password": "새 비밀번호",
-  "label.none": "None",
-  "label.number-of-records": "{x} {x, plural, one {record} other {records}}",
-  "label.ok": "OK",
-  "label.os": "OS",
-  "label.overview": "Overview",
-  "label.owner": "Owner",
-  "label.page-of": "Page {current} of {total}",
-  "label.page-views": "페이지 뷰(PV)",
-  "label.pageTitle": "Page title",
+  "label.none": "없음",
+  "label.number-of-records": "{x} {x, plural, one {record} other {레코드}}",
+  "label.ok": "확인",
+  "label.os": "운영체제",
+  "label.overview": "개요",
+  "label.owner": "소유자",
+  "label.page-of": "{total} 중 {current} 페이지",
+  "label.page-views": "페이지 뷰",
+  "label.pageTitle": "페이지 제목",
   "label.pages": "페이지",
   "label.password": "비밀번호",
   "label.powered-by": "이 시스템은 {name}에서 구동되고 있습니다.",
-  "label.previous": "Previous",
-  "label.previous-period": "Previous period",
-  "label.previous-year": "Previous year",
+  "label.previous": "이전",
+  "label.previous-period": "이전 기간",
+  "label.previous-year": "이전 연도",
   "label.profile": "프로필",
-  "label.property": "Property",
-  "label.queries": "Queries",
-  "label.query": "Query",
-  "label.query-parameters": "Query parameters",
+  "label.property": "속성",
+  "label.queries": "쿼리",
+  "label.query": "쿼리",
+  "label.query-parameters": "쿼리 매개변수",
   "label.realtime": "실시간",
-  "label.referrer": "Referrer",
+  "label.referrer": "리퍼러",
   "label.referrers": "리퍼러",
   "label.refresh": "새로고침",
-  "label.regenerate": "Regenerate",
-  "label.region": "Region",
-  "label.regions": "Regions",
-  "label.remove": "Remove",
-  "label.remove-member": "Remove member",
-  "label.reports": "Reports",
+  "label.regenerate": "다시 생성",
+  "label.region": "지역",
+  "label.regions": "지역",
+  "label.remove": "제거",
+  "label.remove-member": "멤버 제거",
+  "label.reports": "리포트",
   "label.required": "필수",
   "label.reset": "리셋",
-  "label.reset-website": "Reset statistics",
-  "label.retention": "Retention",
-  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
-  "label.role": "Role",
-  "label.run-query": "Run query",
+  "label.reset-website": "웹사이트 초기화",
+  "label.retention": "리텐션",
+  "label.retention-description": "사용자가 얼마나 자주 돌아오는지를 추적하여 웹사이트의 리텐션을 측정하십시오.",
+  "label.role": "역할",
+  "label.run-query": "쿼리 실행",
   "label.save": "저장",
-  "label.screens": "Screens",
-  "label.search": "Search",
-  "label.select": "Select",
-  "label.select-date": "Select date",
-  "label.select-role": "Select role",
-  "label.select-website": "Select website",
-  "label.sessions": "Sessions",
+  "label.screens": "스크린",
+  "label.search": "검색",
+  "label.select": "선택",
+  "label.select-date": "날짜 선택",
+  "label.select-role": "역할 선택",
+  "label.select-website": "웹사이트 선택",
+  "label.sessions": "세션",
   "label.settings": "설정",
   "label.share-url": "공유 URL",
   "label.single-day": "하루",
-  "label.start-step": "Start Step",
-  "label.steps": "Steps",
-  "label.sum": "Sum",
+  "label.start-step": "시작 단계",
+  "label.steps": "단계",
+  "label.sum": "합계",
   "label.tablet": "태블릿",
-  "label.team": "Team",
-  "label.team-id": "Team ID",
-  "label.team-manager": "Team manager",
-  "label.team-member": "Team member",
-  "label.team-name": "Team name",
-  "label.team-owner": "Team owner",
-  "label.team-view-only": "Team view only",
-  "label.team-websites": "Team websites",
-  "label.teams": "Teams",
-  "label.theme": "Theme",
+  "label.team": "팀",
+  "label.team-id": "팀 ID",
+  "label.team-manager": "팀 관리자",
+  "label.team-member": "팀 멤버",
+  "label.team-name": "팀 이름",
+  "label.team-owner": "팀 소유자",
+  "label.team-view-only": "팀 보기 전용",
+  "label.team-websites": "팀 웹사이트",
+  "label.teams": "팀",
+  "label.theme": "테마",
   "label.this-month": "이번 달",
   "label.this-week": "이번 주",
   "label.this-year": "올해",
   "label.timezone": "표준 시간대",
-  "label.title": "Title",
+  "label.title": "제목",
   "label.today": "오늘",
-  "label.toggle-charts": "Toggle charts",
-  "label.total": "Total",
-  "label.total-records": "Total records",
+  "label.toggle-charts": "차트 전환",
+  "label.total": "합계",
+  "label.total-records": "총 레코드",
   "label.tracking-code": "추적 코드",
-  "label.transfer": "Transfer",
-  "label.transfer-website": "Transfer website",
-  "label.true": "True",
-  "label.type": "Type",
-  "label.unique": "Unique",
+  "label.transfer": "전송",
+  "label.transfer-website": "웹사이트 전송",
+  "label.true": "참",
+  "label.type": "유형",
+  "label.unique": "고유",
   "label.unique-visitors": "순방문자(UV)",
   "label.unknown": "알 수 없음",
-  "label.untitled": "Untitled",
-  "label.update": "Update",
+  "label.untitled": "제목 없음",
+  "label.update": "업데이트",
   "label.url": "URL",
-  "label.urls": "URLs",
-  "label.user": "User",
+  "label.urls": "URL",
+  "label.user": "사용자",
   "label.username": "사용자명",
-  "label.users": "Users",
+  "label.users": "사용자",
   "label.utm": "UTM",
-  "label.utm-description": "Track your campaigns through UTM parameters.",
-  "label.value": "Value",
-  "label.view": "View",
+  "label.utm-description": "UTM 매개변수를 통해 캠페인을 추적합니다.",
+  "label.value": "값",
+  "label.view": "보기",
   "label.view-details": "상세보기",
-  "label.view-only": "View only",
+  "label.view-only": "보기 전용",
   "label.views": "조회수",
-  "label.views-per-visit": "Views per visit",
+  "label.views-per-visit": "방문당 조회수",
   "label.visit-duration": "평균 방문 시간",
   "label.visitors": "방문객",
-  "label.visits": "Visits",
-  "label.website": "Website",
-  "label.website-id": "Website ID",
+  "label.visits": "방문",
+  "label.website": "웹사이트",
+  "label.website-id": "웹사이트 ID",
   "label.websites": "웹사이트",
-  "label.window": "Window",
-  "label.yesterday": "Yesterday",
-  "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
+  "label.window": "창",
+  "label.yesterday": "어제",
+  "message.action-confirmation": "확인을 위해 아래 상자에 {confirmation}을(를) 입력하십시오.",
   "message.active-users": "{x}명의 사용자가 보는 중입니다.",
-  "message.collected-data": "Collected data",
+  "message.collected-data": "수집된 데이터",
   "message.confirm-delete": "{target}을(를) 삭제하시겠습니까?",
-  "message.confirm-leave": "Are you sure you want to leave {target}?",
-  "message.confirm-remove": "Are you sure you want to remove {target}?",
-  "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
-  "message.delete-team-warning": "Deleting a team will also delete all team websites.",
-  "message.delete-website-warning": "관련된 모든 데이터도 삭제됩니다.",
+  "message.confirm-leave": "{target}을(를) 떠나시겠습니까?",
+  "message.confirm-remove": "{target}을(를) 제거하시겠습니까?",
+  "message.confirm-reset": "{target}을(를) 초기화하시겠습니까?",
+  "message.delete-team-warning": "팀을 삭제하면 팀에 등록된 모든 웹사이트도 삭제됩니다.",
+  "message.delete-website-warning": "관련된 모든 데이터가 삭제됩니다.",
   "message.error": "오류가 발생하였습니다.",
-  "message.event-log": "{event} on {url}",
+  "message.event-log": "{event} - {url}",
   "message.go-to-settings": "설정으로 이동",
-  "message.incorrect-username-password": "사용자 이름/비밀번호가 잘못되었습니다..",
+  "message.incorrect-username-password": "사용자 이름/비밀번호가 잘못되었습니다.",
   "message.invalid-domain": "잘못된 도메인",
-  "message.min-password-length": "Minimum length of {n} characters",
-  "message.new-version-available": "A new version of Umami {version} is available!",
+  "message.min-password-length": "최소 길이는 {n}자입니다",
+  "message.new-version-available": "새 버전이 사용 가능합니다! - Umami {version}",
   "message.no-data-available": "사용 가능한 데이터가 없습니다.",
-  "message.no-event-data": "No event data is available.",
+  "message.no-event-data": "사용 가능한 이벤트 데이터가 없습니다.",
   "message.no-match-password": "비밀번호가 일치하지 않음",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-teams": "You have not created any teams.",
-  "message.no-users": "There are no users.",
-  "message.no-websites-configured": "구성된 웹 사이트가 없습니다.",
+  "message.no-results-found": "결과를 찾을 수 없습니다.",
+  "message.no-team-websites": "이 팀에는 웹사이트가 없습니다.",
+  "message.no-teams": "생성된 팀이 없습니다.",
+  "message.no-users": "사용자가 없습니다.",
+  "message.no-websites-configured": "설정된 웹사이트가 없습니다.",
   "message.page-not-found": "페이지를 찾을 수 없습니다.",
-  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
-  "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
+  "message.reset-website": "이 웹사이트를 초기화하려면, 아래 상자에 {confirmation}을(를) 입력하십시오.",
+  "message.reset-website-warning": "이 웹사이트의 모든 통계가 삭제되지만 설정은 그대로 유지됩니다.",
   "message.saved": "성공적으로 저장되었습니다.",
-  "message.share-url": "이것은 {target}의 공개적으로 공유된 URL입니다.",
-  "message.team-already-member": "You are already a member of the team.",
-  "message.team-not-found": "Team not found.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.tracking-code": "추적 코드",
-  "message.transfer-team-website-to-user": "Transfer this website to your account?",
-  "message.transfer-user-website-to-team": "Select the team to transfer this website to.",
-  "message.transfer-website": "Transfer website ownership to your account or another team.",
-  "message.triggered-event": "Triggered event",
-  "message.user-deleted": "User deleted.",
-  "message.viewed-page": "Viewed page",
-  "message.visitor-log": "{os} {device}에서 {browser}을(를) 사용하는 {country}의 방문자",
-  "message.visitors-dropped-off": "Visitors dropped off"
+  "message.share-url": "아래 링크를 통해 웹사이트의 통계를 누구나 볼 수 있습니다.",
+  "message.team-already-member": "이미 팀의 회원입니다.",
+  "message.team-not-found": "팀을 찾을 수 없습니다.",
+  "message.team-websites-info": "웹사이트는 팀의 누구나 볼 수 있습니다.",
+  "message.tracking-code": "이 웹사이트의 통계를 추적하려면, 다음 코드를 HTML의 <head>...</head> 섹션에 추가하십시오.",
+  "message.transfer-team-website-to-user": "이 웹사이트를 당신의 계정으로 전송하시겠습니까?",
+  "message.transfer-user-website-to-team": "이 웹사이트를 전송받을 팀을 선택하십시오.",
+  "message.transfer-website": "웹사이트 소유권을 계정이나 다른 팀으로 전송합니다.",
+  "message.triggered-event": "트리거된 이벤트",
+  "message.user-deleted": "사용자가 삭제되었습니다.",
+  "message.viewed-page": "페이지 조회",
+  "message.visitor-log": "{country}의 {browser} 브라우저를 사용하는 {os} {device} 방문자",
+  "message.visitors-dropped-off": "방문자가 이탈했습니다"
 }

From caaa87c0a749474cb4cdb4f01d7991611ae1e31d Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 27 Jun 2024 20:12:32 -0700
Subject: [PATCH 186/438] Updated packages and lang files.

---
 package.json                    |   8 +-
 public/intl/messages/ca-ES.json |  46 ++--
 public/intl/messages/ko-KR.json | 454 ++++++++++++++++----------------
 public/intl/messages/zh-CN.json |  44 ++--
 yarn.lock                       | 216 +++++++--------
 5 files changed, 379 insertions(+), 389 deletions(-)

diff --git a/package.json b/package.json
index d002388f8a..9ef6f738bc 100644
--- a/package.json
+++ b/package.json
@@ -64,9 +64,9 @@
     ".next/cache"
   ],
   "dependencies": {
-    "@clickhouse/client": "^1.0.2",
+    "@clickhouse/client": "^1.2.0",
     "@fontsource/inter": "^4.5.15",
-    "@prisma/client": "5.14.0",
+    "@prisma/client": "5.16.1",
     "@prisma/extension-read-replicas": "^0.3.0",
     "@react-spring/web": "^9.7.3",
     "@tanstack/react-query": "^5.28.6",
@@ -98,11 +98,11 @@
     "maxmind": "^4.3.6",
     "md5": "^2.3.0",
     "moment-timezone": "^0.5.35",
-    "next": "14.2.3",
+    "next": "14.2.4",
     "next-basics": "^0.39.0",
     "node-fetch": "^3.2.8",
     "npm-run-all": "^4.1.5",
-    "prisma": "5.14.0",
+    "prisma": "5.16.1",
     "react": "^18.2.0",
     "react-basics": "^0.123.0",
     "react-beautiful-dnd": "^13.1.0",
diff --git a/public/intl/messages/ca-ES.json b/public/intl/messages/ca-ES.json
index f9b63535f0..dc7b27a87b 100644
--- a/public/intl/messages/ca-ES.json
+++ b/public/intl/messages/ca-ES.json
@@ -152,7 +152,7 @@
   "label.compare": [
     {
       "type": 0,
-      "value": "Compare"
+      "value": "Comparar"
     }
   ],
   "label.confirm": [
@@ -182,7 +182,7 @@
   "label.count": [
     {
       "type": 0,
-      "value": "Count"
+      "value": "Recompte"
     }
   ],
   "label.countries": [
@@ -236,7 +236,7 @@
   "label.current": [
     {
       "type": 0,
-      "value": "Current"
+      "value": "Actual"
     }
   ],
   "label.current-password": [
@@ -398,13 +398,13 @@
   "label.end-step": [
     {
       "type": 0,
-      "value": "End Step"
+      "value": "Pas Final"
     }
   ],
   "label.entry": [
     {
       "type": 0,
-      "value": "Entry URL"
+      "value": "URL d'entrada"
     }
   ],
   "label.event": [
@@ -428,7 +428,7 @@
   "label.exit": [
     {
       "type": 0,
-      "value": "Exit URL"
+      "value": "URL de sortida"
     }
   ],
   "label.false": [
@@ -488,19 +488,19 @@
   "label.goal": [
     {
       "type": 0,
-      "value": "Goal"
+      "value": "Meta"
     }
   ],
   "label.goals": [
     {
       "type": 0,
-      "value": "Goals"
+      "value": "Metes"
     }
   ],
   "label.goals-description": [
     {
       "type": 0,
-      "value": "Track your goals for pageviews and events."
+      "value": "Feu un seguiment de les seves metes per a pàgines vistes i esdeveniments."
     }
   ],
   "label.greater-than": [
@@ -518,13 +518,13 @@
   "label.host": [
     {
       "type": 0,
-      "value": "Host"
+      "value": "Amfitrió"
     }
   ],
   "label.hosts": [
     {
       "type": 0,
-      "value": "Hosts"
+      "value": "Amfitrions"
     }
   ],
   "label.insights": [
@@ -578,13 +578,13 @@
   "label.journey": [
     {
       "type": 0,
-      "value": "Journey"
+      "value": "Trajecte"
     }
   ],
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Entengui com naveguen els usuaris pel seu lloc web."
     }
   ],
   "label.language": [
@@ -777,7 +777,7 @@
           "value": [
             {
               "type": 0,
-              "value": "record"
+              "value": "registre"
             }
           ]
         },
@@ -785,7 +785,7 @@
           "value": [
             {
               "type": 0,
-              "value": "records"
+              "value": "registres"
             }
           ]
         }
@@ -874,19 +874,19 @@
   "label.previous": [
     {
       "type": 0,
-      "value": "Previous"
+      "value": "Anterior"
     }
   ],
   "label.previous-period": [
     {
       "type": 0,
-      "value": "Previous period"
+      "value": "Període anterior"
     }
   ],
   "label.previous-year": [
     {
       "type": 0,
-      "value": "Previous year"
+      "value": "Any anterior"
     }
   ],
   "label.profile": [
@@ -898,7 +898,7 @@
   "label.property": [
     {
       "type": 0,
-      "value": "Property"
+      "value": "Propietat"
     }
   ],
   "label.queries": [
@@ -1090,7 +1090,7 @@
   "label.start-step": [
     {
       "type": 0,
-      "value": "Start Step"
+      "value": "Pas inicial"
     }
   ],
   "label.steps": [
@@ -1360,7 +1360,7 @@
   "label.views-per-visit": [
     {
       "type": 0,
-      "value": "Views per visit"
+      "value": "Vistes per visita"
     }
   ],
   "label.visit-duration": [
@@ -1462,7 +1462,7 @@
   "message.collected-data": [
     {
       "type": 0,
-      "value": "Collected data"
+      "value": "Dades recol·lectades"
     }
   ],
   "message.confirm-delete": [
@@ -1790,7 +1790,7 @@
   "message.visitors-dropped-off": [
     {
       "type": 0,
-      "value": "Els visitants han sortit"
+      "value": "Visitants han sortit"
     }
   ]
 }
diff --git a/public/intl/messages/ko-KR.json b/public/intl/messages/ko-KR.json
index da196a3c96..deab1408bc 100644
--- a/public/intl/messages/ko-KR.json
+++ b/public/intl/messages/ko-KR.json
@@ -2,7 +2,7 @@
   "label.access-code": [
     {
       "type": 0,
-      "value": "Access code"
+      "value": "액세스 코드"
     }
   ],
   "label.actions": [
@@ -14,31 +14,31 @@
   "label.activity-log": [
     {
       "type": 0,
-      "value": "Activity log"
+      "value": "활동 기록"
     }
   ],
   "label.add": [
     {
       "type": 0,
-      "value": "Add"
+      "value": "추가"
     }
   ],
   "label.add-description": [
     {
       "type": 0,
-      "value": "Add description"
+      "value": "설명 추가"
     }
   ],
   "label.add-member": [
     {
       "type": 0,
-      "value": "Add member"
+      "value": "멤버 추가"
     }
   ],
   "label.add-step": [
     {
       "type": 0,
-      "value": "Add step"
+      "value": "단계 추가"
     }
   ],
   "label.add-website": [
@@ -56,7 +56,7 @@
   "label.after": [
     {
       "type": 0,
-      "value": "After"
+      "value": "이후"
     }
   ],
   "label.all": [
@@ -68,19 +68,19 @@
   "label.all-time": [
     {
       "type": 0,
-      "value": "All time"
+      "value": "전체 시간"
     }
   ],
   "label.analytics": [
     {
       "type": 0,
-      "value": "Analytics"
+      "value": "분석"
     }
   ],
   "label.average": [
     {
       "type": 0,
-      "value": "Average"
+      "value": "평균"
     }
   ],
   "label.back": [
@@ -92,7 +92,7 @@
   "label.before": [
     {
       "type": 0,
-      "value": "Before"
+      "value": "이전"
     }
   ],
   "label.bounce-rate": [
@@ -104,13 +104,13 @@
   "label.breakdown": [
     {
       "type": 0,
-      "value": "Breakdown"
+      "value": "세부 사항"
     }
   ],
   "label.browser": [
     {
       "type": 0,
-      "value": "Browser"
+      "value": "브라우저"
     }
   ],
   "label.browsers": [
@@ -128,37 +128,37 @@
   "label.change-password": [
     {
       "type": 0,
-      "value": "비밀번호 변경"
+      "value": "비밀번호 변경하기"
     }
   ],
   "label.cities": [
     {
       "type": 0,
-      "value": "Cities"
+      "value": "도시"
     }
   ],
   "label.city": [
     {
       "type": 0,
-      "value": "City"
+      "value": "도시"
     }
   ],
   "label.clear-all": [
     {
       "type": 0,
-      "value": "Clear all"
+      "value": "모두 지우기"
     }
   ],
   "label.compare": [
     {
       "type": 0,
-      "value": "Compare"
+      "value": "비교"
     }
   ],
   "label.confirm": [
     {
       "type": 0,
-      "value": "Confirm"
+      "value": "확인"
     }
   ],
   "label.confirm-password": [
@@ -170,19 +170,19 @@
   "label.contains": [
     {
       "type": 0,
-      "value": "Contains"
+      "value": "포함"
     }
   ],
   "label.continue": [
     {
       "type": 0,
-      "value": "Continue"
+      "value": "계속"
     }
   ],
   "label.count": [
     {
       "type": 0,
-      "value": "Count"
+      "value": "수"
     }
   ],
   "label.countries": [
@@ -194,49 +194,49 @@
   "label.country": [
     {
       "type": 0,
-      "value": "Country"
+      "value": "국가"
     }
   ],
   "label.create": [
     {
       "type": 0,
-      "value": "Create"
+      "value": "생성"
     }
   ],
   "label.create-report": [
     {
       "type": 0,
-      "value": "Create report"
+      "value": "리포트 생성"
     }
   ],
   "label.create-team": [
     {
       "type": 0,
-      "value": "Create team"
+      "value": "팀 생성"
     }
   ],
   "label.create-user": [
     {
       "type": 0,
-      "value": "Create user"
+      "value": "사용자 생성"
     }
   ],
   "label.created": [
     {
       "type": 0,
-      "value": "Created"
+      "value": "생성됨"
     }
   ],
   "label.created-by": [
     {
       "type": 0,
-      "value": "Created By"
+      "value": "작성자"
     }
   ],
   "label.current": [
     {
       "type": 0,
-      "value": "Current"
+      "value": "현재"
     }
   ],
   "label.current-password": [
@@ -260,13 +260,13 @@
   "label.data": [
     {
       "type": 0,
-      "value": "Data"
+      "value": "데이터"
     }
   ],
   "label.date": [
     {
       "type": 0,
-      "value": "Date"
+      "value": "날짜"
     }
   ],
   "label.date-range": [
@@ -278,7 +278,7 @@
   "label.day": [
     {
       "type": 0,
-      "value": "Day"
+      "value": "일"
     }
   ],
   "label.default-date-range": [
@@ -296,19 +296,19 @@
   "label.delete-report": [
     {
       "type": 0,
-      "value": "Delete report"
+      "value": "리포트 삭제"
     }
   ],
   "label.delete-team": [
     {
       "type": 0,
-      "value": "Delete team"
+      "value": "팀 삭제"
     }
   ],
   "label.delete-user": [
     {
       "type": 0,
-      "value": "Delete user"
+      "value": "사용자 삭제"
     }
   ],
   "label.delete-website": [
@@ -320,7 +320,7 @@
   "label.description": [
     {
       "type": 0,
-      "value": "Description"
+      "value": "설명"
     }
   ],
   "label.desktop": [
@@ -332,13 +332,13 @@
   "label.details": [
     {
       "type": 0,
-      "value": "Details"
+      "value": "세부 사항"
     }
   ],
   "label.device": [
     {
       "type": 0,
-      "value": "Device"
+      "value": "기기"
     }
   ],
   "label.devices": [
@@ -356,7 +356,7 @@
   "label.does-not-contain": [
     {
       "type": 0,
-      "value": "Does not contain"
+      "value": "포함하지 않음"
     }
   ],
   "label.domain": [
@@ -368,7 +368,7 @@
   "label.dropoff": [
     {
       "type": 0,
-      "value": "Dropoff"
+      "value": "이탈"
     }
   ],
   "label.edit": [
@@ -380,13 +380,13 @@
   "label.edit-dashboard": [
     {
       "type": 0,
-      "value": "Edit dashboard"
+      "value": "대시보드 편집"
     }
   ],
   "label.edit-member": [
     {
       "type": 0,
-      "value": "Edit member"
+      "value": "회원 편집"
     }
   ],
   "label.enable-share-url": [
@@ -398,25 +398,25 @@
   "label.end-step": [
     {
       "type": 0,
-      "value": "End Step"
+      "value": "종료 단계"
     }
   ],
   "label.entry": [
     {
       "type": 0,
-      "value": "Entry URL"
+      "value": "입장 URL"
     }
   ],
   "label.event": [
     {
       "type": 0,
-      "value": "Event"
+      "value": "이벤트"
     }
   ],
   "label.event-data": [
     {
       "type": 0,
-      "value": "Event data"
+      "value": "이벤트 데이터"
     }
   ],
   "label.events": [
@@ -428,31 +428,31 @@
   "label.exit": [
     {
       "type": 0,
-      "value": "Exit URL"
+      "value": "퇴장 URL"
     }
   ],
   "label.false": [
     {
       "type": 0,
-      "value": "False"
+      "value": "거짓"
     }
   ],
   "label.field": [
     {
       "type": 0,
-      "value": "Field"
+      "value": "필드"
     }
   ],
   "label.fields": [
     {
       "type": 0,
-      "value": "Fields"
+      "value": "필드"
     }
   ],
   "label.filter": [
     {
       "type": 0,
-      "value": "Filter"
+      "value": "필터"
     }
   ],
   "label.filter-combined": [
@@ -470,133 +470,133 @@
   "label.filters": [
     {
       "type": 0,
-      "value": "Filters"
+      "value": "필터"
     }
   ],
   "label.funnel": [
     {
       "type": 0,
-      "value": "Funnel"
+      "value": "퍼널"
     }
   ],
   "label.funnel-description": [
     {
       "type": 0,
-      "value": "Understand the conversion and drop-off rate of users."
+      "value": "사용자 전환율 및 이탈률을 살펴보세요."
     }
   ],
   "label.goal": [
     {
       "type": 0,
-      "value": "Goal"
+      "value": "목표"
     }
   ],
   "label.goals": [
     {
       "type": 0,
-      "value": "Goals"
+      "value": "목표"
     }
   ],
   "label.goals-description": [
     {
       "type": 0,
-      "value": "Track your goals for pageviews and events."
+      "value": "페이지뷰 및 이벤트 목표를 추적합니다."
     }
   ],
   "label.greater-than": [
     {
       "type": 0,
-      "value": "Greater than"
+      "value": "이상"
     }
   ],
   "label.greater-than-equals": [
     {
       "type": 0,
-      "value": "Greater than or equals"
+      "value": "이상"
     }
   ],
   "label.host": [
     {
       "type": 0,
-      "value": "Host"
+      "value": "호스트"
     }
   ],
   "label.hosts": [
     {
       "type": 0,
-      "value": "Hosts"
+      "value": "호스트"
     }
   ],
   "label.insights": [
     {
       "type": 0,
-      "value": "Insights"
+      "value": "인사이트"
     }
   ],
   "label.insights-description": [
     {
       "type": 0,
-      "value": "Dive deeper into your data by using segments and filters."
+      "value": "세그먼트 및 필터를 사용하여 데이터를 더 자세히 살펴보세요."
     }
   ],
   "label.is": [
     {
       "type": 0,
-      "value": "Is"
+      "value": "해당"
     }
   ],
   "label.is-not": [
     {
       "type": 0,
-      "value": "Is not"
+      "value": "해당하지 않음"
     }
   ],
   "label.is-not-set": [
     {
       "type": 0,
-      "value": "Is not set"
+      "value": "설정되지 않음"
     }
   ],
   "label.is-set": [
     {
       "type": 0,
-      "value": "Is set"
+      "value": "설정됨"
     }
   ],
   "label.join": [
     {
       "type": 0,
-      "value": "Join"
+      "value": "가입"
     }
   ],
   "label.join-team": [
     {
       "type": 0,
-      "value": "Join team"
+      "value": "팀 가입"
     }
   ],
   "label.journey": [
     {
       "type": 0,
-      "value": "Journey"
+      "value": "여정"
     }
   ],
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "사용자가 웹사이트를 탐색하는 경로를 살펴보세요."
     }
   ],
   "label.language": [
     {
       "type": 0,
-      "value": "Language"
+      "value": "언어"
     }
   ],
   "label.languages": [
     {
       "type": 0,
-      "value": "Languages"
+      "value": "언어"
     }
   ],
   "label.laptop": [
@@ -616,7 +616,7 @@
     },
     {
       "type": 0,
-      "value": " 일간"
+      "value": " 일"
     }
   ],
   "label.last-hours": [
@@ -636,7 +636,7 @@
   "label.last-months": [
     {
       "type": 0,
-      "value": "Last "
+      "value": "최근 "
     },
     {
       "type": 1,
@@ -644,31 +644,31 @@
     },
     {
       "type": 0,
-      "value": " months"
+      "value": " 개월"
     }
   ],
   "label.leave": [
     {
       "type": 0,
-      "value": "Leave"
+      "value": "떠나기"
     }
   ],
   "label.leave-team": [
     {
       "type": 0,
-      "value": "Leave team"
+      "value": "팀 떠나기"
     }
   ],
   "label.less-than": [
     {
       "type": 0,
-      "value": "Less than"
+      "value": "미만"
     }
   ],
   "label.less-than-equals": [
     {
       "type": 0,
-      "value": "Less than or equals"
+      "value": "이하"
     }
   ],
   "label.login": [
@@ -686,37 +686,37 @@
   "label.manage": [
     {
       "type": 0,
-      "value": "Manage"
+      "value": "관리"
     }
   ],
   "label.manager": [
     {
       "type": 0,
-      "value": "Manager"
+      "value": "관리자"
     }
   ],
   "label.max": [
     {
       "type": 0,
-      "value": "Max"
+      "value": "최대"
     }
   ],
   "label.member": [
     {
       "type": 0,
-      "value": "Member"
+      "value": "멤버"
     }
   ],
   "label.members": [
     {
       "type": 0,
-      "value": "Members"
+      "value": "멤버"
     }
   ],
   "label.min": [
     {
       "type": 0,
-      "value": "Min"
+      "value": "최소"
     }
   ],
   "label.mobile": [
@@ -734,13 +734,13 @@
   "label.my-account": [
     {
       "type": 0,
-      "value": "My account"
+      "value": "내 계정"
     }
   ],
   "label.my-websites": [
     {
       "type": 0,
-      "value": "My websites"
+      "value": "내 웹사이트"
     }
   ],
   "label.name": [
@@ -758,7 +758,7 @@
   "label.none": [
     {
       "type": 0,
-      "value": "None"
+      "value": "없음"
     }
   ],
   "label.number-of-records": [
@@ -785,7 +785,7 @@
           "value": [
             {
               "type": 0,
-              "value": "records"
+              "value": "레코드"
             }
           ]
         }
@@ -798,31 +798,35 @@
   "label.ok": [
     {
       "type": 0,
-      "value": "OK"
+      "value": "확인"
     }
   ],
   "label.os": [
     {
       "type": 0,
-      "value": "OS"
+      "value": "운영체제"
     }
   ],
   "label.overview": [
     {
       "type": 0,
-      "value": "Overview"
+      "value": "개요"
     }
   ],
   "label.owner": [
     {
       "type": 0,
-      "value": "Owner"
+      "value": "소유자"
     }
   ],
   "label.page-of": [
+    {
+      "type": 1,
+      "value": "total"
+    },
     {
       "type": 0,
-      "value": "Page "
+      "value": " 중 "
     },
     {
       "type": 1,
@@ -830,23 +834,19 @@
     },
     {
       "type": 0,
-      "value": " of "
-    },
-    {
-      "type": 1,
-      "value": "total"
+      "value": " 페이지"
     }
   ],
   "label.page-views": [
     {
       "type": 0,
-      "value": "페이지 뷰(PV)"
+      "value": "페이지 뷰"
     }
   ],
   "label.pageTitle": [
     {
       "type": 0,
-      "value": "Page title"
+      "value": "페이지 제목"
     }
   ],
   "label.pages": [
@@ -878,19 +878,19 @@
   "label.previous": [
     {
       "type": 0,
-      "value": "Previous"
+      "value": "이전"
     }
   ],
   "label.previous-period": [
     {
       "type": 0,
-      "value": "Previous period"
+      "value": "이전 기간"
     }
   ],
   "label.previous-year": [
     {
       "type": 0,
-      "value": "Previous year"
+      "value": "이전 연도"
     }
   ],
   "label.profile": [
@@ -902,25 +902,25 @@
   "label.property": [
     {
       "type": 0,
-      "value": "Property"
+      "value": "속성"
     }
   ],
   "label.queries": [
     {
       "type": 0,
-      "value": "Queries"
+      "value": "쿼리"
     }
   ],
   "label.query": [
     {
       "type": 0,
-      "value": "Query"
+      "value": "쿼리"
     }
   ],
   "label.query-parameters": [
     {
       "type": 0,
-      "value": "Query parameters"
+      "value": "쿼리 매개변수"
     }
   ],
   "label.realtime": [
@@ -932,7 +932,7 @@
   "label.referrer": [
     {
       "type": 0,
-      "value": "Referrer"
+      "value": "리퍼러"
     }
   ],
   "label.referrers": [
@@ -950,37 +950,37 @@
   "label.regenerate": [
     {
       "type": 0,
-      "value": "Regenerate"
+      "value": "다시 생성"
     }
   ],
   "label.region": [
     {
       "type": 0,
-      "value": "Region"
+      "value": "지역"
     }
   ],
   "label.regions": [
     {
       "type": 0,
-      "value": "Regions"
+      "value": "지역"
     }
   ],
   "label.remove": [
     {
       "type": 0,
-      "value": "Remove"
+      "value": "제거"
     }
   ],
   "label.remove-member": [
     {
       "type": 0,
-      "value": "Remove member"
+      "value": "멤버 제거"
     }
   ],
   "label.reports": [
     {
       "type": 0,
-      "value": "Reports"
+      "value": "리포트"
     }
   ],
   "label.required": [
@@ -998,31 +998,31 @@
   "label.reset-website": [
     {
       "type": 0,
-      "value": "Reset statistics"
+      "value": "웹사이트 초기화"
     }
   ],
   "label.retention": [
     {
       "type": 0,
-      "value": "Retention"
+      "value": "리텐션"
     }
   ],
   "label.retention-description": [
     {
       "type": 0,
-      "value": "Measure your website stickiness by tracking how often users return."
+      "value": "사용자가 얼마나 자주 돌아오는지를 추적하여 웹사이트의 리텐션을 측정하십시오."
     }
   ],
   "label.role": [
     {
       "type": 0,
-      "value": "Role"
+      "value": "역할"
     }
   ],
   "label.run-query": [
     {
       "type": 0,
-      "value": "Run query"
+      "value": "쿼리 실행"
     }
   ],
   "label.save": [
@@ -1034,43 +1034,43 @@
   "label.screens": [
     {
       "type": 0,
-      "value": "Screens"
+      "value": "스크린"
     }
   ],
   "label.search": [
     {
       "type": 0,
-      "value": "Search"
+      "value": "검색"
     }
   ],
   "label.select": [
     {
       "type": 0,
-      "value": "Select"
+      "value": "선택"
     }
   ],
   "label.select-date": [
     {
       "type": 0,
-      "value": "Select date"
+      "value": "날짜 선택"
     }
   ],
   "label.select-role": [
     {
       "type": 0,
-      "value": "Select role"
+      "value": "역할 선택"
     }
   ],
   "label.select-website": [
     {
       "type": 0,
-      "value": "Select website"
+      "value": "웹사이트 선택"
     }
   ],
   "label.sessions": [
     {
       "type": 0,
-      "value": "Sessions"
+      "value": "세션"
     }
   ],
   "label.settings": [
@@ -1094,19 +1094,19 @@
   "label.start-step": [
     {
       "type": 0,
-      "value": "Start Step"
+      "value": "시작 단계"
     }
   ],
   "label.steps": [
     {
       "type": 0,
-      "value": "Steps"
+      "value": "단계"
     }
   ],
   "label.sum": [
     {
       "type": 0,
-      "value": "Sum"
+      "value": "합계"
     }
   ],
   "label.tablet": [
@@ -1118,61 +1118,61 @@
   "label.team": [
     {
       "type": 0,
-      "value": "Team"
+      "value": "팀"
     }
   ],
   "label.team-id": [
     {
       "type": 0,
-      "value": "Team ID"
+      "value": "팀 ID"
     }
   ],
   "label.team-manager": [
     {
       "type": 0,
-      "value": "Team manager"
+      "value": "팀 관리자"
     }
   ],
   "label.team-member": [
     {
       "type": 0,
-      "value": "Team member"
+      "value": "팀 멤버"
     }
   ],
   "label.team-name": [
     {
       "type": 0,
-      "value": "Team name"
+      "value": "팀 이름"
     }
   ],
   "label.team-owner": [
     {
       "type": 0,
-      "value": "Team owner"
+      "value": "팀 소유자"
     }
   ],
   "label.team-view-only": [
     {
       "type": 0,
-      "value": "Team view only"
+      "value": "팀 보기 전용"
     }
   ],
   "label.team-websites": [
     {
       "type": 0,
-      "value": "Team websites"
+      "value": "팀 웹사이트"
     }
   ],
   "label.teams": [
     {
       "type": 0,
-      "value": "Teams"
+      "value": "팀"
     }
   ],
   "label.theme": [
     {
       "type": 0,
-      "value": "Theme"
+      "value": "테마"
     }
   ],
   "label.this-month": [
@@ -1202,7 +1202,7 @@
   "label.title": [
     {
       "type": 0,
-      "value": "Title"
+      "value": "제목"
     }
   ],
   "label.today": [
@@ -1214,19 +1214,19 @@
   "label.toggle-charts": [
     {
       "type": 0,
-      "value": "Toggle charts"
+      "value": "차트 전환"
     }
   ],
   "label.total": [
     {
       "type": 0,
-      "value": "Total"
+      "value": "합계"
     }
   ],
   "label.total-records": [
     {
       "type": 0,
-      "value": "Total records"
+      "value": "총 레코드"
     }
   ],
   "label.tracking-code": [
@@ -1238,31 +1238,31 @@
   "label.transfer": [
     {
       "type": 0,
-      "value": "Transfer"
+      "value": "전송"
     }
   ],
   "label.transfer-website": [
     {
       "type": 0,
-      "value": "Transfer website"
+      "value": "웹사이트 전송"
     }
   ],
   "label.true": [
     {
       "type": 0,
-      "value": "True"
+      "value": "참"
     }
   ],
   "label.type": [
     {
       "type": 0,
-      "value": "Type"
+      "value": "유형"
     }
   ],
   "label.unique": [
     {
       "type": 0,
-      "value": "Unique"
+      "value": "고유"
     }
   ],
   "label.unique-visitors": [
@@ -1280,13 +1280,13 @@
   "label.untitled": [
     {
       "type": 0,
-      "value": "Untitled"
+      "value": "제목 없음"
     }
   ],
   "label.update": [
     {
       "type": 0,
-      "value": "Update"
+      "value": "업데이트"
     }
   ],
   "label.url": [
@@ -1298,13 +1298,13 @@
   "label.urls": [
     {
       "type": 0,
-      "value": "URLs"
+      "value": "URL"
     }
   ],
   "label.user": [
     {
       "type": 0,
-      "value": "User"
+      "value": "사용자"
     }
   ],
   "label.username": [
@@ -1316,7 +1316,7 @@
   "label.users": [
     {
       "type": 0,
-      "value": "Users"
+      "value": "사용자"
     }
   ],
   "label.utm": [
@@ -1328,19 +1328,19 @@
   "label.utm-description": [
     {
       "type": 0,
-      "value": "Track your campaigns through UTM parameters."
+      "value": "UTM 매개변수를 통해 캠페인을 추적합니다."
     }
   ],
   "label.value": [
     {
       "type": 0,
-      "value": "Value"
+      "value": "값"
     }
   ],
   "label.view": [
     {
       "type": 0,
-      "value": "View"
+      "value": "보기"
     }
   ],
   "label.view-details": [
@@ -1352,7 +1352,7 @@
   "label.view-only": [
     {
       "type": 0,
-      "value": "View only"
+      "value": "보기 전용"
     }
   ],
   "label.views": [
@@ -1364,7 +1364,7 @@
   "label.views-per-visit": [
     {
       "type": 0,
-      "value": "Views per visit"
+      "value": "방문당 조회수"
     }
   ],
   "label.visit-duration": [
@@ -1382,19 +1382,19 @@
   "label.visits": [
     {
       "type": 0,
-      "value": "Visits"
+      "value": "방문"
     }
   ],
   "label.website": [
     {
       "type": 0,
-      "value": "Website"
+      "value": "웹사이트"
     }
   ],
   "label.website-id": [
     {
       "type": 0,
-      "value": "Website ID"
+      "value": "웹사이트 ID"
     }
   ],
   "label.websites": [
@@ -1406,19 +1406,19 @@
   "label.window": [
     {
       "type": 0,
-      "value": "Window"
+      "value": "창"
     }
   ],
   "label.yesterday": [
     {
       "type": 0,
-      "value": "Yesterday"
+      "value": "어제"
     }
   ],
   "message.action-confirmation": [
     {
       "type": 0,
-      "value": "Type "
+      "value": "확인을 위해 아래 상자에 "
     },
     {
       "type": 1,
@@ -1426,7 +1426,7 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": "을(를) 입력하십시오."
     }
   ],
   "message.active-users": [
@@ -1442,7 +1442,7 @@
   "message.collected-data": [
     {
       "type": 0,
-      "value": "Collected data"
+      "value": "수집된 데이터"
     }
   ],
   "message.confirm-delete": [
@@ -1456,57 +1456,45 @@
     }
   ],
   "message.confirm-leave": [
-    {
-      "type": 0,
-      "value": "Are you sure you want to leave "
-    },
     {
       "type": 1,
       "value": "target"
     },
     {
       "type": 0,
-      "value": "?"
+      "value": "을(를) 떠나시겠습니까?"
     }
   ],
   "message.confirm-remove": [
-    {
-      "type": 0,
-      "value": "Are you sure you want to remove "
-    },
     {
       "type": 1,
       "value": "target"
     },
     {
       "type": 0,
-      "value": "?"
+      "value": "을(를) 제거하시겠습니까?"
     }
   ],
   "message.confirm-reset": [
-    {
-      "type": 0,
-      "value": "Are your sure you want to reset "
-    },
     {
       "type": 1,
       "value": "target"
     },
     {
       "type": 0,
-      "value": "'s statistics?"
+      "value": "을(를) 초기화하시겠습니까?"
     }
   ],
   "message.delete-team-warning": [
     {
       "type": 0,
-      "value": "Deleting a team will also delete all team websites."
+      "value": "팀을 삭제하면 팀에 등록된 모든 웹사이트도 삭제됩니다."
     }
   ],
   "message.delete-website-warning": [
     {
       "type": 0,
-      "value": "관련된 모든 데이터도 삭제됩니다."
+      "value": "관련된 모든 데이터가 삭제됩니다."
     }
   ],
   "message.error": [
@@ -1522,7 +1510,7 @@
     },
     {
       "type": 0,
-      "value": " on "
+      "value": " - "
     },
     {
       "type": 1,
@@ -1538,7 +1526,7 @@
   "message.incorrect-username-password": [
     {
       "type": 0,
-      "value": "사용자 이름/비밀번호가 잘못되었습니다.."
+      "value": "사용자 이름/비밀번호가 잘못되었습니다."
     }
   ],
   "message.invalid-domain": [
@@ -1550,7 +1538,7 @@
   "message.min-password-length": [
     {
       "type": 0,
-      "value": "Minimum length of "
+      "value": "최소 길이는 "
     },
     {
       "type": 1,
@@ -1558,21 +1546,17 @@
     },
     {
       "type": 0,
-      "value": " characters"
+      "value": "자입니다"
     }
   ],
   "message.new-version-available": [
     {
       "type": 0,
-      "value": "A new version of Umami "
+      "value": "새 버전이 사용 가능합니다! - Umami "
     },
     {
       "type": 1,
       "value": "version"
-    },
-    {
-      "type": 0,
-      "value": " is available!"
     }
   ],
   "message.no-data-available": [
@@ -1584,7 +1568,7 @@
   "message.no-event-data": [
     {
       "type": 0,
-      "value": "No event data is available."
+      "value": "사용 가능한 이벤트 데이터가 없습니다."
     }
   ],
   "message.no-match-password": [
@@ -1596,31 +1580,31 @@
   "message.no-results-found": [
     {
       "type": 0,
-      "value": "No results were found."
+      "value": "결과를 찾을 수 없습니다."
     }
   ],
   "message.no-team-websites": [
     {
       "type": 0,
-      "value": "This team does not have any websites."
+      "value": "이 팀에는 웹사이트가 없습니다."
     }
   ],
   "message.no-teams": [
     {
       "type": 0,
-      "value": "You have not created any teams."
+      "value": "생성된 팀이 없습니다."
     }
   ],
   "message.no-users": [
     {
       "type": 0,
-      "value": "There are no users."
+      "value": "사용자가 없습니다."
     }
   ],
   "message.no-websites-configured": [
     {
       "type": 0,
-      "value": "구성된 웹 사이트가 없습니다."
+      "value": "설정된 웹사이트가 없습니다."
     }
   ],
   "message.page-not-found": [
@@ -1632,7 +1616,7 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "To reset this website, type "
+      "value": "이 웹사이트를 초기화하려면, 아래 상자에 "
     },
     {
       "type": 1,
@@ -1640,13 +1624,13 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": "을(를) 입력하십시오."
     }
   ],
   "message.reset-website-warning": [
     {
       "type": 0,
-      "value": "All statistics for this website will be deleted, but your tracking code will remain intact."
+      "value": "이 웹사이트의 모든 통계가 삭제되지만 설정은 그대로 유지됩니다."
     }
   ],
   "message.saved": [
@@ -1658,115 +1642,121 @@
   "message.share-url": [
     {
       "type": 0,
-      "value": "이것은 "
-    },
-    {
-      "type": 1,
-      "value": "target"
-    },
-    {
-      "type": 0,
-      "value": "의 공개적으로 공유된 URL입니다."
+      "value": "아래 링크를 통해 웹사이트의 통계를 누구나 볼 수 있습니다."
     }
   ],
   "message.team-already-member": [
     {
       "type": 0,
-      "value": "You are already a member of the team."
+      "value": "이미 팀의 회원입니다."
     }
   ],
   "message.team-not-found": [
     {
       "type": 0,
-      "value": "Team not found."
+      "value": "팀을 찾을 수 없습니다."
     }
   ],
   "message.team-websites-info": [
     {
       "type": 0,
-      "value": "Websites can be viewed by anyone on the team."
+      "value": "웹사이트는 팀의 누구나 볼 수 있습니다."
     }
   ],
   "message.tracking-code": [
     {
       "type": 0,
-      "value": "추적 코드"
+      "value": "이 웹사이트의 통계를 추적하려면, 다음 코드를 HTML의 "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "..."
+        }
+      ],
+      "type": 8,
+      "value": "head"
+    },
+    {
+      "type": 0,
+      "value": " 섹션에 추가하십시오."
     }
   ],
   "message.transfer-team-website-to-user": [
     {
       "type": 0,
-      "value": "Transfer this website to your account?"
+      "value": "이 웹사이트를 당신의 계정으로 전송하시겠습니까?"
     }
   ],
   "message.transfer-user-website-to-team": [
     {
       "type": 0,
-      "value": "Select the team to transfer this website to."
+      "value": "이 웹사이트를 전송받을 팀을 선택하십시오."
     }
   ],
   "message.transfer-website": [
     {
       "type": 0,
-      "value": "Transfer website ownership to your account or another team."
+      "value": "웹사이트 소유권을 계정이나 다른 팀으로 전송합니다."
     }
   ],
   "message.triggered-event": [
     {
       "type": 0,
-      "value": "Triggered event"
+      "value": "트리거된 이벤트"
     }
   ],
   "message.user-deleted": [
     {
       "type": 0,
-      "value": "User deleted."
+      "value": "사용자가 삭제되었습니다."
     }
   ],
   "message.viewed-page": [
     {
       "type": 0,
-      "value": "Viewed page"
+      "value": "페이지 조회"
     }
   ],
   "message.visitor-log": [
     {
       "type": 1,
-      "value": "os"
+      "value": "country"
     },
     {
       "type": 0,
-      "value": " "
+      "value": "의 "
     },
     {
       "type": 1,
-      "value": "device"
+      "value": "browser"
     },
     {
       "type": 0,
-      "value": "에서 "
+      "value": " 브라우저를 사용하는 "
     },
     {
       "type": 1,
-      "value": "browser"
+      "value": "os"
     },
     {
       "type": 0,
-      "value": "을(를) 사용하는 "
+      "value": " "
     },
     {
       "type": 1,
-      "value": "country"
+      "value": "device"
     },
     {
       "type": 0,
-      "value": "의 방문자"
+      "value": " 방문자"
     }
   ],
   "message.visitors-dropped-off": [
     {
       "type": 0,
-      "value": "Visitors dropped off"
+      "value": "방문자가 이탈했습니다"
     }
   ]
 }
diff --git a/public/intl/messages/zh-CN.json b/public/intl/messages/zh-CN.json
index e66a8eb158..0b7da8a52e 100644
--- a/public/intl/messages/zh-CN.json
+++ b/public/intl/messages/zh-CN.json
@@ -152,7 +152,7 @@
   "label.compare": [
     {
       "type": 0,
-      "value": "Compare"
+      "value": "对比"
     }
   ],
   "label.confirm": [
@@ -182,7 +182,7 @@
   "label.count": [
     {
       "type": 0,
-      "value": "Count"
+      "value": "数量"
     }
   ],
   "label.countries": [
@@ -236,7 +236,7 @@
   "label.current": [
     {
       "type": 0,
-      "value": "Current"
+      "value": "当前"
     }
   ],
   "label.current-password": [
@@ -398,13 +398,13 @@
   "label.end-step": [
     {
       "type": 0,
-      "value": "End Step"
+      "value": "最后一步"
     }
   ],
   "label.entry": [
     {
       "type": 0,
-      "value": "Entry URL"
+      "value": "首次访问 URL"
     }
   ],
   "label.event": [
@@ -428,7 +428,7 @@
   "label.exit": [
     {
       "type": 0,
-      "value": "Exit URL"
+      "value": "退出 URL"
     }
   ],
   "label.false": [
@@ -488,19 +488,19 @@
   "label.goal": [
     {
       "type": 0,
-      "value": "Goal"
+      "value": "目标"
     }
   ],
   "label.goals": [
     {
       "type": 0,
-      "value": "Goals"
+      "value": "目标"
     }
   ],
   "label.goals-description": [
     {
       "type": 0,
-      "value": "Track your goals for pageviews and events."
+      "value": "追踪您的页面浏览量和事件目标。"
     }
   ],
   "label.greater-than": [
@@ -518,13 +518,13 @@
   "label.host": [
     {
       "type": 0,
-      "value": "Host"
+      "value": "主机"
     }
   ],
   "label.hosts": [
     {
       "type": 0,
-      "value": "Hosts"
+      "value": "主机"
     }
   ],
   "label.insights": [
@@ -578,13 +578,13 @@
   "label.journey": [
     {
       "type": 0,
-      "value": "Journey"
+      "value": "轨迹"
     }
   ],
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "了解用户如何浏览您网站的哪些页面。"
     }
   ],
   "label.language": [
@@ -692,7 +692,7 @@
   "label.manager": [
     {
       "type": 0,
-      "value": "Manager"
+      "value": "管理者"
     }
   ],
   "label.max": [
@@ -798,7 +798,7 @@
   "label.ok": [
     {
       "type": 0,
-      "value": "OK"
+      "value": "好的"
     }
   ],
   "label.os": [
@@ -882,19 +882,19 @@
   "label.previous": [
     {
       "type": 0,
-      "value": "Previous"
+      "value": "之前"
     }
   ],
   "label.previous-period": [
     {
       "type": 0,
-      "value": "Previous period"
+      "value": "前一周期"
     }
   ],
   "label.previous-year": [
     {
       "type": 0,
-      "value": "Previous year"
+      "value": "前一年"
     }
   ],
   "label.profile": [
@@ -906,7 +906,7 @@
   "label.property": [
     {
       "type": 0,
-      "value": "Property"
+      "value": "属性"
     }
   ],
   "label.queries": [
@@ -1098,7 +1098,7 @@
   "label.start-step": [
     {
       "type": 0,
-      "value": "Start Step"
+      "value": "第一步"
     }
   ],
   "label.steps": [
@@ -1134,7 +1134,7 @@
   "label.team-manager": [
     {
       "type": 0,
-      "value": "Team manager"
+      "value": "团队管理"
     }
   ],
   "label.team-member": [
@@ -1450,7 +1450,7 @@
   "message.collected-data": [
     {
       "type": 0,
-      "value": "Collected data"
+      "value": "收集数据"
     }
   ],
   "message.confirm-delete": [
diff --git a/yarn.lock b/yarn.lock
index 9b29fa7467..90f3da53ec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1206,17 +1206,17 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@clickhouse/client-common@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@clickhouse/client-common/-/client-common-1.0.2.tgz#0fe0a4b33101c08d85c1279e4d74b2a92d42d996"
-  integrity sha512-5oI2URFsXlzoysv5lAxoTUAnAHjXnaJ+1Jz3HUARR06Hkbr1sN0pGxfGwgjEd8E/lI4+UNdNEZicG2rlFnWSaA==
+"@clickhouse/client-common@1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@clickhouse/client-common/-/client-common-1.2.0.tgz#8845d373a14c6076d59118a0cb58afad84687372"
+  integrity sha512-VfA/C/tVJ2eNe72CaQ7eXmai+yqFEvZjQZiNtvJoOMLP+Vtb6DzqH9nfkgsiHHMhUhhclvt2mFh6+euk1Ea5wA==
 
-"@clickhouse/client@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@clickhouse/client/-/client-1.0.2.tgz#7d9675e697ce697f1e6777f4c66ca6d3384e7325"
-  integrity sha512-PaK0GLjIrlCpXevrp9gliOrurna6MjMMFBgZhDh6Zup8IuJCjQru4LkNsWUl3hJ2nua6+Ygag14iB8ILbeaIjg==
+"@clickhouse/client@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@clickhouse/client/-/client-1.2.0.tgz#83aa3b69635e19c94a975ee7ec9a68843915b94b"
+  integrity sha512-zMp2EhMfp1IrFKr/NjDwNiLsf7nq68nW8lGKszwFe7Iglc6Z5PY9ZA9Hd0XqAk75Q1NmFrkGCP1r3JCM1Nm1Bw==
   dependencies:
-    "@clickhouse/client-common" "1.0.2"
+    "@clickhouse/client-common" "1.2.0"
 
 "@colors/colors@1.5.0":
   version "1.5.0"
@@ -2006,10 +2006,10 @@
   resolved "https://registry.yarnpkg.com/@netlify/plugin-nextjs/-/plugin-nextjs-5.2.2.tgz#3c283d335001f9e0fbcb4db75557e5fe1660db72"
   integrity sha512-jV/P7o8+v1XaEGb7wvFfkF1fSLggAxjg7WYoBPkD3R93bsI6xmCDKBcUJ/6g7lqECRXt4dGKApSFtGk/pUmAHw==
 
-"@next/env@14.2.3":
-  version "14.2.3"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.3.tgz#d6def29d1c763c0afb397343a15a82e7d92353a0"
-  integrity sha512-W7fd7IbkfmeeY2gXrzJYDx8D2lWKbVoTIj1o1ScPHNzvp30s1AuoEFSdr39bC5sjxJaxTtq3OTCZboNp0lNWHA==
+"@next/env@14.2.4":
+  version "14.2.4"
+  resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.4.tgz#5546813dc4f809884a37d257b254a5ce1b0248d7"
+  integrity sha512-3EtkY5VDkuV2+lNmKlbkibIJxcO4oIHEhBWne6PaAp+76J9KoSsGvNikp6ivzAT8dhhBMYrm6op2pS1ApG0Hzg==
 
 "@next/eslint-plugin-next@14.2.3":
   version "14.2.3"
@@ -2018,50 +2018,50 @@
   dependencies:
     glob "10.3.10"
 
-"@next/swc-darwin-arm64@14.2.3":
-  version "14.2.3"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.3.tgz#db1a05eb88c0224089b815ad10ac128ec79c2cdb"
-  integrity sha512-3pEYo/RaGqPP0YzwnlmPN2puaF2WMLM3apt5jLW2fFdXD9+pqcoTzRk+iZsf8ta7+quAe4Q6Ms0nR0SFGFdS1A==
-
-"@next/swc-darwin-x64@14.2.3":
-  version "14.2.3"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.3.tgz#a3f8af05b5f9a52ac3082e66ac29e125ab1d7b9c"
-  integrity sha512-6adp7waE6P1TYFSXpY366xwsOnEXM+y1kgRpjSRVI2CBDOcbRjsJ67Z6EgKIqWIue52d2q/Mx8g9MszARj8IEA==
-
-"@next/swc-linux-arm64-gnu@14.2.3":
-  version "14.2.3"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.3.tgz#4e63f43879285b52554bfd39e6e0cc78a9b27bbf"
-  integrity sha512-cuzCE/1G0ZSnTAHJPUT1rPgQx1w5tzSX7POXSLaS7w2nIUJUD+e25QoXD/hMfxbsT9rslEXugWypJMILBj/QsA==
-
-"@next/swc-linux-arm64-musl@14.2.3":
-  version "14.2.3"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.3.tgz#ebdaed26214448b1e6f2c3e8b3cd29bfba387990"
-  integrity sha512-0D4/oMM2Y9Ta3nGuCcQN8jjJjmDPYpHX9OJzqk42NZGJocU2MqhBq5tWkJrUQOQY9N+In9xOdymzapM09GeiZw==
-
-"@next/swc-linux-x64-gnu@14.2.3":
-  version "14.2.3"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.3.tgz#19e3bcc137c3b582a1ab867106817e5c90a20593"
-  integrity sha512-ENPiNnBNDInBLyUU5ii8PMQh+4XLr4pG51tOp6aJ9xqFQ2iRI6IH0Ds2yJkAzNV1CfyagcyzPfROMViS2wOZ9w==
-
-"@next/swc-linux-x64-musl@14.2.3":
-  version "14.2.3"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.3.tgz#794a539b98e064169cf0ff7741b2a4fb16adec7d"
-  integrity sha512-BTAbq0LnCbF5MtoM7I/9UeUu/8ZBY0i8SFjUMCbPDOLv+un67e2JgyN4pmgfXBwy/I+RHu8q+k+MCkDN6P9ViQ==
-
-"@next/swc-win32-arm64-msvc@14.2.3":
-  version "14.2.3"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.3.tgz#eda9fa0fbf1ff9113e87ac2668ee67ce9e5add5a"
-  integrity sha512-AEHIw/dhAMLNFJFJIJIyOFDzrzI5bAjI9J26gbO5xhAKHYTZ9Or04BesFPXiAYXDNdrwTP2dQceYA4dL1geu8A==
-
-"@next/swc-win32-ia32-msvc@14.2.3":
-  version "14.2.3"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.3.tgz#7c1190e3f640ab16580c6bdbd7d0e766b9920457"
-  integrity sha512-vga40n1q6aYb0CLrM+eEmisfKCR45ixQYXuBXxOOmmoV8sYST9k7E3US32FsY+CkkF7NtzdcebiFT4CHuMSyZw==
-
-"@next/swc-win32-x64-msvc@14.2.3":
-  version "14.2.3"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.3.tgz#2be4e39ee25bfbd85be78eea17c0e7751dc4323c"
-  integrity sha512-Q1/zm43RWynxrO7lW4ehciQVj+5ePBhOK+/K2P7pLFX3JaJ/IZVC69SHidrmZSOkqz7ECIOhhy7XhAFG4JYyHA==
+"@next/swc-darwin-arm64@14.2.4":
+  version "14.2.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.4.tgz#da9f04c34a3d5f0b8401ed745768420e4a604036"
+  integrity sha512-AH3mO4JlFUqsYcwFUHb1wAKlebHU/Hv2u2kb1pAuRanDZ7pD/A/KPD98RHZmwsJpdHQwfEc/06mgpSzwrJYnNg==
+
+"@next/swc-darwin-x64@14.2.4":
+  version "14.2.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.4.tgz#46dedb29ec5503bf171a72a3ecb8aac6e738e9d6"
+  integrity sha512-QVadW73sWIO6E2VroyUjuAxhWLZWEpiFqHdZdoQ/AMpN9YWGuHV8t2rChr0ahy+irKX5mlDU7OY68k3n4tAZTg==
+
+"@next/swc-linux-arm64-gnu@14.2.4":
+  version "14.2.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.4.tgz#c9697ab9eb422bd1d7ffd0eb0779cc2aefa9d4a1"
+  integrity sha512-KT6GUrb3oyCfcfJ+WliXuJnD6pCpZiosx2X3k66HLR+DMoilRb76LpWPGb4tZprawTtcnyrv75ElD6VncVamUQ==
+
+"@next/swc-linux-arm64-musl@14.2.4":
+  version "14.2.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.4.tgz#cbbceb2008571c743b5a310a488d2e166d200a75"
+  integrity sha512-Alv8/XGSs/ytwQcbCHwze1HmiIkIVhDHYLjczSVrf0Wi2MvKn/blt7+S6FJitj3yTlMwMxII1gIJ9WepI4aZ/A==
+
+"@next/swc-linux-x64-gnu@14.2.4":
+  version "14.2.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.4.tgz#d79184223f857bacffb92f643cb2943a43632568"
+  integrity sha512-ze0ShQDBPCqxLImzw4sCdfnB3lRmN3qGMB2GWDRlq5Wqy4G36pxtNOo2usu/Nm9+V2Rh/QQnrRc2l94kYFXO6Q==
+
+"@next/swc-linux-x64-musl@14.2.4":
+  version "14.2.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.4.tgz#6b6c3e5ac02ca5e63394d280ec8ee607491902df"
+  integrity sha512-8dwC0UJoc6fC7PX70csdaznVMNr16hQrTDAMPvLPloazlcaWfdPogq+UpZX6Drqb1OBlwowz8iG7WR0Tzk/diQ==
+
+"@next/swc-win32-arm64-msvc@14.2.4":
+  version "14.2.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.4.tgz#dbad3906e870dba84c5883d9d4c4838472e0697f"
+  integrity sha512-jxyg67NbEWkDyvM+O8UDbPAyYRZqGLQDTPwvrBBeOSyVWW/jFQkQKQ70JDqDSYg1ZDdl+E3nkbFbq8xM8E9x8A==
+
+"@next/swc-win32-ia32-msvc@14.2.4":
+  version "14.2.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.4.tgz#6074529b91ba49132922ce89a2e16d25d2ec235d"
+  integrity sha512-twrmN753hjXRdcrZmZttb/m5xaCBFa48Dt3FbeEItpJArxriYDunWxJn+QFXdJ3hPkm4u7CKxncVvnmgQMY1ag==
+
+"@next/swc-win32-x64-msvc@14.2.4":
+  version "14.2.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.4.tgz#e65a1c6539a671f97bb86d5183d6e3a1733c29c7"
+  integrity sha512-tkLrjBzqFTP8DVrAAQmZelEahfR9OxWpFR++vAI9FBhCiIxtwHwBHC23SBHCTURBtwB4kc/x44imVOnkKGNVGg==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
@@ -2089,51 +2089,51 @@
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
   integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
 
-"@prisma/client@5.14.0":
-  version "5.14.0"
-  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.14.0.tgz#dadca5bb1137ddcebb454bbdaf89423823d3363f"
-  integrity sha512-akMSuyvLKeoU4LeyBAUdThP/uhVP3GuLygFE3MlYzaCb3/J8SfsYBE5PkaFuLuVpLyA6sFoW+16z/aPhNAESqg==
+"@prisma/client@5.16.1":
+  version "5.16.1"
+  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.16.1.tgz#65c5649b4701c097e7fa943c91a3140ce8bf053d"
+  integrity sha512-wM9SKQjF0qLxdnOZIVAIMKiz6Hu7vDt4FFAih85K1dk/Rr2mdahy6d3QP41K62N9O0DJJA//gUDA3Mp49xsKIg==
 
-"@prisma/debug@5.14.0":
-  version "5.14.0"
-  resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.14.0.tgz#1227c705893c38284f7c63d72441480ebaa12605"
-  integrity sha512-iq56qBZuFfX3fCxoxT8gBX33lQzomBU0qIUaEj1RebsKVz1ob/BVH1XSBwwwvRVtZEV1b7Fxx2eVu34Ge/mg3w==
+"@prisma/debug@5.16.1":
+  version "5.16.1"
+  resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.16.1.tgz#4887a57a0973fb732a60c30dc48de97bf1eefd7e"
+  integrity sha512-JsNgZAg6BD9RInLSrg7ZYzo11N7cVvYArq3fHGSD89HSgtN0VDdjV6bib7YddbcO6snzjchTiLfjeTqBjtArVQ==
 
-"@prisma/engines-version@5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48":
-  version "5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48"
-  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48.tgz#019c3c75a5c3276e580685fe48cdbfd181176858"
-  integrity sha512-ip6pNkRo1UxWv+6toxNcYvItNYaqQjXdFNGJ+Nuk2eYtRoEdoF13wxo7/jsClJFFenMPVNVqXQDV0oveXnR1cA==
+"@prisma/engines-version@5.16.0-24.34ace0eb2704183d2c05b60b52fba5c43c13f303":
+  version "5.16.0-24.34ace0eb2704183d2c05b60b52fba5c43c13f303"
+  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.16.0-24.34ace0eb2704183d2c05b60b52fba5c43c13f303.tgz#63ceebefb7daa1eb17f250cad75d35999a50ee1b"
+  integrity sha512-HkT2WbfmFZ9WUPyuJHhkiADxazHg8Y4gByrTSVeb3OikP6tjQ7txtSUGu9OBOBH0C13dPKN2qqH12xKtHu/Hiw==
 
-"@prisma/engines@5.14.0":
-  version "5.14.0"
-  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.14.0.tgz#2ee91dd2220a726c27c906fbea788bbb3efdac6e"
-  integrity sha512-lgxkKZ6IEygVcw6IZZUlPIfLQ9hjSYAtHjZ5r64sCLDgVzsPFCi2XBBJgzPMkOQ5RHzUD4E/dVdpn9+ez8tk1A==
+"@prisma/engines@5.16.1":
+  version "5.16.1"
+  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.16.1.tgz#a14e5d08d34241ed1f1bb7d11ed44eacb37b6fc6"
+  integrity sha512-KkyF3eIUtBIyp5A/rJHCtwQO18OjpGgx18PzjyGcJDY/+vNgaVyuVd+TgwBgeq6NLdd1XMwRCI+58vinHsAdfA==
   dependencies:
-    "@prisma/debug" "5.14.0"
-    "@prisma/engines-version" "5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48"
-    "@prisma/fetch-engine" "5.14.0"
-    "@prisma/get-platform" "5.14.0"
+    "@prisma/debug" "5.16.1"
+    "@prisma/engines-version" "5.16.0-24.34ace0eb2704183d2c05b60b52fba5c43c13f303"
+    "@prisma/fetch-engine" "5.16.1"
+    "@prisma/get-platform" "5.16.1"
 
 "@prisma/extension-read-replicas@^0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/@prisma/extension-read-replicas/-/extension-read-replicas-0.3.0.tgz#2842a7c928f957c1dd58a6256104797596d43426"
   integrity sha512-F9+rSmYday6GT2qjhJtkZcBOpLO5LtpvFcMGqrBDHf+78LEdSuxfFjOxYlNuqk4B+th62yxpbhfpmB9/Mca14Q==
 
-"@prisma/fetch-engine@5.14.0":
-  version "5.14.0"
-  resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.14.0.tgz#45297c118d4ec3fea55129886edd5a429da1f6da"
-  integrity sha512-VrheA9y9DMURK5vu8OJoOgQpxOhas3qF0IBHJ8G/0X44k82kc8E0w98HCn2nhnbOOMwbWsJWXfLC2/F8n5u0gQ==
+"@prisma/fetch-engine@5.16.1":
+  version "5.16.1"
+  resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.16.1.tgz#506a034eb23222af27ba635eb48c63df0ba7fc14"
+  integrity sha512-oOkjaPU1lhcA/Rvr4GVfd1NLJBwExgNBE36Ueq7dr71kTMwy++a3U3oLd2ZwrV9dj9xoP6LjCcky799D9nEt4w==
   dependencies:
-    "@prisma/debug" "5.14.0"
-    "@prisma/engines-version" "5.14.0-25.e9771e62de70f79a5e1c604a2d7c8e2a0a874b48"
-    "@prisma/get-platform" "5.14.0"
+    "@prisma/debug" "5.16.1"
+    "@prisma/engines-version" "5.16.0-24.34ace0eb2704183d2c05b60b52fba5c43c13f303"
+    "@prisma/get-platform" "5.16.1"
 
-"@prisma/get-platform@5.14.0":
-  version "5.14.0"
-  resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.14.0.tgz#69112d3dde61905f59a65ed818f153e153ca40f0"
-  integrity sha512-/yAyBvcEjRv41ynZrhdrPtHgk47xLRRq/o5eWGcUpBJ1YrUZTYB8EoPiopnP7iQrMATK8stXQdPOoVlrzuTQZw==
+"@prisma/get-platform@5.16.1":
+  version "5.16.1"
+  resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.16.1.tgz#613197c58acaafd5142d48a11f4df45a8f26a9e9"
+  integrity sha512-R4IKnWnMkR2nUAbU5gjrPehdQYUUd7RENFD2/D+xXTNhcqczp0N+WEGQ3ViyI3+6mtVcjjNIMdnUTNyu3GxIgA==
   dependencies:
-    "@prisma/debug" "5.14.0"
+    "@prisma/debug" "5.16.1"
 
 "@react-spring/animated@~9.7.3":
   version "9.7.3"
@@ -7601,12 +7601,12 @@ next-basics@^0.39.0:
     jsonwebtoken "^9.0.0"
     pure-rand "^6.0.2"
 
-next@14.2.3:
-  version "14.2.3"
-  resolved "https://registry.yarnpkg.com/next/-/next-14.2.3.tgz#f117dd5d5f20c307e7b8e4f9c1c97d961008925d"
-  integrity sha512-dowFkFTR8v79NPJO4QsBUtxv0g9BrS/phluVpMAt2ku7H+cbcBJlopXjkWlwxrk/xGqMemr7JkGPGemPrLLX7A==
+next@14.2.4:
+  version "14.2.4"
+  resolved "https://registry.yarnpkg.com/next/-/next-14.2.4.tgz#ef66c39c71e2d8ad0a3caa0383c8933f4663e4d1"
+  integrity sha512-R8/V7vugY+822rsQGQCjoLhMuC9oFj9SOi4Cl4b2wjDrseD0LRZ10W7R6Czo4w9ZznVSshKjuIomsRjvm9EKJQ==
   dependencies:
-    "@next/env" "14.2.3"
+    "@next/env" "14.2.4"
     "@swc/helpers" "0.5.5"
     busboy "1.6.0"
     caniuse-lite "^1.0.30001579"
@@ -7614,15 +7614,15 @@ next@14.2.3:
     postcss "8.4.31"
     styled-jsx "5.1.1"
   optionalDependencies:
-    "@next/swc-darwin-arm64" "14.2.3"
-    "@next/swc-darwin-x64" "14.2.3"
-    "@next/swc-linux-arm64-gnu" "14.2.3"
-    "@next/swc-linux-arm64-musl" "14.2.3"
-    "@next/swc-linux-x64-gnu" "14.2.3"
-    "@next/swc-linux-x64-musl" "14.2.3"
-    "@next/swc-win32-arm64-msvc" "14.2.3"
-    "@next/swc-win32-ia32-msvc" "14.2.3"
-    "@next/swc-win32-x64-msvc" "14.2.3"
+    "@next/swc-darwin-arm64" "14.2.4"
+    "@next/swc-darwin-x64" "14.2.4"
+    "@next/swc-linux-arm64-gnu" "14.2.4"
+    "@next/swc-linux-arm64-musl" "14.2.4"
+    "@next/swc-linux-x64-gnu" "14.2.4"
+    "@next/swc-linux-x64-musl" "14.2.4"
+    "@next/swc-win32-arm64-msvc" "14.2.4"
+    "@next/swc-win32-ia32-msvc" "14.2.4"
+    "@next/swc-win32-x64-msvc" "14.2.4"
 
 nice-try@^1.0.4:
   version "1.0.5"
@@ -8659,12 +8659,12 @@ pretty-format@^29.0.0, pretty-format@^29.7.0:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
-prisma@5.14.0:
-  version "5.14.0"
-  resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.14.0.tgz#ffc4696a43b044b636c3303b7aa98c13c2ade4dd"
-  integrity sha512-gCNZco7y5XtjrnQYeDJTiVZmT/ncqCr5RY1/Cf8X2wgLRmyh9ayPAGBNziI4qEE4S6SxCH5omQLVo9lmURaJ/Q==
+prisma@5.16.1:
+  version "5.16.1"
+  resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.16.1.tgz#6dfd1e27e6534741326f4a231f04c16b3fbb7ba9"
+  integrity sha512-Z1Uqodk44diztImxALgJJfNl2Uisl9xDRvqybMKEBYJLNKNhDfAHf+ZIJbZyYiBhLMbKU9cYGdDVG5IIXEnL2Q==
   dependencies:
-    "@prisma/engines" "5.14.0"
+    "@prisma/engines" "5.16.1"
 
 process@^0.11.10:
   version "0.11.10"

From 0142e0ff2f5e31d2b008355f4f45e7363f02921b Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 28 Jun 2024 20:20:12 -0700
Subject: [PATCH 187/438] Fixed typo.

---
 public/intl/messages/am-ET.json | 2 +-
 public/intl/messages/ar-SA.json | 2 +-
 public/intl/messages/be-BY.json | 2 +-
 public/intl/messages/bg-BG.json | 2 +-
 public/intl/messages/bn-BD.json | 2 +-
 public/intl/messages/bs-BA.json | 2 +-
 public/intl/messages/cs-CZ.json | 2 +-
 public/intl/messages/da-DK.json | 2 +-
 public/intl/messages/de-CH.json | 2 +-
 public/intl/messages/de-DE.json | 2 +-
 public/intl/messages/el-GR.json | 2 +-
 public/intl/messages/en-GB.json | 2 +-
 public/intl/messages/en-US.json | 2 +-
 public/intl/messages/es-ES.json | 2 +-
 public/intl/messages/fa-IR.json | 2 +-
 public/intl/messages/fi-FI.json | 2 +-
 public/intl/messages/fo-FO.json | 2 +-
 public/intl/messages/fr-FR.json | 2 +-
 public/intl/messages/ga-ES.json | 2 +-
 public/intl/messages/he-IL.json | 2 +-
 public/intl/messages/hi-IN.json | 2 +-
 public/intl/messages/hr-HR.json | 2 +-
 public/intl/messages/hu-HU.json | 2 +-
 public/intl/messages/id-ID.json | 2 +-
 public/intl/messages/it-IT.json | 2 +-
 public/intl/messages/ja-JP.json | 2 +-
 public/intl/messages/km-KH.json | 2 +-
 public/intl/messages/lt-LT.json | 2 +-
 public/intl/messages/mn-MN.json | 2 +-
 public/intl/messages/ms-MY.json | 2 +-
 public/intl/messages/my-MM.json | 2 +-
 public/intl/messages/nb-NO.json | 2 +-
 public/intl/messages/nl-NL.json | 2 +-
 public/intl/messages/pl-PL.json | 2 +-
 public/intl/messages/pt-BR.json | 2 +-
 public/intl/messages/pt-PT.json | 2 +-
 public/intl/messages/ro-RO.json | 2 +-
 public/intl/messages/ru-RU.json | 2 +-
 public/intl/messages/si-LK.json | 2 +-
 public/intl/messages/sk-SK.json | 2 +-
 public/intl/messages/sl-SI.json | 2 +-
 public/intl/messages/sv-SE.json | 2 +-
 public/intl/messages/ta-IN.json | 2 +-
 public/intl/messages/th-TH.json | 2 +-
 public/intl/messages/tr-TR.json | 2 +-
 public/intl/messages/uk-UA.json | 2 +-
 public/intl/messages/ur-PK.json | 2 +-
 public/intl/messages/vi-VN.json | 2 +-
 public/intl/messages/zh-TW.json | 2 +-
 src/components/messages.ts      | 2 +-
 src/lang/am-ET.json             | 2 +-
 src/lang/ar-SA.json             | 2 +-
 src/lang/be-BY.json             | 2 +-
 src/lang/bg-BG.json             | 2 +-
 src/lang/bn-BD.json             | 2 +-
 src/lang/bs-BA.json             | 2 +-
 src/lang/cs-CZ.json             | 2 +-
 src/lang/da-DK.json             | 2 +-
 src/lang/de-CH.json             | 2 +-
 src/lang/de-DE.json             | 2 +-
 src/lang/el-GR.json             | 2 +-
 src/lang/en-GB.json             | 2 +-
 src/lang/en-US.json             | 2 +-
 src/lang/es-ES.json             | 2 +-
 src/lang/fa-IR.json             | 2 +-
 src/lang/fi-FI.json             | 2 +-
 src/lang/fo-FO.json             | 2 +-
 src/lang/fr-FR.json             | 2 +-
 src/lang/ga-ES.json             | 2 +-
 src/lang/he-IL.json             | 2 +-
 src/lang/hi-IN.json             | 2 +-
 src/lang/hr-HR.json             | 2 +-
 src/lang/hu-HU.json             | 2 +-
 src/lang/id-ID.json             | 2 +-
 src/lang/it-IT.json             | 2 +-
 src/lang/ja-JP.json             | 2 +-
 src/lang/km-KH.json             | 2 +-
 src/lang/lt-LT.json             | 2 +-
 src/lang/mn-MN.json             | 2 +-
 src/lang/ms-MY.json             | 2 +-
 src/lang/my-MM.json             | 2 +-
 src/lang/nb-NO.json             | 2 +-
 src/lang/nl-NL.json             | 2 +-
 src/lang/pl-PL.json             | 2 +-
 src/lang/pt-BR.json             | 2 +-
 src/lang/pt-PT.json             | 2 +-
 src/lang/ro-RO.json             | 2 +-
 src/lang/ru-RU.json             | 2 +-
 src/lang/si-LK.json             | 2 +-
 src/lang/sk-SK.json             | 2 +-
 src/lang/sl-SI.json             | 2 +-
 src/lang/sv-SE.json             | 2 +-
 src/lang/ta-IN.json             | 2 +-
 src/lang/th-TH.json             | 2 +-
 src/lang/tr-TR.json             | 2 +-
 src/lang/uk-UA.json             | 2 +-
 src/lang/ur-PK.json             | 2 +-
 src/lang/vi-VN.json             | 2 +-
 src/lang/zh-TW.json             | 2 +-
 99 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/public/intl/messages/am-ET.json b/public/intl/messages/am-ET.json
index 6565c98b20..65427a024d 100644
--- a/public/intl/messages/am-ET.json
+++ b/public/intl/messages/am-ET.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/ar-SA.json b/public/intl/messages/ar-SA.json
index 721584d5a1..d6a1855e1f 100644
--- a/public/intl/messages/ar-SA.json
+++ b/public/intl/messages/ar-SA.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/be-BY.json b/public/intl/messages/be-BY.json
index 9af4e89523..e6afc2ca85 100644
--- a/public/intl/messages/be-BY.json
+++ b/public/intl/messages/be-BY.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/bg-BG.json b/public/intl/messages/bg-BG.json
index bf5f15dcd5..e970ec52e5 100644
--- a/public/intl/messages/bg-BG.json
+++ b/public/intl/messages/bg-BG.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/bn-BD.json b/public/intl/messages/bn-BD.json
index 827271e3b6..31e04cfa49 100644
--- a/public/intl/messages/bn-BD.json
+++ b/public/intl/messages/bn-BD.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/bs-BA.json b/public/intl/messages/bs-BA.json
index f3edb77352..3b5c10ff53 100644
--- a/public/intl/messages/bs-BA.json
+++ b/public/intl/messages/bs-BA.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/cs-CZ.json b/public/intl/messages/cs-CZ.json
index a2500688a0..eaef42457d 100644
--- a/public/intl/messages/cs-CZ.json
+++ b/public/intl/messages/cs-CZ.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/da-DK.json b/public/intl/messages/da-DK.json
index d9a6903f80..aac48bbc9b 100644
--- a/public/intl/messages/da-DK.json
+++ b/public/intl/messages/da-DK.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/de-CH.json b/public/intl/messages/de-CH.json
index 32d3b4434c..0d06a0e03e 100644
--- a/public/intl/messages/de-CH.json
+++ b/public/intl/messages/de-CH.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/de-DE.json b/public/intl/messages/de-DE.json
index 9a9b6d14f7..2482b208b5 100644
--- a/public/intl/messages/de-DE.json
+++ b/public/intl/messages/de-DE.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/el-GR.json b/public/intl/messages/el-GR.json
index f44bd026a0..af0f11be3e 100644
--- a/public/intl/messages/el-GR.json
+++ b/public/intl/messages/el-GR.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/en-GB.json b/public/intl/messages/en-GB.json
index efb8f1be4d..38a7857ccb 100644
--- a/public/intl/messages/en-GB.json
+++ b/public/intl/messages/en-GB.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/en-US.json b/public/intl/messages/en-US.json
index bf911728a8..52b968ddf1 100644
--- a/public/intl/messages/en-US.json
+++ b/public/intl/messages/en-US.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/es-ES.json b/public/intl/messages/es-ES.json
index 40ddded568..496fabc664 100644
--- a/public/intl/messages/es-ES.json
+++ b/public/intl/messages/es-ES.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/fa-IR.json b/public/intl/messages/fa-IR.json
index cb10df4b1e..d5408e6458 100644
--- a/public/intl/messages/fa-IR.json
+++ b/public/intl/messages/fa-IR.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/fi-FI.json b/public/intl/messages/fi-FI.json
index e43a185500..0af4dc6f4f 100644
--- a/public/intl/messages/fi-FI.json
+++ b/public/intl/messages/fi-FI.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/fo-FO.json b/public/intl/messages/fo-FO.json
index 1b2d4f0721..c9df65e1e2 100644
--- a/public/intl/messages/fo-FO.json
+++ b/public/intl/messages/fo-FO.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/fr-FR.json b/public/intl/messages/fr-FR.json
index 44fd708bee..bc4c51bb3f 100644
--- a/public/intl/messages/fr-FR.json
+++ b/public/intl/messages/fr-FR.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/ga-ES.json b/public/intl/messages/ga-ES.json
index 690083ae05..7e182d73c7 100644
--- a/public/intl/messages/ga-ES.json
+++ b/public/intl/messages/ga-ES.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/he-IL.json b/public/intl/messages/he-IL.json
index 740dfffaa5..ee8599f349 100644
--- a/public/intl/messages/he-IL.json
+++ b/public/intl/messages/he-IL.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/hi-IN.json b/public/intl/messages/hi-IN.json
index 2c178669b5..5fdffe3755 100644
--- a/public/intl/messages/hi-IN.json
+++ b/public/intl/messages/hi-IN.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/hr-HR.json b/public/intl/messages/hr-HR.json
index 974bdebd71..87f37e73ad 100644
--- a/public/intl/messages/hr-HR.json
+++ b/public/intl/messages/hr-HR.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/hu-HU.json b/public/intl/messages/hu-HU.json
index 227ef208a0..2cc464e990 100644
--- a/public/intl/messages/hu-HU.json
+++ b/public/intl/messages/hu-HU.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/id-ID.json b/public/intl/messages/id-ID.json
index dbe78a5018..8123d03b3a 100644
--- a/public/intl/messages/id-ID.json
+++ b/public/intl/messages/id-ID.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/it-IT.json b/public/intl/messages/it-IT.json
index 21b70650dc..d755b277a6 100644
--- a/public/intl/messages/it-IT.json
+++ b/public/intl/messages/it-IT.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/ja-JP.json b/public/intl/messages/ja-JP.json
index c11311c455..b2bc66a09a 100644
--- a/public/intl/messages/ja-JP.json
+++ b/public/intl/messages/ja-JP.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/km-KH.json b/public/intl/messages/km-KH.json
index d8f7d50123..841dabdd33 100644
--- a/public/intl/messages/km-KH.json
+++ b/public/intl/messages/km-KH.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/lt-LT.json b/public/intl/messages/lt-LT.json
index 891aed6ffa..e6c6cd1857 100644
--- a/public/intl/messages/lt-LT.json
+++ b/public/intl/messages/lt-LT.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/mn-MN.json b/public/intl/messages/mn-MN.json
index b11d88c12e..d9461929e1 100644
--- a/public/intl/messages/mn-MN.json
+++ b/public/intl/messages/mn-MN.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/ms-MY.json b/public/intl/messages/ms-MY.json
index 996af333db..8f47f3cd7a 100644
--- a/public/intl/messages/ms-MY.json
+++ b/public/intl/messages/ms-MY.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/my-MM.json b/public/intl/messages/my-MM.json
index 34f83c029f..9451a0febb 100644
--- a/public/intl/messages/my-MM.json
+++ b/public/intl/messages/my-MM.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/nb-NO.json b/public/intl/messages/nb-NO.json
index eeb648c482..3e73b45ee8 100644
--- a/public/intl/messages/nb-NO.json
+++ b/public/intl/messages/nb-NO.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/nl-NL.json b/public/intl/messages/nl-NL.json
index 16f2de07f9..a186de8625 100644
--- a/public/intl/messages/nl-NL.json
+++ b/public/intl/messages/nl-NL.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/pl-PL.json b/public/intl/messages/pl-PL.json
index 29e99d4fe6..608c0b3a80 100644
--- a/public/intl/messages/pl-PL.json
+++ b/public/intl/messages/pl-PL.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/pt-BR.json b/public/intl/messages/pt-BR.json
index 149af775da..ae5b0de4ba 100644
--- a/public/intl/messages/pt-BR.json
+++ b/public/intl/messages/pt-BR.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/pt-PT.json b/public/intl/messages/pt-PT.json
index 340ebb8852..02704e9e0f 100644
--- a/public/intl/messages/pt-PT.json
+++ b/public/intl/messages/pt-PT.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/ro-RO.json b/public/intl/messages/ro-RO.json
index 67d0929bcf..311199cf39 100644
--- a/public/intl/messages/ro-RO.json
+++ b/public/intl/messages/ro-RO.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/ru-RU.json b/public/intl/messages/ru-RU.json
index 1d0a86a1e7..30974dd64e 100644
--- a/public/intl/messages/ru-RU.json
+++ b/public/intl/messages/ru-RU.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/si-LK.json b/public/intl/messages/si-LK.json
index d7cfd7bf43..e6b06c6ba7 100644
--- a/public/intl/messages/si-LK.json
+++ b/public/intl/messages/si-LK.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/sk-SK.json b/public/intl/messages/sk-SK.json
index 2be1f01521..738ead435d 100644
--- a/public/intl/messages/sk-SK.json
+++ b/public/intl/messages/sk-SK.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/sl-SI.json b/public/intl/messages/sl-SI.json
index 83c383c1aa..67f65ad407 100644
--- a/public/intl/messages/sl-SI.json
+++ b/public/intl/messages/sl-SI.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/sv-SE.json b/public/intl/messages/sv-SE.json
index a6336a3044..c2b2c5e06f 100644
--- a/public/intl/messages/sv-SE.json
+++ b/public/intl/messages/sv-SE.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/ta-IN.json b/public/intl/messages/ta-IN.json
index 4afcb8db74..13ab67980f 100644
--- a/public/intl/messages/ta-IN.json
+++ b/public/intl/messages/ta-IN.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/th-TH.json b/public/intl/messages/th-TH.json
index 32d5e677d2..43158951dc 100644
--- a/public/intl/messages/th-TH.json
+++ b/public/intl/messages/th-TH.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/tr-TR.json b/public/intl/messages/tr-TR.json
index ac49dd47d5..1edfdbbc4e 100644
--- a/public/intl/messages/tr-TR.json
+++ b/public/intl/messages/tr-TR.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/uk-UA.json b/public/intl/messages/uk-UA.json
index 6ea471a6b3..33579a3373 100644
--- a/public/intl/messages/uk-UA.json
+++ b/public/intl/messages/uk-UA.json
@@ -566,7 +566,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/ur-PK.json b/public/intl/messages/ur-PK.json
index 18fce7ebb7..9d3c932b6c 100644
--- a/public/intl/messages/ur-PK.json
+++ b/public/intl/messages/ur-PK.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/vi-VN.json b/public/intl/messages/vi-VN.json
index 50409fab26..424d30a691 100644
--- a/public/intl/messages/vi-VN.json
+++ b/public/intl/messages/vi-VN.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/zh-TW.json b/public/intl/messages/zh-TW.json
index d6514ab4df..37c490d7c4 100644
--- a/public/intl/messages/zh-TW.json
+++ b/public/intl/messages/zh-TW.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/src/components/messages.ts b/src/components/messages.ts
index fa515c665f..6609076235 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -265,7 +265,7 @@ export const labels = defineMessages({
   journey: { id: 'label.journey', defaultMessage: 'Journey' },
   journeyDescription: {
     id: 'label.journey-description',
-    defaultMessage: 'Understand how users nagivate through your website.',
+    defaultMessage: 'Understand how users navigate through your website.',
   },
   compare: { id: 'label.compare', defaultMessage: 'Compare' },
   current: { id: 'label.current', defaultMessage: 'Current' },
diff --git a/src/lang/am-ET.json b/src/lang/am-ET.json
index 323fe4e88b..7c533031ab 100644
--- a/src/lang/am-ET.json
+++ b/src/lang/am-ET.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "Laptop",
diff --git a/src/lang/ar-SA.json b/src/lang/ar-SA.json
index a9fd02cfa4..f764f29e0a 100644
--- a/src/lang/ar-SA.json
+++ b/src/lang/ar-SA.json
@@ -96,7 +96,7 @@
   "label.join": "انضم",
   "label.join-team": "انضم للفريق",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "اللغة",
   "label.languages": "اللغات",
   "label.laptop": "لابتوب",
diff --git a/src/lang/be-BY.json b/src/lang/be-BY.json
index 3a4a033581..53533023fd 100644
--- a/src/lang/be-BY.json
+++ b/src/lang/be-BY.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Мова",
   "label.languages": "Мовы",
   "label.laptop": "Ноўтбук",
diff --git a/src/lang/bg-BG.json b/src/lang/bg-BG.json
index 9b22b466f4..5095b38799 100644
--- a/src/lang/bg-BG.json
+++ b/src/lang/bg-BG.json
@@ -96,7 +96,7 @@
   "label.join": "Присъедини се",
   "label.join-team": "Присъедини се към екип",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Език",
   "label.languages": "Езици",
   "label.laptop": "Лаптоп",
diff --git a/src/lang/bn-BD.json b/src/lang/bn-BD.json
index 43b41420c8..18eb1d896e 100644
--- a/src/lang/bn-BD.json
+++ b/src/lang/bn-BD.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "ভাষা",
   "label.languages": "ভাষা",
   "label.laptop": "ল্যাপটপ",
diff --git a/src/lang/bs-BA.json b/src/lang/bs-BA.json
index 04fb89ee4b..000af0dc20 100644
--- a/src/lang/bs-BA.json
+++ b/src/lang/bs-BA.json
@@ -96,7 +96,7 @@
   "label.join": "Učlani se",
   "label.join-team": "Učlani se u tim",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Jezik",
   "label.languages": "Jezici",
   "label.laptop": "Laptop",
diff --git a/src/lang/cs-CZ.json b/src/lang/cs-CZ.json
index 9c6d3ba197..3a57f6b28c 100644
--- a/src/lang/cs-CZ.json
+++ b/src/lang/cs-CZ.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "Přenosný počítač",
diff --git a/src/lang/da-DK.json b/src/lang/da-DK.json
index a0cbe5e650..715df99e21 100644
--- a/src/lang/da-DK.json
+++ b/src/lang/da-DK.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Sprog",
   "label.languages": "Sprog",
   "label.laptop": "Laptop",
diff --git a/src/lang/de-CH.json b/src/lang/de-CH.json
index bdd37cdc8d..6891480fa9 100644
--- a/src/lang/de-CH.json
+++ b/src/lang/de-CH.json
@@ -96,7 +96,7 @@
   "label.join": "Biträte",
   "label.join-team": "Team biträte",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Sprach",
   "label.languages": "Sprache",
   "label.laptop": "Laptop",
diff --git a/src/lang/de-DE.json b/src/lang/de-DE.json
index aca4b863f9..10b633263f 100644
--- a/src/lang/de-DE.json
+++ b/src/lang/de-DE.json
@@ -96,7 +96,7 @@
   "label.join": "Beitreten",
   "label.join-team": "Team beitreten",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Sprache",
   "label.languages": "Sprachen",
   "label.laptop": "Laptop",
diff --git a/src/lang/el-GR.json b/src/lang/el-GR.json
index 8155b97af7..ceb0812bdd 100644
--- a/src/lang/el-GR.json
+++ b/src/lang/el-GR.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "Λάπτοπ",
diff --git a/src/lang/en-GB.json b/src/lang/en-GB.json
index aeefe43997..9bb61811b4 100644
--- a/src/lang/en-GB.json
+++ b/src/lang/en-GB.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "Laptop",
diff --git a/src/lang/en-US.json b/src/lang/en-US.json
index 7487e220a2..e895036cc1 100644
--- a/src/lang/en-US.json
+++ b/src/lang/en-US.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "Laptop",
diff --git a/src/lang/es-ES.json b/src/lang/es-ES.json
index bdcb3e0ad0..d06bd19c2b 100644
--- a/src/lang/es-ES.json
+++ b/src/lang/es-ES.json
@@ -96,7 +96,7 @@
   "label.join": "Unir",
   "label.join-team": "Unirse al equipo",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Idioma",
   "label.languages": "Idiomas",
   "label.laptop": "Portátil",
diff --git a/src/lang/fa-IR.json b/src/lang/fa-IR.json
index 8eb2df241d..fe1705e30a 100644
--- a/src/lang/fa-IR.json
+++ b/src/lang/fa-IR.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "زبان",
   "label.languages": "زبان‌ها",
   "label.laptop": "لپ‌تاپ",
diff --git a/src/lang/fi-FI.json b/src/lang/fi-FI.json
index f6d18b35e5..02561dcb23 100644
--- a/src/lang/fi-FI.json
+++ b/src/lang/fi-FI.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Kieli",
   "label.languages": "Kielet",
   "label.laptop": "Kannettava tietokone",
diff --git a/src/lang/fo-FO.json b/src/lang/fo-FO.json
index 98646d2832..e9ca2aae91 100644
--- a/src/lang/fo-FO.json
+++ b/src/lang/fo-FO.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "Fartelda",
diff --git a/src/lang/fr-FR.json b/src/lang/fr-FR.json
index 23c6652588..edb2abd36b 100644
--- a/src/lang/fr-FR.json
+++ b/src/lang/fr-FR.json
@@ -96,7 +96,7 @@
   "label.join": "Rejoindre",
   "label.join-team": "Rejoindre une équipe",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Langue",
   "label.languages": "Langues",
   "label.laptop": "Portable",
diff --git a/src/lang/ga-ES.json b/src/lang/ga-ES.json
index 9e04806129..d267137f1a 100644
--- a/src/lang/ga-ES.json
+++ b/src/lang/ga-ES.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Idioma",
   "label.languages": "Idiomas",
   "label.laptop": "Portátil",
diff --git a/src/lang/he-IL.json b/src/lang/he-IL.json
index 584d5f5d43..d7ebf875b6 100644
--- a/src/lang/he-IL.json
+++ b/src/lang/he-IL.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "לפטופ",
diff --git a/src/lang/hi-IN.json b/src/lang/hi-IN.json
index 0cf024e332..1fbee2c02e 100644
--- a/src/lang/hi-IN.json
+++ b/src/lang/hi-IN.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "लैपटॉप",
diff --git a/src/lang/hr-HR.json b/src/lang/hr-HR.json
index bc69742664..39d4d9d1dd 100644
--- a/src/lang/hr-HR.json
+++ b/src/lang/hr-HR.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Jezik",
   "label.languages": "Languages",
   "label.laptop": "Laptop",
diff --git a/src/lang/hu-HU.json b/src/lang/hu-HU.json
index 111ce00fa1..6762181bd7 100644
--- a/src/lang/hu-HU.json
+++ b/src/lang/hu-HU.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "Laptop",
diff --git a/src/lang/id-ID.json b/src/lang/id-ID.json
index 0f2c705aa0..930b02da5c 100644
--- a/src/lang/id-ID.json
+++ b/src/lang/id-ID.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Bahasa",
   "label.languages": "Bahasa",
   "label.laptop": "Laptop",
diff --git a/src/lang/it-IT.json b/src/lang/it-IT.json
index 3e73781894..229254d56a 100644
--- a/src/lang/it-IT.json
+++ b/src/lang/it-IT.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Lingua",
   "label.languages": "Lingue",
   "label.laptop": "Portatile",
diff --git a/src/lang/ja-JP.json b/src/lang/ja-JP.json
index ef0cce1dd6..02e300bbb8 100644
--- a/src/lang/ja-JP.json
+++ b/src/lang/ja-JP.json
@@ -96,7 +96,7 @@
   "label.join": "参加",
   "label.join-team": "チームに参加",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "言語",
   "label.languages": "言語",
   "label.laptop": "ノートPC",
diff --git a/src/lang/km-KH.json b/src/lang/km-KH.json
index 9a374a0673..f3189ac2bd 100644
--- a/src/lang/km-KH.json
+++ b/src/lang/km-KH.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "ភាសា",
   "label.languages": "ភាសា",
   "label.laptop": "កុំព្យូទ័រយួរដៃ",
diff --git a/src/lang/lt-LT.json b/src/lang/lt-LT.json
index f96e643e64..424c06ce3e 100644
--- a/src/lang/lt-LT.json
+++ b/src/lang/lt-LT.json
@@ -96,7 +96,7 @@
   "label.join": "Prisijungti",
   "label.join-team": "Prisijungti į komandą",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Kalba",
   "label.languages": "Kalbos",
   "label.laptop": "Laptop",
diff --git a/src/lang/mn-MN.json b/src/lang/mn-MN.json
index 47e08bca3f..0e99817063 100644
--- a/src/lang/mn-MN.json
+++ b/src/lang/mn-MN.json
@@ -96,7 +96,7 @@
   "label.join": "Нэгдэх",
   "label.join-team": "Багт нэгдэх",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Хэл",
   "label.languages": "Хэл",
   "label.laptop": "Зөөврийн компьютер",
diff --git a/src/lang/ms-MY.json b/src/lang/ms-MY.json
index bf28b05cfe..82cfbb6b42 100644
--- a/src/lang/ms-MY.json
+++ b/src/lang/ms-MY.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "Laptop",
diff --git a/src/lang/my-MM.json b/src/lang/my-MM.json
index dffbe43e48..8a71cd4974 100644
--- a/src/lang/my-MM.json
+++ b/src/lang/my-MM.json
@@ -96,7 +96,7 @@
   "label.join": "ဝင်မည်",
   "label.join-team": "အသင်းဝင်မည်",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "ဘာသာစကား",
   "label.languages": "ဘာသာစကားများ",
   "label.laptop": "လက်တော့ပ်",
diff --git a/src/lang/nb-NO.json b/src/lang/nb-NO.json
index ca360d0950..4a6e0409c1 100644
--- a/src/lang/nb-NO.json
+++ b/src/lang/nb-NO.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Språk",
   "label.languages": "Språk",
   "label.laptop": "Bærbar",
diff --git a/src/lang/nl-NL.json b/src/lang/nl-NL.json
index 6208147309..9a1c852bc1 100644
--- a/src/lang/nl-NL.json
+++ b/src/lang/nl-NL.json
@@ -96,7 +96,7 @@
   "label.join": "Lid worden",
   "label.join-team": "Word lid van een team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Taal",
   "label.languages": "Talen",
   "label.laptop": "Laptop",
diff --git a/src/lang/pl-PL.json b/src/lang/pl-PL.json
index 8068d9b360..e663d44598 100644
--- a/src/lang/pl-PL.json
+++ b/src/lang/pl-PL.json
@@ -96,7 +96,7 @@
   "label.join": "Dołącz",
   "label.join-team": "Dołącz do zespołu",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Język",
   "label.languages": "Języki",
   "label.laptop": "Laptop",
diff --git a/src/lang/pt-BR.json b/src/lang/pt-BR.json
index c1f9c708ff..be96d09772 100644
--- a/src/lang/pt-BR.json
+++ b/src/lang/pt-BR.json
@@ -96,7 +96,7 @@
   "label.join": "Participar",
   "label.join-team": "Participar da equipe",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Idioma",
   "label.languages": "Idiomas",
   "label.laptop": "Notebook",
diff --git a/src/lang/pt-PT.json b/src/lang/pt-PT.json
index d497bb3a8f..252457f833 100644
--- a/src/lang/pt-PT.json
+++ b/src/lang/pt-PT.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Língua",
   "label.languages": "Línguas",
   "label.laptop": "Portátil",
diff --git a/src/lang/ro-RO.json b/src/lang/ro-RO.json
index 107303ae94..c06690c23d 100644
--- a/src/lang/ro-RO.json
+++ b/src/lang/ro-RO.json
@@ -96,7 +96,7 @@
   "label.join": "Alătură-te",
   "label.join-team": "Alătură-te echipei",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Limbă",
   "label.languages": "Limbi",
   "label.laptop": "Laptop",
diff --git a/src/lang/ru-RU.json b/src/lang/ru-RU.json
index 535d22921d..257c0491aa 100644
--- a/src/lang/ru-RU.json
+++ b/src/lang/ru-RU.json
@@ -96,7 +96,7 @@
   "label.join": "Присоединиться",
   "label.join-team": "Присоединиться к команде",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Язык",
   "label.languages": "Языки",
   "label.laptop": "Ноутбук",
diff --git a/src/lang/si-LK.json b/src/lang/si-LK.json
index 03b42df782..6263f91a96 100644
--- a/src/lang/si-LK.json
+++ b/src/lang/si-LK.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "භාෂාව",
   "label.languages": "Languages",
   "label.laptop": "Laptop",
diff --git a/src/lang/sk-SK.json b/src/lang/sk-SK.json
index 3d5b8fbb13..4447ada298 100644
--- a/src/lang/sk-SK.json
+++ b/src/lang/sk-SK.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "Prenosný počítač",
diff --git a/src/lang/sl-SI.json b/src/lang/sl-SI.json
index 01fc7f30b4..3c684dec03 100644
--- a/src/lang/sl-SI.json
+++ b/src/lang/sl-SI.json
@@ -96,7 +96,7 @@
   "label.join": "Pridruži se",
   "label.join-team": "Pridruži se ekipi",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Jezik",
   "label.languages": "Jeziki",
   "label.laptop": "Prenosni računalnik",
diff --git a/src/lang/sv-SE.json b/src/lang/sv-SE.json
index 92c9df03c6..c60b6cf904 100644
--- a/src/lang/sv-SE.json
+++ b/src/lang/sv-SE.json
@@ -96,7 +96,7 @@
   "label.join": "Gå med",
   "label.join-team": "Gå med i team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Språk",
   "label.languages": "Språk",
   "label.laptop": "Bärbar",
diff --git a/src/lang/ta-IN.json b/src/lang/ta-IN.json
index 99558b11d8..0f95bc1861 100644
--- a/src/lang/ta-IN.json
+++ b/src/lang/ta-IN.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "மடிக்கணினி",
diff --git a/src/lang/th-TH.json b/src/lang/th-TH.json
index 253f420c82..a594bb3120 100644
--- a/src/lang/th-TH.json
+++ b/src/lang/th-TH.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "ภาษา",
   "label.languages": "ภาษา",
   "label.laptop": "แล็ปท็อป",
diff --git a/src/lang/tr-TR.json b/src/lang/tr-TR.json
index 49e71b9a31..b8271ed219 100644
--- a/src/lang/tr-TR.json
+++ b/src/lang/tr-TR.json
@@ -96,7 +96,7 @@
   "label.join": "Katıl",
   "label.join-team": "Takıma katıl",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Dil",
   "label.languages": "Diller",
   "label.laptop": "Dizüstü",
diff --git a/src/lang/uk-UA.json b/src/lang/uk-UA.json
index ec658b7ef6..ecfd27f50a 100644
--- a/src/lang/uk-UA.json
+++ b/src/lang/uk-UA.json
@@ -93,7 +93,7 @@
   "label.join": "Приєднатись",
   "label.join-team": "Приєднатись до команди",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Мова",
   "label.languages": "Мови",
   "label.laptop": "Ноутбук",
diff --git a/src/lang/ur-PK.json b/src/lang/ur-PK.json
index 7d649148ab..97de5d6940 100644
--- a/src/lang/ur-PK.json
+++ b/src/lang/ur-PK.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "زبانیں",
   "label.laptop": "لیپ ٹاپ",
diff --git a/src/lang/vi-VN.json b/src/lang/vi-VN.json
index 1be8684bdb..054f449a8a 100644
--- a/src/lang/vi-VN.json
+++ b/src/lang/vi-VN.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "Ngôn ngữ",
   "label.laptop": "Laptop",
diff --git a/src/lang/zh-TW.json b/src/lang/zh-TW.json
index 9d8329e9af..10069181e3 100644
--- a/src/lang/zh-TW.json
+++ b/src/lang/zh-TW.json
@@ -96,7 +96,7 @@
   "label.join": "加入",
   "label.join-team": "加入團隊",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "語言",
   "label.languages": "語言",
   "label.laptop": "筆記型電腦",

From 490d51bde12693b2e5936a2d206353f0a57563da Mon Sep 17 00:00:00 2001
From: Jacek Maciejak <18230443+RikoDEV@users.noreply.github.com>
Date: Sat, 29 Jun 2024 18:57:21 +0200
Subject: [PATCH 188/438] Update pl-PL.json

---
 src/lang/pl-PL.json | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/lang/pl-PL.json b/src/lang/pl-PL.json
index 8068d9b360..064f67abc8 100644
--- a/src/lang/pl-PL.json
+++ b/src/lang/pl-PL.json
@@ -24,12 +24,12 @@
   "label.cities": "Miasta",
   "label.city": "Miasto",
   "label.clear-all": "Wyczyść wszystko",
-  "label.compare": "Compare",
+  "label.compare": "Porównaj",
   "label.confirm": "Potwierdź",
   "label.confirm-password": "Potwierdź hasło",
   "label.contains": "Zawiera",
   "label.continue": "Kontynuuj",
-  "label.count": "Count",
+  "label.count": "Liczba",
   "label.countries": "Kraje",
   "label.country": "Państwo",
   "label.create": "Utwórz",
@@ -38,7 +38,7 @@
   "label.create-user": "Utwórz użytkownika",
   "label.created": "Utworzony",
   "label.created-by": "Utworzony przez",
-  "label.current": "Current",
+  "label.current": "Aktualny",
   "label.current-password": "Aktualne hasło",
   "label.custom-range": "Zakres niestandardowy",
   "label.dashboard": "Panel",
@@ -65,12 +65,12 @@
   "label.edit-dashboard": "Edytuj panel",
   "label.edit-member": "Edytuj członka",
   "label.enable-share-url": "Włącz udostępnianie adresu URL",
-  "label.end-step": "End Step",
+  "label.end-step": "Krok końcowy",
   "label.entry": "Entry URL",
   "label.event": "Zdarzenie",
   "label.event-data": "Dane zdarzenia",
   "label.events": "Zdarzenia",
-  "label.exit": "Exit URL",
+  "label.exit": "URL wyjściowy",
   "label.false": "Fałsz",
   "label.field": "Pole",
   "label.fields": "Pola",
@@ -80,13 +80,13 @@
   "label.filters": "Filtry",
   "label.funnel": "Lejek",
   "label.funnel-description": "Zrozum wskaźniki konwersji i odpływu użytkowników.",
-  "label.goal": "Goal",
-  "label.goals": "Goals",
+  "label.goal": "Cel",
+  "label.goals": "Cele",
   "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Większe niż",
   "label.greater-than-equals": "Większe niż lub równe",
   "label.host": "Host",
-  "label.hosts": "Hosts",
+  "label.hosts": "Hosty",
   "label.insights": "Analiza",
   "label.insights-description": "Poznaj lepiej swoje dane, korzystając z segmentów i filtrów.",
   "label.is": "Równe",
@@ -95,8 +95,8 @@
   "label.is-set": "Ustawione",
   "label.join": "Dołącz",
   "label.join-team": "Dołącz do zespołu",
-  "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey": "Droga",
+  "label.journey-description": "Zrozum, w jaki sposób użytkownicy poruszają się po Twojej witrynie.",
   "label.language": "Język",
   "label.languages": "Języki",
   "label.laptop": "Laptop",
@@ -134,22 +134,22 @@
   "label.password": "Hasło",
   "label.powered-by": "Obsługiwane przez {name}",
   "label.previous": "Previous",
-  "label.previous-period": "Previous period",
-  "label.previous-year": "Previous year",
+  "label.previous-period": "Poprzedni okres",
+  "label.previous-year": "Poprzedni rok",
   "label.profile": "Profil",
   "label.property": "Property",
   "label.queries": "Zapytania",
   "label.query": "Zapytanie",
   "label.query-parameters": "Parametry zapytania",
   "label.realtime": "Czas rzeczywisty",
-  "label.referrer": "Referrer",
+  "label.referrer": "Źródło odsyłające",
   "label.referrers": "Źródła odsyłające",
   "label.refresh": "Odśwież",
   "label.regenerate": "Wygeneruj ponownie",
   "label.region": "Region",
   "label.regions": "Regiony",
   "label.remove": "Usuń",
-  "label.remove-member": "Remove member",
+  "label.remove-member": "Usuń członka",
   "label.reports": "Raporty",
   "label.required": "Wymagany",
   "label.reset": "Zresetuj",
@@ -169,7 +169,7 @@
   "label.settings": "Ustawienia",
   "label.share-url": "Udostępnij adres URL",
   "label.single-day": "W tym dniu",
-  "label.start-step": "Start Step",
+  "label.start-step": "Krok startowy",
   "label.steps": "Kroki",
   "label.sum": "Suma",
   "label.tablet": "Tablet",
@@ -217,7 +217,7 @@
   "label.views-per-visit": "Widoków na wizytę",
   "label.visit-duration": "Średni czas wizyty",
   "label.visitors": "Odwiedzający",
-  "label.visits": "Odwiedząjący",
+  "label.visits": "Wizyty",
   "label.website": "Witryna",
   "label.website-id": "ID witryny",
   "label.websites": "Witryny",
@@ -225,7 +225,7 @@
   "label.yesterday": "Wczoraj",
   "message.action-confirmation": "Wpisz {confirmation}, aby potwierdzić.",
   "message.active-users": "{x} aktualnie {x, plural, one {odwiedzający} other {odwiedzających}}",
-  "message.collected-data": "Collected data",
+  "message.collected-data": "Zebrane dane",
   "message.confirm-delete": "Czy na pewno chcesz usunąć {target}?",
   "message.confirm-leave": "Czy na pewno chcesz opuścić {target}?",
   "message.confirm-remove": "Czy na pewno chcesz usunąć {target}?",

From 512603d79b3d40e6da29091644f9b3501d4f5eb5 Mon Sep 17 00:00:00 2001
From: Jacek Maciejak <18230443+RikoDEV@users.noreply.github.com>
Date: Sat, 29 Jun 2024 19:00:33 +0200
Subject: [PATCH 189/438] Whoops

---
 src/lang/pl-PL.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lang/pl-PL.json b/src/lang/pl-PL.json
index 064f67abc8..953438be23 100644
--- a/src/lang/pl-PL.json
+++ b/src/lang/pl-PL.json
@@ -133,7 +133,7 @@
   "label.pages": "Strony",
   "label.password": "Hasło",
   "label.powered-by": "Obsługiwane przez {name}",
-  "label.previous": "Previous",
+  "label.previous": "Poprzedni",
   "label.previous-period": "Poprzedni okres",
   "label.previous-year": "Poprzedni rok",
   "label.profile": "Profil",

From 87779202f9c01d6a39a6dfd4ad03c524a0c2d0f1 Mon Sep 17 00:00:00 2001
From: mobeicanyue <81098819+mobeicanyue@users.noreply.github.com>
Date: Sun, 30 Jun 2024 11:26:21 +0800
Subject: [PATCH 190/438] Update zh-CN.json

---
 src/lang/zh-CN.json | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/lang/zh-CN.json b/src/lang/zh-CN.json
index bcdd3612b6..552c242369 100644
--- a/src/lang/zh-CN.json
+++ b/src/lang/zh-CN.json
@@ -24,12 +24,12 @@
   "label.cities": "市/县",
   "label.city": "市/县",
   "label.clear-all": "清除全部",
-  "label.compare": "Compare",
+  "label.compare": "比较",
   "label.confirm": "确认",
   "label.confirm-password": "确认密码",
   "label.contains": "包含",
   "label.continue": "继续",
-  "label.count": "Count",
+  "label.count": "统计",
   "label.countries": "国家/地区",
   "label.country": "国家/地区",
   "label.create": "创建",
@@ -38,7 +38,7 @@
   "label.create-user": "创建用户",
   "label.created": "已创建",
   "label.created-by": "创建者",
-  "label.current": "Current",
+  "label.current": "目前",
   "label.current-password": "目前密码",
   "label.custom-range": "自定义时间段",
   "label.dashboard": "仪表板",
@@ -65,12 +65,12 @@
   "label.edit-dashboard": "编辑仪表板",
   "label.edit-member": "编辑成员",
   "label.enable-share-url": "启用共享链接",
-  "label.end-step": "End Step",
-  "label.entry": "Entry URL",
+  "label.end-step": "结束步骤",
+  "label.entry": "入口 URL",
   "label.event": "事件",
   "label.event-data": "事件数据",
   "label.events": "行为类别",
-  "label.exit": "Exit URL",
+  "label.exit": "退出 URL",
   "label.false": "否",
   "label.field": "字段",
   "label.fields": "字段",
@@ -80,13 +80,13 @@
   "label.filters": "筛选",
   "label.funnel": "分析",
   "label.funnel-description": "了解用户的转换率和退出率。",
-  "label.goal": "Goal",
-  "label.goals": "Goals",
-  "label.goals-description": "Track your goals for pageviews and events.",
+  "label.goal": "目标",
+  "label.goals": "目标",
+  "label.goals-description": "跟踪页面浏览量和事件的目标。",
   "label.greater-than": "大于",
   "label.greater-than-equals": "大于或等于",
-  "label.host": "Host",
-  "label.hosts": "Hosts",
+  "label.host": "主机",
+  "label.hosts": "主机",
   "label.insights": "见解",
   "label.insights-description": "通过使用筛选器和划分时间段来更深入地研究数据。",
   "label.is": "等于",
@@ -95,8 +95,8 @@
   "label.is-set": "已设置",
   "label.join": "加入",
   "label.join-team": "加入团队",
-  "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey": "用户浏览轨迹",
+  "label.journey-description": "了解用户如何浏览网站。",
   "label.language": "语言",
   "label.languages": "语言",
   "label.laptop": "笔记本",
@@ -110,7 +110,7 @@
   "label.login": "登录",
   "label.logout": "退出",
   "label.manage": "管理",
-  "label.manager": "Manager",
+  "label.manager": "管理者",
   "label.max": "最大",
   "label.member": "成员",
   "label.members": "成员",
@@ -133,11 +133,11 @@
   "label.pages": "网页",
   "label.password": "密码",
   "label.powered-by": "由 {name} 提供支持",
-  "label.previous": "Previous",
-  "label.previous-period": "Previous period",
-  "label.previous-year": "Previous year",
+  "label.previous": "先前",
+  "label.previous-period": "上一时期",
+  "label.previous-year": "上一年",
   "label.profile": "个人资料",
-  "label.property": "Property",
+  "label.property": "属性",
   "label.queries": "查询",
   "label.query": "查询",
   "label.query-parameters": "查询参数",
@@ -169,13 +169,13 @@
   "label.settings": "设置",
   "label.share-url": "共享链接",
   "label.single-day": "单日",
-  "label.start-step": "Start Step",
+  "label.start-step": "开始步骤",
   "label.steps": "步骤",
   "label.sum": "总和",
   "label.tablet": "平板",
   "label.team": "团队",
   "label.team-id": "团队 ID",
-  "label.team-manager": "Team manager",
+  "label.team-manager": "团队管理者",
   "label.team-member": "团队成员",
   "label.team-name": "团队名称",
   "label.team-owner": "团队所有者",
@@ -225,7 +225,7 @@
   "label.yesterday": "昨天",
   "message.action-confirmation": "在下面的框中输入 {confirmation} 以确认。",
   "message.active-users": "当前在线 {x} 人",
-  "message.collected-data": "Collected data",
+  "message.collected-data": "已收集的数据",
   "message.confirm-delete": "你确定要删除 {target} 吗？",
   "message.confirm-leave": "你确定要离开 {target} 吗？",
   "message.confirm-remove": "您确定要移除 {target} ？",

From d95e21299076b46e11b481e2daf4e14de52102cf Mon Sep 17 00:00:00 2001
From: Konstantin Tutsch <mail@konstantintutsch.com>
Date: Sun, 30 Jun 2024 13:39:37 +0200
Subject: [PATCH 191/438] Add German translation for v2.12.0

Report categories, Compare, Transfers, Team features
---
 public/intl/messages/de-DE.json | 108 ++++++++++++++++----------------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/public/intl/messages/de-DE.json b/public/intl/messages/de-DE.json
index 9a9b6d14f7..a75a7ee90c 100644
--- a/public/intl/messages/de-DE.json
+++ b/public/intl/messages/de-DE.json
@@ -32,13 +32,13 @@
   "label.add-member": [
     {
       "type": 0,
-      "value": "Add member"
+      "value": "Mitglied hinzufügen"
     }
   ],
   "label.add-step": [
     {
       "type": 0,
-      "value": "Add step"
+      "value": "Schritt hinzufügen"
     }
   ],
   "label.add-website": [
@@ -74,7 +74,7 @@
   "label.analytics": [
     {
       "type": 0,
-      "value": "Analytics"
+      "value": "Analytiken"
     }
   ],
   "label.average": [
@@ -104,7 +104,7 @@
   "label.breakdown": [
     {
       "type": 0,
-      "value": "Breakdown"
+      "value": "Aufschlüsselung"
     }
   ],
   "label.browser": [
@@ -152,7 +152,7 @@
   "label.compare": [
     {
       "type": 0,
-      "value": "Compare"
+      "value": "Vergleich"
     }
   ],
   "label.confirm": [
@@ -182,7 +182,7 @@
   "label.count": [
     {
       "type": 0,
-      "value": "Count"
+      "value": "Anzahl"
     }
   ],
   "label.countries": [
@@ -200,7 +200,7 @@
   "label.create": [
     {
       "type": 0,
-      "value": "Create"
+      "value": "Erstellen"
     }
   ],
   "label.create-report": [
@@ -230,13 +230,13 @@
   "label.created-by": [
     {
       "type": 0,
-      "value": "Created By"
+      "value": "Erstellt von"
     }
   ],
   "label.current": [
     {
       "type": 0,
-      "value": "Current"
+      "value": "Aktuell"
     }
   ],
   "label.current-password": [
@@ -296,7 +296,7 @@
   "label.delete-report": [
     {
       "type": 0,
-      "value": "Delete report"
+      "value": "Bericht löschen"
     }
   ],
   "label.delete-team": [
@@ -386,7 +386,7 @@
   "label.edit-member": [
     {
       "type": 0,
-      "value": "Edit member"
+      "value": "Mitglied bearbeiten"
     }
   ],
   "label.enable-share-url": [
@@ -398,7 +398,7 @@
   "label.end-step": [
     {
       "type": 0,
-      "value": "End Step"
+      "value": "Schritt beenden"
     }
   ],
   "label.entry": [
@@ -476,31 +476,31 @@
   "label.funnel": [
     {
       "type": 0,
-      "value": "Funnel"
+      "value": "Trichter"
     }
   ],
   "label.funnel-description": [
     {
       "type": 0,
-      "value": "Understand the conversion and drop-off rate of users."
+      "value": "Verstehe die Konversions- und Dropoffrate von Nutzern."
     }
   ],
   "label.goal": [
     {
       "type": 0,
-      "value": "Goal"
+      "value": "Ziel"
     }
   ],
   "label.goals": [
     {
       "type": 0,
-      "value": "Goals"
+      "value": "Ziele"
     }
   ],
   "label.goals-description": [
     {
       "type": 0,
-      "value": "Track your goals for pageviews and events."
+      "value": "Verfolgen Sie Ihre Ziele für Aufrufe und Events."
     }
   ],
   "label.greater-than": [
@@ -536,7 +536,7 @@
   "label.insights-description": [
     {
       "type": 0,
-      "value": "Dive deeper into your data by using segments and filters."
+      "value": "Tauchen Sie tiefer in Ihre Daten mit Filtern und Segmenten ein."
     }
   ],
   "label.is": [
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Verstehen Sie, wie Nutzer Ihre Website navigieren."
     }
   ],
   "label.language": [
@@ -636,7 +636,7 @@
   "label.last-months": [
     {
       "type": 0,
-      "value": "Last "
+      "value": "Letzte "
     },
     {
       "type": 1,
@@ -644,7 +644,7 @@
     },
     {
       "type": 0,
-      "value": " months"
+      "value": " Monate"
     }
   ],
   "label.leave": [
@@ -686,7 +686,7 @@
   "label.manage": [
     {
       "type": 0,
-      "value": "Manage"
+      "value": "Verwalten"
     }
   ],
   "label.manager": [
@@ -704,7 +704,7 @@
   "label.member": [
     {
       "type": 0,
-      "value": "Member"
+      "value": "Mitglied"
     }
   ],
   "label.members": [
@@ -734,7 +734,7 @@
   "label.my-account": [
     {
       "type": 0,
-      "value": "My account"
+      "value": "Mein Konto"
     }
   ],
   "label.my-websites": [
@@ -777,7 +777,7 @@
           "value": [
             {
               "type": 0,
-              "value": "record"
+              "value": "Eintrag"
             }
           ]
         },
@@ -785,7 +785,7 @@
           "value": [
             {
               "type": 0,
-              "value": "records"
+              "value": "Einträge"
             }
           ]
         }
@@ -874,19 +874,19 @@
   "label.previous": [
     {
       "type": 0,
-      "value": "Previous"
+      "value": "Vorherige"
     }
   ],
   "label.previous-period": [
     {
       "type": 0,
-      "value": "Previous period"
+      "value": "Vorheriger Zeitraum"
     }
   ],
   "label.previous-year": [
     {
       "type": 0,
-      "value": "Previous year"
+      "value": "Vorheriges Jahr"
     }
   ],
   "label.profile": [
@@ -898,7 +898,7 @@
   "label.property": [
     {
       "type": 0,
-      "value": "Property"
+      "value": "Besitz"
     }
   ],
   "label.queries": [
@@ -970,7 +970,7 @@
   "label.remove-member": [
     {
       "type": 0,
-      "value": "Remove member"
+      "value": "Mitglied entfernen"
     }
   ],
   "label.reports": [
@@ -1006,7 +1006,7 @@
   "label.retention-description": [
     {
       "type": 0,
-      "value": "Measure your website stickiness by tracking how often users return."
+      "value": "Messen Sie die Presenz Ihrer Website, indem Sie tracken wie oft Nutzer zurückkehren."
     }
   ],
   "label.role": [
@@ -1036,13 +1036,13 @@
   "label.search": [
     {
       "type": 0,
-      "value": "Search"
+      "value": "Suche"
     }
   ],
   "label.select": [
     {
       "type": 0,
-      "value": "Select"
+      "value": "Auswählen"
     }
   ],
   "label.select-date": [
@@ -1054,7 +1054,7 @@
   "label.select-role": [
     {
       "type": 0,
-      "value": "Select role"
+      "value": "Rolle auswählen"
     }
   ],
   "label.select-website": [
@@ -1090,13 +1090,13 @@
   "label.start-step": [
     {
       "type": 0,
-      "value": "Start Step"
+      "value": "Schritt starten"
     }
   ],
   "label.steps": [
     {
       "type": 0,
-      "value": "Steps"
+      "value": "Schritte"
     }
   ],
   "label.sum": [
@@ -1126,7 +1126,7 @@
   "label.team-manager": [
     {
       "type": 0,
-      "value": "Team manager"
+      "value": "Team-Manager"
     }
   ],
   "label.team-member": [
@@ -1234,13 +1234,13 @@
   "label.transfer": [
     {
       "type": 0,
-      "value": "Transfer"
+      "value": "Übertragung"
     }
   ],
   "label.transfer-website": [
     {
       "type": 0,
-      "value": "Transfer website"
+      "value": "Website übertragen"
     }
   ],
   "label.true": [
@@ -1324,7 +1324,7 @@
   "label.utm-description": [
     {
       "type": 0,
-      "value": "Track your campaigns through UTM parameters."
+      "value": "Tracken Sie Ihre Kampagnen mit Hilfe von UTM Parametern."
     }
   ],
   "label.value": [
@@ -1360,7 +1360,7 @@
   "label.views-per-visit": [
     {
       "type": 0,
-      "value": "Views per visit"
+      "value": "Aufrufe pro Besuch"
     }
   ],
   "label.visit-duration": [
@@ -1378,7 +1378,7 @@
   "label.visits": [
     {
       "type": 0,
-      "value": "Visits"
+      "value": "Besuche"
     }
   ],
   "label.website": [
@@ -1414,7 +1414,7 @@
   "message.action-confirmation": [
     {
       "type": 0,
-      "value": "Type "
+      "value": "Tippe "
     },
     {
       "type": 1,
@@ -1422,7 +1422,7 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " in das untenliegende Feld, um zu bestätigen."
     }
   ],
   "message.active-users": [
@@ -1462,7 +1462,7 @@
   "message.collected-data": [
     {
       "type": 0,
-      "value": "Collected data"
+      "value": "Gesammelte Daten"
     }
   ],
   "message.confirm-delete": [
@@ -1496,7 +1496,7 @@
   "message.confirm-remove": [
     {
       "type": 0,
-      "value": "Are you sure you want to remove "
+      "value": "Sind Sie sicher, dass Sie "
     },
     {
       "type": 1,
@@ -1504,7 +1504,7 @@
     },
     {
       "type": 0,
-      "value": "?"
+      "value": " entfernen möchten?"
     }
   ],
   "message.confirm-reset": [
@@ -1524,7 +1524,7 @@
   "message.delete-team-warning": [
     {
       "type": 0,
-      "value": "Deleting a team will also delete all team websites."
+      "value": "Wird ein Team gelöscht werden auch alle Websites des Teams gelöscht."
     }
   ],
   "message.delete-website-warning": [
@@ -1708,25 +1708,25 @@
   "message.transfer-team-website-to-user": [
     {
       "type": 0,
-      "value": "Transfer this website to your account?"
+      "value": "Möchten Sie diese Website auf Ihr Konto übertragen?"
     }
   ],
   "message.transfer-user-website-to-team": [
     {
       "type": 0,
-      "value": "Select the team to transfer this website to."
+      "value": "Wähle das Team, auf das die Website übertragen wird."
     }
   ],
   "message.transfer-website": [
     {
       "type": 0,
-      "value": "Transfer website ownership to your account or another team."
+      "value": "Übertragen Sie den Besitz der Website auf Ihren Account oder ein anderes Team."
     }
   ],
   "message.triggered-event": [
     {
       "type": 0,
-      "value": "Triggered event"
+      "value": "Event ausgelöst."
     }
   ],
   "message.user-deleted": [
@@ -1738,7 +1738,7 @@
   "message.viewed-page": [
     {
       "type": 0,
-      "value": "Viewed page"
+      "value": "Seite besucht."
     }
   ],
   "message.visitor-log": [

From 001dbbad9f10e93bcdea3e8858d439b56dcb5dcc Mon Sep 17 00:00:00 2001
From: Konstantin Tutsch <mail@konstantintutsch.com>
Date: Mon, 1 Jul 2024 17:04:56 +0200
Subject: [PATCH 192/438] Revert "Add German translation for v2.12.0"

This reverts commit d95e21299076b46e11b481e2daf4e14de52102cf.
---
 public/intl/messages/de-DE.json | 108 ++++++++++++++++----------------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/public/intl/messages/de-DE.json b/public/intl/messages/de-DE.json
index a75a7ee90c..9a9b6d14f7 100644
--- a/public/intl/messages/de-DE.json
+++ b/public/intl/messages/de-DE.json
@@ -32,13 +32,13 @@
   "label.add-member": [
     {
       "type": 0,
-      "value": "Mitglied hinzufügen"
+      "value": "Add member"
     }
   ],
   "label.add-step": [
     {
       "type": 0,
-      "value": "Schritt hinzufügen"
+      "value": "Add step"
     }
   ],
   "label.add-website": [
@@ -74,7 +74,7 @@
   "label.analytics": [
     {
       "type": 0,
-      "value": "Analytiken"
+      "value": "Analytics"
     }
   ],
   "label.average": [
@@ -104,7 +104,7 @@
   "label.breakdown": [
     {
       "type": 0,
-      "value": "Aufschlüsselung"
+      "value": "Breakdown"
     }
   ],
   "label.browser": [
@@ -152,7 +152,7 @@
   "label.compare": [
     {
       "type": 0,
-      "value": "Vergleich"
+      "value": "Compare"
     }
   ],
   "label.confirm": [
@@ -182,7 +182,7 @@
   "label.count": [
     {
       "type": 0,
-      "value": "Anzahl"
+      "value": "Count"
     }
   ],
   "label.countries": [
@@ -200,7 +200,7 @@
   "label.create": [
     {
       "type": 0,
-      "value": "Erstellen"
+      "value": "Create"
     }
   ],
   "label.create-report": [
@@ -230,13 +230,13 @@
   "label.created-by": [
     {
       "type": 0,
-      "value": "Erstellt von"
+      "value": "Created By"
     }
   ],
   "label.current": [
     {
       "type": 0,
-      "value": "Aktuell"
+      "value": "Current"
     }
   ],
   "label.current-password": [
@@ -296,7 +296,7 @@
   "label.delete-report": [
     {
       "type": 0,
-      "value": "Bericht löschen"
+      "value": "Delete report"
     }
   ],
   "label.delete-team": [
@@ -386,7 +386,7 @@
   "label.edit-member": [
     {
       "type": 0,
-      "value": "Mitglied bearbeiten"
+      "value": "Edit member"
     }
   ],
   "label.enable-share-url": [
@@ -398,7 +398,7 @@
   "label.end-step": [
     {
       "type": 0,
-      "value": "Schritt beenden"
+      "value": "End Step"
     }
   ],
   "label.entry": [
@@ -476,31 +476,31 @@
   "label.funnel": [
     {
       "type": 0,
-      "value": "Trichter"
+      "value": "Funnel"
     }
   ],
   "label.funnel-description": [
     {
       "type": 0,
-      "value": "Verstehe die Konversions- und Dropoffrate von Nutzern."
+      "value": "Understand the conversion and drop-off rate of users."
     }
   ],
   "label.goal": [
     {
       "type": 0,
-      "value": "Ziel"
+      "value": "Goal"
     }
   ],
   "label.goals": [
     {
       "type": 0,
-      "value": "Ziele"
+      "value": "Goals"
     }
   ],
   "label.goals-description": [
     {
       "type": 0,
-      "value": "Verfolgen Sie Ihre Ziele für Aufrufe und Events."
+      "value": "Track your goals for pageviews and events."
     }
   ],
   "label.greater-than": [
@@ -536,7 +536,7 @@
   "label.insights-description": [
     {
       "type": 0,
-      "value": "Tauchen Sie tiefer in Ihre Daten mit Filtern und Segmenten ein."
+      "value": "Dive deeper into your data by using segments and filters."
     }
   ],
   "label.is": [
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Verstehen Sie, wie Nutzer Ihre Website navigieren."
+      "value": "Understand how users nagivate through your website."
     }
   ],
   "label.language": [
@@ -636,7 +636,7 @@
   "label.last-months": [
     {
       "type": 0,
-      "value": "Letzte "
+      "value": "Last "
     },
     {
       "type": 1,
@@ -644,7 +644,7 @@
     },
     {
       "type": 0,
-      "value": " Monate"
+      "value": " months"
     }
   ],
   "label.leave": [
@@ -686,7 +686,7 @@
   "label.manage": [
     {
       "type": 0,
-      "value": "Verwalten"
+      "value": "Manage"
     }
   ],
   "label.manager": [
@@ -704,7 +704,7 @@
   "label.member": [
     {
       "type": 0,
-      "value": "Mitglied"
+      "value": "Member"
     }
   ],
   "label.members": [
@@ -734,7 +734,7 @@
   "label.my-account": [
     {
       "type": 0,
-      "value": "Mein Konto"
+      "value": "My account"
     }
   ],
   "label.my-websites": [
@@ -777,7 +777,7 @@
           "value": [
             {
               "type": 0,
-              "value": "Eintrag"
+              "value": "record"
             }
           ]
         },
@@ -785,7 +785,7 @@
           "value": [
             {
               "type": 0,
-              "value": "Einträge"
+              "value": "records"
             }
           ]
         }
@@ -874,19 +874,19 @@
   "label.previous": [
     {
       "type": 0,
-      "value": "Vorherige"
+      "value": "Previous"
     }
   ],
   "label.previous-period": [
     {
       "type": 0,
-      "value": "Vorheriger Zeitraum"
+      "value": "Previous period"
     }
   ],
   "label.previous-year": [
     {
       "type": 0,
-      "value": "Vorheriges Jahr"
+      "value": "Previous year"
     }
   ],
   "label.profile": [
@@ -898,7 +898,7 @@
   "label.property": [
     {
       "type": 0,
-      "value": "Besitz"
+      "value": "Property"
     }
   ],
   "label.queries": [
@@ -970,7 +970,7 @@
   "label.remove-member": [
     {
       "type": 0,
-      "value": "Mitglied entfernen"
+      "value": "Remove member"
     }
   ],
   "label.reports": [
@@ -1006,7 +1006,7 @@
   "label.retention-description": [
     {
       "type": 0,
-      "value": "Messen Sie die Presenz Ihrer Website, indem Sie tracken wie oft Nutzer zurückkehren."
+      "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
   "label.role": [
@@ -1036,13 +1036,13 @@
   "label.search": [
     {
       "type": 0,
-      "value": "Suche"
+      "value": "Search"
     }
   ],
   "label.select": [
     {
       "type": 0,
-      "value": "Auswählen"
+      "value": "Select"
     }
   ],
   "label.select-date": [
@@ -1054,7 +1054,7 @@
   "label.select-role": [
     {
       "type": 0,
-      "value": "Rolle auswählen"
+      "value": "Select role"
     }
   ],
   "label.select-website": [
@@ -1090,13 +1090,13 @@
   "label.start-step": [
     {
       "type": 0,
-      "value": "Schritt starten"
+      "value": "Start Step"
     }
   ],
   "label.steps": [
     {
       "type": 0,
-      "value": "Schritte"
+      "value": "Steps"
     }
   ],
   "label.sum": [
@@ -1126,7 +1126,7 @@
   "label.team-manager": [
     {
       "type": 0,
-      "value": "Team-Manager"
+      "value": "Team manager"
     }
   ],
   "label.team-member": [
@@ -1234,13 +1234,13 @@
   "label.transfer": [
     {
       "type": 0,
-      "value": "Übertragung"
+      "value": "Transfer"
     }
   ],
   "label.transfer-website": [
     {
       "type": 0,
-      "value": "Website übertragen"
+      "value": "Transfer website"
     }
   ],
   "label.true": [
@@ -1324,7 +1324,7 @@
   "label.utm-description": [
     {
       "type": 0,
-      "value": "Tracken Sie Ihre Kampagnen mit Hilfe von UTM Parametern."
+      "value": "Track your campaigns through UTM parameters."
     }
   ],
   "label.value": [
@@ -1360,7 +1360,7 @@
   "label.views-per-visit": [
     {
       "type": 0,
-      "value": "Aufrufe pro Besuch"
+      "value": "Views per visit"
     }
   ],
   "label.visit-duration": [
@@ -1378,7 +1378,7 @@
   "label.visits": [
     {
       "type": 0,
-      "value": "Besuche"
+      "value": "Visits"
     }
   ],
   "label.website": [
@@ -1414,7 +1414,7 @@
   "message.action-confirmation": [
     {
       "type": 0,
-      "value": "Tippe "
+      "value": "Type "
     },
     {
       "type": 1,
@@ -1422,7 +1422,7 @@
     },
     {
       "type": 0,
-      "value": " in das untenliegende Feld, um zu bestätigen."
+      "value": " in the box below to confirm."
     }
   ],
   "message.active-users": [
@@ -1462,7 +1462,7 @@
   "message.collected-data": [
     {
       "type": 0,
-      "value": "Gesammelte Daten"
+      "value": "Collected data"
     }
   ],
   "message.confirm-delete": [
@@ -1496,7 +1496,7 @@
   "message.confirm-remove": [
     {
       "type": 0,
-      "value": "Sind Sie sicher, dass Sie "
+      "value": "Are you sure you want to remove "
     },
     {
       "type": 1,
@@ -1504,7 +1504,7 @@
     },
     {
       "type": 0,
-      "value": " entfernen möchten?"
+      "value": "?"
     }
   ],
   "message.confirm-reset": [
@@ -1524,7 +1524,7 @@
   "message.delete-team-warning": [
     {
       "type": 0,
-      "value": "Wird ein Team gelöscht werden auch alle Websites des Teams gelöscht."
+      "value": "Deleting a team will also delete all team websites."
     }
   ],
   "message.delete-website-warning": [
@@ -1708,25 +1708,25 @@
   "message.transfer-team-website-to-user": [
     {
       "type": 0,
-      "value": "Möchten Sie diese Website auf Ihr Konto übertragen?"
+      "value": "Transfer this website to your account?"
     }
   ],
   "message.transfer-user-website-to-team": [
     {
       "type": 0,
-      "value": "Wähle das Team, auf das die Website übertragen wird."
+      "value": "Select the team to transfer this website to."
     }
   ],
   "message.transfer-website": [
     {
       "type": 0,
-      "value": "Übertragen Sie den Besitz der Website auf Ihren Account oder ein anderes Team."
+      "value": "Transfer website ownership to your account or another team."
     }
   ],
   "message.triggered-event": [
     {
       "type": 0,
-      "value": "Event ausgelöst."
+      "value": "Triggered event"
     }
   ],
   "message.user-deleted": [
@@ -1738,7 +1738,7 @@
   "message.viewed-page": [
     {
       "type": 0,
-      "value": "Seite besucht."
+      "value": "Viewed page"
     }
   ],
   "message.visitor-log": [

From 9bb06d86105bd40bbc6c487c9ae08fc86bac26ea Mon Sep 17 00:00:00 2001
From: Konstantin Tutsch <mail@konstantintutsch.com>
Date: Mon, 1 Jul 2024 17:05:48 +0200
Subject: [PATCH 193/438] Update German translation for v2.12

Report categories, Compare, Transfers, Team features
---
 src/lang/de-DE.json | 94 ++++++++++++++++++++++-----------------------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/src/lang/de-DE.json b/src/lang/de-DE.json
index aca4b863f9..aed2655a66 100644
--- a/src/lang/de-DE.json
+++ b/src/lang/de-DE.json
@@ -4,8 +4,8 @@
   "label.activity-log": "Aktivitätsverlauf",
   "label.add": "Hinzufügen",
   "label.add-description": "Beschreibung hinzufügen",
-  "label.add-member": "Add member",
-  "label.add-step": "Add step",
+  "label.add-member": "Mitglied hinzufügen",
+  "label.add-step": "Schritt hinzufügen",
   "label.add-website": "Website hinzufügen",
   "label.admin": "Administrator",
   "label.after": "Nach",
@@ -16,7 +16,7 @@
   "label.back": "Zurück",
   "label.before": "Vor",
   "label.bounce-rate": "Absprungrate",
-  "label.breakdown": "Breakdown",
+  "label.breakdown": "Aufschlüsselung",
   "label.browser": "Browser",
   "label.browsers": "Browser",
   "label.cancel": "Abbrechen",
@@ -24,21 +24,21 @@
   "label.cities": "Städte",
   "label.city": "Stadt",
   "label.clear-all": "Alles löschen",
-  "label.compare": "Compare",
+  "label.compare": "Vergleich",
   "label.confirm": "Bestätigen",
   "label.confirm-password": "Passwort wiederholen",
   "label.contains": "Enthält",
   "label.continue": "Weiter",
-  "label.count": "Count",
+  "label.count": "Anzahl",
   "label.countries": "Länder",
   "label.country": "Land",
-  "label.create": "Create",
+  "label.create": "Erstellen",
   "label.create-report": "Bericht erstellen",
   "label.create-team": "Team erstellen",
   "label.create-user": "Benutzer erstellen",
   "label.created": "Erstellt",
-  "label.created-by": "Created By",
-  "label.current": "Current",
+  "label.created-by": "Erstellt von",
+  "label.current": "Aktuell",
   "label.current-password": "Derzeitiges Passwort",
   "label.custom-range": "Benutzerdefinierter Bereich",
   "label.dashboard": "Übersicht",
@@ -48,7 +48,7 @@
   "label.day": "Tag",
   "label.default-date-range": "Voreingestellter Datumsbereich",
   "label.delete": "Löschen",
-  "label.delete-report": "Delete report",
+  "label.delete-report": "Bericht löschen",
   "label.delete-team": "Team löschen",
   "label.delete-user": "Benutzer löschen",
   "label.delete-website": "Website löschen",
@@ -63,9 +63,9 @@
   "label.dropoff": "Dropoff",
   "label.edit": "Bearbeiten",
   "label.edit-dashboard": "Dashboard bearbeiten",
-  "label.edit-member": "Edit member",
+  "label.edit-member": "Mitglied bearbeiten",
   "label.enable-share-url": "Freigabe-URL aktivieren",
-  "label.end-step": "End Step",
+  "label.end-step": "Schritt beenden",
   "label.entry": "Entry URL",
   "label.event": "Event",
   "label.event-data": "Eventdaten",
@@ -79,16 +79,16 @@
   "label.filter-raw": "Rohdaten",
   "label.filters": "Filter",
   "label.funnel": "Funnel",
-  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
-  "label.goal": "Goal",
-  "label.goals": "Goals",
-  "label.goals-description": "Track your goals for pageviews and events.",
+  "label.funnel-description": "Verstehe die Konversions- und Dropoffrate von Nutzern.",
+  "label.goal": "Ziel",
+  "label.goals": "Ziele",
+  "label.goals-description": "Verfolgen Sie Ihre Ziele für Aufrufe und Events.",
   "label.greater-than": "Größer als",
   "label.greater-than-equals": "Größer oder gleich",
   "label.host": "Host",
   "label.hosts": "Hosts",
   "label.insights": "Insights",
-  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.insights-description": "Tauchen Sie tiefer in Ihre Daten mit Filtern und Segmenten ein.",
   "label.is": "Ist",
   "label.is-not": "Ist nicht",
   "label.is-not-set": "Ist nicht gesetzt",
@@ -96,7 +96,7 @@
   "label.join": "Beitreten",
   "label.join-team": "Team beitreten",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Verstehen Sie, wie Nutzer Ihre Website navigieren.",
   "label.language": "Sprache",
   "label.languages": "Sprachen",
   "label.laptop": "Laptop",
@@ -109,15 +109,15 @@
   "label.less-than-equals": "Kleiner oder gleich",
   "label.login": "Anmelden",
   "label.logout": "Abmelden",
-  "label.manage": "Manage",
+  "label.manage": "Verwalten",
   "label.manager": "Manager",
   "label.max": "Max",
-  "label.member": "Member",
+  "label.member": "Mitglied",
   "label.members": "Mitglieder",
   "label.min": "Min",
   "label.mobile": "Handy",
   "label.more": "Mehr",
-  "label.my-account": "My account",
+  "label.my-account": "Mein Konto",
   "label.my-websites": "Meine Websites",
   "label.name": "Name",
   "label.new-password": "Neues Passwort",
@@ -133,11 +133,11 @@
   "label.pages": "Seiten",
   "label.password": "Passwort",
   "label.powered-by": "Betrieben durch {name}",
-  "label.previous": "Previous",
-  "label.previous-period": "Previous period",
-  "label.previous-year": "Previous year",
+  "label.previous": "Vorherige",
+  "label.previous-period": "Vorheriger Zeitraum",
+  "label.previous-year": "Vorheriges Jahr",
   "label.profile": "Profil",
-  "label.property": "Property",
+  "label.property": "Besitz",
   "label.queries": "Abfragen",
   "label.query": "Abfrage",
   "label.query-parameters": "Abfrageparameter",
@@ -149,33 +149,33 @@
   "label.region": "Region",
   "label.regions": "Regionen",
   "label.remove": "Entfernen",
-  "label.remove-member": "Remove member",
+  "label.remove-member": "Mitglied entfernen",
   "label.reports": "Berichte",
   "label.required": "Erforderlich",
   "label.reset": "Zurücksetzen",
   "label.reset-website": "Statistik zurücksetzen",
   "label.retention": "Retention",
-  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.retention-description": "Messen Sie die Presenz Ihrer Website, indem Sie tracken wie oft Nutzer zurückkehren.",
   "label.role": "Rolle",
   "label.run-query": "Abfrage starten",
   "label.save": "Speichern",
   "label.screens": "Bildschirmauflösungen",
-  "label.search": "Search",
-  "label.select": "Select",
+  "label.search": "Suche",
+  "label.select": "Auswählen",
   "label.select-date": "Datum auswählen",
-  "label.select-role": "Select role",
+  "label.select-role": "Rolle auswählen",
   "label.select-website": "Website auswählen",
   "label.sessions": "Sitzungen",
   "label.settings": "Einstellungen",
   "label.share-url": "Freigabe-URL",
   "label.single-day": "Ein Tag",
-  "label.start-step": "Start Step",
-  "label.steps": "Steps",
+  "label.start-step": "Schritt starten",
+  "label.steps": "Schritte",
   "label.sum": "Summe",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-id": "Team-ID",
-  "label.team-manager": "Team manager",
+  "label.team-manager": "Team-Manager",
   "label.team-member": "Team-Mitglied",
   "label.team-name": "Name des Teams",
   "label.team-owner": "Team-Eigentümer",
@@ -193,8 +193,8 @@
   "label.total": "Gesamt",
   "label.total-records": "Datensätze insgesamt",
   "label.tracking-code": "Tracking Code",
-  "label.transfer": "Transfer",
-  "label.transfer-website": "Transfer website",
+  "label.transfer": "Übertragung",
+  "label.transfer-website": "Website übertragen",
   "label.true": "Wahr",
   "label.type": "Typ",
   "label.unique": "Eindeutig",
@@ -208,29 +208,29 @@
   "label.username": "Benutzername",
   "label.users": "Benutzer",
   "label.utm": "UTM",
-  "label.utm-description": "Track your campaigns through UTM parameters.",
+  "label.utm-description": "Tracken Sie Ihre Kampagnen mit Hilfe von UTM Parametern.",
   "label.value": "Wert",
   "label.view": "Anzeigen",
   "label.view-details": "Details anzeigen",
   "label.view-only": "Nur ansehen",
   "label.views": "Aufrufe",
-  "label.views-per-visit": "Views per visit",
+  "label.views-per-visit": "Aufrufe pro Besuch",
   "label.visit-duration": "Durchschn. Besuchszeit",
   "label.visitors": "Besucher",
-  "label.visits": "Visits",
+  "label.visits": "Besuche",
   "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Websites",
   "label.window": "Fenster",
   "label.yesterday": "Gestern",
-  "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
+  "message.action-confirmation": "Tippen Sie {confirmation} in das untenliegende Feld, um zu bestätigen.",
   "message.active-users": "{x} {x, plural, one {aktiver Besucher} other {aktive Besucher}}",
-  "message.collected-data": "Collected data",
+  "message.collected-data": "Gesammelte Daten",
   "message.confirm-delete": "Sind Sie sich sicher, {target} zu löschen?",
   "message.confirm-leave": "Sind Sie sicher, dass die {target} verlassen möchten?",
-  "message.confirm-remove": "Are you sure you want to remove {target}?",
+  "message.confirm-remove": "Sind Sie sicher, dass Sie {target} entfernen möchten?",
   "message.confirm-reset": "Sind Sie sicher, dass Sie die Statistiken von {target} zurücksetzen wollen?",
-  "message.delete-team-warning": "Deleting a team will also delete all team websites.",
+  "message.delete-team-warning": "Alle zugehörigen Websiten werden ebenfalls gelöscht.",
   "message.delete-website-warning": "Alle zugehörigen Daten werden ebenfalls gelöscht.",
   "message.error": "Es ist ein Fehler aufgetreten.",
   "message.event-log": "{event} auf {url}",
@@ -256,12 +256,12 @@
   "message.team-not-found": "Team nicht gefunden.",
   "message.team-websites-info": "Websites können von jedem im Team eingesehen werden.",
   "message.tracking-code": "Tracking Code",
-  "message.transfer-team-website-to-user": "Transfer this website to your account?",
-  "message.transfer-user-website-to-team": "Select the team to transfer this website to.",
-  "message.transfer-website": "Transfer website ownership to your account or another team.",
-  "message.triggered-event": "Triggered event",
+  "message.transfer-team-website-to-user": "Möchten Sie diese Website auf Ihr Konto übertragen?",
+  "message.transfer-user-website-to-team": "Wählen Sie das Team, auf das die Website übertragen wird.",
+  "message.transfer-website": "Übertragen Sie den Besitz der Website auf Ihren Account oder ein anderes Team.",
+  "message.triggered-event": "Event ausgelöst",
   "message.user-deleted": "Benutzer gelöscht.",
-  "message.viewed-page": "Viewed page",
+  "message.viewed-page": "Seite besucht",
   "message.visitor-log": "Besucher aus {country} benutzt {browser} auf {os} {device}",
-  "message.visitors-dropped-off": "Visitors dropped off"
+  "message.visitors-dropped-off": "Besucher haben die Seite verlassen"
 }

From 05894df58fc61d1096b846703f02ab7f9ab3fdf8 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 1 Jul 2024 12:18:43 -0700
Subject: [PATCH 194/438] replace count(distinct with uniq for session / visits

---
 src/queries/analytics/getWebsiteStats.ts            | 4 ++--
 src/queries/analytics/sessions/getSessionMetrics.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/queries/analytics/getWebsiteStats.ts b/src/queries/analytics/getWebsiteStats.ts
index 6257e166c9..2f3c82e865 100644
--- a/src/queries/analytics/getWebsiteStats.ts
+++ b/src/queries/analytics/getWebsiteStats.ts
@@ -71,8 +71,8 @@ async function clickhouseQuery(
     `
     select 
       sum(t.c) as "pageviews",
-      count(distinct t.session_id) as "visitors",
-      count(distinct t.visit_id) as "visits",
+      uniq(t.session_id) as "visitors",
+      uniq(t.visit_id) as "visits",
       sum(if(t.c = 1, 1, 0)) as "bounces",
       sum(max_time-min_time) as "totaltime"
     from (
diff --git a/src/queries/analytics/sessions/getSessionMetrics.ts b/src/queries/analytics/sessions/getSessionMetrics.ts
index e28f1fb2e7..e522a7effd 100644
--- a/src/queries/analytics/sessions/getSessionMetrics.ts
+++ b/src/queries/analytics/sessions/getSessionMetrics.ts
@@ -75,7 +75,7 @@ async function clickhouseQuery(
     `
     select
       ${column} x,
-      count(distinct session_id) y
+      uniq(session_id) y
       ${includeCountry ? ', country' : ''}
     from website_event
     where website_id = {websiteId:UUID}

From 20b3a3e6c2aa2d221f838295ba68e719ca849c41 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 1 Jul 2024 12:18:43 -0700
Subject: [PATCH 195/438] replace count(distinct with uniq for session / visits

---
 src/queries/analytics/getWebsiteStats.ts            | 4 ++--
 src/queries/analytics/sessions/getSessionMetrics.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/queries/analytics/getWebsiteStats.ts b/src/queries/analytics/getWebsiteStats.ts
index 6257e166c9..2f3c82e865 100644
--- a/src/queries/analytics/getWebsiteStats.ts
+++ b/src/queries/analytics/getWebsiteStats.ts
@@ -71,8 +71,8 @@ async function clickhouseQuery(
     `
     select 
       sum(t.c) as "pageviews",
-      count(distinct t.session_id) as "visitors",
-      count(distinct t.visit_id) as "visits",
+      uniq(t.session_id) as "visitors",
+      uniq(t.visit_id) as "visits",
       sum(if(t.c = 1, 1, 0)) as "bounces",
       sum(max_time-min_time) as "totaltime"
     from (
diff --git a/src/queries/analytics/sessions/getSessionMetrics.ts b/src/queries/analytics/sessions/getSessionMetrics.ts
index e28f1fb2e7..e522a7effd 100644
--- a/src/queries/analytics/sessions/getSessionMetrics.ts
+++ b/src/queries/analytics/sessions/getSessionMetrics.ts
@@ -75,7 +75,7 @@ async function clickhouseQuery(
     `
     select
       ${column} x,
-      count(distinct session_id) y
+      uniq(session_id) y
       ${includeCountry ? ', country' : ''}
     from website_event
     where website_id = {websiteId:UUID}

From 5289c277fb314ed183f582031783b263775ef2dd Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 1 Jul 2024 12:18:43 -0700
Subject: [PATCH 196/438] replace count(distinct with uniq for session / visits

---
 src/queries/analytics/getWebsiteStats.ts            | 4 ++--
 src/queries/analytics/sessions/getSessionMetrics.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/queries/analytics/getWebsiteStats.ts b/src/queries/analytics/getWebsiteStats.ts
index 6257e166c9..2f3c82e865 100644
--- a/src/queries/analytics/getWebsiteStats.ts
+++ b/src/queries/analytics/getWebsiteStats.ts
@@ -71,8 +71,8 @@ async function clickhouseQuery(
     `
     select 
       sum(t.c) as "pageviews",
-      count(distinct t.session_id) as "visitors",
-      count(distinct t.visit_id) as "visits",
+      uniq(t.session_id) as "visitors",
+      uniq(t.visit_id) as "visits",
       sum(if(t.c = 1, 1, 0)) as "bounces",
       sum(max_time-min_time) as "totaltime"
     from (
diff --git a/src/queries/analytics/sessions/getSessionMetrics.ts b/src/queries/analytics/sessions/getSessionMetrics.ts
index e28f1fb2e7..e522a7effd 100644
--- a/src/queries/analytics/sessions/getSessionMetrics.ts
+++ b/src/queries/analytics/sessions/getSessionMetrics.ts
@@ -75,7 +75,7 @@ async function clickhouseQuery(
     `
     select
       ${column} x,
-      count(distinct session_id) y
+      uniq(session_id) y
       ${includeCountry ? ', country' : ''}
     from website_event
     where website_id = {websiteId:UUID}

From d501410a63ac151000356274f22a1e3403c8936d Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 4 Jul 2024 15:55:06 -0700
Subject: [PATCH 197/438] Fixed console command. Updated packages.

---
 package.json                           |   2 +-
 src/app/(main)/console/TestConsole.tsx |  14 +-
 src/lib/detect.ts                      |  30 +-
 src/pages/api/send.ts                  |  31 +-
 yarn.lock                              | 577 ++++++++++++++-----------
 5 files changed, 372 insertions(+), 282 deletions(-)

diff --git a/package.json b/package.json
index 9ef6f738bc..a7a3aba1e2 100644
--- a/package.json
+++ b/package.json
@@ -175,6 +175,6 @@
     "tar": "^6.1.2",
     "ts-jest": "^29.1.2",
     "ts-node": "^10.9.1",
-    "typescript": "^5.4.3"
+    "typescript": "^5.5.3"
   }
 }
diff --git a/src/app/(main)/console/TestConsole.tsx b/src/app/(main)/console/TestConsole.tsx
index d0afb14cec..7461454f9e 100644
--- a/src/app/(main)/console/TestConsole.tsx
+++ b/src/app/(main)/console/TestConsole.tsx
@@ -21,8 +21,12 @@ export function TestConsole({ websiteId }: { websiteId: string }) {
     router.push(`/console/${value}`);
   }
 
-  function handleClick() {
-    window['umami'].track({ url: '/page-view', referrer: 'https://www.google.com' });
+  function handleRunScript() {
+    window['umami'].track(props => ({
+      ...props,
+      url: '/page-view',
+      referrer: 'https://www.google.com',
+    }));
     window['umami'].track('track-event-no-data');
     window['umami'].track('track-event-with-data', {
       test: 'test-data',
@@ -44,7 +48,7 @@ export function TestConsole({ websiteId }: { websiteId: string }) {
     });
   }
 
-  function handleIdentifyClick() {
+  function handleRunIdentify() {
     window['umami'].identify({
       userId: 123,
       name: 'brian',
@@ -145,10 +149,10 @@ export function TestConsole({ websiteId }: { websiteId: string }) {
             </div>
             <div className={styles.group}>
               <div className={styles.header}>Javascript events</div>
-              <Button id="manual-button" variant="primary" onClick={handleClick}>
+              <Button id="manual-button" variant="primary" onClick={handleRunScript}>
                 Run script
               </Button>
-              <Button id="manual-button" variant="primary" onClick={handleIdentifyClick}>
+              <Button id="manual-button" variant="primary" onClick={handleRunIdentify}>
                 Run identify
               </Button>
             </div>
diff --git a/src/lib/detect.ts b/src/lib/detect.ts
index 64f70e6ca5..56a037ec49 100644
--- a/src/lib/detect.ts
+++ b/src/lib/detect.ts
@@ -2,9 +2,9 @@ import path from 'path';
 import { getClientIp } from 'request-ip';
 import { browserName, detectOS } from 'detect-browser';
 import isLocalhost from 'is-localhost-ip';
+import ipaddr from 'ipaddr.js';
 import maxmind from 'maxmind';
 import { safeDecodeURIComponent } from 'next-basics';
-
 import {
   DESKTOP_OS,
   MOBILE_OS,
@@ -137,3 +137,31 @@ export async function getClientInfo(req: NextApiRequestCollect) {
 
   return { userAgent, browser, os, ip, country, subdivision1, subdivision2, city, device };
 }
+
+export function hasBlockedIp(req: NextApiRequestCollect) {
+  const ignoreIps = process.env.IGNORE_IP;
+
+  if (ignoreIps) {
+    const ips = [];
+
+    if (ignoreIps) {
+      ips.push(...ignoreIps.split(',').map(n => n.trim()));
+    }
+
+    const clientIp = getIpAddress(req);
+
+    return ips.find(ip => {
+      if (ip === clientIp) return true;
+
+      // CIDR notation
+      if (ip.indexOf('/') > 0) {
+        const addr = ipaddr.parse(clientIp);
+        const range = ipaddr.parseCIDR(ip);
+
+        if (addr.kind() === range[0].kind() && addr.match(range)) return true;
+      }
+    });
+  }
+
+  return false;
+}
diff --git a/src/pages/api/send.ts b/src/pages/api/send.ts
index ab565e6e70..3431795edd 100644
--- a/src/pages/api/send.ts
+++ b/src/pages/api/send.ts
@@ -1,4 +1,3 @@
-import ipaddr from 'ipaddr.js';
 import { isbot } from 'isbot';
 import { NextApiRequest, NextApiResponse } from 'next';
 import {
@@ -12,7 +11,7 @@ import {
 } from 'next-basics';
 import { COLLECTION_TYPE, HOSTNAME_REGEX, IP_REGEX } from 'lib/constants';
 import { secret, visitSalt, uuid } from 'lib/crypto';
-import { getIpAddress } from 'lib/detect';
+import { hasBlockedIp } from 'lib/detect';
 import { useCors, useSession, useValidate } from 'lib/middleware';
 import { CollectionType, YupRequest } from 'lib/types';
 import { saveEvent, saveSessionData } from 'queries';
@@ -166,31 +165,3 @@ export default async (req: NextApiRequestCollect, res: NextApiResponse) => {
 
   return methodNotAllowed(res);
 };
-
-function hasBlockedIp(req: NextApiRequestCollect) {
-  const ignoreIps = process.env.IGNORE_IP;
-
-  if (ignoreIps) {
-    const ips = [];
-
-    if (ignoreIps) {
-      ips.push(...ignoreIps.split(',').map(n => n.trim()));
-    }
-
-    const clientIp = getIpAddress(req);
-
-    return ips.find(ip => {
-      if (ip === clientIp) return true;
-
-      // CIDR notation
-      if (ip.indexOf('/') > 0) {
-        const addr = ipaddr.parse(clientIp);
-        const range = ipaddr.parseCIDR(ip);
-
-        if (addr.kind() === range[0].kind() && addr.match(range)) return true;
-      }
-    });
-  }
-
-  return false;
-}
diff --git a/yarn.lock b/yarn.lock
index 90f3da53ec..7944a0c6f0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1126,13 +1126,6 @@
   dependencies:
     regenerator-runtime "^0.14.0"
 
-"@babel/runtime@^7.23.2":
-  version "7.24.5"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.5.tgz#230946857c053a36ccc66e1dd03b17dd0c4ed02c"
-  integrity sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==
-  dependencies:
-    regenerator-runtime "^0.14.0"
-
 "@babel/template@^7.22.15", "@babel/template@^7.22.5":
   version "7.22.15"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
@@ -1565,14 +1558,6 @@
     "@formatjs/intl-localematcher" "0.2.25"
     tslib "^2.1.0"
 
-"@formatjs/ecma402-abstract@1.18.2":
-  version "1.18.2"
-  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.18.2.tgz#bf103712a406874eb1e387858d5be2371ab3aa14"
-  integrity sha512-+QoPW4csYALsQIl8GbN14igZzDbuwzcpWrku9nyMXlaqAlwRBgl5V+p0vWMGFqHOw37czNXaP/lEk4wbLgcmtA==
-  dependencies:
-    "@formatjs/intl-localematcher" "0.5.4"
-    tslib "^2.4.0"
-
 "@formatjs/ecma402-abstract@1.4.0":
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.4.0.tgz#ac6c17a8fffac43c6d68c849a7b732626d32654c"
@@ -1587,6 +1572,14 @@
   dependencies:
     tslib "^2.0.1"
 
+"@formatjs/ecma402-abstract@2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-2.0.0.tgz#39197ab90b1c78b7342b129a56a7acdb8f512e17"
+  integrity sha512-rRqXOqdFmk7RYvj4khklyqzcfQl9vEL/usogncBHRZfZBDOwMGuSRNFl02fu5KGHXdbinju+YXyuR+Nk8xlr/g==
+  dependencies:
+    "@formatjs/intl-localematcher" "0.5.4"
+    tslib "^2.4.0"
+
 "@formatjs/fast-memoize@2.2.0":
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-2.2.0.tgz#33bd616d2e486c3e8ef4e68c99648c196887802b"
@@ -1603,13 +1596,13 @@
     "@formatjs/icu-skeleton-parser" "1.3.6"
     tslib "^2.1.0"
 
-"@formatjs/icu-messageformat-parser@2.7.6":
-  version "2.7.6"
-  resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.7.6.tgz#3d69806de056d2919d53dad895a5ff4851e4e9ff"
-  integrity sha512-etVau26po9+eewJKYoiBKP6743I1br0/Ie00Pb/S/PtmYfmjTcOn2YCh2yNkSZI12h6Rg+BOgQYborXk46BvkA==
+"@formatjs/icu-messageformat-parser@2.7.8":
+  version "2.7.8"
+  resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.7.8.tgz#f6d7643001e9bb5930d812f1f9a9856f30fa0343"
+  integrity sha512-nBZJYmhpcSX0WeJ5SDYUkZ42AgR3xiyhNCsQweFx3cz/ULJjym8bHAzWKvG5e2+1XO98dBYC0fWeeAECAVSwLA==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.18.2"
-    "@formatjs/icu-skeleton-parser" "1.8.0"
+    "@formatjs/ecma402-abstract" "2.0.0"
+    "@formatjs/icu-skeleton-parser" "1.8.2"
     tslib "^2.4.0"
 
 "@formatjs/icu-skeleton-parser@1.3.6":
@@ -1620,29 +1613,29 @@
     "@formatjs/ecma402-abstract" "1.11.4"
     tslib "^2.1.0"
 
-"@formatjs/icu-skeleton-parser@1.8.0":
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.0.tgz#5f3d3a620c687d6f8c180d80d1241e8f213acf79"
-  integrity sha512-QWLAYvM0n8hv7Nq5BEs4LKIjevpVpbGLAJgOaYzg9wABEoX1j0JO1q2/jVkO6CVlq0dbsxZCngS5aXbysYueqA==
+"@formatjs/icu-skeleton-parser@1.8.2":
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.2.tgz#2252c949ae84ee66930e726130ea66731a123c9f"
+  integrity sha512-k4ERKgw7aKGWJZgTarIcNEmvyTVD9FYh0mTrrBMHZ1b8hUu6iOJ4SzsZlo3UNAvHYa+PnvntIwRPt1/vy4nA9Q==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.18.2"
+    "@formatjs/ecma402-abstract" "2.0.0"
     tslib "^2.4.0"
 
-"@formatjs/intl-displaynames@6.6.6":
-  version "6.6.6"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-6.6.6.tgz#be9fea4d24f577bb1a9d0f3ef4f2dcdabb4fe42d"
-  integrity sha512-Dg5URSjx0uzF8VZXtHb6KYZ6LFEEhCbAbKoYChYHEOnMFTw/ZU3jIo/NrujzQD2EfKPgQzIq73LOUvW6Z/LpFA==
+"@formatjs/intl-displaynames@6.6.8":
+  version "6.6.8"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-6.6.8.tgz#2f5afac8df83167f5a6ef8543600eaf1ef99c885"
+  integrity sha512-Lgx6n5KxN16B3Pb05z3NLEBQkGoXnGjkTBNCZI+Cn17YjHJ3fhCeEJJUqRlIZmJdmaXQhjcQVDp6WIiNeRYT5g==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.18.2"
+    "@formatjs/ecma402-abstract" "2.0.0"
     "@formatjs/intl-localematcher" "0.5.4"
     tslib "^2.4.0"
 
-"@formatjs/intl-listformat@7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-7.5.5.tgz#e4c7d741f2201c65e7da71326726e61332c7161e"
-  integrity sha512-XoI52qrU6aBGJC9KJddqnacuBbPlb/bXFN+lIFVFhQ1RnFHpzuFrlFdjD9am2O7ZSYsyqzYRpkVcXeT1GHkwDQ==
+"@formatjs/intl-listformat@7.5.7":
+  version "7.5.7"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-7.5.7.tgz#125e05105fabd1ae5f11881d6ab74484f2098ee4"
+  integrity sha512-MG2TSChQJQT9f7Rlv+eXwUFiG24mKSzmF144PLb8m8OixyXqn4+YWU+5wZracZGCgVTVmx8viCf7IH3QXoiB2g==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.18.2"
+    "@formatjs/ecma402-abstract" "2.0.0"
     "@formatjs/intl-localematcher" "0.5.4"
     tslib "^2.4.0"
 
@@ -1668,17 +1661,17 @@
     "@formatjs/ecma402-abstract" "1.4.0"
     tslib "^2.0.1"
 
-"@formatjs/intl@2.10.2":
-  version "2.10.2"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-2.10.2.tgz#c074439ac2dbde4c2b3768b8108dfc3932b7fb30"
-  integrity sha512-raPGWr3JRv3neXV78SqPFrGC05fIbhhNzVghHNxFde27ls2KkXiMhtP7HBybjGpikVSjjhdhaZto+4p1vmm9bQ==
+"@formatjs/intl@2.10.4":
+  version "2.10.4"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-2.10.4.tgz#e1819e0858fb05ca65923a020f346bc74e894e92"
+  integrity sha512-56483O+HVcL0c7VucAS2tyH020mt9XTozZO67cwtGg0a7KWDukS/FzW3OnvaHmTHDuYsoPIzO+ZHVfU6fT/bJw==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.18.2"
+    "@formatjs/ecma402-abstract" "2.0.0"
     "@formatjs/fast-memoize" "2.2.0"
-    "@formatjs/icu-messageformat-parser" "2.7.6"
-    "@formatjs/intl-displaynames" "6.6.6"
-    "@formatjs/intl-listformat" "7.5.5"
-    intl-messageformat "10.5.12"
+    "@formatjs/icu-messageformat-parser" "2.7.8"
+    "@formatjs/intl-displaynames" "6.6.8"
+    "@formatjs/intl-listformat" "7.5.7"
+    intl-messageformat "10.5.14"
     tslib "^2.4.0"
 
 "@formatjs/ts-transformer@3.9.4":
@@ -2002,19 +1995,19 @@
   integrity sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==
 
 "@netlify/plugin-nextjs@^5.1.0":
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/@netlify/plugin-nextjs/-/plugin-nextjs-5.2.2.tgz#3c283d335001f9e0fbcb4db75557e5fe1660db72"
-  integrity sha512-jV/P7o8+v1XaEGb7wvFfkF1fSLggAxjg7WYoBPkD3R93bsI6xmCDKBcUJ/6g7lqECRXt4dGKApSFtGk/pUmAHw==
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/@netlify/plugin-nextjs/-/plugin-nextjs-5.3.3.tgz#414cb0f4c21e6b80d6127b824efb00ae2f732a89"
+  integrity sha512-QhvZLOHhPuTnh6TZ5G0/jtjAJ1Y52A67b39eygKv6znQUPti8p+8y2WulcntpCRzVp2stzEULMNPlnptna1ikg==
 
 "@next/env@14.2.4":
   version "14.2.4"
   resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.4.tgz#5546813dc4f809884a37d257b254a5ce1b0248d7"
   integrity sha512-3EtkY5VDkuV2+lNmKlbkibIJxcO4oIHEhBWne6PaAp+76J9KoSsGvNikp6ivzAT8dhhBMYrm6op2pS1ApG0Hzg==
 
-"@next/eslint-plugin-next@14.2.3":
-  version "14.2.3"
-  resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-14.2.3.tgz#287ad8620e7061ba01e8d3313d464db6d217b6df"
-  integrity sha512-L3oDricIIjgj1AVnRdRor21gI7mShlSwU/1ZGHmqM3LzHhXXhdkrfeNY5zif25Bi5Dd7fiJHsbhoZCHfXYvlAw==
+"@next/eslint-plugin-next@14.2.4":
+  version "14.2.4"
+  resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-14.2.4.tgz#c7f965cb76f0b454e726ef0f69157c4fb4e28f53"
+  integrity sha512-svSFxW9f3xDaZA3idQmlFw7SusOuWTpDTAeBlO3AEPDltrraV+lqs7mAc6A27YdnpQVVIA3sODqUAAHdWhVWsA==
   dependencies:
     glob "10.3.10"
 
@@ -2216,9 +2209,9 @@
     slash "^4.0.0"
 
 "@rollup/plugin-commonjs@^25.0.4":
-  version "25.0.7"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-25.0.7.tgz#145cec7589ad952171aeb6a585bbeabd0fd3b4cf"
-  integrity sha512-nEvcR+LRjEjsaSsc4x3XZfCCvZIaSMenZu/OiwOKGN2UhQpAYI7ru7czFvyWbErlpoGjnSX3D5Ch5FcMA3kRWQ==
+  version "25.0.8"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-25.0.8.tgz#c77e608ab112a666b7f2a6bea625c73224f7dd34"
+  integrity sha512-ZEZWTK5n6Qde0to4vS9Mr5x/0UZoqCxPVR9KRUjU4kA2sO7GEUn1fop0DAwpO6z0Nw/kJON9bDmSxdWxO/TT1A==
   dependencies:
     "@rollup/pluginutils" "^5.0.1"
     commondir "^1.0.1"
@@ -2247,9 +2240,9 @@
     resolve "^1.22.1"
 
 "@rollup/plugin-replace@^5.0.2":
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-5.0.5.tgz#33d5653dce6d03cb24ef98bef7f6d25b57faefdf"
-  integrity sha512-rYO4fOi8lMaTg/z5Jb+hKnrHHVn8j2lwkqwyS4kTRhKyWOLf2wST2sWXr4WzWiTcoHTp2sTjqUbqIj2E39slKQ==
+  version "5.0.7"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-5.0.7.tgz#150c9ee9db8031d9e4580a61a0edeaaed3d37687"
+  integrity sha512-PqxSfuorkHz/SPpyngLyg5GCEkOcee9M1bkxiVDr41Pd61mqP1PLOoDPbpl44SB2mQGKwV/In74gqQmGITOhEQ==
   dependencies:
     "@rollup/pluginutils" "^5.0.1"
     magic-string "^0.30.3"
@@ -2273,9 +2266,9 @@
     picomatch "^2.3.1"
 
 "@rushstack/eslint-patch@^1.3.3":
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.10.2.tgz#053f1540703faa81dea2966b768ee5581c66aeda"
-  integrity sha512-hw437iINopmQuxWPSUEvqE56NCPsiU8N4AYtfHmJFckclktzK9YQJieD3XkDCDH4OjL+C7zgPUh73R/nrcHrqw==
+  version "1.10.3"
+  resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.10.3.tgz#391d528054f758f81e53210f1a1eebcf1a8b1d20"
+  integrity sha512-qC/xYId4NMebE6w/V33Fh9gWxLgURiNYgVNObbJl2LZv0GUUItCcCqC5axQSwRaAgaxl2mELq1rMzlswaQ0Zxg==
 
 "@sinclair/typebox@^0.27.8":
   version "0.27.8"
@@ -2430,17 +2423,17 @@
     "@swc/counter" "^0.1.3"
     tslib "^2.4.0"
 
-"@tanstack/query-core@5.35.5":
-  version "5.35.5"
-  resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-5.35.5.tgz#7b4100dc9cc7fee314b8a1bcbf502a236d43ffe3"
-  integrity sha512-OMWvlEqG01RfGj+XZb/piDzPp0eZkkHWSDHt2LvE/fd1zWburP/xwm0ghk6Iv8cuPlP+ACFkZviKXK0OVt6lhg==
+"@tanstack/query-core@5.48.0":
+  version "5.48.0"
+  resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-5.48.0.tgz#a3308ec925d8c16d64c789899d6c084c2fe30cbc"
+  integrity sha512-lZAfPPeVIqXCswE9SSbG33B6/91XOWt/Iq41bFeWb/mnHwQSIfFRbkS4bfs+WhIk9abRArF9Id2fp0Mgo+hq6Q==
 
 "@tanstack/react-query@^5.28.6":
-  version "5.35.5"
-  resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-5.35.5.tgz#d41a087d58f42418824fa04aaca00ba93c99075c"
-  integrity sha512-sppX7L+PVn5GBV3In6zzj0zcKfnZRKhXbX1MfIfKo1OjIq2GMaopvAFOP0x1bRYTUk2ikrdYcQYOozX7PWkb8A==
+  version "5.48.0"
+  resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-5.48.0.tgz#7890620272b48aeb278498dfe082f27518f3ac6d"
+  integrity sha512-GDExbjYWzvDokyRqMSWXdrPiYpp95Aig0oeMIrxTaruOJJgWiWfUP//OAaowm2RrRkGVsavSZdko/XmIrrV2Nw==
   dependencies:
-    "@tanstack/query-core" "5.35.5"
+    "@tanstack/query-core" "5.48.0"
 
 "@trysound/sax@0.2.0":
   version "0.2.0"
@@ -2525,21 +2518,16 @@
   dependencies:
     cypress "*"
 
-"@types/estree@*":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.3.tgz#2be19e759a3dd18c79f9f436bd7363556c1a73dd"
-  integrity sha512-CS2rOaoQ/eAgAfcTfq6amKG7bsN+EMcgGY4FAFQdvSj2y1ixvOZTUA9mOtCai7E1SYu283XNw7urKK30nP3wkQ==
+"@types/estree@*", "@types/estree@^1.0.0":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
+  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
 
 "@types/estree@^0.0.50":
   version "0.0.50"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"
   integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==
 
-"@types/estree@^1.0.0":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
-  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
-
 "@types/fs-extra@^8.0.1":
   version "8.1.4"
   resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.4.tgz#8171df1d16a80d69fc9c3aab07d7961349a5cb8b"
@@ -2653,9 +2641,9 @@
   integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==
 
 "@types/node@*", "@types/node@^20.9.0":
-  version "20.12.11"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.11.tgz#c4ef00d3507000d17690643278a60dc55a9dc9be"
-  integrity sha512-vDg9PZ/zi+Nqp6boSOT7plNuthRugEKixDv5sFTIpkE89MmNtEArAShI4mxuX2+UrLEe9pxC1vm2cjm9YlWbJw==
+  version "20.14.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.9.tgz#12e8e765ab27f8c421a1820c99f5f313a933b420"
+  integrity sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==
   dependencies:
     undici-types "~5.26.4"
 
@@ -2704,9 +2692,9 @@
     "@types/react" "*"
 
 "@types/react@*", "@types/react@16 || 17 || 18", "@types/react@^18.2.41":
-  version "18.3.1"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.1.tgz#fed43985caa834a2084d002e4771e15dfcbdbe8e"
-  integrity sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw==
+  version "18.3.3"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.3.tgz#9679020895318b0915d7a3ab004d92d33375c45f"
+  integrity sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==
   dependencies:
     "@types/prop-types" "*"
     csstype "^3.0.2"
@@ -3209,14 +3197,14 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-aria-query@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.0.tgz#650c569e41ad90b51b3d7df5e5eed1c7549c103e"
-  integrity sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==
+aria-query@~5.1.3:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.1.3.tgz#19db27cd101152773631396f7a95a3b58c22c35e"
+  integrity sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==
   dependencies:
-    dequal "^2.0.3"
+    deep-equal "^2.0.5"
 
-array-buffer-byte-length@^1.0.1:
+array-buffer-byte-length@^1.0.0, array-buffer-byte-length@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f"
   integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==
@@ -3229,7 +3217,7 @@ array-find-index@^1.0.1:
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
   integrity sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==
 
-array-includes@^3.1.6, array-includes@^3.1.7:
+array-includes@^3.1.6, array-includes@^3.1.7, array-includes@^3.1.8:
   version "3.1.8"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.8.tgz#5e370cbe172fdd5dd6530c1d4aadda25281ba97d"
   integrity sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==
@@ -3246,7 +3234,7 @@ array-union@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-array.prototype.findlast@^1.2.4:
+array.prototype.findlast@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz#3e4fbcb30a15a7f5bf64cf2faae22d139c2e4904"
   integrity sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==
@@ -3300,15 +3288,15 @@ array.prototype.toreversed@^1.1.2:
     es-abstract "^1.22.1"
     es-shim-unscopables "^1.0.0"
 
-array.prototype.tosorted@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.3.tgz#c8c89348337e51b8a3c48a9227f9ce93ceedcba8"
-  integrity sha512-/DdH4TiTmOKzyQbp/eadcCVexiCb36xJg7HshYOYJnNZFDj33GEv0P7GxsynpShhq4OLYJzbGcBDkLsDt7MnNg==
+array.prototype.tosorted@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz#fe954678ff53034e717ea3352a03f0b0b86f7ffc"
+  integrity sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==
   dependencies:
-    call-bind "^1.0.5"
+    call-bind "^1.0.7"
     define-properties "^1.2.1"
-    es-abstract "^1.22.3"
-    es-errors "^1.1.0"
+    es-abstract "^1.23.3"
+    es-errors "^1.3.0"
     es-shim-unscopables "^1.0.2"
 
 arraybuffer.prototype.slice@^1.0.3:
@@ -3392,21 +3380,21 @@ aws-sign2@~0.7.0:
   integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
 
 aws4@^1.8.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.12.0.tgz#ce1c9d143389679e253b314241ea9aa5cec980d3"
-  integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.13.0.tgz#d9b802e9bb9c248d7be5f7f5ef178dc3684e9dcc"
+  integrity sha512-3AungXC4I8kKsS9PuS4JH2nc+0bVY/mjgrephHTIi8fpEeGsTHBUJeosp0Wc1myYMElmD0B3Oc4XL/HVJ4PV2g==
 
-axe-core@=4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.7.0.tgz#34ba5a48a8b564f67e103f0aa5768d76e15bbbbf"
-  integrity sha512-M0JtH+hlOL5pLQwHOLNYZaXuhqmvS8oExsqB1SBYgA4Dk7u/xx+YdGHXaK5pyUfed5mYXdlYiphWq3G8cRi5JQ==
+axe-core@^4.9.1:
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.9.1.tgz#fcd0f4496dad09e0c899b44f6c4bb7848da912ae"
+  integrity sha512-QbUdXJVTpvUTHU7871ppZkdOLBeGUKBQWHkHrvN2V9IQWGMt61zf3B45BtzjxEJzYuj0JBjBZP/hmYS/R9pmAw==
 
-axobject-query@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-3.2.1.tgz#39c378a6e3b06ca679f29138151e45b2b32da62a"
-  integrity sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==
+axobject-query@~3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-3.1.1.tgz#3b6e5c6d4e43ca7ba51c5babf99d22a9c68485e1"
+  integrity sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==
   dependencies:
-    dequal "^2.0.3"
+    deep-equal "^2.0.5"
 
 babel-jest@^29.7.0:
   version "29.7.0"
@@ -3565,7 +3553,7 @@ brace-expansion@^2.0.1:
   dependencies:
     balanced-match "^1.0.0"
 
-braces@^3.0.2:
+braces@^3.0.2, braces@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
   integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
@@ -3754,9 +3742,9 @@ charenc@0.0.2:
   integrity sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==
 
 chart.js@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-4.4.2.tgz#95962fa6430828ed325a480cc2d5f2b4e385ac31"
-  integrity sha512-6GD7iKwFpP5kbSD4MeRRRlTnQvxfQREy36uEtm1hzHzcOqwWx0YEHuspuoNlslu+nciLIB7fjjsHkUv/FzFcOg==
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-4.4.3.tgz#3b2e11e7010fefa99b07d0349236f5098e5226ad"
+  integrity sha512-qK1gkGSRYcJzqrrzdR6a+I0vQ4/R+SoODXyAjscQ/4mzuNzySaMCd+hyVxitSY1+L2fjPD1Gbn+ibNqRmwQeLw==
   dependencies:
     "@kurkle/color" "^0.3.0"
 
@@ -3810,9 +3798,9 @@ cli-cursor@^4.0.0:
     restore-cursor "^4.0.0"
 
 cli-table3@~0.6.1:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.4.tgz#d1c536b8a3f2e7bec58f67ac9e5769b1b30088b0"
-  integrity sha512-Lm3L0p+/npIQWNIiyF/nAn7T5dnOwR3xNTHXYEBFBFVPXzCVNZ5lqEC/1eo/EVfpDsQ1I+TX4ORPQgp+UI0CRw==
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.5.tgz#013b91351762739c16a9567c21a04632e449bf2f"
+  integrity sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==
   dependencies:
     string-width "^4.2.0"
   optionalDependencies:
@@ -4267,9 +4255,9 @@ cypress@*:
     yauzl "^2.10.0"
 
 cypress@^13.6.6:
-  version "13.9.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.9.0.tgz#b529cfa8f8c39ba163ed0501a25bb5b09c143652"
-  integrity sha512-atNjmYfHsvTuCaxTxLZr9xGoHz53LLui3266WWxXJHY7+N6OdwJdg/feEa3T+buez9dmUXHT1izCOklqG82uCQ==
+  version "13.12.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.12.0.tgz#1a4ea89b7fa6855e32bc02eaf5e25fc45b9e273f"
+  integrity sha512-udzS2JilmI9ApO/UuqurEwOvThclin5ntz7K0BtnHBs+tg2Bl9QShLISXpSEMDv/u8b6mqdoAdyKeZiSqKWL8g==
   dependencies:
     "@cypress/request" "^3.0.0"
     "@cypress/xvfb" "^1.2.4"
@@ -4461,7 +4449,7 @@ debounce@^1.2.1:
   resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
   integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
 
-debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
+debug@4.3.4, debug@^4.1.0, debug@^4.3.1, debug@^4.3.2:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -4475,6 +4463,13 @@ debug@^3.1.0, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
+debug@^4.1.1, debug@^4.3.4:
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e"
+  integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==
+  dependencies:
+    ms "2.1.2"
+
 decamelize-keys@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8"
@@ -4498,6 +4493,30 @@ dedent@^1.0.0:
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.5.1.tgz#4f3fc94c8b711e9bb2800d185cd6ad20f2a90aff"
   integrity sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==
 
+deep-equal@^2.0.5:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.2.3.tgz#af89dafb23a396c7da3e862abc0be27cf51d56e1"
+  integrity sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==
+  dependencies:
+    array-buffer-byte-length "^1.0.0"
+    call-bind "^1.0.5"
+    es-get-iterator "^1.1.3"
+    get-intrinsic "^1.2.2"
+    is-arguments "^1.1.1"
+    is-array-buffer "^3.0.2"
+    is-date-object "^1.0.5"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.2"
+    isarray "^2.0.5"
+    object-is "^1.1.5"
+    object-keys "^1.1.1"
+    object.assign "^4.1.4"
+    regexp.prototype.flags "^1.5.1"
+    side-channel "^1.0.4"
+    which-boxed-primitive "^1.0.2"
+    which-collection "^1.0.1"
+    which-typed-array "^1.1.13"
+
 deep-is@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
@@ -4517,7 +4536,7 @@ define-data-property@^1.0.1, define-data-property@^1.1.4:
     es-errors "^1.3.0"
     gopd "^1.0.1"
 
-define-properties@^1.2.0, define-properties@^1.2.1:
+define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
   integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
@@ -4559,11 +4578,6 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
-dequal@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
-  integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
-
 detect-browser@^5.2.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.3.0.tgz#9705ef2bddf46072d0f7265a1fe300e36fe7ceca"
@@ -4731,9 +4745,9 @@ end-of-stream@^1.1.0:
     once "^1.4.0"
 
 enhanced-resolve@^5.12.0:
-  version "5.16.1"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.16.1.tgz#e8bc63d51b826d6f1cbc0a150ecb5a8b0c62e567"
-  integrity sha512-4U5pNsuDl0EhuZpq46M5xPslstkviJuhrdobaRDBk2Jy2KO37FDAJl4lb2KlNabxT0m4MTK2UHNrsAcphE8nyw==
+  version "5.17.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz#d037603789dd9555b89aaec7eb78845c49089bc5"
+  integrity sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -4763,7 +4777,7 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.1, es-abstract@^1.23.2, es-abstract@^1.23.3:
+es-abstract@^1.17.5, es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.1, es-abstract@^1.23.2, es-abstract@^1.23.3:
   version "1.23.3"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0"
   integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==
@@ -4822,12 +4836,27 @@ es-define-property@^1.0.0:
   dependencies:
     get-intrinsic "^1.2.4"
 
-es-errors@^1.1.0, es-errors@^1.2.1, es-errors@^1.3.0:
+es-errors@^1.2.1, es-errors@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
   integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
 
-es-iterator-helpers@^1.0.15, es-iterator-helpers@^1.0.17:
+es-get-iterator@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.3.tgz#3ef87523c5d464d41084b2c3c9c214f1199763d6"
+  integrity sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.3"
+    has-symbols "^1.0.3"
+    is-arguments "^1.1.1"
+    is-map "^2.0.2"
+    is-set "^2.0.2"
+    is-string "^1.0.7"
+    isarray "^2.0.5"
+    stop-iteration-iterator "^1.0.0"
+
+es-iterator-helpers@^1.0.19:
   version "1.0.19"
   resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz#117003d0e5fec237b4b5c08aded722e0c6d50ca8"
   integrity sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw==
@@ -4933,11 +4962,11 @@ escape-string-regexp@^4.0.0:
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
 eslint-config-next@^14.0.4:
-  version "14.2.3"
-  resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-14.2.3.tgz#2fb0f7c4eccda530a4b5054438162b2303786d4f"
-  integrity sha512-ZkNztm3Q7hjqvB1rRlOX8P9E/cXRL9ajRcs8jufEtwMfTVYRqnmtnaSu57QqHyBlovMuiB8LEzfLBkh5RYV6Fg==
+  version "14.2.4"
+  resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-14.2.4.tgz#eb0bedfe4a894bc2aea918214bb5243ee4fa7d4b"
+  integrity sha512-Qr0wMgG9m6m4uYy2jrYJmyuNlYZzPRQq5Kvb9IDlYwn+7yq6W6sfMNFgb+9guM1KYwuIo6TIaiFhZJ6SnQ/Efw==
   dependencies:
-    "@next/eslint-plugin-next" "14.2.3"
+    "@next/eslint-plugin-next" "14.2.4"
     "@rushstack/eslint-patch" "^1.3.3"
     "@typescript-eslint/parser" "^5.4.2 || ^6.0.0 || 7.0.0 - 7.2.0"
     eslint-import-resolver-node "^0.3.6"
@@ -5032,26 +5061,26 @@ eslint-plugin-jest@^27.9.0:
     "@typescript-eslint/utils" "^5.10.0"
 
 eslint-plugin-jsx-a11y@^6.7.1:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.8.0.tgz#2fa9c701d44fcd722b7c771ec322432857fcbad2"
-  integrity sha512-Hdh937BS3KdwwbBaKd5+PLCOmYY6U4f2h9Z2ktwtNKvIdIEu137rjYbcb9ApSbVJfWxANNuiKTD/9tOKjK9qOA==
+  version "6.9.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.9.0.tgz#67ab8ff460d4d3d6a0b4a570e9c1670a0a8245c8"
+  integrity sha512-nOFOCaJG2pYqORjK19lqPqxMO/JpvdCZdPtNdxY3kvom3jTvkAbOvQvD8wuD0G8BYR0IGAGYDlzqWJOh/ybn2g==
   dependencies:
-    "@babel/runtime" "^7.23.2"
-    aria-query "^5.3.0"
-    array-includes "^3.1.7"
+    aria-query "~5.1.3"
+    array-includes "^3.1.8"
     array.prototype.flatmap "^1.3.2"
     ast-types-flow "^0.0.8"
-    axe-core "=4.7.0"
-    axobject-query "^3.2.1"
+    axe-core "^4.9.1"
+    axobject-query "~3.1.1"
     damerau-levenshtein "^1.0.8"
     emoji-regex "^9.2.2"
-    es-iterator-helpers "^1.0.15"
-    hasown "^2.0.0"
+    es-iterator-helpers "^1.0.19"
+    hasown "^2.0.2"
     jsx-ast-utils "^3.3.5"
     language-tags "^1.0.9"
     minimatch "^3.1.2"
-    object.entries "^1.1.7"
-    object.fromentries "^2.0.7"
+    object.fromentries "^2.0.8"
+    safe-regex-test "^1.0.3"
+    string.prototype.includes "^2.0.0"
 
 eslint-plugin-prettier@^4.0.0:
   version "4.2.1"
@@ -5061,9 +5090,9 @@ eslint-plugin-prettier@^4.0.0:
     prettier-linter-helpers "^1.0.0"
 
 eslint-plugin-promise@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz#269a3e2772f62875661220631bd4dafcb4083816"
-  integrity sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-6.2.0.tgz#e24ab0e3c0a25fa227d98d9ff612156b5af15945"
+  integrity sha512-QmAqwizauvnKOlifxyDj2ObfULpHQawlg/zQdgEixur9vl0CvZGv/LCJV2rtj3210QCoeGBzVMfMXqGAOr/4fA==
 
 "eslint-plugin-react-hooks@^4.5.0 || 5.0.0-canary-7118f5dd7-20230705":
   version "4.6.2"
@@ -5071,28 +5100,28 @@ eslint-plugin-promise@^6.1.1:
   integrity sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==
 
 eslint-plugin-react@^7.33.2:
-  version "7.34.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.34.1.tgz#6806b70c97796f5bbfb235a5d3379ece5f4da997"
-  integrity sha512-N97CxlouPT1AHt8Jn0mhhN2RrADlUAsk1/atcT2KyA/l9Q/E6ll7OIGwNumFmWfZ9skV3XXccYS19h80rHtgkw==
+  version "7.34.3"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.34.3.tgz#9965f27bd1250a787b5d4cfcc765e5a5d58dcb7b"
+  integrity sha512-aoW4MV891jkUulwDApQbPYTVZmeuSyFrudpbTAQuj5Fv8VL+o6df2xIGpw8B0hPjAaih1/Fb0om9grCdyFYemA==
   dependencies:
-    array-includes "^3.1.7"
-    array.prototype.findlast "^1.2.4"
+    array-includes "^3.1.8"
+    array.prototype.findlast "^1.2.5"
     array.prototype.flatmap "^1.3.2"
     array.prototype.toreversed "^1.1.2"
-    array.prototype.tosorted "^1.1.3"
+    array.prototype.tosorted "^1.1.4"
     doctrine "^2.1.0"
-    es-iterator-helpers "^1.0.17"
+    es-iterator-helpers "^1.0.19"
     estraverse "^5.3.0"
     jsx-ast-utils "^2.4.1 || ^3.0.0"
     minimatch "^3.1.2"
-    object.entries "^1.1.7"
-    object.fromentries "^2.0.7"
-    object.hasown "^1.1.3"
-    object.values "^1.1.7"
+    object.entries "^1.1.8"
+    object.fromentries "^2.0.8"
+    object.hasown "^1.1.4"
+    object.values "^1.2.0"
     prop-types "^15.8.1"
     resolve "^2.0.0-next.5"
     semver "^6.3.1"
-    string.prototype.matchall "^4.0.10"
+    string.prototype.matchall "^4.0.11"
 
 eslint-scope@^5.1.1:
   version "5.1.1"
@@ -5489,9 +5518,9 @@ for-each@^0.3.3:
     is-callable "^1.1.3"
 
 foreground-child@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d"
-  integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.2.1.tgz#767004ccf3a5b30df39bed90718bab43fe0a59f7"
+  integrity sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==
   dependencies:
     cross-spawn "^7.0.0"
     signal-exit "^4.0.1"
@@ -5609,7 +5638,7 @@ get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4:
+get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd"
   integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
@@ -6039,7 +6068,7 @@ ini@^1.3.5:
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
-internal-slot@^1.0.7:
+internal-slot@^1.0.4, internal-slot@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802"
   integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==
@@ -6068,14 +6097,14 @@ intl-messageformat-parser@^5.3.7:
   dependencies:
     "@formatjs/intl-numberformat" "^5.5.2"
 
-intl-messageformat@10.5.12:
-  version "10.5.12"
-  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.5.12.tgz#a0c1a20da896b7a1f4ba1b59c8ba5d9943c29c3f"
-  integrity sha512-izl0uxhy/melhw8gP2r8pGiVieviZmM4v5Oqx3c1/R7g9cwER2smmGfSjcIsp8Y3Q53bfciL/gkxacJRx/dUvg==
+intl-messageformat@10.5.14:
+  version "10.5.14"
+  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.5.14.tgz#e5bb373f8a37b88fbe647d7b941f3ab2a37ed00a"
+  integrity sha512-IjC6sI0X7YRjjyVH9aUgdftcmZK7WXdHeil4KwbjDnRWjnVitKpAx3rr6t6di1joFp5188VqKcobOPA6mCLG/w==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.18.2"
+    "@formatjs/ecma402-abstract" "2.0.0"
     "@formatjs/fast-memoize" "2.2.0"
-    "@formatjs/icu-messageformat-parser" "2.7.6"
+    "@formatjs/icu-messageformat-parser" "2.7.8"
     tslib "^2.4.0"
 
 ipaddr.js@^2.0.1:
@@ -6083,7 +6112,15 @@ ipaddr.js@^2.0.1:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.2.0.tgz#d33fa7bac284f4de7af949638c9d68157c6b92e8"
   integrity sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==
 
-is-array-buffer@^3.0.4:
+is-arguments@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"
+  integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==
+  dependencies:
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
+
+is-array-buffer@^3.0.2, is-array-buffer@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98"
   integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==
@@ -6142,7 +6179,14 @@ is-ci@^3.0.1:
   dependencies:
     ci-info "^3.2.0"
 
-is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.13.1, is-core-module@^2.5.0:
+is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.13.1:
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.14.0.tgz#43b8ef9f46a6a08888db67b1ffd4ec9e3dfd59d1"
+  integrity sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==
+  dependencies:
+    hasown "^2.0.2"
+
+is-core-module@^2.5.0:
   version "2.13.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
   integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
@@ -6222,7 +6266,7 @@ is-localhost-ip@^1.4.0:
   resolved "https://registry.yarnpkg.com/is-localhost-ip/-/is-localhost-ip-1.4.0.tgz#dd66aaabcbb5dbbc943e00adad5f715d2c3b3a1d"
   integrity sha512-cN7SzlY7BVxSeoJu5equjsZaKSgD4HCfXrTwu0Jgbq5BbT1BU+D7Lyi/l1KO8H0un0JTlxcQaT/GWVapu+DIDg==
 
-is-map@^2.0.3:
+is-map@^2.0.2, is-map@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e"
   integrity sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==
@@ -6294,7 +6338,7 @@ is-regex@^1.1.4:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-set@^2.0.3:
+is-set@^2.0.2, is-set@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.3.tgz#8ab209ea424608141372ded6e0cb200ef1d9d01d"
   integrity sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==
@@ -6373,9 +6417,9 @@ isarray@^2.0.5:
   integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
 
 isbot@^5.1.1:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/isbot/-/isbot-5.1.6.tgz#579a48515e92a3e064da63a41709815d8e641a30"
-  integrity sha512-Phksj1A0dBP/M/5xeOx0zWemKlZRQvrbNzI19/HWso0uodiOcR8YYCXN60IdzwbKsGj5LnxPkMy6FuBtgckMNw==
+  version "5.1.11"
+  resolved "https://registry.yarnpkg.com/isbot/-/isbot-5.1.11.tgz#55e91e887c806a5f07d18ce04c2efe194215ba36"
+  integrity sha512-Asuou7OsKVbATgXlrlqdeSRw4fYnD6CNcc0IXy1f5m1AImL2S6IP0xRcRRzjGjoARbegvnBnju9kk5z/Itf70Q==
 
 isexe@^2.0.0:
   version "2.0.0"
@@ -7033,9 +7077,9 @@ known-css-properties@^0.29.0:
   integrity sha512-Ne7wqW7/9Cz54PDt4I3tcV+hAyat8ypyOGzYRJQfdxnnjeWsTxt1cy8pjvvKeI5kfXuyvULyeeAvwvvtAX3ayQ==
 
 language-subtag-registry@^0.3.20:
-  version "0.3.22"
-  resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz#2e1500861b2e457eba7e7ae86877cbd08fa1fd1d"
-  integrity sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==
+  version "0.3.23"
+  resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.23.tgz#23529e04d9e3b74679d70142df3fd2eb6ec572e7"
+  integrity sha512-0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ==
 
 language-tags@^1.0.9:
   version "1.0.9"
@@ -7290,9 +7334,9 @@ lower-case@^2.0.2:
     tslib "^2.0.3"
 
 lru-cache@^10.2.0:
-  version "10.2.2"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.2.tgz#48206bc114c1252940c41b25b41af5b545aca878"
-  integrity sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==
+  version "10.3.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.3.0.tgz#4a4aaf10c84658ab70f79a85a9a3f1e1fb11196b"
+  integrity sha512-CQl19J/g+Hbjbv4Y3mFNNXFEL/5t/KCg8POCuUqd4rMKjGG+j1ybER83hxV58zL+dFI1PTkt3GNFSHRt+d8qEQ==
 
 lru-cache@^5.1.1:
   version "5.1.1"
@@ -7308,13 +7352,20 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-magic-string@^0.30.0, magic-string@^0.30.2, magic-string@^0.30.3:
+magic-string@^0.30.0, magic-string@^0.30.2:
   version "0.30.5"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.5.tgz#1994d980bd1c8835dc6e78db7cbd4ae4f24746f9"
   integrity sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==
   dependencies:
     "@jridgewell/sourcemap-codec" "^1.4.15"
 
+magic-string@^0.30.3:
+  version "0.30.10"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.10.tgz#123d9c41a0cb5640c892b041d4cfb3bd0aa4b39e"
+  integrity sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.4.15"
+
 make-dir@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
@@ -7357,11 +7408,11 @@ mathml-tag-names@^2.1.3:
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
 maxmind@^4.3.6:
-  version "4.3.19"
-  resolved "https://registry.yarnpkg.com/maxmind/-/maxmind-4.3.19.tgz#da97391185b41373961685419f0f12dfd7b97ff9"
-  integrity sha512-Bu/VEN7ZWAOCjifdZaXJQuN6/yO7+OK35pnJsqmz8sOndK3KQFvJoY+6HX09/MmLLqtCfa+sMK0iaQOaTejGNA==
+  version "4.3.20"
+  resolved "https://registry.yarnpkg.com/maxmind/-/maxmind-4.3.20.tgz#1b85c4b0d9a8df072c5cbe50dc5c54c130a02889"
+  integrity sha512-xwnLGghs96DyNK3ANs1jzW8+JwS6pBQ3eTh3kNsi23n5wySZb9FgqCghmde5JZFOv23bxGehcyh6lT522llNKw==
   dependencies:
-    mmdb-lib "2.1.0"
+    mmdb-lib "2.1.1"
     tiny-lru "11.2.6"
 
 md5@^2.3.0:
@@ -7443,7 +7494,7 @@ merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-micromatch@4.0.5, micromatch@^4.0.4, micromatch@^4.0.5:
+micromatch@4.0.5, micromatch@^4.0.5:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -7451,6 +7502,14 @@ micromatch@4.0.5, micromatch@^4.0.4, micromatch@^4.0.5:
     braces "^3.0.2"
     picomatch "^2.3.1"
 
+micromatch@^4.0.4:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5"
+  integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==
+  dependencies:
+    braces "^3.0.3"
+    picomatch "^2.3.1"
+
 mime-db@1.52.0:
   version "1.52.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
@@ -7500,9 +7559,9 @@ minimatch@^5.0.1:
     brace-expansion "^2.0.1"
 
 minimatch@^9.0.1:
-  version "9.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51"
-  integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==
+  version "9.0.5"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
+  integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
   dependencies:
     brace-expansion "^2.0.1"
 
@@ -7533,9 +7592,9 @@ minipass@^5.0.0:
   integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
 
 "minipass@^5.0.0 || ^6.0.2 || ^7.0.0":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.1.tgz#f7f85aff59aa22f110b20e27692465cf3bf89481"
-  integrity sha512-UZ7eQ+h8ywIRAW1hIEl2AqdwzJucU/Kp59+8kkZeSvafXhZjul247BvIJjEVFVeON6d7lM46XX1HXCduKAS8VA==
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
+  integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
 
 minizlib@^2.1.1:
   version "2.1.2"
@@ -7550,10 +7609,10 @@ mkdirp@^1.0.3:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
-mmdb-lib@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mmdb-lib/-/mmdb-lib-2.1.0.tgz#c2456caaf4c7ffa056f77575da6d40988e9e878b"
-  integrity sha512-tdDTZmnI5G4UoSctv2KxM/3VQt2XRj4CmR5R4VsAWsOUcS3LysHR34wtixWm/pXxXdkBDuN92auxkC0T2+qd1Q==
+mmdb-lib@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/mmdb-lib/-/mmdb-lib-2.1.1.tgz#c0d0bd35dc1fca41f0ebd043e43227ab04eb1792"
+  integrity sha512-yx8H/1H5AfnufiLnzzPqPf4yr/dKU9IFT1rPVwSkrKWHsQEeVVd6+X+L0nUbXhlEFTu3y/7hu38CFmEVgzvyeg==
 
 moment-timezone@^0.5.35:
   version "0.5.45"
@@ -7743,9 +7802,17 @@ object-assign@^4, object-assign@^4.1.1:
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
 object-inspect@^1.13.1:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
-  integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.2.tgz#dea0088467fb991e67af4058147a24824a3043ff"
+  integrity sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==
+
+object-is@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.6.tgz#1a6a53aed2dd8f7e6775ff870bea58545956ab07"
+  integrity sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
 
 object-keys@^1.1.1:
   version "1.1.1"
@@ -7762,7 +7829,7 @@ object.assign@^4.1.4, object.assign@^4.1.5:
     has-symbols "^1.0.3"
     object-keys "^1.1.1"
 
-object.entries@^1.1.7:
+object.entries@^1.1.8:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.8.tgz#bffe6f282e01f4d17807204a24f8edd823599c41"
   integrity sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==
@@ -7771,7 +7838,7 @@ object.entries@^1.1.7:
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
-object.fromentries@^2.0.7:
+object.fromentries@^2.0.7, object.fromentries@^2.0.8:
   version "2.0.8"
   resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.8.tgz#f7195d8a9b97bd95cbc1999ea939ecd1a2b00c65"
   integrity sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==
@@ -7790,7 +7857,7 @@ object.groupby@^1.0.1:
     define-properties "^1.2.1"
     es-abstract "^1.23.2"
 
-object.hasown@^1.1.3:
+object.hasown@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.4.tgz#e270ae377e4c120cdcb7656ce66884a6218283dc"
   integrity sha512-FZ9LZt9/RHzGySlBARE3VF+gE26TxR38SdmqOqliuTnl9wrKulaQs+4dee1V+Io8VfxqzAfHu6YuRgUy8OHoTg==
@@ -7799,7 +7866,7 @@ object.hasown@^1.1.3:
     es-abstract "^1.23.2"
     es-object-atoms "^1.0.0"
 
-object.values@^1.1.6, object.values@^1.1.7:
+object.values@^1.1.6, object.values@^1.1.7, object.values@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.0.tgz#65405a9d92cee68ac2d303002e0b8470a4d9ab1b"
   integrity sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==
@@ -7969,9 +8036,9 @@ path-parse@^1.0.7:
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-scurry@^1.10.1:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.0.tgz#332d64e9726bf667fb348e5a1c71005c09ad741a"
-  integrity sha512-LNHTaVkzaYaLGlO+0u3rQTz7QrHTFOuKyba9JMTQutkmtNew8dw8wOD7mTU/5fCPZzCWpfW0XnQKzY61P0aTaw==
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2"
+  integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==
   dependencies:
     lru-cache "^10.2.0"
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
@@ -8810,19 +8877,19 @@ react-hook-form@^7.34.2:
   integrity sha512-F/TroLjTICipmHeFlMrLtNLceO2xr1jU3CyiNla5zdwsGUGu2UOxxR4UyJgLlhMwLW/Wzp4cpJ7CPfgJIeKdSg==
 
 react-intl@^6.5.5:
-  version "6.6.6"
-  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-6.6.6.tgz#67979f790263c5ebd95b6ea581110eea3e7b550f"
-  integrity sha512-dKXQNUrhZTlCp8uelYW8PHiM4saNKyLmHCfsJYWK0N/kZ/Ien35wjPHB8x9yQcTJbeN/hBOmb4x16iKUrdL9MA==
-  dependencies:
-    "@formatjs/ecma402-abstract" "1.18.2"
-    "@formatjs/icu-messageformat-parser" "2.7.6"
-    "@formatjs/intl" "2.10.2"
-    "@formatjs/intl-displaynames" "6.6.6"
-    "@formatjs/intl-listformat" "7.5.5"
+  version "6.6.8"
+  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-6.6.8.tgz#cb60c90502d0025caf9f86ec298cdc4348da17c2"
+  integrity sha512-M0pkhzcgV31h++2901BiRXWl69hp2zPyLxRrSwRjd1ErXbNoubz/f4M6DrRTd4OiSUrT4ajRQzrmtS5plG4FtA==
+  dependencies:
+    "@formatjs/ecma402-abstract" "2.0.0"
+    "@formatjs/icu-messageformat-parser" "2.7.8"
+    "@formatjs/intl" "2.10.4"
+    "@formatjs/intl-displaynames" "6.6.8"
+    "@formatjs/intl-listformat" "7.5.7"
     "@types/hoist-non-react-statics" "^3.3.1"
     "@types/react" "16 || 17 || 18"
     hoist-non-react-statics "^3.3.2"
-    intl-messageformat "10.5.12"
+    intl-messageformat "10.5.14"
     tslib "^2.4.0"
 
 react-is@^16.13.1, react-is@^16.7.0:
@@ -9018,7 +9085,7 @@ regenerator-transform@^0.15.2:
   dependencies:
     "@babel/runtime" "^7.8.4"
 
-regexp.prototype.flags@^1.5.2:
+regexp.prototype.flags@^1.5.1, regexp.prototype.flags@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334"
   integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==
@@ -9141,9 +9208,9 @@ reusify@^1.0.4:
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
 rfdc@^1.3.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.1.tgz#2b6d4df52dffe8bb346992a10ea9451f24373a8f"
-  integrity sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.4.1.tgz#778f76c4fb731d93414e8f925fbecf64cce7f6ca"
+  integrity sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==
 
 rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
@@ -9567,6 +9634,13 @@ stack-utils@^2.0.3:
   dependencies:
     escape-string-regexp "^2.0.0"
 
+stop-iteration-iterator@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz#6a60be0b4ee757d1ed5254858ec66b10c49285e4"
+  integrity sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==
+  dependencies:
+    internal-slot "^1.0.4"
+
 streamsearch@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764"
@@ -9617,7 +9691,15 @@ string-width@^5.0.0, string-width@^5.0.1, string-width@^5.1.2:
     emoji-regex "^9.2.2"
     strip-ansi "^7.0.1"
 
-string.prototype.matchall@^4.0.10:
+string.prototype.includes@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.includes/-/string.prototype.includes-2.0.0.tgz#8986d57aee66d5460c144620a6d873778ad7289f"
+  integrity sha512-E34CkBgyeqNDcrbU76cDjL5JLcVrtSdYq0MEh/B10r17pRP4ciHLwTgnuLV8Ay6cgEMLkcBkFCKyFZ43YldYzg==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
+
+string.prototype.matchall@^4.0.11:
   version "4.0.11"
   resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz#1092a72c59268d2abaad76582dccc687c0297e0a"
   integrity sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==
@@ -9770,9 +9852,9 @@ stylelint-config-prettier@^9.0.3:
   integrity sha512-U44lELgLZhbAD/xy/vncZ2Pq8sh2TnpiPvo38Ifg9+zeioR+LAkHu0i6YORIOxFafZoVg0xqQwex6e6F25S5XA==
 
 stylelint-config-recommended@^14.0.0:
-  version "14.0.0"
-  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-14.0.0.tgz#b395c7014838d2aaca1755eebd914d0bb5274994"
-  integrity sha512-jSkx290CglS8StmrLp2TxAppIajzIBZKYm3IxT89Kg6fGlxbPiTiyH9PS5YUuVAFwaJLl1ikiXX0QWjI0jmgZQ==
+  version "14.0.1"
+  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-14.0.1.tgz#d25e86409aaf79ee6c6085c2c14b33c7e23c90c6"
+  integrity sha512-bLvc1WOz/14aPImu/cufKAZYfXs/A/owZfSMZ4N+16WGXLoX5lOir53M6odBxvhgmgdxCVnNySJmZKx73T93cg==
 
 stylelint-scss@^6.0.0:
   version "6.1.0"
@@ -10037,9 +10119,9 @@ ts-api-utils@^1.0.1:
   integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
 
 ts-jest@^29.1.2:
-  version "29.1.2"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.2.tgz#7613d8c81c43c8cb312c6904027257e814c40e09"
-  integrity sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==
+  version "29.1.5"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.5.tgz#d6c0471cc78bffa2cb4664a0a6741ef36cfe8f69"
+  integrity sha512-UuClSYxM7byvvYfyWdFI+/2UxMmwNyJb0NPkZPQE2hew3RurV7l7zURgOHAd/1I1ZdPpe3GUsXNXAcN8TFKSIg==
   dependencies:
     bs-logger "0.x"
     fast-json-stable-stringify "2.x"
@@ -10084,11 +10166,16 @@ tslib@^1.8.1:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.0:
+tslib@^2.0.1, tslib@^2.0.3:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
 
+tslib@^2.1.0, tslib@^2.4.0:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
+  integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==
+
 tsutils@^3.21.0:
   version "3.21.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
@@ -10206,10 +10293,10 @@ typescript@^4.0, typescript@^4.5:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
   integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
-typescript@^5.4.3:
-  version "5.4.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
-  integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==
+typescript@^5.5.3:
+  version "5.5.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.3.tgz#e1b0a3c394190838a0b168e771b0ad56a0af0faa"
+  integrity sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==
 
 unbox-primitive@^1.0.2:
   version "1.0.2"
@@ -10415,7 +10502,7 @@ which-collection@^1.0.1:
     is-weakmap "^2.0.2"
     is-weakset "^2.0.3"
 
-which-typed-array@^1.1.14, which-typed-array@^1.1.15, which-typed-array@^1.1.9:
+which-typed-array@^1.1.13, which-typed-array@^1.1.14, which-typed-array@^1.1.15, which-typed-array@^1.1.9:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d"
   integrity sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==
@@ -10607,8 +10694,8 @@ yup@^0.32.11:
     toposort "^2.0.2"
 
 zustand@^4.3.8:
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.5.2.tgz#fddbe7cac1e71d45413b3682cdb47b48034c3848"
-  integrity sha512-2cN1tPkDVkwCy5ickKrI7vijSjPksFRfqS6237NzT0vqSsztTNnQdHw9mmN7uBdk3gceVXU0a+21jFzFzAc9+g==
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.5.4.tgz#63abdd81edfb190bc61e0bbae045cc4d52158a05"
+  integrity sha512-/BPMyLKJPtFEvVL0E9E9BTUM63MNyhPGlvxk1XjrfWTUlV+BR8jufjsovHzrtR6YNcBEcL7cMHovL1n9xHawEg==
   dependencies:
     use-sync-external-store "1.2.0"

From 9bf34bd5e48a86d7ee3038203b865022d75514e3 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Thu, 4 Jul 2024 20:30:15 -0700
Subject: [PATCH 198/438] Support Clickhouse insert without Kafka.

---
 src/lib/clickhouse.ts                            | 11 +++++++++--
 src/queries/analytics/eventData/saveEventData.ts |  8 +++++++-
 src/queries/analytics/events/saveEvent.ts        |  8 +++++++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index b6d0fc3f36..cd057cd70a 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -32,7 +32,7 @@ function getClient() {
   } = new URL(process.env.CLICKHOUSE_URL);
 
   const client = createClient({
-    host: `${protocol}//${hostname}:${port}`,
+    url: `${protocol}//${hostname}:${port}`,
     database: pathname.replace('/', ''),
     username: username,
     password,
@@ -136,7 +136,13 @@ async function rawQuery<T = unknown>(
     format: 'JSONEachRow',
   });
 
-  return resultSet.json();
+  return resultSet.json() as T;
+}
+
+async function insert(table: string, values: any[]) {
+  await connect();
+
+  return clickhouse.insert({ table, values, format: 'JSONEachRow' });
 }
 
 async function findUnique(data: any[]) {
@@ -172,4 +178,5 @@ export default {
   findUnique,
   findFirst,
   rawQuery,
+  insert,
 };
diff --git a/src/queries/analytics/eventData/saveEventData.ts b/src/queries/analytics/eventData/saveEventData.ts
index 0ed3c8b016..222e8b7326 100644
--- a/src/queries/analytics/eventData/saveEventData.ts
+++ b/src/queries/analytics/eventData/saveEventData.ts
@@ -3,6 +3,7 @@ import { DATA_TYPE } from 'lib/constants';
 import { uuid } from 'lib/crypto';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import { flattenJSON, getStringValue } from 'lib/data';
+import clickhouse from 'lib/clickhouse';
 import kafka from 'lib/kafka';
 import prisma from 'lib/prisma';
 import { DynamicData } from 'lib/types';
@@ -59,6 +60,7 @@ async function clickhouseQuery(data: {
 }) {
   const { websiteId, sessionId, eventId, urlPath, eventName, eventData, createdAt } = data;
 
+  const { insert } = clickhouse;
   const { getDateFormat, sendMessages } = kafka;
 
   const jsonKeys = flattenJSON(eventData);
@@ -79,7 +81,11 @@ async function clickhouseQuery(data: {
     };
   });
 
-  await sendMessages(messages, 'event_data');
+  if (kafka.enabled) {
+    await sendMessages(messages, 'event_data');
+  } else {
+    await insert('event_data', messages);
+  }
 
   return data;
 }
diff --git a/src/queries/analytics/events/saveEvent.ts b/src/queries/analytics/events/saveEvent.ts
index 25bcf9e7af..9a5787a38f 100644
--- a/src/queries/analytics/events/saveEvent.ts
+++ b/src/queries/analytics/events/saveEvent.ts
@@ -1,5 +1,6 @@
 import { EVENT_NAME_LENGTH, URL_LENGTH, EVENT_TYPE, PAGE_TITLE_LENGTH } from 'lib/constants';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import clickhouse from 'lib/clickhouse';
 import kafka from 'lib/kafka';
 import prisma from 'lib/prisma';
 import { uuid } from 'lib/crypto';
@@ -134,6 +135,7 @@ async function clickhouseQuery(data: {
     city,
     ...args
   } = data;
+  const { insert } = clickhouse;
   const { getDateFormat, sendMessage } = kafka;
   const eventId = uuid();
   const createdAt = getDateFormat(new Date());
@@ -164,7 +166,11 @@ async function clickhouseQuery(data: {
     created_at: createdAt,
   };
 
-  await sendMessage(message, 'event');
+  if (kafka.enabled) {
+    await sendMessage(message, 'event');
+  } else {
+    await insert('website_event', [message]);
+  }
 
   if (eventData) {
     await saveEventData({

From 26462cffbc697b23527415005639cc6a7e183afa Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 5 Jul 2024 02:04:51 -0700
Subject: [PATCH 199/438] Support clickhouse for save session data.

---
 src/queries/analytics/sessions/saveSessionData.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/queries/analytics/sessions/saveSessionData.ts b/src/queries/analytics/sessions/saveSessionData.ts
index 429c6e281b..6ab5d6ae1d 100644
--- a/src/queries/analytics/sessions/saveSessionData.ts
+++ b/src/queries/analytics/sessions/saveSessionData.ts
@@ -5,6 +5,7 @@ import prisma from 'lib/prisma';
 import { DynamicData } from 'lib/types';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import kafka from 'lib/kafka';
+import clickhouse from 'lib/clickhouse';
 
 export async function saveSessionData(data: {
   websiteId: string;
@@ -81,6 +82,7 @@ async function clickhouseQuery(data: {
 }) {
   const { websiteId, sessionId, sessionData, createdAt } = data;
 
+  const { insert } = clickhouse;
   const { getDateFormat, sendMessages } = kafka;
 
   const jsonKeys = flattenJSON(sessionData);
@@ -98,7 +100,11 @@ async function clickhouseQuery(data: {
     };
   });
 
-  await sendMessages(messages, 'session_data');
+  if (kafka.enabled) {
+    await sendMessages(messages, 'session_data');
+  } else {
+    await insert('event_data', messages);
+  }
 
   return data;
 }

From 72b3b6158ab3999767de351e30122ac56f2dd4cf Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 5 Jul 2024 02:29:12 -0700
Subject: [PATCH 200/438] Changed kafka method signature.

---
 src/lib/kafka.ts                                  | 4 ++--
 src/queries/analytics/eventData/saveEventData.ts  | 2 +-
 src/queries/analytics/events/saveEvent.ts         | 2 +-
 src/queries/analytics/sessions/saveSessionData.ts | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lib/kafka.ts b/src/lib/kafka.ts
index da38baa44f..76692afb4b 100644
--- a/src/lib/kafka.ts
+++ b/src/lib/kafka.ts
@@ -61,8 +61,8 @@ function getDateFormat(date: Date, format?: string): string {
 }
 
 async function sendMessage(
-  message: { [key: string]: string | number },
   topic: string,
+  message: { [key: string]: string | number },
 ): Promise<RecordMetadata[]> {
   await connect();
 
@@ -77,7 +77,7 @@ async function sendMessage(
   });
 }
 
-async function sendMessages(messages: { [key: string]: string | number }[], topic: string) {
+async function sendMessages(topic: string, messages: { [key: string]: string | number }[]) {
   await connect();
 
   await producer.send({
diff --git a/src/queries/analytics/eventData/saveEventData.ts b/src/queries/analytics/eventData/saveEventData.ts
index 222e8b7326..9c7218e97b 100644
--- a/src/queries/analytics/eventData/saveEventData.ts
+++ b/src/queries/analytics/eventData/saveEventData.ts
@@ -82,7 +82,7 @@ async function clickhouseQuery(data: {
   });
 
   if (kafka.enabled) {
-    await sendMessages(messages, 'event_data');
+    await sendMessages('event_data', messages);
   } else {
     await insert('event_data', messages);
   }
diff --git a/src/queries/analytics/events/saveEvent.ts b/src/queries/analytics/events/saveEvent.ts
index 9a5787a38f..cd41b7a318 100644
--- a/src/queries/analytics/events/saveEvent.ts
+++ b/src/queries/analytics/events/saveEvent.ts
@@ -167,7 +167,7 @@ async function clickhouseQuery(data: {
   };
 
   if (kafka.enabled) {
-    await sendMessage(message, 'event');
+    await sendMessage('event', message);
   } else {
     await insert('website_event', [message]);
   }
diff --git a/src/queries/analytics/sessions/saveSessionData.ts b/src/queries/analytics/sessions/saveSessionData.ts
index 6ab5d6ae1d..1f5c149454 100644
--- a/src/queries/analytics/sessions/saveSessionData.ts
+++ b/src/queries/analytics/sessions/saveSessionData.ts
@@ -101,9 +101,9 @@ async function clickhouseQuery(data: {
   });
 
   if (kafka.enabled) {
-    await sendMessages(messages, 'session_data');
+    await sendMessages('session_data', messages);
   } else {
-    await insert('event_data', messages);
+    await insert('session_data', messages);
   }
 
   return data;

From 082a751ffec85601cbc66d218d5ebf638f664edb Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 5 Jul 2024 02:52:36 -0700
Subject: [PATCH 201/438] Should allow non http referrers. Closes #2831

---
 src/pages/api/send.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/api/send.ts b/src/pages/api/send.ts
index 3431795edd..313184202d 100644
--- a/src/pages/api/send.ts
+++ b/src/pages/api/send.ts
@@ -121,7 +121,7 @@ export default async (req: NextApiRequestCollect, res: NextApiResponse) => {
         urlPath = '/';
       }
 
-      if (referrerPath?.startsWith('http')) {
+      if (/^[\w-]+:\/\/\w+/.test(referrerPath)) {
         const refUrl = new URL(referrer);
         referrerPath = refUrl.pathname;
         referrerQuery = refUrl.search.substring(1);

From db36c37d32038c52b066c80a22bb3c4cbca5c5cf Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Mon, 8 Jul 2024 01:45:54 -0700
Subject: [PATCH 202/438] Updated session and events queries. Added sessions
 page.

---
 .../websites/[websiteId]/WebsiteHeader.tsx    |  9 ++-
 .../EventDataMetricsBar.module.css            |  0
 .../EventDataMetricsBar.tsx                   |  0
 .../{event-data => events}/EventDataPage.tsx  |  0
 .../{event-data => events}/EventDataTable.tsx |  0
 .../EventDataValueTable.tsx                   |  0
 .../WebsiteEventData.module.css               |  0
 .../WebsiteEventData.tsx                      |  0
 .../{event-data => events}/page.tsx           |  0
 .../[websiteId]/realtime/RealtimeLog.tsx      |  5 +-
 .../sessions/SessionsDataTable.tsx            | 25 ++++++++
 .../[websiteId]/sessions/SessionsPage.tsx     | 14 +++++
 .../[websiteId]/sessions/SessionsTable.tsx    | 21 +++++++
 .../websites/[websiteId]/sessions/page.tsx    | 10 ++++
 src/app/api/scripts/telemetry/route.ts        | 28 +++++++++
 src/components/hooks/index.ts                 |  1 +
 src/components/hooks/queries/useSessions.ts   | 20 +++++++
 src/lib/clickhouse.ts                         | 54 +++++++++++++++--
 src/lib/prisma.ts                             | 43 +++++++++++---
 src/pages/api/scripts/telemetry.ts            | 24 --------
 .../api/websites/[websiteId]/sessions.ts      | 42 ++++++++++++++
 .../analytics/events/getEventMetrics.ts       |  8 +--
 src/queries/analytics/events/getEvents.ts     | 58 ++++++++-----------
 src/queries/analytics/getRealtimeData.ts      | 12 ++--
 src/queries/analytics/getValues.ts            |  4 +-
 src/queries/analytics/getWebsiteStats.ts      |  4 +-
 .../analytics/pageviews/getPageviewMetrics.ts | 42 ++++++++------
 .../analytics/pageviews/getPageviewStats.ts   | 10 ++--
 src/queries/analytics/reports/getInsights.ts  |  4 +-
 src/queries/analytics/reports/getRetention.ts | 17 +++---
 src/queries/analytics/reports/getRevenue.ts   | 10 ++--
 .../analytics/sessions/getSessionStats.ts     | 10 ++--
 src/queries/analytics/sessions/getSessions.ts | 53 +++++++----------
 src/queries/index.ts                          | 10 ++--
 src/queries/{admin => prisma}/report.ts       |  6 +-
 src/queries/{admin => prisma}/team.ts         |  0
 src/queries/{admin => prisma}/teamUser.ts     |  0
 src/queries/{admin => prisma}/user.ts         |  6 +-
 src/queries/{admin => prisma}/website.ts      |  6 +-
 39 files changed, 376 insertions(+), 180 deletions(-)
 rename src/app/(main)/websites/[websiteId]/{event-data => events}/EventDataMetricsBar.module.css (100%)
 rename src/app/(main)/websites/[websiteId]/{event-data => events}/EventDataMetricsBar.tsx (100%)
 rename src/app/(main)/websites/[websiteId]/{event-data => events}/EventDataPage.tsx (100%)
 rename src/app/(main)/websites/[websiteId]/{event-data => events}/EventDataTable.tsx (100%)
 rename src/app/(main)/websites/[websiteId]/{event-data => events}/EventDataValueTable.tsx (100%)
 rename src/app/(main)/websites/[websiteId]/{event-data => events}/WebsiteEventData.module.css (100%)
 rename src/app/(main)/websites/[websiteId]/{event-data => events}/WebsiteEventData.tsx (100%)
 rename src/app/(main)/websites/[websiteId]/{event-data => events}/page.tsx (100%)
 create mode 100644 src/app/(main)/websites/[websiteId]/sessions/SessionsDataTable.tsx
 create mode 100644 src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx
 create mode 100644 src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
 create mode 100644 src/app/(main)/websites/[websiteId]/sessions/page.tsx
 create mode 100644 src/app/api/scripts/telemetry/route.ts
 create mode 100644 src/components/hooks/queries/useSessions.ts
 delete mode 100644 src/pages/api/scripts/telemetry.ts
 create mode 100644 src/pages/api/websites/[websiteId]/sessions.ts
 rename src/queries/{admin => prisma}/report.ts (93%)
 rename src/queries/{admin => prisma}/team.ts (100%)
 rename src/queries/{admin => prisma}/teamUser.ts (100%)
 rename src/queries/{admin => prisma}/user.ts (98%)
 rename src/queries/{admin => prisma}/website.ts (97%)

diff --git a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
index 0cbaeb44d7..bbd6460aa0 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
@@ -46,9 +46,14 @@ export function WebsiteHeader({
       path: '/reports',
     },
     {
-      label: formatMessage(labels.eventData),
+      label: formatMessage(labels.sessions),
+      icon: <Icons.User />,
+      path: '/sessions',
+    },
+    {
+      label: formatMessage(labels.events),
       icon: <Icons.Nodes />,
-      path: '/event-data',
+      path: '/events',
     },
   ];
 
diff --git a/src/app/(main)/websites/[websiteId]/event-data/EventDataMetricsBar.module.css b/src/app/(main)/websites/[websiteId]/events/EventDataMetricsBar.module.css
similarity index 100%
rename from src/app/(main)/websites/[websiteId]/event-data/EventDataMetricsBar.module.css
rename to src/app/(main)/websites/[websiteId]/events/EventDataMetricsBar.module.css
diff --git a/src/app/(main)/websites/[websiteId]/event-data/EventDataMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/events/EventDataMetricsBar.tsx
similarity index 100%
rename from src/app/(main)/websites/[websiteId]/event-data/EventDataMetricsBar.tsx
rename to src/app/(main)/websites/[websiteId]/events/EventDataMetricsBar.tsx
diff --git a/src/app/(main)/websites/[websiteId]/event-data/EventDataPage.tsx b/src/app/(main)/websites/[websiteId]/events/EventDataPage.tsx
similarity index 100%
rename from src/app/(main)/websites/[websiteId]/event-data/EventDataPage.tsx
rename to src/app/(main)/websites/[websiteId]/events/EventDataPage.tsx
diff --git a/src/app/(main)/websites/[websiteId]/event-data/EventDataTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventDataTable.tsx
similarity index 100%
rename from src/app/(main)/websites/[websiteId]/event-data/EventDataTable.tsx
rename to src/app/(main)/websites/[websiteId]/events/EventDataTable.tsx
diff --git a/src/app/(main)/websites/[websiteId]/event-data/EventDataValueTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventDataValueTable.tsx
similarity index 100%
rename from src/app/(main)/websites/[websiteId]/event-data/EventDataValueTable.tsx
rename to src/app/(main)/websites/[websiteId]/events/EventDataValueTable.tsx
diff --git a/src/app/(main)/websites/[websiteId]/event-data/WebsiteEventData.module.css b/src/app/(main)/websites/[websiteId]/events/WebsiteEventData.module.css
similarity index 100%
rename from src/app/(main)/websites/[websiteId]/event-data/WebsiteEventData.module.css
rename to src/app/(main)/websites/[websiteId]/events/WebsiteEventData.module.css
diff --git a/src/app/(main)/websites/[websiteId]/event-data/WebsiteEventData.tsx b/src/app/(main)/websites/[websiteId]/events/WebsiteEventData.tsx
similarity index 100%
rename from src/app/(main)/websites/[websiteId]/event-data/WebsiteEventData.tsx
rename to src/app/(main)/websites/[websiteId]/events/WebsiteEventData.tsx
diff --git a/src/app/(main)/websites/[websiteId]/event-data/page.tsx b/src/app/(main)/websites/[websiteId]/events/page.tsx
similarity index 100%
rename from src/app/(main)/websites/[websiteId]/event-data/page.tsx
rename to src/app/(main)/websites/[websiteId]/events/page.tsx
diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
index cbdeb1ac43..700e83aeef 100644
--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
@@ -144,7 +144,10 @@ export function RealtimeLog({ data }: { data: RealtimeData }) {
     const { events, visitors } = data;
 
     let logs = [
-      ...events.map(e => ({ __type: e.eventName ? TYPE_EVENT : TYPE_PAGEVIEW, ...e })),
+      ...events.map(e => ({
+        __type: e.eventName ? TYPE_EVENT : TYPE_PAGEVIEW,
+        ...e,
+      })),
       ...visitors.map(v => ({ __type: TYPE_SESSION, ...v })),
     ].sort(thenby.firstBy('timestamp', -1));
 
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsDataTable.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsDataTable.tsx
new file mode 100644
index 0000000000..9e9f97e9ef
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsDataTable.tsx
@@ -0,0 +1,25 @@
+import { useSessions } from 'components/hooks';
+import SessionsTable from './SessionsTable';
+import DataTable from 'components/common/DataTable';
+import { ReactNode } from 'react';
+
+export default function SessionsDataTable({
+  websiteId,
+  children,
+}: {
+  websiteId?: string;
+  teamId?: string;
+  children?: ReactNode;
+}) {
+  const queryResult = useSessions(websiteId);
+
+  if (queryResult?.result?.data?.length === 0) {
+    return children;
+  }
+
+  return (
+    <DataTable queryResult={queryResult} allowSearch={false}>
+      {({ data }) => <SessionsTable data={data} showDomain={!websiteId} />}
+    </DataTable>
+  );
+}
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx
new file mode 100644
index 0000000000..e95145a7da
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx
@@ -0,0 +1,14 @@
+'use client';
+import WebsiteHeader from '../WebsiteHeader';
+import SessionsDataTable from './SessionsDataTable';
+
+export function SessionsPage({ websiteId }) {
+  return (
+    <>
+      <WebsiteHeader websiteId={websiteId} />
+      <SessionsDataTable websiteId={websiteId} />
+    </>
+  );
+}
+
+export default SessionsPage;
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
new file mode 100644
index 0000000000..41c0fef353
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
@@ -0,0 +1,21 @@
+import { GridColumn, GridTable, useBreakpoint } from 'react-basics';
+import { useMessages } from 'components/hooks';
+
+export function SessionsTable({ data = [] }: { data: any[]; showDomain?: boolean }) {
+  const { formatMessage, labels } = useMessages();
+  const breakpoint = useBreakpoint();
+
+  return (
+    <GridTable data={data} cardMode={['xs', 'sm', 'md'].includes(breakpoint)}>
+      <GridColumn name="id" label="ID" />
+      <GridColumn name="country" label={formatMessage(labels.country)} />
+      <GridColumn name="city" label={formatMessage(labels.city)} />
+      <GridColumn name="browser" label={formatMessage(labels.browser)} />
+      <GridColumn name="os" label={formatMessage(labels.os)} />
+      <GridColumn name="device" label={formatMessage(labels.device)} />
+      <GridColumn name="createdAt" label={formatMessage(labels.created)} />
+    </GridTable>
+  );
+}
+
+export default SessionsTable;
diff --git a/src/app/(main)/websites/[websiteId]/sessions/page.tsx b/src/app/(main)/websites/[websiteId]/sessions/page.tsx
new file mode 100644
index 0000000000..771f682ddc
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/sessions/page.tsx
@@ -0,0 +1,10 @@
+import SessionsPage from './SessionsPage';
+import { Metadata } from 'next';
+
+export default function ({ params: { websiteId } }) {
+  return <SessionsPage websiteId={websiteId} />;
+}
+
+export const metadata: Metadata = {
+  title: 'Sessions',
+};
diff --git a/src/app/api/scripts/telemetry/route.ts b/src/app/api/scripts/telemetry/route.ts
new file mode 100644
index 0000000000..ecd83fcb1d
--- /dev/null
+++ b/src/app/api/scripts/telemetry/route.ts
@@ -0,0 +1,28 @@
+import { CURRENT_VERSION, TELEMETRY_PIXEL } from 'lib/constants';
+
+export async function GET() {
+  if (
+    process.env.NODE_ENV !== 'production' &&
+    process.env.DISABLE_TELEMETRY &&
+    process.env.PRIVATE_MODE
+  ) {
+    const script = `
+    (()=>{const i=document.createElement('img');
+      i.setAttribute('src','${TELEMETRY_PIXEL}?v=${CURRENT_VERSION}');
+      i.setAttribute('style','width:0;height:0;position:absolute;pointer-events:none;');
+      document.body.appendChild(i);})();
+  `;
+
+    return new Response(script.replace(/\s\s+/g, ''), {
+      headers: {
+        'content-type': 'text/javascript',
+      },
+    });
+  }
+
+  return new Response('/* telemetry disabled */', {
+    headers: {
+      'content-type': 'text/javascript',
+    },
+  });
+}
diff --git a/src/components/hooks/index.ts b/src/components/hooks/index.ts
index df4fbd88fa..86abdd84c6 100644
--- a/src/components/hooks/index.ts
+++ b/src/components/hooks/index.ts
@@ -5,6 +5,7 @@ export * from './queries/useLogin';
 export * from './queries/useRealtime';
 export * from './queries/useReport';
 export * from './queries/useReports';
+export * from './queries/useSessions';
 export * from './queries/useShareToken';
 export * from './queries/useTeam';
 export * from './queries/useTeams';
diff --git a/src/components/hooks/queries/useSessions.ts b/src/components/hooks/queries/useSessions.ts
new file mode 100644
index 0000000000..c54c3acd1b
--- /dev/null
+++ b/src/components/hooks/queries/useSessions.ts
@@ -0,0 +1,20 @@
+import { useApi } from './useApi';
+import { useFilterQuery } from './useFilterQuery';
+import useModified from '../useModified';
+
+export function useSessions(websiteId: string, params?: { [key: string]: string | number }) {
+  const { get } = useApi();
+  const { modified } = useModified(`websites`);
+
+  return useFilterQuery({
+    queryKey: ['sessions', { websiteId, modified, ...params }],
+    queryFn: (data: any) => {
+      return get(`/websites/${websiteId}/sessions`, {
+        ...data,
+        ...params,
+      });
+    },
+  });
+}
+
+export default useSessions;
diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index cd057cd70a..e716d6493f 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -2,8 +2,8 @@ import { ClickHouseClient, createClient } from '@clickhouse/client';
 import dateFormat from 'dateformat';
 import debug from 'debug';
 import { CLICKHOUSE } from 'lib/db';
-import { QueryFilters, QueryOptions } from './types';
-import { OPERATORS } from './constants';
+import { PageParams, QueryFilters, QueryOptions } from './types';
+import { DEFAULT_PAGE_SIZE, OPERATORS } from './constants';
 import { fetchWebsite } from './load';
 import { maxDate } from './date';
 import { filtersToArray } from './params';
@@ -47,11 +47,11 @@ function getClient() {
   return client;
 }
 
-function getDateStringQuery(data: any, unit: string | number) {
+function getDateStringSQL(data: any, unit: string | number) {
   return `formatDateTime(${data}, '${CLICKHOUSE_DATE_FORMATS[unit]}')`;
 }
 
-function getDateQuery(field: string, unit: string, timezone?: string) {
+function getDateSQL(field: string, unit: string, timezone?: string) {
   if (timezone) {
     return `date_trunc('${unit}', ${field}, '${timezone}')`;
   }
@@ -95,6 +95,20 @@ function getFilterQuery(filters: QueryFilters = {}, options: QueryOptions = {})
   return query.join('\n');
 }
 
+function getDateQuery(filters: QueryFilters = {}) {
+  const { startDate, endDate } = filters;
+
+  if (startDate) {
+    if (endDate) {
+      return `and created_at between {startDate:DateTime64} and {endDate:DateTime64}`;
+    } else {
+      return `and created_at >= {startDate:DateTime64}`;
+    }
+  }
+
+  return '';
+}
+
 function getFilterParams(filters: QueryFilters = {}) {
   return filtersToArray(filters).reduce((obj, { name, value }) => {
     if (name && value !== undefined) {
@@ -110,6 +124,7 @@ async function parseFilters(websiteId: string, filters: QueryFilters = {}, optio
 
   return {
     filterQuery: getFilterQuery(filters, options),
+    dateQuery: getDateQuery(filters),
     params: {
       ...getFilterParams(filters),
       websiteId,
@@ -119,6 +134,32 @@ async function parseFilters(websiteId: string, filters: QueryFilters = {}, optio
   };
 }
 
+async function pagedQuery(
+  query: string,
+  queryParams: { [key: string]: any },
+  pageParams: PageParams = {},
+) {
+  const { page = 1, pageSize, orderBy, sortDescending = false } = pageParams;
+  const size = +pageSize || DEFAULT_PAGE_SIZE;
+  const offset = +size * (page - 1);
+  const direction = sortDescending ? 'desc' : 'asc';
+
+  const statements = [
+    orderBy && `order by ${orderBy} ${direction}`,
+    +size > 0 && `limit ${+size} offset ${offset}`,
+  ]
+    .filter(n => n)
+    .join('\n');
+
+  const count = await rawQuery(`select count(*) as num from (${query}) t`, queryParams).then(
+    res => res[0].num,
+  );
+
+  const data = await rawQuery(`${query}${statements}`, queryParams);
+
+  return { data, count, page: +page, pageSize: size, orderBy };
+}
+
 async function rawQuery<T = unknown>(
   query: string,
   params: Record<string, unknown> = {},
@@ -170,11 +211,12 @@ export default {
   client: clickhouse,
   log,
   connect,
-  getDateStringQuery,
-  getDateQuery,
+  getDateStringSQL,
+  getDateSQL,
   getDateFormat,
   getFilterQuery,
   parseFilters,
+  pagedQuery,
   findUnique,
   findFirst,
   rawQuery,
diff --git a/src/lib/prisma.ts b/src/lib/prisma.ts
index 6250f2e546..28835414fc 100644
--- a/src/lib/prisma.ts
+++ b/src/lib/prisma.ts
@@ -60,7 +60,7 @@ function getCastColumnQuery(field: string, type: string): string {
   }
 }
 
-function getDateQuery(field: string, unit: string, timezone?: string): string {
+function getDateSQL(field: string, unit: string, timezone?: string): string {
   const db = getDatabaseType();
 
   if (db === POSTGRESQL) {
@@ -81,7 +81,19 @@ function getDateQuery(field: string, unit: string, timezone?: string): string {
   }
 }
 
-function getTimestampDiffQuery(field1: string, field2: string): string {
+export function getTimestampSQL(field: string) {
+  const db = getDatabaseType();
+
+  if (db === POSTGRESQL) {
+    return `floor(extract(epoch from ${field}))`;
+  }
+
+  if (db === MYSQL) {
+    return `UNIX_TIMESTAMP(${field})`;
+  }
+}
+
+function getTimestampDiffSQL(field1: string, field2: string): string {
   const db = getDatabaseType();
 
   if (db === POSTGRESQL) {
@@ -93,7 +105,7 @@ function getTimestampDiffQuery(field1: string, field2: string): string {
   }
 }
 
-function getSearchQuery(column: string): string {
+function getSearchSQL(column: string): string {
   const db = getDatabaseType();
   const like = db === POSTGRESQL ? 'ilike' : 'like';
 
@@ -137,6 +149,20 @@ function getFilterQuery(filters: QueryFilters = {}, options: QueryOptions = {}):
   return query.join('\n');
 }
 
+function getDateQuery(filters: QueryFilters = {}) {
+  const { startDate, endDate } = filters;
+
+  if (startDate) {
+    if (endDate) {
+      return `and website_event.created_at between {{startDate}} and {{endDate}}`;
+    } else {
+      return `and website_event.created_at >= {{startDate}}`;
+    }
+  }
+
+  return '';
+}
+
 function getFilterParams(filters: QueryFilters = {}) {
   return filtersToArray(filters).reduce((obj, { name, operator, value }) => {
     obj[name] = [OPERATORS.contains, OPERATORS.doesNotContain].includes(operator)
@@ -161,6 +187,7 @@ async function parseFilters(
         ? `inner join session on website_event.session_id = session.session_id`
         : '',
     filterQuery: getFilterQuery(filters, options),
+    dateQuery: getDateQuery(filters),
     params: {
       ...getFilterParams(filters),
       websiteId,
@@ -191,8 +218,8 @@ async function rawQuery(sql: string, data: object): Promise<any> {
   return prisma.rawQuery(query, params);
 }
 
-async function pagedQuery<T>(model: string, criteria: T, filters: PageParams) {
-  const { page = 1, pageSize, orderBy, sortDescending = false } = filters || {};
+async function pagedQuery<T>(model: string, criteria: T, pageParams: PageParams) {
+  const { page = 1, pageSize, orderBy, sortDescending = false } = pageParams || {};
   const size = +pageSize || DEFAULT_PAGE_SIZE;
 
   const data = await prisma.client[model].findMany({
@@ -256,11 +283,11 @@ export default {
   getAddIntervalQuery,
   getCastColumnQuery,
   getDayDiffQuery,
-  getDateQuery,
+  getDateSQL,
   getFilterQuery,
   getSearchParameters,
-  getTimestampDiffQuery,
-  getSearchQuery,
+  getTimestampDiffSQL,
+  getSearchSQL,
   getQueryMode,
   pagedQuery,
   parseFilters,
diff --git a/src/pages/api/scripts/telemetry.ts b/src/pages/api/scripts/telemetry.ts
deleted file mode 100644
index a8a8872e53..0000000000
--- a/src/pages/api/scripts/telemetry.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { ok } from 'next-basics';
-import { CURRENT_VERSION, TELEMETRY_PIXEL } from 'lib/constants';
-import { NextApiRequest, NextApiResponse } from 'next';
-
-export default function handler(req: NextApiRequest, res: NextApiResponse) {
-  if (process.env.NODE_ENV === 'production') {
-    res.setHeader('content-type', 'text/javascript');
-
-    if (process.env.DISABLE_TELEMETRY || process.env.PRIVATE_MODE) {
-      return res.send('/* telemetry disabled */');
-    }
-
-    const script = `
-    (()=>{const i=document.createElement('img');
-      i.setAttribute('src','${TELEMETRY_PIXEL}?v=${CURRENT_VERSION}');
-      i.setAttribute('style','width:0;height:0;position:absolute;pointer-events:none;');
-      document.body.appendChild(i);})();
-  `;
-
-    return res.send(script.replace(/\s\s+/g, ''));
-  }
-
-  return ok(res);
-}
diff --git a/src/pages/api/websites/[websiteId]/sessions.ts b/src/pages/api/websites/[websiteId]/sessions.ts
new file mode 100644
index 0000000000..21cacb1c2b
--- /dev/null
+++ b/src/pages/api/websites/[websiteId]/sessions.ts
@@ -0,0 +1,42 @@
+import * as yup from 'yup';
+import { canViewWebsite } from 'lib/auth';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody, PageParams } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { pageInfo } from 'lib/schema';
+import { getSessions } from 'queries';
+
+export interface ReportsRequestQuery extends PageParams {
+  websiteId: string;
+}
+
+const schema = {
+  GET: yup.object().shape({
+    websiteId: yup.string().uuid().required(),
+    ...pageInfo,
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<ReportsRequestQuery, any>,
+  res: NextApiResponse,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  const { websiteId } = req.query;
+
+  if (req.method === 'GET') {
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const data = await getSessions(websiteId, {}, req.query);
+
+    return ok(res, data);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/src/queries/analytics/events/getEventMetrics.ts b/src/queries/analytics/events/getEventMetrics.ts
index 32cccd3e85..8efbf7694f 100644
--- a/src/queries/analytics/events/getEventMetrics.ts
+++ b/src/queries/analytics/events/getEventMetrics.ts
@@ -15,7 +15,7 @@ export async function getEventMetrics(
 
 async function relationalQuery(websiteId: string, filters: QueryFilters) {
   const { timezone = 'utc', unit = 'day' } = filters;
-  const { rawQuery, getDateQuery, parseFilters } = prisma;
+  const { rawQuery, getDateSQL, parseFilters } = prisma;
   const { filterQuery, joinSession, params } = await parseFilters(websiteId, {
     ...filters,
     eventType: EVENT_TYPE.customEvent,
@@ -25,7 +25,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     `
     select
       event_name x,
-      ${getDateQuery('website_event.created_at', unit, timezone)} t,
+      ${getDateSQL('website_event.created_at', unit, timezone)} t,
       count(*) y
     from website_event
     ${joinSession}
@@ -45,7 +45,7 @@ async function clickhouseQuery(
   filters: QueryFilters,
 ): Promise<{ x: string; t: string; y: number }[]> {
   const { timezone = 'UTC', unit = 'day' } = filters;
-  const { rawQuery, getDateQuery, parseFilters } = clickhouse;
+  const { rawQuery, getDateSQL, parseFilters } = clickhouse;
   const { filterQuery, params } = await parseFilters(websiteId, {
     ...filters,
     eventType: EVENT_TYPE.customEvent,
@@ -55,7 +55,7 @@ async function clickhouseQuery(
     `
     select
       event_name x,
-      ${getDateQuery('created_at', unit, timezone)} t,
+      ${getDateSQL('created_at', unit, timezone)} t,
       count(*) y
     from website_event
     where website_id = {websiteId:UUID}
diff --git a/src/queries/analytics/events/getEvents.ts b/src/queries/analytics/events/getEvents.ts
index c333242e35..a00f684851 100644
--- a/src/queries/analytics/events/getEvents.ts
+++ b/src/queries/analytics/events/getEvents.ts
@@ -1,45 +1,33 @@
 import clickhouse from 'lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import prisma from 'lib/prisma';
-import { QueryFilters } from 'lib/types';
+import { PageParams, QueryFilters } from 'lib/types';
 
-export function getEvents(...args: [websiteId: string, filters: QueryFilters]) {
+export function getEvents(
+  ...args: [websiteId: string, filters: QueryFilters, pageParams?: PageParams]
+) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
   });
 }
 
-function relationalQuery(websiteId: string, filters: QueryFilters) {
-  const { startDate } = filters;
+async function relationalQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
+  const { pagedQuery } = prisma;
 
-  return prisma.client.websiteEvent
-    .findMany({
-      where: {
-        websiteId,
-        createdAt: {
-          gte: startDate,
-        },
-      },
-      orderBy: {
-        createdAt: 'desc',
-      },
-    })
-    .then(a => {
-      return Object.values(a).map(a => {
-        return {
-          ...a,
-          timestamp: new Date(a.createdAt).getTime() / 1000,
-        };
-      });
-    });
+  const where = {
+    ...filters,
+    id: websiteId,
+  };
+
+  return pagedQuery('website_event', { where }, pageParams);
 }
 
-function clickhouseQuery(websiteId: string, filters: QueryFilters) {
-  const { rawQuery } = clickhouse;
-  const { startDate } = filters;
+async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
+  const { pagedQuery, parseFilters } = clickhouse;
+  const { params, dateQuery, filterQuery } = await parseFilters(websiteId, filters);
 
-  return rawQuery(
+  return pagedQuery(
     `
     select
       event_id as id,
@@ -48,16 +36,20 @@ function clickhouseQuery(websiteId: string, filters: QueryFilters) {
       created_at as createdAt,
       toUnixTimestamp(created_at) as timestamp,
       url_path as urlPath,
+      url_query as urlQuery,
+      referrer_path as referrerPath,
+      referrer_query as referrerQuery,
       referrer_domain as referrerDomain,
+      page_title as pageTitle,
+      event_type as eventType,
       event_name as eventName
     from website_event
     where website_id = {websiteId:UUID}
-      and created_at >= {startDate:DateTime64}
+    ${dateQuery}
+    ${filterQuery}
     order by created_at desc
     `,
-    {
-      websiteId,
-      startDate,
-    },
+    params,
+    pageParams,
   );
 }
diff --git a/src/queries/analytics/getRealtimeData.ts b/src/queries/analytics/getRealtimeData.ts
index b42fbc50af..afc7ff8fa9 100644
--- a/src/queries/analytics/getRealtimeData.ts
+++ b/src/queries/analytics/getRealtimeData.ts
@@ -19,15 +19,15 @@ export async function getRealtimeData(
   const { startDate, timezone } = criteria;
   const filters = { startDate, endDate: new Date(), unit: 'minute', timezone };
   const [events, sessions, pageviews, sessionviews] = await Promise.all([
-    getEvents(websiteId, { startDate }),
-    getSessions(websiteId, { startDate }),
+    getEvents(websiteId, { startDate }, { pageSize: 10000 }),
+    getSessions(websiteId, { startDate }, { pageSize: 10000 }),
     getPageviewStats(websiteId, filters),
     getSessionStats(websiteId, filters),
   ]);
 
   const uniques = new Set();
 
-  const sessionStats = sessions.reduce(
+  const sessionStats = sessions.data.reduce(
     (obj: { visitors: any; countries: any }, session: { id: any; country: any }) => {
       const { countries, visitors } = obj;
       const { id, country } = session;
@@ -49,7 +49,7 @@ export async function getRealtimeData(
     },
   );
 
-  const eventStats = events.reduce(
+  const eventStats = events.data.reduce(
     (
       obj: { urls: any; referrers: any; events: any },
       event: { urlPath: any; referrerDomain: any },
@@ -81,9 +81,9 @@ export async function getRealtimeData(
       visitors: sessionviews,
     },
     totals: {
-      views: events.filter(e => !e.eventName).length,
+      views: events.data.filter(e => !e.eventName).length,
       visitors: uniques.size,
-      events: events.filter(e => e.eventName).length,
+      events: events.data.filter(e => e.eventName).length,
       countries: Object.keys(sessionStats.countries).length,
     },
     timestamp: Date.now(),
diff --git a/src/queries/analytics/getValues.ts b/src/queries/analytics/getValues.ts
index 7cd349940f..8b1afb3f0b 100644
--- a/src/queries/analytics/getValues.ts
+++ b/src/queries/analytics/getValues.ts
@@ -18,11 +18,11 @@ async function relationalQuery(
   endDate: Date,
   search: string,
 ) {
-  const { rawQuery, getSearchQuery } = prisma;
+  const { rawQuery, getSearchSQL } = prisma;
   let searchQuery = '';
 
   if (search) {
-    searchQuery = getSearchQuery(column);
+    searchQuery = getSearchSQL(column);
   }
 
   return rawQuery(
diff --git a/src/queries/analytics/getWebsiteStats.ts b/src/queries/analytics/getWebsiteStats.ts
index 2f3c82e865..84ceaf1c10 100644
--- a/src/queries/analytics/getWebsiteStats.ts
+++ b/src/queries/analytics/getWebsiteStats.ts
@@ -21,7 +21,7 @@ async function relationalQuery(
 ): Promise<
   { pageviews: number; visitors: number; visits: number; bounces: number; totaltime: number }[]
 > {
-  const { getTimestampDiffQuery, parseFilters, rawQuery } = prisma;
+  const { getTimestampDiffSQL, parseFilters, rawQuery } = prisma;
   const { filterQuery, joinSession, params } = await parseFilters(websiteId, {
     ...filters,
     eventType: EVENT_TYPE.pageView,
@@ -34,7 +34,7 @@ async function relationalQuery(
       count(distinct t.session_id) as "visitors",
       count(distinct t.visit_id) as "visits",
       sum(case when t.c = 1 then 1 else 0 end) as "bounces",
-      sum(${getTimestampDiffQuery('t.min_time', 't.max_time')}) as "totaltime"
+      sum(${getTimestampDiffSQL('t.min_time', 't.max_time')}) as "totaltime"
     from (
       select
         website_event.session_id,
diff --git a/src/queries/analytics/pageviews/getPageviewMetrics.ts b/src/queries/analytics/pageviews/getPageviewMetrics.ts
index 67ccb04aab..b3ae633abd 100644
--- a/src/queries/analytics/pageviews/getPageviewMetrics.ts
+++ b/src/queries/analytics/pageviews/getPageviewMetrics.ts
@@ -42,15 +42,18 @@ async function relationalQuery(
     const aggregrate = type === 'entry' ? 'min' : 'max';
 
     entryExitQuery = `
-    JOIN (select visit_id,
-        ${aggregrate}(created_at) target_created_at
-    from website_event
-    where website_event.website_id = {{websiteId::uuid}}
-      and website_event.created_at between {{startDate}} and {{endDate}}
-      and event_type = {{eventType}}
-    group by visit_id) x
-    ON x.visit_id = website_event.visit_id
-        and x.target_created_at = website_event.created_at`;
+      join (
+        select visit_id,
+            ${aggregrate}(created_at) target_created_at
+        from website_event
+        where website_event.website_id = {{websiteId::uuid}}
+          and website_event.created_at between {{startDate}} and {{endDate}}
+          and event_type = {{eventType}}
+        group by visit_id
+      ) x
+      on x.visit_id = website_event.visit_id
+          and x.target_created_at = website_event.created_at
+    `;
   }
 
   return rawQuery(
@@ -97,15 +100,18 @@ async function clickhouseQuery(
     const aggregrate = type === 'entry' ? 'min' : 'max';
 
     entryExitQuery = `
-    JOIN (select visit_id,
-        ${aggregrate}(created_at) target_created_at
-    from website_event
-    where website_id = {websiteId:UUID}
-      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
-      and event_type = {eventType:UInt32}
-    group by visit_id) x
-    ON x.visit_id = website_event.visit_id
-        and x.target_created_at = website_event.created_at`;
+      join (
+        select visit_id,
+            ${aggregrate}(created_at) target_created_at
+        from website_event
+        where website_id = {websiteId:UUID}
+          and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+          and event_type = {eventType:UInt32}
+        group by visit_id
+      ) x
+      on x.visit_id = website_event.visit_id
+          and x.target_created_at = website_event.created_at
+    `;
   }
 
   return rawQuery(
diff --git a/src/queries/analytics/pageviews/getPageviewStats.ts b/src/queries/analytics/pageviews/getPageviewStats.ts
index a37a15662f..65bc8625fb 100644
--- a/src/queries/analytics/pageviews/getPageviewStats.ts
+++ b/src/queries/analytics/pageviews/getPageviewStats.ts
@@ -13,7 +13,7 @@ export async function getPageviewStats(...args: [websiteId: string, filters: Que
 
 async function relationalQuery(websiteId: string, filters: QueryFilters) {
   const { timezone = 'utc', unit = 'day' } = filters;
-  const { getDateQuery, parseFilters, rawQuery } = prisma;
+  const { getDateSQL, parseFilters, rawQuery } = prisma;
   const { filterQuery, joinSession, params } = await parseFilters(websiteId, {
     ...filters,
     eventType: EVENT_TYPE.pageView,
@@ -22,7 +22,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
   return rawQuery(
     `
     select
-      ${getDateQuery('website_event.created_at', unit, timezone)} x,
+      ${getDateSQL('website_event.created_at', unit, timezone)} x,
       count(*) y
     from website_event
       ${joinSession}
@@ -41,7 +41,7 @@ async function clickhouseQuery(
   filters: QueryFilters,
 ): Promise<{ x: string; y: number }[]> {
   const { timezone = 'UTC', unit = 'day' } = filters;
-  const { parseFilters, rawQuery, getDateStringQuery, getDateQuery } = clickhouse;
+  const { parseFilters, rawQuery, getDateStringSQL, getDateSQL } = clickhouse;
   const { filterQuery, params } = await parseFilters(websiteId, {
     ...filters,
     eventType: EVENT_TYPE.pageView,
@@ -50,11 +50,11 @@ async function clickhouseQuery(
   return rawQuery(
     `
     select
-      ${getDateStringQuery('g.t', unit)} as x, 
+      ${getDateStringSQL('g.t', unit)} as x, 
       g.y as y
     from (
       select 
-        ${getDateQuery('created_at', unit, timezone)} as t,
+        ${getDateSQL('created_at', unit, timezone)} as t,
         count(*) as y
       from website_event
       where website_id = {websiteId:UUID}
diff --git a/src/queries/analytics/reports/getInsights.ts b/src/queries/analytics/reports/getInsights.ts
index c1a4f1f156..8e6e3289bd 100644
--- a/src/queries/analytics/reports/getInsights.ts
+++ b/src/queries/analytics/reports/getInsights.ts
@@ -23,7 +23,7 @@ async function relationalQuery(
     y: number;
   }[]
 > {
-  const { getTimestampDiffQuery, parseFilters, rawQuery } = prisma;
+  const { getTimestampDiffSQL, parseFilters, rawQuery } = prisma;
   const { filterQuery, joinSession, params } = await parseFilters(
     websiteId,
     {
@@ -42,7 +42,7 @@ async function relationalQuery(
       count(distinct t.session_id) as "visitors",
       count(distinct t.visit_id) as "visits",
       sum(case when t.c = 1 then 1 else 0 end) as "bounces",
-      sum(${getTimestampDiffQuery('t.min_time', 't.max_time')}) as "totaltime",
+      sum(${getTimestampDiffSQL('t.min_time', 't.max_time')}) as "totaltime",
       ${parseFieldsByName(fields)}
     from (
       select
diff --git a/src/queries/analytics/reports/getRetention.ts b/src/queries/analytics/reports/getRetention.ts
index de495cc48f..24aa2e3a81 100644
--- a/src/queries/analytics/reports/getRetention.ts
+++ b/src/queries/analytics/reports/getRetention.ts
@@ -35,14 +35,14 @@ async function relationalQuery(
   }[]
 > {
   const { startDate, endDate, timezone = 'UTC' } = filters;
-  const { getDateQuery, getDayDiffQuery, getCastColumnQuery, rawQuery } = prisma;
+  const { getDateSQL, getDayDiffQuery, getCastColumnQuery, rawQuery } = prisma;
   const unit = 'day';
 
   return rawQuery(
     `
     WITH cohort_items AS (
       select session_id,
-        ${getDateQuery('created_at', unit, timezone)} as cohort_date  
+        ${getDateSQL('created_at', unit, timezone)} as cohort_date  
       from session 
       where website_id = {{websiteId::uuid}}
         and created_at between {{startDate}} and {{endDate}}
@@ -50,10 +50,7 @@ async function relationalQuery(
     user_activities AS (
       select distinct
         w.session_id,
-        ${getDayDiffQuery(
-          getDateQuery('created_at', unit, timezone),
-          'c.cohort_date',
-        )} as day_number
+        ${getDayDiffQuery(getDateSQL('created_at', unit, timezone), 'c.cohort_date')} as day_number
       from website_event w
       join cohort_items c
       on w.session_id = c.session_id
@@ -115,14 +112,14 @@ async function clickhouseQuery(
   }[]
 > {
   const { startDate, endDate, timezone = 'UTC' } = filters;
-  const { getDateQuery, getDateStringQuery, rawQuery } = clickhouse;
+  const { getDateSQL, getDateStringSQL, rawQuery } = clickhouse;
   const unit = 'day';
 
   return rawQuery(
     `
     WITH cohort_items AS (
       select
-        min(${getDateQuery('created_at', unit, timezone)}) as cohort_date,
+        min(${getDateSQL('created_at', unit, timezone)}) as cohort_date,
         session_id
       from website_event
       where website_id = {websiteId:UUID}
@@ -132,7 +129,7 @@ async function clickhouseQuery(
     user_activities AS (
       select distinct
         w.session_id,
-        (${getDateQuery('created_at', unit, timezone)} - c.cohort_date) / 86400 as day_number
+        (${getDateSQL('created_at', unit, timezone)} - c.cohort_date) / 86400 as day_number
       from website_event w
       join cohort_items c
       on w.session_id = c.session_id
@@ -157,7 +154,7 @@ async function clickhouseQuery(
       group by 1, 2
     )
     select
-      ${getDateStringQuery('c.cohort_date', unit)} as date,
+      ${getDateStringSQL('c.cohort_date', unit)} as date,
       c.day_number as day,
       s.visitors as visitors,
       c.visitors returnVisitors,
diff --git a/src/queries/analytics/reports/getRevenue.ts b/src/queries/analytics/reports/getRevenue.ts
index 6b151bb72f..e4857a43e5 100644
--- a/src/queries/analytics/reports/getRevenue.ts
+++ b/src/queries/analytics/reports/getRevenue.ts
@@ -46,12 +46,12 @@ async function relationalQuery(
     timezone = 'UTC',
     unit = 'day',
   } = criteria;
-  const { getDateQuery, rawQuery } = prisma;
+  const { getDateSQL, rawQuery } = prisma;
 
   const chartRes = await rawQuery(
     `
     select
-      ${getDateQuery('website_event.created_at', unit, timezone)} time,
+      ${getDateSQL('website_event.created_at', unit, timezone)} time,
       sum(case when data_key = {{revenueProperty}} then number_value else 0 end) sum,
       avg(case when data_key = {{revenueProperty}} then number_value else 0 end) avg,
       count(case when data_key = {{revenueProperty}} then 1 else 0 end) count,
@@ -110,7 +110,7 @@ async function clickhouseQuery(
     timezone = 'UTC',
     unit = 'day',
   } = criteria;
-  const { getDateStringQuery, getDateQuery, rawQuery } = clickhouse;
+  const { getDateStringSQL, getDateSQL, rawQuery } = clickhouse;
 
   const chartRes = await rawQuery<{
     time: string;
@@ -121,14 +121,14 @@ async function clickhouseQuery(
   }>(
     `
     select
-      ${getDateStringQuery('g.time', unit)} as time, 
+      ${getDateStringSQL('g.time', unit)} as time, 
       g.sum as sum,
       g.avg as avg,
       g.count as count,
       g.uniqueCount as uniqueCount
     from (
       select 
-        ${getDateQuery('created_at', unit, timezone)} as time,
+        ${getDateSQL('created_at', unit, timezone)} as time,
         sumIf(number_value, data_key = {revenueProperty:String}) as sum,
         avgIf(number_value, data_key = {revenueProperty:String}) as avg,
         countIf(data_key = {revenueProperty:String}) as count,
diff --git a/src/queries/analytics/sessions/getSessionStats.ts b/src/queries/analytics/sessions/getSessionStats.ts
index e3af7ba6d1..54c46c3552 100644
--- a/src/queries/analytics/sessions/getSessionStats.ts
+++ b/src/queries/analytics/sessions/getSessionStats.ts
@@ -13,7 +13,7 @@ export async function getSessionStats(...args: [websiteId: string, filters: Quer
 
 async function relationalQuery(websiteId: string, filters: QueryFilters) {
   const { timezone = 'utc', unit = 'day' } = filters;
-  const { getDateQuery, parseFilters, rawQuery } = prisma;
+  const { getDateSQL, parseFilters, rawQuery } = prisma;
   const { filterQuery, joinSession, params } = await parseFilters(websiteId, {
     ...filters,
     eventType: EVENT_TYPE.pageView,
@@ -22,7 +22,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
   return rawQuery(
     `
     select
-      ${getDateQuery('website_event.created_at', unit, timezone)} x,
+      ${getDateSQL('website_event.created_at', unit, timezone)} x,
       count(distinct website_event.session_id) y
     from website_event
       ${joinSession}
@@ -41,7 +41,7 @@ async function clickhouseQuery(
   filters: QueryFilters,
 ): Promise<{ x: string; y: number }[]> {
   const { timezone = 'UTC', unit = 'day' } = filters;
-  const { parseFilters, rawQuery, getDateStringQuery, getDateQuery } = clickhouse;
+  const { parseFilters, rawQuery, getDateStringSQL, getDateSQL } = clickhouse;
   const { filterQuery, params } = await parseFilters(websiteId, {
     ...filters,
     eventType: EVENT_TYPE.pageView,
@@ -50,11 +50,11 @@ async function clickhouseQuery(
   return rawQuery(
     `
     select
-      ${getDateStringQuery('g.t', unit)} as x, 
+      ${getDateStringSQL('g.t', unit)} as x, 
       g.y as y
     from (
       select 
-        ${getDateQuery('created_at', unit, timezone)} as t,
+        ${getDateSQL('created_at', unit, timezone)} as t,
         count(distinct session_id) as y
       from website_event
       where website_id = {websiteId:UUID}
diff --git a/src/queries/analytics/sessions/getSessions.ts b/src/queries/analytics/sessions/getSessions.ts
index a11edd39bd..47471d986d 100644
--- a/src/queries/analytics/sessions/getSessions.ts
+++ b/src/queries/analytics/sessions/getSessions.ts
@@ -1,45 +1,33 @@
 import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
 import { runQuery, PRISMA, CLICKHOUSE } from 'lib/db';
-import { QueryFilters } from 'lib/types';
+import { PageParams, QueryFilters } from 'lib/types';
 
-export async function getSessions(...args: [websiteId: string, filters: QueryFilters]) {
+export async function getSessions(
+  ...args: [websiteId: string, filters?: QueryFilters, pageParams?: PageParams]
+) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
   });
 }
 
-async function relationalQuery(websiteId: string, filters: QueryFilters) {
-  const { startDate } = filters;
+async function relationalQuery(websiteId: string, filters: QueryFilters, pageParams: PageParams) {
+  const { pagedQuery } = prisma;
 
-  return prisma.client.session
-    .findMany({
-      where: {
-        websiteId,
-        createdAt: {
-          gte: startDate,
-        },
-      },
-      orderBy: {
-        createdAt: 'desc',
-      },
-    })
-    .then(a => {
-      return Object.values(a).map(a => {
-        return {
-          ...a,
-          timestamp: new Date(a.createdAt).getTime() / 1000,
-        };
-      });
-    });
+  const where = {
+    ...filters,
+    id: websiteId,
+  };
+
+  return pagedQuery('session', { where }, pageParams);
 }
 
-async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
-  const { rawQuery } = clickhouse;
-  const { startDate } = filters;
+async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
+  const { pagedQuery, parseFilters } = clickhouse;
+  const { params, dateQuery, filterQuery } = await parseFilters(websiteId, filters);
 
-  return rawQuery(
+  return pagedQuery(
     `
     select
       session_id as id,
@@ -58,12 +46,11 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
       city
     from website_event
     where website_id = {websiteId:UUID}
-    and created_at >= {startDate:DateTime64}
+    ${dateQuery}
+    ${filterQuery}
     order by created_at desc
     `,
-    {
-      websiteId,
-      startDate,
-    },
+    params,
+    pageParams,
   );
 }
diff --git a/src/queries/index.ts b/src/queries/index.ts
index 8cef080aa1..796adea6f4 100644
--- a/src/queries/index.ts
+++ b/src/queries/index.ts
@@ -1,8 +1,8 @@
-export * from './admin/report';
-export * from './admin/team';
-export * from './admin/teamUser';
-export * from './admin/user';
-export * from './admin/website';
+export * from 'queries/prisma/report';
+export * from 'queries/prisma/team';
+export * from 'queries/prisma/teamUser';
+export * from 'queries/prisma/user';
+export * from 'queries/prisma/website';
 export * from './analytics/events/getEventMetrics';
 export * from './analytics/events/getEventUsage';
 export * from './analytics/events/getEvents';
diff --git a/src/queries/admin/report.ts b/src/queries/prisma/report.ts
similarity index 93%
rename from src/queries/admin/report.ts
rename to src/queries/prisma/report.ts
index dc05a1d55b..a0e6364ce8 100644
--- a/src/queries/admin/report.ts
+++ b/src/queries/prisma/report.ts
@@ -17,9 +17,9 @@ export async function getReport(reportId: string): Promise<Report> {
 
 export async function getReports(
   criteria: ReportFindManyArgs,
-  filters: PageParams = {},
+  pageParams: PageParams = {},
 ): Promise<PageResult<Report[]>> {
-  const { query } = filters;
+  const { query } = pageParams;
 
   const where: Prisma.ReportWhereInput = {
     ...criteria.where,
@@ -45,7 +45,7 @@ export async function getReports(
     ]),
   };
 
-  return prisma.pagedQuery('report', { ...criteria, where }, filters);
+  return prisma.pagedQuery('report', { ...criteria, where }, pageParams);
 }
 
 export async function getUserReports(
diff --git a/src/queries/admin/team.ts b/src/queries/prisma/team.ts
similarity index 100%
rename from src/queries/admin/team.ts
rename to src/queries/prisma/team.ts
diff --git a/src/queries/admin/teamUser.ts b/src/queries/prisma/teamUser.ts
similarity index 100%
rename from src/queries/admin/teamUser.ts
rename to src/queries/prisma/teamUser.ts
diff --git a/src/queries/admin/user.ts b/src/queries/prisma/user.ts
similarity index 98%
rename from src/queries/admin/user.ts
rename to src/queries/prisma/user.ts
index 9e08511287..9b471787e4 100644
--- a/src/queries/admin/user.ts
+++ b/src/queries/prisma/user.ts
@@ -49,9 +49,9 @@ export async function getUserByUsername(username: string, options: GetUserOption
 
 export async function getUsers(
   criteria: UserFindManyArgs,
-  filters?: PageParams,
+  pageParams?: PageParams,
 ): Promise<PageResult<User[]>> {
-  const { query } = filters;
+  const { query } = pageParams;
 
   const where: Prisma.UserWhereInput = {
     ...criteria.where,
@@ -68,7 +68,7 @@ export async function getUsers(
     {
       orderBy: 'createdAt',
       sortDescending: true,
-      ...filters,
+      ...pageParams,
     },
   );
 }
diff --git a/src/queries/admin/website.ts b/src/queries/prisma/website.ts
similarity index 97%
rename from src/queries/admin/website.ts
rename to src/queries/prisma/website.ts
index eb07f77991..0814a137b6 100644
--- a/src/queries/admin/website.ts
+++ b/src/queries/prisma/website.ts
@@ -27,9 +27,9 @@ export async function getSharedWebsite(shareId: string) {
 
 export async function getWebsites(
   criteria: WebsiteFindManyArgs,
-  filters: PageParams,
+  pageParams: PageParams,
 ): Promise<PageResult<Website[]>> {
-  const { query } = filters;
+  const { query } = pageParams;
 
   const where: Prisma.WebsiteWhereInput = {
     ...criteria.where,
@@ -42,7 +42,7 @@ export async function getWebsites(
     deletedAt: null,
   };
 
-  return prisma.pagedQuery('website', { ...criteria, where }, filters);
+  return prisma.pagedQuery('website', { ...criteria, where }, pageParams);
 }
 
 export async function getAllWebsites(userId: string) {

From bfd5c5f150d2a44eb22e90d408e77763df085591 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 8 Jul 2024 11:18:30 -0700
Subject: [PATCH 203/438] update dashboard queries to use mv

---
 src/pages/api/websites/[websiteId]/metrics.ts  | 13 ++++++++++---
 .../analytics/pageviews/getPageviewMetrics.ts  | 18 +++++++++++++++---
 .../analytics/pageviews/getPageviewStats.ts    |  5 +++--
 .../analytics/sessions/getSessionMetrics.ts    | 15 +++++++++++++--
 .../analytics/sessions/getSessionStats.ts      |  5 +++--
 5 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/src/pages/api/websites/[websiteId]/metrics.ts b/src/pages/api/websites/[websiteId]/metrics.ts
index 3dac217b21..b37c38f743 100644
--- a/src/pages/api/websites/[websiteId]/metrics.ts
+++ b/src/pages/api/websites/[websiteId]/metrics.ts
@@ -64,7 +64,7 @@ export default async (
   await useAuth(req, res);
   await useValidate(schema, req, res);
 
-  const { websiteId, type, limit, offset, search } = req.query;
+  const { websiteId, type, limit, offset, search, unit } = req.query;
 
   if (req.method === 'GET') {
     if (!(await canViewWebsite(req.auth, websiteId))) {
@@ -89,7 +89,7 @@ export default async (
     }
 
     if (SESSION_COLUMNS.includes(type)) {
-      const data = await getSessionMetrics(websiteId, type, filters, limit, offset);
+      const data = await getSessionMetrics(websiteId, type, filters, limit, offset, unit as string);
 
       if (type === 'language') {
         const combined = {};
@@ -111,7 +111,14 @@ export default async (
     }
 
     if (EVENT_COLUMNS.includes(type)) {
-      const data = await getPageviewMetrics(websiteId, type, filters, limit, offset);
+      const data = await getPageviewMetrics(
+        websiteId,
+        type,
+        filters,
+        limit,
+        offset,
+        unit as string,
+      );
 
       return ok(res, data);
     }
diff --git a/src/queries/analytics/pageviews/getPageviewMetrics.ts b/src/queries/analytics/pageviews/getPageviewMetrics.ts
index 67ccb04aab..25c264b780 100644
--- a/src/queries/analytics/pageviews/getPageviewMetrics.ts
+++ b/src/queries/analytics/pageviews/getPageviewMetrics.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-vars, @typescript-eslint/no-unused-vars */
 import clickhouse from 'lib/clickhouse';
 import { EVENT_TYPE, FILTER_COLUMNS, SESSION_COLUMNS } from 'lib/constants';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
@@ -5,7 +6,14 @@ import prisma from 'lib/prisma';
 import { QueryFilters } from 'lib/types';
 
 export async function getPageviewMetrics(
-  ...args: [websiteId: string, type: string, filters: QueryFilters, limit?: number, offset?: number]
+  ...args: [
+    websiteId: string,
+    type: string,
+    filters: QueryFilters,
+    limit?: number,
+    offset?: number,
+    unit?: string,
+  ]
 ) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
@@ -19,6 +27,7 @@ async function relationalQuery(
   filters: QueryFilters,
   limit: number = 500,
   offset: number = 0,
+  unit: string,
 ) {
   const column = FILTER_COLUMNS[type] || type;
   const { rawQuery, parseFilters } = prisma;
@@ -79,6 +88,7 @@ async function clickhouseQuery(
   filters: QueryFilters,
   limit: number = 500,
   offset: number = 0,
+  unit: string,
 ): Promise<{ x: string; y: number }[]> {
   const column = FILTER_COLUMNS[type] || type;
   const { rawQuery, parseFilters } = clickhouse;
@@ -108,10 +118,12 @@ async function clickhouseQuery(
         and x.target_created_at = website_event.created_at`;
   }
 
+  const table = unit === 'hour' ? 'website_event_metric_hourly' : 'website_event_metric_daily';
+
   return rawQuery(
     `
-    select ${column} x, count(*) y
-    from website_event
+    select ${column} x, countMerge(views) y
+    from ${table} website_event
     ${entryExitQuery}
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}
diff --git a/src/queries/analytics/pageviews/getPageviewStats.ts b/src/queries/analytics/pageviews/getPageviewStats.ts
index a37a15662f..f6942e6a2c 100644
--- a/src/queries/analytics/pageviews/getPageviewStats.ts
+++ b/src/queries/analytics/pageviews/getPageviewStats.ts
@@ -46,6 +46,7 @@ async function clickhouseQuery(
     ...filters,
     eventType: EVENT_TYPE.pageView,
   });
+  const table = unit === 'hour' ? 'website_event_metric_hourly' : 'website_event_metric_daily';
 
   return rawQuery(
     `
@@ -55,8 +56,8 @@ async function clickhouseQuery(
     from (
       select 
         ${getDateQuery('created_at', unit, timezone)} as t,
-        count(*) as y
-      from website_event
+        countMerge(views) as y
+      from ${table} website_event
       where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
         and event_type = {eventType:UInt32}
diff --git a/src/queries/analytics/sessions/getSessionMetrics.ts b/src/queries/analytics/sessions/getSessionMetrics.ts
index e522a7effd..58b5198ceb 100644
--- a/src/queries/analytics/sessions/getSessionMetrics.ts
+++ b/src/queries/analytics/sessions/getSessionMetrics.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-vars, @typescript-eslint/no-unused-vars */
 import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
 import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
@@ -5,7 +6,14 @@ import { EVENT_TYPE, FILTER_COLUMNS, SESSION_COLUMNS } from 'lib/constants';
 import { QueryFilters } from 'lib/types';
 
 export async function getSessionMetrics(
-  ...args: [websiteId: string, type: string, filters: QueryFilters, limit?: number, offset?: number]
+  ...args: [
+    websiteId: string,
+    type: string,
+    filters: QueryFilters,
+    limit?: number,
+    offset?: number,
+    unit?: string,
+  ]
 ) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
@@ -19,6 +27,7 @@ async function relationalQuery(
   filters: QueryFilters,
   limit: number = 500,
   offset: number = 0,
+  unit: string,
 ) {
   const column = FILTER_COLUMNS[type] || type;
   const { parseFilters, rawQuery } = prisma;
@@ -62,6 +71,7 @@ async function clickhouseQuery(
   filters: QueryFilters,
   limit: number = 500,
   offset: number = 0,
+  unit: string,
 ): Promise<{ x: string; y: number }[]> {
   const column = FILTER_COLUMNS[type] || type;
   const { parseFilters, rawQuery } = clickhouse;
@@ -70,6 +80,7 @@ async function clickhouseQuery(
     eventType: EVENT_TYPE.pageView,
   });
   const includeCountry = column === 'city' || column === 'subdivision1';
+  const table = unit === 'hour' ? 'website_event_metric_hourly' : 'website_event_metric_daily';
 
   return rawQuery(
     `
@@ -77,7 +88,7 @@ async function clickhouseQuery(
       ${column} x,
       uniq(session_id) y
       ${includeCountry ? ', country' : ''}
-    from website_event
+    from ${table} website_event
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}
       and event_type = {eventType:UInt32}
diff --git a/src/queries/analytics/sessions/getSessionStats.ts b/src/queries/analytics/sessions/getSessionStats.ts
index e3af7ba6d1..dc6d635d14 100644
--- a/src/queries/analytics/sessions/getSessionStats.ts
+++ b/src/queries/analytics/sessions/getSessionStats.ts
@@ -46,6 +46,7 @@ async function clickhouseQuery(
     ...filters,
     eventType: EVENT_TYPE.pageView,
   });
+  const table = unit === 'hour' ? 'website_event_metric_hourly' : 'website_event_metric_daily';
 
   return rawQuery(
     `
@@ -55,8 +56,8 @@ async function clickhouseQuery(
     from (
       select 
         ${getDateQuery('created_at', unit, timezone)} as t,
-        count(distinct session_id) as y
-      from website_event
+        uniq(session_id) as y
+      from ${table} website_event
       where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
         and event_type = {eventType:UInt32}

From 62f35668ae785799b6bec1b67b4737d00876f451 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Mon, 8 Jul 2024 23:39:06 -0700
Subject: [PATCH 204/438] Fixed funnel chart.

---
 src/app/(main)/reports/funnel/FunnelChart.module.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/app/(main)/reports/funnel/FunnelChart.module.css b/src/app/(main)/reports/funnel/FunnelChart.module.css
index 81b22c7873..7972d57362 100644
--- a/src/app/(main)/reports/funnel/FunnelChart.module.css
+++ b/src/app/(main)/reports/funnel/FunnelChart.module.css
@@ -34,6 +34,10 @@
   background-color: var(--base100);
 }
 
+.step:last-child::before {
+  display: none;
+}
+
 .card {
   display: grid;
   gap: 20px;

From 4494665d2e72fc39cb3baa9f70726a6590a48080 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Mon, 8 Jul 2024 23:41:40 -0700
Subject: [PATCH 205/438] Updated date output for Clickhouse.

---
 .../[websiteId]/realtime/RealtimeLog.tsx        |  4 ++--
 src/lib/clickhouse.ts                           | 17 +++++++++++------
 src/lib/date.ts                                 |  2 +-
 src/queries/analytics/events/getEvents.ts       |  5 ++---
 src/queries/analytics/getRealtimeData.ts        |  4 ++--
 src/queries/analytics/sessions/getSessions.ts   |  5 ++---
 6 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
index 700e83aeef..97fb16597b 100644
--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
@@ -54,7 +54,7 @@ export function RealtimeLog({ data }: { data: RealtimeData }) {
     },
   ];
 
-  const getTime = ({ timestamp }) => format(timestamp * 1000, 'h:mm:ss');
+  const getTime = ({ createdAt }) => format(new Date(createdAt), 'h:mm:ss');
 
   const getColor = ({ id, sessionId }) => stringToColor(sessionId || id);
 
@@ -149,7 +149,7 @@ export function RealtimeLog({ data }: { data: RealtimeData }) {
         ...e,
       })),
       ...visitors.map(v => ({ __type: TYPE_SESSION, ...v })),
-    ].sort(thenby.firstBy('timestamp', -1));
+    ].sort(thenby.firstBy('createdAt', -1));
 
     if (search) {
       logs = logs.filter(({ eventName, urlPath, browser, os, country, device }) => {
diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index e716d6493f..2bda9bfa85 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -9,11 +9,12 @@ import { maxDate } from './date';
 import { filtersToArray } from './params';
 
 export const CLICKHOUSE_DATE_FORMATS = {
-  minute: '%Y-%m-%d %H:%i:00',
-  hour: '%Y-%m-%d %H:00:00',
-  day: '%Y-%m-%d',
-  month: '%Y-%m-01',
-  year: '%Y-01-01',
+  second: '%Y-%m-%dT%H:%i:%S',
+  minute: '%Y-%m-%dT%H:%i:00',
+  hour: '%Y-%m-%dT%H:00:00',
+  day: '%Y-%m-%dT00:00:00',
+  month: '%Y-%m-01T00:00:00',
+  year: '%Y-01-01T00:00:00',
 };
 
 const log = debug('umami:clickhouse');
@@ -47,7 +48,11 @@ function getClient() {
   return client;
 }
 
-function getDateStringSQL(data: any, unit: string | number) {
+function getDateStringSQL(data: any, unit: string | number, timezone?: string) {
+  if (timezone) {
+    return `formatDateTime(${data}, '${CLICKHOUSE_DATE_FORMATS[unit]}', '${timezone}')`;
+  }
+
   return `formatDateTime(${data}, '${CLICKHOUSE_DATE_FORMATS[unit]}')`;
 }
 
diff --git a/src/lib/date.ts b/src/lib/date.ts
index de76f7f327..2fb24073a6 100644
--- a/src/lib/date.ts
+++ b/src/lib/date.ts
@@ -292,7 +292,7 @@ export function getDateArray(data: any[], startDate: Date, endDate: Date, unit:
 
   for (let i = 0; i <= n; i++) {
     const t = start(add(startDate, i));
-    const y = data.find(({ x }) => start(getDateFromString(x)).getTime() === t.getTime())?.y || 0;
+    const y = data.find(({ x }) => start(new Date(x)).getTime() === t.getTime())?.y || 0;
 
     arr.push({ x: t, y });
   }
diff --git a/src/queries/analytics/events/getEvents.ts b/src/queries/analytics/events/getEvents.ts
index a00f684851..540c1a05d8 100644
--- a/src/queries/analytics/events/getEvents.ts
+++ b/src/queries/analytics/events/getEvents.ts
@@ -24,7 +24,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
 }
 
 async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
-  const { pagedQuery, parseFilters } = clickhouse;
+  const { pagedQuery, parseFilters, getDateStringSQL } = clickhouse;
   const { params, dateQuery, filterQuery } = await parseFilters(websiteId, filters);
 
   return pagedQuery(
@@ -33,8 +33,7 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
       event_id as id,
       website_id as websiteId, 
       session_id as sessionId,
-      created_at as createdAt,
-      toUnixTimestamp(created_at) as timestamp,
+      ${getDateStringSQL('created_at', 'second', filters.timezone)} as createdAt,
       url_path as urlPath,
       url_query as urlQuery,
       referrer_path as referrerPath,
diff --git a/src/queries/analytics/getRealtimeData.ts b/src/queries/analytics/getRealtimeData.ts
index afc7ff8fa9..5a9c5a36c0 100644
--- a/src/queries/analytics/getRealtimeData.ts
+++ b/src/queries/analytics/getRealtimeData.ts
@@ -19,8 +19,8 @@ export async function getRealtimeData(
   const { startDate, timezone } = criteria;
   const filters = { startDate, endDate: new Date(), unit: 'minute', timezone };
   const [events, sessions, pageviews, sessionviews] = await Promise.all([
-    getEvents(websiteId, { startDate }, { pageSize: 10000 }),
-    getSessions(websiteId, { startDate }, { pageSize: 10000 }),
+    getEvents(websiteId, { startDate, timezone }, { pageSize: 10000 }),
+    getSessions(websiteId, { startDate, timezone }, { pageSize: 10000 }),
     getPageviewStats(websiteId, filters),
     getSessionStats(websiteId, filters),
   ]);
diff --git a/src/queries/analytics/sessions/getSessions.ts b/src/queries/analytics/sessions/getSessions.ts
index 47471d986d..538133bac3 100644
--- a/src/queries/analytics/sessions/getSessions.ts
+++ b/src/queries/analytics/sessions/getSessions.ts
@@ -24,7 +24,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
 }
 
 async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
-  const { pagedQuery, parseFilters } = clickhouse;
+  const { pagedQuery, parseFilters, getDateStringSQL } = clickhouse;
   const { params, dateQuery, filterQuery } = await parseFilters(websiteId, filters);
 
   return pagedQuery(
@@ -32,8 +32,7 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
     select
       session_id as id,
       website_id as websiteId,
-      created_at as createdAt,
-      toUnixTimestamp(created_at) as timestamp,
+      ${getDateStringSQL('created_at', 'second', filters.timezone)} as createdAt,
       hostname,
       browser,
       os,

From 374faae27b6590adf09c0a02abeb4a379baf6d88 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Mon, 8 Jul 2024 23:42:26 -0700
Subject: [PATCH 206/438] Updated lang files.

---
 public/intl/messages/de-DE.json | 98 ++++++++++++++++-----------------
 public/intl/messages/pl-PL.json | 36 ++++++------
 public/intl/messages/zh-CN.json | 28 +++++-----
 3 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/public/intl/messages/de-DE.json b/public/intl/messages/de-DE.json
index 2482b208b5..a7d1f1ab60 100644
--- a/public/intl/messages/de-DE.json
+++ b/public/intl/messages/de-DE.json
@@ -32,13 +32,13 @@
   "label.add-member": [
     {
       "type": 0,
-      "value": "Add member"
+      "value": "Mitglied hinzufügen"
     }
   ],
   "label.add-step": [
     {
       "type": 0,
-      "value": "Add step"
+      "value": "Schritt hinzufügen"
     }
   ],
   "label.add-website": [
@@ -104,7 +104,7 @@
   "label.breakdown": [
     {
       "type": 0,
-      "value": "Breakdown"
+      "value": "Aufschlüsselung"
     }
   ],
   "label.browser": [
@@ -152,7 +152,7 @@
   "label.compare": [
     {
       "type": 0,
-      "value": "Compare"
+      "value": "Vergleich"
     }
   ],
   "label.confirm": [
@@ -182,7 +182,7 @@
   "label.count": [
     {
       "type": 0,
-      "value": "Count"
+      "value": "Anzahl"
     }
   ],
   "label.countries": [
@@ -200,7 +200,7 @@
   "label.create": [
     {
       "type": 0,
-      "value": "Create"
+      "value": "Erstellen"
     }
   ],
   "label.create-report": [
@@ -230,13 +230,13 @@
   "label.created-by": [
     {
       "type": 0,
-      "value": "Created By"
+      "value": "Erstellt von"
     }
   ],
   "label.current": [
     {
       "type": 0,
-      "value": "Current"
+      "value": "Aktuell"
     }
   ],
   "label.current-password": [
@@ -296,7 +296,7 @@
   "label.delete-report": [
     {
       "type": 0,
-      "value": "Delete report"
+      "value": "Bericht löschen"
     }
   ],
   "label.delete-team": [
@@ -386,7 +386,7 @@
   "label.edit-member": [
     {
       "type": 0,
-      "value": "Edit member"
+      "value": "Mitglied bearbeiten"
     }
   ],
   "label.enable-share-url": [
@@ -398,7 +398,7 @@
   "label.end-step": [
     {
       "type": 0,
-      "value": "End Step"
+      "value": "Schritt beenden"
     }
   ],
   "label.entry": [
@@ -482,25 +482,25 @@
   "label.funnel-description": [
     {
       "type": 0,
-      "value": "Understand the conversion and drop-off rate of users."
+      "value": "Verstehe die Konversions- und Dropoffrate von Nutzern."
     }
   ],
   "label.goal": [
     {
       "type": 0,
-      "value": "Goal"
+      "value": "Ziel"
     }
   ],
   "label.goals": [
     {
       "type": 0,
-      "value": "Goals"
+      "value": "Ziele"
     }
   ],
   "label.goals-description": [
     {
       "type": 0,
-      "value": "Track your goals for pageviews and events."
+      "value": "Verfolgen Sie Ihre Ziele für Aufrufe und Events."
     }
   ],
   "label.greater-than": [
@@ -536,7 +536,7 @@
   "label.insights-description": [
     {
       "type": 0,
-      "value": "Dive deeper into your data by using segments and filters."
+      "value": "Tauchen Sie tiefer in Ihre Daten mit Filtern und Segmenten ein."
     }
   ],
   "label.is": [
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users navigate through your website."
+      "value": "Verstehen Sie, wie Nutzer Ihre Website navigieren."
     }
   ],
   "label.language": [
@@ -686,7 +686,7 @@
   "label.manage": [
     {
       "type": 0,
-      "value": "Manage"
+      "value": "Verwalten"
     }
   ],
   "label.manager": [
@@ -704,7 +704,7 @@
   "label.member": [
     {
       "type": 0,
-      "value": "Member"
+      "value": "Mitglied"
     }
   ],
   "label.members": [
@@ -734,7 +734,7 @@
   "label.my-account": [
     {
       "type": 0,
-      "value": "My account"
+      "value": "Mein Konto"
     }
   ],
   "label.my-websites": [
@@ -874,19 +874,19 @@
   "label.previous": [
     {
       "type": 0,
-      "value": "Previous"
+      "value": "Vorherige"
     }
   ],
   "label.previous-period": [
     {
       "type": 0,
-      "value": "Previous period"
+      "value": "Vorheriger Zeitraum"
     }
   ],
   "label.previous-year": [
     {
       "type": 0,
-      "value": "Previous year"
+      "value": "Vorheriges Jahr"
     }
   ],
   "label.profile": [
@@ -898,7 +898,7 @@
   "label.property": [
     {
       "type": 0,
-      "value": "Property"
+      "value": "Besitz"
     }
   ],
   "label.queries": [
@@ -970,7 +970,7 @@
   "label.remove-member": [
     {
       "type": 0,
-      "value": "Remove member"
+      "value": "Mitglied entfernen"
     }
   ],
   "label.reports": [
@@ -1006,7 +1006,7 @@
   "label.retention-description": [
     {
       "type": 0,
-      "value": "Measure your website stickiness by tracking how often users return."
+      "value": "Messen Sie die Presenz Ihrer Website, indem Sie tracken wie oft Nutzer zurückkehren."
     }
   ],
   "label.role": [
@@ -1036,13 +1036,13 @@
   "label.search": [
     {
       "type": 0,
-      "value": "Search"
+      "value": "Suche"
     }
   ],
   "label.select": [
     {
       "type": 0,
-      "value": "Select"
+      "value": "Auswählen"
     }
   ],
   "label.select-date": [
@@ -1054,7 +1054,7 @@
   "label.select-role": [
     {
       "type": 0,
-      "value": "Select role"
+      "value": "Rolle auswählen"
     }
   ],
   "label.select-website": [
@@ -1090,13 +1090,13 @@
   "label.start-step": [
     {
       "type": 0,
-      "value": "Start Step"
+      "value": "Schritt starten"
     }
   ],
   "label.steps": [
     {
       "type": 0,
-      "value": "Steps"
+      "value": "Schritte"
     }
   ],
   "label.sum": [
@@ -1126,7 +1126,7 @@
   "label.team-manager": [
     {
       "type": 0,
-      "value": "Team manager"
+      "value": "Team-Manager"
     }
   ],
   "label.team-member": [
@@ -1234,13 +1234,13 @@
   "label.transfer": [
     {
       "type": 0,
-      "value": "Transfer"
+      "value": "Übertragung"
     }
   ],
   "label.transfer-website": [
     {
       "type": 0,
-      "value": "Transfer website"
+      "value": "Website übertragen"
     }
   ],
   "label.true": [
@@ -1324,7 +1324,7 @@
   "label.utm-description": [
     {
       "type": 0,
-      "value": "Track your campaigns through UTM parameters."
+      "value": "Tracken Sie Ihre Kampagnen mit Hilfe von UTM Parametern."
     }
   ],
   "label.value": [
@@ -1360,7 +1360,7 @@
   "label.views-per-visit": [
     {
       "type": 0,
-      "value": "Views per visit"
+      "value": "Aufrufe pro Besuch"
     }
   ],
   "label.visit-duration": [
@@ -1378,7 +1378,7 @@
   "label.visits": [
     {
       "type": 0,
-      "value": "Visits"
+      "value": "Besuche"
     }
   ],
   "label.website": [
@@ -1414,7 +1414,7 @@
   "message.action-confirmation": [
     {
       "type": 0,
-      "value": "Type "
+      "value": "Tippen Sie "
     },
     {
       "type": 1,
@@ -1422,7 +1422,7 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " in das untenliegende Feld, um zu bestätigen."
     }
   ],
   "message.active-users": [
@@ -1462,7 +1462,7 @@
   "message.collected-data": [
     {
       "type": 0,
-      "value": "Collected data"
+      "value": "Gesammelte Daten"
     }
   ],
   "message.confirm-delete": [
@@ -1496,7 +1496,7 @@
   "message.confirm-remove": [
     {
       "type": 0,
-      "value": "Are you sure you want to remove "
+      "value": "Sind Sie sicher, dass Sie "
     },
     {
       "type": 1,
@@ -1504,7 +1504,7 @@
     },
     {
       "type": 0,
-      "value": "?"
+      "value": " entfernen möchten?"
     }
   ],
   "message.confirm-reset": [
@@ -1524,7 +1524,7 @@
   "message.delete-team-warning": [
     {
       "type": 0,
-      "value": "Deleting a team will also delete all team websites."
+      "value": "Alle zugehörigen Websiten werden ebenfalls gelöscht."
     }
   ],
   "message.delete-website-warning": [
@@ -1708,25 +1708,25 @@
   "message.transfer-team-website-to-user": [
     {
       "type": 0,
-      "value": "Transfer this website to your account?"
+      "value": "Möchten Sie diese Website auf Ihr Konto übertragen?"
     }
   ],
   "message.transfer-user-website-to-team": [
     {
       "type": 0,
-      "value": "Select the team to transfer this website to."
+      "value": "Wählen Sie das Team, auf das die Website übertragen wird."
     }
   ],
   "message.transfer-website": [
     {
       "type": 0,
-      "value": "Transfer website ownership to your account or another team."
+      "value": "Übertragen Sie den Besitz der Website auf Ihren Account oder ein anderes Team."
     }
   ],
   "message.triggered-event": [
     {
       "type": 0,
-      "value": "Triggered event"
+      "value": "Event ausgelöst"
     }
   ],
   "message.user-deleted": [
@@ -1738,7 +1738,7 @@
   "message.viewed-page": [
     {
       "type": 0,
-      "value": "Viewed page"
+      "value": "Seite besucht"
     }
   ],
   "message.visitor-log": [
@@ -1778,7 +1778,7 @@
   "message.visitors-dropped-off": [
     {
       "type": 0,
-      "value": "Visitors dropped off"
+      "value": "Besucher haben die Seite verlassen"
     }
   ]
 }
diff --git a/public/intl/messages/pl-PL.json b/public/intl/messages/pl-PL.json
index 608c0b3a80..7157a4f26c 100644
--- a/public/intl/messages/pl-PL.json
+++ b/public/intl/messages/pl-PL.json
@@ -152,7 +152,7 @@
   "label.compare": [
     {
       "type": 0,
-      "value": "Compare"
+      "value": "Porównaj"
     }
   ],
   "label.confirm": [
@@ -182,7 +182,7 @@
   "label.count": [
     {
       "type": 0,
-      "value": "Count"
+      "value": "Liczba"
     }
   ],
   "label.countries": [
@@ -236,7 +236,7 @@
   "label.current": [
     {
       "type": 0,
-      "value": "Current"
+      "value": "Aktualny"
     }
   ],
   "label.current-password": [
@@ -398,7 +398,7 @@
   "label.end-step": [
     {
       "type": 0,
-      "value": "End Step"
+      "value": "Krok końcowy"
     }
   ],
   "label.entry": [
@@ -428,7 +428,7 @@
   "label.exit": [
     {
       "type": 0,
-      "value": "Exit URL"
+      "value": "URL wyjściowy"
     }
   ],
   "label.false": [
@@ -488,13 +488,13 @@
   "label.goal": [
     {
       "type": 0,
-      "value": "Goal"
+      "value": "Cel"
     }
   ],
   "label.goals": [
     {
       "type": 0,
-      "value": "Goals"
+      "value": "Cele"
     }
   ],
   "label.goals-description": [
@@ -524,7 +524,7 @@
   "label.hosts": [
     {
       "type": 0,
-      "value": "Hosts"
+      "value": "Hosty"
     }
   ],
   "label.insights": [
@@ -578,13 +578,13 @@
   "label.journey": [
     {
       "type": 0,
-      "value": "Journey"
+      "value": "Droga"
     }
   ],
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users navigate through your website."
+      "value": "Zrozum, w jaki sposób użytkownicy poruszają się po Twojej witrynie."
     }
   ],
   "label.language": [
@@ -874,19 +874,19 @@
   "label.previous": [
     {
       "type": 0,
-      "value": "Previous"
+      "value": "Poprzedni"
     }
   ],
   "label.previous-period": [
     {
       "type": 0,
-      "value": "Previous period"
+      "value": "Poprzedni okres"
     }
   ],
   "label.previous-year": [
     {
       "type": 0,
-      "value": "Previous year"
+      "value": "Poprzedni rok"
     }
   ],
   "label.profile": [
@@ -928,7 +928,7 @@
   "label.referrer": [
     {
       "type": 0,
-      "value": "Referrer"
+      "value": "Źródło odsyłające"
     }
   ],
   "label.referrers": [
@@ -970,7 +970,7 @@
   "label.remove-member": [
     {
       "type": 0,
-      "value": "Remove member"
+      "value": "Usuń członka"
     }
   ],
   "label.reports": [
@@ -1090,7 +1090,7 @@
   "label.start-step": [
     {
       "type": 0,
-      "value": "Start Step"
+      "value": "Krok startowy"
     }
   ],
   "label.steps": [
@@ -1378,7 +1378,7 @@
   "label.visits": [
     {
       "type": 0,
-      "value": "Odwiedząjący"
+      "value": "Wizyty"
     }
   ],
   "label.website": [
@@ -1462,7 +1462,7 @@
   "message.collected-data": [
     {
       "type": 0,
-      "value": "Collected data"
+      "value": "Zebrane dane"
     }
   ],
   "message.confirm-delete": [
diff --git a/public/intl/messages/zh-CN.json b/public/intl/messages/zh-CN.json
index 0b7da8a52e..bb77d83b98 100644
--- a/public/intl/messages/zh-CN.json
+++ b/public/intl/messages/zh-CN.json
@@ -152,7 +152,7 @@
   "label.compare": [
     {
       "type": 0,
-      "value": "对比"
+      "value": "比较"
     }
   ],
   "label.confirm": [
@@ -182,7 +182,7 @@
   "label.count": [
     {
       "type": 0,
-      "value": "数量"
+      "value": "统计"
     }
   ],
   "label.countries": [
@@ -236,7 +236,7 @@
   "label.current": [
     {
       "type": 0,
-      "value": "当前"
+      "value": "目前"
     }
   ],
   "label.current-password": [
@@ -398,13 +398,13 @@
   "label.end-step": [
     {
       "type": 0,
-      "value": "最后一步"
+      "value": "结束步骤"
     }
   ],
   "label.entry": [
     {
       "type": 0,
-      "value": "首次访问 URL"
+      "value": "入口 URL"
     }
   ],
   "label.event": [
@@ -500,7 +500,7 @@
   "label.goals-description": [
     {
       "type": 0,
-      "value": "追踪您的页面浏览量和事件目标。"
+      "value": "跟踪页面浏览量和事件的目标。"
     }
   ],
   "label.greater-than": [
@@ -578,13 +578,13 @@
   "label.journey": [
     {
       "type": 0,
-      "value": "轨迹"
+      "value": "用户浏览轨迹"
     }
   ],
   "label.journey-description": [
     {
       "type": 0,
-      "value": "了解用户如何浏览您网站的哪些页面。"
+      "value": "了解用户如何浏览网站。"
     }
   ],
   "label.language": [
@@ -882,19 +882,19 @@
   "label.previous": [
     {
       "type": 0,
-      "value": "之前"
+      "value": "先前"
     }
   ],
   "label.previous-period": [
     {
       "type": 0,
-      "value": "前一周期"
+      "value": "上一时期"
     }
   ],
   "label.previous-year": [
     {
       "type": 0,
-      "value": "前一年"
+      "value": "上一年"
     }
   ],
   "label.profile": [
@@ -1098,7 +1098,7 @@
   "label.start-step": [
     {
       "type": 0,
-      "value": "第一步"
+      "value": "开始步骤"
     }
   ],
   "label.steps": [
@@ -1134,7 +1134,7 @@
   "label.team-manager": [
     {
       "type": 0,
-      "value": "团队管理"
+      "value": "团队管理者"
     }
   ],
   "label.team-member": [
@@ -1450,7 +1450,7 @@
   "message.collected-data": [
     {
       "type": 0,
-      "value": "收集数据"
+      "value": "已收集的数据"
     }
   ],
   "message.confirm-delete": [

From 44ccb661a2ebb5c71976d10682a87c7e0ca81b2a Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 9 Jul 2024 16:33:43 -0700
Subject: [PATCH 207/438] Updated IP regex to work with IPv6.

---
 src/lib/constants.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 35917802d2..661611bc9f 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -248,7 +248,8 @@ export const UUID_REGEX =
   /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/;
 export const HOSTNAME_REGEX =
   /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9])$/;
-export const IP_REGEX = /^((25[0-5]|(2[0-4]|1[0-9]|[1-9]|)[0-9])(\.(?!$)|$)){4}$/;
+export const IP_REGEX =
+  /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$|^(?:(?:[0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|(?:[0-9a-fA-F]{1,4}:){1,7}:|(?:[0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|(?:[0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|(?:[0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|(?:[0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|(?:[0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:(?:(:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]+|::(ffff(:0{1,4})?:)?((25[0-5]|(2[0-4]|1?[0-9])?[0-9])\.){3}(25[0-5]|(2[0-4]|1?[0-9])?[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1?[0-9])?[0-9])\.){3}(25[0-5]|(2[0-4]|1?[0-9])?[0-9]))$/;
 export const DATETIME_REGEX =
   /^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(\.[0-9]{3}(Z|\+[0-9]{2}:[0-9]{2})?)?$/;
 

From f518066d932fc689a10ae32c142698468d667144 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Wed, 10 Jul 2024 00:54:46 -0700
Subject: [PATCH 208/438] refactor views and queries for dashboard

---
 src/lib/constants.ts                          |  4 +--
 src/pages/api/websites/[websiteId]/stats.ts   | 10 ++++--
 src/queries/analytics/getWebsiteStats.ts      | 33 ++++++++-----------
 .../analytics/pageviews/getPageviewMetrics.ts | 22 ++++---------
 .../analytics/pageviews/getPageviewStats.ts   |  4 +--
 .../analytics/sessions/getSessionMetrics.ts   |  2 +-
 .../analytics/sessions/getSessionStats.ts     |  2 +-
 7 files changed, 34 insertions(+), 43 deletions(-)

diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 35917802d2..8a23f93094 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -58,8 +58,8 @@ export const SESSION_COLUMNS = [
 
 export const FILTER_COLUMNS = {
   url: 'url_path',
-  entry: 'url_path',
-  exit: 'url_path',
+  entry: 'entry_url',
+  exit: 'exit_url',
   referrer: 'referrer_domain',
   host: 'hostname',
   title: 'page_title',
diff --git a/src/pages/api/websites/[websiteId]/stats.ts b/src/pages/api/websites/[websiteId]/stats.ts
index 0189627a59..1c684dbed3 100644
--- a/src/pages/api/websites/[websiteId]/stats.ts
+++ b/src/pages/api/websites/[websiteId]/stats.ts
@@ -56,7 +56,7 @@ export default async (
   await useAuth(req, res);
   await useValidate(schema, req, res);
 
-  const { websiteId, compare } = req.query;
+  const { websiteId, compare, unit } = req.query;
 
   if (req.method === 'GET') {
     if (!(await canViewWebsite(req.auth, websiteId))) {
@@ -72,9 +72,13 @@ export default async (
 
     const filters = getRequestFilters(req);
 
-    const metrics = await getWebsiteStats(websiteId, { ...filters, startDate, endDate });
+    const metrics = await getWebsiteStats(websiteId, unit as string, {
+      ...filters,
+      startDate,
+      endDate,
+    });
 
-    const prevPeriod = await getWebsiteStats(websiteId, {
+    const prevPeriod = await getWebsiteStats(websiteId, unit as string, {
       ...filters,
       startDate: compareStartDate,
       endDate: compareEndDate,
diff --git a/src/queries/analytics/getWebsiteStats.ts b/src/queries/analytics/getWebsiteStats.ts
index 2f3c82e865..13eadbbba8 100644
--- a/src/queries/analytics/getWebsiteStats.ts
+++ b/src/queries/analytics/getWebsiteStats.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-vars, @typescript-eslint/no-unused-vars */
 import clickhouse from 'lib/clickhouse';
 import { EVENT_TYPE } from 'lib/constants';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
@@ -5,7 +6,7 @@ import prisma from 'lib/prisma';
 import { QueryFilters } from 'lib/types';
 
 export async function getWebsiteStats(
-  ...args: [websiteId: string, filters: QueryFilters]
+  ...args: [websiteId: string, unit: string, filters: QueryFilters]
 ): Promise<
   { pageviews: number; visitors: number; visits: number; bounces: number; totaltime: number }[]
 > {
@@ -17,6 +18,7 @@ export async function getWebsiteStats(
 
 async function relationalQuery(
   websiteId: string,
+  unit: string,
   filters: QueryFilters,
 ): Promise<
   { pageviews: number; visitors: number; visits: number; bounces: number; totaltime: number }[]
@@ -57,6 +59,7 @@ async function relationalQuery(
 
 async function clickhouseQuery(
   websiteId: string,
+  unit: string,
   filters: QueryFilters,
 ): Promise<
   { pageviews: number; visitors: number; visits: number; bounces: number; totaltime: number }[]
@@ -66,29 +69,21 @@ async function clickhouseQuery(
     ...filters,
     eventType: EVENT_TYPE.pageView,
   });
+  const table = unit === 'hour' ? 'website_event_stats_hourly' : 'website_event_stats_daily';
 
   return rawQuery(
     `
     select 
-      sum(t.c) as "pageviews",
-      uniq(t.session_id) as "visitors",
-      uniq(t.visit_id) as "visits",
-      sum(if(t.c = 1, 1, 0)) as "bounces",
+      sum(views) as "pageviews",
+      uniq(session_id) as "visitors",
+      uniq(visit_id) as "visits",
+      sumIf(1, views = 1) as "bounces",
       sum(max_time-min_time) as "totaltime"
-    from (
-      select
-        session_id,
-        visit_id,
-        count(*) c,
-        min(created_at) min_time,
-        max(created_at) max_time
-      from website_event
-      where website_id = {websiteId:UUID}
-        and created_at between {startDate:DateTime64} and {endDate:DateTime64}
-        and event_type = {eventType:UInt32}
-        ${filterQuery}
-      group by session_id, visit_id
-    ) as t;
+    from ${table} "website_event"
+    where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      and event_type = {eventType:UInt32}
+      ${filterQuery};
     `,
     params,
   ).then(result => {
diff --git a/src/queries/analytics/pageviews/getPageviewMetrics.ts b/src/queries/analytics/pageviews/getPageviewMetrics.ts
index 25c264b780..34d26d9dcd 100644
--- a/src/queries/analytics/pageviews/getPageviewMetrics.ts
+++ b/src/queries/analytics/pageviews/getPageviewMetrics.ts
@@ -97,34 +97,26 @@ async function clickhouseQuery(
     eventType: column === 'event_name' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
   });
 
-  let entryExitQuery = '';
+  let columnAgg = column;
   let excludeDomain = '';
   if (column === 'referrer_domain') {
     excludeDomain = `and referrer_domain != {websiteDomain:String} and referrer_domain != ''`;
   }
 
-  if (type === 'entry' || type === 'exit') {
-    const aggregrate = type === 'entry' ? 'min' : 'max';
+  if (type === 'entry') {
+    columnAgg = `argMinMerge(${column})`;
+  }
 
-    entryExitQuery = `
-    JOIN (select visit_id,
-        ${aggregrate}(created_at) target_created_at
-    from website_event
-    where website_id = {websiteId:UUID}
-      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
-      and event_type = {eventType:UInt32}
-    group by visit_id) x
-    ON x.visit_id = website_event.visit_id
-        and x.target_created_at = website_event.created_at`;
+  if (type === 'exit') {
+    columnAgg = `argMaxMerge(${column})`;
   }
 
   const table = unit === 'hour' ? 'website_event_metric_hourly' : 'website_event_metric_daily';
 
   return rawQuery(
     `
-    select ${column} x, countMerge(views) y
+    select ${column} x, sum(views) y
     from ${table} website_event
-    ${entryExitQuery}
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}
       and event_type = {eventType:UInt32}
diff --git a/src/queries/analytics/pageviews/getPageviewStats.ts b/src/queries/analytics/pageviews/getPageviewStats.ts
index f6942e6a2c..57292f6588 100644
--- a/src/queries/analytics/pageviews/getPageviewStats.ts
+++ b/src/queries/analytics/pageviews/getPageviewStats.ts
@@ -46,7 +46,7 @@ async function clickhouseQuery(
     ...filters,
     eventType: EVENT_TYPE.pageView,
   });
-  const table = unit === 'hour' ? 'website_event_metric_hourly' : 'website_event_metric_daily';
+  const table = unit === 'hour' ? 'website_event_stats_hourly' : 'website_event_stats_daily';
 
   return rawQuery(
     `
@@ -56,7 +56,7 @@ async function clickhouseQuery(
     from (
       select 
         ${getDateQuery('created_at', unit, timezone)} as t,
-        countMerge(views) as y
+        sum(views) as y
       from ${table} website_event
       where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
diff --git a/src/queries/analytics/sessions/getSessionMetrics.ts b/src/queries/analytics/sessions/getSessionMetrics.ts
index 58b5198ceb..93e36a55fa 100644
--- a/src/queries/analytics/sessions/getSessionMetrics.ts
+++ b/src/queries/analytics/sessions/getSessionMetrics.ts
@@ -80,7 +80,7 @@ async function clickhouseQuery(
     eventType: EVENT_TYPE.pageView,
   });
   const includeCountry = column === 'city' || column === 'subdivision1';
-  const table = unit === 'hour' ? 'website_event_metric_hourly' : 'website_event_metric_daily';
+  const table = unit === 'hour' ? 'website_event_stats_hourly' : 'website_event_stats_daily';
 
   return rawQuery(
     `
diff --git a/src/queries/analytics/sessions/getSessionStats.ts b/src/queries/analytics/sessions/getSessionStats.ts
index dc6d635d14..6db03c46f2 100644
--- a/src/queries/analytics/sessions/getSessionStats.ts
+++ b/src/queries/analytics/sessions/getSessionStats.ts
@@ -46,7 +46,7 @@ async function clickhouseQuery(
     ...filters,
     eventType: EVENT_TYPE.pageView,
   });
-  const table = unit === 'hour' ? 'website_event_metric_hourly' : 'website_event_metric_daily';
+  const table = unit === 'hour' ? 'website_event_stats_hourly' : 'website_event_stats_daily';
 
   return rawQuery(
     `

From d6a4eea7f8be6e8af118e3f199197cf6e500d6fc Mon Sep 17 00:00:00 2001
From: manethpak <manethpak00@gmail.com>
Date: Wed, 10 Jul 2024 17:39:40 +0700
Subject: [PATCH 209/438] Update and fill missing translation for khmer lang

---
 src/lang/km-KH.json | 268 ++++++++++++++++++++++----------------------
 1 file changed, 134 insertions(+), 134 deletions(-)

diff --git a/src/lang/km-KH.json b/src/lang/km-KH.json
index 9a374a0673..e10b32b56e 100644
--- a/src/lang/km-KH.json
+++ b/src/lang/km-KH.json
@@ -1,170 +1,170 @@
 {
   "label.access-code": "Access code",
   "label.actions": "សកម្មភាព",
-  "label.activity-log": "Activity log",
-  "label.add": "Add",
-  "label.add-description": "Add description",
-  "label.add-member": "Add member",
-  "label.add-step": "Add step",
+  "label.activity-log": "កំណត់ហេតុ​សកម្មភាព",
+  "label.add": "បង្កើតបន្ថែម",
+  "label.add-description": "បន្ថែមពិពណ៌នា",
+  "label.add-member": "បន្ថែមសមាជិក",
+  "label.add-step": "បន្ថែមជំហាន",
   "label.add-website": "បន្ថែមគេហទំព័រ",
   "label.admin": "អ្នកគ្រប់គ្រង",
-  "label.after": "After",
+  "label.after": "បន្ទាប់",
   "label.all": "ទាំងអស់",
   "label.all-time": "គ្រប់ពេល",
   "label.analytics": "Analytics",
-  "label.average": "Average",
+  "label.average": "ជាមធ្យម",
   "label.back": "ថយក្រោយ",
-  "label.before": "Before",
+  "label.before": "មុន",
   "label.bounce-rate": "ចំនួនវិលត្រឡប់",
   "label.breakdown": "Breakdown",
   "label.browser": "Browser",
   "label.browsers": "កម្មវិធី",
   "label.cancel": "បោះបង់",
   "label.change-password": "ផ្លាស់ប្តូរពាក្យសម្ងាត់",
-  "label.cities": "Cities",
-  "label.city": "City",
-  "label.clear-all": "Clear all",
-  "label.compare": "Compare",
-  "label.confirm": "Confirm",
+  "label.cities": "ទីក្រុង",
+  "label.city": "ទីក្រុង",
+  "label.clear-all": "លុបទាំងអស់",
+  "label.compare": "ប្រៀបធៀប",
+  "label.confirm": "បញ្ជាក់",
   "label.confirm-password": "បញ្ជាក់ពាក្យសម្ងាត់",
-  "label.contains": "Contains",
-  "label.continue": "Continue",
-  "label.count": "Count",
+  "label.contains": "មាន",
+  "label.continue": "បន្ត",
+  "label.count": "ចំនួន",
   "label.countries": "ប្រទេស",
-  "label.country": "Country",
-  "label.create": "Create",
-  "label.create-report": "Create report",
-  "label.create-team": "Create team",
-  "label.create-user": "Create user",
-  "label.created": "Created",
-  "label.created-by": "Created By",
-  "label.current": "Current",
+  "label.country": "ប្រទេស",
+  "label.create": "បង្កើត",
+  "label.create-report": "បង្កើតរបាយការណ៍",
+  "label.create-team": "បង្កើតរបាយក្រុម",
+  "label.create-user": "បង្កើតអ្នកប្រើប្រាស់",
+  "label.created": "បង្កើតនៅ",
+  "label.created-by": "បង្កើតដោយ",
+  "label.current": "បច្ចុប្បន្ន",
   "label.current-password": "ពាក្យសម្ងាត់បច្ចុប្បន្ន",
   "label.custom-range": "កំណត់ដោយខ្លួនឯង",
   "label.dashboard": "ផ្ទាំងគ្រប់គ្រង",
-  "label.data": "Data",
-  "label.date": "Date",
+  "label.data": "ទិន្នន័យ",
+  "label.date": "កាលបរិច្ឆេទ",
   "label.date-range": "ចន្លោះកាលបរិច្ឆេទ",
-  "label.day": "Day",
-  "label.default-date-range": "ចន្លោះកាលបរិច្ឆេទស្រាប់",
+  "label.day": "ថ្ងៃ",
+  "label.default-date-range": "ចន្លោះកាលបរិច្ឆេទដើម",
   "label.delete": "លុប",
-  "label.delete-report": "Delete report",
-  "label.delete-team": "Delete team",
-  "label.delete-user": "Delete user",
+  "label.delete-report": "លុបរបាយការណ៍",
+  "label.delete-team": "លុបក្រុម",
+  "label.delete-user": "លុបអ្នកប្រើប្រាស់",
   "label.delete-website": "លុបគេហទំព័រ",
-  "label.description": "Description",
+  "label.description": "ការពិពណ៌នា",
   "label.desktop": "កុំព្យូទ័រលើតុ",
-  "label.details": "Details",
-  "label.device": "Device",
+  "label.details": "ព័ត៌មានលម្អិត",
+  "label.device": "ឧបករណ៍",
   "label.devices": "ឧបករណ៍",
-  "label.dismiss": "បដិសេធ",
-  "label.does-not-contain": "Does not contain",
-  "label.domain": "ឈ្មោះគេហទំព័រ",
+  "label.dismiss": "រំសាយ",
+  "label.does-not-contain": "មិនមាន",
+  "label.domain": "Domain",
   "label.dropoff": "Dropoff",
   "label.edit": "កែប្រែ",
   "label.edit-dashboard": "កែផ្ទាំងគ្រប់គ្រង",
-  "label.edit-member": "Edit member",
+  "label.edit-member": "កែព័ត៌មានសមាជិក",
   "label.enable-share-url": "បើកការចែករំលែក URL",
-  "label.end-step": "End Step",
-  "label.entry": "Entry URL",
-  "label.event": "Event",
-  "label.event-data": "Event data",
+  "label.end-step": "បញ្ចប់ជំហាន",
+  "label.entry": "URL ចូល",
+  "label.event": "ព្រឹត្តិការណ៍",
+  "label.event-data": "ទិន្នន័យព្រឹត្តិការណ៍",
   "label.events": "ព្រឹត្តិការណ៍",
-  "label.exit": "Exit URL",
-  "label.false": "False",
+  "label.exit": "URL ចេញ",
+  "label.false": "មិនពិត",
   "label.field": "Field",
   "label.fields": "Fields",
-  "label.filter": "Filter",
+  "label.filter": "ចម្រោះ",
   "label.filter-combined": "រួមបញ្ចូលគ្នា",
   "label.filter-raw": "ដើម",
-  "label.filters": "Filters",
+  "label.filters": "ចម្រោះ",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
-  "label.goal": "Goal",
-  "label.goals": "Goals",
-  "label.goals-description": "Track your goals for pageviews and events.",
-  "label.greater-than": "Greater than",
-  "label.greater-than-equals": "Greater than or equals",
+  "label.goal": "គោលដៅ",
+  "label.goals": "គោលដៅ",
+  "label.goals-description": "តាមដានគោលដៅរបស់អ្នកសម្រាប់ pageviews និង events។",
+  "label.greater-than": "ធំជាង",
+  "label.greater-than-equals": "ធំជាងឬស្មើ",
   "label.host": "Host",
   "label.hosts": "Hosts",
   "label.insights": "Insights",
   "label.insights-description": "Dive deeper into your data by using segments and filters.",
-  "label.is": "Is",
-  "label.is-not": "Is not",
-  "label.is-not-set": "Is not set",
-  "label.is-set": "Is set",
-  "label.join": "Join",
-  "label.join-team": "Join team",
-  "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.is": "គឺ",
+  "label.is-not": "មិនមែន",
+  "label.is-not-set": "មិនបានកំណត់",
+  "label.is-set": "បានកំណត់",
+  "label.join": "ចូលរួម",
+  "label.join-team": "ចូលក្រុម",
+  "label.journey": "​ដំណើរ",
+  "label.journey-description": "ស្វែងយល់ពីការប្រើប្រាស់គេហទំព័ររបស់អតិថិជនអ្នក។",
   "label.language": "ភាសា",
   "label.languages": "ភាសា",
   "label.laptop": "កុំព្យូទ័រយួរដៃ",
-  "label.last-days": "{x} ថ្ងៃមុន",
-  "label.last-hours": "{x} ម៉ោងមុន",
-  "label.last-months": "Last {x} months",
-  "label.leave": "Leave",
-  "label.leave-team": "Leave team",
-  "label.less-than": "Less than",
-  "label.less-than-equals": "Less than or equals",
+  "label.last-days": "{x} ថ្ងៃចុងក្រោយ",
+  "label.last-hours": "{x} ម៉ោងចុងក្រោយ",
+  "label.last-months": "{x} ខែចុងក្រោយ",
+  "label.leave": "ចាកចេញ",
+  "label.leave-team": "ចេញពីក្រុម",
+  "label.less-than": "តិច​ជាង",
+  "label.less-than-equals": "តិចជាង ឬស្មើ",
   "label.login": "Login",
-  "label.logout": "ចេញ",
-  "label.manage": "Manage",
-  "label.manager": "Manager",
+  "label.logout": "Logout",
+  "label.manage": "គ្រប់គ្រង",
+  "label.manager": "អ្នកគ្រប់គ្រង",
   "label.max": "Max",
-  "label.member": "Member",
-  "label.members": "Members",
+  "label.member": "សមាជិក",
+  "label.members": "សមាជិក",
   "label.min": "Min",
   "label.mobile": "ទូរស័ព្ទចល័ត",
   "label.more": "បន្ថែម",
-  "label.my-account": "My account",
-  "label.my-websites": "My websites",
+  "label.my-account": "គណនី​របស់ខ្ញុំ",
+  "label.my-websites": "គេហទំព័ររបស់ខ្ញុំ",
   "label.name": "ឈ្មោះ",
   "label.new-password": "ពាក្យសម្ងាត់​ថ្មី",
   "label.none": "មិនមាន",
   "label.number-of-records": "{x} {x, plural, one {record} other {records}}",
   "label.ok": "OK",
   "label.os": "OS",
-  "label.overview": "Overview",
+  "label.overview": "ទិដ្ឋភាពរួម",
   "label.owner": "ម្ចាស់",
-  "label.page-of": "Page {current} of {total}",
+  "label.page-of": "ទំព័រទី {current} នៃ {total}",
   "label.page-views": "អ្នកមើលទំព័រ",
-  "label.pageTitle": "Page title",
+  "label.pageTitle": "ចំណងជើងទំព័រ",
   "label.pages": "ទំព័រ",
   "label.password": "ពាក្យសម្ងាត់​",
   "label.powered-by": "ដំណើរការដោយ {name}",
-  "label.previous": "Previous",
-  "label.previous-period": "Previous period",
-  "label.previous-year": "Previous year",
-  "label.profile": "ប្រវត្តិរូប",
+  "label.previous": "មុន",
+  "label.previous-period": "មួយរយៈពេលមុន",
+  "label.previous-year": "ឆ្នាំ​មុន",
+  "label.profile": "គណនី",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
   "label.query-parameters": "ប៉ារ៉ាម៉ែត្រ Query",
   "label.realtime": "ឥលូវនេះ",
-  "label.referrer": "Referrer",
+  "label.referrer": "អ្នកណែនាំ",
   "label.referrers": "អ្នកណែនាំ",
   "label.refresh": "ផ្ទុកឡើងវិញ",
   "label.regenerate": "Regenerate",
   "label.region": "Region",
   "label.regions": "Regions",
-  "label.remove": "Remove",
-  "label.remove-member": "Remove member",
-  "label.reports": "Reports",
+  "label.remove": "លុប",
+  "label.remove-member": "លុបសមាជិកក្រុម",
+  "label.reports": "របាយការណ៍",
   "label.required": "ទាមទារ",
-  "label.reset": "កំណត់ឡើងវិញ",
+  "label.reset": "កែសម្រួល",
   "label.reset-website": "កំណត់ស្ថិតិឡើងវិញ",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
-  "label.role": "Role",
+  "label.role": "មុខងារ",
   "label.run-query": "Run query",
   "label.save": "រក្សាទុក",
   "label.screens": "ប្រភេទឧបករណ៍",
-  "label.search": "Search",
-  "label.select": "Select",
-  "label.select-date": "Select date",
-  "label.select-role": "Select role",
-  "label.select-website": "Select website",
+  "label.search": "ស្វែងរក",
+  "label.select": "ជ្រើសរើស",
+  "label.select-date": "ជ្រើសរើសកាលបរិច្ឆេទ",
+  "label.select-role": "ជ្រើសរើសមុខងារ",
+  "label.select-website": "ជ្រើសរើសគេហទំព័រ",
   "label.sessions": "Sessions",
   "label.settings": "ការកំណត់",
   "label.share-url": "ចែករំលែក URL",
@@ -173,34 +173,34 @@
   "label.steps": "Steps",
   "label.sum": "Sum",
   "label.tablet": "ថេប្លេត",
-  "label.team": "Team",
-  "label.team-id": "Team ID",
-  "label.team-manager": "Team manager",
-  "label.team-member": "Team member",
-  "label.team-name": "Team name",
-  "label.team-owner": "Team owner",
+  "label.team": "ក្រុម",
+  "label.team-id": "ID ក្រុម",
+  "label.team-manager": "អ្នកគ្រប់គ្រងក្រុម",
+  "label.team-member": "សមាជិកក្រុម",
+  "label.team-name": "ឈ្មោះក្រុម",
+  "label.team-owner": "ម្ចាស់ក្រុម",
   "label.team-view-only": "Team view only",
-  "label.team-websites": "Team websites",
-  "label.teams": "Teams",
+  "label.team-websites": "គេហទំព័ររបស់ក្រុម",
+  "label.teams": "ក្រុម",
   "label.theme": "រូបរាង",
   "label.this-month": "ខែនេះ",
   "label.this-week": "ស​ប្តា​ហ៍​នេះ",
   "label.this-year": "ឆ្នាំ​នេះ",
   "label.timezone": "តំបន់ម៉ោង",
-  "label.title": "Title",
+  "label.title": "ចំណងជើង",
   "label.today": "ថ្ងៃនេះ",
   "label.toggle-charts": "បិទ/បើកតារាង",
-  "label.total": "Total",
-  "label.total-records": "Total records",
+  "label.total": "សរុប",
+  "label.total-records": "កំណត់ត្រាសរុប",
   "label.tracking-code": "លេខកូដតាមដាន",
-  "label.transfer": "Transfer",
-  "label.transfer-website": "Transfer website",
-  "label.true": "True",
+  "label.transfer": "ការផ្ទេរ",
+  "label.transfer-website": "ការផ្ទេរគេហទំព័រ",
+  "label.true": "ពិត",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "អ្នកចូលមើលម្នាក់ៗ",
   "label.unknown": "មិនស្គាល់",
-  "label.untitled": "Untitled",
+  "label.untitled": "គ្មានចំណងជើង",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
@@ -212,56 +212,56 @@
   "label.value": "Value",
   "label.view": "View",
   "label.view-details": "មើលព័ត៌មានលម្អិត",
-  "label.view-only": "View only",
+  "label.view-only": "បានតែមើលប៉ុណ្ណោះ",
   "label.views": "អ្នកចូលមើល",
   "label.views-per-visit": "Views per visit",
   "label.visit-duration": "មើលជាមធ្យម",
   "label.visitors": "អ្នកទស្សនា",
   "label.visits": "Visits",
-  "label.website": "Website",
-  "label.website-id": "Website ID",
+  "label.website": "គេហទំព័រ",
+  "label.website-id": "ID គេហទំព័រ",
   "label.websites": "គេហទំព័រ",
   "label.window": "Window",
   "label.yesterday": "ម្សិលមិញ",
-  "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
+  "message.action-confirmation": "សសេរ {confirmation} នៅក្នុងប្រអប់ខាងក្រោមដើម្បីបញ្ជាក់។",
   "message.active-users": "មានអ្នកមើល {x} នាក់ ឥលូវនេះ",
   "message.collected-data": "Collected data",
   "message.confirm-delete": "តើអ្នកប្រាកដថាចង់លុប {target} ទេ?",
-  "message.confirm-leave": "Are you sure you want to leave {target}?",
-  "message.confirm-remove": "Are you sure you want to remove {target}?",
+  "message.confirm-leave": "តើអ្នកប្រាកដថាចង់ចាកចេញ {target} ទេ?",
+  "message.confirm-remove": "តើអ្នកប្រាកដថាចង់លុប {target} ទេ?",
   "message.confirm-reset": "តើអ្នកប្រាកដថាចង់កំណត់ស្ថិតិរបស់ {target} ឡើងវិញទេ?",
-  "message.delete-team-warning": "Deleting a team will also delete all team websites.",
-  "message.delete-website-warning": "ទិន្នន័យដែលពាក់ព័ន្ធទាំងអស់នឹងត្រូវបានលុបផងដែរ។",
+  "message.delete-team-warning": "ពេលលុបក្រុម គេហទំព័ររបស់ក្រុមក៏នឹងត្រូវលប់ចោលទាំងអស់ផងដែរ។",
+  "message.delete-website-warning": "ទិន្នន័យរបស់គេហទំព័រទាំងអស់នឹងត្រូវលុបចោល។",
   "message.error": "មាន​អ្វីមួយ​មិន​ប្រក្រតី។",
   "message.event-log": "{event} on {url}",
   "message.go-to-settings": "ការកំណត់",
-  "message.incorrect-username-password": "ឈ្មោះអ្នកប្រើ/ពាក្យសម្ងាត់មិនត្រឹមត្រូវ។",
-  "message.invalid-domain": "ឈ្មោះគេហទំព័រមិន​ត្រឹមត្រូវ",
-  "message.min-password-length": "Minimum length of {n} characters",
-  "message.new-version-available": "A new version of Umami {version} is available!",
-  "message.no-data-available": "មិនមានទិន្នន័យទេ។",
+  "message.incorrect-username-password": "ឈ្មោះអ្នកប្រើឬពាក្យសម្ងាត់មិនត្រឹមត្រូវ។",
+  "message.invalid-domain": "Domain មិន​ត្រឹមត្រូវ",
+  "message.min-password-length": "តិចបំផុតដែលមានអក្សរ {n} តួអក្សរ",
+  "message.new-version-available": "Version ថ្មីនៃ Umami {version} អាចប្រើប្រាស់បានហើយ!",
+  "message.no-data-available": "មិនមានទិន្នន័យ។",
   "message.no-event-data": "No event data is available.",
-  "message.no-match-password": "ពាក្យសម្ងាត់មិនត្រូវគ្នាទេ",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-teams": "You have not created any teams.",
-  "message.no-users": "There are no users.",
+  "message.no-match-password": "ពាក្យសម្ងាត់មិនត្រូវគ្នាទេ។",
+  "message.no-results-found": "មិនមានលទ្ធផល។",
+  "message.no-team-websites": "ក្រុមនេះមិនមានគេហទំព័រទេ។",
+  "message.no-teams": "អ្នកមិនទាន់បានបង្កើតក្រុមណាមួយទេ។",
+  "message.no-users": "មិនមានអ្នកប្រើប្រាស់ទេ។",
   "message.no-websites-configured": "អ្នកមិនទាន់បានដាក់គេហទំព័រណាមួយចូលទេ។",
   "message.page-not-found": "រកមិនឃើញទំព័រ។",
-  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
+  "message.reset-website": "ដើម្បីកែគេហទំព័រនេះឡើងវិញ សូមសរសេរ {confirmation} នៅក្នុងប្រអប់ខាងក្រោមដើម្បីបញ្ជាក់។",
   "message.reset-website-warning": "ស្ថិតិទាំងអស់សម្រាប់គេហទំព័រនេះនឹងត្រូវបានលុប ប៉ុន្តែកូដតាមដានរបស់អ្នកនឹងនៅដដែល។",
   "message.saved": "រក្សាទុកដោយជោគជ័យ។",
-  "message.share-url": "នេះគឺជា URL ដែលបានចែករំលែកជាសាធារណៈសម្រាប់ {target}។",
+  "message.share-url": "នេះគឺជា URL ដែលអាចចែករំលែកជាសាធារណៈបានសម្រាប់ {target}។",
   "message.team-already-member": "You are already a member of the team.",
-  "message.team-not-found": "Team not found.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.tracking-code": "លេខកូដតាមដាន",
-  "message.transfer-team-website-to-user": "Transfer this website to your account?",
-  "message.transfer-user-website-to-team": "Select the team to transfer this website to.",
-  "message.transfer-website": "Transfer website ownership to your account or another team.",
+  "message.team-not-found": "រកក្រុមមិនឃើញទេ។",
+  "message.team-websites-info": "គេហទំព័រនេះអាចមើលបានតែសមាជិកក្រុមតែប៉ុណ្ណោះ",
+  "message.tracking-code": "ដើម្បីតាមដានស្ថិតិសម្រាប់គេហទំព័រអ្នក សូមដាក់កូដខាងក្រោមទៅក្នុងផ្នែក <head>...</head> នៃ HTML របស់អ្នក។",
+  "message.transfer-team-website-to-user": "ផ្ទេរគេហទំព័រនេះទៅគណនីរបស់អ្នក។?",
+  "message.transfer-user-website-to-team": "ជ្រើសក្រុមដែរត្រូវផ្ទេរគេហទំព័រនេះទៅ។",
+  "message.transfer-website": "ផ្ទេរកម្មសិទ្ធិគេហទំព័រទៅគណនីរបស់អ្នក ឬក្រុមផ្សេងទៀត។",
   "message.triggered-event": "Triggered event",
-  "message.user-deleted": "User deleted.",
-  "message.viewed-page": "Viewed page",
+  "message.user-deleted": "អ្នកប្រើប្រាស់ត្រូវបានលុបចោល។",
+  "message.viewed-page": "ទំព័រដែលបានមើល",
   "message.visitor-log": "អ្នកមើលពីប្រទេស {country} ប្រើប្រាស់កម្មវិធី {browser} លើឧបករណ៍ {os} {device}",
   "message.visitors-dropped-off": "Visitors dropped off"
 }

From d270031793aaba5239ddd9c8c66180ef5dfc89b4 Mon Sep 17 00:00:00 2001
From: manethpak <manethpak00@gmail.com>
Date: Wed, 10 Jul 2024 22:18:31 +0700
Subject: [PATCH 210/438] fix: typo, update wording and fill missing
 words/sentence

---
 src/lang/km-KH.json | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/lang/km-KH.json b/src/lang/km-KH.json
index e10b32b56e..f45ed44945 100644
--- a/src/lang/km-KH.json
+++ b/src/lang/km-KH.json
@@ -34,7 +34,7 @@
   "label.country": "ប្រទេស",
   "label.create": "បង្កើត",
   "label.create-report": "បង្កើតរបាយការណ៍",
-  "label.create-team": "បង្កើតរបាយក្រុម",
+  "label.create-team": "បង្កើតក្រុម",
   "label.create-user": "បង្កើតអ្នកប្រើប្រាស់",
   "label.created": "បង្កើតនៅ",
   "label.created-by": "បង្កើតដោយ",
@@ -146,15 +146,15 @@
   "label.referrers": "អ្នកណែនាំ",
   "label.refresh": "ផ្ទុកឡើងវិញ",
   "label.regenerate": "Regenerate",
-  "label.region": "Region",
-  "label.regions": "Regions",
+  "label.region": "តំបន់",
+  "label.regions": "តំបន់",
   "label.remove": "លុប",
   "label.remove-member": "លុបសមាជិកក្រុម",
   "label.reports": "របាយការណ៍",
   "label.required": "ទាមទារ",
   "label.reset": "កែសម្រួល",
   "label.reset-website": "កំណត់ស្ថិតិឡើងវិញ",
-  "label.retention": "Retention",
+  "label.retention": "ការរក្សាទុក",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "មុខងារ",
   "label.run-query": "Run query",
@@ -169,8 +169,8 @@
   "label.settings": "ការកំណត់",
   "label.share-url": "ចែករំលែក URL",
   "label.single-day": "ថ្ងៃតែមួយ",
-  "label.start-step": "Start Step",
-  "label.steps": "Steps",
+  "label.start-step": "ជំហានចាប់ផ្តើម",
+  "label.steps": "ជំហាន",
   "label.sum": "Sum",
   "label.tablet": "ថេប្លេត",
   "label.team": "ក្រុម",
@@ -204,20 +204,20 @@
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
-  "label.user": "User",
+  "label.user": "អ្នកប្រើប្រាស់",
   "label.username": "ឈ្មោះ​អ្នកប្រើប្រាស់",
-  "label.users": "Users",
+  "label.users": "អ្នកប្រើប្រាស់",
   "label.utm": "UTM",
-  "label.utm-description": "Track your campaigns through UTM parameters.",
+  "label.utm-description": "តាមដានយុទ្ធនាការរបស់អ្នកតាមរយៈប៉ារ៉ាម៉ែត្រ UTM។",
   "label.value": "Value",
   "label.view": "View",
   "label.view-details": "មើលព័ត៌មានលម្អិត",
   "label.view-only": "បានតែមើលប៉ុណ្ណោះ",
   "label.views": "អ្នកចូលមើល",
   "label.views-per-visit": "Views per visit",
-  "label.visit-duration": "មើលជាមធ្យម",
+  "label.visit-duration": "រយៈពេលទស្សនា",
   "label.visitors": "អ្នកទស្សនា",
-  "label.visits": "Visits",
+  "label.visits": "ទស្សនា",
   "label.website": "គេហទំព័រ",
   "label.website-id": "ID គេហទំព័រ",
   "label.websites": "គេហទំព័រ",
@@ -225,7 +225,7 @@
   "label.yesterday": "ម្សិលមិញ",
   "message.action-confirmation": "សសេរ {confirmation} នៅក្នុងប្រអប់ខាងក្រោមដើម្បីបញ្ជាក់។",
   "message.active-users": "មានអ្នកមើល {x} នាក់ ឥលូវនេះ",
-  "message.collected-data": "Collected data",
+  "message.collected-data": "ទិន្នន័យដែលបានប្រមូលទុក",
   "message.confirm-delete": "តើអ្នកប្រាកដថាចង់លុប {target} ទេ?",
   "message.confirm-leave": "តើអ្នកប្រាកដថាចង់ចាកចេញ {target} ទេ?",
   "message.confirm-remove": "តើអ្នកប្រាកដថាចង់លុប {target} ទេ?",
@@ -240,7 +240,7 @@
   "message.min-password-length": "តិចបំផុតដែលមានអក្សរ {n} តួអក្សរ",
   "message.new-version-available": "Version ថ្មីនៃ Umami {version} អាចប្រើប្រាស់បានហើយ!",
   "message.no-data-available": "មិនមានទិន្នន័យ។",
-  "message.no-event-data": "No event data is available.",
+  "message.no-event-data": "មិនមានទិន្នន័យព្រឹត្តិការណ៍ទេ។",
   "message.no-match-password": "ពាក្យសម្ងាត់មិនត្រូវគ្នាទេ។",
   "message.no-results-found": "មិនមានលទ្ធផល។",
   "message.no-team-websites": "ក្រុមនេះមិនមានគេហទំព័រទេ។",
@@ -252,7 +252,7 @@
   "message.reset-website-warning": "ស្ថិតិទាំងអស់សម្រាប់គេហទំព័រនេះនឹងត្រូវបានលុប ប៉ុន្តែកូដតាមដានរបស់អ្នកនឹងនៅដដែល។",
   "message.saved": "រក្សាទុកដោយជោគជ័យ។",
   "message.share-url": "នេះគឺជា URL ដែលអាចចែករំលែកជាសាធារណៈបានសម្រាប់ {target}។",
-  "message.team-already-member": "You are already a member of the team.",
+  "message.team-already-member": "អ្នកគឺជាសមាជិកនៃក្រុមរួចហើយ។",
   "message.team-not-found": "រកក្រុមមិនឃើញទេ។",
   "message.team-websites-info": "គេហទំព័រនេះអាចមើលបានតែសមាជិកក្រុមតែប៉ុណ្ណោះ",
   "message.tracking-code": "ដើម្បីតាមដានស្ថិតិសម្រាប់គេហទំព័រអ្នក សូមដាក់កូដខាងក្រោមទៅក្នុងផ្នែក <head>...</head> នៃ HTML របស់អ្នក។",
@@ -263,5 +263,5 @@
   "message.user-deleted": "អ្នកប្រើប្រាស់ត្រូវបានលុបចោល។",
   "message.viewed-page": "ទំព័រដែលបានមើល",
   "message.visitor-log": "អ្នកមើលពីប្រទេស {country} ប្រើប្រាស់កម្មវិធី {browser} លើឧបករណ៍ {os} {device}",
-  "message.visitors-dropped-off": "Visitors dropped off"
+  "message.visitors-dropped-off": "ចំនួនអ្នកទស្សនាធ្លាក់ចុះ"
 }

From eda5adfd79fe9c9d2656b0fcba09409a0945e388 Mon Sep 17 00:00:00 2001
From: Chris Heinz <chrisi.heinz@web.de>
Date: Sat, 13 Jul 2024 16:50:31 +0200
Subject: [PATCH 211/438] replace vh with dvh

---
 src/app/(main)/layout.module.css                | 1 +
 src/app/share/[...shareId]/SharePage.module.css | 1 +
 src/components/layout/Page.module.css           | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/app/(main)/layout.module.css b/src/app/(main)/layout.module.css
index 58c1cacf63..290c38a27c 100644
--- a/src/app/(main)/layout.module.css
+++ b/src/app/(main)/layout.module.css
@@ -17,5 +17,6 @@
   grid-row: 2 / 3;
   min-height: 0;
   height: calc(100vh - 60px);
+  height: calc(100dvh - 60px);
   overflow-y: auto;
 }
diff --git a/src/app/share/[...shareId]/SharePage.module.css b/src/app/share/[...shareId]/SharePage.module.css
index d985435c11..f6c68cf6a1 100644
--- a/src/app/share/[...shareId]/SharePage.module.css
+++ b/src/app/share/[...shareId]/SharePage.module.css
@@ -1,4 +1,5 @@
 .container {
   flex: 1;
   min-height: calc(100vh - 200px);
+  min-height: calc(100dvh - 200px);
 }
diff --git a/src/components/layout/Page.module.css b/src/components/layout/Page.module.css
index 52893157cf..3b9a4581b0 100644
--- a/src/components/layout/Page.module.css
+++ b/src/components/layout/Page.module.css
@@ -8,4 +8,5 @@
   margin: 0 auto;
   padding: 0 20px;
   min-height: calc(100vh - 60px);
+  min-height: calc(100dvh - 60px);
 }

From 4f113bc3ac67b136190098f68820e7be08257578 Mon Sep 17 00:00:00 2001
From: Chris Heinz <chrisi.heinz@web.de>
Date: Sun, 14 Jul 2024 12:16:52 +0200
Subject: [PATCH 212/438] fix website header wrapping and height

---
 .../(main)/websites/[websiteId]/WebsiteHeader.module.css | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/WebsiteHeader.module.css b/src/app/(main)/websites/[websiteId]/WebsiteHeader.module.css
index 3e58c8a3eb..90c3f5cb17 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteHeader.module.css
+++ b/src/app/(main)/websites/[websiteId]/WebsiteHeader.module.css
@@ -1,7 +1,9 @@
 .header {
-  display: grid;
-  grid-template-columns: 1fr max-content;
+  display: flex;
+  gap: 10px;
   align-items: center;
+  flex-wrap: wrap;
+  padding: 20px 0px;
 }
 
 .title {
@@ -12,7 +14,7 @@
   font-size: 24px;
   font-weight: 700;
   overflow: hidden;
-  height: 100px;
+  height: 60px;
 }
 
 .actions {
@@ -22,6 +24,7 @@
   justify-content: flex-end;
   gap: 30px;
   min-height: 0;
+  margin-left: auto;
 }
 
 .selected {

From 60d4d8db22d1ede650ee54768296e72962c88bee Mon Sep 17 00:00:00 2001
From: eagleon <outmyself@gmail.com>
Date: Mon, 15 Jul 2024 11:23:21 +0800
Subject: [PATCH 213/438] fix: Compatible with browsers that do not support
 ES2019

---
 src/tracker/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/tracker/index.js b/src/tracker/index.js
index 97bf3bb06a..90a73c432b 100644
--- a/src/tracker/index.js
+++ b/src/tracker/index.js
@@ -44,7 +44,7 @@
       if (result !== str) {
         return result;
       }
-    } catch {
+    } catch (e) {
       return str;
     }
 
@@ -55,7 +55,7 @@
     try {
       const { pathname, search } = new URL(url);
       url = pathname + search;
-    } catch {
+    } catch (e) {
       /* empty */
     }
     return excludeSearch ? url.split('?')[0] : url;
@@ -217,7 +217,7 @@
       const text = await res.text();
 
       return (cache = text);
-    } catch {
+    } catch (e) {
       /* empty */
     }
   };

From 5eead0e1c85bd6eebcfcabacd81a24d10d3b0eed Mon Sep 17 00:00:00 2001
From: Lena Emme <38376566+Feuerhamster@users.noreply.github.com>
Date: Tue, 16 Jul 2024 14:17:00 +0200
Subject: [PATCH 214/438] improve german translation

---
 src/lang/de-DE.json | 124 ++++++++++++++++++++++----------------------
 1 file changed, 62 insertions(+), 62 deletions(-)

diff --git a/src/lang/de-DE.json b/src/lang/de-DE.json
index aca4b863f9..4e6b112fea 100644
--- a/src/lang/de-DE.json
+++ b/src/lang/de-DE.json
@@ -4,19 +4,19 @@
   "label.activity-log": "Aktivitätsverlauf",
   "label.add": "Hinzufügen",
   "label.add-description": "Beschreibung hinzufügen",
-  "label.add-member": "Add member",
-  "label.add-step": "Add step",
+  "label.add-member": "Mitglied hinzufügen",
+  "label.add-step": "Schritt hinzufügen",
   "label.add-website": "Website hinzufügen",
   "label.admin": "Administrator",
   "label.after": "Nach",
   "label.all": "Alle",
   "label.all-time": "Gesamter Zeitraum",
-  "label.analytics": "Analytics",
+  "label.analytics": "Analysen",
   "label.average": "Durchschnitt",
   "label.back": "Zurück",
   "label.before": "Vor",
   "label.bounce-rate": "Absprungrate",
-  "label.breakdown": "Breakdown",
+  "label.breakdown": "Aufschlüsselung",
   "label.browser": "Browser",
   "label.browsers": "Browser",
   "label.cancel": "Abbrechen",
@@ -24,21 +24,21 @@
   "label.cities": "Städte",
   "label.city": "Stadt",
   "label.clear-all": "Alles löschen",
-  "label.compare": "Compare",
+  "label.compare": "Vergleichen",
   "label.confirm": "Bestätigen",
   "label.confirm-password": "Passwort wiederholen",
   "label.contains": "Enthält",
   "label.continue": "Weiter",
-  "label.count": "Count",
+  "label.count": "Anzahl",
   "label.countries": "Länder",
   "label.country": "Land",
-  "label.create": "Create",
+  "label.create": "Erstellen",
   "label.create-report": "Bericht erstellen",
   "label.create-team": "Team erstellen",
   "label.create-user": "Benutzer erstellen",
   "label.created": "Erstellt",
-  "label.created-by": "Created By",
-  "label.current": "Current",
+  "label.created-by": "Erstellt von",
+  "label.current": "Aktuell",
   "label.current-password": "Derzeitiges Passwort",
   "label.custom-range": "Benutzerdefinierter Bereich",
   "label.dashboard": "Übersicht",
@@ -48,7 +48,7 @@
   "label.day": "Tag",
   "label.default-date-range": "Voreingestellter Datumsbereich",
   "label.delete": "Löschen",
-  "label.delete-report": "Delete report",
+  "label.delete-report": "Bericht löschen",
   "label.delete-team": "Team löschen",
   "label.delete-user": "Benutzer löschen",
   "label.delete-website": "Website löschen",
@@ -60,17 +60,17 @@
   "label.dismiss": "Verwerfen",
   "label.does-not-contain": "Enthält nicht",
   "label.domain": "Domain",
-  "label.dropoff": "Dropoff",
+  "label.dropoff": "Absprung",
   "label.edit": "Bearbeiten",
   "label.edit-dashboard": "Dashboard bearbeiten",
-  "label.edit-member": "Edit member",
+  "label.edit-member": "Mitglied bearbeiten",
   "label.enable-share-url": "Freigabe-URL aktivieren",
-  "label.end-step": "End Step",
-  "label.entry": "Entry URL",
+  "label.end-step": "Schlussschritt",
+  "label.entry": "Eintrags-URL",
   "label.event": "Event",
   "label.event-data": "Eventdaten",
   "label.events": "Ereignisse",
-  "label.exit": "Exit URL",
+  "label.exit": "Ausgangs-URL",
   "label.false": "Falsch",
   "label.field": "Feld",
   "label.fields": "Felder",
@@ -79,46 +79,46 @@
   "label.filter-raw": "Rohdaten",
   "label.filters": "Filter",
   "label.funnel": "Funnel",
-  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
-  "label.goal": "Goal",
-  "label.goals": "Goals",
-  "label.goals-description": "Track your goals for pageviews and events.",
+  "label.funnel-description": "Verstehe die Konversions- und Abbruchrate der Nutzer.",
+  "label.goal": "Ziel",
+  "label.goals": "Ziele",
+  "label.goals-description": "Verfolgen Sie Ihre Ziele für Seitenaufrufe und Ereignisse.",
   "label.greater-than": "Größer als",
   "label.greater-than-equals": "Größer oder gleich",
   "label.host": "Host",
   "label.hosts": "Hosts",
-  "label.insights": "Insights",
-  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.insights": "Einblicke",
+  "label.insights-description": "Vertiefen Sie Ihre Daten mit Hilfe von Segmenten und Filtern.",
   "label.is": "Ist",
   "label.is-not": "Ist nicht",
   "label.is-not-set": "Ist nicht gesetzt",
   "label.is-set": "Ist gesetzt",
   "label.join": "Beitreten",
   "label.join-team": "Team beitreten",
-  "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey": "Reise",
+  "label.journey-description": "Verstehe, wie Nutzer auf der Webseite navigieren",
   "label.language": "Sprache",
   "label.languages": "Sprachen",
   "label.laptop": "Laptop",
-  "label.last-days": "Letzte {x} Tage",
-  "label.last-hours": "Letzte {x} Stunden",
-  "label.last-months": "Last {x} months",
+  "label.last-days": "Letzten {x} Tage",
+  "label.last-hours": "Letzten {x} Stunden",
+  "label.last-months": "Letzten {x} Monate",
   "label.leave": "Verlassen",
   "label.leave-team": "Team verlassen",
   "label.less-than": "Kleiner als",
   "label.less-than-equals": "Kleiner oder gleich",
   "label.login": "Anmelden",
   "label.logout": "Abmelden",
-  "label.manage": "Manage",
-  "label.manager": "Manager",
+  "label.manage": "Verwalten",
+  "label.manager": "Verwaltung",
   "label.max": "Max",
-  "label.member": "Member",
+  "label.member": "Mitglied",
   "label.members": "Mitglieder",
   "label.min": "Min",
   "label.mobile": "Handy",
   "label.more": "Mehr",
-  "label.my-account": "My account",
-  "label.my-websites": "Meine Websites",
+  "label.my-account": "Mein Account",
+  "label.my-websites": "Meine Webseiten",
   "label.name": "Name",
   "label.new-password": "Neues Passwort",
   "label.none": "Keine",
@@ -133,11 +133,11 @@
   "label.pages": "Seiten",
   "label.password": "Passwort",
   "label.powered-by": "Betrieben durch {name}",
-  "label.previous": "Previous",
-  "label.previous-period": "Previous period",
-  "label.previous-year": "Previous year",
+  "label.previous": "Vorheriges",
+  "label.previous-period": "Vorherige Periode",
+  "label.previous-year": "Vorheriges Jahr",
   "label.profile": "Profil",
-  "label.property": "Property",
+  "label.property": "Eigentum",
   "label.queries": "Abfragen",
   "label.query": "Abfrage",
   "label.query-parameters": "Abfrageparameter",
@@ -149,37 +149,37 @@
   "label.region": "Region",
   "label.regions": "Regionen",
   "label.remove": "Entfernen",
-  "label.remove-member": "Remove member",
+  "label.remove-member": "Mitglied entfernen",
   "label.reports": "Berichte",
   "label.required": "Erforderlich",
   "label.reset": "Zurücksetzen",
   "label.reset-website": "Statistik zurücksetzen",
-  "label.retention": "Retention",
-  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.retention": "Bewahrung",
+  "label.retention-description": "Messen Sie die Verweildauer auf Ihrer Website, indem Sie verfolgen, wie oft die Nutzer zurückkehren.",
   "label.role": "Rolle",
   "label.run-query": "Abfrage starten",
   "label.save": "Speichern",
   "label.screens": "Bildschirmauflösungen",
-  "label.search": "Search",
-  "label.select": "Select",
+  "label.search": "Suche",
+  "label.select": "Auswählen",
   "label.select-date": "Datum auswählen",
-  "label.select-role": "Select role",
-  "label.select-website": "Website auswählen",
+  "label.select-role": "Rolle auswählen",
+  "label.select-website": "Webseite auswählen",
   "label.sessions": "Sitzungen",
   "label.settings": "Einstellungen",
   "label.share-url": "Freigabe-URL",
   "label.single-day": "Ein Tag",
-  "label.start-step": "Start Step",
-  "label.steps": "Steps",
+  "label.start-step": "Startschritt",
+  "label.steps": "Schritte",
   "label.sum": "Summe",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-id": "Team-ID",
-  "label.team-manager": "Team manager",
+  "label.team-manager": "Team-Manager",
   "label.team-member": "Team-Mitglied",
   "label.team-name": "Name des Teams",
   "label.team-owner": "Team-Eigentümer",
-  "label.team-view-only": "Team view only",
+  "label.team-view-only": "Nur für Team sichtbar",
   "label.team-websites": "Team-Websites",
   "label.teams": "Teams",
   "label.theme": "Thema",
@@ -208,29 +208,29 @@
   "label.username": "Benutzername",
   "label.users": "Benutzer",
   "label.utm": "UTM",
-  "label.utm-description": "Track your campaigns through UTM parameters.",
+  "label.utm-description": "Tracke deine Kampagnen mit UTM parameterns.",
   "label.value": "Wert",
   "label.view": "Anzeigen",
   "label.view-details": "Details anzeigen",
   "label.view-only": "Nur ansehen",
   "label.views": "Aufrufe",
-  "label.views-per-visit": "Views per visit",
+  "label.views-per-visit": "Aufrufe pro Besuch",
   "label.visit-duration": "Durchschn. Besuchszeit",
   "label.visitors": "Besucher",
-  "label.visits": "Visits",
-  "label.website": "Website",
-  "label.website-id": "Website ID",
-  "label.websites": "Websites",
+  "label.visits": "Besuche",
+  "label.website": "Webseite",
+  "label.website-id": "Webseiten-ID",
+  "label.websites": "Webseiten",
   "label.window": "Fenster",
   "label.yesterday": "Gestern",
-  "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
+  "message.action-confirmation": "Schreibe {confirmation} in die Box zur bestätigung.",
   "message.active-users": "{x} {x, plural, one {aktiver Besucher} other {aktive Besucher}}",
-  "message.collected-data": "Collected data",
+  "message.collected-data": "Gesammelte Daten",
   "message.confirm-delete": "Sind Sie sich sicher, {target} zu löschen?",
   "message.confirm-leave": "Sind Sie sicher, dass die {target} verlassen möchten?",
-  "message.confirm-remove": "Are you sure you want to remove {target}?",
+  "message.confirm-remove": "Sind Sie sicher, {target} zu entfernen?",
   "message.confirm-reset": "Sind Sie sicher, dass Sie die Statistiken von {target} zurücksetzen wollen?",
-  "message.delete-team-warning": "Deleting a team will also delete all team websites.",
+  "message.delete-team-warning": "Ein Team zu löschen, wird auch alle Team-Webseiten löschen.",
   "message.delete-website-warning": "Alle zugehörigen Daten werden ebenfalls gelöscht.",
   "message.error": "Es ist ein Fehler aufgetreten.",
   "message.event-log": "{event} auf {url}",
@@ -256,12 +256,12 @@
   "message.team-not-found": "Team nicht gefunden.",
   "message.team-websites-info": "Websites können von jedem im Team eingesehen werden.",
   "message.tracking-code": "Tracking Code",
-  "message.transfer-team-website-to-user": "Transfer this website to your account?",
-  "message.transfer-user-website-to-team": "Select the team to transfer this website to.",
-  "message.transfer-website": "Transfer website ownership to your account or another team.",
-  "message.triggered-event": "Triggered event",
+  "message.transfer-team-website-to-user": "Diese Webseite zu deinem Account transferieren?",
+  "message.transfer-user-website-to-team": "Wähle ein Team aus, zu dem die Webseite transferiert werden soll.",
+  "message.transfer-website": "Übertrage die Eigentümerrechte zu deinem Account oder einem anderen Team.",
+  "message.triggered-event": "Ausgelöstes Event",
   "message.user-deleted": "Benutzer gelöscht.",
-  "message.viewed-page": "Viewed page",
+  "message.viewed-page": "Besuchte Seite",
   "message.visitor-log": "Besucher aus {country} benutzt {browser} auf {os} {device}",
-  "message.visitors-dropped-off": "Visitors dropped off"
+  "message.visitors-dropped-off": "Besucherverlust"
 }

From 3a4cefef7264e32a2721d08309bdc45caf52df0d Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Fri, 19 Jul 2024 11:20:18 -0700
Subject: [PATCH 215/438] update event/pageview metrics

---
 .../analytics/events/getEventMetrics.ts       | 14 +++++++++----
 .../analytics/pageviews/getPageviewMetrics.ts | 20 ++++++++++---------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/queries/analytics/events/getEventMetrics.ts b/src/queries/analytics/events/getEventMetrics.ts
index 32cccd3e85..d8818bbabf 100644
--- a/src/queries/analytics/events/getEventMetrics.ts
+++ b/src/queries/analytics/events/getEventMetrics.ts
@@ -51,17 +51,23 @@ async function clickhouseQuery(
     eventType: EVENT_TYPE.customEvent,
   });
 
+  const table = unit === 'hour' ? 'website_event_stats_hourly' : 'website_event_stats_daily';
+
   return rawQuery(
     `
     select
       event_name x,
       ${getDateQuery('created_at', unit, timezone)} t,
       count(*) y
-    from website_event
-    where website_id = {websiteId:UUID}
-      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
-      and event_type = {eventType:UInt32}
+    from (
+      select arrayJoin(event_name) as event_name,
+        created_at
+      from ${table} website_event
+      where website_id = {websiteId:UUID}
+        and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+        and event_type = {eventType:UInt32}
       ${filterQuery}
+    ) as g
     group by x, t
     order by t
     `,
diff --git a/src/queries/analytics/pageviews/getPageviewMetrics.ts b/src/queries/analytics/pageviews/getPageviewMetrics.ts
index 34d26d9dcd..f1c316d270 100644
--- a/src/queries/analytics/pageviews/getPageviewMetrics.ts
+++ b/src/queries/analytics/pageviews/getPageviewMetrics.ts
@@ -100,7 +100,7 @@ async function clickhouseQuery(
   let columnAgg = column;
   let excludeDomain = '';
   if (column === 'referrer_domain') {
-    excludeDomain = `and referrer_domain != {websiteDomain:String} and referrer_domain != ''`;
+    excludeDomain = `and t != {websiteDomain:String} and t != ''`;
   }
 
   if (type === 'entry') {
@@ -111,17 +111,19 @@ async function clickhouseQuery(
     columnAgg = `argMaxMerge(${column})`;
   }
 
-  const table = unit === 'hour' ? 'website_event_metric_hourly' : 'website_event_metric_daily';
+  const table = unit === 'hour' ? 'website_event_stats_hourly' : 'website_event_stats_daily';
 
   return rawQuery(
     `
-    select ${column} x, sum(views) y
-    from ${table} website_event
-    where website_id = {websiteId:UUID}
-      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
-      and event_type = {eventType:UInt32}
-      ${excludeDomain}
-      ${filterQuery}
+    select g.t as x,
+      count(*) as y
+    from (
+      select arrayJoin(${column}) as t
+      from ${table} website_event
+      where website_id = {websiteId:UUID}
+        and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+        and event_type = {eventType:UInt32}
+      ${filterQuery}) as g
     group by x
     order by y desc
     limit ${limit}

From 829a45b40e8f0cb5177b6d8e3342459b365f7e9d Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Mon, 22 Jul 2024 18:06:36 -0700
Subject: [PATCH 216/438] Added sessions table.

---
 package.json                                  |  6 +-
 .../(main)/reports/create/ReportTemplates.tsx |  6 ++
 .../sessions/SessionMetricsBar.tsx            |  5 ++
 .../[websiteId]/sessions/SessionsTable.tsx    | 20 +++--
 src/components/metrics/EventsChart.tsx        |  5 --
 yarn.lock                                     | 80 +++++++++----------
 6 files changed, 69 insertions(+), 53 deletions(-)
 create mode 100644 src/app/(main)/websites/[websiteId]/sessions/SessionMetricsBar.tsx

diff --git a/package.json b/package.json
index a7a3aba1e2..f14e552d50 100644
--- a/package.json
+++ b/package.json
@@ -64,9 +64,9 @@
     ".next/cache"
   ],
   "dependencies": {
-    "@clickhouse/client": "^1.2.0",
+    "@clickhouse/client": "^1.3.0",
     "@fontsource/inter": "^4.5.15",
-    "@prisma/client": "5.16.1",
+    "@prisma/client": "5.16.2",
     "@prisma/extension-read-replicas": "^0.3.0",
     "@react-spring/web": "^9.7.3",
     "@tanstack/react-query": "^5.28.6",
@@ -102,7 +102,7 @@
     "next-basics": "^0.39.0",
     "node-fetch": "^3.2.8",
     "npm-run-all": "^4.1.5",
-    "prisma": "5.16.1",
+    "prisma": "5.16.2",
     "react": "^18.2.0",
     "react-basics": "^0.123.0",
     "react-beautiful-dnd": "^13.1.0",
diff --git a/src/app/(main)/reports/create/ReportTemplates.tsx b/src/app/(main)/reports/create/ReportTemplates.tsx
index e37efc0367..2314f7d6a6 100644
--- a/src/app/(main)/reports/create/ReportTemplates.tsx
+++ b/src/app/(main)/reports/create/ReportTemplates.tsx
@@ -51,6 +51,12 @@ export function ReportTemplates({ showHeader = true }: { showHeader?: boolean })
       url: renderTeamUrl('/reports/journey'),
       icon: <Path />,
     },
+    {
+      title: formatMessage(labels.revenue),
+      description: formatMessage(labels.revenueDescription),
+      url: renderTeamUrl('/reports/revenue'),
+      icon: <Path />,
+    },
   ];
 
   return (
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionMetricsBar.tsx
new file mode 100644
index 0000000000..c4f21875d2
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionMetricsBar.tsx
@@ -0,0 +1,5 @@
+export function SessionMetricsBar({ websiteId }: { websiteId: string }) {
+  return <h1>{websiteId}</h1>;
+}
+
+export default SessionMetricsBar;
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
index 41c0fef353..d5ca439ad8 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
@@ -1,19 +1,29 @@
 import { GridColumn, GridTable, useBreakpoint } from 'react-basics';
-import { useMessages } from 'components/hooks';
+import { useFormat, useMessages } from 'components/hooks';
+import { formatDistanceToNow } from 'date-fns';
 
 export function SessionsTable({ data = [] }: { data: any[]; showDomain?: boolean }) {
   const { formatMessage, labels } = useMessages();
   const breakpoint = useBreakpoint();
+  const { formatValue } = useFormat();
 
   return (
     <GridTable data={data} cardMode={['xs', 'sm', 'md'].includes(breakpoint)}>
       <GridColumn name="id" label="ID" />
-      <GridColumn name="country" label={formatMessage(labels.country)} />
+      <GridColumn name="country" label={formatMessage(labels.country)}>
+        {row => formatValue(row.country, 'country')}
+      </GridColumn>
       <GridColumn name="city" label={formatMessage(labels.city)} />
-      <GridColumn name="browser" label={formatMessage(labels.browser)} />
+      <GridColumn name="browser" label={formatMessage(labels.browser)}>
+        {row => formatValue(row.browser, 'browser')}
+      </GridColumn>
       <GridColumn name="os" label={formatMessage(labels.os)} />
-      <GridColumn name="device" label={formatMessage(labels.device)} />
-      <GridColumn name="createdAt" label={formatMessage(labels.created)} />
+      <GridColumn name="device" label={formatMessage(labels.device)}>
+        {row => formatValue(row.device, 'device')}
+      </GridColumn>
+      <GridColumn name="createdAt" label={formatMessage(labels.created)}>
+        {row => formatDistanceToNow(new Date(row.createdAt))}
+      </GridColumn>
     </GridTable>
   );
 }
diff --git a/src/components/metrics/EventsChart.tsx b/src/components/metrics/EventsChart.tsx
index 842ae60568..36ec867233 100644
--- a/src/components/metrics/EventsChart.tsx
+++ b/src/components/metrics/EventsChart.tsx
@@ -1,5 +1,4 @@
 import { useMemo } from 'react';
-import { Loading } from 'react-basics';
 import { colord } from 'colord';
 import BarChart from 'components/charts/BarChart';
 import { getDateArray } from 'lib/date';
@@ -51,10 +50,6 @@ export function EventsChart({ websiteId, className }: EventsChartProps) {
     };
   }, [data, startDate, endDate, unit]);
 
-  if (isLoading) {
-    return <Loading icon="dots" />;
-  }
-
   return (
     <BarChart
       className={className}
diff --git a/yarn.lock b/yarn.lock
index 7944a0c6f0..1fe4013562 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1199,17 +1199,17 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@clickhouse/client-common@1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@clickhouse/client-common/-/client-common-1.2.0.tgz#8845d373a14c6076d59118a0cb58afad84687372"
-  integrity sha512-VfA/C/tVJ2eNe72CaQ7eXmai+yqFEvZjQZiNtvJoOMLP+Vtb6DzqH9nfkgsiHHMhUhhclvt2mFh6+euk1Ea5wA==
+"@clickhouse/client-common@1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@clickhouse/client-common/-/client-common-1.3.0.tgz#9fe4b88eedb233770832cb1c0794f4ad9fbec75c"
+  integrity sha512-fApbhu52WSQlBU0gMZQxd2akuWbI1c9BcWjIbDDgtNZX2OggrIB7a4oI845ZGXpeZCZDI9ZqtkXzbYQYS0Yqew==
 
-"@clickhouse/client@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@clickhouse/client/-/client-1.2.0.tgz#83aa3b69635e19c94a975ee7ec9a68843915b94b"
-  integrity sha512-zMp2EhMfp1IrFKr/NjDwNiLsf7nq68nW8lGKszwFe7Iglc6Z5PY9ZA9Hd0XqAk75Q1NmFrkGCP1r3JCM1Nm1Bw==
+"@clickhouse/client@^1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@clickhouse/client/-/client-1.3.0.tgz#298529b970a9ba2ae5e017258aaf6cf522cb2b51"
+  integrity sha512-baBiuwVpXg/DHCe9Y1pNf+tcE2ZalCAQqZsR9OhP7+01C3UqTjHeY4eYixNlpfZCb8c8R4GygdWJFbXF0aGklw==
   dependencies:
-    "@clickhouse/client-common" "1.2.0"
+    "@clickhouse/client-common" "1.3.0"
 
 "@colors/colors@1.5.0":
   version "1.5.0"
@@ -2082,51 +2082,51 @@
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
   integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
 
-"@prisma/client@5.16.1":
-  version "5.16.1"
-  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.16.1.tgz#65c5649b4701c097e7fa943c91a3140ce8bf053d"
-  integrity sha512-wM9SKQjF0qLxdnOZIVAIMKiz6Hu7vDt4FFAih85K1dk/Rr2mdahy6d3QP41K62N9O0DJJA//gUDA3Mp49xsKIg==
+"@prisma/client@5.16.2":
+  version "5.16.2"
+  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.16.2.tgz#21df4c092eac29dcc4431ebed8c92579ffc9d8bd"
+  integrity sha512-+1lmkhR9gHWcTC5oghm2ZKpWljyWdzfazCVlLKUWXVmwHSf52g81aZ8qb6Km5Bs025yBi7puLp3qSLEvktoUtw==
 
-"@prisma/debug@5.16.1":
-  version "5.16.1"
-  resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.16.1.tgz#4887a57a0973fb732a60c30dc48de97bf1eefd7e"
-  integrity sha512-JsNgZAg6BD9RInLSrg7ZYzo11N7cVvYArq3fHGSD89HSgtN0VDdjV6bib7YddbcO6snzjchTiLfjeTqBjtArVQ==
+"@prisma/debug@5.16.2":
+  version "5.16.2"
+  resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.16.2.tgz#bf774f4768a3d1634887e6964fcfe04576dc7496"
+  integrity sha512-ItzB4nR4O8eLzuJiuP3WwUJfoIvewMHqpGCad+64gvThcKEVOtaUza9AEJo2DPqAOa/AWkFyK54oM4WwHeew+A==
 
 "@prisma/engines-version@5.16.0-24.34ace0eb2704183d2c05b60b52fba5c43c13f303":
   version "5.16.0-24.34ace0eb2704183d2c05b60b52fba5c43c13f303"
   resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.16.0-24.34ace0eb2704183d2c05b60b52fba5c43c13f303.tgz#63ceebefb7daa1eb17f250cad75d35999a50ee1b"
   integrity sha512-HkT2WbfmFZ9WUPyuJHhkiADxazHg8Y4gByrTSVeb3OikP6tjQ7txtSUGu9OBOBH0C13dPKN2qqH12xKtHu/Hiw==
 
-"@prisma/engines@5.16.1":
-  version "5.16.1"
-  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.16.1.tgz#a14e5d08d34241ed1f1bb7d11ed44eacb37b6fc6"
-  integrity sha512-KkyF3eIUtBIyp5A/rJHCtwQO18OjpGgx18PzjyGcJDY/+vNgaVyuVd+TgwBgeq6NLdd1XMwRCI+58vinHsAdfA==
+"@prisma/engines@5.16.2":
+  version "5.16.2"
+  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.16.2.tgz#d624c816c25a5cbad7ca13c7842b71557b6020e0"
+  integrity sha512-qUxwMtrwoG3byd4PbX6T7EjHJ8AUhzTuwniOGkh/hIznBfcE2QQnGakyEq4VnwNuttMqvh/GgPFapHQ3lCuRHg==
   dependencies:
-    "@prisma/debug" "5.16.1"
+    "@prisma/debug" "5.16.2"
     "@prisma/engines-version" "5.16.0-24.34ace0eb2704183d2c05b60b52fba5c43c13f303"
-    "@prisma/fetch-engine" "5.16.1"
-    "@prisma/get-platform" "5.16.1"
+    "@prisma/fetch-engine" "5.16.2"
+    "@prisma/get-platform" "5.16.2"
 
 "@prisma/extension-read-replicas@^0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/@prisma/extension-read-replicas/-/extension-read-replicas-0.3.0.tgz#2842a7c928f957c1dd58a6256104797596d43426"
   integrity sha512-F9+rSmYday6GT2qjhJtkZcBOpLO5LtpvFcMGqrBDHf+78LEdSuxfFjOxYlNuqk4B+th62yxpbhfpmB9/Mca14Q==
 
-"@prisma/fetch-engine@5.16.1":
-  version "5.16.1"
-  resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.16.1.tgz#506a034eb23222af27ba635eb48c63df0ba7fc14"
-  integrity sha512-oOkjaPU1lhcA/Rvr4GVfd1NLJBwExgNBE36Ueq7dr71kTMwy++a3U3oLd2ZwrV9dj9xoP6LjCcky799D9nEt4w==
+"@prisma/fetch-engine@5.16.2":
+  version "5.16.2"
+  resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.16.2.tgz#e7e06cf246340e6ae06791f9133be275c5ee50e5"
+  integrity sha512-sq51lfHKfH2jjYSjBtMjP+AznFqOJzXpqmq6B9auWrlTJrMgZ7lPyhWUW7VU7LsQU48/TJ+DZeIz8s9bMYvcHg==
   dependencies:
-    "@prisma/debug" "5.16.1"
+    "@prisma/debug" "5.16.2"
     "@prisma/engines-version" "5.16.0-24.34ace0eb2704183d2c05b60b52fba5c43c13f303"
-    "@prisma/get-platform" "5.16.1"
+    "@prisma/get-platform" "5.16.2"
 
-"@prisma/get-platform@5.16.1":
-  version "5.16.1"
-  resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.16.1.tgz#613197c58acaafd5142d48a11f4df45a8f26a9e9"
-  integrity sha512-R4IKnWnMkR2nUAbU5gjrPehdQYUUd7RENFD2/D+xXTNhcqczp0N+WEGQ3ViyI3+6mtVcjjNIMdnUTNyu3GxIgA==
+"@prisma/get-platform@5.16.2":
+  version "5.16.2"
+  resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.16.2.tgz#f9b397ddf807b71411fd9d0b17374bc21e91cc40"
+  integrity sha512-cXiHPgNLNyj22vLouPVNegklpRL/iX2jxTeap5GRO3DmCoVyIHmJAV1CgUMUJhHlcol9yYy7EHvsnXTDJ/PKEA==
   dependencies:
-    "@prisma/debug" "5.16.1"
+    "@prisma/debug" "5.16.2"
 
 "@react-spring/animated@~9.7.3":
   version "9.7.3"
@@ -8726,12 +8726,12 @@ pretty-format@^29.0.0, pretty-format@^29.7.0:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
-prisma@5.16.1:
-  version "5.16.1"
-  resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.16.1.tgz#6dfd1e27e6534741326f4a231f04c16b3fbb7ba9"
-  integrity sha512-Z1Uqodk44diztImxALgJJfNl2Uisl9xDRvqybMKEBYJLNKNhDfAHf+ZIJbZyYiBhLMbKU9cYGdDVG5IIXEnL2Q==
+prisma@5.16.2:
+  version "5.16.2"
+  resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.16.2.tgz#f46f130550bc148e603d25e06e82263fa6ab68e8"
+  integrity sha512-rFV/xoBR2hBGGlu4LPLQd4U8WVA+tSAmYyFWGPRVfj+xg7N4kiZV4lSk38htSpF+/IuHKzlrbh4SFk8Z18cI8A==
   dependencies:
-    "@prisma/engines" "5.16.1"
+    "@prisma/engines" "5.16.2"
 
 process@^0.11.10:
   version "0.11.10"

From 5299e9f5797d159deb792e97abbeff9af539cd03 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 22 Jul 2024 21:30:06 -0700
Subject: [PATCH 217/438] resolve entry / exit queries

---
 db/clickhouse/schema.sql                      | 201 +++++++++++++++++-
 .../analytics/pageviews/getPageviewMetrics.ts |  18 +-
 2 files changed, 213 insertions(+), 6 deletions(-)

diff --git a/db/clickhouse/schema.sql b/db/clickhouse/schema.sql
index 53fba1fb76..e36ddf6121 100644
--- a/db/clickhouse/schema.sql
+++ b/db/clickhouse/schema.sql
@@ -66,4 +66,203 @@ CREATE TABLE umami.session_data
 )
     engine = MergeTree
         ORDER BY (website_id, session_id, data_key, created_at)
-        SETTINGS index_granularity = 8192;
\ No newline at end of file
+        SETTINGS index_granularity = 8192;
+
+-- stats hourly
+CREATE TABLE umami.website_event_stats_hourly
+(
+    website_id UUID,
+    session_id UUID,
+    visit_id UUID,
+    hostname LowCardinality(String),
+    browser LowCardinality(String),
+    os LowCardinality(String),
+    device LowCardinality(String),
+    country LowCardinality(String),
+    subdivision1 LowCardinality(String),
+    city String,
+    entry_url AggregateFunction(argMin, String, DateTime('UTC')),
+    exit_url AggregateFunction(argMax, String, DateTime('UTC')),
+    url_path SimpleAggregateFunction(groupArrayArray, Array(String)),
+    url_query SimpleAggregateFunction(groupArrayArray, Array(String)),
+    referrer_domain SimpleAggregateFunction(groupArrayArray, Array(String)),
+    page_title SimpleAggregateFunction(groupArrayArray, Array(String)),
+    event_type UInt32,
+    event_name SimpleAggregateFunction(groupArrayArray, Array(String)),
+    views SimpleAggregateFunction(sum, UInt64),
+    min_time SimpleAggregateFunction(min, DateTime('UTC')),
+    max_time SimpleAggregateFunction(max, DateTime('UTC')),
+    created_at Datetime('UTC')
+)
+ENGINE = AggregatingMergeTree
+PARTITION BY toYYYYMM(created_at)
+ORDER BY (
+    website_id,
+    toStartOfHour(created_at),
+    cityHash64(visit_id),
+    visit_id
+)
+SAMPLE BY cityHash64(visit_id)
+TTL created_at + INTERVAL 10 DAY;
+
+CREATE MATERIALIZED VIEW umami.website_event_stats_hourly_mv
+TO umami.website_event_stats_hourly
+AS
+SELECT
+    website_id,
+    session_id,
+    visit_id,
+    hostname,
+    browser,
+    os,
+    device,
+    country,
+    subdivision1,
+    city,
+    entry_url,
+    exit_url,
+    url_paths as url_path,
+    url_query,
+    referrer_domain,
+    page_title,
+    event_type,
+    event_name,
+    views,
+    min_time,
+    max_time,
+    timestamp as created_at
+FROM (SELECT
+    website_id,
+    session_id,
+    visit_id,
+    hostname,
+    browser,
+    os,
+    device,
+    country,
+    subdivision1,
+    city,
+    argMinState(url_path, created_at) entry_url,
+    argMaxState(url_path, created_at) exit_url,
+    arrayFilter(x -> x != '', groupArray(url_path)) as url_paths,
+    arrayFilter(x -> x != '', groupArray(url_query)) url_query,
+    arrayFilter(x -> x != '', groupArray(referrer_domain)) referrer_domain,
+    arrayFilter(x -> x != '', groupArray(page_title)) page_title,
+    event_type,
+    if(event_type = 2, groupArray(event_name), []) event_name,
+    sumIf(1, event_type = 1) views,
+    min(created_at) min_time,
+    max(created_at) max_time,
+    toStartOfHour(created_at) timestamp
+FROM umami.website_event
+GROUP BY website_id,
+    session_id,
+    visit_id,
+    hostname,
+    browser,
+    os,
+    device,
+    country,
+    subdivision1,
+    city,
+    event_type,
+    timestamp);
+
+-- stats daily
+CREATE TABLE umami.website_event_stats_daily
+(
+    website_id UUID,
+    session_id UUID,
+    visit_id UUID,
+    hostname LowCardinality(String),
+    browser LowCardinality(String),
+    os LowCardinality(String),
+    device LowCardinality(String),
+    country LowCardinality(String),
+    subdivision1 LowCardinality(String),
+    city String,
+    entry_url AggregateFunction(argMin, String, DateTime('UTC')),
+    exit_url AggregateFunction(argMax, String, DateTime('UTC')),
+    url_path SimpleAggregateFunction(groupArrayArray, Array(String)),
+    url_query SimpleAggregateFunction(groupArrayArray, Array(String)),
+    referrer_domain SimpleAggregateFunction(groupArrayArray, Array(String)),
+    page_title SimpleAggregateFunction(groupArrayArray, Array(String)),
+    event_type UInt32,
+    event_name SimpleAggregateFunction(groupArrayArray, Array(String)),
+    views SimpleAggregateFunction(sum, UInt64),
+    min_time SimpleAggregateFunction(min, DateTime('UTC')),
+    max_time SimpleAggregateFunction(max, DateTime('UTC')),
+    created_at Datetime('UTC')
+)
+ENGINE = AggregatingMergeTree
+PARTITION BY toYYYYMM(created_at)
+ORDER BY (
+    website_id,
+    toStartOfDay(created_at),
+    cityHash64(visit_id),
+    visit_id
+)
+SAMPLE BY cityHash64(visit_id);
+
+CREATE MATERIALIZED VIEW umami.website_event_stats_daily_mv
+TO umami.website_event_stats_daily
+AS
+SELECT
+    website_id,
+    session_id,
+    visit_id,
+    hostname,
+    browser,
+    os,
+    device,
+    country,
+    subdivision1,
+    city,
+    entry_url,
+    exit_url,
+    url_paths as url_path,
+    url_query,
+    referrer_domain,
+    page_title,
+    event_type,
+    event_name,
+    views,
+    min_time,
+    max_time,
+    timestamp as created_at
+FROM (SELECT
+    website_id,
+    session_id,
+    visit_id,
+    hostname,
+    browser,
+    os,
+    device,
+    country,
+    subdivision1,
+    city,
+    argMinState(url_path, created_at) entry_url,
+    argMaxState(url_path, created_at) exit_url,
+    arrayFilter(x -> x != '', groupArray(url_path)) as url_paths,
+    arrayFilter(x -> x != '', groupArray(url_query)) url_query,
+    arrayFilter(x -> x != '', groupArray(referrer_domain)) referrer_domain,
+    arrayFilter(x -> x != '', groupArray(page_title)) page_title,
+    event_type,
+    if(event_type = 2, groupArray(event_name), []) event_name,
+    sumIf(1, event_type = 1) views,
+    min(created_at) min_time,
+    max(created_at) max_time,
+    toStartOfDay(created_at) timestamp
+FROM umami.website_event
+GROUP BY website_id,
+    session_id,
+    visit_id,
+    hostname,
+    browser,
+    os,
+    device,
+    country,
+    subdivision1,
+    city,
+    event_type,
+    timestamp);        
\ No newline at end of file
diff --git a/src/queries/analytics/pageviews/getPageviewMetrics.ts b/src/queries/analytics/pageviews/getPageviewMetrics.ts
index d47af35f53..e9598cca6e 100644
--- a/src/queries/analytics/pageviews/getPageviewMetrics.ts
+++ b/src/queries/analytics/pageviews/getPageviewMetrics.ts
@@ -100,18 +100,25 @@ async function clickhouseQuery(
     eventType: column === 'event_name' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
   });
 
-  let columnAgg = column;
   let excludeDomain = '';
+  let groupByQuery = '';
+
   if (column === 'referrer_domain') {
     excludeDomain = `and t != {websiteDomain:String} and t != ''`;
   }
 
+  let columnQuery = `arrayJoin(${column})`;
+
   if (type === 'entry') {
-    columnAgg = `argMinMerge(${column})`;
+    columnQuery = `visit_id x, argMinMerge(${column})`;
   }
 
   if (type === 'exit') {
-    columnAgg = `argMaxMerge(${column})`;
+    columnQuery = `visit_id x, argMaxMerge(${column})`;
+  }
+
+  if (type === 'entry' || type === 'exit') {
+    groupByQuery = 'group by x';
   }
 
   const table = unit === 'hour' ? 'website_event_stats_hourly' : 'website_event_stats_daily';
@@ -121,12 +128,13 @@ async function clickhouseQuery(
     select g.t as x,
       count(*) as y
     from (
-      select arrayJoin(${column}) as t
+      select ${columnQuery} as t
       from ${table} website_event
       where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
         and event_type = {eventType:UInt32}
-      ${filterQuery}) as g
+      ${filterQuery}
+      ${groupByQuery}) as g
     group by x
     order by y desc
     limit ${limit}

From 6d0ae13bc82bd13cdeb143b71aa1d163c7058057 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 22 Jul 2024 22:13:04 -0700
Subject: [PATCH 218/438] add back exclude domain logic

---
 src/queries/analytics/pageviews/getPageviewMetrics.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/queries/analytics/pageviews/getPageviewMetrics.ts b/src/queries/analytics/pageviews/getPageviewMetrics.ts
index e9598cca6e..d66ec6aa7a 100644
--- a/src/queries/analytics/pageviews/getPageviewMetrics.ts
+++ b/src/queries/analytics/pageviews/getPageviewMetrics.ts
@@ -133,7 +133,8 @@ async function clickhouseQuery(
       where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
         and event_type = {eventType:UInt32}
-      ${filterQuery}
+        ${excludeDomain}
+        ${filterQuery}
       ${groupByQuery}) as g
     group by x
     order by y desc

From 7ec845db36134e3f7b80abb1d3b0339b41e11ad3 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 22 Jul 2024 23:16:57 -0700
Subject: [PATCH 219/438] fix undefined datasets

---
 src/components/charts/Chart.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/charts/Chart.tsx b/src/components/charts/Chart.tsx
index 6ba601597f..926defaf9e 100644
--- a/src/components/charts/Chart.tsx
+++ b/src/components/charts/Chart.tsx
@@ -79,7 +79,7 @@ export function Chart({
   };
 
   const updateChart = (data: any) => {
-    if (data.datasets.length === chart.current.data.datasets.length) {
+    if ((data?.datasets?.length || 0) === chart.current.data.datasets.length) {
       chart.current.data.datasets.forEach((dataset: { data: any }, index: string | number) => {
         if (data?.datasets[index]) {
           dataset.data = data?.datasets[index]?.data;

From 9f3138e9b450dec8ab58e3b88b3409dece339542 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Israel=20Ortiz=20de=20Z=C3=A1rate?= <69572@hubbell.com>
Date: Tue, 23 Jul 2024 17:26:03 +0200
Subject: [PATCH 220/438] Update translations and fix typos

---
 public/intl/messages/am-ET.json |  2 +-
 public/intl/messages/ar-SA.json |  2 +-
 public/intl/messages/be-BY.json |  2 +-
 public/intl/messages/bg-BG.json |  2 +-
 public/intl/messages/bn-BD.json |  2 +-
 public/intl/messages/bs-BA.json |  2 +-
 public/intl/messages/ca-ES.json |  2 +-
 public/intl/messages/cs-CZ.json |  2 +-
 public/intl/messages/da-DK.json |  2 +-
 public/intl/messages/de-CH.json |  2 +-
 public/intl/messages/de-DE.json |  2 +-
 public/intl/messages/el-GR.json |  2 +-
 public/intl/messages/en-GB.json |  2 +-
 public/intl/messages/en-US.json |  2 +-
 public/intl/messages/es-ES.json |  2 +-
 public/intl/messages/fa-IR.json |  2 +-
 public/intl/messages/fi-FI.json |  2 +-
 public/intl/messages/fo-FO.json |  2 +-
 public/intl/messages/fr-FR.json |  2 +-
 public/intl/messages/ga-ES.json |  2 +-
 public/intl/messages/he-IL.json |  2 +-
 public/intl/messages/hi-IN.json |  2 +-
 public/intl/messages/hr-HR.json |  2 +-
 public/intl/messages/hu-HU.json |  2 +-
 public/intl/messages/id-ID.json |  2 +-
 public/intl/messages/it-IT.json |  2 +-
 public/intl/messages/ja-JP.json |  2 +-
 public/intl/messages/km-KH.json |  2 +-
 public/intl/messages/ko-KR.json |  2 +-
 public/intl/messages/lt-LT.json |  2 +-
 public/intl/messages/mn-MN.json |  2 +-
 public/intl/messages/ms-MY.json |  2 +-
 public/intl/messages/my-MM.json |  2 +-
 public/intl/messages/nb-NO.json |  2 +-
 public/intl/messages/nl-NL.json |  2 +-
 public/intl/messages/pl-PL.json |  2 +-
 public/intl/messages/pt-BR.json |  2 +-
 public/intl/messages/pt-PT.json |  2 +-
 public/intl/messages/ro-RO.json |  2 +-
 public/intl/messages/ru-RU.json |  2 +-
 public/intl/messages/si-LK.json |  2 +-
 public/intl/messages/sk-SK.json |  2 +-
 public/intl/messages/sl-SI.json |  2 +-
 public/intl/messages/sv-SE.json |  2 +-
 public/intl/messages/ta-IN.json |  2 +-
 public/intl/messages/th-TH.json |  2 +-
 public/intl/messages/tr-TR.json |  2 +-
 public/intl/messages/uk-UA.json |  2 +-
 public/intl/messages/ur-PK.json |  2 +-
 public/intl/messages/vi-VN.json |  2 +-
 public/intl/messages/zh-CN.json |  2 +-
 public/intl/messages/zh-TW.json |  2 +-
 src/components/messages.ts      |  2 +-
 src/lang/am-ET.json             |  2 +-
 src/lang/ar-SA.json             |  2 +-
 src/lang/be-BY.json             |  2 +-
 src/lang/bg-BG.json             |  2 +-
 src/lang/bn-BD.json             |  2 +-
 src/lang/bs-BA.json             |  2 +-
 src/lang/ca-ES.json             |  2 +-
 src/lang/cs-CZ.json             |  2 +-
 src/lang/da-DK.json             |  2 +-
 src/lang/de-CH.json             |  2 +-
 src/lang/de-DE.json             |  2 +-
 src/lang/el-GR.json             |  2 +-
 src/lang/en-GB.json             |  2 +-
 src/lang/en-US.json             |  2 +-
 src/lang/es-ES.json             | 66 ++++++++++++++++-----------------
 src/lang/fa-IR.json             |  2 +-
 src/lang/fi-FI.json             |  2 +-
 src/lang/fo-FO.json             |  2 +-
 src/lang/fr-FR.json             |  2 +-
 src/lang/ga-ES.json             |  2 +-
 src/lang/he-IL.json             |  2 +-
 src/lang/hi-IN.json             |  2 +-
 src/lang/hr-HR.json             |  2 +-
 src/lang/hu-HU.json             |  2 +-
 src/lang/id-ID.json             |  2 +-
 src/lang/it-IT.json             |  2 +-
 src/lang/ja-JP.json             |  2 +-
 src/lang/km-KH.json             |  2 +-
 src/lang/lt-LT.json             |  2 +-
 src/lang/mn-MN.json             |  2 +-
 src/lang/ms-MY.json             |  2 +-
 src/lang/my-MM.json             |  2 +-
 src/lang/nb-NO.json             |  2 +-
 src/lang/nl-NL.json             |  2 +-
 src/lang/pl-PL.json             |  2 +-
 src/lang/pt-BR.json             |  2 +-
 src/lang/pt-PT.json             |  2 +-
 src/lang/ro-RO.json             |  2 +-
 src/lang/ru-RU.json             |  2 +-
 src/lang/si-LK.json             |  2 +-
 src/lang/sk-SK.json             |  2 +-
 src/lang/sl-SI.json             |  2 +-
 src/lang/sv-SE.json             |  2 +-
 src/lang/ta-IN.json             |  2 +-
 src/lang/th-TH.json             |  2 +-
 src/lang/tr-TR.json             |  2 +-
 src/lang/uk-UA.json             |  2 +-
 src/lang/ur-PK.json             |  2 +-
 src/lang/vi-VN.json             |  2 +-
 src/lang/zh-CN.json             |  2 +-
 src/lang/zh-TW.json             |  2 +-
 104 files changed, 136 insertions(+), 136 deletions(-)

diff --git a/public/intl/messages/am-ET.json b/public/intl/messages/am-ET.json
index 6565c98b20..65427a024d 100644
--- a/public/intl/messages/am-ET.json
+++ b/public/intl/messages/am-ET.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/ar-SA.json b/public/intl/messages/ar-SA.json
index 721584d5a1..d6a1855e1f 100644
--- a/public/intl/messages/ar-SA.json
+++ b/public/intl/messages/ar-SA.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/be-BY.json b/public/intl/messages/be-BY.json
index 9af4e89523..e6afc2ca85 100644
--- a/public/intl/messages/be-BY.json
+++ b/public/intl/messages/be-BY.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/bg-BG.json b/public/intl/messages/bg-BG.json
index bf5f15dcd5..e970ec52e5 100644
--- a/public/intl/messages/bg-BG.json
+++ b/public/intl/messages/bg-BG.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/bn-BD.json b/public/intl/messages/bn-BD.json
index 827271e3b6..31e04cfa49 100644
--- a/public/intl/messages/bn-BD.json
+++ b/public/intl/messages/bn-BD.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/bs-BA.json b/public/intl/messages/bs-BA.json
index f3edb77352..3b5c10ff53 100644
--- a/public/intl/messages/bs-BA.json
+++ b/public/intl/messages/bs-BA.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/ca-ES.json b/public/intl/messages/ca-ES.json
index f9b63535f0..94c7d3d41f 100644
--- a/public/intl/messages/ca-ES.json
+++ b/public/intl/messages/ca-ES.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/cs-CZ.json b/public/intl/messages/cs-CZ.json
index a2500688a0..eaef42457d 100644
--- a/public/intl/messages/cs-CZ.json
+++ b/public/intl/messages/cs-CZ.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/da-DK.json b/public/intl/messages/da-DK.json
index d9a6903f80..aac48bbc9b 100644
--- a/public/intl/messages/da-DK.json
+++ b/public/intl/messages/da-DK.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/de-CH.json b/public/intl/messages/de-CH.json
index 32d3b4434c..0d06a0e03e 100644
--- a/public/intl/messages/de-CH.json
+++ b/public/intl/messages/de-CH.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/de-DE.json b/public/intl/messages/de-DE.json
index 9a9b6d14f7..2482b208b5 100644
--- a/public/intl/messages/de-DE.json
+++ b/public/intl/messages/de-DE.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/el-GR.json b/public/intl/messages/el-GR.json
index f44bd026a0..af0f11be3e 100644
--- a/public/intl/messages/el-GR.json
+++ b/public/intl/messages/el-GR.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/en-GB.json b/public/intl/messages/en-GB.json
index efb8f1be4d..38a7857ccb 100644
--- a/public/intl/messages/en-GB.json
+++ b/public/intl/messages/en-GB.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/en-US.json b/public/intl/messages/en-US.json
index bf911728a8..52b968ddf1 100644
--- a/public/intl/messages/en-US.json
+++ b/public/intl/messages/en-US.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/es-ES.json b/public/intl/messages/es-ES.json
index 40ddded568..496fabc664 100644
--- a/public/intl/messages/es-ES.json
+++ b/public/intl/messages/es-ES.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/fa-IR.json b/public/intl/messages/fa-IR.json
index cb10df4b1e..d5408e6458 100644
--- a/public/intl/messages/fa-IR.json
+++ b/public/intl/messages/fa-IR.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/fi-FI.json b/public/intl/messages/fi-FI.json
index e43a185500..0af4dc6f4f 100644
--- a/public/intl/messages/fi-FI.json
+++ b/public/intl/messages/fi-FI.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/fo-FO.json b/public/intl/messages/fo-FO.json
index 1b2d4f0721..c9df65e1e2 100644
--- a/public/intl/messages/fo-FO.json
+++ b/public/intl/messages/fo-FO.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/fr-FR.json b/public/intl/messages/fr-FR.json
index 44fd708bee..bc4c51bb3f 100644
--- a/public/intl/messages/fr-FR.json
+++ b/public/intl/messages/fr-FR.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/ga-ES.json b/public/intl/messages/ga-ES.json
index 690083ae05..7e182d73c7 100644
--- a/public/intl/messages/ga-ES.json
+++ b/public/intl/messages/ga-ES.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/he-IL.json b/public/intl/messages/he-IL.json
index 740dfffaa5..ee8599f349 100644
--- a/public/intl/messages/he-IL.json
+++ b/public/intl/messages/he-IL.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/hi-IN.json b/public/intl/messages/hi-IN.json
index 2c178669b5..5fdffe3755 100644
--- a/public/intl/messages/hi-IN.json
+++ b/public/intl/messages/hi-IN.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/hr-HR.json b/public/intl/messages/hr-HR.json
index 974bdebd71..87f37e73ad 100644
--- a/public/intl/messages/hr-HR.json
+++ b/public/intl/messages/hr-HR.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/hu-HU.json b/public/intl/messages/hu-HU.json
index 227ef208a0..2cc464e990 100644
--- a/public/intl/messages/hu-HU.json
+++ b/public/intl/messages/hu-HU.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/id-ID.json b/public/intl/messages/id-ID.json
index dbe78a5018..8123d03b3a 100644
--- a/public/intl/messages/id-ID.json
+++ b/public/intl/messages/id-ID.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/it-IT.json b/public/intl/messages/it-IT.json
index 21b70650dc..d755b277a6 100644
--- a/public/intl/messages/it-IT.json
+++ b/public/intl/messages/it-IT.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/ja-JP.json b/public/intl/messages/ja-JP.json
index c11311c455..b2bc66a09a 100644
--- a/public/intl/messages/ja-JP.json
+++ b/public/intl/messages/ja-JP.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/km-KH.json b/public/intl/messages/km-KH.json
index d8f7d50123..841dabdd33 100644
--- a/public/intl/messages/km-KH.json
+++ b/public/intl/messages/km-KH.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/ko-KR.json b/public/intl/messages/ko-KR.json
index da196a3c96..b2213cd84a 100644
--- a/public/intl/messages/ko-KR.json
+++ b/public/intl/messages/ko-KR.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/lt-LT.json b/public/intl/messages/lt-LT.json
index 891aed6ffa..e6c6cd1857 100644
--- a/public/intl/messages/lt-LT.json
+++ b/public/intl/messages/lt-LT.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/mn-MN.json b/public/intl/messages/mn-MN.json
index b11d88c12e..d9461929e1 100644
--- a/public/intl/messages/mn-MN.json
+++ b/public/intl/messages/mn-MN.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/ms-MY.json b/public/intl/messages/ms-MY.json
index 996af333db..8f47f3cd7a 100644
--- a/public/intl/messages/ms-MY.json
+++ b/public/intl/messages/ms-MY.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/my-MM.json b/public/intl/messages/my-MM.json
index 34f83c029f..9451a0febb 100644
--- a/public/intl/messages/my-MM.json
+++ b/public/intl/messages/my-MM.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/nb-NO.json b/public/intl/messages/nb-NO.json
index eeb648c482..3e73b45ee8 100644
--- a/public/intl/messages/nb-NO.json
+++ b/public/intl/messages/nb-NO.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/nl-NL.json b/public/intl/messages/nl-NL.json
index 16f2de07f9..a186de8625 100644
--- a/public/intl/messages/nl-NL.json
+++ b/public/intl/messages/nl-NL.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/pl-PL.json b/public/intl/messages/pl-PL.json
index 29e99d4fe6..608c0b3a80 100644
--- a/public/intl/messages/pl-PL.json
+++ b/public/intl/messages/pl-PL.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/pt-BR.json b/public/intl/messages/pt-BR.json
index 149af775da..ae5b0de4ba 100644
--- a/public/intl/messages/pt-BR.json
+++ b/public/intl/messages/pt-BR.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/pt-PT.json b/public/intl/messages/pt-PT.json
index 340ebb8852..02704e9e0f 100644
--- a/public/intl/messages/pt-PT.json
+++ b/public/intl/messages/pt-PT.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/ro-RO.json b/public/intl/messages/ro-RO.json
index 67d0929bcf..311199cf39 100644
--- a/public/intl/messages/ro-RO.json
+++ b/public/intl/messages/ro-RO.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/ru-RU.json b/public/intl/messages/ru-RU.json
index 1d0a86a1e7..30974dd64e 100644
--- a/public/intl/messages/ru-RU.json
+++ b/public/intl/messages/ru-RU.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/si-LK.json b/public/intl/messages/si-LK.json
index d7cfd7bf43..e6b06c6ba7 100644
--- a/public/intl/messages/si-LK.json
+++ b/public/intl/messages/si-LK.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/sk-SK.json b/public/intl/messages/sk-SK.json
index 2be1f01521..738ead435d 100644
--- a/public/intl/messages/sk-SK.json
+++ b/public/intl/messages/sk-SK.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/sl-SI.json b/public/intl/messages/sl-SI.json
index 83c383c1aa..67f65ad407 100644
--- a/public/intl/messages/sl-SI.json
+++ b/public/intl/messages/sl-SI.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/sv-SE.json b/public/intl/messages/sv-SE.json
index a6336a3044..c2b2c5e06f 100644
--- a/public/intl/messages/sv-SE.json
+++ b/public/intl/messages/sv-SE.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/ta-IN.json b/public/intl/messages/ta-IN.json
index 4afcb8db74..13ab67980f 100644
--- a/public/intl/messages/ta-IN.json
+++ b/public/intl/messages/ta-IN.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/th-TH.json b/public/intl/messages/th-TH.json
index 32d5e677d2..43158951dc 100644
--- a/public/intl/messages/th-TH.json
+++ b/public/intl/messages/th-TH.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/tr-TR.json b/public/intl/messages/tr-TR.json
index ac49dd47d5..1edfdbbc4e 100644
--- a/public/intl/messages/tr-TR.json
+++ b/public/intl/messages/tr-TR.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/uk-UA.json b/public/intl/messages/uk-UA.json
index 6ea471a6b3..33579a3373 100644
--- a/public/intl/messages/uk-UA.json
+++ b/public/intl/messages/uk-UA.json
@@ -566,7 +566,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/ur-PK.json b/public/intl/messages/ur-PK.json
index 18fce7ebb7..9d3c932b6c 100644
--- a/public/intl/messages/ur-PK.json
+++ b/public/intl/messages/ur-PK.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/vi-VN.json b/public/intl/messages/vi-VN.json
index 50409fab26..424d30a691 100644
--- a/public/intl/messages/vi-VN.json
+++ b/public/intl/messages/vi-VN.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/zh-CN.json b/public/intl/messages/zh-CN.json
index e66a8eb158..c8852041ab 100644
--- a/public/intl/messages/zh-CN.json
+++ b/public/intl/messages/zh-CN.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/public/intl/messages/zh-TW.json b/public/intl/messages/zh-TW.json
index d6514ab4df..37c490d7c4 100644
--- a/public/intl/messages/zh-TW.json
+++ b/public/intl/messages/zh-TW.json
@@ -584,7 +584,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users nagivate through your website."
+      "value": "Understand how users navigate through your website."
     }
   ],
   "label.language": [
diff --git a/src/components/messages.ts b/src/components/messages.ts
index fa515c665f..6609076235 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -265,7 +265,7 @@ export const labels = defineMessages({
   journey: { id: 'label.journey', defaultMessage: 'Journey' },
   journeyDescription: {
     id: 'label.journey-description',
-    defaultMessage: 'Understand how users nagivate through your website.',
+    defaultMessage: 'Understand how users navigate through your website.',
   },
   compare: { id: 'label.compare', defaultMessage: 'Compare' },
   current: { id: 'label.current', defaultMessage: 'Current' },
diff --git a/src/lang/am-ET.json b/src/lang/am-ET.json
index 323fe4e88b..7c533031ab 100644
--- a/src/lang/am-ET.json
+++ b/src/lang/am-ET.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "Laptop",
diff --git a/src/lang/ar-SA.json b/src/lang/ar-SA.json
index a9fd02cfa4..f764f29e0a 100644
--- a/src/lang/ar-SA.json
+++ b/src/lang/ar-SA.json
@@ -96,7 +96,7 @@
   "label.join": "انضم",
   "label.join-team": "انضم للفريق",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "اللغة",
   "label.languages": "اللغات",
   "label.laptop": "لابتوب",
diff --git a/src/lang/be-BY.json b/src/lang/be-BY.json
index 3a4a033581..53533023fd 100644
--- a/src/lang/be-BY.json
+++ b/src/lang/be-BY.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Мова",
   "label.languages": "Мовы",
   "label.laptop": "Ноўтбук",
diff --git a/src/lang/bg-BG.json b/src/lang/bg-BG.json
index 9b22b466f4..5095b38799 100644
--- a/src/lang/bg-BG.json
+++ b/src/lang/bg-BG.json
@@ -96,7 +96,7 @@
   "label.join": "Присъедини се",
   "label.join-team": "Присъедини се към екип",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Език",
   "label.languages": "Езици",
   "label.laptop": "Лаптоп",
diff --git a/src/lang/bn-BD.json b/src/lang/bn-BD.json
index 43b41420c8..18eb1d896e 100644
--- a/src/lang/bn-BD.json
+++ b/src/lang/bn-BD.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "ভাষা",
   "label.languages": "ভাষা",
   "label.laptop": "ল্যাপটপ",
diff --git a/src/lang/bs-BA.json b/src/lang/bs-BA.json
index 04fb89ee4b..000af0dc20 100644
--- a/src/lang/bs-BA.json
+++ b/src/lang/bs-BA.json
@@ -96,7 +96,7 @@
   "label.join": "Učlani se",
   "label.join-team": "Učlani se u tim",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Jezik",
   "label.languages": "Jezici",
   "label.laptop": "Laptop",
diff --git a/src/lang/ca-ES.json b/src/lang/ca-ES.json
index 5824492c3e..d70dd2321b 100644
--- a/src/lang/ca-ES.json
+++ b/src/lang/ca-ES.json
@@ -96,7 +96,7 @@
   "label.join": "Unir",
   "label.join-team": "Unir-se al equip",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Idioma",
   "label.languages": "Idiomes",
   "label.laptop": "Portàtil",
diff --git a/src/lang/cs-CZ.json b/src/lang/cs-CZ.json
index 9c6d3ba197..3a57f6b28c 100644
--- a/src/lang/cs-CZ.json
+++ b/src/lang/cs-CZ.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "Přenosný počítač",
diff --git a/src/lang/da-DK.json b/src/lang/da-DK.json
index a0cbe5e650..715df99e21 100644
--- a/src/lang/da-DK.json
+++ b/src/lang/da-DK.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Sprog",
   "label.languages": "Sprog",
   "label.laptop": "Laptop",
diff --git a/src/lang/de-CH.json b/src/lang/de-CH.json
index bdd37cdc8d..6891480fa9 100644
--- a/src/lang/de-CH.json
+++ b/src/lang/de-CH.json
@@ -96,7 +96,7 @@
   "label.join": "Biträte",
   "label.join-team": "Team biträte",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Sprach",
   "label.languages": "Sprache",
   "label.laptop": "Laptop",
diff --git a/src/lang/de-DE.json b/src/lang/de-DE.json
index aca4b863f9..10b633263f 100644
--- a/src/lang/de-DE.json
+++ b/src/lang/de-DE.json
@@ -96,7 +96,7 @@
   "label.join": "Beitreten",
   "label.join-team": "Team beitreten",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Sprache",
   "label.languages": "Sprachen",
   "label.laptop": "Laptop",
diff --git a/src/lang/el-GR.json b/src/lang/el-GR.json
index 8155b97af7..ceb0812bdd 100644
--- a/src/lang/el-GR.json
+++ b/src/lang/el-GR.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "Λάπτοπ",
diff --git a/src/lang/en-GB.json b/src/lang/en-GB.json
index aeefe43997..9bb61811b4 100644
--- a/src/lang/en-GB.json
+++ b/src/lang/en-GB.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "Laptop",
diff --git a/src/lang/en-US.json b/src/lang/en-US.json
index 7487e220a2..e895036cc1 100644
--- a/src/lang/en-US.json
+++ b/src/lang/en-US.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "Laptop",
diff --git a/src/lang/es-ES.json b/src/lang/es-ES.json
index bdcb3e0ad0..532e4d20c9 100644
--- a/src/lang/es-ES.json
+++ b/src/lang/es-ES.json
@@ -5,7 +5,7 @@
   "label.add": "Añadir",
   "label.add-description": "Añadir descripción",
   "label.add-member": "Añadir miembro",
-  "label.add-step": "Add step",
+  "label.add-step": "Añadir paso",
   "label.add-website": "Nuevo sitio web",
   "label.admin": "Administrador",
   "label.after": "Después",
@@ -24,12 +24,12 @@
   "label.cities": "Ciudades",
   "label.city": "Ciudad",
   "label.clear-all": "Limpiar todo",
-  "label.compare": "Compare",
+  "label.compare": "Comparar",
   "label.confirm": "Confirmar",
   "label.confirm-password": "Confirmar contraseña",
   "label.contains": "Contiene",
   "label.continue": "Continuar",
-  "label.count": "Count",
+  "label.count": "Contar",
   "label.countries": "Países",
   "label.country": "País",
   "label.create": "Crear",
@@ -37,8 +37,8 @@
   "label.create-team": "Crear equipo",
   "label.create-user": "Crear usuario",
   "label.created": "Creado",
-  "label.created-by": "Created By",
-  "label.current": "Current",
+  "label.created-by": "Creado por",
+  "label.current": "Actual",
   "label.current-password": "Contraseña actual",
   "label.custom-range": "Intervalo personalizado",
   "label.dashboard": "Panel de control",
@@ -63,14 +63,14 @@
   "label.dropoff": "Abandono",
   "label.edit": "Editar",
   "label.edit-dashboard": "Editar panel",
-  "label.edit-member": "Edit member",
+  "label.edit-member": "Editar miembro",
   "label.enable-share-url": "Habilitar compartir URL",
-  "label.end-step": "End Step",
-  "label.entry": "Entry URL",
+  "label.end-step": "Paso final",
+  "label.entry": "URL de entrada",
   "label.event": "Evento",
   "label.event-data": "Datos de evento",
   "label.events": "Eventos",
-  "label.exit": "Exit URL",
+  "label.exit": "URL de salida",
   "label.false": "Falso",
   "label.field": "Campo",
   "label.fields": "Campos",
@@ -78,11 +78,11 @@
   "label.filter-combined": "Combinado",
   "label.filter-raw": "En crudo",
   "label.filters": "Filtros",
-  "label.funnel": "Funnel",
+  "label.funnel": "Embudo",
   "label.funnel-description": "Comprender conversión y abandono de usuarios.",
-  "label.goal": "Goal",
-  "label.goals": "Goals",
-  "label.goals-description": "Track your goals for pageviews and events.",
+  "label.goal": "Objetivo",
+  "label.goals": "Objetivos",
+  "label.goals-description": "Realice un seguimiento de sus objetivos de páginas vistas y eventos.",
   "label.greater-than": "Mayor que",
   "label.greater-than-equals": "Mayor que o igual a",
   "label.host": "Host",
@@ -95,14 +95,14 @@
   "label.is-set": "Está establecido",
   "label.join": "Unir",
   "label.join-team": "Unirse al equipo",
-  "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey": "Viaje",
+  "label.journey-description": "Comprenda cómo los usuarios navegan por su sitio web.",
   "label.language": "Idioma",
   "label.languages": "Idiomas",
   "label.laptop": "Portátil",
   "label.last-days": "Últimos {x} días",
   "label.last-hours": "Últimas {x} horas",
-  "label.last-months": "Last {x} months",
+  "label.last-months": "Últimos {x} meses",
   "label.leave": "Abandonar",
   "label.leave-team": "Abandonar equipo",
   "label.less-than": "Menor que",
@@ -111,10 +111,10 @@
   "label.logout": "Cerrar sesión",
   "label.manage": "Administrar",
   "label.manager": "Manager",
-  "label.max": "Máx",
+  "label.max": "Max",
   "label.member": "Miembro",
   "label.members": "Miembros",
-  "label.min": "Mín",
+  "label.min": "Min",
   "label.mobile": "Móvil",
   "label.more": "Más",
   "label.my-account": "Mi cuenta",
@@ -133,11 +133,11 @@
   "label.pages": "Páginas",
   "label.password": "Contraseña",
   "label.powered-by": "Analíticas de {name}",
-  "label.previous": "Previous",
-  "label.previous-period": "Previous period",
-  "label.previous-year": "Previous year",
+  "label.previous": "Anterior",
+  "label.previous-period": "Periodo anterior",
+  "label.previous-year": "Año anterior",
   "label.profile": "Perfil",
-  "label.property": "Property",
+  "label.property": "Propiedad",
   "label.queries": "Consultas",
   "label.query": "Consulta",
   "label.query-parameters": "Parámetros de petición",
@@ -146,7 +146,7 @@
   "label.referrers": "Referido desde",
   "label.refresh": "Actualizar",
   "label.regenerate": "Regenerar",
-  "label.region": "Region",
+  "label.region": "Región",
   "label.regions": "Regiones",
   "label.remove": "Quitar",
   "label.remove-member": "Eliminar miembro",
@@ -161,7 +161,7 @@
   "label.save": "Guardar",
   "label.screens": "Pantallas",
   "label.search": "Buscar",
-  "label.select": "Select",
+  "label.select": "Seleccionar",
   "label.select-date": "Seleccionar fecha",
   "label.select-role": "Seleccionar rol",
   "label.select-website": "Seleccionar sitio web",
@@ -169,13 +169,13 @@
   "label.settings": "Ajustes",
   "label.share-url": "Compartir URL",
   "label.single-day": "Un solo día",
-  "label.start-step": "Start Step",
-  "label.steps": "Steps",
+  "label.start-step": "Paso inical",
+  "label.steps": "Pasos",
   "label.sum": "Suma",
   "label.tablet": "Tableta",
   "label.team": "Equipo",
   "label.team-id": "ID del equipo",
-  "label.team-manager": "Team manager",
+  "label.team-manager": "Jefe de equipo",
   "label.team-member": "Miembro del equipo",
   "label.team-name": "Nombre del equipo",
   "label.team-owner": "Admin. del equipo",
@@ -201,23 +201,23 @@
   "label.unique-visitors": "Visitantes únicos",
   "label.unknown": "Desconocida",
   "label.untitled": "Sin título",
-  "label.update": "Update",
+  "label.update": "Actualizar",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Usuario",
   "label.username": "Nombre de usuario",
   "label.users": "Usuarios",
   "label.utm": "UTM",
-  "label.utm-description": "Track your campaigns through UTM parameters.",
+  "label.utm-description": "Realice un seguimiento de sus campañas a través de parámetros UTM.",
   "label.value": "Valor",
   "label.view": "Visualizar",
   "label.view-details": "Ver detalles",
   "label.view-only": "Ver sólo",
   "label.views": "Vistas",
-  "label.views-per-visit": "Views per visit",
+  "label.views-per-visit": "Vistas por visita",
   "label.visit-duration": "Tiempo promedio de visita",
   "label.visitors": "Visitantes",
-  "label.visits": "Visits",
+  "label.visits": "Visitas",
   "label.website": "Sitio web",
   "label.website-id": "ID del sitio web",
   "label.websites": "Sitios web",
@@ -225,7 +225,7 @@
   "label.yesterday": "Ayer",
   "message.action-confirmation": "Escriba {confirmation} en el cuadro a continuación para confirmar.",
   "message.active-users": "{x} {x, plural, one {activo} other {activos}}",
-  "message.collected-data": "Collected data",
+  "message.collected-data": "Datos obtenidos",
   "message.confirm-delete": "¿Seguro que quieres eliminar {target}?",
   "message.confirm-leave": "¿Seguro que quieres abandonar {target}?",
   "message.confirm-remove": "¿Estás seguro de que desea eliminar {target}?",
@@ -257,7 +257,7 @@
   "message.team-websites-info": "Las analíticas de tus sitios web pueden ser vistas por cualquier miembro del equipo.",
   "message.tracking-code": "Código de rastreo",
   "message.transfer-team-website-to-user": "¿Transferir este sitio web a su cuenta?",
-  "message.transfer-user-website-to-team": "Select the team to transfer this website to.",
+  "message.transfer-user-website-to-team": "Seleccione el equipo al que transferir este sitio web.",
   "message.transfer-website": "Seleccione el equipo al que transferir este sitio web.",
   "message.triggered-event": "Evento lanzado",
   "message.user-deleted": "Usuario eliminado.",
diff --git a/src/lang/fa-IR.json b/src/lang/fa-IR.json
index 8eb2df241d..fe1705e30a 100644
--- a/src/lang/fa-IR.json
+++ b/src/lang/fa-IR.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "زبان",
   "label.languages": "زبان‌ها",
   "label.laptop": "لپ‌تاپ",
diff --git a/src/lang/fi-FI.json b/src/lang/fi-FI.json
index f6d18b35e5..02561dcb23 100644
--- a/src/lang/fi-FI.json
+++ b/src/lang/fi-FI.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Kieli",
   "label.languages": "Kielet",
   "label.laptop": "Kannettava tietokone",
diff --git a/src/lang/fo-FO.json b/src/lang/fo-FO.json
index 98646d2832..e9ca2aae91 100644
--- a/src/lang/fo-FO.json
+++ b/src/lang/fo-FO.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "Fartelda",
diff --git a/src/lang/fr-FR.json b/src/lang/fr-FR.json
index 23c6652588..edb2abd36b 100644
--- a/src/lang/fr-FR.json
+++ b/src/lang/fr-FR.json
@@ -96,7 +96,7 @@
   "label.join": "Rejoindre",
   "label.join-team": "Rejoindre une équipe",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Langue",
   "label.languages": "Langues",
   "label.laptop": "Portable",
diff --git a/src/lang/ga-ES.json b/src/lang/ga-ES.json
index 9e04806129..d267137f1a 100644
--- a/src/lang/ga-ES.json
+++ b/src/lang/ga-ES.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Idioma",
   "label.languages": "Idiomas",
   "label.laptop": "Portátil",
diff --git a/src/lang/he-IL.json b/src/lang/he-IL.json
index 584d5f5d43..d7ebf875b6 100644
--- a/src/lang/he-IL.json
+++ b/src/lang/he-IL.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "לפטופ",
diff --git a/src/lang/hi-IN.json b/src/lang/hi-IN.json
index 0cf024e332..1fbee2c02e 100644
--- a/src/lang/hi-IN.json
+++ b/src/lang/hi-IN.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "लैपटॉप",
diff --git a/src/lang/hr-HR.json b/src/lang/hr-HR.json
index bc69742664..39d4d9d1dd 100644
--- a/src/lang/hr-HR.json
+++ b/src/lang/hr-HR.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Jezik",
   "label.languages": "Languages",
   "label.laptop": "Laptop",
diff --git a/src/lang/hu-HU.json b/src/lang/hu-HU.json
index 111ce00fa1..6762181bd7 100644
--- a/src/lang/hu-HU.json
+++ b/src/lang/hu-HU.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "Laptop",
diff --git a/src/lang/id-ID.json b/src/lang/id-ID.json
index 0f2c705aa0..930b02da5c 100644
--- a/src/lang/id-ID.json
+++ b/src/lang/id-ID.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Bahasa",
   "label.languages": "Bahasa",
   "label.laptop": "Laptop",
diff --git a/src/lang/it-IT.json b/src/lang/it-IT.json
index 3e73781894..229254d56a 100644
--- a/src/lang/it-IT.json
+++ b/src/lang/it-IT.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Lingua",
   "label.languages": "Lingue",
   "label.laptop": "Portatile",
diff --git a/src/lang/ja-JP.json b/src/lang/ja-JP.json
index ef0cce1dd6..02e300bbb8 100644
--- a/src/lang/ja-JP.json
+++ b/src/lang/ja-JP.json
@@ -96,7 +96,7 @@
   "label.join": "参加",
   "label.join-team": "チームに参加",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "言語",
   "label.languages": "言語",
   "label.laptop": "ノートPC",
diff --git a/src/lang/km-KH.json b/src/lang/km-KH.json
index 9a374a0673..f3189ac2bd 100644
--- a/src/lang/km-KH.json
+++ b/src/lang/km-KH.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "ភាសា",
   "label.languages": "ភាសា",
   "label.laptop": "កុំព្យូទ័រយួរដៃ",
diff --git a/src/lang/lt-LT.json b/src/lang/lt-LT.json
index f96e643e64..424c06ce3e 100644
--- a/src/lang/lt-LT.json
+++ b/src/lang/lt-LT.json
@@ -96,7 +96,7 @@
   "label.join": "Prisijungti",
   "label.join-team": "Prisijungti į komandą",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Kalba",
   "label.languages": "Kalbos",
   "label.laptop": "Laptop",
diff --git a/src/lang/mn-MN.json b/src/lang/mn-MN.json
index 47e08bca3f..0e99817063 100644
--- a/src/lang/mn-MN.json
+++ b/src/lang/mn-MN.json
@@ -96,7 +96,7 @@
   "label.join": "Нэгдэх",
   "label.join-team": "Багт нэгдэх",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Хэл",
   "label.languages": "Хэл",
   "label.laptop": "Зөөврийн компьютер",
diff --git a/src/lang/ms-MY.json b/src/lang/ms-MY.json
index bf28b05cfe..82cfbb6b42 100644
--- a/src/lang/ms-MY.json
+++ b/src/lang/ms-MY.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "Laptop",
diff --git a/src/lang/my-MM.json b/src/lang/my-MM.json
index dffbe43e48..8a71cd4974 100644
--- a/src/lang/my-MM.json
+++ b/src/lang/my-MM.json
@@ -96,7 +96,7 @@
   "label.join": "ဝင်မည်",
   "label.join-team": "အသင်းဝင်မည်",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "ဘာသာစကား",
   "label.languages": "ဘာသာစကားများ",
   "label.laptop": "လက်တော့ပ်",
diff --git a/src/lang/nb-NO.json b/src/lang/nb-NO.json
index ca360d0950..4a6e0409c1 100644
--- a/src/lang/nb-NO.json
+++ b/src/lang/nb-NO.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Språk",
   "label.languages": "Språk",
   "label.laptop": "Bærbar",
diff --git a/src/lang/nl-NL.json b/src/lang/nl-NL.json
index 6208147309..9a1c852bc1 100644
--- a/src/lang/nl-NL.json
+++ b/src/lang/nl-NL.json
@@ -96,7 +96,7 @@
   "label.join": "Lid worden",
   "label.join-team": "Word lid van een team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Taal",
   "label.languages": "Talen",
   "label.laptop": "Laptop",
diff --git a/src/lang/pl-PL.json b/src/lang/pl-PL.json
index 8068d9b360..e663d44598 100644
--- a/src/lang/pl-PL.json
+++ b/src/lang/pl-PL.json
@@ -96,7 +96,7 @@
   "label.join": "Dołącz",
   "label.join-team": "Dołącz do zespołu",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Język",
   "label.languages": "Języki",
   "label.laptop": "Laptop",
diff --git a/src/lang/pt-BR.json b/src/lang/pt-BR.json
index c1f9c708ff..be96d09772 100644
--- a/src/lang/pt-BR.json
+++ b/src/lang/pt-BR.json
@@ -96,7 +96,7 @@
   "label.join": "Participar",
   "label.join-team": "Participar da equipe",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Idioma",
   "label.languages": "Idiomas",
   "label.laptop": "Notebook",
diff --git a/src/lang/pt-PT.json b/src/lang/pt-PT.json
index d497bb3a8f..252457f833 100644
--- a/src/lang/pt-PT.json
+++ b/src/lang/pt-PT.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Língua",
   "label.languages": "Línguas",
   "label.laptop": "Portátil",
diff --git a/src/lang/ro-RO.json b/src/lang/ro-RO.json
index 107303ae94..c06690c23d 100644
--- a/src/lang/ro-RO.json
+++ b/src/lang/ro-RO.json
@@ -96,7 +96,7 @@
   "label.join": "Alătură-te",
   "label.join-team": "Alătură-te echipei",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Limbă",
   "label.languages": "Limbi",
   "label.laptop": "Laptop",
diff --git a/src/lang/ru-RU.json b/src/lang/ru-RU.json
index 535d22921d..257c0491aa 100644
--- a/src/lang/ru-RU.json
+++ b/src/lang/ru-RU.json
@@ -96,7 +96,7 @@
   "label.join": "Присоединиться",
   "label.join-team": "Присоединиться к команде",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Язык",
   "label.languages": "Языки",
   "label.laptop": "Ноутбук",
diff --git a/src/lang/si-LK.json b/src/lang/si-LK.json
index 03b42df782..6263f91a96 100644
--- a/src/lang/si-LK.json
+++ b/src/lang/si-LK.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "භාෂාව",
   "label.languages": "Languages",
   "label.laptop": "Laptop",
diff --git a/src/lang/sk-SK.json b/src/lang/sk-SK.json
index 3d5b8fbb13..4447ada298 100644
--- a/src/lang/sk-SK.json
+++ b/src/lang/sk-SK.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "Prenosný počítač",
diff --git a/src/lang/sl-SI.json b/src/lang/sl-SI.json
index 01fc7f30b4..3c684dec03 100644
--- a/src/lang/sl-SI.json
+++ b/src/lang/sl-SI.json
@@ -96,7 +96,7 @@
   "label.join": "Pridruži se",
   "label.join-team": "Pridruži se ekipi",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Jezik",
   "label.languages": "Jeziki",
   "label.laptop": "Prenosni računalnik",
diff --git a/src/lang/sv-SE.json b/src/lang/sv-SE.json
index 92c9df03c6..c60b6cf904 100644
--- a/src/lang/sv-SE.json
+++ b/src/lang/sv-SE.json
@@ -96,7 +96,7 @@
   "label.join": "Gå med",
   "label.join-team": "Gå med i team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Språk",
   "label.languages": "Språk",
   "label.laptop": "Bärbar",
diff --git a/src/lang/ta-IN.json b/src/lang/ta-IN.json
index 99558b11d8..0f95bc1861 100644
--- a/src/lang/ta-IN.json
+++ b/src/lang/ta-IN.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "Languages",
   "label.laptop": "மடிக்கணினி",
diff --git a/src/lang/th-TH.json b/src/lang/th-TH.json
index 253f420c82..a594bb3120 100644
--- a/src/lang/th-TH.json
+++ b/src/lang/th-TH.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "ภาษา",
   "label.languages": "ภาษา",
   "label.laptop": "แล็ปท็อป",
diff --git a/src/lang/tr-TR.json b/src/lang/tr-TR.json
index 49e71b9a31..b8271ed219 100644
--- a/src/lang/tr-TR.json
+++ b/src/lang/tr-TR.json
@@ -96,7 +96,7 @@
   "label.join": "Katıl",
   "label.join-team": "Takıma katıl",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Dil",
   "label.languages": "Diller",
   "label.laptop": "Dizüstü",
diff --git a/src/lang/uk-UA.json b/src/lang/uk-UA.json
index ec658b7ef6..ecfd27f50a 100644
--- a/src/lang/uk-UA.json
+++ b/src/lang/uk-UA.json
@@ -93,7 +93,7 @@
   "label.join": "Приєднатись",
   "label.join-team": "Приєднатись до команди",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Мова",
   "label.languages": "Мови",
   "label.laptop": "Ноутбук",
diff --git a/src/lang/ur-PK.json b/src/lang/ur-PK.json
index 7d649148ab..97de5d6940 100644
--- a/src/lang/ur-PK.json
+++ b/src/lang/ur-PK.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "زبانیں",
   "label.laptop": "لیپ ٹاپ",
diff --git a/src/lang/vi-VN.json b/src/lang/vi-VN.json
index 1be8684bdb..054f449a8a 100644
--- a/src/lang/vi-VN.json
+++ b/src/lang/vi-VN.json
@@ -96,7 +96,7 @@
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "Language",
   "label.languages": "Ngôn ngữ",
   "label.laptop": "Laptop",
diff --git a/src/lang/zh-CN.json b/src/lang/zh-CN.json
index bcdd3612b6..91df00a615 100644
--- a/src/lang/zh-CN.json
+++ b/src/lang/zh-CN.json
@@ -96,7 +96,7 @@
   "label.join": "加入",
   "label.join-team": "加入团队",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "语言",
   "label.languages": "语言",
   "label.laptop": "笔记本",
diff --git a/src/lang/zh-TW.json b/src/lang/zh-TW.json
index 9d8329e9af..10069181e3 100644
--- a/src/lang/zh-TW.json
+++ b/src/lang/zh-TW.json
@@ -96,7 +96,7 @@
   "label.join": "加入",
   "label.join-team": "加入團隊",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users nagivate through your website.",
+  "label.journey-description": "Understand how users navigate through your website.",
   "label.language": "語言",
   "label.languages": "語言",
   "label.laptop": "筆記型電腦",

From 038ecdb59222f9f332dfb3d76c2e56e025b78838 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 23 Jul 2024 15:34:25 -0700
Subject: [PATCH 221/438] fix pkey for stats tables

---
 db/clickhouse/schema.sql | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/db/clickhouse/schema.sql b/db/clickhouse/schema.sql
index e36ddf6121..9082884b2d 100644
--- a/db/clickhouse/schema.sql
+++ b/db/clickhouse/schema.sql
@@ -100,7 +100,8 @@ ORDER BY (
     website_id,
     toStartOfHour(created_at),
     cityHash64(visit_id),
-    visit_id
+    visit_id,
+    event_type
 )
 SAMPLE BY cityHash64(visit_id)
 TTL created_at + INTERVAL 10 DAY;
@@ -200,7 +201,8 @@ ORDER BY (
     website_id,
     toStartOfDay(created_at),
     cityHash64(visit_id),
-    visit_id
+    visit_id,
+    event_type
 )
 SAMPLE BY cityHash64(visit_id);
 
@@ -265,4 +267,4 @@ GROUP BY website_id,
     subdivision1,
     city,
     event_type,
-    timestamp);        
\ No newline at end of file
+    timestamp);
\ No newline at end of file

From 174b9e4376379ea1b185371bf68dd6e235342c98 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 23 Jul 2024 22:35:11 -0700
Subject: [PATCH 222/438] only use hourly table, remove daily table logic, fix
 updatechart undefined

---
 db/clickhouse/schema.sql                      | 111 ++----------------
 src/components/charts/Chart.tsx               |  24 ++--
 src/pages/api/websites/[websiteId]/metrics.ts |  13 +-
 src/pages/api/websites/[websiteId]/stats.ts   |   6 +-
 .../analytics/events/getEventMetrics.ts       |   4 +-
 src/queries/analytics/getWebsiteStats.ts      |   7 +-
 .../analytics/pageviews/getPageviewMetrics.ts |  16 +--
 .../analytics/pageviews/getPageviewStats.ts   |   3 +-
 .../analytics/sessions/getSessionMetrics.ts   |  19 +--
 .../analytics/sessions/getSessionStats.ts     |   3 +-
 10 files changed, 39 insertions(+), 167 deletions(-)

diff --git a/db/clickhouse/schema.sql b/db/clickhouse/schema.sql
index 9082884b2d..29cdeabc21 100644
--- a/db/clickhouse/schema.sql
+++ b/db/clickhouse/schema.sql
@@ -78,6 +78,8 @@ CREATE TABLE umami.website_event_stats_hourly
     browser LowCardinality(String),
     os LowCardinality(String),
     device LowCardinality(String),
+    screen LowCardinality(String),
+    language LowCardinality(String),
     country LowCardinality(String),
     subdivision1 LowCardinality(String),
     city String,
@@ -103,8 +105,7 @@ ORDER BY (
     visit_id,
     event_type
 )
-SAMPLE BY cityHash64(visit_id)
-TTL created_at + INTERVAL 10 DAY;
+SAMPLE BY cityHash64(visit_id);
 
 CREATE MATERIALIZED VIEW umami.website_event_stats_hourly_mv
 TO umami.website_event_stats_hourly
@@ -117,6 +118,8 @@ SELECT
     browser,
     os,
     device,
+    screen,
+    language,
     country,
     subdivision1,
     city,
@@ -140,6 +143,8 @@ FROM (SELECT
     browser,
     os,
     device,
+    screen,
+    language,
     country,
     subdivision1,
     city,
@@ -163,106 +168,8 @@ GROUP BY website_id,
     browser,
     os,
     device,
-    country,
-    subdivision1,
-    city,
-    event_type,
-    timestamp);
-
--- stats daily
-CREATE TABLE umami.website_event_stats_daily
-(
-    website_id UUID,
-    session_id UUID,
-    visit_id UUID,
-    hostname LowCardinality(String),
-    browser LowCardinality(String),
-    os LowCardinality(String),
-    device LowCardinality(String),
-    country LowCardinality(String),
-    subdivision1 LowCardinality(String),
-    city String,
-    entry_url AggregateFunction(argMin, String, DateTime('UTC')),
-    exit_url AggregateFunction(argMax, String, DateTime('UTC')),
-    url_path SimpleAggregateFunction(groupArrayArray, Array(String)),
-    url_query SimpleAggregateFunction(groupArrayArray, Array(String)),
-    referrer_domain SimpleAggregateFunction(groupArrayArray, Array(String)),
-    page_title SimpleAggregateFunction(groupArrayArray, Array(String)),
-    event_type UInt32,
-    event_name SimpleAggregateFunction(groupArrayArray, Array(String)),
-    views SimpleAggregateFunction(sum, UInt64),
-    min_time SimpleAggregateFunction(min, DateTime('UTC')),
-    max_time SimpleAggregateFunction(max, DateTime('UTC')),
-    created_at Datetime('UTC')
-)
-ENGINE = AggregatingMergeTree
-PARTITION BY toYYYYMM(created_at)
-ORDER BY (
-    website_id,
-    toStartOfDay(created_at),
-    cityHash64(visit_id),
-    visit_id,
-    event_type
-)
-SAMPLE BY cityHash64(visit_id);
-
-CREATE MATERIALIZED VIEW umami.website_event_stats_daily_mv
-TO umami.website_event_stats_daily
-AS
-SELECT
-    website_id,
-    session_id,
-    visit_id,
-    hostname,
-    browser,
-    os,
-    device,
-    country,
-    subdivision1,
-    city,
-    entry_url,
-    exit_url,
-    url_paths as url_path,
-    url_query,
-    referrer_domain,
-    page_title,
-    event_type,
-    event_name,
-    views,
-    min_time,
-    max_time,
-    timestamp as created_at
-FROM (SELECT
-    website_id,
-    session_id,
-    visit_id,
-    hostname,
-    browser,
-    os,
-    device,
-    country,
-    subdivision1,
-    city,
-    argMinState(url_path, created_at) entry_url,
-    argMaxState(url_path, created_at) exit_url,
-    arrayFilter(x -> x != '', groupArray(url_path)) as url_paths,
-    arrayFilter(x -> x != '', groupArray(url_query)) url_query,
-    arrayFilter(x -> x != '', groupArray(referrer_domain)) referrer_domain,
-    arrayFilter(x -> x != '', groupArray(page_title)) page_title,
-    event_type,
-    if(event_type = 2, groupArray(event_name), []) event_name,
-    sumIf(1, event_type = 1) views,
-    min(created_at) min_time,
-    max(created_at) max_time,
-    toStartOfDay(created_at) timestamp
-FROM umami.website_event
-GROUP BY website_id,
-    session_id,
-    visit_id,
-    hostname,
-    browser,
-    os,
-    device,
+    screen,
+    language,
     country,
     subdivision1,
     city,
diff --git a/src/components/charts/Chart.tsx b/src/components/charts/Chart.tsx
index 926defaf9e..a4badbcef0 100644
--- a/src/components/charts/Chart.tsx
+++ b/src/components/charts/Chart.tsx
@@ -79,18 +79,20 @@ export function Chart({
   };
 
   const updateChart = (data: any) => {
-    if ((data?.datasets?.length || 0) === chart.current.data.datasets.length) {
-      chart.current.data.datasets.forEach((dataset: { data: any }, index: string | number) => {
-        if (data?.datasets[index]) {
-          dataset.data = data?.datasets[index]?.data;
-
-          if (chart.current.legend.legendItems[index]) {
-            chart.current.legend.legendItems[index].text = data?.datasets[index]?.label;
+    if (data.datasets) {
+      if (data.datasets.length === chart.current.data.datasets.length) {
+        chart.current.data.datasets.forEach((dataset: { data: any }, index: string | number) => {
+          if (data?.datasets[index]) {
+            dataset.data = data?.datasets[index]?.data;
+
+            if (chart.current.legend.legendItems[index]) {
+              chart.current.legend.legendItems[index].text = data?.datasets[index]?.label;
+            }
           }
-        }
-      });
-    } else {
-      chart.current.data.datasets = data.datasets;
+        });
+      } else {
+        chart.current.data.datasets = data.datasets;
+      }
     }
 
     chart.current.options = options;
diff --git a/src/pages/api/websites/[websiteId]/metrics.ts b/src/pages/api/websites/[websiteId]/metrics.ts
index b37c38f743..3dac217b21 100644
--- a/src/pages/api/websites/[websiteId]/metrics.ts
+++ b/src/pages/api/websites/[websiteId]/metrics.ts
@@ -64,7 +64,7 @@ export default async (
   await useAuth(req, res);
   await useValidate(schema, req, res);
 
-  const { websiteId, type, limit, offset, search, unit } = req.query;
+  const { websiteId, type, limit, offset, search } = req.query;
 
   if (req.method === 'GET') {
     if (!(await canViewWebsite(req.auth, websiteId))) {
@@ -89,7 +89,7 @@ export default async (
     }
 
     if (SESSION_COLUMNS.includes(type)) {
-      const data = await getSessionMetrics(websiteId, type, filters, limit, offset, unit as string);
+      const data = await getSessionMetrics(websiteId, type, filters, limit, offset);
 
       if (type === 'language') {
         const combined = {};
@@ -111,14 +111,7 @@ export default async (
     }
 
     if (EVENT_COLUMNS.includes(type)) {
-      const data = await getPageviewMetrics(
-        websiteId,
-        type,
-        filters,
-        limit,
-        offset,
-        unit as string,
-      );
+      const data = await getPageviewMetrics(websiteId, type, filters, limit, offset);
 
       return ok(res, data);
     }
diff --git a/src/pages/api/websites/[websiteId]/stats.ts b/src/pages/api/websites/[websiteId]/stats.ts
index 1c684dbed3..9ca84c7440 100644
--- a/src/pages/api/websites/[websiteId]/stats.ts
+++ b/src/pages/api/websites/[websiteId]/stats.ts
@@ -56,7 +56,7 @@ export default async (
   await useAuth(req, res);
   await useValidate(schema, req, res);
 
-  const { websiteId, compare, unit } = req.query;
+  const { websiteId, compare } = req.query;
 
   if (req.method === 'GET') {
     if (!(await canViewWebsite(req.auth, websiteId))) {
@@ -72,13 +72,13 @@ export default async (
 
     const filters = getRequestFilters(req);
 
-    const metrics = await getWebsiteStats(websiteId, unit as string, {
+    const metrics = await getWebsiteStats(websiteId, {
       ...filters,
       startDate,
       endDate,
     });
 
-    const prevPeriod = await getWebsiteStats(websiteId, unit as string, {
+    const prevPeriod = await getWebsiteStats(websiteId, {
       ...filters,
       startDate: compareStartDate,
       endDate: compareEndDate,
diff --git a/src/queries/analytics/events/getEventMetrics.ts b/src/queries/analytics/events/getEventMetrics.ts
index c97c11ad27..3623213584 100644
--- a/src/queries/analytics/events/getEventMetrics.ts
+++ b/src/queries/analytics/events/getEventMetrics.ts
@@ -51,8 +51,6 @@ async function clickhouseQuery(
     eventType: EVENT_TYPE.customEvent,
   });
 
-  const table = unit === 'hour' ? 'website_event_stats_hourly' : 'website_event_stats_daily';
-
   return rawQuery(
     `
     select
@@ -62,7 +60,7 @@ async function clickhouseQuery(
     from (
       select arrayJoin(event_name) as event_name,
         created_at
-      from ${table} website_event
+      from website_event_stats_hourly website_event
       where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
         and event_type = {eventType:UInt32}
diff --git a/src/queries/analytics/getWebsiteStats.ts b/src/queries/analytics/getWebsiteStats.ts
index 125715ca6c..ebe711a03f 100644
--- a/src/queries/analytics/getWebsiteStats.ts
+++ b/src/queries/analytics/getWebsiteStats.ts
@@ -6,7 +6,7 @@ import prisma from 'lib/prisma';
 import { QueryFilters } from 'lib/types';
 
 export async function getWebsiteStats(
-  ...args: [websiteId: string, unit: string, filters: QueryFilters]
+  ...args: [websiteId: string, filters: QueryFilters]
 ): Promise<
   { pageviews: number; visitors: number; visits: number; bounces: number; totaltime: number }[]
 > {
@@ -18,7 +18,6 @@ export async function getWebsiteStats(
 
 async function relationalQuery(
   websiteId: string,
-  unit: string,
   filters: QueryFilters,
 ): Promise<
   { pageviews: number; visitors: number; visits: number; bounces: number; totaltime: number }[]
@@ -59,7 +58,6 @@ async function relationalQuery(
 
 async function clickhouseQuery(
   websiteId: string,
-  unit: string,
   filters: QueryFilters,
 ): Promise<
   { pageviews: number; visitors: number; visits: number; bounces: number; totaltime: number }[]
@@ -69,7 +67,6 @@ async function clickhouseQuery(
     ...filters,
     eventType: EVENT_TYPE.pageView,
   });
-  const table = unit === 'hour' ? 'website_event_stats_hourly' : 'website_event_stats_daily';
 
   return rawQuery(
     `
@@ -79,7 +76,7 @@ async function clickhouseQuery(
       uniq(visit_id) as "visits",
       sumIf(1, views = 1) as "bounces",
       sum(max_time-min_time) as "totaltime"
-    from ${table} "website_event"
+    from website_event_stats_hourly "website_event"
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}
       and event_type = {eventType:UInt32}
diff --git a/src/queries/analytics/pageviews/getPageviewMetrics.ts b/src/queries/analytics/pageviews/getPageviewMetrics.ts
index d66ec6aa7a..ccfe4ef032 100644
--- a/src/queries/analytics/pageviews/getPageviewMetrics.ts
+++ b/src/queries/analytics/pageviews/getPageviewMetrics.ts
@@ -1,4 +1,3 @@
-/* eslint-disable no-unused-vars, @typescript-eslint/no-unused-vars */
 import clickhouse from 'lib/clickhouse';
 import { EVENT_TYPE, FILTER_COLUMNS, SESSION_COLUMNS } from 'lib/constants';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
@@ -6,14 +5,7 @@ import prisma from 'lib/prisma';
 import { QueryFilters } from 'lib/types';
 
 export async function getPageviewMetrics(
-  ...args: [
-    websiteId: string,
-    type: string,
-    filters: QueryFilters,
-    limit?: number,
-    offset?: number,
-    unit?: string,
-  ]
+  ...args: [websiteId: string, type: string, filters: QueryFilters, limit?: number, offset?: number]
 ) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
@@ -27,7 +19,6 @@ async function relationalQuery(
   filters: QueryFilters,
   limit: number = 500,
   offset: number = 0,
-  unit: string,
 ) {
   const column = FILTER_COLUMNS[type] || type;
   const { rawQuery, parseFilters } = prisma;
@@ -91,7 +82,6 @@ async function clickhouseQuery(
   filters: QueryFilters,
   limit: number = 500,
   offset: number = 0,
-  unit: string,
 ): Promise<{ x: string; y: number }[]> {
   const column = FILTER_COLUMNS[type] || type;
   const { rawQuery, parseFilters } = clickhouse;
@@ -121,15 +111,13 @@ async function clickhouseQuery(
     groupByQuery = 'group by x';
   }
 
-  const table = unit === 'hour' ? 'website_event_stats_hourly' : 'website_event_stats_daily';
-
   return rawQuery(
     `
     select g.t as x,
       count(*) as y
     from (
       select ${columnQuery} as t
-      from ${table} website_event
+      from website_event_stats_hourly website_event
       where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
         and event_type = {eventType:UInt32}
diff --git a/src/queries/analytics/pageviews/getPageviewStats.ts b/src/queries/analytics/pageviews/getPageviewStats.ts
index 0bb16ca9be..8d757de31d 100644
--- a/src/queries/analytics/pageviews/getPageviewStats.ts
+++ b/src/queries/analytics/pageviews/getPageviewStats.ts
@@ -46,7 +46,6 @@ async function clickhouseQuery(
     ...filters,
     eventType: EVENT_TYPE.pageView,
   });
-  const table = unit === 'hour' ? 'website_event_stats_hourly' : 'website_event_stats_daily';
 
   return rawQuery(
     `
@@ -57,7 +56,7 @@ async function clickhouseQuery(
       select 
         ${getDateSQL('created_at', unit, timezone)} as t,
         sum(views) as y
-      from ${table} website_event
+      from website_event_stats_hourly website_event
       where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
         and event_type = {eventType:UInt32}
diff --git a/src/queries/analytics/sessions/getSessionMetrics.ts b/src/queries/analytics/sessions/getSessionMetrics.ts
index 93e36a55fa..9baf2a5c07 100644
--- a/src/queries/analytics/sessions/getSessionMetrics.ts
+++ b/src/queries/analytics/sessions/getSessionMetrics.ts
@@ -1,19 +1,11 @@
-/* eslint-disable no-unused-vars, @typescript-eslint/no-unused-vars */
-import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
-import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
 import { EVENT_TYPE, FILTER_COLUMNS, SESSION_COLUMNS } from 'lib/constants';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import prisma from 'lib/prisma';
 import { QueryFilters } from 'lib/types';
 
 export async function getSessionMetrics(
-  ...args: [
-    websiteId: string,
-    type: string,
-    filters: QueryFilters,
-    limit?: number,
-    offset?: number,
-    unit?: string,
-  ]
+  ...args: [websiteId: string, type: string, filters: QueryFilters, limit?: number, offset?: number]
 ) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
@@ -27,7 +19,6 @@ async function relationalQuery(
   filters: QueryFilters,
   limit: number = 500,
   offset: number = 0,
-  unit: string,
 ) {
   const column = FILTER_COLUMNS[type] || type;
   const { parseFilters, rawQuery } = prisma;
@@ -71,7 +62,6 @@ async function clickhouseQuery(
   filters: QueryFilters,
   limit: number = 500,
   offset: number = 0,
-  unit: string,
 ): Promise<{ x: string; y: number }[]> {
   const column = FILTER_COLUMNS[type] || type;
   const { parseFilters, rawQuery } = clickhouse;
@@ -80,7 +70,6 @@ async function clickhouseQuery(
     eventType: EVENT_TYPE.pageView,
   });
   const includeCountry = column === 'city' || column === 'subdivision1';
-  const table = unit === 'hour' ? 'website_event_stats_hourly' : 'website_event_stats_daily';
 
   return rawQuery(
     `
@@ -88,7 +77,7 @@ async function clickhouseQuery(
       ${column} x,
       uniq(session_id) y
       ${includeCountry ? ', country' : ''}
-    from ${table} website_event
+    from website_event_stats_hourly website_event
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}
       and event_type = {eventType:UInt32}
diff --git a/src/queries/analytics/sessions/getSessionStats.ts b/src/queries/analytics/sessions/getSessionStats.ts
index 2b57b922b4..0fe0b8a55c 100644
--- a/src/queries/analytics/sessions/getSessionStats.ts
+++ b/src/queries/analytics/sessions/getSessionStats.ts
@@ -46,7 +46,6 @@ async function clickhouseQuery(
     ...filters,
     eventType: EVENT_TYPE.pageView,
   });
-  const table = unit === 'hour' ? 'website_event_stats_hourly' : 'website_event_stats_daily';
 
   return rawQuery(
     `
@@ -57,7 +56,7 @@ async function clickhouseQuery(
       select 
         ${getDateSQL('created_at', unit, timezone)} as t,
         uniq(session_id) as y
-      from ${table} website_event
+      from website_event_stats_hourly website_event
       where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
         and event_type = {eventType:UInt32}

From 3205b4f0f417e025a0d82ccd28156b9291592328 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 23 Jul 2024 22:44:10 -0700
Subject: [PATCH 223/438] fix realtime queries for stats

---
 src/queries/analytics/pageviews/getPageviewStats.ts | 7 +++++--
 src/queries/analytics/sessions/getSessionStats.ts   | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/queries/analytics/pageviews/getPageviewStats.ts b/src/queries/analytics/pageviews/getPageviewStats.ts
index 8d757de31d..f6ea1e08fc 100644
--- a/src/queries/analytics/pageviews/getPageviewStats.ts
+++ b/src/queries/analytics/pageviews/getPageviewStats.ts
@@ -47,6 +47,9 @@ async function clickhouseQuery(
     eventType: EVENT_TYPE.pageView,
   });
 
+  const table = unit === 'minute' ? 'website_event' : 'website_event_stats_hourly';
+  const columnQuery = unit === 'minute' ? 'count(*)' : 'sum(views)';
+
   return rawQuery(
     `
     select
@@ -55,8 +58,8 @@ async function clickhouseQuery(
     from (
       select 
         ${getDateSQL('created_at', unit, timezone)} as t,
-        sum(views) as y
-      from website_event_stats_hourly website_event
+        ${columnQuery} as y
+      from ${table} website_event
       where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
         and event_type = {eventType:UInt32}
diff --git a/src/queries/analytics/sessions/getSessionStats.ts b/src/queries/analytics/sessions/getSessionStats.ts
index 0fe0b8a55c..7bba14df1b 100644
--- a/src/queries/analytics/sessions/getSessionStats.ts
+++ b/src/queries/analytics/sessions/getSessionStats.ts
@@ -47,6 +47,9 @@ async function clickhouseQuery(
     eventType: EVENT_TYPE.pageView,
   });
 
+  const table = unit === 'minute' ? 'website_event' : 'website_event_stats_hourly';
+  const columnQuery = unit === 'minute' ? 'count(distinct session_id)' : 'uniq(session_id)';
+
   return rawQuery(
     `
     select
@@ -55,8 +58,8 @@ async function clickhouseQuery(
     from (
       select 
         ${getDateSQL('created_at', unit, timezone)} as t,
-        uniq(session_id) as y
-      from website_event_stats_hourly website_event
+        ${columnQuery} as y
+      from ${table} website_event
       where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
         and event_type = {eventType:UInt32}

From 161da582ba681fb77517593b851783a0a28ff03f Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Wed, 24 Jul 2024 16:57:23 -0700
Subject: [PATCH 224/438] reorder CH stats index

---
 db/clickhouse/schema.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/clickhouse/schema.sql b/db/clickhouse/schema.sql
index 29cdeabc21..6179bfb04c 100644
--- a/db/clickhouse/schema.sql
+++ b/db/clickhouse/schema.sql
@@ -100,10 +100,10 @@ ENGINE = AggregatingMergeTree
 PARTITION BY toYYYYMM(created_at)
 ORDER BY (
     website_id,
+    event_type,
     toStartOfHour(created_at),
     cityHash64(visit_id),
-    visit_id,
-    event_type
+    visit_id
 )
 SAMPLE BY cityHash64(visit_id);
 

From 2742f1708d6a42626c6e295a3c7c4ff8c15e68c8 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Wed, 24 Jul 2024 17:55:37 -0700
Subject: [PATCH 225/438] remove sessions link

---
 src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
index bbd6460aa0..365783360a 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
@@ -45,11 +45,11 @@ export function WebsiteHeader({
       icon: <Icons.Reports />,
       path: '/reports',
     },
-    {
-      label: formatMessage(labels.sessions),
-      icon: <Icons.User />,
-      path: '/sessions',
-    },
+    // {
+    //   label: formatMessage(labels.sessions),
+    //   icon: <Icons.User />,
+    //   path: '/sessions',
+    // },
     {
       label: formatMessage(labels.events),
       icon: <Icons.Nodes />,

From cd0f185f7769db68fb3783fee610f57937cd12ce Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Thu, 25 Jul 2024 12:24:10 -0700
Subject: [PATCH 226/438] remove revenue report

---
 src/app/(main)/reports/create/ReportTemplates.tsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/(main)/reports/create/ReportTemplates.tsx b/src/app/(main)/reports/create/ReportTemplates.tsx
index 2314f7d6a6..7a754d5f29 100644
--- a/src/app/(main)/reports/create/ReportTemplates.tsx
+++ b/src/app/(main)/reports/create/ReportTemplates.tsx
@@ -51,12 +51,12 @@ export function ReportTemplates({ showHeader = true }: { showHeader?: boolean })
       url: renderTeamUrl('/reports/journey'),
       icon: <Path />,
     },
-    {
-      title: formatMessage(labels.revenue),
-      description: formatMessage(labels.revenueDescription),
-      url: renderTeamUrl('/reports/revenue'),
-      icon: <Path />,
-    },
+    // {
+    //   title: formatMessage(labels.revenue),
+    //   description: formatMessage(labels.revenueDescription),
+    //   url: renderTeamUrl('/reports/revenue'),
+    //   icon: <Path />,
+    // },
   ];
 
   return (

From ac60d08ee5e71e1347d4261bbdaf005c7d7db8ea Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Sun, 28 Jul 2024 19:51:14 -0700
Subject: [PATCH 227/438] Sessions page.

---
 next.config.js                                |   2 +-
 package.json                                  |   2 +
 .../websites/[websiteId]/WebsiteHeader.tsx    |  12 +-
 .../[websiteId]/sessions/SessionsTable.tsx    |  13 +-
 .../[sessionId]/SessionDetailsPage.module.css |   3 +
 .../[sessionId]/SessionDetailsPage.tsx        |  27 +++
 .../sessions/[sessionId]/SessionInfo.tsx      |  17 ++
 .../[websiteId]/sessions/[sessionId]/page.tsx |  10 +
 src/components/common/Profile.tsx             |  41 ++++
 src/components/hooks/index.ts                 |   1 +
 src/components/hooks/queries/useSession.ts    |  14 ++
 src/components/hooks/queries/useSessions.ts   |   2 +-
 .../[websiteId]/sessions/[sessionId].ts       |  42 ++++
 .../{sessions.ts => sessions/index.ts}        |   0
 src/queries/analytics/sessions/getSession.ts  |  41 +++-
 src/queries/analytics/sessions/getSessions.ts |   8 +-
 yarn.lock                                     | 195 +++++++++++++++++-
 17 files changed, 414 insertions(+), 16 deletions(-)
 create mode 100644 src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.module.css
 create mode 100644 src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
 create mode 100644 src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx
 create mode 100644 src/app/(main)/websites/[websiteId]/sessions/[sessionId]/page.tsx
 create mode 100644 src/components/common/Profile.tsx
 create mode 100644 src/components/hooks/queries/useSession.ts
 create mode 100644 src/pages/api/websites/[websiteId]/sessions/[sessionId].ts
 rename src/pages/api/websites/[websiteId]/{sessions.ts => sessions/index.ts} (100%)

diff --git a/next.config.js b/next.config.js
index acb83a9217..b610eb2c83 100644
--- a/next.config.js
+++ b/next.config.js
@@ -17,7 +17,7 @@ const trackerScriptName = process.env.TRACKER_SCRIPT_NAME;
 
 const contentSecurityPolicy = [
   `default-src 'self'`,
-  `img-src *`,
+  `img-src * data:`,
   `script-src 'self' 'unsafe-eval' 'unsafe-inline'`,
   `style-src 'self' 'unsafe-inline'`,
   `connect-src 'self' api.umami.is cloud.umami.is`,
diff --git a/package.json b/package.json
index f14e552d50..f9513c43c9 100644
--- a/package.json
+++ b/package.json
@@ -65,6 +65,8 @@
   ],
   "dependencies": {
     "@clickhouse/client": "^1.3.0",
+    "@dicebear/collection": "^9.2.1",
+    "@dicebear/core": "^9.2.1",
     "@fontsource/inter": "^4.5.15",
     "@prisma/client": "5.16.2",
     "@prisma/extension-read-replicas": "^0.3.0",
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
index 365783360a..bdf0ba7d74 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
@@ -45,11 +45,11 @@ export function WebsiteHeader({
       icon: <Icons.Reports />,
       path: '/reports',
     },
-    // {
-    //   label: formatMessage(labels.sessions),
-    //   icon: <Icons.User />,
-    //   path: '/sessions',
-    // },
+    {
+      label: formatMessage(labels.sessions),
+      icon: <Icons.User />,
+      path: '/sessions',
+    },
     {
       label: formatMessage(labels.events),
       icon: <Icons.Nodes />,
@@ -69,7 +69,7 @@ export function WebsiteHeader({
           <div className={styles.links}>
             {links.map(({ label, icon, path }) => {
               const selected = path
-                ? pathname.endsWith(path)
+                ? pathname.includes(path)
                 : pathname.match(/^\/websites\/[\w-]+$/);
 
               return (
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
index d5ca439ad8..7bae8b6838 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
@@ -1,6 +1,8 @@
+import Link from 'next/link';
 import { GridColumn, GridTable, useBreakpoint } from 'react-basics';
 import { useFormat, useMessages } from 'components/hooks';
 import { formatDistanceToNow } from 'date-fns';
+import Profile from 'components/common/Profile';
 
 export function SessionsTable({ data = [] }: { data: any[]; showDomain?: boolean }) {
   const { formatMessage, labels } = useMessages();
@@ -9,7 +11,16 @@ export function SessionsTable({ data = [] }: { data: any[]; showDomain?: boolean
 
   return (
     <GridTable data={data} cardMode={['xs', 'sm', 'md'].includes(breakpoint)}>
-      <GridColumn name="id" label="ID" />
+      <GridColumn name="pic" label="" width="90px">
+        {row => <Profile seed={row.id} size={64} />}
+      </GridColumn>
+      <GridColumn name="id" label="ID">
+        {row => (
+          <Link href={`sessions/${row.id}`}>
+            {row.id} ({row.firstAt !== row.lastAt ? 'YES' : 'NO'})
+          </Link>
+        )}
+      </GridColumn>
       <GridColumn name="country" label={formatMessage(labels.country)}>
         {row => formatValue(row.country, 'country')}
       </GridColumn>
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.module.css b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.module.css
new file mode 100644
index 0000000000..2f71e9a885
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.module.css
@@ -0,0 +1,3 @@
+.page {
+  display: grid;
+}
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
new file mode 100644
index 0000000000..fc6945ceae
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
@@ -0,0 +1,27 @@
+'use client';
+import WebsiteHeader from '../../WebsiteHeader';
+import SessionInfo from './SessionInfo';
+import { useSession } from 'components/hooks';
+import { Loading } from 'react-basics';
+import styles from './SessionDetailsPage.module.css';
+
+export default function SessionDetailsPage({
+  websiteId,
+  sessionId,
+}: {
+  websiteId: string;
+  sessionId: string;
+}) {
+  const { data, isLoading } = useSession(websiteId, sessionId);
+
+  if (isLoading) {
+    return <Loading position="page" />;
+  }
+
+  return (
+    <div className={styles.page}>
+      <WebsiteHeader websiteId={websiteId} />
+      <SessionInfo data={data} />
+    </div>
+  );
+}
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx
new file mode 100644
index 0000000000..051703a3eb
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx
@@ -0,0 +1,17 @@
+import Profile from 'components/common/Profile';
+
+export default function SessionInfo({ data }) {
+  return (
+    <h1>
+      <Profile seed={data?.id} />
+      <dl>
+        <dt>ID</dt>
+        <dd>{data?.id}</dd>
+        <dt>Country</dt>
+        <dd>{data?.country}</dd>
+        <dt>City</dt>
+        <dd>{data?.city}</dd>
+      </dl>
+    </h1>
+  );
+}
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/page.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/page.tsx
new file mode 100644
index 0000000000..952e8cc580
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/page.tsx
@@ -0,0 +1,10 @@
+import SessionDetailsPage from './SessionDetailsPage';
+import { Metadata } from 'next';
+
+export default function WebsitePage({ params: { websiteId, sessionId } }) {
+  return <SessionDetailsPage websiteId={websiteId} sessionId={sessionId} />;
+}
+
+export const metadata: Metadata = {
+  title: 'Websites',
+};
diff --git a/src/components/common/Profile.tsx b/src/components/common/Profile.tsx
new file mode 100644
index 0000000000..63a59c1687
--- /dev/null
+++ b/src/components/common/Profile.tsx
@@ -0,0 +1,41 @@
+import { useMemo } from 'react';
+import { createAvatar } from '@dicebear/core';
+import { lorelei } from '@dicebear/collection';
+import md5 from 'md5';
+
+const lib = lorelei;
+
+function convertToPastel(hexColor: string, pastelFactor: number = 0.5) {
+  // Remove the # if present
+  hexColor = hexColor.replace(/^#/, '');
+
+  // Convert hex to RGB
+  let r = parseInt(hexColor.substr(0, 2), 16);
+  let g = parseInt(hexColor.substr(2, 2), 16);
+  let b = parseInt(hexColor.substr(4, 2), 16);
+
+  // Calculate pastel version (mix with white)
+  //const pastelFactor = 0.5; // Adjust this value to control pastel intensity
+
+  r = Math.floor((r + 255 * pastelFactor) / (1 + pastelFactor));
+  g = Math.floor((g + 255 * pastelFactor) / (1 + pastelFactor));
+  b = Math.floor((b + 255 * pastelFactor) / (1 + pastelFactor));
+
+  // Convert back to hex
+  return `#${((1 << 24) | (r << 16) | (g << 8) | b).toString(16).slice(1)}`;
+}
+
+function Profile({ seed, size = 128, ...props }: { seed: string; size?: number }) {
+  const avatar = useMemo(() => {
+    return createAvatar(lib, {
+      ...props,
+      seed,
+      size,
+      backgroundColor: [convertToPastel(md5(seed).substring(0, 6), 2).replace(/^#/, '')],
+    }).toDataUri();
+  }, []);
+
+  return <img src={avatar} alt="Avatar" style={{ borderRadius: '100%' }} />;
+}
+
+export default Profile;
diff --git a/src/components/hooks/index.ts b/src/components/hooks/index.ts
index 86abdd84c6..b0271ff2cd 100644
--- a/src/components/hooks/index.ts
+++ b/src/components/hooks/index.ts
@@ -5,6 +5,7 @@ export * from './queries/useLogin';
 export * from './queries/useRealtime';
 export * from './queries/useReport';
 export * from './queries/useReports';
+export * from './queries/useSession';
 export * from './queries/useSessions';
 export * from './queries/useShareToken';
 export * from './queries/useTeam';
diff --git a/src/components/hooks/queries/useSession.ts b/src/components/hooks/queries/useSession.ts
new file mode 100644
index 0000000000..f65efcf45a
--- /dev/null
+++ b/src/components/hooks/queries/useSession.ts
@@ -0,0 +1,14 @@
+import { useApi } from './useApi';
+
+export function useSession(websiteId: string, sessionId: string) {
+  const { get, useQuery } = useApi();
+
+  return useQuery({
+    queryKey: ['session', { websiteId, sessionId }],
+    queryFn: () => {
+      return get(`/websites/${websiteId}/sessions/${sessionId}`);
+    },
+  });
+}
+
+export default useSession;
diff --git a/src/components/hooks/queries/useSessions.ts b/src/components/hooks/queries/useSessions.ts
index c54c3acd1b..91f4ea4c64 100644
--- a/src/components/hooks/queries/useSessions.ts
+++ b/src/components/hooks/queries/useSessions.ts
@@ -4,7 +4,7 @@ import useModified from '../useModified';
 
 export function useSessions(websiteId: string, params?: { [key: string]: string | number }) {
   const { get } = useApi();
-  const { modified } = useModified(`websites`);
+  const { modified } = useModified(`sessions`);
 
   return useFilterQuery({
     queryKey: ['sessions', { websiteId, modified, ...params }],
diff --git a/src/pages/api/websites/[websiteId]/sessions/[sessionId].ts b/src/pages/api/websites/[websiteId]/sessions/[sessionId].ts
new file mode 100644
index 0000000000..57e99ea376
--- /dev/null
+++ b/src/pages/api/websites/[websiteId]/sessions/[sessionId].ts
@@ -0,0 +1,42 @@
+import * as yup from 'yup';
+import { canViewWebsite } from 'lib/auth';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody, PageParams } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getSession } from 'queries';
+
+export interface ReportsRequestQuery extends PageParams {
+  websiteId: string;
+  sessionId: string;
+}
+
+const schema = {
+  GET: yup.object().shape({
+    websiteId: yup.string().uuid().required(),
+    sessionId: yup.string().uuid().required(),
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<ReportsRequestQuery, any>,
+  res: NextApiResponse,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  const { websiteId, sessionId } = req.query;
+
+  if (req.method === 'GET') {
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const data = await getSession(websiteId, sessionId);
+
+    return ok(res, data);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/src/pages/api/websites/[websiteId]/sessions.ts b/src/pages/api/websites/[websiteId]/sessions/index.ts
similarity index 100%
rename from src/pages/api/websites/[websiteId]/sessions.ts
rename to src/pages/api/websites/[websiteId]/sessions/index.ts
diff --git a/src/queries/analytics/sessions/getSession.ts b/src/queries/analytics/sessions/getSession.ts
index 256ada4c08..2c008e30cc 100644
--- a/src/queries/analytics/sessions/getSession.ts
+++ b/src/queries/analytics/sessions/getSession.ts
@@ -1,9 +1,46 @@
 import prisma from 'lib/prisma';
+import clickhouse from 'lib/clickhouse';
+import { runQuery, PRISMA, CLICKHOUSE } from 'lib/db';
 
-export async function getSession(id: string) {
+export async function getSession(...args: [websiteId: string, sessionId: string]) {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(websiteId: string, sessionId: string) {
   return prisma.client.session.findUnique({
     where: {
-      id,
+      id: sessionId,
     },
   });
 }
+
+async function clickhouseQuery(websiteId: string, sessionId: string) {
+  const { rawQuery } = clickhouse;
+
+  return rawQuery(
+    `
+    select
+      session_id as id,
+      website_id as websiteId,
+      min(created_at) as firstAt,
+      max(created_at) as lastAt,
+      hostname,
+      browser,
+      os,
+      device,
+      screen,
+      language,
+      country,
+      subdivision1,
+      city
+    from website_event
+    where website_id = {websiteId:UUID}
+    and session_id = {sessionId:UUID}
+    group by session_id, website_id, hostname, browser, os, device, screen, language, country, subdivision1, city
+    `,
+    { websiteId, sessionId },
+  ).then(result => result?.[0]);
+}
diff --git a/src/queries/analytics/sessions/getSessions.ts b/src/queries/analytics/sessions/getSessions.ts
index 538133bac3..e7c9596339 100644
--- a/src/queries/analytics/sessions/getSessions.ts
+++ b/src/queries/analytics/sessions/getSessions.ts
@@ -24,7 +24,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
 }
 
 async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
-  const { pagedQuery, parseFilters, getDateStringSQL } = clickhouse;
+  const { pagedQuery, parseFilters } = clickhouse;
   const { params, dateQuery, filterQuery } = await parseFilters(websiteId, filters);
 
   return pagedQuery(
@@ -32,7 +32,7 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
     select
       session_id as id,
       website_id as websiteId,
-      ${getDateStringSQL('created_at', 'second', filters.timezone)} as createdAt,
+      min(created_at) as createdAt,
       hostname,
       browser,
       os,
@@ -41,13 +41,13 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
       language,
       country,
       subdivision1,
-      subdivision2,
       city
     from website_event
     where website_id = {websiteId:UUID}
     ${dateQuery}
     ${filterQuery}
-    order by created_at desc
+    group by session_id, website_id, hostname, browser, os, device, screen, language, country, subdivision1, city
+    order by createdAt desc
     `,
     params,
     pageParams,
diff --git a/yarn.lock b/yarn.lock
index 1fe4013562..470cad8fc7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1381,6 +1381,199 @@
     debug "^3.1.0"
     lodash.once "^4.1.1"
 
+"@dicebear/adventurer-neutral@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/adventurer-neutral/-/adventurer-neutral-9.2.1.tgz#0416ff71d0dd3ff391db9c9fda2acb166b074c5f"
+  integrity sha512-iP6Tc6CgrJt63j08i/hlyNiGEbDNgP9Ws6WKT9n/0oTU9X/DKLncGStV3uhgYPIOVQE/tw9a/GjbGjrwBlN8CQ==
+
+"@dicebear/adventurer@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/adventurer/-/adventurer-9.2.1.tgz#3d522d2aaabe17d172ea2302bfdf62d601ebcd64"
+  integrity sha512-utJr8oEOwPy9y+7rIOnB7mls+2XQrc3Kdlx/ay9KBY/HEUMnwMoN/GJhg4HcyGnV+DS7VhN6JSrnwwD9+SQyBw==
+
+"@dicebear/avataaars-neutral@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/avataaars-neutral/-/avataaars-neutral-9.2.1.tgz#61d3894f4d08d9ee3722f3a64c36725729c6aaf3"
+  integrity sha512-yceQMVBLimAHgZDL8VKCDGNs5JQ8BERaUMNIJXXRKEYZXlofoXZpYtcWPKQY9lmRJJznO1GX7ZK12ILnZjRPBQ==
+
+"@dicebear/avataaars@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/avataaars/-/avataaars-9.2.1.tgz#2460fb0d7d364a12e546b40b6e56c220db71c851"
+  integrity sha512-WIZL7CWSsmzLswY/4ZrgtE/7EvnaNrYreLyT8hjiGyVb9J4cQaVZXSMuDIGFa5wT062AW/4/i82kh/7nh0oL+w==
+
+"@dicebear/big-ears-neutral@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/big-ears-neutral/-/big-ears-neutral-9.2.1.tgz#dfee12787f8a0efa7b3552fca5e9f24c9102fc44"
+  integrity sha512-98qOCFEhbqCHeyO7ZXBAMMov8bquZt8vhtjj0YeHjGjI/OEWbA2gxq2ryv1BHSehVc/vTrd1KbHag7yYoeCDuw==
+
+"@dicebear/big-ears@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/big-ears/-/big-ears-9.2.1.tgz#4a7f2f3d987c11d76602b6ee8b398f9dcd2ce486"
+  integrity sha512-BUVTonwSYiGKcnk8wdwUHZ1b34GhfzRpG1kguK4kWAKlayBq7Q+iDJlmk4Bch0XdDQc2bqFf1GQCCj+xXWRHyg==
+
+"@dicebear/big-smile@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/big-smile/-/big-smile-9.2.1.tgz#d6cf95d34d65a393901925df370a1afbd0b0ae76"
+  integrity sha512-bspur+wtnlv/Z4QDvRWg9rs3snf+iuBkamkgw4nZOUFKMlZdPQGqNoh1DkycRcLXNX1Q61KM172K6bS60ZlKxw==
+
+"@dicebear/bottts-neutral@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/bottts-neutral/-/bottts-neutral-9.2.1.tgz#cc89b1ed834b7e8b7163dee2928dc1aa74077f75"
+  integrity sha512-uwd+xcbRQUIHKQ1iEiLjf5RwCaVzOfBgIu2WRE+6MUaahYi6cJ0eJAs0h1q+zpgYyvqPDPDAi9j7AUwjmig0GA==
+
+"@dicebear/bottts@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/bottts/-/bottts-9.2.1.tgz#922ccdba942d8c2c15655be0b6f25f4e9691cb80"
+  integrity sha512-AQQ/WKd54G9sa+TkQptcu6c+Tjfc9hitgB70uA5GqJe+w6Bal+gwY6kPm5sJ1CY2mk/UBh1rXBuauQZ25bgTcQ==
+
+"@dicebear/collection@^9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/collection/-/collection-9.2.1.tgz#b2de84ef654ac1550458a17049b02a0013213b92"
+  integrity sha512-Su1eygO8llKuJ68N+xhBCzBN2Lqrsx9ZNdlvfZeH/s70RjL0raNQaI6/hRABDmlbLYwW4AjRh2lOgDdGfCp5DQ==
+  dependencies:
+    "@dicebear/adventurer" "9.2.1"
+    "@dicebear/adventurer-neutral" "9.2.1"
+    "@dicebear/avataaars" "9.2.1"
+    "@dicebear/avataaars-neutral" "9.2.1"
+    "@dicebear/big-ears" "9.2.1"
+    "@dicebear/big-ears-neutral" "9.2.1"
+    "@dicebear/big-smile" "9.2.1"
+    "@dicebear/bottts" "9.2.1"
+    "@dicebear/bottts-neutral" "9.2.1"
+    "@dicebear/croodles" "9.2.1"
+    "@dicebear/croodles-neutral" "9.2.1"
+    "@dicebear/dylan" "9.2.1"
+    "@dicebear/fun-emoji" "9.2.1"
+    "@dicebear/glass" "9.2.1"
+    "@dicebear/icons" "9.2.1"
+    "@dicebear/identicon" "9.2.1"
+    "@dicebear/initials" "9.2.1"
+    "@dicebear/lorelei" "9.2.1"
+    "@dicebear/lorelei-neutral" "9.2.1"
+    "@dicebear/micah" "9.2.1"
+    "@dicebear/miniavs" "9.2.1"
+    "@dicebear/notionists" "9.2.1"
+    "@dicebear/notionists-neutral" "9.2.1"
+    "@dicebear/open-peeps" "9.2.1"
+    "@dicebear/personas" "9.2.1"
+    "@dicebear/pixel-art" "9.2.1"
+    "@dicebear/pixel-art-neutral" "9.2.1"
+    "@dicebear/rings" "9.2.1"
+    "@dicebear/shapes" "9.2.1"
+    "@dicebear/thumbs" "9.2.1"
+
+"@dicebear/core@^9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/core/-/core-9.2.1.tgz#b93800ac7e21ae955cceaa2370e7dc033a3cc557"
+  integrity sha512-Y3E59+3xO2UWKdf3Zt/rwMdy9r7uccTgM89Kv8aXN1vmdrnA4YYmr4jslRRRqPLVpenuT4105nkboC4rMnDgHw==
+  dependencies:
+    "@types/json-schema" "^7.0.11"
+
+"@dicebear/croodles-neutral@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/croodles-neutral/-/croodles-neutral-9.2.1.tgz#379646cf53ba4d61b6c94c13b3ec3386359e3541"
+  integrity sha512-2iyr+B/y795P7cSIpFg4RjxUu6kljesKjtepvMzfeBR9xKyI84exBNHRoCTEVwOCFePmlPJX1qtw/YWM0sAPJw==
+
+"@dicebear/croodles@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/croodles/-/croodles-9.2.1.tgz#74fa6aa8c0ee0dc303c0ad82fd78f5d6cd66610d"
+  integrity sha512-V7+m21BizYTGgLgxmh5dxHHADeD3gkeuPYkhKqP8Uu8jZFBgh5wKFqqfVI/XSQkx/+lRla5c6l55mymgjt4k8Q==
+
+"@dicebear/dylan@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/dylan/-/dylan-9.2.1.tgz#997aff74b4bf112e4895463eeea0adc2456d332f"
+  integrity sha512-UeKz3Gxprh4bJ73Q2DjDpmjt854G3xfakc5KfeBmPV25EP+al7HCsM/HE+ZgKTSh+PPz5/mVtZQYU40pTzJEyg==
+
+"@dicebear/fun-emoji@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/fun-emoji/-/fun-emoji-9.2.1.tgz#e88c8c2db7927d732ef2d0af3a24c4d4152a7f02"
+  integrity sha512-F08p+Ggdxo4Ryji+3aCJXAKnjx4rM4UMtrJU4eA2t8lAkpwFNgfGK6mpMYPnxmKULYljGOgySmw7AyWcbX8s2Q==
+
+"@dicebear/glass@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/glass/-/glass-9.2.1.tgz#61bc231a5b0bd8d15cfa94c76ac608ab8fe98ac1"
+  integrity sha512-UoErQwg7/qkEKWyEDTyt8FYhw/aZryP0Tr7cwBEuxMXZ585NUTvEel0K5j9aDkBrimJVEM+jKzOFIIMAGLlR0g==
+
+"@dicebear/icons@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/icons/-/icons-9.2.1.tgz#0ef78e8ff742bd9985a3c36cd9cbd2705449e789"
+  integrity sha512-0VuWohGMiv4n1nxwehYi6w+PIT9OBRlV721yNoewQWgQCrnMKBvM0cFRX9Dtg+MvwLMslQCIU3pEauEZ5FNmFA==
+
+"@dicebear/identicon@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/identicon/-/identicon-9.2.1.tgz#aebd7b692de9a6601746ab47711359f81471841c"
+  integrity sha512-Dlqpn3tzqimR8KPIRkSJCKd5XwKgTLVXzT5KiY+2ysMZZQh4uJvBjVfY5SLrHDHC2a42W6EdwQxU6tFTRiKQuQ==
+
+"@dicebear/initials@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/initials/-/initials-9.2.1.tgz#d4e435c18e48837f97086ba5210d4742594ba181"
+  integrity sha512-d6Shnt1LiCf9yAEck3y/w4pXG4bWYVjBFCeI43l0BAR39Mk2Dq05UEFZH5Dtj2kyfNozMjh6vG1cQyBigtamug==
+
+"@dicebear/lorelei-neutral@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/lorelei-neutral/-/lorelei-neutral-9.2.1.tgz#5d5d6400c0e2232081f58f8d82efff00ee307b81"
+  integrity sha512-4YkkR697qXAYxN5N/zVsRe955QLhw0yLib2CzeBga1QXXMIkywq2nRFa3fr4toSRPl45kl1eF8J5HC17CU9inw==
+
+"@dicebear/lorelei@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/lorelei/-/lorelei-9.2.1.tgz#b23ddb02b098578ef1bcb121c7a638795f3de89e"
+  integrity sha512-DNjZpUpe/CxKK8Byn1meBvRz/NJWtBizcoS2DzIIyqPYOwA5cLIa2g/qKkESvXzU9naEMkiHfMZb1RYYzN2FAA==
+
+"@dicebear/micah@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/micah/-/micah-9.2.1.tgz#2e65fdb15b6ee6338123329c92e5afb98f694718"
+  integrity sha512-FK91igiVpPNhGCsfGpOgwYFKRP+FNR1V45Z4Tg/f82ux9TBdTmeoIfkgwrfhcXmCgagoYg2EAY+L72stUVapcA==
+
+"@dicebear/miniavs@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/miniavs/-/miniavs-9.2.1.tgz#de1e571663775b4b2a30944d8033d6a8b972aca3"
+  integrity sha512-r0TcaSrKJDPMqMYIiXNArq9i//cZzA1yuiXJw46iTloBDTh7yL1tpnL84CDxMpQ+OZLeMiRA6jVBx0coer4vmg==
+
+"@dicebear/notionists-neutral@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/notionists-neutral/-/notionists-neutral-9.2.1.tgz#2e77ae7330201628c4b3e4789b1aa83ffc684b82"
+  integrity sha512-Vi/FwMXzc1m/U2TjBnY9NHedoLbPc3BBsNQL8jPU27wdkXoyJHuXBevcUtsF0Zf8OuRbNpZKPbfYy6OYBr9qvw==
+
+"@dicebear/notionists@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/notionists/-/notionists-9.2.1.tgz#70aa14e8846a49096648f891a625a92b04513c75"
+  integrity sha512-oAyvPlp3xfFnDpW3nXhdAPGVm5WYj6VW6RgdzLAHoRO2EOYDNkQruIXd+d8JYo1DMTLUbgp3onr5AF9UU2OBzw==
+
+"@dicebear/open-peeps@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/open-peeps/-/open-peeps-9.2.1.tgz#dd9be6721ff7226e3a0286aec699fd6b0e0ad2b2"
+  integrity sha512-oPA/ljbPtuj2cdM0QtyJu2i24AaEMTIIk/FJbnrBK765WPnQcCZh84w+ZuInTMIfF9gYszNY34gaRD8Z6UiYxQ==
+
+"@dicebear/personas@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/personas/-/personas-9.2.1.tgz#dfa8291ebba098e8cebdeb04a4fba9e4384c4496"
+  integrity sha512-OgtyT9dnY8U60sUo0SLKCFVt0+dIr3a4vR0bDs/zwK4Qb/yTdB1VPdfxq0Fwk2q1vfn9YgbDrb0YYRgMRl60qQ==
+
+"@dicebear/pixel-art-neutral@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/pixel-art-neutral/-/pixel-art-neutral-9.2.1.tgz#457b4e038c9516e75d41c6c1efd9ff9d4099162a"
+  integrity sha512-GUtxJYX7/9XDgSZhkx24PB+yLcKkLHblDldvRr5xGlGxhgAovTBQFHLgCJxmUJgIaNW7pvSWCw7txguyxbBN9A==
+
+"@dicebear/pixel-art@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/pixel-art/-/pixel-art-9.2.1.tgz#e50bcc300a43c16ad3f69de1b6bf3dad92528274"
+  integrity sha512-ftKPKCvnS1cJ2OvuQLmtEIwdb9PzF5C2ofWBdVI/RFvhH1BhYc3OsdQ28o90+ZJQO4fivKwfsh8MPUTaqToQ7Q==
+
+"@dicebear/rings@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/rings/-/rings-9.2.1.tgz#ed6e930c02b09ebbd774fc104cffc5c23ffa6b4c"
+  integrity sha512-BlFYCaKB+wdpWWS28ZnQ/MvHeuNSRvkvWRoiw7pgS653LXx4kz/erVMmeVMSAr82y4BV+K8He2Rl2dMjuLyrXw==
+
+"@dicebear/shapes@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/shapes/-/shapes-9.2.1.tgz#e076b9aabd67bf611e9bbf7149919000e3d74197"
+  integrity sha512-cQzTcYimtuiAun55uPdIIhK53QTyjWqF/YN7LqEBGBqrJuGqHZBm1HXCcj7wPpoQ3zSy/2u8Rp0Etv7+5XFzyw==
+
+"@dicebear/thumbs@9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/thumbs/-/thumbs-9.2.1.tgz#174be721256e5ff97e19586a54bde8fd25468e74"
+  integrity sha512-ziX5HFmhiApO2k7QKj41+dGXbMdmQUUgFBYPyzTwnubhkDldJk7tpRoa5u2OsyTVDQCcPMv5mFSQpbANfmFwMg==
+
 "@esbuild/android-arm64@0.17.19":
   version "0.17.19"
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz#bafb75234a5d3d1b690e7c2956a599345e84a2fd"
@@ -2600,7 +2793,7 @@
     expect "^29.0.0"
     pretty-format "^29.0.0"
 
-"@types/json-schema@^7.0.12":
+"@types/json-schema@^7.0.11", "@types/json-schema@^7.0.12":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==

From c3c3b46ef693de21ef32b2c71c4f0fe2a86e3511 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Mon, 29 Jul 2024 01:38:36 -0700
Subject: [PATCH 228/438] Updated session profile page. Added TypeIcon
 component. Added useRegionNames hook.

---
 .../{browsers => browser}/android-webview.png | Bin
 .../images/{browsers => browser}/android.png  | Bin
 public/images/{browsers => browser}/aol.png   | Bin
 .../images/{browsers => browser}/beaker.png   | Bin
 .../{browsers => browser}/blackberry.png      | Bin
 public/images/{browsers => browser}/brave.png | Bin
 .../images/{browsers => browser}/chrome.png   | Bin
 .../chromium-webview.png                      | Bin
 public/images/{browsers => browser}/crios.png | Bin
 public/images/{browsers => browser}/curl.png  | Bin
 .../{browsers => browser}/edge-chromium.png   | Bin
 .../images/{browsers => browser}/edge-ios.png | Bin
 public/images/{browsers => browser}/edge.png  | Bin
 .../images/{browsers => browser}/facebook.png | Bin
 .../images/{browsers => browser}/firefox.png  | Bin
 public/images/{browsers => browser}/fxios.png | Bin
 public/images/{browsers => browser}/ie.png    | Bin
 .../{browsers => browser}/instagram.png       | Bin
 .../{browsers => browser}/ios-webview.png     | Bin
 public/images/{browsers => browser}/ios.png   | Bin
 .../{browsers => browser}/kakaotalk.png       | Bin
 public/images/{browsers => browser}/miui.png  | Bin
 .../{browsers => browser}/opera-mini.png      | Bin
 public/images/{browsers => browser}/opera.png | Bin
 .../images/{browsers => browser}/safari.png   | Bin
 .../images/{browsers => browser}/samsung.png  | Bin
 .../{browsers => browser}/searchbot.png       | Bin
 public/images/{browsers => browser}/silk.png  | Bin
 .../images/{browsers => browser}/unknown.png  | Bin
 .../{browsers => browser}/yandexbrowser.png   | Bin
 public/images/{flags => country}/ad.png       | Bin
 public/images/{flags => country}/ae.png       | Bin
 public/images/{flags => country}/af.png       | Bin
 public/images/{flags => country}/ag.png       | Bin
 public/images/{flags => country}/ai.png       | Bin
 public/images/{flags => country}/al.png       | Bin
 public/images/{flags => country}/am.png       | Bin
 public/images/{flags => country}/ao.png       | Bin
 public/images/{flags => country}/aq.png       | Bin
 public/images/{flags => country}/ar.png       | Bin
 public/images/{flags => country}/as.png       | Bin
 public/images/{flags => country}/at.png       | Bin
 public/images/{flags => country}/au.png       | Bin
 public/images/{flags => country}/aw.png       | Bin
 public/images/{flags => country}/ax.png       | Bin
 public/images/{flags => country}/az.png       | Bin
 public/images/{flags => country}/ba.png       | Bin
 public/images/{flags => country}/bb.png       | Bin
 public/images/{flags => country}/bd.png       | Bin
 public/images/{flags => country}/be.png       | Bin
 public/images/{flags => country}/bf.png       | Bin
 public/images/{flags => country}/bg.png       | Bin
 public/images/{flags => country}/bh.png       | Bin
 public/images/{flags => country}/bi.png       | Bin
 public/images/{flags => country}/bj.png       | Bin
 public/images/{flags => country}/bl.png       | Bin
 public/images/{flags => country}/bm.png       | Bin
 public/images/{flags => country}/bn.png       | Bin
 public/images/{flags => country}/bo.png       | Bin
 public/images/{flags => country}/bq.png       | Bin
 public/images/{flags => country}/br.png       | Bin
 public/images/{flags => country}/bs.png       | Bin
 public/images/{flags => country}/bt.png       | Bin
 public/images/{flags => country}/bv.png       | Bin
 public/images/{flags => country}/bw.png       | Bin
 public/images/{flags => country}/by.png       | Bin
 public/images/{flags => country}/bz.png       | Bin
 public/images/{flags => country}/ca.png       | Bin
 public/images/{flags => country}/cc.png       | Bin
 public/images/{flags => country}/cd.png       | Bin
 public/images/{flags => country}/cf.png       | Bin
 public/images/{flags => country}/cg.png       | Bin
 public/images/{flags => country}/ch.png       | Bin
 public/images/{flags => country}/ci.png       | Bin
 public/images/{flags => country}/ck.png       | Bin
 public/images/{flags => country}/cl.png       | Bin
 public/images/{flags => country}/cm.png       | Bin
 public/images/{flags => country}/cn.png       | Bin
 public/images/{flags => country}/co.png       | Bin
 public/images/{flags => country}/cr.png       | Bin
 public/images/{flags => country}/cu.png       | Bin
 public/images/{flags => country}/cv.png       | Bin
 public/images/{flags => country}/cw.png       | Bin
 public/images/{flags => country}/cx.png       | Bin
 public/images/{flags => country}/cy.png       | Bin
 public/images/{flags => country}/cz.png       | Bin
 public/images/{flags => country}/de.png       | Bin
 public/images/{flags => country}/dj.png       | Bin
 public/images/{flags => country}/dk.png       | Bin
 public/images/{flags => country}/dm.png       | Bin
 public/images/{flags => country}/do.png       | Bin
 public/images/{flags => country}/dz.png       | Bin
 public/images/{flags => country}/ec.png       | Bin
 public/images/{flags => country}/ee.png       | Bin
 public/images/{flags => country}/eg.png       | Bin
 public/images/{flags => country}/eh.png       | Bin
 public/images/{flags => country}/er.png       | Bin
 public/images/{flags => country}/es.png       | Bin
 public/images/{flags => country}/et.png       | Bin
 public/images/{flags => country}/fi.png       | Bin
 public/images/{flags => country}/fj.png       | Bin
 public/images/{flags => country}/fk.png       | Bin
 public/images/{flags => country}/fm.png       | Bin
 public/images/{flags => country}/fo.png       | Bin
 public/images/{flags => country}/fr.png       | Bin
 public/images/{flags => country}/ga.png       | Bin
 public/images/{flags => country}/gb-eng.png   | Bin
 public/images/{flags => country}/gb-nir.png   | Bin
 public/images/{flags => country}/gb-sct.png   | Bin
 public/images/{flags => country}/gb-wls.png   | Bin
 public/images/{flags => country}/gb.png       | Bin
 public/images/{flags => country}/gd.png       | Bin
 public/images/{flags => country}/ge.png       | Bin
 public/images/{flags => country}/gf.png       | Bin
 public/images/{flags => country}/gg.png       | Bin
 public/images/{flags => country}/gh.png       | Bin
 public/images/{flags => country}/gi.png       | Bin
 public/images/{flags => country}/gl.png       | Bin
 public/images/{flags => country}/gm.png       | Bin
 public/images/{flags => country}/gn.png       | Bin
 public/images/{flags => country}/gp.png       | Bin
 public/images/{flags => country}/gq.png       | Bin
 public/images/{flags => country}/gr.png       | Bin
 public/images/{flags => country}/gs.png       | Bin
 public/images/{flags => country}/gt.png       | Bin
 public/images/{flags => country}/gu.png       | Bin
 public/images/{flags => country}/gw.png       | Bin
 public/images/{flags => country}/gy.png       | Bin
 public/images/{flags => country}/hk.png       | Bin
 public/images/{flags => country}/hm.png       | Bin
 public/images/{flags => country}/hn.png       | Bin
 public/images/{flags => country}/hr.png       | Bin
 public/images/{flags => country}/ht.png       | Bin
 public/images/{flags => country}/hu.png       | Bin
 public/images/{flags => country}/id.png       | Bin
 public/images/{flags => country}/ie.png       | Bin
 public/images/{flags => country}/il.png       | Bin
 public/images/{flags => country}/im.png       | Bin
 public/images/{flags => country}/in.png       | Bin
 public/images/{flags => country}/io.png       | Bin
 public/images/{flags => country}/iq.png       | Bin
 public/images/{flags => country}/ir.png       | Bin
 public/images/{flags => country}/is.png       | Bin
 public/images/{flags => country}/it.png       | Bin
 public/images/{flags => country}/je.png       | Bin
 public/images/{flags => country}/jm.png       | Bin
 public/images/{flags => country}/jo.png       | Bin
 public/images/{flags => country}/jp.png       | Bin
 public/images/{flags => country}/ke.png       | Bin
 public/images/{flags => country}/kg.png       | Bin
 public/images/{flags => country}/kh.png       | Bin
 public/images/{flags => country}/ki.png       | Bin
 public/images/{flags => country}/km.png       | Bin
 public/images/{flags => country}/kn.png       | Bin
 public/images/{flags => country}/kp.png       | Bin
 public/images/{flags => country}/kr.png       | Bin
 public/images/{flags => country}/kw.png       | Bin
 public/images/{flags => country}/ky.png       | Bin
 public/images/{flags => country}/kz.png       | Bin
 public/images/{flags => country}/la.png       | Bin
 public/images/{flags => country}/lb.png       | Bin
 public/images/{flags => country}/lc.png       | Bin
 public/images/{flags => country}/li.png       | Bin
 public/images/{flags => country}/lk.png       | Bin
 public/images/{flags => country}/lr.png       | Bin
 public/images/{flags => country}/ls.png       | Bin
 public/images/{flags => country}/lt.png       | Bin
 public/images/{flags => country}/lu.png       | Bin
 public/images/{flags => country}/lv.png       | Bin
 public/images/{flags => country}/ly.png       | Bin
 public/images/{flags => country}/ma.png       | Bin
 public/images/{flags => country}/mc.png       | Bin
 public/images/{flags => country}/md.png       | Bin
 public/images/{flags => country}/me.png       | Bin
 public/images/{flags => country}/mf.png       | Bin
 public/images/{flags => country}/mg.png       | Bin
 public/images/{flags => country}/mh.png       | Bin
 public/images/{flags => country}/mk.png       | Bin
 public/images/{flags => country}/ml.png       | Bin
 public/images/{flags => country}/mm.png       | Bin
 public/images/{flags => country}/mn.png       | Bin
 public/images/{flags => country}/mo.png       | Bin
 public/images/{flags => country}/mp.png       | Bin
 public/images/{flags => country}/mq.png       | Bin
 public/images/{flags => country}/mr.png       | Bin
 public/images/{flags => country}/ms.png       | Bin
 public/images/{flags => country}/mt.png       | Bin
 public/images/{flags => country}/mu.png       | Bin
 public/images/{flags => country}/mv.png       | Bin
 public/images/{flags => country}/mw.png       | Bin
 public/images/{flags => country}/mx.png       | Bin
 public/images/{flags => country}/my.png       | Bin
 public/images/{flags => country}/mz.png       | Bin
 public/images/{flags => country}/na.png       | Bin
 public/images/{flags => country}/nc.png       | Bin
 public/images/{flags => country}/ne.png       | Bin
 public/images/{flags => country}/nf.png       | Bin
 public/images/{flags => country}/ng.png       | Bin
 public/images/{flags => country}/ni.png       | Bin
 public/images/{flags => country}/nl.png       | Bin
 public/images/{flags => country}/no.png       | Bin
 public/images/{flags => country}/np.png       | Bin
 public/images/{flags => country}/nr.png       | Bin
 public/images/{flags => country}/nu.png       | Bin
 public/images/{flags => country}/nz.png       | Bin
 public/images/{flags => country}/om.png       | Bin
 public/images/{flags => country}/pa.png       | Bin
 public/images/{flags => country}/pe.png       | Bin
 public/images/{flags => country}/pf.png       | Bin
 public/images/{flags => country}/pg.png       | Bin
 public/images/{flags => country}/ph.png       | Bin
 public/images/{flags => country}/pk.png       | Bin
 public/images/{flags => country}/pl.png       | Bin
 public/images/{flags => country}/pm.png       | Bin
 public/images/{flags => country}/pn.png       | Bin
 public/images/{flags => country}/pr.png       | Bin
 public/images/{flags => country}/ps.png       | Bin
 public/images/{flags => country}/pt.png       | Bin
 public/images/{flags => country}/pw.png       | Bin
 public/images/{flags => country}/py.png       | Bin
 public/images/{flags => country}/qa.png       | Bin
 public/images/{flags => country}/re.png       | Bin
 public/images/{flags => country}/ro.png       | Bin
 public/images/{flags => country}/rs.png       | Bin
 public/images/{flags => country}/ru.png       | Bin
 public/images/{flags => country}/rw.png       | Bin
 public/images/{flags => country}/sa.png       | Bin
 public/images/{flags => country}/sb.png       | Bin
 public/images/{flags => country}/sc.png       | Bin
 public/images/{flags => country}/sd.png       | Bin
 public/images/{flags => country}/se.png       | Bin
 public/images/{flags => country}/sg.png       | Bin
 public/images/{flags => country}/sh.png       | Bin
 public/images/{flags => country}/si.png       | Bin
 public/images/{flags => country}/sj.png       | Bin
 public/images/{flags => country}/sk.png       | Bin
 public/images/{flags => country}/sl.png       | Bin
 public/images/{flags => country}/sm.png       | Bin
 public/images/{flags => country}/sn.png       | Bin
 public/images/{flags => country}/so.png       | Bin
 public/images/{flags => country}/sr.png       | Bin
 public/images/{flags => country}/ss.png       | Bin
 public/images/{flags => country}/st.png       | Bin
 public/images/{flags => country}/sv.png       | Bin
 public/images/{flags => country}/sx.png       | Bin
 public/images/{flags => country}/sy.png       | Bin
 public/images/{flags => country}/sz.png       | Bin
 public/images/{flags => country}/tc.png       | Bin
 public/images/{flags => country}/td.png       | Bin
 public/images/{flags => country}/tf.png       | Bin
 public/images/{flags => country}/tg.png       | Bin
 public/images/{flags => country}/th.png       | Bin
 public/images/{flags => country}/tj.png       | Bin
 public/images/{flags => country}/tk.png       | Bin
 public/images/{flags => country}/tl.png       | Bin
 public/images/{flags => country}/tm.png       | Bin
 public/images/{flags => country}/tn.png       | Bin
 public/images/{flags => country}/to.png       | Bin
 public/images/{flags => country}/tr.png       | Bin
 public/images/{flags => country}/tt.png       | Bin
 public/images/{flags => country}/tv.png       | Bin
 public/images/{flags => country}/tw.png       | Bin
 public/images/{flags => country}/tz.png       | Bin
 public/images/{flags => country}/ua.png       | Bin
 public/images/{flags => country}/ug.png       | Bin
 public/images/{flags => country}/um.png       | Bin
 .../{flags/xx.png => country/unknown.png}     | Bin
 public/images/{flags => country}/us.png       | Bin
 public/images/{flags => country}/uy.png       | Bin
 public/images/{flags => country}/uz.png       | Bin
 public/images/{flags => country}/va.png       | Bin
 public/images/{flags => country}/vc.png       | Bin
 public/images/{flags => country}/ve.png       | Bin
 public/images/{flags => country}/vg.png       | Bin
 public/images/{flags => country}/vi.png       | Bin
 public/images/{flags => country}/vn.png       | Bin
 public/images/{flags => country}/vu.png       | Bin
 public/images/{flags => country}/wf.png       | Bin
 public/images/{flags => country}/ws.png       | Bin
 public/images/{flags => country}/xk.png       | Bin
 public/images/{flags => country}/ye.png       | Bin
 public/images/{flags => country}/yt.png       | Bin
 public/images/{flags => country}/za.png       | Bin
 public/images/{flags => country}/zm.png       | Bin
 public/images/{flags => country}/zw.png       | Bin
 .../[websiteId]/WebsiteDetailsPage.tsx        |   5 +-
 .../websites/[websiteId]/WebsiteProvider.tsx  |   1 +
 .../compare/WebsiteComparePage.tsx            |   5 +-
 .../(main)/websites/[websiteId]/layout.tsx    |  17 +++++
 .../realtime/RealtimeCountries.tsx            |   8 +--
 .../[websiteId]/realtime/RealtimeLog.tsx      |   2 +-
 .../realtime/WebsiteRealtimePage.tsx          |   5 +-
 .../[websiteId]/sessions/SessionsTable.tsx    |  13 ++--
 .../[sessionId]/SessionDetailsPage.module.css |  15 +++++
 .../[sessionId]/SessionDetailsPage.tsx        |  13 +++-
 .../[sessionId]/SessionInfo.module.css        |  17 +++++
 .../sessions/[sessionId]/SessionInfo.tsx      |  63 +++++++++++++++---
 src/components/common/TypeIcon.tsx            |  18 +++++
 src/components/hooks/index.ts                 |   1 +
 src/components/hooks/useCountryNames.ts       |   2 +-
 src/components/hooks/useFormat.ts             |   2 +-
 src/components/hooks/useRegionNames.ts        |  19 ++++++
 src/components/icons.ts                       |   2 +
 src/components/messages.ts                    |   2 +
 src/components/metrics/BrowsersTable.tsx      |   8 +--
 src/components/metrics/CitiesTable.tsx        |  10 +--
 src/components/metrics/CountriesTable.tsx     |   8 +--
 src/components/metrics/DevicesTable.tsx       |  10 +--
 src/components/metrics/OSTable.tsx            |  10 +--
 src/components/metrics/RegionsTable.tsx       |  20 ++----
 src/components/metrics/WorldMap.tsx           |   2 +-
 src/queries/analytics/sessions/getSession.ts  |   6 +-
 src/queries/analytics/sessions/getSessions.ts |   7 +-
 313 files changed, 197 insertions(+), 94 deletions(-)
 rename public/images/{browsers => browser}/android-webview.png (100%)
 rename public/images/{browsers => browser}/android.png (100%)
 rename public/images/{browsers => browser}/aol.png (100%)
 rename public/images/{browsers => browser}/beaker.png (100%)
 rename public/images/{browsers => browser}/blackberry.png (100%)
 rename public/images/{browsers => browser}/brave.png (100%)
 rename public/images/{browsers => browser}/chrome.png (100%)
 rename public/images/{browsers => browser}/chromium-webview.png (100%)
 rename public/images/{browsers => browser}/crios.png (100%)
 rename public/images/{browsers => browser}/curl.png (100%)
 rename public/images/{browsers => browser}/edge-chromium.png (100%)
 rename public/images/{browsers => browser}/edge-ios.png (100%)
 rename public/images/{browsers => browser}/edge.png (100%)
 rename public/images/{browsers => browser}/facebook.png (100%)
 rename public/images/{browsers => browser}/firefox.png (100%)
 rename public/images/{browsers => browser}/fxios.png (100%)
 rename public/images/{browsers => browser}/ie.png (100%)
 rename public/images/{browsers => browser}/instagram.png (100%)
 rename public/images/{browsers => browser}/ios-webview.png (100%)
 rename public/images/{browsers => browser}/ios.png (100%)
 rename public/images/{browsers => browser}/kakaotalk.png (100%)
 rename public/images/{browsers => browser}/miui.png (100%)
 rename public/images/{browsers => browser}/opera-mini.png (100%)
 rename public/images/{browsers => browser}/opera.png (100%)
 rename public/images/{browsers => browser}/safari.png (100%)
 rename public/images/{browsers => browser}/samsung.png (100%)
 rename public/images/{browsers => browser}/searchbot.png (100%)
 rename public/images/{browsers => browser}/silk.png (100%)
 rename public/images/{browsers => browser}/unknown.png (100%)
 rename public/images/{browsers => browser}/yandexbrowser.png (100%)
 rename public/images/{flags => country}/ad.png (100%)
 rename public/images/{flags => country}/ae.png (100%)
 rename public/images/{flags => country}/af.png (100%)
 rename public/images/{flags => country}/ag.png (100%)
 rename public/images/{flags => country}/ai.png (100%)
 rename public/images/{flags => country}/al.png (100%)
 rename public/images/{flags => country}/am.png (100%)
 rename public/images/{flags => country}/ao.png (100%)
 rename public/images/{flags => country}/aq.png (100%)
 rename public/images/{flags => country}/ar.png (100%)
 rename public/images/{flags => country}/as.png (100%)
 rename public/images/{flags => country}/at.png (100%)
 rename public/images/{flags => country}/au.png (100%)
 rename public/images/{flags => country}/aw.png (100%)
 rename public/images/{flags => country}/ax.png (100%)
 rename public/images/{flags => country}/az.png (100%)
 rename public/images/{flags => country}/ba.png (100%)
 rename public/images/{flags => country}/bb.png (100%)
 rename public/images/{flags => country}/bd.png (100%)
 rename public/images/{flags => country}/be.png (100%)
 rename public/images/{flags => country}/bf.png (100%)
 rename public/images/{flags => country}/bg.png (100%)
 rename public/images/{flags => country}/bh.png (100%)
 rename public/images/{flags => country}/bi.png (100%)
 rename public/images/{flags => country}/bj.png (100%)
 rename public/images/{flags => country}/bl.png (100%)
 rename public/images/{flags => country}/bm.png (100%)
 rename public/images/{flags => country}/bn.png (100%)
 rename public/images/{flags => country}/bo.png (100%)
 rename public/images/{flags => country}/bq.png (100%)
 rename public/images/{flags => country}/br.png (100%)
 rename public/images/{flags => country}/bs.png (100%)
 rename public/images/{flags => country}/bt.png (100%)
 rename public/images/{flags => country}/bv.png (100%)
 rename public/images/{flags => country}/bw.png (100%)
 rename public/images/{flags => country}/by.png (100%)
 rename public/images/{flags => country}/bz.png (100%)
 rename public/images/{flags => country}/ca.png (100%)
 rename public/images/{flags => country}/cc.png (100%)
 rename public/images/{flags => country}/cd.png (100%)
 rename public/images/{flags => country}/cf.png (100%)
 rename public/images/{flags => country}/cg.png (100%)
 rename public/images/{flags => country}/ch.png (100%)
 rename public/images/{flags => country}/ci.png (100%)
 rename public/images/{flags => country}/ck.png (100%)
 rename public/images/{flags => country}/cl.png (100%)
 rename public/images/{flags => country}/cm.png (100%)
 rename public/images/{flags => country}/cn.png (100%)
 rename public/images/{flags => country}/co.png (100%)
 rename public/images/{flags => country}/cr.png (100%)
 rename public/images/{flags => country}/cu.png (100%)
 rename public/images/{flags => country}/cv.png (100%)
 rename public/images/{flags => country}/cw.png (100%)
 rename public/images/{flags => country}/cx.png (100%)
 rename public/images/{flags => country}/cy.png (100%)
 rename public/images/{flags => country}/cz.png (100%)
 rename public/images/{flags => country}/de.png (100%)
 rename public/images/{flags => country}/dj.png (100%)
 rename public/images/{flags => country}/dk.png (100%)
 rename public/images/{flags => country}/dm.png (100%)
 rename public/images/{flags => country}/do.png (100%)
 rename public/images/{flags => country}/dz.png (100%)
 rename public/images/{flags => country}/ec.png (100%)
 rename public/images/{flags => country}/ee.png (100%)
 rename public/images/{flags => country}/eg.png (100%)
 rename public/images/{flags => country}/eh.png (100%)
 rename public/images/{flags => country}/er.png (100%)
 rename public/images/{flags => country}/es.png (100%)
 rename public/images/{flags => country}/et.png (100%)
 rename public/images/{flags => country}/fi.png (100%)
 rename public/images/{flags => country}/fj.png (100%)
 rename public/images/{flags => country}/fk.png (100%)
 rename public/images/{flags => country}/fm.png (100%)
 rename public/images/{flags => country}/fo.png (100%)
 rename public/images/{flags => country}/fr.png (100%)
 rename public/images/{flags => country}/ga.png (100%)
 rename public/images/{flags => country}/gb-eng.png (100%)
 rename public/images/{flags => country}/gb-nir.png (100%)
 rename public/images/{flags => country}/gb-sct.png (100%)
 rename public/images/{flags => country}/gb-wls.png (100%)
 rename public/images/{flags => country}/gb.png (100%)
 rename public/images/{flags => country}/gd.png (100%)
 rename public/images/{flags => country}/ge.png (100%)
 rename public/images/{flags => country}/gf.png (100%)
 rename public/images/{flags => country}/gg.png (100%)
 rename public/images/{flags => country}/gh.png (100%)
 rename public/images/{flags => country}/gi.png (100%)
 rename public/images/{flags => country}/gl.png (100%)
 rename public/images/{flags => country}/gm.png (100%)
 rename public/images/{flags => country}/gn.png (100%)
 rename public/images/{flags => country}/gp.png (100%)
 rename public/images/{flags => country}/gq.png (100%)
 rename public/images/{flags => country}/gr.png (100%)
 rename public/images/{flags => country}/gs.png (100%)
 rename public/images/{flags => country}/gt.png (100%)
 rename public/images/{flags => country}/gu.png (100%)
 rename public/images/{flags => country}/gw.png (100%)
 rename public/images/{flags => country}/gy.png (100%)
 rename public/images/{flags => country}/hk.png (100%)
 rename public/images/{flags => country}/hm.png (100%)
 rename public/images/{flags => country}/hn.png (100%)
 rename public/images/{flags => country}/hr.png (100%)
 rename public/images/{flags => country}/ht.png (100%)
 rename public/images/{flags => country}/hu.png (100%)
 rename public/images/{flags => country}/id.png (100%)
 rename public/images/{flags => country}/ie.png (100%)
 rename public/images/{flags => country}/il.png (100%)
 rename public/images/{flags => country}/im.png (100%)
 rename public/images/{flags => country}/in.png (100%)
 rename public/images/{flags => country}/io.png (100%)
 rename public/images/{flags => country}/iq.png (100%)
 rename public/images/{flags => country}/ir.png (100%)
 rename public/images/{flags => country}/is.png (100%)
 rename public/images/{flags => country}/it.png (100%)
 rename public/images/{flags => country}/je.png (100%)
 rename public/images/{flags => country}/jm.png (100%)
 rename public/images/{flags => country}/jo.png (100%)
 rename public/images/{flags => country}/jp.png (100%)
 rename public/images/{flags => country}/ke.png (100%)
 rename public/images/{flags => country}/kg.png (100%)
 rename public/images/{flags => country}/kh.png (100%)
 rename public/images/{flags => country}/ki.png (100%)
 rename public/images/{flags => country}/km.png (100%)
 rename public/images/{flags => country}/kn.png (100%)
 rename public/images/{flags => country}/kp.png (100%)
 rename public/images/{flags => country}/kr.png (100%)
 rename public/images/{flags => country}/kw.png (100%)
 rename public/images/{flags => country}/ky.png (100%)
 rename public/images/{flags => country}/kz.png (100%)
 rename public/images/{flags => country}/la.png (100%)
 rename public/images/{flags => country}/lb.png (100%)
 rename public/images/{flags => country}/lc.png (100%)
 rename public/images/{flags => country}/li.png (100%)
 rename public/images/{flags => country}/lk.png (100%)
 rename public/images/{flags => country}/lr.png (100%)
 rename public/images/{flags => country}/ls.png (100%)
 rename public/images/{flags => country}/lt.png (100%)
 rename public/images/{flags => country}/lu.png (100%)
 rename public/images/{flags => country}/lv.png (100%)
 rename public/images/{flags => country}/ly.png (100%)
 rename public/images/{flags => country}/ma.png (100%)
 rename public/images/{flags => country}/mc.png (100%)
 rename public/images/{flags => country}/md.png (100%)
 rename public/images/{flags => country}/me.png (100%)
 rename public/images/{flags => country}/mf.png (100%)
 rename public/images/{flags => country}/mg.png (100%)
 rename public/images/{flags => country}/mh.png (100%)
 rename public/images/{flags => country}/mk.png (100%)
 rename public/images/{flags => country}/ml.png (100%)
 rename public/images/{flags => country}/mm.png (100%)
 rename public/images/{flags => country}/mn.png (100%)
 rename public/images/{flags => country}/mo.png (100%)
 rename public/images/{flags => country}/mp.png (100%)
 rename public/images/{flags => country}/mq.png (100%)
 rename public/images/{flags => country}/mr.png (100%)
 rename public/images/{flags => country}/ms.png (100%)
 rename public/images/{flags => country}/mt.png (100%)
 rename public/images/{flags => country}/mu.png (100%)
 rename public/images/{flags => country}/mv.png (100%)
 rename public/images/{flags => country}/mw.png (100%)
 rename public/images/{flags => country}/mx.png (100%)
 rename public/images/{flags => country}/my.png (100%)
 rename public/images/{flags => country}/mz.png (100%)
 rename public/images/{flags => country}/na.png (100%)
 rename public/images/{flags => country}/nc.png (100%)
 rename public/images/{flags => country}/ne.png (100%)
 rename public/images/{flags => country}/nf.png (100%)
 rename public/images/{flags => country}/ng.png (100%)
 rename public/images/{flags => country}/ni.png (100%)
 rename public/images/{flags => country}/nl.png (100%)
 rename public/images/{flags => country}/no.png (100%)
 rename public/images/{flags => country}/np.png (100%)
 rename public/images/{flags => country}/nr.png (100%)
 rename public/images/{flags => country}/nu.png (100%)
 rename public/images/{flags => country}/nz.png (100%)
 rename public/images/{flags => country}/om.png (100%)
 rename public/images/{flags => country}/pa.png (100%)
 rename public/images/{flags => country}/pe.png (100%)
 rename public/images/{flags => country}/pf.png (100%)
 rename public/images/{flags => country}/pg.png (100%)
 rename public/images/{flags => country}/ph.png (100%)
 rename public/images/{flags => country}/pk.png (100%)
 rename public/images/{flags => country}/pl.png (100%)
 rename public/images/{flags => country}/pm.png (100%)
 rename public/images/{flags => country}/pn.png (100%)
 rename public/images/{flags => country}/pr.png (100%)
 rename public/images/{flags => country}/ps.png (100%)
 rename public/images/{flags => country}/pt.png (100%)
 rename public/images/{flags => country}/pw.png (100%)
 rename public/images/{flags => country}/py.png (100%)
 rename public/images/{flags => country}/qa.png (100%)
 rename public/images/{flags => country}/re.png (100%)
 rename public/images/{flags => country}/ro.png (100%)
 rename public/images/{flags => country}/rs.png (100%)
 rename public/images/{flags => country}/ru.png (100%)
 rename public/images/{flags => country}/rw.png (100%)
 rename public/images/{flags => country}/sa.png (100%)
 rename public/images/{flags => country}/sb.png (100%)
 rename public/images/{flags => country}/sc.png (100%)
 rename public/images/{flags => country}/sd.png (100%)
 rename public/images/{flags => country}/se.png (100%)
 rename public/images/{flags => country}/sg.png (100%)
 rename public/images/{flags => country}/sh.png (100%)
 rename public/images/{flags => country}/si.png (100%)
 rename public/images/{flags => country}/sj.png (100%)
 rename public/images/{flags => country}/sk.png (100%)
 rename public/images/{flags => country}/sl.png (100%)
 rename public/images/{flags => country}/sm.png (100%)
 rename public/images/{flags => country}/sn.png (100%)
 rename public/images/{flags => country}/so.png (100%)
 rename public/images/{flags => country}/sr.png (100%)
 rename public/images/{flags => country}/ss.png (100%)
 rename public/images/{flags => country}/st.png (100%)
 rename public/images/{flags => country}/sv.png (100%)
 rename public/images/{flags => country}/sx.png (100%)
 rename public/images/{flags => country}/sy.png (100%)
 rename public/images/{flags => country}/sz.png (100%)
 rename public/images/{flags => country}/tc.png (100%)
 rename public/images/{flags => country}/td.png (100%)
 rename public/images/{flags => country}/tf.png (100%)
 rename public/images/{flags => country}/tg.png (100%)
 rename public/images/{flags => country}/th.png (100%)
 rename public/images/{flags => country}/tj.png (100%)
 rename public/images/{flags => country}/tk.png (100%)
 rename public/images/{flags => country}/tl.png (100%)
 rename public/images/{flags => country}/tm.png (100%)
 rename public/images/{flags => country}/tn.png (100%)
 rename public/images/{flags => country}/to.png (100%)
 rename public/images/{flags => country}/tr.png (100%)
 rename public/images/{flags => country}/tt.png (100%)
 rename public/images/{flags => country}/tv.png (100%)
 rename public/images/{flags => country}/tw.png (100%)
 rename public/images/{flags => country}/tz.png (100%)
 rename public/images/{flags => country}/ua.png (100%)
 rename public/images/{flags => country}/ug.png (100%)
 rename public/images/{flags => country}/um.png (100%)
 rename public/images/{flags/xx.png => country/unknown.png} (100%)
 rename public/images/{flags => country}/us.png (100%)
 rename public/images/{flags => country}/uy.png (100%)
 rename public/images/{flags => country}/uz.png (100%)
 rename public/images/{flags => country}/va.png (100%)
 rename public/images/{flags => country}/vc.png (100%)
 rename public/images/{flags => country}/ve.png (100%)
 rename public/images/{flags => country}/vg.png (100%)
 rename public/images/{flags => country}/vi.png (100%)
 rename public/images/{flags => country}/vn.png (100%)
 rename public/images/{flags => country}/vu.png (100%)
 rename public/images/{flags => country}/wf.png (100%)
 rename public/images/{flags => country}/ws.png (100%)
 rename public/images/{flags => country}/xk.png (100%)
 rename public/images/{flags => country}/ye.png (100%)
 rename public/images/{flags => country}/yt.png (100%)
 rename public/images/{flags => country}/za.png (100%)
 rename public/images/{flags => country}/zm.png (100%)
 rename public/images/{flags => country}/zw.png (100%)
 create mode 100644 src/app/(main)/websites/[websiteId]/layout.tsx
 create mode 100644 src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.module.css
 create mode 100644 src/components/common/TypeIcon.tsx
 create mode 100644 src/components/hooks/useRegionNames.ts

diff --git a/public/images/browsers/android-webview.png b/public/images/browser/android-webview.png
similarity index 100%
rename from public/images/browsers/android-webview.png
rename to public/images/browser/android-webview.png
diff --git a/public/images/browsers/android.png b/public/images/browser/android.png
similarity index 100%
rename from public/images/browsers/android.png
rename to public/images/browser/android.png
diff --git a/public/images/browsers/aol.png b/public/images/browser/aol.png
similarity index 100%
rename from public/images/browsers/aol.png
rename to public/images/browser/aol.png
diff --git a/public/images/browsers/beaker.png b/public/images/browser/beaker.png
similarity index 100%
rename from public/images/browsers/beaker.png
rename to public/images/browser/beaker.png
diff --git a/public/images/browsers/blackberry.png b/public/images/browser/blackberry.png
similarity index 100%
rename from public/images/browsers/blackberry.png
rename to public/images/browser/blackberry.png
diff --git a/public/images/browsers/brave.png b/public/images/browser/brave.png
similarity index 100%
rename from public/images/browsers/brave.png
rename to public/images/browser/brave.png
diff --git a/public/images/browsers/chrome.png b/public/images/browser/chrome.png
similarity index 100%
rename from public/images/browsers/chrome.png
rename to public/images/browser/chrome.png
diff --git a/public/images/browsers/chromium-webview.png b/public/images/browser/chromium-webview.png
similarity index 100%
rename from public/images/browsers/chromium-webview.png
rename to public/images/browser/chromium-webview.png
diff --git a/public/images/browsers/crios.png b/public/images/browser/crios.png
similarity index 100%
rename from public/images/browsers/crios.png
rename to public/images/browser/crios.png
diff --git a/public/images/browsers/curl.png b/public/images/browser/curl.png
similarity index 100%
rename from public/images/browsers/curl.png
rename to public/images/browser/curl.png
diff --git a/public/images/browsers/edge-chromium.png b/public/images/browser/edge-chromium.png
similarity index 100%
rename from public/images/browsers/edge-chromium.png
rename to public/images/browser/edge-chromium.png
diff --git a/public/images/browsers/edge-ios.png b/public/images/browser/edge-ios.png
similarity index 100%
rename from public/images/browsers/edge-ios.png
rename to public/images/browser/edge-ios.png
diff --git a/public/images/browsers/edge.png b/public/images/browser/edge.png
similarity index 100%
rename from public/images/browsers/edge.png
rename to public/images/browser/edge.png
diff --git a/public/images/browsers/facebook.png b/public/images/browser/facebook.png
similarity index 100%
rename from public/images/browsers/facebook.png
rename to public/images/browser/facebook.png
diff --git a/public/images/browsers/firefox.png b/public/images/browser/firefox.png
similarity index 100%
rename from public/images/browsers/firefox.png
rename to public/images/browser/firefox.png
diff --git a/public/images/browsers/fxios.png b/public/images/browser/fxios.png
similarity index 100%
rename from public/images/browsers/fxios.png
rename to public/images/browser/fxios.png
diff --git a/public/images/browsers/ie.png b/public/images/browser/ie.png
similarity index 100%
rename from public/images/browsers/ie.png
rename to public/images/browser/ie.png
diff --git a/public/images/browsers/instagram.png b/public/images/browser/instagram.png
similarity index 100%
rename from public/images/browsers/instagram.png
rename to public/images/browser/instagram.png
diff --git a/public/images/browsers/ios-webview.png b/public/images/browser/ios-webview.png
similarity index 100%
rename from public/images/browsers/ios-webview.png
rename to public/images/browser/ios-webview.png
diff --git a/public/images/browsers/ios.png b/public/images/browser/ios.png
similarity index 100%
rename from public/images/browsers/ios.png
rename to public/images/browser/ios.png
diff --git a/public/images/browsers/kakaotalk.png b/public/images/browser/kakaotalk.png
similarity index 100%
rename from public/images/browsers/kakaotalk.png
rename to public/images/browser/kakaotalk.png
diff --git a/public/images/browsers/miui.png b/public/images/browser/miui.png
similarity index 100%
rename from public/images/browsers/miui.png
rename to public/images/browser/miui.png
diff --git a/public/images/browsers/opera-mini.png b/public/images/browser/opera-mini.png
similarity index 100%
rename from public/images/browsers/opera-mini.png
rename to public/images/browser/opera-mini.png
diff --git a/public/images/browsers/opera.png b/public/images/browser/opera.png
similarity index 100%
rename from public/images/browsers/opera.png
rename to public/images/browser/opera.png
diff --git a/public/images/browsers/safari.png b/public/images/browser/safari.png
similarity index 100%
rename from public/images/browsers/safari.png
rename to public/images/browser/safari.png
diff --git a/public/images/browsers/samsung.png b/public/images/browser/samsung.png
similarity index 100%
rename from public/images/browsers/samsung.png
rename to public/images/browser/samsung.png
diff --git a/public/images/browsers/searchbot.png b/public/images/browser/searchbot.png
similarity index 100%
rename from public/images/browsers/searchbot.png
rename to public/images/browser/searchbot.png
diff --git a/public/images/browsers/silk.png b/public/images/browser/silk.png
similarity index 100%
rename from public/images/browsers/silk.png
rename to public/images/browser/silk.png
diff --git a/public/images/browsers/unknown.png b/public/images/browser/unknown.png
similarity index 100%
rename from public/images/browsers/unknown.png
rename to public/images/browser/unknown.png
diff --git a/public/images/browsers/yandexbrowser.png b/public/images/browser/yandexbrowser.png
similarity index 100%
rename from public/images/browsers/yandexbrowser.png
rename to public/images/browser/yandexbrowser.png
diff --git a/public/images/flags/ad.png b/public/images/country/ad.png
similarity index 100%
rename from public/images/flags/ad.png
rename to public/images/country/ad.png
diff --git a/public/images/flags/ae.png b/public/images/country/ae.png
similarity index 100%
rename from public/images/flags/ae.png
rename to public/images/country/ae.png
diff --git a/public/images/flags/af.png b/public/images/country/af.png
similarity index 100%
rename from public/images/flags/af.png
rename to public/images/country/af.png
diff --git a/public/images/flags/ag.png b/public/images/country/ag.png
similarity index 100%
rename from public/images/flags/ag.png
rename to public/images/country/ag.png
diff --git a/public/images/flags/ai.png b/public/images/country/ai.png
similarity index 100%
rename from public/images/flags/ai.png
rename to public/images/country/ai.png
diff --git a/public/images/flags/al.png b/public/images/country/al.png
similarity index 100%
rename from public/images/flags/al.png
rename to public/images/country/al.png
diff --git a/public/images/flags/am.png b/public/images/country/am.png
similarity index 100%
rename from public/images/flags/am.png
rename to public/images/country/am.png
diff --git a/public/images/flags/ao.png b/public/images/country/ao.png
similarity index 100%
rename from public/images/flags/ao.png
rename to public/images/country/ao.png
diff --git a/public/images/flags/aq.png b/public/images/country/aq.png
similarity index 100%
rename from public/images/flags/aq.png
rename to public/images/country/aq.png
diff --git a/public/images/flags/ar.png b/public/images/country/ar.png
similarity index 100%
rename from public/images/flags/ar.png
rename to public/images/country/ar.png
diff --git a/public/images/flags/as.png b/public/images/country/as.png
similarity index 100%
rename from public/images/flags/as.png
rename to public/images/country/as.png
diff --git a/public/images/flags/at.png b/public/images/country/at.png
similarity index 100%
rename from public/images/flags/at.png
rename to public/images/country/at.png
diff --git a/public/images/flags/au.png b/public/images/country/au.png
similarity index 100%
rename from public/images/flags/au.png
rename to public/images/country/au.png
diff --git a/public/images/flags/aw.png b/public/images/country/aw.png
similarity index 100%
rename from public/images/flags/aw.png
rename to public/images/country/aw.png
diff --git a/public/images/flags/ax.png b/public/images/country/ax.png
similarity index 100%
rename from public/images/flags/ax.png
rename to public/images/country/ax.png
diff --git a/public/images/flags/az.png b/public/images/country/az.png
similarity index 100%
rename from public/images/flags/az.png
rename to public/images/country/az.png
diff --git a/public/images/flags/ba.png b/public/images/country/ba.png
similarity index 100%
rename from public/images/flags/ba.png
rename to public/images/country/ba.png
diff --git a/public/images/flags/bb.png b/public/images/country/bb.png
similarity index 100%
rename from public/images/flags/bb.png
rename to public/images/country/bb.png
diff --git a/public/images/flags/bd.png b/public/images/country/bd.png
similarity index 100%
rename from public/images/flags/bd.png
rename to public/images/country/bd.png
diff --git a/public/images/flags/be.png b/public/images/country/be.png
similarity index 100%
rename from public/images/flags/be.png
rename to public/images/country/be.png
diff --git a/public/images/flags/bf.png b/public/images/country/bf.png
similarity index 100%
rename from public/images/flags/bf.png
rename to public/images/country/bf.png
diff --git a/public/images/flags/bg.png b/public/images/country/bg.png
similarity index 100%
rename from public/images/flags/bg.png
rename to public/images/country/bg.png
diff --git a/public/images/flags/bh.png b/public/images/country/bh.png
similarity index 100%
rename from public/images/flags/bh.png
rename to public/images/country/bh.png
diff --git a/public/images/flags/bi.png b/public/images/country/bi.png
similarity index 100%
rename from public/images/flags/bi.png
rename to public/images/country/bi.png
diff --git a/public/images/flags/bj.png b/public/images/country/bj.png
similarity index 100%
rename from public/images/flags/bj.png
rename to public/images/country/bj.png
diff --git a/public/images/flags/bl.png b/public/images/country/bl.png
similarity index 100%
rename from public/images/flags/bl.png
rename to public/images/country/bl.png
diff --git a/public/images/flags/bm.png b/public/images/country/bm.png
similarity index 100%
rename from public/images/flags/bm.png
rename to public/images/country/bm.png
diff --git a/public/images/flags/bn.png b/public/images/country/bn.png
similarity index 100%
rename from public/images/flags/bn.png
rename to public/images/country/bn.png
diff --git a/public/images/flags/bo.png b/public/images/country/bo.png
similarity index 100%
rename from public/images/flags/bo.png
rename to public/images/country/bo.png
diff --git a/public/images/flags/bq.png b/public/images/country/bq.png
similarity index 100%
rename from public/images/flags/bq.png
rename to public/images/country/bq.png
diff --git a/public/images/flags/br.png b/public/images/country/br.png
similarity index 100%
rename from public/images/flags/br.png
rename to public/images/country/br.png
diff --git a/public/images/flags/bs.png b/public/images/country/bs.png
similarity index 100%
rename from public/images/flags/bs.png
rename to public/images/country/bs.png
diff --git a/public/images/flags/bt.png b/public/images/country/bt.png
similarity index 100%
rename from public/images/flags/bt.png
rename to public/images/country/bt.png
diff --git a/public/images/flags/bv.png b/public/images/country/bv.png
similarity index 100%
rename from public/images/flags/bv.png
rename to public/images/country/bv.png
diff --git a/public/images/flags/bw.png b/public/images/country/bw.png
similarity index 100%
rename from public/images/flags/bw.png
rename to public/images/country/bw.png
diff --git a/public/images/flags/by.png b/public/images/country/by.png
similarity index 100%
rename from public/images/flags/by.png
rename to public/images/country/by.png
diff --git a/public/images/flags/bz.png b/public/images/country/bz.png
similarity index 100%
rename from public/images/flags/bz.png
rename to public/images/country/bz.png
diff --git a/public/images/flags/ca.png b/public/images/country/ca.png
similarity index 100%
rename from public/images/flags/ca.png
rename to public/images/country/ca.png
diff --git a/public/images/flags/cc.png b/public/images/country/cc.png
similarity index 100%
rename from public/images/flags/cc.png
rename to public/images/country/cc.png
diff --git a/public/images/flags/cd.png b/public/images/country/cd.png
similarity index 100%
rename from public/images/flags/cd.png
rename to public/images/country/cd.png
diff --git a/public/images/flags/cf.png b/public/images/country/cf.png
similarity index 100%
rename from public/images/flags/cf.png
rename to public/images/country/cf.png
diff --git a/public/images/flags/cg.png b/public/images/country/cg.png
similarity index 100%
rename from public/images/flags/cg.png
rename to public/images/country/cg.png
diff --git a/public/images/flags/ch.png b/public/images/country/ch.png
similarity index 100%
rename from public/images/flags/ch.png
rename to public/images/country/ch.png
diff --git a/public/images/flags/ci.png b/public/images/country/ci.png
similarity index 100%
rename from public/images/flags/ci.png
rename to public/images/country/ci.png
diff --git a/public/images/flags/ck.png b/public/images/country/ck.png
similarity index 100%
rename from public/images/flags/ck.png
rename to public/images/country/ck.png
diff --git a/public/images/flags/cl.png b/public/images/country/cl.png
similarity index 100%
rename from public/images/flags/cl.png
rename to public/images/country/cl.png
diff --git a/public/images/flags/cm.png b/public/images/country/cm.png
similarity index 100%
rename from public/images/flags/cm.png
rename to public/images/country/cm.png
diff --git a/public/images/flags/cn.png b/public/images/country/cn.png
similarity index 100%
rename from public/images/flags/cn.png
rename to public/images/country/cn.png
diff --git a/public/images/flags/co.png b/public/images/country/co.png
similarity index 100%
rename from public/images/flags/co.png
rename to public/images/country/co.png
diff --git a/public/images/flags/cr.png b/public/images/country/cr.png
similarity index 100%
rename from public/images/flags/cr.png
rename to public/images/country/cr.png
diff --git a/public/images/flags/cu.png b/public/images/country/cu.png
similarity index 100%
rename from public/images/flags/cu.png
rename to public/images/country/cu.png
diff --git a/public/images/flags/cv.png b/public/images/country/cv.png
similarity index 100%
rename from public/images/flags/cv.png
rename to public/images/country/cv.png
diff --git a/public/images/flags/cw.png b/public/images/country/cw.png
similarity index 100%
rename from public/images/flags/cw.png
rename to public/images/country/cw.png
diff --git a/public/images/flags/cx.png b/public/images/country/cx.png
similarity index 100%
rename from public/images/flags/cx.png
rename to public/images/country/cx.png
diff --git a/public/images/flags/cy.png b/public/images/country/cy.png
similarity index 100%
rename from public/images/flags/cy.png
rename to public/images/country/cy.png
diff --git a/public/images/flags/cz.png b/public/images/country/cz.png
similarity index 100%
rename from public/images/flags/cz.png
rename to public/images/country/cz.png
diff --git a/public/images/flags/de.png b/public/images/country/de.png
similarity index 100%
rename from public/images/flags/de.png
rename to public/images/country/de.png
diff --git a/public/images/flags/dj.png b/public/images/country/dj.png
similarity index 100%
rename from public/images/flags/dj.png
rename to public/images/country/dj.png
diff --git a/public/images/flags/dk.png b/public/images/country/dk.png
similarity index 100%
rename from public/images/flags/dk.png
rename to public/images/country/dk.png
diff --git a/public/images/flags/dm.png b/public/images/country/dm.png
similarity index 100%
rename from public/images/flags/dm.png
rename to public/images/country/dm.png
diff --git a/public/images/flags/do.png b/public/images/country/do.png
similarity index 100%
rename from public/images/flags/do.png
rename to public/images/country/do.png
diff --git a/public/images/flags/dz.png b/public/images/country/dz.png
similarity index 100%
rename from public/images/flags/dz.png
rename to public/images/country/dz.png
diff --git a/public/images/flags/ec.png b/public/images/country/ec.png
similarity index 100%
rename from public/images/flags/ec.png
rename to public/images/country/ec.png
diff --git a/public/images/flags/ee.png b/public/images/country/ee.png
similarity index 100%
rename from public/images/flags/ee.png
rename to public/images/country/ee.png
diff --git a/public/images/flags/eg.png b/public/images/country/eg.png
similarity index 100%
rename from public/images/flags/eg.png
rename to public/images/country/eg.png
diff --git a/public/images/flags/eh.png b/public/images/country/eh.png
similarity index 100%
rename from public/images/flags/eh.png
rename to public/images/country/eh.png
diff --git a/public/images/flags/er.png b/public/images/country/er.png
similarity index 100%
rename from public/images/flags/er.png
rename to public/images/country/er.png
diff --git a/public/images/flags/es.png b/public/images/country/es.png
similarity index 100%
rename from public/images/flags/es.png
rename to public/images/country/es.png
diff --git a/public/images/flags/et.png b/public/images/country/et.png
similarity index 100%
rename from public/images/flags/et.png
rename to public/images/country/et.png
diff --git a/public/images/flags/fi.png b/public/images/country/fi.png
similarity index 100%
rename from public/images/flags/fi.png
rename to public/images/country/fi.png
diff --git a/public/images/flags/fj.png b/public/images/country/fj.png
similarity index 100%
rename from public/images/flags/fj.png
rename to public/images/country/fj.png
diff --git a/public/images/flags/fk.png b/public/images/country/fk.png
similarity index 100%
rename from public/images/flags/fk.png
rename to public/images/country/fk.png
diff --git a/public/images/flags/fm.png b/public/images/country/fm.png
similarity index 100%
rename from public/images/flags/fm.png
rename to public/images/country/fm.png
diff --git a/public/images/flags/fo.png b/public/images/country/fo.png
similarity index 100%
rename from public/images/flags/fo.png
rename to public/images/country/fo.png
diff --git a/public/images/flags/fr.png b/public/images/country/fr.png
similarity index 100%
rename from public/images/flags/fr.png
rename to public/images/country/fr.png
diff --git a/public/images/flags/ga.png b/public/images/country/ga.png
similarity index 100%
rename from public/images/flags/ga.png
rename to public/images/country/ga.png
diff --git a/public/images/flags/gb-eng.png b/public/images/country/gb-eng.png
similarity index 100%
rename from public/images/flags/gb-eng.png
rename to public/images/country/gb-eng.png
diff --git a/public/images/flags/gb-nir.png b/public/images/country/gb-nir.png
similarity index 100%
rename from public/images/flags/gb-nir.png
rename to public/images/country/gb-nir.png
diff --git a/public/images/flags/gb-sct.png b/public/images/country/gb-sct.png
similarity index 100%
rename from public/images/flags/gb-sct.png
rename to public/images/country/gb-sct.png
diff --git a/public/images/flags/gb-wls.png b/public/images/country/gb-wls.png
similarity index 100%
rename from public/images/flags/gb-wls.png
rename to public/images/country/gb-wls.png
diff --git a/public/images/flags/gb.png b/public/images/country/gb.png
similarity index 100%
rename from public/images/flags/gb.png
rename to public/images/country/gb.png
diff --git a/public/images/flags/gd.png b/public/images/country/gd.png
similarity index 100%
rename from public/images/flags/gd.png
rename to public/images/country/gd.png
diff --git a/public/images/flags/ge.png b/public/images/country/ge.png
similarity index 100%
rename from public/images/flags/ge.png
rename to public/images/country/ge.png
diff --git a/public/images/flags/gf.png b/public/images/country/gf.png
similarity index 100%
rename from public/images/flags/gf.png
rename to public/images/country/gf.png
diff --git a/public/images/flags/gg.png b/public/images/country/gg.png
similarity index 100%
rename from public/images/flags/gg.png
rename to public/images/country/gg.png
diff --git a/public/images/flags/gh.png b/public/images/country/gh.png
similarity index 100%
rename from public/images/flags/gh.png
rename to public/images/country/gh.png
diff --git a/public/images/flags/gi.png b/public/images/country/gi.png
similarity index 100%
rename from public/images/flags/gi.png
rename to public/images/country/gi.png
diff --git a/public/images/flags/gl.png b/public/images/country/gl.png
similarity index 100%
rename from public/images/flags/gl.png
rename to public/images/country/gl.png
diff --git a/public/images/flags/gm.png b/public/images/country/gm.png
similarity index 100%
rename from public/images/flags/gm.png
rename to public/images/country/gm.png
diff --git a/public/images/flags/gn.png b/public/images/country/gn.png
similarity index 100%
rename from public/images/flags/gn.png
rename to public/images/country/gn.png
diff --git a/public/images/flags/gp.png b/public/images/country/gp.png
similarity index 100%
rename from public/images/flags/gp.png
rename to public/images/country/gp.png
diff --git a/public/images/flags/gq.png b/public/images/country/gq.png
similarity index 100%
rename from public/images/flags/gq.png
rename to public/images/country/gq.png
diff --git a/public/images/flags/gr.png b/public/images/country/gr.png
similarity index 100%
rename from public/images/flags/gr.png
rename to public/images/country/gr.png
diff --git a/public/images/flags/gs.png b/public/images/country/gs.png
similarity index 100%
rename from public/images/flags/gs.png
rename to public/images/country/gs.png
diff --git a/public/images/flags/gt.png b/public/images/country/gt.png
similarity index 100%
rename from public/images/flags/gt.png
rename to public/images/country/gt.png
diff --git a/public/images/flags/gu.png b/public/images/country/gu.png
similarity index 100%
rename from public/images/flags/gu.png
rename to public/images/country/gu.png
diff --git a/public/images/flags/gw.png b/public/images/country/gw.png
similarity index 100%
rename from public/images/flags/gw.png
rename to public/images/country/gw.png
diff --git a/public/images/flags/gy.png b/public/images/country/gy.png
similarity index 100%
rename from public/images/flags/gy.png
rename to public/images/country/gy.png
diff --git a/public/images/flags/hk.png b/public/images/country/hk.png
similarity index 100%
rename from public/images/flags/hk.png
rename to public/images/country/hk.png
diff --git a/public/images/flags/hm.png b/public/images/country/hm.png
similarity index 100%
rename from public/images/flags/hm.png
rename to public/images/country/hm.png
diff --git a/public/images/flags/hn.png b/public/images/country/hn.png
similarity index 100%
rename from public/images/flags/hn.png
rename to public/images/country/hn.png
diff --git a/public/images/flags/hr.png b/public/images/country/hr.png
similarity index 100%
rename from public/images/flags/hr.png
rename to public/images/country/hr.png
diff --git a/public/images/flags/ht.png b/public/images/country/ht.png
similarity index 100%
rename from public/images/flags/ht.png
rename to public/images/country/ht.png
diff --git a/public/images/flags/hu.png b/public/images/country/hu.png
similarity index 100%
rename from public/images/flags/hu.png
rename to public/images/country/hu.png
diff --git a/public/images/flags/id.png b/public/images/country/id.png
similarity index 100%
rename from public/images/flags/id.png
rename to public/images/country/id.png
diff --git a/public/images/flags/ie.png b/public/images/country/ie.png
similarity index 100%
rename from public/images/flags/ie.png
rename to public/images/country/ie.png
diff --git a/public/images/flags/il.png b/public/images/country/il.png
similarity index 100%
rename from public/images/flags/il.png
rename to public/images/country/il.png
diff --git a/public/images/flags/im.png b/public/images/country/im.png
similarity index 100%
rename from public/images/flags/im.png
rename to public/images/country/im.png
diff --git a/public/images/flags/in.png b/public/images/country/in.png
similarity index 100%
rename from public/images/flags/in.png
rename to public/images/country/in.png
diff --git a/public/images/flags/io.png b/public/images/country/io.png
similarity index 100%
rename from public/images/flags/io.png
rename to public/images/country/io.png
diff --git a/public/images/flags/iq.png b/public/images/country/iq.png
similarity index 100%
rename from public/images/flags/iq.png
rename to public/images/country/iq.png
diff --git a/public/images/flags/ir.png b/public/images/country/ir.png
similarity index 100%
rename from public/images/flags/ir.png
rename to public/images/country/ir.png
diff --git a/public/images/flags/is.png b/public/images/country/is.png
similarity index 100%
rename from public/images/flags/is.png
rename to public/images/country/is.png
diff --git a/public/images/flags/it.png b/public/images/country/it.png
similarity index 100%
rename from public/images/flags/it.png
rename to public/images/country/it.png
diff --git a/public/images/flags/je.png b/public/images/country/je.png
similarity index 100%
rename from public/images/flags/je.png
rename to public/images/country/je.png
diff --git a/public/images/flags/jm.png b/public/images/country/jm.png
similarity index 100%
rename from public/images/flags/jm.png
rename to public/images/country/jm.png
diff --git a/public/images/flags/jo.png b/public/images/country/jo.png
similarity index 100%
rename from public/images/flags/jo.png
rename to public/images/country/jo.png
diff --git a/public/images/flags/jp.png b/public/images/country/jp.png
similarity index 100%
rename from public/images/flags/jp.png
rename to public/images/country/jp.png
diff --git a/public/images/flags/ke.png b/public/images/country/ke.png
similarity index 100%
rename from public/images/flags/ke.png
rename to public/images/country/ke.png
diff --git a/public/images/flags/kg.png b/public/images/country/kg.png
similarity index 100%
rename from public/images/flags/kg.png
rename to public/images/country/kg.png
diff --git a/public/images/flags/kh.png b/public/images/country/kh.png
similarity index 100%
rename from public/images/flags/kh.png
rename to public/images/country/kh.png
diff --git a/public/images/flags/ki.png b/public/images/country/ki.png
similarity index 100%
rename from public/images/flags/ki.png
rename to public/images/country/ki.png
diff --git a/public/images/flags/km.png b/public/images/country/km.png
similarity index 100%
rename from public/images/flags/km.png
rename to public/images/country/km.png
diff --git a/public/images/flags/kn.png b/public/images/country/kn.png
similarity index 100%
rename from public/images/flags/kn.png
rename to public/images/country/kn.png
diff --git a/public/images/flags/kp.png b/public/images/country/kp.png
similarity index 100%
rename from public/images/flags/kp.png
rename to public/images/country/kp.png
diff --git a/public/images/flags/kr.png b/public/images/country/kr.png
similarity index 100%
rename from public/images/flags/kr.png
rename to public/images/country/kr.png
diff --git a/public/images/flags/kw.png b/public/images/country/kw.png
similarity index 100%
rename from public/images/flags/kw.png
rename to public/images/country/kw.png
diff --git a/public/images/flags/ky.png b/public/images/country/ky.png
similarity index 100%
rename from public/images/flags/ky.png
rename to public/images/country/ky.png
diff --git a/public/images/flags/kz.png b/public/images/country/kz.png
similarity index 100%
rename from public/images/flags/kz.png
rename to public/images/country/kz.png
diff --git a/public/images/flags/la.png b/public/images/country/la.png
similarity index 100%
rename from public/images/flags/la.png
rename to public/images/country/la.png
diff --git a/public/images/flags/lb.png b/public/images/country/lb.png
similarity index 100%
rename from public/images/flags/lb.png
rename to public/images/country/lb.png
diff --git a/public/images/flags/lc.png b/public/images/country/lc.png
similarity index 100%
rename from public/images/flags/lc.png
rename to public/images/country/lc.png
diff --git a/public/images/flags/li.png b/public/images/country/li.png
similarity index 100%
rename from public/images/flags/li.png
rename to public/images/country/li.png
diff --git a/public/images/flags/lk.png b/public/images/country/lk.png
similarity index 100%
rename from public/images/flags/lk.png
rename to public/images/country/lk.png
diff --git a/public/images/flags/lr.png b/public/images/country/lr.png
similarity index 100%
rename from public/images/flags/lr.png
rename to public/images/country/lr.png
diff --git a/public/images/flags/ls.png b/public/images/country/ls.png
similarity index 100%
rename from public/images/flags/ls.png
rename to public/images/country/ls.png
diff --git a/public/images/flags/lt.png b/public/images/country/lt.png
similarity index 100%
rename from public/images/flags/lt.png
rename to public/images/country/lt.png
diff --git a/public/images/flags/lu.png b/public/images/country/lu.png
similarity index 100%
rename from public/images/flags/lu.png
rename to public/images/country/lu.png
diff --git a/public/images/flags/lv.png b/public/images/country/lv.png
similarity index 100%
rename from public/images/flags/lv.png
rename to public/images/country/lv.png
diff --git a/public/images/flags/ly.png b/public/images/country/ly.png
similarity index 100%
rename from public/images/flags/ly.png
rename to public/images/country/ly.png
diff --git a/public/images/flags/ma.png b/public/images/country/ma.png
similarity index 100%
rename from public/images/flags/ma.png
rename to public/images/country/ma.png
diff --git a/public/images/flags/mc.png b/public/images/country/mc.png
similarity index 100%
rename from public/images/flags/mc.png
rename to public/images/country/mc.png
diff --git a/public/images/flags/md.png b/public/images/country/md.png
similarity index 100%
rename from public/images/flags/md.png
rename to public/images/country/md.png
diff --git a/public/images/flags/me.png b/public/images/country/me.png
similarity index 100%
rename from public/images/flags/me.png
rename to public/images/country/me.png
diff --git a/public/images/flags/mf.png b/public/images/country/mf.png
similarity index 100%
rename from public/images/flags/mf.png
rename to public/images/country/mf.png
diff --git a/public/images/flags/mg.png b/public/images/country/mg.png
similarity index 100%
rename from public/images/flags/mg.png
rename to public/images/country/mg.png
diff --git a/public/images/flags/mh.png b/public/images/country/mh.png
similarity index 100%
rename from public/images/flags/mh.png
rename to public/images/country/mh.png
diff --git a/public/images/flags/mk.png b/public/images/country/mk.png
similarity index 100%
rename from public/images/flags/mk.png
rename to public/images/country/mk.png
diff --git a/public/images/flags/ml.png b/public/images/country/ml.png
similarity index 100%
rename from public/images/flags/ml.png
rename to public/images/country/ml.png
diff --git a/public/images/flags/mm.png b/public/images/country/mm.png
similarity index 100%
rename from public/images/flags/mm.png
rename to public/images/country/mm.png
diff --git a/public/images/flags/mn.png b/public/images/country/mn.png
similarity index 100%
rename from public/images/flags/mn.png
rename to public/images/country/mn.png
diff --git a/public/images/flags/mo.png b/public/images/country/mo.png
similarity index 100%
rename from public/images/flags/mo.png
rename to public/images/country/mo.png
diff --git a/public/images/flags/mp.png b/public/images/country/mp.png
similarity index 100%
rename from public/images/flags/mp.png
rename to public/images/country/mp.png
diff --git a/public/images/flags/mq.png b/public/images/country/mq.png
similarity index 100%
rename from public/images/flags/mq.png
rename to public/images/country/mq.png
diff --git a/public/images/flags/mr.png b/public/images/country/mr.png
similarity index 100%
rename from public/images/flags/mr.png
rename to public/images/country/mr.png
diff --git a/public/images/flags/ms.png b/public/images/country/ms.png
similarity index 100%
rename from public/images/flags/ms.png
rename to public/images/country/ms.png
diff --git a/public/images/flags/mt.png b/public/images/country/mt.png
similarity index 100%
rename from public/images/flags/mt.png
rename to public/images/country/mt.png
diff --git a/public/images/flags/mu.png b/public/images/country/mu.png
similarity index 100%
rename from public/images/flags/mu.png
rename to public/images/country/mu.png
diff --git a/public/images/flags/mv.png b/public/images/country/mv.png
similarity index 100%
rename from public/images/flags/mv.png
rename to public/images/country/mv.png
diff --git a/public/images/flags/mw.png b/public/images/country/mw.png
similarity index 100%
rename from public/images/flags/mw.png
rename to public/images/country/mw.png
diff --git a/public/images/flags/mx.png b/public/images/country/mx.png
similarity index 100%
rename from public/images/flags/mx.png
rename to public/images/country/mx.png
diff --git a/public/images/flags/my.png b/public/images/country/my.png
similarity index 100%
rename from public/images/flags/my.png
rename to public/images/country/my.png
diff --git a/public/images/flags/mz.png b/public/images/country/mz.png
similarity index 100%
rename from public/images/flags/mz.png
rename to public/images/country/mz.png
diff --git a/public/images/flags/na.png b/public/images/country/na.png
similarity index 100%
rename from public/images/flags/na.png
rename to public/images/country/na.png
diff --git a/public/images/flags/nc.png b/public/images/country/nc.png
similarity index 100%
rename from public/images/flags/nc.png
rename to public/images/country/nc.png
diff --git a/public/images/flags/ne.png b/public/images/country/ne.png
similarity index 100%
rename from public/images/flags/ne.png
rename to public/images/country/ne.png
diff --git a/public/images/flags/nf.png b/public/images/country/nf.png
similarity index 100%
rename from public/images/flags/nf.png
rename to public/images/country/nf.png
diff --git a/public/images/flags/ng.png b/public/images/country/ng.png
similarity index 100%
rename from public/images/flags/ng.png
rename to public/images/country/ng.png
diff --git a/public/images/flags/ni.png b/public/images/country/ni.png
similarity index 100%
rename from public/images/flags/ni.png
rename to public/images/country/ni.png
diff --git a/public/images/flags/nl.png b/public/images/country/nl.png
similarity index 100%
rename from public/images/flags/nl.png
rename to public/images/country/nl.png
diff --git a/public/images/flags/no.png b/public/images/country/no.png
similarity index 100%
rename from public/images/flags/no.png
rename to public/images/country/no.png
diff --git a/public/images/flags/np.png b/public/images/country/np.png
similarity index 100%
rename from public/images/flags/np.png
rename to public/images/country/np.png
diff --git a/public/images/flags/nr.png b/public/images/country/nr.png
similarity index 100%
rename from public/images/flags/nr.png
rename to public/images/country/nr.png
diff --git a/public/images/flags/nu.png b/public/images/country/nu.png
similarity index 100%
rename from public/images/flags/nu.png
rename to public/images/country/nu.png
diff --git a/public/images/flags/nz.png b/public/images/country/nz.png
similarity index 100%
rename from public/images/flags/nz.png
rename to public/images/country/nz.png
diff --git a/public/images/flags/om.png b/public/images/country/om.png
similarity index 100%
rename from public/images/flags/om.png
rename to public/images/country/om.png
diff --git a/public/images/flags/pa.png b/public/images/country/pa.png
similarity index 100%
rename from public/images/flags/pa.png
rename to public/images/country/pa.png
diff --git a/public/images/flags/pe.png b/public/images/country/pe.png
similarity index 100%
rename from public/images/flags/pe.png
rename to public/images/country/pe.png
diff --git a/public/images/flags/pf.png b/public/images/country/pf.png
similarity index 100%
rename from public/images/flags/pf.png
rename to public/images/country/pf.png
diff --git a/public/images/flags/pg.png b/public/images/country/pg.png
similarity index 100%
rename from public/images/flags/pg.png
rename to public/images/country/pg.png
diff --git a/public/images/flags/ph.png b/public/images/country/ph.png
similarity index 100%
rename from public/images/flags/ph.png
rename to public/images/country/ph.png
diff --git a/public/images/flags/pk.png b/public/images/country/pk.png
similarity index 100%
rename from public/images/flags/pk.png
rename to public/images/country/pk.png
diff --git a/public/images/flags/pl.png b/public/images/country/pl.png
similarity index 100%
rename from public/images/flags/pl.png
rename to public/images/country/pl.png
diff --git a/public/images/flags/pm.png b/public/images/country/pm.png
similarity index 100%
rename from public/images/flags/pm.png
rename to public/images/country/pm.png
diff --git a/public/images/flags/pn.png b/public/images/country/pn.png
similarity index 100%
rename from public/images/flags/pn.png
rename to public/images/country/pn.png
diff --git a/public/images/flags/pr.png b/public/images/country/pr.png
similarity index 100%
rename from public/images/flags/pr.png
rename to public/images/country/pr.png
diff --git a/public/images/flags/ps.png b/public/images/country/ps.png
similarity index 100%
rename from public/images/flags/ps.png
rename to public/images/country/ps.png
diff --git a/public/images/flags/pt.png b/public/images/country/pt.png
similarity index 100%
rename from public/images/flags/pt.png
rename to public/images/country/pt.png
diff --git a/public/images/flags/pw.png b/public/images/country/pw.png
similarity index 100%
rename from public/images/flags/pw.png
rename to public/images/country/pw.png
diff --git a/public/images/flags/py.png b/public/images/country/py.png
similarity index 100%
rename from public/images/flags/py.png
rename to public/images/country/py.png
diff --git a/public/images/flags/qa.png b/public/images/country/qa.png
similarity index 100%
rename from public/images/flags/qa.png
rename to public/images/country/qa.png
diff --git a/public/images/flags/re.png b/public/images/country/re.png
similarity index 100%
rename from public/images/flags/re.png
rename to public/images/country/re.png
diff --git a/public/images/flags/ro.png b/public/images/country/ro.png
similarity index 100%
rename from public/images/flags/ro.png
rename to public/images/country/ro.png
diff --git a/public/images/flags/rs.png b/public/images/country/rs.png
similarity index 100%
rename from public/images/flags/rs.png
rename to public/images/country/rs.png
diff --git a/public/images/flags/ru.png b/public/images/country/ru.png
similarity index 100%
rename from public/images/flags/ru.png
rename to public/images/country/ru.png
diff --git a/public/images/flags/rw.png b/public/images/country/rw.png
similarity index 100%
rename from public/images/flags/rw.png
rename to public/images/country/rw.png
diff --git a/public/images/flags/sa.png b/public/images/country/sa.png
similarity index 100%
rename from public/images/flags/sa.png
rename to public/images/country/sa.png
diff --git a/public/images/flags/sb.png b/public/images/country/sb.png
similarity index 100%
rename from public/images/flags/sb.png
rename to public/images/country/sb.png
diff --git a/public/images/flags/sc.png b/public/images/country/sc.png
similarity index 100%
rename from public/images/flags/sc.png
rename to public/images/country/sc.png
diff --git a/public/images/flags/sd.png b/public/images/country/sd.png
similarity index 100%
rename from public/images/flags/sd.png
rename to public/images/country/sd.png
diff --git a/public/images/flags/se.png b/public/images/country/se.png
similarity index 100%
rename from public/images/flags/se.png
rename to public/images/country/se.png
diff --git a/public/images/flags/sg.png b/public/images/country/sg.png
similarity index 100%
rename from public/images/flags/sg.png
rename to public/images/country/sg.png
diff --git a/public/images/flags/sh.png b/public/images/country/sh.png
similarity index 100%
rename from public/images/flags/sh.png
rename to public/images/country/sh.png
diff --git a/public/images/flags/si.png b/public/images/country/si.png
similarity index 100%
rename from public/images/flags/si.png
rename to public/images/country/si.png
diff --git a/public/images/flags/sj.png b/public/images/country/sj.png
similarity index 100%
rename from public/images/flags/sj.png
rename to public/images/country/sj.png
diff --git a/public/images/flags/sk.png b/public/images/country/sk.png
similarity index 100%
rename from public/images/flags/sk.png
rename to public/images/country/sk.png
diff --git a/public/images/flags/sl.png b/public/images/country/sl.png
similarity index 100%
rename from public/images/flags/sl.png
rename to public/images/country/sl.png
diff --git a/public/images/flags/sm.png b/public/images/country/sm.png
similarity index 100%
rename from public/images/flags/sm.png
rename to public/images/country/sm.png
diff --git a/public/images/flags/sn.png b/public/images/country/sn.png
similarity index 100%
rename from public/images/flags/sn.png
rename to public/images/country/sn.png
diff --git a/public/images/flags/so.png b/public/images/country/so.png
similarity index 100%
rename from public/images/flags/so.png
rename to public/images/country/so.png
diff --git a/public/images/flags/sr.png b/public/images/country/sr.png
similarity index 100%
rename from public/images/flags/sr.png
rename to public/images/country/sr.png
diff --git a/public/images/flags/ss.png b/public/images/country/ss.png
similarity index 100%
rename from public/images/flags/ss.png
rename to public/images/country/ss.png
diff --git a/public/images/flags/st.png b/public/images/country/st.png
similarity index 100%
rename from public/images/flags/st.png
rename to public/images/country/st.png
diff --git a/public/images/flags/sv.png b/public/images/country/sv.png
similarity index 100%
rename from public/images/flags/sv.png
rename to public/images/country/sv.png
diff --git a/public/images/flags/sx.png b/public/images/country/sx.png
similarity index 100%
rename from public/images/flags/sx.png
rename to public/images/country/sx.png
diff --git a/public/images/flags/sy.png b/public/images/country/sy.png
similarity index 100%
rename from public/images/flags/sy.png
rename to public/images/country/sy.png
diff --git a/public/images/flags/sz.png b/public/images/country/sz.png
similarity index 100%
rename from public/images/flags/sz.png
rename to public/images/country/sz.png
diff --git a/public/images/flags/tc.png b/public/images/country/tc.png
similarity index 100%
rename from public/images/flags/tc.png
rename to public/images/country/tc.png
diff --git a/public/images/flags/td.png b/public/images/country/td.png
similarity index 100%
rename from public/images/flags/td.png
rename to public/images/country/td.png
diff --git a/public/images/flags/tf.png b/public/images/country/tf.png
similarity index 100%
rename from public/images/flags/tf.png
rename to public/images/country/tf.png
diff --git a/public/images/flags/tg.png b/public/images/country/tg.png
similarity index 100%
rename from public/images/flags/tg.png
rename to public/images/country/tg.png
diff --git a/public/images/flags/th.png b/public/images/country/th.png
similarity index 100%
rename from public/images/flags/th.png
rename to public/images/country/th.png
diff --git a/public/images/flags/tj.png b/public/images/country/tj.png
similarity index 100%
rename from public/images/flags/tj.png
rename to public/images/country/tj.png
diff --git a/public/images/flags/tk.png b/public/images/country/tk.png
similarity index 100%
rename from public/images/flags/tk.png
rename to public/images/country/tk.png
diff --git a/public/images/flags/tl.png b/public/images/country/tl.png
similarity index 100%
rename from public/images/flags/tl.png
rename to public/images/country/tl.png
diff --git a/public/images/flags/tm.png b/public/images/country/tm.png
similarity index 100%
rename from public/images/flags/tm.png
rename to public/images/country/tm.png
diff --git a/public/images/flags/tn.png b/public/images/country/tn.png
similarity index 100%
rename from public/images/flags/tn.png
rename to public/images/country/tn.png
diff --git a/public/images/flags/to.png b/public/images/country/to.png
similarity index 100%
rename from public/images/flags/to.png
rename to public/images/country/to.png
diff --git a/public/images/flags/tr.png b/public/images/country/tr.png
similarity index 100%
rename from public/images/flags/tr.png
rename to public/images/country/tr.png
diff --git a/public/images/flags/tt.png b/public/images/country/tt.png
similarity index 100%
rename from public/images/flags/tt.png
rename to public/images/country/tt.png
diff --git a/public/images/flags/tv.png b/public/images/country/tv.png
similarity index 100%
rename from public/images/flags/tv.png
rename to public/images/country/tv.png
diff --git a/public/images/flags/tw.png b/public/images/country/tw.png
similarity index 100%
rename from public/images/flags/tw.png
rename to public/images/country/tw.png
diff --git a/public/images/flags/tz.png b/public/images/country/tz.png
similarity index 100%
rename from public/images/flags/tz.png
rename to public/images/country/tz.png
diff --git a/public/images/flags/ua.png b/public/images/country/ua.png
similarity index 100%
rename from public/images/flags/ua.png
rename to public/images/country/ua.png
diff --git a/public/images/flags/ug.png b/public/images/country/ug.png
similarity index 100%
rename from public/images/flags/ug.png
rename to public/images/country/ug.png
diff --git a/public/images/flags/um.png b/public/images/country/um.png
similarity index 100%
rename from public/images/flags/um.png
rename to public/images/country/um.png
diff --git a/public/images/flags/xx.png b/public/images/country/unknown.png
similarity index 100%
rename from public/images/flags/xx.png
rename to public/images/country/unknown.png
diff --git a/public/images/flags/us.png b/public/images/country/us.png
similarity index 100%
rename from public/images/flags/us.png
rename to public/images/country/us.png
diff --git a/public/images/flags/uy.png b/public/images/country/uy.png
similarity index 100%
rename from public/images/flags/uy.png
rename to public/images/country/uy.png
diff --git a/public/images/flags/uz.png b/public/images/country/uz.png
similarity index 100%
rename from public/images/flags/uz.png
rename to public/images/country/uz.png
diff --git a/public/images/flags/va.png b/public/images/country/va.png
similarity index 100%
rename from public/images/flags/va.png
rename to public/images/country/va.png
diff --git a/public/images/flags/vc.png b/public/images/country/vc.png
similarity index 100%
rename from public/images/flags/vc.png
rename to public/images/country/vc.png
diff --git a/public/images/flags/ve.png b/public/images/country/ve.png
similarity index 100%
rename from public/images/flags/ve.png
rename to public/images/country/ve.png
diff --git a/public/images/flags/vg.png b/public/images/country/vg.png
similarity index 100%
rename from public/images/flags/vg.png
rename to public/images/country/vg.png
diff --git a/public/images/flags/vi.png b/public/images/country/vi.png
similarity index 100%
rename from public/images/flags/vi.png
rename to public/images/country/vi.png
diff --git a/public/images/flags/vn.png b/public/images/country/vn.png
similarity index 100%
rename from public/images/flags/vn.png
rename to public/images/country/vn.png
diff --git a/public/images/flags/vu.png b/public/images/country/vu.png
similarity index 100%
rename from public/images/flags/vu.png
rename to public/images/country/vu.png
diff --git a/public/images/flags/wf.png b/public/images/country/wf.png
similarity index 100%
rename from public/images/flags/wf.png
rename to public/images/country/wf.png
diff --git a/public/images/flags/ws.png b/public/images/country/ws.png
similarity index 100%
rename from public/images/flags/ws.png
rename to public/images/country/ws.png
diff --git a/public/images/flags/xk.png b/public/images/country/xk.png
similarity index 100%
rename from public/images/flags/xk.png
rename to public/images/country/xk.png
diff --git a/public/images/flags/ye.png b/public/images/country/ye.png
similarity index 100%
rename from public/images/flags/ye.png
rename to public/images/country/ye.png
diff --git a/public/images/flags/yt.png b/public/images/country/yt.png
similarity index 100%
rename from public/images/flags/yt.png
rename to public/images/country/yt.png
diff --git a/public/images/flags/za.png b/public/images/country/za.png
similarity index 100%
rename from public/images/flags/za.png
rename to public/images/country/za.png
diff --git a/public/images/flags/zm.png b/public/images/country/zm.png
similarity index 100%
rename from public/images/flags/zm.png
rename to public/images/country/zm.png
diff --git a/public/images/flags/zw.png b/public/images/country/zw.png
similarity index 100%
rename from public/images/flags/zw.png
rename to public/images/country/zw.png
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteDetailsPage.tsx b/src/app/(main)/websites/[websiteId]/WebsiteDetailsPage.tsx
index 2439040af3..3eeeb18fdb 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteDetailsPage.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteDetailsPage.tsx
@@ -7,7 +7,6 @@ import WebsiteExpandedView from './WebsiteExpandedView';
 import WebsiteHeader from './WebsiteHeader';
 import WebsiteMetricsBar from './WebsiteMetricsBar';
 import WebsiteTableView from './WebsiteTableView';
-import WebsiteProvider from './WebsiteProvider';
 import { FILTER_COLUMNS } from 'lib/constants';
 
 export default function WebsiteDetailsPage({ websiteId }: { websiteId: string }) {
@@ -25,13 +24,13 @@ export default function WebsiteDetailsPage({ websiteId }: { websiteId: string })
   }, {});
 
   return (
-    <WebsiteProvider websiteId={websiteId}>
+    <>
       <WebsiteHeader websiteId={websiteId} showLinks={showLinks} />
       <FilterTags websiteId={websiteId} params={params} />
       <WebsiteMetricsBar websiteId={websiteId} showFilter={true} showChange={true} sticky={true} />
       <WebsiteChart websiteId={websiteId} />
       {!view && <WebsiteTableView websiteId={websiteId} />}
       {view && <WebsiteExpandedView websiteId={websiteId} />}
-    </WebsiteProvider>
+    </>
   );
 }
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteProvider.tsx b/src/app/(main)/websites/[websiteId]/WebsiteProvider.tsx
index 76d40b704f..3cdfdd5df2 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteProvider.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteProvider.tsx
@@ -1,3 +1,4 @@
+'use client';
 import { createContext, ReactNode, useEffect } from 'react';
 import { useModified, useWebsite } from 'components/hooks';
 import { Loading } from 'react-basics';
diff --git a/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx b/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
index 1455b76fac..21cd65972f 100644
--- a/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
+++ b/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
@@ -6,7 +6,6 @@ import { useNavigation } from 'components/hooks';
 import { FILTER_COLUMNS } from 'lib/constants';
 import WebsiteChart from '../WebsiteChart';
 import WebsiteCompareTables from './WebsiteCompareTables';
-import WebsiteProvider from '../WebsiteProvider';
 
 export function WebsiteComparePage({ websiteId }) {
   const { query } = useNavigation();
@@ -19,13 +18,13 @@ export function WebsiteComparePage({ websiteId }) {
   }, {});
 
   return (
-    <WebsiteProvider websiteId={websiteId}>
+    <>
       <WebsiteHeader websiteId={websiteId} />
       <FilterTags websiteId={websiteId} params={params} />
       <WebsiteMetricsBar websiteId={websiteId} compareMode={true} showFilter={true} />
       <WebsiteChart websiteId={websiteId} compareMode={true} />
       <WebsiteCompareTables websiteId={websiteId} />
-    </WebsiteProvider>
+    </>
   );
 }
 
diff --git a/src/app/(main)/websites/[websiteId]/layout.tsx b/src/app/(main)/websites/[websiteId]/layout.tsx
new file mode 100644
index 0000000000..1729e3ed9f
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/layout.tsx
@@ -0,0 +1,17 @@
+import { Metadata } from 'next';
+import WebsiteProvider from './WebsiteProvider';
+
+export default function ({ children, params: { websiteId } }) {
+  if (process.env.cloudMode) {
+    return null;
+  }
+
+  return <WebsiteProvider websiteId={websiteId}>{children}</WebsiteProvider>;
+}
+
+export const metadata: Metadata = {
+  title: {
+    template: '%s | Umami',
+    default: 'Websites | Umami',
+  },
+};
diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx
index 2dd69146d7..ae4967dab9 100644
--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx
+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx
@@ -3,19 +3,17 @@ import ListTable from 'components/metrics/ListTable';
 import { useLocale, useCountryNames, useMessages } from 'components/hooks';
 import classNames from 'classnames';
 import styles from './RealtimeCountries.module.css';
+import TypeIcon from 'components/common/TypeIcon';
 
 export function RealtimeCountries({ data }) {
   const { formatMessage, labels } = useMessages();
   const { locale } = useLocale();
-  const countryNames = useCountryNames(locale);
+  const { countryNames } = useCountryNames(locale);
 
   const renderCountryName = useCallback(
     ({ x: code }) => (
       <span className={classNames(locale, styles.row)}>
-        <img
-          src={`${process.env.basePath || ''}/images/flags/${code?.toLowerCase() || 'xx'}.png`}
-          alt={code}
-        />
+        <TypeIcon type="country" value={code?.toLowerCase()} />
         {countryNames[code]}
       </span>
     ),
diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
index 97fb16597b..ad0314e7ad 100644
--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
@@ -32,7 +32,7 @@ export function RealtimeLog({ data }: { data: RealtimeData }) {
   const { formatMessage, labels, messages, FormattedMessage } = useMessages();
   const { formatValue } = useFormat();
   const { locale } = useLocale();
-  const countryNames = useCountryNames(locale);
+  const { countryNames } = useCountryNames(locale);
   const [filter, setFilter] = useState(TYPE_ALL);
 
   const buttons = [
diff --git a/src/app/(main)/websites/[websiteId]/realtime/WebsiteRealtimePage.tsx b/src/app/(main)/websites/[websiteId]/realtime/WebsiteRealtimePage.tsx
index d88695478d..7030cc32e9 100644
--- a/src/app/(main)/websites/[websiteId]/realtime/WebsiteRealtimePage.tsx
+++ b/src/app/(main)/websites/[websiteId]/realtime/WebsiteRealtimePage.tsx
@@ -10,7 +10,6 @@ import RealtimeHeader from './RealtimeHeader';
 import RealtimeUrls from './RealtimeUrls';
 import RealtimeCountries from './RealtimeCountries';
 import WebsiteHeader from '../WebsiteHeader';
-import WebsiteProvider from '../WebsiteProvider';
 import { percentFilter } from 'lib/filters';
 
 export function WebsiteRealtimePage({ websiteId }) {
@@ -27,7 +26,7 @@ export function WebsiteRealtimePage({ websiteId }) {
   );
 
   return (
-    <WebsiteProvider websiteId={websiteId}>
+    <>
       <WebsiteHeader websiteId={websiteId} />
       <RealtimeHeader data={data} />
       <RealtimeChart data={data} unit="minute" />
@@ -41,7 +40,7 @@ export function WebsiteRealtimePage({ websiteId }) {
           <WorldMap data={countries} />
         </GridRow>
       </Grid>
-    </WebsiteProvider>
+    </>
   );
 }
 
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
index 7bae8b6838..d4cf827a0a 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
@@ -1,7 +1,6 @@
 import Link from 'next/link';
 import { GridColumn, GridTable, useBreakpoint } from 'react-basics';
 import { useFormat, useMessages } from 'components/hooks';
-import { formatDistanceToNow } from 'date-fns';
 import Profile from 'components/common/Profile';
 
 export function SessionsTable({ data = [] }: { data: any[]; showDomain?: boolean }) {
@@ -12,14 +11,10 @@ export function SessionsTable({ data = [] }: { data: any[]; showDomain?: boolean
   return (
     <GridTable data={data} cardMode={['xs', 'sm', 'md'].includes(breakpoint)}>
       <GridColumn name="pic" label="" width="90px">
-        {row => <Profile seed={row.id} size={64} />}
+        {row => <Profile key={row.id} seed={row.id} size={64} />}
       </GridColumn>
       <GridColumn name="id" label="ID">
-        {row => (
-          <Link href={`sessions/${row.id}`}>
-            {row.id} ({row.firstAt !== row.lastAt ? 'YES' : 'NO'})
-          </Link>
-        )}
+        {row => <Link href={`sessions/${row.id}`}>{row.id}</Link>}
       </GridColumn>
       <GridColumn name="country" label={formatMessage(labels.country)}>
         {row => formatValue(row.country, 'country')}
@@ -32,8 +27,8 @@ export function SessionsTable({ data = [] }: { data: any[]; showDomain?: boolean
       <GridColumn name="device" label={formatMessage(labels.device)}>
         {row => formatValue(row.device, 'device')}
       </GridColumn>
-      <GridColumn name="createdAt" label={formatMessage(labels.created)}>
-        {row => formatDistanceToNow(new Date(row.createdAt))}
+      <GridColumn name="lastAt" label={formatMessage(labels.lastSeen)}>
+        {row => row.lastAt}
       </GridColumn>
     </GridTable>
   );
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.module.css b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.module.css
index 2f71e9a885..21bb011aad 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.module.css
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.module.css
@@ -1,3 +1,18 @@
 .page {
   display: grid;
+  grid-template-columns: 300px 1fr;
+}
+
+.sidebar {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 20px;
+  padding-right: 20px;
+  border-right: 1px solid var(--base300);
+}
+
+.content {
+  padding-left: 20px;
 }
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
index fc6945ceae..5aaac9525d 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
@@ -3,6 +3,7 @@ import WebsiteHeader from '../../WebsiteHeader';
 import SessionInfo from './SessionInfo';
 import { useSession } from 'components/hooks';
 import { Loading } from 'react-basics';
+import Profile from 'components/common/Profile';
 import styles from './SessionDetailsPage.module.css';
 
 export default function SessionDetailsPage({
@@ -19,9 +20,15 @@ export default function SessionDetailsPage({
   }
 
   return (
-    <div className={styles.page}>
+    <>
       <WebsiteHeader websiteId={websiteId} />
-      <SessionInfo data={data} />
-    </div>
+      <div className={styles.page}>
+        <div className={styles.sidebar}>
+          <Profile seed={data?.id} />
+          <SessionInfo data={data} />
+        </div>
+        <div className={styles.content}>oh hi.</div>
+      </div>
+    </>
   );
 }
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.module.css b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.module.css
new file mode 100644
index 0000000000..c17eadf5f4
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.module.css
@@ -0,0 +1,17 @@
+.info {
+  display: grid;
+  gap: 10px;
+}
+
+.info dt {
+  color: var(--font-color200);
+  font-weight: bold;
+}
+
+.info dd {
+  display: flex;
+  gap: 10px;
+  align-items: center;
+  margin: 5px 0 28px;
+  text-align: left;
+}
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx
index 051703a3eb..cae200ab9e 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx
@@ -1,17 +1,62 @@
-import Profile from 'components/common/Profile';
+import { format } from 'date-fns';
+import { useFormat, useLocale, useMessages, useRegionNames } from 'components/hooks';
+import TypeIcon from 'components/common/TypeIcon';
+import { Icon, CopyIcon } from 'react-basics';
+import Icons from 'components/icons';
+import styles from './SessionInfo.module.css';
 
 export default function SessionInfo({ data }) {
+  const { locale } = useLocale();
+  const { formatMessage, labels } = useMessages();
+  const { formatValue } = useFormat();
+  const { getRegionName } = useRegionNames(locale);
+
   return (
-    <h1>
-      <Profile seed={data?.id} />
+    <div className={styles.info}>
       <dl>
         <dt>ID</dt>
-        <dd>{data?.id}</dd>
-        <dt>Country</dt>
-        <dd>{data?.country}</dd>
-        <dt>City</dt>
-        <dd>{data?.city}</dd>
+        <dd>
+          {data?.id} <CopyIcon value={data?.id} />
+        </dd>
+        <dt>{formatMessage(labels.firstSeen)}</dt>
+        <dd>{format(new Date(data?.firstAt), 'PPPpp')}</dd>
+        <dt>{formatMessage(labels.lastSeen)}</dt>
+        <dd>{format(new Date(data?.lastAt), 'PPPpp')}</dd>
+        <dt>{formatMessage(labels.country)}</dt>
+        <dd>
+          <TypeIcon type="country" value={data?.country} />
+          {formatValue(data?.country, 'country')}
+        </dd>
+        <dt>{formatMessage(labels.region)}</dt>
+        <dd>
+          <Icon>
+            <Icons.Location />
+          </Icon>
+          {getRegionName(data?.subdivision1)}
+        </dd>
+        <dt>{formatMessage(labels.city)}</dt>
+        <dd>
+          <Icon>
+            <Icons.Location />
+          </Icon>
+          {data?.city}
+        </dd>
+        <dt>{formatMessage(labels.os)}</dt>
+        <dd>
+          <TypeIcon type="os" value={data?.os?.toLowerCase()?.replaceAll(/\W/g, '-')} />
+          {formatValue(data?.os, 'os')}
+        </dd>
+        <dt>{formatMessage(labels.device)}</dt>
+        <dd>
+          <TypeIcon type="device" value={data?.device} />
+          {formatValue(data?.device, 'device')}
+        </dd>
+        <dt>{formatMessage(labels.browser)}</dt>
+        <dd>
+          <TypeIcon type="browser" value={data?.browser} />
+          {formatValue(data?.browser, 'browser')}
+        </dd>
       </dl>
-    </h1>
+    </div>
   );
 }
diff --git a/src/components/common/TypeIcon.tsx b/src/components/common/TypeIcon.tsx
new file mode 100644
index 0000000000..8952bb2628
--- /dev/null
+++ b/src/components/common/TypeIcon.tsx
@@ -0,0 +1,18 @@
+export function TypeIcon({
+  type,
+  value,
+}: {
+  type: 'browser' | 'country' | 'device' | 'os';
+  value: string;
+}) {
+  return (
+    <img
+      src={`${process.env.basePath || ''}/images/${type}/${value || 'unknown'}.png`}
+      alt={value}
+      width={type === 'country' ? undefined : 16}
+      height={type === 'country' ? undefined : 16}
+    />
+  );
+}
+
+export default TypeIcon;
diff --git a/src/components/hooks/index.ts b/src/components/hooks/index.ts
index b0271ff2cd..515255e675 100644
--- a/src/components/hooks/index.ts
+++ b/src/components/hooks/index.ts
@@ -32,6 +32,7 @@ export * from './useLocale';
 export * from './useMessages';
 export * from './useModified';
 export * from './useNavigation';
+export * from './useRegionNames';
 export * from './useSticky';
 export * from './useTeamUrl';
 export * from './useTheme';
diff --git a/src/components/hooks/useCountryNames.ts b/src/components/hooks/useCountryNames.ts
index 17b594b6f3..2bdaa94e92 100644
--- a/src/components/hooks/useCountryNames.ts
+++ b/src/components/hooks/useCountryNames.ts
@@ -28,7 +28,7 @@ export function useCountryNames(locale: string) {
     }
   }, [locale]);
 
-  return list;
+  return { countryNames: list };
 }
 
 export default useCountryNames;
diff --git a/src/components/hooks/useFormat.ts b/src/components/hooks/useFormat.ts
index 57edfa5201..631b3f03bb 100644
--- a/src/components/hooks/useFormat.ts
+++ b/src/components/hooks/useFormat.ts
@@ -7,7 +7,7 @@ import regions from '../../../public/iso-3166-2.json';
 export function useFormat() {
   const { formatMessage, labels } = useMessages();
   const { locale } = useLocale();
-  const countryNames = useCountryNames(locale);
+  const { countryNames } = useCountryNames(locale);
 
   const formatOS = (value: string): string => {
     return OS_NAMES[value] || value;
diff --git a/src/components/hooks/useRegionNames.ts b/src/components/hooks/useRegionNames.ts
new file mode 100644
index 0000000000..1ba7feaa73
--- /dev/null
+++ b/src/components/hooks/useRegionNames.ts
@@ -0,0 +1,19 @@
+import useCountryNames from './useCountryNames';
+import regions from '../../../public/iso-3166-2.json';
+
+export function useRegionNames(locale: string) {
+  const { countryNames } = useCountryNames(locale);
+
+  const getRegionName = (regionCode: string, countryCode?: string) => {
+    if (!countryCode) {
+      return regions[regionCode];
+    }
+
+    const region = regionCode.includes('-') ? regionCode : `${countryCode}-${regionCode}`;
+    return regions[region] ? `${regions[region]}, ${countryNames[countryCode]}` : region;
+  };
+
+  return { regionNames: regions, getRegionName };
+}
+
+export default useRegionNames;
diff --git a/src/components/icons.ts b/src/components/icons.ts
index 8e5a481cbf..422f042ab2 100644
--- a/src/components/icons.ts
+++ b/src/components/icons.ts
@@ -11,6 +11,7 @@ import Dashboard from 'assets/dashboard.svg';
 import Eye from 'assets/eye.svg';
 import Gear from 'assets/gear.svg';
 import Globe from 'assets/globe.svg';
+import Location from 'assets/location.svg';
 import Lock from 'assets/lock.svg';
 import Logo from 'assets/logo.svg';
 import Magnet from 'assets/magnet.svg';
@@ -38,6 +39,7 @@ const icons = {
   Eye,
   Gear,
   Globe,
+  Location,
   Lock,
   Logo,
   Magnet,
diff --git a/src/components/messages.ts b/src/components/messages.ts
index 6609076235..764348fae0 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -272,6 +272,8 @@ export const labels = defineMessages({
   previous: { id: 'label.previous', defaultMessage: 'Previous' },
   previousPeriod: { id: 'label.previous-period', defaultMessage: 'Previous period' },
   previousYear: { id: 'label.previous-year', defaultMessage: 'Previous year' },
+  lastSeen: { id: 'label.last-seen', defaultMessage: 'Last seen' },
+  firstSeen: { id: 'label.first-seen', defaultMessage: 'First seen' },
 });
 
 export const messages = defineMessages({
diff --git a/src/components/metrics/BrowsersTable.tsx b/src/components/metrics/BrowsersTable.tsx
index 004b5e43a5..d0cec12453 100644
--- a/src/components/metrics/BrowsersTable.tsx
+++ b/src/components/metrics/BrowsersTable.tsx
@@ -2,6 +2,7 @@ import FilterLink from 'components/common/FilterLink';
 import MetricsTable, { MetricsTableProps } from 'components/metrics/MetricsTable';
 import { useMessages } from 'components/hooks';
 import { useFormat } from 'components/hooks';
+import TypeIcon from 'components/common/TypeIcon';
 
 export function BrowsersTable(props: MetricsTableProps) {
   const { formatMessage, labels } = useMessages();
@@ -10,12 +11,7 @@ export function BrowsersTable(props: MetricsTableProps) {
   function renderLink({ x: browser }) {
     return (
       <FilterLink id="browser" value={browser} label={formatBrowser(browser)}>
-        <img
-          src={`${process.env.basePath || ''}/images/browsers/${browser || 'unknown'}.png`}
-          alt={browser}
-          width={16}
-          height={16}
-        />
+        <TypeIcon type="browser" value={browser} />
       </FilterLink>
     );
   }
diff --git a/src/components/metrics/CitiesTable.tsx b/src/components/metrics/CitiesTable.tsx
index ee2d100510..b3573b5c36 100644
--- a/src/components/metrics/CitiesTable.tsx
+++ b/src/components/metrics/CitiesTable.tsx
@@ -1,6 +1,7 @@
 import MetricsTable, { MetricsTableProps } from './MetricsTable';
 import { emptyFilter } from 'lib/filters';
 import FilterLink from 'components/common/FilterLink';
+import TypeIcon from 'components/common/TypeIcon';
 import { useLocale } from 'components/hooks';
 import { useMessages } from 'components/hooks';
 import { useCountryNames } from 'components/hooks';
@@ -8,7 +9,7 @@ import { useCountryNames } from 'components/hooks';
 export function CitiesTable(props: MetricsTableProps) {
   const { locale } = useLocale();
   const { formatMessage, labels } = useMessages();
-  const countryNames = useCountryNames(locale);
+  const { countryNames } = useCountryNames(locale);
 
   const renderLabel = (city: string, country: string) => {
     const countryName = countryNames[country];
@@ -18,12 +19,7 @@ export function CitiesTable(props: MetricsTableProps) {
   const renderLink = ({ x: city, country }) => {
     return (
       <FilterLink id="city" value={city} label={renderLabel(city, country)}>
-        {country && (
-          <img
-            src={`${process.env.basePath || ''}/images/flags/${country?.toLowerCase() || 'xx'}.png`}
-            alt={country}
-          />
-        )}
+        {country && <TypeIcon type="country" value={country} />}
       </FilterLink>
     );
   };
diff --git a/src/components/metrics/CountriesTable.tsx b/src/components/metrics/CountriesTable.tsx
index 3e7c0af016..87a7838e2d 100644
--- a/src/components/metrics/CountriesTable.tsx
+++ b/src/components/metrics/CountriesTable.tsx
@@ -2,6 +2,7 @@ import FilterLink from 'components/common/FilterLink';
 import { useCountryNames } from 'components/hooks';
 import { useLocale, useMessages, useFormat } from 'components/hooks';
 import MetricsTable, { MetricsTableProps } from './MetricsTable';
+import TypeIcon from 'components/common/TypeIcon';
 
 export function CountriesTable({
   onDataLoad,
@@ -10,7 +11,7 @@ export function CountriesTable({
   onDataLoad: (data: any) => void;
 } & MetricsTableProps) {
   const { locale } = useLocale();
-  const countryNames = useCountryNames(locale);
+  const { countryNames } = useCountryNames(locale);
   const { formatMessage, labels } = useMessages();
   const { formatCountry } = useFormat();
 
@@ -26,10 +27,7 @@ export function CountriesTable({
         value={countryNames[code] && code}
         label={formatCountry(code)}
       >
-        <img
-          src={`${process.env.basePath || ''}/images/flags/${code?.toLowerCase() || 'xx'}.png`}
-          alt={code}
-        />
+        <TypeIcon type="country" value={code?.toLowerCase()} />
       </FilterLink>
     );
   };
diff --git a/src/components/metrics/DevicesTable.tsx b/src/components/metrics/DevicesTable.tsx
index e3db60ea00..f2f3f1aabe 100644
--- a/src/components/metrics/DevicesTable.tsx
+++ b/src/components/metrics/DevicesTable.tsx
@@ -2,6 +2,7 @@ import MetricsTable, { MetricsTableProps } from './MetricsTable';
 import FilterLink from 'components/common/FilterLink';
 import { useMessages } from 'components/hooks';
 import { useFormat } from 'components/hooks';
+import TypeIcon from 'components/common/TypeIcon';
 
 export function DevicesTable(props: MetricsTableProps) {
   const { formatMessage, labels } = useMessages();
@@ -10,14 +11,7 @@ export function DevicesTable(props: MetricsTableProps) {
   function renderLink({ x: device }) {
     return (
       <FilterLink id="device" value={labels[device] && device} label={formatDevice(device)}>
-        <img
-          src={`${process.env.basePath || ''}/images/device/${
-            device?.toLowerCase() || 'unknown'
-          }.png`}
-          alt={device}
-          width={16}
-          height={16}
-        />
+        <TypeIcon type="device" value={device?.toLowerCase()} />
       </FilterLink>
     );
   }
diff --git a/src/components/metrics/OSTable.tsx b/src/components/metrics/OSTable.tsx
index 7744bf119a..6989504c0d 100644
--- a/src/components/metrics/OSTable.tsx
+++ b/src/components/metrics/OSTable.tsx
@@ -1,6 +1,7 @@
 import MetricsTable, { MetricsTableProps } from './MetricsTable';
 import FilterLink from 'components/common/FilterLink';
 import { useMessages, useFormat } from 'components/hooks';
+import TypeIcon from 'components/common/TypeIcon';
 
 export function OSTable(props: MetricsTableProps) {
   const { formatMessage, labels } = useMessages();
@@ -9,14 +10,7 @@ export function OSTable(props: MetricsTableProps) {
   function renderLink({ x: os }) {
     return (
       <FilterLink id="os" value={os} label={formatOS(os)}>
-        <img
-          src={`${process.env.basePath || ''}/images/os/${
-            os?.toLowerCase()?.replaceAll(/\W/g, '-') || 'unknown'
-          }.png`}
-          alt={os}
-          width={16}
-          height={16}
-        />
+        <TypeIcon type="os" value={os?.toLowerCase()?.replaceAll(/\W/g, '-')} />
       </FilterLink>
     );
   }
diff --git a/src/components/metrics/RegionsTable.tsx b/src/components/metrics/RegionsTable.tsx
index 6e6d7d96de..215551af8b 100644
--- a/src/components/metrics/RegionsTable.tsx
+++ b/src/components/metrics/RegionsTable.tsx
@@ -1,28 +1,18 @@
 import FilterLink from 'components/common/FilterLink';
 import { emptyFilter } from 'lib/filters';
-import { useLocale } from 'components/hooks';
-import { useMessages } from 'components/hooks';
-import { useCountryNames } from 'components/hooks';
+import { useMessages, useLocale, useRegionNames } from 'components/hooks';
 import MetricsTable, { MetricsTableProps } from './MetricsTable';
-import regions from '../../../public/iso-3166-2.json';
+import TypeIcon from 'components/common/TypeIcon';
 
 export function RegionsTable(props: MetricsTableProps) {
   const { locale } = useLocale();
   const { formatMessage, labels } = useMessages();
-  const countryNames = useCountryNames(locale);
-
-  const renderLabel = (code: string, country: string) => {
-    const region = code.includes('-') ? code : `${country}-${code}`;
-    return regions[region] ? `${regions[region]}, ${countryNames[country]}` : region;
-  };
+  const { getRegionName } = useRegionNames(locale);
 
   const renderLink = ({ x: code, country }) => {
     return (
-      <FilterLink id="region" className={locale} value={code} label={renderLabel(code, country)}>
-        <img
-          src={`${process.env.basePath || ''}/images/flags/${country?.toLowerCase() || 'xx'}.png`}
-          alt={code}
-        />
+      <FilterLink id="region" className={locale} value={code} label={getRegionName(code, country)}>
+        <TypeIcon type="country" value={country?.toLowerCase()} />
       </FilterLink>
     );
   };
diff --git a/src/components/metrics/WorldMap.tsx b/src/components/metrics/WorldMap.tsx
index 27d0f57c06..54483270c6 100644
--- a/src/components/metrics/WorldMap.tsx
+++ b/src/components/metrics/WorldMap.tsx
@@ -17,7 +17,7 @@ export function WorldMap({ data = [], className }: { data?: any[]; className?: s
   const { theme, colors } = useTheme();
   const { locale } = useLocale();
   const { formatMessage, labels } = useMessages();
-  const countryNames = useCountryNames(locale);
+  const { countryNames } = useCountryNames(locale);
   const visitorsLabel = formatMessage(labels.visitors).toLocaleLowerCase(locale);
   const metrics = useMemo(() => (data ? percentFilter(data) : []), [data]);
 
diff --git a/src/queries/analytics/sessions/getSession.ts b/src/queries/analytics/sessions/getSession.ts
index 2c008e30cc..9cdc45d69c 100644
--- a/src/queries/analytics/sessions/getSession.ts
+++ b/src/queries/analytics/sessions/getSession.ts
@@ -25,8 +25,6 @@ async function clickhouseQuery(websiteId: string, sessionId: string) {
     select
       session_id as id,
       website_id as websiteId,
-      min(created_at) as firstAt,
-      max(created_at) as lastAt,
       hostname,
       browser,
       os,
@@ -35,7 +33,9 @@ async function clickhouseQuery(websiteId: string, sessionId: string) {
       language,
       country,
       subdivision1,
-      city
+      city,
+      min(created_at) as firstAt,
+      max(created_at) as lastAt
     from website_event
     where website_id = {websiteId:UUID}
     and session_id = {sessionId:UUID}
diff --git a/src/queries/analytics/sessions/getSessions.ts b/src/queries/analytics/sessions/getSessions.ts
index e7c9596339..4e632430ae 100644
--- a/src/queries/analytics/sessions/getSessions.ts
+++ b/src/queries/analytics/sessions/getSessions.ts
@@ -32,7 +32,6 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
     select
       session_id as id,
       website_id as websiteId,
-      min(created_at) as createdAt,
       hostname,
       browser,
       os,
@@ -41,13 +40,15 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
       language,
       country,
       subdivision1,
-      city
+      city,
+      min(created_at) as firstAt,
+      max(created_at) as lastAt
     from website_event
     where website_id = {websiteId:UUID}
     ${dateQuery}
     ${filterQuery}
     group by session_id, website_id, hostname, browser, os, device, screen, language, country, subdivision1, city
-    order by createdAt desc
+    order by lastAt desc
     `,
     params,
     pageParams,

From f32bf0a2e034dfa014e4d92192ee298a75cae3ea Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Mon, 29 Jul 2024 19:09:13 -0700
Subject: [PATCH 229/438] Session details screen.

---
 .../sessions/SessionsDataTable.tsx            |  4 +-
 .../[sessionId]/SessionActivity.module.css    | 20 +++++++
 .../sessions/[sessionId]/SessionActivity.tsx  | 52 +++++++++++++++++++
 .../[sessionId]/SessionDetailsPage.module.css | 13 ++++-
 .../[sessionId]/SessionDetailsPage.tsx        | 13 +++--
 .../sessions/[sessionId]/SessionInfo.tsx      | 16 ++++--
 .../sessions/[sessionId]/SessionStats.tsx     | 14 +++++
 src/assets/location.svg                       |  1 +
 src/components/hooks/index.ts                 |  5 +-
 .../hooks/queries/useSessionActivity.ts       | 12 +++++
 .../{useSession.ts => useWebsiteSession.ts}   |  4 +-
 .../{useSessions.ts => useWebsiteSessions.ts} |  4 +-
 src/lib/load.ts                               | 10 ++--
 .../sessions/[sessionId]/activity.ts          | 42 +++++++++++++++
 .../{[sessionId].ts => [sessionId]/index.ts}  |  8 +--
 .../websites/[websiteId]/sessions/index.ts    |  4 +-
 src/queries/analytics/getRealtimeData.ts      |  4 +-
 .../analytics/sessions/getSessionActivity.ts  | 44 ++++++++++++++++
 .../{getSession.ts => getWebsiteSession.ts}   |  8 ++-
 .../{getSessions.ts => getWebsiteSessions.ts} |  2 +-
 src/queries/index.ts                          |  5 +-
 21 files changed, 252 insertions(+), 33 deletions(-)
 create mode 100644 src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.module.css
 create mode 100644 src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
 create mode 100644 src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionStats.tsx
 create mode 100644 src/assets/location.svg
 create mode 100644 src/components/hooks/queries/useSessionActivity.ts
 rename src/components/hooks/queries/{useSession.ts => useWebsiteSession.ts} (69%)
 rename src/components/hooks/queries/{useSessions.ts => useWebsiteSessions.ts} (76%)
 create mode 100644 src/pages/api/websites/[websiteId]/sessions/[sessionId]/activity.ts
 rename src/pages/api/websites/[websiteId]/sessions/{[sessionId].ts => [sessionId]/index.ts} (78%)
 create mode 100644 src/queries/analytics/sessions/getSessionActivity.ts
 rename src/queries/analytics/sessions/{getSession.ts => getWebsiteSession.ts} (80%)
 rename src/queries/analytics/sessions/{getSessions.ts => getWebsiteSessions.ts} (97%)

diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsDataTable.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsDataTable.tsx
index 9e9f97e9ef..d69cad121a 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsDataTable.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsDataTable.tsx
@@ -1,4 +1,4 @@
-import { useSessions } from 'components/hooks';
+import { useWebsiteSessions } from 'components/hooks';
 import SessionsTable from './SessionsTable';
 import DataTable from 'components/common/DataTable';
 import { ReactNode } from 'react';
@@ -11,7 +11,7 @@ export default function SessionsDataTable({
   teamId?: string;
   children?: ReactNode;
 }) {
-  const queryResult = useSessions(websiteId);
+  const queryResult = useWebsiteSessions(websiteId);
 
   if (queryResult?.result?.data?.length === 0) {
     return children;
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.module.css b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.module.css
new file mode 100644
index 0000000000..bcc6868d49
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.module.css
@@ -0,0 +1,20 @@
+.timeline {
+  display: flex;
+  flex-direction: column;
+  gap: 20px;
+}
+
+.row {
+  display: flex;
+  align-items: center;
+  gap: 20px;
+}
+
+.time {
+  color: var(--font-color200);
+  width: 120px;
+}
+
+.header {
+  font-weight: bold;
+}
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
new file mode 100644
index 0000000000..c644fb8908
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
@@ -0,0 +1,52 @@
+import { formatDate } from 'lib/date';
+import { isSameDay } from 'date-fns';
+import { Loading, Icon, StatusLight } from 'react-basics';
+import Icons from 'components/icons';
+import { useLocale, useSessionActivity } from 'components/hooks';
+import styles from './SessionActivity.module.css';
+
+export function SessionActivity({
+  websiteId,
+  sessionId,
+}: {
+  websiteId: string;
+  sessionId: string;
+}) {
+  const { locale } = useLocale();
+  const { data, isLoading } = useSessionActivity(websiteId, sessionId);
+
+  if (isLoading) {
+    return <Loading position="page" />;
+  }
+
+  let lastDay = null;
+
+  return (
+    <div className={styles.timeline}>
+      <h1>Activity log</h1>
+      {data.map(({ eventId, createdAt, urlPath, eventName, visitId }) => {
+        const showHeader = !lastDay || !isSameDay(new Date(lastDay), new Date(createdAt));
+        lastDay = createdAt;
+
+        return (
+          <>
+            {showHeader && (
+              <div className={styles.header}>
+                {formatDate(new Date(createdAt), 'EEEE, PPP', locale)}
+              </div>
+            )}
+            <div key={eventId} className={styles.row}>
+              <div className={styles.time}>
+                <StatusLight color={`#${visitId?.substring(0, 6)}`}>
+                  {formatDate(new Date(createdAt), 'h:mm:ss aaa', locale)}
+                </StatusLight>
+              </div>
+              <Icon>{eventName ? <Icons.Bolt /> : <Icons.Eye />}</Icon>
+              <div>{eventName || urlPath}</div>
+            </div>
+          </>
+        );
+      })}
+    </div>
+  );
+}
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.module.css b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.module.css
index 21bb011aad..af5ed20153 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.module.css
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.module.css
@@ -1,18 +1,27 @@
 .page {
   display: grid;
-  grid-template-columns: 300px 1fr;
+  grid-template-columns: 300px 1fr max-content;
+  margin-bottom: 40px;
 }
 
 .sidebar {
   display: flex;
   flex-direction: column;
   align-items: center;
-  justify-content: center;
+  justify-content: flex-start;
   gap: 20px;
   padding-right: 20px;
   border-right: 1px solid var(--base300);
 }
 
 .content {
+  padding: 0 20px;
+}
+
+.stats {
+  display: flex;
+  flex-direction: column;
+  gap: 20px;
+  border-left: 1px solid var(--base300);
   padding-left: 20px;
 }
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
index 5aaac9525d..723e6ff788 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
@@ -1,10 +1,12 @@
 'use client';
 import WebsiteHeader from '../../WebsiteHeader';
 import SessionInfo from './SessionInfo';
-import { useSession } from 'components/hooks';
+import { useWebsiteSession } from 'components/hooks';
 import { Loading } from 'react-basics';
 import Profile from 'components/common/Profile';
 import styles from './SessionDetailsPage.module.css';
+import { SessionActivity } from './SessionActivity';
+import SessionStats from './SessionStats';
 
 export default function SessionDetailsPage({
   websiteId,
@@ -13,7 +15,7 @@ export default function SessionDetailsPage({
   websiteId: string;
   sessionId: string;
 }) {
-  const { data, isLoading } = useSession(websiteId, sessionId);
+  const { data, isLoading } = useWebsiteSession(websiteId, sessionId);
 
   if (isLoading) {
     return <Loading position="page" />;
@@ -27,7 +29,12 @@ export default function SessionDetailsPage({
           <Profile seed={data?.id} />
           <SessionInfo data={data} />
         </div>
-        <div className={styles.content}>oh hi.</div>
+        <div className={styles.content}>
+          <SessionActivity websiteId={websiteId} sessionId={sessionId} />
+        </div>
+        <div className={styles.stats}>
+          <SessionStats data={data} />
+        </div>
       </div>
     </>
   );
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx
index cae200ab9e..4b3e8a06d6 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx
@@ -1,4 +1,4 @@
-import { format } from 'date-fns';
+import { formatDate } from 'lib/date';
 import { useFormat, useLocale, useMessages, useRegionNames } from 'components/hooks';
 import TypeIcon from 'components/common/TypeIcon';
 import { Icon, CopyIcon } from 'react-basics';
@@ -18,15 +18,19 @@ export default function SessionInfo({ data }) {
         <dd>
           {data?.id} <CopyIcon value={data?.id} />
         </dd>
-        <dt>{formatMessage(labels.firstSeen)}</dt>
-        <dd>{format(new Date(data?.firstAt), 'PPPpp')}</dd>
+
         <dt>{formatMessage(labels.lastSeen)}</dt>
-        <dd>{format(new Date(data?.lastAt), 'PPPpp')}</dd>
+        <dd>{formatDate(new Date(data?.lastAt), 'EEEE, PPPpp', locale)}</dd>
+
+        <dt>{formatMessage(labels.firstSeen)}</dt>
+        <dd>{formatDate(new Date(data?.firstAt), 'EEEE, PPPpp', locale)}</dd>
+
         <dt>{formatMessage(labels.country)}</dt>
         <dd>
           <TypeIcon type="country" value={data?.country} />
           {formatValue(data?.country, 'country')}
         </dd>
+
         <dt>{formatMessage(labels.region)}</dt>
         <dd>
           <Icon>
@@ -34,6 +38,7 @@ export default function SessionInfo({ data }) {
           </Icon>
           {getRegionName(data?.subdivision1)}
         </dd>
+
         <dt>{formatMessage(labels.city)}</dt>
         <dd>
           <Icon>
@@ -41,16 +46,19 @@ export default function SessionInfo({ data }) {
           </Icon>
           {data?.city}
         </dd>
+
         <dt>{formatMessage(labels.os)}</dt>
         <dd>
           <TypeIcon type="os" value={data?.os?.toLowerCase()?.replaceAll(/\W/g, '-')} />
           {formatValue(data?.os, 'os')}
         </dd>
+
         <dt>{formatMessage(labels.device)}</dt>
         <dd>
           <TypeIcon type="device" value={data?.device} />
           {formatValue(data?.device, 'device')}
         </dd>
+
         <dt>{formatMessage(labels.browser)}</dt>
         <dd>
           <TypeIcon type="browser" value={data?.browser} />
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionStats.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionStats.tsx
new file mode 100644
index 0000000000..574152ec4b
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionStats.tsx
@@ -0,0 +1,14 @@
+import MetricCard from 'components/metrics/MetricCard';
+import { useMessages } from 'components/hooks';
+
+export default function SessionStats({ data }) {
+  const { formatMessage, labels } = useMessages();
+
+  return (
+    <>
+      <MetricCard label={formatMessage(labels.visits)} value={data?.visits} />
+      <MetricCard label={formatMessage(labels.views)} value={data?.views} />
+      <MetricCard label={formatMessage(labels.events)} value={data?.events} />
+    </>
+  );
+}
diff --git a/src/assets/location.svg b/src/assets/location.svg
new file mode 100644
index 0000000000..b0f9af474c
--- /dev/null
+++ b/src/assets/location.svg
@@ -0,0 +1 @@
+<svg height="512" viewBox="0 0 64 64" width="512" xmlns="http://www.w3.org/2000/svg"><g id="Pin"><path d="m32 0a24.0319 24.0319 0 0 0 -24 24c0 17.23 22.36 38.81 23.31 39.72a.99.99 0 0 0 1.38 0c.95-.91 23.31-22.49 23.31-39.72a24.0319 24.0319 0 0 0 -24-24zm0 35a11 11 0 1 1 11-11 11.0066 11.0066 0 0 1 -11 11z"/></g></svg>
\ No newline at end of file
diff --git a/src/components/hooks/index.ts b/src/components/hooks/index.ts
index 515255e675..4ef8925150 100644
--- a/src/components/hooks/index.ts
+++ b/src/components/hooks/index.ts
@@ -5,8 +5,9 @@ export * from './queries/useLogin';
 export * from './queries/useRealtime';
 export * from './queries/useReport';
 export * from './queries/useReports';
-export * from './queries/useSession';
-export * from './queries/useSessions';
+export * from './queries/useSessionActivity';
+export * from './queries/useWebsiteSession';
+export * from './queries/useWebsiteSessions';
 export * from './queries/useShareToken';
 export * from './queries/useTeam';
 export * from './queries/useTeams';
diff --git a/src/components/hooks/queries/useSessionActivity.ts b/src/components/hooks/queries/useSessionActivity.ts
new file mode 100644
index 0000000000..e6d7ffa0e4
--- /dev/null
+++ b/src/components/hooks/queries/useSessionActivity.ts
@@ -0,0 +1,12 @@
+import { useApi } from './useApi';
+
+export function useSessionActivity(websiteId: string, sessionId: string) {
+  const { get, useQuery } = useApi();
+
+  return useQuery({
+    queryKey: ['session:activity', { websiteId, sessionId }],
+    queryFn: () => {
+      return get(`/websites/${websiteId}/sessions/${sessionId}/activity`);
+    },
+  });
+}
diff --git a/src/components/hooks/queries/useSession.ts b/src/components/hooks/queries/useWebsiteSession.ts
similarity index 69%
rename from src/components/hooks/queries/useSession.ts
rename to src/components/hooks/queries/useWebsiteSession.ts
index f65efcf45a..64c7be58bf 100644
--- a/src/components/hooks/queries/useSession.ts
+++ b/src/components/hooks/queries/useWebsiteSession.ts
@@ -1,6 +1,6 @@
 import { useApi } from './useApi';
 
-export function useSession(websiteId: string, sessionId: string) {
+export function useWebsiteSession(websiteId: string, sessionId: string) {
   const { get, useQuery } = useApi();
 
   return useQuery({
@@ -11,4 +11,4 @@ export function useSession(websiteId: string, sessionId: string) {
   });
 }
 
-export default useSession;
+export default useWebsiteSession;
diff --git a/src/components/hooks/queries/useSessions.ts b/src/components/hooks/queries/useWebsiteSessions.ts
similarity index 76%
rename from src/components/hooks/queries/useSessions.ts
rename to src/components/hooks/queries/useWebsiteSessions.ts
index 91f4ea4c64..9430786b1e 100644
--- a/src/components/hooks/queries/useSessions.ts
+++ b/src/components/hooks/queries/useWebsiteSessions.ts
@@ -2,7 +2,7 @@ import { useApi } from './useApi';
 import { useFilterQuery } from './useFilterQuery';
 import useModified from '../useModified';
 
-export function useSessions(websiteId: string, params?: { [key: string]: string | number }) {
+export function useWebsiteSessions(websiteId: string, params?: { [key: string]: string | number }) {
   const { get } = useApi();
   const { modified } = useModified(`sessions`);
 
@@ -17,4 +17,4 @@ export function useSessions(websiteId: string, params?: { [key: string]: string
   });
 }
 
-export default useSessions;
+export default useWebsiteSessions;
diff --git a/src/lib/load.ts b/src/lib/load.ts
index 7812ea0db2..970247ddd5 100644
--- a/src/lib/load.ts
+++ b/src/lib/load.ts
@@ -1,4 +1,4 @@
-import { getSession, getWebsite } from 'queries';
+import { getWebsiteSession, getWebsite } from 'queries';
 import { Website, Session } from '@prisma/client';
 import redis from '@umami/redis-client';
 
@@ -22,9 +22,13 @@ export async function fetchSession(sessionId: string): Promise<Session> {
   let session = null;
 
   if (redis.enabled) {
-    session = await redis.client.fetch(`session:${sessionId}`, () => getSession(sessionId), 86400);
+    session = await redis.client.fetch(
+      `session:${sessionId}`,
+      () => getWebsiteSession(sessionId),
+      86400,
+    );
   } else {
-    session = await getSession(sessionId);
+    session = await getWebsiteSession(sessionId);
   }
 
   if (!session) {
diff --git a/src/pages/api/websites/[websiteId]/sessions/[sessionId]/activity.ts b/src/pages/api/websites/[websiteId]/sessions/[sessionId]/activity.ts
new file mode 100644
index 0000000000..8d1b234617
--- /dev/null
+++ b/src/pages/api/websites/[websiteId]/sessions/[sessionId]/activity.ts
@@ -0,0 +1,42 @@
+import * as yup from 'yup';
+import { canViewWebsite } from 'lib/auth';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody, PageParams } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getSessionActivity } from 'queries';
+
+export interface SessionActivityRequestQuery extends PageParams {
+  websiteId: string;
+  sessionId: string;
+}
+
+const schema = {
+  GET: yup.object().shape({
+    websiteId: yup.string().uuid().required(),
+    sessionId: yup.string().uuid().required(),
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<SessionActivityRequestQuery, any>,
+  res: NextApiResponse,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  const { websiteId, sessionId } = req.query;
+
+  if (req.method === 'GET') {
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const data = await getSessionActivity(websiteId, sessionId);
+
+    return ok(res, data);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/src/pages/api/websites/[websiteId]/sessions/[sessionId].ts b/src/pages/api/websites/[websiteId]/sessions/[sessionId]/index.ts
similarity index 78%
rename from src/pages/api/websites/[websiteId]/sessions/[sessionId].ts
rename to src/pages/api/websites/[websiteId]/sessions/[sessionId]/index.ts
index 57e99ea376..f627a20858 100644
--- a/src/pages/api/websites/[websiteId]/sessions/[sessionId].ts
+++ b/src/pages/api/websites/[websiteId]/sessions/[sessionId]/index.ts
@@ -4,9 +4,9 @@ import { useAuth, useCors, useValidate } from 'lib/middleware';
 import { NextApiRequestQueryBody, PageParams } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { getSession } from 'queries';
+import { getWebsiteSession } from 'queries';
 
-export interface ReportsRequestQuery extends PageParams {
+export interface WesiteSessionRequestQuery extends PageParams {
   websiteId: string;
   sessionId: string;
 }
@@ -19,7 +19,7 @@ const schema = {
 };
 
 export default async (
-  req: NextApiRequestQueryBody<ReportsRequestQuery, any>,
+  req: NextApiRequestQueryBody<WesiteSessionRequestQuery, any>,
   res: NextApiResponse,
 ) => {
   await useCors(req, res);
@@ -33,7 +33,7 @@ export default async (
       return unauthorized(res);
     }
 
-    const data = await getSession(websiteId, sessionId);
+    const data = await getWebsiteSession(websiteId, sessionId);
 
     return ok(res, data);
   }
diff --git a/src/pages/api/websites/[websiteId]/sessions/index.ts b/src/pages/api/websites/[websiteId]/sessions/index.ts
index 21cacb1c2b..4f242882fb 100644
--- a/src/pages/api/websites/[websiteId]/sessions/index.ts
+++ b/src/pages/api/websites/[websiteId]/sessions/index.ts
@@ -5,7 +5,7 @@ import { NextApiRequestQueryBody, PageParams } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { pageInfo } from 'lib/schema';
-import { getSessions } from 'queries';
+import { getWebsiteSessions } from 'queries';
 
 export interface ReportsRequestQuery extends PageParams {
   websiteId: string;
@@ -33,7 +33,7 @@ export default async (
       return unauthorized(res);
     }
 
-    const data = await getSessions(websiteId, {}, req.query);
+    const data = await getWebsiteSessions(websiteId, {}, req.query);
 
     return ok(res, data);
   }
diff --git a/src/queries/analytics/getRealtimeData.ts b/src/queries/analytics/getRealtimeData.ts
index 5a9c5a36c0..e25cc86617 100644
--- a/src/queries/analytics/getRealtimeData.ts
+++ b/src/queries/analytics/getRealtimeData.ts
@@ -1,4 +1,4 @@
-import { getSessions, getEvents, getPageviewStats, getSessionStats } from 'queries/index';
+import { getWebsiteSessions, getEvents, getPageviewStats, getSessionStats } from 'queries/index';
 
 const MAX_SIZE = 50;
 
@@ -20,7 +20,7 @@ export async function getRealtimeData(
   const filters = { startDate, endDate: new Date(), unit: 'minute', timezone };
   const [events, sessions, pageviews, sessionviews] = await Promise.all([
     getEvents(websiteId, { startDate, timezone }, { pageSize: 10000 }),
-    getSessions(websiteId, { startDate, timezone }, { pageSize: 10000 }),
+    getWebsiteSessions(websiteId, { startDate, timezone }, { pageSize: 10000 }),
     getPageviewStats(websiteId, filters),
     getSessionStats(websiteId, filters),
   ]);
diff --git a/src/queries/analytics/sessions/getSessionActivity.ts b/src/queries/analytics/sessions/getSessionActivity.ts
new file mode 100644
index 0000000000..bc1f9acaa4
--- /dev/null
+++ b/src/queries/analytics/sessions/getSessionActivity.ts
@@ -0,0 +1,44 @@
+import prisma from 'lib/prisma';
+import clickhouse from 'lib/clickhouse';
+import { runQuery, PRISMA, CLICKHOUSE } from 'lib/db';
+
+export async function getSessionActivity(...args: [websiteId: string, sessionId: string]) {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(websiteId: string, sessionId: string) {
+  return prisma.client.websiteEvent.findMany({
+    where: {
+      id: sessionId,
+      websiteId,
+    },
+  });
+}
+
+async function clickhouseQuery(websiteId: string, sessionId: string) {
+  const { rawQuery } = clickhouse;
+
+  return rawQuery(
+    `
+    select
+      session_id as id,
+      website_id as websiteId,
+      created_at as createdAt,
+      url_path as urlPath,
+      url_query as urlQuery,
+      referrer_domain as referrerDomain,
+      event_id as eventId,
+      event_type as eventType,
+      event_name as eventName,
+      visit_id as visitId
+    from website_event
+    where website_id = {websiteId:UUID}
+    and session_id = {sessionId:UUID} 
+    order by created_at desc
+    `,
+    { websiteId, sessionId },
+  );
+}
diff --git a/src/queries/analytics/sessions/getSession.ts b/src/queries/analytics/sessions/getWebsiteSession.ts
similarity index 80%
rename from src/queries/analytics/sessions/getSession.ts
rename to src/queries/analytics/sessions/getWebsiteSession.ts
index 9cdc45d69c..2e6e8eca05 100644
--- a/src/queries/analytics/sessions/getSession.ts
+++ b/src/queries/analytics/sessions/getWebsiteSession.ts
@@ -2,7 +2,7 @@ import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
 import { runQuery, PRISMA, CLICKHOUSE } from 'lib/db';
 
-export async function getSession(...args: [websiteId: string, sessionId: string]) {
+export async function getWebsiteSession(...args: [websiteId: string, sessionId: string]) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
@@ -13,6 +13,7 @@ async function relationalQuery(websiteId: string, sessionId: string) {
   return prisma.client.session.findUnique({
     where: {
       id: sessionId,
+      websiteId,
     },
   });
 }
@@ -35,7 +36,10 @@ async function clickhouseQuery(websiteId: string, sessionId: string) {
       subdivision1,
       city,
       min(created_at) as firstAt,
-      max(created_at) as lastAt
+      max(created_at) as lastAt,
+      uniq(visit_id) as "visits",
+      sumIf(1, event_type = 1) as "views",
+      sumIf(1, event_type = 2) as "events"
     from website_event
     where website_id = {websiteId:UUID}
     and session_id = {sessionId:UUID}
diff --git a/src/queries/analytics/sessions/getSessions.ts b/src/queries/analytics/sessions/getWebsiteSessions.ts
similarity index 97%
rename from src/queries/analytics/sessions/getSessions.ts
rename to src/queries/analytics/sessions/getWebsiteSessions.ts
index 4e632430ae..2094c8a452 100644
--- a/src/queries/analytics/sessions/getSessions.ts
+++ b/src/queries/analytics/sessions/getWebsiteSessions.ts
@@ -3,7 +3,7 @@ import clickhouse from 'lib/clickhouse';
 import { runQuery, PRISMA, CLICKHOUSE } from 'lib/db';
 import { PageParams, QueryFilters } from 'lib/types';
 
-export async function getSessions(
+export async function getWebsiteSessions(
   ...args: [websiteId: string, filters?: QueryFilters, pageParams?: PageParams]
 ) {
   return runQuery({
diff --git a/src/queries/index.ts b/src/queries/index.ts
index 796adea6f4..cd7ea280e7 100644
--- a/src/queries/index.ts
+++ b/src/queries/index.ts
@@ -19,9 +19,10 @@ export * from './analytics/reports/getUTM';
 export * from './analytics/pageviews/getPageviewMetrics';
 export * from './analytics/pageviews/getPageviewStats';
 export * from './analytics/sessions/createSession';
-export * from './analytics/sessions/getSession';
+export * from './analytics/sessions/getWebsiteSession';
 export * from './analytics/sessions/getSessionMetrics';
-export * from './analytics/sessions/getSessions';
+export * from './analytics/sessions/getWebsiteSessions';
+export * from './analytics/sessions/getSessionActivity';
 export * from './analytics/sessions/getSessionStats';
 export * from './analytics/sessions/saveSessionData';
 export * from './analytics/getActiveVisitors';

From b3e6e524734e83507758bf1fccd577bda5794ec4 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 30 Jul 2024 21:22:19 -0700
Subject: [PATCH 230/438] Added session data display.

---
 .../sessions/SessionsTable.module.css         |  5 +++
 .../[websiteId]/sessions/SessionsTable.tsx    | 20 +++++----
 .../sessions/[sessionId]/SessionActivity.tsx  |  1 -
 .../[sessionId]/SessionData.module.css        | 39 +++++++++++++++++
 .../sessions/[sessionId]/SessionData.tsx      | 34 +++++++++++++++
 .../[sessionId]/SessionDetailsPage.module.css | 25 +++++++++--
 .../[sessionId]/SessionDetailsPage.tsx        | 10 +++--
 .../sessions/[sessionId]/SessionStats.tsx     |  7 ++--
 src/components/common/Profile.tsx             |  6 +--
 src/components/hooks/index.ts                 |  1 +
 .../hooks/queries/useSessionData.ts           | 12 ++++++
 src/components/messages.ts                    |  1 +
 src/pages/api/sessions/[sessionId]/data.ts    | 42 +++++++++++++++++++
 .../getEventDataEvents.ts                     |  0
 .../getEventDataFields.ts                     |  0
 .../getEventDataStats.ts                      |  0
 .../getEventDataUsage.ts                      |  0
 src/queries/analytics/events/saveEvent.ts     |  2 +-
 .../{eventData => events}/saveEventData.ts    |  0
 .../analytics/sessions/getSessionData.ts      | 41 ++++++++++++++++++
 .../analytics/sessions/getWebsiteSession.ts   |  6 +--
 .../analytics/sessions/getWebsiteSessions.ts  |  8 +++-
 src/queries/index.ts                          | 11 ++---
 23 files changed, 238 insertions(+), 33 deletions(-)
 create mode 100644 src/app/(main)/websites/[websiteId]/sessions/SessionsTable.module.css
 create mode 100644 src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.module.css
 create mode 100644 src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.tsx
 create mode 100644 src/components/hooks/queries/useSessionData.ts
 create mode 100644 src/pages/api/sessions/[sessionId]/data.ts
 rename src/queries/analytics/{eventData => events}/getEventDataEvents.ts (100%)
 rename src/queries/analytics/{eventData => events}/getEventDataFields.ts (100%)
 rename src/queries/analytics/{eventData => events}/getEventDataStats.ts (100%)
 rename src/queries/analytics/{eventData => events}/getEventDataUsage.ts (100%)
 rename src/queries/analytics/{eventData => events}/saveEventData.ts (100%)
 create mode 100644 src/queries/analytics/sessions/getSessionData.ts

diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.module.css b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.module.css
new file mode 100644
index 0000000000..140ad0bb72
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.module.css
@@ -0,0 +1,5 @@
+.link {
+  display: flex;
+  align-items: center;
+  gap: 20px;
+}
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
index d4cf827a0a..73148b835a 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
@@ -1,21 +1,27 @@
 import Link from 'next/link';
 import { GridColumn, GridTable, useBreakpoint } from 'react-basics';
-import { useFormat, useMessages } from 'components/hooks';
+import { useFormat, useLocale, useMessages } from 'components/hooks';
 import Profile from 'components/common/Profile';
+import styles from './SessionsTable.module.css';
+import { formatDate } from 'lib/date';
 
 export function SessionsTable({ data = [] }: { data: any[]; showDomain?: boolean }) {
+  const { locale } = useLocale();
   const { formatMessage, labels } = useMessages();
   const breakpoint = useBreakpoint();
   const { formatValue } = useFormat();
 
   return (
     <GridTable data={data} cardMode={['xs', 'sm', 'md'].includes(breakpoint)}>
-      <GridColumn name="pic" label="" width="90px">
-        {row => <Profile key={row.id} seed={row.id} size={64} />}
-      </GridColumn>
-      <GridColumn name="id" label="ID">
-        {row => <Link href={`sessions/${row.id}`}>{row.id}</Link>}
+      <GridColumn name="id" label="ID" width="300px">
+        {row => (
+          <Link href={`sessions/${row.id}`} className={styles.link}>
+            <Profile key={row.id} seed={row.id} size={64} />
+            {row.id}
+          </Link>
+        )}
       </GridColumn>
+      <GridColumn name="visits" label={formatMessage(labels.visits)} width="100px" />
       <GridColumn name="country" label={formatMessage(labels.country)}>
         {row => formatValue(row.country, 'country')}
       </GridColumn>
@@ -28,7 +34,7 @@ export function SessionsTable({ data = [] }: { data: any[]; showDomain?: boolean
         {row => formatValue(row.device, 'device')}
       </GridColumn>
       <GridColumn name="lastAt" label={formatMessage(labels.lastSeen)}>
-        {row => row.lastAt}
+        {row => formatDate(new Date(row.lastAt), 'PPPpp', locale)}
       </GridColumn>
     </GridTable>
   );
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
index c644fb8908..0a15430c0e 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
@@ -23,7 +23,6 @@ export function SessionActivity({
 
   return (
     <div className={styles.timeline}>
-      <h1>Activity log</h1>
       {data.map(({ eventId, createdAt, urlPath, eventName, visitId }) => {
         const showHeader = !lastDay || !isSameDay(new Date(lastDay), new Date(createdAt));
         lastDay = createdAt;
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.module.css b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.module.css
new file mode 100644
index 0000000000..2057622be8
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.module.css
@@ -0,0 +1,39 @@
+.data {
+  display: flex;
+  flex-direction: column;
+  gap: 20px;
+  width: 200px;
+  position: relative;
+}
+
+.header {
+  font-weight: bold;
+}
+
+.empty {
+  color: var(--font-color300);
+  text-align: center;
+}
+
+.label {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.type {
+  font-size: 10px;
+  text-transform: uppercase;
+  padding: 0 6px;
+  border-radius: 4px;
+  border: 1px solid var(--base300);
+}
+
+.name {
+  color: var(--font-color200);
+  font-weight: bold;
+}
+
+.value {
+  margin: 5px 0;
+}
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.tsx
new file mode 100644
index 0000000000..2d99f8b349
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.tsx
@@ -0,0 +1,34 @@
+import { Loading, TextOverflow } from 'react-basics';
+import { useMessages, useSessionData } from 'components/hooks';
+import Empty from 'components/common/Empty';
+import styles from './SessionData.module.css';
+import { DATA_TYPES } from 'lib/constants';
+
+export function SessionData({ websiteId, sessionId }: { websiteId: string; sessionId: string }) {
+  const { formatMessage, labels } = useMessages();
+  const { data, isLoading } = useSessionData(websiteId, sessionId);
+
+  if (isLoading) {
+    return <Loading icon="dots" size="sm" />;
+  }
+
+  return (
+    <div className={styles.data}>
+      <div className={styles.header}>{formatMessage(labels.properties)}</div>
+      {!data?.length && <Empty className={styles.empty} />}
+      {data?.map(({ dataKey, dataType, stringValue }) => {
+        return (
+          <div key={dataKey}>
+            <div className={styles.label}>
+              <div className={styles.name}>
+                <TextOverflow>{dataKey}</TextOverflow>
+              </div>
+              <div className={styles.type}>{DATA_TYPES[dataType]}</div>
+            </div>
+            <div className={styles.value}>{stringValue}</div>
+          </div>
+        );
+      })}
+    </div>
+  );
+}
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.module.css b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.module.css
index af5ed20153..8e2667f427 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.module.css
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.module.css
@@ -2,6 +2,7 @@
   display: grid;
   grid-template-columns: 300px 1fr max-content;
   margin-bottom: 40px;
+  position: relative;
 }
 
 .sidebar {
@@ -12,16 +13,32 @@
   gap: 20px;
   padding-right: 20px;
   border-right: 1px solid var(--base300);
+  position: relative;
 }
 
 .content {
+  display: flex;
+  flex-direction: column;
+  gap: 30px;
   padding: 0 20px;
+  position: relative;
 }
 
-.stats {
-  display: flex;
-  flex-direction: column;
-  gap: 20px;
+.data {
   border-left: 1px solid var(--base300);
   padding-left: 20px;
+  position: relative;
+  transition: width 200ms ease-in-out;
+}
+
+@media screen and (max-width: 992px) {
+  .page {
+    grid-template-columns: 1fr;
+    gap: 30px;
+  }
+
+  .sidebar,
+  .data {
+    border: 0;
+  }
 }
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
index 723e6ff788..d4ed503e77 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
@@ -4,9 +4,10 @@ import SessionInfo from './SessionInfo';
 import { useWebsiteSession } from 'components/hooks';
 import { Loading } from 'react-basics';
 import Profile from 'components/common/Profile';
-import styles from './SessionDetailsPage.module.css';
 import { SessionActivity } from './SessionActivity';
-import SessionStats from './SessionStats';
+import { SessionStats } from './SessionStats';
+import { SessionData } from './SessionData';
+import styles from './SessionDetailsPage.module.css';
 
 export default function SessionDetailsPage({
   websiteId,
@@ -30,10 +31,11 @@ export default function SessionDetailsPage({
           <SessionInfo data={data} />
         </div>
         <div className={styles.content}>
+          <SessionStats data={data} />
           <SessionActivity websiteId={websiteId} sessionId={sessionId} />
         </div>
-        <div className={styles.stats}>
-          <SessionStats data={data} />
+        <div className={styles.data}>
+          <SessionData websiteId={websiteId} sessionId={sessionId} />
         </div>
       </div>
     </>
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionStats.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionStats.tsx
index 574152ec4b..a25f7af3b4 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionStats.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionStats.tsx
@@ -1,14 +1,15 @@
 import MetricCard from 'components/metrics/MetricCard';
 import { useMessages } from 'components/hooks';
+import MetricsBar from 'components/metrics/MetricsBar';
 
-export default function SessionStats({ data }) {
+export function SessionStats({ data }) {
   const { formatMessage, labels } = useMessages();
 
   return (
-    <>
+    <MetricsBar isFetched={true}>
       <MetricCard label={formatMessage(labels.visits)} value={data?.visits} />
       <MetricCard label={formatMessage(labels.views)} value={data?.views} />
       <MetricCard label={formatMessage(labels.events)} value={data?.events} />
-    </>
+    </MetricsBar>
   );
 }
diff --git a/src/components/common/Profile.tsx b/src/components/common/Profile.tsx
index 63a59c1687..4054499475 100644
--- a/src/components/common/Profile.tsx
+++ b/src/components/common/Profile.tsx
@@ -10,9 +10,9 @@ function convertToPastel(hexColor: string, pastelFactor: number = 0.5) {
   hexColor = hexColor.replace(/^#/, '');
 
   // Convert hex to RGB
-  let r = parseInt(hexColor.substr(0, 2), 16);
-  let g = parseInt(hexColor.substr(2, 2), 16);
-  let b = parseInt(hexColor.substr(4, 2), 16);
+  let r = parseInt(hexColor.substring(0, 2), 16);
+  let g = parseInt(hexColor.substring(2, 4), 16);
+  let b = parseInt(hexColor.substring(4, 6), 16);
 
   // Calculate pastel version (mix with white)
   //const pastelFactor = 0.5; // Adjust this value to control pastel intensity
diff --git a/src/components/hooks/index.ts b/src/components/hooks/index.ts
index 4ef8925150..e06a0414cd 100644
--- a/src/components/hooks/index.ts
+++ b/src/components/hooks/index.ts
@@ -6,6 +6,7 @@ export * from './queries/useRealtime';
 export * from './queries/useReport';
 export * from './queries/useReports';
 export * from './queries/useSessionActivity';
+export * from './queries/useSessionData';
 export * from './queries/useWebsiteSession';
 export * from './queries/useWebsiteSessions';
 export * from './queries/useShareToken';
diff --git a/src/components/hooks/queries/useSessionData.ts b/src/components/hooks/queries/useSessionData.ts
new file mode 100644
index 0000000000..f2e8f5241c
--- /dev/null
+++ b/src/components/hooks/queries/useSessionData.ts
@@ -0,0 +1,12 @@
+import { useApi } from './useApi';
+
+export function useSessionData(websiteId: string, sessionId: string) {
+  const { get, useQuery } = useApi();
+
+  return useQuery({
+    queryKey: ['session:data', { websiteId, sessionId }],
+    queryFn: () => {
+      return get(`/sessions/${sessionId}/data`, { websiteId });
+    },
+  });
+}
diff --git a/src/components/messages.ts b/src/components/messages.ts
index 764348fae0..2dfe61ee65 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -274,6 +274,7 @@ export const labels = defineMessages({
   previousYear: { id: 'label.previous-year', defaultMessage: 'Previous year' },
   lastSeen: { id: 'label.last-seen', defaultMessage: 'Last seen' },
   firstSeen: { id: 'label.first-seen', defaultMessage: 'First seen' },
+  properties: { id: 'label.properties', defaultMessage: 'Properties' },
 });
 
 export const messages = defineMessages({
diff --git a/src/pages/api/sessions/[sessionId]/data.ts b/src/pages/api/sessions/[sessionId]/data.ts
new file mode 100644
index 0000000000..c0c200648d
--- /dev/null
+++ b/src/pages/api/sessions/[sessionId]/data.ts
@@ -0,0 +1,42 @@
+import { canViewWebsite } from 'lib/auth';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getSessionData } from 'queries';
+import * as yup from 'yup';
+
+export interface SessionDataRequestQuery {
+  sessionId: string;
+  websiteId: string;
+}
+
+const schema = {
+  GET: yup.object().shape({
+    sessionId: yup.string().uuid().required(),
+    websiteId: yup.string().uuid().required(),
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<SessionDataRequestQuery, any>,
+  res: NextApiResponse<any>,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  if (req.method === 'GET') {
+    const { websiteId, sessionId } = req.query;
+
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const data = await getSessionData(websiteId, sessionId);
+
+    return ok(res, data);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/src/queries/analytics/eventData/getEventDataEvents.ts b/src/queries/analytics/events/getEventDataEvents.ts
similarity index 100%
rename from src/queries/analytics/eventData/getEventDataEvents.ts
rename to src/queries/analytics/events/getEventDataEvents.ts
diff --git a/src/queries/analytics/eventData/getEventDataFields.ts b/src/queries/analytics/events/getEventDataFields.ts
similarity index 100%
rename from src/queries/analytics/eventData/getEventDataFields.ts
rename to src/queries/analytics/events/getEventDataFields.ts
diff --git a/src/queries/analytics/eventData/getEventDataStats.ts b/src/queries/analytics/events/getEventDataStats.ts
similarity index 100%
rename from src/queries/analytics/eventData/getEventDataStats.ts
rename to src/queries/analytics/events/getEventDataStats.ts
diff --git a/src/queries/analytics/eventData/getEventDataUsage.ts b/src/queries/analytics/events/getEventDataUsage.ts
similarity index 100%
rename from src/queries/analytics/eventData/getEventDataUsage.ts
rename to src/queries/analytics/events/getEventDataUsage.ts
diff --git a/src/queries/analytics/events/saveEvent.ts b/src/queries/analytics/events/saveEvent.ts
index cd41b7a318..fa4805df36 100644
--- a/src/queries/analytics/events/saveEvent.ts
+++ b/src/queries/analytics/events/saveEvent.ts
@@ -4,7 +4,7 @@ import clickhouse from 'lib/clickhouse';
 import kafka from 'lib/kafka';
 import prisma from 'lib/prisma';
 import { uuid } from 'lib/crypto';
-import { saveEventData } from 'queries/analytics/eventData/saveEventData';
+import { saveEventData } from './saveEventData';
 
 export async function saveEvent(args: {
   websiteId: string;
diff --git a/src/queries/analytics/eventData/saveEventData.ts b/src/queries/analytics/events/saveEventData.ts
similarity index 100%
rename from src/queries/analytics/eventData/saveEventData.ts
rename to src/queries/analytics/events/saveEventData.ts
diff --git a/src/queries/analytics/sessions/getSessionData.ts b/src/queries/analytics/sessions/getSessionData.ts
new file mode 100644
index 0000000000..e3106b2753
--- /dev/null
+++ b/src/queries/analytics/sessions/getSessionData.ts
@@ -0,0 +1,41 @@
+import prisma from 'lib/prisma';
+import clickhouse from 'lib/clickhouse';
+import { runQuery, PRISMA, CLICKHOUSE } from 'lib/db';
+
+export async function getSessionData(...args: [websiteId: string, sessionId: string]) {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(websiteId: string, sessionId: string) {
+  return prisma.client.sessionData.findMany({
+    where: {
+      id: sessionId,
+      websiteId,
+    },
+  });
+}
+
+async function clickhouseQuery(websiteId: string, sessionId: string) {
+  const { rawQuery } = clickhouse;
+
+  return rawQuery(
+    `
+    select
+        website_id as websiteId,
+        session_id as sessionId,
+        data_key as dataKey,
+        data_type as dataType,
+        string_value as stringValue,
+        number_value as numberValue,
+        date_value as dateValue,
+        created_at as createdAt
+    from session_data
+    where website_id = {websiteId:UUID}
+    and session_id = {sessionId:UUID}
+    `,
+    { websiteId, sessionId },
+  );
+}
diff --git a/src/queries/analytics/sessions/getWebsiteSession.ts b/src/queries/analytics/sessions/getWebsiteSession.ts
index 2e6e8eca05..df3e8a04ad 100644
--- a/src/queries/analytics/sessions/getWebsiteSession.ts
+++ b/src/queries/analytics/sessions/getWebsiteSession.ts
@@ -37,9 +37,9 @@ async function clickhouseQuery(websiteId: string, sessionId: string) {
       city,
       min(created_at) as firstAt,
       max(created_at) as lastAt,
-      uniq(visit_id) as "visits",
-      sumIf(1, event_type = 1) as "views",
-      sumIf(1, event_type = 2) as "events"
+      uniq(visit_id) as visits,
+      sumIf(1, event_type = 1) as views,
+      sumIf(1, event_type = 2) as events
     from website_event
     where website_id = {websiteId:UUID}
     and session_id = {sessionId:UUID}
diff --git a/src/queries/analytics/sessions/getWebsiteSessions.ts b/src/queries/analytics/sessions/getWebsiteSessions.ts
index 2094c8a452..c5fe6cec99 100644
--- a/src/queries/analytics/sessions/getWebsiteSessions.ts
+++ b/src/queries/analytics/sessions/getWebsiteSessions.ts
@@ -42,7 +42,8 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
       subdivision1,
       city,
       min(created_at) as firstAt,
-      max(created_at) as lastAt
+      max(created_at) as lastAt,
+      uniq(visit_id) as visits
     from website_event
     where website_id = {websiteId:UUID}
     ${dateQuery}
@@ -52,5 +53,8 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
     `,
     params,
     pageParams,
-  );
+  ).then((result: any) => ({
+    ...result,
+    visits: Number(result.visits),
+  }));
 }
diff --git a/src/queries/index.ts b/src/queries/index.ts
index cd7ea280e7..82d40ee5d9 100644
--- a/src/queries/index.ts
+++ b/src/queries/index.ts
@@ -3,13 +3,13 @@ export * from 'queries/prisma/team';
 export * from 'queries/prisma/teamUser';
 export * from 'queries/prisma/user';
 export * from 'queries/prisma/website';
+export * from './analytics/events/getEventDataEvents';
+export * from './analytics/events/getEventDataFields';
+export * from './analytics/events/getEventDataStats';
+export * from './analytics/events/getEventDataUsage';
 export * from './analytics/events/getEventMetrics';
-export * from './analytics/events/getEventUsage';
 export * from './analytics/events/getEvents';
-export * from './analytics/eventData/getEventDataEvents';
-export * from './analytics/eventData/getEventDataFields';
-export * from './analytics/eventData/getEventDataStats';
-export * from './analytics/eventData/getEventDataUsage';
+export * from './analytics/events/getEventUsage';
 export * from './analytics/events/saveEvent';
 export * from './analytics/reports/getFunnel';
 export * from './analytics/reports/getJourney';
@@ -20,6 +20,7 @@ export * from './analytics/pageviews/getPageviewMetrics';
 export * from './analytics/pageviews/getPageviewStats';
 export * from './analytics/sessions/createSession';
 export * from './analytics/sessions/getWebsiteSession';
+export * from './analytics/sessions/getSessionData';
 export * from './analytics/sessions/getSessionMetrics';
 export * from './analytics/sessions/getWebsiteSessions';
 export * from './analytics/sessions/getSessionActivity';

From 10f65cae685314fb857ea27813ab8bc771790f92 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 30 Jul 2024 22:10:32 -0700
Subject: [PATCH 231/438] Responsive styles for session page.

---
 .../sessions/[sessionId]/SessionData.module.css      |  6 ++----
 .../[websiteId]/sessions/[sessionId]/SessionData.tsx |  2 +-
 .../[sessionId]/SessionDetailsPage.module.css        |  5 ++++-
 .../sessions/[sessionId]/SessionInfo.module.css      |  4 ++++
 .../[websiteId]/sessions/[sessionId]/index.ts        |  2 +-
 src/queries/analytics/sessions/getSessionData.ts     |  1 +
 src/queries/analytics/sessions/getWebsiteSession.ts  | 12 +++++-------
 7 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.module.css b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.module.css
index 2057622be8..072172f6dd 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.module.css
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.module.css
@@ -2,7 +2,6 @@
   display: flex;
   flex-direction: column;
   gap: 20px;
-  width: 200px;
   position: relative;
 }
 
@@ -22,11 +21,10 @@
 }
 
 .type {
-  font-size: 10px;
-  text-transform: uppercase;
+  font-size: 11px;
   padding: 0 6px;
   border-radius: 4px;
-  border: 1px solid var(--base300);
+  border: 1px solid var(--base400);
 }
 
 .name {
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.tsx
index 2d99f8b349..7e583f185b 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.tsx
@@ -1,8 +1,8 @@
 import { Loading, TextOverflow } from 'react-basics';
 import { useMessages, useSessionData } from 'components/hooks';
 import Empty from 'components/common/Empty';
-import styles from './SessionData.module.css';
 import { DATA_TYPES } from 'lib/constants';
+import styles from './SessionData.module.css';
 
 export function SessionData({ websiteId, sessionId }: { websiteId: string; sessionId: string }) {
   const { formatMessage, labels } = useMessages();
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.module.css b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.module.css
index 8e2667f427..7058cd7939 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.module.css
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.module.css
@@ -1,6 +1,6 @@
 .page {
   display: grid;
-  grid-template-columns: 300px 1fr max-content;
+  grid-template-columns: max-content 1fr max-content;
   margin-bottom: 40px;
   position: relative;
 }
@@ -11,6 +11,7 @@
   align-items: center;
   justify-content: flex-start;
   gap: 20px;
+  width: 300px;
   padding-right: 20px;
   border-right: 1px solid var(--base300);
   position: relative;
@@ -25,6 +26,7 @@
 }
 
 .data {
+  width: 300px;
   border-left: 1px solid var(--base300);
   padding-left: 20px;
   position: relative;
@@ -40,5 +42,6 @@
   .sidebar,
   .data {
     border: 0;
+    width: auto;
   }
 }
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.module.css b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.module.css
index c17eadf5f4..de6e796f7b 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.module.css
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.module.css
@@ -3,6 +3,10 @@
   gap: 10px;
 }
 
+.info dl {
+  width: 100%;
+}
+
 .info dt {
   color: var(--font-color200);
   font-weight: bold;
diff --git a/src/pages/api/websites/[websiteId]/sessions/[sessionId]/index.ts b/src/pages/api/websites/[websiteId]/sessions/[sessionId]/index.ts
index f627a20858..b2665c7cf6 100644
--- a/src/pages/api/websites/[websiteId]/sessions/[sessionId]/index.ts
+++ b/src/pages/api/websites/[websiteId]/sessions/[sessionId]/index.ts
@@ -33,7 +33,7 @@ export default async (
       return unauthorized(res);
     }
 
-    const data = await getWebsiteSession(websiteId, sessionId);
+    const data = await getWebsiteSession(sessionId);
 
     return ok(res, data);
   }
diff --git a/src/queries/analytics/sessions/getSessionData.ts b/src/queries/analytics/sessions/getSessionData.ts
index e3106b2753..8b78fc8623 100644
--- a/src/queries/analytics/sessions/getSessionData.ts
+++ b/src/queries/analytics/sessions/getSessionData.ts
@@ -35,6 +35,7 @@ async function clickhouseQuery(websiteId: string, sessionId: string) {
     from session_data
     where website_id = {websiteId:UUID}
     and session_id = {sessionId:UUID}
+    order by data_key asc
     `,
     { websiteId, sessionId },
   );
diff --git a/src/queries/analytics/sessions/getWebsiteSession.ts b/src/queries/analytics/sessions/getWebsiteSession.ts
index df3e8a04ad..38bc230c8c 100644
--- a/src/queries/analytics/sessions/getWebsiteSession.ts
+++ b/src/queries/analytics/sessions/getWebsiteSession.ts
@@ -2,23 +2,22 @@ import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
 import { runQuery, PRISMA, CLICKHOUSE } from 'lib/db';
 
-export async function getWebsiteSession(...args: [websiteId: string, sessionId: string]) {
+export async function getWebsiteSession(...args: [sessionId: string]) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
   });
 }
 
-async function relationalQuery(websiteId: string, sessionId: string) {
+async function relationalQuery(sessionId: string) {
   return prisma.client.session.findUnique({
     where: {
       id: sessionId,
-      websiteId,
     },
   });
 }
 
-async function clickhouseQuery(websiteId: string, sessionId: string) {
+async function clickhouseQuery(sessionId: string) {
   const { rawQuery } = clickhouse;
 
   return rawQuery(
@@ -41,10 +40,9 @@ async function clickhouseQuery(websiteId: string, sessionId: string) {
       sumIf(1, event_type = 1) as views,
       sumIf(1, event_type = 2) as events
     from website_event
-    where website_id = {websiteId:UUID}
-    and session_id = {sessionId:UUID}
+    where session_id = {sessionId:UUID}
     group by session_id, website_id, hostname, browser, os, device, screen, language, country, subdivision1, city
     `,
-    { websiteId, sessionId },
+    { sessionId },
   ).then(result => result?.[0]);
 }

From 1e5616a872e4e19dc9afe5f3ae96115a016750d2 Mon Sep 17 00:00:00 2001
From: beforetech <mail@before.tech>
Date: Wed, 31 Jul 2024 22:21:58 +0800
Subject: [PATCH 232/438] chore: fix comment

Signed-off-by: beforetech <mail@before.tech>
---
 src/components/messages.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/messages.ts b/src/components/messages.ts
index fa515c665f..6609076235 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -265,7 +265,7 @@ export const labels = defineMessages({
   journey: { id: 'label.journey', defaultMessage: 'Journey' },
   journeyDescription: {
     id: 'label.journey-description',
-    defaultMessage: 'Understand how users nagivate through your website.',
+    defaultMessage: 'Understand how users navigate through your website.',
   },
   compare: { id: 'label.compare', defaultMessage: 'Compare' },
   current: { id: 'label.current', defaultMessage: 'Current' },

From cb4368e12ca16c2c1c658d715c60383089424ec5 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Wed, 31 Jul 2024 09:35:29 -0700
Subject: [PATCH 233/438] template multiple queries for filtering

---
 db/clickhouse/schema.sql                      | 16 +++++-------
 src/queries/analytics/getWebsiteStats.ts      | 25 +++++++++++++++++--
 .../analytics/pageviews/getPageviewMetrics.ts | 18 +++++++++++++
 .../analytics/pageviews/getPageviewStats.ts   | 21 ++++++++++++++--
 4 files changed, 66 insertions(+), 14 deletions(-)

diff --git a/db/clickhouse/schema.sql b/db/clickhouse/schema.sql
index 6179bfb04c..aadc5402b6 100644
--- a/db/clickhouse/schema.sql
+++ b/db/clickhouse/schema.sql
@@ -30,7 +30,9 @@ CREATE TABLE umami.website_event
     job_id Nullable(UUID)
 )
     engine = MergeTree
-        ORDER BY (website_id, session_id, created_at)
+        PARTITION BY toYYYYMM(created_at)
+        ORDER BY (toStartOfHour(created_at), website_id, session_id, visit_id, created_at)
+        PRIMARY KEY (toStartOfHour(created_at), website_id, session_id, visit_id)
         SETTINGS index_granularity = 8192;
 
 CREATE TABLE umami.event_data
@@ -97,15 +99,9 @@ CREATE TABLE umami.website_event_stats_hourly
     created_at Datetime('UTC')
 )
 ENGINE = AggregatingMergeTree
-PARTITION BY toYYYYMM(created_at)
-ORDER BY (
-    website_id,
-    event_type,
-    toStartOfHour(created_at),
-    cityHash64(visit_id),
-    visit_id
-)
-SAMPLE BY cityHash64(visit_id);
+        PARTITION BY toYYYYMM(created_at)
+        ORDER BY (toStartOfDay(created_at), website_id, session_id, visit_id, created_at)
+        PRIMARY KEY (toStartOfDay(created_at), website_id, session_id, visit_id)
 
 CREATE MATERIALIZED VIEW umami.website_event_stats_hourly_mv
 TO umami.website_event_stats_hourly
diff --git a/src/queries/analytics/getWebsiteStats.ts b/src/queries/analytics/getWebsiteStats.ts
index ebe711a03f..7d8a76f69b 100644
--- a/src/queries/analytics/getWebsiteStats.ts
+++ b/src/queries/analytics/getWebsiteStats.ts
@@ -1,4 +1,3 @@
-/* eslint-disable no-unused-vars, @typescript-eslint/no-unused-vars */
 import clickhouse from 'lib/clickhouse';
 import { EVENT_TYPE } from 'lib/constants';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
@@ -69,8 +68,30 @@ async function clickhouseQuery(
   });
 
   return rawQuery(
+    // `
+    // select
+    //   sum(t.c) as "pageviews",
+    //   count(distinct t.session_id) as "visitors",
+    //   count(distinct t.visit_id) as "visits",
+    //   sum(if(t.c = 1, 1, 0)) as "bounces",
+    //   sum(max_time-min_time) as "totaltime"
+    // from (
+    //   select
+    //     session_id,
+    //     visit_id,
+    //     count(*) c,
+    //     min(created_at) min_time,
+    //     max(created_at) max_time
+    //   from website_event
+    //   where website_id = {websiteId:UUID}
+    //     and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+    //     and event_type = {eventType:UInt32}
+    //     ${filterQuery}
+    //   group by session_id, visit_id
+    // ) as t;
+    // `,
     `
-    select 
+    select
       sum(views) as "pageviews",
       uniq(session_id) as "visitors",
       uniq(visit_id) as "visits",
diff --git a/src/queries/analytics/pageviews/getPageviewMetrics.ts b/src/queries/analytics/pageviews/getPageviewMetrics.ts
index ccfe4ef032..4ac101b2cc 100644
--- a/src/queries/analytics/pageviews/getPageviewMetrics.ts
+++ b/src/queries/analytics/pageviews/getPageviewMetrics.ts
@@ -111,7 +111,25 @@ async function clickhouseQuery(
     groupByQuery = 'group by x';
   }
 
+  // let excludeDomain = '';
+  // if (column === 'referrer_domain') {
+  //   excludeDomain = `and referrer_domain != {websiteDomain:String} and referrer_domain != ''`;
+  // }
+
   return rawQuery(
+    // `
+    //   select ${column} x, count(*) y
+    //   from website_event
+    //   where website_id = {websiteId:UUID}
+    //     and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+    //     and event_type = {eventType:UInt32}
+    //     ${excludeDomain}
+    //     ${filterQuery}
+    //   group by x
+    //   order by y desc
+    //   limit ${limit}
+    //   offset ${offset}
+    //   `,
     `
     select g.t as x,
       count(*) as y
diff --git a/src/queries/analytics/pageviews/getPageviewStats.ts b/src/queries/analytics/pageviews/getPageviewStats.ts
index f6ea1e08fc..c378d48a6b 100644
--- a/src/queries/analytics/pageviews/getPageviewStats.ts
+++ b/src/queries/analytics/pageviews/getPageviewStats.ts
@@ -51,12 +51,29 @@ async function clickhouseQuery(
   const columnQuery = unit === 'minute' ? 'count(*)' : 'sum(views)';
 
   return rawQuery(
+    // `
+    // select
+    //   ${getDateStringSQL('g.t', unit)} as x,
+    //   g.y as y
+    // from (
+    //   select
+    //     ${getDateSQL('created_at', unit, timezone)} as t,
+    //     count(*) as y
+    //   from website_event
+    //   where website_id = {websiteId:UUID}
+    //     and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+    //     and event_type = {eventType:UInt32}
+    //     ${filterQuery}
+    //   group by t
+    // ) as g
+    // order by t
+    // `,
     `
     select
-      ${getDateStringSQL('g.t', unit)} as x, 
+      ${getDateStringSQL('g.t', unit)} as x,
       g.y as y
     from (
-      select 
+      select
         ${getDateSQL('created_at', unit, timezone)} as t,
         ${columnQuery} as y
       from ${table} website_event

From 9882ff24f6fecd317159705d0f6f32244ac382cd Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Thu, 1 Aug 2024 15:32:49 -0700
Subject: [PATCH 234/438] route dashboard queries based on filters selected

---
 src/lib/clickhouse.ts                         | 42 +++++++-
 src/lib/constants.ts                          | 15 +--
 .../analytics/events/getEventMetrics.ts       | 34 +++++--
 src/queries/analytics/getWebsiteStats.ts      | 59 ++++++------
 .../analytics/pageviews/getPageviewMetrics.ts | 95 +++++++++++--------
 .../analytics/pageviews/getPageviewStats.ts   | 55 +++++------
 .../analytics/sessions/getSessionMetrics.ts   |  4 +-
 .../analytics/sessions/getSessionStats.ts     |  4 +-
 8 files changed, 191 insertions(+), 117 deletions(-)

diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index 2bda9bfa85..4c544a71d9 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -3,7 +3,7 @@ import dateFormat from 'dateformat';
 import debug from 'debug';
 import { CLICKHOUSE } from 'lib/db';
 import { PageParams, QueryFilters, QueryOptions } from './types';
-import { DEFAULT_PAGE_SIZE, OPERATORS } from './constants';
+import { EVENT_COLUMNS, DEFAULT_PAGE_SIZE, OPERATORS } from './constants';
 import { fetchWebsite } from './load';
 import { maxDate } from './date';
 import { filtersToArray } from './params';
@@ -100,6 +100,26 @@ function getFilterQuery(filters: QueryFilters = {}, options: QueryOptions = {})
   return query.join('\n');
 }
 
+function getSessionFilterQuery(filters: QueryFilters = {}, options: QueryOptions = {}) {
+  const query = filtersToArray(filters, options).reduce((arr, { name, column, operator }) => {
+    if (column) {
+      if (EVENT_COLUMNS.includes(name)) {
+        arr.push(`and has(${column}, {${name}:String})`);
+
+        if (name === 'referrer') {
+          arr.push('and not has(referrer_domain, {websiteDomain:String})');
+        }
+      } else {
+        arr.push(`and ${mapFilter(column, operator, name)}`);
+      }
+    }
+
+    return arr;
+  }, []);
+
+  return query.join('\n');
+}
+
 function getDateQuery(filters: QueryFilters = {}) {
   const { startDate, endDate } = filters;
 
@@ -139,6 +159,25 @@ async function parseFilters(websiteId: string, filters: QueryFilters = {}, optio
   };
 }
 
+async function parseSessionFilters(
+  websiteId: string,
+  filters: QueryFilters = {},
+  options?: QueryOptions,
+) {
+  const website = await fetchWebsite(websiteId);
+
+  return {
+    filterQuery: getSessionFilterQuery(filters, options),
+    dateQuery: getDateQuery(filters),
+    params: {
+      ...getFilterParams(filters),
+      websiteId,
+      startDate: maxDate(filters.startDate, new Date(website?.resetAt)),
+      websiteDomain: website.domain,
+    },
+  };
+}
+
 async function pagedQuery(
   query: string,
   queryParams: { [key: string]: any },
@@ -221,6 +260,7 @@ export default {
   getDateFormat,
   getFilterQuery,
   parseFilters,
+  parseSessionFilters,
   pagedQuery,
   findUnique,
   findFirst,
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index aa1b3c0f23..9d696f114c 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -33,16 +33,7 @@ export const FILTER_REFERRERS = 'filter-referrers';
 export const FILTER_PAGES = 'filter-pages';
 
 export const UNIT_TYPES = ['year', 'month', 'hour', 'day', 'minute'];
-export const EVENT_COLUMNS = [
-  'url',
-  'entry',
-  'exit',
-  'referrer',
-  'title',
-  'query',
-  'event',
-  'host',
-];
+export const EVENT_COLUMNS = ['url', 'entry', 'exit', 'referrer', 'title', 'query', 'event'];
 
 export const SESSION_COLUMNS = [
   'browser',
@@ -58,8 +49,8 @@ export const SESSION_COLUMNS = [
 
 export const FILTER_COLUMNS = {
   url: 'url_path',
-  entry: 'entry_url',
-  exit: 'exit_url',
+  entry: 'url_path',
+  exit: 'url_path',
   referrer: 'referrer_domain',
   host: 'hostname',
   title: 'page_title',
diff --git a/src/queries/analytics/events/getEventMetrics.ts b/src/queries/analytics/events/getEventMetrics.ts
index 3623213584..504cea119a 100644
--- a/src/queries/analytics/events/getEventMetrics.ts
+++ b/src/queries/analytics/events/getEventMetrics.ts
@@ -1,8 +1,8 @@
-import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
-import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
-import { WebsiteEventMetric, QueryFilters } from 'lib/types';
 import { EVENT_TYPE } from 'lib/constants';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import prisma from 'lib/prisma';
+import { QueryFilters, WebsiteEventMetric } from 'lib/types';
 
 export async function getEventMetrics(
   ...args: [websiteId: string, filters: QueryFilters]
@@ -51,8 +51,24 @@ async function clickhouseQuery(
     eventType: EVENT_TYPE.customEvent,
   });
 
-  return rawQuery(
-    `
+  let sql = '';
+
+  if (filterQuery) {
+    sql = `
+    select
+      event_name x,
+      ${getDateSQL('created_at', unit, timezone)} t,
+      count(*) y
+    from website_event
+    where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      and event_type = {eventType:UInt32}
+      ${filterQuery}
+    group by x, t
+    order by t
+    `;
+  } else {
+    sql = `
     select
       event_name x,
       ${getDateSQL('created_at', unit, timezone)} t,
@@ -64,13 +80,13 @@ async function clickhouseQuery(
       where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
         and event_type = {eventType:UInt32}
-      ${filterQuery}
     ) as g
     group by x, t
     order by t
-    `,
-    params,
-  ).then(a => {
+    `;
+  }
+
+  return rawQuery(sql, params).then(a => {
     return Object.values(a).map(a => {
       return { x: a.x, t: a.t, y: Number(a.y) };
     });
diff --git a/src/queries/analytics/getWebsiteStats.ts b/src/queries/analytics/getWebsiteStats.ts
index 7d8a76f69b..09eebb919f 100644
--- a/src/queries/analytics/getWebsiteStats.ts
+++ b/src/queries/analytics/getWebsiteStats.ts
@@ -3,6 +3,7 @@ import { EVENT_TYPE } from 'lib/constants';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import prisma from 'lib/prisma';
 import { QueryFilters } from 'lib/types';
+import { EVENT_COLUMNS } from 'lib/constants';
 
 export async function getWebsiteStats(
   ...args: [websiteId: string, filters: QueryFilters]
@@ -67,30 +68,33 @@ async function clickhouseQuery(
     eventType: EVENT_TYPE.pageView,
   });
 
-  return rawQuery(
-    // `
-    // select
-    //   sum(t.c) as "pageviews",
-    //   count(distinct t.session_id) as "visitors",
-    //   count(distinct t.visit_id) as "visits",
-    //   sum(if(t.c = 1, 1, 0)) as "bounces",
-    //   sum(max_time-min_time) as "totaltime"
-    // from (
-    //   select
-    //     session_id,
-    //     visit_id,
-    //     count(*) c,
-    //     min(created_at) min_time,
-    //     max(created_at) max_time
-    //   from website_event
-    //   where website_id = {websiteId:UUID}
-    //     and created_at between {startDate:DateTime64} and {endDate:DateTime64}
-    //     and event_type = {eventType:UInt32}
-    //     ${filterQuery}
-    //   group by session_id, visit_id
-    // ) as t;
-    // `,
-    `
+  let sql = '';
+
+  if (EVENT_COLUMNS.some(item => Object.keys(filters).includes(item))) {
+    sql = `
+    select
+      sum(t.c) as "pageviews",
+      count(distinct t.session_id) as "visitors",
+      count(distinct t.visit_id) as "visits",
+      sum(if(t.c = 1, 1, 0)) as "bounces",
+      sum(max_time-min_time) as "totaltime"
+    from (
+      select
+        session_id,
+        visit_id,
+        count(*) c,
+        min(created_at) min_time,
+        max(created_at) max_time
+      from website_event
+      where website_id = {websiteId:UUID}
+        and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+        and event_type = {eventType:UInt32}
+        ${filterQuery}
+      group by session_id, visit_id
+    ) as t;
+    `;
+  } else {
+    sql = `
     select
       sum(views) as "pageviews",
       uniq(session_id) as "visitors",
@@ -102,9 +106,10 @@ async function clickhouseQuery(
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}
       and event_type = {eventType:UInt32}
       ${filterQuery};
-    `,
-    params,
-  ).then(result => {
+    `;
+  }
+
+  return rawQuery(sql, params).then(result => {
     return Object.values(result).map((a: any) => {
       return {
         pageviews: Number(a.pageviews),
diff --git a/src/queries/analytics/pageviews/getPageviewMetrics.ts b/src/queries/analytics/pageviews/getPageviewMetrics.ts
index 4ac101b2cc..f734b1ddc4 100644
--- a/src/queries/analytics/pageviews/getPageviewMetrics.ts
+++ b/src/queries/analytics/pageviews/getPageviewMetrics.ts
@@ -1,5 +1,5 @@
 import clickhouse from 'lib/clickhouse';
-import { EVENT_TYPE, FILTER_COLUMNS, SESSION_COLUMNS } from 'lib/constants';
+import { EVENT_COLUMNS, EVENT_TYPE, FILTER_COLUMNS, SESSION_COLUMNS } from 'lib/constants';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import prisma from 'lib/prisma';
 import { QueryFilters } from 'lib/types';
@@ -91,46 +91,66 @@ async function clickhouseQuery(
   });
 
   let excludeDomain = '';
-  let groupByQuery = '';
+  let sql = '';
 
-  if (column === 'referrer_domain') {
-    excludeDomain = `and t != {websiteDomain:String} and t != ''`;
-  }
+  if (EVENT_COLUMNS.some(item => Object.keys(filters).includes(item))) {
+    let entryExitQuery = '';
 
-  let columnQuery = `arrayJoin(${column})`;
+    if (column === 'referrer_domain') {
+      excludeDomain = `and referrer_domain != {websiteDomain:String} and referrer_domain != ''`;
+    }
 
-  if (type === 'entry') {
-    columnQuery = `visit_id x, argMinMerge(${column})`;
-  }
+    if (type === 'entry' || type === 'exit') {
+      const aggregrate = type === 'entry' ? 'min' : 'max';
 
-  if (type === 'exit') {
-    columnQuery = `visit_id x, argMaxMerge(${column})`;
-  }
+      entryExitQuery = `
+      JOIN (select visit_id,
+          ${aggregrate}(created_at) target_created_at
+      from website_event
+      where website_id = {websiteId:UUID}
+        and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+        and event_type = {eventType:UInt32}
+      group by visit_id) x
+      ON x.visit_id = website_event.visit_id
+          and x.target_created_at = website_event.created_at`;
+    }
 
-  if (type === 'entry' || type === 'exit') {
-    groupByQuery = 'group by x';
-  }
+    sql = `
+    select ${column} x, count(*) y
+    from website_event
+    ${entryExitQuery}
+    where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      and event_type = {eventType:UInt32}
+      ${excludeDomain}
+      ${filterQuery}
+    group by x
+    order by y desc
+    limit ${limit}
+    offset ${offset}
+    `;
+  } else {
+    let groupByQuery = '';
 
-  // let excludeDomain = '';
-  // if (column === 'referrer_domain') {
-  //   excludeDomain = `and referrer_domain != {websiteDomain:String} and referrer_domain != ''`;
-  // }
+    if (column === 'referrer_domain') {
+      excludeDomain = `and t != {websiteDomain:String} and t != ''`;
+    }
 
-  return rawQuery(
-    // `
-    //   select ${column} x, count(*) y
-    //   from website_event
-    //   where website_id = {websiteId:UUID}
-    //     and created_at between {startDate:DateTime64} and {endDate:DateTime64}
-    //     and event_type = {eventType:UInt32}
-    //     ${excludeDomain}
-    //     ${filterQuery}
-    //   group by x
-    //   order by y desc
-    //   limit ${limit}
-    //   offset ${offset}
-    //   `,
-    `
+    let columnQuery = `arrayJoin(${column})`;
+
+    if (type === 'entry') {
+      columnQuery = `visit_id x, argMinMerge(entry_url)`;
+    }
+
+    if (type === 'exit') {
+      columnQuery = `visit_id x, argMaxMerge(exit_url)`;
+    }
+
+    if (type === 'entry' || type === 'exit') {
+      groupByQuery = 'group by x';
+    }
+
+    sql = `
     select g.t as x,
       count(*) as y
     from (
@@ -146,9 +166,10 @@ async function clickhouseQuery(
     order by y desc
     limit ${limit}
     offset ${offset}
-    `,
-    params,
-  ).then((result: any) => {
+    `;
+  }
+
+  return rawQuery(sql, params).then((result: any) => {
     return Object.values(result).map((a: any) => {
       return { x: a.x, y: Number(a.y) };
     });
diff --git a/src/queries/analytics/pageviews/getPageviewStats.ts b/src/queries/analytics/pageviews/getPageviewStats.ts
index c378d48a6b..1d027e794f 100644
--- a/src/queries/analytics/pageviews/getPageviewStats.ts
+++ b/src/queries/analytics/pageviews/getPageviewStats.ts
@@ -1,7 +1,7 @@
 import clickhouse from 'lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import prisma from 'lib/prisma';
-import { EVENT_TYPE } from 'lib/constants';
+import { EVENT_COLUMNS, EVENT_TYPE } from 'lib/constants';
 import { QueryFilters } from 'lib/types';
 
 export async function getPageviewStats(...args: [websiteId: string, filters: QueryFilters]) {
@@ -47,36 +47,18 @@ async function clickhouseQuery(
     eventType: EVENT_TYPE.pageView,
   });
 
-  const table = unit === 'minute' ? 'website_event' : 'website_event_stats_hourly';
-  const columnQuery = unit === 'minute' ? 'count(*)' : 'sum(views)';
+  let sql = '';
 
-  return rawQuery(
-    // `
-    // select
-    //   ${getDateStringSQL('g.t', unit)} as x,
-    //   g.y as y
-    // from (
-    //   select
-    //     ${getDateSQL('created_at', unit, timezone)} as t,
-    //     count(*) as y
-    //   from website_event
-    //   where website_id = {websiteId:UUID}
-    //     and created_at between {startDate:DateTime64} and {endDate:DateTime64}
-    //     and event_type = {eventType:UInt32}
-    //     ${filterQuery}
-    //   group by t
-    // ) as g
-    // order by t
-    // `,
-    `
+  if (EVENT_COLUMNS.some(item => Object.keys(filters).includes(item)) || unit === 'minute') {
+    sql = `
     select
       ${getDateStringSQL('g.t', unit)} as x,
       g.y as y
     from (
       select
         ${getDateSQL('created_at', unit, timezone)} as t,
-        ${columnQuery} as y
-      from ${table} website_event
+        count(*) as y
+      from website_event
       where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
         and event_type = {eventType:UInt32}
@@ -84,9 +66,28 @@ async function clickhouseQuery(
       group by t
     ) as g
     order by t
-    `,
-    params,
-  ).then(result => {
+    `;
+  } else {
+    sql = `
+    select
+      ${getDateStringSQL('g.t', unit)} as x,
+      g.y as y
+    from (
+      select
+        ${getDateSQL('created_at', unit, timezone)} as t,
+        sum(views)as y
+      from website_event_stats_hourly website_event
+      where website_id = {websiteId:UUID}
+        and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+        and event_type = {eventType:UInt32}
+        ${filterQuery}
+      group by t
+    ) as g
+    order by t
+    `;
+  }
+
+  return rawQuery(sql, params).then(result => {
     return Object.values(result).map((a: any) => {
       return { x: a.x, y: Number(a.y) };
     });
diff --git a/src/queries/analytics/sessions/getSessionMetrics.ts b/src/queries/analytics/sessions/getSessionMetrics.ts
index 9baf2a5c07..3e6f53c0af 100644
--- a/src/queries/analytics/sessions/getSessionMetrics.ts
+++ b/src/queries/analytics/sessions/getSessionMetrics.ts
@@ -64,8 +64,8 @@ async function clickhouseQuery(
   offset: number = 0,
 ): Promise<{ x: string; y: number }[]> {
   const column = FILTER_COLUMNS[type] || type;
-  const { parseFilters, rawQuery } = clickhouse;
-  const { filterQuery, params } = await parseFilters(websiteId, {
+  const { parseSessionFilters, rawQuery } = clickhouse;
+  const { filterQuery, params } = await parseSessionFilters(websiteId, {
     ...filters,
     eventType: EVENT_TYPE.pageView,
   });
diff --git a/src/queries/analytics/sessions/getSessionStats.ts b/src/queries/analytics/sessions/getSessionStats.ts
index 7bba14df1b..fa0ed6a96d 100644
--- a/src/queries/analytics/sessions/getSessionStats.ts
+++ b/src/queries/analytics/sessions/getSessionStats.ts
@@ -41,8 +41,8 @@ async function clickhouseQuery(
   filters: QueryFilters,
 ): Promise<{ x: string; y: number }[]> {
   const { timezone = 'UTC', unit = 'day' } = filters;
-  const { parseFilters, rawQuery, getDateStringSQL, getDateSQL } = clickhouse;
-  const { filterQuery, params } = await parseFilters(websiteId, {
+  const { parseSessionFilters, rawQuery, getDateStringSQL, getDateSQL } = clickhouse;
+  const { filterQuery, params } = await parseSessionFilters(websiteId, {
     ...filters,
     eventType: EVENT_TYPE.pageView,
   });

From 61dfa1391e80558e1939987562e2f4ce95ba33d3 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Thu, 1 Aug 2024 15:34:35 -0700
Subject: [PATCH 235/438] add projection code

---
 db/clickhouse/schema.sql | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/db/clickhouse/schema.sql b/db/clickhouse/schema.sql
index aadc5402b6..8bdcfc0b20 100644
--- a/db/clickhouse/schema.sql
+++ b/db/clickhouse/schema.sql
@@ -170,4 +170,19 @@ GROUP BY website_id,
     subdivision1,
     city,
     event_type,
-    timestamp);
\ No newline at end of file
+    timestamp);
+
+-- projections
+ALTER TABLE umami.website_event 
+ADD PROJECTION website_event_url_path_projection (
+SELECT * ORDER BY toStartOfDay(created_at), website_id, url_path, created_at
+);
+
+ALTER TABLE umami.website_event MATERIALIZE PROJECTION website_event_url_path_projection;
+
+ALTER TABLE umami.website_event 
+ADD PROJECTION website_event_referrer_domain_projection (
+SELECT * ORDER BY toStartOfDay(created_at), website_id, referrer_domain, created_at
+);
+
+ALTER TABLE umami.website_event MATERIALIZE PROJECTION website_event_referrer_domain_projection;

From 57a23bab2d60a4c592886cb357788bb0cae71cd4 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Thu, 1 Aug 2024 16:16:18 -0700
Subject: [PATCH 236/438] fix hourly order by

---
 db/clickhouse/schema.sql | 1 -
 1 file changed, 1 deletion(-)

diff --git a/db/clickhouse/schema.sql b/db/clickhouse/schema.sql
index 8bdcfc0b20..ca42134d26 100644
--- a/db/clickhouse/schema.sql
+++ b/db/clickhouse/schema.sql
@@ -101,7 +101,6 @@ CREATE TABLE umami.website_event_stats_hourly
 ENGINE = AggregatingMergeTree
         PARTITION BY toYYYYMM(created_at)
         ORDER BY (toStartOfDay(created_at), website_id, session_id, visit_id, created_at)
-        PRIMARY KEY (toStartOfDay(created_at), website_id, session_id, visit_id)
 
 CREATE MATERIALIZED VIEW umami.website_event_stats_hourly_mv
 TO umami.website_event_stats_hourly

From 3207b0ce06fd7d9a2f20a8044dc5bf35a412587a Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Thu, 1 Aug 2024 16:40:48 -0700
Subject: [PATCH 237/438] revert AggregatingMergeTree order by

---
 db/clickhouse/schema.sql | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/db/clickhouse/schema.sql b/db/clickhouse/schema.sql
index ca42134d26..02be2e38f3 100644
--- a/db/clickhouse/schema.sql
+++ b/db/clickhouse/schema.sql
@@ -29,11 +29,11 @@ CREATE TABLE umami.website_event
     created_at DateTime('UTC'),
     job_id Nullable(UUID)
 )
-    engine = MergeTree
-        PARTITION BY toYYYYMM(created_at)
-        ORDER BY (toStartOfHour(created_at), website_id, session_id, visit_id, created_at)
-        PRIMARY KEY (toStartOfHour(created_at), website_id, session_id, visit_id)
-        SETTINGS index_granularity = 8192;
+ENGINE = MergeTree
+    PARTITION BY toYYYYMM(created_at)
+    ORDER BY (toStartOfHour(created_at), website_id, session_id, visit_id, created_at)
+    PRIMARY KEY (toStartOfHour(created_at), website_id, session_id, visit_id)
+    SETTINGS index_granularity = 8192;
 
 CREATE TABLE umami.event_data
 (
@@ -50,9 +50,9 @@ CREATE TABLE umami.event_data
     created_at DateTime('UTC'),
     job_id Nullable(UUID)
 )
-    engine = MergeTree
-        ORDER BY (website_id, event_id, data_key, created_at)
-        SETTINGS index_granularity = 8192;
+ENGINE = MergeTree
+    ORDER BY (website_id, event_id, data_key, created_at)
+    SETTINGS index_granularity = 8192;
 
 CREATE TABLE umami.session_data
 (
@@ -66,9 +66,9 @@ CREATE TABLE umami.session_data
     created_at DateTime('UTC'),
     job_id Nullable(UUID)
 )
-    engine = MergeTree
-        ORDER BY (website_id, session_id, data_key, created_at)
-        SETTINGS index_granularity = 8192;
+ENGINE = MergeTree
+    ORDER BY (website_id, session_id, data_key, created_at)
+    SETTINGS index_granularity = 8192;
 
 -- stats hourly
 CREATE TABLE umami.website_event_stats_hourly
@@ -99,8 +99,15 @@ CREATE TABLE umami.website_event_stats_hourly
     created_at Datetime('UTC')
 )
 ENGINE = AggregatingMergeTree
-        PARTITION BY toYYYYMM(created_at)
-        ORDER BY (toStartOfDay(created_at), website_id, session_id, visit_id, created_at)
+    PARTITION BY toYYYYMM(created_at)
+    ORDER BY (
+        website_id,
+        event_type,
+        toStartOfHour(created_at),
+        cityHash64(visit_id),
+        visit_id
+    )
+    SAMPLE BY cityHash64(visit_id);
 
 CREATE MATERIALIZED VIEW umami.website_event_stats_hourly_mv
 TO umami.website_event_stats_hourly

From 9c3205784146e06dc50f69bc2a1c8bf169745800 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 1 Aug 2024 21:05:43 -0700
Subject: [PATCH 238/438] Redo events tab to show all events.

---
 .../event-data/EventDataParameters.tsx        |  2 +-
 .../[websiteId]/events/EventDataPage.tsx      | 12 ------
 .../[websiteId]/events/EventDataTable.tsx     | 37 ----------------
 .../[websiteId]/events/EventsDataTable.tsx    | 25 +++++++++++
 .../[websiteId]/events/EventsPage.tsx         | 12 ++++++
 .../[websiteId]/events/EventsTable.tsx        | 43 +++++++++++++++++++
 .../[websiteId]/events/WebsiteEventData.tsx   |  4 +-
 .../websites/[websiteId]/events/page.tsx      |  4 +-
 src/components/common/DataTable.tsx           |  4 +-
 .../hooks/queries/useFilterQuery.ts           |  8 ++--
 .../hooks/queries/useWebsiteEvents.ts         | 10 +++--
 src/components/messages.ts                    |  2 +
 .../events.ts => events/[eventId]/data.ts}    |  0
 .../api/websites/[websiteId]/events/index.ts  | 42 ++++++++++++++++++
 .../{events.ts => events/series.ts}           |  0
 .../{getEvents.ts => getWebsiteEvents.ts}     |  2 +-
 src/queries/analytics/getRealtimeData.ts      |  9 +++-
 src/queries/index.ts                          |  2 +-
 18 files changed, 152 insertions(+), 66 deletions(-)
 delete mode 100644 src/app/(main)/websites/[websiteId]/events/EventDataPage.tsx
 delete mode 100644 src/app/(main)/websites/[websiteId]/events/EventDataTable.tsx
 create mode 100644 src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx
 create mode 100644 src/app/(main)/websites/[websiteId]/events/EventsPage.tsx
 create mode 100644 src/app/(main)/websites/[websiteId]/events/EventsTable.tsx
 rename src/pages/api/{event-data/events.ts => events/[eventId]/data.ts} (100%)
 create mode 100644 src/pages/api/websites/[websiteId]/events/index.ts
 rename src/pages/api/websites/[websiteId]/{events.ts => events/series.ts} (100%)
 rename src/queries/analytics/events/{getEvents.ts => getWebsiteEvents.ts} (97%)

diff --git a/src/app/(main)/reports/event-data/EventDataParameters.tsx b/src/app/(main)/reports/event-data/EventDataParameters.tsx
index e0afda3f5a..7b61c11297 100644
--- a/src/app/(main)/reports/event-data/EventDataParameters.tsx
+++ b/src/app/(main)/reports/event-data/EventDataParameters.tsx
@@ -48,7 +48,7 @@ export function EventDataParameters() {
     groups,
   };
 
-  const handleSubmit = values => {
+  const handleSubmit = (values: any) => {
     runReport(values);
   };
 
diff --git a/src/app/(main)/websites/[websiteId]/events/EventDataPage.tsx b/src/app/(main)/websites/[websiteId]/events/EventDataPage.tsx
deleted file mode 100644
index 77d367e58f..0000000000
--- a/src/app/(main)/websites/[websiteId]/events/EventDataPage.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-'use client';
-import WebsiteHeader from '../WebsiteHeader';
-import WebsiteEventData from './WebsiteEventData';
-
-export default function EventDataPage({ websiteId }) {
-  return (
-    <>
-      <WebsiteHeader websiteId={websiteId} />
-      <WebsiteEventData websiteId={websiteId} />
-    </>
-  );
-}
diff --git a/src/app/(main)/websites/[websiteId]/events/EventDataTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventDataTable.tsx
deleted file mode 100644
index 71c3699222..0000000000
--- a/src/app/(main)/websites/[websiteId]/events/EventDataTable.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import Link from 'next/link';
-import { GridTable, GridColumn } from 'react-basics';
-import { useMessages, useNavigation } from 'components/hooks';
-import Empty from 'components/common/Empty';
-import { DATA_TYPES } from 'lib/constants';
-
-export function EventDataTable({ data = [] }) {
-  const { formatMessage, labels } = useMessages();
-  const { renderUrl } = useNavigation();
-
-  if (data.length === 0) {
-    return <Empty />;
-  }
-
-  return (
-    <GridTable data={data}>
-      <GridColumn name="eventName" label={formatMessage(labels.event)}>
-        {row => (
-          <Link href={renderUrl({ event: row.eventName })} shallow={true}>
-            {row.eventName}
-          </Link>
-        )}
-      </GridColumn>
-      <GridColumn name="fieldName" label={formatMessage(labels.field)}>
-        {row => row.fieldName}
-      </GridColumn>
-      <GridColumn name="dataType" label={formatMessage(labels.type)}>
-        {row => DATA_TYPES[row.dataType]}
-      </GridColumn>
-      <GridColumn name="total" label={formatMessage(labels.totalRecords)}>
-        {({ total }) => total.toLocaleString()}
-      </GridColumn>
-    </GridTable>
-  );
-}
-
-export default EventDataTable;
diff --git a/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx
new file mode 100644
index 0000000000..f2bf7cb9d2
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx
@@ -0,0 +1,25 @@
+import { useWebsiteEvents } from 'components/hooks';
+import EventsTable from './EventsTable';
+import DataTable from 'components/common/DataTable';
+import { ReactNode } from 'react';
+
+export default function EventsDataTable({
+  websiteId,
+  children,
+}: {
+  websiteId?: string;
+  teamId?: string;
+  children?: ReactNode;
+}) {
+  const queryResult = useWebsiteEvents(websiteId);
+
+  if (queryResult?.result?.data?.length === 0) {
+    return children;
+  }
+
+  return (
+    <DataTable queryResult={queryResult} allowSearch={false}>
+      {({ data }) => <EventsTable data={data} />}
+    </DataTable>
+  );
+}
diff --git a/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx
new file mode 100644
index 0000000000..8f793d81ed
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx
@@ -0,0 +1,12 @@
+'use client';
+import WebsiteHeader from '../WebsiteHeader';
+import EventsDataTable from './EventsDataTable';
+
+export default function EventsPage({ websiteId }) {
+  return (
+    <>
+      <WebsiteHeader websiteId={websiteId} />
+      <EventsDataTable websiteId={websiteId} />
+    </>
+  );
+}
diff --git a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx
new file mode 100644
index 0000000000..5a625ee94c
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx
@@ -0,0 +1,43 @@
+import { GridTable, GridColumn } from 'react-basics';
+import { useLocale, useMessages } from 'components/hooks';
+import Empty from 'components/common/Empty';
+import { formatDistance } from 'date-fns';
+import Profile from 'components/common/Profile';
+import Link from 'next/link';
+
+export function EventsTable({ data = [] }) {
+  const { dateLocale } = useLocale();
+  const { formatMessage, labels } = useMessages();
+
+  if (data.length === 0) {
+    return <Empty />;
+  }
+
+  return (
+    <GridTable data={data}>
+      <GridColumn name="id" label="ID" />
+      <GridColumn name="session" label={formatMessage(labels.session)}>
+        {row => (
+          <Link href={`/sessions/`}>
+            <Profile seed={row.sessionId} size={64} />
+          </Link>
+        )}
+      </GridColumn>
+      <GridColumn name="eventName" label={formatMessage(labels.event)}>
+        {row => formatMessage(row.eventName ? labels.triggeredEvent : labels.viewedPage)}
+      </GridColumn>
+      <GridColumn name="eventName" label={formatMessage(labels.name)} />
+      <GridColumn name="urlPath" label={formatMessage(labels.path)} />
+      <GridColumn name="created" label={formatMessage(labels.created)}>
+        {row =>
+          formatDistance(new Date(row.createdAt), new Date(), {
+            addSuffix: true,
+            locale: dateLocale,
+          })
+        }
+      </GridColumn>
+    </GridTable>
+  );
+}
+
+export default EventsTable;
diff --git a/src/app/(main)/websites/[websiteId]/events/WebsiteEventData.tsx b/src/app/(main)/websites/[websiteId]/events/WebsiteEventData.tsx
index d7d24ceed1..296c8a66ba 100644
--- a/src/app/(main)/websites/[websiteId]/events/WebsiteEventData.tsx
+++ b/src/app/(main)/websites/[websiteId]/events/WebsiteEventData.tsx
@@ -1,5 +1,5 @@
 import { Flexbox, Loading } from 'react-basics';
-import EventDataTable from './EventDataTable';
+import EventsTable from './EventsTable';
 import EventDataValueTable from './EventDataValueTable';
 import { EventDataMetricsBar } from './EventDataMetricsBar';
 import { useDateRange, useApi, useNavigation } from 'components/hooks';
@@ -33,7 +33,7 @@ export default function WebsiteEventData({ websiteId }) {
   return (
     <Flexbox className={styles.container} direction="column" gap={20}>
       <EventDataMetricsBar websiteId={websiteId} />
-      {!event && <EventDataTable data={data} />}
+      {!event && <EventsTable data={data} />}
       {isLoading && <Loading position="page" />}
       {event && data && <EventDataValueTable event={event} data={data} />}
     </Flexbox>
diff --git a/src/app/(main)/websites/[websiteId]/events/page.tsx b/src/app/(main)/websites/[websiteId]/events/page.tsx
index 24cf4feaab..b5dc4d62ca 100644
--- a/src/app/(main)/websites/[websiteId]/events/page.tsx
+++ b/src/app/(main)/websites/[websiteId]/events/page.tsx
@@ -1,8 +1,8 @@
 import { Metadata } from 'next';
-import EventDataPage from './EventDataPage';
+import EventsPage from './EventsPage';
 
 export default async function ({ params: { websiteId } }) {
-  return <EventDataPage websiteId={websiteId} />;
+  return <EventsPage websiteId={websiteId} />;
 }
 
 export const metadata: Metadata = {
diff --git a/src/components/common/DataTable.tsx b/src/components/common/DataTable.tsx
index ed910def7d..041c2ba5ef 100644
--- a/src/components/common/DataTable.tsx
+++ b/src/components/common/DataTable.tsx
@@ -1,7 +1,7 @@
 import { ReactNode } from 'react';
 import classNames from 'classnames';
 import { Banner, Loading, SearchField } from 'react-basics';
-import { useMessages } from 'components/hooks';
+import { useMessages, useNavigation } from 'components/hooks';
 import Empty from 'components/common/Empty';
 import Pager from 'components/common/Pager';
 import { FilterQueryResult } from 'lib/types';
@@ -35,6 +35,7 @@ export function DataTable({
   const { query } = params || {};
   const hasData = Boolean(!isLoading && data?.length);
   const noResults = Boolean(!isLoading && query && !hasData);
+  const { router, renderUrl } = useNavigation();
 
   const handleSearch = (query: string) => {
     setParams({ ...params, query, page: params.page ? page : 1 });
@@ -42,6 +43,7 @@ export function DataTable({
 
   const handlePageChange = (page: number) => {
     setParams({ ...params, query, page });
+    router.push(renderUrl({ page }));
   };
 
   if (error) {
diff --git a/src/components/hooks/queries/useFilterQuery.ts b/src/components/hooks/queries/useFilterQuery.ts
index 5963d09974..82fc4d614f 100644
--- a/src/components/hooks/queries/useFilterQuery.ts
+++ b/src/components/hooks/queries/useFilterQuery.ts
@@ -2,15 +2,17 @@ import { UseQueryOptions } from '@tanstack/react-query';
 import { useState } from 'react';
 import { useApi } from './useApi';
 import { PageResult, PageParams, FilterQueryResult } from 'lib/types';
+import { useNavigation } from '../useNavigation';
 
 export function useFilterQuery<T = any>({
   queryKey,
   queryFn,
   ...options
 }: Omit<UseQueryOptions, 'queryFn'> & { queryFn: (params?: object) => any }): FilterQueryResult<T> {
-  const [params, setParams] = useState<T | PageParams>({
+  const { query: queryParams } = useNavigation();
+  const [params, setParams] = useState<PageParams>({
     query: '',
-    page: 1,
+    page: +queryParams.page || 1,
   });
 
   const { useQuery } = useApi();
@@ -21,7 +23,7 @@ export function useFilterQuery<T = any>({
   });
 
   return {
-    result: data as PageResult<any>,
+    result: data as PageResult<T>,
     query,
     params,
     setParams,
diff --git a/src/components/hooks/queries/useWebsiteEvents.ts b/src/components/hooks/queries/useWebsiteEvents.ts
index 588d4fb568..f0132470fa 100644
--- a/src/components/hooks/queries/useWebsiteEvents.ts
+++ b/src/components/hooks/queries/useWebsiteEvents.ts
@@ -1,17 +1,19 @@
 import useApi from './useApi';
-import { useFilterParams } from '../useFilterParams';
 import { UseQueryOptions } from '@tanstack/react-query';
+import { useFilterParams } from '../useFilterParams';
+import { useFilterQuery } from 'components/hooks';
 
 export function useWebsiteEvents(
   websiteId: string,
   options?: Omit<UseQueryOptions, 'queryKey' | 'queryFn'>,
 ) {
-  const { get, useQuery } = useApi();
+  const { get } = useApi();
   const params = useFilterParams(websiteId);
 
-  return useQuery({
+  return useFilterQuery({
     queryKey: ['websites:events', { websiteId, ...params }],
-    queryFn: () => get(`/websites/${websiteId}/events`, params),
+    queryFn: pageParams =>
+      get(`/websites/${websiteId}/events`, { ...params, ...pageParams, pageSize: 20 }),
     enabled: !!websiteId,
     ...options,
   });
diff --git a/src/components/messages.ts b/src/components/messages.ts
index 2dfe61ee65..703ccba3c8 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -130,6 +130,7 @@ export const labels = defineMessages({
   selectRole: { id: 'label.select-role', defaultMessage: 'Select role' },
   selectDate: { id: 'label.select-date', defaultMessage: 'Select date' },
   all: { id: 'label.all', defaultMessage: 'All' },
+  session: { id: 'label.session', defaultMessage: 'Session' },
   sessions: { id: 'label.sessions', defaultMessage: 'Sessions' },
   pageNotFound: { id: 'message.page-not-found', defaultMessage: 'Page not found' },
   activityLog: { id: 'label.activity-log', defaultMessage: 'Activity log' },
@@ -275,6 +276,7 @@ export const labels = defineMessages({
   lastSeen: { id: 'label.last-seen', defaultMessage: 'Last seen' },
   firstSeen: { id: 'label.first-seen', defaultMessage: 'First seen' },
   properties: { id: 'label.properties', defaultMessage: 'Properties' },
+  path: { id: 'label.path', defaultMessage: 'Path' },
 });
 
 export const messages = defineMessages({
diff --git a/src/pages/api/event-data/events.ts b/src/pages/api/events/[eventId]/data.ts
similarity index 100%
rename from src/pages/api/event-data/events.ts
rename to src/pages/api/events/[eventId]/data.ts
diff --git a/src/pages/api/websites/[websiteId]/events/index.ts b/src/pages/api/websites/[websiteId]/events/index.ts
new file mode 100644
index 0000000000..2aa791b11d
--- /dev/null
+++ b/src/pages/api/websites/[websiteId]/events/index.ts
@@ -0,0 +1,42 @@
+import * as yup from 'yup';
+import { canViewWebsite } from 'lib/auth';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody, PageParams } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { pageInfo } from 'lib/schema';
+import { getWebsiteEvents } from 'queries';
+
+export interface ReportsRequestQuery extends PageParams {
+  websiteId: string;
+}
+
+const schema = {
+  GET: yup.object().shape({
+    websiteId: yup.string().uuid().required(),
+    ...pageInfo,
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<ReportsRequestQuery, any>,
+  res: NextApiResponse,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  const { websiteId } = req.query;
+
+  if (req.method === 'GET') {
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const data = await getWebsiteEvents(websiteId, {}, req.query);
+
+    return ok(res, data);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/src/pages/api/websites/[websiteId]/events.ts b/src/pages/api/websites/[websiteId]/events/series.ts
similarity index 100%
rename from src/pages/api/websites/[websiteId]/events.ts
rename to src/pages/api/websites/[websiteId]/events/series.ts
diff --git a/src/queries/analytics/events/getEvents.ts b/src/queries/analytics/events/getWebsiteEvents.ts
similarity index 97%
rename from src/queries/analytics/events/getEvents.ts
rename to src/queries/analytics/events/getWebsiteEvents.ts
index 540c1a05d8..b76d1ee548 100644
--- a/src/queries/analytics/events/getEvents.ts
+++ b/src/queries/analytics/events/getWebsiteEvents.ts
@@ -3,7 +3,7 @@ import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import prisma from 'lib/prisma';
 import { PageParams, QueryFilters } from 'lib/types';
 
-export function getEvents(
+export function getWebsiteEvents(
   ...args: [websiteId: string, filters: QueryFilters, pageParams?: PageParams]
 ) {
   return runQuery({
diff --git a/src/queries/analytics/getRealtimeData.ts b/src/queries/analytics/getRealtimeData.ts
index e25cc86617..3e691b4edb 100644
--- a/src/queries/analytics/getRealtimeData.ts
+++ b/src/queries/analytics/getRealtimeData.ts
@@ -1,4 +1,9 @@
-import { getWebsiteSessions, getEvents, getPageviewStats, getSessionStats } from 'queries/index';
+import {
+  getWebsiteSessions,
+  getWebsiteEvents,
+  getPageviewStats,
+  getSessionStats,
+} from 'queries/index';
 
 const MAX_SIZE = 50;
 
@@ -19,7 +24,7 @@ export async function getRealtimeData(
   const { startDate, timezone } = criteria;
   const filters = { startDate, endDate: new Date(), unit: 'minute', timezone };
   const [events, sessions, pageviews, sessionviews] = await Promise.all([
-    getEvents(websiteId, { startDate, timezone }, { pageSize: 10000 }),
+    getWebsiteEvents(websiteId, { startDate, timezone }, { pageSize: 10000 }),
     getWebsiteSessions(websiteId, { startDate, timezone }, { pageSize: 10000 }),
     getPageviewStats(websiteId, filters),
     getSessionStats(websiteId, filters),
diff --git a/src/queries/index.ts b/src/queries/index.ts
index 82d40ee5d9..51c1e14b9f 100644
--- a/src/queries/index.ts
+++ b/src/queries/index.ts
@@ -8,7 +8,7 @@ export * from './analytics/events/getEventDataFields';
 export * from './analytics/events/getEventDataStats';
 export * from './analytics/events/getEventDataUsage';
 export * from './analytics/events/getEventMetrics';
-export * from './analytics/events/getEvents';
+export * from './analytics/events/getWebsiteEvents';
 export * from './analytics/events/getEventUsage';
 export * from './analytics/events/saveEvent';
 export * from './analytics/reports/getFunnel';

From 3262ea02854102b14771ad9e192436f406c61d6d Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 1 Aug 2024 22:53:17 -0700
Subject: [PATCH 239/438] Updated avatar colors and events table.

---
 .../[websiteId]/events/EventsTable.tsx        | 19 ++--
 .../[websiteId]/sessions/SessionsTable.tsx    |  4 +-
 .../[sessionId]/SessionDetailsPage.tsx        |  4 +-
 src/components/common/Avatar.tsx              | 88 +++++--------------
 src/components/common/Profile.tsx             | 41 ---------
 src/lib/colors.ts                             | 45 ++++++++++
 6 files changed, 81 insertions(+), 120 deletions(-)
 delete mode 100644 src/components/common/Profile.tsx
 create mode 100644 src/lib/colors.ts

diff --git a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx
index 5a625ee94c..c34ac89b07 100644
--- a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx
+++ b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx
@@ -2,7 +2,7 @@ import { GridTable, GridColumn } from 'react-basics';
 import { useLocale, useMessages } from 'components/hooks';
 import Empty from 'components/common/Empty';
 import { formatDistance } from 'date-fns';
-import Profile from 'components/common/Profile';
+import Avatar from 'components/common/Avatar';
 import Link from 'next/link';
 
 export function EventsTable({ data = [] }) {
@@ -15,18 +15,23 @@ export function EventsTable({ data = [] }) {
 
   return (
     <GridTable data={data}>
-      <GridColumn name="id" label="ID" />
-      <GridColumn name="session" label={formatMessage(labels.session)}>
+      <GridColumn name="session" label={formatMessage(labels.session)} width={'100px'}>
         {row => (
           <Link href={`/sessions/`}>
-            <Profile seed={row.sessionId} size={64} />
+            <Avatar seed={row.sessionId} size={64} />
           </Link>
         )}
       </GridColumn>
-      <GridColumn name="eventName" label={formatMessage(labels.event)}>
-        {row => formatMessage(row.eventName ? labels.triggeredEvent : labels.viewedPage)}
+      <GridColumn name="event" label={formatMessage(labels.event)}>
+        {row => {
+          return (
+            <>
+              {formatMessage(row.eventName ? labels.triggeredEvent : labels.viewedPage)}
+              <strong>{row.eventName}</strong>
+            </>
+          );
+        }}
       </GridColumn>
-      <GridColumn name="eventName" label={formatMessage(labels.name)} />
       <GridColumn name="urlPath" label={formatMessage(labels.path)} />
       <GridColumn name="created" label={formatMessage(labels.created)}>
         {row =>
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
index 73148b835a..9dd6a56dda 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
@@ -1,7 +1,7 @@
 import Link from 'next/link';
 import { GridColumn, GridTable, useBreakpoint } from 'react-basics';
 import { useFormat, useLocale, useMessages } from 'components/hooks';
-import Profile from 'components/common/Profile';
+import Avatar from 'components/common/Avatar';
 import styles from './SessionsTable.module.css';
 import { formatDate } from 'lib/date';
 
@@ -16,7 +16,7 @@ export function SessionsTable({ data = [] }: { data: any[]; showDomain?: boolean
       <GridColumn name="id" label="ID" width="300px">
         {row => (
           <Link href={`sessions/${row.id}`} className={styles.link}>
-            <Profile key={row.id} seed={row.id} size={64} />
+            <Avatar key={row.id} seed={row.id} size={64} />
             {row.id}
           </Link>
         )}
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
index d4ed503e77..059e041f5a 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
@@ -3,7 +3,7 @@ import WebsiteHeader from '../../WebsiteHeader';
 import SessionInfo from './SessionInfo';
 import { useWebsiteSession } from 'components/hooks';
 import { Loading } from 'react-basics';
-import Profile from 'components/common/Profile';
+import Avatar from 'components/common/Avatar';
 import { SessionActivity } from './SessionActivity';
 import { SessionStats } from './SessionStats';
 import { SessionData } from './SessionData';
@@ -27,7 +27,7 @@ export default function SessionDetailsPage({
       <WebsiteHeader websiteId={websiteId} />
       <div className={styles.page}>
         <div className={styles.sidebar}>
-          <Profile seed={data?.id} />
+          <Avatar seed={data?.id} />
           <SessionInfo data={data} />
         </div>
         <div className={styles.content}>
diff --git a/src/components/common/Avatar.tsx b/src/components/common/Avatar.tsx
index b947704b9a..2e82b0782c 100644
--- a/src/components/common/Avatar.tsx
+++ b/src/components/common/Avatar.tsx
@@ -1,71 +1,23 @@
-import md5 from 'md5';
-import { colord, extend } from 'colord';
-import harmoniesPlugin from 'colord/plugins/harmonies';
-import mixPlugin from 'colord/plugins/mix';
-
-extend([harmoniesPlugin, mixPlugin]);
-
-const harmonies = [
-  //'analogous',
-  //'complementary',
-  'double-split-complementary',
-  //'rectangle',
-  'split-complementary',
-  'tetradic',
-  //'triadic',
-];
-
-const color = (value: string, invert: boolean = false) => {
-  const c = colord(value.startsWith('#') ? value : `#${value}`);
-
-  if (invert && c.isDark()) {
-    return c.invert();
-  }
-
-  return c;
-};
-
-const remix = (hash: string) => {
-  const a = hash.substring(0, 6);
-  const b = hash.substring(6, 12);
-  const c = hash.substring(12, 18);
-  const d = hash.substring(18, 24);
-  const e = hash.substring(24, 30);
-  const f = hash.substring(30, 32);
-
-  const base = [b, c, d, e]
-    .reduce((acc, val) => {
-      return acc.mix(color(val), 0.05);
-    }, color(a))
-    .saturate(0.1)
-    .toHex();
-
-  const harmony = pick(parseInt(f, 16), harmonies);
-
-  return color(base, true)
-    .harmonies(harmony)
-    .map(c => c.toHex());
-};
-
-const pick = (num: number, arr: any[]) => {
-  return arr[num % arr.length];
-};
-
-export function Avatar({ value }: { value: string }) {
-  const hash = md5(value);
-  const colors = remix(hash);
-
-  return (
-    <svg viewBox="0 0 100 100">
-      <defs>
-        <linearGradient id={`color-${hash}`} gradientTransform="rotate(90)">
-          <stop offset="0%" stopColor={colors[1]} />
-          <stop offset="100%" stopColor={colors[2]} />
-        </linearGradient>
-      </defs>
-      <circle cx="50" cy="50" r="50" fill={`url(#color-${hash})`} />
-    </svg>
-  );
+import { useMemo } from 'react';
+import { createAvatar } from '@dicebear/core';
+import { lorelei } from '@dicebear/collection';
+import { getColor, getPastel } from 'lib/colors';
+
+const lib = lorelei;
+
+function Avatar({ seed, size = 128, ...props }: { seed: string; size?: number }) {
+  const backgroundColor = getPastel(getColor(seed), 4);
+
+  const avatar = useMemo(() => {
+    return createAvatar(lib, {
+      ...props,
+      seed,
+      size,
+      backgroundColor: [backgroundColor],
+    }).toDataUri();
+  }, []);
+
+  return <img src={avatar} alt="Avatar" style={{ borderRadius: '100%' }} />;
 }
 
 export default Avatar;
diff --git a/src/components/common/Profile.tsx b/src/components/common/Profile.tsx
deleted file mode 100644
index 4054499475..0000000000
--- a/src/components/common/Profile.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { useMemo } from 'react';
-import { createAvatar } from '@dicebear/core';
-import { lorelei } from '@dicebear/collection';
-import md5 from 'md5';
-
-const lib = lorelei;
-
-function convertToPastel(hexColor: string, pastelFactor: number = 0.5) {
-  // Remove the # if present
-  hexColor = hexColor.replace(/^#/, '');
-
-  // Convert hex to RGB
-  let r = parseInt(hexColor.substring(0, 2), 16);
-  let g = parseInt(hexColor.substring(2, 4), 16);
-  let b = parseInt(hexColor.substring(4, 6), 16);
-
-  // Calculate pastel version (mix with white)
-  //const pastelFactor = 0.5; // Adjust this value to control pastel intensity
-
-  r = Math.floor((r + 255 * pastelFactor) / (1 + pastelFactor));
-  g = Math.floor((g + 255 * pastelFactor) / (1 + pastelFactor));
-  b = Math.floor((b + 255 * pastelFactor) / (1 + pastelFactor));
-
-  // Convert back to hex
-  return `#${((1 << 24) | (r << 16) | (g << 8) | b).toString(16).slice(1)}`;
-}
-
-function Profile({ seed, size = 128, ...props }: { seed: string; size?: number }) {
-  const avatar = useMemo(() => {
-    return createAvatar(lib, {
-      ...props,
-      seed,
-      size,
-      backgroundColor: [convertToPastel(md5(seed).substring(0, 6), 2).replace(/^#/, '')],
-    }).toDataUri();
-  }, []);
-
-  return <img src={avatar} alt="Avatar" style={{ borderRadius: '100%' }} />;
-}
-
-export default Profile;
diff --git a/src/lib/colors.ts b/src/lib/colors.ts
new file mode 100644
index 0000000000..ba329805d4
--- /dev/null
+++ b/src/lib/colors.ts
@@ -0,0 +1,45 @@
+import md5 from 'md5';
+
+export const pick = (num: number, arr: any[]) => {
+  return arr[num % arr.length];
+};
+
+export function clamp(num: number, min: number, max: number) {
+  return num < min ? min : num > max ? max : num;
+}
+
+export function hex2RGB(color: string, min: number = 0, max: number = 255) {
+  const c = color.replace(/^#/, '');
+  const diff = max - min;
+
+  const normalize = (num: number) => {
+    return Math.floor((num / 255) * diff + min);
+  };
+
+  const r = normalize(parseInt(c.substring(0, 2), 16));
+  const g = normalize(parseInt(c.substring(2, 4), 16));
+  const b = normalize(parseInt(c.substring(4, 6), 16));
+
+  return { r, g, b };
+}
+
+export function rgb2Hex(r: number, g: number, b: number, prefix = '') {
+  return `${prefix}${r.toString(16)}${g.toString(16)}${b.toString(16)}`;
+}
+
+export function getPastel(color: string, factor: number = 0.5, prefix = '') {
+  let { r, g, b } = hex2RGB(color);
+
+  r = Math.floor((r + 255 * factor) / (1 + factor));
+  g = Math.floor((g + 255 * factor) / (1 + factor));
+  b = Math.floor((b + 255 * factor) / (1 + factor));
+
+  return rgb2Hex(r, g, b, prefix);
+}
+
+export function getColor(seed: string, min: number = 0, max: number = 255) {
+  const color = md5(seed).substring(0, 6);
+  const { r, g, b } = hex2RGB(color, min, max);
+
+  return rgb2Hex(r, g, b);
+}

From d02dc6f997855b2b14717b4d7e549d180cf24900 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Thu, 1 Aug 2024 22:57:54 -0700
Subject: [PATCH 240/438] remove parse session filters

---
 src/lib/clickhouse.ts                         | 46 ++-----------------
 src/queries/analytics/getWebsiteStats.ts      | 20 +++++---
 .../analytics/sessions/getSessionMetrics.ts   | 36 +++++++++++----
 .../analytics/sessions/getSessionStats.ts     | 42 ++++++++++++-----
 4 files changed, 75 insertions(+), 69 deletions(-)

diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index 4c544a71d9..c25eff4e53 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -2,11 +2,11 @@ import { ClickHouseClient, createClient } from '@clickhouse/client';
 import dateFormat from 'dateformat';
 import debug from 'debug';
 import { CLICKHOUSE } from 'lib/db';
-import { PageParams, QueryFilters, QueryOptions } from './types';
-import { EVENT_COLUMNS, DEFAULT_PAGE_SIZE, OPERATORS } from './constants';
-import { fetchWebsite } from './load';
+import { DEFAULT_PAGE_SIZE, OPERATORS } from './constants';
 import { maxDate } from './date';
+import { fetchWebsite } from './load';
 import { filtersToArray } from './params';
+import { PageParams, QueryFilters, QueryOptions } from './types';
 
 export const CLICKHOUSE_DATE_FORMATS = {
   second: '%Y-%m-%dT%H:%i:%S',
@@ -100,26 +100,6 @@ function getFilterQuery(filters: QueryFilters = {}, options: QueryOptions = {})
   return query.join('\n');
 }
 
-function getSessionFilterQuery(filters: QueryFilters = {}, options: QueryOptions = {}) {
-  const query = filtersToArray(filters, options).reduce((arr, { name, column, operator }) => {
-    if (column) {
-      if (EVENT_COLUMNS.includes(name)) {
-        arr.push(`and has(${column}, {${name}:String})`);
-
-        if (name === 'referrer') {
-          arr.push('and not has(referrer_domain, {websiteDomain:String})');
-        }
-      } else {
-        arr.push(`and ${mapFilter(column, operator, name)}`);
-      }
-    }
-
-    return arr;
-  }, []);
-
-  return query.join('\n');
-}
-
 function getDateQuery(filters: QueryFilters = {}) {
   const { startDate, endDate } = filters;
 
@@ -159,25 +139,6 @@ async function parseFilters(websiteId: string, filters: QueryFilters = {}, optio
   };
 }
 
-async function parseSessionFilters(
-  websiteId: string,
-  filters: QueryFilters = {},
-  options?: QueryOptions,
-) {
-  const website = await fetchWebsite(websiteId);
-
-  return {
-    filterQuery: getSessionFilterQuery(filters, options),
-    dateQuery: getDateQuery(filters),
-    params: {
-      ...getFilterParams(filters),
-      websiteId,
-      startDate: maxDate(filters.startDate, new Date(website?.resetAt)),
-      websiteDomain: website.domain,
-    },
-  };
-}
-
 async function pagedQuery(
   query: string,
   queryParams: { [key: string]: any },
@@ -260,7 +221,6 @@ export default {
   getDateFormat,
   getFilterQuery,
   parseFilters,
-  parseSessionFilters,
   pagedQuery,
   findUnique,
   findFirst,
diff --git a/src/queries/analytics/getWebsiteStats.ts b/src/queries/analytics/getWebsiteStats.ts
index 09eebb919f..c5141d3be7 100644
--- a/src/queries/analytics/getWebsiteStats.ts
+++ b/src/queries/analytics/getWebsiteStats.ts
@@ -74,8 +74,8 @@ async function clickhouseQuery(
     sql = `
     select
       sum(t.c) as "pageviews",
-      count(distinct t.session_id) as "visitors",
-      count(distinct t.visit_id) as "visits",
+      uniq(t.session_id) as "visitors",
+      uniq(t.visit_id) as "visits",
       sum(if(t.c = 1, 1, 0)) as "bounces",
       sum(max_time-min_time) as "totaltime"
     from (
@@ -96,16 +96,24 @@ async function clickhouseQuery(
   } else {
     sql = `
     select
-      sum(views) as "pageviews",
+      sum(t.c) as "pageviews",
       uniq(session_id) as "visitors",
       uniq(visit_id) as "visits",
-      sumIf(1, views = 1) as "bounces",
+      sumIf(1, t.c = 1) as "bounces",
       sum(max_time-min_time) as "totaltime"
-    from website_event_stats_hourly "website_event"
+    from (select
+            session_id,
+            visit_id,
+            sum(views) c,
+            min(min_time) min_time,
+            max(max_time) max_time
+        from umami.website_event_stats_hourly "website_event"
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}
       and event_type = {eventType:UInt32}
-      ${filterQuery};
+      ${filterQuery}
+      group by session_id, visit_id
+    ) as t;
     `;
   }
 
diff --git a/src/queries/analytics/sessions/getSessionMetrics.ts b/src/queries/analytics/sessions/getSessionMetrics.ts
index 3e6f53c0af..bb8bc4c5c4 100644
--- a/src/queries/analytics/sessions/getSessionMetrics.ts
+++ b/src/queries/analytics/sessions/getSessionMetrics.ts
@@ -1,5 +1,5 @@
 import clickhouse from 'lib/clickhouse';
-import { EVENT_TYPE, FILTER_COLUMNS, SESSION_COLUMNS } from 'lib/constants';
+import { EVENT_COLUMNS, EVENT_TYPE, FILTER_COLUMNS, SESSION_COLUMNS } from 'lib/constants';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import prisma from 'lib/prisma';
 import { QueryFilters } from 'lib/types';
@@ -64,15 +64,34 @@ async function clickhouseQuery(
   offset: number = 0,
 ): Promise<{ x: string; y: number }[]> {
   const column = FILTER_COLUMNS[type] || type;
-  const { parseSessionFilters, rawQuery } = clickhouse;
-  const { filterQuery, params } = await parseSessionFilters(websiteId, {
+  const { parseFilters, rawQuery } = clickhouse;
+  const { filterQuery, params } = await parseFilters(websiteId, {
     ...filters,
     eventType: EVENT_TYPE.pageView,
   });
   const includeCountry = column === 'city' || column === 'subdivision1';
 
-  return rawQuery(
-    `
+  let sql = '';
+
+  if (EVENT_COLUMNS.some(item => Object.keys(filters).includes(item))) {
+    sql = `
+    select
+      ${column} x,
+      count(distinct session_id) y
+      ${includeCountry ? ', country' : ''}
+    from website_event
+    where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      and event_type = {eventType:UInt32}
+      ${filterQuery}
+    group by x 
+    ${includeCountry ? ', country' : ''}
+    order by y desc
+    limit ${limit}
+    offset ${offset}
+    `;
+  } else {
+    sql = `
     select
       ${column} x,
       uniq(session_id) y
@@ -87,9 +106,10 @@ async function clickhouseQuery(
     order by y desc
     limit ${limit}
     offset ${offset}
-    `,
-    params,
-  ).then(a => {
+    `;
+  }
+
+  return rawQuery(sql, params).then(a => {
     return Object.values(a).map(a => {
       return { x: a.x, y: Number(a.y), country: a.country };
     });
diff --git a/src/queries/analytics/sessions/getSessionStats.ts b/src/queries/analytics/sessions/getSessionStats.ts
index fa0ed6a96d..fa7483333d 100644
--- a/src/queries/analytics/sessions/getSessionStats.ts
+++ b/src/queries/analytics/sessions/getSessionStats.ts
@@ -1,7 +1,7 @@
 import clickhouse from 'lib/clickhouse';
+import { EVENT_COLUMNS, EVENT_TYPE } from 'lib/constants';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import prisma from 'lib/prisma';
-import { EVENT_TYPE } from 'lib/constants';
 import { QueryFilters } from 'lib/types';
 
 export async function getSessionStats(...args: [websiteId: string, filters: QueryFilters]) {
@@ -41,25 +41,24 @@ async function clickhouseQuery(
   filters: QueryFilters,
 ): Promise<{ x: string; y: number }[]> {
   const { timezone = 'UTC', unit = 'day' } = filters;
-  const { parseSessionFilters, rawQuery, getDateStringSQL, getDateSQL } = clickhouse;
-  const { filterQuery, params } = await parseSessionFilters(websiteId, {
+  const { parseFilters, rawQuery, getDateStringSQL, getDateSQL } = clickhouse;
+  const { filterQuery, params } = await parseFilters(websiteId, {
     ...filters,
     eventType: EVENT_TYPE.pageView,
   });
 
-  const table = unit === 'minute' ? 'website_event' : 'website_event_stats_hourly';
-  const columnQuery = unit === 'minute' ? 'count(distinct session_id)' : 'uniq(session_id)';
+  let sql = '';
 
-  return rawQuery(
-    `
+  if (EVENT_COLUMNS.some(item => Object.keys(filters).includes(item)) || unit === 'minute') {
+    sql = `
     select
       ${getDateStringSQL('g.t', unit)} as x, 
       g.y as y
     from (
       select 
         ${getDateSQL('created_at', unit, timezone)} as t,
-        ${columnQuery} as y
-      from ${table} website_event
+        count(distinct session_id) as y
+      from website_event
       where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
         and event_type = {eventType:UInt32}
@@ -67,9 +66,28 @@ async function clickhouseQuery(
       group by t
     ) as g
     order by t
-    `,
-    params,
-  ).then(result => {
+    `;
+  } else {
+    sql = `
+    select
+      ${getDateStringSQL('g.t', unit)} as x, 
+      g.y as y
+    from (
+      select 
+        ${getDateSQL('created_at', unit, timezone)} as t,
+        uniq(session_id) as y
+      from website_event_stats_hourly website_event
+      where website_id = {websiteId:UUID}
+        and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+        and event_type = {eventType:UInt32}
+        ${filterQuery}
+      group by t
+    ) as g
+    order by t
+    `;
+  }
+
+  return rawQuery(sql, params).then(result => {
     return Object.values(result).map((a: any) => {
       return { x: a.x, y: Number(a.y) };
     });

From 7582670aef1bcb9c5d170b82a2349ab6bc865945 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Fri, 2 Aug 2024 00:14:32 -0700
Subject: [PATCH 241/438] fix retention report invalid date

---
 src/app/(main)/reports/retention/RetentionTable.tsx | 2 +-
 src/pages/api/reports/retention.ts                  | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/app/(main)/reports/retention/RetentionTable.tsx b/src/app/(main)/reports/retention/RetentionTable.tsx
index 171c5bd3f1..1770a76468 100644
--- a/src/app/(main)/reports/retention/RetentionTable.tsx
+++ b/src/app/(main)/reports/retention/RetentionTable.tsx
@@ -52,7 +52,7 @@ export function RetentionTable({ days = DAYS }) {
         {rows.map(({ date, visitors, records }, rowIndex) => {
           return (
             <div key={rowIndex} className={styles.row}>
-              <div className={styles.date}>{formatDate(`${date} 00:00:00`, 'PP', locale)}</div>
+              <div className={styles.date}>{formatDate(date, 'PP', locale)}</div>
               <div className={styles.visitors}>{visitors}</div>
               {days.map(day => {
                 if (totalDays - rowIndex < day) {
diff --git a/src/pages/api/reports/retention.ts b/src/pages/api/reports/retention.ts
index 6ff7bbe1c3..f4d9b7df07 100644
--- a/src/pages/api/reports/retention.ts
+++ b/src/pages/api/reports/retention.ts
@@ -9,7 +9,8 @@ import * as yup from 'yup';
 
 export interface RetentionRequestBody {
   websiteId: string;
-  dateRange: { startDate: string; endDate: string; timezone: string };
+  dateRange: { startDate: string; endDate: string };
+  timezone: string;
 }
 
 const schema = {
@@ -20,9 +21,9 @@ const schema = {
       .shape({
         startDate: yup.date().required(),
         endDate: yup.date().required(),
-        timezone: TimezoneTest,
       })
       .required(),
+    timezone: TimezoneTest,
   }),
 };
 
@@ -37,7 +38,8 @@ export default async (
   if (req.method === 'POST') {
     const {
       websiteId,
-      dateRange: { startDate, endDate, timezone },
+      dateRange: { startDate, endDate },
+      timezone,
     } = req.body;
 
     if (!(await canViewWebsite(req.auth, websiteId))) {

From 9d3513256f4b4b92f1e09759a5f7be4279cdd4fd Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 2 Aug 2024 15:25:08 -0700
Subject: [PATCH 242/438] Updated session link.

---
 src/app/(main)/websites/[websiteId]/events/EventsTable.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx
index c34ac89b07..b3414097e2 100644
--- a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx
+++ b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx
@@ -1,5 +1,5 @@
 import { GridTable, GridColumn } from 'react-basics';
-import { useLocale, useMessages } from 'components/hooks';
+import { useLocale, useMessages, useTeamUrl } from 'components/hooks';
 import Empty from 'components/common/Empty';
 import { formatDistance } from 'date-fns';
 import Avatar from 'components/common/Avatar';
@@ -8,6 +8,7 @@ import Link from 'next/link';
 export function EventsTable({ data = [] }) {
   const { dateLocale } = useLocale();
   const { formatMessage, labels } = useMessages();
+  const { renderTeamUrl } = useTeamUrl();
 
   if (data.length === 0) {
     return <Empty />;
@@ -17,7 +18,7 @@ export function EventsTable({ data = [] }) {
     <GridTable data={data}>
       <GridColumn name="session" label={formatMessage(labels.session)} width={'100px'}>
         {row => (
-          <Link href={`/sessions/`}>
+          <Link href={renderTeamUrl(`/websites/${row.websiteId}/sessions/${row.sessionId}`)}>
             <Avatar seed={row.sessionId} size={64} />
           </Link>
         )}

From 1195695b721639985bd0d93f318a9c718bf08e95 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 2 Aug 2024 17:50:00 -0700
Subject: [PATCH 243/438] Upgrade next.

---
 package.json         |   2 +-
 scripts/check-env.js |   6 +--
 yarn.lock            | 124 +++++++++++++++++++++----------------------
 3 files changed, 64 insertions(+), 68 deletions(-)

diff --git a/package.json b/package.json
index f9513c43c9..186a1cd4c2 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,7 @@
     "maxmind": "^4.3.6",
     "md5": "^2.3.0",
     "moment-timezone": "^0.5.35",
-    "next": "14.2.4",
+    "next": "14.2.5",
     "next-basics": "^0.39.0",
     "node-fetch": "^3.2.8",
     "npm-run-all": "^4.1.5",
diff --git a/scripts/check-env.js b/scripts/check-env.js
index db39bb79d5..280e7e398f 100644
--- a/scripts/check-env.js
+++ b/scripts/check-env.js
@@ -22,10 +22,6 @@ if (!process.env.SKIP_DB_CHECK && !process.env.DATABASE_TYPE) {
   checkMissing(['DATABASE_URL']);
 }
 
-if (process.env.CLICKHOUSE_URL) {
-  checkMissing(['KAFKA_BROKER', 'KAFKA_URL', 'REDIS_URL']);
-}
-
 if (process.env.CLOUD_MODE) {
-  checkMissing(['CLOUD_URL']);
+  checkMissing(['CLOUD_URL', 'KAFKA_BROKER', 'KAFKA_URL', 'REDIS_URL']);
 }
diff --git a/yarn.lock b/yarn.lock
index 470cad8fc7..eee877d39c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2192,10 +2192,10 @@
   resolved "https://registry.yarnpkg.com/@netlify/plugin-nextjs/-/plugin-nextjs-5.3.3.tgz#414cb0f4c21e6b80d6127b824efb00ae2f732a89"
   integrity sha512-QhvZLOHhPuTnh6TZ5G0/jtjAJ1Y52A67b39eygKv6znQUPti8p+8y2WulcntpCRzVp2stzEULMNPlnptna1ikg==
 
-"@next/env@14.2.4":
-  version "14.2.4"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.4.tgz#5546813dc4f809884a37d257b254a5ce1b0248d7"
-  integrity sha512-3EtkY5VDkuV2+lNmKlbkibIJxcO4oIHEhBWne6PaAp+76J9KoSsGvNikp6ivzAT8dhhBMYrm6op2pS1ApG0Hzg==
+"@next/env@14.2.5":
+  version "14.2.5"
+  resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.5.tgz#1d9328ab828711d3517d0a1d505acb55e5ef7ad0"
+  integrity sha512-/zZGkrTOsraVfYjGP8uM0p6r0BDT6xWpkjdVbcz66PJVSpwXX3yNiRycxAuDfBKGWBrZBXRuK/YVlkNgxHGwmA==
 
 "@next/eslint-plugin-next@14.2.4":
   version "14.2.4"
@@ -2204,50 +2204,50 @@
   dependencies:
     glob "10.3.10"
 
-"@next/swc-darwin-arm64@14.2.4":
-  version "14.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.4.tgz#da9f04c34a3d5f0b8401ed745768420e4a604036"
-  integrity sha512-AH3mO4JlFUqsYcwFUHb1wAKlebHU/Hv2u2kb1pAuRanDZ7pD/A/KPD98RHZmwsJpdHQwfEc/06mgpSzwrJYnNg==
-
-"@next/swc-darwin-x64@14.2.4":
-  version "14.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.4.tgz#46dedb29ec5503bf171a72a3ecb8aac6e738e9d6"
-  integrity sha512-QVadW73sWIO6E2VroyUjuAxhWLZWEpiFqHdZdoQ/AMpN9YWGuHV8t2rChr0ahy+irKX5mlDU7OY68k3n4tAZTg==
-
-"@next/swc-linux-arm64-gnu@14.2.4":
-  version "14.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.4.tgz#c9697ab9eb422bd1d7ffd0eb0779cc2aefa9d4a1"
-  integrity sha512-KT6GUrb3oyCfcfJ+WliXuJnD6pCpZiosx2X3k66HLR+DMoilRb76LpWPGb4tZprawTtcnyrv75ElD6VncVamUQ==
-
-"@next/swc-linux-arm64-musl@14.2.4":
-  version "14.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.4.tgz#cbbceb2008571c743b5a310a488d2e166d200a75"
-  integrity sha512-Alv8/XGSs/ytwQcbCHwze1HmiIkIVhDHYLjczSVrf0Wi2MvKn/blt7+S6FJitj3yTlMwMxII1gIJ9WepI4aZ/A==
-
-"@next/swc-linux-x64-gnu@14.2.4":
-  version "14.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.4.tgz#d79184223f857bacffb92f643cb2943a43632568"
-  integrity sha512-ze0ShQDBPCqxLImzw4sCdfnB3lRmN3qGMB2GWDRlq5Wqy4G36pxtNOo2usu/Nm9+V2Rh/QQnrRc2l94kYFXO6Q==
-
-"@next/swc-linux-x64-musl@14.2.4":
-  version "14.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.4.tgz#6b6c3e5ac02ca5e63394d280ec8ee607491902df"
-  integrity sha512-8dwC0UJoc6fC7PX70csdaznVMNr16hQrTDAMPvLPloazlcaWfdPogq+UpZX6Drqb1OBlwowz8iG7WR0Tzk/diQ==
-
-"@next/swc-win32-arm64-msvc@14.2.4":
-  version "14.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.4.tgz#dbad3906e870dba84c5883d9d4c4838472e0697f"
-  integrity sha512-jxyg67NbEWkDyvM+O8UDbPAyYRZqGLQDTPwvrBBeOSyVWW/jFQkQKQ70JDqDSYg1ZDdl+E3nkbFbq8xM8E9x8A==
-
-"@next/swc-win32-ia32-msvc@14.2.4":
-  version "14.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.4.tgz#6074529b91ba49132922ce89a2e16d25d2ec235d"
-  integrity sha512-twrmN753hjXRdcrZmZttb/m5xaCBFa48Dt3FbeEItpJArxriYDunWxJn+QFXdJ3hPkm4u7CKxncVvnmgQMY1ag==
-
-"@next/swc-win32-x64-msvc@14.2.4":
-  version "14.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.4.tgz#e65a1c6539a671f97bb86d5183d6e3a1733c29c7"
-  integrity sha512-tkLrjBzqFTP8DVrAAQmZelEahfR9OxWpFR++vAI9FBhCiIxtwHwBHC23SBHCTURBtwB4kc/x44imVOnkKGNVGg==
+"@next/swc-darwin-arm64@14.2.5":
+  version "14.2.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.5.tgz#d0a160cf78c18731c51cc0bff131c706b3e9bb05"
+  integrity sha512-/9zVxJ+K9lrzSGli1///ujyRfon/ZneeZ+v4ptpiPoOU+GKZnm8Wj8ELWU1Pm7GHltYRBklmXMTUqM/DqQ99FQ==
+
+"@next/swc-darwin-x64@14.2.5":
+  version "14.2.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.5.tgz#eb832a992407f6e6352eed05a073379f1ce0589c"
+  integrity sha512-vXHOPCwfDe9qLDuq7U1OYM2wUY+KQ4Ex6ozwsKxp26BlJ6XXbHleOUldenM67JRyBfVjv371oneEvYd3H2gNSA==
+
+"@next/swc-linux-arm64-gnu@14.2.5":
+  version "14.2.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.5.tgz#098fdab57a4664969bc905f5801ef5a89582c689"
+  integrity sha512-vlhB8wI+lj8q1ExFW8lbWutA4M2ZazQNvMWuEDqZcuJJc78iUnLdPPunBPX8rC4IgT6lIx/adB+Cwrl99MzNaA==
+
+"@next/swc-linux-arm64-musl@14.2.5":
+  version "14.2.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.5.tgz#243a1cc1087fb75481726dd289c7b219fa01f2b5"
+  integrity sha512-NpDB9NUR2t0hXzJJwQSGu1IAOYybsfeB+LxpGsXrRIb7QOrYmidJz3shzY8cM6+rO4Aojuef0N/PEaX18pi9OA==
+
+"@next/swc-linux-x64-gnu@14.2.5":
+  version "14.2.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.5.tgz#b8a2e436387ee4a52aa9719b718992e0330c4953"
+  integrity sha512-8XFikMSxWleYNryWIjiCX+gU201YS+erTUidKdyOVYi5qUQo/gRxv/3N1oZFCgqpesN6FPeqGM72Zve+nReVXQ==
+
+"@next/swc-linux-x64-musl@14.2.5":
+  version "14.2.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.5.tgz#cb8a9adad5fb8df86112cfbd363aab5c6d32757b"
+  integrity sha512-6QLwi7RaYiQDcRDSU/os40r5o06b5ue7Jsk5JgdRBGGp8l37RZEh9JsLSM8QF0YDsgcosSeHjglgqi25+m04IQ==
+
+"@next/swc-win32-arm64-msvc@14.2.5":
+  version "14.2.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.5.tgz#81f996c1c38ea0900d4e7719cc8814be8a835da0"
+  integrity sha512-1GpG2VhbspO+aYoMOQPQiqc/tG3LzmsdBH0LhnDS3JrtDx2QmzXe0B6mSZZiN3Bq7IOMXxv1nlsjzoS1+9mzZw==
+
+"@next/swc-win32-ia32-msvc@14.2.5":
+  version "14.2.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.5.tgz#f61c74ce823e10b2bc150e648fc192a7056422e0"
+  integrity sha512-Igh9ZlxwvCDsu6438FXlQTHlRno4gFpJzqPjSIBZooD22tKeI4fE/YMRoHVJHmrQ2P5YL1DoZ0qaOKkbeFWeMg==
+
+"@next/swc-win32-x64-msvc@14.2.5":
+  version "14.2.5"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.5.tgz#ed199a920efb510cfe941cd75ed38a7be21e756f"
+  integrity sha512-tEQ7oinq1/CjSG9uSTerca3v4AZ+dFa+4Yu6ihaG8Ud8ddqLQgFGcnwYls13H5X5CPDPZJdYxyeMui6muOLd4g==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
@@ -7853,12 +7853,12 @@ next-basics@^0.39.0:
     jsonwebtoken "^9.0.0"
     pure-rand "^6.0.2"
 
-next@14.2.4:
-  version "14.2.4"
-  resolved "https://registry.yarnpkg.com/next/-/next-14.2.4.tgz#ef66c39c71e2d8ad0a3caa0383c8933f4663e4d1"
-  integrity sha512-R8/V7vugY+822rsQGQCjoLhMuC9oFj9SOi4Cl4b2wjDrseD0LRZ10W7R6Czo4w9ZznVSshKjuIomsRjvm9EKJQ==
+next@14.2.5:
+  version "14.2.5"
+  resolved "https://registry.yarnpkg.com/next/-/next-14.2.5.tgz#afe4022bb0b752962e2205836587a289270efbea"
+  integrity sha512-0f8aRfBVL+mpzfBjYfQuLWh2WyAwtJXCRfkPF4UJ5qd2YwrHczsrSzXU4tRMV0OAxR8ZJZWPFn6uhSC56UTsLA==
   dependencies:
-    "@next/env" "14.2.4"
+    "@next/env" "14.2.5"
     "@swc/helpers" "0.5.5"
     busboy "1.6.0"
     caniuse-lite "^1.0.30001579"
@@ -7866,15 +7866,15 @@ next@14.2.4:
     postcss "8.4.31"
     styled-jsx "5.1.1"
   optionalDependencies:
-    "@next/swc-darwin-arm64" "14.2.4"
-    "@next/swc-darwin-x64" "14.2.4"
-    "@next/swc-linux-arm64-gnu" "14.2.4"
-    "@next/swc-linux-arm64-musl" "14.2.4"
-    "@next/swc-linux-x64-gnu" "14.2.4"
-    "@next/swc-linux-x64-musl" "14.2.4"
-    "@next/swc-win32-arm64-msvc" "14.2.4"
-    "@next/swc-win32-ia32-msvc" "14.2.4"
-    "@next/swc-win32-x64-msvc" "14.2.4"
+    "@next/swc-darwin-arm64" "14.2.5"
+    "@next/swc-darwin-x64" "14.2.5"
+    "@next/swc-linux-arm64-gnu" "14.2.5"
+    "@next/swc-linux-arm64-musl" "14.2.5"
+    "@next/swc-linux-x64-gnu" "14.2.5"
+    "@next/swc-linux-x64-musl" "14.2.5"
+    "@next/swc-win32-arm64-msvc" "14.2.5"
+    "@next/swc-win32-ia32-msvc" "14.2.5"
+    "@next/swc-win32-x64-msvc" "14.2.5"
 
 nice-try@^1.0.4:
   version "1.0.5"

From eda18d37957a8818748ff54afb101870ba323a12 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 2 Aug 2024 17:52:53 -0700
Subject: [PATCH 244/438] Fixed website details page not rendering.

---
 src/app/(main)/websites/[websiteId]/layout.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/layout.tsx b/src/app/(main)/websites/[websiteId]/layout.tsx
index 1729e3ed9f..f8756ea3e7 100644
--- a/src/app/(main)/websites/[websiteId]/layout.tsx
+++ b/src/app/(main)/websites/[websiteId]/layout.tsx
@@ -2,10 +2,6 @@ import { Metadata } from 'next';
 import WebsiteProvider from './WebsiteProvider';
 
 export default function ({ children, params: { websiteId } }) {
-  if (process.env.cloudMode) {
-    return null;
-  }
-
   return <WebsiteProvider websiteId={websiteId}>{children}</WebsiteProvider>;
 }
 

From 4e7e1019bdd59d8d22af8e6366e8b299723834b3 Mon Sep 17 00:00:00 2001
From: Sergey Lisovskiy <lisovskiyserj@gmail.com>
Date: Sat, 3 Aug 2024 18:51:44 +0400
Subject: [PATCH 245/438] feat: Update be-BY translations

---
 src/lang/be-BY.json | 364 ++++++++++++++++++++++----------------------
 1 file changed, 182 insertions(+), 182 deletions(-)

diff --git a/src/lang/be-BY.json b/src/lang/be-BY.json
index 53533023fd..129e6702af 100644
--- a/src/lang/be-BY.json
+++ b/src/lang/be-BY.json
@@ -1,267 +1,267 @@
 {
-  "label.access-code": "Access code",
+  "label.access-code": "Код доступу",
   "label.actions": "Дзеянні",
-  "label.activity-log": "Activity log",
-  "label.add": "Add",
-  "label.add-description": "Add description",
-  "label.add-member": "Add member",
-  "label.add-step": "Add step",
+  "label.activity-log": "Журнал актыўнасці",
+  "label.add": "Дадаць",
+  "label.add-description": "Дадаць апісанне",
+  "label.add-member": "Дадаць удзельніка",
+  "label.add-step": "Дадаць крок",
   "label.add-website": "Дадаць сайт",
   "label.admin": "Адміністратар",
-  "label.after": "After",
+  "label.after": "Пасля",
   "label.all": "Усё",
   "label.all-time": "Увесь час",
-  "label.analytics": "Analytics",
-  "label.average": "Average",
+  "label.analytics": "Аналітыка",
+  "label.average": "Сярэдняе",
   "label.back": "Назад",
-  "label.before": "Before",
+  "label.before": "Да",
   "label.bounce-rate": "Паказчык адмоваў",
-  "label.breakdown": "Breakdown",
-  "label.browser": "Browser",
+  "label.breakdown": "Разбіўка",
+  "label.browser": "Браўзер",
   "label.browsers": "Браўзеры",
   "label.cancel": "Адмена",
   "label.change-password": "Змяніць пароль",
-  "label.cities": "Cities",
-  "label.city": "City",
-  "label.clear-all": "Clear all",
-  "label.compare": "Compare",
-  "label.confirm": "Confirm",
+  "label.cities": "Гарады",
+  "label.city": "Горад",
+  "label.clear-all": "Ачысціць усё",
+  "label.compare": "Параўнаць",
+  "label.confirm": "Падцвердзіць",
   "label.confirm-password": "Падцвердзіць пароль",
-  "label.contains": "Contains",
-  "label.continue": "Continue",
-  "label.count": "Count",
+  "label.contains": "Уключае",
+  "label.continue": "Працягнуць",
+  "label.count": "Колькасць",
   "label.countries": "Краіны",
-  "label.country": "Country",
-  "label.create": "Create",
-  "label.create-report": "Create report",
-  "label.create-team": "Create team",
-  "label.create-user": "Create user",
-  "label.created": "Created",
-  "label.created-by": "Created By",
-  "label.current": "Current",
-  "label.current-password": "Бягучы пароль",
-  "label.custom-range": "Карыстацкі дыяпазон",
+  "label.country": "Краіна",
+  "label.create": "Стварыць",
+  "label.create-report": "Стварыць справаздачу",
+  "label.create-team": "Стварыць каманду",
+  "label.create-user": "Стварыць карыстальніка",
+  "label.created": "Створана",
+  "label.created-by": "Створана",
+  "label.current": "Цяперашні",
+  "label.current-password": "Цяперашні пароль",
+  "label.custom-range": "Іншы дыяпазон",
   "label.dashboard": "Інфармацыйная панэль",
-  "label.data": "Data",
-  "label.date": "Date",
+  "label.data": "Дадзеныя",
+  "label.date": "Дата",
   "label.date-range": "Дыяпазон дат",
-  "label.day": "Day",
+  "label.day": "Дзень",
   "label.default-date-range": "Дыяпазон дат па змаўчанню",
   "label.delete": "Выдаліць",
-  "label.delete-report": "Delete report",
-  "label.delete-team": "Delete team",
-  "label.delete-user": "Delete user",
+  "label.delete-report": "Выдаліць справаздачу",
+  "label.delete-team": "Выдаліць каманду",
+  "label.delete-user": "Выдаліць карыстальніка",
   "label.delete-website": "Выдаліць сайт",
-  "label.description": "Description",
+  "label.description": "Апісанне",
   "label.desktop": "Настольны ПК",
-  "label.details": "Details",
-  "label.device": "Device",
+  "label.details": "Дэталі",
+  "label.device": "Прылада",
   "label.devices": "Прылады",
-  "label.dismiss": "Адмена",
-  "label.does-not-contain": "Does not contain",
+  "label.dismiss": "Адхіліць",
+  "label.does-not-contain": "Не ўключае",
   "label.domain": "Дамен",
-  "label.dropoff": "Dropoff",
+  "label.dropoff": "Адмовы",
   "label.edit": "Змяніць",
   "label.edit-dashboard": "Змяніць інфармацыйную панэль",
-  "label.edit-member": "Edit member",
+  "label.edit-member": "Рэдагаваць удзельніка",
   "label.enable-share-url": "Дазволіць дзяліцца спасылкай",
-  "label.end-step": "End Step",
-  "label.entry": "Entry URL",
-  "label.event": "Event",
-  "label.event-data": "Event data",
+  "label.end-step": "Канчатковы крок",
+  "label.entry": "URL уваходу",
+  "label.event": "Падзея",
+  "label.event-data": "Дадзеныя падзеі",
   "label.events": "Падзеі",
-  "label.exit": "Exit URL",
-  "label.false": "False",
-  "label.field": "Field",
-  "label.fields": "Fields",
-  "label.filter": "Filter",
-  "label.filter-combined": "Камбініаваны",
+  "label.exit": "URL выхаду",
+  "label.false": "Ложна",
+  "label.field": "Поле",
+  "label.fields": "Палі",
+  "label.filter": "Фільтр",
+  "label.filter-combined": "Камбініраваны",
   "label.filter-raw": "Сырыя",
-  "label.filters": "Filters",
-  "label.funnel": "Funnel",
-  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
-  "label.goal": "Goal",
-  "label.goals": "Goals",
-  "label.goals-description": "Track your goals for pageviews and events.",
-  "label.greater-than": "Greater than",
-  "label.greater-than-equals": "Greater than or equals",
-  "label.host": "Host",
-  "label.hosts": "Hosts",
-  "label.insights": "Insights",
-  "label.insights-description": "Dive deeper into your data by using segments and filters.",
-  "label.is": "Is",
-  "label.is-not": "Is not",
-  "label.is-not-set": "Is not set",
-  "label.is-set": "Is set",
-  "label.join": "Join",
-  "label.join-team": "Join team",
-  "label.journey": "Journey",
-  "label.journey-description": "Understand how users navigate through your website.",
+  "label.filters": "Фільтры",
+  "label.funnel": "Варонка",
+  "label.funnel-description": "Разумець паказчыкі канверсіі і адмоваў.",
+  "label.goal": "Мэта",
+  "label.goals": "Мэты",
+  "label.goals-description": "Сачыць за мэтамі па праглядах старонак і падзеях.",
+  "label.greater-than": "Больш чым",
+  "label.greater-than-equals": "Больш чым або роўна",
+  "label.host": "Хост",
+  "label.hosts": "Хасты",
+  "label.insights": "Інсайты",
+  "label.insights-description": "Даследваць дадзеныя з дапамогай сегментаў і фільтраў.",
+  "label.is": "З'яўляецца",
+  "label.is-not": "Не з'яўляецца",
+  "label.is-not-set": "Не ўстаноўлена",
+  "label.is-set": "Устаноўлена",
+  "label.join": "Далучыцца",
+  "label.join-team": "Далучыцца да каманды",
+  "label.journey": "Маршрут карыстальніка",
+  "label.journey-description": "Разумець як карыстальнікі навігуюць па сайце.",
   "label.language": "Мова",
   "label.languages": "Мовы",
   "label.laptop": "Ноўтбук",
-  "label.last-days": "Апошнія {x} дні",
+  "label.last-days": "Апошнія {x} дзён",
   "label.last-hours": "Апошнія {x} гадзіны",
-  "label.last-months": "Last {x} months",
-  "label.leave": "Leave",
-  "label.leave-team": "Leave team",
-  "label.less-than": "Less than",
-  "label.less-than-equals": "Less than or equals",
-  "label.login": "Login",
+  "label.last-months": "Апошнія {x} месяцаў",
+  "label.leave": "Пакінуць",
+  "label.leave-team": "Пакінуць каманду",
+  "label.less-than": "Менш чым",
+  "label.less-than-equals": "Менш чым або роўна",
+  "label.login": "Увайсці",
   "label.logout": "Выйсці",
-  "label.manage": "Manage",
-  "label.manager": "Manager",
-  "label.max": "Max",
-  "label.member": "Member",
-  "label.members": "Members",
-  "label.min": "Min",
+  "label.manage": "Кіраваць",
+  "label.manager": "Кіраўнік",
+  "label.max": "Максімум",
+  "label.member": "Удзельнік",
+  "label.members": "Удзельнікі",
+  "label.min": "Мінімум",
   "label.mobile": "Мабільны",
   "label.more": "Болей",
-  "label.my-account": "My account",
-  "label.my-websites": "My websites",
+  "label.my-account": "Мой уліковы запіс",
+  "label.my-websites": "Мае сайты",
   "label.name": "Імя",
   "label.new-password": "Новы пароль",
   "label.none": "Няма",
-  "label.number-of-records": "{x} {x, plural, one {record} other {records}}",
-  "label.ok": "OK",
-  "label.os": "OS",
-  "label.overview": "Overview",
+  "label.number-of-records": "{x} {x, plural, one {запіс} other {запісаў}}",
+  "label.ok": "ОК",
+  "label.os": "Аперацыйная сістэма",
+  "label.overview": "Агляд",
   "label.owner": "Уласнік",
-  "label.page-of": "Page {current} of {total}",
+  "label.page-of": "Старонка {current} з {total}",
   "label.page-views": "Прагляды старонкі",
-  "label.pageTitle": "Page title",
+  "label.pageTitle": "Загаловак старонкі",
   "label.pages": "Старонкі",
   "label.password": "Пароль",
   "label.powered-by": "Зроблена {name}",
-  "label.previous": "Previous",
-  "label.previous-period": "Previous period",
-  "label.previous-year": "Previous year",
+  "label.previous": "Папярэдні",
+  "label.previous-period": "Папярэдні перыяд",
+  "label.previous-year": "Папярэдні год",
   "label.profile": "Профіль",
-  "label.property": "Property",
-  "label.queries": "Queries",
-  "label.query": "Query",
-  "label.query-parameters": "Query parameters",
+  "label.property": "Уласцівасць",
+  "label.queries": "Запыты",
+  "label.query": "Запыт",
+  "label.query-parameters": "Параметры запыту",
   "label.realtime": "У рэяльным часе",
-  "label.referrer": "Referrer",
-  "label.referrers": "Referrers",
+  "label.referrer": "Рэферэр",
+  "label.referrers": "Рэферэры",
   "label.refresh": "Аднавіць",
-  "label.regenerate": "Regenerate",
-  "label.region": "Region",
-  "label.regions": "Regions",
-  "label.remove": "Remove",
-  "label.remove-member": "Remove member",
-  "label.reports": "Reports",
+  "label.regenerate": "Рэгенераваць",
+  "label.region": "Рэгіён",
+  "label.regions": "Рэгіёны",
+  "label.remove": "Выдаліць",
+  "label.remove-member": "Выдаліць удзельніка",
+  "label.reports": "Справаздачы",
   "label.required": "Абавязкова",
   "label.reset": "Скінуць",
   "label.reset-website": "Скінуць статыстыку",
-  "label.retention": "Retention",
-  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
-  "label.role": "Role",
-  "label.run-query": "Run query",
+  "label.retention": "Утрыманне",
+  "label.retention-description": "Ацаніць прыцягальнасць сайта, адсочваючы павяртанні карыстальнікаў.",
+  "label.role": "Роля",
+  "label.run-query": "Запусціць запыт",
   "label.save": "Захаваць",
   "label.screens": "Экраны",
-  "label.search": "Search",
-  "label.select": "Select",
-  "label.select-date": "Select date",
-  "label.select-role": "Select role",
-  "label.select-website": "Select website",
-  "label.sessions": "Sessions",
+  "label.search": "Пошук",
+  "label.select": "Выбраць",
+  "label.select-date": "Выбраць дату",
+  "label.select-role": "Выбраць ролю",
+  "label.select-website": "Выбраць сайт",
+  "label.sessions": "Сесіі",
   "label.settings": "Налады",
   "label.share-url": "Падзяліцца спасылкай",
   "label.single-day": "Адзін дзень",
-  "label.start-step": "Start Step",
-  "label.steps": "Steps",
-  "label.sum": "Sum",
+  "label.start-step": "Першы кроку",
+  "label.steps": "Крокі",
+  "label.sum": "Сума",
   "label.tablet": "Планшэт",
-  "label.team": "Team",
-  "label.team-id": "Team ID",
-  "label.team-manager": "Team manager",
-  "label.team-member": "Team member",
-  "label.team-name": "Team name",
-  "label.team-owner": "Team owner",
-  "label.team-view-only": "Team view only",
-  "label.team-websites": "Team websites",
-  "label.teams": "Teams",
+  "label.team": "Каманда",
+  "label.team-id": "Ідэнтыфікатар каманды",
+  "label.team-manager": "Кіраўнік каманды",
+  "label.team-member": "Удзельнік каманды",
+  "label.team-name": "Назва каманды",
+  "label.team-owner": "Уласнік каманды",
+  "label.team-view-only": "Толькі для каманднага прагляду",
+  "label.team-websites": "Сайты каманды",
+  "label.teams": "Каманды",
   "label.theme": "Тэма",
   "label.this-month": "Гэты месяц",
   "label.this-week": "Гэты тыдзень",
   "label.this-year": "Гэты год",
-  "label.timezone": "Таймзона",
-  "label.title": "Title",
+  "label.timezone": "Часавы пояс",
+  "label.title": "Загаловак",
   "label.today": "Сёння",
   "label.toggle-charts": "Пераключыць графікі",
-  "label.total": "Total",
-  "label.total-records": "Total records",
+  "label.total": "Агульная колькасць",
+  "label.total-records": "Агульная колькасць запісаў",
   "label.tracking-code": "Код адсочвання",
-  "label.transfer": "Transfer",
-  "label.transfer-website": "Transfer website",
-  "label.true": "True",
-  "label.type": "Type",
-  "label.unique": "Unique",
+  "label.transfer": "Перадаць",
+  "label.transfer-website": "Перадаць сайт",
+  "label.true": "Ісціна",
+  "label.type": "Тып",
+  "label.unique": "Унікальны",
   "label.unique-visitors": "Унікальныя наведвальнікі",
   "label.unknown": "Невядома",
-  "label.untitled": "Untitled",
-  "label.update": "Update",
+  "label.untitled": "Без назвы",
+  "label.update": "Абнавіць",
   "label.url": "URL",
   "label.urls": "URLs",
-  "label.user": "User",
+  "label.user": "Карыстальнік",
   "label.username": "Імя карыстальніка",
-  "label.users": "Users",
+  "label.users": "Карыстальнікі",
   "label.utm": "UTM",
-  "label.utm-description": "Track your campaigns through UTM parameters.",
-  "label.value": "Value",
-  "label.view": "View",
-  "label.view-details": "Пабачыць дэталі",
-  "label.view-only": "View only",
+  "label.utm-description": "Сачыць за кампаніямі з дапамогай UTM-метак.",
+  "label.value": "Значэнне",
+  "label.view": "Паглядзець",
+  "label.view-details": "Паглядзець дэталі",
+  "label.view-only": "Толькі прагляд",
   "label.views": "Прагляды",
-  "label.views-per-visit": "Views per visit",
+  "label.views-per-visit": "Прагляды за наведванне",
   "label.visit-duration": "Сярэдняя даўжыня наведвання",
   "label.visitors": "Наведвальнікі",
-  "label.visits": "Visits",
-  "label.website": "Website",
-  "label.website-id": "Website ID",
+  "label.visits": "Наведванні",
+  "label.website": "Сайт",
+  "label.website-id": "Ідэнтыфікатар сайта",
   "label.websites": "Сайты",
-  "label.window": "Window",
+  "label.window": "Вакно",
   "label.yesterday": "Учора",
-  "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
-  "message.active-users": "{x} тякучых {x, plural, one {наведвальнік} other {наведвальнікаў}}",
-  "message.collected-data": "Collected data",
+  "message.action-confirmation": "Увядзіце {confirmation} у поле ніжэй, каб пацвердзіць.",
+  "message.active-users": "{x} цякучых {x, plural, one {наведвальнік} other {наведвальнікаў}}",
+  "message.collected-data": "Сабраныя дадзеныя",
   "message.confirm-delete": "Вы дакладна хочаце выдаліць {target}?",
-  "message.confirm-leave": "Are you sure you want to leave {target}?",
-  "message.confirm-remove": "Are you sure you want to remove {target}?",
+  "message.confirm-leave": "Вы дакладна хочаце пакінуць {target}?",
+  "message.confirm-remove": "Вы дакладна хочаце выдаліць {target}?",
   "message.confirm-reset": "Вы дакладна хочаце скінуць {target} статыстыку?",
-  "message.delete-team-warning": "Deleting a team will also delete all team websites.",
+  "message.delete-team-warning": "Выдаленне каманды таксама выдаліць усе сайты каманды.",
   "message.delete-website-warning": "Усе асацыяваныя дадзеныя будуць таксама выдалены.",
   "message.error": "Нешта пайшло не так.",
-  "message.event-log": "{event} on {url}",
+  "message.event-log": "{event} на {url}",
   "message.go-to-settings": "Да налад",
-  "message.incorrect-username-password": "Некарэктны username/password.",
+  "message.incorrect-username-password": "Некарэктнае імя карыстальніка/пароль.",
   "message.invalid-domain": "Некарэктны дамен",
-  "message.min-password-length": "Minimum length of {n} characters",
-  "message.new-version-available": "A new version of Umami {version} is available!",
+  "message.min-password-length": "Мінімальная даўжыня {n} знакаў",
+  "message.new-version-available": "Даступная новая версія Umami {version}!",
   "message.no-data-available": "Няма дадзеных.",
-  "message.no-event-data": "No event data is available.",
+  "message.no-event-data": "Дадзеныя падзеі недаступныя.",
   "message.no-match-password": "Паролі не супадаюць",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-teams": "You have not created any teams.",
-  "message.no-users": "There are no users.",
-  "message.no-websites-configured": "Вы не наладзілі ніводнага сайту.",
+  "message.no-results-found": "Вынікаў не знойдзена.",
+  "message.no-team-websites": "Гэтая каманда не мае ніводнага сайта.",
+  "message.no-teams": "Вы не стварылі ніводнай каманды.",
+  "message.no-users": "Няма карыстальнікаў.",
+  "message.no-websites-configured": "Вы не наладзілі ніводнага сайта.",
   "message.page-not-found": "Старонка не знойдзена.",
-  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
-  "message.reset-website-warning": "Уся статыстыка для гэтага сайту будзе выдалена, але код адсочвання будзе працягваць працаваць.",
+  "message.reset-website": "Каб скінуць гэты сайт, увядзіце {confirmation} у поле ніжэй для пацверджання.",
+  "message.reset-website-warning": "Уся статыстыка для гэтага сайта будзе выдалена, але код адсочвання будзе працягваць працаваць.",
   "message.saved": "Захавана паспяхова.",
   "message.share-url": "Гэта публічная спасылка для {target}.",
-  "message.team-already-member": "You are already a member of the team.",
-  "message.team-not-found": "Team not found.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
+  "message.team-already-member": "Вы ўжо ўдзельнік каманды.",
+  "message.team-not-found": "Каманда не знойдзена.",
+  "message.team-websites-info": "Сайты могуць быць праглядацца любым удзельнікам каманды.",
   "message.tracking-code": "Код адсочвання",
-  "message.transfer-team-website-to-user": "Transfer this website to your account?",
-  "message.transfer-user-website-to-team": "Select the team to transfer this website to.",
-  "message.transfer-website": "Transfer website ownership to your account or another team.",
-  "message.triggered-event": "Triggered event",
-  "message.user-deleted": "User deleted.",
-  "message.viewed-page": "Viewed page",
+  "message.transfer-team-website-to-user": "Перадаць гэты сайт на ваш уліковы запіс?",
+  "message.transfer-user-website-to-team": "Выберыце каманду для перадачы гэтага сайта.",
+  "message.transfer-website": "Перадача сайта на ваш уліковы запіс або іншай камандзе.",
+  "message.triggered-event": "Падзея якая спрацавала",
+  "message.user-deleted": "Карыстальнік выдалены.",
+  "message.viewed-page": "Праглядзеў старонку",
   "message.visitor-log": "Наведвальнік з {country} праз {browser} на {os} {device}",
-  "message.visitors-dropped-off": "Visitors dropped off"
+  "message.visitors-dropped-off": "Наведвальнікі сышлі"
 }

From 440db17000067fcedae580ee527b19cbd73ee1a8 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Sat, 3 Aug 2024 22:02:41 -0700
Subject: [PATCH 246/438] Added created date to session data save.

---
 src/pages/api/send.ts                             | 4 +---
 src/queries/analytics/sessions/saveSessionData.ts | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/pages/api/send.ts b/src/pages/api/send.ts
index 313184202d..23640de9f0 100644
--- a/src/pages/api/send.ts
+++ b/src/pages/api/send.ts
@@ -144,9 +144,7 @@ export default async (req: NextApiRequestCollect, res: NextApiResponse) => {
         ...session,
         sessionId: session.id,
       });
-    }
-
-    if (type === COLLECTION_TYPE.identify) {
+    } else if (type === COLLECTION_TYPE.identify) {
       if (!data) {
         return badRequest(res, 'Data required.');
       }
diff --git a/src/queries/analytics/sessions/saveSessionData.ts b/src/queries/analytics/sessions/saveSessionData.ts
index 1f5c149454..51f5c47d0d 100644
--- a/src/queries/analytics/sessions/saveSessionData.ts
+++ b/src/queries/analytics/sessions/saveSessionData.ts
@@ -11,7 +11,6 @@ export async function saveSessionData(data: {
   websiteId: string;
   sessionId: string;
   sessionData: DynamicData;
-  createdAt?: string;
 }) {
   return runQuery({
     [PRISMA]: () => relationalQuery(data),
@@ -78,12 +77,12 @@ async function clickhouseQuery(data: {
   websiteId: string;
   sessionId: string;
   sessionData: DynamicData;
-  createdAt?: string;
 }) {
-  const { websiteId, sessionId, sessionData, createdAt } = data;
+  const { websiteId, sessionId, sessionData } = data;
 
   const { insert } = clickhouse;
   const { getDateFormat, sendMessages } = kafka;
+  const createdAt = getDateFormat(new Date());
 
   const jsonKeys = flattenJSON(sessionData);
 

From 0988808b756ed890fe88726279eeeafe93ee771d Mon Sep 17 00:00:00 2001
From: Raye Evtuch <raye@evtuch.net>
Date: Sun, 4 Aug 2024 20:00:45 -0500
Subject: [PATCH 247/438] Allow team managers to transfer websites to teams

---
 .../settings/websites/[websiteId]/WebsiteTransferForm.tsx    | 2 +-
 src/lib/auth.ts                                              | 4 ++--
 src/lib/constants.ts                                         | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteTransferForm.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteTransferForm.tsx
index db46c212f6..eb568a7f8e 100644
--- a/src/app/(main)/settings/websites/[websiteId]/WebsiteTransferForm.tsx
+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteTransferForm.tsx
@@ -71,7 +71,7 @@ export function WebsiteTransferForm({
               {result.data
                 .filter(({ teamUser }) =>
                   teamUser.find(
-                    ({ role, userId }) => role === ROLES.teamOwner && userId === user.id,
+                    ({ role, userId }) => [ ROLES.teamOwner, ROLES.teamManager ].includes(role) && userId === user.id,
                   ),
                 )
                 .map(({ id, name }) => {
diff --git a/src/lib/auth.ts b/src/lib/auth.ts
index 5b17cf1329..12fb0a2817 100644
--- a/src/lib/auth.ts
+++ b/src/lib/auth.ts
@@ -106,7 +106,7 @@ export async function canTransferWebsiteToUser({ user }: Auth, websiteId: string
   if (website.teamId && user.id === userId) {
     const teamUser = await getTeamUser(website.teamId, userId);
 
-    return teamUser?.role === ROLES.teamOwner;
+    return teamUser && hasPermission(teamUser.role, PERMISSIONS.websiteTransferToUser);
   }
 
   return false;
@@ -118,7 +118,7 @@ export async function canTransferWebsiteToTeam({ user }: Auth, websiteId: string
   if (website.userId && website.userId === user.id) {
     const teamUser = await getTeamUser(teamId, user.id);
 
-    return teamUser?.role === ROLES.teamOwner;
+    return teamUser && hasPermission(teamUser.role, PERMISSIONS.websiteTransferToTeam);
   }
 
   return false;
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 35917802d2..250307086e 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -160,6 +160,8 @@ export const PERMISSIONS = {
   websiteCreate: 'website:create',
   websiteUpdate: 'website:update',
   websiteDelete: 'website:delete',
+  websiteTransferToTeam: 'website:transfer-to-team',
+  websiteTransferToUser: 'website:transfer-to-user',
   teamCreate: 'team:create',
   teamUpdate: 'team:update',
   teamDelete: 'team:delete',
@@ -180,12 +182,15 @@ export const ROLE_PERMISSIONS = {
     PERMISSIONS.websiteCreate,
     PERMISSIONS.websiteUpdate,
     PERMISSIONS.websiteDelete,
+    PERMISSIONS.websiteTransferToTeam,
+    PERMISSIONS.websiteTransferToUser,
   ],
   [ROLES.teamManager]: [
     PERMISSIONS.teamUpdate,
     PERMISSIONS.websiteCreate,
     PERMISSIONS.websiteUpdate,
     PERMISSIONS.websiteDelete,
+    PERMISSIONS.websiteTransferToTeam,
   ],
   [ROLES.teamMember]: [
     PERMISSIONS.websiteCreate,

From 3fd9d6b148d3349349f7398602a090a5810c67be Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 5 Aug 2024 13:57:33 -0700
Subject: [PATCH 248/438] limit contain filters on country, region, city

---
 .../[reportId]/FieldFilterEditForm.tsx        | 36 +++++++++-----
 yarn.lock                                     | 49 +++----------------
 2 files changed, 30 insertions(+), 55 deletions(-)

diff --git a/src/app/(main)/reports/[reportId]/FieldFilterEditForm.tsx b/src/app/(main)/reports/[reportId]/FieldFilterEditForm.tsx
index dc10b724dc..a1417780e6 100644
--- a/src/app/(main)/reports/[reportId]/FieldFilterEditForm.tsx
+++ b/src/app/(main)/reports/[reportId]/FieldFilterEditForm.tsx
@@ -1,22 +1,22 @@
-import { useState, useMemo } from 'react';
+import { useFilters, useFormat, useLocale, useMessages, useWebsiteValues } from 'components/hooks';
+import { OPERATORS } from 'lib/constants';
+import { isEqualsOperator } from 'lib/params';
+import { useMemo, useState } from 'react';
 import {
+  Button,
+  Dropdown,
+  Flexbox,
   Form,
   FormRow,
-  Item,
-  Flexbox,
-  Dropdown,
-  Button,
-  SearchField,
-  TextField,
-  Text,
   Icon,
   Icons,
-  Menu,
+  Item,
   Loading,
+  Menu,
+  SearchField,
+  Text,
+  TextField,
 } from 'react-basics';
-import { useMessages, useFilters, useFormat, useLocale, useWebsiteValues } from 'components/hooks';
-import { OPERATORS } from 'lib/constants';
-import { isEqualsOperator } from 'lib/params';
 import styles from './FieldFilterEditForm.module.css';
 
 export interface FieldFilterFormProps {
@@ -69,6 +69,16 @@ export default function FieldFilterEditForm({
     search,
   });
 
+  const filterDropdownItems = (name: string) => {
+    const limitedFilters = ['country', 'region', 'city'];
+
+    if (limitedFilters.includes(name)) {
+      return filters.filter(f => f.type === type && !f.label.match(/contain/gi));
+    } else {
+      return filters.filter(f => f.type === type);
+    }
+  };
+
   const formattedValues = useMemo(() => {
     if (!values) {
       return {};
@@ -142,7 +152,7 @@ export default function FieldFilterEditForm({
           {allowFilterSelect && (
             <Dropdown
               className={styles.dropdown}
-              items={filters.filter(f => f.type === type)}
+              items={filterDropdownItems(name)}
               value={operator}
               renderValue={renderFilterValue}
               onChange={handleOperatorChange}
diff --git a/yarn.lock b/yarn.lock
index eee877d39c..08dac6cb4a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3882,20 +3882,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001538, caniuse-lite@^1.0.30001541:
-  version "1.0.30001551"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001551.tgz#1f2cfa8820bd97c971a57349d7fd8f6e08664a3e"
-  integrity sha512-vtBAez47BoGMMzlbYhfXrMV1kvRF2WP/lqiMuDu1Sb4EE4LKEgjopFDSRtZfdVnslNRpOqV/woE+Xgrwj6VQlg==
-
-caniuse-lite@^1.0.30001579:
-  version "1.0.30001587"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001587.tgz#a0bce920155fa56a1885a69c74e1163fc34b4881"
-  integrity sha512-HMFNotUmLXn71BQxg8cijvqxnIAofforZOwGsxyXJ0qugTdspUF4sPSJ2vhgprHCB996tIDzEq1ubumPDV8ULA==
-
-caniuse-lite@^1.0.30001587:
-  version "1.0.30001591"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001591.tgz#16745e50263edc9f395895a7cd468b9f3767cf33"
-  integrity sha512-PCzRMei/vXjJyL5mJtzNiUCKP59dm8Apqc3PH8gJkMnMXZGox93RbE76jHsmLwmIo6/3nsYIpJtx0O7u5PqFuQ==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001538, caniuse-lite@^1.0.30001541, caniuse-lite@^1.0.30001579, caniuse-lite@^1.0.30001587:
+  version "1.0.30001649"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001649.tgz"
+  integrity sha512-fJegqZZ0ZX8HOWr6rcafGr72+xcgJKI9oWfDW5DrD7ExUtgZC7a7R7ZYmZqplh7XDocFdGeIFn7roAxhOeYrPQ==
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -9857,16 +9847,7 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -9947,14 +9928,7 @@ string.prototype.trimstart@^1.0.8:
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -10720,7 +10694,7 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -10738,15 +10712,6 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

From b9068c00504a53980f55d31c24d5112d2b8b8372 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Wed, 7 Aug 2024 00:10:25 -0700
Subject: [PATCH 249/438] Added metrics bar and date range to sessions.

---
 package.json                                  |   6 +-
 public/intl/messages/be-BY.json               | 378 +++++++--------
 public/intl/messages/de-DE.json               |  84 ++--
 public/intl/messages/es-ES.json               |  68 +--
 public/intl/messages/km-KH.json               | 328 ++++++-------
 src/app/(main)/reports/ReportsTable.tsx       |   5 +-
 .../(main)/reports/create/ReportTemplates.tsx |  13 +-
 .../(main)/reports/revenue/RevenueReport.tsx  |   6 +-
 src/app/(main)/settings/teams/TeamsTable.tsx  |   5 +-
 src/app/(main)/settings/users/UsersTable.tsx  |   5 +-
 .../settings/websites/WebsitesTable.tsx       |   5 +-
 .../settings/members/TeamMembersTable.tsx     |   5 +-
 .../settings/websites/TeamWebsitesTable.tsx   |   5 +-
 .../websites/[websiteId]/WebsiteHeader.tsx    |   2 +-
 .../[websiteId]/events/EventsTable.tsx        |  20 +-
 .../sessions/SessionMetricsBar.tsx            |   5 -
 .../sessions/SessionsMetricsBar.tsx           |  42 ++
 .../[websiteId]/sessions/SessionsPage.tsx     |   2 +
 .../[websiteId]/sessions/SessionsTable.tsx    |  16 +-
 src/assets/location.svg                       |   2 +-
 src/assets/logo-white.svg                     |   5 +-
 src/assets/money.svg                          |   1 +
 src/components/common/DataTable.tsx           |   4 +-
 src/components/common/TypeIcon.tsx            |  19 +-
 src/components/hooks/index.ts                 |   3 +-
 .../{useFilterQuery.ts => usePagedQuery.ts}   |   8 +-
 src/components/hooks/queries/useReports.ts    |   4 +-
 .../hooks/queries/useTeamMembers.ts           |   4 +-
 .../hooks/queries/useTeamWebsites.ts          |   4 +-
 src/components/hooks/queries/useTeams.ts      |   4 +-
 src/components/hooks/queries/useUsers.ts      |   4 +-
 .../hooks/queries/useWebsiteEvents.ts         |   4 +-
 .../hooks/queries/useWebsiteEventsSeries.ts   |  20 +
 .../hooks/queries/useWebsiteSessions.ts       |   9 +-
 src/components/hooks/queries/useWebsites.ts   |   4 +-
 src/components/messages.ts                    |   7 +-
 src/components/metrics/EventsChart.tsx        |   4 +-
 src/components/metrics/MetricCard.tsx         |   2 +-
 src/components/metrics/PagesTable.tsx         |   2 +-
 src/lib/types.ts                              |   2 +-
 .../websites/[websiteId]/sessions/index.ts    |   9 +-
 src/queries/analytics/getWebsiteStats.ts      |  38 +-
 .../analytics/sessions/getWebsiteSessions.ts  |   3 +-
 yarn.lock                                     | 432 ++++++++++--------
 44 files changed, 859 insertions(+), 739 deletions(-)
 delete mode 100644 src/app/(main)/websites/[websiteId]/sessions/SessionMetricsBar.tsx
 create mode 100644 src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx
 create mode 100644 src/assets/money.svg
 rename src/components/hooks/queries/{useFilterQuery.ts => usePagedQuery.ts} (79%)
 create mode 100644 src/components/hooks/queries/useWebsiteEventsSeries.ts

diff --git a/package.json b/package.json
index 186a1cd4c2..9ca56fe356 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
     "@dicebear/collection": "^9.2.1",
     "@dicebear/core": "^9.2.1",
     "@fontsource/inter": "^4.5.15",
-    "@prisma/client": "5.16.2",
+    "@prisma/client": "5.17.0",
     "@prisma/extension-read-replicas": "^0.3.0",
     "@react-spring/web": "^9.7.3",
     "@tanstack/react-query": "^5.28.6",
@@ -104,9 +104,9 @@
     "next-basics": "^0.39.0",
     "node-fetch": "^3.2.8",
     "npm-run-all": "^4.1.5",
-    "prisma": "5.16.2",
+    "prisma": "5.17.0",
     "react": "^18.2.0",
-    "react-basics": "^0.123.0",
+    "react-basics": "^0.124.0",
     "react-beautiful-dnd": "^13.1.0",
     "react-dom": "^18.2.0",
     "react-error-boundary": "^4.0.4",
diff --git a/public/intl/messages/be-BY.json b/public/intl/messages/be-BY.json
index e6afc2ca85..5d84ef4e09 100644
--- a/public/intl/messages/be-BY.json
+++ b/public/intl/messages/be-BY.json
@@ -2,7 +2,7 @@
   "label.access-code": [
     {
       "type": 0,
-      "value": "Access code"
+      "value": "Код доступу"
     }
   ],
   "label.actions": [
@@ -14,31 +14,31 @@
   "label.activity-log": [
     {
       "type": 0,
-      "value": "Activity log"
+      "value": "Журнал актыўнасці"
     }
   ],
   "label.add": [
     {
       "type": 0,
-      "value": "Add"
+      "value": "Дадаць"
     }
   ],
   "label.add-description": [
     {
       "type": 0,
-      "value": "Add description"
+      "value": "Дадаць апісанне"
     }
   ],
   "label.add-member": [
     {
       "type": 0,
-      "value": "Add member"
+      "value": "Дадаць удзельніка"
     }
   ],
   "label.add-step": [
     {
       "type": 0,
-      "value": "Add step"
+      "value": "Дадаць крок"
     }
   ],
   "label.add-website": [
@@ -56,7 +56,7 @@
   "label.after": [
     {
       "type": 0,
-      "value": "After"
+      "value": "Пасля"
     }
   ],
   "label.all": [
@@ -74,13 +74,13 @@
   "label.analytics": [
     {
       "type": 0,
-      "value": "Analytics"
+      "value": "Аналітыка"
     }
   ],
   "label.average": [
     {
       "type": 0,
-      "value": "Average"
+      "value": "Сярэдняе"
     }
   ],
   "label.back": [
@@ -92,7 +92,7 @@
   "label.before": [
     {
       "type": 0,
-      "value": "Before"
+      "value": "Да"
     }
   ],
   "label.bounce-rate": [
@@ -104,13 +104,13 @@
   "label.breakdown": [
     {
       "type": 0,
-      "value": "Breakdown"
+      "value": "Разбіўка"
     }
   ],
   "label.browser": [
     {
       "type": 0,
-      "value": "Browser"
+      "value": "Браўзер"
     }
   ],
   "label.browsers": [
@@ -134,31 +134,31 @@
   "label.cities": [
     {
       "type": 0,
-      "value": "Cities"
+      "value": "Гарады"
     }
   ],
   "label.city": [
     {
       "type": 0,
-      "value": "City"
+      "value": "Горад"
     }
   ],
   "label.clear-all": [
     {
       "type": 0,
-      "value": "Clear all"
+      "value": "Ачысціць усё"
     }
   ],
   "label.compare": [
     {
       "type": 0,
-      "value": "Compare"
+      "value": "Параўнаць"
     }
   ],
   "label.confirm": [
     {
       "type": 0,
-      "value": "Confirm"
+      "value": "Падцвердзіць"
     }
   ],
   "label.confirm-password": [
@@ -170,19 +170,19 @@
   "label.contains": [
     {
       "type": 0,
-      "value": "Contains"
+      "value": "Уключае"
     }
   ],
   "label.continue": [
     {
       "type": 0,
-      "value": "Continue"
+      "value": "Працягнуць"
     }
   ],
   "label.count": [
     {
       "type": 0,
-      "value": "Count"
+      "value": "Колькасць"
     }
   ],
   "label.countries": [
@@ -194,61 +194,61 @@
   "label.country": [
     {
       "type": 0,
-      "value": "Country"
+      "value": "Краіна"
     }
   ],
   "label.create": [
     {
       "type": 0,
-      "value": "Create"
+      "value": "Стварыць"
     }
   ],
   "label.create-report": [
     {
       "type": 0,
-      "value": "Create report"
+      "value": "Стварыць справаздачу"
     }
   ],
   "label.create-team": [
     {
       "type": 0,
-      "value": "Create team"
+      "value": "Стварыць каманду"
     }
   ],
   "label.create-user": [
     {
       "type": 0,
-      "value": "Create user"
+      "value": "Стварыць карыстальніка"
     }
   ],
   "label.created": [
     {
       "type": 0,
-      "value": "Created"
+      "value": "Створана"
     }
   ],
   "label.created-by": [
     {
       "type": 0,
-      "value": "Created By"
+      "value": "Створана"
     }
   ],
   "label.current": [
     {
       "type": 0,
-      "value": "Current"
+      "value": "Цяперашні"
     }
   ],
   "label.current-password": [
     {
       "type": 0,
-      "value": "Бягучы пароль"
+      "value": "Цяперашні пароль"
     }
   ],
   "label.custom-range": [
     {
       "type": 0,
-      "value": "Карыстацкі дыяпазон"
+      "value": "Іншы дыяпазон"
     }
   ],
   "label.dashboard": [
@@ -260,13 +260,13 @@
   "label.data": [
     {
       "type": 0,
-      "value": "Data"
+      "value": "Дадзеныя"
     }
   ],
   "label.date": [
     {
       "type": 0,
-      "value": "Date"
+      "value": "Дата"
     }
   ],
   "label.date-range": [
@@ -278,7 +278,7 @@
   "label.day": [
     {
       "type": 0,
-      "value": "Day"
+      "value": "Дзень"
     }
   ],
   "label.default-date-range": [
@@ -296,19 +296,19 @@
   "label.delete-report": [
     {
       "type": 0,
-      "value": "Delete report"
+      "value": "Выдаліць справаздачу"
     }
   ],
   "label.delete-team": [
     {
       "type": 0,
-      "value": "Delete team"
+      "value": "Выдаліць каманду"
     }
   ],
   "label.delete-user": [
     {
       "type": 0,
-      "value": "Delete user"
+      "value": "Выдаліць карыстальніка"
     }
   ],
   "label.delete-website": [
@@ -320,7 +320,7 @@
   "label.description": [
     {
       "type": 0,
-      "value": "Description"
+      "value": "Апісанне"
     }
   ],
   "label.desktop": [
@@ -332,13 +332,13 @@
   "label.details": [
     {
       "type": 0,
-      "value": "Details"
+      "value": "Дэталі"
     }
   ],
   "label.device": [
     {
       "type": 0,
-      "value": "Device"
+      "value": "Прылада"
     }
   ],
   "label.devices": [
@@ -350,13 +350,13 @@
   "label.dismiss": [
     {
       "type": 0,
-      "value": "Адмена"
+      "value": "Адхіліць"
     }
   ],
   "label.does-not-contain": [
     {
       "type": 0,
-      "value": "Does not contain"
+      "value": "Не ўключае"
     }
   ],
   "label.domain": [
@@ -368,7 +368,7 @@
   "label.dropoff": [
     {
       "type": 0,
-      "value": "Dropoff"
+      "value": "Адмовы"
     }
   ],
   "label.edit": [
@@ -386,7 +386,7 @@
   "label.edit-member": [
     {
       "type": 0,
-      "value": "Edit member"
+      "value": "Рэдагаваць удзельніка"
     }
   ],
   "label.enable-share-url": [
@@ -398,25 +398,25 @@
   "label.end-step": [
     {
       "type": 0,
-      "value": "End Step"
+      "value": "Канчатковы крок"
     }
   ],
   "label.entry": [
     {
       "type": 0,
-      "value": "Entry URL"
+      "value": "URL уваходу"
     }
   ],
   "label.event": [
     {
       "type": 0,
-      "value": "Event"
+      "value": "Падзея"
     }
   ],
   "label.event-data": [
     {
       "type": 0,
-      "value": "Event data"
+      "value": "Дадзеныя падзеі"
     }
   ],
   "label.events": [
@@ -428,37 +428,37 @@
   "label.exit": [
     {
       "type": 0,
-      "value": "Exit URL"
+      "value": "URL выхаду"
     }
   ],
   "label.false": [
     {
       "type": 0,
-      "value": "False"
+      "value": "Ложна"
     }
   ],
   "label.field": [
     {
       "type": 0,
-      "value": "Field"
+      "value": "Поле"
     }
   ],
   "label.fields": [
     {
       "type": 0,
-      "value": "Fields"
+      "value": "Палі"
     }
   ],
   "label.filter": [
     {
       "type": 0,
-      "value": "Filter"
+      "value": "Фільтр"
     }
   ],
   "label.filter-combined": [
     {
       "type": 0,
-      "value": "Камбініаваны"
+      "value": "Камбініраваны"
     }
   ],
   "label.filter-raw": [
@@ -470,121 +470,121 @@
   "label.filters": [
     {
       "type": 0,
-      "value": "Filters"
+      "value": "Фільтры"
     }
   ],
   "label.funnel": [
     {
       "type": 0,
-      "value": "Funnel"
+      "value": "Варонка"
     }
   ],
   "label.funnel-description": [
     {
       "type": 0,
-      "value": "Understand the conversion and drop-off rate of users."
+      "value": "Разумець паказчыкі канверсіі і адмоваў."
     }
   ],
   "label.goal": [
     {
       "type": 0,
-      "value": "Goal"
+      "value": "Мэта"
     }
   ],
   "label.goals": [
     {
       "type": 0,
-      "value": "Goals"
+      "value": "Мэты"
     }
   ],
   "label.goals-description": [
     {
       "type": 0,
-      "value": "Track your goals for pageviews and events."
+      "value": "Сачыць за мэтамі па праглядах старонак і падзеях."
     }
   ],
   "label.greater-than": [
     {
       "type": 0,
-      "value": "Greater than"
+      "value": "Больш чым"
     }
   ],
   "label.greater-than-equals": [
     {
       "type": 0,
-      "value": "Greater than or equals"
+      "value": "Больш чым або роўна"
     }
   ],
   "label.host": [
     {
       "type": 0,
-      "value": "Host"
+      "value": "Хост"
     }
   ],
   "label.hosts": [
     {
       "type": 0,
-      "value": "Hosts"
+      "value": "Хасты"
     }
   ],
   "label.insights": [
     {
       "type": 0,
-      "value": "Insights"
+      "value": "Інсайты"
     }
   ],
   "label.insights-description": [
     {
       "type": 0,
-      "value": "Dive deeper into your data by using segments and filters."
+      "value": "Даследваць дадзеныя з дапамогай сегментаў і фільтраў."
     }
   ],
   "label.is": [
     {
       "type": 0,
-      "value": "Is"
+      "value": "З'яўляецца"
     }
   ],
   "label.is-not": [
     {
       "type": 0,
-      "value": "Is not"
+      "value": "Не з'яўляецца"
     }
   ],
   "label.is-not-set": [
     {
       "type": 0,
-      "value": "Is not set"
+      "value": "Не ўстаноўлена"
     }
   ],
   "label.is-set": [
     {
       "type": 0,
-      "value": "Is set"
+      "value": "Устаноўлена"
     }
   ],
   "label.join": [
     {
       "type": 0,
-      "value": "Join"
+      "value": "Далучыцца"
     }
   ],
   "label.join-team": [
     {
       "type": 0,
-      "value": "Join team"
+      "value": "Далучыцца да каманды"
     }
   ],
   "label.journey": [
     {
       "type": 0,
-      "value": "Journey"
+      "value": "Маршрут карыстальніка"
     }
   ],
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users navigate through your website."
+      "value": "Разумець як карыстальнікі навігуюць па сайце."
     }
   ],
   "label.language": [
@@ -616,7 +616,7 @@
     },
     {
       "type": 0,
-      "value": " дні"
+      "value": " дзён"
     }
   ],
   "label.last-hours": [
@@ -636,7 +636,7 @@
   "label.last-months": [
     {
       "type": 0,
-      "value": "Last "
+      "value": "Апошнія "
     },
     {
       "type": 1,
@@ -644,37 +644,37 @@
     },
     {
       "type": 0,
-      "value": " months"
+      "value": " месяцаў"
     }
   ],
   "label.leave": [
     {
       "type": 0,
-      "value": "Leave"
+      "value": "Пакінуць"
     }
   ],
   "label.leave-team": [
     {
       "type": 0,
-      "value": "Leave team"
+      "value": "Пакінуць каманду"
     }
   ],
   "label.less-than": [
     {
       "type": 0,
-      "value": "Less than"
+      "value": "Менш чым"
     }
   ],
   "label.less-than-equals": [
     {
       "type": 0,
-      "value": "Less than or equals"
+      "value": "Менш чым або роўна"
     }
   ],
   "label.login": [
     {
       "type": 0,
-      "value": "Login"
+      "value": "Увайсці"
     }
   ],
   "label.logout": [
@@ -686,37 +686,37 @@
   "label.manage": [
     {
       "type": 0,
-      "value": "Manage"
+      "value": "Кіраваць"
     }
   ],
   "label.manager": [
     {
       "type": 0,
-      "value": "Manager"
+      "value": "Кіраўнік"
     }
   ],
   "label.max": [
     {
       "type": 0,
-      "value": "Max"
+      "value": "Максімум"
     }
   ],
   "label.member": [
     {
       "type": 0,
-      "value": "Member"
+      "value": "Удзельнік"
     }
   ],
   "label.members": [
     {
       "type": 0,
-      "value": "Members"
+      "value": "Удзельнікі"
     }
   ],
   "label.min": [
     {
       "type": 0,
-      "value": "Min"
+      "value": "Мінімум"
     }
   ],
   "label.mobile": [
@@ -734,13 +734,13 @@
   "label.my-account": [
     {
       "type": 0,
-      "value": "My account"
+      "value": "Мой уліковы запіс"
     }
   ],
   "label.my-websites": [
     {
       "type": 0,
-      "value": "My websites"
+      "value": "Мае сайты"
     }
   ],
   "label.name": [
@@ -777,7 +777,7 @@
           "value": [
             {
               "type": 0,
-              "value": "record"
+              "value": "запіс"
             }
           ]
         },
@@ -785,7 +785,7 @@
           "value": [
             {
               "type": 0,
-              "value": "records"
+              "value": "запісаў"
             }
           ]
         }
@@ -798,19 +798,19 @@
   "label.ok": [
     {
       "type": 0,
-      "value": "OK"
+      "value": "ОК"
     }
   ],
   "label.os": [
     {
       "type": 0,
-      "value": "OS"
+      "value": "Аперацыйная сістэма"
     }
   ],
   "label.overview": [
     {
       "type": 0,
-      "value": "Overview"
+      "value": "Агляд"
     }
   ],
   "label.owner": [
@@ -822,7 +822,7 @@
   "label.page-of": [
     {
       "type": 0,
-      "value": "Page "
+      "value": "Старонка "
     },
     {
       "type": 1,
@@ -830,7 +830,7 @@
     },
     {
       "type": 0,
-      "value": " of "
+      "value": " з "
     },
     {
       "type": 1,
@@ -846,7 +846,7 @@
   "label.pageTitle": [
     {
       "type": 0,
-      "value": "Page title"
+      "value": "Загаловак старонкі"
     }
   ],
   "label.pages": [
@@ -874,19 +874,19 @@
   "label.previous": [
     {
       "type": 0,
-      "value": "Previous"
+      "value": "Папярэдні"
     }
   ],
   "label.previous-period": [
     {
       "type": 0,
-      "value": "Previous period"
+      "value": "Папярэдні перыяд"
     }
   ],
   "label.previous-year": [
     {
       "type": 0,
-      "value": "Previous year"
+      "value": "Папярэдні год"
     }
   ],
   "label.profile": [
@@ -898,25 +898,25 @@
   "label.property": [
     {
       "type": 0,
-      "value": "Property"
+      "value": "Уласцівасць"
     }
   ],
   "label.queries": [
     {
       "type": 0,
-      "value": "Queries"
+      "value": "Запыты"
     }
   ],
   "label.query": [
     {
       "type": 0,
-      "value": "Query"
+      "value": "Запыт"
     }
   ],
   "label.query-parameters": [
     {
       "type": 0,
-      "value": "Query parameters"
+      "value": "Параметры запыту"
     }
   ],
   "label.realtime": [
@@ -928,13 +928,13 @@
   "label.referrer": [
     {
       "type": 0,
-      "value": "Referrer"
+      "value": "Рэферэр"
     }
   ],
   "label.referrers": [
     {
       "type": 0,
-      "value": "Referrers"
+      "value": "Рэферэры"
     }
   ],
   "label.refresh": [
@@ -946,37 +946,37 @@
   "label.regenerate": [
     {
       "type": 0,
-      "value": "Regenerate"
+      "value": "Рэгенераваць"
     }
   ],
   "label.region": [
     {
       "type": 0,
-      "value": "Region"
+      "value": "Рэгіён"
     }
   ],
   "label.regions": [
     {
       "type": 0,
-      "value": "Regions"
+      "value": "Рэгіёны"
     }
   ],
   "label.remove": [
     {
       "type": 0,
-      "value": "Remove"
+      "value": "Выдаліць"
     }
   ],
   "label.remove-member": [
     {
       "type": 0,
-      "value": "Remove member"
+      "value": "Выдаліць удзельніка"
     }
   ],
   "label.reports": [
     {
       "type": 0,
-      "value": "Reports"
+      "value": "Справаздачы"
     }
   ],
   "label.required": [
@@ -1000,25 +1000,25 @@
   "label.retention": [
     {
       "type": 0,
-      "value": "Retention"
+      "value": "Утрыманне"
     }
   ],
   "label.retention-description": [
     {
       "type": 0,
-      "value": "Measure your website stickiness by tracking how often users return."
+      "value": "Ацаніць прыцягальнасць сайта, адсочваючы павяртанні карыстальнікаў."
     }
   ],
   "label.role": [
     {
       "type": 0,
-      "value": "Role"
+      "value": "Роля"
     }
   ],
   "label.run-query": [
     {
       "type": 0,
-      "value": "Run query"
+      "value": "Запусціць запыт"
     }
   ],
   "label.save": [
@@ -1036,37 +1036,37 @@
   "label.search": [
     {
       "type": 0,
-      "value": "Search"
+      "value": "Пошук"
     }
   ],
   "label.select": [
     {
       "type": 0,
-      "value": "Select"
+      "value": "Выбраць"
     }
   ],
   "label.select-date": [
     {
       "type": 0,
-      "value": "Select date"
+      "value": "Выбраць дату"
     }
   ],
   "label.select-role": [
     {
       "type": 0,
-      "value": "Select role"
+      "value": "Выбраць ролю"
     }
   ],
   "label.select-website": [
     {
       "type": 0,
-      "value": "Select website"
+      "value": "Выбраць сайт"
     }
   ],
   "label.sessions": [
     {
       "type": 0,
-      "value": "Sessions"
+      "value": "Сесіі"
     }
   ],
   "label.settings": [
@@ -1090,19 +1090,19 @@
   "label.start-step": [
     {
       "type": 0,
-      "value": "Start Step"
+      "value": "Першы кроку"
     }
   ],
   "label.steps": [
     {
       "type": 0,
-      "value": "Steps"
+      "value": "Крокі"
     }
   ],
   "label.sum": [
     {
       "type": 0,
-      "value": "Sum"
+      "value": "Сума"
     }
   ],
   "label.tablet": [
@@ -1114,55 +1114,55 @@
   "label.team": [
     {
       "type": 0,
-      "value": "Team"
+      "value": "Каманда"
     }
   ],
   "label.team-id": [
     {
       "type": 0,
-      "value": "Team ID"
+      "value": "Ідэнтыфікатар каманды"
     }
   ],
   "label.team-manager": [
     {
       "type": 0,
-      "value": "Team manager"
+      "value": "Кіраўнік каманды"
     }
   ],
   "label.team-member": [
     {
       "type": 0,
-      "value": "Team member"
+      "value": "Удзельнік каманды"
     }
   ],
   "label.team-name": [
     {
       "type": 0,
-      "value": "Team name"
+      "value": "Назва каманды"
     }
   ],
   "label.team-owner": [
     {
       "type": 0,
-      "value": "Team owner"
+      "value": "Уласнік каманды"
     }
   ],
   "label.team-view-only": [
     {
       "type": 0,
-      "value": "Team view only"
+      "value": "Толькі для каманднага прагляду"
     }
   ],
   "label.team-websites": [
     {
       "type": 0,
-      "value": "Team websites"
+      "value": "Сайты каманды"
     }
   ],
   "label.teams": [
     {
       "type": 0,
-      "value": "Teams"
+      "value": "Каманды"
     }
   ],
   "label.theme": [
@@ -1192,13 +1192,13 @@
   "label.timezone": [
     {
       "type": 0,
-      "value": "Таймзона"
+      "value": "Часавы пояс"
     }
   ],
   "label.title": [
     {
       "type": 0,
-      "value": "Title"
+      "value": "Загаловак"
     }
   ],
   "label.today": [
@@ -1216,13 +1216,13 @@
   "label.total": [
     {
       "type": 0,
-      "value": "Total"
+      "value": "Агульная колькасць"
     }
   ],
   "label.total-records": [
     {
       "type": 0,
-      "value": "Total records"
+      "value": "Агульная колькасць запісаў"
     }
   ],
   "label.tracking-code": [
@@ -1234,31 +1234,31 @@
   "label.transfer": [
     {
       "type": 0,
-      "value": "Transfer"
+      "value": "Перадаць"
     }
   ],
   "label.transfer-website": [
     {
       "type": 0,
-      "value": "Transfer website"
+      "value": "Перадаць сайт"
     }
   ],
   "label.true": [
     {
       "type": 0,
-      "value": "True"
+      "value": "Ісціна"
     }
   ],
   "label.type": [
     {
       "type": 0,
-      "value": "Type"
+      "value": "Тып"
     }
   ],
   "label.unique": [
     {
       "type": 0,
-      "value": "Unique"
+      "value": "Унікальны"
     }
   ],
   "label.unique-visitors": [
@@ -1276,13 +1276,13 @@
   "label.untitled": [
     {
       "type": 0,
-      "value": "Untitled"
+      "value": "Без назвы"
     }
   ],
   "label.update": [
     {
       "type": 0,
-      "value": "Update"
+      "value": "Абнавіць"
     }
   ],
   "label.url": [
@@ -1300,7 +1300,7 @@
   "label.user": [
     {
       "type": 0,
-      "value": "User"
+      "value": "Карыстальнік"
     }
   ],
   "label.username": [
@@ -1312,7 +1312,7 @@
   "label.users": [
     {
       "type": 0,
-      "value": "Users"
+      "value": "Карыстальнікі"
     }
   ],
   "label.utm": [
@@ -1324,31 +1324,31 @@
   "label.utm-description": [
     {
       "type": 0,
-      "value": "Track your campaigns through UTM parameters."
+      "value": "Сачыць за кампаніямі з дапамогай UTM-метак."
     }
   ],
   "label.value": [
     {
       "type": 0,
-      "value": "Value"
+      "value": "Значэнне"
     }
   ],
   "label.view": [
     {
       "type": 0,
-      "value": "View"
+      "value": "Паглядзець"
     }
   ],
   "label.view-details": [
     {
       "type": 0,
-      "value": "Пабачыць дэталі"
+      "value": "Паглядзець дэталі"
     }
   ],
   "label.view-only": [
     {
       "type": 0,
-      "value": "View only"
+      "value": "Толькі прагляд"
     }
   ],
   "label.views": [
@@ -1360,7 +1360,7 @@
   "label.views-per-visit": [
     {
       "type": 0,
-      "value": "Views per visit"
+      "value": "Прагляды за наведванне"
     }
   ],
   "label.visit-duration": [
@@ -1378,19 +1378,19 @@
   "label.visits": [
     {
       "type": 0,
-      "value": "Visits"
+      "value": "Наведванні"
     }
   ],
   "label.website": [
     {
       "type": 0,
-      "value": "Website"
+      "value": "Сайт"
     }
   ],
   "label.website-id": [
     {
       "type": 0,
-      "value": "Website ID"
+      "value": "Ідэнтыфікатар сайта"
     }
   ],
   "label.websites": [
@@ -1402,7 +1402,7 @@
   "label.window": [
     {
       "type": 0,
-      "value": "Window"
+      "value": "Вакно"
     }
   ],
   "label.yesterday": [
@@ -1414,7 +1414,7 @@
   "message.action-confirmation": [
     {
       "type": 0,
-      "value": "Type "
+      "value": "Увядзіце "
     },
     {
       "type": 1,
@@ -1422,7 +1422,7 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " у поле ніжэй, каб пацвердзіць."
     }
   ],
   "message.active-users": [
@@ -1432,7 +1432,7 @@
     },
     {
       "type": 0,
-      "value": " тякучых "
+      "value": " цякучых "
     },
     {
       "offset": 0,
@@ -1462,7 +1462,7 @@
   "message.collected-data": [
     {
       "type": 0,
-      "value": "Collected data"
+      "value": "Сабраныя дадзеныя"
     }
   ],
   "message.confirm-delete": [
@@ -1482,7 +1482,7 @@
   "message.confirm-leave": [
     {
       "type": 0,
-      "value": "Are you sure you want to leave "
+      "value": "Вы дакладна хочаце пакінуць "
     },
     {
       "type": 1,
@@ -1496,7 +1496,7 @@
   "message.confirm-remove": [
     {
       "type": 0,
-      "value": "Are you sure you want to remove "
+      "value": "Вы дакладна хочаце выдаліць "
     },
     {
       "type": 1,
@@ -1524,7 +1524,7 @@
   "message.delete-team-warning": [
     {
       "type": 0,
-      "value": "Deleting a team will also delete all team websites."
+      "value": "Выдаленне каманды таксама выдаліць усе сайты каманды."
     }
   ],
   "message.delete-website-warning": [
@@ -1546,7 +1546,7 @@
     },
     {
       "type": 0,
-      "value": " on "
+      "value": " на "
     },
     {
       "type": 1,
@@ -1562,7 +1562,7 @@
   "message.incorrect-username-password": [
     {
       "type": 0,
-      "value": "Некарэктны username/password."
+      "value": "Некарэктнае імя карыстальніка/пароль."
     }
   ],
   "message.invalid-domain": [
@@ -1574,7 +1574,7 @@
   "message.min-password-length": [
     {
       "type": 0,
-      "value": "Minimum length of "
+      "value": "Мінімальная даўжыня "
     },
     {
       "type": 1,
@@ -1582,13 +1582,13 @@
     },
     {
       "type": 0,
-      "value": " characters"
+      "value": " знакаў"
     }
   ],
   "message.new-version-available": [
     {
       "type": 0,
-      "value": "A new version of Umami "
+      "value": "Даступная новая версія Umami "
     },
     {
       "type": 1,
@@ -1596,7 +1596,7 @@
     },
     {
       "type": 0,
-      "value": " is available!"
+      "value": "!"
     }
   ],
   "message.no-data-available": [
@@ -1608,7 +1608,7 @@
   "message.no-event-data": [
     {
       "type": 0,
-      "value": "No event data is available."
+      "value": "Дадзеныя падзеі недаступныя."
     }
   ],
   "message.no-match-password": [
@@ -1620,31 +1620,31 @@
   "message.no-results-found": [
     {
       "type": 0,
-      "value": "No results were found."
+      "value": "Вынікаў не знойдзена."
     }
   ],
   "message.no-team-websites": [
     {
       "type": 0,
-      "value": "This team does not have any websites."
+      "value": "Гэтая каманда не мае ніводнага сайта."
     }
   ],
   "message.no-teams": [
     {
       "type": 0,
-      "value": "You have not created any teams."
+      "value": "Вы не стварылі ніводнай каманды."
     }
   ],
   "message.no-users": [
     {
       "type": 0,
-      "value": "There are no users."
+      "value": "Няма карыстальнікаў."
     }
   ],
   "message.no-websites-configured": [
     {
       "type": 0,
-      "value": "Вы не наладзілі ніводнага сайту."
+      "value": "Вы не наладзілі ніводнага сайта."
     }
   ],
   "message.page-not-found": [
@@ -1656,7 +1656,7 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "To reset this website, type "
+      "value": "Каб скінуць гэты сайт, увядзіце "
     },
     {
       "type": 1,
@@ -1664,13 +1664,13 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " у поле ніжэй для пацверджання."
     }
   ],
   "message.reset-website-warning": [
     {
       "type": 0,
-      "value": "Уся статыстыка для гэтага сайту будзе выдалена, але код адсочвання будзе працягваць працаваць."
+      "value": "Уся статыстыка для гэтага сайта будзе выдалена, але код адсочвання будзе працягваць працаваць."
     }
   ],
   "message.saved": [
@@ -1696,19 +1696,19 @@
   "message.team-already-member": [
     {
       "type": 0,
-      "value": "You are already a member of the team."
+      "value": "Вы ўжо ўдзельнік каманды."
     }
   ],
   "message.team-not-found": [
     {
       "type": 0,
-      "value": "Team not found."
+      "value": "Каманда не знойдзена."
     }
   ],
   "message.team-websites-info": [
     {
       "type": 0,
-      "value": "Websites can be viewed by anyone on the team."
+      "value": "Сайты могуць быць праглядацца любым удзельнікам каманды."
     }
   ],
   "message.tracking-code": [
@@ -1720,37 +1720,37 @@
   "message.transfer-team-website-to-user": [
     {
       "type": 0,
-      "value": "Transfer this website to your account?"
+      "value": "Перадаць гэты сайт на ваш уліковы запіс?"
     }
   ],
   "message.transfer-user-website-to-team": [
     {
       "type": 0,
-      "value": "Select the team to transfer this website to."
+      "value": "Выберыце каманду для перадачы гэтага сайта."
     }
   ],
   "message.transfer-website": [
     {
       "type": 0,
-      "value": "Transfer website ownership to your account or another team."
+      "value": "Перадача сайта на ваш уліковы запіс або іншай камандзе."
     }
   ],
   "message.triggered-event": [
     {
       "type": 0,
-      "value": "Triggered event"
+      "value": "Падзея якая спрацавала"
     }
   ],
   "message.user-deleted": [
     {
       "type": 0,
-      "value": "User deleted."
+      "value": "Карыстальнік выдалены."
     }
   ],
   "message.viewed-page": [
     {
       "type": 0,
-      "value": "Viewed page"
+      "value": "Праглядзеў старонку"
     }
   ],
   "message.visitor-log": [
@@ -1790,7 +1790,7 @@
   "message.visitors-dropped-off": [
     {
       "type": 0,
-      "value": "Visitors dropped off"
+      "value": "Наведвальнікі сышлі"
     }
   ]
 }
diff --git a/public/intl/messages/de-DE.json b/public/intl/messages/de-DE.json
index a7d1f1ab60..713238bc75 100644
--- a/public/intl/messages/de-DE.json
+++ b/public/intl/messages/de-DE.json
@@ -74,7 +74,7 @@
   "label.analytics": [
     {
       "type": 0,
-      "value": "Analytics"
+      "value": "Analysen"
     }
   ],
   "label.average": [
@@ -152,7 +152,7 @@
   "label.compare": [
     {
       "type": 0,
-      "value": "Vergleich"
+      "value": "Vergleichen"
     }
   ],
   "label.confirm": [
@@ -368,7 +368,7 @@
   "label.dropoff": [
     {
       "type": 0,
-      "value": "Dropoff"
+      "value": "Absprung"
     }
   ],
   "label.edit": [
@@ -398,13 +398,13 @@
   "label.end-step": [
     {
       "type": 0,
-      "value": "Schritt beenden"
+      "value": "Schlussschritt"
     }
   ],
   "label.entry": [
     {
       "type": 0,
-      "value": "Entry URL"
+      "value": "Eintrags-URL"
     }
   ],
   "label.event": [
@@ -428,7 +428,7 @@
   "label.exit": [
     {
       "type": 0,
-      "value": "Exit URL"
+      "value": "Ausgangs-URL"
     }
   ],
   "label.false": [
@@ -482,7 +482,7 @@
   "label.funnel-description": [
     {
       "type": 0,
-      "value": "Verstehe die Konversions- und Dropoffrate von Nutzern."
+      "value": "Verstehe die Konversions- und Abbruchrate der Nutzer."
     }
   ],
   "label.goal": [
@@ -500,7 +500,7 @@
   "label.goals-description": [
     {
       "type": 0,
-      "value": "Verfolgen Sie Ihre Ziele für Aufrufe und Events."
+      "value": "Verfolgen Sie Ihre Ziele für Seitenaufrufe und Ereignisse."
     }
   ],
   "label.greater-than": [
@@ -530,13 +530,13 @@
   "label.insights": [
     {
       "type": 0,
-      "value": "Insights"
+      "value": "Einblicke"
     }
   ],
   "label.insights-description": [
     {
       "type": 0,
-      "value": "Tauchen Sie tiefer in Ihre Daten mit Filtern und Segmenten ein."
+      "value": "Vertiefen Sie Ihre Daten mit Hilfe von Segmenten und Filtern."
     }
   ],
   "label.is": [
@@ -578,13 +578,13 @@
   "label.journey": [
     {
       "type": 0,
-      "value": "Journey"
+      "value": "Reise"
     }
   ],
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Verstehen Sie, wie Nutzer Ihre Website navigieren."
+      "value": "Verstehe, wie Nutzer auf der Webseite navigieren"
     }
   ],
   "label.language": [
@@ -608,7 +608,7 @@
   "label.last-days": [
     {
       "type": 0,
-      "value": "Letzte "
+      "value": "Letzten "
     },
     {
       "type": 1,
@@ -622,7 +622,7 @@
   "label.last-hours": [
     {
       "type": 0,
-      "value": "Letzte "
+      "value": "Letzten "
     },
     {
       "type": 1,
@@ -636,7 +636,7 @@
   "label.last-months": [
     {
       "type": 0,
-      "value": "Last "
+      "value": "Letzten "
     },
     {
       "type": 1,
@@ -644,7 +644,7 @@
     },
     {
       "type": 0,
-      "value": " months"
+      "value": " Monate"
     }
   ],
   "label.leave": [
@@ -692,7 +692,7 @@
   "label.manager": [
     {
       "type": 0,
-      "value": "Manager"
+      "value": "Verwaltung"
     }
   ],
   "label.max": [
@@ -734,13 +734,13 @@
   "label.my-account": [
     {
       "type": 0,
-      "value": "Mein Konto"
+      "value": "Mein Account"
     }
   ],
   "label.my-websites": [
     {
       "type": 0,
-      "value": "Meine Websites"
+      "value": "Meine Webseiten"
     }
   ],
   "label.name": [
@@ -874,13 +874,13 @@
   "label.previous": [
     {
       "type": 0,
-      "value": "Vorherige"
+      "value": "Vorheriges"
     }
   ],
   "label.previous-period": [
     {
       "type": 0,
-      "value": "Vorheriger Zeitraum"
+      "value": "Vorherige Periode"
     }
   ],
   "label.previous-year": [
@@ -898,7 +898,7 @@
   "label.property": [
     {
       "type": 0,
-      "value": "Besitz"
+      "value": "Eigentum"
     }
   ],
   "label.queries": [
@@ -1000,13 +1000,13 @@
   "label.retention": [
     {
       "type": 0,
-      "value": "Retention"
+      "value": "Bewahrung"
     }
   ],
   "label.retention-description": [
     {
       "type": 0,
-      "value": "Messen Sie die Presenz Ihrer Website, indem Sie tracken wie oft Nutzer zurückkehren."
+      "value": "Messen Sie die Verweildauer auf Ihrer Website, indem Sie verfolgen, wie oft die Nutzer zurückkehren."
     }
   ],
   "label.role": [
@@ -1060,7 +1060,7 @@
   "label.select-website": [
     {
       "type": 0,
-      "value": "Website auswählen"
+      "value": "Webseite auswählen"
     }
   ],
   "label.sessions": [
@@ -1090,7 +1090,7 @@
   "label.start-step": [
     {
       "type": 0,
-      "value": "Schritt starten"
+      "value": "Startschritt"
     }
   ],
   "label.steps": [
@@ -1150,7 +1150,7 @@
   "label.team-view-only": [
     {
       "type": 0,
-      "value": "Team view only"
+      "value": "Nur für Team sichtbar"
     }
   ],
   "label.team-websites": [
@@ -1324,7 +1324,7 @@
   "label.utm-description": [
     {
       "type": 0,
-      "value": "Tracken Sie Ihre Kampagnen mit Hilfe von UTM Parametern."
+      "value": "Tracke deine Kampagnen mit UTM parameterns."
     }
   ],
   "label.value": [
@@ -1384,19 +1384,19 @@
   "label.website": [
     {
       "type": 0,
-      "value": "Website"
+      "value": "Webseite"
     }
   ],
   "label.website-id": [
     {
       "type": 0,
-      "value": "Website ID"
+      "value": "Webseiten-ID"
     }
   ],
   "label.websites": [
     {
       "type": 0,
-      "value": "Websites"
+      "value": "Webseiten"
     }
   ],
   "label.window": [
@@ -1414,7 +1414,7 @@
   "message.action-confirmation": [
     {
       "type": 0,
-      "value": "Tippen Sie "
+      "value": "Schreibe "
     },
     {
       "type": 1,
@@ -1422,7 +1422,7 @@
     },
     {
       "type": 0,
-      "value": " in das untenliegende Feld, um zu bestätigen."
+      "value": " in die Box zur bestätigung."
     }
   ],
   "message.active-users": [
@@ -1496,7 +1496,7 @@
   "message.confirm-remove": [
     {
       "type": 0,
-      "value": "Sind Sie sicher, dass Sie "
+      "value": "Sind Sie sicher, "
     },
     {
       "type": 1,
@@ -1504,7 +1504,7 @@
     },
     {
       "type": 0,
-      "value": " entfernen möchten?"
+      "value": " zu entfernen?"
     }
   ],
   "message.confirm-reset": [
@@ -1524,7 +1524,7 @@
   "message.delete-team-warning": [
     {
       "type": 0,
-      "value": "Alle zugehörigen Websiten werden ebenfalls gelöscht."
+      "value": "Ein Team zu löschen, wird auch alle Team-Webseiten löschen."
     }
   ],
   "message.delete-website-warning": [
@@ -1708,25 +1708,25 @@
   "message.transfer-team-website-to-user": [
     {
       "type": 0,
-      "value": "Möchten Sie diese Website auf Ihr Konto übertragen?"
+      "value": "Diese Webseite zu deinem Account transferieren?"
     }
   ],
   "message.transfer-user-website-to-team": [
     {
       "type": 0,
-      "value": "Wählen Sie das Team, auf das die Website übertragen wird."
+      "value": "Wähle ein Team aus, zu dem die Webseite transferiert werden soll."
     }
   ],
   "message.transfer-website": [
     {
       "type": 0,
-      "value": "Übertragen Sie den Besitz der Website auf Ihren Account oder ein anderes Team."
+      "value": "Übertrage die Eigentümerrechte zu deinem Account oder einem anderen Team."
     }
   ],
   "message.triggered-event": [
     {
       "type": 0,
-      "value": "Event ausgelöst"
+      "value": "Ausgelöstes Event"
     }
   ],
   "message.user-deleted": [
@@ -1738,7 +1738,7 @@
   "message.viewed-page": [
     {
       "type": 0,
-      "value": "Seite besucht"
+      "value": "Besuchte Seite"
     }
   ],
   "message.visitor-log": [
@@ -1778,7 +1778,7 @@
   "message.visitors-dropped-off": [
     {
       "type": 0,
-      "value": "Besucher haben die Seite verlassen"
+      "value": "Besucherverlust"
     }
   ]
 }
diff --git a/public/intl/messages/es-ES.json b/public/intl/messages/es-ES.json
index 496fabc664..825877e4fa 100644
--- a/public/intl/messages/es-ES.json
+++ b/public/intl/messages/es-ES.json
@@ -38,7 +38,7 @@
   "label.add-step": [
     {
       "type": 0,
-      "value": "Add step"
+      "value": "Añadir paso"
     }
   ],
   "label.add-website": [
@@ -152,7 +152,7 @@
   "label.compare": [
     {
       "type": 0,
-      "value": "Compare"
+      "value": "Comparar"
     }
   ],
   "label.confirm": [
@@ -182,7 +182,7 @@
   "label.count": [
     {
       "type": 0,
-      "value": "Count"
+      "value": "Contar"
     }
   ],
   "label.countries": [
@@ -230,13 +230,13 @@
   "label.created-by": [
     {
       "type": 0,
-      "value": "Created By"
+      "value": "Creado por"
     }
   ],
   "label.current": [
     {
       "type": 0,
-      "value": "Current"
+      "value": "Actual"
     }
   ],
   "label.current-password": [
@@ -386,7 +386,7 @@
   "label.edit-member": [
     {
       "type": 0,
-      "value": "Edit member"
+      "value": "Editar miembro"
     }
   ],
   "label.enable-share-url": [
@@ -398,13 +398,13 @@
   "label.end-step": [
     {
       "type": 0,
-      "value": "End Step"
+      "value": "Paso final"
     }
   ],
   "label.entry": [
     {
       "type": 0,
-      "value": "Entry URL"
+      "value": "URL de entrada"
     }
   ],
   "label.event": [
@@ -428,7 +428,7 @@
   "label.exit": [
     {
       "type": 0,
-      "value": "Exit URL"
+      "value": "URL de salida"
     }
   ],
   "label.false": [
@@ -476,7 +476,7 @@
   "label.funnel": [
     {
       "type": 0,
-      "value": "Funnel"
+      "value": "Embudo"
     }
   ],
   "label.funnel-description": [
@@ -488,19 +488,19 @@
   "label.goal": [
     {
       "type": 0,
-      "value": "Goal"
+      "value": "Objetivo"
     }
   ],
   "label.goals": [
     {
       "type": 0,
-      "value": "Goals"
+      "value": "Objetivos"
     }
   ],
   "label.goals-description": [
     {
       "type": 0,
-      "value": "Track your goals for pageviews and events."
+      "value": "Realice un seguimiento de sus objetivos de páginas vistas y eventos."
     }
   ],
   "label.greater-than": [
@@ -578,13 +578,13 @@
   "label.journey": [
     {
       "type": 0,
-      "value": "Journey"
+      "value": "Viaje"
     }
   ],
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users navigate through your website."
+      "value": "Comprenda cómo los usuarios navegan por su sitio web."
     }
   ],
   "label.language": [
@@ -636,7 +636,7 @@
   "label.last-months": [
     {
       "type": 0,
-      "value": "Last "
+      "value": "Últimos "
     },
     {
       "type": 1,
@@ -644,7 +644,7 @@
     },
     {
       "type": 0,
-      "value": " months"
+      "value": " meses"
     }
   ],
   "label.leave": [
@@ -698,7 +698,7 @@
   "label.max": [
     {
       "type": 0,
-      "value": "Máx"
+      "value": "Max"
     }
   ],
   "label.member": [
@@ -716,7 +716,7 @@
   "label.min": [
     {
       "type": 0,
-      "value": "Mín"
+      "value": "Min"
     }
   ],
   "label.mobile": [
@@ -874,19 +874,19 @@
   "label.previous": [
     {
       "type": 0,
-      "value": "Previous"
+      "value": "Anterior"
     }
   ],
   "label.previous-period": [
     {
       "type": 0,
-      "value": "Previous period"
+      "value": "Periodo anterior"
     }
   ],
   "label.previous-year": [
     {
       "type": 0,
-      "value": "Previous year"
+      "value": "Año anterior"
     }
   ],
   "label.profile": [
@@ -898,7 +898,7 @@
   "label.property": [
     {
       "type": 0,
-      "value": "Property"
+      "value": "Propiedad"
     }
   ],
   "label.queries": [
@@ -952,7 +952,7 @@
   "label.region": [
     {
       "type": 0,
-      "value": "Region"
+      "value": "Región"
     }
   ],
   "label.regions": [
@@ -1042,7 +1042,7 @@
   "label.select": [
     {
       "type": 0,
-      "value": "Select"
+      "value": "Seleccionar"
     }
   ],
   "label.select-date": [
@@ -1090,13 +1090,13 @@
   "label.start-step": [
     {
       "type": 0,
-      "value": "Start Step"
+      "value": "Paso inical"
     }
   ],
   "label.steps": [
     {
       "type": 0,
-      "value": "Steps"
+      "value": "Pasos"
     }
   ],
   "label.sum": [
@@ -1126,7 +1126,7 @@
   "label.team-manager": [
     {
       "type": 0,
-      "value": "Team manager"
+      "value": "Jefe de equipo"
     }
   ],
   "label.team-member": [
@@ -1282,7 +1282,7 @@
   "label.update": [
     {
       "type": 0,
-      "value": "Update"
+      "value": "Actualizar"
     }
   ],
   "label.url": [
@@ -1324,7 +1324,7 @@
   "label.utm-description": [
     {
       "type": 0,
-      "value": "Track your campaigns through UTM parameters."
+      "value": "Realice un seguimiento de sus campañas a través de parámetros UTM."
     }
   ],
   "label.value": [
@@ -1360,7 +1360,7 @@
   "label.views-per-visit": [
     {
       "type": 0,
-      "value": "Views per visit"
+      "value": "Vistas por visita"
     }
   ],
   "label.visit-duration": [
@@ -1378,7 +1378,7 @@
   "label.visits": [
     {
       "type": 0,
-      "value": "Visits"
+      "value": "Visitas"
     }
   ],
   "label.website": [
@@ -1462,7 +1462,7 @@
   "message.collected-data": [
     {
       "type": 0,
-      "value": "Collected data"
+      "value": "Datos obtenidos"
     }
   ],
   "message.confirm-delete": [
@@ -1726,7 +1726,7 @@
   "message.transfer-user-website-to-team": [
     {
       "type": 0,
-      "value": "Select the team to transfer this website to."
+      "value": "Seleccione el equipo al que transferir este sitio web."
     }
   ],
   "message.transfer-website": [
diff --git a/public/intl/messages/km-KH.json b/public/intl/messages/km-KH.json
index 841dabdd33..ad273d2932 100644
--- a/public/intl/messages/km-KH.json
+++ b/public/intl/messages/km-KH.json
@@ -14,31 +14,31 @@
   "label.activity-log": [
     {
       "type": 0,
-      "value": "Activity log"
+      "value": "កំណត់ហេតុ​សកម្មភាព"
     }
   ],
   "label.add": [
     {
       "type": 0,
-      "value": "Add"
+      "value": "បង្កើតបន្ថែម"
     }
   ],
   "label.add-description": [
     {
       "type": 0,
-      "value": "Add description"
+      "value": "បន្ថែមពិពណ៌នា"
     }
   ],
   "label.add-member": [
     {
       "type": 0,
-      "value": "Add member"
+      "value": "បន្ថែមសមាជិក"
     }
   ],
   "label.add-step": [
     {
       "type": 0,
-      "value": "Add step"
+      "value": "បន្ថែមជំហាន"
     }
   ],
   "label.add-website": [
@@ -56,7 +56,7 @@
   "label.after": [
     {
       "type": 0,
-      "value": "After"
+      "value": "បន្ទាប់"
     }
   ],
   "label.all": [
@@ -80,7 +80,7 @@
   "label.average": [
     {
       "type": 0,
-      "value": "Average"
+      "value": "ជាមធ្យម"
     }
   ],
   "label.back": [
@@ -92,7 +92,7 @@
   "label.before": [
     {
       "type": 0,
-      "value": "Before"
+      "value": "មុន"
     }
   ],
   "label.bounce-rate": [
@@ -134,31 +134,31 @@
   "label.cities": [
     {
       "type": 0,
-      "value": "Cities"
+      "value": "ទីក្រុង"
     }
   ],
   "label.city": [
     {
       "type": 0,
-      "value": "City"
+      "value": "ទីក្រុង"
     }
   ],
   "label.clear-all": [
     {
       "type": 0,
-      "value": "Clear all"
+      "value": "លុបទាំងអស់"
     }
   ],
   "label.compare": [
     {
       "type": 0,
-      "value": "Compare"
+      "value": "ប្រៀបធៀប"
     }
   ],
   "label.confirm": [
     {
       "type": 0,
-      "value": "Confirm"
+      "value": "បញ្ជាក់"
     }
   ],
   "label.confirm-password": [
@@ -170,19 +170,19 @@
   "label.contains": [
     {
       "type": 0,
-      "value": "Contains"
+      "value": "មាន"
     }
   ],
   "label.continue": [
     {
       "type": 0,
-      "value": "Continue"
+      "value": "បន្ត"
     }
   ],
   "label.count": [
     {
       "type": 0,
-      "value": "Count"
+      "value": "ចំនួន"
     }
   ],
   "label.countries": [
@@ -194,49 +194,49 @@
   "label.country": [
     {
       "type": 0,
-      "value": "Country"
+      "value": "ប្រទេស"
     }
   ],
   "label.create": [
     {
       "type": 0,
-      "value": "Create"
+      "value": "បង្កើត"
     }
   ],
   "label.create-report": [
     {
       "type": 0,
-      "value": "Create report"
+      "value": "បង្កើតរបាយការណ៍"
     }
   ],
   "label.create-team": [
     {
       "type": 0,
-      "value": "Create team"
+      "value": "បង្កើតក្រុម"
     }
   ],
   "label.create-user": [
     {
       "type": 0,
-      "value": "Create user"
+      "value": "បង្កើតអ្នកប្រើប្រាស់"
     }
   ],
   "label.created": [
     {
       "type": 0,
-      "value": "Created"
+      "value": "បង្កើតនៅ"
     }
   ],
   "label.created-by": [
     {
       "type": 0,
-      "value": "Created By"
+      "value": "បង្កើតដោយ"
     }
   ],
   "label.current": [
     {
       "type": 0,
-      "value": "Current"
+      "value": "បច្ចុប្បន្ន"
     }
   ],
   "label.current-password": [
@@ -260,13 +260,13 @@
   "label.data": [
     {
       "type": 0,
-      "value": "Data"
+      "value": "ទិន្នន័យ"
     }
   ],
   "label.date": [
     {
       "type": 0,
-      "value": "Date"
+      "value": "កាលបរិច្ឆេទ"
     }
   ],
   "label.date-range": [
@@ -278,13 +278,13 @@
   "label.day": [
     {
       "type": 0,
-      "value": "Day"
+      "value": "ថ្ងៃ"
     }
   ],
   "label.default-date-range": [
     {
       "type": 0,
-      "value": "ចន្លោះកាលបរិច្ឆេទស្រាប់"
+      "value": "ចន្លោះកាលបរិច្ឆេទដើម"
     }
   ],
   "label.delete": [
@@ -296,19 +296,19 @@
   "label.delete-report": [
     {
       "type": 0,
-      "value": "Delete report"
+      "value": "លុបរបាយការណ៍"
     }
   ],
   "label.delete-team": [
     {
       "type": 0,
-      "value": "Delete team"
+      "value": "លុបក្រុម"
     }
   ],
   "label.delete-user": [
     {
       "type": 0,
-      "value": "Delete user"
+      "value": "លុបអ្នកប្រើប្រាស់"
     }
   ],
   "label.delete-website": [
@@ -320,7 +320,7 @@
   "label.description": [
     {
       "type": 0,
-      "value": "Description"
+      "value": "ការពិពណ៌នា"
     }
   ],
   "label.desktop": [
@@ -332,13 +332,13 @@
   "label.details": [
     {
       "type": 0,
-      "value": "Details"
+      "value": "ព័ត៌មានលម្អិត"
     }
   ],
   "label.device": [
     {
       "type": 0,
-      "value": "Device"
+      "value": "ឧបករណ៍"
     }
   ],
   "label.devices": [
@@ -350,19 +350,19 @@
   "label.dismiss": [
     {
       "type": 0,
-      "value": "បដិសេធ"
+      "value": "រំសាយ"
     }
   ],
   "label.does-not-contain": [
     {
       "type": 0,
-      "value": "Does not contain"
+      "value": "មិនមាន"
     }
   ],
   "label.domain": [
     {
       "type": 0,
-      "value": "ឈ្មោះគេហទំព័រ"
+      "value": "Domain"
     }
   ],
   "label.dropoff": [
@@ -386,7 +386,7 @@
   "label.edit-member": [
     {
       "type": 0,
-      "value": "Edit member"
+      "value": "កែព័ត៌មានសមាជិក"
     }
   ],
   "label.enable-share-url": [
@@ -398,25 +398,25 @@
   "label.end-step": [
     {
       "type": 0,
-      "value": "End Step"
+      "value": "បញ្ចប់ជំហាន"
     }
   ],
   "label.entry": [
     {
       "type": 0,
-      "value": "Entry URL"
+      "value": "URL ចូល"
     }
   ],
   "label.event": [
     {
       "type": 0,
-      "value": "Event"
+      "value": "ព្រឹត្តិការណ៍"
     }
   ],
   "label.event-data": [
     {
       "type": 0,
-      "value": "Event data"
+      "value": "ទិន្នន័យព្រឹត្តិការណ៍"
     }
   ],
   "label.events": [
@@ -428,13 +428,13 @@
   "label.exit": [
     {
       "type": 0,
-      "value": "Exit URL"
+      "value": "URL ចេញ"
     }
   ],
   "label.false": [
     {
       "type": 0,
-      "value": "False"
+      "value": "មិនពិត"
     }
   ],
   "label.field": [
@@ -452,7 +452,7 @@
   "label.filter": [
     {
       "type": 0,
-      "value": "Filter"
+      "value": "ចម្រោះ"
     }
   ],
   "label.filter-combined": [
@@ -470,7 +470,7 @@
   "label.filters": [
     {
       "type": 0,
-      "value": "Filters"
+      "value": "ចម្រោះ"
     }
   ],
   "label.funnel": [
@@ -488,31 +488,31 @@
   "label.goal": [
     {
       "type": 0,
-      "value": "Goal"
+      "value": "គោលដៅ"
     }
   ],
   "label.goals": [
     {
       "type": 0,
-      "value": "Goals"
+      "value": "គោលដៅ"
     }
   ],
   "label.goals-description": [
     {
       "type": 0,
-      "value": "Track your goals for pageviews and events."
+      "value": "តាមដានគោលដៅរបស់អ្នកសម្រាប់ pageviews និង events។"
     }
   ],
   "label.greater-than": [
     {
       "type": 0,
-      "value": "Greater than"
+      "value": "ធំជាង"
     }
   ],
   "label.greater-than-equals": [
     {
       "type": 0,
-      "value": "Greater than or equals"
+      "value": "ធំជាងឬស្មើ"
     }
   ],
   "label.host": [
@@ -542,49 +542,49 @@
   "label.is": [
     {
       "type": 0,
-      "value": "Is"
+      "value": "គឺ"
     }
   ],
   "label.is-not": [
     {
       "type": 0,
-      "value": "Is not"
+      "value": "មិនមែន"
     }
   ],
   "label.is-not-set": [
     {
       "type": 0,
-      "value": "Is not set"
+      "value": "មិនបានកំណត់"
     }
   ],
   "label.is-set": [
     {
       "type": 0,
-      "value": "Is set"
+      "value": "បានកំណត់"
     }
   ],
   "label.join": [
     {
       "type": 0,
-      "value": "Join"
+      "value": "ចូលរួម"
     }
   ],
   "label.join-team": [
     {
       "type": 0,
-      "value": "Join team"
+      "value": "ចូលក្រុម"
     }
   ],
   "label.journey": [
     {
       "type": 0,
-      "value": "Journey"
+      "value": "​ដំណើរ"
     }
   ],
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users navigate through your website."
+      "value": "ស្វែងយល់ពីការប្រើប្រាស់គេហទំព័ររបស់អតិថិជនអ្នក។"
     }
   ],
   "label.language": [
@@ -612,7 +612,7 @@
     },
     {
       "type": 0,
-      "value": " ថ្ងៃមុន"
+      "value": " ថ្ងៃចុងក្រោយ"
     }
   ],
   "label.last-hours": [
@@ -622,45 +622,41 @@
     },
     {
       "type": 0,
-      "value": " ម៉ោងមុន"
+      "value": " ម៉ោងចុងក្រោយ"
     }
   ],
   "label.last-months": [
-    {
-      "type": 0,
-      "value": "Last "
-    },
     {
       "type": 1,
       "value": "x"
     },
     {
       "type": 0,
-      "value": " months"
+      "value": " ខែចុងក្រោយ"
     }
   ],
   "label.leave": [
     {
       "type": 0,
-      "value": "Leave"
+      "value": "ចាកចេញ"
     }
   ],
   "label.leave-team": [
     {
       "type": 0,
-      "value": "Leave team"
+      "value": "ចេញពីក្រុម"
     }
   ],
   "label.less-than": [
     {
       "type": 0,
-      "value": "Less than"
+      "value": "តិច​ជាង"
     }
   ],
   "label.less-than-equals": [
     {
       "type": 0,
-      "value": "Less than or equals"
+      "value": "តិចជាង ឬស្មើ"
     }
   ],
   "label.login": [
@@ -672,19 +668,19 @@
   "label.logout": [
     {
       "type": 0,
-      "value": "ចេញ"
+      "value": "Logout"
     }
   ],
   "label.manage": [
     {
       "type": 0,
-      "value": "Manage"
+      "value": "គ្រប់គ្រង"
     }
   ],
   "label.manager": [
     {
       "type": 0,
-      "value": "Manager"
+      "value": "អ្នកគ្រប់គ្រង"
     }
   ],
   "label.max": [
@@ -696,13 +692,13 @@
   "label.member": [
     {
       "type": 0,
-      "value": "Member"
+      "value": "សមាជិក"
     }
   ],
   "label.members": [
     {
       "type": 0,
-      "value": "Members"
+      "value": "សមាជិក"
     }
   ],
   "label.min": [
@@ -726,13 +722,13 @@
   "label.my-account": [
     {
       "type": 0,
-      "value": "My account"
+      "value": "គណនី​របស់ខ្ញុំ"
     }
   ],
   "label.my-websites": [
     {
       "type": 0,
-      "value": "My websites"
+      "value": "គេហទំព័ររបស់ខ្ញុំ"
     }
   ],
   "label.name": [
@@ -802,7 +798,7 @@
   "label.overview": [
     {
       "type": 0,
-      "value": "Overview"
+      "value": "ទិដ្ឋភាពរួម"
     }
   ],
   "label.owner": [
@@ -814,7 +810,7 @@
   "label.page-of": [
     {
       "type": 0,
-      "value": "Page "
+      "value": "ទំព័រទី "
     },
     {
       "type": 1,
@@ -822,7 +818,7 @@
     },
     {
       "type": 0,
-      "value": " of "
+      "value": " នៃ "
     },
     {
       "type": 1,
@@ -838,7 +834,7 @@
   "label.pageTitle": [
     {
       "type": 0,
-      "value": "Page title"
+      "value": "ចំណងជើងទំព័រ"
     }
   ],
   "label.pages": [
@@ -866,25 +862,25 @@
   "label.previous": [
     {
       "type": 0,
-      "value": "Previous"
+      "value": "មុន"
     }
   ],
   "label.previous-period": [
     {
       "type": 0,
-      "value": "Previous period"
+      "value": "មួយរយៈពេលមុន"
     }
   ],
   "label.previous-year": [
     {
       "type": 0,
-      "value": "Previous year"
+      "value": "ឆ្នាំ​មុន"
     }
   ],
   "label.profile": [
     {
       "type": 0,
-      "value": "ប្រវត្តិរូប"
+      "value": "គណនី"
     }
   ],
   "label.property": [
@@ -920,7 +916,7 @@
   "label.referrer": [
     {
       "type": 0,
-      "value": "Referrer"
+      "value": "អ្នកណែនាំ"
     }
   ],
   "label.referrers": [
@@ -944,31 +940,31 @@
   "label.region": [
     {
       "type": 0,
-      "value": "Region"
+      "value": "តំបន់"
     }
   ],
   "label.regions": [
     {
       "type": 0,
-      "value": "Regions"
+      "value": "តំបន់"
     }
   ],
   "label.remove": [
     {
       "type": 0,
-      "value": "Remove"
+      "value": "លុប"
     }
   ],
   "label.remove-member": [
     {
       "type": 0,
-      "value": "Remove member"
+      "value": "លុបសមាជិកក្រុម"
     }
   ],
   "label.reports": [
     {
       "type": 0,
-      "value": "Reports"
+      "value": "របាយការណ៍"
     }
   ],
   "label.required": [
@@ -980,7 +976,7 @@
   "label.reset": [
     {
       "type": 0,
-      "value": "កំណត់ឡើងវិញ"
+      "value": "កែសម្រួល"
     }
   ],
   "label.reset-website": [
@@ -992,7 +988,7 @@
   "label.retention": [
     {
       "type": 0,
-      "value": "Retention"
+      "value": "ការរក្សាទុក"
     }
   ],
   "label.retention-description": [
@@ -1004,7 +1000,7 @@
   "label.role": [
     {
       "type": 0,
-      "value": "Role"
+      "value": "មុខងារ"
     }
   ],
   "label.run-query": [
@@ -1028,31 +1024,31 @@
   "label.search": [
     {
       "type": 0,
-      "value": "Search"
+      "value": "ស្វែងរក"
     }
   ],
   "label.select": [
     {
       "type": 0,
-      "value": "Select"
+      "value": "ជ្រើសរើស"
     }
   ],
   "label.select-date": [
     {
       "type": 0,
-      "value": "Select date"
+      "value": "ជ្រើសរើសកាលបរិច្ឆេទ"
     }
   ],
   "label.select-role": [
     {
       "type": 0,
-      "value": "Select role"
+      "value": "ជ្រើសរើសមុខងារ"
     }
   ],
   "label.select-website": [
     {
       "type": 0,
-      "value": "Select website"
+      "value": "ជ្រើសរើសគេហទំព័រ"
     }
   ],
   "label.sessions": [
@@ -1082,13 +1078,13 @@
   "label.start-step": [
     {
       "type": 0,
-      "value": "Start Step"
+      "value": "ជំហានចាប់ផ្តើម"
     }
   ],
   "label.steps": [
     {
       "type": 0,
-      "value": "Steps"
+      "value": "ជំហាន"
     }
   ],
   "label.sum": [
@@ -1106,37 +1102,37 @@
   "label.team": [
     {
       "type": 0,
-      "value": "Team"
+      "value": "ក្រុម"
     }
   ],
   "label.team-id": [
     {
       "type": 0,
-      "value": "Team ID"
+      "value": "ID ក្រុម"
     }
   ],
   "label.team-manager": [
     {
       "type": 0,
-      "value": "Team manager"
+      "value": "អ្នកគ្រប់គ្រងក្រុម"
     }
   ],
   "label.team-member": [
     {
       "type": 0,
-      "value": "Team member"
+      "value": "សមាជិកក្រុម"
     }
   ],
   "label.team-name": [
     {
       "type": 0,
-      "value": "Team name"
+      "value": "ឈ្មោះក្រុម"
     }
   ],
   "label.team-owner": [
     {
       "type": 0,
-      "value": "Team owner"
+      "value": "ម្ចាស់ក្រុម"
     }
   ],
   "label.team-view-only": [
@@ -1148,13 +1144,13 @@
   "label.team-websites": [
     {
       "type": 0,
-      "value": "Team websites"
+      "value": "គេហទំព័ររបស់ក្រុម"
     }
   ],
   "label.teams": [
     {
       "type": 0,
-      "value": "Teams"
+      "value": "ក្រុម"
     }
   ],
   "label.theme": [
@@ -1190,7 +1186,7 @@
   "label.title": [
     {
       "type": 0,
-      "value": "Title"
+      "value": "ចំណងជើង"
     }
   ],
   "label.today": [
@@ -1208,13 +1204,13 @@
   "label.total": [
     {
       "type": 0,
-      "value": "Total"
+      "value": "សរុប"
     }
   ],
   "label.total-records": [
     {
       "type": 0,
-      "value": "Total records"
+      "value": "កំណត់ត្រាសរុប"
     }
   ],
   "label.tracking-code": [
@@ -1226,19 +1222,19 @@
   "label.transfer": [
     {
       "type": 0,
-      "value": "Transfer"
+      "value": "ការផ្ទេរ"
     }
   ],
   "label.transfer-website": [
     {
       "type": 0,
-      "value": "Transfer website"
+      "value": "ការផ្ទេរគេហទំព័រ"
     }
   ],
   "label.true": [
     {
       "type": 0,
-      "value": "True"
+      "value": "ពិត"
     }
   ],
   "label.type": [
@@ -1268,7 +1264,7 @@
   "label.untitled": [
     {
       "type": 0,
-      "value": "Untitled"
+      "value": "គ្មានចំណងជើង"
     }
   ],
   "label.update": [
@@ -1292,7 +1288,7 @@
   "label.user": [
     {
       "type": 0,
-      "value": "User"
+      "value": "អ្នកប្រើប្រាស់"
     }
   ],
   "label.username": [
@@ -1304,7 +1300,7 @@
   "label.users": [
     {
       "type": 0,
-      "value": "Users"
+      "value": "អ្នកប្រើប្រាស់"
     }
   ],
   "label.utm": [
@@ -1316,7 +1312,7 @@
   "label.utm-description": [
     {
       "type": 0,
-      "value": "Track your campaigns through UTM parameters."
+      "value": "តាមដានយុទ្ធនាការរបស់អ្នកតាមរយៈប៉ារ៉ាម៉ែត្រ UTM។"
     }
   ],
   "label.value": [
@@ -1340,7 +1336,7 @@
   "label.view-only": [
     {
       "type": 0,
-      "value": "View only"
+      "value": "បានតែមើលប៉ុណ្ណោះ"
     }
   ],
   "label.views": [
@@ -1358,7 +1354,7 @@
   "label.visit-duration": [
     {
       "type": 0,
-      "value": "មើលជាមធ្យម"
+      "value": "រយៈពេលទស្សនា"
     }
   ],
   "label.visitors": [
@@ -1370,19 +1366,19 @@
   "label.visits": [
     {
       "type": 0,
-      "value": "Visits"
+      "value": "ទស្សនា"
     }
   ],
   "label.website": [
     {
       "type": 0,
-      "value": "Website"
+      "value": "គេហទំព័រ"
     }
   ],
   "label.website-id": [
     {
       "type": 0,
-      "value": "Website ID"
+      "value": "ID គេហទំព័រ"
     }
   ],
   "label.websites": [
@@ -1406,7 +1402,7 @@
   "message.action-confirmation": [
     {
       "type": 0,
-      "value": "Type "
+      "value": "សសេរ "
     },
     {
       "type": 1,
@@ -1414,7 +1410,7 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " នៅក្នុងប្រអប់ខាងក្រោមដើម្បីបញ្ជាក់។"
     }
   ],
   "message.active-users": [
@@ -1434,7 +1430,7 @@
   "message.collected-data": [
     {
       "type": 0,
-      "value": "Collected data"
+      "value": "ទិន្នន័យដែលបានប្រមូលទុក"
     }
   ],
   "message.confirm-delete": [
@@ -1454,7 +1450,7 @@
   "message.confirm-leave": [
     {
       "type": 0,
-      "value": "Are you sure you want to leave "
+      "value": "តើអ្នកប្រាកដថាចង់ចាកចេញ "
     },
     {
       "type": 1,
@@ -1462,13 +1458,13 @@
     },
     {
       "type": 0,
-      "value": "?"
+      "value": " ទេ?"
     }
   ],
   "message.confirm-remove": [
     {
       "type": 0,
-      "value": "Are you sure you want to remove "
+      "value": "តើអ្នកប្រាកដថាចង់លុប "
     },
     {
       "type": 1,
@@ -1476,7 +1472,7 @@
     },
     {
       "type": 0,
-      "value": "?"
+      "value": " ទេ?"
     }
   ],
   "message.confirm-reset": [
@@ -1496,13 +1492,13 @@
   "message.delete-team-warning": [
     {
       "type": 0,
-      "value": "Deleting a team will also delete all team websites."
+      "value": "ពេលលុបក្រុម គេហទំព័ររបស់ក្រុមក៏នឹងត្រូវលប់ចោលទាំងអស់ផងដែរ។"
     }
   ],
   "message.delete-website-warning": [
     {
       "type": 0,
-      "value": "ទិន្នន័យដែលពាក់ព័ន្ធទាំងអស់នឹងត្រូវបានលុបផងដែរ។"
+      "value": "ទិន្នន័យរបស់គេហទំព័រទាំងអស់នឹងត្រូវលុបចោល។"
     }
   ],
   "message.error": [
@@ -1534,19 +1530,19 @@
   "message.incorrect-username-password": [
     {
       "type": 0,
-      "value": "ឈ្មោះអ្នកប្រើ/ពាក្យសម្ងាត់មិនត្រឹមត្រូវ។"
+      "value": "ឈ្មោះអ្នកប្រើឬពាក្យសម្ងាត់មិនត្រឹមត្រូវ។"
     }
   ],
   "message.invalid-domain": [
     {
       "type": 0,
-      "value": "ឈ្មោះគេហទំព័រមិន​ត្រឹមត្រូវ"
+      "value": "Domain មិន​ត្រឹមត្រូវ"
     }
   ],
   "message.min-password-length": [
     {
       "type": 0,
-      "value": "Minimum length of "
+      "value": "តិចបំផុតដែលមានអក្សរ "
     },
     {
       "type": 1,
@@ -1554,13 +1550,13 @@
     },
     {
       "type": 0,
-      "value": " characters"
+      "value": " តួអក្សរ"
     }
   ],
   "message.new-version-available": [
     {
       "type": 0,
-      "value": "A new version of Umami "
+      "value": "Version ថ្មីនៃ Umami "
     },
     {
       "type": 1,
@@ -1568,49 +1564,49 @@
     },
     {
       "type": 0,
-      "value": " is available!"
+      "value": " អាចប្រើប្រាស់បានហើយ!"
     }
   ],
   "message.no-data-available": [
     {
       "type": 0,
-      "value": "មិនមានទិន្នន័យទេ។"
+      "value": "មិនមានទិន្នន័យ។"
     }
   ],
   "message.no-event-data": [
     {
       "type": 0,
-      "value": "No event data is available."
+      "value": "មិនមានទិន្នន័យព្រឹត្តិការណ៍ទេ។"
     }
   ],
   "message.no-match-password": [
     {
       "type": 0,
-      "value": "ពាក្យសម្ងាត់មិនត្រូវគ្នាទេ"
+      "value": "ពាក្យសម្ងាត់មិនត្រូវគ្នាទេ។"
     }
   ],
   "message.no-results-found": [
     {
       "type": 0,
-      "value": "No results were found."
+      "value": "មិនមានលទ្ធផល។"
     }
   ],
   "message.no-team-websites": [
     {
       "type": 0,
-      "value": "This team does not have any websites."
+      "value": "ក្រុមនេះមិនមានគេហទំព័រទេ។"
     }
   ],
   "message.no-teams": [
     {
       "type": 0,
-      "value": "You have not created any teams."
+      "value": "អ្នកមិនទាន់បានបង្កើតក្រុមណាមួយទេ។"
     }
   ],
   "message.no-users": [
     {
       "type": 0,
-      "value": "There are no users."
+      "value": "មិនមានអ្នកប្រើប្រាស់ទេ។"
     }
   ],
   "message.no-websites-configured": [
@@ -1628,7 +1624,7 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "To reset this website, type "
+      "value": "ដើម្បីកែគេហទំព័រនេះឡើងវិញ សូមសរសេរ "
     },
     {
       "type": 1,
@@ -1636,7 +1632,7 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " នៅក្នុងប្រអប់ខាងក្រោមដើម្បីបញ្ជាក់។"
     }
   ],
   "message.reset-website-warning": [
@@ -1654,7 +1650,7 @@
   "message.share-url": [
     {
       "type": 0,
-      "value": "នេះគឺជា URL ដែលបានចែករំលែកជាសាធារណៈសម្រាប់ "
+      "value": "នេះគឺជា URL ដែលអាចចែករំលែកជាសាធារណៈបានសម្រាប់ "
     },
     {
       "type": 1,
@@ -1668,43 +1664,57 @@
   "message.team-already-member": [
     {
       "type": 0,
-      "value": "You are already a member of the team."
+      "value": "អ្នកគឺជាសមាជិកនៃក្រុមរួចហើយ។"
     }
   ],
   "message.team-not-found": [
     {
       "type": 0,
-      "value": "Team not found."
+      "value": "រកក្រុមមិនឃើញទេ។"
     }
   ],
   "message.team-websites-info": [
     {
       "type": 0,
-      "value": "Websites can be viewed by anyone on the team."
+      "value": "គេហទំព័រនេះអាចមើលបានតែសមាជិកក្រុមតែប៉ុណ្ណោះ"
     }
   ],
   "message.tracking-code": [
     {
       "type": 0,
-      "value": "លេខកូដតាមដាន"
+      "value": "ដើម្បីតាមដានស្ថិតិសម្រាប់គេហទំព័រអ្នក សូមដាក់កូដខាងក្រោមទៅក្នុងផ្នែក "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "..."
+        }
+      ],
+      "type": 8,
+      "value": "head"
+    },
+    {
+      "type": 0,
+      "value": " នៃ HTML របស់អ្នក។"
     }
   ],
   "message.transfer-team-website-to-user": [
     {
       "type": 0,
-      "value": "Transfer this website to your account?"
+      "value": "ផ្ទេរគេហទំព័រនេះទៅគណនីរបស់អ្នក។?"
     }
   ],
   "message.transfer-user-website-to-team": [
     {
       "type": 0,
-      "value": "Select the team to transfer this website to."
+      "value": "ជ្រើសក្រុមដែរត្រូវផ្ទេរគេហទំព័រនេះទៅ។"
     }
   ],
   "message.transfer-website": [
     {
       "type": 0,
-      "value": "Transfer website ownership to your account or another team."
+      "value": "ផ្ទេរកម្មសិទ្ធិគេហទំព័រទៅគណនីរបស់អ្នក ឬក្រុមផ្សេងទៀត។"
     }
   ],
   "message.triggered-event": [
@@ -1716,13 +1726,13 @@
   "message.user-deleted": [
     {
       "type": 0,
-      "value": "User deleted."
+      "value": "អ្នកប្រើប្រាស់ត្រូវបានលុបចោល។"
     }
   ],
   "message.viewed-page": [
     {
       "type": 0,
-      "value": "Viewed page"
+      "value": "ទំព័រដែលបានមើល"
     }
   ],
   "message.visitor-log": [
@@ -1762,7 +1772,7 @@
   "message.visitors-dropped-off": [
     {
       "type": 0,
-      "value": "Visitors dropped off"
+      "value": "ចំនួនអ្នកទស្សនាធ្លាក់ចុះ"
     }
   ]
 }
diff --git a/src/app/(main)/reports/ReportsTable.tsx b/src/app/(main)/reports/ReportsTable.tsx
index 7cb9cca7b1..c35468aaaa 100644
--- a/src/app/(main)/reports/ReportsTable.tsx
+++ b/src/app/(main)/reports/ReportsTable.tsx
@@ -1,4 +1,4 @@
-import { GridColumn, GridTable, Icon, Icons, Text, useBreakpoint } from 'react-basics';
+import { GridColumn, GridTable, Icon, Icons, Text } from 'react-basics';
 import LinkButton from 'components/common/LinkButton';
 import { useMessages, useLogin, useTeamUrl } from 'components/hooks';
 import { REPORT_TYPES } from 'lib/constants';
@@ -7,11 +7,10 @@ import ReportDeleteButton from './ReportDeleteButton';
 export function ReportsTable({ data = [], showDomain }: { data: any[]; showDomain?: boolean }) {
   const { formatMessage, labels } = useMessages();
   const { user } = useLogin();
-  const breakpoint = useBreakpoint();
   const { renderTeamUrl } = useTeamUrl();
 
   return (
-    <GridTable data={data} cardMode={['xs', 'sm', 'md'].includes(breakpoint)}>
+    <GridTable data={data}>
       <GridColumn name="name" label={formatMessage(labels.name)} />
       <GridColumn name="description" label={formatMessage(labels.description)} />
       <GridColumn name="type" label={formatMessage(labels.type)}>
diff --git a/src/app/(main)/reports/create/ReportTemplates.tsx b/src/app/(main)/reports/create/ReportTemplates.tsx
index 7a754d5f29..dbff9f1031 100644
--- a/src/app/(main)/reports/create/ReportTemplates.tsx
+++ b/src/app/(main)/reports/create/ReportTemplates.tsx
@@ -4,6 +4,7 @@ import Magnet from 'assets/magnet.svg';
 import Path from 'assets/path.svg';
 import Tag from 'assets/tag.svg';
 import Target from 'assets/target.svg';
+import Money from 'assets/money.svg';
 import { useMessages, useTeamUrl } from 'components/hooks';
 import PageHeader from 'components/layout/PageHeader';
 import Link from 'next/link';
@@ -51,12 +52,12 @@ export function ReportTemplates({ showHeader = true }: { showHeader?: boolean })
       url: renderTeamUrl('/reports/journey'),
       icon: <Path />,
     },
-    // {
-    //   title: formatMessage(labels.revenue),
-    //   description: formatMessage(labels.revenueDescription),
-    //   url: renderTeamUrl('/reports/revenue'),
-    //   icon: <Path />,
-    // },
+    {
+      title: formatMessage(labels.revenue),
+      description: formatMessage(labels.revenueDescription),
+      url: renderTeamUrl('/reports/revenue'),
+      icon: <Money />,
+    },
   ];
 
   return (
diff --git a/src/app/(main)/reports/revenue/RevenueReport.tsx b/src/app/(main)/reports/revenue/RevenueReport.tsx
index d82f424ac2..d67f57c0d8 100644
--- a/src/app/(main)/reports/revenue/RevenueReport.tsx
+++ b/src/app/(main)/reports/revenue/RevenueReport.tsx
@@ -4,7 +4,7 @@ import Report from '../[reportId]/Report';
 import ReportHeader from '../[reportId]/ReportHeader';
 import ReportMenu from '../[reportId]/ReportMenu';
 import ReportBody from '../[reportId]/ReportBody';
-import Target from 'assets/target.svg';
+import Money from 'assets/money.svg';
 import { REPORT_TYPES } from 'lib/constants';
 
 const defaultParameters = {
@@ -15,12 +15,12 @@ const defaultParameters = {
 export default function RevenueReport({ reportId }: { reportId?: string }) {
   return (
     <Report reportId={reportId} defaultParameters={defaultParameters}>
-      <ReportHeader icon={<Target />} />
+      <ReportHeader icon={<Money />} />
       <ReportMenu>
         <RevenueParameters />
       </ReportMenu>
       <ReportBody>
-        <RevenueChart />
+        <RevenueChart unit="day" />
       </ReportBody>
     </Report>
   );
diff --git a/src/app/(main)/settings/teams/TeamsTable.tsx b/src/app/(main)/settings/teams/TeamsTable.tsx
index 787d51c7b0..a7a039580e 100644
--- a/src/app/(main)/settings/teams/TeamsTable.tsx
+++ b/src/app/(main)/settings/teams/TeamsTable.tsx
@@ -1,4 +1,4 @@
-import { GridColumn, GridTable, Icon, Text, useBreakpoint } from 'react-basics';
+import { GridColumn, GridTable, Icon, Text } from 'react-basics';
 import { useMessages } from 'components/hooks';
 import Icons from 'components/icons';
 import { ROLES } from 'lib/constants';
@@ -13,10 +13,9 @@ export function TeamsTable({
   showActions?: boolean;
 }) {
   const { formatMessage, labels } = useMessages();
-  const breakpoint = useBreakpoint();
 
   return (
-    <GridTable data={data} cardMode={['xs', 'sm', 'md'].includes(breakpoint)}>
+    <GridTable data={data}>
       <GridColumn name="name" label={formatMessage(labels.name)} />
       <GridColumn name="owner" label={formatMessage(labels.owner)}>
         {row => row.teamUser.find(({ role }) => role === ROLES.teamOwner)?.user?.username}
diff --git a/src/app/(main)/settings/users/UsersTable.tsx b/src/app/(main)/settings/users/UsersTable.tsx
index 76a0480915..e074be24ed 100644
--- a/src/app/(main)/settings/users/UsersTable.tsx
+++ b/src/app/(main)/settings/users/UsersTable.tsx
@@ -1,4 +1,4 @@
-import { Text, Icon, Icons, GridTable, GridColumn, useBreakpoint } from 'react-basics';
+import { Text, Icon, Icons, GridTable, GridColumn } from 'react-basics';
 import { formatDistance } from 'date-fns';
 import { ROLES } from 'lib/constants';
 import { useMessages, useLocale } from 'components/hooks';
@@ -14,10 +14,9 @@ export function UsersTable({
 }) {
   const { formatMessage, labels } = useMessages();
   const { dateLocale } = useLocale();
-  const breakpoint = useBreakpoint();
 
   return (
-    <GridTable data={data} cardMode={['xs', 'sm', 'md'].includes(breakpoint)}>
+    <GridTable data={data}>
       <GridColumn name="username" label={formatMessage(labels.username)} style={{ minWidth: 0 }} />
       <GridColumn name="role" label={formatMessage(labels.role)} width={'120px'}>
         {row =>
diff --git a/src/app/(main)/settings/websites/WebsitesTable.tsx b/src/app/(main)/settings/websites/WebsitesTable.tsx
index dced90be50..5e9aef2c2f 100644
--- a/src/app/(main)/settings/websites/WebsitesTable.tsx
+++ b/src/app/(main)/settings/websites/WebsitesTable.tsx
@@ -1,5 +1,5 @@
 import { ReactNode } from 'react';
-import { Text, Icon, Icons, GridTable, GridColumn, useBreakpoint } from 'react-basics';
+import { Text, Icon, Icons, GridTable, GridColumn } from 'react-basics';
 import { useMessages, useTeamUrl } from 'components/hooks';
 import LinkButton from 'components/common/LinkButton';
 
@@ -20,7 +20,6 @@ export function WebsitesTable({
   children,
 }: WebsitesTableProps) {
   const { formatMessage, labels } = useMessages();
-  const breakpoint = useBreakpoint();
   const { renderTeamUrl } = useTeamUrl();
 
   if (!data?.length) {
@@ -28,7 +27,7 @@ export function WebsitesTable({
   }
 
   return (
-    <GridTable data={data} cardMode={['xs', 'sm', 'md'].includes(breakpoint)}>
+    <GridTable data={data}>
       <GridColumn name="name" label={formatMessage(labels.name)} />
       <GridColumn name="domain" label={formatMessage(labels.domain)} />
       {showActions && (
diff --git a/src/app/(main)/teams/[teamId]/settings/members/TeamMembersTable.tsx b/src/app/(main)/teams/[teamId]/settings/members/TeamMembersTable.tsx
index 7d1efbf2dd..67cb23c7d6 100644
--- a/src/app/(main)/teams/[teamId]/settings/members/TeamMembersTable.tsx
+++ b/src/app/(main)/teams/[teamId]/settings/members/TeamMembersTable.tsx
@@ -1,4 +1,4 @@
-import { GridColumn, GridTable, useBreakpoint } from 'react-basics';
+import { GridColumn, GridTable } from 'react-basics';
 import { useMessages, useLogin } from 'components/hooks';
 import { ROLES } from 'lib/constants';
 import TeamMemberRemoveButton from './TeamMemberRemoveButton';
@@ -15,7 +15,6 @@ export function TeamMembersTable({
 }) {
   const { formatMessage, labels } = useMessages();
   const { user } = useLogin();
-  const breakpoint = useBreakpoint();
 
   const roles = {
     [ROLES.teamOwner]: formatMessage(labels.teamOwner),
@@ -25,7 +24,7 @@ export function TeamMembersTable({
   };
 
   return (
-    <GridTable data={data} cardMode={['xs', 'sm', 'md'].includes(breakpoint)}>
+    <GridTable data={data}>
       <GridColumn name="username" label={formatMessage(labels.username)}>
         {row => row?.user?.username}
       </GridColumn>
diff --git a/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesTable.tsx b/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesTable.tsx
index c733e3e362..dc6760a6bb 100644
--- a/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesTable.tsx
+++ b/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesTable.tsx
@@ -1,4 +1,4 @@
-import { GridColumn, GridTable, Icon, Text, useBreakpoint } from 'react-basics';
+import { GridColumn, GridTable, Icon, Text } from 'react-basics';
 import { useLogin, useMessages } from 'components/hooks';
 import Icons from 'components/icons';
 import LinkButton from 'components/common/LinkButton';
@@ -14,10 +14,9 @@ export function TeamWebsitesTable({
 }) {
   const { user } = useLogin();
   const { formatMessage, labels } = useMessages();
-  const breakpoint = useBreakpoint();
 
   return (
-    <GridTable data={data} cardMode={['xs', 'sm', 'md'].includes(breakpoint)}>
+    <GridTable data={data}>
       <GridColumn name="name" label={formatMessage(labels.name)} />
       <GridColumn name="domain" label={formatMessage(labels.domain)} />
       <GridColumn name="createdBy" label={formatMessage(labels.createdBy)}>
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
index bdf0ba7d74..ef0d2b9063 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
@@ -52,7 +52,7 @@ export function WebsiteHeader({
     },
     {
       label: formatMessage(labels.events),
-      icon: <Icons.Nodes />,
+      icon: <Icons.Bolt />,
       path: '/events',
     },
   ];
diff --git a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx
index b3414097e2..261f8e4799 100644
--- a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx
+++ b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx
@@ -1,12 +1,13 @@
-import { GridTable, GridColumn } from 'react-basics';
+import { GridTable, GridColumn, Icon } from 'react-basics';
 import { useLocale, useMessages, useTeamUrl } from 'components/hooks';
 import Empty from 'components/common/Empty';
-import { formatDistance } from 'date-fns';
 import Avatar from 'components/common/Avatar';
 import Link from 'next/link';
+import Icons from 'components/icons';
+import { formatDate } from 'lib/date';
 
 export function EventsTable({ data = [] }) {
-  const { dateLocale } = useLocale();
+  const { locale } = useLocale();
   const { formatMessage, labels } = useMessages();
   const { renderTeamUrl } = useTeamUrl();
 
@@ -27,20 +28,15 @@ export function EventsTable({ data = [] }) {
         {row => {
           return (
             <>
+              <Icon>{row.eventName ? <Icons.Bolt /> : <Icons.Eye />}</Icon>
               {formatMessage(row.eventName ? labels.triggeredEvent : labels.viewedPage)}
-              <strong>{row.eventName}</strong>
+              <strong>{row.eventName || row.urlPath}</strong>
             </>
           );
         }}
       </GridColumn>
-      <GridColumn name="urlPath" label={formatMessage(labels.path)} />
-      <GridColumn name="created" label={formatMessage(labels.created)}>
-        {row =>
-          formatDistance(new Date(row.createdAt), new Date(), {
-            addSuffix: true,
-            locale: dateLocale,
-          })
-        }
+      <GridColumn name="created" label={formatMessage(labels.created)} width={'300px'}>
+        {row => formatDate(new Date(row.createdAt), 'PPPpp', locale)}
       </GridColumn>
     </GridTable>
   );
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionMetricsBar.tsx
deleted file mode 100644
index c4f21875d2..0000000000
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionMetricsBar.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-export function SessionMetricsBar({ websiteId }: { websiteId: string }) {
-  return <h1>{websiteId}</h1>;
-}
-
-export default SessionMetricsBar;
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx
new file mode 100644
index 0000000000..6d3c357957
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx
@@ -0,0 +1,42 @@
+import WebsiteDateFilter from 'components/input/WebsiteDateFilter';
+import { Flexbox, Loading } from 'react-basics';
+import MetricCard from 'components/metrics/MetricCard';
+import { useMessages } from 'components/hooks';
+import useWebsiteStats from 'components/hooks/queries/useWebsiteStats';
+import { formatLongNumber } from 'lib/format';
+
+export function SessionsMetricsBar({ websiteId }: { websiteId: string }) {
+  const { formatMessage, labels } = useMessages();
+  const { data, isLoading } = useWebsiteStats(websiteId);
+
+  return (
+    <Flexbox direction="row" justifyContent="space-between" style={{ height: 120 }}>
+      <Flexbox direction="row">
+        {isLoading && <Loading icon="dots" />}
+        {!isLoading && data && (
+          <>
+            <MetricCard
+              value={data.visitors.value}
+              label={formatMessage(labels.visitors)}
+              formatValue={formatLongNumber}
+            />
+            <MetricCard
+              value={data.visits.value}
+              label={formatMessage(labels.visits)}
+              formatValue={formatLongNumber}
+            />
+            <MetricCard
+              value={data.pageviews.value}
+              label={formatMessage(labels.views)}
+              formatValue={formatLongNumber}
+            />
+            <MetricCard value={data?.countries?.value} label={formatMessage(labels.countries)} />
+          </>
+        )}
+      </Flexbox>
+      <WebsiteDateFilter websiteId={websiteId} />
+    </Flexbox>
+  );
+}
+
+export default SessionsMetricsBar;
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx
index e95145a7da..afb1873507 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx
@@ -1,11 +1,13 @@
 'use client';
 import WebsiteHeader from '../WebsiteHeader';
 import SessionsDataTable from './SessionsDataTable';
+import SessionsMetricsBar from './SessionsMetricsBar';
 
 export function SessionsPage({ websiteId }) {
   return (
     <>
       <WebsiteHeader websiteId={websiteId} />
+      <SessionsMetricsBar websiteId={websiteId} />
       <SessionsDataTable websiteId={websiteId} />
     </>
   );
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
index 9dd6a56dda..6e2e53ed00 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
@@ -1,29 +1,33 @@
 import Link from 'next/link';
-import { GridColumn, GridTable, useBreakpoint } from 'react-basics';
+import { GridColumn, GridTable } from 'react-basics';
 import { useFormat, useLocale, useMessages } from 'components/hooks';
 import Avatar from 'components/common/Avatar';
 import styles from './SessionsTable.module.css';
 import { formatDate } from 'lib/date';
+import TypeIcon from 'components/common/TypeIcon';
 
 export function SessionsTable({ data = [] }: { data: any[]; showDomain?: boolean }) {
   const { locale } = useLocale();
   const { formatMessage, labels } = useMessages();
-  const breakpoint = useBreakpoint();
   const { formatValue } = useFormat();
 
   return (
-    <GridTable data={data} cardMode={['xs', 'sm', 'md'].includes(breakpoint)}>
-      <GridColumn name="id" label="ID" width="300px">
+    <GridTable data={data}>
+      <GridColumn name="id" label={formatMessage(labels.session)} width="100px">
         {row => (
           <Link href={`sessions/${row.id}`} className={styles.link}>
             <Avatar key={row.id} seed={row.id} size={64} />
-            {row.id}
           </Link>
         )}
       </GridColumn>
       <GridColumn name="visits" label={formatMessage(labels.visits)} width="100px" />
+      <GridColumn name="views" label={formatMessage(labels.views)} width="100px" />
       <GridColumn name="country" label={formatMessage(labels.country)}>
-        {row => formatValue(row.country, 'country')}
+        {row => (
+          <TypeIcon type="country" value={row.country}>
+            {formatValue(row.country, 'country')}
+          </TypeIcon>
+        )}
       </GridColumn>
       <GridColumn name="city" label={formatMessage(labels.city)} />
       <GridColumn name="browser" label={formatMessage(labels.browser)}>
diff --git a/src/assets/location.svg b/src/assets/location.svg
index b0f9af474c..f7f085e416 100644
--- a/src/assets/location.svg
+++ b/src/assets/location.svg
@@ -1 +1 @@
-<svg height="512" viewBox="0 0 64 64" width="512" xmlns="http://www.w3.org/2000/svg"><g id="Pin"><path d="m32 0a24.0319 24.0319 0 0 0 -24 24c0 17.23 22.36 38.81 23.31 39.72a.99.99 0 0 0 1.38 0c.95-.91 23.31-22.49 23.31-39.72a24.0319 24.0319 0 0 0 -24-24zm0 35a11 11 0 1 1 11-11 11.0066 11.0066 0 0 1 -11 11z"/></g></svg>
\ No newline at end of file
+<svg height="512" viewBox="0 0 64 64" width="512" xmlns="http://www.w3.org/2000/svg"><path d="M32 0A24.032 24.032 0 0 0 8 24c0 17.23 22.36 38.81 23.31 39.72a.99.99 0 0 0 1.38 0C33.64 62.81 56 41.23 56 24A24.032 24.032 0 0 0 32 0zm0 35a11 11 0 1 1 11-11 11.007 11.007 0 0 1-11 11z"/></svg>
\ No newline at end of file
diff --git a/src/assets/logo-white.svg b/src/assets/logo-white.svg
index 12a76d3471..20c41fb291 100644
--- a/src/assets/logo-white.svg
+++ b/src/assets/logo-white.svg
@@ -1,4 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 428 389.11">
-  <circle cx="214.15" cy="181" r="171" fill="none" stroke="white" stroke-miterlimit="10" stroke-width="20"/>
-  <path d="M413 134.11H15.29a15 15 0 0 0-15 15v15.3C.12 168 0 171.52 0 175.11c0 118.19 95.81 214 214 214 116.4 0 211.1-92.94 213.93-208.67 0-.44.07-.88.07-1.33v-30a15 15 0 0 0-15-15Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 428 389.11"><circle cx="214.15" cy="181" r="171" fill="none" stroke="#fff" stroke-miterlimit="10" stroke-width="20"/><path d="M413 134.11H15.29a15 15 0 0 0-15 15v15.3C.12 168 0 171.52 0 175.11c0 118.19 95.81 214 214 214 116.4 0 211.1-92.94 213.93-208.67 0-.44.07-.88.07-1.33v-30a15 15 0 0 0-15-15Z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/src/assets/money.svg b/src/assets/money.svg
new file mode 100644
index 0000000000..954f954d84
--- /dev/null
+++ b/src/assets/money.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512" xml:space="preserve"><path d="M347 302c8.271 0 15 6.639 15 14.8h30c0-19.468-12.541-36.067-30-42.231V242h-30v32.58c-17.459 6.192-30 22.865-30 42.42 0 24.813 20.187 45 45 45 8.271 0 15 6.729 15 15s-6.729 15-15 15-15-6.729-15-15h-30c0 19.555 12.541 36.228 30 42.42v32.38h30v-32.38c17.459-6.192 30-22.865 30-42.42 0-24.813-20.187-45-45-45-8.271 0-15-6.729-15-15s6.729-15 15-15z"/><path d="M347 182c-5.057 0-10.058.242-15 .689V90c0-26.011-18.548-49.61-52.226-66.449C249.4 8.364 209.35 0 167 0 124.564 0 84.193 8.347 53.323 23.502 18.938 40.385 0 64 0 90v272c0 26 18.938 49.616 53.323 66.498C84.193 443.653 124.564 452 167 452c17.009 0 33.647-1.358 49.615-4.004C246.826 486.909 294.035 512 347 512c90.981 0 165-74.019 165-165s-74.019-165-165-165zM66.545 50.432C92.992 37.447 129.606 30 167 30c79.558 0 135 31.621 135 60s-55.442 60-135 60c-37.394 0-74.008-7.447-100.455-20.432C43.32 118.166 30 103.744 30 90s13.32-28.166 36.545-39.568zM30 142.265c6.724 5.137 14.512 9.907 23.323 14.233C84.193 171.653 124.564 180 167 180c42.35 0 82.4-8.364 112.774-23.551 8.359-4.18 15.783-8.776 22.226-13.722v45.51c-29.896 8.485-56.359 25.209-76.778 47.548C206.946 239.908 187.386 242 167 242c-37.394 0-74.008-7.447-100.455-20.432C43.32 210.166 30 195.744 30 182v-39.735zm0 92c6.724 5.137 14.512 9.907 23.323 14.233C84.193 263.653 124.564 272 167 272c11.581 0 22.942-.621 34.021-1.839a163.743 163.743 0 0 0-18.293 61.395c-5.211.286-10.465.444-15.728.444-37.394 0-74.008-7.447-100.455-20.432C43.32 300.166 30 285.744 30 272v-37.735zM167 422c-37.394 0-74.008-7.447-100.455-20.432C43.32 390.166 30 375.744 30 362v-37.736c6.724 5.137 14.512 9.907 23.323 14.233C84.193 353.653 124.564 362 167 362c5.23 0 10.459-.132 15.654-.388a163.726 163.726 0 0 0 16.486 58.557A280.559 280.559 0 0 1 167 422zm180 60c-74.439 0-135-60.561-135-135s60.561-135 135-135 135 60.561 135 135-60.561 135-135 135z"/></svg>
\ No newline at end of file
diff --git a/src/components/common/DataTable.tsx b/src/components/common/DataTable.tsx
index 041c2ba5ef..0f011c3331 100644
--- a/src/components/common/DataTable.tsx
+++ b/src/components/common/DataTable.tsx
@@ -4,13 +4,13 @@ import { Banner, Loading, SearchField } from 'react-basics';
 import { useMessages, useNavigation } from 'components/hooks';
 import Empty from 'components/common/Empty';
 import Pager from 'components/common/Pager';
-import { FilterQueryResult } from 'lib/types';
+import { PagedQueryResult } from 'lib/types';
 import styles from './DataTable.module.css';
 
 const DEFAULT_SEARCH_DELAY = 600;
 
 export interface DataTableProps {
-  queryResult: FilterQueryResult<any>;
+  queryResult: PagedQueryResult<any>;
   searchDelay?: number;
   allowSearch?: boolean;
   allowPaging?: boolean;
diff --git a/src/components/common/TypeIcon.tsx b/src/components/common/TypeIcon.tsx
index 8952bb2628..475fe6436a 100644
--- a/src/components/common/TypeIcon.tsx
+++ b/src/components/common/TypeIcon.tsx
@@ -1,17 +1,24 @@
+import { ReactNode } from 'react';
+
 export function TypeIcon({
   type,
   value,
+  children,
 }: {
   type: 'browser' | 'country' | 'device' | 'os';
   value: string;
+  children?: ReactNode;
 }) {
   return (
-    <img
-      src={`${process.env.basePath || ''}/images/${type}/${value || 'unknown'}.png`}
-      alt={value}
-      width={type === 'country' ? undefined : 16}
-      height={type === 'country' ? undefined : 16}
-    />
+    <>
+      <img
+        src={`${process.env.basePath || ''}/images/${type}/${value || 'unknown'}.png`}
+        alt={value}
+        width={type === 'country' ? undefined : 16}
+        height={type === 'country' ? undefined : 16}
+      />
+      {children}
+    </>
   );
 }
 
diff --git a/src/components/hooks/index.ts b/src/components/hooks/index.ts
index e06a0414cd..d92329c78d 100644
--- a/src/components/hooks/index.ts
+++ b/src/components/hooks/index.ts
@@ -1,6 +1,6 @@
 export * from './queries/useApi';
 export * from './queries/useConfig';
-export * from './queries/useFilterQuery';
+export * from './queries/usePagedQuery';
 export * from './queries/useLogin';
 export * from './queries/useRealtime';
 export * from './queries/useReport';
@@ -19,6 +19,7 @@ export * from './queries/useUsers';
 export * from './queries/useWebsite';
 export * from './queries/useWebsites';
 export * from './queries/useWebsiteEvents';
+export * from './queries/useWebsiteEventsSeries';
 export * from './queries/useWebsiteMetrics';
 export * from './queries/useWebsiteValues';
 export * from './useCountryNames';
diff --git a/src/components/hooks/queries/useFilterQuery.ts b/src/components/hooks/queries/usePagedQuery.ts
similarity index 79%
rename from src/components/hooks/queries/useFilterQuery.ts
rename to src/components/hooks/queries/usePagedQuery.ts
index 82fc4d614f..253f809254 100644
--- a/src/components/hooks/queries/useFilterQuery.ts
+++ b/src/components/hooks/queries/usePagedQuery.ts
@@ -1,14 +1,14 @@
 import { UseQueryOptions } from '@tanstack/react-query';
 import { useState } from 'react';
 import { useApi } from './useApi';
-import { PageResult, PageParams, FilterQueryResult } from 'lib/types';
+import { PageResult, PageParams, PagedQueryResult } from 'lib/types';
 import { useNavigation } from '../useNavigation';
 
-export function useFilterQuery<T = any>({
+export function usePagedQuery<T = any>({
   queryKey,
   queryFn,
   ...options
-}: Omit<UseQueryOptions, 'queryFn'> & { queryFn: (params?: object) => any }): FilterQueryResult<T> {
+}: Omit<UseQueryOptions, 'queryFn'> & { queryFn: (params?: object) => any }): PagedQueryResult<T> {
   const { query: queryParams } = useNavigation();
   const [params, setParams] = useState<PageParams>({
     query: '',
@@ -30,4 +30,4 @@ export function useFilterQuery<T = any>({
   };
 }
 
-export default useFilterQuery;
+export default usePagedQuery;
diff --git a/src/components/hooks/queries/useReports.ts b/src/components/hooks/queries/useReports.ts
index 314880f861..88e4f02ebf 100644
--- a/src/components/hooks/queries/useReports.ts
+++ b/src/components/hooks/queries/useReports.ts
@@ -1,11 +1,11 @@
 import useApi from './useApi';
-import useFilterQuery from './useFilterQuery';
+import usePagedQuery from './usePagedQuery';
 import useModified from '../useModified';
 
 export function useReports({ websiteId, teamId }: { websiteId?: string; teamId?: string }) {
   const { modified } = useModified(`reports`);
   const { get, del, useMutation } = useApi();
-  const queryResult = useFilterQuery({
+  const queryResult = usePagedQuery({
     queryKey: ['reports', { websiteId, teamId, modified }],
     queryFn: (params: any) => {
       return get('/reports', { websiteId, teamId, ...params });
diff --git a/src/components/hooks/queries/useTeamMembers.ts b/src/components/hooks/queries/useTeamMembers.ts
index 8586087087..a3e8bcd235 100644
--- a/src/components/hooks/queries/useTeamMembers.ts
+++ b/src/components/hooks/queries/useTeamMembers.ts
@@ -1,12 +1,12 @@
 import useApi from './useApi';
-import useFilterQuery from './useFilterQuery';
+import usePagedQuery from './usePagedQuery';
 import useModified from '../useModified';
 
 export function useTeamMembers(teamId: string) {
   const { get } = useApi();
   const { modified } = useModified(`teams:members`);
 
-  return useFilterQuery({
+  return usePagedQuery({
     queryKey: ['teams:members', { teamId, modified }],
     queryFn: (params: any) => {
       return get(`/teams/${teamId}/users`, params);
diff --git a/src/components/hooks/queries/useTeamWebsites.ts b/src/components/hooks/queries/useTeamWebsites.ts
index 7679d7672c..fac82d13bf 100644
--- a/src/components/hooks/queries/useTeamWebsites.ts
+++ b/src/components/hooks/queries/useTeamWebsites.ts
@@ -1,12 +1,12 @@
 import useApi from './useApi';
-import useFilterQuery from './useFilterQuery';
+import usePagedQuery from './usePagedQuery';
 import useModified from '../useModified';
 
 export function useTeamWebsites(teamId: string) {
   const { get } = useApi();
   const { modified } = useModified(`websites`);
 
-  return useFilterQuery({
+  return usePagedQuery({
     queryKey: ['teams:websites', { teamId, modified }],
     queryFn: (params: any) => {
       return get(`/teams/${teamId}/websites`, params);
diff --git a/src/components/hooks/queries/useTeams.ts b/src/components/hooks/queries/useTeams.ts
index be71080789..e1f7790a54 100644
--- a/src/components/hooks/queries/useTeams.ts
+++ b/src/components/hooks/queries/useTeams.ts
@@ -1,12 +1,12 @@
 import useApi from './useApi';
-import useFilterQuery from './useFilterQuery';
+import usePagedQuery from './usePagedQuery';
 import useModified from '../useModified';
 
 export function useTeams(userId: string) {
   const { get } = useApi();
   const { modified } = useModified(`teams`);
 
-  return useFilterQuery({
+  return usePagedQuery({
     queryKey: ['teams', { userId, modified }],
     queryFn: (params: any) => {
       return get(`/users/${userId}/teams`, params);
diff --git a/src/components/hooks/queries/useUsers.ts b/src/components/hooks/queries/useUsers.ts
index 169cf42419..519fb89916 100644
--- a/src/components/hooks/queries/useUsers.ts
+++ b/src/components/hooks/queries/useUsers.ts
@@ -1,12 +1,12 @@
 import useApi from './useApi';
-import useFilterQuery from './useFilterQuery';
+import usePagedQuery from './usePagedQuery';
 import useModified from '../useModified';
 
 export function useUsers() {
   const { get } = useApi();
   const { modified } = useModified(`users`);
 
-  return useFilterQuery({
+  return usePagedQuery({
     queryKey: ['users', { modified }],
     queryFn: (params: any) => {
       return get('/admin/users', {
diff --git a/src/components/hooks/queries/useWebsiteEvents.ts b/src/components/hooks/queries/useWebsiteEvents.ts
index f0132470fa..12febcc814 100644
--- a/src/components/hooks/queries/useWebsiteEvents.ts
+++ b/src/components/hooks/queries/useWebsiteEvents.ts
@@ -1,7 +1,7 @@
 import useApi from './useApi';
 import { UseQueryOptions } from '@tanstack/react-query';
 import { useFilterParams } from '../useFilterParams';
-import { useFilterQuery } from 'components/hooks';
+import { usePagedQuery } from 'components/hooks';
 
 export function useWebsiteEvents(
   websiteId: string,
@@ -10,7 +10,7 @@ export function useWebsiteEvents(
   const { get } = useApi();
   const params = useFilterParams(websiteId);
 
-  return useFilterQuery({
+  return usePagedQuery({
     queryKey: ['websites:events', { websiteId, ...params }],
     queryFn: pageParams =>
       get(`/websites/${websiteId}/events`, { ...params, ...pageParams, pageSize: 20 }),
diff --git a/src/components/hooks/queries/useWebsiteEventsSeries.ts b/src/components/hooks/queries/useWebsiteEventsSeries.ts
new file mode 100644
index 0000000000..88b493759a
--- /dev/null
+++ b/src/components/hooks/queries/useWebsiteEventsSeries.ts
@@ -0,0 +1,20 @@
+import useApi from './useApi';
+import { UseQueryOptions } from '@tanstack/react-query';
+import { useFilterParams } from '../useFilterParams';
+
+export function useWebsiteEventsSeries(
+  websiteId: string,
+  options?: Omit<UseQueryOptions, 'queryKey' | 'queryFn'>,
+) {
+  const { get, useQuery } = useApi();
+  const params = useFilterParams(websiteId);
+
+  return useQuery({
+    queryKey: ['websites:events:series', { websiteId, ...params }],
+    queryFn: () => get(`/websites/${websiteId}/events/series`, { ...params }),
+    enabled: !!websiteId,
+    ...options,
+  });
+}
+
+export default useWebsiteEventsSeries;
diff --git a/src/components/hooks/queries/useWebsiteSessions.ts b/src/components/hooks/queries/useWebsiteSessions.ts
index 9430786b1e..e8a1ce2f82 100644
--- a/src/components/hooks/queries/useWebsiteSessions.ts
+++ b/src/components/hooks/queries/useWebsiteSessions.ts
@@ -1,17 +1,20 @@
 import { useApi } from './useApi';
-import { useFilterQuery } from './useFilterQuery';
+import { usePagedQuery } from './usePagedQuery';
 import useModified from '../useModified';
+import { useFilterParams } from 'components/hooks/useFilterParams';
 
 export function useWebsiteSessions(websiteId: string, params?: { [key: string]: string | number }) {
   const { get } = useApi();
   const { modified } = useModified(`sessions`);
+  const filters = useFilterParams(websiteId);
 
-  return useFilterQuery({
-    queryKey: ['sessions', { websiteId, modified, ...params }],
+  return usePagedQuery({
+    queryKey: ['sessions', { websiteId, modified, ...params, ...filters }],
     queryFn: (data: any) => {
       return get(`/websites/${websiteId}/sessions`, {
         ...data,
         ...params,
+        ...filters,
       });
     },
   });
diff --git a/src/components/hooks/queries/useWebsites.ts b/src/components/hooks/queries/useWebsites.ts
index 941989750d..d6fe00df79 100644
--- a/src/components/hooks/queries/useWebsites.ts
+++ b/src/components/hooks/queries/useWebsites.ts
@@ -1,5 +1,5 @@
 import { useApi } from './useApi';
-import { useFilterQuery } from './useFilterQuery';
+import { usePagedQuery } from './usePagedQuery';
 import { useLogin } from './useLogin';
 import useModified from '../useModified';
 
@@ -11,7 +11,7 @@ export function useWebsites(
   const { user } = useLogin();
   const { modified } = useModified(`websites`);
 
-  return useFilterQuery({
+  return usePagedQuery({
     queryKey: ['websites', { userId, teamId, modified, ...params }],
     queryFn: (data: any) => {
       return get(teamId ? `/teams/${teamId}/websites` : `/users/${userId || user.id}/websites`, {
diff --git a/src/components/messages.ts b/src/components/messages.ts
index 703ccba3c8..75fa2d3e6c 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -88,8 +88,8 @@ export const labels = defineMessages({
   leaveTeam: { id: 'label.leave-team', defaultMessage: 'Leave team' },
   refresh: { id: 'label.refresh', defaultMessage: 'Refresh' },
   pages: { id: 'label.pages', defaultMessage: 'Pages' },
-  entry: { id: 'label.entry', defaultMessage: 'Entry URL' },
-  exit: { id: 'label.exit', defaultMessage: 'Exit URL' },
+  entry: { id: 'label.entry', defaultMessage: 'Entry path' },
+  exit: { id: 'label.exit', defaultMessage: 'Exit path' },
   referrers: { id: 'label.referrers', defaultMessage: 'Referrers' },
   hosts: { id: 'label.hosts', defaultMessage: 'Hosts' },
   screens: { id: 'label.screens', defaultMessage: 'Screens' },
@@ -165,6 +165,8 @@ export const labels = defineMessages({
   },
   url: { id: 'label.url', defaultMessage: 'URL' },
   urls: { id: 'label.urls', defaultMessage: 'URLs' },
+  path: { id: 'label.path', defaultMessage: 'Path' },
+  paths: { id: 'label.paths', defaultMessage: 'Paths' },
   add: { id: 'label.add', defaultMessage: 'Add' },
   update: { id: 'label.update', defaultMessage: 'Update' },
   window: { id: 'label.window', defaultMessage: 'Window' },
@@ -276,7 +278,6 @@ export const labels = defineMessages({
   lastSeen: { id: 'label.last-seen', defaultMessage: 'Last seen' },
   firstSeen: { id: 'label.first-seen', defaultMessage: 'First seen' },
   properties: { id: 'label.properties', defaultMessage: 'Properties' },
-  path: { id: 'label.path', defaultMessage: 'Path' },
 });
 
 export const messages = defineMessages({
diff --git a/src/components/metrics/EventsChart.tsx b/src/components/metrics/EventsChart.tsx
index 36ec867233..0bb65eb298 100644
--- a/src/components/metrics/EventsChart.tsx
+++ b/src/components/metrics/EventsChart.tsx
@@ -2,7 +2,7 @@ import { useMemo } from 'react';
 import { colord } from 'colord';
 import BarChart from 'components/charts/BarChart';
 import { getDateArray } from 'lib/date';
-import { useLocale, useDateRange, useWebsiteEvents } from 'components/hooks';
+import { useLocale, useDateRange, useWebsiteEventsSeries } from 'components/hooks';
 import { CHART_COLORS } from 'lib/constants';
 import { renderDateLabels } from 'lib/charts';
 
@@ -16,7 +16,7 @@ export function EventsChart({ websiteId, className }: EventsChartProps) {
     dateRange: { startDate, endDate, unit },
   } = useDateRange(websiteId);
   const { locale } = useLocale();
-  const { data, isLoading } = useWebsiteEvents(websiteId);
+  const { data, isLoading } = useWebsiteEventsSeries(websiteId);
 
   const chartData = useMemo(() => {
     if (!data) return [];
diff --git a/src/components/metrics/MetricCard.tsx b/src/components/metrics/MetricCard.tsx
index a5fd758ec3..64f2a1b6b2 100644
--- a/src/components/metrics/MetricCard.tsx
+++ b/src/components/metrics/MetricCard.tsx
@@ -10,7 +10,7 @@ export interface MetricCardProps {
   change?: number;
   label?: string;
   reverseColors?: boolean;
-  formatValue?: typeof formatNumber;
+  formatValue?: (n: any) => string;
   showLabel?: boolean;
   showChange?: boolean;
   showPrevious?: boolean;
diff --git a/src/components/metrics/PagesTable.tsx b/src/components/metrics/PagesTable.tsx
index 767c4764b4..b2d8ca9c30 100644
--- a/src/components/metrics/PagesTable.tsx
+++ b/src/components/metrics/PagesTable.tsx
@@ -25,7 +25,7 @@ export function PagesTable({ allowFilter, ...props }: PagesTableProps) {
 
   const buttons = [
     {
-      label: 'URL',
+      label: formatMessage(labels.path),
       key: 'url',
     },
     {
diff --git a/src/lib/types.ts b/src/lib/types.ts
index e659655202..3bce527151 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -41,7 +41,7 @@ export interface PageResult<T> {
   sortDescending?: boolean;
 }
 
-export interface FilterQueryResult<T> {
+export interface PagedQueryResult<T> {
   result: PageResult<T>;
   query: any;
   params: PageParams;
diff --git a/src/pages/api/websites/[websiteId]/sessions/index.ts b/src/pages/api/websites/[websiteId]/sessions/index.ts
index 4f242882fb..69f777f503 100644
--- a/src/pages/api/websites/[websiteId]/sessions/index.ts
+++ b/src/pages/api/websites/[websiteId]/sessions/index.ts
@@ -14,6 +14,8 @@ export interface ReportsRequestQuery extends PageParams {
 const schema = {
   GET: yup.object().shape({
     websiteId: yup.string().uuid().required(),
+    startAt: yup.number().integer().required(),
+    endAt: yup.number().integer().min(yup.ref('startAt')).required(),
     ...pageInfo,
   }),
 };
@@ -26,14 +28,17 @@ export default async (
   await useAuth(req, res);
   await useValidate(schema, req, res);
 
-  const { websiteId } = req.query;
+  const { websiteId, startAt, endAt } = req.query;
+
+  const startDate = new Date(+startAt);
+  const endDate = new Date(+endAt);
 
   if (req.method === 'GET') {
     if (!(await canViewWebsite(req.auth, websiteId))) {
       return unauthorized(res);
     }
 
-    const data = await getWebsiteSessions(websiteId, {}, req.query);
+    const data = await getWebsiteSessions(websiteId, { startDate, endDate }, req.query);
 
     return ok(res, data);
   }
diff --git a/src/queries/analytics/getWebsiteStats.ts b/src/queries/analytics/getWebsiteStats.ts
index c5141d3be7..7f7f4f19e2 100644
--- a/src/queries/analytics/getWebsiteStats.ts
+++ b/src/queries/analytics/getWebsiteStats.ts
@@ -34,12 +34,14 @@ async function relationalQuery(
       sum(t.c) as "pageviews",
       count(distinct t.session_id) as "visitors",
       count(distinct t.visit_id) as "visits",
+      count(distinct t.country) as "countries",
       sum(case when t.c = 1 then 1 else 0 end) as "bounces",
-      sum(${getTimestampDiffSQL('t.min_time', 't.max_time')}) as "totaltime"
+      sum(${getTimestampDiffSQL('t.min_time', 't.max_time')}) as "totaltime",
     from (
       select
         website_event.session_id,
         website_event.visit_id,
+        session.country,
         count(*) as "c",
         min(website_event.created_at) as "min_time",
         max(website_event.created_at) as "max_time"
@@ -49,7 +51,7 @@ async function relationalQuery(
         and website_event.created_at between {{startDate}} and {{endDate}}
         and event_type = {{eventType}}
         ${filterQuery}
-      group by 1, 2
+      group by 1, 2, 3
     ) as t
     `,
     params,
@@ -76,12 +78,14 @@ async function clickhouseQuery(
       sum(t.c) as "pageviews",
       uniq(t.session_id) as "visitors",
       uniq(t.visit_id) as "visits",
+      uniq(t.country) as "countries",
       sum(if(t.c = 1, 1, 0)) as "bounces",
       sum(max_time-min_time) as "totaltime"
     from (
       select
         session_id,
         visit_id,
+        country,
         count(*) c,
         min(created_at) min_time,
         max(created_at) max_time
@@ -90,7 +94,7 @@ async function clickhouseQuery(
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
         and event_type = {eventType:UInt32}
         ${filterQuery}
-      group by session_id, visit_id
+      group by session_id, visit_id, country
     ) as t;
     `;
   } else {
@@ -99,20 +103,23 @@ async function clickhouseQuery(
       sum(t.c) as "pageviews",
       uniq(session_id) as "visitors",
       uniq(visit_id) as "visits",
+      uniq(country) as "countries",
       sumIf(1, t.c = 1) as "bounces",
       sum(max_time-min_time) as "totaltime"
-    from (select
-            session_id,
-            visit_id,
-            sum(views) c,
-            min(min_time) min_time,
-            max(max_time) max_time
-        from umami.website_event_stats_hourly "website_event"
-    where website_id = {websiteId:UUID}
-      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
-      and event_type = {eventType:UInt32}
-      ${filterQuery}
-      group by session_id, visit_id
+    from (
+      select
+          session_id,
+          visit_id,
+          country,
+          sum(views) c,
+          min(min_time) min_time,
+          max(max_time) max_time
+      from umami.website_event_stats_hourly "website_event"
+      where website_id = {websiteId:UUID}
+        and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+        and event_type = {eventType:UInt32}
+        ${filterQuery}
+      group by session_id, visit_id, country
     ) as t;
     `;
   }
@@ -125,6 +132,7 @@ async function clickhouseQuery(
         visits: Number(a.visits),
         bounces: Number(a.bounces),
         totaltime: Number(a.totaltime),
+        countries: Number(a.countries),
       };
     });
   });
diff --git a/src/queries/analytics/sessions/getWebsiteSessions.ts b/src/queries/analytics/sessions/getWebsiteSessions.ts
index c5fe6cec99..94d2827ee1 100644
--- a/src/queries/analytics/sessions/getWebsiteSessions.ts
+++ b/src/queries/analytics/sessions/getWebsiteSessions.ts
@@ -43,7 +43,8 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
       city,
       min(created_at) as firstAt,
       max(created_at) as lastAt,
-      uniq(visit_id) as visits
+      uniq(visit_id) as visits,
+      count(*) as views
     from website_event
     where website_id = {websiteId:UUID}
     ${dateQuery}
diff --git a/yarn.lock b/yarn.lock
index eee877d39c..fc4169df90 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1199,17 +1199,17 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@clickhouse/client-common@1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@clickhouse/client-common/-/client-common-1.3.0.tgz#9fe4b88eedb233770832cb1c0794f4ad9fbec75c"
-  integrity sha512-fApbhu52WSQlBU0gMZQxd2akuWbI1c9BcWjIbDDgtNZX2OggrIB7a4oI845ZGXpeZCZDI9ZqtkXzbYQYS0Yqew==
+"@clickhouse/client-common@1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@clickhouse/client-common/-/client-common-1.4.0.tgz#6936f667ba901724bf9174cc2b783507e921868f"
+  integrity sha512-kglG8YyWnR1K24RckUf5ZdNTN0U0s+a1j/bpCO4ZjzjO87ICgWlXFVD22pZqSACW7/2IIi1IkzbwtxKI2s/MOw==
 
 "@clickhouse/client@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@clickhouse/client/-/client-1.3.0.tgz#298529b970a9ba2ae5e017258aaf6cf522cb2b51"
-  integrity sha512-baBiuwVpXg/DHCe9Y1pNf+tcE2ZalCAQqZsR9OhP7+01C3UqTjHeY4eYixNlpfZCb8c8R4GygdWJFbXF0aGklw==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@clickhouse/client/-/client-1.4.0.tgz#84e17f8c0f2ba109d8e76c3d4f5830aeff5e9459"
+  integrity sha512-O4mbFPM/wQtFck01ghYI2mnNHv9jSFEiQBsTCH4t6MKeGHNAPkJGaFGv+KycLTv6zjnQNjiUGdXDMVRema5SyA==
   dependencies:
-    "@clickhouse/client-common" "1.3.0"
+    "@clickhouse/client-common" "1.4.0"
 
 "@colors/colors@1.5.0":
   version "1.5.0"
@@ -1349,7 +1349,7 @@
   resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-3.0.2.tgz#ea61ba7bb24be3502c6aaa3190ed231f4633a81e"
   integrity sha512-RpHaZ1h9LE7aALeQXmXrJkRG84ZxIsctEN2biEUmFyKpzFM3zZ35eUMcIzZFsw/2olQE6v69+esEqU2f1MKycg==
 
-"@cypress/request@^3.0.0":
+"@cypress/request@^3.0.0", "@cypress/request@^3.0.1":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@cypress/request/-/request-3.0.1.tgz#72d7d5425236a2413bd3d8bb66d02d9dc3168960"
   integrity sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==
@@ -2188,19 +2188,19 @@
   integrity sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==
 
 "@netlify/plugin-nextjs@^5.1.0":
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/@netlify/plugin-nextjs/-/plugin-nextjs-5.3.3.tgz#414cb0f4c21e6b80d6127b824efb00ae2f732a89"
-  integrity sha512-QhvZLOHhPuTnh6TZ5G0/jtjAJ1Y52A67b39eygKv6znQUPti8p+8y2WulcntpCRzVp2stzEULMNPlnptna1ikg==
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@netlify/plugin-nextjs/-/plugin-nextjs-5.6.0.tgz#970f96b11bee4fe115fad8e3e4f3c6121f97a370"
+  integrity sha512-PBrsd/GJZ9MN8BdyIoleTkY22lAUMfcRxrbb8wgxGzXtTW0RU0GW2mc99ISB6zOwWMZ11rSjeN0GS6znnukvww==
 
 "@next/env@14.2.5":
   version "14.2.5"
   resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.5.tgz#1d9328ab828711d3517d0a1d505acb55e5ef7ad0"
   integrity sha512-/zZGkrTOsraVfYjGP8uM0p6r0BDT6xWpkjdVbcz66PJVSpwXX3yNiRycxAuDfBKGWBrZBXRuK/YVlkNgxHGwmA==
 
-"@next/eslint-plugin-next@14.2.4":
-  version "14.2.4"
-  resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-14.2.4.tgz#c7f965cb76f0b454e726ef0f69157c4fb4e28f53"
-  integrity sha512-svSFxW9f3xDaZA3idQmlFw7SusOuWTpDTAeBlO3AEPDltrraV+lqs7mAc6A27YdnpQVVIA3sODqUAAHdWhVWsA==
+"@next/eslint-plugin-next@14.2.5":
+  version "14.2.5"
+  resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-14.2.5.tgz#f7e3ff3efe40a2855e5f29bc2692175f85913ba8"
+  integrity sha512-LY3btOpPh+OTIpviNojDpUdIbHW9j0JBYBjsIp8IxtDFfYFyORvw3yNq6N231FVqQA7n7lwaf7xHbVJlA1ED7g==
   dependencies:
     glob "10.3.10"
 
@@ -2275,90 +2275,96 @@
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
   integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
 
-"@prisma/client@5.16.2":
-  version "5.16.2"
-  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.16.2.tgz#21df4c092eac29dcc4431ebed8c92579ffc9d8bd"
-  integrity sha512-+1lmkhR9gHWcTC5oghm2ZKpWljyWdzfazCVlLKUWXVmwHSf52g81aZ8qb6Km5Bs025yBi7puLp3qSLEvktoUtw==
+"@prisma/client@5.17.0":
+  version "5.17.0"
+  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.17.0.tgz#9079947bd749689c2dabfb9ecc70a24ebefb1f43"
+  integrity sha512-N2tnyKayT0Zf7mHjwEyE8iG7FwTmXDHFZ1GnNhQp0pJUObsuel4ZZ1XwfuAYkq5mRIiC/Kot0kt0tGCfLJ70Jw==
 
-"@prisma/debug@5.16.2":
-  version "5.16.2"
-  resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.16.2.tgz#bf774f4768a3d1634887e6964fcfe04576dc7496"
-  integrity sha512-ItzB4nR4O8eLzuJiuP3WwUJfoIvewMHqpGCad+64gvThcKEVOtaUza9AEJo2DPqAOa/AWkFyK54oM4WwHeew+A==
+"@prisma/debug@5.17.0":
+  version "5.17.0"
+  resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.17.0.tgz#a765105848993984535b6066f8ebc6e6ead26533"
+  integrity sha512-l7+AteR3P8FXiYyo496zkuoiJ5r9jLQEdUuxIxNCN1ud8rdbH3GTxm+f+dCyaSv9l9WY+29L9czaVRXz9mULfg==
 
-"@prisma/engines-version@5.16.0-24.34ace0eb2704183d2c05b60b52fba5c43c13f303":
-  version "5.16.0-24.34ace0eb2704183d2c05b60b52fba5c43c13f303"
-  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.16.0-24.34ace0eb2704183d2c05b60b52fba5c43c13f303.tgz#63ceebefb7daa1eb17f250cad75d35999a50ee1b"
-  integrity sha512-HkT2WbfmFZ9WUPyuJHhkiADxazHg8Y4gByrTSVeb3OikP6tjQ7txtSUGu9OBOBH0C13dPKN2qqH12xKtHu/Hiw==
+"@prisma/engines-version@5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053":
+  version "5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053"
+  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053.tgz#3c7cc1ef3ebc34cbd069e5873b9982f2aabf5acd"
+  integrity sha512-tUuxZZysZDcrk5oaNOdrBnnkoTtmNQPkzINFDjz7eG6vcs9AVDmA/F6K5Plsb2aQc/l5M2EnFqn3htng9FA4hg==
 
-"@prisma/engines@5.16.2":
-  version "5.16.2"
-  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.16.2.tgz#d624c816c25a5cbad7ca13c7842b71557b6020e0"
-  integrity sha512-qUxwMtrwoG3byd4PbX6T7EjHJ8AUhzTuwniOGkh/hIznBfcE2QQnGakyEq4VnwNuttMqvh/GgPFapHQ3lCuRHg==
+"@prisma/engines@5.17.0":
+  version "5.17.0"
+  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.17.0.tgz#74dd1aabb22675892760b3cf69a448e3aef4616b"
+  integrity sha512-+r+Nf+JP210Jur+/X8SIPLtz+uW9YA4QO5IXA+KcSOBe/shT47bCcRMTYCbOESw3FFYFTwe7vU6KTWHKPiwvtg==
   dependencies:
-    "@prisma/debug" "5.16.2"
-    "@prisma/engines-version" "5.16.0-24.34ace0eb2704183d2c05b60b52fba5c43c13f303"
-    "@prisma/fetch-engine" "5.16.2"
-    "@prisma/get-platform" "5.16.2"
+    "@prisma/debug" "5.17.0"
+    "@prisma/engines-version" "5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053"
+    "@prisma/fetch-engine" "5.17.0"
+    "@prisma/get-platform" "5.17.0"
 
 "@prisma/extension-read-replicas@^0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/@prisma/extension-read-replicas/-/extension-read-replicas-0.3.0.tgz#2842a7c928f957c1dd58a6256104797596d43426"
   integrity sha512-F9+rSmYday6GT2qjhJtkZcBOpLO5LtpvFcMGqrBDHf+78LEdSuxfFjOxYlNuqk4B+th62yxpbhfpmB9/Mca14Q==
 
-"@prisma/fetch-engine@5.16.2":
-  version "5.16.2"
-  resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.16.2.tgz#e7e06cf246340e6ae06791f9133be275c5ee50e5"
-  integrity sha512-sq51lfHKfH2jjYSjBtMjP+AznFqOJzXpqmq6B9auWrlTJrMgZ7lPyhWUW7VU7LsQU48/TJ+DZeIz8s9bMYvcHg==
+"@prisma/fetch-engine@5.17.0":
+  version "5.17.0"
+  resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.17.0.tgz#f718dc7426411d1ebeeee53e2d0d38652387f87c"
+  integrity sha512-ESxiOaHuC488ilLPnrv/tM2KrPhQB5TRris/IeIV4ZvUuKeaicCl4Xj/JCQeG9IlxqOgf1cCg5h5vAzlewN91Q==
   dependencies:
-    "@prisma/debug" "5.16.2"
-    "@prisma/engines-version" "5.16.0-24.34ace0eb2704183d2c05b60b52fba5c43c13f303"
-    "@prisma/get-platform" "5.16.2"
+    "@prisma/debug" "5.17.0"
+    "@prisma/engines-version" "5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053"
+    "@prisma/get-platform" "5.17.0"
 
-"@prisma/get-platform@5.16.2":
-  version "5.16.2"
-  resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.16.2.tgz#f9b397ddf807b71411fd9d0b17374bc21e91cc40"
-  integrity sha512-cXiHPgNLNyj22vLouPVNegklpRL/iX2jxTeap5GRO3DmCoVyIHmJAV1CgUMUJhHlcol9yYy7EHvsnXTDJ/PKEA==
+"@prisma/get-platform@5.17.0":
+  version "5.17.0"
+  resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.17.0.tgz#89fdcae2adddebbbf0e7bd0474a6c49d6023519b"
+  integrity sha512-UlDgbRozCP1rfJ5Tlkf3Cnftb6srGrEQ4Nm3og+1Se2gWmCZ0hmPIi+tQikGDUVLlvOWx3Gyi9LzgRP+HTXV9w==
   dependencies:
-    "@prisma/debug" "5.16.2"
+    "@prisma/debug" "5.17.0"
 
-"@react-spring/animated@~9.7.3":
-  version "9.7.3"
-  resolved "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.7.3.tgz#4211b1a6d48da0ff474a125e93c0f460ff816e0f"
-  integrity sha512-5CWeNJt9pNgyvuSzQH+uy2pvTg8Y4/OisoscZIR8/ZNLIOI+CatFBhGZpDGTF/OzdNFsAoGk3wiUYTwoJ0YIvw==
+"@react-spring/animated@~9.7.4":
+  version "9.7.4"
+  resolved "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.7.4.tgz#c712b2d3dc9312ef41aa8886818b539151bda062"
+  integrity sha512-7As+8Pty2QlemJ9O5ecsuPKjmO0NKvmVkRR1n6mEotFgWar8FKuQt2xgxz3RTgxcccghpx1YdS1FCdElQNexmQ==
   dependencies:
-    "@react-spring/shared" "~9.7.3"
-    "@react-spring/types" "~9.7.3"
+    "@react-spring/shared" "~9.7.4"
+    "@react-spring/types" "~9.7.4"
 
-"@react-spring/core@~9.7.3":
-  version "9.7.3"
-  resolved "https://registry.yarnpkg.com/@react-spring/core/-/core-9.7.3.tgz#60056bcb397f2c4f371c6c9a5f882db77ae90095"
-  integrity sha512-IqFdPVf3ZOC1Cx7+M0cXf4odNLxDC+n7IN3MDcVCTIOSBfqEcBebSv+vlY5AhM0zw05PDbjKrNmBpzv/AqpjnQ==
+"@react-spring/core@~9.7.4":
+  version "9.7.4"
+  resolved "https://registry.yarnpkg.com/@react-spring/core/-/core-9.7.4.tgz#0eaa0b5da3d18036d87a571f23079819d45a9f46"
+  integrity sha512-GzjA44niEJBFUe9jN3zubRDDDP2E4tBlhNlSIkTChiNf9p4ZQlgXBg50qbXfSXHQPHak/ExYxwhipKVsQ/sUTw==
   dependencies:
-    "@react-spring/animated" "~9.7.3"
-    "@react-spring/shared" "~9.7.3"
-    "@react-spring/types" "~9.7.3"
+    "@react-spring/animated" "~9.7.4"
+    "@react-spring/shared" "~9.7.4"
+    "@react-spring/types" "~9.7.4"
+
+"@react-spring/rafz@~9.7.4":
+  version "9.7.4"
+  resolved "https://registry.yarnpkg.com/@react-spring/rafz/-/rafz-9.7.4.tgz#d53aa45a8cb116b81b27ba29e0cc15470ccfd449"
+  integrity sha512-mqDI6rW0Ca8IdryOMiXRhMtVGiEGLIO89vIOyFQXRIwwIMX30HLya24g9z4olDvFyeDW3+kibiKwtZnA4xhldA==
 
-"@react-spring/shared@~9.7.3":
-  version "9.7.3"
-  resolved "https://registry.yarnpkg.com/@react-spring/shared/-/shared-9.7.3.tgz#4cf29797847c689912aec4e62e34c99a4d5d9e53"
-  integrity sha512-NEopD+9S5xYyQ0pGtioacLhL2luflh6HACSSDUZOwLHoxA5eku1UPuqcJqjwSD6luKjjLfiLOspxo43FUHKKSA==
+"@react-spring/shared@~9.7.4":
+  version "9.7.4"
+  resolved "https://registry.yarnpkg.com/@react-spring/shared/-/shared-9.7.4.tgz#8ac57505072c2aee33d77c47c4269347061a3377"
+  integrity sha512-bEPI7cQp94dOtCFSEYpxvLxj0+xQfB5r9Ru1h8OMycsIq7zFZon1G0sHrBLaLQIWeMCllc4tVDYRTLIRv70C8w==
   dependencies:
-    "@react-spring/types" "~9.7.3"
+    "@react-spring/rafz" "~9.7.4"
+    "@react-spring/types" "~9.7.4"
 
-"@react-spring/types@~9.7.3":
-  version "9.7.3"
-  resolved "https://registry.yarnpkg.com/@react-spring/types/-/types-9.7.3.tgz#ea78fd447cbc2612c1f5d55852e3c331e8172a0b"
-  integrity sha512-Kpx/fQ/ZFX31OtlqVEFfgaD1ACzul4NksrvIgYfIFq9JpDHFwQkMVZ10tbo0FU/grje4rcL4EIrjekl3kYwgWw==
+"@react-spring/types@~9.7.4":
+  version "9.7.4"
+  resolved "https://registry.yarnpkg.com/@react-spring/types/-/types-9.7.4.tgz#c849a7f062b5163d078e5e75f28c8f6acf91792e"
+  integrity sha512-iQVztO09ZVfsletMiY+DpT/JRiBntdsdJ4uqk3UJFhrhS8mIC9ZOZbmfGSRs/kdbNPQkVyzucceDicQ/3Mlj9g==
 
 "@react-spring/web@^9.7.3":
-  version "9.7.3"
-  resolved "https://registry.yarnpkg.com/@react-spring/web/-/web-9.7.3.tgz#d9f4e17fec259f1d65495a19502ada4f5b57fa3d"
-  integrity sha512-BXt6BpS9aJL/QdVqEIX9YoUy8CE6TJrU0mNCqSoxdXlIeNcEBWOfIyE6B14ENNsyQKS3wOWkiJfco0tCr/9tUg==
+  version "9.7.4"
+  resolved "https://registry.yarnpkg.com/@react-spring/web/-/web-9.7.4.tgz#0086ab5dcf17e6a8f3d7e7f8041ccb4cc2fa10dc"
+  integrity sha512-UMvCZp7I5HCVIleSa4BwbNxynqvj+mJjG2m20VO2yPoi2pnCYANy58flvz9v/YcXTAvsmL655FV3pm5fbr6akA==
   dependencies:
-    "@react-spring/animated" "~9.7.3"
-    "@react-spring/core" "~9.7.3"
-    "@react-spring/shared" "~9.7.3"
-    "@react-spring/types" "~9.7.3"
+    "@react-spring/animated" "~9.7.4"
+    "@react-spring/core" "~9.7.4"
+    "@react-spring/shared" "~9.7.4"
+    "@react-spring/types" "~9.7.4"
 
 "@redis/bloom@1.2.0":
   version "1.2.0"
@@ -2459,9 +2465,9 @@
     picomatch "^2.3.1"
 
 "@rushstack/eslint-patch@^1.3.3":
-  version "1.10.3"
-  resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.10.3.tgz#391d528054f758f81e53210f1a1eebcf1a8b1d20"
-  integrity sha512-qC/xYId4NMebE6w/V33Fh9gWxLgURiNYgVNObbJl2LZv0GUUItCcCqC5axQSwRaAgaxl2mELq1rMzlswaQ0Zxg==
+  version "1.10.4"
+  resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.10.4.tgz#427d5549943a9c6fce808e39ea64dbe60d4047f1"
+  integrity sha512-WJgX9nzTqknM393q1QJDJmoW28kUfEnybeTfVNcNAPnIx210RXm2DiXiHzfNPJNIUUb1tJnz/l4QGtJ30PgWmA==
 
 "@sinclair/typebox@^0.27.8":
   version "0.27.8"
@@ -2616,17 +2622,17 @@
     "@swc/counter" "^0.1.3"
     tslib "^2.4.0"
 
-"@tanstack/query-core@5.48.0":
-  version "5.48.0"
-  resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-5.48.0.tgz#a3308ec925d8c16d64c789899d6c084c2fe30cbc"
-  integrity sha512-lZAfPPeVIqXCswE9SSbG33B6/91XOWt/Iq41bFeWb/mnHwQSIfFRbkS4bfs+WhIk9abRArF9Id2fp0Mgo+hq6Q==
+"@tanstack/query-core@5.51.21":
+  version "5.51.21"
+  resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-5.51.21.tgz#a510469c6c30d3de2a8b8798e340169a4b0fd08f"
+  integrity sha512-POQxm42IUp6n89kKWF4IZi18v3fxQWFRolvBA6phNVmA8psdfB1MvDnGacCJdS+EOX12w/CyHM62z//rHmYmvw==
 
 "@tanstack/react-query@^5.28.6":
-  version "5.48.0"
-  resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-5.48.0.tgz#7890620272b48aeb278498dfe082f27518f3ac6d"
-  integrity sha512-GDExbjYWzvDokyRqMSWXdrPiYpp95Aig0oeMIrxTaruOJJgWiWfUP//OAaowm2RrRkGVsavSZdko/XmIrrV2Nw==
+  version "5.51.21"
+  resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-5.51.21.tgz#cdd14677bcc809a83e01b6c38842c841ce7420af"
+  integrity sha512-Q/V81x3sAYgCsxjwOkfLXfrmoG+FmDhLeHH5okC/Bp8Aaw2c33lbEo/mMcMnkxUPVtB2FLpzHT0tq3c+OlZEbw==
   dependencies:
-    "@tanstack/query-core" "5.48.0"
+    "@tanstack/query-core" "5.51.21"
 
 "@trysound/sax@0.2.0":
   version "0.2.0"
@@ -2833,12 +2839,12 @@
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.5.tgz#ec10755e871497bcd83efe927e43ec46e8c0747e"
   integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==
 
-"@types/node@*", "@types/node@^20.9.0":
-  version "20.14.9"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.9.tgz#12e8e765ab27f8c421a1820c99f5f313a933b420"
-  integrity sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==
+"@types/node@*":
+  version "22.1.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.1.0.tgz#6d6adc648b5e03f0e83c78dc788c2b037d0ad94b"
+  integrity sha512-AOmuRF0R2/5j1knA3c6G3HOk523Ga+l+ZXltX8SF1+5oqcXijjfTd8fY3XRZqSihEu9XhtQnKYLmkFaoxgsJHw==
   dependencies:
-    undici-types "~5.26.4"
+    undici-types "~6.13.0"
 
 "@types/node@14":
   version "14.18.63"
@@ -2850,6 +2856,13 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.45.tgz#2c0fafd78705e7a18b7906b5201a522719dc5190"
   integrity sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==
 
+"@types/node@^20.9.0":
+  version "20.14.14"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.14.tgz#6b655d4a88623b0edb98300bb9dd2107225f885e"
+  integrity sha512-d64f00982fS9YoOgJkAMolK7MN8Iq3TDdVjchbYHdEmjth/DHowx82GnoA+tVUAN+7vxfYUgAzi+JXbKNd2SDQ==
+  dependencies:
+    undici-types "~5.26.4"
+
 "@types/normalize-package-data@^2.4.0":
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.3.tgz#291c243e4b94dbfbc0c0ee26b7666f1d5c030e2c"
@@ -3471,16 +3484,6 @@ array.prototype.flatmap@^1.3.2:
     es-abstract "^1.22.1"
     es-shim-unscopables "^1.0.0"
 
-array.prototype.toreversed@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/array.prototype.toreversed/-/array.prototype.toreversed-1.1.2.tgz#b989a6bf35c4c5051e1dc0325151bf8088954eba"
-  integrity sha512-wwDCoT4Ck4Cz7sLtgUmzR5UV3YF5mFHUlbChCzZBQZ+0m2cl/DH3tKgvphv1nKgFsJ48oCSg6p91q2Vm0I/ZMA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-    es-shim-unscopables "^1.0.0"
-
 array.prototype.tosorted@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz#fe954678ff53034e717ea3352a03f0b0b86f7ffc"
@@ -3533,7 +3536,7 @@ astral-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
-async@^3.2.0:
+async@^3.2.0, async@^3.2.3:
   version "3.2.5"
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66"
   integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==
@@ -3578,9 +3581,9 @@ aws4@^1.8.0:
   integrity sha512-3AungXC4I8kKsS9PuS4JH2nc+0bVY/mjgrephHTIi8fpEeGsTHBUJeosp0Wc1myYMElmD0B3Oc4XL/HVJ4PV2g==
 
 axe-core@^4.9.1:
-  version "4.9.1"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.9.1.tgz#fcd0f4496dad09e0c899b44f6c4bb7848da912ae"
-  integrity sha512-QbUdXJVTpvUTHU7871ppZkdOLBeGUKBQWHkHrvN2V9IQWGMt61zf3B45BtzjxEJzYuj0JBjBZP/hmYS/R9pmAw==
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.10.0.tgz#d9e56ab0147278272739a000880196cdfe113b59"
+  integrity sha512-Mr2ZakwQ7XUAjp7pAwQWRhhK8mQQ6JAaNWSjmjxil0R8BPioMtQsTLOolGYkji1rcL++3dCqZA3zWqpT+9Ew6g==
 
 axobject-query@~3.1.1:
   version "3.1.1"
@@ -3916,7 +3919,7 @@ chalk@^2.4.1, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
+chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -4448,11 +4451,11 @@ cypress@*:
     yauzl "^2.10.0"
 
 cypress@^13.6.6:
-  version "13.12.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.12.0.tgz#1a4ea89b7fa6855e32bc02eaf5e25fc45b9e273f"
-  integrity sha512-udzS2JilmI9ApO/UuqurEwOvThclin5ntz7K0BtnHBs+tg2Bl9QShLISXpSEMDv/u8b6mqdoAdyKeZiSqKWL8g==
+  version "13.13.2"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.13.2.tgz#c71f8d92056c430b1b879e5313f6de25ccce0eda"
+  integrity sha512-PvJQU33933NvS1StfzEb8/mu2kMy4dABwCF+yd5Bi7Qly1HOVf+Bufrygee/tlmty/6j5lX+KIi8j9Q3JUMbhA==
   dependencies:
-    "@cypress/request" "^3.0.0"
+    "@cypress/request" "^3.0.1"
     "@cypress/xvfb" "^1.2.4"
     "@types/sinonjs__fake-timers" "8.1.1"
     "@types/sizzle" "^2.3.2"
@@ -4491,7 +4494,7 @@ cypress@^13.6.6:
     request-progress "^3.0.0"
     semver "^7.5.3"
     supports-color "^8.1.1"
-    tmp "~0.2.1"
+    tmp "~0.2.3"
     untildify "^4.0.0"
     yauzl "^2.10.0"
 
@@ -4633,9 +4636,9 @@ dateformat@^5.0.3:
   integrity sha512-Kvr6HmPXUMerlLcLF+Pwq3K7apHpYmGDVqrxcDasBg86UcKeTSNWbEzU8bwdXnxnR44FtMhJAxI4Bov6Y/KUfA==
 
 dayjs@^1.10.4:
-  version "1.11.11"
-  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.11.tgz#dfe0e9d54c5f8b68ccf8ca5f72ac603e7e5ed59e"
-  integrity sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==
+  version "1.11.12"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.12.tgz#5245226cc7f40a15bf52e0b99fd2a04669ccac1d"
+  integrity sha512-Rt2g+nTbLlDWZTwwrIXjy9MeiZmSDI375FvZs72ngxx8PDC6YXOeR3q5LAuPzjZQxhiWdRKac7RKV+YyQYfYIg==
 
 debounce@^1.2.1:
   version "1.2.1"
@@ -4657,9 +4660,9 @@ debug@^3.1.0, debug@^3.2.7:
     ms "^2.1.1"
 
 debug@^4.1.1, debug@^4.3.4:
-  version "4.3.5"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e"
-  integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==
+  version "4.3.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b"
+  integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==
   dependencies:
     ms "2.1.2"
 
@@ -4905,6 +4908,13 @@ ecdsa-sig-formatter@1.0.11:
   dependencies:
     safe-buffer "^5.0.1"
 
+ejs@^3.1.10:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b"
+  integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==
+  dependencies:
+    jake "^10.8.5"
+
 electron-to-chromium@^1.4.535:
   version "1.4.561"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.561.tgz#816f31d9ae01fe58abbf469fca7e125b16befd85"
@@ -4938,9 +4948,9 @@ end-of-stream@^1.1.0:
     once "^1.4.0"
 
 enhanced-resolve@^5.12.0:
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz#d037603789dd9555b89aaec7eb78845c49089bc5"
-  integrity sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA==
+  version "5.17.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
+  integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -5155,11 +5165,11 @@ escape-string-regexp@^4.0.0:
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
 eslint-config-next@^14.0.4:
-  version "14.2.4"
-  resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-14.2.4.tgz#eb0bedfe4a894bc2aea918214bb5243ee4fa7d4b"
-  integrity sha512-Qr0wMgG9m6m4uYy2jrYJmyuNlYZzPRQq5Kvb9IDlYwn+7yq6W6sfMNFgb+9guM1KYwuIo6TIaiFhZJ6SnQ/Efw==
+  version "14.2.5"
+  resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-14.2.5.tgz#cdd43d89047eb7391ba25445d5855b4600b6adb9"
+  integrity sha512-zogs9zlOiZ7ka+wgUnmcM0KBEDjo4Jis7kxN1jvC0N4wynQ2MIx/KBkg4mVF63J5EK4W0QMCn7xO3vNisjaAoA==
   dependencies:
-    "@next/eslint-plugin-next" "14.2.4"
+    "@next/eslint-plugin-next" "14.2.5"
     "@rushstack/eslint-patch" "^1.3.3"
     "@typescript-eslint/parser" "^5.4.2 || ^6.0.0 || 7.0.0 - 7.2.0"
     eslint-import-resolver-node "^0.3.6"
@@ -5283,9 +5293,9 @@ eslint-plugin-prettier@^4.0.0:
     prettier-linter-helpers "^1.0.0"
 
 eslint-plugin-promise@^6.1.1:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-6.2.0.tgz#e24ab0e3c0a25fa227d98d9ff612156b5af15945"
-  integrity sha512-QmAqwizauvnKOlifxyDj2ObfULpHQawlg/zQdgEixur9vl0CvZGv/LCJV2rtj3210QCoeGBzVMfMXqGAOr/4fA==
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-6.6.0.tgz#acd3fd7d55cead7a10f92cf698f36c0aafcd717a"
+  integrity sha512-57Zzfw8G6+Gq7axm2Pdo3gW/Rx3h9Yywgn61uE/3elTCOePEHVrn2i5CdfBwA1BLK0Q0WqctICIUSqXZW/VprQ==
 
 "eslint-plugin-react-hooks@^4.5.0 || 5.0.0-canary-7118f5dd7-20230705":
   version "4.6.2"
@@ -5293,28 +5303,28 @@ eslint-plugin-promise@^6.1.1:
   integrity sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==
 
 eslint-plugin-react@^7.33.2:
-  version "7.34.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.34.3.tgz#9965f27bd1250a787b5d4cfcc765e5a5d58dcb7b"
-  integrity sha512-aoW4MV891jkUulwDApQbPYTVZmeuSyFrudpbTAQuj5Fv8VL+o6df2xIGpw8B0hPjAaih1/Fb0om9grCdyFYemA==
+  version "7.35.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.35.0.tgz#00b1e4559896710e58af6358898f2ff917ea4c41"
+  integrity sha512-v501SSMOWv8gerHkk+IIQBkcGRGrO2nfybfj5pLxuJNFTPxxA3PSryhXTK+9pNbtkggheDdsC0E9Q8CuPk6JKA==
   dependencies:
     array-includes "^3.1.8"
     array.prototype.findlast "^1.2.5"
     array.prototype.flatmap "^1.3.2"
-    array.prototype.toreversed "^1.1.2"
     array.prototype.tosorted "^1.1.4"
     doctrine "^2.1.0"
     es-iterator-helpers "^1.0.19"
     estraverse "^5.3.0"
+    hasown "^2.0.2"
     jsx-ast-utils "^2.4.1 || ^3.0.0"
     minimatch "^3.1.2"
     object.entries "^1.1.8"
     object.fromentries "^2.0.8"
-    object.hasown "^1.1.4"
     object.values "^1.2.0"
     prop-types "^15.8.1"
     resolve "^2.0.0-next.5"
     semver "^6.3.1"
     string.prototype.matchall "^4.0.11"
+    string.prototype.repeat "^1.0.0"
 
 eslint-scope@^5.1.1:
   version "5.1.1"
@@ -5661,6 +5671,13 @@ file-entry-cache@^7.0.0:
   dependencies:
     flat-cache "^3.2.0"
 
+filelist@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5"
+  integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==
+  dependencies:
+    minimatch "^5.0.1"
+
 fill-range@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
@@ -5794,7 +5811,7 @@ function-bind@^1.1.2:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
   integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
-function.prototype.name@^1.1.5, function.prototype.name@^1.1.6:
+function.prototype.name@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd"
   integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==
@@ -5869,9 +5886,9 @@ get-symbol-description@^1.0.2:
     get-intrinsic "^1.2.4"
 
 get-tsconfig@^4.5.0:
-  version "4.7.5"
-  resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.7.5.tgz#5e012498579e9a6947511ed0cd403272c7acbbaf"
-  integrity sha512-ZCuZCnlqNzjb4QprAzXKdpp/gh6KTxSJuw3IBsPnV/7fV4NxC9ckB+vPTt8w7fJA0TaSD7c55BR47JD6MEDyDw==
+  version "4.7.6"
+  resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.7.6.tgz#118fd5b7b9bae234cc7705a00cd771d7eb65d62a"
+  integrity sha512-ZAqrLlu18NbDdRaHq+AKXzAmqIUPswPWKUchfytdAjiRFnCe5ojG2bstg6mRiZabkKfCoL/e98pbBELIV/YCeA==
   dependencies:
     resolve-pkg-maps "^1.0.0"
 
@@ -6373,9 +6390,9 @@ is-ci@^3.0.1:
     ci-info "^3.2.0"
 
 is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.13.1:
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.14.0.tgz#43b8ef9f46a6a08888db67b1ffd4ec9e3dfd59d1"
-  integrity sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.0.tgz#71c72ec5442ace7e76b306e9d48db361f22699ea"
+  integrity sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==
   dependencies:
     hasown "^2.0.2"
 
@@ -6610,9 +6627,9 @@ isarray@^2.0.5:
   integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
 
 isbot@^5.1.1:
-  version "5.1.11"
-  resolved "https://registry.yarnpkg.com/isbot/-/isbot-5.1.11.tgz#55e91e887c806a5f07d18ce04c2efe194215ba36"
-  integrity sha512-Asuou7OsKVbATgXlrlqdeSRw4fYnD6CNcc0IXy1f5m1AImL2S6IP0xRcRRzjGjoARbegvnBnju9kk5z/Itf70Q==
+  version "5.1.13"
+  resolved "https://registry.yarnpkg.com/isbot/-/isbot-5.1.13.tgz#c291ae9f33d346c070648cb44d6ab2bb163650d1"
+  integrity sha512-RXtBib4m9zChSb+187EpNQML7Z3u2i34zDdqcRFZnqSJs0xdh91xzJytc5apYVg+9Y4NGnUQ0AIeJvX9FAnCUw==
 
 isexe@^2.0.0:
   version "2.0.0"
@@ -6697,6 +6714,16 @@ jackspeak@^2.3.5:
   optionalDependencies:
     "@pkgjs/parseargs" "^0.11.0"
 
+jake@^10.8.5:
+  version "10.9.2"
+  resolved "https://registry.yarnpkg.com/jake/-/jake-10.9.2.tgz#6ae487e6a69afec3a5e167628996b59f35ae2b7f"
+  integrity sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==
+  dependencies:
+    async "^3.2.3"
+    chalk "^4.0.2"
+    filelist "^1.0.4"
+    minimatch "^3.1.2"
+
 jest-changed-files@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.7.0.tgz#1c06d07e77c78e1585d020424dedc10d6e17ac3a"
@@ -7527,9 +7554,9 @@ lower-case@^2.0.2:
     tslib "^2.0.3"
 
 lru-cache@^10.2.0:
-  version "10.3.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.3.0.tgz#4a4aaf10c84658ab70f79a85a9a3f1e1fb11196b"
-  integrity sha512-CQl19J/g+Hbjbv4Y3mFNNXFEL/5t/KCg8POCuUqd4rMKjGG+j1ybER83hxV58zL+dFI1PTkt3GNFSHRt+d8qEQ==
+  version "10.4.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"
+  integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
 
 lru-cache@^5.1.1:
   version "5.1.1"
@@ -7601,12 +7628,12 @@ mathml-tag-names@^2.1.3:
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
 maxmind@^4.3.6:
-  version "4.3.20"
-  resolved "https://registry.yarnpkg.com/maxmind/-/maxmind-4.3.20.tgz#1b85c4b0d9a8df072c5cbe50dc5c54c130a02889"
-  integrity sha512-xwnLGghs96DyNK3ANs1jzW8+JwS6pBQ3eTh3kNsi23n5wySZb9FgqCghmde5JZFOv23bxGehcyh6lT522llNKw==
+  version "4.3.21"
+  resolved "https://registry.yarnpkg.com/maxmind/-/maxmind-4.3.21.tgz#cc3af09775e9b96434a56b6ac63c9bf4878d23b8"
+  integrity sha512-orda4yI01roTa4pP5Jf43u5HPOoEIGaLudTn9cdgCPyZDPipTJdbz1boZQR9QE96hvwNDrJwt1ak9vHIE6iZSQ==
   dependencies:
     mmdb-lib "2.1.1"
-    tiny-lru "11.2.6"
+    tiny-lru "11.2.11"
 
 md5@^2.3.0:
   version "2.3.0"
@@ -8050,15 +8077,6 @@ object.groupby@^1.0.1:
     define-properties "^1.2.1"
     es-abstract "^1.23.2"
 
-object.hasown@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.4.tgz#e270ae377e4c120cdcb7656ce66884a6218283dc"
-  integrity sha512-FZ9LZt9/RHzGySlBARE3VF+gE26TxR38SdmqOqliuTnl9wrKulaQs+4dee1V+Io8VfxqzAfHu6YuRgUy8OHoTg==
-  dependencies:
-    define-properties "^1.2.1"
-    es-abstract "^1.23.2"
-    es-object-atoms "^1.0.0"
-
 object.values@^1.1.6, object.values@^1.1.7, object.values@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.0.tgz#65405a9d92cee68ac2d303002e0b8470a4d9ab1b"
@@ -8258,10 +8276,10 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
 
-picocolors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
-  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+picocolors@^1.0.0, picocolors@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1"
+  integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==
 
 picomatch@^2.0.4, picomatch@^2.2.3, picomatch@^2.3.1:
   version "2.3.1"
@@ -8880,12 +8898,12 @@ postcss@^8.4.28:
     source-map-js "^1.0.2"
 
 postcss@^8.4.31:
-  version "8.4.38"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"
-  integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==
+  version "8.4.40"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.40.tgz#eb81f2a4dd7668ed869a6db25999e02e9ad909d8"
+  integrity sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==
   dependencies:
     nanoid "^3.3.7"
-    picocolors "^1.0.0"
+    picocolors "^1.0.1"
     source-map-js "^1.2.0"
 
 prelude-ls@^1.2.1:
@@ -8919,12 +8937,12 @@ pretty-format@^29.0.0, pretty-format@^29.7.0:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
-prisma@5.16.2:
-  version "5.16.2"
-  resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.16.2.tgz#f46f130550bc148e603d25e06e82263fa6ab68e8"
-  integrity sha512-rFV/xoBR2hBGGlu4LPLQd4U8WVA+tSAmYyFWGPRVfj+xg7N4kiZV4lSk38htSpF+/IuHKzlrbh4SFk8Z18cI8A==
+prisma@5.17.0:
+  version "5.17.0"
+  resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.17.0.tgz#267b43921ab94805b010537cffa5ccaf530fa066"
+  integrity sha512-m4UWkN5lBE6yevqeOxEvmepnL5cNPEjzMw2IqDB59AcEV6w7D8vGljDLd1gPFH+W6gUxw9x7/RmN5dCS/WTPxA==
   dependencies:
-    "@prisma/engines" "5.16.2"
+    "@prisma/engines" "5.17.0"
 
 process@^0.11.10:
   version "0.11.10"
@@ -9025,10 +9043,10 @@ randombytes@^2.1.0:
   dependencies:
     safe-buffer "^5.1.0"
 
-react-basics@^0.123.0:
-  version "0.123.0"
-  resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.123.0.tgz#8b18c1c1a235858dd0d1e329d5b1c3ac9ab48df3"
-  integrity sha512-5K5b6pSp0uiBMytDeSlWuAHRjkLfwpySAIc1jKM4nuR8E6jf6UxGn4W2I7jI8p220vmdeK8Phsyxht0UxvIxHA==
+react-basics@^0.124.0:
+  version "0.124.0"
+  resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.124.0.tgz#c2c783f634aadccc13aae8a770960d298a10ebe4"
+  integrity sha512-5E2chyDE0PKKQ9x7kKM18/6UjFsjkPx7mfbTJb4PsWCC5gPi6m5zX7uPWF7omu4/I5Oms/nj16D3pa350WXIyw==
   dependencies:
     "@react-spring/web" "^9.7.3"
     classnames "^2.3.1"
@@ -9600,9 +9618,9 @@ semver@^7.3.4, semver@^7.3.7:
     lru-cache "^6.0.0"
 
 semver@^7.5.3, semver@^7.5.4:
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13"
-  integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
+  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
 
 serialize-javascript@^4.0.0:
   version "4.0.0"
@@ -9919,6 +9937,14 @@ string.prototype.padend@^3.0.0:
     define-properties "^1.2.0"
     es-abstract "^1.22.1"
 
+string.prototype.repeat@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz#e90872ee0308b29435aa26275f6e1b762daee01a"
+  integrity sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
+
 string.prototype.trim@^1.2.9:
   version "1.2.9"
   resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz#b6fa326d72d2c78b6df02f7759c73f8f6274faa4"
@@ -10247,12 +10273,12 @@ tiny-invariant@^1.0.6:
   resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.1.tgz#8560808c916ef02ecfd55e66090df23a4b7aa642"
   integrity sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==
 
-tiny-lru@11.2.6:
-  version "11.2.6"
-  resolved "https://registry.yarnpkg.com/tiny-lru/-/tiny-lru-11.2.6.tgz#86a4fd0ad615eac1639adf92010e8b944e209fdb"
-  integrity sha512-0PU3c9PjMnltZaFo2sGYv/nnJsMjG0Cxx8X6FXHPPGjFyoo1SJDxvUXW1207rdiSxYizf31roo+GrkIByQeZoA==
+tiny-lru@11.2.11:
+  version "11.2.11"
+  resolved "https://registry.yarnpkg.com/tiny-lru/-/tiny-lru-11.2.11.tgz#5089a6a4a157f5a97b82aa930b44d550ac5c4778"
+  integrity sha512-27BIW0dIWTYYoWNnqSmoNMKe5WIbkXsc0xaCQHd3/3xT2XMuMJrzHdrO9QBFR14emBz1Bu0dOAs2sCBBrvgPQA==
 
-tmp@~0.2.1:
+tmp@~0.2.1, tmp@~0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae"
   integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==
@@ -10312,11 +10338,12 @@ ts-api-utils@^1.0.1:
   integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
 
 ts-jest@^29.1.2:
-  version "29.1.5"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.5.tgz#d6c0471cc78bffa2cb4664a0a6741ef36cfe8f69"
-  integrity sha512-UuClSYxM7byvvYfyWdFI+/2UxMmwNyJb0NPkZPQE2hew3RurV7l7zURgOHAd/1I1ZdPpe3GUsXNXAcN8TFKSIg==
+  version "29.2.4"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.2.4.tgz#38ccf487407d7a63054a72689f6f99b075e296e5"
+  integrity sha512-3d6tgDyhCI29HlpwIq87sNuI+3Q6GLTTCeYRHCs7vDz+/3GCMwEtV9jezLyl4ZtnBgx00I7hm8PCP8cTksMGrw==
   dependencies:
     bs-logger "0.x"
+    ejs "^3.1.10"
     fast-json-stable-stringify "2.x"
     jest-util "^29.0.0"
     json5 "^2.2.3"
@@ -10487,9 +10514,9 @@ typescript@^4.0, typescript@^4.5:
   integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
 typescript@^5.5.3:
-  version "5.5.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.3.tgz#e1b0a3c394190838a0b168e771b0ad56a0af0faa"
-  integrity sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==
+  version "5.5.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba"
+  integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==
 
 unbox-primitive@^1.0.2:
   version "1.0.2"
@@ -10506,6 +10533,11 @@ undici-types@~5.26.4:
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
   integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
 
+undici-types@~6.13.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.13.0.tgz#e3e79220ab8c81ed1496b5812471afd7cf075ea5"
+  integrity sha512-xtFJHudx8S2DSoujjMd1WeWvn7KKWFRESZTMeL1RptAYERu29D6jphMjjY+vn96jvN3kVPDNxU/E13VTaXj6jg==
+
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
@@ -10668,12 +10700,12 @@ which-boxed-primitive@^1.0.2:
     is-symbol "^1.0.3"
 
 which-builtin-type@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.1.3.tgz#b1b8443707cc58b6e9bf98d32110ff0c2cbd029b"
-  integrity sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.1.4.tgz#592796260602fc3514a1b5ee7fa29319b72380c3"
+  integrity sha512-bppkmBSsHFmIMSl8BO9TbsyzsvGjVoppt8xUiGzwiu/bhDCGxnpOKCxgqj6GuyHE0mINMDecBFPlOm2hzY084w==
   dependencies:
-    function.prototype.name "^1.1.5"
-    has-tostringtag "^1.0.0"
+    function.prototype.name "^1.1.6"
+    has-tostringtag "^1.0.2"
     is-async-function "^2.0.0"
     is-date-object "^1.0.5"
     is-finalizationregistry "^1.0.2"
@@ -10682,10 +10714,10 @@ which-builtin-type@^1.1.3:
     is-weakref "^1.0.2"
     isarray "^2.0.5"
     which-boxed-primitive "^1.0.2"
-    which-collection "^1.0.1"
-    which-typed-array "^1.1.9"
+    which-collection "^1.0.2"
+    which-typed-array "^1.1.15"
 
-which-collection@^1.0.1:
+which-collection@^1.0.1, which-collection@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.2.tgz#627ef76243920a107e7ce8e96191debe4b16c2a0"
   integrity sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==
@@ -10695,7 +10727,7 @@ which-collection@^1.0.1:
     is-weakmap "^2.0.2"
     is-weakset "^2.0.3"
 
-which-typed-array@^1.1.13, which-typed-array@^1.1.14, which-typed-array@^1.1.15, which-typed-array@^1.1.9:
+which-typed-array@^1.1.13, which-typed-array@^1.1.14, which-typed-array@^1.1.15:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d"
   integrity sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==

From c6b81149455fc772f8f86b622cab12e520987932 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Wed, 7 Aug 2024 22:39:36 -0700
Subject: [PATCH 250/438] Updated events page.

---
 .../[websiteId]/events/EventsDataTable.tsx    |  7 +--
 .../[websiteId]/events/EventsMetricsBar.tsx   | 42 +++++++++++++++
 .../[websiteId]/events/EventsPage.tsx         | 21 +++++++-
 .../sessions/SessionsMetricsBar.tsx           | 52 +++++++++----------
 src/components/common/DataTable.tsx           |  2 +-
 .../hooks/queries/useWebsiteSessions.ts       |  1 +
 src/components/input/DateFilter.module.css    |  3 ++
 src/components/input/DateFilter.tsx           |  4 +-
 src/components/layout/Grid.module.css         |  4 ++
 src/components/metrics/MetricsBar.module.css  |  2 +
 .../analytics/events/getWebsiteEvents.ts      |  4 +-
 src/queries/analytics/getWebsiteStats.ts      | 22 ++++----
 .../analytics/sessions/getWebsiteSessions.ts  |  4 ++
 13 files changed, 122 insertions(+), 46 deletions(-)
 create mode 100644 src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsx
 create mode 100644 src/components/input/DateFilter.module.css

diff --git a/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx
index f2bf7cb9d2..49b31656d3 100644
--- a/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx
+++ b/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx
@@ -5,7 +5,6 @@ import { ReactNode } from 'react';
 
 export default function EventsDataTable({
   websiteId,
-  children,
 }: {
   websiteId?: string;
   teamId?: string;
@@ -13,12 +12,8 @@ export default function EventsDataTable({
 }) {
   const queryResult = useWebsiteEvents(websiteId);
 
-  if (queryResult?.result?.data?.length === 0) {
-    return children;
-  }
-
   return (
-    <DataTable queryResult={queryResult} allowSearch={false}>
+    <DataTable queryResult={queryResult} allowSearch={true}>
       {({ data }) => <EventsTable data={data} />}
     </DataTable>
   );
diff --git a/src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsx
new file mode 100644
index 0000000000..f77c6c04de
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsx
@@ -0,0 +1,42 @@
+import WebsiteDateFilter from 'components/input/WebsiteDateFilter';
+import { Flexbox } from 'react-basics';
+import MetricsBar from 'components/metrics/MetricsBar';
+import MetricCard from 'components/metrics/MetricCard';
+import { useMessages } from 'components/hooks';
+import useWebsiteStats from 'components/hooks/queries/useWebsiteStats';
+import { formatLongNumber } from 'lib/format';
+
+export function EventsMetricsBar({ websiteId }: { websiteId: string }) {
+  const { formatMessage, labels } = useMessages();
+  const { data, isLoading, isFetched, error } = useWebsiteStats(websiteId);
+
+  return (
+    <Flexbox direction="row" justifyContent="space-between" style={{ minHeight: 120 }}>
+      <MetricsBar isLoading={isLoading} isFetched={isFetched} error={error}>
+        <MetricCard
+          value={data?.visitors?.value}
+          label={formatMessage(labels.visitors)}
+          formatValue={formatLongNumber}
+        />
+        <MetricCard
+          value={data?.visits?.value}
+          label={formatMessage(labels.visits)}
+          formatValue={formatLongNumber}
+        />
+        <MetricCard
+          value={data?.pageviews?.value}
+          label={formatMessage(labels.views)}
+          formatValue={formatLongNumber}
+        />
+        <MetricCard
+          value={data?.events?.value}
+          label={formatMessage(labels.events)}
+          formatValue={formatLongNumber}
+        />
+      </MetricsBar>
+      <WebsiteDateFilter websiteId={websiteId} />
+    </Flexbox>
+  );
+}
+
+export default EventsMetricsBar;
diff --git a/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx
index 8f793d81ed..e35442d065 100644
--- a/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx
+++ b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx
@@ -1,12 +1,31 @@
 'use client';
 import WebsiteHeader from '../WebsiteHeader';
 import EventsDataTable from './EventsDataTable';
+import EventsMetricsBar from './EventsMetricsBar';
+import EventsChart from 'components/metrics/EventsChart';
+import { GridRow } from 'components/layout/Grid';
+import MetricsTable from 'components/metrics/MetricsTable';
+import { useMessages } from 'components/hooks';
 
 export default function EventsPage({ websiteId }) {
+  const { formatMessage, labels } = useMessages();
+
   return (
     <>
       <WebsiteHeader websiteId={websiteId} />
-      <EventsDataTable websiteId={websiteId} />
+      <EventsMetricsBar websiteId={websiteId} />
+      <GridRow columns="two-one">
+        <EventsChart websiteId={websiteId} />
+        <MetricsTable
+          websiteId={websiteId}
+          type="event"
+          title={formatMessage(labels.events)}
+          metric={formatMessage(labels.actions)}
+        />
+      </GridRow>
+      <GridRow columns="one">
+        <EventsDataTable websiteId={websiteId} />
+      </GridRow>
     </>
   );
 }
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx
index 6d3c357957..9133ca71c6 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx
@@ -1,5 +1,6 @@
 import WebsiteDateFilter from 'components/input/WebsiteDateFilter';
-import { Flexbox, Loading } from 'react-basics';
+import { Flexbox } from 'react-basics';
+import MetricsBar from 'components/metrics/MetricsBar';
 import MetricCard from 'components/metrics/MetricCard';
 import { useMessages } from 'components/hooks';
 import useWebsiteStats from 'components/hooks/queries/useWebsiteStats';
@@ -7,33 +8,32 @@ import { formatLongNumber } from 'lib/format';
 
 export function SessionsMetricsBar({ websiteId }: { websiteId: string }) {
   const { formatMessage, labels } = useMessages();
-  const { data, isLoading } = useWebsiteStats(websiteId);
+  const { data, isLoading, isFetched, error } = useWebsiteStats(websiteId);
 
   return (
-    <Flexbox direction="row" justifyContent="space-between" style={{ height: 120 }}>
-      <Flexbox direction="row">
-        {isLoading && <Loading icon="dots" />}
-        {!isLoading && data && (
-          <>
-            <MetricCard
-              value={data.visitors.value}
-              label={formatMessage(labels.visitors)}
-              formatValue={formatLongNumber}
-            />
-            <MetricCard
-              value={data.visits.value}
-              label={formatMessage(labels.visits)}
-              formatValue={formatLongNumber}
-            />
-            <MetricCard
-              value={data.pageviews.value}
-              label={formatMessage(labels.views)}
-              formatValue={formatLongNumber}
-            />
-            <MetricCard value={data?.countries?.value} label={formatMessage(labels.countries)} />
-          </>
-        )}
-      </Flexbox>
+    <Flexbox direction="row" justifyContent="space-between" style={{ minHeight: 120 }}>
+      <MetricsBar isLoading={isLoading} isFetched={isFetched} error={error}>
+        <MetricCard
+          value={data?.visitors?.value}
+          label={formatMessage(labels.visitors)}
+          formatValue={formatLongNumber}
+        />
+        <MetricCard
+          value={data?.visits?.value}
+          label={formatMessage(labels.visits)}
+          formatValue={formatLongNumber}
+        />
+        <MetricCard
+          value={data?.pageviews?.value}
+          label={formatMessage(labels.views)}
+          formatValue={formatLongNumber}
+        />
+        <MetricCard
+          value={data?.countries?.value}
+          label={formatMessage(labels.countries)}
+          formatValue={formatLongNumber}
+        />
+      </MetricsBar>
       <WebsiteDateFilter websiteId={websiteId} />
     </Flexbox>
   );
diff --git a/src/components/common/DataTable.tsx b/src/components/common/DataTable.tsx
index 0f011c3331..775e123c8c 100644
--- a/src/components/common/DataTable.tsx
+++ b/src/components/common/DataTable.tsx
@@ -34,7 +34,7 @@ export function DataTable({
   const { page, pageSize, count, data } = result || {};
   const { query } = params || {};
   const hasData = Boolean(!isLoading && data?.length);
-  const noResults = Boolean(!isLoading && query && !hasData);
+  const noResults = Boolean(query && !hasData);
   const { router, renderUrl } = useNavigation();
 
   const handleSearch = (query: string) => {
diff --git a/src/components/hooks/queries/useWebsiteSessions.ts b/src/components/hooks/queries/useWebsiteSessions.ts
index e8a1ce2f82..ce65512c2f 100644
--- a/src/components/hooks/queries/useWebsiteSessions.ts
+++ b/src/components/hooks/queries/useWebsiteSessions.ts
@@ -15,6 +15,7 @@ export function useWebsiteSessions(websiteId: string, params?: { [key: string]:
         ...data,
         ...params,
         ...filters,
+        pageSize: 20,
       });
     },
   });
diff --git a/src/components/input/DateFilter.module.css b/src/components/input/DateFilter.module.css
new file mode 100644
index 0000000000..bd9ec1a8c4
--- /dev/null
+++ b/src/components/input/DateFilter.module.css
@@ -0,0 +1,3 @@
+.dropdown span {
+  white-space: nowrap;
+}
diff --git a/src/components/input/DateFilter.tsx b/src/components/input/DateFilter.tsx
index 6e7c099a55..e486551d65 100644
--- a/src/components/input/DateFilter.tsx
+++ b/src/components/input/DateFilter.tsx
@@ -5,6 +5,8 @@ import DatePickerForm from 'components/metrics/DatePickerForm';
 import { useLocale, useMessages } from 'components/hooks';
 import Icons from 'components/icons';
 import { formatDate, parseDateValue } from 'lib/date';
+import styles from './DateFilter.module.css';
+import classNames from 'classnames';
 
 export interface DateFilterProps {
   value: string;
@@ -123,7 +125,7 @@ export function DateFilter({
   return (
     <>
       <Dropdown
-        className={className}
+        className={classNames(className, styles.dropdown)}
         items={options}
         renderValue={renderValue}
         value={value}
diff --git a/src/components/layout/Grid.module.css b/src/components/layout/Grid.module.css
index de99b75261..7a2b7124a6 100644
--- a/src/components/layout/Grid.module.css
+++ b/src/components/layout/Grid.module.css
@@ -27,6 +27,10 @@
   padding-inline-end: 0;
 }
 
+.col.one {
+  grid-column: span 6;
+}
+
 .col.two {
   grid-column: span 3;
 }
diff --git a/src/components/metrics/MetricsBar.module.css b/src/components/metrics/MetricsBar.module.css
index 21c9e80238..dadee9ef76 100644
--- a/src/components/metrics/MetricsBar.module.css
+++ b/src/components/metrics/MetricsBar.module.css
@@ -2,6 +2,8 @@
   display: grid;
   grid-template-columns: repeat(auto-fit, minmax(140px, max-content));
   gap: 20px;
+  width: 100%;
+  position: relative;
 }
 
 @media screen and (max-width: 768px) {
diff --git a/src/queries/analytics/events/getWebsiteEvents.ts b/src/queries/analytics/events/getWebsiteEvents.ts
index b76d1ee548..8666816102 100644
--- a/src/queries/analytics/events/getWebsiteEvents.ts
+++ b/src/queries/analytics/events/getWebsiteEvents.ts
@@ -26,6 +26,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
 async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
   const { pagedQuery, parseFilters, getDateStringSQL } = clickhouse;
   const { params, dateQuery, filterQuery } = await parseFilters(websiteId, filters);
+  const { query } = pageParams;
 
   return pagedQuery(
     `
@@ -46,9 +47,10 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
     where website_id = {websiteId:UUID}
     ${dateQuery}
     ${filterQuery}
+    ${query ? `and (positionCaseInsensitive(event_name, {query:String}) > 0)` : ''}
     order by created_at desc
     `,
-    params,
+    { ...params, query },
     pageParams,
   );
 }
diff --git a/src/queries/analytics/getWebsiteStats.ts b/src/queries/analytics/getWebsiteStats.ts
index 7f7f4f19e2..a33011ff5c 100644
--- a/src/queries/analytics/getWebsiteStats.ts
+++ b/src/queries/analytics/getWebsiteStats.ts
@@ -1,5 +1,4 @@
 import clickhouse from 'lib/clickhouse';
-import { EVENT_TYPE } from 'lib/constants';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import prisma from 'lib/prisma';
 import { QueryFilters } from 'lib/types';
@@ -25,7 +24,6 @@ async function relationalQuery(
   const { getTimestampDiffSQL, parseFilters, rawQuery } = prisma;
   const { filterQuery, joinSession, params } = await parseFilters(websiteId, {
     ...filters,
-    eventType: EVENT_TYPE.pageView,
   });
 
   return rawQuery(
@@ -35,12 +33,15 @@ async function relationalQuery(
       count(distinct t.session_id) as "visitors",
       count(distinct t.visit_id) as "visits",
       count(distinct t.country) as "countries",
+      count(t.event_name) as "countries",
+      sum(case when t.event_type = 2 then 1 else 0 end) as "events",
       sum(case when t.c = 1 then 1 else 0 end) as "bounces",
       sum(${getTimestampDiffSQL('t.min_time', 't.max_time')}) as "totaltime",
     from (
       select
         website_event.session_id,
         website_event.visit_id,
+        website_event.event_type,
         session.country,
         count(*) as "c",
         min(website_event.created_at) as "min_time",
@@ -49,9 +50,8 @@ async function relationalQuery(
         ${joinSession}
       where website_event.website_id = {{websiteId::uuid}}
         and website_event.created_at between {{startDate}} and {{endDate}}
-        and event_type = {{eventType}}
         ${filterQuery}
-      group by 1, 2, 3
+      group by 1, 2, 3, 4
     ) as t
     `,
     params,
@@ -67,7 +67,6 @@ async function clickhouseQuery(
   const { rawQuery, parseFilters } = clickhouse;
   const { filterQuery, params } = await parseFilters(websiteId, {
     ...filters,
-    eventType: EVENT_TYPE.pageView,
   });
 
   let sql = '';
@@ -79,12 +78,14 @@ async function clickhouseQuery(
       uniq(t.session_id) as "visitors",
       uniq(t.visit_id) as "visits",
       uniq(t.country) as "countries",
-      sum(if(t.c = 1, 1, 0)) as "bounces",
+      sumIf(1, t.event_type = 2) as "events",
+      sumIf(1, t.c = 1) as "bounces",
       sum(max_time-min_time) as "totaltime"
     from (
       select
         session_id,
         visit_id,
+        event_type,
         country,
         count(*) c,
         min(created_at) min_time,
@@ -92,9 +93,8 @@ async function clickhouseQuery(
       from website_event
       where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
-        and event_type = {eventType:UInt32}
         ${filterQuery}
-      group by session_id, visit_id, country
+      group by session_id, visit_id, event_type, country
     ) as t;
     `;
   } else {
@@ -104,12 +104,14 @@ async function clickhouseQuery(
       uniq(session_id) as "visitors",
       uniq(visit_id) as "visits",
       uniq(country) as "countries",
+      sumIf(1, t.event_type = 2) as "events",
       sumIf(1, t.c = 1) as "bounces",
       sum(max_time-min_time) as "totaltime"
     from (
       select
           session_id,
           visit_id,
+          event_type,
           country,
           sum(views) c,
           min(min_time) min_time,
@@ -117,9 +119,8 @@ async function clickhouseQuery(
       from umami.website_event_stats_hourly "website_event"
       where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
-        and event_type = {eventType:UInt32}
         ${filterQuery}
-      group by session_id, visit_id, country
+      group by session_id, visit_id, event_type, country
     ) as t;
     `;
   }
@@ -133,6 +134,7 @@ async function clickhouseQuery(
         bounces: Number(a.bounces),
         totaltime: Number(a.totaltime),
         countries: Number(a.countries),
+        events: Number(a.events),
       };
     });
   });
diff --git a/src/queries/analytics/sessions/getWebsiteSessions.ts b/src/queries/analytics/sessions/getWebsiteSessions.ts
index 94d2827ee1..26852616fc 100644
--- a/src/queries/analytics/sessions/getWebsiteSessions.ts
+++ b/src/queries/analytics/sessions/getWebsiteSessions.ts
@@ -14,10 +14,12 @@ export async function getWebsiteSessions(
 
 async function relationalQuery(websiteId: string, filters: QueryFilters, pageParams: PageParams) {
   const { pagedQuery } = prisma;
+  const { query } = pageParams;
 
   const where = {
     ...filters,
     id: websiteId,
+    ...prisma.getSearchParameters(query, [{ eventName: 'contains' }, { urlPath: 'contains' }]),
   };
 
   return pagedQuery('session', { where }, pageParams);
@@ -26,6 +28,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
 async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
   const { pagedQuery, parseFilters } = clickhouse;
   const { params, dateQuery, filterQuery } = await parseFilters(websiteId, filters);
+  const { query } = pageParams;
 
   return pagedQuery(
     `
@@ -49,6 +52,7 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
     where website_id = {websiteId:UUID}
     ${dateQuery}
     ${filterQuery}
+    ${query ? `and (positionCaseInsensitive(event_name, {query:String}) > 0)` : ''}
     group by session_id, website_id, hostname, browser, os, device, screen, language, country, subdivision1, city
     order by lastAt desc
     `,

From 60d53382cac60afeb8930028eee88f7346e3e1b7 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Thu, 8 Aug 2024 09:20:46 -0700
Subject: [PATCH 251/438] remove revenue report

---
 src/app/(main)/reports/create/ReportTemplates.tsx | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/app/(main)/reports/create/ReportTemplates.tsx b/src/app/(main)/reports/create/ReportTemplates.tsx
index dbff9f1031..fcfa6f6a92 100644
--- a/src/app/(main)/reports/create/ReportTemplates.tsx
+++ b/src/app/(main)/reports/create/ReportTemplates.tsx
@@ -4,7 +4,6 @@ import Magnet from 'assets/magnet.svg';
 import Path from 'assets/path.svg';
 import Tag from 'assets/tag.svg';
 import Target from 'assets/target.svg';
-import Money from 'assets/money.svg';
 import { useMessages, useTeamUrl } from 'components/hooks';
 import PageHeader from 'components/layout/PageHeader';
 import Link from 'next/link';
@@ -52,12 +51,12 @@ export function ReportTemplates({ showHeader = true }: { showHeader?: boolean })
       url: renderTeamUrl('/reports/journey'),
       icon: <Path />,
     },
-    {
-      title: formatMessage(labels.revenue),
-      description: formatMessage(labels.revenueDescription),
-      url: renderTeamUrl('/reports/revenue'),
-      icon: <Money />,
-    },
+    // {
+    //   title: formatMessage(labels.revenue),
+    //   description: formatMessage(labels.revenueDescription),
+    //   url: renderTeamUrl('/reports/revenue'),
+    //   icon: <Money />,
+    // },
   ];
 
   return (

From 166b704166bb13d7656bf1f458d90156befcb956 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Thu, 8 Aug 2024 10:30:45 -0700
Subject: [PATCH 252/438] fix transfer website button disable logic

---
 .../websites/[websiteId]/WebsiteData.tsx      | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx
index 017a91f940..bc6a316969 100644
--- a/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx
+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx
@@ -13,11 +13,18 @@ export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?:
   const { teamId, renderTeamUrl } = useTeamUrl();
   const router = useRouter();
   const { result } = useTeams(user.id);
-  const hasTeams = result?.data?.length > 0;
-  const isTeamOwner =
-    (!teamId && hasTeams) ||
-    (hasTeams &&
-      result?.data
+  const canTransferWebsite =
+    (
+      !teamId &&
+      result.data.filter(({ teamUser }) =>
+        teamUser.find(
+          ({ role, userId }) =>
+            [ROLES.teamOwner, ROLES.teamManager].includes(role) && userId === user.id,
+        ),
+      )
+    ).length > 0 ||
+    (teamId &&
+      !!result?.data
         ?.find(({ id }) => id === teamId)
         ?.teamUser.find(({ role, userId }) => role === ROLES.teamOwner && userId === user.id));
 
@@ -37,8 +44,8 @@ export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?:
         label={formatMessage(labels.transferWebsite)}
         description={formatMessage(messages.transferWebsite)}
       >
-        <ModalTrigger disabled={!isTeamOwner}>
-          <Button variant="secondary" disabled={!isTeamOwner}>
+        <ModalTrigger disabled={!canTransferWebsite}>
+          <Button variant="secondary" disabled={!canTransferWebsite}>
             {formatMessage(labels.transfer)}
           </Button>
           <Modal title={formatMessage(labels.transferWebsite)}>

From f135e4ffbb81f058bf957ec33aadb96f0bf6f028 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 8 Aug 2024 12:00:38 -0700
Subject: [PATCH 253/438] Moved events components to events page. Updated map
 data loading.

---
 .../websites/[websiteId]/WebsiteHeader.tsx    |  3 +-
 .../websites/[websiteId]/WebsiteTableView.tsx | 19 ++++++----
 src/assets/lightning.svg                      |  1 +
 .../hooks/queries/useWebsiteMetrics.ts        |  2 +-
 src/components/metrics/CountriesTable.tsx     | 12 +-----
 src/components/metrics/WorldMap.tsx           | 37 ++++++++++++++-----
 .../api/websites/[websiteId]/events/index.ts  |  7 +++-
 .../websites/[websiteId]/sessions/index.ts    |  6 +--
 8 files changed, 52 insertions(+), 35 deletions(-)
 create mode 100644 src/assets/lightning.svg

diff --git a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
index ef0d2b9063..1e14c4c5fe 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
@@ -7,6 +7,7 @@ import Link from 'next/link';
 import { usePathname } from 'next/navigation';
 import { ReactNode } from 'react';
 import { Button, Icon, Text } from 'react-basics';
+import Lightning from 'assets/lightning.svg';
 import styles from './WebsiteHeader.module.css';
 
 export function WebsiteHeader({
@@ -52,7 +53,7 @@ export function WebsiteHeader({
     },
     {
       label: formatMessage(labels.events),
-      icon: <Icons.Bolt />,
+      icon: <Lightning />,
       path: '/events',
     },
   ];
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx b/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx
index e530f2bae7..2782cac62d 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx
@@ -1,4 +1,3 @@
-import { useState } from 'react';
 import { Grid, GridRow } from 'components/layout/Grid';
 import PagesTable from 'components/metrics/PagesTable';
 import ReferrersTable from 'components/metrics/ReferrersTable';
@@ -9,13 +8,15 @@ import WorldMap from 'components/metrics/WorldMap';
 import CountriesTable from 'components/metrics/CountriesTable';
 import EventsTable from 'components/metrics/EventsTable';
 import EventsChart from 'components/metrics/EventsChart';
+import { usePathname } from 'next/navigation';
 
 export default function WebsiteTableView({ websiteId }: { websiteId: string }) {
-  const [countryData, setCountryData] = useState();
+  const pathname = usePathname();
   const tableProps = {
     websiteId,
     limit: 10,
   };
+  const isSharePage = pathname.includes('/share/');
 
   return (
     <Grid>
@@ -29,13 +30,15 @@ export default function WebsiteTableView({ websiteId }: { websiteId: string }) {
         <DevicesTable {...tableProps} />
       </GridRow>
       <GridRow columns="two-one">
-        <WorldMap data={countryData} />
-        <CountriesTable {...tableProps} onDataLoad={setCountryData} />
-      </GridRow>
-      <GridRow columns="one-two">
-        <EventsTable {...tableProps} />
-        <EventsChart websiteId={websiteId} />
+        <WorldMap websiteId={websiteId} />
+        <CountriesTable {...tableProps} />
       </GridRow>
+      {isSharePage && (
+        <GridRow columns="one-two">
+          <EventsTable {...tableProps} />
+          <EventsChart websiteId={websiteId} />
+        </GridRow>
+      )}
     </Grid>
   );
 }
diff --git a/src/assets/lightning.svg b/src/assets/lightning.svg
new file mode 100644
index 0000000000..14cb95d9c0
--- /dev/null
+++ b/src/assets/lightning.svg
@@ -0,0 +1 @@
+<svg xml:space="preserve" viewBox="0 0 682.667 682.667" xmlns="http://www.w3.org/2000/svg"><defs><clipPath clipPathUnits="userSpaceOnUse" id="a"><path d="M0 512h512V0H0Z"/></clipPath></defs><g clip-path="url(#a)" transform="matrix(1.33333 0 0 -1.33333 0 682.667)"><path d="M0 0h137.962L69.319-155.807h140.419L.242-482l55.349 222.794h-155.853z" style="fill:none;stroke:currentColor;stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" transform="translate(201.262 496.994)"/></g></svg>
\ No newline at end of file
diff --git a/src/components/hooks/queries/useWebsiteMetrics.ts b/src/components/hooks/queries/useWebsiteMetrics.ts
index 088b31ac45..184fd4d44c 100644
--- a/src/components/hooks/queries/useWebsiteMetrics.ts
+++ b/src/components/hooks/queries/useWebsiteMetrics.ts
@@ -4,7 +4,7 @@ import { useFilterParams } from '../useFilterParams';
 
 export function useWebsiteMetrics(
   websiteId: string,
-  queryParams: { type: string; limit: number; search: string; startAt?: number; endAt?: number },
+  queryParams: { type: string; limit?: number; search?: string; startAt?: number; endAt?: number },
   options?: Omit<UseQueryOptions & { onDataLoad?: (data: any) => void }, 'queryKey' | 'queryFn'>,
 ) {
   const { get, useQuery } = useApi();
diff --git a/src/components/metrics/CountriesTable.tsx b/src/components/metrics/CountriesTable.tsx
index 87a7838e2d..592ade8a0d 100644
--- a/src/components/metrics/CountriesTable.tsx
+++ b/src/components/metrics/CountriesTable.tsx
@@ -4,21 +4,12 @@ import { useLocale, useMessages, useFormat } from 'components/hooks';
 import MetricsTable, { MetricsTableProps } from './MetricsTable';
 import TypeIcon from 'components/common/TypeIcon';
 
-export function CountriesTable({
-  onDataLoad,
-  ...props
-}: {
-  onDataLoad: (data: any) => void;
-} & MetricsTableProps) {
+export function CountriesTable({ ...props }: MetricsTableProps) {
   const { locale } = useLocale();
   const { countryNames } = useCountryNames(locale);
   const { formatMessage, labels } = useMessages();
   const { formatCountry } = useFormat();
 
-  const handleDataLoad = (data: any) => {
-    onDataLoad?.(data);
-  };
-
   const renderLink = ({ x: code }) => {
     return (
       <FilterLink
@@ -39,7 +30,6 @@ export function CountriesTable({
       type="country"
       metric={formatMessage(labels.visitors)}
       renderLabel={renderLink}
-      onDataLoad={handleDataLoad}
     />
   );
 }
diff --git a/src/components/metrics/WorldMap.tsx b/src/components/metrics/WorldMap.tsx
index 54483270c6..5cebd428d3 100644
--- a/src/components/metrics/WorldMap.tsx
+++ b/src/components/metrics/WorldMap.tsx
@@ -4,7 +4,7 @@ import classNames from 'classnames';
 import { colord } from 'colord';
 import HoverTooltip from 'components/common/HoverTooltip';
 import { ISO_COUNTRIES, MAP_FILE } from 'lib/constants';
-import { useTheme } from 'components/hooks';
+import { useDateRange, useTheme, useWebsiteMetrics } from 'components/hooks';
 import { useCountryNames } from 'components/hooks';
 import { useLocale } from 'components/hooks';
 import { useMessages } from 'components/hooks';
@@ -12,16 +12,35 @@ import { formatLongNumber } from 'lib/format';
 import { percentFilter } from 'lib/filters';
 import styles from './WorldMap.module.css';
 
-export function WorldMap({ data = [], className }: { data?: any[]; className?: string }) {
+export function WorldMap({
+  websiteId,
+  data,
+  className,
+}: {
+  websiteId?: string;
+  data?: any[];
+  className?: string;
+}) {
   const [tooltip, setTooltipPopup] = useState();
   const { theme, colors } = useTheme();
   const { locale } = useLocale();
   const { formatMessage, labels } = useMessages();
   const { countryNames } = useCountryNames(locale);
   const visitorsLabel = formatMessage(labels.visitors).toLocaleLowerCase(locale);
-  const metrics = useMemo(() => (data ? percentFilter(data) : []), [data]);
+  const {
+    dateRange: { startDate, endDate },
+  } = useDateRange(websiteId);
+  const { data: mapData } = useWebsiteMetrics(websiteId, {
+    type: 'country',
+    startAt: +startDate,
+    endAt: +endDate,
+  });
+  const metrics = useMemo(
+    () => (data || mapData ? percentFilter((data || mapData) as any[]) : []),
+    [data, mapData],
+  );
 
-  function getFillColor(code: string) {
+  const getFillColor = (code: string) => {
     if (code === 'AQ') return;
     const country = metrics?.find(({ x }) => x === code);
 
@@ -32,19 +51,19 @@ export function WorldMap({ data = [], className }: { data?: any[]; className?: s
     return colord(colors.map.baseColor)
       [theme === 'light' ? 'lighten' : 'darken'](0.4 * (1.0 - country.z / 100))
       .toHex();
-  }
+  };
 
-  function getOpacity(code) {
+  const getOpacity = (code: string) => {
     return code === 'AQ' ? 0 : 1;
-  }
+  };
 
-  function handleHover(code) {
+  const handleHover = (code: string) => {
     if (code === 'AQ') return;
     const country = metrics?.find(({ x }) => x === code);
     setTooltipPopup(
       `${countryNames[code]}: ${formatLongNumber(country?.y || 0)} ${visitorsLabel}` as any,
     );
-  }
+  };
 
   return (
     <div
diff --git a/src/pages/api/websites/[websiteId]/events/index.ts b/src/pages/api/websites/[websiteId]/events/index.ts
index 2aa791b11d..13b31fc07a 100644
--- a/src/pages/api/websites/[websiteId]/events/index.ts
+++ b/src/pages/api/websites/[websiteId]/events/index.ts
@@ -26,14 +26,17 @@ export default async (
   await useAuth(req, res);
   await useValidate(schema, req, res);
 
-  const { websiteId } = req.query;
+  const { websiteId, startAt, endAt } = req.query;
 
   if (req.method === 'GET') {
     if (!(await canViewWebsite(req.auth, websiteId))) {
       return unauthorized(res);
     }
 
-    const data = await getWebsiteEvents(websiteId, {}, req.query);
+    const startDate = new Date(+startAt);
+    const endDate = new Date(+endAt);
+
+    const data = await getWebsiteEvents(websiteId, { startDate, endDate }, req.query);
 
     return ok(res, data);
   }
diff --git a/src/pages/api/websites/[websiteId]/sessions/index.ts b/src/pages/api/websites/[websiteId]/sessions/index.ts
index 69f777f503..1809929c19 100644
--- a/src/pages/api/websites/[websiteId]/sessions/index.ts
+++ b/src/pages/api/websites/[websiteId]/sessions/index.ts
@@ -30,14 +30,14 @@ export default async (
 
   const { websiteId, startAt, endAt } = req.query;
 
-  const startDate = new Date(+startAt);
-  const endDate = new Date(+endAt);
-
   if (req.method === 'GET') {
     if (!(await canViewWebsite(req.auth, websiteId))) {
       return unauthorized(res);
     }
 
+    const startDate = new Date(+startAt);
+    const endDate = new Date(+endAt);
+
     const data = await getWebsiteSessions(websiteId, { startDate, endDate }, req.query);
 
     return ok(res, data);

From 10c438d1dea2d0e1e909f739af0bd46c2fa1d76b Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 8 Aug 2024 16:22:24 -0700
Subject: [PATCH 254/438] Fixed components build.

---
 src/components/hooks/queries/useRealtime.ts   |  2 +-
 .../hooks/queries/useWebsiteEvents.ts         |  2 +-
 src/index.ts                                  | 24 +++++++++----------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/components/hooks/queries/useRealtime.ts b/src/components/hooks/queries/useRealtime.ts
index d5186ee0da..9c0c54f6be 100644
--- a/src/components/hooks/queries/useRealtime.ts
+++ b/src/components/hooks/queries/useRealtime.ts
@@ -1,7 +1,7 @@
 import { RealtimeData } from 'lib/types';
 import { useApi } from './useApi';
 import { REALTIME_INTERVAL } from 'lib/constants';
-import { useTimezone } from 'components/hooks';
+import { useTimezone } from '../useTimezone';
 
 export function useRealtime(websiteId: string) {
   const { get, useQuery } = useApi();
diff --git a/src/components/hooks/queries/useWebsiteEvents.ts b/src/components/hooks/queries/useWebsiteEvents.ts
index 12febcc814..5d9bd19660 100644
--- a/src/components/hooks/queries/useWebsiteEvents.ts
+++ b/src/components/hooks/queries/useWebsiteEvents.ts
@@ -1,7 +1,7 @@
 import useApi from './useApi';
 import { UseQueryOptions } from '@tanstack/react-query';
 import { useFilterParams } from '../useFilterParams';
-import { usePagedQuery } from 'components/hooks';
+import { usePagedQuery } from './usePagedQuery';
 
 export function useWebsiteEvents(
   websiteId: string,
diff --git a/src/index.ts b/src/index.ts
index 465de67ee7..553a44b546 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,19 +1,19 @@
 export * from 'components/hooks';
 
-export * from 'app/(main)/settings/teams/[teamId]/members/TeamMemberEditButton';
-export * from 'app/(main)/settings/teams/[teamId]/members/TeamMemberEditForm';
-export * from 'app/(main)/settings/teams/[teamId]/members/TeamMemberRemoveButton';
-export * from 'app/(main)/settings/teams/[teamId]/members/TeamMembersDataTable';
-export * from 'app/(main)/settings/teams/[teamId]/members/TeamMembersTable';
+export * from 'app/(main)/teams/[teamId]/settings/members/TeamMemberEditButton';
+export * from 'app/(main)/teams/[teamId]/settings/members/TeamMemberEditForm';
+export * from 'app/(main)/teams/[teamId]/settings/members/TeamMemberRemoveButton';
+export * from 'app/(main)/teams/[teamId]/settings/members/TeamMembersDataTable';
+export * from 'app/(main)/teams/[teamId]/settings/members/TeamMembersTable';
 
-export * from 'app/(main)/settings/teams/[teamId]/team/TeamDeleteForm';
-export * from 'app/(main)/settings/teams/[teamId]/team/TeamDetails';
-export * from 'app/(main)/settings/teams/[teamId]/team/TeamEditForm';
-export * from 'app/(main)/settings/teams/[teamId]/team/TeamManage';
+export * from 'app/(main)/teams/[teamId]/settings/team/TeamDeleteForm';
+export * from 'app/(main)/teams/[teamId]/settings/team/TeamDetails';
+export * from 'app/(main)/teams/[teamId]/settings/team/TeamEditForm';
+export * from 'app/(main)/teams/[teamId]/settings/team/TeamManage';
 
-export * from 'app/(main)/settings/teams/[teamId]/websites/TeamWebsiteRemoveButton';
-export * from 'app/(main)/settings/teams/[teamId]/websites/TeamWebsitesDataTable';
-export * from 'app/(main)/settings/teams/[teamId]/websites/TeamWebsitesTable';
+export * from 'app/(main)/teams/[teamId]/settings/websites/TeamWebsiteRemoveButton';
+export * from 'app/(main)/teams/[teamId]/settings/websites/TeamWebsitesDataTable';
+export * from 'app/(main)/teams/[teamId]/settings/websites/TeamWebsitesTable';
 
 export * from 'app/(main)/settings/teams/TeamAddForm';
 export * from 'app/(main)/settings/teams/TeamJoinForm';

From 8ee37d124656f16ac94835e7151d01c5e2566540 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 9 Aug 2024 01:09:54 -0700
Subject: [PATCH 255/438] New event data screen.

---
 package.json                                  |   4 +-
 public/intl/messages/am-ET.json               |  74 +++++++++++-
 public/intl/messages/ar-SA.json               |  74 +++++++++++-
 public/intl/messages/be-BY.json               |  74 +++++++++++-
 public/intl/messages/bg-BG.json               |  74 +++++++++++-
 public/intl/messages/bn-BD.json               |  74 +++++++++++-
 public/intl/messages/bs-BA.json               |  74 +++++++++++-
 public/intl/messages/ca-ES.json               |  74 +++++++++++-
 public/intl/messages/cs-CZ.json               |  74 +++++++++++-
 public/intl/messages/da-DK.json               |  74 +++++++++++-
 public/intl/messages/de-CH.json               |  74 +++++++++++-
 public/intl/messages/de-DE.json               |  74 +++++++++++-
 public/intl/messages/el-GR.json               |  74 +++++++++++-
 public/intl/messages/en-GB.json               |  74 +++++++++++-
 public/intl/messages/en-US.json               |  80 ++++++++++++-
 public/intl/messages/es-ES.json               |  74 +++++++++++-
 public/intl/messages/es-MX.json               |   2 +-
 public/intl/messages/fa-IR.json               |  74 +++++++++++-
 public/intl/messages/fi-FI.json               |  74 +++++++++++-
 public/intl/messages/fo-FO.json               |  74 +++++++++++-
 public/intl/messages/fr-FR.json               |  74 +++++++++++-
 public/intl/messages/ga-ES.json               |  74 +++++++++++-
 public/intl/messages/he-IL.json               |  74 +++++++++++-
 public/intl/messages/hi-IN.json               |  74 +++++++++++-
 public/intl/messages/hr-HR.json               |  74 +++++++++++-
 public/intl/messages/hu-HU.json               |  74 +++++++++++-
 public/intl/messages/id-ID.json               |  74 +++++++++++-
 public/intl/messages/it-IT.json               |  74 +++++++++++-
 public/intl/messages/ja-JP.json               |  74 +++++++++++-
 public/intl/messages/km-KH.json               |  74 +++++++++++-
 public/intl/messages/ko-KR.json               |  74 +++++++++++-
 public/intl/messages/lt-LT.json               |  74 +++++++++++-
 public/intl/messages/mn-MN.json               |  74 +++++++++++-
 public/intl/messages/ms-MY.json               |  74 +++++++++++-
 public/intl/messages/my-MM.json               |  74 +++++++++++-
 public/intl/messages/nb-NO.json               |  74 +++++++++++-
 public/intl/messages/nl-NL.json               |  74 +++++++++++-
 public/intl/messages/pl-PL.json               |  74 +++++++++++-
 public/intl/messages/pt-BR.json               |  74 +++++++++++-
 public/intl/messages/pt-PT.json               |  74 +++++++++++-
 public/intl/messages/ro-RO.json               |  74 +++++++++++-
 public/intl/messages/ru-RU.json               |  74 +++++++++++-
 public/intl/messages/si-LK.json               |  74 +++++++++++-
 public/intl/messages/sk-SK.json               |  74 +++++++++++-
 public/intl/messages/sl-SI.json               |  74 +++++++++++-
 public/intl/messages/sv-SE.json               |  74 +++++++++++-
 public/intl/messages/ta-IN.json               |  74 +++++++++++-
 public/intl/messages/th-TH.json               |  74 +++++++++++-
 public/intl/messages/tr-TR.json               |  74 +++++++++++-
 public/intl/messages/uk-UA.json               | 110 +++++++++++++++++-
 public/intl/messages/ur-PK.json               |  74 +++++++++++-
 public/intl/messages/vi-VN.json               |  74 +++++++++++-
 public/intl/messages/zh-CN.json               |  74 +++++++++++-
 public/intl/messages/zh-TW.json               |  74 +++++++++++-
 .../websites/[websiteId]/WebsiteHeader.tsx    |  20 ++--
 .../events/EventDataMetricsBar.module.css     |  26 -----
 .../events/EventDataMetricsBar.tsx            |  37 ------
 .../events/EventDataValueTable.tsx            |  30 -----
 .../events/EventProperties.module.css         |  14 +++
 .../[websiteId]/events/EventProperties.tsx    |  52 +++++++++
 .../[websiteId]/events/EventsPage.tsx         |  19 ++-
 .../events/WebsiteEventData.module.css        |   7 --
 .../[websiteId]/events/WebsiteEventData.tsx   |  41 -------
 .../[websiteId]/realtime/RealtimeLog.tsx      |   4 +-
 src/app/layout.tsx                            |   1 -
 src/components/charts/PieChart.tsx            |   4 +-
 src/components/common/LoadingPanel.module.css |   5 +
 src/components/common/LoadingPanel.tsx        |  36 ++++++
 src/components/hooks/index.ts                 |   3 +
 .../hooks/queries/useEventDataEvents.ts       |  20 ++++
 .../hooks/queries/useEventDataProperties.ts   |  20 ++++
 .../hooks/queries/useEventDataValues.ts       |  21 ++++
 src/components/messages.ts                    |   2 +-
 src/lang/am-ET.json                           |  14 ++-
 src/lang/ar-SA.json                           |  14 ++-
 src/lang/be-BY.json                           |  14 ++-
 src/lang/bg-BG.json                           |  14 ++-
 src/lang/bn-BD.json                           |  14 ++-
 src/lang/bs-BA.json                           |  14 ++-
 src/lang/ca-ES.json                           |  14 ++-
 src/lang/cs-CZ.json                           |  14 ++-
 src/lang/da-DK.json                           |  14 ++-
 src/lang/de-CH.json                           |  14 ++-
 src/lang/de-DE.json                           |  14 ++-
 src/lang/el-GR.json                           |  14 ++-
 src/lang/en-GB.json                           |  14 ++-
 src/lang/en-US.json                           |  18 ++-
 src/lang/es-ES.json                           |  14 ++-
 src/lang/fa-IR.json                           |  14 ++-
 src/lang/fi-FI.json                           |  14 ++-
 src/lang/fo-FO.json                           |  14 ++-
 src/lang/fr-FR.json                           |  14 ++-
 src/lang/ga-ES.json                           |  14 ++-
 src/lang/he-IL.json                           |  14 ++-
 src/lang/hi-IN.json                           |  14 ++-
 src/lang/hr-HR.json                           |  14 ++-
 src/lang/hu-HU.json                           |  14 ++-
 src/lang/id-ID.json                           |  14 ++-
 src/lang/it-IT.json                           |  14 ++-
 src/lang/ja-JP.json                           |  14 ++-
 src/lang/km-KH.json                           |  14 ++-
 src/lang/ko-KR.json                           |  14 ++-
 src/lang/lt-LT.json                           |  14 ++-
 src/lang/mn-MN.json                           |  14 ++-
 src/lang/ms-MY.json                           |  14 ++-
 src/lang/my-MM.json                           |  14 ++-
 src/lang/nb-NO.json                           |  14 ++-
 src/lang/nl-NL.json                           |  14 ++-
 src/lang/pl-PL.json                           |  14 ++-
 src/lang/pt-BR.json                           |  14 ++-
 src/lang/pt-PT.json                           |  14 ++-
 src/lang/ro-RO.json                           |  14 ++-
 src/lang/ru-RU.json                           |  14 ++-
 src/lang/si-LK.json                           |  14 ++-
 src/lang/sk-SK.json                           |  14 ++-
 src/lang/sl-SI.json                           |  14 ++-
 src/lang/sv-SE.json                           |  14 ++-
 src/lang/ta-IN.json                           |  14 ++-
 src/lang/th-TH.json                           |  14 ++-
 src/lang/tr-TR.json                           |  14 ++-
 src/lang/uk-UA.json                           |  20 +++-
 src/lang/ur-PK.json                           |  14 ++-
 src/lang/vi-VN.json                           |  14 ++-
 src/lang/zh-CN.json                           |  14 ++-
 src/lang/zh-TW.json                           |  14 ++-
 src/lib/types.ts                              |   4 +-
 .../[websiteId]/event-data/events.ts}         |   0
 .../[websiteId]/event-data/properties.ts      |  49 ++++++++
 .../[websiteId]/event-data/values.ts}         |  11 +-
 .../[websiteId]/events}/stats.ts              |   0
 .../sessions/[sessionId]/properties.ts}       |   0
 .../analytics/events/getEventDataEvents.ts    |  20 ++--
 ...ataFields.ts => getEventDataProperties.ts} |  37 +++---
 .../analytics/events/getEventDataStats.ts     |  10 +-
 .../analytics/events/getEventDataValues.ts    |  70 +++++++++++
 src/queries/index.ts                          |   3 +-
 yarn.lock                                     |  39 +++++--
 137 files changed, 4918 insertions(+), 321 deletions(-)
 delete mode 100644 src/app/(main)/websites/[websiteId]/events/EventDataMetricsBar.module.css
 delete mode 100644 src/app/(main)/websites/[websiteId]/events/EventDataMetricsBar.tsx
 delete mode 100644 src/app/(main)/websites/[websiteId]/events/EventDataValueTable.tsx
 create mode 100644 src/app/(main)/websites/[websiteId]/events/EventProperties.module.css
 create mode 100644 src/app/(main)/websites/[websiteId]/events/EventProperties.tsx
 delete mode 100644 src/app/(main)/websites/[websiteId]/events/WebsiteEventData.module.css
 delete mode 100644 src/app/(main)/websites/[websiteId]/events/WebsiteEventData.tsx
 create mode 100644 src/components/common/LoadingPanel.module.css
 create mode 100644 src/components/common/LoadingPanel.tsx
 create mode 100644 src/components/hooks/queries/useEventDataEvents.ts
 create mode 100644 src/components/hooks/queries/useEventDataProperties.ts
 create mode 100644 src/components/hooks/queries/useEventDataValues.ts
 rename src/pages/api/{events/[eventId]/data.ts => websites/[websiteId]/event-data/events.ts} (100%)
 create mode 100644 src/pages/api/websites/[websiteId]/event-data/properties.ts
 rename src/pages/api/{event-data/fields.ts => websites/[websiteId]/event-data/values.ts} (80%)
 rename src/pages/api/{event-data => websites/[websiteId]/events}/stats.ts (100%)
 rename src/pages/api/{sessions/[sessionId]/data.ts => websites/[websiteId]/sessions/[sessionId]/properties.ts} (100%)
 rename src/queries/analytics/events/{getEventDataFields.ts => getEventDataProperties.ts} (61%)
 create mode 100644 src/queries/analytics/events/getEventDataValues.ts

diff --git a/package.json b/package.json
index 9ca56fe356..af873918c3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "2.12.1",
+  "version": "2.13.0",
   "description": "A simple, fast, privacy-focused alternative to Google Analytics.",
   "author": "Umami Software, Inc. <hello@umami.is>",
   "license": "MIT",
@@ -106,7 +106,7 @@
     "npm-run-all": "^4.1.5",
     "prisma": "5.17.0",
     "react": "^18.2.0",
-    "react-basics": "^0.124.0",
+    "react-basics": "^0.125.0",
     "react-beautiful-dnd": "^13.1.0",
     "react-dom": "^18.2.0",
     "react-error-boundary": "^4.0.4",
diff --git a/public/intl/messages/am-ET.json b/public/intl/messages/am-ET.json
index 65427a024d..6ab57eb203 100644
--- a/public/intl/messages/am-ET.json
+++ b/public/intl/messages/am-ET.json
@@ -11,7 +11,7 @@
       "value": "Actions"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Activity log"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Password"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Profile"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Select website"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Tracking code"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Unique visitors"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "User"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/ar-SA.json b/public/intl/messages/ar-SA.json
index d6a1855e1f..b466054af5 100644
--- a/public/intl/messages/ar-SA.json
+++ b/public/intl/messages/ar-SA.json
@@ -11,7 +11,7 @@
       "value": "الإجراءات"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "سجل الأحداث"
@@ -473,6 +473,12 @@
       "value": "التصفيات"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "كلمة المرور"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "الملف الشخصي"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "قس مدى ثبات موقعك على الويب من خلال تتبع عدد مرات عودة المستخدمين."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "حدد موقع"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "كود التتبع"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "زائرون فريدون"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "المستخدم"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/be-BY.json b/public/intl/messages/be-BY.json
index 5d84ef4e09..d5ca0a1e78 100644
--- a/public/intl/messages/be-BY.json
+++ b/public/intl/messages/be-BY.json
@@ -11,7 +11,7 @@
       "value": "Дзеянні"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Журнал актыўнасці"
@@ -473,6 +473,12 @@
       "value": "Фільтры"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " месяцаў"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Пароль"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Профіль"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Ацаніць прыцягальнасць сайта, адсочваючы павяртанні карыстальнікаў."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Выбраць сайт"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Код адсочвання"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Унікальныя наведвальнікі"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "Карыстальнік"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/bg-BG.json b/public/intl/messages/bg-BG.json
index e970ec52e5..d81c4c69fa 100644
--- a/public/intl/messages/bg-BG.json
+++ b/public/intl/messages/bg-BG.json
@@ -11,7 +11,7 @@
       "value": "Действия"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Активностти"
@@ -473,6 +473,12 @@
       "value": "Филтри"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " месеца"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Парола"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Профил"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Измерете привързаността към вашия уебсайт, като проследявате колко често потребителите се връщат."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Избери уебсайт"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Код за проследяване"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Уникални посетители"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "Потребител"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/bn-BD.json b/public/intl/messages/bn-BD.json
index 31e04cfa49..a50db62261 100644
--- a/public/intl/messages/bn-BD.json
+++ b/public/intl/messages/bn-BD.json
@@ -11,7 +11,7 @@
       "value": "অ্যাকশনস"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "একটিভিটি দেখুন"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "পাসওয়ার্ড"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 1,
@@ -895,6 +919,12 @@
       "value": "প্রোফাইল"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Select website"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "ট্র্যাকিং কোড"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "অনন্য ভিজিটর"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "User"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/bs-BA.json b/public/intl/messages/bs-BA.json
index 3b5c10ff53..71d870e25c 100644
--- a/public/intl/messages/bs-BA.json
+++ b/public/intl/messages/bs-BA.json
@@ -11,7 +11,7 @@
       "value": "Akcije"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Log aktivnosti"
@@ -473,6 +473,12 @@
       "value": "Filtri"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " mjeseci"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Šifra"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Profil"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Izmjeri 'ljepljivost' svoje web stranice praćenjem koliko često set korisnici vraćaju."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Odaberi web stranicu"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Kod za praćenje"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Jedinstvenih posjetitelja"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "Korisnik"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/ca-ES.json b/public/intl/messages/ca-ES.json
index dc7b27a87b..c112c5c700 100644
--- a/public/intl/messages/ca-ES.json
+++ b/public/intl/messages/ca-ES.json
@@ -11,7 +11,7 @@
       "value": "Accions"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Registre d'activitat"
@@ -473,6 +473,12 @@
       "value": "Filtres"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " mesos"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Contrasenya"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Perfil"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Mesuri la retenció del seu lloc web fent un seguiment de la freqüència amb què tornen els usuaris."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Seleccionar lloc web"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Codi de seguiment"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Visitants únics"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "Usuari"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/cs-CZ.json b/public/intl/messages/cs-CZ.json
index eaef42457d..26ae71415c 100644
--- a/public/intl/messages/cs-CZ.json
+++ b/public/intl/messages/cs-CZ.json
@@ -11,7 +11,7 @@
       "value": "Akce"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Activity log"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Heslo"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Profil"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Select website"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Sledovací kód"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Jedinečné návštěvy"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "User"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/da-DK.json b/public/intl/messages/da-DK.json
index aac48bbc9b..87e5f8a95d 100644
--- a/public/intl/messages/da-DK.json
+++ b/public/intl/messages/da-DK.json
@@ -11,7 +11,7 @@
       "value": "Handlinger"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Activity log"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Adgangskode"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Profil"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Select website"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Sporingskode"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Unikke besøgende"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "User"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/de-CH.json b/public/intl/messages/de-CH.json
index 0d06a0e03e..7b46c539b0 100644
--- a/public/intl/messages/de-CH.json
+++ b/public/intl/messages/de-CH.json
@@ -11,7 +11,7 @@
       "value": "Aktione"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Aktivitätsverlauf"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Passwort"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Profil"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Websiite uuswähle"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Tracking Code"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Eidütigi Bsuecher"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "Benutzer"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/de-DE.json b/public/intl/messages/de-DE.json
index 713238bc75..84bc60e136 100644
--- a/public/intl/messages/de-DE.json
+++ b/public/intl/messages/de-DE.json
@@ -11,7 +11,7 @@
       "value": "Aktionen"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Aktivitätsverlauf"
@@ -473,6 +473,12 @@
       "value": "Filter"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " Monate"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Passwort"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Profil"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Messen Sie die Verweildauer auf Ihrer Website, indem Sie verfolgen, wie oft die Nutzer zurückkehren."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Webseite auswählen"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Tracking Code"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Eindeutige Besucher"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "Benutzer"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/el-GR.json b/public/intl/messages/el-GR.json
index af0f11be3e..29c3efba6b 100644
--- a/public/intl/messages/el-GR.json
+++ b/public/intl/messages/el-GR.json
@@ -11,7 +11,7 @@
       "value": "Ενέργειες"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Activity log"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Κωδικός"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Προφίλ"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Select website"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Κωδικός παρακολούθησης"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Μοναδικοί επισκέπτες"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "User"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/en-GB.json b/public/intl/messages/en-GB.json
index 38a7857ccb..c8c38be149 100644
--- a/public/intl/messages/en-GB.json
+++ b/public/intl/messages/en-GB.json
@@ -11,7 +11,7 @@
       "value": "Actions"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Activity log"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Password"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Profile"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Select website"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Tracking code"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Unique visitors"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "User"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/en-US.json b/public/intl/messages/en-US.json
index 52b968ddf1..76a68dba1b 100644
--- a/public/intl/messages/en-US.json
+++ b/public/intl/messages/en-US.json
@@ -11,10 +11,10 @@
       "value": "Actions"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
-      "value": "Activity log"
+      "value": "Activity"
     }
   ],
   "label.add": [
@@ -404,7 +404,7 @@
   "label.entry": [
     {
       "type": 0,
-      "value": "Entry URL"
+      "value": "Entry path"
     }
   ],
   "label.event": [
@@ -428,7 +428,7 @@
   "label.exit": [
     {
       "type": 0,
-      "value": "Exit URL"
+      "value": "Exit path"
     }
   ],
   "label.false": [
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Password"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Profile"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Select website"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Tracking code"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Unique visitors"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "User"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/es-ES.json b/public/intl/messages/es-ES.json
index 825877e4fa..540c9bbd0e 100644
--- a/public/intl/messages/es-ES.json
+++ b/public/intl/messages/es-ES.json
@@ -11,7 +11,7 @@
       "value": "Acciones"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Registro de actividad"
@@ -473,6 +473,12 @@
       "value": "Filtros"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " meses"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Contraseña"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Perfil"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Medir la frecuencia con la que los usuarios vuelven a tu sitio web."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Seleccionar sitio web"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Código de rastreo"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Visitantes únicos"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "Usuario"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/es-MX.json b/public/intl/messages/es-MX.json
index 8051cde5ee..9dc4b4c965 100644
--- a/public/intl/messages/es-MX.json
+++ b/public/intl/messages/es-MX.json
@@ -11,7 +11,7 @@
       "value": "Acciones"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Registro de actividad"
diff --git a/public/intl/messages/fa-IR.json b/public/intl/messages/fa-IR.json
index d5408e6458..34b9a3633b 100644
--- a/public/intl/messages/fa-IR.json
+++ b/public/intl/messages/fa-IR.json
@@ -11,7 +11,7 @@
       "value": "اقدامات"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Activity log"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "رمز"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "پروفایل"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Select website"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "کد رهگیری"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "بازدیدکننده‌های یکتا"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "User"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/fi-FI.json b/public/intl/messages/fi-FI.json
index 0af4dc6f4f..9a1f066f23 100644
--- a/public/intl/messages/fi-FI.json
+++ b/public/intl/messages/fi-FI.json
@@ -11,7 +11,7 @@
       "value": "Toiminnat"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Activity log"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Salasana"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Profiili"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Select website"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Seurantakoodi"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Yksittäiset kävijät"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "User"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/fo-FO.json b/public/intl/messages/fo-FO.json
index c9df65e1e2..f6bdf4ca65 100644
--- a/public/intl/messages/fo-FO.json
+++ b/public/intl/messages/fo-FO.json
@@ -11,7 +11,7 @@
       "value": "Gerðir"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Activity log"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Loyniorð"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Vangi"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Select website"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Spori kota"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Einsýna vitjanir"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "User"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/fr-FR.json b/public/intl/messages/fr-FR.json
index bc4c51bb3f..0bfe6e7a0e 100644
--- a/public/intl/messages/fr-FR.json
+++ b/public/intl/messages/fr-FR.json
@@ -11,7 +11,7 @@
       "value": "Actions"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Journal d'activité"
@@ -473,6 +473,12 @@
       "value": "Filtres"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -635,6 +641,12 @@
       "value": " derniers mois"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -849,6 +861,18 @@
       "value": "Mot de passe"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -883,6 +907,12 @@
       "value": "Profil"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -997,6 +1027,24 @@
       "value": "Mesure de l'attractivité du site en visualisant les taux de visiteurs qui reviennent."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1051,6 +1099,12 @@
       "value": "Choisir un site"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1219,6 +1273,12 @@
       "value": "Code de suivi"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1255,6 +1315,12 @@
       "value": "Visiteurs uniques"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1291,6 +1357,12 @@
       "value": "Utilisateur"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/ga-ES.json b/public/intl/messages/ga-ES.json
index 7e182d73c7..6ce820e69d 100644
--- a/public/intl/messages/ga-ES.json
+++ b/public/intl/messages/ga-ES.json
@@ -11,7 +11,7 @@
       "value": "Accións"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Activity log"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Contrasinal"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Perfil"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1017,6 +1047,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1071,6 +1119,12 @@
       "value": "Select website"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1239,6 +1293,12 @@
       "value": "Código de seguimento"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1275,6 +1335,12 @@
       "value": "Visitas únicas"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1311,6 +1377,12 @@
       "value": "User"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/he-IL.json b/public/intl/messages/he-IL.json
index ee8599f349..d3ada47cc7 100644
--- a/public/intl/messages/he-IL.json
+++ b/public/intl/messages/he-IL.json
@@ -11,7 +11,7 @@
       "value": "פעולות"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Activity log"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -639,6 +645,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -853,6 +865,18 @@
       "value": "סיסמה"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -887,6 +911,12 @@
       "value": "פרופיל"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1001,6 +1031,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1055,6 +1103,12 @@
       "value": "Select website"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1223,6 +1277,12 @@
       "value": "קוד מעקב"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1259,6 +1319,12 @@
       "value": "מבקרים ייחודיים"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1295,6 +1361,12 @@
       "value": "User"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/hi-IN.json b/public/intl/messages/hi-IN.json
index 5fdffe3755..fc133a9349 100644
--- a/public/intl/messages/hi-IN.json
+++ b/public/intl/messages/hi-IN.json
@@ -11,7 +11,7 @@
       "value": "कार्य"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Activity log"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "पासवर्ड"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 1,
@@ -895,6 +919,12 @@
       "value": "प्रोफ़ाइल"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Select website"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "ट्रैकिंग कोड"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "अद्वितीय आगंतुकों"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "User"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/hr-HR.json b/public/intl/messages/hr-HR.json
index 87f37e73ad..4718f0c2f2 100644
--- a/public/intl/messages/hr-HR.json
+++ b/public/intl/messages/hr-HR.json
@@ -11,7 +11,7 @@
       "value": "Actions"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Activity log"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Lozinka"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Profil"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Select website"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Kod za praćenje"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Unique visitors"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "User"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/hu-HU.json b/public/intl/messages/hu-HU.json
index 2cc464e990..6c51c3dc33 100644
--- a/public/intl/messages/hu-HU.json
+++ b/public/intl/messages/hu-HU.json
@@ -11,7 +11,7 @@
       "value": "Műveletek"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Activity log"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Jelszó"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Profil"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Select website"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Követési kód"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Egyedi látogatók"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "User"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/id-ID.json b/public/intl/messages/id-ID.json
index 8123d03b3a..c6bb04a286 100644
--- a/public/intl/messages/id-ID.json
+++ b/public/intl/messages/id-ID.json
@@ -11,7 +11,7 @@
       "value": "Aksi"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Activity log"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -639,6 +645,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -853,6 +865,18 @@
       "value": "Kata sandi"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -887,6 +911,12 @@
       "value": "Profil"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1001,6 +1031,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1055,6 +1103,12 @@
       "value": "Select website"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1223,6 +1277,12 @@
       "value": "Kode lacak"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1259,6 +1319,12 @@
       "value": "Pengunjung unik"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1295,6 +1361,12 @@
       "value": "User"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/it-IT.json b/public/intl/messages/it-IT.json
index d755b277a6..38e6113630 100644
--- a/public/intl/messages/it-IT.json
+++ b/public/intl/messages/it-IT.json
@@ -11,7 +11,7 @@
       "value": "Azioni"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Activity log"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Password"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Profilo"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Select website"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Codice di tracking"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Visitatori unici"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "User"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/ja-JP.json b/public/intl/messages/ja-JP.json
index b2bc66a09a..f38a82d459 100644
--- a/public/intl/messages/ja-JP.json
+++ b/public/intl/messages/ja-JP.json
@@ -11,7 +11,7 @@
       "value": "アクション"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "アクティビティログ"
@@ -473,6 +473,12 @@
       "value": "フィルター"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "パスワード"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "プロフィール"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "ユーザーの再訪問回数を記録して、Webサイトのリテンション率を計測します。"
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Webサイトを選択"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "トラッキングコード"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "ユニーク訪問者数"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "ユーザー"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/km-KH.json b/public/intl/messages/km-KH.json
index ad273d2932..ca8a40a934 100644
--- a/public/intl/messages/km-KH.json
+++ b/public/intl/messages/km-KH.json
@@ -11,7 +11,7 @@
       "value": "សកម្មភាព"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "កំណត់ហេតុ​សកម្មភាព"
@@ -473,6 +473,12 @@
       "value": "ចម្រោះ"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -635,6 +641,12 @@
       "value": " ខែចុងក្រោយ"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -849,6 +861,18 @@
       "value": "ពាក្យសម្ងាត់​"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -883,6 +907,12 @@
       "value": "គណនី"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -997,6 +1027,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1051,6 +1099,12 @@
       "value": "ជ្រើសរើសគេហទំព័រ"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1219,6 +1273,12 @@
       "value": "លេខកូដតាមដាន"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1255,6 +1315,12 @@
       "value": "អ្នកចូលមើលម្នាក់ៗ"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1291,6 +1357,12 @@
       "value": "អ្នកប្រើប្រាស់"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/ko-KR.json b/public/intl/messages/ko-KR.json
index deab1408bc..9f6520ea40 100644
--- a/public/intl/messages/ko-KR.json
+++ b/public/intl/messages/ko-KR.json
@@ -11,7 +11,7 @@
       "value": "액션"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "활동 기록"
@@ -473,6 +473,12 @@
       "value": "필터"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " 개월"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "비밀번호"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -899,6 +923,12 @@
       "value": "프로필"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1013,6 +1043,24 @@
       "value": "사용자가 얼마나 자주 돌아오는지를 추적하여 웹사이트의 리텐션을 측정하십시오."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1067,6 +1115,12 @@
       "value": "웹사이트 선택"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1235,6 +1289,12 @@
       "value": "추적 코드"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1271,6 +1331,12 @@
       "value": "순방문자(UV)"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1307,6 +1373,12 @@
       "value": "사용자"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/lt-LT.json b/public/intl/messages/lt-LT.json
index e6c6cd1857..d5eec3c81a 100644
--- a/public/intl/messages/lt-LT.json
+++ b/public/intl/messages/lt-LT.json
@@ -11,7 +11,7 @@
       "value": "Veiksmai"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Veiklos žurnalas"
@@ -473,6 +473,12 @@
       "value": "Filtrai"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -752,6 +758,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -966,6 +978,18 @@
       "value": "Slaptažodis"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -1000,6 +1024,12 @@
       "value": "Profilis"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1114,6 +1144,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1168,6 +1216,12 @@
       "value": "Pasirinkti svetainę"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1336,6 +1390,12 @@
       "value": "Sekimo kodas"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1372,6 +1432,12 @@
       "value": "Unikalūs lankytojai"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1408,6 +1474,12 @@
       "value": "Vartotojas"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/mn-MN.json b/public/intl/messages/mn-MN.json
index d9461929e1..f1a76b9b87 100644
--- a/public/intl/messages/mn-MN.json
+++ b/public/intl/messages/mn-MN.json
@@ -11,7 +11,7 @@
       "value": "Үйлдлүүд"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Үйл ажиллагааны бүртгэл"
@@ -473,6 +473,12 @@
       "value": "Шүүлтүүр"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Нууц үг"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 1,
@@ -895,6 +919,12 @@
       "value": "Бүртгэл"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Хэрэглэгчид таны веб рүү дахин хандах буюу хэрэглэгчдээ хэр тогтоож буйг хэмжих."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Веб сонгох"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Мөрдөх код"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Зочин"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "Хэрэглэгч"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/ms-MY.json b/public/intl/messages/ms-MY.json
index 8f47f3cd7a..6886b74c60 100644
--- a/public/intl/messages/ms-MY.json
+++ b/public/intl/messages/ms-MY.json
@@ -11,7 +11,7 @@
       "value": "Aksi"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Activity log"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -639,6 +645,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -853,6 +865,18 @@
       "value": "Kata laluan"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -887,6 +911,12 @@
       "value": "Profil"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1001,6 +1031,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1055,6 +1103,12 @@
       "value": "Select website"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1223,6 +1277,12 @@
       "value": "Kod penjejakan"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1259,6 +1319,12 @@
       "value": "Pelawat unik"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1295,6 +1361,12 @@
       "value": "User"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/my-MM.json b/public/intl/messages/my-MM.json
index 9451a0febb..7fc610e4dd 100644
--- a/public/intl/messages/my-MM.json
+++ b/public/intl/messages/my-MM.json
@@ -11,7 +11,7 @@
       "value": "လုပ်ဆောင်ချက်များ"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "လုပ်ဆောင်ချက်စာရင်း"
@@ -473,6 +473,12 @@
       "value": "Filter များ"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "စကားဝှက်"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 1,
@@ -895,6 +919,12 @@
       "value": "ပရိုဖိုင်း"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "ဝဘက်ဘ်ဆိုဒ်ရွေးပါ"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "ထရက်လုပ်သည့် ကုဒ်"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "ဝင်ရောက်သူ (ထပ်ခြင်းမရှိ)"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "အသုံးပြုသူ"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/nb-NO.json b/public/intl/messages/nb-NO.json
index 3e73b45ee8..051c362c26 100644
--- a/public/intl/messages/nb-NO.json
+++ b/public/intl/messages/nb-NO.json
@@ -11,7 +11,7 @@
       "value": "Handlinger"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Activity log"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Passord"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Profil"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Select website"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Sporingskode"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Unike besøkende"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "User"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/nl-NL.json b/public/intl/messages/nl-NL.json
index a186de8625..d7ea5c9f27 100644
--- a/public/intl/messages/nl-NL.json
+++ b/public/intl/messages/nl-NL.json
@@ -11,7 +11,7 @@
       "value": "Acties"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Activiteiten logboek"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Wachtwoord"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Profiel"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Meet de retentie van je website door door bij te houden hoe vaak gebruikers terugkeren."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Website selecteren"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Volgcode"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Unieke bezoekers"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "Gebruiker"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/pl-PL.json b/public/intl/messages/pl-PL.json
index 7157a4f26c..97782a412a 100644
--- a/public/intl/messages/pl-PL.json
+++ b/public/intl/messages/pl-PL.json
@@ -11,7 +11,7 @@
       "value": "Działania"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Dziennik aktywności"
@@ -473,6 +473,12 @@
       "value": "Filtry"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " miesięcy"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Hasło"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Profil"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Mierz przyciągającą siłę swojej strony internetowej, śledząc, jak często użytkownicy powracają."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Wybierz witrynę"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Kod śledzenia"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Unikalni odwiedzający"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "Użytkownik"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/pt-BR.json b/public/intl/messages/pt-BR.json
index ae5b0de4ba..26985407af 100644
--- a/public/intl/messages/pt-BR.json
+++ b/public/intl/messages/pt-BR.json
@@ -11,7 +11,7 @@
       "value": "Ações do usuário"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Registro de atividades"
@@ -473,6 +473,12 @@
       "value": "Filtros"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " meses"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Senha"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Perfil"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Avalie a fidelidade dos seus usuários medindo a frequência com que eles retornam."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Selecionar site"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Código de rastreamento"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Visitantes únicos"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "Usuário"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/pt-PT.json b/public/intl/messages/pt-PT.json
index 02704e9e0f..6efd9834bc 100644
--- a/public/intl/messages/pt-PT.json
+++ b/public/intl/messages/pt-PT.json
@@ -11,7 +11,7 @@
       "value": "Ações"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Activity log"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Senha"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Perfil"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Select website"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Código de rastreamento"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Visitantes únicos"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "User"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/ro-RO.json b/public/intl/messages/ro-RO.json
index 311199cf39..1e5ac13af9 100644
--- a/public/intl/messages/ro-RO.json
+++ b/public/intl/messages/ro-RO.json
@@ -11,7 +11,7 @@
       "value": "Acțiuni"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Jurnal de activități"
@@ -473,6 +473,12 @@
       "value": "Filtre"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Parolă"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Profil"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Măsoară atractivitatea site-ului tău prin urmărirea frecvenței cu care utilizatorii se întorc."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Selectează website"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Cod de urmărire"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Vizitatori unici"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "Utilizator"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/ru-RU.json b/public/intl/messages/ru-RU.json
index 30974dd64e..e8f7f5b4fc 100644
--- a/public/intl/messages/ru-RU.json
+++ b/public/intl/messages/ru-RU.json
@@ -11,7 +11,7 @@
       "value": "Действия"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Журнал активности"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Пароль"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Профиль"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Выбрать сайт"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Код отслеживания"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Уникальные посетители"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "Пользователь"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/si-LK.json b/public/intl/messages/si-LK.json
index e6b06c6ba7..e18561c9dd 100644
--- a/public/intl/messages/si-LK.json
+++ b/public/intl/messages/si-LK.json
@@ -11,7 +11,7 @@
       "value": "Actions"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Activity log"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "මුරපදය"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "පැතිකඩ"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Select website"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "ලුහුබැඳීමේ කේතය"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Unique visitors"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "User"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/sk-SK.json b/public/intl/messages/sk-SK.json
index 738ead435d..0908ec4f6d 100644
--- a/public/intl/messages/sk-SK.json
+++ b/public/intl/messages/sk-SK.json
@@ -11,7 +11,7 @@
       "value": "Akcie"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Activity log"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Heslo"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Profil"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Select website"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Sledovací kód"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Jedinečné návštevy"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "User"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/sl-SI.json b/public/intl/messages/sl-SI.json
index 67f65ad407..ae11c067d0 100644
--- a/public/intl/messages/sl-SI.json
+++ b/public/intl/messages/sl-SI.json
@@ -11,7 +11,7 @@
       "value": "Dejanja"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Dnevnik dejavnosti"
@@ -473,6 +473,12 @@
       "value": "Filtri"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Geslo"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Profil"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Izberi spletno mesto"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Koda za sledenje"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Unikatni obiskovalci"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "Uporabnik"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/sv-SE.json b/public/intl/messages/sv-SE.json
index c2b2c5e06f..830a7bd329 100644
--- a/public/intl/messages/sv-SE.json
+++ b/public/intl/messages/sv-SE.json
@@ -11,7 +11,7 @@
       "value": "Händelser"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Aktivitetslogg"
@@ -473,6 +473,12 @@
       "value": "Filter"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Lösenord"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Profil"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Mät din webbplats engagemang genom att följa hur ofta användare återvänder."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Välj webbplats"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "Spårningskod"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Unika besökare"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "Användare"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/ta-IN.json b/public/intl/messages/ta-IN.json
index 13ab67980f..87a38137c4 100644
--- a/public/intl/messages/ta-IN.json
+++ b/public/intl/messages/ta-IN.json
@@ -11,7 +11,7 @@
       "value": "செயல்கள்"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Activity log"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "கடவுச்சொல்"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 1,
@@ -895,6 +919,12 @@
       "value": "சுயவிவரம்"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Select website"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "கண்காணிப்பு குறியீடு"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "தனிப்பட்ட பார்வையாளர்கள்"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "User"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/th-TH.json b/public/intl/messages/th-TH.json
index 43158951dc..a8e68c99fe 100644
--- a/public/intl/messages/th-TH.json
+++ b/public/intl/messages/th-TH.json
@@ -11,7 +11,7 @@
       "value": "การกระทำ"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Activity log"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -639,6 +645,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -853,6 +865,18 @@
       "value": "รหัสผ่าน"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -887,6 +911,12 @@
       "value": "โปรไฟล์"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1001,6 +1031,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1055,6 +1103,12 @@
       "value": "Select website"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1223,6 +1277,12 @@
       "value": "โค้ดสำหรับใช้ติดตาม"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1259,6 +1319,12 @@
       "value": "ผู้เข้าชม"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1295,6 +1361,12 @@
       "value": "User"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/tr-TR.json b/public/intl/messages/tr-TR.json
index 1edfdbbc4e..9b23b29c37 100644
--- a/public/intl/messages/tr-TR.json
+++ b/public/intl/messages/tr-TR.json
@@ -11,7 +11,7 @@
       "value": "Hareketler"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Aktivite Kaydı"
@@ -473,6 +473,12 @@
       "value": "Filtreler"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " ay"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "Parola"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "Profil"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Kullanıcıların ne sıklıkla geri döndüğünü takip ederek web sitenizin kalıcılığını ölçün."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Web sitesi seç"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "İzleme kodu"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "Tekil kullanıcı"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "Kullanıcı"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/uk-UA.json b/public/intl/messages/uk-UA.json
index 33579a3373..0f68c8052e 100644
--- a/public/intl/messages/uk-UA.json
+++ b/public/intl/messages/uk-UA.json
@@ -11,7 +11,7 @@
       "value": "Дії"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Журнал"
@@ -377,6 +377,24 @@
       "value": "Редагувати"
     }
   ],
+  "label.edit-dashboard": [
+    {
+      "type": 0,
+      "value": "Edit dashboard"
+    }
+  ],
+  "label.edit-member": [
+    {
+      "type": 0,
+      "value": "Edit member"
+    }
+  ],
+  "label.enable-share-url": [
+    {
+      "type": 0,
+      "value": "Enable share URL"
+    }
+  ],
   "label.end-step": [
     {
       "type": 0,
@@ -455,6 +473,12 @@
       "value": "Фільтри"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -629,6 +653,12 @@
       "value": " місяців"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -671,6 +701,12 @@
       "value": "Керувати"
     }
   ],
+  "label.manager": [
+    {
+      "type": 0,
+      "value": "Manager"
+    }
+  ],
   "label.max": [
     {
       "type": 0,
@@ -837,6 +873,18 @@
       "value": "Пароль"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -871,6 +919,12 @@
       "value": "Профіль"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -985,6 +1039,24 @@
       "value": "Виміряйте липкість вашого сайту, відстежуючи, як часто користувачі повертаються на нього."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1039,6 +1111,12 @@
       "value": "Вибрати сайт"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1099,6 +1177,12 @@
       "value": "Ідентифікатор команди"
     }
   ],
+  "label.team-manager": [
+    {
+      "type": 0,
+      "value": "Team manager"
+    }
+  ],
   "label.team-member": [
     {
       "type": 0,
@@ -1201,6 +1285,12 @@
       "value": "Код для відслідковування"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1237,6 +1327,12 @@
       "value": "Унікальні відвідувачі"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1273,6 +1369,12 @@
       "value": "Користувач"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
@@ -1333,6 +1435,12 @@
       "value": "Перегляди за одне відвідування"
     }
   ],
+  "label.visit-duration": [
+    {
+      "type": 0,
+      "value": "Visit duration"
+    }
+  ],
   "label.visitors": [
     {
       "type": 0,
diff --git a/public/intl/messages/ur-PK.json b/public/intl/messages/ur-PK.json
index 9d3c932b6c..2652fcfa2c 100644
--- a/public/intl/messages/ur-PK.json
+++ b/public/intl/messages/ur-PK.json
@@ -11,7 +11,7 @@
       "value": "اعمال"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Activity log"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "پاس ورڈ"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -895,6 +919,12 @@
       "value": "پروفائل"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1009,6 +1039,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1063,6 +1111,12 @@
       "value": "Select website"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1231,6 +1285,12 @@
       "value": "ٹریکنگ کوڈ"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1267,6 +1327,12 @@
       "value": "منفرد زائرین"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1303,6 +1369,12 @@
       "value": "User"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/vi-VN.json b/public/intl/messages/vi-VN.json
index 424d30a691..68a301ae5c 100644
--- a/public/intl/messages/vi-VN.json
+++ b/public/intl/messages/vi-VN.json
@@ -11,7 +11,7 @@
       "value": "Hành động"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "Activity log"
@@ -473,6 +473,12 @@
       "value": "Filters"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -639,6 +645,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -853,6 +865,18 @@
       "value": "Mật khẩu"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -887,6 +911,12 @@
       "value": "Hồ sơ"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1001,6 +1031,24 @@
       "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1055,6 +1103,12 @@
       "value": "Select website"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1223,6 +1277,12 @@
       "value": "Mã theo dõi"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1259,6 +1319,12 @@
       "value": "Khách truy cập một lần"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1295,6 +1361,12 @@
       "value": "User"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/zh-CN.json b/public/intl/messages/zh-CN.json
index bb77d83b98..b3e97b9b0f 100644
--- a/public/intl/messages/zh-CN.json
+++ b/public/intl/messages/zh-CN.json
@@ -11,7 +11,7 @@
       "value": "用户行为"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "活动日志"
@@ -473,6 +473,12 @@
       "value": "筛选"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " 个月"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -865,6 +877,18 @@
       "value": "密码"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -903,6 +927,12 @@
       "value": "个人资料"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1017,6 +1047,24 @@
       "value": "通过跟踪用户返回的频率来衡量网站的用户粘性。"
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1071,6 +1119,12 @@
       "value": "选择网站"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1239,6 +1293,12 @@
       "value": "跟踪代码"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1275,6 +1335,12 @@
       "value": "独立访客"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1311,6 +1377,12 @@
       "value": "用户"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/public/intl/messages/zh-TW.json b/public/intl/messages/zh-TW.json
index 37c490d7c4..e03059f8d6 100644
--- a/public/intl/messages/zh-TW.json
+++ b/public/intl/messages/zh-TW.json
@@ -11,7 +11,7 @@
       "value": "行動"
     }
   ],
-  "label.activity-log": [
+  "label.activity": [
     {
       "type": 0,
       "value": "活動日誌"
@@ -473,6 +473,12 @@
       "value": "篩選器"
     }
   ],
+  "label.first-seen": [
+    {
+      "type": 0,
+      "value": "First seen"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
@@ -647,6 +653,12 @@
       "value": " months"
     }
   ],
+  "label.last-seen": [
+    {
+      "type": 0,
+      "value": "Last seen"
+    }
+  ],
   "label.leave": [
     {
       "type": 0,
@@ -861,6 +873,18 @@
       "value": "密碼"
     }
   ],
+  "label.path": [
+    {
+      "type": 0,
+      "value": "Path"
+    }
+  ],
+  "label.paths": [
+    {
+      "type": 0,
+      "value": "Paths"
+    }
+  ],
   "label.powered-by": [
     {
       "type": 0,
@@ -899,6 +923,12 @@
       "value": "個人資料"
     }
   ],
+  "label.properties": [
+    {
+      "type": 0,
+      "value": "Properties"
+    }
+  ],
   "label.property": [
     {
       "type": 0,
@@ -1013,6 +1043,24 @@
       "value": "透過追蹤使用者回訪的頻率來衡量您的網站黏著度。"
     }
   ],
+  "label.revenue": [
+    {
+      "type": 0,
+      "value": "Revenue"
+    }
+  ],
+  "label.revenue-description": [
+    {
+      "type": 0,
+      "value": "Look into your revenue across time."
+    }
+  ],
+  "label.revenue-property": [
+    {
+      "type": 0,
+      "value": "Revenue Property"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -1067,6 +1115,12 @@
       "value": "選擇網站"
     }
   ],
+  "label.session": [
+    {
+      "type": 0,
+      "value": "Session"
+    }
+  ],
   "label.sessions": [
     {
       "type": 0,
@@ -1235,6 +1289,12 @@
       "value": "追蹤代碼"
     }
   ],
+  "label.transactions": [
+    {
+      "type": 0,
+      "value": "Transactions"
+    }
+  ],
   "label.transfer": [
     {
       "type": 0,
@@ -1271,6 +1331,12 @@
       "value": "獨立訪客"
     }
   ],
+  "label.uniqueCustomers": [
+    {
+      "type": 0,
+      "value": "Unique Customers"
+    }
+  ],
   "label.unknown": [
     {
       "type": 0,
@@ -1307,6 +1373,12 @@
       "value": "使用者"
     }
   ],
+  "label.user-property": [
+    {
+      "type": 0,
+      "value": "User Property"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
index 1e14c4c5fe..3b8cddaeaa 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
@@ -36,16 +36,6 @@ export function WebsiteHeader({
       icon: <Icons.Compare />,
       path: '/compare',
     },
-    {
-      label: formatMessage(labels.realtime),
-      icon: <Icons.Clock />,
-      path: '/realtime',
-    },
-    {
-      label: formatMessage(labels.reports),
-      icon: <Icons.Reports />,
-      path: '/reports',
-    },
     {
       label: formatMessage(labels.sessions),
       icon: <Icons.User />,
@@ -56,6 +46,16 @@ export function WebsiteHeader({
       icon: <Lightning />,
       path: '/events',
     },
+    {
+      label: formatMessage(labels.realtime),
+      icon: <Icons.Clock />,
+      path: '/realtime',
+    },
+    {
+      label: formatMessage(labels.reports),
+      icon: <Icons.Reports />,
+      path: '/reports',
+    },
   ];
 
   return (
diff --git a/src/app/(main)/websites/[websiteId]/events/EventDataMetricsBar.module.css b/src/app/(main)/websites/[websiteId]/events/EventDataMetricsBar.module.css
deleted file mode 100644
index 408396c37b..0000000000
--- a/src/app/(main)/websites/[websiteId]/events/EventDataMetricsBar.module.css
+++ /dev/null
@@ -1,26 +0,0 @@
-.container {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  justify-content: space-between;
-  align-items: center;
-  padding: 10px 0;
-  min-height: 90px;
-  margin-bottom: 20px;
-  background: var(--base50);
-  z-index: var(--z-index-above);
-}
-
-.actions {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: flex-end;
-  flex: 1;
-}
-
-@media only screen and (max-width: 992px) {
-  .container {
-    grid-template-columns: 1fr;
-    grid-template-rows: 1fr 1fr;
-  }
-}
diff --git a/src/app/(main)/websites/[websiteId]/events/EventDataMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/events/EventDataMetricsBar.tsx
deleted file mode 100644
index 86417c96d3..0000000000
--- a/src/app/(main)/websites/[websiteId]/events/EventDataMetricsBar.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import { useApi, useDateRange, useMessages } from 'components/hooks';
-import MetricCard from 'components/metrics/MetricCard';
-import WebsiteDateFilter from 'components/input/WebsiteDateFilter';
-import MetricsBar from 'components/metrics/MetricsBar';
-import styles from './EventDataMetricsBar.module.css';
-
-export function EventDataMetricsBar({ websiteId }: { websiteId: string }) {
-  const { formatMessage, labels } = useMessages();
-  const { get, useQuery } = useApi();
-  const { dateRange } = useDateRange(websiteId);
-  const { startDate, endDate } = dateRange;
-
-  const { data, error, isLoading, isFetched } = useQuery({
-    queryKey: ['event-data:stats', { websiteId, startDate, endDate }],
-    queryFn: () =>
-      get(`/event-data/stats`, {
-        websiteId,
-        startAt: +startDate,
-        endAt: +endDate,
-      }),
-  });
-
-  return (
-    <div className={styles.container}>
-      <MetricsBar isLoading={isLoading} isFetched={isFetched} error={error}>
-        <MetricCard label={formatMessage(labels.events)} value={data?.events} />
-        <MetricCard label={formatMessage(labels.fields)} value={data?.fields} />
-        <MetricCard label={formatMessage(labels.totalRecords)} value={data?.records} />
-      </MetricsBar>
-      <div className={styles.actions}>
-        <WebsiteDateFilter websiteId={websiteId} />
-      </div>
-    </div>
-  );
-}
-
-export default EventDataMetricsBar;
diff --git a/src/app/(main)/websites/[websiteId]/events/EventDataValueTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventDataValueTable.tsx
deleted file mode 100644
index cddeea23fd..0000000000
--- a/src/app/(main)/websites/[websiteId]/events/EventDataValueTable.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { GridTable, GridColumn } from 'react-basics';
-import { useMessages } from 'components/hooks';
-import PageHeader from 'components/layout/PageHeader';
-import Empty from 'components/common/Empty';
-import { DATA_TYPES } from 'lib/constants';
-
-export function EventDataValueTable({ data = [], event }: { data: any[]; event: string }) {
-  const { formatMessage, labels } = useMessages();
-
-  return (
-    <>
-      <PageHeader title={event} />
-      {data.length <= 0 && <Empty />}
-      {data.length > 0 && (
-        <GridTable data={data}>
-          <GridColumn name="fieldName" label={formatMessage(labels.field)} />
-          <GridColumn name="dataType" label={formatMessage(labels.type)}>
-            {row => DATA_TYPES[row.dataType]}
-          </GridColumn>
-          <GridColumn name="fieldValue" label={formatMessage(labels.value)} />
-          <GridColumn name="total" label={formatMessage(labels.totalRecords)} width="200px">
-            {({ total }) => total.toLocaleString()}
-          </GridColumn>
-        </GridTable>
-      )}
-    </>
-  );
-}
-
-export default EventDataValueTable;
diff --git a/src/app/(main)/websites/[websiteId]/events/EventProperties.module.css b/src/app/(main)/websites/[websiteId]/events/EventProperties.module.css
new file mode 100644
index 0000000000..b476ebd87a
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/events/EventProperties.module.css
@@ -0,0 +1,14 @@
+.container {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(600px, 1fr));
+  gap: 30px;
+}
+
+.table {
+  align-self: start;
+}
+
+.link:hover {
+  cursor: pointer;
+  color: var(--primary400);
+}
diff --git a/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx b/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx
new file mode 100644
index 0000000000..d6e52c59ea
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx
@@ -0,0 +1,52 @@
+import { GridColumn, GridTable } from 'react-basics';
+import { useEventDataProperties, useEventDataValues, useMessages } from 'components/hooks';
+import { LoadingPanel } from 'components/common/LoadingPanel';
+import styles from './EventProperties.module.css';
+import PieChart from 'components/charts/PieChart';
+import { useState } from 'react';
+import { CHART_COLORS } from 'lib/constants';
+
+export function EventProperties({ websiteId }: { websiteId: string }) {
+  const [propertyName, setPropertyName] = useState('');
+  const { formatMessage, labels } = useMessages();
+  const { data, isLoading, isFetched, error } = useEventDataProperties(websiteId);
+  const { data: values } = useEventDataValues(websiteId, propertyName);
+  const chartData =
+    propertyName && values
+      ? {
+          labels: values.map(({ value }) => value),
+          datasets: [
+            {
+              data: values.map(({ total }) => total),
+              backgroundColor: CHART_COLORS,
+              borderWidth: 0,
+            },
+          ],
+        }
+      : null;
+
+  return (
+    <LoadingPanel isLoading={isLoading} isFetched={isFetched} data={data} error={error}>
+      <div className={styles.container}>
+        <GridTable data={data} cardMode={false} className={styles.table}>
+          <GridColumn name="propertyName" label={formatMessage(labels.property)}>
+            {row => (
+              <div className={styles.link} onClick={() => setPropertyName(row.propertyName)}>
+                {row.propertyName}
+              </div>
+            )}
+          </GridColumn>
+          <GridColumn name="total" label={formatMessage(labels.count)} />
+        </GridTable>
+        {propertyName && (
+          <div>
+            <strong>{propertyName}</strong>
+            <PieChart key={propertyName} type="doughnut" data={chartData} />
+          </div>
+        )}
+      </div>
+    </LoadingPanel>
+  );
+}
+
+export default EventProperties;
diff --git a/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx
index e35442d065..7dfc0394c6 100644
--- a/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx
+++ b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx
@@ -6,8 +6,12 @@ import EventsChart from 'components/metrics/EventsChart';
 import { GridRow } from 'components/layout/Grid';
 import MetricsTable from 'components/metrics/MetricsTable';
 import { useMessages } from 'components/hooks';
+import { Item, Tabs } from 'react-basics';
+import { useState } from 'react';
+import EventProperties from './EventProperties';
 
 export default function EventsPage({ websiteId }) {
+  const [tab, setTab] = useState('activity');
   const { formatMessage, labels } = useMessages();
 
   return (
@@ -23,9 +27,18 @@ export default function EventsPage({ websiteId }) {
           metric={formatMessage(labels.actions)}
         />
       </GridRow>
-      <GridRow columns="one">
-        <EventsDataTable websiteId={websiteId} />
-      </GridRow>
+      <div>
+        <Tabs
+          selectedKey={tab}
+          onSelect={(value: any) => setTab(value)}
+          style={{ marginBottom: 30 }}
+        >
+          <Item key="activity">{formatMessage(labels.activity)}</Item>
+          <Item key="properties">{formatMessage(labels.properties)}</Item>
+        </Tabs>
+        {tab === 'activity' && <EventsDataTable websiteId={websiteId} />}
+        {tab === 'properties' && <EventProperties websiteId={websiteId} />}
+      </div>
     </>
   );
 }
diff --git a/src/app/(main)/websites/[websiteId]/events/WebsiteEventData.module.css b/src/app/(main)/websites/[websiteId]/events/WebsiteEventData.module.css
deleted file mode 100644
index 1d1782312d..0000000000
--- a/src/app/(main)/websites/[websiteId]/events/WebsiteEventData.module.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.container a {
-  color: var(--font-color100);
-}
-
-.container a:hover {
-  color: var(--primary400);
-}
diff --git a/src/app/(main)/websites/[websiteId]/events/WebsiteEventData.tsx b/src/app/(main)/websites/[websiteId]/events/WebsiteEventData.tsx
deleted file mode 100644
index 296c8a66ba..0000000000
--- a/src/app/(main)/websites/[websiteId]/events/WebsiteEventData.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { Flexbox, Loading } from 'react-basics';
-import EventsTable from './EventsTable';
-import EventDataValueTable from './EventDataValueTable';
-import { EventDataMetricsBar } from './EventDataMetricsBar';
-import { useDateRange, useApi, useNavigation } from 'components/hooks';
-import styles from './WebsiteEventData.module.css';
-
-function useData(websiteId: string, event: string) {
-  const { dateRange } = useDateRange(websiteId);
-  const { startDate, endDate } = dateRange;
-  const { get, useQuery } = useApi();
-  const { data, error, isLoading } = useQuery({
-    queryKey: ['event-data:events', { websiteId, startDate, endDate, event }],
-    queryFn: () =>
-      get('/event-data/events', {
-        websiteId,
-        startAt: +startDate,
-        endAt: +endDate,
-        event,
-      }),
-    enabled: !!(websiteId && startDate && endDate),
-  });
-
-  return { data, error, isLoading };
-}
-
-export default function WebsiteEventData({ websiteId }) {
-  const {
-    query: { event },
-  } = useNavigation();
-  const { data, isLoading } = useData(websiteId, event);
-
-  return (
-    <Flexbox className={styles.container} direction="column" gap={20}>
-      <EventDataMetricsBar websiteId={websiteId} />
-      {!event && <EventsTable data={data} />}
-      {isLoading && <Loading position="page" />}
-      {event && data && <EventDataValueTable event={event} data={data} />}
-    </Flexbox>
-  );
-}
diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
index ad0314e7ad..b1836d4f1d 100644
--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
@@ -54,7 +54,7 @@ export function RealtimeLog({ data }: { data: RealtimeData }) {
     },
   ];
 
-  const getTime = ({ createdAt }) => format(new Date(createdAt), 'h:mm:ss');
+  const getTime = ({ createdAt, firstAt }) => format(new Date(firstAt || createdAt), 'h:mm:ss');
 
   const getColor = ({ id, sessionId }) => stringToColor(sessionId || id);
 
@@ -181,7 +181,7 @@ export function RealtimeLog({ data }: { data: RealtimeData }) {
         <SearchField className={styles.search} value={search} onSearch={setSearch} />
         <FilterButtons items={buttons} selectedKey={filter} onSelect={setFilter} />
       </div>
-      <div className={styles.header}>{formatMessage(labels.activityLog)}</div>
+      <div className={styles.header}>{formatMessage(labels.activity)}</div>
       <div className={styles.body}>
         {logs?.length === 0 && <Empty />}
         {logs?.length > 0 && (
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 33ae9fa991..92285c63dd 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -21,7 +21,6 @@ export default function ({ children }) {
         <meta name="msapplication-TileColor" content="#da532c" />
         <meta name="theme-color" content="#fafafa" media="(prefers-color-scheme: light)" />
         <meta name="theme-color" content="#2f2f2f" media="(prefers-color-scheme: dark)" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
         <meta name="robots" content="noindex,nofollow" />
       </head>
       <body>
diff --git a/src/components/charts/PieChart.tsx b/src/components/charts/PieChart.tsx
index 11ad125cfb..57d676caec 100644
--- a/src/components/charts/PieChart.tsx
+++ b/src/components/charts/PieChart.tsx
@@ -9,7 +9,7 @@ export interface PieChartProps extends ChartProps {
 
 export default function PieChart(props: PieChartProps) {
   const [tooltip, setTooltip] = useState(null);
-  const { type } = props;
+  const { type = 'pie' } = props;
 
   const handleTooltip = ({ tooltip }) => {
     const { labelColors, dataPoints } = tooltip;
@@ -23,5 +23,5 @@ export default function PieChart(props: PieChartProps) {
     );
   };
 
-  return <Chart {...props} type={type || 'pie'} tooltip={tooltip} onTooltip={handleTooltip} />;
+  return <Chart {...props} type={type} tooltip={tooltip} onTooltip={handleTooltip} />;
 }
diff --git a/src/components/common/LoadingPanel.module.css b/src/components/common/LoadingPanel.module.css
new file mode 100644
index 0000000000..d82e27d69b
--- /dev/null
+++ b/src/components/common/LoadingPanel.module.css
@@ -0,0 +1,5 @@
+.panel {
+  display: flex;
+  flex-direction: column;
+  position: relative;
+}
diff --git a/src/components/common/LoadingPanel.tsx b/src/components/common/LoadingPanel.tsx
new file mode 100644
index 0000000000..890e8e3918
--- /dev/null
+++ b/src/components/common/LoadingPanel.tsx
@@ -0,0 +1,36 @@
+import { ReactNode } from 'react';
+import styles from './LoadingPanel.module.css';
+import classNames from 'classnames';
+import ErrorMessage from 'components/common/ErrorMessage';
+import { Loading } from 'react-basics';
+import Empty from 'components/common/Empty';
+
+export function LoadingPanel({
+  data,
+  error,
+  isFetched,
+  isLoading,
+  loadingIcon = 'dots',
+  className,
+  children,
+}: {
+  data?: any;
+  error?: Error;
+  isFetched?: boolean;
+  isLoading?: boolean;
+  loadingIcon?: 'dots' | 'spinner';
+  isEmpty?: boolean;
+  className?: string;
+  children: ReactNode;
+}) {
+  const isEmpty = !data?.length && !isLoading && isFetched;
+
+  return (
+    <div className={classNames(styles.panel, className)}>
+      {isLoading && !isFetched && <Loading icon={loadingIcon} />}
+      {error && <ErrorMessage />}
+      {!error && isEmpty && <Empty />}
+      {!error && !isEmpty && data && children}
+    </div>
+  );
+}
diff --git a/src/components/hooks/index.ts b/src/components/hooks/index.ts
index d92329c78d..42cac81a65 100644
--- a/src/components/hooks/index.ts
+++ b/src/components/hooks/index.ts
@@ -1,5 +1,8 @@
 export * from './queries/useApi';
 export * from './queries/useConfig';
+export * from './queries/useEventDataEvents';
+export * from './queries/useEventDataProperties';
+export * from './queries/useEventDataValues';
 export * from './queries/usePagedQuery';
 export * from './queries/useLogin';
 export * from './queries/useRealtime';
diff --git a/src/components/hooks/queries/useEventDataEvents.ts b/src/components/hooks/queries/useEventDataEvents.ts
new file mode 100644
index 0000000000..1d7ccf2da1
--- /dev/null
+++ b/src/components/hooks/queries/useEventDataEvents.ts
@@ -0,0 +1,20 @@
+import useApi from './useApi';
+import { UseQueryOptions } from '@tanstack/react-query';
+import { useFilterParams } from '../useFilterParams';
+
+export function useEventDataEvents(
+  websiteId: string,
+  options?: Omit<UseQueryOptions, 'queryKey' | 'queryFn'>,
+) {
+  const { get, useQuery } = useApi();
+  const params = useFilterParams(websiteId);
+
+  return useQuery({
+    queryKey: ['websites:event-data:events', { websiteId, ...params }],
+    queryFn: () => get(`/websites/${websiteId}/event-data/events`, { ...params }),
+    enabled: !!websiteId,
+    ...options,
+  });
+}
+
+export default useEventDataEvents;
diff --git a/src/components/hooks/queries/useEventDataProperties.ts b/src/components/hooks/queries/useEventDataProperties.ts
new file mode 100644
index 0000000000..4eabd0519e
--- /dev/null
+++ b/src/components/hooks/queries/useEventDataProperties.ts
@@ -0,0 +1,20 @@
+import useApi from './useApi';
+import { UseQueryOptions } from '@tanstack/react-query';
+import { useFilterParams } from '../useFilterParams';
+
+export function useEventDataProperties(
+  websiteId: string,
+  options?: Omit<UseQueryOptions, 'queryKey' | 'queryFn'>,
+) {
+  const { get, useQuery } = useApi();
+  const params = useFilterParams(websiteId);
+
+  return useQuery<any>({
+    queryKey: ['websites:event-data:properties', { websiteId, ...params }],
+    queryFn: () => get(`/websites/${websiteId}/event-data/properties`, { ...params }),
+    enabled: !!websiteId,
+    ...options,
+  });
+}
+
+export default useEventDataProperties;
diff --git a/src/components/hooks/queries/useEventDataValues.ts b/src/components/hooks/queries/useEventDataValues.ts
new file mode 100644
index 0000000000..47b5a513ce
--- /dev/null
+++ b/src/components/hooks/queries/useEventDataValues.ts
@@ -0,0 +1,21 @@
+import useApi from './useApi';
+import { UseQueryOptions } from '@tanstack/react-query';
+import { useFilterParams } from '../useFilterParams';
+
+export function useEventDataValues(
+  websiteId: string,
+  propertyName: string,
+  options?: Omit<UseQueryOptions, 'queryKey' | 'queryFn'>,
+) {
+  const { get, useQuery } = useApi();
+  const params = useFilterParams(websiteId);
+
+  return useQuery<any>({
+    queryKey: ['websites:event-data:values', { websiteId, propertyName, ...params }],
+    queryFn: () => get(`/websites/${websiteId}/event-data/values`, { ...params, propertyName }),
+    enabled: !!(websiteId && propertyName),
+    ...options,
+  });
+}
+
+export default useEventDataValues;
diff --git a/src/components/messages.ts b/src/components/messages.ts
index 75fa2d3e6c..f711a4f6cf 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -133,7 +133,7 @@ export const labels = defineMessages({
   session: { id: 'label.session', defaultMessage: 'Session' },
   sessions: { id: 'label.sessions', defaultMessage: 'Sessions' },
   pageNotFound: { id: 'message.page-not-found', defaultMessage: 'Page not found' },
-  activityLog: { id: 'label.activity-log', defaultMessage: 'Activity log' },
+  activity: { id: 'label.activity', defaultMessage: 'Activity' },
   dismiss: { id: 'label.dismiss', defaultMessage: 'Dismiss' },
   poweredBy: { id: 'label.powered-by', defaultMessage: 'Powered by {name}' },
   pageViews: { id: 'label.page-views', defaultMessage: 'Page views' },
diff --git a/src/lang/am-ET.json b/src/lang/am-ET.json
index 7c533031ab..ab31121851 100644
--- a/src/lang/am-ET.json
+++ b/src/lang/am-ET.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Access code",
   "label.actions": "Actions",
-  "label.activity-log": "Activity log",
+  "label.activity": "Activity log",
   "label.add": "Add",
   "label.add-description": "Add description",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Combined",
   "label.filter-raw": "Raw",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "Last {x} days",
   "label.last-hours": "Last {x} hours",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "Pages",
   "label.password": "Password",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Powered by {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Profile",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "Reset statistics",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Save",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Select website",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "Settings",
   "label.share-url": "Share URL",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "Tracking code",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "Unique visitors",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Unknown",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
+  "label.user-property": "User Property",
   "label.username": "Username",
   "label.users": "Users",
   "label.utm": "UTM",
diff --git a/src/lang/ar-SA.json b/src/lang/ar-SA.json
index f764f29e0a..981fea8407 100644
--- a/src/lang/ar-SA.json
+++ b/src/lang/ar-SA.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "كود الدعوة",
   "label.actions": "الإجراءات",
-  "label.activity-log": "سجل الأحداث",
+  "label.activity": "سجل الأحداث",
   "label.add": "أضِف",
   "label.add-description": "أضِف وصف",
   "label.add-member": "أضِف عضو",
@@ -78,6 +78,7 @@
   "label.filter-combined": "مُجمّعة",
   "label.filter-raw": "خام",
   "label.filters": "التصفيات",
+  "label.first-seen": "First seen",
   "label.funnel": "قمع",
   "label.funnel-description": "فهم معدل التحويل والانقطاع عن المستخدمين.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "آخر {x} يوم/ايام",
   "label.last-hours": "آخر {x} ساعة",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "غادر",
   "label.leave-team": "مغادرة المجموعة",
   "label.less-than": "أقل مِن",
@@ -132,11 +134,14 @@
   "label.pageTitle": "عنوان الصفحة",
   "label.pages": "الصفحات",
   "label.password": "كلمة المرور",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "مشغل بواسطة {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "الملف الشخصي",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "استعلامات",
   "label.query": "استعلام",
@@ -156,6 +161,9 @@
   "label.reset-website": "اعادة تعيين الإحصائيات",
   "label.retention": "الاحتفاظ",
   "label.retention-description": "قس مدى ثبات موقعك على الويب من خلال تتبع عدد مرات عودة المستخدمين.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "الصلاحية",
   "label.run-query": "شغّل الاستعلام",
   "label.save": "حفظ",
@@ -165,6 +173,7 @@
   "label.select-date": "حدد التاريخ",
   "label.select-role": "حدد الدور",
   "label.select-website": "حدد موقع",
+  "label.session": "Session",
   "label.sessions": "الزيارات",
   "label.settings": "الإعدادات",
   "label.share-url": "مشاركة الرابط",
@@ -193,18 +202,21 @@
   "label.total": "الإجمالي",
   "label.total-records": "إجمالي السجلات",
   "label.tracking-code": "كود التتبع",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "انقل الموقع",
   "label.true": "حقيقي",
   "label.type": "النوع",
   "label.unique": "فريد",
   "label.unique-visitors": "زائرون فريدون",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "غير معروف",
   "label.untitled": "بدون عنوان",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "المستخدم",
+  "label.user-property": "User Property",
   "label.username": "اسم المستخدم",
   "label.users": "المستخدمين",
   "label.utm": "UTM",
diff --git a/src/lang/be-BY.json b/src/lang/be-BY.json
index 129e6702af..b417afaa44 100644
--- a/src/lang/be-BY.json
+++ b/src/lang/be-BY.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Код доступу",
   "label.actions": "Дзеянні",
-  "label.activity-log": "Журнал актыўнасці",
+  "label.activity": "Журнал актыўнасці",
   "label.add": "Дадаць",
   "label.add-description": "Дадаць апісанне",
   "label.add-member": "Дадаць удзельніка",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Камбініраваны",
   "label.filter-raw": "Сырыя",
   "label.filters": "Фільтры",
+  "label.first-seen": "First seen",
   "label.funnel": "Варонка",
   "label.funnel-description": "Разумець паказчыкі канверсіі і адмоваў.",
   "label.goal": "Мэта",
@@ -103,6 +104,7 @@
   "label.last-days": "Апошнія {x} дзён",
   "label.last-hours": "Апошнія {x} гадзіны",
   "label.last-months": "Апошнія {x} месяцаў",
+  "label.last-seen": "Last seen",
   "label.leave": "Пакінуць",
   "label.leave-team": "Пакінуць каманду",
   "label.less-than": "Менш чым",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Загаловак старонкі",
   "label.pages": "Старонкі",
   "label.password": "Пароль",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Зроблена {name}",
   "label.previous": "Папярэдні",
   "label.previous-period": "Папярэдні перыяд",
   "label.previous-year": "Папярэдні год",
   "label.profile": "Профіль",
+  "label.properties": "Properties",
   "label.property": "Уласцівасць",
   "label.queries": "Запыты",
   "label.query": "Запыт",
@@ -156,6 +161,9 @@
   "label.reset-website": "Скінуць статыстыку",
   "label.retention": "Утрыманне",
   "label.retention-description": "Ацаніць прыцягальнасць сайта, адсочваючы павяртанні карыстальнікаў.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Роля",
   "label.run-query": "Запусціць запыт",
   "label.save": "Захаваць",
@@ -165,6 +173,7 @@
   "label.select-date": "Выбраць дату",
   "label.select-role": "Выбраць ролю",
   "label.select-website": "Выбраць сайт",
+  "label.session": "Session",
   "label.sessions": "Сесіі",
   "label.settings": "Налады",
   "label.share-url": "Падзяліцца спасылкай",
@@ -193,18 +202,21 @@
   "label.total": "Агульная колькасць",
   "label.total-records": "Агульная колькасць запісаў",
   "label.tracking-code": "Код адсочвання",
+  "label.transactions": "Transactions",
   "label.transfer": "Перадаць",
   "label.transfer-website": "Перадаць сайт",
   "label.true": "Ісціна",
   "label.type": "Тып",
   "label.unique": "Унікальны",
   "label.unique-visitors": "Унікальныя наведвальнікі",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Невядома",
   "label.untitled": "Без назвы",
   "label.update": "Абнавіць",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Карыстальнік",
+  "label.user-property": "User Property",
   "label.username": "Імя карыстальніка",
   "label.users": "Карыстальнікі",
   "label.utm": "UTM",
diff --git a/src/lang/bg-BG.json b/src/lang/bg-BG.json
index 5095b38799..1fd87de2e4 100644
--- a/src/lang/bg-BG.json
+++ b/src/lang/bg-BG.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Код за достъп",
   "label.actions": "Действия",
-  "label.activity-log": "Активностти",
+  "label.activity": "Активностти",
   "label.add": "Добави",
   "label.add-description": "Добави описание",
   "label.add-member": "Добави член",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Комбиниран",
   "label.filter-raw": "Суров",
   "label.filters": "Филтри",
+  "label.first-seen": "First seen",
   "label.funnel": "Фуния",
   "label.funnel-description": "Разберете процента на конверсия и отпадане на потребителите.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "Последните {x} дни",
   "label.last-hours": "Последните {x} часа",
   "label.last-months": "Последните {x} месеца",
+  "label.last-seen": "Last seen",
   "label.leave": "Напусни",
   "label.leave-team": "Напусни екип",
   "label.less-than": "По-малко от",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Заглавие на страница",
   "label.pages": "Страници",
   "label.password": "Парола",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Поддържано от {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Профил",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Запитвания",
   "label.query": "Запитване",
@@ -156,6 +161,9 @@
   "label.reset-website": "Нулирай уебсайт",
   "label.retention": "Привързване",
   "label.retention-description": "Измерете привързаността към вашия уебсайт, като проследявате колко често потребителите се връщат.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Роля",
   "label.run-query": "Изпълни запитване",
   "label.save": "Запази",
@@ -165,6 +173,7 @@
   "label.select-date": "Избери дата",
   "label.select-role": "Избери роля",
   "label.select-website": "Избери уебсайт",
+  "label.session": "Session",
   "label.sessions": "Сесии",
   "label.settings": "Настройки",
   "label.share-url": "Сподели Линк",
@@ -193,18 +202,21 @@
   "label.total": "Общо",
   "label.total-records": "Общо записи",
   "label.tracking-code": "Код за проследяване",
+  "label.transactions": "Transactions",
   "label.transfer": "Прехвърли",
   "label.transfer-website": "Прехвърляне на уебсайт",
   "label.true": "Вярно",
   "label.type": "Вид",
   "label.unique": "Уникален",
   "label.unique-visitors": "Уникални посетители",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Неизвестен",
   "label.untitled": "Без заглавие",
   "label.update": "Актуализирай",
   "label.url": "URL адрес",
   "label.urls": "URL адреси",
   "label.user": "Потребител",
+  "label.user-property": "User Property",
   "label.username": "Потребителско име",
   "label.users": "Потребители",
   "label.utm": "UTM",
diff --git a/src/lang/bn-BD.json b/src/lang/bn-BD.json
index 18eb1d896e..7a22d76c17 100644
--- a/src/lang/bn-BD.json
+++ b/src/lang/bn-BD.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "এক্সেস কোড",
   "label.actions": "অ্যাকশনস",
-  "label.activity-log": "একটিভিটি দেখুন",
+  "label.activity": "একটিভিটি দেখুন",
   "label.add": "যুক্ত করুন",
   "label.add-description": "বর্ননা যোগ করুন",
   "label.add-member": "সদস্য যোগ করুন",
@@ -78,6 +78,7 @@
   "label.filter-combined": "সম্মিলিত",
   "label.filter-raw": "অপরিশোধিত",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "শেষ {x} দিন",
   "label.last-hours": "শেষ {x} ঘন্টা",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "পৃষ্ঠাগুলি",
   "label.password": "পাসওয়ার্ড",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "{name} দ্বারা চালিত",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "প্রোফাইল",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "ওয়েবসাইট রিসেট করুন",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "সংরক্ষণ",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Select website",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "সেটিংস",
   "label.share-url": "ইউআরএল শেয়ার করুন",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "ট্র্যাকিং কোড",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "অনন্য ভিজিটর",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "অজানা",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
+  "label.user-property": "User Property",
   "label.username": "ব্যবহারকারীর নাম",
   "label.users": "Users",
   "label.utm": "UTM",
diff --git a/src/lang/bs-BA.json b/src/lang/bs-BA.json
index 000af0dc20..b9d9e8a8e8 100644
--- a/src/lang/bs-BA.json
+++ b/src/lang/bs-BA.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Pristupni kod",
   "label.actions": "Akcije",
-  "label.activity-log": "Log aktivnosti",
+  "label.activity": "Log aktivnosti",
   "label.add": "Dodaj",
   "label.add-description": "Dodaj opis",
   "label.add-member": "Dodaj člana",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Kombinovano",
   "label.filter-raw": "Sirovo",
   "label.filters": "Filtri",
+  "label.first-seen": "First seen",
   "label.funnel": "Lijevak",
   "label.funnel-description": "Razumite koverziju i drop-off učestalost korisnika.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "Zadnjih {x} dana",
   "label.last-hours": "Zadnjih {x} sati",
   "label.last-months": "Zadnjih {x} mjeseci",
+  "label.last-seen": "Last seen",
   "label.leave": "Napusti",
   "label.leave-team": "Napusti tim",
   "label.less-than": "Manje od",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Naslov stranice",
   "label.pages": "Stranice",
   "label.password": "Šifra",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Omogućeno s {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queryji",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "Resetuj web stranicu",
   "label.retention": "Retention",
   "label.retention-description": "Izmjeri 'ljepljivost' svoje web stranice praćenjem koliko često set korisnici vraćaju.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Rola",
   "label.run-query": "Pokreni query",
   "label.save": "Sačuvaj",
@@ -165,6 +173,7 @@
   "label.select-date": "Odaberi datum",
   "label.select-role": "Odaberi rolu",
   "label.select-website": "Odaberi web stranicu",
+  "label.session": "Session",
   "label.sessions": "Sesije",
   "label.settings": "Postavke",
   "label.share-url": "Share URL",
@@ -193,18 +202,21 @@
   "label.total": "Ukupno",
   "label.total-records": "Ukupno redova",
   "label.tracking-code": "Kod za praćenje",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer web stranice",
   "label.true": "Da",
   "label.type": "Tip",
   "label.unique": "Jedinstveno",
   "label.unique-visitors": "Jedinstvenih posjetitelja",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Nepoznato",
   "label.untitled": "Bezimeno",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Korisnik",
+  "label.user-property": "User Property",
   "label.username": "Korisničko ime",
   "label.users": "Korisnici",
   "label.utm": "UTM",
diff --git a/src/lang/ca-ES.json b/src/lang/ca-ES.json
index dae977fc2c..5083af70ea 100644
--- a/src/lang/ca-ES.json
+++ b/src/lang/ca-ES.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Codi d'accés",
   "label.actions": "Accions",
-  "label.activity-log": "Registre d'activitat",
+  "label.activity": "Registre d'activitat",
   "label.add": "Afegir",
   "label.add-description": "Afegir descripció",
   "label.add-member": "Afegir membre",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Combinat",
   "label.filter-raw": "En cru",
   "label.filters": "Filtres",
+  "label.first-seen": "First seen",
   "label.funnel": "Embut",
   "label.funnel-description": "Entengui la taxa de conversió i abandonament dels usuaris.",
   "label.goal": "Meta",
@@ -103,6 +104,7 @@
   "label.last-days": "Últims {x} dies",
   "label.last-hours": "Últimes {x} hores",
   "label.last-months": "Últims {x} mesos",
+  "label.last-seen": "Last seen",
   "label.leave": "Abandonar",
   "label.leave-team": "Abandonar equip",
   "label.less-than": "Menor que",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Títol de la pàgina",
   "label.pages": "Pàgines",
   "label.password": "Contrasenya",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Funciona amb {name}",
   "label.previous": "Anterior",
   "label.previous-period": "Període anterior",
   "label.previous-year": "Any anterior",
   "label.profile": "Perfil",
+  "label.properties": "Properties",
   "label.property": "Propietat",
   "label.queries": "Consultes",
   "label.query": "Consulta",
@@ -156,6 +161,9 @@
   "label.reset-website": "Restableix estadístiques",
   "label.retention": "Retenció",
   "label.retention-description": "Mesuri la retenció del seu lloc web fent un seguiment de la freqüència amb què tornen els usuaris.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Rol",
   "label.run-query": "Executar consulta",
   "label.save": "Desa",
@@ -165,6 +173,7 @@
   "label.select-date": "Seleccionar data",
   "label.select-role": "Seleccionar rol",
   "label.select-website": "Seleccionar lloc web",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "Configuració",
   "label.share-url": "Enllaç per compartir",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total de registres",
   "label.tracking-code": "Codi de seguiment",
+  "label.transactions": "Transactions",
   "label.transfer": "Transferir",
   "label.transfer-website": "Transferir lloc web",
   "label.true": "Cert",
   "label.type": "Tipus",
   "label.unique": "Únic",
   "label.unique-visitors": "Visitants únics",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Desconegut",
   "label.untitled": "Sense títol",
   "label.update": "Actualitzar",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Usuari",
+  "label.user-property": "User Property",
   "label.username": "Nom d'usuari",
   "label.users": "Usuaris",
   "label.utm": "UTM",
diff --git a/src/lang/cs-CZ.json b/src/lang/cs-CZ.json
index 3a57f6b28c..717bd97019 100644
--- a/src/lang/cs-CZ.json
+++ b/src/lang/cs-CZ.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Access code",
   "label.actions": "Akce",
-  "label.activity-log": "Activity log",
+  "label.activity": "Activity log",
   "label.add": "Add",
   "label.add-description": "Add description",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Kombinace",
   "label.filter-raw": "Nezpracované",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "Posledních {x} dnů",
   "label.last-hours": "Posledních {x} hodin",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "Stránky",
   "label.password": "Heslo",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Běží na {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "Reset statistics",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Uložit",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Select website",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "Nastavení",
   "label.share-url": "Sdílet URL",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "Sledovací kód",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "Jedinečné návštěvy",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Neznámý",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
+  "label.user-property": "User Property",
   "label.username": "Uživatelské jméno",
   "label.users": "Users",
   "label.utm": "UTM",
diff --git a/src/lang/da-DK.json b/src/lang/da-DK.json
index 715df99e21..143d079dca 100644
--- a/src/lang/da-DK.json
+++ b/src/lang/da-DK.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Access code",
   "label.actions": "Handlinger",
-  "label.activity-log": "Activity log",
+  "label.activity": "Activity log",
   "label.add": "Add",
   "label.add-description": "Add description",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Kombineret",
   "label.filter-raw": "Rå",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "Sidste {x} dage",
   "label.last-hours": "Sidste {x} timer",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "Sider",
   "label.password": "Adgangskode",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Drevet af {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "Nulstil statistikker",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Gem",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Select website",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "Indstillinger",
   "label.share-url": "Del URL",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "Sporingskode",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "Unikke besøgende",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Ukendt",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
+  "label.user-property": "User Property",
   "label.username": "Brugernavn",
   "label.users": "Users",
   "label.utm": "UTM",
diff --git a/src/lang/de-CH.json b/src/lang/de-CH.json
index 6891480fa9..aa57f90c9c 100644
--- a/src/lang/de-CH.json
+++ b/src/lang/de-CH.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Zuegangscode",
   "label.actions": "Aktione",
-  "label.activity-log": "Aktivitätsverlauf",
+  "label.activity": "Aktivitätsverlauf",
   "label.add": "Add",
   "label.add-description": "Add description",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Kombiniert",
   "label.filter-raw": "Rohdate",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "Letzti {x} Täg",
   "label.last-hours": "Letzti {x} Stunde",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Verlah",
   "label.leave-team": "Team verlah",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "Siite",
   "label.password": "Passwort",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Betribe dur {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Abfrage",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "Statistik zruggsetze",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Rollä",
   "label.run-query": "Run query",
   "label.save": "Speichere",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Websiite uuswähle",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "Istellige",
   "label.share-url": "Freigab-URL",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "Tracking Code",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "Eidütigi Bsuecher",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Unbekannt",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Benutzer",
+  "label.user-property": "User Property",
   "label.username": "Benutzername",
   "label.users": "Benutzer",
   "label.utm": "UTM",
diff --git a/src/lang/de-DE.json b/src/lang/de-DE.json
index cb9ba089ca..5151910533 100644
--- a/src/lang/de-DE.json
+++ b/src/lang/de-DE.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Zugangscode",
   "label.actions": "Aktionen",
-  "label.activity-log": "Aktivitätsverlauf",
+  "label.activity": "Aktivitätsverlauf",
   "label.add": "Hinzufügen",
   "label.add-description": "Beschreibung hinzufügen",
   "label.add-member": "Mitglied hinzufügen",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Kombiniert",
   "label.filter-raw": "Rohdaten",
   "label.filters": "Filter",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Verstehe die Konversions- und Abbruchrate der Nutzer.",
   "label.goal": "Ziel",
@@ -103,6 +104,7 @@
   "label.last-days": "Letzten {x} Tage",
   "label.last-hours": "Letzten {x} Stunden",
   "label.last-months": "Letzten {x} Monate",
+  "label.last-seen": "Last seen",
   "label.leave": "Verlassen",
   "label.leave-team": "Team verlassen",
   "label.less-than": "Kleiner als",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Seitentitel",
   "label.pages": "Seiten",
   "label.password": "Passwort",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Betrieben durch {name}",
   "label.previous": "Vorheriges",
   "label.previous-period": "Vorherige Periode",
   "label.previous-year": "Vorheriges Jahr",
   "label.profile": "Profil",
+  "label.properties": "Properties",
   "label.property": "Eigentum",
   "label.queries": "Abfragen",
   "label.query": "Abfrage",
@@ -156,6 +161,9 @@
   "label.reset-website": "Statistik zurücksetzen",
   "label.retention": "Bewahrung",
   "label.retention-description": "Messen Sie die Verweildauer auf Ihrer Website, indem Sie verfolgen, wie oft die Nutzer zurückkehren.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Rolle",
   "label.run-query": "Abfrage starten",
   "label.save": "Speichern",
@@ -165,6 +173,7 @@
   "label.select-date": "Datum auswählen",
   "label.select-role": "Rolle auswählen",
   "label.select-website": "Webseite auswählen",
+  "label.session": "Session",
   "label.sessions": "Sitzungen",
   "label.settings": "Einstellungen",
   "label.share-url": "Freigabe-URL",
@@ -193,18 +202,21 @@
   "label.total": "Gesamt",
   "label.total-records": "Datensätze insgesamt",
   "label.tracking-code": "Tracking Code",
+  "label.transactions": "Transactions",
   "label.transfer": "Übertragung",
   "label.transfer-website": "Website übertragen",
   "label.true": "Wahr",
   "label.type": "Typ",
   "label.unique": "Eindeutig",
   "label.unique-visitors": "Eindeutige Besucher",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Unbekannt",
   "label.untitled": "Unbenannt",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Benutzer",
+  "label.user-property": "User Property",
   "label.username": "Benutzername",
   "label.users": "Benutzer",
   "label.utm": "UTM",
diff --git a/src/lang/el-GR.json b/src/lang/el-GR.json
index ceb0812bdd..263ea7e9f0 100644
--- a/src/lang/el-GR.json
+++ b/src/lang/el-GR.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Access code",
   "label.actions": "Ενέργειες",
-  "label.activity-log": "Activity log",
+  "label.activity": "Activity log",
   "label.add": "Add",
   "label.add-description": "Add description",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Σε συνδυασμό",
   "label.filter-raw": "Ακατέργαστο",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "Τελευταίες {x} ημέρες",
   "label.last-hours": "Τελευταίες {x} ώρες",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "Σελίδες",
   "label.password": "Κωδικός",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Με την υποστήριξη του {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Προφίλ",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "Reset statistics",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Αποθήκευση",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Select website",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "Ρυθμίσεις",
   "label.share-url": "Κοινοποίηση διεύθυνσης URL",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "Κωδικός παρακολούθησης",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "Μοναδικοί επισκέπτες",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Άγνωστο",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
+  "label.user-property": "User Property",
   "label.username": "Όνομα χρήστη",
   "label.users": "Users",
   "label.utm": "UTM",
diff --git a/src/lang/en-GB.json b/src/lang/en-GB.json
index 9bb61811b4..80bbbd7b89 100644
--- a/src/lang/en-GB.json
+++ b/src/lang/en-GB.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Access code",
   "label.actions": "Actions",
-  "label.activity-log": "Activity log",
+  "label.activity": "Activity log",
   "label.add": "Add",
   "label.add-description": "Add description",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Combined",
   "label.filter-raw": "Raw",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "Last {x} days",
   "label.last-hours": "Last {x} hours",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "Pages",
   "label.password": "Password",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Powered by {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Profile",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "Reset statistics",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Save",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Select website",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "Settings",
   "label.share-url": "Share URL",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "Tracking code",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "Unique visitors",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Unknown",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
+  "label.user-property": "User Property",
   "label.username": "Username",
   "label.users": "Users",
   "label.utm": "UTM",
diff --git a/src/lang/en-US.json b/src/lang/en-US.json
index e895036cc1..8fe3314592 100644
--- a/src/lang/en-US.json
+++ b/src/lang/en-US.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Access code",
   "label.actions": "Actions",
-  "label.activity-log": "Activity log",
+  "label.activity": "Activity",
   "label.add": "Add",
   "label.add-description": "Add description",
   "label.add-member": "Add member",
@@ -66,11 +66,11 @@
   "label.edit-member": "Edit member",
   "label.enable-share-url": "Enable share URL",
   "label.end-step": "End Step",
-  "label.entry": "Entry URL",
+  "label.entry": "Entry path",
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Events",
-  "label.exit": "Exit URL",
+  "label.exit": "Exit path",
   "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Combined",
   "label.filter-raw": "Raw",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "Last {x} days",
   "label.last-hours": "Last {x} hours",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "Pages",
   "label.password": "Password",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Powered by {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Profile",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "Reset website",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Save",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Select website",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "Settings",
   "label.share-url": "Share URL",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "Tracking code",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "Unique visitors",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Unknown",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
+  "label.user-property": "User Property",
   "label.username": "Username",
   "label.users": "Users",
   "label.utm": "UTM",
diff --git a/src/lang/es-ES.json b/src/lang/es-ES.json
index 532e4d20c9..5f930be7b6 100644
--- a/src/lang/es-ES.json
+++ b/src/lang/es-ES.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Código de acceso",
   "label.actions": "Acciones",
-  "label.activity-log": "Registro de actividad",
+  "label.activity": "Registro de actividad",
   "label.add": "Añadir",
   "label.add-description": "Añadir descripción",
   "label.add-member": "Añadir miembro",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Combinado",
   "label.filter-raw": "En crudo",
   "label.filters": "Filtros",
+  "label.first-seen": "First seen",
   "label.funnel": "Embudo",
   "label.funnel-description": "Comprender conversión y abandono de usuarios.",
   "label.goal": "Objetivo",
@@ -103,6 +104,7 @@
   "label.last-days": "Últimos {x} días",
   "label.last-hours": "Últimas {x} horas",
   "label.last-months": "Últimos {x} meses",
+  "label.last-seen": "Last seen",
   "label.leave": "Abandonar",
   "label.leave-team": "Abandonar equipo",
   "label.less-than": "Menor que",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Título de página",
   "label.pages": "Páginas",
   "label.password": "Contraseña",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Analíticas de {name}",
   "label.previous": "Anterior",
   "label.previous-period": "Periodo anterior",
   "label.previous-year": "Año anterior",
   "label.profile": "Perfil",
+  "label.properties": "Properties",
   "label.property": "Propiedad",
   "label.queries": "Consultas",
   "label.query": "Consulta",
@@ -156,6 +161,9 @@
   "label.reset-website": "Reiniciar analíticas",
   "label.retention": "Retención",
   "label.retention-description": "Medir la frecuencia con la que los usuarios vuelven a tu sitio web.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Rol",
   "label.run-query": "Ejecutar consulta",
   "label.save": "Guardar",
@@ -165,6 +173,7 @@
   "label.select-date": "Seleccionar fecha",
   "label.select-role": "Seleccionar rol",
   "label.select-website": "Seleccionar sitio web",
+  "label.session": "Session",
   "label.sessions": "Sesiones",
   "label.settings": "Ajustes",
   "label.share-url": "Compartir URL",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total de registros",
   "label.tracking-code": "Código de rastreo",
+  "label.transactions": "Transactions",
   "label.transfer": "Transferir",
   "label.transfer-website": "Transferir sitio web",
   "label.true": "Verdadero",
   "label.type": "Tipo",
   "label.unique": "Único",
   "label.unique-visitors": "Visitantes únicos",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Desconocida",
   "label.untitled": "Sin título",
   "label.update": "Actualizar",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Usuario",
+  "label.user-property": "User Property",
   "label.username": "Nombre de usuario",
   "label.users": "Usuarios",
   "label.utm": "UTM",
diff --git a/src/lang/fa-IR.json b/src/lang/fa-IR.json
index fe1705e30a..d5b480218c 100644
--- a/src/lang/fa-IR.json
+++ b/src/lang/fa-IR.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Access code",
   "label.actions": "اقدامات",
-  "label.activity-log": "Activity log",
+  "label.activity": "Activity log",
   "label.add": "Add",
   "label.add-description": "Add description",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "ترکیب شده",
   "label.filter-raw": "خام",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "لیست {x} روز گذشته",
   "label.last-hours": "لیست {x} ساعت گذشته",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "صفحه‌ها",
   "label.password": "رمز",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "قدرت گرفته توسط {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "پروفایل",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "بازنشانی آمار",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "ذخیره",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Select website",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "تنظیمات",
   "label.share-url": "به اشتراک گذاری URL",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "کد رهگیری",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "بازدیدکننده‌های یکتا",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "ناشناخته",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
+  "label.user-property": "User Property",
   "label.username": "نام کاربری",
   "label.users": "Users",
   "label.utm": "UTM",
diff --git a/src/lang/fi-FI.json b/src/lang/fi-FI.json
index 02561dcb23..a47df265d2 100644
--- a/src/lang/fi-FI.json
+++ b/src/lang/fi-FI.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Access code",
   "label.actions": "Toiminnat",
-  "label.activity-log": "Activity log",
+  "label.activity": "Activity log",
   "label.add": "Add",
   "label.add-description": "Add description",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Yhdistetty",
   "label.filter-raw": "Käsittelemätön",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "Viimeisimmät {x} päivää",
   "label.last-hours": "Viimeisimmät {x} tuntia",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "Sivut",
   "label.password": "Salasana",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Voimanlähteenä {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Profiili",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "Nollaa tilastot",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Tallenna",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Select website",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "Asetukset",
   "label.share-url": "Jaa URL",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "Seurantakoodi",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "Yksittäiset kävijät",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Tuntematon",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
+  "label.user-property": "User Property",
   "label.username": "Käyttäjänimi",
   "label.users": "Users",
   "label.utm": "UTM",
diff --git a/src/lang/fo-FO.json b/src/lang/fo-FO.json
index e9ca2aae91..231753029a 100644
--- a/src/lang/fo-FO.json
+++ b/src/lang/fo-FO.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Access code",
   "label.actions": "Gerðir",
-  "label.activity-log": "Activity log",
+  "label.activity": "Activity log",
   "label.add": "Add",
   "label.add-description": "Add description",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Samansett",
   "label.filter-raw": "Óviðgjørt",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "Seinastu {x} dagarnar",
   "label.last-hours": "Seinastu {x} tímarnar",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "Síðir",
   "label.password": "Loyniorð",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Powered by {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Vangi",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "Reset statistics",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Goym",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Select website",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "Stillingar",
   "label.share-url": "Deil leinku",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "Spori kota",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "Einsýna vitjanir",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Ókent",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
+  "label.user-property": "User Property",
   "label.username": "Brúkaranavn",
   "label.users": "Users",
   "label.utm": "UTM",
diff --git a/src/lang/fr-FR.json b/src/lang/fr-FR.json
index edb2abd36b..e1c9befef6 100644
--- a/src/lang/fr-FR.json
+++ b/src/lang/fr-FR.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Code d'accès",
   "label.actions": "Actions",
-  "label.activity-log": "Journal d'activité",
+  "label.activity": "Journal d'activité",
   "label.add": "Ajouter",
   "label.add-description": "Ajouter une description",
   "label.add-member": "Ajouter un membre",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Combiné",
   "label.filter-raw": "Brut",
   "label.filters": "Filtres",
+  "label.first-seen": "First seen",
   "label.funnel": "Entonnoir",
   "label.funnel-description": "Suivi des conversions et des taux d'abandons.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "{x} derniers jours",
   "label.last-hours": "{x} dernières heures",
   "label.last-months": "{x} derniers mois",
+  "label.last-seen": "Last seen",
   "label.leave": "Quitter",
   "label.leave-team": "Quitter l'équipe",
   "label.less-than": "Inférieur à",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Titre de page",
   "label.pages": "Pages",
   "label.password": "Mot de passe",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Propulsé par {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Requêtes",
   "label.query": "Requête",
@@ -156,6 +161,9 @@
   "label.reset-website": "Réinitialiser les statistiques",
   "label.retention": "Rétention",
   "label.retention-description": "Mesure de l'attractivité du site en visualisant les taux de visiteurs qui reviennent.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Rôle",
   "label.run-query": "Éxécuter la requête",
   "label.save": "Enregistrer",
@@ -165,6 +173,7 @@
   "label.select-date": "Choisir une période",
   "label.select-role": "Choisir un rôle",
   "label.select-website": "Choisir un site",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "Paramètres",
   "label.share-url": "URL de partage",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Nombre d'enregistrements",
   "label.tracking-code": "Code de suivi",
+  "label.transactions": "Transactions",
   "label.transfer": "Transférer",
   "label.transfer-website": "Transférer le site",
   "label.true": "Vrai",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "Visiteurs uniques",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Inconnu",
   "label.untitled": "Sans titre",
   "label.update": "Modifier",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Utilisateur",
+  "label.user-property": "User Property",
   "label.username": "Nom d'utilisateur",
   "label.users": "Utilisateurs",
   "label.utm": "UTM",
diff --git a/src/lang/ga-ES.json b/src/lang/ga-ES.json
index d267137f1a..14b9a47411 100644
--- a/src/lang/ga-ES.json
+++ b/src/lang/ga-ES.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Access code",
   "label.actions": "Accións",
-  "label.activity-log": "Activity log",
+  "label.activity": "Activity log",
   "label.add": "Add",
   "label.add-description": "Add description",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Combinado",
   "label.filter-raw": "Raw",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "Últimos {x} días",
   "label.last-hours": "Últimas {x} horas",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "Páxinas",
   "label.password": "Contrasinal",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Funciona grazas a {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Perfil",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Gardar",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Select website",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "Axustes",
   "label.share-url": "Compartir URL",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "Código de seguimento",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "Visitas únicas",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Descoñecido",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
+  "label.user-property": "User Property",
   "label.username": "Identificador",
   "label.users": "Users",
   "label.utm": "UTM",
diff --git a/src/lang/he-IL.json b/src/lang/he-IL.json
index d7ebf875b6..fd25cd144a 100644
--- a/src/lang/he-IL.json
+++ b/src/lang/he-IL.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Access code",
   "label.actions": "פעולות",
-  "label.activity-log": "Activity log",
+  "label.activity": "Activity log",
   "label.add": "Add",
   "label.add-description": "Add description",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "משותף",
   "label.filter-raw": "גולמי",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "{x} ימים אחרונים",
   "label.last-hours": "{x} שעות אחרונות",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "דפים",
   "label.password": "סיסמה",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Powered by {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "פרופיל",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "Reset statistics",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "שמירה",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Select website",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "הגדרות",
   "label.share-url": "שיתוף URL",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "קוד מעקב",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "מבקרים ייחודיים",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "לא ידוע",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
+  "label.user-property": "User Property",
   "label.username": "שם משתמש",
   "label.users": "Users",
   "label.utm": "UTM",
diff --git a/src/lang/hi-IN.json b/src/lang/hi-IN.json
index 1fbee2c02e..2fabe0c6e1 100644
--- a/src/lang/hi-IN.json
+++ b/src/lang/hi-IN.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Access code",
   "label.actions": "कार्य",
-  "label.activity-log": "Activity log",
+  "label.activity": "Activity log",
   "label.add": "Add",
   "label.add-description": "Add description",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "संयुक्त",
   "label.filter-raw": "रॉ",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "पिछले {x} दिन",
   "label.last-hours": "पिछले {x} घंटे",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "पृष्ठों",
   "label.password": "पासवर्ड",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "{name} द्वारा संचालित",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "प्रोफ़ाइल",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "Reset statistics",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "सहेजें",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Select website",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "समायोजन",
   "label.share-url": "यूआरएल साझा करें",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "ट्रैकिंग कोड",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "अद्वितीय आगंतुकों",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "अज्ञात",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
+  "label.user-property": "User Property",
   "label.username": "उपयोगकर्ता नाम",
   "label.users": "Users",
   "label.utm": "UTM",
diff --git a/src/lang/hr-HR.json b/src/lang/hr-HR.json
index 39d4d9d1dd..6bf12237ab 100644
--- a/src/lang/hr-HR.json
+++ b/src/lang/hr-HR.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Access code",
   "label.actions": "Actions",
-  "label.activity-log": "Activity log",
+  "label.activity": "Activity log",
   "label.add": "Add",
   "label.add-description": "Add description",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Combined",
   "label.filter-raw": "Raw",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "Zadnjih {x} dana",
   "label.last-hours": "Zadnjih {x} sati",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "Pages",
   "label.password": "Lozinka",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Powered by {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "Resetirati web stranicu",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Spremi",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Select website",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "Postavke",
   "label.share-url": "Podijeli poveznicu",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "Kod za praćenje",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "Unique visitors",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Nepoznato",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
+  "label.user-property": "User Property",
   "label.username": "Korisničko ime",
   "label.users": "Users",
   "label.utm": "UTM",
diff --git a/src/lang/hu-HU.json b/src/lang/hu-HU.json
index 6762181bd7..8593b37e7a 100644
--- a/src/lang/hu-HU.json
+++ b/src/lang/hu-HU.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Access code",
   "label.actions": "Műveletek",
-  "label.activity-log": "Activity log",
+  "label.activity": "Activity log",
   "label.add": "Add",
   "label.add-description": "Add description",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Összevont",
   "label.filter-raw": "Nyers",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "Legutóbbi {x} nap",
   "label.last-hours": "Legutóbbi {x} óra",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "Oldalak",
   "label.password": "Jelszó",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Működteti az {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "Reset statistics",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Mentés",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Select website",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "Beállítások",
   "label.share-url": "URL megosztása",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "Követési kód",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "Egyedi látogatók",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Ismeretlen",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
+  "label.user-property": "User Property",
   "label.username": "Felhasználónév",
   "label.users": "Users",
   "label.utm": "UTM",
diff --git a/src/lang/id-ID.json b/src/lang/id-ID.json
index 930b02da5c..6cf7659caa 100644
--- a/src/lang/id-ID.json
+++ b/src/lang/id-ID.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Access code",
   "label.actions": "Aksi",
-  "label.activity-log": "Activity log",
+  "label.activity": "Activity log",
   "label.add": "Add",
   "label.add-description": "Add description",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Gabungan",
   "label.filter-raw": "Mentah",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "{x} hari terakhir",
   "label.last-hours": "{x} jam terakhir",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "Halaman",
   "label.password": "Kata sandi",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Didukung oleh {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "Atur ulang statistik",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Simpan",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Select website",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "Pengaturan",
   "label.share-url": "Bagikan URL",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "Kode lacak",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "Pengunjung unik",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Tidak diketahui",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
+  "label.user-property": "User Property",
   "label.username": "Nama pengguna",
   "label.users": "Users",
   "label.utm": "UTM",
diff --git a/src/lang/it-IT.json b/src/lang/it-IT.json
index 229254d56a..4df7599a45 100644
--- a/src/lang/it-IT.json
+++ b/src/lang/it-IT.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Access code",
   "label.actions": "Azioni",
-  "label.activity-log": "Activity log",
+  "label.activity": "Activity log",
   "label.add": "Add",
   "label.add-description": "Add description",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Aggregati",
   "label.filter-raw": "Raw",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "Ultimi {x} giorni",
   "label.last-hours": "Ultime {x} ore",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "Pagine",
   "label.password": "Password",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Powered by {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Profilo",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "Resetta le statistiche",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Salva",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Select website",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "Impostazioni",
   "label.share-url": "Condividi link",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "Codice di tracking",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "Visitatori unici",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Sconosciuto",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
+  "label.user-property": "User Property",
   "label.username": "Nome utente",
   "label.users": "Users",
   "label.utm": "UTM",
diff --git a/src/lang/ja-JP.json b/src/lang/ja-JP.json
index 02e300bbb8..72e2998b5c 100644
--- a/src/lang/ja-JP.json
+++ b/src/lang/ja-JP.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "アクセスコード",
   "label.actions": "アクション",
-  "label.activity-log": "アクティビティログ",
+  "label.activity": "アクティビティログ",
   "label.add": "追加",
   "label.add-description": "説明を追加",
   "label.add-member": "メンバーの追加",
@@ -78,6 +78,7 @@
   "label.filter-combined": "結合",
   "label.filter-raw": "RAW",
   "label.filters": "フィルター",
+  "label.first-seen": "First seen",
   "label.funnel": "ファネル",
   "label.funnel-description": "ユーザーのコンバージョン率と離脱率を分析します。",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "過去{x}日間",
   "label.last-hours": "過去{x}時間",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "離脱",
   "label.leave-team": "チームを離脱",
   "label.less-than": "未満",
@@ -132,11 +134,14 @@
   "label.pageTitle": "ページタイトル",
   "label.pages": "ページ",
   "label.password": "パスワード",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Powered by {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "プロフィール",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "クエリ",
   "label.query": "クエリ",
@@ -156,6 +161,9 @@
   "label.reset-website": "Webサイトをリセットする",
   "label.retention": "リテンション",
   "label.retention-description": "ユーザーの再訪問回数を記録して、Webサイトのリテンション率を計測します。",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "ロール",
   "label.run-query": "クエリ実行",
   "label.save": "保存",
@@ -165,6 +173,7 @@
   "label.select-date": "日付を選択",
   "label.select-role": "ロールを選択",
   "label.select-website": "Webサイトを選択",
+  "label.session": "Session",
   "label.sessions": "セッション",
   "label.settings": "設定",
   "label.share-url": "共有URL",
@@ -193,18 +202,21 @@
   "label.total": "累計",
   "label.total-records": "総記録数",
   "label.tracking-code": "トラッキングコード",
+  "label.transactions": "Transactions",
   "label.transfer": "移管",
   "label.transfer-website": "Webサイトの移管",
   "label.true": "真",
   "label.type": "種別",
   "label.unique": "ユニーク",
   "label.unique-visitors": "ユニーク訪問者数",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "不明",
   "label.untitled": "無題",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URL",
   "label.user": "ユーザー",
+  "label.user-property": "User Property",
   "label.username": "ユーザー名",
   "label.users": "ユーザー",
   "label.utm": "UTM",
diff --git a/src/lang/km-KH.json b/src/lang/km-KH.json
index f45ed44945..8a87834ace 100644
--- a/src/lang/km-KH.json
+++ b/src/lang/km-KH.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Access code",
   "label.actions": "សកម្មភាព",
-  "label.activity-log": "កំណត់ហេតុ​សកម្មភាព",
+  "label.activity": "កំណត់ហេតុ​សកម្មភាព",
   "label.add": "បង្កើតបន្ថែម",
   "label.add-description": "បន្ថែមពិពណ៌នា",
   "label.add-member": "បន្ថែមសមាជិក",
@@ -78,6 +78,7 @@
   "label.filter-combined": "រួមបញ្ចូលគ្នា",
   "label.filter-raw": "ដើម",
   "label.filters": "ចម្រោះ",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "គោលដៅ",
@@ -103,6 +104,7 @@
   "label.last-days": "{x} ថ្ងៃចុងក្រោយ",
   "label.last-hours": "{x} ម៉ោងចុងក្រោយ",
   "label.last-months": "{x} ខែចុងក្រោយ",
+  "label.last-seen": "Last seen",
   "label.leave": "ចាកចេញ",
   "label.leave-team": "ចេញពីក្រុម",
   "label.less-than": "តិច​ជាង",
@@ -132,11 +134,14 @@
   "label.pageTitle": "ចំណងជើងទំព័រ",
   "label.pages": "ទំព័រ",
   "label.password": "ពាក្យសម្ងាត់​",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "ដំណើរការដោយ {name}",
   "label.previous": "មុន",
   "label.previous-period": "មួយរយៈពេលមុន",
   "label.previous-year": "ឆ្នាំ​មុន",
   "label.profile": "គណនី",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "កំណត់ស្ថិតិឡើងវិញ",
   "label.retention": "ការរក្សាទុក",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "មុខងារ",
   "label.run-query": "Run query",
   "label.save": "រក្សាទុក",
@@ -165,6 +173,7 @@
   "label.select-date": "ជ្រើសរើសកាលបរិច្ឆេទ",
   "label.select-role": "ជ្រើសរើសមុខងារ",
   "label.select-website": "ជ្រើសរើសគេហទំព័រ",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "ការកំណត់",
   "label.share-url": "ចែករំលែក URL",
@@ -193,18 +202,21 @@
   "label.total": "សរុប",
   "label.total-records": "កំណត់ត្រាសរុប",
   "label.tracking-code": "លេខកូដតាមដាន",
+  "label.transactions": "Transactions",
   "label.transfer": "ការផ្ទេរ",
   "label.transfer-website": "ការផ្ទេរគេហទំព័រ",
   "label.true": "ពិត",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "អ្នកចូលមើលម្នាក់ៗ",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "មិនស្គាល់",
   "label.untitled": "គ្មានចំណងជើង",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "អ្នកប្រើប្រាស់",
+  "label.user-property": "User Property",
   "label.username": "ឈ្មោះ​អ្នកប្រើប្រាស់",
   "label.users": "អ្នកប្រើប្រាស់",
   "label.utm": "UTM",
diff --git a/src/lang/ko-KR.json b/src/lang/ko-KR.json
index b3bee85f7a..8a2de47b14 100644
--- a/src/lang/ko-KR.json
+++ b/src/lang/ko-KR.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "액세스 코드",
   "label.actions": "액션",
-  "label.activity-log": "활동 기록",
+  "label.activity": "활동 기록",
   "label.add": "추가",
   "label.add-description": "설명 추가",
   "label.add-member": "멤버 추가",
@@ -78,6 +78,7 @@
   "label.filter-combined": "합쳐서 보기",
   "label.filter-raw": "전체 보기",
   "label.filters": "필터",
+  "label.first-seen": "First seen",
   "label.funnel": "퍼널",
   "label.funnel-description": "사용자 전환율 및 이탈률을 살펴보세요.",
   "label.goal": "목표",
@@ -103,6 +104,7 @@
   "label.last-days": "최근 {x} 일",
   "label.last-hours": "최근 {x} 시간",
   "label.last-months": "최근 {x} 개월",
+  "label.last-seen": "Last seen",
   "label.leave": "떠나기",
   "label.leave-team": "팀 떠나기",
   "label.less-than": "미만",
@@ -132,11 +134,14 @@
   "label.pageTitle": "페이지 제목",
   "label.pages": "페이지",
   "label.password": "비밀번호",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "이 시스템은 {name}에서 구동되고 있습니다.",
   "label.previous": "이전",
   "label.previous-period": "이전 기간",
   "label.previous-year": "이전 연도",
   "label.profile": "프로필",
+  "label.properties": "Properties",
   "label.property": "속성",
   "label.queries": "쿼리",
   "label.query": "쿼리",
@@ -156,6 +161,9 @@
   "label.reset-website": "웹사이트 초기화",
   "label.retention": "리텐션",
   "label.retention-description": "사용자가 얼마나 자주 돌아오는지를 추적하여 웹사이트의 리텐션을 측정하십시오.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "역할",
   "label.run-query": "쿼리 실행",
   "label.save": "저장",
@@ -165,6 +173,7 @@
   "label.select-date": "날짜 선택",
   "label.select-role": "역할 선택",
   "label.select-website": "웹사이트 선택",
+  "label.session": "Session",
   "label.sessions": "세션",
   "label.settings": "설정",
   "label.share-url": "공유 URL",
@@ -193,18 +202,21 @@
   "label.total": "합계",
   "label.total-records": "총 레코드",
   "label.tracking-code": "추적 코드",
+  "label.transactions": "Transactions",
   "label.transfer": "전송",
   "label.transfer-website": "웹사이트 전송",
   "label.true": "참",
   "label.type": "유형",
   "label.unique": "고유",
   "label.unique-visitors": "순방문자(UV)",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "알 수 없음",
   "label.untitled": "제목 없음",
   "label.update": "업데이트",
   "label.url": "URL",
   "label.urls": "URL",
   "label.user": "사용자",
+  "label.user-property": "User Property",
   "label.username": "사용자명",
   "label.users": "사용자",
   "label.utm": "UTM",
diff --git a/src/lang/lt-LT.json b/src/lang/lt-LT.json
index 424c06ce3e..2e7776a373 100644
--- a/src/lang/lt-LT.json
+++ b/src/lang/lt-LT.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Prieigos kodas",
   "label.actions": "Veiksmai",
-  "label.activity-log": "Veiklos žurnalas",
+  "label.activity": "Veiklos žurnalas",
   "label.add": "Pridėti",
   "label.add-description": "Pridėti aprašymą",
   "label.add-member": "Pridėti narį",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Kombinuoti",
   "label.filter-raw": "Neapdoroti",
   "label.filters": "Filtrai",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "{x, plural, =0 {Paskutinės # dienų} zero {Paskutinės # dienų} one {Paskutinė diena} other {Paskutinės # dienos}}",
   "label.last-hours": "{x, plural, =0 {Paskutinės # valandų} zero {Paskutinės # valandų} one {Paskutinė # valanda} other {Paskutinės # valandos}}",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Išeiti",
   "label.leave-team": "Išeiti iš komandos",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Puslapio pavadinimas",
   "label.pages": "Puslapiai",
   "label.password": "Slaptažodis",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Powered by {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Profilis",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Užklausos",
   "label.query": "Užklausa",
@@ -156,6 +161,9 @@
   "label.reset-website": "Atstatyti statistikos duomenis",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Rolė",
   "label.run-query": "Run query",
   "label.save": "Išsaugoti",
@@ -165,6 +173,7 @@
   "label.select-date": "Pasirinkti laikotarpį",
   "label.select-role": "Pasirinkti rolę",
   "label.select-website": "Pasirinkti svetainę",
+  "label.session": "Session",
   "label.sessions": "Sesijos",
   "label.settings": "Nustatymai",
   "label.share-url": "Pasidalinti nuoroda",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "Sekimo kodas",
+  "label.transactions": "Transactions",
   "label.transfer": "Perleisti",
   "label.transfer-website": "Perleisti svetainę",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "Unikalūs lankytojai",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Nežinoma",
   "label.untitled": "Be pavadinimo",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Vartotojas",
+  "label.user-property": "User Property",
   "label.username": "Vartotojo vardas",
   "label.users": "Vartotojai",
   "label.utm": "UTM",
diff --git a/src/lang/mn-MN.json b/src/lang/mn-MN.json
index 0e99817063..769c58a5be 100644
--- a/src/lang/mn-MN.json
+++ b/src/lang/mn-MN.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Хандалтын код",
   "label.actions": "Үйлдлүүд",
-  "label.activity-log": "Үйл ажиллагааны бүртгэл",
+  "label.activity": "Үйл ажиллагааны бүртгэл",
   "label.add": "Нэмэх",
   "label.add-description": "Тайлбар нэмэх",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Нэгтгэсэн",
   "label.filter-raw": "Түүхий",
   "label.filters": "Шүүлтүүр",
+  "label.first-seen": "First seen",
   "label.funnel": "Цутгал",
   "label.funnel-description": "Хэрэглэгчдийн шилжилт, уналтын хэмжээг шинжлэх.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "Сүүлийн {x} хоног",
   "label.last-hours": "Сүүлийн {x} цаг",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Гарах",
   "label.leave-team": "Багаас гарах",
   "label.less-than": "Бага",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Хуудасны гарчиг",
   "label.pages": "Хуудас",
   "label.password": "Нууц үг",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "{name} дээр суурилсан",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Бүртгэл",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Query-нүүд",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "Тоон үзүүлэлтийг дахин эхлүүлэх",
   "label.retention": "Барилт",
   "label.retention-description": "Хэрэглэгчид таны веб рүү дахин хандах буюу хэрэглэгчдээ хэр тогтоож буйг хэмжих.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Эрх",
   "label.run-query": "Query ажиллуулах",
   "label.save": "Хадгалах",
@@ -165,6 +173,7 @@
   "label.select-date": "Огноо сонгох",
   "label.select-role": "Select role",
   "label.select-website": "Веб сонгох",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "Тохиргоо",
   "label.share-url": "Хуваалцах холбоос",
@@ -193,18 +202,21 @@
   "label.total": "Нийт",
   "label.total-records": "Нийт мөрийн тоо",
   "label.tracking-code": "Мөрдөх код",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "Үнэн",
   "label.type": "Төрөл",
   "label.unique": "Давхардаагүй",
   "label.unique-visitors": "Зочин",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Тодорхойгүй",
   "label.untitled": "Гарчиггүй",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Хэрэглэгч",
+  "label.user-property": "User Property",
   "label.username": "Хэрэглэгчийн нэр",
   "label.users": "Хэрэглэгчид",
   "label.utm": "UTM",
diff --git a/src/lang/ms-MY.json b/src/lang/ms-MY.json
index 82cfbb6b42..a86865731d 100644
--- a/src/lang/ms-MY.json
+++ b/src/lang/ms-MY.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Access code",
   "label.actions": "Aksi",
-  "label.activity-log": "Activity log",
+  "label.activity": "Activity log",
   "label.add": "Add",
   "label.add-description": "Add description",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Digabungkan",
   "label.filter-raw": "Mentah",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "{x} hari lepas",
   "label.last-hours": "{x} jam lepas",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "Halaman",
   "label.password": "Kata laluan",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Disediakan oleh {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "Reset statistics",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Simpan",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Select website",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "Tetapan",
   "label.share-url": "Kongsikan URL",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "Kod penjejakan",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "Pelawat unik",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Tidak diketahui",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
+  "label.user-property": "User Property",
   "label.username": "Nama pengguna",
   "label.users": "Users",
   "label.utm": "UTM",
diff --git a/src/lang/my-MM.json b/src/lang/my-MM.json
index 8a71cd4974..3ab75f885e 100644
--- a/src/lang/my-MM.json
+++ b/src/lang/my-MM.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "ဝင်ခွင့်ကုဒ်",
   "label.actions": "လုပ်ဆောင်ချက်များ",
-  "label.activity-log": "လုပ်ဆောင်ချက်စာရင်း",
+  "label.activity": "လုပ်ဆောင်ချက်စာရင်း",
   "label.add": "ထပ်ထည့်မည်",
   "label.add-description": "အကြောင်းအရာဖော်ပြချက် ထည့်မည်",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "ပေါင်းစပ်ပြီး",
   "label.filter-raw": "အရှိအတိုင်း",
   "label.filters": "Filter များ",
+  "label.first-seen": "First seen",
   "label.funnel": "ဖန်နယ်",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "လွန်ခဲ့သော {x} ရက်က",
   "label.last-hours": "လွန်ခဲ့သော {x} နာရီက",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "ထွက်မည်",
   "label.leave-team": "အသင်းမှထွက်မည်",
   "label.less-than": "ထက်ပို၍ငယ်သည်",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "စာမျက်နှာများ",
   "label.password": "စကားဝှက်",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "{name} ထောက်ပံ့သည်",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "ပရိုဖိုင်း",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries (ကွာရီများ)",
   "label.query": "Query (ကွာရီ)",
@@ -156,6 +161,9 @@
   "label.reset-website": "ဝက်ဘ်ဆိုဒ်ဒေတာကိုဖျက်မည်",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "အခန်းကဏ္ဍ",
   "label.run-query": "Query ကိုလုပ်ဆောင်မည်",
   "label.save": "သိမ်းဆည်းမည်",
@@ -165,6 +173,7 @@
   "label.select-date": "ရက်ရွေးပါ",
   "label.select-role": "Select role",
   "label.select-website": "ဝဘက်ဘ်ဆိုဒ်ရွေးပါ",
+  "label.session": "Session",
   "label.sessions": "ဆက်ရှင်များ",
   "label.settings": "ဆက်တင်များ",
   "label.share-url": "URL ကိုရှဲမည်",
@@ -193,18 +202,21 @@
   "label.total": "စုစုပေါင်း",
   "label.total-records": "မှတ်တမ်းစုစုပေါင်း",
   "label.tracking-code": "ထရက်လုပ်သည့် ကုဒ်",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "မှန်သည်",
   "label.type": "အမျိုးအစား",
   "label.unique": "Unique",
   "label.unique-visitors": "ဝင်ရောက်သူ (ထပ်ခြင်းမရှိ)",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "မသိသော",
   "label.untitled": "ခေါင်းစဉ်မရှိ",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URL များ",
   "label.user": "အသုံးပြုသူ",
+  "label.user-property": "User Property",
   "label.username": "အသုံးပြုသူအမည်",
   "label.users": "အသုံးပြုသူများ",
   "label.utm": "UTM",
diff --git a/src/lang/nb-NO.json b/src/lang/nb-NO.json
index 4a6e0409c1..55d211874d 100644
--- a/src/lang/nb-NO.json
+++ b/src/lang/nb-NO.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Access code",
   "label.actions": "Handlinger",
-  "label.activity-log": "Activity log",
+  "label.activity": "Activity log",
   "label.add": "Add",
   "label.add-description": "Add description",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Kombinert",
   "label.filter-raw": "Rå",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "Siste {x} dager",
   "label.last-hours": "Siste {x} timer",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "Sider",
   "label.password": "Passord",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Drevet av {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "Nullstill statistikk",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Lagre",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Select website",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "Innstillinger",
   "label.share-url": "Del URL",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "Sporingskode",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "Unike besøkende",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Ukjent",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
+  "label.user-property": "User Property",
   "label.username": "Brukernavn",
   "label.users": "Users",
   "label.utm": "UTM",
diff --git a/src/lang/nl-NL.json b/src/lang/nl-NL.json
index 9a1c852bc1..78b41df7d5 100644
--- a/src/lang/nl-NL.json
+++ b/src/lang/nl-NL.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Toegangscode",
   "label.actions": "Acties",
-  "label.activity-log": "Activiteiten logboek",
+  "label.activity": "Activiteiten logboek",
   "label.add": "Toevoegen",
   "label.add-description": "Omschrijving toevoegen",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Gecombineerd",
   "label.filter-raw": "Ruw",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Ontdek de conversie- en uitvalpercentages van gebruikers.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "Laatste {x} dagen",
   "label.last-hours": "Laatste {x} uur",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Verlaten",
   "label.leave-team": "Verlaat team",
   "label.less-than": "Minder dan",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Pagina titel",
   "label.pages": "Pagina's",
   "label.password": "Wachtwoord",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "mogelijk gemaakt door {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Profiel",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Parameters",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "Statistieken opnieuw instellen",
   "label.retention": "Retentie",
   "label.retention-description": "Meet de retentie van je website door door bij te houden hoe vaak gebruikers terugkeren.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Gebruikersrol",
   "label.run-query": "Query uitvoeren",
   "label.save": "Opslaan",
@@ -165,6 +173,7 @@
   "label.select-date": "Datum selecteren",
   "label.select-role": "Rol selecteren",
   "label.select-website": "Website selecteren",
+  "label.session": "Session",
   "label.sessions": "Sessies",
   "label.settings": "Instellingen",
   "label.share-url": "URL delen",
@@ -193,18 +202,21 @@
   "label.total": "Totaal",
   "label.total-records": "Totaal records",
   "label.tracking-code": "Volgcode",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "Waar",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "Unieke bezoekers",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Onbekend",
   "label.untitled": "Ongetiteld",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URL's",
   "label.user": "Gebruiker",
+  "label.user-property": "User Property",
   "label.username": "Gebruikersnaam",
   "label.users": "Gebruikers",
   "label.utm": "UTM",
diff --git a/src/lang/pl-PL.json b/src/lang/pl-PL.json
index 953438be23..697beeb35e 100644
--- a/src/lang/pl-PL.json
+++ b/src/lang/pl-PL.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Kod dostępu",
   "label.actions": "Działania",
-  "label.activity-log": "Dziennik aktywności",
+  "label.activity": "Dziennik aktywności",
   "label.add": "Dodaj",
   "label.add-description": "Dodaj opis",
   "label.add-member": "Dodaj członka",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Połączone",
   "label.filter-raw": "Surowe dane",
   "label.filters": "Filtry",
+  "label.first-seen": "First seen",
   "label.funnel": "Lejek",
   "label.funnel-description": "Zrozum wskaźniki konwersji i odpływu użytkowników.",
   "label.goal": "Cel",
@@ -103,6 +104,7 @@
   "label.last-days": "Ostatnie {x} dni",
   "label.last-hours": "Ostatnie {x} godzin",
   "label.last-months": "Osatnie {x} miesięcy",
+  "label.last-seen": "Last seen",
   "label.leave": "Opuść",
   "label.leave-team": "Opuść zespół",
   "label.less-than": "Mniejsze niż",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Tytuł strony",
   "label.pages": "Strony",
   "label.password": "Hasło",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Obsługiwane przez {name}",
   "label.previous": "Poprzedni",
   "label.previous-period": "Poprzedni okres",
   "label.previous-year": "Poprzedni rok",
   "label.profile": "Profil",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Zapytania",
   "label.query": "Zapytanie",
@@ -156,6 +161,9 @@
   "label.reset-website": "Zresetuj statystyki",
   "label.retention": "Retencja",
   "label.retention-description": "Mierz przyciągającą siłę swojej strony internetowej, śledząc, jak często użytkownicy powracają.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Rola",
   "label.run-query": "Uruchom zapytanie",
   "label.save": "Zapisz",
@@ -165,6 +173,7 @@
   "label.select-date": "Wybierz datę",
   "label.select-role": "Wybierz rolę",
   "label.select-website": "Wybierz witrynę",
+  "label.session": "Session",
   "label.sessions": "Sesje",
   "label.settings": "Ustawienia",
   "label.share-url": "Udostępnij adres URL",
@@ -193,18 +202,21 @@
   "label.total": "W sumie",
   "label.total-records": "Suma rekordów",
   "label.tracking-code": "Kod śledzenia",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "Prawda",
   "label.type": "Typ",
   "label.unique": "Unikalne",
   "label.unique-visitors": "Unikalni odwiedzający",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Nieznany",
   "label.untitled": "Bez tytułu",
   "label.update": "Aktualizuj",
   "label.url": "Link",
   "label.urls": "Linki",
   "label.user": "Użytkownik",
+  "label.user-property": "User Property",
   "label.username": "Nazwa użytkownika",
   "label.users": "Użytkownicy",
   "label.utm": "UTM",
diff --git a/src/lang/pt-BR.json b/src/lang/pt-BR.json
index be96d09772..6e5b095ed6 100644
--- a/src/lang/pt-BR.json
+++ b/src/lang/pt-BR.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Código de acesso",
   "label.actions": "Ações do usuário",
-  "label.activity-log": "Registro de atividades",
+  "label.activity": "Registro de atividades",
   "label.add": "Adicionar",
   "label.add-description": "Adicionar descrição",
   "label.add-member": "Adicionar membro",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Combinado",
   "label.filter-raw": "Bruto",
   "label.filters": "Filtros",
+  "label.first-seen": "First seen",
   "label.funnel": "Funil",
   "label.funnel-description": "Entenda a taxa de conversão e abandono dos seus usuários.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "Últimos {x} dias",
   "label.last-hours": "Últimas {x} horas",
   "label.last-months": "Últimos {x} meses",
+  "label.last-seen": "Last seen",
   "label.leave": "Sair",
   "label.leave-team": "Sair da equipe",
   "label.less-than": "Menor que",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Título",
   "label.pages": "Páginas",
   "label.password": "Senha",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Desenvolvido por {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Perfil",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Consultas",
   "label.query": "Consulta",
@@ -156,6 +161,9 @@
   "label.reset-website": "Redefinir dados",
   "label.retention": "Retenção",
   "label.retention-description": "Avalie a fidelidade dos seus usuários medindo a frequência com que eles retornam.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Função",
   "label.run-query": "Executar consulta",
   "label.save": "Salvar",
@@ -165,6 +173,7 @@
   "label.select-date": "Selecionar data",
   "label.select-role": "Selecionar função",
   "label.select-website": "Selecionar site",
+  "label.session": "Session",
   "label.sessions": "Sessões",
   "label.settings": "Configurações",
   "label.share-url": "Link para compartilhar",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total de registros",
   "label.tracking-code": "Código de rastreamento",
+  "label.transactions": "Transactions",
   "label.transfer": "Transferir",
   "label.transfer-website": "Transferir site",
   "label.true": "Sim",
   "label.type": "Tipo",
   "label.unique": "Únicos",
   "label.unique-visitors": "Visitantes únicos",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Desconhecido",
   "label.untitled": "Sem título",
   "label.update": "Atualizar",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Usuário",
+  "label.user-property": "User Property",
   "label.username": "Nome de usuário",
   "label.users": "Usuários",
   "label.utm": "UTM",
diff --git a/src/lang/pt-PT.json b/src/lang/pt-PT.json
index 252457f833..ddc6b72616 100644
--- a/src/lang/pt-PT.json
+++ b/src/lang/pt-PT.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Access code",
   "label.actions": "Ações",
-  "label.activity-log": "Activity log",
+  "label.activity": "Activity log",
   "label.add": "Add",
   "label.add-description": "Add description",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Combinado",
   "label.filter-raw": "Dados brutos",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "Últimos {x} dias",
   "label.last-hours": "Últimas {x} horas",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "Páginas",
   "label.password": "Senha",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Distribuído por {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Perfil",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "Repor estatísticas",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Guardar",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Select website",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "Definições",
   "label.share-url": "Partilhar link",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "Código de rastreamento",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "Visitantes únicos",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Desconhecido",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
+  "label.user-property": "User Property",
   "label.username": "Nome de utilizador",
   "label.users": "Users",
   "label.utm": "UTM",
diff --git a/src/lang/ro-RO.json b/src/lang/ro-RO.json
index c06690c23d..f60f8f2baa 100644
--- a/src/lang/ro-RO.json
+++ b/src/lang/ro-RO.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Cod de access",
   "label.actions": "Acțiuni",
-  "label.activity-log": "Jurnal de activități",
+  "label.activity": "Jurnal de activități",
   "label.add": "Adaugă",
   "label.add-description": "Adaugă descriere",
   "label.add-member": "Adaugă membru",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Combinat",
   "label.filter-raw": "Brut",
   "label.filters": "Filtre",
+  "label.first-seen": "First seen",
   "label.funnel": "Parcursul utilizatorului",
   "label.funnel-description": "Înțelege rata de conversie și rata de abandon a utilizatorilor.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "Ultimele {x} zile",
   "label.last-hours": "Ultimele {x} ore",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Părăsește",
   "label.leave-team": "Părăsește echipa",
   "label.less-than": "Mai puțin decât",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Titlul paginii",
   "label.pages": "Pagini",
   "label.password": "Parolă",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Cu sprijinul {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Interogări",
   "label.query": "Interogare",
@@ -156,6 +161,9 @@
   "label.reset-website": "Resetează statisticile pentru site",
   "label.retention": "Retenție",
   "label.retention-description": "Măsoară atractivitatea site-ului tău prin urmărirea frecvenței cu care utilizatorii se întorc.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Rol",
   "label.run-query": "Execută interogarea",
   "label.save": "Salvează",
@@ -165,6 +173,7 @@
   "label.select-date": "Selectează data",
   "label.select-role": "Selectează rolul",
   "label.select-website": "Selectează website",
+  "label.session": "Session",
   "label.sessions": "Sesiuni",
   "label.settings": "Setări",
   "label.share-url": "Partajare URL",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total înregistrări",
   "label.tracking-code": "Cod de urmărire",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "Adevărat",
   "label.type": "Tip",
   "label.unique": "Unici",
   "label.unique-visitors": "Vizitatori unici",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Necunoscut",
   "label.untitled": "Fără titlu",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Utilizator",
+  "label.user-property": "User Property",
   "label.username": "Nume utilizator",
   "label.users": "Utilizatori",
   "label.utm": "UTM",
diff --git a/src/lang/ru-RU.json b/src/lang/ru-RU.json
index 257c0491aa..f483522a97 100644
--- a/src/lang/ru-RU.json
+++ b/src/lang/ru-RU.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Код доступа",
   "label.actions": "Действия",
-  "label.activity-log": "Журнал активности",
+  "label.activity": "Журнал активности",
   "label.add": "Add",
   "label.add-description": "Add description",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Объединенные",
   "label.filter-raw": "Сырые данные",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "Последние {x} дней",
   "label.last-hours": "Последние {x} часа",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Уйти",
   "label.leave-team": "Покинуть команду",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "Страницы",
   "label.password": "Пароль",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "На движке {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Профиль",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Запросы",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "Сбросить статистику",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Роль",
   "label.run-query": "Run query",
   "label.save": "Сохранить",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Выбрать сайт",
+  "label.session": "Session",
   "label.sessions": "Сессии",
   "label.settings": "Настройки",
   "label.share-url": "Поделиться ссылкой",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "Код отслеживания",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "Уникальные посетители",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Неизвестно",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Пользователь",
+  "label.user-property": "User Property",
   "label.username": "Имя пользователя",
   "label.users": "Пользователи",
   "label.utm": "UTM",
diff --git a/src/lang/si-LK.json b/src/lang/si-LK.json
index 6263f91a96..46dab6b304 100644
--- a/src/lang/si-LK.json
+++ b/src/lang/si-LK.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Access code",
   "label.actions": "Actions",
-  "label.activity-log": "Activity log",
+  "label.activity": "Activity log",
   "label.add": "Add",
   "label.add-description": "Add description",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Combined",
   "label.filter-raw": "Raw",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "අන්තිම {x} දින",
   "label.last-hours": "අන්තිම {x} පැය",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "Pages",
   "label.password": "මුරපදය",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Powered by {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "පැතිකඩ",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "සංඛ්යා ලේඛන නැවත සකසන්න",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "සුරකින්න",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Select website",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "සැකසුම්",
   "label.share-url": "බෙදාගැනීමේ URL",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "ලුහුබැඳීමේ කේතය",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "Unique visitors",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "නොදනී",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
+  "label.user-property": "User Property",
   "label.username": "පරිශීලක නාමය",
   "label.users": "Users",
   "label.utm": "UTM",
diff --git a/src/lang/sk-SK.json b/src/lang/sk-SK.json
index 4447ada298..2a02b5c744 100644
--- a/src/lang/sk-SK.json
+++ b/src/lang/sk-SK.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Access code",
   "label.actions": "Akcie",
-  "label.activity-log": "Activity log",
+  "label.activity": "Activity log",
   "label.add": "Add",
   "label.add-description": "Add description",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Kombinácie",
   "label.filter-raw": "Nezpracované",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "Posledných {x} dní",
   "label.last-hours": "Posledných {x} hodín",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "Stránky",
   "label.password": "Heslo",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Powered by {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "Reset statistics",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Uložiť",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Select website",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "Nastavenia",
   "label.share-url": "Zdielanie URL",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "Sledovací kód",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "Jedinečné návštevy",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Neznámý",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
+  "label.user-property": "User Property",
   "label.username": "Užívateľské meno",
   "label.users": "Users",
   "label.utm": "UTM",
diff --git a/src/lang/sl-SI.json b/src/lang/sl-SI.json
index 3c684dec03..bd180bfb9b 100644
--- a/src/lang/sl-SI.json
+++ b/src/lang/sl-SI.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Koda za dostop",
   "label.actions": "Dejanja",
-  "label.activity-log": "Dnevnik dejavnosti",
+  "label.activity": "Dnevnik dejavnosti",
   "label.add": "Dodaj",
   "label.add-description": "Dodaj opis",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Skupaj",
   "label.filter-raw": "Neobdelano",
   "label.filters": "Filtri",
+  "label.first-seen": "First seen",
   "label.funnel": "Prodajni lijak",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "Zadnjih {x} dni",
   "label.last-hours": "Zadnjih {x} ur",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Zapusti",
   "label.leave-team": "Zapusti ekipo",
   "label.less-than": "Manjše kot",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Naslov strani",
   "label.pages": "Strani",
   "label.password": "Geslo",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Poganja {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Poizvedbe",
   "label.query": "Poizvedba",
@@ -156,6 +161,9 @@
   "label.reset-website": "Ponastavi statistiko",
   "label.retention": "Ohranjanje uporabnikov",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Vloga",
   "label.run-query": "Izvedi poizvedbo",
   "label.save": "Shrani",
@@ -165,6 +173,7 @@
   "label.select-date": "Izberi datum",
   "label.select-role": "Select role",
   "label.select-website": "Izberi spletno mesto",
+  "label.session": "Session",
   "label.sessions": "Seje",
   "label.settings": "Nastavitve",
   "label.share-url": "Deli povezavo",
@@ -193,18 +202,21 @@
   "label.total": "Skupaj",
   "label.total-records": "Skupni zapisi",
   "label.tracking-code": "Koda za sledenje",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "Pravilno",
   "label.type": "Vrsta",
   "label.unique": "Unikatni",
   "label.unique-visitors": "Unikatni obiskovalci",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Neznano",
   "label.untitled": "Brez naslova",
   "label.update": "Update",
   "label.url": "Povezava",
   "label.urls": "Povezave",
   "label.user": "Uporabnik",
+  "label.user-property": "User Property",
   "label.username": "Uporabniško ime",
   "label.users": "Uporabniki",
   "label.utm": "UTM",
diff --git a/src/lang/sv-SE.json b/src/lang/sv-SE.json
index c60b6cf904..cdaa676af4 100644
--- a/src/lang/sv-SE.json
+++ b/src/lang/sv-SE.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Åtkomstkod",
   "label.actions": "Händelser",
-  "label.activity-log": "Aktivitetslogg",
+  "label.activity": "Aktivitetslogg",
   "label.add": "Lägg till",
   "label.add-description": "Lägg till beskrivning",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Kombinerade",
   "label.filter-raw": "Rådata",
   "label.filters": "Filter",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Förstå omvandlingen och bortfallsfrekvensen för användare.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "Senaste {x} dagarna",
   "label.last-hours": "Senaste {x} timmarna",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Lämna",
   "label.leave-team": "Lämna team",
   "label.less-than": "Mindre än",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Sidtitel",
   "label.pages": "Sidor",
   "label.password": "Lösenord",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Drivs av {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Frågor",
   "label.query": "Fråga",
@@ -156,6 +161,9 @@
   "label.reset-website": "Återställ webbplats",
   "label.retention": "Retention",
   "label.retention-description": "Mät din webbplats engagemang genom att följa hur ofta användare återvänder.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Roll",
   "label.run-query": "Kör sökning",
   "label.save": "Spara",
@@ -165,6 +173,7 @@
   "label.select-date": "Välj datum",
   "label.select-role": "Select role",
   "label.select-website": "Välj webbplats",
+  "label.session": "Session",
   "label.sessions": "Sessioner",
   "label.settings": "Inställningar",
   "label.share-url": "Delningslänk",
@@ -193,18 +202,21 @@
   "label.total": "Totalt",
   "label.total-records": "Totala poster",
   "label.tracking-code": "Spårningskod",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "Sant",
   "label.type": "Typ",
   "label.unique": "Unikt",
   "label.unique-visitors": "Unika besökare",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Okänt",
   "label.untitled": "Namnlös",
   "label.update": "Update",
   "label.url": "Länk",
   "label.urls": "Länkar",
   "label.user": "Användare",
+  "label.user-property": "User Property",
   "label.username": "Användarnamn",
   "label.users": "Användare",
   "label.utm": "UTM",
diff --git a/src/lang/ta-IN.json b/src/lang/ta-IN.json
index 0f95bc1861..1e4466b52c 100644
--- a/src/lang/ta-IN.json
+++ b/src/lang/ta-IN.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Access code",
   "label.actions": "செயல்கள்",
-  "label.activity-log": "Activity log",
+  "label.activity": "Activity log",
   "label.add": "Add",
   "label.add-description": "Add description",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "ஒருங்கிணைந்த",
   "label.filter-raw": "மூல",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "முந்தைய {x} நாட்கள்",
   "label.last-hours": "முந்தைய {x} மணி",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "பக்கங்கள்",
   "label.password": "கடவுச்சொல்",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "{name} ஆல் இயக்கப்படுகிறது",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "சுயவிவரம்",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "Reset statistics",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "சேமி",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Select website",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "அமைப்புகள்",
   "label.share-url": "வலைத்தள களத்தைப் பகிரவும்",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "கண்காணிப்பு குறியீடு",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "தனிப்பட்ட பார்வையாளர்கள்",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "தெரியாத",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
+  "label.user-property": "User Property",
   "label.username": "பயனர்பெயர்",
   "label.users": "Users",
   "label.utm": "UTM",
diff --git a/src/lang/th-TH.json b/src/lang/th-TH.json
index a594bb3120..7cc3504506 100644
--- a/src/lang/th-TH.json
+++ b/src/lang/th-TH.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Access code",
   "label.actions": "การกระทำ",
-  "label.activity-log": "Activity log",
+  "label.activity": "Activity log",
   "label.add": "Add",
   "label.add-description": "Add description",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "ข้อมูลรวม",
   "label.filter-raw": "ข้อมูลดิบ",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "{x} วันที่ผ่านมา",
   "label.last-hours": "{x} ชั่วโมงที่ผ่านมา",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "หน้าเพจ",
   "label.password": "รหัสผ่าน",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "ขับเคลื่อนโดย {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "โปรไฟล์",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "รีเซตข้อมูลสถิติ",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "บันทึก",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Select website",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "ตั้งค่า",
   "label.share-url": "แชร์ลิงก์",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "โค้ดสำหรับใช้ติดตาม",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "ผู้เข้าชม",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "ไม่รู้จัก",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
+  "label.user-property": "User Property",
   "label.username": "ชื่อผู้ใช้",
   "label.users": "Users",
   "label.utm": "UTM",
diff --git a/src/lang/tr-TR.json b/src/lang/tr-TR.json
index b8271ed219..34a81f75cf 100644
--- a/src/lang/tr-TR.json
+++ b/src/lang/tr-TR.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Erişim Kodu",
   "label.actions": "Hareketler",
-  "label.activity-log": "Aktivite Kaydı",
+  "label.activity": "Aktivite Kaydı",
   "label.add": "Ekle",
   "label.add-description": "Açıklama ekle",
   "label.add-member": "Üye ekle",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Birleşik filtre",
   "label.filter-raw": "Ham filtre",
   "label.filters": "Filtreler",
+  "label.first-seen": "First seen",
   "label.funnel": "Huni",
   "label.funnel-description": "Kullanıcıların dönüşüm ve ayrılma oranlarını anlayın.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "Son {x} gün",
   "label.last-hours": "Son {x} saat",
   "label.last-months": "Son {x} ay",
+  "label.last-seen": "Last seen",
   "label.leave": "Ayrıl",
   "label.leave-team": "Takımdan Ayrıl",
   "label.less-than": "Küçüktür",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Sayfa başlığı",
   "label.pages": "Sayfalar",
   "label.password": "Parola",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Sağlayıcı: {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Profil",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Sorgular",
   "label.query": "Sorgu",
@@ -156,6 +161,9 @@
   "label.reset-website": "İstatistikleri sıfırla",
   "label.retention": "Geri dönüş",
   "label.retention-description": "Kullanıcıların ne sıklıkla geri döndüğünü takip ederek web sitenizin kalıcılığını ölçün.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Rol",
   "label.run-query": "Sorgu çalıştır",
   "label.save": "Kaydet",
@@ -165,6 +173,7 @@
   "label.select-date": "Tarih seç",
   "label.select-role": "Rol seç",
   "label.select-website": "Web sitesi seç",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "Ayarlar",
   "label.share-url": "Paylaşım adresi",
@@ -193,18 +202,21 @@
   "label.total": "Toplam",
   "label.total-records": "Toplam kayıt",
   "label.tracking-code": "İzleme kodu",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer web sitesi",
   "label.true": "Doğru",
   "label.type": "Tip",
   "label.unique": "Benzersiz",
   "label.unique-visitors": "Tekil kullanıcı",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Bilinmeyen",
   "label.untitled": "İsimsiz",
   "label.update": "Güncelle",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Kullanıcı",
+  "label.user-property": "User Property",
   "label.username": "Kullanıcı adı",
   "label.users": "Kullanıcılar",
   "label.utm": "UTM",
diff --git a/src/lang/uk-UA.json b/src/lang/uk-UA.json
index ecfd27f50a..c6843055f2 100644
--- a/src/lang/uk-UA.json
+++ b/src/lang/uk-UA.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Код доступу",
   "label.actions": "Дії",
-  "label.activity-log": "Журнал",
+  "label.activity": "Журнал",
   "label.add": "Додати",
   "label.add-description": "Додати опис",
   "label.add-member": "Додати учасника",
@@ -62,6 +62,9 @@
   "label.domain": "Домен",
   "label.dropoff": "Відсів",
   "label.edit": "Редагувати",
+  "label.edit-dashboard": "Edit dashboard",
+  "label.edit-member": "Edit member",
+  "label.enable-share-url": "Enable share URL",
   "label.end-step": "End Step",
   "label.entry": "Entry URL",
   "label.event": "Подія",
@@ -75,6 +78,7 @@
   "label.filter-combined": "Об'єднані",
   "label.filter-raw": "Сирі дані",
   "label.filters": "Фільтри",
+  "label.first-seen": "First seen",
   "label.funnel": "Воронка",
   "label.funnel-description": "Зрозуміти рівень конверсії та відсіву користувачів.",
   "label.goal": "Goal",
@@ -100,6 +104,7 @@
   "label.last-days": "Останні {x} днів",
   "label.last-hours": "Останні {x} годин",
   "label.last-months": "Останні {x} місяців",
+  "label.last-seen": "Last seen",
   "label.leave": "Покинути",
   "label.leave-team": "Покинути команду",
   "label.less-than": "Менше ніж",
@@ -107,6 +112,7 @@
   "label.login": "Увійти",
   "label.logout": "Вийти",
   "label.manage": "Керувати",
+  "label.manager": "Manager",
   "label.max": "Макс.",
   "label.member": "Учасник",
   "label.members": "Учасники",
@@ -128,11 +134,14 @@
   "label.pageTitle": "Заголовок сторінки",
   "label.pages": "Сторінки",
   "label.password": "Пароль",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "На базі {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Профіль",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Запити",
   "label.query": "Запит",
@@ -152,6 +161,9 @@
   "label.reset-website": "Скинути статистику сайту",
   "label.retention": "Липкість",
   "label.retention-description": "Виміряйте липкість вашого сайту, відстежуючи, як часто користувачі повертаються на нього.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Роль",
   "label.run-query": "Виконати запит",
   "label.save": "Зберегти",
@@ -161,6 +173,7 @@
   "label.select-date": "Вибрати дату",
   "label.select-role": "Вибрати роль",
   "label.select-website": "Вибрати сайт",
+  "label.session": "Session",
   "label.sessions": "Сесії",
   "label.settings": "Налаштування",
   "label.share-url": "Поділитися посилання",
@@ -171,6 +184,7 @@
   "label.tablet": "Планшет",
   "label.team": "Команда",
   "label.team-id": "Ідентифікатор команди",
+  "label.team-manager": "Team manager",
   "label.team-member": "Учасник команди",
   "label.team-name": "Назва команди",
   "label.team-owner": "Власник команди",
@@ -188,18 +202,21 @@
   "label.total": "Всього",
   "label.total-records": "Всього записів",
   "label.tracking-code": "Код для відслідковування",
+  "label.transactions": "Transactions",
   "label.transfer": "Передати",
   "label.transfer-website": "Передати сайт",
   "label.true": "True",
   "label.type": "Тип",
   "label.unique": "Унікальний",
   "label.unique-visitors": "Унікальні відвідувачі",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Невідомо",
   "label.untitled": "Без заголовку",
   "label.update": "Оновлення",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Користувач",
+  "label.user-property": "User Property",
   "label.username": "Ім'я користувача",
   "label.users": "Користувачі",
   "label.utm": "UTM",
@@ -210,6 +227,7 @@
   "label.view-only": "Тільки для перегляду",
   "label.views": "Перегляди",
   "label.views-per-visit": "Перегляди за одне відвідування",
+  "label.visit-duration": "Visit duration",
   "label.visitors": "Відвідувачі",
   "label.visits": "Відвідування",
   "label.website": "Сайт",
diff --git a/src/lang/ur-PK.json b/src/lang/ur-PK.json
index 97de5d6940..138ec1b3eb 100644
--- a/src/lang/ur-PK.json
+++ b/src/lang/ur-PK.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Access code",
   "label.actions": "اعمال",
-  "label.activity-log": "Activity log",
+  "label.activity": "Activity log",
   "label.add": "Add",
   "label.add-description": "Add description",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "مشترکہ",
   "label.filter-raw": "خام",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "پچھلے {x} دن",
   "label.last-hours": "پچھلے {x} گھنٹے",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "صفحات",
   "label.password": "پاس ورڈ",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "تقویت یافتہ بذریعہ {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "پروفائل",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "اعدادوشمار کو دوبارہ ترتیب دیں",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "محفوظ کریں",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Select website",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "ترتیبات",
   "label.share-url": "URL کا اشتراک کریں",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "ٹریکنگ کوڈ",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "منفرد زائرین",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "نامعلوم",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
+  "label.user-property": "User Property",
   "label.username": "صارف نام",
   "label.users": "Users",
   "label.utm": "UTM",
diff --git a/src/lang/vi-VN.json b/src/lang/vi-VN.json
index 054f449a8a..22a4eaf72a 100644
--- a/src/lang/vi-VN.json
+++ b/src/lang/vi-VN.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "Access code",
   "label.actions": "Hành động",
-  "label.activity-log": "Activity log",
+  "label.activity": "Activity log",
   "label.add": "Add",
   "label.add-description": "Add description",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "Kết hợp",
   "label.filter-raw": "Gốc",
   "label.filters": "Filters",
+  "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "{x} ngày gần nhất",
   "label.last-hours": "{x} giờ gần nhất",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
   "label.less-than": "Less than",
@@ -132,11 +134,14 @@
   "label.pageTitle": "Page title",
   "label.pages": "Trang",
   "label.password": "Mật khẩu",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "Bản quyền thuộc về {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "Hồ sơ",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Queries",
   "label.query": "Query",
@@ -156,6 +161,9 @@
   "label.reset-website": "Tái thiết lập thống kê",
   "label.retention": "Retention",
   "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Lưu",
@@ -165,6 +173,7 @@
   "label.select-date": "Select date",
   "label.select-role": "Select role",
   "label.select-website": "Select website",
+  "label.session": "Session",
   "label.sessions": "Sessions",
   "label.settings": "Cài đặt",
   "label.share-url": "Chia sẻ URL",
@@ -193,18 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total records",
   "label.tracking-code": "Mã theo dõi",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "True",
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "Khách truy cập một lần",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "Không rõ",
   "label.untitled": "Untitled",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
+  "label.user-property": "User Property",
   "label.username": "Tên đăng nhập",
   "label.users": "Users",
   "label.utm": "UTM",
diff --git a/src/lang/zh-CN.json b/src/lang/zh-CN.json
index 64dfa12fd3..741d2de0ec 100644
--- a/src/lang/zh-CN.json
+++ b/src/lang/zh-CN.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "访问代码",
   "label.actions": "用户行为",
-  "label.activity-log": "活动日志",
+  "label.activity": "活动日志",
   "label.add": "添加",
   "label.add-description": "添加描述",
   "label.add-member": "添加成员",
@@ -78,6 +78,7 @@
   "label.filter-combined": "合并",
   "label.filter-raw": "原始",
   "label.filters": "筛选",
+  "label.first-seen": "First seen",
   "label.funnel": "分析",
   "label.funnel-description": "了解用户的转换率和退出率。",
   "label.goal": "目标",
@@ -103,6 +104,7 @@
   "label.last-days": "最近 {x} 天",
   "label.last-hours": "最近 {x} 小时",
   "label.last-months": "最近 {x} 个月",
+  "label.last-seen": "Last seen",
   "label.leave": "离开",
   "label.leave-team": "离开团队",
   "label.less-than": "少于",
@@ -132,11 +134,14 @@
   "label.pageTitle": "标题",
   "label.pages": "网页",
   "label.password": "密码",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "由 {name} 提供支持",
   "label.previous": "先前",
   "label.previous-period": "上一时期",
   "label.previous-year": "上一年",
   "label.profile": "个人资料",
+  "label.properties": "Properties",
   "label.property": "属性",
   "label.queries": "查询",
   "label.query": "查询",
@@ -156,6 +161,9 @@
   "label.reset-website": "重置统计数据",
   "label.retention": "保留",
   "label.retention-description": "通过跟踪用户返回的频率来衡量网站的用户粘性。",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "角色",
   "label.run-query": "查询",
   "label.save": "保存",
@@ -165,6 +173,7 @@
   "label.select-date": "选择数据",
   "label.select-role": "选择角色",
   "label.select-website": "选择网站",
+  "label.session": "Session",
   "label.sessions": "会话",
   "label.settings": "设置",
   "label.share-url": "共享链接",
@@ -193,18 +202,21 @@
   "label.total": "总数",
   "label.total-records": "总记录数",
   "label.tracking-code": "跟踪代码",
+  "label.transactions": "Transactions",
   "label.transfer": "转移",
   "label.transfer-website": "转移网站",
   "label.true": "是",
   "label.type": "类型",
   "label.unique": "独立",
   "label.unique-visitors": "独立访客",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "未知",
   "label.untitled": "未命名",
   "label.update": "更新",
   "label.url": "网址",
   "label.urls": "网址",
   "label.user": "用户",
+  "label.user-property": "User Property",
   "label.username": "用户名",
   "label.users": "用户",
   "label.utm": "UTM",
diff --git a/src/lang/zh-TW.json b/src/lang/zh-TW.json
index 10069181e3..a2c5d2c31b 100644
--- a/src/lang/zh-TW.json
+++ b/src/lang/zh-TW.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "存取碼",
   "label.actions": "行動",
-  "label.activity-log": "活動日誌",
+  "label.activity": "活動日誌",
   "label.add": "新增",
   "label.add-description": "新增描述",
   "label.add-member": "Add member",
@@ -78,6 +78,7 @@
   "label.filter-combined": "組合",
   "label.filter-raw": "原始",
   "label.filters": "篩選器",
+  "label.first-seen": "First seen",
   "label.funnel": "漏斗",
   "label.funnel-description": "瞭解使用者的轉換率和退出率",
   "label.goal": "Goal",
@@ -103,6 +104,7 @@
   "label.last-days": "最近 {x} 天",
   "label.last-hours": "最近 {x} 小時",
   "label.last-months": "Last {x} months",
+  "label.last-seen": "Last seen",
   "label.leave": "離開",
   "label.leave-team": "離開團隊",
   "label.less-than": "小於",
@@ -132,11 +134,14 @@
   "label.pageTitle": "頁面標題",
   "label.pages": "頁面",
   "label.password": "密碼",
+  "label.path": "Path",
+  "label.paths": "Paths",
   "label.powered-by": "由 {name} 提供",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
   "label.previous-year": "Previous year",
   "label.profile": "個人資料",
+  "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "查詢",
   "label.query": "查詢",
@@ -156,6 +161,9 @@
   "label.reset-website": "重設網站",
   "label.retention": "保留",
   "label.retention-description": "透過追蹤使用者回訪的頻率來衡量您的網站黏著度。",
+  "label.revenue": "Revenue",
+  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue-property": "Revenue Property",
   "label.role": "角色",
   "label.run-query": "執行查詢",
   "label.save": "儲存",
@@ -165,6 +173,7 @@
   "label.select-date": "選擇日期",
   "label.select-role": "Select role",
   "label.select-website": "選擇網站",
+  "label.session": "Session",
   "label.sessions": "工作階段",
   "label.settings": "設定",
   "label.share-url": "分享網址",
@@ -193,18 +202,21 @@
   "label.total": "總計",
   "label.total-records": "總記錄",
   "label.tracking-code": "追蹤代碼",
+  "label.transactions": "Transactions",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "是",
   "label.type": "類型",
   "label.unique": "獨立",
   "label.unique-visitors": "獨立訪客",
+  "label.uniqueCustomers": "Unique Customers",
   "label.unknown": "未知",
   "label.untitled": "無標題",
   "label.update": "Update",
   "label.url": "網址",
   "label.urls": "網址",
   "label.user": "使用者",
+  "label.user-property": "User Property",
   "label.username": "使用者名稱",
   "label.users": "使用者",
   "label.utm": "UTM",
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 3bce527151..743761d783 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -125,9 +125,9 @@ export interface WebsiteEventMetric {
 
 export interface WebsiteEventData {
   eventName?: string;
-  fieldName: string;
+  propertyName: string;
   dataType: number;
-  fieldValue?: string;
+  propertyValue?: string;
   total: number;
 }
 
diff --git a/src/pages/api/events/[eventId]/data.ts b/src/pages/api/websites/[websiteId]/event-data/events.ts
similarity index 100%
rename from src/pages/api/events/[eventId]/data.ts
rename to src/pages/api/websites/[websiteId]/event-data/events.ts
diff --git a/src/pages/api/websites/[websiteId]/event-data/properties.ts b/src/pages/api/websites/[websiteId]/event-data/properties.ts
new file mode 100644
index 0000000000..19e9bbb892
--- /dev/null
+++ b/src/pages/api/websites/[websiteId]/event-data/properties.ts
@@ -0,0 +1,49 @@
+import { canViewWebsite } from 'lib/auth';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getEventDataProperties } from 'queries';
+import * as yup from 'yup';
+
+export interface EventDataFieldsRequestQuery {
+  websiteId: string;
+  startAt: string;
+  endAt: string;
+  propertyName?: string;
+}
+
+const schema = {
+  GET: yup.object().shape({
+    websiteId: yup.string().uuid().required(),
+    startAt: yup.number().integer().required(),
+    endAt: yup.number().integer().min(yup.ref('startAt')).required(),
+    propertyName: yup.string(),
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<EventDataFieldsRequestQuery>,
+  res: NextApiResponse<any>,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  if (req.method === 'GET') {
+    const { websiteId, startAt, endAt, propertyName } = req.query;
+
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const startDate = new Date(+startAt);
+    const endDate = new Date(+endAt);
+
+    const data = await getEventDataProperties(websiteId, { startDate, endDate, propertyName });
+
+    return ok(res, data);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/src/pages/api/event-data/fields.ts b/src/pages/api/websites/[websiteId]/event-data/values.ts
similarity index 80%
rename from src/pages/api/event-data/fields.ts
rename to src/pages/api/websites/[websiteId]/event-data/values.ts
index 4353ee7303..b9ada96df5 100644
--- a/src/pages/api/event-data/fields.ts
+++ b/src/pages/api/websites/[websiteId]/event-data/values.ts
@@ -3,14 +3,15 @@ import { useAuth, useCors, useValidate } from 'lib/middleware';
 import { NextApiRequestQueryBody } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { getEventDataFields } from 'queries';
+import { getEventDataValues } from 'queries';
+
 import * as yup from 'yup';
 
 export interface EventDataFieldsRequestQuery {
   websiteId: string;
   startAt: string;
   endAt: string;
-  field?: string;
+  propertyName?: string;
 }
 
 const schema = {
@@ -18,7 +19,7 @@ const schema = {
     websiteId: yup.string().uuid().required(),
     startAt: yup.number().integer().required(),
     endAt: yup.number().integer().min(yup.ref('startAt')).required(),
-    field: yup.string(),
+    propertyName: yup.string(),
   }),
 };
 
@@ -31,7 +32,7 @@ export default async (
   await useValidate(schema, req, res);
 
   if (req.method === 'GET') {
-    const { websiteId, startAt, endAt, field } = req.query;
+    const { websiteId, startAt, endAt, propertyName } = req.query;
 
     if (!(await canViewWebsite(req.auth, websiteId))) {
       return unauthorized(res);
@@ -40,7 +41,7 @@ export default async (
     const startDate = new Date(+startAt);
     const endDate = new Date(+endAt);
 
-    const data = await getEventDataFields(websiteId, { startDate, endDate, field });
+    const data = await getEventDataValues(websiteId, { startDate, endDate, propertyName });
 
     return ok(res, data);
   }
diff --git a/src/pages/api/event-data/stats.ts b/src/pages/api/websites/[websiteId]/events/stats.ts
similarity index 100%
rename from src/pages/api/event-data/stats.ts
rename to src/pages/api/websites/[websiteId]/events/stats.ts
diff --git a/src/pages/api/sessions/[sessionId]/data.ts b/src/pages/api/websites/[websiteId]/sessions/[sessionId]/properties.ts
similarity index 100%
rename from src/pages/api/sessions/[sessionId]/data.ts
rename to src/pages/api/websites/[websiteId]/sessions/[sessionId]/properties.ts
diff --git a/src/queries/analytics/events/getEventDataEvents.ts b/src/queries/analytics/events/getEventDataEvents.ts
index e5647debd0..6b57330c59 100644
--- a/src/queries/analytics/events/getEventDataEvents.ts
+++ b/src/queries/analytics/events/getEventDataEvents.ts
@@ -22,9 +22,9 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
       `
       select
         website_event.event_name as "eventName",
-        event_data.data_key as "fieldName",
+        event_data.data_key as "propertyName",
         event_data.data_type as "dataType",
-        event_data.string_value as "fieldValue",
+        event_data.string_value as "propertyValue",
         count(*) as "total"
       from event_data
       inner join website_event
@@ -43,7 +43,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     `
     select
       website_event.event_name as "eventName",
-      event_data.data_key as "fieldName",
+      event_data.data_key as "propertyName",
       event_data.data_type as "dataType",
       count(*) as "total"
     from event_data
@@ -62,7 +62,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
 async function clickhouseQuery(
   websiteId: string,
   filters: QueryFilters,
-): Promise<{ eventName: string; fieldName: string; dataType: number; total: number }[]> {
+): Promise<{ eventName: string; propertyName: string; dataType: number; total: number }[]> {
   const { rawQuery, parseFilters } = clickhouse;
   const { event } = filters;
   const { params } = await parseFilters(websiteId, filters);
@@ -72,9 +72,9 @@ async function clickhouseQuery(
       `
       select
         event_name as eventName,
-        data_key as fieldName,
+        data_key as propertyName,
         data_type as dataType,
-        string_value as fieldValue,
+        string_value as propertyValue,
         count(*) as total
       from event_data
       where website_id = {websiteId:UUID}
@@ -89,9 +89,9 @@ async function clickhouseQuery(
       return Object.values(result).map((a: any) => {
         return {
           eventName: a.eventName,
-          fieldName: a.fieldName,
+          propertyName: a.propertyName,
           dataType: Number(a.dataType),
-          fieldValue: a.fieldValue,
+          propertyValue: a.propertyValue,
           total: Number(a.total),
         };
       });
@@ -102,7 +102,7 @@ async function clickhouseQuery(
     `
     select
       event_name as eventName,
-      data_key as fieldName,
+      data_key as propertyName,
       data_type as dataType,
       count(*) as total
     from event_data
@@ -117,7 +117,7 @@ async function clickhouseQuery(
     return Object.values(result).map((a: any) => {
       return {
         eventName: a.eventName,
-        fieldName: a.fieldName,
+        propertyName: a.propertyName,
         dataType: Number(a.dataType),
         total: Number(a.total),
       };
diff --git a/src/queries/analytics/events/getEventDataFields.ts b/src/queries/analytics/events/getEventDataProperties.ts
similarity index 61%
rename from src/queries/analytics/events/getEventDataFields.ts
rename to src/queries/analytics/events/getEventDataProperties.ts
index f669ad39f6..78fcb2cda3 100644
--- a/src/queries/analytics/events/getEventDataFields.ts
+++ b/src/queries/analytics/events/getEventDataProperties.ts
@@ -3,8 +3,8 @@ import clickhouse from 'lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import { QueryFilters, WebsiteEventData } from 'lib/types';
 
-export async function getEventDataFields(
-  ...args: [websiteId: string, filters: QueryFilters & { field?: string }]
+export async function getEventDataProperties(
+  ...args: [websiteId: string, filters: QueryFilters & { propertyName?: string }]
 ): Promise<WebsiteEventData[]> {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
@@ -12,25 +12,26 @@ export async function getEventDataFields(
   });
 }
 
-async function relationalQuery(websiteId: string, filters: QueryFilters & { field?: string }) {
+async function relationalQuery(
+  websiteId: string,
+  filters: QueryFilters & { propertyName?: string },
+) {
   const { rawQuery, parseFilters } = prisma;
   const { filterQuery, params } = await parseFilters(websiteId, filters, {
-    columns: { field: 'data_key' },
+    columns: { propertyName: 'data_key' },
   });
 
   return rawQuery(
     `
     select
-      data_key as "fieldName",
-      data_type as "dataType",
-      string_value as "fieldValue",
+      data_key as "propertyName",
       count(*) as "total"
     from event_data
     where website_id = {{websiteId::uuid}}
       and created_at between {{startDate}} and {{endDate}}
     ${filterQuery}
-    group by data_key, data_type, string_value
-    order by 3 desc, 2 desc, 1 asc
+    group by data_key
+    order by 2 desc
     limit 500
     `,
     params,
@@ -39,35 +40,33 @@ async function relationalQuery(websiteId: string, filters: QueryFilters & { fiel
 
 async function clickhouseQuery(
   websiteId: string,
-  filters: QueryFilters & { field?: string },
-): Promise<{ fieldName: string; dataType: number; fieldValue: string; total: number }[]> {
+  filters: QueryFilters & { propertyName?: string },
+): Promise<{ propertyName: string; dataType: number; propertyValue: string; total: number }[]> {
   const { rawQuery, parseFilters } = clickhouse;
   const { filterQuery, params } = await parseFilters(websiteId, filters, {
-    columns: { field: 'data_key' },
+    columns: { propertyName: 'data_key' },
   });
 
   return rawQuery(
     `
     select
-      data_key as fieldName,
-      data_type as dataType,
-      string_value as fieldValue,
+      data_key as propertyName,
       count(*) as total
     from event_data
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}
     ${filterQuery}
-    group by data_key, data_type, string_value
-    order by 3 desc, 2 desc, 1 asc
+    group by data_key
+    order by 2 desc
     limit 500
     `,
     params,
   ).then(result => {
     return Object.values(result).map((a: any) => {
       return {
-        fieldName: a.fieldName,
+        propertyName: a.propertyName,
         dataType: Number(a.dataType),
-        fieldValue: a.fieldValue,
+        propertyValue: a.propertyValue,
         total: Number(a.total),
       };
     });
diff --git a/src/queries/analytics/events/getEventDataStats.ts b/src/queries/analytics/events/getEventDataStats.ts
index 09bef107c6..51a0da746e 100644
--- a/src/queries/analytics/events/getEventDataStats.ts
+++ b/src/queries/analytics/events/getEventDataStats.ts
@@ -7,7 +7,7 @@ export async function getEventDataStats(
   ...args: [websiteId: string, filters: QueryFilters]
 ): Promise<{
   events: number;
-  fields: number;
+  properties: number;
   records: number;
 }> {
   return runQuery({
@@ -24,7 +24,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     `
     select 
       count(distinct t.website_event_id) as "events",
-      count(distinct t.data_key) as "fields",
+      count(distinct t.data_key) as "properties",
       sum(t.total) as "records"
     from (
       select
@@ -45,7 +45,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
 async function clickhouseQuery(
   websiteId: string,
   filters: QueryFilters,
-): Promise<{ events: number; fields: number; records: number }[]> {
+): Promise<{ events: number; properties: number; records: number }[]> {
   const { rawQuery, parseFilters } = clickhouse;
   const { filterQuery, params } = await parseFilters(websiteId, filters);
 
@@ -53,7 +53,7 @@ async function clickhouseQuery(
     `
     select 
       count(distinct t.event_id) as "events",
-      count(distinct t.data_key) as "fields",
+      count(distinct t.data_key) as "properties",
       sum(t.total) as "records"
     from (
       select
@@ -72,7 +72,7 @@ async function clickhouseQuery(
     return Object.values(result).map((a: any) => {
       return {
         events: Number(a.events),
-        fields: Number(a.fields),
+        properties: Number(a.properties),
         records: Number(a.records),
       };
     });
diff --git a/src/queries/analytics/events/getEventDataValues.ts b/src/queries/analytics/events/getEventDataValues.ts
new file mode 100644
index 0000000000..abf2efc0c9
--- /dev/null
+++ b/src/queries/analytics/events/getEventDataValues.ts
@@ -0,0 +1,70 @@
+import prisma from 'lib/prisma';
+import clickhouse from 'lib/clickhouse';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import { QueryFilters, WebsiteEventData } from 'lib/types';
+
+export async function getEventDataValues(
+  ...args: [websiteId: string, filters: QueryFilters & { propertyName?: string }]
+): Promise<WebsiteEventData[]> {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(
+  websiteId: string,
+  filters: QueryFilters & { propertyName?: string },
+) {
+  const { rawQuery, parseFilters } = prisma;
+  const { filterQuery, params } = await parseFilters(websiteId, filters);
+
+  return rawQuery(
+    `
+    select
+      string_value as "value",
+      count(*) as "total"
+    from event_data
+    where website_id = {{websiteId::uuid}}
+      and created_at between {{startDate}} and {{endDate}}
+      and data_key = {{propertyName}}
+    ${filterQuery}
+    group by string_value
+    order by 2 desc
+    limit 500
+    `,
+    params,
+  );
+}
+
+async function clickhouseQuery(
+  websiteId: string,
+  filters: QueryFilters & { propertyName?: string },
+): Promise<{ propertyName: string; dataType: number; propertyValue: string; total: number }[]> {
+  const { rawQuery, parseFilters } = clickhouse;
+  const { filterQuery, params } = await parseFilters(websiteId, filters);
+
+  return rawQuery(
+    `
+    select
+      string_value as "value",
+      count(*) as "total"
+    from event_data
+    where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      and data_key = {propertyName:String}
+    ${filterQuery}
+    group by string_value
+    order by 2 desc
+    limit 500
+    `,
+    params,
+  ).then(result => {
+    return Object.values(result).map((a: any) => {
+      return {
+        ...a,
+        total: Number(a.total),
+      };
+    });
+  });
+}
diff --git a/src/queries/index.ts b/src/queries/index.ts
index 51c1e14b9f..7dd7178340 100644
--- a/src/queries/index.ts
+++ b/src/queries/index.ts
@@ -4,7 +4,8 @@ export * from 'queries/prisma/teamUser';
 export * from 'queries/prisma/user';
 export * from 'queries/prisma/website';
 export * from './analytics/events/getEventDataEvents';
-export * from './analytics/events/getEventDataFields';
+export * from './analytics/events/getEventDataProperties';
+export * from './analytics/events/getEventDataValues';
 export * from './analytics/events/getEventDataStats';
 export * from './analytics/events/getEventDataUsage';
 export * from './analytics/events/getEventMetrics';
diff --git a/yarn.lock b/yarn.lock
index 24df3ea113..9cfe709f93 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9033,10 +9033,10 @@ randombytes@^2.1.0:
   dependencies:
     safe-buffer "^5.1.0"
 
-react-basics@^0.124.0:
-  version "0.124.0"
-  resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.124.0.tgz#c2c783f634aadccc13aae8a770960d298a10ebe4"
-  integrity sha512-5E2chyDE0PKKQ9x7kKM18/6UjFsjkPx7mfbTJb4PsWCC5gPi6m5zX7uPWF7omu4/I5Oms/nj16D3pa350WXIyw==
+react-basics@^0.125.0:
+  version "0.125.0"
+  resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.125.0.tgz#6baf3fea503fb4475f51877efa05d1a734b232c6"
+  integrity sha512-8swjTaKfenwb+NunwzQo16V+dCA/38Kd+PSYWpBFyNmlFzs3Ax2ZgnysxDhW9IgfFr4wR6/0gzD3S31WzXq6Kw==
   dependencies:
     "@react-spring/web" "^9.7.3"
     classnames "^2.3.1"
@@ -9865,7 +9865,16 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -9954,7 +9963,14 @@ string.prototype.trimstart@^1.0.8:
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -10726,7 +10742,7 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -10744,6 +10760,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

From 67874a6282e9f5e0b52d1b6a0e3d5284cce468d4 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 9 Aug 2024 01:41:21 -0700
Subject: [PATCH 256/438] Update event property styles.

---
 .../[websiteId]/events/EventProperties.module.css | 15 +++++++++++++--
 .../[websiteId]/events/EventProperties.tsx        |  8 ++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/events/EventProperties.module.css b/src/app/(main)/websites/[websiteId]/events/EventProperties.module.css
index b476ebd87a..4f6a65ec9a 100644
--- a/src/app/(main)/websites/[websiteId]/events/EventProperties.module.css
+++ b/src/app/(main)/websites/[websiteId]/events/EventProperties.module.css
@@ -1,7 +1,8 @@
 .container {
   display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(600px, 1fr));
-  gap: 30px;
+  grid-template-columns: repeat(auto-fill, minmax(420px, 1fr));
+  gap: 60px;
+  margin-bottom: 40px;
 }
 
 .table {
@@ -12,3 +13,13 @@
   cursor: pointer;
   color: var(--primary400);
 }
+
+.title {
+  text-align: center;
+  font-weight: bold;
+  margin: 20px 0;
+}
+
+.chart {
+  min-height: 620px;
+}
diff --git a/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx b/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx
index d6e52c59ea..b2fa491a1b 100644
--- a/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx
+++ b/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx
@@ -1,10 +1,10 @@
 import { GridColumn, GridTable } from 'react-basics';
 import { useEventDataProperties, useEventDataValues, useMessages } from 'components/hooks';
 import { LoadingPanel } from 'components/common/LoadingPanel';
-import styles from './EventProperties.module.css';
 import PieChart from 'components/charts/PieChart';
 import { useState } from 'react';
 import { CHART_COLORS } from 'lib/constants';
+import styles from './EventProperties.module.css';
 
 export function EventProperties({ websiteId }: { websiteId: string }) {
   const [propertyName, setPropertyName] = useState('');
@@ -36,11 +36,11 @@ export function EventProperties({ websiteId }: { websiteId: string }) {
               </div>
             )}
           </GridColumn>
-          <GridColumn name="total" label={formatMessage(labels.count)} />
+          <GridColumn name="total" label={formatMessage(labels.count)} alignment="end" />
         </GridTable>
         {propertyName && (
-          <div>
-            <strong>{propertyName}</strong>
+          <div className={styles.chart}>
+            <div className={styles.title}>{propertyName}</div>
             <PieChart key={propertyName} type="doughnut" data={chartData} />
           </div>
         )}

From 840c1c02bf897df61551d6f49aacf59f79306fe4 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 9 Aug 2024 11:49:08 -0700
Subject: [PATCH 257/438] Fixed type icons.

---
 .../[websiteId]/sessions/SessionsTable.tsx    | 20 ++++++++++++++++---
 src/components/common/TypeIcon.tsx            |  4 +++-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
index 6e2e53ed00..ad4a8ac924 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
@@ -31,11 +31,25 @@ export function SessionsTable({ data = [] }: { data: any[]; showDomain?: boolean
       </GridColumn>
       <GridColumn name="city" label={formatMessage(labels.city)} />
       <GridColumn name="browser" label={formatMessage(labels.browser)}>
-        {row => formatValue(row.browser, 'browser')}
+        {row => (
+          <TypeIcon type="browser" value={row.browser}>
+            {formatValue(row.browser, 'browser')}
+          </TypeIcon>
+        )}
+      </GridColumn>
+      <GridColumn name="os" label={formatMessage(labels.os)}>
+        {row => (
+          <TypeIcon type="os" value={row.os}>
+            {formatValue(row.os, 'os')}
+          </TypeIcon>
+        )}
       </GridColumn>
-      <GridColumn name="os" label={formatMessage(labels.os)} />
       <GridColumn name="device" label={formatMessage(labels.device)}>
-        {row => formatValue(row.device, 'device')}
+        {row => (
+          <TypeIcon type="device" value={row.device}>
+            {formatValue(row.device, 'device')}
+          </TypeIcon>
+        )}
       </GridColumn>
       <GridColumn name="lastAt" label={formatMessage(labels.lastSeen)}>
         {row => formatDate(new Date(row.lastAt), 'PPPpp', locale)}
diff --git a/src/components/common/TypeIcon.tsx b/src/components/common/TypeIcon.tsx
index 475fe6436a..bb99c2f7f0 100644
--- a/src/components/common/TypeIcon.tsx
+++ b/src/components/common/TypeIcon.tsx
@@ -12,7 +12,9 @@ export function TypeIcon({
   return (
     <>
       <img
-        src={`${process.env.basePath || ''}/images/${type}/${value || 'unknown'}.png`}
+        src={`${process.env.basePath || ''}/images/${type}/${
+          value.replaceAll(' ', '-').toLowerCase() || 'unknown'
+        }.png`}
         alt={value}
         width={type === 'country' ? undefined : 16}
         height={type === 'country' ? undefined : 16}

From 5feae93162a5c7247b7bc1f1127674dedaec2be4 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 9 Aug 2024 13:37:39 -0700
Subject: [PATCH 258/438] Fixed share page.

---
 src/app/share/[...shareId]/SharePage.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/app/share/[...shareId]/SharePage.tsx b/src/app/share/[...shareId]/SharePage.tsx
index 4ac6af378a..c4d9af62da 100644
--- a/src/app/share/[...shareId]/SharePage.tsx
+++ b/src/app/share/[...shareId]/SharePage.tsx
@@ -5,6 +5,7 @@ import Page from 'components/layout/Page';
 import Header from './Header';
 import Footer from './Footer';
 import styles from './SharePage.module.css';
+import { WebsiteProvider } from 'app/(main)/websites/[websiteId]/WebsiteProvider';
 
 export default function SharePage({ shareId }) {
   const { shareToken, isLoading } = useShareToken(shareId);
@@ -17,7 +18,9 @@ export default function SharePage({ shareId }) {
     <div className={styles.container}>
       <Page>
         <Header />
-        <WebsiteDetailsPage websiteId={shareToken.websiteId} />
+        <WebsiteProvider websiteId={shareToken.websiteId}>
+          <WebsiteDetailsPage websiteId={shareToken.websiteId} />
+        </WebsiteProvider>
         <Footer />
       </Page>
     </div>

From c7d39a3e940c47337860d351b4e9d83028da0d66 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 9 Aug 2024 14:13:34 -0700
Subject: [PATCH 259/438] Fixed session properties.

---
 .../sessions/[sessionId]/SessionData.tsx            | 13 +++++--------
 .../sessions/[sessionId]/SessionDetailsPage.tsx     | 12 ++++--------
 src/components/common/LoadingPanel.module.css       |  1 +
 src/components/common/LoadingPanel.tsx              |  2 +-
 src/components/hooks/queries/useSessionData.ts      |  2 +-
 5 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.tsx
index 7e583f185b..6b18cb572b 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.tsx
@@ -1,19 +1,16 @@
-import { Loading, TextOverflow } from 'react-basics';
+import { TextOverflow } from 'react-basics';
 import { useMessages, useSessionData } from 'components/hooks';
 import Empty from 'components/common/Empty';
 import { DATA_TYPES } from 'lib/constants';
 import styles from './SessionData.module.css';
+import { LoadingPanel } from 'components/common/LoadingPanel';
 
 export function SessionData({ websiteId, sessionId }: { websiteId: string; sessionId: string }) {
   const { formatMessage, labels } = useMessages();
-  const { data, isLoading } = useSessionData(websiteId, sessionId);
-
-  if (isLoading) {
-    return <Loading icon="dots" size="sm" />;
-  }
+  const { data, ...query } = useSessionData(websiteId, sessionId);
 
   return (
-    <div className={styles.data}>
+    <LoadingPanel className={styles.data} {...query} data={data}>
       <div className={styles.header}>{formatMessage(labels.properties)}</div>
       {!data?.length && <Empty className={styles.empty} />}
       {data?.map(({ dataKey, dataType, stringValue }) => {
@@ -29,6 +26,6 @@ export function SessionData({ websiteId, sessionId }: { websiteId: string; sessi
           </div>
         );
       })}
-    </div>
+    </LoadingPanel>
   );
 }
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
index 059e041f5a..fa96c7762e 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
@@ -2,12 +2,12 @@
 import WebsiteHeader from '../../WebsiteHeader';
 import SessionInfo from './SessionInfo';
 import { useWebsiteSession } from 'components/hooks';
-import { Loading } from 'react-basics';
 import Avatar from 'components/common/Avatar';
 import { SessionActivity } from './SessionActivity';
 import { SessionStats } from './SessionStats';
 import { SessionData } from './SessionData';
 import styles from './SessionDetailsPage.module.css';
+import { LoadingPanel } from 'components/common/LoadingPanel';
 
 export default function SessionDetailsPage({
   websiteId,
@@ -16,14 +16,10 @@ export default function SessionDetailsPage({
   websiteId: string;
   sessionId: string;
 }) {
-  const { data, isLoading } = useWebsiteSession(websiteId, sessionId);
-
-  if (isLoading) {
-    return <Loading position="page" />;
-  }
+  const { data, ...query } = useWebsiteSession(websiteId, sessionId);
 
   return (
-    <>
+    <LoadingPanel {...query} loadingIcon="spinner" data={data}>
       <WebsiteHeader websiteId={websiteId} />
       <div className={styles.page}>
         <div className={styles.sidebar}>
@@ -38,6 +34,6 @@ export default function SessionDetailsPage({
           <SessionData websiteId={websiteId} sessionId={sessionId} />
         </div>
       </div>
-    </>
+    </LoadingPanel>
   );
 }
diff --git a/src/components/common/LoadingPanel.module.css b/src/components/common/LoadingPanel.module.css
index d82e27d69b..2dc8b75ee3 100644
--- a/src/components/common/LoadingPanel.module.css
+++ b/src/components/common/LoadingPanel.module.css
@@ -2,4 +2,5 @@
   display: flex;
   flex-direction: column;
   position: relative;
+  flex: 1;
 }
diff --git a/src/components/common/LoadingPanel.tsx b/src/components/common/LoadingPanel.tsx
index 890e8e3918..dc18ca508a 100644
--- a/src/components/common/LoadingPanel.tsx
+++ b/src/components/common/LoadingPanel.tsx
@@ -23,7 +23,7 @@ export function LoadingPanel({
   className?: string;
   children: ReactNode;
 }) {
-  const isEmpty = !data?.length && !isLoading && isFetched;
+  const isEmpty = !isLoading && isFetched && data && Array.isArray(data) && data.length > 0;
 
   return (
     <div className={classNames(styles.panel, className)}>
diff --git a/src/components/hooks/queries/useSessionData.ts b/src/components/hooks/queries/useSessionData.ts
index f2e8f5241c..14e046d1d2 100644
--- a/src/components/hooks/queries/useSessionData.ts
+++ b/src/components/hooks/queries/useSessionData.ts
@@ -6,7 +6,7 @@ export function useSessionData(websiteId: string, sessionId: string) {
   return useQuery({
     queryKey: ['session:data', { websiteId, sessionId }],
     queryFn: () => {
-      return get(`/sessions/${sessionId}/data`, { websiteId });
+      return get(`/websites/${websiteId}/sessions/${sessionId}/properties`, { websiteId });
     },
   });
 }

From 4c0d7d960d4e4e85c7ed0d1b8e0855ce4df6719c Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 9 Aug 2024 15:02:48 -0700
Subject: [PATCH 260/438] Fixed empty logic.

---
 src/components/common/LoadingPanel.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/common/LoadingPanel.tsx b/src/components/common/LoadingPanel.tsx
index dc18ca508a..487252be6a 100644
--- a/src/components/common/LoadingPanel.tsx
+++ b/src/components/common/LoadingPanel.tsx
@@ -23,7 +23,7 @@ export function LoadingPanel({
   className?: string;
   children: ReactNode;
 }) {
-  const isEmpty = !isLoading && isFetched && data && Array.isArray(data) && data.length > 0;
+  const isEmpty = !isLoading && isFetched && data && Array.isArray(data) && data.length === 0;
 
   return (
     <div className={classNames(styles.panel, className)}>

From a1c0ec9c81af9a1017d05ccbe117a58973740f6e Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Fri, 9 Aug 2024 15:49:30 -0700
Subject: [PATCH 261/438] update getSessionActivity / getWebsiteSession

---
 .../sessions/[sessionId]/SessionActivity.tsx  |  6 +++-
 .../[sessionId]/SessionDetailsPage.tsx        | 17 +++++++----
 .../hooks/queries/useSessionActivity.ts       |  9 ++++--
 .../sessions/[sessionId]/activity.ts          | 13 +++++++--
 .../[websiteId]/sessions/[sessionId]/index.ts |  2 +-
 .../analytics/sessions/getSessionActivity.ts  | 28 ++++++++++++++-----
 .../analytics/sessions/getWebsiteSession.ts   | 24 ++++++++--------
 7 files changed, 69 insertions(+), 30 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
index 0a15430c0e..69407584e7 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
@@ -8,12 +8,16 @@ import styles from './SessionActivity.module.css';
 export function SessionActivity({
   websiteId,
   sessionId,
+  startDate,
+  endDate,
 }: {
   websiteId: string;
   sessionId: string;
+  startDate: string;
+  endDate: string;
 }) {
   const { locale } = useLocale();
-  const { data, isLoading } = useSessionActivity(websiteId, sessionId);
+  const { data, isLoading } = useSessionActivity(websiteId, sessionId, startDate, endDate);
 
   if (isLoading) {
     return <Loading position="page" />;
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
index fa96c7762e..d6a07edcf4 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
@@ -1,13 +1,13 @@
 'use client';
-import WebsiteHeader from '../../WebsiteHeader';
-import SessionInfo from './SessionInfo';
-import { useWebsiteSession } from 'components/hooks';
 import Avatar from 'components/common/Avatar';
+import { LoadingPanel } from 'components/common/LoadingPanel';
+import { useWebsiteSession } from 'components/hooks';
+import WebsiteHeader from '../../WebsiteHeader';
 import { SessionActivity } from './SessionActivity';
-import { SessionStats } from './SessionStats';
 import { SessionData } from './SessionData';
 import styles from './SessionDetailsPage.module.css';
-import { LoadingPanel } from 'components/common/LoadingPanel';
+import SessionInfo from './SessionInfo';
+import { SessionStats } from './SessionStats';
 
 export default function SessionDetailsPage({
   websiteId,
@@ -28,7 +28,12 @@ export default function SessionDetailsPage({
         </div>
         <div className={styles.content}>
           <SessionStats data={data} />
-          <SessionActivity websiteId={websiteId} sessionId={sessionId} />
+          <SessionActivity
+            websiteId={websiteId}
+            sessionId={sessionId}
+            startDate={data?.firstAt}
+            endDate={data?.lastAt}
+          />
         </div>
         <div className={styles.data}>
           <SessionData websiteId={websiteId} sessionId={sessionId} />
diff --git a/src/components/hooks/queries/useSessionActivity.ts b/src/components/hooks/queries/useSessionActivity.ts
index e6d7ffa0e4..94676a9916 100644
--- a/src/components/hooks/queries/useSessionActivity.ts
+++ b/src/components/hooks/queries/useSessionActivity.ts
@@ -1,12 +1,17 @@
 import { useApi } from './useApi';
 
-export function useSessionActivity(websiteId: string, sessionId: string) {
+export function useSessionActivity(
+  websiteId: string,
+  sessionId: string,
+  startDate: string,
+  endDate: string,
+) {
   const { get, useQuery } = useApi();
 
   return useQuery({
     queryKey: ['session:activity', { websiteId, sessionId }],
     queryFn: () => {
-      return get(`/websites/${websiteId}/sessions/${sessionId}/activity`);
+      return get(`/websites/${websiteId}/sessions/${sessionId}/activity`, { startDate, endDate });
     },
   });
 }
diff --git a/src/pages/api/websites/[websiteId]/sessions/[sessionId]/activity.ts b/src/pages/api/websites/[websiteId]/sessions/[sessionId]/activity.ts
index 8d1b234617..2bf236545f 100644
--- a/src/pages/api/websites/[websiteId]/sessions/[sessionId]/activity.ts
+++ b/src/pages/api/websites/[websiteId]/sessions/[sessionId]/activity.ts
@@ -9,12 +9,16 @@ import { getSessionActivity } from 'queries';
 export interface SessionActivityRequestQuery extends PageParams {
   websiteId: string;
   sessionId: string;
+  startDate: string;
+  endDate: string;
 }
 
 const schema = {
   GET: yup.object().shape({
     websiteId: yup.string().uuid().required(),
     sessionId: yup.string().uuid().required(),
+    startDate: yup.string().required(),
+    endDate: yup.string().required(),
   }),
 };
 
@@ -26,14 +30,19 @@ export default async (
   await useAuth(req, res);
   await useValidate(schema, req, res);
 
-  const { websiteId, sessionId } = req.query;
+  const { websiteId, sessionId, startDate, endDate } = req.query;
 
   if (req.method === 'GET') {
     if (!(await canViewWebsite(req.auth, websiteId))) {
       return unauthorized(res);
     }
 
-    const data = await getSessionActivity(websiteId, sessionId);
+    const data = await getSessionActivity(
+      websiteId,
+      sessionId,
+      new Date(startDate),
+      new Date(endDate),
+    );
 
     return ok(res, data);
   }
diff --git a/src/pages/api/websites/[websiteId]/sessions/[sessionId]/index.ts b/src/pages/api/websites/[websiteId]/sessions/[sessionId]/index.ts
index b2665c7cf6..f627a20858 100644
--- a/src/pages/api/websites/[websiteId]/sessions/[sessionId]/index.ts
+++ b/src/pages/api/websites/[websiteId]/sessions/[sessionId]/index.ts
@@ -33,7 +33,7 @@ export default async (
       return unauthorized(res);
     }
 
-    const data = await getWebsiteSession(sessionId);
+    const data = await getWebsiteSession(websiteId, sessionId);
 
     return ok(res, data);
   }
diff --git a/src/queries/analytics/sessions/getSessionActivity.ts b/src/queries/analytics/sessions/getSessionActivity.ts
index bc1f9acaa4..bb7c141cb4 100644
--- a/src/queries/analytics/sessions/getSessionActivity.ts
+++ b/src/queries/analytics/sessions/getSessionActivity.ts
@@ -1,24 +1,37 @@
-import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
-import { runQuery, PRISMA, CLICKHOUSE } from 'lib/db';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import prisma from 'lib/prisma';
 
-export async function getSessionActivity(...args: [websiteId: string, sessionId: string]) {
+export async function getSessionActivity(
+  ...args: [websiteId: string, sessionId: string, startDate: Date, endDate: Date]
+) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
   });
 }
 
-async function relationalQuery(websiteId: string, sessionId: string) {
+async function relationalQuery(
+  websiteId: string,
+  sessionId: string,
+  startDate: Date,
+  endDate: Date,
+) {
   return prisma.client.websiteEvent.findMany({
     where: {
       id: sessionId,
       websiteId,
+      createdAt: { gte: startDate, lte: endDate },
     },
   });
 }
 
-async function clickhouseQuery(websiteId: string, sessionId: string) {
+async function clickhouseQuery(
+  websiteId: string,
+  sessionId: string,
+  startDate: Date,
+  endDate: Date,
+) {
   const { rawQuery } = clickhouse;
 
   return rawQuery(
@@ -36,9 +49,10 @@ async function clickhouseQuery(websiteId: string, sessionId: string) {
       visit_id as visitId
     from website_event
     where website_id = {websiteId:UUID}
-    and session_id = {sessionId:UUID} 
+      and session_id = {sessionId:UUID} 
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
     order by created_at desc
     `,
-    { websiteId, sessionId },
+    { websiteId, sessionId, startDate, endDate },
   );
 }
diff --git a/src/queries/analytics/sessions/getWebsiteSession.ts b/src/queries/analytics/sessions/getWebsiteSession.ts
index 38bc230c8c..ca527dba86 100644
--- a/src/queries/analytics/sessions/getWebsiteSession.ts
+++ b/src/queries/analytics/sessions/getWebsiteSession.ts
@@ -2,22 +2,23 @@ import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
 import { runQuery, PRISMA, CLICKHOUSE } from 'lib/db';
 
-export async function getWebsiteSession(...args: [sessionId: string]) {
+export async function getWebsiteSession(...args: [websiteId: string, sessionId: string]) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
   });
 }
 
-async function relationalQuery(sessionId: string) {
+async function relationalQuery(websiteId: string, sessionId: string) {
   return prisma.client.session.findUnique({
     where: {
       id: sessionId,
+      websiteId,
     },
   });
 }
 
-async function clickhouseQuery(sessionId: string) {
+async function clickhouseQuery(websiteId: string, sessionId: string) {
   const { rawQuery } = clickhouse;
 
   return rawQuery(
@@ -34,15 +35,16 @@ async function clickhouseQuery(sessionId: string) {
       country,
       subdivision1,
       city,
-      min(created_at) as firstAt,
-      max(created_at) as lastAt,
+      min(min_time) as firstAt,
+      max(max_time) as lastAt,
       uniq(visit_id) as visits,
-      sumIf(1, event_type = 1) as views,
-      sumIf(1, event_type = 2) as events
-    from website_event
-    where session_id = {sessionId:UUID}
-    group by session_id, website_id, hostname, browser, os, device, screen, language, country, subdivision1, city
+      sumIf(views, event_type = 1) as views,
+      length(groupArrayArray(event_name)) as events
+    from website_event_stats_hourly
+    where website_id = {websiteId:UUID}
+      and session_id = {sessionId:UUID}
+    group by session_id, website_id, hostname, browser, os, device, screen, language, country, subdivision1, city;
     `,
-    { sessionId },
+    { websiteId, sessionId },
   ).then(result => result?.[0]);
 }

From 136dd6794e171751938a53885b16187cf7e60ada Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Fri, 9 Aug 2024 17:27:06 -0700
Subject: [PATCH 262/438] update websitesession, add session duration

---
 .../sessions/[sessionId]/SessionStats.tsx      | 18 +++++++++++++++++-
 src/components/messages.ts                     |  1 +
 src/lib/load.ts                                |  6 +++---
 src/lib/session.ts                             |  2 +-
 .../sessions/[sessionId]/activity.ts           |  4 ++--
 .../analytics/sessions/getWebsiteSessions.ts   |  2 +-
 6 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionStats.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionStats.tsx
index a25f7af3b4..6953405e3d 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionStats.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionStats.tsx
@@ -1,15 +1,31 @@
-import MetricCard from 'components/metrics/MetricCard';
 import { useMessages } from 'components/hooks';
+import MetricCard from 'components/metrics/MetricCard';
 import MetricsBar from 'components/metrics/MetricsBar';
+import { formatShortTime } from 'lib/format';
 
 export function SessionStats({ data }) {
   const { formatMessage, labels } = useMessages();
+  const duration = (new Date(data?.lastAt).getTime() - new Date(data?.firstAt).getTime()) / 1000;
+  let dateFormat;
+
+  if (duration > 86400) {
+    dateFormat = ['d', 'm'];
+  } else if (duration > 3600) {
+    dateFormat = ['h', 'm'];
+  } else {
+    dateFormat = ['m', 's'];
+  }
 
   return (
     <MetricsBar isFetched={true}>
       <MetricCard label={formatMessage(labels.visits)} value={data?.visits} />
       <MetricCard label={formatMessage(labels.views)} value={data?.views} />
       <MetricCard label={formatMessage(labels.events)} value={data?.events} />
+      <MetricCard
+        label={formatMessage(labels.sessionDuration)}
+        value={duration}
+        formatValue={n => `${+n < 0 ? '-' : ''}${formatShortTime(Math.abs(~~n), dateFormat, ' ')}`}
+      />
     </MetricsBar>
   );
 }
diff --git a/src/components/messages.ts b/src/components/messages.ts
index f711a4f6cf..0b32d0d868 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -141,6 +141,7 @@ export const labels = defineMessages({
   bounceRate: { id: 'label.bounce-rate', defaultMessage: 'Bounce rate' },
   viewsPerVisit: { id: 'label.views-per-visit', defaultMessage: 'Views per visit' },
   visitDuration: { id: 'label.visit-duration', defaultMessage: 'Visit duration' },
+  sessionDuration: { id: 'label.session-duration', defaultMessage: 'Session duration' },
   desktop: { id: 'label.desktop', defaultMessage: 'Desktop' },
   laptop: { id: 'label.laptop', defaultMessage: 'Laptop' },
   tablet: { id: 'label.tablet', defaultMessage: 'Tablet' },
diff --git a/src/lib/load.ts b/src/lib/load.ts
index 970247ddd5..8cddeaa9e5 100644
--- a/src/lib/load.ts
+++ b/src/lib/load.ts
@@ -18,17 +18,17 @@ export async function fetchWebsite(websiteId: string): Promise<Website> {
   return website;
 }
 
-export async function fetchSession(sessionId: string): Promise<Session> {
+export async function fetchSession(websiteId: string, sessionId: string): Promise<Session> {
   let session = null;
 
   if (redis.enabled) {
     session = await redis.client.fetch(
       `session:${sessionId}`,
-      () => getWebsiteSession(sessionId),
+      () => getWebsiteSession(websiteId, sessionId),
       86400,
     );
   } else {
-    session = await getWebsiteSession(sessionId);
+    session = await getWebsiteSession(websiteId, sessionId);
   }
 
   if (!session) {
diff --git a/src/lib/session.ts b/src/lib/session.ts
index cf30aa7124..ca145c04bb 100644
--- a/src/lib/session.ts
+++ b/src/lib/session.ts
@@ -62,7 +62,7 @@ export async function getSession(req: NextApiRequestCollect): Promise<SessionDat
   }
 
   // Find session
-  let session = await fetchSession(sessionId);
+  let session = await fetchSession(websiteId, sessionId);
 
   // Create a session if not found
   if (!session) {
diff --git a/src/pages/api/websites/[websiteId]/sessions/[sessionId]/activity.ts b/src/pages/api/websites/[websiteId]/sessions/[sessionId]/activity.ts
index 2bf236545f..d1a763fb3b 100644
--- a/src/pages/api/websites/[websiteId]/sessions/[sessionId]/activity.ts
+++ b/src/pages/api/websites/[websiteId]/sessions/[sessionId]/activity.ts
@@ -40,8 +40,8 @@ export default async (
     const data = await getSessionActivity(
       websiteId,
       sessionId,
-      new Date(startDate),
-      new Date(endDate),
+      new Date(startDate + 'Z'),
+      new Date(endDate + 'Z'),
     );
 
     return ok(res, data);
diff --git a/src/queries/analytics/sessions/getWebsiteSessions.ts b/src/queries/analytics/sessions/getWebsiteSessions.ts
index 26852616fc..b7c4f92848 100644
--- a/src/queries/analytics/sessions/getWebsiteSessions.ts
+++ b/src/queries/analytics/sessions/getWebsiteSessions.ts
@@ -47,7 +47,7 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
       min(created_at) as firstAt,
       max(created_at) as lastAt,
       uniq(visit_id) as visits,
-      count(*) as views
+      sumIf(1, event_type = 1) as views
     from website_event
     where website_id = {websiteId:UUID}
     ${dateQuery}

From 22333a1e9a71353d11f01e452791c115a371535b Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Fri, 9 Aug 2024 18:20:26 -0700
Subject: [PATCH 263/438] remove event from website stats. doesnt work with
 view

---
 .../[websiteId]/events/EventsMetricsBar.tsx         |  5 -----
 src/queries/analytics/getWebsiteStats.ts            | 13 +++----------
 .../analytics/sessions/getWebsiteSessions.ts        |  8 ++++----
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsx
index f77c6c04de..0a054e8d17 100644
--- a/src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsx
+++ b/src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsx
@@ -28,11 +28,6 @@ export function EventsMetricsBar({ websiteId }: { websiteId: string }) {
           label={formatMessage(labels.views)}
           formatValue={formatLongNumber}
         />
-        <MetricCard
-          value={data?.events?.value}
-          label={formatMessage(labels.events)}
-          formatValue={formatLongNumber}
-        />
       </MetricsBar>
       <WebsiteDateFilter websiteId={websiteId} />
     </Flexbox>
diff --git a/src/queries/analytics/getWebsiteStats.ts b/src/queries/analytics/getWebsiteStats.ts
index a33011ff5c..c35aea0693 100644
--- a/src/queries/analytics/getWebsiteStats.ts
+++ b/src/queries/analytics/getWebsiteStats.ts
@@ -33,15 +33,12 @@ async function relationalQuery(
       count(distinct t.session_id) as "visitors",
       count(distinct t.visit_id) as "visits",
       count(distinct t.country) as "countries",
-      count(t.event_name) as "countries",
-      sum(case when t.event_type = 2 then 1 else 0 end) as "events",
       sum(case when t.c = 1 then 1 else 0 end) as "bounces",
       sum(${getTimestampDiffSQL('t.min_time', 't.max_time')}) as "totaltime",
     from (
       select
         website_event.session_id,
         website_event.visit_id,
-        website_event.event_type,
         session.country,
         count(*) as "c",
         min(website_event.created_at) as "min_time",
@@ -51,7 +48,7 @@ async function relationalQuery(
       where website_event.website_id = {{websiteId::uuid}}
         and website_event.created_at between {{startDate}} and {{endDate}}
         ${filterQuery}
-      group by 1, 2, 3, 4
+      group by 1, 2, 3
     ) as t
     `,
     params,
@@ -78,14 +75,12 @@ async function clickhouseQuery(
       uniq(t.session_id) as "visitors",
       uniq(t.visit_id) as "visits",
       uniq(t.country) as "countries",
-      sumIf(1, t.event_type = 2) as "events",
       sumIf(1, t.c = 1) as "bounces",
       sum(max_time-min_time) as "totaltime"
     from (
       select
         session_id,
         visit_id,
-        event_type,
         country,
         count(*) c,
         min(created_at) min_time,
@@ -94,7 +89,7 @@ async function clickhouseQuery(
       where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
         ${filterQuery}
-      group by session_id, visit_id, event_type, country
+      group by session_id, visit_id, country
     ) as t;
     `;
   } else {
@@ -104,14 +99,12 @@ async function clickhouseQuery(
       uniq(session_id) as "visitors",
       uniq(visit_id) as "visits",
       uniq(country) as "countries",
-      sumIf(1, t.event_type = 2) as "events",
       sumIf(1, t.c = 1) as "bounces",
       sum(max_time-min_time) as "totaltime"
     from (
       select
           session_id,
           visit_id,
-          event_type,
           country,
           sum(views) c,
           min(min_time) min_time,
@@ -120,7 +113,7 @@ async function clickhouseQuery(
       where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
         ${filterQuery}
-      group by session_id, visit_id, event_type, country
+      group by session_id, visit_id, country
     ) as t;
     `;
   }
diff --git a/src/queries/analytics/sessions/getWebsiteSessions.ts b/src/queries/analytics/sessions/getWebsiteSessions.ts
index b7c4f92848..2b22a0c810 100644
--- a/src/queries/analytics/sessions/getWebsiteSessions.ts
+++ b/src/queries/analytics/sessions/getWebsiteSessions.ts
@@ -44,11 +44,11 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
       country,
       subdivision1,
       city,
-      min(created_at) as firstAt,
-      max(created_at) as lastAt,
+      min(min_time) as firstAt,
+      max(max_time) as lastAt,
       uniq(visit_id) as visits,
-      sumIf(1, event_type = 1) as views
-    from website_event
+      sumIf(views, event_type = 1) as views
+    from website_event_stats_hourly
     where website_id = {websiteId:UUID}
     ${dateQuery}
     ${filterQuery}

From 1e52eeb0f0be14d2fb9c789a2b70b263dd137df6 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Fri, 9 Aug 2024 20:02:46 -0700
Subject: [PATCH 264/438] Updated header nav.

---
 .../websites/[websiteId]/WebsiteHeader.tsx       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
index 3b8cddaeaa..edd10b99b0 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
@@ -32,25 +32,25 @@ export function WebsiteHeader({
       path: '',
     },
     {
-      label: formatMessage(labels.compare),
-      icon: <Icons.Compare />,
-      path: '/compare',
+      label: formatMessage(labels.events),
+      icon: <Lightning />,
+      path: '/events',
     },
     {
       label: formatMessage(labels.sessions),
       icon: <Icons.User />,
       path: '/sessions',
     },
-    {
-      label: formatMessage(labels.events),
-      icon: <Lightning />,
-      path: '/events',
-    },
     {
       label: formatMessage(labels.realtime),
       icon: <Icons.Clock />,
       path: '/realtime',
     },
+    {
+      label: formatMessage(labels.compare),
+      icon: <Icons.Compare />,
+      path: '/compare',
+    },
     {
       label: formatMessage(labels.reports),
       icon: <Icons.Reports />,

From 78728b8706c1121c0146975616e6b80fb870c813 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Sun, 11 Aug 2024 23:14:02 -0700
Subject: [PATCH 265/438] Fixed event search. Removed session time from
 profile.

---
 .../sessions/[sessionId]/SessionData.tsx      | 30 ++++++++++---------
 .../sessions/[sessionId]/SessionStats.tsx     | 16 ----------
 src/components/messages.ts                    |  1 -
 .../analytics/events/getWebsiteEvents.ts      |  9 +++++-
 .../analytics/sessions/getWebsiteSessions.ts  | 21 ++++++++-----
 5 files changed, 37 insertions(+), 40 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.tsx
index 6b18cb572b..39b6afd1f5 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.tsx
@@ -10,22 +10,24 @@ export function SessionData({ websiteId, sessionId }: { websiteId: string; sessi
   const { data, ...query } = useSessionData(websiteId, sessionId);
 
   return (
-    <LoadingPanel className={styles.data} {...query} data={data}>
+    <>
       <div className={styles.header}>{formatMessage(labels.properties)}</div>
-      {!data?.length && <Empty className={styles.empty} />}
-      {data?.map(({ dataKey, dataType, stringValue }) => {
-        return (
-          <div key={dataKey}>
-            <div className={styles.label}>
-              <div className={styles.name}>
-                <TextOverflow>{dataKey}</TextOverflow>
+      <LoadingPanel className={styles.data} {...query} data={data}>
+        {!data?.length && <Empty className={styles.empty} />}
+        {data?.map(({ dataKey, dataType, stringValue }) => {
+          return (
+            <div key={dataKey}>
+              <div className={styles.label}>
+                <div className={styles.name}>
+                  <TextOverflow>{dataKey}</TextOverflow>
+                </div>
+                <div className={styles.type}>{DATA_TYPES[dataType]}</div>
               </div>
-              <div className={styles.type}>{DATA_TYPES[dataType]}</div>
+              <div className={styles.value}>{stringValue}</div>
             </div>
-            <div className={styles.value}>{stringValue}</div>
-          </div>
-        );
-      })}
-    </LoadingPanel>
+          );
+        })}
+      </LoadingPanel>
+    </>
   );
 }
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionStats.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionStats.tsx
index 6953405e3d..3265e59241 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionStats.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionStats.tsx
@@ -1,31 +1,15 @@
 import { useMessages } from 'components/hooks';
 import MetricCard from 'components/metrics/MetricCard';
 import MetricsBar from 'components/metrics/MetricsBar';
-import { formatShortTime } from 'lib/format';
 
 export function SessionStats({ data }) {
   const { formatMessage, labels } = useMessages();
-  const duration = (new Date(data?.lastAt).getTime() - new Date(data?.firstAt).getTime()) / 1000;
-  let dateFormat;
-
-  if (duration > 86400) {
-    dateFormat = ['d', 'm'];
-  } else if (duration > 3600) {
-    dateFormat = ['h', 'm'];
-  } else {
-    dateFormat = ['m', 's'];
-  }
 
   return (
     <MetricsBar isFetched={true}>
       <MetricCard label={formatMessage(labels.visits)} value={data?.visits} />
       <MetricCard label={formatMessage(labels.views)} value={data?.views} />
       <MetricCard label={formatMessage(labels.events)} value={data?.events} />
-      <MetricCard
-        label={formatMessage(labels.sessionDuration)}
-        value={duration}
-        formatValue={n => `${+n < 0 ? '-' : ''}${formatShortTime(Math.abs(~~n), dateFormat, ' ')}`}
-      />
     </MetricsBar>
   );
 }
diff --git a/src/components/messages.ts b/src/components/messages.ts
index 0b32d0d868..f711a4f6cf 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -141,7 +141,6 @@ export const labels = defineMessages({
   bounceRate: { id: 'label.bounce-rate', defaultMessage: 'Bounce rate' },
   viewsPerVisit: { id: 'label.views-per-visit', defaultMessage: 'Views per visit' },
   visitDuration: { id: 'label.visit-duration', defaultMessage: 'Visit duration' },
-  sessionDuration: { id: 'label.session-duration', defaultMessage: 'Session duration' },
   desktop: { id: 'label.desktop', defaultMessage: 'Desktop' },
   laptop: { id: 'label.laptop', defaultMessage: 'Laptop' },
   tablet: { id: 'label.tablet', defaultMessage: 'Tablet' },
diff --git a/src/queries/analytics/events/getWebsiteEvents.ts b/src/queries/analytics/events/getWebsiteEvents.ts
index 8666816102..2fe2bda21f 100644
--- a/src/queries/analytics/events/getWebsiteEvents.ts
+++ b/src/queries/analytics/events/getWebsiteEvents.ts
@@ -14,10 +14,12 @@ export function getWebsiteEvents(
 
 async function relationalQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
   const { pagedQuery } = prisma;
+  const { query } = pageParams;
 
   const where = {
     ...filters,
     id: websiteId,
+    ...prisma.getSearchParameters(query, [{ eventName: 'contains' }, { urlPath: 'contains' }]),
   };
 
   return pagedQuery('website_event', { where }, pageParams);
@@ -47,7 +49,12 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
     where website_id = {websiteId:UUID}
     ${dateQuery}
     ${filterQuery}
-    ${query ? `and (positionCaseInsensitive(event_name, {query:String}) > 0)` : ''}
+    ${
+      query
+        ? `and (positionCaseInsensitive(event_name, {query:String}) > 0
+           or positionCaseInsensitive(url_path, {query:String}) > 0)`
+        : ''
+    }
     order by created_at desc
     `,
     { ...params, query },
diff --git a/src/queries/analytics/sessions/getWebsiteSessions.ts b/src/queries/analytics/sessions/getWebsiteSessions.ts
index 2b22a0c810..518769b03f 100644
--- a/src/queries/analytics/sessions/getWebsiteSessions.ts
+++ b/src/queries/analytics/sessions/getWebsiteSessions.ts
@@ -14,12 +14,10 @@ export async function getWebsiteSessions(
 
 async function relationalQuery(websiteId: string, filters: QueryFilters, pageParams: PageParams) {
   const { pagedQuery } = prisma;
-  const { query } = pageParams;
 
   const where = {
     ...filters,
     id: websiteId,
-    ...prisma.getSearchParameters(query, [{ eventName: 'contains' }, { urlPath: 'contains' }]),
   };
 
   return pagedQuery('session', { where }, pageParams);
@@ -28,7 +26,6 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
 async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
   const { pagedQuery, parseFilters } = clickhouse;
   const { params, dateQuery, filterQuery } = await parseFilters(websiteId, filters);
-  const { query } = pageParams;
 
   return pagedQuery(
     `
@@ -52,14 +49,22 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
     where website_id = {websiteId:UUID}
     ${dateQuery}
     ${filterQuery}
-    ${query ? `and (positionCaseInsensitive(event_name, {query:String}) > 0)` : ''}
     group by session_id, website_id, hostname, browser, os, device, screen, language, country, subdivision1, city
     order by lastAt desc
     `,
     params,
     pageParams,
-  ).then((result: any) => ({
-    ...result,
-    visits: Number(result.visits),
-  }));
+  ).then((result: any) => {
+    return {
+      ...result,
+      data: result.data.map((row: any) => {
+        return {
+          ...row,
+          createdAt: row.firstAt,
+          visits: Number(row.visits),
+          views: Number(row.views),
+        };
+      }),
+    };
+  });
 }

From b11b2e352432f1e6562bb6787f3dae0c58f73f7b Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Mon, 12 Aug 2024 23:54:21 -0700
Subject: [PATCH 266/438] Display correct date for events/sessions.

---
 package.json                                  |  1 +
 .../[websiteId]/events/EventsTable.tsx        | 13 ++++++++----
 .../[websiteId]/sessions/SessionsTable.tsx    | 13 ++++++++----
 src/lib/clickhouse.ts                         | 20 ++++++++++++-------
 .../analytics/events/getWebsiteEvents.ts      |  4 ++--
 yarn.lock                                     |  5 +++++
 6 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index af873918c3..dd43d88909 100644
--- a/package.json
+++ b/package.json
@@ -65,6 +65,7 @@
   ],
   "dependencies": {
     "@clickhouse/client": "^1.3.0",
+    "@date-fns/utc": "^1.2.0",
     "@dicebear/collection": "^9.2.1",
     "@dicebear/core": "^9.2.1",
     "@fontsource/inter": "^4.5.15",
diff --git a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx
index 261f8e4799..c09a797c17 100644
--- a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx
+++ b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx
@@ -1,13 +1,14 @@
 import { GridTable, GridColumn, Icon } from 'react-basics';
-import { useLocale, useMessages, useTeamUrl } from 'components/hooks';
+import { useLocale, useMessages, useTeamUrl, useTimezone } from 'components/hooks';
 import Empty from 'components/common/Empty';
 import Avatar from 'components/common/Avatar';
 import Link from 'next/link';
 import Icons from 'components/icons';
-import { formatDate } from 'lib/date';
+import { formatInTimeZone } from 'date-fns-tz';
 
 export function EventsTable({ data = [] }) {
-  const { locale } = useLocale();
+  const { dateLocale } = useLocale();
+  const { timezone } = useTimezone();
   const { formatMessage, labels } = useMessages();
   const { renderTeamUrl } = useTeamUrl();
 
@@ -36,7 +37,11 @@ export function EventsTable({ data = [] }) {
         }}
       </GridColumn>
       <GridColumn name="created" label={formatMessage(labels.created)} width={'300px'}>
-        {row => formatDate(new Date(row.createdAt), 'PPPpp', locale)}
+        {row =>
+          formatInTimeZone(new Date(row.createdAt.split(' ').join('T') + 'Z'), timezone, 'PPPpp', {
+            locale: dateLocale,
+          })
+        }
       </GridColumn>
     </GridTable>
   );
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
index ad4a8ac924..0f346f8b0c 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
@@ -1,13 +1,14 @@
 import Link from 'next/link';
 import { GridColumn, GridTable } from 'react-basics';
-import { useFormat, useLocale, useMessages } from 'components/hooks';
+import { useFormat, useLocale, useMessages, useTimezone } from 'components/hooks';
 import Avatar from 'components/common/Avatar';
 import styles from './SessionsTable.module.css';
-import { formatDate } from 'lib/date';
 import TypeIcon from 'components/common/TypeIcon';
+import { formatInTimeZone } from 'date-fns-tz';
 
 export function SessionsTable({ data = [] }: { data: any[]; showDomain?: boolean }) {
-  const { locale } = useLocale();
+  const { dateLocale } = useLocale();
+  const { timezone } = useTimezone();
   const { formatMessage, labels } = useMessages();
   const { formatValue } = useFormat();
 
@@ -52,7 +53,11 @@ export function SessionsTable({ data = [] }: { data: any[]; showDomain?: boolean
         )}
       </GridColumn>
       <GridColumn name="lastAt" label={formatMessage(labels.lastSeen)}>
-        {row => formatDate(new Date(row.lastAt), 'PPPpp', locale)}
+        {row =>
+          formatInTimeZone(new Date(row.createdAt.split(' ').join('T') + 'Z'), timezone, 'PPPpp', {
+            locale: dateLocale,
+          })
+        }
       </GridColumn>
     </GridTable>
   );
diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index c25eff4e53..bf3da950fb 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -9,12 +9,12 @@ import { filtersToArray } from './params';
 import { PageParams, QueryFilters, QueryOptions } from './types';
 
 export const CLICKHOUSE_DATE_FORMATS = {
-  second: '%Y-%m-%dT%H:%i:%S',
-  minute: '%Y-%m-%dT%H:%i:00',
-  hour: '%Y-%m-%dT%H:00:00',
-  day: '%Y-%m-%dT00:00:00',
-  month: '%Y-%m-01T00:00:00',
-  year: '%Y-01-01T00:00:00',
+  second: '%Y-%m-%d %H:%i:%S',
+  minute: '%Y-%m-%d %H:%i:00',
+  hour: '%Y-%m-%d %H:00:00',
+  day: '%Y-%m-%d',
+  month: '%Y-%m-01',
+  year: '%Y-01-01',
 };
 
 const log = debug('umami:clickhouse');
@@ -101,12 +101,18 @@ function getFilterQuery(filters: QueryFilters = {}, options: QueryOptions = {})
 }
 
 function getDateQuery(filters: QueryFilters = {}) {
-  const { startDate, endDate } = filters;
+  const { startDate, endDate, timezone } = filters;
 
   if (startDate) {
     if (endDate) {
+      if (timezone) {
+        return `and created_at between toTimezone({startDate:DateTime64},{timezone:String}) and toTimezone({endDate:DateTime64},{timezone:String})`;
+      }
       return `and created_at between {startDate:DateTime64} and {endDate:DateTime64}`;
     } else {
+      if (timezone) {
+        return `and created_at >= toTimezone({startDate:DateTime64},{timezone:String})`;
+      }
       return `and created_at >= {startDate:DateTime64}`;
     }
   }
diff --git a/src/queries/analytics/events/getWebsiteEvents.ts b/src/queries/analytics/events/getWebsiteEvents.ts
index 2fe2bda21f..296602ea49 100644
--- a/src/queries/analytics/events/getWebsiteEvents.ts
+++ b/src/queries/analytics/events/getWebsiteEvents.ts
@@ -26,7 +26,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
 }
 
 async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
-  const { pagedQuery, parseFilters, getDateStringSQL } = clickhouse;
+  const { pagedQuery, parseFilters } = clickhouse;
   const { params, dateQuery, filterQuery } = await parseFilters(websiteId, filters);
   const { query } = pageParams;
 
@@ -36,7 +36,7 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
       event_id as id,
       website_id as websiteId, 
       session_id as sessionId,
-      ${getDateStringSQL('created_at', 'second', filters.timezone)} as createdAt,
+      created_at as createdAt,
       url_path as urlPath,
       url_query as urlQuery,
       referrer_path as referrerPath,
diff --git a/yarn.lock b/yarn.lock
index 9cfe709f93..e7456af739 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1381,6 +1381,11 @@
     debug "^3.1.0"
     lodash.once "^4.1.1"
 
+"@date-fns/utc@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@date-fns/utc/-/utc-1.2.0.tgz#fb705b025b6769840608782c8fa7f3919d1b3337"
+  integrity sha512-YLq+crMPJiBmIdkRmv9nZuZy1mVtMlDcUKlg4mvI0UsC/dZeIaGoGB5p/C4FrpeOhZ7zBTK03T58S0DFkRNMnw==
+
 "@dicebear/adventurer-neutral@9.2.1":
   version "9.2.1"
   resolved "https://registry.yarnpkg.com/@dicebear/adventurer-neutral/-/adventurer-neutral-9.2.1.tgz#0416ff71d0dd3ff391db9c9fda2acb166b074c5f"

From 9b005e11c068268030e5bd88b5939bcf4b7bd9cb Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 13 Aug 2024 00:40:19 -0700
Subject: [PATCH 267/438] Created formatDate function for rendering dates in
 correct timezone.

---
 .../websites/[websiteId]/events/EventsTable.tsx      | 12 +++---------
 .../websites/[websiteId]/sessions/SessionsTable.tsx  | 12 +++---------
 src/components/hooks/useTimezone.ts                  |  7 ++++++-
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx
index c09a797c17..4100202b36 100644
--- a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx
+++ b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx
@@ -1,14 +1,12 @@
 import { GridTable, GridColumn, Icon } from 'react-basics';
-import { useLocale, useMessages, useTeamUrl, useTimezone } from 'components/hooks';
+import { useMessages, useTeamUrl, useTimezone } from 'components/hooks';
 import Empty from 'components/common/Empty';
 import Avatar from 'components/common/Avatar';
 import Link from 'next/link';
 import Icons from 'components/icons';
-import { formatInTimeZone } from 'date-fns-tz';
 
 export function EventsTable({ data = [] }) {
-  const { dateLocale } = useLocale();
-  const { timezone } = useTimezone();
+  const { formatDate } = useTimezone();
   const { formatMessage, labels } = useMessages();
   const { renderTeamUrl } = useTeamUrl();
 
@@ -37,11 +35,7 @@ export function EventsTable({ data = [] }) {
         }}
       </GridColumn>
       <GridColumn name="created" label={formatMessage(labels.created)} width={'300px'}>
-        {row =>
-          formatInTimeZone(new Date(row.createdAt.split(' ').join('T') + 'Z'), timezone, 'PPPpp', {
-            locale: dateLocale,
-          })
-        }
+        {row => formatDate(row.createdAt, 'PPPpp')}
       </GridColumn>
     </GridTable>
   );
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
index 0f346f8b0c..e266885642 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
@@ -1,14 +1,12 @@
 import Link from 'next/link';
 import { GridColumn, GridTable } from 'react-basics';
-import { useFormat, useLocale, useMessages, useTimezone } from 'components/hooks';
+import { useFormat, useMessages, useTimezone } from 'components/hooks';
 import Avatar from 'components/common/Avatar';
 import styles from './SessionsTable.module.css';
 import TypeIcon from 'components/common/TypeIcon';
-import { formatInTimeZone } from 'date-fns-tz';
 
 export function SessionsTable({ data = [] }: { data: any[]; showDomain?: boolean }) {
-  const { dateLocale } = useLocale();
-  const { timezone } = useTimezone();
+  const { formatDate } = useTimezone();
   const { formatMessage, labels } = useMessages();
   const { formatValue } = useFormat();
 
@@ -53,11 +51,7 @@ export function SessionsTable({ data = [] }: { data: any[]; showDomain?: boolean
         )}
       </GridColumn>
       <GridColumn name="lastAt" label={formatMessage(labels.lastSeen)}>
-        {row =>
-          formatInTimeZone(new Date(row.createdAt.split(' ').join('T') + 'Z'), timezone, 'PPPpp', {
-            locale: dateLocale,
-          })
-        }
+        {row => formatDate(row.createdAt, 'PPPpp')}
       </GridColumn>
     </GridTable>
   );
diff --git a/src/components/hooks/useTimezone.ts b/src/components/hooks/useTimezone.ts
index 8bd76504bf..067441f57c 100644
--- a/src/components/hooks/useTimezone.ts
+++ b/src/components/hooks/useTimezone.ts
@@ -1,5 +1,6 @@
 import { setItem } from 'next-basics';
 import { TIMEZONE_CONFIG } from 'lib/constants';
+import { formatInTimeZone } from 'date-fns-tz';
 import useStore, { setTimezone } from 'store/app';
 
 const selector = (state: { timezone: string }) => state.timezone;
@@ -12,7 +13,11 @@ export function useTimezone() {
     setTimezone(value);
   };
 
-  return { timezone, saveTimezone };
+  const formatDate = (date: string, pattern: string) => {
+    return formatInTimeZone(date.split(' ').join('T') + 'Z', timezone, pattern);
+  };
+
+  return { timezone, saveTimezone, formatDate };
 }
 
 export default useTimezone;

From af646029514572ca4ed63570c55bf6de8fa2a991 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 13 Aug 2024 00:56:41 -0700
Subject: [PATCH 268/438] Added map to sessions page.

---
 .../(main)/websites/[websiteId]/sessions/SessionsPage.tsx | 5 +++++
 src/components/hooks/useTimezone.ts                       | 8 +++++++-
 src/components/metrics/WorldMap.tsx                       | 6 ++++--
 src/queries/analytics/sessions/getWebsiteSessions.ts      | 2 +-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx
index afb1873507..ed02b2a86d 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx
@@ -2,12 +2,17 @@
 import WebsiteHeader from '../WebsiteHeader';
 import SessionsDataTable from './SessionsDataTable';
 import SessionsMetricsBar from './SessionsMetricsBar';
+import WorldMap from 'components/metrics/WorldMap';
+import { GridRow } from 'components/layout/Grid';
 
 export function SessionsPage({ websiteId }) {
   return (
     <>
       <WebsiteHeader websiteId={websiteId} />
       <SessionsMetricsBar websiteId={websiteId} />
+      <GridRow columns="one">
+        <WorldMap websiteId={websiteId} style={{ width: 800, margin: '0 auto' }} />
+      </GridRow>
       <SessionsDataTable websiteId={websiteId} />
     </>
   );
diff --git a/src/components/hooks/useTimezone.ts b/src/components/hooks/useTimezone.ts
index 067441f57c..b5e58ea923 100644
--- a/src/components/hooks/useTimezone.ts
+++ b/src/components/hooks/useTimezone.ts
@@ -14,7 +14,13 @@ export function useTimezone() {
   };
 
   const formatDate = (date: string, pattern: string) => {
-    return formatInTimeZone(date.split(' ').join('T') + 'Z', timezone, pattern);
+    return formatInTimeZone(
+      /^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$/.test(date)
+        ? date
+        : date.split(' ').join('T') + 'Z',
+      timezone,
+      pattern,
+    );
   };
 
   return { timezone, saveTimezone, formatDate };
diff --git a/src/components/metrics/WorldMap.tsx b/src/components/metrics/WorldMap.tsx
index 5cebd428d3..4a16f98f77 100644
--- a/src/components/metrics/WorldMap.tsx
+++ b/src/components/metrics/WorldMap.tsx
@@ -1,4 +1,4 @@
-import { useState, useMemo } from 'react';
+import { useState, useMemo, HTMLAttributes } from 'react';
 import { ComposableMap, Geographies, Geography, ZoomableGroup } from 'react-simple-maps';
 import classNames from 'classnames';
 import { colord } from 'colord';
@@ -16,11 +16,12 @@ export function WorldMap({
   websiteId,
   data,
   className,
+  ...props
 }: {
   websiteId?: string;
   data?: any[];
   className?: string;
-}) {
+} & HTMLAttributes<HTMLDivElement>) {
   const [tooltip, setTooltipPopup] = useState();
   const { theme, colors } = useTheme();
   const { locale } = useLocale();
@@ -67,6 +68,7 @@ export function WorldMap({
 
   return (
     <div
+      {...props}
       className={classNames(styles.container, className)}
       data-tip=""
       data-for="world-map-tooltip"
diff --git a/src/queries/analytics/sessions/getWebsiteSessions.ts b/src/queries/analytics/sessions/getWebsiteSessions.ts
index 518769b03f..5513e4380d 100644
--- a/src/queries/analytics/sessions/getWebsiteSessions.ts
+++ b/src/queries/analytics/sessions/getWebsiteSessions.ts
@@ -60,7 +60,7 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
       data: result.data.map((row: any) => {
         return {
           ...row,
-          createdAt: row.firstAt,
+          createdAt: row.lastAt,
           visits: Number(row.visits),
           views: Number(row.views),
         };

From fc758745dc30bf87b9bc364e8dda94ac734074ba Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 13 Aug 2024 01:04:28 -0700
Subject: [PATCH 269/438] Fixed date display for session profile.

---
 .../sessions/[sessionId]/SessionActivity.tsx          | 11 ++++-------
 .../[websiteId]/sessions/[sessionId]/SessionInfo.tsx  |  8 ++++----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
index 69407584e7..def3f0ba02 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
@@ -1,8 +1,7 @@
-import { formatDate } from 'lib/date';
 import { isSameDay } from 'date-fns';
 import { Loading, Icon, StatusLight } from 'react-basics';
 import Icons from 'components/icons';
-import { useLocale, useSessionActivity } from 'components/hooks';
+import { useSessionActivity, useTimezone } from 'components/hooks';
 import styles from './SessionActivity.module.css';
 
 export function SessionActivity({
@@ -16,7 +15,7 @@ export function SessionActivity({
   startDate: string;
   endDate: string;
 }) {
-  const { locale } = useLocale();
+  const { formatDate } = useTimezone();
   const { data, isLoading } = useSessionActivity(websiteId, sessionId, startDate, endDate);
 
   if (isLoading) {
@@ -34,14 +33,12 @@ export function SessionActivity({
         return (
           <>
             {showHeader && (
-              <div className={styles.header}>
-                {formatDate(new Date(createdAt), 'EEEE, PPP', locale)}
-              </div>
+              <div className={styles.header}>{formatDate(createdAt, 'EEEE, PPP')}</div>
             )}
             <div key={eventId} className={styles.row}>
               <div className={styles.time}>
                 <StatusLight color={`#${visitId?.substring(0, 6)}`}>
-                  {formatDate(new Date(createdAt), 'h:mm:ss aaa', locale)}
+                  {formatDate(createdAt, 'h:mm:ss aaa')}
                 </StatusLight>
               </div>
               <Icon>{eventName ? <Icons.Bolt /> : <Icons.Eye />}</Icon>
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx
index 4b3e8a06d6..641d2941b0 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx
@@ -1,5 +1,4 @@
-import { formatDate } from 'lib/date';
-import { useFormat, useLocale, useMessages, useRegionNames } from 'components/hooks';
+import { useFormat, useLocale, useMessages, useRegionNames, useTimezone } from 'components/hooks';
 import TypeIcon from 'components/common/TypeIcon';
 import { Icon, CopyIcon } from 'react-basics';
 import Icons from 'components/icons';
@@ -7,6 +6,7 @@ import styles from './SessionInfo.module.css';
 
 export default function SessionInfo({ data }) {
   const { locale } = useLocale();
+  const { formatDate } = useTimezone();
   const { formatMessage, labels } = useMessages();
   const { formatValue } = useFormat();
   const { getRegionName } = useRegionNames(locale);
@@ -20,10 +20,10 @@ export default function SessionInfo({ data }) {
         </dd>
 
         <dt>{formatMessage(labels.lastSeen)}</dt>
-        <dd>{formatDate(new Date(data?.lastAt), 'EEEE, PPPpp', locale)}</dd>
+        <dd>{formatDate(data?.lastAt, 'EEEE, PPPpp')}</dd>
 
         <dt>{formatMessage(labels.firstSeen)}</dt>
-        <dd>{formatDate(new Date(data?.firstAt), 'EEEE, PPPpp', locale)}</dd>
+        <dd>{formatDate(data?.firstAt, 'EEEE, PPPpp')}</dd>
 
         <dt>{formatMessage(labels.country)}</dt>
         <dd>

From f9c7129a3e279ee6167fc6ebe19c7fd3fda4bc9e Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 13 Aug 2024 08:45:52 -0700
Subject: [PATCH 270/438] implement visit duration

---
 .../sessions/[sessionId]/SessionStats.tsx     |  6 +++
 .../analytics/sessions/getWebsiteSession.ts   | 38 ++++++++++++++-----
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionStats.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionStats.tsx
index 3265e59241..ea606582f0 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionStats.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionStats.tsx
@@ -1,6 +1,7 @@
 import { useMessages } from 'components/hooks';
 import MetricCard from 'components/metrics/MetricCard';
 import MetricsBar from 'components/metrics/MetricsBar';
+import { formatShortTime } from 'lib/format';
 
 export function SessionStats({ data }) {
   const { formatMessage, labels } = useMessages();
@@ -10,6 +11,11 @@ export function SessionStats({ data }) {
       <MetricCard label={formatMessage(labels.visits)} value={data?.visits} />
       <MetricCard label={formatMessage(labels.views)} value={data?.views} />
       <MetricCard label={formatMessage(labels.events)} value={data?.events} />
+      <MetricCard
+        label={formatMessage(labels.visitDuration)}
+        value={data?.totaltime / data?.visits}
+        formatValue={n => `${+n < 0 ? '-' : ''}${formatShortTime(Math.abs(~~n), ['m', 's'], ' ')}`}
+      />
     </MetricsBar>
   );
 }
diff --git a/src/queries/analytics/sessions/getWebsiteSession.ts b/src/queries/analytics/sessions/getWebsiteSession.ts
index ca527dba86..22c186420a 100644
--- a/src/queries/analytics/sessions/getWebsiteSession.ts
+++ b/src/queries/analytics/sessions/getWebsiteSession.ts
@@ -23,9 +23,8 @@ async function clickhouseQuery(websiteId: string, sessionId: string) {
 
   return rawQuery(
     `
-    select
-      session_id as id,
-      website_id as websiteId,
+    select id,
+      websiteId,
       hostname,
       browser,
       os,
@@ -37,13 +36,32 @@ async function clickhouseQuery(websiteId: string, sessionId: string) {
       city,
       min(min_time) as firstAt,
       max(max_time) as lastAt,
-      uniq(visit_id) as visits,
-      sumIf(views, event_type = 1) as views,
-      length(groupArrayArray(event_name)) as events
-    from website_event_stats_hourly
-    where website_id = {websiteId:UUID}
-      and session_id = {sessionId:UUID}
-    group by session_id, website_id, hostname, browser, os, device, screen, language, country, subdivision1, city;
+      uniq(visit_id) visits,
+      sum(views) as views,
+      sum(events) as events,
+      sum(max_time-min_time) as totaltime
+    from (select
+              session_id as id,
+              visit_id,
+              website_id as websiteId,
+              hostname,
+              browser,
+              os,
+              device,
+              screen,
+              language,
+              country,
+              subdivision1,
+              city,
+              min(min_time) as min_time,
+              max(max_time) as max_time,
+              sum(views) as views,
+              length(groupArrayArray(event_name)) as events
+        from website_event_stats_hourly
+        where website_id = {websiteId:UUID}
+          and session_id = {sessionId:UUID}
+        group by session_id, visit_id, website_id, hostname, browser, os, device, screen, language, country, subdivision1, city) t
+    group by id, websiteId, hostname, browser, os, device, screen, language, country, subdivision1, city;
     `,
     { websiteId, sessionId },
   ).then(result => result?.[0]);

From ae3888ced83d739d501b68f7412ad7b9bd3f8f52 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 13 Aug 2024 09:21:20 -0700
Subject: [PATCH 271/438] fix loading spinner / no results bug

---
 src/components/common/DataTable.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/common/DataTable.tsx b/src/components/common/DataTable.tsx
index 775e123c8c..c3bab88ff4 100644
--- a/src/components/common/DataTable.tsx
+++ b/src/components/common/DataTable.tsx
@@ -68,7 +68,7 @@ export function DataTable({
         {hasData ? (typeof children === 'function' ? children(result) : children) : null}
         {isLoading && <Loading position="page" />}
         {!isLoading && !hasData && !query && <Empty />}
-        {noResults && <Empty message={formatMessage(messages.noResultsFound)} />}
+        {!isLoading && noResults && <Empty message={formatMessage(messages.noResultsFound)} />}
       </div>
       {allowPaging && hasData && (
         <Pager

From 7ae53e2650a40354e1d7ecec1f28ea264cd6fd39 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 13 Aug 2024 10:11:12 -0700
Subject: [PATCH 272/438] fix event property format, fix realtime date format

---
 .../[websiteId]/realtime/RealtimeLog.tsx      | 20 +++++++++----------
 .../analytics/events/getEventDataValues.ts    | 10 ++++++----
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
index b1836d4f1d..8bae2c17bd 100644
--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
@@ -1,17 +1,16 @@
-import { useContext, useMemo, useState } from 'react';
-import { StatusLight, Icon, Text, SearchField } from 'react-basics';
-import { FixedSizeList } from 'react-window';
-import { format } from 'date-fns';
-import thenby from 'thenby';
-import { safeDecodeURI } from 'next-basics';
-import FilterButtons from 'components/common/FilterButtons';
+import useFormat from 'components//hooks/useFormat';
 import Empty from 'components/common/Empty';
-import { useLocale, useCountryNames, useMessages } from 'components/hooks';
+import FilterButtons from 'components/common/FilterButtons';
+import { useCountryNames, useLocale, useMessages, useTimezone } from 'components/hooks';
 import Icons from 'components/icons';
-import useFormat from 'components//hooks/useFormat';
 import { BROWSERS } from 'lib/constants';
 import { stringToColor } from 'lib/format';
 import { RealtimeData } from 'lib/types';
+import { safeDecodeURI } from 'next-basics';
+import { useContext, useMemo, useState } from 'react';
+import { Icon, SearchField, StatusLight, Text } from 'react-basics';
+import { FixedSizeList } from 'react-window';
+import thenby from 'thenby';
 import { WebsiteContext } from '../WebsiteProvider';
 import styles from './RealtimeLog.module.css';
 
@@ -32,6 +31,7 @@ export function RealtimeLog({ data }: { data: RealtimeData }) {
   const { formatMessage, labels, messages, FormattedMessage } = useMessages();
   const { formatValue } = useFormat();
   const { locale } = useLocale();
+  const { formatDate } = useTimezone();
   const { countryNames } = useCountryNames(locale);
   const [filter, setFilter] = useState(TYPE_ALL);
 
@@ -54,7 +54,7 @@ export function RealtimeLog({ data }: { data: RealtimeData }) {
     },
   ];
 
-  const getTime = ({ createdAt, firstAt }) => format(new Date(firstAt || createdAt), 'h:mm:ss');
+  const getTime = ({ createdAt, firstAt }) => formatDate(firstAt || createdAt, 'h:mm:ss');
 
   const getColor = ({ id, sessionId }) => stringToColor(sessionId || id);
 
diff --git a/src/queries/analytics/events/getEventDataValues.ts b/src/queries/analytics/events/getEventDataValues.ts
index abf2efc0c9..d7754ad2a5 100644
--- a/src/queries/analytics/events/getEventDataValues.ts
+++ b/src/queries/analytics/events/getEventDataValues.ts
@@ -47,16 +47,18 @@ async function clickhouseQuery(
   return rawQuery(
     `
     select
-      string_value as "value",
+      multiIf(data_type = 2, replaceAll(string_value, '.0000', ''),
+              data_type = 4, toString(date_trunc('hour', date_value)),
+              string_value) as "value",
       count(*) as "total"
-    from event_data
+    from umami.event_data
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}
       and data_key = {propertyName:String}
     ${filterQuery}
-    group by string_value
+    group by value
     order by 2 desc
-    limit 500
+    limit 500;
     `,
     params,
   ).then(result => {

From 3805a0b43149df8b5c133189787c98b709eb9c3d Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 13 Aug 2024 10:49:04 -0700
Subject: [PATCH 273/438] limit event/session table to 1000 for performance

---
 src/queries/analytics/events/getWebsiteEvents.ts     | 3 +++
 src/queries/analytics/sessions/getWebsiteSessions.ts | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/queries/analytics/events/getWebsiteEvents.ts b/src/queries/analytics/events/getWebsiteEvents.ts
index 296602ea49..9304d69e88 100644
--- a/src/queries/analytics/events/getWebsiteEvents.ts
+++ b/src/queries/analytics/events/getWebsiteEvents.ts
@@ -32,6 +32,7 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
 
   return pagedQuery(
     `
+    with events as (
     select
       event_id as id,
       website_id as websiteId, 
@@ -56,6 +57,8 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
         : ''
     }
     order by created_at desc
+    limit 1000)
+    select * from events
     `,
     { ...params, query },
     pageParams,
diff --git a/src/queries/analytics/sessions/getWebsiteSessions.ts b/src/queries/analytics/sessions/getWebsiteSessions.ts
index 5513e4380d..60f30b6b9e 100644
--- a/src/queries/analytics/sessions/getWebsiteSessions.ts
+++ b/src/queries/analytics/sessions/getWebsiteSessions.ts
@@ -29,6 +29,7 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
 
   return pagedQuery(
     `
+    with sessions as (
     select
       session_id as id,
       website_id as websiteId,
@@ -51,6 +52,8 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
     ${filterQuery}
     group by session_id, website_id, hostname, browser, os, device, screen, language, country, subdivision1, city
     order by lastAt desc
+    limit 1000)
+    select * from sessions
     `,
     params,
     pageParams,

From 0bd57bb158d14ca8080133bfc3cec7e2884cd6d2 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 13 Aug 2024 21:42:20 -0700
Subject: [PATCH 274/438] Added display of session properties.

---
 .../sessions/SessionProperties.module.css     | 25 +++++++
 .../sessions/SessionProperties.tsx            | 52 +++++++++++++
 .../[websiteId]/sessions/SessionsPage.tsx     | 14 +++-
 src/components/hooks/index.ts                 |  2 +
 .../hooks/queries/useSessionDataProperties.ts | 20 +++++
 .../hooks/queries/useSessionDataValues.ts     | 21 ++++++
 .../[websiteId]/session-data/properties.ts    | 49 ++++++++++++
 .../[websiteId]/session-data/values.ts        | 50 +++++++++++++
 .../sessions/getSessionDataProperties.ts      | 74 +++++++++++++++++++
 .../sessions/getSessionDataValues.ts          | 72 ++++++++++++++++++
 10 files changed, 378 insertions(+), 1 deletion(-)
 create mode 100644 src/app/(main)/websites/[websiteId]/sessions/SessionProperties.module.css
 create mode 100644 src/app/(main)/websites/[websiteId]/sessions/SessionProperties.tsx
 create mode 100644 src/components/hooks/queries/useSessionDataProperties.ts
 create mode 100644 src/components/hooks/queries/useSessionDataValues.ts
 create mode 100644 src/pages/api/websites/[websiteId]/session-data/properties.ts
 create mode 100644 src/pages/api/websites/[websiteId]/session-data/values.ts
 create mode 100644 src/queries/analytics/sessions/getSessionDataProperties.ts
 create mode 100644 src/queries/analytics/sessions/getSessionDataValues.ts

diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.module.css b/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.module.css
new file mode 100644
index 0000000000..4f6a65ec9a
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.module.css
@@ -0,0 +1,25 @@
+.container {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(420px, 1fr));
+  gap: 60px;
+  margin-bottom: 40px;
+}
+
+.table {
+  align-self: start;
+}
+
+.link:hover {
+  cursor: pointer;
+  color: var(--primary400);
+}
+
+.title {
+  text-align: center;
+  font-weight: bold;
+  margin: 20px 0;
+}
+
+.chart {
+  min-height: 620px;
+}
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.tsx
new file mode 100644
index 0000000000..49b63e7489
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.tsx
@@ -0,0 +1,52 @@
+import { GridColumn, GridTable } from 'react-basics';
+import { useSessionDataProperties, useSessionDataValues, useMessages } from 'components/hooks';
+import { LoadingPanel } from 'components/common/LoadingPanel';
+import PieChart from 'components/charts/PieChart';
+import { useState } from 'react';
+import { CHART_COLORS } from 'lib/constants';
+import styles from './SessionProperties.module.css';
+
+export function SessionProperties({ websiteId }: { websiteId: string }) {
+  const [propertyName, setPropertyName] = useState('');
+  const { formatMessage, labels } = useMessages();
+  const { data, isLoading, isFetched, error } = useSessionDataProperties(websiteId);
+  const { data: values } = useSessionDataValues(websiteId, propertyName);
+  const chartData =
+    propertyName && values
+      ? {
+          labels: values.map(({ value }) => value),
+          datasets: [
+            {
+              data: values.map(({ total }) => total),
+              backgroundColor: CHART_COLORS,
+              borderWidth: 0,
+            },
+          ],
+        }
+      : null;
+
+  return (
+    <LoadingPanel isLoading={isLoading} isFetched={isFetched} data={data} error={error}>
+      <div className={styles.container}>
+        <GridTable data={data} cardMode={false} className={styles.table}>
+          <GridColumn name="propertyName" label={formatMessage(labels.property)}>
+            {row => (
+              <div className={styles.link} onClick={() => setPropertyName(row.propertyName)}>
+                {row.propertyName}
+              </div>
+            )}
+          </GridColumn>
+          <GridColumn name="total" label={formatMessage(labels.count)} alignment="end" />
+        </GridTable>
+        {propertyName && (
+          <div className={styles.chart}>
+            <div className={styles.title}>{propertyName}</div>
+            <PieChart key={propertyName} type="doughnut" data={chartData} />
+          </div>
+        )}
+      </div>
+    </LoadingPanel>
+  );
+}
+
+export default SessionProperties;
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx
index ed02b2a86d..1b3ba6dd4e 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx
@@ -2,10 +2,17 @@
 import WebsiteHeader from '../WebsiteHeader';
 import SessionsDataTable from './SessionsDataTable';
 import SessionsMetricsBar from './SessionsMetricsBar';
+import SessionProperties from './SessionProperties';
 import WorldMap from 'components/metrics/WorldMap';
 import { GridRow } from 'components/layout/Grid';
+import { Item, Tabs } from 'react-basics';
+import { useState } from 'react';
+import { useMessages } from 'components/hooks';
 
 export function SessionsPage({ websiteId }) {
+  const [tab, setTab] = useState('activity');
+  const { formatMessage, labels } = useMessages();
+
   return (
     <>
       <WebsiteHeader websiteId={websiteId} />
@@ -13,7 +20,12 @@ export function SessionsPage({ websiteId }) {
       <GridRow columns="one">
         <WorldMap websiteId={websiteId} style={{ width: 800, margin: '0 auto' }} />
       </GridRow>
-      <SessionsDataTable websiteId={websiteId} />
+      <Tabs selectedKey={tab} onSelect={(value: any) => setTab(value)} style={{ marginBottom: 30 }}>
+        <Item key="activity">{formatMessage(labels.activity)}</Item>
+        <Item key="properties">{formatMessage(labels.properties)}</Item>
+      </Tabs>
+      {tab === 'activity' && <SessionsDataTable websiteId={websiteId} />}
+      {tab === 'properties' && <SessionProperties websiteId={websiteId} />}
     </>
   );
 }
diff --git a/src/components/hooks/index.ts b/src/components/hooks/index.ts
index 42cac81a65..4e9c49d693 100644
--- a/src/components/hooks/index.ts
+++ b/src/components/hooks/index.ts
@@ -10,6 +10,8 @@ export * from './queries/useReport';
 export * from './queries/useReports';
 export * from './queries/useSessionActivity';
 export * from './queries/useSessionData';
+export * from './queries/useSessionDataProperties';
+export * from './queries/useSessionDataValues';
 export * from './queries/useWebsiteSession';
 export * from './queries/useWebsiteSessions';
 export * from './queries/useShareToken';
diff --git a/src/components/hooks/queries/useSessionDataProperties.ts b/src/components/hooks/queries/useSessionDataProperties.ts
new file mode 100644
index 0000000000..459dccd6a8
--- /dev/null
+++ b/src/components/hooks/queries/useSessionDataProperties.ts
@@ -0,0 +1,20 @@
+import useApi from './useApi';
+import { UseQueryOptions } from '@tanstack/react-query';
+import { useFilterParams } from '../useFilterParams';
+
+export function useSessionDataProperties(
+  websiteId: string,
+  options?: Omit<UseQueryOptions, 'queryKey' | 'queryFn'>,
+) {
+  const { get, useQuery } = useApi();
+  const params = useFilterParams(websiteId);
+
+  return useQuery<any>({
+    queryKey: ['websites:event-data:properties', { websiteId, ...params }],
+    queryFn: () => get(`/websites/${websiteId}/session-data/properties`, { ...params }),
+    enabled: !!websiteId,
+    ...options,
+  });
+}
+
+export default useSessionDataProperties;
diff --git a/src/components/hooks/queries/useSessionDataValues.ts b/src/components/hooks/queries/useSessionDataValues.ts
new file mode 100644
index 0000000000..5230017736
--- /dev/null
+++ b/src/components/hooks/queries/useSessionDataValues.ts
@@ -0,0 +1,21 @@
+import useApi from './useApi';
+import { UseQueryOptions } from '@tanstack/react-query';
+import { useFilterParams } from '../useFilterParams';
+
+export function useSessionDataValues(
+  websiteId: string,
+  propertyName: string,
+  options?: Omit<UseQueryOptions, 'queryKey' | 'queryFn'>,
+) {
+  const { get, useQuery } = useApi();
+  const params = useFilterParams(websiteId);
+
+  return useQuery<any>({
+    queryKey: ['websites:event-data:values', { websiteId, propertyName, ...params }],
+    queryFn: () => get(`/websites/${websiteId}/session-data/values`, { ...params, propertyName }),
+    enabled: !!(websiteId && propertyName),
+    ...options,
+  });
+}
+
+export default useSessionDataValues;
diff --git a/src/pages/api/websites/[websiteId]/session-data/properties.ts b/src/pages/api/websites/[websiteId]/session-data/properties.ts
new file mode 100644
index 0000000000..19e9bbb892
--- /dev/null
+++ b/src/pages/api/websites/[websiteId]/session-data/properties.ts
@@ -0,0 +1,49 @@
+import { canViewWebsite } from 'lib/auth';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getEventDataProperties } from 'queries';
+import * as yup from 'yup';
+
+export interface EventDataFieldsRequestQuery {
+  websiteId: string;
+  startAt: string;
+  endAt: string;
+  propertyName?: string;
+}
+
+const schema = {
+  GET: yup.object().shape({
+    websiteId: yup.string().uuid().required(),
+    startAt: yup.number().integer().required(),
+    endAt: yup.number().integer().min(yup.ref('startAt')).required(),
+    propertyName: yup.string(),
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<EventDataFieldsRequestQuery>,
+  res: NextApiResponse<any>,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  if (req.method === 'GET') {
+    const { websiteId, startAt, endAt, propertyName } = req.query;
+
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const startDate = new Date(+startAt);
+    const endDate = new Date(+endAt);
+
+    const data = await getEventDataProperties(websiteId, { startDate, endDate, propertyName });
+
+    return ok(res, data);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/src/pages/api/websites/[websiteId]/session-data/values.ts b/src/pages/api/websites/[websiteId]/session-data/values.ts
new file mode 100644
index 0000000000..b9ada96df5
--- /dev/null
+++ b/src/pages/api/websites/[websiteId]/session-data/values.ts
@@ -0,0 +1,50 @@
+import { canViewWebsite } from 'lib/auth';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getEventDataValues } from 'queries';
+
+import * as yup from 'yup';
+
+export interface EventDataFieldsRequestQuery {
+  websiteId: string;
+  startAt: string;
+  endAt: string;
+  propertyName?: string;
+}
+
+const schema = {
+  GET: yup.object().shape({
+    websiteId: yup.string().uuid().required(),
+    startAt: yup.number().integer().required(),
+    endAt: yup.number().integer().min(yup.ref('startAt')).required(),
+    propertyName: yup.string(),
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<EventDataFieldsRequestQuery>,
+  res: NextApiResponse<any>,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  if (req.method === 'GET') {
+    const { websiteId, startAt, endAt, propertyName } = req.query;
+
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const startDate = new Date(+startAt);
+    const endDate = new Date(+endAt);
+
+    const data = await getEventDataValues(websiteId, { startDate, endDate, propertyName });
+
+    return ok(res, data);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/src/queries/analytics/sessions/getSessionDataProperties.ts b/src/queries/analytics/sessions/getSessionDataProperties.ts
new file mode 100644
index 0000000000..0f45e1404a
--- /dev/null
+++ b/src/queries/analytics/sessions/getSessionDataProperties.ts
@@ -0,0 +1,74 @@
+import prisma from 'lib/prisma';
+import clickhouse from 'lib/clickhouse';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import { QueryFilters, WebsiteEventData } from 'lib/types';
+
+export async function getSessionDataProperties(
+  ...args: [websiteId: string, filters: QueryFilters & { propertyName?: string }]
+): Promise<WebsiteEventData[]> {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(
+  websiteId: string,
+  filters: QueryFilters & { propertyName?: string },
+) {
+  const { rawQuery, parseFilters } = prisma;
+  const { filterQuery, params } = await parseFilters(websiteId, filters, {
+    columns: { propertyName: 'data_key' },
+  });
+
+  return rawQuery(
+    `
+    select
+      data_key as "propertyName",
+      count(*) as "total"
+    from session_data
+    where website_id = {{websiteId::uuid}}
+      and created_at between {{startDate}} and {{endDate}}
+    ${filterQuery}
+    group by data_key
+    order by 2 desc
+    limit 500
+    `,
+    params,
+  );
+}
+
+async function clickhouseQuery(
+  websiteId: string,
+  filters: QueryFilters & { propertyName?: string },
+): Promise<{ propertyName: string; dataType: number; propertyValue: string; total: number }[]> {
+  const { rawQuery, parseFilters } = clickhouse;
+  const { filterQuery, params } = await parseFilters(websiteId, filters, {
+    columns: { propertyName: 'data_key' },
+  });
+
+  return rawQuery(
+    `
+    select
+      data_key as propertyName,
+      count(*) as total
+    from session_data
+    where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+    ${filterQuery}
+    group by data_key
+    order by 2 desc
+    limit 500
+    `,
+    params,
+  ).then(result => {
+    return Object.values(result).map((a: any) => {
+      return {
+        propertyName: a.propertyName,
+        dataType: Number(a.dataType),
+        propertyValue: a.propertyValue,
+        total: Number(a.total),
+      };
+    });
+  });
+}
diff --git a/src/queries/analytics/sessions/getSessionDataValues.ts b/src/queries/analytics/sessions/getSessionDataValues.ts
new file mode 100644
index 0000000000..a018dfa0e7
--- /dev/null
+++ b/src/queries/analytics/sessions/getSessionDataValues.ts
@@ -0,0 +1,72 @@
+import prisma from 'lib/prisma';
+import clickhouse from 'lib/clickhouse';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import { QueryFilters, WebsiteEventData } from 'lib/types';
+
+export async function getSessionDataValues(
+  ...args: [websiteId: string, filters: QueryFilters & { propertyName?: string }]
+): Promise<WebsiteEventData[]> {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(
+  websiteId: string,
+  filters: QueryFilters & { propertyName?: string },
+) {
+  const { rawQuery, parseFilters } = prisma;
+  const { filterQuery, params } = await parseFilters(websiteId, filters);
+
+  return rawQuery(
+    `
+    select
+      string_value as "value",
+      count(*) as "total"
+    from session_data
+    where website_id = {{websiteId::uuid}}
+      and created_at between {{startDate}} and {{endDate}}
+      and data_key = {{propertyName}}
+    ${filterQuery}
+    group by string_value
+    order by 2 desc
+    limit 500
+    `,
+    params,
+  );
+}
+
+async function clickhouseQuery(
+  websiteId: string,
+  filters: QueryFilters & { propertyName?: string },
+): Promise<{ propertyName: string; dataType: number; propertyValue: string; total: number }[]> {
+  const { rawQuery, parseFilters } = clickhouse;
+  const { filterQuery, params } = await parseFilters(websiteId, filters);
+
+  return rawQuery(
+    `
+    select
+      multiIf(data_type = 2, replaceAll(string_value, '.0000', ''),
+              data_type = 4, toString(date_trunc('hour', date_value)),
+              string_value) as "value",
+      count(*) as "total"
+    from umami.session_data
+    where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      and data_key = {propertyName:String}
+    ${filterQuery}
+    group by value
+    order by 2 desc
+    limit 500;
+    `,
+    params,
+  ).then(result => {
+    return Object.values(result).map((a: any) => {
+      return {
+        ...a,
+        total: Number(a.total),
+      };
+    });
+  });
+}

From 04de691893658d9cb9ad6c5cf673cddb35c0144c Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 13 Aug 2024 22:16:21 -0700
Subject: [PATCH 275/438] Removed custom date format. Use ISO string
 everywhere.

---
 package.json                                      | 1 -
 src/lib/clickhouse.ts                             | 6 ------
 src/lib/kafka.ts                                  | 6 ------
 src/queries/analytics/events/saveEvent.ts         | 4 ++--
 src/queries/analytics/events/saveEventData.ts     | 4 ++--
 src/queries/analytics/sessions/saveSessionData.ts | 6 +++---
 yarn.lock                                         | 5 -----
 7 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/package.json b/package.json
index dd43d88909..d6217788d3 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,6 @@
     "cross-spawn": "^7.0.3",
     "date-fns": "^2.23.0",
     "date-fns-tz": "^1.1.4",
-    "dateformat": "^5.0.3",
     "debug": "^4.3.4",
     "del": "^6.0.0",
     "detect-browser": "^5.2.0",
diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index bf3da950fb..78f0323ed0 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -1,5 +1,4 @@
 import { ClickHouseClient, createClient } from '@clickhouse/client';
-import dateFormat from 'dateformat';
 import debug from 'debug';
 import { CLICKHOUSE } from 'lib/db';
 import { DEFAULT_PAGE_SIZE, OPERATORS } from './constants';
@@ -63,10 +62,6 @@ function getDateSQL(field: string, unit: string, timezone?: string) {
   return `date_trunc('${unit}', ${field})`;
 }
 
-function getDateFormat(date: Date) {
-  return `'${dateFormat(date, 'UTC:yyyy-mm-dd HH:MM:ss')}'`;
-}
-
 function mapFilter(column: string, operator: string, name: string, type: string = 'String') {
   const value = `{${name}:${type}}`;
 
@@ -224,7 +219,6 @@ export default {
   connect,
   getDateStringSQL,
   getDateSQL,
-  getDateFormat,
   getFilterQuery,
   parseFilters,
   pagedQuery,
diff --git a/src/lib/kafka.ts b/src/lib/kafka.ts
index 76692afb4b..38a7073e6a 100644
--- a/src/lib/kafka.ts
+++ b/src/lib/kafka.ts
@@ -1,4 +1,3 @@
-import dateFormat from 'dateformat';
 import debug from 'debug';
 import { Kafka, Mechanism, Producer, RecordMetadata, SASLOptions, logLevel } from 'kafkajs';
 import { KAFKA, KAFKA_PRODUCER } from 'lib/db';
@@ -56,10 +55,6 @@ async function getProducer(): Promise<Producer> {
   return producer;
 }
 
-function getDateFormat(date: Date, format?: string): string {
-  return dateFormat(date, format ? format : 'UTC:yyyy-mm-dd HH:MM:ss');
-}
-
 async function sendMessage(
   topic: string,
   message: { [key: string]: string | number },
@@ -107,7 +102,6 @@ export default {
   producer,
   log,
   connect,
-  getDateFormat,
   sendMessage,
   sendMessages,
 };
diff --git a/src/queries/analytics/events/saveEvent.ts b/src/queries/analytics/events/saveEvent.ts
index fa4805df36..5e21e303ff 100644
--- a/src/queries/analytics/events/saveEvent.ts
+++ b/src/queries/analytics/events/saveEvent.ts
@@ -136,9 +136,9 @@ async function clickhouseQuery(data: {
     ...args
   } = data;
   const { insert } = clickhouse;
-  const { getDateFormat, sendMessage } = kafka;
+  const { sendMessage } = kafka;
   const eventId = uuid();
-  const createdAt = getDateFormat(new Date());
+  const createdAt = new Date().toISOString();
 
   const message = {
     ...args,
diff --git a/src/queries/analytics/events/saveEventData.ts b/src/queries/analytics/events/saveEventData.ts
index 9c7218e97b..fec4cae393 100644
--- a/src/queries/analytics/events/saveEventData.ts
+++ b/src/queries/analytics/events/saveEventData.ts
@@ -61,7 +61,7 @@ async function clickhouseQuery(data: {
   const { websiteId, sessionId, eventId, urlPath, eventName, eventData, createdAt } = data;
 
   const { insert } = clickhouse;
-  const { getDateFormat, sendMessages } = kafka;
+  const { sendMessages } = kafka;
 
   const jsonKeys = flattenJSON(eventData);
 
@@ -76,7 +76,7 @@ async function clickhouseQuery(data: {
       data_type: dataType,
       string_value: getStringValue(value, dataType),
       number_value: dataType === DATA_TYPE.number ? value : null,
-      date_value: dataType === DATA_TYPE.date ? getDateFormat(value) : null,
+      date_value: dataType === DATA_TYPE.date ? value?.toISOString() : null,
       created_at: createdAt,
     };
   });
diff --git a/src/queries/analytics/sessions/saveSessionData.ts b/src/queries/analytics/sessions/saveSessionData.ts
index 51f5c47d0d..d932f7ed27 100644
--- a/src/queries/analytics/sessions/saveSessionData.ts
+++ b/src/queries/analytics/sessions/saveSessionData.ts
@@ -81,8 +81,8 @@ async function clickhouseQuery(data: {
   const { websiteId, sessionId, sessionData } = data;
 
   const { insert } = clickhouse;
-  const { getDateFormat, sendMessages } = kafka;
-  const createdAt = getDateFormat(new Date());
+  const { sendMessages } = kafka;
+  const createdAt = new Date().toISOString();
 
   const jsonKeys = flattenJSON(sessionData);
 
@@ -94,7 +94,7 @@ async function clickhouseQuery(data: {
       data_type: dataType,
       string_value: getStringValue(value, dataType),
       number_value: dataType === DATA_TYPE.number ? value : null,
-      date_value: dataType === DATA_TYPE.date ? getDateFormat(value) : null,
+      date_value: dataType === DATA_TYPE.date ? value?.toISOString() : null,
       created_at: createdAt,
     };
   });
diff --git a/yarn.lock b/yarn.lock
index e7456af739..cf78cc0c6a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4625,11 +4625,6 @@ date-fns@^2.23.0, date-fns@^2.29.3:
   dependencies:
     "@babel/runtime" "^7.21.0"
 
-dateformat@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-5.0.3.tgz#fe2223eff3cc70ce716931cb3038b59a9280696e"
-  integrity sha512-Kvr6HmPXUMerlLcLF+Pwq3K7apHpYmGDVqrxcDasBg86UcKeTSNWbEzU8bwdXnxnR44FtMhJAxI4Bov6Y/KUfA==
-
 dayjs@^1.10.4:
   version "1.11.12"
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.12.tgz#5245226cc7f40a15bf52e0b99fd2a04669ccac1d"

From aaf9adacc61623d842ac90babac7c5a523963d29 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Wed, 14 Aug 2024 12:29:47 -0700
Subject: [PATCH 276/438] add event name to properties table

---
 .../[websiteId]/events/EventProperties.tsx      | 17 +++++++++++++++--
 .../hooks/queries/useEventDataValues.ts         |  4 +++-
 .../websites/[websiteId]/event-data/values.ts   | 11 +++++++++--
 .../analytics/events/getEventDataProperties.ts  | 15 ++++++++-------
 .../analytics/events/getEventDataValues.ts      | 13 +++++++++----
 5 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx b/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx
index b2fa491a1b..794a5053d5 100644
--- a/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx
+++ b/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx
@@ -8,9 +8,10 @@ import styles from './EventProperties.module.css';
 
 export function EventProperties({ websiteId }: { websiteId: string }) {
   const [propertyName, setPropertyName] = useState('');
+  const [eventName, setEventName] = useState('');
   const { formatMessage, labels } = useMessages();
   const { data, isLoading, isFetched, error } = useEventDataProperties(websiteId);
-  const { data: values } = useEventDataValues(websiteId, propertyName);
+  const { data: values } = useEventDataValues(websiteId, eventName, propertyName);
   const chartData =
     propertyName && values
       ? {
@@ -25,13 +26,25 @@ export function EventProperties({ websiteId }: { websiteId: string }) {
         }
       : null;
 
+  const handleRowClick = row => {
+    setEventName(row.eventName);
+    setPropertyName(row.propertyName);
+  };
+
   return (
     <LoadingPanel isLoading={isLoading} isFetched={isFetched} data={data} error={error}>
       <div className={styles.container}>
         <GridTable data={data} cardMode={false} className={styles.table}>
+          <GridColumn name="eventName" label={formatMessage(labels.name)}>
+            {row => (
+              <div className={styles.link} onClick={() => handleRowClick(row)}>
+                {row.eventName}
+              </div>
+            )}
+          </GridColumn>
           <GridColumn name="propertyName" label={formatMessage(labels.property)}>
             {row => (
-              <div className={styles.link} onClick={() => setPropertyName(row.propertyName)}>
+              <div className={styles.link} onClick={() => handleRowClick(row)}>
                 {row.propertyName}
               </div>
             )}
diff --git a/src/components/hooks/queries/useEventDataValues.ts b/src/components/hooks/queries/useEventDataValues.ts
index 47b5a513ce..61aea58e05 100644
--- a/src/components/hooks/queries/useEventDataValues.ts
+++ b/src/components/hooks/queries/useEventDataValues.ts
@@ -4,6 +4,7 @@ import { useFilterParams } from '../useFilterParams';
 
 export function useEventDataValues(
   websiteId: string,
+  eventName: string,
   propertyName: string,
   options?: Omit<UseQueryOptions, 'queryKey' | 'queryFn'>,
 ) {
@@ -12,7 +13,8 @@ export function useEventDataValues(
 
   return useQuery<any>({
     queryKey: ['websites:event-data:values', { websiteId, propertyName, ...params }],
-    queryFn: () => get(`/websites/${websiteId}/event-data/values`, { ...params, propertyName }),
+    queryFn: () =>
+      get(`/websites/${websiteId}/event-data/values`, { ...params, eventName, propertyName }),
     enabled: !!(websiteId && propertyName),
     ...options,
   });
diff --git a/src/pages/api/websites/[websiteId]/event-data/values.ts b/src/pages/api/websites/[websiteId]/event-data/values.ts
index b9ada96df5..e5bb4ab8de 100644
--- a/src/pages/api/websites/[websiteId]/event-data/values.ts
+++ b/src/pages/api/websites/[websiteId]/event-data/values.ts
@@ -11,6 +11,7 @@ export interface EventDataFieldsRequestQuery {
   websiteId: string;
   startAt: string;
   endAt: string;
+  eventName?: string;
   propertyName?: string;
 }
 
@@ -19,6 +20,7 @@ const schema = {
     websiteId: yup.string().uuid().required(),
     startAt: yup.number().integer().required(),
     endAt: yup.number().integer().min(yup.ref('startAt')).required(),
+    eventName: yup.string(),
     propertyName: yup.string(),
   }),
 };
@@ -32,7 +34,7 @@ export default async (
   await useValidate(schema, req, res);
 
   if (req.method === 'GET') {
-    const { websiteId, startAt, endAt, propertyName } = req.query;
+    const { websiteId, startAt, endAt, eventName, propertyName } = req.query;
 
     if (!(await canViewWebsite(req.auth, websiteId))) {
       return unauthorized(res);
@@ -41,7 +43,12 @@ export default async (
     const startDate = new Date(+startAt);
     const endDate = new Date(+endAt);
 
-    const data = await getEventDataValues(websiteId, { startDate, endDate, propertyName });
+    const data = await getEventDataValues(websiteId, {
+      startDate,
+      endDate,
+      eventName,
+      propertyName,
+    });
 
     return ok(res, data);
   }
diff --git a/src/queries/analytics/events/getEventDataProperties.ts b/src/queries/analytics/events/getEventDataProperties.ts
index 78fcb2cda3..8d1eaf9de0 100644
--- a/src/queries/analytics/events/getEventDataProperties.ts
+++ b/src/queries/analytics/events/getEventDataProperties.ts
@@ -24,14 +24,15 @@ async function relationalQuery(
   return rawQuery(
     `
     select
+      event_name as "eventName",
       data_key as "propertyName",
       count(*) as "total"
     from event_data
     where website_id = {{websiteId::uuid}}
       and created_at between {{startDate}} and {{endDate}}
     ${filterQuery}
-    group by data_key
-    order by 2 desc
+    group by event_name, data_key
+    order by 3 desc
     limit 500
     `,
     params,
@@ -41,7 +42,7 @@ async function relationalQuery(
 async function clickhouseQuery(
   websiteId: string,
   filters: QueryFilters & { propertyName?: string },
-): Promise<{ propertyName: string; dataType: number; propertyValue: string; total: number }[]> {
+): Promise<{ eventName: string; propertyName: string; total: number }[]> {
   const { rawQuery, parseFilters } = clickhouse;
   const { filterQuery, params } = await parseFilters(websiteId, filters, {
     columns: { propertyName: 'data_key' },
@@ -50,23 +51,23 @@ async function clickhouseQuery(
   return rawQuery(
     `
     select
+      event_name as eventName,
       data_key as propertyName,
       count(*) as total
     from event_data
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}
     ${filterQuery}
-    group by data_key
-    order by 2 desc
+    group by event_name, data_key
+    order by 1, 3 desc
     limit 500
     `,
     params,
   ).then(result => {
     return Object.values(result).map((a: any) => {
       return {
+        eventName: a.eventName,
         propertyName: a.propertyName,
-        dataType: Number(a.dataType),
-        propertyValue: a.propertyValue,
         total: Number(a.total),
       };
     });
diff --git a/src/queries/analytics/events/getEventDataValues.ts b/src/queries/analytics/events/getEventDataValues.ts
index d7754ad2a5..6d50a96d6c 100644
--- a/src/queries/analytics/events/getEventDataValues.ts
+++ b/src/queries/analytics/events/getEventDataValues.ts
@@ -4,7 +4,10 @@ import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import { QueryFilters, WebsiteEventData } from 'lib/types';
 
 export async function getEventDataValues(
-  ...args: [websiteId: string, filters: QueryFilters & { propertyName?: string }]
+  ...args: [
+    websiteId: string,
+    filters: QueryFilters & { eventName?: string; propertyName?: string },
+  ]
 ): Promise<WebsiteEventData[]> {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
@@ -14,7 +17,7 @@ export async function getEventDataValues(
 
 async function relationalQuery(
   websiteId: string,
-  filters: QueryFilters & { propertyName?: string },
+  filters: QueryFilters & { eventName?: string; propertyName?: string },
 ) {
   const { rawQuery, parseFilters } = prisma;
   const { filterQuery, params } = await parseFilters(websiteId, filters);
@@ -28,6 +31,7 @@ async function relationalQuery(
     where website_id = {{websiteId::uuid}}
       and created_at between {{startDate}} and {{endDate}}
       and data_key = {{propertyName}}
+      and event_key = {{eventName}}
     ${filterQuery}
     group by string_value
     order by 2 desc
@@ -39,7 +43,7 @@ async function relationalQuery(
 
 async function clickhouseQuery(
   websiteId: string,
-  filters: QueryFilters & { propertyName?: string },
+  filters: QueryFilters & { eventName?: string; propertyName?: string },
 ): Promise<{ propertyName: string; dataType: number; propertyValue: string; total: number }[]> {
   const { rawQuery, parseFilters } = clickhouse;
   const { filterQuery, params } = await parseFilters(websiteId, filters);
@@ -55,8 +59,9 @@ async function clickhouseQuery(
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}
       and data_key = {propertyName:String}
+      and event_name = {eventName:String}
     ${filterQuery}
-    group by value
+    group by event_name, value
     order by 2 desc
     limit 500;
     `,

From db25f241c0367885c2b244001827ed0e60597c82 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Wed, 14 Aug 2024 12:57:43 -0700
Subject: [PATCH 277/438] clean up session properties / values

---
 src/components/hooks/queries/useSessionDataValues.ts          | 2 +-
 src/pages/api/websites/[websiteId]/session-data/properties.ts | 4 ++--
 src/pages/api/websites/[websiteId]/session-data/values.ts     | 4 ++--
 src/queries/analytics/events/getEventDataValues.ts            | 2 +-
 src/queries/analytics/sessions/getSessionDataProperties.ts    | 4 +---
 src/queries/analytics/sessions/getSessionDataValues.ts        | 2 +-
 src/queries/index.ts                                          | 2 ++
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/hooks/queries/useSessionDataValues.ts b/src/components/hooks/queries/useSessionDataValues.ts
index 5230017736..ce9a67f3ec 100644
--- a/src/components/hooks/queries/useSessionDataValues.ts
+++ b/src/components/hooks/queries/useSessionDataValues.ts
@@ -11,7 +11,7 @@ export function useSessionDataValues(
   const params = useFilterParams(websiteId);
 
   return useQuery<any>({
-    queryKey: ['websites:event-data:values', { websiteId, propertyName, ...params }],
+    queryKey: ['websites:session-data:values', { websiteId, propertyName, ...params }],
     queryFn: () => get(`/websites/${websiteId}/session-data/values`, { ...params, propertyName }),
     enabled: !!(websiteId && propertyName),
     ...options,
diff --git a/src/pages/api/websites/[websiteId]/session-data/properties.ts b/src/pages/api/websites/[websiteId]/session-data/properties.ts
index 19e9bbb892..4cd2e1e62e 100644
--- a/src/pages/api/websites/[websiteId]/session-data/properties.ts
+++ b/src/pages/api/websites/[websiteId]/session-data/properties.ts
@@ -3,7 +3,7 @@ import { useAuth, useCors, useValidate } from 'lib/middleware';
 import { NextApiRequestQueryBody } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { getEventDataProperties } from 'queries';
+import { getSessionDataProperties } from 'queries';
 import * as yup from 'yup';
 
 export interface EventDataFieldsRequestQuery {
@@ -40,7 +40,7 @@ export default async (
     const startDate = new Date(+startAt);
     const endDate = new Date(+endAt);
 
-    const data = await getEventDataProperties(websiteId, { startDate, endDate, propertyName });
+    const data = await getSessionDataProperties(websiteId, { startDate, endDate, propertyName });
 
     return ok(res, data);
   }
diff --git a/src/pages/api/websites/[websiteId]/session-data/values.ts b/src/pages/api/websites/[websiteId]/session-data/values.ts
index b9ada96df5..98463f1522 100644
--- a/src/pages/api/websites/[websiteId]/session-data/values.ts
+++ b/src/pages/api/websites/[websiteId]/session-data/values.ts
@@ -3,7 +3,7 @@ import { useAuth, useCors, useValidate } from 'lib/middleware';
 import { NextApiRequestQueryBody } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { getEventDataValues } from 'queries';
+import { getSessionDataValues } from 'queries';
 
 import * as yup from 'yup';
 
@@ -41,7 +41,7 @@ export default async (
     const startDate = new Date(+startAt);
     const endDate = new Date(+endAt);
 
-    const data = await getEventDataValues(websiteId, { startDate, endDate, propertyName });
+    const data = await getSessionDataValues(websiteId, { startDate, endDate, propertyName });
 
     return ok(res, data);
   }
diff --git a/src/queries/analytics/events/getEventDataValues.ts b/src/queries/analytics/events/getEventDataValues.ts
index 6d50a96d6c..e055bfccc9 100644
--- a/src/queries/analytics/events/getEventDataValues.ts
+++ b/src/queries/analytics/events/getEventDataValues.ts
@@ -55,7 +55,7 @@ async function clickhouseQuery(
               data_type = 4, toString(date_trunc('hour', date_value)),
               string_value) as "value",
       count(*) as "total"
-    from umami.event_data
+    from event_data
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}
       and data_key = {propertyName:String}
diff --git a/src/queries/analytics/sessions/getSessionDataProperties.ts b/src/queries/analytics/sessions/getSessionDataProperties.ts
index 0f45e1404a..bfbd924618 100644
--- a/src/queries/analytics/sessions/getSessionDataProperties.ts
+++ b/src/queries/analytics/sessions/getSessionDataProperties.ts
@@ -41,7 +41,7 @@ async function relationalQuery(
 async function clickhouseQuery(
   websiteId: string,
   filters: QueryFilters & { propertyName?: string },
-): Promise<{ propertyName: string; dataType: number; propertyValue: string; total: number }[]> {
+): Promise<{ propertyName: string; total: number }[]> {
   const { rawQuery, parseFilters } = clickhouse;
   const { filterQuery, params } = await parseFilters(websiteId, filters, {
     columns: { propertyName: 'data_key' },
@@ -65,8 +65,6 @@ async function clickhouseQuery(
     return Object.values(result).map((a: any) => {
       return {
         propertyName: a.propertyName,
-        dataType: Number(a.dataType),
-        propertyValue: a.propertyValue,
         total: Number(a.total),
       };
     });
diff --git a/src/queries/analytics/sessions/getSessionDataValues.ts b/src/queries/analytics/sessions/getSessionDataValues.ts
index a018dfa0e7..fd67e7a99a 100644
--- a/src/queries/analytics/sessions/getSessionDataValues.ts
+++ b/src/queries/analytics/sessions/getSessionDataValues.ts
@@ -51,7 +51,7 @@ async function clickhouseQuery(
               data_type = 4, toString(date_trunc('hour', date_value)),
               string_value) as "value",
       count(*) as "total"
-    from umami.session_data
+    from session_data
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}
       and data_key = {propertyName:String}
diff --git a/src/queries/index.ts b/src/queries/index.ts
index 7dd7178340..f9c44dba94 100644
--- a/src/queries/index.ts
+++ b/src/queries/index.ts
@@ -22,6 +22,8 @@ export * from './analytics/pageviews/getPageviewStats';
 export * from './analytics/sessions/createSession';
 export * from './analytics/sessions/getWebsiteSession';
 export * from './analytics/sessions/getSessionData';
+export * from './analytics/sessions/getSessionDataProperties';
+export * from './analytics/sessions/getSessionDataValues';
 export * from './analytics/sessions/getSessionMetrics';
 export * from './analytics/sessions/getWebsiteSessions';
 export * from './analytics/sessions/getSessionActivity';

From c79720ae1d083bea6e7eb2c56066cfdb2498bb5c Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Thu, 15 Aug 2024 09:28:39 -0700
Subject: [PATCH 278/438] update session data schema

---
 db/clickhouse/schema.sql                                      | 4 ++--
 .../[websiteId]/sessions/[sessionId]/SessionData.module.css   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/db/clickhouse/schema.sql b/db/clickhouse/schema.sql
index 02be2e38f3..3dcfda9f69 100644
--- a/db/clickhouse/schema.sql
+++ b/db/clickhouse/schema.sql
@@ -66,8 +66,8 @@ CREATE TABLE umami.session_data
     created_at DateTime('UTC'),
     job_id Nullable(UUID)
 )
-ENGINE = MergeTree
-    ORDER BY (website_id, session_id, data_key, created_at)
+ENGINE = ReplacingMergeTree
+    ORDER BY (website_id, session_id, data_key)
     SETTINGS index_granularity = 8192;
 
 -- stats hourly
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.module.css b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.module.css
index 072172f6dd..4794803d22 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.module.css
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.module.css
@@ -7,6 +7,7 @@
 
 .header {
   font-weight: bold;
+  margin-bottom: 20px;
 }
 
 .empty {

From 439377f5c526f84916740bc6b2b25a1151c9fe38 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Thu, 15 Aug 2024 12:04:48 -0700
Subject: [PATCH 279/438] add final keyword to session data queries

---
 src/queries/analytics/sessions/getSessionData.ts           | 2 +-
 src/queries/analytics/sessions/getSessionDataProperties.ts | 2 +-
 src/queries/analytics/sessions/getSessionDataValues.ts     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/queries/analytics/sessions/getSessionData.ts b/src/queries/analytics/sessions/getSessionData.ts
index 8b78fc8623..509fcdbf6b 100644
--- a/src/queries/analytics/sessions/getSessionData.ts
+++ b/src/queries/analytics/sessions/getSessionData.ts
@@ -32,7 +32,7 @@ async function clickhouseQuery(websiteId: string, sessionId: string) {
         number_value as numberValue,
         date_value as dateValue,
         created_at as createdAt
-    from session_data
+    from session_data final
     where website_id = {websiteId:UUID}
     and session_id = {sessionId:UUID}
     order by data_key asc
diff --git a/src/queries/analytics/sessions/getSessionDataProperties.ts b/src/queries/analytics/sessions/getSessionDataProperties.ts
index bfbd924618..b33fecfbd2 100644
--- a/src/queries/analytics/sessions/getSessionDataProperties.ts
+++ b/src/queries/analytics/sessions/getSessionDataProperties.ts
@@ -52,7 +52,7 @@ async function clickhouseQuery(
     select
       data_key as propertyName,
       count(*) as total
-    from session_data
+    from session_data final
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}
     ${filterQuery}
diff --git a/src/queries/analytics/sessions/getSessionDataValues.ts b/src/queries/analytics/sessions/getSessionDataValues.ts
index fd67e7a99a..c2fa5f6651 100644
--- a/src/queries/analytics/sessions/getSessionDataValues.ts
+++ b/src/queries/analytics/sessions/getSessionDataValues.ts
@@ -51,7 +51,7 @@ async function clickhouseQuery(
               data_type = 4, toString(date_trunc('hour', date_value)),
               string_value) as "value",
       count(*) as "total"
-    from session_data
+    from session_data final
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}
       and data_key = {propertyName:String}

From deb9dd60df39eb6979eb54e5a6def576251146ff Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 16 Aug 2024 00:35:08 -0700
Subject: [PATCH 280/438] Render UTC dates in sessions.

---
 .../sessions/[sessionId]/SessionActivity.tsx  |  6 +---
 .../[sessionId]/SessionDetailsPage.tsx        |  7 +----
 .../hooks/queries/useSessionActivity.ts       |  9 ++----
 src/components/hooks/useFilterParams.ts       |  7 ++---
 src/components/hooks/useTimezone.ts           | 12 ++++++--
 src/lib/clickhouse.ts                         |  3 +-
 .../sessions/[sessionId]/activity.ts          | 13 ++-------
 .../analytics/sessions/getSessionActivity.ts  | 28 ++++++-------------
 .../analytics/sessions/getWebsiteSession.ts   |  6 ++--
 .../analytics/sessions/getWebsiteSessions.ts  |  6 ++--
 10 files changed, 35 insertions(+), 62 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
index def3f0ba02..3b0ad0080e 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
@@ -7,16 +7,12 @@ import styles from './SessionActivity.module.css';
 export function SessionActivity({
   websiteId,
   sessionId,
-  startDate,
-  endDate,
 }: {
   websiteId: string;
   sessionId: string;
-  startDate: string;
-  endDate: string;
 }) {
   const { formatDate } = useTimezone();
-  const { data, isLoading } = useSessionActivity(websiteId, sessionId, startDate, endDate);
+  const { data, isLoading } = useSessionActivity(websiteId, sessionId);
 
   if (isLoading) {
     return <Loading position="page" />;
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
index d6a07edcf4..212f853304 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
@@ -28,12 +28,7 @@ export default function SessionDetailsPage({
         </div>
         <div className={styles.content}>
           <SessionStats data={data} />
-          <SessionActivity
-            websiteId={websiteId}
-            sessionId={sessionId}
-            startDate={data?.firstAt}
-            endDate={data?.lastAt}
-          />
+          <SessionActivity websiteId={websiteId} sessionId={sessionId} />
         </div>
         <div className={styles.data}>
           <SessionData websiteId={websiteId} sessionId={sessionId} />
diff --git a/src/components/hooks/queries/useSessionActivity.ts b/src/components/hooks/queries/useSessionActivity.ts
index 94676a9916..e6d7ffa0e4 100644
--- a/src/components/hooks/queries/useSessionActivity.ts
+++ b/src/components/hooks/queries/useSessionActivity.ts
@@ -1,17 +1,12 @@
 import { useApi } from './useApi';
 
-export function useSessionActivity(
-  websiteId: string,
-  sessionId: string,
-  startDate: string,
-  endDate: string,
-) {
+export function useSessionActivity(websiteId: string, sessionId: string) {
   const { get, useQuery } = useApi();
 
   return useQuery({
     queryKey: ['session:activity', { websiteId, sessionId }],
     queryFn: () => {
-      return get(`/websites/${websiteId}/sessions/${sessionId}/activity`, { startDate, endDate });
+      return get(`/websites/${websiteId}/sessions/${sessionId}/activity`);
     },
   });
 }
diff --git a/src/components/hooks/useFilterParams.ts b/src/components/hooks/useFilterParams.ts
index 343aea9fae..525f349298 100644
--- a/src/components/hooks/useFilterParams.ts
+++ b/src/components/hooks/useFilterParams.ts
@@ -1,19 +1,18 @@
 import { useNavigation } from './useNavigation';
 import { useDateRange } from './useDateRange';
 import { useTimezone } from './useTimezone';
-import { zonedTimeToUtc } from 'date-fns-tz';
 
 export function useFilterParams(websiteId: string) {
   const { dateRange } = useDateRange(websiteId);
   const { startDate, endDate, unit } = dateRange;
-  const { timezone } = useTimezone();
+  const { timezone, toUtc } = useTimezone();
   const {
     query: { url, referrer, title, query, host, os, browser, device, country, region, city, event },
   } = useNavigation();
 
   return {
-    startAt: +zonedTimeToUtc(startDate, timezone),
-    endAt: +zonedTimeToUtc(endDate, timezone),
+    startAt: +toUtc(startDate),
+    endAt: +toUtc(endDate),
     unit,
     timezone,
     url,
diff --git a/src/components/hooks/useTimezone.ts b/src/components/hooks/useTimezone.ts
index b5e58ea923..24cef02cce 100644
--- a/src/components/hooks/useTimezone.ts
+++ b/src/components/hooks/useTimezone.ts
@@ -1,6 +1,6 @@
 import { setItem } from 'next-basics';
 import { TIMEZONE_CONFIG } from 'lib/constants';
-import { formatInTimeZone } from 'date-fns-tz';
+import { formatInTimeZone, zonedTimeToUtc, utcToZonedTime } from 'date-fns-tz';
 import useStore, { setTimezone } from 'store/app';
 
 const selector = (state: { timezone: string }) => state.timezone;
@@ -23,7 +23,15 @@ export function useTimezone() {
     );
   };
 
-  return { timezone, saveTimezone, formatDate };
+  const toUtc = (date: Date | string | number) => {
+    return zonedTimeToUtc(date, timezone);
+  };
+
+  const fromUtc = (date: Date | string | number) => {
+    return utcToZonedTime(date, timezone);
+  };
+
+  return { timezone, saveTimezone, formatDate, toUtc, fromUtc };
 }
 
 export default useTimezone;
diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index 78f0323ed0..63027d7525 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -8,6 +8,7 @@ import { filtersToArray } from './params';
 import { PageParams, QueryFilters, QueryOptions } from './types';
 
 export const CLICKHOUSE_DATE_FORMATS = {
+  utc: '%Y-%m-%dT%H:%i:%SZ',
   second: '%Y-%m-%d %H:%i:%S',
   minute: '%Y-%m-%d %H:%i:00',
   hour: '%Y-%m-%d %H:00:00',
@@ -47,7 +48,7 @@ function getClient() {
   return client;
 }
 
-function getDateStringSQL(data: any, unit: string | number, timezone?: string) {
+function getDateStringSQL(data: any, unit: string = 'utc', timezone?: string) {
   if (timezone) {
     return `formatDateTime(${data}, '${CLICKHOUSE_DATE_FORMATS[unit]}', '${timezone}')`;
   }
diff --git a/src/pages/api/websites/[websiteId]/sessions/[sessionId]/activity.ts b/src/pages/api/websites/[websiteId]/sessions/[sessionId]/activity.ts
index d1a763fb3b..8d1b234617 100644
--- a/src/pages/api/websites/[websiteId]/sessions/[sessionId]/activity.ts
+++ b/src/pages/api/websites/[websiteId]/sessions/[sessionId]/activity.ts
@@ -9,16 +9,12 @@ import { getSessionActivity } from 'queries';
 export interface SessionActivityRequestQuery extends PageParams {
   websiteId: string;
   sessionId: string;
-  startDate: string;
-  endDate: string;
 }
 
 const schema = {
   GET: yup.object().shape({
     websiteId: yup.string().uuid().required(),
     sessionId: yup.string().uuid().required(),
-    startDate: yup.string().required(),
-    endDate: yup.string().required(),
   }),
 };
 
@@ -30,19 +26,14 @@ export default async (
   await useAuth(req, res);
   await useValidate(schema, req, res);
 
-  const { websiteId, sessionId, startDate, endDate } = req.query;
+  const { websiteId, sessionId } = req.query;
 
   if (req.method === 'GET') {
     if (!(await canViewWebsite(req.auth, websiteId))) {
       return unauthorized(res);
     }
 
-    const data = await getSessionActivity(
-      websiteId,
-      sessionId,
-      new Date(startDate + 'Z'),
-      new Date(endDate + 'Z'),
-    );
+    const data = await getSessionActivity(websiteId, sessionId);
 
     return ok(res, data);
   }
diff --git a/src/queries/analytics/sessions/getSessionActivity.ts b/src/queries/analytics/sessions/getSessionActivity.ts
index bb7c141cb4..47c5f590d8 100644
--- a/src/queries/analytics/sessions/getSessionActivity.ts
+++ b/src/queries/analytics/sessions/getSessionActivity.ts
@@ -2,44 +2,32 @@ import clickhouse from 'lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import prisma from 'lib/prisma';
 
-export async function getSessionActivity(
-  ...args: [websiteId: string, sessionId: string, startDate: Date, endDate: Date]
-) {
+export async function getSessionActivity(...args: [websiteId: string, sessionId: string]) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
   });
 }
 
-async function relationalQuery(
-  websiteId: string,
-  sessionId: string,
-  startDate: Date,
-  endDate: Date,
-) {
+async function relationalQuery(websiteId: string, sessionId: string) {
   return prisma.client.websiteEvent.findMany({
     where: {
       id: sessionId,
       websiteId,
-      createdAt: { gte: startDate, lte: endDate },
     },
+    take: 500,
   });
 }
 
-async function clickhouseQuery(
-  websiteId: string,
-  sessionId: string,
-  startDate: Date,
-  endDate: Date,
-) {
-  const { rawQuery } = clickhouse;
+async function clickhouseQuery(websiteId: string, sessionId: string) {
+  const { rawQuery, getDateStringSQL } = clickhouse;
 
   return rawQuery(
     `
     select
       session_id as id,
       website_id as websiteId,
-      created_at as createdAt,
+      ${getDateStringSQL('created_at')} as createdAt,
       url_path as urlPath,
       url_query as urlQuery,
       referrer_domain as referrerDomain,
@@ -50,9 +38,9 @@ async function clickhouseQuery(
     from website_event
     where website_id = {websiteId:UUID}
       and session_id = {sessionId:UUID} 
-      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
     order by created_at desc
+    limit 500
     `,
-    { websiteId, sessionId, startDate, endDate },
+    { websiteId, sessionId },
   );
 }
diff --git a/src/queries/analytics/sessions/getWebsiteSession.ts b/src/queries/analytics/sessions/getWebsiteSession.ts
index 22c186420a..6f672e7d8d 100644
--- a/src/queries/analytics/sessions/getWebsiteSession.ts
+++ b/src/queries/analytics/sessions/getWebsiteSession.ts
@@ -19,7 +19,7 @@ async function relationalQuery(websiteId: string, sessionId: string) {
 }
 
 async function clickhouseQuery(websiteId: string, sessionId: string) {
-  const { rawQuery } = clickhouse;
+  const { rawQuery, getDateStringSQL } = clickhouse;
 
   return rawQuery(
     `
@@ -34,8 +34,8 @@ async function clickhouseQuery(websiteId: string, sessionId: string) {
       country,
       subdivision1,
       city,
-      min(min_time) as firstAt,
-      max(max_time) as lastAt,
+      ${getDateStringSQL('min(min_time)')} as firstAt,
+      ${getDateStringSQL('max(max_time)')} as lastAt,
       uniq(visit_id) visits,
       sum(views) as views,
       sum(events) as events,
diff --git a/src/queries/analytics/sessions/getWebsiteSessions.ts b/src/queries/analytics/sessions/getWebsiteSessions.ts
index 60f30b6b9e..1ea3ef49e6 100644
--- a/src/queries/analytics/sessions/getWebsiteSessions.ts
+++ b/src/queries/analytics/sessions/getWebsiteSessions.ts
@@ -24,7 +24,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
 }
 
 async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
-  const { pagedQuery, parseFilters } = clickhouse;
+  const { pagedQuery, parseFilters, getDateStringSQL } = clickhouse;
   const { params, dateQuery, filterQuery } = await parseFilters(websiteId, filters);
 
   return pagedQuery(
@@ -42,8 +42,8 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
       country,
       subdivision1,
       city,
-      min(min_time) as firstAt,
-      max(max_time) as lastAt,
+      ${getDateStringSQL('min(min_time)')} as firstAt,
+      ${getDateStringSQL('max(max_time)')} as lastAt,
       uniq(visit_id) as visits,
       sumIf(views, event_type = 1) as views
     from website_event_stats_hourly

From fc1fc5807ec0682ad6996362c842e0fe74fe2c63 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 16 Aug 2024 19:44:16 -0700
Subject: [PATCH 281/438] Session properties.

---
 .../sessions/[sessionId]/SessionActivity.tsx  |  6 +++-
 .../[sessionId]/SessionDetailsPage.tsx        |  7 ++++-
 .../hooks/queries/useSessionActivity.ts       | 15 ++++++++--
 src/declaration.d.ts                          |  1 -
 src/lib/clickhouse.ts                         |  6 ++++
 .../[websiteId]/session-data/properties.ts    |  4 +--
 .../sessions/[sessionId]/activity.ts          | 11 ++++++--
 src/queries/analytics/events/saveEvent.ts     |  4 +--
 .../analytics/sessions/getSessionActivity.ts  | 28 +++++++++++++------
 .../analytics/sessions/saveSessionData.ts     |  4 +--
 10 files changed, 64 insertions(+), 22 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
index 3b0ad0080e..663934936e 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
@@ -7,12 +7,16 @@ import styles from './SessionActivity.module.css';
 export function SessionActivity({
   websiteId,
   sessionId,
+  startDate,
+  endDate,
 }: {
   websiteId: string;
   sessionId: string;
+  startDate: Date;
+  endDate: Date;
 }) {
   const { formatDate } = useTimezone();
-  const { data, isLoading } = useSessionActivity(websiteId, sessionId);
+  const { data, isLoading } = useSessionActivity(websiteId, sessionId, startDate, endDate);
 
   if (isLoading) {
     return <Loading position="page" />;
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
index 212f853304..d6a07edcf4 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx
@@ -28,7 +28,12 @@ export default function SessionDetailsPage({
         </div>
         <div className={styles.content}>
           <SessionStats data={data} />
-          <SessionActivity websiteId={websiteId} sessionId={sessionId} />
+          <SessionActivity
+            websiteId={websiteId}
+            sessionId={sessionId}
+            startDate={data?.firstAt}
+            endDate={data?.lastAt}
+          />
         </div>
         <div className={styles.data}>
           <SessionData websiteId={websiteId} sessionId={sessionId} />
diff --git a/src/components/hooks/queries/useSessionActivity.ts b/src/components/hooks/queries/useSessionActivity.ts
index e6d7ffa0e4..16c139ab38 100644
--- a/src/components/hooks/queries/useSessionActivity.ts
+++ b/src/components/hooks/queries/useSessionActivity.ts
@@ -1,12 +1,21 @@
 import { useApi } from './useApi';
 
-export function useSessionActivity(websiteId: string, sessionId: string) {
+export function useSessionActivity(
+  websiteId: string,
+  sessionId: string,
+  startDate: Date,
+  endDate: Date,
+) {
   const { get, useQuery } = useApi();
 
   return useQuery({
-    queryKey: ['session:activity', { websiteId, sessionId }],
+    queryKey: ['session:activity', { websiteId, sessionId, startDate, endDate }],
     queryFn: () => {
-      return get(`/websites/${websiteId}/sessions/${sessionId}/activity`);
+      return get(`/websites/${websiteId}/sessions/${sessionId}/activity`, {
+        startAt: +new Date(startDate),
+        endAt: +new Date(endDate),
+      });
     },
+    enabled: Boolean(websiteId && sessionId && startDate && endDate),
   });
 }
diff --git a/src/declaration.d.ts b/src/declaration.d.ts
index d968c14d5e..986adf2723 100644
--- a/src/declaration.d.ts
+++ b/src/declaration.d.ts
@@ -1,5 +1,4 @@
 declare module 'cors';
-declare module 'dateformat';
 declare module 'debug';
 declare module 'chartjs-adapter-date-fns';
 declare module 'md5';
diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index 63027d7525..474417b93c 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -1,4 +1,5 @@
 import { ClickHouseClient, createClient } from '@clickhouse/client';
+import { formatInTimeZone } from 'date-fns-tz';
 import debug from 'debug';
 import { CLICKHOUSE } from 'lib/db';
 import { DEFAULT_PAGE_SIZE, OPERATORS } from './constants';
@@ -48,6 +49,10 @@ function getClient() {
   return client;
 }
 
+function getUTCString(date?: Date) {
+  return formatInTimeZone(date || new Date(), 'UTC', 'yyyy-MM-dd HH:mm:ss');
+}
+
 function getDateStringSQL(data: any, unit: string = 'utc', timezone?: string) {
   if (timezone) {
     return `formatDateTime(${data}, '${CLICKHOUSE_DATE_FORMATS[unit]}', '${timezone}')`;
@@ -221,6 +226,7 @@ export default {
   getDateStringSQL,
   getDateSQL,
   getFilterQuery,
+  getUTCString,
   parseFilters,
   pagedQuery,
   findUnique,
diff --git a/src/pages/api/websites/[websiteId]/session-data/properties.ts b/src/pages/api/websites/[websiteId]/session-data/properties.ts
index 4cd2e1e62e..92e182d298 100644
--- a/src/pages/api/websites/[websiteId]/session-data/properties.ts
+++ b/src/pages/api/websites/[websiteId]/session-data/properties.ts
@@ -6,7 +6,7 @@ import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { getSessionDataProperties } from 'queries';
 import * as yup from 'yup';
 
-export interface EventDataFieldsRequestQuery {
+export interface SessionDataFieldsRequestQuery {
   websiteId: string;
   startAt: string;
   endAt: string;
@@ -23,7 +23,7 @@ const schema = {
 };
 
 export default async (
-  req: NextApiRequestQueryBody<EventDataFieldsRequestQuery>,
+  req: NextApiRequestQueryBody<SessionDataFieldsRequestQuery>,
   res: NextApiResponse<any>,
 ) => {
   await useCors(req, res);
diff --git a/src/pages/api/websites/[websiteId]/sessions/[sessionId]/activity.ts b/src/pages/api/websites/[websiteId]/sessions/[sessionId]/activity.ts
index 8d1b234617..2b0fc0847e 100644
--- a/src/pages/api/websites/[websiteId]/sessions/[sessionId]/activity.ts
+++ b/src/pages/api/websites/[websiteId]/sessions/[sessionId]/activity.ts
@@ -9,12 +9,16 @@ import { getSessionActivity } from 'queries';
 export interface SessionActivityRequestQuery extends PageParams {
   websiteId: string;
   sessionId: string;
+  startAt: number;
+  endAt: number;
 }
 
 const schema = {
   GET: yup.object().shape({
     websiteId: yup.string().uuid().required(),
     sessionId: yup.string().uuid().required(),
+    startAt: yup.number().integer(),
+    endAt: yup.number().integer(),
   }),
 };
 
@@ -26,14 +30,17 @@ export default async (
   await useAuth(req, res);
   await useValidate(schema, req, res);
 
-  const { websiteId, sessionId } = req.query;
+  const { websiteId, sessionId, startAt, endAt } = req.query;
 
   if (req.method === 'GET') {
     if (!(await canViewWebsite(req.auth, websiteId))) {
       return unauthorized(res);
     }
 
-    const data = await getSessionActivity(websiteId, sessionId);
+    const startDate = new Date(+startAt);
+    const endDate = new Date(+endAt);
+
+    const data = await getSessionActivity(websiteId, sessionId, startDate, endDate);
 
     return ok(res, data);
   }
diff --git a/src/queries/analytics/events/saveEvent.ts b/src/queries/analytics/events/saveEvent.ts
index 5e21e303ff..6c0f917baa 100644
--- a/src/queries/analytics/events/saveEvent.ts
+++ b/src/queries/analytics/events/saveEvent.ts
@@ -135,10 +135,10 @@ async function clickhouseQuery(data: {
     city,
     ...args
   } = data;
-  const { insert } = clickhouse;
+  const { insert, getUTCString } = clickhouse;
   const { sendMessage } = kafka;
   const eventId = uuid();
-  const createdAt = new Date().toISOString();
+  const createdAt = getUTCString();
 
   const message = {
     ...args,
diff --git a/src/queries/analytics/sessions/getSessionActivity.ts b/src/queries/analytics/sessions/getSessionActivity.ts
index 47c5f590d8..c50a82d97e 100644
--- a/src/queries/analytics/sessions/getSessionActivity.ts
+++ b/src/queries/analytics/sessions/getSessionActivity.ts
@@ -2,32 +2,43 @@ import clickhouse from 'lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import prisma from 'lib/prisma';
 
-export async function getSessionActivity(...args: [websiteId: string, sessionId: string]) {
+export async function getSessionActivity(
+  ...args: [websiteId: string, sessionId: string, startDate: Date, endDate: Date]
+) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
   });
 }
 
-async function relationalQuery(websiteId: string, sessionId: string) {
+async function relationalQuery(
+  websiteId: string,
+  sessionId: string,
+  startDate: Date,
+  endDate: Date,
+) {
   return prisma.client.websiteEvent.findMany({
     where: {
       id: sessionId,
       websiteId,
+      createdAt: { gte: startDate, lte: endDate },
     },
     take: 500,
   });
 }
 
-async function clickhouseQuery(websiteId: string, sessionId: string) {
-  const { rawQuery, getDateStringSQL } = clickhouse;
+async function clickhouseQuery(
+  websiteId: string,
+  sessionId: string,
+  startDate: Date,
+  endDate: Date,
+) {
+  const { rawQuery } = clickhouse;
 
   return rawQuery(
     `
     select
-      session_id as id,
-      website_id as websiteId,
-      ${getDateStringSQL('created_at')} as createdAt,
+      created_at as createdAt,
       url_path as urlPath,
       url_query as urlQuery,
       referrer_domain as referrerDomain,
@@ -38,9 +49,10 @@ async function clickhouseQuery(websiteId: string, sessionId: string) {
     from website_event
     where website_id = {websiteId:UUID}
       and session_id = {sessionId:UUID} 
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
     order by created_at desc
     limit 500
     `,
-    { websiteId, sessionId },
+    { websiteId, sessionId, startDate, endDate },
   );
 }
diff --git a/src/queries/analytics/sessions/saveSessionData.ts b/src/queries/analytics/sessions/saveSessionData.ts
index d932f7ed27..5259239a76 100644
--- a/src/queries/analytics/sessions/saveSessionData.ts
+++ b/src/queries/analytics/sessions/saveSessionData.ts
@@ -80,9 +80,9 @@ async function clickhouseQuery(data: {
 }) {
   const { websiteId, sessionId, sessionData } = data;
 
-  const { insert } = clickhouse;
+  const { insert, getUTCString } = clickhouse;
   const { sendMessages } = kafka;
-  const createdAt = new Date().toISOString();
+  const createdAt = getUTCString();
 
   const jsonKeys = flattenJSON(sessionData);
 

From 53d8548909ea68cdb8ab7c6ef22c798444d0c4b4 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 16 Aug 2024 23:42:26 -0700
Subject: [PATCH 282/438] Weekly session data.

---
 .../[websiteId]/sessions/SessionsPage.tsx     |  6 +-
 .../sessions/SessionsWeekly.module.css        | 40 ++++++++++
 .../[websiteId]/sessions/SessionsWeekly.tsx   | 78 +++++++++++++++++++
 src/components/charts/BubbleChart.tsx         | 27 +++++++
 src/components/common/LoadingPanel.module.css | 10 +++
 src/components/common/LoadingPanel.tsx        |  6 +-
 src/components/hooks/index.ts                 |  1 +
 .../hooks/queries/useWebsiteSessionsWeekly.ts | 24 ++++++
 src/lib/date.ts                               | 14 ++++
 src/lib/prisma.ts                             | 13 ++++
 .../websites/[websiteId]/sessions/weekly.ts   | 47 +++++++++++
 .../sessions/getWebsiteSessionsWeekly.ts      | 69 ++++++++++++++++
 src/queries/index.ts                          |  1 +
 13 files changed, 331 insertions(+), 5 deletions(-)
 create mode 100644 src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css
 create mode 100644 src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.tsx
 create mode 100644 src/components/charts/BubbleChart.tsx
 create mode 100644 src/components/hooks/queries/useWebsiteSessionsWeekly.ts
 create mode 100644 src/pages/api/websites/[websiteId]/sessions/weekly.ts
 create mode 100644 src/queries/analytics/sessions/getWebsiteSessionsWeekly.ts

diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx
index 1b3ba6dd4e..30fd193dbf 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx
@@ -8,6 +8,7 @@ import { GridRow } from 'components/layout/Grid';
 import { Item, Tabs } from 'react-basics';
 import { useState } from 'react';
 import { useMessages } from 'components/hooks';
+import SessionsWeekly from './SessionsWeekly';
 
 export function SessionsPage({ websiteId }) {
   const [tab, setTab] = useState('activity');
@@ -17,8 +18,9 @@ export function SessionsPage({ websiteId }) {
     <>
       <WebsiteHeader websiteId={websiteId} />
       <SessionsMetricsBar websiteId={websiteId} />
-      <GridRow columns="one">
-        <WorldMap websiteId={websiteId} style={{ width: 800, margin: '0 auto' }} />
+      <GridRow columns="two-one">
+        <WorldMap websiteId={websiteId} />
+        <SessionsWeekly websiteId={websiteId} />
       </GridRow>
       <Tabs selectedKey={tab} onSelect={(value: any) => setTab(value)} style={{ marginBottom: 30 }}>
         <Item key="activity">{formatMessage(labels.activity)}</Item>
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css b/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css
new file mode 100644
index 0000000000..4b41d87ceb
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css
@@ -0,0 +1,40 @@
+.week {
+  display: flex;
+  justify-content: space-between;
+  position: relative;
+}
+
+.header {
+  text-align: center;
+  font-weight: 700;
+  margin-bottom: 10px;
+}
+
+.day {
+  display: flex;
+  flex-direction: column;
+  gap: 5px;
+  position: relative;
+}
+
+.cell {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: var(--base100);
+  width: 20px;
+  height: 20px;
+}
+
+.hour {
+  font-weight: 700;
+  color: var(--font-color300);
+  background-color: transparent;
+}
+
+.block {
+  background-color: var(--primary400);
+  width: 20px;
+  height: 20px;
+  border-radius: 3px;
+}
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.tsx
new file mode 100644
index 0000000000..6c0984ea53
--- /dev/null
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.tsx
@@ -0,0 +1,78 @@
+import { format } from 'date-fns';
+import { useLocale, useMessages, useWebsiteSessionsWeekly } from 'components/hooks';
+import { LoadingPanel } from 'components/common/LoadingPanel';
+import { getDayOfWeekAsDate } from 'lib/date';
+import styles from './SessionsWeekly.module.css';
+import classNames from 'classnames';
+import { TooltipPopup } from 'react-basics';
+
+export function SessionsWeekly({ websiteId }: { websiteId: string }) {
+  const { data, ...props } = useWebsiteSessionsWeekly(websiteId);
+  const { dateLocale } = useLocale();
+  const { labels, formatMessage } = useMessages();
+
+  const [, max] = data
+    ? data.reduce((arr: number[], hours: number[], index: number) => {
+        const min = Math.min(...hours);
+        const max = Math.max(...hours);
+
+        if (index === 0) {
+          return [min, max];
+        }
+
+        if (min < arr[0]) {
+          arr[0] = min;
+        }
+
+        if (max > arr[1]) {
+          arr[1] = max;
+        }
+
+        return arr;
+      }, [])
+    : [];
+
+  return (
+    <LoadingPanel {...(props as any)} data={data}>
+      <div className={styles.week}>
+        <div className={styles.day}>
+          <div className={styles.header}>&nbsp;</div>
+          {Array(24)
+            .fill(null)
+            .map((_, i) => {
+              return (
+                <div key={i} className={classNames(styles.cell, styles.hour)}>
+                  {i.toString().padStart(2, '0')}
+                </div>
+              );
+            })}
+        </div>
+        {data?.map((day: number[], index: number) => {
+          return (
+            <div className={styles.day} key={index}>
+              <div className={styles.header}>
+                {format(getDayOfWeekAsDate(index), 'EEE', { locale: dateLocale })}
+              </div>
+              {day?.map((hour: number) => {
+                return (
+                  <div key={hour} className={classNames(styles.cell)}>
+                    {hour > 0 && (
+                      <TooltipPopup
+                        label={`${formatMessage(labels.visitors)}: ${hour}`}
+                        position="right"
+                      >
+                        <div className={styles.block} style={{ opacity: hour / max }} />
+                      </TooltipPopup>
+                    )}
+                  </div>
+                );
+              })}
+            </div>
+          );
+        })}
+      </div>
+    </LoadingPanel>
+  );
+}
+
+export default SessionsWeekly;
diff --git a/src/components/charts/BubbleChart.tsx b/src/components/charts/BubbleChart.tsx
new file mode 100644
index 0000000000..956e260cbd
--- /dev/null
+++ b/src/components/charts/BubbleChart.tsx
@@ -0,0 +1,27 @@
+import { Chart, ChartProps } from 'components/charts/Chart';
+import { useState } from 'react';
+import { StatusLight } from 'react-basics';
+import { formatLongNumber } from 'lib/format';
+
+export interface BubbleChartProps extends ChartProps {
+  type?: 'bubble';
+}
+
+export default function BubbleChart(props: BubbleChartProps) {
+  const [tooltip, setTooltip] = useState(null);
+  const { type = 'bubble' } = props;
+
+  const handleTooltip = ({ tooltip }) => {
+    const { labelColors, dataPoints } = tooltip;
+
+    setTooltip(
+      tooltip.opacity ? (
+        <StatusLight color={labelColors?.[0]?.backgroundColor}>
+          {formatLongNumber(dataPoints?.[0]?.raw)} {dataPoints?.[0]?.label}
+        </StatusLight>
+      ) : null,
+    );
+  };
+
+  return <Chart {...props} type={type} tooltip={tooltip} onTooltip={handleTooltip} />;
+}
diff --git a/src/components/common/LoadingPanel.module.css b/src/components/common/LoadingPanel.module.css
index 2dc8b75ee3..00d6cbb4f4 100644
--- a/src/components/common/LoadingPanel.module.css
+++ b/src/components/common/LoadingPanel.module.css
@@ -3,4 +3,14 @@
   flex-direction: column;
   position: relative;
   flex: 1;
+  height: 100%;
+}
+
+.loading {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  margin: auto;
 }
diff --git a/src/components/common/LoadingPanel.tsx b/src/components/common/LoadingPanel.tsx
index 487252be6a..36de93651a 100644
--- a/src/components/common/LoadingPanel.tsx
+++ b/src/components/common/LoadingPanel.tsx
@@ -1,9 +1,9 @@
 import { ReactNode } from 'react';
-import styles from './LoadingPanel.module.css';
 import classNames from 'classnames';
-import ErrorMessage from 'components/common/ErrorMessage';
 import { Loading } from 'react-basics';
+import ErrorMessage from 'components/common/ErrorMessage';
 import Empty from 'components/common/Empty';
+import styles from './LoadingPanel.module.css';
 
 export function LoadingPanel({
   data,
@@ -27,7 +27,7 @@ export function LoadingPanel({
 
   return (
     <div className={classNames(styles.panel, className)}>
-      {isLoading && !isFetched && <Loading icon={loadingIcon} />}
+      {isLoading && !isFetched && <Loading className={styles.loading} icon={loadingIcon} />}
       {error && <ErrorMessage />}
       {!error && isEmpty && <Empty />}
       {!error && !isEmpty && data && children}
diff --git a/src/components/hooks/index.ts b/src/components/hooks/index.ts
index 4e9c49d693..1be99732e0 100644
--- a/src/components/hooks/index.ts
+++ b/src/components/hooks/index.ts
@@ -14,6 +14,7 @@ export * from './queries/useSessionDataProperties';
 export * from './queries/useSessionDataValues';
 export * from './queries/useWebsiteSession';
 export * from './queries/useWebsiteSessions';
+export * from './queries/useWebsiteSessionsWeekly';
 export * from './queries/useShareToken';
 export * from './queries/useTeam';
 export * from './queries/useTeams';
diff --git a/src/components/hooks/queries/useWebsiteSessionsWeekly.ts b/src/components/hooks/queries/useWebsiteSessionsWeekly.ts
new file mode 100644
index 0000000000..5df543f507
--- /dev/null
+++ b/src/components/hooks/queries/useWebsiteSessionsWeekly.ts
@@ -0,0 +1,24 @@
+import { useApi } from './useApi';
+import useModified from '../useModified';
+import { useFilterParams } from 'components/hooks/useFilterParams';
+
+export function useWebsiteSessionsWeekly(
+  websiteId: string,
+  params?: { [key: string]: string | number },
+) {
+  const { get, useQuery } = useApi();
+  const { modified } = useModified(`sessions`);
+  const filters = useFilterParams(websiteId);
+
+  return useQuery({
+    queryKey: ['sessions', { websiteId, modified, ...params, ...filters }],
+    queryFn: () => {
+      return get(`/websites/${websiteId}/sessions/weekly`, {
+        ...params,
+        ...filters,
+      });
+    },
+  });
+}
+
+export default useWebsiteSessionsWeekly;
diff --git a/src/lib/date.ts b/src/lib/date.ts
index 2fb24073a6..b8bfa6c765 100644
--- a/src/lib/date.ts
+++ b/src/lib/date.ts
@@ -34,6 +34,7 @@ import {
   addWeeks,
   subWeeks,
   endOfMinute,
+  isSameDay,
 } from 'date-fns';
 import { getDateLocale } from 'lib/lang';
 import { DateRange } from 'lib/types';
@@ -336,3 +337,16 @@ export function getCompareDate(compare: string, startDate: Date, endDate: Date)
 
   return { startDate: subMinutes(startDate, diff), endDate: subMinutes(endDate, diff) };
 }
+
+export function getDayOfWeekAsDate(dayOfWeek: number) {
+  const startOfWeekDay = startOfWeek(new Date());
+  const daysToAdd = [0, 1, 2, 3, 4, 5, 6].indexOf(dayOfWeek);
+  let currentDate = addDays(startOfWeekDay, daysToAdd);
+
+  // Ensure we're not returning a past date
+  if (isSameDay(currentDate, startOfWeekDay)) {
+    currentDate = addDays(currentDate, 7);
+  }
+
+  return currentDate;
+}
diff --git a/src/lib/prisma.ts b/src/lib/prisma.ts
index 28835414fc..1fbb3cd4f7 100644
--- a/src/lib/prisma.ts
+++ b/src/lib/prisma.ts
@@ -81,6 +81,18 @@ function getDateSQL(field: string, unit: string, timezone?: string): string {
   }
 }
 
+function getDateWeeklySQL(field: string) {
+  const db = getDatabaseType();
+
+  if (db === POSTGRESQL) {
+    return `EXTRACT(DOW FROM ${field})`;
+  }
+
+  if (db === MYSQL) {
+    return `DAYOFWEEK(${field})-1`;
+  }
+}
+
 export function getTimestampSQL(field: string) {
   const db = getDatabaseType();
 
@@ -284,6 +296,7 @@ export default {
   getCastColumnQuery,
   getDayDiffQuery,
   getDateSQL,
+  getDateWeeklySQL,
   getFilterQuery,
   getSearchParameters,
   getTimestampDiffSQL,
diff --git a/src/pages/api/websites/[websiteId]/sessions/weekly.ts b/src/pages/api/websites/[websiteId]/sessions/weekly.ts
new file mode 100644
index 0000000000..f33970d0b7
--- /dev/null
+++ b/src/pages/api/websites/[websiteId]/sessions/weekly.ts
@@ -0,0 +1,47 @@
+import * as yup from 'yup';
+import { canViewWebsite } from 'lib/auth';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody, PageParams } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { pageInfo } from 'lib/schema';
+import { getWebsiteSessionsWeekly } from 'queries';
+
+export interface ReportsRequestQuery extends PageParams {
+  websiteId: string;
+}
+
+const schema = {
+  GET: yup.object().shape({
+    websiteId: yup.string().uuid().required(),
+    startAt: yup.number().integer().required(),
+    endAt: yup.number().integer().min(yup.ref('startAt')).required(),
+    ...pageInfo,
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<ReportsRequestQuery, any>,
+  res: NextApiResponse,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  const { websiteId, startAt, endAt } = req.query;
+
+  if (req.method === 'GET') {
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const startDate = new Date(+startAt);
+    const endDate = new Date(+endAt);
+
+    const data = await getWebsiteSessionsWeekly(websiteId, { startDate, endDate });
+
+    return ok(res, data);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/src/queries/analytics/sessions/getWebsiteSessionsWeekly.ts b/src/queries/analytics/sessions/getWebsiteSessionsWeekly.ts
new file mode 100644
index 0000000000..9031edf510
--- /dev/null
+++ b/src/queries/analytics/sessions/getWebsiteSessionsWeekly.ts
@@ -0,0 +1,69 @@
+import prisma from 'lib/prisma';
+import clickhouse from 'lib/clickhouse';
+import { runQuery, PRISMA, CLICKHOUSE } from 'lib/db';
+import { QueryFilters } from 'lib/types';
+
+export async function getWebsiteSessionsWeekly(
+  ...args: [websiteId: string, filters?: QueryFilters]
+) {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(websiteId: string, filters: QueryFilters) {
+  const { rawQuery, getDateWeeklySQL, parseFilters } = prisma;
+  const { params } = await parseFilters(websiteId, filters);
+
+  return rawQuery(
+    `
+    select
+      ${getDateWeeklySQL('created_at')} as time,
+      count(distinct session_id) as value
+    from website_event_stats_hourly
+    where website_id = {{websiteId::uuid}}
+      and created_at between {{startDate}} and {{endDate}}
+    group by time
+    order by 2
+    `,
+    params,
+  ).then(formatResults);
+}
+
+async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
+  const { rawQuery } = clickhouse;
+  const { startDate, endDate } = filters;
+
+  return rawQuery(
+    `
+    select
+      formatDateTime(created_at, '%w:%H') as time,
+      count(distinct session_id) as value
+    from website_event_stats_hourly
+    where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+    group by time
+    order by time
+    `,
+    { websiteId, startDate, endDate },
+  ).then(formatResults);
+}
+
+function formatResults(data: any) {
+  const days = [];
+
+  for (let i = 0; i < 7; i++) {
+    days.push([]);
+
+    for (let j = 0; j < 24; j++) {
+      days[i].push(
+        Number(
+          data.find(({ time }) => time === `${i}:${j.toString().padStart(2, '0')}`)?.value || 0,
+        ),
+      );
+    }
+  }
+
+  return days;
+}
diff --git a/src/queries/index.ts b/src/queries/index.ts
index f9c44dba94..26c1df09a6 100644
--- a/src/queries/index.ts
+++ b/src/queries/index.ts
@@ -26,6 +26,7 @@ export * from './analytics/sessions/getSessionDataProperties';
 export * from './analytics/sessions/getSessionDataValues';
 export * from './analytics/sessions/getSessionMetrics';
 export * from './analytics/sessions/getWebsiteSessions';
+export * from './analytics/sessions/getWebsiteSessionsWeekly';
 export * from './analytics/sessions/getSessionActivity';
 export * from './analytics/sessions/getSessionStats';
 export * from './analytics/sessions/saveSessionData';

From b6b1488ddf1856bad9d225ce50aa2a1f31559f32 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Sat, 17 Aug 2024 20:00:58 -0700
Subject: [PATCH 283/438] Updated packages.

---
 package.json |  10 +--
 yarn.lock    | 168 +++++++++++++++++++++++++--------------------------
 2 files changed, 89 insertions(+), 89 deletions(-)

diff --git a/package.json b/package.json
index d6217788d3..351596fb1a 100644
--- a/package.json
+++ b/package.json
@@ -64,12 +64,12 @@
     ".next/cache"
   ],
   "dependencies": {
-    "@clickhouse/client": "^1.3.0",
+    "@clickhouse/client": "^1.4.1",
     "@date-fns/utc": "^1.2.0",
     "@dicebear/collection": "^9.2.1",
     "@dicebear/core": "^9.2.1",
     "@fontsource/inter": "^4.5.15",
-    "@prisma/client": "5.17.0",
+    "@prisma/client": "5.18.0",
     "@prisma/extension-read-replicas": "^0.3.0",
     "@react-spring/web": "^9.7.3",
     "@tanstack/react-query": "^5.28.6",
@@ -95,7 +95,7 @@
     "is-ci": "^3.0.1",
     "is-docker": "^3.0.0",
     "is-localhost-ip": "^1.4.0",
-    "isbot": "^5.1.1",
+    "isbot": "^5.1.16",
     "kafkajs": "^2.1.0",
     "maxmind": "^4.3.6",
     "md5": "^2.3.0",
@@ -104,7 +104,7 @@
     "next-basics": "^0.39.0",
     "node-fetch": "^3.2.8",
     "npm-run-all": "^4.1.5",
-    "prisma": "5.17.0",
+    "prisma": "5.18.0",
     "react": "^18.2.0",
     "react-basics": "^0.125.0",
     "react-beautiful-dnd": "^13.1.0",
@@ -119,7 +119,7 @@
     "thenby": "^1.3.4",
     "uuid": "^9.0.0",
     "yup": "^0.32.11",
-    "zustand": "^4.3.8"
+    "zustand": "^4.5.5"
   },
   "devDependencies": {
     "@formatjs/cli": "^4.2.29",
diff --git a/yarn.lock b/yarn.lock
index cf78cc0c6a..0abea883e2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1199,17 +1199,17 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@clickhouse/client-common@1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@clickhouse/client-common/-/client-common-1.4.0.tgz#6936f667ba901724bf9174cc2b783507e921868f"
-  integrity sha512-kglG8YyWnR1K24RckUf5ZdNTN0U0s+a1j/bpCO4ZjzjO87ICgWlXFVD22pZqSACW7/2IIi1IkzbwtxKI2s/MOw==
+"@clickhouse/client-common@1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@clickhouse/client-common/-/client-common-1.4.1.tgz#23c6ffbff5717729e533301c9f595cd79af221ef"
+  integrity sha512-f5eoTrUSDplrMoi3ddeZ0MzGTn0iGMByEQ8j63eVMoBSOI2+F6jEIPcW2tWofT79Rvnn3RRlveYcShiaIiCJyw==
 
-"@clickhouse/client@^1.3.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@clickhouse/client/-/client-1.4.0.tgz#84e17f8c0f2ba109d8e76c3d4f5830aeff5e9459"
-  integrity sha512-O4mbFPM/wQtFck01ghYI2mnNHv9jSFEiQBsTCH4t6MKeGHNAPkJGaFGv+KycLTv6zjnQNjiUGdXDMVRema5SyA==
+"@clickhouse/client@^1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@clickhouse/client/-/client-1.4.1.tgz#be4303d81f42835c5f168de61babd1a67d821f5a"
+  integrity sha512-12iV+MeykxdQySRFHwaVU+hKUv3JP6kdwOI+z3zzyfPVYHynTlV8emJjjGZR0+VfRaj3PCMuQfryfsJ82nh9WQ==
   dependencies:
-    "@clickhouse/client-common" "1.4.0"
+    "@clickhouse/client-common" "1.4.1"
 
 "@colors/colors@1.5.0":
   version "1.5.0"
@@ -2280,51 +2280,51 @@
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
   integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
 
-"@prisma/client@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.17.0.tgz#9079947bd749689c2dabfb9ecc70a24ebefb1f43"
-  integrity sha512-N2tnyKayT0Zf7mHjwEyE8iG7FwTmXDHFZ1GnNhQp0pJUObsuel4ZZ1XwfuAYkq5mRIiC/Kot0kt0tGCfLJ70Jw==
+"@prisma/client@5.18.0":
+  version "5.18.0"
+  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.18.0.tgz#526e4281a448f214c0ff81d65c39243608c98294"
+  integrity sha512-BWivkLh+af1kqC89zCJYkHsRcyWsM8/JHpsDMM76DjP3ZdEquJhXa4IeX+HkWPnwJ5FanxEJFZZDTWiDs/Kvyw==
 
-"@prisma/debug@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.17.0.tgz#a765105848993984535b6066f8ebc6e6ead26533"
-  integrity sha512-l7+AteR3P8FXiYyo496zkuoiJ5r9jLQEdUuxIxNCN1ud8rdbH3GTxm+f+dCyaSv9l9WY+29L9czaVRXz9mULfg==
+"@prisma/debug@5.18.0":
+  version "5.18.0"
+  resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.18.0.tgz#527799e044d2903a35945e61ac2d8916e4b61ead"
+  integrity sha512-f+ZvpTLidSo3LMJxQPVgAxdAjzv5OpzAo/eF8qZqbwvgi2F5cTOI9XCpdRzJYA0iGfajjwjOKKrVq64vkxEfUw==
 
-"@prisma/engines-version@5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053":
-  version "5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053"
-  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053.tgz#3c7cc1ef3ebc34cbd069e5873b9982f2aabf5acd"
-  integrity sha512-tUuxZZysZDcrk5oaNOdrBnnkoTtmNQPkzINFDjz7eG6vcs9AVDmA/F6K5Plsb2aQc/l5M2EnFqn3htng9FA4hg==
+"@prisma/engines-version@5.18.0-25.4c784e32044a8a016d99474bd02a3b6123742169":
+  version "5.18.0-25.4c784e32044a8a016d99474bd02a3b6123742169"
+  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.18.0-25.4c784e32044a8a016d99474bd02a3b6123742169.tgz#203426ebf4ec4e1acce7da4a59ec8f0df92b29e7"
+  integrity sha512-a/+LpJj8vYU3nmtkg+N3X51ddbt35yYrRe8wqHTJtYQt7l1f8kjIBcCs6sHJvodW/EK5XGvboOiwm47fmNrbgg==
 
-"@prisma/engines@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.17.0.tgz#74dd1aabb22675892760b3cf69a448e3aef4616b"
-  integrity sha512-+r+Nf+JP210Jur+/X8SIPLtz+uW9YA4QO5IXA+KcSOBe/shT47bCcRMTYCbOESw3FFYFTwe7vU6KTWHKPiwvtg==
+"@prisma/engines@5.18.0":
+  version "5.18.0"
+  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.18.0.tgz#26ea46e26498be622407cf95663d7fb4c39c895b"
+  integrity sha512-ofmpGLeJ2q2P0wa/XaEgTnX/IsLnvSp/gZts0zjgLNdBhfuj2lowOOPmDcfKljLQUXMvAek3lw5T01kHmCG8rg==
   dependencies:
-    "@prisma/debug" "5.17.0"
-    "@prisma/engines-version" "5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053"
-    "@prisma/fetch-engine" "5.17.0"
-    "@prisma/get-platform" "5.17.0"
+    "@prisma/debug" "5.18.0"
+    "@prisma/engines-version" "5.18.0-25.4c784e32044a8a016d99474bd02a3b6123742169"
+    "@prisma/fetch-engine" "5.18.0"
+    "@prisma/get-platform" "5.18.0"
 
 "@prisma/extension-read-replicas@^0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/@prisma/extension-read-replicas/-/extension-read-replicas-0.3.0.tgz#2842a7c928f957c1dd58a6256104797596d43426"
   integrity sha512-F9+rSmYday6GT2qjhJtkZcBOpLO5LtpvFcMGqrBDHf+78LEdSuxfFjOxYlNuqk4B+th62yxpbhfpmB9/Mca14Q==
 
-"@prisma/fetch-engine@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.17.0.tgz#f718dc7426411d1ebeeee53e2d0d38652387f87c"
-  integrity sha512-ESxiOaHuC488ilLPnrv/tM2KrPhQB5TRris/IeIV4ZvUuKeaicCl4Xj/JCQeG9IlxqOgf1cCg5h5vAzlewN91Q==
+"@prisma/fetch-engine@5.18.0":
+  version "5.18.0"
+  resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.18.0.tgz#5b343e2b36b27e2713901ddd032ddd6932b3d55f"
+  integrity sha512-I/3u0x2n31rGaAuBRx2YK4eB7R/1zCuayo2DGwSpGyrJWsZesrV7QVw7ND0/Suxeo/vLkJ5OwuBqHoCxvTHpOg==
   dependencies:
-    "@prisma/debug" "5.17.0"
-    "@prisma/engines-version" "5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053"
-    "@prisma/get-platform" "5.17.0"
+    "@prisma/debug" "5.18.0"
+    "@prisma/engines-version" "5.18.0-25.4c784e32044a8a016d99474bd02a3b6123742169"
+    "@prisma/get-platform" "5.18.0"
 
-"@prisma/get-platform@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.17.0.tgz#89fdcae2adddebbbf0e7bd0474a6c49d6023519b"
-  integrity sha512-UlDgbRozCP1rfJ5Tlkf3Cnftb6srGrEQ4Nm3og+1Se2gWmCZ0hmPIi+tQikGDUVLlvOWx3Gyi9LzgRP+HTXV9w==
+"@prisma/get-platform@5.18.0":
+  version "5.18.0"
+  resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.18.0.tgz#0dc4c82fe9a4971f4519a57cb2dd69d8e0df4b71"
+  integrity sha512-Tk+m7+uhqcKDgnMnFN0lRiH7Ewea0OEsZZs9pqXa7i3+7svS3FSCqDBCaM9x5fmhhkufiG0BtunJVDka+46DlA==
   dependencies:
-    "@prisma/debug" "5.17.0"
+    "@prisma/debug" "5.18.0"
 
 "@react-spring/animated@~9.7.4":
   version "9.7.4"
@@ -2633,9 +2633,9 @@
   integrity sha512-POQxm42IUp6n89kKWF4IZi18v3fxQWFRolvBA6phNVmA8psdfB1MvDnGacCJdS+EOX12w/CyHM62z//rHmYmvw==
 
 "@tanstack/react-query@^5.28.6":
-  version "5.51.21"
-  resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-5.51.21.tgz#cdd14677bcc809a83e01b6c38842c841ce7420af"
-  integrity sha512-Q/V81x3sAYgCsxjwOkfLXfrmoG+FmDhLeHH5okC/Bp8Aaw2c33lbEo/mMcMnkxUPVtB2FLpzHT0tq3c+OlZEbw==
+  version "5.51.23"
+  resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-5.51.23.tgz#83c223f4cb6054b206de8856b73ca7e41a63ba1f"
+  integrity sha512-CfJCfX45nnVIZjQBRYYtvVMIsGgWLKLYC4xcUiYEey671n1alvTZoCBaU9B85O8mF/tx9LPyrI04A6Bs2THv4A==
   dependencies:
     "@tanstack/query-core" "5.51.21"
 
@@ -2845,11 +2845,11 @@
   integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==
 
 "@types/node@*":
-  version "22.1.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.1.0.tgz#6d6adc648b5e03f0e83c78dc788c2b037d0ad94b"
-  integrity sha512-AOmuRF0R2/5j1knA3c6G3HOk523Ga+l+ZXltX8SF1+5oqcXijjfTd8fY3XRZqSihEu9XhtQnKYLmkFaoxgsJHw==
+  version "22.4.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.4.0.tgz#c295fe1d6f5f58916cc61dbef8cf65b5b9b71de9"
+  integrity sha512-49AbMDwYUz7EXxKU/r7mXOsxwFr4BYbvB7tWYxVuLdb2ibd30ijjXINSMAHiEEZk5PCRBmW1gUeisn2VMKt3cQ==
   dependencies:
-    undici-types "~6.13.0"
+    undici-types "~6.19.2"
 
 "@types/node@14":
   version "14.18.63"
@@ -2862,11 +2862,11 @@
   integrity sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==
 
 "@types/node@^20.9.0":
-  version "20.14.14"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.14.tgz#6b655d4a88623b0edb98300bb9dd2107225f885e"
-  integrity sha512-d64f00982fS9YoOgJkAMolK7MN8Iq3TDdVjchbYHdEmjth/DHowx82GnoA+tVUAN+7vxfYUgAzi+JXbKNd2SDQ==
+  version "20.15.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.15.0.tgz#7305f7fe7c62cd31047ed8d65c5092f0b0e1c55d"
+  integrity sha512-eQf4OkH6gA9v1W0iEpht/neozCsZKMTK+C4cU6/fv7wtJCCL8LEQ4hie2Ln8ZP/0YYM2xGj7//f8xyqItkJ6QA==
   dependencies:
-    undici-types "~5.26.4"
+    undici-types "~6.13.0"
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.3"
@@ -3581,9 +3581,9 @@ aws-sign2@~0.7.0:
   integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
 
 aws4@^1.8.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.13.0.tgz#d9b802e9bb9c248d7be5f7f5ef178dc3684e9dcc"
-  integrity sha512-3AungXC4I8kKsS9PuS4JH2nc+0bVY/mjgrephHTIi8fpEeGsTHBUJeosp0Wc1myYMElmD0B3Oc4XL/HVJ4PV2g==
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.13.1.tgz#bb5f8b8a20739f6ae1caeaf7eea2c7913df8048e"
+  integrity sha512-u5w79Rd7SU4JaIlA/zFqG+gOiuq25q5VLyZ8E+ijJeILuTxVzZgp2CaGw/UTw6pXYN9XMO9yiqj/nEHmhTG5CA==
 
 axe-core@^4.9.1:
   version "4.10.0"
@@ -4446,9 +4446,9 @@ cypress@*:
     yauzl "^2.10.0"
 
 cypress@^13.6.6:
-  version "13.13.2"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.13.2.tgz#c71f8d92056c430b1b879e5313f6de25ccce0eda"
-  integrity sha512-PvJQU33933NvS1StfzEb8/mu2kMy4dABwCF+yd5Bi7Qly1HOVf+Bufrygee/tlmty/6j5lX+KIi8j9Q3JUMbhA==
+  version "13.13.3"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.13.3.tgz#21ee054bb4e00b3858f2e33b4f8f4e69128470a9"
+  integrity sha512-hUxPrdbJXhUOTzuML+y9Av7CKoYznbD83pt8g3klgpioEha0emfx4WNIuVRx0C76r0xV2MIwAW9WYiXfVJYFQw==
   dependencies:
     "@cypress/request" "^3.0.1"
     "@cypress/xvfb" "^1.2.4"
@@ -6616,10 +6616,10 @@ isarray@^2.0.5:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
   integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
 
-isbot@^5.1.1:
-  version "5.1.13"
-  resolved "https://registry.yarnpkg.com/isbot/-/isbot-5.1.13.tgz#c291ae9f33d346c070648cb44d6ab2bb163650d1"
-  integrity sha512-RXtBib4m9zChSb+187EpNQML7Z3u2i34zDdqcRFZnqSJs0xdh91xzJytc5apYVg+9Y4NGnUQ0AIeJvX9FAnCUw==
+isbot@^5.1.16:
+  version "5.1.16"
+  resolved "https://registry.yarnpkg.com/isbot/-/isbot-5.1.16.tgz#652fac0ab5ba181cefc53aa156edcb76f28ac07d"
+  integrity sha512-zvRjcw/4UfKiCVx+/PqXPKthufO5m2PpJSbA0tVZY9ns7hlQRV1xqWpEFcqyfkK/MrChsXPmu1zpxECjcaEuKg==
 
 isexe@^2.0.0:
   version "2.0.0"
@@ -8888,9 +8888,9 @@ postcss@^8.4.28:
     source-map-js "^1.0.2"
 
 postcss@^8.4.31:
-  version "8.4.40"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.40.tgz#eb81f2a4dd7668ed869a6db25999e02e9ad909d8"
-  integrity sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==
+  version "8.4.41"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.41.tgz#d6104d3ba272d882fe18fc07d15dc2da62fa2681"
+  integrity sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==
   dependencies:
     nanoid "^3.3.7"
     picocolors "^1.0.1"
@@ -8927,12 +8927,12 @@ pretty-format@^29.0.0, pretty-format@^29.7.0:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
-prisma@5.17.0:
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.17.0.tgz#267b43921ab94805b010537cffa5ccaf530fa066"
-  integrity sha512-m4UWkN5lBE6yevqeOxEvmepnL5cNPEjzMw2IqDB59AcEV6w7D8vGljDLd1gPFH+W6gUxw9x7/RmN5dCS/WTPxA==
+prisma@5.18.0:
+  version "5.18.0"
+  resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.18.0.tgz#5ef69c802a075b7596231ea57003496873610b9e"
+  integrity sha512-+TrSIxZsh64OPOmaSgVPH7ALL9dfU0jceYaMJXsNrTkFHO7/3RANi5K2ZiPB1De9+KDxCWn7jvRq8y8pvk+o9g==
   dependencies:
-    "@prisma/engines" "5.17.0"
+    "@prisma/engines" "5.18.0"
 
 process@^0.11.10:
   version "0.11.10"
@@ -10518,16 +10518,16 @@ unbox-primitive@^1.0.2:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-
 undici-types@~6.13.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.13.0.tgz#e3e79220ab8c81ed1496b5812471afd7cf075ea5"
   integrity sha512-xtFJHudx8S2DSoujjMd1WeWvn7KKWFRESZTMeL1RptAYERu29D6jphMjjY+vn96jvN3kVPDNxU/E13VTaXj6jg==
 
+undici-types@~6.19.2:
+  version "6.19.6"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.6.tgz#e218c3df0987f4c0e0008ca00d6b6472d9b89b36"
+  integrity sha512-e/vggGopEfTKSvj4ihnOLTsqhrKRN3LeO6qSN/GxohhuRv8qH9bNQ4B8W7e/vFL+0XTnmHPB4/kegunZGA4Org==
+
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
@@ -10599,10 +10599,10 @@ use-memo-one@^1.1.1:
   resolved "https://registry.yarnpkg.com/use-memo-one/-/use-memo-one-1.1.3.tgz#2fd2e43a2169eabc7496960ace8c79efef975e99"
   integrity sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==
 
-use-sync-external-store@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a"
-  integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==
+use-sync-external-store@1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.2.tgz#c3b6390f3a30eba13200d2302dcdf1e7b57b2ef9"
+  integrity sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw==
 
 util-deprecate@^1.0.2:
   version "1.0.2"
@@ -10908,9 +10908,9 @@ yup@^0.32.11:
     property-expr "^2.0.4"
     toposort "^2.0.2"
 
-zustand@^4.3.8:
-  version "4.5.4"
-  resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.5.4.tgz#63abdd81edfb190bc61e0bbae045cc4d52158a05"
-  integrity sha512-/BPMyLKJPtFEvVL0E9E9BTUM63MNyhPGlvxk1XjrfWTUlV+BR8jufjsovHzrtR6YNcBEcL7cMHovL1n9xHawEg==
+zustand@^4.5.5:
+  version "4.5.5"
+  resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.5.5.tgz#f8c713041543715ec81a2adda0610e1dc82d4ad1"
+  integrity sha512-+0PALYNJNgK6hldkgDq2vLrw5f6g/jCInz52n9RTpropGgeAf/ioFUCdtsjCqu4gNhW9D01rUQBROoRjdzyn2Q==
   dependencies:
-    use-sync-external-store "1.2.0"
+    use-sync-external-store "1.2.2"

From ffa954ee02e74b22acbaea7cafa9b72ed1965e28 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Sat, 17 Aug 2024 20:27:40 -0700
Subject: [PATCH 284/438] Updated data query limits.

---
 src/lib/clickhouse.ts                                  | 2 +-
 src/lib/prisma.ts                                      | 8 ++++++++
 src/queries/analytics/events/getEventDataValues.ts     | 4 ++--
 src/queries/analytics/sessions/getSessionDataValues.ts | 4 ++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index 474417b93c..70f8d31d7b 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -189,7 +189,7 @@ async function rawQuery<T = unknown>(
     format: 'JSONEachRow',
   });
 
-  return resultSet.json() as T;
+  return (await resultSet.json()) as T;
 }
 
 async function insert(table: string, values: any[]) {
diff --git a/src/lib/prisma.ts b/src/lib/prisma.ts
index 1fbb3cd4f7..85b1bea7e0 100644
--- a/src/lib/prisma.ts
+++ b/src/lib/prisma.ts
@@ -1,3 +1,4 @@
+import debug from 'debug';
 import { Prisma } from '@prisma/client';
 import prisma from '@umami/prisma-client';
 import moment from 'moment-timezone';
@@ -8,6 +9,8 @@ import { maxDate } from './date';
 import { QueryFilters, QueryOptions, PageParams } from './types';
 import { filtersToArray } from './params';
 
+const log = debug('umami:prisma');
+
 const MYSQL_DATE_FORMATS = {
   minute: '%Y-%m-%d %H:%i:00',
   hour: '%Y-%m-%d %H:00:00',
@@ -210,6 +213,11 @@ async function parseFilters(
 }
 
 async function rawQuery(sql: string, data: object): Promise<any> {
+  if (process.env.LOG_QUERY) {
+    log('QUERY:\n', sql);
+    log('PARAMETERS:\n', data);
+  }
+
   const db = getDatabaseType();
   const params = [];
 
diff --git a/src/queries/analytics/events/getEventDataValues.ts b/src/queries/analytics/events/getEventDataValues.ts
index e055bfccc9..7ccd7a2863 100644
--- a/src/queries/analytics/events/getEventDataValues.ts
+++ b/src/queries/analytics/events/getEventDataValues.ts
@@ -35,7 +35,7 @@ async function relationalQuery(
     ${filterQuery}
     group by string_value
     order by 2 desc
-    limit 500
+    limit 100
     `,
     params,
   );
@@ -63,7 +63,7 @@ async function clickhouseQuery(
     ${filterQuery}
     group by event_name, value
     order by 2 desc
-    limit 500;
+    limit 100
     `,
     params,
   ).then(result => {
diff --git a/src/queries/analytics/sessions/getSessionDataValues.ts b/src/queries/analytics/sessions/getSessionDataValues.ts
index fd67e7a99a..74524204ad 100644
--- a/src/queries/analytics/sessions/getSessionDataValues.ts
+++ b/src/queries/analytics/sessions/getSessionDataValues.ts
@@ -31,7 +31,7 @@ async function relationalQuery(
     ${filterQuery}
     group by string_value
     order by 2 desc
-    limit 500
+    limit 100
     `,
     params,
   );
@@ -58,7 +58,7 @@ async function clickhouseQuery(
     ${filterQuery}
     group by value
     order by 2 desc
-    limit 500;
+    limit 100
     `,
     params,
   ).then(result => {

From 7add059f430895370241d6f83778be3589fc2fc1 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Sat, 17 Aug 2024 21:32:42 -0700
Subject: [PATCH 285/438] Updated weekly session labels.

---
 .../[websiteId]/sessions/SessionsWeekly.module.css         | 4 ++--
 .../websites/[websiteId]/sessions/SessionsWeekly.tsx       | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css b/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css
index 4b41d87ceb..b795ed704c 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css
@@ -20,16 +20,16 @@
 .cell {
   display: flex;
   align-items: center;
-  justify-content: center;
   background-color: var(--base100);
   width: 20px;
   height: 20px;
+  margin: auto;
 }
 
 .hour {
   font-weight: 700;
   color: var(--font-color300);
-  background-color: transparent;
+  height: 20px;
 }
 
 .block {
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.tsx
index 6c0984ea53..0ee4805dd1 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.tsx
@@ -1,4 +1,4 @@
-import { format } from 'date-fns';
+import { format, startOfDay, addHours } from 'date-fns';
 import { useLocale, useMessages, useWebsiteSessionsWeekly } from 'components/hooks';
 import { LoadingPanel } from 'components/common/LoadingPanel';
 import { getDayOfWeekAsDate } from 'lib/date';
@@ -40,9 +40,10 @@ export function SessionsWeekly({ websiteId }: { websiteId: string }) {
           {Array(24)
             .fill(null)
             .map((_, i) => {
+              const label = format(addHours(startOfDay(new Date()), i), 'haaa');
               return (
-                <div key={i} className={classNames(styles.cell, styles.hour)}>
-                  {i.toString().padStart(2, '0')}
+                <div key={i} className={styles.hour}>
+                  {label}
                 </div>
               );
             })}

From e853ed7ae95a464cff79b0be5aca147e871216a0 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Sat, 17 Aug 2024 21:51:29 -0700
Subject: [PATCH 286/438] Updated weekly session styles.

---
 .../websites/[websiteId]/sessions/SessionsWeekly.module.css    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css b/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css
index b795ed704c..59f0cca682 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css
@@ -13,7 +13,7 @@
 .day {
   display: flex;
   flex-direction: column;
-  gap: 5px;
+  gap: 1px;
   position: relative;
 }
 
@@ -23,7 +23,6 @@
   background-color: var(--base100);
   width: 20px;
   height: 20px;
-  margin: auto;
 }
 
 .hour {

From ceacc25021737491c155de366deb31372583c102 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Sun, 18 Aug 2024 00:15:20 -0700
Subject: [PATCH 287/438] Fixed session weekly rendering bug.

---
 .../websites/[websiteId]/sessions/SessionsWeekly.module.css  | 5 ++++-
 .../(main)/websites/[websiteId]/sessions/SessionsWeekly.tsx  | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css b/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css
index 59f0cca682..6f5bf6cb48 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css
@@ -13,16 +13,19 @@
 .day {
   display: flex;
   flex-direction: column;
+  align-items: start;
+  justify-content: start;
   gap: 1px;
   position: relative;
 }
 
 .cell {
   display: flex;
-  align-items: center;
   background-color: var(--base100);
   width: 20px;
   height: 20px;
+  margin: auto;
+  align-items: start;
 }
 
 .hour {
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.tsx
index 0ee4805dd1..f9acaefc60 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.tsx
@@ -34,7 +34,7 @@ export function SessionsWeekly({ websiteId }: { websiteId: string }) {
 
   return (
     <LoadingPanel {...(props as any)} data={data}>
-      <div className={styles.week}>
+      <div key={data} className={styles.week}>
         <div className={styles.day}>
           <div className={styles.header}>&nbsp;</div>
           {Array(24)
@@ -50,7 +50,7 @@ export function SessionsWeekly({ websiteId }: { websiteId: string }) {
         </div>
         {data?.map((day: number[], index: number) => {
           return (
-            <div className={styles.day} key={index}>
+            <div key={index} className={styles.day}>
               <div className={styles.header}>
                 {format(getDayOfWeekAsDate(index), 'EEE', { locale: dateLocale })}
               </div>

From e98bc3bd742acd71d5b2abe13d42c8a79634e7a3 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Sun, 18 Aug 2024 10:38:28 -0700
Subject: [PATCH 288/438] Changed session weekly to dots.

---
 .../websites/[websiteId]/sessions/SessionsWeekly.module.css | 5 +++--
 .../(main)/websites/[websiteId]/sessions/SessionsWeekly.tsx | 6 +++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css b/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css
index 6f5bf6cb48..ba15dfcc56 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css
@@ -21,10 +21,11 @@
 
 .cell {
   display: flex;
-  background-color: var(--base100);
+  background-color: var(--base75);
   width: 20px;
   height: 20px;
   margin: auto;
+  border-radius: 100%;
   align-items: start;
 }
 
@@ -38,5 +39,5 @@
   background-color: var(--primary400);
   width: 20px;
   height: 20px;
-  border-radius: 3px;
+  border-radius: 100%;
 }
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.tsx
index f9acaefc60..3e15ddfaeb 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.tsx
@@ -55,6 +55,7 @@ export function SessionsWeekly({ websiteId }: { websiteId: string }) {
                 {format(getDayOfWeekAsDate(index), 'EEE', { locale: dateLocale })}
               </div>
               {day?.map((hour: number) => {
+                const pct = hour / max;
                 return (
                   <div key={hour} className={classNames(styles.cell)}>
                     {hour > 0 && (
@@ -62,7 +63,10 @@ export function SessionsWeekly({ websiteId }: { websiteId: string }) {
                         label={`${formatMessage(labels.visitors)}: ${hour}`}
                         position="right"
                       >
-                        <div className={styles.block} style={{ opacity: hour / max }} />
+                        <div
+                          className={styles.block}
+                          style={{ opacity: pct, transform: `scale(${pct})` }}
+                        />
                       </TooltipPopup>
                     )}
                   </div>

From a058552d3963203908e78a609366d4ada98721c0 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 19 Aug 2024 09:35:22 -0700
Subject: [PATCH 289/438] add sessionstats query for performance, countries,
 events values

---
 .../[websiteId]/events/EventsMetricsBar.tsx   | 15 ++--
 .../sessions/SessionsMetricsBar.tsx           | 10 +--
 .../hooks/queries/useWebsiteSessionStats.ts   | 16 ++++
 .../websites/[websiteId]/sessions/stats.ts    | 84 +++++++++++++++++++
 src/queries/analytics/getWebsiteStats.ts      | 45 +++++-----
 .../sessions/getWebsiteSessionStats.ts        | 82 ++++++++++++++++++
 6 files changed, 218 insertions(+), 34 deletions(-)
 create mode 100644 src/components/hooks/queries/useWebsiteSessionStats.ts
 create mode 100644 src/pages/api/websites/[websiteId]/sessions/stats.ts
 create mode 100644 src/queries/analytics/sessions/getWebsiteSessionStats.ts

diff --git a/src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsx
index 0a054e8d17..d039b67f71 100644
--- a/src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsx
+++ b/src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsx
@@ -1,14 +1,14 @@
+import { useMessages } from 'components/hooks';
+import useWebsiteSessionStats from 'components/hooks/queries/useWebsiteSessionStats';
 import WebsiteDateFilter from 'components/input/WebsiteDateFilter';
-import { Flexbox } from 'react-basics';
-import MetricsBar from 'components/metrics/MetricsBar';
 import MetricCard from 'components/metrics/MetricCard';
-import { useMessages } from 'components/hooks';
-import useWebsiteStats from 'components/hooks/queries/useWebsiteStats';
+import MetricsBar from 'components/metrics/MetricsBar';
 import { formatLongNumber } from 'lib/format';
+import { Flexbox } from 'react-basics';
 
 export function EventsMetricsBar({ websiteId }: { websiteId: string }) {
   const { formatMessage, labels } = useMessages();
-  const { data, isLoading, isFetched, error } = useWebsiteStats(websiteId);
+  const { data, isLoading, isFetched, error } = useWebsiteSessionStats(websiteId);
 
   return (
     <Flexbox direction="row" justifyContent="space-between" style={{ minHeight: 120 }}>
@@ -28,6 +28,11 @@ export function EventsMetricsBar({ websiteId }: { websiteId: string }) {
           label={formatMessage(labels.views)}
           formatValue={formatLongNumber}
         />
+        <MetricCard
+          value={data?.events?.value}
+          label={formatMessage(labels.events)}
+          formatValue={formatLongNumber}
+        />
       </MetricsBar>
       <WebsiteDateFilter websiteId={websiteId} />
     </Flexbox>
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx
index 9133ca71c6..803e7a0690 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx
@@ -1,14 +1,14 @@
+import { useMessages } from 'components/hooks';
+import useWebsiteSessionStats from 'components/hooks/queries/useWebsiteSessionStats';
 import WebsiteDateFilter from 'components/input/WebsiteDateFilter';
-import { Flexbox } from 'react-basics';
-import MetricsBar from 'components/metrics/MetricsBar';
 import MetricCard from 'components/metrics/MetricCard';
-import { useMessages } from 'components/hooks';
-import useWebsiteStats from 'components/hooks/queries/useWebsiteStats';
+import MetricsBar from 'components/metrics/MetricsBar';
 import { formatLongNumber } from 'lib/format';
+import { Flexbox } from 'react-basics';
 
 export function SessionsMetricsBar({ websiteId }: { websiteId: string }) {
   const { formatMessage, labels } = useMessages();
-  const { data, isLoading, isFetched, error } = useWebsiteStats(websiteId);
+  const { data, isLoading, isFetched, error } = useWebsiteSessionStats(websiteId);
 
   return (
     <Flexbox direction="row" justifyContent="space-between" style={{ minHeight: 120 }}>
diff --git a/src/components/hooks/queries/useWebsiteSessionStats.ts b/src/components/hooks/queries/useWebsiteSessionStats.ts
new file mode 100644
index 0000000000..7671b2ebee
--- /dev/null
+++ b/src/components/hooks/queries/useWebsiteSessionStats.ts
@@ -0,0 +1,16 @@
+import { useApi } from './useApi';
+import { useFilterParams } from '../useFilterParams';
+
+export function useWebsiteSessionStats(websiteId: string, options?: { [key: string]: string }) {
+  const { get, useQuery } = useApi();
+  const params = useFilterParams(websiteId);
+
+  return useQuery({
+    queryKey: ['sessions:stats', { websiteId, ...params }],
+    queryFn: () => get(`/websites/${websiteId}/sessions/stats`, { ...params }),
+    enabled: !!websiteId,
+    ...options,
+  });
+}
+
+export default useWebsiteSessionStats;
diff --git a/src/pages/api/websites/[websiteId]/sessions/stats.ts b/src/pages/api/websites/[websiteId]/sessions/stats.ts
new file mode 100644
index 0000000000..a522bd6bf5
--- /dev/null
+++ b/src/pages/api/websites/[websiteId]/sessions/stats.ts
@@ -0,0 +1,84 @@
+import { canViewWebsite } from 'lib/auth';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { getRequestDateRange, getRequestFilters } from 'lib/request';
+import { NextApiRequestQueryBody, WebsiteStats } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getWebsiteSessionStats } from 'queries/analytics/sessions/getWebsiteSessionStats';
+import * as yup from 'yup';
+
+export interface WebsiteSessionStatsRequestQuery {
+  websiteId: string;
+  startAt: number;
+  endAt: number;
+  url?: string;
+  referrer?: string;
+  title?: string;
+  query?: string;
+  event?: string;
+  host?: string;
+  os?: string;
+  browser?: string;
+  device?: string;
+  country?: string;
+  region?: string;
+  city?: string;
+}
+
+const schema = {
+  GET: yup.object().shape({
+    websiteId: yup.string().uuid().required(),
+    startAt: yup.number().required(),
+    endAt: yup.number().required(),
+    url: yup.string(),
+    referrer: yup.string(),
+    title: yup.string(),
+    query: yup.string(),
+    event: yup.string(),
+    host: yup.string(),
+    os: yup.string(),
+    browser: yup.string(),
+    device: yup.string(),
+    country: yup.string(),
+    region: yup.string(),
+    city: yup.string(),
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<WebsiteSessionStatsRequestQuery>,
+  res: NextApiResponse<WebsiteStats>,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  const { websiteId } = req.query;
+
+  if (req.method === 'GET') {
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const { startDate, endDate } = await getRequestDateRange(req);
+
+    const filters = getRequestFilters(req);
+
+    const metrics = await getWebsiteSessionStats(websiteId, {
+      ...filters,
+      startDate,
+      endDate,
+    });
+
+    const stats = Object.keys(metrics[0]).reduce((obj, key) => {
+      obj[key] = {
+        value: Number(metrics[0][key]) || 0,
+      };
+      return obj;
+    }, {});
+
+    return ok(res, stats);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/src/queries/analytics/getWebsiteStats.ts b/src/queries/analytics/getWebsiteStats.ts
index c35aea0693..c5141d3be7 100644
--- a/src/queries/analytics/getWebsiteStats.ts
+++ b/src/queries/analytics/getWebsiteStats.ts
@@ -1,4 +1,5 @@
 import clickhouse from 'lib/clickhouse';
+import { EVENT_TYPE } from 'lib/constants';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import prisma from 'lib/prisma';
 import { QueryFilters } from 'lib/types';
@@ -24,6 +25,7 @@ async function relationalQuery(
   const { getTimestampDiffSQL, parseFilters, rawQuery } = prisma;
   const { filterQuery, joinSession, params } = await parseFilters(websiteId, {
     ...filters,
+    eventType: EVENT_TYPE.pageView,
   });
 
   return rawQuery(
@@ -32,14 +34,12 @@ async function relationalQuery(
       sum(t.c) as "pageviews",
       count(distinct t.session_id) as "visitors",
       count(distinct t.visit_id) as "visits",
-      count(distinct t.country) as "countries",
       sum(case when t.c = 1 then 1 else 0 end) as "bounces",
-      sum(${getTimestampDiffSQL('t.min_time', 't.max_time')}) as "totaltime",
+      sum(${getTimestampDiffSQL('t.min_time', 't.max_time')}) as "totaltime"
     from (
       select
         website_event.session_id,
         website_event.visit_id,
-        session.country,
         count(*) as "c",
         min(website_event.created_at) as "min_time",
         max(website_event.created_at) as "max_time"
@@ -47,8 +47,9 @@ async function relationalQuery(
         ${joinSession}
       where website_event.website_id = {{websiteId::uuid}}
         and website_event.created_at between {{startDate}} and {{endDate}}
+        and event_type = {{eventType}}
         ${filterQuery}
-      group by 1, 2, 3
+      group by 1, 2
     ) as t
     `,
     params,
@@ -64,6 +65,7 @@ async function clickhouseQuery(
   const { rawQuery, parseFilters } = clickhouse;
   const { filterQuery, params } = await parseFilters(websiteId, {
     ...filters,
+    eventType: EVENT_TYPE.pageView,
   });
 
   let sql = '';
@@ -74,22 +76,21 @@ async function clickhouseQuery(
       sum(t.c) as "pageviews",
       uniq(t.session_id) as "visitors",
       uniq(t.visit_id) as "visits",
-      uniq(t.country) as "countries",
-      sumIf(1, t.c = 1) as "bounces",
+      sum(if(t.c = 1, 1, 0)) as "bounces",
       sum(max_time-min_time) as "totaltime"
     from (
       select
         session_id,
         visit_id,
-        country,
         count(*) c,
         min(created_at) min_time,
         max(created_at) max_time
       from website_event
       where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+        and event_type = {eventType:UInt32}
         ${filterQuery}
-      group by session_id, visit_id, country
+      group by session_id, visit_id
     ) as t;
     `;
   } else {
@@ -98,22 +99,20 @@ async function clickhouseQuery(
       sum(t.c) as "pageviews",
       uniq(session_id) as "visitors",
       uniq(visit_id) as "visits",
-      uniq(country) as "countries",
       sumIf(1, t.c = 1) as "bounces",
       sum(max_time-min_time) as "totaltime"
-    from (
-      select
-          session_id,
-          visit_id,
-          country,
-          sum(views) c,
-          min(min_time) min_time,
-          max(max_time) max_time
-      from umami.website_event_stats_hourly "website_event"
-      where website_id = {websiteId:UUID}
-        and created_at between {startDate:DateTime64} and {endDate:DateTime64}
-        ${filterQuery}
-      group by session_id, visit_id, country
+    from (select
+            session_id,
+            visit_id,
+            sum(views) c,
+            min(min_time) min_time,
+            max(max_time) max_time
+        from umami.website_event_stats_hourly "website_event"
+    where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      and event_type = {eventType:UInt32}
+      ${filterQuery}
+      group by session_id, visit_id
     ) as t;
     `;
   }
@@ -126,8 +125,6 @@ async function clickhouseQuery(
         visits: Number(a.visits),
         bounces: Number(a.bounces),
         totaltime: Number(a.totaltime),
-        countries: Number(a.countries),
-        events: Number(a.events),
       };
     });
   });
diff --git a/src/queries/analytics/sessions/getWebsiteSessionStats.ts b/src/queries/analytics/sessions/getWebsiteSessionStats.ts
new file mode 100644
index 0000000000..a3130c7c3a
--- /dev/null
+++ b/src/queries/analytics/sessions/getWebsiteSessionStats.ts
@@ -0,0 +1,82 @@
+import clickhouse from 'lib/clickhouse';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import prisma from 'lib/prisma';
+import { QueryFilters } from 'lib/types';
+
+export async function getWebsiteSessionStats(
+  ...args: [websiteId: string, filters: QueryFilters]
+): Promise<
+  { pageviews: number; visitors: number; visits: number; countries: number; events: number }[]
+> {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(
+  websiteId: string,
+  filters: QueryFilters,
+): Promise<
+  { pageviews: number; visitors: number; visits: number; countries: number; events: number }[]
+> {
+  const { parseFilters, rawQuery } = prisma;
+  const { filterQuery, params } = await parseFilters(websiteId, {
+    ...filters,
+  });
+
+  return rawQuery(
+    `
+    select
+      count(*) as "pageviews",
+      count(distinct t.session_id) as "visitors",
+      count(distinct t.visit_id) as "visits",
+      count(distinct t.country) as "countries",
+      sum(case when event_type = 2 then 1 else 0 end) as "events"
+    from website_event
+    join session on website_event.session_id = session.session_id
+    where website_event.website_id = {{websiteId::uuid}}
+      and website_event.created_at between {{startDate}} and {{endDate}}
+      ${filterQuery}
+    `,
+    params,
+  );
+}
+
+async function clickhouseQuery(
+  websiteId: string,
+  filters: QueryFilters,
+): Promise<
+  { pageviews: number; visitors: number; visits: number; countries: number; events: number }[]
+> {
+  const { rawQuery, parseFilters } = clickhouse;
+  const { filterQuery, params } = await parseFilters(websiteId, {
+    ...filters,
+  });
+
+  return rawQuery(
+    `
+    select
+      sum(views) as "pageviews",
+      uniq(session_id) as "visitors",
+      uniq(visit_id) as "visits",
+      uniq(country) as "countries",
+      sum(length(event_name)) as "events"
+    from umami.website_event_stats_hourly "website_event"
+    where website_id = {websiteId:UUID}
+        and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+        ${filterQuery}
+    `,
+    params,
+  ).then(result => {
+    return Object.values(result).map((a: any) => {
+      return {
+        pageviews: Number(a.pageviews),
+        visitors: Number(a.visitors),
+        visits: Number(a.visits),
+        countries: Number(a.countries),
+        events: Number(a.events),
+      };
+    });
+  });
+}

From 7ae3c790cd290b377238a66e68a3f58afc4df154 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 19 Aug 2024 10:28:10 -0700
Subject: [PATCH 290/438] fix relational queries for new screens

---
 .../analytics/events/getEventDataProperties.ts      | 13 +++++++------
 .../analytics/sessions/getWebsiteSessionStats.ts    |  8 ++++----
 .../analytics/sessions/getWebsiteSessionsWeekly.ts  |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/queries/analytics/events/getEventDataProperties.ts b/src/queries/analytics/events/getEventDataProperties.ts
index 8d1eaf9de0..9d55f8967c 100644
--- a/src/queries/analytics/events/getEventDataProperties.ts
+++ b/src/queries/analytics/events/getEventDataProperties.ts
@@ -24,14 +24,15 @@ async function relationalQuery(
   return rawQuery(
     `
     select
-      event_name as "eventName",
-      data_key as "propertyName",
+      we.event_name as "eventName",
+      ed.data_key as "propertyName",
       count(*) as "total"
-    from event_data
-    where website_id = {{websiteId::uuid}}
-      and created_at between {{startDate}} and {{endDate}}
+    from event_data ed
+    join website_event we on we.event_id = ed.website_event_id
+    where ed.website_id = {{websiteId::uuid}}
+      and ed.created_at between {{startDate}} and {{endDate}}
     ${filterQuery}
-    group by event_name, data_key
+    group by we.event_name, ed.data_key
     order by 3 desc
     limit 500
     `,
diff --git a/src/queries/analytics/sessions/getWebsiteSessionStats.ts b/src/queries/analytics/sessions/getWebsiteSessionStats.ts
index a3130c7c3a..5660a5fa25 100644
--- a/src/queries/analytics/sessions/getWebsiteSessionStats.ts
+++ b/src/queries/analytics/sessions/getWebsiteSessionStats.ts
@@ -29,10 +29,10 @@ async function relationalQuery(
     `
     select
       count(*) as "pageviews",
-      count(distinct t.session_id) as "visitors",
-      count(distinct t.visit_id) as "visits",
-      count(distinct t.country) as "countries",
-      sum(case when event_type = 2 then 1 else 0 end) as "events"
+      count(distinct website_event.session_id) as "visitors",
+      count(distinct website_event.visit_id) as "visits",
+      count(distinct session.country) as "countries",
+      sum(case when website_event.event_type = 2 then 1 else 0 end) as "events"
     from website_event
     join session on website_event.session_id = session.session_id
     where website_event.website_id = {{websiteId::uuid}}
diff --git a/src/queries/analytics/sessions/getWebsiteSessionsWeekly.ts b/src/queries/analytics/sessions/getWebsiteSessionsWeekly.ts
index 9031edf510..c92c2929be 100644
--- a/src/queries/analytics/sessions/getWebsiteSessionsWeekly.ts
+++ b/src/queries/analytics/sessions/getWebsiteSessionsWeekly.ts
@@ -21,7 +21,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     select
       ${getDateWeeklySQL('created_at')} as time,
       count(distinct session_id) as value
-    from website_event_stats_hourly
+    from website_event
     where website_id = {{websiteId::uuid}}
       and created_at between {{startDate}} and {{endDate}}
     group by time

From 8d92509f71e065642d9f723f928e54afd2b9d554 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Mon, 19 Aug 2024 10:53:31 -0700
Subject: [PATCH 291/438] Fixed queries.

---
 .../sessions/[sessionId]/SessionActivity.module.css  |  6 +++++-
 .../sessions/[sessionId]/SessionActivity.tsx         |  2 +-
 src/queries/analytics/events/getWebsiteEvents.ts     |  3 +--
 src/queries/analytics/getWebsiteStats.ts             | 12 ++++++++----
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.module.css b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.module.css
index bcc6868d49..b49230c7b8 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.module.css
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.module.css
@@ -12,7 +12,11 @@
 
 .time {
   color: var(--font-color200);
-  width: 120px;
+  width: 150px;
+}
+
+.value {
+  white-space: nowrap;
 }
 
 .header {
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
index 663934936e..187205e986 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
@@ -42,7 +42,7 @@ export function SessionActivity({
                 </StatusLight>
               </div>
               <Icon>{eventName ? <Icons.Bolt /> : <Icons.Eye />}</Icon>
-              <div>{eventName || urlPath}</div>
+              <div className={styles.value}>{eventName || urlPath}</div>
             </div>
           </>
         );
diff --git a/src/queries/analytics/events/getWebsiteEvents.ts b/src/queries/analytics/events/getWebsiteEvents.ts
index 9304d69e88..e558c6092b 100644
--- a/src/queries/analytics/events/getWebsiteEvents.ts
+++ b/src/queries/analytics/events/getWebsiteEvents.ts
@@ -17,12 +17,11 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
   const { query } = pageParams;
 
   const where = {
-    ...filters,
     id: websiteId,
     ...prisma.getSearchParameters(query, [{ eventName: 'contains' }, { urlPath: 'contains' }]),
   };
 
-  return pagedQuery('website_event', { where }, pageParams);
+  return pagedQuery('WebsiteEvent', { where }, pageParams);
 }
 
 async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
diff --git a/src/queries/analytics/getWebsiteStats.ts b/src/queries/analytics/getWebsiteStats.ts
index c35aea0693..17bf0c8d95 100644
--- a/src/queries/analytics/getWebsiteStats.ts
+++ b/src/queries/analytics/getWebsiteStats.ts
@@ -22,9 +22,13 @@ async function relationalQuery(
   { pageviews: number; visitors: number; visits: number; bounces: number; totaltime: number }[]
 > {
   const { getTimestampDiffSQL, parseFilters, rawQuery } = prisma;
-  const { filterQuery, joinSession, params } = await parseFilters(websiteId, {
-    ...filters,
-  });
+  const { filterQuery, joinSession, params } = await parseFilters(
+    websiteId,
+    {
+      ...filters,
+    },
+    { joinSession: true },
+  );
 
   return rawQuery(
     `
@@ -34,7 +38,7 @@ async function relationalQuery(
       count(distinct t.visit_id) as "visits",
       count(distinct t.country) as "countries",
       sum(case when t.c = 1 then 1 else 0 end) as "bounces",
-      sum(${getTimestampDiffSQL('t.min_time', 't.max_time')}) as "totaltime",
+      sum(${getTimestampDiffSQL('t.min_time', 't.max_time')}) as "totaltime"
     from (
       select
         website_event.session_id,

From dc9b1dc44674c31f6ecf7404d9f378bc1d18afeb Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Mon, 19 Aug 2024 12:58:00 -0700
Subject: [PATCH 292/438] Rolled back Prisma to 5.17.

---
 package.json |  4 +--
 yarn.lock    | 82 ++++++++++++++++++++++++++--------------------------
 2 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/package.json b/package.json
index 351596fb1a..bd1ed4e692 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
     "@dicebear/collection": "^9.2.1",
     "@dicebear/core": "^9.2.1",
     "@fontsource/inter": "^4.5.15",
-    "@prisma/client": "5.18.0",
+    "@prisma/client": "5.17",
     "@prisma/extension-read-replicas": "^0.3.0",
     "@react-spring/web": "^9.7.3",
     "@tanstack/react-query": "^5.28.6",
@@ -104,7 +104,7 @@
     "next-basics": "^0.39.0",
     "node-fetch": "^3.2.8",
     "npm-run-all": "^4.1.5",
-    "prisma": "5.18.0",
+    "prisma": "5.17",
     "react": "^18.2.0",
     "react-basics": "^0.125.0",
     "react-beautiful-dnd": "^13.1.0",
diff --git a/yarn.lock b/yarn.lock
index 0abea883e2..910f0c69f2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2280,51 +2280,51 @@
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
   integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
 
-"@prisma/client@5.18.0":
-  version "5.18.0"
-  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.18.0.tgz#526e4281a448f214c0ff81d65c39243608c98294"
-  integrity sha512-BWivkLh+af1kqC89zCJYkHsRcyWsM8/JHpsDMM76DjP3ZdEquJhXa4IeX+HkWPnwJ5FanxEJFZZDTWiDs/Kvyw==
-
-"@prisma/debug@5.18.0":
-  version "5.18.0"
-  resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.18.0.tgz#527799e044d2903a35945e61ac2d8916e4b61ead"
-  integrity sha512-f+ZvpTLidSo3LMJxQPVgAxdAjzv5OpzAo/eF8qZqbwvgi2F5cTOI9XCpdRzJYA0iGfajjwjOKKrVq64vkxEfUw==
-
-"@prisma/engines-version@5.18.0-25.4c784e32044a8a016d99474bd02a3b6123742169":
-  version "5.18.0-25.4c784e32044a8a016d99474bd02a3b6123742169"
-  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.18.0-25.4c784e32044a8a016d99474bd02a3b6123742169.tgz#203426ebf4ec4e1acce7da4a59ec8f0df92b29e7"
-  integrity sha512-a/+LpJj8vYU3nmtkg+N3X51ddbt35yYrRe8wqHTJtYQt7l1f8kjIBcCs6sHJvodW/EK5XGvboOiwm47fmNrbgg==
-
-"@prisma/engines@5.18.0":
-  version "5.18.0"
-  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.18.0.tgz#26ea46e26498be622407cf95663d7fb4c39c895b"
-  integrity sha512-ofmpGLeJ2q2P0wa/XaEgTnX/IsLnvSp/gZts0zjgLNdBhfuj2lowOOPmDcfKljLQUXMvAek3lw5T01kHmCG8rg==
-  dependencies:
-    "@prisma/debug" "5.18.0"
-    "@prisma/engines-version" "5.18.0-25.4c784e32044a8a016d99474bd02a3b6123742169"
-    "@prisma/fetch-engine" "5.18.0"
-    "@prisma/get-platform" "5.18.0"
+"@prisma/client@5.17":
+  version "5.17.0"
+  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.17.0.tgz#9079947bd749689c2dabfb9ecc70a24ebefb1f43"
+  integrity sha512-N2tnyKayT0Zf7mHjwEyE8iG7FwTmXDHFZ1GnNhQp0pJUObsuel4ZZ1XwfuAYkq5mRIiC/Kot0kt0tGCfLJ70Jw==
+
+"@prisma/debug@5.17.0":
+  version "5.17.0"
+  resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.17.0.tgz#a765105848993984535b6066f8ebc6e6ead26533"
+  integrity sha512-l7+AteR3P8FXiYyo496zkuoiJ5r9jLQEdUuxIxNCN1ud8rdbH3GTxm+f+dCyaSv9l9WY+29L9czaVRXz9mULfg==
+
+"@prisma/engines-version@5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053":
+  version "5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053"
+  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053.tgz#3c7cc1ef3ebc34cbd069e5873b9982f2aabf5acd"
+  integrity sha512-tUuxZZysZDcrk5oaNOdrBnnkoTtmNQPkzINFDjz7eG6vcs9AVDmA/F6K5Plsb2aQc/l5M2EnFqn3htng9FA4hg==
+
+"@prisma/engines@5.17.0":
+  version "5.17.0"
+  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.17.0.tgz#74dd1aabb22675892760b3cf69a448e3aef4616b"
+  integrity sha512-+r+Nf+JP210Jur+/X8SIPLtz+uW9YA4QO5IXA+KcSOBe/shT47bCcRMTYCbOESw3FFYFTwe7vU6KTWHKPiwvtg==
+  dependencies:
+    "@prisma/debug" "5.17.0"
+    "@prisma/engines-version" "5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053"
+    "@prisma/fetch-engine" "5.17.0"
+    "@prisma/get-platform" "5.17.0"
 
 "@prisma/extension-read-replicas@^0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/@prisma/extension-read-replicas/-/extension-read-replicas-0.3.0.tgz#2842a7c928f957c1dd58a6256104797596d43426"
   integrity sha512-F9+rSmYday6GT2qjhJtkZcBOpLO5LtpvFcMGqrBDHf+78LEdSuxfFjOxYlNuqk4B+th62yxpbhfpmB9/Mca14Q==
 
-"@prisma/fetch-engine@5.18.0":
-  version "5.18.0"
-  resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.18.0.tgz#5b343e2b36b27e2713901ddd032ddd6932b3d55f"
-  integrity sha512-I/3u0x2n31rGaAuBRx2YK4eB7R/1zCuayo2DGwSpGyrJWsZesrV7QVw7ND0/Suxeo/vLkJ5OwuBqHoCxvTHpOg==
+"@prisma/fetch-engine@5.17.0":
+  version "5.17.0"
+  resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.17.0.tgz#f718dc7426411d1ebeeee53e2d0d38652387f87c"
+  integrity sha512-ESxiOaHuC488ilLPnrv/tM2KrPhQB5TRris/IeIV4ZvUuKeaicCl4Xj/JCQeG9IlxqOgf1cCg5h5vAzlewN91Q==
   dependencies:
-    "@prisma/debug" "5.18.0"
-    "@prisma/engines-version" "5.18.0-25.4c784e32044a8a016d99474bd02a3b6123742169"
-    "@prisma/get-platform" "5.18.0"
+    "@prisma/debug" "5.17.0"
+    "@prisma/engines-version" "5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053"
+    "@prisma/get-platform" "5.17.0"
 
-"@prisma/get-platform@5.18.0":
-  version "5.18.0"
-  resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.18.0.tgz#0dc4c82fe9a4971f4519a57cb2dd69d8e0df4b71"
-  integrity sha512-Tk+m7+uhqcKDgnMnFN0lRiH7Ewea0OEsZZs9pqXa7i3+7svS3FSCqDBCaM9x5fmhhkufiG0BtunJVDka+46DlA==
+"@prisma/get-platform@5.17.0":
+  version "5.17.0"
+  resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.17.0.tgz#89fdcae2adddebbbf0e7bd0474a6c49d6023519b"
+  integrity sha512-UlDgbRozCP1rfJ5Tlkf3Cnftb6srGrEQ4Nm3og+1Se2gWmCZ0hmPIi+tQikGDUVLlvOWx3Gyi9LzgRP+HTXV9w==
   dependencies:
-    "@prisma/debug" "5.18.0"
+    "@prisma/debug" "5.17.0"
 
 "@react-spring/animated@~9.7.4":
   version "9.7.4"
@@ -8927,12 +8927,12 @@ pretty-format@^29.0.0, pretty-format@^29.7.0:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
-prisma@5.18.0:
-  version "5.18.0"
-  resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.18.0.tgz#5ef69c802a075b7596231ea57003496873610b9e"
-  integrity sha512-+TrSIxZsh64OPOmaSgVPH7ALL9dfU0jceYaMJXsNrTkFHO7/3RANi5K2ZiPB1De9+KDxCWn7jvRq8y8pvk+o9g==
+prisma@5.17:
+  version "5.17.0"
+  resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.17.0.tgz#267b43921ab94805b010537cffa5ccaf530fa066"
+  integrity sha512-m4UWkN5lBE6yevqeOxEvmepnL5cNPEjzMw2IqDB59AcEV6w7D8vGljDLd1gPFH+W6gUxw9x7/RmN5dCS/WTPxA==
   dependencies:
-    "@prisma/engines" "5.18.0"
+    "@prisma/engines" "5.17.0"
 
 process@^0.11.10:
   version "0.11.10"

From 10239fefcdc789356cfa5bd187c56f678700ee7a Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Mon, 19 Aug 2024 15:24:02 -0700
Subject: [PATCH 293/438] Fixed docker build for Prisma.

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 801b2bc20a..0f7c2d3500 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,7 +37,7 @@ RUN adduser --system --uid 1001 nextjs
 
 RUN set -x \
     && apk add --no-cache curl \
-    && yarn add npm-run-all dotenv prisma semver
+    && yarn add npm-run-all dotenv semver prisma@5.17.0
 
 # You only need to copy next.config.js if you are NOT using the default configuration
 COPY --from=builder /app/next.config.js .

From 5aba9acb81be385a24715faa379548c06d7fa72d Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 20 Aug 2024 00:34:01 -0700
Subject: [PATCH 294/438] Fixed date value for properties.

---
 src/lib/clickhouse.ts                             | 2 +-
 src/queries/analytics/events/saveEventData.ts     | 4 ++--
 src/queries/analytics/sessions/saveSessionData.ts | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index 70f8d31d7b..24e6a3b66d 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -49,7 +49,7 @@ function getClient() {
   return client;
 }
 
-function getUTCString(date?: Date) {
+function getUTCString(date?: Date | string | number) {
   return formatInTimeZone(date || new Date(), 'UTC', 'yyyy-MM-dd HH:mm:ss');
 }
 
diff --git a/src/queries/analytics/events/saveEventData.ts b/src/queries/analytics/events/saveEventData.ts
index fec4cae393..7e7db8b465 100644
--- a/src/queries/analytics/events/saveEventData.ts
+++ b/src/queries/analytics/events/saveEventData.ts
@@ -60,7 +60,7 @@ async function clickhouseQuery(data: {
 }) {
   const { websiteId, sessionId, eventId, urlPath, eventName, eventData, createdAt } = data;
 
-  const { insert } = clickhouse;
+  const { insert, getUTCString } = clickhouse;
   const { sendMessages } = kafka;
 
   const jsonKeys = flattenJSON(eventData);
@@ -76,7 +76,7 @@ async function clickhouseQuery(data: {
       data_type: dataType,
       string_value: getStringValue(value, dataType),
       number_value: dataType === DATA_TYPE.number ? value : null,
-      date_value: dataType === DATA_TYPE.date ? value?.toISOString() : null,
+      date_value: dataType === DATA_TYPE.date ? getUTCString(value) : null,
       created_at: createdAt,
     };
   });
diff --git a/src/queries/analytics/sessions/saveSessionData.ts b/src/queries/analytics/sessions/saveSessionData.ts
index 5259239a76..f9f0276ecc 100644
--- a/src/queries/analytics/sessions/saveSessionData.ts
+++ b/src/queries/analytics/sessions/saveSessionData.ts
@@ -94,7 +94,7 @@ async function clickhouseQuery(data: {
       data_type: dataType,
       string_value: getStringValue(value, dataType),
       number_value: dataType === DATA_TYPE.number ? value : null,
-      date_value: dataType === DATA_TYPE.date ? value?.toISOString() : null,
+      date_value: dataType === DATA_TYPE.date ? getUTCString(value) : null,
       created_at: createdAt,
     };
   });

From da28fe8fe90d2f3b3ea87a05922eee4b831b94dc Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 20 Aug 2024 01:15:33 -0700
Subject: [PATCH 295/438] Fixed some styles.

---
 .../websites/[websiteId]/WebsiteExpandedView.module.css     | 4 ++--
 .../websites/[websiteId]/events/EventProperties.module.css  | 2 +-
 .../[websiteId]/sessions/SessionProperties.module.css       | 2 +-
 .../websites/[websiteId]/sessions/SessionsWeekly.module.css | 6 +++---
 src/components/common/Pager.module.css                      | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.module.css b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.module.css
index f71032ae9f..007fa7f1b7 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.module.css
+++ b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.module.css
@@ -38,7 +38,7 @@
   }
 
   .back {
-    align-self: start;
+    align-self: flex-start;
     margin: 0;
   }
 
@@ -49,7 +49,7 @@
   .dropdown {
     display: flex;
     width: 200px;
-    align-self: end;
+    align-self: flex-end;
   }
 
   .menu {
diff --git a/src/app/(main)/websites/[websiteId]/events/EventProperties.module.css b/src/app/(main)/websites/[websiteId]/events/EventProperties.module.css
index 4f6a65ec9a..0b9c011d18 100644
--- a/src/app/(main)/websites/[websiteId]/events/EventProperties.module.css
+++ b/src/app/(main)/websites/[websiteId]/events/EventProperties.module.css
@@ -6,7 +6,7 @@
 }
 
 .table {
-  align-self: start;
+  align-self: flex-start;
 }
 
 .link:hover {
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.module.css b/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.module.css
index 4f6a65ec9a..0b9c011d18 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.module.css
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.module.css
@@ -6,7 +6,7 @@
 }
 
 .table {
-  align-self: start;
+  align-self: flex-start;
 }
 
 .link:hover {
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css b/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css
index ba15dfcc56..3536164353 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css
@@ -13,8 +13,8 @@
 .day {
   display: flex;
   flex-direction: column;
-  align-items: start;
-  justify-content: start;
+  align-items: flex-start;
+  justify-content: flex-start;
   gap: 1px;
   position: relative;
 }
@@ -26,7 +26,7 @@
   height: 20px;
   margin: auto;
   border-radius: 100%;
-  align-items: start;
+  align-items: flex-start;
 }
 
 .hour {
diff --git a/src/components/common/Pager.module.css b/src/components/common/Pager.module.css
index 880c1b401d..c9330c32d7 100644
--- a/src/components/common/Pager.module.css
+++ b/src/components/common/Pager.module.css
@@ -27,6 +27,6 @@
   }
 
   .nav {
-    justify-content: end;
+    justify-content: flex-end;
   }
 }

From eb05e2ada67e7a4c4362716e02225f7ff4468e01 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 20 Aug 2024 09:21:15 -0700
Subject: [PATCH 296/438] fix getDateWeeklySQL

---
 src/lib/prisma.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/prisma.ts b/src/lib/prisma.ts
index 85b1bea7e0..8c4f8c5c84 100644
--- a/src/lib/prisma.ts
+++ b/src/lib/prisma.ts
@@ -88,11 +88,11 @@ function getDateWeeklySQL(field: string) {
   const db = getDatabaseType();
 
   if (db === POSTGRESQL) {
-    return `EXTRACT(DOW FROM ${field})`;
+    return `concat(extract(dow from ${field}), ':', to_char(${field}, 'HH24'))`;
   }
 
   if (db === MYSQL) {
-    return `DAYOFWEEK(${field})-1`;
+    return `date_format(${field}, '%w:%H')`;
   }
 }
 

From 8ee4fc32fdf453aa9975cb3cce64b0aacd6af65b Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 20 Aug 2024 09:28:10 -0700
Subject: [PATCH 297/438] fix css console errors

---
 .../websites/[websiteId]/WebsiteExpandedView.module.css     | 2 +-
 .../websites/[websiteId]/events/EventProperties.module.css  | 2 +-
 .../[websiteId]/sessions/SessionProperties.module.css       | 2 +-
 .../websites/[websiteId]/sessions/SessionsWeekly.module.css | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.module.css b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.module.css
index f71032ae9f..d17fad88e8 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.module.css
+++ b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.module.css
@@ -38,7 +38,7 @@
   }
 
   .back {
-    align-self: start;
+    align-self: flex-start;
     margin: 0;
   }
 
diff --git a/src/app/(main)/websites/[websiteId]/events/EventProperties.module.css b/src/app/(main)/websites/[websiteId]/events/EventProperties.module.css
index 4f6a65ec9a..0b9c011d18 100644
--- a/src/app/(main)/websites/[websiteId]/events/EventProperties.module.css
+++ b/src/app/(main)/websites/[websiteId]/events/EventProperties.module.css
@@ -6,7 +6,7 @@
 }
 
 .table {
-  align-self: start;
+  align-self: flex-start;
 }
 
 .link:hover {
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.module.css b/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.module.css
index 4f6a65ec9a..0b9c011d18 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.module.css
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.module.css
@@ -6,7 +6,7 @@
 }
 
 .table {
-  align-self: start;
+  align-self: flex-start;
 }
 
 .link:hover {
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css b/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css
index ba15dfcc56..3536164353 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css
@@ -13,8 +13,8 @@
 .day {
   display: flex;
   flex-direction: column;
-  align-items: start;
-  justify-content: start;
+  align-items: flex-start;
+  justify-content: flex-start;
   gap: 1px;
   position: relative;
 }
@@ -26,7 +26,7 @@
   height: 20px;
   margin: auto;
   border-radius: 100%;
-  align-items: start;
+  align-items: flex-start;
 }
 
 .hour {

From adc65e4487447f2fcc869add42381b8e9c60498f Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 20 Aug 2024 13:57:40 -0700
Subject: [PATCH 298/438] fix websiteEvent query

---
 src/queries/analytics/events/getWebsiteEvents.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/queries/analytics/events/getWebsiteEvents.ts b/src/queries/analytics/events/getWebsiteEvents.ts
index e558c6092b..60a932f559 100644
--- a/src/queries/analytics/events/getWebsiteEvents.ts
+++ b/src/queries/analytics/events/getWebsiteEvents.ts
@@ -15,13 +15,22 @@ export function getWebsiteEvents(
 async function relationalQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
   const { pagedQuery } = prisma;
   const { query } = pageParams;
+  const { startDate, endDate } = filters;
 
   const where = {
-    id: websiteId,
+    websiteId,
+    createdAt: {
+      lte: endDate,
+      gte: startDate,
+    },
     ...prisma.getSearchParameters(query, [{ eventName: 'contains' }, { urlPath: 'contains' }]),
   };
 
-  return pagedQuery('WebsiteEvent', { where }, pageParams);
+  return pagedQuery(
+    'websiteEvent',
+    { where },
+    { orderBy: 'createdAt', sortDescending: true, ...pageParams },
+  );
 }
 
 async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {

From 511fec2ddba3282abc632b0774375c047c8ea09c Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 20 Aug 2024 14:15:47 -0700
Subject: [PATCH 299/438] Fixed timezone date format.

---
 .../[websiteId]/events/EventsTable.tsx         |  4 ++--
 .../[websiteId]/realtime/RealtimeLog.tsx       |  4 ++--
 .../[websiteId]/sessions/SessionsTable.tsx     |  4 ++--
 .../sessions/[sessionId]/SessionActivity.tsx   |  6 +++---
 .../sessions/[sessionId]/SessionInfo.tsx       |  6 +++---
 src/components/hooks/useTimezone.ts            | 18 ++++++++++--------
 6 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx
index 4100202b36..42eb8f7ad0 100644
--- a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx
+++ b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx
@@ -6,7 +6,7 @@ import Link from 'next/link';
 import Icons from 'components/icons';
 
 export function EventsTable({ data = [] }) {
-  const { formatDate } = useTimezone();
+  const { formatTimezoneDate } = useTimezone();
   const { formatMessage, labels } = useMessages();
   const { renderTeamUrl } = useTeamUrl();
 
@@ -35,7 +35,7 @@ export function EventsTable({ data = [] }) {
         }}
       </GridColumn>
       <GridColumn name="created" label={formatMessage(labels.created)} width={'300px'}>
-        {row => formatDate(row.createdAt, 'PPPpp')}
+        {row => formatTimezoneDate(row.createdAt, 'PPPpp')}
       </GridColumn>
     </GridTable>
   );
diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
index 8bae2c17bd..98b7a924be 100644
--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
@@ -31,7 +31,7 @@ export function RealtimeLog({ data }: { data: RealtimeData }) {
   const { formatMessage, labels, messages, FormattedMessage } = useMessages();
   const { formatValue } = useFormat();
   const { locale } = useLocale();
-  const { formatDate } = useTimezone();
+  const { formatTimezoneDate } = useTimezone();
   const { countryNames } = useCountryNames(locale);
   const [filter, setFilter] = useState(TYPE_ALL);
 
@@ -54,7 +54,7 @@ export function RealtimeLog({ data }: { data: RealtimeData }) {
     },
   ];
 
-  const getTime = ({ createdAt, firstAt }) => formatDate(firstAt || createdAt, 'h:mm:ss');
+  const getTime = ({ createdAt, firstAt }) => formatTimezoneDate(firstAt || createdAt, 'h:mm:ss');
 
   const getColor = ({ id, sessionId }) => stringToColor(sessionId || id);
 
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
index e266885642..3fea4836c0 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
@@ -6,7 +6,7 @@ import styles from './SessionsTable.module.css';
 import TypeIcon from 'components/common/TypeIcon';
 
 export function SessionsTable({ data = [] }: { data: any[]; showDomain?: boolean }) {
-  const { formatDate } = useTimezone();
+  const { formatTimezoneDate } = useTimezone();
   const { formatMessage, labels } = useMessages();
   const { formatValue } = useFormat();
 
@@ -51,7 +51,7 @@ export function SessionsTable({ data = [] }: { data: any[]; showDomain?: boolean
         )}
       </GridColumn>
       <GridColumn name="lastAt" label={formatMessage(labels.lastSeen)}>
-        {row => formatDate(row.createdAt, 'PPPpp')}
+        {row => formatTimezoneDate(row.createdAt, 'PPPpp')}
       </GridColumn>
     </GridTable>
   );
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
index 187205e986..fd498ac3ab 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
@@ -15,7 +15,7 @@ export function SessionActivity({
   startDate: Date;
   endDate: Date;
 }) {
-  const { formatDate } = useTimezone();
+  const { formatTimezoneDate } = useTimezone();
   const { data, isLoading } = useSessionActivity(websiteId, sessionId, startDate, endDate);
 
   if (isLoading) {
@@ -33,12 +33,12 @@ export function SessionActivity({
         return (
           <>
             {showHeader && (
-              <div className={styles.header}>{formatDate(createdAt, 'EEEE, PPP')}</div>
+              <div className={styles.header}>{formatTimezoneDate(createdAt, 'EEEE, PPP')}</div>
             )}
             <div key={eventId} className={styles.row}>
               <div className={styles.time}>
                 <StatusLight color={`#${visitId?.substring(0, 6)}`}>
-                  {formatDate(createdAt, 'h:mm:ss aaa')}
+                  {formatTimezoneDate(createdAt, 'h:mm:ss aaa')}
                 </StatusLight>
               </div>
               <Icon>{eventName ? <Icons.Bolt /> : <Icons.Eye />}</Icon>
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx
index 641d2941b0..6f9a8f3d57 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx
@@ -6,7 +6,7 @@ import styles from './SessionInfo.module.css';
 
 export default function SessionInfo({ data }) {
   const { locale } = useLocale();
-  const { formatDate } = useTimezone();
+  const { formatTimezoneDate } = useTimezone();
   const { formatMessage, labels } = useMessages();
   const { formatValue } = useFormat();
   const { getRegionName } = useRegionNames(locale);
@@ -20,10 +20,10 @@ export default function SessionInfo({ data }) {
         </dd>
 
         <dt>{formatMessage(labels.lastSeen)}</dt>
-        <dd>{formatDate(data?.lastAt, 'EEEE, PPPpp')}</dd>
+        <dd>{formatTimezoneDate(data?.lastAt, 'EEEE, PPPpp')}</dd>
 
         <dt>{formatMessage(labels.firstSeen)}</dt>
-        <dd>{formatDate(data?.firstAt, 'EEEE, PPPpp')}</dd>
+        <dd>{formatTimezoneDate(data?.firstAt, 'EEEE, PPPpp')}</dd>
 
         <dt>{formatMessage(labels.country)}</dt>
         <dd>
diff --git a/src/components/hooks/useTimezone.ts b/src/components/hooks/useTimezone.ts
index 24cef02cce..d06562a2c4 100644
--- a/src/components/hooks/useTimezone.ts
+++ b/src/components/hooks/useTimezone.ts
@@ -13,13 +13,15 @@ export function useTimezone() {
     setTimezone(value);
   };
 
-  const formatDate = (date: string, pattern: string) => {
-    return formatInTimeZone(
-      /^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$/.test(date)
-        ? date
-        : date.split(' ').join('T') + 'Z',
-      timezone,
-      pattern,
+  const formatTimezoneDate = (date: string, pattern: string) => {
+    return (
+      formatInTimeZone(
+        /^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(\.[0-9]{3})?Z$/.test(date)
+          ? date
+          : date.split(' ').join('T') + 'Z',
+        timezone,
+        pattern,
+      ) + `, ${date}, ${pattern}, ${timezone}, ${formatInTimeZone(date, timezone, pattern)}`
     );
   };
 
@@ -31,7 +33,7 @@ export function useTimezone() {
     return utcToZonedTime(date, timezone);
   };
 
-  return { timezone, saveTimezone, formatDate, toUtc, fromUtc };
+  return { timezone, saveTimezone, formatTimezoneDate, toUtc, fromUtc };
 }
 
 export default useTimezone;

From caa9da9166d35502315ba1026bbde03c622d2be5 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 20 Aug 2024 14:16:35 -0700
Subject: [PATCH 300/438] Removed junk.

---
 src/components/hooks/useTimezone.ts | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/components/hooks/useTimezone.ts b/src/components/hooks/useTimezone.ts
index d06562a2c4..c74f513f5f 100644
--- a/src/components/hooks/useTimezone.ts
+++ b/src/components/hooks/useTimezone.ts
@@ -14,14 +14,12 @@ export function useTimezone() {
   };
 
   const formatTimezoneDate = (date: string, pattern: string) => {
-    return (
-      formatInTimeZone(
-        /^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(\.[0-9]{3})?Z$/.test(date)
-          ? date
-          : date.split(' ').join('T') + 'Z',
-        timezone,
-        pattern,
-      ) + `, ${date}, ${pattern}, ${timezone}, ${formatInTimeZone(date, timezone, pattern)}`
+    return formatInTimeZone(
+      /^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(\.[0-9]{3})?Z$/.test(date)
+        ? date
+        : date.split(' ').join('T') + 'Z',
+      timezone,
+      pattern,
     );
   };
 

From 04e0b33622463ee79c1b993cc4405c823bb39c8c Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 20 Aug 2024 14:53:53 -0700
Subject: [PATCH 301/438] Updated Clickhouse number handling. Removed number
 formatting.

---
 src/lib/clickhouse.ts                         |  1 +
 .../analytics/events/getEventDataEvents.ts    | 23 ++-----------------
 .../events/getEventDataProperties.ts          | 10 +-------
 .../analytics/events/getEventDataStats.ts     | 12 ++--------
 .../analytics/events/getEventDataUsage.ts     |  6 +----
 .../analytics/events/getEventDataValues.ts    |  9 +-------
 src/queries/analytics/getActiveVisitors.ts    | 14 ++++-------
 src/queries/analytics/getWebsiteStats.ts      | 12 +---------
 .../analytics/pageviews/getPageviewStats.ts   |  6 +----
 src/queries/analytics/reports/getRetention.ts | 16 ++-----------
 src/queries/analytics/reports/getRevenue.ts   | 23 ++-----------------
 .../sessions/getSessionDataProperties.ts      |  9 +-------
 .../sessions/getSessionDataValues.ts          |  9 +-------
 .../analytics/sessions/getSessionStats.ts     |  6 +----
 .../sessions/getWebsiteSessionStats.ts        | 12 +---------
 15 files changed, 23 insertions(+), 145 deletions(-)

diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index 24e6a3b66d..397883fb58 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -187,6 +187,7 @@ async function rawQuery<T = unknown>(
     query: query,
     query_params: params,
     format: 'JSONEachRow',
+    clickhouse_settings: { output_format_json_quote_64bit_integers: 0 },
   });
 
   return (await resultSet.json()) as T;
diff --git a/src/queries/analytics/events/getEventDataEvents.ts b/src/queries/analytics/events/getEventDataEvents.ts
index 6b57330c59..0b19c5be33 100644
--- a/src/queries/analytics/events/getEventDataEvents.ts
+++ b/src/queries/analytics/events/getEventDataEvents.ts
@@ -85,17 +85,7 @@ async function clickhouseQuery(
       limit 500
       `,
       params,
-    ).then(result => {
-      return Object.values(result).map((a: any) => {
-        return {
-          eventName: a.eventName,
-          propertyName: a.propertyName,
-          dataType: Number(a.dataType),
-          propertyValue: a.propertyValue,
-          total: Number(a.total),
-        };
-      });
-    });
+    );
   }
 
   return rawQuery(
@@ -113,14 +103,5 @@ async function clickhouseQuery(
     limit 500
     `,
     params,
-  ).then(result => {
-    return Object.values(result).map((a: any) => {
-      return {
-        eventName: a.eventName,
-        propertyName: a.propertyName,
-        dataType: Number(a.dataType),
-        total: Number(a.total),
-      };
-    });
-  });
+  );
 }
diff --git a/src/queries/analytics/events/getEventDataProperties.ts b/src/queries/analytics/events/getEventDataProperties.ts
index 9d55f8967c..cdf76c3f5f 100644
--- a/src/queries/analytics/events/getEventDataProperties.ts
+++ b/src/queries/analytics/events/getEventDataProperties.ts
@@ -64,13 +64,5 @@ async function clickhouseQuery(
     limit 500
     `,
     params,
-  ).then(result => {
-    return Object.values(result).map((a: any) => {
-      return {
-        eventName: a.eventName,
-        propertyName: a.propertyName,
-        total: Number(a.total),
-      };
-    });
-  });
+  );
 }
diff --git a/src/queries/analytics/events/getEventDataStats.ts b/src/queries/analytics/events/getEventDataStats.ts
index 51a0da746e..adeeda46ef 100644
--- a/src/queries/analytics/events/getEventDataStats.ts
+++ b/src/queries/analytics/events/getEventDataStats.ts
@@ -13,7 +13,7 @@ export async function getEventDataStats(
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
-  }).then(results => results[0]);
+  }).then(results => results?.[0]);
 }
 
 async function relationalQuery(websiteId: string, filters: QueryFilters) {
@@ -68,13 +68,5 @@ async function clickhouseQuery(
       ) as t
     `,
     params,
-  ).then(result => {
-    return Object.values(result).map((a: any) => {
-      return {
-        events: Number(a.events),
-        properties: Number(a.properties),
-        records: Number(a.records),
-      };
-    });
-  });
+  );
 }
diff --git a/src/queries/analytics/events/getEventDataUsage.ts b/src/queries/analytics/events/getEventDataUsage.ts
index 2a19f33e6d..1d146c9c71 100644
--- a/src/queries/analytics/events/getEventDataUsage.ts
+++ b/src/queries/analytics/events/getEventDataUsage.ts
@@ -30,9 +30,5 @@ function clickhouseQuery(
       startDate,
       endDate,
     },
-  ).then(result => {
-    return Object.values(result).map((a: any) => {
-      return { websiteId: a.websiteId, count: Number(a.count) };
-    });
-  });
+  );
 }
diff --git a/src/queries/analytics/events/getEventDataValues.ts b/src/queries/analytics/events/getEventDataValues.ts
index 7ccd7a2863..f6b36b566c 100644
--- a/src/queries/analytics/events/getEventDataValues.ts
+++ b/src/queries/analytics/events/getEventDataValues.ts
@@ -66,12 +66,5 @@ async function clickhouseQuery(
     limit 100
     `,
     params,
-  ).then(result => {
-    return Object.values(result).map((a: any) => {
-      return {
-        ...a,
-        total: Number(a.total),
-      };
-    });
-  });
+  );
 }
diff --git a/src/queries/analytics/getActiveVisitors.ts b/src/queries/analytics/getActiveVisitors.ts
index 6d55f5dedc..c59a265a8f 100644
--- a/src/queries/analytics/getActiveVisitors.ts
+++ b/src/queries/analytics/getActiveVisitors.ts
@@ -18,9 +18,9 @@ async function relationalQuery(websiteId: string) {
     select count(distinct session_id) x
     from website_event
     where website_id = {{websiteId::uuid}}
-    and created_at >= {{startAt}}
+    and created_at >= {{startDate}}
     `,
-    { websiteId, startAt: subMinutes(new Date(), 5) },
+    { websiteId, startDate: subMinutes(new Date(), 5) },
   );
 
   return result[0] ?? null;
@@ -35,14 +35,10 @@ async function clickhouseQuery(websiteId: string): Promise<{ x: number }> {
       count(distinct session_id) x
     from website_event
     where website_id = {websiteId:UUID}
-      and created_at >= {startAt:DateTime64}
+      and created_at >= {startDate:DateTime64}
     `,
-    { websiteId, startAt: subMinutes(new Date(), 5) },
-  ).then(a => {
-    return Object.values(a).map(a => {
-      return { x: Number(a.x) };
-    });
-  });
+    { websiteId, startDate: subMinutes(new Date(), 5) },
+  );
 
   return result[0] ?? null;
 }
diff --git a/src/queries/analytics/getWebsiteStats.ts b/src/queries/analytics/getWebsiteStats.ts
index c5141d3be7..061d487ead 100644
--- a/src/queries/analytics/getWebsiteStats.ts
+++ b/src/queries/analytics/getWebsiteStats.ts
@@ -117,15 +117,5 @@ async function clickhouseQuery(
     `;
   }
 
-  return rawQuery(sql, params).then(result => {
-    return Object.values(result).map((a: any) => {
-      return {
-        pageviews: Number(a.pageviews),
-        visitors: Number(a.visitors),
-        visits: Number(a.visits),
-        bounces: Number(a.bounces),
-        totaltime: Number(a.totaltime),
-      };
-    });
-  });
+  return rawQuery(sql, params);
 }
diff --git a/src/queries/analytics/pageviews/getPageviewStats.ts b/src/queries/analytics/pageviews/getPageviewStats.ts
index 1d027e794f..0b80a2ed6a 100644
--- a/src/queries/analytics/pageviews/getPageviewStats.ts
+++ b/src/queries/analytics/pageviews/getPageviewStats.ts
@@ -87,9 +87,5 @@ async function clickhouseQuery(
     `;
   }
 
-  return rawQuery(sql, params).then(result => {
-    return Object.values(result).map((a: any) => {
-      return { x: a.x, y: Number(a.y) };
-    });
-  });
+  return rawQuery(sql, params);
 }
diff --git a/src/queries/analytics/reports/getRetention.ts b/src/queries/analytics/reports/getRetention.ts
index 24aa2e3a81..eb184e1806 100644
--- a/src/queries/analytics/reports/getRetention.ts
+++ b/src/queries/analytics/reports/getRetention.ts
@@ -90,9 +90,7 @@ async function relationalQuery(
       startDate,
       endDate,
     },
-  ).then(results => {
-    return results.map(i => ({ ...i, percentage: Number(i.percentage) || 0 }));
-  });
+  );
 }
 
 async function clickhouseQuery(
@@ -169,15 +167,5 @@ async function clickhouseQuery(
       startDate,
       endDate,
     },
-  ).then(result => {
-    return Object.values(result).map((a: any) => {
-      return {
-        date: a.date,
-        day: Number(a.day),
-        visitors: Number(a.visitors),
-        returnVisitors: Number(a.returnVisitors),
-        percentage: Number(a.percentage),
-      };
-    });
-  });
+  );
 }
diff --git a/src/queries/analytics/reports/getRevenue.ts b/src/queries/analytics/reports/getRevenue.ts
index e4857a43e5..502505f44f 100644
--- a/src/queries/analytics/reports/getRevenue.ts
+++ b/src/queries/analytics/reports/getRevenue.ts
@@ -143,17 +143,7 @@ async function clickhouseQuery(
     order by time
     `,
     { websiteId, startDate, endDate, eventName, revenueProperty, userProperty },
-  ).then(result => {
-    return Object.values(result).map((a: any) => {
-      return {
-        time: a.time,
-        sum: Number(a.sum),
-        avg: Number(a.avg),
-        count: Number(a.count),
-        uniqueCount: Number(!a.avg ? 0 : a.uniqueCount),
-      };
-    });
-  });
+  ).then(result => result?.[0]);
 
   const totalRes = await rawQuery<{
     sum: number;
@@ -174,16 +164,7 @@ async function clickhouseQuery(
         and data_key in ({revenueProperty:String}, {userProperty:String})
     `,
     { websiteId, startDate, endDate, eventName, revenueProperty, userProperty },
-  ).then(results => {
-    const result = results[0];
-
-    return {
-      sum: Number(result.sum),
-      avg: Number(result.avg),
-      count: Number(result.count),
-      uniqueCount: Number(!result.avg ? 0 : result.uniqueCount),
-    };
-  });
+  );
 
   return { chart: chartRes, total: totalRes };
 }
diff --git a/src/queries/analytics/sessions/getSessionDataProperties.ts b/src/queries/analytics/sessions/getSessionDataProperties.ts
index b33fecfbd2..1d15ea8de1 100644
--- a/src/queries/analytics/sessions/getSessionDataProperties.ts
+++ b/src/queries/analytics/sessions/getSessionDataProperties.ts
@@ -61,12 +61,5 @@ async function clickhouseQuery(
     limit 500
     `,
     params,
-  ).then(result => {
-    return Object.values(result).map((a: any) => {
-      return {
-        propertyName: a.propertyName,
-        total: Number(a.total),
-      };
-    });
-  });
+  );
 }
diff --git a/src/queries/analytics/sessions/getSessionDataValues.ts b/src/queries/analytics/sessions/getSessionDataValues.ts
index 0f0f806a70..d9a7eb596b 100644
--- a/src/queries/analytics/sessions/getSessionDataValues.ts
+++ b/src/queries/analytics/sessions/getSessionDataValues.ts
@@ -61,12 +61,5 @@ async function clickhouseQuery(
     limit 100
     `,
     params,
-  ).then(result => {
-    return Object.values(result).map((a: any) => {
-      return {
-        ...a,
-        total: Number(a.total),
-      };
-    });
-  });
+  );
 }
diff --git a/src/queries/analytics/sessions/getSessionStats.ts b/src/queries/analytics/sessions/getSessionStats.ts
index fa7483333d..af69f454c7 100644
--- a/src/queries/analytics/sessions/getSessionStats.ts
+++ b/src/queries/analytics/sessions/getSessionStats.ts
@@ -87,9 +87,5 @@ async function clickhouseQuery(
     `;
   }
 
-  return rawQuery(sql, params).then(result => {
-    return Object.values(result).map((a: any) => {
-      return { x: a.x, y: Number(a.y) };
-    });
-  });
+  return rawQuery(sql, params);
 }
diff --git a/src/queries/analytics/sessions/getWebsiteSessionStats.ts b/src/queries/analytics/sessions/getWebsiteSessionStats.ts
index 5660a5fa25..648be14000 100644
--- a/src/queries/analytics/sessions/getWebsiteSessionStats.ts
+++ b/src/queries/analytics/sessions/getWebsiteSessionStats.ts
@@ -68,15 +68,5 @@ async function clickhouseQuery(
         ${filterQuery}
     `,
     params,
-  ).then(result => {
-    return Object.values(result).map((a: any) => {
-      return {
-        pageviews: Number(a.pageviews),
-        visitors: Number(a.visitors),
-        visits: Number(a.visits),
-        countries: Number(a.countries),
-        events: Number(a.events),
-      };
-    });
-  });
+  );
 }

From 0220091cff9218f12eb630f2de036c42b93beb75 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 20 Aug 2024 18:59:24 -0700
Subject: [PATCH 302/438] add paging for relational raw query

---
 src/lib/prisma.ts                             | 27 ++++++++
 .../analytics/events/getWebsiteEvents.ts      | 54 +++++++++++-----
 .../analytics/sessions/getWebsiteSessions.ts  | 63 ++++++++++++-------
 3 files changed, 107 insertions(+), 37 deletions(-)

diff --git a/src/lib/prisma.ts b/src/lib/prisma.ts
index 8c4f8c5c84..c450f1f023 100644
--- a/src/lib/prisma.ts
+++ b/src/lib/prisma.ts
@@ -261,6 +261,32 @@ async function pagedQuery<T>(model: string, criteria: T, pageParams: PageParams)
   return { data, count, page: +page, pageSize: size, orderBy };
 }
 
+async function pagedRawQuery(
+  query: string,
+  queryParams: { [key: string]: any },
+  pageParams: PageParams = {},
+) {
+  const { page = 1, pageSize, orderBy, sortDescending = false } = pageParams;
+  const size = +pageSize || DEFAULT_PAGE_SIZE;
+  const offset = +size * (page - 1);
+  const direction = sortDescending ? 'desc' : 'asc';
+
+  const statements = [
+    orderBy && `order by ${orderBy} ${direction}`,
+    +size > 0 && `limit ${+size} offset ${offset}`,
+  ]
+    .filter(n => n)
+    .join('\n');
+
+  const count = await rawQuery(`select count(*) as num from (${query}) t`, queryParams).then(
+    res => res[0].num,
+  );
+
+  const data = await rawQuery(`${query}${statements}`, queryParams);
+
+  return { data, count, page: +page, pageSize: size, orderBy };
+}
+
 function getQueryMode(): { mode?: Prisma.QueryMode } {
   const db = getDatabaseType();
 
@@ -311,6 +337,7 @@ export default {
   getSearchSQL,
   getQueryMode,
   pagedQuery,
+  pagedRawQuery,
   parseFilters,
   rawQuery,
 };
diff --git a/src/queries/analytics/events/getWebsiteEvents.ts b/src/queries/analytics/events/getWebsiteEvents.ts
index 60a932f559..5ac42dbb5e 100644
--- a/src/queries/analytics/events/getWebsiteEvents.ts
+++ b/src/queries/analytics/events/getWebsiteEvents.ts
@@ -1,5 +1,5 @@
 import clickhouse from 'lib/clickhouse';
-import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import { CLICKHOUSE, getDatabaseType, POSTGRESQL, PRISMA, runQuery } from 'lib/db';
 import prisma from 'lib/prisma';
 import { PageParams, QueryFilters } from 'lib/types';
 
@@ -13,23 +13,47 @@ export function getWebsiteEvents(
 }
 
 async function relationalQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
-  const { pagedQuery } = prisma;
+  const { pagedRawQuery, parseFilters } = prisma;
   const { query } = pageParams;
-  const { startDate, endDate } = filters;
+  const { filterQuery, params } = await parseFilters(websiteId, {
+    ...filters,
+  });
 
-  const where = {
-    websiteId,
-    createdAt: {
-      lte: endDate,
-      gte: startDate,
-    },
-    ...prisma.getSearchParameters(query, [{ eventName: 'contains' }, { urlPath: 'contains' }]),
-  };
+  const db = getDatabaseType();
+  const like = db === POSTGRESQL ? 'ilike' : 'like';
 
-  return pagedQuery(
-    'websiteEvent',
-    { where },
-    { orderBy: 'createdAt', sortDescending: true, ...pageParams },
+  return pagedRawQuery(
+    `
+    with events as (
+    select
+      event_id as "id",
+      website_id as "websiteId", 
+      session_id as "sessionId",
+      created_at as "createdAt",
+      url_path as "urlPath",
+      url_query as "urlQuery",
+      referrer_path as "referrerPath",
+      referrer_query as "referrerQuery",
+      referrer_domain as "referrerDomain",
+      page_title as "pageTitle",
+      event_type as "eventType",
+      event_name as "eventName"
+    from website_event
+    where website_id = {{websiteId::uuid}}
+        and created_at between {{startDate}} and {{endDate}}
+    ${filterQuery}
+    ${
+      query
+        ? `and (event_name ${like} {{query}}
+           or url_path ${like} {{query}})`
+        : ''
+    }
+    order by created_at desc
+    limit 1000)
+    select * from events
+    `,
+    { ...params, query: `%${query}%` },
+    pageParams,
   );
 }
 
diff --git a/src/queries/analytics/sessions/getWebsiteSessions.ts b/src/queries/analytics/sessions/getWebsiteSessions.ts
index 1ea3ef49e6..81e007ca08 100644
--- a/src/queries/analytics/sessions/getWebsiteSessions.ts
+++ b/src/queries/analytics/sessions/getWebsiteSessions.ts
@@ -1,6 +1,6 @@
-import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
-import { runQuery, PRISMA, CLICKHOUSE } from 'lib/db';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import prisma from 'lib/prisma';
 import { PageParams, QueryFilters } from 'lib/types';
 
 export async function getWebsiteSessions(
@@ -13,14 +13,44 @@ export async function getWebsiteSessions(
 }
 
 async function relationalQuery(websiteId: string, filters: QueryFilters, pageParams: PageParams) {
-  const { pagedQuery } = prisma;
-
-  const where = {
+  const { pagedRawQuery, parseFilters } = prisma;
+  const { filterQuery, params } = await parseFilters(websiteId, {
     ...filters,
-    id: websiteId,
-  };
+  });
 
-  return pagedQuery('session', { where }, pageParams);
+  return pagedRawQuery(
+    `
+    with sessions as (
+    select
+      s.session_id as "id",
+      s.website_id as "websiteId",
+      hostname,
+      browser,
+      os,
+      device,
+      screen,
+      language,
+      country,
+      subdivision1,
+      city,
+      min(we.created_at) as "firstAt",
+      max(we.created_at) as "lastAt",
+      count(distinct we.visit_id) as "visits",
+      sum(case when we.event_type = 1 then 1 else 0 end) as "views",
+      max(we.created_at) as "createdAt"
+    from website_event we
+    join session s on s.session_id = we.session_id
+    where we.website_id = {{websiteId::uuid}}
+        and we.created_at between {{startDate}} and {{endDate}}
+    ${filterQuery}
+    group by s.session_id, s.website_id, s.hostname, s.browser, s.os, s.device, s.screen, s.language, s.country, s.subdivision1, s.city
+    order by max(we.created_at) desc
+    limit 1000)
+    select * from sessions
+    `,
+    params,
+    pageParams,
+  );
 }
 
 async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
@@ -45,7 +75,8 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
       ${getDateStringSQL('min(min_time)')} as firstAt,
       ${getDateStringSQL('max(max_time)')} as lastAt,
       uniq(visit_id) as visits,
-      sumIf(views, event_type = 1) as views
+      sumIf(views, event_type = 1) as views,
+      lastAt as createdAt
     from website_event_stats_hourly
     where website_id = {websiteId:UUID}
     ${dateQuery}
@@ -57,17 +88,5 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
     `,
     params,
     pageParams,
-  ).then((result: any) => {
-    return {
-      ...result,
-      data: result.data.map((row: any) => {
-        return {
-          ...row,
-          createdAt: row.lastAt,
-          visits: Number(row.visits),
-          views: Number(row.views),
-        };
-      }),
-    };
-  });
+  );
 }

From e35c11c3d648f9ebd69698551c2dfd48d0f3afec Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 20 Aug 2024 23:58:20 -0700
Subject: [PATCH 303/438] Updated realtime data fetch.

---
 .../[websiteId]/realtime/RealtimeLog.tsx      | 11 +--
 src/components/hooks/queries/useRealtime.ts   |  4 +-
 src/lib/clickhouse.ts                         |  5 +-
 src/pages/api/realtime/[websiteId].ts         |  6 +-
 src/queries/analytics/getRealtimeActivity.ts  | 67 +++++++++++++++
 src/queries/analytics/getRealtimeData.ts      | 85 +++++++------------
 .../analytics/pageviews/getPageviewStats.ts   | 12 +--
 .../analytics/sessions/getSessionStats.ts     | 16 ++--
 src/queries/index.ts                          |  1 +
 9 files changed, 123 insertions(+), 84 deletions(-)
 create mode 100644 src/queries/analytics/getRealtimeActivity.ts

diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
index 98b7a924be..8a5f3a55f5 100644
--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
@@ -10,7 +10,6 @@ import { safeDecodeURI } from 'next-basics';
 import { useContext, useMemo, useState } from 'react';
 import { Icon, SearchField, StatusLight, Text } from 'react-basics';
 import { FixedSizeList } from 'react-window';
-import thenby from 'thenby';
 import { WebsiteContext } from '../WebsiteProvider';
 import styles from './RealtimeLog.module.css';
 
@@ -141,15 +140,7 @@ export function RealtimeLog({ data }: { data: RealtimeData }) {
       return [];
     }
 
-    const { events, visitors } = data;
-
-    let logs = [
-      ...events.map(e => ({
-        __type: e.eventName ? TYPE_EVENT : TYPE_PAGEVIEW,
-        ...e,
-      })),
-      ...visitors.map(v => ({ __type: TYPE_SESSION, ...v })),
-    ].sort(thenby.firstBy('createdAt', -1));
+    let logs = data.events;
 
     if (search) {
       logs = logs.filter(({ eventName, urlPath, browser, os, country, device }) => {
diff --git a/src/components/hooks/queries/useRealtime.ts b/src/components/hooks/queries/useRealtime.ts
index 9c0c54f6be..88bf06e4b1 100644
--- a/src/components/hooks/queries/useRealtime.ts
+++ b/src/components/hooks/queries/useRealtime.ts
@@ -1,15 +1,13 @@
 import { RealtimeData } from 'lib/types';
 import { useApi } from './useApi';
 import { REALTIME_INTERVAL } from 'lib/constants';
-import { useTimezone } from '../useTimezone';
 
 export function useRealtime(websiteId: string) {
   const { get, useQuery } = useApi();
-  const { timezone } = useTimezone();
   const { data, isLoading, error } = useQuery<RealtimeData>({
     queryKey: ['realtime', websiteId],
     queryFn: async () => {
-      return get(`/realtime/${websiteId}`, { timezone });
+      return get(`/realtime/${websiteId}`);
     },
     enabled: !!websiteId,
     refetchInterval: REALTIME_INTERVAL,
diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index 397883fb58..332d07275c 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -187,7 +187,10 @@ async function rawQuery<T = unknown>(
     query: query,
     query_params: params,
     format: 'JSONEachRow',
-    clickhouse_settings: { output_format_json_quote_64bit_integers: 0 },
+    clickhouse_settings: {
+      date_time_output_format: 'iso',
+      output_format_json_quote_64bit_integers: 0,
+    },
   });
 
   return (await resultSet.json()) as T;
diff --git a/src/pages/api/realtime/[websiteId].ts b/src/pages/api/realtime/[websiteId].ts
index 82854f1c17..66dcabc97e 100644
--- a/src/pages/api/realtime/[websiteId].ts
+++ b/src/pages/api/realtime/[websiteId].ts
@@ -10,13 +10,11 @@ import { REALTIME_RANGE } from 'lib/constants';
 
 export interface RealtimeRequestQuery {
   websiteId: string;
-  timezone: string;
 }
 
 const schema = {
   GET: yup.object().shape({
     websiteId: yup.string().uuid().required(),
-    timezone: yup.string().required(),
   }),
 };
 
@@ -25,7 +23,7 @@ export default async (req: NextApiRequestQueryBody<RealtimeRequestQuery>, res: N
   await useValidate(schema, req, res);
 
   if (req.method === 'GET') {
-    const { websiteId, timezone } = req.query;
+    const { websiteId } = req.query;
 
     if (!(await canViewWebsite(req.auth, websiteId))) {
       return unauthorized(res);
@@ -33,7 +31,7 @@ export default async (req: NextApiRequestQueryBody<RealtimeRequestQuery>, res: N
 
     const startDate = subMinutes(startOfMinute(new Date()), REALTIME_RANGE);
 
-    const data = await getRealtimeData(websiteId, { startDate, timezone });
+    const data = await getRealtimeData(websiteId, { startDate });
 
     return ok(res, data);
   }
diff --git a/src/queries/analytics/getRealtimeActivity.ts b/src/queries/analytics/getRealtimeActivity.ts
new file mode 100644
index 0000000000..11fcf2d8a8
--- /dev/null
+++ b/src/queries/analytics/getRealtimeActivity.ts
@@ -0,0 +1,67 @@
+import prisma from 'lib/prisma';
+import clickhouse from 'lib/clickhouse';
+import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
+import { QueryFilters } from 'lib/types';
+
+export async function getRealtimeActivity(...args: [websiteId: string, filters: QueryFilters]) {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(websiteId: string, filters: QueryFilters) {
+  const { rawQuery, parseFilters } = prisma;
+  const { params, filterQuery, dateQuery } = await parseFilters(websiteId, filters);
+
+  return rawQuery(
+    `
+    select
+        website_event.session_id as sessionId,
+        website_event.event_name as eventName,
+        website_event.created_at as createdAt,
+        session.browser,
+        session.os,
+        session.device,
+        session.country,
+        session.url_path as urlPath,
+        session.referrer_domain as referrerDomain
+    from website_event
+    inner join session
+      on session.session_id = website_event.session_id
+    where website_id = {{websiteId::uuid}}
+    ${filterQuery}
+    ${dateQuery}
+    order by created_at asc
+    limit 100
+    `,
+    params,
+  );
+}
+
+async function clickhouseQuery(websiteId: string, filters: QueryFilters): Promise<{ x: number }> {
+  const { rawQuery, parseFilters } = clickhouse;
+  const { params, filterQuery, dateQuery } = await parseFilters(websiteId, filters);
+
+  return rawQuery(
+    `
+        select
+            session_id as sessionId,
+            event_name as eventName,
+            created_at as createdAt,
+            browser,
+            os,
+            device,
+            country,
+            url_path as urlPath,
+            referrer_domain as referrerDomain
+        from website_event
+        where website_id = {websiteId:UUID}
+        ${filterQuery}
+        ${dateQuery}
+        order by createdAt asc
+        limit 100
+    `,
+    params,
+  );
+}
diff --git a/src/queries/analytics/getRealtimeData.ts b/src/queries/analytics/getRealtimeData.ts
index 3e691b4edb..bd0f8d5c87 100644
--- a/src/queries/analytics/getRealtimeData.ts
+++ b/src/queries/analytics/getRealtimeData.ts
@@ -1,11 +1,4 @@
-import {
-  getWebsiteSessions,
-  getWebsiteEvents,
-  getPageviewStats,
-  getSessionStats,
-} from 'queries/index';
-
-const MAX_SIZE = 50;
+import { getRealtimeActivity, getPageviewStats, getSessionStats } from 'queries/index';
 
 function increment(data: object, key: string) {
   if (key) {
@@ -17,61 +10,47 @@ function increment(data: object, key: string) {
   }
 }
 
-export async function getRealtimeData(
-  websiteId: string,
-  criteria: { startDate: Date; timezone: string },
-) {
-  const { startDate, timezone } = criteria;
-  const filters = { startDate, endDate: new Date(), unit: 'minute', timezone };
-  const [events, sessions, pageviews, sessionviews] = await Promise.all([
-    getWebsiteEvents(websiteId, { startDate, timezone }, { pageSize: 10000 }),
-    getWebsiteSessions(websiteId, { startDate, timezone }, { pageSize: 10000 }),
+export async function getRealtimeData(websiteId: string, criteria: { startDate: Date }) {
+  const { startDate } = criteria;
+  const filters = { startDate, endDate: new Date(), unit: 'minute' };
+  const [activity, pageviews, sessions] = await Promise.all([
+    getRealtimeActivity(websiteId, filters),
     getPageviewStats(websiteId, filters),
     getSessionStats(websiteId, filters),
   ]);
 
   const uniques = new Set();
 
-  const sessionStats = sessions.data.reduce(
-    (obj: { visitors: any; countries: any }, session: { id: any; country: any }) => {
-      const { countries, visitors } = obj;
-      const { id, country } = session;
+  const { countries, urls, referrers, events } = activity.reduce(
+    (
+      obj: { countries: any; urls: any; referrers: any; events: any },
+      event: {
+        sessionId: string;
+        urlPath: string;
+        referrerDomain: string;
+        country: string;
+        eventName: string;
+      },
+    ) => {
+      const { countries, urls, referrers, events } = obj;
+      const { sessionId, urlPath, referrerDomain, country, eventName } = event;
 
-      if (!uniques.has(id)) {
-        uniques.add(id);
+      if (!uniques.has(sessionId)) {
+        uniques.add(sessionId);
         increment(countries, country);
 
-        if (visitors.length < MAX_SIZE) {
-          visitors.push(session);
-        }
+        events.push({ __type: 'session', ...event });
       }
 
-      return obj;
-    },
-    {
-      countries: {},
-      visitors: [],
-    },
-  );
-
-  const eventStats = events.data.reduce(
-    (
-      obj: { urls: any; referrers: any; events: any },
-      event: { urlPath: any; referrerDomain: any },
-    ) => {
-      const { urls, referrers, events } = obj;
-      const { urlPath, referrerDomain } = event;
-
       increment(urls, urlPath);
       increment(referrers, referrerDomain);
 
-      if (events.length < MAX_SIZE) {
-        events.push(event);
-      }
+      events.push({ __type: eventName ? 'event' : 'pageview', ...event });
 
       return obj;
     },
     {
+      countries: {},
       urls: {},
       referrers: {},
       events: [],
@@ -79,17 +58,19 @@ export async function getRealtimeData(
   );
 
   return {
-    ...sessionStats,
-    ...eventStats,
+    countries,
+    urls,
+    referrers,
+    events: events.reverse(),
     series: {
       views: pageviews,
-      visitors: sessionviews,
+      visitors: sessions,
     },
     totals: {
-      views: events.data.filter(e => !e.eventName).length,
-      visitors: uniques.size,
-      events: events.data.filter(e => e.eventName).length,
-      countries: Object.keys(sessionStats.countries).length,
+      views: pageviews.reduce((sum: number, { y }: { y: number }) => sum + y, 0),
+      visitors: sessions.reduce((sum: number, { y }: { y: number }) => sum + y, 0),
+      events: activity.filter(e => e.eventName).length,
+      countries: Object.keys(countries).length,
     },
     timestamp: Date.now(),
   };
diff --git a/src/queries/analytics/pageviews/getPageviewStats.ts b/src/queries/analytics/pageviews/getPageviewStats.ts
index 0b80a2ed6a..bf8a0e8f6a 100644
--- a/src/queries/analytics/pageviews/getPageviewStats.ts
+++ b/src/queries/analytics/pageviews/getPageviewStats.ts
@@ -40,8 +40,8 @@ async function clickhouseQuery(
   websiteId: string,
   filters: QueryFilters,
 ): Promise<{ x: string; y: number }[]> {
-  const { timezone = 'UTC', unit = 'day' } = filters;
-  const { parseFilters, rawQuery, getDateStringSQL, getDateSQL } = clickhouse;
+  const { unit = 'day' } = filters;
+  const { parseFilters, rawQuery } = clickhouse;
   const { filterQuery, params } = await parseFilters(websiteId, {
     ...filters,
     eventType: EVENT_TYPE.pageView,
@@ -52,11 +52,11 @@ async function clickhouseQuery(
   if (EVENT_COLUMNS.some(item => Object.keys(filters).includes(item)) || unit === 'minute') {
     sql = `
     select
-      ${getDateStringSQL('g.t', unit)} as x,
+      g.t as x,
       g.y as y
     from (
       select
-        ${getDateSQL('created_at', unit, timezone)} as t,
+        date_trunc('${unit}', created_at) as t,
         count(*) as y
       from website_event
       where website_id = {websiteId:UUID}
@@ -70,11 +70,11 @@ async function clickhouseQuery(
   } else {
     sql = `
     select
-      ${getDateStringSQL('g.t', unit)} as x,
+      g.t as x,
       g.y as y
     from (
       select
-        ${getDateSQL('created_at', unit, timezone)} as t,
+        date_trunc('${unit}', created_at) as t,
         sum(views)as y
       from website_event_stats_hourly website_event
       where website_id = {websiteId:UUID}
diff --git a/src/queries/analytics/sessions/getSessionStats.ts b/src/queries/analytics/sessions/getSessionStats.ts
index af69f454c7..ee16e42560 100644
--- a/src/queries/analytics/sessions/getSessionStats.ts
+++ b/src/queries/analytics/sessions/getSessionStats.ts
@@ -40,8 +40,8 @@ async function clickhouseQuery(
   websiteId: string,
   filters: QueryFilters,
 ): Promise<{ x: string; y: number }[]> {
-  const { timezone = 'UTC', unit = 'day' } = filters;
-  const { parseFilters, rawQuery, getDateStringSQL, getDateSQL } = clickhouse;
+  const { unit = 'day' } = filters;
+  const { parseFilters, rawQuery } = clickhouse;
   const { filterQuery, params } = await parseFilters(websiteId, {
     ...filters,
     eventType: EVENT_TYPE.pageView,
@@ -52,11 +52,11 @@ async function clickhouseQuery(
   if (EVENT_COLUMNS.some(item => Object.keys(filters).includes(item)) || unit === 'minute') {
     sql = `
     select
-      ${getDateStringSQL('g.t', unit)} as x, 
+      g.t as x, 
       g.y as y
     from (
-      select 
-        ${getDateSQL('created_at', unit, timezone)} as t,
+      select
+        date_trunc('${unit}', created_at) as t,
         count(distinct session_id) as y
       from website_event
       where website_id = {websiteId:UUID}
@@ -70,11 +70,11 @@ async function clickhouseQuery(
   } else {
     sql = `
     select
-      ${getDateStringSQL('g.t', unit)} as x, 
+      g.t as x, 
       g.y as y
     from (
-      select 
-        ${getDateSQL('created_at', unit, timezone)} as t,
+      select
+        date_trunc('${unit}', created_at) as t,
         uniq(session_id) as y
       from website_event_stats_hourly website_event
       where website_id = {websiteId:UUID}
diff --git a/src/queries/index.ts b/src/queries/index.ts
index 26c1df09a6..a2697ced58 100644
--- a/src/queries/index.ts
+++ b/src/queries/index.ts
@@ -31,6 +31,7 @@ export * from './analytics/sessions/getSessionActivity';
 export * from './analytics/sessions/getSessionStats';
 export * from './analytics/sessions/saveSessionData';
 export * from './analytics/getActiveVisitors';
+export * from './analytics/getRealtimeActivity';
 export * from './analytics/getRealtimeData';
 export * from './analytics/getValues';
 export * from './analytics/getWebsiteDateRange';

From 917916c2247dfff7a4f6ed0ba43420ab71de9b22 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Wed, 21 Aug 2024 13:51:28 -0700
Subject: [PATCH 304/438] update queries for event / session properties and
 values screens

---
 src/components/common/TypeIcon.tsx            |  2 +-
 .../events/getEventDataProperties.ts          | 14 ++---
 .../analytics/events/getEventDataValues.ts    | 19 ++++---
 .../sessions/getSessionDataValues.ts          | 10 ++--
 .../analytics/sessions/getWebsiteSessions.ts  | 54 +++++++++++--------
 5 files changed, 59 insertions(+), 40 deletions(-)

diff --git a/src/components/common/TypeIcon.tsx b/src/components/common/TypeIcon.tsx
index bb99c2f7f0..d617e75925 100644
--- a/src/components/common/TypeIcon.tsx
+++ b/src/components/common/TypeIcon.tsx
@@ -13,7 +13,7 @@ export function TypeIcon({
     <>
       <img
         src={`${process.env.basePath || ''}/images/${type}/${
-          value.replaceAll(' ', '-').toLowerCase() || 'unknown'
+          value?.replaceAll(' ', '-').toLowerCase() || 'unknown'
         }.png`}
         alt={value}
         width={type === 'country' ? undefined : 16}
diff --git a/src/queries/analytics/events/getEventDataProperties.ts b/src/queries/analytics/events/getEventDataProperties.ts
index cdf76c3f5f..e2cf082887 100644
--- a/src/queries/analytics/events/getEventDataProperties.ts
+++ b/src/queries/analytics/events/getEventDataProperties.ts
@@ -24,15 +24,15 @@ async function relationalQuery(
   return rawQuery(
     `
     select
-      we.event_name as "eventName",
-      ed.data_key as "propertyName",
+      website_event.event_name as "eventName",
+      event_data.data_key as "propertyName",
       count(*) as "total"
-    from event_data ed
-    join website_event we on we.event_id = ed.website_event_id
-    where ed.website_id = {{websiteId::uuid}}
-      and ed.created_at between {{startDate}} and {{endDate}}
+    from event_data 
+    join website_event on website_event.event_id = event_data.website_event_id
+    where event_data.website_id = {{websiteId::uuid}}
+      and event_data.created_at between {{startDate}} and {{endDate}}
     ${filterQuery}
-    group by we.event_name, ed.data_key
+    group by website_event.event_name, event_data.data_key
     order by 3 desc
     limit 500
     `,
diff --git a/src/queries/analytics/events/getEventDataValues.ts b/src/queries/analytics/events/getEventDataValues.ts
index f6b36b566c..07e423075b 100644
--- a/src/queries/analytics/events/getEventDataValues.ts
+++ b/src/queries/analytics/events/getEventDataValues.ts
@@ -19,21 +19,26 @@ async function relationalQuery(
   websiteId: string,
   filters: QueryFilters & { eventName?: string; propertyName?: string },
 ) {
-  const { rawQuery, parseFilters } = prisma;
+  const { rawQuery, parseFilters, getDateSQL } = prisma;
   const { filterQuery, params } = await parseFilters(websiteId, filters);
 
   return rawQuery(
     `
     select
-      string_value as "value",
+      case 
+        when data_type = 2 then replace(string_value, '.0000', '') 
+        when data_type = 4 then ${getDateSQL('date_value', 'hour')} 
+        else string_value
+      end as "value",
       count(*) as "total"
     from event_data
-    where website_id = {{websiteId::uuid}}
-      and created_at between {{startDate}} and {{endDate}}
-      and data_key = {{propertyName}}
-      and event_key = {{eventName}}
+    join website_event on website_event.event_id = event_data.website_event_id
+    where event_data.website_id = {{websiteId::uuid}}
+      and event_data.created_at between {{startDate}} and {{endDate}}
+      and event_data.data_key = {{propertyName}}
+      and website_event.event_name = {{eventName}}
     ${filterQuery}
-    group by string_value
+    group by value
     order by 2 desc
     limit 100
     `,
diff --git a/src/queries/analytics/sessions/getSessionDataValues.ts b/src/queries/analytics/sessions/getSessionDataValues.ts
index d9a7eb596b..c02e4adb06 100644
--- a/src/queries/analytics/sessions/getSessionDataValues.ts
+++ b/src/queries/analytics/sessions/getSessionDataValues.ts
@@ -16,20 +16,24 @@ async function relationalQuery(
   websiteId: string,
   filters: QueryFilters & { propertyName?: string },
 ) {
-  const { rawQuery, parseFilters } = prisma;
+  const { rawQuery, parseFilters, getDateSQL } = prisma;
   const { filterQuery, params } = await parseFilters(websiteId, filters);
 
   return rawQuery(
     `
     select
-      string_value as "value",
+      case 
+        when data_type = 2 then replace(string_value, '.0000', '') 
+        when data_type = 4 then ${getDateSQL('date_value', 'hour')} 
+        else string_value
+      end as "value",
       count(*) as "total"
     from session_data
     where website_id = {{websiteId::uuid}}
       and created_at between {{startDate}} and {{endDate}}
       and data_key = {{propertyName}}
     ${filterQuery}
-    group by string_value
+    group by value
     order by 2 desc
     limit 100
     `,
diff --git a/src/queries/analytics/sessions/getWebsiteSessions.ts b/src/queries/analytics/sessions/getWebsiteSessions.ts
index 81e007ca08..d2a827d0eb 100644
--- a/src/queries/analytics/sessions/getWebsiteSessions.ts
+++ b/src/queries/analytics/sessions/getWebsiteSessions.ts
@@ -22,29 +22,39 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
     `
     with sessions as (
     select
-      s.session_id as "id",
-      s.website_id as "websiteId",
-      hostname,
-      browser,
-      os,
-      device,
-      screen,
-      language,
-      country,
-      subdivision1,
-      city,
-      min(we.created_at) as "firstAt",
-      max(we.created_at) as "lastAt",
-      count(distinct we.visit_id) as "visits",
-      sum(case when we.event_type = 1 then 1 else 0 end) as "views",
-      max(we.created_at) as "createdAt"
-    from website_event we
-    join session s on s.session_id = we.session_id
-    where we.website_id = {{websiteId::uuid}}
-        and we.created_at between {{startDate}} and {{endDate}}
+      session.session_id as "id",
+      session.website_id as "websiteId",
+      session.hostname,
+      session.browser,
+      session.os,
+      session.device,
+      session.screen,
+      session.language,
+      session.country,
+      session.subdivision1,
+      session.city,
+      min(website_event.created_at) as "firstAt",
+      max(website_event.created_at) as "lastAt",
+      count(distinct website_event.visit_id) as "visits",
+      sum(case when website_event.event_type = 1 then 1 else 0 end) as "views",
+      max(website_event.created_at) as "createdAt"
+    from website_event 
+    join session on session.session_id = website_event.session_id
+    where website_event.website_id = {{websiteId::uuid}}
+        and website_event.created_at between {{startDate}} and {{endDate}}
     ${filterQuery}
-    group by s.session_id, s.website_id, s.hostname, s.browser, s.os, s.device, s.screen, s.language, s.country, s.subdivision1, s.city
-    order by max(we.created_at) desc
+    group by session.session_id, 
+      session.website_id, 
+      session.hostname, 
+      session.browser, 
+      session.os, 
+      session.device, 
+      session.screen, 
+      session.language, 
+      session.country, 
+      session.subdivision1, 
+      session.city
+    order by max(website_event.created_at) desc
     limit 1000)
     select * from sessions
     `,

From 7bc5635b9d946872dcb70d31948631e90820fcea Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Wed, 21 Aug 2024 15:08:22 -0700
Subject: [PATCH 305/438] fix websiteSession screens

---
 src/queries/analytics/getRealtimeActivity.ts  | 14 ++---
 src/queries/analytics/getRealtimeData.ts      |  4 +-
 .../analytics/sessions/getSessionActivity.ts  |  2 +-
 .../analytics/sessions/getSessionData.ts      | 28 +++++++---
 .../analytics/sessions/getWebsiteSession.ts   | 53 ++++++++++++++++---
 5 files changed, 78 insertions(+), 23 deletions(-)

diff --git a/src/queries/analytics/getRealtimeActivity.ts b/src/queries/analytics/getRealtimeActivity.ts
index 11fcf2d8a8..fba303b2f9 100644
--- a/src/queries/analytics/getRealtimeActivity.ts
+++ b/src/queries/analytics/getRealtimeActivity.ts
@@ -17,22 +17,22 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
   return rawQuery(
     `
     select
-        website_event.session_id as sessionId,
-        website_event.event_name as eventName,
-        website_event.created_at as createdAt,
+        website_event.session_id as "sessionId",
+        website_event.event_name as "eventName",
+        website_event.created_at as "createdAt",
         session.browser,
         session.os,
         session.device,
         session.country,
-        session.url_path as urlPath,
-        session.referrer_domain as referrerDomain
+        website_event.url_path as "urlPath",
+        website_event.referrer_domain as "referrerDomain"
     from website_event
     inner join session
       on session.session_id = website_event.session_id
-    where website_id = {{websiteId::uuid}}
+    where website_event.website_id = {{websiteId::uuid}}
     ${filterQuery}
     ${dateQuery}
-    order by created_at asc
+    order by website_event.created_at asc
     limit 100
     `,
     params,
diff --git a/src/queries/analytics/getRealtimeData.ts b/src/queries/analytics/getRealtimeData.ts
index bd0f8d5c87..63aa9aecb8 100644
--- a/src/queries/analytics/getRealtimeData.ts
+++ b/src/queries/analytics/getRealtimeData.ts
@@ -67,8 +67,8 @@ export async function getRealtimeData(websiteId: string, criteria: { startDate:
       visitors: sessions,
     },
     totals: {
-      views: pageviews.reduce((sum: number, { y }: { y: number }) => sum + y, 0),
-      visitors: sessions.reduce((sum: number, { y }: { y: number }) => sum + y, 0),
+      views: pageviews.reduce((sum: number, { y }: { y: number }) => Number(sum) + Number(y), 0),
+      visitors: sessions.reduce((sum: number, { y }: { y: number }) => Number(sum) + Number(y), 0),
       events: activity.filter(e => e.eventName).length,
       countries: Object.keys(countries).length,
     },
diff --git a/src/queries/analytics/sessions/getSessionActivity.ts b/src/queries/analytics/sessions/getSessionActivity.ts
index c50a82d97e..3bda0d2917 100644
--- a/src/queries/analytics/sessions/getSessionActivity.ts
+++ b/src/queries/analytics/sessions/getSessionActivity.ts
@@ -19,7 +19,7 @@ async function relationalQuery(
 ) {
   return prisma.client.websiteEvent.findMany({
     where: {
-      id: sessionId,
+      sessionId,
       websiteId,
       createdAt: { gte: startDate, lte: endDate },
     },
diff --git a/src/queries/analytics/sessions/getSessionData.ts b/src/queries/analytics/sessions/getSessionData.ts
index 509fcdbf6b..ce80b0351a 100644
--- a/src/queries/analytics/sessions/getSessionData.ts
+++ b/src/queries/analytics/sessions/getSessionData.ts
@@ -10,12 +10,26 @@ export async function getSessionData(...args: [websiteId: string, sessionId: str
 }
 
 async function relationalQuery(websiteId: string, sessionId: string) {
-  return prisma.client.sessionData.findMany({
-    where: {
-      id: sessionId,
-      websiteId,
-    },
-  });
+  const { rawQuery } = prisma;
+
+  return rawQuery(
+    `
+    select
+        website_id as "websiteId",
+        session_id as "sessionId",
+        data_key as "dataKey",
+        data_type as "dataType",
+        replace(string_value, '.0000', '') as "stringValue",
+        number_value as "numberValue",
+        date_value as "dateValue",
+        created_at as "createdAt"
+    from session_data
+    where website_id = {{websiteId::uuid}}
+      and session_id = {{sessionId::uuid}}
+    order by data_key asc
+    `,
+    { websiteId, sessionId },
+  );
 }
 
 async function clickhouseQuery(websiteId: string, sessionId: string) {
@@ -28,7 +42,7 @@ async function clickhouseQuery(websiteId: string, sessionId: string) {
         session_id as sessionId,
         data_key as dataKey,
         data_type as dataType,
-        string_value as stringValue,
+        replace(string_value, '.0000', '')  as stringValue,
         number_value as numberValue,
         date_value as dateValue,
         created_at as createdAt
diff --git a/src/queries/analytics/sessions/getWebsiteSession.ts b/src/queries/analytics/sessions/getWebsiteSession.ts
index 6f672e7d8d..f9b9f39a08 100644
--- a/src/queries/analytics/sessions/getWebsiteSession.ts
+++ b/src/queries/analytics/sessions/getWebsiteSession.ts
@@ -10,12 +10,53 @@ export async function getWebsiteSession(...args: [websiteId: string, sessionId:
 }
 
 async function relationalQuery(websiteId: string, sessionId: string) {
-  return prisma.client.session.findUnique({
-    where: {
-      id: sessionId,
-      websiteId,
-    },
-  });
+  const { rawQuery, getTimestampDiffSQL } = prisma;
+
+  return rawQuery(
+    `
+    select id,
+      website_id as "websiteId",
+      hostname,
+      browser,
+      os,
+      device,
+      screen,
+      language,
+      country,
+      subdivision1,
+      city,
+      min(min_time) as "firstAt",
+      max(max_time) as "lastAt",
+      count(distinct visit_id) as visits,
+      sum(views) as views,
+      sum(events) as events,
+      sum(${getTimestampDiffSQL('min_time', 'max_time')}) as "totaltime" 
+    from (select
+          session.session_id as id,
+          website_event.visit_id,
+          session.website_id,
+          session.hostname,
+          session.browser,
+          session.os,
+          session.device,
+          session.screen,
+          session.language,
+          session.country,
+          session.subdivision1,
+          session.city,
+          min(website_event.created_at) as min_time,
+          max(website_event.created_at) as max_time,
+          sum(case when website_event.event_type = 1 then 1 else 0 end) as views,
+          sum(case when website_event.event_type = 1 then 1 else 0 end) as events
+    from session
+    join website_event on website_event.session_id = session.session_id
+    where session.website_id = {{websiteId::uuid}}
+      and session.session_id = {{sessionId::uuid}}
+    group by session.session_id, visit_id, session.website_id, session.hostname, session.browser, session.os, session.device, session.screen, session.language, session.country, session.subdivision1, session.city) t
+    group by id, website_id, hostname, browser, os, device, screen, language, country, subdivision1, city;
+    `,
+    { websiteId, sessionId },
+  ).then(result => result?.[0]);
 }
 
 async function clickhouseQuery(websiteId: string, sessionId: string) {

From db7d705767fc7f45d13ad15a856c7f5d54998914 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Wed, 21 Aug 2024 15:25:42 -0700
Subject: [PATCH 306/438] fix getwebsiteevent search

---
 src/queries/analytics/events/getWebsiteEvents.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/queries/analytics/events/getWebsiteEvents.ts b/src/queries/analytics/events/getWebsiteEvents.ts
index 5ac42dbb5e..21e6270c76 100644
--- a/src/queries/analytics/events/getWebsiteEvents.ts
+++ b/src/queries/analytics/events/getWebsiteEvents.ts
@@ -44,8 +44,8 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
     ${filterQuery}
     ${
       query
-        ? `and (event_name ${like} {{query}}
-           or url_path ${like} {{query}})`
+        ? `and ((event_name ${like} {{query}} and event_type = 2)
+           or (url_path ${like} {{query}} and event_type = 1))`
         : ''
     }
     order by created_at desc
@@ -84,8 +84,8 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
     ${filterQuery}
     ${
       query
-        ? `and (positionCaseInsensitive(event_name, {query:String}) > 0
-           or positionCaseInsensitive(url_path, {query:String}) > 0)`
+        ? `and ((positionCaseInsensitive(event_name, {query:String}) > 0 and event_type = 2)
+           or (positionCaseInsensitive(url_path, {query:String}) > 0 and event_type = 1))`
         : ''
     }
     order by created_at desc

From 9b88611a38d22a7ae1d12205fa9b006665a6e648 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 22 Aug 2024 03:10:48 -0700
Subject: [PATCH 307/438] Fixed search field disappearing when results are
 empty. Closes #2879.

---
 src/app/(main)/reports/ReportsDataTable.tsx   |  6 +--
 .../(main)/settings/teams/TeamsDataTable.tsx  |  6 +--
 .../(main)/settings/users/UsersDataTable.tsx  |  6 +--
 .../settings/websites/WebsitesDataTable.tsx   |  6 +--
 .../sessions/SessionsDataTable.tsx            |  6 +--
 src/components/common/DataTable.tsx           | 49 ++++++++++---------
 6 files changed, 31 insertions(+), 48 deletions(-)

diff --git a/src/app/(main)/reports/ReportsDataTable.tsx b/src/app/(main)/reports/ReportsDataTable.tsx
index 7c99fb25f7..b03edfc273 100644
--- a/src/app/(main)/reports/ReportsDataTable.tsx
+++ b/src/app/(main)/reports/ReportsDataTable.tsx
@@ -14,12 +14,8 @@ export default function ReportsDataTable({
 }) {
   const queryResult = useReports({ websiteId, teamId });
 
-  if (queryResult?.result?.data?.length === 0) {
-    return children;
-  }
-
   return (
-    <DataTable queryResult={queryResult}>
+    <DataTable queryResult={queryResult} renderEmpty={() => children}>
       {({ data }) => <ReportsTable data={data} showDomain={!websiteId} />}
     </DataTable>
   );
diff --git a/src/app/(main)/settings/teams/TeamsDataTable.tsx b/src/app/(main)/settings/teams/TeamsDataTable.tsx
index 6baeba3313..e8563b2eae 100644
--- a/src/app/(main)/settings/teams/TeamsDataTable.tsx
+++ b/src/app/(main)/settings/teams/TeamsDataTable.tsx
@@ -15,12 +15,8 @@ export function TeamsDataTable({
   const { user } = useLogin();
   const queryResult = useTeams(user.id);
 
-  if (queryResult?.result?.data?.length === 0) {
-    return children;
-  }
-
   return (
-    <DataTable queryResult={queryResult}>
+    <DataTable queryResult={queryResult} renderEmpty={() => children}>
       {({ data }) => {
         return <TeamsTable data={data} allowEdit={allowEdit} showActions={showActions} />;
       }}
diff --git a/src/app/(main)/settings/users/UsersDataTable.tsx b/src/app/(main)/settings/users/UsersDataTable.tsx
index 681b4dc2d6..03addc749a 100644
--- a/src/app/(main)/settings/users/UsersDataTable.tsx
+++ b/src/app/(main)/settings/users/UsersDataTable.tsx
@@ -12,12 +12,8 @@ export function UsersDataTable({
 }) {
   const queryResult = useUsers();
 
-  if (queryResult?.result?.data?.length === 0) {
-    return children;
-  }
-
   return (
-    <DataTable queryResult={queryResult}>
+    <DataTable queryResult={queryResult} renderEmpty={() => children}>
       {({ data }) => <UsersTable data={data} showActions={showActions} />}
     </DataTable>
   );
diff --git a/src/app/(main)/settings/websites/WebsitesDataTable.tsx b/src/app/(main)/settings/websites/WebsitesDataTable.tsx
index 1780dfb4a3..d91bbeefa5 100644
--- a/src/app/(main)/settings/websites/WebsitesDataTable.tsx
+++ b/src/app/(main)/settings/websites/WebsitesDataTable.tsx
@@ -18,12 +18,8 @@ export function WebsitesDataTable({
 }) {
   const queryResult = useWebsites({ teamId });
 
-  if (queryResult?.result?.data?.length === 0) {
-    return children;
-  }
-
   return (
-    <DataTable queryResult={queryResult}>
+    <DataTable queryResult={queryResult} renderEmpty={() => children}>
       {({ data }) => (
         <WebsitesTable
           teamId={teamId}
diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsDataTable.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsDataTable.tsx
index d69cad121a..788d0066c8 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/SessionsDataTable.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsDataTable.tsx
@@ -13,12 +13,8 @@ export default function SessionsDataTable({
 }) {
   const queryResult = useWebsiteSessions(websiteId);
 
-  if (queryResult?.result?.data?.length === 0) {
-    return children;
-  }
-
   return (
-    <DataTable queryResult={queryResult} allowSearch={false}>
+    <DataTable queryResult={queryResult} allowSearch={false} renderEmpty={() => children}>
       {({ data }) => <SessionsTable data={data} showDomain={!websiteId} />}
     </DataTable>
   );
diff --git a/src/components/common/DataTable.tsx b/src/components/common/DataTable.tsx
index c3bab88ff4..22373f608e 100644
--- a/src/components/common/DataTable.tsx
+++ b/src/components/common/DataTable.tsx
@@ -1,11 +1,12 @@
 import { ReactNode } from 'react';
 import classNames from 'classnames';
-import { Banner, Loading, SearchField } from 'react-basics';
+import { Loading, SearchField } from 'react-basics';
 import { useMessages, useNavigation } from 'components/hooks';
 import Empty from 'components/common/Empty';
 import Pager from 'components/common/Pager';
 import { PagedQueryResult } from 'lib/types';
 import styles from './DataTable.module.css';
+import { LoadingPanel } from 'components/common/LoadingPanel';
 
 const DEFAULT_SEARCH_DELAY = 600;
 
@@ -14,6 +15,7 @@ export interface DataTableProps {
   searchDelay?: number;
   allowSearch?: boolean;
   allowPaging?: boolean;
+  renderEmpty?: () => ReactNode;
   children: ReactNode | ((data: any) => ReactNode);
 }
 
@@ -22,6 +24,7 @@ export function DataTable({
   searchDelay = 600,
   allowSearch = true,
   allowPaging = true,
+  renderEmpty,
   children,
 }: DataTableProps) {
   const { formatMessage, labels, messages } = useMessages();
@@ -29,7 +32,7 @@ export function DataTable({
     result,
     params,
     setParams,
-    query: { error, isLoading },
+    query: { error, isLoading, isFetched },
   } = queryResult || {};
   const { page, pageSize, count, data } = result || {};
   const { query } = params || {};
@@ -46,10 +49,6 @@ export function DataTable({
     router.push(renderUrl({ page }));
   };
 
-  if (error) {
-    return <Banner variant="error">{formatMessage(messages.error)}</Banner>;
-  }
-
   return (
     <>
       {allowSearch && (hasData || query) && (
@@ -62,23 +61,27 @@ export function DataTable({
           placeholder={formatMessage(labels.search)}
         />
       )}
-      <div
-        className={classNames(styles.body, { [styles.status]: isLoading || noResults || !hasData })}
-      >
-        {hasData ? (typeof children === 'function' ? children(result) : children) : null}
-        {isLoading && <Loading position="page" />}
-        {!isLoading && !hasData && !query && <Empty />}
-        {!isLoading && noResults && <Empty message={formatMessage(messages.noResultsFound)} />}
-      </div>
-      {allowPaging && hasData && (
-        <Pager
-          className={styles.pager}
-          page={page}
-          pageSize={pageSize}
-          count={count}
-          onPageChange={handlePageChange}
-        />
-      )}
+      <LoadingPanel data={data} isLoading={isLoading} isFetched={isFetched} error={error}>
+        <div
+          className={classNames(styles.body, {
+            [styles.status]: isLoading || noResults || !hasData,
+          })}
+        >
+          {hasData ? (typeof children === 'function' ? children(result) : children) : null}
+          {isLoading && <Loading position="page" />}
+          {!isLoading && !hasData && !query && (renderEmpty ? renderEmpty() : <Empty />)}
+          {!isLoading && noResults && <Empty message={formatMessage(messages.noResultsFound)} />}
+        </div>
+        {allowPaging && hasData && (
+          <Pager
+            className={styles.pager}
+            page={page}
+            pageSize={pageSize}
+            count={count}
+            onPageChange={handlePageChange}
+          />
+        )}
+      </LoadingPanel>
     </>
   );
 }

From cfb3fcafc955b05cccdd41e0ee16df1b70efd7aa Mon Sep 17 00:00:00 2001
From: wjsoj <wjs@wjsphy.top>
Date: Thu, 22 Aug 2024 23:54:45 +0800
Subject: [PATCH 308/438] fix: a small type error

---
 src/lib/types.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/lib/types.ts b/src/lib/types.ts
index e659655202..d5bf05f5cf 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -143,10 +143,11 @@ export interface WebsitePageviews {
 }
 
 export interface WebsiteStats {
-  pageviews: { value: number; change: number };
-  uniques: { value: number; change: number };
-  bounces: { value: number; change: number };
-  totalTime: { value: number; change: number };
+  pageviews: { value: number; prev: number };
+  visitors: { value: number; prev: number };
+  visits: { value: number; prev: number };
+  bounces: { value: number; prev: number };
+  totalTime: { value: number; prev: number };
 }
 
 export interface DateRange {

From 647dcb5f25cb7672be71ea3bdb0845165a1c1bbd Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 22 Aug 2024 12:02:36 -0700
Subject: [PATCH 309/438] Fixed realtime chart for relational. Removed
 getDateArray. Added chart min/max dates.

---
 .../websites/[websiteId]/WebsiteChart.tsx     | 15 +++++++++----
 src/components/charts/BarChart.tsx            |  6 +++++
 src/components/metrics/EventsChart.tsx        |  5 -----
 src/components/metrics/RealtimeChart.tsx      | 14 ++++++++----
 src/lib/date.ts                               | 13 -----------
 src/lib/prisma.ts                             | 22 ++++++-------------
 .../analytics/sessions/getSessionStats.ts     | 17 +++++++++-----
 7 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx b/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
index 48da23776c..fa5ab69423 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
@@ -1,6 +1,5 @@
 import { useMemo } from 'react';
 import PageviewsChart from 'components/metrics/PageviewsChart';
-import { getDateArray } from 'lib/date';
 import useWebsitePageviews from 'components/hooks/queries/useWebsitePageviews';
 import { useDateRange } from 'components/hooks';
 
@@ -19,8 +18,8 @@ export function WebsiteChart({
   const chartData = useMemo(() => {
     if (data) {
       const result = {
-        pageviews: getDateArray(pageviews, startDate, endDate, unit),
-        sessions: getDateArray(sessions, startDate, endDate, unit),
+        pageviews,
+        sessions,
       };
 
       if (compare) {
@@ -43,7 +42,15 @@ export function WebsiteChart({
     return { pageviews: [], sessions: [] };
   }, [data, startDate, endDate, unit]);
 
-  return <PageviewsChart data={chartData} unit={unit} isLoading={isLoading} />;
+  return (
+    <PageviewsChart
+      data={chartData}
+      minDate={startDate.toISOString()}
+      maxDate={endDate.toISOString()}
+      unit={unit}
+      isLoading={isLoading}
+    />
+  );
 }
 
 export default WebsiteChart;
diff --git a/src/components/charts/BarChart.tsx b/src/components/charts/BarChart.tsx
index cfcbe74350..b96812210e 100644
--- a/src/components/charts/BarChart.tsx
+++ b/src/components/charts/BarChart.tsx
@@ -12,6 +12,8 @@ export interface BarChartProps extends ChartProps {
   renderYLabel?: (label: string, index: number, values: any[]) => string;
   XAxisType?: string;
   YAxisType?: string;
+  minDate?: number | string;
+  maxDate?: number | string;
 }
 
 export function BarChart(props: BarChartProps) {
@@ -24,6 +26,8 @@ export function BarChart(props: BarChartProps) {
     XAxisType = 'time',
     YAxisType = 'linear',
     stacked = false,
+    minDate,
+    maxDate,
   } = props;
 
   const options: any = useMemo(() => {
@@ -32,6 +36,8 @@ export function BarChart(props: BarChartProps) {
         x: {
           type: XAxisType,
           stacked: true,
+          min: minDate,
+          max: maxDate,
           time: {
             unit,
           },
diff --git a/src/components/metrics/EventsChart.tsx b/src/components/metrics/EventsChart.tsx
index 0bb65eb298..ee7f866cb3 100644
--- a/src/components/metrics/EventsChart.tsx
+++ b/src/components/metrics/EventsChart.tsx
@@ -1,7 +1,6 @@
 import { useMemo } from 'react';
 import { colord } from 'colord';
 import BarChart from 'components/charts/BarChart';
-import { getDateArray } from 'lib/date';
 import { useLocale, useDateRange, useWebsiteEventsSeries } from 'components/hooks';
 import { CHART_COLORS } from 'lib/constants';
 import { renderDateLabels } from 'lib/charts';
@@ -31,10 +30,6 @@ export function EventsChart({ websiteId, className }: EventsChartProps) {
       return obj;
     }, {});
 
-    Object.keys(map).forEach(key => {
-      map[key] = getDateArray(map[key], startDate, endDate, unit);
-    });
-
     return {
       datasets: Object.keys(map).map((key, index) => {
         const color = colord(CHART_COLORS[index % CHART_COLORS.length]);
diff --git a/src/components/metrics/RealtimeChart.tsx b/src/components/metrics/RealtimeChart.tsx
index b24eedb50c..b2819f9c88 100644
--- a/src/components/metrics/RealtimeChart.tsx
+++ b/src/components/metrics/RealtimeChart.tsx
@@ -1,7 +1,6 @@
 import { useMemo, useRef } from 'react';
 import { startOfMinute, subMinutes, isBefore } from 'date-fns';
 import PageviewsChart from './PageviewsChart';
-import { getDateArray } from 'lib/date';
 import { DEFAULT_ANIMATION_DURATION, REALTIME_RANGE } from 'lib/constants';
 import { RealtimeData } from 'lib/types';
 
@@ -22,8 +21,8 @@ export function RealtimeChart({ data, unit, ...props }: RealtimeChartProps) {
     }
 
     return {
-      pageviews: getDateArray(data.series.views, startDate, endDate, unit),
-      sessions: getDateArray(data.series.visitors, startDate, endDate, unit),
+      pageviews: data.series.views,
+      sessions: data.series.visitors,
     };
   }, [data, startDate, endDate, unit]);
 
@@ -37,7 +36,14 @@ export function RealtimeChart({ data, unit, ...props }: RealtimeChartProps) {
   }, [endDate]);
 
   return (
-    <PageviewsChart {...props} unit={unit} data={chartData} animationDuration={animationDuration} />
+    <PageviewsChart
+      {...props}
+      minDate={startDate.toISOString()}
+      maxDate={endDate.toISOString()}
+      unit={unit}
+      data={chartData}
+      animationDuration={animationDuration}
+    />
   );
 }
 
diff --git a/src/lib/date.ts b/src/lib/date.ts
index b8bfa6c765..b731140cf2 100644
--- a/src/lib/date.ts
+++ b/src/lib/date.ts
@@ -273,19 +273,6 @@ export function getMinimumUnit(startDate: number | Date, endDate: number | Date)
   return 'year';
 }
 
-export function getDateFromString(str: string) {
-  const [ymd, hms] = str.split(' ');
-  const [year, month, day] = ymd.split('-');
-
-  if (hms) {
-    const [hour, min, sec] = hms.split(':');
-
-    return new Date(+year, +month - 1, +day, +hour, +min, +sec);
-  }
-
-  return new Date(+year, +month - 1, +day);
-}
-
 export function getDateArray(data: any[], startDate: Date, endDate: Date, unit: string) {
   const arr = [];
   const { diff, add, start } = DATE_FUNCTIONS[unit];
diff --git a/src/lib/prisma.ts b/src/lib/prisma.ts
index c450f1f023..110b4750e2 100644
--- a/src/lib/prisma.ts
+++ b/src/lib/prisma.ts
@@ -12,19 +12,11 @@ import { filtersToArray } from './params';
 const log = debug('umami:prisma');
 
 const MYSQL_DATE_FORMATS = {
-  minute: '%Y-%m-%d %H:%i:00',
-  hour: '%Y-%m-%d %H:00:00',
-  day: '%Y-%m-%d',
-  month: '%Y-%m-01',
-  year: '%Y-01-01',
-};
-
-const POSTGRESQL_DATE_FORMATS = {
-  minute: 'YYYY-MM-DD HH24:MI:00',
-  hour: 'YYYY-MM-DD HH24:00:00',
-  day: 'YYYY-MM-DD',
-  month: 'YYYY-MM-01',
-  year: 'YYYY-01-01',
+  minute: '%Y-%m-%dT%H:%i:00Z',
+  hour: '%Y-%m-%dT%H:00:00Z',
+  day: '%Y-%m-%dT00:00:00Z',
+  month: '%Y-%m-01T00:00:00Z',
+  year: '%Y-01-01T00:00:00Z',
 };
 
 function getAddIntervalQuery(field: string, interval: string): string {
@@ -68,9 +60,9 @@ function getDateSQL(field: string, unit: string, timezone?: string): string {
 
   if (db === POSTGRESQL) {
     if (timezone) {
-      return `to_char(date_trunc('${unit}', ${field} at time zone '${timezone}'), '${POSTGRESQL_DATE_FORMATS[unit]}')`;
+      return `date_trunc('${unit}', ${field} at time zone '${timezone}')`;
     }
-    return `to_char(date_trunc('${unit}', ${field}), '${POSTGRESQL_DATE_FORMATS[unit]}')`;
+    return `date_trunc('${unit}', ${field})`;
   }
 
   if (db === MYSQL) {
diff --git a/src/queries/analytics/sessions/getSessionStats.ts b/src/queries/analytics/sessions/getSessionStats.ts
index ee16e42560..cd04976155 100644
--- a/src/queries/analytics/sessions/getSessionStats.ts
+++ b/src/queries/analytics/sessions/getSessionStats.ts
@@ -22,14 +22,21 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
   return rawQuery(
     `
     select
-      ${getDateSQL('website_event.created_at', unit, timezone)} x,
-      count(distinct website_event.session_id) y
-    from website_event
+      ${getDateSQL('g.created_at', unit, timezone)} as x,
+      count(distinct g.session_id) as y
+    from (
+      select
+        website_event.session_id,
+        min(website_event.created_at) as created_at,
+        count(*) y
+      from website_event
       ${joinSession}
-    where website_event.website_id = {{websiteId::uuid}}
+      where website_event.website_id = {{websiteId::uuid}}
       and website_event.created_at between {{startDate}} and {{endDate}}
-      and event_type = {{eventType}}
+      and event_type = {{eventType}} 
       ${filterQuery}
+      group by website_event.session_id, website_event.created_at
+    ) as g
     group by 1
     `,
     params,

From 5e5b61dc7ee3026fabd988b578ffa9e35799845f Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 22 Aug 2024 13:14:40 -0700
Subject: [PATCH 310/438] Revert "Fixed realtime chart for relational. Removed
 getDateArray. Added chart min/max dates."

This reverts commit 647dcb5f25cb7672be71ea3bdb0845165a1c1bbd.
---
 .../websites/[websiteId]/WebsiteChart.tsx     | 15 ++++---------
 src/components/charts/BarChart.tsx            |  6 -----
 src/components/metrics/EventsChart.tsx        |  5 +++++
 src/components/metrics/RealtimeChart.tsx      | 14 ++++--------
 src/lib/date.ts                               | 13 +++++++++++
 src/lib/prisma.ts                             | 22 +++++++++++++------
 .../analytics/sessions/getSessionStats.ts     | 17 +++++---------
 7 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx b/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
index fa5ab69423..48da23776c 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
@@ -1,5 +1,6 @@
 import { useMemo } from 'react';
 import PageviewsChart from 'components/metrics/PageviewsChart';
+import { getDateArray } from 'lib/date';
 import useWebsitePageviews from 'components/hooks/queries/useWebsitePageviews';
 import { useDateRange } from 'components/hooks';
 
@@ -18,8 +19,8 @@ export function WebsiteChart({
   const chartData = useMemo(() => {
     if (data) {
       const result = {
-        pageviews,
-        sessions,
+        pageviews: getDateArray(pageviews, startDate, endDate, unit),
+        sessions: getDateArray(sessions, startDate, endDate, unit),
       };
 
       if (compare) {
@@ -42,15 +43,7 @@ export function WebsiteChart({
     return { pageviews: [], sessions: [] };
   }, [data, startDate, endDate, unit]);
 
-  return (
-    <PageviewsChart
-      data={chartData}
-      minDate={startDate.toISOString()}
-      maxDate={endDate.toISOString()}
-      unit={unit}
-      isLoading={isLoading}
-    />
-  );
+  return <PageviewsChart data={chartData} unit={unit} isLoading={isLoading} />;
 }
 
 export default WebsiteChart;
diff --git a/src/components/charts/BarChart.tsx b/src/components/charts/BarChart.tsx
index b96812210e..cfcbe74350 100644
--- a/src/components/charts/BarChart.tsx
+++ b/src/components/charts/BarChart.tsx
@@ -12,8 +12,6 @@ export interface BarChartProps extends ChartProps {
   renderYLabel?: (label: string, index: number, values: any[]) => string;
   XAxisType?: string;
   YAxisType?: string;
-  minDate?: number | string;
-  maxDate?: number | string;
 }
 
 export function BarChart(props: BarChartProps) {
@@ -26,8 +24,6 @@ export function BarChart(props: BarChartProps) {
     XAxisType = 'time',
     YAxisType = 'linear',
     stacked = false,
-    minDate,
-    maxDate,
   } = props;
 
   const options: any = useMemo(() => {
@@ -36,8 +32,6 @@ export function BarChart(props: BarChartProps) {
         x: {
           type: XAxisType,
           stacked: true,
-          min: minDate,
-          max: maxDate,
           time: {
             unit,
           },
diff --git a/src/components/metrics/EventsChart.tsx b/src/components/metrics/EventsChart.tsx
index ee7f866cb3..0bb65eb298 100644
--- a/src/components/metrics/EventsChart.tsx
+++ b/src/components/metrics/EventsChart.tsx
@@ -1,6 +1,7 @@
 import { useMemo } from 'react';
 import { colord } from 'colord';
 import BarChart from 'components/charts/BarChart';
+import { getDateArray } from 'lib/date';
 import { useLocale, useDateRange, useWebsiteEventsSeries } from 'components/hooks';
 import { CHART_COLORS } from 'lib/constants';
 import { renderDateLabels } from 'lib/charts';
@@ -30,6 +31,10 @@ export function EventsChart({ websiteId, className }: EventsChartProps) {
       return obj;
     }, {});
 
+    Object.keys(map).forEach(key => {
+      map[key] = getDateArray(map[key], startDate, endDate, unit);
+    });
+
     return {
       datasets: Object.keys(map).map((key, index) => {
         const color = colord(CHART_COLORS[index % CHART_COLORS.length]);
diff --git a/src/components/metrics/RealtimeChart.tsx b/src/components/metrics/RealtimeChart.tsx
index b2819f9c88..b24eedb50c 100644
--- a/src/components/metrics/RealtimeChart.tsx
+++ b/src/components/metrics/RealtimeChart.tsx
@@ -1,6 +1,7 @@
 import { useMemo, useRef } from 'react';
 import { startOfMinute, subMinutes, isBefore } from 'date-fns';
 import PageviewsChart from './PageviewsChart';
+import { getDateArray } from 'lib/date';
 import { DEFAULT_ANIMATION_DURATION, REALTIME_RANGE } from 'lib/constants';
 import { RealtimeData } from 'lib/types';
 
@@ -21,8 +22,8 @@ export function RealtimeChart({ data, unit, ...props }: RealtimeChartProps) {
     }
 
     return {
-      pageviews: data.series.views,
-      sessions: data.series.visitors,
+      pageviews: getDateArray(data.series.views, startDate, endDate, unit),
+      sessions: getDateArray(data.series.visitors, startDate, endDate, unit),
     };
   }, [data, startDate, endDate, unit]);
 
@@ -36,14 +37,7 @@ export function RealtimeChart({ data, unit, ...props }: RealtimeChartProps) {
   }, [endDate]);
 
   return (
-    <PageviewsChart
-      {...props}
-      minDate={startDate.toISOString()}
-      maxDate={endDate.toISOString()}
-      unit={unit}
-      data={chartData}
-      animationDuration={animationDuration}
-    />
+    <PageviewsChart {...props} unit={unit} data={chartData} animationDuration={animationDuration} />
   );
 }
 
diff --git a/src/lib/date.ts b/src/lib/date.ts
index b731140cf2..b8bfa6c765 100644
--- a/src/lib/date.ts
+++ b/src/lib/date.ts
@@ -273,6 +273,19 @@ export function getMinimumUnit(startDate: number | Date, endDate: number | Date)
   return 'year';
 }
 
+export function getDateFromString(str: string) {
+  const [ymd, hms] = str.split(' ');
+  const [year, month, day] = ymd.split('-');
+
+  if (hms) {
+    const [hour, min, sec] = hms.split(':');
+
+    return new Date(+year, +month - 1, +day, +hour, +min, +sec);
+  }
+
+  return new Date(+year, +month - 1, +day);
+}
+
 export function getDateArray(data: any[], startDate: Date, endDate: Date, unit: string) {
   const arr = [];
   const { diff, add, start } = DATE_FUNCTIONS[unit];
diff --git a/src/lib/prisma.ts b/src/lib/prisma.ts
index 110b4750e2..c450f1f023 100644
--- a/src/lib/prisma.ts
+++ b/src/lib/prisma.ts
@@ -12,11 +12,19 @@ import { filtersToArray } from './params';
 const log = debug('umami:prisma');
 
 const MYSQL_DATE_FORMATS = {
-  minute: '%Y-%m-%dT%H:%i:00Z',
-  hour: '%Y-%m-%dT%H:00:00Z',
-  day: '%Y-%m-%dT00:00:00Z',
-  month: '%Y-%m-01T00:00:00Z',
-  year: '%Y-01-01T00:00:00Z',
+  minute: '%Y-%m-%d %H:%i:00',
+  hour: '%Y-%m-%d %H:00:00',
+  day: '%Y-%m-%d',
+  month: '%Y-%m-01',
+  year: '%Y-01-01',
+};
+
+const POSTGRESQL_DATE_FORMATS = {
+  minute: 'YYYY-MM-DD HH24:MI:00',
+  hour: 'YYYY-MM-DD HH24:00:00',
+  day: 'YYYY-MM-DD',
+  month: 'YYYY-MM-01',
+  year: 'YYYY-01-01',
 };
 
 function getAddIntervalQuery(field: string, interval: string): string {
@@ -60,9 +68,9 @@ function getDateSQL(field: string, unit: string, timezone?: string): string {
 
   if (db === POSTGRESQL) {
     if (timezone) {
-      return `date_trunc('${unit}', ${field} at time zone '${timezone}')`;
+      return `to_char(date_trunc('${unit}', ${field} at time zone '${timezone}'), '${POSTGRESQL_DATE_FORMATS[unit]}')`;
     }
-    return `date_trunc('${unit}', ${field})`;
+    return `to_char(date_trunc('${unit}', ${field}), '${POSTGRESQL_DATE_FORMATS[unit]}')`;
   }
 
   if (db === MYSQL) {
diff --git a/src/queries/analytics/sessions/getSessionStats.ts b/src/queries/analytics/sessions/getSessionStats.ts
index cd04976155..ee16e42560 100644
--- a/src/queries/analytics/sessions/getSessionStats.ts
+++ b/src/queries/analytics/sessions/getSessionStats.ts
@@ -22,21 +22,14 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
   return rawQuery(
     `
     select
-      ${getDateSQL('g.created_at', unit, timezone)} as x,
-      count(distinct g.session_id) as y
-    from (
-      select
-        website_event.session_id,
-        min(website_event.created_at) as created_at,
-        count(*) y
-      from website_event
+      ${getDateSQL('website_event.created_at', unit, timezone)} x,
+      count(distinct website_event.session_id) y
+    from website_event
       ${joinSession}
-      where website_event.website_id = {{websiteId::uuid}}
+    where website_event.website_id = {{websiteId::uuid}}
       and website_event.created_at between {{startDate}} and {{endDate}}
-      and event_type = {{eventType}} 
+      and event_type = {{eventType}}
       ${filterQuery}
-      group by website_event.session_id, website_event.created_at
-    ) as g
     group by 1
     `,
     params,

From 8f934d2552eb8daedda321875333bfad39dc106c Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 22 Aug 2024 13:15:48 -0700
Subject: [PATCH 311/438] Reapply "Fixed realtime chart for relational. Removed
 getDateArray. Added chart min/max dates."

This reverts commit 5e5b61dc7ee3026fabd988b578ffa9e35799845f.
---
 .../websites/[websiteId]/WebsiteChart.tsx     | 15 +++++++++----
 src/components/charts/BarChart.tsx            |  6 +++++
 src/components/metrics/EventsChart.tsx        |  5 -----
 src/components/metrics/RealtimeChart.tsx      | 14 ++++++++----
 src/lib/date.ts                               | 13 -----------
 src/lib/prisma.ts                             | 22 ++++++-------------
 .../analytics/sessions/getSessionStats.ts     | 17 +++++++++-----
 7 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx b/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
index 48da23776c..fa5ab69423 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
@@ -1,6 +1,5 @@
 import { useMemo } from 'react';
 import PageviewsChart from 'components/metrics/PageviewsChart';
-import { getDateArray } from 'lib/date';
 import useWebsitePageviews from 'components/hooks/queries/useWebsitePageviews';
 import { useDateRange } from 'components/hooks';
 
@@ -19,8 +18,8 @@ export function WebsiteChart({
   const chartData = useMemo(() => {
     if (data) {
       const result = {
-        pageviews: getDateArray(pageviews, startDate, endDate, unit),
-        sessions: getDateArray(sessions, startDate, endDate, unit),
+        pageviews,
+        sessions,
       };
 
       if (compare) {
@@ -43,7 +42,15 @@ export function WebsiteChart({
     return { pageviews: [], sessions: [] };
   }, [data, startDate, endDate, unit]);
 
-  return <PageviewsChart data={chartData} unit={unit} isLoading={isLoading} />;
+  return (
+    <PageviewsChart
+      data={chartData}
+      minDate={startDate.toISOString()}
+      maxDate={endDate.toISOString()}
+      unit={unit}
+      isLoading={isLoading}
+    />
+  );
 }
 
 export default WebsiteChart;
diff --git a/src/components/charts/BarChart.tsx b/src/components/charts/BarChart.tsx
index cfcbe74350..b96812210e 100644
--- a/src/components/charts/BarChart.tsx
+++ b/src/components/charts/BarChart.tsx
@@ -12,6 +12,8 @@ export interface BarChartProps extends ChartProps {
   renderYLabel?: (label: string, index: number, values: any[]) => string;
   XAxisType?: string;
   YAxisType?: string;
+  minDate?: number | string;
+  maxDate?: number | string;
 }
 
 export function BarChart(props: BarChartProps) {
@@ -24,6 +26,8 @@ export function BarChart(props: BarChartProps) {
     XAxisType = 'time',
     YAxisType = 'linear',
     stacked = false,
+    minDate,
+    maxDate,
   } = props;
 
   const options: any = useMemo(() => {
@@ -32,6 +36,8 @@ export function BarChart(props: BarChartProps) {
         x: {
           type: XAxisType,
           stacked: true,
+          min: minDate,
+          max: maxDate,
           time: {
             unit,
           },
diff --git a/src/components/metrics/EventsChart.tsx b/src/components/metrics/EventsChart.tsx
index 0bb65eb298..ee7f866cb3 100644
--- a/src/components/metrics/EventsChart.tsx
+++ b/src/components/metrics/EventsChart.tsx
@@ -1,7 +1,6 @@
 import { useMemo } from 'react';
 import { colord } from 'colord';
 import BarChart from 'components/charts/BarChart';
-import { getDateArray } from 'lib/date';
 import { useLocale, useDateRange, useWebsiteEventsSeries } from 'components/hooks';
 import { CHART_COLORS } from 'lib/constants';
 import { renderDateLabels } from 'lib/charts';
@@ -31,10 +30,6 @@ export function EventsChart({ websiteId, className }: EventsChartProps) {
       return obj;
     }, {});
 
-    Object.keys(map).forEach(key => {
-      map[key] = getDateArray(map[key], startDate, endDate, unit);
-    });
-
     return {
       datasets: Object.keys(map).map((key, index) => {
         const color = colord(CHART_COLORS[index % CHART_COLORS.length]);
diff --git a/src/components/metrics/RealtimeChart.tsx b/src/components/metrics/RealtimeChart.tsx
index b24eedb50c..b2819f9c88 100644
--- a/src/components/metrics/RealtimeChart.tsx
+++ b/src/components/metrics/RealtimeChart.tsx
@@ -1,7 +1,6 @@
 import { useMemo, useRef } from 'react';
 import { startOfMinute, subMinutes, isBefore } from 'date-fns';
 import PageviewsChart from './PageviewsChart';
-import { getDateArray } from 'lib/date';
 import { DEFAULT_ANIMATION_DURATION, REALTIME_RANGE } from 'lib/constants';
 import { RealtimeData } from 'lib/types';
 
@@ -22,8 +21,8 @@ export function RealtimeChart({ data, unit, ...props }: RealtimeChartProps) {
     }
 
     return {
-      pageviews: getDateArray(data.series.views, startDate, endDate, unit),
-      sessions: getDateArray(data.series.visitors, startDate, endDate, unit),
+      pageviews: data.series.views,
+      sessions: data.series.visitors,
     };
   }, [data, startDate, endDate, unit]);
 
@@ -37,7 +36,14 @@ export function RealtimeChart({ data, unit, ...props }: RealtimeChartProps) {
   }, [endDate]);
 
   return (
-    <PageviewsChart {...props} unit={unit} data={chartData} animationDuration={animationDuration} />
+    <PageviewsChart
+      {...props}
+      minDate={startDate.toISOString()}
+      maxDate={endDate.toISOString()}
+      unit={unit}
+      data={chartData}
+      animationDuration={animationDuration}
+    />
   );
 }
 
diff --git a/src/lib/date.ts b/src/lib/date.ts
index b8bfa6c765..b731140cf2 100644
--- a/src/lib/date.ts
+++ b/src/lib/date.ts
@@ -273,19 +273,6 @@ export function getMinimumUnit(startDate: number | Date, endDate: number | Date)
   return 'year';
 }
 
-export function getDateFromString(str: string) {
-  const [ymd, hms] = str.split(' ');
-  const [year, month, day] = ymd.split('-');
-
-  if (hms) {
-    const [hour, min, sec] = hms.split(':');
-
-    return new Date(+year, +month - 1, +day, +hour, +min, +sec);
-  }
-
-  return new Date(+year, +month - 1, +day);
-}
-
 export function getDateArray(data: any[], startDate: Date, endDate: Date, unit: string) {
   const arr = [];
   const { diff, add, start } = DATE_FUNCTIONS[unit];
diff --git a/src/lib/prisma.ts b/src/lib/prisma.ts
index c450f1f023..110b4750e2 100644
--- a/src/lib/prisma.ts
+++ b/src/lib/prisma.ts
@@ -12,19 +12,11 @@ import { filtersToArray } from './params';
 const log = debug('umami:prisma');
 
 const MYSQL_DATE_FORMATS = {
-  minute: '%Y-%m-%d %H:%i:00',
-  hour: '%Y-%m-%d %H:00:00',
-  day: '%Y-%m-%d',
-  month: '%Y-%m-01',
-  year: '%Y-01-01',
-};
-
-const POSTGRESQL_DATE_FORMATS = {
-  minute: 'YYYY-MM-DD HH24:MI:00',
-  hour: 'YYYY-MM-DD HH24:00:00',
-  day: 'YYYY-MM-DD',
-  month: 'YYYY-MM-01',
-  year: 'YYYY-01-01',
+  minute: '%Y-%m-%dT%H:%i:00Z',
+  hour: '%Y-%m-%dT%H:00:00Z',
+  day: '%Y-%m-%dT00:00:00Z',
+  month: '%Y-%m-01T00:00:00Z',
+  year: '%Y-01-01T00:00:00Z',
 };
 
 function getAddIntervalQuery(field: string, interval: string): string {
@@ -68,9 +60,9 @@ function getDateSQL(field: string, unit: string, timezone?: string): string {
 
   if (db === POSTGRESQL) {
     if (timezone) {
-      return `to_char(date_trunc('${unit}', ${field} at time zone '${timezone}'), '${POSTGRESQL_DATE_FORMATS[unit]}')`;
+      return `date_trunc('${unit}', ${field} at time zone '${timezone}')`;
     }
-    return `to_char(date_trunc('${unit}', ${field}), '${POSTGRESQL_DATE_FORMATS[unit]}')`;
+    return `date_trunc('${unit}', ${field})`;
   }
 
   if (db === MYSQL) {
diff --git a/src/queries/analytics/sessions/getSessionStats.ts b/src/queries/analytics/sessions/getSessionStats.ts
index ee16e42560..cd04976155 100644
--- a/src/queries/analytics/sessions/getSessionStats.ts
+++ b/src/queries/analytics/sessions/getSessionStats.ts
@@ -22,14 +22,21 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
   return rawQuery(
     `
     select
-      ${getDateSQL('website_event.created_at', unit, timezone)} x,
-      count(distinct website_event.session_id) y
-    from website_event
+      ${getDateSQL('g.created_at', unit, timezone)} as x,
+      count(distinct g.session_id) as y
+    from (
+      select
+        website_event.session_id,
+        min(website_event.created_at) as created_at,
+        count(*) y
+      from website_event
       ${joinSession}
-    where website_event.website_id = {{websiteId::uuid}}
+      where website_event.website_id = {{websiteId::uuid}}
       and website_event.created_at between {{startDate}} and {{endDate}}
-      and event_type = {{eventType}}
+      and event_type = {{eventType}} 
       ${filterQuery}
+      group by website_event.session_id, website_event.created_at
+    ) as g
     group by 1
     `,
     params,

From 60f1b7b7558a30b54e7bcdec1f0d9ced3f55d919 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 22 Aug 2024 13:42:22 -0700
Subject: [PATCH 312/438] Revert session stats change.

---
 .../analytics/sessions/getSessionStats.ts       | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/queries/analytics/sessions/getSessionStats.ts b/src/queries/analytics/sessions/getSessionStats.ts
index cd04976155..ee16e42560 100644
--- a/src/queries/analytics/sessions/getSessionStats.ts
+++ b/src/queries/analytics/sessions/getSessionStats.ts
@@ -22,21 +22,14 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
   return rawQuery(
     `
     select
-      ${getDateSQL('g.created_at', unit, timezone)} as x,
-      count(distinct g.session_id) as y
-    from (
-      select
-        website_event.session_id,
-        min(website_event.created_at) as created_at,
-        count(*) y
-      from website_event
+      ${getDateSQL('website_event.created_at', unit, timezone)} x,
+      count(distinct website_event.session_id) y
+    from website_event
       ${joinSession}
-      where website_event.website_id = {{websiteId::uuid}}
+    where website_event.website_id = {{websiteId::uuid}}
       and website_event.created_at between {{startDate}} and {{endDate}}
-      and event_type = {{eventType}} 
+      and event_type = {{eventType}}
       ${filterQuery}
-      group by website_event.session_id, website_event.created_at
-    ) as g
     group by 1
     `,
     params,

From 0ef936eec60dd2bbf10a23a64ed055f578895521 Mon Sep 17 00:00:00 2001
From: Minoru Maekawa <126235344+err931@users.noreply.github.com>
Date: Fri, 23 Aug 2024 17:56:37 +0900
Subject: [PATCH 313/438] Update ja-JP.json

---
 src/lang/ja-JP.json | 84 ++++++++++++++++++++++-----------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/lang/ja-JP.json b/src/lang/ja-JP.json
index 72e2998b5c..bc59f1140b 100644
--- a/src/lang/ja-JP.json
+++ b/src/lang/ja-JP.json
@@ -5,7 +5,7 @@
   "label.add": "追加",
   "label.add-description": "説明を追加",
   "label.add-member": "メンバーの追加",
-  "label.add-step": "Add step",
+  "label.add-step": "ステップを追加",
   "label.add-website": "Webサイトの追加",
   "label.admin": "管理者",
   "label.after": "直後",
@@ -24,12 +24,12 @@
   "label.cities": "都市",
   "label.city": "都市",
   "label.clear-all": "すべてクリア",
-  "label.compare": "Compare",
+  "label.compare": "比較",
   "label.confirm": "確認",
   "label.confirm-password": "パスワード(確認)",
   "label.contains": "コンテンツ",
   "label.continue": "続ける",
-  "label.count": "Count",
+  "label.count": "回数",
   "label.countries": "国名",
   "label.country": "国",
   "label.create": "作成",
@@ -37,8 +37,8 @@
   "label.create-team": "チームの作成",
   "label.create-user": "ユーザーの作成",
   "label.created": "作成されました",
-  "label.created-by": "Created By",
-  "label.current": "Current",
+  "label.created-by": "作成者",
+  "label.current": "現在",
   "label.current-password": "現在のパスワード",
   "label.custom-range": "範囲指定",
   "label.dashboard": "ダッシュボード",
@@ -65,12 +65,12 @@
   "label.edit-dashboard": "ダッシュボードの編集",
   "label.edit-member": "メンバーの編集",
   "label.enable-share-url": "共有URLを有効にする",
-  "label.end-step": "End Step",
-  "label.entry": "Entry URL",
+  "label.end-step": "最終ステップ",
+  "label.entry": "訪問時のURL",
   "label.event": "イベント",
   "label.event-data": "イベントデータ",
   "label.events": "イベント",
-  "label.exit": "Exit URL",
+  "label.exit": "退出時のURL",
   "label.false": "偽",
   "label.field": "フィールド",
   "label.fields": "フィールド",
@@ -78,16 +78,16 @@
   "label.filter-combined": "結合",
   "label.filter-raw": "RAW",
   "label.filters": "フィルター",
-  "label.first-seen": "First seen",
+  "label.first-seen": "初回ログイン",
   "label.funnel": "ファネル",
   "label.funnel-description": "ユーザーのコンバージョン率と離脱率を分析します。",
-  "label.goal": "Goal",
-  "label.goals": "Goals",
-  "label.goals-description": "Track your goals for pageviews and events.",
+  "label.goal": "目標",
+  "label.goals": "目標",
+  "label.goals-description": "ページビューとイベントの目標を追跡します。",
   "label.greater-than": "超過",
   "label.greater-than-equals": "以上",
-  "label.host": "Host",
-  "label.hosts": "Hosts",
+  "label.host": "ホスト",
+  "label.hosts": "ホスト",
   "label.insights": "インサイト",
   "label.insights-description": "セグメントとフィルタを使用して、データをさらに詳しく分析します。",
   "label.is": "に等しい",
@@ -96,15 +96,15 @@
   "label.is-set": "設定済み",
   "label.join": "参加",
   "label.join-team": "チームに参加",
-  "label.journey": "Journey",
-  "label.journey-description": "Understand how users navigate through your website.",
+  "label.journey": "ジャーニー",
+  "label.journey-description": "ユーザーがWebサイト内をどのように移動するかを把握します。",
   "label.language": "言語",
   "label.languages": "言語",
   "label.laptop": "ノートPC",
   "label.last-days": "過去{x}日間",
   "label.last-hours": "過去{x}時間",
-  "label.last-months": "Last {x} months",
-  "label.last-seen": "Last seen",
+  "label.last-months": "過去{x}月間",
+  "label.last-seen": "最終ログイン",
   "label.leave": "離脱",
   "label.leave-team": "チームを離脱",
   "label.less-than": "未満",
@@ -112,7 +112,7 @@
   "label.login": "ログイン",
   "label.logout": "ログアウト",
   "label.manage": "管理",
-  "label.manager": "Manager",
+  "label.manager": "管理者",
   "label.max": "最大",
   "label.member": "メンバー",
   "label.members": "メンバー",
@@ -134,15 +134,15 @@
   "label.pageTitle": "ページタイトル",
   "label.pages": "ページ",
   "label.password": "パスワード",
-  "label.path": "Path",
-  "label.paths": "Paths",
+  "label.path": "パス",
+  "label.paths": "パス",
   "label.powered-by": "Powered by {name}",
-  "label.previous": "Previous",
-  "label.previous-period": "Previous period",
-  "label.previous-year": "Previous year",
+  "label.previous": "以前",
+  "label.previous-period": "前期",
+  "label.previous-year": "前年",
   "label.profile": "プロフィール",
-  "label.properties": "Properties",
-  "label.property": "Property",
+  "label.properties": "プロパティ",
+  "label.property": "プロパティ",
   "label.queries": "クエリ",
   "label.query": "クエリ",
   "label.query-parameters": "クエリパラメーター",
@@ -161,9 +161,9 @@
   "label.reset-website": "Webサイトをリセットする",
   "label.retention": "リテンション",
   "label.retention-description": "ユーザーの再訪問回数を記録して、Webサイトのリテンション率を計測します。",
-  "label.revenue": "Revenue",
-  "label.revenue-description": "Look into your revenue across time.",
-  "label.revenue-property": "Revenue Property",
+  "label.revenue": "レベニュー",
+  "label.revenue-description": "時間あたりの売上高を確認します。",
+  "label.revenue-property": "レベニュープロパティ",
   "label.role": "ロール",
   "label.run-query": "クエリ実行",
   "label.save": "保存",
@@ -173,21 +173,21 @@
   "label.select-date": "日付を選択",
   "label.select-role": "ロールを選択",
   "label.select-website": "Webサイトを選択",
-  "label.session": "Session",
+  "label.session": "セッション",
   "label.sessions": "セッション",
   "label.settings": "設定",
   "label.share-url": "共有URL",
   "label.single-day": "一日",
-  "label.start-step": "Start Step",
-  "label.steps": "Steps",
+  "label.start-step": "最初のステップ",
+  "label.steps": "ステップ",
   "label.sum": "合計",
   "label.tablet": "タブレット",
   "label.team": "チーム",
   "label.team-id": "チームID",
-  "label.team-manager": "Team manager",
+  "label.team-manager": "チーム管理者",
   "label.team-member": "チームメンバー",
   "label.team-name": "チーム名",
-  "label.team-owner": "チーム所有者",
+  "label.team-owner": "チームオーナー",
   "label.team-view-only": "チーム表示のみ",
   "label.team-websites": "チームのWebサイト",
   "label.teams": "チーム",
@@ -202,34 +202,34 @@
   "label.total": "累計",
   "label.total-records": "総記録数",
   "label.tracking-code": "トラッキングコード",
-  "label.transactions": "Transactions",
+  "label.transactions": "トランザクション",
   "label.transfer": "移管",
   "label.transfer-website": "Webサイトの移管",
   "label.true": "真",
   "label.type": "種別",
   "label.unique": "ユニーク",
   "label.unique-visitors": "ユニーク訪問者数",
-  "label.uniqueCustomers": "Unique Customers",
+  "label.uniqueCustomers": "ユニーク顧客数",
   "label.unknown": "不明",
   "label.untitled": "無題",
-  "label.update": "Update",
+  "label.update": "更新",
   "label.url": "URL",
   "label.urls": "URL",
   "label.user": "ユーザー",
-  "label.user-property": "User Property",
+  "label.user-property": "ユーザープロパティ",
   "label.username": "ユーザー名",
   "label.users": "ユーザー",
   "label.utm": "UTM",
-  "label.utm-description": "Track your campaigns through UTM parameters.",
+  "label.utm-description": "UTMパラメーターを使用してキャンペーンを追跡します。",
   "label.value": "値",
   "label.view": "表示",
   "label.view-details": "詳細を表示",
   "label.view-only": "表示のみ",
   "label.views": "表示",
-  "label.views-per-visit": "Views per visit",
+  "label.views-per-visit": "訪問あたりの閲覧数",
   "label.visit-duration": "平均滞在時間",
   "label.visitors": "訪問者",
-  "label.visits": "Visits",
+  "label.visits": "訪問者数",
   "label.website": "Webサイト",
   "label.website-id": "WebサイトID",
   "label.websites": "Webサイト",
@@ -237,7 +237,7 @@
   "label.yesterday": "昨日",
   "message.action-confirmation": "承認する場合は、下のフォームに「{confirmation}」と入力してください。",
   "message.active-users": "{x} {x, plural, one {アクティブな訪問者} other {アクティブな訪問者}}",
-  "message.collected-data": "Collected data",
+  "message.collected-data": "収集されたデータ",
   "message.confirm-delete": "{target}を削除してもよろしいですか？",
   "message.confirm-leave": "{target}から離脱してもよろしいですか？",
   "message.confirm-remove": "{target}を削除してもよろしいですか？",

From 8500669ed0b4850a61a0f1afbddac44396042b81 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 23 Aug 2024 09:33:58 -0700
Subject: [PATCH 314/438] Updated lang.

---
 public/intl/messages/ja-JP.json | 86 ++++++++++++++++-----------------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/public/intl/messages/ja-JP.json b/public/intl/messages/ja-JP.json
index f38a82d459..5a13b4b1bb 100644
--- a/public/intl/messages/ja-JP.json
+++ b/public/intl/messages/ja-JP.json
@@ -38,7 +38,7 @@
   "label.add-step": [
     {
       "type": 0,
-      "value": "Add step"
+      "value": "ステップを追加"
     }
   ],
   "label.add-website": [
@@ -152,7 +152,7 @@
   "label.compare": [
     {
       "type": 0,
-      "value": "Compare"
+      "value": "比較"
     }
   ],
   "label.confirm": [
@@ -182,7 +182,7 @@
   "label.count": [
     {
       "type": 0,
-      "value": "Count"
+      "value": "回数"
     }
   ],
   "label.countries": [
@@ -230,13 +230,13 @@
   "label.created-by": [
     {
       "type": 0,
-      "value": "Created By"
+      "value": "作成者"
     }
   ],
   "label.current": [
     {
       "type": 0,
-      "value": "Current"
+      "value": "現在"
     }
   ],
   "label.current-password": [
@@ -398,13 +398,13 @@
   "label.end-step": [
     {
       "type": 0,
-      "value": "End Step"
+      "value": "最終ステップ"
     }
   ],
   "label.entry": [
     {
       "type": 0,
-      "value": "Entry URL"
+      "value": "訪問時のURL"
     }
   ],
   "label.event": [
@@ -428,7 +428,7 @@
   "label.exit": [
     {
       "type": 0,
-      "value": "Exit URL"
+      "value": "退出時のURL"
     }
   ],
   "label.false": [
@@ -476,7 +476,7 @@
   "label.first-seen": [
     {
       "type": 0,
-      "value": "First seen"
+      "value": "初回ログイン"
     }
   ],
   "label.funnel": [
@@ -494,19 +494,19 @@
   "label.goal": [
     {
       "type": 0,
-      "value": "Goal"
+      "value": "目標"
     }
   ],
   "label.goals": [
     {
       "type": 0,
-      "value": "Goals"
+      "value": "目標"
     }
   ],
   "label.goals-description": [
     {
       "type": 0,
-      "value": "Track your goals for pageviews and events."
+      "value": "ページビューとイベントの目標を追跡します。"
     }
   ],
   "label.greater-than": [
@@ -524,13 +524,13 @@
   "label.host": [
     {
       "type": 0,
-      "value": "Host"
+      "value": "ホスト"
     }
   ],
   "label.hosts": [
     {
       "type": 0,
-      "value": "Hosts"
+      "value": "ホスト"
     }
   ],
   "label.insights": [
@@ -584,13 +584,13 @@
   "label.journey": [
     {
       "type": 0,
-      "value": "Journey"
+      "value": "ジャーニー"
     }
   ],
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users navigate through your website."
+      "value": "ユーザーがWebサイト内をどのように移動するかを把握します。"
     }
   ],
   "label.language": [
@@ -642,7 +642,7 @@
   "label.last-months": [
     {
       "type": 0,
-      "value": "Last "
+      "value": "過去"
     },
     {
       "type": 1,
@@ -650,13 +650,13 @@
     },
     {
       "type": 0,
-      "value": " months"
+      "value": "月間"
     }
   ],
   "label.last-seen": [
     {
       "type": 0,
-      "value": "Last seen"
+      "value": "最終ログイン"
     }
   ],
   "label.leave": [
@@ -704,7 +704,7 @@
   "label.manager": [
     {
       "type": 0,
-      "value": "Manager"
+      "value": "管理者"
     }
   ],
   "label.max": [
@@ -876,13 +876,13 @@
   "label.path": [
     {
       "type": 0,
-      "value": "Path"
+      "value": "パス"
     }
   ],
   "label.paths": [
     {
       "type": 0,
-      "value": "Paths"
+      "value": "パス"
     }
   ],
   "label.powered-by": [
@@ -898,19 +898,19 @@
   "label.previous": [
     {
       "type": 0,
-      "value": "Previous"
+      "value": "以前"
     }
   ],
   "label.previous-period": [
     {
       "type": 0,
-      "value": "Previous period"
+      "value": "前期"
     }
   ],
   "label.previous-year": [
     {
       "type": 0,
-      "value": "Previous year"
+      "value": "前年"
     }
   ],
   "label.profile": [
@@ -922,13 +922,13 @@
   "label.properties": [
     {
       "type": 0,
-      "value": "Properties"
+      "value": "プロパティ"
     }
   ],
   "label.property": [
     {
       "type": 0,
-      "value": "Property"
+      "value": "プロパティ"
     }
   ],
   "label.queries": [
@@ -1042,19 +1042,19 @@
   "label.revenue": [
     {
       "type": 0,
-      "value": "Revenue"
+      "value": "レベニュー"
     }
   ],
   "label.revenue-description": [
     {
       "type": 0,
-      "value": "Look into your revenue across time."
+      "value": "時間あたりの売上高を確認します。"
     }
   ],
   "label.revenue-property": [
     {
       "type": 0,
-      "value": "Revenue Property"
+      "value": "レベニュープロパティ"
     }
   ],
   "label.role": [
@@ -1114,7 +1114,7 @@
   "label.session": [
     {
       "type": 0,
-      "value": "Session"
+      "value": "セッション"
     }
   ],
   "label.sessions": [
@@ -1144,13 +1144,13 @@
   "label.start-step": [
     {
       "type": 0,
-      "value": "Start Step"
+      "value": "最初のステップ"
     }
   ],
   "label.steps": [
     {
       "type": 0,
-      "value": "Steps"
+      "value": "ステップ"
     }
   ],
   "label.sum": [
@@ -1180,7 +1180,7 @@
   "label.team-manager": [
     {
       "type": 0,
-      "value": "Team manager"
+      "value": "チーム管理者"
     }
   ],
   "label.team-member": [
@@ -1198,7 +1198,7 @@
   "label.team-owner": [
     {
       "type": 0,
-      "value": "チーム所有者"
+      "value": "チームオーナー"
     }
   ],
   "label.team-view-only": [
@@ -1288,7 +1288,7 @@
   "label.transactions": [
     {
       "type": 0,
-      "value": "Transactions"
+      "value": "トランザクション"
     }
   ],
   "label.transfer": [
@@ -1330,7 +1330,7 @@
   "label.uniqueCustomers": [
     {
       "type": 0,
-      "value": "Unique Customers"
+      "value": "ユニーク顧客数"
     }
   ],
   "label.unknown": [
@@ -1348,7 +1348,7 @@
   "label.update": [
     {
       "type": 0,
-      "value": "Update"
+      "value": "更新"
     }
   ],
   "label.url": [
@@ -1372,7 +1372,7 @@
   "label.user-property": [
     {
       "type": 0,
-      "value": "User Property"
+      "value": "ユーザープロパティ"
     }
   ],
   "label.username": [
@@ -1396,7 +1396,7 @@
   "label.utm-description": [
     {
       "type": 0,
-      "value": "Track your campaigns through UTM parameters."
+      "value": "UTMパラメーターを使用してキャンペーンを追跡します。"
     }
   ],
   "label.value": [
@@ -1432,7 +1432,7 @@
   "label.views-per-visit": [
     {
       "type": 0,
-      "value": "Views per visit"
+      "value": "訪問あたりの閲覧数"
     }
   ],
   "label.visit-duration": [
@@ -1450,7 +1450,7 @@
   "label.visits": [
     {
       "type": 0,
-      "value": "Visits"
+      "value": "訪問者数"
     }
   ],
   "label.website": [
@@ -1534,7 +1534,7 @@
   "message.collected-data": [
     {
       "type": 0,
-      "value": "Collected data"
+      "value": "収集されたデータ"
     }
   ],
   "message.confirm-delete": [

From b9f8647262f3e39c65b8f7354b702319c2cb522b Mon Sep 17 00:00:00 2001
From: Gerard Nesta <gerardnll@users.noreply.github.com>
Date: Fri, 23 Aug 2024 22:35:56 +0200
Subject: [PATCH 315/438] Update ca-ES.json

---
 src/lang/ca-ES.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/lang/ca-ES.json b/src/lang/ca-ES.json
index 5083af70ea..dd249d4a92 100644
--- a/src/lang/ca-ES.json
+++ b/src/lang/ca-ES.json
@@ -78,7 +78,7 @@
   "label.filter-combined": "Combinat",
   "label.filter-raw": "En cru",
   "label.filters": "Filtres",
-  "label.first-seen": "First seen",
+  "label.first-seen": "Vist per primer cop",
   "label.funnel": "Embut",
   "label.funnel-description": "Entengui la taxa de conversió i abandonament dels usuaris.",
   "label.goal": "Meta",
@@ -104,7 +104,7 @@
   "label.last-days": "Últims {x} dies",
   "label.last-hours": "Últimes {x} hores",
   "label.last-months": "Últims {x} mesos",
-  "label.last-seen": "Last seen",
+  "label.last-seen": "Vist per últim cop",
   "label.leave": "Abandonar",
   "label.leave-team": "Abandonar equip",
   "label.less-than": "Menor que",
@@ -134,14 +134,14 @@
   "label.pageTitle": "Títol de la pàgina",
   "label.pages": "Pàgines",
   "label.password": "Contrasenya",
-  "label.path": "Path",
-  "label.paths": "Paths",
+  "label.path": "Camí",
+  "label.paths": "Camins",
   "label.powered-by": "Funciona amb {name}",
   "label.previous": "Anterior",
   "label.previous-period": "Període anterior",
   "label.previous-year": "Any anterior",
   "label.profile": "Perfil",
-  "label.properties": "Properties",
+  "label.properties": "Propietats",
   "label.property": "Propietat",
   "label.queries": "Consultes",
   "label.query": "Consulta",
@@ -161,9 +161,9 @@
   "label.reset-website": "Restableix estadístiques",
   "label.retention": "Retenció",
   "label.retention-description": "Mesuri la retenció del seu lloc web fent un seguiment de la freqüència amb què tornen els usuaris.",
-  "label.revenue": "Revenue",
-  "label.revenue-description": "Look into your revenue across time.",
-  "label.revenue-property": "Revenue Property",
+  "label.revenue": "Ingressos",
+  "label.revenue-description": "Observi els seus ingressos al llarg del temps.",
+  "label.revenue-property": "Propietat d'Ingressos",
   "label.role": "Rol",
   "label.run-query": "Executar consulta",
   "label.save": "Desa",
@@ -173,7 +173,7 @@
   "label.select-date": "Seleccionar data",
   "label.select-role": "Seleccionar rol",
   "label.select-website": "Seleccionar lloc web",
-  "label.session": "Session",
+  "label.session": "Sessió",
   "label.sessions": "Sessions",
   "label.settings": "Configuració",
   "label.share-url": "Enllaç per compartir",
@@ -184,7 +184,7 @@
   "label.tablet": "Tauleta",
   "label.team": "Equip",
   "label.team-id": "ID del equip",
-  "label.team-manager": "Team manager",
+  "label.team-manager": "Responsable d'Equip",
   "label.team-member": "Membre de l'equip",
   "label.team-name": "Nom de l'equip",
   "label.team-owner": "Propietari de l'equip",
@@ -202,21 +202,21 @@
   "label.total": "Total",
   "label.total-records": "Total de registres",
   "label.tracking-code": "Codi de seguiment",
-  "label.transactions": "Transactions",
+  "label.transactions": "Transaccions",
   "label.transfer": "Transferir",
   "label.transfer-website": "Transferir lloc web",
   "label.true": "Cert",
   "label.type": "Tipus",
   "label.unique": "Únic",
   "label.unique-visitors": "Visitants únics",
-  "label.uniqueCustomers": "Unique Customers",
+  "label.uniqueCustomers": "Clients Únics",
   "label.unknown": "Desconegut",
   "label.untitled": "Sense títol",
   "label.update": "Actualitzar",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Usuari",
-  "label.user-property": "User Property",
+  "label.user-property": "Propietat d'Usuari",
   "label.username": "Nom d'usuari",
   "label.users": "Usuaris",
   "label.utm": "UTM",

From 004ccdc22f6aeb52bc81b34e51b101f2d9ca4029 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Fri, 23 Aug 2024 16:43:38 -0700
Subject: [PATCH 316/438] fix order by and revert getDateSQL

---
 src/lib/prisma.ts                                  | 14 ++++++++++----
 .../analytics/pageviews/getPageviewStats.ts        |  1 +
 .../analytics/sessions/getSessionActivity.ts       |  1 +
 src/queries/analytics/sessions/getSessionStats.ts  |  1 +
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/lib/prisma.ts b/src/lib/prisma.ts
index 110b4750e2..844238b9a1 100644
--- a/src/lib/prisma.ts
+++ b/src/lib/prisma.ts
@@ -19,6 +19,14 @@ const MYSQL_DATE_FORMATS = {
   year: '%Y-01-01T00:00:00Z',
 };
 
+const POSTGRESQL_DATE_FORMATS = {
+  minute: 'YYYY-MM-DD HH24:MI:00',
+  hour: 'YYYY-MM-DD HH24:00:00',
+  day: 'YYYY-MM-DD',
+  month: 'YYYY-MM-01',
+  year: 'YYYY-01-01',
+};
+
 function getAddIntervalQuery(field: string, interval: string): string {
   const db = getDatabaseType();
 
@@ -60,18 +68,16 @@ function getDateSQL(field: string, unit: string, timezone?: string): string {
 
   if (db === POSTGRESQL) {
     if (timezone) {
-      return `date_trunc('${unit}', ${field} at time zone '${timezone}')`;
+      return `to_char(date_trunc('${unit}', ${field} at time zone '${timezone}'), '${POSTGRESQL_DATE_FORMATS[unit]}')`;
     }
-    return `date_trunc('${unit}', ${field})`;
+    return `to_char(date_trunc('${unit}', ${field}), '${POSTGRESQL_DATE_FORMATS[unit]}')`;
   }
 
   if (db === MYSQL) {
     if (timezone) {
       const tz = moment.tz(timezone).format('Z');
-
       return `date_format(convert_tz(${field},'+00:00','${tz}'), '${MYSQL_DATE_FORMATS[unit]}')`;
     }
-
     return `date_format(${field}, '${MYSQL_DATE_FORMATS[unit]}')`;
   }
 }
diff --git a/src/queries/analytics/pageviews/getPageviewStats.ts b/src/queries/analytics/pageviews/getPageviewStats.ts
index bf8a0e8f6a..96e9f1e131 100644
--- a/src/queries/analytics/pageviews/getPageviewStats.ts
+++ b/src/queries/analytics/pageviews/getPageviewStats.ts
@@ -31,6 +31,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
       and event_type = {{eventType}}
       ${filterQuery}
     group by 1
+    order by 1
     `,
     params,
   );
diff --git a/src/queries/analytics/sessions/getSessionActivity.ts b/src/queries/analytics/sessions/getSessionActivity.ts
index 3bda0d2917..1fe8bbd3f0 100644
--- a/src/queries/analytics/sessions/getSessionActivity.ts
+++ b/src/queries/analytics/sessions/getSessionActivity.ts
@@ -24,6 +24,7 @@ async function relationalQuery(
       createdAt: { gte: startDate, lte: endDate },
     },
     take: 500,
+    orderBy: { createdAt: 'desc' },
   });
 }
 
diff --git a/src/queries/analytics/sessions/getSessionStats.ts b/src/queries/analytics/sessions/getSessionStats.ts
index ee16e42560..8fde94f379 100644
--- a/src/queries/analytics/sessions/getSessionStats.ts
+++ b/src/queries/analytics/sessions/getSessionStats.ts
@@ -31,6 +31,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
       and event_type = {{eventType}}
       ${filterQuery}
     group by 1
+    order by 1
     `,
     params,
   );

From a15d0ca94a545420560c902969aac7eb8fa9b0f1 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Fri, 23 Aug 2024 19:23:04 -0700
Subject: [PATCH 317/438] fix UTC issues

---
 src/components/hooks/queries/useRealtime.ts     |  8 +++++---
 src/lib/prisma.ts                               | 17 +++++++++--------
 src/pages/api/realtime/[websiteId].ts           |  7 +++++--
 .../api/websites/[websiteId]/sessions/weekly.ts |  7 +++++--
 src/queries/analytics/getRealtimeData.ts        | 11 +++++++----
 .../sessions/getWebsiteSessionsWeekly.ts        |  6 ++++--
 6 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/src/components/hooks/queries/useRealtime.ts b/src/components/hooks/queries/useRealtime.ts
index 88bf06e4b1..9c665e4f06 100644
--- a/src/components/hooks/queries/useRealtime.ts
+++ b/src/components/hooks/queries/useRealtime.ts
@@ -1,13 +1,15 @@
+import { useTimezone } from 'components/hooks';
+import { REALTIME_INTERVAL } from 'lib/constants';
 import { RealtimeData } from 'lib/types';
 import { useApi } from './useApi';
-import { REALTIME_INTERVAL } from 'lib/constants';
 
 export function useRealtime(websiteId: string) {
   const { get, useQuery } = useApi();
+  const { timezone } = useTimezone();
   const { data, isLoading, error } = useQuery<RealtimeData>({
-    queryKey: ['realtime', websiteId],
+    queryKey: ['realtime', { websiteId, timezone }],
     queryFn: async () => {
-      return get(`/realtime/${websiteId}`);
+      return get(`/realtime/${websiteId}`, { timezone });
     },
     enabled: !!websiteId,
     refetchInterval: REALTIME_INTERVAL,
diff --git a/src/lib/prisma.ts b/src/lib/prisma.ts
index 844238b9a1..f0f071bc79 100644
--- a/src/lib/prisma.ts
+++ b/src/lib/prisma.ts
@@ -12,11 +12,11 @@ import { filtersToArray } from './params';
 const log = debug('umami:prisma');
 
 const MYSQL_DATE_FORMATS = {
-  minute: '%Y-%m-%dT%H:%i:00Z',
-  hour: '%Y-%m-%dT%H:00:00Z',
-  day: '%Y-%m-%dT00:00:00Z',
-  month: '%Y-%m-01T00:00:00Z',
-  year: '%Y-01-01T00:00:00Z',
+  minute: '%Y-%m-%dT%H:%i:00',
+  hour: '%Y-%m-%d %H:00:00',
+  day: '%Y-%m-%d',
+  month: '%Y-%m-01',
+  year: '%Y-01-01',
 };
 
 const POSTGRESQL_DATE_FORMATS = {
@@ -82,15 +82,16 @@ function getDateSQL(field: string, unit: string, timezone?: string): string {
   }
 }
 
-function getDateWeeklySQL(field: string) {
+function getDateWeeklySQL(field: string, timezone?: string) {
   const db = getDatabaseType();
 
   if (db === POSTGRESQL) {
-    return `concat(extract(dow from ${field}), ':', to_char(${field}, 'HH24'))`;
+    return `concat(extract(dow from (${field} at time zone '${timezone}')), ':', to_char((${field} at time zone '${timezone}'), 'HH24'))`;
   }
 
   if (db === MYSQL) {
-    return `date_format(${field}, '%w:%H')`;
+    const tz = moment.tz(timezone).format('Z');
+    return `date_format(convert_tz(${field},'+00:00','${tz}'), '%w:%H')`;
   }
 }
 
diff --git a/src/pages/api/realtime/[websiteId].ts b/src/pages/api/realtime/[websiteId].ts
index 66dcabc97e..08e9bc471e 100644
--- a/src/pages/api/realtime/[websiteId].ts
+++ b/src/pages/api/realtime/[websiteId].ts
@@ -7,14 +7,17 @@ import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { getRealtimeData } from 'queries';
 import * as yup from 'yup';
 import { REALTIME_RANGE } from 'lib/constants';
+import { TimezoneTest } from 'lib/yup';
 
 export interface RealtimeRequestQuery {
   websiteId: string;
+  timezone?: string;
 }
 
 const schema = {
   GET: yup.object().shape({
     websiteId: yup.string().uuid().required(),
+    timezone: TimezoneTest,
   }),
 };
 
@@ -23,7 +26,7 @@ export default async (req: NextApiRequestQueryBody<RealtimeRequestQuery>, res: N
   await useValidate(schema, req, res);
 
   if (req.method === 'GET') {
-    const { websiteId } = req.query;
+    const { websiteId, timezone } = req.query;
 
     if (!(await canViewWebsite(req.auth, websiteId))) {
       return unauthorized(res);
@@ -31,7 +34,7 @@ export default async (req: NextApiRequestQueryBody<RealtimeRequestQuery>, res: N
 
     const startDate = subMinutes(startOfMinute(new Date()), REALTIME_RANGE);
 
-    const data = await getRealtimeData(websiteId, { startDate });
+    const data = await getRealtimeData(websiteId, { startDate, timezone });
 
     return ok(res, data);
   }
diff --git a/src/pages/api/websites/[websiteId]/sessions/weekly.ts b/src/pages/api/websites/[websiteId]/sessions/weekly.ts
index f33970d0b7..b1c28c3f6f 100644
--- a/src/pages/api/websites/[websiteId]/sessions/weekly.ts
+++ b/src/pages/api/websites/[websiteId]/sessions/weekly.ts
@@ -6,9 +6,11 @@ import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { pageInfo } from 'lib/schema';
 import { getWebsiteSessionsWeekly } from 'queries';
+import { TimezoneTest } from 'lib/yup';
 
 export interface ReportsRequestQuery extends PageParams {
   websiteId: string;
+  timezone?: string;
 }
 
 const schema = {
@@ -16,6 +18,7 @@ const schema = {
     websiteId: yup.string().uuid().required(),
     startAt: yup.number().integer().required(),
     endAt: yup.number().integer().min(yup.ref('startAt')).required(),
+    timezone: TimezoneTest,
     ...pageInfo,
   }),
 };
@@ -28,7 +31,7 @@ export default async (
   await useAuth(req, res);
   await useValidate(schema, req, res);
 
-  const { websiteId, startAt, endAt } = req.query;
+  const { websiteId, startAt, endAt, timezone } = req.query;
 
   if (req.method === 'GET') {
     if (!(await canViewWebsite(req.auth, websiteId))) {
@@ -38,7 +41,7 @@ export default async (
     const startDate = new Date(+startAt);
     const endDate = new Date(+endAt);
 
-    const data = await getWebsiteSessionsWeekly(websiteId, { startDate, endDate });
+    const data = await getWebsiteSessionsWeekly(websiteId, { startDate, endDate, timezone });
 
     return ok(res, data);
   }
diff --git a/src/queries/analytics/getRealtimeData.ts b/src/queries/analytics/getRealtimeData.ts
index 63aa9aecb8..1af63219d6 100644
--- a/src/queries/analytics/getRealtimeData.ts
+++ b/src/queries/analytics/getRealtimeData.ts
@@ -1,4 +1,4 @@
-import { getRealtimeActivity, getPageviewStats, getSessionStats } from 'queries/index';
+import { getPageviewStats, getRealtimeActivity, getSessionStats } from 'queries/index';
 
 function increment(data: object, key: string) {
   if (key) {
@@ -10,9 +10,12 @@ function increment(data: object, key: string) {
   }
 }
 
-export async function getRealtimeData(websiteId: string, criteria: { startDate: Date }) {
-  const { startDate } = criteria;
-  const filters = { startDate, endDate: new Date(), unit: 'minute' };
+export async function getRealtimeData(
+  websiteId: string,
+  criteria: { startDate: Date; timezone: string },
+) {
+  const { startDate, timezone } = criteria;
+  const filters = { startDate, endDate: new Date(), unit: 'minute', timezone };
   const [activity, pageviews, sessions] = await Promise.all([
     getRealtimeActivity(websiteId, filters),
     getPageviewStats(websiteId, filters),
diff --git a/src/queries/analytics/sessions/getWebsiteSessionsWeekly.ts b/src/queries/analytics/sessions/getWebsiteSessionsWeekly.ts
index c92c2929be..153c9bb385 100644
--- a/src/queries/analytics/sessions/getWebsiteSessionsWeekly.ts
+++ b/src/queries/analytics/sessions/getWebsiteSessionsWeekly.ts
@@ -13,13 +13,14 @@ export async function getWebsiteSessionsWeekly(
 }
 
 async function relationalQuery(websiteId: string, filters: QueryFilters) {
+  const { timezone = 'utc' } = filters;
   const { rawQuery, getDateWeeklySQL, parseFilters } = prisma;
   const { params } = await parseFilters(websiteId, filters);
 
   return rawQuery(
     `
     select
-      ${getDateWeeklySQL('created_at')} as time,
+      ${getDateWeeklySQL('created_at', timezone)} as time,
       count(distinct session_id) as value
     from website_event
     where website_id = {{websiteId::uuid}}
@@ -32,13 +33,14 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
 }
 
 async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
+  const { timezone = 'utc' } = filters;
   const { rawQuery } = clickhouse;
   const { startDate, endDate } = filters;
 
   return rawQuery(
     `
     select
-      formatDateTime(created_at, '%w:%H') as time,
+      formatDateTime(toDateTime(created_at, '${timezone}'), '%w:%H') as time,
       count(distinct session_id) as value
     from website_event_stats_hourly
     where website_id = {websiteId:UUID}

From 2c4d7f18107f9d109b7c7b7b5eb19bc5c21ee694 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 23 Aug 2024 20:10:58 -0700
Subject: [PATCH 318/438] Updated lang.

---
 public/intl/messages/ca-ES.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/public/intl/messages/ca-ES.json b/public/intl/messages/ca-ES.json
index c112c5c700..ccc4988908 100644
--- a/public/intl/messages/ca-ES.json
+++ b/public/intl/messages/ca-ES.json
@@ -476,7 +476,7 @@
   "label.first-seen": [
     {
       "type": 0,
-      "value": "First seen"
+      "value": "Vist per primer cop"
     }
   ],
   "label.funnel": [
@@ -656,7 +656,7 @@
   "label.last-seen": [
     {
       "type": 0,
-      "value": "Last seen"
+      "value": "Vist per últim cop"
     }
   ],
   "label.leave": [
@@ -876,13 +876,13 @@
   "label.path": [
     {
       "type": 0,
-      "value": "Path"
+      "value": "Camí"
     }
   ],
   "label.paths": [
     {
       "type": 0,
-      "value": "Paths"
+      "value": "Camins"
     }
   ],
   "label.powered-by": [
@@ -922,7 +922,7 @@
   "label.properties": [
     {
       "type": 0,
-      "value": "Properties"
+      "value": "Propietats"
     }
   ],
   "label.property": [
@@ -1042,19 +1042,19 @@
   "label.revenue": [
     {
       "type": 0,
-      "value": "Revenue"
+      "value": "Ingressos"
     }
   ],
   "label.revenue-description": [
     {
       "type": 0,
-      "value": "Look into your revenue across time."
+      "value": "Observi els seus ingressos al llarg del temps."
     }
   ],
   "label.revenue-property": [
     {
       "type": 0,
-      "value": "Revenue Property"
+      "value": "Propietat d'Ingressos"
     }
   ],
   "label.role": [
@@ -1114,7 +1114,7 @@
   "label.session": [
     {
       "type": 0,
-      "value": "Session"
+      "value": "Sessió"
     }
   ],
   "label.sessions": [
@@ -1180,7 +1180,7 @@
   "label.team-manager": [
     {
       "type": 0,
-      "value": "Team manager"
+      "value": "Responsable d'Equip"
     }
   ],
   "label.team-member": [
@@ -1288,7 +1288,7 @@
   "label.transactions": [
     {
       "type": 0,
-      "value": "Transactions"
+      "value": "Transaccions"
     }
   ],
   "label.transfer": [
@@ -1330,7 +1330,7 @@
   "label.uniqueCustomers": [
     {
       "type": 0,
-      "value": "Unique Customers"
+      "value": "Clients Únics"
     }
   ],
   "label.unknown": [
@@ -1372,7 +1372,7 @@
   "label.user-property": [
     {
       "type": 0,
-      "value": "User Property"
+      "value": "Propietat d'Usuari"
     }
   ],
   "label.username": [

From bba584a09f738fc89fc84d3a36f9e8e0196caccb Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 23 Aug 2024 20:11:40 -0700
Subject: [PATCH 319/438] Bump version.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bd1ed4e692..c8ed652193 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "2.13.0",
+  "version": "2.13.1",
   "description": "A simple, fast, privacy-focused alternative to Google Analytics.",
   "author": "Umami Software, Inc. <hello@umami.is>",
   "license": "MIT",

From c480a971d313a20952a264f487c67f63f528a21f Mon Sep 17 00:00:00 2001
From: Konstantin Tutsch <mail@konstantintutsch.com>
Date: Sat, 24 Aug 2024 08:58:38 +0200
Subject: [PATCH 320/438] Update German translation

Improvements to previous translation

New translations for 8ee37d124656f16ac94835e7151d01c5e2566540
---
 src/lang/de-DE.json | 54 ++++++++++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/lang/de-DE.json b/src/lang/de-DE.json
index 5151910533..e9a726eb43 100644
--- a/src/lang/de-DE.json
+++ b/src/lang/de-DE.json
@@ -67,8 +67,8 @@
   "label.enable-share-url": "Freigabe-URL aktivieren",
   "label.end-step": "Schlussschritt",
   "label.entry": "Eintrags-URL",
-  "label.event": "Event",
-  "label.event-data": "Eventdaten",
+  "label.event": "Ereigniss",
+  "label.event-data": "Ereignissdaten",
   "label.events": "Ereignisse",
   "label.exit": "Ausgangs-URL",
   "label.false": "Falsch",
@@ -78,9 +78,9 @@
   "label.filter-combined": "Kombiniert",
   "label.filter-raw": "Rohdaten",
   "label.filters": "Filter",
-  "label.first-seen": "First seen",
-  "label.funnel": "Funnel",
-  "label.funnel-description": "Verstehe die Konversions- und Abbruchrate der Nutzer.",
+  "label.first-seen": "Erstmalig gesehen",
+  "label.funnel": "Trichter",
+  "label.funnel-description": "Verstehen Sie die Konversions- und Absprungrate Ihrer Nutzer.",
   "label.goal": "Ziel",
   "label.goals": "Ziele",
   "label.goals-description": "Verfolgen Sie Ihre Ziele für Seitenaufrufe und Ereignisse.",
@@ -89,7 +89,7 @@
   "label.host": "Host",
   "label.hosts": "Hosts",
   "label.insights": "Einblicke",
-  "label.insights-description": "Vertiefen Sie Ihre Daten mit Hilfe von Segmenten und Filtern.",
+  "label.insights-description": "Vertiefen Sie sich mit Hilfe von Segmenten und Filtern in Ihre Daten.",
   "label.is": "Ist",
   "label.is-not": "Ist nicht",
   "label.is-not-set": "Ist nicht gesetzt",
@@ -97,14 +97,14 @@
   "label.join": "Beitreten",
   "label.join-team": "Team beitreten",
   "label.journey": "Reise",
-  "label.journey-description": "Verstehe, wie Nutzer auf der Webseite navigieren",
+  "label.journey-description": "Verstehen Sie, wie Nutzer auf Ihrer Webseite navigieren.",
   "label.language": "Sprache",
   "label.languages": "Sprachen",
   "label.laptop": "Laptop",
   "label.last-days": "Letzten {x} Tage",
   "label.last-hours": "Letzten {x} Stunden",
   "label.last-months": "Letzten {x} Monate",
-  "label.last-seen": "Last seen",
+  "label.last-seen": "Zuletzt gesehen",
   "label.leave": "Verlassen",
   "label.leave-team": "Team verlassen",
   "label.less-than": "Kleiner als",
@@ -134,21 +134,21 @@
   "label.pageTitle": "Seitentitel",
   "label.pages": "Seiten",
   "label.password": "Passwort",
-  "label.path": "Path",
-  "label.paths": "Paths",
+  "label.path": "Pfad",
+  "label.paths": "Pfade",
   "label.powered-by": "Betrieben durch {name}",
-  "label.previous": "Vorheriges",
+  "label.previous": "Vorherig",
   "label.previous-period": "Vorherige Periode",
   "label.previous-year": "Vorheriges Jahr",
   "label.profile": "Profil",
-  "label.properties": "Properties",
+  "label.properties": "Eigenschaften",
   "label.property": "Eigentum",
   "label.queries": "Abfragen",
   "label.query": "Abfrage",
   "label.query-parameters": "Abfrageparameter",
   "label.realtime": "Echtzeit",
-  "label.referrer": "Referrer",
-  "label.referrers": "Referrer",
+  "label.referrer": "Übermittler",
+  "label.referrers": "Übermittler",
   "label.refresh": "Aktualisieren",
   "label.regenerate": "Erneuern",
   "label.region": "Region",
@@ -159,11 +159,11 @@
   "label.required": "Erforderlich",
   "label.reset": "Zurücksetzen",
   "label.reset-website": "Statistik zurücksetzen",
-  "label.retention": "Bewahrung",
+  "label.retention": "Erhalt",
   "label.retention-description": "Messen Sie die Verweildauer auf Ihrer Website, indem Sie verfolgen, wie oft die Nutzer zurückkehren.",
-  "label.revenue": "Revenue",
-  "label.revenue-description": "Look into your revenue across time.",
-  "label.revenue-property": "Revenue Property",
+  "label.revenue": "Umsatz",
+  "label.revenue-description": "Haben Sie einen Blick auf Ihre Umsätze im Laufe der Zeit.",
+  "label.revenue-property": "Umsatzeigenschaften",
   "label.role": "Rolle",
   "label.run-query": "Abfrage starten",
   "label.save": "Speichern",
@@ -173,7 +173,7 @@
   "label.select-date": "Datum auswählen",
   "label.select-role": "Rolle auswählen",
   "label.select-website": "Webseite auswählen",
-  "label.session": "Session",
+  "label.session": "Sitzung",
   "label.sessions": "Sitzungen",
   "label.settings": "Einstellungen",
   "label.share-url": "Freigabe-URL",
@@ -202,25 +202,25 @@
   "label.total": "Gesamt",
   "label.total-records": "Datensätze insgesamt",
   "label.tracking-code": "Tracking Code",
-  "label.transactions": "Transactions",
+  "label.transactions": "Transaktionen",
   "label.transfer": "Übertragung",
   "label.transfer-website": "Website übertragen",
   "label.true": "Wahr",
   "label.type": "Typ",
-  "label.unique": "Eindeutig",
-  "label.unique-visitors": "Eindeutige Besucher",
-  "label.uniqueCustomers": "Unique Customers",
+  "label.unique": "Einzigartig",
+  "label.unique-visitors": "Einzigartige Besucher",
+  "label.uniqueCustomers": "Einzigartige Kunden",
   "label.unknown": "Unbekannt",
   "label.untitled": "Unbenannt",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Benutzer",
-  "label.user-property": "User Property",
+  "label.user-property": "Benutzereigenschaften",
   "label.username": "Benutzername",
   "label.users": "Benutzer",
   "label.utm": "UTM",
-  "label.utm-description": "Tracke deine Kampagnen mit UTM parameterns.",
+  "label.utm-description": "Tracken Sie Ihre Kampagnen mit UTM Parametern.",
   "label.value": "Wert",
   "label.view": "Anzeigen",
   "label.view-details": "Details anzeigen",
@@ -271,9 +271,9 @@
   "message.transfer-team-website-to-user": "Diese Webseite zu deinem Account transferieren?",
   "message.transfer-user-website-to-team": "Wähle ein Team aus, zu dem die Webseite transferiert werden soll.",
   "message.transfer-website": "Übertrage die Eigentümerrechte zu deinem Account oder einem anderen Team.",
-  "message.triggered-event": "Ausgelöstes Event",
+  "message.triggered-event": "Ausgelöstes Ereigniss",
   "message.user-deleted": "Benutzer gelöscht.",
-  "message.viewed-page": "Besuchte Seite",
+  "message.viewed-page": "Seite besucht",
   "message.visitor-log": "Besucher aus {country} benutzt {browser} auf {os} {device}",
   "message.visitors-dropped-off": "Besucherverlust"
 }

From 633b26315ee39a4c390002110c7d7e64985f32a6 Mon Sep 17 00:00:00 2001
From: Konstantin Tutsch <mail@konstantintutsch.com>
Date: Sat, 24 Aug 2024 09:05:30 +0200
Subject: [PATCH 321/438] Fix use of Website and Webseite in German translation

See https://www.duden.de/sprachwissen/sprachratgeber/website-oder-webseite for further details.
---
 src/lang/de-DE.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/lang/de-DE.json b/src/lang/de-DE.json
index e9a726eb43..33d6578d6e 100644
--- a/src/lang/de-DE.json
+++ b/src/lang/de-DE.json
@@ -97,7 +97,7 @@
   "label.join": "Beitreten",
   "label.join-team": "Team beitreten",
   "label.journey": "Reise",
-  "label.journey-description": "Verstehen Sie, wie Nutzer auf Ihrer Webseite navigieren.",
+  "label.journey-description": "Verstehen Sie, wie Nutzer auf Ihrer Website navigieren.",
   "label.language": "Sprache",
   "label.languages": "Sprachen",
   "label.laptop": "Laptop",
@@ -120,7 +120,7 @@
   "label.mobile": "Handy",
   "label.more": "Mehr",
   "label.my-account": "Mein Account",
-  "label.my-websites": "Meine Webseiten",
+  "label.my-websites": "Meine Websites",
   "label.name": "Name",
   "label.new-password": "Neues Passwort",
   "label.none": "Keine",
@@ -172,7 +172,7 @@
   "label.select": "Auswählen",
   "label.select-date": "Datum auswählen",
   "label.select-role": "Rolle auswählen",
-  "label.select-website": "Webseite auswählen",
+  "label.select-website": "Website auswählen",
   "label.session": "Sitzung",
   "label.sessions": "Sitzungen",
   "label.settings": "Einstellungen",
@@ -230,9 +230,9 @@
   "label.visit-duration": "Durchschn. Besuchszeit",
   "label.visitors": "Besucher",
   "label.visits": "Besuche",
-  "label.website": "Webseite",
-  "label.website-id": "Webseiten-ID",
-  "label.websites": "Webseiten",
+  "label.website": "Website",
+  "label.website-id": "Website-ID",
+  "label.websites": "Websites",
   "label.window": "Fenster",
   "label.yesterday": "Gestern",
   "message.action-confirmation": "Schreibe {confirmation} in die Box zur bestätigung.",
@@ -242,7 +242,7 @@
   "message.confirm-leave": "Sind Sie sicher, dass die {target} verlassen möchten?",
   "message.confirm-remove": "Sind Sie sicher, {target} zu entfernen?",
   "message.confirm-reset": "Sind Sie sicher, dass Sie die Statistiken von {target} zurücksetzen wollen?",
-  "message.delete-team-warning": "Ein Team zu löschen, wird auch alle Team-Webseiten löschen.",
+  "message.delete-team-warning": "Ein Team zu löschen, wird auch alle Team-Websiten löschen.",
   "message.delete-website-warning": "Alle zugehörigen Daten werden ebenfalls gelöscht.",
   "message.error": "Es ist ein Fehler aufgetreten.",
   "message.event-log": "{event} auf {url}",
@@ -268,8 +268,8 @@
   "message.team-not-found": "Team nicht gefunden.",
   "message.team-websites-info": "Websites können von jedem im Team eingesehen werden.",
   "message.tracking-code": "Tracking Code",
-  "message.transfer-team-website-to-user": "Diese Webseite zu deinem Account transferieren?",
-  "message.transfer-user-website-to-team": "Wähle ein Team aus, zu dem die Webseite transferiert werden soll.",
+  "message.transfer-team-website-to-user": "Diese Website zu deinem Account transferieren?",
+  "message.transfer-user-website-to-team": "Wähle ein Team aus, zu dem die Website transferiert werden soll.",
   "message.transfer-website": "Übertrage die Eigentümerrechte zu deinem Account oder einem anderen Team.",
   "message.triggered-event": "Ausgelöstes Ereigniss",
   "message.user-deleted": "Benutzer gelöscht.",

From 50bdc234257a6196ac09184835117a80caf17709 Mon Sep 17 00:00:00 2001
From: Konstantin Tutsch <mail@konstantintutsch.com>
Date: Sat, 24 Aug 2024 09:12:53 +0200
Subject: [PATCH 322/438] Remove occasional informal address from German
 translation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Consistent use of “Siezen” (addressing the use formally/polite)
---
 src/lang/de-DE.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lang/de-DE.json b/src/lang/de-DE.json
index 33d6578d6e..9946bbec43 100644
--- a/src/lang/de-DE.json
+++ b/src/lang/de-DE.json
@@ -242,7 +242,7 @@
   "message.confirm-leave": "Sind Sie sicher, dass die {target} verlassen möchten?",
   "message.confirm-remove": "Sind Sie sicher, {target} zu entfernen?",
   "message.confirm-reset": "Sind Sie sicher, dass Sie die Statistiken von {target} zurücksetzen wollen?",
-  "message.delete-team-warning": "Ein Team zu löschen, wird auch alle Team-Websiten löschen.",
+  "message.delete-team-warning": "Ein Team zu löschen, wird auch alle Team-Websites löschen.",
   "message.delete-website-warning": "Alle zugehörigen Daten werden ebenfalls gelöscht.",
   "message.error": "Es ist ein Fehler aufgetreten.",
   "message.event-log": "{event} auf {url}",
@@ -268,9 +268,9 @@
   "message.team-not-found": "Team nicht gefunden.",
   "message.team-websites-info": "Websites können von jedem im Team eingesehen werden.",
   "message.tracking-code": "Tracking Code",
-  "message.transfer-team-website-to-user": "Diese Website zu deinem Account transferieren?",
-  "message.transfer-user-website-to-team": "Wähle ein Team aus, zu dem die Website transferiert werden soll.",
-  "message.transfer-website": "Übertrage die Eigentümerrechte zu deinem Account oder einem anderen Team.",
+  "message.transfer-team-website-to-user": "Diese Website zu Ihrem Account transferieren?",
+  "message.transfer-user-website-to-team": "Wählen Sie ein Team aus, zu dem die Website transferiert werden soll.",
+  "message.transfer-website": "Übertragen Sie die Eigentümerrechte zu Ihrem Account oder einem anderen Team.",
   "message.triggered-event": "Ausgelöstes Ereigniss",
   "message.user-deleted": "Benutzer gelöscht.",
   "message.viewed-page": "Seite besucht",

From e0334380237fb77571b518dfade6cfcac6396eea Mon Sep 17 00:00:00 2001
From: Konstantin Tutsch <mail@konstantintutsch.com>
Date: Sat, 24 Aug 2024 09:16:04 +0200
Subject: [PATCH 323/438] Fix various errors in German translation

---
 src/lang/de-DE.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lang/de-DE.json b/src/lang/de-DE.json
index 9946bbec43..dfbb9a47e0 100644
--- a/src/lang/de-DE.json
+++ b/src/lang/de-DE.json
@@ -66,7 +66,7 @@
   "label.edit-member": "Mitglied bearbeiten",
   "label.enable-share-url": "Freigabe-URL aktivieren",
   "label.end-step": "Schlussschritt",
-  "label.entry": "Eintrags-URL",
+  "label.entry": "Eingangs-URL",
   "label.event": "Ereigniss",
   "label.event-data": "Ereignissdaten",
   "label.events": "Ereignisse",
@@ -188,7 +188,7 @@
   "label.team-member": "Team-Mitglied",
   "label.team-name": "Name des Teams",
   "label.team-owner": "Team-Eigentümer",
-  "label.team-view-only": "Nur für Team sichtbar",
+  "label.team-view-only": "Nur für Team-Mitglieder sichtbar",
   "label.team-websites": "Team-Websites",
   "label.teams": "Teams",
   "label.theme": "Thema",

From 83cfc659dfd5a04673b0e502abcd3f701aed6207 Mon Sep 17 00:00:00 2001
From: Gerard Nesta <gerardnll@users.noreply.github.com>
Date: Sat, 24 Aug 2024 09:27:32 +0200
Subject: [PATCH 324/438] Update ca-ES.json

---
 src/lang/ca-ES.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lang/ca-ES.json b/src/lang/ca-ES.json
index dd249d4a92..3b6333379a 100644
--- a/src/lang/ca-ES.json
+++ b/src/lang/ca-ES.json
@@ -184,7 +184,7 @@
   "label.tablet": "Tauleta",
   "label.team": "Equip",
   "label.team-id": "ID del equip",
-  "label.team-manager": "Responsable d'Equip",
+  "label.team-manager": "Responsable d'equip",
   "label.team-member": "Membre de l'equip",
   "label.team-name": "Nom de l'equip",
   "label.team-owner": "Propietari de l'equip",

From a219f5dbe3cea44a29ba96c0a4fb2314cb66128b Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 26 Aug 2024 10:36:07 -0700
Subject: [PATCH 325/438] pass timezone in stats CH query

---
 src/queries/analytics/pageviews/getPageviewStats.ts | 6 +++---
 src/queries/analytics/sessions/getSessionStats.ts   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/queries/analytics/pageviews/getPageviewStats.ts b/src/queries/analytics/pageviews/getPageviewStats.ts
index 96e9f1e131..2230da91d5 100644
--- a/src/queries/analytics/pageviews/getPageviewStats.ts
+++ b/src/queries/analytics/pageviews/getPageviewStats.ts
@@ -41,7 +41,7 @@ async function clickhouseQuery(
   websiteId: string,
   filters: QueryFilters,
 ): Promise<{ x: string; y: number }[]> {
-  const { unit = 'day' } = filters;
+  const { timezone = 'utc', unit = 'day' } = filters;
   const { parseFilters, rawQuery } = clickhouse;
   const { filterQuery, params } = await parseFilters(websiteId, {
     ...filters,
@@ -57,7 +57,7 @@ async function clickhouseQuery(
       g.y as y
     from (
       select
-        date_trunc('${unit}', created_at) as t,
+        date_trunc('${unit}', created_at, '${timezone}') as t,
         count(*) as y
       from website_event
       where website_id = {websiteId:UUID}
@@ -75,7 +75,7 @@ async function clickhouseQuery(
       g.y as y
     from (
       select
-        date_trunc('${unit}', created_at) as t,
+        date_trunc('${unit}', created_at, '${timezone}') as t,
         sum(views)as y
       from website_event_stats_hourly website_event
       where website_id = {websiteId:UUID}
diff --git a/src/queries/analytics/sessions/getSessionStats.ts b/src/queries/analytics/sessions/getSessionStats.ts
index 8fde94f379..bddebcec10 100644
--- a/src/queries/analytics/sessions/getSessionStats.ts
+++ b/src/queries/analytics/sessions/getSessionStats.ts
@@ -41,7 +41,7 @@ async function clickhouseQuery(
   websiteId: string,
   filters: QueryFilters,
 ): Promise<{ x: string; y: number }[]> {
-  const { unit = 'day' } = filters;
+  const { timezone = 'utc', unit = 'day' } = filters;
   const { parseFilters, rawQuery } = clickhouse;
   const { filterQuery, params } = await parseFilters(websiteId, {
     ...filters,
@@ -57,7 +57,7 @@ async function clickhouseQuery(
       g.y as y
     from (
       select
-        date_trunc('${unit}', created_at) as t,
+        date_trunc('${unit}', created_at, '${timezone}') as t,
         count(distinct session_id) as y
       from website_event
       where website_id = {websiteId:UUID}
@@ -75,7 +75,7 @@ async function clickhouseQuery(
       g.y as y
     from (
       select
-        date_trunc('${unit}', created_at) as t,
+        date_trunc('${unit}', created_at, '${timezone}') as t,
         uniq(session_id) as y
       from website_event_stats_hourly website_event
       where website_id = {websiteId:UUID}

From 0f93f183642c0daae5ad97ff009c8406886b29ca Mon Sep 17 00:00:00 2001
From: Minseo Lee <itoupluk427@gmail.com>
Date: Mon, 26 Aug 2024 21:45:35 +0900
Subject: [PATCH 326/438] Update ko-KR.json

---
 src/lang/ko-KR.json | 142 ++++++++++++++++++++++----------------------
 1 file changed, 71 insertions(+), 71 deletions(-)

diff --git a/src/lang/ko-KR.json b/src/lang/ko-KR.json
index 8a2de47b14..07494d93f9 100644
--- a/src/lang/ko-KR.json
+++ b/src/lang/ko-KR.json
@@ -1,7 +1,7 @@
 {
   "label.access-code": "액세스 코드",
-  "label.actions": "액션",
-  "label.activity": "활동 기록",
+  "label.actions": "동작",
+  "label.activity": "활동",
   "label.add": "추가",
   "label.add-description": "설명 추가",
   "label.add-member": "멤버 추가",
@@ -20,7 +20,7 @@
   "label.browser": "브라우저",
   "label.browsers": "브라우저",
   "label.cancel": "취소",
-  "label.change-password": "비밀번호 변경하기",
+  "label.change-password": "비밀번호 변경",
   "label.cities": "도시",
   "label.city": "도시",
   "label.clear-all": "모두 지우기",
@@ -32,10 +32,10 @@
   "label.count": "수",
   "label.countries": "국가",
   "label.country": "국가",
-  "label.create": "생성",
-  "label.create-report": "리포트 생성",
-  "label.create-team": "팀 생성",
-  "label.create-user": "사용자 생성",
+  "label.create": "만들기",
+  "label.create-report": "보고서 만들기",
+  "label.create-team": "팀 만들기",
+  "label.create-user": "사용자 만들기",
   "label.created": "생성됨",
   "label.created-by": "작성자",
   "label.current": "현재",
@@ -48,13 +48,13 @@
   "label.day": "일",
   "label.default-date-range": "기본 날짜 범위",
   "label.delete": "삭제",
-  "label.delete-report": "리포트 삭제",
+  "label.delete-report": "보고서 삭제",
   "label.delete-team": "팀 삭제",
   "label.delete-user": "사용자 삭제",
   "label.delete-website": "웹사이트 삭제",
   "label.description": "설명",
-  "label.desktop": "데스크탑",
-  "label.details": "세부 사항",
+  "label.desktop": "데스크톱",
+  "label.details": "세부 정보",
   "label.device": "기기",
   "label.devices": "기기",
   "label.dismiss": "무시하기",
@@ -63,9 +63,9 @@
   "label.dropoff": "이탈",
   "label.edit": "편집",
   "label.edit-dashboard": "대시보드 편집",
-  "label.edit-member": "회원 편집",
+  "label.edit-member": "멤버 편집",
   "label.enable-share-url": "URL 공유 활성화",
-  "label.end-step": "종료 단계",
+  "label.end-step": "마지막 단계",
   "label.entry": "입장 URL",
   "label.event": "이벤트",
   "label.event-data": "이벤트 데이터",
@@ -75,15 +75,15 @@
   "label.field": "필드",
   "label.fields": "필드",
   "label.filter": "필터",
-  "label.filter-combined": "합쳐서 보기",
+  "label.filter-combined": "합쳐 보기",
   "label.filter-raw": "전체 보기",
   "label.filters": "필터",
-  "label.first-seen": "First seen",
+  "label.first-seen": "첫 접속",
   "label.funnel": "퍼널",
   "label.funnel-description": "사용자 전환율 및 이탈률을 살펴보세요.",
   "label.goal": "목표",
   "label.goals": "목표",
-  "label.goals-description": "페이지뷰 및 이벤트 목표를 추적합니다.",
+  "label.goals-description": "페이지 조회 및 이벤트 목표를 추적합니다.",
   "label.greater-than": "이상",
   "label.greater-than-equals": "이상",
   "label.host": "호스트",
@@ -94,17 +94,17 @@
   "label.is-not": "해당하지 않음",
   "label.is-not-set": "설정되지 않음",
   "label.is-set": "설정됨",
-  "label.join": "가입",
-  "label.join-team": "팀 가입",
+  "label.join": "가입하기",
+  "label.join-team": "팀 가입하기",
   "label.journey": "여정",
   "label.journey-description": "사용자가 웹사이트를 탐색하는 경로를 살펴보세요.",
   "label.language": "언어",
   "label.languages": "언어",
   "label.laptop": "노트북",
-  "label.last-days": "최근 {x} 일",
-  "label.last-hours": "최근 {x} 시간",
-  "label.last-months": "최근 {x} 개월",
-  "label.last-seen": "Last seen",
+  "label.last-days": "지난 {x}일",
+  "label.last-hours": "지난 {x}시간",
+  "label.last-months": "지난 {x}개월",
+  "label.last-seen": "마지막 접속",
   "label.leave": "떠나기",
   "label.leave-team": "팀 떠나기",
   "label.less-than": "미만",
@@ -124,56 +124,56 @@
   "label.name": "이름",
   "label.new-password": "새 비밀번호",
   "label.none": "없음",
-  "label.number-of-records": "{x} {x, plural, one {record} other {레코드}}",
+  "label.number-of-records": "{x}개 레코드",
   "label.ok": "확인",
-  "label.os": "운영체제",
+  "label.os": "운영 체제",
   "label.overview": "개요",
   "label.owner": "소유자",
-  "label.page-of": "{total} 중 {current} 페이지",
-  "label.page-views": "페이지 뷰",
+  "label.page-of": "페이지 {current}/{total}",
+  "label.page-views": "페이지 조회",
   "label.pageTitle": "페이지 제목",
   "label.pages": "페이지",
   "label.password": "비밀번호",
-  "label.path": "Path",
-  "label.paths": "Paths",
-  "label.powered-by": "이 시스템은 {name}에서 구동되고 있습니다.",
+  "label.path": "패스",
+  "label.paths": "패스",
+  "label.powered-by": "Powered by {name}",
   "label.previous": "이전",
   "label.previous-period": "이전 기간",
   "label.previous-year": "이전 연도",
   "label.profile": "프로필",
-  "label.properties": "Properties",
+  "label.properties": "속성",
   "label.property": "속성",
   "label.queries": "쿼리",
   "label.query": "쿼리",
-  "label.query-parameters": "쿼리 매개변수",
+  "label.query-parameters": "쿼리 매개 변수",
   "label.realtime": "실시간",
   "label.referrer": "리퍼러",
   "label.referrers": "리퍼러",
-  "label.refresh": "새로고침",
+  "label.refresh": "새로 고침",
   "label.regenerate": "다시 생성",
   "label.region": "지역",
   "label.regions": "지역",
   "label.remove": "제거",
   "label.remove-member": "멤버 제거",
-  "label.reports": "리포트",
+  "label.reports": "보고서",
   "label.required": "필수",
-  "label.reset": "리셋",
+  "label.reset": "초기화",
   "label.reset-website": "웹사이트 초기화",
   "label.retention": "리텐션",
   "label.retention-description": "사용자가 얼마나 자주 돌아오는지를 추적하여 웹사이트의 리텐션을 측정하십시오.",
-  "label.revenue": "Revenue",
-  "label.revenue-description": "Look into your revenue across time.",
-  "label.revenue-property": "Revenue Property",
+  "label.revenue": "수익",
+  "label.revenue-description": "시간대별 수익을 살펴보세요.",
+  "label.revenue-property": "수익 속성",
   "label.role": "역할",
   "label.run-query": "쿼리 실행",
   "label.save": "저장",
-  "label.screens": "스크린",
+  "label.screens": "화면",
   "label.search": "검색",
   "label.select": "선택",
   "label.select-date": "날짜 선택",
   "label.select-role": "역할 선택",
   "label.select-website": "웹사이트 선택",
-  "label.session": "Session",
+  "label.session": "세션",
   "label.sessions": "세션",
   "label.settings": "설정",
   "label.share-url": "공유 URL",
@@ -200,43 +200,43 @@
   "label.today": "오늘",
   "label.toggle-charts": "차트 전환",
   "label.total": "합계",
-  "label.total-records": "총 레코드",
+  "label.total-records": "전체 레코드",
   "label.tracking-code": "추적 코드",
-  "label.transactions": "Transactions",
+  "label.transactions": "거래",
   "label.transfer": "전송",
   "label.transfer-website": "웹사이트 전송",
   "label.true": "참",
   "label.type": "유형",
   "label.unique": "고유",
-  "label.unique-visitors": "순방문자(UV)",
-  "label.uniqueCustomers": "Unique Customers",
+  "label.unique-visitors": "고유 방문자",
+  "label.uniqueCustomers": "고유 고객",
   "label.unknown": "알 수 없음",
   "label.untitled": "제목 없음",
   "label.update": "업데이트",
   "label.url": "URL",
   "label.urls": "URL",
   "label.user": "사용자",
-  "label.user-property": "User Property",
-  "label.username": "사용자명",
+  "label.user-property": "사용자 속성",
+  "label.username": "사용자 이름",
   "label.users": "사용자",
   "label.utm": "UTM",
   "label.utm-description": "UTM 매개변수를 통해 캠페인을 추적합니다.",
   "label.value": "값",
   "label.view": "보기",
-  "label.view-details": "상세보기",
+  "label.view-details": "자세히 보기",
   "label.view-only": "보기 전용",
-  "label.views": "조회수",
-  "label.views-per-visit": "방문당 조회수",
+  "label.views": "조회",
+  "label.views-per-visit": "방문당 조회",
   "label.visit-duration": "평균 방문 시간",
-  "label.visitors": "방문객",
+  "label.visitors": "방문자",
   "label.visits": "방문",
   "label.website": "웹사이트",
   "label.website-id": "웹사이트 ID",
   "label.websites": "웹사이트",
   "label.window": "창",
   "label.yesterday": "어제",
-  "message.action-confirmation": "확인을 위해 아래 상자에 {confirmation}을(를) 입력하십시오.",
-  "message.active-users": "{x}명의 사용자가 보는 중입니다.",
+  "message.action-confirmation": "확인을 위해 아래 상자에 {confirmation}을(를) 입력하세요.",
+  "message.active-users": "현재 방문자 {x}명",
   "message.collected-data": "수집된 데이터",
   "message.confirm-delete": "{target}을(를) 삭제하시겠습니까?",
   "message.confirm-leave": "{target}을(를) 떠나시겠습니까?",
@@ -244,36 +244,36 @@
   "message.confirm-reset": "{target}을(를) 초기화하시겠습니까?",
   "message.delete-team-warning": "팀을 삭제하면 팀에 등록된 모든 웹사이트도 삭제됩니다.",
   "message.delete-website-warning": "관련된 모든 데이터가 삭제됩니다.",
-  "message.error": "오류가 발생하였습니다.",
+  "message.error": "오류가 발생했습니다.",
   "message.event-log": "{event} - {url}",
   "message.go-to-settings": "설정으로 이동",
-  "message.incorrect-username-password": "사용자 이름/비밀번호가 잘못되었습니다.",
-  "message.invalid-domain": "잘못된 도메인",
-  "message.min-password-length": "최소 길이는 {n}자입니다",
-  "message.new-version-available": "새 버전이 사용 가능합니다! - Umami {version}",
-  "message.no-data-available": "사용 가능한 데이터가 없습니다.",
-  "message.no-event-data": "사용 가능한 이벤트 데이터가 없습니다.",
-  "message.no-match-password": "비밀번호가 일치하지 않음",
+  "message.incorrect-username-password": "사용자 이름 또는 비밀번호를 잘못 입력했습니다.",
+  "message.invalid-domain": "잘못된 도메인입니다. http/https를 포함하지 마세요.",
+  "message.min-password-length": "최소 {n}자여야 합니다",
+  "message.new-version-available": "Umami의 새 버전 {version}을(를) 사용할 수 있습니다!",
+  "message.no-data-available": "사용할 수 있는 데이터가 없습니다.",
+  "message.no-event-data": "사용할 수 있는 이벤트 데이터가 없습니다.",
+  "message.no-match-password": "비밀번호가 일치하지 않습니다.",
   "message.no-results-found": "결과를 찾을 수 없습니다.",
-  "message.no-team-websites": "이 팀에는 웹사이트가 없습니다.",
-  "message.no-teams": "생성된 팀이 없습니다.",
+  "message.no-team-websites": "팀에 웹사이트가 없습니다.",
+  "message.no-teams": "만든 팀이 없습니다.",
   "message.no-users": "사용자가 없습니다.",
   "message.no-websites-configured": "설정된 웹사이트가 없습니다.",
-  "message.page-not-found": "페이지를 찾을 수 없습니다.",
-  "message.reset-website": "이 웹사이트를 초기화하려면, 아래 상자에 {confirmation}을(를) 입력하십시오.",
+  "message.page-not-found": "페이지를 찾을 수 없음",
+  "message.reset-website": "이 웹사이트를 초기화하려면 아래 상자에 {confirmation}을(를) 입력하세요.",
   "message.reset-website-warning": "이 웹사이트의 모든 통계가 삭제되지만 설정은 그대로 유지됩니다.",
-  "message.saved": "성공적으로 저장되었습니다.",
+  "message.saved": "저장했습니다.",
   "message.share-url": "아래 링크를 통해 웹사이트의 통계를 누구나 볼 수 있습니다.",
-  "message.team-already-member": "이미 팀의 회원입니다.",
+  "message.team-already-member": "이미 팀 멤버입니다.",
   "message.team-not-found": "팀을 찾을 수 없습니다.",
-  "message.team-websites-info": "웹사이트는 팀의 누구나 볼 수 있습니다.",
-  "message.tracking-code": "이 웹사이트의 통계를 추적하려면, 다음 코드를 HTML의 <head>...</head> 섹션에 추가하십시오.",
+  "message.team-websites-info": "웹사이트는 팀 멤버 누구나 볼 수 있습니다.",
+  "message.tracking-code": "이 웹사이트의 통계를 추적하려면 다음 코드를 HTML의 <head>...</head> 부분에 추가하세요.",
   "message.transfer-team-website-to-user": "이 웹사이트를 당신의 계정으로 전송하시겠습니까?",
-  "message.transfer-user-website-to-team": "이 웹사이트를 전송받을 팀을 선택하십시오.",
+  "message.transfer-user-website-to-team": "이 웹사이트를 전송받을 팀을 선택하세요.",
   "message.transfer-website": "웹사이트 소유권을 계정이나 다른 팀으로 전송합니다.",
   "message.triggered-event": "트리거된 이벤트",
-  "message.user-deleted": "사용자가 삭제되었습니다.",
-  "message.viewed-page": "페이지 조회",
-  "message.visitor-log": "{country}의 {browser} 브라우저를 사용하는 {os} {device} 방문자",
-  "message.visitors-dropped-off": "방문자가 이탈했습니다"
+  "message.user-deleted": "사용자를 삭제했습니다.",
+  "message.viewed-page": "조회한 페이지",
+  "message.visitor-log": "{os} {device}에서 {browser}을(를) 사용하는 {country}의 방문자",
+  "message.visitors-dropped-off": "방문자 이탈함"
 }

From 8776af9bc807bfea6fc8d01d7d24487178e5bd3c Mon Sep 17 00:00:00 2001
From: Minseo Lee <itoupluk427@gmail.com>
Date: Tue, 27 Aug 2024 15:53:19 +0900
Subject: [PATCH 327/438] OS strings in visitorLog

---
 src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
index 8a5f3a55f5..024d79c740 100644
--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
@@ -3,7 +3,7 @@ import Empty from 'components/common/Empty';
 import FilterButtons from 'components/common/FilterButtons';
 import { useCountryNames, useLocale, useMessages, useTimezone } from 'components/hooks';
 import Icons from 'components/icons';
-import { BROWSERS } from 'lib/constants';
+import { BROWSERS, OS_NAMES } from 'lib/constants';
 import { stringToColor } from 'lib/format';
 import { RealtimeData } from 'lib/types';
 import { safeDecodeURI } from 'next-basics';
@@ -111,7 +111,7 @@ export function RealtimeLog({ data }: { data: RealtimeData }) {
           values={{
             country: <b>{countryNames[country] || formatMessage(labels.unknown)}</b>,
             browser: <b>{BROWSERS[browser]}</b>,
-            os: <b>{os}</b>,
+            os: <b>{OS_NAMES[os]}</b>,
             device: <b>{formatMessage(labels[device] || labels.unknown)}</b>,
           }}
         />

From 248722edbff61777436ab46b9e8abfe56c138e4f Mon Sep 17 00:00:00 2001
From: Minseo Lee <itoupluk427@gmail.com>
Date: Tue, 27 Aug 2024 15:53:49 +0900
Subject: [PATCH 328/438] Fix name of KakaoTalk

---
 src/lib/constants.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index b3f89db261..5d3a9776b5 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -311,7 +311,7 @@ export const BROWSERS = {
   instagram: 'Instagram',
   ios: 'iOS',
   'ios-webview': 'iOS (webview)',
-  kakaotalk: 'KaKaoTalk',
+  kakaotalk: 'KakaoTalk',
   miui: 'MIUI',
   opera: 'Opera',
   'opera-mini': 'Opera Mini',

From a92fa260e193205295969f1e8c74996454aa11a7 Mon Sep 17 00:00:00 2001
From: Minseo Lee <itoupluk427@gmail.com>
Date: Tue, 27 Aug 2024 16:04:22 +0900
Subject: [PATCH 329/438] Update RealtimeLog.tsx

---
 src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
index 024d79c740..f40be9dbc6 100644
--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx
@@ -111,7 +111,7 @@ export function RealtimeLog({ data }: { data: RealtimeData }) {
           values={{
             country: <b>{countryNames[country] || formatMessage(labels.unknown)}</b>,
             browser: <b>{BROWSERS[browser]}</b>,
-            os: <b>{OS_NAMES[os]}</b>,
+            os: <b>{OS_NAMES[os] || os}</b>,
             device: <b>{formatMessage(labels[device] || labels.unknown)}</b>,
           }}
         />

From b1caf6edb702f227220e0f2e1742963b282be746 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 27 Aug 2024 12:02:23 -0700
Subject: [PATCH 330/438] fix monthly and all time charts

---
 src/components/charts/BarChart.tsx                  |  2 +-
 src/lib/clickhouse.ts                               |  4 ++--
 src/queries/analytics/pageviews/getPageviewStats.ts |  6 +++---
 src/queries/analytics/sessions/getSessionStats.ts   | 10 +++++-----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/charts/BarChart.tsx b/src/components/charts/BarChart.tsx
index b96812210e..7a8dcbed84 100644
--- a/src/components/charts/BarChart.tsx
+++ b/src/components/charts/BarChart.tsx
@@ -36,7 +36,7 @@ export function BarChart(props: BarChartProps) {
         x: {
           type: XAxisType,
           stacked: true,
-          min: minDate,
+          min: unit === 'minute' ? minDate : '',
           max: maxDate,
           time: {
             unit,
diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index 332d07275c..5502b5babf 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -63,9 +63,9 @@ function getDateStringSQL(data: any, unit: string = 'utc', timezone?: string) {
 
 function getDateSQL(field: string, unit: string, timezone?: string) {
   if (timezone) {
-    return `date_trunc('${unit}', ${field}, '${timezone}')`;
+    return `toDateTime(date_trunc('${unit}', ${field}, '${timezone}'), '${timezone}')`;
   }
-  return `date_trunc('${unit}', ${field})`;
+  return `toDateTime(date_trunc('${unit}', ${field}))`;
 }
 
 function mapFilter(column: string, operator: string, name: string, type: string = 'String') {
diff --git a/src/queries/analytics/pageviews/getPageviewStats.ts b/src/queries/analytics/pageviews/getPageviewStats.ts
index 2230da91d5..48b82000aa 100644
--- a/src/queries/analytics/pageviews/getPageviewStats.ts
+++ b/src/queries/analytics/pageviews/getPageviewStats.ts
@@ -42,7 +42,7 @@ async function clickhouseQuery(
   filters: QueryFilters,
 ): Promise<{ x: string; y: number }[]> {
   const { timezone = 'utc', unit = 'day' } = filters;
-  const { parseFilters, rawQuery } = clickhouse;
+  const { parseFilters, rawQuery, getDateSQL } = clickhouse;
   const { filterQuery, params } = await parseFilters(websiteId, {
     ...filters,
     eventType: EVENT_TYPE.pageView,
@@ -57,7 +57,7 @@ async function clickhouseQuery(
       g.y as y
     from (
       select
-        date_trunc('${unit}', created_at, '${timezone}') as t,
+        ${getDateSQL('website_event.created_at', unit, timezone)} as t,
         count(*) as y
       from website_event
       where website_id = {websiteId:UUID}
@@ -75,7 +75,7 @@ async function clickhouseQuery(
       g.y as y
     from (
       select
-        date_trunc('${unit}', created_at, '${timezone}') as t,
+        ${getDateSQL('website_event.created_at', unit, timezone)} as t,
         sum(views)as y
       from website_event_stats_hourly website_event
       where website_id = {websiteId:UUID}
diff --git a/src/queries/analytics/sessions/getSessionStats.ts b/src/queries/analytics/sessions/getSessionStats.ts
index bddebcec10..212f15e9bd 100644
--- a/src/queries/analytics/sessions/getSessionStats.ts
+++ b/src/queries/analytics/sessions/getSessionStats.ts
@@ -42,7 +42,7 @@ async function clickhouseQuery(
   filters: QueryFilters,
 ): Promise<{ x: string; y: number }[]> {
   const { timezone = 'utc', unit = 'day' } = filters;
-  const { parseFilters, rawQuery } = clickhouse;
+  const { parseFilters, rawQuery, getDateSQL } = clickhouse;
   const { filterQuery, params } = await parseFilters(websiteId, {
     ...filters,
     eventType: EVENT_TYPE.pageView,
@@ -53,11 +53,11 @@ async function clickhouseQuery(
   if (EVENT_COLUMNS.some(item => Object.keys(filters).includes(item)) || unit === 'minute') {
     sql = `
     select
-      g.t as x, 
+      g.t as x,
       g.y as y
     from (
       select
-        date_trunc('${unit}', created_at, '${timezone}') as t,
+        ${getDateSQL('website_event.created_at', unit, timezone)} as t,
         count(distinct session_id) as y
       from website_event
       where website_id = {websiteId:UUID}
@@ -71,11 +71,11 @@ async function clickhouseQuery(
   } else {
     sql = `
     select
-      g.t as x, 
+      g.t as x,
       g.y as y
     from (
       select
-        date_trunc('${unit}', created_at, '${timezone}') as t,
+        ${getDateSQL('website_event.created_at', unit, timezone)} as t,
         uniq(session_id) as y
       from website_event_stats_hourly website_event
       where website_id = {websiteId:UUID}

From 291c64f7b0b5c46667f4e80e0580c6b00b65a607 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 27 Aug 2024 14:01:29 -0700
Subject: [PATCH 331/438] Updated initialization process.

---
 src/tracker/index.js | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/tracker/index.js b/src/tracker/index.js
index 90a73c432b..707594cf40 100644
--- a/src/tracker/index.js
+++ b/src/tracker/index.js
@@ -222,6 +222,16 @@
     }
   };
 
+  const init = () => {
+    if (!initialized) {
+      track();
+      handlePathChanges();
+      handleTitleChanges();
+      handleClicks();
+      initialized = true;
+    }
+  };
+
   const track = (obj, data) => {
     if (typeof obj === 'string') {
       return send({
@@ -255,19 +265,10 @@
   let initialized;
 
   if (autoTrack && !trackingDisabled()) {
-    handlePathChanges();
-    handleTitleChanges();
-    handleClicks();
-
-    const init = () => {
-      if (document.readyState === 'complete' && !initialized) {
-        track();
-        initialized = true;
-      }
-    };
-
-    document.addEventListener('readystatechange', init, true);
-
-    init();
+    if (document.readyState === 'complete') {
+      init();
+    } else {
+      document.addEventListener('readystatechange', init, true);
+    }
   }
 })(window);

From 981a6556548762f797acab96bd4589c27dd9e459 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 27 Aug 2024 14:17:42 -0700
Subject: [PATCH 332/438] fix mindate logic

---
 src/components/charts/BarChart.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/charts/BarChart.tsx b/src/components/charts/BarChart.tsx
index 7a8dcbed84..de7690468c 100644
--- a/src/components/charts/BarChart.tsx
+++ b/src/components/charts/BarChart.tsx
@@ -36,7 +36,7 @@ export function BarChart(props: BarChartProps) {
         x: {
           type: XAxisType,
           stacked: true,
-          min: unit === 'minute' ? minDate : '',
+          min: unit === 'year' ? '' : minDate,
           max: maxDate,
           time: {
             unit,

From ab050e51c590fd4f814e91cd0c4d4e4e365ca577 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 27 Aug 2024 16:02:43 -0700
Subject: [PATCH 333/438] Fix tooltip label, retention report for mysql, pass
 minDate into eventsChart

---
 src/app/(main)/reports/retention/RetentionTable.tsx |  2 +-
 src/components/charts/BarChart.tsx                  |  9 ++++-----
 src/components/metrics/EventsChart.tsx              |  2 ++
 src/lib/prisma.ts                                   | 12 ++++++------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/app/(main)/reports/retention/RetentionTable.tsx b/src/app/(main)/reports/retention/RetentionTable.tsx
index 1770a76468..acc9c052b8 100644
--- a/src/app/(main)/reports/retention/RetentionTable.tsx
+++ b/src/app/(main)/reports/retention/RetentionTable.tsx
@@ -64,7 +64,7 @@ export function RetentionTable({ days = DAYS }) {
                     key={day}
                     className={classNames(styles.cell, { [styles.empty]: !percentage })}
                   >
-                    {percentage ? `${percentage.toFixed(2)}%` : ''}
+                    {percentage ? `${Number(percentage).toFixed(2)}%` : ''}
                   </div>
                 );
               })}
diff --git a/src/components/charts/BarChart.tsx b/src/components/charts/BarChart.tsx
index de7690468c..7624ba1c43 100644
--- a/src/components/charts/BarChart.tsx
+++ b/src/components/charts/BarChart.tsx
@@ -1,9 +1,8 @@
-import { useMemo } from 'react';
-import { useTheme } from 'components/hooks';
+import BarChartTooltip from 'components/charts/BarChartTooltip';
 import Chart, { ChartProps } from 'components/charts/Chart';
+import { useTheme } from 'components/hooks';
 import { renderNumberLabels } from 'lib/charts';
-import { useState } from 'react';
-import BarChartTooltip from 'components/charts/BarChartTooltip';
+import { useMemo, useState } from 'react';
 
 export interface BarChartProps extends ChartProps {
   unit: string;
@@ -36,7 +35,7 @@ export function BarChart(props: BarChartProps) {
         x: {
           type: XAxisType,
           stacked: true,
-          min: unit === 'year' ? '' : minDate,
+          min: minDate && new Date(minDate).getSeconds() === 0 ? minDate : '',
           max: maxDate,
           time: {
             unit,
diff --git a/src/components/metrics/EventsChart.tsx b/src/components/metrics/EventsChart.tsx
index ee7f866cb3..f5b283449b 100644
--- a/src/components/metrics/EventsChart.tsx
+++ b/src/components/metrics/EventsChart.tsx
@@ -47,6 +47,8 @@ export function EventsChart({ websiteId, className }: EventsChartProps) {
 
   return (
     <BarChart
+      minDate={startDate.toISOString()}
+      maxDate={endDate.toISOString()}
       className={className}
       data={chartData}
       unit={unit}
diff --git a/src/lib/prisma.ts b/src/lib/prisma.ts
index f0f071bc79..32ac65eb5f 100644
--- a/src/lib/prisma.ts
+++ b/src/lib/prisma.ts
@@ -14,17 +14,17 @@ const log = debug('umami:prisma');
 const MYSQL_DATE_FORMATS = {
   minute: '%Y-%m-%dT%H:%i:00',
   hour: '%Y-%m-%d %H:00:00',
-  day: '%Y-%m-%d',
-  month: '%Y-%m-01',
-  year: '%Y-01-01',
+  day: '%Y-%m-%d 00:00:00',
+  month: '%Y-%m-01 00:00:00',
+  year: '%Y-01-01 00:00:00',
 };
 
 const POSTGRESQL_DATE_FORMATS = {
   minute: 'YYYY-MM-DD HH24:MI:00',
   hour: 'YYYY-MM-DD HH24:00:00',
-  day: 'YYYY-MM-DD',
-  month: 'YYYY-MM-01',
-  year: 'YYYY-01-01',
+  day: 'YYYY-MM-DD HH24:00:00',
+  month: 'YYYY-MM-01 HH24:00:00',
+  year: 'YYYY-01-01 HH24:00:00',
 };
 
 function getAddIntervalQuery(field: string, interval: string): string {

From 89257605b3089b7ae28ee393b99aa0aa532e389f Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 27 Aug 2024 16:21:31 -0700
Subject: [PATCH 334/438] Show stats changes on dashboard page. Closes #2840

---
 src/app/(main)/websites/[websiteId]/WebsiteChartList.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/(main)/websites/[websiteId]/WebsiteChartList.tsx b/src/app/(main)/websites/[websiteId]/WebsiteChartList.tsx
index b4a02db799..398fbf8fde 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteChartList.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteChartList.tsx
@@ -47,7 +47,7 @@ export default function WebsiteChartList({
                 </Button>
               </Link>
             </WebsiteHeader>
-            <WebsiteMetricsBar websiteId={id} />
+            <WebsiteMetricsBar websiteId={id} showChange={true} />
             {showCharts && <WebsiteChart websiteId={id} />}
           </div>
         ) : null;

From 178f9dc1a706322121f4ae688f2885cc1bdbbe3e Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 27 Aug 2024 16:23:34 -0700
Subject: [PATCH 335/438] Updated lang files.

---
 public/intl/messages/ca-ES.json |   2 +-
 public/intl/messages/de-DE.json |  76 ++++++------
 public/intl/messages/ko-KR.json | 214 +++++++++++++++-----------------
 3 files changed, 136 insertions(+), 156 deletions(-)

diff --git a/public/intl/messages/ca-ES.json b/public/intl/messages/ca-ES.json
index ccc4988908..69b69e4354 100644
--- a/public/intl/messages/ca-ES.json
+++ b/public/intl/messages/ca-ES.json
@@ -1180,7 +1180,7 @@
   "label.team-manager": [
     {
       "type": 0,
-      "value": "Responsable d'Equip"
+      "value": "Responsable d'equip"
     }
   ],
   "label.team-member": [
diff --git a/public/intl/messages/de-DE.json b/public/intl/messages/de-DE.json
index 84bc60e136..84e7364c53 100644
--- a/public/intl/messages/de-DE.json
+++ b/public/intl/messages/de-DE.json
@@ -404,19 +404,19 @@
   "label.entry": [
     {
       "type": 0,
-      "value": "Eintrags-URL"
+      "value": "Eingangs-URL"
     }
   ],
   "label.event": [
     {
       "type": 0,
-      "value": "Event"
+      "value": "Ereigniss"
     }
   ],
   "label.event-data": [
     {
       "type": 0,
-      "value": "Eventdaten"
+      "value": "Ereignissdaten"
     }
   ],
   "label.events": [
@@ -476,19 +476,19 @@
   "label.first-seen": [
     {
       "type": 0,
-      "value": "First seen"
+      "value": "Erstmalig gesehen"
     }
   ],
   "label.funnel": [
     {
       "type": 0,
-      "value": "Funnel"
+      "value": "Trichter"
     }
   ],
   "label.funnel-description": [
     {
       "type": 0,
-      "value": "Verstehe die Konversions- und Abbruchrate der Nutzer."
+      "value": "Verstehen Sie die Konversions- und Absprungrate Ihrer Nutzer."
     }
   ],
   "label.goal": [
@@ -542,7 +542,7 @@
   "label.insights-description": [
     {
       "type": 0,
-      "value": "Vertiefen Sie Ihre Daten mit Hilfe von Segmenten und Filtern."
+      "value": "Vertiefen Sie sich mit Hilfe von Segmenten und Filtern in Ihre Daten."
     }
   ],
   "label.is": [
@@ -590,7 +590,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Verstehe, wie Nutzer auf der Webseite navigieren"
+      "value": "Verstehen Sie, wie Nutzer auf Ihrer Website navigieren."
     }
   ],
   "label.language": [
@@ -656,7 +656,7 @@
   "label.last-seen": [
     {
       "type": 0,
-      "value": "Last seen"
+      "value": "Zuletzt gesehen"
     }
   ],
   "label.leave": [
@@ -752,7 +752,7 @@
   "label.my-websites": [
     {
       "type": 0,
-      "value": "Meine Webseiten"
+      "value": "Meine Websites"
     }
   ],
   "label.name": [
@@ -876,13 +876,13 @@
   "label.path": [
     {
       "type": 0,
-      "value": "Path"
+      "value": "Pfad"
     }
   ],
   "label.paths": [
     {
       "type": 0,
-      "value": "Paths"
+      "value": "Pfade"
     }
   ],
   "label.powered-by": [
@@ -898,7 +898,7 @@
   "label.previous": [
     {
       "type": 0,
-      "value": "Vorheriges"
+      "value": "Vorherig"
     }
   ],
   "label.previous-period": [
@@ -922,7 +922,7 @@
   "label.properties": [
     {
       "type": 0,
-      "value": "Properties"
+      "value": "Eigenschaften"
     }
   ],
   "label.property": [
@@ -958,13 +958,13 @@
   "label.referrer": [
     {
       "type": 0,
-      "value": "Referrer"
+      "value": "Übermittler"
     }
   ],
   "label.referrers": [
     {
       "type": 0,
-      "value": "Referrer"
+      "value": "Übermittler"
     }
   ],
   "label.refresh": [
@@ -1030,7 +1030,7 @@
   "label.retention": [
     {
       "type": 0,
-      "value": "Bewahrung"
+      "value": "Erhalt"
     }
   ],
   "label.retention-description": [
@@ -1042,19 +1042,19 @@
   "label.revenue": [
     {
       "type": 0,
-      "value": "Revenue"
+      "value": "Umsatz"
     }
   ],
   "label.revenue-description": [
     {
       "type": 0,
-      "value": "Look into your revenue across time."
+      "value": "Haben Sie einen Blick auf Ihre Umsätze im Laufe der Zeit."
     }
   ],
   "label.revenue-property": [
     {
       "type": 0,
-      "value": "Revenue Property"
+      "value": "Umsatzeigenschaften"
     }
   ],
   "label.role": [
@@ -1108,13 +1108,13 @@
   "label.select-website": [
     {
       "type": 0,
-      "value": "Webseite auswählen"
+      "value": "Website auswählen"
     }
   ],
   "label.session": [
     {
       "type": 0,
-      "value": "Session"
+      "value": "Sitzung"
     }
   ],
   "label.sessions": [
@@ -1204,7 +1204,7 @@
   "label.team-view-only": [
     {
       "type": 0,
-      "value": "Nur für Team sichtbar"
+      "value": "Nur für Team-Mitglieder sichtbar"
     }
   ],
   "label.team-websites": [
@@ -1288,7 +1288,7 @@
   "label.transactions": [
     {
       "type": 0,
-      "value": "Transactions"
+      "value": "Transaktionen"
     }
   ],
   "label.transfer": [
@@ -1318,19 +1318,19 @@
   "label.unique": [
     {
       "type": 0,
-      "value": "Eindeutig"
+      "value": "Einzigartig"
     }
   ],
   "label.unique-visitors": [
     {
       "type": 0,
-      "value": "Eindeutige Besucher"
+      "value": "Einzigartige Besucher"
     }
   ],
   "label.uniqueCustomers": [
     {
       "type": 0,
-      "value": "Unique Customers"
+      "value": "Einzigartige Kunden"
     }
   ],
   "label.unknown": [
@@ -1372,7 +1372,7 @@
   "label.user-property": [
     {
       "type": 0,
-      "value": "User Property"
+      "value": "Benutzereigenschaften"
     }
   ],
   "label.username": [
@@ -1396,7 +1396,7 @@
   "label.utm-description": [
     {
       "type": 0,
-      "value": "Tracke deine Kampagnen mit UTM parameterns."
+      "value": "Tracken Sie Ihre Kampagnen mit UTM Parametern."
     }
   ],
   "label.value": [
@@ -1456,19 +1456,19 @@
   "label.website": [
     {
       "type": 0,
-      "value": "Webseite"
+      "value": "Website"
     }
   ],
   "label.website-id": [
     {
       "type": 0,
-      "value": "Webseiten-ID"
+      "value": "Website-ID"
     }
   ],
   "label.websites": [
     {
       "type": 0,
-      "value": "Webseiten"
+      "value": "Websites"
     }
   ],
   "label.window": [
@@ -1596,7 +1596,7 @@
   "message.delete-team-warning": [
     {
       "type": 0,
-      "value": "Ein Team zu löschen, wird auch alle Team-Webseiten löschen."
+      "value": "Ein Team zu löschen, wird auch alle Team-Websites löschen."
     }
   ],
   "message.delete-website-warning": [
@@ -1780,25 +1780,25 @@
   "message.transfer-team-website-to-user": [
     {
       "type": 0,
-      "value": "Diese Webseite zu deinem Account transferieren?"
+      "value": "Diese Website zu Ihrem Account transferieren?"
     }
   ],
   "message.transfer-user-website-to-team": [
     {
       "type": 0,
-      "value": "Wähle ein Team aus, zu dem die Webseite transferiert werden soll."
+      "value": "Wählen Sie ein Team aus, zu dem die Website transferiert werden soll."
     }
   ],
   "message.transfer-website": [
     {
       "type": 0,
-      "value": "Übertrage die Eigentümerrechte zu deinem Account oder einem anderen Team."
+      "value": "Übertragen Sie die Eigentümerrechte zu Ihrem Account oder einem anderen Team."
     }
   ],
   "message.triggered-event": [
     {
       "type": 0,
-      "value": "Ausgelöstes Event"
+      "value": "Ausgelöstes Ereigniss"
     }
   ],
   "message.user-deleted": [
@@ -1810,7 +1810,7 @@
   "message.viewed-page": [
     {
       "type": 0,
-      "value": "Besuchte Seite"
+      "value": "Seite besucht"
     }
   ],
   "message.visitor-log": [
diff --git a/public/intl/messages/ko-KR.json b/public/intl/messages/ko-KR.json
index 9f6520ea40..42a984191f 100644
--- a/public/intl/messages/ko-KR.json
+++ b/public/intl/messages/ko-KR.json
@@ -8,13 +8,13 @@
   "label.actions": [
     {
       "type": 0,
-      "value": "액션"
+      "value": "동작"
     }
   ],
   "label.activity": [
     {
       "type": 0,
-      "value": "활동 기록"
+      "value": "활동"
     }
   ],
   "label.add": [
@@ -128,7 +128,7 @@
   "label.change-password": [
     {
       "type": 0,
-      "value": "비밀번호 변경하기"
+      "value": "비밀번호 변경"
     }
   ],
   "label.cities": [
@@ -200,25 +200,25 @@
   "label.create": [
     {
       "type": 0,
-      "value": "생성"
+      "value": "만들기"
     }
   ],
   "label.create-report": [
     {
       "type": 0,
-      "value": "리포트 생성"
+      "value": "보고서 만들기"
     }
   ],
   "label.create-team": [
     {
       "type": 0,
-      "value": "팀 생성"
+      "value": "팀 만들기"
     }
   ],
   "label.create-user": [
     {
       "type": 0,
-      "value": "사용자 생성"
+      "value": "사용자 만들기"
     }
   ],
   "label.created": [
@@ -296,7 +296,7 @@
   "label.delete-report": [
     {
       "type": 0,
-      "value": "리포트 삭제"
+      "value": "보고서 삭제"
     }
   ],
   "label.delete-team": [
@@ -326,13 +326,13 @@
   "label.desktop": [
     {
       "type": 0,
-      "value": "데스크탑"
+      "value": "데스크톱"
     }
   ],
   "label.details": [
     {
       "type": 0,
-      "value": "세부 사항"
+      "value": "세부 정보"
     }
   ],
   "label.device": [
@@ -386,7 +386,7 @@
   "label.edit-member": [
     {
       "type": 0,
-      "value": "회원 편집"
+      "value": "멤버 편집"
     }
   ],
   "label.enable-share-url": [
@@ -398,7 +398,7 @@
   "label.end-step": [
     {
       "type": 0,
-      "value": "종료 단계"
+      "value": "마지막 단계"
     }
   ],
   "label.entry": [
@@ -458,7 +458,7 @@
   "label.filter-combined": [
     {
       "type": 0,
-      "value": "합쳐서 보기"
+      "value": "합쳐 보기"
     }
   ],
   "label.filter-raw": [
@@ -476,7 +476,7 @@
   "label.first-seen": [
     {
       "type": 0,
-      "value": "First seen"
+      "value": "첫 접속"
     }
   ],
   "label.funnel": [
@@ -506,7 +506,7 @@
   "label.goals-description": [
     {
       "type": 0,
-      "value": "페이지뷰 및 이벤트 목표를 추적합니다."
+      "value": "페이지 조회 및 이벤트 목표를 추적합니다."
     }
   ],
   "label.greater-than": [
@@ -572,13 +572,13 @@
   "label.join": [
     {
       "type": 0,
-      "value": "가입"
+      "value": "가입하기"
     }
   ],
   "label.join-team": [
     {
       "type": 0,
-      "value": "팀 가입"
+      "value": "팀 가입하기"
     }
   ],
   "label.journey": [
@@ -614,7 +614,7 @@
   "label.last-days": [
     {
       "type": 0,
-      "value": "최근 "
+      "value": "지난 "
     },
     {
       "type": 1,
@@ -622,13 +622,13 @@
     },
     {
       "type": 0,
-      "value": " 일"
+      "value": "일"
     }
   ],
   "label.last-hours": [
     {
       "type": 0,
-      "value": "최근 "
+      "value": "지난 "
     },
     {
       "type": 1,
@@ -636,13 +636,13 @@
     },
     {
       "type": 0,
-      "value": " 시간"
+      "value": "시간"
     }
   ],
   "label.last-months": [
     {
       "type": 0,
-      "value": "최근 "
+      "value": "지난 "
     },
     {
       "type": 1,
@@ -650,13 +650,13 @@
     },
     {
       "type": 0,
-      "value": " 개월"
+      "value": "개월"
     }
   ],
   "label.last-seen": [
     {
       "type": 0,
-      "value": "Last seen"
+      "value": "마지막 접속"
     }
   ],
   "label.leave": [
@@ -780,31 +780,7 @@
     },
     {
       "type": 0,
-      "value": " "
-    },
-    {
-      "offset": 0,
-      "options": {
-        "one": {
-          "value": [
-            {
-              "type": 0,
-              "value": "record"
-            }
-          ]
-        },
-        "other": {
-          "value": [
-            {
-              "type": 0,
-              "value": "레코드"
-            }
-          ]
-        }
-      },
-      "pluralType": "cardinal",
-      "type": 6,
-      "value": "x"
+      "value": "개 레코드"
     }
   ],
   "label.ok": [
@@ -816,7 +792,7 @@
   "label.os": [
     {
       "type": 0,
-      "value": "운영체제"
+      "value": "운영 체제"
     }
   ],
   "label.overview": [
@@ -832,13 +808,9 @@
     }
   ],
   "label.page-of": [
-    {
-      "type": 1,
-      "value": "total"
-    },
     {
       "type": 0,
-      "value": " 중 "
+      "value": "페이지 "
     },
     {
       "type": 1,
@@ -846,13 +818,17 @@
     },
     {
       "type": 0,
-      "value": " 페이지"
+      "value": "/"
+    },
+    {
+      "type": 1,
+      "value": "total"
     }
   ],
   "label.page-views": [
     {
       "type": 0,
-      "value": "페이지 뷰"
+      "value": "페이지 조회"
     }
   ],
   "label.pageTitle": [
@@ -876,27 +852,23 @@
   "label.path": [
     {
       "type": 0,
-      "value": "Path"
+      "value": "패스"
     }
   ],
   "label.paths": [
     {
       "type": 0,
-      "value": "Paths"
+      "value": "패스"
     }
   ],
   "label.powered-by": [
     {
       "type": 0,
-      "value": "이 시스템은 "
+      "value": "Powered by "
     },
     {
       "type": 1,
       "value": "name"
-    },
-    {
-      "type": 0,
-      "value": "에서 구동되고 있습니다."
     }
   ],
   "label.previous": [
@@ -926,7 +898,7 @@
   "label.properties": [
     {
       "type": 0,
-      "value": "Properties"
+      "value": "속성"
     }
   ],
   "label.property": [
@@ -950,7 +922,7 @@
   "label.query-parameters": [
     {
       "type": 0,
-      "value": "쿼리 매개변수"
+      "value": "쿼리 매개 변수"
     }
   ],
   "label.realtime": [
@@ -974,7 +946,7 @@
   "label.refresh": [
     {
       "type": 0,
-      "value": "새로고침"
+      "value": "새로 고침"
     }
   ],
   "label.regenerate": [
@@ -1010,7 +982,7 @@
   "label.reports": [
     {
       "type": 0,
-      "value": "리포트"
+      "value": "보고서"
     }
   ],
   "label.required": [
@@ -1022,7 +994,7 @@
   "label.reset": [
     {
       "type": 0,
-      "value": "리셋"
+      "value": "초기화"
     }
   ],
   "label.reset-website": [
@@ -1046,19 +1018,19 @@
   "label.revenue": [
     {
       "type": 0,
-      "value": "Revenue"
+      "value": "수익"
     }
   ],
   "label.revenue-description": [
     {
       "type": 0,
-      "value": "Look into your revenue across time."
+      "value": "시간대별 수익을 살펴보세요."
     }
   ],
   "label.revenue-property": [
     {
       "type": 0,
-      "value": "Revenue Property"
+      "value": "수익 속성"
     }
   ],
   "label.role": [
@@ -1082,7 +1054,7 @@
   "label.screens": [
     {
       "type": 0,
-      "value": "스크린"
+      "value": "화면"
     }
   ],
   "label.search": [
@@ -1118,7 +1090,7 @@
   "label.session": [
     {
       "type": 0,
-      "value": "Session"
+      "value": "세션"
     }
   ],
   "label.sessions": [
@@ -1280,7 +1252,7 @@
   "label.total-records": [
     {
       "type": 0,
-      "value": "총 레코드"
+      "value": "전체 레코드"
     }
   ],
   "label.tracking-code": [
@@ -1292,7 +1264,7 @@
   "label.transactions": [
     {
       "type": 0,
-      "value": "Transactions"
+      "value": "거래"
     }
   ],
   "label.transfer": [
@@ -1328,13 +1300,13 @@
   "label.unique-visitors": [
     {
       "type": 0,
-      "value": "순방문자(UV)"
+      "value": "고유 방문자"
     }
   ],
   "label.uniqueCustomers": [
     {
       "type": 0,
-      "value": "Unique Customers"
+      "value": "고유 고객"
     }
   ],
   "label.unknown": [
@@ -1376,13 +1348,13 @@
   "label.user-property": [
     {
       "type": 0,
-      "value": "User Property"
+      "value": "사용자 속성"
     }
   ],
   "label.username": [
     {
       "type": 0,
-      "value": "사용자명"
+      "value": "사용자 이름"
     }
   ],
   "label.users": [
@@ -1418,7 +1390,7 @@
   "label.view-details": [
     {
       "type": 0,
-      "value": "상세보기"
+      "value": "자세히 보기"
     }
   ],
   "label.view-only": [
@@ -1430,13 +1402,13 @@
   "label.views": [
     {
       "type": 0,
-      "value": "조회수"
+      "value": "조회"
     }
   ],
   "label.views-per-visit": [
     {
       "type": 0,
-      "value": "방문당 조회수"
+      "value": "방문당 조회"
     }
   ],
   "label.visit-duration": [
@@ -1448,7 +1420,7 @@
   "label.visitors": [
     {
       "type": 0,
-      "value": "방문객"
+      "value": "방문자"
     }
   ],
   "label.visits": [
@@ -1498,17 +1470,21 @@
     },
     {
       "type": 0,
-      "value": "을(를) 입력하십시오."
+      "value": "을(를) 입력하세요."
     }
   ],
   "message.active-users": [
+    {
+      "type": 0,
+      "value": "현재 방문자 "
+    },
     {
       "type": 1,
       "value": "x"
     },
     {
       "type": 0,
-      "value": "명의 사용자가 보는 중입니다."
+      "value": "명"
     }
   ],
   "message.collected-data": [
@@ -1572,7 +1548,7 @@
   "message.error": [
     {
       "type": 0,
-      "value": "오류가 발생하였습니다."
+      "value": "오류가 발생했습니다."
     }
   ],
   "message.event-log": [
@@ -1598,19 +1574,19 @@
   "message.incorrect-username-password": [
     {
       "type": 0,
-      "value": "사용자 이름/비밀번호가 잘못되었습니다."
+      "value": "사용자 이름 또는 비밀번호를 잘못 입력했습니다."
     }
   ],
   "message.invalid-domain": [
     {
       "type": 0,
-      "value": "잘못된 도메인"
+      "value": "잘못된 도메인입니다. http/https를 포함하지 마세요."
     }
   ],
   "message.min-password-length": [
     {
       "type": 0,
-      "value": "최소 길이는 "
+      "value": "최소 "
     },
     {
       "type": 1,
@@ -1618,35 +1594,39 @@
     },
     {
       "type": 0,
-      "value": "자입니다"
+      "value": "자여야 합니다"
     }
   ],
   "message.new-version-available": [
     {
       "type": 0,
-      "value": "새 버전이 사용 가능합니다! - Umami "
+      "value": "Umami의 새 버전 "
     },
     {
       "type": 1,
       "value": "version"
+    },
+    {
+      "type": 0,
+      "value": "을(를) 사용할 수 있습니다!"
     }
   ],
   "message.no-data-available": [
     {
       "type": 0,
-      "value": "사용 가능한 데이터가 없습니다."
+      "value": "사용할 수 있는 데이터가 없습니다."
     }
   ],
   "message.no-event-data": [
     {
       "type": 0,
-      "value": "사용 가능한 이벤트 데이터가 없습니다."
+      "value": "사용할 수 있는 이벤트 데이터가 없습니다."
     }
   ],
   "message.no-match-password": [
     {
       "type": 0,
-      "value": "비밀번호가 일치하지 않음"
+      "value": "비밀번호가 일치하지 않습니다."
     }
   ],
   "message.no-results-found": [
@@ -1658,13 +1638,13 @@
   "message.no-team-websites": [
     {
       "type": 0,
-      "value": "이 팀에는 웹사이트가 없습니다."
+      "value": "팀에 웹사이트가 없습니다."
     }
   ],
   "message.no-teams": [
     {
       "type": 0,
-      "value": "생성된 팀이 없습니다."
+      "value": "만든 팀이 없습니다."
     }
   ],
   "message.no-users": [
@@ -1682,13 +1662,13 @@
   "message.page-not-found": [
     {
       "type": 0,
-      "value": "페이지를 찾을 수 없습니다."
+      "value": "페이지를 찾을 수 없음"
     }
   ],
   "message.reset-website": [
     {
       "type": 0,
-      "value": "이 웹사이트를 초기화하려면, 아래 상자에 "
+      "value": "이 웹사이트를 초기화하려면 아래 상자에 "
     },
     {
       "type": 1,
@@ -1696,7 +1676,7 @@
     },
     {
       "type": 0,
-      "value": "을(를) 입력하십시오."
+      "value": "을(를) 입력하세요."
     }
   ],
   "message.reset-website-warning": [
@@ -1708,7 +1688,7 @@
   "message.saved": [
     {
       "type": 0,
-      "value": "성공적으로 저장되었습니다."
+      "value": "저장했습니다."
     }
   ],
   "message.share-url": [
@@ -1720,7 +1700,7 @@
   "message.team-already-member": [
     {
       "type": 0,
-      "value": "이미 팀의 회원입니다."
+      "value": "이미 팀 멤버입니다."
     }
   ],
   "message.team-not-found": [
@@ -1732,13 +1712,13 @@
   "message.team-websites-info": [
     {
       "type": 0,
-      "value": "웹사이트는 팀의 누구나 볼 수 있습니다."
+      "value": "웹사이트는 팀 멤버 누구나 볼 수 있습니다."
     }
   ],
   "message.tracking-code": [
     {
       "type": 0,
-      "value": "이 웹사이트의 통계를 추적하려면, 다음 코드를 HTML의 "
+      "value": "이 웹사이트의 통계를 추적하려면 다음 코드를 HTML의 "
     },
     {
       "children": [
@@ -1752,7 +1732,7 @@
     },
     {
       "type": 0,
-      "value": " 섹션에 추가하십시오."
+      "value": " 부분에 추가하세요."
     }
   ],
   "message.transfer-team-website-to-user": [
@@ -1764,7 +1744,7 @@
   "message.transfer-user-website-to-team": [
     {
       "type": 0,
-      "value": "이 웹사이트를 전송받을 팀을 선택하십시오."
+      "value": "이 웹사이트를 전송받을 팀을 선택하세요."
     }
   ],
   "message.transfer-website": [
@@ -1782,53 +1762,53 @@
   "message.user-deleted": [
     {
       "type": 0,
-      "value": "사용자가 삭제되었습니다."
+      "value": "사용자를 삭제했습니다."
     }
   ],
   "message.viewed-page": [
     {
       "type": 0,
-      "value": "페이지 조회"
+      "value": "조회한 페이지"
     }
   ],
   "message.visitor-log": [
     {
       "type": 1,
-      "value": "country"
+      "value": "os"
     },
     {
       "type": 0,
-      "value": "의 "
+      "value": " "
     },
     {
       "type": 1,
-      "value": "browser"
+      "value": "device"
     },
     {
       "type": 0,
-      "value": " 브라우저를 사용하는 "
+      "value": "에서 "
     },
     {
       "type": 1,
-      "value": "os"
+      "value": "browser"
     },
     {
       "type": 0,
-      "value": " "
+      "value": "을(를) 사용하는 "
     },
     {
       "type": 1,
-      "value": "device"
+      "value": "country"
     },
     {
       "type": 0,
-      "value": " 방문자"
+      "value": "의 방문자"
     }
   ],
   "message.visitors-dropped-off": [
     {
       "type": 0,
-      "value": "방문자가 이탈했습니다"
+      "value": "방문자 이탈함"
     }
   ]
 }

From ed5ff81684b971671e4b12365c19e2c4abe90148 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 27 Aug 2024 16:24:03 -0700
Subject: [PATCH 336/438] Bump version v2.13.2.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c8ed652193..c1aaf410e7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "2.13.1",
+  "version": "2.13.2",
   "description": "A simple, fast, privacy-focused alternative to Google Analytics.",
   "author": "Umami Software, Inc. <hello@umami.is>",
   "license": "MIT",

From b89fb0a9627455d54964970f4fcef4b3dcb95394 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 27 Aug 2024 16:28:03 -0700
Subject: [PATCH 337/438] Fix autofocus on events page

---
 .../(main)/websites/[websiteId]/events/EventsDataTable.tsx    | 2 +-
 src/components/common/DataTable.tsx                           | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx
index 49b31656d3..32eb985c61 100644
--- a/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx
+++ b/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx
@@ -13,7 +13,7 @@ export default function EventsDataTable({
   const queryResult = useWebsiteEvents(websiteId);
 
   return (
-    <DataTable queryResult={queryResult} allowSearch={true}>
+    <DataTable queryResult={queryResult} allowSearch={true} autoFocus={false}>
       {({ data }) => <EventsTable data={data} />}
     </DataTable>
   );
diff --git a/src/components/common/DataTable.tsx b/src/components/common/DataTable.tsx
index 22373f608e..d2094329b0 100644
--- a/src/components/common/DataTable.tsx
+++ b/src/components/common/DataTable.tsx
@@ -15,6 +15,7 @@ export interface DataTableProps {
   searchDelay?: number;
   allowSearch?: boolean;
   allowPaging?: boolean;
+  autoFocus?: boolean;
   renderEmpty?: () => ReactNode;
   children: ReactNode | ((data: any) => ReactNode);
 }
@@ -24,6 +25,7 @@ export function DataTable({
   searchDelay = 600,
   allowSearch = true,
   allowPaging = true,
+  autoFocus = true,
   renderEmpty,
   children,
 }: DataTableProps) {
@@ -57,7 +59,7 @@ export function DataTable({
           value={query}
           onSearch={handleSearch}
           delay={searchDelay || DEFAULT_SEARCH_DELAY}
-          autoFocus={true}
+          autoFocus={autoFocus}
           placeholder={formatMessage(labels.search)}
         />
       )}

From ff0c825a7bca7adaad0bc492ab3d910703b8f3a2 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 27 Aug 2024 17:07:43 -0700
Subject: [PATCH 338/438] fix retention report dates and days

---
 src/app/(main)/reports/retention/RetentionTable.tsx | 2 +-
 src/queries/analytics/reports/getRetention.ts       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/(main)/reports/retention/RetentionTable.tsx b/src/app/(main)/reports/retention/RetentionTable.tsx
index acc9c052b8..6d825567d4 100644
--- a/src/app/(main)/reports/retention/RetentionTable.tsx
+++ b/src/app/(main)/reports/retention/RetentionTable.tsx
@@ -58,7 +58,7 @@ export function RetentionTable({ days = DAYS }) {
                 if (totalDays - rowIndex < day) {
                   return null;
                 }
-                const percentage = records[day]?.percentage;
+                const percentage = records.filter(a => a.day === day)[0]?.percentage;
                 return (
                   <div
                     key={day}
diff --git a/src/queries/analytics/reports/getRetention.ts b/src/queries/analytics/reports/getRetention.ts
index eb184e1806..d69a77d7bf 100644
--- a/src/queries/analytics/reports/getRetention.ts
+++ b/src/queries/analytics/reports/getRetention.ts
@@ -110,7 +110,7 @@ async function clickhouseQuery(
   }[]
 > {
   const { startDate, endDate, timezone = 'UTC' } = filters;
-  const { getDateSQL, getDateStringSQL, rawQuery } = clickhouse;
+  const { getDateSQL, rawQuery } = clickhouse;
   const unit = 'day';
 
   return rawQuery(
@@ -152,7 +152,7 @@ async function clickhouseQuery(
       group by 1, 2
     )
     select
-      ${getDateStringSQL('c.cohort_date', unit)} as date,
+      c.cohort_date as date,
       c.day_number as day,
       s.visitors as visitors,
       c.visitors returnVisitors,

From d80739a203f846f9cea12f0a605612620dd018af Mon Sep 17 00:00:00 2001
From: Minseo Lee <itoupluk427@gmail.com>
Date: Wed, 28 Aug 2024 09:35:16 +0900
Subject: [PATCH 339/438] Remove `locale.css`

---
 src/app/layout.tsx    |  1 -
 src/styles/locale.css | 29 -----------------------------
 2 files changed, 30 deletions(-)
 delete mode 100644 src/styles/locale.css

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 92285c63dd..999cea0321 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -4,7 +4,6 @@ import '@fontsource/inter/400.css';
 import '@fontsource/inter/700.css';
 import '@fontsource/inter/800.css';
 import 'react-basics/dist/styles.css';
-import 'styles/locale.css';
 import 'styles/index.css';
 import 'styles/variables.css';
 
diff --git a/src/styles/locale.css b/src/styles/locale.css
deleted file mode 100644
index dddf495b6a..0000000000
--- a/src/styles/locale.css
+++ /dev/null
@@ -1,29 +0,0 @@
-.zh-CN {
-  font-family: '方体', 'PingFang SC', '黑体', 'Heiti SC', 'Microsoft JhengHei UI',
-    'Microsoft JhengHei', Roboto, Noto, 'Noto Sans CJK SC', sans-serif !important;
-}
-
-.zh-TW {
-  font-family: '方體', 'PingFang TC', '黑體', 'Heiti TC', 'Microsoft JhengHei UI',
-    'Microsoft JhengHei', Roboto, Noto, 'Noto Sans CJK TC', sans-serif !important;
-}
-
-.ja-JP {
-  font-family: '游ゴシック体', YuGothic, 'ヒラギノ丸ゴ', 'Hiragino Sans', 'Yu Gothic UI',
-    'Meiryo UI', 'MS Gothic', Roboto, Noto, 'Noto Sans CJK JP', sans-serif !important;
-}
-
-.ko-KR {
-  font-family: 'Nanum Gothic', 'Apple SD Gothic Neo', 'Malgun Gothic', Roboto, Noto,
-    'Noto Sans CJK KR', sans-serif !important;
-}
-
-.ar-SA {
-  font-family: 'Geeza Pro', 'Arabic Typesetting', Roboto, Noto, 'Noto Naskh Arabic',
-    'Times New Roman', serif !important;
-}
-
-.he-IL {
-  font-family: 'New Peninim MT', 'Arial Hebrew', Gisha, 'Times New Roman', Roboto, Noto,
-    'Noto Sans Hebrew', sans-serif !important;
-}

From d7734d0493bbb0451270695d8939fd6e548b6c32 Mon Sep 17 00:00:00 2001
From: Minseo Lee <itoupluk427@gmail.com>
Date: Wed, 28 Aug 2024 10:13:11 +0900
Subject: [PATCH 340/438] Remove className locale

---
 src/components/input/LanguageButton.tsx   | 4 ++--
 src/components/metrics/CountriesTable.tsx | 7 +------
 src/components/metrics/LanguagesTable.tsx | 2 +-
 src/components/metrics/Legend.tsx         | 5 +----
 src/components/metrics/RegionsTable.tsx   | 2 +-
 5 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/components/input/LanguageButton.tsx b/src/components/input/LanguageButton.tsx
index fcaa4046ee..5da3bf7845 100644
--- a/src/components/input/LanguageButton.tsx
+++ b/src/components/input/LanguageButton.tsx
@@ -1,4 +1,4 @@
-import { Icon, Button, PopupTrigger, Popup, Text } from 'react-basics';
+import { Icon, Button, PopupTrigger, Popup } from 'react-basics';
 import classNames from 'classnames';
 import { languages } from 'lib/lang';
 import { useLocale } from 'components/hooks';
@@ -33,7 +33,7 @@ export function LanguageButton() {
                     className={classNames(styles.item, { [styles.selected]: value === locale })}
                     onClick={(e: any) => handleSelect(value, close, e)}
                   >
-                    <Text>{label}</Text>
+                    <span lang={value}>{label}</span>
                     {value === locale && (
                       <Icon className={styles.icon}>
                         <Icons.Check />
diff --git a/src/components/metrics/CountriesTable.tsx b/src/components/metrics/CountriesTable.tsx
index 592ade8a0d..c1fc28318c 100644
--- a/src/components/metrics/CountriesTable.tsx
+++ b/src/components/metrics/CountriesTable.tsx
@@ -12,12 +12,7 @@ export function CountriesTable({ ...props }: MetricsTableProps) {
 
   const renderLink = ({ x: code }) => {
     return (
-      <FilterLink
-        id="country"
-        className={locale}
-        value={countryNames[code] && code}
-        label={formatCountry(code)}
-      >
+      <FilterLink id="country" value={countryNames[code] && code} label={formatCountry(code)}>
         <TypeIcon type="country" value={code?.toLowerCase()} />
       </FilterLink>
     );
diff --git a/src/components/metrics/LanguagesTable.tsx b/src/components/metrics/LanguagesTable.tsx
index 67b6e62237..f4b0b50386 100644
--- a/src/components/metrics/LanguagesTable.tsx
+++ b/src/components/metrics/LanguagesTable.tsx
@@ -13,7 +13,7 @@ export function LanguagesTable({
   const languageNames = useLanguageNames(locale);
 
   const renderLabel = ({ x }) => {
-    return <div className={locale}>{languageNames[x?.split('-')[0]] ?? x}</div>;
+    return languageNames[x?.split('-')[0]] ?? x;
   };
 
   return (
diff --git a/src/components/metrics/Legend.tsx b/src/components/metrics/Legend.tsx
index c7ef1022b0..4ebcf4b440 100644
--- a/src/components/metrics/Legend.tsx
+++ b/src/components/metrics/Legend.tsx
@@ -3,7 +3,6 @@ import { safeDecodeURIComponent } from 'next-basics';
 import { colord } from 'colord';
 import classNames from 'classnames';
 import { LegendItem } from 'chart.js/auto';
-import { useLocale } from 'components/hooks';
 import styles from './Legend.module.css';
 
 export function Legend({
@@ -13,8 +12,6 @@ export function Legend({
   items: any[];
   onClick: (index: LegendItem) => void;
 }) {
-  const { locale } = useLocale();
-
   if (!items.find(({ text }) => text)) {
     return null;
   }
@@ -32,7 +29,7 @@ export function Legend({
             onClick={() => onClick(item)}
           >
             <StatusLight color={color.alpha(color.alpha() + 0.2).toHex()}>
-              <span className={locale}>{safeDecodeURIComponent(text)}</span>
+              {safeDecodeURIComponent(text)}
             </StatusLight>
           </div>
         );
diff --git a/src/components/metrics/RegionsTable.tsx b/src/components/metrics/RegionsTable.tsx
index 215551af8b..b4071f50ec 100644
--- a/src/components/metrics/RegionsTable.tsx
+++ b/src/components/metrics/RegionsTable.tsx
@@ -11,7 +11,7 @@ export function RegionsTable(props: MetricsTableProps) {
 
   const renderLink = ({ x: code, country }) => {
     return (
-      <FilterLink id="region" className={locale} value={code} label={getRegionName(code, country)}>
+      <FilterLink id="region" value={code} label={getRegionName(code, country)}>
         <TypeIcon type="country" value={country?.toLowerCase()} />
       </FilterLink>
     );

From 13c7dd6aa8ec3d2e495780e6ce87e35adf824209 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 27 Aug 2024 21:33:46 -0700
Subject: [PATCH 341/438] add cascading delete to sessionData

---
 src/queries/prisma/user.ts    | 3 +++
 src/queries/prisma/website.ts | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/src/queries/prisma/user.ts b/src/queries/prisma/user.ts
index 9b471787e4..0c8e3520de 100644
--- a/src/queries/prisma/user.ts
+++ b/src/queries/prisma/user.ts
@@ -171,6 +171,9 @@ export async function deleteUser(
     client.eventData.deleteMany({
       where: { websiteId: { in: websiteIds } },
     }),
+    client.sessionData.deleteMany({
+      where: { websiteId: { in: websiteIds } },
+    }),
     client.websiteEvent.deleteMany({
       where: { websiteId: { in: websiteIds } },
     }),
diff --git a/src/queries/prisma/website.ts b/src/queries/prisma/website.ts
index 0814a137b6..c24cdd0d23 100644
--- a/src/queries/prisma/website.ts
+++ b/src/queries/prisma/website.ts
@@ -164,6 +164,9 @@ export async function resetWebsite(
     client.eventData.deleteMany({
       where: { websiteId },
     }),
+    client.sessionData.deleteMany({
+      where: { websiteId },
+    }),
     client.websiteEvent.deleteMany({
       where: { websiteId },
     }),
@@ -195,6 +198,9 @@ export async function deleteWebsite(
     client.eventData.deleteMany({
       where: { websiteId },
     }),
+    client.sessionData.deleteMany({
+      where: { websiteId },
+    }),
     client.websiteEvent.deleteMany({
       where: { websiteId },
     }),

From 8f786d6d278f29f81e8eba04f6117e36b87c3068 Mon Sep 17 00:00:00 2001
From: Konstantin Tutsch <mail@konstantintutsch.com>
Date: Wed, 28 Aug 2024 07:32:33 +0200
Subject: [PATCH 342/438] Increase consistency of German translation on Events
 screen

---
 src/lang/de-DE.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lang/de-DE.json b/src/lang/de-DE.json
index dfbb9a47e0..ad822b04f2 100644
--- a/src/lang/de-DE.json
+++ b/src/lang/de-DE.json
@@ -271,7 +271,7 @@
   "message.transfer-team-website-to-user": "Diese Website zu Ihrem Account transferieren?",
   "message.transfer-user-website-to-team": "Wählen Sie ein Team aus, zu dem die Website transferiert werden soll.",
   "message.transfer-website": "Übertragen Sie die Eigentümerrechte zu Ihrem Account oder einem anderen Team.",
-  "message.triggered-event": "Ausgelöstes Ereigniss",
+  "message.triggered-event": "Ereigniss ausgelöst",
   "message.user-deleted": "Benutzer gelöscht.",
   "message.viewed-page": "Seite besucht",
   "message.visitor-log": "Besucher aus {country} benutzt {browser} auf {os} {device}",

From 4ecd2afb51efd2c8b6d175e9bab10fd47711c6c4 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 27 Aug 2024 22:53:28 -0700
Subject: [PATCH 343/438] Added build for cloud.

---
 .github/workflows/cd-cloud.yml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 .github/workflows/cd-cloud.yml

diff --git a/.github/workflows/cd-cloud.yml b/.github/workflows/cd-cloud.yml
new file mode 100644
index 0000000000..e0b4ed5746
--- /dev/null
+++ b/.github/workflows/cd-cloud.yml
@@ -0,0 +1,30 @@
+name: Create docker images
+
+on:
+  push:
+    branches:
+      - analytics
+
+jobs:
+  build:
+    name: Build, push, and deploy
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Generate random hash
+        id: random_hash
+        run: echo "hash=$(openssl rand -hex 4)" >> $GITHUB_OUTPUT
+
+      - uses: mr-smithers-excellent/docker-build-push@v6
+        name: Build & push Docker image to ghcr.io
+        with:
+          image: umami
+          tags: cloud-${{ steps.random_hash.outputs.hash }}, cloud-latest
+          buildArgs: DATABASE_TYPE=postgresql
+          registry: ghcr.io
+          multiPlatform: true
+          platform: linux/amd64,linux/arm64
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}

From 2de8632ae04e7dfe5d17e5541a5c3da86e0adf24 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 27 Aug 2024 23:02:28 -0700
Subject: [PATCH 344/438] Updated cloud build.

---
 .github/workflows/cd-cloud.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cd-cloud.yml b/.github/workflows/cd-cloud.yml
index e0b4ed5746..95bb092764 100644
--- a/.github/workflows/cd-cloud.yml
+++ b/.github/workflows/cd-cloud.yml
@@ -25,6 +25,6 @@ jobs:
           buildArgs: DATABASE_TYPE=postgresql
           registry: ghcr.io
           multiPlatform: true
-          platform: linux/amd64,linux/arm64
+          platform: linux/amd64
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}

From bd728682d24d7fb4a8f7968bd7c944b68b127bc6 Mon Sep 17 00:00:00 2001
From: Minseo Lee <itoupluk427@gmail.com>
Date: Wed, 28 Aug 2024 16:31:42 +0900
Subject: [PATCH 345/438] Update RealtimeCountries.tsx

---
 .../(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx
index ae4967dab9..5166344101 100644
--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx
+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx
@@ -12,7 +12,7 @@ export function RealtimeCountries({ data }) {
 
   const renderCountryName = useCallback(
     ({ x: code }) => (
-      <span className={classNames(locale, styles.row)}>
+      <span className={classNames(styles.row)}>
         <TypeIcon type="country" value={code?.toLowerCase()} />
         {countryNames[code]}
       </span>

From 330f3e235035da0d65259faae28441ecfefb2f7d Mon Sep 17 00:00:00 2001
From: Minseo Lee <itoupluk427@gmail.com>
Date: Thu, 29 Aug 2024 21:37:24 +0900
Subject: [PATCH 346/438] Update ko-KR.json

---
 src/lang/ko-KR.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lang/ko-KR.json b/src/lang/ko-KR.json
index 07494d93f9..933e2883b6 100644
--- a/src/lang/ko-KR.json
+++ b/src/lang/ko-KR.json
@@ -160,7 +160,7 @@
   "label.reset": "초기화",
   "label.reset-website": "웹사이트 초기화",
   "label.retention": "리텐션",
-  "label.retention-description": "사용자가 얼마나 자주 돌아오는지를 추적하여 웹사이트의 리텐션을 측정하십시오.",
+  "label.retention-description": "사용자가 얼마나 자주 돌아오는지를 추적하여 웹사이트의 리텐션을 측정하세요.",
   "label.revenue": "수익",
   "label.revenue-description": "시간대별 수익을 살펴보세요.",
   "label.revenue-property": "수익 속성",
@@ -220,14 +220,14 @@
   "label.username": "사용자 이름",
   "label.users": "사용자",
   "label.utm": "UTM",
-  "label.utm-description": "UTM 매개변수를 통해 캠페인을 추적합니다.",
+  "label.utm-description": "UTM 매개변수를 통해 캠페인을 추적하세요.",
   "label.value": "값",
   "label.view": "보기",
   "label.view-details": "자세히 보기",
   "label.view-only": "보기 전용",
   "label.views": "조회",
   "label.views-per-visit": "방문당 조회",
-  "label.visit-duration": "평균 방문 시간",
+  "label.visit-duration": "방문 시간",
   "label.visitors": "방문자",
   "label.visits": "방문",
   "label.website": "웹사이트",
@@ -244,7 +244,7 @@
   "message.confirm-reset": "{target}을(를) 초기화하시겠습니까?",
   "message.delete-team-warning": "팀을 삭제하면 팀에 등록된 모든 웹사이트도 삭제됩니다.",
   "message.delete-website-warning": "관련된 모든 데이터가 삭제됩니다.",
-  "message.error": "오류가 발생했습니다.",
+  "message.error": "문제가 발생했습니다.",
   "message.event-log": "{event} - {url}",
   "message.go-to-settings": "설정으로 이동",
   "message.incorrect-username-password": "사용자 이름 또는 비밀번호를 잘못 입력했습니다.",

From bfe15e9f0ef69772d9230cd77500794defbeb83c Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Mon, 2 Sep 2024 21:17:08 -0700
Subject: [PATCH 347/438] Push cloud image to docker.io instead.

---
 .github/workflows/cd-cloud.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/cd-cloud.yml b/.github/workflows/cd-cloud.yml
index 95bb092764..386a6ce036 100644
--- a/.github/workflows/cd-cloud.yml
+++ b/.github/workflows/cd-cloud.yml
@@ -18,13 +18,11 @@ jobs:
         run: echo "hash=$(openssl rand -hex 4)" >> $GITHUB_OUTPUT
 
       - uses: mr-smithers-excellent/docker-build-push@v6
-        name: Build & push Docker image to ghcr.io
+        name: Build & push Docker image to docker.io
         with:
-          image: umami
+          image: umamisoftware/umami
           tags: cloud-${{ steps.random_hash.outputs.hash }}, cloud-latest
           buildArgs: DATABASE_TYPE=postgresql
-          registry: ghcr.io
-          multiPlatform: true
-          platform: linux/amd64
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          registry: docker.io
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}

From 2d21260f3778c8f9e6ab43e933b920905ab2aed5 Mon Sep 17 00:00:00 2001
From: Quadrubo <71718414+Quadrubo@users.noreply.github.com>
Date: Wed, 4 Sep 2024 14:53:59 +0200
Subject: [PATCH 348/438] feat: major and minor tags on docker build

---
 .github/workflows/cd-manual.yml | 19 +++++++++++++++++--
 .github/workflows/cd.yml        | 14 ++++++++++----
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cd-manual.yml b/.github/workflows/cd-manual.yml
index ac701fcc50..1f8651fa29 100644
--- a/.github/workflows/cd-manual.yml
+++ b/.github/workflows/cd-manual.yml
@@ -20,11 +20,26 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Extract version parts from input
+        id: extract_version
+        run: |
+          echo "version=$(echo ${{ github.event.inputs.version }})" >> $GITHUB_ENV
+          echo "major=$(echo ${{ github.event.inputs.version }} | cut -d. -f1)" >> $GITHUB_ENV
+          echo "minor=$(echo ${{ github.event.inputs.version }} | cut -d. -f2)" >> $GITHUB_ENV
+
+      - name: Generate tags
+        id: generate_tags
+        run: |
+          echo "tag_major=$(echo ${{ matrix.db-type }}-${{ env.major }})" >> $GITHUB_ENV
+          echo "tag_minor=$(echo ${{ matrix.db-type }}-${{ env.major }}.${{ env.minor }})" >> $GITHUB_ENV
+          echo "tag_patch=$(echo ${{ matrix.db-type }}-${{ env.version }})" >> $GITHUB_ENV
+          echo "tag_latest=$(echo ${{ matrix.db-type }}-latest)" >> $GITHUB_ENV
+
       - uses: mr-smithers-excellent/docker-build-push@v6
         name: Build & push Docker image to ghcr.io for ${{ matrix.db-type }}
         with:
           image: umami
-          tags: ${{ matrix.db-type }}-${{ inputs.version }}, ${{ matrix.db-type }}-latest
+          tags: ${{ env.tag_major }}, ${{ env.tag_minor }}, ${{ env.tag_patch }}, ${{ env.tag_latest }}
           buildArgs: DATABASE_TYPE=${{ matrix.db-type }}
           registry: ghcr.io
           multiPlatform: true
@@ -36,7 +51,7 @@ jobs:
         name: Build & push Docker image to docker.io for ${{ matrix.db-type }}
         with:
           image: umamisoftware/umami
-          tags: ${{ matrix.db-type }}-${{ inputs.version }}, ${{ matrix.db-type }}-latest
+          tags: ${{ env.tag_major }}, ${{ env.tag_minor }}, ${{ env.tag_patch }}, ${{ env.tag_latest }}
           buildArgs: DATABASE_TYPE=${{ matrix.db-type }}
           registry: docker.io
           username: ${{ secrets.DOCKER_USERNAME }}
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index b4de549922..f67f51c385 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -17,14 +17,21 @@ jobs:
 
       - name: Set env
         run: |
-          echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
           echo "NOW=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
+          
+      - name: Generate tags
+        id: generate_tags
+        run: |
+          echo "tag_patch=$(echo ${{ matrix.db-type }})-${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+          echo "tag_minor=$(echo ${{ matrix.db-type }})-$(echo ${GITHUB_REF#refs/tags/} | cut -d. -f1,2)" >> $GITHUB_ENV
+          echo "tag_major=$(echo ${{ matrix.db-type }})-$(echo ${GITHUB_REF#refs/tags/} | cut -d. -f1)" >> $GITHUB_ENV
+          echo "tag_latest=$(echo ${{ matrix.db-type }})-latest" >> $GITHUB_ENV
 
       - uses: mr-smithers-excellent/docker-build-push@v6
         name: Build & push Docker image to ghcr.io for ${{ matrix.db-type }}
         with:
           image: umami
-          tags: ${{ matrix.db-type }}-${{ env.RELEASE_VERSION }}, ${{ matrix.db-type }}-latest
+          tags: ${{ env.tag_major }}, ${{ env.tag_minor }}, ${{ env.tag_patch }}, ${{ env.tag_latest }}
           buildArgs: DATABASE_TYPE=${{ matrix.db-type }}
           registry: ghcr.io
           multiPlatform: true
@@ -32,12 +39,11 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-
       - uses: mr-smithers-excellent/docker-build-push@v6
         name: Build & push Docker image to docker.io for ${{ matrix.db-type }}
         with:
           image: umamisoftware/umami
-          tags: ${{ matrix.db-type }}-${{ env.RELEASE_VERSION }}, ${{ matrix.db-type }}-latest
+          tags: ${{ env.tag_major }}, ${{ env.tag_minor }}, ${{ env.tag_patch }}, ${{ env.tag_latest }}
           buildArgs: DATABASE_TYPE=${{ matrix.db-type }}
           registry: docker.io
           username: ${{ secrets.DOCKER_USERNAME }}

From 89fee63990a68d60b1cf9542dbf907509b775bff Mon Sep 17 00:00:00 2001
From: robertsilen <robert.silen@iki.fi>
Date: Thu, 5 Sep 2024 09:19:46 +0300
Subject: [PATCH 349/438] add MariaDB to README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 33a5aac39a..2c46b6263e 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ A detailed getting started guide can be found at [umami.is/docs](https://umami.i
 ### Requirements
 
 - A server with Node.js version 16.13 or newer
-- A database. Umami supports [MySQL](https://www.mysql.com/) (minimum v8.0) and [PostgreSQL](https://www.postgresql.org/) (minimum v12.14) databases.
+- A database. Umami supports [MariaDB](https://www.mariadb.org/) (minimum v10.5), [MySQL](https://www.mysql.com/) (minimum v8.0) and [PostgreSQL](https://www.postgresql.org/) (minimum v12.14) databases.
 
 ### Install Yarn
 

From f2f77a050de28376433b8ca618c60daa0d31ea49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=95=D0=B3=D0=BE=D1=80?=
 <57842677+xuserz@users.noreply.github.com>
Date: Thu, 5 Sep 2024 16:02:03 +0300
Subject: [PATCH 350/438] Update ru-RU.json

Updated and translated all remaining text
---
 src/lang/ru-RU.json | 258 ++++++++++++++++++++++----------------------
 1 file changed, 129 insertions(+), 129 deletions(-)

diff --git a/src/lang/ru-RU.json b/src/lang/ru-RU.json
index f483522a97..745f2179b6 100644
--- a/src/lang/ru-RU.json
+++ b/src/lang/ru-RU.json
@@ -2,194 +2,194 @@
   "label.access-code": "Код доступа",
   "label.actions": "Действия",
   "label.activity": "Журнал активности",
-  "label.add": "Add",
-  "label.add-description": "Add description",
-  "label.add-member": "Add member",
-  "label.add-step": "Add step",
+  "label.add": "Добавить",
+  "label.add-description": "Добавить описание",
+  "label.add-member": "Добавить участника",
+  "label.add-step": "Добавить шаг",
   "label.add-website": "Добавить сайт",
   "label.admin": "Администратор",
-  "label.after": "After",
+  "label.after": "После",
   "label.all": "Все",
   "label.all-time": "Все время",
   "label.analytics": "Аналитика",
-  "label.average": "Average",
+  "label.average": "Средний",
   "label.back": "Назад",
-  "label.before": "Before",
+  "label.before": "До",
   "label.bounce-rate": "Отказы",
-  "label.breakdown": "Breakdown",
-  "label.browser": "Browser",
+  "label.breakdown": "Авария",
+  "label.browser": "Браузер",
   "label.browsers": "Браузеры",
   "label.cancel": "Отменить",
   "label.change-password": "Изменить пароль",
   "label.cities": "Города",
-  "label.city": "City",
+  "label.city": "Город",
   "label.clear-all": "Очистить все",
-  "label.compare": "Compare",
+  "label.compare": "Сравнить",
   "label.confirm": "Подтвердить",
   "label.confirm-password": "Подтвердить пароль",
-  "label.contains": "Contains",
+  "label.contains": "Содержит",
   "label.continue": "Продолжить",
-  "label.count": "Count",
+  "label.count": "Считать",
   "label.countries": "Страны",
-  "label.country": "Country",
-  "label.create": "Create",
-  "label.create-report": "Create report",
+  "label.country": "Страна",
+  "label.create": "Создать",
+  "label.create-report": "Создать отчет",
   "label.create-team": "Создать команду",
   "label.create-user": "Создать пользователя",
   "label.created": "Создано",
-  "label.created-by": "Created By",
-  "label.current": "Current",
+  "label.created-by": "Создано",
+  "label.current": "Текущий",
   "label.current-password": "Текущий пароль",
   "label.custom-range": "Другой период",
   "label.dashboard": "Информационная панель",
   "label.data": "Данные",
-  "label.date": "Date",
+  "label.date": "Дата",
   "label.date-range": "Диапазон дат",
-  "label.day": "Day",
+  "label.day": "День",
   "label.default-date-range": "Диапазон дат по-умолчанию",
   "label.delete": "Удалить",
-  "label.delete-report": "Delete report",
+  "label.delete-report": "Удалить отчет",
   "label.delete-team": "Удалить команду",
   "label.delete-user": "Удалить пользователя",
   "label.delete-website": "Удалить сайт",
-  "label.description": "Description",
+  "label.description": "Описание",
   "label.desktop": "Настольный компьютер",
   "label.details": "Подробности",
-  "label.device": "Device",
+  "label.device": "Устройство",
   "label.devices": "Устройства",
   "label.dismiss": "Отклонить",
-  "label.does-not-contain": "Does not contain",
+  "label.does-not-contain": "Не содержит",
   "label.domain": "Домен",
-  "label.dropoff": "Dropoff",
+  "label.dropoff": "Высадка",
   "label.edit": "Изменить",
   "label.edit-dashboard": "Редактировать дашборд",
-  "label.edit-member": "Edit member",
+  "label.edit-member": "Редактировать участника",
   "label.enable-share-url": "Разрешить делиться ссылкой",
-  "label.end-step": "End Step",
-  "label.entry": "Entry URL",
-  "label.event": "Event",
-  "label.event-data": "Event data",
+  "label.end-step": "Конечный шаг",
+  "label.entry": "URL-адрес входа",
+  "label.event": "Событие",
+  "label.event-data": "Данные о событии",
   "label.events": "События",
-  "label.exit": "Exit URL",
-  "label.false": "False",
-  "label.field": "Field",
-  "label.fields": "Fields",
-  "label.filter": "Filter",
+  "label.exit": "URL-адрес выхода",
+  "label.false": "Ложь",
+  "label.field": "Поле",
+  "label.fields": "Поля",
+  "label.filter": "Фильтр",
   "label.filter-combined": "Объединенные",
   "label.filter-raw": "Сырые данные",
-  "label.filters": "Filters",
-  "label.first-seen": "First seen",
-  "label.funnel": "Funnel",
-  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
-  "label.goal": "Goal",
-  "label.goals": "Goals",
-  "label.goals-description": "Track your goals for pageviews and events.",
-  "label.greater-than": "Greater than",
-  "label.greater-than-equals": "Greater than or equals",
+  "label.filters": "Фильтры",
+  "label.first-seen": "Первый вход",
+  "label.funnel": "Воронка",
+  "label.funnel-description": "Изучите коэффициент конверсии и ухода пользователей.",
+  "label.goal": "Цель",
+  "label.goals": "Цели",
+  "label.goals-description": "Отслеживайте свои цели по просмотрам страниц и событиям.",
+  "label.greater-than": "Больше, чем",
+  "label.greater-than-equals": "Больше или равно",
   "label.host": "Host",
   "label.hosts": "Hosts",
-  "label.insights": "Insights",
-  "label.insights-description": "Dive deeper into your data by using segments and filters.",
-  "label.is": "Is",
-  "label.is-not": "Is not",
-  "label.is-not-set": "Is not set",
-  "label.is-set": "Is set",
+  "label.insights": "Информация",
+  "label.insights-description": "Погрузитесь глубже в свои данные с помощью сегментов и фильтров.",
+  "label.is": "Является",
+  "label.is-not": "Не установлен",
+  "label.is-not-set": "Не установлено",
+  "label.is-set": "Установлен",
   "label.join": "Присоединиться",
   "label.join-team": "Присоединиться к команде",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users navigate through your website.",
+  "label.journey-description": "Поймите, как пользователи перемещаются по вашему сайту.",
   "label.language": "Язык",
   "label.languages": "Языки",
   "label.laptop": "Ноутбук",
   "label.last-days": "Последние {x} дней",
   "label.last-hours": "Последние {x} часа",
-  "label.last-months": "Last {x} months",
-  "label.last-seen": "Last seen",
+  "label.last-months": "Последние {x} месяцев",
+  "label.last-seen": "Последний вход",
   "label.leave": "Уйти",
   "label.leave-team": "Покинуть команду",
-  "label.less-than": "Less than",
-  "label.less-than-equals": "Less than or equals",
+  "label.less-than": "Меньше, чем",
+  "label.less-than-equals": "Меньше или равно",
   "label.login": "Войти",
   "label.logout": "Выйти",
-  "label.manage": "Manage",
-  "label.manager": "Manager",
-  "label.max": "Max",
-  "label.member": "Member",
+  "label.manage": "Управление",
+  "label.manager": "Менеджер",
+  "label.max": "Максимум",
+  "label.member": "Участник",
   "label.members": "Участники",
-  "label.min": "Min",
+  "label.min": "Минимум",
   "label.mobile": "Смартфон",
   "label.more": "Больше",
-  "label.my-account": "My account",
-  "label.my-websites": "My websites",
+  "label.my-account": "Мой профиль",
+  "label.my-websites": "Мои сайты",
   "label.name": "Имя",
   "label.new-password": "Новый пароль",
   "label.none": "Не указано",
-  "label.number-of-records": "{x} {x, plural, one {record} other {records}}",
+  "label.number-of-records": "{x} {x, множественное число, один {запись} другие {записи}}",
   "label.ok": "OK",
   "label.os": "OS",
-  "label.overview": "Overview",
+  "label.overview": "Обзор",
   "label.owner": "Владелец",
-  "label.page-of": "Page {current} of {total}",
+  "label.page-of": "Страница {current} из {total}",
   "label.page-views": "Просмотры страниц",
-  "label.pageTitle": "Page title",
+  "label.pageTitle": "Название страницы",
   "label.pages": "Страницы",
   "label.password": "Пароль",
-  "label.path": "Path",
-  "label.paths": "Paths",
+  "label.path": "Путь",
+  "label.paths": "Пути",
   "label.powered-by": "На движке {name}",
-  "label.previous": "Previous",
-  "label.previous-period": "Previous period",
-  "label.previous-year": "Previous year",
+  "label.previous": "Предыдущий",
+  "label.previous-period": "Предыдущий период",
+  "label.previous-year": "Предыдущий год",
   "label.profile": "Профиль",
-  "label.properties": "Properties",
-  "label.property": "Property",
+  "label.properties": "Свойства",
+  "label.property": "Свойство",
   "label.queries": "Запросы",
-  "label.query": "Query",
+  "label.query": "Запрос",
   "label.query-parameters": "Параметры запроса",
   "label.realtime": "Реальное время",
-  "label.referrer": "Referrer",
+  "label.referrer": "Реферер",
   "label.referrers": "Источники",
   "label.refresh": "Обновить",
   "label.regenerate": "Обновить",
-  "label.region": "Region",
+  "label.region": "Регион",
   "label.regions": "Регионы",
   "label.remove": "Удалить",
-  "label.remove-member": "Remove member",
-  "label.reports": "Reports",
+  "label.remove-member": "Удалить участника",
+  "label.reports": "Отчеты",
   "label.required": "Обязательное",
   "label.reset": "Сбросить",
   "label.reset-website": "Сбросить статистику",
-  "label.retention": "Retention",
-  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
-  "label.revenue": "Revenue",
-  "label.revenue-description": "Look into your revenue across time.",
-  "label.revenue-property": "Revenue Property",
+  "label.retention": "Удержание",
+  "label.retention-description": "Измерьте «прилипаемость» вашего сайта, отслеживая, как часто пользователи возвращаются на него.",
+  "label.revenue": "Выручка",
+  "label.revenue-description": "Изучите свои доходы за определенное время.",
+  "label.revenue-property": "Доходная недвижимость",
   "label.role": "Роль",
-  "label.run-query": "Run query",
+  "label.run-query": "Выполнить запрос",
   "label.save": "Сохранить",
   "label.screens": "Экраны",
-  "label.search": "Search",
-  "label.select": "Select",
-  "label.select-date": "Select date",
-  "label.select-role": "Select role",
+  "label.search": "Поиск",
+  "label.select": "Выберите",
+  "label.select-date": "Выберите дату",
+  "label.select-role": "Выберите роль",
   "label.select-website": "Выбрать сайт",
-  "label.session": "Session",
+  "label.session": "Сессия",
   "label.sessions": "Сессии",
   "label.settings": "Настройки",
   "label.share-url": "Поделиться ссылкой",
   "label.single-day": "Один день",
-  "label.start-step": "Start Step",
-  "label.steps": "Steps",
-  "label.sum": "Sum",
+  "label.start-step": "Начальный этап",
+  "label.steps": "Шаги",
+  "label.sum": "Сумма",
   "label.tablet": "Планшет",
   "label.team": "Команда",
   "label.team-id": "ID команды",
-  "label.team-manager": "Team manager",
+  "label.team-manager": "Менеджер команды",
   "label.team-member": "Член команды",
-  "label.team-name": "Team name",
+  "label.team-name": "Название команды",
   "label.team-owner": "Владелец команды",
-  "label.team-view-only": "Team view only",
-  "label.team-websites": "Team websites",
+  "label.team-view-only": "Только командный просмотр",
+  "label.team-websites": "Веб-сайты команды",
   "label.teams": "Команды",
   "label.theme": "Тема",
   "label.this-month": "Этот месяц",
@@ -199,62 +199,62 @@
   "label.title": "Заголовок",
   "label.today": "Сегодня",
   "label.toggle-charts": "Показать/скрыть графики",
-  "label.total": "Total",
-  "label.total-records": "Total records",
+  "label.total": "Всего",
+  "label.total-records": "Всего записей",
   "label.tracking-code": "Код отслеживания",
-  "label.transactions": "Transactions",
-  "label.transfer": "Transfer",
-  "label.transfer-website": "Transfer website",
-  "label.true": "True",
-  "label.type": "Type",
-  "label.unique": "Unique",
+  "label.transactions": "Транзакции",
+  "label.transfer": "Передача",
+  "label.transfer-website": "Передать сайт",
+  "label.true": "Правда",
+  "label.type": "Тип",
+  "label.unique": "Уникальный",
   "label.unique-visitors": "Уникальные посетители",
-  "label.uniqueCustomers": "Unique Customers",
+  "label.uniqueCustomers": "Уникальные клиенты",
   "label.unknown": "Неизвестно",
-  "label.untitled": "Untitled",
-  "label.update": "Update",
+  "label.untitled": "Без названия",
+  "label.update": "Обновление",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Пользователь",
-  "label.user-property": "User Property",
+  "label.user-property": "Собственность пользователя",
   "label.username": "Имя пользователя",
   "label.users": "Пользователи",
   "label.utm": "UTM",
-  "label.utm-description": "Track your campaigns through UTM parameters.",
-  "label.value": "Value",
+  "label.utm-description": "Отслеживайте свои кампании с помощью UTM-параметров.",
+  "label.value": "Значение",
   "label.view": "Просмотреть",
   "label.view-details": "Посмотреть детали",
-  "label.view-only": "View only",
+  "label.view-only": "Только просмотр",
   "label.views": "Просмотры",
-  "label.views-per-visit": "Views per visit",
+  "label.views-per-visit": "Просмотров за посещение",
   "label.visit-duration": "Среднее время посещения",
   "label.visitors": "Посетители",
-  "label.visits": "Visits",
-  "label.website": "Website",
+  "label.visits": "Посещения",
+  "label.website": "Сайт",
   "label.website-id": "ID сайта",
   "label.websites": "Сайты",
-  "label.window": "Window",
+  "label.window": "Окно",
   "label.yesterday": "Вчера",
-  "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
+  "message.action-confirmation": "Введите {confirmation} в поле ниже, чтобы подтвердить.",
   "message.active-users": "{x} текущих посетителей",
-  "message.collected-data": "Collected data",
+  "message.collected-data": "Собранные данные",
   "message.confirm-delete": "Вы уверены, что хотите удалить {target}?",
   "message.confirm-leave": "Вы уверены, что хотите уйти {target}?",
-  "message.confirm-remove": "Are you sure you want to remove {target}?",
+  "message.confirm-remove": "Вы уверены, что хотите удалить {target}?",
   "message.confirm-reset": "Вы уверены, что хотите сбросить статистику {target}?",
-  "message.delete-team-warning": "Deleting a team will also delete all team websites.",
+  "message.delete-team-warning": "При удалении команды будут удалены и все ее веб-сайты.",
   "message.delete-website-warning": "Все связанные данные будут также удалены.",
   "message.error": "Что-то пошло не так.",
-  "message.event-log": "{event} on {url}",
+  "message.event-log": "{event} на {url}",
   "message.go-to-settings": "Перейти к настройкам",
   "message.incorrect-username-password": "Неверное имя пользователя/пароль.",
   "message.invalid-domain": "Некорректный домен",
   "message.min-password-length": "Минимальная длина {n} символов",
-  "message.new-version-available": "A new version of Umami {version} is available!",
+  "message.new-version-available": "Вышла новая версия Umami {version}!",
   "message.no-data-available": "Нет данных.",
-  "message.no-event-data": "No event data is available.",
+  "message.no-event-data": "Данные о событиях отсутствуют.",
   "message.no-match-password": "Пароли не совпадают",
-  "message.no-results-found": "No results were found.",
+  "message.no-results-found": "Результаты не найдены.",
   "message.no-team-websites": "У этой команды нет ни одного сайта.",
   "message.no-teams": "Вы не создали ни одной команды.",
   "message.no-users": "Нет пользователей.",
@@ -268,12 +268,12 @@
   "message.team-not-found": "Команда не найдена.",
   "message.team-websites-info": "Сайты могут просматривать все члены команды.",
   "message.tracking-code": "Код отслеживания",
-  "message.transfer-team-website-to-user": "Transfer this website to your account?",
-  "message.transfer-user-website-to-team": "Select the team to transfer this website to.",
-  "message.transfer-website": "Transfer website ownership to your account or another team.",
-  "message.triggered-event": "Triggered event",
+  "message.transfer-team-website-to-user": "Перенести этот сайт в свой прфоиль?",
+  "message.transfer-user-website-to-team": "Выберите команду, которой нужно передать этот сайт.",
+  "message.transfer-website": "Передайте право владения сайтом своей учетной записи или другой команде.",
+  "message.triggered-event": "Запущенное событие",
   "message.user-deleted": "Пользователь удален.",
-  "message.viewed-page": "Viewed page",
+  "message.viewed-page": "Просмотренная страница",
   "message.visitor-log": "Посетитель из {country} используя {browser} на {os} {device}",
-  "message.visitors-dropped-off": "Visitors dropped off"
+  "message.visitors-dropped-off": "Высадка посетителей"
 }

From 5d8a3a952e1489edbe5ed07c5f0671be92ee487f Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 9 Sep 2024 13:09:09 -0700
Subject: [PATCH 351/438] move event stats to event-data folder

---
 .../api/websites/[websiteId]/{events => event-data}/stats.ts      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/pages/api/websites/[websiteId]/{events => event-data}/stats.ts (100%)

diff --git a/src/pages/api/websites/[websiteId]/events/stats.ts b/src/pages/api/websites/[websiteId]/event-data/stats.ts
similarity index 100%
rename from src/pages/api/websites/[websiteId]/events/stats.ts
rename to src/pages/api/websites/[websiteId]/event-data/stats.ts

From 45f93eb4fbdb991735f88240dd1a0e702dc4b469 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 9 Sep 2024 13:09:09 -0700
Subject: [PATCH 352/438] move event stats to event-data folder

---
 .../api/websites/[websiteId]/{events => event-data}/stats.ts      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/pages/api/websites/[websiteId]/{events => event-data}/stats.ts (100%)

diff --git a/src/pages/api/websites/[websiteId]/events/stats.ts b/src/pages/api/websites/[websiteId]/event-data/stats.ts
similarity index 100%
rename from src/pages/api/websites/[websiteId]/events/stats.ts
rename to src/pages/api/websites/[websiteId]/event-data/stats.ts

From f05e92659d867daa6e24b5c497a20e011926e8a7 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Mon, 9 Sep 2024 23:54:26 -0700
Subject: [PATCH 353/438] Updated telemetry payload.

---
 scripts/telemetry.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/telemetry.js b/scripts/telemetry.js
index 24cd40c91c..27110cd467 100644
--- a/scripts/telemetry.js
+++ b/scripts/telemetry.js
@@ -15,9 +15,9 @@ async function sendTelemetry(type) {
       node: process.version,
       platform: os.platform(),
       arch: os.arch(),
-      os: `${os.type()} (${os.version()})`,
-      isDocker: isDocker(),
-      isCi: isCI,
+      os: `${os.type()} ${os.version()}`,
+      is_docker: isDocker(),
+      is_ci: isCI,
     },
   };
 

From 29044de73611123a9301cc07eb1009a7d8d0bcda Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Thu, 12 Sep 2024 12:20:58 -0700
Subject: [PATCH 354/438] Add sessionData label

---
 src/components/messages.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/messages.ts b/src/components/messages.ts
index f711a4f6cf..933a7a0f4c 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -153,6 +153,7 @@ export const labels = defineMessages({
   regions: { id: 'label.regions', defaultMessage: 'Regions' },
   reports: { id: 'label.reports', defaultMessage: 'Reports' },
   eventData: { id: 'label.event-data', defaultMessage: 'Event data' },
+  sessionData: { id: 'label.session-data', defaultMessage: 'Session data' },
   funnel: { id: 'label.funnel', defaultMessage: 'Funnel' },
   funnelDescription: {
     id: 'label.funnel-description',

From e440779c7ac43c2b333603ec26d02400e4d54840 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Fri, 13 Sep 2024 08:31:52 -0700
Subject: [PATCH 355/438] add getEventDataFields

---
 .../websites/[websiteId]/event-data/fields.ts | 51 ++++++++++++++
 .../analytics/events/getEventDataFields.ts    | 69 +++++++++++++++++++
 .../analytics/events/getEventDataValues.ts    |  4 +-
 src/queries/index.ts                          |  1 +
 4 files changed, 123 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/api/websites/[websiteId]/event-data/fields.ts
 create mode 100644 src/queries/analytics/events/getEventDataFields.ts

diff --git a/src/pages/api/websites/[websiteId]/event-data/fields.ts b/src/pages/api/websites/[websiteId]/event-data/fields.ts
new file mode 100644
index 0000000000..c5075c5eeb
--- /dev/null
+++ b/src/pages/api/websites/[websiteId]/event-data/fields.ts
@@ -0,0 +1,51 @@
+import { canViewWebsite } from 'lib/auth';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getEventDataFields } from 'queries';
+
+import * as yup from 'yup';
+
+export interface EventDataFieldsRequestQuery {
+  websiteId: string;
+  startAt: string;
+  endAt: string;
+}
+
+const schema = {
+  GET: yup.object().shape({
+    websiteId: yup.string().uuid().required(),
+    startAt: yup.number().integer().required(),
+    endAt: yup.number().integer().min(yup.ref('startAt')).required(),
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<EventDataFieldsRequestQuery>,
+  res: NextApiResponse<any>,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  if (req.method === 'GET') {
+    const { websiteId, startAt, endAt } = req.query;
+
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const startDate = new Date(+startAt);
+    const endDate = new Date(+endAt);
+
+    const data = await getEventDataFields(websiteId, {
+      startDate,
+      endDate,
+    });
+
+    return ok(res, data);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/src/queries/analytics/events/getEventDataFields.ts b/src/queries/analytics/events/getEventDataFields.ts
new file mode 100644
index 0000000000..05fee07280
--- /dev/null
+++ b/src/queries/analytics/events/getEventDataFields.ts
@@ -0,0 +1,69 @@
+import prisma from 'lib/prisma';
+import clickhouse from 'lib/clickhouse';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import { QueryFilters, WebsiteEventData } from 'lib/types';
+
+export async function getEventDataFields(
+  ...args: [websiteId: string, filters: QueryFilters]
+): Promise<WebsiteEventData[]> {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(websiteId: string, filters: QueryFilters) {
+  const { rawQuery, parseFilters, getDateSQL } = prisma;
+  const { filterQuery, params } = await parseFilters(websiteId, filters);
+
+  return rawQuery(
+    `
+    select
+      data_key as "propertyName",
+      data_type as "dataType",
+      case 
+        when data_type = 2 then replace(string_value, '.0000', '') 
+        when data_type = 4 then ${getDateSQL('date_value', 'hour')} 
+        else string_value
+      end as "value",
+      count(*) as "total"
+    from event_data
+    join website_event on website_event.event_id = event_data.website_event_id
+    where event_data.website_id = {{websiteId::uuid}}
+      and event_data.created_at between {{startDate}} and {{endDate}}
+    ${filterQuery}
+    group by data_key, data_type, value
+    order by 2 desc
+    limit 100
+    `,
+    params,
+  );
+}
+
+async function clickhouseQuery(
+  websiteId: string,
+  filters: QueryFilters,
+): Promise<{ propertyName: string; dataType: number; propertyValue: string; total: number }[]> {
+  const { rawQuery, parseFilters } = clickhouse;
+  const { filterQuery, params } = await parseFilters(websiteId, filters);
+
+  return rawQuery(
+    `
+    select
+      data_key as propertyName,
+      data_type as dataType,
+      multiIf(data_type = 2, replaceAll(string_value, '.0000', ''),
+              data_type = 4, toString(date_trunc('hour', date_value)),
+              string_value) as "value",
+      count(*) as "total"
+    from event_data
+    where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+    ${filterQuery}
+    group by data_key, data_type, value
+    order by 2 desc
+    limit 100
+    `,
+    params,
+  );
+}
diff --git a/src/queries/analytics/events/getEventDataValues.ts b/src/queries/analytics/events/getEventDataValues.ts
index 07e423075b..631018248b 100644
--- a/src/queries/analytics/events/getEventDataValues.ts
+++ b/src/queries/analytics/events/getEventDataValues.ts
@@ -49,7 +49,7 @@ async function relationalQuery(
 async function clickhouseQuery(
   websiteId: string,
   filters: QueryFilters & { eventName?: string; propertyName?: string },
-): Promise<{ propertyName: string; dataType: number; propertyValue: string; total: number }[]> {
+): Promise<{ value: string; total: number }[]> {
   const { rawQuery, parseFilters } = clickhouse;
   const { filterQuery, params } = await parseFilters(websiteId, filters);
 
@@ -66,7 +66,7 @@ async function clickhouseQuery(
       and data_key = {propertyName:String}
       and event_name = {eventName:String}
     ${filterQuery}
-    group by event_name, value
+    group by value
     order by 2 desc
     limit 100
     `,
diff --git a/src/queries/index.ts b/src/queries/index.ts
index a2697ced58..8c7e564abc 100644
--- a/src/queries/index.ts
+++ b/src/queries/index.ts
@@ -4,6 +4,7 @@ export * from 'queries/prisma/teamUser';
 export * from 'queries/prisma/user';
 export * from 'queries/prisma/website';
 export * from './analytics/events/getEventDataEvents';
+export * from './analytics/events/getEventDataFields';
 export * from './analytics/events/getEventDataProperties';
 export * from './analytics/events/getEventDataValues';
 export * from './analytics/events/getEventDataStats';

From fa3710badcbc4ffb9fc388909034e45a8ecc4dcf Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Fri, 13 Sep 2024 08:31:52 -0700
Subject: [PATCH 356/438] add getEventDataFields

---
 .../websites/[websiteId]/event-data/fields.ts | 51 ++++++++++++++
 .../analytics/events/getEventDataFields.ts    | 69 +++++++++++++++++++
 .../analytics/events/getEventDataValues.ts    |  4 +-
 src/queries/index.ts                          |  1 +
 4 files changed, 123 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/api/websites/[websiteId]/event-data/fields.ts
 create mode 100644 src/queries/analytics/events/getEventDataFields.ts

diff --git a/src/pages/api/websites/[websiteId]/event-data/fields.ts b/src/pages/api/websites/[websiteId]/event-data/fields.ts
new file mode 100644
index 0000000000..c5075c5eeb
--- /dev/null
+++ b/src/pages/api/websites/[websiteId]/event-data/fields.ts
@@ -0,0 +1,51 @@
+import { canViewWebsite } from 'lib/auth';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getEventDataFields } from 'queries';
+
+import * as yup from 'yup';
+
+export interface EventDataFieldsRequestQuery {
+  websiteId: string;
+  startAt: string;
+  endAt: string;
+}
+
+const schema = {
+  GET: yup.object().shape({
+    websiteId: yup.string().uuid().required(),
+    startAt: yup.number().integer().required(),
+    endAt: yup.number().integer().min(yup.ref('startAt')).required(),
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<EventDataFieldsRequestQuery>,
+  res: NextApiResponse<any>,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  if (req.method === 'GET') {
+    const { websiteId, startAt, endAt } = req.query;
+
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const startDate = new Date(+startAt);
+    const endDate = new Date(+endAt);
+
+    const data = await getEventDataFields(websiteId, {
+      startDate,
+      endDate,
+    });
+
+    return ok(res, data);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/src/queries/analytics/events/getEventDataFields.ts b/src/queries/analytics/events/getEventDataFields.ts
new file mode 100644
index 0000000000..05fee07280
--- /dev/null
+++ b/src/queries/analytics/events/getEventDataFields.ts
@@ -0,0 +1,69 @@
+import prisma from 'lib/prisma';
+import clickhouse from 'lib/clickhouse';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import { QueryFilters, WebsiteEventData } from 'lib/types';
+
+export async function getEventDataFields(
+  ...args: [websiteId: string, filters: QueryFilters]
+): Promise<WebsiteEventData[]> {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(websiteId: string, filters: QueryFilters) {
+  const { rawQuery, parseFilters, getDateSQL } = prisma;
+  const { filterQuery, params } = await parseFilters(websiteId, filters);
+
+  return rawQuery(
+    `
+    select
+      data_key as "propertyName",
+      data_type as "dataType",
+      case 
+        when data_type = 2 then replace(string_value, '.0000', '') 
+        when data_type = 4 then ${getDateSQL('date_value', 'hour')} 
+        else string_value
+      end as "value",
+      count(*) as "total"
+    from event_data
+    join website_event on website_event.event_id = event_data.website_event_id
+    where event_data.website_id = {{websiteId::uuid}}
+      and event_data.created_at between {{startDate}} and {{endDate}}
+    ${filterQuery}
+    group by data_key, data_type, value
+    order by 2 desc
+    limit 100
+    `,
+    params,
+  );
+}
+
+async function clickhouseQuery(
+  websiteId: string,
+  filters: QueryFilters,
+): Promise<{ propertyName: string; dataType: number; propertyValue: string; total: number }[]> {
+  const { rawQuery, parseFilters } = clickhouse;
+  const { filterQuery, params } = await parseFilters(websiteId, filters);
+
+  return rawQuery(
+    `
+    select
+      data_key as propertyName,
+      data_type as dataType,
+      multiIf(data_type = 2, replaceAll(string_value, '.0000', ''),
+              data_type = 4, toString(date_trunc('hour', date_value)),
+              string_value) as "value",
+      count(*) as "total"
+    from event_data
+    where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+    ${filterQuery}
+    group by data_key, data_type, value
+    order by 2 desc
+    limit 100
+    `,
+    params,
+  );
+}
diff --git a/src/queries/analytics/events/getEventDataValues.ts b/src/queries/analytics/events/getEventDataValues.ts
index 07e423075b..631018248b 100644
--- a/src/queries/analytics/events/getEventDataValues.ts
+++ b/src/queries/analytics/events/getEventDataValues.ts
@@ -49,7 +49,7 @@ async function relationalQuery(
 async function clickhouseQuery(
   websiteId: string,
   filters: QueryFilters & { eventName?: string; propertyName?: string },
-): Promise<{ propertyName: string; dataType: number; propertyValue: string; total: number }[]> {
+): Promise<{ value: string; total: number }[]> {
   const { rawQuery, parseFilters } = clickhouse;
   const { filterQuery, params } = await parseFilters(websiteId, filters);
 
@@ -66,7 +66,7 @@ async function clickhouseQuery(
       and data_key = {propertyName:String}
       and event_name = {eventName:String}
     ${filterQuery}
-    group by event_name, value
+    group by value
     order by 2 desc
     limit 100
     `,
diff --git a/src/queries/index.ts b/src/queries/index.ts
index a2697ced58..8c7e564abc 100644
--- a/src/queries/index.ts
+++ b/src/queries/index.ts
@@ -4,6 +4,7 @@ export * from 'queries/prisma/teamUser';
 export * from 'queries/prisma/user';
 export * from 'queries/prisma/website';
 export * from './analytics/events/getEventDataEvents';
+export * from './analytics/events/getEventDataFields';
 export * from './analytics/events/getEventDataProperties';
 export * from './analytics/events/getEventDataValues';
 export * from './analytics/events/getEventDataStats';

From 517da90abe1dddbbffd0f8683f0c06bbec7a6390 Mon Sep 17 00:00:00 2001
From: Peter Kuhmann <info@peter-kuhmann.de>
Date: Mon, 16 Sep 2024 14:55:56 +0200
Subject: [PATCH 357/438] Add `Access-Control-Allow-Origin` header with value
 `*` to tracker script asset and all its alternative paths.

---
 next.config.js | 63 +++++++++++++++++++++++++++++++++-----------------
 1 file changed, 42 insertions(+), 21 deletions(-)

diff --git a/next.config.js b/next.config.js
index b610eb2c83..87a2355416 100644
--- a/next.config.js
+++ b/next.config.js
@@ -24,7 +24,7 @@ const contentSecurityPolicy = [
   `frame-ancestors 'self' ${frameAncestors}`,
 ];
 
-const headers = [
+const defaultHeaders = [
   {
     key: 'X-DNS-Prefetch-Control',
     value: 'on',
@@ -39,12 +39,30 @@ const headers = [
 ];
 
 if (forceSSL) {
-  headers.push({
+  defaultHeaders.push({
     key: 'Strict-Transport-Security',
     value: 'max-age=63072000; includeSubDomains; preload',
   });
 }
 
+const trackerHeaders = [
+  {
+    key: 'Access-Control-Allow-Origin',
+    value: '*',
+  },
+];
+
+const headers = [
+  {
+    source: '/:path*',
+    headers: defaultHeaders,
+  },
+  {
+    source: '/script.js',
+    headers: trackerHeaders,
+  },
+];
+
 const rewrites = [];
 
 if (collectApiEndpoint) {
@@ -54,19 +72,6 @@ if (collectApiEndpoint) {
   });
 }
 
-if (trackerScriptName) {
-  const names = trackerScriptName?.split(',').map(name => name.trim());
-
-  if (names) {
-    names.forEach(name => {
-      rewrites.push({
-        source: `/${name.replace(/^\/+/, '')}`,
-        destination: '/script.js',
-      });
-    });
-  }
-}
-
 const redirects = [
   {
     source: '/settings',
@@ -85,6 +90,27 @@ const redirects = [
   },
 ];
 
+// Adding rewrites + headers for all alternative tracker script names.
+if (trackerScriptName) {
+  const names = trackerScriptName?.split(',').map(name => name.trim());
+
+  if (names) {
+    names.forEach(name => {
+      const normalizedSource = `/${name.replace(/^\/+/, '')}`;
+
+      rewrites.push({
+        source: normalizedSource,
+        destination: '/script.js',
+      });
+
+      headers.push({
+        source: normalizedSource,
+        headers: trackerHeaders,
+      });
+    });
+  }
+}
+
 if (cloudMode && cloudUrl) {
   redirects.push({
     source: '/settings/:path*',
@@ -153,12 +179,7 @@ const config = {
     return config;
   },
   async headers() {
-    return [
-      {
-        source: '/:path*',
-        headers,
-      },
-    ];
+    return headers;
   },
   async rewrites() {
     return [

From fcb7fa2264663f8111129bb361043a11b7ad8a00 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 17 Sep 2024 19:59:58 -0700
Subject: [PATCH 358/438] fix reset website bug

---
 src/lib/clickhouse.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index 5502b5babf..b588ec84e5 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -2,9 +2,9 @@ import { ClickHouseClient, createClient } from '@clickhouse/client';
 import { formatInTimeZone } from 'date-fns-tz';
 import debug from 'debug';
 import { CLICKHOUSE } from 'lib/db';
+import { getWebsite } from 'queries/index';
 import { DEFAULT_PAGE_SIZE, OPERATORS } from './constants';
 import { maxDate } from './date';
-import { fetchWebsite } from './load';
 import { filtersToArray } from './params';
 import { PageParams, QueryFilters, QueryOptions } from './types';
 
@@ -132,7 +132,7 @@ function getFilterParams(filters: QueryFilters = {}) {
 }
 
 async function parseFilters(websiteId: string, filters: QueryFilters = {}, options?: QueryOptions) {
-  const website = await fetchWebsite(websiteId);
+  const website = await getWebsite(websiteId);
 
   return {
     filterQuery: getFilterQuery(filters, options),

From 501d016ae37f56f4196371fbb118425a966dcb94 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Sep 2024 05:32:03 +0000
Subject: [PATCH 359/438] Bump next from 14.2.5 to 14.2.10

Bumps [next](https://github.com/vercel/next.js) from 14.2.5 to 14.2.10.
- [Release notes](https://github.com/vercel/next.js/releases)
- [Changelog](https://github.com/vercel/next.js/blob/canary/release.js)
- [Commits](https://github.com/vercel/next.js/compare/v14.2.5...v14.2.10)

---
updated-dependencies:
- dependency-name: next
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 146 ++++++++++++++++++++++-----------------------------
 2 files changed, 65 insertions(+), 83 deletions(-)

diff --git a/package.json b/package.json
index c1aaf410e7..c78a113750 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,7 @@
     "maxmind": "^4.3.6",
     "md5": "^2.3.0",
     "moment-timezone": "^0.5.35",
-    "next": "14.2.5",
+    "next": "14.2.10",
     "next-basics": "^0.39.0",
     "node-fetch": "^3.2.8",
     "npm-run-all": "^4.1.5",
diff --git a/yarn.lock b/yarn.lock
index 910f0c69f2..a53045fef1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2197,10 +2197,10 @@
   resolved "https://registry.yarnpkg.com/@netlify/plugin-nextjs/-/plugin-nextjs-5.6.0.tgz#970f96b11bee4fe115fad8e3e4f3c6121f97a370"
   integrity sha512-PBrsd/GJZ9MN8BdyIoleTkY22lAUMfcRxrbb8wgxGzXtTW0RU0GW2mc99ISB6zOwWMZ11rSjeN0GS6znnukvww==
 
-"@next/env@14.2.5":
-  version "14.2.5"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.5.tgz#1d9328ab828711d3517d0a1d505acb55e5ef7ad0"
-  integrity sha512-/zZGkrTOsraVfYjGP8uM0p6r0BDT6xWpkjdVbcz66PJVSpwXX3yNiRycxAuDfBKGWBrZBXRuK/YVlkNgxHGwmA==
+"@next/env@14.2.10":
+  version "14.2.10"
+  resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.10.tgz#1d3178340028ced2d679f84140877db4f420333c"
+  integrity sha512-dZIu93Bf5LUtluBXIv4woQw2cZVZ2DJTjax5/5DOs3lzEOeKLy7GxRSr4caK9/SCPdaW6bCgpye6+n4Dh9oJPw==
 
 "@next/eslint-plugin-next@14.2.5":
   version "14.2.5"
@@ -2209,50 +2209,50 @@
   dependencies:
     glob "10.3.10"
 
-"@next/swc-darwin-arm64@14.2.5":
-  version "14.2.5"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.5.tgz#d0a160cf78c18731c51cc0bff131c706b3e9bb05"
-  integrity sha512-/9zVxJ+K9lrzSGli1///ujyRfon/ZneeZ+v4ptpiPoOU+GKZnm8Wj8ELWU1Pm7GHltYRBklmXMTUqM/DqQ99FQ==
-
-"@next/swc-darwin-x64@14.2.5":
-  version "14.2.5"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.5.tgz#eb832a992407f6e6352eed05a073379f1ce0589c"
-  integrity sha512-vXHOPCwfDe9qLDuq7U1OYM2wUY+KQ4Ex6ozwsKxp26BlJ6XXbHleOUldenM67JRyBfVjv371oneEvYd3H2gNSA==
-
-"@next/swc-linux-arm64-gnu@14.2.5":
-  version "14.2.5"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.5.tgz#098fdab57a4664969bc905f5801ef5a89582c689"
-  integrity sha512-vlhB8wI+lj8q1ExFW8lbWutA4M2ZazQNvMWuEDqZcuJJc78iUnLdPPunBPX8rC4IgT6lIx/adB+Cwrl99MzNaA==
-
-"@next/swc-linux-arm64-musl@14.2.5":
-  version "14.2.5"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.5.tgz#243a1cc1087fb75481726dd289c7b219fa01f2b5"
-  integrity sha512-NpDB9NUR2t0hXzJJwQSGu1IAOYybsfeB+LxpGsXrRIb7QOrYmidJz3shzY8cM6+rO4Aojuef0N/PEaX18pi9OA==
-
-"@next/swc-linux-x64-gnu@14.2.5":
-  version "14.2.5"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.5.tgz#b8a2e436387ee4a52aa9719b718992e0330c4953"
-  integrity sha512-8XFikMSxWleYNryWIjiCX+gU201YS+erTUidKdyOVYi5qUQo/gRxv/3N1oZFCgqpesN6FPeqGM72Zve+nReVXQ==
-
-"@next/swc-linux-x64-musl@14.2.5":
-  version "14.2.5"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.5.tgz#cb8a9adad5fb8df86112cfbd363aab5c6d32757b"
-  integrity sha512-6QLwi7RaYiQDcRDSU/os40r5o06b5ue7Jsk5JgdRBGGp8l37RZEh9JsLSM8QF0YDsgcosSeHjglgqi25+m04IQ==
-
-"@next/swc-win32-arm64-msvc@14.2.5":
-  version "14.2.5"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.5.tgz#81f996c1c38ea0900d4e7719cc8814be8a835da0"
-  integrity sha512-1GpG2VhbspO+aYoMOQPQiqc/tG3LzmsdBH0LhnDS3JrtDx2QmzXe0B6mSZZiN3Bq7IOMXxv1nlsjzoS1+9mzZw==
-
-"@next/swc-win32-ia32-msvc@14.2.5":
-  version "14.2.5"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.5.tgz#f61c74ce823e10b2bc150e648fc192a7056422e0"
-  integrity sha512-Igh9ZlxwvCDsu6438FXlQTHlRno4gFpJzqPjSIBZooD22tKeI4fE/YMRoHVJHmrQ2P5YL1DoZ0qaOKkbeFWeMg==
-
-"@next/swc-win32-x64-msvc@14.2.5":
-  version "14.2.5"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.5.tgz#ed199a920efb510cfe941cd75ed38a7be21e756f"
-  integrity sha512-tEQ7oinq1/CjSG9uSTerca3v4AZ+dFa+4Yu6ihaG8Ud8ddqLQgFGcnwYls13H5X5CPDPZJdYxyeMui6muOLd4g==
+"@next/swc-darwin-arm64@14.2.10":
+  version "14.2.10"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.10.tgz#49d10ca4086fbd59ee68e204f75d7136eda2aa80"
+  integrity sha512-V3z10NV+cvMAfxQUMhKgfQnPbjw+Ew3cnr64b0lr8MDiBJs3eLnM6RpGC46nhfMZsiXgQngCJKWGTC/yDcgrDQ==
+
+"@next/swc-darwin-x64@14.2.10":
+  version "14.2.10"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.10.tgz#0ebeae3afb8eac433882b79543295ab83624a1a8"
+  integrity sha512-Y0TC+FXbFUQ2MQgimJ/7Ina2mXIKhE7F+GUe1SgnzRmwFY3hX2z8nyVCxE82I2RicspdkZnSWMn4oTjIKz4uzA==
+
+"@next/swc-linux-arm64-gnu@14.2.10":
+  version "14.2.10"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.10.tgz#7e602916d2fb55a3c532f74bed926a0137c16f20"
+  integrity sha512-ZfQ7yOy5zyskSj9rFpa0Yd7gkrBnJTkYVSya95hX3zeBG9E55Z6OTNPn1j2BTFWvOVVj65C3T+qsjOyVI9DQpA==
+
+"@next/swc-linux-arm64-musl@14.2.10":
+  version "14.2.10"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.10.tgz#6b143f628ccee490b527562e934f8de578d4be47"
+  integrity sha512-n2i5o3y2jpBfXFRxDREr342BGIQCJbdAUi/K4q6Env3aSx8erM9VuKXHw5KNROK9ejFSPf0LhoSkU/ZiNdacpQ==
+
+"@next/swc-linux-x64-gnu@14.2.10":
+  version "14.2.10"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.10.tgz#086f2f16a0678890a1eb46518c4dda381b046082"
+  integrity sha512-GXvajAWh2woTT0GKEDlkVhFNxhJS/XdDmrVHrPOA83pLzlGPQnixqxD8u3bBB9oATBKB//5e4vpACnx5Vaxdqg==
+
+"@next/swc-linux-x64-musl@14.2.10":
+  version "14.2.10"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.10.tgz#1befef10ed8dbcc5047b5d637a25ae3c30a0bfc3"
+  integrity sha512-opFFN5B0SnO+HTz4Wq4HaylXGFV+iHrVxd3YvREUX9K+xfc4ePbRrxqOuPOFjtSuiVouwe6uLeDtabjEIbkmDA==
+
+"@next/swc-win32-arm64-msvc@14.2.10":
+  version "14.2.10"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.10.tgz#731f52c3ae3c56a26cf21d474b11ae1529531209"
+  integrity sha512-9NUzZuR8WiXTvv+EiU/MXdcQ1XUvFixbLIMNQiVHuzs7ZIFrJDLJDaOF1KaqttoTujpcxljM/RNAOmw1GhPPQQ==
+
+"@next/swc-win32-ia32-msvc@14.2.10":
+  version "14.2.10"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.10.tgz#32723ef7f04e25be12af357cc72ddfdd42fd1041"
+  integrity sha512-fr3aEbSd1GeW3YUMBkWAu4hcdjZ6g4NBl1uku4gAn661tcxd1bHs1THWYzdsbTRLcCKLjrDZlNp6j2HTfrw+Bg==
+
+"@next/swc-win32-x64-msvc@14.2.10":
+  version "14.2.10"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.10.tgz#ee1d036cb5ec871816f96baee7991035bb242455"
+  integrity sha512-UjeVoRGKNL2zfbcQ6fscmgjBAS/inHBh63mjIlfPg/NG8Yn2ztqylXt5qilYb6hoHIwaU2ogHknHWWmahJjgZQ==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
@@ -7870,12 +7870,12 @@ next-basics@^0.39.0:
     jsonwebtoken "^9.0.0"
     pure-rand "^6.0.2"
 
-next@14.2.5:
-  version "14.2.5"
-  resolved "https://registry.yarnpkg.com/next/-/next-14.2.5.tgz#afe4022bb0b752962e2205836587a289270efbea"
-  integrity sha512-0f8aRfBVL+mpzfBjYfQuLWh2WyAwtJXCRfkPF4UJ5qd2YwrHczsrSzXU4tRMV0OAxR8ZJZWPFn6uhSC56UTsLA==
+next@14.2.10:
+  version "14.2.10"
+  resolved "https://registry.yarnpkg.com/next/-/next-14.2.10.tgz#331981a4fecb1ae8af1817d4db98fc9687ee1cb6"
+  integrity sha512-sDDExXnh33cY3RkS9JuFEKaS4HmlWmDKP1VJioucCG6z5KuA008DPsDZOzi8UfqEk3Ii+2NCQSJrfbEWtZZfww==
   dependencies:
-    "@next/env" "14.2.5"
+    "@next/env" "14.2.10"
     "@swc/helpers" "0.5.5"
     busboy "1.6.0"
     caniuse-lite "^1.0.30001579"
@@ -7883,15 +7883,15 @@ next@14.2.5:
     postcss "8.4.31"
     styled-jsx "5.1.1"
   optionalDependencies:
-    "@next/swc-darwin-arm64" "14.2.5"
-    "@next/swc-darwin-x64" "14.2.5"
-    "@next/swc-linux-arm64-gnu" "14.2.5"
-    "@next/swc-linux-arm64-musl" "14.2.5"
-    "@next/swc-linux-x64-gnu" "14.2.5"
-    "@next/swc-linux-x64-musl" "14.2.5"
-    "@next/swc-win32-arm64-msvc" "14.2.5"
-    "@next/swc-win32-ia32-msvc" "14.2.5"
-    "@next/swc-win32-x64-msvc" "14.2.5"
+    "@next/swc-darwin-arm64" "14.2.10"
+    "@next/swc-darwin-x64" "14.2.10"
+    "@next/swc-linux-arm64-gnu" "14.2.10"
+    "@next/swc-linux-arm64-musl" "14.2.10"
+    "@next/swc-linux-x64-gnu" "14.2.10"
+    "@next/swc-linux-x64-musl" "14.2.10"
+    "@next/swc-win32-arm64-msvc" "14.2.10"
+    "@next/swc-win32-ia32-msvc" "14.2.10"
+    "@next/swc-win32-x64-msvc" "14.2.10"
 
 nice-try@^1.0.4:
   version "1.0.5"
@@ -8860,7 +8860,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@8.4.31, postcss@^8.1.10:
+postcss@8.4.31:
   version "8.4.31"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
   integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
@@ -8869,25 +8869,7 @@ postcss@8.4.31, postcss@^8.1.10:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-postcss@^8.4.21:
-  version "8.4.32"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.32.tgz#1dac6ac51ab19adb21b8b34fd2d93a86440ef6c9"
-  integrity sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==
-  dependencies:
-    nanoid "^3.3.7"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
-
-postcss@^8.4.28:
-  version "8.4.35"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.35.tgz#60997775689ce09011edf083a549cea44aabe2f7"
-  integrity sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==
-  dependencies:
-    nanoid "^3.3.7"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
-
-postcss@^8.4.31:
+postcss@^8.1.10, postcss@^8.4.21, postcss@^8.4.28, postcss@^8.4.31:
   version "8.4.41"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.41.tgz#d6104d3ba272d882fe18fc07d15dc2da62fa2681"
   integrity sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==

From d4da5aef0038ae546a62f39305f443881d741f7f Mon Sep 17 00:00:00 2001
From: yArna <82231420+yArna@users.noreply.github.com>
Date: Wed, 18 Sep 2024 18:13:13 +0800
Subject: [PATCH 360/438] fix  'none' as hostname  when 'data:' URLs

---
 src/tracker/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tracker/index.js b/src/tracker/index.js
index 707594cf40..d4446560a2 100644
--- a/src/tracker/index.js
+++ b/src/tracker/index.js
@@ -63,7 +63,7 @@
 
   const getPayload = () => ({
     website,
-    hostname,
+    hostname || 'none',
     screen,
     language,
     title: encode(title),

From be656f0b6374ff647c9aa15ae107cafaf819e264 Mon Sep 17 00:00:00 2001
From: yArna <82231420+yArna@users.noreply.github.com>
Date: Wed, 18 Sep 2024 18:17:15 +0800
Subject: [PATCH 361/438] fix tracker localStorage DOMException in data URLs

---
 src/tracker/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tracker/index.js b/src/tracker/index.js
index d4446560a2..e1c269734a 100644
--- a/src/tracker/index.js
+++ b/src/tracker/index.js
@@ -3,10 +3,10 @@
     screen: { width, height },
     navigator: { language },
     location,
-    localStorage,
     document,
     history,
   } = window;
+  const localStorage = location.href.startsWith('data:') ? undefined : window.localStorage
   const { hostname, href } = location;
   const { currentScript, referrer } = document;
 

From e173f375c72d848d421a72cd378285a87f5251c5 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Wed, 18 Sep 2024 11:58:03 -0700
Subject: [PATCH 362/438] remove northern cyprus from datamaps

---
 public/datamaps.world.json | 13371 ++++++++++++++++++++++++++++++++++-
 1 file changed, 13191 insertions(+), 180 deletions(-)

diff --git a/public/datamaps.world.json b/public/datamaps.world.json
index 22d1036060..beaceb6868 100644
--- a/public/datamaps.world.json
+++ b/public/datamaps.world.json
@@ -1,180 +1,13191 @@
-{"type":"FeatureCollection","features":[
-{"type":"Feature","properties":{"name":"Afghanistan"},"geometry":{"type":"Polygon","coordinates":[[[61.210817,35.650072],[62.230651,35.270664],[62.984662,35.404041],[63.193538,35.857166],[63.982896,36.007957],[64.546479,36.312073],[64.746105,37.111818],[65.588948,37.305217],[65.745631,37.661164],[66.217385,37.39379],[66.518607,37.362784],[67.075782,37.356144],[67.83,37.144994],[68.135562,37.023115],[68.859446,37.344336],[69.196273,37.151144],[69.518785,37.608997],[70.116578,37.588223],[70.270574,37.735165],[70.376304,38.138396],[70.806821,38.486282],[71.348131,38.258905],[71.239404,37.953265],[71.541918,37.905774],[71.448693,37.065645],[71.844638,36.738171],[72.193041,36.948288],[72.63689,37.047558],[73.260056,37.495257],[73.948696,37.421566],[74.980002,37.41999],[75.158028,37.133031],[74.575893,37.020841],[74.067552,36.836176],[72.920025,36.720007],[71.846292,36.509942],[71.262348,36.074388],[71.498768,35.650563],[71.613076,35.153203],[71.115019,34.733126],[71.156773,34.348911],[70.881803,33.988856],[69.930543,34.02012],[70.323594,33.358533],[69.687147,33.105499],[69.262522,32.501944],[69.317764,31.901412],[68.926677,31.620189],[68.556932,31.71331],[67.792689,31.58293],[67.683394,31.303154],[66.938891,31.304911],[66.381458,30.738899],[66.346473,29.887943],[65.046862,29.472181],[64.350419,29.560031],[64.148002,29.340819],[63.550261,29.468331],[62.549857,29.318572],[60.874248,29.829239],[61.781222,30.73585],[61.699314,31.379506],[60.941945,31.548075],[60.863655,32.18292],[60.536078,32.981269],[60.9637,33.528832],[60.52843,33.676446],[60.803193,34.404102],[61.210817,35.650072]]]},"id":"AFG"},
-{"type":"Feature","properties":{"name":"Angola"},"geometry":{"type":"MultiPolygon","coordinates":[[[[16.326528,-5.87747],[16.57318,-6.622645],[16.860191,-7.222298],[17.089996,-7.545689],[17.47297,-8.068551],[18.134222,-7.987678],[18.464176,-7.847014],[19.016752,-7.988246],[19.166613,-7.738184],[19.417502,-7.155429],[20.037723,-7.116361],[20.091622,-6.94309],[20.601823,-6.939318],[20.514748,-7.299606],[21.728111,-7.290872],[21.746456,-7.920085],[21.949131,-8.305901],[21.801801,-8.908707],[21.875182,-9.523708],[22.208753,-9.894796],[22.155268,-11.084801],[22.402798,-10.993075],[22.837345,-11.017622],[23.456791,-10.867863],[23.912215,-10.926826],[24.017894,-11.237298],[23.904154,-11.722282],[24.079905,-12.191297],[23.930922,-12.565848],[24.016137,-12.911046],[21.933886,-12.898437],[21.887843,-16.08031],[22.562478,-16.898451],[23.215048,-17.523116],[21.377176,-17.930636],[18.956187,-17.789095],[18.263309,-17.309951],[14.209707,-17.353101],[14.058501,-17.423381],[13.462362,-16.971212],[12.814081,-16.941343],[12.215461,-17.111668],[11.734199,-17.301889],[11.640096,-16.673142],[11.778537,-15.793816],[12.123581,-14.878316],[12.175619,-14.449144],[12.500095,-13.5477],[12.738479,-13.137906],[13.312914,-12.48363],[13.633721,-12.038645],[13.738728,-11.297863],[13.686379,-10.731076],[13.387328,-10.373578],[13.120988,-9.766897],[12.87537,-9.166934],[12.929061,-8.959091],[13.236433,-8.562629],[12.93304,-7.596539],[12.728298,-6.927122],[12.227347,-6.294448],[12.322432,-6.100092],[12.735171,-5.965682],[13.024869,-5.984389],[13.375597,-5.864241],[16.326528,-5.87747]]],[[[12.436688,-5.684304],[12.182337,-5.789931],[11.914963,-5.037987],[12.318608,-4.60623],[12.62076,-4.438023],[12.995517,-4.781103],[12.631612,-4.991271],[12.468004,-5.248362],[12.436688,-5.684304]]]]},"id":"AGO"},
-{"type":"Feature","properties":{"name":"Albania"},"geometry":{"type":"Polygon","coordinates":[[[20.590247,41.855404],[20.463175,41.515089],[20.605182,41.086226],[21.02004,40.842727],[20.99999,40.580004],[20.674997,40.435],[20.615,40.110007],[20.150016,39.624998],[19.98,39.694993],[19.960002,39.915006],[19.406082,40.250773],[19.319059,40.72723],[19.40355,41.409566],[19.540027,41.719986],[19.371769,41.877548],[19.304486,42.195745],[19.738051,42.688247],[19.801613,42.500093],[20.0707,42.58863],[20.283755,42.32026],[20.52295,42.21787],[20.590247,41.855404]]]},"id":"ALB"},
-{"type":"Feature","properties":{"name":"United Arab Emirates"},"geometry":{"type":"Polygon","coordinates":[[[51.579519,24.245497],[51.757441,24.294073],[51.794389,24.019826],[52.577081,24.177439],[53.404007,24.151317],[54.008001,24.121758],[54.693024,24.797892],[55.439025,25.439145],[56.070821,26.055464],[56.261042,25.714606],[56.396847,24.924732],[55.886233,24.920831],[55.804119,24.269604],[55.981214,24.130543],[55.528632,23.933604],[55.525841,23.524869],[55.234489,23.110993],[55.208341,22.70833],[55.006803,22.496948],[52.000733,23.001154],[51.617708,24.014219],[51.579519,24.245497]]]},"id":"ARE"},
-{"type":"Feature","properties":{"name":"Argentina"},"geometry":{"type":"MultiPolygon","coordinates":[[[[-65.5,-55.2],[-66.45,-55.25],[-66.95992,-54.89681],[-67.56244,-54.87001],[-68.63335,-54.8695],[-68.63401,-52.63637],[-68.25,-53.1],[-67.75,-53.85],[-66.45,-54.45],[-65.05,-54.7],[-65.5,-55.2]]],[[[-64.964892,-22.075862],[-64.377021,-22.798091],[-63.986838,-21.993644],[-62.846468,-22.034985],[-62.685057,-22.249029],[-60.846565,-23.880713],[-60.028966,-24.032796],[-58.807128,-24.771459],[-57.777217,-25.16234],[-57.63366,-25.603657],[-58.618174,-27.123719],[-57.60976,-27.395899],[-56.486702,-27.548499],[-55.695846,-27.387837],[-54.788795,-26.621786],[-54.625291,-25.739255],[-54.13005,-25.547639],[-53.628349,-26.124865],[-53.648735,-26.923473],[-54.490725,-27.474757],[-55.162286,-27.881915],[-56.2909,-28.852761],[-57.625133,-30.216295],[-57.874937,-31.016556],[-58.14244,-32.044504],[-58.132648,-33.040567],[-58.349611,-33.263189],[-58.427074,-33.909454],[-58.495442,-34.43149],[-57.22583,-35.288027],[-57.362359,-35.97739],[-56.737487,-36.413126],[-56.788285,-36.901572],[-57.749157,-38.183871],[-59.231857,-38.72022],[-61.237445,-38.928425],[-62.335957,-38.827707],[-62.125763,-39.424105],[-62.330531,-40.172586],[-62.145994,-40.676897],[-62.745803,-41.028761],[-63.770495,-41.166789],[-64.73209,-40.802677],[-65.118035,-41.064315],[-64.978561,-42.058001],[-64.303408,-42.359016],[-63.755948,-42.043687],[-63.458059,-42.563138],[-64.378804,-42.873558],[-65.181804,-43.495381],[-65.328823,-44.501366],[-65.565269,-45.036786],[-66.509966,-45.039628],[-67.293794,-45.551896],[-67.580546,-46.301773],[-66.597066,-47.033925],[-65.641027,-47.236135],[-65.985088,-48.133289],[-67.166179,-48.697337],[-67.816088,-49.869669],[-68.728745,-50.264218],[-69.138539,-50.73251],[-68.815561,-51.771104],[-68.149995,-52.349983],[-68.571545,-52.299444],[-69.498362,-52.142761],[-71.914804,-52.009022],[-72.329404,-51.425956],[-72.309974,-50.67701],[-72.975747,-50.74145],[-73.328051,-50.378785],[-73.415436,-49.318436],[-72.648247,-48.878618],[-72.331161,-48.244238],[-72.447355,-47.738533],[-71.917258,-46.884838],[-71.552009,-45.560733],[-71.659316,-44.973689],[-71.222779,-44.784243],[-71.329801,-44.407522],[-71.793623,-44.207172],[-71.464056,-43.787611],[-71.915424,-43.408565],[-72.148898,-42.254888],[-71.746804,-42.051386],[-71.915734,-40.832339],[-71.680761,-39.808164],[-71.413517,-38.916022],[-70.814664,-38.552995],[-71.118625,-37.576827],[-71.121881,-36.658124],[-70.364769,-36.005089],[-70.388049,-35.169688],[-69.817309,-34.193571],[-69.814777,-33.273886],[-70.074399,-33.09121],[-70.535069,-31.36501],[-69.919008,-30.336339],[-70.01355,-29.367923],[-69.65613,-28.459141],[-69.001235,-27.521214],[-68.295542,-26.89934],[-68.5948,-26.506909],[-68.386001,-26.185016],[-68.417653,-24.518555],[-67.328443,-24.025303],[-66.985234,-22.986349],[-67.106674,-22.735925],[-66.273339,-21.83231],[-64.964892,-22.075862]]]]},"id":"ARG"},
-{"type":"Feature","properties":{"name":"Armenia"},"geometry":{"type":"Polygon","coordinates":[[[43.582746,41.092143],[44.97248,41.248129],[45.179496,40.985354],[45.560351,40.81229],[45.359175,40.561504],[45.891907,40.218476],[45.610012,39.899994],[46.034534,39.628021],[46.483499,39.464155],[46.50572,38.770605],[46.143623,38.741201],[45.735379,39.319719],[45.739978,39.473999],[45.298145,39.471751],[45.001987,39.740004],[44.79399,39.713003],[44.400009,40.005],[43.656436,40.253564],[43.752658,40.740201],[43.582746,41.092143]]]},"id":"ARM"},
-{"type":"Feature","properties":{"name":"Antarctica"},"geometry":{"type":"MultiPolygon","coordinates":[[[[-59.572095,-80.040179],[-59.865849,-80.549657],[-60.159656,-81.000327],[-62.255393,-80.863178],[-64.488125,-80.921934],[-65.741666,-80.588827],[-65.741666,-80.549657],[-66.290031,-80.255773],[-64.037688,-80.294944],[-61.883246,-80.39287],[-61.138976,-79.981371],[-60.610119,-79.628679],[-59.572095,-80.040179]]],[[[-159.208184,-79.497059],[-161.127601,-79.634209],[-162.439847,-79.281465],[-163.027408,-78.928774],[-163.066604,-78.869966],[-163.712896,-78.595667],[-163.712896,-78.595667],[-163.105801,-78.223338],[-161.245113,-78.380176],[-160.246208,-78.693645],[-159.482405,-79.046338],[-159.208184,-79.497059]]],[[[-45.154758,-78.04707],[-43.920828,-78.478103],[-43.48995,-79.08556],[-43.372438,-79.516645],[-43.333267,-80.026123],[-44.880537,-80.339644],[-46.506174,-80.594357],[-48.386421,-80.829485],[-50.482107,-81.025442],[-52.851988,-80.966685],[-54.164259,-80.633528],[-53.987991,-80.222028],[-51.853134,-79.94773],[-50.991326,-79.614623],[-50.364595,-79.183487],[-49.914131,-78.811209],[-49.306959,-78.458569],[-48.660616,-78.047018],[-48.660616,-78.047019],[-48.151396,-78.04707],[-46.662857,-77.831476],[-45.154758,-78.04707]]],[[[-121.211511,-73.50099],[-119.918851,-73.657725],[-118.724143,-73.481353],[-119.292119,-73.834097],[-120.232217,-74.08881],[-121.62283,-74.010468],[-122.621735,-73.657778],[-122.621735,-73.657777],[-122.406245,-73.324619],[-121.211511,-73.50099]]],[[[-125.559566,-73.481353],[-124.031882,-73.873268],[-124.619469,-73.834097],[-125.912181,-73.736118],[-127.28313,-73.461769],[-127.28313,-73.461768],[-126.558472,-73.246226],[-125.559566,-73.481353]]],[[[-98.98155,-71.933334],[-97.884743,-72.070535],[-96.787937,-71.952971],[-96.20035,-72.521205],[-96.983765,-72.442864],[-98.198083,-72.482035],[-99.432013,-72.442864],[-100.783455,-72.50162],[-101.801868,-72.305663],[-102.330725,-71.894164],[-102.330725,-71.894164],[-101.703967,-71.717792],[-100.430919,-71.854993],[-98.98155,-71.933334]]],[[[-68.451346,-70.955823],[-68.333834,-71.406493],[-68.510128,-71.798407],[-68.784297,-72.170736],[-69.959471,-72.307885],[-71.075889,-72.503842],[-72.388134,-72.484257],[-71.8985,-72.092343],[-73.073622,-72.229492],[-74.19004,-72.366693],[-74.953895,-72.072757],[-75.012625,-71.661258],[-73.915819,-71.269345],[-73.915819,-71.269344],[-73.230331,-71.15178],[-72.074717,-71.190951],[-71.780962,-70.681473],[-71.72218,-70.309196],[-71.741791,-69.505782],[-71.173815,-69.035475],[-70.253252,-68.87874],[-69.724447,-69.251017],[-69.489422,-69.623346],[-69.058518,-70.074016],[-68.725541,-70.505153],[-68.451346,-70.955823]]],[[[-58.614143,-64.152467],[-59.045073,-64.36801],[-59.789342,-64.211223],[-60.611928,-64.309202],[-61.297416,-64.54433],[-62.0221,-64.799094],[-62.51176,-65.09303],[-62.648858,-65.484942],[-62.590128,-65.857219],[-62.120079,-66.190326],[-62.805567,-66.425505],[-63.74569,-66.503847],[-64.294106,-66.837004],[-64.881693,-67.150474],[-65.508425,-67.58161],[-65.665082,-67.953887],[-65.312545,-68.365335],[-64.783715,-68.678908],[-63.961103,-68.913984],[-63.1973,-69.227556],[-62.785955,-69.619419],[-62.570516,-69.991747],[-62.276736,-70.383661],[-61.806661,-70.716768],[-61.512906,-71.089045],[-61.375809,-72.010074],[-61.081977,-72.382351],[-61.003661,-72.774265],[-60.690269,-73.166179],[-60.827367,-73.695242],[-61.375809,-74.106742],[-61.96337,-74.439848],[-63.295201,-74.576997],[-63.74569,-74.92974],[-64.352836,-75.262847],[-65.860987,-75.635124],[-67.192818,-75.79191],[-68.446282,-76.007452],[-69.797724,-76.222995],[-70.600724,-76.634494],[-72.206776,-76.673665],[-73.969536,-76.634494],[-75.555977,-76.712887],[-77.24037,-76.712887],[-76.926979,-77.104802],[-75.399294,-77.28107],[-74.282876,-77.55542],[-73.656119,-77.908112],[-74.772536,-78.221633],[-76.4961,-78.123654],[-77.925858,-78.378419],[-77.984666,-78.789918],[-78.023785,-79.181833],[-76.848637,-79.514939],[-76.633224,-79.887216],[-75.360097,-80.259545],[-73.244852,-80.416331],[-71.442946,-80.69063],[-70.013163,-81.004151],[-68.191646,-81.317672],[-65.704279,-81.474458],[-63.25603,-81.748757],[-61.552026,-82.042692],[-59.691416,-82.37585],[-58.712121,-82.846106],[-58.222487,-83.218434],[-57.008117,-82.865691],[-55.362894,-82.571755],[-53.619771,-82.258235],[-51.543644,-82.003521],[-49.76135,-81.729171],[-47.273931,-81.709586],[-44.825708,-81.846735],[-42.808363,-82.081915],[-42.16202,-81.65083],[-40.771433,-81.356894],[-38.244818,-81.337309],[-36.26667,-81.121715],[-34.386397,-80.906172],[-32.310296,-80.769023],[-30.097098,-80.592651],[-28.549802,-80.337938],[-29.254901,-79.985195],[-29.685805,-79.632503],[-29.685805,-79.260226],[-31.624808,-79.299397],[-33.681324,-79.456132],[-35.639912,-79.456132],[-35.914107,-79.083855],[-35.77701,-78.339248],[-35.326546,-78.123654],[-33.896763,-77.888526],[-32.212369,-77.65345],[-30.998051,-77.359515],[-29.783732,-77.065579],[-28.882779,-76.673665],[-27.511752,-76.497345],[-26.160336,-76.360144],[-25.474822,-76.281803],[-23.927552,-76.24258],[-22.458598,-76.105431],[-21.224694,-75.909474],[-20.010375,-75.674346],[-18.913543,-75.439218],[-17.522982,-75.125698],[-16.641589,-74.79254],[-15.701491,-74.498604],[-15.40771,-74.106742],[-16.46532,-73.871614],[-16.112784,-73.460114],[-15.446855,-73.146542],[-14.408805,-72.950585],[-13.311973,-72.715457],[-12.293508,-72.401936],[-11.510067,-72.010074],[-11.020433,-71.539767],[-10.295774,-71.265416],[-9.101015,-71.324224],[-8.611381,-71.65733],[-7.416622,-71.696501],[-7.377451,-71.324224],[-6.868232,-70.93231],[-5.790985,-71.030289],[-5.536375,-71.402617],[-4.341667,-71.461373],[-3.048981,-71.285053],[-1.795492,-71.167438],[-0.659489,-71.226246],[-0.228637,-71.637745],[0.868195,-71.304639],[1.886686,-71.128267],[3.022638,-70.991118],[4.139055,-70.853917],[5.157546,-70.618789],[6.273912,-70.462055],[7.13572,-70.246512],[7.742866,-69.893769],[8.48711,-70.148534],[9.525135,-70.011333],[10.249845,-70.48164],[10.817821,-70.834332],[11.953824,-70.638375],[12.404287,-70.246512],[13.422778,-69.972162],[14.734998,-70.030918],[15.126757,-70.403247],[15.949342,-70.030918],[17.026589,-69.913354],[18.201711,-69.874183],[19.259373,-69.893769],[20.375739,-70.011333],[21.452985,-70.07014],[21.923034,-70.403247],[22.569403,-70.697182],[23.666184,-70.520811],[24.841357,-70.48164],[25.977309,-70.48164],[27.093726,-70.462055],[28.09258,-70.324854],[29.150242,-70.20729],[30.031583,-69.93294],[30.971733,-69.75662],[31.990172,-69.658641],[32.754053,-69.384291],[33.302443,-68.835642],[33.870419,-68.502588],[34.908495,-68.659271],[35.300202,-69.012014],[36.16201,-69.247142],[37.200035,-69.168748],[37.905108,-69.52144],[38.649404,-69.776205],[39.667894,-69.541077],[40.020431,-69.109941],[40.921358,-68.933621],[41.959434,-68.600514],[42.938702,-68.463313],[44.113876,-68.267408],[44.897291,-68.051866],[45.719928,-67.816738],[46.503343,-67.601196],[47.44344,-67.718759],[48.344419,-67.366068],[48.990736,-67.091718],[49.930885,-67.111303],[50.753471,-66.876175],[50.949325,-66.523484],[51.791547,-66.249133],[52.614133,-66.053176],[53.613038,-65.89639],[54.53355,-65.818049],[55.414943,-65.876805],[56.355041,-65.974783],[57.158093,-66.249133],[57.255968,-66.680218],[58.137361,-67.013324],[58.744508,-67.287675],[59.939318,-67.405239],[60.605221,-67.679589],[61.427806,-67.953887],[62.387489,-68.012695],[63.19049,-67.816738],[64.052349,-67.405239],[64.992447,-67.620729],[65.971715,-67.738345],[66.911864,-67.855909],[67.891133,-67.934302],[68.890038,-67.934302],[69.712624,-68.972791],[69.673453,-69.227556],[69.555941,-69.678226],[68.596258,-69.93294],[67.81274,-70.305268],[67.949889,-70.697182],[69.066307,-70.677545],[68.929157,-71.069459],[68.419989,-71.441788],[67.949889,-71.853287],[68.71377,-72.166808],[69.869307,-72.264787],[71.024895,-72.088415],[71.573285,-71.696501],[71.906288,-71.324224],[72.454627,-71.010703],[73.08141,-70.716768],[73.33602,-70.364024],[73.864877,-69.874183],[74.491557,-69.776205],[75.62756,-69.737034],[76.626465,-69.619419],[77.644904,-69.462684],[78.134539,-69.07077],[78.428371,-68.698441],[79.113859,-68.326216],[80.093127,-68.071503],[80.93535,-67.875546],[81.483792,-67.542388],[82.051767,-67.366068],[82.776426,-67.209282],[83.775331,-67.30726],[84.676206,-67.209282],[85.655527,-67.091718],[86.752359,-67.150474],[87.477017,-66.876175],[87.986289,-66.209911],[88.358411,-66.484261],[88.828408,-66.954568],[89.67063,-67.150474],[90.630365,-67.228867],[91.5901,-67.111303],[92.608539,-67.189696],[93.548637,-67.209282],[94.17542,-67.111303],[95.017591,-67.170111],[95.781472,-67.385653],[96.682399,-67.248504],[97.759646,-67.248504],[98.68021,-67.111303],[99.718182,-67.248504],[100.384188,-66.915346],[100.893356,-66.58224],[101.578896,-66.30789],[102.832411,-65.563284],[103.478676,-65.700485],[104.242557,-65.974783],[104.90846,-66.327527],[106.181561,-66.934931],[107.160881,-66.954568],[108.081393,-66.954568],[109.15864,-66.837004],[110.235835,-66.699804],[111.058472,-66.425505],[111.74396,-66.13157],[112.860378,-66.092347],[113.604673,-65.876805],[114.388088,-66.072762],[114.897308,-66.386283],[115.602381,-66.699804],[116.699161,-66.660633],[117.384701,-66.915346],[118.57946,-67.170111],[119.832924,-67.268089],[120.871,-67.189696],[121.654415,-66.876175],[122.320369,-66.562654],[123.221296,-66.484261],[124.122274,-66.621462],[125.160247,-66.719389],[126.100396,-66.562654],[127.001427,-66.562654],[127.882768,-66.660633],[128.80328,-66.758611],[129.704259,-66.58224],[130.781454,-66.425505],[131.799945,-66.386283],[132.935896,-66.386283],[133.85646,-66.288304],[134.757387,-66.209963],[135.031582,-65.72007],[135.070753,-65.308571],[135.697485,-65.582869],[135.873805,-66.033591],[136.206705,-66.44509],[136.618049,-66.778197],[137.460271,-66.954568],[138.596223,-66.895761],[139.908442,-66.876175],[140.809421,-66.817367],[142.121692,-66.817367],[143.061842,-66.797782],[144.374061,-66.837004],[145.490427,-66.915346],[146.195552,-67.228867],[145.999699,-67.601196],[146.646067,-67.895131],[147.723263,-68.130259],[148.839629,-68.385024],[150.132314,-68.561292],[151.483705,-68.71813],[152.502247,-68.874813],[153.638199,-68.894502],[154.284567,-68.561292],[155.165857,-68.835642],[155.92979,-69.149215],[156.811132,-69.384291],[158.025528,-69.482269],[159.181013,-69.599833],[159.670699,-69.991747],[160.80665,-70.226875],[161.570479,-70.579618],[162.686897,-70.736353],[163.842434,-70.716768],[164.919681,-70.775524],[166.11444,-70.755938],[167.309095,-70.834332],[168.425616,-70.971481],[169.463589,-71.20666],[170.501665,-71.402617],[171.20679,-71.696501],[171.089227,-72.088415],[170.560422,-72.441159],[170.109958,-72.891829],[169.75737,-73.24452],[169.287321,-73.65602],[167.975101,-73.812806],[167.387489,-74.165498],[166.094803,-74.38104],[165.644391,-74.772954],[164.958851,-75.145283],[164.234193,-75.458804],[163.822797,-75.870303],[163.568239,-76.24258],[163.47026,-76.693302],[163.489897,-77.065579],[164.057873,-77.457442],[164.273363,-77.82977],[164.743464,-78.182514],[166.604126,-78.319611],[166.995781,-78.750748],[165.193876,-78.907483],[163.666217,-79.123025],[161.766385,-79.162248],[160.924162,-79.730482],[160.747894,-80.200737],[160.316964,-80.573066],[159.788211,-80.945395],[161.120016,-81.278501],[161.629287,-81.690001],[162.490992,-82.062278],[163.705336,-82.395435],[165.095949,-82.708956],[166.604126,-83.022477],[168.895665,-83.335998],[169.404782,-83.825891],[172.283934,-84.041433],[172.477049,-84.117914],[173.224083,-84.41371],[175.985672,-84.158997],[178.277212,-84.472518],[180,-84.71338],[-179.942499,-84.721443],[-179.058677,-84.139412],[-177.256772,-84.452933],[-177.140807,-84.417941],[-176.084673,-84.099259],[-175.947235,-84.110449],[-175.829882,-84.117914],[-174.382503,-84.534323],[-173.116559,-84.117914],[-172.889106,-84.061019],[-169.951223,-83.884647],[-168.999989,-84.117914],[-168.530199,-84.23739],[-167.022099,-84.570497],[-164.182144,-84.82521],[-161.929775,-85.138731],[-158.07138,-85.37391],[-155.192253,-85.09956],[-150.942099,-85.295517],[-148.533073,-85.609038],[-145.888918,-85.315102],[-143.107718,-85.040752],[-142.892279,-84.570497],[-146.829068,-84.531274],[-150.060732,-84.296146],[-150.902928,-83.904232],[-153.586201,-83.68869],[-153.409907,-83.23802],[-153.037759,-82.82652],[-152.665637,-82.454192],[-152.861517,-82.042692],[-154.526299,-81.768394],[-155.29018,-81.41565],[-156.83745,-81.102129],[-154.408787,-81.160937],[-152.097662,-81.004151],[-150.648293,-81.337309],[-148.865998,-81.043373],[-147.22075,-80.671045],[-146.417749,-80.337938],[-146.770286,-79.926439],[-148.062947,-79.652089],[-149.531901,-79.358205],[-151.588416,-79.299397],[-153.390322,-79.162248],[-155.329376,-79.064269],[-155.975668,-78.69194],[-157.268302,-78.378419],[-158.051768,-78.025676],[-158.365134,-76.889207],[-157.875474,-76.987238],[-156.974573,-77.300759],[-155.329376,-77.202728],[-153.742832,-77.065579],[-152.920247,-77.496664],[-151.33378,-77.398737],[-150.00195,-77.183143],[-148.748486,-76.908845],[-147.612483,-76.575738],[-146.104409,-76.47776],[-146.143528,-76.105431],[-146.496091,-75.733154],[-146.20231,-75.380411],[-144.909624,-75.204039],[-144.322037,-75.537197],[-142.794353,-75.34124],[-141.638764,-75.086475],[-140.209007,-75.06689],[-138.85759,-74.968911],[-137.5062,-74.733783],[-136.428901,-74.518241],[-135.214583,-74.302699],[-134.431194,-74.361455],[-133.745654,-74.439848],[-132.257168,-74.302699],[-130.925311,-74.479019],[-129.554284,-74.459433],[-128.242038,-74.322284],[-126.890622,-74.420263],[-125.402082,-74.518241],[-124.011496,-74.479019],[-122.562152,-74.498604],[-121.073613,-74.518241],[-119.70256,-74.479019],[-118.684145,-74.185083],[-117.469801,-74.028348],[-116.216312,-74.243891],[-115.021552,-74.067519],[-113.944331,-73.714828],[-113.297988,-74.028348],[-112.945452,-74.38104],[-112.299083,-74.714198],[-111.261059,-74.420263],[-110.066325,-74.79254],[-108.714909,-74.910103],[-107.559346,-75.184454],[-106.149148,-75.125698],[-104.876074,-74.949326],[-103.367949,-74.988497],[-102.016507,-75.125698],[-100.645531,-75.302018],[-100.1167,-74.870933],[-100.763043,-74.537826],[-101.252703,-74.185083],[-102.545337,-74.106742],[-103.113313,-73.734413],[-103.328752,-73.362084],[-103.681289,-72.61753],[-102.917485,-72.754679],[-101.60524,-72.813436],[-100.312528,-72.754679],[-99.13738,-72.911414],[-98.118889,-73.20535],[-97.688037,-73.558041],[-96.336595,-73.616849],[-95.043961,-73.4797],[-93.672907,-73.283743],[-92.439003,-73.166179],[-91.420564,-73.401307],[-90.088733,-73.322914],[-89.226951,-72.558722],[-88.423951,-73.009393],[-87.268337,-73.185764],[-86.014822,-73.087786],[-85.192236,-73.4797],[-83.879991,-73.518871],[-82.665646,-73.636434],[-81.470913,-73.851977],[-80.687447,-73.4797],[-80.295791,-73.126956],[-79.296886,-73.518871],[-77.925858,-73.420892],[-76.907367,-73.636434],[-76.221879,-73.969541],[-74.890049,-73.871614],[-73.852024,-73.65602],[-72.833533,-73.401307],[-71.619215,-73.264157],[-70.209042,-73.146542],[-68.935916,-73.009393],[-67.956622,-72.79385],[-67.369061,-72.480329],[-67.134036,-72.049244],[-67.251548,-71.637745],[-67.56494,-71.245831],[-67.917477,-70.853917],[-68.230843,-70.462055],[-68.485452,-70.109311],[-68.544209,-69.717397],[-68.446282,-69.325535],[-67.976233,-68.953206],[-67.5845,-68.541707],[-67.427843,-68.149844],[-67.62367,-67.718759],[-67.741183,-67.326845],[-67.251548,-66.876175],[-66.703184,-66.58224],[-66.056815,-66.209963],[-65.371327,-65.89639],[-64.568276,-65.602506],[-64.176542,-65.171423],[-63.628152,-64.897073],[-63.001394,-64.642308],[-62.041686,-64.583552],[-61.414928,-64.270031],[-60.709855,-64.074074],[-59.887269,-63.95651],[-59.162585,-63.701745],[-58.594557,-63.388224],[-57.811143,-63.27066],[-57.223582,-63.525425],[-57.59573,-63.858532],[-58.614143,-64.152467]]]]},"id":"ATA"},
-{"type":"Feature","properties":{"name":"French Southern and Antarctic Lands"},"geometry":{"type":"Polygon","coordinates":[[[68.935,-48.625],[69.58,-48.94],[70.525,-49.065],[70.56,-49.255],[70.28,-49.71],[68.745,-49.775],[68.72,-49.2425],[68.8675,-48.83],[68.935,-48.625]]]},"id":"ATF"},
-{"type":"Feature","properties":{"name":"Australia"},"geometry":{"type":"MultiPolygon","coordinates":[[[[145.397978,-40.792549],[146.364121,-41.137695],[146.908584,-41.000546],[147.689259,-40.808258],[148.289068,-40.875438],[148.359865,-42.062445],[148.017301,-42.407024],[147.914052,-43.211522],[147.564564,-42.937689],[146.870343,-43.634597],[146.663327,-43.580854],[146.048378,-43.549745],[145.43193,-42.693776],[145.29509,-42.03361],[144.718071,-41.162552],[144.743755,-40.703975],[145.397978,-40.792549]]],[[[143.561811,-13.763656],[143.922099,-14.548311],[144.563714,-14.171176],[144.894908,-14.594458],[145.374724,-14.984976],[145.271991,-15.428205],[145.48526,-16.285672],[145.637033,-16.784918],[145.888904,-16.906926],[146.160309,-17.761655],[146.063674,-18.280073],[146.387478,-18.958274],[147.471082,-19.480723],[148.177602,-19.955939],[148.848414,-20.39121],[148.717465,-20.633469],[149.28942,-21.260511],[149.678337,-22.342512],[150.077382,-22.122784],[150.482939,-22.556142],[150.727265,-22.402405],[150.899554,-23.462237],[151.609175,-24.076256],[152.07354,-24.457887],[152.855197,-25.267501],[153.136162,-26.071173],[153.161949,-26.641319],[153.092909,-27.2603],[153.569469,-28.110067],[153.512108,-28.995077],[153.339095,-29.458202],[153.069241,-30.35024],[153.089602,-30.923642],[152.891578,-31.640446],[152.450002,-32.550003],[151.709117,-33.041342],[151.343972,-33.816023],[151.010555,-34.31036],[150.714139,-35.17346],[150.32822,-35.671879],[150.075212,-36.420206],[149.946124,-37.109052],[149.997284,-37.425261],[149.423882,-37.772681],[148.304622,-37.809061],[147.381733,-38.219217],[146.922123,-38.606532],[146.317922,-39.035757],[145.489652,-38.593768],[144.876976,-38.417448],[145.032212,-37.896188],[144.485682,-38.085324],[143.609974,-38.809465],[142.745427,-38.538268],[142.17833,-38.380034],[141.606582,-38.308514],[140.638579,-38.019333],[139.992158,-37.402936],[139.806588,-36.643603],[139.574148,-36.138362],[139.082808,-35.732754],[138.120748,-35.612296],[138.449462,-35.127261],[138.207564,-34.384723],[137.71917,-35.076825],[136.829406,-35.260535],[137.352371,-34.707339],[137.503886,-34.130268],[137.890116,-33.640479],[137.810328,-32.900007],[136.996837,-33.752771],[136.372069,-34.094766],[135.989043,-34.890118],[135.208213,-34.47867],[135.239218,-33.947953],[134.613417,-33.222778],[134.085904,-32.848072],[134.273903,-32.617234],[132.990777,-32.011224],[132.288081,-31.982647],[131.326331,-31.495803],[129.535794,-31.590423],[128.240938,-31.948489],[127.102867,-32.282267],[126.148714,-32.215966],[125.088623,-32.728751],[124.221648,-32.959487],[124.028947,-33.483847],[123.659667,-33.890179],[122.811036,-33.914467],[122.183064,-34.003402],[121.299191,-33.821036],[120.580268,-33.930177],[119.893695,-33.976065],[119.298899,-34.509366],[119.007341,-34.464149],[118.505718,-34.746819],[118.024972,-35.064733],[117.295507,-35.025459],[116.625109,-35.025097],[115.564347,-34.386428],[115.026809,-34.196517],[115.048616,-33.623425],[115.545123,-33.487258],[115.714674,-33.259572],[115.679379,-32.900369],[115.801645,-32.205062],[115.689611,-31.612437],[115.160909,-30.601594],[114.997043,-30.030725],[115.040038,-29.461095],[114.641974,-28.810231],[114.616498,-28.516399],[114.173579,-28.118077],[114.048884,-27.334765],[113.477498,-26.543134],[113.338953,-26.116545],[113.778358,-26.549025],[113.440962,-25.621278],[113.936901,-25.911235],[114.232852,-26.298446],[114.216161,-25.786281],[113.721255,-24.998939],[113.625344,-24.683971],[113.393523,-24.384764],[113.502044,-23.80635],[113.706993,-23.560215],[113.843418,-23.059987],[113.736552,-22.475475],[114.149756,-21.755881],[114.225307,-22.517488],[114.647762,-21.82952],[115.460167,-21.495173],[115.947373,-21.068688],[116.711615,-20.701682],[117.166316,-20.623599],[117.441545,-20.746899],[118.229559,-20.374208],[118.836085,-20.263311],[118.987807,-20.044203],[119.252494,-19.952942],[119.805225,-19.976506],[120.85622,-19.683708],[121.399856,-19.239756],[121.655138,-18.705318],[122.241665,-18.197649],[122.286624,-17.798603],[122.312772,-17.254967],[123.012574,-16.4052],[123.433789,-17.268558],[123.859345,-17.069035],[123.503242,-16.596506],[123.817073,-16.111316],[124.258287,-16.327944],[124.379726,-15.56706],[124.926153,-15.0751],[125.167275,-14.680396],[125.670087,-14.51007],[125.685796,-14.230656],[126.125149,-14.347341],[126.142823,-14.095987],[126.582589,-13.952791],[127.065867,-13.817968],[127.804633,-14.276906],[128.35969,-14.86917],[128.985543,-14.875991],[129.621473,-14.969784],[129.4096,-14.42067],[129.888641,-13.618703],[130.339466,-13.357376],[130.183506,-13.10752],[130.617795,-12.536392],[131.223495,-12.183649],[131.735091,-12.302453],[132.575298,-12.114041],[132.557212,-11.603012],[131.824698,-11.273782],[132.357224,-11.128519],[133.019561,-11.376411],[133.550846,-11.786515],[134.393068,-12.042365],[134.678632,-11.941183],[135.298491,-12.248606],[135.882693,-11.962267],[136.258381,-12.049342],[136.492475,-11.857209],[136.95162,-12.351959],[136.685125,-12.887223],[136.305407,-13.29123],[135.961758,-13.324509],[136.077617,-13.724278],[135.783836,-14.223989],[135.428664,-14.715432],[135.500184,-14.997741],[136.295175,-15.550265],[137.06536,-15.870762],[137.580471,-16.215082],[138.303217,-16.807604],[138.585164,-16.806622],[139.108543,-17.062679],[139.260575,-17.371601],[140.215245,-17.710805],[140.875463,-17.369069],[141.07111,-16.832047],[141.274095,-16.38887],[141.398222,-15.840532],[141.702183,-15.044921],[141.56338,-14.561333],[141.63552,-14.270395],[141.519869,-13.698078],[141.65092,-12.944688],[141.842691,-12.741548],[141.68699,-12.407614],[141.928629,-11.877466],[142.118488,-11.328042],[142.143706,-11.042737],[142.51526,-10.668186],[142.79731,-11.157355],[142.866763,-11.784707],[143.115947,-11.90563],[143.158632,-12.325656],[143.522124,-12.834358],[143.597158,-13.400422],[143.561811,-13.763656]]]]},"id":"AUS"},
-{"type":"Feature","properties":{"name":"Austria"},"geometry":{"type":"Polygon","coordinates":[[[16.979667,48.123497],[16.903754,47.714866],[16.340584,47.712902],[16.534268,47.496171],[16.202298,46.852386],[16.011664,46.683611],[15.137092,46.658703],[14.632472,46.431817],[13.806475,46.509306],[12.376485,46.767559],[12.153088,47.115393],[11.164828,46.941579],[11.048556,46.751359],[10.442701,46.893546],[9.932448,46.920728],[9.47997,47.10281],[9.632932,47.347601],[9.594226,47.525058],[9.896068,47.580197],[10.402084,47.302488],[10.544504,47.566399],[11.426414,47.523766],[12.141357,47.703083],[12.62076,47.672388],[12.932627,47.467646],[13.025851,47.637584],[12.884103,48.289146],[13.243357,48.416115],[13.595946,48.877172],[14.338898,48.555305],[14.901447,48.964402],[15.253416,49.039074],[16.029647,48.733899],[16.499283,48.785808],[16.960288,48.596982],[16.879983,48.470013],[16.979667,48.123497]]]},"id":"AUT"},
-{"type":"Feature","properties":{"name":"Azerbaijan"},"geometry":{"type":"MultiPolygon","coordinates":[[[[45.001987,39.740004],[45.298145,39.471751],[45.739978,39.473999],[45.735379,39.319719],[46.143623,38.741201],[45.457722,38.874139],[44.952688,39.335765],[44.79399,39.713003],[45.001987,39.740004]]],[[[47.373315,41.219732],[47.815666,41.151416],[47.987283,41.405819],[48.584353,41.80887],[49.110264,41.282287],[49.618915,40.572924],[50.08483,40.526157],[50.392821,40.256561],[49.569202,40.176101],[49.395259,39.399482],[49.223228,39.049219],[48.856532,38.815486],[48.883249,38.320245],[48.634375,38.270378],[48.010744,38.794015],[48.355529,39.288765],[48.060095,39.582235],[47.685079,39.508364],[46.50572,38.770605],[46.483499,39.464155],[46.034534,39.628021],[45.610012,39.899994],[45.891907,40.218476],[45.359175,40.561504],[45.560351,40.81229],[45.179496,40.985354],[44.97248,41.248129],[45.217426,41.411452],[45.962601,41.123873],[46.501637,41.064445],[46.637908,41.181673],[46.145432,41.722802],[46.404951,41.860675],[46.686071,41.827137],[47.373315,41.219732]]]]},"id":"AZE"},
-{"type":"Feature","properties":{"name":"Burundi"},"geometry":{"type":"Polygon","coordinates":[[[29.339998,-4.499983],[29.276384,-3.293907],[29.024926,-2.839258],[29.632176,-2.917858],[29.938359,-2.348487],[30.469696,-2.413858],[30.527677,-2.807632],[30.743013,-3.034285],[30.752263,-3.35933],[30.50556,-3.568567],[30.116333,-4.090138],[29.753512,-4.452389],[29.339998,-4.499983]]]},"id":"BDI"},
-{"type":"Feature","properties":{"name":"Belgium"},"geometry":{"type":"Polygon","coordinates":[[[3.314971,51.345781],[4.047071,51.267259],[4.973991,51.475024],[5.606976,51.037298],[6.156658,50.803721],[6.043073,50.128052],[5.782417,50.090328],[5.674052,49.529484],[4.799222,49.985373],[4.286023,49.907497],[3.588184,50.378992],[3.123252,50.780363],[2.658422,50.796848],[2.513573,51.148506],[3.314971,51.345781]]]},"id":"BEL"},
-{"type":"Feature","properties":{"name":"Benin"},"geometry":{"type":"Polygon","coordinates":[[[2.691702,6.258817],[1.865241,6.142158],[1.618951,6.832038],[1.664478,9.12859],[1.463043,9.334624],[1.425061,9.825395],[1.077795,10.175607],[0.772336,10.470808],[0.899563,10.997339],[1.24347,11.110511],[1.447178,11.547719],[1.935986,11.64115],[2.154474,11.94015],[2.490164,12.233052],[2.848643,12.235636],[3.61118,11.660167],[3.572216,11.327939],[3.797112,10.734746],[3.60007,10.332186],[3.705438,10.06321],[3.220352,9.444153],[2.912308,9.137608],[2.723793,8.506845],[2.749063,7.870734],[2.691702,6.258817]]]},"id":"BEN"},
-{"type":"Feature","properties":{"name":"Burkina Faso"},"geometry":{"type":"Polygon","coordinates":[[[-2.827496,9.642461],[-3.511899,9.900326],[-3.980449,9.862344],[-4.330247,9.610835],[-4.779884,9.821985],[-4.954653,10.152714],[-5.404342,10.370737],[-5.470565,10.95127],[-5.197843,11.375146],[-5.220942,11.713859],[-4.427166,12.542646],[-4.280405,13.228444],[-4.006391,13.472485],[-3.522803,13.337662],[-3.103707,13.541267],[-2.967694,13.79815],[-2.191825,14.246418],[-2.001035,14.559008],[-1.066363,14.973815],[-0.515854,15.116158],[-0.266257,14.924309],[0.374892,14.928908],[0.295646,14.444235],[0.429928,13.988733],[0.993046,13.33575],[1.024103,12.851826],[2.177108,12.625018],[2.154474,11.94015],[1.935986,11.64115],[1.447178,11.547719],[1.24347,11.110511],[0.899563,10.997339],[0.023803,11.018682],[-0.438702,11.098341],[-0.761576,10.93693],[-1.203358,11.009819],[-2.940409,10.96269],[-2.963896,10.395335],[-2.827496,9.642461]]]},"id":"BFA"},
-{"type":"Feature","properties":{"name":"Bangladesh"},"geometry":{"type":"Polygon","coordinates":[[[92.672721,22.041239],[92.652257,21.324048],[92.303234,21.475485],[92.368554,20.670883],[92.082886,21.192195],[92.025215,21.70157],[91.834891,22.182936],[91.417087,22.765019],[90.496006,22.805017],[90.586957,22.392794],[90.272971,21.836368],[89.847467,22.039146],[89.70205,21.857116],[89.418863,21.966179],[89.031961,22.055708],[88.876312,22.879146],[88.52977,23.631142],[88.69994,24.233715],[88.084422,24.501657],[88.306373,24.866079],[88.931554,25.238692],[88.209789,25.768066],[88.563049,26.446526],[89.355094,26.014407],[89.832481,25.965082],[89.920693,25.26975],[90.872211,25.132601],[91.799596,25.147432],[92.376202,24.976693],[91.915093,24.130414],[91.46773,24.072639],[91.158963,23.503527],[91.706475,22.985264],[91.869928,23.624346],[92.146035,23.627499],[92.672721,22.041239]]]},"id":"BGD"},
-{"type":"Feature","properties":{"name":"Bulgaria"},"geometry":{"type":"Polygon","coordinates":[[[22.65715,44.234923],[22.944832,43.823785],[23.332302,43.897011],[24.100679,43.741051],[25.569272,43.688445],[26.065159,43.943494],[27.2424,44.175986],[27.970107,43.812468],[28.558081,43.707462],[28.039095,43.293172],[27.673898,42.577892],[27.99672,42.007359],[27.135739,42.141485],[26.117042,41.826905],[26.106138,41.328899],[25.197201,41.234486],[24.492645,41.583896],[23.692074,41.309081],[22.952377,41.337994],[22.881374,41.999297],[22.380526,42.32026],[22.545012,42.461362],[22.436595,42.580321],[22.604801,42.898519],[22.986019,43.211161],[22.500157,43.642814],[22.410446,44.008063],[22.65715,44.234923]]]},"id":"BGR"},
-{"type":"Feature","properties":{"name":"The Bahamas"},"geometry":{"type":"MultiPolygon","coordinates":[[[[-77.53466,23.75975],[-77.78,23.71],[-78.03405,24.28615],[-78.40848,24.57564],[-78.19087,25.2103],[-77.89,25.17],[-77.54,24.34],[-77.53466,23.75975]]],[[[-77.82,26.58],[-78.91,26.42],[-78.98,26.79],[-78.51,26.87],[-77.85,26.84],[-77.82,26.58]]],[[[-77,26.59],[-77.17255,25.87918],[-77.35641,26.00735],[-77.34,26.53],[-77.78802,26.92516],[-77.79,27.04],[-77,26.59]]]]},"id":"BHS"},
-{"type":"Feature","properties":{"name":"Bosnia and Herzegovina"},"geometry":{"type":"Polygon","coordinates":[[[19.005486,44.860234],[19.36803,44.863],[19.11761,44.42307],[19.59976,44.03847],[19.454,43.5681],[19.21852,43.52384],[19.03165,43.43253],[18.70648,43.20011],[18.56,42.65],[17.674922,43.028563],[17.297373,43.446341],[16.916156,43.667722],[16.456443,44.04124],[16.23966,44.351143],[15.750026,44.818712],[15.959367,45.233777],[16.318157,45.004127],[16.534939,45.211608],[17.002146,45.233777],[17.861783,45.06774],[18.553214,45.08159],[19.005486,44.860234]]]},"id":"BIH"},
-{"type":"Feature","properties":{"name":"Belarus"},"geometry":{"type":"Polygon","coordinates":[[[23.484128,53.912498],[24.450684,53.905702],[25.536354,54.282423],[25.768433,54.846963],[26.588279,55.167176],[26.494331,55.615107],[27.10246,55.783314],[28.176709,56.16913],[29.229513,55.918344],[29.371572,55.670091],[29.896294,55.789463],[30.873909,55.550976],[30.971836,55.081548],[30.757534,54.811771],[31.384472,54.157056],[31.791424,53.974639],[31.731273,53.794029],[32.405599,53.618045],[32.693643,53.351421],[32.304519,53.132726],[31.497644,53.167427],[31.305201,53.073996],[31.540018,52.742052],[31.785998,52.101678],[30.927549,52.042353],[30.619454,51.822806],[30.555117,51.319503],[30.157364,51.416138],[29.254938,51.368234],[28.992835,51.602044],[28.617613,51.427714],[28.241615,51.572227],[27.454066,51.592303],[26.337959,51.832289],[25.327788,51.910656],[24.553106,51.888461],[24.005078,51.617444],[23.527071,51.578454],[23.508002,52.023647],[23.199494,52.486977],[23.799199,52.691099],[23.804935,53.089731],[23.527536,53.470122],[23.484128,53.912498]]]},"id":"BLR"},
-{"type":"Feature","properties":{"name":"Belize"},"geometry":{"type":"Polygon","coordinates":[[[-89.14308,17.808319],[-89.150909,17.955468],[-89.029857,18.001511],[-88.848344,17.883198],[-88.490123,18.486831],[-88.300031,18.499982],[-88.296336,18.353273],[-88.106813,18.348674],[-88.123479,18.076675],[-88.285355,17.644143],[-88.197867,17.489475],[-88.302641,17.131694],[-88.239518,17.036066],[-88.355428,16.530774],[-88.551825,16.265467],[-88.732434,16.233635],[-88.930613,15.887273],[-89.229122,15.886938],[-89.150806,17.015577],[-89.14308,17.808319]]]},"id":"BLZ"},
-{"type":"Feature","properties":{"name":"Bolivia"},"geometry":{"type":"Polygon","coordinates":[[[-62.846468,-22.034985],[-63.986838,-21.993644],[-64.377021,-22.798091],[-64.964892,-22.075862],[-66.273339,-21.83231],[-67.106674,-22.735925],[-67.82818,-22.872919],[-68.219913,-21.494347],[-68.757167,-20.372658],[-68.442225,-19.405068],[-68.966818,-18.981683],[-69.100247,-18.260125],[-69.590424,-17.580012],[-68.959635,-16.500698],[-69.389764,-15.660129],[-69.160347,-15.323974],[-69.339535,-14.953195],[-68.948887,-14.453639],[-68.929224,-13.602684],[-68.88008,-12.899729],[-68.66508,-12.5613],[-69.529678,-10.951734],[-68.786158,-11.03638],[-68.271254,-11.014521],[-68.048192,-10.712059],[-67.173801,-10.306812],[-66.646908,-9.931331],[-65.338435,-9.761988],[-65.444837,-10.511451],[-65.321899,-10.895872],[-65.402281,-11.56627],[-64.316353,-12.461978],[-63.196499,-12.627033],[-62.80306,-13.000653],[-62.127081,-13.198781],[-61.713204,-13.489202],[-61.084121,-13.479384],[-60.503304,-13.775955],[-60.459198,-14.354007],[-60.264326,-14.645979],[-60.251149,-15.077219],[-60.542966,-15.09391],[-60.15839,-16.258284],[-58.24122,-16.299573],[-58.388058,-16.877109],[-58.280804,-17.27171],[-57.734558,-17.552468],[-57.498371,-18.174188],[-57.676009,-18.96184],[-57.949997,-19.400004],[-57.853802,-19.969995],[-58.166392,-20.176701],[-58.183471,-19.868399],[-59.115042,-19.356906],[-60.043565,-19.342747],[-61.786326,-19.633737],[-62.265961,-20.513735],[-62.291179,-21.051635],[-62.685057,-22.249029],[-62.846468,-22.034985]]]},"id":"BOL"},
-{"type":"Feature","properties":{"name":"Brazil"},"geometry":{"type":"Polygon","coordinates":[[[-57.625133,-30.216295],[-56.2909,-28.852761],[-55.162286,-27.881915],[-54.490725,-27.474757],[-53.648735,-26.923473],[-53.628349,-26.124865],[-54.13005,-25.547639],[-54.625291,-25.739255],[-54.428946,-25.162185],[-54.293476,-24.5708],[-54.29296,-24.021014],[-54.652834,-23.839578],[-55.027902,-24.001274],[-55.400747,-23.956935],[-55.517639,-23.571998],[-55.610683,-22.655619],[-55.797958,-22.35693],[-56.473317,-22.0863],[-56.88151,-22.282154],[-57.937156,-22.090176],[-57.870674,-20.732688],[-58.166392,-20.176701],[-57.853802,-19.969995],[-57.949997,-19.400004],[-57.676009,-18.96184],[-57.498371,-18.174188],[-57.734558,-17.552468],[-58.280804,-17.27171],[-58.388058,-16.877109],[-58.24122,-16.299573],[-60.15839,-16.258284],[-60.542966,-15.09391],[-60.251149,-15.077219],[-60.264326,-14.645979],[-60.459198,-14.354007],[-60.503304,-13.775955],[-61.084121,-13.479384],[-61.713204,-13.489202],[-62.127081,-13.198781],[-62.80306,-13.000653],[-63.196499,-12.627033],[-64.316353,-12.461978],[-65.402281,-11.56627],[-65.321899,-10.895872],[-65.444837,-10.511451],[-65.338435,-9.761988],[-66.646908,-9.931331],[-67.173801,-10.306812],[-68.048192,-10.712059],[-68.271254,-11.014521],[-68.786158,-11.03638],[-69.529678,-10.951734],[-70.093752,-11.123972],[-70.548686,-11.009147],[-70.481894,-9.490118],[-71.302412,-10.079436],[-72.184891,-10.053598],[-72.563033,-9.520194],[-73.226713,-9.462213],[-73.015383,-9.032833],[-73.571059,-8.424447],[-73.987235,-7.52383],[-73.723401,-7.340999],[-73.724487,-6.918595],[-73.120027,-6.629931],[-73.219711,-6.089189],[-72.964507,-5.741251],[-72.891928,-5.274561],[-71.748406,-4.593983],[-70.928843,-4.401591],[-70.794769,-4.251265],[-69.893635,-4.298187],[-69.444102,-1.556287],[-69.420486,-1.122619],[-69.577065,-0.549992],[-70.020656,-0.185156],[-70.015566,0.541414],[-69.452396,0.706159],[-69.252434,0.602651],[-69.218638,0.985677],[-69.804597,1.089081],[-69.816973,1.714805],[-67.868565,1.692455],[-67.53781,2.037163],[-67.259998,1.719999],[-67.065048,1.130112],[-66.876326,1.253361],[-66.325765,0.724452],[-65.548267,0.789254],[-65.354713,1.095282],[-64.611012,1.328731],[-64.199306,1.492855],[-64.083085,1.916369],[-63.368788,2.2009],[-63.422867,2.411068],[-64.269999,2.497006],[-64.408828,3.126786],[-64.368494,3.79721],[-64.816064,4.056445],[-64.628659,4.148481],[-63.888343,4.02053],[-63.093198,3.770571],[-62.804533,4.006965],[-62.08543,4.162124],[-60.966893,4.536468],[-60.601179,4.918098],[-60.733574,5.200277],[-60.213683,5.244486],[-59.980959,5.014061],[-60.111002,4.574967],[-59.767406,4.423503],[-59.53804,3.958803],[-59.815413,3.606499],[-59.974525,2.755233],[-59.718546,2.24963],[-59.646044,1.786894],[-59.030862,1.317698],[-58.540013,1.268088],[-58.429477,1.463942],[-58.11345,1.507195],[-57.660971,1.682585],[-57.335823,1.948538],[-56.782704,1.863711],[-56.539386,1.899523],[-55.995698,1.817667],[-55.9056,2.021996],[-56.073342,2.220795],[-55.973322,2.510364],[-55.569755,2.421506],[-55.097587,2.523748],[-54.524754,2.311849],[-54.088063,2.105557],[-53.778521,2.376703],[-53.554839,2.334897],[-53.418465,2.053389],[-52.939657,2.124858],[-52.556425,2.504705],[-52.249338,3.241094],[-51.657797,4.156232],[-51.317146,4.203491],[-51.069771,3.650398],[-50.508875,1.901564],[-49.974076,1.736483],[-49.947101,1.04619],[-50.699251,0.222984],[-50.388211,-0.078445],[-48.620567,-0.235489],[-48.584497,-1.237805],[-47.824956,-0.581618],[-46.566584,-0.941028],[-44.905703,-1.55174],[-44.417619,-2.13775],[-44.581589,-2.691308],[-43.418791,-2.38311],[-41.472657,-2.912018],[-39.978665,-2.873054],[-38.500383,-3.700652],[-37.223252,-4.820946],[-36.452937,-5.109404],[-35.597796,-5.149504],[-35.235389,-5.464937],[-34.89603,-6.738193],[-34.729993,-7.343221],[-35.128212,-8.996401],[-35.636967,-9.649282],[-37.046519,-11.040721],[-37.683612,-12.171195],[-38.423877,-13.038119],[-38.673887,-13.057652],[-38.953276,-13.79337],[-38.882298,-15.667054],[-39.161092,-17.208407],[-39.267339,-17.867746],[-39.583521,-18.262296],[-39.760823,-19.599113],[-40.774741,-20.904512],[-40.944756,-21.937317],[-41.754164,-22.370676],[-41.988284,-22.97007],[-43.074704,-22.967693],[-44.647812,-23.351959],[-45.352136,-23.796842],[-46.472093,-24.088969],[-47.648972,-24.885199],[-48.495458,-25.877025],[-48.641005,-26.623698],[-48.474736,-27.175912],[-48.66152,-28.186135],[-48.888457,-28.674115],[-49.587329,-29.224469],[-50.696874,-30.984465],[-51.576226,-31.777698],[-52.256081,-32.24537],[-52.7121,-33.196578],[-53.373662,-33.768378],[-53.650544,-33.202004],[-53.209589,-32.727666],[-53.787952,-32.047243],[-54.572452,-31.494511],[-55.60151,-30.853879],[-55.973245,-30.883076],[-56.976026,-30.109686],[-57.625133,-30.216295]]]},"id":"BRA"},
-{"type":"Feature","properties":{"name":"Brunei"},"geometry":{"type":"Polygon","coordinates":[[[114.204017,4.525874],[114.599961,4.900011],[115.45071,5.44773],[115.4057,4.955228],[115.347461,4.316636],[114.869557,4.348314],[114.659596,4.007637],[114.204017,4.525874]]]},"id":"BRN"},
-{"type":"Feature","properties":{"name":"Bhutan"},"geometry":{"type":"Polygon","coordinates":[[[91.696657,27.771742],[92.103712,27.452614],[92.033484,26.83831],[91.217513,26.808648],[90.373275,26.875724],[89.744528,26.719403],[88.835643,27.098966],[88.814248,27.299316],[89.47581,28.042759],[90.015829,28.296439],[90.730514,28.064954],[91.258854,28.040614],[91.696657,27.771742]]]},"id":"BTN"},
-{"type":"Feature","properties":{"name":"Botswana"},"geometry":{"type":"Polygon","coordinates":[[[25.649163,-18.536026],[25.850391,-18.714413],[26.164791,-19.293086],[27.296505,-20.39152],[27.724747,-20.499059],[27.727228,-20.851802],[28.02137,-21.485975],[28.794656,-21.639454],[29.432188,-22.091313],[28.017236,-22.827754],[27.11941,-23.574323],[26.786407,-24.240691],[26.485753,-24.616327],[25.941652,-24.696373],[25.765849,-25.174845],[25.664666,-25.486816],[25.025171,-25.71967],[24.211267,-25.670216],[23.73357,-25.390129],[23.312097,-25.26869],[22.824271,-25.500459],[22.579532,-25.979448],[22.105969,-26.280256],[21.605896,-26.726534],[20.889609,-26.828543],[20.66647,-26.477453],[20.758609,-25.868136],[20.165726,-24.917962],[19.895768,-24.76779],[19.895458,-21.849157],[20.881134,-21.814327],[20.910641,-18.252219],[21.65504,-18.219146],[23.196858,-17.869038],[23.579006,-18.281261],[24.217365,-17.889347],[24.520705,-17.887125],[25.084443,-17.661816],[25.264226,-17.73654],[25.649163,-18.536026]]]},"id":"BWA"},
-{"type":"Feature","properties":{"name":"Central African Republic"},"geometry":{"type":"Polygon","coordinates":[[[15.27946,7.421925],[16.106232,7.497088],[16.290562,7.754307],[16.456185,7.734774],[16.705988,7.508328],[17.96493,7.890914],[18.389555,8.281304],[18.911022,8.630895],[18.81201,8.982915],[19.094008,9.074847],[20.059685,9.012706],[21.000868,9.475985],[21.723822,10.567056],[22.231129,10.971889],[22.864165,11.142395],[22.977544,10.714463],[23.554304,10.089255],[23.55725,9.681218],[23.394779,9.265068],[23.459013,8.954286],[23.805813,8.666319],[24.567369,8.229188],[25.114932,7.825104],[25.124131,7.500085],[25.796648,6.979316],[26.213418,6.546603],[26.465909,5.946717],[27.213409,5.550953],[27.374226,5.233944],[27.044065,5.127853],[26.402761,5.150875],[25.650455,5.256088],[25.278798,5.170408],[25.128833,4.927245],[24.805029,4.897247],[24.410531,5.108784],[23.297214,4.609693],[22.84148,4.710126],[22.704124,4.633051],[22.405124,4.02916],[21.659123,4.224342],[20.927591,4.322786],[20.290679,4.691678],[19.467784,5.031528],[18.932312,4.709506],[18.542982,4.201785],[18.453065,3.504386],[17.8099,3.560196],[17.133042,3.728197],[16.537058,3.198255],[16.012852,2.26764],[15.907381,2.557389],[15.862732,3.013537],[15.405396,3.335301],[15.03622,3.851367],[14.950953,4.210389],[14.478372,4.732605],[14.558936,5.030598],[14.459407,5.451761],[14.53656,6.226959],[14.776545,6.408498],[15.27946,7.421925]]]},"id":"CAF"},
-{"type":"Feature","properties":{"name":"Canada"},"geometry":{"type":"MultiPolygon","coordinates":[[[[-63.6645,46.55001],[-62.9393,46.41587],[-62.01208,46.44314],[-62.50391,46.03339],[-62.87433,45.96818],[-64.1428,46.39265],[-64.39261,46.72747],[-64.01486,47.03601],[-63.6645,46.55001]]],[[[-61.806305,49.10506],[-62.29318,49.08717],[-63.58926,49.40069],[-64.51912,49.87304],[-64.17322,49.95718],[-62.85829,49.70641],[-61.835585,49.28855],[-61.806305,49.10506]]],[[[-123.510002,48.510011],[-124.012891,48.370846],[-125.655013,48.825005],[-125.954994,49.179996],[-126.850004,49.53],[-127.029993,49.814996],[-128.059336,49.994959],[-128.444584,50.539138],[-128.358414,50.770648],[-127.308581,50.552574],[-126.695001,50.400903],[-125.755007,50.295018],[-125.415002,49.950001],[-124.920768,49.475275],[-123.922509,49.062484],[-123.510002,48.510011]]],[[[-56.134036,50.68701],[-56.795882,49.812309],[-56.143105,50.150117],[-55.471492,49.935815],[-55.822401,49.587129],[-54.935143,49.313011],[-54.473775,49.556691],[-53.476549,49.249139],[-53.786014,48.516781],[-53.086134,48.687804],[-52.958648,48.157164],[-52.648099,47.535548],[-53.069158,46.655499],[-53.521456,46.618292],[-54.178936,46.807066],[-53.961869,47.625207],[-54.240482,47.752279],[-55.400773,46.884994],[-55.997481,46.91972],[-55.291219,47.389562],[-56.250799,47.632545],[-57.325229,47.572807],[-59.266015,47.603348],[-59.419494,47.899454],[-58.796586,48.251525],[-59.231625,48.523188],[-58.391805,49.125581],[-57.35869,50.718274],[-56.73865,51.287438],[-55.870977,51.632094],[-55.406974,51.588273],[-55.600218,51.317075],[-56.134036,50.68701]]],[[[-132.710008,54.040009],[-132.710009,54.040009],[-132.710008,54.040009],[-132.710008,54.040009],[-131.74999,54.120004],[-132.04948,52.984621],[-131.179043,52.180433],[-131.57783,52.182371],[-132.180428,52.639707],[-132.549992,53.100015],[-133.054611,53.411469],[-133.239664,53.85108],[-133.180004,54.169975],[-132.710008,54.040009]]],[[[-79.26582,62.158675],[-79.65752,61.63308],[-80.09956,61.7181],[-80.36215,62.01649],[-80.315395,62.085565],[-79.92939,62.3856],[-79.52002,62.36371],[-79.26582,62.158675]]],[[[-81.89825,62.7108],[-83.06857,62.15922],[-83.77462,62.18231],[-83.99367,62.4528],[-83.25048,62.91409],[-81.87699,62.90458],[-81.89825,62.7108]]],[[[-85.161308,65.657285],[-84.975764,65.217518],[-84.464012,65.371772],[-83.882626,65.109618],[-82.787577,64.766693],[-81.642014,64.455136],[-81.55344,63.979609],[-80.817361,64.057486],[-80.103451,63.725981],[-80.99102,63.411246],[-82.547178,63.651722],[-83.108798,64.101876],[-84.100417,63.569712],[-85.523405,63.052379],[-85.866769,63.637253],[-87.221983,63.541238],[-86.35276,64.035833],[-86.224886,64.822917],[-85.883848,65.738778],[-85.161308,65.657285]]],[[[-75.86588,67.14886],[-76.98687,67.09873],[-77.2364,67.58809],[-76.81166,68.14856],[-75.89521,68.28721],[-75.1145,68.01036],[-75.10333,67.58202],[-75.21597,67.44425],[-75.86588,67.14886]]],[[[-95.647681,69.10769],[-96.269521,68.75704],[-97.617401,69.06003],[-98.431801,68.9507],[-99.797401,69.40003],[-98.917401,69.71003],[-98.218261,70.14354],[-97.157401,69.86003],[-96.557401,69.68003],[-96.257401,69.49003],[-95.647681,69.10769]]],[[[-90.5471,69.49766],[-90.55151,68.47499],[-89.21515,69.25873],[-88.01966,68.61508],[-88.31749,67.87338],[-87.35017,67.19872],[-86.30607,67.92146],[-85.57664,68.78456],[-85.52197,69.88211],[-84.10081,69.80539],[-82.62258,69.65826],[-81.28043,69.16202],[-81.2202,68.66567],[-81.96436,68.13253],[-81.25928,67.59716],[-81.38653,67.11078],[-83.34456,66.41154],[-84.73542,66.2573],[-85.76943,66.55833],[-86.0676,66.05625],[-87.03143,65.21297],[-87.32324,64.77563],[-88.48296,64.09897],[-89.91444,64.03273],[-90.70398,63.61017],[-90.77004,62.96021],[-91.93342,62.83508],[-93.15698,62.02469],[-94.24153,60.89865],[-94.62931,60.11021],[-94.6846,58.94882],[-93.21502,58.78212],[-92.76462,57.84571],[-92.29703,57.08709],[-90.89769,57.28468],[-89.03953,56.85172],[-88.03978,56.47162],[-87.32421,55.99914],[-86.07121,55.72383],[-85.01181,55.3026],[-83.36055,55.24489],[-82.27285,55.14832],[-82.4362,54.28227],[-82.12502,53.27703],[-81.40075,52.15788],[-79.91289,51.20842],[-79.14301,51.53393],[-78.60191,52.56208],[-79.12421,54.14145],[-79.82958,54.66772],[-78.22874,55.13645],[-77.0956,55.83741],[-76.54137,56.53423],[-76.62319,57.20263],[-77.30226,58.05209],[-78.51688,58.80458],[-77.33676,59.85261],[-77.77272,60.75788],[-78.10687,62.31964],[-77.41067,62.55053],[-75.69621,62.2784],[-74.6682,62.18111],[-73.83988,62.4438],[-72.90853,62.10507],[-71.67708,61.52535],[-71.37369,61.13717],[-69.59042,61.06141],[-69.62033,60.22125],[-69.2879,58.95736],[-68.37455,58.80106],[-67.64976,58.21206],[-66.20178,58.76731],[-65.24517,59.87071],[-64.58352,60.33558],[-63.80475,59.4426],[-62.50236,58.16708],[-61.39655,56.96745],[-61.79866,56.33945],[-60.46853,55.77548],[-59.56962,55.20407],[-57.97508,54.94549],[-57.3332,54.6265],[-56.93689,53.78032],[-56.15811,53.64749],[-55.75632,53.27036],[-55.68338,52.14664],[-56.40916,51.7707],[-57.12691,51.41972],[-58.77482,51.0643],[-60.03309,50.24277],[-61.72366,50.08046],[-63.86251,50.29099],[-65.36331,50.2982],[-66.39905,50.22897],[-67.23631,49.51156],[-68.51114,49.06836],[-69.95362,47.74488],[-71.10458,46.82171],[-70.25522,46.98606],[-68.65,48.3],[-66.55243,49.1331],[-65.05626,49.23278],[-64.17099,48.74248],[-65.11545,48.07085],[-64.79854,46.99297],[-64.47219,46.23849],[-63.17329,45.73902],[-61.52072,45.88377],[-60.51815,47.00793],[-60.4486,46.28264],[-59.80287,45.9204],[-61.03988,45.26525],[-63.25471,44.67014],[-64.24656,44.26553],[-65.36406,43.54523],[-66.1234,43.61867],[-66.16173,44.46512],[-64.42549,45.29204],[-66.02605,45.25931],[-67.13741,45.13753],[-67.79134,45.70281],[-67.79046,47.06636],[-68.23444,47.35486],[-68.905,47.185],[-69.237216,47.447781],[-69.99997,46.69307],[-70.305,45.915],[-70.66,45.46],[-71.08482,45.30524],[-71.405,45.255],[-71.50506,45.0082],[-73.34783,45.00738],[-74.867,45.00048],[-75.31821,44.81645],[-76.375,44.09631],[-76.5,44.018459],[-76.820034,43.628784],[-77.737885,43.629056],[-78.72028,43.625089],[-79.171674,43.466339],[-79.01,43.27],[-78.92,42.965],[-78.939362,42.863611],[-80.247448,42.3662],[-81.277747,42.209026],[-82.439278,41.675105],[-82.690089,41.675105],[-83.02981,41.832796],[-83.142,41.975681],[-83.12,42.08],[-82.9,42.43],[-82.43,42.98],[-82.137642,43.571088],[-82.337763,44.44],[-82.550925,45.347517],[-83.592851,45.816894],[-83.469551,45.994686],[-83.616131,46.116927],[-83.890765,46.116927],[-84.091851,46.275419],[-84.14212,46.512226],[-84.3367,46.40877],[-84.6049,46.4396],[-84.543749,46.538684],[-84.779238,46.637102],[-84.87608,46.900083],[-85.652363,47.220219],[-86.461991,47.553338],[-87.439793,47.94],[-88.378114,48.302918],[-89.272917,48.019808],[-89.6,48.01],[-90.83,48.27],[-91.64,48.14],[-92.61,48.45],[-93.63087,48.60926],[-94.32914,48.67074],[-94.64,48.84],[-94.81758,49.38905],[-95.15609,49.38425],[-95.15907,49],[-97.22872,49.0007],[-100.65,49],[-104.04826,48.99986],[-107.05,49],[-110.05,49],[-113,49],[-116.04818,49],[-117.03121,49],[-120,49],[-122.84,49],[-122.97421,49.002538],[-124.91024,49.98456],[-125.62461,50.41656],[-127.43561,50.83061],[-127.99276,51.71583],[-127.85032,52.32961],[-129.12979,52.75538],[-129.30523,53.56159],[-130.51497,54.28757],[-130.53611,54.80278],[-129.98,55.285],[-130.00778,55.91583],[-131.70781,56.55212],[-132.73042,57.69289],[-133.35556,58.41028],[-134.27111,58.86111],[-134.945,59.27056],[-135.47583,59.78778],[-136.47972,59.46389],[-137.4525,58.905],[-138.34089,59.56211],[-139.039,60],[-140.013,60.27682],[-140.99778,60.30639],[-140.9925,66.00003],[-140.986,69.712],[-139.12052,69.47102],[-137.54636,68.99002],[-136.50358,68.89804],[-135.62576,69.31512],[-134.41464,69.62743],[-132.92925,69.50534],[-131.43136,69.94451],[-129.79471,70.19369],[-129.10773,69.77927],[-128.36156,70.01286],[-128.13817,70.48384],[-127.44712,70.37721],[-125.75632,69.48058],[-124.42483,70.1584],[-124.28968,69.39969],[-123.06108,69.56372],[-122.6835,69.85553],[-121.47226,69.79778],[-119.94288,69.37786],[-117.60268,69.01128],[-116.22643,68.84151],[-115.2469,68.90591],[-113.89794,68.3989],[-115.30489,67.90261],[-113.49727,67.68815],[-110.798,67.80612],[-109.94619,67.98104],[-108.8802,67.38144],[-107.79239,67.88736],[-108.81299,68.31164],[-108.16721,68.65392],[-106.95,68.7],[-106.15,68.8],[-105.34282,68.56122],[-104.33791,68.018],[-103.22115,68.09775],[-101.45433,67.64689],[-99.90195,67.80566],[-98.4432,67.78165],[-98.5586,68.40394],[-97.66948,68.57864],[-96.11991,68.23939],[-96.12588,67.29338],[-95.48943,68.0907],[-94.685,68.06383],[-94.23282,69.06903],[-95.30408,69.68571],[-96.47131,70.08976],[-96.39115,71.19482],[-95.2088,71.92053],[-93.88997,71.76015],[-92.87818,71.31869],[-91.51964,70.19129],[-92.40692,69.69997],[-90.5471,69.49766]]],[[[-114.16717,73.12145],[-114.66634,72.65277],[-112.44102,72.9554],[-111.05039,72.4504],[-109.92035,72.96113],[-109.00654,72.63335],[-108.18835,71.65089],[-107.68599,72.06548],[-108.39639,73.08953],[-107.51645,73.23598],[-106.52259,73.07601],[-105.40246,72.67259],[-104.77484,71.6984],[-104.46476,70.99297],[-102.78537,70.49776],[-100.98078,70.02432],[-101.08929,69.58447],[-102.73116,69.50402],[-102.09329,69.11962],[-102.43024,68.75282],[-104.24,68.91],[-105.96,69.18],[-107.12254,69.11922],[-109,68.78],[-111.534149,68.630059],[-113.3132,68.53554],[-113.85496,69.00744],[-115.22,69.28],[-116.10794,69.16821],[-117.34,69.96],[-116.67473,70.06655],[-115.13112,70.2373],[-113.72141,70.19237],[-112.4161,70.36638],[-114.35,70.6],[-116.48684,70.52045],[-117.9048,70.54056],[-118.43238,70.9092],[-116.11311,71.30918],[-117.65568,71.2952],[-119.40199,71.55859],[-118.56267,72.30785],[-117.86642,72.70594],[-115.18909,73.31459],[-114.16717,73.12145]]],[[[-104.5,73.42],[-105.38,72.76],[-106.94,73.46],[-106.6,73.6],[-105.26,73.64],[-104.5,73.42]]],[[[-76.34,73.102685],[-76.251404,72.826385],[-77.314438,72.855545],[-78.39167,72.876656],[-79.486252,72.742203],[-79.775833,72.802902],[-80.876099,73.333183],[-80.833885,73.693184],[-80.353058,73.75972],[-78.064438,73.651932],[-76.34,73.102685]]],[[[-86.562179,73.157447],[-85.774371,72.534126],[-84.850112,73.340278],[-82.31559,73.750951],[-80.600088,72.716544],[-80.748942,72.061907],[-78.770639,72.352173],[-77.824624,72.749617],[-75.605845,72.243678],[-74.228616,71.767144],[-74.099141,71.33084],[-72.242226,71.556925],[-71.200015,70.920013],[-68.786054,70.525024],[-67.91497,70.121948],[-66.969033,69.186087],[-68.805123,68.720198],[-66.449866,68.067163],[-64.862314,67.847539],[-63.424934,66.928473],[-61.851981,66.862121],[-62.163177,66.160251],[-63.918444,64.998669],[-65.14886,65.426033],[-66.721219,66.388041],[-68.015016,66.262726],[-68.141287,65.689789],[-67.089646,65.108455],[-65.73208,64.648406],[-65.320168,64.382737],[-64.669406,63.392927],[-65.013804,62.674185],[-66.275045,62.945099],[-68.783186,63.74567],[-67.369681,62.883966],[-66.328297,62.280075],[-66.165568,61.930897],[-68.877367,62.330149],[-71.023437,62.910708],[-72.235379,63.397836],[-71.886278,63.679989],[-73.378306,64.193963],[-74.834419,64.679076],[-74.818503,64.389093],[-77.70998,64.229542],[-78.555949,64.572906],[-77.897281,65.309192],[-76.018274,65.326969],[-73.959795,65.454765],[-74.293883,65.811771],[-73.944912,66.310578],[-72.651167,67.284576],[-72.92606,67.726926],[-73.311618,68.069437],[-74.843307,68.554627],[-76.869101,68.894736],[-76.228649,69.147769],[-77.28737,69.76954],[-78.168634,69.826488],[-78.957242,70.16688],[-79.492455,69.871808],[-81.305471,69.743185],[-84.944706,69.966634],[-87.060003,70.260001],[-88.681713,70.410741],[-89.51342,70.762038],[-88.467721,71.218186],[-89.888151,71.222552],[-90.20516,72.235074],[-89.436577,73.129464],[-88.408242,73.537889],[-85.826151,73.803816],[-86.562179,73.157447]]],[[[-100.35642,73.84389],[-99.16387,73.63339],[-97.38,73.76],[-97.12,73.47],[-98.05359,72.99052],[-96.54,72.56],[-96.72,71.66],[-98.35966,71.27285],[-99.32286,71.35639],[-100.01482,71.73827],[-102.5,72.51],[-102.48,72.83],[-100.43836,72.70588],[-101.54,73.36],[-100.35642,73.84389]]],[[[-93.196296,72.771992],[-94.269047,72.024596],[-95.409856,72.061881],[-96.033745,72.940277],[-96.018268,73.43743],[-95.495793,73.862417],[-94.503658,74.134907],[-92.420012,74.100025],[-90.509793,73.856732],[-92.003965,72.966244],[-93.196296,72.771992]]],[[[-120.46,71.383602],[-123.09219,70.90164],[-123.62,71.34],[-125.928949,71.868688],[-125.5,72.292261],[-124.80729,73.02256],[-123.94,73.68],[-124.91775,74.29275],[-121.53788,74.44893],[-120.10978,74.24135],[-117.55564,74.18577],[-116.58442,73.89607],[-115.51081,73.47519],[-116.76794,73.22292],[-119.22,72.52],[-120.46,71.82],[-120.46,71.383602]]],[[[-93.612756,74.979997],[-94.156909,74.592347],[-95.608681,74.666864],[-96.820932,74.927623],[-96.288587,75.377828],[-94.85082,75.647218],[-93.977747,75.29649],[-93.612756,74.979997]]],[[[-98.5,76.72],[-97.735585,76.25656],[-97.704415,75.74344],[-98.16,75],[-99.80874,74.89744],[-100.88366,75.05736],[-100.86292,75.64075],[-102.50209,75.5638],[-102.56552,76.3366],[-101.48973,76.30537],[-99.98349,76.64634],[-98.57699,76.58859],[-98.5,76.72]]],[[[-108.21141,76.20168],[-107.81943,75.84552],[-106.92893,76.01282],[-105.881,75.9694],[-105.70498,75.47951],[-106.31347,75.00527],[-109.7,74.85],[-112.22307,74.41696],[-113.74381,74.39427],[-113.87135,74.72029],[-111.79421,75.1625],[-116.31221,75.04343],[-117.7104,75.2222],[-116.34602,76.19903],[-115.40487,76.47887],[-112.59056,76.14134],[-110.81422,75.54919],[-109.0671,75.47321],[-110.49726,76.42982],[-109.5811,76.79417],[-108.54859,76.67832],[-108.21141,76.20168]]],[[[-94.684086,77.097878],[-93.573921,76.776296],[-91.605023,76.778518],[-90.741846,76.449597],[-90.969661,76.074013],[-89.822238,75.847774],[-89.187083,75.610166],[-87.838276,75.566189],[-86.379192,75.482421],[-84.789625,75.699204],[-82.753445,75.784315],[-81.128531,75.713983],[-80.057511,75.336849],[-79.833933,74.923127],[-80.457771,74.657304],[-81.948843,74.442459],[-83.228894,74.564028],[-86.097452,74.410032],[-88.15035,74.392307],[-89.764722,74.515555],[-92.422441,74.837758],[-92.768285,75.38682],[-92.889906,75.882655],[-93.893824,76.319244],[-95.962457,76.441381],[-97.121379,76.751078],[-96.745123,77.161389],[-94.684086,77.097878]]],[[[-116.198587,77.645287],[-116.335813,76.876962],[-117.106051,76.530032],[-118.040412,76.481172],[-119.899318,76.053213],[-121.499995,75.900019],[-122.854924,76.116543],[-122.854925,76.116543],[-121.157535,76.864508],[-119.103939,77.51222],[-117.570131,77.498319],[-116.198587,77.645287]]],[[[-93.840003,77.519997],[-94.295608,77.491343],[-96.169654,77.555111],[-96.436304,77.834629],[-94.422577,77.820005],[-93.720656,77.634331],[-93.840003,77.519997]]],[[[-110.186938,77.697015],[-112.051191,77.409229],[-113.534279,77.732207],[-112.724587,78.05105],[-111.264443,78.152956],[-109.854452,77.996325],[-110.186938,77.697015]]],[[[-109.663146,78.601973],[-110.881314,78.40692],[-112.542091,78.407902],[-112.525891,78.550555],[-111.50001,78.849994],[-110.963661,78.804441],[-109.663146,78.601973]]],[[[-95.830295,78.056941],[-97.309843,77.850597],[-98.124289,78.082857],[-98.552868,78.458105],[-98.631984,78.87193],[-97.337231,78.831984],[-96.754399,78.765813],[-95.559278,78.418315],[-95.830295,78.056941]]],[[[-100.060192,78.324754],[-99.670939,77.907545],[-101.30394,78.018985],[-102.949809,78.343229],[-105.176133,78.380332],[-104.210429,78.67742],[-105.41958,78.918336],[-105.492289,79.301594],[-103.529282,79.165349],[-100.825158,78.800462],[-100.060192,78.324754]]],[[[-87.02,79.66],[-85.81435,79.3369],[-87.18756,79.0393],[-89.03535,78.28723],[-90.80436,78.21533],[-92.87669,78.34333],[-93.95116,78.75099],[-93.93574,79.11373],[-93.14524,79.3801],[-94.974,79.37248],[-96.07614,79.70502],[-96.70972,80.15777],[-96.01644,80.60233],[-95.32345,80.90729],[-94.29843,80.97727],[-94.73542,81.20646],[-92.40984,81.25739],[-91.13289,80.72345],[-89.45,80.509322],[-87.81,80.32],[-87.02,79.66]]],[[[-68.5,83.106322],[-65.82735,83.02801],[-63.68,82.9],[-61.85,82.6286],[-61.89388,82.36165],[-64.334,81.92775],[-66.75342,81.72527],[-67.65755,81.50141],[-65.48031,81.50657],[-67.84,80.9],[-69.4697,80.61683],[-71.18,79.8],[-73.2428,79.63415],[-73.88,79.430162],[-76.90773,79.32309],[-75.52924,79.19766],[-76.22046,79.01907],[-75.39345,78.52581],[-76.34354,78.18296],[-77.88851,77.89991],[-78.36269,77.50859],[-79.75951,77.20968],[-79.61965,76.98336],[-77.91089,77.022045],[-77.88911,76.777955],[-80.56125,76.17812],[-83.17439,76.45403],[-86.11184,76.29901],[-87.6,76.42],[-89.49068,76.47239],[-89.6161,76.95213],[-87.76739,77.17833],[-88.26,77.9],[-87.65,77.970222],[-84.97634,77.53873],[-86.34,78.18],[-87.96192,78.37181],[-87.15198,78.75867],[-85.37868,78.9969],[-85.09495,79.34543],[-86.50734,79.73624],[-86.93179,80.25145],[-84.19844,80.20836],[-83.408696,80.1],[-81.84823,80.46442],[-84.1,80.58],[-87.59895,80.51627],[-89.36663,80.85569],[-90.2,81.26],[-91.36786,81.5531],[-91.58702,81.89429],[-90.1,82.085],[-88.93227,82.11751],[-86.97024,82.27961],[-85.5,82.652273],[-84.260005,82.6],[-83.18,82.32],[-82.42,82.86],[-81.1,83.02],[-79.30664,83.13056],[-76.25,83.172059],[-75.71878,83.06404],[-72.83153,83.23324],[-70.665765,83.169781],[-68.5,83.106322]]]]},"id":"CAN"},
-{"type":"Feature","properties":{"name":"Switzerland"},"geometry":{"type":"Polygon","coordinates":[[[9.594226,47.525058],[9.632932,47.347601],[9.47997,47.10281],[9.932448,46.920728],[10.442701,46.893546],[10.363378,46.483571],[9.922837,46.314899],[9.182882,46.440215],[8.966306,46.036932],[8.489952,46.005151],[8.31663,46.163642],[7.755992,45.82449],[7.273851,45.776948],[6.843593,45.991147],[6.5001,46.429673],[6.022609,46.27299],[6.037389,46.725779],[6.768714,47.287708],[6.736571,47.541801],[7.192202,47.449766],[7.466759,47.620582],[8.317301,47.61358],[8.522612,47.830828],[9.594226,47.525058]]]},"id":"CHE"},
-{"type":"Feature","properties":{"name":"Chile"},"geometry":{"type":"MultiPolygon","coordinates":[[[[-68.63401,-52.63637],[-68.63335,-54.8695],[-67.56244,-54.87001],[-66.95992,-54.89681],[-67.29103,-55.30124],[-68.14863,-55.61183],[-68.639991,-55.580018],[-69.2321,-55.49906],[-69.95809,-55.19843],[-71.00568,-55.05383],[-72.2639,-54.49514],[-73.2852,-53.95752],[-74.66253,-52.83749],[-73.8381,-53.04743],[-72.43418,-53.7154],[-71.10773,-54.07433],[-70.59178,-53.61583],[-70.26748,-52.93123],[-69.34565,-52.5183],[-68.63401,-52.63637]]],[[[-68.219913,-21.494347],[-67.82818,-22.872919],[-67.106674,-22.735925],[-66.985234,-22.986349],[-67.328443,-24.025303],[-68.417653,-24.518555],[-68.386001,-26.185016],[-68.5948,-26.506909],[-68.295542,-26.89934],[-69.001235,-27.521214],[-69.65613,-28.459141],[-70.01355,-29.367923],[-69.919008,-30.336339],[-70.535069,-31.36501],[-70.074399,-33.09121],[-69.814777,-33.273886],[-69.817309,-34.193571],[-70.388049,-35.169688],[-70.364769,-36.005089],[-71.121881,-36.658124],[-71.118625,-37.576827],[-70.814664,-38.552995],[-71.413517,-38.916022],[-71.680761,-39.808164],[-71.915734,-40.832339],[-71.746804,-42.051386],[-72.148898,-42.254888],[-71.915424,-43.408565],[-71.464056,-43.787611],[-71.793623,-44.207172],[-71.329801,-44.407522],[-71.222779,-44.784243],[-71.659316,-44.973689],[-71.552009,-45.560733],[-71.917258,-46.884838],[-72.447355,-47.738533],[-72.331161,-48.244238],[-72.648247,-48.878618],[-73.415436,-49.318436],[-73.328051,-50.378785],[-72.975747,-50.74145],[-72.309974,-50.67701],[-72.329404,-51.425956],[-71.914804,-52.009022],[-69.498362,-52.142761],[-68.571545,-52.299444],[-69.461284,-52.291951],[-69.94278,-52.537931],[-70.845102,-52.899201],[-71.006332,-53.833252],[-71.429795,-53.856455],[-72.557943,-53.53141],[-73.702757,-52.835069],[-73.702757,-52.83507],[-74.946763,-52.262754],[-75.260026,-51.629355],[-74.976632,-51.043396],[-75.479754,-50.378372],[-75.608015,-48.673773],[-75.18277,-47.711919],[-74.126581,-46.939253],[-75.644395,-46.647643],[-74.692154,-45.763976],[-74.351709,-44.103044],[-73.240356,-44.454961],[-72.717804,-42.383356],[-73.3889,-42.117532],[-73.701336,-43.365776],[-74.331943,-43.224958],[-74.017957,-41.794813],[-73.677099,-39.942213],[-73.217593,-39.258689],[-73.505559,-38.282883],[-73.588061,-37.156285],[-73.166717,-37.12378],[-72.553137,-35.50884],[-71.861732,-33.909093],[-71.43845,-32.418899],[-71.668721,-30.920645],[-71.370083,-30.095682],[-71.489894,-28.861442],[-70.905124,-27.64038],[-70.724954,-25.705924],[-70.403966,-23.628997],[-70.091246,-21.393319],[-70.16442,-19.756468],[-70.372572,-18.347975],[-69.858444,-18.092694],[-69.590424,-17.580012],[-69.100247,-18.260125],[-68.966818,-18.981683],[-68.442225,-19.405068],[-68.757167,-20.372658],[-68.219913,-21.494347]]]]},"id":"CHL"},
-{"type":"Feature","properties":{"name":"China"},"geometry":{"type":"MultiPolygon","coordinates":[[[[110.339188,18.678395],[109.47521,18.197701],[108.655208,18.507682],[108.626217,19.367888],[109.119056,19.821039],[110.211599,20.101254],[110.786551,20.077534],[111.010051,19.69593],[110.570647,19.255879],[110.339188,18.678395]]],[[[127.657407,49.76027],[129.397818,49.4406],[130.582293,48.729687],[130.987282,47.790132],[132.506672,47.78897],[133.373596,48.183442],[135.026311,48.47823],[134.500814,47.57844],[134.112362,47.212467],[133.769644,46.116927],[133.097127,45.144066],[131.883454,45.321162],[131.025212,44.967953],[131.288555,44.11152],[131.144688,42.92999],[130.633866,42.903015],[130.640016,42.395009],[129.994267,42.985387],[129.596669,42.424982],[128.052215,41.994285],[128.208433,41.466772],[127.343783,41.503152],[126.869083,41.816569],[126.182045,41.107336],[125.079942,40.569824],[124.265625,39.928493],[122.86757,39.637788],[122.131388,39.170452],[121.054554,38.897471],[121.585995,39.360854],[121.376757,39.750261],[122.168595,40.422443],[121.640359,40.94639],[120.768629,40.593388],[119.639602,39.898056],[119.023464,39.252333],[118.042749,39.204274],[117.532702,38.737636],[118.059699,38.061476],[118.87815,37.897325],[118.911636,37.448464],[119.702802,37.156389],[120.823457,37.870428],[121.711259,37.481123],[122.357937,37.454484],[122.519995,36.930614],[121.104164,36.651329],[120.637009,36.11144],[119.664562,35.609791],[119.151208,34.909859],[120.227525,34.360332],[120.620369,33.376723],[121.229014,32.460319],[121.908146,31.692174],[121.891919,30.949352],[121.264257,30.676267],[121.503519,30.142915],[122.092114,29.83252],[121.938428,29.018022],[121.684439,28.225513],[121.125661,28.135673],[120.395473,27.053207],[119.585497,25.740781],[118.656871,24.547391],[117.281606,23.624501],[115.890735,22.782873],[114.763827,22.668074],[114.152547,22.22376],[113.80678,22.54834],[113.241078,22.051367],[111.843592,21.550494],[110.785466,21.397144],[110.444039,20.341033],[109.889861,20.282457],[109.627655,21.008227],[109.864488,21.395051],[108.522813,21.715212],[108.05018,21.55238],[107.04342,21.811899],[106.567273,22.218205],[106.725403,22.794268],[105.811247,22.976892],[105.329209,23.352063],[104.476858,22.81915],[103.504515,22.703757],[102.706992,22.708795],[102.170436,22.464753],[101.652018,22.318199],[101.80312,21.174367],[101.270026,21.201652],[101.180005,21.436573],[101.150033,21.849984],[100.416538,21.558839],[99.983489,21.742937],[99.240899,22.118314],[99.531992,22.949039],[98.898749,23.142722],[98.660262,24.063286],[97.60472,23.897405],[97.724609,25.083637],[98.671838,25.918703],[98.712094,26.743536],[98.68269,27.508812],[98.246231,27.747221],[97.911988,28.335945],[97.327114,28.261583],[96.248833,28.411031],[96.586591,28.83098],[96.117679,29.452802],[95.404802,29.031717],[94.56599,29.277438],[93.413348,28.640629],[92.503119,27.896876],[91.696657,27.771742],[91.258854,28.040614],[90.730514,28.064954],[90.015829,28.296439],[89.47581,28.042759],[88.814248,27.299316],[88.730326,28.086865],[88.120441,27.876542],[86.954517,27.974262],[85.82332,28.203576],[85.011638,28.642774],[84.23458,28.839894],[83.898993,29.320226],[83.337115,29.463732],[82.327513,30.115268],[81.525804,30.422717],[81.111256,30.183481],[79.721367,30.882715],[78.738894,31.515906],[78.458446,32.618164],[79.176129,32.48378],[79.208892,32.994395],[78.811086,33.506198],[78.912269,34.321936],[77.837451,35.49401],[76.192848,35.898403],[75.896897,36.666806],[75.158028,37.133031],[74.980002,37.41999],[74.829986,37.990007],[74.864816,38.378846],[74.257514,38.606507],[73.928852,38.505815],[73.675379,39.431237],[73.960013,39.660008],[73.822244,39.893973],[74.776862,40.366425],[75.467828,40.562072],[76.526368,40.427946],[76.904484,41.066486],[78.187197,41.185316],[78.543661,41.582243],[80.11943,42.123941],[80.25999,42.349999],[80.18015,42.920068],[80.866206,43.180362],[79.966106,44.917517],[81.947071,45.317027],[82.458926,45.53965],[83.180484,47.330031],[85.16429,47.000956],[85.720484,47.452969],[85.768233,48.455751],[86.598776,48.549182],[87.35997,49.214981],[87.751264,49.297198],[88.013832,48.599463],[88.854298,48.069082],[90.280826,47.693549],[90.970809,46.888146],[90.585768,45.719716],[90.94554,45.286073],[92.133891,45.115076],[93.480734,44.975472],[94.688929,44.352332],[95.306875,44.241331],[95.762455,43.319449],[96.349396,42.725635],[97.451757,42.74889],[99.515817,42.524691],[100.845866,42.663804],[101.83304,42.514873],[103.312278,41.907468],[104.522282,41.908347],[104.964994,41.59741],[106.129316,42.134328],[107.744773,42.481516],[109.243596,42.519446],[110.412103,42.871234],[111.129682,43.406834],[111.829588,43.743118],[111.667737,44.073176],[111.348377,44.457442],[111.873306,45.102079],[112.436062,45.011646],[113.463907,44.808893],[114.460332,45.339817],[115.985096,45.727235],[116.717868,46.388202],[117.421701,46.672733],[118.874326,46.805412],[119.66327,46.69268],[119.772824,47.048059],[118.866574,47.74706],[118.064143,48.06673],[117.295507,47.697709],[116.308953,47.85341],[115.742837,47.726545],[115.485282,48.135383],[116.191802,49.134598],[116.678801,49.888531],[117.879244,49.510983],[119.288461,50.142883],[119.279366,50.582908],[120.18205,51.643566],[120.738191,51.964115],[120.725789,52.516226],[120.177089,52.753886],[121.003085,53.251401],[122.245748,53.431726],[123.571507,53.458804],[125.068211,53.161045],[125.946349,52.792799],[126.564399,51.784255],[126.939157,51.353894],[127.287456,50.739797],[127.657407,49.76027]]]]},"id":"CHN"},
-{"type":"Feature","properties":{"name":"Ivory Coast"},"geometry":{"type":"Polygon","coordinates":[[[-2.856125,4.994476],[-3.311084,4.984296],[-4.00882,5.179813],[-4.649917,5.168264],[-5.834496,4.993701],[-6.528769,4.705088],[-7.518941,4.338288],[-7.712159,4.364566],[-7.635368,5.188159],[-7.539715,5.313345],[-7.570153,5.707352],[-7.993693,6.12619],[-8.311348,6.193033],[-8.60288,6.467564],[-8.385452,6.911801],[-8.485446,7.395208],[-8.439298,7.686043],[-8.280703,7.68718],[-8.221792,8.123329],[-8.299049,8.316444],[-8.203499,8.455453],[-7.8321,8.575704],[-8.079114,9.376224],[-8.309616,9.789532],[-8.229337,10.12902],[-8.029944,10.206535],[-7.89959,10.297382],[-7.622759,10.147236],[-6.850507,10.138994],[-6.666461,10.430811],[-6.493965,10.411303],[-6.205223,10.524061],[-6.050452,10.096361],[-5.816926,10.222555],[-5.404342,10.370737],[-4.954653,10.152714],[-4.779884,9.821985],[-4.330247,9.610835],[-3.980449,9.862344],[-3.511899,9.900326],[-2.827496,9.642461],[-2.56219,8.219628],[-2.983585,7.379705],[-3.24437,6.250472],[-2.810701,5.389051],[-2.856125,4.994476]]]},"id":"CIV"},
-{"type":"Feature","properties":{"name":"Cameroon"},"geometry":{"type":"Polygon","coordinates":[[[13.075822,2.267097],[12.951334,2.321616],[12.35938,2.192812],[11.751665,2.326758],[11.276449,2.261051],[9.649158,2.283866],[9.795196,3.073404],[9.404367,3.734527],[8.948116,3.904129],[8.744924,4.352215],[8.488816,4.495617],[8.500288,4.771983],[8.757533,5.479666],[9.233163,6.444491],[9.522706,6.453482],[10.118277,7.03877],[10.497375,7.055358],[11.058788,6.644427],[11.745774,6.981383],[11.839309,7.397042],[12.063946,7.799808],[12.218872,8.305824],[12.753672,8.717763],[12.955468,9.417772],[13.1676,9.640626],[13.308676,10.160362],[13.57295,10.798566],[14.415379,11.572369],[14.468192,11.904752],[14.577178,12.085361],[14.181336,12.483657],[14.213531,12.802035],[14.495787,12.859396],[14.893386,12.219048],[14.960152,11.555574],[14.923565,10.891325],[15.467873,9.982337],[14.909354,9.992129],[14.627201,9.920919],[14.171466,10.021378],[13.954218,9.549495],[14.544467,8.965861],[14.979996,8.796104],[15.120866,8.38215],[15.436092,7.692812],[15.27946,7.421925],[14.776545,6.408498],[14.53656,6.226959],[14.459407,5.451761],[14.558936,5.030598],[14.478372,4.732605],[14.950953,4.210389],[15.03622,3.851367],[15.405396,3.335301],[15.862732,3.013537],[15.907381,2.557389],[16.012852,2.26764],[15.940919,1.727673],[15.146342,1.964015],[14.337813,2.227875],[13.075822,2.267097]]]},"id":"CMR"},
-{"type":"Feature","properties":{"name":"Democratic Republic of the Congo"},"geometry":{"type":"Polygon","coordinates":[[[30.83386,3.509166],[30.773347,2.339883],[31.174149,2.204465],[30.85267,1.849396],[30.468508,1.583805],[30.086154,1.062313],[29.875779,0.59738],[29.819503,-0.20531],[29.587838,-0.587406],[29.579466,-1.341313],[29.291887,-1.620056],[29.254835,-2.21511],[29.117479,-2.292211],[29.024926,-2.839258],[29.276384,-3.293907],[29.339998,-4.499983],[29.519987,-5.419979],[29.419993,-5.939999],[29.620032,-6.520015],[30.199997,-7.079981],[30.740015,-8.340007],[30.346086,-8.238257],[29.002912,-8.407032],[28.734867,-8.526559],[28.449871,-9.164918],[28.673682,-9.605925],[28.49607,-10.789884],[28.372253,-11.793647],[28.642417,-11.971569],[29.341548,-12.360744],[29.616001,-12.178895],[29.699614,-13.257227],[28.934286,-13.248958],[28.523562,-12.698604],[28.155109,-12.272481],[27.388799,-12.132747],[27.16442,-11.608748],[26.553088,-11.92444],[25.75231,-11.784965],[25.418118,-11.330936],[24.78317,-11.238694],[24.314516,-11.262826],[24.257155,-10.951993],[23.912215,-10.926826],[23.456791,-10.867863],[22.837345,-11.017622],[22.402798,-10.993075],[22.155268,-11.084801],[22.208753,-9.894796],[21.875182,-9.523708],[21.801801,-8.908707],[21.949131,-8.305901],[21.746456,-7.920085],[21.728111,-7.290872],[20.514748,-7.299606],[20.601823,-6.939318],[20.091622,-6.94309],[20.037723,-7.116361],[19.417502,-7.155429],[19.166613,-7.738184],[19.016752,-7.988246],[18.464176,-7.847014],[18.134222,-7.987678],[17.47297,-8.068551],[17.089996,-7.545689],[16.860191,-7.222298],[16.57318,-6.622645],[16.326528,-5.87747],[13.375597,-5.864241],[13.024869,-5.984389],[12.735171,-5.965682],[12.322432,-6.100092],[12.182337,-5.789931],[12.436688,-5.684304],[12.468004,-5.248362],[12.631612,-4.991271],[12.995517,-4.781103],[13.25824,-4.882957],[13.600235,-4.500138],[14.144956,-4.510009],[14.209035,-4.793092],[14.582604,-4.970239],[15.170992,-4.343507],[15.75354,-3.855165],[16.00629,-3.535133],[15.972803,-2.712392],[16.407092,-1.740927],[16.865307,-1.225816],[17.523716,-0.74383],[17.638645,-0.424832],[17.663553,-0.058084],[17.82654,0.288923],[17.774192,0.855659],[17.898835,1.741832],[18.094276,2.365722],[18.393792,2.900443],[18.453065,3.504386],[18.542982,4.201785],[18.932312,4.709506],[19.467784,5.031528],[20.290679,4.691678],[20.927591,4.322786],[21.659123,4.224342],[22.405124,4.02916],[22.704124,4.633051],[22.84148,4.710126],[23.297214,4.609693],[24.410531,5.108784],[24.805029,4.897247],[25.128833,4.927245],[25.278798,5.170408],[25.650455,5.256088],[26.402761,5.150875],[27.044065,5.127853],[27.374226,5.233944],[27.979977,4.408413],[28.428994,4.287155],[28.696678,4.455077],[29.159078,4.389267],[29.715995,4.600805],[29.9535,4.173699],[30.83386,3.509166]]]},"id":"COD"},
-{"type":"Feature","properties":{"name":"Republic of the Congo"},"geometry":{"type":"Polygon","coordinates":[[[12.995517,-4.781103],[12.62076,-4.438023],[12.318608,-4.60623],[11.914963,-5.037987],[11.093773,-3.978827],[11.855122,-3.426871],[11.478039,-2.765619],[11.820964,-2.514161],[12.495703,-2.391688],[12.575284,-1.948511],[13.109619,-2.42874],[13.992407,-2.470805],[14.29921,-1.998276],[14.425456,-1.333407],[14.316418,-0.552627],[13.843321,0.038758],[14.276266,1.19693],[14.026669,1.395677],[13.282631,1.314184],[13.003114,1.830896],[13.075822,2.267097],[14.337813,2.227875],[15.146342,1.964015],[15.940919,1.727673],[16.012852,2.26764],[16.537058,3.198255],[17.133042,3.728197],[17.8099,3.560196],[18.453065,3.504386],[18.393792,2.900443],[18.094276,2.365722],[17.898835,1.741832],[17.774192,0.855659],[17.82654,0.288923],[17.663553,-0.058084],[17.638645,-0.424832],[17.523716,-0.74383],[16.865307,-1.225816],[16.407092,-1.740927],[15.972803,-2.712392],[16.00629,-3.535133],[15.75354,-3.855165],[15.170992,-4.343507],[14.582604,-4.970239],[14.209035,-4.793092],[14.144956,-4.510009],[13.600235,-4.500138],[13.25824,-4.882957],[12.995517,-4.781103]]]},"id":"COG"},
-{"type":"Feature","properties":{"name":"Colombia"},"geometry":{"type":"Polygon","coordinates":[[[-75.373223,-0.152032],[-75.801466,0.084801],[-76.292314,0.416047],[-76.57638,0.256936],[-77.424984,0.395687],[-77.668613,0.825893],[-77.855061,0.809925],[-78.855259,1.380924],[-78.990935,1.69137],[-78.617831,1.766404],[-78.662118,2.267355],[-78.42761,2.629556],[-77.931543,2.696606],[-77.510431,3.325017],[-77.12769,3.849636],[-77.496272,4.087606],[-77.307601,4.667984],[-77.533221,5.582812],[-77.318815,5.845354],[-77.476661,6.691116],[-77.881571,7.223771],[-77.753414,7.70984],[-77.431108,7.638061],[-77.242566,7.935278],[-77.474723,8.524286],[-77.353361,8.670505],[-76.836674,8.638749],[-76.086384,9.336821],[-75.6746,9.443248],[-75.664704,9.774003],[-75.480426,10.61899],[-74.906895,11.083045],[-74.276753,11.102036],[-74.197223,11.310473],[-73.414764,11.227015],[-72.627835,11.731972],[-72.238195,11.95555],[-71.75409,12.437303],[-71.399822,12.376041],[-71.137461,12.112982],[-71.331584,11.776284],[-71.973922,11.608672],[-72.227575,11.108702],[-72.614658,10.821975],[-72.905286,10.450344],[-73.027604,9.73677],[-73.304952,9.152],[-72.78873,9.085027],[-72.660495,8.625288],[-72.439862,8.405275],[-72.360901,8.002638],[-72.479679,7.632506],[-72.444487,7.423785],[-72.198352,7.340431],[-71.960176,6.991615],[-70.674234,7.087785],[-70.093313,6.960376],[-69.38948,6.099861],[-68.985319,6.206805],[-68.265052,6.153268],[-67.695087,6.267318],[-67.34144,6.095468],[-67.521532,5.55687],[-67.744697,5.221129],[-67.823012,4.503937],[-67.621836,3.839482],[-67.337564,3.542342],[-67.303173,3.318454],[-67.809938,2.820655],[-67.447092,2.600281],[-67.181294,2.250638],[-66.876326,1.253361],[-67.065048,1.130112],[-67.259998,1.719999],[-67.53781,2.037163],[-67.868565,1.692455],[-69.816973,1.714805],[-69.804597,1.089081],[-69.218638,0.985677],[-69.252434,0.602651],[-69.452396,0.706159],[-70.015566,0.541414],[-70.020656,-0.185156],[-69.577065,-0.549992],[-69.420486,-1.122619],[-69.444102,-1.556287],[-69.893635,-4.298187],[-70.394044,-3.766591],[-70.692682,-3.742872],[-70.047709,-2.725156],[-70.813476,-2.256865],[-71.413646,-2.342802],[-71.774761,-2.16979],[-72.325787,-2.434218],[-73.070392,-2.308954],[-73.659504,-1.260491],[-74.122395,-1.002833],[-74.441601,-0.53082],[-75.106625,-0.057205],[-75.373223,-0.152032]]]},"id":"COL"},
-{"type":"Feature","properties":{"name":"Costa Rica"},"geometry":{"type":"Polygon","coordinates":[[[-82.965783,8.225028],[-83.508437,8.446927],[-83.711474,8.656836],[-83.596313,8.830443],[-83.632642,9.051386],[-83.909886,9.290803],[-84.303402,9.487354],[-84.647644,9.615537],[-84.713351,9.908052],[-84.97566,10.086723],[-84.911375,9.795992],[-85.110923,9.55704],[-85.339488,9.834542],[-85.660787,9.933347],[-85.797445,10.134886],[-85.791709,10.439337],[-85.659314,10.754331],[-85.941725,10.895278],[-85.71254,11.088445],[-85.561852,11.217119],[-84.903003,10.952303],[-84.673069,11.082657],[-84.355931,10.999226],[-84.190179,10.79345],[-83.895054,10.726839],[-83.655612,10.938764],[-83.40232,10.395438],[-83.015677,9.992982],[-82.546196,9.566135],[-82.932891,9.476812],[-82.927155,9.07433],[-82.719183,8.925709],[-82.868657,8.807266],[-82.829771,8.626295],[-82.913176,8.423517],[-82.965783,8.225028]]]},"id":"CRI"},
-{"type":"Feature","properties":{"name":"Cuba"},"geometry":{"type":"Polygon","coordinates":[[[-82.268151,23.188611],[-81.404457,23.117271],[-80.618769,23.10598],[-79.679524,22.765303],[-79.281486,22.399202],[-78.347434,22.512166],[-77.993296,22.277194],[-77.146422,21.657851],[-76.523825,21.20682],[-76.19462,21.220565],[-75.598222,21.016624],[-75.67106,20.735091],[-74.933896,20.693905],[-74.178025,20.284628],[-74.296648,20.050379],[-74.961595,19.923435],[-75.63468,19.873774],[-76.323656,19.952891],[-77.755481,19.855481],[-77.085108,20.413354],[-77.492655,20.673105],[-78.137292,20.739949],[-78.482827,21.028613],[-78.719867,21.598114],[-79.285,21.559175],[-80.217475,21.827324],[-80.517535,22.037079],[-81.820943,22.192057],[-82.169992,22.387109],[-81.795002,22.636965],[-82.775898,22.68815],[-83.494459,22.168518],[-83.9088,22.154565],[-84.052151,21.910575],[-84.54703,21.801228],[-84.974911,21.896028],[-84.447062,22.20495],[-84.230357,22.565755],[-83.77824,22.788118],[-83.267548,22.983042],[-82.510436,23.078747],[-82.268151,23.188611]]]},"id":"CUB"},
-{"type":"Feature","properties":{"name":"Northern Cyprus"},"geometry":{"type":"Polygon","coordinates":[[[32.73178,35.140026],[32.802474,35.145504],[32.946961,35.386703],[33.667227,35.373216],[34.576474,35.671596],[33.900804,35.245756],[33.973617,35.058506],[33.86644,35.093595],[33.675392,35.017863],[33.525685,35.038688],[33.475817,35.000345],[33.455922,35.101424],[33.383833,35.162712],[33.190977,35.173125],[32.919572,35.087833],[32.73178,35.140026]]]},"id":"-99"},
-{"type":"Feature","properties":{"name":"Cyprus"},"geometry":{"type":"Polygon","coordinates":[[[33.973617,35.058506],[34.004881,34.978098],[32.979827,34.571869],[32.490296,34.701655],[32.256667,35.103232],[32.73178,35.140026],[32.919572,35.087833],[33.190977,35.173125],[33.383833,35.162712],[33.455922,35.101424],[33.475817,35.000345],[33.525685,35.038688],[33.675392,35.017863],[33.86644,35.093595],[33.973617,35.058506]]]},"id":"CYP"},
-{"type":"Feature","properties":{"name":"Czech Republic"},"geometry":{"type":"Polygon","coordinates":[[[16.960288,48.596982],[16.499283,48.785808],[16.029647,48.733899],[15.253416,49.039074],[14.901447,48.964402],[14.338898,48.555305],[13.595946,48.877172],[13.031329,49.307068],[12.521024,49.547415],[12.415191,49.969121],[12.240111,50.266338],[12.966837,50.484076],[13.338132,50.733234],[14.056228,50.926918],[14.307013,51.117268],[14.570718,51.002339],[15.016996,51.106674],[15.490972,50.78473],[16.238627,50.697733],[16.176253,50.422607],[16.719476,50.215747],[16.868769,50.473974],[17.554567,50.362146],[17.649445,50.049038],[18.392914,49.988629],[18.853144,49.49623],[18.554971,49.495015],[18.399994,49.315001],[18.170498,49.271515],[18.104973,49.043983],[17.913512,48.996493],[17.886485,48.903475],[17.545007,48.800019],[17.101985,48.816969],[16.960288,48.596982]]]},"id":"CZE"},
-{"type":"Feature","properties":{"name":"Germany"},"geometry":{"type":"Polygon","coordinates":[[[9.921906,54.983104],[9.93958,54.596642],[10.950112,54.363607],[10.939467,54.008693],[11.956252,54.196486],[12.51844,54.470371],[13.647467,54.075511],[14.119686,53.757029],[14.353315,53.248171],[14.074521,52.981263],[14.4376,52.62485],[14.685026,52.089947],[14.607098,51.745188],[15.016996,51.106674],[14.570718,51.002339],[14.307013,51.117268],[14.056228,50.926918],[13.338132,50.733234],[12.966837,50.484076],[12.240111,50.266338],[12.415191,49.969121],[12.521024,49.547415],[13.031329,49.307068],[13.595946,48.877172],[13.243357,48.416115],[12.884103,48.289146],[13.025851,47.637584],[12.932627,47.467646],[12.62076,47.672388],[12.141357,47.703083],[11.426414,47.523766],[10.544504,47.566399],[10.402084,47.302488],[9.896068,47.580197],[9.594226,47.525058],[8.522612,47.830828],[8.317301,47.61358],[7.466759,47.620582],[7.593676,48.333019],[8.099279,49.017784],[6.65823,49.201958],[6.18632,49.463803],[6.242751,49.902226],[6.043073,50.128052],[6.156658,50.803721],[5.988658,51.851616],[6.589397,51.852029],[6.84287,52.22844],[7.092053,53.144043],[6.90514,53.482162],[7.100425,53.693932],[7.936239,53.748296],[8.121706,53.527792],[8.800734,54.020786],[8.572118,54.395646],[8.526229,54.962744],[9.282049,54.830865],[9.921906,54.983104]]]},"id":"DEU"},
-{"type":"Feature","properties":{"name":"Djibouti"},"geometry":{"type":"Polygon","coordinates":[[[43.081226,12.699639],[43.317852,12.390148],[43.286381,11.974928],[42.715874,11.735641],[43.145305,11.46204],[42.776852,10.926879],[42.55493,11.10511],[42.31414,11.0342],[41.75557,11.05091],[41.73959,11.35511],[41.66176,11.6312],[42,12.1],[42.35156,12.54223],[42.779642,12.455416],[43.081226,12.699639]]]},"id":"DJI"},
-{"type":"Feature","properties":{"name":"Denmark"},"geometry":{"type":"MultiPolygon","coordinates":[[[[12.690006,55.609991],[12.089991,54.800015],[11.043543,55.364864],[10.903914,55.779955],[12.370904,56.111407],[12.690006,55.609991]]],[[[10.912182,56.458621],[10.667804,56.081383],[10.369993,56.190007],[9.649985,55.469999],[9.921906,54.983104],[9.282049,54.830865],[8.526229,54.962744],[8.120311,55.517723],[8.089977,56.540012],[8.256582,56.809969],[8.543438,57.110003],[9.424469,57.172066],[9.775559,57.447941],[10.580006,57.730017],[10.546106,57.215733],[10.25,56.890016],[10.369993,56.609982],[10.912182,56.458621]]]]},"id":"DNK"},
-{"type":"Feature","properties":{"name":"Dominican Republic"},"geometry":{"type":"Polygon","coordinates":[[[-71.712361,19.714456],[-71.587304,19.884911],[-70.806706,19.880286],[-70.214365,19.622885],[-69.950815,19.648],[-69.76925,19.293267],[-69.222126,19.313214],[-69.254346,19.015196],[-68.809412,18.979074],[-68.317943,18.612198],[-68.689316,18.205142],[-69.164946,18.422648],[-69.623988,18.380713],[-69.952934,18.428307],[-70.133233,18.245915],[-70.517137,18.184291],[-70.669298,18.426886],[-70.99995,18.283329],[-71.40021,17.598564],[-71.657662,17.757573],[-71.708305,18.044997],[-71.687738,18.31666],[-71.945112,18.6169],[-71.701303,18.785417],[-71.624873,19.169838],[-71.712361,19.714456]]]},"id":"DOM"},
-{"type":"Feature","properties":{"name":"Algeria"},"geometry":{"type":"Polygon","coordinates":[[[11.999506,23.471668],[8.572893,21.565661],[5.677566,19.601207],[4.267419,19.155265],[3.158133,19.057364],[3.146661,19.693579],[2.683588,19.85623],[2.060991,20.142233],[1.823228,20.610809],[-1.550055,22.792666],[-4.923337,24.974574],[-8.6844,27.395744],[-8.665124,27.589479],[-8.66559,27.656426],[-8.674116,28.841289],[-7.059228,29.579228],[-6.060632,29.7317],[-5.242129,30.000443],[-4.859646,30.501188],[-3.690441,30.896952],[-3.647498,31.637294],[-3.06898,31.724498],[-2.616605,32.094346],[-1.307899,32.262889],[-1.124551,32.651522],[-1.388049,32.864015],[-1.733455,33.919713],[-1.792986,34.527919],[-2.169914,35.168396],[-1.208603,35.714849],[-0.127454,35.888662],[0.503877,36.301273],[1.466919,36.605647],[3.161699,36.783905],[4.815758,36.865037],[5.32012,36.716519],[6.26182,37.110655],[7.330385,37.118381],[7.737078,36.885708],[8.420964,36.946427],[8.217824,36.433177],[8.376368,35.479876],[8.140981,34.655146],[7.524482,34.097376],[7.612642,33.344115],[8.430473,32.748337],[8.439103,32.506285],[9.055603,32.102692],[9.48214,30.307556],[9.805634,29.424638],[9.859998,28.95999],[9.683885,28.144174],[9.756128,27.688259],[9.629056,27.140953],[9.716286,26.512206],[9.319411,26.094325],[9.910693,25.365455],[9.948261,24.936954],[10.303847,24.379313],[10.771364,24.562532],[11.560669,24.097909],[11.999506,23.471668]]]},"id":"DZA"},
-{"type":"Feature","properties":{"name":"Ecuador"},"geometry":{"type":"Polygon","coordinates":[[[-80.302561,-3.404856],[-79.770293,-2.657512],[-79.986559,-2.220794],[-80.368784,-2.685159],[-80.967765,-2.246943],[-80.764806,-1.965048],[-80.933659,-1.057455],[-80.58337,-0.906663],[-80.399325,-0.283703],[-80.020898,0.36034],[-80.09061,0.768429],[-79.542762,0.982938],[-78.855259,1.380924],[-77.855061,0.809925],[-77.668613,0.825893],[-77.424984,0.395687],[-76.57638,0.256936],[-76.292314,0.416047],[-75.801466,0.084801],[-75.373223,-0.152032],[-75.233723,-0.911417],[-75.544996,-1.56161],[-76.635394,-2.608678],[-77.837905,-3.003021],[-78.450684,-3.873097],[-78.639897,-4.547784],[-79.205289,-4.959129],[-79.624979,-4.454198],[-80.028908,-4.346091],[-80.442242,-4.425724],[-80.469295,-4.059287],[-80.184015,-3.821162],[-80.302561,-3.404856]]]},"id":"ECU"},
-{"type":"Feature","properties":{"name":"Egypt"},"geometry":{"type":"Polygon","coordinates":[[[34.9226,29.50133],[34.64174,29.09942],[34.42655,28.34399],[34.15451,27.8233],[33.92136,27.6487],[33.58811,27.97136],[33.13676,28.41765],[32.42323,29.85108],[32.32046,29.76043],[32.73482,28.70523],[33.34876,27.69989],[34.10455,26.14227],[34.47387,25.59856],[34.79507,25.03375],[35.69241,23.92671],[35.49372,23.75237],[35.52598,23.10244],[36.69069,22.20485],[36.86623,22],[32.9,22],[29.02,22],[25,22],[25,25.6825],[25,29.238655],[24.70007,30.04419],[24.95762,30.6616],[24.80287,31.08929],[25.16482,31.56915],[26.49533,31.58568],[27.45762,31.32126],[28.45048,31.02577],[28.91353,30.87005],[29.68342,31.18686],[30.09503,31.4734],[30.97693,31.55586],[31.68796,31.4296],[31.96041,30.9336],[32.19247,31.26034],[32.99392,31.02407],[33.7734,30.96746],[34.26544,31.21936],[34.9226,29.50133]]]},"id":"EGY"},
-{"type":"Feature","properties":{"name":"Eritrea"},"geometry":{"type":"Polygon","coordinates":[[[42.35156,12.54223],[42.00975,12.86582],[41.59856,13.45209],[41.155194,13.77332],[40.8966,14.11864],[40.026219,14.519579],[39.34061,14.53155],[39.0994,14.74064],[38.51295,14.50547],[37.90607,14.95943],[37.59377,14.2131],[36.42951,14.42211],[36.323189,14.822481],[36.75386,16.291874],[36.85253,16.95655],[37.16747,17.26314],[37.904,17.42754],[38.41009,17.998307],[38.990623,16.840626],[39.26611,15.922723],[39.814294,15.435647],[41.179275,14.49108],[41.734952,13.921037],[42.276831,13.343992],[42.589576,13.000421],[43.081226,12.699639],[42.779642,12.455416],[42.35156,12.54223]]]},"id":"ERI"},
-{"type":"Feature","properties":{"name":"Spain"},"geometry":{"type":"Polygon","coordinates":[[[-9.034818,41.880571],[-8.984433,42.592775],[-9.392884,43.026625],[-7.97819,43.748338],[-6.754492,43.567909],[-5.411886,43.57424],[-4.347843,43.403449],[-3.517532,43.455901],[-1.901351,43.422802],[-1.502771,43.034014],[0.338047,42.579546],[0.701591,42.795734],[1.826793,42.343385],[2.985999,42.473015],[3.039484,41.89212],[2.091842,41.226089],[0.810525,41.014732],[0.721331,40.678318],[0.106692,40.123934],[-0.278711,39.309978],[0.111291,38.738514],[-0.467124,38.292366],[-0.683389,37.642354],[-1.438382,37.443064],[-2.146453,36.674144],[-3.415781,36.6589],[-4.368901,36.677839],[-4.995219,36.324708],[-5.37716,35.94685],[-5.866432,36.029817],[-6.236694,36.367677],[-6.520191,36.942913],[-7.453726,37.097788],[-7.537105,37.428904],[-7.166508,37.803894],[-7.029281,38.075764],[-7.374092,38.373059],[-7.098037,39.030073],[-7.498632,39.629571],[-7.066592,39.711892],[-7.026413,40.184524],[-6.86402,40.330872],[-6.851127,41.111083],[-6.389088,41.381815],[-6.668606,41.883387],[-7.251309,41.918346],[-7.422513,41.792075],[-8.013175,41.790886],[-8.263857,42.280469],[-8.671946,42.134689],[-9.034818,41.880571]]]},"id":"ESP"},
-{"type":"Feature","properties":{"name":"Estonia"},"geometry":{"type":"Polygon","coordinates":[[[24.312863,57.793424],[24.428928,58.383413],[24.061198,58.257375],[23.42656,58.612753],[23.339795,59.18724],[24.604214,59.465854],[25.864189,59.61109],[26.949136,59.445803],[27.981114,59.475388],[28.131699,59.300825],[27.420166,58.724581],[27.716686,57.791899],[27.288185,57.474528],[26.463532,57.476389],[25.60281,57.847529],[25.164594,57.970157],[24.312863,57.793424]]]},"id":"EST"},
-{"type":"Feature","properties":{"name":"Ethiopia"},"geometry":{"type":"Polygon","coordinates":[[[37.90607,14.95943],[38.51295,14.50547],[39.0994,14.74064],[39.34061,14.53155],[40.02625,14.51959],[40.8966,14.11864],[41.1552,13.77333],[41.59856,13.45209],[42.00975,12.86582],[42.35156,12.54223],[42,12.1],[41.66176,11.6312],[41.73959,11.35511],[41.75557,11.05091],[42.31414,11.0342],[42.55493,11.10511],[42.776852,10.926879],[42.55876,10.57258],[42.92812,10.02194],[43.29699,9.54048],[43.67875,9.18358],[46.94834,7.99688],[47.78942,8.003],[44.9636,5.00162],[43.66087,4.95755],[42.76967,4.25259],[42.12861,4.23413],[41.855083,3.918912],[41.1718,3.91909],[40.76848,4.25702],[39.85494,3.83879],[39.559384,3.42206],[38.89251,3.50074],[38.67114,3.61607],[38.43697,3.58851],[38.120915,3.598605],[36.855093,4.447864],[36.159079,4.447864],[35.817448,4.776966],[35.817448,5.338232],[35.298007,5.506],[34.70702,6.59422],[34.25032,6.82607],[34.0751,7.22595],[33.56829,7.71334],[32.95418,7.78497],[33.2948,8.35458],[33.8255,8.37916],[33.97498,8.68456],[33.96162,9.58358],[34.25745,10.63009],[34.73115,10.91017],[34.83163,11.31896],[35.26049,12.08286],[35.86363,12.57828],[36.27022,13.56333],[36.42951,14.42211],[37.59377,14.2131],[37.90607,14.95943]]]},"id":"ETH"},
-{"type":"Feature","properties":{"name":"Finland"},"geometry":{"type":"Polygon","coordinates":[[[28.59193,69.064777],[28.445944,68.364613],[29.977426,67.698297],[29.054589,66.944286],[30.21765,65.80598],[29.54443,64.948672],[30.444685,64.204453],[30.035872,63.552814],[31.516092,62.867687],[31.139991,62.357693],[30.211107,61.780028],[28.069998,60.503517],[26.255173,60.423961],[24.496624,60.057316],[22.869695,59.846373],[22.290764,60.391921],[21.322244,60.72017],[21.544866,61.705329],[21.059211,62.607393],[21.536029,63.189735],[22.442744,63.81781],[24.730512,64.902344],[25.398068,65.111427],[25.294043,65.534346],[23.903379,66.006927],[23.56588,66.396051],[23.539473,67.936009],[21.978535,68.616846],[20.645593,69.106247],[21.244936,69.370443],[22.356238,68.841741],[23.66205,68.891247],[24.735679,68.649557],[25.689213,69.092114],[26.179622,69.825299],[27.732292,70.164193],[29.015573,69.766491],[28.59193,69.064777]]]},"id":"FIN"},
-{"type":"Feature","properties":{"name":"Fiji"},"geometry":{"type":"MultiPolygon","coordinates":[[[[178.3736,-17.33992],[178.71806,-17.62846],[178.55271,-18.15059],[177.93266,-18.28799],[177.38146,-18.16432],[177.28504,-17.72465],[177.67087,-17.38114],[178.12557,-17.50481],[178.3736,-17.33992]]],[[[179.364143,-16.801354],[178.725059,-17.012042],[178.596839,-16.63915],[179.096609,-16.433984],[179.413509,-16.379054],[180,-16.067133],[180,-16.555217],[179.364143,-16.801354]]],[[[-179.917369,-16.501783],[-180,-16.555217],[-180,-16.067133],[-179.79332,-16.020882],[-179.917369,-16.501783]]]]},"id":"FJI"},
-{"type":"Feature","properties":{"name":"Falkland Islands"},"geometry":{"type":"Polygon","coordinates":[[[-61.2,-51.85],[-60,-51.25],[-59.15,-51.5],[-58.55,-51.1],[-57.75,-51.55],[-58.05,-51.9],[-59.4,-52.2],[-59.85,-51.85],[-60.7,-52.3],[-61.2,-51.85]]]},"id":"FLK"},
-{"type":"Feature","properties":{"name":"France"},"geometry":{"type":"MultiPolygon","coordinates":[[[[9.560016,42.152492],[9.229752,41.380007],[8.775723,41.583612],[8.544213,42.256517],[8.746009,42.628122],[9.390001,43.009985],[9.560016,42.152492]]],[[[3.588184,50.378992],[4.286023,49.907497],[4.799222,49.985373],[5.674052,49.529484],[5.897759,49.442667],[6.18632,49.463803],[6.65823,49.201958],[8.099279,49.017784],[7.593676,48.333019],[7.466759,47.620582],[7.192202,47.449766],[6.736571,47.541801],[6.768714,47.287708],[6.037389,46.725779],[6.022609,46.27299],[6.5001,46.429673],[6.843593,45.991147],[6.802355,45.70858],[7.096652,45.333099],[6.749955,45.028518],[7.007562,44.254767],[7.549596,44.127901],[7.435185,43.693845],[6.529245,43.128892],[4.556963,43.399651],[3.100411,43.075201],[2.985999,42.473015],[1.826793,42.343385],[0.701591,42.795734],[0.338047,42.579546],[-1.502771,43.034014],[-1.901351,43.422802],[-1.384225,44.02261],[-1.193798,46.014918],[-2.225724,47.064363],[-2.963276,47.570327],[-4.491555,47.954954],[-4.59235,48.68416],[-3.295814,48.901692],[-1.616511,48.644421],[-1.933494,49.776342],[-0.989469,49.347376],[1.338761,50.127173],[1.639001,50.946606],[2.513573,51.148506],[2.658422,50.796848],[3.123252,50.780363],[3.588184,50.378992]]]]},"id":"FRA"},
-{"type":"Feature","properties":{"name":"French Guiana"},"geometry":{"type":"MultiPolygon","coordinates":[[[[-52.556425,2.504705],[-52.939657,2.124858],[-53.418465,2.053389],[-53.554839,2.334897],[-53.778521,2.376703],[-54.088063,2.105557],[-54.524754,2.311849],[-54.27123,2.738748],[-54.184284,3.194172],[-54.011504,3.62257],[-54.399542,4.212611],[-54.478633,4.896756],[-53.958045,5.756548],[-53.618453,5.646529],[-52.882141,5.409851],[-51.823343,4.565768],[-51.657797,4.156232],[-52.249338,3.241094],[-52.556425,2.504705]]]]},"id":"GUF"},
-{"type":"Feature","properties":{"name":"Gabon"},"geometry":{"type":"Polygon","coordinates":[[[11.093773,-3.978827],[10.066135,-2.969483],[9.405245,-2.144313],[8.797996,-1.111301],[8.830087,-0.779074],[9.04842,-0.459351],[9.291351,0.268666],[9.492889,1.01012],[9.830284,1.067894],[11.285079,1.057662],[11.276449,2.261051],[11.751665,2.326758],[12.35938,2.192812],[12.951334,2.321616],[13.075822,2.267097],[13.003114,1.830896],[13.282631,1.314184],[14.026669,1.395677],[14.276266,1.19693],[13.843321,0.038758],[14.316418,-0.552627],[14.425456,-1.333407],[14.29921,-1.998276],[13.992407,-2.470805],[13.109619,-2.42874],[12.575284,-1.948511],[12.495703,-2.391688],[11.820964,-2.514161],[11.478039,-2.765619],[11.855122,-3.426871],[11.093773,-3.978827]]]},"id":"GAB"},
-{"type":"Feature","properties":{"name":"United Kingdom"},"geometry":{"type":"MultiPolygon","coordinates":[[[[-5.661949,54.554603],[-6.197885,53.867565],[-6.95373,54.073702],[-7.572168,54.059956],[-7.366031,54.595841],[-7.572168,55.131622],[-6.733847,55.17286],[-5.661949,54.554603]]],[[[-3.005005,58.635],[-4.073828,57.553025],[-3.055002,57.690019],[-1.959281,57.6848],[-2.219988,56.870017],[-3.119003,55.973793],[-2.085009,55.909998],[-2.005676,55.804903],[-1.114991,54.624986],[-0.430485,54.464376],[0.184981,53.325014],[0.469977,52.929999],[1.681531,52.73952],[1.559988,52.099998],[1.050562,51.806761],[1.449865,51.289428],[0.550334,50.765739],[-0.787517,50.774989],[-2.489998,50.500019],[-2.956274,50.69688],[-3.617448,50.228356],[-4.542508,50.341837],[-5.245023,49.96],[-5.776567,50.159678],[-4.30999,51.210001],[-3.414851,51.426009],[-3.422719,51.426848],[-4.984367,51.593466],[-5.267296,51.9914],[-4.222347,52.301356],[-4.770013,52.840005],[-4.579999,53.495004],[-3.093831,53.404547],[-3.09208,53.404441],[-2.945009,53.985],[-3.614701,54.600937],[-3.630005,54.615013],[-4.844169,54.790971],[-5.082527,55.061601],[-4.719112,55.508473],[-5.047981,55.783986],[-5.586398,55.311146],[-5.644999,56.275015],[-6.149981,56.78501],[-5.786825,57.818848],[-5.009999,58.630013],[-4.211495,58.550845],[-3.005005,58.635]]]]},"id":"GBR"},
-{"type":"Feature","properties":{"name":"Georgia"},"geometry":{"type":"Polygon","coordinates":[[[41.554084,41.535656],[41.703171,41.962943],[41.45347,42.645123],[40.875469,43.013628],[40.321394,43.128634],[39.955009,43.434998],[40.076965,43.553104],[40.922185,43.382159],[42.394395,43.220308],[43.756017,42.740828],[43.9312,42.554974],[44.537623,42.711993],[45.470279,42.502781],[45.77641,42.092444],[46.404951,41.860675],[46.145432,41.722802],[46.637908,41.181673],[46.501637,41.064445],[45.962601,41.123873],[45.217426,41.411452],[44.97248,41.248129],[43.582746,41.092143],[42.619549,41.583173],[41.554084,41.535656]]]},"id":"GEO"},
-{"type":"Feature","properties":{"name":"Ghana"},"geometry":{"type":"Polygon","coordinates":[[[1.060122,5.928837],[-0.507638,5.343473],[-1.063625,5.000548],[-1.964707,4.710462],[-2.856125,4.994476],[-2.810701,5.389051],[-3.24437,6.250472],[-2.983585,7.379705],[-2.56219,8.219628],[-2.827496,9.642461],[-2.963896,10.395335],[-2.940409,10.96269],[-1.203358,11.009819],[-0.761576,10.93693],[-0.438702,11.098341],[0.023803,11.018682],[-0.049785,10.706918],[0.36758,10.191213],[0.365901,9.465004],[0.461192,8.677223],[0.712029,8.312465],[0.490957,7.411744],[0.570384,6.914359],[0.836931,6.279979],[1.060122,5.928837]]]},"id":"GHA"},
-{"type":"Feature","properties":{"name":"Guinea"},"geometry":{"type":"Polygon","coordinates":[[[-8.439298,7.686043],[-8.722124,7.711674],[-8.926065,7.309037],[-9.208786,7.313921],[-9.403348,7.526905],[-9.33728,7.928534],[-9.755342,8.541055],[-10.016567,8.428504],[-10.230094,8.406206],[-10.505477,8.348896],[-10.494315,8.715541],[-10.65477,8.977178],[-10.622395,9.26791],[-10.839152,9.688246],[-11.117481,10.045873],[-11.917277,10.046984],[-12.150338,9.858572],[-12.425929,9.835834],[-12.596719,9.620188],[-12.711958,9.342712],[-13.24655,8.903049],[-13.685154,9.494744],[-14.074045,9.886167],[-14.330076,10.01572],[-14.579699,10.214467],[-14.693232,10.656301],[-14.839554,10.876572],[-15.130311,11.040412],[-14.685687,11.527824],[-14.382192,11.509272],[-14.121406,11.677117],[-13.9008,11.678719],[-13.743161,11.811269],[-13.828272,12.142644],[-13.718744,12.247186],[-13.700476,12.586183],[-13.217818,12.575874],[-12.499051,12.33209],[-12.278599,12.35444],[-12.203565,12.465648],[-11.658301,12.386583],[-11.513943,12.442988],[-11.456169,12.076834],[-11.297574,12.077971],[-11.036556,12.211245],[-10.87083,12.177887],[-10.593224,11.923975],[-10.165214,11.844084],[-9.890993,12.060479],[-9.567912,12.194243],[-9.327616,12.334286],[-9.127474,12.30806],[-8.905265,12.088358],[-8.786099,11.812561],[-8.376305,11.393646],[-8.581305,11.136246],[-8.620321,10.810891],[-8.407311,10.909257],[-8.282357,10.792597],[-8.335377,10.494812],[-8.029944,10.206535],[-8.229337,10.12902],[-8.309616,9.789532],[-8.079114,9.376224],[-7.8321,8.575704],[-8.203499,8.455453],[-8.299049,8.316444],[-8.221792,8.123329],[-8.280703,7.68718],[-8.439298,7.686043]]]},"id":"GIN"},
-{"type":"Feature","properties":{"name":"Gambia"},"geometry":{"type":"Polygon","coordinates":[[[-16.841525,13.151394],[-16.713729,13.594959],[-15.624596,13.623587],[-15.39877,13.860369],[-15.081735,13.876492],[-14.687031,13.630357],[-14.376714,13.62568],[-14.046992,13.794068],[-13.844963,13.505042],[-14.277702,13.280585],[-14.712197,13.298207],[-15.141163,13.509512],[-15.511813,13.27857],[-15.691001,13.270353],[-15.931296,13.130284],[-16.841525,13.151394]]]},"id":"GMB"},
-{"type":"Feature","properties":{"name":"Guinea Bissau"},"geometry":{"type":"Polygon","coordinates":[[[-15.130311,11.040412],[-15.66418,11.458474],[-16.085214,11.524594],[-16.314787,11.806515],[-16.308947,11.958702],[-16.613838,12.170911],[-16.677452,12.384852],[-16.147717,12.547762],[-15.816574,12.515567],[-15.548477,12.62817],[-13.700476,12.586183],[-13.718744,12.247186],[-13.828272,12.142644],[-13.743161,11.811269],[-13.9008,11.678719],[-14.121406,11.677117],[-14.382192,11.509272],[-14.685687,11.527824],[-15.130311,11.040412]]]},"id":"GNB"},
-{"type":"Feature","properties":{"name":"Equatorial Guinea"},"geometry":{"type":"Polygon","coordinates":[[[9.492889,1.01012],[9.305613,1.160911],[9.649158,2.283866],[11.276449,2.261051],[11.285079,1.057662],[9.830284,1.067894],[9.492889,1.01012]]]},"id":"GNQ"},
-{"type":"Feature","properties":{"name":"Greece"},"geometry":{"type":"MultiPolygon","coordinates":[[[[23.69998,35.705004],[24.246665,35.368022],[25.025015,35.424996],[25.769208,35.354018],[25.745023,35.179998],[26.290003,35.29999],[26.164998,35.004995],[24.724982,34.919988],[24.735007,35.084991],[23.514978,35.279992],[23.69998,35.705004]]],[[[26.604196,41.562115],[26.294602,40.936261],[26.056942,40.824123],[25.447677,40.852545],[24.925848,40.947062],[23.714811,40.687129],[24.407999,40.124993],[23.899968,39.962006],[23.342999,39.960998],[22.813988,40.476005],[22.626299,40.256561],[22.849748,39.659311],[23.350027,39.190011],[22.973099,38.970903],[23.530016,38.510001],[24.025025,38.219993],[24.040011,37.655015],[23.115003,37.920011],[23.409972,37.409991],[22.774972,37.30501],[23.154225,36.422506],[22.490028,36.41],[21.670026,36.844986],[21.295011,37.644989],[21.120034,38.310323],[20.730032,38.769985],[20.217712,39.340235],[20.150016,39.624998],[20.615,40.110007],[20.674997,40.435],[20.99999,40.580004],[21.02004,40.842727],[21.674161,40.931275],[22.055378,41.149866],[22.597308,41.130487],[22.76177,41.3048],[22.952377,41.337994],[23.692074,41.309081],[24.492645,41.583896],[25.197201,41.234486],[26.106138,41.328899],[26.117042,41.826905],[26.604196,41.562115]]]]},"id":"GRC"},
-{"type":"Feature","properties":{"name":"Greenland"},"geometry":{"type":"Polygon","coordinates":[[[-46.76379,82.62796],[-43.40644,83.22516],[-39.89753,83.18018],[-38.62214,83.54905],[-35.08787,83.64513],[-27.10046,83.51966],[-20.84539,82.72669],[-22.69182,82.34165],[-26.51753,82.29765],[-31.9,82.2],[-31.39646,82.02154],[-27.85666,82.13178],[-24.84448,81.78697],[-22.90328,82.09317],[-22.07175,81.73449],[-23.16961,81.15271],[-20.62363,81.52462],[-15.76818,81.91245],[-12.77018,81.71885],[-12.20855,81.29154],[-16.28533,80.58004],[-16.85,80.35],[-20.04624,80.17708],[-17.73035,80.12912],[-18.9,79.4],[-19.70499,78.75128],[-19.67353,77.63859],[-18.47285,76.98565],[-20.03503,76.94434],[-21.67944,76.62795],[-19.83407,76.09808],[-19.59896,75.24838],[-20.66818,75.15585],[-19.37281,74.29561],[-21.59422,74.22382],[-20.43454,73.81713],[-20.76234,73.46436],[-22.17221,73.30955],[-23.56593,73.30663],[-22.31311,72.62928],[-22.29954,72.18409],[-24.27834,72.59788],[-24.79296,72.3302],[-23.44296,72.08016],[-22.13281,71.46898],[-21.75356,70.66369],[-23.53603,70.471],[-24.30702,70.85649],[-25.54341,71.43094],[-25.20135,70.75226],[-26.36276,70.22646],[-23.72742,70.18401],[-22.34902,70.12946],[-25.02927,69.2588],[-27.74737,68.47046],[-30.67371,68.12503],[-31.77665,68.12078],[-32.81105,67.73547],[-34.20196,66.67974],[-36.35284,65.9789],[-37.04378,65.93768],[-38.37505,65.69213],[-39.81222,65.45848],[-40.66899,64.83997],[-40.68281,64.13902],[-41.1887,63.48246],[-42.81938,62.68233],[-42.41666,61.90093],[-42.86619,61.07404],[-43.3784,60.09772],[-44.7875,60.03676],[-46.26364,60.85328],[-48.26294,60.85843],[-49.23308,61.40681],[-49.90039,62.38336],[-51.63325,63.62691],[-52.14014,64.27842],[-52.27659,65.1767],[-53.66166,66.09957],[-53.30161,66.8365],[-53.96911,67.18899],[-52.9804,68.35759],[-51.47536,68.72958],[-51.08041,69.14781],[-50.87122,69.9291],[-52.013585,69.574925],[-52.55792,69.42616],[-53.45629,69.283625],[-54.68336,69.61003],[-54.75001,70.28932],[-54.35884,70.821315],[-53.431315,70.835755],[-51.39014,70.56978],[-53.10937,71.20485],[-54.00422,71.54719],[-55,71.406537],[-55.83468,71.65444],[-54.71819,72.58625],[-55.32634,72.95861],[-56.12003,73.64977],[-57.32363,74.71026],[-58.59679,75.09861],[-58.58516,75.51727],[-61.26861,76.10238],[-63.39165,76.1752],[-66.06427,76.13486],[-68.50438,76.06141],[-69.66485,76.37975],[-71.40257,77.00857],[-68.77671,77.32312],[-66.76397,77.37595],[-71.04293,77.63595],[-73.297,78.04419],[-73.15938,78.43271],[-69.37345,78.91388],[-65.7107,79.39436],[-65.3239,79.75814],[-68.02298,80.11721],[-67.15129,80.51582],[-63.68925,81.21396],[-62.23444,81.3211],[-62.65116,81.77042],[-60.28249,82.03363],[-57.20744,82.19074],[-54.13442,82.19962],[-53.04328,81.88833],[-50.39061,82.43883],[-48.00386,82.06481],[-46.59984,81.985945],[-44.523,81.6607],[-46.9007,82.19979],[-46.76379,82.62796]]]},"id":"GRL"},
-{"type":"Feature","properties":{"name":"Guatemala"},"geometry":{"type":"Polygon","coordinates":[[[-90.095555,13.735338],[-90.608624,13.909771],[-91.23241,13.927832],[-91.689747,14.126218],[-92.22775,14.538829],[-92.20323,14.830103],[-92.087216,15.064585],[-92.229249,15.251447],[-91.74796,16.066565],[-90.464473,16.069562],[-90.438867,16.41011],[-90.600847,16.470778],[-90.711822,16.687483],[-91.08167,16.918477],[-91.453921,17.252177],[-91.002269,17.254658],[-91.00152,17.817595],[-90.067934,17.819326],[-89.14308,17.808319],[-89.150806,17.015577],[-89.229122,15.886938],[-88.930613,15.887273],[-88.604586,15.70638],[-88.518364,15.855389],[-88.225023,15.727722],[-88.68068,15.346247],[-89.154811,15.066419],[-89.22522,14.874286],[-89.145535,14.678019],[-89.353326,14.424133],[-89.587343,14.362586],[-89.534219,14.244816],[-89.721934,14.134228],[-90.064678,13.88197],[-90.095555,13.735338]]]},"id":"GTM"},
-{"type":"Feature","properties":{"name":"Guyana"},"geometry":{"type":"Polygon","coordinates":[[[-59.758285,8.367035],[-59.101684,7.999202],[-58.482962,7.347691],[-58.454876,6.832787],[-58.078103,6.809094],[-57.542219,6.321268],[-57.147436,5.97315],[-57.307246,5.073567],[-57.914289,4.812626],[-57.86021,4.576801],[-58.044694,4.060864],[-57.601569,3.334655],[-57.281433,3.333492],[-57.150098,2.768927],[-56.539386,1.899523],[-56.782704,1.863711],[-57.335823,1.948538],[-57.660971,1.682585],[-58.11345,1.507195],[-58.429477,1.463942],[-58.540013,1.268088],[-59.030862,1.317698],[-59.646044,1.786894],[-59.718546,2.24963],[-59.974525,2.755233],[-59.815413,3.606499],[-59.53804,3.958803],[-59.767406,4.423503],[-60.111002,4.574967],[-59.980959,5.014061],[-60.213683,5.244486],[-60.733574,5.200277],[-61.410303,5.959068],[-61.139415,6.234297],[-61.159336,6.696077],[-60.543999,6.856584],[-60.295668,7.043911],[-60.637973,7.415],[-60.550588,7.779603],[-59.758285,8.367035]]]},"id":"GUY"},
-{"type":"Feature","properties":{"name":"Honduras"},"geometry":{"type":"Polygon","coordinates":[[[-87.316654,12.984686],[-87.489409,13.297535],[-87.793111,13.38448],[-87.723503,13.78505],[-87.859515,13.893312],[-88.065343,13.964626],[-88.503998,13.845486],[-88.541231,13.980155],[-88.843073,14.140507],[-89.058512,14.340029],[-89.353326,14.424133],[-89.145535,14.678019],[-89.22522,14.874286],[-89.154811,15.066419],[-88.68068,15.346247],[-88.225023,15.727722],[-88.121153,15.688655],[-87.901813,15.864458],[-87.61568,15.878799],[-87.522921,15.797279],[-87.367762,15.84694],[-86.903191,15.756713],[-86.440946,15.782835],[-86.119234,15.893449],[-86.001954,16.005406],[-85.683317,15.953652],[-85.444004,15.885749],[-85.182444,15.909158],[-84.983722,15.995923],[-84.52698,15.857224],[-84.368256,15.835158],[-84.063055,15.648244],[-83.773977,15.424072],[-83.410381,15.270903],[-83.147219,14.995829],[-83.489989,15.016267],[-83.628585,14.880074],[-83.975721,14.749436],[-84.228342,14.748764],[-84.449336,14.621614],[-84.649582,14.666805],[-84.820037,14.819587],[-84.924501,14.790493],[-85.052787,14.551541],[-85.148751,14.560197],[-85.165365,14.35437],[-85.514413,14.079012],[-85.698665,13.960078],[-85.801295,13.836055],[-86.096264,14.038187],[-86.312142,13.771356],[-86.520708,13.778487],[-86.755087,13.754845],[-86.733822,13.263093],[-86.880557,13.254204],[-87.005769,13.025794],[-87.316654,12.984686]]]},"id":"HND"},
-{"type":"Feature","properties":{"name":"Croatia"},"geometry":{"type":"Polygon","coordinates":[[[18.829838,45.908878],[19.072769,45.521511],[19.390476,45.236516],[19.005486,44.860234],[18.553214,45.08159],[17.861783,45.06774],[17.002146,45.233777],[16.534939,45.211608],[16.318157,45.004127],[15.959367,45.233777],[15.750026,44.818712],[16.23966,44.351143],[16.456443,44.04124],[16.916156,43.667722],[17.297373,43.446341],[17.674922,43.028563],[18.56,42.65],[18.450016,42.479991],[17.50997,42.849995],[16.930006,43.209998],[16.015385,43.507215],[15.174454,44.243191],[15.37625,44.317915],[14.920309,44.738484],[14.901602,45.07606],[14.258748,45.233777],[13.952255,44.802124],[13.656976,45.136935],[13.679403,45.484149],[13.71506,45.500324],[14.411968,45.466166],[14.595109,45.634941],[14.935244,45.471695],[15.327675,45.452316],[15.323954,45.731783],[15.67153,45.834154],[15.768733,46.238108],[16.564808,46.503751],[16.882515,46.380632],[17.630066,45.951769],[18.456062,45.759481],[18.829838,45.908878]]]},"id":"HRV"},
-{"type":"Feature","properties":{"name":"Haiti"},"geometry":{"type":"Polygon","coordinates":[[[-73.189791,19.915684],[-72.579673,19.871501],[-71.712361,19.714456],[-71.624873,19.169838],[-71.701303,18.785417],[-71.945112,18.6169],[-71.687738,18.31666],[-71.708305,18.044997],[-72.372476,18.214961],[-72.844411,18.145611],[-73.454555,18.217906],[-73.922433,18.030993],[-74.458034,18.34255],[-74.369925,18.664908],[-73.449542,18.526053],[-72.694937,18.445799],[-72.334882,18.668422],[-72.79165,19.101625],[-72.784105,19.483591],[-73.415022,19.639551],[-73.189791,19.915684]]]},"id":"HTI"},
-{"type":"Feature","properties":{"name":"Hungary"},"geometry":{"type":"Polygon","coordinates":[[[16.202298,46.852386],[16.534268,47.496171],[16.340584,47.712902],[16.903754,47.714866],[16.979667,48.123497],[17.488473,47.867466],[17.857133,47.758429],[18.696513,47.880954],[18.777025,48.081768],[19.174365,48.111379],[19.661364,48.266615],[19.769471,48.202691],[20.239054,48.327567],[20.473562,48.56285],[20.801294,48.623854],[21.872236,48.319971],[22.085608,48.422264],[22.64082,48.15024],[22.710531,47.882194],[22.099768,47.672439],[21.626515,46.994238],[21.021952,46.316088],[20.220192,46.127469],[19.596045,46.17173],[18.829838,45.908878],[18.456062,45.759481],[17.630066,45.951769],[16.882515,46.380632],[16.564808,46.503751],[16.370505,46.841327],[16.202298,46.852386]]]},"id":"HUN"},
-{"type":"Feature","properties":{"name":"Indonesia"},"geometry":{"type":"MultiPolygon","coordinates":[[[[120.715609,-10.239581],[120.295014,-10.25865],[118.967808,-9.557969],[119.90031,-9.36134],[120.425756,-9.665921],[120.775502,-9.969675],[120.715609,-10.239581]]],[[[124.43595,-10.140001],[123.579982,-10.359987],[123.459989,-10.239995],[123.550009,-9.900016],[123.980009,-9.290027],[124.968682,-8.89279],[125.07002,-9.089987],[125.08852,-9.393173],[124.43595,-10.140001]]],[[[117.900018,-8.095681],[118.260616,-8.362383],[118.87846,-8.280683],[119.126507,-8.705825],[117.970402,-8.906639],[117.277731,-9.040895],[116.740141,-9.032937],[117.083737,-8.457158],[117.632024,-8.449303],[117.900018,-8.095681]]],[[[122.903537,-8.094234],[122.756983,-8.649808],[121.254491,-8.933666],[119.924391,-8.810418],[119.920929,-8.444859],[120.715092,-8.236965],[121.341669,-8.53674],[122.007365,-8.46062],[122.903537,-8.094234]]],[[[108.623479,-6.777674],[110.539227,-6.877358],[110.759576,-6.465186],[112.614811,-6.946036],[112.978768,-7.594213],[114.478935,-7.776528],[115.705527,-8.370807],[114.564511,-8.751817],[113.464734,-8.348947],[112.559672,-8.376181],[111.522061,-8.302129],[110.58615,-8.122605],[109.427667,-7.740664],[108.693655,-7.6416],[108.277763,-7.766657],[106.454102,-7.3549],[106.280624,-6.9249],[105.365486,-6.851416],[106.051646,-5.895919],[107.265009,-5.954985],[108.072091,-6.345762],[108.486846,-6.421985],[108.623479,-6.777674]]],[[[134.724624,-6.214401],[134.210134,-6.895238],[134.112776,-6.142467],[134.290336,-5.783058],[134.499625,-5.445042],[134.727002,-5.737582],[134.724624,-6.214401]]],[[[127.249215,-3.459065],[126.874923,-3.790983],[126.183802,-3.607376],[125.989034,-3.177273],[127.000651,-3.129318],[127.249215,-3.459065]]],[[[130.471344,-3.093764],[130.834836,-3.858472],[129.990547,-3.446301],[129.155249,-3.362637],[128.590684,-3.428679],[127.898891,-3.393436],[128.135879,-2.84365],[129.370998,-2.802154],[130.471344,-3.093764]]],[[[134.143368,-1.151867],[134.422627,-2.769185],[135.457603,-3.367753],[136.293314,-2.307042],[137.440738,-1.703513],[138.329727,-1.702686],[139.184921,-2.051296],[139.926684,-2.409052],[141.00021,-2.600151],[141.017057,-5.859022],[141.033852,-9.117893],[140.143415,-8.297168],[139.127767,-8.096043],[138.881477,-8.380935],[137.614474,-8.411683],[138.039099,-7.597882],[138.668621,-7.320225],[138.407914,-6.232849],[137.92784,-5.393366],[135.98925,-4.546544],[135.164598,-4.462931],[133.66288,-3.538853],[133.367705,-4.024819],[132.983956,-4.112979],[132.756941,-3.746283],[132.753789,-3.311787],[131.989804,-2.820551],[133.066845,-2.460418],[133.780031,-2.479848],[133.696212,-2.214542],[132.232373,-2.212526],[131.836222,-1.617162],[130.94284,-1.432522],[130.519558,-0.93772],[131.867538,-0.695461],[132.380116,-0.369538],[133.985548,-0.78021],[134.143368,-1.151867]]],[[[125.240501,1.419836],[124.437035,0.427881],[123.685505,0.235593],[122.723083,0.431137],[121.056725,0.381217],[120.183083,0.237247],[120.04087,-0.519658],[120.935905,-1.408906],[121.475821,-0.955962],[123.340565,-0.615673],[123.258399,-1.076213],[122.822715,-0.930951],[122.38853,-1.516858],[121.508274,-1.904483],[122.454572,-3.186058],[122.271896,-3.5295],[123.170963,-4.683693],[123.162333,-5.340604],[122.628515,-5.634591],[122.236394,-5.282933],[122.719569,-4.464172],[121.738234,-4.851331],[121.489463,-4.574553],[121.619171,-4.188478],[120.898182,-3.602105],[120.972389,-2.627643],[120.305453,-2.931604],[120.390047,-4.097579],[120.430717,-5.528241],[119.796543,-5.6734],[119.366906,-5.379878],[119.653606,-4.459417],[119.498835,-3.494412],[119.078344,-3.487022],[118.767769,-2.801999],[119.180974,-2.147104],[119.323394,-1.353147],[119.825999,0.154254],[120.035702,0.566477],[120.885779,1.309223],[121.666817,1.013944],[122.927567,0.875192],[124.077522,0.917102],[125.065989,1.643259],[125.240501,1.419836]]],[[[128.688249,1.132386],[128.635952,0.258486],[128.12017,0.356413],[127.968034,-0.252077],[128.379999,-0.780004],[128.100016,-0.899996],[127.696475,-0.266598],[127.39949,1.011722],[127.600512,1.810691],[127.932378,2.174596],[128.004156,1.628531],[128.594559,1.540811],[128.688249,1.132386]]],[[[117.875627,1.827641],[118.996747,0.902219],[117.811858,0.784242],[117.478339,0.102475],[117.521644,-0.803723],[116.560048,-1.487661],[116.533797,-2.483517],[116.148084,-4.012726],[116.000858,-3.657037],[114.864803,-4.106984],[114.468652,-3.495704],[113.755672,-3.43917],[113.256994,-3.118776],[112.068126,-3.478392],[111.703291,-2.994442],[111.04824,-3.049426],[110.223846,-2.934032],[110.070936,-1.592874],[109.571948,-1.314907],[109.091874,-0.459507],[108.952658,0.415375],[109.069136,1.341934],[109.66326,2.006467],[109.830227,1.338136],[110.514061,0.773131],[111.159138,0.976478],[111.797548,0.904441],[112.380252,1.410121],[112.859809,1.49779],[113.80585,1.217549],[114.621355,1.430688],[115.134037,2.821482],[115.519078,3.169238],[115.865517,4.306559],[117.015214,4.306094],[117.882035,4.137551],[117.313232,3.234428],[118.04833,2.28769],[117.875627,1.827641]]],[[[105.817655,-5.852356],[104.710384,-5.873285],[103.868213,-5.037315],[102.584261,-4.220259],[102.156173,-3.614146],[101.399113,-2.799777],[100.902503,-2.050262],[100.141981,-0.650348],[99.26374,0.183142],[98.970011,1.042882],[98.601351,1.823507],[97.699598,2.453184],[97.176942,3.308791],[96.424017,3.86886],[95.380876,4.970782],[95.293026,5.479821],[95.936863,5.439513],[97.484882,5.246321],[98.369169,4.26837],[99.142559,3.59035],[99.693998,3.174329],[100.641434,2.099381],[101.658012,2.083697],[102.498271,1.3987],[103.07684,0.561361],[103.838396,0.104542],[103.437645,-0.711946],[104.010789,-1.059212],[104.369991,-1.084843],[104.53949,-1.782372],[104.887893,-2.340425],[105.622111,-2.428844],[106.108593,-3.061777],[105.857446,-4.305525],[105.817655,-5.852356]]]]},"id":"IDN"},
-{"type":"Feature","properties":{"name":"India"},"geometry":{"type":"Polygon","coordinates":[[[77.837451,35.49401],[78.912269,34.321936],[78.811086,33.506198],[79.208892,32.994395],[79.176129,32.48378],[78.458446,32.618164],[78.738894,31.515906],[79.721367,30.882715],[81.111256,30.183481],[80.476721,29.729865],[80.088425,28.79447],[81.057203,28.416095],[81.999987,27.925479],[83.304249,27.364506],[84.675018,27.234901],[85.251779,26.726198],[86.024393,26.630985],[87.227472,26.397898],[88.060238,26.414615],[88.174804,26.810405],[88.043133,27.445819],[88.120441,27.876542],[88.730326,28.086865],[88.814248,27.299316],[88.835643,27.098966],[89.744528,26.719403],[90.373275,26.875724],[91.217513,26.808648],[92.033484,26.83831],[92.103712,27.452614],[91.696657,27.771742],[92.503119,27.896876],[93.413348,28.640629],[94.56599,29.277438],[95.404802,29.031717],[96.117679,29.452802],[96.586591,28.83098],[96.248833,28.411031],[97.327114,28.261583],[97.402561,27.882536],[97.051989,27.699059],[97.133999,27.083774],[96.419366,27.264589],[95.124768,26.573572],[95.155153,26.001307],[94.603249,25.162495],[94.552658,24.675238],[94.106742,23.850741],[93.325188,24.078556],[93.286327,23.043658],[93.060294,22.703111],[93.166128,22.27846],[92.672721,22.041239],[92.146035,23.627499],[91.869928,23.624346],[91.706475,22.985264],[91.158963,23.503527],[91.46773,24.072639],[91.915093,24.130414],[92.376202,24.976693],[91.799596,25.147432],[90.872211,25.132601],[89.920693,25.26975],[89.832481,25.965082],[89.355094,26.014407],[88.563049,26.446526],[88.209789,25.768066],[88.931554,25.238692],[88.306373,24.866079],[88.084422,24.501657],[88.69994,24.233715],[88.52977,23.631142],[88.876312,22.879146],[89.031961,22.055708],[88.888766,21.690588],[88.208497,21.703172],[86.975704,21.495562],[87.033169,20.743308],[86.499351,20.151638],[85.060266,19.478579],[83.941006,18.30201],[83.189217,17.671221],[82.192792,17.016636],[82.191242,16.556664],[81.692719,16.310219],[80.791999,15.951972],[80.324896,15.899185],[80.025069,15.136415],[80.233274,13.835771],[80.286294,13.006261],[79.862547,12.056215],[79.857999,10.357275],[79.340512,10.308854],[78.885345,9.546136],[79.18972,9.216544],[78.277941,8.933047],[77.941165,8.252959],[77.539898,7.965535],[76.592979,8.899276],[76.130061,10.29963],[75.746467,11.308251],[75.396101,11.781245],[74.864816,12.741936],[74.616717,13.992583],[74.443859,14.617222],[73.534199,15.990652],[73.119909,17.92857],[72.820909,19.208234],[72.824475,20.419503],[72.630533,21.356009],[71.175273,20.757441],[70.470459,20.877331],[69.16413,22.089298],[69.644928,22.450775],[69.349597,22.84318],[68.176645,23.691965],[68.842599,24.359134],[71.04324,24.356524],[70.844699,25.215102],[70.282873,25.722229],[70.168927,26.491872],[69.514393,26.940966],[70.616496,27.989196],[71.777666,27.91318],[72.823752,28.961592],[73.450638,29.976413],[74.42138,30.979815],[74.405929,31.692639],[75.258642,32.271105],[74.451559,32.7649],[74.104294,33.441473],[73.749948,34.317699],[74.240203,34.748887],[75.757061,34.504923],[76.871722,34.653544],[77.837451,35.49401]]]},"id":"IND"},
-{"type":"Feature","properties":{"name":"Ireland"},"geometry":{"type":"Polygon","coordinates":[[[-6.197885,53.867565],[-6.032985,53.153164],[-6.788857,52.260118],[-8.561617,51.669301],[-9.977086,51.820455],[-9.166283,52.864629],[-9.688525,53.881363],[-8.327987,54.664519],[-7.572168,55.131622],[-7.366031,54.595841],[-7.572168,54.059956],[-6.95373,54.073702],[-6.197885,53.867565]]]},"id":"IRL"},
-{"type":"Feature","properties":{"name":"Iran"},"geometry":{"type":"Polygon","coordinates":[[[53.921598,37.198918],[54.800304,37.392421],[55.511578,37.964117],[56.180375,37.935127],[56.619366,38.121394],[57.330434,38.029229],[58.436154,37.522309],[59.234762,37.412988],[60.377638,36.527383],[61.123071,36.491597],[61.210817,35.650072],[60.803193,34.404102],[60.52843,33.676446],[60.9637,33.528832],[60.536078,32.981269],[60.863655,32.18292],[60.941945,31.548075],[61.699314,31.379506],[61.781222,30.73585],[60.874248,29.829239],[61.369309,29.303276],[61.771868,28.699334],[62.72783,28.259645],[62.755426,27.378923],[63.233898,27.217047],[63.316632,26.756532],[61.874187,26.239975],[61.497363,25.078237],[59.616134,25.380157],[58.525761,25.609962],[57.397251,25.739902],[56.970766,26.966106],[56.492139,27.143305],[55.72371,26.964633],[54.71509,26.480658],[53.493097,26.812369],[52.483598,27.580849],[51.520763,27.86569],[50.852948,28.814521],[50.115009,30.147773],[49.57685,29.985715],[48.941333,30.31709],[48.567971,29.926778],[48.014568,30.452457],[48.004698,30.985137],[47.685286,30.984853],[47.849204,31.709176],[47.334661,32.469155],[46.109362,33.017287],[45.416691,33.967798],[45.64846,34.748138],[46.151788,35.093259],[46.07634,35.677383],[45.420618,35.977546],[44.77267,37.17045],[44.225756,37.971584],[44.421403,38.281281],[44.109225,39.428136],[44.79399,39.713003],[44.952688,39.335765],[45.457722,38.874139],[46.143623,38.741201],[46.50572,38.770605],[47.685079,39.508364],[48.060095,39.582235],[48.355529,39.288765],[48.010744,38.794015],[48.634375,38.270378],[48.883249,38.320245],[49.199612,37.582874],[50.147771,37.374567],[50.842354,36.872814],[52.264025,36.700422],[53.82579,36.965031],[53.921598,37.198918]]]},"id":"IRN"},
-{"type":"Feature","properties":{"name":"Iraq"},"geometry":{"type":"Polygon","coordinates":[[[45.420618,35.977546],[46.07634,35.677383],[46.151788,35.093259],[45.64846,34.748138],[45.416691,33.967798],[46.109362,33.017287],[47.334661,32.469155],[47.849204,31.709176],[47.685286,30.984853],[48.004698,30.985137],[48.014568,30.452457],[48.567971,29.926778],[47.974519,29.975819],[47.302622,30.05907],[46.568713,29.099025],[44.709499,29.178891],[41.889981,31.190009],[40.399994,31.889992],[39.195468,32.161009],[38.792341,33.378686],[41.006159,34.419372],[41.383965,35.628317],[41.289707,36.358815],[41.837064,36.605854],[42.349591,37.229873],[42.779126,37.385264],[43.942259,37.256228],[44.293452,37.001514],[44.772699,37.170445],[45.420618,35.977546]]]},"id":"IRQ"},
-{"type":"Feature","properties":{"name":"Iceland"},"geometry":{"type":"Polygon","coordinates":[[[-14.508695,66.455892],[-14.739637,65.808748],[-13.609732,65.126671],[-14.909834,64.364082],[-17.794438,63.678749],[-18.656246,63.496383],[-19.972755,63.643635],[-22.762972,63.960179],[-21.778484,64.402116],[-23.955044,64.89113],[-22.184403,65.084968],[-22.227423,65.378594],[-24.326184,65.611189],[-23.650515,66.262519],[-22.134922,66.410469],[-20.576284,65.732112],[-19.056842,66.276601],[-17.798624,65.993853],[-16.167819,66.526792],[-14.508695,66.455892]]]},"id":"ISL"},
-{"type":"Feature","properties":{"name":"Israel"},"geometry":{"type":"Polygon","coordinates":[[[35.719918,32.709192],[35.545665,32.393992],[35.18393,32.532511],[34.974641,31.866582],[35.225892,31.754341],[34.970507,31.616778],[34.927408,31.353435],[35.397561,31.489086],[35.420918,31.100066],[34.922603,29.501326],[34.265433,31.219361],[34.556372,31.548824],[34.488107,31.605539],[34.752587,32.072926],[34.955417,32.827376],[35.098457,33.080539],[35.126053,33.0909],[35.460709,33.08904],[35.552797,33.264275],[35.821101,33.277426],[35.836397,32.868123],[35.700798,32.716014],[35.719918,32.709192]]]},"id":"ISR"},
-{"type":"Feature","properties":{"name":"Italy"},"geometry":{"type":"MultiPolygon","coordinates":[[[[15.520376,38.231155],[15.160243,37.444046],[15.309898,37.134219],[15.099988,36.619987],[14.335229,36.996631],[13.826733,37.104531],[12.431004,37.61295],[12.570944,38.126381],[13.741156,38.034966],[14.761249,38.143874],[15.520376,38.231155]]],[[[9.210012,41.209991],[9.809975,40.500009],[9.669519,39.177376],[9.214818,39.240473],[8.806936,38.906618],[8.428302,39.171847],[8.388253,40.378311],[8.159998,40.950007],[8.709991,40.899984],[9.210012,41.209991]]],[[[12.376485,46.767559],[13.806475,46.509306],[13.69811,46.016778],[13.93763,45.591016],[13.141606,45.736692],[12.328581,45.381778],[12.383875,44.885374],[12.261453,44.600482],[12.589237,44.091366],[13.526906,43.587727],[14.029821,42.761008],[15.14257,41.95514],[15.926191,41.961315],[16.169897,41.740295],[15.889346,41.541082],[16.785002,41.179606],[17.519169,40.877143],[18.376687,40.355625],[18.480247,40.168866],[18.293385,39.810774],[17.73838,40.277671],[16.869596,40.442235],[16.448743,39.795401],[17.17149,39.4247],[17.052841,38.902871],[16.635088,38.843572],[16.100961,37.985899],[15.684087,37.908849],[15.687963,38.214593],[15.891981,38.750942],[16.109332,38.964547],[15.718814,39.544072],[15.413613,40.048357],[14.998496,40.172949],[14.703268,40.60455],[14.060672,40.786348],[13.627985,41.188287],[12.888082,41.25309],[12.106683,41.704535],[11.191906,42.355425],[10.511948,42.931463],[10.200029,43.920007],[9.702488,44.036279],[8.888946,44.366336],[8.428561,44.231228],[7.850767,43.767148],[7.435185,43.693845],[7.549596,44.127901],[7.007562,44.254767],[6.749955,45.028518],[7.096652,45.333099],[6.802355,45.70858],[6.843593,45.991147],[7.273851,45.776948],[7.755992,45.82449],[8.31663,46.163642],[8.489952,46.005151],[8.966306,46.036932],[9.182882,46.440215],[9.922837,46.314899],[10.363378,46.483571],[10.442701,46.893546],[11.048556,46.751359],[11.164828,46.941579],[12.153088,47.115393],[12.376485,46.767559]]]]},"id":"ITA"},
-{"type":"Feature","properties":{"name":"Jamaica"},"geometry":{"type":"Polygon","coordinates":[[[-77.569601,18.490525],[-76.896619,18.400867],[-76.365359,18.160701],[-76.199659,17.886867],[-76.902561,17.868238],[-77.206341,17.701116],[-77.766023,17.861597],[-78.337719,18.225968],[-78.217727,18.454533],[-77.797365,18.524218],[-77.569601,18.490525]]]},"id":"JAM"},
-{"type":"Feature","properties":{"name":"Jordan"},"geometry":{"type":"Polygon","coordinates":[[[35.545665,32.393992],[35.719918,32.709192],[36.834062,32.312938],[38.792341,33.378686],[39.195468,32.161009],[39.004886,32.010217],[37.002166,31.508413],[37.998849,30.5085],[37.66812,30.338665],[37.503582,30.003776],[36.740528,29.865283],[36.501214,29.505254],[36.068941,29.197495],[34.956037,29.356555],[34.922603,29.501326],[35.420918,31.100066],[35.397561,31.489086],[35.545252,31.782505],[35.545665,32.393992]]]},"id":"JOR"},
-{"type":"Feature","properties":{"name":"Japan"},"geometry":{"type":"MultiPolygon","coordinates":[[[[134.638428,34.149234],[134.766379,33.806335],[134.203416,33.201178],[133.79295,33.521985],[133.280268,33.28957],[133.014858,32.704567],[132.363115,32.989382],[132.371176,33.463642],[132.924373,34.060299],[133.492968,33.944621],[133.904106,34.364931],[134.638428,34.149234]]],[[[140.976388,37.142074],[140.59977,36.343983],[140.774074,35.842877],[140.253279,35.138114],[138.975528,34.6676],[137.217599,34.606286],[135.792983,33.464805],[135.120983,33.849071],[135.079435,34.596545],[133.340316,34.375938],[132.156771,33.904933],[130.986145,33.885761],[132.000036,33.149992],[131.33279,31.450355],[130.686318,31.029579],[130.20242,31.418238],[130.447676,32.319475],[129.814692,32.61031],[129.408463,33.296056],[130.353935,33.604151],[130.878451,34.232743],[131.884229,34.749714],[132.617673,35.433393],[134.608301,35.731618],[135.677538,35.527134],[136.723831,37.304984],[137.390612,36.827391],[138.857602,37.827485],[139.426405,38.215962],[140.05479,39.438807],[139.883379,40.563312],[140.305783,41.195005],[141.368973,41.37856],[141.914263,39.991616],[141.884601,39.180865],[140.959489,38.174001],[140.976388,37.142074]]],[[[143.910162,44.1741],[144.613427,43.960883],[145.320825,44.384733],[145.543137,43.262088],[144.059662,42.988358],[143.18385,41.995215],[141.611491,42.678791],[141.067286,41.584594],[139.955106,41.569556],[139.817544,42.563759],[140.312087,43.333273],[141.380549,43.388825],[141.671952,44.772125],[141.967645,45.551483],[143.14287,44.510358],[143.910162,44.1741]]]]},"id":"JPN"},
-{"type":"Feature","properties":{"name":"Kazakhstan"},"geometry":{"type":"Polygon","coordinates":[[[70.962315,42.266154],[70.388965,42.081308],[69.070027,41.384244],[68.632483,40.668681],[68.259896,40.662325],[67.985856,41.135991],[66.714047,41.168444],[66.510649,41.987644],[66.023392,41.994646],[66.098012,42.99766],[64.900824,43.728081],[63.185787,43.650075],[62.0133,43.504477],[61.05832,44.405817],[60.239972,44.784037],[58.689989,45.500014],[58.503127,45.586804],[55.928917,44.995858],[55.968191,41.308642],[55.455251,41.259859],[54.755345,42.043971],[54.079418,42.324109],[52.944293,42.116034],[52.50246,41.783316],[52.446339,42.027151],[52.692112,42.443895],[52.501426,42.792298],[51.342427,43.132975],[50.891292,44.031034],[50.339129,44.284016],[50.305643,44.609836],[51.278503,44.514854],[51.316899,45.245998],[52.16739,45.408391],[53.040876,45.259047],[53.220866,46.234646],[53.042737,46.853006],[52.042023,46.804637],[51.191945,47.048705],[50.034083,46.60899],[49.10116,46.39933],[48.593241,46.561034],[48.694734,47.075628],[48.057253,47.743753],[47.315231,47.715847],[46.466446,48.394152],[47.043672,49.152039],[46.751596,49.356006],[47.54948,50.454698],[48.577841,49.87476],[48.702382,50.605128],[50.766648,51.692762],[52.328724,51.718652],[54.532878,51.02624],[55.716941,50.621717],[56.777961,51.043551],[58.363291,51.063653],[59.642282,50.545442],[59.932807,50.842194],[61.337424,50.79907],[61.588003,51.272659],[59.967534,51.96042],[60.927269,52.447548],[60.739993,52.719986],[61.699986,52.979996],[60.978066,53.664993],[61.436591,54.006265],[65.178534,54.354228],[65.666876,54.601267],[68.1691,54.970392],[69.068167,55.38525],[70.865267,55.169734],[71.180131,54.133285],[72.22415,54.376655],[73.508516,54.035617],[73.425679,53.48981],[74.384845,53.546861],[76.8911,54.490524],[76.525179,54.177003],[77.800916,53.404415],[80.03556,50.864751],[80.568447,51.388336],[81.945986,50.812196],[83.383004,51.069183],[83.935115,50.889246],[84.416377,50.3114],[85.11556,50.117303],[85.54127,49.692859],[86.829357,49.826675],[87.35997,49.214981],[86.598776,48.549182],[85.768233,48.455751],[85.720484,47.452969],[85.16429,47.000956],[83.180484,47.330031],[82.458926,45.53965],[81.947071,45.317027],[79.966106,44.917517],[80.866206,43.180362],[80.18015,42.920068],[80.25999,42.349999],[79.643645,42.496683],[79.142177,42.856092],[77.658392,42.960686],[76.000354,42.988022],[75.636965,42.8779],[74.212866,43.298339],[73.645304,43.091272],[73.489758,42.500894],[71.844638,42.845395],[71.186281,42.704293],[70.962315,42.266154]]]},"id":"KAZ"},
-{"type":"Feature","properties":{"name":"Kenya"},"geometry":{"type":"Polygon","coordinates":[[[40.993,-0.85829],[41.58513,-1.68325],[40.88477,-2.08255],[40.63785,-2.49979],[40.26304,-2.57309],[40.12119,-3.27768],[39.80006,-3.68116],[39.60489,-4.34653],[39.20222,-4.67677],[37.7669,-3.67712],[37.69869,-3.09699],[34.07262,-1.05982],[33.903711,-0.95],[33.893569,0.109814],[34.18,0.515],[34.6721,1.17694],[35.03599,1.90584],[34.59607,3.05374],[34.47913,3.5556],[34.005,4.249885],[34.620196,4.847123],[35.298007,5.506],[35.817448,5.338232],[35.817448,4.776966],[36.159079,4.447864],[36.855093,4.447864],[38.120915,3.598605],[38.43697,3.58851],[38.67114,3.61607],[38.89251,3.50074],[39.559384,3.42206],[39.85494,3.83879],[40.76848,4.25702],[41.1718,3.91909],[41.855083,3.918912],[40.98105,2.78452],[40.993,-0.85829]]]},"id":"KEN"},
-{"type":"Feature","properties":{"name":"Kyrgyzstan"},"geometry":{"type":"Polygon","coordinates":[[[70.962315,42.266154],[71.186281,42.704293],[71.844638,42.845395],[73.489758,42.500894],[73.645304,43.091272],[74.212866,43.298339],[75.636965,42.8779],[76.000354,42.988022],[77.658392,42.960686],[79.142177,42.856092],[79.643645,42.496683],[80.25999,42.349999],[80.11943,42.123941],[78.543661,41.582243],[78.187197,41.185316],[76.904484,41.066486],[76.526368,40.427946],[75.467828,40.562072],[74.776862,40.366425],[73.822244,39.893973],[73.960013,39.660008],[73.675379,39.431237],[71.784694,39.279463],[70.549162,39.604198],[69.464887,39.526683],[69.55961,40.103211],[70.648019,39.935754],[71.014198,40.244366],[71.774875,40.145844],[73.055417,40.866033],[71.870115,41.3929],[71.157859,41.143587],[70.420022,41.519998],[71.259248,42.167711],[70.962315,42.266154]]]},"id":"KGZ"},
-{"type":"Feature","properties":{"name":"Cambodia"},"geometry":{"type":"Polygon","coordinates":[[[103.49728,10.632555],[103.09069,11.153661],[102.584932,12.186595],[102.348099,13.394247],[102.988422,14.225721],[104.281418,14.416743],[105.218777,14.273212],[106.043946,13.881091],[106.496373,14.570584],[107.382727,14.202441],[107.614548,13.535531],[107.491403,12.337206],[105.810524,11.567615],[106.24967,10.961812],[105.199915,10.88931],[104.334335,10.486544],[103.49728,10.632555]]]},"id":"KHM"},
-{"type":"Feature","properties":{"name":"South Korea"},"geometry":{"type":"Polygon","coordinates":[[[128.349716,38.612243],[129.21292,37.432392],[129.46045,36.784189],[129.468304,35.632141],[129.091377,35.082484],[128.18585,34.890377],[127.386519,34.475674],[126.485748,34.390046],[126.37392,34.93456],[126.559231,35.684541],[126.117398,36.725485],[126.860143,36.893924],[126.174759,37.749686],[126.237339,37.840378],[126.68372,37.804773],[127.073309,38.256115],[127.780035,38.304536],[128.205746,38.370397],[128.349716,38.612243]]]},"id":"KOR"},
-{"type":"Feature","properties":{"name":"Kosovo"},"geometry":{"type":"Polygon","coordinates":[[[20.76216,42.05186],[20.71731,41.84711],[20.59023,41.85541],[20.52295,42.21787],[20.28374,42.32025],[20.0707,42.58863],[20.25758,42.81275],[20.49679,42.88469],[20.63508,43.21671],[20.81448,43.27205],[20.95651,43.13094],[21.143395,43.068685],[21.27421,42.90959],[21.43866,42.86255],[21.63302,42.67717],[21.77505,42.6827],[21.66292,42.43922],[21.54332,42.32025],[21.576636,42.245224],[21.3527,42.2068],[20.76216,42.05186]]]},"id":"-99"},
-{"type":"Feature","properties":{"name":"Kuwait"},"geometry":{"type":"Polygon","coordinates":[[[47.974519,29.975819],[48.183189,29.534477],[48.093943,29.306299],[48.416094,28.552004],[47.708851,28.526063],[47.459822,29.002519],[46.568713,29.099025],[47.302622,30.05907],[47.974519,29.975819]]]},"id":"KWT"},
-{"type":"Feature","properties":{"name":"Laos"},"geometry":{"type":"Polygon","coordinates":[[[105.218777,14.273212],[105.544338,14.723934],[105.589039,15.570316],[104.779321,16.441865],[104.716947,17.428859],[103.956477,18.240954],[103.200192,18.309632],[102.998706,17.961695],[102.413005,17.932782],[102.113592,18.109102],[101.059548,17.512497],[101.035931,18.408928],[101.282015,19.462585],[100.606294,19.508344],[100.548881,20.109238],[100.115988,20.41785],[100.329101,20.786122],[101.180005,21.436573],[101.270026,21.201652],[101.80312,21.174367],[101.652018,22.318199],[102.170436,22.464753],[102.754896,21.675137],[103.203861,20.766562],[104.435,20.758733],[104.822574,19.886642],[104.183388,19.624668],[103.896532,19.265181],[105.094598,18.666975],[105.925762,17.485315],[106.556008,16.604284],[107.312706,15.908538],[107.564525,15.202173],[107.382727,14.202441],[106.496373,14.570584],[106.043946,13.881091],[105.218777,14.273212]]]},"id":"LAO"},
-{"type":"Feature","properties":{"name":"Lebanon"},"geometry":{"type":"Polygon","coordinates":[[[35.821101,33.277426],[35.552797,33.264275],[35.460709,33.08904],[35.126053,33.0909],[35.482207,33.90545],[35.979592,34.610058],[35.998403,34.644914],[36.448194,34.593935],[36.61175,34.201789],[36.06646,33.824912],[35.821101,33.277426]]]},"id":"LBN"},
-{"type":"Feature","properties":{"name":"Liberia"},"geometry":{"type":"Polygon","coordinates":[[[-7.712159,4.364566],[-7.974107,4.355755],[-9.004794,4.832419],[-9.91342,5.593561],[-10.765384,6.140711],[-11.438779,6.785917],[-11.199802,7.105846],[-11.146704,7.396706],[-10.695595,7.939464],[-10.230094,8.406206],[-10.016567,8.428504],[-9.755342,8.541055],[-9.33728,7.928534],[-9.403348,7.526905],[-9.208786,7.313921],[-8.926065,7.309037],[-8.722124,7.711674],[-8.439298,7.686043],[-8.485446,7.395208],[-8.385452,6.911801],[-8.60288,6.467564],[-8.311348,6.193033],[-7.993693,6.12619],[-7.570153,5.707352],[-7.539715,5.313345],[-7.635368,5.188159],[-7.712159,4.364566]]]},"id":"LBR"},
-{"type":"Feature","properties":{"name":"Libya"},"geometry":{"type":"Polygon","coordinates":[[[14.8513,22.86295],[14.143871,22.491289],[13.581425,23.040506],[11.999506,23.471668],[11.560669,24.097909],[10.771364,24.562532],[10.303847,24.379313],[9.948261,24.936954],[9.910693,25.365455],[9.319411,26.094325],[9.716286,26.512206],[9.629056,27.140953],[9.756128,27.688259],[9.683885,28.144174],[9.859998,28.95999],[9.805634,29.424638],[9.48214,30.307556],[9.970017,30.539325],[10.056575,30.961831],[9.950225,31.37607],[10.636901,31.761421],[10.94479,32.081815],[11.432253,32.368903],[11.488787,33.136996],[12.66331,32.79278],[13.08326,32.87882],[13.91868,32.71196],[15.24563,32.26508],[15.71394,31.37626],[16.61162,31.18218],[18.02109,30.76357],[19.08641,30.26639],[19.57404,30.52582],[20.05335,30.98576],[19.82033,31.75179],[20.13397,32.2382],[20.85452,32.7068],[21.54298,32.8432],[22.89576,32.63858],[23.2368,32.19149],[23.60913,32.18726],[23.9275,32.01667],[24.92114,31.89936],[25.16482,31.56915],[24.80287,31.08929],[24.95762,30.6616],[24.70007,30.04419],[25,29.238655],[25,25.6825],[25,22],[25,20.00304],[23.85,20],[23.83766,19.58047],[19.84926,21.49509],[15.86085,23.40972],[14.8513,22.86295]]]},"id":"LBY"},
-{"type":"Feature","properties":{"name":"Sri Lanka"},"geometry":{"type":"Polygon","coordinates":[[[81.787959,7.523055],[81.637322,6.481775],[81.21802,6.197141],[80.348357,5.96837],[79.872469,6.763463],[79.695167,8.200843],[80.147801,9.824078],[80.838818,9.268427],[81.304319,8.564206],[81.787959,7.523055]]]},"id":"LKA"},
-{"type":"Feature","properties":{"name":"Lesotho"},"geometry":{"type":"Polygon","coordinates":[[[28.978263,-28.955597],[29.325166,-29.257387],[29.018415,-29.743766],[28.8484,-30.070051],[28.291069,-30.226217],[28.107205,-30.545732],[27.749397,-30.645106],[26.999262,-29.875954],[27.532511,-29.242711],[28.074338,-28.851469],[28.5417,-28.647502],[28.978263,-28.955597]]]},"id":"LSO"},
-{"type":"Feature","properties":{"name":"Lithuania"},"geometry":{"type":"Polygon","coordinates":[[[22.731099,54.327537],[22.651052,54.582741],[22.757764,54.856574],[22.315724,55.015299],[21.268449,55.190482],[21.0558,56.031076],[22.201157,56.337802],[23.878264,56.273671],[24.860684,56.372528],[25.000934,56.164531],[25.533047,56.100297],[26.494331,55.615107],[26.588279,55.167176],[25.768433,54.846963],[25.536354,54.282423],[24.450684,53.905702],[23.484128,53.912498],[23.243987,54.220567],[22.731099,54.327537]]]},"id":"LTU"},
-{"type":"Feature","properties":{"name":"Luxembourg"},"geometry":{"type":"Polygon","coordinates":[[[6.043073,50.128052],[6.242751,49.902226],[6.18632,49.463803],[5.897759,49.442667],[5.674052,49.529484],[5.782417,50.090328],[6.043073,50.128052]]]},"id":"LUX"},
-{"type":"Feature","properties":{"name":"Latvia"},"geometry":{"type":"Polygon","coordinates":[[[21.0558,56.031076],[21.090424,56.783873],[21.581866,57.411871],[22.524341,57.753374],[23.318453,57.006236],[24.12073,57.025693],[24.312863,57.793424],[25.164594,57.970157],[25.60281,57.847529],[26.463532,57.476389],[27.288185,57.474528],[27.770016,57.244258],[27.855282,56.759326],[28.176709,56.16913],[27.10246,55.783314],[26.494331,55.615107],[25.533047,56.100297],[25.000934,56.164531],[24.860684,56.372528],[23.878264,56.273671],[22.201157,56.337802],[21.0558,56.031076]]]},"id":"LVA"},
-{"type":"Feature","properties":{"name":"Morocco"},"geometry":{"type":"Polygon","coordinates":[[[-5.193863,35.755182],[-4.591006,35.330712],[-3.640057,35.399855],[-2.604306,35.179093],[-2.169914,35.168396],[-1.792986,34.527919],[-1.733455,33.919713],[-1.388049,32.864015],[-1.124551,32.651522],[-1.307899,32.262889],[-2.616605,32.094346],[-3.06898,31.724498],[-3.647498,31.637294],[-3.690441,30.896952],[-4.859646,30.501188],[-5.242129,30.000443],[-6.060632,29.7317],[-7.059228,29.579228],[-8.674116,28.841289],[-8.66559,27.656426],[-8.817809,27.656426],[-8.817828,27.656426],[-8.794884,27.120696],[-9.413037,27.088476],[-9.735343,26.860945],[-10.189424,26.860945],[-10.551263,26.990808],[-11.392555,26.883424],[-11.71822,26.104092],[-12.030759,26.030866],[-12.500963,24.770116],[-13.89111,23.691009],[-14.221168,22.310163],[-14.630833,21.86094],[-14.750955,21.5006],[-17.002962,21.420734],[-17.020428,21.42231],[-16.973248,21.885745],[-16.589137,22.158234],[-16.261922,22.67934],[-16.326414,23.017768],[-15.982611,23.723358],[-15.426004,24.359134],[-15.089332,24.520261],[-14.824645,25.103533],[-14.800926,25.636265],[-14.43994,26.254418],[-13.773805,26.618892],[-13.139942,27.640148],[-13.121613,27.654148],[-12.618837,28.038186],[-11.688919,28.148644],[-10.900957,28.832142],[-10.399592,29.098586],[-9.564811,29.933574],[-9.814718,31.177736],[-9.434793,32.038096],[-9.300693,32.564679],[-8.657476,33.240245],[-7.654178,33.697065],[-6.912544,34.110476],[-6.244342,35.145865],[-5.929994,35.759988],[-5.193863,35.755182]]]},"id":"MAR"},
-{"type":"Feature","properties":{"name":"Moldova"},"geometry":{"type":"Polygon","coordinates":[[[26.619337,48.220726],[26.857824,48.368211],[27.522537,48.467119],[28.259547,48.155562],[28.670891,48.118149],[29.122698,47.849095],[29.050868,47.510227],[29.415135,47.346645],[29.559674,46.928583],[29.908852,46.674361],[29.83821,46.525326],[30.024659,46.423937],[29.759972,46.349988],[29.170654,46.379262],[29.072107,46.517678],[28.862972,46.437889],[28.933717,46.25883],[28.659987,45.939987],[28.485269,45.596907],[28.233554,45.488283],[28.054443,45.944586],[28.160018,46.371563],[28.12803,46.810476],[27.551166,47.405117],[27.233873,47.826771],[26.924176,48.123264],[26.619337,48.220726]]]},"id":"MDA"},
-{"type":"Feature","properties":{"name":"Madagascar"},"geometry":{"type":"Polygon","coordinates":[[[49.543519,-12.469833],[49.808981,-12.895285],[50.056511,-13.555761],[50.217431,-14.758789],[50.476537,-15.226512],[50.377111,-15.706069],[50.200275,-16.000263],[49.860606,-15.414253],[49.672607,-15.710204],[49.863344,-16.451037],[49.774564,-16.875042],[49.498612,-17.106036],[49.435619,-17.953064],[49.041792,-19.118781],[48.548541,-20.496888],[47.930749,-22.391501],[47.547723,-23.781959],[47.095761,-24.94163],[46.282478,-25.178463],[45.409508,-25.601434],[44.833574,-25.346101],[44.03972,-24.988345],[43.763768,-24.460677],[43.697778,-23.574116],[43.345654,-22.776904],[43.254187,-22.057413],[43.433298,-21.336475],[43.893683,-21.163307],[43.89637,-20.830459],[44.374325,-20.072366],[44.464397,-19.435454],[44.232422,-18.961995],[44.042976,-18.331387],[43.963084,-17.409945],[44.312469,-16.850496],[44.446517,-16.216219],[44.944937,-16.179374],[45.502732,-15.974373],[45.872994,-15.793454],[46.312243,-15.780018],[46.882183,-15.210182],[47.70513,-14.594303],[48.005215,-14.091233],[47.869047,-13.663869],[48.293828,-13.784068],[48.84506,-13.089175],[48.863509,-12.487868],[49.194651,-12.040557],[49.543519,-12.469833]]]},"id":"MDG"},
-{"type":"Feature","properties":{"name":"Mexico"},"geometry":{"type":"Polygon","coordinates":[[[-97.140008,25.869997],[-97.528072,24.992144],[-97.702946,24.272343],[-97.776042,22.93258],[-97.872367,22.444212],[-97.699044,21.898689],[-97.38896,21.411019],[-97.189333,20.635433],[-96.525576,19.890931],[-96.292127,19.320371],[-95.900885,18.828024],[-94.839063,18.562717],[-94.42573,18.144371],[-93.548651,18.423837],[-92.786114,18.524839],[-92.037348,18.704569],[-91.407903,18.876083],[-90.77187,19.28412],[-90.53359,19.867418],[-90.451476,20.707522],[-90.278618,20.999855],[-89.601321,21.261726],[-88.543866,21.493675],[-87.658417,21.458846],[-87.05189,21.543543],[-86.811982,21.331515],[-86.845908,20.849865],[-87.383291,20.255405],[-87.621054,19.646553],[-87.43675,19.472403],[-87.58656,19.04013],[-87.837191,18.259816],[-88.090664,18.516648],[-88.300031,18.499982],[-88.490123,18.486831],[-88.848344,17.883198],[-89.029857,18.001511],[-89.150909,17.955468],[-89.14308,17.808319],[-90.067934,17.819326],[-91.00152,17.817595],[-91.002269,17.254658],[-91.453921,17.252177],[-91.08167,16.918477],[-90.711822,16.687483],[-90.600847,16.470778],[-90.438867,16.41011],[-90.464473,16.069562],[-91.74796,16.066565],[-92.229249,15.251447],[-92.087216,15.064585],[-92.20323,14.830103],[-92.22775,14.538829],[-93.359464,15.61543],[-93.875169,15.940164],[-94.691656,16.200975],[-95.250227,16.128318],[-96.053382,15.752088],[-96.557434,15.653515],[-97.263592,15.917065],[-98.01303,16.107312],[-98.947676,16.566043],[-99.697397,16.706164],[-100.829499,17.171071],[-101.666089,17.649026],[-101.918528,17.91609],[-102.478132,17.975751],[-103.50099,18.292295],[-103.917527,18.748572],[-104.99201,19.316134],[-105.493038,19.946767],[-105.731396,20.434102],[-105.397773,20.531719],[-105.500661,20.816895],[-105.270752,21.076285],[-105.265817,21.422104],[-105.603161,21.871146],[-105.693414,22.26908],[-106.028716,22.773752],[-106.90998,23.767774],[-107.915449,24.548915],[-108.401905,25.172314],[-109.260199,25.580609],[-109.444089,25.824884],[-109.291644,26.442934],[-109.801458,26.676176],[-110.391732,27.162115],[-110.641019,27.859876],[-111.178919,27.941241],[-111.759607,28.467953],[-112.228235,28.954409],[-112.271824,29.266844],[-112.809594,30.021114],[-113.163811,30.786881],[-113.148669,31.170966],[-113.871881,31.567608],[-114.205737,31.524045],[-114.776451,31.799532],[-114.9367,31.393485],[-114.771232,30.913617],[-114.673899,30.162681],[-114.330974,29.750432],[-113.588875,29.061611],[-113.424053,28.826174],[-113.271969,28.754783],[-113.140039,28.411289],[-112.962298,28.42519],[-112.761587,27.780217],[-112.457911,27.525814],[-112.244952,27.171727],[-111.616489,26.662817],[-111.284675,25.73259],[-110.987819,25.294606],[-110.710007,24.826004],[-110.655049,24.298595],[-110.172856,24.265548],[-109.771847,23.811183],[-109.409104,23.364672],[-109.433392,23.185588],[-109.854219,22.818272],[-110.031392,22.823078],[-110.295071,23.430973],[-110.949501,24.000964],[-111.670568,24.484423],[-112.182036,24.738413],[-112.148989,25.470125],[-112.300711,26.012004],[-112.777297,26.32196],[-113.464671,26.768186],[-113.59673,26.63946],[-113.848937,26.900064],[-114.465747,27.14209],[-115.055142,27.722727],[-114.982253,27.7982],[-114.570366,27.741485],[-114.199329,28.115003],[-114.162018,28.566112],[-114.931842,29.279479],[-115.518654,29.556362],[-115.887365,30.180794],[-116.25835,30.836464],[-116.721526,31.635744],[-117.12776,32.53534],[-115.99135,32.61239],[-114.72139,32.72083],[-114.815,32.52528],[-113.30498,32.03914],[-111.02361,31.33472],[-109.035,31.34194],[-108.24194,31.34222],[-108.24,31.754854],[-106.50759,31.75452],[-106.1429,31.39995],[-105.63159,31.08383],[-105.03737,30.64402],[-104.70575,30.12173],[-104.45697,29.57196],[-103.94,29.27],[-103.11,28.97],[-102.48,29.76],[-101.6624,29.7793],[-100.9576,29.38071],[-100.45584,28.69612],[-100.11,28.11],[-99.52,27.54],[-99.3,26.84],[-99.02,26.37],[-98.24,26.06],[-97.53,25.84],[-97.140008,25.869997]]]},"id":"MEX"},
-{"type":"Feature","properties":{"name":"Macedonia"},"geometry":{"type":"Polygon","coordinates":[[[20.59023,41.85541],[20.71731,41.84711],[20.76216,42.05186],[21.3527,42.2068],[21.576636,42.245224],[21.91708,42.30364],[22.380526,42.32026],[22.881374,41.999297],[22.952377,41.337994],[22.76177,41.3048],[22.597308,41.130487],[22.055378,41.149866],[21.674161,40.931275],[21.02004,40.842727],[20.60518,41.08622],[20.46315,41.51509],[20.59023,41.85541]]]},"id":"MKD"},
-{"type":"Feature","properties":{"name":"Mali"},"geometry":{"type":"Polygon","coordinates":[[[-12.17075,14.616834],[-11.834208,14.799097],[-11.666078,15.388208],[-11.349095,15.411256],[-10.650791,15.132746],[-10.086846,15.330486],[-9.700255,15.264107],[-9.550238,15.486497],[-5.537744,15.50169],[-5.315277,16.201854],[-5.488523,16.325102],[-5.971129,20.640833],[-6.453787,24.956591],[-4.923337,24.974574],[-1.550055,22.792666],[1.823228,20.610809],[2.060991,20.142233],[2.683588,19.85623],[3.146661,19.693579],[3.158133,19.057364],[4.267419,19.155265],[4.27021,16.852227],[3.723422,16.184284],[3.638259,15.56812],[2.749993,15.409525],[1.385528,15.323561],[1.015783,14.968182],[0.374892,14.928908],[-0.266257,14.924309],[-0.515854,15.116158],[-1.066363,14.973815],[-2.001035,14.559008],[-2.191825,14.246418],[-2.967694,13.79815],[-3.103707,13.541267],[-3.522803,13.337662],[-4.006391,13.472485],[-4.280405,13.228444],[-4.427166,12.542646],[-5.220942,11.713859],[-5.197843,11.375146],[-5.470565,10.95127],[-5.404342,10.370737],[-5.816926,10.222555],[-6.050452,10.096361],[-6.205223,10.524061],[-6.493965,10.411303],[-6.666461,10.430811],[-6.850507,10.138994],[-7.622759,10.147236],[-7.89959,10.297382],[-8.029944,10.206535],[-8.335377,10.494812],[-8.282357,10.792597],[-8.407311,10.909257],[-8.620321,10.810891],[-8.581305,11.136246],[-8.376305,11.393646],[-8.786099,11.812561],[-8.905265,12.088358],[-9.127474,12.30806],[-9.327616,12.334286],[-9.567912,12.194243],[-9.890993,12.060479],[-10.165214,11.844084],[-10.593224,11.923975],[-10.87083,12.177887],[-11.036556,12.211245],[-11.297574,12.077971],[-11.456169,12.076834],[-11.513943,12.442988],[-11.467899,12.754519],[-11.553398,13.141214],[-11.927716,13.422075],[-12.124887,13.994727],[-12.17075,14.616834]]]},"id":"MLI"},
-{"type":"Feature","properties":{"name":"Myanmar"},"geometry":{"type":"Polygon","coordinates":[[[99.543309,20.186598],[98.959676,19.752981],[98.253724,19.708203],[97.797783,18.62708],[97.375896,18.445438],[97.859123,17.567946],[98.493761,16.837836],[98.903348,16.177824],[98.537376,15.308497],[98.192074,15.123703],[98.430819,14.622028],[99.097755,13.827503],[99.212012,13.269294],[99.196354,12.804748],[99.587286,11.892763],[99.038121,10.960546],[98.553551,9.93296],[98.457174,10.675266],[98.764546,11.441292],[98.428339,12.032987],[98.509574,13.122378],[98.103604,13.64046],[97.777732,14.837286],[97.597072,16.100568],[97.16454,16.928734],[96.505769,16.427241],[95.369352,15.71439],[94.808405,15.803454],[94.188804,16.037936],[94.533486,17.27724],[94.324817,18.213514],[93.540988,19.366493],[93.663255,19.726962],[93.078278,19.855145],[92.368554,20.670883],[92.303234,21.475485],[92.652257,21.324048],[92.672721,22.041239],[93.166128,22.27846],[93.060294,22.703111],[93.286327,23.043658],[93.325188,24.078556],[94.106742,23.850741],[94.552658,24.675238],[94.603249,25.162495],[95.155153,26.001307],[95.124768,26.573572],[96.419366,27.264589],[97.133999,27.083774],[97.051989,27.699059],[97.402561,27.882536],[97.327114,28.261583],[97.911988,28.335945],[98.246231,27.747221],[98.68269,27.508812],[98.712094,26.743536],[98.671838,25.918703],[97.724609,25.083637],[97.60472,23.897405],[98.660262,24.063286],[98.898749,23.142722],[99.531992,22.949039],[99.240899,22.118314],[99.983489,21.742937],[100.416538,21.558839],[101.150033,21.849984],[101.180005,21.436573],[100.329101,20.786122],[100.115988,20.41785],[99.543309,20.186598]]]},"id":"MMR"},
-{"type":"Feature","properties":{"name":"Montenegro"},"geometry":{"type":"Polygon","coordinates":[[[19.801613,42.500093],[19.738051,42.688247],[19.30449,42.19574],[19.37177,41.87755],[19.16246,41.95502],[18.88214,42.28151],[18.45,42.48],[18.56,42.65],[18.70648,43.20011],[19.03165,43.43253],[19.21852,43.52384],[19.48389,43.35229],[19.63,43.21378],[19.95857,43.10604],[20.3398,42.89852],[20.25758,42.81275],[20.0707,42.58863],[19.801613,42.500093]]]},"id":"MNE"},
-{"type":"Feature","properties":{"name":"Mongolia"},"geometry":{"type":"Polygon","coordinates":[[[87.751264,49.297198],[88.805567,49.470521],[90.713667,50.331812],[92.234712,50.802171],[93.104219,50.49529],[94.147566,50.480537],[94.815949,50.013433],[95.814028,49.977467],[97.259728,49.726061],[98.231762,50.422401],[97.82574,51.010995],[98.861491,52.047366],[99.981732,51.634006],[100.88948,51.516856],[102.065223,51.259921],[102.255909,50.510561],[103.676545,50.089966],[104.621552,50.275329],[105.886591,50.406019],[106.888804,50.274296],[107.868176,49.793705],[108.475167,49.282548],[109.402449,49.292961],[110.662011,49.130128],[111.581231,49.377968],[112.89774,49.543565],[114.362456,50.248303],[114.96211,50.140247],[115.485695,49.805177],[116.678801,49.888531],[116.191802,49.134598],[115.485282,48.135383],[115.742837,47.726545],[116.308953,47.85341],[117.295507,47.697709],[118.064143,48.06673],[118.866574,47.74706],[119.772824,47.048059],[119.66327,46.69268],[118.874326,46.805412],[117.421701,46.672733],[116.717868,46.388202],[115.985096,45.727235],[114.460332,45.339817],[113.463907,44.808893],[112.436062,45.011646],[111.873306,45.102079],[111.348377,44.457442],[111.667737,44.073176],[111.829588,43.743118],[111.129682,43.406834],[110.412103,42.871234],[109.243596,42.519446],[107.744773,42.481516],[106.129316,42.134328],[104.964994,41.59741],[104.522282,41.908347],[103.312278,41.907468],[101.83304,42.514873],[100.845866,42.663804],[99.515817,42.524691],[97.451757,42.74889],[96.349396,42.725635],[95.762455,43.319449],[95.306875,44.241331],[94.688929,44.352332],[93.480734,44.975472],[92.133891,45.115076],[90.94554,45.286073],[90.585768,45.719716],[90.970809,46.888146],[90.280826,47.693549],[88.854298,48.069082],[88.013832,48.599463],[87.751264,49.297198]]]},"id":"MNG"},
-{"type":"Feature","properties":{"name":"Mozambique"},"geometry":{"type":"Polygon","coordinates":[[[34.559989,-11.52002],[35.312398,-11.439146],[36.514082,-11.720938],[36.775151,-11.594537],[37.471284,-11.568751],[37.827645,-11.268769],[38.427557,-11.285202],[39.52103,-10.896854],[40.316589,-10.317096],[40.478387,-10.765441],[40.437253,-11.761711],[40.560811,-12.639177],[40.59962,-14.201975],[40.775475,-14.691764],[40.477251,-15.406294],[40.089264,-16.100774],[39.452559,-16.720891],[38.538351,-17.101023],[37.411133,-17.586368],[36.281279,-18.659688],[35.896497,-18.84226],[35.1984,-19.552811],[34.786383,-19.784012],[34.701893,-20.497043],[35.176127,-21.254361],[35.373428,-21.840837],[35.385848,-22.14],[35.562546,-22.09],[35.533935,-23.070788],[35.371774,-23.535359],[35.60747,-23.706563],[35.458746,-24.12261],[35.040735,-24.478351],[34.215824,-24.816314],[33.01321,-25.357573],[32.574632,-25.727318],[32.660363,-26.148584],[32.915955,-26.215867],[32.83012,-26.742192],[32.071665,-26.73382],[31.985779,-26.29178],[31.837778,-25.843332],[31.752408,-25.484284],[31.930589,-24.369417],[31.670398,-23.658969],[31.191409,-22.25151],[32.244988,-21.116489],[32.508693,-20.395292],[32.659743,-20.30429],[32.772708,-19.715592],[32.611994,-19.419383],[32.654886,-18.67209],[32.849861,-17.979057],[32.847639,-16.713398],[32.328239,-16.392074],[31.852041,-16.319417],[31.636498,-16.07199],[31.173064,-15.860944],[30.338955,-15.880839],[30.274256,-15.507787],[30.179481,-14.796099],[33.214025,-13.97186],[33.7897,-14.451831],[34.064825,-14.35995],[34.459633,-14.61301],[34.517666,-15.013709],[34.307291,-15.478641],[34.381292,-16.18356],[35.03381,-16.8013],[35.339063,-16.10744],[35.771905,-15.896859],[35.686845,-14.611046],[35.267956,-13.887834],[34.907151,-13.565425],[34.559989,-13.579998],[34.280006,-12.280025],[34.559989,-11.52002]]]},"id":"MOZ"},
-{"type":"Feature","properties":{"name":"Mauritania"},"geometry":{"type":"Polygon","coordinates":[[[-12.17075,14.616834],[-12.830658,15.303692],[-13.435738,16.039383],[-14.099521,16.304302],[-14.577348,16.598264],[-15.135737,16.587282],[-15.623666,16.369337],[-16.12069,16.455663],[-16.463098,16.135036],[-16.549708,16.673892],[-16.270552,17.166963],[-16.146347,18.108482],[-16.256883,19.096716],[-16.377651,19.593817],[-16.277838,20.092521],[-16.536324,20.567866],[-17.063423,20.999752],[-16.845194,21.333323],[-12.929102,21.327071],[-13.118754,22.77122],[-12.874222,23.284832],[-11.937224,23.374594],[-11.969419,25.933353],[-8.687294,25.881056],[-8.6844,27.395744],[-4.923337,24.974574],[-6.453787,24.956591],[-5.971129,20.640833],[-5.488523,16.325102],[-5.315277,16.201854],[-5.537744,15.50169],[-9.550238,15.486497],[-9.700255,15.264107],[-10.086846,15.330486],[-10.650791,15.132746],[-11.349095,15.411256],[-11.666078,15.388208],[-11.834208,14.799097],[-12.17075,14.616834]]]},"id":"MRT"},
-{"type":"Feature","properties":{"name":"Malawi"},"geometry":{"type":"Polygon","coordinates":[[[34.559989,-11.52002],[34.280006,-12.280025],[34.559989,-13.579998],[34.907151,-13.565425],[35.267956,-13.887834],[35.686845,-14.611046],[35.771905,-15.896859],[35.339063,-16.10744],[35.03381,-16.8013],[34.381292,-16.18356],[34.307291,-15.478641],[34.517666,-15.013709],[34.459633,-14.61301],[34.064825,-14.35995],[33.7897,-14.451831],[33.214025,-13.97186],[32.688165,-13.712858],[32.991764,-12.783871],[33.306422,-12.435778],[33.114289,-11.607198],[33.31531,-10.79655],[33.485688,-10.525559],[33.231388,-9.676722],[32.759375,-9.230599],[33.739729,-9.417151],[33.940838,-9.693674],[34.280006,-10.16],[34.559989,-11.52002]]]},"id":"MWI"},
-{"type":"Feature","properties":{"name":"Malaysia"},"geometry":{"type":"MultiPolygon","coordinates":[[[[101.075516,6.204867],[101.154219,5.691384],[101.814282,5.810808],[102.141187,6.221636],[102.371147,6.128205],[102.961705,5.524495],[103.381215,4.855001],[103.438575,4.181606],[103.332122,3.726698],[103.429429,3.382869],[103.502448,2.791019],[103.854674,2.515454],[104.247932,1.631141],[104.228811,1.293048],[103.519707,1.226334],[102.573615,1.967115],[101.390638,2.760814],[101.27354,3.270292],[100.695435,3.93914],[100.557408,4.76728],[100.196706,5.312493],[100.30626,6.040562],[100.085757,6.464489],[100.259596,6.642825],[101.075516,6.204867]]],[[[118.618321,4.478202],[117.882035,4.137551],[117.015214,4.306094],[115.865517,4.306559],[115.519078,3.169238],[115.134037,2.821482],[114.621355,1.430688],[113.80585,1.217549],[112.859809,1.49779],[112.380252,1.410121],[111.797548,0.904441],[111.159138,0.976478],[110.514061,0.773131],[109.830227,1.338136],[109.66326,2.006467],[110.396135,1.663775],[111.168853,1.850637],[111.370081,2.697303],[111.796928,2.885897],[112.995615,3.102395],[113.712935,3.893509],[114.204017,4.525874],[114.659596,4.007637],[114.869557,4.348314],[115.347461,4.316636],[115.4057,4.955228],[115.45071,5.44773],[116.220741,6.143191],[116.725103,6.924771],[117.129626,6.928053],[117.643393,6.422166],[117.689075,5.98749],[118.347691,5.708696],[119.181904,5.407836],[119.110694,5.016128],[118.439727,4.966519],[118.618321,4.478202]]]]},"id":"MYS"},
-{"type":"Feature","properties":{"name":"Namibia"},"geometry":{"type":"Polygon","coordinates":[[[16.344977,-28.576705],[15.601818,-27.821247],[15.210472,-27.090956],[14.989711,-26.117372],[14.743214,-25.39292],[14.408144,-23.853014],[14.385717,-22.656653],[14.257714,-22.111208],[13.868642,-21.699037],[13.352498,-20.872834],[12.826845,-19.673166],[12.608564,-19.045349],[11.794919,-18.069129],[11.734199,-17.301889],[12.215461,-17.111668],[12.814081,-16.941343],[13.462362,-16.971212],[14.058501,-17.423381],[14.209707,-17.353101],[18.263309,-17.309951],[18.956187,-17.789095],[21.377176,-17.930636],[23.215048,-17.523116],[24.033862,-17.295843],[24.682349,-17.353411],[25.07695,-17.578823],[25.084443,-17.661816],[24.520705,-17.887125],[24.217365,-17.889347],[23.579006,-18.281261],[23.196858,-17.869038],[21.65504,-18.219146],[20.910641,-18.252219],[20.881134,-21.814327],[19.895458,-21.849157],[19.895768,-24.76779],[19.894734,-28.461105],[19.002127,-28.972443],[18.464899,-29.045462],[17.836152,-28.856378],[17.387497,-28.783514],[17.218929,-28.355943],[16.824017,-28.082162],[16.344977,-28.576705]]]},"id":"NAM"},
-{"type":"Feature","properties":{"name":"New Caledonia"},"geometry":{"type":"Polygon","coordinates":[[[165.77999,-21.080005],[166.599991,-21.700019],[167.120011,-22.159991],[166.740035,-22.399976],[166.189732,-22.129708],[165.474375,-21.679607],[164.829815,-21.14982],[164.167995,-20.444747],[164.029606,-20.105646],[164.459967,-20.120012],[165.020036,-20.459991],[165.460009,-20.800022],[165.77999,-21.080005]]]},"id":"NCL"},
-{"type":"Feature","properties":{"name":"Niger"},"geometry":{"type":"Polygon","coordinates":[[[2.154474,11.94015],[2.177108,12.625018],[1.024103,12.851826],[0.993046,13.33575],[0.429928,13.988733],[0.295646,14.444235],[0.374892,14.928908],[1.015783,14.968182],[1.385528,15.323561],[2.749993,15.409525],[3.638259,15.56812],[3.723422,16.184284],[4.27021,16.852227],[4.267419,19.155265],[5.677566,19.601207],[8.572893,21.565661],[11.999506,23.471668],[13.581425,23.040506],[14.143871,22.491289],[14.8513,22.86295],[15.096888,21.308519],[15.471077,21.048457],[15.487148,20.730415],[15.903247,20.387619],[15.685741,19.95718],[15.300441,17.92795],[15.247731,16.627306],[13.972202,15.684366],[13.540394,14.367134],[13.956699,13.996691],[13.954477,13.353449],[14.595781,13.330427],[14.495787,12.859396],[14.213531,12.802035],[14.181336,12.483657],[13.995353,12.461565],[13.318702,13.556356],[13.083987,13.596147],[12.302071,13.037189],[11.527803,13.32898],[10.989593,13.387323],[10.701032,13.246918],[10.114814,13.277252],[9.524928,12.851102],[9.014933,12.826659],[7.804671,13.343527],[7.330747,13.098038],[6.820442,13.115091],[6.445426,13.492768],[5.443058,13.865924],[4.368344,13.747482],[4.107946,13.531216],[3.967283,12.956109],[3.680634,12.552903],[3.61118,11.660167],[2.848643,12.235636],[2.490164,12.233052],[2.154474,11.94015]]]},"id":"NER"},
-{"type":"Feature","properties":{"name":"Nigeria"},"geometry":{"type":"Polygon","coordinates":[[[8.500288,4.771983],[7.462108,4.412108],[7.082596,4.464689],[6.698072,4.240594],[5.898173,4.262453],[5.362805,4.887971],[5.033574,5.611802],[4.325607,6.270651],[3.57418,6.2583],[2.691702,6.258817],[2.749063,7.870734],[2.723793,8.506845],[2.912308,9.137608],[3.220352,9.444153],[3.705438,10.06321],[3.60007,10.332186],[3.797112,10.734746],[3.572216,11.327939],[3.61118,11.660167],[3.680634,12.552903],[3.967283,12.956109],[4.107946,13.531216],[4.368344,13.747482],[5.443058,13.865924],[6.445426,13.492768],[6.820442,13.115091],[7.330747,13.098038],[7.804671,13.343527],[9.014933,12.826659],[9.524928,12.851102],[10.114814,13.277252],[10.701032,13.246918],[10.989593,13.387323],[11.527803,13.32898],[12.302071,13.037189],[13.083987,13.596147],[13.318702,13.556356],[13.995353,12.461565],[14.181336,12.483657],[14.577178,12.085361],[14.468192,11.904752],[14.415379,11.572369],[13.57295,10.798566],[13.308676,10.160362],[13.1676,9.640626],[12.955468,9.417772],[12.753672,8.717763],[12.218872,8.305824],[12.063946,7.799808],[11.839309,7.397042],[11.745774,6.981383],[11.058788,6.644427],[10.497375,7.055358],[10.118277,7.03877],[9.522706,6.453482],[9.233163,6.444491],[8.757533,5.479666],[8.500288,4.771983]]]},"id":"NGA"},
-{"type":"Feature","properties":{"name":"Nicaragua"},"geometry":{"type":"Polygon","coordinates":[[[-85.71254,11.088445],[-86.058488,11.403439],[-86.52585,11.806877],[-86.745992,12.143962],[-87.167516,12.458258],[-87.668493,12.90991],[-87.557467,13.064552],[-87.392386,12.914018],[-87.316654,12.984686],[-87.005769,13.025794],[-86.880557,13.254204],[-86.733822,13.263093],[-86.755087,13.754845],[-86.520708,13.778487],[-86.312142,13.771356],[-86.096264,14.038187],[-85.801295,13.836055],[-85.698665,13.960078],[-85.514413,14.079012],[-85.165365,14.35437],[-85.148751,14.560197],[-85.052787,14.551541],[-84.924501,14.790493],[-84.820037,14.819587],[-84.649582,14.666805],[-84.449336,14.621614],[-84.228342,14.748764],[-83.975721,14.749436],[-83.628585,14.880074],[-83.489989,15.016267],[-83.147219,14.995829],[-83.233234,14.899866],[-83.284162,14.676624],[-83.182126,14.310703],[-83.4125,13.970078],[-83.519832,13.567699],[-83.552207,13.127054],[-83.498515,12.869292],[-83.473323,12.419087],[-83.626104,12.32085],[-83.719613,11.893124],[-83.650858,11.629032],[-83.85547,11.373311],[-83.808936,11.103044],[-83.655612,10.938764],[-83.895054,10.726839],[-84.190179,10.79345],[-84.355931,10.999226],[-84.673069,11.082657],[-84.903003,10.952303],[-85.561852,11.217119],[-85.71254,11.088445]]]},"id":"NIC"},
-{"type":"Feature","properties":{"name":"Netherlands"},"geometry":{"type":"Polygon","coordinates":[[[6.074183,53.510403],[6.90514,53.482162],[7.092053,53.144043],[6.84287,52.22844],[6.589397,51.852029],[5.988658,51.851616],[6.156658,50.803721],[5.606976,51.037298],[4.973991,51.475024],[4.047071,51.267259],[3.314971,51.345755],[3.830289,51.620545],[4.705997,53.091798],[6.074183,53.510403]]]},"id":"NLD"},
-{"type":"Feature","properties":{"name":"Norway"},"geometry":{"type":"MultiPolygon","coordinates":[[[[28.165547,71.185474],[31.293418,70.453788],[30.005435,70.186259],[31.101079,69.55808],[29.399581,69.156916],[28.59193,69.064777],[29.015573,69.766491],[27.732292,70.164193],[26.179622,69.825299],[25.689213,69.092114],[24.735679,68.649557],[23.66205,68.891247],[22.356238,68.841741],[21.244936,69.370443],[20.645593,69.106247],[20.025269,69.065139],[19.87856,68.407194],[17.993868,68.567391],[17.729182,68.010552],[16.768879,68.013937],[16.108712,67.302456],[15.108411,66.193867],[13.55569,64.787028],[13.919905,64.445421],[13.571916,64.049114],[12.579935,64.066219],[11.930569,63.128318],[11.992064,61.800362],[12.631147,61.293572],[12.300366,60.117933],[11.468272,59.432393],[11.027369,58.856149],[10.356557,59.469807],[8.382,58.313288],[7.048748,58.078884],[5.665835,58.588155],[5.308234,59.663232],[4.992078,61.970998],[5.9129,62.614473],[8.553411,63.454008],[10.527709,64.486038],[12.358347,65.879726],[14.761146,67.810642],[16.435927,68.563205],[19.184028,69.817444],[21.378416,70.255169],[23.023742,70.202072],[24.546543,71.030497],[26.37005,70.986262],[28.165547,71.185474]]],[[[24.72412,77.85385],[22.49032,77.44493],[20.72601,77.67704],[21.41611,77.93504],[20.8119,78.25463],[22.88426,78.45494],[23.28134,78.07954],[24.72412,77.85385]]],[[[18.25183,79.70175],[21.54383,78.95611],[19.02737,78.5626],[18.47172,77.82669],[17.59441,77.63796],[17.1182,76.80941],[15.91315,76.77045],[13.76259,77.38035],[14.66956,77.73565],[13.1706,78.02493],[11.22231,78.8693],[10.44453,79.65239],[13.17077,80.01046],[13.71852,79.66039],[15.14282,79.67431],[15.52255,80.01608],[16.99085,80.05086],[18.25183,79.70175]]],[[[25.447625,80.40734],[27.407506,80.056406],[25.924651,79.517834],[23.024466,79.400012],[20.075188,79.566823],[19.897266,79.842362],[18.462264,79.85988],[17.368015,80.318896],[20.455992,80.598156],[21.907945,80.357679],[22.919253,80.657144],[25.447625,80.40734]]]]},"id":"NOR"},
-{"type":"Feature","properties":{"name":"Nepal"},"geometry":{"type":"Polygon","coordinates":[[[88.120441,27.876542],[88.043133,27.445819],[88.174804,26.810405],[88.060238,26.414615],[87.227472,26.397898],[86.024393,26.630985],[85.251779,26.726198],[84.675018,27.234901],[83.304249,27.364506],[81.999987,27.925479],[81.057203,28.416095],[80.088425,28.79447],[80.476721,29.729865],[81.111256,30.183481],[81.525804,30.422717],[82.327513,30.115268],[83.337115,29.463732],[83.898993,29.320226],[84.23458,28.839894],[85.011638,28.642774],[85.82332,28.203576],[86.954517,27.974262],[88.120441,27.876542]]]},"id":"NPL"},
-{"type":"Feature","properties":{"name":"New Zealand"},"geometry":{"type":"MultiPolygon","coordinates":[[[[173.020375,-40.919052],[173.247234,-41.331999],[173.958405,-40.926701],[174.247587,-41.349155],[174.248517,-41.770008],[173.876447,-42.233184],[173.22274,-42.970038],[172.711246,-43.372288],[173.080113,-43.853344],[172.308584,-43.865694],[171.452925,-44.242519],[171.185138,-44.897104],[170.616697,-45.908929],[169.831422,-46.355775],[169.332331,-46.641235],[168.411354,-46.619945],[167.763745,-46.290197],[166.676886,-46.219917],[166.509144,-45.852705],[167.046424,-45.110941],[168.303763,-44.123973],[168.949409,-43.935819],[169.667815,-43.555326],[170.52492,-43.031688],[171.12509,-42.512754],[171.569714,-41.767424],[171.948709,-41.514417],[172.097227,-40.956104],[172.79858,-40.493962],[173.020375,-40.919052]]],[[[174.612009,-36.156397],[175.336616,-37.209098],[175.357596,-36.526194],[175.808887,-36.798942],[175.95849,-37.555382],[176.763195,-37.881253],[177.438813,-37.961248],[178.010354,-37.579825],[178.517094,-37.695373],[178.274731,-38.582813],[177.97046,-39.166343],[177.206993,-39.145776],[176.939981,-39.449736],[177.032946,-39.879943],[176.885824,-40.065978],[176.508017,-40.604808],[176.01244,-41.289624],[175.239567,-41.688308],[175.067898,-41.425895],[174.650973,-41.281821],[175.22763,-40.459236],[174.900157,-39.908933],[173.824047,-39.508854],[173.852262,-39.146602],[174.574802,-38.797683],[174.743474,-38.027808],[174.697017,-37.381129],[174.292028,-36.711092],[174.319004,-36.534824],[173.840997,-36.121981],[173.054171,-35.237125],[172.636005,-34.529107],[173.007042,-34.450662],[173.551298,-35.006183],[174.32939,-35.265496],[174.612009,-36.156397]]]]},"id":"NZL"},
-{"type":"Feature","properties":{"name":"Oman"},"geometry":{"type":"MultiPolygon","coordinates":[[[[58.861141,21.114035],[58.487986,20.428986],[58.034318,20.481437],[57.826373,20.243002],[57.665762,19.736005],[57.7887,19.06757],[57.694391,18.94471],[57.234264,18.947991],[56.609651,18.574267],[56.512189,18.087113],[56.283521,17.876067],[55.661492,17.884128],[55.269939,17.632309],[55.2749,17.228354],[54.791002,16.950697],[54.239253,17.044981],[53.570508,16.707663],[53.108573,16.651051],[52.782184,17.349742],[52.00001,19.000003],[54.999982,19.999994],[55.666659,22.000001],[55.208341,22.70833],[55.234489,23.110993],[55.525841,23.524869],[55.528632,23.933604],[55.981214,24.130543],[55.804119,24.269604],[55.886233,24.920831],[56.396847,24.924732],[56.84514,24.241673],[57.403453,23.878594],[58.136948,23.747931],[58.729211,23.565668],[59.180502,22.992395],[59.450098,22.660271],[59.80806,22.533612],[59.806148,22.310525],[59.442191,21.714541],[59.282408,21.433886],[58.861141,21.114035]]],[[[56.391421,25.895991],[56.261042,25.714606],[56.070821,26.055464],[56.362017,26.395934],[56.485679,26.309118],[56.391421,25.895991]]]]},"id":"OMN"},
-{"type":"Feature","properties":{"name":"Pakistan"},"geometry":{"type":"Polygon","coordinates":[[[75.158028,37.133031],[75.896897,36.666806],[76.192848,35.898403],[77.837451,35.49401],[76.871722,34.653544],[75.757061,34.504923],[74.240203,34.748887],[73.749948,34.317699],[74.104294,33.441473],[74.451559,32.7649],[75.258642,32.271105],[74.405929,31.692639],[74.42138,30.979815],[73.450638,29.976413],[72.823752,28.961592],[71.777666,27.91318],[70.616496,27.989196],[69.514393,26.940966],[70.168927,26.491872],[70.282873,25.722229],[70.844699,25.215102],[71.04324,24.356524],[68.842599,24.359134],[68.176645,23.691965],[67.443667,23.944844],[67.145442,24.663611],[66.372828,25.425141],[64.530408,25.237039],[62.905701,25.218409],[61.497363,25.078237],[61.874187,26.239975],[63.316632,26.756532],[63.233898,27.217047],[62.755426,27.378923],[62.72783,28.259645],[61.771868,28.699334],[61.369309,29.303276],[60.874248,29.829239],[62.549857,29.318572],[63.550261,29.468331],[64.148002,29.340819],[64.350419,29.560031],[65.046862,29.472181],[66.346473,29.887943],[66.381458,30.738899],[66.938891,31.304911],[67.683394,31.303154],[67.792689,31.58293],[68.556932,31.71331],[68.926677,31.620189],[69.317764,31.901412],[69.262522,32.501944],[69.687147,33.105499],[70.323594,33.358533],[69.930543,34.02012],[70.881803,33.988856],[71.156773,34.348911],[71.115019,34.733126],[71.613076,35.153203],[71.498768,35.650563],[71.262348,36.074388],[71.846292,36.509942],[72.920025,36.720007],[74.067552,36.836176],[74.575893,37.020841],[75.158028,37.133031]]]},"id":"PAK"},
-{"type":"Feature","properties":{"name":"Panama"},"geometry":{"type":"Polygon","coordinates":[[[-77.881571,7.223771],[-78.214936,7.512255],[-78.429161,8.052041],[-78.182096,8.319182],[-78.435465,8.387705],[-78.622121,8.718124],[-79.120307,8.996092],[-79.557877,8.932375],[-79.760578,8.584515],[-80.164481,8.333316],[-80.382659,8.298409],[-80.480689,8.090308],[-80.00369,7.547524],[-80.276671,7.419754],[-80.421158,7.271572],[-80.886401,7.220541],[-81.059543,7.817921],[-81.189716,7.647906],[-81.519515,7.70661],[-81.721311,8.108963],[-82.131441,8.175393],[-82.390934,8.292362],[-82.820081,8.290864],[-82.850958,8.073823],[-82.965783,8.225028],[-82.913176,8.423517],[-82.829771,8.626295],[-82.868657,8.807266],[-82.719183,8.925709],[-82.927155,9.07433],[-82.932891,9.476812],[-82.546196,9.566135],[-82.187123,9.207449],[-82.207586,8.995575],[-81.808567,8.950617],[-81.714154,9.031955],[-81.439287,8.786234],[-80.947302,8.858504],[-80.521901,9.111072],[-79.9146,9.312765],[-79.573303,9.61161],[-79.021192,9.552931],[-79.05845,9.454565],[-78.500888,9.420459],[-78.055928,9.24773],[-77.729514,8.946844],[-77.353361,8.670505],[-77.474723,8.524286],[-77.242566,7.935278],[-77.431108,7.638061],[-77.753414,7.70984],[-77.881571,7.223771]]]},"id":"PAN"},
-{"type":"Feature","properties":{"name":"Peru"},"geometry":{"type":"Polygon","coordinates":[[[-69.590424,-17.580012],[-69.858444,-18.092694],[-70.372572,-18.347975],[-71.37525,-17.773799],[-71.462041,-17.363488],[-73.44453,-16.359363],[-75.237883,-15.265683],[-76.009205,-14.649286],[-76.423469,-13.823187],[-76.259242,-13.535039],[-77.106192,-12.222716],[-78.092153,-10.377712],[-79.036953,-8.386568],[-79.44592,-7.930833],[-79.760578,-7.194341],[-80.537482,-6.541668],[-81.249996,-6.136834],[-80.926347,-5.690557],[-81.410943,-4.736765],[-81.09967,-4.036394],[-80.302561,-3.404856],[-80.184015,-3.821162],[-80.469295,-4.059287],[-80.442242,-4.425724],[-80.028908,-4.346091],[-79.624979,-4.454198],[-79.205289,-4.959129],[-78.639897,-4.547784],[-78.450684,-3.873097],[-77.837905,-3.003021],[-76.635394,-2.608678],[-75.544996,-1.56161],[-75.233723,-0.911417],[-75.373223,-0.152032],[-75.106625,-0.057205],[-74.441601,-0.53082],[-74.122395,-1.002833],[-73.659504,-1.260491],[-73.070392,-2.308954],[-72.325787,-2.434218],[-71.774761,-2.16979],[-71.413646,-2.342802],[-70.813476,-2.256865],[-70.047709,-2.725156],[-70.692682,-3.742872],[-70.394044,-3.766591],[-69.893635,-4.298187],[-70.794769,-4.251265],[-70.928843,-4.401591],[-71.748406,-4.593983],[-72.891928,-5.274561],[-72.964507,-5.741251],[-73.219711,-6.089189],[-73.120027,-6.629931],[-73.724487,-6.918595],[-73.723401,-7.340999],[-73.987235,-7.52383],[-73.571059,-8.424447],[-73.015383,-9.032833],[-73.226713,-9.462213],[-72.563033,-9.520194],[-72.184891,-10.053598],[-71.302412,-10.079436],[-70.481894,-9.490118],[-70.548686,-11.009147],[-70.093752,-11.123972],[-69.529678,-10.951734],[-68.66508,-12.5613],[-68.88008,-12.899729],[-68.929224,-13.602684],[-68.948887,-14.453639],[-69.339535,-14.953195],[-69.160347,-15.323974],[-69.389764,-15.660129],[-68.959635,-16.500698],[-69.590424,-17.580012]]]},"id":"PER"},
-{"type":"Feature","properties":{"name":"Philippines"},"geometry":{"type":"MultiPolygon","coordinates":[[[[126.376814,8.414706],[126.478513,7.750354],[126.537424,7.189381],[126.196773,6.274294],[125.831421,7.293715],[125.363852,6.786485],[125.683161,6.049657],[125.396512,5.581003],[124.219788,6.161355],[123.93872,6.885136],[124.243662,7.36061],[123.610212,7.833527],[123.296071,7.418876],[122.825506,7.457375],[122.085499,6.899424],[121.919928,7.192119],[122.312359,8.034962],[122.942398,8.316237],[123.487688,8.69301],[123.841154,8.240324],[124.60147,8.514158],[124.764612,8.960409],[125.471391,8.986997],[125.412118,9.760335],[126.222714,9.286074],[126.306637,8.782487],[126.376814,8.414706]]],[[[123.982438,10.278779],[123.623183,9.950091],[123.309921,9.318269],[122.995883,9.022189],[122.380055,9.713361],[122.586089,9.981045],[122.837081,10.261157],[122.947411,10.881868],[123.49885,10.940624],[123.337774,10.267384],[124.077936,11.232726],[123.982438,10.278779]]],[[[118.504581,9.316383],[117.174275,8.3675],[117.664477,9.066889],[118.386914,9.6845],[118.987342,10.376292],[119.511496,11.369668],[119.689677,10.554291],[119.029458,10.003653],[118.504581,9.316383]]],[[[121.883548,11.891755],[122.483821,11.582187],[123.120217,11.58366],[123.100838,11.165934],[122.637714,10.741308],[122.00261,10.441017],[121.967367,10.905691],[122.03837,11.415841],[121.883548,11.891755]]],[[[125.502552,12.162695],[125.783465,11.046122],[125.011884,11.311455],[125.032761,10.975816],[125.277449,10.358722],[124.801819,10.134679],[124.760168,10.837995],[124.459101,10.88993],[124.302522,11.495371],[124.891013,11.415583],[124.87799,11.79419],[124.266762,12.557761],[125.227116,12.535721],[125.502552,12.162695]]],[[[121.527394,13.06959],[121.26219,12.20556],[120.833896,12.704496],[120.323436,13.466413],[121.180128,13.429697],[121.527394,13.06959]]],[[[121.321308,18.504065],[121.937601,18.218552],[122.246006,18.47895],[122.336957,18.224883],[122.174279,17.810283],[122.515654,17.093505],[122.252311,16.262444],[121.662786,15.931018],[121.50507,15.124814],[121.728829,14.328376],[122.258925,14.218202],[122.701276,14.336541],[123.950295,13.782131],[123.855107,13.237771],[124.181289,12.997527],[124.077419,12.536677],[123.298035,13.027526],[122.928652,13.55292],[122.671355,13.185836],[122.03465,13.784482],[121.126385,13.636687],[120.628637,13.857656],[120.679384,14.271016],[120.991819,14.525393],[120.693336,14.756671],[120.564145,14.396279],[120.070429,14.970869],[119.920929,15.406347],[119.883773,16.363704],[120.286488,16.034629],[120.390047,17.599081],[120.715867,18.505227],[121.321308,18.504065]]]]},"id":"PHL"},
-{"type":"Feature","properties":{"name":"Papua New Guinea"},"geometry":{"type":"MultiPolygon","coordinates":[[[[155.880026,-6.819997],[155.599991,-6.919991],[155.166994,-6.535931],[154.729192,-5.900828],[154.514114,-5.139118],[154.652504,-5.042431],[154.759991,-5.339984],[155.062918,-5.566792],[155.547746,-6.200655],[156.019965,-6.540014],[155.880026,-6.819997]]],[[[151.982796,-5.478063],[151.459107,-5.56028],[151.30139,-5.840728],[150.754447,-6.083763],[150.241197,-6.317754],[149.709963,-6.316513],[148.890065,-6.02604],[148.318937,-5.747142],[148.401826,-5.437756],[149.298412,-5.583742],[149.845562,-5.505503],[149.99625,-5.026101],[150.139756,-5.001348],[150.236908,-5.53222],[150.807467,-5.455842],[151.089672,-5.113693],[151.647881,-4.757074],[151.537862,-4.167807],[152.136792,-4.14879],[152.338743,-4.312966],[152.318693,-4.867661],[151.982796,-5.478063]]],[[[147.191874,-7.388024],[148.084636,-8.044108],[148.734105,-9.104664],[149.306835,-9.071436],[149.266631,-9.514406],[150.038728,-9.684318],[149.738798,-9.872937],[150.801628,-10.293687],[150.690575,-10.582713],[150.028393,-10.652476],[149.78231,-10.393267],[148.923138,-10.280923],[147.913018,-10.130441],[147.135443,-9.492444],[146.567881,-8.942555],[146.048481,-8.067414],[144.744168,-7.630128],[143.897088,-7.91533],[143.286376,-8.245491],[143.413913,-8.983069],[142.628431,-9.326821],[142.068259,-9.159596],[141.033852,-9.117893],[141.017057,-5.859022],[141.00021,-2.600151],[142.735247,-3.289153],[144.583971,-3.861418],[145.27318,-4.373738],[145.829786,-4.876498],[145.981922,-5.465609],[147.648073,-6.083659],[147.891108,-6.614015],[146.970905,-6.721657],[147.191874,-7.388024]]],[[[153.140038,-4.499983],[152.827292,-4.766427],[152.638673,-4.176127],[152.406026,-3.789743],[151.953237,-3.462062],[151.384279,-3.035422],[150.66205,-2.741486],[150.939965,-2.500002],[151.479984,-2.779985],[151.820015,-2.999972],[152.239989,-3.240009],[152.640017,-3.659983],[153.019994,-3.980015],[153.140038,-4.499983]]]]},"id":"PNG"},
-{"type":"Feature","properties":{"name":"Poland"},"geometry":{"type":"Polygon","coordinates":[[[15.016996,51.106674],[14.607098,51.745188],[14.685026,52.089947],[14.4376,52.62485],[14.074521,52.981263],[14.353315,53.248171],[14.119686,53.757029],[14.8029,54.050706],[16.363477,54.513159],[17.622832,54.851536],[18.620859,54.682606],[18.696255,54.438719],[19.66064,54.426084],[20.892245,54.312525],[22.731099,54.327537],[23.243987,54.220567],[23.484128,53.912498],[23.527536,53.470122],[23.804935,53.089731],[23.799199,52.691099],[23.199494,52.486977],[23.508002,52.023647],[23.527071,51.578454],[24.029986,50.705407],[23.922757,50.424881],[23.426508,50.308506],[22.51845,49.476774],[22.776419,49.027395],[22.558138,49.085738],[21.607808,49.470107],[20.887955,49.328772],[20.415839,49.431453],[19.825023,49.217125],[19.320713,49.571574],[18.909575,49.435846],[18.853144,49.49623],[18.392914,49.988629],[17.649445,50.049038],[17.554567,50.362146],[16.868769,50.473974],[16.719476,50.215747],[16.176253,50.422607],[16.238627,50.697733],[15.490972,50.78473],[15.016996,51.106674]]]},"id":"POL"},
-{"type":"Feature","properties":{"name":"Puerto Rico"},"geometry":{"type":"Polygon","coordinates":[[[-66.282434,18.514762],[-65.771303,18.426679],[-65.591004,18.228035],[-65.847164,17.975906],[-66.599934,17.981823],[-67.184162,17.946553],[-67.242428,18.37446],[-67.100679,18.520601],[-66.282434,18.514762]]]},"id":"PRI"},
-{"type":"Feature","properties":{"name":"North Korea"},"geometry":{"type":"Polygon","coordinates":[[[130.640016,42.395009],[130.780007,42.220007],[130.400031,42.280004],[129.965949,41.941368],[129.667362,41.601104],[129.705189,40.882828],[129.188115,40.661808],[129.0104,40.485436],[128.633368,40.189847],[127.967414,40.025413],[127.533436,39.75685],[127.50212,39.323931],[127.385434,39.213472],[127.783343,39.050898],[128.349716,38.612243],[128.205746,38.370397],[127.780035,38.304536],[127.073309,38.256115],[126.68372,37.804773],[126.237339,37.840378],[126.174759,37.749686],[125.689104,37.94001],[125.568439,37.752089],[125.27533,37.669071],[125.240087,37.857224],[124.981033,37.948821],[124.712161,38.108346],[124.985994,38.548474],[125.221949,38.665857],[125.132859,38.848559],[125.38659,39.387958],[125.321116,39.551385],[124.737482,39.660344],[124.265625,39.928493],[125.079942,40.569824],[126.182045,41.107336],[126.869083,41.816569],[127.343783,41.503152],[128.208433,41.466772],[128.052215,41.994285],[129.596669,42.424982],[129.994267,42.985387],[130.640016,42.395009]]]},"id":"PRK"},
-{"type":"Feature","properties":{"name":"Portugal"},"geometry":{"type":"Polygon","coordinates":[[[-9.034818,41.880571],[-8.671946,42.134689],[-8.263857,42.280469],[-8.013175,41.790886],[-7.422513,41.792075],[-7.251309,41.918346],[-6.668606,41.883387],[-6.389088,41.381815],[-6.851127,41.111083],[-6.86402,40.330872],[-7.026413,40.184524],[-7.066592,39.711892],[-7.498632,39.629571],[-7.098037,39.030073],[-7.374092,38.373059],[-7.029281,38.075764],[-7.166508,37.803894],[-7.537105,37.428904],[-7.453726,37.097788],[-7.855613,36.838269],[-8.382816,36.97888],[-8.898857,36.868809],[-8.746101,37.651346],[-8.839998,38.266243],[-9.287464,38.358486],[-9.526571,38.737429],[-9.446989,39.392066],[-9.048305,39.755093],[-8.977353,40.159306],[-8.768684,40.760639],[-8.790853,41.184334],[-8.990789,41.543459],[-9.034818,41.880571]]]},"id":"PRT"},
-{"type":"Feature","properties":{"name":"Paraguay"},"geometry":{"type":"Polygon","coordinates":[[[-62.685057,-22.249029],[-62.291179,-21.051635],[-62.265961,-20.513735],[-61.786326,-19.633737],[-60.043565,-19.342747],[-59.115042,-19.356906],[-58.183471,-19.868399],[-58.166392,-20.176701],[-57.870674,-20.732688],[-57.937156,-22.090176],[-56.88151,-22.282154],[-56.473317,-22.0863],[-55.797958,-22.35693],[-55.610683,-22.655619],[-55.517639,-23.571998],[-55.400747,-23.956935],[-55.027902,-24.001274],[-54.652834,-23.839578],[-54.29296,-24.021014],[-54.293476,-24.5708],[-54.428946,-25.162185],[-54.625291,-25.739255],[-54.788795,-26.621786],[-55.695846,-27.387837],[-56.486702,-27.548499],[-57.60976,-27.395899],[-58.618174,-27.123719],[-57.63366,-25.603657],[-57.777217,-25.16234],[-58.807128,-24.771459],[-60.028966,-24.032796],[-60.846565,-23.880713],[-62.685057,-22.249029]]]},"id":"PRY"},
-{"type":"Feature","properties":{"name":"Qatar"},"geometry":{"type":"Polygon","coordinates":[[[50.810108,24.754743],[50.743911,25.482424],[51.013352,26.006992],[51.286462,26.114582],[51.589079,25.801113],[51.6067,25.21567],[51.389608,24.627386],[51.112415,24.556331],[50.810108,24.754743]]]},"id":"QAT"},
-{"type":"Feature","properties":{"name":"Romania"},"geometry":{"type":"Polygon","coordinates":[[[22.710531,47.882194],[23.142236,48.096341],[23.760958,47.985598],[24.402056,47.981878],[24.866317,47.737526],[25.207743,47.891056],[25.945941,47.987149],[26.19745,48.220881],[26.619337,48.220726],[26.924176,48.123264],[27.233873,47.826771],[27.551166,47.405117],[28.12803,46.810476],[28.160018,46.371563],[28.054443,45.944586],[28.233554,45.488283],[28.679779,45.304031],[29.149725,45.464925],[29.603289,45.293308],[29.626543,45.035391],[29.141612,44.82021],[28.837858,44.913874],[28.558081,43.707462],[27.970107,43.812468],[27.2424,44.175986],[26.065159,43.943494],[25.569272,43.688445],[24.100679,43.741051],[23.332302,43.897011],[22.944832,43.823785],[22.65715,44.234923],[22.474008,44.409228],[22.705726,44.578003],[22.459022,44.702517],[22.145088,44.478422],[21.562023,44.768947],[21.483526,45.18117],[20.874313,45.416375],[20.762175,45.734573],[20.220192,46.127469],[21.021952,46.316088],[21.626515,46.994238],[22.099768,47.672439],[22.710531,47.882194]]]},"id":"ROU"},
-{"type":"Feature","properties":{"name":"Russia"},"geometry":{"type":"MultiPolygon","coordinates":[[[[143.648007,50.7476],[144.654148,48.976391],[143.173928,49.306551],[142.558668,47.861575],[143.533492,46.836728],[143.505277,46.137908],[142.747701,46.740765],[142.09203,45.966755],[141.906925,46.805929],[142.018443,47.780133],[141.904445,48.859189],[142.1358,49.615163],[142.179983,50.952342],[141.594076,51.935435],[141.682546,53.301966],[142.606934,53.762145],[142.209749,54.225476],[142.654786,54.365881],[142.914616,53.704578],[143.260848,52.74076],[143.235268,51.75666],[143.648007,50.7476]]],[[[22.731099,54.327537],[20.892245,54.312525],[19.66064,54.426084],[19.888481,54.86616],[21.268449,55.190482],[22.315724,55.015299],[22.757764,54.856574],[22.651052,54.582741],[22.731099,54.327537]]],[[[-175.01425,66.58435],[-174.33983,66.33556],[-174.57182,67.06219],[-171.85731,66.91308],[-169.89958,65.97724],[-170.89107,65.54139],[-172.53025,65.43791],[-172.555,64.46079],[-172.95533,64.25269],[-173.89184,64.2826],[-174.65392,64.63125],[-175.98353,64.92288],[-176.20716,65.35667],[-177.22266,65.52024],[-178.35993,65.39052],[-178.90332,65.74044],[-178.68611,66.11211],[-179.88377,65.87456],[-179.43268,65.40411],[-180,64.979709],[-180,68.963636],[-177.55,68.2],[-174.92825,67.20589],[-175.01425,66.58435]]],[[[180,70.832199],[178.903425,70.78114],[178.7253,71.0988],[180,71.515714],[180,70.832199]]],[[[-178.69378,70.89302],[-180,70.832199],[-180,71.515714],[-179.871875,71.55762],[-179.02433,71.55553],[-177.577945,71.26948],[-177.663575,71.13277],[-178.69378,70.89302]]],[[[143.60385,73.21244],[142.08763,73.20544],[140.038155,73.31692],[139.86312,73.36983],[140.81171,73.76506],[142.06207,73.85758],[143.48283,73.47525],[143.60385,73.21244]]],[[[150.73167,75.08406],[149.575925,74.68892],[147.977465,74.778355],[146.11919,75.17298],[146.358485,75.49682],[148.22223,75.345845],[150.73167,75.08406]]],[[[145.086285,75.562625],[144.3,74.82],[140.61381,74.84768],[138.95544,74.61148],[136.97439,75.26167],[137.51176,75.94917],[138.831075,76.13676],[141.471615,76.09289],[145.086285,75.562625]]],[[[57.535693,70.720464],[56.944979,70.632743],[53.677375,70.762658],[53.412017,71.206662],[51.601895,71.474759],[51.455754,72.014881],[52.478275,72.229442],[52.444169,72.774731],[54.427614,73.627548],[53.50829,73.749814],[55.902459,74.627486],[55.631933,75.081412],[57.868644,75.60939],[61.170044,76.251883],[64.498368,76.439055],[66.210977,76.809782],[68.15706,76.939697],[68.852211,76.544811],[68.180573,76.233642],[64.637326,75.737755],[61.583508,75.260885],[58.477082,74.309056],[56.986786,73.333044],[55.419336,72.371268],[55.622838,71.540595],[57.535693,70.720464]]],[[[106.97013,76.97419],[107.24,76.48],[108.1538,76.72335],[111.07726,76.71],[113.33151,76.22224],[114.13417,75.84764],[113.88539,75.32779],[112.77918,75.03186],[110.15125,74.47673],[109.4,74.18],[110.64,74.04],[112.11919,73.78774],[113.01954,73.97693],[113.52958,73.33505],[113.96881,73.59488],[115.56782,73.75285],[118.77633,73.58772],[119.02,73.12],[123.20066,72.97122],[123.25777,73.73503],[125.38,73.56],[126.97644,73.56549],[128.59126,73.03871],[129.05157,72.39872],[128.46,71.98],[129.71599,71.19304],[131.28858,70.78699],[132.2535,71.8363],[133.85766,71.38642],[135.56193,71.65525],[137.49755,71.34763],[138.23409,71.62803],[139.86983,71.48783],[139.14791,72.41619],[140.46817,72.84941],[149.5,72.2],[150.35118,71.60643],[152.9689,70.84222],[157.00688,71.03141],[158.99779,70.86672],[159.83031,70.45324],[159.70866,69.72198],[160.94053,69.43728],[162.27907,69.64204],[164.05248,69.66823],[165.94037,69.47199],[167.83567,69.58269],[169.57763,68.6938],[170.81688,69.01363],[170.0082,69.65276],[170.45345,70.09703],[173.64391,69.81743],[175.72403,69.87725],[178.6,69.4],[180,68.963636],[180,64.979709],[179.99281,64.97433],[178.7072,64.53493],[177.41128,64.60821],[178.313,64.07593],[178.90825,63.25197],[179.37034,62.98262],[179.48636,62.56894],[179.22825,62.3041],[177.3643,62.5219],[174.56929,61.76915],[173.68013,61.65261],[172.15,60.95],[170.6985,60.33618],[170.33085,59.88177],[168.90046,60.57355],[166.29498,59.78855],[165.84,60.16],[164.87674,59.7316],[163.53929,59.86871],[163.21711,59.21101],[162.01733,58.24328],[162.05297,57.83912],[163.19191,57.61503],[163.05794,56.15924],[162.12958,56.12219],[161.70146,55.28568],[162.11749,54.85514],[160.36877,54.34433],[160.02173,53.20257],[158.53094,52.95868],[158.23118,51.94269],[156.78979,51.01105],[156.42,51.7],[155.99182,53.15895],[155.43366,55.38103],[155.91442,56.76792],[156.75815,57.3647],[156.81035,57.83204],[158.36433,58.05575],[160.15064,59.31477],[161.87204,60.343],[163.66969,61.1409],[164.47355,62.55061],[163.25842,62.46627],[162.65791,61.6425],[160.12148,60.54423],[159.30232,61.77396],[156.72068,61.43442],[154.21806,59.75818],[155.04375,59.14495],[152.81185,58.88385],[151.26573,58.78089],[151.33815,59.50396],[149.78371,59.65573],[148.54481,59.16448],[145.48722,59.33637],[142.19782,59.03998],[138.95848,57.08805],[135.12619,54.72959],[136.70171,54.60355],[137.19342,53.97732],[138.1647,53.75501],[138.80463,54.25455],[139.90151,54.18968],[141.34531,53.08957],[141.37923,52.23877],[140.59742,51.23967],[140.51308,50.04553],[140.06193,48.44671],[138.55472,46.99965],[138.21971,46.30795],[136.86232,45.1435],[135.51535,43.989],[134.86939,43.39821],[133.53687,42.81147],[132.90627,42.79849],[132.27807,43.28456],[130.93587,42.55274],[130.78,42.22],[130.64,42.395],[130.633866,42.903015],[131.144688,42.92999],[131.288555,44.11152],[131.02519,44.96796],[131.883454,45.321162],[133.09712,45.14409],[133.769644,46.116927],[134.11235,47.21248],[134.50081,47.57845],[135.026311,48.47823],[133.373596,48.183442],[132.50669,47.78896],[130.98726,47.79013],[130.582293,48.729687],[129.397818,49.4406],[127.6574,49.76027],[127.287456,50.739797],[126.939157,51.353894],[126.564399,51.784255],[125.946349,52.792799],[125.068211,53.161045],[123.57147,53.4588],[122.245748,53.431726],[121.003085,53.251401],[120.177089,52.753886],[120.725789,52.516226],[120.7382,51.96411],[120.18208,51.64355],[119.27939,50.58292],[119.288461,50.142883],[117.879244,49.510983],[116.678801,49.888531],[115.485695,49.805177],[114.96211,50.140247],[114.362456,50.248303],[112.89774,49.543565],[111.581231,49.377968],[110.662011,49.130128],[109.402449,49.292961],[108.475167,49.282548],[107.868176,49.793705],[106.888804,50.274296],[105.886591,50.406019],[104.62158,50.27532],[103.676545,50.089966],[102.25589,50.51056],[102.06521,51.25991],[100.88948,51.516856],[99.981732,51.634006],[98.861491,52.047366],[97.82574,51.010995],[98.231762,50.422401],[97.25976,49.72605],[95.81402,49.97746],[94.815949,50.013433],[94.147566,50.480537],[93.10421,50.49529],[92.234712,50.802171],[90.713667,50.331812],[88.805567,49.470521],[87.751264,49.297198],[87.35997,49.214981],[86.829357,49.826675],[85.54127,49.692859],[85.11556,50.117303],[84.416377,50.3114],[83.935115,50.889246],[83.383004,51.069183],[81.945986,50.812196],[80.568447,51.388336],[80.03556,50.864751],[77.800916,53.404415],[76.525179,54.177003],[76.8911,54.490524],[74.38482,53.54685],[73.425679,53.48981],[73.508516,54.035617],[72.22415,54.376655],[71.180131,54.133285],[70.865267,55.169734],[69.068167,55.38525],[68.1691,54.970392],[65.66687,54.60125],[65.178534,54.354228],[61.4366,54.00625],[60.978066,53.664993],[61.699986,52.979996],[60.739993,52.719986],[60.927269,52.447548],[59.967534,51.96042],[61.588003,51.272659],[61.337424,50.79907],[59.932807,50.842194],[59.642282,50.545442],[58.36332,51.06364],[56.77798,51.04355],[55.71694,50.62171],[54.532878,51.02624],[52.328724,51.718652],[50.766648,51.692762],[48.702382,50.605128],[48.577841,49.87476],[47.54948,50.454698],[46.751596,49.356006],[47.043672,49.152039],[46.466446,48.394152],[47.31524,47.71585],[48.05725,47.74377],[48.694734,47.075628],[48.59325,46.56104],[49.10116,46.39933],[48.64541,45.80629],[47.67591,45.64149],[46.68201,44.6092],[47.59094,43.66016],[47.49252,42.98658],[48.58437,41.80888],[47.987283,41.405819],[47.815666,41.151416],[47.373315,41.219732],[46.686071,41.827137],[46.404951,41.860675],[45.7764,42.09244],[45.470279,42.502781],[44.537623,42.711993],[43.93121,42.55496],[43.75599,42.74083],[42.3944,43.2203],[40.92219,43.38215],[40.076965,43.553104],[39.955009,43.434998],[38.68,44.28],[37.53912,44.65721],[36.67546,45.24469],[37.40317,45.40451],[38.23295,46.24087],[37.67372,46.63657],[39.14767,47.04475],[39.1212,47.26336],[38.223538,47.10219],[38.255112,47.5464],[38.77057,47.82562],[39.738278,47.898937],[39.89562,48.23241],[39.67465,48.78382],[40.080789,49.30743],[40.06904,49.60105],[38.594988,49.926462],[38.010631,49.915662],[37.39346,50.383953],[36.626168,50.225591],[35.356116,50.577197],[35.37791,50.77394],[35.022183,51.207572],[34.224816,51.255993],[34.141978,51.566413],[34.391731,51.768882],[33.7527,52.335075],[32.715761,52.238465],[32.412058,52.288695],[32.15944,52.06125],[31.78597,52.10168],[31.540018,52.742052],[31.305201,53.073996],[31.49764,53.16743],[32.304519,53.132726],[32.693643,53.351421],[32.405599,53.618045],[31.731273,53.794029],[31.791424,53.974639],[31.384472,54.157056],[30.757534,54.811771],[30.971836,55.081548],[30.873909,55.550976],[29.896294,55.789463],[29.371572,55.670091],[29.229513,55.918344],[28.176709,56.16913],[27.855282,56.759326],[27.770016,57.244258],[27.288185,57.474528],[27.716686,57.791899],[27.42015,58.72457],[28.131699,59.300825],[27.98112,59.47537],[29.1177,60.02805],[28.07,60.50352],[30.211107,61.780028],[31.139991,62.357693],[31.516092,62.867687],[30.035872,63.552814],[30.444685,64.204453],[29.54443,64.948672],[30.21765,65.80598],[29.054589,66.944286],[29.977426,67.698297],[28.445944,68.364613],[28.59193,69.064777],[29.39955,69.15692],[31.10108,69.55811],[32.13272,69.90595],[33.77547,69.30142],[36.51396,69.06342],[40.29234,67.9324],[41.05987,67.45713],[41.12595,66.79158],[40.01583,66.26618],[38.38295,65.99953],[33.91871,66.75961],[33.18444,66.63253],[34.81477,65.90015],[34.878574,65.436213],[34.94391,64.41437],[36.23129,64.10945],[37.01273,63.84983],[37.14197,64.33471],[36.539579,64.76446],[37.17604,65.14322],[39.59345,64.52079],[40.4356,64.76446],[39.7626,65.49682],[42.09309,66.47623],[43.01604,66.41858],[43.94975,66.06908],[44.53226,66.75634],[43.69839,67.35245],[44.18795,67.95051],[43.45282,68.57079],[46.25,68.25],[46.82134,67.68997],[45.55517,67.56652],[45.56202,67.01005],[46.34915,66.66767],[47.89416,66.88455],[48.13876,67.52238],[50.22766,67.99867],[53.71743,68.85738],[54.47171,68.80815],[53.48582,68.20131],[54.72628,68.09702],[55.44268,68.43866],[57.31702,68.46628],[58.802,68.88082],[59.94142,68.27844],[61.07784,68.94069],[60.03,69.52],[60.55,69.85],[63.504,69.54739],[64.888115,69.234835],[68.51216,68.09233],[69.18068,68.61563],[68.16444,69.14436],[68.13522,69.35649],[66.93008,69.45461],[67.25976,69.92873],[66.72492,70.70889],[66.69466,71.02897],[68.54006,71.9345],[69.19636,72.84336],[69.94,73.04],[72.58754,72.77629],[72.79603,72.22006],[71.84811,71.40898],[72.47011,71.09019],[72.79188,70.39114],[72.5647,69.02085],[73.66787,68.4079],[73.2387,67.7404],[71.28,66.32],[72.42301,66.17267],[72.82077,66.53267],[73.92099,66.78946],[74.18651,67.28429],[75.052,67.76047],[74.46926,68.32899],[74.93584,68.98918],[73.84236,69.07146],[73.60187,69.62763],[74.3998,70.63175],[73.1011,71.44717],[74.89082,72.12119],[74.65926,72.83227],[75.15801,72.85497],[75.68351,72.30056],[75.28898,71.33556],[76.35911,71.15287],[75.90313,71.87401],[77.57665,72.26717],[79.65202,72.32011],[81.5,71.75],[80.61071,72.58285],[80.51109,73.6482],[82.25,73.85],[84.65526,73.80591],[86.8223,73.93688],[86.00956,74.45967],[87.16682,75.11643],[88.31571,75.14393],[90.26,75.64],[92.90058,75.77333],[93.23421,76.0472],[95.86,76.14],[96.67821,75.91548],[98.92254,76.44689],[100.75967,76.43028],[101.03532,76.86189],[101.99084,77.28754],[104.3516,77.69792],[106.06664,77.37389],[104.705,77.1274],[106.97013,76.97419]]],[[[105.07547,78.30689],[99.43814,77.921],[101.2649,79.23399],[102.08635,79.34641],[102.837815,79.28129],[105.37243,78.71334],[105.07547,78.30689]]],[[[51.136187,80.54728],[49.793685,80.415428],[48.894411,80.339567],[48.754937,80.175468],[47.586119,80.010181],[46.502826,80.247247],[47.072455,80.559424],[44.846958,80.58981],[46.799139,80.771918],[48.318477,80.78401],[48.522806,80.514569],[49.09719,80.753986],[50.039768,80.918885],[51.522933,80.699726],[51.136187,80.54728]]],[[[99.93976,78.88094],[97.75794,78.7562],[94.97259,79.044745],[93.31288,79.4265],[92.5454,80.14379],[91.18107,80.34146],[93.77766,81.0246],[95.940895,81.2504],[97.88385,80.746975],[100.186655,79.780135],[99.93976,78.88094]]]]},"id":"RUS"},
-{"type":"Feature","properties":{"name":"Rwanda"},"geometry":{"type":"Polygon","coordinates":[[[30.419105,-1.134659],[30.816135,-1.698914],[30.758309,-2.28725],[30.469696,-2.413858],[29.938359,-2.348487],[29.632176,-2.917858],[29.024926,-2.839258],[29.117479,-2.292211],[29.254835,-2.21511],[29.291887,-1.620056],[29.579466,-1.341313],[29.821519,-1.443322],[30.419105,-1.134659]]]},"id":"RWA"},
-{"type":"Feature","properties":{"name":"Western Sahara"},"geometry":{"type":"Polygon","coordinates":[[[-8.794884,27.120696],[-8.817828,27.656426],[-8.66559,27.656426],[-8.665124,27.589479],[-8.6844,27.395744],[-8.687294,25.881056],[-11.969419,25.933353],[-11.937224,23.374594],[-12.874222,23.284832],[-13.118754,22.77122],[-12.929102,21.327071],[-16.845194,21.333323],[-17.063423,20.999752],[-17.020428,21.42231],[-17.002962,21.420734],[-14.750955,21.5006],[-14.630833,21.86094],[-14.221168,22.310163],[-13.89111,23.691009],[-12.500963,24.770116],[-12.030759,26.030866],[-11.71822,26.104092],[-11.392555,26.883424],[-10.551263,26.990808],[-10.189424,26.860945],[-9.735343,26.860945],[-9.413037,27.088476],[-8.794884,27.120696]]]},"id":"ESH"},
-{"type":"Feature","properties":{"name":"Saudi Arabia"},"geometry":{"type":"Polygon","coordinates":[[[42.779332,16.347891],[42.649573,16.774635],[42.347989,17.075806],[42.270888,17.474722],[41.754382,17.833046],[41.221391,18.6716],[40.939341,19.486485],[40.247652,20.174635],[39.801685,20.338862],[39.139399,21.291905],[39.023696,21.986875],[39.066329,22.579656],[38.492772,23.688451],[38.02386,24.078686],[37.483635,24.285495],[37.154818,24.858483],[37.209491,25.084542],[36.931627,25.602959],[36.639604,25.826228],[36.249137,26.570136],[35.640182,27.37652],[35.130187,28.063352],[34.632336,28.058546],[34.787779,28.607427],[34.83222,28.957483],[34.956037,29.356555],[36.068941,29.197495],[36.501214,29.505254],[36.740528,29.865283],[37.503582,30.003776],[37.66812,30.338665],[37.998849,30.5085],[37.002166,31.508413],[39.004886,32.010217],[39.195468,32.161009],[40.399994,31.889992],[41.889981,31.190009],[44.709499,29.178891],[46.568713,29.099025],[47.459822,29.002519],[47.708851,28.526063],[48.416094,28.552004],[48.807595,27.689628],[49.299554,27.461218],[49.470914,27.109999],[50.152422,26.689663],[50.212935,26.277027],[50.113303,25.943972],[50.239859,25.60805],[50.527387,25.327808],[50.660557,24.999896],[50.810108,24.754743],[51.112415,24.556331],[51.389608,24.627386],[51.579519,24.245497],[51.617708,24.014219],[52.000733,23.001154],[55.006803,22.496948],[55.208341,22.70833],[55.666659,22.000001],[54.999982,19.999994],[52.00001,19.000003],[49.116672,18.616668],[48.183344,18.166669],[47.466695,17.116682],[47.000005,16.949999],[46.749994,17.283338],[46.366659,17.233315],[45.399999,17.333335],[45.216651,17.433329],[44.062613,17.410359],[43.791519,17.319977],[43.380794,17.579987],[43.115798,17.08844],[43.218375,16.66689],[42.779332,16.347891]]]},"id":"SAU"},
-{"type":"Feature","properties":{"name":"Sudan"},"geometry":{"type":"Polygon","coordinates":[[[33.963393,9.464285],[33.824963,9.484061],[33.842131,9.981915],[33.721959,10.325262],[33.206938,10.720112],[33.086766,11.441141],[33.206938,12.179338],[32.743419,12.248008],[32.67475,12.024832],[32.073892,11.97333],[32.314235,11.681484],[32.400072,11.080626],[31.850716,10.531271],[31.352862,9.810241],[30.837841,9.707237],[29.996639,10.290927],[29.618957,10.084919],[29.515953,9.793074],[29.000932,9.604232],[28.966597,9.398224],[27.97089,9.398224],[27.833551,9.604232],[27.112521,9.638567],[26.752006,9.466893],[26.477328,9.55273],[25.962307,10.136421],[25.790633,10.411099],[25.069604,10.27376],[24.794926,9.810241],[24.537415,8.917538],[24.194068,8.728696],[23.88698,8.61973],[23.805813,8.666319],[23.459013,8.954286],[23.394779,9.265068],[23.55725,9.681218],[23.554304,10.089255],[22.977544,10.714463],[22.864165,11.142395],[22.87622,11.38461],[22.50869,11.67936],[22.49762,12.26024],[22.28801,12.64605],[21.93681,12.58818],[22.03759,12.95546],[22.29658,13.37232],[22.18329,13.78648],[22.51202,14.09318],[22.30351,14.32682],[22.56795,14.94429],[23.02459,15.68072],[23.88689,15.61084],[23.83766,19.58047],[23.85,20],[25,20.00304],[25,22],[29.02,22],[32.9,22],[36.86623,22],[37.18872,21.01885],[36.96941,20.83744],[37.1147,19.80796],[37.48179,18.61409],[37.86276,18.36786],[38.41009,17.998307],[37.904,17.42754],[37.16747,17.26314],[36.85253,16.95655],[36.75389,16.29186],[36.32322,14.82249],[36.42951,14.42211],[36.27022,13.56333],[35.86363,12.57828],[35.26049,12.08286],[34.83163,11.31896],[34.73115,10.91017],[34.25745,10.63009],[33.96162,9.58358],[33.963393,9.464285]]]},"id":"SDN"},
-{"type":"Feature","properties":{"name":"South Sudan"},"geometry":{"type":"Polygon","coordinates":[[[33.963393,9.464285],[33.97498,8.68456],[33.8255,8.37916],[33.2948,8.35458],[32.95418,7.78497],[33.56829,7.71334],[34.0751,7.22595],[34.25032,6.82607],[34.70702,6.59422],[35.298007,5.506],[34.620196,4.847123],[34.005,4.249885],[33.39,3.79],[32.68642,3.79232],[31.88145,3.55827],[31.24556,3.7819],[30.83385,3.50917],[29.95349,4.1737],[29.715995,4.600805],[29.159078,4.389267],[28.696678,4.455077],[28.428994,4.287155],[27.979977,4.408413],[27.374226,5.233944],[27.213409,5.550953],[26.465909,5.946717],[26.213418,6.546603],[25.796648,6.979316],[25.124131,7.500085],[25.114932,7.825104],[24.567369,8.229188],[23.88698,8.61973],[24.194068,8.728696],[24.537415,8.917538],[24.794926,9.810241],[25.069604,10.27376],[25.790633,10.411099],[25.962307,10.136421],[26.477328,9.55273],[26.752006,9.466893],[27.112521,9.638567],[27.833551,9.604232],[27.97089,9.398224],[28.966597,9.398224],[29.000932,9.604232],[29.515953,9.793074],[29.618957,10.084919],[29.996639,10.290927],[30.837841,9.707237],[31.352862,9.810241],[31.850716,10.531271],[32.400072,11.080626],[32.314235,11.681484],[32.073892,11.97333],[32.67475,12.024832],[32.743419,12.248008],[33.206938,12.179338],[33.086766,11.441141],[33.206938,10.720112],[33.721959,10.325262],[33.842131,9.981915],[33.824963,9.484061],[33.963393,9.464285]]]},"id":"SSD"},
-{"type":"Feature","properties":{"name":"Senegal"},"geometry":{"type":"Polygon","coordinates":[[[-16.713729,13.594959],[-17.126107,14.373516],[-17.625043,14.729541],[-17.185173,14.919477],[-16.700706,15.621527],[-16.463098,16.135036],[-16.12069,16.455663],[-15.623666,16.369337],[-15.135737,16.587282],[-14.577348,16.598264],[-14.099521,16.304302],[-13.435738,16.039383],[-12.830658,15.303692],[-12.17075,14.616834],[-12.124887,13.994727],[-11.927716,13.422075],[-11.553398,13.141214],[-11.467899,12.754519],[-11.513943,12.442988],[-11.658301,12.386583],[-12.203565,12.465648],[-12.278599,12.35444],[-12.499051,12.33209],[-13.217818,12.575874],[-13.700476,12.586183],[-15.548477,12.62817],[-15.816574,12.515567],[-16.147717,12.547762],[-16.677452,12.384852],[-16.841525,13.151394],[-15.931296,13.130284],[-15.691001,13.270353],[-15.511813,13.27857],[-15.141163,13.509512],[-14.712197,13.298207],[-14.277702,13.280585],[-13.844963,13.505042],[-14.046992,13.794068],[-14.376714,13.62568],[-14.687031,13.630357],[-15.081735,13.876492],[-15.39877,13.860369],[-15.624596,13.623587],[-16.713729,13.594959]]]},"id":"SEN"},
-{"type":"Feature","properties":{"name":"Solomon Islands"},"geometry":{"type":"MultiPolygon","coordinates":[[[[162.119025,-10.482719],[162.398646,-10.826367],[161.700032,-10.820011],[161.319797,-10.204751],[161.917383,-10.446701],[162.119025,-10.482719]]],[[[160.852229,-9.872937],[160.462588,-9.89521],[159.849447,-9.794027],[159.640003,-9.63998],[159.702945,-9.24295],[160.362956,-9.400304],[160.688518,-9.610162],[160.852229,-9.872937]]],[[[161.679982,-9.599982],[161.529397,-9.784312],[160.788253,-8.917543],[160.579997,-8.320009],[160.920028,-8.320009],[161.280006,-9.120011],[161.679982,-9.599982]]],[[[159.875027,-8.33732],[159.917402,-8.53829],[159.133677,-8.114181],[158.586114,-7.754824],[158.21115,-7.421872],[158.359978,-7.320018],[158.820001,-7.560003],[159.640003,-8.020027],[159.875027,-8.33732]]],[[[157.538426,-7.34782],[157.33942,-7.404767],[156.90203,-7.176874],[156.491358,-6.765943],[156.542828,-6.599338],[157.14,-7.021638],[157.538426,-7.34782]]]]},"id":"SLB"},
-{"type":"Feature","properties":{"name":"Sierra Leone"},"geometry":{"type":"Polygon","coordinates":[[[-11.438779,6.785917],[-11.708195,6.860098],[-12.428099,7.262942],[-12.949049,7.798646],[-13.124025,8.163946],[-13.24655,8.903049],[-12.711958,9.342712],[-12.596719,9.620188],[-12.425929,9.835834],[-12.150338,9.858572],[-11.917277,10.046984],[-11.117481,10.045873],[-10.839152,9.688246],[-10.622395,9.26791],[-10.65477,8.977178],[-10.494315,8.715541],[-10.505477,8.348896],[-10.230094,8.406206],[-10.695595,7.939464],[-11.146704,7.396706],[-11.199802,7.105846],[-11.438779,6.785917]]]},"id":"SLE"},
-{"type":"Feature","properties":{"name":"El Salvador"},"geometry":{"type":"Polygon","coordinates":[[[-87.793111,13.38448],[-87.904112,13.149017],[-88.483302,13.163951],[-88.843228,13.259734],[-89.256743,13.458533],[-89.812394,13.520622],[-90.095555,13.735338],[-90.064678,13.88197],[-89.721934,14.134228],[-89.534219,14.244816],[-89.587343,14.362586],[-89.353326,14.424133],[-89.058512,14.340029],[-88.843073,14.140507],[-88.541231,13.980155],[-88.503998,13.845486],[-88.065343,13.964626],[-87.859515,13.893312],[-87.723503,13.78505],[-87.793111,13.38448]]]},"id":"SLV"},
-{"type":"Feature","properties":{"name":"Somaliland"},"geometry":{"type":"Polygon","coordinates":[[[48.93813,9.451749],[48.486736,8.837626],[47.78942,8.003],[46.948328,7.996877],[43.67875,9.18358],[43.296975,9.540477],[42.92812,10.02194],[42.55876,10.57258],[42.776852,10.926879],[43.145305,11.46204],[43.47066,11.27771],[43.666668,10.864169],[44.117804,10.445538],[44.614259,10.442205],[45.556941,10.698029],[46.645401,10.816549],[47.525658,11.127228],[48.021596,11.193064],[48.378784,11.375482],[48.948206,11.410622],[48.942005,11.394266],[48.938491,10.982327],[48.938233,9.9735],[48.93813,9.451749]]]},"id":"-99"},
-{"type":"Feature","properties":{"name":"Somalia"},"geometry":{"type":"Polygon","coordinates":[[[49.72862,11.5789],[50.25878,11.67957],[50.73202,12.0219],[51.1112,12.02464],[51.13387,11.74815],[51.04153,11.16651],[51.04531,10.6409],[50.83418,10.27972],[50.55239,9.19874],[50.07092,8.08173],[49.4527,6.80466],[48.59455,5.33911],[47.74079,4.2194],[46.56476,2.85529],[45.56399,2.04576],[44.06815,1.05283],[43.13597,0.2922],[42.04157,-0.91916],[41.81095,-1.44647],[41.58513,-1.68325],[40.993,-0.85829],[40.98105,2.78452],[41.855083,3.918912],[42.12861,4.23413],[42.76967,4.25259],[43.66087,4.95755],[44.9636,5.00162],[47.78942,8.003],[48.486736,8.837626],[48.93813,9.451749],[48.938233,9.9735],[48.938491,10.982327],[48.942005,11.394266],[48.948205,11.410617],[49.26776,11.43033],[49.72862,11.5789]]]},"id":"SOM"},
-{"type":"Feature","properties":{"name":"Republic of Serbia"},"geometry":{"type":"Polygon","coordinates":[[[20.874313,45.416375],[21.483526,45.18117],[21.562023,44.768947],[22.145088,44.478422],[22.459022,44.702517],[22.705726,44.578003],[22.474008,44.409228],[22.65715,44.234923],[22.410446,44.008063],[22.500157,43.642814],[22.986019,43.211161],[22.604801,42.898519],[22.436595,42.580321],[22.545012,42.461362],[22.380526,42.32026],[21.91708,42.30364],[21.576636,42.245224],[21.54332,42.32025],[21.66292,42.43922],[21.77505,42.6827],[21.63302,42.67717],[21.43866,42.86255],[21.27421,42.90959],[21.143395,43.068685],[20.95651,43.13094],[20.81448,43.27205],[20.63508,43.21671],[20.49679,42.88469],[20.25758,42.81275],[20.3398,42.89852],[19.95857,43.10604],[19.63,43.21378],[19.48389,43.35229],[19.21852,43.52384],[19.454,43.5681],[19.59976,44.03847],[19.11761,44.42307],[19.36803,44.863],[19.00548,44.86023],[19.390476,45.236516],[19.072769,45.521511],[18.82982,45.90888],[19.596045,46.17173],[20.220192,46.127469],[20.762175,45.734573],[20.874313,45.416375]]]},"id":"SRB"},
-{"type":"Feature","properties":{"name":"Suriname"},"geometry":{"type":"Polygon","coordinates":[[[-57.147436,5.97315],[-55.949318,5.772878],[-55.84178,5.953125],[-55.03325,6.025291],[-53.958045,5.756548],[-54.478633,4.896756],[-54.399542,4.212611],[-54.006931,3.620038],[-54.181726,3.18978],[-54.269705,2.732392],[-54.524754,2.311849],[-55.097587,2.523748],[-55.569755,2.421506],[-55.973322,2.510364],[-56.073342,2.220795],[-55.9056,2.021996],[-55.995698,1.817667],[-56.539386,1.899523],[-57.150098,2.768927],[-57.281433,3.333492],[-57.601569,3.334655],[-58.044694,4.060864],[-57.86021,4.576801],[-57.914289,4.812626],[-57.307246,5.073567],[-57.147436,5.97315]]]},"id":"SUR"},
-{"type":"Feature","properties":{"name":"Slovakia"},"geometry":{"type":"Polygon","coordinates":[[[18.853144,49.49623],[18.909575,49.435846],[19.320713,49.571574],[19.825023,49.217125],[20.415839,49.431453],[20.887955,49.328772],[21.607808,49.470107],[22.558138,49.085738],[22.280842,48.825392],[22.085608,48.422264],[21.872236,48.319971],[20.801294,48.623854],[20.473562,48.56285],[20.239054,48.327567],[19.769471,48.202691],[19.661364,48.266615],[19.174365,48.111379],[18.777025,48.081768],[18.696513,47.880954],[17.857133,47.758429],[17.488473,47.867466],[16.979667,48.123497],[16.879983,48.470013],[16.960288,48.596982],[17.101985,48.816969],[17.545007,48.800019],[17.886485,48.903475],[17.913512,48.996493],[18.104973,49.043983],[18.170498,49.271515],[18.399994,49.315001],[18.554971,49.495015],[18.853144,49.49623]]]},"id":"SVK"},
-{"type":"Feature","properties":{"name":"Slovenia"},"geometry":{"type":"Polygon","coordinates":[[[13.806475,46.509306],[14.632472,46.431817],[15.137092,46.658703],[16.011664,46.683611],[16.202298,46.852386],[16.370505,46.841327],[16.564808,46.503751],[15.768733,46.238108],[15.67153,45.834154],[15.323954,45.731783],[15.327675,45.452316],[14.935244,45.471695],[14.595109,45.634941],[14.411968,45.466166],[13.71506,45.500324],[13.93763,45.591016],[13.69811,46.016778],[13.806475,46.509306]]]},"id":"SVN"},
-{"type":"Feature","properties":{"name":"Sweden"},"geometry":{"type":"Polygon","coordinates":[[[22.183173,65.723741],[21.213517,65.026005],[21.369631,64.413588],[19.778876,63.609554],[17.847779,62.7494],[17.119555,61.341166],[17.831346,60.636583],[18.787722,60.081914],[17.869225,58.953766],[16.829185,58.719827],[16.44771,57.041118],[15.879786,56.104302],[14.666681,56.200885],[14.100721,55.407781],[12.942911,55.361737],[12.625101,56.30708],[11.787942,57.441817],[11.027369,58.856149],[11.468272,59.432393],[12.300366,60.117933],[12.631147,61.293572],[11.992064,61.800362],[11.930569,63.128318],[12.579935,64.066219],[13.571916,64.049114],[13.919905,64.445421],[13.55569,64.787028],[15.108411,66.193867],[16.108712,67.302456],[16.768879,68.013937],[17.729182,68.010552],[17.993868,68.567391],[19.87856,68.407194],[20.025269,69.065139],[20.645593,69.106247],[21.978535,68.616846],[23.539473,67.936009],[23.56588,66.396051],[23.903379,66.006927],[22.183173,65.723741]]]},"id":"SWE"},
-{"type":"Feature","properties":{"name":"Swaziland"},"geometry":{"type":"Polygon","coordinates":[[[32.071665,-26.73382],[31.86806,-27.177927],[31.282773,-27.285879],[30.685962,-26.743845],[30.676609,-26.398078],[30.949667,-26.022649],[31.04408,-25.731452],[31.333158,-25.660191],[31.837778,-25.843332],[31.985779,-26.29178],[32.071665,-26.73382]]]},"id":"SWZ"},
-{"type":"Feature","properties":{"name":"Syria"},"geometry":{"type":"Polygon","coordinates":[[[38.792341,33.378686],[36.834062,32.312938],[35.719918,32.709192],[35.700798,32.716014],[35.836397,32.868123],[35.821101,33.277426],[36.06646,33.824912],[36.61175,34.201789],[36.448194,34.593935],[35.998403,34.644914],[35.905023,35.410009],[36.149763,35.821535],[36.41755,36.040617],[36.685389,36.259699],[36.739494,36.81752],[37.066761,36.623036],[38.167727,36.90121],[38.699891,36.712927],[39.52258,36.716054],[40.673259,37.091276],[41.212089,37.074352],[42.349591,37.229873],[41.837064,36.605854],[41.289707,36.358815],[41.383965,35.628317],[41.006159,34.419372],[38.792341,33.378686]]]},"id":"SYR"},
-{"type":"Feature","properties":{"name":"Chad"},"geometry":{"type":"Polygon","coordinates":[[[14.495787,12.859396],[14.595781,13.330427],[13.954477,13.353449],[13.956699,13.996691],[13.540394,14.367134],[13.97217,15.68437],[15.247731,16.627306],[15.300441,17.92795],[15.685741,19.95718],[15.903247,20.387619],[15.487148,20.730415],[15.47106,21.04845],[15.096888,21.308519],[14.8513,22.86295],[15.86085,23.40972],[19.84926,21.49509],[23.83766,19.58047],[23.88689,15.61084],[23.02459,15.68072],[22.56795,14.94429],[22.30351,14.32682],[22.51202,14.09318],[22.18329,13.78648],[22.29658,13.37232],[22.03759,12.95546],[21.93681,12.58818],[22.28801,12.64605],[22.49762,12.26024],[22.50869,11.67936],[22.87622,11.38461],[22.864165,11.142395],[22.231129,10.971889],[21.723822,10.567056],[21.000868,9.475985],[20.059685,9.012706],[19.094008,9.074847],[18.81201,8.982915],[18.911022,8.630895],[18.389555,8.281304],[17.96493,7.890914],[16.705988,7.508328],[16.456185,7.734774],[16.290562,7.754307],[16.106232,7.497088],[15.27946,7.421925],[15.436092,7.692812],[15.120866,8.38215],[14.979996,8.796104],[14.544467,8.965861],[13.954218,9.549495],[14.171466,10.021378],[14.627201,9.920919],[14.909354,9.992129],[15.467873,9.982337],[14.923565,10.891325],[14.960152,11.555574],[14.89336,12.21905],[14.495787,12.859396]]]},"id":"TCD"},
-{"type":"Feature","properties":{"name":"Togo"},"geometry":{"type":"Polygon","coordinates":[[[1.865241,6.142158],[1.060122,5.928837],[0.836931,6.279979],[0.570384,6.914359],[0.490957,7.411744],[0.712029,8.312465],[0.461192,8.677223],[0.365901,9.465004],[0.36758,10.191213],[-0.049785,10.706918],[0.023803,11.018682],[0.899563,10.997339],[0.772336,10.470808],[1.077795,10.175607],[1.425061,9.825395],[1.463043,9.334624],[1.664478,9.12859],[1.618951,6.832038],[1.865241,6.142158]]]},"id":"TGO"},
-{"type":"Feature","properties":{"name":"Thailand"},"geometry":{"type":"Polygon","coordinates":[[[102.584932,12.186595],[101.687158,12.64574],[100.83181,12.627085],[100.978467,13.412722],[100.097797,13.406856],[100.018733,12.307001],[99.478921,10.846367],[99.153772,9.963061],[99.222399,9.239255],[99.873832,9.207862],[100.279647,8.295153],[100.459274,7.429573],[101.017328,6.856869],[101.623079,6.740622],[102.141187,6.221636],[101.814282,5.810808],[101.154219,5.691384],[101.075516,6.204867],[100.259596,6.642825],[100.085757,6.464489],[99.690691,6.848213],[99.519642,7.343454],[98.988253,7.907993],[98.503786,8.382305],[98.339662,7.794512],[98.150009,8.350007],[98.25915,8.973923],[98.553551,9.93296],[99.038121,10.960546],[99.587286,11.892763],[99.196354,12.804748],[99.212012,13.269294],[99.097755,13.827503],[98.430819,14.622028],[98.192074,15.123703],[98.537376,15.308497],[98.903348,16.177824],[98.493761,16.837836],[97.859123,17.567946],[97.375896,18.445438],[97.797783,18.62708],[98.253724,19.708203],[98.959676,19.752981],[99.543309,20.186598],[100.115988,20.41785],[100.548881,20.109238],[100.606294,19.508344],[101.282015,19.462585],[101.035931,18.408928],[101.059548,17.512497],[102.113592,18.109102],[102.413005,17.932782],[102.998706,17.961695],[103.200192,18.309632],[103.956477,18.240954],[104.716947,17.428859],[104.779321,16.441865],[105.589039,15.570316],[105.544338,14.723934],[105.218777,14.273212],[104.281418,14.416743],[102.988422,14.225721],[102.348099,13.394247],[102.584932,12.186595]]]},"id":"THA"},
-{"type":"Feature","properties":{"name":"Tajikistan"},"geometry":{"type":"Polygon","coordinates":[[[71.014198,40.244366],[70.648019,39.935754],[69.55961,40.103211],[69.464887,39.526683],[70.549162,39.604198],[71.784694,39.279463],[73.675379,39.431237],[73.928852,38.505815],[74.257514,38.606507],[74.864816,38.378846],[74.829986,37.990007],[74.980002,37.41999],[73.948696,37.421566],[73.260056,37.495257],[72.63689,37.047558],[72.193041,36.948288],[71.844638,36.738171],[71.448693,37.065645],[71.541918,37.905774],[71.239404,37.953265],[71.348131,38.258905],[70.806821,38.486282],[70.376304,38.138396],[70.270574,37.735165],[70.116578,37.588223],[69.518785,37.608997],[69.196273,37.151144],[68.859446,37.344336],[68.135562,37.023115],[67.83,37.144994],[68.392033,38.157025],[68.176025,38.901553],[67.44222,39.140144],[67.701429,39.580478],[68.536416,39.533453],[69.011633,40.086158],[69.329495,40.727824],[70.666622,40.960213],[70.45816,40.496495],[70.601407,40.218527],[71.014198,40.244366]]]},"id":"TJK"},
-{"type":"Feature","properties":{"name":"Turkmenistan"},"geometry":{"type":"Polygon","coordinates":[[[61.210817,35.650072],[61.123071,36.491597],[60.377638,36.527383],[59.234762,37.412988],[58.436154,37.522309],[57.330434,38.029229],[56.619366,38.121394],[56.180375,37.935127],[55.511578,37.964117],[54.800304,37.392421],[53.921598,37.198918],[53.735511,37.906136],[53.880929,38.952093],[53.101028,39.290574],[53.357808,39.975286],[52.693973,40.033629],[52.915251,40.876523],[53.858139,40.631034],[54.736845,40.951015],[54.008311,41.551211],[53.721713,42.123191],[52.91675,41.868117],[52.814689,41.135371],[52.50246,41.783316],[52.944293,42.116034],[54.079418,42.324109],[54.755345,42.043971],[55.455251,41.259859],[55.968191,41.308642],[57.096391,41.32231],[56.932215,41.826026],[57.78653,42.170553],[58.629011,42.751551],[59.976422,42.223082],[60.083341,41.425146],[60.465953,41.220327],[61.547179,41.26637],[61.882714,41.084857],[62.37426,40.053886],[63.518015,39.363257],[64.170223,38.892407],[65.215999,38.402695],[66.54615,37.974685],[66.518607,37.362784],[66.217385,37.39379],[65.745631,37.661164],[65.588948,37.305217],[64.746105,37.111818],[64.546479,36.312073],[63.982896,36.007957],[63.193538,35.857166],[62.984662,35.404041],[62.230651,35.270664],[61.210817,35.650072]]]},"id":"TKM"},
-{"type":"Feature","properties":{"name":"East Timor"},"geometry":{"type":"Polygon","coordinates":[[[124.968682,-8.89279],[125.086246,-8.656887],[125.947072,-8.432095],[126.644704,-8.398247],[126.957243,-8.273345],[127.335928,-8.397317],[126.967992,-8.668256],[125.925885,-9.106007],[125.08852,-9.393173],[125.07002,-9.089987],[124.968682,-8.89279]]]},"id":"TLS"},
-{"type":"Feature","properties":{"name":"Trinidad and Tobago"},"geometry":{"type":"Polygon","coordinates":[[[-61.68,10.76],[-61.105,10.89],[-60.895,10.855],[-60.935,10.11],[-61.77,10],[-61.95,10.09],[-61.66,10.365],[-61.68,10.76]]]},"id":"TTO"},
-{"type":"Feature","properties":{"name":"Tunisia"},"geometry":{"type":"Polygon","coordinates":[[[9.48214,30.307556],[9.055603,32.102692],[8.439103,32.506285],[8.430473,32.748337],[7.612642,33.344115],[7.524482,34.097376],[8.140981,34.655146],[8.376368,35.479876],[8.217824,36.433177],[8.420964,36.946427],[9.509994,37.349994],[10.210002,37.230002],[10.18065,36.724038],[11.028867,37.092103],[11.100026,36.899996],[10.600005,36.41],[10.593287,35.947444],[10.939519,35.698984],[10.807847,34.833507],[10.149593,34.330773],[10.339659,33.785742],[10.856836,33.76874],[11.108501,33.293343],[11.488787,33.136996],[11.432253,32.368903],[10.94479,32.081815],[10.636901,31.761421],[9.950225,31.37607],[10.056575,30.961831],[9.970017,30.539325],[9.48214,30.307556]]]},"id":"TUN"},
-{"type":"Feature","properties":{"name":"Turkey"},"geometry":{"type":"MultiPolygon","coordinates":[[[[36.913127,41.335358],[38.347665,40.948586],[39.512607,41.102763],[40.373433,41.013673],[41.554084,41.535656],[42.619549,41.583173],[43.582746,41.092143],[43.752658,40.740201],[43.656436,40.253564],[44.400009,40.005],[44.79399,39.713003],[44.109225,39.428136],[44.421403,38.281281],[44.225756,37.971584],[44.772699,37.170445],[44.293452,37.001514],[43.942259,37.256228],[42.779126,37.385264],[42.349591,37.229873],[41.212089,37.074352],[40.673259,37.091276],[39.52258,36.716054],[38.699891,36.712927],[38.167727,36.90121],[37.066761,36.623036],[36.739494,36.81752],[36.685389,36.259699],[36.41755,36.040617],[36.149763,35.821535],[35.782085,36.274995],[36.160822,36.650606],[35.550936,36.565443],[34.714553,36.795532],[34.026895,36.21996],[32.509158,36.107564],[31.699595,36.644275],[30.621625,36.677865],[30.391096,36.262981],[29.699976,36.144357],[28.732903,36.676831],[27.641187,36.658822],[27.048768,37.653361],[26.318218,38.208133],[26.8047,38.98576],[26.170785,39.463612],[27.28002,40.420014],[28.819978,40.460011],[29.240004,41.219991],[31.145934,41.087622],[32.347979,41.736264],[33.513283,42.01896],[35.167704,42.040225],[36.913127,41.335358]]],[[[27.192377,40.690566],[26.358009,40.151994],[26.043351,40.617754],[26.056942,40.824123],[26.294602,40.936261],[26.604196,41.562115],[26.117042,41.826905],[27.135739,42.141485],[27.99672,42.007359],[28.115525,41.622886],[28.988443,41.299934],[28.806438,41.054962],[27.619017,40.999823],[27.192377,40.690566]]]]},"id":"TUR"},
-{"type":"Feature","properties":{"name":"Taiwan"},"geometry":{"type":"Polygon","coordinates":[[[121.777818,24.394274],[121.175632,22.790857],[120.74708,21.970571],[120.220083,22.814861],[120.106189,23.556263],[120.69468,24.538451],[121.495044,25.295459],[121.951244,24.997596],[121.777818,24.394274]]]},"id":"TWN"},
-{"type":"Feature","properties":{"name":"United Republic of Tanzania"},"geometry":{"type":"Polygon","coordinates":[[[33.903711,-0.95],[34.07262,-1.05982],[37.69869,-3.09699],[37.7669,-3.67712],[39.20222,-4.67677],[38.74054,-5.90895],[38.79977,-6.47566],[39.44,-6.84],[39.47,-7.1],[39.19469,-7.7039],[39.25203,-8.00781],[39.18652,-8.48551],[39.53574,-9.11237],[39.9496,-10.0984],[40.31659,-10.3171],[39.521,-10.89688],[38.427557,-11.285202],[37.82764,-11.26879],[37.47129,-11.56876],[36.775151,-11.594537],[36.514082,-11.720938],[35.312398,-11.439146],[34.559989,-11.52002],[34.28,-10.16],[33.940838,-9.693674],[33.73972,-9.41715],[32.759375,-9.230599],[32.191865,-8.930359],[31.556348,-8.762049],[31.157751,-8.594579],[30.74,-8.34],[30.2,-7.08],[29.62,-6.52],[29.419993,-5.939999],[29.519987,-5.419979],[29.339998,-4.499983],[29.753512,-4.452389],[30.11632,-4.09012],[30.50554,-3.56858],[30.75224,-3.35931],[30.74301,-3.03431],[30.52766,-2.80762],[30.46967,-2.41383],[30.758309,-2.28725],[30.816135,-1.698914],[30.419105,-1.134659],[30.76986,-1.01455],[31.86617,-1.02736],[33.903711,-0.95]]]},"id":"TZA"},
-{"type":"Feature","properties":{"name":"Uganda"},"geometry":{"type":"Polygon","coordinates":[[[31.86617,-1.02736],[30.76986,-1.01455],[30.419105,-1.134659],[29.821519,-1.443322],[29.579466,-1.341313],[29.587838,-0.587406],[29.8195,-0.2053],[29.875779,0.59738],[30.086154,1.062313],[30.468508,1.583805],[30.85267,1.849396],[31.174149,2.204465],[30.77332,2.33989],[30.83385,3.50917],[31.24556,3.7819],[31.88145,3.55827],[32.68642,3.79232],[33.39,3.79],[34.005,4.249885],[34.47913,3.5556],[34.59607,3.05374],[35.03599,1.90584],[34.6721,1.17694],[34.18,0.515],[33.893569,0.109814],[33.903711,-0.95],[31.86617,-1.02736]]]},"id":"UGA"},
-{"type":"Feature","properties":{"name":"Ukraine"},"geometry":{"type":"Polygon","coordinates":[[[31.785998,52.101678],[32.159412,52.061267],[32.412058,52.288695],[32.715761,52.238465],[33.7527,52.335075],[34.391731,51.768882],[34.141978,51.566413],[34.224816,51.255993],[35.022183,51.207572],[35.377924,50.773955],[35.356116,50.577197],[36.626168,50.225591],[37.39346,50.383953],[38.010631,49.915662],[38.594988,49.926462],[40.069058,49.601055],[40.080789,49.30743],[39.674664,48.783818],[39.895632,48.232405],[39.738278,47.898937],[38.770585,47.825608],[38.255112,47.5464],[38.223538,47.10219],[37.425137,47.022221],[36.759855,46.6987],[35.823685,46.645964],[34.962342,46.273197],[35.020788,45.651219],[35.510009,45.409993],[36.529998,45.46999],[36.334713,45.113216],[35.239999,44.939996],[33.882511,44.361479],[33.326421,44.564877],[33.546924,45.034771],[32.454174,45.327466],[32.630804,45.519186],[33.588162,45.851569],[33.298567,46.080598],[31.74414,46.333348],[31.675307,46.706245],[30.748749,46.5831],[30.377609,46.03241],[29.603289,45.293308],[29.149725,45.464925],[28.679779,45.304031],[28.233554,45.488283],[28.485269,45.596907],[28.659987,45.939987],[28.933717,46.25883],[28.862972,46.437889],[29.072107,46.517678],[29.170654,46.379262],[29.759972,46.349988],[30.024659,46.423937],[29.83821,46.525326],[29.908852,46.674361],[29.559674,46.928583],[29.415135,47.346645],[29.050868,47.510227],[29.122698,47.849095],[28.670891,48.118149],[28.259547,48.155562],[27.522537,48.467119],[26.857824,48.368211],[26.619337,48.220726],[26.19745,48.220881],[25.945941,47.987149],[25.207743,47.891056],[24.866317,47.737526],[24.402056,47.981878],[23.760958,47.985598],[23.142236,48.096341],[22.710531,47.882194],[22.64082,48.15024],[22.085608,48.422264],[22.280842,48.825392],[22.558138,49.085738],[22.776419,49.027395],[22.51845,49.476774],[23.426508,50.308506],[23.922757,50.424881],[24.029986,50.705407],[23.527071,51.578454],[24.005078,51.617444],[24.553106,51.888461],[25.327788,51.910656],[26.337959,51.832289],[27.454066,51.592303],[28.241615,51.572227],[28.617613,51.427714],[28.992835,51.602044],[29.254938,51.368234],[30.157364,51.416138],[30.555117,51.319503],[30.619454,51.822806],[30.927549,52.042353],[31.785998,52.101678]]]},"id":"UKR"},
-{"type":"Feature","properties":{"name":"Uruguay"},"geometry":{"type":"Polygon","coordinates":[[[-57.625133,-30.216295],[-56.976026,-30.109686],[-55.973245,-30.883076],[-55.60151,-30.853879],[-54.572452,-31.494511],[-53.787952,-32.047243],[-53.209589,-32.727666],[-53.650544,-33.202004],[-53.373662,-33.768378],[-53.806426,-34.396815],[-54.935866,-34.952647],[-55.67409,-34.752659],[-56.215297,-34.859836],[-57.139685,-34.430456],[-57.817861,-34.462547],[-58.427074,-33.909454],[-58.349611,-33.263189],[-58.132648,-33.040567],[-58.14244,-32.044504],[-57.874937,-31.016556],[-57.625133,-30.216295]]]},"id":"URY"},
-{"type":"Feature","properties":{"name":"United States of America"},"geometry":{"type":"MultiPolygon","coordinates":[[[[-155.54211,19.08348],[-155.68817,18.91619],[-155.93665,19.05939],[-155.90806,19.33888],[-156.07347,19.70294],[-156.02368,19.81422],[-155.85008,19.97729],[-155.91907,20.17395],[-155.86108,20.26721],[-155.78505,20.2487],[-155.40214,20.07975],[-155.22452,19.99302],[-155.06226,19.8591],[-154.80741,19.50871],[-154.83147,19.45328],[-155.22217,19.23972],[-155.54211,19.08348]]],[[[-156.07926,20.64397],[-156.41445,20.57241],[-156.58673,20.783],[-156.70167,20.8643],[-156.71055,20.92676],[-156.61258,21.01249],[-156.25711,20.91745],[-155.99566,20.76404],[-156.07926,20.64397]]],[[[-156.75824,21.17684],[-156.78933,21.06873],[-157.32521,21.09777],[-157.25027,21.21958],[-156.75824,21.17684]]],[[[-157.65283,21.32217],[-157.70703,21.26442],[-157.7786,21.27729],[-158.12667,21.31244],[-158.2538,21.53919],[-158.29265,21.57912],[-158.0252,21.71696],[-157.94161,21.65272],[-157.65283,21.32217]]],[[[-159.34512,21.982],[-159.46372,21.88299],[-159.80051,22.06533],[-159.74877,22.1382],[-159.5962,22.23618],[-159.36569,22.21494],[-159.34512,21.982]]],[[[-94.81758,49.38905],[-94.64,48.84],[-94.32914,48.67074],[-93.63087,48.60926],[-92.61,48.45],[-91.64,48.14],[-90.83,48.27],[-89.6,48.01],[-89.272917,48.019808],[-88.378114,48.302918],[-87.439793,47.94],[-86.461991,47.553338],[-85.652363,47.220219],[-84.87608,46.900083],[-84.779238,46.637102],[-84.543749,46.538684],[-84.6049,46.4396],[-84.3367,46.40877],[-84.14212,46.512226],[-84.091851,46.275419],[-83.890765,46.116927],[-83.616131,46.116927],[-83.469551,45.994686],[-83.592851,45.816894],[-82.550925,45.347517],[-82.337763,44.44],[-82.137642,43.571088],[-82.43,42.98],[-82.9,42.43],[-83.12,42.08],[-83.142,41.975681],[-83.02981,41.832796],[-82.690089,41.675105],[-82.439278,41.675105],[-81.277747,42.209026],[-80.247448,42.3662],[-78.939362,42.863611],[-78.92,42.965],[-79.01,43.27],[-79.171674,43.466339],[-78.72028,43.625089],[-77.737885,43.629056],[-76.820034,43.628784],[-76.5,44.018459],[-76.375,44.09631],[-75.31821,44.81645],[-74.867,45.00048],[-73.34783,45.00738],[-71.50506,45.0082],[-71.405,45.255],[-71.08482,45.30524],[-70.66,45.46],[-70.305,45.915],[-69.99997,46.69307],[-69.237216,47.447781],[-68.905,47.185],[-68.23444,47.35486],[-67.79046,47.06636],[-67.79134,45.70281],[-67.13741,45.13753],[-66.96466,44.8097],[-68.03252,44.3252],[-69.06,43.98],[-70.11617,43.68405],[-70.645476,43.090238],[-70.81489,42.8653],[-70.825,42.335],[-70.495,41.805],[-70.08,41.78],[-70.185,42.145],[-69.88497,41.92283],[-69.96503,41.63717],[-70.64,41.475],[-71.12039,41.49445],[-71.86,41.32],[-72.295,41.27],[-72.87643,41.22065],[-73.71,40.931102],[-72.24126,41.11948],[-71.945,40.93],[-73.345,40.63],[-73.982,40.628],[-73.952325,40.75075],[-74.25671,40.47351],[-73.96244,40.42763],[-74.17838,39.70926],[-74.90604,38.93954],[-74.98041,39.1964],[-75.20002,39.24845],[-75.52805,39.4985],[-75.32,38.96],[-75.071835,38.782032],[-75.05673,38.40412],[-75.37747,38.01551],[-75.94023,37.21689],[-76.03127,37.2566],[-75.72205,37.93705],[-76.23287,38.319215],[-76.35,39.15],[-76.542725,38.717615],[-76.32933,38.08326],[-76.989998,38.239992],[-76.30162,37.917945],[-76.25874,36.9664],[-75.9718,36.89726],[-75.86804,36.55125],[-75.72749,35.55074],[-76.36318,34.80854],[-77.397635,34.51201],[-78.05496,33.92547],[-78.55435,33.86133],[-79.06067,33.49395],[-79.20357,33.15839],[-80.301325,32.509355],[-80.86498,32.0333],[-81.33629,31.44049],[-81.49042,30.72999],[-81.31371,30.03552],[-80.98,29.18],[-80.535585,28.47213],[-80.53,28.04],[-80.056539,26.88],[-80.088015,26.205765],[-80.13156,25.816775],[-80.38103,25.20616],[-80.68,25.08],[-81.17213,25.20126],[-81.33,25.64],[-81.71,25.87],[-82.24,26.73],[-82.70515,27.49504],[-82.85526,27.88624],[-82.65,28.55],[-82.93,29.1],[-83.70959,29.93656],[-84.1,30.09],[-85.10882,29.63615],[-85.28784,29.68612],[-85.7731,30.15261],[-86.4,30.4],[-87.53036,30.27433],[-88.41782,30.3849],[-89.18049,30.31598],[-89.593831,30.159994],[-89.413735,29.89419],[-89.43,29.48864],[-89.21767,29.29108],[-89.40823,29.15961],[-89.77928,29.30714],[-90.15463,29.11743],[-90.880225,29.148535],[-91.626785,29.677],[-92.49906,29.5523],[-93.22637,29.78375],[-93.84842,29.71363],[-94.69,29.48],[-95.60026,28.73863],[-96.59404,28.30748],[-97.14,27.83],[-97.37,27.38],[-97.38,26.69],[-97.33,26.21],[-97.14,25.87],[-97.53,25.84],[-98.24,26.06],[-99.02,26.37],[-99.3,26.84],[-99.52,27.54],[-100.11,28.11],[-100.45584,28.69612],[-100.9576,29.38071],[-101.6624,29.7793],[-102.48,29.76],[-103.11,28.97],[-103.94,29.27],[-104.45697,29.57196],[-104.70575,30.12173],[-105.03737,30.64402],[-105.63159,31.08383],[-106.1429,31.39995],[-106.50759,31.75452],[-108.24,31.754854],[-108.24194,31.34222],[-109.035,31.34194],[-111.02361,31.33472],[-113.30498,32.03914],[-114.815,32.52528],[-114.72139,32.72083],[-115.99135,32.61239],[-117.12776,32.53534],[-117.295938,33.046225],[-117.944,33.621236],[-118.410602,33.740909],[-118.519895,34.027782],[-119.081,34.078],[-119.438841,34.348477],[-120.36778,34.44711],[-120.62286,34.60855],[-120.74433,35.15686],[-121.71457,36.16153],[-122.54747,37.55176],[-122.51201,37.78339],[-122.95319,38.11371],[-123.7272,38.95166],[-123.86517,39.76699],[-124.39807,40.3132],[-124.17886,41.14202],[-124.2137,41.99964],[-124.53284,42.76599],[-124.14214,43.70838],[-124.020535,44.615895],[-123.89893,45.52341],[-124.079635,46.86475],[-124.39567,47.72017],[-124.68721,48.184433],[-124.566101,48.379715],[-123.12,48.04],[-122.58736,47.096],[-122.34,47.36],[-122.5,48.18],[-122.84,49],[-120,49],[-117.03121,49],[-116.04818,49],[-113,49],[-110.05,49],[-107.05,49],[-104.04826,48.99986],[-100.65,49],[-97.22872,49.0007],[-95.15907,49],[-95.15609,49.38425],[-94.81758,49.38905]]],[[[-153.006314,57.115842],[-154.00509,56.734677],[-154.516403,56.992749],[-154.670993,57.461196],[-153.76278,57.816575],[-153.228729,57.968968],[-152.564791,57.901427],[-152.141147,57.591059],[-153.006314,57.115842]]],[[[-165.579164,59.909987],[-166.19277,59.754441],[-166.848337,59.941406],[-167.455277,60.213069],[-166.467792,60.38417],[-165.67443,60.293607],[-165.579164,59.909987]]],[[[-171.731657,63.782515],[-171.114434,63.592191],[-170.491112,63.694975],[-169.682505,63.431116],[-168.689439,63.297506],[-168.771941,63.188598],[-169.52944,62.976931],[-170.290556,63.194438],[-170.671386,63.375822],[-171.553063,63.317789],[-171.791111,63.405846],[-171.731657,63.782515]]],[[[-155.06779,71.147776],[-154.344165,70.696409],[-153.900006,70.889989],[-152.210006,70.829992],[-152.270002,70.600006],[-150.739992,70.430017],[-149.720003,70.53001],[-147.613362,70.214035],[-145.68999,70.12001],[-144.920011,69.989992],[-143.589446,70.152514],[-142.07251,69.851938],[-140.985988,69.711998],[-140.985988,69.711998],[-140.992499,66.000029],[-140.99777,60.306397],[-140.012998,60.276838],[-139.039,60.000007],[-138.34089,59.56211],[-137.4525,58.905],[-136.47972,59.46389],[-135.47583,59.78778],[-134.945,59.27056],[-134.27111,58.86111],[-133.355549,58.410285],[-132.73042,57.69289],[-131.70781,56.55212],[-130.00778,55.91583],[-129.979994,55.284998],[-130.53611,54.802753],[-131.085818,55.178906],[-131.967211,55.497776],[-132.250011,56.369996],[-133.539181,57.178887],[-134.078063,58.123068],[-135.038211,58.187715],[-136.628062,58.212209],[-137.800006,58.499995],[-139.867787,59.537762],[-140.825274,59.727517],[-142.574444,60.084447],[-143.958881,59.99918],[-145.925557,60.45861],[-147.114374,60.884656],[-148.224306,60.672989],[-148.018066,59.978329],[-148.570823,59.914173],[-149.727858,59.705658],[-150.608243,59.368211],[-151.716393,59.155821],[-151.859433,59.744984],[-151.409719,60.725803],[-150.346941,61.033588],[-150.621111,61.284425],[-151.895839,60.727198],[-152.57833,60.061657],[-154.019172,59.350279],[-153.287511,58.864728],[-154.232492,58.146374],[-155.307491,57.727795],[-156.308335,57.422774],[-156.556097,56.979985],[-158.117217,56.463608],[-158.433321,55.994154],[-159.603327,55.566686],[-160.28972,55.643581],[-161.223048,55.364735],[-162.237766,55.024187],[-163.069447,54.689737],[-164.785569,54.404173],[-164.942226,54.572225],[-163.84834,55.039431],[-162.870001,55.348043],[-161.804175,55.894986],[-160.563605,56.008055],[-160.07056,56.418055],[-158.684443,57.016675],[-158.461097,57.216921],[-157.72277,57.570001],[-157.550274,58.328326],[-157.041675,58.918885],[-158.194731,58.615802],[-158.517218,58.787781],[-159.058606,58.424186],[-159.711667,58.93139],[-159.981289,58.572549],[-160.355271,59.071123],[-161.355003,58.670838],[-161.968894,58.671665],[-162.054987,59.266925],[-161.874171,59.633621],[-162.518059,59.989724],[-163.818341,59.798056],[-164.662218,60.267484],[-165.346388,60.507496],[-165.350832,61.073895],[-166.121379,61.500019],[-165.734452,62.074997],[-164.919179,62.633076],[-164.562508,63.146378],[-163.753332,63.219449],[-163.067224,63.059459],[-162.260555,63.541936],[-161.53445,63.455817],[-160.772507,63.766108],[-160.958335,64.222799],[-161.518068,64.402788],[-160.777778,64.788604],[-161.391926,64.777235],[-162.45305,64.559445],[-162.757786,64.338605],[-163.546394,64.55916],[-164.96083,64.446945],[-166.425288,64.686672],[-166.845004,65.088896],[-168.11056,65.669997],[-166.705271,66.088318],[-164.47471,66.57666],[-163.652512,66.57666],[-163.788602,66.077207],[-161.677774,66.11612],[-162.489715,66.735565],[-163.719717,67.116395],[-164.430991,67.616338],[-165.390287,68.042772],[-166.764441,68.358877],[-166.204707,68.883031],[-164.430811,68.915535],[-163.168614,69.371115],[-162.930566,69.858062],[-161.908897,70.33333],[-160.934797,70.44769],[-159.039176,70.891642],[-158.119723,70.824721],[-156.580825,71.357764],[-155.06779,71.147776]]]]},"id":"USA"},
-{"type":"Feature","properties":{"name":"Uzbekistan"},"geometry":{"type":"Polygon","coordinates":[[[66.518607,37.362784],[66.54615,37.974685],[65.215999,38.402695],[64.170223,38.892407],[63.518015,39.363257],[62.37426,40.053886],[61.882714,41.084857],[61.547179,41.26637],[60.465953,41.220327],[60.083341,41.425146],[59.976422,42.223082],[58.629011,42.751551],[57.78653,42.170553],[56.932215,41.826026],[57.096391,41.32231],[55.968191,41.308642],[55.928917,44.995858],[58.503127,45.586804],[58.689989,45.500014],[60.239972,44.784037],[61.05832,44.405817],[62.0133,43.504477],[63.185787,43.650075],[64.900824,43.728081],[66.098012,42.99766],[66.023392,41.994646],[66.510649,41.987644],[66.714047,41.168444],[67.985856,41.135991],[68.259896,40.662325],[68.632483,40.668681],[69.070027,41.384244],[70.388965,42.081308],[70.962315,42.266154],[71.259248,42.167711],[70.420022,41.519998],[71.157859,41.143587],[71.870115,41.3929],[73.055417,40.866033],[71.774875,40.145844],[71.014198,40.244366],[70.601407,40.218527],[70.45816,40.496495],[70.666622,40.960213],[69.329495,40.727824],[69.011633,40.086158],[68.536416,39.533453],[67.701429,39.580478],[67.44222,39.140144],[68.176025,38.901553],[68.392033,38.157025],[67.83,37.144994],[67.075782,37.356144],[66.518607,37.362784]]]},"id":"UZB"},
-{"type":"Feature","properties":{"name":"Venezuela"},"geometry":{"type":"Polygon","coordinates":[[[-71.331584,11.776284],[-71.360006,11.539994],[-71.94705,11.423282],[-71.620868,10.96946],[-71.633064,10.446494],[-72.074174,9.865651],[-71.695644,9.072263],[-71.264559,9.137195],[-71.039999,9.859993],[-71.350084,10.211935],[-71.400623,10.968969],[-70.155299,11.375482],[-70.293843,11.846822],[-69.943245,12.162307],[-69.5843,11.459611],[-68.882999,11.443385],[-68.233271,10.885744],[-68.194127,10.554653],[-67.296249,10.545868],[-66.227864,10.648627],[-65.655238,10.200799],[-64.890452,10.077215],[-64.329479,10.389599],[-64.318007,10.641418],[-63.079322,10.701724],[-61.880946,10.715625],[-62.730119,10.420269],[-62.388512,9.948204],[-61.588767,9.873067],[-60.830597,9.38134],[-60.671252,8.580174],[-60.150096,8.602757],[-59.758285,8.367035],[-60.550588,7.779603],[-60.637973,7.415],[-60.295668,7.043911],[-60.543999,6.856584],[-61.159336,6.696077],[-61.139415,6.234297],[-61.410303,5.959068],[-60.733574,5.200277],[-60.601179,4.918098],[-60.966893,4.536468],[-62.08543,4.162124],[-62.804533,4.006965],[-63.093198,3.770571],[-63.888343,4.02053],[-64.628659,4.148481],[-64.816064,4.056445],[-64.368494,3.79721],[-64.408828,3.126786],[-64.269999,2.497006],[-63.422867,2.411068],[-63.368788,2.2009],[-64.083085,1.916369],[-64.199306,1.492855],[-64.611012,1.328731],[-65.354713,1.095282],[-65.548267,0.789254],[-66.325765,0.724452],[-66.876326,1.253361],[-67.181294,2.250638],[-67.447092,2.600281],[-67.809938,2.820655],[-67.303173,3.318454],[-67.337564,3.542342],[-67.621836,3.839482],[-67.823012,4.503937],[-67.744697,5.221129],[-67.521532,5.55687],[-67.34144,6.095468],[-67.695087,6.267318],[-68.265052,6.153268],[-68.985319,6.206805],[-69.38948,6.099861],[-70.093313,6.960376],[-70.674234,7.087785],[-71.960176,6.991615],[-72.198352,7.340431],[-72.444487,7.423785],[-72.479679,7.632506],[-72.360901,8.002638],[-72.439862,8.405275],[-72.660495,8.625288],[-72.78873,9.085027],[-73.304952,9.152],[-73.027604,9.73677],[-72.905286,10.450344],[-72.614658,10.821975],[-72.227575,11.108702],[-71.973922,11.608672],[-71.331584,11.776284]]]},"id":"VEN"},
-{"type":"Feature","properties":{"name":"Vietnam"},"geometry":{"type":"Polygon","coordinates":[[[108.05018,21.55238],[106.715068,20.696851],[105.881682,19.75205],[105.662006,19.058165],[106.426817,18.004121],[107.361954,16.697457],[108.269495,16.079742],[108.877107,15.276691],[109.33527,13.426028],[109.200136,11.666859],[108.36613,11.008321],[107.220929,10.364484],[106.405113,9.53084],[105.158264,8.59976],[104.795185,9.241038],[105.076202,9.918491],[104.334335,10.486544],[105.199915,10.88931],[106.24967,10.961812],[105.810524,11.567615],[107.491403,12.337206],[107.614548,13.535531],[107.382727,14.202441],[107.564525,15.202173],[107.312706,15.908538],[106.556008,16.604284],[105.925762,17.485315],[105.094598,18.666975],[103.896532,19.265181],[104.183388,19.624668],[104.822574,19.886642],[104.435,20.758733],[103.203861,20.766562],[102.754896,21.675137],[102.170436,22.464753],[102.706992,22.708795],[103.504515,22.703757],[104.476858,22.81915],[105.329209,23.352063],[105.811247,22.976892],[106.725403,22.794268],[106.567273,22.218205],[107.04342,21.811899],[108.05018,21.55238]]]},"id":"VNM"},
-{"type":"Feature","properties":{"name":"Vanuatu"},"geometry":{"type":"MultiPolygon","coordinates":[[[[167.844877,-16.466333],[167.515181,-16.59785],[167.180008,-16.159995],[167.216801,-15.891846],[167.844877,-16.466333]]],[[[167.107712,-14.93392],[167.270028,-15.740021],[167.001207,-15.614602],[166.793158,-15.668811],[166.649859,-15.392704],[166.629137,-14.626497],[167.107712,-14.93392]]]]},"id":"VUT"},
-{"type":"Feature","properties":{"name":"West Bank"},"geometry":{"type":"Polygon","coordinates":[[[35.545665,32.393992],[35.545252,31.782505],[35.397561,31.489086],[34.927408,31.353435],[34.970507,31.616778],[35.225892,31.754341],[34.974641,31.866582],[35.18393,32.532511],[35.545665,32.393992]]]},"id":"PSE"},
-{"type":"Feature","properties":{"name":"Yemen"},"geometry":{"type":"Polygon","coordinates":[[[53.108573,16.651051],[52.385206,16.382411],[52.191729,15.938433],[52.168165,15.59742],[51.172515,15.17525],[49.574576,14.708767],[48.679231,14.003202],[48.238947,13.94809],[47.938914,14.007233],[47.354454,13.59222],[46.717076,13.399699],[45.877593,13.347764],[45.62505,13.290946],[45.406459,13.026905],[45.144356,12.953938],[44.989533,12.699587],[44.494576,12.721653],[44.175113,12.58595],[43.482959,12.6368],[43.222871,13.22095],[43.251448,13.767584],[43.087944,14.06263],[42.892245,14.802249],[42.604873,15.213335],[42.805015,15.261963],[42.702438,15.718886],[42.823671,15.911742],[42.779332,16.347891],[43.218375,16.66689],[43.115798,17.08844],[43.380794,17.579987],[43.791519,17.319977],[44.062613,17.410359],[45.216651,17.433329],[45.399999,17.333335],[46.366659,17.233315],[46.749994,17.283338],[47.000005,16.949999],[47.466695,17.116682],[48.183344,18.166669],[49.116672,18.616668],[52.00001,19.000003],[52.782184,17.349742],[53.108573,16.651051]]]},"id":"YEM"},
-{"type":"Feature","properties":{"name":"South Africa"},"geometry":{"type":"Polygon","coordinates":[[[31.521001,-29.257387],[31.325561,-29.401978],[30.901763,-29.909957],[30.622813,-30.423776],[30.055716,-31.140269],[28.925553,-32.172041],[28.219756,-32.771953],[27.464608,-33.226964],[26.419452,-33.61495],[25.909664,-33.66704],[25.780628,-33.944646],[25.172862,-33.796851],[24.677853,-33.987176],[23.594043,-33.794474],[22.988189,-33.916431],[22.574157,-33.864083],[21.542799,-34.258839],[20.689053,-34.417175],[20.071261,-34.795137],[19.616405,-34.819166],[19.193278,-34.462599],[18.855315,-34.444306],[18.424643,-33.997873],[18.377411,-34.136521],[18.244499,-33.867752],[18.25008,-33.281431],[17.92519,-32.611291],[18.24791,-32.429131],[18.221762,-31.661633],[17.566918,-30.725721],[17.064416,-29.878641],[17.062918,-29.875954],[16.344977,-28.576705],[16.824017,-28.082162],[17.218929,-28.355943],[17.387497,-28.783514],[17.836152,-28.856378],[18.464899,-29.045462],[19.002127,-28.972443],[19.894734,-28.461105],[19.895768,-24.76779],[20.165726,-24.917962],[20.758609,-25.868136],[20.66647,-26.477453],[20.889609,-26.828543],[21.605896,-26.726534],[22.105969,-26.280256],[22.579532,-25.979448],[22.824271,-25.500459],[23.312097,-25.26869],[23.73357,-25.390129],[24.211267,-25.670216],[25.025171,-25.71967],[25.664666,-25.486816],[25.765849,-25.174845],[25.941652,-24.696373],[26.485753,-24.616327],[26.786407,-24.240691],[27.11941,-23.574323],[28.017236,-22.827754],[29.432188,-22.091313],[29.839037,-22.102216],[30.322883,-22.271612],[30.659865,-22.151567],[31.191409,-22.25151],[31.670398,-23.658969],[31.930589,-24.369417],[31.752408,-25.484284],[31.837778,-25.843332],[31.333158,-25.660191],[31.04408,-25.731452],[30.949667,-26.022649],[30.676609,-26.398078],[30.685962,-26.743845],[31.282773,-27.285879],[31.86806,-27.177927],[32.071665,-26.73382],[32.83012,-26.742192],[32.580265,-27.470158],[32.462133,-28.301011],[32.203389,-28.752405],[31.521001,-29.257387]],[[28.978263,-28.955597],[28.5417,-28.647502],[28.074338,-28.851469],[27.532511,-29.242711],[26.999262,-29.875954],[27.749397,-30.645106],[28.107205,-30.545732],[28.291069,-30.226217],[28.8484,-30.070051],[29.018415,-29.743766],[29.325166,-29.257387],[28.978263,-28.955597]]]},"id":"ZAF"},
-{"type":"Feature","properties":{"name":"Zambia"},"geometry":{"type":"Polygon","coordinates":[[[32.759375,-9.230599],[33.231388,-9.676722],[33.485688,-10.525559],[33.31531,-10.79655],[33.114289,-11.607198],[33.306422,-12.435778],[32.991764,-12.783871],[32.688165,-13.712858],[33.214025,-13.97186],[30.179481,-14.796099],[30.274256,-15.507787],[29.516834,-15.644678],[28.947463,-16.043051],[28.825869,-16.389749],[28.467906,-16.4684],[27.598243,-17.290831],[27.044427,-17.938026],[26.706773,-17.961229],[26.381935,-17.846042],[25.264226,-17.73654],[25.084443,-17.661816],[25.07695,-17.578823],[24.682349,-17.353411],[24.033862,-17.295843],[23.215048,-17.523116],[22.562478,-16.898451],[21.887843,-16.08031],[21.933886,-12.898437],[24.016137,-12.911046],[23.930922,-12.565848],[24.079905,-12.191297],[23.904154,-11.722282],[24.017894,-11.237298],[23.912215,-10.926826],[24.257155,-10.951993],[24.314516,-11.262826],[24.78317,-11.238694],[25.418118,-11.330936],[25.75231,-11.784965],[26.553088,-11.92444],[27.16442,-11.608748],[27.388799,-12.132747],[28.155109,-12.272481],[28.523562,-12.698604],[28.934286,-13.248958],[29.699614,-13.257227],[29.616001,-12.178895],[29.341548,-12.360744],[28.642417,-11.971569],[28.372253,-11.793647],[28.49607,-10.789884],[28.673682,-9.605925],[28.449871,-9.164918],[28.734867,-8.526559],[29.002912,-8.407032],[30.346086,-8.238257],[30.740015,-8.340007],[31.157751,-8.594579],[31.556348,-8.762049],[32.191865,-8.930359],[32.759375,-9.230599]]]},"id":"ZMB"},
-{"type":"Feature","properties":{"name":"Zimbabwe"},"geometry":{"type":"Polygon","coordinates":[[[31.191409,-22.25151],[30.659865,-22.151567],[30.322883,-22.271612],[29.839037,-22.102216],[29.432188,-22.091313],[28.794656,-21.639454],[28.02137,-21.485975],[27.727228,-20.851802],[27.724747,-20.499059],[27.296505,-20.39152],[26.164791,-19.293086],[25.850391,-18.714413],[25.649163,-18.536026],[25.264226,-17.73654],[26.381935,-17.846042],[26.706773,-17.961229],[27.044427,-17.938026],[27.598243,-17.290831],[28.467906,-16.4684],[28.825869,-16.389749],[28.947463,-16.043051],[29.516834,-15.644678],[30.274256,-15.507787],[30.338955,-15.880839],[31.173064,-15.860944],[31.636498,-16.07199],[31.852041,-16.319417],[32.328239,-16.392074],[32.847639,-16.713398],[32.849861,-17.979057],[32.654886,-18.67209],[32.611994,-19.419383],[32.772708,-19.715592],[32.659743,-20.30429],[32.508693,-20.395292],[32.244988,-21.116489],[31.191409,-22.25151]]]},"id":"ZWE"}
-]}
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "properties": { "name": "Afghanistan" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [61.210817, 35.650072],
+            [62.230651, 35.270664],
+            [62.984662, 35.404041],
+            [63.193538, 35.857166],
+            [63.982896, 36.007957],
+            [64.546479, 36.312073],
+            [64.746105, 37.111818],
+            [65.588948, 37.305217],
+            [65.745631, 37.661164],
+            [66.217385, 37.39379],
+            [66.518607, 37.362784],
+            [67.075782, 37.356144],
+            [67.83, 37.144994],
+            [68.135562, 37.023115],
+            [68.859446, 37.344336],
+            [69.196273, 37.151144],
+            [69.518785, 37.608997],
+            [70.116578, 37.588223],
+            [70.270574, 37.735165],
+            [70.376304, 38.138396],
+            [70.806821, 38.486282],
+            [71.348131, 38.258905],
+            [71.239404, 37.953265],
+            [71.541918, 37.905774],
+            [71.448693, 37.065645],
+            [71.844638, 36.738171],
+            [72.193041, 36.948288],
+            [72.63689, 37.047558],
+            [73.260056, 37.495257],
+            [73.948696, 37.421566],
+            [74.980002, 37.41999],
+            [75.158028, 37.133031],
+            [74.575893, 37.020841],
+            [74.067552, 36.836176],
+            [72.920025, 36.720007],
+            [71.846292, 36.509942],
+            [71.262348, 36.074388],
+            [71.498768, 35.650563],
+            [71.613076, 35.153203],
+            [71.115019, 34.733126],
+            [71.156773, 34.348911],
+            [70.881803, 33.988856],
+            [69.930543, 34.02012],
+            [70.323594, 33.358533],
+            [69.687147, 33.105499],
+            [69.262522, 32.501944],
+            [69.317764, 31.901412],
+            [68.926677, 31.620189],
+            [68.556932, 31.71331],
+            [67.792689, 31.58293],
+            [67.683394, 31.303154],
+            [66.938891, 31.304911],
+            [66.381458, 30.738899],
+            [66.346473, 29.887943],
+            [65.046862, 29.472181],
+            [64.350419, 29.560031],
+            [64.148002, 29.340819],
+            [63.550261, 29.468331],
+            [62.549857, 29.318572],
+            [60.874248, 29.829239],
+            [61.781222, 30.73585],
+            [61.699314, 31.379506],
+            [60.941945, 31.548075],
+            [60.863655, 32.18292],
+            [60.536078, 32.981269],
+            [60.9637, 33.528832],
+            [60.52843, 33.676446],
+            [60.803193, 34.404102],
+            [61.210817, 35.650072]
+          ]
+        ]
+      },
+      "id": "AFG"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Angola" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [16.326528, -5.87747],
+              [16.57318, -6.622645],
+              [16.860191, -7.222298],
+              [17.089996, -7.545689],
+              [17.47297, -8.068551],
+              [18.134222, -7.987678],
+              [18.464176, -7.847014],
+              [19.016752, -7.988246],
+              [19.166613, -7.738184],
+              [19.417502, -7.155429],
+              [20.037723, -7.116361],
+              [20.091622, -6.94309],
+              [20.601823, -6.939318],
+              [20.514748, -7.299606],
+              [21.728111, -7.290872],
+              [21.746456, -7.920085],
+              [21.949131, -8.305901],
+              [21.801801, -8.908707],
+              [21.875182, -9.523708],
+              [22.208753, -9.894796],
+              [22.155268, -11.084801],
+              [22.402798, -10.993075],
+              [22.837345, -11.017622],
+              [23.456791, -10.867863],
+              [23.912215, -10.926826],
+              [24.017894, -11.237298],
+              [23.904154, -11.722282],
+              [24.079905, -12.191297],
+              [23.930922, -12.565848],
+              [24.016137, -12.911046],
+              [21.933886, -12.898437],
+              [21.887843, -16.08031],
+              [22.562478, -16.898451],
+              [23.215048, -17.523116],
+              [21.377176, -17.930636],
+              [18.956187, -17.789095],
+              [18.263309, -17.309951],
+              [14.209707, -17.353101],
+              [14.058501, -17.423381],
+              [13.462362, -16.971212],
+              [12.814081, -16.941343],
+              [12.215461, -17.111668],
+              [11.734199, -17.301889],
+              [11.640096, -16.673142],
+              [11.778537, -15.793816],
+              [12.123581, -14.878316],
+              [12.175619, -14.449144],
+              [12.500095, -13.5477],
+              [12.738479, -13.137906],
+              [13.312914, -12.48363],
+              [13.633721, -12.038645],
+              [13.738728, -11.297863],
+              [13.686379, -10.731076],
+              [13.387328, -10.373578],
+              [13.120988, -9.766897],
+              [12.87537, -9.166934],
+              [12.929061, -8.959091],
+              [13.236433, -8.562629],
+              [12.93304, -7.596539],
+              [12.728298, -6.927122],
+              [12.227347, -6.294448],
+              [12.322432, -6.100092],
+              [12.735171, -5.965682],
+              [13.024869, -5.984389],
+              [13.375597, -5.864241],
+              [16.326528, -5.87747]
+            ]
+          ],
+          [
+            [
+              [12.436688, -5.684304],
+              [12.182337, -5.789931],
+              [11.914963, -5.037987],
+              [12.318608, -4.60623],
+              [12.62076, -4.438023],
+              [12.995517, -4.781103],
+              [12.631612, -4.991271],
+              [12.468004, -5.248362],
+              [12.436688, -5.684304]
+            ]
+          ]
+        ]
+      },
+      "id": "AGO"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Albania" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [20.590247, 41.855404],
+            [20.463175, 41.515089],
+            [20.605182, 41.086226],
+            [21.02004, 40.842727],
+            [20.99999, 40.580004],
+            [20.674997, 40.435],
+            [20.615, 40.110007],
+            [20.150016, 39.624998],
+            [19.98, 39.694993],
+            [19.960002, 39.915006],
+            [19.406082, 40.250773],
+            [19.319059, 40.72723],
+            [19.40355, 41.409566],
+            [19.540027, 41.719986],
+            [19.371769, 41.877548],
+            [19.304486, 42.195745],
+            [19.738051, 42.688247],
+            [19.801613, 42.500093],
+            [20.0707, 42.58863],
+            [20.283755, 42.32026],
+            [20.52295, 42.21787],
+            [20.590247, 41.855404]
+          ]
+        ]
+      },
+      "id": "ALB"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "United Arab Emirates" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [51.579519, 24.245497],
+            [51.757441, 24.294073],
+            [51.794389, 24.019826],
+            [52.577081, 24.177439],
+            [53.404007, 24.151317],
+            [54.008001, 24.121758],
+            [54.693024, 24.797892],
+            [55.439025, 25.439145],
+            [56.070821, 26.055464],
+            [56.261042, 25.714606],
+            [56.396847, 24.924732],
+            [55.886233, 24.920831],
+            [55.804119, 24.269604],
+            [55.981214, 24.130543],
+            [55.528632, 23.933604],
+            [55.525841, 23.524869],
+            [55.234489, 23.110993],
+            [55.208341, 22.70833],
+            [55.006803, 22.496948],
+            [52.000733, 23.001154],
+            [51.617708, 24.014219],
+            [51.579519, 24.245497]
+          ]
+        ]
+      },
+      "id": "ARE"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Argentina" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [-65.5, -55.2],
+              [-66.45, -55.25],
+              [-66.95992, -54.89681],
+              [-67.56244, -54.87001],
+              [-68.63335, -54.8695],
+              [-68.63401, -52.63637],
+              [-68.25, -53.1],
+              [-67.75, -53.85],
+              [-66.45, -54.45],
+              [-65.05, -54.7],
+              [-65.5, -55.2]
+            ]
+          ],
+          [
+            [
+              [-64.964892, -22.075862],
+              [-64.377021, -22.798091],
+              [-63.986838, -21.993644],
+              [-62.846468, -22.034985],
+              [-62.685057, -22.249029],
+              [-60.846565, -23.880713],
+              [-60.028966, -24.032796],
+              [-58.807128, -24.771459],
+              [-57.777217, -25.16234],
+              [-57.63366, -25.603657],
+              [-58.618174, -27.123719],
+              [-57.60976, -27.395899],
+              [-56.486702, -27.548499],
+              [-55.695846, -27.387837],
+              [-54.788795, -26.621786],
+              [-54.625291, -25.739255],
+              [-54.13005, -25.547639],
+              [-53.628349, -26.124865],
+              [-53.648735, -26.923473],
+              [-54.490725, -27.474757],
+              [-55.162286, -27.881915],
+              [-56.2909, -28.852761],
+              [-57.625133, -30.216295],
+              [-57.874937, -31.016556],
+              [-58.14244, -32.044504],
+              [-58.132648, -33.040567],
+              [-58.349611, -33.263189],
+              [-58.427074, -33.909454],
+              [-58.495442, -34.43149],
+              [-57.22583, -35.288027],
+              [-57.362359, -35.97739],
+              [-56.737487, -36.413126],
+              [-56.788285, -36.901572],
+              [-57.749157, -38.183871],
+              [-59.231857, -38.72022],
+              [-61.237445, -38.928425],
+              [-62.335957, -38.827707],
+              [-62.125763, -39.424105],
+              [-62.330531, -40.172586],
+              [-62.145994, -40.676897],
+              [-62.745803, -41.028761],
+              [-63.770495, -41.166789],
+              [-64.73209, -40.802677],
+              [-65.118035, -41.064315],
+              [-64.978561, -42.058001],
+              [-64.303408, -42.359016],
+              [-63.755948, -42.043687],
+              [-63.458059, -42.563138],
+              [-64.378804, -42.873558],
+              [-65.181804, -43.495381],
+              [-65.328823, -44.501366],
+              [-65.565269, -45.036786],
+              [-66.509966, -45.039628],
+              [-67.293794, -45.551896],
+              [-67.580546, -46.301773],
+              [-66.597066, -47.033925],
+              [-65.641027, -47.236135],
+              [-65.985088, -48.133289],
+              [-67.166179, -48.697337],
+              [-67.816088, -49.869669],
+              [-68.728745, -50.264218],
+              [-69.138539, -50.73251],
+              [-68.815561, -51.771104],
+              [-68.149995, -52.349983],
+              [-68.571545, -52.299444],
+              [-69.498362, -52.142761],
+              [-71.914804, -52.009022],
+              [-72.329404, -51.425956],
+              [-72.309974, -50.67701],
+              [-72.975747, -50.74145],
+              [-73.328051, -50.378785],
+              [-73.415436, -49.318436],
+              [-72.648247, -48.878618],
+              [-72.331161, -48.244238],
+              [-72.447355, -47.738533],
+              [-71.917258, -46.884838],
+              [-71.552009, -45.560733],
+              [-71.659316, -44.973689],
+              [-71.222779, -44.784243],
+              [-71.329801, -44.407522],
+              [-71.793623, -44.207172],
+              [-71.464056, -43.787611],
+              [-71.915424, -43.408565],
+              [-72.148898, -42.254888],
+              [-71.746804, -42.051386],
+              [-71.915734, -40.832339],
+              [-71.680761, -39.808164],
+              [-71.413517, -38.916022],
+              [-70.814664, -38.552995],
+              [-71.118625, -37.576827],
+              [-71.121881, -36.658124],
+              [-70.364769, -36.005089],
+              [-70.388049, -35.169688],
+              [-69.817309, -34.193571],
+              [-69.814777, -33.273886],
+              [-70.074399, -33.09121],
+              [-70.535069, -31.36501],
+              [-69.919008, -30.336339],
+              [-70.01355, -29.367923],
+              [-69.65613, -28.459141],
+              [-69.001235, -27.521214],
+              [-68.295542, -26.89934],
+              [-68.5948, -26.506909],
+              [-68.386001, -26.185016],
+              [-68.417653, -24.518555],
+              [-67.328443, -24.025303],
+              [-66.985234, -22.986349],
+              [-67.106674, -22.735925],
+              [-66.273339, -21.83231],
+              [-64.964892, -22.075862]
+            ]
+          ]
+        ]
+      },
+      "id": "ARG"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Armenia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [43.582746, 41.092143],
+            [44.97248, 41.248129],
+            [45.179496, 40.985354],
+            [45.560351, 40.81229],
+            [45.359175, 40.561504],
+            [45.891907, 40.218476],
+            [45.610012, 39.899994],
+            [46.034534, 39.628021],
+            [46.483499, 39.464155],
+            [46.50572, 38.770605],
+            [46.143623, 38.741201],
+            [45.735379, 39.319719],
+            [45.739978, 39.473999],
+            [45.298145, 39.471751],
+            [45.001987, 39.740004],
+            [44.79399, 39.713003],
+            [44.400009, 40.005],
+            [43.656436, 40.253564],
+            [43.752658, 40.740201],
+            [43.582746, 41.092143]
+          ]
+        ]
+      },
+      "id": "ARM"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Antarctica" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [-59.572095, -80.040179],
+              [-59.865849, -80.549657],
+              [-60.159656, -81.000327],
+              [-62.255393, -80.863178],
+              [-64.488125, -80.921934],
+              [-65.741666, -80.588827],
+              [-65.741666, -80.549657],
+              [-66.290031, -80.255773],
+              [-64.037688, -80.294944],
+              [-61.883246, -80.39287],
+              [-61.138976, -79.981371],
+              [-60.610119, -79.628679],
+              [-59.572095, -80.040179]
+            ]
+          ],
+          [
+            [
+              [-159.208184, -79.497059],
+              [-161.127601, -79.634209],
+              [-162.439847, -79.281465],
+              [-163.027408, -78.928774],
+              [-163.066604, -78.869966],
+              [-163.712896, -78.595667],
+              [-163.712896, -78.595667],
+              [-163.105801, -78.223338],
+              [-161.245113, -78.380176],
+              [-160.246208, -78.693645],
+              [-159.482405, -79.046338],
+              [-159.208184, -79.497059]
+            ]
+          ],
+          [
+            [
+              [-45.154758, -78.04707],
+              [-43.920828, -78.478103],
+              [-43.48995, -79.08556],
+              [-43.372438, -79.516645],
+              [-43.333267, -80.026123],
+              [-44.880537, -80.339644],
+              [-46.506174, -80.594357],
+              [-48.386421, -80.829485],
+              [-50.482107, -81.025442],
+              [-52.851988, -80.966685],
+              [-54.164259, -80.633528],
+              [-53.987991, -80.222028],
+              [-51.853134, -79.94773],
+              [-50.991326, -79.614623],
+              [-50.364595, -79.183487],
+              [-49.914131, -78.811209],
+              [-49.306959, -78.458569],
+              [-48.660616, -78.047018],
+              [-48.660616, -78.047019],
+              [-48.151396, -78.04707],
+              [-46.662857, -77.831476],
+              [-45.154758, -78.04707]
+            ]
+          ],
+          [
+            [
+              [-121.211511, -73.50099],
+              [-119.918851, -73.657725],
+              [-118.724143, -73.481353],
+              [-119.292119, -73.834097],
+              [-120.232217, -74.08881],
+              [-121.62283, -74.010468],
+              [-122.621735, -73.657778],
+              [-122.621735, -73.657777],
+              [-122.406245, -73.324619],
+              [-121.211511, -73.50099]
+            ]
+          ],
+          [
+            [
+              [-125.559566, -73.481353],
+              [-124.031882, -73.873268],
+              [-124.619469, -73.834097],
+              [-125.912181, -73.736118],
+              [-127.28313, -73.461769],
+              [-127.28313, -73.461768],
+              [-126.558472, -73.246226],
+              [-125.559566, -73.481353]
+            ]
+          ],
+          [
+            [
+              [-98.98155, -71.933334],
+              [-97.884743, -72.070535],
+              [-96.787937, -71.952971],
+              [-96.20035, -72.521205],
+              [-96.983765, -72.442864],
+              [-98.198083, -72.482035],
+              [-99.432013, -72.442864],
+              [-100.783455, -72.50162],
+              [-101.801868, -72.305663],
+              [-102.330725, -71.894164],
+              [-102.330725, -71.894164],
+              [-101.703967, -71.717792],
+              [-100.430919, -71.854993],
+              [-98.98155, -71.933334]
+            ]
+          ],
+          [
+            [
+              [-68.451346, -70.955823],
+              [-68.333834, -71.406493],
+              [-68.510128, -71.798407],
+              [-68.784297, -72.170736],
+              [-69.959471, -72.307885],
+              [-71.075889, -72.503842],
+              [-72.388134, -72.484257],
+              [-71.8985, -72.092343],
+              [-73.073622, -72.229492],
+              [-74.19004, -72.366693],
+              [-74.953895, -72.072757],
+              [-75.012625, -71.661258],
+              [-73.915819, -71.269345],
+              [-73.915819, -71.269344],
+              [-73.230331, -71.15178],
+              [-72.074717, -71.190951],
+              [-71.780962, -70.681473],
+              [-71.72218, -70.309196],
+              [-71.741791, -69.505782],
+              [-71.173815, -69.035475],
+              [-70.253252, -68.87874],
+              [-69.724447, -69.251017],
+              [-69.489422, -69.623346],
+              [-69.058518, -70.074016],
+              [-68.725541, -70.505153],
+              [-68.451346, -70.955823]
+            ]
+          ],
+          [
+            [
+              [-58.614143, -64.152467],
+              [-59.045073, -64.36801],
+              [-59.789342, -64.211223],
+              [-60.611928, -64.309202],
+              [-61.297416, -64.54433],
+              [-62.0221, -64.799094],
+              [-62.51176, -65.09303],
+              [-62.648858, -65.484942],
+              [-62.590128, -65.857219],
+              [-62.120079, -66.190326],
+              [-62.805567, -66.425505],
+              [-63.74569, -66.503847],
+              [-64.294106, -66.837004],
+              [-64.881693, -67.150474],
+              [-65.508425, -67.58161],
+              [-65.665082, -67.953887],
+              [-65.312545, -68.365335],
+              [-64.783715, -68.678908],
+              [-63.961103, -68.913984],
+              [-63.1973, -69.227556],
+              [-62.785955, -69.619419],
+              [-62.570516, -69.991747],
+              [-62.276736, -70.383661],
+              [-61.806661, -70.716768],
+              [-61.512906, -71.089045],
+              [-61.375809, -72.010074],
+              [-61.081977, -72.382351],
+              [-61.003661, -72.774265],
+              [-60.690269, -73.166179],
+              [-60.827367, -73.695242],
+              [-61.375809, -74.106742],
+              [-61.96337, -74.439848],
+              [-63.295201, -74.576997],
+              [-63.74569, -74.92974],
+              [-64.352836, -75.262847],
+              [-65.860987, -75.635124],
+              [-67.192818, -75.79191],
+              [-68.446282, -76.007452],
+              [-69.797724, -76.222995],
+              [-70.600724, -76.634494],
+              [-72.206776, -76.673665],
+              [-73.969536, -76.634494],
+              [-75.555977, -76.712887],
+              [-77.24037, -76.712887],
+              [-76.926979, -77.104802],
+              [-75.399294, -77.28107],
+              [-74.282876, -77.55542],
+              [-73.656119, -77.908112],
+              [-74.772536, -78.221633],
+              [-76.4961, -78.123654],
+              [-77.925858, -78.378419],
+              [-77.984666, -78.789918],
+              [-78.023785, -79.181833],
+              [-76.848637, -79.514939],
+              [-76.633224, -79.887216],
+              [-75.360097, -80.259545],
+              [-73.244852, -80.416331],
+              [-71.442946, -80.69063],
+              [-70.013163, -81.004151],
+              [-68.191646, -81.317672],
+              [-65.704279, -81.474458],
+              [-63.25603, -81.748757],
+              [-61.552026, -82.042692],
+              [-59.691416, -82.37585],
+              [-58.712121, -82.846106],
+              [-58.222487, -83.218434],
+              [-57.008117, -82.865691],
+              [-55.362894, -82.571755],
+              [-53.619771, -82.258235],
+              [-51.543644, -82.003521],
+              [-49.76135, -81.729171],
+              [-47.273931, -81.709586],
+              [-44.825708, -81.846735],
+              [-42.808363, -82.081915],
+              [-42.16202, -81.65083],
+              [-40.771433, -81.356894],
+              [-38.244818, -81.337309],
+              [-36.26667, -81.121715],
+              [-34.386397, -80.906172],
+              [-32.310296, -80.769023],
+              [-30.097098, -80.592651],
+              [-28.549802, -80.337938],
+              [-29.254901, -79.985195],
+              [-29.685805, -79.632503],
+              [-29.685805, -79.260226],
+              [-31.624808, -79.299397],
+              [-33.681324, -79.456132],
+              [-35.639912, -79.456132],
+              [-35.914107, -79.083855],
+              [-35.77701, -78.339248],
+              [-35.326546, -78.123654],
+              [-33.896763, -77.888526],
+              [-32.212369, -77.65345],
+              [-30.998051, -77.359515],
+              [-29.783732, -77.065579],
+              [-28.882779, -76.673665],
+              [-27.511752, -76.497345],
+              [-26.160336, -76.360144],
+              [-25.474822, -76.281803],
+              [-23.927552, -76.24258],
+              [-22.458598, -76.105431],
+              [-21.224694, -75.909474],
+              [-20.010375, -75.674346],
+              [-18.913543, -75.439218],
+              [-17.522982, -75.125698],
+              [-16.641589, -74.79254],
+              [-15.701491, -74.498604],
+              [-15.40771, -74.106742],
+              [-16.46532, -73.871614],
+              [-16.112784, -73.460114],
+              [-15.446855, -73.146542],
+              [-14.408805, -72.950585],
+              [-13.311973, -72.715457],
+              [-12.293508, -72.401936],
+              [-11.510067, -72.010074],
+              [-11.020433, -71.539767],
+              [-10.295774, -71.265416],
+              [-9.101015, -71.324224],
+              [-8.611381, -71.65733],
+              [-7.416622, -71.696501],
+              [-7.377451, -71.324224],
+              [-6.868232, -70.93231],
+              [-5.790985, -71.030289],
+              [-5.536375, -71.402617],
+              [-4.341667, -71.461373],
+              [-3.048981, -71.285053],
+              [-1.795492, -71.167438],
+              [-0.659489, -71.226246],
+              [-0.228637, -71.637745],
+              [0.868195, -71.304639],
+              [1.886686, -71.128267],
+              [3.022638, -70.991118],
+              [4.139055, -70.853917],
+              [5.157546, -70.618789],
+              [6.273912, -70.462055],
+              [7.13572, -70.246512],
+              [7.742866, -69.893769],
+              [8.48711, -70.148534],
+              [9.525135, -70.011333],
+              [10.249845, -70.48164],
+              [10.817821, -70.834332],
+              [11.953824, -70.638375],
+              [12.404287, -70.246512],
+              [13.422778, -69.972162],
+              [14.734998, -70.030918],
+              [15.126757, -70.403247],
+              [15.949342, -70.030918],
+              [17.026589, -69.913354],
+              [18.201711, -69.874183],
+              [19.259373, -69.893769],
+              [20.375739, -70.011333],
+              [21.452985, -70.07014],
+              [21.923034, -70.403247],
+              [22.569403, -70.697182],
+              [23.666184, -70.520811],
+              [24.841357, -70.48164],
+              [25.977309, -70.48164],
+              [27.093726, -70.462055],
+              [28.09258, -70.324854],
+              [29.150242, -70.20729],
+              [30.031583, -69.93294],
+              [30.971733, -69.75662],
+              [31.990172, -69.658641],
+              [32.754053, -69.384291],
+              [33.302443, -68.835642],
+              [33.870419, -68.502588],
+              [34.908495, -68.659271],
+              [35.300202, -69.012014],
+              [36.16201, -69.247142],
+              [37.200035, -69.168748],
+              [37.905108, -69.52144],
+              [38.649404, -69.776205],
+              [39.667894, -69.541077],
+              [40.020431, -69.109941],
+              [40.921358, -68.933621],
+              [41.959434, -68.600514],
+              [42.938702, -68.463313],
+              [44.113876, -68.267408],
+              [44.897291, -68.051866],
+              [45.719928, -67.816738],
+              [46.503343, -67.601196],
+              [47.44344, -67.718759],
+              [48.344419, -67.366068],
+              [48.990736, -67.091718],
+              [49.930885, -67.111303],
+              [50.753471, -66.876175],
+              [50.949325, -66.523484],
+              [51.791547, -66.249133],
+              [52.614133, -66.053176],
+              [53.613038, -65.89639],
+              [54.53355, -65.818049],
+              [55.414943, -65.876805],
+              [56.355041, -65.974783],
+              [57.158093, -66.249133],
+              [57.255968, -66.680218],
+              [58.137361, -67.013324],
+              [58.744508, -67.287675],
+              [59.939318, -67.405239],
+              [60.605221, -67.679589],
+              [61.427806, -67.953887],
+              [62.387489, -68.012695],
+              [63.19049, -67.816738],
+              [64.052349, -67.405239],
+              [64.992447, -67.620729],
+              [65.971715, -67.738345],
+              [66.911864, -67.855909],
+              [67.891133, -67.934302],
+              [68.890038, -67.934302],
+              [69.712624, -68.972791],
+              [69.673453, -69.227556],
+              [69.555941, -69.678226],
+              [68.596258, -69.93294],
+              [67.81274, -70.305268],
+              [67.949889, -70.697182],
+              [69.066307, -70.677545],
+              [68.929157, -71.069459],
+              [68.419989, -71.441788],
+              [67.949889, -71.853287],
+              [68.71377, -72.166808],
+              [69.869307, -72.264787],
+              [71.024895, -72.088415],
+              [71.573285, -71.696501],
+              [71.906288, -71.324224],
+              [72.454627, -71.010703],
+              [73.08141, -70.716768],
+              [73.33602, -70.364024],
+              [73.864877, -69.874183],
+              [74.491557, -69.776205],
+              [75.62756, -69.737034],
+              [76.626465, -69.619419],
+              [77.644904, -69.462684],
+              [78.134539, -69.07077],
+              [78.428371, -68.698441],
+              [79.113859, -68.326216],
+              [80.093127, -68.071503],
+              [80.93535, -67.875546],
+              [81.483792, -67.542388],
+              [82.051767, -67.366068],
+              [82.776426, -67.209282],
+              [83.775331, -67.30726],
+              [84.676206, -67.209282],
+              [85.655527, -67.091718],
+              [86.752359, -67.150474],
+              [87.477017, -66.876175],
+              [87.986289, -66.209911],
+              [88.358411, -66.484261],
+              [88.828408, -66.954568],
+              [89.67063, -67.150474],
+              [90.630365, -67.228867],
+              [91.5901, -67.111303],
+              [92.608539, -67.189696],
+              [93.548637, -67.209282],
+              [94.17542, -67.111303],
+              [95.017591, -67.170111],
+              [95.781472, -67.385653],
+              [96.682399, -67.248504],
+              [97.759646, -67.248504],
+              [98.68021, -67.111303],
+              [99.718182, -67.248504],
+              [100.384188, -66.915346],
+              [100.893356, -66.58224],
+              [101.578896, -66.30789],
+              [102.832411, -65.563284],
+              [103.478676, -65.700485],
+              [104.242557, -65.974783],
+              [104.90846, -66.327527],
+              [106.181561, -66.934931],
+              [107.160881, -66.954568],
+              [108.081393, -66.954568],
+              [109.15864, -66.837004],
+              [110.235835, -66.699804],
+              [111.058472, -66.425505],
+              [111.74396, -66.13157],
+              [112.860378, -66.092347],
+              [113.604673, -65.876805],
+              [114.388088, -66.072762],
+              [114.897308, -66.386283],
+              [115.602381, -66.699804],
+              [116.699161, -66.660633],
+              [117.384701, -66.915346],
+              [118.57946, -67.170111],
+              [119.832924, -67.268089],
+              [120.871, -67.189696],
+              [121.654415, -66.876175],
+              [122.320369, -66.562654],
+              [123.221296, -66.484261],
+              [124.122274, -66.621462],
+              [125.160247, -66.719389],
+              [126.100396, -66.562654],
+              [127.001427, -66.562654],
+              [127.882768, -66.660633],
+              [128.80328, -66.758611],
+              [129.704259, -66.58224],
+              [130.781454, -66.425505],
+              [131.799945, -66.386283],
+              [132.935896, -66.386283],
+              [133.85646, -66.288304],
+              [134.757387, -66.209963],
+              [135.031582, -65.72007],
+              [135.070753, -65.308571],
+              [135.697485, -65.582869],
+              [135.873805, -66.033591],
+              [136.206705, -66.44509],
+              [136.618049, -66.778197],
+              [137.460271, -66.954568],
+              [138.596223, -66.895761],
+              [139.908442, -66.876175],
+              [140.809421, -66.817367],
+              [142.121692, -66.817367],
+              [143.061842, -66.797782],
+              [144.374061, -66.837004],
+              [145.490427, -66.915346],
+              [146.195552, -67.228867],
+              [145.999699, -67.601196],
+              [146.646067, -67.895131],
+              [147.723263, -68.130259],
+              [148.839629, -68.385024],
+              [150.132314, -68.561292],
+              [151.483705, -68.71813],
+              [152.502247, -68.874813],
+              [153.638199, -68.894502],
+              [154.284567, -68.561292],
+              [155.165857, -68.835642],
+              [155.92979, -69.149215],
+              [156.811132, -69.384291],
+              [158.025528, -69.482269],
+              [159.181013, -69.599833],
+              [159.670699, -69.991747],
+              [160.80665, -70.226875],
+              [161.570479, -70.579618],
+              [162.686897, -70.736353],
+              [163.842434, -70.716768],
+              [164.919681, -70.775524],
+              [166.11444, -70.755938],
+              [167.309095, -70.834332],
+              [168.425616, -70.971481],
+              [169.463589, -71.20666],
+              [170.501665, -71.402617],
+              [171.20679, -71.696501],
+              [171.089227, -72.088415],
+              [170.560422, -72.441159],
+              [170.109958, -72.891829],
+              [169.75737, -73.24452],
+              [169.287321, -73.65602],
+              [167.975101, -73.812806],
+              [167.387489, -74.165498],
+              [166.094803, -74.38104],
+              [165.644391, -74.772954],
+              [164.958851, -75.145283],
+              [164.234193, -75.458804],
+              [163.822797, -75.870303],
+              [163.568239, -76.24258],
+              [163.47026, -76.693302],
+              [163.489897, -77.065579],
+              [164.057873, -77.457442],
+              [164.273363, -77.82977],
+              [164.743464, -78.182514],
+              [166.604126, -78.319611],
+              [166.995781, -78.750748],
+              [165.193876, -78.907483],
+              [163.666217, -79.123025],
+              [161.766385, -79.162248],
+              [160.924162, -79.730482],
+              [160.747894, -80.200737],
+              [160.316964, -80.573066],
+              [159.788211, -80.945395],
+              [161.120016, -81.278501],
+              [161.629287, -81.690001],
+              [162.490992, -82.062278],
+              [163.705336, -82.395435],
+              [165.095949, -82.708956],
+              [166.604126, -83.022477],
+              [168.895665, -83.335998],
+              [169.404782, -83.825891],
+              [172.283934, -84.041433],
+              [172.477049, -84.117914],
+              [173.224083, -84.41371],
+              [175.985672, -84.158997],
+              [178.277212, -84.472518],
+              [180, -84.71338],
+              [-179.942499, -84.721443],
+              [-179.058677, -84.139412],
+              [-177.256772, -84.452933],
+              [-177.140807, -84.417941],
+              [-176.084673, -84.099259],
+              [-175.947235, -84.110449],
+              [-175.829882, -84.117914],
+              [-174.382503, -84.534323],
+              [-173.116559, -84.117914],
+              [-172.889106, -84.061019],
+              [-169.951223, -83.884647],
+              [-168.999989, -84.117914],
+              [-168.530199, -84.23739],
+              [-167.022099, -84.570497],
+              [-164.182144, -84.82521],
+              [-161.929775, -85.138731],
+              [-158.07138, -85.37391],
+              [-155.192253, -85.09956],
+              [-150.942099, -85.295517],
+              [-148.533073, -85.609038],
+              [-145.888918, -85.315102],
+              [-143.107718, -85.040752],
+              [-142.892279, -84.570497],
+              [-146.829068, -84.531274],
+              [-150.060732, -84.296146],
+              [-150.902928, -83.904232],
+              [-153.586201, -83.68869],
+              [-153.409907, -83.23802],
+              [-153.037759, -82.82652],
+              [-152.665637, -82.454192],
+              [-152.861517, -82.042692],
+              [-154.526299, -81.768394],
+              [-155.29018, -81.41565],
+              [-156.83745, -81.102129],
+              [-154.408787, -81.160937],
+              [-152.097662, -81.004151],
+              [-150.648293, -81.337309],
+              [-148.865998, -81.043373],
+              [-147.22075, -80.671045],
+              [-146.417749, -80.337938],
+              [-146.770286, -79.926439],
+              [-148.062947, -79.652089],
+              [-149.531901, -79.358205],
+              [-151.588416, -79.299397],
+              [-153.390322, -79.162248],
+              [-155.329376, -79.064269],
+              [-155.975668, -78.69194],
+              [-157.268302, -78.378419],
+              [-158.051768, -78.025676],
+              [-158.365134, -76.889207],
+              [-157.875474, -76.987238],
+              [-156.974573, -77.300759],
+              [-155.329376, -77.202728],
+              [-153.742832, -77.065579],
+              [-152.920247, -77.496664],
+              [-151.33378, -77.398737],
+              [-150.00195, -77.183143],
+              [-148.748486, -76.908845],
+              [-147.612483, -76.575738],
+              [-146.104409, -76.47776],
+              [-146.143528, -76.105431],
+              [-146.496091, -75.733154],
+              [-146.20231, -75.380411],
+              [-144.909624, -75.204039],
+              [-144.322037, -75.537197],
+              [-142.794353, -75.34124],
+              [-141.638764, -75.086475],
+              [-140.209007, -75.06689],
+              [-138.85759, -74.968911],
+              [-137.5062, -74.733783],
+              [-136.428901, -74.518241],
+              [-135.214583, -74.302699],
+              [-134.431194, -74.361455],
+              [-133.745654, -74.439848],
+              [-132.257168, -74.302699],
+              [-130.925311, -74.479019],
+              [-129.554284, -74.459433],
+              [-128.242038, -74.322284],
+              [-126.890622, -74.420263],
+              [-125.402082, -74.518241],
+              [-124.011496, -74.479019],
+              [-122.562152, -74.498604],
+              [-121.073613, -74.518241],
+              [-119.70256, -74.479019],
+              [-118.684145, -74.185083],
+              [-117.469801, -74.028348],
+              [-116.216312, -74.243891],
+              [-115.021552, -74.067519],
+              [-113.944331, -73.714828],
+              [-113.297988, -74.028348],
+              [-112.945452, -74.38104],
+              [-112.299083, -74.714198],
+              [-111.261059, -74.420263],
+              [-110.066325, -74.79254],
+              [-108.714909, -74.910103],
+              [-107.559346, -75.184454],
+              [-106.149148, -75.125698],
+              [-104.876074, -74.949326],
+              [-103.367949, -74.988497],
+              [-102.016507, -75.125698],
+              [-100.645531, -75.302018],
+              [-100.1167, -74.870933],
+              [-100.763043, -74.537826],
+              [-101.252703, -74.185083],
+              [-102.545337, -74.106742],
+              [-103.113313, -73.734413],
+              [-103.328752, -73.362084],
+              [-103.681289, -72.61753],
+              [-102.917485, -72.754679],
+              [-101.60524, -72.813436],
+              [-100.312528, -72.754679],
+              [-99.13738, -72.911414],
+              [-98.118889, -73.20535],
+              [-97.688037, -73.558041],
+              [-96.336595, -73.616849],
+              [-95.043961, -73.4797],
+              [-93.672907, -73.283743],
+              [-92.439003, -73.166179],
+              [-91.420564, -73.401307],
+              [-90.088733, -73.322914],
+              [-89.226951, -72.558722],
+              [-88.423951, -73.009393],
+              [-87.268337, -73.185764],
+              [-86.014822, -73.087786],
+              [-85.192236, -73.4797],
+              [-83.879991, -73.518871],
+              [-82.665646, -73.636434],
+              [-81.470913, -73.851977],
+              [-80.687447, -73.4797],
+              [-80.295791, -73.126956],
+              [-79.296886, -73.518871],
+              [-77.925858, -73.420892],
+              [-76.907367, -73.636434],
+              [-76.221879, -73.969541],
+              [-74.890049, -73.871614],
+              [-73.852024, -73.65602],
+              [-72.833533, -73.401307],
+              [-71.619215, -73.264157],
+              [-70.209042, -73.146542],
+              [-68.935916, -73.009393],
+              [-67.956622, -72.79385],
+              [-67.369061, -72.480329],
+              [-67.134036, -72.049244],
+              [-67.251548, -71.637745],
+              [-67.56494, -71.245831],
+              [-67.917477, -70.853917],
+              [-68.230843, -70.462055],
+              [-68.485452, -70.109311],
+              [-68.544209, -69.717397],
+              [-68.446282, -69.325535],
+              [-67.976233, -68.953206],
+              [-67.5845, -68.541707],
+              [-67.427843, -68.149844],
+              [-67.62367, -67.718759],
+              [-67.741183, -67.326845],
+              [-67.251548, -66.876175],
+              [-66.703184, -66.58224],
+              [-66.056815, -66.209963],
+              [-65.371327, -65.89639],
+              [-64.568276, -65.602506],
+              [-64.176542, -65.171423],
+              [-63.628152, -64.897073],
+              [-63.001394, -64.642308],
+              [-62.041686, -64.583552],
+              [-61.414928, -64.270031],
+              [-60.709855, -64.074074],
+              [-59.887269, -63.95651],
+              [-59.162585, -63.701745],
+              [-58.594557, -63.388224],
+              [-57.811143, -63.27066],
+              [-57.223582, -63.525425],
+              [-57.59573, -63.858532],
+              [-58.614143, -64.152467]
+            ]
+          ]
+        ]
+      },
+      "id": "ATA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "French Southern and Antarctic Lands" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [68.935, -48.625],
+            [69.58, -48.94],
+            [70.525, -49.065],
+            [70.56, -49.255],
+            [70.28, -49.71],
+            [68.745, -49.775],
+            [68.72, -49.2425],
+            [68.8675, -48.83],
+            [68.935, -48.625]
+          ]
+        ]
+      },
+      "id": "ATF"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Australia" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [145.397978, -40.792549],
+              [146.364121, -41.137695],
+              [146.908584, -41.000546],
+              [147.689259, -40.808258],
+              [148.289068, -40.875438],
+              [148.359865, -42.062445],
+              [148.017301, -42.407024],
+              [147.914052, -43.211522],
+              [147.564564, -42.937689],
+              [146.870343, -43.634597],
+              [146.663327, -43.580854],
+              [146.048378, -43.549745],
+              [145.43193, -42.693776],
+              [145.29509, -42.03361],
+              [144.718071, -41.162552],
+              [144.743755, -40.703975],
+              [145.397978, -40.792549]
+            ]
+          ],
+          [
+            [
+              [143.561811, -13.763656],
+              [143.922099, -14.548311],
+              [144.563714, -14.171176],
+              [144.894908, -14.594458],
+              [145.374724, -14.984976],
+              [145.271991, -15.428205],
+              [145.48526, -16.285672],
+              [145.637033, -16.784918],
+              [145.888904, -16.906926],
+              [146.160309, -17.761655],
+              [146.063674, -18.280073],
+              [146.387478, -18.958274],
+              [147.471082, -19.480723],
+              [148.177602, -19.955939],
+              [148.848414, -20.39121],
+              [148.717465, -20.633469],
+              [149.28942, -21.260511],
+              [149.678337, -22.342512],
+              [150.077382, -22.122784],
+              [150.482939, -22.556142],
+              [150.727265, -22.402405],
+              [150.899554, -23.462237],
+              [151.609175, -24.076256],
+              [152.07354, -24.457887],
+              [152.855197, -25.267501],
+              [153.136162, -26.071173],
+              [153.161949, -26.641319],
+              [153.092909, -27.2603],
+              [153.569469, -28.110067],
+              [153.512108, -28.995077],
+              [153.339095, -29.458202],
+              [153.069241, -30.35024],
+              [153.089602, -30.923642],
+              [152.891578, -31.640446],
+              [152.450002, -32.550003],
+              [151.709117, -33.041342],
+              [151.343972, -33.816023],
+              [151.010555, -34.31036],
+              [150.714139, -35.17346],
+              [150.32822, -35.671879],
+              [150.075212, -36.420206],
+              [149.946124, -37.109052],
+              [149.997284, -37.425261],
+              [149.423882, -37.772681],
+              [148.304622, -37.809061],
+              [147.381733, -38.219217],
+              [146.922123, -38.606532],
+              [146.317922, -39.035757],
+              [145.489652, -38.593768],
+              [144.876976, -38.417448],
+              [145.032212, -37.896188],
+              [144.485682, -38.085324],
+              [143.609974, -38.809465],
+              [142.745427, -38.538268],
+              [142.17833, -38.380034],
+              [141.606582, -38.308514],
+              [140.638579, -38.019333],
+              [139.992158, -37.402936],
+              [139.806588, -36.643603],
+              [139.574148, -36.138362],
+              [139.082808, -35.732754],
+              [138.120748, -35.612296],
+              [138.449462, -35.127261],
+              [138.207564, -34.384723],
+              [137.71917, -35.076825],
+              [136.829406, -35.260535],
+              [137.352371, -34.707339],
+              [137.503886, -34.130268],
+              [137.890116, -33.640479],
+              [137.810328, -32.900007],
+              [136.996837, -33.752771],
+              [136.372069, -34.094766],
+              [135.989043, -34.890118],
+              [135.208213, -34.47867],
+              [135.239218, -33.947953],
+              [134.613417, -33.222778],
+              [134.085904, -32.848072],
+              [134.273903, -32.617234],
+              [132.990777, -32.011224],
+              [132.288081, -31.982647],
+              [131.326331, -31.495803],
+              [129.535794, -31.590423],
+              [128.240938, -31.948489],
+              [127.102867, -32.282267],
+              [126.148714, -32.215966],
+              [125.088623, -32.728751],
+              [124.221648, -32.959487],
+              [124.028947, -33.483847],
+              [123.659667, -33.890179],
+              [122.811036, -33.914467],
+              [122.183064, -34.003402],
+              [121.299191, -33.821036],
+              [120.580268, -33.930177],
+              [119.893695, -33.976065],
+              [119.298899, -34.509366],
+              [119.007341, -34.464149],
+              [118.505718, -34.746819],
+              [118.024972, -35.064733],
+              [117.295507, -35.025459],
+              [116.625109, -35.025097],
+              [115.564347, -34.386428],
+              [115.026809, -34.196517],
+              [115.048616, -33.623425],
+              [115.545123, -33.487258],
+              [115.714674, -33.259572],
+              [115.679379, -32.900369],
+              [115.801645, -32.205062],
+              [115.689611, -31.612437],
+              [115.160909, -30.601594],
+              [114.997043, -30.030725],
+              [115.040038, -29.461095],
+              [114.641974, -28.810231],
+              [114.616498, -28.516399],
+              [114.173579, -28.118077],
+              [114.048884, -27.334765],
+              [113.477498, -26.543134],
+              [113.338953, -26.116545],
+              [113.778358, -26.549025],
+              [113.440962, -25.621278],
+              [113.936901, -25.911235],
+              [114.232852, -26.298446],
+              [114.216161, -25.786281],
+              [113.721255, -24.998939],
+              [113.625344, -24.683971],
+              [113.393523, -24.384764],
+              [113.502044, -23.80635],
+              [113.706993, -23.560215],
+              [113.843418, -23.059987],
+              [113.736552, -22.475475],
+              [114.149756, -21.755881],
+              [114.225307, -22.517488],
+              [114.647762, -21.82952],
+              [115.460167, -21.495173],
+              [115.947373, -21.068688],
+              [116.711615, -20.701682],
+              [117.166316, -20.623599],
+              [117.441545, -20.746899],
+              [118.229559, -20.374208],
+              [118.836085, -20.263311],
+              [118.987807, -20.044203],
+              [119.252494, -19.952942],
+              [119.805225, -19.976506],
+              [120.85622, -19.683708],
+              [121.399856, -19.239756],
+              [121.655138, -18.705318],
+              [122.241665, -18.197649],
+              [122.286624, -17.798603],
+              [122.312772, -17.254967],
+              [123.012574, -16.4052],
+              [123.433789, -17.268558],
+              [123.859345, -17.069035],
+              [123.503242, -16.596506],
+              [123.817073, -16.111316],
+              [124.258287, -16.327944],
+              [124.379726, -15.56706],
+              [124.926153, -15.0751],
+              [125.167275, -14.680396],
+              [125.670087, -14.51007],
+              [125.685796, -14.230656],
+              [126.125149, -14.347341],
+              [126.142823, -14.095987],
+              [126.582589, -13.952791],
+              [127.065867, -13.817968],
+              [127.804633, -14.276906],
+              [128.35969, -14.86917],
+              [128.985543, -14.875991],
+              [129.621473, -14.969784],
+              [129.4096, -14.42067],
+              [129.888641, -13.618703],
+              [130.339466, -13.357376],
+              [130.183506, -13.10752],
+              [130.617795, -12.536392],
+              [131.223495, -12.183649],
+              [131.735091, -12.302453],
+              [132.575298, -12.114041],
+              [132.557212, -11.603012],
+              [131.824698, -11.273782],
+              [132.357224, -11.128519],
+              [133.019561, -11.376411],
+              [133.550846, -11.786515],
+              [134.393068, -12.042365],
+              [134.678632, -11.941183],
+              [135.298491, -12.248606],
+              [135.882693, -11.962267],
+              [136.258381, -12.049342],
+              [136.492475, -11.857209],
+              [136.95162, -12.351959],
+              [136.685125, -12.887223],
+              [136.305407, -13.29123],
+              [135.961758, -13.324509],
+              [136.077617, -13.724278],
+              [135.783836, -14.223989],
+              [135.428664, -14.715432],
+              [135.500184, -14.997741],
+              [136.295175, -15.550265],
+              [137.06536, -15.870762],
+              [137.580471, -16.215082],
+              [138.303217, -16.807604],
+              [138.585164, -16.806622],
+              [139.108543, -17.062679],
+              [139.260575, -17.371601],
+              [140.215245, -17.710805],
+              [140.875463, -17.369069],
+              [141.07111, -16.832047],
+              [141.274095, -16.38887],
+              [141.398222, -15.840532],
+              [141.702183, -15.044921],
+              [141.56338, -14.561333],
+              [141.63552, -14.270395],
+              [141.519869, -13.698078],
+              [141.65092, -12.944688],
+              [141.842691, -12.741548],
+              [141.68699, -12.407614],
+              [141.928629, -11.877466],
+              [142.118488, -11.328042],
+              [142.143706, -11.042737],
+              [142.51526, -10.668186],
+              [142.79731, -11.157355],
+              [142.866763, -11.784707],
+              [143.115947, -11.90563],
+              [143.158632, -12.325656],
+              [143.522124, -12.834358],
+              [143.597158, -13.400422],
+              [143.561811, -13.763656]
+            ]
+          ]
+        ]
+      },
+      "id": "AUS"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Austria" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [16.979667, 48.123497],
+            [16.903754, 47.714866],
+            [16.340584, 47.712902],
+            [16.534268, 47.496171],
+            [16.202298, 46.852386],
+            [16.011664, 46.683611],
+            [15.137092, 46.658703],
+            [14.632472, 46.431817],
+            [13.806475, 46.509306],
+            [12.376485, 46.767559],
+            [12.153088, 47.115393],
+            [11.164828, 46.941579],
+            [11.048556, 46.751359],
+            [10.442701, 46.893546],
+            [9.932448, 46.920728],
+            [9.47997, 47.10281],
+            [9.632932, 47.347601],
+            [9.594226, 47.525058],
+            [9.896068, 47.580197],
+            [10.402084, 47.302488],
+            [10.544504, 47.566399],
+            [11.426414, 47.523766],
+            [12.141357, 47.703083],
+            [12.62076, 47.672388],
+            [12.932627, 47.467646],
+            [13.025851, 47.637584],
+            [12.884103, 48.289146],
+            [13.243357, 48.416115],
+            [13.595946, 48.877172],
+            [14.338898, 48.555305],
+            [14.901447, 48.964402],
+            [15.253416, 49.039074],
+            [16.029647, 48.733899],
+            [16.499283, 48.785808],
+            [16.960288, 48.596982],
+            [16.879983, 48.470013],
+            [16.979667, 48.123497]
+          ]
+        ]
+      },
+      "id": "AUT"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Azerbaijan" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [45.001987, 39.740004],
+              [45.298145, 39.471751],
+              [45.739978, 39.473999],
+              [45.735379, 39.319719],
+              [46.143623, 38.741201],
+              [45.457722, 38.874139],
+              [44.952688, 39.335765],
+              [44.79399, 39.713003],
+              [45.001987, 39.740004]
+            ]
+          ],
+          [
+            [
+              [47.373315, 41.219732],
+              [47.815666, 41.151416],
+              [47.987283, 41.405819],
+              [48.584353, 41.80887],
+              [49.110264, 41.282287],
+              [49.618915, 40.572924],
+              [50.08483, 40.526157],
+              [50.392821, 40.256561],
+              [49.569202, 40.176101],
+              [49.395259, 39.399482],
+              [49.223228, 39.049219],
+              [48.856532, 38.815486],
+              [48.883249, 38.320245],
+              [48.634375, 38.270378],
+              [48.010744, 38.794015],
+              [48.355529, 39.288765],
+              [48.060095, 39.582235],
+              [47.685079, 39.508364],
+              [46.50572, 38.770605],
+              [46.483499, 39.464155],
+              [46.034534, 39.628021],
+              [45.610012, 39.899994],
+              [45.891907, 40.218476],
+              [45.359175, 40.561504],
+              [45.560351, 40.81229],
+              [45.179496, 40.985354],
+              [44.97248, 41.248129],
+              [45.217426, 41.411452],
+              [45.962601, 41.123873],
+              [46.501637, 41.064445],
+              [46.637908, 41.181673],
+              [46.145432, 41.722802],
+              [46.404951, 41.860675],
+              [46.686071, 41.827137],
+              [47.373315, 41.219732]
+            ]
+          ]
+        ]
+      },
+      "id": "AZE"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Burundi" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [29.339998, -4.499983],
+            [29.276384, -3.293907],
+            [29.024926, -2.839258],
+            [29.632176, -2.917858],
+            [29.938359, -2.348487],
+            [30.469696, -2.413858],
+            [30.527677, -2.807632],
+            [30.743013, -3.034285],
+            [30.752263, -3.35933],
+            [30.50556, -3.568567],
+            [30.116333, -4.090138],
+            [29.753512, -4.452389],
+            [29.339998, -4.499983]
+          ]
+        ]
+      },
+      "id": "BDI"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Belgium" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [3.314971, 51.345781],
+            [4.047071, 51.267259],
+            [4.973991, 51.475024],
+            [5.606976, 51.037298],
+            [6.156658, 50.803721],
+            [6.043073, 50.128052],
+            [5.782417, 50.090328],
+            [5.674052, 49.529484],
+            [4.799222, 49.985373],
+            [4.286023, 49.907497],
+            [3.588184, 50.378992],
+            [3.123252, 50.780363],
+            [2.658422, 50.796848],
+            [2.513573, 51.148506],
+            [3.314971, 51.345781]
+          ]
+        ]
+      },
+      "id": "BEL"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Benin" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [2.691702, 6.258817],
+            [1.865241, 6.142158],
+            [1.618951, 6.832038],
+            [1.664478, 9.12859],
+            [1.463043, 9.334624],
+            [1.425061, 9.825395],
+            [1.077795, 10.175607],
+            [0.772336, 10.470808],
+            [0.899563, 10.997339],
+            [1.24347, 11.110511],
+            [1.447178, 11.547719],
+            [1.935986, 11.64115],
+            [2.154474, 11.94015],
+            [2.490164, 12.233052],
+            [2.848643, 12.235636],
+            [3.61118, 11.660167],
+            [3.572216, 11.327939],
+            [3.797112, 10.734746],
+            [3.60007, 10.332186],
+            [3.705438, 10.06321],
+            [3.220352, 9.444153],
+            [2.912308, 9.137608],
+            [2.723793, 8.506845],
+            [2.749063, 7.870734],
+            [2.691702, 6.258817]
+          ]
+        ]
+      },
+      "id": "BEN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Burkina Faso" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-2.827496, 9.642461],
+            [-3.511899, 9.900326],
+            [-3.980449, 9.862344],
+            [-4.330247, 9.610835],
+            [-4.779884, 9.821985],
+            [-4.954653, 10.152714],
+            [-5.404342, 10.370737],
+            [-5.470565, 10.95127],
+            [-5.197843, 11.375146],
+            [-5.220942, 11.713859],
+            [-4.427166, 12.542646],
+            [-4.280405, 13.228444],
+            [-4.006391, 13.472485],
+            [-3.522803, 13.337662],
+            [-3.103707, 13.541267],
+            [-2.967694, 13.79815],
+            [-2.191825, 14.246418],
+            [-2.001035, 14.559008],
+            [-1.066363, 14.973815],
+            [-0.515854, 15.116158],
+            [-0.266257, 14.924309],
+            [0.374892, 14.928908],
+            [0.295646, 14.444235],
+            [0.429928, 13.988733],
+            [0.993046, 13.33575],
+            [1.024103, 12.851826],
+            [2.177108, 12.625018],
+            [2.154474, 11.94015],
+            [1.935986, 11.64115],
+            [1.447178, 11.547719],
+            [1.24347, 11.110511],
+            [0.899563, 10.997339],
+            [0.023803, 11.018682],
+            [-0.438702, 11.098341],
+            [-0.761576, 10.93693],
+            [-1.203358, 11.009819],
+            [-2.940409, 10.96269],
+            [-2.963896, 10.395335],
+            [-2.827496, 9.642461]
+          ]
+        ]
+      },
+      "id": "BFA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Bangladesh" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [92.672721, 22.041239],
+            [92.652257, 21.324048],
+            [92.303234, 21.475485],
+            [92.368554, 20.670883],
+            [92.082886, 21.192195],
+            [92.025215, 21.70157],
+            [91.834891, 22.182936],
+            [91.417087, 22.765019],
+            [90.496006, 22.805017],
+            [90.586957, 22.392794],
+            [90.272971, 21.836368],
+            [89.847467, 22.039146],
+            [89.70205, 21.857116],
+            [89.418863, 21.966179],
+            [89.031961, 22.055708],
+            [88.876312, 22.879146],
+            [88.52977, 23.631142],
+            [88.69994, 24.233715],
+            [88.084422, 24.501657],
+            [88.306373, 24.866079],
+            [88.931554, 25.238692],
+            [88.209789, 25.768066],
+            [88.563049, 26.446526],
+            [89.355094, 26.014407],
+            [89.832481, 25.965082],
+            [89.920693, 25.26975],
+            [90.872211, 25.132601],
+            [91.799596, 25.147432],
+            [92.376202, 24.976693],
+            [91.915093, 24.130414],
+            [91.46773, 24.072639],
+            [91.158963, 23.503527],
+            [91.706475, 22.985264],
+            [91.869928, 23.624346],
+            [92.146035, 23.627499],
+            [92.672721, 22.041239]
+          ]
+        ]
+      },
+      "id": "BGD"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Bulgaria" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [22.65715, 44.234923],
+            [22.944832, 43.823785],
+            [23.332302, 43.897011],
+            [24.100679, 43.741051],
+            [25.569272, 43.688445],
+            [26.065159, 43.943494],
+            [27.2424, 44.175986],
+            [27.970107, 43.812468],
+            [28.558081, 43.707462],
+            [28.039095, 43.293172],
+            [27.673898, 42.577892],
+            [27.99672, 42.007359],
+            [27.135739, 42.141485],
+            [26.117042, 41.826905],
+            [26.106138, 41.328899],
+            [25.197201, 41.234486],
+            [24.492645, 41.583896],
+            [23.692074, 41.309081],
+            [22.952377, 41.337994],
+            [22.881374, 41.999297],
+            [22.380526, 42.32026],
+            [22.545012, 42.461362],
+            [22.436595, 42.580321],
+            [22.604801, 42.898519],
+            [22.986019, 43.211161],
+            [22.500157, 43.642814],
+            [22.410446, 44.008063],
+            [22.65715, 44.234923]
+          ]
+        ]
+      },
+      "id": "BGR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "The Bahamas" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [-77.53466, 23.75975],
+              [-77.78, 23.71],
+              [-78.03405, 24.28615],
+              [-78.40848, 24.57564],
+              [-78.19087, 25.2103],
+              [-77.89, 25.17],
+              [-77.54, 24.34],
+              [-77.53466, 23.75975]
+            ]
+          ],
+          [
+            [
+              [-77.82, 26.58],
+              [-78.91, 26.42],
+              [-78.98, 26.79],
+              [-78.51, 26.87],
+              [-77.85, 26.84],
+              [-77.82, 26.58]
+            ]
+          ],
+          [
+            [
+              [-77, 26.59],
+              [-77.17255, 25.87918],
+              [-77.35641, 26.00735],
+              [-77.34, 26.53],
+              [-77.78802, 26.92516],
+              [-77.79, 27.04],
+              [-77, 26.59]
+            ]
+          ]
+        ]
+      },
+      "id": "BHS"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Bosnia and Herzegovina" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [19.005486, 44.860234],
+            [19.36803, 44.863],
+            [19.11761, 44.42307],
+            [19.59976, 44.03847],
+            [19.454, 43.5681],
+            [19.21852, 43.52384],
+            [19.03165, 43.43253],
+            [18.70648, 43.20011],
+            [18.56, 42.65],
+            [17.674922, 43.028563],
+            [17.297373, 43.446341],
+            [16.916156, 43.667722],
+            [16.456443, 44.04124],
+            [16.23966, 44.351143],
+            [15.750026, 44.818712],
+            [15.959367, 45.233777],
+            [16.318157, 45.004127],
+            [16.534939, 45.211608],
+            [17.002146, 45.233777],
+            [17.861783, 45.06774],
+            [18.553214, 45.08159],
+            [19.005486, 44.860234]
+          ]
+        ]
+      },
+      "id": "BIH"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Belarus" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [23.484128, 53.912498],
+            [24.450684, 53.905702],
+            [25.536354, 54.282423],
+            [25.768433, 54.846963],
+            [26.588279, 55.167176],
+            [26.494331, 55.615107],
+            [27.10246, 55.783314],
+            [28.176709, 56.16913],
+            [29.229513, 55.918344],
+            [29.371572, 55.670091],
+            [29.896294, 55.789463],
+            [30.873909, 55.550976],
+            [30.971836, 55.081548],
+            [30.757534, 54.811771],
+            [31.384472, 54.157056],
+            [31.791424, 53.974639],
+            [31.731273, 53.794029],
+            [32.405599, 53.618045],
+            [32.693643, 53.351421],
+            [32.304519, 53.132726],
+            [31.497644, 53.167427],
+            [31.305201, 53.073996],
+            [31.540018, 52.742052],
+            [31.785998, 52.101678],
+            [30.927549, 52.042353],
+            [30.619454, 51.822806],
+            [30.555117, 51.319503],
+            [30.157364, 51.416138],
+            [29.254938, 51.368234],
+            [28.992835, 51.602044],
+            [28.617613, 51.427714],
+            [28.241615, 51.572227],
+            [27.454066, 51.592303],
+            [26.337959, 51.832289],
+            [25.327788, 51.910656],
+            [24.553106, 51.888461],
+            [24.005078, 51.617444],
+            [23.527071, 51.578454],
+            [23.508002, 52.023647],
+            [23.199494, 52.486977],
+            [23.799199, 52.691099],
+            [23.804935, 53.089731],
+            [23.527536, 53.470122],
+            [23.484128, 53.912498]
+          ]
+        ]
+      },
+      "id": "BLR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Belize" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-89.14308, 17.808319],
+            [-89.150909, 17.955468],
+            [-89.029857, 18.001511],
+            [-88.848344, 17.883198],
+            [-88.490123, 18.486831],
+            [-88.300031, 18.499982],
+            [-88.296336, 18.353273],
+            [-88.106813, 18.348674],
+            [-88.123479, 18.076675],
+            [-88.285355, 17.644143],
+            [-88.197867, 17.489475],
+            [-88.302641, 17.131694],
+            [-88.239518, 17.036066],
+            [-88.355428, 16.530774],
+            [-88.551825, 16.265467],
+            [-88.732434, 16.233635],
+            [-88.930613, 15.887273],
+            [-89.229122, 15.886938],
+            [-89.150806, 17.015577],
+            [-89.14308, 17.808319]
+          ]
+        ]
+      },
+      "id": "BLZ"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Bolivia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-62.846468, -22.034985],
+            [-63.986838, -21.993644],
+            [-64.377021, -22.798091],
+            [-64.964892, -22.075862],
+            [-66.273339, -21.83231],
+            [-67.106674, -22.735925],
+            [-67.82818, -22.872919],
+            [-68.219913, -21.494347],
+            [-68.757167, -20.372658],
+            [-68.442225, -19.405068],
+            [-68.966818, -18.981683],
+            [-69.100247, -18.260125],
+            [-69.590424, -17.580012],
+            [-68.959635, -16.500698],
+            [-69.389764, -15.660129],
+            [-69.160347, -15.323974],
+            [-69.339535, -14.953195],
+            [-68.948887, -14.453639],
+            [-68.929224, -13.602684],
+            [-68.88008, -12.899729],
+            [-68.66508, -12.5613],
+            [-69.529678, -10.951734],
+            [-68.786158, -11.03638],
+            [-68.271254, -11.014521],
+            [-68.048192, -10.712059],
+            [-67.173801, -10.306812],
+            [-66.646908, -9.931331],
+            [-65.338435, -9.761988],
+            [-65.444837, -10.511451],
+            [-65.321899, -10.895872],
+            [-65.402281, -11.56627],
+            [-64.316353, -12.461978],
+            [-63.196499, -12.627033],
+            [-62.80306, -13.000653],
+            [-62.127081, -13.198781],
+            [-61.713204, -13.489202],
+            [-61.084121, -13.479384],
+            [-60.503304, -13.775955],
+            [-60.459198, -14.354007],
+            [-60.264326, -14.645979],
+            [-60.251149, -15.077219],
+            [-60.542966, -15.09391],
+            [-60.15839, -16.258284],
+            [-58.24122, -16.299573],
+            [-58.388058, -16.877109],
+            [-58.280804, -17.27171],
+            [-57.734558, -17.552468],
+            [-57.498371, -18.174188],
+            [-57.676009, -18.96184],
+            [-57.949997, -19.400004],
+            [-57.853802, -19.969995],
+            [-58.166392, -20.176701],
+            [-58.183471, -19.868399],
+            [-59.115042, -19.356906],
+            [-60.043565, -19.342747],
+            [-61.786326, -19.633737],
+            [-62.265961, -20.513735],
+            [-62.291179, -21.051635],
+            [-62.685057, -22.249029],
+            [-62.846468, -22.034985]
+          ]
+        ]
+      },
+      "id": "BOL"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Brazil" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-57.625133, -30.216295],
+            [-56.2909, -28.852761],
+            [-55.162286, -27.881915],
+            [-54.490725, -27.474757],
+            [-53.648735, -26.923473],
+            [-53.628349, -26.124865],
+            [-54.13005, -25.547639],
+            [-54.625291, -25.739255],
+            [-54.428946, -25.162185],
+            [-54.293476, -24.5708],
+            [-54.29296, -24.021014],
+            [-54.652834, -23.839578],
+            [-55.027902, -24.001274],
+            [-55.400747, -23.956935],
+            [-55.517639, -23.571998],
+            [-55.610683, -22.655619],
+            [-55.797958, -22.35693],
+            [-56.473317, -22.0863],
+            [-56.88151, -22.282154],
+            [-57.937156, -22.090176],
+            [-57.870674, -20.732688],
+            [-58.166392, -20.176701],
+            [-57.853802, -19.969995],
+            [-57.949997, -19.400004],
+            [-57.676009, -18.96184],
+            [-57.498371, -18.174188],
+            [-57.734558, -17.552468],
+            [-58.280804, -17.27171],
+            [-58.388058, -16.877109],
+            [-58.24122, -16.299573],
+            [-60.15839, -16.258284],
+            [-60.542966, -15.09391],
+            [-60.251149, -15.077219],
+            [-60.264326, -14.645979],
+            [-60.459198, -14.354007],
+            [-60.503304, -13.775955],
+            [-61.084121, -13.479384],
+            [-61.713204, -13.489202],
+            [-62.127081, -13.198781],
+            [-62.80306, -13.000653],
+            [-63.196499, -12.627033],
+            [-64.316353, -12.461978],
+            [-65.402281, -11.56627],
+            [-65.321899, -10.895872],
+            [-65.444837, -10.511451],
+            [-65.338435, -9.761988],
+            [-66.646908, -9.931331],
+            [-67.173801, -10.306812],
+            [-68.048192, -10.712059],
+            [-68.271254, -11.014521],
+            [-68.786158, -11.03638],
+            [-69.529678, -10.951734],
+            [-70.093752, -11.123972],
+            [-70.548686, -11.009147],
+            [-70.481894, -9.490118],
+            [-71.302412, -10.079436],
+            [-72.184891, -10.053598],
+            [-72.563033, -9.520194],
+            [-73.226713, -9.462213],
+            [-73.015383, -9.032833],
+            [-73.571059, -8.424447],
+            [-73.987235, -7.52383],
+            [-73.723401, -7.340999],
+            [-73.724487, -6.918595],
+            [-73.120027, -6.629931],
+            [-73.219711, -6.089189],
+            [-72.964507, -5.741251],
+            [-72.891928, -5.274561],
+            [-71.748406, -4.593983],
+            [-70.928843, -4.401591],
+            [-70.794769, -4.251265],
+            [-69.893635, -4.298187],
+            [-69.444102, -1.556287],
+            [-69.420486, -1.122619],
+            [-69.577065, -0.549992],
+            [-70.020656, -0.185156],
+            [-70.015566, 0.541414],
+            [-69.452396, 0.706159],
+            [-69.252434, 0.602651],
+            [-69.218638, 0.985677],
+            [-69.804597, 1.089081],
+            [-69.816973, 1.714805],
+            [-67.868565, 1.692455],
+            [-67.53781, 2.037163],
+            [-67.259998, 1.719999],
+            [-67.065048, 1.130112],
+            [-66.876326, 1.253361],
+            [-66.325765, 0.724452],
+            [-65.548267, 0.789254],
+            [-65.354713, 1.095282],
+            [-64.611012, 1.328731],
+            [-64.199306, 1.492855],
+            [-64.083085, 1.916369],
+            [-63.368788, 2.2009],
+            [-63.422867, 2.411068],
+            [-64.269999, 2.497006],
+            [-64.408828, 3.126786],
+            [-64.368494, 3.79721],
+            [-64.816064, 4.056445],
+            [-64.628659, 4.148481],
+            [-63.888343, 4.02053],
+            [-63.093198, 3.770571],
+            [-62.804533, 4.006965],
+            [-62.08543, 4.162124],
+            [-60.966893, 4.536468],
+            [-60.601179, 4.918098],
+            [-60.733574, 5.200277],
+            [-60.213683, 5.244486],
+            [-59.980959, 5.014061],
+            [-60.111002, 4.574967],
+            [-59.767406, 4.423503],
+            [-59.53804, 3.958803],
+            [-59.815413, 3.606499],
+            [-59.974525, 2.755233],
+            [-59.718546, 2.24963],
+            [-59.646044, 1.786894],
+            [-59.030862, 1.317698],
+            [-58.540013, 1.268088],
+            [-58.429477, 1.463942],
+            [-58.11345, 1.507195],
+            [-57.660971, 1.682585],
+            [-57.335823, 1.948538],
+            [-56.782704, 1.863711],
+            [-56.539386, 1.899523],
+            [-55.995698, 1.817667],
+            [-55.9056, 2.021996],
+            [-56.073342, 2.220795],
+            [-55.973322, 2.510364],
+            [-55.569755, 2.421506],
+            [-55.097587, 2.523748],
+            [-54.524754, 2.311849],
+            [-54.088063, 2.105557],
+            [-53.778521, 2.376703],
+            [-53.554839, 2.334897],
+            [-53.418465, 2.053389],
+            [-52.939657, 2.124858],
+            [-52.556425, 2.504705],
+            [-52.249338, 3.241094],
+            [-51.657797, 4.156232],
+            [-51.317146, 4.203491],
+            [-51.069771, 3.650398],
+            [-50.508875, 1.901564],
+            [-49.974076, 1.736483],
+            [-49.947101, 1.04619],
+            [-50.699251, 0.222984],
+            [-50.388211, -0.078445],
+            [-48.620567, -0.235489],
+            [-48.584497, -1.237805],
+            [-47.824956, -0.581618],
+            [-46.566584, -0.941028],
+            [-44.905703, -1.55174],
+            [-44.417619, -2.13775],
+            [-44.581589, -2.691308],
+            [-43.418791, -2.38311],
+            [-41.472657, -2.912018],
+            [-39.978665, -2.873054],
+            [-38.500383, -3.700652],
+            [-37.223252, -4.820946],
+            [-36.452937, -5.109404],
+            [-35.597796, -5.149504],
+            [-35.235389, -5.464937],
+            [-34.89603, -6.738193],
+            [-34.729993, -7.343221],
+            [-35.128212, -8.996401],
+            [-35.636967, -9.649282],
+            [-37.046519, -11.040721],
+            [-37.683612, -12.171195],
+            [-38.423877, -13.038119],
+            [-38.673887, -13.057652],
+            [-38.953276, -13.79337],
+            [-38.882298, -15.667054],
+            [-39.161092, -17.208407],
+            [-39.267339, -17.867746],
+            [-39.583521, -18.262296],
+            [-39.760823, -19.599113],
+            [-40.774741, -20.904512],
+            [-40.944756, -21.937317],
+            [-41.754164, -22.370676],
+            [-41.988284, -22.97007],
+            [-43.074704, -22.967693],
+            [-44.647812, -23.351959],
+            [-45.352136, -23.796842],
+            [-46.472093, -24.088969],
+            [-47.648972, -24.885199],
+            [-48.495458, -25.877025],
+            [-48.641005, -26.623698],
+            [-48.474736, -27.175912],
+            [-48.66152, -28.186135],
+            [-48.888457, -28.674115],
+            [-49.587329, -29.224469],
+            [-50.696874, -30.984465],
+            [-51.576226, -31.777698],
+            [-52.256081, -32.24537],
+            [-52.7121, -33.196578],
+            [-53.373662, -33.768378],
+            [-53.650544, -33.202004],
+            [-53.209589, -32.727666],
+            [-53.787952, -32.047243],
+            [-54.572452, -31.494511],
+            [-55.60151, -30.853879],
+            [-55.973245, -30.883076],
+            [-56.976026, -30.109686],
+            [-57.625133, -30.216295]
+          ]
+        ]
+      },
+      "id": "BRA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Brunei" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [114.204017, 4.525874],
+            [114.599961, 4.900011],
+            [115.45071, 5.44773],
+            [115.4057, 4.955228],
+            [115.347461, 4.316636],
+            [114.869557, 4.348314],
+            [114.659596, 4.007637],
+            [114.204017, 4.525874]
+          ]
+        ]
+      },
+      "id": "BRN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Bhutan" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [91.696657, 27.771742],
+            [92.103712, 27.452614],
+            [92.033484, 26.83831],
+            [91.217513, 26.808648],
+            [90.373275, 26.875724],
+            [89.744528, 26.719403],
+            [88.835643, 27.098966],
+            [88.814248, 27.299316],
+            [89.47581, 28.042759],
+            [90.015829, 28.296439],
+            [90.730514, 28.064954],
+            [91.258854, 28.040614],
+            [91.696657, 27.771742]
+          ]
+        ]
+      },
+      "id": "BTN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Botswana" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [25.649163, -18.536026],
+            [25.850391, -18.714413],
+            [26.164791, -19.293086],
+            [27.296505, -20.39152],
+            [27.724747, -20.499059],
+            [27.727228, -20.851802],
+            [28.02137, -21.485975],
+            [28.794656, -21.639454],
+            [29.432188, -22.091313],
+            [28.017236, -22.827754],
+            [27.11941, -23.574323],
+            [26.786407, -24.240691],
+            [26.485753, -24.616327],
+            [25.941652, -24.696373],
+            [25.765849, -25.174845],
+            [25.664666, -25.486816],
+            [25.025171, -25.71967],
+            [24.211267, -25.670216],
+            [23.73357, -25.390129],
+            [23.312097, -25.26869],
+            [22.824271, -25.500459],
+            [22.579532, -25.979448],
+            [22.105969, -26.280256],
+            [21.605896, -26.726534],
+            [20.889609, -26.828543],
+            [20.66647, -26.477453],
+            [20.758609, -25.868136],
+            [20.165726, -24.917962],
+            [19.895768, -24.76779],
+            [19.895458, -21.849157],
+            [20.881134, -21.814327],
+            [20.910641, -18.252219],
+            [21.65504, -18.219146],
+            [23.196858, -17.869038],
+            [23.579006, -18.281261],
+            [24.217365, -17.889347],
+            [24.520705, -17.887125],
+            [25.084443, -17.661816],
+            [25.264226, -17.73654],
+            [25.649163, -18.536026]
+          ]
+        ]
+      },
+      "id": "BWA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Central African Republic" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [15.27946, 7.421925],
+            [16.106232, 7.497088],
+            [16.290562, 7.754307],
+            [16.456185, 7.734774],
+            [16.705988, 7.508328],
+            [17.96493, 7.890914],
+            [18.389555, 8.281304],
+            [18.911022, 8.630895],
+            [18.81201, 8.982915],
+            [19.094008, 9.074847],
+            [20.059685, 9.012706],
+            [21.000868, 9.475985],
+            [21.723822, 10.567056],
+            [22.231129, 10.971889],
+            [22.864165, 11.142395],
+            [22.977544, 10.714463],
+            [23.554304, 10.089255],
+            [23.55725, 9.681218],
+            [23.394779, 9.265068],
+            [23.459013, 8.954286],
+            [23.805813, 8.666319],
+            [24.567369, 8.229188],
+            [25.114932, 7.825104],
+            [25.124131, 7.500085],
+            [25.796648, 6.979316],
+            [26.213418, 6.546603],
+            [26.465909, 5.946717],
+            [27.213409, 5.550953],
+            [27.374226, 5.233944],
+            [27.044065, 5.127853],
+            [26.402761, 5.150875],
+            [25.650455, 5.256088],
+            [25.278798, 5.170408],
+            [25.128833, 4.927245],
+            [24.805029, 4.897247],
+            [24.410531, 5.108784],
+            [23.297214, 4.609693],
+            [22.84148, 4.710126],
+            [22.704124, 4.633051],
+            [22.405124, 4.02916],
+            [21.659123, 4.224342],
+            [20.927591, 4.322786],
+            [20.290679, 4.691678],
+            [19.467784, 5.031528],
+            [18.932312, 4.709506],
+            [18.542982, 4.201785],
+            [18.453065, 3.504386],
+            [17.8099, 3.560196],
+            [17.133042, 3.728197],
+            [16.537058, 3.198255],
+            [16.012852, 2.26764],
+            [15.907381, 2.557389],
+            [15.862732, 3.013537],
+            [15.405396, 3.335301],
+            [15.03622, 3.851367],
+            [14.950953, 4.210389],
+            [14.478372, 4.732605],
+            [14.558936, 5.030598],
+            [14.459407, 5.451761],
+            [14.53656, 6.226959],
+            [14.776545, 6.408498],
+            [15.27946, 7.421925]
+          ]
+        ]
+      },
+      "id": "CAF"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Canada" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [-63.6645, 46.55001],
+              [-62.9393, 46.41587],
+              [-62.01208, 46.44314],
+              [-62.50391, 46.03339],
+              [-62.87433, 45.96818],
+              [-64.1428, 46.39265],
+              [-64.39261, 46.72747],
+              [-64.01486, 47.03601],
+              [-63.6645, 46.55001]
+            ]
+          ],
+          [
+            [
+              [-61.806305, 49.10506],
+              [-62.29318, 49.08717],
+              [-63.58926, 49.40069],
+              [-64.51912, 49.87304],
+              [-64.17322, 49.95718],
+              [-62.85829, 49.70641],
+              [-61.835585, 49.28855],
+              [-61.806305, 49.10506]
+            ]
+          ],
+          [
+            [
+              [-123.510002, 48.510011],
+              [-124.012891, 48.370846],
+              [-125.655013, 48.825005],
+              [-125.954994, 49.179996],
+              [-126.850004, 49.53],
+              [-127.029993, 49.814996],
+              [-128.059336, 49.994959],
+              [-128.444584, 50.539138],
+              [-128.358414, 50.770648],
+              [-127.308581, 50.552574],
+              [-126.695001, 50.400903],
+              [-125.755007, 50.295018],
+              [-125.415002, 49.950001],
+              [-124.920768, 49.475275],
+              [-123.922509, 49.062484],
+              [-123.510002, 48.510011]
+            ]
+          ],
+          [
+            [
+              [-56.134036, 50.68701],
+              [-56.795882, 49.812309],
+              [-56.143105, 50.150117],
+              [-55.471492, 49.935815],
+              [-55.822401, 49.587129],
+              [-54.935143, 49.313011],
+              [-54.473775, 49.556691],
+              [-53.476549, 49.249139],
+              [-53.786014, 48.516781],
+              [-53.086134, 48.687804],
+              [-52.958648, 48.157164],
+              [-52.648099, 47.535548],
+              [-53.069158, 46.655499],
+              [-53.521456, 46.618292],
+              [-54.178936, 46.807066],
+              [-53.961869, 47.625207],
+              [-54.240482, 47.752279],
+              [-55.400773, 46.884994],
+              [-55.997481, 46.91972],
+              [-55.291219, 47.389562],
+              [-56.250799, 47.632545],
+              [-57.325229, 47.572807],
+              [-59.266015, 47.603348],
+              [-59.419494, 47.899454],
+              [-58.796586, 48.251525],
+              [-59.231625, 48.523188],
+              [-58.391805, 49.125581],
+              [-57.35869, 50.718274],
+              [-56.73865, 51.287438],
+              [-55.870977, 51.632094],
+              [-55.406974, 51.588273],
+              [-55.600218, 51.317075],
+              [-56.134036, 50.68701]
+            ]
+          ],
+          [
+            [
+              [-132.710008, 54.040009],
+              [-132.710009, 54.040009],
+              [-132.710008, 54.040009],
+              [-132.710008, 54.040009],
+              [-131.74999, 54.120004],
+              [-132.04948, 52.984621],
+              [-131.179043, 52.180433],
+              [-131.57783, 52.182371],
+              [-132.180428, 52.639707],
+              [-132.549992, 53.100015],
+              [-133.054611, 53.411469],
+              [-133.239664, 53.85108],
+              [-133.180004, 54.169975],
+              [-132.710008, 54.040009]
+            ]
+          ],
+          [
+            [
+              [-79.26582, 62.158675],
+              [-79.65752, 61.63308],
+              [-80.09956, 61.7181],
+              [-80.36215, 62.01649],
+              [-80.315395, 62.085565],
+              [-79.92939, 62.3856],
+              [-79.52002, 62.36371],
+              [-79.26582, 62.158675]
+            ]
+          ],
+          [
+            [
+              [-81.89825, 62.7108],
+              [-83.06857, 62.15922],
+              [-83.77462, 62.18231],
+              [-83.99367, 62.4528],
+              [-83.25048, 62.91409],
+              [-81.87699, 62.90458],
+              [-81.89825, 62.7108]
+            ]
+          ],
+          [
+            [
+              [-85.161308, 65.657285],
+              [-84.975764, 65.217518],
+              [-84.464012, 65.371772],
+              [-83.882626, 65.109618],
+              [-82.787577, 64.766693],
+              [-81.642014, 64.455136],
+              [-81.55344, 63.979609],
+              [-80.817361, 64.057486],
+              [-80.103451, 63.725981],
+              [-80.99102, 63.411246],
+              [-82.547178, 63.651722],
+              [-83.108798, 64.101876],
+              [-84.100417, 63.569712],
+              [-85.523405, 63.052379],
+              [-85.866769, 63.637253],
+              [-87.221983, 63.541238],
+              [-86.35276, 64.035833],
+              [-86.224886, 64.822917],
+              [-85.883848, 65.738778],
+              [-85.161308, 65.657285]
+            ]
+          ],
+          [
+            [
+              [-75.86588, 67.14886],
+              [-76.98687, 67.09873],
+              [-77.2364, 67.58809],
+              [-76.81166, 68.14856],
+              [-75.89521, 68.28721],
+              [-75.1145, 68.01036],
+              [-75.10333, 67.58202],
+              [-75.21597, 67.44425],
+              [-75.86588, 67.14886]
+            ]
+          ],
+          [
+            [
+              [-95.647681, 69.10769],
+              [-96.269521, 68.75704],
+              [-97.617401, 69.06003],
+              [-98.431801, 68.9507],
+              [-99.797401, 69.40003],
+              [-98.917401, 69.71003],
+              [-98.218261, 70.14354],
+              [-97.157401, 69.86003],
+              [-96.557401, 69.68003],
+              [-96.257401, 69.49003],
+              [-95.647681, 69.10769]
+            ]
+          ],
+          [
+            [
+              [-90.5471, 69.49766],
+              [-90.55151, 68.47499],
+              [-89.21515, 69.25873],
+              [-88.01966, 68.61508],
+              [-88.31749, 67.87338],
+              [-87.35017, 67.19872],
+              [-86.30607, 67.92146],
+              [-85.57664, 68.78456],
+              [-85.52197, 69.88211],
+              [-84.10081, 69.80539],
+              [-82.62258, 69.65826],
+              [-81.28043, 69.16202],
+              [-81.2202, 68.66567],
+              [-81.96436, 68.13253],
+              [-81.25928, 67.59716],
+              [-81.38653, 67.11078],
+              [-83.34456, 66.41154],
+              [-84.73542, 66.2573],
+              [-85.76943, 66.55833],
+              [-86.0676, 66.05625],
+              [-87.03143, 65.21297],
+              [-87.32324, 64.77563],
+              [-88.48296, 64.09897],
+              [-89.91444, 64.03273],
+              [-90.70398, 63.61017],
+              [-90.77004, 62.96021],
+              [-91.93342, 62.83508],
+              [-93.15698, 62.02469],
+              [-94.24153, 60.89865],
+              [-94.62931, 60.11021],
+              [-94.6846, 58.94882],
+              [-93.21502, 58.78212],
+              [-92.76462, 57.84571],
+              [-92.29703, 57.08709],
+              [-90.89769, 57.28468],
+              [-89.03953, 56.85172],
+              [-88.03978, 56.47162],
+              [-87.32421, 55.99914],
+              [-86.07121, 55.72383],
+              [-85.01181, 55.3026],
+              [-83.36055, 55.24489],
+              [-82.27285, 55.14832],
+              [-82.4362, 54.28227],
+              [-82.12502, 53.27703],
+              [-81.40075, 52.15788],
+              [-79.91289, 51.20842],
+              [-79.14301, 51.53393],
+              [-78.60191, 52.56208],
+              [-79.12421, 54.14145],
+              [-79.82958, 54.66772],
+              [-78.22874, 55.13645],
+              [-77.0956, 55.83741],
+              [-76.54137, 56.53423],
+              [-76.62319, 57.20263],
+              [-77.30226, 58.05209],
+              [-78.51688, 58.80458],
+              [-77.33676, 59.85261],
+              [-77.77272, 60.75788],
+              [-78.10687, 62.31964],
+              [-77.41067, 62.55053],
+              [-75.69621, 62.2784],
+              [-74.6682, 62.18111],
+              [-73.83988, 62.4438],
+              [-72.90853, 62.10507],
+              [-71.67708, 61.52535],
+              [-71.37369, 61.13717],
+              [-69.59042, 61.06141],
+              [-69.62033, 60.22125],
+              [-69.2879, 58.95736],
+              [-68.37455, 58.80106],
+              [-67.64976, 58.21206],
+              [-66.20178, 58.76731],
+              [-65.24517, 59.87071],
+              [-64.58352, 60.33558],
+              [-63.80475, 59.4426],
+              [-62.50236, 58.16708],
+              [-61.39655, 56.96745],
+              [-61.79866, 56.33945],
+              [-60.46853, 55.77548],
+              [-59.56962, 55.20407],
+              [-57.97508, 54.94549],
+              [-57.3332, 54.6265],
+              [-56.93689, 53.78032],
+              [-56.15811, 53.64749],
+              [-55.75632, 53.27036],
+              [-55.68338, 52.14664],
+              [-56.40916, 51.7707],
+              [-57.12691, 51.41972],
+              [-58.77482, 51.0643],
+              [-60.03309, 50.24277],
+              [-61.72366, 50.08046],
+              [-63.86251, 50.29099],
+              [-65.36331, 50.2982],
+              [-66.39905, 50.22897],
+              [-67.23631, 49.51156],
+              [-68.51114, 49.06836],
+              [-69.95362, 47.74488],
+              [-71.10458, 46.82171],
+              [-70.25522, 46.98606],
+              [-68.65, 48.3],
+              [-66.55243, 49.1331],
+              [-65.05626, 49.23278],
+              [-64.17099, 48.74248],
+              [-65.11545, 48.07085],
+              [-64.79854, 46.99297],
+              [-64.47219, 46.23849],
+              [-63.17329, 45.73902],
+              [-61.52072, 45.88377],
+              [-60.51815, 47.00793],
+              [-60.4486, 46.28264],
+              [-59.80287, 45.9204],
+              [-61.03988, 45.26525],
+              [-63.25471, 44.67014],
+              [-64.24656, 44.26553],
+              [-65.36406, 43.54523],
+              [-66.1234, 43.61867],
+              [-66.16173, 44.46512],
+              [-64.42549, 45.29204],
+              [-66.02605, 45.25931],
+              [-67.13741, 45.13753],
+              [-67.79134, 45.70281],
+              [-67.79046, 47.06636],
+              [-68.23444, 47.35486],
+              [-68.905, 47.185],
+              [-69.237216, 47.447781],
+              [-69.99997, 46.69307],
+              [-70.305, 45.915],
+              [-70.66, 45.46],
+              [-71.08482, 45.30524],
+              [-71.405, 45.255],
+              [-71.50506, 45.0082],
+              [-73.34783, 45.00738],
+              [-74.867, 45.00048],
+              [-75.31821, 44.81645],
+              [-76.375, 44.09631],
+              [-76.5, 44.018459],
+              [-76.820034, 43.628784],
+              [-77.737885, 43.629056],
+              [-78.72028, 43.625089],
+              [-79.171674, 43.466339],
+              [-79.01, 43.27],
+              [-78.92, 42.965],
+              [-78.939362, 42.863611],
+              [-80.247448, 42.3662],
+              [-81.277747, 42.209026],
+              [-82.439278, 41.675105],
+              [-82.690089, 41.675105],
+              [-83.02981, 41.832796],
+              [-83.142, 41.975681],
+              [-83.12, 42.08],
+              [-82.9, 42.43],
+              [-82.43, 42.98],
+              [-82.137642, 43.571088],
+              [-82.337763, 44.44],
+              [-82.550925, 45.347517],
+              [-83.592851, 45.816894],
+              [-83.469551, 45.994686],
+              [-83.616131, 46.116927],
+              [-83.890765, 46.116927],
+              [-84.091851, 46.275419],
+              [-84.14212, 46.512226],
+              [-84.3367, 46.40877],
+              [-84.6049, 46.4396],
+              [-84.543749, 46.538684],
+              [-84.779238, 46.637102],
+              [-84.87608, 46.900083],
+              [-85.652363, 47.220219],
+              [-86.461991, 47.553338],
+              [-87.439793, 47.94],
+              [-88.378114, 48.302918],
+              [-89.272917, 48.019808],
+              [-89.6, 48.01],
+              [-90.83, 48.27],
+              [-91.64, 48.14],
+              [-92.61, 48.45],
+              [-93.63087, 48.60926],
+              [-94.32914, 48.67074],
+              [-94.64, 48.84],
+              [-94.81758, 49.38905],
+              [-95.15609, 49.38425],
+              [-95.15907, 49],
+              [-97.22872, 49.0007],
+              [-100.65, 49],
+              [-104.04826, 48.99986],
+              [-107.05, 49],
+              [-110.05, 49],
+              [-113, 49],
+              [-116.04818, 49],
+              [-117.03121, 49],
+              [-120, 49],
+              [-122.84, 49],
+              [-122.97421, 49.002538],
+              [-124.91024, 49.98456],
+              [-125.62461, 50.41656],
+              [-127.43561, 50.83061],
+              [-127.99276, 51.71583],
+              [-127.85032, 52.32961],
+              [-129.12979, 52.75538],
+              [-129.30523, 53.56159],
+              [-130.51497, 54.28757],
+              [-130.53611, 54.80278],
+              [-129.98, 55.285],
+              [-130.00778, 55.91583],
+              [-131.70781, 56.55212],
+              [-132.73042, 57.69289],
+              [-133.35556, 58.41028],
+              [-134.27111, 58.86111],
+              [-134.945, 59.27056],
+              [-135.47583, 59.78778],
+              [-136.47972, 59.46389],
+              [-137.4525, 58.905],
+              [-138.34089, 59.56211],
+              [-139.039, 60],
+              [-140.013, 60.27682],
+              [-140.99778, 60.30639],
+              [-140.9925, 66.00003],
+              [-140.986, 69.712],
+              [-139.12052, 69.47102],
+              [-137.54636, 68.99002],
+              [-136.50358, 68.89804],
+              [-135.62576, 69.31512],
+              [-134.41464, 69.62743],
+              [-132.92925, 69.50534],
+              [-131.43136, 69.94451],
+              [-129.79471, 70.19369],
+              [-129.10773, 69.77927],
+              [-128.36156, 70.01286],
+              [-128.13817, 70.48384],
+              [-127.44712, 70.37721],
+              [-125.75632, 69.48058],
+              [-124.42483, 70.1584],
+              [-124.28968, 69.39969],
+              [-123.06108, 69.56372],
+              [-122.6835, 69.85553],
+              [-121.47226, 69.79778],
+              [-119.94288, 69.37786],
+              [-117.60268, 69.01128],
+              [-116.22643, 68.84151],
+              [-115.2469, 68.90591],
+              [-113.89794, 68.3989],
+              [-115.30489, 67.90261],
+              [-113.49727, 67.68815],
+              [-110.798, 67.80612],
+              [-109.94619, 67.98104],
+              [-108.8802, 67.38144],
+              [-107.79239, 67.88736],
+              [-108.81299, 68.31164],
+              [-108.16721, 68.65392],
+              [-106.95, 68.7],
+              [-106.15, 68.8],
+              [-105.34282, 68.56122],
+              [-104.33791, 68.018],
+              [-103.22115, 68.09775],
+              [-101.45433, 67.64689],
+              [-99.90195, 67.80566],
+              [-98.4432, 67.78165],
+              [-98.5586, 68.40394],
+              [-97.66948, 68.57864],
+              [-96.11991, 68.23939],
+              [-96.12588, 67.29338],
+              [-95.48943, 68.0907],
+              [-94.685, 68.06383],
+              [-94.23282, 69.06903],
+              [-95.30408, 69.68571],
+              [-96.47131, 70.08976],
+              [-96.39115, 71.19482],
+              [-95.2088, 71.92053],
+              [-93.88997, 71.76015],
+              [-92.87818, 71.31869],
+              [-91.51964, 70.19129],
+              [-92.40692, 69.69997],
+              [-90.5471, 69.49766]
+            ]
+          ],
+          [
+            [
+              [-114.16717, 73.12145],
+              [-114.66634, 72.65277],
+              [-112.44102, 72.9554],
+              [-111.05039, 72.4504],
+              [-109.92035, 72.96113],
+              [-109.00654, 72.63335],
+              [-108.18835, 71.65089],
+              [-107.68599, 72.06548],
+              [-108.39639, 73.08953],
+              [-107.51645, 73.23598],
+              [-106.52259, 73.07601],
+              [-105.40246, 72.67259],
+              [-104.77484, 71.6984],
+              [-104.46476, 70.99297],
+              [-102.78537, 70.49776],
+              [-100.98078, 70.02432],
+              [-101.08929, 69.58447],
+              [-102.73116, 69.50402],
+              [-102.09329, 69.11962],
+              [-102.43024, 68.75282],
+              [-104.24, 68.91],
+              [-105.96, 69.18],
+              [-107.12254, 69.11922],
+              [-109, 68.78],
+              [-111.534149, 68.630059],
+              [-113.3132, 68.53554],
+              [-113.85496, 69.00744],
+              [-115.22, 69.28],
+              [-116.10794, 69.16821],
+              [-117.34, 69.96],
+              [-116.67473, 70.06655],
+              [-115.13112, 70.2373],
+              [-113.72141, 70.19237],
+              [-112.4161, 70.36638],
+              [-114.35, 70.6],
+              [-116.48684, 70.52045],
+              [-117.9048, 70.54056],
+              [-118.43238, 70.9092],
+              [-116.11311, 71.30918],
+              [-117.65568, 71.2952],
+              [-119.40199, 71.55859],
+              [-118.56267, 72.30785],
+              [-117.86642, 72.70594],
+              [-115.18909, 73.31459],
+              [-114.16717, 73.12145]
+            ]
+          ],
+          [
+            [
+              [-104.5, 73.42],
+              [-105.38, 72.76],
+              [-106.94, 73.46],
+              [-106.6, 73.6],
+              [-105.26, 73.64],
+              [-104.5, 73.42]
+            ]
+          ],
+          [
+            [
+              [-76.34, 73.102685],
+              [-76.251404, 72.826385],
+              [-77.314438, 72.855545],
+              [-78.39167, 72.876656],
+              [-79.486252, 72.742203],
+              [-79.775833, 72.802902],
+              [-80.876099, 73.333183],
+              [-80.833885, 73.693184],
+              [-80.353058, 73.75972],
+              [-78.064438, 73.651932],
+              [-76.34, 73.102685]
+            ]
+          ],
+          [
+            [
+              [-86.562179, 73.157447],
+              [-85.774371, 72.534126],
+              [-84.850112, 73.340278],
+              [-82.31559, 73.750951],
+              [-80.600088, 72.716544],
+              [-80.748942, 72.061907],
+              [-78.770639, 72.352173],
+              [-77.824624, 72.749617],
+              [-75.605845, 72.243678],
+              [-74.228616, 71.767144],
+              [-74.099141, 71.33084],
+              [-72.242226, 71.556925],
+              [-71.200015, 70.920013],
+              [-68.786054, 70.525024],
+              [-67.91497, 70.121948],
+              [-66.969033, 69.186087],
+              [-68.805123, 68.720198],
+              [-66.449866, 68.067163],
+              [-64.862314, 67.847539],
+              [-63.424934, 66.928473],
+              [-61.851981, 66.862121],
+              [-62.163177, 66.160251],
+              [-63.918444, 64.998669],
+              [-65.14886, 65.426033],
+              [-66.721219, 66.388041],
+              [-68.015016, 66.262726],
+              [-68.141287, 65.689789],
+              [-67.089646, 65.108455],
+              [-65.73208, 64.648406],
+              [-65.320168, 64.382737],
+              [-64.669406, 63.392927],
+              [-65.013804, 62.674185],
+              [-66.275045, 62.945099],
+              [-68.783186, 63.74567],
+              [-67.369681, 62.883966],
+              [-66.328297, 62.280075],
+              [-66.165568, 61.930897],
+              [-68.877367, 62.330149],
+              [-71.023437, 62.910708],
+              [-72.235379, 63.397836],
+              [-71.886278, 63.679989],
+              [-73.378306, 64.193963],
+              [-74.834419, 64.679076],
+              [-74.818503, 64.389093],
+              [-77.70998, 64.229542],
+              [-78.555949, 64.572906],
+              [-77.897281, 65.309192],
+              [-76.018274, 65.326969],
+              [-73.959795, 65.454765],
+              [-74.293883, 65.811771],
+              [-73.944912, 66.310578],
+              [-72.651167, 67.284576],
+              [-72.92606, 67.726926],
+              [-73.311618, 68.069437],
+              [-74.843307, 68.554627],
+              [-76.869101, 68.894736],
+              [-76.228649, 69.147769],
+              [-77.28737, 69.76954],
+              [-78.168634, 69.826488],
+              [-78.957242, 70.16688],
+              [-79.492455, 69.871808],
+              [-81.305471, 69.743185],
+              [-84.944706, 69.966634],
+              [-87.060003, 70.260001],
+              [-88.681713, 70.410741],
+              [-89.51342, 70.762038],
+              [-88.467721, 71.218186],
+              [-89.888151, 71.222552],
+              [-90.20516, 72.235074],
+              [-89.436577, 73.129464],
+              [-88.408242, 73.537889],
+              [-85.826151, 73.803816],
+              [-86.562179, 73.157447]
+            ]
+          ],
+          [
+            [
+              [-100.35642, 73.84389],
+              [-99.16387, 73.63339],
+              [-97.38, 73.76],
+              [-97.12, 73.47],
+              [-98.05359, 72.99052],
+              [-96.54, 72.56],
+              [-96.72, 71.66],
+              [-98.35966, 71.27285],
+              [-99.32286, 71.35639],
+              [-100.01482, 71.73827],
+              [-102.5, 72.51],
+              [-102.48, 72.83],
+              [-100.43836, 72.70588],
+              [-101.54, 73.36],
+              [-100.35642, 73.84389]
+            ]
+          ],
+          [
+            [
+              [-93.196296, 72.771992],
+              [-94.269047, 72.024596],
+              [-95.409856, 72.061881],
+              [-96.033745, 72.940277],
+              [-96.018268, 73.43743],
+              [-95.495793, 73.862417],
+              [-94.503658, 74.134907],
+              [-92.420012, 74.100025],
+              [-90.509793, 73.856732],
+              [-92.003965, 72.966244],
+              [-93.196296, 72.771992]
+            ]
+          ],
+          [
+            [
+              [-120.46, 71.383602],
+              [-123.09219, 70.90164],
+              [-123.62, 71.34],
+              [-125.928949, 71.868688],
+              [-125.5, 72.292261],
+              [-124.80729, 73.02256],
+              [-123.94, 73.68],
+              [-124.91775, 74.29275],
+              [-121.53788, 74.44893],
+              [-120.10978, 74.24135],
+              [-117.55564, 74.18577],
+              [-116.58442, 73.89607],
+              [-115.51081, 73.47519],
+              [-116.76794, 73.22292],
+              [-119.22, 72.52],
+              [-120.46, 71.82],
+              [-120.46, 71.383602]
+            ]
+          ],
+          [
+            [
+              [-93.612756, 74.979997],
+              [-94.156909, 74.592347],
+              [-95.608681, 74.666864],
+              [-96.820932, 74.927623],
+              [-96.288587, 75.377828],
+              [-94.85082, 75.647218],
+              [-93.977747, 75.29649],
+              [-93.612756, 74.979997]
+            ]
+          ],
+          [
+            [
+              [-98.5, 76.72],
+              [-97.735585, 76.25656],
+              [-97.704415, 75.74344],
+              [-98.16, 75],
+              [-99.80874, 74.89744],
+              [-100.88366, 75.05736],
+              [-100.86292, 75.64075],
+              [-102.50209, 75.5638],
+              [-102.56552, 76.3366],
+              [-101.48973, 76.30537],
+              [-99.98349, 76.64634],
+              [-98.57699, 76.58859],
+              [-98.5, 76.72]
+            ]
+          ],
+          [
+            [
+              [-108.21141, 76.20168],
+              [-107.81943, 75.84552],
+              [-106.92893, 76.01282],
+              [-105.881, 75.9694],
+              [-105.70498, 75.47951],
+              [-106.31347, 75.00527],
+              [-109.7, 74.85],
+              [-112.22307, 74.41696],
+              [-113.74381, 74.39427],
+              [-113.87135, 74.72029],
+              [-111.79421, 75.1625],
+              [-116.31221, 75.04343],
+              [-117.7104, 75.2222],
+              [-116.34602, 76.19903],
+              [-115.40487, 76.47887],
+              [-112.59056, 76.14134],
+              [-110.81422, 75.54919],
+              [-109.0671, 75.47321],
+              [-110.49726, 76.42982],
+              [-109.5811, 76.79417],
+              [-108.54859, 76.67832],
+              [-108.21141, 76.20168]
+            ]
+          ],
+          [
+            [
+              [-94.684086, 77.097878],
+              [-93.573921, 76.776296],
+              [-91.605023, 76.778518],
+              [-90.741846, 76.449597],
+              [-90.969661, 76.074013],
+              [-89.822238, 75.847774],
+              [-89.187083, 75.610166],
+              [-87.838276, 75.566189],
+              [-86.379192, 75.482421],
+              [-84.789625, 75.699204],
+              [-82.753445, 75.784315],
+              [-81.128531, 75.713983],
+              [-80.057511, 75.336849],
+              [-79.833933, 74.923127],
+              [-80.457771, 74.657304],
+              [-81.948843, 74.442459],
+              [-83.228894, 74.564028],
+              [-86.097452, 74.410032],
+              [-88.15035, 74.392307],
+              [-89.764722, 74.515555],
+              [-92.422441, 74.837758],
+              [-92.768285, 75.38682],
+              [-92.889906, 75.882655],
+              [-93.893824, 76.319244],
+              [-95.962457, 76.441381],
+              [-97.121379, 76.751078],
+              [-96.745123, 77.161389],
+              [-94.684086, 77.097878]
+            ]
+          ],
+          [
+            [
+              [-116.198587, 77.645287],
+              [-116.335813, 76.876962],
+              [-117.106051, 76.530032],
+              [-118.040412, 76.481172],
+              [-119.899318, 76.053213],
+              [-121.499995, 75.900019],
+              [-122.854924, 76.116543],
+              [-122.854925, 76.116543],
+              [-121.157535, 76.864508],
+              [-119.103939, 77.51222],
+              [-117.570131, 77.498319],
+              [-116.198587, 77.645287]
+            ]
+          ],
+          [
+            [
+              [-93.840003, 77.519997],
+              [-94.295608, 77.491343],
+              [-96.169654, 77.555111],
+              [-96.436304, 77.834629],
+              [-94.422577, 77.820005],
+              [-93.720656, 77.634331],
+              [-93.840003, 77.519997]
+            ]
+          ],
+          [
+            [
+              [-110.186938, 77.697015],
+              [-112.051191, 77.409229],
+              [-113.534279, 77.732207],
+              [-112.724587, 78.05105],
+              [-111.264443, 78.152956],
+              [-109.854452, 77.996325],
+              [-110.186938, 77.697015]
+            ]
+          ],
+          [
+            [
+              [-109.663146, 78.601973],
+              [-110.881314, 78.40692],
+              [-112.542091, 78.407902],
+              [-112.525891, 78.550555],
+              [-111.50001, 78.849994],
+              [-110.963661, 78.804441],
+              [-109.663146, 78.601973]
+            ]
+          ],
+          [
+            [
+              [-95.830295, 78.056941],
+              [-97.309843, 77.850597],
+              [-98.124289, 78.082857],
+              [-98.552868, 78.458105],
+              [-98.631984, 78.87193],
+              [-97.337231, 78.831984],
+              [-96.754399, 78.765813],
+              [-95.559278, 78.418315],
+              [-95.830295, 78.056941]
+            ]
+          ],
+          [
+            [
+              [-100.060192, 78.324754],
+              [-99.670939, 77.907545],
+              [-101.30394, 78.018985],
+              [-102.949809, 78.343229],
+              [-105.176133, 78.380332],
+              [-104.210429, 78.67742],
+              [-105.41958, 78.918336],
+              [-105.492289, 79.301594],
+              [-103.529282, 79.165349],
+              [-100.825158, 78.800462],
+              [-100.060192, 78.324754]
+            ]
+          ],
+          [
+            [
+              [-87.02, 79.66],
+              [-85.81435, 79.3369],
+              [-87.18756, 79.0393],
+              [-89.03535, 78.28723],
+              [-90.80436, 78.21533],
+              [-92.87669, 78.34333],
+              [-93.95116, 78.75099],
+              [-93.93574, 79.11373],
+              [-93.14524, 79.3801],
+              [-94.974, 79.37248],
+              [-96.07614, 79.70502],
+              [-96.70972, 80.15777],
+              [-96.01644, 80.60233],
+              [-95.32345, 80.90729],
+              [-94.29843, 80.97727],
+              [-94.73542, 81.20646],
+              [-92.40984, 81.25739],
+              [-91.13289, 80.72345],
+              [-89.45, 80.509322],
+              [-87.81, 80.32],
+              [-87.02, 79.66]
+            ]
+          ],
+          [
+            [
+              [-68.5, 83.106322],
+              [-65.82735, 83.02801],
+              [-63.68, 82.9],
+              [-61.85, 82.6286],
+              [-61.89388, 82.36165],
+              [-64.334, 81.92775],
+              [-66.75342, 81.72527],
+              [-67.65755, 81.50141],
+              [-65.48031, 81.50657],
+              [-67.84, 80.9],
+              [-69.4697, 80.61683],
+              [-71.18, 79.8],
+              [-73.2428, 79.63415],
+              [-73.88, 79.430162],
+              [-76.90773, 79.32309],
+              [-75.52924, 79.19766],
+              [-76.22046, 79.01907],
+              [-75.39345, 78.52581],
+              [-76.34354, 78.18296],
+              [-77.88851, 77.89991],
+              [-78.36269, 77.50859],
+              [-79.75951, 77.20968],
+              [-79.61965, 76.98336],
+              [-77.91089, 77.022045],
+              [-77.88911, 76.777955],
+              [-80.56125, 76.17812],
+              [-83.17439, 76.45403],
+              [-86.11184, 76.29901],
+              [-87.6, 76.42],
+              [-89.49068, 76.47239],
+              [-89.6161, 76.95213],
+              [-87.76739, 77.17833],
+              [-88.26, 77.9],
+              [-87.65, 77.970222],
+              [-84.97634, 77.53873],
+              [-86.34, 78.18],
+              [-87.96192, 78.37181],
+              [-87.15198, 78.75867],
+              [-85.37868, 78.9969],
+              [-85.09495, 79.34543],
+              [-86.50734, 79.73624],
+              [-86.93179, 80.25145],
+              [-84.19844, 80.20836],
+              [-83.408696, 80.1],
+              [-81.84823, 80.46442],
+              [-84.1, 80.58],
+              [-87.59895, 80.51627],
+              [-89.36663, 80.85569],
+              [-90.2, 81.26],
+              [-91.36786, 81.5531],
+              [-91.58702, 81.89429],
+              [-90.1, 82.085],
+              [-88.93227, 82.11751],
+              [-86.97024, 82.27961],
+              [-85.5, 82.652273],
+              [-84.260005, 82.6],
+              [-83.18, 82.32],
+              [-82.42, 82.86],
+              [-81.1, 83.02],
+              [-79.30664, 83.13056],
+              [-76.25, 83.172059],
+              [-75.71878, 83.06404],
+              [-72.83153, 83.23324],
+              [-70.665765, 83.169781],
+              [-68.5, 83.106322]
+            ]
+          ]
+        ]
+      },
+      "id": "CAN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Switzerland" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [9.594226, 47.525058],
+            [9.632932, 47.347601],
+            [9.47997, 47.10281],
+            [9.932448, 46.920728],
+            [10.442701, 46.893546],
+            [10.363378, 46.483571],
+            [9.922837, 46.314899],
+            [9.182882, 46.440215],
+            [8.966306, 46.036932],
+            [8.489952, 46.005151],
+            [8.31663, 46.163642],
+            [7.755992, 45.82449],
+            [7.273851, 45.776948],
+            [6.843593, 45.991147],
+            [6.5001, 46.429673],
+            [6.022609, 46.27299],
+            [6.037389, 46.725779],
+            [6.768714, 47.287708],
+            [6.736571, 47.541801],
+            [7.192202, 47.449766],
+            [7.466759, 47.620582],
+            [8.317301, 47.61358],
+            [8.522612, 47.830828],
+            [9.594226, 47.525058]
+          ]
+        ]
+      },
+      "id": "CHE"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Chile" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [-68.63401, -52.63637],
+              [-68.63335, -54.8695],
+              [-67.56244, -54.87001],
+              [-66.95992, -54.89681],
+              [-67.29103, -55.30124],
+              [-68.14863, -55.61183],
+              [-68.639991, -55.580018],
+              [-69.2321, -55.49906],
+              [-69.95809, -55.19843],
+              [-71.00568, -55.05383],
+              [-72.2639, -54.49514],
+              [-73.2852, -53.95752],
+              [-74.66253, -52.83749],
+              [-73.8381, -53.04743],
+              [-72.43418, -53.7154],
+              [-71.10773, -54.07433],
+              [-70.59178, -53.61583],
+              [-70.26748, -52.93123],
+              [-69.34565, -52.5183],
+              [-68.63401, -52.63637]
+            ]
+          ],
+          [
+            [
+              [-68.219913, -21.494347],
+              [-67.82818, -22.872919],
+              [-67.106674, -22.735925],
+              [-66.985234, -22.986349],
+              [-67.328443, -24.025303],
+              [-68.417653, -24.518555],
+              [-68.386001, -26.185016],
+              [-68.5948, -26.506909],
+              [-68.295542, -26.89934],
+              [-69.001235, -27.521214],
+              [-69.65613, -28.459141],
+              [-70.01355, -29.367923],
+              [-69.919008, -30.336339],
+              [-70.535069, -31.36501],
+              [-70.074399, -33.09121],
+              [-69.814777, -33.273886],
+              [-69.817309, -34.193571],
+              [-70.388049, -35.169688],
+              [-70.364769, -36.005089],
+              [-71.121881, -36.658124],
+              [-71.118625, -37.576827],
+              [-70.814664, -38.552995],
+              [-71.413517, -38.916022],
+              [-71.680761, -39.808164],
+              [-71.915734, -40.832339],
+              [-71.746804, -42.051386],
+              [-72.148898, -42.254888],
+              [-71.915424, -43.408565],
+              [-71.464056, -43.787611],
+              [-71.793623, -44.207172],
+              [-71.329801, -44.407522],
+              [-71.222779, -44.784243],
+              [-71.659316, -44.973689],
+              [-71.552009, -45.560733],
+              [-71.917258, -46.884838],
+              [-72.447355, -47.738533],
+              [-72.331161, -48.244238],
+              [-72.648247, -48.878618],
+              [-73.415436, -49.318436],
+              [-73.328051, -50.378785],
+              [-72.975747, -50.74145],
+              [-72.309974, -50.67701],
+              [-72.329404, -51.425956],
+              [-71.914804, -52.009022],
+              [-69.498362, -52.142761],
+              [-68.571545, -52.299444],
+              [-69.461284, -52.291951],
+              [-69.94278, -52.537931],
+              [-70.845102, -52.899201],
+              [-71.006332, -53.833252],
+              [-71.429795, -53.856455],
+              [-72.557943, -53.53141],
+              [-73.702757, -52.835069],
+              [-73.702757, -52.83507],
+              [-74.946763, -52.262754],
+              [-75.260026, -51.629355],
+              [-74.976632, -51.043396],
+              [-75.479754, -50.378372],
+              [-75.608015, -48.673773],
+              [-75.18277, -47.711919],
+              [-74.126581, -46.939253],
+              [-75.644395, -46.647643],
+              [-74.692154, -45.763976],
+              [-74.351709, -44.103044],
+              [-73.240356, -44.454961],
+              [-72.717804, -42.383356],
+              [-73.3889, -42.117532],
+              [-73.701336, -43.365776],
+              [-74.331943, -43.224958],
+              [-74.017957, -41.794813],
+              [-73.677099, -39.942213],
+              [-73.217593, -39.258689],
+              [-73.505559, -38.282883],
+              [-73.588061, -37.156285],
+              [-73.166717, -37.12378],
+              [-72.553137, -35.50884],
+              [-71.861732, -33.909093],
+              [-71.43845, -32.418899],
+              [-71.668721, -30.920645],
+              [-71.370083, -30.095682],
+              [-71.489894, -28.861442],
+              [-70.905124, -27.64038],
+              [-70.724954, -25.705924],
+              [-70.403966, -23.628997],
+              [-70.091246, -21.393319],
+              [-70.16442, -19.756468],
+              [-70.372572, -18.347975],
+              [-69.858444, -18.092694],
+              [-69.590424, -17.580012],
+              [-69.100247, -18.260125],
+              [-68.966818, -18.981683],
+              [-68.442225, -19.405068],
+              [-68.757167, -20.372658],
+              [-68.219913, -21.494347]
+            ]
+          ]
+        ]
+      },
+      "id": "CHL"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "China" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [110.339188, 18.678395],
+              [109.47521, 18.197701],
+              [108.655208, 18.507682],
+              [108.626217, 19.367888],
+              [109.119056, 19.821039],
+              [110.211599, 20.101254],
+              [110.786551, 20.077534],
+              [111.010051, 19.69593],
+              [110.570647, 19.255879],
+              [110.339188, 18.678395]
+            ]
+          ],
+          [
+            [
+              [127.657407, 49.76027],
+              [129.397818, 49.4406],
+              [130.582293, 48.729687],
+              [130.987282, 47.790132],
+              [132.506672, 47.78897],
+              [133.373596, 48.183442],
+              [135.026311, 48.47823],
+              [134.500814, 47.57844],
+              [134.112362, 47.212467],
+              [133.769644, 46.116927],
+              [133.097127, 45.144066],
+              [131.883454, 45.321162],
+              [131.025212, 44.967953],
+              [131.288555, 44.11152],
+              [131.144688, 42.92999],
+              [130.633866, 42.903015],
+              [130.640016, 42.395009],
+              [129.994267, 42.985387],
+              [129.596669, 42.424982],
+              [128.052215, 41.994285],
+              [128.208433, 41.466772],
+              [127.343783, 41.503152],
+              [126.869083, 41.816569],
+              [126.182045, 41.107336],
+              [125.079942, 40.569824],
+              [124.265625, 39.928493],
+              [122.86757, 39.637788],
+              [122.131388, 39.170452],
+              [121.054554, 38.897471],
+              [121.585995, 39.360854],
+              [121.376757, 39.750261],
+              [122.168595, 40.422443],
+              [121.640359, 40.94639],
+              [120.768629, 40.593388],
+              [119.639602, 39.898056],
+              [119.023464, 39.252333],
+              [118.042749, 39.204274],
+              [117.532702, 38.737636],
+              [118.059699, 38.061476],
+              [118.87815, 37.897325],
+              [118.911636, 37.448464],
+              [119.702802, 37.156389],
+              [120.823457, 37.870428],
+              [121.711259, 37.481123],
+              [122.357937, 37.454484],
+              [122.519995, 36.930614],
+              [121.104164, 36.651329],
+              [120.637009, 36.11144],
+              [119.664562, 35.609791],
+              [119.151208, 34.909859],
+              [120.227525, 34.360332],
+              [120.620369, 33.376723],
+              [121.229014, 32.460319],
+              [121.908146, 31.692174],
+              [121.891919, 30.949352],
+              [121.264257, 30.676267],
+              [121.503519, 30.142915],
+              [122.092114, 29.83252],
+              [121.938428, 29.018022],
+              [121.684439, 28.225513],
+              [121.125661, 28.135673],
+              [120.395473, 27.053207],
+              [119.585497, 25.740781],
+              [118.656871, 24.547391],
+              [117.281606, 23.624501],
+              [115.890735, 22.782873],
+              [114.763827, 22.668074],
+              [114.152547, 22.22376],
+              [113.80678, 22.54834],
+              [113.241078, 22.051367],
+              [111.843592, 21.550494],
+              [110.785466, 21.397144],
+              [110.444039, 20.341033],
+              [109.889861, 20.282457],
+              [109.627655, 21.008227],
+              [109.864488, 21.395051],
+              [108.522813, 21.715212],
+              [108.05018, 21.55238],
+              [107.04342, 21.811899],
+              [106.567273, 22.218205],
+              [106.725403, 22.794268],
+              [105.811247, 22.976892],
+              [105.329209, 23.352063],
+              [104.476858, 22.81915],
+              [103.504515, 22.703757],
+              [102.706992, 22.708795],
+              [102.170436, 22.464753],
+              [101.652018, 22.318199],
+              [101.80312, 21.174367],
+              [101.270026, 21.201652],
+              [101.180005, 21.436573],
+              [101.150033, 21.849984],
+              [100.416538, 21.558839],
+              [99.983489, 21.742937],
+              [99.240899, 22.118314],
+              [99.531992, 22.949039],
+              [98.898749, 23.142722],
+              [98.660262, 24.063286],
+              [97.60472, 23.897405],
+              [97.724609, 25.083637],
+              [98.671838, 25.918703],
+              [98.712094, 26.743536],
+              [98.68269, 27.508812],
+              [98.246231, 27.747221],
+              [97.911988, 28.335945],
+              [97.327114, 28.261583],
+              [96.248833, 28.411031],
+              [96.586591, 28.83098],
+              [96.117679, 29.452802],
+              [95.404802, 29.031717],
+              [94.56599, 29.277438],
+              [93.413348, 28.640629],
+              [92.503119, 27.896876],
+              [91.696657, 27.771742],
+              [91.258854, 28.040614],
+              [90.730514, 28.064954],
+              [90.015829, 28.296439],
+              [89.47581, 28.042759],
+              [88.814248, 27.299316],
+              [88.730326, 28.086865],
+              [88.120441, 27.876542],
+              [86.954517, 27.974262],
+              [85.82332, 28.203576],
+              [85.011638, 28.642774],
+              [84.23458, 28.839894],
+              [83.898993, 29.320226],
+              [83.337115, 29.463732],
+              [82.327513, 30.115268],
+              [81.525804, 30.422717],
+              [81.111256, 30.183481],
+              [79.721367, 30.882715],
+              [78.738894, 31.515906],
+              [78.458446, 32.618164],
+              [79.176129, 32.48378],
+              [79.208892, 32.994395],
+              [78.811086, 33.506198],
+              [78.912269, 34.321936],
+              [77.837451, 35.49401],
+              [76.192848, 35.898403],
+              [75.896897, 36.666806],
+              [75.158028, 37.133031],
+              [74.980002, 37.41999],
+              [74.829986, 37.990007],
+              [74.864816, 38.378846],
+              [74.257514, 38.606507],
+              [73.928852, 38.505815],
+              [73.675379, 39.431237],
+              [73.960013, 39.660008],
+              [73.822244, 39.893973],
+              [74.776862, 40.366425],
+              [75.467828, 40.562072],
+              [76.526368, 40.427946],
+              [76.904484, 41.066486],
+              [78.187197, 41.185316],
+              [78.543661, 41.582243],
+              [80.11943, 42.123941],
+              [80.25999, 42.349999],
+              [80.18015, 42.920068],
+              [80.866206, 43.180362],
+              [79.966106, 44.917517],
+              [81.947071, 45.317027],
+              [82.458926, 45.53965],
+              [83.180484, 47.330031],
+              [85.16429, 47.000956],
+              [85.720484, 47.452969],
+              [85.768233, 48.455751],
+              [86.598776, 48.549182],
+              [87.35997, 49.214981],
+              [87.751264, 49.297198],
+              [88.013832, 48.599463],
+              [88.854298, 48.069082],
+              [90.280826, 47.693549],
+              [90.970809, 46.888146],
+              [90.585768, 45.719716],
+              [90.94554, 45.286073],
+              [92.133891, 45.115076],
+              [93.480734, 44.975472],
+              [94.688929, 44.352332],
+              [95.306875, 44.241331],
+              [95.762455, 43.319449],
+              [96.349396, 42.725635],
+              [97.451757, 42.74889],
+              [99.515817, 42.524691],
+              [100.845866, 42.663804],
+              [101.83304, 42.514873],
+              [103.312278, 41.907468],
+              [104.522282, 41.908347],
+              [104.964994, 41.59741],
+              [106.129316, 42.134328],
+              [107.744773, 42.481516],
+              [109.243596, 42.519446],
+              [110.412103, 42.871234],
+              [111.129682, 43.406834],
+              [111.829588, 43.743118],
+              [111.667737, 44.073176],
+              [111.348377, 44.457442],
+              [111.873306, 45.102079],
+              [112.436062, 45.011646],
+              [113.463907, 44.808893],
+              [114.460332, 45.339817],
+              [115.985096, 45.727235],
+              [116.717868, 46.388202],
+              [117.421701, 46.672733],
+              [118.874326, 46.805412],
+              [119.66327, 46.69268],
+              [119.772824, 47.048059],
+              [118.866574, 47.74706],
+              [118.064143, 48.06673],
+              [117.295507, 47.697709],
+              [116.308953, 47.85341],
+              [115.742837, 47.726545],
+              [115.485282, 48.135383],
+              [116.191802, 49.134598],
+              [116.678801, 49.888531],
+              [117.879244, 49.510983],
+              [119.288461, 50.142883],
+              [119.279366, 50.582908],
+              [120.18205, 51.643566],
+              [120.738191, 51.964115],
+              [120.725789, 52.516226],
+              [120.177089, 52.753886],
+              [121.003085, 53.251401],
+              [122.245748, 53.431726],
+              [123.571507, 53.458804],
+              [125.068211, 53.161045],
+              [125.946349, 52.792799],
+              [126.564399, 51.784255],
+              [126.939157, 51.353894],
+              [127.287456, 50.739797],
+              [127.657407, 49.76027]
+            ]
+          ]
+        ]
+      },
+      "id": "CHN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Ivory Coast" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-2.856125, 4.994476],
+            [-3.311084, 4.984296],
+            [-4.00882, 5.179813],
+            [-4.649917, 5.168264],
+            [-5.834496, 4.993701],
+            [-6.528769, 4.705088],
+            [-7.518941, 4.338288],
+            [-7.712159, 4.364566],
+            [-7.635368, 5.188159],
+            [-7.539715, 5.313345],
+            [-7.570153, 5.707352],
+            [-7.993693, 6.12619],
+            [-8.311348, 6.193033],
+            [-8.60288, 6.467564],
+            [-8.385452, 6.911801],
+            [-8.485446, 7.395208],
+            [-8.439298, 7.686043],
+            [-8.280703, 7.68718],
+            [-8.221792, 8.123329],
+            [-8.299049, 8.316444],
+            [-8.203499, 8.455453],
+            [-7.8321, 8.575704],
+            [-8.079114, 9.376224],
+            [-8.309616, 9.789532],
+            [-8.229337, 10.12902],
+            [-8.029944, 10.206535],
+            [-7.89959, 10.297382],
+            [-7.622759, 10.147236],
+            [-6.850507, 10.138994],
+            [-6.666461, 10.430811],
+            [-6.493965, 10.411303],
+            [-6.205223, 10.524061],
+            [-6.050452, 10.096361],
+            [-5.816926, 10.222555],
+            [-5.404342, 10.370737],
+            [-4.954653, 10.152714],
+            [-4.779884, 9.821985],
+            [-4.330247, 9.610835],
+            [-3.980449, 9.862344],
+            [-3.511899, 9.900326],
+            [-2.827496, 9.642461],
+            [-2.56219, 8.219628],
+            [-2.983585, 7.379705],
+            [-3.24437, 6.250472],
+            [-2.810701, 5.389051],
+            [-2.856125, 4.994476]
+          ]
+        ]
+      },
+      "id": "CIV"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Cameroon" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [13.075822, 2.267097],
+            [12.951334, 2.321616],
+            [12.35938, 2.192812],
+            [11.751665, 2.326758],
+            [11.276449, 2.261051],
+            [9.649158, 2.283866],
+            [9.795196, 3.073404],
+            [9.404367, 3.734527],
+            [8.948116, 3.904129],
+            [8.744924, 4.352215],
+            [8.488816, 4.495617],
+            [8.500288, 4.771983],
+            [8.757533, 5.479666],
+            [9.233163, 6.444491],
+            [9.522706, 6.453482],
+            [10.118277, 7.03877],
+            [10.497375, 7.055358],
+            [11.058788, 6.644427],
+            [11.745774, 6.981383],
+            [11.839309, 7.397042],
+            [12.063946, 7.799808],
+            [12.218872, 8.305824],
+            [12.753672, 8.717763],
+            [12.955468, 9.417772],
+            [13.1676, 9.640626],
+            [13.308676, 10.160362],
+            [13.57295, 10.798566],
+            [14.415379, 11.572369],
+            [14.468192, 11.904752],
+            [14.577178, 12.085361],
+            [14.181336, 12.483657],
+            [14.213531, 12.802035],
+            [14.495787, 12.859396],
+            [14.893386, 12.219048],
+            [14.960152, 11.555574],
+            [14.923565, 10.891325],
+            [15.467873, 9.982337],
+            [14.909354, 9.992129],
+            [14.627201, 9.920919],
+            [14.171466, 10.021378],
+            [13.954218, 9.549495],
+            [14.544467, 8.965861],
+            [14.979996, 8.796104],
+            [15.120866, 8.38215],
+            [15.436092, 7.692812],
+            [15.27946, 7.421925],
+            [14.776545, 6.408498],
+            [14.53656, 6.226959],
+            [14.459407, 5.451761],
+            [14.558936, 5.030598],
+            [14.478372, 4.732605],
+            [14.950953, 4.210389],
+            [15.03622, 3.851367],
+            [15.405396, 3.335301],
+            [15.862732, 3.013537],
+            [15.907381, 2.557389],
+            [16.012852, 2.26764],
+            [15.940919, 1.727673],
+            [15.146342, 1.964015],
+            [14.337813, 2.227875],
+            [13.075822, 2.267097]
+          ]
+        ]
+      },
+      "id": "CMR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Democratic Republic of the Congo" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [30.83386, 3.509166],
+            [30.773347, 2.339883],
+            [31.174149, 2.204465],
+            [30.85267, 1.849396],
+            [30.468508, 1.583805],
+            [30.086154, 1.062313],
+            [29.875779, 0.59738],
+            [29.819503, -0.20531],
+            [29.587838, -0.587406],
+            [29.579466, -1.341313],
+            [29.291887, -1.620056],
+            [29.254835, -2.21511],
+            [29.117479, -2.292211],
+            [29.024926, -2.839258],
+            [29.276384, -3.293907],
+            [29.339998, -4.499983],
+            [29.519987, -5.419979],
+            [29.419993, -5.939999],
+            [29.620032, -6.520015],
+            [30.199997, -7.079981],
+            [30.740015, -8.340007],
+            [30.346086, -8.238257],
+            [29.002912, -8.407032],
+            [28.734867, -8.526559],
+            [28.449871, -9.164918],
+            [28.673682, -9.605925],
+            [28.49607, -10.789884],
+            [28.372253, -11.793647],
+            [28.642417, -11.971569],
+            [29.341548, -12.360744],
+            [29.616001, -12.178895],
+            [29.699614, -13.257227],
+            [28.934286, -13.248958],
+            [28.523562, -12.698604],
+            [28.155109, -12.272481],
+            [27.388799, -12.132747],
+            [27.16442, -11.608748],
+            [26.553088, -11.92444],
+            [25.75231, -11.784965],
+            [25.418118, -11.330936],
+            [24.78317, -11.238694],
+            [24.314516, -11.262826],
+            [24.257155, -10.951993],
+            [23.912215, -10.926826],
+            [23.456791, -10.867863],
+            [22.837345, -11.017622],
+            [22.402798, -10.993075],
+            [22.155268, -11.084801],
+            [22.208753, -9.894796],
+            [21.875182, -9.523708],
+            [21.801801, -8.908707],
+            [21.949131, -8.305901],
+            [21.746456, -7.920085],
+            [21.728111, -7.290872],
+            [20.514748, -7.299606],
+            [20.601823, -6.939318],
+            [20.091622, -6.94309],
+            [20.037723, -7.116361],
+            [19.417502, -7.155429],
+            [19.166613, -7.738184],
+            [19.016752, -7.988246],
+            [18.464176, -7.847014],
+            [18.134222, -7.987678],
+            [17.47297, -8.068551],
+            [17.089996, -7.545689],
+            [16.860191, -7.222298],
+            [16.57318, -6.622645],
+            [16.326528, -5.87747],
+            [13.375597, -5.864241],
+            [13.024869, -5.984389],
+            [12.735171, -5.965682],
+            [12.322432, -6.100092],
+            [12.182337, -5.789931],
+            [12.436688, -5.684304],
+            [12.468004, -5.248362],
+            [12.631612, -4.991271],
+            [12.995517, -4.781103],
+            [13.25824, -4.882957],
+            [13.600235, -4.500138],
+            [14.144956, -4.510009],
+            [14.209035, -4.793092],
+            [14.582604, -4.970239],
+            [15.170992, -4.343507],
+            [15.75354, -3.855165],
+            [16.00629, -3.535133],
+            [15.972803, -2.712392],
+            [16.407092, -1.740927],
+            [16.865307, -1.225816],
+            [17.523716, -0.74383],
+            [17.638645, -0.424832],
+            [17.663553, -0.058084],
+            [17.82654, 0.288923],
+            [17.774192, 0.855659],
+            [17.898835, 1.741832],
+            [18.094276, 2.365722],
+            [18.393792, 2.900443],
+            [18.453065, 3.504386],
+            [18.542982, 4.201785],
+            [18.932312, 4.709506],
+            [19.467784, 5.031528],
+            [20.290679, 4.691678],
+            [20.927591, 4.322786],
+            [21.659123, 4.224342],
+            [22.405124, 4.02916],
+            [22.704124, 4.633051],
+            [22.84148, 4.710126],
+            [23.297214, 4.609693],
+            [24.410531, 5.108784],
+            [24.805029, 4.897247],
+            [25.128833, 4.927245],
+            [25.278798, 5.170408],
+            [25.650455, 5.256088],
+            [26.402761, 5.150875],
+            [27.044065, 5.127853],
+            [27.374226, 5.233944],
+            [27.979977, 4.408413],
+            [28.428994, 4.287155],
+            [28.696678, 4.455077],
+            [29.159078, 4.389267],
+            [29.715995, 4.600805],
+            [29.9535, 4.173699],
+            [30.83386, 3.509166]
+          ]
+        ]
+      },
+      "id": "COD"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Republic of the Congo" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [12.995517, -4.781103],
+            [12.62076, -4.438023],
+            [12.318608, -4.60623],
+            [11.914963, -5.037987],
+            [11.093773, -3.978827],
+            [11.855122, -3.426871],
+            [11.478039, -2.765619],
+            [11.820964, -2.514161],
+            [12.495703, -2.391688],
+            [12.575284, -1.948511],
+            [13.109619, -2.42874],
+            [13.992407, -2.470805],
+            [14.29921, -1.998276],
+            [14.425456, -1.333407],
+            [14.316418, -0.552627],
+            [13.843321, 0.038758],
+            [14.276266, 1.19693],
+            [14.026669, 1.395677],
+            [13.282631, 1.314184],
+            [13.003114, 1.830896],
+            [13.075822, 2.267097],
+            [14.337813, 2.227875],
+            [15.146342, 1.964015],
+            [15.940919, 1.727673],
+            [16.012852, 2.26764],
+            [16.537058, 3.198255],
+            [17.133042, 3.728197],
+            [17.8099, 3.560196],
+            [18.453065, 3.504386],
+            [18.393792, 2.900443],
+            [18.094276, 2.365722],
+            [17.898835, 1.741832],
+            [17.774192, 0.855659],
+            [17.82654, 0.288923],
+            [17.663553, -0.058084],
+            [17.638645, -0.424832],
+            [17.523716, -0.74383],
+            [16.865307, -1.225816],
+            [16.407092, -1.740927],
+            [15.972803, -2.712392],
+            [16.00629, -3.535133],
+            [15.75354, -3.855165],
+            [15.170992, -4.343507],
+            [14.582604, -4.970239],
+            [14.209035, -4.793092],
+            [14.144956, -4.510009],
+            [13.600235, -4.500138],
+            [13.25824, -4.882957],
+            [12.995517, -4.781103]
+          ]
+        ]
+      },
+      "id": "COG"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Colombia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-75.373223, -0.152032],
+            [-75.801466, 0.084801],
+            [-76.292314, 0.416047],
+            [-76.57638, 0.256936],
+            [-77.424984, 0.395687],
+            [-77.668613, 0.825893],
+            [-77.855061, 0.809925],
+            [-78.855259, 1.380924],
+            [-78.990935, 1.69137],
+            [-78.617831, 1.766404],
+            [-78.662118, 2.267355],
+            [-78.42761, 2.629556],
+            [-77.931543, 2.696606],
+            [-77.510431, 3.325017],
+            [-77.12769, 3.849636],
+            [-77.496272, 4.087606],
+            [-77.307601, 4.667984],
+            [-77.533221, 5.582812],
+            [-77.318815, 5.845354],
+            [-77.476661, 6.691116],
+            [-77.881571, 7.223771],
+            [-77.753414, 7.70984],
+            [-77.431108, 7.638061],
+            [-77.242566, 7.935278],
+            [-77.474723, 8.524286],
+            [-77.353361, 8.670505],
+            [-76.836674, 8.638749],
+            [-76.086384, 9.336821],
+            [-75.6746, 9.443248],
+            [-75.664704, 9.774003],
+            [-75.480426, 10.61899],
+            [-74.906895, 11.083045],
+            [-74.276753, 11.102036],
+            [-74.197223, 11.310473],
+            [-73.414764, 11.227015],
+            [-72.627835, 11.731972],
+            [-72.238195, 11.95555],
+            [-71.75409, 12.437303],
+            [-71.399822, 12.376041],
+            [-71.137461, 12.112982],
+            [-71.331584, 11.776284],
+            [-71.973922, 11.608672],
+            [-72.227575, 11.108702],
+            [-72.614658, 10.821975],
+            [-72.905286, 10.450344],
+            [-73.027604, 9.73677],
+            [-73.304952, 9.152],
+            [-72.78873, 9.085027],
+            [-72.660495, 8.625288],
+            [-72.439862, 8.405275],
+            [-72.360901, 8.002638],
+            [-72.479679, 7.632506],
+            [-72.444487, 7.423785],
+            [-72.198352, 7.340431],
+            [-71.960176, 6.991615],
+            [-70.674234, 7.087785],
+            [-70.093313, 6.960376],
+            [-69.38948, 6.099861],
+            [-68.985319, 6.206805],
+            [-68.265052, 6.153268],
+            [-67.695087, 6.267318],
+            [-67.34144, 6.095468],
+            [-67.521532, 5.55687],
+            [-67.744697, 5.221129],
+            [-67.823012, 4.503937],
+            [-67.621836, 3.839482],
+            [-67.337564, 3.542342],
+            [-67.303173, 3.318454],
+            [-67.809938, 2.820655],
+            [-67.447092, 2.600281],
+            [-67.181294, 2.250638],
+            [-66.876326, 1.253361],
+            [-67.065048, 1.130112],
+            [-67.259998, 1.719999],
+            [-67.53781, 2.037163],
+            [-67.868565, 1.692455],
+            [-69.816973, 1.714805],
+            [-69.804597, 1.089081],
+            [-69.218638, 0.985677],
+            [-69.252434, 0.602651],
+            [-69.452396, 0.706159],
+            [-70.015566, 0.541414],
+            [-70.020656, -0.185156],
+            [-69.577065, -0.549992],
+            [-69.420486, -1.122619],
+            [-69.444102, -1.556287],
+            [-69.893635, -4.298187],
+            [-70.394044, -3.766591],
+            [-70.692682, -3.742872],
+            [-70.047709, -2.725156],
+            [-70.813476, -2.256865],
+            [-71.413646, -2.342802],
+            [-71.774761, -2.16979],
+            [-72.325787, -2.434218],
+            [-73.070392, -2.308954],
+            [-73.659504, -1.260491],
+            [-74.122395, -1.002833],
+            [-74.441601, -0.53082],
+            [-75.106625, -0.057205],
+            [-75.373223, -0.152032]
+          ]
+        ]
+      },
+      "id": "COL"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Costa Rica" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-82.965783, 8.225028],
+            [-83.508437, 8.446927],
+            [-83.711474, 8.656836],
+            [-83.596313, 8.830443],
+            [-83.632642, 9.051386],
+            [-83.909886, 9.290803],
+            [-84.303402, 9.487354],
+            [-84.647644, 9.615537],
+            [-84.713351, 9.908052],
+            [-84.97566, 10.086723],
+            [-84.911375, 9.795992],
+            [-85.110923, 9.55704],
+            [-85.339488, 9.834542],
+            [-85.660787, 9.933347],
+            [-85.797445, 10.134886],
+            [-85.791709, 10.439337],
+            [-85.659314, 10.754331],
+            [-85.941725, 10.895278],
+            [-85.71254, 11.088445],
+            [-85.561852, 11.217119],
+            [-84.903003, 10.952303],
+            [-84.673069, 11.082657],
+            [-84.355931, 10.999226],
+            [-84.190179, 10.79345],
+            [-83.895054, 10.726839],
+            [-83.655612, 10.938764],
+            [-83.40232, 10.395438],
+            [-83.015677, 9.992982],
+            [-82.546196, 9.566135],
+            [-82.932891, 9.476812],
+            [-82.927155, 9.07433],
+            [-82.719183, 8.925709],
+            [-82.868657, 8.807266],
+            [-82.829771, 8.626295],
+            [-82.913176, 8.423517],
+            [-82.965783, 8.225028]
+          ]
+        ]
+      },
+      "id": "CRI"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Cuba" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-82.268151, 23.188611],
+            [-81.404457, 23.117271],
+            [-80.618769, 23.10598],
+            [-79.679524, 22.765303],
+            [-79.281486, 22.399202],
+            [-78.347434, 22.512166],
+            [-77.993296, 22.277194],
+            [-77.146422, 21.657851],
+            [-76.523825, 21.20682],
+            [-76.19462, 21.220565],
+            [-75.598222, 21.016624],
+            [-75.67106, 20.735091],
+            [-74.933896, 20.693905],
+            [-74.178025, 20.284628],
+            [-74.296648, 20.050379],
+            [-74.961595, 19.923435],
+            [-75.63468, 19.873774],
+            [-76.323656, 19.952891],
+            [-77.755481, 19.855481],
+            [-77.085108, 20.413354],
+            [-77.492655, 20.673105],
+            [-78.137292, 20.739949],
+            [-78.482827, 21.028613],
+            [-78.719867, 21.598114],
+            [-79.285, 21.559175],
+            [-80.217475, 21.827324],
+            [-80.517535, 22.037079],
+            [-81.820943, 22.192057],
+            [-82.169992, 22.387109],
+            [-81.795002, 22.636965],
+            [-82.775898, 22.68815],
+            [-83.494459, 22.168518],
+            [-83.9088, 22.154565],
+            [-84.052151, 21.910575],
+            [-84.54703, 21.801228],
+            [-84.974911, 21.896028],
+            [-84.447062, 22.20495],
+            [-84.230357, 22.565755],
+            [-83.77824, 22.788118],
+            [-83.267548, 22.983042],
+            [-82.510436, 23.078747],
+            [-82.268151, 23.188611]
+          ]
+        ]
+      },
+      "id": "CUB"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Cyprus" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [33.973617, 35.058506],
+            [34.004881, 34.978098],
+            [32.979827, 34.571869],
+            [32.490296, 34.701655],
+            [32.256667, 35.103232],
+            [32.73178, 35.140026],
+            [32.919572, 35.087833],
+            [33.190977, 35.173125],
+            [33.383833, 35.162712],
+            [33.455922, 35.101424],
+            [33.475817, 35.000345],
+            [33.525685, 35.038688],
+            [33.675392, 35.017863],
+            [33.86644, 35.093595],
+            [33.973617, 35.058506]
+          ]
+        ]
+      },
+      "id": "CYP"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Czech Republic" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [16.960288, 48.596982],
+            [16.499283, 48.785808],
+            [16.029647, 48.733899],
+            [15.253416, 49.039074],
+            [14.901447, 48.964402],
+            [14.338898, 48.555305],
+            [13.595946, 48.877172],
+            [13.031329, 49.307068],
+            [12.521024, 49.547415],
+            [12.415191, 49.969121],
+            [12.240111, 50.266338],
+            [12.966837, 50.484076],
+            [13.338132, 50.733234],
+            [14.056228, 50.926918],
+            [14.307013, 51.117268],
+            [14.570718, 51.002339],
+            [15.016996, 51.106674],
+            [15.490972, 50.78473],
+            [16.238627, 50.697733],
+            [16.176253, 50.422607],
+            [16.719476, 50.215747],
+            [16.868769, 50.473974],
+            [17.554567, 50.362146],
+            [17.649445, 50.049038],
+            [18.392914, 49.988629],
+            [18.853144, 49.49623],
+            [18.554971, 49.495015],
+            [18.399994, 49.315001],
+            [18.170498, 49.271515],
+            [18.104973, 49.043983],
+            [17.913512, 48.996493],
+            [17.886485, 48.903475],
+            [17.545007, 48.800019],
+            [17.101985, 48.816969],
+            [16.960288, 48.596982]
+          ]
+        ]
+      },
+      "id": "CZE"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Germany" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [9.921906, 54.983104],
+            [9.93958, 54.596642],
+            [10.950112, 54.363607],
+            [10.939467, 54.008693],
+            [11.956252, 54.196486],
+            [12.51844, 54.470371],
+            [13.647467, 54.075511],
+            [14.119686, 53.757029],
+            [14.353315, 53.248171],
+            [14.074521, 52.981263],
+            [14.4376, 52.62485],
+            [14.685026, 52.089947],
+            [14.607098, 51.745188],
+            [15.016996, 51.106674],
+            [14.570718, 51.002339],
+            [14.307013, 51.117268],
+            [14.056228, 50.926918],
+            [13.338132, 50.733234],
+            [12.966837, 50.484076],
+            [12.240111, 50.266338],
+            [12.415191, 49.969121],
+            [12.521024, 49.547415],
+            [13.031329, 49.307068],
+            [13.595946, 48.877172],
+            [13.243357, 48.416115],
+            [12.884103, 48.289146],
+            [13.025851, 47.637584],
+            [12.932627, 47.467646],
+            [12.62076, 47.672388],
+            [12.141357, 47.703083],
+            [11.426414, 47.523766],
+            [10.544504, 47.566399],
+            [10.402084, 47.302488],
+            [9.896068, 47.580197],
+            [9.594226, 47.525058],
+            [8.522612, 47.830828],
+            [8.317301, 47.61358],
+            [7.466759, 47.620582],
+            [7.593676, 48.333019],
+            [8.099279, 49.017784],
+            [6.65823, 49.201958],
+            [6.18632, 49.463803],
+            [6.242751, 49.902226],
+            [6.043073, 50.128052],
+            [6.156658, 50.803721],
+            [5.988658, 51.851616],
+            [6.589397, 51.852029],
+            [6.84287, 52.22844],
+            [7.092053, 53.144043],
+            [6.90514, 53.482162],
+            [7.100425, 53.693932],
+            [7.936239, 53.748296],
+            [8.121706, 53.527792],
+            [8.800734, 54.020786],
+            [8.572118, 54.395646],
+            [8.526229, 54.962744],
+            [9.282049, 54.830865],
+            [9.921906, 54.983104]
+          ]
+        ]
+      },
+      "id": "DEU"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Djibouti" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [43.081226, 12.699639],
+            [43.317852, 12.390148],
+            [43.286381, 11.974928],
+            [42.715874, 11.735641],
+            [43.145305, 11.46204],
+            [42.776852, 10.926879],
+            [42.55493, 11.10511],
+            [42.31414, 11.0342],
+            [41.75557, 11.05091],
+            [41.73959, 11.35511],
+            [41.66176, 11.6312],
+            [42, 12.1],
+            [42.35156, 12.54223],
+            [42.779642, 12.455416],
+            [43.081226, 12.699639]
+          ]
+        ]
+      },
+      "id": "DJI"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Denmark" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [12.690006, 55.609991],
+              [12.089991, 54.800015],
+              [11.043543, 55.364864],
+              [10.903914, 55.779955],
+              [12.370904, 56.111407],
+              [12.690006, 55.609991]
+            ]
+          ],
+          [
+            [
+              [10.912182, 56.458621],
+              [10.667804, 56.081383],
+              [10.369993, 56.190007],
+              [9.649985, 55.469999],
+              [9.921906, 54.983104],
+              [9.282049, 54.830865],
+              [8.526229, 54.962744],
+              [8.120311, 55.517723],
+              [8.089977, 56.540012],
+              [8.256582, 56.809969],
+              [8.543438, 57.110003],
+              [9.424469, 57.172066],
+              [9.775559, 57.447941],
+              [10.580006, 57.730017],
+              [10.546106, 57.215733],
+              [10.25, 56.890016],
+              [10.369993, 56.609982],
+              [10.912182, 56.458621]
+            ]
+          ]
+        ]
+      },
+      "id": "DNK"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Dominican Republic" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-71.712361, 19.714456],
+            [-71.587304, 19.884911],
+            [-70.806706, 19.880286],
+            [-70.214365, 19.622885],
+            [-69.950815, 19.648],
+            [-69.76925, 19.293267],
+            [-69.222126, 19.313214],
+            [-69.254346, 19.015196],
+            [-68.809412, 18.979074],
+            [-68.317943, 18.612198],
+            [-68.689316, 18.205142],
+            [-69.164946, 18.422648],
+            [-69.623988, 18.380713],
+            [-69.952934, 18.428307],
+            [-70.133233, 18.245915],
+            [-70.517137, 18.184291],
+            [-70.669298, 18.426886],
+            [-70.99995, 18.283329],
+            [-71.40021, 17.598564],
+            [-71.657662, 17.757573],
+            [-71.708305, 18.044997],
+            [-71.687738, 18.31666],
+            [-71.945112, 18.6169],
+            [-71.701303, 18.785417],
+            [-71.624873, 19.169838],
+            [-71.712361, 19.714456]
+          ]
+        ]
+      },
+      "id": "DOM"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Algeria" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [11.999506, 23.471668],
+            [8.572893, 21.565661],
+            [5.677566, 19.601207],
+            [4.267419, 19.155265],
+            [3.158133, 19.057364],
+            [3.146661, 19.693579],
+            [2.683588, 19.85623],
+            [2.060991, 20.142233],
+            [1.823228, 20.610809],
+            [-1.550055, 22.792666],
+            [-4.923337, 24.974574],
+            [-8.6844, 27.395744],
+            [-8.665124, 27.589479],
+            [-8.66559, 27.656426],
+            [-8.674116, 28.841289],
+            [-7.059228, 29.579228],
+            [-6.060632, 29.7317],
+            [-5.242129, 30.000443],
+            [-4.859646, 30.501188],
+            [-3.690441, 30.896952],
+            [-3.647498, 31.637294],
+            [-3.06898, 31.724498],
+            [-2.616605, 32.094346],
+            [-1.307899, 32.262889],
+            [-1.124551, 32.651522],
+            [-1.388049, 32.864015],
+            [-1.733455, 33.919713],
+            [-1.792986, 34.527919],
+            [-2.169914, 35.168396],
+            [-1.208603, 35.714849],
+            [-0.127454, 35.888662],
+            [0.503877, 36.301273],
+            [1.466919, 36.605647],
+            [3.161699, 36.783905],
+            [4.815758, 36.865037],
+            [5.32012, 36.716519],
+            [6.26182, 37.110655],
+            [7.330385, 37.118381],
+            [7.737078, 36.885708],
+            [8.420964, 36.946427],
+            [8.217824, 36.433177],
+            [8.376368, 35.479876],
+            [8.140981, 34.655146],
+            [7.524482, 34.097376],
+            [7.612642, 33.344115],
+            [8.430473, 32.748337],
+            [8.439103, 32.506285],
+            [9.055603, 32.102692],
+            [9.48214, 30.307556],
+            [9.805634, 29.424638],
+            [9.859998, 28.95999],
+            [9.683885, 28.144174],
+            [9.756128, 27.688259],
+            [9.629056, 27.140953],
+            [9.716286, 26.512206],
+            [9.319411, 26.094325],
+            [9.910693, 25.365455],
+            [9.948261, 24.936954],
+            [10.303847, 24.379313],
+            [10.771364, 24.562532],
+            [11.560669, 24.097909],
+            [11.999506, 23.471668]
+          ]
+        ]
+      },
+      "id": "DZA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Ecuador" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-80.302561, -3.404856],
+            [-79.770293, -2.657512],
+            [-79.986559, -2.220794],
+            [-80.368784, -2.685159],
+            [-80.967765, -2.246943],
+            [-80.764806, -1.965048],
+            [-80.933659, -1.057455],
+            [-80.58337, -0.906663],
+            [-80.399325, -0.283703],
+            [-80.020898, 0.36034],
+            [-80.09061, 0.768429],
+            [-79.542762, 0.982938],
+            [-78.855259, 1.380924],
+            [-77.855061, 0.809925],
+            [-77.668613, 0.825893],
+            [-77.424984, 0.395687],
+            [-76.57638, 0.256936],
+            [-76.292314, 0.416047],
+            [-75.801466, 0.084801],
+            [-75.373223, -0.152032],
+            [-75.233723, -0.911417],
+            [-75.544996, -1.56161],
+            [-76.635394, -2.608678],
+            [-77.837905, -3.003021],
+            [-78.450684, -3.873097],
+            [-78.639897, -4.547784],
+            [-79.205289, -4.959129],
+            [-79.624979, -4.454198],
+            [-80.028908, -4.346091],
+            [-80.442242, -4.425724],
+            [-80.469295, -4.059287],
+            [-80.184015, -3.821162],
+            [-80.302561, -3.404856]
+          ]
+        ]
+      },
+      "id": "ECU"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Egypt" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [34.9226, 29.50133],
+            [34.64174, 29.09942],
+            [34.42655, 28.34399],
+            [34.15451, 27.8233],
+            [33.92136, 27.6487],
+            [33.58811, 27.97136],
+            [33.13676, 28.41765],
+            [32.42323, 29.85108],
+            [32.32046, 29.76043],
+            [32.73482, 28.70523],
+            [33.34876, 27.69989],
+            [34.10455, 26.14227],
+            [34.47387, 25.59856],
+            [34.79507, 25.03375],
+            [35.69241, 23.92671],
+            [35.49372, 23.75237],
+            [35.52598, 23.10244],
+            [36.69069, 22.20485],
+            [36.86623, 22],
+            [32.9, 22],
+            [29.02, 22],
+            [25, 22],
+            [25, 25.6825],
+            [25, 29.238655],
+            [24.70007, 30.04419],
+            [24.95762, 30.6616],
+            [24.80287, 31.08929],
+            [25.16482, 31.56915],
+            [26.49533, 31.58568],
+            [27.45762, 31.32126],
+            [28.45048, 31.02577],
+            [28.91353, 30.87005],
+            [29.68342, 31.18686],
+            [30.09503, 31.4734],
+            [30.97693, 31.55586],
+            [31.68796, 31.4296],
+            [31.96041, 30.9336],
+            [32.19247, 31.26034],
+            [32.99392, 31.02407],
+            [33.7734, 30.96746],
+            [34.26544, 31.21936],
+            [34.9226, 29.50133]
+          ]
+        ]
+      },
+      "id": "EGY"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Eritrea" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [42.35156, 12.54223],
+            [42.00975, 12.86582],
+            [41.59856, 13.45209],
+            [41.155194, 13.77332],
+            [40.8966, 14.11864],
+            [40.026219, 14.519579],
+            [39.34061, 14.53155],
+            [39.0994, 14.74064],
+            [38.51295, 14.50547],
+            [37.90607, 14.95943],
+            [37.59377, 14.2131],
+            [36.42951, 14.42211],
+            [36.323189, 14.822481],
+            [36.75386, 16.291874],
+            [36.85253, 16.95655],
+            [37.16747, 17.26314],
+            [37.904, 17.42754],
+            [38.41009, 17.998307],
+            [38.990623, 16.840626],
+            [39.26611, 15.922723],
+            [39.814294, 15.435647],
+            [41.179275, 14.49108],
+            [41.734952, 13.921037],
+            [42.276831, 13.343992],
+            [42.589576, 13.000421],
+            [43.081226, 12.699639],
+            [42.779642, 12.455416],
+            [42.35156, 12.54223]
+          ]
+        ]
+      },
+      "id": "ERI"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Spain" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-9.034818, 41.880571],
+            [-8.984433, 42.592775],
+            [-9.392884, 43.026625],
+            [-7.97819, 43.748338],
+            [-6.754492, 43.567909],
+            [-5.411886, 43.57424],
+            [-4.347843, 43.403449],
+            [-3.517532, 43.455901],
+            [-1.901351, 43.422802],
+            [-1.502771, 43.034014],
+            [0.338047, 42.579546],
+            [0.701591, 42.795734],
+            [1.826793, 42.343385],
+            [2.985999, 42.473015],
+            [3.039484, 41.89212],
+            [2.091842, 41.226089],
+            [0.810525, 41.014732],
+            [0.721331, 40.678318],
+            [0.106692, 40.123934],
+            [-0.278711, 39.309978],
+            [0.111291, 38.738514],
+            [-0.467124, 38.292366],
+            [-0.683389, 37.642354],
+            [-1.438382, 37.443064],
+            [-2.146453, 36.674144],
+            [-3.415781, 36.6589],
+            [-4.368901, 36.677839],
+            [-4.995219, 36.324708],
+            [-5.37716, 35.94685],
+            [-5.866432, 36.029817],
+            [-6.236694, 36.367677],
+            [-6.520191, 36.942913],
+            [-7.453726, 37.097788],
+            [-7.537105, 37.428904],
+            [-7.166508, 37.803894],
+            [-7.029281, 38.075764],
+            [-7.374092, 38.373059],
+            [-7.098037, 39.030073],
+            [-7.498632, 39.629571],
+            [-7.066592, 39.711892],
+            [-7.026413, 40.184524],
+            [-6.86402, 40.330872],
+            [-6.851127, 41.111083],
+            [-6.389088, 41.381815],
+            [-6.668606, 41.883387],
+            [-7.251309, 41.918346],
+            [-7.422513, 41.792075],
+            [-8.013175, 41.790886],
+            [-8.263857, 42.280469],
+            [-8.671946, 42.134689],
+            [-9.034818, 41.880571]
+          ]
+        ]
+      },
+      "id": "ESP"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Estonia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [24.312863, 57.793424],
+            [24.428928, 58.383413],
+            [24.061198, 58.257375],
+            [23.42656, 58.612753],
+            [23.339795, 59.18724],
+            [24.604214, 59.465854],
+            [25.864189, 59.61109],
+            [26.949136, 59.445803],
+            [27.981114, 59.475388],
+            [28.131699, 59.300825],
+            [27.420166, 58.724581],
+            [27.716686, 57.791899],
+            [27.288185, 57.474528],
+            [26.463532, 57.476389],
+            [25.60281, 57.847529],
+            [25.164594, 57.970157],
+            [24.312863, 57.793424]
+          ]
+        ]
+      },
+      "id": "EST"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Ethiopia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [37.90607, 14.95943],
+            [38.51295, 14.50547],
+            [39.0994, 14.74064],
+            [39.34061, 14.53155],
+            [40.02625, 14.51959],
+            [40.8966, 14.11864],
+            [41.1552, 13.77333],
+            [41.59856, 13.45209],
+            [42.00975, 12.86582],
+            [42.35156, 12.54223],
+            [42, 12.1],
+            [41.66176, 11.6312],
+            [41.73959, 11.35511],
+            [41.75557, 11.05091],
+            [42.31414, 11.0342],
+            [42.55493, 11.10511],
+            [42.776852, 10.926879],
+            [42.55876, 10.57258],
+            [42.92812, 10.02194],
+            [43.29699, 9.54048],
+            [43.67875, 9.18358],
+            [46.94834, 7.99688],
+            [47.78942, 8.003],
+            [44.9636, 5.00162],
+            [43.66087, 4.95755],
+            [42.76967, 4.25259],
+            [42.12861, 4.23413],
+            [41.855083, 3.918912],
+            [41.1718, 3.91909],
+            [40.76848, 4.25702],
+            [39.85494, 3.83879],
+            [39.559384, 3.42206],
+            [38.89251, 3.50074],
+            [38.67114, 3.61607],
+            [38.43697, 3.58851],
+            [38.120915, 3.598605],
+            [36.855093, 4.447864],
+            [36.159079, 4.447864],
+            [35.817448, 4.776966],
+            [35.817448, 5.338232],
+            [35.298007, 5.506],
+            [34.70702, 6.59422],
+            [34.25032, 6.82607],
+            [34.0751, 7.22595],
+            [33.56829, 7.71334],
+            [32.95418, 7.78497],
+            [33.2948, 8.35458],
+            [33.8255, 8.37916],
+            [33.97498, 8.68456],
+            [33.96162, 9.58358],
+            [34.25745, 10.63009],
+            [34.73115, 10.91017],
+            [34.83163, 11.31896],
+            [35.26049, 12.08286],
+            [35.86363, 12.57828],
+            [36.27022, 13.56333],
+            [36.42951, 14.42211],
+            [37.59377, 14.2131],
+            [37.90607, 14.95943]
+          ]
+        ]
+      },
+      "id": "ETH"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Finland" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [28.59193, 69.064777],
+            [28.445944, 68.364613],
+            [29.977426, 67.698297],
+            [29.054589, 66.944286],
+            [30.21765, 65.80598],
+            [29.54443, 64.948672],
+            [30.444685, 64.204453],
+            [30.035872, 63.552814],
+            [31.516092, 62.867687],
+            [31.139991, 62.357693],
+            [30.211107, 61.780028],
+            [28.069998, 60.503517],
+            [26.255173, 60.423961],
+            [24.496624, 60.057316],
+            [22.869695, 59.846373],
+            [22.290764, 60.391921],
+            [21.322244, 60.72017],
+            [21.544866, 61.705329],
+            [21.059211, 62.607393],
+            [21.536029, 63.189735],
+            [22.442744, 63.81781],
+            [24.730512, 64.902344],
+            [25.398068, 65.111427],
+            [25.294043, 65.534346],
+            [23.903379, 66.006927],
+            [23.56588, 66.396051],
+            [23.539473, 67.936009],
+            [21.978535, 68.616846],
+            [20.645593, 69.106247],
+            [21.244936, 69.370443],
+            [22.356238, 68.841741],
+            [23.66205, 68.891247],
+            [24.735679, 68.649557],
+            [25.689213, 69.092114],
+            [26.179622, 69.825299],
+            [27.732292, 70.164193],
+            [29.015573, 69.766491],
+            [28.59193, 69.064777]
+          ]
+        ]
+      },
+      "id": "FIN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Fiji" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [178.3736, -17.33992],
+              [178.71806, -17.62846],
+              [178.55271, -18.15059],
+              [177.93266, -18.28799],
+              [177.38146, -18.16432],
+              [177.28504, -17.72465],
+              [177.67087, -17.38114],
+              [178.12557, -17.50481],
+              [178.3736, -17.33992]
+            ]
+          ],
+          [
+            [
+              [179.364143, -16.801354],
+              [178.725059, -17.012042],
+              [178.596839, -16.63915],
+              [179.096609, -16.433984],
+              [179.413509, -16.379054],
+              [180, -16.067133],
+              [180, -16.555217],
+              [179.364143, -16.801354]
+            ]
+          ],
+          [
+            [
+              [-179.917369, -16.501783],
+              [-180, -16.555217],
+              [-180, -16.067133],
+              [-179.79332, -16.020882],
+              [-179.917369, -16.501783]
+            ]
+          ]
+        ]
+      },
+      "id": "FJI"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Falkland Islands" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-61.2, -51.85],
+            [-60, -51.25],
+            [-59.15, -51.5],
+            [-58.55, -51.1],
+            [-57.75, -51.55],
+            [-58.05, -51.9],
+            [-59.4, -52.2],
+            [-59.85, -51.85],
+            [-60.7, -52.3],
+            [-61.2, -51.85]
+          ]
+        ]
+      },
+      "id": "FLK"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "France" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [9.560016, 42.152492],
+              [9.229752, 41.380007],
+              [8.775723, 41.583612],
+              [8.544213, 42.256517],
+              [8.746009, 42.628122],
+              [9.390001, 43.009985],
+              [9.560016, 42.152492]
+            ]
+          ],
+          [
+            [
+              [3.588184, 50.378992],
+              [4.286023, 49.907497],
+              [4.799222, 49.985373],
+              [5.674052, 49.529484],
+              [5.897759, 49.442667],
+              [6.18632, 49.463803],
+              [6.65823, 49.201958],
+              [8.099279, 49.017784],
+              [7.593676, 48.333019],
+              [7.466759, 47.620582],
+              [7.192202, 47.449766],
+              [6.736571, 47.541801],
+              [6.768714, 47.287708],
+              [6.037389, 46.725779],
+              [6.022609, 46.27299],
+              [6.5001, 46.429673],
+              [6.843593, 45.991147],
+              [6.802355, 45.70858],
+              [7.096652, 45.333099],
+              [6.749955, 45.028518],
+              [7.007562, 44.254767],
+              [7.549596, 44.127901],
+              [7.435185, 43.693845],
+              [6.529245, 43.128892],
+              [4.556963, 43.399651],
+              [3.100411, 43.075201],
+              [2.985999, 42.473015],
+              [1.826793, 42.343385],
+              [0.701591, 42.795734],
+              [0.338047, 42.579546],
+              [-1.502771, 43.034014],
+              [-1.901351, 43.422802],
+              [-1.384225, 44.02261],
+              [-1.193798, 46.014918],
+              [-2.225724, 47.064363],
+              [-2.963276, 47.570327],
+              [-4.491555, 47.954954],
+              [-4.59235, 48.68416],
+              [-3.295814, 48.901692],
+              [-1.616511, 48.644421],
+              [-1.933494, 49.776342],
+              [-0.989469, 49.347376],
+              [1.338761, 50.127173],
+              [1.639001, 50.946606],
+              [2.513573, 51.148506],
+              [2.658422, 50.796848],
+              [3.123252, 50.780363],
+              [3.588184, 50.378992]
+            ]
+          ]
+        ]
+      },
+      "id": "FRA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "French Guiana" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [-52.556425, 2.504705],
+              [-52.939657, 2.124858],
+              [-53.418465, 2.053389],
+              [-53.554839, 2.334897],
+              [-53.778521, 2.376703],
+              [-54.088063, 2.105557],
+              [-54.524754, 2.311849],
+              [-54.27123, 2.738748],
+              [-54.184284, 3.194172],
+              [-54.011504, 3.62257],
+              [-54.399542, 4.212611],
+              [-54.478633, 4.896756],
+              [-53.958045, 5.756548],
+              [-53.618453, 5.646529],
+              [-52.882141, 5.409851],
+              [-51.823343, 4.565768],
+              [-51.657797, 4.156232],
+              [-52.249338, 3.241094],
+              [-52.556425, 2.504705]
+            ]
+          ]
+        ]
+      },
+      "id": "GUF"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Gabon" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [11.093773, -3.978827],
+            [10.066135, -2.969483],
+            [9.405245, -2.144313],
+            [8.797996, -1.111301],
+            [8.830087, -0.779074],
+            [9.04842, -0.459351],
+            [9.291351, 0.268666],
+            [9.492889, 1.01012],
+            [9.830284, 1.067894],
+            [11.285079, 1.057662],
+            [11.276449, 2.261051],
+            [11.751665, 2.326758],
+            [12.35938, 2.192812],
+            [12.951334, 2.321616],
+            [13.075822, 2.267097],
+            [13.003114, 1.830896],
+            [13.282631, 1.314184],
+            [14.026669, 1.395677],
+            [14.276266, 1.19693],
+            [13.843321, 0.038758],
+            [14.316418, -0.552627],
+            [14.425456, -1.333407],
+            [14.29921, -1.998276],
+            [13.992407, -2.470805],
+            [13.109619, -2.42874],
+            [12.575284, -1.948511],
+            [12.495703, -2.391688],
+            [11.820964, -2.514161],
+            [11.478039, -2.765619],
+            [11.855122, -3.426871],
+            [11.093773, -3.978827]
+          ]
+        ]
+      },
+      "id": "GAB"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "United Kingdom" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [-5.661949, 54.554603],
+              [-6.197885, 53.867565],
+              [-6.95373, 54.073702],
+              [-7.572168, 54.059956],
+              [-7.366031, 54.595841],
+              [-7.572168, 55.131622],
+              [-6.733847, 55.17286],
+              [-5.661949, 54.554603]
+            ]
+          ],
+          [
+            [
+              [-3.005005, 58.635],
+              [-4.073828, 57.553025],
+              [-3.055002, 57.690019],
+              [-1.959281, 57.6848],
+              [-2.219988, 56.870017],
+              [-3.119003, 55.973793],
+              [-2.085009, 55.909998],
+              [-2.005676, 55.804903],
+              [-1.114991, 54.624986],
+              [-0.430485, 54.464376],
+              [0.184981, 53.325014],
+              [0.469977, 52.929999],
+              [1.681531, 52.73952],
+              [1.559988, 52.099998],
+              [1.050562, 51.806761],
+              [1.449865, 51.289428],
+              [0.550334, 50.765739],
+              [-0.787517, 50.774989],
+              [-2.489998, 50.500019],
+              [-2.956274, 50.69688],
+              [-3.617448, 50.228356],
+              [-4.542508, 50.341837],
+              [-5.245023, 49.96],
+              [-5.776567, 50.159678],
+              [-4.30999, 51.210001],
+              [-3.414851, 51.426009],
+              [-3.422719, 51.426848],
+              [-4.984367, 51.593466],
+              [-5.267296, 51.9914],
+              [-4.222347, 52.301356],
+              [-4.770013, 52.840005],
+              [-4.579999, 53.495004],
+              [-3.093831, 53.404547],
+              [-3.09208, 53.404441],
+              [-2.945009, 53.985],
+              [-3.614701, 54.600937],
+              [-3.630005, 54.615013],
+              [-4.844169, 54.790971],
+              [-5.082527, 55.061601],
+              [-4.719112, 55.508473],
+              [-5.047981, 55.783986],
+              [-5.586398, 55.311146],
+              [-5.644999, 56.275015],
+              [-6.149981, 56.78501],
+              [-5.786825, 57.818848],
+              [-5.009999, 58.630013],
+              [-4.211495, 58.550845],
+              [-3.005005, 58.635]
+            ]
+          ]
+        ]
+      },
+      "id": "GBR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Georgia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [41.554084, 41.535656],
+            [41.703171, 41.962943],
+            [41.45347, 42.645123],
+            [40.875469, 43.013628],
+            [40.321394, 43.128634],
+            [39.955009, 43.434998],
+            [40.076965, 43.553104],
+            [40.922185, 43.382159],
+            [42.394395, 43.220308],
+            [43.756017, 42.740828],
+            [43.9312, 42.554974],
+            [44.537623, 42.711993],
+            [45.470279, 42.502781],
+            [45.77641, 42.092444],
+            [46.404951, 41.860675],
+            [46.145432, 41.722802],
+            [46.637908, 41.181673],
+            [46.501637, 41.064445],
+            [45.962601, 41.123873],
+            [45.217426, 41.411452],
+            [44.97248, 41.248129],
+            [43.582746, 41.092143],
+            [42.619549, 41.583173],
+            [41.554084, 41.535656]
+          ]
+        ]
+      },
+      "id": "GEO"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Ghana" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [1.060122, 5.928837],
+            [-0.507638, 5.343473],
+            [-1.063625, 5.000548],
+            [-1.964707, 4.710462],
+            [-2.856125, 4.994476],
+            [-2.810701, 5.389051],
+            [-3.24437, 6.250472],
+            [-2.983585, 7.379705],
+            [-2.56219, 8.219628],
+            [-2.827496, 9.642461],
+            [-2.963896, 10.395335],
+            [-2.940409, 10.96269],
+            [-1.203358, 11.009819],
+            [-0.761576, 10.93693],
+            [-0.438702, 11.098341],
+            [0.023803, 11.018682],
+            [-0.049785, 10.706918],
+            [0.36758, 10.191213],
+            [0.365901, 9.465004],
+            [0.461192, 8.677223],
+            [0.712029, 8.312465],
+            [0.490957, 7.411744],
+            [0.570384, 6.914359],
+            [0.836931, 6.279979],
+            [1.060122, 5.928837]
+          ]
+        ]
+      },
+      "id": "GHA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Guinea" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-8.439298, 7.686043],
+            [-8.722124, 7.711674],
+            [-8.926065, 7.309037],
+            [-9.208786, 7.313921],
+            [-9.403348, 7.526905],
+            [-9.33728, 7.928534],
+            [-9.755342, 8.541055],
+            [-10.016567, 8.428504],
+            [-10.230094, 8.406206],
+            [-10.505477, 8.348896],
+            [-10.494315, 8.715541],
+            [-10.65477, 8.977178],
+            [-10.622395, 9.26791],
+            [-10.839152, 9.688246],
+            [-11.117481, 10.045873],
+            [-11.917277, 10.046984],
+            [-12.150338, 9.858572],
+            [-12.425929, 9.835834],
+            [-12.596719, 9.620188],
+            [-12.711958, 9.342712],
+            [-13.24655, 8.903049],
+            [-13.685154, 9.494744],
+            [-14.074045, 9.886167],
+            [-14.330076, 10.01572],
+            [-14.579699, 10.214467],
+            [-14.693232, 10.656301],
+            [-14.839554, 10.876572],
+            [-15.130311, 11.040412],
+            [-14.685687, 11.527824],
+            [-14.382192, 11.509272],
+            [-14.121406, 11.677117],
+            [-13.9008, 11.678719],
+            [-13.743161, 11.811269],
+            [-13.828272, 12.142644],
+            [-13.718744, 12.247186],
+            [-13.700476, 12.586183],
+            [-13.217818, 12.575874],
+            [-12.499051, 12.33209],
+            [-12.278599, 12.35444],
+            [-12.203565, 12.465648],
+            [-11.658301, 12.386583],
+            [-11.513943, 12.442988],
+            [-11.456169, 12.076834],
+            [-11.297574, 12.077971],
+            [-11.036556, 12.211245],
+            [-10.87083, 12.177887],
+            [-10.593224, 11.923975],
+            [-10.165214, 11.844084],
+            [-9.890993, 12.060479],
+            [-9.567912, 12.194243],
+            [-9.327616, 12.334286],
+            [-9.127474, 12.30806],
+            [-8.905265, 12.088358],
+            [-8.786099, 11.812561],
+            [-8.376305, 11.393646],
+            [-8.581305, 11.136246],
+            [-8.620321, 10.810891],
+            [-8.407311, 10.909257],
+            [-8.282357, 10.792597],
+            [-8.335377, 10.494812],
+            [-8.029944, 10.206535],
+            [-8.229337, 10.12902],
+            [-8.309616, 9.789532],
+            [-8.079114, 9.376224],
+            [-7.8321, 8.575704],
+            [-8.203499, 8.455453],
+            [-8.299049, 8.316444],
+            [-8.221792, 8.123329],
+            [-8.280703, 7.68718],
+            [-8.439298, 7.686043]
+          ]
+        ]
+      },
+      "id": "GIN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Gambia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-16.841525, 13.151394],
+            [-16.713729, 13.594959],
+            [-15.624596, 13.623587],
+            [-15.39877, 13.860369],
+            [-15.081735, 13.876492],
+            [-14.687031, 13.630357],
+            [-14.376714, 13.62568],
+            [-14.046992, 13.794068],
+            [-13.844963, 13.505042],
+            [-14.277702, 13.280585],
+            [-14.712197, 13.298207],
+            [-15.141163, 13.509512],
+            [-15.511813, 13.27857],
+            [-15.691001, 13.270353],
+            [-15.931296, 13.130284],
+            [-16.841525, 13.151394]
+          ]
+        ]
+      },
+      "id": "GMB"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Guinea Bissau" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-15.130311, 11.040412],
+            [-15.66418, 11.458474],
+            [-16.085214, 11.524594],
+            [-16.314787, 11.806515],
+            [-16.308947, 11.958702],
+            [-16.613838, 12.170911],
+            [-16.677452, 12.384852],
+            [-16.147717, 12.547762],
+            [-15.816574, 12.515567],
+            [-15.548477, 12.62817],
+            [-13.700476, 12.586183],
+            [-13.718744, 12.247186],
+            [-13.828272, 12.142644],
+            [-13.743161, 11.811269],
+            [-13.9008, 11.678719],
+            [-14.121406, 11.677117],
+            [-14.382192, 11.509272],
+            [-14.685687, 11.527824],
+            [-15.130311, 11.040412]
+          ]
+        ]
+      },
+      "id": "GNB"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Equatorial Guinea" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [9.492889, 1.01012],
+            [9.305613, 1.160911],
+            [9.649158, 2.283866],
+            [11.276449, 2.261051],
+            [11.285079, 1.057662],
+            [9.830284, 1.067894],
+            [9.492889, 1.01012]
+          ]
+        ]
+      },
+      "id": "GNQ"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Greece" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [23.69998, 35.705004],
+              [24.246665, 35.368022],
+              [25.025015, 35.424996],
+              [25.769208, 35.354018],
+              [25.745023, 35.179998],
+              [26.290003, 35.29999],
+              [26.164998, 35.004995],
+              [24.724982, 34.919988],
+              [24.735007, 35.084991],
+              [23.514978, 35.279992],
+              [23.69998, 35.705004]
+            ]
+          ],
+          [
+            [
+              [26.604196, 41.562115],
+              [26.294602, 40.936261],
+              [26.056942, 40.824123],
+              [25.447677, 40.852545],
+              [24.925848, 40.947062],
+              [23.714811, 40.687129],
+              [24.407999, 40.124993],
+              [23.899968, 39.962006],
+              [23.342999, 39.960998],
+              [22.813988, 40.476005],
+              [22.626299, 40.256561],
+              [22.849748, 39.659311],
+              [23.350027, 39.190011],
+              [22.973099, 38.970903],
+              [23.530016, 38.510001],
+              [24.025025, 38.219993],
+              [24.040011, 37.655015],
+              [23.115003, 37.920011],
+              [23.409972, 37.409991],
+              [22.774972, 37.30501],
+              [23.154225, 36.422506],
+              [22.490028, 36.41],
+              [21.670026, 36.844986],
+              [21.295011, 37.644989],
+              [21.120034, 38.310323],
+              [20.730032, 38.769985],
+              [20.217712, 39.340235],
+              [20.150016, 39.624998],
+              [20.615, 40.110007],
+              [20.674997, 40.435],
+              [20.99999, 40.580004],
+              [21.02004, 40.842727],
+              [21.674161, 40.931275],
+              [22.055378, 41.149866],
+              [22.597308, 41.130487],
+              [22.76177, 41.3048],
+              [22.952377, 41.337994],
+              [23.692074, 41.309081],
+              [24.492645, 41.583896],
+              [25.197201, 41.234486],
+              [26.106138, 41.328899],
+              [26.117042, 41.826905],
+              [26.604196, 41.562115]
+            ]
+          ]
+        ]
+      },
+      "id": "GRC"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Greenland" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-46.76379, 82.62796],
+            [-43.40644, 83.22516],
+            [-39.89753, 83.18018],
+            [-38.62214, 83.54905],
+            [-35.08787, 83.64513],
+            [-27.10046, 83.51966],
+            [-20.84539, 82.72669],
+            [-22.69182, 82.34165],
+            [-26.51753, 82.29765],
+            [-31.9, 82.2],
+            [-31.39646, 82.02154],
+            [-27.85666, 82.13178],
+            [-24.84448, 81.78697],
+            [-22.90328, 82.09317],
+            [-22.07175, 81.73449],
+            [-23.16961, 81.15271],
+            [-20.62363, 81.52462],
+            [-15.76818, 81.91245],
+            [-12.77018, 81.71885],
+            [-12.20855, 81.29154],
+            [-16.28533, 80.58004],
+            [-16.85, 80.35],
+            [-20.04624, 80.17708],
+            [-17.73035, 80.12912],
+            [-18.9, 79.4],
+            [-19.70499, 78.75128],
+            [-19.67353, 77.63859],
+            [-18.47285, 76.98565],
+            [-20.03503, 76.94434],
+            [-21.67944, 76.62795],
+            [-19.83407, 76.09808],
+            [-19.59896, 75.24838],
+            [-20.66818, 75.15585],
+            [-19.37281, 74.29561],
+            [-21.59422, 74.22382],
+            [-20.43454, 73.81713],
+            [-20.76234, 73.46436],
+            [-22.17221, 73.30955],
+            [-23.56593, 73.30663],
+            [-22.31311, 72.62928],
+            [-22.29954, 72.18409],
+            [-24.27834, 72.59788],
+            [-24.79296, 72.3302],
+            [-23.44296, 72.08016],
+            [-22.13281, 71.46898],
+            [-21.75356, 70.66369],
+            [-23.53603, 70.471],
+            [-24.30702, 70.85649],
+            [-25.54341, 71.43094],
+            [-25.20135, 70.75226],
+            [-26.36276, 70.22646],
+            [-23.72742, 70.18401],
+            [-22.34902, 70.12946],
+            [-25.02927, 69.2588],
+            [-27.74737, 68.47046],
+            [-30.67371, 68.12503],
+            [-31.77665, 68.12078],
+            [-32.81105, 67.73547],
+            [-34.20196, 66.67974],
+            [-36.35284, 65.9789],
+            [-37.04378, 65.93768],
+            [-38.37505, 65.69213],
+            [-39.81222, 65.45848],
+            [-40.66899, 64.83997],
+            [-40.68281, 64.13902],
+            [-41.1887, 63.48246],
+            [-42.81938, 62.68233],
+            [-42.41666, 61.90093],
+            [-42.86619, 61.07404],
+            [-43.3784, 60.09772],
+            [-44.7875, 60.03676],
+            [-46.26364, 60.85328],
+            [-48.26294, 60.85843],
+            [-49.23308, 61.40681],
+            [-49.90039, 62.38336],
+            [-51.63325, 63.62691],
+            [-52.14014, 64.27842],
+            [-52.27659, 65.1767],
+            [-53.66166, 66.09957],
+            [-53.30161, 66.8365],
+            [-53.96911, 67.18899],
+            [-52.9804, 68.35759],
+            [-51.47536, 68.72958],
+            [-51.08041, 69.14781],
+            [-50.87122, 69.9291],
+            [-52.013585, 69.574925],
+            [-52.55792, 69.42616],
+            [-53.45629, 69.283625],
+            [-54.68336, 69.61003],
+            [-54.75001, 70.28932],
+            [-54.35884, 70.821315],
+            [-53.431315, 70.835755],
+            [-51.39014, 70.56978],
+            [-53.10937, 71.20485],
+            [-54.00422, 71.54719],
+            [-55, 71.406537],
+            [-55.83468, 71.65444],
+            [-54.71819, 72.58625],
+            [-55.32634, 72.95861],
+            [-56.12003, 73.64977],
+            [-57.32363, 74.71026],
+            [-58.59679, 75.09861],
+            [-58.58516, 75.51727],
+            [-61.26861, 76.10238],
+            [-63.39165, 76.1752],
+            [-66.06427, 76.13486],
+            [-68.50438, 76.06141],
+            [-69.66485, 76.37975],
+            [-71.40257, 77.00857],
+            [-68.77671, 77.32312],
+            [-66.76397, 77.37595],
+            [-71.04293, 77.63595],
+            [-73.297, 78.04419],
+            [-73.15938, 78.43271],
+            [-69.37345, 78.91388],
+            [-65.7107, 79.39436],
+            [-65.3239, 79.75814],
+            [-68.02298, 80.11721],
+            [-67.15129, 80.51582],
+            [-63.68925, 81.21396],
+            [-62.23444, 81.3211],
+            [-62.65116, 81.77042],
+            [-60.28249, 82.03363],
+            [-57.20744, 82.19074],
+            [-54.13442, 82.19962],
+            [-53.04328, 81.88833],
+            [-50.39061, 82.43883],
+            [-48.00386, 82.06481],
+            [-46.59984, 81.985945],
+            [-44.523, 81.6607],
+            [-46.9007, 82.19979],
+            [-46.76379, 82.62796]
+          ]
+        ]
+      },
+      "id": "GRL"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Guatemala" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-90.095555, 13.735338],
+            [-90.608624, 13.909771],
+            [-91.23241, 13.927832],
+            [-91.689747, 14.126218],
+            [-92.22775, 14.538829],
+            [-92.20323, 14.830103],
+            [-92.087216, 15.064585],
+            [-92.229249, 15.251447],
+            [-91.74796, 16.066565],
+            [-90.464473, 16.069562],
+            [-90.438867, 16.41011],
+            [-90.600847, 16.470778],
+            [-90.711822, 16.687483],
+            [-91.08167, 16.918477],
+            [-91.453921, 17.252177],
+            [-91.002269, 17.254658],
+            [-91.00152, 17.817595],
+            [-90.067934, 17.819326],
+            [-89.14308, 17.808319],
+            [-89.150806, 17.015577],
+            [-89.229122, 15.886938],
+            [-88.930613, 15.887273],
+            [-88.604586, 15.70638],
+            [-88.518364, 15.855389],
+            [-88.225023, 15.727722],
+            [-88.68068, 15.346247],
+            [-89.154811, 15.066419],
+            [-89.22522, 14.874286],
+            [-89.145535, 14.678019],
+            [-89.353326, 14.424133],
+            [-89.587343, 14.362586],
+            [-89.534219, 14.244816],
+            [-89.721934, 14.134228],
+            [-90.064678, 13.88197],
+            [-90.095555, 13.735338]
+          ]
+        ]
+      },
+      "id": "GTM"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Guyana" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-59.758285, 8.367035],
+            [-59.101684, 7.999202],
+            [-58.482962, 7.347691],
+            [-58.454876, 6.832787],
+            [-58.078103, 6.809094],
+            [-57.542219, 6.321268],
+            [-57.147436, 5.97315],
+            [-57.307246, 5.073567],
+            [-57.914289, 4.812626],
+            [-57.86021, 4.576801],
+            [-58.044694, 4.060864],
+            [-57.601569, 3.334655],
+            [-57.281433, 3.333492],
+            [-57.150098, 2.768927],
+            [-56.539386, 1.899523],
+            [-56.782704, 1.863711],
+            [-57.335823, 1.948538],
+            [-57.660971, 1.682585],
+            [-58.11345, 1.507195],
+            [-58.429477, 1.463942],
+            [-58.540013, 1.268088],
+            [-59.030862, 1.317698],
+            [-59.646044, 1.786894],
+            [-59.718546, 2.24963],
+            [-59.974525, 2.755233],
+            [-59.815413, 3.606499],
+            [-59.53804, 3.958803],
+            [-59.767406, 4.423503],
+            [-60.111002, 4.574967],
+            [-59.980959, 5.014061],
+            [-60.213683, 5.244486],
+            [-60.733574, 5.200277],
+            [-61.410303, 5.959068],
+            [-61.139415, 6.234297],
+            [-61.159336, 6.696077],
+            [-60.543999, 6.856584],
+            [-60.295668, 7.043911],
+            [-60.637973, 7.415],
+            [-60.550588, 7.779603],
+            [-59.758285, 8.367035]
+          ]
+        ]
+      },
+      "id": "GUY"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Honduras" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-87.316654, 12.984686],
+            [-87.489409, 13.297535],
+            [-87.793111, 13.38448],
+            [-87.723503, 13.78505],
+            [-87.859515, 13.893312],
+            [-88.065343, 13.964626],
+            [-88.503998, 13.845486],
+            [-88.541231, 13.980155],
+            [-88.843073, 14.140507],
+            [-89.058512, 14.340029],
+            [-89.353326, 14.424133],
+            [-89.145535, 14.678019],
+            [-89.22522, 14.874286],
+            [-89.154811, 15.066419],
+            [-88.68068, 15.346247],
+            [-88.225023, 15.727722],
+            [-88.121153, 15.688655],
+            [-87.901813, 15.864458],
+            [-87.61568, 15.878799],
+            [-87.522921, 15.797279],
+            [-87.367762, 15.84694],
+            [-86.903191, 15.756713],
+            [-86.440946, 15.782835],
+            [-86.119234, 15.893449],
+            [-86.001954, 16.005406],
+            [-85.683317, 15.953652],
+            [-85.444004, 15.885749],
+            [-85.182444, 15.909158],
+            [-84.983722, 15.995923],
+            [-84.52698, 15.857224],
+            [-84.368256, 15.835158],
+            [-84.063055, 15.648244],
+            [-83.773977, 15.424072],
+            [-83.410381, 15.270903],
+            [-83.147219, 14.995829],
+            [-83.489989, 15.016267],
+            [-83.628585, 14.880074],
+            [-83.975721, 14.749436],
+            [-84.228342, 14.748764],
+            [-84.449336, 14.621614],
+            [-84.649582, 14.666805],
+            [-84.820037, 14.819587],
+            [-84.924501, 14.790493],
+            [-85.052787, 14.551541],
+            [-85.148751, 14.560197],
+            [-85.165365, 14.35437],
+            [-85.514413, 14.079012],
+            [-85.698665, 13.960078],
+            [-85.801295, 13.836055],
+            [-86.096264, 14.038187],
+            [-86.312142, 13.771356],
+            [-86.520708, 13.778487],
+            [-86.755087, 13.754845],
+            [-86.733822, 13.263093],
+            [-86.880557, 13.254204],
+            [-87.005769, 13.025794],
+            [-87.316654, 12.984686]
+          ]
+        ]
+      },
+      "id": "HND"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Croatia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [18.829838, 45.908878],
+            [19.072769, 45.521511],
+            [19.390476, 45.236516],
+            [19.005486, 44.860234],
+            [18.553214, 45.08159],
+            [17.861783, 45.06774],
+            [17.002146, 45.233777],
+            [16.534939, 45.211608],
+            [16.318157, 45.004127],
+            [15.959367, 45.233777],
+            [15.750026, 44.818712],
+            [16.23966, 44.351143],
+            [16.456443, 44.04124],
+            [16.916156, 43.667722],
+            [17.297373, 43.446341],
+            [17.674922, 43.028563],
+            [18.56, 42.65],
+            [18.450016, 42.479991],
+            [17.50997, 42.849995],
+            [16.930006, 43.209998],
+            [16.015385, 43.507215],
+            [15.174454, 44.243191],
+            [15.37625, 44.317915],
+            [14.920309, 44.738484],
+            [14.901602, 45.07606],
+            [14.258748, 45.233777],
+            [13.952255, 44.802124],
+            [13.656976, 45.136935],
+            [13.679403, 45.484149],
+            [13.71506, 45.500324],
+            [14.411968, 45.466166],
+            [14.595109, 45.634941],
+            [14.935244, 45.471695],
+            [15.327675, 45.452316],
+            [15.323954, 45.731783],
+            [15.67153, 45.834154],
+            [15.768733, 46.238108],
+            [16.564808, 46.503751],
+            [16.882515, 46.380632],
+            [17.630066, 45.951769],
+            [18.456062, 45.759481],
+            [18.829838, 45.908878]
+          ]
+        ]
+      },
+      "id": "HRV"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Haiti" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-73.189791, 19.915684],
+            [-72.579673, 19.871501],
+            [-71.712361, 19.714456],
+            [-71.624873, 19.169838],
+            [-71.701303, 18.785417],
+            [-71.945112, 18.6169],
+            [-71.687738, 18.31666],
+            [-71.708305, 18.044997],
+            [-72.372476, 18.214961],
+            [-72.844411, 18.145611],
+            [-73.454555, 18.217906],
+            [-73.922433, 18.030993],
+            [-74.458034, 18.34255],
+            [-74.369925, 18.664908],
+            [-73.449542, 18.526053],
+            [-72.694937, 18.445799],
+            [-72.334882, 18.668422],
+            [-72.79165, 19.101625],
+            [-72.784105, 19.483591],
+            [-73.415022, 19.639551],
+            [-73.189791, 19.915684]
+          ]
+        ]
+      },
+      "id": "HTI"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Hungary" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [16.202298, 46.852386],
+            [16.534268, 47.496171],
+            [16.340584, 47.712902],
+            [16.903754, 47.714866],
+            [16.979667, 48.123497],
+            [17.488473, 47.867466],
+            [17.857133, 47.758429],
+            [18.696513, 47.880954],
+            [18.777025, 48.081768],
+            [19.174365, 48.111379],
+            [19.661364, 48.266615],
+            [19.769471, 48.202691],
+            [20.239054, 48.327567],
+            [20.473562, 48.56285],
+            [20.801294, 48.623854],
+            [21.872236, 48.319971],
+            [22.085608, 48.422264],
+            [22.64082, 48.15024],
+            [22.710531, 47.882194],
+            [22.099768, 47.672439],
+            [21.626515, 46.994238],
+            [21.021952, 46.316088],
+            [20.220192, 46.127469],
+            [19.596045, 46.17173],
+            [18.829838, 45.908878],
+            [18.456062, 45.759481],
+            [17.630066, 45.951769],
+            [16.882515, 46.380632],
+            [16.564808, 46.503751],
+            [16.370505, 46.841327],
+            [16.202298, 46.852386]
+          ]
+        ]
+      },
+      "id": "HUN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Indonesia" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [120.715609, -10.239581],
+              [120.295014, -10.25865],
+              [118.967808, -9.557969],
+              [119.90031, -9.36134],
+              [120.425756, -9.665921],
+              [120.775502, -9.969675],
+              [120.715609, -10.239581]
+            ]
+          ],
+          [
+            [
+              [124.43595, -10.140001],
+              [123.579982, -10.359987],
+              [123.459989, -10.239995],
+              [123.550009, -9.900016],
+              [123.980009, -9.290027],
+              [124.968682, -8.89279],
+              [125.07002, -9.089987],
+              [125.08852, -9.393173],
+              [124.43595, -10.140001]
+            ]
+          ],
+          [
+            [
+              [117.900018, -8.095681],
+              [118.260616, -8.362383],
+              [118.87846, -8.280683],
+              [119.126507, -8.705825],
+              [117.970402, -8.906639],
+              [117.277731, -9.040895],
+              [116.740141, -9.032937],
+              [117.083737, -8.457158],
+              [117.632024, -8.449303],
+              [117.900018, -8.095681]
+            ]
+          ],
+          [
+            [
+              [122.903537, -8.094234],
+              [122.756983, -8.649808],
+              [121.254491, -8.933666],
+              [119.924391, -8.810418],
+              [119.920929, -8.444859],
+              [120.715092, -8.236965],
+              [121.341669, -8.53674],
+              [122.007365, -8.46062],
+              [122.903537, -8.094234]
+            ]
+          ],
+          [
+            [
+              [108.623479, -6.777674],
+              [110.539227, -6.877358],
+              [110.759576, -6.465186],
+              [112.614811, -6.946036],
+              [112.978768, -7.594213],
+              [114.478935, -7.776528],
+              [115.705527, -8.370807],
+              [114.564511, -8.751817],
+              [113.464734, -8.348947],
+              [112.559672, -8.376181],
+              [111.522061, -8.302129],
+              [110.58615, -8.122605],
+              [109.427667, -7.740664],
+              [108.693655, -7.6416],
+              [108.277763, -7.766657],
+              [106.454102, -7.3549],
+              [106.280624, -6.9249],
+              [105.365486, -6.851416],
+              [106.051646, -5.895919],
+              [107.265009, -5.954985],
+              [108.072091, -6.345762],
+              [108.486846, -6.421985],
+              [108.623479, -6.777674]
+            ]
+          ],
+          [
+            [
+              [134.724624, -6.214401],
+              [134.210134, -6.895238],
+              [134.112776, -6.142467],
+              [134.290336, -5.783058],
+              [134.499625, -5.445042],
+              [134.727002, -5.737582],
+              [134.724624, -6.214401]
+            ]
+          ],
+          [
+            [
+              [127.249215, -3.459065],
+              [126.874923, -3.790983],
+              [126.183802, -3.607376],
+              [125.989034, -3.177273],
+              [127.000651, -3.129318],
+              [127.249215, -3.459065]
+            ]
+          ],
+          [
+            [
+              [130.471344, -3.093764],
+              [130.834836, -3.858472],
+              [129.990547, -3.446301],
+              [129.155249, -3.362637],
+              [128.590684, -3.428679],
+              [127.898891, -3.393436],
+              [128.135879, -2.84365],
+              [129.370998, -2.802154],
+              [130.471344, -3.093764]
+            ]
+          ],
+          [
+            [
+              [134.143368, -1.151867],
+              [134.422627, -2.769185],
+              [135.457603, -3.367753],
+              [136.293314, -2.307042],
+              [137.440738, -1.703513],
+              [138.329727, -1.702686],
+              [139.184921, -2.051296],
+              [139.926684, -2.409052],
+              [141.00021, -2.600151],
+              [141.017057, -5.859022],
+              [141.033852, -9.117893],
+              [140.143415, -8.297168],
+              [139.127767, -8.096043],
+              [138.881477, -8.380935],
+              [137.614474, -8.411683],
+              [138.039099, -7.597882],
+              [138.668621, -7.320225],
+              [138.407914, -6.232849],
+              [137.92784, -5.393366],
+              [135.98925, -4.546544],
+              [135.164598, -4.462931],
+              [133.66288, -3.538853],
+              [133.367705, -4.024819],
+              [132.983956, -4.112979],
+              [132.756941, -3.746283],
+              [132.753789, -3.311787],
+              [131.989804, -2.820551],
+              [133.066845, -2.460418],
+              [133.780031, -2.479848],
+              [133.696212, -2.214542],
+              [132.232373, -2.212526],
+              [131.836222, -1.617162],
+              [130.94284, -1.432522],
+              [130.519558, -0.93772],
+              [131.867538, -0.695461],
+              [132.380116, -0.369538],
+              [133.985548, -0.78021],
+              [134.143368, -1.151867]
+            ]
+          ],
+          [
+            [
+              [125.240501, 1.419836],
+              [124.437035, 0.427881],
+              [123.685505, 0.235593],
+              [122.723083, 0.431137],
+              [121.056725, 0.381217],
+              [120.183083, 0.237247],
+              [120.04087, -0.519658],
+              [120.935905, -1.408906],
+              [121.475821, -0.955962],
+              [123.340565, -0.615673],
+              [123.258399, -1.076213],
+              [122.822715, -0.930951],
+              [122.38853, -1.516858],
+              [121.508274, -1.904483],
+              [122.454572, -3.186058],
+              [122.271896, -3.5295],
+              [123.170963, -4.683693],
+              [123.162333, -5.340604],
+              [122.628515, -5.634591],
+              [122.236394, -5.282933],
+              [122.719569, -4.464172],
+              [121.738234, -4.851331],
+              [121.489463, -4.574553],
+              [121.619171, -4.188478],
+              [120.898182, -3.602105],
+              [120.972389, -2.627643],
+              [120.305453, -2.931604],
+              [120.390047, -4.097579],
+              [120.430717, -5.528241],
+              [119.796543, -5.6734],
+              [119.366906, -5.379878],
+              [119.653606, -4.459417],
+              [119.498835, -3.494412],
+              [119.078344, -3.487022],
+              [118.767769, -2.801999],
+              [119.180974, -2.147104],
+              [119.323394, -1.353147],
+              [119.825999, 0.154254],
+              [120.035702, 0.566477],
+              [120.885779, 1.309223],
+              [121.666817, 1.013944],
+              [122.927567, 0.875192],
+              [124.077522, 0.917102],
+              [125.065989, 1.643259],
+              [125.240501, 1.419836]
+            ]
+          ],
+          [
+            [
+              [128.688249, 1.132386],
+              [128.635952, 0.258486],
+              [128.12017, 0.356413],
+              [127.968034, -0.252077],
+              [128.379999, -0.780004],
+              [128.100016, -0.899996],
+              [127.696475, -0.266598],
+              [127.39949, 1.011722],
+              [127.600512, 1.810691],
+              [127.932378, 2.174596],
+              [128.004156, 1.628531],
+              [128.594559, 1.540811],
+              [128.688249, 1.132386]
+            ]
+          ],
+          [
+            [
+              [117.875627, 1.827641],
+              [118.996747, 0.902219],
+              [117.811858, 0.784242],
+              [117.478339, 0.102475],
+              [117.521644, -0.803723],
+              [116.560048, -1.487661],
+              [116.533797, -2.483517],
+              [116.148084, -4.012726],
+              [116.000858, -3.657037],
+              [114.864803, -4.106984],
+              [114.468652, -3.495704],
+              [113.755672, -3.43917],
+              [113.256994, -3.118776],
+              [112.068126, -3.478392],
+              [111.703291, -2.994442],
+              [111.04824, -3.049426],
+              [110.223846, -2.934032],
+              [110.070936, -1.592874],
+              [109.571948, -1.314907],
+              [109.091874, -0.459507],
+              [108.952658, 0.415375],
+              [109.069136, 1.341934],
+              [109.66326, 2.006467],
+              [109.830227, 1.338136],
+              [110.514061, 0.773131],
+              [111.159138, 0.976478],
+              [111.797548, 0.904441],
+              [112.380252, 1.410121],
+              [112.859809, 1.49779],
+              [113.80585, 1.217549],
+              [114.621355, 1.430688],
+              [115.134037, 2.821482],
+              [115.519078, 3.169238],
+              [115.865517, 4.306559],
+              [117.015214, 4.306094],
+              [117.882035, 4.137551],
+              [117.313232, 3.234428],
+              [118.04833, 2.28769],
+              [117.875627, 1.827641]
+            ]
+          ],
+          [
+            [
+              [105.817655, -5.852356],
+              [104.710384, -5.873285],
+              [103.868213, -5.037315],
+              [102.584261, -4.220259],
+              [102.156173, -3.614146],
+              [101.399113, -2.799777],
+              [100.902503, -2.050262],
+              [100.141981, -0.650348],
+              [99.26374, 0.183142],
+              [98.970011, 1.042882],
+              [98.601351, 1.823507],
+              [97.699598, 2.453184],
+              [97.176942, 3.308791],
+              [96.424017, 3.86886],
+              [95.380876, 4.970782],
+              [95.293026, 5.479821],
+              [95.936863, 5.439513],
+              [97.484882, 5.246321],
+              [98.369169, 4.26837],
+              [99.142559, 3.59035],
+              [99.693998, 3.174329],
+              [100.641434, 2.099381],
+              [101.658012, 2.083697],
+              [102.498271, 1.3987],
+              [103.07684, 0.561361],
+              [103.838396, 0.104542],
+              [103.437645, -0.711946],
+              [104.010789, -1.059212],
+              [104.369991, -1.084843],
+              [104.53949, -1.782372],
+              [104.887893, -2.340425],
+              [105.622111, -2.428844],
+              [106.108593, -3.061777],
+              [105.857446, -4.305525],
+              [105.817655, -5.852356]
+            ]
+          ]
+        ]
+      },
+      "id": "IDN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "India" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [77.837451, 35.49401],
+            [78.912269, 34.321936],
+            [78.811086, 33.506198],
+            [79.208892, 32.994395],
+            [79.176129, 32.48378],
+            [78.458446, 32.618164],
+            [78.738894, 31.515906],
+            [79.721367, 30.882715],
+            [81.111256, 30.183481],
+            [80.476721, 29.729865],
+            [80.088425, 28.79447],
+            [81.057203, 28.416095],
+            [81.999987, 27.925479],
+            [83.304249, 27.364506],
+            [84.675018, 27.234901],
+            [85.251779, 26.726198],
+            [86.024393, 26.630985],
+            [87.227472, 26.397898],
+            [88.060238, 26.414615],
+            [88.174804, 26.810405],
+            [88.043133, 27.445819],
+            [88.120441, 27.876542],
+            [88.730326, 28.086865],
+            [88.814248, 27.299316],
+            [88.835643, 27.098966],
+            [89.744528, 26.719403],
+            [90.373275, 26.875724],
+            [91.217513, 26.808648],
+            [92.033484, 26.83831],
+            [92.103712, 27.452614],
+            [91.696657, 27.771742],
+            [92.503119, 27.896876],
+            [93.413348, 28.640629],
+            [94.56599, 29.277438],
+            [95.404802, 29.031717],
+            [96.117679, 29.452802],
+            [96.586591, 28.83098],
+            [96.248833, 28.411031],
+            [97.327114, 28.261583],
+            [97.402561, 27.882536],
+            [97.051989, 27.699059],
+            [97.133999, 27.083774],
+            [96.419366, 27.264589],
+            [95.124768, 26.573572],
+            [95.155153, 26.001307],
+            [94.603249, 25.162495],
+            [94.552658, 24.675238],
+            [94.106742, 23.850741],
+            [93.325188, 24.078556],
+            [93.286327, 23.043658],
+            [93.060294, 22.703111],
+            [93.166128, 22.27846],
+            [92.672721, 22.041239],
+            [92.146035, 23.627499],
+            [91.869928, 23.624346],
+            [91.706475, 22.985264],
+            [91.158963, 23.503527],
+            [91.46773, 24.072639],
+            [91.915093, 24.130414],
+            [92.376202, 24.976693],
+            [91.799596, 25.147432],
+            [90.872211, 25.132601],
+            [89.920693, 25.26975],
+            [89.832481, 25.965082],
+            [89.355094, 26.014407],
+            [88.563049, 26.446526],
+            [88.209789, 25.768066],
+            [88.931554, 25.238692],
+            [88.306373, 24.866079],
+            [88.084422, 24.501657],
+            [88.69994, 24.233715],
+            [88.52977, 23.631142],
+            [88.876312, 22.879146],
+            [89.031961, 22.055708],
+            [88.888766, 21.690588],
+            [88.208497, 21.703172],
+            [86.975704, 21.495562],
+            [87.033169, 20.743308],
+            [86.499351, 20.151638],
+            [85.060266, 19.478579],
+            [83.941006, 18.30201],
+            [83.189217, 17.671221],
+            [82.192792, 17.016636],
+            [82.191242, 16.556664],
+            [81.692719, 16.310219],
+            [80.791999, 15.951972],
+            [80.324896, 15.899185],
+            [80.025069, 15.136415],
+            [80.233274, 13.835771],
+            [80.286294, 13.006261],
+            [79.862547, 12.056215],
+            [79.857999, 10.357275],
+            [79.340512, 10.308854],
+            [78.885345, 9.546136],
+            [79.18972, 9.216544],
+            [78.277941, 8.933047],
+            [77.941165, 8.252959],
+            [77.539898, 7.965535],
+            [76.592979, 8.899276],
+            [76.130061, 10.29963],
+            [75.746467, 11.308251],
+            [75.396101, 11.781245],
+            [74.864816, 12.741936],
+            [74.616717, 13.992583],
+            [74.443859, 14.617222],
+            [73.534199, 15.990652],
+            [73.119909, 17.92857],
+            [72.820909, 19.208234],
+            [72.824475, 20.419503],
+            [72.630533, 21.356009],
+            [71.175273, 20.757441],
+            [70.470459, 20.877331],
+            [69.16413, 22.089298],
+            [69.644928, 22.450775],
+            [69.349597, 22.84318],
+            [68.176645, 23.691965],
+            [68.842599, 24.359134],
+            [71.04324, 24.356524],
+            [70.844699, 25.215102],
+            [70.282873, 25.722229],
+            [70.168927, 26.491872],
+            [69.514393, 26.940966],
+            [70.616496, 27.989196],
+            [71.777666, 27.91318],
+            [72.823752, 28.961592],
+            [73.450638, 29.976413],
+            [74.42138, 30.979815],
+            [74.405929, 31.692639],
+            [75.258642, 32.271105],
+            [74.451559, 32.7649],
+            [74.104294, 33.441473],
+            [73.749948, 34.317699],
+            [74.240203, 34.748887],
+            [75.757061, 34.504923],
+            [76.871722, 34.653544],
+            [77.837451, 35.49401]
+          ]
+        ]
+      },
+      "id": "IND"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Ireland" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-6.197885, 53.867565],
+            [-6.032985, 53.153164],
+            [-6.788857, 52.260118],
+            [-8.561617, 51.669301],
+            [-9.977086, 51.820455],
+            [-9.166283, 52.864629],
+            [-9.688525, 53.881363],
+            [-8.327987, 54.664519],
+            [-7.572168, 55.131622],
+            [-7.366031, 54.595841],
+            [-7.572168, 54.059956],
+            [-6.95373, 54.073702],
+            [-6.197885, 53.867565]
+          ]
+        ]
+      },
+      "id": "IRL"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Iran" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [53.921598, 37.198918],
+            [54.800304, 37.392421],
+            [55.511578, 37.964117],
+            [56.180375, 37.935127],
+            [56.619366, 38.121394],
+            [57.330434, 38.029229],
+            [58.436154, 37.522309],
+            [59.234762, 37.412988],
+            [60.377638, 36.527383],
+            [61.123071, 36.491597],
+            [61.210817, 35.650072],
+            [60.803193, 34.404102],
+            [60.52843, 33.676446],
+            [60.9637, 33.528832],
+            [60.536078, 32.981269],
+            [60.863655, 32.18292],
+            [60.941945, 31.548075],
+            [61.699314, 31.379506],
+            [61.781222, 30.73585],
+            [60.874248, 29.829239],
+            [61.369309, 29.303276],
+            [61.771868, 28.699334],
+            [62.72783, 28.259645],
+            [62.755426, 27.378923],
+            [63.233898, 27.217047],
+            [63.316632, 26.756532],
+            [61.874187, 26.239975],
+            [61.497363, 25.078237],
+            [59.616134, 25.380157],
+            [58.525761, 25.609962],
+            [57.397251, 25.739902],
+            [56.970766, 26.966106],
+            [56.492139, 27.143305],
+            [55.72371, 26.964633],
+            [54.71509, 26.480658],
+            [53.493097, 26.812369],
+            [52.483598, 27.580849],
+            [51.520763, 27.86569],
+            [50.852948, 28.814521],
+            [50.115009, 30.147773],
+            [49.57685, 29.985715],
+            [48.941333, 30.31709],
+            [48.567971, 29.926778],
+            [48.014568, 30.452457],
+            [48.004698, 30.985137],
+            [47.685286, 30.984853],
+            [47.849204, 31.709176],
+            [47.334661, 32.469155],
+            [46.109362, 33.017287],
+            [45.416691, 33.967798],
+            [45.64846, 34.748138],
+            [46.151788, 35.093259],
+            [46.07634, 35.677383],
+            [45.420618, 35.977546],
+            [44.77267, 37.17045],
+            [44.225756, 37.971584],
+            [44.421403, 38.281281],
+            [44.109225, 39.428136],
+            [44.79399, 39.713003],
+            [44.952688, 39.335765],
+            [45.457722, 38.874139],
+            [46.143623, 38.741201],
+            [46.50572, 38.770605],
+            [47.685079, 39.508364],
+            [48.060095, 39.582235],
+            [48.355529, 39.288765],
+            [48.010744, 38.794015],
+            [48.634375, 38.270378],
+            [48.883249, 38.320245],
+            [49.199612, 37.582874],
+            [50.147771, 37.374567],
+            [50.842354, 36.872814],
+            [52.264025, 36.700422],
+            [53.82579, 36.965031],
+            [53.921598, 37.198918]
+          ]
+        ]
+      },
+      "id": "IRN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Iraq" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [45.420618, 35.977546],
+            [46.07634, 35.677383],
+            [46.151788, 35.093259],
+            [45.64846, 34.748138],
+            [45.416691, 33.967798],
+            [46.109362, 33.017287],
+            [47.334661, 32.469155],
+            [47.849204, 31.709176],
+            [47.685286, 30.984853],
+            [48.004698, 30.985137],
+            [48.014568, 30.452457],
+            [48.567971, 29.926778],
+            [47.974519, 29.975819],
+            [47.302622, 30.05907],
+            [46.568713, 29.099025],
+            [44.709499, 29.178891],
+            [41.889981, 31.190009],
+            [40.399994, 31.889992],
+            [39.195468, 32.161009],
+            [38.792341, 33.378686],
+            [41.006159, 34.419372],
+            [41.383965, 35.628317],
+            [41.289707, 36.358815],
+            [41.837064, 36.605854],
+            [42.349591, 37.229873],
+            [42.779126, 37.385264],
+            [43.942259, 37.256228],
+            [44.293452, 37.001514],
+            [44.772699, 37.170445],
+            [45.420618, 35.977546]
+          ]
+        ]
+      },
+      "id": "IRQ"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Iceland" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-14.508695, 66.455892],
+            [-14.739637, 65.808748],
+            [-13.609732, 65.126671],
+            [-14.909834, 64.364082],
+            [-17.794438, 63.678749],
+            [-18.656246, 63.496383],
+            [-19.972755, 63.643635],
+            [-22.762972, 63.960179],
+            [-21.778484, 64.402116],
+            [-23.955044, 64.89113],
+            [-22.184403, 65.084968],
+            [-22.227423, 65.378594],
+            [-24.326184, 65.611189],
+            [-23.650515, 66.262519],
+            [-22.134922, 66.410469],
+            [-20.576284, 65.732112],
+            [-19.056842, 66.276601],
+            [-17.798624, 65.993853],
+            [-16.167819, 66.526792],
+            [-14.508695, 66.455892]
+          ]
+        ]
+      },
+      "id": "ISL"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Israel" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [35.719918, 32.709192],
+            [35.545665, 32.393992],
+            [35.18393, 32.532511],
+            [34.974641, 31.866582],
+            [35.225892, 31.754341],
+            [34.970507, 31.616778],
+            [34.927408, 31.353435],
+            [35.397561, 31.489086],
+            [35.420918, 31.100066],
+            [34.922603, 29.501326],
+            [34.265433, 31.219361],
+            [34.556372, 31.548824],
+            [34.488107, 31.605539],
+            [34.752587, 32.072926],
+            [34.955417, 32.827376],
+            [35.098457, 33.080539],
+            [35.126053, 33.0909],
+            [35.460709, 33.08904],
+            [35.552797, 33.264275],
+            [35.821101, 33.277426],
+            [35.836397, 32.868123],
+            [35.700798, 32.716014],
+            [35.719918, 32.709192]
+          ]
+        ]
+      },
+      "id": "ISR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Italy" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [15.520376, 38.231155],
+              [15.160243, 37.444046],
+              [15.309898, 37.134219],
+              [15.099988, 36.619987],
+              [14.335229, 36.996631],
+              [13.826733, 37.104531],
+              [12.431004, 37.61295],
+              [12.570944, 38.126381],
+              [13.741156, 38.034966],
+              [14.761249, 38.143874],
+              [15.520376, 38.231155]
+            ]
+          ],
+          [
+            [
+              [9.210012, 41.209991],
+              [9.809975, 40.500009],
+              [9.669519, 39.177376],
+              [9.214818, 39.240473],
+              [8.806936, 38.906618],
+              [8.428302, 39.171847],
+              [8.388253, 40.378311],
+              [8.159998, 40.950007],
+              [8.709991, 40.899984],
+              [9.210012, 41.209991]
+            ]
+          ],
+          [
+            [
+              [12.376485, 46.767559],
+              [13.806475, 46.509306],
+              [13.69811, 46.016778],
+              [13.93763, 45.591016],
+              [13.141606, 45.736692],
+              [12.328581, 45.381778],
+              [12.383875, 44.885374],
+              [12.261453, 44.600482],
+              [12.589237, 44.091366],
+              [13.526906, 43.587727],
+              [14.029821, 42.761008],
+              [15.14257, 41.95514],
+              [15.926191, 41.961315],
+              [16.169897, 41.740295],
+              [15.889346, 41.541082],
+              [16.785002, 41.179606],
+              [17.519169, 40.877143],
+              [18.376687, 40.355625],
+              [18.480247, 40.168866],
+              [18.293385, 39.810774],
+              [17.73838, 40.277671],
+              [16.869596, 40.442235],
+              [16.448743, 39.795401],
+              [17.17149, 39.4247],
+              [17.052841, 38.902871],
+              [16.635088, 38.843572],
+              [16.100961, 37.985899],
+              [15.684087, 37.908849],
+              [15.687963, 38.214593],
+              [15.891981, 38.750942],
+              [16.109332, 38.964547],
+              [15.718814, 39.544072],
+              [15.413613, 40.048357],
+              [14.998496, 40.172949],
+              [14.703268, 40.60455],
+              [14.060672, 40.786348],
+              [13.627985, 41.188287],
+              [12.888082, 41.25309],
+              [12.106683, 41.704535],
+              [11.191906, 42.355425],
+              [10.511948, 42.931463],
+              [10.200029, 43.920007],
+              [9.702488, 44.036279],
+              [8.888946, 44.366336],
+              [8.428561, 44.231228],
+              [7.850767, 43.767148],
+              [7.435185, 43.693845],
+              [7.549596, 44.127901],
+              [7.007562, 44.254767],
+              [6.749955, 45.028518],
+              [7.096652, 45.333099],
+              [6.802355, 45.70858],
+              [6.843593, 45.991147],
+              [7.273851, 45.776948],
+              [7.755992, 45.82449],
+              [8.31663, 46.163642],
+              [8.489952, 46.005151],
+              [8.966306, 46.036932],
+              [9.182882, 46.440215],
+              [9.922837, 46.314899],
+              [10.363378, 46.483571],
+              [10.442701, 46.893546],
+              [11.048556, 46.751359],
+              [11.164828, 46.941579],
+              [12.153088, 47.115393],
+              [12.376485, 46.767559]
+            ]
+          ]
+        ]
+      },
+      "id": "ITA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Jamaica" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-77.569601, 18.490525],
+            [-76.896619, 18.400867],
+            [-76.365359, 18.160701],
+            [-76.199659, 17.886867],
+            [-76.902561, 17.868238],
+            [-77.206341, 17.701116],
+            [-77.766023, 17.861597],
+            [-78.337719, 18.225968],
+            [-78.217727, 18.454533],
+            [-77.797365, 18.524218],
+            [-77.569601, 18.490525]
+          ]
+        ]
+      },
+      "id": "JAM"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Jordan" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [35.545665, 32.393992],
+            [35.719918, 32.709192],
+            [36.834062, 32.312938],
+            [38.792341, 33.378686],
+            [39.195468, 32.161009],
+            [39.004886, 32.010217],
+            [37.002166, 31.508413],
+            [37.998849, 30.5085],
+            [37.66812, 30.338665],
+            [37.503582, 30.003776],
+            [36.740528, 29.865283],
+            [36.501214, 29.505254],
+            [36.068941, 29.197495],
+            [34.956037, 29.356555],
+            [34.922603, 29.501326],
+            [35.420918, 31.100066],
+            [35.397561, 31.489086],
+            [35.545252, 31.782505],
+            [35.545665, 32.393992]
+          ]
+        ]
+      },
+      "id": "JOR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Japan" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [134.638428, 34.149234],
+              [134.766379, 33.806335],
+              [134.203416, 33.201178],
+              [133.79295, 33.521985],
+              [133.280268, 33.28957],
+              [133.014858, 32.704567],
+              [132.363115, 32.989382],
+              [132.371176, 33.463642],
+              [132.924373, 34.060299],
+              [133.492968, 33.944621],
+              [133.904106, 34.364931],
+              [134.638428, 34.149234]
+            ]
+          ],
+          [
+            [
+              [140.976388, 37.142074],
+              [140.59977, 36.343983],
+              [140.774074, 35.842877],
+              [140.253279, 35.138114],
+              [138.975528, 34.6676],
+              [137.217599, 34.606286],
+              [135.792983, 33.464805],
+              [135.120983, 33.849071],
+              [135.079435, 34.596545],
+              [133.340316, 34.375938],
+              [132.156771, 33.904933],
+              [130.986145, 33.885761],
+              [132.000036, 33.149992],
+              [131.33279, 31.450355],
+              [130.686318, 31.029579],
+              [130.20242, 31.418238],
+              [130.447676, 32.319475],
+              [129.814692, 32.61031],
+              [129.408463, 33.296056],
+              [130.353935, 33.604151],
+              [130.878451, 34.232743],
+              [131.884229, 34.749714],
+              [132.617673, 35.433393],
+              [134.608301, 35.731618],
+              [135.677538, 35.527134],
+              [136.723831, 37.304984],
+              [137.390612, 36.827391],
+              [138.857602, 37.827485],
+              [139.426405, 38.215962],
+              [140.05479, 39.438807],
+              [139.883379, 40.563312],
+              [140.305783, 41.195005],
+              [141.368973, 41.37856],
+              [141.914263, 39.991616],
+              [141.884601, 39.180865],
+              [140.959489, 38.174001],
+              [140.976388, 37.142074]
+            ]
+          ],
+          [
+            [
+              [143.910162, 44.1741],
+              [144.613427, 43.960883],
+              [145.320825, 44.384733],
+              [145.543137, 43.262088],
+              [144.059662, 42.988358],
+              [143.18385, 41.995215],
+              [141.611491, 42.678791],
+              [141.067286, 41.584594],
+              [139.955106, 41.569556],
+              [139.817544, 42.563759],
+              [140.312087, 43.333273],
+              [141.380549, 43.388825],
+              [141.671952, 44.772125],
+              [141.967645, 45.551483],
+              [143.14287, 44.510358],
+              [143.910162, 44.1741]
+            ]
+          ]
+        ]
+      },
+      "id": "JPN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Kazakhstan" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [70.962315, 42.266154],
+            [70.388965, 42.081308],
+            [69.070027, 41.384244],
+            [68.632483, 40.668681],
+            [68.259896, 40.662325],
+            [67.985856, 41.135991],
+            [66.714047, 41.168444],
+            [66.510649, 41.987644],
+            [66.023392, 41.994646],
+            [66.098012, 42.99766],
+            [64.900824, 43.728081],
+            [63.185787, 43.650075],
+            [62.0133, 43.504477],
+            [61.05832, 44.405817],
+            [60.239972, 44.784037],
+            [58.689989, 45.500014],
+            [58.503127, 45.586804],
+            [55.928917, 44.995858],
+            [55.968191, 41.308642],
+            [55.455251, 41.259859],
+            [54.755345, 42.043971],
+            [54.079418, 42.324109],
+            [52.944293, 42.116034],
+            [52.50246, 41.783316],
+            [52.446339, 42.027151],
+            [52.692112, 42.443895],
+            [52.501426, 42.792298],
+            [51.342427, 43.132975],
+            [50.891292, 44.031034],
+            [50.339129, 44.284016],
+            [50.305643, 44.609836],
+            [51.278503, 44.514854],
+            [51.316899, 45.245998],
+            [52.16739, 45.408391],
+            [53.040876, 45.259047],
+            [53.220866, 46.234646],
+            [53.042737, 46.853006],
+            [52.042023, 46.804637],
+            [51.191945, 47.048705],
+            [50.034083, 46.60899],
+            [49.10116, 46.39933],
+            [48.593241, 46.561034],
+            [48.694734, 47.075628],
+            [48.057253, 47.743753],
+            [47.315231, 47.715847],
+            [46.466446, 48.394152],
+            [47.043672, 49.152039],
+            [46.751596, 49.356006],
+            [47.54948, 50.454698],
+            [48.577841, 49.87476],
+            [48.702382, 50.605128],
+            [50.766648, 51.692762],
+            [52.328724, 51.718652],
+            [54.532878, 51.02624],
+            [55.716941, 50.621717],
+            [56.777961, 51.043551],
+            [58.363291, 51.063653],
+            [59.642282, 50.545442],
+            [59.932807, 50.842194],
+            [61.337424, 50.79907],
+            [61.588003, 51.272659],
+            [59.967534, 51.96042],
+            [60.927269, 52.447548],
+            [60.739993, 52.719986],
+            [61.699986, 52.979996],
+            [60.978066, 53.664993],
+            [61.436591, 54.006265],
+            [65.178534, 54.354228],
+            [65.666876, 54.601267],
+            [68.1691, 54.970392],
+            [69.068167, 55.38525],
+            [70.865267, 55.169734],
+            [71.180131, 54.133285],
+            [72.22415, 54.376655],
+            [73.508516, 54.035617],
+            [73.425679, 53.48981],
+            [74.384845, 53.546861],
+            [76.8911, 54.490524],
+            [76.525179, 54.177003],
+            [77.800916, 53.404415],
+            [80.03556, 50.864751],
+            [80.568447, 51.388336],
+            [81.945986, 50.812196],
+            [83.383004, 51.069183],
+            [83.935115, 50.889246],
+            [84.416377, 50.3114],
+            [85.11556, 50.117303],
+            [85.54127, 49.692859],
+            [86.829357, 49.826675],
+            [87.35997, 49.214981],
+            [86.598776, 48.549182],
+            [85.768233, 48.455751],
+            [85.720484, 47.452969],
+            [85.16429, 47.000956],
+            [83.180484, 47.330031],
+            [82.458926, 45.53965],
+            [81.947071, 45.317027],
+            [79.966106, 44.917517],
+            [80.866206, 43.180362],
+            [80.18015, 42.920068],
+            [80.25999, 42.349999],
+            [79.643645, 42.496683],
+            [79.142177, 42.856092],
+            [77.658392, 42.960686],
+            [76.000354, 42.988022],
+            [75.636965, 42.8779],
+            [74.212866, 43.298339],
+            [73.645304, 43.091272],
+            [73.489758, 42.500894],
+            [71.844638, 42.845395],
+            [71.186281, 42.704293],
+            [70.962315, 42.266154]
+          ]
+        ]
+      },
+      "id": "KAZ"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Kenya" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [40.993, -0.85829],
+            [41.58513, -1.68325],
+            [40.88477, -2.08255],
+            [40.63785, -2.49979],
+            [40.26304, -2.57309],
+            [40.12119, -3.27768],
+            [39.80006, -3.68116],
+            [39.60489, -4.34653],
+            [39.20222, -4.67677],
+            [37.7669, -3.67712],
+            [37.69869, -3.09699],
+            [34.07262, -1.05982],
+            [33.903711, -0.95],
+            [33.893569, 0.109814],
+            [34.18, 0.515],
+            [34.6721, 1.17694],
+            [35.03599, 1.90584],
+            [34.59607, 3.05374],
+            [34.47913, 3.5556],
+            [34.005, 4.249885],
+            [34.620196, 4.847123],
+            [35.298007, 5.506],
+            [35.817448, 5.338232],
+            [35.817448, 4.776966],
+            [36.159079, 4.447864],
+            [36.855093, 4.447864],
+            [38.120915, 3.598605],
+            [38.43697, 3.58851],
+            [38.67114, 3.61607],
+            [38.89251, 3.50074],
+            [39.559384, 3.42206],
+            [39.85494, 3.83879],
+            [40.76848, 4.25702],
+            [41.1718, 3.91909],
+            [41.855083, 3.918912],
+            [40.98105, 2.78452],
+            [40.993, -0.85829]
+          ]
+        ]
+      },
+      "id": "KEN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Kyrgyzstan" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [70.962315, 42.266154],
+            [71.186281, 42.704293],
+            [71.844638, 42.845395],
+            [73.489758, 42.500894],
+            [73.645304, 43.091272],
+            [74.212866, 43.298339],
+            [75.636965, 42.8779],
+            [76.000354, 42.988022],
+            [77.658392, 42.960686],
+            [79.142177, 42.856092],
+            [79.643645, 42.496683],
+            [80.25999, 42.349999],
+            [80.11943, 42.123941],
+            [78.543661, 41.582243],
+            [78.187197, 41.185316],
+            [76.904484, 41.066486],
+            [76.526368, 40.427946],
+            [75.467828, 40.562072],
+            [74.776862, 40.366425],
+            [73.822244, 39.893973],
+            [73.960013, 39.660008],
+            [73.675379, 39.431237],
+            [71.784694, 39.279463],
+            [70.549162, 39.604198],
+            [69.464887, 39.526683],
+            [69.55961, 40.103211],
+            [70.648019, 39.935754],
+            [71.014198, 40.244366],
+            [71.774875, 40.145844],
+            [73.055417, 40.866033],
+            [71.870115, 41.3929],
+            [71.157859, 41.143587],
+            [70.420022, 41.519998],
+            [71.259248, 42.167711],
+            [70.962315, 42.266154]
+          ]
+        ]
+      },
+      "id": "KGZ"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Cambodia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [103.49728, 10.632555],
+            [103.09069, 11.153661],
+            [102.584932, 12.186595],
+            [102.348099, 13.394247],
+            [102.988422, 14.225721],
+            [104.281418, 14.416743],
+            [105.218777, 14.273212],
+            [106.043946, 13.881091],
+            [106.496373, 14.570584],
+            [107.382727, 14.202441],
+            [107.614548, 13.535531],
+            [107.491403, 12.337206],
+            [105.810524, 11.567615],
+            [106.24967, 10.961812],
+            [105.199915, 10.88931],
+            [104.334335, 10.486544],
+            [103.49728, 10.632555]
+          ]
+        ]
+      },
+      "id": "KHM"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "South Korea" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [128.349716, 38.612243],
+            [129.21292, 37.432392],
+            [129.46045, 36.784189],
+            [129.468304, 35.632141],
+            [129.091377, 35.082484],
+            [128.18585, 34.890377],
+            [127.386519, 34.475674],
+            [126.485748, 34.390046],
+            [126.37392, 34.93456],
+            [126.559231, 35.684541],
+            [126.117398, 36.725485],
+            [126.860143, 36.893924],
+            [126.174759, 37.749686],
+            [126.237339, 37.840378],
+            [126.68372, 37.804773],
+            [127.073309, 38.256115],
+            [127.780035, 38.304536],
+            [128.205746, 38.370397],
+            [128.349716, 38.612243]
+          ]
+        ]
+      },
+      "id": "KOR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Kosovo" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [20.76216, 42.05186],
+            [20.71731, 41.84711],
+            [20.59023, 41.85541],
+            [20.52295, 42.21787],
+            [20.28374, 42.32025],
+            [20.0707, 42.58863],
+            [20.25758, 42.81275],
+            [20.49679, 42.88469],
+            [20.63508, 43.21671],
+            [20.81448, 43.27205],
+            [20.95651, 43.13094],
+            [21.143395, 43.068685],
+            [21.27421, 42.90959],
+            [21.43866, 42.86255],
+            [21.63302, 42.67717],
+            [21.77505, 42.6827],
+            [21.66292, 42.43922],
+            [21.54332, 42.32025],
+            [21.576636, 42.245224],
+            [21.3527, 42.2068],
+            [20.76216, 42.05186]
+          ]
+        ]
+      },
+      "id": "-99"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Kuwait" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [47.974519, 29.975819],
+            [48.183189, 29.534477],
+            [48.093943, 29.306299],
+            [48.416094, 28.552004],
+            [47.708851, 28.526063],
+            [47.459822, 29.002519],
+            [46.568713, 29.099025],
+            [47.302622, 30.05907],
+            [47.974519, 29.975819]
+          ]
+        ]
+      },
+      "id": "KWT"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Laos" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [105.218777, 14.273212],
+            [105.544338, 14.723934],
+            [105.589039, 15.570316],
+            [104.779321, 16.441865],
+            [104.716947, 17.428859],
+            [103.956477, 18.240954],
+            [103.200192, 18.309632],
+            [102.998706, 17.961695],
+            [102.413005, 17.932782],
+            [102.113592, 18.109102],
+            [101.059548, 17.512497],
+            [101.035931, 18.408928],
+            [101.282015, 19.462585],
+            [100.606294, 19.508344],
+            [100.548881, 20.109238],
+            [100.115988, 20.41785],
+            [100.329101, 20.786122],
+            [101.180005, 21.436573],
+            [101.270026, 21.201652],
+            [101.80312, 21.174367],
+            [101.652018, 22.318199],
+            [102.170436, 22.464753],
+            [102.754896, 21.675137],
+            [103.203861, 20.766562],
+            [104.435, 20.758733],
+            [104.822574, 19.886642],
+            [104.183388, 19.624668],
+            [103.896532, 19.265181],
+            [105.094598, 18.666975],
+            [105.925762, 17.485315],
+            [106.556008, 16.604284],
+            [107.312706, 15.908538],
+            [107.564525, 15.202173],
+            [107.382727, 14.202441],
+            [106.496373, 14.570584],
+            [106.043946, 13.881091],
+            [105.218777, 14.273212]
+          ]
+        ]
+      },
+      "id": "LAO"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Lebanon" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [35.821101, 33.277426],
+            [35.552797, 33.264275],
+            [35.460709, 33.08904],
+            [35.126053, 33.0909],
+            [35.482207, 33.90545],
+            [35.979592, 34.610058],
+            [35.998403, 34.644914],
+            [36.448194, 34.593935],
+            [36.61175, 34.201789],
+            [36.06646, 33.824912],
+            [35.821101, 33.277426]
+          ]
+        ]
+      },
+      "id": "LBN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Liberia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-7.712159, 4.364566],
+            [-7.974107, 4.355755],
+            [-9.004794, 4.832419],
+            [-9.91342, 5.593561],
+            [-10.765384, 6.140711],
+            [-11.438779, 6.785917],
+            [-11.199802, 7.105846],
+            [-11.146704, 7.396706],
+            [-10.695595, 7.939464],
+            [-10.230094, 8.406206],
+            [-10.016567, 8.428504],
+            [-9.755342, 8.541055],
+            [-9.33728, 7.928534],
+            [-9.403348, 7.526905],
+            [-9.208786, 7.313921],
+            [-8.926065, 7.309037],
+            [-8.722124, 7.711674],
+            [-8.439298, 7.686043],
+            [-8.485446, 7.395208],
+            [-8.385452, 6.911801],
+            [-8.60288, 6.467564],
+            [-8.311348, 6.193033],
+            [-7.993693, 6.12619],
+            [-7.570153, 5.707352],
+            [-7.539715, 5.313345],
+            [-7.635368, 5.188159],
+            [-7.712159, 4.364566]
+          ]
+        ]
+      },
+      "id": "LBR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Libya" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [14.8513, 22.86295],
+            [14.143871, 22.491289],
+            [13.581425, 23.040506],
+            [11.999506, 23.471668],
+            [11.560669, 24.097909],
+            [10.771364, 24.562532],
+            [10.303847, 24.379313],
+            [9.948261, 24.936954],
+            [9.910693, 25.365455],
+            [9.319411, 26.094325],
+            [9.716286, 26.512206],
+            [9.629056, 27.140953],
+            [9.756128, 27.688259],
+            [9.683885, 28.144174],
+            [9.859998, 28.95999],
+            [9.805634, 29.424638],
+            [9.48214, 30.307556],
+            [9.970017, 30.539325],
+            [10.056575, 30.961831],
+            [9.950225, 31.37607],
+            [10.636901, 31.761421],
+            [10.94479, 32.081815],
+            [11.432253, 32.368903],
+            [11.488787, 33.136996],
+            [12.66331, 32.79278],
+            [13.08326, 32.87882],
+            [13.91868, 32.71196],
+            [15.24563, 32.26508],
+            [15.71394, 31.37626],
+            [16.61162, 31.18218],
+            [18.02109, 30.76357],
+            [19.08641, 30.26639],
+            [19.57404, 30.52582],
+            [20.05335, 30.98576],
+            [19.82033, 31.75179],
+            [20.13397, 32.2382],
+            [20.85452, 32.7068],
+            [21.54298, 32.8432],
+            [22.89576, 32.63858],
+            [23.2368, 32.19149],
+            [23.60913, 32.18726],
+            [23.9275, 32.01667],
+            [24.92114, 31.89936],
+            [25.16482, 31.56915],
+            [24.80287, 31.08929],
+            [24.95762, 30.6616],
+            [24.70007, 30.04419],
+            [25, 29.238655],
+            [25, 25.6825],
+            [25, 22],
+            [25, 20.00304],
+            [23.85, 20],
+            [23.83766, 19.58047],
+            [19.84926, 21.49509],
+            [15.86085, 23.40972],
+            [14.8513, 22.86295]
+          ]
+        ]
+      },
+      "id": "LBY"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Sri Lanka" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [81.787959, 7.523055],
+            [81.637322, 6.481775],
+            [81.21802, 6.197141],
+            [80.348357, 5.96837],
+            [79.872469, 6.763463],
+            [79.695167, 8.200843],
+            [80.147801, 9.824078],
+            [80.838818, 9.268427],
+            [81.304319, 8.564206],
+            [81.787959, 7.523055]
+          ]
+        ]
+      },
+      "id": "LKA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Lesotho" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [28.978263, -28.955597],
+            [29.325166, -29.257387],
+            [29.018415, -29.743766],
+            [28.8484, -30.070051],
+            [28.291069, -30.226217],
+            [28.107205, -30.545732],
+            [27.749397, -30.645106],
+            [26.999262, -29.875954],
+            [27.532511, -29.242711],
+            [28.074338, -28.851469],
+            [28.5417, -28.647502],
+            [28.978263, -28.955597]
+          ]
+        ]
+      },
+      "id": "LSO"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Lithuania" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [22.731099, 54.327537],
+            [22.651052, 54.582741],
+            [22.757764, 54.856574],
+            [22.315724, 55.015299],
+            [21.268449, 55.190482],
+            [21.0558, 56.031076],
+            [22.201157, 56.337802],
+            [23.878264, 56.273671],
+            [24.860684, 56.372528],
+            [25.000934, 56.164531],
+            [25.533047, 56.100297],
+            [26.494331, 55.615107],
+            [26.588279, 55.167176],
+            [25.768433, 54.846963],
+            [25.536354, 54.282423],
+            [24.450684, 53.905702],
+            [23.484128, 53.912498],
+            [23.243987, 54.220567],
+            [22.731099, 54.327537]
+          ]
+        ]
+      },
+      "id": "LTU"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Luxembourg" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [6.043073, 50.128052],
+            [6.242751, 49.902226],
+            [6.18632, 49.463803],
+            [5.897759, 49.442667],
+            [5.674052, 49.529484],
+            [5.782417, 50.090328],
+            [6.043073, 50.128052]
+          ]
+        ]
+      },
+      "id": "LUX"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Latvia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [21.0558, 56.031076],
+            [21.090424, 56.783873],
+            [21.581866, 57.411871],
+            [22.524341, 57.753374],
+            [23.318453, 57.006236],
+            [24.12073, 57.025693],
+            [24.312863, 57.793424],
+            [25.164594, 57.970157],
+            [25.60281, 57.847529],
+            [26.463532, 57.476389],
+            [27.288185, 57.474528],
+            [27.770016, 57.244258],
+            [27.855282, 56.759326],
+            [28.176709, 56.16913],
+            [27.10246, 55.783314],
+            [26.494331, 55.615107],
+            [25.533047, 56.100297],
+            [25.000934, 56.164531],
+            [24.860684, 56.372528],
+            [23.878264, 56.273671],
+            [22.201157, 56.337802],
+            [21.0558, 56.031076]
+          ]
+        ]
+      },
+      "id": "LVA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Morocco" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-5.193863, 35.755182],
+            [-4.591006, 35.330712],
+            [-3.640057, 35.399855],
+            [-2.604306, 35.179093],
+            [-2.169914, 35.168396],
+            [-1.792986, 34.527919],
+            [-1.733455, 33.919713],
+            [-1.388049, 32.864015],
+            [-1.124551, 32.651522],
+            [-1.307899, 32.262889],
+            [-2.616605, 32.094346],
+            [-3.06898, 31.724498],
+            [-3.647498, 31.637294],
+            [-3.690441, 30.896952],
+            [-4.859646, 30.501188],
+            [-5.242129, 30.000443],
+            [-6.060632, 29.7317],
+            [-7.059228, 29.579228],
+            [-8.674116, 28.841289],
+            [-8.66559, 27.656426],
+            [-8.817809, 27.656426],
+            [-8.817828, 27.656426],
+            [-8.794884, 27.120696],
+            [-9.413037, 27.088476],
+            [-9.735343, 26.860945],
+            [-10.189424, 26.860945],
+            [-10.551263, 26.990808],
+            [-11.392555, 26.883424],
+            [-11.71822, 26.104092],
+            [-12.030759, 26.030866],
+            [-12.500963, 24.770116],
+            [-13.89111, 23.691009],
+            [-14.221168, 22.310163],
+            [-14.630833, 21.86094],
+            [-14.750955, 21.5006],
+            [-17.002962, 21.420734],
+            [-17.020428, 21.42231],
+            [-16.973248, 21.885745],
+            [-16.589137, 22.158234],
+            [-16.261922, 22.67934],
+            [-16.326414, 23.017768],
+            [-15.982611, 23.723358],
+            [-15.426004, 24.359134],
+            [-15.089332, 24.520261],
+            [-14.824645, 25.103533],
+            [-14.800926, 25.636265],
+            [-14.43994, 26.254418],
+            [-13.773805, 26.618892],
+            [-13.139942, 27.640148],
+            [-13.121613, 27.654148],
+            [-12.618837, 28.038186],
+            [-11.688919, 28.148644],
+            [-10.900957, 28.832142],
+            [-10.399592, 29.098586],
+            [-9.564811, 29.933574],
+            [-9.814718, 31.177736],
+            [-9.434793, 32.038096],
+            [-9.300693, 32.564679],
+            [-8.657476, 33.240245],
+            [-7.654178, 33.697065],
+            [-6.912544, 34.110476],
+            [-6.244342, 35.145865],
+            [-5.929994, 35.759988],
+            [-5.193863, 35.755182]
+          ]
+        ]
+      },
+      "id": "MAR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Moldova" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [26.619337, 48.220726],
+            [26.857824, 48.368211],
+            [27.522537, 48.467119],
+            [28.259547, 48.155562],
+            [28.670891, 48.118149],
+            [29.122698, 47.849095],
+            [29.050868, 47.510227],
+            [29.415135, 47.346645],
+            [29.559674, 46.928583],
+            [29.908852, 46.674361],
+            [29.83821, 46.525326],
+            [30.024659, 46.423937],
+            [29.759972, 46.349988],
+            [29.170654, 46.379262],
+            [29.072107, 46.517678],
+            [28.862972, 46.437889],
+            [28.933717, 46.25883],
+            [28.659987, 45.939987],
+            [28.485269, 45.596907],
+            [28.233554, 45.488283],
+            [28.054443, 45.944586],
+            [28.160018, 46.371563],
+            [28.12803, 46.810476],
+            [27.551166, 47.405117],
+            [27.233873, 47.826771],
+            [26.924176, 48.123264],
+            [26.619337, 48.220726]
+          ]
+        ]
+      },
+      "id": "MDA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Madagascar" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [49.543519, -12.469833],
+            [49.808981, -12.895285],
+            [50.056511, -13.555761],
+            [50.217431, -14.758789],
+            [50.476537, -15.226512],
+            [50.377111, -15.706069],
+            [50.200275, -16.000263],
+            [49.860606, -15.414253],
+            [49.672607, -15.710204],
+            [49.863344, -16.451037],
+            [49.774564, -16.875042],
+            [49.498612, -17.106036],
+            [49.435619, -17.953064],
+            [49.041792, -19.118781],
+            [48.548541, -20.496888],
+            [47.930749, -22.391501],
+            [47.547723, -23.781959],
+            [47.095761, -24.94163],
+            [46.282478, -25.178463],
+            [45.409508, -25.601434],
+            [44.833574, -25.346101],
+            [44.03972, -24.988345],
+            [43.763768, -24.460677],
+            [43.697778, -23.574116],
+            [43.345654, -22.776904],
+            [43.254187, -22.057413],
+            [43.433298, -21.336475],
+            [43.893683, -21.163307],
+            [43.89637, -20.830459],
+            [44.374325, -20.072366],
+            [44.464397, -19.435454],
+            [44.232422, -18.961995],
+            [44.042976, -18.331387],
+            [43.963084, -17.409945],
+            [44.312469, -16.850496],
+            [44.446517, -16.216219],
+            [44.944937, -16.179374],
+            [45.502732, -15.974373],
+            [45.872994, -15.793454],
+            [46.312243, -15.780018],
+            [46.882183, -15.210182],
+            [47.70513, -14.594303],
+            [48.005215, -14.091233],
+            [47.869047, -13.663869],
+            [48.293828, -13.784068],
+            [48.84506, -13.089175],
+            [48.863509, -12.487868],
+            [49.194651, -12.040557],
+            [49.543519, -12.469833]
+          ]
+        ]
+      },
+      "id": "MDG"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Mexico" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-97.140008, 25.869997],
+            [-97.528072, 24.992144],
+            [-97.702946, 24.272343],
+            [-97.776042, 22.93258],
+            [-97.872367, 22.444212],
+            [-97.699044, 21.898689],
+            [-97.38896, 21.411019],
+            [-97.189333, 20.635433],
+            [-96.525576, 19.890931],
+            [-96.292127, 19.320371],
+            [-95.900885, 18.828024],
+            [-94.839063, 18.562717],
+            [-94.42573, 18.144371],
+            [-93.548651, 18.423837],
+            [-92.786114, 18.524839],
+            [-92.037348, 18.704569],
+            [-91.407903, 18.876083],
+            [-90.77187, 19.28412],
+            [-90.53359, 19.867418],
+            [-90.451476, 20.707522],
+            [-90.278618, 20.999855],
+            [-89.601321, 21.261726],
+            [-88.543866, 21.493675],
+            [-87.658417, 21.458846],
+            [-87.05189, 21.543543],
+            [-86.811982, 21.331515],
+            [-86.845908, 20.849865],
+            [-87.383291, 20.255405],
+            [-87.621054, 19.646553],
+            [-87.43675, 19.472403],
+            [-87.58656, 19.04013],
+            [-87.837191, 18.259816],
+            [-88.090664, 18.516648],
+            [-88.300031, 18.499982],
+            [-88.490123, 18.486831],
+            [-88.848344, 17.883198],
+            [-89.029857, 18.001511],
+            [-89.150909, 17.955468],
+            [-89.14308, 17.808319],
+            [-90.067934, 17.819326],
+            [-91.00152, 17.817595],
+            [-91.002269, 17.254658],
+            [-91.453921, 17.252177],
+            [-91.08167, 16.918477],
+            [-90.711822, 16.687483],
+            [-90.600847, 16.470778],
+            [-90.438867, 16.41011],
+            [-90.464473, 16.069562],
+            [-91.74796, 16.066565],
+            [-92.229249, 15.251447],
+            [-92.087216, 15.064585],
+            [-92.20323, 14.830103],
+            [-92.22775, 14.538829],
+            [-93.359464, 15.61543],
+            [-93.875169, 15.940164],
+            [-94.691656, 16.200975],
+            [-95.250227, 16.128318],
+            [-96.053382, 15.752088],
+            [-96.557434, 15.653515],
+            [-97.263592, 15.917065],
+            [-98.01303, 16.107312],
+            [-98.947676, 16.566043],
+            [-99.697397, 16.706164],
+            [-100.829499, 17.171071],
+            [-101.666089, 17.649026],
+            [-101.918528, 17.91609],
+            [-102.478132, 17.975751],
+            [-103.50099, 18.292295],
+            [-103.917527, 18.748572],
+            [-104.99201, 19.316134],
+            [-105.493038, 19.946767],
+            [-105.731396, 20.434102],
+            [-105.397773, 20.531719],
+            [-105.500661, 20.816895],
+            [-105.270752, 21.076285],
+            [-105.265817, 21.422104],
+            [-105.603161, 21.871146],
+            [-105.693414, 22.26908],
+            [-106.028716, 22.773752],
+            [-106.90998, 23.767774],
+            [-107.915449, 24.548915],
+            [-108.401905, 25.172314],
+            [-109.260199, 25.580609],
+            [-109.444089, 25.824884],
+            [-109.291644, 26.442934],
+            [-109.801458, 26.676176],
+            [-110.391732, 27.162115],
+            [-110.641019, 27.859876],
+            [-111.178919, 27.941241],
+            [-111.759607, 28.467953],
+            [-112.228235, 28.954409],
+            [-112.271824, 29.266844],
+            [-112.809594, 30.021114],
+            [-113.163811, 30.786881],
+            [-113.148669, 31.170966],
+            [-113.871881, 31.567608],
+            [-114.205737, 31.524045],
+            [-114.776451, 31.799532],
+            [-114.9367, 31.393485],
+            [-114.771232, 30.913617],
+            [-114.673899, 30.162681],
+            [-114.330974, 29.750432],
+            [-113.588875, 29.061611],
+            [-113.424053, 28.826174],
+            [-113.271969, 28.754783],
+            [-113.140039, 28.411289],
+            [-112.962298, 28.42519],
+            [-112.761587, 27.780217],
+            [-112.457911, 27.525814],
+            [-112.244952, 27.171727],
+            [-111.616489, 26.662817],
+            [-111.284675, 25.73259],
+            [-110.987819, 25.294606],
+            [-110.710007, 24.826004],
+            [-110.655049, 24.298595],
+            [-110.172856, 24.265548],
+            [-109.771847, 23.811183],
+            [-109.409104, 23.364672],
+            [-109.433392, 23.185588],
+            [-109.854219, 22.818272],
+            [-110.031392, 22.823078],
+            [-110.295071, 23.430973],
+            [-110.949501, 24.000964],
+            [-111.670568, 24.484423],
+            [-112.182036, 24.738413],
+            [-112.148989, 25.470125],
+            [-112.300711, 26.012004],
+            [-112.777297, 26.32196],
+            [-113.464671, 26.768186],
+            [-113.59673, 26.63946],
+            [-113.848937, 26.900064],
+            [-114.465747, 27.14209],
+            [-115.055142, 27.722727],
+            [-114.982253, 27.7982],
+            [-114.570366, 27.741485],
+            [-114.199329, 28.115003],
+            [-114.162018, 28.566112],
+            [-114.931842, 29.279479],
+            [-115.518654, 29.556362],
+            [-115.887365, 30.180794],
+            [-116.25835, 30.836464],
+            [-116.721526, 31.635744],
+            [-117.12776, 32.53534],
+            [-115.99135, 32.61239],
+            [-114.72139, 32.72083],
+            [-114.815, 32.52528],
+            [-113.30498, 32.03914],
+            [-111.02361, 31.33472],
+            [-109.035, 31.34194],
+            [-108.24194, 31.34222],
+            [-108.24, 31.754854],
+            [-106.50759, 31.75452],
+            [-106.1429, 31.39995],
+            [-105.63159, 31.08383],
+            [-105.03737, 30.64402],
+            [-104.70575, 30.12173],
+            [-104.45697, 29.57196],
+            [-103.94, 29.27],
+            [-103.11, 28.97],
+            [-102.48, 29.76],
+            [-101.6624, 29.7793],
+            [-100.9576, 29.38071],
+            [-100.45584, 28.69612],
+            [-100.11, 28.11],
+            [-99.52, 27.54],
+            [-99.3, 26.84],
+            [-99.02, 26.37],
+            [-98.24, 26.06],
+            [-97.53, 25.84],
+            [-97.140008, 25.869997]
+          ]
+        ]
+      },
+      "id": "MEX"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Macedonia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [20.59023, 41.85541],
+            [20.71731, 41.84711],
+            [20.76216, 42.05186],
+            [21.3527, 42.2068],
+            [21.576636, 42.245224],
+            [21.91708, 42.30364],
+            [22.380526, 42.32026],
+            [22.881374, 41.999297],
+            [22.952377, 41.337994],
+            [22.76177, 41.3048],
+            [22.597308, 41.130487],
+            [22.055378, 41.149866],
+            [21.674161, 40.931275],
+            [21.02004, 40.842727],
+            [20.60518, 41.08622],
+            [20.46315, 41.51509],
+            [20.59023, 41.85541]
+          ]
+        ]
+      },
+      "id": "MKD"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Mali" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-12.17075, 14.616834],
+            [-11.834208, 14.799097],
+            [-11.666078, 15.388208],
+            [-11.349095, 15.411256],
+            [-10.650791, 15.132746],
+            [-10.086846, 15.330486],
+            [-9.700255, 15.264107],
+            [-9.550238, 15.486497],
+            [-5.537744, 15.50169],
+            [-5.315277, 16.201854],
+            [-5.488523, 16.325102],
+            [-5.971129, 20.640833],
+            [-6.453787, 24.956591],
+            [-4.923337, 24.974574],
+            [-1.550055, 22.792666],
+            [1.823228, 20.610809],
+            [2.060991, 20.142233],
+            [2.683588, 19.85623],
+            [3.146661, 19.693579],
+            [3.158133, 19.057364],
+            [4.267419, 19.155265],
+            [4.27021, 16.852227],
+            [3.723422, 16.184284],
+            [3.638259, 15.56812],
+            [2.749993, 15.409525],
+            [1.385528, 15.323561],
+            [1.015783, 14.968182],
+            [0.374892, 14.928908],
+            [-0.266257, 14.924309],
+            [-0.515854, 15.116158],
+            [-1.066363, 14.973815],
+            [-2.001035, 14.559008],
+            [-2.191825, 14.246418],
+            [-2.967694, 13.79815],
+            [-3.103707, 13.541267],
+            [-3.522803, 13.337662],
+            [-4.006391, 13.472485],
+            [-4.280405, 13.228444],
+            [-4.427166, 12.542646],
+            [-5.220942, 11.713859],
+            [-5.197843, 11.375146],
+            [-5.470565, 10.95127],
+            [-5.404342, 10.370737],
+            [-5.816926, 10.222555],
+            [-6.050452, 10.096361],
+            [-6.205223, 10.524061],
+            [-6.493965, 10.411303],
+            [-6.666461, 10.430811],
+            [-6.850507, 10.138994],
+            [-7.622759, 10.147236],
+            [-7.89959, 10.297382],
+            [-8.029944, 10.206535],
+            [-8.335377, 10.494812],
+            [-8.282357, 10.792597],
+            [-8.407311, 10.909257],
+            [-8.620321, 10.810891],
+            [-8.581305, 11.136246],
+            [-8.376305, 11.393646],
+            [-8.786099, 11.812561],
+            [-8.905265, 12.088358],
+            [-9.127474, 12.30806],
+            [-9.327616, 12.334286],
+            [-9.567912, 12.194243],
+            [-9.890993, 12.060479],
+            [-10.165214, 11.844084],
+            [-10.593224, 11.923975],
+            [-10.87083, 12.177887],
+            [-11.036556, 12.211245],
+            [-11.297574, 12.077971],
+            [-11.456169, 12.076834],
+            [-11.513943, 12.442988],
+            [-11.467899, 12.754519],
+            [-11.553398, 13.141214],
+            [-11.927716, 13.422075],
+            [-12.124887, 13.994727],
+            [-12.17075, 14.616834]
+          ]
+        ]
+      },
+      "id": "MLI"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Myanmar" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [99.543309, 20.186598],
+            [98.959676, 19.752981],
+            [98.253724, 19.708203],
+            [97.797783, 18.62708],
+            [97.375896, 18.445438],
+            [97.859123, 17.567946],
+            [98.493761, 16.837836],
+            [98.903348, 16.177824],
+            [98.537376, 15.308497],
+            [98.192074, 15.123703],
+            [98.430819, 14.622028],
+            [99.097755, 13.827503],
+            [99.212012, 13.269294],
+            [99.196354, 12.804748],
+            [99.587286, 11.892763],
+            [99.038121, 10.960546],
+            [98.553551, 9.93296],
+            [98.457174, 10.675266],
+            [98.764546, 11.441292],
+            [98.428339, 12.032987],
+            [98.509574, 13.122378],
+            [98.103604, 13.64046],
+            [97.777732, 14.837286],
+            [97.597072, 16.100568],
+            [97.16454, 16.928734],
+            [96.505769, 16.427241],
+            [95.369352, 15.71439],
+            [94.808405, 15.803454],
+            [94.188804, 16.037936],
+            [94.533486, 17.27724],
+            [94.324817, 18.213514],
+            [93.540988, 19.366493],
+            [93.663255, 19.726962],
+            [93.078278, 19.855145],
+            [92.368554, 20.670883],
+            [92.303234, 21.475485],
+            [92.652257, 21.324048],
+            [92.672721, 22.041239],
+            [93.166128, 22.27846],
+            [93.060294, 22.703111],
+            [93.286327, 23.043658],
+            [93.325188, 24.078556],
+            [94.106742, 23.850741],
+            [94.552658, 24.675238],
+            [94.603249, 25.162495],
+            [95.155153, 26.001307],
+            [95.124768, 26.573572],
+            [96.419366, 27.264589],
+            [97.133999, 27.083774],
+            [97.051989, 27.699059],
+            [97.402561, 27.882536],
+            [97.327114, 28.261583],
+            [97.911988, 28.335945],
+            [98.246231, 27.747221],
+            [98.68269, 27.508812],
+            [98.712094, 26.743536],
+            [98.671838, 25.918703],
+            [97.724609, 25.083637],
+            [97.60472, 23.897405],
+            [98.660262, 24.063286],
+            [98.898749, 23.142722],
+            [99.531992, 22.949039],
+            [99.240899, 22.118314],
+            [99.983489, 21.742937],
+            [100.416538, 21.558839],
+            [101.150033, 21.849984],
+            [101.180005, 21.436573],
+            [100.329101, 20.786122],
+            [100.115988, 20.41785],
+            [99.543309, 20.186598]
+          ]
+        ]
+      },
+      "id": "MMR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Montenegro" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [19.801613, 42.500093],
+            [19.738051, 42.688247],
+            [19.30449, 42.19574],
+            [19.37177, 41.87755],
+            [19.16246, 41.95502],
+            [18.88214, 42.28151],
+            [18.45, 42.48],
+            [18.56, 42.65],
+            [18.70648, 43.20011],
+            [19.03165, 43.43253],
+            [19.21852, 43.52384],
+            [19.48389, 43.35229],
+            [19.63, 43.21378],
+            [19.95857, 43.10604],
+            [20.3398, 42.89852],
+            [20.25758, 42.81275],
+            [20.0707, 42.58863],
+            [19.801613, 42.500093]
+          ]
+        ]
+      },
+      "id": "MNE"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Mongolia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [87.751264, 49.297198],
+            [88.805567, 49.470521],
+            [90.713667, 50.331812],
+            [92.234712, 50.802171],
+            [93.104219, 50.49529],
+            [94.147566, 50.480537],
+            [94.815949, 50.013433],
+            [95.814028, 49.977467],
+            [97.259728, 49.726061],
+            [98.231762, 50.422401],
+            [97.82574, 51.010995],
+            [98.861491, 52.047366],
+            [99.981732, 51.634006],
+            [100.88948, 51.516856],
+            [102.065223, 51.259921],
+            [102.255909, 50.510561],
+            [103.676545, 50.089966],
+            [104.621552, 50.275329],
+            [105.886591, 50.406019],
+            [106.888804, 50.274296],
+            [107.868176, 49.793705],
+            [108.475167, 49.282548],
+            [109.402449, 49.292961],
+            [110.662011, 49.130128],
+            [111.581231, 49.377968],
+            [112.89774, 49.543565],
+            [114.362456, 50.248303],
+            [114.96211, 50.140247],
+            [115.485695, 49.805177],
+            [116.678801, 49.888531],
+            [116.191802, 49.134598],
+            [115.485282, 48.135383],
+            [115.742837, 47.726545],
+            [116.308953, 47.85341],
+            [117.295507, 47.697709],
+            [118.064143, 48.06673],
+            [118.866574, 47.74706],
+            [119.772824, 47.048059],
+            [119.66327, 46.69268],
+            [118.874326, 46.805412],
+            [117.421701, 46.672733],
+            [116.717868, 46.388202],
+            [115.985096, 45.727235],
+            [114.460332, 45.339817],
+            [113.463907, 44.808893],
+            [112.436062, 45.011646],
+            [111.873306, 45.102079],
+            [111.348377, 44.457442],
+            [111.667737, 44.073176],
+            [111.829588, 43.743118],
+            [111.129682, 43.406834],
+            [110.412103, 42.871234],
+            [109.243596, 42.519446],
+            [107.744773, 42.481516],
+            [106.129316, 42.134328],
+            [104.964994, 41.59741],
+            [104.522282, 41.908347],
+            [103.312278, 41.907468],
+            [101.83304, 42.514873],
+            [100.845866, 42.663804],
+            [99.515817, 42.524691],
+            [97.451757, 42.74889],
+            [96.349396, 42.725635],
+            [95.762455, 43.319449],
+            [95.306875, 44.241331],
+            [94.688929, 44.352332],
+            [93.480734, 44.975472],
+            [92.133891, 45.115076],
+            [90.94554, 45.286073],
+            [90.585768, 45.719716],
+            [90.970809, 46.888146],
+            [90.280826, 47.693549],
+            [88.854298, 48.069082],
+            [88.013832, 48.599463],
+            [87.751264, 49.297198]
+          ]
+        ]
+      },
+      "id": "MNG"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Mozambique" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [34.559989, -11.52002],
+            [35.312398, -11.439146],
+            [36.514082, -11.720938],
+            [36.775151, -11.594537],
+            [37.471284, -11.568751],
+            [37.827645, -11.268769],
+            [38.427557, -11.285202],
+            [39.52103, -10.896854],
+            [40.316589, -10.317096],
+            [40.478387, -10.765441],
+            [40.437253, -11.761711],
+            [40.560811, -12.639177],
+            [40.59962, -14.201975],
+            [40.775475, -14.691764],
+            [40.477251, -15.406294],
+            [40.089264, -16.100774],
+            [39.452559, -16.720891],
+            [38.538351, -17.101023],
+            [37.411133, -17.586368],
+            [36.281279, -18.659688],
+            [35.896497, -18.84226],
+            [35.1984, -19.552811],
+            [34.786383, -19.784012],
+            [34.701893, -20.497043],
+            [35.176127, -21.254361],
+            [35.373428, -21.840837],
+            [35.385848, -22.14],
+            [35.562546, -22.09],
+            [35.533935, -23.070788],
+            [35.371774, -23.535359],
+            [35.60747, -23.706563],
+            [35.458746, -24.12261],
+            [35.040735, -24.478351],
+            [34.215824, -24.816314],
+            [33.01321, -25.357573],
+            [32.574632, -25.727318],
+            [32.660363, -26.148584],
+            [32.915955, -26.215867],
+            [32.83012, -26.742192],
+            [32.071665, -26.73382],
+            [31.985779, -26.29178],
+            [31.837778, -25.843332],
+            [31.752408, -25.484284],
+            [31.930589, -24.369417],
+            [31.670398, -23.658969],
+            [31.191409, -22.25151],
+            [32.244988, -21.116489],
+            [32.508693, -20.395292],
+            [32.659743, -20.30429],
+            [32.772708, -19.715592],
+            [32.611994, -19.419383],
+            [32.654886, -18.67209],
+            [32.849861, -17.979057],
+            [32.847639, -16.713398],
+            [32.328239, -16.392074],
+            [31.852041, -16.319417],
+            [31.636498, -16.07199],
+            [31.173064, -15.860944],
+            [30.338955, -15.880839],
+            [30.274256, -15.507787],
+            [30.179481, -14.796099],
+            [33.214025, -13.97186],
+            [33.7897, -14.451831],
+            [34.064825, -14.35995],
+            [34.459633, -14.61301],
+            [34.517666, -15.013709],
+            [34.307291, -15.478641],
+            [34.381292, -16.18356],
+            [35.03381, -16.8013],
+            [35.339063, -16.10744],
+            [35.771905, -15.896859],
+            [35.686845, -14.611046],
+            [35.267956, -13.887834],
+            [34.907151, -13.565425],
+            [34.559989, -13.579998],
+            [34.280006, -12.280025],
+            [34.559989, -11.52002]
+          ]
+        ]
+      },
+      "id": "MOZ"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Mauritania" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-12.17075, 14.616834],
+            [-12.830658, 15.303692],
+            [-13.435738, 16.039383],
+            [-14.099521, 16.304302],
+            [-14.577348, 16.598264],
+            [-15.135737, 16.587282],
+            [-15.623666, 16.369337],
+            [-16.12069, 16.455663],
+            [-16.463098, 16.135036],
+            [-16.549708, 16.673892],
+            [-16.270552, 17.166963],
+            [-16.146347, 18.108482],
+            [-16.256883, 19.096716],
+            [-16.377651, 19.593817],
+            [-16.277838, 20.092521],
+            [-16.536324, 20.567866],
+            [-17.063423, 20.999752],
+            [-16.845194, 21.333323],
+            [-12.929102, 21.327071],
+            [-13.118754, 22.77122],
+            [-12.874222, 23.284832],
+            [-11.937224, 23.374594],
+            [-11.969419, 25.933353],
+            [-8.687294, 25.881056],
+            [-8.6844, 27.395744],
+            [-4.923337, 24.974574],
+            [-6.453787, 24.956591],
+            [-5.971129, 20.640833],
+            [-5.488523, 16.325102],
+            [-5.315277, 16.201854],
+            [-5.537744, 15.50169],
+            [-9.550238, 15.486497],
+            [-9.700255, 15.264107],
+            [-10.086846, 15.330486],
+            [-10.650791, 15.132746],
+            [-11.349095, 15.411256],
+            [-11.666078, 15.388208],
+            [-11.834208, 14.799097],
+            [-12.17075, 14.616834]
+          ]
+        ]
+      },
+      "id": "MRT"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Malawi" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [34.559989, -11.52002],
+            [34.280006, -12.280025],
+            [34.559989, -13.579998],
+            [34.907151, -13.565425],
+            [35.267956, -13.887834],
+            [35.686845, -14.611046],
+            [35.771905, -15.896859],
+            [35.339063, -16.10744],
+            [35.03381, -16.8013],
+            [34.381292, -16.18356],
+            [34.307291, -15.478641],
+            [34.517666, -15.013709],
+            [34.459633, -14.61301],
+            [34.064825, -14.35995],
+            [33.7897, -14.451831],
+            [33.214025, -13.97186],
+            [32.688165, -13.712858],
+            [32.991764, -12.783871],
+            [33.306422, -12.435778],
+            [33.114289, -11.607198],
+            [33.31531, -10.79655],
+            [33.485688, -10.525559],
+            [33.231388, -9.676722],
+            [32.759375, -9.230599],
+            [33.739729, -9.417151],
+            [33.940838, -9.693674],
+            [34.280006, -10.16],
+            [34.559989, -11.52002]
+          ]
+        ]
+      },
+      "id": "MWI"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Malaysia" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [101.075516, 6.204867],
+              [101.154219, 5.691384],
+              [101.814282, 5.810808],
+              [102.141187, 6.221636],
+              [102.371147, 6.128205],
+              [102.961705, 5.524495],
+              [103.381215, 4.855001],
+              [103.438575, 4.181606],
+              [103.332122, 3.726698],
+              [103.429429, 3.382869],
+              [103.502448, 2.791019],
+              [103.854674, 2.515454],
+              [104.247932, 1.631141],
+              [104.228811, 1.293048],
+              [103.519707, 1.226334],
+              [102.573615, 1.967115],
+              [101.390638, 2.760814],
+              [101.27354, 3.270292],
+              [100.695435, 3.93914],
+              [100.557408, 4.76728],
+              [100.196706, 5.312493],
+              [100.30626, 6.040562],
+              [100.085757, 6.464489],
+              [100.259596, 6.642825],
+              [101.075516, 6.204867]
+            ]
+          ],
+          [
+            [
+              [118.618321, 4.478202],
+              [117.882035, 4.137551],
+              [117.015214, 4.306094],
+              [115.865517, 4.306559],
+              [115.519078, 3.169238],
+              [115.134037, 2.821482],
+              [114.621355, 1.430688],
+              [113.80585, 1.217549],
+              [112.859809, 1.49779],
+              [112.380252, 1.410121],
+              [111.797548, 0.904441],
+              [111.159138, 0.976478],
+              [110.514061, 0.773131],
+              [109.830227, 1.338136],
+              [109.66326, 2.006467],
+              [110.396135, 1.663775],
+              [111.168853, 1.850637],
+              [111.370081, 2.697303],
+              [111.796928, 2.885897],
+              [112.995615, 3.102395],
+              [113.712935, 3.893509],
+              [114.204017, 4.525874],
+              [114.659596, 4.007637],
+              [114.869557, 4.348314],
+              [115.347461, 4.316636],
+              [115.4057, 4.955228],
+              [115.45071, 5.44773],
+              [116.220741, 6.143191],
+              [116.725103, 6.924771],
+              [117.129626, 6.928053],
+              [117.643393, 6.422166],
+              [117.689075, 5.98749],
+              [118.347691, 5.708696],
+              [119.181904, 5.407836],
+              [119.110694, 5.016128],
+              [118.439727, 4.966519],
+              [118.618321, 4.478202]
+            ]
+          ]
+        ]
+      },
+      "id": "MYS"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Namibia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [16.344977, -28.576705],
+            [15.601818, -27.821247],
+            [15.210472, -27.090956],
+            [14.989711, -26.117372],
+            [14.743214, -25.39292],
+            [14.408144, -23.853014],
+            [14.385717, -22.656653],
+            [14.257714, -22.111208],
+            [13.868642, -21.699037],
+            [13.352498, -20.872834],
+            [12.826845, -19.673166],
+            [12.608564, -19.045349],
+            [11.794919, -18.069129],
+            [11.734199, -17.301889],
+            [12.215461, -17.111668],
+            [12.814081, -16.941343],
+            [13.462362, -16.971212],
+            [14.058501, -17.423381],
+            [14.209707, -17.353101],
+            [18.263309, -17.309951],
+            [18.956187, -17.789095],
+            [21.377176, -17.930636],
+            [23.215048, -17.523116],
+            [24.033862, -17.295843],
+            [24.682349, -17.353411],
+            [25.07695, -17.578823],
+            [25.084443, -17.661816],
+            [24.520705, -17.887125],
+            [24.217365, -17.889347],
+            [23.579006, -18.281261],
+            [23.196858, -17.869038],
+            [21.65504, -18.219146],
+            [20.910641, -18.252219],
+            [20.881134, -21.814327],
+            [19.895458, -21.849157],
+            [19.895768, -24.76779],
+            [19.894734, -28.461105],
+            [19.002127, -28.972443],
+            [18.464899, -29.045462],
+            [17.836152, -28.856378],
+            [17.387497, -28.783514],
+            [17.218929, -28.355943],
+            [16.824017, -28.082162],
+            [16.344977, -28.576705]
+          ]
+        ]
+      },
+      "id": "NAM"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "New Caledonia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [165.77999, -21.080005],
+            [166.599991, -21.700019],
+            [167.120011, -22.159991],
+            [166.740035, -22.399976],
+            [166.189732, -22.129708],
+            [165.474375, -21.679607],
+            [164.829815, -21.14982],
+            [164.167995, -20.444747],
+            [164.029606, -20.105646],
+            [164.459967, -20.120012],
+            [165.020036, -20.459991],
+            [165.460009, -20.800022],
+            [165.77999, -21.080005]
+          ]
+        ]
+      },
+      "id": "NCL"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Niger" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [2.154474, 11.94015],
+            [2.177108, 12.625018],
+            [1.024103, 12.851826],
+            [0.993046, 13.33575],
+            [0.429928, 13.988733],
+            [0.295646, 14.444235],
+            [0.374892, 14.928908],
+            [1.015783, 14.968182],
+            [1.385528, 15.323561],
+            [2.749993, 15.409525],
+            [3.638259, 15.56812],
+            [3.723422, 16.184284],
+            [4.27021, 16.852227],
+            [4.267419, 19.155265],
+            [5.677566, 19.601207],
+            [8.572893, 21.565661],
+            [11.999506, 23.471668],
+            [13.581425, 23.040506],
+            [14.143871, 22.491289],
+            [14.8513, 22.86295],
+            [15.096888, 21.308519],
+            [15.471077, 21.048457],
+            [15.487148, 20.730415],
+            [15.903247, 20.387619],
+            [15.685741, 19.95718],
+            [15.300441, 17.92795],
+            [15.247731, 16.627306],
+            [13.972202, 15.684366],
+            [13.540394, 14.367134],
+            [13.956699, 13.996691],
+            [13.954477, 13.353449],
+            [14.595781, 13.330427],
+            [14.495787, 12.859396],
+            [14.213531, 12.802035],
+            [14.181336, 12.483657],
+            [13.995353, 12.461565],
+            [13.318702, 13.556356],
+            [13.083987, 13.596147],
+            [12.302071, 13.037189],
+            [11.527803, 13.32898],
+            [10.989593, 13.387323],
+            [10.701032, 13.246918],
+            [10.114814, 13.277252],
+            [9.524928, 12.851102],
+            [9.014933, 12.826659],
+            [7.804671, 13.343527],
+            [7.330747, 13.098038],
+            [6.820442, 13.115091],
+            [6.445426, 13.492768],
+            [5.443058, 13.865924],
+            [4.368344, 13.747482],
+            [4.107946, 13.531216],
+            [3.967283, 12.956109],
+            [3.680634, 12.552903],
+            [3.61118, 11.660167],
+            [2.848643, 12.235636],
+            [2.490164, 12.233052],
+            [2.154474, 11.94015]
+          ]
+        ]
+      },
+      "id": "NER"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Nigeria" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [8.500288, 4.771983],
+            [7.462108, 4.412108],
+            [7.082596, 4.464689],
+            [6.698072, 4.240594],
+            [5.898173, 4.262453],
+            [5.362805, 4.887971],
+            [5.033574, 5.611802],
+            [4.325607, 6.270651],
+            [3.57418, 6.2583],
+            [2.691702, 6.258817],
+            [2.749063, 7.870734],
+            [2.723793, 8.506845],
+            [2.912308, 9.137608],
+            [3.220352, 9.444153],
+            [3.705438, 10.06321],
+            [3.60007, 10.332186],
+            [3.797112, 10.734746],
+            [3.572216, 11.327939],
+            [3.61118, 11.660167],
+            [3.680634, 12.552903],
+            [3.967283, 12.956109],
+            [4.107946, 13.531216],
+            [4.368344, 13.747482],
+            [5.443058, 13.865924],
+            [6.445426, 13.492768],
+            [6.820442, 13.115091],
+            [7.330747, 13.098038],
+            [7.804671, 13.343527],
+            [9.014933, 12.826659],
+            [9.524928, 12.851102],
+            [10.114814, 13.277252],
+            [10.701032, 13.246918],
+            [10.989593, 13.387323],
+            [11.527803, 13.32898],
+            [12.302071, 13.037189],
+            [13.083987, 13.596147],
+            [13.318702, 13.556356],
+            [13.995353, 12.461565],
+            [14.181336, 12.483657],
+            [14.577178, 12.085361],
+            [14.468192, 11.904752],
+            [14.415379, 11.572369],
+            [13.57295, 10.798566],
+            [13.308676, 10.160362],
+            [13.1676, 9.640626],
+            [12.955468, 9.417772],
+            [12.753672, 8.717763],
+            [12.218872, 8.305824],
+            [12.063946, 7.799808],
+            [11.839309, 7.397042],
+            [11.745774, 6.981383],
+            [11.058788, 6.644427],
+            [10.497375, 7.055358],
+            [10.118277, 7.03877],
+            [9.522706, 6.453482],
+            [9.233163, 6.444491],
+            [8.757533, 5.479666],
+            [8.500288, 4.771983]
+          ]
+        ]
+      },
+      "id": "NGA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Nicaragua" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-85.71254, 11.088445],
+            [-86.058488, 11.403439],
+            [-86.52585, 11.806877],
+            [-86.745992, 12.143962],
+            [-87.167516, 12.458258],
+            [-87.668493, 12.90991],
+            [-87.557467, 13.064552],
+            [-87.392386, 12.914018],
+            [-87.316654, 12.984686],
+            [-87.005769, 13.025794],
+            [-86.880557, 13.254204],
+            [-86.733822, 13.263093],
+            [-86.755087, 13.754845],
+            [-86.520708, 13.778487],
+            [-86.312142, 13.771356],
+            [-86.096264, 14.038187],
+            [-85.801295, 13.836055],
+            [-85.698665, 13.960078],
+            [-85.514413, 14.079012],
+            [-85.165365, 14.35437],
+            [-85.148751, 14.560197],
+            [-85.052787, 14.551541],
+            [-84.924501, 14.790493],
+            [-84.820037, 14.819587],
+            [-84.649582, 14.666805],
+            [-84.449336, 14.621614],
+            [-84.228342, 14.748764],
+            [-83.975721, 14.749436],
+            [-83.628585, 14.880074],
+            [-83.489989, 15.016267],
+            [-83.147219, 14.995829],
+            [-83.233234, 14.899866],
+            [-83.284162, 14.676624],
+            [-83.182126, 14.310703],
+            [-83.4125, 13.970078],
+            [-83.519832, 13.567699],
+            [-83.552207, 13.127054],
+            [-83.498515, 12.869292],
+            [-83.473323, 12.419087],
+            [-83.626104, 12.32085],
+            [-83.719613, 11.893124],
+            [-83.650858, 11.629032],
+            [-83.85547, 11.373311],
+            [-83.808936, 11.103044],
+            [-83.655612, 10.938764],
+            [-83.895054, 10.726839],
+            [-84.190179, 10.79345],
+            [-84.355931, 10.999226],
+            [-84.673069, 11.082657],
+            [-84.903003, 10.952303],
+            [-85.561852, 11.217119],
+            [-85.71254, 11.088445]
+          ]
+        ]
+      },
+      "id": "NIC"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Netherlands" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [6.074183, 53.510403],
+            [6.90514, 53.482162],
+            [7.092053, 53.144043],
+            [6.84287, 52.22844],
+            [6.589397, 51.852029],
+            [5.988658, 51.851616],
+            [6.156658, 50.803721],
+            [5.606976, 51.037298],
+            [4.973991, 51.475024],
+            [4.047071, 51.267259],
+            [3.314971, 51.345755],
+            [3.830289, 51.620545],
+            [4.705997, 53.091798],
+            [6.074183, 53.510403]
+          ]
+        ]
+      },
+      "id": "NLD"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Norway" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [28.165547, 71.185474],
+              [31.293418, 70.453788],
+              [30.005435, 70.186259],
+              [31.101079, 69.55808],
+              [29.399581, 69.156916],
+              [28.59193, 69.064777],
+              [29.015573, 69.766491],
+              [27.732292, 70.164193],
+              [26.179622, 69.825299],
+              [25.689213, 69.092114],
+              [24.735679, 68.649557],
+              [23.66205, 68.891247],
+              [22.356238, 68.841741],
+              [21.244936, 69.370443],
+              [20.645593, 69.106247],
+              [20.025269, 69.065139],
+              [19.87856, 68.407194],
+              [17.993868, 68.567391],
+              [17.729182, 68.010552],
+              [16.768879, 68.013937],
+              [16.108712, 67.302456],
+              [15.108411, 66.193867],
+              [13.55569, 64.787028],
+              [13.919905, 64.445421],
+              [13.571916, 64.049114],
+              [12.579935, 64.066219],
+              [11.930569, 63.128318],
+              [11.992064, 61.800362],
+              [12.631147, 61.293572],
+              [12.300366, 60.117933],
+              [11.468272, 59.432393],
+              [11.027369, 58.856149],
+              [10.356557, 59.469807],
+              [8.382, 58.313288],
+              [7.048748, 58.078884],
+              [5.665835, 58.588155],
+              [5.308234, 59.663232],
+              [4.992078, 61.970998],
+              [5.9129, 62.614473],
+              [8.553411, 63.454008],
+              [10.527709, 64.486038],
+              [12.358347, 65.879726],
+              [14.761146, 67.810642],
+              [16.435927, 68.563205],
+              [19.184028, 69.817444],
+              [21.378416, 70.255169],
+              [23.023742, 70.202072],
+              [24.546543, 71.030497],
+              [26.37005, 70.986262],
+              [28.165547, 71.185474]
+            ]
+          ],
+          [
+            [
+              [24.72412, 77.85385],
+              [22.49032, 77.44493],
+              [20.72601, 77.67704],
+              [21.41611, 77.93504],
+              [20.8119, 78.25463],
+              [22.88426, 78.45494],
+              [23.28134, 78.07954],
+              [24.72412, 77.85385]
+            ]
+          ],
+          [
+            [
+              [18.25183, 79.70175],
+              [21.54383, 78.95611],
+              [19.02737, 78.5626],
+              [18.47172, 77.82669],
+              [17.59441, 77.63796],
+              [17.1182, 76.80941],
+              [15.91315, 76.77045],
+              [13.76259, 77.38035],
+              [14.66956, 77.73565],
+              [13.1706, 78.02493],
+              [11.22231, 78.8693],
+              [10.44453, 79.65239],
+              [13.17077, 80.01046],
+              [13.71852, 79.66039],
+              [15.14282, 79.67431],
+              [15.52255, 80.01608],
+              [16.99085, 80.05086],
+              [18.25183, 79.70175]
+            ]
+          ],
+          [
+            [
+              [25.447625, 80.40734],
+              [27.407506, 80.056406],
+              [25.924651, 79.517834],
+              [23.024466, 79.400012],
+              [20.075188, 79.566823],
+              [19.897266, 79.842362],
+              [18.462264, 79.85988],
+              [17.368015, 80.318896],
+              [20.455992, 80.598156],
+              [21.907945, 80.357679],
+              [22.919253, 80.657144],
+              [25.447625, 80.40734]
+            ]
+          ]
+        ]
+      },
+      "id": "NOR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Nepal" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [88.120441, 27.876542],
+            [88.043133, 27.445819],
+            [88.174804, 26.810405],
+            [88.060238, 26.414615],
+            [87.227472, 26.397898],
+            [86.024393, 26.630985],
+            [85.251779, 26.726198],
+            [84.675018, 27.234901],
+            [83.304249, 27.364506],
+            [81.999987, 27.925479],
+            [81.057203, 28.416095],
+            [80.088425, 28.79447],
+            [80.476721, 29.729865],
+            [81.111256, 30.183481],
+            [81.525804, 30.422717],
+            [82.327513, 30.115268],
+            [83.337115, 29.463732],
+            [83.898993, 29.320226],
+            [84.23458, 28.839894],
+            [85.011638, 28.642774],
+            [85.82332, 28.203576],
+            [86.954517, 27.974262],
+            [88.120441, 27.876542]
+          ]
+        ]
+      },
+      "id": "NPL"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "New Zealand" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [173.020375, -40.919052],
+              [173.247234, -41.331999],
+              [173.958405, -40.926701],
+              [174.247587, -41.349155],
+              [174.248517, -41.770008],
+              [173.876447, -42.233184],
+              [173.22274, -42.970038],
+              [172.711246, -43.372288],
+              [173.080113, -43.853344],
+              [172.308584, -43.865694],
+              [171.452925, -44.242519],
+              [171.185138, -44.897104],
+              [170.616697, -45.908929],
+              [169.831422, -46.355775],
+              [169.332331, -46.641235],
+              [168.411354, -46.619945],
+              [167.763745, -46.290197],
+              [166.676886, -46.219917],
+              [166.509144, -45.852705],
+              [167.046424, -45.110941],
+              [168.303763, -44.123973],
+              [168.949409, -43.935819],
+              [169.667815, -43.555326],
+              [170.52492, -43.031688],
+              [171.12509, -42.512754],
+              [171.569714, -41.767424],
+              [171.948709, -41.514417],
+              [172.097227, -40.956104],
+              [172.79858, -40.493962],
+              [173.020375, -40.919052]
+            ]
+          ],
+          [
+            [
+              [174.612009, -36.156397],
+              [175.336616, -37.209098],
+              [175.357596, -36.526194],
+              [175.808887, -36.798942],
+              [175.95849, -37.555382],
+              [176.763195, -37.881253],
+              [177.438813, -37.961248],
+              [178.010354, -37.579825],
+              [178.517094, -37.695373],
+              [178.274731, -38.582813],
+              [177.97046, -39.166343],
+              [177.206993, -39.145776],
+              [176.939981, -39.449736],
+              [177.032946, -39.879943],
+              [176.885824, -40.065978],
+              [176.508017, -40.604808],
+              [176.01244, -41.289624],
+              [175.239567, -41.688308],
+              [175.067898, -41.425895],
+              [174.650973, -41.281821],
+              [175.22763, -40.459236],
+              [174.900157, -39.908933],
+              [173.824047, -39.508854],
+              [173.852262, -39.146602],
+              [174.574802, -38.797683],
+              [174.743474, -38.027808],
+              [174.697017, -37.381129],
+              [174.292028, -36.711092],
+              [174.319004, -36.534824],
+              [173.840997, -36.121981],
+              [173.054171, -35.237125],
+              [172.636005, -34.529107],
+              [173.007042, -34.450662],
+              [173.551298, -35.006183],
+              [174.32939, -35.265496],
+              [174.612009, -36.156397]
+            ]
+          ]
+        ]
+      },
+      "id": "NZL"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Oman" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [58.861141, 21.114035],
+              [58.487986, 20.428986],
+              [58.034318, 20.481437],
+              [57.826373, 20.243002],
+              [57.665762, 19.736005],
+              [57.7887, 19.06757],
+              [57.694391, 18.94471],
+              [57.234264, 18.947991],
+              [56.609651, 18.574267],
+              [56.512189, 18.087113],
+              [56.283521, 17.876067],
+              [55.661492, 17.884128],
+              [55.269939, 17.632309],
+              [55.2749, 17.228354],
+              [54.791002, 16.950697],
+              [54.239253, 17.044981],
+              [53.570508, 16.707663],
+              [53.108573, 16.651051],
+              [52.782184, 17.349742],
+              [52.00001, 19.000003],
+              [54.999982, 19.999994],
+              [55.666659, 22.000001],
+              [55.208341, 22.70833],
+              [55.234489, 23.110993],
+              [55.525841, 23.524869],
+              [55.528632, 23.933604],
+              [55.981214, 24.130543],
+              [55.804119, 24.269604],
+              [55.886233, 24.920831],
+              [56.396847, 24.924732],
+              [56.84514, 24.241673],
+              [57.403453, 23.878594],
+              [58.136948, 23.747931],
+              [58.729211, 23.565668],
+              [59.180502, 22.992395],
+              [59.450098, 22.660271],
+              [59.80806, 22.533612],
+              [59.806148, 22.310525],
+              [59.442191, 21.714541],
+              [59.282408, 21.433886],
+              [58.861141, 21.114035]
+            ]
+          ],
+          [
+            [
+              [56.391421, 25.895991],
+              [56.261042, 25.714606],
+              [56.070821, 26.055464],
+              [56.362017, 26.395934],
+              [56.485679, 26.309118],
+              [56.391421, 25.895991]
+            ]
+          ]
+        ]
+      },
+      "id": "OMN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Pakistan" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [75.158028, 37.133031],
+            [75.896897, 36.666806],
+            [76.192848, 35.898403],
+            [77.837451, 35.49401],
+            [76.871722, 34.653544],
+            [75.757061, 34.504923],
+            [74.240203, 34.748887],
+            [73.749948, 34.317699],
+            [74.104294, 33.441473],
+            [74.451559, 32.7649],
+            [75.258642, 32.271105],
+            [74.405929, 31.692639],
+            [74.42138, 30.979815],
+            [73.450638, 29.976413],
+            [72.823752, 28.961592],
+            [71.777666, 27.91318],
+            [70.616496, 27.989196],
+            [69.514393, 26.940966],
+            [70.168927, 26.491872],
+            [70.282873, 25.722229],
+            [70.844699, 25.215102],
+            [71.04324, 24.356524],
+            [68.842599, 24.359134],
+            [68.176645, 23.691965],
+            [67.443667, 23.944844],
+            [67.145442, 24.663611],
+            [66.372828, 25.425141],
+            [64.530408, 25.237039],
+            [62.905701, 25.218409],
+            [61.497363, 25.078237],
+            [61.874187, 26.239975],
+            [63.316632, 26.756532],
+            [63.233898, 27.217047],
+            [62.755426, 27.378923],
+            [62.72783, 28.259645],
+            [61.771868, 28.699334],
+            [61.369309, 29.303276],
+            [60.874248, 29.829239],
+            [62.549857, 29.318572],
+            [63.550261, 29.468331],
+            [64.148002, 29.340819],
+            [64.350419, 29.560031],
+            [65.046862, 29.472181],
+            [66.346473, 29.887943],
+            [66.381458, 30.738899],
+            [66.938891, 31.304911],
+            [67.683394, 31.303154],
+            [67.792689, 31.58293],
+            [68.556932, 31.71331],
+            [68.926677, 31.620189],
+            [69.317764, 31.901412],
+            [69.262522, 32.501944],
+            [69.687147, 33.105499],
+            [70.323594, 33.358533],
+            [69.930543, 34.02012],
+            [70.881803, 33.988856],
+            [71.156773, 34.348911],
+            [71.115019, 34.733126],
+            [71.613076, 35.153203],
+            [71.498768, 35.650563],
+            [71.262348, 36.074388],
+            [71.846292, 36.509942],
+            [72.920025, 36.720007],
+            [74.067552, 36.836176],
+            [74.575893, 37.020841],
+            [75.158028, 37.133031]
+          ]
+        ]
+      },
+      "id": "PAK"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Panama" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-77.881571, 7.223771],
+            [-78.214936, 7.512255],
+            [-78.429161, 8.052041],
+            [-78.182096, 8.319182],
+            [-78.435465, 8.387705],
+            [-78.622121, 8.718124],
+            [-79.120307, 8.996092],
+            [-79.557877, 8.932375],
+            [-79.760578, 8.584515],
+            [-80.164481, 8.333316],
+            [-80.382659, 8.298409],
+            [-80.480689, 8.090308],
+            [-80.00369, 7.547524],
+            [-80.276671, 7.419754],
+            [-80.421158, 7.271572],
+            [-80.886401, 7.220541],
+            [-81.059543, 7.817921],
+            [-81.189716, 7.647906],
+            [-81.519515, 7.70661],
+            [-81.721311, 8.108963],
+            [-82.131441, 8.175393],
+            [-82.390934, 8.292362],
+            [-82.820081, 8.290864],
+            [-82.850958, 8.073823],
+            [-82.965783, 8.225028],
+            [-82.913176, 8.423517],
+            [-82.829771, 8.626295],
+            [-82.868657, 8.807266],
+            [-82.719183, 8.925709],
+            [-82.927155, 9.07433],
+            [-82.932891, 9.476812],
+            [-82.546196, 9.566135],
+            [-82.187123, 9.207449],
+            [-82.207586, 8.995575],
+            [-81.808567, 8.950617],
+            [-81.714154, 9.031955],
+            [-81.439287, 8.786234],
+            [-80.947302, 8.858504],
+            [-80.521901, 9.111072],
+            [-79.9146, 9.312765],
+            [-79.573303, 9.61161],
+            [-79.021192, 9.552931],
+            [-79.05845, 9.454565],
+            [-78.500888, 9.420459],
+            [-78.055928, 9.24773],
+            [-77.729514, 8.946844],
+            [-77.353361, 8.670505],
+            [-77.474723, 8.524286],
+            [-77.242566, 7.935278],
+            [-77.431108, 7.638061],
+            [-77.753414, 7.70984],
+            [-77.881571, 7.223771]
+          ]
+        ]
+      },
+      "id": "PAN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Peru" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-69.590424, -17.580012],
+            [-69.858444, -18.092694],
+            [-70.372572, -18.347975],
+            [-71.37525, -17.773799],
+            [-71.462041, -17.363488],
+            [-73.44453, -16.359363],
+            [-75.237883, -15.265683],
+            [-76.009205, -14.649286],
+            [-76.423469, -13.823187],
+            [-76.259242, -13.535039],
+            [-77.106192, -12.222716],
+            [-78.092153, -10.377712],
+            [-79.036953, -8.386568],
+            [-79.44592, -7.930833],
+            [-79.760578, -7.194341],
+            [-80.537482, -6.541668],
+            [-81.249996, -6.136834],
+            [-80.926347, -5.690557],
+            [-81.410943, -4.736765],
+            [-81.09967, -4.036394],
+            [-80.302561, -3.404856],
+            [-80.184015, -3.821162],
+            [-80.469295, -4.059287],
+            [-80.442242, -4.425724],
+            [-80.028908, -4.346091],
+            [-79.624979, -4.454198],
+            [-79.205289, -4.959129],
+            [-78.639897, -4.547784],
+            [-78.450684, -3.873097],
+            [-77.837905, -3.003021],
+            [-76.635394, -2.608678],
+            [-75.544996, -1.56161],
+            [-75.233723, -0.911417],
+            [-75.373223, -0.152032],
+            [-75.106625, -0.057205],
+            [-74.441601, -0.53082],
+            [-74.122395, -1.002833],
+            [-73.659504, -1.260491],
+            [-73.070392, -2.308954],
+            [-72.325787, -2.434218],
+            [-71.774761, -2.16979],
+            [-71.413646, -2.342802],
+            [-70.813476, -2.256865],
+            [-70.047709, -2.725156],
+            [-70.692682, -3.742872],
+            [-70.394044, -3.766591],
+            [-69.893635, -4.298187],
+            [-70.794769, -4.251265],
+            [-70.928843, -4.401591],
+            [-71.748406, -4.593983],
+            [-72.891928, -5.274561],
+            [-72.964507, -5.741251],
+            [-73.219711, -6.089189],
+            [-73.120027, -6.629931],
+            [-73.724487, -6.918595],
+            [-73.723401, -7.340999],
+            [-73.987235, -7.52383],
+            [-73.571059, -8.424447],
+            [-73.015383, -9.032833],
+            [-73.226713, -9.462213],
+            [-72.563033, -9.520194],
+            [-72.184891, -10.053598],
+            [-71.302412, -10.079436],
+            [-70.481894, -9.490118],
+            [-70.548686, -11.009147],
+            [-70.093752, -11.123972],
+            [-69.529678, -10.951734],
+            [-68.66508, -12.5613],
+            [-68.88008, -12.899729],
+            [-68.929224, -13.602684],
+            [-68.948887, -14.453639],
+            [-69.339535, -14.953195],
+            [-69.160347, -15.323974],
+            [-69.389764, -15.660129],
+            [-68.959635, -16.500698],
+            [-69.590424, -17.580012]
+          ]
+        ]
+      },
+      "id": "PER"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Philippines" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [126.376814, 8.414706],
+              [126.478513, 7.750354],
+              [126.537424, 7.189381],
+              [126.196773, 6.274294],
+              [125.831421, 7.293715],
+              [125.363852, 6.786485],
+              [125.683161, 6.049657],
+              [125.396512, 5.581003],
+              [124.219788, 6.161355],
+              [123.93872, 6.885136],
+              [124.243662, 7.36061],
+              [123.610212, 7.833527],
+              [123.296071, 7.418876],
+              [122.825506, 7.457375],
+              [122.085499, 6.899424],
+              [121.919928, 7.192119],
+              [122.312359, 8.034962],
+              [122.942398, 8.316237],
+              [123.487688, 8.69301],
+              [123.841154, 8.240324],
+              [124.60147, 8.514158],
+              [124.764612, 8.960409],
+              [125.471391, 8.986997],
+              [125.412118, 9.760335],
+              [126.222714, 9.286074],
+              [126.306637, 8.782487],
+              [126.376814, 8.414706]
+            ]
+          ],
+          [
+            [
+              [123.982438, 10.278779],
+              [123.623183, 9.950091],
+              [123.309921, 9.318269],
+              [122.995883, 9.022189],
+              [122.380055, 9.713361],
+              [122.586089, 9.981045],
+              [122.837081, 10.261157],
+              [122.947411, 10.881868],
+              [123.49885, 10.940624],
+              [123.337774, 10.267384],
+              [124.077936, 11.232726],
+              [123.982438, 10.278779]
+            ]
+          ],
+          [
+            [
+              [118.504581, 9.316383],
+              [117.174275, 8.3675],
+              [117.664477, 9.066889],
+              [118.386914, 9.6845],
+              [118.987342, 10.376292],
+              [119.511496, 11.369668],
+              [119.689677, 10.554291],
+              [119.029458, 10.003653],
+              [118.504581, 9.316383]
+            ]
+          ],
+          [
+            [
+              [121.883548, 11.891755],
+              [122.483821, 11.582187],
+              [123.120217, 11.58366],
+              [123.100838, 11.165934],
+              [122.637714, 10.741308],
+              [122.00261, 10.441017],
+              [121.967367, 10.905691],
+              [122.03837, 11.415841],
+              [121.883548, 11.891755]
+            ]
+          ],
+          [
+            [
+              [125.502552, 12.162695],
+              [125.783465, 11.046122],
+              [125.011884, 11.311455],
+              [125.032761, 10.975816],
+              [125.277449, 10.358722],
+              [124.801819, 10.134679],
+              [124.760168, 10.837995],
+              [124.459101, 10.88993],
+              [124.302522, 11.495371],
+              [124.891013, 11.415583],
+              [124.87799, 11.79419],
+              [124.266762, 12.557761],
+              [125.227116, 12.535721],
+              [125.502552, 12.162695]
+            ]
+          ],
+          [
+            [
+              [121.527394, 13.06959],
+              [121.26219, 12.20556],
+              [120.833896, 12.704496],
+              [120.323436, 13.466413],
+              [121.180128, 13.429697],
+              [121.527394, 13.06959]
+            ]
+          ],
+          [
+            [
+              [121.321308, 18.504065],
+              [121.937601, 18.218552],
+              [122.246006, 18.47895],
+              [122.336957, 18.224883],
+              [122.174279, 17.810283],
+              [122.515654, 17.093505],
+              [122.252311, 16.262444],
+              [121.662786, 15.931018],
+              [121.50507, 15.124814],
+              [121.728829, 14.328376],
+              [122.258925, 14.218202],
+              [122.701276, 14.336541],
+              [123.950295, 13.782131],
+              [123.855107, 13.237771],
+              [124.181289, 12.997527],
+              [124.077419, 12.536677],
+              [123.298035, 13.027526],
+              [122.928652, 13.55292],
+              [122.671355, 13.185836],
+              [122.03465, 13.784482],
+              [121.126385, 13.636687],
+              [120.628637, 13.857656],
+              [120.679384, 14.271016],
+              [120.991819, 14.525393],
+              [120.693336, 14.756671],
+              [120.564145, 14.396279],
+              [120.070429, 14.970869],
+              [119.920929, 15.406347],
+              [119.883773, 16.363704],
+              [120.286488, 16.034629],
+              [120.390047, 17.599081],
+              [120.715867, 18.505227],
+              [121.321308, 18.504065]
+            ]
+          ]
+        ]
+      },
+      "id": "PHL"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Papua New Guinea" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [155.880026, -6.819997],
+              [155.599991, -6.919991],
+              [155.166994, -6.535931],
+              [154.729192, -5.900828],
+              [154.514114, -5.139118],
+              [154.652504, -5.042431],
+              [154.759991, -5.339984],
+              [155.062918, -5.566792],
+              [155.547746, -6.200655],
+              [156.019965, -6.540014],
+              [155.880026, -6.819997]
+            ]
+          ],
+          [
+            [
+              [151.982796, -5.478063],
+              [151.459107, -5.56028],
+              [151.30139, -5.840728],
+              [150.754447, -6.083763],
+              [150.241197, -6.317754],
+              [149.709963, -6.316513],
+              [148.890065, -6.02604],
+              [148.318937, -5.747142],
+              [148.401826, -5.437756],
+              [149.298412, -5.583742],
+              [149.845562, -5.505503],
+              [149.99625, -5.026101],
+              [150.139756, -5.001348],
+              [150.236908, -5.53222],
+              [150.807467, -5.455842],
+              [151.089672, -5.113693],
+              [151.647881, -4.757074],
+              [151.537862, -4.167807],
+              [152.136792, -4.14879],
+              [152.338743, -4.312966],
+              [152.318693, -4.867661],
+              [151.982796, -5.478063]
+            ]
+          ],
+          [
+            [
+              [147.191874, -7.388024],
+              [148.084636, -8.044108],
+              [148.734105, -9.104664],
+              [149.306835, -9.071436],
+              [149.266631, -9.514406],
+              [150.038728, -9.684318],
+              [149.738798, -9.872937],
+              [150.801628, -10.293687],
+              [150.690575, -10.582713],
+              [150.028393, -10.652476],
+              [149.78231, -10.393267],
+              [148.923138, -10.280923],
+              [147.913018, -10.130441],
+              [147.135443, -9.492444],
+              [146.567881, -8.942555],
+              [146.048481, -8.067414],
+              [144.744168, -7.630128],
+              [143.897088, -7.91533],
+              [143.286376, -8.245491],
+              [143.413913, -8.983069],
+              [142.628431, -9.326821],
+              [142.068259, -9.159596],
+              [141.033852, -9.117893],
+              [141.017057, -5.859022],
+              [141.00021, -2.600151],
+              [142.735247, -3.289153],
+              [144.583971, -3.861418],
+              [145.27318, -4.373738],
+              [145.829786, -4.876498],
+              [145.981922, -5.465609],
+              [147.648073, -6.083659],
+              [147.891108, -6.614015],
+              [146.970905, -6.721657],
+              [147.191874, -7.388024]
+            ]
+          ],
+          [
+            [
+              [153.140038, -4.499983],
+              [152.827292, -4.766427],
+              [152.638673, -4.176127],
+              [152.406026, -3.789743],
+              [151.953237, -3.462062],
+              [151.384279, -3.035422],
+              [150.66205, -2.741486],
+              [150.939965, -2.500002],
+              [151.479984, -2.779985],
+              [151.820015, -2.999972],
+              [152.239989, -3.240009],
+              [152.640017, -3.659983],
+              [153.019994, -3.980015],
+              [153.140038, -4.499983]
+            ]
+          ]
+        ]
+      },
+      "id": "PNG"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Poland" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [15.016996, 51.106674],
+            [14.607098, 51.745188],
+            [14.685026, 52.089947],
+            [14.4376, 52.62485],
+            [14.074521, 52.981263],
+            [14.353315, 53.248171],
+            [14.119686, 53.757029],
+            [14.8029, 54.050706],
+            [16.363477, 54.513159],
+            [17.622832, 54.851536],
+            [18.620859, 54.682606],
+            [18.696255, 54.438719],
+            [19.66064, 54.426084],
+            [20.892245, 54.312525],
+            [22.731099, 54.327537],
+            [23.243987, 54.220567],
+            [23.484128, 53.912498],
+            [23.527536, 53.470122],
+            [23.804935, 53.089731],
+            [23.799199, 52.691099],
+            [23.199494, 52.486977],
+            [23.508002, 52.023647],
+            [23.527071, 51.578454],
+            [24.029986, 50.705407],
+            [23.922757, 50.424881],
+            [23.426508, 50.308506],
+            [22.51845, 49.476774],
+            [22.776419, 49.027395],
+            [22.558138, 49.085738],
+            [21.607808, 49.470107],
+            [20.887955, 49.328772],
+            [20.415839, 49.431453],
+            [19.825023, 49.217125],
+            [19.320713, 49.571574],
+            [18.909575, 49.435846],
+            [18.853144, 49.49623],
+            [18.392914, 49.988629],
+            [17.649445, 50.049038],
+            [17.554567, 50.362146],
+            [16.868769, 50.473974],
+            [16.719476, 50.215747],
+            [16.176253, 50.422607],
+            [16.238627, 50.697733],
+            [15.490972, 50.78473],
+            [15.016996, 51.106674]
+          ]
+        ]
+      },
+      "id": "POL"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Puerto Rico" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-66.282434, 18.514762],
+            [-65.771303, 18.426679],
+            [-65.591004, 18.228035],
+            [-65.847164, 17.975906],
+            [-66.599934, 17.981823],
+            [-67.184162, 17.946553],
+            [-67.242428, 18.37446],
+            [-67.100679, 18.520601],
+            [-66.282434, 18.514762]
+          ]
+        ]
+      },
+      "id": "PRI"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "North Korea" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [130.640016, 42.395009],
+            [130.780007, 42.220007],
+            [130.400031, 42.280004],
+            [129.965949, 41.941368],
+            [129.667362, 41.601104],
+            [129.705189, 40.882828],
+            [129.188115, 40.661808],
+            [129.0104, 40.485436],
+            [128.633368, 40.189847],
+            [127.967414, 40.025413],
+            [127.533436, 39.75685],
+            [127.50212, 39.323931],
+            [127.385434, 39.213472],
+            [127.783343, 39.050898],
+            [128.349716, 38.612243],
+            [128.205746, 38.370397],
+            [127.780035, 38.304536],
+            [127.073309, 38.256115],
+            [126.68372, 37.804773],
+            [126.237339, 37.840378],
+            [126.174759, 37.749686],
+            [125.689104, 37.94001],
+            [125.568439, 37.752089],
+            [125.27533, 37.669071],
+            [125.240087, 37.857224],
+            [124.981033, 37.948821],
+            [124.712161, 38.108346],
+            [124.985994, 38.548474],
+            [125.221949, 38.665857],
+            [125.132859, 38.848559],
+            [125.38659, 39.387958],
+            [125.321116, 39.551385],
+            [124.737482, 39.660344],
+            [124.265625, 39.928493],
+            [125.079942, 40.569824],
+            [126.182045, 41.107336],
+            [126.869083, 41.816569],
+            [127.343783, 41.503152],
+            [128.208433, 41.466772],
+            [128.052215, 41.994285],
+            [129.596669, 42.424982],
+            [129.994267, 42.985387],
+            [130.640016, 42.395009]
+          ]
+        ]
+      },
+      "id": "PRK"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Portugal" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-9.034818, 41.880571],
+            [-8.671946, 42.134689],
+            [-8.263857, 42.280469],
+            [-8.013175, 41.790886],
+            [-7.422513, 41.792075],
+            [-7.251309, 41.918346],
+            [-6.668606, 41.883387],
+            [-6.389088, 41.381815],
+            [-6.851127, 41.111083],
+            [-6.86402, 40.330872],
+            [-7.026413, 40.184524],
+            [-7.066592, 39.711892],
+            [-7.498632, 39.629571],
+            [-7.098037, 39.030073],
+            [-7.374092, 38.373059],
+            [-7.029281, 38.075764],
+            [-7.166508, 37.803894],
+            [-7.537105, 37.428904],
+            [-7.453726, 37.097788],
+            [-7.855613, 36.838269],
+            [-8.382816, 36.97888],
+            [-8.898857, 36.868809],
+            [-8.746101, 37.651346],
+            [-8.839998, 38.266243],
+            [-9.287464, 38.358486],
+            [-9.526571, 38.737429],
+            [-9.446989, 39.392066],
+            [-9.048305, 39.755093],
+            [-8.977353, 40.159306],
+            [-8.768684, 40.760639],
+            [-8.790853, 41.184334],
+            [-8.990789, 41.543459],
+            [-9.034818, 41.880571]
+          ]
+        ]
+      },
+      "id": "PRT"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Paraguay" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-62.685057, -22.249029],
+            [-62.291179, -21.051635],
+            [-62.265961, -20.513735],
+            [-61.786326, -19.633737],
+            [-60.043565, -19.342747],
+            [-59.115042, -19.356906],
+            [-58.183471, -19.868399],
+            [-58.166392, -20.176701],
+            [-57.870674, -20.732688],
+            [-57.937156, -22.090176],
+            [-56.88151, -22.282154],
+            [-56.473317, -22.0863],
+            [-55.797958, -22.35693],
+            [-55.610683, -22.655619],
+            [-55.517639, -23.571998],
+            [-55.400747, -23.956935],
+            [-55.027902, -24.001274],
+            [-54.652834, -23.839578],
+            [-54.29296, -24.021014],
+            [-54.293476, -24.5708],
+            [-54.428946, -25.162185],
+            [-54.625291, -25.739255],
+            [-54.788795, -26.621786],
+            [-55.695846, -27.387837],
+            [-56.486702, -27.548499],
+            [-57.60976, -27.395899],
+            [-58.618174, -27.123719],
+            [-57.63366, -25.603657],
+            [-57.777217, -25.16234],
+            [-58.807128, -24.771459],
+            [-60.028966, -24.032796],
+            [-60.846565, -23.880713],
+            [-62.685057, -22.249029]
+          ]
+        ]
+      },
+      "id": "PRY"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Qatar" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [50.810108, 24.754743],
+            [50.743911, 25.482424],
+            [51.013352, 26.006992],
+            [51.286462, 26.114582],
+            [51.589079, 25.801113],
+            [51.6067, 25.21567],
+            [51.389608, 24.627386],
+            [51.112415, 24.556331],
+            [50.810108, 24.754743]
+          ]
+        ]
+      },
+      "id": "QAT"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Romania" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [22.710531, 47.882194],
+            [23.142236, 48.096341],
+            [23.760958, 47.985598],
+            [24.402056, 47.981878],
+            [24.866317, 47.737526],
+            [25.207743, 47.891056],
+            [25.945941, 47.987149],
+            [26.19745, 48.220881],
+            [26.619337, 48.220726],
+            [26.924176, 48.123264],
+            [27.233873, 47.826771],
+            [27.551166, 47.405117],
+            [28.12803, 46.810476],
+            [28.160018, 46.371563],
+            [28.054443, 45.944586],
+            [28.233554, 45.488283],
+            [28.679779, 45.304031],
+            [29.149725, 45.464925],
+            [29.603289, 45.293308],
+            [29.626543, 45.035391],
+            [29.141612, 44.82021],
+            [28.837858, 44.913874],
+            [28.558081, 43.707462],
+            [27.970107, 43.812468],
+            [27.2424, 44.175986],
+            [26.065159, 43.943494],
+            [25.569272, 43.688445],
+            [24.100679, 43.741051],
+            [23.332302, 43.897011],
+            [22.944832, 43.823785],
+            [22.65715, 44.234923],
+            [22.474008, 44.409228],
+            [22.705726, 44.578003],
+            [22.459022, 44.702517],
+            [22.145088, 44.478422],
+            [21.562023, 44.768947],
+            [21.483526, 45.18117],
+            [20.874313, 45.416375],
+            [20.762175, 45.734573],
+            [20.220192, 46.127469],
+            [21.021952, 46.316088],
+            [21.626515, 46.994238],
+            [22.099768, 47.672439],
+            [22.710531, 47.882194]
+          ]
+        ]
+      },
+      "id": "ROU"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Russia" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [143.648007, 50.7476],
+              [144.654148, 48.976391],
+              [143.173928, 49.306551],
+              [142.558668, 47.861575],
+              [143.533492, 46.836728],
+              [143.505277, 46.137908],
+              [142.747701, 46.740765],
+              [142.09203, 45.966755],
+              [141.906925, 46.805929],
+              [142.018443, 47.780133],
+              [141.904445, 48.859189],
+              [142.1358, 49.615163],
+              [142.179983, 50.952342],
+              [141.594076, 51.935435],
+              [141.682546, 53.301966],
+              [142.606934, 53.762145],
+              [142.209749, 54.225476],
+              [142.654786, 54.365881],
+              [142.914616, 53.704578],
+              [143.260848, 52.74076],
+              [143.235268, 51.75666],
+              [143.648007, 50.7476]
+            ]
+          ],
+          [
+            [
+              [22.731099, 54.327537],
+              [20.892245, 54.312525],
+              [19.66064, 54.426084],
+              [19.888481, 54.86616],
+              [21.268449, 55.190482],
+              [22.315724, 55.015299],
+              [22.757764, 54.856574],
+              [22.651052, 54.582741],
+              [22.731099, 54.327537]
+            ]
+          ],
+          [
+            [
+              [-175.01425, 66.58435],
+              [-174.33983, 66.33556],
+              [-174.57182, 67.06219],
+              [-171.85731, 66.91308],
+              [-169.89958, 65.97724],
+              [-170.89107, 65.54139],
+              [-172.53025, 65.43791],
+              [-172.555, 64.46079],
+              [-172.95533, 64.25269],
+              [-173.89184, 64.2826],
+              [-174.65392, 64.63125],
+              [-175.98353, 64.92288],
+              [-176.20716, 65.35667],
+              [-177.22266, 65.52024],
+              [-178.35993, 65.39052],
+              [-178.90332, 65.74044],
+              [-178.68611, 66.11211],
+              [-179.88377, 65.87456],
+              [-179.43268, 65.40411],
+              [-180, 64.979709],
+              [-180, 68.963636],
+              [-177.55, 68.2],
+              [-174.92825, 67.20589],
+              [-175.01425, 66.58435]
+            ]
+          ],
+          [
+            [
+              [180, 70.832199],
+              [178.903425, 70.78114],
+              [178.7253, 71.0988],
+              [180, 71.515714],
+              [180, 70.832199]
+            ]
+          ],
+          [
+            [
+              [-178.69378, 70.89302],
+              [-180, 70.832199],
+              [-180, 71.515714],
+              [-179.871875, 71.55762],
+              [-179.02433, 71.55553],
+              [-177.577945, 71.26948],
+              [-177.663575, 71.13277],
+              [-178.69378, 70.89302]
+            ]
+          ],
+          [
+            [
+              [143.60385, 73.21244],
+              [142.08763, 73.20544],
+              [140.038155, 73.31692],
+              [139.86312, 73.36983],
+              [140.81171, 73.76506],
+              [142.06207, 73.85758],
+              [143.48283, 73.47525],
+              [143.60385, 73.21244]
+            ]
+          ],
+          [
+            [
+              [150.73167, 75.08406],
+              [149.575925, 74.68892],
+              [147.977465, 74.778355],
+              [146.11919, 75.17298],
+              [146.358485, 75.49682],
+              [148.22223, 75.345845],
+              [150.73167, 75.08406]
+            ]
+          ],
+          [
+            [
+              [145.086285, 75.562625],
+              [144.3, 74.82],
+              [140.61381, 74.84768],
+              [138.95544, 74.61148],
+              [136.97439, 75.26167],
+              [137.51176, 75.94917],
+              [138.831075, 76.13676],
+              [141.471615, 76.09289],
+              [145.086285, 75.562625]
+            ]
+          ],
+          [
+            [
+              [57.535693, 70.720464],
+              [56.944979, 70.632743],
+              [53.677375, 70.762658],
+              [53.412017, 71.206662],
+              [51.601895, 71.474759],
+              [51.455754, 72.014881],
+              [52.478275, 72.229442],
+              [52.444169, 72.774731],
+              [54.427614, 73.627548],
+              [53.50829, 73.749814],
+              [55.902459, 74.627486],
+              [55.631933, 75.081412],
+              [57.868644, 75.60939],
+              [61.170044, 76.251883],
+              [64.498368, 76.439055],
+              [66.210977, 76.809782],
+              [68.15706, 76.939697],
+              [68.852211, 76.544811],
+              [68.180573, 76.233642],
+              [64.637326, 75.737755],
+              [61.583508, 75.260885],
+              [58.477082, 74.309056],
+              [56.986786, 73.333044],
+              [55.419336, 72.371268],
+              [55.622838, 71.540595],
+              [57.535693, 70.720464]
+            ]
+          ],
+          [
+            [
+              [106.97013, 76.97419],
+              [107.24, 76.48],
+              [108.1538, 76.72335],
+              [111.07726, 76.71],
+              [113.33151, 76.22224],
+              [114.13417, 75.84764],
+              [113.88539, 75.32779],
+              [112.77918, 75.03186],
+              [110.15125, 74.47673],
+              [109.4, 74.18],
+              [110.64, 74.04],
+              [112.11919, 73.78774],
+              [113.01954, 73.97693],
+              [113.52958, 73.33505],
+              [113.96881, 73.59488],
+              [115.56782, 73.75285],
+              [118.77633, 73.58772],
+              [119.02, 73.12],
+              [123.20066, 72.97122],
+              [123.25777, 73.73503],
+              [125.38, 73.56],
+              [126.97644, 73.56549],
+              [128.59126, 73.03871],
+              [129.05157, 72.39872],
+              [128.46, 71.98],
+              [129.71599, 71.19304],
+              [131.28858, 70.78699],
+              [132.2535, 71.8363],
+              [133.85766, 71.38642],
+              [135.56193, 71.65525],
+              [137.49755, 71.34763],
+              [138.23409, 71.62803],
+              [139.86983, 71.48783],
+              [139.14791, 72.41619],
+              [140.46817, 72.84941],
+              [149.5, 72.2],
+              [150.35118, 71.60643],
+              [152.9689, 70.84222],
+              [157.00688, 71.03141],
+              [158.99779, 70.86672],
+              [159.83031, 70.45324],
+              [159.70866, 69.72198],
+              [160.94053, 69.43728],
+              [162.27907, 69.64204],
+              [164.05248, 69.66823],
+              [165.94037, 69.47199],
+              [167.83567, 69.58269],
+              [169.57763, 68.6938],
+              [170.81688, 69.01363],
+              [170.0082, 69.65276],
+              [170.45345, 70.09703],
+              [173.64391, 69.81743],
+              [175.72403, 69.87725],
+              [178.6, 69.4],
+              [180, 68.963636],
+              [180, 64.979709],
+              [179.99281, 64.97433],
+              [178.7072, 64.53493],
+              [177.41128, 64.60821],
+              [178.313, 64.07593],
+              [178.90825, 63.25197],
+              [179.37034, 62.98262],
+              [179.48636, 62.56894],
+              [179.22825, 62.3041],
+              [177.3643, 62.5219],
+              [174.56929, 61.76915],
+              [173.68013, 61.65261],
+              [172.15, 60.95],
+              [170.6985, 60.33618],
+              [170.33085, 59.88177],
+              [168.90046, 60.57355],
+              [166.29498, 59.78855],
+              [165.84, 60.16],
+              [164.87674, 59.7316],
+              [163.53929, 59.86871],
+              [163.21711, 59.21101],
+              [162.01733, 58.24328],
+              [162.05297, 57.83912],
+              [163.19191, 57.61503],
+              [163.05794, 56.15924],
+              [162.12958, 56.12219],
+              [161.70146, 55.28568],
+              [162.11749, 54.85514],
+              [160.36877, 54.34433],
+              [160.02173, 53.20257],
+              [158.53094, 52.95868],
+              [158.23118, 51.94269],
+              [156.78979, 51.01105],
+              [156.42, 51.7],
+              [155.99182, 53.15895],
+              [155.43366, 55.38103],
+              [155.91442, 56.76792],
+              [156.75815, 57.3647],
+              [156.81035, 57.83204],
+              [158.36433, 58.05575],
+              [160.15064, 59.31477],
+              [161.87204, 60.343],
+              [163.66969, 61.1409],
+              [164.47355, 62.55061],
+              [163.25842, 62.46627],
+              [162.65791, 61.6425],
+              [160.12148, 60.54423],
+              [159.30232, 61.77396],
+              [156.72068, 61.43442],
+              [154.21806, 59.75818],
+              [155.04375, 59.14495],
+              [152.81185, 58.88385],
+              [151.26573, 58.78089],
+              [151.33815, 59.50396],
+              [149.78371, 59.65573],
+              [148.54481, 59.16448],
+              [145.48722, 59.33637],
+              [142.19782, 59.03998],
+              [138.95848, 57.08805],
+              [135.12619, 54.72959],
+              [136.70171, 54.60355],
+              [137.19342, 53.97732],
+              [138.1647, 53.75501],
+              [138.80463, 54.25455],
+              [139.90151, 54.18968],
+              [141.34531, 53.08957],
+              [141.37923, 52.23877],
+              [140.59742, 51.23967],
+              [140.51308, 50.04553],
+              [140.06193, 48.44671],
+              [138.55472, 46.99965],
+              [138.21971, 46.30795],
+              [136.86232, 45.1435],
+              [135.51535, 43.989],
+              [134.86939, 43.39821],
+              [133.53687, 42.81147],
+              [132.90627, 42.79849],
+              [132.27807, 43.28456],
+              [130.93587, 42.55274],
+              [130.78, 42.22],
+              [130.64, 42.395],
+              [130.633866, 42.903015],
+              [131.144688, 42.92999],
+              [131.288555, 44.11152],
+              [131.02519, 44.96796],
+              [131.883454, 45.321162],
+              [133.09712, 45.14409],
+              [133.769644, 46.116927],
+              [134.11235, 47.21248],
+              [134.50081, 47.57845],
+              [135.026311, 48.47823],
+              [133.373596, 48.183442],
+              [132.50669, 47.78896],
+              [130.98726, 47.79013],
+              [130.582293, 48.729687],
+              [129.397818, 49.4406],
+              [127.6574, 49.76027],
+              [127.287456, 50.739797],
+              [126.939157, 51.353894],
+              [126.564399, 51.784255],
+              [125.946349, 52.792799],
+              [125.068211, 53.161045],
+              [123.57147, 53.4588],
+              [122.245748, 53.431726],
+              [121.003085, 53.251401],
+              [120.177089, 52.753886],
+              [120.725789, 52.516226],
+              [120.7382, 51.96411],
+              [120.18208, 51.64355],
+              [119.27939, 50.58292],
+              [119.288461, 50.142883],
+              [117.879244, 49.510983],
+              [116.678801, 49.888531],
+              [115.485695, 49.805177],
+              [114.96211, 50.140247],
+              [114.362456, 50.248303],
+              [112.89774, 49.543565],
+              [111.581231, 49.377968],
+              [110.662011, 49.130128],
+              [109.402449, 49.292961],
+              [108.475167, 49.282548],
+              [107.868176, 49.793705],
+              [106.888804, 50.274296],
+              [105.886591, 50.406019],
+              [104.62158, 50.27532],
+              [103.676545, 50.089966],
+              [102.25589, 50.51056],
+              [102.06521, 51.25991],
+              [100.88948, 51.516856],
+              [99.981732, 51.634006],
+              [98.861491, 52.047366],
+              [97.82574, 51.010995],
+              [98.231762, 50.422401],
+              [97.25976, 49.72605],
+              [95.81402, 49.97746],
+              [94.815949, 50.013433],
+              [94.147566, 50.480537],
+              [93.10421, 50.49529],
+              [92.234712, 50.802171],
+              [90.713667, 50.331812],
+              [88.805567, 49.470521],
+              [87.751264, 49.297198],
+              [87.35997, 49.214981],
+              [86.829357, 49.826675],
+              [85.54127, 49.692859],
+              [85.11556, 50.117303],
+              [84.416377, 50.3114],
+              [83.935115, 50.889246],
+              [83.383004, 51.069183],
+              [81.945986, 50.812196],
+              [80.568447, 51.388336],
+              [80.03556, 50.864751],
+              [77.800916, 53.404415],
+              [76.525179, 54.177003],
+              [76.8911, 54.490524],
+              [74.38482, 53.54685],
+              [73.425679, 53.48981],
+              [73.508516, 54.035617],
+              [72.22415, 54.376655],
+              [71.180131, 54.133285],
+              [70.865267, 55.169734],
+              [69.068167, 55.38525],
+              [68.1691, 54.970392],
+              [65.66687, 54.60125],
+              [65.178534, 54.354228],
+              [61.4366, 54.00625],
+              [60.978066, 53.664993],
+              [61.699986, 52.979996],
+              [60.739993, 52.719986],
+              [60.927269, 52.447548],
+              [59.967534, 51.96042],
+              [61.588003, 51.272659],
+              [61.337424, 50.79907],
+              [59.932807, 50.842194],
+              [59.642282, 50.545442],
+              [58.36332, 51.06364],
+              [56.77798, 51.04355],
+              [55.71694, 50.62171],
+              [54.532878, 51.02624],
+              [52.328724, 51.718652],
+              [50.766648, 51.692762],
+              [48.702382, 50.605128],
+              [48.577841, 49.87476],
+              [47.54948, 50.454698],
+              [46.751596, 49.356006],
+              [47.043672, 49.152039],
+              [46.466446, 48.394152],
+              [47.31524, 47.71585],
+              [48.05725, 47.74377],
+              [48.694734, 47.075628],
+              [48.59325, 46.56104],
+              [49.10116, 46.39933],
+              [48.64541, 45.80629],
+              [47.67591, 45.64149],
+              [46.68201, 44.6092],
+              [47.59094, 43.66016],
+              [47.49252, 42.98658],
+              [48.58437, 41.80888],
+              [47.987283, 41.405819],
+              [47.815666, 41.151416],
+              [47.373315, 41.219732],
+              [46.686071, 41.827137],
+              [46.404951, 41.860675],
+              [45.7764, 42.09244],
+              [45.470279, 42.502781],
+              [44.537623, 42.711993],
+              [43.93121, 42.55496],
+              [43.75599, 42.74083],
+              [42.3944, 43.2203],
+              [40.92219, 43.38215],
+              [40.076965, 43.553104],
+              [39.955009, 43.434998],
+              [38.68, 44.28],
+              [37.53912, 44.65721],
+              [36.67546, 45.24469],
+              [37.40317, 45.40451],
+              [38.23295, 46.24087],
+              [37.67372, 46.63657],
+              [39.14767, 47.04475],
+              [39.1212, 47.26336],
+              [38.223538, 47.10219],
+              [38.255112, 47.5464],
+              [38.77057, 47.82562],
+              [39.738278, 47.898937],
+              [39.89562, 48.23241],
+              [39.67465, 48.78382],
+              [40.080789, 49.30743],
+              [40.06904, 49.60105],
+              [38.594988, 49.926462],
+              [38.010631, 49.915662],
+              [37.39346, 50.383953],
+              [36.626168, 50.225591],
+              [35.356116, 50.577197],
+              [35.37791, 50.77394],
+              [35.022183, 51.207572],
+              [34.224816, 51.255993],
+              [34.141978, 51.566413],
+              [34.391731, 51.768882],
+              [33.7527, 52.335075],
+              [32.715761, 52.238465],
+              [32.412058, 52.288695],
+              [32.15944, 52.06125],
+              [31.78597, 52.10168],
+              [31.540018, 52.742052],
+              [31.305201, 53.073996],
+              [31.49764, 53.16743],
+              [32.304519, 53.132726],
+              [32.693643, 53.351421],
+              [32.405599, 53.618045],
+              [31.731273, 53.794029],
+              [31.791424, 53.974639],
+              [31.384472, 54.157056],
+              [30.757534, 54.811771],
+              [30.971836, 55.081548],
+              [30.873909, 55.550976],
+              [29.896294, 55.789463],
+              [29.371572, 55.670091],
+              [29.229513, 55.918344],
+              [28.176709, 56.16913],
+              [27.855282, 56.759326],
+              [27.770016, 57.244258],
+              [27.288185, 57.474528],
+              [27.716686, 57.791899],
+              [27.42015, 58.72457],
+              [28.131699, 59.300825],
+              [27.98112, 59.47537],
+              [29.1177, 60.02805],
+              [28.07, 60.50352],
+              [30.211107, 61.780028],
+              [31.139991, 62.357693],
+              [31.516092, 62.867687],
+              [30.035872, 63.552814],
+              [30.444685, 64.204453],
+              [29.54443, 64.948672],
+              [30.21765, 65.80598],
+              [29.054589, 66.944286],
+              [29.977426, 67.698297],
+              [28.445944, 68.364613],
+              [28.59193, 69.064777],
+              [29.39955, 69.15692],
+              [31.10108, 69.55811],
+              [32.13272, 69.90595],
+              [33.77547, 69.30142],
+              [36.51396, 69.06342],
+              [40.29234, 67.9324],
+              [41.05987, 67.45713],
+              [41.12595, 66.79158],
+              [40.01583, 66.26618],
+              [38.38295, 65.99953],
+              [33.91871, 66.75961],
+              [33.18444, 66.63253],
+              [34.81477, 65.90015],
+              [34.878574, 65.436213],
+              [34.94391, 64.41437],
+              [36.23129, 64.10945],
+              [37.01273, 63.84983],
+              [37.14197, 64.33471],
+              [36.539579, 64.76446],
+              [37.17604, 65.14322],
+              [39.59345, 64.52079],
+              [40.4356, 64.76446],
+              [39.7626, 65.49682],
+              [42.09309, 66.47623],
+              [43.01604, 66.41858],
+              [43.94975, 66.06908],
+              [44.53226, 66.75634],
+              [43.69839, 67.35245],
+              [44.18795, 67.95051],
+              [43.45282, 68.57079],
+              [46.25, 68.25],
+              [46.82134, 67.68997],
+              [45.55517, 67.56652],
+              [45.56202, 67.01005],
+              [46.34915, 66.66767],
+              [47.89416, 66.88455],
+              [48.13876, 67.52238],
+              [50.22766, 67.99867],
+              [53.71743, 68.85738],
+              [54.47171, 68.80815],
+              [53.48582, 68.20131],
+              [54.72628, 68.09702],
+              [55.44268, 68.43866],
+              [57.31702, 68.46628],
+              [58.802, 68.88082],
+              [59.94142, 68.27844],
+              [61.07784, 68.94069],
+              [60.03, 69.52],
+              [60.55, 69.85],
+              [63.504, 69.54739],
+              [64.888115, 69.234835],
+              [68.51216, 68.09233],
+              [69.18068, 68.61563],
+              [68.16444, 69.14436],
+              [68.13522, 69.35649],
+              [66.93008, 69.45461],
+              [67.25976, 69.92873],
+              [66.72492, 70.70889],
+              [66.69466, 71.02897],
+              [68.54006, 71.9345],
+              [69.19636, 72.84336],
+              [69.94, 73.04],
+              [72.58754, 72.77629],
+              [72.79603, 72.22006],
+              [71.84811, 71.40898],
+              [72.47011, 71.09019],
+              [72.79188, 70.39114],
+              [72.5647, 69.02085],
+              [73.66787, 68.4079],
+              [73.2387, 67.7404],
+              [71.28, 66.32],
+              [72.42301, 66.17267],
+              [72.82077, 66.53267],
+              [73.92099, 66.78946],
+              [74.18651, 67.28429],
+              [75.052, 67.76047],
+              [74.46926, 68.32899],
+              [74.93584, 68.98918],
+              [73.84236, 69.07146],
+              [73.60187, 69.62763],
+              [74.3998, 70.63175],
+              [73.1011, 71.44717],
+              [74.89082, 72.12119],
+              [74.65926, 72.83227],
+              [75.15801, 72.85497],
+              [75.68351, 72.30056],
+              [75.28898, 71.33556],
+              [76.35911, 71.15287],
+              [75.90313, 71.87401],
+              [77.57665, 72.26717],
+              [79.65202, 72.32011],
+              [81.5, 71.75],
+              [80.61071, 72.58285],
+              [80.51109, 73.6482],
+              [82.25, 73.85],
+              [84.65526, 73.80591],
+              [86.8223, 73.93688],
+              [86.00956, 74.45967],
+              [87.16682, 75.11643],
+              [88.31571, 75.14393],
+              [90.26, 75.64],
+              [92.90058, 75.77333],
+              [93.23421, 76.0472],
+              [95.86, 76.14],
+              [96.67821, 75.91548],
+              [98.92254, 76.44689],
+              [100.75967, 76.43028],
+              [101.03532, 76.86189],
+              [101.99084, 77.28754],
+              [104.3516, 77.69792],
+              [106.06664, 77.37389],
+              [104.705, 77.1274],
+              [106.97013, 76.97419]
+            ]
+          ],
+          [
+            [
+              [105.07547, 78.30689],
+              [99.43814, 77.921],
+              [101.2649, 79.23399],
+              [102.08635, 79.34641],
+              [102.837815, 79.28129],
+              [105.37243, 78.71334],
+              [105.07547, 78.30689]
+            ]
+          ],
+          [
+            [
+              [51.136187, 80.54728],
+              [49.793685, 80.415428],
+              [48.894411, 80.339567],
+              [48.754937, 80.175468],
+              [47.586119, 80.010181],
+              [46.502826, 80.247247],
+              [47.072455, 80.559424],
+              [44.846958, 80.58981],
+              [46.799139, 80.771918],
+              [48.318477, 80.78401],
+              [48.522806, 80.514569],
+              [49.09719, 80.753986],
+              [50.039768, 80.918885],
+              [51.522933, 80.699726],
+              [51.136187, 80.54728]
+            ]
+          ],
+          [
+            [
+              [99.93976, 78.88094],
+              [97.75794, 78.7562],
+              [94.97259, 79.044745],
+              [93.31288, 79.4265],
+              [92.5454, 80.14379],
+              [91.18107, 80.34146],
+              [93.77766, 81.0246],
+              [95.940895, 81.2504],
+              [97.88385, 80.746975],
+              [100.186655, 79.780135],
+              [99.93976, 78.88094]
+            ]
+          ]
+        ]
+      },
+      "id": "RUS"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Rwanda" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [30.419105, -1.134659],
+            [30.816135, -1.698914],
+            [30.758309, -2.28725],
+            [30.469696, -2.413858],
+            [29.938359, -2.348487],
+            [29.632176, -2.917858],
+            [29.024926, -2.839258],
+            [29.117479, -2.292211],
+            [29.254835, -2.21511],
+            [29.291887, -1.620056],
+            [29.579466, -1.341313],
+            [29.821519, -1.443322],
+            [30.419105, -1.134659]
+          ]
+        ]
+      },
+      "id": "RWA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Western Sahara" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-8.794884, 27.120696],
+            [-8.817828, 27.656426],
+            [-8.66559, 27.656426],
+            [-8.665124, 27.589479],
+            [-8.6844, 27.395744],
+            [-8.687294, 25.881056],
+            [-11.969419, 25.933353],
+            [-11.937224, 23.374594],
+            [-12.874222, 23.284832],
+            [-13.118754, 22.77122],
+            [-12.929102, 21.327071],
+            [-16.845194, 21.333323],
+            [-17.063423, 20.999752],
+            [-17.020428, 21.42231],
+            [-17.002962, 21.420734],
+            [-14.750955, 21.5006],
+            [-14.630833, 21.86094],
+            [-14.221168, 22.310163],
+            [-13.89111, 23.691009],
+            [-12.500963, 24.770116],
+            [-12.030759, 26.030866],
+            [-11.71822, 26.104092],
+            [-11.392555, 26.883424],
+            [-10.551263, 26.990808],
+            [-10.189424, 26.860945],
+            [-9.735343, 26.860945],
+            [-9.413037, 27.088476],
+            [-8.794884, 27.120696]
+          ]
+        ]
+      },
+      "id": "ESH"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Saudi Arabia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [42.779332, 16.347891],
+            [42.649573, 16.774635],
+            [42.347989, 17.075806],
+            [42.270888, 17.474722],
+            [41.754382, 17.833046],
+            [41.221391, 18.6716],
+            [40.939341, 19.486485],
+            [40.247652, 20.174635],
+            [39.801685, 20.338862],
+            [39.139399, 21.291905],
+            [39.023696, 21.986875],
+            [39.066329, 22.579656],
+            [38.492772, 23.688451],
+            [38.02386, 24.078686],
+            [37.483635, 24.285495],
+            [37.154818, 24.858483],
+            [37.209491, 25.084542],
+            [36.931627, 25.602959],
+            [36.639604, 25.826228],
+            [36.249137, 26.570136],
+            [35.640182, 27.37652],
+            [35.130187, 28.063352],
+            [34.632336, 28.058546],
+            [34.787779, 28.607427],
+            [34.83222, 28.957483],
+            [34.956037, 29.356555],
+            [36.068941, 29.197495],
+            [36.501214, 29.505254],
+            [36.740528, 29.865283],
+            [37.503582, 30.003776],
+            [37.66812, 30.338665],
+            [37.998849, 30.5085],
+            [37.002166, 31.508413],
+            [39.004886, 32.010217],
+            [39.195468, 32.161009],
+            [40.399994, 31.889992],
+            [41.889981, 31.190009],
+            [44.709499, 29.178891],
+            [46.568713, 29.099025],
+            [47.459822, 29.002519],
+            [47.708851, 28.526063],
+            [48.416094, 28.552004],
+            [48.807595, 27.689628],
+            [49.299554, 27.461218],
+            [49.470914, 27.109999],
+            [50.152422, 26.689663],
+            [50.212935, 26.277027],
+            [50.113303, 25.943972],
+            [50.239859, 25.60805],
+            [50.527387, 25.327808],
+            [50.660557, 24.999896],
+            [50.810108, 24.754743],
+            [51.112415, 24.556331],
+            [51.389608, 24.627386],
+            [51.579519, 24.245497],
+            [51.617708, 24.014219],
+            [52.000733, 23.001154],
+            [55.006803, 22.496948],
+            [55.208341, 22.70833],
+            [55.666659, 22.000001],
+            [54.999982, 19.999994],
+            [52.00001, 19.000003],
+            [49.116672, 18.616668],
+            [48.183344, 18.166669],
+            [47.466695, 17.116682],
+            [47.000005, 16.949999],
+            [46.749994, 17.283338],
+            [46.366659, 17.233315],
+            [45.399999, 17.333335],
+            [45.216651, 17.433329],
+            [44.062613, 17.410359],
+            [43.791519, 17.319977],
+            [43.380794, 17.579987],
+            [43.115798, 17.08844],
+            [43.218375, 16.66689],
+            [42.779332, 16.347891]
+          ]
+        ]
+      },
+      "id": "SAU"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Sudan" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [33.963393, 9.464285],
+            [33.824963, 9.484061],
+            [33.842131, 9.981915],
+            [33.721959, 10.325262],
+            [33.206938, 10.720112],
+            [33.086766, 11.441141],
+            [33.206938, 12.179338],
+            [32.743419, 12.248008],
+            [32.67475, 12.024832],
+            [32.073892, 11.97333],
+            [32.314235, 11.681484],
+            [32.400072, 11.080626],
+            [31.850716, 10.531271],
+            [31.352862, 9.810241],
+            [30.837841, 9.707237],
+            [29.996639, 10.290927],
+            [29.618957, 10.084919],
+            [29.515953, 9.793074],
+            [29.000932, 9.604232],
+            [28.966597, 9.398224],
+            [27.97089, 9.398224],
+            [27.833551, 9.604232],
+            [27.112521, 9.638567],
+            [26.752006, 9.466893],
+            [26.477328, 9.55273],
+            [25.962307, 10.136421],
+            [25.790633, 10.411099],
+            [25.069604, 10.27376],
+            [24.794926, 9.810241],
+            [24.537415, 8.917538],
+            [24.194068, 8.728696],
+            [23.88698, 8.61973],
+            [23.805813, 8.666319],
+            [23.459013, 8.954286],
+            [23.394779, 9.265068],
+            [23.55725, 9.681218],
+            [23.554304, 10.089255],
+            [22.977544, 10.714463],
+            [22.864165, 11.142395],
+            [22.87622, 11.38461],
+            [22.50869, 11.67936],
+            [22.49762, 12.26024],
+            [22.28801, 12.64605],
+            [21.93681, 12.58818],
+            [22.03759, 12.95546],
+            [22.29658, 13.37232],
+            [22.18329, 13.78648],
+            [22.51202, 14.09318],
+            [22.30351, 14.32682],
+            [22.56795, 14.94429],
+            [23.02459, 15.68072],
+            [23.88689, 15.61084],
+            [23.83766, 19.58047],
+            [23.85, 20],
+            [25, 20.00304],
+            [25, 22],
+            [29.02, 22],
+            [32.9, 22],
+            [36.86623, 22],
+            [37.18872, 21.01885],
+            [36.96941, 20.83744],
+            [37.1147, 19.80796],
+            [37.48179, 18.61409],
+            [37.86276, 18.36786],
+            [38.41009, 17.998307],
+            [37.904, 17.42754],
+            [37.16747, 17.26314],
+            [36.85253, 16.95655],
+            [36.75389, 16.29186],
+            [36.32322, 14.82249],
+            [36.42951, 14.42211],
+            [36.27022, 13.56333],
+            [35.86363, 12.57828],
+            [35.26049, 12.08286],
+            [34.83163, 11.31896],
+            [34.73115, 10.91017],
+            [34.25745, 10.63009],
+            [33.96162, 9.58358],
+            [33.963393, 9.464285]
+          ]
+        ]
+      },
+      "id": "SDN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "South Sudan" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [33.963393, 9.464285],
+            [33.97498, 8.68456],
+            [33.8255, 8.37916],
+            [33.2948, 8.35458],
+            [32.95418, 7.78497],
+            [33.56829, 7.71334],
+            [34.0751, 7.22595],
+            [34.25032, 6.82607],
+            [34.70702, 6.59422],
+            [35.298007, 5.506],
+            [34.620196, 4.847123],
+            [34.005, 4.249885],
+            [33.39, 3.79],
+            [32.68642, 3.79232],
+            [31.88145, 3.55827],
+            [31.24556, 3.7819],
+            [30.83385, 3.50917],
+            [29.95349, 4.1737],
+            [29.715995, 4.600805],
+            [29.159078, 4.389267],
+            [28.696678, 4.455077],
+            [28.428994, 4.287155],
+            [27.979977, 4.408413],
+            [27.374226, 5.233944],
+            [27.213409, 5.550953],
+            [26.465909, 5.946717],
+            [26.213418, 6.546603],
+            [25.796648, 6.979316],
+            [25.124131, 7.500085],
+            [25.114932, 7.825104],
+            [24.567369, 8.229188],
+            [23.88698, 8.61973],
+            [24.194068, 8.728696],
+            [24.537415, 8.917538],
+            [24.794926, 9.810241],
+            [25.069604, 10.27376],
+            [25.790633, 10.411099],
+            [25.962307, 10.136421],
+            [26.477328, 9.55273],
+            [26.752006, 9.466893],
+            [27.112521, 9.638567],
+            [27.833551, 9.604232],
+            [27.97089, 9.398224],
+            [28.966597, 9.398224],
+            [29.000932, 9.604232],
+            [29.515953, 9.793074],
+            [29.618957, 10.084919],
+            [29.996639, 10.290927],
+            [30.837841, 9.707237],
+            [31.352862, 9.810241],
+            [31.850716, 10.531271],
+            [32.400072, 11.080626],
+            [32.314235, 11.681484],
+            [32.073892, 11.97333],
+            [32.67475, 12.024832],
+            [32.743419, 12.248008],
+            [33.206938, 12.179338],
+            [33.086766, 11.441141],
+            [33.206938, 10.720112],
+            [33.721959, 10.325262],
+            [33.842131, 9.981915],
+            [33.824963, 9.484061],
+            [33.963393, 9.464285]
+          ]
+        ]
+      },
+      "id": "SSD"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Senegal" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-16.713729, 13.594959],
+            [-17.126107, 14.373516],
+            [-17.625043, 14.729541],
+            [-17.185173, 14.919477],
+            [-16.700706, 15.621527],
+            [-16.463098, 16.135036],
+            [-16.12069, 16.455663],
+            [-15.623666, 16.369337],
+            [-15.135737, 16.587282],
+            [-14.577348, 16.598264],
+            [-14.099521, 16.304302],
+            [-13.435738, 16.039383],
+            [-12.830658, 15.303692],
+            [-12.17075, 14.616834],
+            [-12.124887, 13.994727],
+            [-11.927716, 13.422075],
+            [-11.553398, 13.141214],
+            [-11.467899, 12.754519],
+            [-11.513943, 12.442988],
+            [-11.658301, 12.386583],
+            [-12.203565, 12.465648],
+            [-12.278599, 12.35444],
+            [-12.499051, 12.33209],
+            [-13.217818, 12.575874],
+            [-13.700476, 12.586183],
+            [-15.548477, 12.62817],
+            [-15.816574, 12.515567],
+            [-16.147717, 12.547762],
+            [-16.677452, 12.384852],
+            [-16.841525, 13.151394],
+            [-15.931296, 13.130284],
+            [-15.691001, 13.270353],
+            [-15.511813, 13.27857],
+            [-15.141163, 13.509512],
+            [-14.712197, 13.298207],
+            [-14.277702, 13.280585],
+            [-13.844963, 13.505042],
+            [-14.046992, 13.794068],
+            [-14.376714, 13.62568],
+            [-14.687031, 13.630357],
+            [-15.081735, 13.876492],
+            [-15.39877, 13.860369],
+            [-15.624596, 13.623587],
+            [-16.713729, 13.594959]
+          ]
+        ]
+      },
+      "id": "SEN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Solomon Islands" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [162.119025, -10.482719],
+              [162.398646, -10.826367],
+              [161.700032, -10.820011],
+              [161.319797, -10.204751],
+              [161.917383, -10.446701],
+              [162.119025, -10.482719]
+            ]
+          ],
+          [
+            [
+              [160.852229, -9.872937],
+              [160.462588, -9.89521],
+              [159.849447, -9.794027],
+              [159.640003, -9.63998],
+              [159.702945, -9.24295],
+              [160.362956, -9.400304],
+              [160.688518, -9.610162],
+              [160.852229, -9.872937]
+            ]
+          ],
+          [
+            [
+              [161.679982, -9.599982],
+              [161.529397, -9.784312],
+              [160.788253, -8.917543],
+              [160.579997, -8.320009],
+              [160.920028, -8.320009],
+              [161.280006, -9.120011],
+              [161.679982, -9.599982]
+            ]
+          ],
+          [
+            [
+              [159.875027, -8.33732],
+              [159.917402, -8.53829],
+              [159.133677, -8.114181],
+              [158.586114, -7.754824],
+              [158.21115, -7.421872],
+              [158.359978, -7.320018],
+              [158.820001, -7.560003],
+              [159.640003, -8.020027],
+              [159.875027, -8.33732]
+            ]
+          ],
+          [
+            [
+              [157.538426, -7.34782],
+              [157.33942, -7.404767],
+              [156.90203, -7.176874],
+              [156.491358, -6.765943],
+              [156.542828, -6.599338],
+              [157.14, -7.021638],
+              [157.538426, -7.34782]
+            ]
+          ]
+        ]
+      },
+      "id": "SLB"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Sierra Leone" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-11.438779, 6.785917],
+            [-11.708195, 6.860098],
+            [-12.428099, 7.262942],
+            [-12.949049, 7.798646],
+            [-13.124025, 8.163946],
+            [-13.24655, 8.903049],
+            [-12.711958, 9.342712],
+            [-12.596719, 9.620188],
+            [-12.425929, 9.835834],
+            [-12.150338, 9.858572],
+            [-11.917277, 10.046984],
+            [-11.117481, 10.045873],
+            [-10.839152, 9.688246],
+            [-10.622395, 9.26791],
+            [-10.65477, 8.977178],
+            [-10.494315, 8.715541],
+            [-10.505477, 8.348896],
+            [-10.230094, 8.406206],
+            [-10.695595, 7.939464],
+            [-11.146704, 7.396706],
+            [-11.199802, 7.105846],
+            [-11.438779, 6.785917]
+          ]
+        ]
+      },
+      "id": "SLE"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "El Salvador" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-87.793111, 13.38448],
+            [-87.904112, 13.149017],
+            [-88.483302, 13.163951],
+            [-88.843228, 13.259734],
+            [-89.256743, 13.458533],
+            [-89.812394, 13.520622],
+            [-90.095555, 13.735338],
+            [-90.064678, 13.88197],
+            [-89.721934, 14.134228],
+            [-89.534219, 14.244816],
+            [-89.587343, 14.362586],
+            [-89.353326, 14.424133],
+            [-89.058512, 14.340029],
+            [-88.843073, 14.140507],
+            [-88.541231, 13.980155],
+            [-88.503998, 13.845486],
+            [-88.065343, 13.964626],
+            [-87.859515, 13.893312],
+            [-87.723503, 13.78505],
+            [-87.793111, 13.38448]
+          ]
+        ]
+      },
+      "id": "SLV"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Somaliland" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [48.93813, 9.451749],
+            [48.486736, 8.837626],
+            [47.78942, 8.003],
+            [46.948328, 7.996877],
+            [43.67875, 9.18358],
+            [43.296975, 9.540477],
+            [42.92812, 10.02194],
+            [42.55876, 10.57258],
+            [42.776852, 10.926879],
+            [43.145305, 11.46204],
+            [43.47066, 11.27771],
+            [43.666668, 10.864169],
+            [44.117804, 10.445538],
+            [44.614259, 10.442205],
+            [45.556941, 10.698029],
+            [46.645401, 10.816549],
+            [47.525658, 11.127228],
+            [48.021596, 11.193064],
+            [48.378784, 11.375482],
+            [48.948206, 11.410622],
+            [48.942005, 11.394266],
+            [48.938491, 10.982327],
+            [48.938233, 9.9735],
+            [48.93813, 9.451749]
+          ]
+        ]
+      },
+      "id": "-99"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Somalia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [49.72862, 11.5789],
+            [50.25878, 11.67957],
+            [50.73202, 12.0219],
+            [51.1112, 12.02464],
+            [51.13387, 11.74815],
+            [51.04153, 11.16651],
+            [51.04531, 10.6409],
+            [50.83418, 10.27972],
+            [50.55239, 9.19874],
+            [50.07092, 8.08173],
+            [49.4527, 6.80466],
+            [48.59455, 5.33911],
+            [47.74079, 4.2194],
+            [46.56476, 2.85529],
+            [45.56399, 2.04576],
+            [44.06815, 1.05283],
+            [43.13597, 0.2922],
+            [42.04157, -0.91916],
+            [41.81095, -1.44647],
+            [41.58513, -1.68325],
+            [40.993, -0.85829],
+            [40.98105, 2.78452],
+            [41.855083, 3.918912],
+            [42.12861, 4.23413],
+            [42.76967, 4.25259],
+            [43.66087, 4.95755],
+            [44.9636, 5.00162],
+            [47.78942, 8.003],
+            [48.486736, 8.837626],
+            [48.93813, 9.451749],
+            [48.938233, 9.9735],
+            [48.938491, 10.982327],
+            [48.942005, 11.394266],
+            [48.948205, 11.410617],
+            [49.26776, 11.43033],
+            [49.72862, 11.5789]
+          ]
+        ]
+      },
+      "id": "SOM"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Republic of Serbia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [20.874313, 45.416375],
+            [21.483526, 45.18117],
+            [21.562023, 44.768947],
+            [22.145088, 44.478422],
+            [22.459022, 44.702517],
+            [22.705726, 44.578003],
+            [22.474008, 44.409228],
+            [22.65715, 44.234923],
+            [22.410446, 44.008063],
+            [22.500157, 43.642814],
+            [22.986019, 43.211161],
+            [22.604801, 42.898519],
+            [22.436595, 42.580321],
+            [22.545012, 42.461362],
+            [22.380526, 42.32026],
+            [21.91708, 42.30364],
+            [21.576636, 42.245224],
+            [21.54332, 42.32025],
+            [21.66292, 42.43922],
+            [21.77505, 42.6827],
+            [21.63302, 42.67717],
+            [21.43866, 42.86255],
+            [21.27421, 42.90959],
+            [21.143395, 43.068685],
+            [20.95651, 43.13094],
+            [20.81448, 43.27205],
+            [20.63508, 43.21671],
+            [20.49679, 42.88469],
+            [20.25758, 42.81275],
+            [20.3398, 42.89852],
+            [19.95857, 43.10604],
+            [19.63, 43.21378],
+            [19.48389, 43.35229],
+            [19.21852, 43.52384],
+            [19.454, 43.5681],
+            [19.59976, 44.03847],
+            [19.11761, 44.42307],
+            [19.36803, 44.863],
+            [19.00548, 44.86023],
+            [19.390476, 45.236516],
+            [19.072769, 45.521511],
+            [18.82982, 45.90888],
+            [19.596045, 46.17173],
+            [20.220192, 46.127469],
+            [20.762175, 45.734573],
+            [20.874313, 45.416375]
+          ]
+        ]
+      },
+      "id": "SRB"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Suriname" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-57.147436, 5.97315],
+            [-55.949318, 5.772878],
+            [-55.84178, 5.953125],
+            [-55.03325, 6.025291],
+            [-53.958045, 5.756548],
+            [-54.478633, 4.896756],
+            [-54.399542, 4.212611],
+            [-54.006931, 3.620038],
+            [-54.181726, 3.18978],
+            [-54.269705, 2.732392],
+            [-54.524754, 2.311849],
+            [-55.097587, 2.523748],
+            [-55.569755, 2.421506],
+            [-55.973322, 2.510364],
+            [-56.073342, 2.220795],
+            [-55.9056, 2.021996],
+            [-55.995698, 1.817667],
+            [-56.539386, 1.899523],
+            [-57.150098, 2.768927],
+            [-57.281433, 3.333492],
+            [-57.601569, 3.334655],
+            [-58.044694, 4.060864],
+            [-57.86021, 4.576801],
+            [-57.914289, 4.812626],
+            [-57.307246, 5.073567],
+            [-57.147436, 5.97315]
+          ]
+        ]
+      },
+      "id": "SUR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Slovakia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [18.853144, 49.49623],
+            [18.909575, 49.435846],
+            [19.320713, 49.571574],
+            [19.825023, 49.217125],
+            [20.415839, 49.431453],
+            [20.887955, 49.328772],
+            [21.607808, 49.470107],
+            [22.558138, 49.085738],
+            [22.280842, 48.825392],
+            [22.085608, 48.422264],
+            [21.872236, 48.319971],
+            [20.801294, 48.623854],
+            [20.473562, 48.56285],
+            [20.239054, 48.327567],
+            [19.769471, 48.202691],
+            [19.661364, 48.266615],
+            [19.174365, 48.111379],
+            [18.777025, 48.081768],
+            [18.696513, 47.880954],
+            [17.857133, 47.758429],
+            [17.488473, 47.867466],
+            [16.979667, 48.123497],
+            [16.879983, 48.470013],
+            [16.960288, 48.596982],
+            [17.101985, 48.816969],
+            [17.545007, 48.800019],
+            [17.886485, 48.903475],
+            [17.913512, 48.996493],
+            [18.104973, 49.043983],
+            [18.170498, 49.271515],
+            [18.399994, 49.315001],
+            [18.554971, 49.495015],
+            [18.853144, 49.49623]
+          ]
+        ]
+      },
+      "id": "SVK"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Slovenia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [13.806475, 46.509306],
+            [14.632472, 46.431817],
+            [15.137092, 46.658703],
+            [16.011664, 46.683611],
+            [16.202298, 46.852386],
+            [16.370505, 46.841327],
+            [16.564808, 46.503751],
+            [15.768733, 46.238108],
+            [15.67153, 45.834154],
+            [15.323954, 45.731783],
+            [15.327675, 45.452316],
+            [14.935244, 45.471695],
+            [14.595109, 45.634941],
+            [14.411968, 45.466166],
+            [13.71506, 45.500324],
+            [13.93763, 45.591016],
+            [13.69811, 46.016778],
+            [13.806475, 46.509306]
+          ]
+        ]
+      },
+      "id": "SVN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Sweden" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [22.183173, 65.723741],
+            [21.213517, 65.026005],
+            [21.369631, 64.413588],
+            [19.778876, 63.609554],
+            [17.847779, 62.7494],
+            [17.119555, 61.341166],
+            [17.831346, 60.636583],
+            [18.787722, 60.081914],
+            [17.869225, 58.953766],
+            [16.829185, 58.719827],
+            [16.44771, 57.041118],
+            [15.879786, 56.104302],
+            [14.666681, 56.200885],
+            [14.100721, 55.407781],
+            [12.942911, 55.361737],
+            [12.625101, 56.30708],
+            [11.787942, 57.441817],
+            [11.027369, 58.856149],
+            [11.468272, 59.432393],
+            [12.300366, 60.117933],
+            [12.631147, 61.293572],
+            [11.992064, 61.800362],
+            [11.930569, 63.128318],
+            [12.579935, 64.066219],
+            [13.571916, 64.049114],
+            [13.919905, 64.445421],
+            [13.55569, 64.787028],
+            [15.108411, 66.193867],
+            [16.108712, 67.302456],
+            [16.768879, 68.013937],
+            [17.729182, 68.010552],
+            [17.993868, 68.567391],
+            [19.87856, 68.407194],
+            [20.025269, 69.065139],
+            [20.645593, 69.106247],
+            [21.978535, 68.616846],
+            [23.539473, 67.936009],
+            [23.56588, 66.396051],
+            [23.903379, 66.006927],
+            [22.183173, 65.723741]
+          ]
+        ]
+      },
+      "id": "SWE"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Swaziland" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [32.071665, -26.73382],
+            [31.86806, -27.177927],
+            [31.282773, -27.285879],
+            [30.685962, -26.743845],
+            [30.676609, -26.398078],
+            [30.949667, -26.022649],
+            [31.04408, -25.731452],
+            [31.333158, -25.660191],
+            [31.837778, -25.843332],
+            [31.985779, -26.29178],
+            [32.071665, -26.73382]
+          ]
+        ]
+      },
+      "id": "SWZ"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Syria" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [38.792341, 33.378686],
+            [36.834062, 32.312938],
+            [35.719918, 32.709192],
+            [35.700798, 32.716014],
+            [35.836397, 32.868123],
+            [35.821101, 33.277426],
+            [36.06646, 33.824912],
+            [36.61175, 34.201789],
+            [36.448194, 34.593935],
+            [35.998403, 34.644914],
+            [35.905023, 35.410009],
+            [36.149763, 35.821535],
+            [36.41755, 36.040617],
+            [36.685389, 36.259699],
+            [36.739494, 36.81752],
+            [37.066761, 36.623036],
+            [38.167727, 36.90121],
+            [38.699891, 36.712927],
+            [39.52258, 36.716054],
+            [40.673259, 37.091276],
+            [41.212089, 37.074352],
+            [42.349591, 37.229873],
+            [41.837064, 36.605854],
+            [41.289707, 36.358815],
+            [41.383965, 35.628317],
+            [41.006159, 34.419372],
+            [38.792341, 33.378686]
+          ]
+        ]
+      },
+      "id": "SYR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Chad" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [14.495787, 12.859396],
+            [14.595781, 13.330427],
+            [13.954477, 13.353449],
+            [13.956699, 13.996691],
+            [13.540394, 14.367134],
+            [13.97217, 15.68437],
+            [15.247731, 16.627306],
+            [15.300441, 17.92795],
+            [15.685741, 19.95718],
+            [15.903247, 20.387619],
+            [15.487148, 20.730415],
+            [15.47106, 21.04845],
+            [15.096888, 21.308519],
+            [14.8513, 22.86295],
+            [15.86085, 23.40972],
+            [19.84926, 21.49509],
+            [23.83766, 19.58047],
+            [23.88689, 15.61084],
+            [23.02459, 15.68072],
+            [22.56795, 14.94429],
+            [22.30351, 14.32682],
+            [22.51202, 14.09318],
+            [22.18329, 13.78648],
+            [22.29658, 13.37232],
+            [22.03759, 12.95546],
+            [21.93681, 12.58818],
+            [22.28801, 12.64605],
+            [22.49762, 12.26024],
+            [22.50869, 11.67936],
+            [22.87622, 11.38461],
+            [22.864165, 11.142395],
+            [22.231129, 10.971889],
+            [21.723822, 10.567056],
+            [21.000868, 9.475985],
+            [20.059685, 9.012706],
+            [19.094008, 9.074847],
+            [18.81201, 8.982915],
+            [18.911022, 8.630895],
+            [18.389555, 8.281304],
+            [17.96493, 7.890914],
+            [16.705988, 7.508328],
+            [16.456185, 7.734774],
+            [16.290562, 7.754307],
+            [16.106232, 7.497088],
+            [15.27946, 7.421925],
+            [15.436092, 7.692812],
+            [15.120866, 8.38215],
+            [14.979996, 8.796104],
+            [14.544467, 8.965861],
+            [13.954218, 9.549495],
+            [14.171466, 10.021378],
+            [14.627201, 9.920919],
+            [14.909354, 9.992129],
+            [15.467873, 9.982337],
+            [14.923565, 10.891325],
+            [14.960152, 11.555574],
+            [14.89336, 12.21905],
+            [14.495787, 12.859396]
+          ]
+        ]
+      },
+      "id": "TCD"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Togo" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [1.865241, 6.142158],
+            [1.060122, 5.928837],
+            [0.836931, 6.279979],
+            [0.570384, 6.914359],
+            [0.490957, 7.411744],
+            [0.712029, 8.312465],
+            [0.461192, 8.677223],
+            [0.365901, 9.465004],
+            [0.36758, 10.191213],
+            [-0.049785, 10.706918],
+            [0.023803, 11.018682],
+            [0.899563, 10.997339],
+            [0.772336, 10.470808],
+            [1.077795, 10.175607],
+            [1.425061, 9.825395],
+            [1.463043, 9.334624],
+            [1.664478, 9.12859],
+            [1.618951, 6.832038],
+            [1.865241, 6.142158]
+          ]
+        ]
+      },
+      "id": "TGO"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Thailand" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [102.584932, 12.186595],
+            [101.687158, 12.64574],
+            [100.83181, 12.627085],
+            [100.978467, 13.412722],
+            [100.097797, 13.406856],
+            [100.018733, 12.307001],
+            [99.478921, 10.846367],
+            [99.153772, 9.963061],
+            [99.222399, 9.239255],
+            [99.873832, 9.207862],
+            [100.279647, 8.295153],
+            [100.459274, 7.429573],
+            [101.017328, 6.856869],
+            [101.623079, 6.740622],
+            [102.141187, 6.221636],
+            [101.814282, 5.810808],
+            [101.154219, 5.691384],
+            [101.075516, 6.204867],
+            [100.259596, 6.642825],
+            [100.085757, 6.464489],
+            [99.690691, 6.848213],
+            [99.519642, 7.343454],
+            [98.988253, 7.907993],
+            [98.503786, 8.382305],
+            [98.339662, 7.794512],
+            [98.150009, 8.350007],
+            [98.25915, 8.973923],
+            [98.553551, 9.93296],
+            [99.038121, 10.960546],
+            [99.587286, 11.892763],
+            [99.196354, 12.804748],
+            [99.212012, 13.269294],
+            [99.097755, 13.827503],
+            [98.430819, 14.622028],
+            [98.192074, 15.123703],
+            [98.537376, 15.308497],
+            [98.903348, 16.177824],
+            [98.493761, 16.837836],
+            [97.859123, 17.567946],
+            [97.375896, 18.445438],
+            [97.797783, 18.62708],
+            [98.253724, 19.708203],
+            [98.959676, 19.752981],
+            [99.543309, 20.186598],
+            [100.115988, 20.41785],
+            [100.548881, 20.109238],
+            [100.606294, 19.508344],
+            [101.282015, 19.462585],
+            [101.035931, 18.408928],
+            [101.059548, 17.512497],
+            [102.113592, 18.109102],
+            [102.413005, 17.932782],
+            [102.998706, 17.961695],
+            [103.200192, 18.309632],
+            [103.956477, 18.240954],
+            [104.716947, 17.428859],
+            [104.779321, 16.441865],
+            [105.589039, 15.570316],
+            [105.544338, 14.723934],
+            [105.218777, 14.273212],
+            [104.281418, 14.416743],
+            [102.988422, 14.225721],
+            [102.348099, 13.394247],
+            [102.584932, 12.186595]
+          ]
+        ]
+      },
+      "id": "THA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Tajikistan" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [71.014198, 40.244366],
+            [70.648019, 39.935754],
+            [69.55961, 40.103211],
+            [69.464887, 39.526683],
+            [70.549162, 39.604198],
+            [71.784694, 39.279463],
+            [73.675379, 39.431237],
+            [73.928852, 38.505815],
+            [74.257514, 38.606507],
+            [74.864816, 38.378846],
+            [74.829986, 37.990007],
+            [74.980002, 37.41999],
+            [73.948696, 37.421566],
+            [73.260056, 37.495257],
+            [72.63689, 37.047558],
+            [72.193041, 36.948288],
+            [71.844638, 36.738171],
+            [71.448693, 37.065645],
+            [71.541918, 37.905774],
+            [71.239404, 37.953265],
+            [71.348131, 38.258905],
+            [70.806821, 38.486282],
+            [70.376304, 38.138396],
+            [70.270574, 37.735165],
+            [70.116578, 37.588223],
+            [69.518785, 37.608997],
+            [69.196273, 37.151144],
+            [68.859446, 37.344336],
+            [68.135562, 37.023115],
+            [67.83, 37.144994],
+            [68.392033, 38.157025],
+            [68.176025, 38.901553],
+            [67.44222, 39.140144],
+            [67.701429, 39.580478],
+            [68.536416, 39.533453],
+            [69.011633, 40.086158],
+            [69.329495, 40.727824],
+            [70.666622, 40.960213],
+            [70.45816, 40.496495],
+            [70.601407, 40.218527],
+            [71.014198, 40.244366]
+          ]
+        ]
+      },
+      "id": "TJK"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Turkmenistan" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [61.210817, 35.650072],
+            [61.123071, 36.491597],
+            [60.377638, 36.527383],
+            [59.234762, 37.412988],
+            [58.436154, 37.522309],
+            [57.330434, 38.029229],
+            [56.619366, 38.121394],
+            [56.180375, 37.935127],
+            [55.511578, 37.964117],
+            [54.800304, 37.392421],
+            [53.921598, 37.198918],
+            [53.735511, 37.906136],
+            [53.880929, 38.952093],
+            [53.101028, 39.290574],
+            [53.357808, 39.975286],
+            [52.693973, 40.033629],
+            [52.915251, 40.876523],
+            [53.858139, 40.631034],
+            [54.736845, 40.951015],
+            [54.008311, 41.551211],
+            [53.721713, 42.123191],
+            [52.91675, 41.868117],
+            [52.814689, 41.135371],
+            [52.50246, 41.783316],
+            [52.944293, 42.116034],
+            [54.079418, 42.324109],
+            [54.755345, 42.043971],
+            [55.455251, 41.259859],
+            [55.968191, 41.308642],
+            [57.096391, 41.32231],
+            [56.932215, 41.826026],
+            [57.78653, 42.170553],
+            [58.629011, 42.751551],
+            [59.976422, 42.223082],
+            [60.083341, 41.425146],
+            [60.465953, 41.220327],
+            [61.547179, 41.26637],
+            [61.882714, 41.084857],
+            [62.37426, 40.053886],
+            [63.518015, 39.363257],
+            [64.170223, 38.892407],
+            [65.215999, 38.402695],
+            [66.54615, 37.974685],
+            [66.518607, 37.362784],
+            [66.217385, 37.39379],
+            [65.745631, 37.661164],
+            [65.588948, 37.305217],
+            [64.746105, 37.111818],
+            [64.546479, 36.312073],
+            [63.982896, 36.007957],
+            [63.193538, 35.857166],
+            [62.984662, 35.404041],
+            [62.230651, 35.270664],
+            [61.210817, 35.650072]
+          ]
+        ]
+      },
+      "id": "TKM"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "East Timor" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [124.968682, -8.89279],
+            [125.086246, -8.656887],
+            [125.947072, -8.432095],
+            [126.644704, -8.398247],
+            [126.957243, -8.273345],
+            [127.335928, -8.397317],
+            [126.967992, -8.668256],
+            [125.925885, -9.106007],
+            [125.08852, -9.393173],
+            [125.07002, -9.089987],
+            [124.968682, -8.89279]
+          ]
+        ]
+      },
+      "id": "TLS"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Trinidad and Tobago" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-61.68, 10.76],
+            [-61.105, 10.89],
+            [-60.895, 10.855],
+            [-60.935, 10.11],
+            [-61.77, 10],
+            [-61.95, 10.09],
+            [-61.66, 10.365],
+            [-61.68, 10.76]
+          ]
+        ]
+      },
+      "id": "TTO"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Tunisia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [9.48214, 30.307556],
+            [9.055603, 32.102692],
+            [8.439103, 32.506285],
+            [8.430473, 32.748337],
+            [7.612642, 33.344115],
+            [7.524482, 34.097376],
+            [8.140981, 34.655146],
+            [8.376368, 35.479876],
+            [8.217824, 36.433177],
+            [8.420964, 36.946427],
+            [9.509994, 37.349994],
+            [10.210002, 37.230002],
+            [10.18065, 36.724038],
+            [11.028867, 37.092103],
+            [11.100026, 36.899996],
+            [10.600005, 36.41],
+            [10.593287, 35.947444],
+            [10.939519, 35.698984],
+            [10.807847, 34.833507],
+            [10.149593, 34.330773],
+            [10.339659, 33.785742],
+            [10.856836, 33.76874],
+            [11.108501, 33.293343],
+            [11.488787, 33.136996],
+            [11.432253, 32.368903],
+            [10.94479, 32.081815],
+            [10.636901, 31.761421],
+            [9.950225, 31.37607],
+            [10.056575, 30.961831],
+            [9.970017, 30.539325],
+            [9.48214, 30.307556]
+          ]
+        ]
+      },
+      "id": "TUN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Turkey" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [36.913127, 41.335358],
+              [38.347665, 40.948586],
+              [39.512607, 41.102763],
+              [40.373433, 41.013673],
+              [41.554084, 41.535656],
+              [42.619549, 41.583173],
+              [43.582746, 41.092143],
+              [43.752658, 40.740201],
+              [43.656436, 40.253564],
+              [44.400009, 40.005],
+              [44.79399, 39.713003],
+              [44.109225, 39.428136],
+              [44.421403, 38.281281],
+              [44.225756, 37.971584],
+              [44.772699, 37.170445],
+              [44.293452, 37.001514],
+              [43.942259, 37.256228],
+              [42.779126, 37.385264],
+              [42.349591, 37.229873],
+              [41.212089, 37.074352],
+              [40.673259, 37.091276],
+              [39.52258, 36.716054],
+              [38.699891, 36.712927],
+              [38.167727, 36.90121],
+              [37.066761, 36.623036],
+              [36.739494, 36.81752],
+              [36.685389, 36.259699],
+              [36.41755, 36.040617],
+              [36.149763, 35.821535],
+              [35.782085, 36.274995],
+              [36.160822, 36.650606],
+              [35.550936, 36.565443],
+              [34.714553, 36.795532],
+              [34.026895, 36.21996],
+              [32.509158, 36.107564],
+              [31.699595, 36.644275],
+              [30.621625, 36.677865],
+              [30.391096, 36.262981],
+              [29.699976, 36.144357],
+              [28.732903, 36.676831],
+              [27.641187, 36.658822],
+              [27.048768, 37.653361],
+              [26.318218, 38.208133],
+              [26.8047, 38.98576],
+              [26.170785, 39.463612],
+              [27.28002, 40.420014],
+              [28.819978, 40.460011],
+              [29.240004, 41.219991],
+              [31.145934, 41.087622],
+              [32.347979, 41.736264],
+              [33.513283, 42.01896],
+              [35.167704, 42.040225],
+              [36.913127, 41.335358]
+            ]
+          ],
+          [
+            [
+              [27.192377, 40.690566],
+              [26.358009, 40.151994],
+              [26.043351, 40.617754],
+              [26.056942, 40.824123],
+              [26.294602, 40.936261],
+              [26.604196, 41.562115],
+              [26.117042, 41.826905],
+              [27.135739, 42.141485],
+              [27.99672, 42.007359],
+              [28.115525, 41.622886],
+              [28.988443, 41.299934],
+              [28.806438, 41.054962],
+              [27.619017, 40.999823],
+              [27.192377, 40.690566]
+            ]
+          ]
+        ]
+      },
+      "id": "TUR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Taiwan" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [121.777818, 24.394274],
+            [121.175632, 22.790857],
+            [120.74708, 21.970571],
+            [120.220083, 22.814861],
+            [120.106189, 23.556263],
+            [120.69468, 24.538451],
+            [121.495044, 25.295459],
+            [121.951244, 24.997596],
+            [121.777818, 24.394274]
+          ]
+        ]
+      },
+      "id": "TWN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "United Republic of Tanzania" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [33.903711, -0.95],
+            [34.07262, -1.05982],
+            [37.69869, -3.09699],
+            [37.7669, -3.67712],
+            [39.20222, -4.67677],
+            [38.74054, -5.90895],
+            [38.79977, -6.47566],
+            [39.44, -6.84],
+            [39.47, -7.1],
+            [39.19469, -7.7039],
+            [39.25203, -8.00781],
+            [39.18652, -8.48551],
+            [39.53574, -9.11237],
+            [39.9496, -10.0984],
+            [40.31659, -10.3171],
+            [39.521, -10.89688],
+            [38.427557, -11.285202],
+            [37.82764, -11.26879],
+            [37.47129, -11.56876],
+            [36.775151, -11.594537],
+            [36.514082, -11.720938],
+            [35.312398, -11.439146],
+            [34.559989, -11.52002],
+            [34.28, -10.16],
+            [33.940838, -9.693674],
+            [33.73972, -9.41715],
+            [32.759375, -9.230599],
+            [32.191865, -8.930359],
+            [31.556348, -8.762049],
+            [31.157751, -8.594579],
+            [30.74, -8.34],
+            [30.2, -7.08],
+            [29.62, -6.52],
+            [29.419993, -5.939999],
+            [29.519987, -5.419979],
+            [29.339998, -4.499983],
+            [29.753512, -4.452389],
+            [30.11632, -4.09012],
+            [30.50554, -3.56858],
+            [30.75224, -3.35931],
+            [30.74301, -3.03431],
+            [30.52766, -2.80762],
+            [30.46967, -2.41383],
+            [30.758309, -2.28725],
+            [30.816135, -1.698914],
+            [30.419105, -1.134659],
+            [30.76986, -1.01455],
+            [31.86617, -1.02736],
+            [33.903711, -0.95]
+          ]
+        ]
+      },
+      "id": "TZA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Uganda" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [31.86617, -1.02736],
+            [30.76986, -1.01455],
+            [30.419105, -1.134659],
+            [29.821519, -1.443322],
+            [29.579466, -1.341313],
+            [29.587838, -0.587406],
+            [29.8195, -0.2053],
+            [29.875779, 0.59738],
+            [30.086154, 1.062313],
+            [30.468508, 1.583805],
+            [30.85267, 1.849396],
+            [31.174149, 2.204465],
+            [30.77332, 2.33989],
+            [30.83385, 3.50917],
+            [31.24556, 3.7819],
+            [31.88145, 3.55827],
+            [32.68642, 3.79232],
+            [33.39, 3.79],
+            [34.005, 4.249885],
+            [34.47913, 3.5556],
+            [34.59607, 3.05374],
+            [35.03599, 1.90584],
+            [34.6721, 1.17694],
+            [34.18, 0.515],
+            [33.893569, 0.109814],
+            [33.903711, -0.95],
+            [31.86617, -1.02736]
+          ]
+        ]
+      },
+      "id": "UGA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Ukraine" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [31.785998, 52.101678],
+            [32.159412, 52.061267],
+            [32.412058, 52.288695],
+            [32.715761, 52.238465],
+            [33.7527, 52.335075],
+            [34.391731, 51.768882],
+            [34.141978, 51.566413],
+            [34.224816, 51.255993],
+            [35.022183, 51.207572],
+            [35.377924, 50.773955],
+            [35.356116, 50.577197],
+            [36.626168, 50.225591],
+            [37.39346, 50.383953],
+            [38.010631, 49.915662],
+            [38.594988, 49.926462],
+            [40.069058, 49.601055],
+            [40.080789, 49.30743],
+            [39.674664, 48.783818],
+            [39.895632, 48.232405],
+            [39.738278, 47.898937],
+            [38.770585, 47.825608],
+            [38.255112, 47.5464],
+            [38.223538, 47.10219],
+            [37.425137, 47.022221],
+            [36.759855, 46.6987],
+            [35.823685, 46.645964],
+            [34.962342, 46.273197],
+            [35.020788, 45.651219],
+            [35.510009, 45.409993],
+            [36.529998, 45.46999],
+            [36.334713, 45.113216],
+            [35.239999, 44.939996],
+            [33.882511, 44.361479],
+            [33.326421, 44.564877],
+            [33.546924, 45.034771],
+            [32.454174, 45.327466],
+            [32.630804, 45.519186],
+            [33.588162, 45.851569],
+            [33.298567, 46.080598],
+            [31.74414, 46.333348],
+            [31.675307, 46.706245],
+            [30.748749, 46.5831],
+            [30.377609, 46.03241],
+            [29.603289, 45.293308],
+            [29.149725, 45.464925],
+            [28.679779, 45.304031],
+            [28.233554, 45.488283],
+            [28.485269, 45.596907],
+            [28.659987, 45.939987],
+            [28.933717, 46.25883],
+            [28.862972, 46.437889],
+            [29.072107, 46.517678],
+            [29.170654, 46.379262],
+            [29.759972, 46.349988],
+            [30.024659, 46.423937],
+            [29.83821, 46.525326],
+            [29.908852, 46.674361],
+            [29.559674, 46.928583],
+            [29.415135, 47.346645],
+            [29.050868, 47.510227],
+            [29.122698, 47.849095],
+            [28.670891, 48.118149],
+            [28.259547, 48.155562],
+            [27.522537, 48.467119],
+            [26.857824, 48.368211],
+            [26.619337, 48.220726],
+            [26.19745, 48.220881],
+            [25.945941, 47.987149],
+            [25.207743, 47.891056],
+            [24.866317, 47.737526],
+            [24.402056, 47.981878],
+            [23.760958, 47.985598],
+            [23.142236, 48.096341],
+            [22.710531, 47.882194],
+            [22.64082, 48.15024],
+            [22.085608, 48.422264],
+            [22.280842, 48.825392],
+            [22.558138, 49.085738],
+            [22.776419, 49.027395],
+            [22.51845, 49.476774],
+            [23.426508, 50.308506],
+            [23.922757, 50.424881],
+            [24.029986, 50.705407],
+            [23.527071, 51.578454],
+            [24.005078, 51.617444],
+            [24.553106, 51.888461],
+            [25.327788, 51.910656],
+            [26.337959, 51.832289],
+            [27.454066, 51.592303],
+            [28.241615, 51.572227],
+            [28.617613, 51.427714],
+            [28.992835, 51.602044],
+            [29.254938, 51.368234],
+            [30.157364, 51.416138],
+            [30.555117, 51.319503],
+            [30.619454, 51.822806],
+            [30.927549, 52.042353],
+            [31.785998, 52.101678]
+          ]
+        ]
+      },
+      "id": "UKR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Uruguay" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-57.625133, -30.216295],
+            [-56.976026, -30.109686],
+            [-55.973245, -30.883076],
+            [-55.60151, -30.853879],
+            [-54.572452, -31.494511],
+            [-53.787952, -32.047243],
+            [-53.209589, -32.727666],
+            [-53.650544, -33.202004],
+            [-53.373662, -33.768378],
+            [-53.806426, -34.396815],
+            [-54.935866, -34.952647],
+            [-55.67409, -34.752659],
+            [-56.215297, -34.859836],
+            [-57.139685, -34.430456],
+            [-57.817861, -34.462547],
+            [-58.427074, -33.909454],
+            [-58.349611, -33.263189],
+            [-58.132648, -33.040567],
+            [-58.14244, -32.044504],
+            [-57.874937, -31.016556],
+            [-57.625133, -30.216295]
+          ]
+        ]
+      },
+      "id": "URY"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "United States of America" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [-155.54211, 19.08348],
+              [-155.68817, 18.91619],
+              [-155.93665, 19.05939],
+              [-155.90806, 19.33888],
+              [-156.07347, 19.70294],
+              [-156.02368, 19.81422],
+              [-155.85008, 19.97729],
+              [-155.91907, 20.17395],
+              [-155.86108, 20.26721],
+              [-155.78505, 20.2487],
+              [-155.40214, 20.07975],
+              [-155.22452, 19.99302],
+              [-155.06226, 19.8591],
+              [-154.80741, 19.50871],
+              [-154.83147, 19.45328],
+              [-155.22217, 19.23972],
+              [-155.54211, 19.08348]
+            ]
+          ],
+          [
+            [
+              [-156.07926, 20.64397],
+              [-156.41445, 20.57241],
+              [-156.58673, 20.783],
+              [-156.70167, 20.8643],
+              [-156.71055, 20.92676],
+              [-156.61258, 21.01249],
+              [-156.25711, 20.91745],
+              [-155.99566, 20.76404],
+              [-156.07926, 20.64397]
+            ]
+          ],
+          [
+            [
+              [-156.75824, 21.17684],
+              [-156.78933, 21.06873],
+              [-157.32521, 21.09777],
+              [-157.25027, 21.21958],
+              [-156.75824, 21.17684]
+            ]
+          ],
+          [
+            [
+              [-157.65283, 21.32217],
+              [-157.70703, 21.26442],
+              [-157.7786, 21.27729],
+              [-158.12667, 21.31244],
+              [-158.2538, 21.53919],
+              [-158.29265, 21.57912],
+              [-158.0252, 21.71696],
+              [-157.94161, 21.65272],
+              [-157.65283, 21.32217]
+            ]
+          ],
+          [
+            [
+              [-159.34512, 21.982],
+              [-159.46372, 21.88299],
+              [-159.80051, 22.06533],
+              [-159.74877, 22.1382],
+              [-159.5962, 22.23618],
+              [-159.36569, 22.21494],
+              [-159.34512, 21.982]
+            ]
+          ],
+          [
+            [
+              [-94.81758, 49.38905],
+              [-94.64, 48.84],
+              [-94.32914, 48.67074],
+              [-93.63087, 48.60926],
+              [-92.61, 48.45],
+              [-91.64, 48.14],
+              [-90.83, 48.27],
+              [-89.6, 48.01],
+              [-89.272917, 48.019808],
+              [-88.378114, 48.302918],
+              [-87.439793, 47.94],
+              [-86.461991, 47.553338],
+              [-85.652363, 47.220219],
+              [-84.87608, 46.900083],
+              [-84.779238, 46.637102],
+              [-84.543749, 46.538684],
+              [-84.6049, 46.4396],
+              [-84.3367, 46.40877],
+              [-84.14212, 46.512226],
+              [-84.091851, 46.275419],
+              [-83.890765, 46.116927],
+              [-83.616131, 46.116927],
+              [-83.469551, 45.994686],
+              [-83.592851, 45.816894],
+              [-82.550925, 45.347517],
+              [-82.337763, 44.44],
+              [-82.137642, 43.571088],
+              [-82.43, 42.98],
+              [-82.9, 42.43],
+              [-83.12, 42.08],
+              [-83.142, 41.975681],
+              [-83.02981, 41.832796],
+              [-82.690089, 41.675105],
+              [-82.439278, 41.675105],
+              [-81.277747, 42.209026],
+              [-80.247448, 42.3662],
+              [-78.939362, 42.863611],
+              [-78.92, 42.965],
+              [-79.01, 43.27],
+              [-79.171674, 43.466339],
+              [-78.72028, 43.625089],
+              [-77.737885, 43.629056],
+              [-76.820034, 43.628784],
+              [-76.5, 44.018459],
+              [-76.375, 44.09631],
+              [-75.31821, 44.81645],
+              [-74.867, 45.00048],
+              [-73.34783, 45.00738],
+              [-71.50506, 45.0082],
+              [-71.405, 45.255],
+              [-71.08482, 45.30524],
+              [-70.66, 45.46],
+              [-70.305, 45.915],
+              [-69.99997, 46.69307],
+              [-69.237216, 47.447781],
+              [-68.905, 47.185],
+              [-68.23444, 47.35486],
+              [-67.79046, 47.06636],
+              [-67.79134, 45.70281],
+              [-67.13741, 45.13753],
+              [-66.96466, 44.8097],
+              [-68.03252, 44.3252],
+              [-69.06, 43.98],
+              [-70.11617, 43.68405],
+              [-70.645476, 43.090238],
+              [-70.81489, 42.8653],
+              [-70.825, 42.335],
+              [-70.495, 41.805],
+              [-70.08, 41.78],
+              [-70.185, 42.145],
+              [-69.88497, 41.92283],
+              [-69.96503, 41.63717],
+              [-70.64, 41.475],
+              [-71.12039, 41.49445],
+              [-71.86, 41.32],
+              [-72.295, 41.27],
+              [-72.87643, 41.22065],
+              [-73.71, 40.931102],
+              [-72.24126, 41.11948],
+              [-71.945, 40.93],
+              [-73.345, 40.63],
+              [-73.982, 40.628],
+              [-73.952325, 40.75075],
+              [-74.25671, 40.47351],
+              [-73.96244, 40.42763],
+              [-74.17838, 39.70926],
+              [-74.90604, 38.93954],
+              [-74.98041, 39.1964],
+              [-75.20002, 39.24845],
+              [-75.52805, 39.4985],
+              [-75.32, 38.96],
+              [-75.071835, 38.782032],
+              [-75.05673, 38.40412],
+              [-75.37747, 38.01551],
+              [-75.94023, 37.21689],
+              [-76.03127, 37.2566],
+              [-75.72205, 37.93705],
+              [-76.23287, 38.319215],
+              [-76.35, 39.15],
+              [-76.542725, 38.717615],
+              [-76.32933, 38.08326],
+              [-76.989998, 38.239992],
+              [-76.30162, 37.917945],
+              [-76.25874, 36.9664],
+              [-75.9718, 36.89726],
+              [-75.86804, 36.55125],
+              [-75.72749, 35.55074],
+              [-76.36318, 34.80854],
+              [-77.397635, 34.51201],
+              [-78.05496, 33.92547],
+              [-78.55435, 33.86133],
+              [-79.06067, 33.49395],
+              [-79.20357, 33.15839],
+              [-80.301325, 32.509355],
+              [-80.86498, 32.0333],
+              [-81.33629, 31.44049],
+              [-81.49042, 30.72999],
+              [-81.31371, 30.03552],
+              [-80.98, 29.18],
+              [-80.535585, 28.47213],
+              [-80.53, 28.04],
+              [-80.056539, 26.88],
+              [-80.088015, 26.205765],
+              [-80.13156, 25.816775],
+              [-80.38103, 25.20616],
+              [-80.68, 25.08],
+              [-81.17213, 25.20126],
+              [-81.33, 25.64],
+              [-81.71, 25.87],
+              [-82.24, 26.73],
+              [-82.70515, 27.49504],
+              [-82.85526, 27.88624],
+              [-82.65, 28.55],
+              [-82.93, 29.1],
+              [-83.70959, 29.93656],
+              [-84.1, 30.09],
+              [-85.10882, 29.63615],
+              [-85.28784, 29.68612],
+              [-85.7731, 30.15261],
+              [-86.4, 30.4],
+              [-87.53036, 30.27433],
+              [-88.41782, 30.3849],
+              [-89.18049, 30.31598],
+              [-89.593831, 30.159994],
+              [-89.413735, 29.89419],
+              [-89.43, 29.48864],
+              [-89.21767, 29.29108],
+              [-89.40823, 29.15961],
+              [-89.77928, 29.30714],
+              [-90.15463, 29.11743],
+              [-90.880225, 29.148535],
+              [-91.626785, 29.677],
+              [-92.49906, 29.5523],
+              [-93.22637, 29.78375],
+              [-93.84842, 29.71363],
+              [-94.69, 29.48],
+              [-95.60026, 28.73863],
+              [-96.59404, 28.30748],
+              [-97.14, 27.83],
+              [-97.37, 27.38],
+              [-97.38, 26.69],
+              [-97.33, 26.21],
+              [-97.14, 25.87],
+              [-97.53, 25.84],
+              [-98.24, 26.06],
+              [-99.02, 26.37],
+              [-99.3, 26.84],
+              [-99.52, 27.54],
+              [-100.11, 28.11],
+              [-100.45584, 28.69612],
+              [-100.9576, 29.38071],
+              [-101.6624, 29.7793],
+              [-102.48, 29.76],
+              [-103.11, 28.97],
+              [-103.94, 29.27],
+              [-104.45697, 29.57196],
+              [-104.70575, 30.12173],
+              [-105.03737, 30.64402],
+              [-105.63159, 31.08383],
+              [-106.1429, 31.39995],
+              [-106.50759, 31.75452],
+              [-108.24, 31.754854],
+              [-108.24194, 31.34222],
+              [-109.035, 31.34194],
+              [-111.02361, 31.33472],
+              [-113.30498, 32.03914],
+              [-114.815, 32.52528],
+              [-114.72139, 32.72083],
+              [-115.99135, 32.61239],
+              [-117.12776, 32.53534],
+              [-117.295938, 33.046225],
+              [-117.944, 33.621236],
+              [-118.410602, 33.740909],
+              [-118.519895, 34.027782],
+              [-119.081, 34.078],
+              [-119.438841, 34.348477],
+              [-120.36778, 34.44711],
+              [-120.62286, 34.60855],
+              [-120.74433, 35.15686],
+              [-121.71457, 36.16153],
+              [-122.54747, 37.55176],
+              [-122.51201, 37.78339],
+              [-122.95319, 38.11371],
+              [-123.7272, 38.95166],
+              [-123.86517, 39.76699],
+              [-124.39807, 40.3132],
+              [-124.17886, 41.14202],
+              [-124.2137, 41.99964],
+              [-124.53284, 42.76599],
+              [-124.14214, 43.70838],
+              [-124.020535, 44.615895],
+              [-123.89893, 45.52341],
+              [-124.079635, 46.86475],
+              [-124.39567, 47.72017],
+              [-124.68721, 48.184433],
+              [-124.566101, 48.379715],
+              [-123.12, 48.04],
+              [-122.58736, 47.096],
+              [-122.34, 47.36],
+              [-122.5, 48.18],
+              [-122.84, 49],
+              [-120, 49],
+              [-117.03121, 49],
+              [-116.04818, 49],
+              [-113, 49],
+              [-110.05, 49],
+              [-107.05, 49],
+              [-104.04826, 48.99986],
+              [-100.65, 49],
+              [-97.22872, 49.0007],
+              [-95.15907, 49],
+              [-95.15609, 49.38425],
+              [-94.81758, 49.38905]
+            ]
+          ],
+          [
+            [
+              [-153.006314, 57.115842],
+              [-154.00509, 56.734677],
+              [-154.516403, 56.992749],
+              [-154.670993, 57.461196],
+              [-153.76278, 57.816575],
+              [-153.228729, 57.968968],
+              [-152.564791, 57.901427],
+              [-152.141147, 57.591059],
+              [-153.006314, 57.115842]
+            ]
+          ],
+          [
+            [
+              [-165.579164, 59.909987],
+              [-166.19277, 59.754441],
+              [-166.848337, 59.941406],
+              [-167.455277, 60.213069],
+              [-166.467792, 60.38417],
+              [-165.67443, 60.293607],
+              [-165.579164, 59.909987]
+            ]
+          ],
+          [
+            [
+              [-171.731657, 63.782515],
+              [-171.114434, 63.592191],
+              [-170.491112, 63.694975],
+              [-169.682505, 63.431116],
+              [-168.689439, 63.297506],
+              [-168.771941, 63.188598],
+              [-169.52944, 62.976931],
+              [-170.290556, 63.194438],
+              [-170.671386, 63.375822],
+              [-171.553063, 63.317789],
+              [-171.791111, 63.405846],
+              [-171.731657, 63.782515]
+            ]
+          ],
+          [
+            [
+              [-155.06779, 71.147776],
+              [-154.344165, 70.696409],
+              [-153.900006, 70.889989],
+              [-152.210006, 70.829992],
+              [-152.270002, 70.600006],
+              [-150.739992, 70.430017],
+              [-149.720003, 70.53001],
+              [-147.613362, 70.214035],
+              [-145.68999, 70.12001],
+              [-144.920011, 69.989992],
+              [-143.589446, 70.152514],
+              [-142.07251, 69.851938],
+              [-140.985988, 69.711998],
+              [-140.985988, 69.711998],
+              [-140.992499, 66.000029],
+              [-140.99777, 60.306397],
+              [-140.012998, 60.276838],
+              [-139.039, 60.000007],
+              [-138.34089, 59.56211],
+              [-137.4525, 58.905],
+              [-136.47972, 59.46389],
+              [-135.47583, 59.78778],
+              [-134.945, 59.27056],
+              [-134.27111, 58.86111],
+              [-133.355549, 58.410285],
+              [-132.73042, 57.69289],
+              [-131.70781, 56.55212],
+              [-130.00778, 55.91583],
+              [-129.979994, 55.284998],
+              [-130.53611, 54.802753],
+              [-131.085818, 55.178906],
+              [-131.967211, 55.497776],
+              [-132.250011, 56.369996],
+              [-133.539181, 57.178887],
+              [-134.078063, 58.123068],
+              [-135.038211, 58.187715],
+              [-136.628062, 58.212209],
+              [-137.800006, 58.499995],
+              [-139.867787, 59.537762],
+              [-140.825274, 59.727517],
+              [-142.574444, 60.084447],
+              [-143.958881, 59.99918],
+              [-145.925557, 60.45861],
+              [-147.114374, 60.884656],
+              [-148.224306, 60.672989],
+              [-148.018066, 59.978329],
+              [-148.570823, 59.914173],
+              [-149.727858, 59.705658],
+              [-150.608243, 59.368211],
+              [-151.716393, 59.155821],
+              [-151.859433, 59.744984],
+              [-151.409719, 60.725803],
+              [-150.346941, 61.033588],
+              [-150.621111, 61.284425],
+              [-151.895839, 60.727198],
+              [-152.57833, 60.061657],
+              [-154.019172, 59.350279],
+              [-153.287511, 58.864728],
+              [-154.232492, 58.146374],
+              [-155.307491, 57.727795],
+              [-156.308335, 57.422774],
+              [-156.556097, 56.979985],
+              [-158.117217, 56.463608],
+              [-158.433321, 55.994154],
+              [-159.603327, 55.566686],
+              [-160.28972, 55.643581],
+              [-161.223048, 55.364735],
+              [-162.237766, 55.024187],
+              [-163.069447, 54.689737],
+              [-164.785569, 54.404173],
+              [-164.942226, 54.572225],
+              [-163.84834, 55.039431],
+              [-162.870001, 55.348043],
+              [-161.804175, 55.894986],
+              [-160.563605, 56.008055],
+              [-160.07056, 56.418055],
+              [-158.684443, 57.016675],
+              [-158.461097, 57.216921],
+              [-157.72277, 57.570001],
+              [-157.550274, 58.328326],
+              [-157.041675, 58.918885],
+              [-158.194731, 58.615802],
+              [-158.517218, 58.787781],
+              [-159.058606, 58.424186],
+              [-159.711667, 58.93139],
+              [-159.981289, 58.572549],
+              [-160.355271, 59.071123],
+              [-161.355003, 58.670838],
+              [-161.968894, 58.671665],
+              [-162.054987, 59.266925],
+              [-161.874171, 59.633621],
+              [-162.518059, 59.989724],
+              [-163.818341, 59.798056],
+              [-164.662218, 60.267484],
+              [-165.346388, 60.507496],
+              [-165.350832, 61.073895],
+              [-166.121379, 61.500019],
+              [-165.734452, 62.074997],
+              [-164.919179, 62.633076],
+              [-164.562508, 63.146378],
+              [-163.753332, 63.219449],
+              [-163.067224, 63.059459],
+              [-162.260555, 63.541936],
+              [-161.53445, 63.455817],
+              [-160.772507, 63.766108],
+              [-160.958335, 64.222799],
+              [-161.518068, 64.402788],
+              [-160.777778, 64.788604],
+              [-161.391926, 64.777235],
+              [-162.45305, 64.559445],
+              [-162.757786, 64.338605],
+              [-163.546394, 64.55916],
+              [-164.96083, 64.446945],
+              [-166.425288, 64.686672],
+              [-166.845004, 65.088896],
+              [-168.11056, 65.669997],
+              [-166.705271, 66.088318],
+              [-164.47471, 66.57666],
+              [-163.652512, 66.57666],
+              [-163.788602, 66.077207],
+              [-161.677774, 66.11612],
+              [-162.489715, 66.735565],
+              [-163.719717, 67.116395],
+              [-164.430991, 67.616338],
+              [-165.390287, 68.042772],
+              [-166.764441, 68.358877],
+              [-166.204707, 68.883031],
+              [-164.430811, 68.915535],
+              [-163.168614, 69.371115],
+              [-162.930566, 69.858062],
+              [-161.908897, 70.33333],
+              [-160.934797, 70.44769],
+              [-159.039176, 70.891642],
+              [-158.119723, 70.824721],
+              [-156.580825, 71.357764],
+              [-155.06779, 71.147776]
+            ]
+          ]
+        ]
+      },
+      "id": "USA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Uzbekistan" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [66.518607, 37.362784],
+            [66.54615, 37.974685],
+            [65.215999, 38.402695],
+            [64.170223, 38.892407],
+            [63.518015, 39.363257],
+            [62.37426, 40.053886],
+            [61.882714, 41.084857],
+            [61.547179, 41.26637],
+            [60.465953, 41.220327],
+            [60.083341, 41.425146],
+            [59.976422, 42.223082],
+            [58.629011, 42.751551],
+            [57.78653, 42.170553],
+            [56.932215, 41.826026],
+            [57.096391, 41.32231],
+            [55.968191, 41.308642],
+            [55.928917, 44.995858],
+            [58.503127, 45.586804],
+            [58.689989, 45.500014],
+            [60.239972, 44.784037],
+            [61.05832, 44.405817],
+            [62.0133, 43.504477],
+            [63.185787, 43.650075],
+            [64.900824, 43.728081],
+            [66.098012, 42.99766],
+            [66.023392, 41.994646],
+            [66.510649, 41.987644],
+            [66.714047, 41.168444],
+            [67.985856, 41.135991],
+            [68.259896, 40.662325],
+            [68.632483, 40.668681],
+            [69.070027, 41.384244],
+            [70.388965, 42.081308],
+            [70.962315, 42.266154],
+            [71.259248, 42.167711],
+            [70.420022, 41.519998],
+            [71.157859, 41.143587],
+            [71.870115, 41.3929],
+            [73.055417, 40.866033],
+            [71.774875, 40.145844],
+            [71.014198, 40.244366],
+            [70.601407, 40.218527],
+            [70.45816, 40.496495],
+            [70.666622, 40.960213],
+            [69.329495, 40.727824],
+            [69.011633, 40.086158],
+            [68.536416, 39.533453],
+            [67.701429, 39.580478],
+            [67.44222, 39.140144],
+            [68.176025, 38.901553],
+            [68.392033, 38.157025],
+            [67.83, 37.144994],
+            [67.075782, 37.356144],
+            [66.518607, 37.362784]
+          ]
+        ]
+      },
+      "id": "UZB"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Venezuela" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-71.331584, 11.776284],
+            [-71.360006, 11.539994],
+            [-71.94705, 11.423282],
+            [-71.620868, 10.96946],
+            [-71.633064, 10.446494],
+            [-72.074174, 9.865651],
+            [-71.695644, 9.072263],
+            [-71.264559, 9.137195],
+            [-71.039999, 9.859993],
+            [-71.350084, 10.211935],
+            [-71.400623, 10.968969],
+            [-70.155299, 11.375482],
+            [-70.293843, 11.846822],
+            [-69.943245, 12.162307],
+            [-69.5843, 11.459611],
+            [-68.882999, 11.443385],
+            [-68.233271, 10.885744],
+            [-68.194127, 10.554653],
+            [-67.296249, 10.545868],
+            [-66.227864, 10.648627],
+            [-65.655238, 10.200799],
+            [-64.890452, 10.077215],
+            [-64.329479, 10.389599],
+            [-64.318007, 10.641418],
+            [-63.079322, 10.701724],
+            [-61.880946, 10.715625],
+            [-62.730119, 10.420269],
+            [-62.388512, 9.948204],
+            [-61.588767, 9.873067],
+            [-60.830597, 9.38134],
+            [-60.671252, 8.580174],
+            [-60.150096, 8.602757],
+            [-59.758285, 8.367035],
+            [-60.550588, 7.779603],
+            [-60.637973, 7.415],
+            [-60.295668, 7.043911],
+            [-60.543999, 6.856584],
+            [-61.159336, 6.696077],
+            [-61.139415, 6.234297],
+            [-61.410303, 5.959068],
+            [-60.733574, 5.200277],
+            [-60.601179, 4.918098],
+            [-60.966893, 4.536468],
+            [-62.08543, 4.162124],
+            [-62.804533, 4.006965],
+            [-63.093198, 3.770571],
+            [-63.888343, 4.02053],
+            [-64.628659, 4.148481],
+            [-64.816064, 4.056445],
+            [-64.368494, 3.79721],
+            [-64.408828, 3.126786],
+            [-64.269999, 2.497006],
+            [-63.422867, 2.411068],
+            [-63.368788, 2.2009],
+            [-64.083085, 1.916369],
+            [-64.199306, 1.492855],
+            [-64.611012, 1.328731],
+            [-65.354713, 1.095282],
+            [-65.548267, 0.789254],
+            [-66.325765, 0.724452],
+            [-66.876326, 1.253361],
+            [-67.181294, 2.250638],
+            [-67.447092, 2.600281],
+            [-67.809938, 2.820655],
+            [-67.303173, 3.318454],
+            [-67.337564, 3.542342],
+            [-67.621836, 3.839482],
+            [-67.823012, 4.503937],
+            [-67.744697, 5.221129],
+            [-67.521532, 5.55687],
+            [-67.34144, 6.095468],
+            [-67.695087, 6.267318],
+            [-68.265052, 6.153268],
+            [-68.985319, 6.206805],
+            [-69.38948, 6.099861],
+            [-70.093313, 6.960376],
+            [-70.674234, 7.087785],
+            [-71.960176, 6.991615],
+            [-72.198352, 7.340431],
+            [-72.444487, 7.423785],
+            [-72.479679, 7.632506],
+            [-72.360901, 8.002638],
+            [-72.439862, 8.405275],
+            [-72.660495, 8.625288],
+            [-72.78873, 9.085027],
+            [-73.304952, 9.152],
+            [-73.027604, 9.73677],
+            [-72.905286, 10.450344],
+            [-72.614658, 10.821975],
+            [-72.227575, 11.108702],
+            [-71.973922, 11.608672],
+            [-71.331584, 11.776284]
+          ]
+        ]
+      },
+      "id": "VEN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Vietnam" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [108.05018, 21.55238],
+            [106.715068, 20.696851],
+            [105.881682, 19.75205],
+            [105.662006, 19.058165],
+            [106.426817, 18.004121],
+            [107.361954, 16.697457],
+            [108.269495, 16.079742],
+            [108.877107, 15.276691],
+            [109.33527, 13.426028],
+            [109.200136, 11.666859],
+            [108.36613, 11.008321],
+            [107.220929, 10.364484],
+            [106.405113, 9.53084],
+            [105.158264, 8.59976],
+            [104.795185, 9.241038],
+            [105.076202, 9.918491],
+            [104.334335, 10.486544],
+            [105.199915, 10.88931],
+            [106.24967, 10.961812],
+            [105.810524, 11.567615],
+            [107.491403, 12.337206],
+            [107.614548, 13.535531],
+            [107.382727, 14.202441],
+            [107.564525, 15.202173],
+            [107.312706, 15.908538],
+            [106.556008, 16.604284],
+            [105.925762, 17.485315],
+            [105.094598, 18.666975],
+            [103.896532, 19.265181],
+            [104.183388, 19.624668],
+            [104.822574, 19.886642],
+            [104.435, 20.758733],
+            [103.203861, 20.766562],
+            [102.754896, 21.675137],
+            [102.170436, 22.464753],
+            [102.706992, 22.708795],
+            [103.504515, 22.703757],
+            [104.476858, 22.81915],
+            [105.329209, 23.352063],
+            [105.811247, 22.976892],
+            [106.725403, 22.794268],
+            [106.567273, 22.218205],
+            [107.04342, 21.811899],
+            [108.05018, 21.55238]
+          ]
+        ]
+      },
+      "id": "VNM"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Vanuatu" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [167.844877, -16.466333],
+              [167.515181, -16.59785],
+              [167.180008, -16.159995],
+              [167.216801, -15.891846],
+              [167.844877, -16.466333]
+            ]
+          ],
+          [
+            [
+              [167.107712, -14.93392],
+              [167.270028, -15.740021],
+              [167.001207, -15.614602],
+              [166.793158, -15.668811],
+              [166.649859, -15.392704],
+              [166.629137, -14.626497],
+              [167.107712, -14.93392]
+            ]
+          ]
+        ]
+      },
+      "id": "VUT"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "West Bank" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [35.545665, 32.393992],
+            [35.545252, 31.782505],
+            [35.397561, 31.489086],
+            [34.927408, 31.353435],
+            [34.970507, 31.616778],
+            [35.225892, 31.754341],
+            [34.974641, 31.866582],
+            [35.18393, 32.532511],
+            [35.545665, 32.393992]
+          ]
+        ]
+      },
+      "id": "PSE"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Yemen" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [53.108573, 16.651051],
+            [52.385206, 16.382411],
+            [52.191729, 15.938433],
+            [52.168165, 15.59742],
+            [51.172515, 15.17525],
+            [49.574576, 14.708767],
+            [48.679231, 14.003202],
+            [48.238947, 13.94809],
+            [47.938914, 14.007233],
+            [47.354454, 13.59222],
+            [46.717076, 13.399699],
+            [45.877593, 13.347764],
+            [45.62505, 13.290946],
+            [45.406459, 13.026905],
+            [45.144356, 12.953938],
+            [44.989533, 12.699587],
+            [44.494576, 12.721653],
+            [44.175113, 12.58595],
+            [43.482959, 12.6368],
+            [43.222871, 13.22095],
+            [43.251448, 13.767584],
+            [43.087944, 14.06263],
+            [42.892245, 14.802249],
+            [42.604873, 15.213335],
+            [42.805015, 15.261963],
+            [42.702438, 15.718886],
+            [42.823671, 15.911742],
+            [42.779332, 16.347891],
+            [43.218375, 16.66689],
+            [43.115798, 17.08844],
+            [43.380794, 17.579987],
+            [43.791519, 17.319977],
+            [44.062613, 17.410359],
+            [45.216651, 17.433329],
+            [45.399999, 17.333335],
+            [46.366659, 17.233315],
+            [46.749994, 17.283338],
+            [47.000005, 16.949999],
+            [47.466695, 17.116682],
+            [48.183344, 18.166669],
+            [49.116672, 18.616668],
+            [52.00001, 19.000003],
+            [52.782184, 17.349742],
+            [53.108573, 16.651051]
+          ]
+        ]
+      },
+      "id": "YEM"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "South Africa" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [31.521001, -29.257387],
+            [31.325561, -29.401978],
+            [30.901763, -29.909957],
+            [30.622813, -30.423776],
+            [30.055716, -31.140269],
+            [28.925553, -32.172041],
+            [28.219756, -32.771953],
+            [27.464608, -33.226964],
+            [26.419452, -33.61495],
+            [25.909664, -33.66704],
+            [25.780628, -33.944646],
+            [25.172862, -33.796851],
+            [24.677853, -33.987176],
+            [23.594043, -33.794474],
+            [22.988189, -33.916431],
+            [22.574157, -33.864083],
+            [21.542799, -34.258839],
+            [20.689053, -34.417175],
+            [20.071261, -34.795137],
+            [19.616405, -34.819166],
+            [19.193278, -34.462599],
+            [18.855315, -34.444306],
+            [18.424643, -33.997873],
+            [18.377411, -34.136521],
+            [18.244499, -33.867752],
+            [18.25008, -33.281431],
+            [17.92519, -32.611291],
+            [18.24791, -32.429131],
+            [18.221762, -31.661633],
+            [17.566918, -30.725721],
+            [17.064416, -29.878641],
+            [17.062918, -29.875954],
+            [16.344977, -28.576705],
+            [16.824017, -28.082162],
+            [17.218929, -28.355943],
+            [17.387497, -28.783514],
+            [17.836152, -28.856378],
+            [18.464899, -29.045462],
+            [19.002127, -28.972443],
+            [19.894734, -28.461105],
+            [19.895768, -24.76779],
+            [20.165726, -24.917962],
+            [20.758609, -25.868136],
+            [20.66647, -26.477453],
+            [20.889609, -26.828543],
+            [21.605896, -26.726534],
+            [22.105969, -26.280256],
+            [22.579532, -25.979448],
+            [22.824271, -25.500459],
+            [23.312097, -25.26869],
+            [23.73357, -25.390129],
+            [24.211267, -25.670216],
+            [25.025171, -25.71967],
+            [25.664666, -25.486816],
+            [25.765849, -25.174845],
+            [25.941652, -24.696373],
+            [26.485753, -24.616327],
+            [26.786407, -24.240691],
+            [27.11941, -23.574323],
+            [28.017236, -22.827754],
+            [29.432188, -22.091313],
+            [29.839037, -22.102216],
+            [30.322883, -22.271612],
+            [30.659865, -22.151567],
+            [31.191409, -22.25151],
+            [31.670398, -23.658969],
+            [31.930589, -24.369417],
+            [31.752408, -25.484284],
+            [31.837778, -25.843332],
+            [31.333158, -25.660191],
+            [31.04408, -25.731452],
+            [30.949667, -26.022649],
+            [30.676609, -26.398078],
+            [30.685962, -26.743845],
+            [31.282773, -27.285879],
+            [31.86806, -27.177927],
+            [32.071665, -26.73382],
+            [32.83012, -26.742192],
+            [32.580265, -27.470158],
+            [32.462133, -28.301011],
+            [32.203389, -28.752405],
+            [31.521001, -29.257387]
+          ],
+          [
+            [28.978263, -28.955597],
+            [28.5417, -28.647502],
+            [28.074338, -28.851469],
+            [27.532511, -29.242711],
+            [26.999262, -29.875954],
+            [27.749397, -30.645106],
+            [28.107205, -30.545732],
+            [28.291069, -30.226217],
+            [28.8484, -30.070051],
+            [29.018415, -29.743766],
+            [29.325166, -29.257387],
+            [28.978263, -28.955597]
+          ]
+        ]
+      },
+      "id": "ZAF"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Zambia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [32.759375, -9.230599],
+            [33.231388, -9.676722],
+            [33.485688, -10.525559],
+            [33.31531, -10.79655],
+            [33.114289, -11.607198],
+            [33.306422, -12.435778],
+            [32.991764, -12.783871],
+            [32.688165, -13.712858],
+            [33.214025, -13.97186],
+            [30.179481, -14.796099],
+            [30.274256, -15.507787],
+            [29.516834, -15.644678],
+            [28.947463, -16.043051],
+            [28.825869, -16.389749],
+            [28.467906, -16.4684],
+            [27.598243, -17.290831],
+            [27.044427, -17.938026],
+            [26.706773, -17.961229],
+            [26.381935, -17.846042],
+            [25.264226, -17.73654],
+            [25.084443, -17.661816],
+            [25.07695, -17.578823],
+            [24.682349, -17.353411],
+            [24.033862, -17.295843],
+            [23.215048, -17.523116],
+            [22.562478, -16.898451],
+            [21.887843, -16.08031],
+            [21.933886, -12.898437],
+            [24.016137, -12.911046],
+            [23.930922, -12.565848],
+            [24.079905, -12.191297],
+            [23.904154, -11.722282],
+            [24.017894, -11.237298],
+            [23.912215, -10.926826],
+            [24.257155, -10.951993],
+            [24.314516, -11.262826],
+            [24.78317, -11.238694],
+            [25.418118, -11.330936],
+            [25.75231, -11.784965],
+            [26.553088, -11.92444],
+            [27.16442, -11.608748],
+            [27.388799, -12.132747],
+            [28.155109, -12.272481],
+            [28.523562, -12.698604],
+            [28.934286, -13.248958],
+            [29.699614, -13.257227],
+            [29.616001, -12.178895],
+            [29.341548, -12.360744],
+            [28.642417, -11.971569],
+            [28.372253, -11.793647],
+            [28.49607, -10.789884],
+            [28.673682, -9.605925],
+            [28.449871, -9.164918],
+            [28.734867, -8.526559],
+            [29.002912, -8.407032],
+            [30.346086, -8.238257],
+            [30.740015, -8.340007],
+            [31.157751, -8.594579],
+            [31.556348, -8.762049],
+            [32.191865, -8.930359],
+            [32.759375, -9.230599]
+          ]
+        ]
+      },
+      "id": "ZMB"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Zimbabwe" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [31.191409, -22.25151],
+            [30.659865, -22.151567],
+            [30.322883, -22.271612],
+            [29.839037, -22.102216],
+            [29.432188, -22.091313],
+            [28.794656, -21.639454],
+            [28.02137, -21.485975],
+            [27.727228, -20.851802],
+            [27.724747, -20.499059],
+            [27.296505, -20.39152],
+            [26.164791, -19.293086],
+            [25.850391, -18.714413],
+            [25.649163, -18.536026],
+            [25.264226, -17.73654],
+            [26.381935, -17.846042],
+            [26.706773, -17.961229],
+            [27.044427, -17.938026],
+            [27.598243, -17.290831],
+            [28.467906, -16.4684],
+            [28.825869, -16.389749],
+            [28.947463, -16.043051],
+            [29.516834, -15.644678],
+            [30.274256, -15.507787],
+            [30.338955, -15.880839],
+            [31.173064, -15.860944],
+            [31.636498, -16.07199],
+            [31.852041, -16.319417],
+            [32.328239, -16.392074],
+            [32.847639, -16.713398],
+            [32.849861, -17.979057],
+            [32.654886, -18.67209],
+            [32.611994, -19.419383],
+            [32.772708, -19.715592],
+            [32.659743, -20.30429],
+            [32.508693, -20.395292],
+            [32.244988, -21.116489],
+            [31.191409, -22.25151]
+          ]
+        ]
+      },
+      "id": "ZWE"
+    }
+  ]
+}

From 438eb4bd56e82572bab49a7ff274d33ab2ee0d56 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Wed, 18 Sep 2024 11:58:03 -0700
Subject: [PATCH 363/438] remove northern cyprus from datamaps

---
 public/datamaps.world.json | 13371 ++++++++++++++++++++++++++++++++++-
 1 file changed, 13191 insertions(+), 180 deletions(-)

diff --git a/public/datamaps.world.json b/public/datamaps.world.json
index 22d1036060..beaceb6868 100644
--- a/public/datamaps.world.json
+++ b/public/datamaps.world.json
@@ -1,180 +1,13191 @@
-{"type":"FeatureCollection","features":[
-{"type":"Feature","properties":{"name":"Afghanistan"},"geometry":{"type":"Polygon","coordinates":[[[61.210817,35.650072],[62.230651,35.270664],[62.984662,35.404041],[63.193538,35.857166],[63.982896,36.007957],[64.546479,36.312073],[64.746105,37.111818],[65.588948,37.305217],[65.745631,37.661164],[66.217385,37.39379],[66.518607,37.362784],[67.075782,37.356144],[67.83,37.144994],[68.135562,37.023115],[68.859446,37.344336],[69.196273,37.151144],[69.518785,37.608997],[70.116578,37.588223],[70.270574,37.735165],[70.376304,38.138396],[70.806821,38.486282],[71.348131,38.258905],[71.239404,37.953265],[71.541918,37.905774],[71.448693,37.065645],[71.844638,36.738171],[72.193041,36.948288],[72.63689,37.047558],[73.260056,37.495257],[73.948696,37.421566],[74.980002,37.41999],[75.158028,37.133031],[74.575893,37.020841],[74.067552,36.836176],[72.920025,36.720007],[71.846292,36.509942],[71.262348,36.074388],[71.498768,35.650563],[71.613076,35.153203],[71.115019,34.733126],[71.156773,34.348911],[70.881803,33.988856],[69.930543,34.02012],[70.323594,33.358533],[69.687147,33.105499],[69.262522,32.501944],[69.317764,31.901412],[68.926677,31.620189],[68.556932,31.71331],[67.792689,31.58293],[67.683394,31.303154],[66.938891,31.304911],[66.381458,30.738899],[66.346473,29.887943],[65.046862,29.472181],[64.350419,29.560031],[64.148002,29.340819],[63.550261,29.468331],[62.549857,29.318572],[60.874248,29.829239],[61.781222,30.73585],[61.699314,31.379506],[60.941945,31.548075],[60.863655,32.18292],[60.536078,32.981269],[60.9637,33.528832],[60.52843,33.676446],[60.803193,34.404102],[61.210817,35.650072]]]},"id":"AFG"},
-{"type":"Feature","properties":{"name":"Angola"},"geometry":{"type":"MultiPolygon","coordinates":[[[[16.326528,-5.87747],[16.57318,-6.622645],[16.860191,-7.222298],[17.089996,-7.545689],[17.47297,-8.068551],[18.134222,-7.987678],[18.464176,-7.847014],[19.016752,-7.988246],[19.166613,-7.738184],[19.417502,-7.155429],[20.037723,-7.116361],[20.091622,-6.94309],[20.601823,-6.939318],[20.514748,-7.299606],[21.728111,-7.290872],[21.746456,-7.920085],[21.949131,-8.305901],[21.801801,-8.908707],[21.875182,-9.523708],[22.208753,-9.894796],[22.155268,-11.084801],[22.402798,-10.993075],[22.837345,-11.017622],[23.456791,-10.867863],[23.912215,-10.926826],[24.017894,-11.237298],[23.904154,-11.722282],[24.079905,-12.191297],[23.930922,-12.565848],[24.016137,-12.911046],[21.933886,-12.898437],[21.887843,-16.08031],[22.562478,-16.898451],[23.215048,-17.523116],[21.377176,-17.930636],[18.956187,-17.789095],[18.263309,-17.309951],[14.209707,-17.353101],[14.058501,-17.423381],[13.462362,-16.971212],[12.814081,-16.941343],[12.215461,-17.111668],[11.734199,-17.301889],[11.640096,-16.673142],[11.778537,-15.793816],[12.123581,-14.878316],[12.175619,-14.449144],[12.500095,-13.5477],[12.738479,-13.137906],[13.312914,-12.48363],[13.633721,-12.038645],[13.738728,-11.297863],[13.686379,-10.731076],[13.387328,-10.373578],[13.120988,-9.766897],[12.87537,-9.166934],[12.929061,-8.959091],[13.236433,-8.562629],[12.93304,-7.596539],[12.728298,-6.927122],[12.227347,-6.294448],[12.322432,-6.100092],[12.735171,-5.965682],[13.024869,-5.984389],[13.375597,-5.864241],[16.326528,-5.87747]]],[[[12.436688,-5.684304],[12.182337,-5.789931],[11.914963,-5.037987],[12.318608,-4.60623],[12.62076,-4.438023],[12.995517,-4.781103],[12.631612,-4.991271],[12.468004,-5.248362],[12.436688,-5.684304]]]]},"id":"AGO"},
-{"type":"Feature","properties":{"name":"Albania"},"geometry":{"type":"Polygon","coordinates":[[[20.590247,41.855404],[20.463175,41.515089],[20.605182,41.086226],[21.02004,40.842727],[20.99999,40.580004],[20.674997,40.435],[20.615,40.110007],[20.150016,39.624998],[19.98,39.694993],[19.960002,39.915006],[19.406082,40.250773],[19.319059,40.72723],[19.40355,41.409566],[19.540027,41.719986],[19.371769,41.877548],[19.304486,42.195745],[19.738051,42.688247],[19.801613,42.500093],[20.0707,42.58863],[20.283755,42.32026],[20.52295,42.21787],[20.590247,41.855404]]]},"id":"ALB"},
-{"type":"Feature","properties":{"name":"United Arab Emirates"},"geometry":{"type":"Polygon","coordinates":[[[51.579519,24.245497],[51.757441,24.294073],[51.794389,24.019826],[52.577081,24.177439],[53.404007,24.151317],[54.008001,24.121758],[54.693024,24.797892],[55.439025,25.439145],[56.070821,26.055464],[56.261042,25.714606],[56.396847,24.924732],[55.886233,24.920831],[55.804119,24.269604],[55.981214,24.130543],[55.528632,23.933604],[55.525841,23.524869],[55.234489,23.110993],[55.208341,22.70833],[55.006803,22.496948],[52.000733,23.001154],[51.617708,24.014219],[51.579519,24.245497]]]},"id":"ARE"},
-{"type":"Feature","properties":{"name":"Argentina"},"geometry":{"type":"MultiPolygon","coordinates":[[[[-65.5,-55.2],[-66.45,-55.25],[-66.95992,-54.89681],[-67.56244,-54.87001],[-68.63335,-54.8695],[-68.63401,-52.63637],[-68.25,-53.1],[-67.75,-53.85],[-66.45,-54.45],[-65.05,-54.7],[-65.5,-55.2]]],[[[-64.964892,-22.075862],[-64.377021,-22.798091],[-63.986838,-21.993644],[-62.846468,-22.034985],[-62.685057,-22.249029],[-60.846565,-23.880713],[-60.028966,-24.032796],[-58.807128,-24.771459],[-57.777217,-25.16234],[-57.63366,-25.603657],[-58.618174,-27.123719],[-57.60976,-27.395899],[-56.486702,-27.548499],[-55.695846,-27.387837],[-54.788795,-26.621786],[-54.625291,-25.739255],[-54.13005,-25.547639],[-53.628349,-26.124865],[-53.648735,-26.923473],[-54.490725,-27.474757],[-55.162286,-27.881915],[-56.2909,-28.852761],[-57.625133,-30.216295],[-57.874937,-31.016556],[-58.14244,-32.044504],[-58.132648,-33.040567],[-58.349611,-33.263189],[-58.427074,-33.909454],[-58.495442,-34.43149],[-57.22583,-35.288027],[-57.362359,-35.97739],[-56.737487,-36.413126],[-56.788285,-36.901572],[-57.749157,-38.183871],[-59.231857,-38.72022],[-61.237445,-38.928425],[-62.335957,-38.827707],[-62.125763,-39.424105],[-62.330531,-40.172586],[-62.145994,-40.676897],[-62.745803,-41.028761],[-63.770495,-41.166789],[-64.73209,-40.802677],[-65.118035,-41.064315],[-64.978561,-42.058001],[-64.303408,-42.359016],[-63.755948,-42.043687],[-63.458059,-42.563138],[-64.378804,-42.873558],[-65.181804,-43.495381],[-65.328823,-44.501366],[-65.565269,-45.036786],[-66.509966,-45.039628],[-67.293794,-45.551896],[-67.580546,-46.301773],[-66.597066,-47.033925],[-65.641027,-47.236135],[-65.985088,-48.133289],[-67.166179,-48.697337],[-67.816088,-49.869669],[-68.728745,-50.264218],[-69.138539,-50.73251],[-68.815561,-51.771104],[-68.149995,-52.349983],[-68.571545,-52.299444],[-69.498362,-52.142761],[-71.914804,-52.009022],[-72.329404,-51.425956],[-72.309974,-50.67701],[-72.975747,-50.74145],[-73.328051,-50.378785],[-73.415436,-49.318436],[-72.648247,-48.878618],[-72.331161,-48.244238],[-72.447355,-47.738533],[-71.917258,-46.884838],[-71.552009,-45.560733],[-71.659316,-44.973689],[-71.222779,-44.784243],[-71.329801,-44.407522],[-71.793623,-44.207172],[-71.464056,-43.787611],[-71.915424,-43.408565],[-72.148898,-42.254888],[-71.746804,-42.051386],[-71.915734,-40.832339],[-71.680761,-39.808164],[-71.413517,-38.916022],[-70.814664,-38.552995],[-71.118625,-37.576827],[-71.121881,-36.658124],[-70.364769,-36.005089],[-70.388049,-35.169688],[-69.817309,-34.193571],[-69.814777,-33.273886],[-70.074399,-33.09121],[-70.535069,-31.36501],[-69.919008,-30.336339],[-70.01355,-29.367923],[-69.65613,-28.459141],[-69.001235,-27.521214],[-68.295542,-26.89934],[-68.5948,-26.506909],[-68.386001,-26.185016],[-68.417653,-24.518555],[-67.328443,-24.025303],[-66.985234,-22.986349],[-67.106674,-22.735925],[-66.273339,-21.83231],[-64.964892,-22.075862]]]]},"id":"ARG"},
-{"type":"Feature","properties":{"name":"Armenia"},"geometry":{"type":"Polygon","coordinates":[[[43.582746,41.092143],[44.97248,41.248129],[45.179496,40.985354],[45.560351,40.81229],[45.359175,40.561504],[45.891907,40.218476],[45.610012,39.899994],[46.034534,39.628021],[46.483499,39.464155],[46.50572,38.770605],[46.143623,38.741201],[45.735379,39.319719],[45.739978,39.473999],[45.298145,39.471751],[45.001987,39.740004],[44.79399,39.713003],[44.400009,40.005],[43.656436,40.253564],[43.752658,40.740201],[43.582746,41.092143]]]},"id":"ARM"},
-{"type":"Feature","properties":{"name":"Antarctica"},"geometry":{"type":"MultiPolygon","coordinates":[[[[-59.572095,-80.040179],[-59.865849,-80.549657],[-60.159656,-81.000327],[-62.255393,-80.863178],[-64.488125,-80.921934],[-65.741666,-80.588827],[-65.741666,-80.549657],[-66.290031,-80.255773],[-64.037688,-80.294944],[-61.883246,-80.39287],[-61.138976,-79.981371],[-60.610119,-79.628679],[-59.572095,-80.040179]]],[[[-159.208184,-79.497059],[-161.127601,-79.634209],[-162.439847,-79.281465],[-163.027408,-78.928774],[-163.066604,-78.869966],[-163.712896,-78.595667],[-163.712896,-78.595667],[-163.105801,-78.223338],[-161.245113,-78.380176],[-160.246208,-78.693645],[-159.482405,-79.046338],[-159.208184,-79.497059]]],[[[-45.154758,-78.04707],[-43.920828,-78.478103],[-43.48995,-79.08556],[-43.372438,-79.516645],[-43.333267,-80.026123],[-44.880537,-80.339644],[-46.506174,-80.594357],[-48.386421,-80.829485],[-50.482107,-81.025442],[-52.851988,-80.966685],[-54.164259,-80.633528],[-53.987991,-80.222028],[-51.853134,-79.94773],[-50.991326,-79.614623],[-50.364595,-79.183487],[-49.914131,-78.811209],[-49.306959,-78.458569],[-48.660616,-78.047018],[-48.660616,-78.047019],[-48.151396,-78.04707],[-46.662857,-77.831476],[-45.154758,-78.04707]]],[[[-121.211511,-73.50099],[-119.918851,-73.657725],[-118.724143,-73.481353],[-119.292119,-73.834097],[-120.232217,-74.08881],[-121.62283,-74.010468],[-122.621735,-73.657778],[-122.621735,-73.657777],[-122.406245,-73.324619],[-121.211511,-73.50099]]],[[[-125.559566,-73.481353],[-124.031882,-73.873268],[-124.619469,-73.834097],[-125.912181,-73.736118],[-127.28313,-73.461769],[-127.28313,-73.461768],[-126.558472,-73.246226],[-125.559566,-73.481353]]],[[[-98.98155,-71.933334],[-97.884743,-72.070535],[-96.787937,-71.952971],[-96.20035,-72.521205],[-96.983765,-72.442864],[-98.198083,-72.482035],[-99.432013,-72.442864],[-100.783455,-72.50162],[-101.801868,-72.305663],[-102.330725,-71.894164],[-102.330725,-71.894164],[-101.703967,-71.717792],[-100.430919,-71.854993],[-98.98155,-71.933334]]],[[[-68.451346,-70.955823],[-68.333834,-71.406493],[-68.510128,-71.798407],[-68.784297,-72.170736],[-69.959471,-72.307885],[-71.075889,-72.503842],[-72.388134,-72.484257],[-71.8985,-72.092343],[-73.073622,-72.229492],[-74.19004,-72.366693],[-74.953895,-72.072757],[-75.012625,-71.661258],[-73.915819,-71.269345],[-73.915819,-71.269344],[-73.230331,-71.15178],[-72.074717,-71.190951],[-71.780962,-70.681473],[-71.72218,-70.309196],[-71.741791,-69.505782],[-71.173815,-69.035475],[-70.253252,-68.87874],[-69.724447,-69.251017],[-69.489422,-69.623346],[-69.058518,-70.074016],[-68.725541,-70.505153],[-68.451346,-70.955823]]],[[[-58.614143,-64.152467],[-59.045073,-64.36801],[-59.789342,-64.211223],[-60.611928,-64.309202],[-61.297416,-64.54433],[-62.0221,-64.799094],[-62.51176,-65.09303],[-62.648858,-65.484942],[-62.590128,-65.857219],[-62.120079,-66.190326],[-62.805567,-66.425505],[-63.74569,-66.503847],[-64.294106,-66.837004],[-64.881693,-67.150474],[-65.508425,-67.58161],[-65.665082,-67.953887],[-65.312545,-68.365335],[-64.783715,-68.678908],[-63.961103,-68.913984],[-63.1973,-69.227556],[-62.785955,-69.619419],[-62.570516,-69.991747],[-62.276736,-70.383661],[-61.806661,-70.716768],[-61.512906,-71.089045],[-61.375809,-72.010074],[-61.081977,-72.382351],[-61.003661,-72.774265],[-60.690269,-73.166179],[-60.827367,-73.695242],[-61.375809,-74.106742],[-61.96337,-74.439848],[-63.295201,-74.576997],[-63.74569,-74.92974],[-64.352836,-75.262847],[-65.860987,-75.635124],[-67.192818,-75.79191],[-68.446282,-76.007452],[-69.797724,-76.222995],[-70.600724,-76.634494],[-72.206776,-76.673665],[-73.969536,-76.634494],[-75.555977,-76.712887],[-77.24037,-76.712887],[-76.926979,-77.104802],[-75.399294,-77.28107],[-74.282876,-77.55542],[-73.656119,-77.908112],[-74.772536,-78.221633],[-76.4961,-78.123654],[-77.925858,-78.378419],[-77.984666,-78.789918],[-78.023785,-79.181833],[-76.848637,-79.514939],[-76.633224,-79.887216],[-75.360097,-80.259545],[-73.244852,-80.416331],[-71.442946,-80.69063],[-70.013163,-81.004151],[-68.191646,-81.317672],[-65.704279,-81.474458],[-63.25603,-81.748757],[-61.552026,-82.042692],[-59.691416,-82.37585],[-58.712121,-82.846106],[-58.222487,-83.218434],[-57.008117,-82.865691],[-55.362894,-82.571755],[-53.619771,-82.258235],[-51.543644,-82.003521],[-49.76135,-81.729171],[-47.273931,-81.709586],[-44.825708,-81.846735],[-42.808363,-82.081915],[-42.16202,-81.65083],[-40.771433,-81.356894],[-38.244818,-81.337309],[-36.26667,-81.121715],[-34.386397,-80.906172],[-32.310296,-80.769023],[-30.097098,-80.592651],[-28.549802,-80.337938],[-29.254901,-79.985195],[-29.685805,-79.632503],[-29.685805,-79.260226],[-31.624808,-79.299397],[-33.681324,-79.456132],[-35.639912,-79.456132],[-35.914107,-79.083855],[-35.77701,-78.339248],[-35.326546,-78.123654],[-33.896763,-77.888526],[-32.212369,-77.65345],[-30.998051,-77.359515],[-29.783732,-77.065579],[-28.882779,-76.673665],[-27.511752,-76.497345],[-26.160336,-76.360144],[-25.474822,-76.281803],[-23.927552,-76.24258],[-22.458598,-76.105431],[-21.224694,-75.909474],[-20.010375,-75.674346],[-18.913543,-75.439218],[-17.522982,-75.125698],[-16.641589,-74.79254],[-15.701491,-74.498604],[-15.40771,-74.106742],[-16.46532,-73.871614],[-16.112784,-73.460114],[-15.446855,-73.146542],[-14.408805,-72.950585],[-13.311973,-72.715457],[-12.293508,-72.401936],[-11.510067,-72.010074],[-11.020433,-71.539767],[-10.295774,-71.265416],[-9.101015,-71.324224],[-8.611381,-71.65733],[-7.416622,-71.696501],[-7.377451,-71.324224],[-6.868232,-70.93231],[-5.790985,-71.030289],[-5.536375,-71.402617],[-4.341667,-71.461373],[-3.048981,-71.285053],[-1.795492,-71.167438],[-0.659489,-71.226246],[-0.228637,-71.637745],[0.868195,-71.304639],[1.886686,-71.128267],[3.022638,-70.991118],[4.139055,-70.853917],[5.157546,-70.618789],[6.273912,-70.462055],[7.13572,-70.246512],[7.742866,-69.893769],[8.48711,-70.148534],[9.525135,-70.011333],[10.249845,-70.48164],[10.817821,-70.834332],[11.953824,-70.638375],[12.404287,-70.246512],[13.422778,-69.972162],[14.734998,-70.030918],[15.126757,-70.403247],[15.949342,-70.030918],[17.026589,-69.913354],[18.201711,-69.874183],[19.259373,-69.893769],[20.375739,-70.011333],[21.452985,-70.07014],[21.923034,-70.403247],[22.569403,-70.697182],[23.666184,-70.520811],[24.841357,-70.48164],[25.977309,-70.48164],[27.093726,-70.462055],[28.09258,-70.324854],[29.150242,-70.20729],[30.031583,-69.93294],[30.971733,-69.75662],[31.990172,-69.658641],[32.754053,-69.384291],[33.302443,-68.835642],[33.870419,-68.502588],[34.908495,-68.659271],[35.300202,-69.012014],[36.16201,-69.247142],[37.200035,-69.168748],[37.905108,-69.52144],[38.649404,-69.776205],[39.667894,-69.541077],[40.020431,-69.109941],[40.921358,-68.933621],[41.959434,-68.600514],[42.938702,-68.463313],[44.113876,-68.267408],[44.897291,-68.051866],[45.719928,-67.816738],[46.503343,-67.601196],[47.44344,-67.718759],[48.344419,-67.366068],[48.990736,-67.091718],[49.930885,-67.111303],[50.753471,-66.876175],[50.949325,-66.523484],[51.791547,-66.249133],[52.614133,-66.053176],[53.613038,-65.89639],[54.53355,-65.818049],[55.414943,-65.876805],[56.355041,-65.974783],[57.158093,-66.249133],[57.255968,-66.680218],[58.137361,-67.013324],[58.744508,-67.287675],[59.939318,-67.405239],[60.605221,-67.679589],[61.427806,-67.953887],[62.387489,-68.012695],[63.19049,-67.816738],[64.052349,-67.405239],[64.992447,-67.620729],[65.971715,-67.738345],[66.911864,-67.855909],[67.891133,-67.934302],[68.890038,-67.934302],[69.712624,-68.972791],[69.673453,-69.227556],[69.555941,-69.678226],[68.596258,-69.93294],[67.81274,-70.305268],[67.949889,-70.697182],[69.066307,-70.677545],[68.929157,-71.069459],[68.419989,-71.441788],[67.949889,-71.853287],[68.71377,-72.166808],[69.869307,-72.264787],[71.024895,-72.088415],[71.573285,-71.696501],[71.906288,-71.324224],[72.454627,-71.010703],[73.08141,-70.716768],[73.33602,-70.364024],[73.864877,-69.874183],[74.491557,-69.776205],[75.62756,-69.737034],[76.626465,-69.619419],[77.644904,-69.462684],[78.134539,-69.07077],[78.428371,-68.698441],[79.113859,-68.326216],[80.093127,-68.071503],[80.93535,-67.875546],[81.483792,-67.542388],[82.051767,-67.366068],[82.776426,-67.209282],[83.775331,-67.30726],[84.676206,-67.209282],[85.655527,-67.091718],[86.752359,-67.150474],[87.477017,-66.876175],[87.986289,-66.209911],[88.358411,-66.484261],[88.828408,-66.954568],[89.67063,-67.150474],[90.630365,-67.228867],[91.5901,-67.111303],[92.608539,-67.189696],[93.548637,-67.209282],[94.17542,-67.111303],[95.017591,-67.170111],[95.781472,-67.385653],[96.682399,-67.248504],[97.759646,-67.248504],[98.68021,-67.111303],[99.718182,-67.248504],[100.384188,-66.915346],[100.893356,-66.58224],[101.578896,-66.30789],[102.832411,-65.563284],[103.478676,-65.700485],[104.242557,-65.974783],[104.90846,-66.327527],[106.181561,-66.934931],[107.160881,-66.954568],[108.081393,-66.954568],[109.15864,-66.837004],[110.235835,-66.699804],[111.058472,-66.425505],[111.74396,-66.13157],[112.860378,-66.092347],[113.604673,-65.876805],[114.388088,-66.072762],[114.897308,-66.386283],[115.602381,-66.699804],[116.699161,-66.660633],[117.384701,-66.915346],[118.57946,-67.170111],[119.832924,-67.268089],[120.871,-67.189696],[121.654415,-66.876175],[122.320369,-66.562654],[123.221296,-66.484261],[124.122274,-66.621462],[125.160247,-66.719389],[126.100396,-66.562654],[127.001427,-66.562654],[127.882768,-66.660633],[128.80328,-66.758611],[129.704259,-66.58224],[130.781454,-66.425505],[131.799945,-66.386283],[132.935896,-66.386283],[133.85646,-66.288304],[134.757387,-66.209963],[135.031582,-65.72007],[135.070753,-65.308571],[135.697485,-65.582869],[135.873805,-66.033591],[136.206705,-66.44509],[136.618049,-66.778197],[137.460271,-66.954568],[138.596223,-66.895761],[139.908442,-66.876175],[140.809421,-66.817367],[142.121692,-66.817367],[143.061842,-66.797782],[144.374061,-66.837004],[145.490427,-66.915346],[146.195552,-67.228867],[145.999699,-67.601196],[146.646067,-67.895131],[147.723263,-68.130259],[148.839629,-68.385024],[150.132314,-68.561292],[151.483705,-68.71813],[152.502247,-68.874813],[153.638199,-68.894502],[154.284567,-68.561292],[155.165857,-68.835642],[155.92979,-69.149215],[156.811132,-69.384291],[158.025528,-69.482269],[159.181013,-69.599833],[159.670699,-69.991747],[160.80665,-70.226875],[161.570479,-70.579618],[162.686897,-70.736353],[163.842434,-70.716768],[164.919681,-70.775524],[166.11444,-70.755938],[167.309095,-70.834332],[168.425616,-70.971481],[169.463589,-71.20666],[170.501665,-71.402617],[171.20679,-71.696501],[171.089227,-72.088415],[170.560422,-72.441159],[170.109958,-72.891829],[169.75737,-73.24452],[169.287321,-73.65602],[167.975101,-73.812806],[167.387489,-74.165498],[166.094803,-74.38104],[165.644391,-74.772954],[164.958851,-75.145283],[164.234193,-75.458804],[163.822797,-75.870303],[163.568239,-76.24258],[163.47026,-76.693302],[163.489897,-77.065579],[164.057873,-77.457442],[164.273363,-77.82977],[164.743464,-78.182514],[166.604126,-78.319611],[166.995781,-78.750748],[165.193876,-78.907483],[163.666217,-79.123025],[161.766385,-79.162248],[160.924162,-79.730482],[160.747894,-80.200737],[160.316964,-80.573066],[159.788211,-80.945395],[161.120016,-81.278501],[161.629287,-81.690001],[162.490992,-82.062278],[163.705336,-82.395435],[165.095949,-82.708956],[166.604126,-83.022477],[168.895665,-83.335998],[169.404782,-83.825891],[172.283934,-84.041433],[172.477049,-84.117914],[173.224083,-84.41371],[175.985672,-84.158997],[178.277212,-84.472518],[180,-84.71338],[-179.942499,-84.721443],[-179.058677,-84.139412],[-177.256772,-84.452933],[-177.140807,-84.417941],[-176.084673,-84.099259],[-175.947235,-84.110449],[-175.829882,-84.117914],[-174.382503,-84.534323],[-173.116559,-84.117914],[-172.889106,-84.061019],[-169.951223,-83.884647],[-168.999989,-84.117914],[-168.530199,-84.23739],[-167.022099,-84.570497],[-164.182144,-84.82521],[-161.929775,-85.138731],[-158.07138,-85.37391],[-155.192253,-85.09956],[-150.942099,-85.295517],[-148.533073,-85.609038],[-145.888918,-85.315102],[-143.107718,-85.040752],[-142.892279,-84.570497],[-146.829068,-84.531274],[-150.060732,-84.296146],[-150.902928,-83.904232],[-153.586201,-83.68869],[-153.409907,-83.23802],[-153.037759,-82.82652],[-152.665637,-82.454192],[-152.861517,-82.042692],[-154.526299,-81.768394],[-155.29018,-81.41565],[-156.83745,-81.102129],[-154.408787,-81.160937],[-152.097662,-81.004151],[-150.648293,-81.337309],[-148.865998,-81.043373],[-147.22075,-80.671045],[-146.417749,-80.337938],[-146.770286,-79.926439],[-148.062947,-79.652089],[-149.531901,-79.358205],[-151.588416,-79.299397],[-153.390322,-79.162248],[-155.329376,-79.064269],[-155.975668,-78.69194],[-157.268302,-78.378419],[-158.051768,-78.025676],[-158.365134,-76.889207],[-157.875474,-76.987238],[-156.974573,-77.300759],[-155.329376,-77.202728],[-153.742832,-77.065579],[-152.920247,-77.496664],[-151.33378,-77.398737],[-150.00195,-77.183143],[-148.748486,-76.908845],[-147.612483,-76.575738],[-146.104409,-76.47776],[-146.143528,-76.105431],[-146.496091,-75.733154],[-146.20231,-75.380411],[-144.909624,-75.204039],[-144.322037,-75.537197],[-142.794353,-75.34124],[-141.638764,-75.086475],[-140.209007,-75.06689],[-138.85759,-74.968911],[-137.5062,-74.733783],[-136.428901,-74.518241],[-135.214583,-74.302699],[-134.431194,-74.361455],[-133.745654,-74.439848],[-132.257168,-74.302699],[-130.925311,-74.479019],[-129.554284,-74.459433],[-128.242038,-74.322284],[-126.890622,-74.420263],[-125.402082,-74.518241],[-124.011496,-74.479019],[-122.562152,-74.498604],[-121.073613,-74.518241],[-119.70256,-74.479019],[-118.684145,-74.185083],[-117.469801,-74.028348],[-116.216312,-74.243891],[-115.021552,-74.067519],[-113.944331,-73.714828],[-113.297988,-74.028348],[-112.945452,-74.38104],[-112.299083,-74.714198],[-111.261059,-74.420263],[-110.066325,-74.79254],[-108.714909,-74.910103],[-107.559346,-75.184454],[-106.149148,-75.125698],[-104.876074,-74.949326],[-103.367949,-74.988497],[-102.016507,-75.125698],[-100.645531,-75.302018],[-100.1167,-74.870933],[-100.763043,-74.537826],[-101.252703,-74.185083],[-102.545337,-74.106742],[-103.113313,-73.734413],[-103.328752,-73.362084],[-103.681289,-72.61753],[-102.917485,-72.754679],[-101.60524,-72.813436],[-100.312528,-72.754679],[-99.13738,-72.911414],[-98.118889,-73.20535],[-97.688037,-73.558041],[-96.336595,-73.616849],[-95.043961,-73.4797],[-93.672907,-73.283743],[-92.439003,-73.166179],[-91.420564,-73.401307],[-90.088733,-73.322914],[-89.226951,-72.558722],[-88.423951,-73.009393],[-87.268337,-73.185764],[-86.014822,-73.087786],[-85.192236,-73.4797],[-83.879991,-73.518871],[-82.665646,-73.636434],[-81.470913,-73.851977],[-80.687447,-73.4797],[-80.295791,-73.126956],[-79.296886,-73.518871],[-77.925858,-73.420892],[-76.907367,-73.636434],[-76.221879,-73.969541],[-74.890049,-73.871614],[-73.852024,-73.65602],[-72.833533,-73.401307],[-71.619215,-73.264157],[-70.209042,-73.146542],[-68.935916,-73.009393],[-67.956622,-72.79385],[-67.369061,-72.480329],[-67.134036,-72.049244],[-67.251548,-71.637745],[-67.56494,-71.245831],[-67.917477,-70.853917],[-68.230843,-70.462055],[-68.485452,-70.109311],[-68.544209,-69.717397],[-68.446282,-69.325535],[-67.976233,-68.953206],[-67.5845,-68.541707],[-67.427843,-68.149844],[-67.62367,-67.718759],[-67.741183,-67.326845],[-67.251548,-66.876175],[-66.703184,-66.58224],[-66.056815,-66.209963],[-65.371327,-65.89639],[-64.568276,-65.602506],[-64.176542,-65.171423],[-63.628152,-64.897073],[-63.001394,-64.642308],[-62.041686,-64.583552],[-61.414928,-64.270031],[-60.709855,-64.074074],[-59.887269,-63.95651],[-59.162585,-63.701745],[-58.594557,-63.388224],[-57.811143,-63.27066],[-57.223582,-63.525425],[-57.59573,-63.858532],[-58.614143,-64.152467]]]]},"id":"ATA"},
-{"type":"Feature","properties":{"name":"French Southern and Antarctic Lands"},"geometry":{"type":"Polygon","coordinates":[[[68.935,-48.625],[69.58,-48.94],[70.525,-49.065],[70.56,-49.255],[70.28,-49.71],[68.745,-49.775],[68.72,-49.2425],[68.8675,-48.83],[68.935,-48.625]]]},"id":"ATF"},
-{"type":"Feature","properties":{"name":"Australia"},"geometry":{"type":"MultiPolygon","coordinates":[[[[145.397978,-40.792549],[146.364121,-41.137695],[146.908584,-41.000546],[147.689259,-40.808258],[148.289068,-40.875438],[148.359865,-42.062445],[148.017301,-42.407024],[147.914052,-43.211522],[147.564564,-42.937689],[146.870343,-43.634597],[146.663327,-43.580854],[146.048378,-43.549745],[145.43193,-42.693776],[145.29509,-42.03361],[144.718071,-41.162552],[144.743755,-40.703975],[145.397978,-40.792549]]],[[[143.561811,-13.763656],[143.922099,-14.548311],[144.563714,-14.171176],[144.894908,-14.594458],[145.374724,-14.984976],[145.271991,-15.428205],[145.48526,-16.285672],[145.637033,-16.784918],[145.888904,-16.906926],[146.160309,-17.761655],[146.063674,-18.280073],[146.387478,-18.958274],[147.471082,-19.480723],[148.177602,-19.955939],[148.848414,-20.39121],[148.717465,-20.633469],[149.28942,-21.260511],[149.678337,-22.342512],[150.077382,-22.122784],[150.482939,-22.556142],[150.727265,-22.402405],[150.899554,-23.462237],[151.609175,-24.076256],[152.07354,-24.457887],[152.855197,-25.267501],[153.136162,-26.071173],[153.161949,-26.641319],[153.092909,-27.2603],[153.569469,-28.110067],[153.512108,-28.995077],[153.339095,-29.458202],[153.069241,-30.35024],[153.089602,-30.923642],[152.891578,-31.640446],[152.450002,-32.550003],[151.709117,-33.041342],[151.343972,-33.816023],[151.010555,-34.31036],[150.714139,-35.17346],[150.32822,-35.671879],[150.075212,-36.420206],[149.946124,-37.109052],[149.997284,-37.425261],[149.423882,-37.772681],[148.304622,-37.809061],[147.381733,-38.219217],[146.922123,-38.606532],[146.317922,-39.035757],[145.489652,-38.593768],[144.876976,-38.417448],[145.032212,-37.896188],[144.485682,-38.085324],[143.609974,-38.809465],[142.745427,-38.538268],[142.17833,-38.380034],[141.606582,-38.308514],[140.638579,-38.019333],[139.992158,-37.402936],[139.806588,-36.643603],[139.574148,-36.138362],[139.082808,-35.732754],[138.120748,-35.612296],[138.449462,-35.127261],[138.207564,-34.384723],[137.71917,-35.076825],[136.829406,-35.260535],[137.352371,-34.707339],[137.503886,-34.130268],[137.890116,-33.640479],[137.810328,-32.900007],[136.996837,-33.752771],[136.372069,-34.094766],[135.989043,-34.890118],[135.208213,-34.47867],[135.239218,-33.947953],[134.613417,-33.222778],[134.085904,-32.848072],[134.273903,-32.617234],[132.990777,-32.011224],[132.288081,-31.982647],[131.326331,-31.495803],[129.535794,-31.590423],[128.240938,-31.948489],[127.102867,-32.282267],[126.148714,-32.215966],[125.088623,-32.728751],[124.221648,-32.959487],[124.028947,-33.483847],[123.659667,-33.890179],[122.811036,-33.914467],[122.183064,-34.003402],[121.299191,-33.821036],[120.580268,-33.930177],[119.893695,-33.976065],[119.298899,-34.509366],[119.007341,-34.464149],[118.505718,-34.746819],[118.024972,-35.064733],[117.295507,-35.025459],[116.625109,-35.025097],[115.564347,-34.386428],[115.026809,-34.196517],[115.048616,-33.623425],[115.545123,-33.487258],[115.714674,-33.259572],[115.679379,-32.900369],[115.801645,-32.205062],[115.689611,-31.612437],[115.160909,-30.601594],[114.997043,-30.030725],[115.040038,-29.461095],[114.641974,-28.810231],[114.616498,-28.516399],[114.173579,-28.118077],[114.048884,-27.334765],[113.477498,-26.543134],[113.338953,-26.116545],[113.778358,-26.549025],[113.440962,-25.621278],[113.936901,-25.911235],[114.232852,-26.298446],[114.216161,-25.786281],[113.721255,-24.998939],[113.625344,-24.683971],[113.393523,-24.384764],[113.502044,-23.80635],[113.706993,-23.560215],[113.843418,-23.059987],[113.736552,-22.475475],[114.149756,-21.755881],[114.225307,-22.517488],[114.647762,-21.82952],[115.460167,-21.495173],[115.947373,-21.068688],[116.711615,-20.701682],[117.166316,-20.623599],[117.441545,-20.746899],[118.229559,-20.374208],[118.836085,-20.263311],[118.987807,-20.044203],[119.252494,-19.952942],[119.805225,-19.976506],[120.85622,-19.683708],[121.399856,-19.239756],[121.655138,-18.705318],[122.241665,-18.197649],[122.286624,-17.798603],[122.312772,-17.254967],[123.012574,-16.4052],[123.433789,-17.268558],[123.859345,-17.069035],[123.503242,-16.596506],[123.817073,-16.111316],[124.258287,-16.327944],[124.379726,-15.56706],[124.926153,-15.0751],[125.167275,-14.680396],[125.670087,-14.51007],[125.685796,-14.230656],[126.125149,-14.347341],[126.142823,-14.095987],[126.582589,-13.952791],[127.065867,-13.817968],[127.804633,-14.276906],[128.35969,-14.86917],[128.985543,-14.875991],[129.621473,-14.969784],[129.4096,-14.42067],[129.888641,-13.618703],[130.339466,-13.357376],[130.183506,-13.10752],[130.617795,-12.536392],[131.223495,-12.183649],[131.735091,-12.302453],[132.575298,-12.114041],[132.557212,-11.603012],[131.824698,-11.273782],[132.357224,-11.128519],[133.019561,-11.376411],[133.550846,-11.786515],[134.393068,-12.042365],[134.678632,-11.941183],[135.298491,-12.248606],[135.882693,-11.962267],[136.258381,-12.049342],[136.492475,-11.857209],[136.95162,-12.351959],[136.685125,-12.887223],[136.305407,-13.29123],[135.961758,-13.324509],[136.077617,-13.724278],[135.783836,-14.223989],[135.428664,-14.715432],[135.500184,-14.997741],[136.295175,-15.550265],[137.06536,-15.870762],[137.580471,-16.215082],[138.303217,-16.807604],[138.585164,-16.806622],[139.108543,-17.062679],[139.260575,-17.371601],[140.215245,-17.710805],[140.875463,-17.369069],[141.07111,-16.832047],[141.274095,-16.38887],[141.398222,-15.840532],[141.702183,-15.044921],[141.56338,-14.561333],[141.63552,-14.270395],[141.519869,-13.698078],[141.65092,-12.944688],[141.842691,-12.741548],[141.68699,-12.407614],[141.928629,-11.877466],[142.118488,-11.328042],[142.143706,-11.042737],[142.51526,-10.668186],[142.79731,-11.157355],[142.866763,-11.784707],[143.115947,-11.90563],[143.158632,-12.325656],[143.522124,-12.834358],[143.597158,-13.400422],[143.561811,-13.763656]]]]},"id":"AUS"},
-{"type":"Feature","properties":{"name":"Austria"},"geometry":{"type":"Polygon","coordinates":[[[16.979667,48.123497],[16.903754,47.714866],[16.340584,47.712902],[16.534268,47.496171],[16.202298,46.852386],[16.011664,46.683611],[15.137092,46.658703],[14.632472,46.431817],[13.806475,46.509306],[12.376485,46.767559],[12.153088,47.115393],[11.164828,46.941579],[11.048556,46.751359],[10.442701,46.893546],[9.932448,46.920728],[9.47997,47.10281],[9.632932,47.347601],[9.594226,47.525058],[9.896068,47.580197],[10.402084,47.302488],[10.544504,47.566399],[11.426414,47.523766],[12.141357,47.703083],[12.62076,47.672388],[12.932627,47.467646],[13.025851,47.637584],[12.884103,48.289146],[13.243357,48.416115],[13.595946,48.877172],[14.338898,48.555305],[14.901447,48.964402],[15.253416,49.039074],[16.029647,48.733899],[16.499283,48.785808],[16.960288,48.596982],[16.879983,48.470013],[16.979667,48.123497]]]},"id":"AUT"},
-{"type":"Feature","properties":{"name":"Azerbaijan"},"geometry":{"type":"MultiPolygon","coordinates":[[[[45.001987,39.740004],[45.298145,39.471751],[45.739978,39.473999],[45.735379,39.319719],[46.143623,38.741201],[45.457722,38.874139],[44.952688,39.335765],[44.79399,39.713003],[45.001987,39.740004]]],[[[47.373315,41.219732],[47.815666,41.151416],[47.987283,41.405819],[48.584353,41.80887],[49.110264,41.282287],[49.618915,40.572924],[50.08483,40.526157],[50.392821,40.256561],[49.569202,40.176101],[49.395259,39.399482],[49.223228,39.049219],[48.856532,38.815486],[48.883249,38.320245],[48.634375,38.270378],[48.010744,38.794015],[48.355529,39.288765],[48.060095,39.582235],[47.685079,39.508364],[46.50572,38.770605],[46.483499,39.464155],[46.034534,39.628021],[45.610012,39.899994],[45.891907,40.218476],[45.359175,40.561504],[45.560351,40.81229],[45.179496,40.985354],[44.97248,41.248129],[45.217426,41.411452],[45.962601,41.123873],[46.501637,41.064445],[46.637908,41.181673],[46.145432,41.722802],[46.404951,41.860675],[46.686071,41.827137],[47.373315,41.219732]]]]},"id":"AZE"},
-{"type":"Feature","properties":{"name":"Burundi"},"geometry":{"type":"Polygon","coordinates":[[[29.339998,-4.499983],[29.276384,-3.293907],[29.024926,-2.839258],[29.632176,-2.917858],[29.938359,-2.348487],[30.469696,-2.413858],[30.527677,-2.807632],[30.743013,-3.034285],[30.752263,-3.35933],[30.50556,-3.568567],[30.116333,-4.090138],[29.753512,-4.452389],[29.339998,-4.499983]]]},"id":"BDI"},
-{"type":"Feature","properties":{"name":"Belgium"},"geometry":{"type":"Polygon","coordinates":[[[3.314971,51.345781],[4.047071,51.267259],[4.973991,51.475024],[5.606976,51.037298],[6.156658,50.803721],[6.043073,50.128052],[5.782417,50.090328],[5.674052,49.529484],[4.799222,49.985373],[4.286023,49.907497],[3.588184,50.378992],[3.123252,50.780363],[2.658422,50.796848],[2.513573,51.148506],[3.314971,51.345781]]]},"id":"BEL"},
-{"type":"Feature","properties":{"name":"Benin"},"geometry":{"type":"Polygon","coordinates":[[[2.691702,6.258817],[1.865241,6.142158],[1.618951,6.832038],[1.664478,9.12859],[1.463043,9.334624],[1.425061,9.825395],[1.077795,10.175607],[0.772336,10.470808],[0.899563,10.997339],[1.24347,11.110511],[1.447178,11.547719],[1.935986,11.64115],[2.154474,11.94015],[2.490164,12.233052],[2.848643,12.235636],[3.61118,11.660167],[3.572216,11.327939],[3.797112,10.734746],[3.60007,10.332186],[3.705438,10.06321],[3.220352,9.444153],[2.912308,9.137608],[2.723793,8.506845],[2.749063,7.870734],[2.691702,6.258817]]]},"id":"BEN"},
-{"type":"Feature","properties":{"name":"Burkina Faso"},"geometry":{"type":"Polygon","coordinates":[[[-2.827496,9.642461],[-3.511899,9.900326],[-3.980449,9.862344],[-4.330247,9.610835],[-4.779884,9.821985],[-4.954653,10.152714],[-5.404342,10.370737],[-5.470565,10.95127],[-5.197843,11.375146],[-5.220942,11.713859],[-4.427166,12.542646],[-4.280405,13.228444],[-4.006391,13.472485],[-3.522803,13.337662],[-3.103707,13.541267],[-2.967694,13.79815],[-2.191825,14.246418],[-2.001035,14.559008],[-1.066363,14.973815],[-0.515854,15.116158],[-0.266257,14.924309],[0.374892,14.928908],[0.295646,14.444235],[0.429928,13.988733],[0.993046,13.33575],[1.024103,12.851826],[2.177108,12.625018],[2.154474,11.94015],[1.935986,11.64115],[1.447178,11.547719],[1.24347,11.110511],[0.899563,10.997339],[0.023803,11.018682],[-0.438702,11.098341],[-0.761576,10.93693],[-1.203358,11.009819],[-2.940409,10.96269],[-2.963896,10.395335],[-2.827496,9.642461]]]},"id":"BFA"},
-{"type":"Feature","properties":{"name":"Bangladesh"},"geometry":{"type":"Polygon","coordinates":[[[92.672721,22.041239],[92.652257,21.324048],[92.303234,21.475485],[92.368554,20.670883],[92.082886,21.192195],[92.025215,21.70157],[91.834891,22.182936],[91.417087,22.765019],[90.496006,22.805017],[90.586957,22.392794],[90.272971,21.836368],[89.847467,22.039146],[89.70205,21.857116],[89.418863,21.966179],[89.031961,22.055708],[88.876312,22.879146],[88.52977,23.631142],[88.69994,24.233715],[88.084422,24.501657],[88.306373,24.866079],[88.931554,25.238692],[88.209789,25.768066],[88.563049,26.446526],[89.355094,26.014407],[89.832481,25.965082],[89.920693,25.26975],[90.872211,25.132601],[91.799596,25.147432],[92.376202,24.976693],[91.915093,24.130414],[91.46773,24.072639],[91.158963,23.503527],[91.706475,22.985264],[91.869928,23.624346],[92.146035,23.627499],[92.672721,22.041239]]]},"id":"BGD"},
-{"type":"Feature","properties":{"name":"Bulgaria"},"geometry":{"type":"Polygon","coordinates":[[[22.65715,44.234923],[22.944832,43.823785],[23.332302,43.897011],[24.100679,43.741051],[25.569272,43.688445],[26.065159,43.943494],[27.2424,44.175986],[27.970107,43.812468],[28.558081,43.707462],[28.039095,43.293172],[27.673898,42.577892],[27.99672,42.007359],[27.135739,42.141485],[26.117042,41.826905],[26.106138,41.328899],[25.197201,41.234486],[24.492645,41.583896],[23.692074,41.309081],[22.952377,41.337994],[22.881374,41.999297],[22.380526,42.32026],[22.545012,42.461362],[22.436595,42.580321],[22.604801,42.898519],[22.986019,43.211161],[22.500157,43.642814],[22.410446,44.008063],[22.65715,44.234923]]]},"id":"BGR"},
-{"type":"Feature","properties":{"name":"The Bahamas"},"geometry":{"type":"MultiPolygon","coordinates":[[[[-77.53466,23.75975],[-77.78,23.71],[-78.03405,24.28615],[-78.40848,24.57564],[-78.19087,25.2103],[-77.89,25.17],[-77.54,24.34],[-77.53466,23.75975]]],[[[-77.82,26.58],[-78.91,26.42],[-78.98,26.79],[-78.51,26.87],[-77.85,26.84],[-77.82,26.58]]],[[[-77,26.59],[-77.17255,25.87918],[-77.35641,26.00735],[-77.34,26.53],[-77.78802,26.92516],[-77.79,27.04],[-77,26.59]]]]},"id":"BHS"},
-{"type":"Feature","properties":{"name":"Bosnia and Herzegovina"},"geometry":{"type":"Polygon","coordinates":[[[19.005486,44.860234],[19.36803,44.863],[19.11761,44.42307],[19.59976,44.03847],[19.454,43.5681],[19.21852,43.52384],[19.03165,43.43253],[18.70648,43.20011],[18.56,42.65],[17.674922,43.028563],[17.297373,43.446341],[16.916156,43.667722],[16.456443,44.04124],[16.23966,44.351143],[15.750026,44.818712],[15.959367,45.233777],[16.318157,45.004127],[16.534939,45.211608],[17.002146,45.233777],[17.861783,45.06774],[18.553214,45.08159],[19.005486,44.860234]]]},"id":"BIH"},
-{"type":"Feature","properties":{"name":"Belarus"},"geometry":{"type":"Polygon","coordinates":[[[23.484128,53.912498],[24.450684,53.905702],[25.536354,54.282423],[25.768433,54.846963],[26.588279,55.167176],[26.494331,55.615107],[27.10246,55.783314],[28.176709,56.16913],[29.229513,55.918344],[29.371572,55.670091],[29.896294,55.789463],[30.873909,55.550976],[30.971836,55.081548],[30.757534,54.811771],[31.384472,54.157056],[31.791424,53.974639],[31.731273,53.794029],[32.405599,53.618045],[32.693643,53.351421],[32.304519,53.132726],[31.497644,53.167427],[31.305201,53.073996],[31.540018,52.742052],[31.785998,52.101678],[30.927549,52.042353],[30.619454,51.822806],[30.555117,51.319503],[30.157364,51.416138],[29.254938,51.368234],[28.992835,51.602044],[28.617613,51.427714],[28.241615,51.572227],[27.454066,51.592303],[26.337959,51.832289],[25.327788,51.910656],[24.553106,51.888461],[24.005078,51.617444],[23.527071,51.578454],[23.508002,52.023647],[23.199494,52.486977],[23.799199,52.691099],[23.804935,53.089731],[23.527536,53.470122],[23.484128,53.912498]]]},"id":"BLR"},
-{"type":"Feature","properties":{"name":"Belize"},"geometry":{"type":"Polygon","coordinates":[[[-89.14308,17.808319],[-89.150909,17.955468],[-89.029857,18.001511],[-88.848344,17.883198],[-88.490123,18.486831],[-88.300031,18.499982],[-88.296336,18.353273],[-88.106813,18.348674],[-88.123479,18.076675],[-88.285355,17.644143],[-88.197867,17.489475],[-88.302641,17.131694],[-88.239518,17.036066],[-88.355428,16.530774],[-88.551825,16.265467],[-88.732434,16.233635],[-88.930613,15.887273],[-89.229122,15.886938],[-89.150806,17.015577],[-89.14308,17.808319]]]},"id":"BLZ"},
-{"type":"Feature","properties":{"name":"Bolivia"},"geometry":{"type":"Polygon","coordinates":[[[-62.846468,-22.034985],[-63.986838,-21.993644],[-64.377021,-22.798091],[-64.964892,-22.075862],[-66.273339,-21.83231],[-67.106674,-22.735925],[-67.82818,-22.872919],[-68.219913,-21.494347],[-68.757167,-20.372658],[-68.442225,-19.405068],[-68.966818,-18.981683],[-69.100247,-18.260125],[-69.590424,-17.580012],[-68.959635,-16.500698],[-69.389764,-15.660129],[-69.160347,-15.323974],[-69.339535,-14.953195],[-68.948887,-14.453639],[-68.929224,-13.602684],[-68.88008,-12.899729],[-68.66508,-12.5613],[-69.529678,-10.951734],[-68.786158,-11.03638],[-68.271254,-11.014521],[-68.048192,-10.712059],[-67.173801,-10.306812],[-66.646908,-9.931331],[-65.338435,-9.761988],[-65.444837,-10.511451],[-65.321899,-10.895872],[-65.402281,-11.56627],[-64.316353,-12.461978],[-63.196499,-12.627033],[-62.80306,-13.000653],[-62.127081,-13.198781],[-61.713204,-13.489202],[-61.084121,-13.479384],[-60.503304,-13.775955],[-60.459198,-14.354007],[-60.264326,-14.645979],[-60.251149,-15.077219],[-60.542966,-15.09391],[-60.15839,-16.258284],[-58.24122,-16.299573],[-58.388058,-16.877109],[-58.280804,-17.27171],[-57.734558,-17.552468],[-57.498371,-18.174188],[-57.676009,-18.96184],[-57.949997,-19.400004],[-57.853802,-19.969995],[-58.166392,-20.176701],[-58.183471,-19.868399],[-59.115042,-19.356906],[-60.043565,-19.342747],[-61.786326,-19.633737],[-62.265961,-20.513735],[-62.291179,-21.051635],[-62.685057,-22.249029],[-62.846468,-22.034985]]]},"id":"BOL"},
-{"type":"Feature","properties":{"name":"Brazil"},"geometry":{"type":"Polygon","coordinates":[[[-57.625133,-30.216295],[-56.2909,-28.852761],[-55.162286,-27.881915],[-54.490725,-27.474757],[-53.648735,-26.923473],[-53.628349,-26.124865],[-54.13005,-25.547639],[-54.625291,-25.739255],[-54.428946,-25.162185],[-54.293476,-24.5708],[-54.29296,-24.021014],[-54.652834,-23.839578],[-55.027902,-24.001274],[-55.400747,-23.956935],[-55.517639,-23.571998],[-55.610683,-22.655619],[-55.797958,-22.35693],[-56.473317,-22.0863],[-56.88151,-22.282154],[-57.937156,-22.090176],[-57.870674,-20.732688],[-58.166392,-20.176701],[-57.853802,-19.969995],[-57.949997,-19.400004],[-57.676009,-18.96184],[-57.498371,-18.174188],[-57.734558,-17.552468],[-58.280804,-17.27171],[-58.388058,-16.877109],[-58.24122,-16.299573],[-60.15839,-16.258284],[-60.542966,-15.09391],[-60.251149,-15.077219],[-60.264326,-14.645979],[-60.459198,-14.354007],[-60.503304,-13.775955],[-61.084121,-13.479384],[-61.713204,-13.489202],[-62.127081,-13.198781],[-62.80306,-13.000653],[-63.196499,-12.627033],[-64.316353,-12.461978],[-65.402281,-11.56627],[-65.321899,-10.895872],[-65.444837,-10.511451],[-65.338435,-9.761988],[-66.646908,-9.931331],[-67.173801,-10.306812],[-68.048192,-10.712059],[-68.271254,-11.014521],[-68.786158,-11.03638],[-69.529678,-10.951734],[-70.093752,-11.123972],[-70.548686,-11.009147],[-70.481894,-9.490118],[-71.302412,-10.079436],[-72.184891,-10.053598],[-72.563033,-9.520194],[-73.226713,-9.462213],[-73.015383,-9.032833],[-73.571059,-8.424447],[-73.987235,-7.52383],[-73.723401,-7.340999],[-73.724487,-6.918595],[-73.120027,-6.629931],[-73.219711,-6.089189],[-72.964507,-5.741251],[-72.891928,-5.274561],[-71.748406,-4.593983],[-70.928843,-4.401591],[-70.794769,-4.251265],[-69.893635,-4.298187],[-69.444102,-1.556287],[-69.420486,-1.122619],[-69.577065,-0.549992],[-70.020656,-0.185156],[-70.015566,0.541414],[-69.452396,0.706159],[-69.252434,0.602651],[-69.218638,0.985677],[-69.804597,1.089081],[-69.816973,1.714805],[-67.868565,1.692455],[-67.53781,2.037163],[-67.259998,1.719999],[-67.065048,1.130112],[-66.876326,1.253361],[-66.325765,0.724452],[-65.548267,0.789254],[-65.354713,1.095282],[-64.611012,1.328731],[-64.199306,1.492855],[-64.083085,1.916369],[-63.368788,2.2009],[-63.422867,2.411068],[-64.269999,2.497006],[-64.408828,3.126786],[-64.368494,3.79721],[-64.816064,4.056445],[-64.628659,4.148481],[-63.888343,4.02053],[-63.093198,3.770571],[-62.804533,4.006965],[-62.08543,4.162124],[-60.966893,4.536468],[-60.601179,4.918098],[-60.733574,5.200277],[-60.213683,5.244486],[-59.980959,5.014061],[-60.111002,4.574967],[-59.767406,4.423503],[-59.53804,3.958803],[-59.815413,3.606499],[-59.974525,2.755233],[-59.718546,2.24963],[-59.646044,1.786894],[-59.030862,1.317698],[-58.540013,1.268088],[-58.429477,1.463942],[-58.11345,1.507195],[-57.660971,1.682585],[-57.335823,1.948538],[-56.782704,1.863711],[-56.539386,1.899523],[-55.995698,1.817667],[-55.9056,2.021996],[-56.073342,2.220795],[-55.973322,2.510364],[-55.569755,2.421506],[-55.097587,2.523748],[-54.524754,2.311849],[-54.088063,2.105557],[-53.778521,2.376703],[-53.554839,2.334897],[-53.418465,2.053389],[-52.939657,2.124858],[-52.556425,2.504705],[-52.249338,3.241094],[-51.657797,4.156232],[-51.317146,4.203491],[-51.069771,3.650398],[-50.508875,1.901564],[-49.974076,1.736483],[-49.947101,1.04619],[-50.699251,0.222984],[-50.388211,-0.078445],[-48.620567,-0.235489],[-48.584497,-1.237805],[-47.824956,-0.581618],[-46.566584,-0.941028],[-44.905703,-1.55174],[-44.417619,-2.13775],[-44.581589,-2.691308],[-43.418791,-2.38311],[-41.472657,-2.912018],[-39.978665,-2.873054],[-38.500383,-3.700652],[-37.223252,-4.820946],[-36.452937,-5.109404],[-35.597796,-5.149504],[-35.235389,-5.464937],[-34.89603,-6.738193],[-34.729993,-7.343221],[-35.128212,-8.996401],[-35.636967,-9.649282],[-37.046519,-11.040721],[-37.683612,-12.171195],[-38.423877,-13.038119],[-38.673887,-13.057652],[-38.953276,-13.79337],[-38.882298,-15.667054],[-39.161092,-17.208407],[-39.267339,-17.867746],[-39.583521,-18.262296],[-39.760823,-19.599113],[-40.774741,-20.904512],[-40.944756,-21.937317],[-41.754164,-22.370676],[-41.988284,-22.97007],[-43.074704,-22.967693],[-44.647812,-23.351959],[-45.352136,-23.796842],[-46.472093,-24.088969],[-47.648972,-24.885199],[-48.495458,-25.877025],[-48.641005,-26.623698],[-48.474736,-27.175912],[-48.66152,-28.186135],[-48.888457,-28.674115],[-49.587329,-29.224469],[-50.696874,-30.984465],[-51.576226,-31.777698],[-52.256081,-32.24537],[-52.7121,-33.196578],[-53.373662,-33.768378],[-53.650544,-33.202004],[-53.209589,-32.727666],[-53.787952,-32.047243],[-54.572452,-31.494511],[-55.60151,-30.853879],[-55.973245,-30.883076],[-56.976026,-30.109686],[-57.625133,-30.216295]]]},"id":"BRA"},
-{"type":"Feature","properties":{"name":"Brunei"},"geometry":{"type":"Polygon","coordinates":[[[114.204017,4.525874],[114.599961,4.900011],[115.45071,5.44773],[115.4057,4.955228],[115.347461,4.316636],[114.869557,4.348314],[114.659596,4.007637],[114.204017,4.525874]]]},"id":"BRN"},
-{"type":"Feature","properties":{"name":"Bhutan"},"geometry":{"type":"Polygon","coordinates":[[[91.696657,27.771742],[92.103712,27.452614],[92.033484,26.83831],[91.217513,26.808648],[90.373275,26.875724],[89.744528,26.719403],[88.835643,27.098966],[88.814248,27.299316],[89.47581,28.042759],[90.015829,28.296439],[90.730514,28.064954],[91.258854,28.040614],[91.696657,27.771742]]]},"id":"BTN"},
-{"type":"Feature","properties":{"name":"Botswana"},"geometry":{"type":"Polygon","coordinates":[[[25.649163,-18.536026],[25.850391,-18.714413],[26.164791,-19.293086],[27.296505,-20.39152],[27.724747,-20.499059],[27.727228,-20.851802],[28.02137,-21.485975],[28.794656,-21.639454],[29.432188,-22.091313],[28.017236,-22.827754],[27.11941,-23.574323],[26.786407,-24.240691],[26.485753,-24.616327],[25.941652,-24.696373],[25.765849,-25.174845],[25.664666,-25.486816],[25.025171,-25.71967],[24.211267,-25.670216],[23.73357,-25.390129],[23.312097,-25.26869],[22.824271,-25.500459],[22.579532,-25.979448],[22.105969,-26.280256],[21.605896,-26.726534],[20.889609,-26.828543],[20.66647,-26.477453],[20.758609,-25.868136],[20.165726,-24.917962],[19.895768,-24.76779],[19.895458,-21.849157],[20.881134,-21.814327],[20.910641,-18.252219],[21.65504,-18.219146],[23.196858,-17.869038],[23.579006,-18.281261],[24.217365,-17.889347],[24.520705,-17.887125],[25.084443,-17.661816],[25.264226,-17.73654],[25.649163,-18.536026]]]},"id":"BWA"},
-{"type":"Feature","properties":{"name":"Central African Republic"},"geometry":{"type":"Polygon","coordinates":[[[15.27946,7.421925],[16.106232,7.497088],[16.290562,7.754307],[16.456185,7.734774],[16.705988,7.508328],[17.96493,7.890914],[18.389555,8.281304],[18.911022,8.630895],[18.81201,8.982915],[19.094008,9.074847],[20.059685,9.012706],[21.000868,9.475985],[21.723822,10.567056],[22.231129,10.971889],[22.864165,11.142395],[22.977544,10.714463],[23.554304,10.089255],[23.55725,9.681218],[23.394779,9.265068],[23.459013,8.954286],[23.805813,8.666319],[24.567369,8.229188],[25.114932,7.825104],[25.124131,7.500085],[25.796648,6.979316],[26.213418,6.546603],[26.465909,5.946717],[27.213409,5.550953],[27.374226,5.233944],[27.044065,5.127853],[26.402761,5.150875],[25.650455,5.256088],[25.278798,5.170408],[25.128833,4.927245],[24.805029,4.897247],[24.410531,5.108784],[23.297214,4.609693],[22.84148,4.710126],[22.704124,4.633051],[22.405124,4.02916],[21.659123,4.224342],[20.927591,4.322786],[20.290679,4.691678],[19.467784,5.031528],[18.932312,4.709506],[18.542982,4.201785],[18.453065,3.504386],[17.8099,3.560196],[17.133042,3.728197],[16.537058,3.198255],[16.012852,2.26764],[15.907381,2.557389],[15.862732,3.013537],[15.405396,3.335301],[15.03622,3.851367],[14.950953,4.210389],[14.478372,4.732605],[14.558936,5.030598],[14.459407,5.451761],[14.53656,6.226959],[14.776545,6.408498],[15.27946,7.421925]]]},"id":"CAF"},
-{"type":"Feature","properties":{"name":"Canada"},"geometry":{"type":"MultiPolygon","coordinates":[[[[-63.6645,46.55001],[-62.9393,46.41587],[-62.01208,46.44314],[-62.50391,46.03339],[-62.87433,45.96818],[-64.1428,46.39265],[-64.39261,46.72747],[-64.01486,47.03601],[-63.6645,46.55001]]],[[[-61.806305,49.10506],[-62.29318,49.08717],[-63.58926,49.40069],[-64.51912,49.87304],[-64.17322,49.95718],[-62.85829,49.70641],[-61.835585,49.28855],[-61.806305,49.10506]]],[[[-123.510002,48.510011],[-124.012891,48.370846],[-125.655013,48.825005],[-125.954994,49.179996],[-126.850004,49.53],[-127.029993,49.814996],[-128.059336,49.994959],[-128.444584,50.539138],[-128.358414,50.770648],[-127.308581,50.552574],[-126.695001,50.400903],[-125.755007,50.295018],[-125.415002,49.950001],[-124.920768,49.475275],[-123.922509,49.062484],[-123.510002,48.510011]]],[[[-56.134036,50.68701],[-56.795882,49.812309],[-56.143105,50.150117],[-55.471492,49.935815],[-55.822401,49.587129],[-54.935143,49.313011],[-54.473775,49.556691],[-53.476549,49.249139],[-53.786014,48.516781],[-53.086134,48.687804],[-52.958648,48.157164],[-52.648099,47.535548],[-53.069158,46.655499],[-53.521456,46.618292],[-54.178936,46.807066],[-53.961869,47.625207],[-54.240482,47.752279],[-55.400773,46.884994],[-55.997481,46.91972],[-55.291219,47.389562],[-56.250799,47.632545],[-57.325229,47.572807],[-59.266015,47.603348],[-59.419494,47.899454],[-58.796586,48.251525],[-59.231625,48.523188],[-58.391805,49.125581],[-57.35869,50.718274],[-56.73865,51.287438],[-55.870977,51.632094],[-55.406974,51.588273],[-55.600218,51.317075],[-56.134036,50.68701]]],[[[-132.710008,54.040009],[-132.710009,54.040009],[-132.710008,54.040009],[-132.710008,54.040009],[-131.74999,54.120004],[-132.04948,52.984621],[-131.179043,52.180433],[-131.57783,52.182371],[-132.180428,52.639707],[-132.549992,53.100015],[-133.054611,53.411469],[-133.239664,53.85108],[-133.180004,54.169975],[-132.710008,54.040009]]],[[[-79.26582,62.158675],[-79.65752,61.63308],[-80.09956,61.7181],[-80.36215,62.01649],[-80.315395,62.085565],[-79.92939,62.3856],[-79.52002,62.36371],[-79.26582,62.158675]]],[[[-81.89825,62.7108],[-83.06857,62.15922],[-83.77462,62.18231],[-83.99367,62.4528],[-83.25048,62.91409],[-81.87699,62.90458],[-81.89825,62.7108]]],[[[-85.161308,65.657285],[-84.975764,65.217518],[-84.464012,65.371772],[-83.882626,65.109618],[-82.787577,64.766693],[-81.642014,64.455136],[-81.55344,63.979609],[-80.817361,64.057486],[-80.103451,63.725981],[-80.99102,63.411246],[-82.547178,63.651722],[-83.108798,64.101876],[-84.100417,63.569712],[-85.523405,63.052379],[-85.866769,63.637253],[-87.221983,63.541238],[-86.35276,64.035833],[-86.224886,64.822917],[-85.883848,65.738778],[-85.161308,65.657285]]],[[[-75.86588,67.14886],[-76.98687,67.09873],[-77.2364,67.58809],[-76.81166,68.14856],[-75.89521,68.28721],[-75.1145,68.01036],[-75.10333,67.58202],[-75.21597,67.44425],[-75.86588,67.14886]]],[[[-95.647681,69.10769],[-96.269521,68.75704],[-97.617401,69.06003],[-98.431801,68.9507],[-99.797401,69.40003],[-98.917401,69.71003],[-98.218261,70.14354],[-97.157401,69.86003],[-96.557401,69.68003],[-96.257401,69.49003],[-95.647681,69.10769]]],[[[-90.5471,69.49766],[-90.55151,68.47499],[-89.21515,69.25873],[-88.01966,68.61508],[-88.31749,67.87338],[-87.35017,67.19872],[-86.30607,67.92146],[-85.57664,68.78456],[-85.52197,69.88211],[-84.10081,69.80539],[-82.62258,69.65826],[-81.28043,69.16202],[-81.2202,68.66567],[-81.96436,68.13253],[-81.25928,67.59716],[-81.38653,67.11078],[-83.34456,66.41154],[-84.73542,66.2573],[-85.76943,66.55833],[-86.0676,66.05625],[-87.03143,65.21297],[-87.32324,64.77563],[-88.48296,64.09897],[-89.91444,64.03273],[-90.70398,63.61017],[-90.77004,62.96021],[-91.93342,62.83508],[-93.15698,62.02469],[-94.24153,60.89865],[-94.62931,60.11021],[-94.6846,58.94882],[-93.21502,58.78212],[-92.76462,57.84571],[-92.29703,57.08709],[-90.89769,57.28468],[-89.03953,56.85172],[-88.03978,56.47162],[-87.32421,55.99914],[-86.07121,55.72383],[-85.01181,55.3026],[-83.36055,55.24489],[-82.27285,55.14832],[-82.4362,54.28227],[-82.12502,53.27703],[-81.40075,52.15788],[-79.91289,51.20842],[-79.14301,51.53393],[-78.60191,52.56208],[-79.12421,54.14145],[-79.82958,54.66772],[-78.22874,55.13645],[-77.0956,55.83741],[-76.54137,56.53423],[-76.62319,57.20263],[-77.30226,58.05209],[-78.51688,58.80458],[-77.33676,59.85261],[-77.77272,60.75788],[-78.10687,62.31964],[-77.41067,62.55053],[-75.69621,62.2784],[-74.6682,62.18111],[-73.83988,62.4438],[-72.90853,62.10507],[-71.67708,61.52535],[-71.37369,61.13717],[-69.59042,61.06141],[-69.62033,60.22125],[-69.2879,58.95736],[-68.37455,58.80106],[-67.64976,58.21206],[-66.20178,58.76731],[-65.24517,59.87071],[-64.58352,60.33558],[-63.80475,59.4426],[-62.50236,58.16708],[-61.39655,56.96745],[-61.79866,56.33945],[-60.46853,55.77548],[-59.56962,55.20407],[-57.97508,54.94549],[-57.3332,54.6265],[-56.93689,53.78032],[-56.15811,53.64749],[-55.75632,53.27036],[-55.68338,52.14664],[-56.40916,51.7707],[-57.12691,51.41972],[-58.77482,51.0643],[-60.03309,50.24277],[-61.72366,50.08046],[-63.86251,50.29099],[-65.36331,50.2982],[-66.39905,50.22897],[-67.23631,49.51156],[-68.51114,49.06836],[-69.95362,47.74488],[-71.10458,46.82171],[-70.25522,46.98606],[-68.65,48.3],[-66.55243,49.1331],[-65.05626,49.23278],[-64.17099,48.74248],[-65.11545,48.07085],[-64.79854,46.99297],[-64.47219,46.23849],[-63.17329,45.73902],[-61.52072,45.88377],[-60.51815,47.00793],[-60.4486,46.28264],[-59.80287,45.9204],[-61.03988,45.26525],[-63.25471,44.67014],[-64.24656,44.26553],[-65.36406,43.54523],[-66.1234,43.61867],[-66.16173,44.46512],[-64.42549,45.29204],[-66.02605,45.25931],[-67.13741,45.13753],[-67.79134,45.70281],[-67.79046,47.06636],[-68.23444,47.35486],[-68.905,47.185],[-69.237216,47.447781],[-69.99997,46.69307],[-70.305,45.915],[-70.66,45.46],[-71.08482,45.30524],[-71.405,45.255],[-71.50506,45.0082],[-73.34783,45.00738],[-74.867,45.00048],[-75.31821,44.81645],[-76.375,44.09631],[-76.5,44.018459],[-76.820034,43.628784],[-77.737885,43.629056],[-78.72028,43.625089],[-79.171674,43.466339],[-79.01,43.27],[-78.92,42.965],[-78.939362,42.863611],[-80.247448,42.3662],[-81.277747,42.209026],[-82.439278,41.675105],[-82.690089,41.675105],[-83.02981,41.832796],[-83.142,41.975681],[-83.12,42.08],[-82.9,42.43],[-82.43,42.98],[-82.137642,43.571088],[-82.337763,44.44],[-82.550925,45.347517],[-83.592851,45.816894],[-83.469551,45.994686],[-83.616131,46.116927],[-83.890765,46.116927],[-84.091851,46.275419],[-84.14212,46.512226],[-84.3367,46.40877],[-84.6049,46.4396],[-84.543749,46.538684],[-84.779238,46.637102],[-84.87608,46.900083],[-85.652363,47.220219],[-86.461991,47.553338],[-87.439793,47.94],[-88.378114,48.302918],[-89.272917,48.019808],[-89.6,48.01],[-90.83,48.27],[-91.64,48.14],[-92.61,48.45],[-93.63087,48.60926],[-94.32914,48.67074],[-94.64,48.84],[-94.81758,49.38905],[-95.15609,49.38425],[-95.15907,49],[-97.22872,49.0007],[-100.65,49],[-104.04826,48.99986],[-107.05,49],[-110.05,49],[-113,49],[-116.04818,49],[-117.03121,49],[-120,49],[-122.84,49],[-122.97421,49.002538],[-124.91024,49.98456],[-125.62461,50.41656],[-127.43561,50.83061],[-127.99276,51.71583],[-127.85032,52.32961],[-129.12979,52.75538],[-129.30523,53.56159],[-130.51497,54.28757],[-130.53611,54.80278],[-129.98,55.285],[-130.00778,55.91583],[-131.70781,56.55212],[-132.73042,57.69289],[-133.35556,58.41028],[-134.27111,58.86111],[-134.945,59.27056],[-135.47583,59.78778],[-136.47972,59.46389],[-137.4525,58.905],[-138.34089,59.56211],[-139.039,60],[-140.013,60.27682],[-140.99778,60.30639],[-140.9925,66.00003],[-140.986,69.712],[-139.12052,69.47102],[-137.54636,68.99002],[-136.50358,68.89804],[-135.62576,69.31512],[-134.41464,69.62743],[-132.92925,69.50534],[-131.43136,69.94451],[-129.79471,70.19369],[-129.10773,69.77927],[-128.36156,70.01286],[-128.13817,70.48384],[-127.44712,70.37721],[-125.75632,69.48058],[-124.42483,70.1584],[-124.28968,69.39969],[-123.06108,69.56372],[-122.6835,69.85553],[-121.47226,69.79778],[-119.94288,69.37786],[-117.60268,69.01128],[-116.22643,68.84151],[-115.2469,68.90591],[-113.89794,68.3989],[-115.30489,67.90261],[-113.49727,67.68815],[-110.798,67.80612],[-109.94619,67.98104],[-108.8802,67.38144],[-107.79239,67.88736],[-108.81299,68.31164],[-108.16721,68.65392],[-106.95,68.7],[-106.15,68.8],[-105.34282,68.56122],[-104.33791,68.018],[-103.22115,68.09775],[-101.45433,67.64689],[-99.90195,67.80566],[-98.4432,67.78165],[-98.5586,68.40394],[-97.66948,68.57864],[-96.11991,68.23939],[-96.12588,67.29338],[-95.48943,68.0907],[-94.685,68.06383],[-94.23282,69.06903],[-95.30408,69.68571],[-96.47131,70.08976],[-96.39115,71.19482],[-95.2088,71.92053],[-93.88997,71.76015],[-92.87818,71.31869],[-91.51964,70.19129],[-92.40692,69.69997],[-90.5471,69.49766]]],[[[-114.16717,73.12145],[-114.66634,72.65277],[-112.44102,72.9554],[-111.05039,72.4504],[-109.92035,72.96113],[-109.00654,72.63335],[-108.18835,71.65089],[-107.68599,72.06548],[-108.39639,73.08953],[-107.51645,73.23598],[-106.52259,73.07601],[-105.40246,72.67259],[-104.77484,71.6984],[-104.46476,70.99297],[-102.78537,70.49776],[-100.98078,70.02432],[-101.08929,69.58447],[-102.73116,69.50402],[-102.09329,69.11962],[-102.43024,68.75282],[-104.24,68.91],[-105.96,69.18],[-107.12254,69.11922],[-109,68.78],[-111.534149,68.630059],[-113.3132,68.53554],[-113.85496,69.00744],[-115.22,69.28],[-116.10794,69.16821],[-117.34,69.96],[-116.67473,70.06655],[-115.13112,70.2373],[-113.72141,70.19237],[-112.4161,70.36638],[-114.35,70.6],[-116.48684,70.52045],[-117.9048,70.54056],[-118.43238,70.9092],[-116.11311,71.30918],[-117.65568,71.2952],[-119.40199,71.55859],[-118.56267,72.30785],[-117.86642,72.70594],[-115.18909,73.31459],[-114.16717,73.12145]]],[[[-104.5,73.42],[-105.38,72.76],[-106.94,73.46],[-106.6,73.6],[-105.26,73.64],[-104.5,73.42]]],[[[-76.34,73.102685],[-76.251404,72.826385],[-77.314438,72.855545],[-78.39167,72.876656],[-79.486252,72.742203],[-79.775833,72.802902],[-80.876099,73.333183],[-80.833885,73.693184],[-80.353058,73.75972],[-78.064438,73.651932],[-76.34,73.102685]]],[[[-86.562179,73.157447],[-85.774371,72.534126],[-84.850112,73.340278],[-82.31559,73.750951],[-80.600088,72.716544],[-80.748942,72.061907],[-78.770639,72.352173],[-77.824624,72.749617],[-75.605845,72.243678],[-74.228616,71.767144],[-74.099141,71.33084],[-72.242226,71.556925],[-71.200015,70.920013],[-68.786054,70.525024],[-67.91497,70.121948],[-66.969033,69.186087],[-68.805123,68.720198],[-66.449866,68.067163],[-64.862314,67.847539],[-63.424934,66.928473],[-61.851981,66.862121],[-62.163177,66.160251],[-63.918444,64.998669],[-65.14886,65.426033],[-66.721219,66.388041],[-68.015016,66.262726],[-68.141287,65.689789],[-67.089646,65.108455],[-65.73208,64.648406],[-65.320168,64.382737],[-64.669406,63.392927],[-65.013804,62.674185],[-66.275045,62.945099],[-68.783186,63.74567],[-67.369681,62.883966],[-66.328297,62.280075],[-66.165568,61.930897],[-68.877367,62.330149],[-71.023437,62.910708],[-72.235379,63.397836],[-71.886278,63.679989],[-73.378306,64.193963],[-74.834419,64.679076],[-74.818503,64.389093],[-77.70998,64.229542],[-78.555949,64.572906],[-77.897281,65.309192],[-76.018274,65.326969],[-73.959795,65.454765],[-74.293883,65.811771],[-73.944912,66.310578],[-72.651167,67.284576],[-72.92606,67.726926],[-73.311618,68.069437],[-74.843307,68.554627],[-76.869101,68.894736],[-76.228649,69.147769],[-77.28737,69.76954],[-78.168634,69.826488],[-78.957242,70.16688],[-79.492455,69.871808],[-81.305471,69.743185],[-84.944706,69.966634],[-87.060003,70.260001],[-88.681713,70.410741],[-89.51342,70.762038],[-88.467721,71.218186],[-89.888151,71.222552],[-90.20516,72.235074],[-89.436577,73.129464],[-88.408242,73.537889],[-85.826151,73.803816],[-86.562179,73.157447]]],[[[-100.35642,73.84389],[-99.16387,73.63339],[-97.38,73.76],[-97.12,73.47],[-98.05359,72.99052],[-96.54,72.56],[-96.72,71.66],[-98.35966,71.27285],[-99.32286,71.35639],[-100.01482,71.73827],[-102.5,72.51],[-102.48,72.83],[-100.43836,72.70588],[-101.54,73.36],[-100.35642,73.84389]]],[[[-93.196296,72.771992],[-94.269047,72.024596],[-95.409856,72.061881],[-96.033745,72.940277],[-96.018268,73.43743],[-95.495793,73.862417],[-94.503658,74.134907],[-92.420012,74.100025],[-90.509793,73.856732],[-92.003965,72.966244],[-93.196296,72.771992]]],[[[-120.46,71.383602],[-123.09219,70.90164],[-123.62,71.34],[-125.928949,71.868688],[-125.5,72.292261],[-124.80729,73.02256],[-123.94,73.68],[-124.91775,74.29275],[-121.53788,74.44893],[-120.10978,74.24135],[-117.55564,74.18577],[-116.58442,73.89607],[-115.51081,73.47519],[-116.76794,73.22292],[-119.22,72.52],[-120.46,71.82],[-120.46,71.383602]]],[[[-93.612756,74.979997],[-94.156909,74.592347],[-95.608681,74.666864],[-96.820932,74.927623],[-96.288587,75.377828],[-94.85082,75.647218],[-93.977747,75.29649],[-93.612756,74.979997]]],[[[-98.5,76.72],[-97.735585,76.25656],[-97.704415,75.74344],[-98.16,75],[-99.80874,74.89744],[-100.88366,75.05736],[-100.86292,75.64075],[-102.50209,75.5638],[-102.56552,76.3366],[-101.48973,76.30537],[-99.98349,76.64634],[-98.57699,76.58859],[-98.5,76.72]]],[[[-108.21141,76.20168],[-107.81943,75.84552],[-106.92893,76.01282],[-105.881,75.9694],[-105.70498,75.47951],[-106.31347,75.00527],[-109.7,74.85],[-112.22307,74.41696],[-113.74381,74.39427],[-113.87135,74.72029],[-111.79421,75.1625],[-116.31221,75.04343],[-117.7104,75.2222],[-116.34602,76.19903],[-115.40487,76.47887],[-112.59056,76.14134],[-110.81422,75.54919],[-109.0671,75.47321],[-110.49726,76.42982],[-109.5811,76.79417],[-108.54859,76.67832],[-108.21141,76.20168]]],[[[-94.684086,77.097878],[-93.573921,76.776296],[-91.605023,76.778518],[-90.741846,76.449597],[-90.969661,76.074013],[-89.822238,75.847774],[-89.187083,75.610166],[-87.838276,75.566189],[-86.379192,75.482421],[-84.789625,75.699204],[-82.753445,75.784315],[-81.128531,75.713983],[-80.057511,75.336849],[-79.833933,74.923127],[-80.457771,74.657304],[-81.948843,74.442459],[-83.228894,74.564028],[-86.097452,74.410032],[-88.15035,74.392307],[-89.764722,74.515555],[-92.422441,74.837758],[-92.768285,75.38682],[-92.889906,75.882655],[-93.893824,76.319244],[-95.962457,76.441381],[-97.121379,76.751078],[-96.745123,77.161389],[-94.684086,77.097878]]],[[[-116.198587,77.645287],[-116.335813,76.876962],[-117.106051,76.530032],[-118.040412,76.481172],[-119.899318,76.053213],[-121.499995,75.900019],[-122.854924,76.116543],[-122.854925,76.116543],[-121.157535,76.864508],[-119.103939,77.51222],[-117.570131,77.498319],[-116.198587,77.645287]]],[[[-93.840003,77.519997],[-94.295608,77.491343],[-96.169654,77.555111],[-96.436304,77.834629],[-94.422577,77.820005],[-93.720656,77.634331],[-93.840003,77.519997]]],[[[-110.186938,77.697015],[-112.051191,77.409229],[-113.534279,77.732207],[-112.724587,78.05105],[-111.264443,78.152956],[-109.854452,77.996325],[-110.186938,77.697015]]],[[[-109.663146,78.601973],[-110.881314,78.40692],[-112.542091,78.407902],[-112.525891,78.550555],[-111.50001,78.849994],[-110.963661,78.804441],[-109.663146,78.601973]]],[[[-95.830295,78.056941],[-97.309843,77.850597],[-98.124289,78.082857],[-98.552868,78.458105],[-98.631984,78.87193],[-97.337231,78.831984],[-96.754399,78.765813],[-95.559278,78.418315],[-95.830295,78.056941]]],[[[-100.060192,78.324754],[-99.670939,77.907545],[-101.30394,78.018985],[-102.949809,78.343229],[-105.176133,78.380332],[-104.210429,78.67742],[-105.41958,78.918336],[-105.492289,79.301594],[-103.529282,79.165349],[-100.825158,78.800462],[-100.060192,78.324754]]],[[[-87.02,79.66],[-85.81435,79.3369],[-87.18756,79.0393],[-89.03535,78.28723],[-90.80436,78.21533],[-92.87669,78.34333],[-93.95116,78.75099],[-93.93574,79.11373],[-93.14524,79.3801],[-94.974,79.37248],[-96.07614,79.70502],[-96.70972,80.15777],[-96.01644,80.60233],[-95.32345,80.90729],[-94.29843,80.97727],[-94.73542,81.20646],[-92.40984,81.25739],[-91.13289,80.72345],[-89.45,80.509322],[-87.81,80.32],[-87.02,79.66]]],[[[-68.5,83.106322],[-65.82735,83.02801],[-63.68,82.9],[-61.85,82.6286],[-61.89388,82.36165],[-64.334,81.92775],[-66.75342,81.72527],[-67.65755,81.50141],[-65.48031,81.50657],[-67.84,80.9],[-69.4697,80.61683],[-71.18,79.8],[-73.2428,79.63415],[-73.88,79.430162],[-76.90773,79.32309],[-75.52924,79.19766],[-76.22046,79.01907],[-75.39345,78.52581],[-76.34354,78.18296],[-77.88851,77.89991],[-78.36269,77.50859],[-79.75951,77.20968],[-79.61965,76.98336],[-77.91089,77.022045],[-77.88911,76.777955],[-80.56125,76.17812],[-83.17439,76.45403],[-86.11184,76.29901],[-87.6,76.42],[-89.49068,76.47239],[-89.6161,76.95213],[-87.76739,77.17833],[-88.26,77.9],[-87.65,77.970222],[-84.97634,77.53873],[-86.34,78.18],[-87.96192,78.37181],[-87.15198,78.75867],[-85.37868,78.9969],[-85.09495,79.34543],[-86.50734,79.73624],[-86.93179,80.25145],[-84.19844,80.20836],[-83.408696,80.1],[-81.84823,80.46442],[-84.1,80.58],[-87.59895,80.51627],[-89.36663,80.85569],[-90.2,81.26],[-91.36786,81.5531],[-91.58702,81.89429],[-90.1,82.085],[-88.93227,82.11751],[-86.97024,82.27961],[-85.5,82.652273],[-84.260005,82.6],[-83.18,82.32],[-82.42,82.86],[-81.1,83.02],[-79.30664,83.13056],[-76.25,83.172059],[-75.71878,83.06404],[-72.83153,83.23324],[-70.665765,83.169781],[-68.5,83.106322]]]]},"id":"CAN"},
-{"type":"Feature","properties":{"name":"Switzerland"},"geometry":{"type":"Polygon","coordinates":[[[9.594226,47.525058],[9.632932,47.347601],[9.47997,47.10281],[9.932448,46.920728],[10.442701,46.893546],[10.363378,46.483571],[9.922837,46.314899],[9.182882,46.440215],[8.966306,46.036932],[8.489952,46.005151],[8.31663,46.163642],[7.755992,45.82449],[7.273851,45.776948],[6.843593,45.991147],[6.5001,46.429673],[6.022609,46.27299],[6.037389,46.725779],[6.768714,47.287708],[6.736571,47.541801],[7.192202,47.449766],[7.466759,47.620582],[8.317301,47.61358],[8.522612,47.830828],[9.594226,47.525058]]]},"id":"CHE"},
-{"type":"Feature","properties":{"name":"Chile"},"geometry":{"type":"MultiPolygon","coordinates":[[[[-68.63401,-52.63637],[-68.63335,-54.8695],[-67.56244,-54.87001],[-66.95992,-54.89681],[-67.29103,-55.30124],[-68.14863,-55.61183],[-68.639991,-55.580018],[-69.2321,-55.49906],[-69.95809,-55.19843],[-71.00568,-55.05383],[-72.2639,-54.49514],[-73.2852,-53.95752],[-74.66253,-52.83749],[-73.8381,-53.04743],[-72.43418,-53.7154],[-71.10773,-54.07433],[-70.59178,-53.61583],[-70.26748,-52.93123],[-69.34565,-52.5183],[-68.63401,-52.63637]]],[[[-68.219913,-21.494347],[-67.82818,-22.872919],[-67.106674,-22.735925],[-66.985234,-22.986349],[-67.328443,-24.025303],[-68.417653,-24.518555],[-68.386001,-26.185016],[-68.5948,-26.506909],[-68.295542,-26.89934],[-69.001235,-27.521214],[-69.65613,-28.459141],[-70.01355,-29.367923],[-69.919008,-30.336339],[-70.535069,-31.36501],[-70.074399,-33.09121],[-69.814777,-33.273886],[-69.817309,-34.193571],[-70.388049,-35.169688],[-70.364769,-36.005089],[-71.121881,-36.658124],[-71.118625,-37.576827],[-70.814664,-38.552995],[-71.413517,-38.916022],[-71.680761,-39.808164],[-71.915734,-40.832339],[-71.746804,-42.051386],[-72.148898,-42.254888],[-71.915424,-43.408565],[-71.464056,-43.787611],[-71.793623,-44.207172],[-71.329801,-44.407522],[-71.222779,-44.784243],[-71.659316,-44.973689],[-71.552009,-45.560733],[-71.917258,-46.884838],[-72.447355,-47.738533],[-72.331161,-48.244238],[-72.648247,-48.878618],[-73.415436,-49.318436],[-73.328051,-50.378785],[-72.975747,-50.74145],[-72.309974,-50.67701],[-72.329404,-51.425956],[-71.914804,-52.009022],[-69.498362,-52.142761],[-68.571545,-52.299444],[-69.461284,-52.291951],[-69.94278,-52.537931],[-70.845102,-52.899201],[-71.006332,-53.833252],[-71.429795,-53.856455],[-72.557943,-53.53141],[-73.702757,-52.835069],[-73.702757,-52.83507],[-74.946763,-52.262754],[-75.260026,-51.629355],[-74.976632,-51.043396],[-75.479754,-50.378372],[-75.608015,-48.673773],[-75.18277,-47.711919],[-74.126581,-46.939253],[-75.644395,-46.647643],[-74.692154,-45.763976],[-74.351709,-44.103044],[-73.240356,-44.454961],[-72.717804,-42.383356],[-73.3889,-42.117532],[-73.701336,-43.365776],[-74.331943,-43.224958],[-74.017957,-41.794813],[-73.677099,-39.942213],[-73.217593,-39.258689],[-73.505559,-38.282883],[-73.588061,-37.156285],[-73.166717,-37.12378],[-72.553137,-35.50884],[-71.861732,-33.909093],[-71.43845,-32.418899],[-71.668721,-30.920645],[-71.370083,-30.095682],[-71.489894,-28.861442],[-70.905124,-27.64038],[-70.724954,-25.705924],[-70.403966,-23.628997],[-70.091246,-21.393319],[-70.16442,-19.756468],[-70.372572,-18.347975],[-69.858444,-18.092694],[-69.590424,-17.580012],[-69.100247,-18.260125],[-68.966818,-18.981683],[-68.442225,-19.405068],[-68.757167,-20.372658],[-68.219913,-21.494347]]]]},"id":"CHL"},
-{"type":"Feature","properties":{"name":"China"},"geometry":{"type":"MultiPolygon","coordinates":[[[[110.339188,18.678395],[109.47521,18.197701],[108.655208,18.507682],[108.626217,19.367888],[109.119056,19.821039],[110.211599,20.101254],[110.786551,20.077534],[111.010051,19.69593],[110.570647,19.255879],[110.339188,18.678395]]],[[[127.657407,49.76027],[129.397818,49.4406],[130.582293,48.729687],[130.987282,47.790132],[132.506672,47.78897],[133.373596,48.183442],[135.026311,48.47823],[134.500814,47.57844],[134.112362,47.212467],[133.769644,46.116927],[133.097127,45.144066],[131.883454,45.321162],[131.025212,44.967953],[131.288555,44.11152],[131.144688,42.92999],[130.633866,42.903015],[130.640016,42.395009],[129.994267,42.985387],[129.596669,42.424982],[128.052215,41.994285],[128.208433,41.466772],[127.343783,41.503152],[126.869083,41.816569],[126.182045,41.107336],[125.079942,40.569824],[124.265625,39.928493],[122.86757,39.637788],[122.131388,39.170452],[121.054554,38.897471],[121.585995,39.360854],[121.376757,39.750261],[122.168595,40.422443],[121.640359,40.94639],[120.768629,40.593388],[119.639602,39.898056],[119.023464,39.252333],[118.042749,39.204274],[117.532702,38.737636],[118.059699,38.061476],[118.87815,37.897325],[118.911636,37.448464],[119.702802,37.156389],[120.823457,37.870428],[121.711259,37.481123],[122.357937,37.454484],[122.519995,36.930614],[121.104164,36.651329],[120.637009,36.11144],[119.664562,35.609791],[119.151208,34.909859],[120.227525,34.360332],[120.620369,33.376723],[121.229014,32.460319],[121.908146,31.692174],[121.891919,30.949352],[121.264257,30.676267],[121.503519,30.142915],[122.092114,29.83252],[121.938428,29.018022],[121.684439,28.225513],[121.125661,28.135673],[120.395473,27.053207],[119.585497,25.740781],[118.656871,24.547391],[117.281606,23.624501],[115.890735,22.782873],[114.763827,22.668074],[114.152547,22.22376],[113.80678,22.54834],[113.241078,22.051367],[111.843592,21.550494],[110.785466,21.397144],[110.444039,20.341033],[109.889861,20.282457],[109.627655,21.008227],[109.864488,21.395051],[108.522813,21.715212],[108.05018,21.55238],[107.04342,21.811899],[106.567273,22.218205],[106.725403,22.794268],[105.811247,22.976892],[105.329209,23.352063],[104.476858,22.81915],[103.504515,22.703757],[102.706992,22.708795],[102.170436,22.464753],[101.652018,22.318199],[101.80312,21.174367],[101.270026,21.201652],[101.180005,21.436573],[101.150033,21.849984],[100.416538,21.558839],[99.983489,21.742937],[99.240899,22.118314],[99.531992,22.949039],[98.898749,23.142722],[98.660262,24.063286],[97.60472,23.897405],[97.724609,25.083637],[98.671838,25.918703],[98.712094,26.743536],[98.68269,27.508812],[98.246231,27.747221],[97.911988,28.335945],[97.327114,28.261583],[96.248833,28.411031],[96.586591,28.83098],[96.117679,29.452802],[95.404802,29.031717],[94.56599,29.277438],[93.413348,28.640629],[92.503119,27.896876],[91.696657,27.771742],[91.258854,28.040614],[90.730514,28.064954],[90.015829,28.296439],[89.47581,28.042759],[88.814248,27.299316],[88.730326,28.086865],[88.120441,27.876542],[86.954517,27.974262],[85.82332,28.203576],[85.011638,28.642774],[84.23458,28.839894],[83.898993,29.320226],[83.337115,29.463732],[82.327513,30.115268],[81.525804,30.422717],[81.111256,30.183481],[79.721367,30.882715],[78.738894,31.515906],[78.458446,32.618164],[79.176129,32.48378],[79.208892,32.994395],[78.811086,33.506198],[78.912269,34.321936],[77.837451,35.49401],[76.192848,35.898403],[75.896897,36.666806],[75.158028,37.133031],[74.980002,37.41999],[74.829986,37.990007],[74.864816,38.378846],[74.257514,38.606507],[73.928852,38.505815],[73.675379,39.431237],[73.960013,39.660008],[73.822244,39.893973],[74.776862,40.366425],[75.467828,40.562072],[76.526368,40.427946],[76.904484,41.066486],[78.187197,41.185316],[78.543661,41.582243],[80.11943,42.123941],[80.25999,42.349999],[80.18015,42.920068],[80.866206,43.180362],[79.966106,44.917517],[81.947071,45.317027],[82.458926,45.53965],[83.180484,47.330031],[85.16429,47.000956],[85.720484,47.452969],[85.768233,48.455751],[86.598776,48.549182],[87.35997,49.214981],[87.751264,49.297198],[88.013832,48.599463],[88.854298,48.069082],[90.280826,47.693549],[90.970809,46.888146],[90.585768,45.719716],[90.94554,45.286073],[92.133891,45.115076],[93.480734,44.975472],[94.688929,44.352332],[95.306875,44.241331],[95.762455,43.319449],[96.349396,42.725635],[97.451757,42.74889],[99.515817,42.524691],[100.845866,42.663804],[101.83304,42.514873],[103.312278,41.907468],[104.522282,41.908347],[104.964994,41.59741],[106.129316,42.134328],[107.744773,42.481516],[109.243596,42.519446],[110.412103,42.871234],[111.129682,43.406834],[111.829588,43.743118],[111.667737,44.073176],[111.348377,44.457442],[111.873306,45.102079],[112.436062,45.011646],[113.463907,44.808893],[114.460332,45.339817],[115.985096,45.727235],[116.717868,46.388202],[117.421701,46.672733],[118.874326,46.805412],[119.66327,46.69268],[119.772824,47.048059],[118.866574,47.74706],[118.064143,48.06673],[117.295507,47.697709],[116.308953,47.85341],[115.742837,47.726545],[115.485282,48.135383],[116.191802,49.134598],[116.678801,49.888531],[117.879244,49.510983],[119.288461,50.142883],[119.279366,50.582908],[120.18205,51.643566],[120.738191,51.964115],[120.725789,52.516226],[120.177089,52.753886],[121.003085,53.251401],[122.245748,53.431726],[123.571507,53.458804],[125.068211,53.161045],[125.946349,52.792799],[126.564399,51.784255],[126.939157,51.353894],[127.287456,50.739797],[127.657407,49.76027]]]]},"id":"CHN"},
-{"type":"Feature","properties":{"name":"Ivory Coast"},"geometry":{"type":"Polygon","coordinates":[[[-2.856125,4.994476],[-3.311084,4.984296],[-4.00882,5.179813],[-4.649917,5.168264],[-5.834496,4.993701],[-6.528769,4.705088],[-7.518941,4.338288],[-7.712159,4.364566],[-7.635368,5.188159],[-7.539715,5.313345],[-7.570153,5.707352],[-7.993693,6.12619],[-8.311348,6.193033],[-8.60288,6.467564],[-8.385452,6.911801],[-8.485446,7.395208],[-8.439298,7.686043],[-8.280703,7.68718],[-8.221792,8.123329],[-8.299049,8.316444],[-8.203499,8.455453],[-7.8321,8.575704],[-8.079114,9.376224],[-8.309616,9.789532],[-8.229337,10.12902],[-8.029944,10.206535],[-7.89959,10.297382],[-7.622759,10.147236],[-6.850507,10.138994],[-6.666461,10.430811],[-6.493965,10.411303],[-6.205223,10.524061],[-6.050452,10.096361],[-5.816926,10.222555],[-5.404342,10.370737],[-4.954653,10.152714],[-4.779884,9.821985],[-4.330247,9.610835],[-3.980449,9.862344],[-3.511899,9.900326],[-2.827496,9.642461],[-2.56219,8.219628],[-2.983585,7.379705],[-3.24437,6.250472],[-2.810701,5.389051],[-2.856125,4.994476]]]},"id":"CIV"},
-{"type":"Feature","properties":{"name":"Cameroon"},"geometry":{"type":"Polygon","coordinates":[[[13.075822,2.267097],[12.951334,2.321616],[12.35938,2.192812],[11.751665,2.326758],[11.276449,2.261051],[9.649158,2.283866],[9.795196,3.073404],[9.404367,3.734527],[8.948116,3.904129],[8.744924,4.352215],[8.488816,4.495617],[8.500288,4.771983],[8.757533,5.479666],[9.233163,6.444491],[9.522706,6.453482],[10.118277,7.03877],[10.497375,7.055358],[11.058788,6.644427],[11.745774,6.981383],[11.839309,7.397042],[12.063946,7.799808],[12.218872,8.305824],[12.753672,8.717763],[12.955468,9.417772],[13.1676,9.640626],[13.308676,10.160362],[13.57295,10.798566],[14.415379,11.572369],[14.468192,11.904752],[14.577178,12.085361],[14.181336,12.483657],[14.213531,12.802035],[14.495787,12.859396],[14.893386,12.219048],[14.960152,11.555574],[14.923565,10.891325],[15.467873,9.982337],[14.909354,9.992129],[14.627201,9.920919],[14.171466,10.021378],[13.954218,9.549495],[14.544467,8.965861],[14.979996,8.796104],[15.120866,8.38215],[15.436092,7.692812],[15.27946,7.421925],[14.776545,6.408498],[14.53656,6.226959],[14.459407,5.451761],[14.558936,5.030598],[14.478372,4.732605],[14.950953,4.210389],[15.03622,3.851367],[15.405396,3.335301],[15.862732,3.013537],[15.907381,2.557389],[16.012852,2.26764],[15.940919,1.727673],[15.146342,1.964015],[14.337813,2.227875],[13.075822,2.267097]]]},"id":"CMR"},
-{"type":"Feature","properties":{"name":"Democratic Republic of the Congo"},"geometry":{"type":"Polygon","coordinates":[[[30.83386,3.509166],[30.773347,2.339883],[31.174149,2.204465],[30.85267,1.849396],[30.468508,1.583805],[30.086154,1.062313],[29.875779,0.59738],[29.819503,-0.20531],[29.587838,-0.587406],[29.579466,-1.341313],[29.291887,-1.620056],[29.254835,-2.21511],[29.117479,-2.292211],[29.024926,-2.839258],[29.276384,-3.293907],[29.339998,-4.499983],[29.519987,-5.419979],[29.419993,-5.939999],[29.620032,-6.520015],[30.199997,-7.079981],[30.740015,-8.340007],[30.346086,-8.238257],[29.002912,-8.407032],[28.734867,-8.526559],[28.449871,-9.164918],[28.673682,-9.605925],[28.49607,-10.789884],[28.372253,-11.793647],[28.642417,-11.971569],[29.341548,-12.360744],[29.616001,-12.178895],[29.699614,-13.257227],[28.934286,-13.248958],[28.523562,-12.698604],[28.155109,-12.272481],[27.388799,-12.132747],[27.16442,-11.608748],[26.553088,-11.92444],[25.75231,-11.784965],[25.418118,-11.330936],[24.78317,-11.238694],[24.314516,-11.262826],[24.257155,-10.951993],[23.912215,-10.926826],[23.456791,-10.867863],[22.837345,-11.017622],[22.402798,-10.993075],[22.155268,-11.084801],[22.208753,-9.894796],[21.875182,-9.523708],[21.801801,-8.908707],[21.949131,-8.305901],[21.746456,-7.920085],[21.728111,-7.290872],[20.514748,-7.299606],[20.601823,-6.939318],[20.091622,-6.94309],[20.037723,-7.116361],[19.417502,-7.155429],[19.166613,-7.738184],[19.016752,-7.988246],[18.464176,-7.847014],[18.134222,-7.987678],[17.47297,-8.068551],[17.089996,-7.545689],[16.860191,-7.222298],[16.57318,-6.622645],[16.326528,-5.87747],[13.375597,-5.864241],[13.024869,-5.984389],[12.735171,-5.965682],[12.322432,-6.100092],[12.182337,-5.789931],[12.436688,-5.684304],[12.468004,-5.248362],[12.631612,-4.991271],[12.995517,-4.781103],[13.25824,-4.882957],[13.600235,-4.500138],[14.144956,-4.510009],[14.209035,-4.793092],[14.582604,-4.970239],[15.170992,-4.343507],[15.75354,-3.855165],[16.00629,-3.535133],[15.972803,-2.712392],[16.407092,-1.740927],[16.865307,-1.225816],[17.523716,-0.74383],[17.638645,-0.424832],[17.663553,-0.058084],[17.82654,0.288923],[17.774192,0.855659],[17.898835,1.741832],[18.094276,2.365722],[18.393792,2.900443],[18.453065,3.504386],[18.542982,4.201785],[18.932312,4.709506],[19.467784,5.031528],[20.290679,4.691678],[20.927591,4.322786],[21.659123,4.224342],[22.405124,4.02916],[22.704124,4.633051],[22.84148,4.710126],[23.297214,4.609693],[24.410531,5.108784],[24.805029,4.897247],[25.128833,4.927245],[25.278798,5.170408],[25.650455,5.256088],[26.402761,5.150875],[27.044065,5.127853],[27.374226,5.233944],[27.979977,4.408413],[28.428994,4.287155],[28.696678,4.455077],[29.159078,4.389267],[29.715995,4.600805],[29.9535,4.173699],[30.83386,3.509166]]]},"id":"COD"},
-{"type":"Feature","properties":{"name":"Republic of the Congo"},"geometry":{"type":"Polygon","coordinates":[[[12.995517,-4.781103],[12.62076,-4.438023],[12.318608,-4.60623],[11.914963,-5.037987],[11.093773,-3.978827],[11.855122,-3.426871],[11.478039,-2.765619],[11.820964,-2.514161],[12.495703,-2.391688],[12.575284,-1.948511],[13.109619,-2.42874],[13.992407,-2.470805],[14.29921,-1.998276],[14.425456,-1.333407],[14.316418,-0.552627],[13.843321,0.038758],[14.276266,1.19693],[14.026669,1.395677],[13.282631,1.314184],[13.003114,1.830896],[13.075822,2.267097],[14.337813,2.227875],[15.146342,1.964015],[15.940919,1.727673],[16.012852,2.26764],[16.537058,3.198255],[17.133042,3.728197],[17.8099,3.560196],[18.453065,3.504386],[18.393792,2.900443],[18.094276,2.365722],[17.898835,1.741832],[17.774192,0.855659],[17.82654,0.288923],[17.663553,-0.058084],[17.638645,-0.424832],[17.523716,-0.74383],[16.865307,-1.225816],[16.407092,-1.740927],[15.972803,-2.712392],[16.00629,-3.535133],[15.75354,-3.855165],[15.170992,-4.343507],[14.582604,-4.970239],[14.209035,-4.793092],[14.144956,-4.510009],[13.600235,-4.500138],[13.25824,-4.882957],[12.995517,-4.781103]]]},"id":"COG"},
-{"type":"Feature","properties":{"name":"Colombia"},"geometry":{"type":"Polygon","coordinates":[[[-75.373223,-0.152032],[-75.801466,0.084801],[-76.292314,0.416047],[-76.57638,0.256936],[-77.424984,0.395687],[-77.668613,0.825893],[-77.855061,0.809925],[-78.855259,1.380924],[-78.990935,1.69137],[-78.617831,1.766404],[-78.662118,2.267355],[-78.42761,2.629556],[-77.931543,2.696606],[-77.510431,3.325017],[-77.12769,3.849636],[-77.496272,4.087606],[-77.307601,4.667984],[-77.533221,5.582812],[-77.318815,5.845354],[-77.476661,6.691116],[-77.881571,7.223771],[-77.753414,7.70984],[-77.431108,7.638061],[-77.242566,7.935278],[-77.474723,8.524286],[-77.353361,8.670505],[-76.836674,8.638749],[-76.086384,9.336821],[-75.6746,9.443248],[-75.664704,9.774003],[-75.480426,10.61899],[-74.906895,11.083045],[-74.276753,11.102036],[-74.197223,11.310473],[-73.414764,11.227015],[-72.627835,11.731972],[-72.238195,11.95555],[-71.75409,12.437303],[-71.399822,12.376041],[-71.137461,12.112982],[-71.331584,11.776284],[-71.973922,11.608672],[-72.227575,11.108702],[-72.614658,10.821975],[-72.905286,10.450344],[-73.027604,9.73677],[-73.304952,9.152],[-72.78873,9.085027],[-72.660495,8.625288],[-72.439862,8.405275],[-72.360901,8.002638],[-72.479679,7.632506],[-72.444487,7.423785],[-72.198352,7.340431],[-71.960176,6.991615],[-70.674234,7.087785],[-70.093313,6.960376],[-69.38948,6.099861],[-68.985319,6.206805],[-68.265052,6.153268],[-67.695087,6.267318],[-67.34144,6.095468],[-67.521532,5.55687],[-67.744697,5.221129],[-67.823012,4.503937],[-67.621836,3.839482],[-67.337564,3.542342],[-67.303173,3.318454],[-67.809938,2.820655],[-67.447092,2.600281],[-67.181294,2.250638],[-66.876326,1.253361],[-67.065048,1.130112],[-67.259998,1.719999],[-67.53781,2.037163],[-67.868565,1.692455],[-69.816973,1.714805],[-69.804597,1.089081],[-69.218638,0.985677],[-69.252434,0.602651],[-69.452396,0.706159],[-70.015566,0.541414],[-70.020656,-0.185156],[-69.577065,-0.549992],[-69.420486,-1.122619],[-69.444102,-1.556287],[-69.893635,-4.298187],[-70.394044,-3.766591],[-70.692682,-3.742872],[-70.047709,-2.725156],[-70.813476,-2.256865],[-71.413646,-2.342802],[-71.774761,-2.16979],[-72.325787,-2.434218],[-73.070392,-2.308954],[-73.659504,-1.260491],[-74.122395,-1.002833],[-74.441601,-0.53082],[-75.106625,-0.057205],[-75.373223,-0.152032]]]},"id":"COL"},
-{"type":"Feature","properties":{"name":"Costa Rica"},"geometry":{"type":"Polygon","coordinates":[[[-82.965783,8.225028],[-83.508437,8.446927],[-83.711474,8.656836],[-83.596313,8.830443],[-83.632642,9.051386],[-83.909886,9.290803],[-84.303402,9.487354],[-84.647644,9.615537],[-84.713351,9.908052],[-84.97566,10.086723],[-84.911375,9.795992],[-85.110923,9.55704],[-85.339488,9.834542],[-85.660787,9.933347],[-85.797445,10.134886],[-85.791709,10.439337],[-85.659314,10.754331],[-85.941725,10.895278],[-85.71254,11.088445],[-85.561852,11.217119],[-84.903003,10.952303],[-84.673069,11.082657],[-84.355931,10.999226],[-84.190179,10.79345],[-83.895054,10.726839],[-83.655612,10.938764],[-83.40232,10.395438],[-83.015677,9.992982],[-82.546196,9.566135],[-82.932891,9.476812],[-82.927155,9.07433],[-82.719183,8.925709],[-82.868657,8.807266],[-82.829771,8.626295],[-82.913176,8.423517],[-82.965783,8.225028]]]},"id":"CRI"},
-{"type":"Feature","properties":{"name":"Cuba"},"geometry":{"type":"Polygon","coordinates":[[[-82.268151,23.188611],[-81.404457,23.117271],[-80.618769,23.10598],[-79.679524,22.765303],[-79.281486,22.399202],[-78.347434,22.512166],[-77.993296,22.277194],[-77.146422,21.657851],[-76.523825,21.20682],[-76.19462,21.220565],[-75.598222,21.016624],[-75.67106,20.735091],[-74.933896,20.693905],[-74.178025,20.284628],[-74.296648,20.050379],[-74.961595,19.923435],[-75.63468,19.873774],[-76.323656,19.952891],[-77.755481,19.855481],[-77.085108,20.413354],[-77.492655,20.673105],[-78.137292,20.739949],[-78.482827,21.028613],[-78.719867,21.598114],[-79.285,21.559175],[-80.217475,21.827324],[-80.517535,22.037079],[-81.820943,22.192057],[-82.169992,22.387109],[-81.795002,22.636965],[-82.775898,22.68815],[-83.494459,22.168518],[-83.9088,22.154565],[-84.052151,21.910575],[-84.54703,21.801228],[-84.974911,21.896028],[-84.447062,22.20495],[-84.230357,22.565755],[-83.77824,22.788118],[-83.267548,22.983042],[-82.510436,23.078747],[-82.268151,23.188611]]]},"id":"CUB"},
-{"type":"Feature","properties":{"name":"Northern Cyprus"},"geometry":{"type":"Polygon","coordinates":[[[32.73178,35.140026],[32.802474,35.145504],[32.946961,35.386703],[33.667227,35.373216],[34.576474,35.671596],[33.900804,35.245756],[33.973617,35.058506],[33.86644,35.093595],[33.675392,35.017863],[33.525685,35.038688],[33.475817,35.000345],[33.455922,35.101424],[33.383833,35.162712],[33.190977,35.173125],[32.919572,35.087833],[32.73178,35.140026]]]},"id":"-99"},
-{"type":"Feature","properties":{"name":"Cyprus"},"geometry":{"type":"Polygon","coordinates":[[[33.973617,35.058506],[34.004881,34.978098],[32.979827,34.571869],[32.490296,34.701655],[32.256667,35.103232],[32.73178,35.140026],[32.919572,35.087833],[33.190977,35.173125],[33.383833,35.162712],[33.455922,35.101424],[33.475817,35.000345],[33.525685,35.038688],[33.675392,35.017863],[33.86644,35.093595],[33.973617,35.058506]]]},"id":"CYP"},
-{"type":"Feature","properties":{"name":"Czech Republic"},"geometry":{"type":"Polygon","coordinates":[[[16.960288,48.596982],[16.499283,48.785808],[16.029647,48.733899],[15.253416,49.039074],[14.901447,48.964402],[14.338898,48.555305],[13.595946,48.877172],[13.031329,49.307068],[12.521024,49.547415],[12.415191,49.969121],[12.240111,50.266338],[12.966837,50.484076],[13.338132,50.733234],[14.056228,50.926918],[14.307013,51.117268],[14.570718,51.002339],[15.016996,51.106674],[15.490972,50.78473],[16.238627,50.697733],[16.176253,50.422607],[16.719476,50.215747],[16.868769,50.473974],[17.554567,50.362146],[17.649445,50.049038],[18.392914,49.988629],[18.853144,49.49623],[18.554971,49.495015],[18.399994,49.315001],[18.170498,49.271515],[18.104973,49.043983],[17.913512,48.996493],[17.886485,48.903475],[17.545007,48.800019],[17.101985,48.816969],[16.960288,48.596982]]]},"id":"CZE"},
-{"type":"Feature","properties":{"name":"Germany"},"geometry":{"type":"Polygon","coordinates":[[[9.921906,54.983104],[9.93958,54.596642],[10.950112,54.363607],[10.939467,54.008693],[11.956252,54.196486],[12.51844,54.470371],[13.647467,54.075511],[14.119686,53.757029],[14.353315,53.248171],[14.074521,52.981263],[14.4376,52.62485],[14.685026,52.089947],[14.607098,51.745188],[15.016996,51.106674],[14.570718,51.002339],[14.307013,51.117268],[14.056228,50.926918],[13.338132,50.733234],[12.966837,50.484076],[12.240111,50.266338],[12.415191,49.969121],[12.521024,49.547415],[13.031329,49.307068],[13.595946,48.877172],[13.243357,48.416115],[12.884103,48.289146],[13.025851,47.637584],[12.932627,47.467646],[12.62076,47.672388],[12.141357,47.703083],[11.426414,47.523766],[10.544504,47.566399],[10.402084,47.302488],[9.896068,47.580197],[9.594226,47.525058],[8.522612,47.830828],[8.317301,47.61358],[7.466759,47.620582],[7.593676,48.333019],[8.099279,49.017784],[6.65823,49.201958],[6.18632,49.463803],[6.242751,49.902226],[6.043073,50.128052],[6.156658,50.803721],[5.988658,51.851616],[6.589397,51.852029],[6.84287,52.22844],[7.092053,53.144043],[6.90514,53.482162],[7.100425,53.693932],[7.936239,53.748296],[8.121706,53.527792],[8.800734,54.020786],[8.572118,54.395646],[8.526229,54.962744],[9.282049,54.830865],[9.921906,54.983104]]]},"id":"DEU"},
-{"type":"Feature","properties":{"name":"Djibouti"},"geometry":{"type":"Polygon","coordinates":[[[43.081226,12.699639],[43.317852,12.390148],[43.286381,11.974928],[42.715874,11.735641],[43.145305,11.46204],[42.776852,10.926879],[42.55493,11.10511],[42.31414,11.0342],[41.75557,11.05091],[41.73959,11.35511],[41.66176,11.6312],[42,12.1],[42.35156,12.54223],[42.779642,12.455416],[43.081226,12.699639]]]},"id":"DJI"},
-{"type":"Feature","properties":{"name":"Denmark"},"geometry":{"type":"MultiPolygon","coordinates":[[[[12.690006,55.609991],[12.089991,54.800015],[11.043543,55.364864],[10.903914,55.779955],[12.370904,56.111407],[12.690006,55.609991]]],[[[10.912182,56.458621],[10.667804,56.081383],[10.369993,56.190007],[9.649985,55.469999],[9.921906,54.983104],[9.282049,54.830865],[8.526229,54.962744],[8.120311,55.517723],[8.089977,56.540012],[8.256582,56.809969],[8.543438,57.110003],[9.424469,57.172066],[9.775559,57.447941],[10.580006,57.730017],[10.546106,57.215733],[10.25,56.890016],[10.369993,56.609982],[10.912182,56.458621]]]]},"id":"DNK"},
-{"type":"Feature","properties":{"name":"Dominican Republic"},"geometry":{"type":"Polygon","coordinates":[[[-71.712361,19.714456],[-71.587304,19.884911],[-70.806706,19.880286],[-70.214365,19.622885],[-69.950815,19.648],[-69.76925,19.293267],[-69.222126,19.313214],[-69.254346,19.015196],[-68.809412,18.979074],[-68.317943,18.612198],[-68.689316,18.205142],[-69.164946,18.422648],[-69.623988,18.380713],[-69.952934,18.428307],[-70.133233,18.245915],[-70.517137,18.184291],[-70.669298,18.426886],[-70.99995,18.283329],[-71.40021,17.598564],[-71.657662,17.757573],[-71.708305,18.044997],[-71.687738,18.31666],[-71.945112,18.6169],[-71.701303,18.785417],[-71.624873,19.169838],[-71.712361,19.714456]]]},"id":"DOM"},
-{"type":"Feature","properties":{"name":"Algeria"},"geometry":{"type":"Polygon","coordinates":[[[11.999506,23.471668],[8.572893,21.565661],[5.677566,19.601207],[4.267419,19.155265],[3.158133,19.057364],[3.146661,19.693579],[2.683588,19.85623],[2.060991,20.142233],[1.823228,20.610809],[-1.550055,22.792666],[-4.923337,24.974574],[-8.6844,27.395744],[-8.665124,27.589479],[-8.66559,27.656426],[-8.674116,28.841289],[-7.059228,29.579228],[-6.060632,29.7317],[-5.242129,30.000443],[-4.859646,30.501188],[-3.690441,30.896952],[-3.647498,31.637294],[-3.06898,31.724498],[-2.616605,32.094346],[-1.307899,32.262889],[-1.124551,32.651522],[-1.388049,32.864015],[-1.733455,33.919713],[-1.792986,34.527919],[-2.169914,35.168396],[-1.208603,35.714849],[-0.127454,35.888662],[0.503877,36.301273],[1.466919,36.605647],[3.161699,36.783905],[4.815758,36.865037],[5.32012,36.716519],[6.26182,37.110655],[7.330385,37.118381],[7.737078,36.885708],[8.420964,36.946427],[8.217824,36.433177],[8.376368,35.479876],[8.140981,34.655146],[7.524482,34.097376],[7.612642,33.344115],[8.430473,32.748337],[8.439103,32.506285],[9.055603,32.102692],[9.48214,30.307556],[9.805634,29.424638],[9.859998,28.95999],[9.683885,28.144174],[9.756128,27.688259],[9.629056,27.140953],[9.716286,26.512206],[9.319411,26.094325],[9.910693,25.365455],[9.948261,24.936954],[10.303847,24.379313],[10.771364,24.562532],[11.560669,24.097909],[11.999506,23.471668]]]},"id":"DZA"},
-{"type":"Feature","properties":{"name":"Ecuador"},"geometry":{"type":"Polygon","coordinates":[[[-80.302561,-3.404856],[-79.770293,-2.657512],[-79.986559,-2.220794],[-80.368784,-2.685159],[-80.967765,-2.246943],[-80.764806,-1.965048],[-80.933659,-1.057455],[-80.58337,-0.906663],[-80.399325,-0.283703],[-80.020898,0.36034],[-80.09061,0.768429],[-79.542762,0.982938],[-78.855259,1.380924],[-77.855061,0.809925],[-77.668613,0.825893],[-77.424984,0.395687],[-76.57638,0.256936],[-76.292314,0.416047],[-75.801466,0.084801],[-75.373223,-0.152032],[-75.233723,-0.911417],[-75.544996,-1.56161],[-76.635394,-2.608678],[-77.837905,-3.003021],[-78.450684,-3.873097],[-78.639897,-4.547784],[-79.205289,-4.959129],[-79.624979,-4.454198],[-80.028908,-4.346091],[-80.442242,-4.425724],[-80.469295,-4.059287],[-80.184015,-3.821162],[-80.302561,-3.404856]]]},"id":"ECU"},
-{"type":"Feature","properties":{"name":"Egypt"},"geometry":{"type":"Polygon","coordinates":[[[34.9226,29.50133],[34.64174,29.09942],[34.42655,28.34399],[34.15451,27.8233],[33.92136,27.6487],[33.58811,27.97136],[33.13676,28.41765],[32.42323,29.85108],[32.32046,29.76043],[32.73482,28.70523],[33.34876,27.69989],[34.10455,26.14227],[34.47387,25.59856],[34.79507,25.03375],[35.69241,23.92671],[35.49372,23.75237],[35.52598,23.10244],[36.69069,22.20485],[36.86623,22],[32.9,22],[29.02,22],[25,22],[25,25.6825],[25,29.238655],[24.70007,30.04419],[24.95762,30.6616],[24.80287,31.08929],[25.16482,31.56915],[26.49533,31.58568],[27.45762,31.32126],[28.45048,31.02577],[28.91353,30.87005],[29.68342,31.18686],[30.09503,31.4734],[30.97693,31.55586],[31.68796,31.4296],[31.96041,30.9336],[32.19247,31.26034],[32.99392,31.02407],[33.7734,30.96746],[34.26544,31.21936],[34.9226,29.50133]]]},"id":"EGY"},
-{"type":"Feature","properties":{"name":"Eritrea"},"geometry":{"type":"Polygon","coordinates":[[[42.35156,12.54223],[42.00975,12.86582],[41.59856,13.45209],[41.155194,13.77332],[40.8966,14.11864],[40.026219,14.519579],[39.34061,14.53155],[39.0994,14.74064],[38.51295,14.50547],[37.90607,14.95943],[37.59377,14.2131],[36.42951,14.42211],[36.323189,14.822481],[36.75386,16.291874],[36.85253,16.95655],[37.16747,17.26314],[37.904,17.42754],[38.41009,17.998307],[38.990623,16.840626],[39.26611,15.922723],[39.814294,15.435647],[41.179275,14.49108],[41.734952,13.921037],[42.276831,13.343992],[42.589576,13.000421],[43.081226,12.699639],[42.779642,12.455416],[42.35156,12.54223]]]},"id":"ERI"},
-{"type":"Feature","properties":{"name":"Spain"},"geometry":{"type":"Polygon","coordinates":[[[-9.034818,41.880571],[-8.984433,42.592775],[-9.392884,43.026625],[-7.97819,43.748338],[-6.754492,43.567909],[-5.411886,43.57424],[-4.347843,43.403449],[-3.517532,43.455901],[-1.901351,43.422802],[-1.502771,43.034014],[0.338047,42.579546],[0.701591,42.795734],[1.826793,42.343385],[2.985999,42.473015],[3.039484,41.89212],[2.091842,41.226089],[0.810525,41.014732],[0.721331,40.678318],[0.106692,40.123934],[-0.278711,39.309978],[0.111291,38.738514],[-0.467124,38.292366],[-0.683389,37.642354],[-1.438382,37.443064],[-2.146453,36.674144],[-3.415781,36.6589],[-4.368901,36.677839],[-4.995219,36.324708],[-5.37716,35.94685],[-5.866432,36.029817],[-6.236694,36.367677],[-6.520191,36.942913],[-7.453726,37.097788],[-7.537105,37.428904],[-7.166508,37.803894],[-7.029281,38.075764],[-7.374092,38.373059],[-7.098037,39.030073],[-7.498632,39.629571],[-7.066592,39.711892],[-7.026413,40.184524],[-6.86402,40.330872],[-6.851127,41.111083],[-6.389088,41.381815],[-6.668606,41.883387],[-7.251309,41.918346],[-7.422513,41.792075],[-8.013175,41.790886],[-8.263857,42.280469],[-8.671946,42.134689],[-9.034818,41.880571]]]},"id":"ESP"},
-{"type":"Feature","properties":{"name":"Estonia"},"geometry":{"type":"Polygon","coordinates":[[[24.312863,57.793424],[24.428928,58.383413],[24.061198,58.257375],[23.42656,58.612753],[23.339795,59.18724],[24.604214,59.465854],[25.864189,59.61109],[26.949136,59.445803],[27.981114,59.475388],[28.131699,59.300825],[27.420166,58.724581],[27.716686,57.791899],[27.288185,57.474528],[26.463532,57.476389],[25.60281,57.847529],[25.164594,57.970157],[24.312863,57.793424]]]},"id":"EST"},
-{"type":"Feature","properties":{"name":"Ethiopia"},"geometry":{"type":"Polygon","coordinates":[[[37.90607,14.95943],[38.51295,14.50547],[39.0994,14.74064],[39.34061,14.53155],[40.02625,14.51959],[40.8966,14.11864],[41.1552,13.77333],[41.59856,13.45209],[42.00975,12.86582],[42.35156,12.54223],[42,12.1],[41.66176,11.6312],[41.73959,11.35511],[41.75557,11.05091],[42.31414,11.0342],[42.55493,11.10511],[42.776852,10.926879],[42.55876,10.57258],[42.92812,10.02194],[43.29699,9.54048],[43.67875,9.18358],[46.94834,7.99688],[47.78942,8.003],[44.9636,5.00162],[43.66087,4.95755],[42.76967,4.25259],[42.12861,4.23413],[41.855083,3.918912],[41.1718,3.91909],[40.76848,4.25702],[39.85494,3.83879],[39.559384,3.42206],[38.89251,3.50074],[38.67114,3.61607],[38.43697,3.58851],[38.120915,3.598605],[36.855093,4.447864],[36.159079,4.447864],[35.817448,4.776966],[35.817448,5.338232],[35.298007,5.506],[34.70702,6.59422],[34.25032,6.82607],[34.0751,7.22595],[33.56829,7.71334],[32.95418,7.78497],[33.2948,8.35458],[33.8255,8.37916],[33.97498,8.68456],[33.96162,9.58358],[34.25745,10.63009],[34.73115,10.91017],[34.83163,11.31896],[35.26049,12.08286],[35.86363,12.57828],[36.27022,13.56333],[36.42951,14.42211],[37.59377,14.2131],[37.90607,14.95943]]]},"id":"ETH"},
-{"type":"Feature","properties":{"name":"Finland"},"geometry":{"type":"Polygon","coordinates":[[[28.59193,69.064777],[28.445944,68.364613],[29.977426,67.698297],[29.054589,66.944286],[30.21765,65.80598],[29.54443,64.948672],[30.444685,64.204453],[30.035872,63.552814],[31.516092,62.867687],[31.139991,62.357693],[30.211107,61.780028],[28.069998,60.503517],[26.255173,60.423961],[24.496624,60.057316],[22.869695,59.846373],[22.290764,60.391921],[21.322244,60.72017],[21.544866,61.705329],[21.059211,62.607393],[21.536029,63.189735],[22.442744,63.81781],[24.730512,64.902344],[25.398068,65.111427],[25.294043,65.534346],[23.903379,66.006927],[23.56588,66.396051],[23.539473,67.936009],[21.978535,68.616846],[20.645593,69.106247],[21.244936,69.370443],[22.356238,68.841741],[23.66205,68.891247],[24.735679,68.649557],[25.689213,69.092114],[26.179622,69.825299],[27.732292,70.164193],[29.015573,69.766491],[28.59193,69.064777]]]},"id":"FIN"},
-{"type":"Feature","properties":{"name":"Fiji"},"geometry":{"type":"MultiPolygon","coordinates":[[[[178.3736,-17.33992],[178.71806,-17.62846],[178.55271,-18.15059],[177.93266,-18.28799],[177.38146,-18.16432],[177.28504,-17.72465],[177.67087,-17.38114],[178.12557,-17.50481],[178.3736,-17.33992]]],[[[179.364143,-16.801354],[178.725059,-17.012042],[178.596839,-16.63915],[179.096609,-16.433984],[179.413509,-16.379054],[180,-16.067133],[180,-16.555217],[179.364143,-16.801354]]],[[[-179.917369,-16.501783],[-180,-16.555217],[-180,-16.067133],[-179.79332,-16.020882],[-179.917369,-16.501783]]]]},"id":"FJI"},
-{"type":"Feature","properties":{"name":"Falkland Islands"},"geometry":{"type":"Polygon","coordinates":[[[-61.2,-51.85],[-60,-51.25],[-59.15,-51.5],[-58.55,-51.1],[-57.75,-51.55],[-58.05,-51.9],[-59.4,-52.2],[-59.85,-51.85],[-60.7,-52.3],[-61.2,-51.85]]]},"id":"FLK"},
-{"type":"Feature","properties":{"name":"France"},"geometry":{"type":"MultiPolygon","coordinates":[[[[9.560016,42.152492],[9.229752,41.380007],[8.775723,41.583612],[8.544213,42.256517],[8.746009,42.628122],[9.390001,43.009985],[9.560016,42.152492]]],[[[3.588184,50.378992],[4.286023,49.907497],[4.799222,49.985373],[5.674052,49.529484],[5.897759,49.442667],[6.18632,49.463803],[6.65823,49.201958],[8.099279,49.017784],[7.593676,48.333019],[7.466759,47.620582],[7.192202,47.449766],[6.736571,47.541801],[6.768714,47.287708],[6.037389,46.725779],[6.022609,46.27299],[6.5001,46.429673],[6.843593,45.991147],[6.802355,45.70858],[7.096652,45.333099],[6.749955,45.028518],[7.007562,44.254767],[7.549596,44.127901],[7.435185,43.693845],[6.529245,43.128892],[4.556963,43.399651],[3.100411,43.075201],[2.985999,42.473015],[1.826793,42.343385],[0.701591,42.795734],[0.338047,42.579546],[-1.502771,43.034014],[-1.901351,43.422802],[-1.384225,44.02261],[-1.193798,46.014918],[-2.225724,47.064363],[-2.963276,47.570327],[-4.491555,47.954954],[-4.59235,48.68416],[-3.295814,48.901692],[-1.616511,48.644421],[-1.933494,49.776342],[-0.989469,49.347376],[1.338761,50.127173],[1.639001,50.946606],[2.513573,51.148506],[2.658422,50.796848],[3.123252,50.780363],[3.588184,50.378992]]]]},"id":"FRA"},
-{"type":"Feature","properties":{"name":"French Guiana"},"geometry":{"type":"MultiPolygon","coordinates":[[[[-52.556425,2.504705],[-52.939657,2.124858],[-53.418465,2.053389],[-53.554839,2.334897],[-53.778521,2.376703],[-54.088063,2.105557],[-54.524754,2.311849],[-54.27123,2.738748],[-54.184284,3.194172],[-54.011504,3.62257],[-54.399542,4.212611],[-54.478633,4.896756],[-53.958045,5.756548],[-53.618453,5.646529],[-52.882141,5.409851],[-51.823343,4.565768],[-51.657797,4.156232],[-52.249338,3.241094],[-52.556425,2.504705]]]]},"id":"GUF"},
-{"type":"Feature","properties":{"name":"Gabon"},"geometry":{"type":"Polygon","coordinates":[[[11.093773,-3.978827],[10.066135,-2.969483],[9.405245,-2.144313],[8.797996,-1.111301],[8.830087,-0.779074],[9.04842,-0.459351],[9.291351,0.268666],[9.492889,1.01012],[9.830284,1.067894],[11.285079,1.057662],[11.276449,2.261051],[11.751665,2.326758],[12.35938,2.192812],[12.951334,2.321616],[13.075822,2.267097],[13.003114,1.830896],[13.282631,1.314184],[14.026669,1.395677],[14.276266,1.19693],[13.843321,0.038758],[14.316418,-0.552627],[14.425456,-1.333407],[14.29921,-1.998276],[13.992407,-2.470805],[13.109619,-2.42874],[12.575284,-1.948511],[12.495703,-2.391688],[11.820964,-2.514161],[11.478039,-2.765619],[11.855122,-3.426871],[11.093773,-3.978827]]]},"id":"GAB"},
-{"type":"Feature","properties":{"name":"United Kingdom"},"geometry":{"type":"MultiPolygon","coordinates":[[[[-5.661949,54.554603],[-6.197885,53.867565],[-6.95373,54.073702],[-7.572168,54.059956],[-7.366031,54.595841],[-7.572168,55.131622],[-6.733847,55.17286],[-5.661949,54.554603]]],[[[-3.005005,58.635],[-4.073828,57.553025],[-3.055002,57.690019],[-1.959281,57.6848],[-2.219988,56.870017],[-3.119003,55.973793],[-2.085009,55.909998],[-2.005676,55.804903],[-1.114991,54.624986],[-0.430485,54.464376],[0.184981,53.325014],[0.469977,52.929999],[1.681531,52.73952],[1.559988,52.099998],[1.050562,51.806761],[1.449865,51.289428],[0.550334,50.765739],[-0.787517,50.774989],[-2.489998,50.500019],[-2.956274,50.69688],[-3.617448,50.228356],[-4.542508,50.341837],[-5.245023,49.96],[-5.776567,50.159678],[-4.30999,51.210001],[-3.414851,51.426009],[-3.422719,51.426848],[-4.984367,51.593466],[-5.267296,51.9914],[-4.222347,52.301356],[-4.770013,52.840005],[-4.579999,53.495004],[-3.093831,53.404547],[-3.09208,53.404441],[-2.945009,53.985],[-3.614701,54.600937],[-3.630005,54.615013],[-4.844169,54.790971],[-5.082527,55.061601],[-4.719112,55.508473],[-5.047981,55.783986],[-5.586398,55.311146],[-5.644999,56.275015],[-6.149981,56.78501],[-5.786825,57.818848],[-5.009999,58.630013],[-4.211495,58.550845],[-3.005005,58.635]]]]},"id":"GBR"},
-{"type":"Feature","properties":{"name":"Georgia"},"geometry":{"type":"Polygon","coordinates":[[[41.554084,41.535656],[41.703171,41.962943],[41.45347,42.645123],[40.875469,43.013628],[40.321394,43.128634],[39.955009,43.434998],[40.076965,43.553104],[40.922185,43.382159],[42.394395,43.220308],[43.756017,42.740828],[43.9312,42.554974],[44.537623,42.711993],[45.470279,42.502781],[45.77641,42.092444],[46.404951,41.860675],[46.145432,41.722802],[46.637908,41.181673],[46.501637,41.064445],[45.962601,41.123873],[45.217426,41.411452],[44.97248,41.248129],[43.582746,41.092143],[42.619549,41.583173],[41.554084,41.535656]]]},"id":"GEO"},
-{"type":"Feature","properties":{"name":"Ghana"},"geometry":{"type":"Polygon","coordinates":[[[1.060122,5.928837],[-0.507638,5.343473],[-1.063625,5.000548],[-1.964707,4.710462],[-2.856125,4.994476],[-2.810701,5.389051],[-3.24437,6.250472],[-2.983585,7.379705],[-2.56219,8.219628],[-2.827496,9.642461],[-2.963896,10.395335],[-2.940409,10.96269],[-1.203358,11.009819],[-0.761576,10.93693],[-0.438702,11.098341],[0.023803,11.018682],[-0.049785,10.706918],[0.36758,10.191213],[0.365901,9.465004],[0.461192,8.677223],[0.712029,8.312465],[0.490957,7.411744],[0.570384,6.914359],[0.836931,6.279979],[1.060122,5.928837]]]},"id":"GHA"},
-{"type":"Feature","properties":{"name":"Guinea"},"geometry":{"type":"Polygon","coordinates":[[[-8.439298,7.686043],[-8.722124,7.711674],[-8.926065,7.309037],[-9.208786,7.313921],[-9.403348,7.526905],[-9.33728,7.928534],[-9.755342,8.541055],[-10.016567,8.428504],[-10.230094,8.406206],[-10.505477,8.348896],[-10.494315,8.715541],[-10.65477,8.977178],[-10.622395,9.26791],[-10.839152,9.688246],[-11.117481,10.045873],[-11.917277,10.046984],[-12.150338,9.858572],[-12.425929,9.835834],[-12.596719,9.620188],[-12.711958,9.342712],[-13.24655,8.903049],[-13.685154,9.494744],[-14.074045,9.886167],[-14.330076,10.01572],[-14.579699,10.214467],[-14.693232,10.656301],[-14.839554,10.876572],[-15.130311,11.040412],[-14.685687,11.527824],[-14.382192,11.509272],[-14.121406,11.677117],[-13.9008,11.678719],[-13.743161,11.811269],[-13.828272,12.142644],[-13.718744,12.247186],[-13.700476,12.586183],[-13.217818,12.575874],[-12.499051,12.33209],[-12.278599,12.35444],[-12.203565,12.465648],[-11.658301,12.386583],[-11.513943,12.442988],[-11.456169,12.076834],[-11.297574,12.077971],[-11.036556,12.211245],[-10.87083,12.177887],[-10.593224,11.923975],[-10.165214,11.844084],[-9.890993,12.060479],[-9.567912,12.194243],[-9.327616,12.334286],[-9.127474,12.30806],[-8.905265,12.088358],[-8.786099,11.812561],[-8.376305,11.393646],[-8.581305,11.136246],[-8.620321,10.810891],[-8.407311,10.909257],[-8.282357,10.792597],[-8.335377,10.494812],[-8.029944,10.206535],[-8.229337,10.12902],[-8.309616,9.789532],[-8.079114,9.376224],[-7.8321,8.575704],[-8.203499,8.455453],[-8.299049,8.316444],[-8.221792,8.123329],[-8.280703,7.68718],[-8.439298,7.686043]]]},"id":"GIN"},
-{"type":"Feature","properties":{"name":"Gambia"},"geometry":{"type":"Polygon","coordinates":[[[-16.841525,13.151394],[-16.713729,13.594959],[-15.624596,13.623587],[-15.39877,13.860369],[-15.081735,13.876492],[-14.687031,13.630357],[-14.376714,13.62568],[-14.046992,13.794068],[-13.844963,13.505042],[-14.277702,13.280585],[-14.712197,13.298207],[-15.141163,13.509512],[-15.511813,13.27857],[-15.691001,13.270353],[-15.931296,13.130284],[-16.841525,13.151394]]]},"id":"GMB"},
-{"type":"Feature","properties":{"name":"Guinea Bissau"},"geometry":{"type":"Polygon","coordinates":[[[-15.130311,11.040412],[-15.66418,11.458474],[-16.085214,11.524594],[-16.314787,11.806515],[-16.308947,11.958702],[-16.613838,12.170911],[-16.677452,12.384852],[-16.147717,12.547762],[-15.816574,12.515567],[-15.548477,12.62817],[-13.700476,12.586183],[-13.718744,12.247186],[-13.828272,12.142644],[-13.743161,11.811269],[-13.9008,11.678719],[-14.121406,11.677117],[-14.382192,11.509272],[-14.685687,11.527824],[-15.130311,11.040412]]]},"id":"GNB"},
-{"type":"Feature","properties":{"name":"Equatorial Guinea"},"geometry":{"type":"Polygon","coordinates":[[[9.492889,1.01012],[9.305613,1.160911],[9.649158,2.283866],[11.276449,2.261051],[11.285079,1.057662],[9.830284,1.067894],[9.492889,1.01012]]]},"id":"GNQ"},
-{"type":"Feature","properties":{"name":"Greece"},"geometry":{"type":"MultiPolygon","coordinates":[[[[23.69998,35.705004],[24.246665,35.368022],[25.025015,35.424996],[25.769208,35.354018],[25.745023,35.179998],[26.290003,35.29999],[26.164998,35.004995],[24.724982,34.919988],[24.735007,35.084991],[23.514978,35.279992],[23.69998,35.705004]]],[[[26.604196,41.562115],[26.294602,40.936261],[26.056942,40.824123],[25.447677,40.852545],[24.925848,40.947062],[23.714811,40.687129],[24.407999,40.124993],[23.899968,39.962006],[23.342999,39.960998],[22.813988,40.476005],[22.626299,40.256561],[22.849748,39.659311],[23.350027,39.190011],[22.973099,38.970903],[23.530016,38.510001],[24.025025,38.219993],[24.040011,37.655015],[23.115003,37.920011],[23.409972,37.409991],[22.774972,37.30501],[23.154225,36.422506],[22.490028,36.41],[21.670026,36.844986],[21.295011,37.644989],[21.120034,38.310323],[20.730032,38.769985],[20.217712,39.340235],[20.150016,39.624998],[20.615,40.110007],[20.674997,40.435],[20.99999,40.580004],[21.02004,40.842727],[21.674161,40.931275],[22.055378,41.149866],[22.597308,41.130487],[22.76177,41.3048],[22.952377,41.337994],[23.692074,41.309081],[24.492645,41.583896],[25.197201,41.234486],[26.106138,41.328899],[26.117042,41.826905],[26.604196,41.562115]]]]},"id":"GRC"},
-{"type":"Feature","properties":{"name":"Greenland"},"geometry":{"type":"Polygon","coordinates":[[[-46.76379,82.62796],[-43.40644,83.22516],[-39.89753,83.18018],[-38.62214,83.54905],[-35.08787,83.64513],[-27.10046,83.51966],[-20.84539,82.72669],[-22.69182,82.34165],[-26.51753,82.29765],[-31.9,82.2],[-31.39646,82.02154],[-27.85666,82.13178],[-24.84448,81.78697],[-22.90328,82.09317],[-22.07175,81.73449],[-23.16961,81.15271],[-20.62363,81.52462],[-15.76818,81.91245],[-12.77018,81.71885],[-12.20855,81.29154],[-16.28533,80.58004],[-16.85,80.35],[-20.04624,80.17708],[-17.73035,80.12912],[-18.9,79.4],[-19.70499,78.75128],[-19.67353,77.63859],[-18.47285,76.98565],[-20.03503,76.94434],[-21.67944,76.62795],[-19.83407,76.09808],[-19.59896,75.24838],[-20.66818,75.15585],[-19.37281,74.29561],[-21.59422,74.22382],[-20.43454,73.81713],[-20.76234,73.46436],[-22.17221,73.30955],[-23.56593,73.30663],[-22.31311,72.62928],[-22.29954,72.18409],[-24.27834,72.59788],[-24.79296,72.3302],[-23.44296,72.08016],[-22.13281,71.46898],[-21.75356,70.66369],[-23.53603,70.471],[-24.30702,70.85649],[-25.54341,71.43094],[-25.20135,70.75226],[-26.36276,70.22646],[-23.72742,70.18401],[-22.34902,70.12946],[-25.02927,69.2588],[-27.74737,68.47046],[-30.67371,68.12503],[-31.77665,68.12078],[-32.81105,67.73547],[-34.20196,66.67974],[-36.35284,65.9789],[-37.04378,65.93768],[-38.37505,65.69213],[-39.81222,65.45848],[-40.66899,64.83997],[-40.68281,64.13902],[-41.1887,63.48246],[-42.81938,62.68233],[-42.41666,61.90093],[-42.86619,61.07404],[-43.3784,60.09772],[-44.7875,60.03676],[-46.26364,60.85328],[-48.26294,60.85843],[-49.23308,61.40681],[-49.90039,62.38336],[-51.63325,63.62691],[-52.14014,64.27842],[-52.27659,65.1767],[-53.66166,66.09957],[-53.30161,66.8365],[-53.96911,67.18899],[-52.9804,68.35759],[-51.47536,68.72958],[-51.08041,69.14781],[-50.87122,69.9291],[-52.013585,69.574925],[-52.55792,69.42616],[-53.45629,69.283625],[-54.68336,69.61003],[-54.75001,70.28932],[-54.35884,70.821315],[-53.431315,70.835755],[-51.39014,70.56978],[-53.10937,71.20485],[-54.00422,71.54719],[-55,71.406537],[-55.83468,71.65444],[-54.71819,72.58625],[-55.32634,72.95861],[-56.12003,73.64977],[-57.32363,74.71026],[-58.59679,75.09861],[-58.58516,75.51727],[-61.26861,76.10238],[-63.39165,76.1752],[-66.06427,76.13486],[-68.50438,76.06141],[-69.66485,76.37975],[-71.40257,77.00857],[-68.77671,77.32312],[-66.76397,77.37595],[-71.04293,77.63595],[-73.297,78.04419],[-73.15938,78.43271],[-69.37345,78.91388],[-65.7107,79.39436],[-65.3239,79.75814],[-68.02298,80.11721],[-67.15129,80.51582],[-63.68925,81.21396],[-62.23444,81.3211],[-62.65116,81.77042],[-60.28249,82.03363],[-57.20744,82.19074],[-54.13442,82.19962],[-53.04328,81.88833],[-50.39061,82.43883],[-48.00386,82.06481],[-46.59984,81.985945],[-44.523,81.6607],[-46.9007,82.19979],[-46.76379,82.62796]]]},"id":"GRL"},
-{"type":"Feature","properties":{"name":"Guatemala"},"geometry":{"type":"Polygon","coordinates":[[[-90.095555,13.735338],[-90.608624,13.909771],[-91.23241,13.927832],[-91.689747,14.126218],[-92.22775,14.538829],[-92.20323,14.830103],[-92.087216,15.064585],[-92.229249,15.251447],[-91.74796,16.066565],[-90.464473,16.069562],[-90.438867,16.41011],[-90.600847,16.470778],[-90.711822,16.687483],[-91.08167,16.918477],[-91.453921,17.252177],[-91.002269,17.254658],[-91.00152,17.817595],[-90.067934,17.819326],[-89.14308,17.808319],[-89.150806,17.015577],[-89.229122,15.886938],[-88.930613,15.887273],[-88.604586,15.70638],[-88.518364,15.855389],[-88.225023,15.727722],[-88.68068,15.346247],[-89.154811,15.066419],[-89.22522,14.874286],[-89.145535,14.678019],[-89.353326,14.424133],[-89.587343,14.362586],[-89.534219,14.244816],[-89.721934,14.134228],[-90.064678,13.88197],[-90.095555,13.735338]]]},"id":"GTM"},
-{"type":"Feature","properties":{"name":"Guyana"},"geometry":{"type":"Polygon","coordinates":[[[-59.758285,8.367035],[-59.101684,7.999202],[-58.482962,7.347691],[-58.454876,6.832787],[-58.078103,6.809094],[-57.542219,6.321268],[-57.147436,5.97315],[-57.307246,5.073567],[-57.914289,4.812626],[-57.86021,4.576801],[-58.044694,4.060864],[-57.601569,3.334655],[-57.281433,3.333492],[-57.150098,2.768927],[-56.539386,1.899523],[-56.782704,1.863711],[-57.335823,1.948538],[-57.660971,1.682585],[-58.11345,1.507195],[-58.429477,1.463942],[-58.540013,1.268088],[-59.030862,1.317698],[-59.646044,1.786894],[-59.718546,2.24963],[-59.974525,2.755233],[-59.815413,3.606499],[-59.53804,3.958803],[-59.767406,4.423503],[-60.111002,4.574967],[-59.980959,5.014061],[-60.213683,5.244486],[-60.733574,5.200277],[-61.410303,5.959068],[-61.139415,6.234297],[-61.159336,6.696077],[-60.543999,6.856584],[-60.295668,7.043911],[-60.637973,7.415],[-60.550588,7.779603],[-59.758285,8.367035]]]},"id":"GUY"},
-{"type":"Feature","properties":{"name":"Honduras"},"geometry":{"type":"Polygon","coordinates":[[[-87.316654,12.984686],[-87.489409,13.297535],[-87.793111,13.38448],[-87.723503,13.78505],[-87.859515,13.893312],[-88.065343,13.964626],[-88.503998,13.845486],[-88.541231,13.980155],[-88.843073,14.140507],[-89.058512,14.340029],[-89.353326,14.424133],[-89.145535,14.678019],[-89.22522,14.874286],[-89.154811,15.066419],[-88.68068,15.346247],[-88.225023,15.727722],[-88.121153,15.688655],[-87.901813,15.864458],[-87.61568,15.878799],[-87.522921,15.797279],[-87.367762,15.84694],[-86.903191,15.756713],[-86.440946,15.782835],[-86.119234,15.893449],[-86.001954,16.005406],[-85.683317,15.953652],[-85.444004,15.885749],[-85.182444,15.909158],[-84.983722,15.995923],[-84.52698,15.857224],[-84.368256,15.835158],[-84.063055,15.648244],[-83.773977,15.424072],[-83.410381,15.270903],[-83.147219,14.995829],[-83.489989,15.016267],[-83.628585,14.880074],[-83.975721,14.749436],[-84.228342,14.748764],[-84.449336,14.621614],[-84.649582,14.666805],[-84.820037,14.819587],[-84.924501,14.790493],[-85.052787,14.551541],[-85.148751,14.560197],[-85.165365,14.35437],[-85.514413,14.079012],[-85.698665,13.960078],[-85.801295,13.836055],[-86.096264,14.038187],[-86.312142,13.771356],[-86.520708,13.778487],[-86.755087,13.754845],[-86.733822,13.263093],[-86.880557,13.254204],[-87.005769,13.025794],[-87.316654,12.984686]]]},"id":"HND"},
-{"type":"Feature","properties":{"name":"Croatia"},"geometry":{"type":"Polygon","coordinates":[[[18.829838,45.908878],[19.072769,45.521511],[19.390476,45.236516],[19.005486,44.860234],[18.553214,45.08159],[17.861783,45.06774],[17.002146,45.233777],[16.534939,45.211608],[16.318157,45.004127],[15.959367,45.233777],[15.750026,44.818712],[16.23966,44.351143],[16.456443,44.04124],[16.916156,43.667722],[17.297373,43.446341],[17.674922,43.028563],[18.56,42.65],[18.450016,42.479991],[17.50997,42.849995],[16.930006,43.209998],[16.015385,43.507215],[15.174454,44.243191],[15.37625,44.317915],[14.920309,44.738484],[14.901602,45.07606],[14.258748,45.233777],[13.952255,44.802124],[13.656976,45.136935],[13.679403,45.484149],[13.71506,45.500324],[14.411968,45.466166],[14.595109,45.634941],[14.935244,45.471695],[15.327675,45.452316],[15.323954,45.731783],[15.67153,45.834154],[15.768733,46.238108],[16.564808,46.503751],[16.882515,46.380632],[17.630066,45.951769],[18.456062,45.759481],[18.829838,45.908878]]]},"id":"HRV"},
-{"type":"Feature","properties":{"name":"Haiti"},"geometry":{"type":"Polygon","coordinates":[[[-73.189791,19.915684],[-72.579673,19.871501],[-71.712361,19.714456],[-71.624873,19.169838],[-71.701303,18.785417],[-71.945112,18.6169],[-71.687738,18.31666],[-71.708305,18.044997],[-72.372476,18.214961],[-72.844411,18.145611],[-73.454555,18.217906],[-73.922433,18.030993],[-74.458034,18.34255],[-74.369925,18.664908],[-73.449542,18.526053],[-72.694937,18.445799],[-72.334882,18.668422],[-72.79165,19.101625],[-72.784105,19.483591],[-73.415022,19.639551],[-73.189791,19.915684]]]},"id":"HTI"},
-{"type":"Feature","properties":{"name":"Hungary"},"geometry":{"type":"Polygon","coordinates":[[[16.202298,46.852386],[16.534268,47.496171],[16.340584,47.712902],[16.903754,47.714866],[16.979667,48.123497],[17.488473,47.867466],[17.857133,47.758429],[18.696513,47.880954],[18.777025,48.081768],[19.174365,48.111379],[19.661364,48.266615],[19.769471,48.202691],[20.239054,48.327567],[20.473562,48.56285],[20.801294,48.623854],[21.872236,48.319971],[22.085608,48.422264],[22.64082,48.15024],[22.710531,47.882194],[22.099768,47.672439],[21.626515,46.994238],[21.021952,46.316088],[20.220192,46.127469],[19.596045,46.17173],[18.829838,45.908878],[18.456062,45.759481],[17.630066,45.951769],[16.882515,46.380632],[16.564808,46.503751],[16.370505,46.841327],[16.202298,46.852386]]]},"id":"HUN"},
-{"type":"Feature","properties":{"name":"Indonesia"},"geometry":{"type":"MultiPolygon","coordinates":[[[[120.715609,-10.239581],[120.295014,-10.25865],[118.967808,-9.557969],[119.90031,-9.36134],[120.425756,-9.665921],[120.775502,-9.969675],[120.715609,-10.239581]]],[[[124.43595,-10.140001],[123.579982,-10.359987],[123.459989,-10.239995],[123.550009,-9.900016],[123.980009,-9.290027],[124.968682,-8.89279],[125.07002,-9.089987],[125.08852,-9.393173],[124.43595,-10.140001]]],[[[117.900018,-8.095681],[118.260616,-8.362383],[118.87846,-8.280683],[119.126507,-8.705825],[117.970402,-8.906639],[117.277731,-9.040895],[116.740141,-9.032937],[117.083737,-8.457158],[117.632024,-8.449303],[117.900018,-8.095681]]],[[[122.903537,-8.094234],[122.756983,-8.649808],[121.254491,-8.933666],[119.924391,-8.810418],[119.920929,-8.444859],[120.715092,-8.236965],[121.341669,-8.53674],[122.007365,-8.46062],[122.903537,-8.094234]]],[[[108.623479,-6.777674],[110.539227,-6.877358],[110.759576,-6.465186],[112.614811,-6.946036],[112.978768,-7.594213],[114.478935,-7.776528],[115.705527,-8.370807],[114.564511,-8.751817],[113.464734,-8.348947],[112.559672,-8.376181],[111.522061,-8.302129],[110.58615,-8.122605],[109.427667,-7.740664],[108.693655,-7.6416],[108.277763,-7.766657],[106.454102,-7.3549],[106.280624,-6.9249],[105.365486,-6.851416],[106.051646,-5.895919],[107.265009,-5.954985],[108.072091,-6.345762],[108.486846,-6.421985],[108.623479,-6.777674]]],[[[134.724624,-6.214401],[134.210134,-6.895238],[134.112776,-6.142467],[134.290336,-5.783058],[134.499625,-5.445042],[134.727002,-5.737582],[134.724624,-6.214401]]],[[[127.249215,-3.459065],[126.874923,-3.790983],[126.183802,-3.607376],[125.989034,-3.177273],[127.000651,-3.129318],[127.249215,-3.459065]]],[[[130.471344,-3.093764],[130.834836,-3.858472],[129.990547,-3.446301],[129.155249,-3.362637],[128.590684,-3.428679],[127.898891,-3.393436],[128.135879,-2.84365],[129.370998,-2.802154],[130.471344,-3.093764]]],[[[134.143368,-1.151867],[134.422627,-2.769185],[135.457603,-3.367753],[136.293314,-2.307042],[137.440738,-1.703513],[138.329727,-1.702686],[139.184921,-2.051296],[139.926684,-2.409052],[141.00021,-2.600151],[141.017057,-5.859022],[141.033852,-9.117893],[140.143415,-8.297168],[139.127767,-8.096043],[138.881477,-8.380935],[137.614474,-8.411683],[138.039099,-7.597882],[138.668621,-7.320225],[138.407914,-6.232849],[137.92784,-5.393366],[135.98925,-4.546544],[135.164598,-4.462931],[133.66288,-3.538853],[133.367705,-4.024819],[132.983956,-4.112979],[132.756941,-3.746283],[132.753789,-3.311787],[131.989804,-2.820551],[133.066845,-2.460418],[133.780031,-2.479848],[133.696212,-2.214542],[132.232373,-2.212526],[131.836222,-1.617162],[130.94284,-1.432522],[130.519558,-0.93772],[131.867538,-0.695461],[132.380116,-0.369538],[133.985548,-0.78021],[134.143368,-1.151867]]],[[[125.240501,1.419836],[124.437035,0.427881],[123.685505,0.235593],[122.723083,0.431137],[121.056725,0.381217],[120.183083,0.237247],[120.04087,-0.519658],[120.935905,-1.408906],[121.475821,-0.955962],[123.340565,-0.615673],[123.258399,-1.076213],[122.822715,-0.930951],[122.38853,-1.516858],[121.508274,-1.904483],[122.454572,-3.186058],[122.271896,-3.5295],[123.170963,-4.683693],[123.162333,-5.340604],[122.628515,-5.634591],[122.236394,-5.282933],[122.719569,-4.464172],[121.738234,-4.851331],[121.489463,-4.574553],[121.619171,-4.188478],[120.898182,-3.602105],[120.972389,-2.627643],[120.305453,-2.931604],[120.390047,-4.097579],[120.430717,-5.528241],[119.796543,-5.6734],[119.366906,-5.379878],[119.653606,-4.459417],[119.498835,-3.494412],[119.078344,-3.487022],[118.767769,-2.801999],[119.180974,-2.147104],[119.323394,-1.353147],[119.825999,0.154254],[120.035702,0.566477],[120.885779,1.309223],[121.666817,1.013944],[122.927567,0.875192],[124.077522,0.917102],[125.065989,1.643259],[125.240501,1.419836]]],[[[128.688249,1.132386],[128.635952,0.258486],[128.12017,0.356413],[127.968034,-0.252077],[128.379999,-0.780004],[128.100016,-0.899996],[127.696475,-0.266598],[127.39949,1.011722],[127.600512,1.810691],[127.932378,2.174596],[128.004156,1.628531],[128.594559,1.540811],[128.688249,1.132386]]],[[[117.875627,1.827641],[118.996747,0.902219],[117.811858,0.784242],[117.478339,0.102475],[117.521644,-0.803723],[116.560048,-1.487661],[116.533797,-2.483517],[116.148084,-4.012726],[116.000858,-3.657037],[114.864803,-4.106984],[114.468652,-3.495704],[113.755672,-3.43917],[113.256994,-3.118776],[112.068126,-3.478392],[111.703291,-2.994442],[111.04824,-3.049426],[110.223846,-2.934032],[110.070936,-1.592874],[109.571948,-1.314907],[109.091874,-0.459507],[108.952658,0.415375],[109.069136,1.341934],[109.66326,2.006467],[109.830227,1.338136],[110.514061,0.773131],[111.159138,0.976478],[111.797548,0.904441],[112.380252,1.410121],[112.859809,1.49779],[113.80585,1.217549],[114.621355,1.430688],[115.134037,2.821482],[115.519078,3.169238],[115.865517,4.306559],[117.015214,4.306094],[117.882035,4.137551],[117.313232,3.234428],[118.04833,2.28769],[117.875627,1.827641]]],[[[105.817655,-5.852356],[104.710384,-5.873285],[103.868213,-5.037315],[102.584261,-4.220259],[102.156173,-3.614146],[101.399113,-2.799777],[100.902503,-2.050262],[100.141981,-0.650348],[99.26374,0.183142],[98.970011,1.042882],[98.601351,1.823507],[97.699598,2.453184],[97.176942,3.308791],[96.424017,3.86886],[95.380876,4.970782],[95.293026,5.479821],[95.936863,5.439513],[97.484882,5.246321],[98.369169,4.26837],[99.142559,3.59035],[99.693998,3.174329],[100.641434,2.099381],[101.658012,2.083697],[102.498271,1.3987],[103.07684,0.561361],[103.838396,0.104542],[103.437645,-0.711946],[104.010789,-1.059212],[104.369991,-1.084843],[104.53949,-1.782372],[104.887893,-2.340425],[105.622111,-2.428844],[106.108593,-3.061777],[105.857446,-4.305525],[105.817655,-5.852356]]]]},"id":"IDN"},
-{"type":"Feature","properties":{"name":"India"},"geometry":{"type":"Polygon","coordinates":[[[77.837451,35.49401],[78.912269,34.321936],[78.811086,33.506198],[79.208892,32.994395],[79.176129,32.48378],[78.458446,32.618164],[78.738894,31.515906],[79.721367,30.882715],[81.111256,30.183481],[80.476721,29.729865],[80.088425,28.79447],[81.057203,28.416095],[81.999987,27.925479],[83.304249,27.364506],[84.675018,27.234901],[85.251779,26.726198],[86.024393,26.630985],[87.227472,26.397898],[88.060238,26.414615],[88.174804,26.810405],[88.043133,27.445819],[88.120441,27.876542],[88.730326,28.086865],[88.814248,27.299316],[88.835643,27.098966],[89.744528,26.719403],[90.373275,26.875724],[91.217513,26.808648],[92.033484,26.83831],[92.103712,27.452614],[91.696657,27.771742],[92.503119,27.896876],[93.413348,28.640629],[94.56599,29.277438],[95.404802,29.031717],[96.117679,29.452802],[96.586591,28.83098],[96.248833,28.411031],[97.327114,28.261583],[97.402561,27.882536],[97.051989,27.699059],[97.133999,27.083774],[96.419366,27.264589],[95.124768,26.573572],[95.155153,26.001307],[94.603249,25.162495],[94.552658,24.675238],[94.106742,23.850741],[93.325188,24.078556],[93.286327,23.043658],[93.060294,22.703111],[93.166128,22.27846],[92.672721,22.041239],[92.146035,23.627499],[91.869928,23.624346],[91.706475,22.985264],[91.158963,23.503527],[91.46773,24.072639],[91.915093,24.130414],[92.376202,24.976693],[91.799596,25.147432],[90.872211,25.132601],[89.920693,25.26975],[89.832481,25.965082],[89.355094,26.014407],[88.563049,26.446526],[88.209789,25.768066],[88.931554,25.238692],[88.306373,24.866079],[88.084422,24.501657],[88.69994,24.233715],[88.52977,23.631142],[88.876312,22.879146],[89.031961,22.055708],[88.888766,21.690588],[88.208497,21.703172],[86.975704,21.495562],[87.033169,20.743308],[86.499351,20.151638],[85.060266,19.478579],[83.941006,18.30201],[83.189217,17.671221],[82.192792,17.016636],[82.191242,16.556664],[81.692719,16.310219],[80.791999,15.951972],[80.324896,15.899185],[80.025069,15.136415],[80.233274,13.835771],[80.286294,13.006261],[79.862547,12.056215],[79.857999,10.357275],[79.340512,10.308854],[78.885345,9.546136],[79.18972,9.216544],[78.277941,8.933047],[77.941165,8.252959],[77.539898,7.965535],[76.592979,8.899276],[76.130061,10.29963],[75.746467,11.308251],[75.396101,11.781245],[74.864816,12.741936],[74.616717,13.992583],[74.443859,14.617222],[73.534199,15.990652],[73.119909,17.92857],[72.820909,19.208234],[72.824475,20.419503],[72.630533,21.356009],[71.175273,20.757441],[70.470459,20.877331],[69.16413,22.089298],[69.644928,22.450775],[69.349597,22.84318],[68.176645,23.691965],[68.842599,24.359134],[71.04324,24.356524],[70.844699,25.215102],[70.282873,25.722229],[70.168927,26.491872],[69.514393,26.940966],[70.616496,27.989196],[71.777666,27.91318],[72.823752,28.961592],[73.450638,29.976413],[74.42138,30.979815],[74.405929,31.692639],[75.258642,32.271105],[74.451559,32.7649],[74.104294,33.441473],[73.749948,34.317699],[74.240203,34.748887],[75.757061,34.504923],[76.871722,34.653544],[77.837451,35.49401]]]},"id":"IND"},
-{"type":"Feature","properties":{"name":"Ireland"},"geometry":{"type":"Polygon","coordinates":[[[-6.197885,53.867565],[-6.032985,53.153164],[-6.788857,52.260118],[-8.561617,51.669301],[-9.977086,51.820455],[-9.166283,52.864629],[-9.688525,53.881363],[-8.327987,54.664519],[-7.572168,55.131622],[-7.366031,54.595841],[-7.572168,54.059956],[-6.95373,54.073702],[-6.197885,53.867565]]]},"id":"IRL"},
-{"type":"Feature","properties":{"name":"Iran"},"geometry":{"type":"Polygon","coordinates":[[[53.921598,37.198918],[54.800304,37.392421],[55.511578,37.964117],[56.180375,37.935127],[56.619366,38.121394],[57.330434,38.029229],[58.436154,37.522309],[59.234762,37.412988],[60.377638,36.527383],[61.123071,36.491597],[61.210817,35.650072],[60.803193,34.404102],[60.52843,33.676446],[60.9637,33.528832],[60.536078,32.981269],[60.863655,32.18292],[60.941945,31.548075],[61.699314,31.379506],[61.781222,30.73585],[60.874248,29.829239],[61.369309,29.303276],[61.771868,28.699334],[62.72783,28.259645],[62.755426,27.378923],[63.233898,27.217047],[63.316632,26.756532],[61.874187,26.239975],[61.497363,25.078237],[59.616134,25.380157],[58.525761,25.609962],[57.397251,25.739902],[56.970766,26.966106],[56.492139,27.143305],[55.72371,26.964633],[54.71509,26.480658],[53.493097,26.812369],[52.483598,27.580849],[51.520763,27.86569],[50.852948,28.814521],[50.115009,30.147773],[49.57685,29.985715],[48.941333,30.31709],[48.567971,29.926778],[48.014568,30.452457],[48.004698,30.985137],[47.685286,30.984853],[47.849204,31.709176],[47.334661,32.469155],[46.109362,33.017287],[45.416691,33.967798],[45.64846,34.748138],[46.151788,35.093259],[46.07634,35.677383],[45.420618,35.977546],[44.77267,37.17045],[44.225756,37.971584],[44.421403,38.281281],[44.109225,39.428136],[44.79399,39.713003],[44.952688,39.335765],[45.457722,38.874139],[46.143623,38.741201],[46.50572,38.770605],[47.685079,39.508364],[48.060095,39.582235],[48.355529,39.288765],[48.010744,38.794015],[48.634375,38.270378],[48.883249,38.320245],[49.199612,37.582874],[50.147771,37.374567],[50.842354,36.872814],[52.264025,36.700422],[53.82579,36.965031],[53.921598,37.198918]]]},"id":"IRN"},
-{"type":"Feature","properties":{"name":"Iraq"},"geometry":{"type":"Polygon","coordinates":[[[45.420618,35.977546],[46.07634,35.677383],[46.151788,35.093259],[45.64846,34.748138],[45.416691,33.967798],[46.109362,33.017287],[47.334661,32.469155],[47.849204,31.709176],[47.685286,30.984853],[48.004698,30.985137],[48.014568,30.452457],[48.567971,29.926778],[47.974519,29.975819],[47.302622,30.05907],[46.568713,29.099025],[44.709499,29.178891],[41.889981,31.190009],[40.399994,31.889992],[39.195468,32.161009],[38.792341,33.378686],[41.006159,34.419372],[41.383965,35.628317],[41.289707,36.358815],[41.837064,36.605854],[42.349591,37.229873],[42.779126,37.385264],[43.942259,37.256228],[44.293452,37.001514],[44.772699,37.170445],[45.420618,35.977546]]]},"id":"IRQ"},
-{"type":"Feature","properties":{"name":"Iceland"},"geometry":{"type":"Polygon","coordinates":[[[-14.508695,66.455892],[-14.739637,65.808748],[-13.609732,65.126671],[-14.909834,64.364082],[-17.794438,63.678749],[-18.656246,63.496383],[-19.972755,63.643635],[-22.762972,63.960179],[-21.778484,64.402116],[-23.955044,64.89113],[-22.184403,65.084968],[-22.227423,65.378594],[-24.326184,65.611189],[-23.650515,66.262519],[-22.134922,66.410469],[-20.576284,65.732112],[-19.056842,66.276601],[-17.798624,65.993853],[-16.167819,66.526792],[-14.508695,66.455892]]]},"id":"ISL"},
-{"type":"Feature","properties":{"name":"Israel"},"geometry":{"type":"Polygon","coordinates":[[[35.719918,32.709192],[35.545665,32.393992],[35.18393,32.532511],[34.974641,31.866582],[35.225892,31.754341],[34.970507,31.616778],[34.927408,31.353435],[35.397561,31.489086],[35.420918,31.100066],[34.922603,29.501326],[34.265433,31.219361],[34.556372,31.548824],[34.488107,31.605539],[34.752587,32.072926],[34.955417,32.827376],[35.098457,33.080539],[35.126053,33.0909],[35.460709,33.08904],[35.552797,33.264275],[35.821101,33.277426],[35.836397,32.868123],[35.700798,32.716014],[35.719918,32.709192]]]},"id":"ISR"},
-{"type":"Feature","properties":{"name":"Italy"},"geometry":{"type":"MultiPolygon","coordinates":[[[[15.520376,38.231155],[15.160243,37.444046],[15.309898,37.134219],[15.099988,36.619987],[14.335229,36.996631],[13.826733,37.104531],[12.431004,37.61295],[12.570944,38.126381],[13.741156,38.034966],[14.761249,38.143874],[15.520376,38.231155]]],[[[9.210012,41.209991],[9.809975,40.500009],[9.669519,39.177376],[9.214818,39.240473],[8.806936,38.906618],[8.428302,39.171847],[8.388253,40.378311],[8.159998,40.950007],[8.709991,40.899984],[9.210012,41.209991]]],[[[12.376485,46.767559],[13.806475,46.509306],[13.69811,46.016778],[13.93763,45.591016],[13.141606,45.736692],[12.328581,45.381778],[12.383875,44.885374],[12.261453,44.600482],[12.589237,44.091366],[13.526906,43.587727],[14.029821,42.761008],[15.14257,41.95514],[15.926191,41.961315],[16.169897,41.740295],[15.889346,41.541082],[16.785002,41.179606],[17.519169,40.877143],[18.376687,40.355625],[18.480247,40.168866],[18.293385,39.810774],[17.73838,40.277671],[16.869596,40.442235],[16.448743,39.795401],[17.17149,39.4247],[17.052841,38.902871],[16.635088,38.843572],[16.100961,37.985899],[15.684087,37.908849],[15.687963,38.214593],[15.891981,38.750942],[16.109332,38.964547],[15.718814,39.544072],[15.413613,40.048357],[14.998496,40.172949],[14.703268,40.60455],[14.060672,40.786348],[13.627985,41.188287],[12.888082,41.25309],[12.106683,41.704535],[11.191906,42.355425],[10.511948,42.931463],[10.200029,43.920007],[9.702488,44.036279],[8.888946,44.366336],[8.428561,44.231228],[7.850767,43.767148],[7.435185,43.693845],[7.549596,44.127901],[7.007562,44.254767],[6.749955,45.028518],[7.096652,45.333099],[6.802355,45.70858],[6.843593,45.991147],[7.273851,45.776948],[7.755992,45.82449],[8.31663,46.163642],[8.489952,46.005151],[8.966306,46.036932],[9.182882,46.440215],[9.922837,46.314899],[10.363378,46.483571],[10.442701,46.893546],[11.048556,46.751359],[11.164828,46.941579],[12.153088,47.115393],[12.376485,46.767559]]]]},"id":"ITA"},
-{"type":"Feature","properties":{"name":"Jamaica"},"geometry":{"type":"Polygon","coordinates":[[[-77.569601,18.490525],[-76.896619,18.400867],[-76.365359,18.160701],[-76.199659,17.886867],[-76.902561,17.868238],[-77.206341,17.701116],[-77.766023,17.861597],[-78.337719,18.225968],[-78.217727,18.454533],[-77.797365,18.524218],[-77.569601,18.490525]]]},"id":"JAM"},
-{"type":"Feature","properties":{"name":"Jordan"},"geometry":{"type":"Polygon","coordinates":[[[35.545665,32.393992],[35.719918,32.709192],[36.834062,32.312938],[38.792341,33.378686],[39.195468,32.161009],[39.004886,32.010217],[37.002166,31.508413],[37.998849,30.5085],[37.66812,30.338665],[37.503582,30.003776],[36.740528,29.865283],[36.501214,29.505254],[36.068941,29.197495],[34.956037,29.356555],[34.922603,29.501326],[35.420918,31.100066],[35.397561,31.489086],[35.545252,31.782505],[35.545665,32.393992]]]},"id":"JOR"},
-{"type":"Feature","properties":{"name":"Japan"},"geometry":{"type":"MultiPolygon","coordinates":[[[[134.638428,34.149234],[134.766379,33.806335],[134.203416,33.201178],[133.79295,33.521985],[133.280268,33.28957],[133.014858,32.704567],[132.363115,32.989382],[132.371176,33.463642],[132.924373,34.060299],[133.492968,33.944621],[133.904106,34.364931],[134.638428,34.149234]]],[[[140.976388,37.142074],[140.59977,36.343983],[140.774074,35.842877],[140.253279,35.138114],[138.975528,34.6676],[137.217599,34.606286],[135.792983,33.464805],[135.120983,33.849071],[135.079435,34.596545],[133.340316,34.375938],[132.156771,33.904933],[130.986145,33.885761],[132.000036,33.149992],[131.33279,31.450355],[130.686318,31.029579],[130.20242,31.418238],[130.447676,32.319475],[129.814692,32.61031],[129.408463,33.296056],[130.353935,33.604151],[130.878451,34.232743],[131.884229,34.749714],[132.617673,35.433393],[134.608301,35.731618],[135.677538,35.527134],[136.723831,37.304984],[137.390612,36.827391],[138.857602,37.827485],[139.426405,38.215962],[140.05479,39.438807],[139.883379,40.563312],[140.305783,41.195005],[141.368973,41.37856],[141.914263,39.991616],[141.884601,39.180865],[140.959489,38.174001],[140.976388,37.142074]]],[[[143.910162,44.1741],[144.613427,43.960883],[145.320825,44.384733],[145.543137,43.262088],[144.059662,42.988358],[143.18385,41.995215],[141.611491,42.678791],[141.067286,41.584594],[139.955106,41.569556],[139.817544,42.563759],[140.312087,43.333273],[141.380549,43.388825],[141.671952,44.772125],[141.967645,45.551483],[143.14287,44.510358],[143.910162,44.1741]]]]},"id":"JPN"},
-{"type":"Feature","properties":{"name":"Kazakhstan"},"geometry":{"type":"Polygon","coordinates":[[[70.962315,42.266154],[70.388965,42.081308],[69.070027,41.384244],[68.632483,40.668681],[68.259896,40.662325],[67.985856,41.135991],[66.714047,41.168444],[66.510649,41.987644],[66.023392,41.994646],[66.098012,42.99766],[64.900824,43.728081],[63.185787,43.650075],[62.0133,43.504477],[61.05832,44.405817],[60.239972,44.784037],[58.689989,45.500014],[58.503127,45.586804],[55.928917,44.995858],[55.968191,41.308642],[55.455251,41.259859],[54.755345,42.043971],[54.079418,42.324109],[52.944293,42.116034],[52.50246,41.783316],[52.446339,42.027151],[52.692112,42.443895],[52.501426,42.792298],[51.342427,43.132975],[50.891292,44.031034],[50.339129,44.284016],[50.305643,44.609836],[51.278503,44.514854],[51.316899,45.245998],[52.16739,45.408391],[53.040876,45.259047],[53.220866,46.234646],[53.042737,46.853006],[52.042023,46.804637],[51.191945,47.048705],[50.034083,46.60899],[49.10116,46.39933],[48.593241,46.561034],[48.694734,47.075628],[48.057253,47.743753],[47.315231,47.715847],[46.466446,48.394152],[47.043672,49.152039],[46.751596,49.356006],[47.54948,50.454698],[48.577841,49.87476],[48.702382,50.605128],[50.766648,51.692762],[52.328724,51.718652],[54.532878,51.02624],[55.716941,50.621717],[56.777961,51.043551],[58.363291,51.063653],[59.642282,50.545442],[59.932807,50.842194],[61.337424,50.79907],[61.588003,51.272659],[59.967534,51.96042],[60.927269,52.447548],[60.739993,52.719986],[61.699986,52.979996],[60.978066,53.664993],[61.436591,54.006265],[65.178534,54.354228],[65.666876,54.601267],[68.1691,54.970392],[69.068167,55.38525],[70.865267,55.169734],[71.180131,54.133285],[72.22415,54.376655],[73.508516,54.035617],[73.425679,53.48981],[74.384845,53.546861],[76.8911,54.490524],[76.525179,54.177003],[77.800916,53.404415],[80.03556,50.864751],[80.568447,51.388336],[81.945986,50.812196],[83.383004,51.069183],[83.935115,50.889246],[84.416377,50.3114],[85.11556,50.117303],[85.54127,49.692859],[86.829357,49.826675],[87.35997,49.214981],[86.598776,48.549182],[85.768233,48.455751],[85.720484,47.452969],[85.16429,47.000956],[83.180484,47.330031],[82.458926,45.53965],[81.947071,45.317027],[79.966106,44.917517],[80.866206,43.180362],[80.18015,42.920068],[80.25999,42.349999],[79.643645,42.496683],[79.142177,42.856092],[77.658392,42.960686],[76.000354,42.988022],[75.636965,42.8779],[74.212866,43.298339],[73.645304,43.091272],[73.489758,42.500894],[71.844638,42.845395],[71.186281,42.704293],[70.962315,42.266154]]]},"id":"KAZ"},
-{"type":"Feature","properties":{"name":"Kenya"},"geometry":{"type":"Polygon","coordinates":[[[40.993,-0.85829],[41.58513,-1.68325],[40.88477,-2.08255],[40.63785,-2.49979],[40.26304,-2.57309],[40.12119,-3.27768],[39.80006,-3.68116],[39.60489,-4.34653],[39.20222,-4.67677],[37.7669,-3.67712],[37.69869,-3.09699],[34.07262,-1.05982],[33.903711,-0.95],[33.893569,0.109814],[34.18,0.515],[34.6721,1.17694],[35.03599,1.90584],[34.59607,3.05374],[34.47913,3.5556],[34.005,4.249885],[34.620196,4.847123],[35.298007,5.506],[35.817448,5.338232],[35.817448,4.776966],[36.159079,4.447864],[36.855093,4.447864],[38.120915,3.598605],[38.43697,3.58851],[38.67114,3.61607],[38.89251,3.50074],[39.559384,3.42206],[39.85494,3.83879],[40.76848,4.25702],[41.1718,3.91909],[41.855083,3.918912],[40.98105,2.78452],[40.993,-0.85829]]]},"id":"KEN"},
-{"type":"Feature","properties":{"name":"Kyrgyzstan"},"geometry":{"type":"Polygon","coordinates":[[[70.962315,42.266154],[71.186281,42.704293],[71.844638,42.845395],[73.489758,42.500894],[73.645304,43.091272],[74.212866,43.298339],[75.636965,42.8779],[76.000354,42.988022],[77.658392,42.960686],[79.142177,42.856092],[79.643645,42.496683],[80.25999,42.349999],[80.11943,42.123941],[78.543661,41.582243],[78.187197,41.185316],[76.904484,41.066486],[76.526368,40.427946],[75.467828,40.562072],[74.776862,40.366425],[73.822244,39.893973],[73.960013,39.660008],[73.675379,39.431237],[71.784694,39.279463],[70.549162,39.604198],[69.464887,39.526683],[69.55961,40.103211],[70.648019,39.935754],[71.014198,40.244366],[71.774875,40.145844],[73.055417,40.866033],[71.870115,41.3929],[71.157859,41.143587],[70.420022,41.519998],[71.259248,42.167711],[70.962315,42.266154]]]},"id":"KGZ"},
-{"type":"Feature","properties":{"name":"Cambodia"},"geometry":{"type":"Polygon","coordinates":[[[103.49728,10.632555],[103.09069,11.153661],[102.584932,12.186595],[102.348099,13.394247],[102.988422,14.225721],[104.281418,14.416743],[105.218777,14.273212],[106.043946,13.881091],[106.496373,14.570584],[107.382727,14.202441],[107.614548,13.535531],[107.491403,12.337206],[105.810524,11.567615],[106.24967,10.961812],[105.199915,10.88931],[104.334335,10.486544],[103.49728,10.632555]]]},"id":"KHM"},
-{"type":"Feature","properties":{"name":"South Korea"},"geometry":{"type":"Polygon","coordinates":[[[128.349716,38.612243],[129.21292,37.432392],[129.46045,36.784189],[129.468304,35.632141],[129.091377,35.082484],[128.18585,34.890377],[127.386519,34.475674],[126.485748,34.390046],[126.37392,34.93456],[126.559231,35.684541],[126.117398,36.725485],[126.860143,36.893924],[126.174759,37.749686],[126.237339,37.840378],[126.68372,37.804773],[127.073309,38.256115],[127.780035,38.304536],[128.205746,38.370397],[128.349716,38.612243]]]},"id":"KOR"},
-{"type":"Feature","properties":{"name":"Kosovo"},"geometry":{"type":"Polygon","coordinates":[[[20.76216,42.05186],[20.71731,41.84711],[20.59023,41.85541],[20.52295,42.21787],[20.28374,42.32025],[20.0707,42.58863],[20.25758,42.81275],[20.49679,42.88469],[20.63508,43.21671],[20.81448,43.27205],[20.95651,43.13094],[21.143395,43.068685],[21.27421,42.90959],[21.43866,42.86255],[21.63302,42.67717],[21.77505,42.6827],[21.66292,42.43922],[21.54332,42.32025],[21.576636,42.245224],[21.3527,42.2068],[20.76216,42.05186]]]},"id":"-99"},
-{"type":"Feature","properties":{"name":"Kuwait"},"geometry":{"type":"Polygon","coordinates":[[[47.974519,29.975819],[48.183189,29.534477],[48.093943,29.306299],[48.416094,28.552004],[47.708851,28.526063],[47.459822,29.002519],[46.568713,29.099025],[47.302622,30.05907],[47.974519,29.975819]]]},"id":"KWT"},
-{"type":"Feature","properties":{"name":"Laos"},"geometry":{"type":"Polygon","coordinates":[[[105.218777,14.273212],[105.544338,14.723934],[105.589039,15.570316],[104.779321,16.441865],[104.716947,17.428859],[103.956477,18.240954],[103.200192,18.309632],[102.998706,17.961695],[102.413005,17.932782],[102.113592,18.109102],[101.059548,17.512497],[101.035931,18.408928],[101.282015,19.462585],[100.606294,19.508344],[100.548881,20.109238],[100.115988,20.41785],[100.329101,20.786122],[101.180005,21.436573],[101.270026,21.201652],[101.80312,21.174367],[101.652018,22.318199],[102.170436,22.464753],[102.754896,21.675137],[103.203861,20.766562],[104.435,20.758733],[104.822574,19.886642],[104.183388,19.624668],[103.896532,19.265181],[105.094598,18.666975],[105.925762,17.485315],[106.556008,16.604284],[107.312706,15.908538],[107.564525,15.202173],[107.382727,14.202441],[106.496373,14.570584],[106.043946,13.881091],[105.218777,14.273212]]]},"id":"LAO"},
-{"type":"Feature","properties":{"name":"Lebanon"},"geometry":{"type":"Polygon","coordinates":[[[35.821101,33.277426],[35.552797,33.264275],[35.460709,33.08904],[35.126053,33.0909],[35.482207,33.90545],[35.979592,34.610058],[35.998403,34.644914],[36.448194,34.593935],[36.61175,34.201789],[36.06646,33.824912],[35.821101,33.277426]]]},"id":"LBN"},
-{"type":"Feature","properties":{"name":"Liberia"},"geometry":{"type":"Polygon","coordinates":[[[-7.712159,4.364566],[-7.974107,4.355755],[-9.004794,4.832419],[-9.91342,5.593561],[-10.765384,6.140711],[-11.438779,6.785917],[-11.199802,7.105846],[-11.146704,7.396706],[-10.695595,7.939464],[-10.230094,8.406206],[-10.016567,8.428504],[-9.755342,8.541055],[-9.33728,7.928534],[-9.403348,7.526905],[-9.208786,7.313921],[-8.926065,7.309037],[-8.722124,7.711674],[-8.439298,7.686043],[-8.485446,7.395208],[-8.385452,6.911801],[-8.60288,6.467564],[-8.311348,6.193033],[-7.993693,6.12619],[-7.570153,5.707352],[-7.539715,5.313345],[-7.635368,5.188159],[-7.712159,4.364566]]]},"id":"LBR"},
-{"type":"Feature","properties":{"name":"Libya"},"geometry":{"type":"Polygon","coordinates":[[[14.8513,22.86295],[14.143871,22.491289],[13.581425,23.040506],[11.999506,23.471668],[11.560669,24.097909],[10.771364,24.562532],[10.303847,24.379313],[9.948261,24.936954],[9.910693,25.365455],[9.319411,26.094325],[9.716286,26.512206],[9.629056,27.140953],[9.756128,27.688259],[9.683885,28.144174],[9.859998,28.95999],[9.805634,29.424638],[9.48214,30.307556],[9.970017,30.539325],[10.056575,30.961831],[9.950225,31.37607],[10.636901,31.761421],[10.94479,32.081815],[11.432253,32.368903],[11.488787,33.136996],[12.66331,32.79278],[13.08326,32.87882],[13.91868,32.71196],[15.24563,32.26508],[15.71394,31.37626],[16.61162,31.18218],[18.02109,30.76357],[19.08641,30.26639],[19.57404,30.52582],[20.05335,30.98576],[19.82033,31.75179],[20.13397,32.2382],[20.85452,32.7068],[21.54298,32.8432],[22.89576,32.63858],[23.2368,32.19149],[23.60913,32.18726],[23.9275,32.01667],[24.92114,31.89936],[25.16482,31.56915],[24.80287,31.08929],[24.95762,30.6616],[24.70007,30.04419],[25,29.238655],[25,25.6825],[25,22],[25,20.00304],[23.85,20],[23.83766,19.58047],[19.84926,21.49509],[15.86085,23.40972],[14.8513,22.86295]]]},"id":"LBY"},
-{"type":"Feature","properties":{"name":"Sri Lanka"},"geometry":{"type":"Polygon","coordinates":[[[81.787959,7.523055],[81.637322,6.481775],[81.21802,6.197141],[80.348357,5.96837],[79.872469,6.763463],[79.695167,8.200843],[80.147801,9.824078],[80.838818,9.268427],[81.304319,8.564206],[81.787959,7.523055]]]},"id":"LKA"},
-{"type":"Feature","properties":{"name":"Lesotho"},"geometry":{"type":"Polygon","coordinates":[[[28.978263,-28.955597],[29.325166,-29.257387],[29.018415,-29.743766],[28.8484,-30.070051],[28.291069,-30.226217],[28.107205,-30.545732],[27.749397,-30.645106],[26.999262,-29.875954],[27.532511,-29.242711],[28.074338,-28.851469],[28.5417,-28.647502],[28.978263,-28.955597]]]},"id":"LSO"},
-{"type":"Feature","properties":{"name":"Lithuania"},"geometry":{"type":"Polygon","coordinates":[[[22.731099,54.327537],[22.651052,54.582741],[22.757764,54.856574],[22.315724,55.015299],[21.268449,55.190482],[21.0558,56.031076],[22.201157,56.337802],[23.878264,56.273671],[24.860684,56.372528],[25.000934,56.164531],[25.533047,56.100297],[26.494331,55.615107],[26.588279,55.167176],[25.768433,54.846963],[25.536354,54.282423],[24.450684,53.905702],[23.484128,53.912498],[23.243987,54.220567],[22.731099,54.327537]]]},"id":"LTU"},
-{"type":"Feature","properties":{"name":"Luxembourg"},"geometry":{"type":"Polygon","coordinates":[[[6.043073,50.128052],[6.242751,49.902226],[6.18632,49.463803],[5.897759,49.442667],[5.674052,49.529484],[5.782417,50.090328],[6.043073,50.128052]]]},"id":"LUX"},
-{"type":"Feature","properties":{"name":"Latvia"},"geometry":{"type":"Polygon","coordinates":[[[21.0558,56.031076],[21.090424,56.783873],[21.581866,57.411871],[22.524341,57.753374],[23.318453,57.006236],[24.12073,57.025693],[24.312863,57.793424],[25.164594,57.970157],[25.60281,57.847529],[26.463532,57.476389],[27.288185,57.474528],[27.770016,57.244258],[27.855282,56.759326],[28.176709,56.16913],[27.10246,55.783314],[26.494331,55.615107],[25.533047,56.100297],[25.000934,56.164531],[24.860684,56.372528],[23.878264,56.273671],[22.201157,56.337802],[21.0558,56.031076]]]},"id":"LVA"},
-{"type":"Feature","properties":{"name":"Morocco"},"geometry":{"type":"Polygon","coordinates":[[[-5.193863,35.755182],[-4.591006,35.330712],[-3.640057,35.399855],[-2.604306,35.179093],[-2.169914,35.168396],[-1.792986,34.527919],[-1.733455,33.919713],[-1.388049,32.864015],[-1.124551,32.651522],[-1.307899,32.262889],[-2.616605,32.094346],[-3.06898,31.724498],[-3.647498,31.637294],[-3.690441,30.896952],[-4.859646,30.501188],[-5.242129,30.000443],[-6.060632,29.7317],[-7.059228,29.579228],[-8.674116,28.841289],[-8.66559,27.656426],[-8.817809,27.656426],[-8.817828,27.656426],[-8.794884,27.120696],[-9.413037,27.088476],[-9.735343,26.860945],[-10.189424,26.860945],[-10.551263,26.990808],[-11.392555,26.883424],[-11.71822,26.104092],[-12.030759,26.030866],[-12.500963,24.770116],[-13.89111,23.691009],[-14.221168,22.310163],[-14.630833,21.86094],[-14.750955,21.5006],[-17.002962,21.420734],[-17.020428,21.42231],[-16.973248,21.885745],[-16.589137,22.158234],[-16.261922,22.67934],[-16.326414,23.017768],[-15.982611,23.723358],[-15.426004,24.359134],[-15.089332,24.520261],[-14.824645,25.103533],[-14.800926,25.636265],[-14.43994,26.254418],[-13.773805,26.618892],[-13.139942,27.640148],[-13.121613,27.654148],[-12.618837,28.038186],[-11.688919,28.148644],[-10.900957,28.832142],[-10.399592,29.098586],[-9.564811,29.933574],[-9.814718,31.177736],[-9.434793,32.038096],[-9.300693,32.564679],[-8.657476,33.240245],[-7.654178,33.697065],[-6.912544,34.110476],[-6.244342,35.145865],[-5.929994,35.759988],[-5.193863,35.755182]]]},"id":"MAR"},
-{"type":"Feature","properties":{"name":"Moldova"},"geometry":{"type":"Polygon","coordinates":[[[26.619337,48.220726],[26.857824,48.368211],[27.522537,48.467119],[28.259547,48.155562],[28.670891,48.118149],[29.122698,47.849095],[29.050868,47.510227],[29.415135,47.346645],[29.559674,46.928583],[29.908852,46.674361],[29.83821,46.525326],[30.024659,46.423937],[29.759972,46.349988],[29.170654,46.379262],[29.072107,46.517678],[28.862972,46.437889],[28.933717,46.25883],[28.659987,45.939987],[28.485269,45.596907],[28.233554,45.488283],[28.054443,45.944586],[28.160018,46.371563],[28.12803,46.810476],[27.551166,47.405117],[27.233873,47.826771],[26.924176,48.123264],[26.619337,48.220726]]]},"id":"MDA"},
-{"type":"Feature","properties":{"name":"Madagascar"},"geometry":{"type":"Polygon","coordinates":[[[49.543519,-12.469833],[49.808981,-12.895285],[50.056511,-13.555761],[50.217431,-14.758789],[50.476537,-15.226512],[50.377111,-15.706069],[50.200275,-16.000263],[49.860606,-15.414253],[49.672607,-15.710204],[49.863344,-16.451037],[49.774564,-16.875042],[49.498612,-17.106036],[49.435619,-17.953064],[49.041792,-19.118781],[48.548541,-20.496888],[47.930749,-22.391501],[47.547723,-23.781959],[47.095761,-24.94163],[46.282478,-25.178463],[45.409508,-25.601434],[44.833574,-25.346101],[44.03972,-24.988345],[43.763768,-24.460677],[43.697778,-23.574116],[43.345654,-22.776904],[43.254187,-22.057413],[43.433298,-21.336475],[43.893683,-21.163307],[43.89637,-20.830459],[44.374325,-20.072366],[44.464397,-19.435454],[44.232422,-18.961995],[44.042976,-18.331387],[43.963084,-17.409945],[44.312469,-16.850496],[44.446517,-16.216219],[44.944937,-16.179374],[45.502732,-15.974373],[45.872994,-15.793454],[46.312243,-15.780018],[46.882183,-15.210182],[47.70513,-14.594303],[48.005215,-14.091233],[47.869047,-13.663869],[48.293828,-13.784068],[48.84506,-13.089175],[48.863509,-12.487868],[49.194651,-12.040557],[49.543519,-12.469833]]]},"id":"MDG"},
-{"type":"Feature","properties":{"name":"Mexico"},"geometry":{"type":"Polygon","coordinates":[[[-97.140008,25.869997],[-97.528072,24.992144],[-97.702946,24.272343],[-97.776042,22.93258],[-97.872367,22.444212],[-97.699044,21.898689],[-97.38896,21.411019],[-97.189333,20.635433],[-96.525576,19.890931],[-96.292127,19.320371],[-95.900885,18.828024],[-94.839063,18.562717],[-94.42573,18.144371],[-93.548651,18.423837],[-92.786114,18.524839],[-92.037348,18.704569],[-91.407903,18.876083],[-90.77187,19.28412],[-90.53359,19.867418],[-90.451476,20.707522],[-90.278618,20.999855],[-89.601321,21.261726],[-88.543866,21.493675],[-87.658417,21.458846],[-87.05189,21.543543],[-86.811982,21.331515],[-86.845908,20.849865],[-87.383291,20.255405],[-87.621054,19.646553],[-87.43675,19.472403],[-87.58656,19.04013],[-87.837191,18.259816],[-88.090664,18.516648],[-88.300031,18.499982],[-88.490123,18.486831],[-88.848344,17.883198],[-89.029857,18.001511],[-89.150909,17.955468],[-89.14308,17.808319],[-90.067934,17.819326],[-91.00152,17.817595],[-91.002269,17.254658],[-91.453921,17.252177],[-91.08167,16.918477],[-90.711822,16.687483],[-90.600847,16.470778],[-90.438867,16.41011],[-90.464473,16.069562],[-91.74796,16.066565],[-92.229249,15.251447],[-92.087216,15.064585],[-92.20323,14.830103],[-92.22775,14.538829],[-93.359464,15.61543],[-93.875169,15.940164],[-94.691656,16.200975],[-95.250227,16.128318],[-96.053382,15.752088],[-96.557434,15.653515],[-97.263592,15.917065],[-98.01303,16.107312],[-98.947676,16.566043],[-99.697397,16.706164],[-100.829499,17.171071],[-101.666089,17.649026],[-101.918528,17.91609],[-102.478132,17.975751],[-103.50099,18.292295],[-103.917527,18.748572],[-104.99201,19.316134],[-105.493038,19.946767],[-105.731396,20.434102],[-105.397773,20.531719],[-105.500661,20.816895],[-105.270752,21.076285],[-105.265817,21.422104],[-105.603161,21.871146],[-105.693414,22.26908],[-106.028716,22.773752],[-106.90998,23.767774],[-107.915449,24.548915],[-108.401905,25.172314],[-109.260199,25.580609],[-109.444089,25.824884],[-109.291644,26.442934],[-109.801458,26.676176],[-110.391732,27.162115],[-110.641019,27.859876],[-111.178919,27.941241],[-111.759607,28.467953],[-112.228235,28.954409],[-112.271824,29.266844],[-112.809594,30.021114],[-113.163811,30.786881],[-113.148669,31.170966],[-113.871881,31.567608],[-114.205737,31.524045],[-114.776451,31.799532],[-114.9367,31.393485],[-114.771232,30.913617],[-114.673899,30.162681],[-114.330974,29.750432],[-113.588875,29.061611],[-113.424053,28.826174],[-113.271969,28.754783],[-113.140039,28.411289],[-112.962298,28.42519],[-112.761587,27.780217],[-112.457911,27.525814],[-112.244952,27.171727],[-111.616489,26.662817],[-111.284675,25.73259],[-110.987819,25.294606],[-110.710007,24.826004],[-110.655049,24.298595],[-110.172856,24.265548],[-109.771847,23.811183],[-109.409104,23.364672],[-109.433392,23.185588],[-109.854219,22.818272],[-110.031392,22.823078],[-110.295071,23.430973],[-110.949501,24.000964],[-111.670568,24.484423],[-112.182036,24.738413],[-112.148989,25.470125],[-112.300711,26.012004],[-112.777297,26.32196],[-113.464671,26.768186],[-113.59673,26.63946],[-113.848937,26.900064],[-114.465747,27.14209],[-115.055142,27.722727],[-114.982253,27.7982],[-114.570366,27.741485],[-114.199329,28.115003],[-114.162018,28.566112],[-114.931842,29.279479],[-115.518654,29.556362],[-115.887365,30.180794],[-116.25835,30.836464],[-116.721526,31.635744],[-117.12776,32.53534],[-115.99135,32.61239],[-114.72139,32.72083],[-114.815,32.52528],[-113.30498,32.03914],[-111.02361,31.33472],[-109.035,31.34194],[-108.24194,31.34222],[-108.24,31.754854],[-106.50759,31.75452],[-106.1429,31.39995],[-105.63159,31.08383],[-105.03737,30.64402],[-104.70575,30.12173],[-104.45697,29.57196],[-103.94,29.27],[-103.11,28.97],[-102.48,29.76],[-101.6624,29.7793],[-100.9576,29.38071],[-100.45584,28.69612],[-100.11,28.11],[-99.52,27.54],[-99.3,26.84],[-99.02,26.37],[-98.24,26.06],[-97.53,25.84],[-97.140008,25.869997]]]},"id":"MEX"},
-{"type":"Feature","properties":{"name":"Macedonia"},"geometry":{"type":"Polygon","coordinates":[[[20.59023,41.85541],[20.71731,41.84711],[20.76216,42.05186],[21.3527,42.2068],[21.576636,42.245224],[21.91708,42.30364],[22.380526,42.32026],[22.881374,41.999297],[22.952377,41.337994],[22.76177,41.3048],[22.597308,41.130487],[22.055378,41.149866],[21.674161,40.931275],[21.02004,40.842727],[20.60518,41.08622],[20.46315,41.51509],[20.59023,41.85541]]]},"id":"MKD"},
-{"type":"Feature","properties":{"name":"Mali"},"geometry":{"type":"Polygon","coordinates":[[[-12.17075,14.616834],[-11.834208,14.799097],[-11.666078,15.388208],[-11.349095,15.411256],[-10.650791,15.132746],[-10.086846,15.330486],[-9.700255,15.264107],[-9.550238,15.486497],[-5.537744,15.50169],[-5.315277,16.201854],[-5.488523,16.325102],[-5.971129,20.640833],[-6.453787,24.956591],[-4.923337,24.974574],[-1.550055,22.792666],[1.823228,20.610809],[2.060991,20.142233],[2.683588,19.85623],[3.146661,19.693579],[3.158133,19.057364],[4.267419,19.155265],[4.27021,16.852227],[3.723422,16.184284],[3.638259,15.56812],[2.749993,15.409525],[1.385528,15.323561],[1.015783,14.968182],[0.374892,14.928908],[-0.266257,14.924309],[-0.515854,15.116158],[-1.066363,14.973815],[-2.001035,14.559008],[-2.191825,14.246418],[-2.967694,13.79815],[-3.103707,13.541267],[-3.522803,13.337662],[-4.006391,13.472485],[-4.280405,13.228444],[-4.427166,12.542646],[-5.220942,11.713859],[-5.197843,11.375146],[-5.470565,10.95127],[-5.404342,10.370737],[-5.816926,10.222555],[-6.050452,10.096361],[-6.205223,10.524061],[-6.493965,10.411303],[-6.666461,10.430811],[-6.850507,10.138994],[-7.622759,10.147236],[-7.89959,10.297382],[-8.029944,10.206535],[-8.335377,10.494812],[-8.282357,10.792597],[-8.407311,10.909257],[-8.620321,10.810891],[-8.581305,11.136246],[-8.376305,11.393646],[-8.786099,11.812561],[-8.905265,12.088358],[-9.127474,12.30806],[-9.327616,12.334286],[-9.567912,12.194243],[-9.890993,12.060479],[-10.165214,11.844084],[-10.593224,11.923975],[-10.87083,12.177887],[-11.036556,12.211245],[-11.297574,12.077971],[-11.456169,12.076834],[-11.513943,12.442988],[-11.467899,12.754519],[-11.553398,13.141214],[-11.927716,13.422075],[-12.124887,13.994727],[-12.17075,14.616834]]]},"id":"MLI"},
-{"type":"Feature","properties":{"name":"Myanmar"},"geometry":{"type":"Polygon","coordinates":[[[99.543309,20.186598],[98.959676,19.752981],[98.253724,19.708203],[97.797783,18.62708],[97.375896,18.445438],[97.859123,17.567946],[98.493761,16.837836],[98.903348,16.177824],[98.537376,15.308497],[98.192074,15.123703],[98.430819,14.622028],[99.097755,13.827503],[99.212012,13.269294],[99.196354,12.804748],[99.587286,11.892763],[99.038121,10.960546],[98.553551,9.93296],[98.457174,10.675266],[98.764546,11.441292],[98.428339,12.032987],[98.509574,13.122378],[98.103604,13.64046],[97.777732,14.837286],[97.597072,16.100568],[97.16454,16.928734],[96.505769,16.427241],[95.369352,15.71439],[94.808405,15.803454],[94.188804,16.037936],[94.533486,17.27724],[94.324817,18.213514],[93.540988,19.366493],[93.663255,19.726962],[93.078278,19.855145],[92.368554,20.670883],[92.303234,21.475485],[92.652257,21.324048],[92.672721,22.041239],[93.166128,22.27846],[93.060294,22.703111],[93.286327,23.043658],[93.325188,24.078556],[94.106742,23.850741],[94.552658,24.675238],[94.603249,25.162495],[95.155153,26.001307],[95.124768,26.573572],[96.419366,27.264589],[97.133999,27.083774],[97.051989,27.699059],[97.402561,27.882536],[97.327114,28.261583],[97.911988,28.335945],[98.246231,27.747221],[98.68269,27.508812],[98.712094,26.743536],[98.671838,25.918703],[97.724609,25.083637],[97.60472,23.897405],[98.660262,24.063286],[98.898749,23.142722],[99.531992,22.949039],[99.240899,22.118314],[99.983489,21.742937],[100.416538,21.558839],[101.150033,21.849984],[101.180005,21.436573],[100.329101,20.786122],[100.115988,20.41785],[99.543309,20.186598]]]},"id":"MMR"},
-{"type":"Feature","properties":{"name":"Montenegro"},"geometry":{"type":"Polygon","coordinates":[[[19.801613,42.500093],[19.738051,42.688247],[19.30449,42.19574],[19.37177,41.87755],[19.16246,41.95502],[18.88214,42.28151],[18.45,42.48],[18.56,42.65],[18.70648,43.20011],[19.03165,43.43253],[19.21852,43.52384],[19.48389,43.35229],[19.63,43.21378],[19.95857,43.10604],[20.3398,42.89852],[20.25758,42.81275],[20.0707,42.58863],[19.801613,42.500093]]]},"id":"MNE"},
-{"type":"Feature","properties":{"name":"Mongolia"},"geometry":{"type":"Polygon","coordinates":[[[87.751264,49.297198],[88.805567,49.470521],[90.713667,50.331812],[92.234712,50.802171],[93.104219,50.49529],[94.147566,50.480537],[94.815949,50.013433],[95.814028,49.977467],[97.259728,49.726061],[98.231762,50.422401],[97.82574,51.010995],[98.861491,52.047366],[99.981732,51.634006],[100.88948,51.516856],[102.065223,51.259921],[102.255909,50.510561],[103.676545,50.089966],[104.621552,50.275329],[105.886591,50.406019],[106.888804,50.274296],[107.868176,49.793705],[108.475167,49.282548],[109.402449,49.292961],[110.662011,49.130128],[111.581231,49.377968],[112.89774,49.543565],[114.362456,50.248303],[114.96211,50.140247],[115.485695,49.805177],[116.678801,49.888531],[116.191802,49.134598],[115.485282,48.135383],[115.742837,47.726545],[116.308953,47.85341],[117.295507,47.697709],[118.064143,48.06673],[118.866574,47.74706],[119.772824,47.048059],[119.66327,46.69268],[118.874326,46.805412],[117.421701,46.672733],[116.717868,46.388202],[115.985096,45.727235],[114.460332,45.339817],[113.463907,44.808893],[112.436062,45.011646],[111.873306,45.102079],[111.348377,44.457442],[111.667737,44.073176],[111.829588,43.743118],[111.129682,43.406834],[110.412103,42.871234],[109.243596,42.519446],[107.744773,42.481516],[106.129316,42.134328],[104.964994,41.59741],[104.522282,41.908347],[103.312278,41.907468],[101.83304,42.514873],[100.845866,42.663804],[99.515817,42.524691],[97.451757,42.74889],[96.349396,42.725635],[95.762455,43.319449],[95.306875,44.241331],[94.688929,44.352332],[93.480734,44.975472],[92.133891,45.115076],[90.94554,45.286073],[90.585768,45.719716],[90.970809,46.888146],[90.280826,47.693549],[88.854298,48.069082],[88.013832,48.599463],[87.751264,49.297198]]]},"id":"MNG"},
-{"type":"Feature","properties":{"name":"Mozambique"},"geometry":{"type":"Polygon","coordinates":[[[34.559989,-11.52002],[35.312398,-11.439146],[36.514082,-11.720938],[36.775151,-11.594537],[37.471284,-11.568751],[37.827645,-11.268769],[38.427557,-11.285202],[39.52103,-10.896854],[40.316589,-10.317096],[40.478387,-10.765441],[40.437253,-11.761711],[40.560811,-12.639177],[40.59962,-14.201975],[40.775475,-14.691764],[40.477251,-15.406294],[40.089264,-16.100774],[39.452559,-16.720891],[38.538351,-17.101023],[37.411133,-17.586368],[36.281279,-18.659688],[35.896497,-18.84226],[35.1984,-19.552811],[34.786383,-19.784012],[34.701893,-20.497043],[35.176127,-21.254361],[35.373428,-21.840837],[35.385848,-22.14],[35.562546,-22.09],[35.533935,-23.070788],[35.371774,-23.535359],[35.60747,-23.706563],[35.458746,-24.12261],[35.040735,-24.478351],[34.215824,-24.816314],[33.01321,-25.357573],[32.574632,-25.727318],[32.660363,-26.148584],[32.915955,-26.215867],[32.83012,-26.742192],[32.071665,-26.73382],[31.985779,-26.29178],[31.837778,-25.843332],[31.752408,-25.484284],[31.930589,-24.369417],[31.670398,-23.658969],[31.191409,-22.25151],[32.244988,-21.116489],[32.508693,-20.395292],[32.659743,-20.30429],[32.772708,-19.715592],[32.611994,-19.419383],[32.654886,-18.67209],[32.849861,-17.979057],[32.847639,-16.713398],[32.328239,-16.392074],[31.852041,-16.319417],[31.636498,-16.07199],[31.173064,-15.860944],[30.338955,-15.880839],[30.274256,-15.507787],[30.179481,-14.796099],[33.214025,-13.97186],[33.7897,-14.451831],[34.064825,-14.35995],[34.459633,-14.61301],[34.517666,-15.013709],[34.307291,-15.478641],[34.381292,-16.18356],[35.03381,-16.8013],[35.339063,-16.10744],[35.771905,-15.896859],[35.686845,-14.611046],[35.267956,-13.887834],[34.907151,-13.565425],[34.559989,-13.579998],[34.280006,-12.280025],[34.559989,-11.52002]]]},"id":"MOZ"},
-{"type":"Feature","properties":{"name":"Mauritania"},"geometry":{"type":"Polygon","coordinates":[[[-12.17075,14.616834],[-12.830658,15.303692],[-13.435738,16.039383],[-14.099521,16.304302],[-14.577348,16.598264],[-15.135737,16.587282],[-15.623666,16.369337],[-16.12069,16.455663],[-16.463098,16.135036],[-16.549708,16.673892],[-16.270552,17.166963],[-16.146347,18.108482],[-16.256883,19.096716],[-16.377651,19.593817],[-16.277838,20.092521],[-16.536324,20.567866],[-17.063423,20.999752],[-16.845194,21.333323],[-12.929102,21.327071],[-13.118754,22.77122],[-12.874222,23.284832],[-11.937224,23.374594],[-11.969419,25.933353],[-8.687294,25.881056],[-8.6844,27.395744],[-4.923337,24.974574],[-6.453787,24.956591],[-5.971129,20.640833],[-5.488523,16.325102],[-5.315277,16.201854],[-5.537744,15.50169],[-9.550238,15.486497],[-9.700255,15.264107],[-10.086846,15.330486],[-10.650791,15.132746],[-11.349095,15.411256],[-11.666078,15.388208],[-11.834208,14.799097],[-12.17075,14.616834]]]},"id":"MRT"},
-{"type":"Feature","properties":{"name":"Malawi"},"geometry":{"type":"Polygon","coordinates":[[[34.559989,-11.52002],[34.280006,-12.280025],[34.559989,-13.579998],[34.907151,-13.565425],[35.267956,-13.887834],[35.686845,-14.611046],[35.771905,-15.896859],[35.339063,-16.10744],[35.03381,-16.8013],[34.381292,-16.18356],[34.307291,-15.478641],[34.517666,-15.013709],[34.459633,-14.61301],[34.064825,-14.35995],[33.7897,-14.451831],[33.214025,-13.97186],[32.688165,-13.712858],[32.991764,-12.783871],[33.306422,-12.435778],[33.114289,-11.607198],[33.31531,-10.79655],[33.485688,-10.525559],[33.231388,-9.676722],[32.759375,-9.230599],[33.739729,-9.417151],[33.940838,-9.693674],[34.280006,-10.16],[34.559989,-11.52002]]]},"id":"MWI"},
-{"type":"Feature","properties":{"name":"Malaysia"},"geometry":{"type":"MultiPolygon","coordinates":[[[[101.075516,6.204867],[101.154219,5.691384],[101.814282,5.810808],[102.141187,6.221636],[102.371147,6.128205],[102.961705,5.524495],[103.381215,4.855001],[103.438575,4.181606],[103.332122,3.726698],[103.429429,3.382869],[103.502448,2.791019],[103.854674,2.515454],[104.247932,1.631141],[104.228811,1.293048],[103.519707,1.226334],[102.573615,1.967115],[101.390638,2.760814],[101.27354,3.270292],[100.695435,3.93914],[100.557408,4.76728],[100.196706,5.312493],[100.30626,6.040562],[100.085757,6.464489],[100.259596,6.642825],[101.075516,6.204867]]],[[[118.618321,4.478202],[117.882035,4.137551],[117.015214,4.306094],[115.865517,4.306559],[115.519078,3.169238],[115.134037,2.821482],[114.621355,1.430688],[113.80585,1.217549],[112.859809,1.49779],[112.380252,1.410121],[111.797548,0.904441],[111.159138,0.976478],[110.514061,0.773131],[109.830227,1.338136],[109.66326,2.006467],[110.396135,1.663775],[111.168853,1.850637],[111.370081,2.697303],[111.796928,2.885897],[112.995615,3.102395],[113.712935,3.893509],[114.204017,4.525874],[114.659596,4.007637],[114.869557,4.348314],[115.347461,4.316636],[115.4057,4.955228],[115.45071,5.44773],[116.220741,6.143191],[116.725103,6.924771],[117.129626,6.928053],[117.643393,6.422166],[117.689075,5.98749],[118.347691,5.708696],[119.181904,5.407836],[119.110694,5.016128],[118.439727,4.966519],[118.618321,4.478202]]]]},"id":"MYS"},
-{"type":"Feature","properties":{"name":"Namibia"},"geometry":{"type":"Polygon","coordinates":[[[16.344977,-28.576705],[15.601818,-27.821247],[15.210472,-27.090956],[14.989711,-26.117372],[14.743214,-25.39292],[14.408144,-23.853014],[14.385717,-22.656653],[14.257714,-22.111208],[13.868642,-21.699037],[13.352498,-20.872834],[12.826845,-19.673166],[12.608564,-19.045349],[11.794919,-18.069129],[11.734199,-17.301889],[12.215461,-17.111668],[12.814081,-16.941343],[13.462362,-16.971212],[14.058501,-17.423381],[14.209707,-17.353101],[18.263309,-17.309951],[18.956187,-17.789095],[21.377176,-17.930636],[23.215048,-17.523116],[24.033862,-17.295843],[24.682349,-17.353411],[25.07695,-17.578823],[25.084443,-17.661816],[24.520705,-17.887125],[24.217365,-17.889347],[23.579006,-18.281261],[23.196858,-17.869038],[21.65504,-18.219146],[20.910641,-18.252219],[20.881134,-21.814327],[19.895458,-21.849157],[19.895768,-24.76779],[19.894734,-28.461105],[19.002127,-28.972443],[18.464899,-29.045462],[17.836152,-28.856378],[17.387497,-28.783514],[17.218929,-28.355943],[16.824017,-28.082162],[16.344977,-28.576705]]]},"id":"NAM"},
-{"type":"Feature","properties":{"name":"New Caledonia"},"geometry":{"type":"Polygon","coordinates":[[[165.77999,-21.080005],[166.599991,-21.700019],[167.120011,-22.159991],[166.740035,-22.399976],[166.189732,-22.129708],[165.474375,-21.679607],[164.829815,-21.14982],[164.167995,-20.444747],[164.029606,-20.105646],[164.459967,-20.120012],[165.020036,-20.459991],[165.460009,-20.800022],[165.77999,-21.080005]]]},"id":"NCL"},
-{"type":"Feature","properties":{"name":"Niger"},"geometry":{"type":"Polygon","coordinates":[[[2.154474,11.94015],[2.177108,12.625018],[1.024103,12.851826],[0.993046,13.33575],[0.429928,13.988733],[0.295646,14.444235],[0.374892,14.928908],[1.015783,14.968182],[1.385528,15.323561],[2.749993,15.409525],[3.638259,15.56812],[3.723422,16.184284],[4.27021,16.852227],[4.267419,19.155265],[5.677566,19.601207],[8.572893,21.565661],[11.999506,23.471668],[13.581425,23.040506],[14.143871,22.491289],[14.8513,22.86295],[15.096888,21.308519],[15.471077,21.048457],[15.487148,20.730415],[15.903247,20.387619],[15.685741,19.95718],[15.300441,17.92795],[15.247731,16.627306],[13.972202,15.684366],[13.540394,14.367134],[13.956699,13.996691],[13.954477,13.353449],[14.595781,13.330427],[14.495787,12.859396],[14.213531,12.802035],[14.181336,12.483657],[13.995353,12.461565],[13.318702,13.556356],[13.083987,13.596147],[12.302071,13.037189],[11.527803,13.32898],[10.989593,13.387323],[10.701032,13.246918],[10.114814,13.277252],[9.524928,12.851102],[9.014933,12.826659],[7.804671,13.343527],[7.330747,13.098038],[6.820442,13.115091],[6.445426,13.492768],[5.443058,13.865924],[4.368344,13.747482],[4.107946,13.531216],[3.967283,12.956109],[3.680634,12.552903],[3.61118,11.660167],[2.848643,12.235636],[2.490164,12.233052],[2.154474,11.94015]]]},"id":"NER"},
-{"type":"Feature","properties":{"name":"Nigeria"},"geometry":{"type":"Polygon","coordinates":[[[8.500288,4.771983],[7.462108,4.412108],[7.082596,4.464689],[6.698072,4.240594],[5.898173,4.262453],[5.362805,4.887971],[5.033574,5.611802],[4.325607,6.270651],[3.57418,6.2583],[2.691702,6.258817],[2.749063,7.870734],[2.723793,8.506845],[2.912308,9.137608],[3.220352,9.444153],[3.705438,10.06321],[3.60007,10.332186],[3.797112,10.734746],[3.572216,11.327939],[3.61118,11.660167],[3.680634,12.552903],[3.967283,12.956109],[4.107946,13.531216],[4.368344,13.747482],[5.443058,13.865924],[6.445426,13.492768],[6.820442,13.115091],[7.330747,13.098038],[7.804671,13.343527],[9.014933,12.826659],[9.524928,12.851102],[10.114814,13.277252],[10.701032,13.246918],[10.989593,13.387323],[11.527803,13.32898],[12.302071,13.037189],[13.083987,13.596147],[13.318702,13.556356],[13.995353,12.461565],[14.181336,12.483657],[14.577178,12.085361],[14.468192,11.904752],[14.415379,11.572369],[13.57295,10.798566],[13.308676,10.160362],[13.1676,9.640626],[12.955468,9.417772],[12.753672,8.717763],[12.218872,8.305824],[12.063946,7.799808],[11.839309,7.397042],[11.745774,6.981383],[11.058788,6.644427],[10.497375,7.055358],[10.118277,7.03877],[9.522706,6.453482],[9.233163,6.444491],[8.757533,5.479666],[8.500288,4.771983]]]},"id":"NGA"},
-{"type":"Feature","properties":{"name":"Nicaragua"},"geometry":{"type":"Polygon","coordinates":[[[-85.71254,11.088445],[-86.058488,11.403439],[-86.52585,11.806877],[-86.745992,12.143962],[-87.167516,12.458258],[-87.668493,12.90991],[-87.557467,13.064552],[-87.392386,12.914018],[-87.316654,12.984686],[-87.005769,13.025794],[-86.880557,13.254204],[-86.733822,13.263093],[-86.755087,13.754845],[-86.520708,13.778487],[-86.312142,13.771356],[-86.096264,14.038187],[-85.801295,13.836055],[-85.698665,13.960078],[-85.514413,14.079012],[-85.165365,14.35437],[-85.148751,14.560197],[-85.052787,14.551541],[-84.924501,14.790493],[-84.820037,14.819587],[-84.649582,14.666805],[-84.449336,14.621614],[-84.228342,14.748764],[-83.975721,14.749436],[-83.628585,14.880074],[-83.489989,15.016267],[-83.147219,14.995829],[-83.233234,14.899866],[-83.284162,14.676624],[-83.182126,14.310703],[-83.4125,13.970078],[-83.519832,13.567699],[-83.552207,13.127054],[-83.498515,12.869292],[-83.473323,12.419087],[-83.626104,12.32085],[-83.719613,11.893124],[-83.650858,11.629032],[-83.85547,11.373311],[-83.808936,11.103044],[-83.655612,10.938764],[-83.895054,10.726839],[-84.190179,10.79345],[-84.355931,10.999226],[-84.673069,11.082657],[-84.903003,10.952303],[-85.561852,11.217119],[-85.71254,11.088445]]]},"id":"NIC"},
-{"type":"Feature","properties":{"name":"Netherlands"},"geometry":{"type":"Polygon","coordinates":[[[6.074183,53.510403],[6.90514,53.482162],[7.092053,53.144043],[6.84287,52.22844],[6.589397,51.852029],[5.988658,51.851616],[6.156658,50.803721],[5.606976,51.037298],[4.973991,51.475024],[4.047071,51.267259],[3.314971,51.345755],[3.830289,51.620545],[4.705997,53.091798],[6.074183,53.510403]]]},"id":"NLD"},
-{"type":"Feature","properties":{"name":"Norway"},"geometry":{"type":"MultiPolygon","coordinates":[[[[28.165547,71.185474],[31.293418,70.453788],[30.005435,70.186259],[31.101079,69.55808],[29.399581,69.156916],[28.59193,69.064777],[29.015573,69.766491],[27.732292,70.164193],[26.179622,69.825299],[25.689213,69.092114],[24.735679,68.649557],[23.66205,68.891247],[22.356238,68.841741],[21.244936,69.370443],[20.645593,69.106247],[20.025269,69.065139],[19.87856,68.407194],[17.993868,68.567391],[17.729182,68.010552],[16.768879,68.013937],[16.108712,67.302456],[15.108411,66.193867],[13.55569,64.787028],[13.919905,64.445421],[13.571916,64.049114],[12.579935,64.066219],[11.930569,63.128318],[11.992064,61.800362],[12.631147,61.293572],[12.300366,60.117933],[11.468272,59.432393],[11.027369,58.856149],[10.356557,59.469807],[8.382,58.313288],[7.048748,58.078884],[5.665835,58.588155],[5.308234,59.663232],[4.992078,61.970998],[5.9129,62.614473],[8.553411,63.454008],[10.527709,64.486038],[12.358347,65.879726],[14.761146,67.810642],[16.435927,68.563205],[19.184028,69.817444],[21.378416,70.255169],[23.023742,70.202072],[24.546543,71.030497],[26.37005,70.986262],[28.165547,71.185474]]],[[[24.72412,77.85385],[22.49032,77.44493],[20.72601,77.67704],[21.41611,77.93504],[20.8119,78.25463],[22.88426,78.45494],[23.28134,78.07954],[24.72412,77.85385]]],[[[18.25183,79.70175],[21.54383,78.95611],[19.02737,78.5626],[18.47172,77.82669],[17.59441,77.63796],[17.1182,76.80941],[15.91315,76.77045],[13.76259,77.38035],[14.66956,77.73565],[13.1706,78.02493],[11.22231,78.8693],[10.44453,79.65239],[13.17077,80.01046],[13.71852,79.66039],[15.14282,79.67431],[15.52255,80.01608],[16.99085,80.05086],[18.25183,79.70175]]],[[[25.447625,80.40734],[27.407506,80.056406],[25.924651,79.517834],[23.024466,79.400012],[20.075188,79.566823],[19.897266,79.842362],[18.462264,79.85988],[17.368015,80.318896],[20.455992,80.598156],[21.907945,80.357679],[22.919253,80.657144],[25.447625,80.40734]]]]},"id":"NOR"},
-{"type":"Feature","properties":{"name":"Nepal"},"geometry":{"type":"Polygon","coordinates":[[[88.120441,27.876542],[88.043133,27.445819],[88.174804,26.810405],[88.060238,26.414615],[87.227472,26.397898],[86.024393,26.630985],[85.251779,26.726198],[84.675018,27.234901],[83.304249,27.364506],[81.999987,27.925479],[81.057203,28.416095],[80.088425,28.79447],[80.476721,29.729865],[81.111256,30.183481],[81.525804,30.422717],[82.327513,30.115268],[83.337115,29.463732],[83.898993,29.320226],[84.23458,28.839894],[85.011638,28.642774],[85.82332,28.203576],[86.954517,27.974262],[88.120441,27.876542]]]},"id":"NPL"},
-{"type":"Feature","properties":{"name":"New Zealand"},"geometry":{"type":"MultiPolygon","coordinates":[[[[173.020375,-40.919052],[173.247234,-41.331999],[173.958405,-40.926701],[174.247587,-41.349155],[174.248517,-41.770008],[173.876447,-42.233184],[173.22274,-42.970038],[172.711246,-43.372288],[173.080113,-43.853344],[172.308584,-43.865694],[171.452925,-44.242519],[171.185138,-44.897104],[170.616697,-45.908929],[169.831422,-46.355775],[169.332331,-46.641235],[168.411354,-46.619945],[167.763745,-46.290197],[166.676886,-46.219917],[166.509144,-45.852705],[167.046424,-45.110941],[168.303763,-44.123973],[168.949409,-43.935819],[169.667815,-43.555326],[170.52492,-43.031688],[171.12509,-42.512754],[171.569714,-41.767424],[171.948709,-41.514417],[172.097227,-40.956104],[172.79858,-40.493962],[173.020375,-40.919052]]],[[[174.612009,-36.156397],[175.336616,-37.209098],[175.357596,-36.526194],[175.808887,-36.798942],[175.95849,-37.555382],[176.763195,-37.881253],[177.438813,-37.961248],[178.010354,-37.579825],[178.517094,-37.695373],[178.274731,-38.582813],[177.97046,-39.166343],[177.206993,-39.145776],[176.939981,-39.449736],[177.032946,-39.879943],[176.885824,-40.065978],[176.508017,-40.604808],[176.01244,-41.289624],[175.239567,-41.688308],[175.067898,-41.425895],[174.650973,-41.281821],[175.22763,-40.459236],[174.900157,-39.908933],[173.824047,-39.508854],[173.852262,-39.146602],[174.574802,-38.797683],[174.743474,-38.027808],[174.697017,-37.381129],[174.292028,-36.711092],[174.319004,-36.534824],[173.840997,-36.121981],[173.054171,-35.237125],[172.636005,-34.529107],[173.007042,-34.450662],[173.551298,-35.006183],[174.32939,-35.265496],[174.612009,-36.156397]]]]},"id":"NZL"},
-{"type":"Feature","properties":{"name":"Oman"},"geometry":{"type":"MultiPolygon","coordinates":[[[[58.861141,21.114035],[58.487986,20.428986],[58.034318,20.481437],[57.826373,20.243002],[57.665762,19.736005],[57.7887,19.06757],[57.694391,18.94471],[57.234264,18.947991],[56.609651,18.574267],[56.512189,18.087113],[56.283521,17.876067],[55.661492,17.884128],[55.269939,17.632309],[55.2749,17.228354],[54.791002,16.950697],[54.239253,17.044981],[53.570508,16.707663],[53.108573,16.651051],[52.782184,17.349742],[52.00001,19.000003],[54.999982,19.999994],[55.666659,22.000001],[55.208341,22.70833],[55.234489,23.110993],[55.525841,23.524869],[55.528632,23.933604],[55.981214,24.130543],[55.804119,24.269604],[55.886233,24.920831],[56.396847,24.924732],[56.84514,24.241673],[57.403453,23.878594],[58.136948,23.747931],[58.729211,23.565668],[59.180502,22.992395],[59.450098,22.660271],[59.80806,22.533612],[59.806148,22.310525],[59.442191,21.714541],[59.282408,21.433886],[58.861141,21.114035]]],[[[56.391421,25.895991],[56.261042,25.714606],[56.070821,26.055464],[56.362017,26.395934],[56.485679,26.309118],[56.391421,25.895991]]]]},"id":"OMN"},
-{"type":"Feature","properties":{"name":"Pakistan"},"geometry":{"type":"Polygon","coordinates":[[[75.158028,37.133031],[75.896897,36.666806],[76.192848,35.898403],[77.837451,35.49401],[76.871722,34.653544],[75.757061,34.504923],[74.240203,34.748887],[73.749948,34.317699],[74.104294,33.441473],[74.451559,32.7649],[75.258642,32.271105],[74.405929,31.692639],[74.42138,30.979815],[73.450638,29.976413],[72.823752,28.961592],[71.777666,27.91318],[70.616496,27.989196],[69.514393,26.940966],[70.168927,26.491872],[70.282873,25.722229],[70.844699,25.215102],[71.04324,24.356524],[68.842599,24.359134],[68.176645,23.691965],[67.443667,23.944844],[67.145442,24.663611],[66.372828,25.425141],[64.530408,25.237039],[62.905701,25.218409],[61.497363,25.078237],[61.874187,26.239975],[63.316632,26.756532],[63.233898,27.217047],[62.755426,27.378923],[62.72783,28.259645],[61.771868,28.699334],[61.369309,29.303276],[60.874248,29.829239],[62.549857,29.318572],[63.550261,29.468331],[64.148002,29.340819],[64.350419,29.560031],[65.046862,29.472181],[66.346473,29.887943],[66.381458,30.738899],[66.938891,31.304911],[67.683394,31.303154],[67.792689,31.58293],[68.556932,31.71331],[68.926677,31.620189],[69.317764,31.901412],[69.262522,32.501944],[69.687147,33.105499],[70.323594,33.358533],[69.930543,34.02012],[70.881803,33.988856],[71.156773,34.348911],[71.115019,34.733126],[71.613076,35.153203],[71.498768,35.650563],[71.262348,36.074388],[71.846292,36.509942],[72.920025,36.720007],[74.067552,36.836176],[74.575893,37.020841],[75.158028,37.133031]]]},"id":"PAK"},
-{"type":"Feature","properties":{"name":"Panama"},"geometry":{"type":"Polygon","coordinates":[[[-77.881571,7.223771],[-78.214936,7.512255],[-78.429161,8.052041],[-78.182096,8.319182],[-78.435465,8.387705],[-78.622121,8.718124],[-79.120307,8.996092],[-79.557877,8.932375],[-79.760578,8.584515],[-80.164481,8.333316],[-80.382659,8.298409],[-80.480689,8.090308],[-80.00369,7.547524],[-80.276671,7.419754],[-80.421158,7.271572],[-80.886401,7.220541],[-81.059543,7.817921],[-81.189716,7.647906],[-81.519515,7.70661],[-81.721311,8.108963],[-82.131441,8.175393],[-82.390934,8.292362],[-82.820081,8.290864],[-82.850958,8.073823],[-82.965783,8.225028],[-82.913176,8.423517],[-82.829771,8.626295],[-82.868657,8.807266],[-82.719183,8.925709],[-82.927155,9.07433],[-82.932891,9.476812],[-82.546196,9.566135],[-82.187123,9.207449],[-82.207586,8.995575],[-81.808567,8.950617],[-81.714154,9.031955],[-81.439287,8.786234],[-80.947302,8.858504],[-80.521901,9.111072],[-79.9146,9.312765],[-79.573303,9.61161],[-79.021192,9.552931],[-79.05845,9.454565],[-78.500888,9.420459],[-78.055928,9.24773],[-77.729514,8.946844],[-77.353361,8.670505],[-77.474723,8.524286],[-77.242566,7.935278],[-77.431108,7.638061],[-77.753414,7.70984],[-77.881571,7.223771]]]},"id":"PAN"},
-{"type":"Feature","properties":{"name":"Peru"},"geometry":{"type":"Polygon","coordinates":[[[-69.590424,-17.580012],[-69.858444,-18.092694],[-70.372572,-18.347975],[-71.37525,-17.773799],[-71.462041,-17.363488],[-73.44453,-16.359363],[-75.237883,-15.265683],[-76.009205,-14.649286],[-76.423469,-13.823187],[-76.259242,-13.535039],[-77.106192,-12.222716],[-78.092153,-10.377712],[-79.036953,-8.386568],[-79.44592,-7.930833],[-79.760578,-7.194341],[-80.537482,-6.541668],[-81.249996,-6.136834],[-80.926347,-5.690557],[-81.410943,-4.736765],[-81.09967,-4.036394],[-80.302561,-3.404856],[-80.184015,-3.821162],[-80.469295,-4.059287],[-80.442242,-4.425724],[-80.028908,-4.346091],[-79.624979,-4.454198],[-79.205289,-4.959129],[-78.639897,-4.547784],[-78.450684,-3.873097],[-77.837905,-3.003021],[-76.635394,-2.608678],[-75.544996,-1.56161],[-75.233723,-0.911417],[-75.373223,-0.152032],[-75.106625,-0.057205],[-74.441601,-0.53082],[-74.122395,-1.002833],[-73.659504,-1.260491],[-73.070392,-2.308954],[-72.325787,-2.434218],[-71.774761,-2.16979],[-71.413646,-2.342802],[-70.813476,-2.256865],[-70.047709,-2.725156],[-70.692682,-3.742872],[-70.394044,-3.766591],[-69.893635,-4.298187],[-70.794769,-4.251265],[-70.928843,-4.401591],[-71.748406,-4.593983],[-72.891928,-5.274561],[-72.964507,-5.741251],[-73.219711,-6.089189],[-73.120027,-6.629931],[-73.724487,-6.918595],[-73.723401,-7.340999],[-73.987235,-7.52383],[-73.571059,-8.424447],[-73.015383,-9.032833],[-73.226713,-9.462213],[-72.563033,-9.520194],[-72.184891,-10.053598],[-71.302412,-10.079436],[-70.481894,-9.490118],[-70.548686,-11.009147],[-70.093752,-11.123972],[-69.529678,-10.951734],[-68.66508,-12.5613],[-68.88008,-12.899729],[-68.929224,-13.602684],[-68.948887,-14.453639],[-69.339535,-14.953195],[-69.160347,-15.323974],[-69.389764,-15.660129],[-68.959635,-16.500698],[-69.590424,-17.580012]]]},"id":"PER"},
-{"type":"Feature","properties":{"name":"Philippines"},"geometry":{"type":"MultiPolygon","coordinates":[[[[126.376814,8.414706],[126.478513,7.750354],[126.537424,7.189381],[126.196773,6.274294],[125.831421,7.293715],[125.363852,6.786485],[125.683161,6.049657],[125.396512,5.581003],[124.219788,6.161355],[123.93872,6.885136],[124.243662,7.36061],[123.610212,7.833527],[123.296071,7.418876],[122.825506,7.457375],[122.085499,6.899424],[121.919928,7.192119],[122.312359,8.034962],[122.942398,8.316237],[123.487688,8.69301],[123.841154,8.240324],[124.60147,8.514158],[124.764612,8.960409],[125.471391,8.986997],[125.412118,9.760335],[126.222714,9.286074],[126.306637,8.782487],[126.376814,8.414706]]],[[[123.982438,10.278779],[123.623183,9.950091],[123.309921,9.318269],[122.995883,9.022189],[122.380055,9.713361],[122.586089,9.981045],[122.837081,10.261157],[122.947411,10.881868],[123.49885,10.940624],[123.337774,10.267384],[124.077936,11.232726],[123.982438,10.278779]]],[[[118.504581,9.316383],[117.174275,8.3675],[117.664477,9.066889],[118.386914,9.6845],[118.987342,10.376292],[119.511496,11.369668],[119.689677,10.554291],[119.029458,10.003653],[118.504581,9.316383]]],[[[121.883548,11.891755],[122.483821,11.582187],[123.120217,11.58366],[123.100838,11.165934],[122.637714,10.741308],[122.00261,10.441017],[121.967367,10.905691],[122.03837,11.415841],[121.883548,11.891755]]],[[[125.502552,12.162695],[125.783465,11.046122],[125.011884,11.311455],[125.032761,10.975816],[125.277449,10.358722],[124.801819,10.134679],[124.760168,10.837995],[124.459101,10.88993],[124.302522,11.495371],[124.891013,11.415583],[124.87799,11.79419],[124.266762,12.557761],[125.227116,12.535721],[125.502552,12.162695]]],[[[121.527394,13.06959],[121.26219,12.20556],[120.833896,12.704496],[120.323436,13.466413],[121.180128,13.429697],[121.527394,13.06959]]],[[[121.321308,18.504065],[121.937601,18.218552],[122.246006,18.47895],[122.336957,18.224883],[122.174279,17.810283],[122.515654,17.093505],[122.252311,16.262444],[121.662786,15.931018],[121.50507,15.124814],[121.728829,14.328376],[122.258925,14.218202],[122.701276,14.336541],[123.950295,13.782131],[123.855107,13.237771],[124.181289,12.997527],[124.077419,12.536677],[123.298035,13.027526],[122.928652,13.55292],[122.671355,13.185836],[122.03465,13.784482],[121.126385,13.636687],[120.628637,13.857656],[120.679384,14.271016],[120.991819,14.525393],[120.693336,14.756671],[120.564145,14.396279],[120.070429,14.970869],[119.920929,15.406347],[119.883773,16.363704],[120.286488,16.034629],[120.390047,17.599081],[120.715867,18.505227],[121.321308,18.504065]]]]},"id":"PHL"},
-{"type":"Feature","properties":{"name":"Papua New Guinea"},"geometry":{"type":"MultiPolygon","coordinates":[[[[155.880026,-6.819997],[155.599991,-6.919991],[155.166994,-6.535931],[154.729192,-5.900828],[154.514114,-5.139118],[154.652504,-5.042431],[154.759991,-5.339984],[155.062918,-5.566792],[155.547746,-6.200655],[156.019965,-6.540014],[155.880026,-6.819997]]],[[[151.982796,-5.478063],[151.459107,-5.56028],[151.30139,-5.840728],[150.754447,-6.083763],[150.241197,-6.317754],[149.709963,-6.316513],[148.890065,-6.02604],[148.318937,-5.747142],[148.401826,-5.437756],[149.298412,-5.583742],[149.845562,-5.505503],[149.99625,-5.026101],[150.139756,-5.001348],[150.236908,-5.53222],[150.807467,-5.455842],[151.089672,-5.113693],[151.647881,-4.757074],[151.537862,-4.167807],[152.136792,-4.14879],[152.338743,-4.312966],[152.318693,-4.867661],[151.982796,-5.478063]]],[[[147.191874,-7.388024],[148.084636,-8.044108],[148.734105,-9.104664],[149.306835,-9.071436],[149.266631,-9.514406],[150.038728,-9.684318],[149.738798,-9.872937],[150.801628,-10.293687],[150.690575,-10.582713],[150.028393,-10.652476],[149.78231,-10.393267],[148.923138,-10.280923],[147.913018,-10.130441],[147.135443,-9.492444],[146.567881,-8.942555],[146.048481,-8.067414],[144.744168,-7.630128],[143.897088,-7.91533],[143.286376,-8.245491],[143.413913,-8.983069],[142.628431,-9.326821],[142.068259,-9.159596],[141.033852,-9.117893],[141.017057,-5.859022],[141.00021,-2.600151],[142.735247,-3.289153],[144.583971,-3.861418],[145.27318,-4.373738],[145.829786,-4.876498],[145.981922,-5.465609],[147.648073,-6.083659],[147.891108,-6.614015],[146.970905,-6.721657],[147.191874,-7.388024]]],[[[153.140038,-4.499983],[152.827292,-4.766427],[152.638673,-4.176127],[152.406026,-3.789743],[151.953237,-3.462062],[151.384279,-3.035422],[150.66205,-2.741486],[150.939965,-2.500002],[151.479984,-2.779985],[151.820015,-2.999972],[152.239989,-3.240009],[152.640017,-3.659983],[153.019994,-3.980015],[153.140038,-4.499983]]]]},"id":"PNG"},
-{"type":"Feature","properties":{"name":"Poland"},"geometry":{"type":"Polygon","coordinates":[[[15.016996,51.106674],[14.607098,51.745188],[14.685026,52.089947],[14.4376,52.62485],[14.074521,52.981263],[14.353315,53.248171],[14.119686,53.757029],[14.8029,54.050706],[16.363477,54.513159],[17.622832,54.851536],[18.620859,54.682606],[18.696255,54.438719],[19.66064,54.426084],[20.892245,54.312525],[22.731099,54.327537],[23.243987,54.220567],[23.484128,53.912498],[23.527536,53.470122],[23.804935,53.089731],[23.799199,52.691099],[23.199494,52.486977],[23.508002,52.023647],[23.527071,51.578454],[24.029986,50.705407],[23.922757,50.424881],[23.426508,50.308506],[22.51845,49.476774],[22.776419,49.027395],[22.558138,49.085738],[21.607808,49.470107],[20.887955,49.328772],[20.415839,49.431453],[19.825023,49.217125],[19.320713,49.571574],[18.909575,49.435846],[18.853144,49.49623],[18.392914,49.988629],[17.649445,50.049038],[17.554567,50.362146],[16.868769,50.473974],[16.719476,50.215747],[16.176253,50.422607],[16.238627,50.697733],[15.490972,50.78473],[15.016996,51.106674]]]},"id":"POL"},
-{"type":"Feature","properties":{"name":"Puerto Rico"},"geometry":{"type":"Polygon","coordinates":[[[-66.282434,18.514762],[-65.771303,18.426679],[-65.591004,18.228035],[-65.847164,17.975906],[-66.599934,17.981823],[-67.184162,17.946553],[-67.242428,18.37446],[-67.100679,18.520601],[-66.282434,18.514762]]]},"id":"PRI"},
-{"type":"Feature","properties":{"name":"North Korea"},"geometry":{"type":"Polygon","coordinates":[[[130.640016,42.395009],[130.780007,42.220007],[130.400031,42.280004],[129.965949,41.941368],[129.667362,41.601104],[129.705189,40.882828],[129.188115,40.661808],[129.0104,40.485436],[128.633368,40.189847],[127.967414,40.025413],[127.533436,39.75685],[127.50212,39.323931],[127.385434,39.213472],[127.783343,39.050898],[128.349716,38.612243],[128.205746,38.370397],[127.780035,38.304536],[127.073309,38.256115],[126.68372,37.804773],[126.237339,37.840378],[126.174759,37.749686],[125.689104,37.94001],[125.568439,37.752089],[125.27533,37.669071],[125.240087,37.857224],[124.981033,37.948821],[124.712161,38.108346],[124.985994,38.548474],[125.221949,38.665857],[125.132859,38.848559],[125.38659,39.387958],[125.321116,39.551385],[124.737482,39.660344],[124.265625,39.928493],[125.079942,40.569824],[126.182045,41.107336],[126.869083,41.816569],[127.343783,41.503152],[128.208433,41.466772],[128.052215,41.994285],[129.596669,42.424982],[129.994267,42.985387],[130.640016,42.395009]]]},"id":"PRK"},
-{"type":"Feature","properties":{"name":"Portugal"},"geometry":{"type":"Polygon","coordinates":[[[-9.034818,41.880571],[-8.671946,42.134689],[-8.263857,42.280469],[-8.013175,41.790886],[-7.422513,41.792075],[-7.251309,41.918346],[-6.668606,41.883387],[-6.389088,41.381815],[-6.851127,41.111083],[-6.86402,40.330872],[-7.026413,40.184524],[-7.066592,39.711892],[-7.498632,39.629571],[-7.098037,39.030073],[-7.374092,38.373059],[-7.029281,38.075764],[-7.166508,37.803894],[-7.537105,37.428904],[-7.453726,37.097788],[-7.855613,36.838269],[-8.382816,36.97888],[-8.898857,36.868809],[-8.746101,37.651346],[-8.839998,38.266243],[-9.287464,38.358486],[-9.526571,38.737429],[-9.446989,39.392066],[-9.048305,39.755093],[-8.977353,40.159306],[-8.768684,40.760639],[-8.790853,41.184334],[-8.990789,41.543459],[-9.034818,41.880571]]]},"id":"PRT"},
-{"type":"Feature","properties":{"name":"Paraguay"},"geometry":{"type":"Polygon","coordinates":[[[-62.685057,-22.249029],[-62.291179,-21.051635],[-62.265961,-20.513735],[-61.786326,-19.633737],[-60.043565,-19.342747],[-59.115042,-19.356906],[-58.183471,-19.868399],[-58.166392,-20.176701],[-57.870674,-20.732688],[-57.937156,-22.090176],[-56.88151,-22.282154],[-56.473317,-22.0863],[-55.797958,-22.35693],[-55.610683,-22.655619],[-55.517639,-23.571998],[-55.400747,-23.956935],[-55.027902,-24.001274],[-54.652834,-23.839578],[-54.29296,-24.021014],[-54.293476,-24.5708],[-54.428946,-25.162185],[-54.625291,-25.739255],[-54.788795,-26.621786],[-55.695846,-27.387837],[-56.486702,-27.548499],[-57.60976,-27.395899],[-58.618174,-27.123719],[-57.63366,-25.603657],[-57.777217,-25.16234],[-58.807128,-24.771459],[-60.028966,-24.032796],[-60.846565,-23.880713],[-62.685057,-22.249029]]]},"id":"PRY"},
-{"type":"Feature","properties":{"name":"Qatar"},"geometry":{"type":"Polygon","coordinates":[[[50.810108,24.754743],[50.743911,25.482424],[51.013352,26.006992],[51.286462,26.114582],[51.589079,25.801113],[51.6067,25.21567],[51.389608,24.627386],[51.112415,24.556331],[50.810108,24.754743]]]},"id":"QAT"},
-{"type":"Feature","properties":{"name":"Romania"},"geometry":{"type":"Polygon","coordinates":[[[22.710531,47.882194],[23.142236,48.096341],[23.760958,47.985598],[24.402056,47.981878],[24.866317,47.737526],[25.207743,47.891056],[25.945941,47.987149],[26.19745,48.220881],[26.619337,48.220726],[26.924176,48.123264],[27.233873,47.826771],[27.551166,47.405117],[28.12803,46.810476],[28.160018,46.371563],[28.054443,45.944586],[28.233554,45.488283],[28.679779,45.304031],[29.149725,45.464925],[29.603289,45.293308],[29.626543,45.035391],[29.141612,44.82021],[28.837858,44.913874],[28.558081,43.707462],[27.970107,43.812468],[27.2424,44.175986],[26.065159,43.943494],[25.569272,43.688445],[24.100679,43.741051],[23.332302,43.897011],[22.944832,43.823785],[22.65715,44.234923],[22.474008,44.409228],[22.705726,44.578003],[22.459022,44.702517],[22.145088,44.478422],[21.562023,44.768947],[21.483526,45.18117],[20.874313,45.416375],[20.762175,45.734573],[20.220192,46.127469],[21.021952,46.316088],[21.626515,46.994238],[22.099768,47.672439],[22.710531,47.882194]]]},"id":"ROU"},
-{"type":"Feature","properties":{"name":"Russia"},"geometry":{"type":"MultiPolygon","coordinates":[[[[143.648007,50.7476],[144.654148,48.976391],[143.173928,49.306551],[142.558668,47.861575],[143.533492,46.836728],[143.505277,46.137908],[142.747701,46.740765],[142.09203,45.966755],[141.906925,46.805929],[142.018443,47.780133],[141.904445,48.859189],[142.1358,49.615163],[142.179983,50.952342],[141.594076,51.935435],[141.682546,53.301966],[142.606934,53.762145],[142.209749,54.225476],[142.654786,54.365881],[142.914616,53.704578],[143.260848,52.74076],[143.235268,51.75666],[143.648007,50.7476]]],[[[22.731099,54.327537],[20.892245,54.312525],[19.66064,54.426084],[19.888481,54.86616],[21.268449,55.190482],[22.315724,55.015299],[22.757764,54.856574],[22.651052,54.582741],[22.731099,54.327537]]],[[[-175.01425,66.58435],[-174.33983,66.33556],[-174.57182,67.06219],[-171.85731,66.91308],[-169.89958,65.97724],[-170.89107,65.54139],[-172.53025,65.43791],[-172.555,64.46079],[-172.95533,64.25269],[-173.89184,64.2826],[-174.65392,64.63125],[-175.98353,64.92288],[-176.20716,65.35667],[-177.22266,65.52024],[-178.35993,65.39052],[-178.90332,65.74044],[-178.68611,66.11211],[-179.88377,65.87456],[-179.43268,65.40411],[-180,64.979709],[-180,68.963636],[-177.55,68.2],[-174.92825,67.20589],[-175.01425,66.58435]]],[[[180,70.832199],[178.903425,70.78114],[178.7253,71.0988],[180,71.515714],[180,70.832199]]],[[[-178.69378,70.89302],[-180,70.832199],[-180,71.515714],[-179.871875,71.55762],[-179.02433,71.55553],[-177.577945,71.26948],[-177.663575,71.13277],[-178.69378,70.89302]]],[[[143.60385,73.21244],[142.08763,73.20544],[140.038155,73.31692],[139.86312,73.36983],[140.81171,73.76506],[142.06207,73.85758],[143.48283,73.47525],[143.60385,73.21244]]],[[[150.73167,75.08406],[149.575925,74.68892],[147.977465,74.778355],[146.11919,75.17298],[146.358485,75.49682],[148.22223,75.345845],[150.73167,75.08406]]],[[[145.086285,75.562625],[144.3,74.82],[140.61381,74.84768],[138.95544,74.61148],[136.97439,75.26167],[137.51176,75.94917],[138.831075,76.13676],[141.471615,76.09289],[145.086285,75.562625]]],[[[57.535693,70.720464],[56.944979,70.632743],[53.677375,70.762658],[53.412017,71.206662],[51.601895,71.474759],[51.455754,72.014881],[52.478275,72.229442],[52.444169,72.774731],[54.427614,73.627548],[53.50829,73.749814],[55.902459,74.627486],[55.631933,75.081412],[57.868644,75.60939],[61.170044,76.251883],[64.498368,76.439055],[66.210977,76.809782],[68.15706,76.939697],[68.852211,76.544811],[68.180573,76.233642],[64.637326,75.737755],[61.583508,75.260885],[58.477082,74.309056],[56.986786,73.333044],[55.419336,72.371268],[55.622838,71.540595],[57.535693,70.720464]]],[[[106.97013,76.97419],[107.24,76.48],[108.1538,76.72335],[111.07726,76.71],[113.33151,76.22224],[114.13417,75.84764],[113.88539,75.32779],[112.77918,75.03186],[110.15125,74.47673],[109.4,74.18],[110.64,74.04],[112.11919,73.78774],[113.01954,73.97693],[113.52958,73.33505],[113.96881,73.59488],[115.56782,73.75285],[118.77633,73.58772],[119.02,73.12],[123.20066,72.97122],[123.25777,73.73503],[125.38,73.56],[126.97644,73.56549],[128.59126,73.03871],[129.05157,72.39872],[128.46,71.98],[129.71599,71.19304],[131.28858,70.78699],[132.2535,71.8363],[133.85766,71.38642],[135.56193,71.65525],[137.49755,71.34763],[138.23409,71.62803],[139.86983,71.48783],[139.14791,72.41619],[140.46817,72.84941],[149.5,72.2],[150.35118,71.60643],[152.9689,70.84222],[157.00688,71.03141],[158.99779,70.86672],[159.83031,70.45324],[159.70866,69.72198],[160.94053,69.43728],[162.27907,69.64204],[164.05248,69.66823],[165.94037,69.47199],[167.83567,69.58269],[169.57763,68.6938],[170.81688,69.01363],[170.0082,69.65276],[170.45345,70.09703],[173.64391,69.81743],[175.72403,69.87725],[178.6,69.4],[180,68.963636],[180,64.979709],[179.99281,64.97433],[178.7072,64.53493],[177.41128,64.60821],[178.313,64.07593],[178.90825,63.25197],[179.37034,62.98262],[179.48636,62.56894],[179.22825,62.3041],[177.3643,62.5219],[174.56929,61.76915],[173.68013,61.65261],[172.15,60.95],[170.6985,60.33618],[170.33085,59.88177],[168.90046,60.57355],[166.29498,59.78855],[165.84,60.16],[164.87674,59.7316],[163.53929,59.86871],[163.21711,59.21101],[162.01733,58.24328],[162.05297,57.83912],[163.19191,57.61503],[163.05794,56.15924],[162.12958,56.12219],[161.70146,55.28568],[162.11749,54.85514],[160.36877,54.34433],[160.02173,53.20257],[158.53094,52.95868],[158.23118,51.94269],[156.78979,51.01105],[156.42,51.7],[155.99182,53.15895],[155.43366,55.38103],[155.91442,56.76792],[156.75815,57.3647],[156.81035,57.83204],[158.36433,58.05575],[160.15064,59.31477],[161.87204,60.343],[163.66969,61.1409],[164.47355,62.55061],[163.25842,62.46627],[162.65791,61.6425],[160.12148,60.54423],[159.30232,61.77396],[156.72068,61.43442],[154.21806,59.75818],[155.04375,59.14495],[152.81185,58.88385],[151.26573,58.78089],[151.33815,59.50396],[149.78371,59.65573],[148.54481,59.16448],[145.48722,59.33637],[142.19782,59.03998],[138.95848,57.08805],[135.12619,54.72959],[136.70171,54.60355],[137.19342,53.97732],[138.1647,53.75501],[138.80463,54.25455],[139.90151,54.18968],[141.34531,53.08957],[141.37923,52.23877],[140.59742,51.23967],[140.51308,50.04553],[140.06193,48.44671],[138.55472,46.99965],[138.21971,46.30795],[136.86232,45.1435],[135.51535,43.989],[134.86939,43.39821],[133.53687,42.81147],[132.90627,42.79849],[132.27807,43.28456],[130.93587,42.55274],[130.78,42.22],[130.64,42.395],[130.633866,42.903015],[131.144688,42.92999],[131.288555,44.11152],[131.02519,44.96796],[131.883454,45.321162],[133.09712,45.14409],[133.769644,46.116927],[134.11235,47.21248],[134.50081,47.57845],[135.026311,48.47823],[133.373596,48.183442],[132.50669,47.78896],[130.98726,47.79013],[130.582293,48.729687],[129.397818,49.4406],[127.6574,49.76027],[127.287456,50.739797],[126.939157,51.353894],[126.564399,51.784255],[125.946349,52.792799],[125.068211,53.161045],[123.57147,53.4588],[122.245748,53.431726],[121.003085,53.251401],[120.177089,52.753886],[120.725789,52.516226],[120.7382,51.96411],[120.18208,51.64355],[119.27939,50.58292],[119.288461,50.142883],[117.879244,49.510983],[116.678801,49.888531],[115.485695,49.805177],[114.96211,50.140247],[114.362456,50.248303],[112.89774,49.543565],[111.581231,49.377968],[110.662011,49.130128],[109.402449,49.292961],[108.475167,49.282548],[107.868176,49.793705],[106.888804,50.274296],[105.886591,50.406019],[104.62158,50.27532],[103.676545,50.089966],[102.25589,50.51056],[102.06521,51.25991],[100.88948,51.516856],[99.981732,51.634006],[98.861491,52.047366],[97.82574,51.010995],[98.231762,50.422401],[97.25976,49.72605],[95.81402,49.97746],[94.815949,50.013433],[94.147566,50.480537],[93.10421,50.49529],[92.234712,50.802171],[90.713667,50.331812],[88.805567,49.470521],[87.751264,49.297198],[87.35997,49.214981],[86.829357,49.826675],[85.54127,49.692859],[85.11556,50.117303],[84.416377,50.3114],[83.935115,50.889246],[83.383004,51.069183],[81.945986,50.812196],[80.568447,51.388336],[80.03556,50.864751],[77.800916,53.404415],[76.525179,54.177003],[76.8911,54.490524],[74.38482,53.54685],[73.425679,53.48981],[73.508516,54.035617],[72.22415,54.376655],[71.180131,54.133285],[70.865267,55.169734],[69.068167,55.38525],[68.1691,54.970392],[65.66687,54.60125],[65.178534,54.354228],[61.4366,54.00625],[60.978066,53.664993],[61.699986,52.979996],[60.739993,52.719986],[60.927269,52.447548],[59.967534,51.96042],[61.588003,51.272659],[61.337424,50.79907],[59.932807,50.842194],[59.642282,50.545442],[58.36332,51.06364],[56.77798,51.04355],[55.71694,50.62171],[54.532878,51.02624],[52.328724,51.718652],[50.766648,51.692762],[48.702382,50.605128],[48.577841,49.87476],[47.54948,50.454698],[46.751596,49.356006],[47.043672,49.152039],[46.466446,48.394152],[47.31524,47.71585],[48.05725,47.74377],[48.694734,47.075628],[48.59325,46.56104],[49.10116,46.39933],[48.64541,45.80629],[47.67591,45.64149],[46.68201,44.6092],[47.59094,43.66016],[47.49252,42.98658],[48.58437,41.80888],[47.987283,41.405819],[47.815666,41.151416],[47.373315,41.219732],[46.686071,41.827137],[46.404951,41.860675],[45.7764,42.09244],[45.470279,42.502781],[44.537623,42.711993],[43.93121,42.55496],[43.75599,42.74083],[42.3944,43.2203],[40.92219,43.38215],[40.076965,43.553104],[39.955009,43.434998],[38.68,44.28],[37.53912,44.65721],[36.67546,45.24469],[37.40317,45.40451],[38.23295,46.24087],[37.67372,46.63657],[39.14767,47.04475],[39.1212,47.26336],[38.223538,47.10219],[38.255112,47.5464],[38.77057,47.82562],[39.738278,47.898937],[39.89562,48.23241],[39.67465,48.78382],[40.080789,49.30743],[40.06904,49.60105],[38.594988,49.926462],[38.010631,49.915662],[37.39346,50.383953],[36.626168,50.225591],[35.356116,50.577197],[35.37791,50.77394],[35.022183,51.207572],[34.224816,51.255993],[34.141978,51.566413],[34.391731,51.768882],[33.7527,52.335075],[32.715761,52.238465],[32.412058,52.288695],[32.15944,52.06125],[31.78597,52.10168],[31.540018,52.742052],[31.305201,53.073996],[31.49764,53.16743],[32.304519,53.132726],[32.693643,53.351421],[32.405599,53.618045],[31.731273,53.794029],[31.791424,53.974639],[31.384472,54.157056],[30.757534,54.811771],[30.971836,55.081548],[30.873909,55.550976],[29.896294,55.789463],[29.371572,55.670091],[29.229513,55.918344],[28.176709,56.16913],[27.855282,56.759326],[27.770016,57.244258],[27.288185,57.474528],[27.716686,57.791899],[27.42015,58.72457],[28.131699,59.300825],[27.98112,59.47537],[29.1177,60.02805],[28.07,60.50352],[30.211107,61.780028],[31.139991,62.357693],[31.516092,62.867687],[30.035872,63.552814],[30.444685,64.204453],[29.54443,64.948672],[30.21765,65.80598],[29.054589,66.944286],[29.977426,67.698297],[28.445944,68.364613],[28.59193,69.064777],[29.39955,69.15692],[31.10108,69.55811],[32.13272,69.90595],[33.77547,69.30142],[36.51396,69.06342],[40.29234,67.9324],[41.05987,67.45713],[41.12595,66.79158],[40.01583,66.26618],[38.38295,65.99953],[33.91871,66.75961],[33.18444,66.63253],[34.81477,65.90015],[34.878574,65.436213],[34.94391,64.41437],[36.23129,64.10945],[37.01273,63.84983],[37.14197,64.33471],[36.539579,64.76446],[37.17604,65.14322],[39.59345,64.52079],[40.4356,64.76446],[39.7626,65.49682],[42.09309,66.47623],[43.01604,66.41858],[43.94975,66.06908],[44.53226,66.75634],[43.69839,67.35245],[44.18795,67.95051],[43.45282,68.57079],[46.25,68.25],[46.82134,67.68997],[45.55517,67.56652],[45.56202,67.01005],[46.34915,66.66767],[47.89416,66.88455],[48.13876,67.52238],[50.22766,67.99867],[53.71743,68.85738],[54.47171,68.80815],[53.48582,68.20131],[54.72628,68.09702],[55.44268,68.43866],[57.31702,68.46628],[58.802,68.88082],[59.94142,68.27844],[61.07784,68.94069],[60.03,69.52],[60.55,69.85],[63.504,69.54739],[64.888115,69.234835],[68.51216,68.09233],[69.18068,68.61563],[68.16444,69.14436],[68.13522,69.35649],[66.93008,69.45461],[67.25976,69.92873],[66.72492,70.70889],[66.69466,71.02897],[68.54006,71.9345],[69.19636,72.84336],[69.94,73.04],[72.58754,72.77629],[72.79603,72.22006],[71.84811,71.40898],[72.47011,71.09019],[72.79188,70.39114],[72.5647,69.02085],[73.66787,68.4079],[73.2387,67.7404],[71.28,66.32],[72.42301,66.17267],[72.82077,66.53267],[73.92099,66.78946],[74.18651,67.28429],[75.052,67.76047],[74.46926,68.32899],[74.93584,68.98918],[73.84236,69.07146],[73.60187,69.62763],[74.3998,70.63175],[73.1011,71.44717],[74.89082,72.12119],[74.65926,72.83227],[75.15801,72.85497],[75.68351,72.30056],[75.28898,71.33556],[76.35911,71.15287],[75.90313,71.87401],[77.57665,72.26717],[79.65202,72.32011],[81.5,71.75],[80.61071,72.58285],[80.51109,73.6482],[82.25,73.85],[84.65526,73.80591],[86.8223,73.93688],[86.00956,74.45967],[87.16682,75.11643],[88.31571,75.14393],[90.26,75.64],[92.90058,75.77333],[93.23421,76.0472],[95.86,76.14],[96.67821,75.91548],[98.92254,76.44689],[100.75967,76.43028],[101.03532,76.86189],[101.99084,77.28754],[104.3516,77.69792],[106.06664,77.37389],[104.705,77.1274],[106.97013,76.97419]]],[[[105.07547,78.30689],[99.43814,77.921],[101.2649,79.23399],[102.08635,79.34641],[102.837815,79.28129],[105.37243,78.71334],[105.07547,78.30689]]],[[[51.136187,80.54728],[49.793685,80.415428],[48.894411,80.339567],[48.754937,80.175468],[47.586119,80.010181],[46.502826,80.247247],[47.072455,80.559424],[44.846958,80.58981],[46.799139,80.771918],[48.318477,80.78401],[48.522806,80.514569],[49.09719,80.753986],[50.039768,80.918885],[51.522933,80.699726],[51.136187,80.54728]]],[[[99.93976,78.88094],[97.75794,78.7562],[94.97259,79.044745],[93.31288,79.4265],[92.5454,80.14379],[91.18107,80.34146],[93.77766,81.0246],[95.940895,81.2504],[97.88385,80.746975],[100.186655,79.780135],[99.93976,78.88094]]]]},"id":"RUS"},
-{"type":"Feature","properties":{"name":"Rwanda"},"geometry":{"type":"Polygon","coordinates":[[[30.419105,-1.134659],[30.816135,-1.698914],[30.758309,-2.28725],[30.469696,-2.413858],[29.938359,-2.348487],[29.632176,-2.917858],[29.024926,-2.839258],[29.117479,-2.292211],[29.254835,-2.21511],[29.291887,-1.620056],[29.579466,-1.341313],[29.821519,-1.443322],[30.419105,-1.134659]]]},"id":"RWA"},
-{"type":"Feature","properties":{"name":"Western Sahara"},"geometry":{"type":"Polygon","coordinates":[[[-8.794884,27.120696],[-8.817828,27.656426],[-8.66559,27.656426],[-8.665124,27.589479],[-8.6844,27.395744],[-8.687294,25.881056],[-11.969419,25.933353],[-11.937224,23.374594],[-12.874222,23.284832],[-13.118754,22.77122],[-12.929102,21.327071],[-16.845194,21.333323],[-17.063423,20.999752],[-17.020428,21.42231],[-17.002962,21.420734],[-14.750955,21.5006],[-14.630833,21.86094],[-14.221168,22.310163],[-13.89111,23.691009],[-12.500963,24.770116],[-12.030759,26.030866],[-11.71822,26.104092],[-11.392555,26.883424],[-10.551263,26.990808],[-10.189424,26.860945],[-9.735343,26.860945],[-9.413037,27.088476],[-8.794884,27.120696]]]},"id":"ESH"},
-{"type":"Feature","properties":{"name":"Saudi Arabia"},"geometry":{"type":"Polygon","coordinates":[[[42.779332,16.347891],[42.649573,16.774635],[42.347989,17.075806],[42.270888,17.474722],[41.754382,17.833046],[41.221391,18.6716],[40.939341,19.486485],[40.247652,20.174635],[39.801685,20.338862],[39.139399,21.291905],[39.023696,21.986875],[39.066329,22.579656],[38.492772,23.688451],[38.02386,24.078686],[37.483635,24.285495],[37.154818,24.858483],[37.209491,25.084542],[36.931627,25.602959],[36.639604,25.826228],[36.249137,26.570136],[35.640182,27.37652],[35.130187,28.063352],[34.632336,28.058546],[34.787779,28.607427],[34.83222,28.957483],[34.956037,29.356555],[36.068941,29.197495],[36.501214,29.505254],[36.740528,29.865283],[37.503582,30.003776],[37.66812,30.338665],[37.998849,30.5085],[37.002166,31.508413],[39.004886,32.010217],[39.195468,32.161009],[40.399994,31.889992],[41.889981,31.190009],[44.709499,29.178891],[46.568713,29.099025],[47.459822,29.002519],[47.708851,28.526063],[48.416094,28.552004],[48.807595,27.689628],[49.299554,27.461218],[49.470914,27.109999],[50.152422,26.689663],[50.212935,26.277027],[50.113303,25.943972],[50.239859,25.60805],[50.527387,25.327808],[50.660557,24.999896],[50.810108,24.754743],[51.112415,24.556331],[51.389608,24.627386],[51.579519,24.245497],[51.617708,24.014219],[52.000733,23.001154],[55.006803,22.496948],[55.208341,22.70833],[55.666659,22.000001],[54.999982,19.999994],[52.00001,19.000003],[49.116672,18.616668],[48.183344,18.166669],[47.466695,17.116682],[47.000005,16.949999],[46.749994,17.283338],[46.366659,17.233315],[45.399999,17.333335],[45.216651,17.433329],[44.062613,17.410359],[43.791519,17.319977],[43.380794,17.579987],[43.115798,17.08844],[43.218375,16.66689],[42.779332,16.347891]]]},"id":"SAU"},
-{"type":"Feature","properties":{"name":"Sudan"},"geometry":{"type":"Polygon","coordinates":[[[33.963393,9.464285],[33.824963,9.484061],[33.842131,9.981915],[33.721959,10.325262],[33.206938,10.720112],[33.086766,11.441141],[33.206938,12.179338],[32.743419,12.248008],[32.67475,12.024832],[32.073892,11.97333],[32.314235,11.681484],[32.400072,11.080626],[31.850716,10.531271],[31.352862,9.810241],[30.837841,9.707237],[29.996639,10.290927],[29.618957,10.084919],[29.515953,9.793074],[29.000932,9.604232],[28.966597,9.398224],[27.97089,9.398224],[27.833551,9.604232],[27.112521,9.638567],[26.752006,9.466893],[26.477328,9.55273],[25.962307,10.136421],[25.790633,10.411099],[25.069604,10.27376],[24.794926,9.810241],[24.537415,8.917538],[24.194068,8.728696],[23.88698,8.61973],[23.805813,8.666319],[23.459013,8.954286],[23.394779,9.265068],[23.55725,9.681218],[23.554304,10.089255],[22.977544,10.714463],[22.864165,11.142395],[22.87622,11.38461],[22.50869,11.67936],[22.49762,12.26024],[22.28801,12.64605],[21.93681,12.58818],[22.03759,12.95546],[22.29658,13.37232],[22.18329,13.78648],[22.51202,14.09318],[22.30351,14.32682],[22.56795,14.94429],[23.02459,15.68072],[23.88689,15.61084],[23.83766,19.58047],[23.85,20],[25,20.00304],[25,22],[29.02,22],[32.9,22],[36.86623,22],[37.18872,21.01885],[36.96941,20.83744],[37.1147,19.80796],[37.48179,18.61409],[37.86276,18.36786],[38.41009,17.998307],[37.904,17.42754],[37.16747,17.26314],[36.85253,16.95655],[36.75389,16.29186],[36.32322,14.82249],[36.42951,14.42211],[36.27022,13.56333],[35.86363,12.57828],[35.26049,12.08286],[34.83163,11.31896],[34.73115,10.91017],[34.25745,10.63009],[33.96162,9.58358],[33.963393,9.464285]]]},"id":"SDN"},
-{"type":"Feature","properties":{"name":"South Sudan"},"geometry":{"type":"Polygon","coordinates":[[[33.963393,9.464285],[33.97498,8.68456],[33.8255,8.37916],[33.2948,8.35458],[32.95418,7.78497],[33.56829,7.71334],[34.0751,7.22595],[34.25032,6.82607],[34.70702,6.59422],[35.298007,5.506],[34.620196,4.847123],[34.005,4.249885],[33.39,3.79],[32.68642,3.79232],[31.88145,3.55827],[31.24556,3.7819],[30.83385,3.50917],[29.95349,4.1737],[29.715995,4.600805],[29.159078,4.389267],[28.696678,4.455077],[28.428994,4.287155],[27.979977,4.408413],[27.374226,5.233944],[27.213409,5.550953],[26.465909,5.946717],[26.213418,6.546603],[25.796648,6.979316],[25.124131,7.500085],[25.114932,7.825104],[24.567369,8.229188],[23.88698,8.61973],[24.194068,8.728696],[24.537415,8.917538],[24.794926,9.810241],[25.069604,10.27376],[25.790633,10.411099],[25.962307,10.136421],[26.477328,9.55273],[26.752006,9.466893],[27.112521,9.638567],[27.833551,9.604232],[27.97089,9.398224],[28.966597,9.398224],[29.000932,9.604232],[29.515953,9.793074],[29.618957,10.084919],[29.996639,10.290927],[30.837841,9.707237],[31.352862,9.810241],[31.850716,10.531271],[32.400072,11.080626],[32.314235,11.681484],[32.073892,11.97333],[32.67475,12.024832],[32.743419,12.248008],[33.206938,12.179338],[33.086766,11.441141],[33.206938,10.720112],[33.721959,10.325262],[33.842131,9.981915],[33.824963,9.484061],[33.963393,9.464285]]]},"id":"SSD"},
-{"type":"Feature","properties":{"name":"Senegal"},"geometry":{"type":"Polygon","coordinates":[[[-16.713729,13.594959],[-17.126107,14.373516],[-17.625043,14.729541],[-17.185173,14.919477],[-16.700706,15.621527],[-16.463098,16.135036],[-16.12069,16.455663],[-15.623666,16.369337],[-15.135737,16.587282],[-14.577348,16.598264],[-14.099521,16.304302],[-13.435738,16.039383],[-12.830658,15.303692],[-12.17075,14.616834],[-12.124887,13.994727],[-11.927716,13.422075],[-11.553398,13.141214],[-11.467899,12.754519],[-11.513943,12.442988],[-11.658301,12.386583],[-12.203565,12.465648],[-12.278599,12.35444],[-12.499051,12.33209],[-13.217818,12.575874],[-13.700476,12.586183],[-15.548477,12.62817],[-15.816574,12.515567],[-16.147717,12.547762],[-16.677452,12.384852],[-16.841525,13.151394],[-15.931296,13.130284],[-15.691001,13.270353],[-15.511813,13.27857],[-15.141163,13.509512],[-14.712197,13.298207],[-14.277702,13.280585],[-13.844963,13.505042],[-14.046992,13.794068],[-14.376714,13.62568],[-14.687031,13.630357],[-15.081735,13.876492],[-15.39877,13.860369],[-15.624596,13.623587],[-16.713729,13.594959]]]},"id":"SEN"},
-{"type":"Feature","properties":{"name":"Solomon Islands"},"geometry":{"type":"MultiPolygon","coordinates":[[[[162.119025,-10.482719],[162.398646,-10.826367],[161.700032,-10.820011],[161.319797,-10.204751],[161.917383,-10.446701],[162.119025,-10.482719]]],[[[160.852229,-9.872937],[160.462588,-9.89521],[159.849447,-9.794027],[159.640003,-9.63998],[159.702945,-9.24295],[160.362956,-9.400304],[160.688518,-9.610162],[160.852229,-9.872937]]],[[[161.679982,-9.599982],[161.529397,-9.784312],[160.788253,-8.917543],[160.579997,-8.320009],[160.920028,-8.320009],[161.280006,-9.120011],[161.679982,-9.599982]]],[[[159.875027,-8.33732],[159.917402,-8.53829],[159.133677,-8.114181],[158.586114,-7.754824],[158.21115,-7.421872],[158.359978,-7.320018],[158.820001,-7.560003],[159.640003,-8.020027],[159.875027,-8.33732]]],[[[157.538426,-7.34782],[157.33942,-7.404767],[156.90203,-7.176874],[156.491358,-6.765943],[156.542828,-6.599338],[157.14,-7.021638],[157.538426,-7.34782]]]]},"id":"SLB"},
-{"type":"Feature","properties":{"name":"Sierra Leone"},"geometry":{"type":"Polygon","coordinates":[[[-11.438779,6.785917],[-11.708195,6.860098],[-12.428099,7.262942],[-12.949049,7.798646],[-13.124025,8.163946],[-13.24655,8.903049],[-12.711958,9.342712],[-12.596719,9.620188],[-12.425929,9.835834],[-12.150338,9.858572],[-11.917277,10.046984],[-11.117481,10.045873],[-10.839152,9.688246],[-10.622395,9.26791],[-10.65477,8.977178],[-10.494315,8.715541],[-10.505477,8.348896],[-10.230094,8.406206],[-10.695595,7.939464],[-11.146704,7.396706],[-11.199802,7.105846],[-11.438779,6.785917]]]},"id":"SLE"},
-{"type":"Feature","properties":{"name":"El Salvador"},"geometry":{"type":"Polygon","coordinates":[[[-87.793111,13.38448],[-87.904112,13.149017],[-88.483302,13.163951],[-88.843228,13.259734],[-89.256743,13.458533],[-89.812394,13.520622],[-90.095555,13.735338],[-90.064678,13.88197],[-89.721934,14.134228],[-89.534219,14.244816],[-89.587343,14.362586],[-89.353326,14.424133],[-89.058512,14.340029],[-88.843073,14.140507],[-88.541231,13.980155],[-88.503998,13.845486],[-88.065343,13.964626],[-87.859515,13.893312],[-87.723503,13.78505],[-87.793111,13.38448]]]},"id":"SLV"},
-{"type":"Feature","properties":{"name":"Somaliland"},"geometry":{"type":"Polygon","coordinates":[[[48.93813,9.451749],[48.486736,8.837626],[47.78942,8.003],[46.948328,7.996877],[43.67875,9.18358],[43.296975,9.540477],[42.92812,10.02194],[42.55876,10.57258],[42.776852,10.926879],[43.145305,11.46204],[43.47066,11.27771],[43.666668,10.864169],[44.117804,10.445538],[44.614259,10.442205],[45.556941,10.698029],[46.645401,10.816549],[47.525658,11.127228],[48.021596,11.193064],[48.378784,11.375482],[48.948206,11.410622],[48.942005,11.394266],[48.938491,10.982327],[48.938233,9.9735],[48.93813,9.451749]]]},"id":"-99"},
-{"type":"Feature","properties":{"name":"Somalia"},"geometry":{"type":"Polygon","coordinates":[[[49.72862,11.5789],[50.25878,11.67957],[50.73202,12.0219],[51.1112,12.02464],[51.13387,11.74815],[51.04153,11.16651],[51.04531,10.6409],[50.83418,10.27972],[50.55239,9.19874],[50.07092,8.08173],[49.4527,6.80466],[48.59455,5.33911],[47.74079,4.2194],[46.56476,2.85529],[45.56399,2.04576],[44.06815,1.05283],[43.13597,0.2922],[42.04157,-0.91916],[41.81095,-1.44647],[41.58513,-1.68325],[40.993,-0.85829],[40.98105,2.78452],[41.855083,3.918912],[42.12861,4.23413],[42.76967,4.25259],[43.66087,4.95755],[44.9636,5.00162],[47.78942,8.003],[48.486736,8.837626],[48.93813,9.451749],[48.938233,9.9735],[48.938491,10.982327],[48.942005,11.394266],[48.948205,11.410617],[49.26776,11.43033],[49.72862,11.5789]]]},"id":"SOM"},
-{"type":"Feature","properties":{"name":"Republic of Serbia"},"geometry":{"type":"Polygon","coordinates":[[[20.874313,45.416375],[21.483526,45.18117],[21.562023,44.768947],[22.145088,44.478422],[22.459022,44.702517],[22.705726,44.578003],[22.474008,44.409228],[22.65715,44.234923],[22.410446,44.008063],[22.500157,43.642814],[22.986019,43.211161],[22.604801,42.898519],[22.436595,42.580321],[22.545012,42.461362],[22.380526,42.32026],[21.91708,42.30364],[21.576636,42.245224],[21.54332,42.32025],[21.66292,42.43922],[21.77505,42.6827],[21.63302,42.67717],[21.43866,42.86255],[21.27421,42.90959],[21.143395,43.068685],[20.95651,43.13094],[20.81448,43.27205],[20.63508,43.21671],[20.49679,42.88469],[20.25758,42.81275],[20.3398,42.89852],[19.95857,43.10604],[19.63,43.21378],[19.48389,43.35229],[19.21852,43.52384],[19.454,43.5681],[19.59976,44.03847],[19.11761,44.42307],[19.36803,44.863],[19.00548,44.86023],[19.390476,45.236516],[19.072769,45.521511],[18.82982,45.90888],[19.596045,46.17173],[20.220192,46.127469],[20.762175,45.734573],[20.874313,45.416375]]]},"id":"SRB"},
-{"type":"Feature","properties":{"name":"Suriname"},"geometry":{"type":"Polygon","coordinates":[[[-57.147436,5.97315],[-55.949318,5.772878],[-55.84178,5.953125],[-55.03325,6.025291],[-53.958045,5.756548],[-54.478633,4.896756],[-54.399542,4.212611],[-54.006931,3.620038],[-54.181726,3.18978],[-54.269705,2.732392],[-54.524754,2.311849],[-55.097587,2.523748],[-55.569755,2.421506],[-55.973322,2.510364],[-56.073342,2.220795],[-55.9056,2.021996],[-55.995698,1.817667],[-56.539386,1.899523],[-57.150098,2.768927],[-57.281433,3.333492],[-57.601569,3.334655],[-58.044694,4.060864],[-57.86021,4.576801],[-57.914289,4.812626],[-57.307246,5.073567],[-57.147436,5.97315]]]},"id":"SUR"},
-{"type":"Feature","properties":{"name":"Slovakia"},"geometry":{"type":"Polygon","coordinates":[[[18.853144,49.49623],[18.909575,49.435846],[19.320713,49.571574],[19.825023,49.217125],[20.415839,49.431453],[20.887955,49.328772],[21.607808,49.470107],[22.558138,49.085738],[22.280842,48.825392],[22.085608,48.422264],[21.872236,48.319971],[20.801294,48.623854],[20.473562,48.56285],[20.239054,48.327567],[19.769471,48.202691],[19.661364,48.266615],[19.174365,48.111379],[18.777025,48.081768],[18.696513,47.880954],[17.857133,47.758429],[17.488473,47.867466],[16.979667,48.123497],[16.879983,48.470013],[16.960288,48.596982],[17.101985,48.816969],[17.545007,48.800019],[17.886485,48.903475],[17.913512,48.996493],[18.104973,49.043983],[18.170498,49.271515],[18.399994,49.315001],[18.554971,49.495015],[18.853144,49.49623]]]},"id":"SVK"},
-{"type":"Feature","properties":{"name":"Slovenia"},"geometry":{"type":"Polygon","coordinates":[[[13.806475,46.509306],[14.632472,46.431817],[15.137092,46.658703],[16.011664,46.683611],[16.202298,46.852386],[16.370505,46.841327],[16.564808,46.503751],[15.768733,46.238108],[15.67153,45.834154],[15.323954,45.731783],[15.327675,45.452316],[14.935244,45.471695],[14.595109,45.634941],[14.411968,45.466166],[13.71506,45.500324],[13.93763,45.591016],[13.69811,46.016778],[13.806475,46.509306]]]},"id":"SVN"},
-{"type":"Feature","properties":{"name":"Sweden"},"geometry":{"type":"Polygon","coordinates":[[[22.183173,65.723741],[21.213517,65.026005],[21.369631,64.413588],[19.778876,63.609554],[17.847779,62.7494],[17.119555,61.341166],[17.831346,60.636583],[18.787722,60.081914],[17.869225,58.953766],[16.829185,58.719827],[16.44771,57.041118],[15.879786,56.104302],[14.666681,56.200885],[14.100721,55.407781],[12.942911,55.361737],[12.625101,56.30708],[11.787942,57.441817],[11.027369,58.856149],[11.468272,59.432393],[12.300366,60.117933],[12.631147,61.293572],[11.992064,61.800362],[11.930569,63.128318],[12.579935,64.066219],[13.571916,64.049114],[13.919905,64.445421],[13.55569,64.787028],[15.108411,66.193867],[16.108712,67.302456],[16.768879,68.013937],[17.729182,68.010552],[17.993868,68.567391],[19.87856,68.407194],[20.025269,69.065139],[20.645593,69.106247],[21.978535,68.616846],[23.539473,67.936009],[23.56588,66.396051],[23.903379,66.006927],[22.183173,65.723741]]]},"id":"SWE"},
-{"type":"Feature","properties":{"name":"Swaziland"},"geometry":{"type":"Polygon","coordinates":[[[32.071665,-26.73382],[31.86806,-27.177927],[31.282773,-27.285879],[30.685962,-26.743845],[30.676609,-26.398078],[30.949667,-26.022649],[31.04408,-25.731452],[31.333158,-25.660191],[31.837778,-25.843332],[31.985779,-26.29178],[32.071665,-26.73382]]]},"id":"SWZ"},
-{"type":"Feature","properties":{"name":"Syria"},"geometry":{"type":"Polygon","coordinates":[[[38.792341,33.378686],[36.834062,32.312938],[35.719918,32.709192],[35.700798,32.716014],[35.836397,32.868123],[35.821101,33.277426],[36.06646,33.824912],[36.61175,34.201789],[36.448194,34.593935],[35.998403,34.644914],[35.905023,35.410009],[36.149763,35.821535],[36.41755,36.040617],[36.685389,36.259699],[36.739494,36.81752],[37.066761,36.623036],[38.167727,36.90121],[38.699891,36.712927],[39.52258,36.716054],[40.673259,37.091276],[41.212089,37.074352],[42.349591,37.229873],[41.837064,36.605854],[41.289707,36.358815],[41.383965,35.628317],[41.006159,34.419372],[38.792341,33.378686]]]},"id":"SYR"},
-{"type":"Feature","properties":{"name":"Chad"},"geometry":{"type":"Polygon","coordinates":[[[14.495787,12.859396],[14.595781,13.330427],[13.954477,13.353449],[13.956699,13.996691],[13.540394,14.367134],[13.97217,15.68437],[15.247731,16.627306],[15.300441,17.92795],[15.685741,19.95718],[15.903247,20.387619],[15.487148,20.730415],[15.47106,21.04845],[15.096888,21.308519],[14.8513,22.86295],[15.86085,23.40972],[19.84926,21.49509],[23.83766,19.58047],[23.88689,15.61084],[23.02459,15.68072],[22.56795,14.94429],[22.30351,14.32682],[22.51202,14.09318],[22.18329,13.78648],[22.29658,13.37232],[22.03759,12.95546],[21.93681,12.58818],[22.28801,12.64605],[22.49762,12.26024],[22.50869,11.67936],[22.87622,11.38461],[22.864165,11.142395],[22.231129,10.971889],[21.723822,10.567056],[21.000868,9.475985],[20.059685,9.012706],[19.094008,9.074847],[18.81201,8.982915],[18.911022,8.630895],[18.389555,8.281304],[17.96493,7.890914],[16.705988,7.508328],[16.456185,7.734774],[16.290562,7.754307],[16.106232,7.497088],[15.27946,7.421925],[15.436092,7.692812],[15.120866,8.38215],[14.979996,8.796104],[14.544467,8.965861],[13.954218,9.549495],[14.171466,10.021378],[14.627201,9.920919],[14.909354,9.992129],[15.467873,9.982337],[14.923565,10.891325],[14.960152,11.555574],[14.89336,12.21905],[14.495787,12.859396]]]},"id":"TCD"},
-{"type":"Feature","properties":{"name":"Togo"},"geometry":{"type":"Polygon","coordinates":[[[1.865241,6.142158],[1.060122,5.928837],[0.836931,6.279979],[0.570384,6.914359],[0.490957,7.411744],[0.712029,8.312465],[0.461192,8.677223],[0.365901,9.465004],[0.36758,10.191213],[-0.049785,10.706918],[0.023803,11.018682],[0.899563,10.997339],[0.772336,10.470808],[1.077795,10.175607],[1.425061,9.825395],[1.463043,9.334624],[1.664478,9.12859],[1.618951,6.832038],[1.865241,6.142158]]]},"id":"TGO"},
-{"type":"Feature","properties":{"name":"Thailand"},"geometry":{"type":"Polygon","coordinates":[[[102.584932,12.186595],[101.687158,12.64574],[100.83181,12.627085],[100.978467,13.412722],[100.097797,13.406856],[100.018733,12.307001],[99.478921,10.846367],[99.153772,9.963061],[99.222399,9.239255],[99.873832,9.207862],[100.279647,8.295153],[100.459274,7.429573],[101.017328,6.856869],[101.623079,6.740622],[102.141187,6.221636],[101.814282,5.810808],[101.154219,5.691384],[101.075516,6.204867],[100.259596,6.642825],[100.085757,6.464489],[99.690691,6.848213],[99.519642,7.343454],[98.988253,7.907993],[98.503786,8.382305],[98.339662,7.794512],[98.150009,8.350007],[98.25915,8.973923],[98.553551,9.93296],[99.038121,10.960546],[99.587286,11.892763],[99.196354,12.804748],[99.212012,13.269294],[99.097755,13.827503],[98.430819,14.622028],[98.192074,15.123703],[98.537376,15.308497],[98.903348,16.177824],[98.493761,16.837836],[97.859123,17.567946],[97.375896,18.445438],[97.797783,18.62708],[98.253724,19.708203],[98.959676,19.752981],[99.543309,20.186598],[100.115988,20.41785],[100.548881,20.109238],[100.606294,19.508344],[101.282015,19.462585],[101.035931,18.408928],[101.059548,17.512497],[102.113592,18.109102],[102.413005,17.932782],[102.998706,17.961695],[103.200192,18.309632],[103.956477,18.240954],[104.716947,17.428859],[104.779321,16.441865],[105.589039,15.570316],[105.544338,14.723934],[105.218777,14.273212],[104.281418,14.416743],[102.988422,14.225721],[102.348099,13.394247],[102.584932,12.186595]]]},"id":"THA"},
-{"type":"Feature","properties":{"name":"Tajikistan"},"geometry":{"type":"Polygon","coordinates":[[[71.014198,40.244366],[70.648019,39.935754],[69.55961,40.103211],[69.464887,39.526683],[70.549162,39.604198],[71.784694,39.279463],[73.675379,39.431237],[73.928852,38.505815],[74.257514,38.606507],[74.864816,38.378846],[74.829986,37.990007],[74.980002,37.41999],[73.948696,37.421566],[73.260056,37.495257],[72.63689,37.047558],[72.193041,36.948288],[71.844638,36.738171],[71.448693,37.065645],[71.541918,37.905774],[71.239404,37.953265],[71.348131,38.258905],[70.806821,38.486282],[70.376304,38.138396],[70.270574,37.735165],[70.116578,37.588223],[69.518785,37.608997],[69.196273,37.151144],[68.859446,37.344336],[68.135562,37.023115],[67.83,37.144994],[68.392033,38.157025],[68.176025,38.901553],[67.44222,39.140144],[67.701429,39.580478],[68.536416,39.533453],[69.011633,40.086158],[69.329495,40.727824],[70.666622,40.960213],[70.45816,40.496495],[70.601407,40.218527],[71.014198,40.244366]]]},"id":"TJK"},
-{"type":"Feature","properties":{"name":"Turkmenistan"},"geometry":{"type":"Polygon","coordinates":[[[61.210817,35.650072],[61.123071,36.491597],[60.377638,36.527383],[59.234762,37.412988],[58.436154,37.522309],[57.330434,38.029229],[56.619366,38.121394],[56.180375,37.935127],[55.511578,37.964117],[54.800304,37.392421],[53.921598,37.198918],[53.735511,37.906136],[53.880929,38.952093],[53.101028,39.290574],[53.357808,39.975286],[52.693973,40.033629],[52.915251,40.876523],[53.858139,40.631034],[54.736845,40.951015],[54.008311,41.551211],[53.721713,42.123191],[52.91675,41.868117],[52.814689,41.135371],[52.50246,41.783316],[52.944293,42.116034],[54.079418,42.324109],[54.755345,42.043971],[55.455251,41.259859],[55.968191,41.308642],[57.096391,41.32231],[56.932215,41.826026],[57.78653,42.170553],[58.629011,42.751551],[59.976422,42.223082],[60.083341,41.425146],[60.465953,41.220327],[61.547179,41.26637],[61.882714,41.084857],[62.37426,40.053886],[63.518015,39.363257],[64.170223,38.892407],[65.215999,38.402695],[66.54615,37.974685],[66.518607,37.362784],[66.217385,37.39379],[65.745631,37.661164],[65.588948,37.305217],[64.746105,37.111818],[64.546479,36.312073],[63.982896,36.007957],[63.193538,35.857166],[62.984662,35.404041],[62.230651,35.270664],[61.210817,35.650072]]]},"id":"TKM"},
-{"type":"Feature","properties":{"name":"East Timor"},"geometry":{"type":"Polygon","coordinates":[[[124.968682,-8.89279],[125.086246,-8.656887],[125.947072,-8.432095],[126.644704,-8.398247],[126.957243,-8.273345],[127.335928,-8.397317],[126.967992,-8.668256],[125.925885,-9.106007],[125.08852,-9.393173],[125.07002,-9.089987],[124.968682,-8.89279]]]},"id":"TLS"},
-{"type":"Feature","properties":{"name":"Trinidad and Tobago"},"geometry":{"type":"Polygon","coordinates":[[[-61.68,10.76],[-61.105,10.89],[-60.895,10.855],[-60.935,10.11],[-61.77,10],[-61.95,10.09],[-61.66,10.365],[-61.68,10.76]]]},"id":"TTO"},
-{"type":"Feature","properties":{"name":"Tunisia"},"geometry":{"type":"Polygon","coordinates":[[[9.48214,30.307556],[9.055603,32.102692],[8.439103,32.506285],[8.430473,32.748337],[7.612642,33.344115],[7.524482,34.097376],[8.140981,34.655146],[8.376368,35.479876],[8.217824,36.433177],[8.420964,36.946427],[9.509994,37.349994],[10.210002,37.230002],[10.18065,36.724038],[11.028867,37.092103],[11.100026,36.899996],[10.600005,36.41],[10.593287,35.947444],[10.939519,35.698984],[10.807847,34.833507],[10.149593,34.330773],[10.339659,33.785742],[10.856836,33.76874],[11.108501,33.293343],[11.488787,33.136996],[11.432253,32.368903],[10.94479,32.081815],[10.636901,31.761421],[9.950225,31.37607],[10.056575,30.961831],[9.970017,30.539325],[9.48214,30.307556]]]},"id":"TUN"},
-{"type":"Feature","properties":{"name":"Turkey"},"geometry":{"type":"MultiPolygon","coordinates":[[[[36.913127,41.335358],[38.347665,40.948586],[39.512607,41.102763],[40.373433,41.013673],[41.554084,41.535656],[42.619549,41.583173],[43.582746,41.092143],[43.752658,40.740201],[43.656436,40.253564],[44.400009,40.005],[44.79399,39.713003],[44.109225,39.428136],[44.421403,38.281281],[44.225756,37.971584],[44.772699,37.170445],[44.293452,37.001514],[43.942259,37.256228],[42.779126,37.385264],[42.349591,37.229873],[41.212089,37.074352],[40.673259,37.091276],[39.52258,36.716054],[38.699891,36.712927],[38.167727,36.90121],[37.066761,36.623036],[36.739494,36.81752],[36.685389,36.259699],[36.41755,36.040617],[36.149763,35.821535],[35.782085,36.274995],[36.160822,36.650606],[35.550936,36.565443],[34.714553,36.795532],[34.026895,36.21996],[32.509158,36.107564],[31.699595,36.644275],[30.621625,36.677865],[30.391096,36.262981],[29.699976,36.144357],[28.732903,36.676831],[27.641187,36.658822],[27.048768,37.653361],[26.318218,38.208133],[26.8047,38.98576],[26.170785,39.463612],[27.28002,40.420014],[28.819978,40.460011],[29.240004,41.219991],[31.145934,41.087622],[32.347979,41.736264],[33.513283,42.01896],[35.167704,42.040225],[36.913127,41.335358]]],[[[27.192377,40.690566],[26.358009,40.151994],[26.043351,40.617754],[26.056942,40.824123],[26.294602,40.936261],[26.604196,41.562115],[26.117042,41.826905],[27.135739,42.141485],[27.99672,42.007359],[28.115525,41.622886],[28.988443,41.299934],[28.806438,41.054962],[27.619017,40.999823],[27.192377,40.690566]]]]},"id":"TUR"},
-{"type":"Feature","properties":{"name":"Taiwan"},"geometry":{"type":"Polygon","coordinates":[[[121.777818,24.394274],[121.175632,22.790857],[120.74708,21.970571],[120.220083,22.814861],[120.106189,23.556263],[120.69468,24.538451],[121.495044,25.295459],[121.951244,24.997596],[121.777818,24.394274]]]},"id":"TWN"},
-{"type":"Feature","properties":{"name":"United Republic of Tanzania"},"geometry":{"type":"Polygon","coordinates":[[[33.903711,-0.95],[34.07262,-1.05982],[37.69869,-3.09699],[37.7669,-3.67712],[39.20222,-4.67677],[38.74054,-5.90895],[38.79977,-6.47566],[39.44,-6.84],[39.47,-7.1],[39.19469,-7.7039],[39.25203,-8.00781],[39.18652,-8.48551],[39.53574,-9.11237],[39.9496,-10.0984],[40.31659,-10.3171],[39.521,-10.89688],[38.427557,-11.285202],[37.82764,-11.26879],[37.47129,-11.56876],[36.775151,-11.594537],[36.514082,-11.720938],[35.312398,-11.439146],[34.559989,-11.52002],[34.28,-10.16],[33.940838,-9.693674],[33.73972,-9.41715],[32.759375,-9.230599],[32.191865,-8.930359],[31.556348,-8.762049],[31.157751,-8.594579],[30.74,-8.34],[30.2,-7.08],[29.62,-6.52],[29.419993,-5.939999],[29.519987,-5.419979],[29.339998,-4.499983],[29.753512,-4.452389],[30.11632,-4.09012],[30.50554,-3.56858],[30.75224,-3.35931],[30.74301,-3.03431],[30.52766,-2.80762],[30.46967,-2.41383],[30.758309,-2.28725],[30.816135,-1.698914],[30.419105,-1.134659],[30.76986,-1.01455],[31.86617,-1.02736],[33.903711,-0.95]]]},"id":"TZA"},
-{"type":"Feature","properties":{"name":"Uganda"},"geometry":{"type":"Polygon","coordinates":[[[31.86617,-1.02736],[30.76986,-1.01455],[30.419105,-1.134659],[29.821519,-1.443322],[29.579466,-1.341313],[29.587838,-0.587406],[29.8195,-0.2053],[29.875779,0.59738],[30.086154,1.062313],[30.468508,1.583805],[30.85267,1.849396],[31.174149,2.204465],[30.77332,2.33989],[30.83385,3.50917],[31.24556,3.7819],[31.88145,3.55827],[32.68642,3.79232],[33.39,3.79],[34.005,4.249885],[34.47913,3.5556],[34.59607,3.05374],[35.03599,1.90584],[34.6721,1.17694],[34.18,0.515],[33.893569,0.109814],[33.903711,-0.95],[31.86617,-1.02736]]]},"id":"UGA"},
-{"type":"Feature","properties":{"name":"Ukraine"},"geometry":{"type":"Polygon","coordinates":[[[31.785998,52.101678],[32.159412,52.061267],[32.412058,52.288695],[32.715761,52.238465],[33.7527,52.335075],[34.391731,51.768882],[34.141978,51.566413],[34.224816,51.255993],[35.022183,51.207572],[35.377924,50.773955],[35.356116,50.577197],[36.626168,50.225591],[37.39346,50.383953],[38.010631,49.915662],[38.594988,49.926462],[40.069058,49.601055],[40.080789,49.30743],[39.674664,48.783818],[39.895632,48.232405],[39.738278,47.898937],[38.770585,47.825608],[38.255112,47.5464],[38.223538,47.10219],[37.425137,47.022221],[36.759855,46.6987],[35.823685,46.645964],[34.962342,46.273197],[35.020788,45.651219],[35.510009,45.409993],[36.529998,45.46999],[36.334713,45.113216],[35.239999,44.939996],[33.882511,44.361479],[33.326421,44.564877],[33.546924,45.034771],[32.454174,45.327466],[32.630804,45.519186],[33.588162,45.851569],[33.298567,46.080598],[31.74414,46.333348],[31.675307,46.706245],[30.748749,46.5831],[30.377609,46.03241],[29.603289,45.293308],[29.149725,45.464925],[28.679779,45.304031],[28.233554,45.488283],[28.485269,45.596907],[28.659987,45.939987],[28.933717,46.25883],[28.862972,46.437889],[29.072107,46.517678],[29.170654,46.379262],[29.759972,46.349988],[30.024659,46.423937],[29.83821,46.525326],[29.908852,46.674361],[29.559674,46.928583],[29.415135,47.346645],[29.050868,47.510227],[29.122698,47.849095],[28.670891,48.118149],[28.259547,48.155562],[27.522537,48.467119],[26.857824,48.368211],[26.619337,48.220726],[26.19745,48.220881],[25.945941,47.987149],[25.207743,47.891056],[24.866317,47.737526],[24.402056,47.981878],[23.760958,47.985598],[23.142236,48.096341],[22.710531,47.882194],[22.64082,48.15024],[22.085608,48.422264],[22.280842,48.825392],[22.558138,49.085738],[22.776419,49.027395],[22.51845,49.476774],[23.426508,50.308506],[23.922757,50.424881],[24.029986,50.705407],[23.527071,51.578454],[24.005078,51.617444],[24.553106,51.888461],[25.327788,51.910656],[26.337959,51.832289],[27.454066,51.592303],[28.241615,51.572227],[28.617613,51.427714],[28.992835,51.602044],[29.254938,51.368234],[30.157364,51.416138],[30.555117,51.319503],[30.619454,51.822806],[30.927549,52.042353],[31.785998,52.101678]]]},"id":"UKR"},
-{"type":"Feature","properties":{"name":"Uruguay"},"geometry":{"type":"Polygon","coordinates":[[[-57.625133,-30.216295],[-56.976026,-30.109686],[-55.973245,-30.883076],[-55.60151,-30.853879],[-54.572452,-31.494511],[-53.787952,-32.047243],[-53.209589,-32.727666],[-53.650544,-33.202004],[-53.373662,-33.768378],[-53.806426,-34.396815],[-54.935866,-34.952647],[-55.67409,-34.752659],[-56.215297,-34.859836],[-57.139685,-34.430456],[-57.817861,-34.462547],[-58.427074,-33.909454],[-58.349611,-33.263189],[-58.132648,-33.040567],[-58.14244,-32.044504],[-57.874937,-31.016556],[-57.625133,-30.216295]]]},"id":"URY"},
-{"type":"Feature","properties":{"name":"United States of America"},"geometry":{"type":"MultiPolygon","coordinates":[[[[-155.54211,19.08348],[-155.68817,18.91619],[-155.93665,19.05939],[-155.90806,19.33888],[-156.07347,19.70294],[-156.02368,19.81422],[-155.85008,19.97729],[-155.91907,20.17395],[-155.86108,20.26721],[-155.78505,20.2487],[-155.40214,20.07975],[-155.22452,19.99302],[-155.06226,19.8591],[-154.80741,19.50871],[-154.83147,19.45328],[-155.22217,19.23972],[-155.54211,19.08348]]],[[[-156.07926,20.64397],[-156.41445,20.57241],[-156.58673,20.783],[-156.70167,20.8643],[-156.71055,20.92676],[-156.61258,21.01249],[-156.25711,20.91745],[-155.99566,20.76404],[-156.07926,20.64397]]],[[[-156.75824,21.17684],[-156.78933,21.06873],[-157.32521,21.09777],[-157.25027,21.21958],[-156.75824,21.17684]]],[[[-157.65283,21.32217],[-157.70703,21.26442],[-157.7786,21.27729],[-158.12667,21.31244],[-158.2538,21.53919],[-158.29265,21.57912],[-158.0252,21.71696],[-157.94161,21.65272],[-157.65283,21.32217]]],[[[-159.34512,21.982],[-159.46372,21.88299],[-159.80051,22.06533],[-159.74877,22.1382],[-159.5962,22.23618],[-159.36569,22.21494],[-159.34512,21.982]]],[[[-94.81758,49.38905],[-94.64,48.84],[-94.32914,48.67074],[-93.63087,48.60926],[-92.61,48.45],[-91.64,48.14],[-90.83,48.27],[-89.6,48.01],[-89.272917,48.019808],[-88.378114,48.302918],[-87.439793,47.94],[-86.461991,47.553338],[-85.652363,47.220219],[-84.87608,46.900083],[-84.779238,46.637102],[-84.543749,46.538684],[-84.6049,46.4396],[-84.3367,46.40877],[-84.14212,46.512226],[-84.091851,46.275419],[-83.890765,46.116927],[-83.616131,46.116927],[-83.469551,45.994686],[-83.592851,45.816894],[-82.550925,45.347517],[-82.337763,44.44],[-82.137642,43.571088],[-82.43,42.98],[-82.9,42.43],[-83.12,42.08],[-83.142,41.975681],[-83.02981,41.832796],[-82.690089,41.675105],[-82.439278,41.675105],[-81.277747,42.209026],[-80.247448,42.3662],[-78.939362,42.863611],[-78.92,42.965],[-79.01,43.27],[-79.171674,43.466339],[-78.72028,43.625089],[-77.737885,43.629056],[-76.820034,43.628784],[-76.5,44.018459],[-76.375,44.09631],[-75.31821,44.81645],[-74.867,45.00048],[-73.34783,45.00738],[-71.50506,45.0082],[-71.405,45.255],[-71.08482,45.30524],[-70.66,45.46],[-70.305,45.915],[-69.99997,46.69307],[-69.237216,47.447781],[-68.905,47.185],[-68.23444,47.35486],[-67.79046,47.06636],[-67.79134,45.70281],[-67.13741,45.13753],[-66.96466,44.8097],[-68.03252,44.3252],[-69.06,43.98],[-70.11617,43.68405],[-70.645476,43.090238],[-70.81489,42.8653],[-70.825,42.335],[-70.495,41.805],[-70.08,41.78],[-70.185,42.145],[-69.88497,41.92283],[-69.96503,41.63717],[-70.64,41.475],[-71.12039,41.49445],[-71.86,41.32],[-72.295,41.27],[-72.87643,41.22065],[-73.71,40.931102],[-72.24126,41.11948],[-71.945,40.93],[-73.345,40.63],[-73.982,40.628],[-73.952325,40.75075],[-74.25671,40.47351],[-73.96244,40.42763],[-74.17838,39.70926],[-74.90604,38.93954],[-74.98041,39.1964],[-75.20002,39.24845],[-75.52805,39.4985],[-75.32,38.96],[-75.071835,38.782032],[-75.05673,38.40412],[-75.37747,38.01551],[-75.94023,37.21689],[-76.03127,37.2566],[-75.72205,37.93705],[-76.23287,38.319215],[-76.35,39.15],[-76.542725,38.717615],[-76.32933,38.08326],[-76.989998,38.239992],[-76.30162,37.917945],[-76.25874,36.9664],[-75.9718,36.89726],[-75.86804,36.55125],[-75.72749,35.55074],[-76.36318,34.80854],[-77.397635,34.51201],[-78.05496,33.92547],[-78.55435,33.86133],[-79.06067,33.49395],[-79.20357,33.15839],[-80.301325,32.509355],[-80.86498,32.0333],[-81.33629,31.44049],[-81.49042,30.72999],[-81.31371,30.03552],[-80.98,29.18],[-80.535585,28.47213],[-80.53,28.04],[-80.056539,26.88],[-80.088015,26.205765],[-80.13156,25.816775],[-80.38103,25.20616],[-80.68,25.08],[-81.17213,25.20126],[-81.33,25.64],[-81.71,25.87],[-82.24,26.73],[-82.70515,27.49504],[-82.85526,27.88624],[-82.65,28.55],[-82.93,29.1],[-83.70959,29.93656],[-84.1,30.09],[-85.10882,29.63615],[-85.28784,29.68612],[-85.7731,30.15261],[-86.4,30.4],[-87.53036,30.27433],[-88.41782,30.3849],[-89.18049,30.31598],[-89.593831,30.159994],[-89.413735,29.89419],[-89.43,29.48864],[-89.21767,29.29108],[-89.40823,29.15961],[-89.77928,29.30714],[-90.15463,29.11743],[-90.880225,29.148535],[-91.626785,29.677],[-92.49906,29.5523],[-93.22637,29.78375],[-93.84842,29.71363],[-94.69,29.48],[-95.60026,28.73863],[-96.59404,28.30748],[-97.14,27.83],[-97.37,27.38],[-97.38,26.69],[-97.33,26.21],[-97.14,25.87],[-97.53,25.84],[-98.24,26.06],[-99.02,26.37],[-99.3,26.84],[-99.52,27.54],[-100.11,28.11],[-100.45584,28.69612],[-100.9576,29.38071],[-101.6624,29.7793],[-102.48,29.76],[-103.11,28.97],[-103.94,29.27],[-104.45697,29.57196],[-104.70575,30.12173],[-105.03737,30.64402],[-105.63159,31.08383],[-106.1429,31.39995],[-106.50759,31.75452],[-108.24,31.754854],[-108.24194,31.34222],[-109.035,31.34194],[-111.02361,31.33472],[-113.30498,32.03914],[-114.815,32.52528],[-114.72139,32.72083],[-115.99135,32.61239],[-117.12776,32.53534],[-117.295938,33.046225],[-117.944,33.621236],[-118.410602,33.740909],[-118.519895,34.027782],[-119.081,34.078],[-119.438841,34.348477],[-120.36778,34.44711],[-120.62286,34.60855],[-120.74433,35.15686],[-121.71457,36.16153],[-122.54747,37.55176],[-122.51201,37.78339],[-122.95319,38.11371],[-123.7272,38.95166],[-123.86517,39.76699],[-124.39807,40.3132],[-124.17886,41.14202],[-124.2137,41.99964],[-124.53284,42.76599],[-124.14214,43.70838],[-124.020535,44.615895],[-123.89893,45.52341],[-124.079635,46.86475],[-124.39567,47.72017],[-124.68721,48.184433],[-124.566101,48.379715],[-123.12,48.04],[-122.58736,47.096],[-122.34,47.36],[-122.5,48.18],[-122.84,49],[-120,49],[-117.03121,49],[-116.04818,49],[-113,49],[-110.05,49],[-107.05,49],[-104.04826,48.99986],[-100.65,49],[-97.22872,49.0007],[-95.15907,49],[-95.15609,49.38425],[-94.81758,49.38905]]],[[[-153.006314,57.115842],[-154.00509,56.734677],[-154.516403,56.992749],[-154.670993,57.461196],[-153.76278,57.816575],[-153.228729,57.968968],[-152.564791,57.901427],[-152.141147,57.591059],[-153.006314,57.115842]]],[[[-165.579164,59.909987],[-166.19277,59.754441],[-166.848337,59.941406],[-167.455277,60.213069],[-166.467792,60.38417],[-165.67443,60.293607],[-165.579164,59.909987]]],[[[-171.731657,63.782515],[-171.114434,63.592191],[-170.491112,63.694975],[-169.682505,63.431116],[-168.689439,63.297506],[-168.771941,63.188598],[-169.52944,62.976931],[-170.290556,63.194438],[-170.671386,63.375822],[-171.553063,63.317789],[-171.791111,63.405846],[-171.731657,63.782515]]],[[[-155.06779,71.147776],[-154.344165,70.696409],[-153.900006,70.889989],[-152.210006,70.829992],[-152.270002,70.600006],[-150.739992,70.430017],[-149.720003,70.53001],[-147.613362,70.214035],[-145.68999,70.12001],[-144.920011,69.989992],[-143.589446,70.152514],[-142.07251,69.851938],[-140.985988,69.711998],[-140.985988,69.711998],[-140.992499,66.000029],[-140.99777,60.306397],[-140.012998,60.276838],[-139.039,60.000007],[-138.34089,59.56211],[-137.4525,58.905],[-136.47972,59.46389],[-135.47583,59.78778],[-134.945,59.27056],[-134.27111,58.86111],[-133.355549,58.410285],[-132.73042,57.69289],[-131.70781,56.55212],[-130.00778,55.91583],[-129.979994,55.284998],[-130.53611,54.802753],[-131.085818,55.178906],[-131.967211,55.497776],[-132.250011,56.369996],[-133.539181,57.178887],[-134.078063,58.123068],[-135.038211,58.187715],[-136.628062,58.212209],[-137.800006,58.499995],[-139.867787,59.537762],[-140.825274,59.727517],[-142.574444,60.084447],[-143.958881,59.99918],[-145.925557,60.45861],[-147.114374,60.884656],[-148.224306,60.672989],[-148.018066,59.978329],[-148.570823,59.914173],[-149.727858,59.705658],[-150.608243,59.368211],[-151.716393,59.155821],[-151.859433,59.744984],[-151.409719,60.725803],[-150.346941,61.033588],[-150.621111,61.284425],[-151.895839,60.727198],[-152.57833,60.061657],[-154.019172,59.350279],[-153.287511,58.864728],[-154.232492,58.146374],[-155.307491,57.727795],[-156.308335,57.422774],[-156.556097,56.979985],[-158.117217,56.463608],[-158.433321,55.994154],[-159.603327,55.566686],[-160.28972,55.643581],[-161.223048,55.364735],[-162.237766,55.024187],[-163.069447,54.689737],[-164.785569,54.404173],[-164.942226,54.572225],[-163.84834,55.039431],[-162.870001,55.348043],[-161.804175,55.894986],[-160.563605,56.008055],[-160.07056,56.418055],[-158.684443,57.016675],[-158.461097,57.216921],[-157.72277,57.570001],[-157.550274,58.328326],[-157.041675,58.918885],[-158.194731,58.615802],[-158.517218,58.787781],[-159.058606,58.424186],[-159.711667,58.93139],[-159.981289,58.572549],[-160.355271,59.071123],[-161.355003,58.670838],[-161.968894,58.671665],[-162.054987,59.266925],[-161.874171,59.633621],[-162.518059,59.989724],[-163.818341,59.798056],[-164.662218,60.267484],[-165.346388,60.507496],[-165.350832,61.073895],[-166.121379,61.500019],[-165.734452,62.074997],[-164.919179,62.633076],[-164.562508,63.146378],[-163.753332,63.219449],[-163.067224,63.059459],[-162.260555,63.541936],[-161.53445,63.455817],[-160.772507,63.766108],[-160.958335,64.222799],[-161.518068,64.402788],[-160.777778,64.788604],[-161.391926,64.777235],[-162.45305,64.559445],[-162.757786,64.338605],[-163.546394,64.55916],[-164.96083,64.446945],[-166.425288,64.686672],[-166.845004,65.088896],[-168.11056,65.669997],[-166.705271,66.088318],[-164.47471,66.57666],[-163.652512,66.57666],[-163.788602,66.077207],[-161.677774,66.11612],[-162.489715,66.735565],[-163.719717,67.116395],[-164.430991,67.616338],[-165.390287,68.042772],[-166.764441,68.358877],[-166.204707,68.883031],[-164.430811,68.915535],[-163.168614,69.371115],[-162.930566,69.858062],[-161.908897,70.33333],[-160.934797,70.44769],[-159.039176,70.891642],[-158.119723,70.824721],[-156.580825,71.357764],[-155.06779,71.147776]]]]},"id":"USA"},
-{"type":"Feature","properties":{"name":"Uzbekistan"},"geometry":{"type":"Polygon","coordinates":[[[66.518607,37.362784],[66.54615,37.974685],[65.215999,38.402695],[64.170223,38.892407],[63.518015,39.363257],[62.37426,40.053886],[61.882714,41.084857],[61.547179,41.26637],[60.465953,41.220327],[60.083341,41.425146],[59.976422,42.223082],[58.629011,42.751551],[57.78653,42.170553],[56.932215,41.826026],[57.096391,41.32231],[55.968191,41.308642],[55.928917,44.995858],[58.503127,45.586804],[58.689989,45.500014],[60.239972,44.784037],[61.05832,44.405817],[62.0133,43.504477],[63.185787,43.650075],[64.900824,43.728081],[66.098012,42.99766],[66.023392,41.994646],[66.510649,41.987644],[66.714047,41.168444],[67.985856,41.135991],[68.259896,40.662325],[68.632483,40.668681],[69.070027,41.384244],[70.388965,42.081308],[70.962315,42.266154],[71.259248,42.167711],[70.420022,41.519998],[71.157859,41.143587],[71.870115,41.3929],[73.055417,40.866033],[71.774875,40.145844],[71.014198,40.244366],[70.601407,40.218527],[70.45816,40.496495],[70.666622,40.960213],[69.329495,40.727824],[69.011633,40.086158],[68.536416,39.533453],[67.701429,39.580478],[67.44222,39.140144],[68.176025,38.901553],[68.392033,38.157025],[67.83,37.144994],[67.075782,37.356144],[66.518607,37.362784]]]},"id":"UZB"},
-{"type":"Feature","properties":{"name":"Venezuela"},"geometry":{"type":"Polygon","coordinates":[[[-71.331584,11.776284],[-71.360006,11.539994],[-71.94705,11.423282],[-71.620868,10.96946],[-71.633064,10.446494],[-72.074174,9.865651],[-71.695644,9.072263],[-71.264559,9.137195],[-71.039999,9.859993],[-71.350084,10.211935],[-71.400623,10.968969],[-70.155299,11.375482],[-70.293843,11.846822],[-69.943245,12.162307],[-69.5843,11.459611],[-68.882999,11.443385],[-68.233271,10.885744],[-68.194127,10.554653],[-67.296249,10.545868],[-66.227864,10.648627],[-65.655238,10.200799],[-64.890452,10.077215],[-64.329479,10.389599],[-64.318007,10.641418],[-63.079322,10.701724],[-61.880946,10.715625],[-62.730119,10.420269],[-62.388512,9.948204],[-61.588767,9.873067],[-60.830597,9.38134],[-60.671252,8.580174],[-60.150096,8.602757],[-59.758285,8.367035],[-60.550588,7.779603],[-60.637973,7.415],[-60.295668,7.043911],[-60.543999,6.856584],[-61.159336,6.696077],[-61.139415,6.234297],[-61.410303,5.959068],[-60.733574,5.200277],[-60.601179,4.918098],[-60.966893,4.536468],[-62.08543,4.162124],[-62.804533,4.006965],[-63.093198,3.770571],[-63.888343,4.02053],[-64.628659,4.148481],[-64.816064,4.056445],[-64.368494,3.79721],[-64.408828,3.126786],[-64.269999,2.497006],[-63.422867,2.411068],[-63.368788,2.2009],[-64.083085,1.916369],[-64.199306,1.492855],[-64.611012,1.328731],[-65.354713,1.095282],[-65.548267,0.789254],[-66.325765,0.724452],[-66.876326,1.253361],[-67.181294,2.250638],[-67.447092,2.600281],[-67.809938,2.820655],[-67.303173,3.318454],[-67.337564,3.542342],[-67.621836,3.839482],[-67.823012,4.503937],[-67.744697,5.221129],[-67.521532,5.55687],[-67.34144,6.095468],[-67.695087,6.267318],[-68.265052,6.153268],[-68.985319,6.206805],[-69.38948,6.099861],[-70.093313,6.960376],[-70.674234,7.087785],[-71.960176,6.991615],[-72.198352,7.340431],[-72.444487,7.423785],[-72.479679,7.632506],[-72.360901,8.002638],[-72.439862,8.405275],[-72.660495,8.625288],[-72.78873,9.085027],[-73.304952,9.152],[-73.027604,9.73677],[-72.905286,10.450344],[-72.614658,10.821975],[-72.227575,11.108702],[-71.973922,11.608672],[-71.331584,11.776284]]]},"id":"VEN"},
-{"type":"Feature","properties":{"name":"Vietnam"},"geometry":{"type":"Polygon","coordinates":[[[108.05018,21.55238],[106.715068,20.696851],[105.881682,19.75205],[105.662006,19.058165],[106.426817,18.004121],[107.361954,16.697457],[108.269495,16.079742],[108.877107,15.276691],[109.33527,13.426028],[109.200136,11.666859],[108.36613,11.008321],[107.220929,10.364484],[106.405113,9.53084],[105.158264,8.59976],[104.795185,9.241038],[105.076202,9.918491],[104.334335,10.486544],[105.199915,10.88931],[106.24967,10.961812],[105.810524,11.567615],[107.491403,12.337206],[107.614548,13.535531],[107.382727,14.202441],[107.564525,15.202173],[107.312706,15.908538],[106.556008,16.604284],[105.925762,17.485315],[105.094598,18.666975],[103.896532,19.265181],[104.183388,19.624668],[104.822574,19.886642],[104.435,20.758733],[103.203861,20.766562],[102.754896,21.675137],[102.170436,22.464753],[102.706992,22.708795],[103.504515,22.703757],[104.476858,22.81915],[105.329209,23.352063],[105.811247,22.976892],[106.725403,22.794268],[106.567273,22.218205],[107.04342,21.811899],[108.05018,21.55238]]]},"id":"VNM"},
-{"type":"Feature","properties":{"name":"Vanuatu"},"geometry":{"type":"MultiPolygon","coordinates":[[[[167.844877,-16.466333],[167.515181,-16.59785],[167.180008,-16.159995],[167.216801,-15.891846],[167.844877,-16.466333]]],[[[167.107712,-14.93392],[167.270028,-15.740021],[167.001207,-15.614602],[166.793158,-15.668811],[166.649859,-15.392704],[166.629137,-14.626497],[167.107712,-14.93392]]]]},"id":"VUT"},
-{"type":"Feature","properties":{"name":"West Bank"},"geometry":{"type":"Polygon","coordinates":[[[35.545665,32.393992],[35.545252,31.782505],[35.397561,31.489086],[34.927408,31.353435],[34.970507,31.616778],[35.225892,31.754341],[34.974641,31.866582],[35.18393,32.532511],[35.545665,32.393992]]]},"id":"PSE"},
-{"type":"Feature","properties":{"name":"Yemen"},"geometry":{"type":"Polygon","coordinates":[[[53.108573,16.651051],[52.385206,16.382411],[52.191729,15.938433],[52.168165,15.59742],[51.172515,15.17525],[49.574576,14.708767],[48.679231,14.003202],[48.238947,13.94809],[47.938914,14.007233],[47.354454,13.59222],[46.717076,13.399699],[45.877593,13.347764],[45.62505,13.290946],[45.406459,13.026905],[45.144356,12.953938],[44.989533,12.699587],[44.494576,12.721653],[44.175113,12.58595],[43.482959,12.6368],[43.222871,13.22095],[43.251448,13.767584],[43.087944,14.06263],[42.892245,14.802249],[42.604873,15.213335],[42.805015,15.261963],[42.702438,15.718886],[42.823671,15.911742],[42.779332,16.347891],[43.218375,16.66689],[43.115798,17.08844],[43.380794,17.579987],[43.791519,17.319977],[44.062613,17.410359],[45.216651,17.433329],[45.399999,17.333335],[46.366659,17.233315],[46.749994,17.283338],[47.000005,16.949999],[47.466695,17.116682],[48.183344,18.166669],[49.116672,18.616668],[52.00001,19.000003],[52.782184,17.349742],[53.108573,16.651051]]]},"id":"YEM"},
-{"type":"Feature","properties":{"name":"South Africa"},"geometry":{"type":"Polygon","coordinates":[[[31.521001,-29.257387],[31.325561,-29.401978],[30.901763,-29.909957],[30.622813,-30.423776],[30.055716,-31.140269],[28.925553,-32.172041],[28.219756,-32.771953],[27.464608,-33.226964],[26.419452,-33.61495],[25.909664,-33.66704],[25.780628,-33.944646],[25.172862,-33.796851],[24.677853,-33.987176],[23.594043,-33.794474],[22.988189,-33.916431],[22.574157,-33.864083],[21.542799,-34.258839],[20.689053,-34.417175],[20.071261,-34.795137],[19.616405,-34.819166],[19.193278,-34.462599],[18.855315,-34.444306],[18.424643,-33.997873],[18.377411,-34.136521],[18.244499,-33.867752],[18.25008,-33.281431],[17.92519,-32.611291],[18.24791,-32.429131],[18.221762,-31.661633],[17.566918,-30.725721],[17.064416,-29.878641],[17.062918,-29.875954],[16.344977,-28.576705],[16.824017,-28.082162],[17.218929,-28.355943],[17.387497,-28.783514],[17.836152,-28.856378],[18.464899,-29.045462],[19.002127,-28.972443],[19.894734,-28.461105],[19.895768,-24.76779],[20.165726,-24.917962],[20.758609,-25.868136],[20.66647,-26.477453],[20.889609,-26.828543],[21.605896,-26.726534],[22.105969,-26.280256],[22.579532,-25.979448],[22.824271,-25.500459],[23.312097,-25.26869],[23.73357,-25.390129],[24.211267,-25.670216],[25.025171,-25.71967],[25.664666,-25.486816],[25.765849,-25.174845],[25.941652,-24.696373],[26.485753,-24.616327],[26.786407,-24.240691],[27.11941,-23.574323],[28.017236,-22.827754],[29.432188,-22.091313],[29.839037,-22.102216],[30.322883,-22.271612],[30.659865,-22.151567],[31.191409,-22.25151],[31.670398,-23.658969],[31.930589,-24.369417],[31.752408,-25.484284],[31.837778,-25.843332],[31.333158,-25.660191],[31.04408,-25.731452],[30.949667,-26.022649],[30.676609,-26.398078],[30.685962,-26.743845],[31.282773,-27.285879],[31.86806,-27.177927],[32.071665,-26.73382],[32.83012,-26.742192],[32.580265,-27.470158],[32.462133,-28.301011],[32.203389,-28.752405],[31.521001,-29.257387]],[[28.978263,-28.955597],[28.5417,-28.647502],[28.074338,-28.851469],[27.532511,-29.242711],[26.999262,-29.875954],[27.749397,-30.645106],[28.107205,-30.545732],[28.291069,-30.226217],[28.8484,-30.070051],[29.018415,-29.743766],[29.325166,-29.257387],[28.978263,-28.955597]]]},"id":"ZAF"},
-{"type":"Feature","properties":{"name":"Zambia"},"geometry":{"type":"Polygon","coordinates":[[[32.759375,-9.230599],[33.231388,-9.676722],[33.485688,-10.525559],[33.31531,-10.79655],[33.114289,-11.607198],[33.306422,-12.435778],[32.991764,-12.783871],[32.688165,-13.712858],[33.214025,-13.97186],[30.179481,-14.796099],[30.274256,-15.507787],[29.516834,-15.644678],[28.947463,-16.043051],[28.825869,-16.389749],[28.467906,-16.4684],[27.598243,-17.290831],[27.044427,-17.938026],[26.706773,-17.961229],[26.381935,-17.846042],[25.264226,-17.73654],[25.084443,-17.661816],[25.07695,-17.578823],[24.682349,-17.353411],[24.033862,-17.295843],[23.215048,-17.523116],[22.562478,-16.898451],[21.887843,-16.08031],[21.933886,-12.898437],[24.016137,-12.911046],[23.930922,-12.565848],[24.079905,-12.191297],[23.904154,-11.722282],[24.017894,-11.237298],[23.912215,-10.926826],[24.257155,-10.951993],[24.314516,-11.262826],[24.78317,-11.238694],[25.418118,-11.330936],[25.75231,-11.784965],[26.553088,-11.92444],[27.16442,-11.608748],[27.388799,-12.132747],[28.155109,-12.272481],[28.523562,-12.698604],[28.934286,-13.248958],[29.699614,-13.257227],[29.616001,-12.178895],[29.341548,-12.360744],[28.642417,-11.971569],[28.372253,-11.793647],[28.49607,-10.789884],[28.673682,-9.605925],[28.449871,-9.164918],[28.734867,-8.526559],[29.002912,-8.407032],[30.346086,-8.238257],[30.740015,-8.340007],[31.157751,-8.594579],[31.556348,-8.762049],[32.191865,-8.930359],[32.759375,-9.230599]]]},"id":"ZMB"},
-{"type":"Feature","properties":{"name":"Zimbabwe"},"geometry":{"type":"Polygon","coordinates":[[[31.191409,-22.25151],[30.659865,-22.151567],[30.322883,-22.271612],[29.839037,-22.102216],[29.432188,-22.091313],[28.794656,-21.639454],[28.02137,-21.485975],[27.727228,-20.851802],[27.724747,-20.499059],[27.296505,-20.39152],[26.164791,-19.293086],[25.850391,-18.714413],[25.649163,-18.536026],[25.264226,-17.73654],[26.381935,-17.846042],[26.706773,-17.961229],[27.044427,-17.938026],[27.598243,-17.290831],[28.467906,-16.4684],[28.825869,-16.389749],[28.947463,-16.043051],[29.516834,-15.644678],[30.274256,-15.507787],[30.338955,-15.880839],[31.173064,-15.860944],[31.636498,-16.07199],[31.852041,-16.319417],[32.328239,-16.392074],[32.847639,-16.713398],[32.849861,-17.979057],[32.654886,-18.67209],[32.611994,-19.419383],[32.772708,-19.715592],[32.659743,-20.30429],[32.508693,-20.395292],[32.244988,-21.116489],[31.191409,-22.25151]]]},"id":"ZWE"}
-]}
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "properties": { "name": "Afghanistan" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [61.210817, 35.650072],
+            [62.230651, 35.270664],
+            [62.984662, 35.404041],
+            [63.193538, 35.857166],
+            [63.982896, 36.007957],
+            [64.546479, 36.312073],
+            [64.746105, 37.111818],
+            [65.588948, 37.305217],
+            [65.745631, 37.661164],
+            [66.217385, 37.39379],
+            [66.518607, 37.362784],
+            [67.075782, 37.356144],
+            [67.83, 37.144994],
+            [68.135562, 37.023115],
+            [68.859446, 37.344336],
+            [69.196273, 37.151144],
+            [69.518785, 37.608997],
+            [70.116578, 37.588223],
+            [70.270574, 37.735165],
+            [70.376304, 38.138396],
+            [70.806821, 38.486282],
+            [71.348131, 38.258905],
+            [71.239404, 37.953265],
+            [71.541918, 37.905774],
+            [71.448693, 37.065645],
+            [71.844638, 36.738171],
+            [72.193041, 36.948288],
+            [72.63689, 37.047558],
+            [73.260056, 37.495257],
+            [73.948696, 37.421566],
+            [74.980002, 37.41999],
+            [75.158028, 37.133031],
+            [74.575893, 37.020841],
+            [74.067552, 36.836176],
+            [72.920025, 36.720007],
+            [71.846292, 36.509942],
+            [71.262348, 36.074388],
+            [71.498768, 35.650563],
+            [71.613076, 35.153203],
+            [71.115019, 34.733126],
+            [71.156773, 34.348911],
+            [70.881803, 33.988856],
+            [69.930543, 34.02012],
+            [70.323594, 33.358533],
+            [69.687147, 33.105499],
+            [69.262522, 32.501944],
+            [69.317764, 31.901412],
+            [68.926677, 31.620189],
+            [68.556932, 31.71331],
+            [67.792689, 31.58293],
+            [67.683394, 31.303154],
+            [66.938891, 31.304911],
+            [66.381458, 30.738899],
+            [66.346473, 29.887943],
+            [65.046862, 29.472181],
+            [64.350419, 29.560031],
+            [64.148002, 29.340819],
+            [63.550261, 29.468331],
+            [62.549857, 29.318572],
+            [60.874248, 29.829239],
+            [61.781222, 30.73585],
+            [61.699314, 31.379506],
+            [60.941945, 31.548075],
+            [60.863655, 32.18292],
+            [60.536078, 32.981269],
+            [60.9637, 33.528832],
+            [60.52843, 33.676446],
+            [60.803193, 34.404102],
+            [61.210817, 35.650072]
+          ]
+        ]
+      },
+      "id": "AFG"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Angola" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [16.326528, -5.87747],
+              [16.57318, -6.622645],
+              [16.860191, -7.222298],
+              [17.089996, -7.545689],
+              [17.47297, -8.068551],
+              [18.134222, -7.987678],
+              [18.464176, -7.847014],
+              [19.016752, -7.988246],
+              [19.166613, -7.738184],
+              [19.417502, -7.155429],
+              [20.037723, -7.116361],
+              [20.091622, -6.94309],
+              [20.601823, -6.939318],
+              [20.514748, -7.299606],
+              [21.728111, -7.290872],
+              [21.746456, -7.920085],
+              [21.949131, -8.305901],
+              [21.801801, -8.908707],
+              [21.875182, -9.523708],
+              [22.208753, -9.894796],
+              [22.155268, -11.084801],
+              [22.402798, -10.993075],
+              [22.837345, -11.017622],
+              [23.456791, -10.867863],
+              [23.912215, -10.926826],
+              [24.017894, -11.237298],
+              [23.904154, -11.722282],
+              [24.079905, -12.191297],
+              [23.930922, -12.565848],
+              [24.016137, -12.911046],
+              [21.933886, -12.898437],
+              [21.887843, -16.08031],
+              [22.562478, -16.898451],
+              [23.215048, -17.523116],
+              [21.377176, -17.930636],
+              [18.956187, -17.789095],
+              [18.263309, -17.309951],
+              [14.209707, -17.353101],
+              [14.058501, -17.423381],
+              [13.462362, -16.971212],
+              [12.814081, -16.941343],
+              [12.215461, -17.111668],
+              [11.734199, -17.301889],
+              [11.640096, -16.673142],
+              [11.778537, -15.793816],
+              [12.123581, -14.878316],
+              [12.175619, -14.449144],
+              [12.500095, -13.5477],
+              [12.738479, -13.137906],
+              [13.312914, -12.48363],
+              [13.633721, -12.038645],
+              [13.738728, -11.297863],
+              [13.686379, -10.731076],
+              [13.387328, -10.373578],
+              [13.120988, -9.766897],
+              [12.87537, -9.166934],
+              [12.929061, -8.959091],
+              [13.236433, -8.562629],
+              [12.93304, -7.596539],
+              [12.728298, -6.927122],
+              [12.227347, -6.294448],
+              [12.322432, -6.100092],
+              [12.735171, -5.965682],
+              [13.024869, -5.984389],
+              [13.375597, -5.864241],
+              [16.326528, -5.87747]
+            ]
+          ],
+          [
+            [
+              [12.436688, -5.684304],
+              [12.182337, -5.789931],
+              [11.914963, -5.037987],
+              [12.318608, -4.60623],
+              [12.62076, -4.438023],
+              [12.995517, -4.781103],
+              [12.631612, -4.991271],
+              [12.468004, -5.248362],
+              [12.436688, -5.684304]
+            ]
+          ]
+        ]
+      },
+      "id": "AGO"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Albania" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [20.590247, 41.855404],
+            [20.463175, 41.515089],
+            [20.605182, 41.086226],
+            [21.02004, 40.842727],
+            [20.99999, 40.580004],
+            [20.674997, 40.435],
+            [20.615, 40.110007],
+            [20.150016, 39.624998],
+            [19.98, 39.694993],
+            [19.960002, 39.915006],
+            [19.406082, 40.250773],
+            [19.319059, 40.72723],
+            [19.40355, 41.409566],
+            [19.540027, 41.719986],
+            [19.371769, 41.877548],
+            [19.304486, 42.195745],
+            [19.738051, 42.688247],
+            [19.801613, 42.500093],
+            [20.0707, 42.58863],
+            [20.283755, 42.32026],
+            [20.52295, 42.21787],
+            [20.590247, 41.855404]
+          ]
+        ]
+      },
+      "id": "ALB"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "United Arab Emirates" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [51.579519, 24.245497],
+            [51.757441, 24.294073],
+            [51.794389, 24.019826],
+            [52.577081, 24.177439],
+            [53.404007, 24.151317],
+            [54.008001, 24.121758],
+            [54.693024, 24.797892],
+            [55.439025, 25.439145],
+            [56.070821, 26.055464],
+            [56.261042, 25.714606],
+            [56.396847, 24.924732],
+            [55.886233, 24.920831],
+            [55.804119, 24.269604],
+            [55.981214, 24.130543],
+            [55.528632, 23.933604],
+            [55.525841, 23.524869],
+            [55.234489, 23.110993],
+            [55.208341, 22.70833],
+            [55.006803, 22.496948],
+            [52.000733, 23.001154],
+            [51.617708, 24.014219],
+            [51.579519, 24.245497]
+          ]
+        ]
+      },
+      "id": "ARE"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Argentina" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [-65.5, -55.2],
+              [-66.45, -55.25],
+              [-66.95992, -54.89681],
+              [-67.56244, -54.87001],
+              [-68.63335, -54.8695],
+              [-68.63401, -52.63637],
+              [-68.25, -53.1],
+              [-67.75, -53.85],
+              [-66.45, -54.45],
+              [-65.05, -54.7],
+              [-65.5, -55.2]
+            ]
+          ],
+          [
+            [
+              [-64.964892, -22.075862],
+              [-64.377021, -22.798091],
+              [-63.986838, -21.993644],
+              [-62.846468, -22.034985],
+              [-62.685057, -22.249029],
+              [-60.846565, -23.880713],
+              [-60.028966, -24.032796],
+              [-58.807128, -24.771459],
+              [-57.777217, -25.16234],
+              [-57.63366, -25.603657],
+              [-58.618174, -27.123719],
+              [-57.60976, -27.395899],
+              [-56.486702, -27.548499],
+              [-55.695846, -27.387837],
+              [-54.788795, -26.621786],
+              [-54.625291, -25.739255],
+              [-54.13005, -25.547639],
+              [-53.628349, -26.124865],
+              [-53.648735, -26.923473],
+              [-54.490725, -27.474757],
+              [-55.162286, -27.881915],
+              [-56.2909, -28.852761],
+              [-57.625133, -30.216295],
+              [-57.874937, -31.016556],
+              [-58.14244, -32.044504],
+              [-58.132648, -33.040567],
+              [-58.349611, -33.263189],
+              [-58.427074, -33.909454],
+              [-58.495442, -34.43149],
+              [-57.22583, -35.288027],
+              [-57.362359, -35.97739],
+              [-56.737487, -36.413126],
+              [-56.788285, -36.901572],
+              [-57.749157, -38.183871],
+              [-59.231857, -38.72022],
+              [-61.237445, -38.928425],
+              [-62.335957, -38.827707],
+              [-62.125763, -39.424105],
+              [-62.330531, -40.172586],
+              [-62.145994, -40.676897],
+              [-62.745803, -41.028761],
+              [-63.770495, -41.166789],
+              [-64.73209, -40.802677],
+              [-65.118035, -41.064315],
+              [-64.978561, -42.058001],
+              [-64.303408, -42.359016],
+              [-63.755948, -42.043687],
+              [-63.458059, -42.563138],
+              [-64.378804, -42.873558],
+              [-65.181804, -43.495381],
+              [-65.328823, -44.501366],
+              [-65.565269, -45.036786],
+              [-66.509966, -45.039628],
+              [-67.293794, -45.551896],
+              [-67.580546, -46.301773],
+              [-66.597066, -47.033925],
+              [-65.641027, -47.236135],
+              [-65.985088, -48.133289],
+              [-67.166179, -48.697337],
+              [-67.816088, -49.869669],
+              [-68.728745, -50.264218],
+              [-69.138539, -50.73251],
+              [-68.815561, -51.771104],
+              [-68.149995, -52.349983],
+              [-68.571545, -52.299444],
+              [-69.498362, -52.142761],
+              [-71.914804, -52.009022],
+              [-72.329404, -51.425956],
+              [-72.309974, -50.67701],
+              [-72.975747, -50.74145],
+              [-73.328051, -50.378785],
+              [-73.415436, -49.318436],
+              [-72.648247, -48.878618],
+              [-72.331161, -48.244238],
+              [-72.447355, -47.738533],
+              [-71.917258, -46.884838],
+              [-71.552009, -45.560733],
+              [-71.659316, -44.973689],
+              [-71.222779, -44.784243],
+              [-71.329801, -44.407522],
+              [-71.793623, -44.207172],
+              [-71.464056, -43.787611],
+              [-71.915424, -43.408565],
+              [-72.148898, -42.254888],
+              [-71.746804, -42.051386],
+              [-71.915734, -40.832339],
+              [-71.680761, -39.808164],
+              [-71.413517, -38.916022],
+              [-70.814664, -38.552995],
+              [-71.118625, -37.576827],
+              [-71.121881, -36.658124],
+              [-70.364769, -36.005089],
+              [-70.388049, -35.169688],
+              [-69.817309, -34.193571],
+              [-69.814777, -33.273886],
+              [-70.074399, -33.09121],
+              [-70.535069, -31.36501],
+              [-69.919008, -30.336339],
+              [-70.01355, -29.367923],
+              [-69.65613, -28.459141],
+              [-69.001235, -27.521214],
+              [-68.295542, -26.89934],
+              [-68.5948, -26.506909],
+              [-68.386001, -26.185016],
+              [-68.417653, -24.518555],
+              [-67.328443, -24.025303],
+              [-66.985234, -22.986349],
+              [-67.106674, -22.735925],
+              [-66.273339, -21.83231],
+              [-64.964892, -22.075862]
+            ]
+          ]
+        ]
+      },
+      "id": "ARG"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Armenia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [43.582746, 41.092143],
+            [44.97248, 41.248129],
+            [45.179496, 40.985354],
+            [45.560351, 40.81229],
+            [45.359175, 40.561504],
+            [45.891907, 40.218476],
+            [45.610012, 39.899994],
+            [46.034534, 39.628021],
+            [46.483499, 39.464155],
+            [46.50572, 38.770605],
+            [46.143623, 38.741201],
+            [45.735379, 39.319719],
+            [45.739978, 39.473999],
+            [45.298145, 39.471751],
+            [45.001987, 39.740004],
+            [44.79399, 39.713003],
+            [44.400009, 40.005],
+            [43.656436, 40.253564],
+            [43.752658, 40.740201],
+            [43.582746, 41.092143]
+          ]
+        ]
+      },
+      "id": "ARM"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Antarctica" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [-59.572095, -80.040179],
+              [-59.865849, -80.549657],
+              [-60.159656, -81.000327],
+              [-62.255393, -80.863178],
+              [-64.488125, -80.921934],
+              [-65.741666, -80.588827],
+              [-65.741666, -80.549657],
+              [-66.290031, -80.255773],
+              [-64.037688, -80.294944],
+              [-61.883246, -80.39287],
+              [-61.138976, -79.981371],
+              [-60.610119, -79.628679],
+              [-59.572095, -80.040179]
+            ]
+          ],
+          [
+            [
+              [-159.208184, -79.497059],
+              [-161.127601, -79.634209],
+              [-162.439847, -79.281465],
+              [-163.027408, -78.928774],
+              [-163.066604, -78.869966],
+              [-163.712896, -78.595667],
+              [-163.712896, -78.595667],
+              [-163.105801, -78.223338],
+              [-161.245113, -78.380176],
+              [-160.246208, -78.693645],
+              [-159.482405, -79.046338],
+              [-159.208184, -79.497059]
+            ]
+          ],
+          [
+            [
+              [-45.154758, -78.04707],
+              [-43.920828, -78.478103],
+              [-43.48995, -79.08556],
+              [-43.372438, -79.516645],
+              [-43.333267, -80.026123],
+              [-44.880537, -80.339644],
+              [-46.506174, -80.594357],
+              [-48.386421, -80.829485],
+              [-50.482107, -81.025442],
+              [-52.851988, -80.966685],
+              [-54.164259, -80.633528],
+              [-53.987991, -80.222028],
+              [-51.853134, -79.94773],
+              [-50.991326, -79.614623],
+              [-50.364595, -79.183487],
+              [-49.914131, -78.811209],
+              [-49.306959, -78.458569],
+              [-48.660616, -78.047018],
+              [-48.660616, -78.047019],
+              [-48.151396, -78.04707],
+              [-46.662857, -77.831476],
+              [-45.154758, -78.04707]
+            ]
+          ],
+          [
+            [
+              [-121.211511, -73.50099],
+              [-119.918851, -73.657725],
+              [-118.724143, -73.481353],
+              [-119.292119, -73.834097],
+              [-120.232217, -74.08881],
+              [-121.62283, -74.010468],
+              [-122.621735, -73.657778],
+              [-122.621735, -73.657777],
+              [-122.406245, -73.324619],
+              [-121.211511, -73.50099]
+            ]
+          ],
+          [
+            [
+              [-125.559566, -73.481353],
+              [-124.031882, -73.873268],
+              [-124.619469, -73.834097],
+              [-125.912181, -73.736118],
+              [-127.28313, -73.461769],
+              [-127.28313, -73.461768],
+              [-126.558472, -73.246226],
+              [-125.559566, -73.481353]
+            ]
+          ],
+          [
+            [
+              [-98.98155, -71.933334],
+              [-97.884743, -72.070535],
+              [-96.787937, -71.952971],
+              [-96.20035, -72.521205],
+              [-96.983765, -72.442864],
+              [-98.198083, -72.482035],
+              [-99.432013, -72.442864],
+              [-100.783455, -72.50162],
+              [-101.801868, -72.305663],
+              [-102.330725, -71.894164],
+              [-102.330725, -71.894164],
+              [-101.703967, -71.717792],
+              [-100.430919, -71.854993],
+              [-98.98155, -71.933334]
+            ]
+          ],
+          [
+            [
+              [-68.451346, -70.955823],
+              [-68.333834, -71.406493],
+              [-68.510128, -71.798407],
+              [-68.784297, -72.170736],
+              [-69.959471, -72.307885],
+              [-71.075889, -72.503842],
+              [-72.388134, -72.484257],
+              [-71.8985, -72.092343],
+              [-73.073622, -72.229492],
+              [-74.19004, -72.366693],
+              [-74.953895, -72.072757],
+              [-75.012625, -71.661258],
+              [-73.915819, -71.269345],
+              [-73.915819, -71.269344],
+              [-73.230331, -71.15178],
+              [-72.074717, -71.190951],
+              [-71.780962, -70.681473],
+              [-71.72218, -70.309196],
+              [-71.741791, -69.505782],
+              [-71.173815, -69.035475],
+              [-70.253252, -68.87874],
+              [-69.724447, -69.251017],
+              [-69.489422, -69.623346],
+              [-69.058518, -70.074016],
+              [-68.725541, -70.505153],
+              [-68.451346, -70.955823]
+            ]
+          ],
+          [
+            [
+              [-58.614143, -64.152467],
+              [-59.045073, -64.36801],
+              [-59.789342, -64.211223],
+              [-60.611928, -64.309202],
+              [-61.297416, -64.54433],
+              [-62.0221, -64.799094],
+              [-62.51176, -65.09303],
+              [-62.648858, -65.484942],
+              [-62.590128, -65.857219],
+              [-62.120079, -66.190326],
+              [-62.805567, -66.425505],
+              [-63.74569, -66.503847],
+              [-64.294106, -66.837004],
+              [-64.881693, -67.150474],
+              [-65.508425, -67.58161],
+              [-65.665082, -67.953887],
+              [-65.312545, -68.365335],
+              [-64.783715, -68.678908],
+              [-63.961103, -68.913984],
+              [-63.1973, -69.227556],
+              [-62.785955, -69.619419],
+              [-62.570516, -69.991747],
+              [-62.276736, -70.383661],
+              [-61.806661, -70.716768],
+              [-61.512906, -71.089045],
+              [-61.375809, -72.010074],
+              [-61.081977, -72.382351],
+              [-61.003661, -72.774265],
+              [-60.690269, -73.166179],
+              [-60.827367, -73.695242],
+              [-61.375809, -74.106742],
+              [-61.96337, -74.439848],
+              [-63.295201, -74.576997],
+              [-63.74569, -74.92974],
+              [-64.352836, -75.262847],
+              [-65.860987, -75.635124],
+              [-67.192818, -75.79191],
+              [-68.446282, -76.007452],
+              [-69.797724, -76.222995],
+              [-70.600724, -76.634494],
+              [-72.206776, -76.673665],
+              [-73.969536, -76.634494],
+              [-75.555977, -76.712887],
+              [-77.24037, -76.712887],
+              [-76.926979, -77.104802],
+              [-75.399294, -77.28107],
+              [-74.282876, -77.55542],
+              [-73.656119, -77.908112],
+              [-74.772536, -78.221633],
+              [-76.4961, -78.123654],
+              [-77.925858, -78.378419],
+              [-77.984666, -78.789918],
+              [-78.023785, -79.181833],
+              [-76.848637, -79.514939],
+              [-76.633224, -79.887216],
+              [-75.360097, -80.259545],
+              [-73.244852, -80.416331],
+              [-71.442946, -80.69063],
+              [-70.013163, -81.004151],
+              [-68.191646, -81.317672],
+              [-65.704279, -81.474458],
+              [-63.25603, -81.748757],
+              [-61.552026, -82.042692],
+              [-59.691416, -82.37585],
+              [-58.712121, -82.846106],
+              [-58.222487, -83.218434],
+              [-57.008117, -82.865691],
+              [-55.362894, -82.571755],
+              [-53.619771, -82.258235],
+              [-51.543644, -82.003521],
+              [-49.76135, -81.729171],
+              [-47.273931, -81.709586],
+              [-44.825708, -81.846735],
+              [-42.808363, -82.081915],
+              [-42.16202, -81.65083],
+              [-40.771433, -81.356894],
+              [-38.244818, -81.337309],
+              [-36.26667, -81.121715],
+              [-34.386397, -80.906172],
+              [-32.310296, -80.769023],
+              [-30.097098, -80.592651],
+              [-28.549802, -80.337938],
+              [-29.254901, -79.985195],
+              [-29.685805, -79.632503],
+              [-29.685805, -79.260226],
+              [-31.624808, -79.299397],
+              [-33.681324, -79.456132],
+              [-35.639912, -79.456132],
+              [-35.914107, -79.083855],
+              [-35.77701, -78.339248],
+              [-35.326546, -78.123654],
+              [-33.896763, -77.888526],
+              [-32.212369, -77.65345],
+              [-30.998051, -77.359515],
+              [-29.783732, -77.065579],
+              [-28.882779, -76.673665],
+              [-27.511752, -76.497345],
+              [-26.160336, -76.360144],
+              [-25.474822, -76.281803],
+              [-23.927552, -76.24258],
+              [-22.458598, -76.105431],
+              [-21.224694, -75.909474],
+              [-20.010375, -75.674346],
+              [-18.913543, -75.439218],
+              [-17.522982, -75.125698],
+              [-16.641589, -74.79254],
+              [-15.701491, -74.498604],
+              [-15.40771, -74.106742],
+              [-16.46532, -73.871614],
+              [-16.112784, -73.460114],
+              [-15.446855, -73.146542],
+              [-14.408805, -72.950585],
+              [-13.311973, -72.715457],
+              [-12.293508, -72.401936],
+              [-11.510067, -72.010074],
+              [-11.020433, -71.539767],
+              [-10.295774, -71.265416],
+              [-9.101015, -71.324224],
+              [-8.611381, -71.65733],
+              [-7.416622, -71.696501],
+              [-7.377451, -71.324224],
+              [-6.868232, -70.93231],
+              [-5.790985, -71.030289],
+              [-5.536375, -71.402617],
+              [-4.341667, -71.461373],
+              [-3.048981, -71.285053],
+              [-1.795492, -71.167438],
+              [-0.659489, -71.226246],
+              [-0.228637, -71.637745],
+              [0.868195, -71.304639],
+              [1.886686, -71.128267],
+              [3.022638, -70.991118],
+              [4.139055, -70.853917],
+              [5.157546, -70.618789],
+              [6.273912, -70.462055],
+              [7.13572, -70.246512],
+              [7.742866, -69.893769],
+              [8.48711, -70.148534],
+              [9.525135, -70.011333],
+              [10.249845, -70.48164],
+              [10.817821, -70.834332],
+              [11.953824, -70.638375],
+              [12.404287, -70.246512],
+              [13.422778, -69.972162],
+              [14.734998, -70.030918],
+              [15.126757, -70.403247],
+              [15.949342, -70.030918],
+              [17.026589, -69.913354],
+              [18.201711, -69.874183],
+              [19.259373, -69.893769],
+              [20.375739, -70.011333],
+              [21.452985, -70.07014],
+              [21.923034, -70.403247],
+              [22.569403, -70.697182],
+              [23.666184, -70.520811],
+              [24.841357, -70.48164],
+              [25.977309, -70.48164],
+              [27.093726, -70.462055],
+              [28.09258, -70.324854],
+              [29.150242, -70.20729],
+              [30.031583, -69.93294],
+              [30.971733, -69.75662],
+              [31.990172, -69.658641],
+              [32.754053, -69.384291],
+              [33.302443, -68.835642],
+              [33.870419, -68.502588],
+              [34.908495, -68.659271],
+              [35.300202, -69.012014],
+              [36.16201, -69.247142],
+              [37.200035, -69.168748],
+              [37.905108, -69.52144],
+              [38.649404, -69.776205],
+              [39.667894, -69.541077],
+              [40.020431, -69.109941],
+              [40.921358, -68.933621],
+              [41.959434, -68.600514],
+              [42.938702, -68.463313],
+              [44.113876, -68.267408],
+              [44.897291, -68.051866],
+              [45.719928, -67.816738],
+              [46.503343, -67.601196],
+              [47.44344, -67.718759],
+              [48.344419, -67.366068],
+              [48.990736, -67.091718],
+              [49.930885, -67.111303],
+              [50.753471, -66.876175],
+              [50.949325, -66.523484],
+              [51.791547, -66.249133],
+              [52.614133, -66.053176],
+              [53.613038, -65.89639],
+              [54.53355, -65.818049],
+              [55.414943, -65.876805],
+              [56.355041, -65.974783],
+              [57.158093, -66.249133],
+              [57.255968, -66.680218],
+              [58.137361, -67.013324],
+              [58.744508, -67.287675],
+              [59.939318, -67.405239],
+              [60.605221, -67.679589],
+              [61.427806, -67.953887],
+              [62.387489, -68.012695],
+              [63.19049, -67.816738],
+              [64.052349, -67.405239],
+              [64.992447, -67.620729],
+              [65.971715, -67.738345],
+              [66.911864, -67.855909],
+              [67.891133, -67.934302],
+              [68.890038, -67.934302],
+              [69.712624, -68.972791],
+              [69.673453, -69.227556],
+              [69.555941, -69.678226],
+              [68.596258, -69.93294],
+              [67.81274, -70.305268],
+              [67.949889, -70.697182],
+              [69.066307, -70.677545],
+              [68.929157, -71.069459],
+              [68.419989, -71.441788],
+              [67.949889, -71.853287],
+              [68.71377, -72.166808],
+              [69.869307, -72.264787],
+              [71.024895, -72.088415],
+              [71.573285, -71.696501],
+              [71.906288, -71.324224],
+              [72.454627, -71.010703],
+              [73.08141, -70.716768],
+              [73.33602, -70.364024],
+              [73.864877, -69.874183],
+              [74.491557, -69.776205],
+              [75.62756, -69.737034],
+              [76.626465, -69.619419],
+              [77.644904, -69.462684],
+              [78.134539, -69.07077],
+              [78.428371, -68.698441],
+              [79.113859, -68.326216],
+              [80.093127, -68.071503],
+              [80.93535, -67.875546],
+              [81.483792, -67.542388],
+              [82.051767, -67.366068],
+              [82.776426, -67.209282],
+              [83.775331, -67.30726],
+              [84.676206, -67.209282],
+              [85.655527, -67.091718],
+              [86.752359, -67.150474],
+              [87.477017, -66.876175],
+              [87.986289, -66.209911],
+              [88.358411, -66.484261],
+              [88.828408, -66.954568],
+              [89.67063, -67.150474],
+              [90.630365, -67.228867],
+              [91.5901, -67.111303],
+              [92.608539, -67.189696],
+              [93.548637, -67.209282],
+              [94.17542, -67.111303],
+              [95.017591, -67.170111],
+              [95.781472, -67.385653],
+              [96.682399, -67.248504],
+              [97.759646, -67.248504],
+              [98.68021, -67.111303],
+              [99.718182, -67.248504],
+              [100.384188, -66.915346],
+              [100.893356, -66.58224],
+              [101.578896, -66.30789],
+              [102.832411, -65.563284],
+              [103.478676, -65.700485],
+              [104.242557, -65.974783],
+              [104.90846, -66.327527],
+              [106.181561, -66.934931],
+              [107.160881, -66.954568],
+              [108.081393, -66.954568],
+              [109.15864, -66.837004],
+              [110.235835, -66.699804],
+              [111.058472, -66.425505],
+              [111.74396, -66.13157],
+              [112.860378, -66.092347],
+              [113.604673, -65.876805],
+              [114.388088, -66.072762],
+              [114.897308, -66.386283],
+              [115.602381, -66.699804],
+              [116.699161, -66.660633],
+              [117.384701, -66.915346],
+              [118.57946, -67.170111],
+              [119.832924, -67.268089],
+              [120.871, -67.189696],
+              [121.654415, -66.876175],
+              [122.320369, -66.562654],
+              [123.221296, -66.484261],
+              [124.122274, -66.621462],
+              [125.160247, -66.719389],
+              [126.100396, -66.562654],
+              [127.001427, -66.562654],
+              [127.882768, -66.660633],
+              [128.80328, -66.758611],
+              [129.704259, -66.58224],
+              [130.781454, -66.425505],
+              [131.799945, -66.386283],
+              [132.935896, -66.386283],
+              [133.85646, -66.288304],
+              [134.757387, -66.209963],
+              [135.031582, -65.72007],
+              [135.070753, -65.308571],
+              [135.697485, -65.582869],
+              [135.873805, -66.033591],
+              [136.206705, -66.44509],
+              [136.618049, -66.778197],
+              [137.460271, -66.954568],
+              [138.596223, -66.895761],
+              [139.908442, -66.876175],
+              [140.809421, -66.817367],
+              [142.121692, -66.817367],
+              [143.061842, -66.797782],
+              [144.374061, -66.837004],
+              [145.490427, -66.915346],
+              [146.195552, -67.228867],
+              [145.999699, -67.601196],
+              [146.646067, -67.895131],
+              [147.723263, -68.130259],
+              [148.839629, -68.385024],
+              [150.132314, -68.561292],
+              [151.483705, -68.71813],
+              [152.502247, -68.874813],
+              [153.638199, -68.894502],
+              [154.284567, -68.561292],
+              [155.165857, -68.835642],
+              [155.92979, -69.149215],
+              [156.811132, -69.384291],
+              [158.025528, -69.482269],
+              [159.181013, -69.599833],
+              [159.670699, -69.991747],
+              [160.80665, -70.226875],
+              [161.570479, -70.579618],
+              [162.686897, -70.736353],
+              [163.842434, -70.716768],
+              [164.919681, -70.775524],
+              [166.11444, -70.755938],
+              [167.309095, -70.834332],
+              [168.425616, -70.971481],
+              [169.463589, -71.20666],
+              [170.501665, -71.402617],
+              [171.20679, -71.696501],
+              [171.089227, -72.088415],
+              [170.560422, -72.441159],
+              [170.109958, -72.891829],
+              [169.75737, -73.24452],
+              [169.287321, -73.65602],
+              [167.975101, -73.812806],
+              [167.387489, -74.165498],
+              [166.094803, -74.38104],
+              [165.644391, -74.772954],
+              [164.958851, -75.145283],
+              [164.234193, -75.458804],
+              [163.822797, -75.870303],
+              [163.568239, -76.24258],
+              [163.47026, -76.693302],
+              [163.489897, -77.065579],
+              [164.057873, -77.457442],
+              [164.273363, -77.82977],
+              [164.743464, -78.182514],
+              [166.604126, -78.319611],
+              [166.995781, -78.750748],
+              [165.193876, -78.907483],
+              [163.666217, -79.123025],
+              [161.766385, -79.162248],
+              [160.924162, -79.730482],
+              [160.747894, -80.200737],
+              [160.316964, -80.573066],
+              [159.788211, -80.945395],
+              [161.120016, -81.278501],
+              [161.629287, -81.690001],
+              [162.490992, -82.062278],
+              [163.705336, -82.395435],
+              [165.095949, -82.708956],
+              [166.604126, -83.022477],
+              [168.895665, -83.335998],
+              [169.404782, -83.825891],
+              [172.283934, -84.041433],
+              [172.477049, -84.117914],
+              [173.224083, -84.41371],
+              [175.985672, -84.158997],
+              [178.277212, -84.472518],
+              [180, -84.71338],
+              [-179.942499, -84.721443],
+              [-179.058677, -84.139412],
+              [-177.256772, -84.452933],
+              [-177.140807, -84.417941],
+              [-176.084673, -84.099259],
+              [-175.947235, -84.110449],
+              [-175.829882, -84.117914],
+              [-174.382503, -84.534323],
+              [-173.116559, -84.117914],
+              [-172.889106, -84.061019],
+              [-169.951223, -83.884647],
+              [-168.999989, -84.117914],
+              [-168.530199, -84.23739],
+              [-167.022099, -84.570497],
+              [-164.182144, -84.82521],
+              [-161.929775, -85.138731],
+              [-158.07138, -85.37391],
+              [-155.192253, -85.09956],
+              [-150.942099, -85.295517],
+              [-148.533073, -85.609038],
+              [-145.888918, -85.315102],
+              [-143.107718, -85.040752],
+              [-142.892279, -84.570497],
+              [-146.829068, -84.531274],
+              [-150.060732, -84.296146],
+              [-150.902928, -83.904232],
+              [-153.586201, -83.68869],
+              [-153.409907, -83.23802],
+              [-153.037759, -82.82652],
+              [-152.665637, -82.454192],
+              [-152.861517, -82.042692],
+              [-154.526299, -81.768394],
+              [-155.29018, -81.41565],
+              [-156.83745, -81.102129],
+              [-154.408787, -81.160937],
+              [-152.097662, -81.004151],
+              [-150.648293, -81.337309],
+              [-148.865998, -81.043373],
+              [-147.22075, -80.671045],
+              [-146.417749, -80.337938],
+              [-146.770286, -79.926439],
+              [-148.062947, -79.652089],
+              [-149.531901, -79.358205],
+              [-151.588416, -79.299397],
+              [-153.390322, -79.162248],
+              [-155.329376, -79.064269],
+              [-155.975668, -78.69194],
+              [-157.268302, -78.378419],
+              [-158.051768, -78.025676],
+              [-158.365134, -76.889207],
+              [-157.875474, -76.987238],
+              [-156.974573, -77.300759],
+              [-155.329376, -77.202728],
+              [-153.742832, -77.065579],
+              [-152.920247, -77.496664],
+              [-151.33378, -77.398737],
+              [-150.00195, -77.183143],
+              [-148.748486, -76.908845],
+              [-147.612483, -76.575738],
+              [-146.104409, -76.47776],
+              [-146.143528, -76.105431],
+              [-146.496091, -75.733154],
+              [-146.20231, -75.380411],
+              [-144.909624, -75.204039],
+              [-144.322037, -75.537197],
+              [-142.794353, -75.34124],
+              [-141.638764, -75.086475],
+              [-140.209007, -75.06689],
+              [-138.85759, -74.968911],
+              [-137.5062, -74.733783],
+              [-136.428901, -74.518241],
+              [-135.214583, -74.302699],
+              [-134.431194, -74.361455],
+              [-133.745654, -74.439848],
+              [-132.257168, -74.302699],
+              [-130.925311, -74.479019],
+              [-129.554284, -74.459433],
+              [-128.242038, -74.322284],
+              [-126.890622, -74.420263],
+              [-125.402082, -74.518241],
+              [-124.011496, -74.479019],
+              [-122.562152, -74.498604],
+              [-121.073613, -74.518241],
+              [-119.70256, -74.479019],
+              [-118.684145, -74.185083],
+              [-117.469801, -74.028348],
+              [-116.216312, -74.243891],
+              [-115.021552, -74.067519],
+              [-113.944331, -73.714828],
+              [-113.297988, -74.028348],
+              [-112.945452, -74.38104],
+              [-112.299083, -74.714198],
+              [-111.261059, -74.420263],
+              [-110.066325, -74.79254],
+              [-108.714909, -74.910103],
+              [-107.559346, -75.184454],
+              [-106.149148, -75.125698],
+              [-104.876074, -74.949326],
+              [-103.367949, -74.988497],
+              [-102.016507, -75.125698],
+              [-100.645531, -75.302018],
+              [-100.1167, -74.870933],
+              [-100.763043, -74.537826],
+              [-101.252703, -74.185083],
+              [-102.545337, -74.106742],
+              [-103.113313, -73.734413],
+              [-103.328752, -73.362084],
+              [-103.681289, -72.61753],
+              [-102.917485, -72.754679],
+              [-101.60524, -72.813436],
+              [-100.312528, -72.754679],
+              [-99.13738, -72.911414],
+              [-98.118889, -73.20535],
+              [-97.688037, -73.558041],
+              [-96.336595, -73.616849],
+              [-95.043961, -73.4797],
+              [-93.672907, -73.283743],
+              [-92.439003, -73.166179],
+              [-91.420564, -73.401307],
+              [-90.088733, -73.322914],
+              [-89.226951, -72.558722],
+              [-88.423951, -73.009393],
+              [-87.268337, -73.185764],
+              [-86.014822, -73.087786],
+              [-85.192236, -73.4797],
+              [-83.879991, -73.518871],
+              [-82.665646, -73.636434],
+              [-81.470913, -73.851977],
+              [-80.687447, -73.4797],
+              [-80.295791, -73.126956],
+              [-79.296886, -73.518871],
+              [-77.925858, -73.420892],
+              [-76.907367, -73.636434],
+              [-76.221879, -73.969541],
+              [-74.890049, -73.871614],
+              [-73.852024, -73.65602],
+              [-72.833533, -73.401307],
+              [-71.619215, -73.264157],
+              [-70.209042, -73.146542],
+              [-68.935916, -73.009393],
+              [-67.956622, -72.79385],
+              [-67.369061, -72.480329],
+              [-67.134036, -72.049244],
+              [-67.251548, -71.637745],
+              [-67.56494, -71.245831],
+              [-67.917477, -70.853917],
+              [-68.230843, -70.462055],
+              [-68.485452, -70.109311],
+              [-68.544209, -69.717397],
+              [-68.446282, -69.325535],
+              [-67.976233, -68.953206],
+              [-67.5845, -68.541707],
+              [-67.427843, -68.149844],
+              [-67.62367, -67.718759],
+              [-67.741183, -67.326845],
+              [-67.251548, -66.876175],
+              [-66.703184, -66.58224],
+              [-66.056815, -66.209963],
+              [-65.371327, -65.89639],
+              [-64.568276, -65.602506],
+              [-64.176542, -65.171423],
+              [-63.628152, -64.897073],
+              [-63.001394, -64.642308],
+              [-62.041686, -64.583552],
+              [-61.414928, -64.270031],
+              [-60.709855, -64.074074],
+              [-59.887269, -63.95651],
+              [-59.162585, -63.701745],
+              [-58.594557, -63.388224],
+              [-57.811143, -63.27066],
+              [-57.223582, -63.525425],
+              [-57.59573, -63.858532],
+              [-58.614143, -64.152467]
+            ]
+          ]
+        ]
+      },
+      "id": "ATA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "French Southern and Antarctic Lands" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [68.935, -48.625],
+            [69.58, -48.94],
+            [70.525, -49.065],
+            [70.56, -49.255],
+            [70.28, -49.71],
+            [68.745, -49.775],
+            [68.72, -49.2425],
+            [68.8675, -48.83],
+            [68.935, -48.625]
+          ]
+        ]
+      },
+      "id": "ATF"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Australia" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [145.397978, -40.792549],
+              [146.364121, -41.137695],
+              [146.908584, -41.000546],
+              [147.689259, -40.808258],
+              [148.289068, -40.875438],
+              [148.359865, -42.062445],
+              [148.017301, -42.407024],
+              [147.914052, -43.211522],
+              [147.564564, -42.937689],
+              [146.870343, -43.634597],
+              [146.663327, -43.580854],
+              [146.048378, -43.549745],
+              [145.43193, -42.693776],
+              [145.29509, -42.03361],
+              [144.718071, -41.162552],
+              [144.743755, -40.703975],
+              [145.397978, -40.792549]
+            ]
+          ],
+          [
+            [
+              [143.561811, -13.763656],
+              [143.922099, -14.548311],
+              [144.563714, -14.171176],
+              [144.894908, -14.594458],
+              [145.374724, -14.984976],
+              [145.271991, -15.428205],
+              [145.48526, -16.285672],
+              [145.637033, -16.784918],
+              [145.888904, -16.906926],
+              [146.160309, -17.761655],
+              [146.063674, -18.280073],
+              [146.387478, -18.958274],
+              [147.471082, -19.480723],
+              [148.177602, -19.955939],
+              [148.848414, -20.39121],
+              [148.717465, -20.633469],
+              [149.28942, -21.260511],
+              [149.678337, -22.342512],
+              [150.077382, -22.122784],
+              [150.482939, -22.556142],
+              [150.727265, -22.402405],
+              [150.899554, -23.462237],
+              [151.609175, -24.076256],
+              [152.07354, -24.457887],
+              [152.855197, -25.267501],
+              [153.136162, -26.071173],
+              [153.161949, -26.641319],
+              [153.092909, -27.2603],
+              [153.569469, -28.110067],
+              [153.512108, -28.995077],
+              [153.339095, -29.458202],
+              [153.069241, -30.35024],
+              [153.089602, -30.923642],
+              [152.891578, -31.640446],
+              [152.450002, -32.550003],
+              [151.709117, -33.041342],
+              [151.343972, -33.816023],
+              [151.010555, -34.31036],
+              [150.714139, -35.17346],
+              [150.32822, -35.671879],
+              [150.075212, -36.420206],
+              [149.946124, -37.109052],
+              [149.997284, -37.425261],
+              [149.423882, -37.772681],
+              [148.304622, -37.809061],
+              [147.381733, -38.219217],
+              [146.922123, -38.606532],
+              [146.317922, -39.035757],
+              [145.489652, -38.593768],
+              [144.876976, -38.417448],
+              [145.032212, -37.896188],
+              [144.485682, -38.085324],
+              [143.609974, -38.809465],
+              [142.745427, -38.538268],
+              [142.17833, -38.380034],
+              [141.606582, -38.308514],
+              [140.638579, -38.019333],
+              [139.992158, -37.402936],
+              [139.806588, -36.643603],
+              [139.574148, -36.138362],
+              [139.082808, -35.732754],
+              [138.120748, -35.612296],
+              [138.449462, -35.127261],
+              [138.207564, -34.384723],
+              [137.71917, -35.076825],
+              [136.829406, -35.260535],
+              [137.352371, -34.707339],
+              [137.503886, -34.130268],
+              [137.890116, -33.640479],
+              [137.810328, -32.900007],
+              [136.996837, -33.752771],
+              [136.372069, -34.094766],
+              [135.989043, -34.890118],
+              [135.208213, -34.47867],
+              [135.239218, -33.947953],
+              [134.613417, -33.222778],
+              [134.085904, -32.848072],
+              [134.273903, -32.617234],
+              [132.990777, -32.011224],
+              [132.288081, -31.982647],
+              [131.326331, -31.495803],
+              [129.535794, -31.590423],
+              [128.240938, -31.948489],
+              [127.102867, -32.282267],
+              [126.148714, -32.215966],
+              [125.088623, -32.728751],
+              [124.221648, -32.959487],
+              [124.028947, -33.483847],
+              [123.659667, -33.890179],
+              [122.811036, -33.914467],
+              [122.183064, -34.003402],
+              [121.299191, -33.821036],
+              [120.580268, -33.930177],
+              [119.893695, -33.976065],
+              [119.298899, -34.509366],
+              [119.007341, -34.464149],
+              [118.505718, -34.746819],
+              [118.024972, -35.064733],
+              [117.295507, -35.025459],
+              [116.625109, -35.025097],
+              [115.564347, -34.386428],
+              [115.026809, -34.196517],
+              [115.048616, -33.623425],
+              [115.545123, -33.487258],
+              [115.714674, -33.259572],
+              [115.679379, -32.900369],
+              [115.801645, -32.205062],
+              [115.689611, -31.612437],
+              [115.160909, -30.601594],
+              [114.997043, -30.030725],
+              [115.040038, -29.461095],
+              [114.641974, -28.810231],
+              [114.616498, -28.516399],
+              [114.173579, -28.118077],
+              [114.048884, -27.334765],
+              [113.477498, -26.543134],
+              [113.338953, -26.116545],
+              [113.778358, -26.549025],
+              [113.440962, -25.621278],
+              [113.936901, -25.911235],
+              [114.232852, -26.298446],
+              [114.216161, -25.786281],
+              [113.721255, -24.998939],
+              [113.625344, -24.683971],
+              [113.393523, -24.384764],
+              [113.502044, -23.80635],
+              [113.706993, -23.560215],
+              [113.843418, -23.059987],
+              [113.736552, -22.475475],
+              [114.149756, -21.755881],
+              [114.225307, -22.517488],
+              [114.647762, -21.82952],
+              [115.460167, -21.495173],
+              [115.947373, -21.068688],
+              [116.711615, -20.701682],
+              [117.166316, -20.623599],
+              [117.441545, -20.746899],
+              [118.229559, -20.374208],
+              [118.836085, -20.263311],
+              [118.987807, -20.044203],
+              [119.252494, -19.952942],
+              [119.805225, -19.976506],
+              [120.85622, -19.683708],
+              [121.399856, -19.239756],
+              [121.655138, -18.705318],
+              [122.241665, -18.197649],
+              [122.286624, -17.798603],
+              [122.312772, -17.254967],
+              [123.012574, -16.4052],
+              [123.433789, -17.268558],
+              [123.859345, -17.069035],
+              [123.503242, -16.596506],
+              [123.817073, -16.111316],
+              [124.258287, -16.327944],
+              [124.379726, -15.56706],
+              [124.926153, -15.0751],
+              [125.167275, -14.680396],
+              [125.670087, -14.51007],
+              [125.685796, -14.230656],
+              [126.125149, -14.347341],
+              [126.142823, -14.095987],
+              [126.582589, -13.952791],
+              [127.065867, -13.817968],
+              [127.804633, -14.276906],
+              [128.35969, -14.86917],
+              [128.985543, -14.875991],
+              [129.621473, -14.969784],
+              [129.4096, -14.42067],
+              [129.888641, -13.618703],
+              [130.339466, -13.357376],
+              [130.183506, -13.10752],
+              [130.617795, -12.536392],
+              [131.223495, -12.183649],
+              [131.735091, -12.302453],
+              [132.575298, -12.114041],
+              [132.557212, -11.603012],
+              [131.824698, -11.273782],
+              [132.357224, -11.128519],
+              [133.019561, -11.376411],
+              [133.550846, -11.786515],
+              [134.393068, -12.042365],
+              [134.678632, -11.941183],
+              [135.298491, -12.248606],
+              [135.882693, -11.962267],
+              [136.258381, -12.049342],
+              [136.492475, -11.857209],
+              [136.95162, -12.351959],
+              [136.685125, -12.887223],
+              [136.305407, -13.29123],
+              [135.961758, -13.324509],
+              [136.077617, -13.724278],
+              [135.783836, -14.223989],
+              [135.428664, -14.715432],
+              [135.500184, -14.997741],
+              [136.295175, -15.550265],
+              [137.06536, -15.870762],
+              [137.580471, -16.215082],
+              [138.303217, -16.807604],
+              [138.585164, -16.806622],
+              [139.108543, -17.062679],
+              [139.260575, -17.371601],
+              [140.215245, -17.710805],
+              [140.875463, -17.369069],
+              [141.07111, -16.832047],
+              [141.274095, -16.38887],
+              [141.398222, -15.840532],
+              [141.702183, -15.044921],
+              [141.56338, -14.561333],
+              [141.63552, -14.270395],
+              [141.519869, -13.698078],
+              [141.65092, -12.944688],
+              [141.842691, -12.741548],
+              [141.68699, -12.407614],
+              [141.928629, -11.877466],
+              [142.118488, -11.328042],
+              [142.143706, -11.042737],
+              [142.51526, -10.668186],
+              [142.79731, -11.157355],
+              [142.866763, -11.784707],
+              [143.115947, -11.90563],
+              [143.158632, -12.325656],
+              [143.522124, -12.834358],
+              [143.597158, -13.400422],
+              [143.561811, -13.763656]
+            ]
+          ]
+        ]
+      },
+      "id": "AUS"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Austria" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [16.979667, 48.123497],
+            [16.903754, 47.714866],
+            [16.340584, 47.712902],
+            [16.534268, 47.496171],
+            [16.202298, 46.852386],
+            [16.011664, 46.683611],
+            [15.137092, 46.658703],
+            [14.632472, 46.431817],
+            [13.806475, 46.509306],
+            [12.376485, 46.767559],
+            [12.153088, 47.115393],
+            [11.164828, 46.941579],
+            [11.048556, 46.751359],
+            [10.442701, 46.893546],
+            [9.932448, 46.920728],
+            [9.47997, 47.10281],
+            [9.632932, 47.347601],
+            [9.594226, 47.525058],
+            [9.896068, 47.580197],
+            [10.402084, 47.302488],
+            [10.544504, 47.566399],
+            [11.426414, 47.523766],
+            [12.141357, 47.703083],
+            [12.62076, 47.672388],
+            [12.932627, 47.467646],
+            [13.025851, 47.637584],
+            [12.884103, 48.289146],
+            [13.243357, 48.416115],
+            [13.595946, 48.877172],
+            [14.338898, 48.555305],
+            [14.901447, 48.964402],
+            [15.253416, 49.039074],
+            [16.029647, 48.733899],
+            [16.499283, 48.785808],
+            [16.960288, 48.596982],
+            [16.879983, 48.470013],
+            [16.979667, 48.123497]
+          ]
+        ]
+      },
+      "id": "AUT"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Azerbaijan" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [45.001987, 39.740004],
+              [45.298145, 39.471751],
+              [45.739978, 39.473999],
+              [45.735379, 39.319719],
+              [46.143623, 38.741201],
+              [45.457722, 38.874139],
+              [44.952688, 39.335765],
+              [44.79399, 39.713003],
+              [45.001987, 39.740004]
+            ]
+          ],
+          [
+            [
+              [47.373315, 41.219732],
+              [47.815666, 41.151416],
+              [47.987283, 41.405819],
+              [48.584353, 41.80887],
+              [49.110264, 41.282287],
+              [49.618915, 40.572924],
+              [50.08483, 40.526157],
+              [50.392821, 40.256561],
+              [49.569202, 40.176101],
+              [49.395259, 39.399482],
+              [49.223228, 39.049219],
+              [48.856532, 38.815486],
+              [48.883249, 38.320245],
+              [48.634375, 38.270378],
+              [48.010744, 38.794015],
+              [48.355529, 39.288765],
+              [48.060095, 39.582235],
+              [47.685079, 39.508364],
+              [46.50572, 38.770605],
+              [46.483499, 39.464155],
+              [46.034534, 39.628021],
+              [45.610012, 39.899994],
+              [45.891907, 40.218476],
+              [45.359175, 40.561504],
+              [45.560351, 40.81229],
+              [45.179496, 40.985354],
+              [44.97248, 41.248129],
+              [45.217426, 41.411452],
+              [45.962601, 41.123873],
+              [46.501637, 41.064445],
+              [46.637908, 41.181673],
+              [46.145432, 41.722802],
+              [46.404951, 41.860675],
+              [46.686071, 41.827137],
+              [47.373315, 41.219732]
+            ]
+          ]
+        ]
+      },
+      "id": "AZE"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Burundi" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [29.339998, -4.499983],
+            [29.276384, -3.293907],
+            [29.024926, -2.839258],
+            [29.632176, -2.917858],
+            [29.938359, -2.348487],
+            [30.469696, -2.413858],
+            [30.527677, -2.807632],
+            [30.743013, -3.034285],
+            [30.752263, -3.35933],
+            [30.50556, -3.568567],
+            [30.116333, -4.090138],
+            [29.753512, -4.452389],
+            [29.339998, -4.499983]
+          ]
+        ]
+      },
+      "id": "BDI"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Belgium" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [3.314971, 51.345781],
+            [4.047071, 51.267259],
+            [4.973991, 51.475024],
+            [5.606976, 51.037298],
+            [6.156658, 50.803721],
+            [6.043073, 50.128052],
+            [5.782417, 50.090328],
+            [5.674052, 49.529484],
+            [4.799222, 49.985373],
+            [4.286023, 49.907497],
+            [3.588184, 50.378992],
+            [3.123252, 50.780363],
+            [2.658422, 50.796848],
+            [2.513573, 51.148506],
+            [3.314971, 51.345781]
+          ]
+        ]
+      },
+      "id": "BEL"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Benin" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [2.691702, 6.258817],
+            [1.865241, 6.142158],
+            [1.618951, 6.832038],
+            [1.664478, 9.12859],
+            [1.463043, 9.334624],
+            [1.425061, 9.825395],
+            [1.077795, 10.175607],
+            [0.772336, 10.470808],
+            [0.899563, 10.997339],
+            [1.24347, 11.110511],
+            [1.447178, 11.547719],
+            [1.935986, 11.64115],
+            [2.154474, 11.94015],
+            [2.490164, 12.233052],
+            [2.848643, 12.235636],
+            [3.61118, 11.660167],
+            [3.572216, 11.327939],
+            [3.797112, 10.734746],
+            [3.60007, 10.332186],
+            [3.705438, 10.06321],
+            [3.220352, 9.444153],
+            [2.912308, 9.137608],
+            [2.723793, 8.506845],
+            [2.749063, 7.870734],
+            [2.691702, 6.258817]
+          ]
+        ]
+      },
+      "id": "BEN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Burkina Faso" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-2.827496, 9.642461],
+            [-3.511899, 9.900326],
+            [-3.980449, 9.862344],
+            [-4.330247, 9.610835],
+            [-4.779884, 9.821985],
+            [-4.954653, 10.152714],
+            [-5.404342, 10.370737],
+            [-5.470565, 10.95127],
+            [-5.197843, 11.375146],
+            [-5.220942, 11.713859],
+            [-4.427166, 12.542646],
+            [-4.280405, 13.228444],
+            [-4.006391, 13.472485],
+            [-3.522803, 13.337662],
+            [-3.103707, 13.541267],
+            [-2.967694, 13.79815],
+            [-2.191825, 14.246418],
+            [-2.001035, 14.559008],
+            [-1.066363, 14.973815],
+            [-0.515854, 15.116158],
+            [-0.266257, 14.924309],
+            [0.374892, 14.928908],
+            [0.295646, 14.444235],
+            [0.429928, 13.988733],
+            [0.993046, 13.33575],
+            [1.024103, 12.851826],
+            [2.177108, 12.625018],
+            [2.154474, 11.94015],
+            [1.935986, 11.64115],
+            [1.447178, 11.547719],
+            [1.24347, 11.110511],
+            [0.899563, 10.997339],
+            [0.023803, 11.018682],
+            [-0.438702, 11.098341],
+            [-0.761576, 10.93693],
+            [-1.203358, 11.009819],
+            [-2.940409, 10.96269],
+            [-2.963896, 10.395335],
+            [-2.827496, 9.642461]
+          ]
+        ]
+      },
+      "id": "BFA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Bangladesh" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [92.672721, 22.041239],
+            [92.652257, 21.324048],
+            [92.303234, 21.475485],
+            [92.368554, 20.670883],
+            [92.082886, 21.192195],
+            [92.025215, 21.70157],
+            [91.834891, 22.182936],
+            [91.417087, 22.765019],
+            [90.496006, 22.805017],
+            [90.586957, 22.392794],
+            [90.272971, 21.836368],
+            [89.847467, 22.039146],
+            [89.70205, 21.857116],
+            [89.418863, 21.966179],
+            [89.031961, 22.055708],
+            [88.876312, 22.879146],
+            [88.52977, 23.631142],
+            [88.69994, 24.233715],
+            [88.084422, 24.501657],
+            [88.306373, 24.866079],
+            [88.931554, 25.238692],
+            [88.209789, 25.768066],
+            [88.563049, 26.446526],
+            [89.355094, 26.014407],
+            [89.832481, 25.965082],
+            [89.920693, 25.26975],
+            [90.872211, 25.132601],
+            [91.799596, 25.147432],
+            [92.376202, 24.976693],
+            [91.915093, 24.130414],
+            [91.46773, 24.072639],
+            [91.158963, 23.503527],
+            [91.706475, 22.985264],
+            [91.869928, 23.624346],
+            [92.146035, 23.627499],
+            [92.672721, 22.041239]
+          ]
+        ]
+      },
+      "id": "BGD"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Bulgaria" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [22.65715, 44.234923],
+            [22.944832, 43.823785],
+            [23.332302, 43.897011],
+            [24.100679, 43.741051],
+            [25.569272, 43.688445],
+            [26.065159, 43.943494],
+            [27.2424, 44.175986],
+            [27.970107, 43.812468],
+            [28.558081, 43.707462],
+            [28.039095, 43.293172],
+            [27.673898, 42.577892],
+            [27.99672, 42.007359],
+            [27.135739, 42.141485],
+            [26.117042, 41.826905],
+            [26.106138, 41.328899],
+            [25.197201, 41.234486],
+            [24.492645, 41.583896],
+            [23.692074, 41.309081],
+            [22.952377, 41.337994],
+            [22.881374, 41.999297],
+            [22.380526, 42.32026],
+            [22.545012, 42.461362],
+            [22.436595, 42.580321],
+            [22.604801, 42.898519],
+            [22.986019, 43.211161],
+            [22.500157, 43.642814],
+            [22.410446, 44.008063],
+            [22.65715, 44.234923]
+          ]
+        ]
+      },
+      "id": "BGR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "The Bahamas" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [-77.53466, 23.75975],
+              [-77.78, 23.71],
+              [-78.03405, 24.28615],
+              [-78.40848, 24.57564],
+              [-78.19087, 25.2103],
+              [-77.89, 25.17],
+              [-77.54, 24.34],
+              [-77.53466, 23.75975]
+            ]
+          ],
+          [
+            [
+              [-77.82, 26.58],
+              [-78.91, 26.42],
+              [-78.98, 26.79],
+              [-78.51, 26.87],
+              [-77.85, 26.84],
+              [-77.82, 26.58]
+            ]
+          ],
+          [
+            [
+              [-77, 26.59],
+              [-77.17255, 25.87918],
+              [-77.35641, 26.00735],
+              [-77.34, 26.53],
+              [-77.78802, 26.92516],
+              [-77.79, 27.04],
+              [-77, 26.59]
+            ]
+          ]
+        ]
+      },
+      "id": "BHS"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Bosnia and Herzegovina" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [19.005486, 44.860234],
+            [19.36803, 44.863],
+            [19.11761, 44.42307],
+            [19.59976, 44.03847],
+            [19.454, 43.5681],
+            [19.21852, 43.52384],
+            [19.03165, 43.43253],
+            [18.70648, 43.20011],
+            [18.56, 42.65],
+            [17.674922, 43.028563],
+            [17.297373, 43.446341],
+            [16.916156, 43.667722],
+            [16.456443, 44.04124],
+            [16.23966, 44.351143],
+            [15.750026, 44.818712],
+            [15.959367, 45.233777],
+            [16.318157, 45.004127],
+            [16.534939, 45.211608],
+            [17.002146, 45.233777],
+            [17.861783, 45.06774],
+            [18.553214, 45.08159],
+            [19.005486, 44.860234]
+          ]
+        ]
+      },
+      "id": "BIH"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Belarus" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [23.484128, 53.912498],
+            [24.450684, 53.905702],
+            [25.536354, 54.282423],
+            [25.768433, 54.846963],
+            [26.588279, 55.167176],
+            [26.494331, 55.615107],
+            [27.10246, 55.783314],
+            [28.176709, 56.16913],
+            [29.229513, 55.918344],
+            [29.371572, 55.670091],
+            [29.896294, 55.789463],
+            [30.873909, 55.550976],
+            [30.971836, 55.081548],
+            [30.757534, 54.811771],
+            [31.384472, 54.157056],
+            [31.791424, 53.974639],
+            [31.731273, 53.794029],
+            [32.405599, 53.618045],
+            [32.693643, 53.351421],
+            [32.304519, 53.132726],
+            [31.497644, 53.167427],
+            [31.305201, 53.073996],
+            [31.540018, 52.742052],
+            [31.785998, 52.101678],
+            [30.927549, 52.042353],
+            [30.619454, 51.822806],
+            [30.555117, 51.319503],
+            [30.157364, 51.416138],
+            [29.254938, 51.368234],
+            [28.992835, 51.602044],
+            [28.617613, 51.427714],
+            [28.241615, 51.572227],
+            [27.454066, 51.592303],
+            [26.337959, 51.832289],
+            [25.327788, 51.910656],
+            [24.553106, 51.888461],
+            [24.005078, 51.617444],
+            [23.527071, 51.578454],
+            [23.508002, 52.023647],
+            [23.199494, 52.486977],
+            [23.799199, 52.691099],
+            [23.804935, 53.089731],
+            [23.527536, 53.470122],
+            [23.484128, 53.912498]
+          ]
+        ]
+      },
+      "id": "BLR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Belize" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-89.14308, 17.808319],
+            [-89.150909, 17.955468],
+            [-89.029857, 18.001511],
+            [-88.848344, 17.883198],
+            [-88.490123, 18.486831],
+            [-88.300031, 18.499982],
+            [-88.296336, 18.353273],
+            [-88.106813, 18.348674],
+            [-88.123479, 18.076675],
+            [-88.285355, 17.644143],
+            [-88.197867, 17.489475],
+            [-88.302641, 17.131694],
+            [-88.239518, 17.036066],
+            [-88.355428, 16.530774],
+            [-88.551825, 16.265467],
+            [-88.732434, 16.233635],
+            [-88.930613, 15.887273],
+            [-89.229122, 15.886938],
+            [-89.150806, 17.015577],
+            [-89.14308, 17.808319]
+          ]
+        ]
+      },
+      "id": "BLZ"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Bolivia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-62.846468, -22.034985],
+            [-63.986838, -21.993644],
+            [-64.377021, -22.798091],
+            [-64.964892, -22.075862],
+            [-66.273339, -21.83231],
+            [-67.106674, -22.735925],
+            [-67.82818, -22.872919],
+            [-68.219913, -21.494347],
+            [-68.757167, -20.372658],
+            [-68.442225, -19.405068],
+            [-68.966818, -18.981683],
+            [-69.100247, -18.260125],
+            [-69.590424, -17.580012],
+            [-68.959635, -16.500698],
+            [-69.389764, -15.660129],
+            [-69.160347, -15.323974],
+            [-69.339535, -14.953195],
+            [-68.948887, -14.453639],
+            [-68.929224, -13.602684],
+            [-68.88008, -12.899729],
+            [-68.66508, -12.5613],
+            [-69.529678, -10.951734],
+            [-68.786158, -11.03638],
+            [-68.271254, -11.014521],
+            [-68.048192, -10.712059],
+            [-67.173801, -10.306812],
+            [-66.646908, -9.931331],
+            [-65.338435, -9.761988],
+            [-65.444837, -10.511451],
+            [-65.321899, -10.895872],
+            [-65.402281, -11.56627],
+            [-64.316353, -12.461978],
+            [-63.196499, -12.627033],
+            [-62.80306, -13.000653],
+            [-62.127081, -13.198781],
+            [-61.713204, -13.489202],
+            [-61.084121, -13.479384],
+            [-60.503304, -13.775955],
+            [-60.459198, -14.354007],
+            [-60.264326, -14.645979],
+            [-60.251149, -15.077219],
+            [-60.542966, -15.09391],
+            [-60.15839, -16.258284],
+            [-58.24122, -16.299573],
+            [-58.388058, -16.877109],
+            [-58.280804, -17.27171],
+            [-57.734558, -17.552468],
+            [-57.498371, -18.174188],
+            [-57.676009, -18.96184],
+            [-57.949997, -19.400004],
+            [-57.853802, -19.969995],
+            [-58.166392, -20.176701],
+            [-58.183471, -19.868399],
+            [-59.115042, -19.356906],
+            [-60.043565, -19.342747],
+            [-61.786326, -19.633737],
+            [-62.265961, -20.513735],
+            [-62.291179, -21.051635],
+            [-62.685057, -22.249029],
+            [-62.846468, -22.034985]
+          ]
+        ]
+      },
+      "id": "BOL"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Brazil" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-57.625133, -30.216295],
+            [-56.2909, -28.852761],
+            [-55.162286, -27.881915],
+            [-54.490725, -27.474757],
+            [-53.648735, -26.923473],
+            [-53.628349, -26.124865],
+            [-54.13005, -25.547639],
+            [-54.625291, -25.739255],
+            [-54.428946, -25.162185],
+            [-54.293476, -24.5708],
+            [-54.29296, -24.021014],
+            [-54.652834, -23.839578],
+            [-55.027902, -24.001274],
+            [-55.400747, -23.956935],
+            [-55.517639, -23.571998],
+            [-55.610683, -22.655619],
+            [-55.797958, -22.35693],
+            [-56.473317, -22.0863],
+            [-56.88151, -22.282154],
+            [-57.937156, -22.090176],
+            [-57.870674, -20.732688],
+            [-58.166392, -20.176701],
+            [-57.853802, -19.969995],
+            [-57.949997, -19.400004],
+            [-57.676009, -18.96184],
+            [-57.498371, -18.174188],
+            [-57.734558, -17.552468],
+            [-58.280804, -17.27171],
+            [-58.388058, -16.877109],
+            [-58.24122, -16.299573],
+            [-60.15839, -16.258284],
+            [-60.542966, -15.09391],
+            [-60.251149, -15.077219],
+            [-60.264326, -14.645979],
+            [-60.459198, -14.354007],
+            [-60.503304, -13.775955],
+            [-61.084121, -13.479384],
+            [-61.713204, -13.489202],
+            [-62.127081, -13.198781],
+            [-62.80306, -13.000653],
+            [-63.196499, -12.627033],
+            [-64.316353, -12.461978],
+            [-65.402281, -11.56627],
+            [-65.321899, -10.895872],
+            [-65.444837, -10.511451],
+            [-65.338435, -9.761988],
+            [-66.646908, -9.931331],
+            [-67.173801, -10.306812],
+            [-68.048192, -10.712059],
+            [-68.271254, -11.014521],
+            [-68.786158, -11.03638],
+            [-69.529678, -10.951734],
+            [-70.093752, -11.123972],
+            [-70.548686, -11.009147],
+            [-70.481894, -9.490118],
+            [-71.302412, -10.079436],
+            [-72.184891, -10.053598],
+            [-72.563033, -9.520194],
+            [-73.226713, -9.462213],
+            [-73.015383, -9.032833],
+            [-73.571059, -8.424447],
+            [-73.987235, -7.52383],
+            [-73.723401, -7.340999],
+            [-73.724487, -6.918595],
+            [-73.120027, -6.629931],
+            [-73.219711, -6.089189],
+            [-72.964507, -5.741251],
+            [-72.891928, -5.274561],
+            [-71.748406, -4.593983],
+            [-70.928843, -4.401591],
+            [-70.794769, -4.251265],
+            [-69.893635, -4.298187],
+            [-69.444102, -1.556287],
+            [-69.420486, -1.122619],
+            [-69.577065, -0.549992],
+            [-70.020656, -0.185156],
+            [-70.015566, 0.541414],
+            [-69.452396, 0.706159],
+            [-69.252434, 0.602651],
+            [-69.218638, 0.985677],
+            [-69.804597, 1.089081],
+            [-69.816973, 1.714805],
+            [-67.868565, 1.692455],
+            [-67.53781, 2.037163],
+            [-67.259998, 1.719999],
+            [-67.065048, 1.130112],
+            [-66.876326, 1.253361],
+            [-66.325765, 0.724452],
+            [-65.548267, 0.789254],
+            [-65.354713, 1.095282],
+            [-64.611012, 1.328731],
+            [-64.199306, 1.492855],
+            [-64.083085, 1.916369],
+            [-63.368788, 2.2009],
+            [-63.422867, 2.411068],
+            [-64.269999, 2.497006],
+            [-64.408828, 3.126786],
+            [-64.368494, 3.79721],
+            [-64.816064, 4.056445],
+            [-64.628659, 4.148481],
+            [-63.888343, 4.02053],
+            [-63.093198, 3.770571],
+            [-62.804533, 4.006965],
+            [-62.08543, 4.162124],
+            [-60.966893, 4.536468],
+            [-60.601179, 4.918098],
+            [-60.733574, 5.200277],
+            [-60.213683, 5.244486],
+            [-59.980959, 5.014061],
+            [-60.111002, 4.574967],
+            [-59.767406, 4.423503],
+            [-59.53804, 3.958803],
+            [-59.815413, 3.606499],
+            [-59.974525, 2.755233],
+            [-59.718546, 2.24963],
+            [-59.646044, 1.786894],
+            [-59.030862, 1.317698],
+            [-58.540013, 1.268088],
+            [-58.429477, 1.463942],
+            [-58.11345, 1.507195],
+            [-57.660971, 1.682585],
+            [-57.335823, 1.948538],
+            [-56.782704, 1.863711],
+            [-56.539386, 1.899523],
+            [-55.995698, 1.817667],
+            [-55.9056, 2.021996],
+            [-56.073342, 2.220795],
+            [-55.973322, 2.510364],
+            [-55.569755, 2.421506],
+            [-55.097587, 2.523748],
+            [-54.524754, 2.311849],
+            [-54.088063, 2.105557],
+            [-53.778521, 2.376703],
+            [-53.554839, 2.334897],
+            [-53.418465, 2.053389],
+            [-52.939657, 2.124858],
+            [-52.556425, 2.504705],
+            [-52.249338, 3.241094],
+            [-51.657797, 4.156232],
+            [-51.317146, 4.203491],
+            [-51.069771, 3.650398],
+            [-50.508875, 1.901564],
+            [-49.974076, 1.736483],
+            [-49.947101, 1.04619],
+            [-50.699251, 0.222984],
+            [-50.388211, -0.078445],
+            [-48.620567, -0.235489],
+            [-48.584497, -1.237805],
+            [-47.824956, -0.581618],
+            [-46.566584, -0.941028],
+            [-44.905703, -1.55174],
+            [-44.417619, -2.13775],
+            [-44.581589, -2.691308],
+            [-43.418791, -2.38311],
+            [-41.472657, -2.912018],
+            [-39.978665, -2.873054],
+            [-38.500383, -3.700652],
+            [-37.223252, -4.820946],
+            [-36.452937, -5.109404],
+            [-35.597796, -5.149504],
+            [-35.235389, -5.464937],
+            [-34.89603, -6.738193],
+            [-34.729993, -7.343221],
+            [-35.128212, -8.996401],
+            [-35.636967, -9.649282],
+            [-37.046519, -11.040721],
+            [-37.683612, -12.171195],
+            [-38.423877, -13.038119],
+            [-38.673887, -13.057652],
+            [-38.953276, -13.79337],
+            [-38.882298, -15.667054],
+            [-39.161092, -17.208407],
+            [-39.267339, -17.867746],
+            [-39.583521, -18.262296],
+            [-39.760823, -19.599113],
+            [-40.774741, -20.904512],
+            [-40.944756, -21.937317],
+            [-41.754164, -22.370676],
+            [-41.988284, -22.97007],
+            [-43.074704, -22.967693],
+            [-44.647812, -23.351959],
+            [-45.352136, -23.796842],
+            [-46.472093, -24.088969],
+            [-47.648972, -24.885199],
+            [-48.495458, -25.877025],
+            [-48.641005, -26.623698],
+            [-48.474736, -27.175912],
+            [-48.66152, -28.186135],
+            [-48.888457, -28.674115],
+            [-49.587329, -29.224469],
+            [-50.696874, -30.984465],
+            [-51.576226, -31.777698],
+            [-52.256081, -32.24537],
+            [-52.7121, -33.196578],
+            [-53.373662, -33.768378],
+            [-53.650544, -33.202004],
+            [-53.209589, -32.727666],
+            [-53.787952, -32.047243],
+            [-54.572452, -31.494511],
+            [-55.60151, -30.853879],
+            [-55.973245, -30.883076],
+            [-56.976026, -30.109686],
+            [-57.625133, -30.216295]
+          ]
+        ]
+      },
+      "id": "BRA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Brunei" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [114.204017, 4.525874],
+            [114.599961, 4.900011],
+            [115.45071, 5.44773],
+            [115.4057, 4.955228],
+            [115.347461, 4.316636],
+            [114.869557, 4.348314],
+            [114.659596, 4.007637],
+            [114.204017, 4.525874]
+          ]
+        ]
+      },
+      "id": "BRN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Bhutan" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [91.696657, 27.771742],
+            [92.103712, 27.452614],
+            [92.033484, 26.83831],
+            [91.217513, 26.808648],
+            [90.373275, 26.875724],
+            [89.744528, 26.719403],
+            [88.835643, 27.098966],
+            [88.814248, 27.299316],
+            [89.47581, 28.042759],
+            [90.015829, 28.296439],
+            [90.730514, 28.064954],
+            [91.258854, 28.040614],
+            [91.696657, 27.771742]
+          ]
+        ]
+      },
+      "id": "BTN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Botswana" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [25.649163, -18.536026],
+            [25.850391, -18.714413],
+            [26.164791, -19.293086],
+            [27.296505, -20.39152],
+            [27.724747, -20.499059],
+            [27.727228, -20.851802],
+            [28.02137, -21.485975],
+            [28.794656, -21.639454],
+            [29.432188, -22.091313],
+            [28.017236, -22.827754],
+            [27.11941, -23.574323],
+            [26.786407, -24.240691],
+            [26.485753, -24.616327],
+            [25.941652, -24.696373],
+            [25.765849, -25.174845],
+            [25.664666, -25.486816],
+            [25.025171, -25.71967],
+            [24.211267, -25.670216],
+            [23.73357, -25.390129],
+            [23.312097, -25.26869],
+            [22.824271, -25.500459],
+            [22.579532, -25.979448],
+            [22.105969, -26.280256],
+            [21.605896, -26.726534],
+            [20.889609, -26.828543],
+            [20.66647, -26.477453],
+            [20.758609, -25.868136],
+            [20.165726, -24.917962],
+            [19.895768, -24.76779],
+            [19.895458, -21.849157],
+            [20.881134, -21.814327],
+            [20.910641, -18.252219],
+            [21.65504, -18.219146],
+            [23.196858, -17.869038],
+            [23.579006, -18.281261],
+            [24.217365, -17.889347],
+            [24.520705, -17.887125],
+            [25.084443, -17.661816],
+            [25.264226, -17.73654],
+            [25.649163, -18.536026]
+          ]
+        ]
+      },
+      "id": "BWA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Central African Republic" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [15.27946, 7.421925],
+            [16.106232, 7.497088],
+            [16.290562, 7.754307],
+            [16.456185, 7.734774],
+            [16.705988, 7.508328],
+            [17.96493, 7.890914],
+            [18.389555, 8.281304],
+            [18.911022, 8.630895],
+            [18.81201, 8.982915],
+            [19.094008, 9.074847],
+            [20.059685, 9.012706],
+            [21.000868, 9.475985],
+            [21.723822, 10.567056],
+            [22.231129, 10.971889],
+            [22.864165, 11.142395],
+            [22.977544, 10.714463],
+            [23.554304, 10.089255],
+            [23.55725, 9.681218],
+            [23.394779, 9.265068],
+            [23.459013, 8.954286],
+            [23.805813, 8.666319],
+            [24.567369, 8.229188],
+            [25.114932, 7.825104],
+            [25.124131, 7.500085],
+            [25.796648, 6.979316],
+            [26.213418, 6.546603],
+            [26.465909, 5.946717],
+            [27.213409, 5.550953],
+            [27.374226, 5.233944],
+            [27.044065, 5.127853],
+            [26.402761, 5.150875],
+            [25.650455, 5.256088],
+            [25.278798, 5.170408],
+            [25.128833, 4.927245],
+            [24.805029, 4.897247],
+            [24.410531, 5.108784],
+            [23.297214, 4.609693],
+            [22.84148, 4.710126],
+            [22.704124, 4.633051],
+            [22.405124, 4.02916],
+            [21.659123, 4.224342],
+            [20.927591, 4.322786],
+            [20.290679, 4.691678],
+            [19.467784, 5.031528],
+            [18.932312, 4.709506],
+            [18.542982, 4.201785],
+            [18.453065, 3.504386],
+            [17.8099, 3.560196],
+            [17.133042, 3.728197],
+            [16.537058, 3.198255],
+            [16.012852, 2.26764],
+            [15.907381, 2.557389],
+            [15.862732, 3.013537],
+            [15.405396, 3.335301],
+            [15.03622, 3.851367],
+            [14.950953, 4.210389],
+            [14.478372, 4.732605],
+            [14.558936, 5.030598],
+            [14.459407, 5.451761],
+            [14.53656, 6.226959],
+            [14.776545, 6.408498],
+            [15.27946, 7.421925]
+          ]
+        ]
+      },
+      "id": "CAF"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Canada" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [-63.6645, 46.55001],
+              [-62.9393, 46.41587],
+              [-62.01208, 46.44314],
+              [-62.50391, 46.03339],
+              [-62.87433, 45.96818],
+              [-64.1428, 46.39265],
+              [-64.39261, 46.72747],
+              [-64.01486, 47.03601],
+              [-63.6645, 46.55001]
+            ]
+          ],
+          [
+            [
+              [-61.806305, 49.10506],
+              [-62.29318, 49.08717],
+              [-63.58926, 49.40069],
+              [-64.51912, 49.87304],
+              [-64.17322, 49.95718],
+              [-62.85829, 49.70641],
+              [-61.835585, 49.28855],
+              [-61.806305, 49.10506]
+            ]
+          ],
+          [
+            [
+              [-123.510002, 48.510011],
+              [-124.012891, 48.370846],
+              [-125.655013, 48.825005],
+              [-125.954994, 49.179996],
+              [-126.850004, 49.53],
+              [-127.029993, 49.814996],
+              [-128.059336, 49.994959],
+              [-128.444584, 50.539138],
+              [-128.358414, 50.770648],
+              [-127.308581, 50.552574],
+              [-126.695001, 50.400903],
+              [-125.755007, 50.295018],
+              [-125.415002, 49.950001],
+              [-124.920768, 49.475275],
+              [-123.922509, 49.062484],
+              [-123.510002, 48.510011]
+            ]
+          ],
+          [
+            [
+              [-56.134036, 50.68701],
+              [-56.795882, 49.812309],
+              [-56.143105, 50.150117],
+              [-55.471492, 49.935815],
+              [-55.822401, 49.587129],
+              [-54.935143, 49.313011],
+              [-54.473775, 49.556691],
+              [-53.476549, 49.249139],
+              [-53.786014, 48.516781],
+              [-53.086134, 48.687804],
+              [-52.958648, 48.157164],
+              [-52.648099, 47.535548],
+              [-53.069158, 46.655499],
+              [-53.521456, 46.618292],
+              [-54.178936, 46.807066],
+              [-53.961869, 47.625207],
+              [-54.240482, 47.752279],
+              [-55.400773, 46.884994],
+              [-55.997481, 46.91972],
+              [-55.291219, 47.389562],
+              [-56.250799, 47.632545],
+              [-57.325229, 47.572807],
+              [-59.266015, 47.603348],
+              [-59.419494, 47.899454],
+              [-58.796586, 48.251525],
+              [-59.231625, 48.523188],
+              [-58.391805, 49.125581],
+              [-57.35869, 50.718274],
+              [-56.73865, 51.287438],
+              [-55.870977, 51.632094],
+              [-55.406974, 51.588273],
+              [-55.600218, 51.317075],
+              [-56.134036, 50.68701]
+            ]
+          ],
+          [
+            [
+              [-132.710008, 54.040009],
+              [-132.710009, 54.040009],
+              [-132.710008, 54.040009],
+              [-132.710008, 54.040009],
+              [-131.74999, 54.120004],
+              [-132.04948, 52.984621],
+              [-131.179043, 52.180433],
+              [-131.57783, 52.182371],
+              [-132.180428, 52.639707],
+              [-132.549992, 53.100015],
+              [-133.054611, 53.411469],
+              [-133.239664, 53.85108],
+              [-133.180004, 54.169975],
+              [-132.710008, 54.040009]
+            ]
+          ],
+          [
+            [
+              [-79.26582, 62.158675],
+              [-79.65752, 61.63308],
+              [-80.09956, 61.7181],
+              [-80.36215, 62.01649],
+              [-80.315395, 62.085565],
+              [-79.92939, 62.3856],
+              [-79.52002, 62.36371],
+              [-79.26582, 62.158675]
+            ]
+          ],
+          [
+            [
+              [-81.89825, 62.7108],
+              [-83.06857, 62.15922],
+              [-83.77462, 62.18231],
+              [-83.99367, 62.4528],
+              [-83.25048, 62.91409],
+              [-81.87699, 62.90458],
+              [-81.89825, 62.7108]
+            ]
+          ],
+          [
+            [
+              [-85.161308, 65.657285],
+              [-84.975764, 65.217518],
+              [-84.464012, 65.371772],
+              [-83.882626, 65.109618],
+              [-82.787577, 64.766693],
+              [-81.642014, 64.455136],
+              [-81.55344, 63.979609],
+              [-80.817361, 64.057486],
+              [-80.103451, 63.725981],
+              [-80.99102, 63.411246],
+              [-82.547178, 63.651722],
+              [-83.108798, 64.101876],
+              [-84.100417, 63.569712],
+              [-85.523405, 63.052379],
+              [-85.866769, 63.637253],
+              [-87.221983, 63.541238],
+              [-86.35276, 64.035833],
+              [-86.224886, 64.822917],
+              [-85.883848, 65.738778],
+              [-85.161308, 65.657285]
+            ]
+          ],
+          [
+            [
+              [-75.86588, 67.14886],
+              [-76.98687, 67.09873],
+              [-77.2364, 67.58809],
+              [-76.81166, 68.14856],
+              [-75.89521, 68.28721],
+              [-75.1145, 68.01036],
+              [-75.10333, 67.58202],
+              [-75.21597, 67.44425],
+              [-75.86588, 67.14886]
+            ]
+          ],
+          [
+            [
+              [-95.647681, 69.10769],
+              [-96.269521, 68.75704],
+              [-97.617401, 69.06003],
+              [-98.431801, 68.9507],
+              [-99.797401, 69.40003],
+              [-98.917401, 69.71003],
+              [-98.218261, 70.14354],
+              [-97.157401, 69.86003],
+              [-96.557401, 69.68003],
+              [-96.257401, 69.49003],
+              [-95.647681, 69.10769]
+            ]
+          ],
+          [
+            [
+              [-90.5471, 69.49766],
+              [-90.55151, 68.47499],
+              [-89.21515, 69.25873],
+              [-88.01966, 68.61508],
+              [-88.31749, 67.87338],
+              [-87.35017, 67.19872],
+              [-86.30607, 67.92146],
+              [-85.57664, 68.78456],
+              [-85.52197, 69.88211],
+              [-84.10081, 69.80539],
+              [-82.62258, 69.65826],
+              [-81.28043, 69.16202],
+              [-81.2202, 68.66567],
+              [-81.96436, 68.13253],
+              [-81.25928, 67.59716],
+              [-81.38653, 67.11078],
+              [-83.34456, 66.41154],
+              [-84.73542, 66.2573],
+              [-85.76943, 66.55833],
+              [-86.0676, 66.05625],
+              [-87.03143, 65.21297],
+              [-87.32324, 64.77563],
+              [-88.48296, 64.09897],
+              [-89.91444, 64.03273],
+              [-90.70398, 63.61017],
+              [-90.77004, 62.96021],
+              [-91.93342, 62.83508],
+              [-93.15698, 62.02469],
+              [-94.24153, 60.89865],
+              [-94.62931, 60.11021],
+              [-94.6846, 58.94882],
+              [-93.21502, 58.78212],
+              [-92.76462, 57.84571],
+              [-92.29703, 57.08709],
+              [-90.89769, 57.28468],
+              [-89.03953, 56.85172],
+              [-88.03978, 56.47162],
+              [-87.32421, 55.99914],
+              [-86.07121, 55.72383],
+              [-85.01181, 55.3026],
+              [-83.36055, 55.24489],
+              [-82.27285, 55.14832],
+              [-82.4362, 54.28227],
+              [-82.12502, 53.27703],
+              [-81.40075, 52.15788],
+              [-79.91289, 51.20842],
+              [-79.14301, 51.53393],
+              [-78.60191, 52.56208],
+              [-79.12421, 54.14145],
+              [-79.82958, 54.66772],
+              [-78.22874, 55.13645],
+              [-77.0956, 55.83741],
+              [-76.54137, 56.53423],
+              [-76.62319, 57.20263],
+              [-77.30226, 58.05209],
+              [-78.51688, 58.80458],
+              [-77.33676, 59.85261],
+              [-77.77272, 60.75788],
+              [-78.10687, 62.31964],
+              [-77.41067, 62.55053],
+              [-75.69621, 62.2784],
+              [-74.6682, 62.18111],
+              [-73.83988, 62.4438],
+              [-72.90853, 62.10507],
+              [-71.67708, 61.52535],
+              [-71.37369, 61.13717],
+              [-69.59042, 61.06141],
+              [-69.62033, 60.22125],
+              [-69.2879, 58.95736],
+              [-68.37455, 58.80106],
+              [-67.64976, 58.21206],
+              [-66.20178, 58.76731],
+              [-65.24517, 59.87071],
+              [-64.58352, 60.33558],
+              [-63.80475, 59.4426],
+              [-62.50236, 58.16708],
+              [-61.39655, 56.96745],
+              [-61.79866, 56.33945],
+              [-60.46853, 55.77548],
+              [-59.56962, 55.20407],
+              [-57.97508, 54.94549],
+              [-57.3332, 54.6265],
+              [-56.93689, 53.78032],
+              [-56.15811, 53.64749],
+              [-55.75632, 53.27036],
+              [-55.68338, 52.14664],
+              [-56.40916, 51.7707],
+              [-57.12691, 51.41972],
+              [-58.77482, 51.0643],
+              [-60.03309, 50.24277],
+              [-61.72366, 50.08046],
+              [-63.86251, 50.29099],
+              [-65.36331, 50.2982],
+              [-66.39905, 50.22897],
+              [-67.23631, 49.51156],
+              [-68.51114, 49.06836],
+              [-69.95362, 47.74488],
+              [-71.10458, 46.82171],
+              [-70.25522, 46.98606],
+              [-68.65, 48.3],
+              [-66.55243, 49.1331],
+              [-65.05626, 49.23278],
+              [-64.17099, 48.74248],
+              [-65.11545, 48.07085],
+              [-64.79854, 46.99297],
+              [-64.47219, 46.23849],
+              [-63.17329, 45.73902],
+              [-61.52072, 45.88377],
+              [-60.51815, 47.00793],
+              [-60.4486, 46.28264],
+              [-59.80287, 45.9204],
+              [-61.03988, 45.26525],
+              [-63.25471, 44.67014],
+              [-64.24656, 44.26553],
+              [-65.36406, 43.54523],
+              [-66.1234, 43.61867],
+              [-66.16173, 44.46512],
+              [-64.42549, 45.29204],
+              [-66.02605, 45.25931],
+              [-67.13741, 45.13753],
+              [-67.79134, 45.70281],
+              [-67.79046, 47.06636],
+              [-68.23444, 47.35486],
+              [-68.905, 47.185],
+              [-69.237216, 47.447781],
+              [-69.99997, 46.69307],
+              [-70.305, 45.915],
+              [-70.66, 45.46],
+              [-71.08482, 45.30524],
+              [-71.405, 45.255],
+              [-71.50506, 45.0082],
+              [-73.34783, 45.00738],
+              [-74.867, 45.00048],
+              [-75.31821, 44.81645],
+              [-76.375, 44.09631],
+              [-76.5, 44.018459],
+              [-76.820034, 43.628784],
+              [-77.737885, 43.629056],
+              [-78.72028, 43.625089],
+              [-79.171674, 43.466339],
+              [-79.01, 43.27],
+              [-78.92, 42.965],
+              [-78.939362, 42.863611],
+              [-80.247448, 42.3662],
+              [-81.277747, 42.209026],
+              [-82.439278, 41.675105],
+              [-82.690089, 41.675105],
+              [-83.02981, 41.832796],
+              [-83.142, 41.975681],
+              [-83.12, 42.08],
+              [-82.9, 42.43],
+              [-82.43, 42.98],
+              [-82.137642, 43.571088],
+              [-82.337763, 44.44],
+              [-82.550925, 45.347517],
+              [-83.592851, 45.816894],
+              [-83.469551, 45.994686],
+              [-83.616131, 46.116927],
+              [-83.890765, 46.116927],
+              [-84.091851, 46.275419],
+              [-84.14212, 46.512226],
+              [-84.3367, 46.40877],
+              [-84.6049, 46.4396],
+              [-84.543749, 46.538684],
+              [-84.779238, 46.637102],
+              [-84.87608, 46.900083],
+              [-85.652363, 47.220219],
+              [-86.461991, 47.553338],
+              [-87.439793, 47.94],
+              [-88.378114, 48.302918],
+              [-89.272917, 48.019808],
+              [-89.6, 48.01],
+              [-90.83, 48.27],
+              [-91.64, 48.14],
+              [-92.61, 48.45],
+              [-93.63087, 48.60926],
+              [-94.32914, 48.67074],
+              [-94.64, 48.84],
+              [-94.81758, 49.38905],
+              [-95.15609, 49.38425],
+              [-95.15907, 49],
+              [-97.22872, 49.0007],
+              [-100.65, 49],
+              [-104.04826, 48.99986],
+              [-107.05, 49],
+              [-110.05, 49],
+              [-113, 49],
+              [-116.04818, 49],
+              [-117.03121, 49],
+              [-120, 49],
+              [-122.84, 49],
+              [-122.97421, 49.002538],
+              [-124.91024, 49.98456],
+              [-125.62461, 50.41656],
+              [-127.43561, 50.83061],
+              [-127.99276, 51.71583],
+              [-127.85032, 52.32961],
+              [-129.12979, 52.75538],
+              [-129.30523, 53.56159],
+              [-130.51497, 54.28757],
+              [-130.53611, 54.80278],
+              [-129.98, 55.285],
+              [-130.00778, 55.91583],
+              [-131.70781, 56.55212],
+              [-132.73042, 57.69289],
+              [-133.35556, 58.41028],
+              [-134.27111, 58.86111],
+              [-134.945, 59.27056],
+              [-135.47583, 59.78778],
+              [-136.47972, 59.46389],
+              [-137.4525, 58.905],
+              [-138.34089, 59.56211],
+              [-139.039, 60],
+              [-140.013, 60.27682],
+              [-140.99778, 60.30639],
+              [-140.9925, 66.00003],
+              [-140.986, 69.712],
+              [-139.12052, 69.47102],
+              [-137.54636, 68.99002],
+              [-136.50358, 68.89804],
+              [-135.62576, 69.31512],
+              [-134.41464, 69.62743],
+              [-132.92925, 69.50534],
+              [-131.43136, 69.94451],
+              [-129.79471, 70.19369],
+              [-129.10773, 69.77927],
+              [-128.36156, 70.01286],
+              [-128.13817, 70.48384],
+              [-127.44712, 70.37721],
+              [-125.75632, 69.48058],
+              [-124.42483, 70.1584],
+              [-124.28968, 69.39969],
+              [-123.06108, 69.56372],
+              [-122.6835, 69.85553],
+              [-121.47226, 69.79778],
+              [-119.94288, 69.37786],
+              [-117.60268, 69.01128],
+              [-116.22643, 68.84151],
+              [-115.2469, 68.90591],
+              [-113.89794, 68.3989],
+              [-115.30489, 67.90261],
+              [-113.49727, 67.68815],
+              [-110.798, 67.80612],
+              [-109.94619, 67.98104],
+              [-108.8802, 67.38144],
+              [-107.79239, 67.88736],
+              [-108.81299, 68.31164],
+              [-108.16721, 68.65392],
+              [-106.95, 68.7],
+              [-106.15, 68.8],
+              [-105.34282, 68.56122],
+              [-104.33791, 68.018],
+              [-103.22115, 68.09775],
+              [-101.45433, 67.64689],
+              [-99.90195, 67.80566],
+              [-98.4432, 67.78165],
+              [-98.5586, 68.40394],
+              [-97.66948, 68.57864],
+              [-96.11991, 68.23939],
+              [-96.12588, 67.29338],
+              [-95.48943, 68.0907],
+              [-94.685, 68.06383],
+              [-94.23282, 69.06903],
+              [-95.30408, 69.68571],
+              [-96.47131, 70.08976],
+              [-96.39115, 71.19482],
+              [-95.2088, 71.92053],
+              [-93.88997, 71.76015],
+              [-92.87818, 71.31869],
+              [-91.51964, 70.19129],
+              [-92.40692, 69.69997],
+              [-90.5471, 69.49766]
+            ]
+          ],
+          [
+            [
+              [-114.16717, 73.12145],
+              [-114.66634, 72.65277],
+              [-112.44102, 72.9554],
+              [-111.05039, 72.4504],
+              [-109.92035, 72.96113],
+              [-109.00654, 72.63335],
+              [-108.18835, 71.65089],
+              [-107.68599, 72.06548],
+              [-108.39639, 73.08953],
+              [-107.51645, 73.23598],
+              [-106.52259, 73.07601],
+              [-105.40246, 72.67259],
+              [-104.77484, 71.6984],
+              [-104.46476, 70.99297],
+              [-102.78537, 70.49776],
+              [-100.98078, 70.02432],
+              [-101.08929, 69.58447],
+              [-102.73116, 69.50402],
+              [-102.09329, 69.11962],
+              [-102.43024, 68.75282],
+              [-104.24, 68.91],
+              [-105.96, 69.18],
+              [-107.12254, 69.11922],
+              [-109, 68.78],
+              [-111.534149, 68.630059],
+              [-113.3132, 68.53554],
+              [-113.85496, 69.00744],
+              [-115.22, 69.28],
+              [-116.10794, 69.16821],
+              [-117.34, 69.96],
+              [-116.67473, 70.06655],
+              [-115.13112, 70.2373],
+              [-113.72141, 70.19237],
+              [-112.4161, 70.36638],
+              [-114.35, 70.6],
+              [-116.48684, 70.52045],
+              [-117.9048, 70.54056],
+              [-118.43238, 70.9092],
+              [-116.11311, 71.30918],
+              [-117.65568, 71.2952],
+              [-119.40199, 71.55859],
+              [-118.56267, 72.30785],
+              [-117.86642, 72.70594],
+              [-115.18909, 73.31459],
+              [-114.16717, 73.12145]
+            ]
+          ],
+          [
+            [
+              [-104.5, 73.42],
+              [-105.38, 72.76],
+              [-106.94, 73.46],
+              [-106.6, 73.6],
+              [-105.26, 73.64],
+              [-104.5, 73.42]
+            ]
+          ],
+          [
+            [
+              [-76.34, 73.102685],
+              [-76.251404, 72.826385],
+              [-77.314438, 72.855545],
+              [-78.39167, 72.876656],
+              [-79.486252, 72.742203],
+              [-79.775833, 72.802902],
+              [-80.876099, 73.333183],
+              [-80.833885, 73.693184],
+              [-80.353058, 73.75972],
+              [-78.064438, 73.651932],
+              [-76.34, 73.102685]
+            ]
+          ],
+          [
+            [
+              [-86.562179, 73.157447],
+              [-85.774371, 72.534126],
+              [-84.850112, 73.340278],
+              [-82.31559, 73.750951],
+              [-80.600088, 72.716544],
+              [-80.748942, 72.061907],
+              [-78.770639, 72.352173],
+              [-77.824624, 72.749617],
+              [-75.605845, 72.243678],
+              [-74.228616, 71.767144],
+              [-74.099141, 71.33084],
+              [-72.242226, 71.556925],
+              [-71.200015, 70.920013],
+              [-68.786054, 70.525024],
+              [-67.91497, 70.121948],
+              [-66.969033, 69.186087],
+              [-68.805123, 68.720198],
+              [-66.449866, 68.067163],
+              [-64.862314, 67.847539],
+              [-63.424934, 66.928473],
+              [-61.851981, 66.862121],
+              [-62.163177, 66.160251],
+              [-63.918444, 64.998669],
+              [-65.14886, 65.426033],
+              [-66.721219, 66.388041],
+              [-68.015016, 66.262726],
+              [-68.141287, 65.689789],
+              [-67.089646, 65.108455],
+              [-65.73208, 64.648406],
+              [-65.320168, 64.382737],
+              [-64.669406, 63.392927],
+              [-65.013804, 62.674185],
+              [-66.275045, 62.945099],
+              [-68.783186, 63.74567],
+              [-67.369681, 62.883966],
+              [-66.328297, 62.280075],
+              [-66.165568, 61.930897],
+              [-68.877367, 62.330149],
+              [-71.023437, 62.910708],
+              [-72.235379, 63.397836],
+              [-71.886278, 63.679989],
+              [-73.378306, 64.193963],
+              [-74.834419, 64.679076],
+              [-74.818503, 64.389093],
+              [-77.70998, 64.229542],
+              [-78.555949, 64.572906],
+              [-77.897281, 65.309192],
+              [-76.018274, 65.326969],
+              [-73.959795, 65.454765],
+              [-74.293883, 65.811771],
+              [-73.944912, 66.310578],
+              [-72.651167, 67.284576],
+              [-72.92606, 67.726926],
+              [-73.311618, 68.069437],
+              [-74.843307, 68.554627],
+              [-76.869101, 68.894736],
+              [-76.228649, 69.147769],
+              [-77.28737, 69.76954],
+              [-78.168634, 69.826488],
+              [-78.957242, 70.16688],
+              [-79.492455, 69.871808],
+              [-81.305471, 69.743185],
+              [-84.944706, 69.966634],
+              [-87.060003, 70.260001],
+              [-88.681713, 70.410741],
+              [-89.51342, 70.762038],
+              [-88.467721, 71.218186],
+              [-89.888151, 71.222552],
+              [-90.20516, 72.235074],
+              [-89.436577, 73.129464],
+              [-88.408242, 73.537889],
+              [-85.826151, 73.803816],
+              [-86.562179, 73.157447]
+            ]
+          ],
+          [
+            [
+              [-100.35642, 73.84389],
+              [-99.16387, 73.63339],
+              [-97.38, 73.76],
+              [-97.12, 73.47],
+              [-98.05359, 72.99052],
+              [-96.54, 72.56],
+              [-96.72, 71.66],
+              [-98.35966, 71.27285],
+              [-99.32286, 71.35639],
+              [-100.01482, 71.73827],
+              [-102.5, 72.51],
+              [-102.48, 72.83],
+              [-100.43836, 72.70588],
+              [-101.54, 73.36],
+              [-100.35642, 73.84389]
+            ]
+          ],
+          [
+            [
+              [-93.196296, 72.771992],
+              [-94.269047, 72.024596],
+              [-95.409856, 72.061881],
+              [-96.033745, 72.940277],
+              [-96.018268, 73.43743],
+              [-95.495793, 73.862417],
+              [-94.503658, 74.134907],
+              [-92.420012, 74.100025],
+              [-90.509793, 73.856732],
+              [-92.003965, 72.966244],
+              [-93.196296, 72.771992]
+            ]
+          ],
+          [
+            [
+              [-120.46, 71.383602],
+              [-123.09219, 70.90164],
+              [-123.62, 71.34],
+              [-125.928949, 71.868688],
+              [-125.5, 72.292261],
+              [-124.80729, 73.02256],
+              [-123.94, 73.68],
+              [-124.91775, 74.29275],
+              [-121.53788, 74.44893],
+              [-120.10978, 74.24135],
+              [-117.55564, 74.18577],
+              [-116.58442, 73.89607],
+              [-115.51081, 73.47519],
+              [-116.76794, 73.22292],
+              [-119.22, 72.52],
+              [-120.46, 71.82],
+              [-120.46, 71.383602]
+            ]
+          ],
+          [
+            [
+              [-93.612756, 74.979997],
+              [-94.156909, 74.592347],
+              [-95.608681, 74.666864],
+              [-96.820932, 74.927623],
+              [-96.288587, 75.377828],
+              [-94.85082, 75.647218],
+              [-93.977747, 75.29649],
+              [-93.612756, 74.979997]
+            ]
+          ],
+          [
+            [
+              [-98.5, 76.72],
+              [-97.735585, 76.25656],
+              [-97.704415, 75.74344],
+              [-98.16, 75],
+              [-99.80874, 74.89744],
+              [-100.88366, 75.05736],
+              [-100.86292, 75.64075],
+              [-102.50209, 75.5638],
+              [-102.56552, 76.3366],
+              [-101.48973, 76.30537],
+              [-99.98349, 76.64634],
+              [-98.57699, 76.58859],
+              [-98.5, 76.72]
+            ]
+          ],
+          [
+            [
+              [-108.21141, 76.20168],
+              [-107.81943, 75.84552],
+              [-106.92893, 76.01282],
+              [-105.881, 75.9694],
+              [-105.70498, 75.47951],
+              [-106.31347, 75.00527],
+              [-109.7, 74.85],
+              [-112.22307, 74.41696],
+              [-113.74381, 74.39427],
+              [-113.87135, 74.72029],
+              [-111.79421, 75.1625],
+              [-116.31221, 75.04343],
+              [-117.7104, 75.2222],
+              [-116.34602, 76.19903],
+              [-115.40487, 76.47887],
+              [-112.59056, 76.14134],
+              [-110.81422, 75.54919],
+              [-109.0671, 75.47321],
+              [-110.49726, 76.42982],
+              [-109.5811, 76.79417],
+              [-108.54859, 76.67832],
+              [-108.21141, 76.20168]
+            ]
+          ],
+          [
+            [
+              [-94.684086, 77.097878],
+              [-93.573921, 76.776296],
+              [-91.605023, 76.778518],
+              [-90.741846, 76.449597],
+              [-90.969661, 76.074013],
+              [-89.822238, 75.847774],
+              [-89.187083, 75.610166],
+              [-87.838276, 75.566189],
+              [-86.379192, 75.482421],
+              [-84.789625, 75.699204],
+              [-82.753445, 75.784315],
+              [-81.128531, 75.713983],
+              [-80.057511, 75.336849],
+              [-79.833933, 74.923127],
+              [-80.457771, 74.657304],
+              [-81.948843, 74.442459],
+              [-83.228894, 74.564028],
+              [-86.097452, 74.410032],
+              [-88.15035, 74.392307],
+              [-89.764722, 74.515555],
+              [-92.422441, 74.837758],
+              [-92.768285, 75.38682],
+              [-92.889906, 75.882655],
+              [-93.893824, 76.319244],
+              [-95.962457, 76.441381],
+              [-97.121379, 76.751078],
+              [-96.745123, 77.161389],
+              [-94.684086, 77.097878]
+            ]
+          ],
+          [
+            [
+              [-116.198587, 77.645287],
+              [-116.335813, 76.876962],
+              [-117.106051, 76.530032],
+              [-118.040412, 76.481172],
+              [-119.899318, 76.053213],
+              [-121.499995, 75.900019],
+              [-122.854924, 76.116543],
+              [-122.854925, 76.116543],
+              [-121.157535, 76.864508],
+              [-119.103939, 77.51222],
+              [-117.570131, 77.498319],
+              [-116.198587, 77.645287]
+            ]
+          ],
+          [
+            [
+              [-93.840003, 77.519997],
+              [-94.295608, 77.491343],
+              [-96.169654, 77.555111],
+              [-96.436304, 77.834629],
+              [-94.422577, 77.820005],
+              [-93.720656, 77.634331],
+              [-93.840003, 77.519997]
+            ]
+          ],
+          [
+            [
+              [-110.186938, 77.697015],
+              [-112.051191, 77.409229],
+              [-113.534279, 77.732207],
+              [-112.724587, 78.05105],
+              [-111.264443, 78.152956],
+              [-109.854452, 77.996325],
+              [-110.186938, 77.697015]
+            ]
+          ],
+          [
+            [
+              [-109.663146, 78.601973],
+              [-110.881314, 78.40692],
+              [-112.542091, 78.407902],
+              [-112.525891, 78.550555],
+              [-111.50001, 78.849994],
+              [-110.963661, 78.804441],
+              [-109.663146, 78.601973]
+            ]
+          ],
+          [
+            [
+              [-95.830295, 78.056941],
+              [-97.309843, 77.850597],
+              [-98.124289, 78.082857],
+              [-98.552868, 78.458105],
+              [-98.631984, 78.87193],
+              [-97.337231, 78.831984],
+              [-96.754399, 78.765813],
+              [-95.559278, 78.418315],
+              [-95.830295, 78.056941]
+            ]
+          ],
+          [
+            [
+              [-100.060192, 78.324754],
+              [-99.670939, 77.907545],
+              [-101.30394, 78.018985],
+              [-102.949809, 78.343229],
+              [-105.176133, 78.380332],
+              [-104.210429, 78.67742],
+              [-105.41958, 78.918336],
+              [-105.492289, 79.301594],
+              [-103.529282, 79.165349],
+              [-100.825158, 78.800462],
+              [-100.060192, 78.324754]
+            ]
+          ],
+          [
+            [
+              [-87.02, 79.66],
+              [-85.81435, 79.3369],
+              [-87.18756, 79.0393],
+              [-89.03535, 78.28723],
+              [-90.80436, 78.21533],
+              [-92.87669, 78.34333],
+              [-93.95116, 78.75099],
+              [-93.93574, 79.11373],
+              [-93.14524, 79.3801],
+              [-94.974, 79.37248],
+              [-96.07614, 79.70502],
+              [-96.70972, 80.15777],
+              [-96.01644, 80.60233],
+              [-95.32345, 80.90729],
+              [-94.29843, 80.97727],
+              [-94.73542, 81.20646],
+              [-92.40984, 81.25739],
+              [-91.13289, 80.72345],
+              [-89.45, 80.509322],
+              [-87.81, 80.32],
+              [-87.02, 79.66]
+            ]
+          ],
+          [
+            [
+              [-68.5, 83.106322],
+              [-65.82735, 83.02801],
+              [-63.68, 82.9],
+              [-61.85, 82.6286],
+              [-61.89388, 82.36165],
+              [-64.334, 81.92775],
+              [-66.75342, 81.72527],
+              [-67.65755, 81.50141],
+              [-65.48031, 81.50657],
+              [-67.84, 80.9],
+              [-69.4697, 80.61683],
+              [-71.18, 79.8],
+              [-73.2428, 79.63415],
+              [-73.88, 79.430162],
+              [-76.90773, 79.32309],
+              [-75.52924, 79.19766],
+              [-76.22046, 79.01907],
+              [-75.39345, 78.52581],
+              [-76.34354, 78.18296],
+              [-77.88851, 77.89991],
+              [-78.36269, 77.50859],
+              [-79.75951, 77.20968],
+              [-79.61965, 76.98336],
+              [-77.91089, 77.022045],
+              [-77.88911, 76.777955],
+              [-80.56125, 76.17812],
+              [-83.17439, 76.45403],
+              [-86.11184, 76.29901],
+              [-87.6, 76.42],
+              [-89.49068, 76.47239],
+              [-89.6161, 76.95213],
+              [-87.76739, 77.17833],
+              [-88.26, 77.9],
+              [-87.65, 77.970222],
+              [-84.97634, 77.53873],
+              [-86.34, 78.18],
+              [-87.96192, 78.37181],
+              [-87.15198, 78.75867],
+              [-85.37868, 78.9969],
+              [-85.09495, 79.34543],
+              [-86.50734, 79.73624],
+              [-86.93179, 80.25145],
+              [-84.19844, 80.20836],
+              [-83.408696, 80.1],
+              [-81.84823, 80.46442],
+              [-84.1, 80.58],
+              [-87.59895, 80.51627],
+              [-89.36663, 80.85569],
+              [-90.2, 81.26],
+              [-91.36786, 81.5531],
+              [-91.58702, 81.89429],
+              [-90.1, 82.085],
+              [-88.93227, 82.11751],
+              [-86.97024, 82.27961],
+              [-85.5, 82.652273],
+              [-84.260005, 82.6],
+              [-83.18, 82.32],
+              [-82.42, 82.86],
+              [-81.1, 83.02],
+              [-79.30664, 83.13056],
+              [-76.25, 83.172059],
+              [-75.71878, 83.06404],
+              [-72.83153, 83.23324],
+              [-70.665765, 83.169781],
+              [-68.5, 83.106322]
+            ]
+          ]
+        ]
+      },
+      "id": "CAN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Switzerland" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [9.594226, 47.525058],
+            [9.632932, 47.347601],
+            [9.47997, 47.10281],
+            [9.932448, 46.920728],
+            [10.442701, 46.893546],
+            [10.363378, 46.483571],
+            [9.922837, 46.314899],
+            [9.182882, 46.440215],
+            [8.966306, 46.036932],
+            [8.489952, 46.005151],
+            [8.31663, 46.163642],
+            [7.755992, 45.82449],
+            [7.273851, 45.776948],
+            [6.843593, 45.991147],
+            [6.5001, 46.429673],
+            [6.022609, 46.27299],
+            [6.037389, 46.725779],
+            [6.768714, 47.287708],
+            [6.736571, 47.541801],
+            [7.192202, 47.449766],
+            [7.466759, 47.620582],
+            [8.317301, 47.61358],
+            [8.522612, 47.830828],
+            [9.594226, 47.525058]
+          ]
+        ]
+      },
+      "id": "CHE"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Chile" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [-68.63401, -52.63637],
+              [-68.63335, -54.8695],
+              [-67.56244, -54.87001],
+              [-66.95992, -54.89681],
+              [-67.29103, -55.30124],
+              [-68.14863, -55.61183],
+              [-68.639991, -55.580018],
+              [-69.2321, -55.49906],
+              [-69.95809, -55.19843],
+              [-71.00568, -55.05383],
+              [-72.2639, -54.49514],
+              [-73.2852, -53.95752],
+              [-74.66253, -52.83749],
+              [-73.8381, -53.04743],
+              [-72.43418, -53.7154],
+              [-71.10773, -54.07433],
+              [-70.59178, -53.61583],
+              [-70.26748, -52.93123],
+              [-69.34565, -52.5183],
+              [-68.63401, -52.63637]
+            ]
+          ],
+          [
+            [
+              [-68.219913, -21.494347],
+              [-67.82818, -22.872919],
+              [-67.106674, -22.735925],
+              [-66.985234, -22.986349],
+              [-67.328443, -24.025303],
+              [-68.417653, -24.518555],
+              [-68.386001, -26.185016],
+              [-68.5948, -26.506909],
+              [-68.295542, -26.89934],
+              [-69.001235, -27.521214],
+              [-69.65613, -28.459141],
+              [-70.01355, -29.367923],
+              [-69.919008, -30.336339],
+              [-70.535069, -31.36501],
+              [-70.074399, -33.09121],
+              [-69.814777, -33.273886],
+              [-69.817309, -34.193571],
+              [-70.388049, -35.169688],
+              [-70.364769, -36.005089],
+              [-71.121881, -36.658124],
+              [-71.118625, -37.576827],
+              [-70.814664, -38.552995],
+              [-71.413517, -38.916022],
+              [-71.680761, -39.808164],
+              [-71.915734, -40.832339],
+              [-71.746804, -42.051386],
+              [-72.148898, -42.254888],
+              [-71.915424, -43.408565],
+              [-71.464056, -43.787611],
+              [-71.793623, -44.207172],
+              [-71.329801, -44.407522],
+              [-71.222779, -44.784243],
+              [-71.659316, -44.973689],
+              [-71.552009, -45.560733],
+              [-71.917258, -46.884838],
+              [-72.447355, -47.738533],
+              [-72.331161, -48.244238],
+              [-72.648247, -48.878618],
+              [-73.415436, -49.318436],
+              [-73.328051, -50.378785],
+              [-72.975747, -50.74145],
+              [-72.309974, -50.67701],
+              [-72.329404, -51.425956],
+              [-71.914804, -52.009022],
+              [-69.498362, -52.142761],
+              [-68.571545, -52.299444],
+              [-69.461284, -52.291951],
+              [-69.94278, -52.537931],
+              [-70.845102, -52.899201],
+              [-71.006332, -53.833252],
+              [-71.429795, -53.856455],
+              [-72.557943, -53.53141],
+              [-73.702757, -52.835069],
+              [-73.702757, -52.83507],
+              [-74.946763, -52.262754],
+              [-75.260026, -51.629355],
+              [-74.976632, -51.043396],
+              [-75.479754, -50.378372],
+              [-75.608015, -48.673773],
+              [-75.18277, -47.711919],
+              [-74.126581, -46.939253],
+              [-75.644395, -46.647643],
+              [-74.692154, -45.763976],
+              [-74.351709, -44.103044],
+              [-73.240356, -44.454961],
+              [-72.717804, -42.383356],
+              [-73.3889, -42.117532],
+              [-73.701336, -43.365776],
+              [-74.331943, -43.224958],
+              [-74.017957, -41.794813],
+              [-73.677099, -39.942213],
+              [-73.217593, -39.258689],
+              [-73.505559, -38.282883],
+              [-73.588061, -37.156285],
+              [-73.166717, -37.12378],
+              [-72.553137, -35.50884],
+              [-71.861732, -33.909093],
+              [-71.43845, -32.418899],
+              [-71.668721, -30.920645],
+              [-71.370083, -30.095682],
+              [-71.489894, -28.861442],
+              [-70.905124, -27.64038],
+              [-70.724954, -25.705924],
+              [-70.403966, -23.628997],
+              [-70.091246, -21.393319],
+              [-70.16442, -19.756468],
+              [-70.372572, -18.347975],
+              [-69.858444, -18.092694],
+              [-69.590424, -17.580012],
+              [-69.100247, -18.260125],
+              [-68.966818, -18.981683],
+              [-68.442225, -19.405068],
+              [-68.757167, -20.372658],
+              [-68.219913, -21.494347]
+            ]
+          ]
+        ]
+      },
+      "id": "CHL"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "China" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [110.339188, 18.678395],
+              [109.47521, 18.197701],
+              [108.655208, 18.507682],
+              [108.626217, 19.367888],
+              [109.119056, 19.821039],
+              [110.211599, 20.101254],
+              [110.786551, 20.077534],
+              [111.010051, 19.69593],
+              [110.570647, 19.255879],
+              [110.339188, 18.678395]
+            ]
+          ],
+          [
+            [
+              [127.657407, 49.76027],
+              [129.397818, 49.4406],
+              [130.582293, 48.729687],
+              [130.987282, 47.790132],
+              [132.506672, 47.78897],
+              [133.373596, 48.183442],
+              [135.026311, 48.47823],
+              [134.500814, 47.57844],
+              [134.112362, 47.212467],
+              [133.769644, 46.116927],
+              [133.097127, 45.144066],
+              [131.883454, 45.321162],
+              [131.025212, 44.967953],
+              [131.288555, 44.11152],
+              [131.144688, 42.92999],
+              [130.633866, 42.903015],
+              [130.640016, 42.395009],
+              [129.994267, 42.985387],
+              [129.596669, 42.424982],
+              [128.052215, 41.994285],
+              [128.208433, 41.466772],
+              [127.343783, 41.503152],
+              [126.869083, 41.816569],
+              [126.182045, 41.107336],
+              [125.079942, 40.569824],
+              [124.265625, 39.928493],
+              [122.86757, 39.637788],
+              [122.131388, 39.170452],
+              [121.054554, 38.897471],
+              [121.585995, 39.360854],
+              [121.376757, 39.750261],
+              [122.168595, 40.422443],
+              [121.640359, 40.94639],
+              [120.768629, 40.593388],
+              [119.639602, 39.898056],
+              [119.023464, 39.252333],
+              [118.042749, 39.204274],
+              [117.532702, 38.737636],
+              [118.059699, 38.061476],
+              [118.87815, 37.897325],
+              [118.911636, 37.448464],
+              [119.702802, 37.156389],
+              [120.823457, 37.870428],
+              [121.711259, 37.481123],
+              [122.357937, 37.454484],
+              [122.519995, 36.930614],
+              [121.104164, 36.651329],
+              [120.637009, 36.11144],
+              [119.664562, 35.609791],
+              [119.151208, 34.909859],
+              [120.227525, 34.360332],
+              [120.620369, 33.376723],
+              [121.229014, 32.460319],
+              [121.908146, 31.692174],
+              [121.891919, 30.949352],
+              [121.264257, 30.676267],
+              [121.503519, 30.142915],
+              [122.092114, 29.83252],
+              [121.938428, 29.018022],
+              [121.684439, 28.225513],
+              [121.125661, 28.135673],
+              [120.395473, 27.053207],
+              [119.585497, 25.740781],
+              [118.656871, 24.547391],
+              [117.281606, 23.624501],
+              [115.890735, 22.782873],
+              [114.763827, 22.668074],
+              [114.152547, 22.22376],
+              [113.80678, 22.54834],
+              [113.241078, 22.051367],
+              [111.843592, 21.550494],
+              [110.785466, 21.397144],
+              [110.444039, 20.341033],
+              [109.889861, 20.282457],
+              [109.627655, 21.008227],
+              [109.864488, 21.395051],
+              [108.522813, 21.715212],
+              [108.05018, 21.55238],
+              [107.04342, 21.811899],
+              [106.567273, 22.218205],
+              [106.725403, 22.794268],
+              [105.811247, 22.976892],
+              [105.329209, 23.352063],
+              [104.476858, 22.81915],
+              [103.504515, 22.703757],
+              [102.706992, 22.708795],
+              [102.170436, 22.464753],
+              [101.652018, 22.318199],
+              [101.80312, 21.174367],
+              [101.270026, 21.201652],
+              [101.180005, 21.436573],
+              [101.150033, 21.849984],
+              [100.416538, 21.558839],
+              [99.983489, 21.742937],
+              [99.240899, 22.118314],
+              [99.531992, 22.949039],
+              [98.898749, 23.142722],
+              [98.660262, 24.063286],
+              [97.60472, 23.897405],
+              [97.724609, 25.083637],
+              [98.671838, 25.918703],
+              [98.712094, 26.743536],
+              [98.68269, 27.508812],
+              [98.246231, 27.747221],
+              [97.911988, 28.335945],
+              [97.327114, 28.261583],
+              [96.248833, 28.411031],
+              [96.586591, 28.83098],
+              [96.117679, 29.452802],
+              [95.404802, 29.031717],
+              [94.56599, 29.277438],
+              [93.413348, 28.640629],
+              [92.503119, 27.896876],
+              [91.696657, 27.771742],
+              [91.258854, 28.040614],
+              [90.730514, 28.064954],
+              [90.015829, 28.296439],
+              [89.47581, 28.042759],
+              [88.814248, 27.299316],
+              [88.730326, 28.086865],
+              [88.120441, 27.876542],
+              [86.954517, 27.974262],
+              [85.82332, 28.203576],
+              [85.011638, 28.642774],
+              [84.23458, 28.839894],
+              [83.898993, 29.320226],
+              [83.337115, 29.463732],
+              [82.327513, 30.115268],
+              [81.525804, 30.422717],
+              [81.111256, 30.183481],
+              [79.721367, 30.882715],
+              [78.738894, 31.515906],
+              [78.458446, 32.618164],
+              [79.176129, 32.48378],
+              [79.208892, 32.994395],
+              [78.811086, 33.506198],
+              [78.912269, 34.321936],
+              [77.837451, 35.49401],
+              [76.192848, 35.898403],
+              [75.896897, 36.666806],
+              [75.158028, 37.133031],
+              [74.980002, 37.41999],
+              [74.829986, 37.990007],
+              [74.864816, 38.378846],
+              [74.257514, 38.606507],
+              [73.928852, 38.505815],
+              [73.675379, 39.431237],
+              [73.960013, 39.660008],
+              [73.822244, 39.893973],
+              [74.776862, 40.366425],
+              [75.467828, 40.562072],
+              [76.526368, 40.427946],
+              [76.904484, 41.066486],
+              [78.187197, 41.185316],
+              [78.543661, 41.582243],
+              [80.11943, 42.123941],
+              [80.25999, 42.349999],
+              [80.18015, 42.920068],
+              [80.866206, 43.180362],
+              [79.966106, 44.917517],
+              [81.947071, 45.317027],
+              [82.458926, 45.53965],
+              [83.180484, 47.330031],
+              [85.16429, 47.000956],
+              [85.720484, 47.452969],
+              [85.768233, 48.455751],
+              [86.598776, 48.549182],
+              [87.35997, 49.214981],
+              [87.751264, 49.297198],
+              [88.013832, 48.599463],
+              [88.854298, 48.069082],
+              [90.280826, 47.693549],
+              [90.970809, 46.888146],
+              [90.585768, 45.719716],
+              [90.94554, 45.286073],
+              [92.133891, 45.115076],
+              [93.480734, 44.975472],
+              [94.688929, 44.352332],
+              [95.306875, 44.241331],
+              [95.762455, 43.319449],
+              [96.349396, 42.725635],
+              [97.451757, 42.74889],
+              [99.515817, 42.524691],
+              [100.845866, 42.663804],
+              [101.83304, 42.514873],
+              [103.312278, 41.907468],
+              [104.522282, 41.908347],
+              [104.964994, 41.59741],
+              [106.129316, 42.134328],
+              [107.744773, 42.481516],
+              [109.243596, 42.519446],
+              [110.412103, 42.871234],
+              [111.129682, 43.406834],
+              [111.829588, 43.743118],
+              [111.667737, 44.073176],
+              [111.348377, 44.457442],
+              [111.873306, 45.102079],
+              [112.436062, 45.011646],
+              [113.463907, 44.808893],
+              [114.460332, 45.339817],
+              [115.985096, 45.727235],
+              [116.717868, 46.388202],
+              [117.421701, 46.672733],
+              [118.874326, 46.805412],
+              [119.66327, 46.69268],
+              [119.772824, 47.048059],
+              [118.866574, 47.74706],
+              [118.064143, 48.06673],
+              [117.295507, 47.697709],
+              [116.308953, 47.85341],
+              [115.742837, 47.726545],
+              [115.485282, 48.135383],
+              [116.191802, 49.134598],
+              [116.678801, 49.888531],
+              [117.879244, 49.510983],
+              [119.288461, 50.142883],
+              [119.279366, 50.582908],
+              [120.18205, 51.643566],
+              [120.738191, 51.964115],
+              [120.725789, 52.516226],
+              [120.177089, 52.753886],
+              [121.003085, 53.251401],
+              [122.245748, 53.431726],
+              [123.571507, 53.458804],
+              [125.068211, 53.161045],
+              [125.946349, 52.792799],
+              [126.564399, 51.784255],
+              [126.939157, 51.353894],
+              [127.287456, 50.739797],
+              [127.657407, 49.76027]
+            ]
+          ]
+        ]
+      },
+      "id": "CHN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Ivory Coast" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-2.856125, 4.994476],
+            [-3.311084, 4.984296],
+            [-4.00882, 5.179813],
+            [-4.649917, 5.168264],
+            [-5.834496, 4.993701],
+            [-6.528769, 4.705088],
+            [-7.518941, 4.338288],
+            [-7.712159, 4.364566],
+            [-7.635368, 5.188159],
+            [-7.539715, 5.313345],
+            [-7.570153, 5.707352],
+            [-7.993693, 6.12619],
+            [-8.311348, 6.193033],
+            [-8.60288, 6.467564],
+            [-8.385452, 6.911801],
+            [-8.485446, 7.395208],
+            [-8.439298, 7.686043],
+            [-8.280703, 7.68718],
+            [-8.221792, 8.123329],
+            [-8.299049, 8.316444],
+            [-8.203499, 8.455453],
+            [-7.8321, 8.575704],
+            [-8.079114, 9.376224],
+            [-8.309616, 9.789532],
+            [-8.229337, 10.12902],
+            [-8.029944, 10.206535],
+            [-7.89959, 10.297382],
+            [-7.622759, 10.147236],
+            [-6.850507, 10.138994],
+            [-6.666461, 10.430811],
+            [-6.493965, 10.411303],
+            [-6.205223, 10.524061],
+            [-6.050452, 10.096361],
+            [-5.816926, 10.222555],
+            [-5.404342, 10.370737],
+            [-4.954653, 10.152714],
+            [-4.779884, 9.821985],
+            [-4.330247, 9.610835],
+            [-3.980449, 9.862344],
+            [-3.511899, 9.900326],
+            [-2.827496, 9.642461],
+            [-2.56219, 8.219628],
+            [-2.983585, 7.379705],
+            [-3.24437, 6.250472],
+            [-2.810701, 5.389051],
+            [-2.856125, 4.994476]
+          ]
+        ]
+      },
+      "id": "CIV"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Cameroon" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [13.075822, 2.267097],
+            [12.951334, 2.321616],
+            [12.35938, 2.192812],
+            [11.751665, 2.326758],
+            [11.276449, 2.261051],
+            [9.649158, 2.283866],
+            [9.795196, 3.073404],
+            [9.404367, 3.734527],
+            [8.948116, 3.904129],
+            [8.744924, 4.352215],
+            [8.488816, 4.495617],
+            [8.500288, 4.771983],
+            [8.757533, 5.479666],
+            [9.233163, 6.444491],
+            [9.522706, 6.453482],
+            [10.118277, 7.03877],
+            [10.497375, 7.055358],
+            [11.058788, 6.644427],
+            [11.745774, 6.981383],
+            [11.839309, 7.397042],
+            [12.063946, 7.799808],
+            [12.218872, 8.305824],
+            [12.753672, 8.717763],
+            [12.955468, 9.417772],
+            [13.1676, 9.640626],
+            [13.308676, 10.160362],
+            [13.57295, 10.798566],
+            [14.415379, 11.572369],
+            [14.468192, 11.904752],
+            [14.577178, 12.085361],
+            [14.181336, 12.483657],
+            [14.213531, 12.802035],
+            [14.495787, 12.859396],
+            [14.893386, 12.219048],
+            [14.960152, 11.555574],
+            [14.923565, 10.891325],
+            [15.467873, 9.982337],
+            [14.909354, 9.992129],
+            [14.627201, 9.920919],
+            [14.171466, 10.021378],
+            [13.954218, 9.549495],
+            [14.544467, 8.965861],
+            [14.979996, 8.796104],
+            [15.120866, 8.38215],
+            [15.436092, 7.692812],
+            [15.27946, 7.421925],
+            [14.776545, 6.408498],
+            [14.53656, 6.226959],
+            [14.459407, 5.451761],
+            [14.558936, 5.030598],
+            [14.478372, 4.732605],
+            [14.950953, 4.210389],
+            [15.03622, 3.851367],
+            [15.405396, 3.335301],
+            [15.862732, 3.013537],
+            [15.907381, 2.557389],
+            [16.012852, 2.26764],
+            [15.940919, 1.727673],
+            [15.146342, 1.964015],
+            [14.337813, 2.227875],
+            [13.075822, 2.267097]
+          ]
+        ]
+      },
+      "id": "CMR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Democratic Republic of the Congo" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [30.83386, 3.509166],
+            [30.773347, 2.339883],
+            [31.174149, 2.204465],
+            [30.85267, 1.849396],
+            [30.468508, 1.583805],
+            [30.086154, 1.062313],
+            [29.875779, 0.59738],
+            [29.819503, -0.20531],
+            [29.587838, -0.587406],
+            [29.579466, -1.341313],
+            [29.291887, -1.620056],
+            [29.254835, -2.21511],
+            [29.117479, -2.292211],
+            [29.024926, -2.839258],
+            [29.276384, -3.293907],
+            [29.339998, -4.499983],
+            [29.519987, -5.419979],
+            [29.419993, -5.939999],
+            [29.620032, -6.520015],
+            [30.199997, -7.079981],
+            [30.740015, -8.340007],
+            [30.346086, -8.238257],
+            [29.002912, -8.407032],
+            [28.734867, -8.526559],
+            [28.449871, -9.164918],
+            [28.673682, -9.605925],
+            [28.49607, -10.789884],
+            [28.372253, -11.793647],
+            [28.642417, -11.971569],
+            [29.341548, -12.360744],
+            [29.616001, -12.178895],
+            [29.699614, -13.257227],
+            [28.934286, -13.248958],
+            [28.523562, -12.698604],
+            [28.155109, -12.272481],
+            [27.388799, -12.132747],
+            [27.16442, -11.608748],
+            [26.553088, -11.92444],
+            [25.75231, -11.784965],
+            [25.418118, -11.330936],
+            [24.78317, -11.238694],
+            [24.314516, -11.262826],
+            [24.257155, -10.951993],
+            [23.912215, -10.926826],
+            [23.456791, -10.867863],
+            [22.837345, -11.017622],
+            [22.402798, -10.993075],
+            [22.155268, -11.084801],
+            [22.208753, -9.894796],
+            [21.875182, -9.523708],
+            [21.801801, -8.908707],
+            [21.949131, -8.305901],
+            [21.746456, -7.920085],
+            [21.728111, -7.290872],
+            [20.514748, -7.299606],
+            [20.601823, -6.939318],
+            [20.091622, -6.94309],
+            [20.037723, -7.116361],
+            [19.417502, -7.155429],
+            [19.166613, -7.738184],
+            [19.016752, -7.988246],
+            [18.464176, -7.847014],
+            [18.134222, -7.987678],
+            [17.47297, -8.068551],
+            [17.089996, -7.545689],
+            [16.860191, -7.222298],
+            [16.57318, -6.622645],
+            [16.326528, -5.87747],
+            [13.375597, -5.864241],
+            [13.024869, -5.984389],
+            [12.735171, -5.965682],
+            [12.322432, -6.100092],
+            [12.182337, -5.789931],
+            [12.436688, -5.684304],
+            [12.468004, -5.248362],
+            [12.631612, -4.991271],
+            [12.995517, -4.781103],
+            [13.25824, -4.882957],
+            [13.600235, -4.500138],
+            [14.144956, -4.510009],
+            [14.209035, -4.793092],
+            [14.582604, -4.970239],
+            [15.170992, -4.343507],
+            [15.75354, -3.855165],
+            [16.00629, -3.535133],
+            [15.972803, -2.712392],
+            [16.407092, -1.740927],
+            [16.865307, -1.225816],
+            [17.523716, -0.74383],
+            [17.638645, -0.424832],
+            [17.663553, -0.058084],
+            [17.82654, 0.288923],
+            [17.774192, 0.855659],
+            [17.898835, 1.741832],
+            [18.094276, 2.365722],
+            [18.393792, 2.900443],
+            [18.453065, 3.504386],
+            [18.542982, 4.201785],
+            [18.932312, 4.709506],
+            [19.467784, 5.031528],
+            [20.290679, 4.691678],
+            [20.927591, 4.322786],
+            [21.659123, 4.224342],
+            [22.405124, 4.02916],
+            [22.704124, 4.633051],
+            [22.84148, 4.710126],
+            [23.297214, 4.609693],
+            [24.410531, 5.108784],
+            [24.805029, 4.897247],
+            [25.128833, 4.927245],
+            [25.278798, 5.170408],
+            [25.650455, 5.256088],
+            [26.402761, 5.150875],
+            [27.044065, 5.127853],
+            [27.374226, 5.233944],
+            [27.979977, 4.408413],
+            [28.428994, 4.287155],
+            [28.696678, 4.455077],
+            [29.159078, 4.389267],
+            [29.715995, 4.600805],
+            [29.9535, 4.173699],
+            [30.83386, 3.509166]
+          ]
+        ]
+      },
+      "id": "COD"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Republic of the Congo" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [12.995517, -4.781103],
+            [12.62076, -4.438023],
+            [12.318608, -4.60623],
+            [11.914963, -5.037987],
+            [11.093773, -3.978827],
+            [11.855122, -3.426871],
+            [11.478039, -2.765619],
+            [11.820964, -2.514161],
+            [12.495703, -2.391688],
+            [12.575284, -1.948511],
+            [13.109619, -2.42874],
+            [13.992407, -2.470805],
+            [14.29921, -1.998276],
+            [14.425456, -1.333407],
+            [14.316418, -0.552627],
+            [13.843321, 0.038758],
+            [14.276266, 1.19693],
+            [14.026669, 1.395677],
+            [13.282631, 1.314184],
+            [13.003114, 1.830896],
+            [13.075822, 2.267097],
+            [14.337813, 2.227875],
+            [15.146342, 1.964015],
+            [15.940919, 1.727673],
+            [16.012852, 2.26764],
+            [16.537058, 3.198255],
+            [17.133042, 3.728197],
+            [17.8099, 3.560196],
+            [18.453065, 3.504386],
+            [18.393792, 2.900443],
+            [18.094276, 2.365722],
+            [17.898835, 1.741832],
+            [17.774192, 0.855659],
+            [17.82654, 0.288923],
+            [17.663553, -0.058084],
+            [17.638645, -0.424832],
+            [17.523716, -0.74383],
+            [16.865307, -1.225816],
+            [16.407092, -1.740927],
+            [15.972803, -2.712392],
+            [16.00629, -3.535133],
+            [15.75354, -3.855165],
+            [15.170992, -4.343507],
+            [14.582604, -4.970239],
+            [14.209035, -4.793092],
+            [14.144956, -4.510009],
+            [13.600235, -4.500138],
+            [13.25824, -4.882957],
+            [12.995517, -4.781103]
+          ]
+        ]
+      },
+      "id": "COG"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Colombia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-75.373223, -0.152032],
+            [-75.801466, 0.084801],
+            [-76.292314, 0.416047],
+            [-76.57638, 0.256936],
+            [-77.424984, 0.395687],
+            [-77.668613, 0.825893],
+            [-77.855061, 0.809925],
+            [-78.855259, 1.380924],
+            [-78.990935, 1.69137],
+            [-78.617831, 1.766404],
+            [-78.662118, 2.267355],
+            [-78.42761, 2.629556],
+            [-77.931543, 2.696606],
+            [-77.510431, 3.325017],
+            [-77.12769, 3.849636],
+            [-77.496272, 4.087606],
+            [-77.307601, 4.667984],
+            [-77.533221, 5.582812],
+            [-77.318815, 5.845354],
+            [-77.476661, 6.691116],
+            [-77.881571, 7.223771],
+            [-77.753414, 7.70984],
+            [-77.431108, 7.638061],
+            [-77.242566, 7.935278],
+            [-77.474723, 8.524286],
+            [-77.353361, 8.670505],
+            [-76.836674, 8.638749],
+            [-76.086384, 9.336821],
+            [-75.6746, 9.443248],
+            [-75.664704, 9.774003],
+            [-75.480426, 10.61899],
+            [-74.906895, 11.083045],
+            [-74.276753, 11.102036],
+            [-74.197223, 11.310473],
+            [-73.414764, 11.227015],
+            [-72.627835, 11.731972],
+            [-72.238195, 11.95555],
+            [-71.75409, 12.437303],
+            [-71.399822, 12.376041],
+            [-71.137461, 12.112982],
+            [-71.331584, 11.776284],
+            [-71.973922, 11.608672],
+            [-72.227575, 11.108702],
+            [-72.614658, 10.821975],
+            [-72.905286, 10.450344],
+            [-73.027604, 9.73677],
+            [-73.304952, 9.152],
+            [-72.78873, 9.085027],
+            [-72.660495, 8.625288],
+            [-72.439862, 8.405275],
+            [-72.360901, 8.002638],
+            [-72.479679, 7.632506],
+            [-72.444487, 7.423785],
+            [-72.198352, 7.340431],
+            [-71.960176, 6.991615],
+            [-70.674234, 7.087785],
+            [-70.093313, 6.960376],
+            [-69.38948, 6.099861],
+            [-68.985319, 6.206805],
+            [-68.265052, 6.153268],
+            [-67.695087, 6.267318],
+            [-67.34144, 6.095468],
+            [-67.521532, 5.55687],
+            [-67.744697, 5.221129],
+            [-67.823012, 4.503937],
+            [-67.621836, 3.839482],
+            [-67.337564, 3.542342],
+            [-67.303173, 3.318454],
+            [-67.809938, 2.820655],
+            [-67.447092, 2.600281],
+            [-67.181294, 2.250638],
+            [-66.876326, 1.253361],
+            [-67.065048, 1.130112],
+            [-67.259998, 1.719999],
+            [-67.53781, 2.037163],
+            [-67.868565, 1.692455],
+            [-69.816973, 1.714805],
+            [-69.804597, 1.089081],
+            [-69.218638, 0.985677],
+            [-69.252434, 0.602651],
+            [-69.452396, 0.706159],
+            [-70.015566, 0.541414],
+            [-70.020656, -0.185156],
+            [-69.577065, -0.549992],
+            [-69.420486, -1.122619],
+            [-69.444102, -1.556287],
+            [-69.893635, -4.298187],
+            [-70.394044, -3.766591],
+            [-70.692682, -3.742872],
+            [-70.047709, -2.725156],
+            [-70.813476, -2.256865],
+            [-71.413646, -2.342802],
+            [-71.774761, -2.16979],
+            [-72.325787, -2.434218],
+            [-73.070392, -2.308954],
+            [-73.659504, -1.260491],
+            [-74.122395, -1.002833],
+            [-74.441601, -0.53082],
+            [-75.106625, -0.057205],
+            [-75.373223, -0.152032]
+          ]
+        ]
+      },
+      "id": "COL"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Costa Rica" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-82.965783, 8.225028],
+            [-83.508437, 8.446927],
+            [-83.711474, 8.656836],
+            [-83.596313, 8.830443],
+            [-83.632642, 9.051386],
+            [-83.909886, 9.290803],
+            [-84.303402, 9.487354],
+            [-84.647644, 9.615537],
+            [-84.713351, 9.908052],
+            [-84.97566, 10.086723],
+            [-84.911375, 9.795992],
+            [-85.110923, 9.55704],
+            [-85.339488, 9.834542],
+            [-85.660787, 9.933347],
+            [-85.797445, 10.134886],
+            [-85.791709, 10.439337],
+            [-85.659314, 10.754331],
+            [-85.941725, 10.895278],
+            [-85.71254, 11.088445],
+            [-85.561852, 11.217119],
+            [-84.903003, 10.952303],
+            [-84.673069, 11.082657],
+            [-84.355931, 10.999226],
+            [-84.190179, 10.79345],
+            [-83.895054, 10.726839],
+            [-83.655612, 10.938764],
+            [-83.40232, 10.395438],
+            [-83.015677, 9.992982],
+            [-82.546196, 9.566135],
+            [-82.932891, 9.476812],
+            [-82.927155, 9.07433],
+            [-82.719183, 8.925709],
+            [-82.868657, 8.807266],
+            [-82.829771, 8.626295],
+            [-82.913176, 8.423517],
+            [-82.965783, 8.225028]
+          ]
+        ]
+      },
+      "id": "CRI"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Cuba" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-82.268151, 23.188611],
+            [-81.404457, 23.117271],
+            [-80.618769, 23.10598],
+            [-79.679524, 22.765303],
+            [-79.281486, 22.399202],
+            [-78.347434, 22.512166],
+            [-77.993296, 22.277194],
+            [-77.146422, 21.657851],
+            [-76.523825, 21.20682],
+            [-76.19462, 21.220565],
+            [-75.598222, 21.016624],
+            [-75.67106, 20.735091],
+            [-74.933896, 20.693905],
+            [-74.178025, 20.284628],
+            [-74.296648, 20.050379],
+            [-74.961595, 19.923435],
+            [-75.63468, 19.873774],
+            [-76.323656, 19.952891],
+            [-77.755481, 19.855481],
+            [-77.085108, 20.413354],
+            [-77.492655, 20.673105],
+            [-78.137292, 20.739949],
+            [-78.482827, 21.028613],
+            [-78.719867, 21.598114],
+            [-79.285, 21.559175],
+            [-80.217475, 21.827324],
+            [-80.517535, 22.037079],
+            [-81.820943, 22.192057],
+            [-82.169992, 22.387109],
+            [-81.795002, 22.636965],
+            [-82.775898, 22.68815],
+            [-83.494459, 22.168518],
+            [-83.9088, 22.154565],
+            [-84.052151, 21.910575],
+            [-84.54703, 21.801228],
+            [-84.974911, 21.896028],
+            [-84.447062, 22.20495],
+            [-84.230357, 22.565755],
+            [-83.77824, 22.788118],
+            [-83.267548, 22.983042],
+            [-82.510436, 23.078747],
+            [-82.268151, 23.188611]
+          ]
+        ]
+      },
+      "id": "CUB"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Cyprus" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [33.973617, 35.058506],
+            [34.004881, 34.978098],
+            [32.979827, 34.571869],
+            [32.490296, 34.701655],
+            [32.256667, 35.103232],
+            [32.73178, 35.140026],
+            [32.919572, 35.087833],
+            [33.190977, 35.173125],
+            [33.383833, 35.162712],
+            [33.455922, 35.101424],
+            [33.475817, 35.000345],
+            [33.525685, 35.038688],
+            [33.675392, 35.017863],
+            [33.86644, 35.093595],
+            [33.973617, 35.058506]
+          ]
+        ]
+      },
+      "id": "CYP"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Czech Republic" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [16.960288, 48.596982],
+            [16.499283, 48.785808],
+            [16.029647, 48.733899],
+            [15.253416, 49.039074],
+            [14.901447, 48.964402],
+            [14.338898, 48.555305],
+            [13.595946, 48.877172],
+            [13.031329, 49.307068],
+            [12.521024, 49.547415],
+            [12.415191, 49.969121],
+            [12.240111, 50.266338],
+            [12.966837, 50.484076],
+            [13.338132, 50.733234],
+            [14.056228, 50.926918],
+            [14.307013, 51.117268],
+            [14.570718, 51.002339],
+            [15.016996, 51.106674],
+            [15.490972, 50.78473],
+            [16.238627, 50.697733],
+            [16.176253, 50.422607],
+            [16.719476, 50.215747],
+            [16.868769, 50.473974],
+            [17.554567, 50.362146],
+            [17.649445, 50.049038],
+            [18.392914, 49.988629],
+            [18.853144, 49.49623],
+            [18.554971, 49.495015],
+            [18.399994, 49.315001],
+            [18.170498, 49.271515],
+            [18.104973, 49.043983],
+            [17.913512, 48.996493],
+            [17.886485, 48.903475],
+            [17.545007, 48.800019],
+            [17.101985, 48.816969],
+            [16.960288, 48.596982]
+          ]
+        ]
+      },
+      "id": "CZE"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Germany" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [9.921906, 54.983104],
+            [9.93958, 54.596642],
+            [10.950112, 54.363607],
+            [10.939467, 54.008693],
+            [11.956252, 54.196486],
+            [12.51844, 54.470371],
+            [13.647467, 54.075511],
+            [14.119686, 53.757029],
+            [14.353315, 53.248171],
+            [14.074521, 52.981263],
+            [14.4376, 52.62485],
+            [14.685026, 52.089947],
+            [14.607098, 51.745188],
+            [15.016996, 51.106674],
+            [14.570718, 51.002339],
+            [14.307013, 51.117268],
+            [14.056228, 50.926918],
+            [13.338132, 50.733234],
+            [12.966837, 50.484076],
+            [12.240111, 50.266338],
+            [12.415191, 49.969121],
+            [12.521024, 49.547415],
+            [13.031329, 49.307068],
+            [13.595946, 48.877172],
+            [13.243357, 48.416115],
+            [12.884103, 48.289146],
+            [13.025851, 47.637584],
+            [12.932627, 47.467646],
+            [12.62076, 47.672388],
+            [12.141357, 47.703083],
+            [11.426414, 47.523766],
+            [10.544504, 47.566399],
+            [10.402084, 47.302488],
+            [9.896068, 47.580197],
+            [9.594226, 47.525058],
+            [8.522612, 47.830828],
+            [8.317301, 47.61358],
+            [7.466759, 47.620582],
+            [7.593676, 48.333019],
+            [8.099279, 49.017784],
+            [6.65823, 49.201958],
+            [6.18632, 49.463803],
+            [6.242751, 49.902226],
+            [6.043073, 50.128052],
+            [6.156658, 50.803721],
+            [5.988658, 51.851616],
+            [6.589397, 51.852029],
+            [6.84287, 52.22844],
+            [7.092053, 53.144043],
+            [6.90514, 53.482162],
+            [7.100425, 53.693932],
+            [7.936239, 53.748296],
+            [8.121706, 53.527792],
+            [8.800734, 54.020786],
+            [8.572118, 54.395646],
+            [8.526229, 54.962744],
+            [9.282049, 54.830865],
+            [9.921906, 54.983104]
+          ]
+        ]
+      },
+      "id": "DEU"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Djibouti" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [43.081226, 12.699639],
+            [43.317852, 12.390148],
+            [43.286381, 11.974928],
+            [42.715874, 11.735641],
+            [43.145305, 11.46204],
+            [42.776852, 10.926879],
+            [42.55493, 11.10511],
+            [42.31414, 11.0342],
+            [41.75557, 11.05091],
+            [41.73959, 11.35511],
+            [41.66176, 11.6312],
+            [42, 12.1],
+            [42.35156, 12.54223],
+            [42.779642, 12.455416],
+            [43.081226, 12.699639]
+          ]
+        ]
+      },
+      "id": "DJI"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Denmark" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [12.690006, 55.609991],
+              [12.089991, 54.800015],
+              [11.043543, 55.364864],
+              [10.903914, 55.779955],
+              [12.370904, 56.111407],
+              [12.690006, 55.609991]
+            ]
+          ],
+          [
+            [
+              [10.912182, 56.458621],
+              [10.667804, 56.081383],
+              [10.369993, 56.190007],
+              [9.649985, 55.469999],
+              [9.921906, 54.983104],
+              [9.282049, 54.830865],
+              [8.526229, 54.962744],
+              [8.120311, 55.517723],
+              [8.089977, 56.540012],
+              [8.256582, 56.809969],
+              [8.543438, 57.110003],
+              [9.424469, 57.172066],
+              [9.775559, 57.447941],
+              [10.580006, 57.730017],
+              [10.546106, 57.215733],
+              [10.25, 56.890016],
+              [10.369993, 56.609982],
+              [10.912182, 56.458621]
+            ]
+          ]
+        ]
+      },
+      "id": "DNK"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Dominican Republic" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-71.712361, 19.714456],
+            [-71.587304, 19.884911],
+            [-70.806706, 19.880286],
+            [-70.214365, 19.622885],
+            [-69.950815, 19.648],
+            [-69.76925, 19.293267],
+            [-69.222126, 19.313214],
+            [-69.254346, 19.015196],
+            [-68.809412, 18.979074],
+            [-68.317943, 18.612198],
+            [-68.689316, 18.205142],
+            [-69.164946, 18.422648],
+            [-69.623988, 18.380713],
+            [-69.952934, 18.428307],
+            [-70.133233, 18.245915],
+            [-70.517137, 18.184291],
+            [-70.669298, 18.426886],
+            [-70.99995, 18.283329],
+            [-71.40021, 17.598564],
+            [-71.657662, 17.757573],
+            [-71.708305, 18.044997],
+            [-71.687738, 18.31666],
+            [-71.945112, 18.6169],
+            [-71.701303, 18.785417],
+            [-71.624873, 19.169838],
+            [-71.712361, 19.714456]
+          ]
+        ]
+      },
+      "id": "DOM"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Algeria" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [11.999506, 23.471668],
+            [8.572893, 21.565661],
+            [5.677566, 19.601207],
+            [4.267419, 19.155265],
+            [3.158133, 19.057364],
+            [3.146661, 19.693579],
+            [2.683588, 19.85623],
+            [2.060991, 20.142233],
+            [1.823228, 20.610809],
+            [-1.550055, 22.792666],
+            [-4.923337, 24.974574],
+            [-8.6844, 27.395744],
+            [-8.665124, 27.589479],
+            [-8.66559, 27.656426],
+            [-8.674116, 28.841289],
+            [-7.059228, 29.579228],
+            [-6.060632, 29.7317],
+            [-5.242129, 30.000443],
+            [-4.859646, 30.501188],
+            [-3.690441, 30.896952],
+            [-3.647498, 31.637294],
+            [-3.06898, 31.724498],
+            [-2.616605, 32.094346],
+            [-1.307899, 32.262889],
+            [-1.124551, 32.651522],
+            [-1.388049, 32.864015],
+            [-1.733455, 33.919713],
+            [-1.792986, 34.527919],
+            [-2.169914, 35.168396],
+            [-1.208603, 35.714849],
+            [-0.127454, 35.888662],
+            [0.503877, 36.301273],
+            [1.466919, 36.605647],
+            [3.161699, 36.783905],
+            [4.815758, 36.865037],
+            [5.32012, 36.716519],
+            [6.26182, 37.110655],
+            [7.330385, 37.118381],
+            [7.737078, 36.885708],
+            [8.420964, 36.946427],
+            [8.217824, 36.433177],
+            [8.376368, 35.479876],
+            [8.140981, 34.655146],
+            [7.524482, 34.097376],
+            [7.612642, 33.344115],
+            [8.430473, 32.748337],
+            [8.439103, 32.506285],
+            [9.055603, 32.102692],
+            [9.48214, 30.307556],
+            [9.805634, 29.424638],
+            [9.859998, 28.95999],
+            [9.683885, 28.144174],
+            [9.756128, 27.688259],
+            [9.629056, 27.140953],
+            [9.716286, 26.512206],
+            [9.319411, 26.094325],
+            [9.910693, 25.365455],
+            [9.948261, 24.936954],
+            [10.303847, 24.379313],
+            [10.771364, 24.562532],
+            [11.560669, 24.097909],
+            [11.999506, 23.471668]
+          ]
+        ]
+      },
+      "id": "DZA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Ecuador" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-80.302561, -3.404856],
+            [-79.770293, -2.657512],
+            [-79.986559, -2.220794],
+            [-80.368784, -2.685159],
+            [-80.967765, -2.246943],
+            [-80.764806, -1.965048],
+            [-80.933659, -1.057455],
+            [-80.58337, -0.906663],
+            [-80.399325, -0.283703],
+            [-80.020898, 0.36034],
+            [-80.09061, 0.768429],
+            [-79.542762, 0.982938],
+            [-78.855259, 1.380924],
+            [-77.855061, 0.809925],
+            [-77.668613, 0.825893],
+            [-77.424984, 0.395687],
+            [-76.57638, 0.256936],
+            [-76.292314, 0.416047],
+            [-75.801466, 0.084801],
+            [-75.373223, -0.152032],
+            [-75.233723, -0.911417],
+            [-75.544996, -1.56161],
+            [-76.635394, -2.608678],
+            [-77.837905, -3.003021],
+            [-78.450684, -3.873097],
+            [-78.639897, -4.547784],
+            [-79.205289, -4.959129],
+            [-79.624979, -4.454198],
+            [-80.028908, -4.346091],
+            [-80.442242, -4.425724],
+            [-80.469295, -4.059287],
+            [-80.184015, -3.821162],
+            [-80.302561, -3.404856]
+          ]
+        ]
+      },
+      "id": "ECU"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Egypt" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [34.9226, 29.50133],
+            [34.64174, 29.09942],
+            [34.42655, 28.34399],
+            [34.15451, 27.8233],
+            [33.92136, 27.6487],
+            [33.58811, 27.97136],
+            [33.13676, 28.41765],
+            [32.42323, 29.85108],
+            [32.32046, 29.76043],
+            [32.73482, 28.70523],
+            [33.34876, 27.69989],
+            [34.10455, 26.14227],
+            [34.47387, 25.59856],
+            [34.79507, 25.03375],
+            [35.69241, 23.92671],
+            [35.49372, 23.75237],
+            [35.52598, 23.10244],
+            [36.69069, 22.20485],
+            [36.86623, 22],
+            [32.9, 22],
+            [29.02, 22],
+            [25, 22],
+            [25, 25.6825],
+            [25, 29.238655],
+            [24.70007, 30.04419],
+            [24.95762, 30.6616],
+            [24.80287, 31.08929],
+            [25.16482, 31.56915],
+            [26.49533, 31.58568],
+            [27.45762, 31.32126],
+            [28.45048, 31.02577],
+            [28.91353, 30.87005],
+            [29.68342, 31.18686],
+            [30.09503, 31.4734],
+            [30.97693, 31.55586],
+            [31.68796, 31.4296],
+            [31.96041, 30.9336],
+            [32.19247, 31.26034],
+            [32.99392, 31.02407],
+            [33.7734, 30.96746],
+            [34.26544, 31.21936],
+            [34.9226, 29.50133]
+          ]
+        ]
+      },
+      "id": "EGY"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Eritrea" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [42.35156, 12.54223],
+            [42.00975, 12.86582],
+            [41.59856, 13.45209],
+            [41.155194, 13.77332],
+            [40.8966, 14.11864],
+            [40.026219, 14.519579],
+            [39.34061, 14.53155],
+            [39.0994, 14.74064],
+            [38.51295, 14.50547],
+            [37.90607, 14.95943],
+            [37.59377, 14.2131],
+            [36.42951, 14.42211],
+            [36.323189, 14.822481],
+            [36.75386, 16.291874],
+            [36.85253, 16.95655],
+            [37.16747, 17.26314],
+            [37.904, 17.42754],
+            [38.41009, 17.998307],
+            [38.990623, 16.840626],
+            [39.26611, 15.922723],
+            [39.814294, 15.435647],
+            [41.179275, 14.49108],
+            [41.734952, 13.921037],
+            [42.276831, 13.343992],
+            [42.589576, 13.000421],
+            [43.081226, 12.699639],
+            [42.779642, 12.455416],
+            [42.35156, 12.54223]
+          ]
+        ]
+      },
+      "id": "ERI"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Spain" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-9.034818, 41.880571],
+            [-8.984433, 42.592775],
+            [-9.392884, 43.026625],
+            [-7.97819, 43.748338],
+            [-6.754492, 43.567909],
+            [-5.411886, 43.57424],
+            [-4.347843, 43.403449],
+            [-3.517532, 43.455901],
+            [-1.901351, 43.422802],
+            [-1.502771, 43.034014],
+            [0.338047, 42.579546],
+            [0.701591, 42.795734],
+            [1.826793, 42.343385],
+            [2.985999, 42.473015],
+            [3.039484, 41.89212],
+            [2.091842, 41.226089],
+            [0.810525, 41.014732],
+            [0.721331, 40.678318],
+            [0.106692, 40.123934],
+            [-0.278711, 39.309978],
+            [0.111291, 38.738514],
+            [-0.467124, 38.292366],
+            [-0.683389, 37.642354],
+            [-1.438382, 37.443064],
+            [-2.146453, 36.674144],
+            [-3.415781, 36.6589],
+            [-4.368901, 36.677839],
+            [-4.995219, 36.324708],
+            [-5.37716, 35.94685],
+            [-5.866432, 36.029817],
+            [-6.236694, 36.367677],
+            [-6.520191, 36.942913],
+            [-7.453726, 37.097788],
+            [-7.537105, 37.428904],
+            [-7.166508, 37.803894],
+            [-7.029281, 38.075764],
+            [-7.374092, 38.373059],
+            [-7.098037, 39.030073],
+            [-7.498632, 39.629571],
+            [-7.066592, 39.711892],
+            [-7.026413, 40.184524],
+            [-6.86402, 40.330872],
+            [-6.851127, 41.111083],
+            [-6.389088, 41.381815],
+            [-6.668606, 41.883387],
+            [-7.251309, 41.918346],
+            [-7.422513, 41.792075],
+            [-8.013175, 41.790886],
+            [-8.263857, 42.280469],
+            [-8.671946, 42.134689],
+            [-9.034818, 41.880571]
+          ]
+        ]
+      },
+      "id": "ESP"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Estonia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [24.312863, 57.793424],
+            [24.428928, 58.383413],
+            [24.061198, 58.257375],
+            [23.42656, 58.612753],
+            [23.339795, 59.18724],
+            [24.604214, 59.465854],
+            [25.864189, 59.61109],
+            [26.949136, 59.445803],
+            [27.981114, 59.475388],
+            [28.131699, 59.300825],
+            [27.420166, 58.724581],
+            [27.716686, 57.791899],
+            [27.288185, 57.474528],
+            [26.463532, 57.476389],
+            [25.60281, 57.847529],
+            [25.164594, 57.970157],
+            [24.312863, 57.793424]
+          ]
+        ]
+      },
+      "id": "EST"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Ethiopia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [37.90607, 14.95943],
+            [38.51295, 14.50547],
+            [39.0994, 14.74064],
+            [39.34061, 14.53155],
+            [40.02625, 14.51959],
+            [40.8966, 14.11864],
+            [41.1552, 13.77333],
+            [41.59856, 13.45209],
+            [42.00975, 12.86582],
+            [42.35156, 12.54223],
+            [42, 12.1],
+            [41.66176, 11.6312],
+            [41.73959, 11.35511],
+            [41.75557, 11.05091],
+            [42.31414, 11.0342],
+            [42.55493, 11.10511],
+            [42.776852, 10.926879],
+            [42.55876, 10.57258],
+            [42.92812, 10.02194],
+            [43.29699, 9.54048],
+            [43.67875, 9.18358],
+            [46.94834, 7.99688],
+            [47.78942, 8.003],
+            [44.9636, 5.00162],
+            [43.66087, 4.95755],
+            [42.76967, 4.25259],
+            [42.12861, 4.23413],
+            [41.855083, 3.918912],
+            [41.1718, 3.91909],
+            [40.76848, 4.25702],
+            [39.85494, 3.83879],
+            [39.559384, 3.42206],
+            [38.89251, 3.50074],
+            [38.67114, 3.61607],
+            [38.43697, 3.58851],
+            [38.120915, 3.598605],
+            [36.855093, 4.447864],
+            [36.159079, 4.447864],
+            [35.817448, 4.776966],
+            [35.817448, 5.338232],
+            [35.298007, 5.506],
+            [34.70702, 6.59422],
+            [34.25032, 6.82607],
+            [34.0751, 7.22595],
+            [33.56829, 7.71334],
+            [32.95418, 7.78497],
+            [33.2948, 8.35458],
+            [33.8255, 8.37916],
+            [33.97498, 8.68456],
+            [33.96162, 9.58358],
+            [34.25745, 10.63009],
+            [34.73115, 10.91017],
+            [34.83163, 11.31896],
+            [35.26049, 12.08286],
+            [35.86363, 12.57828],
+            [36.27022, 13.56333],
+            [36.42951, 14.42211],
+            [37.59377, 14.2131],
+            [37.90607, 14.95943]
+          ]
+        ]
+      },
+      "id": "ETH"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Finland" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [28.59193, 69.064777],
+            [28.445944, 68.364613],
+            [29.977426, 67.698297],
+            [29.054589, 66.944286],
+            [30.21765, 65.80598],
+            [29.54443, 64.948672],
+            [30.444685, 64.204453],
+            [30.035872, 63.552814],
+            [31.516092, 62.867687],
+            [31.139991, 62.357693],
+            [30.211107, 61.780028],
+            [28.069998, 60.503517],
+            [26.255173, 60.423961],
+            [24.496624, 60.057316],
+            [22.869695, 59.846373],
+            [22.290764, 60.391921],
+            [21.322244, 60.72017],
+            [21.544866, 61.705329],
+            [21.059211, 62.607393],
+            [21.536029, 63.189735],
+            [22.442744, 63.81781],
+            [24.730512, 64.902344],
+            [25.398068, 65.111427],
+            [25.294043, 65.534346],
+            [23.903379, 66.006927],
+            [23.56588, 66.396051],
+            [23.539473, 67.936009],
+            [21.978535, 68.616846],
+            [20.645593, 69.106247],
+            [21.244936, 69.370443],
+            [22.356238, 68.841741],
+            [23.66205, 68.891247],
+            [24.735679, 68.649557],
+            [25.689213, 69.092114],
+            [26.179622, 69.825299],
+            [27.732292, 70.164193],
+            [29.015573, 69.766491],
+            [28.59193, 69.064777]
+          ]
+        ]
+      },
+      "id": "FIN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Fiji" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [178.3736, -17.33992],
+              [178.71806, -17.62846],
+              [178.55271, -18.15059],
+              [177.93266, -18.28799],
+              [177.38146, -18.16432],
+              [177.28504, -17.72465],
+              [177.67087, -17.38114],
+              [178.12557, -17.50481],
+              [178.3736, -17.33992]
+            ]
+          ],
+          [
+            [
+              [179.364143, -16.801354],
+              [178.725059, -17.012042],
+              [178.596839, -16.63915],
+              [179.096609, -16.433984],
+              [179.413509, -16.379054],
+              [180, -16.067133],
+              [180, -16.555217],
+              [179.364143, -16.801354]
+            ]
+          ],
+          [
+            [
+              [-179.917369, -16.501783],
+              [-180, -16.555217],
+              [-180, -16.067133],
+              [-179.79332, -16.020882],
+              [-179.917369, -16.501783]
+            ]
+          ]
+        ]
+      },
+      "id": "FJI"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Falkland Islands" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-61.2, -51.85],
+            [-60, -51.25],
+            [-59.15, -51.5],
+            [-58.55, -51.1],
+            [-57.75, -51.55],
+            [-58.05, -51.9],
+            [-59.4, -52.2],
+            [-59.85, -51.85],
+            [-60.7, -52.3],
+            [-61.2, -51.85]
+          ]
+        ]
+      },
+      "id": "FLK"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "France" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [9.560016, 42.152492],
+              [9.229752, 41.380007],
+              [8.775723, 41.583612],
+              [8.544213, 42.256517],
+              [8.746009, 42.628122],
+              [9.390001, 43.009985],
+              [9.560016, 42.152492]
+            ]
+          ],
+          [
+            [
+              [3.588184, 50.378992],
+              [4.286023, 49.907497],
+              [4.799222, 49.985373],
+              [5.674052, 49.529484],
+              [5.897759, 49.442667],
+              [6.18632, 49.463803],
+              [6.65823, 49.201958],
+              [8.099279, 49.017784],
+              [7.593676, 48.333019],
+              [7.466759, 47.620582],
+              [7.192202, 47.449766],
+              [6.736571, 47.541801],
+              [6.768714, 47.287708],
+              [6.037389, 46.725779],
+              [6.022609, 46.27299],
+              [6.5001, 46.429673],
+              [6.843593, 45.991147],
+              [6.802355, 45.70858],
+              [7.096652, 45.333099],
+              [6.749955, 45.028518],
+              [7.007562, 44.254767],
+              [7.549596, 44.127901],
+              [7.435185, 43.693845],
+              [6.529245, 43.128892],
+              [4.556963, 43.399651],
+              [3.100411, 43.075201],
+              [2.985999, 42.473015],
+              [1.826793, 42.343385],
+              [0.701591, 42.795734],
+              [0.338047, 42.579546],
+              [-1.502771, 43.034014],
+              [-1.901351, 43.422802],
+              [-1.384225, 44.02261],
+              [-1.193798, 46.014918],
+              [-2.225724, 47.064363],
+              [-2.963276, 47.570327],
+              [-4.491555, 47.954954],
+              [-4.59235, 48.68416],
+              [-3.295814, 48.901692],
+              [-1.616511, 48.644421],
+              [-1.933494, 49.776342],
+              [-0.989469, 49.347376],
+              [1.338761, 50.127173],
+              [1.639001, 50.946606],
+              [2.513573, 51.148506],
+              [2.658422, 50.796848],
+              [3.123252, 50.780363],
+              [3.588184, 50.378992]
+            ]
+          ]
+        ]
+      },
+      "id": "FRA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "French Guiana" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [-52.556425, 2.504705],
+              [-52.939657, 2.124858],
+              [-53.418465, 2.053389],
+              [-53.554839, 2.334897],
+              [-53.778521, 2.376703],
+              [-54.088063, 2.105557],
+              [-54.524754, 2.311849],
+              [-54.27123, 2.738748],
+              [-54.184284, 3.194172],
+              [-54.011504, 3.62257],
+              [-54.399542, 4.212611],
+              [-54.478633, 4.896756],
+              [-53.958045, 5.756548],
+              [-53.618453, 5.646529],
+              [-52.882141, 5.409851],
+              [-51.823343, 4.565768],
+              [-51.657797, 4.156232],
+              [-52.249338, 3.241094],
+              [-52.556425, 2.504705]
+            ]
+          ]
+        ]
+      },
+      "id": "GUF"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Gabon" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [11.093773, -3.978827],
+            [10.066135, -2.969483],
+            [9.405245, -2.144313],
+            [8.797996, -1.111301],
+            [8.830087, -0.779074],
+            [9.04842, -0.459351],
+            [9.291351, 0.268666],
+            [9.492889, 1.01012],
+            [9.830284, 1.067894],
+            [11.285079, 1.057662],
+            [11.276449, 2.261051],
+            [11.751665, 2.326758],
+            [12.35938, 2.192812],
+            [12.951334, 2.321616],
+            [13.075822, 2.267097],
+            [13.003114, 1.830896],
+            [13.282631, 1.314184],
+            [14.026669, 1.395677],
+            [14.276266, 1.19693],
+            [13.843321, 0.038758],
+            [14.316418, -0.552627],
+            [14.425456, -1.333407],
+            [14.29921, -1.998276],
+            [13.992407, -2.470805],
+            [13.109619, -2.42874],
+            [12.575284, -1.948511],
+            [12.495703, -2.391688],
+            [11.820964, -2.514161],
+            [11.478039, -2.765619],
+            [11.855122, -3.426871],
+            [11.093773, -3.978827]
+          ]
+        ]
+      },
+      "id": "GAB"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "United Kingdom" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [-5.661949, 54.554603],
+              [-6.197885, 53.867565],
+              [-6.95373, 54.073702],
+              [-7.572168, 54.059956],
+              [-7.366031, 54.595841],
+              [-7.572168, 55.131622],
+              [-6.733847, 55.17286],
+              [-5.661949, 54.554603]
+            ]
+          ],
+          [
+            [
+              [-3.005005, 58.635],
+              [-4.073828, 57.553025],
+              [-3.055002, 57.690019],
+              [-1.959281, 57.6848],
+              [-2.219988, 56.870017],
+              [-3.119003, 55.973793],
+              [-2.085009, 55.909998],
+              [-2.005676, 55.804903],
+              [-1.114991, 54.624986],
+              [-0.430485, 54.464376],
+              [0.184981, 53.325014],
+              [0.469977, 52.929999],
+              [1.681531, 52.73952],
+              [1.559988, 52.099998],
+              [1.050562, 51.806761],
+              [1.449865, 51.289428],
+              [0.550334, 50.765739],
+              [-0.787517, 50.774989],
+              [-2.489998, 50.500019],
+              [-2.956274, 50.69688],
+              [-3.617448, 50.228356],
+              [-4.542508, 50.341837],
+              [-5.245023, 49.96],
+              [-5.776567, 50.159678],
+              [-4.30999, 51.210001],
+              [-3.414851, 51.426009],
+              [-3.422719, 51.426848],
+              [-4.984367, 51.593466],
+              [-5.267296, 51.9914],
+              [-4.222347, 52.301356],
+              [-4.770013, 52.840005],
+              [-4.579999, 53.495004],
+              [-3.093831, 53.404547],
+              [-3.09208, 53.404441],
+              [-2.945009, 53.985],
+              [-3.614701, 54.600937],
+              [-3.630005, 54.615013],
+              [-4.844169, 54.790971],
+              [-5.082527, 55.061601],
+              [-4.719112, 55.508473],
+              [-5.047981, 55.783986],
+              [-5.586398, 55.311146],
+              [-5.644999, 56.275015],
+              [-6.149981, 56.78501],
+              [-5.786825, 57.818848],
+              [-5.009999, 58.630013],
+              [-4.211495, 58.550845],
+              [-3.005005, 58.635]
+            ]
+          ]
+        ]
+      },
+      "id": "GBR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Georgia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [41.554084, 41.535656],
+            [41.703171, 41.962943],
+            [41.45347, 42.645123],
+            [40.875469, 43.013628],
+            [40.321394, 43.128634],
+            [39.955009, 43.434998],
+            [40.076965, 43.553104],
+            [40.922185, 43.382159],
+            [42.394395, 43.220308],
+            [43.756017, 42.740828],
+            [43.9312, 42.554974],
+            [44.537623, 42.711993],
+            [45.470279, 42.502781],
+            [45.77641, 42.092444],
+            [46.404951, 41.860675],
+            [46.145432, 41.722802],
+            [46.637908, 41.181673],
+            [46.501637, 41.064445],
+            [45.962601, 41.123873],
+            [45.217426, 41.411452],
+            [44.97248, 41.248129],
+            [43.582746, 41.092143],
+            [42.619549, 41.583173],
+            [41.554084, 41.535656]
+          ]
+        ]
+      },
+      "id": "GEO"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Ghana" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [1.060122, 5.928837],
+            [-0.507638, 5.343473],
+            [-1.063625, 5.000548],
+            [-1.964707, 4.710462],
+            [-2.856125, 4.994476],
+            [-2.810701, 5.389051],
+            [-3.24437, 6.250472],
+            [-2.983585, 7.379705],
+            [-2.56219, 8.219628],
+            [-2.827496, 9.642461],
+            [-2.963896, 10.395335],
+            [-2.940409, 10.96269],
+            [-1.203358, 11.009819],
+            [-0.761576, 10.93693],
+            [-0.438702, 11.098341],
+            [0.023803, 11.018682],
+            [-0.049785, 10.706918],
+            [0.36758, 10.191213],
+            [0.365901, 9.465004],
+            [0.461192, 8.677223],
+            [0.712029, 8.312465],
+            [0.490957, 7.411744],
+            [0.570384, 6.914359],
+            [0.836931, 6.279979],
+            [1.060122, 5.928837]
+          ]
+        ]
+      },
+      "id": "GHA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Guinea" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-8.439298, 7.686043],
+            [-8.722124, 7.711674],
+            [-8.926065, 7.309037],
+            [-9.208786, 7.313921],
+            [-9.403348, 7.526905],
+            [-9.33728, 7.928534],
+            [-9.755342, 8.541055],
+            [-10.016567, 8.428504],
+            [-10.230094, 8.406206],
+            [-10.505477, 8.348896],
+            [-10.494315, 8.715541],
+            [-10.65477, 8.977178],
+            [-10.622395, 9.26791],
+            [-10.839152, 9.688246],
+            [-11.117481, 10.045873],
+            [-11.917277, 10.046984],
+            [-12.150338, 9.858572],
+            [-12.425929, 9.835834],
+            [-12.596719, 9.620188],
+            [-12.711958, 9.342712],
+            [-13.24655, 8.903049],
+            [-13.685154, 9.494744],
+            [-14.074045, 9.886167],
+            [-14.330076, 10.01572],
+            [-14.579699, 10.214467],
+            [-14.693232, 10.656301],
+            [-14.839554, 10.876572],
+            [-15.130311, 11.040412],
+            [-14.685687, 11.527824],
+            [-14.382192, 11.509272],
+            [-14.121406, 11.677117],
+            [-13.9008, 11.678719],
+            [-13.743161, 11.811269],
+            [-13.828272, 12.142644],
+            [-13.718744, 12.247186],
+            [-13.700476, 12.586183],
+            [-13.217818, 12.575874],
+            [-12.499051, 12.33209],
+            [-12.278599, 12.35444],
+            [-12.203565, 12.465648],
+            [-11.658301, 12.386583],
+            [-11.513943, 12.442988],
+            [-11.456169, 12.076834],
+            [-11.297574, 12.077971],
+            [-11.036556, 12.211245],
+            [-10.87083, 12.177887],
+            [-10.593224, 11.923975],
+            [-10.165214, 11.844084],
+            [-9.890993, 12.060479],
+            [-9.567912, 12.194243],
+            [-9.327616, 12.334286],
+            [-9.127474, 12.30806],
+            [-8.905265, 12.088358],
+            [-8.786099, 11.812561],
+            [-8.376305, 11.393646],
+            [-8.581305, 11.136246],
+            [-8.620321, 10.810891],
+            [-8.407311, 10.909257],
+            [-8.282357, 10.792597],
+            [-8.335377, 10.494812],
+            [-8.029944, 10.206535],
+            [-8.229337, 10.12902],
+            [-8.309616, 9.789532],
+            [-8.079114, 9.376224],
+            [-7.8321, 8.575704],
+            [-8.203499, 8.455453],
+            [-8.299049, 8.316444],
+            [-8.221792, 8.123329],
+            [-8.280703, 7.68718],
+            [-8.439298, 7.686043]
+          ]
+        ]
+      },
+      "id": "GIN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Gambia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-16.841525, 13.151394],
+            [-16.713729, 13.594959],
+            [-15.624596, 13.623587],
+            [-15.39877, 13.860369],
+            [-15.081735, 13.876492],
+            [-14.687031, 13.630357],
+            [-14.376714, 13.62568],
+            [-14.046992, 13.794068],
+            [-13.844963, 13.505042],
+            [-14.277702, 13.280585],
+            [-14.712197, 13.298207],
+            [-15.141163, 13.509512],
+            [-15.511813, 13.27857],
+            [-15.691001, 13.270353],
+            [-15.931296, 13.130284],
+            [-16.841525, 13.151394]
+          ]
+        ]
+      },
+      "id": "GMB"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Guinea Bissau" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-15.130311, 11.040412],
+            [-15.66418, 11.458474],
+            [-16.085214, 11.524594],
+            [-16.314787, 11.806515],
+            [-16.308947, 11.958702],
+            [-16.613838, 12.170911],
+            [-16.677452, 12.384852],
+            [-16.147717, 12.547762],
+            [-15.816574, 12.515567],
+            [-15.548477, 12.62817],
+            [-13.700476, 12.586183],
+            [-13.718744, 12.247186],
+            [-13.828272, 12.142644],
+            [-13.743161, 11.811269],
+            [-13.9008, 11.678719],
+            [-14.121406, 11.677117],
+            [-14.382192, 11.509272],
+            [-14.685687, 11.527824],
+            [-15.130311, 11.040412]
+          ]
+        ]
+      },
+      "id": "GNB"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Equatorial Guinea" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [9.492889, 1.01012],
+            [9.305613, 1.160911],
+            [9.649158, 2.283866],
+            [11.276449, 2.261051],
+            [11.285079, 1.057662],
+            [9.830284, 1.067894],
+            [9.492889, 1.01012]
+          ]
+        ]
+      },
+      "id": "GNQ"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Greece" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [23.69998, 35.705004],
+              [24.246665, 35.368022],
+              [25.025015, 35.424996],
+              [25.769208, 35.354018],
+              [25.745023, 35.179998],
+              [26.290003, 35.29999],
+              [26.164998, 35.004995],
+              [24.724982, 34.919988],
+              [24.735007, 35.084991],
+              [23.514978, 35.279992],
+              [23.69998, 35.705004]
+            ]
+          ],
+          [
+            [
+              [26.604196, 41.562115],
+              [26.294602, 40.936261],
+              [26.056942, 40.824123],
+              [25.447677, 40.852545],
+              [24.925848, 40.947062],
+              [23.714811, 40.687129],
+              [24.407999, 40.124993],
+              [23.899968, 39.962006],
+              [23.342999, 39.960998],
+              [22.813988, 40.476005],
+              [22.626299, 40.256561],
+              [22.849748, 39.659311],
+              [23.350027, 39.190011],
+              [22.973099, 38.970903],
+              [23.530016, 38.510001],
+              [24.025025, 38.219993],
+              [24.040011, 37.655015],
+              [23.115003, 37.920011],
+              [23.409972, 37.409991],
+              [22.774972, 37.30501],
+              [23.154225, 36.422506],
+              [22.490028, 36.41],
+              [21.670026, 36.844986],
+              [21.295011, 37.644989],
+              [21.120034, 38.310323],
+              [20.730032, 38.769985],
+              [20.217712, 39.340235],
+              [20.150016, 39.624998],
+              [20.615, 40.110007],
+              [20.674997, 40.435],
+              [20.99999, 40.580004],
+              [21.02004, 40.842727],
+              [21.674161, 40.931275],
+              [22.055378, 41.149866],
+              [22.597308, 41.130487],
+              [22.76177, 41.3048],
+              [22.952377, 41.337994],
+              [23.692074, 41.309081],
+              [24.492645, 41.583896],
+              [25.197201, 41.234486],
+              [26.106138, 41.328899],
+              [26.117042, 41.826905],
+              [26.604196, 41.562115]
+            ]
+          ]
+        ]
+      },
+      "id": "GRC"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Greenland" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-46.76379, 82.62796],
+            [-43.40644, 83.22516],
+            [-39.89753, 83.18018],
+            [-38.62214, 83.54905],
+            [-35.08787, 83.64513],
+            [-27.10046, 83.51966],
+            [-20.84539, 82.72669],
+            [-22.69182, 82.34165],
+            [-26.51753, 82.29765],
+            [-31.9, 82.2],
+            [-31.39646, 82.02154],
+            [-27.85666, 82.13178],
+            [-24.84448, 81.78697],
+            [-22.90328, 82.09317],
+            [-22.07175, 81.73449],
+            [-23.16961, 81.15271],
+            [-20.62363, 81.52462],
+            [-15.76818, 81.91245],
+            [-12.77018, 81.71885],
+            [-12.20855, 81.29154],
+            [-16.28533, 80.58004],
+            [-16.85, 80.35],
+            [-20.04624, 80.17708],
+            [-17.73035, 80.12912],
+            [-18.9, 79.4],
+            [-19.70499, 78.75128],
+            [-19.67353, 77.63859],
+            [-18.47285, 76.98565],
+            [-20.03503, 76.94434],
+            [-21.67944, 76.62795],
+            [-19.83407, 76.09808],
+            [-19.59896, 75.24838],
+            [-20.66818, 75.15585],
+            [-19.37281, 74.29561],
+            [-21.59422, 74.22382],
+            [-20.43454, 73.81713],
+            [-20.76234, 73.46436],
+            [-22.17221, 73.30955],
+            [-23.56593, 73.30663],
+            [-22.31311, 72.62928],
+            [-22.29954, 72.18409],
+            [-24.27834, 72.59788],
+            [-24.79296, 72.3302],
+            [-23.44296, 72.08016],
+            [-22.13281, 71.46898],
+            [-21.75356, 70.66369],
+            [-23.53603, 70.471],
+            [-24.30702, 70.85649],
+            [-25.54341, 71.43094],
+            [-25.20135, 70.75226],
+            [-26.36276, 70.22646],
+            [-23.72742, 70.18401],
+            [-22.34902, 70.12946],
+            [-25.02927, 69.2588],
+            [-27.74737, 68.47046],
+            [-30.67371, 68.12503],
+            [-31.77665, 68.12078],
+            [-32.81105, 67.73547],
+            [-34.20196, 66.67974],
+            [-36.35284, 65.9789],
+            [-37.04378, 65.93768],
+            [-38.37505, 65.69213],
+            [-39.81222, 65.45848],
+            [-40.66899, 64.83997],
+            [-40.68281, 64.13902],
+            [-41.1887, 63.48246],
+            [-42.81938, 62.68233],
+            [-42.41666, 61.90093],
+            [-42.86619, 61.07404],
+            [-43.3784, 60.09772],
+            [-44.7875, 60.03676],
+            [-46.26364, 60.85328],
+            [-48.26294, 60.85843],
+            [-49.23308, 61.40681],
+            [-49.90039, 62.38336],
+            [-51.63325, 63.62691],
+            [-52.14014, 64.27842],
+            [-52.27659, 65.1767],
+            [-53.66166, 66.09957],
+            [-53.30161, 66.8365],
+            [-53.96911, 67.18899],
+            [-52.9804, 68.35759],
+            [-51.47536, 68.72958],
+            [-51.08041, 69.14781],
+            [-50.87122, 69.9291],
+            [-52.013585, 69.574925],
+            [-52.55792, 69.42616],
+            [-53.45629, 69.283625],
+            [-54.68336, 69.61003],
+            [-54.75001, 70.28932],
+            [-54.35884, 70.821315],
+            [-53.431315, 70.835755],
+            [-51.39014, 70.56978],
+            [-53.10937, 71.20485],
+            [-54.00422, 71.54719],
+            [-55, 71.406537],
+            [-55.83468, 71.65444],
+            [-54.71819, 72.58625],
+            [-55.32634, 72.95861],
+            [-56.12003, 73.64977],
+            [-57.32363, 74.71026],
+            [-58.59679, 75.09861],
+            [-58.58516, 75.51727],
+            [-61.26861, 76.10238],
+            [-63.39165, 76.1752],
+            [-66.06427, 76.13486],
+            [-68.50438, 76.06141],
+            [-69.66485, 76.37975],
+            [-71.40257, 77.00857],
+            [-68.77671, 77.32312],
+            [-66.76397, 77.37595],
+            [-71.04293, 77.63595],
+            [-73.297, 78.04419],
+            [-73.15938, 78.43271],
+            [-69.37345, 78.91388],
+            [-65.7107, 79.39436],
+            [-65.3239, 79.75814],
+            [-68.02298, 80.11721],
+            [-67.15129, 80.51582],
+            [-63.68925, 81.21396],
+            [-62.23444, 81.3211],
+            [-62.65116, 81.77042],
+            [-60.28249, 82.03363],
+            [-57.20744, 82.19074],
+            [-54.13442, 82.19962],
+            [-53.04328, 81.88833],
+            [-50.39061, 82.43883],
+            [-48.00386, 82.06481],
+            [-46.59984, 81.985945],
+            [-44.523, 81.6607],
+            [-46.9007, 82.19979],
+            [-46.76379, 82.62796]
+          ]
+        ]
+      },
+      "id": "GRL"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Guatemala" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-90.095555, 13.735338],
+            [-90.608624, 13.909771],
+            [-91.23241, 13.927832],
+            [-91.689747, 14.126218],
+            [-92.22775, 14.538829],
+            [-92.20323, 14.830103],
+            [-92.087216, 15.064585],
+            [-92.229249, 15.251447],
+            [-91.74796, 16.066565],
+            [-90.464473, 16.069562],
+            [-90.438867, 16.41011],
+            [-90.600847, 16.470778],
+            [-90.711822, 16.687483],
+            [-91.08167, 16.918477],
+            [-91.453921, 17.252177],
+            [-91.002269, 17.254658],
+            [-91.00152, 17.817595],
+            [-90.067934, 17.819326],
+            [-89.14308, 17.808319],
+            [-89.150806, 17.015577],
+            [-89.229122, 15.886938],
+            [-88.930613, 15.887273],
+            [-88.604586, 15.70638],
+            [-88.518364, 15.855389],
+            [-88.225023, 15.727722],
+            [-88.68068, 15.346247],
+            [-89.154811, 15.066419],
+            [-89.22522, 14.874286],
+            [-89.145535, 14.678019],
+            [-89.353326, 14.424133],
+            [-89.587343, 14.362586],
+            [-89.534219, 14.244816],
+            [-89.721934, 14.134228],
+            [-90.064678, 13.88197],
+            [-90.095555, 13.735338]
+          ]
+        ]
+      },
+      "id": "GTM"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Guyana" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-59.758285, 8.367035],
+            [-59.101684, 7.999202],
+            [-58.482962, 7.347691],
+            [-58.454876, 6.832787],
+            [-58.078103, 6.809094],
+            [-57.542219, 6.321268],
+            [-57.147436, 5.97315],
+            [-57.307246, 5.073567],
+            [-57.914289, 4.812626],
+            [-57.86021, 4.576801],
+            [-58.044694, 4.060864],
+            [-57.601569, 3.334655],
+            [-57.281433, 3.333492],
+            [-57.150098, 2.768927],
+            [-56.539386, 1.899523],
+            [-56.782704, 1.863711],
+            [-57.335823, 1.948538],
+            [-57.660971, 1.682585],
+            [-58.11345, 1.507195],
+            [-58.429477, 1.463942],
+            [-58.540013, 1.268088],
+            [-59.030862, 1.317698],
+            [-59.646044, 1.786894],
+            [-59.718546, 2.24963],
+            [-59.974525, 2.755233],
+            [-59.815413, 3.606499],
+            [-59.53804, 3.958803],
+            [-59.767406, 4.423503],
+            [-60.111002, 4.574967],
+            [-59.980959, 5.014061],
+            [-60.213683, 5.244486],
+            [-60.733574, 5.200277],
+            [-61.410303, 5.959068],
+            [-61.139415, 6.234297],
+            [-61.159336, 6.696077],
+            [-60.543999, 6.856584],
+            [-60.295668, 7.043911],
+            [-60.637973, 7.415],
+            [-60.550588, 7.779603],
+            [-59.758285, 8.367035]
+          ]
+        ]
+      },
+      "id": "GUY"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Honduras" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-87.316654, 12.984686],
+            [-87.489409, 13.297535],
+            [-87.793111, 13.38448],
+            [-87.723503, 13.78505],
+            [-87.859515, 13.893312],
+            [-88.065343, 13.964626],
+            [-88.503998, 13.845486],
+            [-88.541231, 13.980155],
+            [-88.843073, 14.140507],
+            [-89.058512, 14.340029],
+            [-89.353326, 14.424133],
+            [-89.145535, 14.678019],
+            [-89.22522, 14.874286],
+            [-89.154811, 15.066419],
+            [-88.68068, 15.346247],
+            [-88.225023, 15.727722],
+            [-88.121153, 15.688655],
+            [-87.901813, 15.864458],
+            [-87.61568, 15.878799],
+            [-87.522921, 15.797279],
+            [-87.367762, 15.84694],
+            [-86.903191, 15.756713],
+            [-86.440946, 15.782835],
+            [-86.119234, 15.893449],
+            [-86.001954, 16.005406],
+            [-85.683317, 15.953652],
+            [-85.444004, 15.885749],
+            [-85.182444, 15.909158],
+            [-84.983722, 15.995923],
+            [-84.52698, 15.857224],
+            [-84.368256, 15.835158],
+            [-84.063055, 15.648244],
+            [-83.773977, 15.424072],
+            [-83.410381, 15.270903],
+            [-83.147219, 14.995829],
+            [-83.489989, 15.016267],
+            [-83.628585, 14.880074],
+            [-83.975721, 14.749436],
+            [-84.228342, 14.748764],
+            [-84.449336, 14.621614],
+            [-84.649582, 14.666805],
+            [-84.820037, 14.819587],
+            [-84.924501, 14.790493],
+            [-85.052787, 14.551541],
+            [-85.148751, 14.560197],
+            [-85.165365, 14.35437],
+            [-85.514413, 14.079012],
+            [-85.698665, 13.960078],
+            [-85.801295, 13.836055],
+            [-86.096264, 14.038187],
+            [-86.312142, 13.771356],
+            [-86.520708, 13.778487],
+            [-86.755087, 13.754845],
+            [-86.733822, 13.263093],
+            [-86.880557, 13.254204],
+            [-87.005769, 13.025794],
+            [-87.316654, 12.984686]
+          ]
+        ]
+      },
+      "id": "HND"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Croatia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [18.829838, 45.908878],
+            [19.072769, 45.521511],
+            [19.390476, 45.236516],
+            [19.005486, 44.860234],
+            [18.553214, 45.08159],
+            [17.861783, 45.06774],
+            [17.002146, 45.233777],
+            [16.534939, 45.211608],
+            [16.318157, 45.004127],
+            [15.959367, 45.233777],
+            [15.750026, 44.818712],
+            [16.23966, 44.351143],
+            [16.456443, 44.04124],
+            [16.916156, 43.667722],
+            [17.297373, 43.446341],
+            [17.674922, 43.028563],
+            [18.56, 42.65],
+            [18.450016, 42.479991],
+            [17.50997, 42.849995],
+            [16.930006, 43.209998],
+            [16.015385, 43.507215],
+            [15.174454, 44.243191],
+            [15.37625, 44.317915],
+            [14.920309, 44.738484],
+            [14.901602, 45.07606],
+            [14.258748, 45.233777],
+            [13.952255, 44.802124],
+            [13.656976, 45.136935],
+            [13.679403, 45.484149],
+            [13.71506, 45.500324],
+            [14.411968, 45.466166],
+            [14.595109, 45.634941],
+            [14.935244, 45.471695],
+            [15.327675, 45.452316],
+            [15.323954, 45.731783],
+            [15.67153, 45.834154],
+            [15.768733, 46.238108],
+            [16.564808, 46.503751],
+            [16.882515, 46.380632],
+            [17.630066, 45.951769],
+            [18.456062, 45.759481],
+            [18.829838, 45.908878]
+          ]
+        ]
+      },
+      "id": "HRV"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Haiti" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-73.189791, 19.915684],
+            [-72.579673, 19.871501],
+            [-71.712361, 19.714456],
+            [-71.624873, 19.169838],
+            [-71.701303, 18.785417],
+            [-71.945112, 18.6169],
+            [-71.687738, 18.31666],
+            [-71.708305, 18.044997],
+            [-72.372476, 18.214961],
+            [-72.844411, 18.145611],
+            [-73.454555, 18.217906],
+            [-73.922433, 18.030993],
+            [-74.458034, 18.34255],
+            [-74.369925, 18.664908],
+            [-73.449542, 18.526053],
+            [-72.694937, 18.445799],
+            [-72.334882, 18.668422],
+            [-72.79165, 19.101625],
+            [-72.784105, 19.483591],
+            [-73.415022, 19.639551],
+            [-73.189791, 19.915684]
+          ]
+        ]
+      },
+      "id": "HTI"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Hungary" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [16.202298, 46.852386],
+            [16.534268, 47.496171],
+            [16.340584, 47.712902],
+            [16.903754, 47.714866],
+            [16.979667, 48.123497],
+            [17.488473, 47.867466],
+            [17.857133, 47.758429],
+            [18.696513, 47.880954],
+            [18.777025, 48.081768],
+            [19.174365, 48.111379],
+            [19.661364, 48.266615],
+            [19.769471, 48.202691],
+            [20.239054, 48.327567],
+            [20.473562, 48.56285],
+            [20.801294, 48.623854],
+            [21.872236, 48.319971],
+            [22.085608, 48.422264],
+            [22.64082, 48.15024],
+            [22.710531, 47.882194],
+            [22.099768, 47.672439],
+            [21.626515, 46.994238],
+            [21.021952, 46.316088],
+            [20.220192, 46.127469],
+            [19.596045, 46.17173],
+            [18.829838, 45.908878],
+            [18.456062, 45.759481],
+            [17.630066, 45.951769],
+            [16.882515, 46.380632],
+            [16.564808, 46.503751],
+            [16.370505, 46.841327],
+            [16.202298, 46.852386]
+          ]
+        ]
+      },
+      "id": "HUN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Indonesia" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [120.715609, -10.239581],
+              [120.295014, -10.25865],
+              [118.967808, -9.557969],
+              [119.90031, -9.36134],
+              [120.425756, -9.665921],
+              [120.775502, -9.969675],
+              [120.715609, -10.239581]
+            ]
+          ],
+          [
+            [
+              [124.43595, -10.140001],
+              [123.579982, -10.359987],
+              [123.459989, -10.239995],
+              [123.550009, -9.900016],
+              [123.980009, -9.290027],
+              [124.968682, -8.89279],
+              [125.07002, -9.089987],
+              [125.08852, -9.393173],
+              [124.43595, -10.140001]
+            ]
+          ],
+          [
+            [
+              [117.900018, -8.095681],
+              [118.260616, -8.362383],
+              [118.87846, -8.280683],
+              [119.126507, -8.705825],
+              [117.970402, -8.906639],
+              [117.277731, -9.040895],
+              [116.740141, -9.032937],
+              [117.083737, -8.457158],
+              [117.632024, -8.449303],
+              [117.900018, -8.095681]
+            ]
+          ],
+          [
+            [
+              [122.903537, -8.094234],
+              [122.756983, -8.649808],
+              [121.254491, -8.933666],
+              [119.924391, -8.810418],
+              [119.920929, -8.444859],
+              [120.715092, -8.236965],
+              [121.341669, -8.53674],
+              [122.007365, -8.46062],
+              [122.903537, -8.094234]
+            ]
+          ],
+          [
+            [
+              [108.623479, -6.777674],
+              [110.539227, -6.877358],
+              [110.759576, -6.465186],
+              [112.614811, -6.946036],
+              [112.978768, -7.594213],
+              [114.478935, -7.776528],
+              [115.705527, -8.370807],
+              [114.564511, -8.751817],
+              [113.464734, -8.348947],
+              [112.559672, -8.376181],
+              [111.522061, -8.302129],
+              [110.58615, -8.122605],
+              [109.427667, -7.740664],
+              [108.693655, -7.6416],
+              [108.277763, -7.766657],
+              [106.454102, -7.3549],
+              [106.280624, -6.9249],
+              [105.365486, -6.851416],
+              [106.051646, -5.895919],
+              [107.265009, -5.954985],
+              [108.072091, -6.345762],
+              [108.486846, -6.421985],
+              [108.623479, -6.777674]
+            ]
+          ],
+          [
+            [
+              [134.724624, -6.214401],
+              [134.210134, -6.895238],
+              [134.112776, -6.142467],
+              [134.290336, -5.783058],
+              [134.499625, -5.445042],
+              [134.727002, -5.737582],
+              [134.724624, -6.214401]
+            ]
+          ],
+          [
+            [
+              [127.249215, -3.459065],
+              [126.874923, -3.790983],
+              [126.183802, -3.607376],
+              [125.989034, -3.177273],
+              [127.000651, -3.129318],
+              [127.249215, -3.459065]
+            ]
+          ],
+          [
+            [
+              [130.471344, -3.093764],
+              [130.834836, -3.858472],
+              [129.990547, -3.446301],
+              [129.155249, -3.362637],
+              [128.590684, -3.428679],
+              [127.898891, -3.393436],
+              [128.135879, -2.84365],
+              [129.370998, -2.802154],
+              [130.471344, -3.093764]
+            ]
+          ],
+          [
+            [
+              [134.143368, -1.151867],
+              [134.422627, -2.769185],
+              [135.457603, -3.367753],
+              [136.293314, -2.307042],
+              [137.440738, -1.703513],
+              [138.329727, -1.702686],
+              [139.184921, -2.051296],
+              [139.926684, -2.409052],
+              [141.00021, -2.600151],
+              [141.017057, -5.859022],
+              [141.033852, -9.117893],
+              [140.143415, -8.297168],
+              [139.127767, -8.096043],
+              [138.881477, -8.380935],
+              [137.614474, -8.411683],
+              [138.039099, -7.597882],
+              [138.668621, -7.320225],
+              [138.407914, -6.232849],
+              [137.92784, -5.393366],
+              [135.98925, -4.546544],
+              [135.164598, -4.462931],
+              [133.66288, -3.538853],
+              [133.367705, -4.024819],
+              [132.983956, -4.112979],
+              [132.756941, -3.746283],
+              [132.753789, -3.311787],
+              [131.989804, -2.820551],
+              [133.066845, -2.460418],
+              [133.780031, -2.479848],
+              [133.696212, -2.214542],
+              [132.232373, -2.212526],
+              [131.836222, -1.617162],
+              [130.94284, -1.432522],
+              [130.519558, -0.93772],
+              [131.867538, -0.695461],
+              [132.380116, -0.369538],
+              [133.985548, -0.78021],
+              [134.143368, -1.151867]
+            ]
+          ],
+          [
+            [
+              [125.240501, 1.419836],
+              [124.437035, 0.427881],
+              [123.685505, 0.235593],
+              [122.723083, 0.431137],
+              [121.056725, 0.381217],
+              [120.183083, 0.237247],
+              [120.04087, -0.519658],
+              [120.935905, -1.408906],
+              [121.475821, -0.955962],
+              [123.340565, -0.615673],
+              [123.258399, -1.076213],
+              [122.822715, -0.930951],
+              [122.38853, -1.516858],
+              [121.508274, -1.904483],
+              [122.454572, -3.186058],
+              [122.271896, -3.5295],
+              [123.170963, -4.683693],
+              [123.162333, -5.340604],
+              [122.628515, -5.634591],
+              [122.236394, -5.282933],
+              [122.719569, -4.464172],
+              [121.738234, -4.851331],
+              [121.489463, -4.574553],
+              [121.619171, -4.188478],
+              [120.898182, -3.602105],
+              [120.972389, -2.627643],
+              [120.305453, -2.931604],
+              [120.390047, -4.097579],
+              [120.430717, -5.528241],
+              [119.796543, -5.6734],
+              [119.366906, -5.379878],
+              [119.653606, -4.459417],
+              [119.498835, -3.494412],
+              [119.078344, -3.487022],
+              [118.767769, -2.801999],
+              [119.180974, -2.147104],
+              [119.323394, -1.353147],
+              [119.825999, 0.154254],
+              [120.035702, 0.566477],
+              [120.885779, 1.309223],
+              [121.666817, 1.013944],
+              [122.927567, 0.875192],
+              [124.077522, 0.917102],
+              [125.065989, 1.643259],
+              [125.240501, 1.419836]
+            ]
+          ],
+          [
+            [
+              [128.688249, 1.132386],
+              [128.635952, 0.258486],
+              [128.12017, 0.356413],
+              [127.968034, -0.252077],
+              [128.379999, -0.780004],
+              [128.100016, -0.899996],
+              [127.696475, -0.266598],
+              [127.39949, 1.011722],
+              [127.600512, 1.810691],
+              [127.932378, 2.174596],
+              [128.004156, 1.628531],
+              [128.594559, 1.540811],
+              [128.688249, 1.132386]
+            ]
+          ],
+          [
+            [
+              [117.875627, 1.827641],
+              [118.996747, 0.902219],
+              [117.811858, 0.784242],
+              [117.478339, 0.102475],
+              [117.521644, -0.803723],
+              [116.560048, -1.487661],
+              [116.533797, -2.483517],
+              [116.148084, -4.012726],
+              [116.000858, -3.657037],
+              [114.864803, -4.106984],
+              [114.468652, -3.495704],
+              [113.755672, -3.43917],
+              [113.256994, -3.118776],
+              [112.068126, -3.478392],
+              [111.703291, -2.994442],
+              [111.04824, -3.049426],
+              [110.223846, -2.934032],
+              [110.070936, -1.592874],
+              [109.571948, -1.314907],
+              [109.091874, -0.459507],
+              [108.952658, 0.415375],
+              [109.069136, 1.341934],
+              [109.66326, 2.006467],
+              [109.830227, 1.338136],
+              [110.514061, 0.773131],
+              [111.159138, 0.976478],
+              [111.797548, 0.904441],
+              [112.380252, 1.410121],
+              [112.859809, 1.49779],
+              [113.80585, 1.217549],
+              [114.621355, 1.430688],
+              [115.134037, 2.821482],
+              [115.519078, 3.169238],
+              [115.865517, 4.306559],
+              [117.015214, 4.306094],
+              [117.882035, 4.137551],
+              [117.313232, 3.234428],
+              [118.04833, 2.28769],
+              [117.875627, 1.827641]
+            ]
+          ],
+          [
+            [
+              [105.817655, -5.852356],
+              [104.710384, -5.873285],
+              [103.868213, -5.037315],
+              [102.584261, -4.220259],
+              [102.156173, -3.614146],
+              [101.399113, -2.799777],
+              [100.902503, -2.050262],
+              [100.141981, -0.650348],
+              [99.26374, 0.183142],
+              [98.970011, 1.042882],
+              [98.601351, 1.823507],
+              [97.699598, 2.453184],
+              [97.176942, 3.308791],
+              [96.424017, 3.86886],
+              [95.380876, 4.970782],
+              [95.293026, 5.479821],
+              [95.936863, 5.439513],
+              [97.484882, 5.246321],
+              [98.369169, 4.26837],
+              [99.142559, 3.59035],
+              [99.693998, 3.174329],
+              [100.641434, 2.099381],
+              [101.658012, 2.083697],
+              [102.498271, 1.3987],
+              [103.07684, 0.561361],
+              [103.838396, 0.104542],
+              [103.437645, -0.711946],
+              [104.010789, -1.059212],
+              [104.369991, -1.084843],
+              [104.53949, -1.782372],
+              [104.887893, -2.340425],
+              [105.622111, -2.428844],
+              [106.108593, -3.061777],
+              [105.857446, -4.305525],
+              [105.817655, -5.852356]
+            ]
+          ]
+        ]
+      },
+      "id": "IDN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "India" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [77.837451, 35.49401],
+            [78.912269, 34.321936],
+            [78.811086, 33.506198],
+            [79.208892, 32.994395],
+            [79.176129, 32.48378],
+            [78.458446, 32.618164],
+            [78.738894, 31.515906],
+            [79.721367, 30.882715],
+            [81.111256, 30.183481],
+            [80.476721, 29.729865],
+            [80.088425, 28.79447],
+            [81.057203, 28.416095],
+            [81.999987, 27.925479],
+            [83.304249, 27.364506],
+            [84.675018, 27.234901],
+            [85.251779, 26.726198],
+            [86.024393, 26.630985],
+            [87.227472, 26.397898],
+            [88.060238, 26.414615],
+            [88.174804, 26.810405],
+            [88.043133, 27.445819],
+            [88.120441, 27.876542],
+            [88.730326, 28.086865],
+            [88.814248, 27.299316],
+            [88.835643, 27.098966],
+            [89.744528, 26.719403],
+            [90.373275, 26.875724],
+            [91.217513, 26.808648],
+            [92.033484, 26.83831],
+            [92.103712, 27.452614],
+            [91.696657, 27.771742],
+            [92.503119, 27.896876],
+            [93.413348, 28.640629],
+            [94.56599, 29.277438],
+            [95.404802, 29.031717],
+            [96.117679, 29.452802],
+            [96.586591, 28.83098],
+            [96.248833, 28.411031],
+            [97.327114, 28.261583],
+            [97.402561, 27.882536],
+            [97.051989, 27.699059],
+            [97.133999, 27.083774],
+            [96.419366, 27.264589],
+            [95.124768, 26.573572],
+            [95.155153, 26.001307],
+            [94.603249, 25.162495],
+            [94.552658, 24.675238],
+            [94.106742, 23.850741],
+            [93.325188, 24.078556],
+            [93.286327, 23.043658],
+            [93.060294, 22.703111],
+            [93.166128, 22.27846],
+            [92.672721, 22.041239],
+            [92.146035, 23.627499],
+            [91.869928, 23.624346],
+            [91.706475, 22.985264],
+            [91.158963, 23.503527],
+            [91.46773, 24.072639],
+            [91.915093, 24.130414],
+            [92.376202, 24.976693],
+            [91.799596, 25.147432],
+            [90.872211, 25.132601],
+            [89.920693, 25.26975],
+            [89.832481, 25.965082],
+            [89.355094, 26.014407],
+            [88.563049, 26.446526],
+            [88.209789, 25.768066],
+            [88.931554, 25.238692],
+            [88.306373, 24.866079],
+            [88.084422, 24.501657],
+            [88.69994, 24.233715],
+            [88.52977, 23.631142],
+            [88.876312, 22.879146],
+            [89.031961, 22.055708],
+            [88.888766, 21.690588],
+            [88.208497, 21.703172],
+            [86.975704, 21.495562],
+            [87.033169, 20.743308],
+            [86.499351, 20.151638],
+            [85.060266, 19.478579],
+            [83.941006, 18.30201],
+            [83.189217, 17.671221],
+            [82.192792, 17.016636],
+            [82.191242, 16.556664],
+            [81.692719, 16.310219],
+            [80.791999, 15.951972],
+            [80.324896, 15.899185],
+            [80.025069, 15.136415],
+            [80.233274, 13.835771],
+            [80.286294, 13.006261],
+            [79.862547, 12.056215],
+            [79.857999, 10.357275],
+            [79.340512, 10.308854],
+            [78.885345, 9.546136],
+            [79.18972, 9.216544],
+            [78.277941, 8.933047],
+            [77.941165, 8.252959],
+            [77.539898, 7.965535],
+            [76.592979, 8.899276],
+            [76.130061, 10.29963],
+            [75.746467, 11.308251],
+            [75.396101, 11.781245],
+            [74.864816, 12.741936],
+            [74.616717, 13.992583],
+            [74.443859, 14.617222],
+            [73.534199, 15.990652],
+            [73.119909, 17.92857],
+            [72.820909, 19.208234],
+            [72.824475, 20.419503],
+            [72.630533, 21.356009],
+            [71.175273, 20.757441],
+            [70.470459, 20.877331],
+            [69.16413, 22.089298],
+            [69.644928, 22.450775],
+            [69.349597, 22.84318],
+            [68.176645, 23.691965],
+            [68.842599, 24.359134],
+            [71.04324, 24.356524],
+            [70.844699, 25.215102],
+            [70.282873, 25.722229],
+            [70.168927, 26.491872],
+            [69.514393, 26.940966],
+            [70.616496, 27.989196],
+            [71.777666, 27.91318],
+            [72.823752, 28.961592],
+            [73.450638, 29.976413],
+            [74.42138, 30.979815],
+            [74.405929, 31.692639],
+            [75.258642, 32.271105],
+            [74.451559, 32.7649],
+            [74.104294, 33.441473],
+            [73.749948, 34.317699],
+            [74.240203, 34.748887],
+            [75.757061, 34.504923],
+            [76.871722, 34.653544],
+            [77.837451, 35.49401]
+          ]
+        ]
+      },
+      "id": "IND"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Ireland" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-6.197885, 53.867565],
+            [-6.032985, 53.153164],
+            [-6.788857, 52.260118],
+            [-8.561617, 51.669301],
+            [-9.977086, 51.820455],
+            [-9.166283, 52.864629],
+            [-9.688525, 53.881363],
+            [-8.327987, 54.664519],
+            [-7.572168, 55.131622],
+            [-7.366031, 54.595841],
+            [-7.572168, 54.059956],
+            [-6.95373, 54.073702],
+            [-6.197885, 53.867565]
+          ]
+        ]
+      },
+      "id": "IRL"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Iran" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [53.921598, 37.198918],
+            [54.800304, 37.392421],
+            [55.511578, 37.964117],
+            [56.180375, 37.935127],
+            [56.619366, 38.121394],
+            [57.330434, 38.029229],
+            [58.436154, 37.522309],
+            [59.234762, 37.412988],
+            [60.377638, 36.527383],
+            [61.123071, 36.491597],
+            [61.210817, 35.650072],
+            [60.803193, 34.404102],
+            [60.52843, 33.676446],
+            [60.9637, 33.528832],
+            [60.536078, 32.981269],
+            [60.863655, 32.18292],
+            [60.941945, 31.548075],
+            [61.699314, 31.379506],
+            [61.781222, 30.73585],
+            [60.874248, 29.829239],
+            [61.369309, 29.303276],
+            [61.771868, 28.699334],
+            [62.72783, 28.259645],
+            [62.755426, 27.378923],
+            [63.233898, 27.217047],
+            [63.316632, 26.756532],
+            [61.874187, 26.239975],
+            [61.497363, 25.078237],
+            [59.616134, 25.380157],
+            [58.525761, 25.609962],
+            [57.397251, 25.739902],
+            [56.970766, 26.966106],
+            [56.492139, 27.143305],
+            [55.72371, 26.964633],
+            [54.71509, 26.480658],
+            [53.493097, 26.812369],
+            [52.483598, 27.580849],
+            [51.520763, 27.86569],
+            [50.852948, 28.814521],
+            [50.115009, 30.147773],
+            [49.57685, 29.985715],
+            [48.941333, 30.31709],
+            [48.567971, 29.926778],
+            [48.014568, 30.452457],
+            [48.004698, 30.985137],
+            [47.685286, 30.984853],
+            [47.849204, 31.709176],
+            [47.334661, 32.469155],
+            [46.109362, 33.017287],
+            [45.416691, 33.967798],
+            [45.64846, 34.748138],
+            [46.151788, 35.093259],
+            [46.07634, 35.677383],
+            [45.420618, 35.977546],
+            [44.77267, 37.17045],
+            [44.225756, 37.971584],
+            [44.421403, 38.281281],
+            [44.109225, 39.428136],
+            [44.79399, 39.713003],
+            [44.952688, 39.335765],
+            [45.457722, 38.874139],
+            [46.143623, 38.741201],
+            [46.50572, 38.770605],
+            [47.685079, 39.508364],
+            [48.060095, 39.582235],
+            [48.355529, 39.288765],
+            [48.010744, 38.794015],
+            [48.634375, 38.270378],
+            [48.883249, 38.320245],
+            [49.199612, 37.582874],
+            [50.147771, 37.374567],
+            [50.842354, 36.872814],
+            [52.264025, 36.700422],
+            [53.82579, 36.965031],
+            [53.921598, 37.198918]
+          ]
+        ]
+      },
+      "id": "IRN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Iraq" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [45.420618, 35.977546],
+            [46.07634, 35.677383],
+            [46.151788, 35.093259],
+            [45.64846, 34.748138],
+            [45.416691, 33.967798],
+            [46.109362, 33.017287],
+            [47.334661, 32.469155],
+            [47.849204, 31.709176],
+            [47.685286, 30.984853],
+            [48.004698, 30.985137],
+            [48.014568, 30.452457],
+            [48.567971, 29.926778],
+            [47.974519, 29.975819],
+            [47.302622, 30.05907],
+            [46.568713, 29.099025],
+            [44.709499, 29.178891],
+            [41.889981, 31.190009],
+            [40.399994, 31.889992],
+            [39.195468, 32.161009],
+            [38.792341, 33.378686],
+            [41.006159, 34.419372],
+            [41.383965, 35.628317],
+            [41.289707, 36.358815],
+            [41.837064, 36.605854],
+            [42.349591, 37.229873],
+            [42.779126, 37.385264],
+            [43.942259, 37.256228],
+            [44.293452, 37.001514],
+            [44.772699, 37.170445],
+            [45.420618, 35.977546]
+          ]
+        ]
+      },
+      "id": "IRQ"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Iceland" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-14.508695, 66.455892],
+            [-14.739637, 65.808748],
+            [-13.609732, 65.126671],
+            [-14.909834, 64.364082],
+            [-17.794438, 63.678749],
+            [-18.656246, 63.496383],
+            [-19.972755, 63.643635],
+            [-22.762972, 63.960179],
+            [-21.778484, 64.402116],
+            [-23.955044, 64.89113],
+            [-22.184403, 65.084968],
+            [-22.227423, 65.378594],
+            [-24.326184, 65.611189],
+            [-23.650515, 66.262519],
+            [-22.134922, 66.410469],
+            [-20.576284, 65.732112],
+            [-19.056842, 66.276601],
+            [-17.798624, 65.993853],
+            [-16.167819, 66.526792],
+            [-14.508695, 66.455892]
+          ]
+        ]
+      },
+      "id": "ISL"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Israel" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [35.719918, 32.709192],
+            [35.545665, 32.393992],
+            [35.18393, 32.532511],
+            [34.974641, 31.866582],
+            [35.225892, 31.754341],
+            [34.970507, 31.616778],
+            [34.927408, 31.353435],
+            [35.397561, 31.489086],
+            [35.420918, 31.100066],
+            [34.922603, 29.501326],
+            [34.265433, 31.219361],
+            [34.556372, 31.548824],
+            [34.488107, 31.605539],
+            [34.752587, 32.072926],
+            [34.955417, 32.827376],
+            [35.098457, 33.080539],
+            [35.126053, 33.0909],
+            [35.460709, 33.08904],
+            [35.552797, 33.264275],
+            [35.821101, 33.277426],
+            [35.836397, 32.868123],
+            [35.700798, 32.716014],
+            [35.719918, 32.709192]
+          ]
+        ]
+      },
+      "id": "ISR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Italy" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [15.520376, 38.231155],
+              [15.160243, 37.444046],
+              [15.309898, 37.134219],
+              [15.099988, 36.619987],
+              [14.335229, 36.996631],
+              [13.826733, 37.104531],
+              [12.431004, 37.61295],
+              [12.570944, 38.126381],
+              [13.741156, 38.034966],
+              [14.761249, 38.143874],
+              [15.520376, 38.231155]
+            ]
+          ],
+          [
+            [
+              [9.210012, 41.209991],
+              [9.809975, 40.500009],
+              [9.669519, 39.177376],
+              [9.214818, 39.240473],
+              [8.806936, 38.906618],
+              [8.428302, 39.171847],
+              [8.388253, 40.378311],
+              [8.159998, 40.950007],
+              [8.709991, 40.899984],
+              [9.210012, 41.209991]
+            ]
+          ],
+          [
+            [
+              [12.376485, 46.767559],
+              [13.806475, 46.509306],
+              [13.69811, 46.016778],
+              [13.93763, 45.591016],
+              [13.141606, 45.736692],
+              [12.328581, 45.381778],
+              [12.383875, 44.885374],
+              [12.261453, 44.600482],
+              [12.589237, 44.091366],
+              [13.526906, 43.587727],
+              [14.029821, 42.761008],
+              [15.14257, 41.95514],
+              [15.926191, 41.961315],
+              [16.169897, 41.740295],
+              [15.889346, 41.541082],
+              [16.785002, 41.179606],
+              [17.519169, 40.877143],
+              [18.376687, 40.355625],
+              [18.480247, 40.168866],
+              [18.293385, 39.810774],
+              [17.73838, 40.277671],
+              [16.869596, 40.442235],
+              [16.448743, 39.795401],
+              [17.17149, 39.4247],
+              [17.052841, 38.902871],
+              [16.635088, 38.843572],
+              [16.100961, 37.985899],
+              [15.684087, 37.908849],
+              [15.687963, 38.214593],
+              [15.891981, 38.750942],
+              [16.109332, 38.964547],
+              [15.718814, 39.544072],
+              [15.413613, 40.048357],
+              [14.998496, 40.172949],
+              [14.703268, 40.60455],
+              [14.060672, 40.786348],
+              [13.627985, 41.188287],
+              [12.888082, 41.25309],
+              [12.106683, 41.704535],
+              [11.191906, 42.355425],
+              [10.511948, 42.931463],
+              [10.200029, 43.920007],
+              [9.702488, 44.036279],
+              [8.888946, 44.366336],
+              [8.428561, 44.231228],
+              [7.850767, 43.767148],
+              [7.435185, 43.693845],
+              [7.549596, 44.127901],
+              [7.007562, 44.254767],
+              [6.749955, 45.028518],
+              [7.096652, 45.333099],
+              [6.802355, 45.70858],
+              [6.843593, 45.991147],
+              [7.273851, 45.776948],
+              [7.755992, 45.82449],
+              [8.31663, 46.163642],
+              [8.489952, 46.005151],
+              [8.966306, 46.036932],
+              [9.182882, 46.440215],
+              [9.922837, 46.314899],
+              [10.363378, 46.483571],
+              [10.442701, 46.893546],
+              [11.048556, 46.751359],
+              [11.164828, 46.941579],
+              [12.153088, 47.115393],
+              [12.376485, 46.767559]
+            ]
+          ]
+        ]
+      },
+      "id": "ITA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Jamaica" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-77.569601, 18.490525],
+            [-76.896619, 18.400867],
+            [-76.365359, 18.160701],
+            [-76.199659, 17.886867],
+            [-76.902561, 17.868238],
+            [-77.206341, 17.701116],
+            [-77.766023, 17.861597],
+            [-78.337719, 18.225968],
+            [-78.217727, 18.454533],
+            [-77.797365, 18.524218],
+            [-77.569601, 18.490525]
+          ]
+        ]
+      },
+      "id": "JAM"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Jordan" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [35.545665, 32.393992],
+            [35.719918, 32.709192],
+            [36.834062, 32.312938],
+            [38.792341, 33.378686],
+            [39.195468, 32.161009],
+            [39.004886, 32.010217],
+            [37.002166, 31.508413],
+            [37.998849, 30.5085],
+            [37.66812, 30.338665],
+            [37.503582, 30.003776],
+            [36.740528, 29.865283],
+            [36.501214, 29.505254],
+            [36.068941, 29.197495],
+            [34.956037, 29.356555],
+            [34.922603, 29.501326],
+            [35.420918, 31.100066],
+            [35.397561, 31.489086],
+            [35.545252, 31.782505],
+            [35.545665, 32.393992]
+          ]
+        ]
+      },
+      "id": "JOR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Japan" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [134.638428, 34.149234],
+              [134.766379, 33.806335],
+              [134.203416, 33.201178],
+              [133.79295, 33.521985],
+              [133.280268, 33.28957],
+              [133.014858, 32.704567],
+              [132.363115, 32.989382],
+              [132.371176, 33.463642],
+              [132.924373, 34.060299],
+              [133.492968, 33.944621],
+              [133.904106, 34.364931],
+              [134.638428, 34.149234]
+            ]
+          ],
+          [
+            [
+              [140.976388, 37.142074],
+              [140.59977, 36.343983],
+              [140.774074, 35.842877],
+              [140.253279, 35.138114],
+              [138.975528, 34.6676],
+              [137.217599, 34.606286],
+              [135.792983, 33.464805],
+              [135.120983, 33.849071],
+              [135.079435, 34.596545],
+              [133.340316, 34.375938],
+              [132.156771, 33.904933],
+              [130.986145, 33.885761],
+              [132.000036, 33.149992],
+              [131.33279, 31.450355],
+              [130.686318, 31.029579],
+              [130.20242, 31.418238],
+              [130.447676, 32.319475],
+              [129.814692, 32.61031],
+              [129.408463, 33.296056],
+              [130.353935, 33.604151],
+              [130.878451, 34.232743],
+              [131.884229, 34.749714],
+              [132.617673, 35.433393],
+              [134.608301, 35.731618],
+              [135.677538, 35.527134],
+              [136.723831, 37.304984],
+              [137.390612, 36.827391],
+              [138.857602, 37.827485],
+              [139.426405, 38.215962],
+              [140.05479, 39.438807],
+              [139.883379, 40.563312],
+              [140.305783, 41.195005],
+              [141.368973, 41.37856],
+              [141.914263, 39.991616],
+              [141.884601, 39.180865],
+              [140.959489, 38.174001],
+              [140.976388, 37.142074]
+            ]
+          ],
+          [
+            [
+              [143.910162, 44.1741],
+              [144.613427, 43.960883],
+              [145.320825, 44.384733],
+              [145.543137, 43.262088],
+              [144.059662, 42.988358],
+              [143.18385, 41.995215],
+              [141.611491, 42.678791],
+              [141.067286, 41.584594],
+              [139.955106, 41.569556],
+              [139.817544, 42.563759],
+              [140.312087, 43.333273],
+              [141.380549, 43.388825],
+              [141.671952, 44.772125],
+              [141.967645, 45.551483],
+              [143.14287, 44.510358],
+              [143.910162, 44.1741]
+            ]
+          ]
+        ]
+      },
+      "id": "JPN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Kazakhstan" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [70.962315, 42.266154],
+            [70.388965, 42.081308],
+            [69.070027, 41.384244],
+            [68.632483, 40.668681],
+            [68.259896, 40.662325],
+            [67.985856, 41.135991],
+            [66.714047, 41.168444],
+            [66.510649, 41.987644],
+            [66.023392, 41.994646],
+            [66.098012, 42.99766],
+            [64.900824, 43.728081],
+            [63.185787, 43.650075],
+            [62.0133, 43.504477],
+            [61.05832, 44.405817],
+            [60.239972, 44.784037],
+            [58.689989, 45.500014],
+            [58.503127, 45.586804],
+            [55.928917, 44.995858],
+            [55.968191, 41.308642],
+            [55.455251, 41.259859],
+            [54.755345, 42.043971],
+            [54.079418, 42.324109],
+            [52.944293, 42.116034],
+            [52.50246, 41.783316],
+            [52.446339, 42.027151],
+            [52.692112, 42.443895],
+            [52.501426, 42.792298],
+            [51.342427, 43.132975],
+            [50.891292, 44.031034],
+            [50.339129, 44.284016],
+            [50.305643, 44.609836],
+            [51.278503, 44.514854],
+            [51.316899, 45.245998],
+            [52.16739, 45.408391],
+            [53.040876, 45.259047],
+            [53.220866, 46.234646],
+            [53.042737, 46.853006],
+            [52.042023, 46.804637],
+            [51.191945, 47.048705],
+            [50.034083, 46.60899],
+            [49.10116, 46.39933],
+            [48.593241, 46.561034],
+            [48.694734, 47.075628],
+            [48.057253, 47.743753],
+            [47.315231, 47.715847],
+            [46.466446, 48.394152],
+            [47.043672, 49.152039],
+            [46.751596, 49.356006],
+            [47.54948, 50.454698],
+            [48.577841, 49.87476],
+            [48.702382, 50.605128],
+            [50.766648, 51.692762],
+            [52.328724, 51.718652],
+            [54.532878, 51.02624],
+            [55.716941, 50.621717],
+            [56.777961, 51.043551],
+            [58.363291, 51.063653],
+            [59.642282, 50.545442],
+            [59.932807, 50.842194],
+            [61.337424, 50.79907],
+            [61.588003, 51.272659],
+            [59.967534, 51.96042],
+            [60.927269, 52.447548],
+            [60.739993, 52.719986],
+            [61.699986, 52.979996],
+            [60.978066, 53.664993],
+            [61.436591, 54.006265],
+            [65.178534, 54.354228],
+            [65.666876, 54.601267],
+            [68.1691, 54.970392],
+            [69.068167, 55.38525],
+            [70.865267, 55.169734],
+            [71.180131, 54.133285],
+            [72.22415, 54.376655],
+            [73.508516, 54.035617],
+            [73.425679, 53.48981],
+            [74.384845, 53.546861],
+            [76.8911, 54.490524],
+            [76.525179, 54.177003],
+            [77.800916, 53.404415],
+            [80.03556, 50.864751],
+            [80.568447, 51.388336],
+            [81.945986, 50.812196],
+            [83.383004, 51.069183],
+            [83.935115, 50.889246],
+            [84.416377, 50.3114],
+            [85.11556, 50.117303],
+            [85.54127, 49.692859],
+            [86.829357, 49.826675],
+            [87.35997, 49.214981],
+            [86.598776, 48.549182],
+            [85.768233, 48.455751],
+            [85.720484, 47.452969],
+            [85.16429, 47.000956],
+            [83.180484, 47.330031],
+            [82.458926, 45.53965],
+            [81.947071, 45.317027],
+            [79.966106, 44.917517],
+            [80.866206, 43.180362],
+            [80.18015, 42.920068],
+            [80.25999, 42.349999],
+            [79.643645, 42.496683],
+            [79.142177, 42.856092],
+            [77.658392, 42.960686],
+            [76.000354, 42.988022],
+            [75.636965, 42.8779],
+            [74.212866, 43.298339],
+            [73.645304, 43.091272],
+            [73.489758, 42.500894],
+            [71.844638, 42.845395],
+            [71.186281, 42.704293],
+            [70.962315, 42.266154]
+          ]
+        ]
+      },
+      "id": "KAZ"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Kenya" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [40.993, -0.85829],
+            [41.58513, -1.68325],
+            [40.88477, -2.08255],
+            [40.63785, -2.49979],
+            [40.26304, -2.57309],
+            [40.12119, -3.27768],
+            [39.80006, -3.68116],
+            [39.60489, -4.34653],
+            [39.20222, -4.67677],
+            [37.7669, -3.67712],
+            [37.69869, -3.09699],
+            [34.07262, -1.05982],
+            [33.903711, -0.95],
+            [33.893569, 0.109814],
+            [34.18, 0.515],
+            [34.6721, 1.17694],
+            [35.03599, 1.90584],
+            [34.59607, 3.05374],
+            [34.47913, 3.5556],
+            [34.005, 4.249885],
+            [34.620196, 4.847123],
+            [35.298007, 5.506],
+            [35.817448, 5.338232],
+            [35.817448, 4.776966],
+            [36.159079, 4.447864],
+            [36.855093, 4.447864],
+            [38.120915, 3.598605],
+            [38.43697, 3.58851],
+            [38.67114, 3.61607],
+            [38.89251, 3.50074],
+            [39.559384, 3.42206],
+            [39.85494, 3.83879],
+            [40.76848, 4.25702],
+            [41.1718, 3.91909],
+            [41.855083, 3.918912],
+            [40.98105, 2.78452],
+            [40.993, -0.85829]
+          ]
+        ]
+      },
+      "id": "KEN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Kyrgyzstan" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [70.962315, 42.266154],
+            [71.186281, 42.704293],
+            [71.844638, 42.845395],
+            [73.489758, 42.500894],
+            [73.645304, 43.091272],
+            [74.212866, 43.298339],
+            [75.636965, 42.8779],
+            [76.000354, 42.988022],
+            [77.658392, 42.960686],
+            [79.142177, 42.856092],
+            [79.643645, 42.496683],
+            [80.25999, 42.349999],
+            [80.11943, 42.123941],
+            [78.543661, 41.582243],
+            [78.187197, 41.185316],
+            [76.904484, 41.066486],
+            [76.526368, 40.427946],
+            [75.467828, 40.562072],
+            [74.776862, 40.366425],
+            [73.822244, 39.893973],
+            [73.960013, 39.660008],
+            [73.675379, 39.431237],
+            [71.784694, 39.279463],
+            [70.549162, 39.604198],
+            [69.464887, 39.526683],
+            [69.55961, 40.103211],
+            [70.648019, 39.935754],
+            [71.014198, 40.244366],
+            [71.774875, 40.145844],
+            [73.055417, 40.866033],
+            [71.870115, 41.3929],
+            [71.157859, 41.143587],
+            [70.420022, 41.519998],
+            [71.259248, 42.167711],
+            [70.962315, 42.266154]
+          ]
+        ]
+      },
+      "id": "KGZ"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Cambodia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [103.49728, 10.632555],
+            [103.09069, 11.153661],
+            [102.584932, 12.186595],
+            [102.348099, 13.394247],
+            [102.988422, 14.225721],
+            [104.281418, 14.416743],
+            [105.218777, 14.273212],
+            [106.043946, 13.881091],
+            [106.496373, 14.570584],
+            [107.382727, 14.202441],
+            [107.614548, 13.535531],
+            [107.491403, 12.337206],
+            [105.810524, 11.567615],
+            [106.24967, 10.961812],
+            [105.199915, 10.88931],
+            [104.334335, 10.486544],
+            [103.49728, 10.632555]
+          ]
+        ]
+      },
+      "id": "KHM"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "South Korea" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [128.349716, 38.612243],
+            [129.21292, 37.432392],
+            [129.46045, 36.784189],
+            [129.468304, 35.632141],
+            [129.091377, 35.082484],
+            [128.18585, 34.890377],
+            [127.386519, 34.475674],
+            [126.485748, 34.390046],
+            [126.37392, 34.93456],
+            [126.559231, 35.684541],
+            [126.117398, 36.725485],
+            [126.860143, 36.893924],
+            [126.174759, 37.749686],
+            [126.237339, 37.840378],
+            [126.68372, 37.804773],
+            [127.073309, 38.256115],
+            [127.780035, 38.304536],
+            [128.205746, 38.370397],
+            [128.349716, 38.612243]
+          ]
+        ]
+      },
+      "id": "KOR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Kosovo" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [20.76216, 42.05186],
+            [20.71731, 41.84711],
+            [20.59023, 41.85541],
+            [20.52295, 42.21787],
+            [20.28374, 42.32025],
+            [20.0707, 42.58863],
+            [20.25758, 42.81275],
+            [20.49679, 42.88469],
+            [20.63508, 43.21671],
+            [20.81448, 43.27205],
+            [20.95651, 43.13094],
+            [21.143395, 43.068685],
+            [21.27421, 42.90959],
+            [21.43866, 42.86255],
+            [21.63302, 42.67717],
+            [21.77505, 42.6827],
+            [21.66292, 42.43922],
+            [21.54332, 42.32025],
+            [21.576636, 42.245224],
+            [21.3527, 42.2068],
+            [20.76216, 42.05186]
+          ]
+        ]
+      },
+      "id": "-99"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Kuwait" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [47.974519, 29.975819],
+            [48.183189, 29.534477],
+            [48.093943, 29.306299],
+            [48.416094, 28.552004],
+            [47.708851, 28.526063],
+            [47.459822, 29.002519],
+            [46.568713, 29.099025],
+            [47.302622, 30.05907],
+            [47.974519, 29.975819]
+          ]
+        ]
+      },
+      "id": "KWT"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Laos" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [105.218777, 14.273212],
+            [105.544338, 14.723934],
+            [105.589039, 15.570316],
+            [104.779321, 16.441865],
+            [104.716947, 17.428859],
+            [103.956477, 18.240954],
+            [103.200192, 18.309632],
+            [102.998706, 17.961695],
+            [102.413005, 17.932782],
+            [102.113592, 18.109102],
+            [101.059548, 17.512497],
+            [101.035931, 18.408928],
+            [101.282015, 19.462585],
+            [100.606294, 19.508344],
+            [100.548881, 20.109238],
+            [100.115988, 20.41785],
+            [100.329101, 20.786122],
+            [101.180005, 21.436573],
+            [101.270026, 21.201652],
+            [101.80312, 21.174367],
+            [101.652018, 22.318199],
+            [102.170436, 22.464753],
+            [102.754896, 21.675137],
+            [103.203861, 20.766562],
+            [104.435, 20.758733],
+            [104.822574, 19.886642],
+            [104.183388, 19.624668],
+            [103.896532, 19.265181],
+            [105.094598, 18.666975],
+            [105.925762, 17.485315],
+            [106.556008, 16.604284],
+            [107.312706, 15.908538],
+            [107.564525, 15.202173],
+            [107.382727, 14.202441],
+            [106.496373, 14.570584],
+            [106.043946, 13.881091],
+            [105.218777, 14.273212]
+          ]
+        ]
+      },
+      "id": "LAO"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Lebanon" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [35.821101, 33.277426],
+            [35.552797, 33.264275],
+            [35.460709, 33.08904],
+            [35.126053, 33.0909],
+            [35.482207, 33.90545],
+            [35.979592, 34.610058],
+            [35.998403, 34.644914],
+            [36.448194, 34.593935],
+            [36.61175, 34.201789],
+            [36.06646, 33.824912],
+            [35.821101, 33.277426]
+          ]
+        ]
+      },
+      "id": "LBN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Liberia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-7.712159, 4.364566],
+            [-7.974107, 4.355755],
+            [-9.004794, 4.832419],
+            [-9.91342, 5.593561],
+            [-10.765384, 6.140711],
+            [-11.438779, 6.785917],
+            [-11.199802, 7.105846],
+            [-11.146704, 7.396706],
+            [-10.695595, 7.939464],
+            [-10.230094, 8.406206],
+            [-10.016567, 8.428504],
+            [-9.755342, 8.541055],
+            [-9.33728, 7.928534],
+            [-9.403348, 7.526905],
+            [-9.208786, 7.313921],
+            [-8.926065, 7.309037],
+            [-8.722124, 7.711674],
+            [-8.439298, 7.686043],
+            [-8.485446, 7.395208],
+            [-8.385452, 6.911801],
+            [-8.60288, 6.467564],
+            [-8.311348, 6.193033],
+            [-7.993693, 6.12619],
+            [-7.570153, 5.707352],
+            [-7.539715, 5.313345],
+            [-7.635368, 5.188159],
+            [-7.712159, 4.364566]
+          ]
+        ]
+      },
+      "id": "LBR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Libya" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [14.8513, 22.86295],
+            [14.143871, 22.491289],
+            [13.581425, 23.040506],
+            [11.999506, 23.471668],
+            [11.560669, 24.097909],
+            [10.771364, 24.562532],
+            [10.303847, 24.379313],
+            [9.948261, 24.936954],
+            [9.910693, 25.365455],
+            [9.319411, 26.094325],
+            [9.716286, 26.512206],
+            [9.629056, 27.140953],
+            [9.756128, 27.688259],
+            [9.683885, 28.144174],
+            [9.859998, 28.95999],
+            [9.805634, 29.424638],
+            [9.48214, 30.307556],
+            [9.970017, 30.539325],
+            [10.056575, 30.961831],
+            [9.950225, 31.37607],
+            [10.636901, 31.761421],
+            [10.94479, 32.081815],
+            [11.432253, 32.368903],
+            [11.488787, 33.136996],
+            [12.66331, 32.79278],
+            [13.08326, 32.87882],
+            [13.91868, 32.71196],
+            [15.24563, 32.26508],
+            [15.71394, 31.37626],
+            [16.61162, 31.18218],
+            [18.02109, 30.76357],
+            [19.08641, 30.26639],
+            [19.57404, 30.52582],
+            [20.05335, 30.98576],
+            [19.82033, 31.75179],
+            [20.13397, 32.2382],
+            [20.85452, 32.7068],
+            [21.54298, 32.8432],
+            [22.89576, 32.63858],
+            [23.2368, 32.19149],
+            [23.60913, 32.18726],
+            [23.9275, 32.01667],
+            [24.92114, 31.89936],
+            [25.16482, 31.56915],
+            [24.80287, 31.08929],
+            [24.95762, 30.6616],
+            [24.70007, 30.04419],
+            [25, 29.238655],
+            [25, 25.6825],
+            [25, 22],
+            [25, 20.00304],
+            [23.85, 20],
+            [23.83766, 19.58047],
+            [19.84926, 21.49509],
+            [15.86085, 23.40972],
+            [14.8513, 22.86295]
+          ]
+        ]
+      },
+      "id": "LBY"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Sri Lanka" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [81.787959, 7.523055],
+            [81.637322, 6.481775],
+            [81.21802, 6.197141],
+            [80.348357, 5.96837],
+            [79.872469, 6.763463],
+            [79.695167, 8.200843],
+            [80.147801, 9.824078],
+            [80.838818, 9.268427],
+            [81.304319, 8.564206],
+            [81.787959, 7.523055]
+          ]
+        ]
+      },
+      "id": "LKA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Lesotho" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [28.978263, -28.955597],
+            [29.325166, -29.257387],
+            [29.018415, -29.743766],
+            [28.8484, -30.070051],
+            [28.291069, -30.226217],
+            [28.107205, -30.545732],
+            [27.749397, -30.645106],
+            [26.999262, -29.875954],
+            [27.532511, -29.242711],
+            [28.074338, -28.851469],
+            [28.5417, -28.647502],
+            [28.978263, -28.955597]
+          ]
+        ]
+      },
+      "id": "LSO"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Lithuania" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [22.731099, 54.327537],
+            [22.651052, 54.582741],
+            [22.757764, 54.856574],
+            [22.315724, 55.015299],
+            [21.268449, 55.190482],
+            [21.0558, 56.031076],
+            [22.201157, 56.337802],
+            [23.878264, 56.273671],
+            [24.860684, 56.372528],
+            [25.000934, 56.164531],
+            [25.533047, 56.100297],
+            [26.494331, 55.615107],
+            [26.588279, 55.167176],
+            [25.768433, 54.846963],
+            [25.536354, 54.282423],
+            [24.450684, 53.905702],
+            [23.484128, 53.912498],
+            [23.243987, 54.220567],
+            [22.731099, 54.327537]
+          ]
+        ]
+      },
+      "id": "LTU"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Luxembourg" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [6.043073, 50.128052],
+            [6.242751, 49.902226],
+            [6.18632, 49.463803],
+            [5.897759, 49.442667],
+            [5.674052, 49.529484],
+            [5.782417, 50.090328],
+            [6.043073, 50.128052]
+          ]
+        ]
+      },
+      "id": "LUX"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Latvia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [21.0558, 56.031076],
+            [21.090424, 56.783873],
+            [21.581866, 57.411871],
+            [22.524341, 57.753374],
+            [23.318453, 57.006236],
+            [24.12073, 57.025693],
+            [24.312863, 57.793424],
+            [25.164594, 57.970157],
+            [25.60281, 57.847529],
+            [26.463532, 57.476389],
+            [27.288185, 57.474528],
+            [27.770016, 57.244258],
+            [27.855282, 56.759326],
+            [28.176709, 56.16913],
+            [27.10246, 55.783314],
+            [26.494331, 55.615107],
+            [25.533047, 56.100297],
+            [25.000934, 56.164531],
+            [24.860684, 56.372528],
+            [23.878264, 56.273671],
+            [22.201157, 56.337802],
+            [21.0558, 56.031076]
+          ]
+        ]
+      },
+      "id": "LVA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Morocco" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-5.193863, 35.755182],
+            [-4.591006, 35.330712],
+            [-3.640057, 35.399855],
+            [-2.604306, 35.179093],
+            [-2.169914, 35.168396],
+            [-1.792986, 34.527919],
+            [-1.733455, 33.919713],
+            [-1.388049, 32.864015],
+            [-1.124551, 32.651522],
+            [-1.307899, 32.262889],
+            [-2.616605, 32.094346],
+            [-3.06898, 31.724498],
+            [-3.647498, 31.637294],
+            [-3.690441, 30.896952],
+            [-4.859646, 30.501188],
+            [-5.242129, 30.000443],
+            [-6.060632, 29.7317],
+            [-7.059228, 29.579228],
+            [-8.674116, 28.841289],
+            [-8.66559, 27.656426],
+            [-8.817809, 27.656426],
+            [-8.817828, 27.656426],
+            [-8.794884, 27.120696],
+            [-9.413037, 27.088476],
+            [-9.735343, 26.860945],
+            [-10.189424, 26.860945],
+            [-10.551263, 26.990808],
+            [-11.392555, 26.883424],
+            [-11.71822, 26.104092],
+            [-12.030759, 26.030866],
+            [-12.500963, 24.770116],
+            [-13.89111, 23.691009],
+            [-14.221168, 22.310163],
+            [-14.630833, 21.86094],
+            [-14.750955, 21.5006],
+            [-17.002962, 21.420734],
+            [-17.020428, 21.42231],
+            [-16.973248, 21.885745],
+            [-16.589137, 22.158234],
+            [-16.261922, 22.67934],
+            [-16.326414, 23.017768],
+            [-15.982611, 23.723358],
+            [-15.426004, 24.359134],
+            [-15.089332, 24.520261],
+            [-14.824645, 25.103533],
+            [-14.800926, 25.636265],
+            [-14.43994, 26.254418],
+            [-13.773805, 26.618892],
+            [-13.139942, 27.640148],
+            [-13.121613, 27.654148],
+            [-12.618837, 28.038186],
+            [-11.688919, 28.148644],
+            [-10.900957, 28.832142],
+            [-10.399592, 29.098586],
+            [-9.564811, 29.933574],
+            [-9.814718, 31.177736],
+            [-9.434793, 32.038096],
+            [-9.300693, 32.564679],
+            [-8.657476, 33.240245],
+            [-7.654178, 33.697065],
+            [-6.912544, 34.110476],
+            [-6.244342, 35.145865],
+            [-5.929994, 35.759988],
+            [-5.193863, 35.755182]
+          ]
+        ]
+      },
+      "id": "MAR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Moldova" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [26.619337, 48.220726],
+            [26.857824, 48.368211],
+            [27.522537, 48.467119],
+            [28.259547, 48.155562],
+            [28.670891, 48.118149],
+            [29.122698, 47.849095],
+            [29.050868, 47.510227],
+            [29.415135, 47.346645],
+            [29.559674, 46.928583],
+            [29.908852, 46.674361],
+            [29.83821, 46.525326],
+            [30.024659, 46.423937],
+            [29.759972, 46.349988],
+            [29.170654, 46.379262],
+            [29.072107, 46.517678],
+            [28.862972, 46.437889],
+            [28.933717, 46.25883],
+            [28.659987, 45.939987],
+            [28.485269, 45.596907],
+            [28.233554, 45.488283],
+            [28.054443, 45.944586],
+            [28.160018, 46.371563],
+            [28.12803, 46.810476],
+            [27.551166, 47.405117],
+            [27.233873, 47.826771],
+            [26.924176, 48.123264],
+            [26.619337, 48.220726]
+          ]
+        ]
+      },
+      "id": "MDA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Madagascar" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [49.543519, -12.469833],
+            [49.808981, -12.895285],
+            [50.056511, -13.555761],
+            [50.217431, -14.758789],
+            [50.476537, -15.226512],
+            [50.377111, -15.706069],
+            [50.200275, -16.000263],
+            [49.860606, -15.414253],
+            [49.672607, -15.710204],
+            [49.863344, -16.451037],
+            [49.774564, -16.875042],
+            [49.498612, -17.106036],
+            [49.435619, -17.953064],
+            [49.041792, -19.118781],
+            [48.548541, -20.496888],
+            [47.930749, -22.391501],
+            [47.547723, -23.781959],
+            [47.095761, -24.94163],
+            [46.282478, -25.178463],
+            [45.409508, -25.601434],
+            [44.833574, -25.346101],
+            [44.03972, -24.988345],
+            [43.763768, -24.460677],
+            [43.697778, -23.574116],
+            [43.345654, -22.776904],
+            [43.254187, -22.057413],
+            [43.433298, -21.336475],
+            [43.893683, -21.163307],
+            [43.89637, -20.830459],
+            [44.374325, -20.072366],
+            [44.464397, -19.435454],
+            [44.232422, -18.961995],
+            [44.042976, -18.331387],
+            [43.963084, -17.409945],
+            [44.312469, -16.850496],
+            [44.446517, -16.216219],
+            [44.944937, -16.179374],
+            [45.502732, -15.974373],
+            [45.872994, -15.793454],
+            [46.312243, -15.780018],
+            [46.882183, -15.210182],
+            [47.70513, -14.594303],
+            [48.005215, -14.091233],
+            [47.869047, -13.663869],
+            [48.293828, -13.784068],
+            [48.84506, -13.089175],
+            [48.863509, -12.487868],
+            [49.194651, -12.040557],
+            [49.543519, -12.469833]
+          ]
+        ]
+      },
+      "id": "MDG"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Mexico" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-97.140008, 25.869997],
+            [-97.528072, 24.992144],
+            [-97.702946, 24.272343],
+            [-97.776042, 22.93258],
+            [-97.872367, 22.444212],
+            [-97.699044, 21.898689],
+            [-97.38896, 21.411019],
+            [-97.189333, 20.635433],
+            [-96.525576, 19.890931],
+            [-96.292127, 19.320371],
+            [-95.900885, 18.828024],
+            [-94.839063, 18.562717],
+            [-94.42573, 18.144371],
+            [-93.548651, 18.423837],
+            [-92.786114, 18.524839],
+            [-92.037348, 18.704569],
+            [-91.407903, 18.876083],
+            [-90.77187, 19.28412],
+            [-90.53359, 19.867418],
+            [-90.451476, 20.707522],
+            [-90.278618, 20.999855],
+            [-89.601321, 21.261726],
+            [-88.543866, 21.493675],
+            [-87.658417, 21.458846],
+            [-87.05189, 21.543543],
+            [-86.811982, 21.331515],
+            [-86.845908, 20.849865],
+            [-87.383291, 20.255405],
+            [-87.621054, 19.646553],
+            [-87.43675, 19.472403],
+            [-87.58656, 19.04013],
+            [-87.837191, 18.259816],
+            [-88.090664, 18.516648],
+            [-88.300031, 18.499982],
+            [-88.490123, 18.486831],
+            [-88.848344, 17.883198],
+            [-89.029857, 18.001511],
+            [-89.150909, 17.955468],
+            [-89.14308, 17.808319],
+            [-90.067934, 17.819326],
+            [-91.00152, 17.817595],
+            [-91.002269, 17.254658],
+            [-91.453921, 17.252177],
+            [-91.08167, 16.918477],
+            [-90.711822, 16.687483],
+            [-90.600847, 16.470778],
+            [-90.438867, 16.41011],
+            [-90.464473, 16.069562],
+            [-91.74796, 16.066565],
+            [-92.229249, 15.251447],
+            [-92.087216, 15.064585],
+            [-92.20323, 14.830103],
+            [-92.22775, 14.538829],
+            [-93.359464, 15.61543],
+            [-93.875169, 15.940164],
+            [-94.691656, 16.200975],
+            [-95.250227, 16.128318],
+            [-96.053382, 15.752088],
+            [-96.557434, 15.653515],
+            [-97.263592, 15.917065],
+            [-98.01303, 16.107312],
+            [-98.947676, 16.566043],
+            [-99.697397, 16.706164],
+            [-100.829499, 17.171071],
+            [-101.666089, 17.649026],
+            [-101.918528, 17.91609],
+            [-102.478132, 17.975751],
+            [-103.50099, 18.292295],
+            [-103.917527, 18.748572],
+            [-104.99201, 19.316134],
+            [-105.493038, 19.946767],
+            [-105.731396, 20.434102],
+            [-105.397773, 20.531719],
+            [-105.500661, 20.816895],
+            [-105.270752, 21.076285],
+            [-105.265817, 21.422104],
+            [-105.603161, 21.871146],
+            [-105.693414, 22.26908],
+            [-106.028716, 22.773752],
+            [-106.90998, 23.767774],
+            [-107.915449, 24.548915],
+            [-108.401905, 25.172314],
+            [-109.260199, 25.580609],
+            [-109.444089, 25.824884],
+            [-109.291644, 26.442934],
+            [-109.801458, 26.676176],
+            [-110.391732, 27.162115],
+            [-110.641019, 27.859876],
+            [-111.178919, 27.941241],
+            [-111.759607, 28.467953],
+            [-112.228235, 28.954409],
+            [-112.271824, 29.266844],
+            [-112.809594, 30.021114],
+            [-113.163811, 30.786881],
+            [-113.148669, 31.170966],
+            [-113.871881, 31.567608],
+            [-114.205737, 31.524045],
+            [-114.776451, 31.799532],
+            [-114.9367, 31.393485],
+            [-114.771232, 30.913617],
+            [-114.673899, 30.162681],
+            [-114.330974, 29.750432],
+            [-113.588875, 29.061611],
+            [-113.424053, 28.826174],
+            [-113.271969, 28.754783],
+            [-113.140039, 28.411289],
+            [-112.962298, 28.42519],
+            [-112.761587, 27.780217],
+            [-112.457911, 27.525814],
+            [-112.244952, 27.171727],
+            [-111.616489, 26.662817],
+            [-111.284675, 25.73259],
+            [-110.987819, 25.294606],
+            [-110.710007, 24.826004],
+            [-110.655049, 24.298595],
+            [-110.172856, 24.265548],
+            [-109.771847, 23.811183],
+            [-109.409104, 23.364672],
+            [-109.433392, 23.185588],
+            [-109.854219, 22.818272],
+            [-110.031392, 22.823078],
+            [-110.295071, 23.430973],
+            [-110.949501, 24.000964],
+            [-111.670568, 24.484423],
+            [-112.182036, 24.738413],
+            [-112.148989, 25.470125],
+            [-112.300711, 26.012004],
+            [-112.777297, 26.32196],
+            [-113.464671, 26.768186],
+            [-113.59673, 26.63946],
+            [-113.848937, 26.900064],
+            [-114.465747, 27.14209],
+            [-115.055142, 27.722727],
+            [-114.982253, 27.7982],
+            [-114.570366, 27.741485],
+            [-114.199329, 28.115003],
+            [-114.162018, 28.566112],
+            [-114.931842, 29.279479],
+            [-115.518654, 29.556362],
+            [-115.887365, 30.180794],
+            [-116.25835, 30.836464],
+            [-116.721526, 31.635744],
+            [-117.12776, 32.53534],
+            [-115.99135, 32.61239],
+            [-114.72139, 32.72083],
+            [-114.815, 32.52528],
+            [-113.30498, 32.03914],
+            [-111.02361, 31.33472],
+            [-109.035, 31.34194],
+            [-108.24194, 31.34222],
+            [-108.24, 31.754854],
+            [-106.50759, 31.75452],
+            [-106.1429, 31.39995],
+            [-105.63159, 31.08383],
+            [-105.03737, 30.64402],
+            [-104.70575, 30.12173],
+            [-104.45697, 29.57196],
+            [-103.94, 29.27],
+            [-103.11, 28.97],
+            [-102.48, 29.76],
+            [-101.6624, 29.7793],
+            [-100.9576, 29.38071],
+            [-100.45584, 28.69612],
+            [-100.11, 28.11],
+            [-99.52, 27.54],
+            [-99.3, 26.84],
+            [-99.02, 26.37],
+            [-98.24, 26.06],
+            [-97.53, 25.84],
+            [-97.140008, 25.869997]
+          ]
+        ]
+      },
+      "id": "MEX"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Macedonia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [20.59023, 41.85541],
+            [20.71731, 41.84711],
+            [20.76216, 42.05186],
+            [21.3527, 42.2068],
+            [21.576636, 42.245224],
+            [21.91708, 42.30364],
+            [22.380526, 42.32026],
+            [22.881374, 41.999297],
+            [22.952377, 41.337994],
+            [22.76177, 41.3048],
+            [22.597308, 41.130487],
+            [22.055378, 41.149866],
+            [21.674161, 40.931275],
+            [21.02004, 40.842727],
+            [20.60518, 41.08622],
+            [20.46315, 41.51509],
+            [20.59023, 41.85541]
+          ]
+        ]
+      },
+      "id": "MKD"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Mali" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-12.17075, 14.616834],
+            [-11.834208, 14.799097],
+            [-11.666078, 15.388208],
+            [-11.349095, 15.411256],
+            [-10.650791, 15.132746],
+            [-10.086846, 15.330486],
+            [-9.700255, 15.264107],
+            [-9.550238, 15.486497],
+            [-5.537744, 15.50169],
+            [-5.315277, 16.201854],
+            [-5.488523, 16.325102],
+            [-5.971129, 20.640833],
+            [-6.453787, 24.956591],
+            [-4.923337, 24.974574],
+            [-1.550055, 22.792666],
+            [1.823228, 20.610809],
+            [2.060991, 20.142233],
+            [2.683588, 19.85623],
+            [3.146661, 19.693579],
+            [3.158133, 19.057364],
+            [4.267419, 19.155265],
+            [4.27021, 16.852227],
+            [3.723422, 16.184284],
+            [3.638259, 15.56812],
+            [2.749993, 15.409525],
+            [1.385528, 15.323561],
+            [1.015783, 14.968182],
+            [0.374892, 14.928908],
+            [-0.266257, 14.924309],
+            [-0.515854, 15.116158],
+            [-1.066363, 14.973815],
+            [-2.001035, 14.559008],
+            [-2.191825, 14.246418],
+            [-2.967694, 13.79815],
+            [-3.103707, 13.541267],
+            [-3.522803, 13.337662],
+            [-4.006391, 13.472485],
+            [-4.280405, 13.228444],
+            [-4.427166, 12.542646],
+            [-5.220942, 11.713859],
+            [-5.197843, 11.375146],
+            [-5.470565, 10.95127],
+            [-5.404342, 10.370737],
+            [-5.816926, 10.222555],
+            [-6.050452, 10.096361],
+            [-6.205223, 10.524061],
+            [-6.493965, 10.411303],
+            [-6.666461, 10.430811],
+            [-6.850507, 10.138994],
+            [-7.622759, 10.147236],
+            [-7.89959, 10.297382],
+            [-8.029944, 10.206535],
+            [-8.335377, 10.494812],
+            [-8.282357, 10.792597],
+            [-8.407311, 10.909257],
+            [-8.620321, 10.810891],
+            [-8.581305, 11.136246],
+            [-8.376305, 11.393646],
+            [-8.786099, 11.812561],
+            [-8.905265, 12.088358],
+            [-9.127474, 12.30806],
+            [-9.327616, 12.334286],
+            [-9.567912, 12.194243],
+            [-9.890993, 12.060479],
+            [-10.165214, 11.844084],
+            [-10.593224, 11.923975],
+            [-10.87083, 12.177887],
+            [-11.036556, 12.211245],
+            [-11.297574, 12.077971],
+            [-11.456169, 12.076834],
+            [-11.513943, 12.442988],
+            [-11.467899, 12.754519],
+            [-11.553398, 13.141214],
+            [-11.927716, 13.422075],
+            [-12.124887, 13.994727],
+            [-12.17075, 14.616834]
+          ]
+        ]
+      },
+      "id": "MLI"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Myanmar" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [99.543309, 20.186598],
+            [98.959676, 19.752981],
+            [98.253724, 19.708203],
+            [97.797783, 18.62708],
+            [97.375896, 18.445438],
+            [97.859123, 17.567946],
+            [98.493761, 16.837836],
+            [98.903348, 16.177824],
+            [98.537376, 15.308497],
+            [98.192074, 15.123703],
+            [98.430819, 14.622028],
+            [99.097755, 13.827503],
+            [99.212012, 13.269294],
+            [99.196354, 12.804748],
+            [99.587286, 11.892763],
+            [99.038121, 10.960546],
+            [98.553551, 9.93296],
+            [98.457174, 10.675266],
+            [98.764546, 11.441292],
+            [98.428339, 12.032987],
+            [98.509574, 13.122378],
+            [98.103604, 13.64046],
+            [97.777732, 14.837286],
+            [97.597072, 16.100568],
+            [97.16454, 16.928734],
+            [96.505769, 16.427241],
+            [95.369352, 15.71439],
+            [94.808405, 15.803454],
+            [94.188804, 16.037936],
+            [94.533486, 17.27724],
+            [94.324817, 18.213514],
+            [93.540988, 19.366493],
+            [93.663255, 19.726962],
+            [93.078278, 19.855145],
+            [92.368554, 20.670883],
+            [92.303234, 21.475485],
+            [92.652257, 21.324048],
+            [92.672721, 22.041239],
+            [93.166128, 22.27846],
+            [93.060294, 22.703111],
+            [93.286327, 23.043658],
+            [93.325188, 24.078556],
+            [94.106742, 23.850741],
+            [94.552658, 24.675238],
+            [94.603249, 25.162495],
+            [95.155153, 26.001307],
+            [95.124768, 26.573572],
+            [96.419366, 27.264589],
+            [97.133999, 27.083774],
+            [97.051989, 27.699059],
+            [97.402561, 27.882536],
+            [97.327114, 28.261583],
+            [97.911988, 28.335945],
+            [98.246231, 27.747221],
+            [98.68269, 27.508812],
+            [98.712094, 26.743536],
+            [98.671838, 25.918703],
+            [97.724609, 25.083637],
+            [97.60472, 23.897405],
+            [98.660262, 24.063286],
+            [98.898749, 23.142722],
+            [99.531992, 22.949039],
+            [99.240899, 22.118314],
+            [99.983489, 21.742937],
+            [100.416538, 21.558839],
+            [101.150033, 21.849984],
+            [101.180005, 21.436573],
+            [100.329101, 20.786122],
+            [100.115988, 20.41785],
+            [99.543309, 20.186598]
+          ]
+        ]
+      },
+      "id": "MMR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Montenegro" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [19.801613, 42.500093],
+            [19.738051, 42.688247],
+            [19.30449, 42.19574],
+            [19.37177, 41.87755],
+            [19.16246, 41.95502],
+            [18.88214, 42.28151],
+            [18.45, 42.48],
+            [18.56, 42.65],
+            [18.70648, 43.20011],
+            [19.03165, 43.43253],
+            [19.21852, 43.52384],
+            [19.48389, 43.35229],
+            [19.63, 43.21378],
+            [19.95857, 43.10604],
+            [20.3398, 42.89852],
+            [20.25758, 42.81275],
+            [20.0707, 42.58863],
+            [19.801613, 42.500093]
+          ]
+        ]
+      },
+      "id": "MNE"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Mongolia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [87.751264, 49.297198],
+            [88.805567, 49.470521],
+            [90.713667, 50.331812],
+            [92.234712, 50.802171],
+            [93.104219, 50.49529],
+            [94.147566, 50.480537],
+            [94.815949, 50.013433],
+            [95.814028, 49.977467],
+            [97.259728, 49.726061],
+            [98.231762, 50.422401],
+            [97.82574, 51.010995],
+            [98.861491, 52.047366],
+            [99.981732, 51.634006],
+            [100.88948, 51.516856],
+            [102.065223, 51.259921],
+            [102.255909, 50.510561],
+            [103.676545, 50.089966],
+            [104.621552, 50.275329],
+            [105.886591, 50.406019],
+            [106.888804, 50.274296],
+            [107.868176, 49.793705],
+            [108.475167, 49.282548],
+            [109.402449, 49.292961],
+            [110.662011, 49.130128],
+            [111.581231, 49.377968],
+            [112.89774, 49.543565],
+            [114.362456, 50.248303],
+            [114.96211, 50.140247],
+            [115.485695, 49.805177],
+            [116.678801, 49.888531],
+            [116.191802, 49.134598],
+            [115.485282, 48.135383],
+            [115.742837, 47.726545],
+            [116.308953, 47.85341],
+            [117.295507, 47.697709],
+            [118.064143, 48.06673],
+            [118.866574, 47.74706],
+            [119.772824, 47.048059],
+            [119.66327, 46.69268],
+            [118.874326, 46.805412],
+            [117.421701, 46.672733],
+            [116.717868, 46.388202],
+            [115.985096, 45.727235],
+            [114.460332, 45.339817],
+            [113.463907, 44.808893],
+            [112.436062, 45.011646],
+            [111.873306, 45.102079],
+            [111.348377, 44.457442],
+            [111.667737, 44.073176],
+            [111.829588, 43.743118],
+            [111.129682, 43.406834],
+            [110.412103, 42.871234],
+            [109.243596, 42.519446],
+            [107.744773, 42.481516],
+            [106.129316, 42.134328],
+            [104.964994, 41.59741],
+            [104.522282, 41.908347],
+            [103.312278, 41.907468],
+            [101.83304, 42.514873],
+            [100.845866, 42.663804],
+            [99.515817, 42.524691],
+            [97.451757, 42.74889],
+            [96.349396, 42.725635],
+            [95.762455, 43.319449],
+            [95.306875, 44.241331],
+            [94.688929, 44.352332],
+            [93.480734, 44.975472],
+            [92.133891, 45.115076],
+            [90.94554, 45.286073],
+            [90.585768, 45.719716],
+            [90.970809, 46.888146],
+            [90.280826, 47.693549],
+            [88.854298, 48.069082],
+            [88.013832, 48.599463],
+            [87.751264, 49.297198]
+          ]
+        ]
+      },
+      "id": "MNG"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Mozambique" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [34.559989, -11.52002],
+            [35.312398, -11.439146],
+            [36.514082, -11.720938],
+            [36.775151, -11.594537],
+            [37.471284, -11.568751],
+            [37.827645, -11.268769],
+            [38.427557, -11.285202],
+            [39.52103, -10.896854],
+            [40.316589, -10.317096],
+            [40.478387, -10.765441],
+            [40.437253, -11.761711],
+            [40.560811, -12.639177],
+            [40.59962, -14.201975],
+            [40.775475, -14.691764],
+            [40.477251, -15.406294],
+            [40.089264, -16.100774],
+            [39.452559, -16.720891],
+            [38.538351, -17.101023],
+            [37.411133, -17.586368],
+            [36.281279, -18.659688],
+            [35.896497, -18.84226],
+            [35.1984, -19.552811],
+            [34.786383, -19.784012],
+            [34.701893, -20.497043],
+            [35.176127, -21.254361],
+            [35.373428, -21.840837],
+            [35.385848, -22.14],
+            [35.562546, -22.09],
+            [35.533935, -23.070788],
+            [35.371774, -23.535359],
+            [35.60747, -23.706563],
+            [35.458746, -24.12261],
+            [35.040735, -24.478351],
+            [34.215824, -24.816314],
+            [33.01321, -25.357573],
+            [32.574632, -25.727318],
+            [32.660363, -26.148584],
+            [32.915955, -26.215867],
+            [32.83012, -26.742192],
+            [32.071665, -26.73382],
+            [31.985779, -26.29178],
+            [31.837778, -25.843332],
+            [31.752408, -25.484284],
+            [31.930589, -24.369417],
+            [31.670398, -23.658969],
+            [31.191409, -22.25151],
+            [32.244988, -21.116489],
+            [32.508693, -20.395292],
+            [32.659743, -20.30429],
+            [32.772708, -19.715592],
+            [32.611994, -19.419383],
+            [32.654886, -18.67209],
+            [32.849861, -17.979057],
+            [32.847639, -16.713398],
+            [32.328239, -16.392074],
+            [31.852041, -16.319417],
+            [31.636498, -16.07199],
+            [31.173064, -15.860944],
+            [30.338955, -15.880839],
+            [30.274256, -15.507787],
+            [30.179481, -14.796099],
+            [33.214025, -13.97186],
+            [33.7897, -14.451831],
+            [34.064825, -14.35995],
+            [34.459633, -14.61301],
+            [34.517666, -15.013709],
+            [34.307291, -15.478641],
+            [34.381292, -16.18356],
+            [35.03381, -16.8013],
+            [35.339063, -16.10744],
+            [35.771905, -15.896859],
+            [35.686845, -14.611046],
+            [35.267956, -13.887834],
+            [34.907151, -13.565425],
+            [34.559989, -13.579998],
+            [34.280006, -12.280025],
+            [34.559989, -11.52002]
+          ]
+        ]
+      },
+      "id": "MOZ"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Mauritania" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-12.17075, 14.616834],
+            [-12.830658, 15.303692],
+            [-13.435738, 16.039383],
+            [-14.099521, 16.304302],
+            [-14.577348, 16.598264],
+            [-15.135737, 16.587282],
+            [-15.623666, 16.369337],
+            [-16.12069, 16.455663],
+            [-16.463098, 16.135036],
+            [-16.549708, 16.673892],
+            [-16.270552, 17.166963],
+            [-16.146347, 18.108482],
+            [-16.256883, 19.096716],
+            [-16.377651, 19.593817],
+            [-16.277838, 20.092521],
+            [-16.536324, 20.567866],
+            [-17.063423, 20.999752],
+            [-16.845194, 21.333323],
+            [-12.929102, 21.327071],
+            [-13.118754, 22.77122],
+            [-12.874222, 23.284832],
+            [-11.937224, 23.374594],
+            [-11.969419, 25.933353],
+            [-8.687294, 25.881056],
+            [-8.6844, 27.395744],
+            [-4.923337, 24.974574],
+            [-6.453787, 24.956591],
+            [-5.971129, 20.640833],
+            [-5.488523, 16.325102],
+            [-5.315277, 16.201854],
+            [-5.537744, 15.50169],
+            [-9.550238, 15.486497],
+            [-9.700255, 15.264107],
+            [-10.086846, 15.330486],
+            [-10.650791, 15.132746],
+            [-11.349095, 15.411256],
+            [-11.666078, 15.388208],
+            [-11.834208, 14.799097],
+            [-12.17075, 14.616834]
+          ]
+        ]
+      },
+      "id": "MRT"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Malawi" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [34.559989, -11.52002],
+            [34.280006, -12.280025],
+            [34.559989, -13.579998],
+            [34.907151, -13.565425],
+            [35.267956, -13.887834],
+            [35.686845, -14.611046],
+            [35.771905, -15.896859],
+            [35.339063, -16.10744],
+            [35.03381, -16.8013],
+            [34.381292, -16.18356],
+            [34.307291, -15.478641],
+            [34.517666, -15.013709],
+            [34.459633, -14.61301],
+            [34.064825, -14.35995],
+            [33.7897, -14.451831],
+            [33.214025, -13.97186],
+            [32.688165, -13.712858],
+            [32.991764, -12.783871],
+            [33.306422, -12.435778],
+            [33.114289, -11.607198],
+            [33.31531, -10.79655],
+            [33.485688, -10.525559],
+            [33.231388, -9.676722],
+            [32.759375, -9.230599],
+            [33.739729, -9.417151],
+            [33.940838, -9.693674],
+            [34.280006, -10.16],
+            [34.559989, -11.52002]
+          ]
+        ]
+      },
+      "id": "MWI"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Malaysia" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [101.075516, 6.204867],
+              [101.154219, 5.691384],
+              [101.814282, 5.810808],
+              [102.141187, 6.221636],
+              [102.371147, 6.128205],
+              [102.961705, 5.524495],
+              [103.381215, 4.855001],
+              [103.438575, 4.181606],
+              [103.332122, 3.726698],
+              [103.429429, 3.382869],
+              [103.502448, 2.791019],
+              [103.854674, 2.515454],
+              [104.247932, 1.631141],
+              [104.228811, 1.293048],
+              [103.519707, 1.226334],
+              [102.573615, 1.967115],
+              [101.390638, 2.760814],
+              [101.27354, 3.270292],
+              [100.695435, 3.93914],
+              [100.557408, 4.76728],
+              [100.196706, 5.312493],
+              [100.30626, 6.040562],
+              [100.085757, 6.464489],
+              [100.259596, 6.642825],
+              [101.075516, 6.204867]
+            ]
+          ],
+          [
+            [
+              [118.618321, 4.478202],
+              [117.882035, 4.137551],
+              [117.015214, 4.306094],
+              [115.865517, 4.306559],
+              [115.519078, 3.169238],
+              [115.134037, 2.821482],
+              [114.621355, 1.430688],
+              [113.80585, 1.217549],
+              [112.859809, 1.49779],
+              [112.380252, 1.410121],
+              [111.797548, 0.904441],
+              [111.159138, 0.976478],
+              [110.514061, 0.773131],
+              [109.830227, 1.338136],
+              [109.66326, 2.006467],
+              [110.396135, 1.663775],
+              [111.168853, 1.850637],
+              [111.370081, 2.697303],
+              [111.796928, 2.885897],
+              [112.995615, 3.102395],
+              [113.712935, 3.893509],
+              [114.204017, 4.525874],
+              [114.659596, 4.007637],
+              [114.869557, 4.348314],
+              [115.347461, 4.316636],
+              [115.4057, 4.955228],
+              [115.45071, 5.44773],
+              [116.220741, 6.143191],
+              [116.725103, 6.924771],
+              [117.129626, 6.928053],
+              [117.643393, 6.422166],
+              [117.689075, 5.98749],
+              [118.347691, 5.708696],
+              [119.181904, 5.407836],
+              [119.110694, 5.016128],
+              [118.439727, 4.966519],
+              [118.618321, 4.478202]
+            ]
+          ]
+        ]
+      },
+      "id": "MYS"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Namibia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [16.344977, -28.576705],
+            [15.601818, -27.821247],
+            [15.210472, -27.090956],
+            [14.989711, -26.117372],
+            [14.743214, -25.39292],
+            [14.408144, -23.853014],
+            [14.385717, -22.656653],
+            [14.257714, -22.111208],
+            [13.868642, -21.699037],
+            [13.352498, -20.872834],
+            [12.826845, -19.673166],
+            [12.608564, -19.045349],
+            [11.794919, -18.069129],
+            [11.734199, -17.301889],
+            [12.215461, -17.111668],
+            [12.814081, -16.941343],
+            [13.462362, -16.971212],
+            [14.058501, -17.423381],
+            [14.209707, -17.353101],
+            [18.263309, -17.309951],
+            [18.956187, -17.789095],
+            [21.377176, -17.930636],
+            [23.215048, -17.523116],
+            [24.033862, -17.295843],
+            [24.682349, -17.353411],
+            [25.07695, -17.578823],
+            [25.084443, -17.661816],
+            [24.520705, -17.887125],
+            [24.217365, -17.889347],
+            [23.579006, -18.281261],
+            [23.196858, -17.869038],
+            [21.65504, -18.219146],
+            [20.910641, -18.252219],
+            [20.881134, -21.814327],
+            [19.895458, -21.849157],
+            [19.895768, -24.76779],
+            [19.894734, -28.461105],
+            [19.002127, -28.972443],
+            [18.464899, -29.045462],
+            [17.836152, -28.856378],
+            [17.387497, -28.783514],
+            [17.218929, -28.355943],
+            [16.824017, -28.082162],
+            [16.344977, -28.576705]
+          ]
+        ]
+      },
+      "id": "NAM"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "New Caledonia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [165.77999, -21.080005],
+            [166.599991, -21.700019],
+            [167.120011, -22.159991],
+            [166.740035, -22.399976],
+            [166.189732, -22.129708],
+            [165.474375, -21.679607],
+            [164.829815, -21.14982],
+            [164.167995, -20.444747],
+            [164.029606, -20.105646],
+            [164.459967, -20.120012],
+            [165.020036, -20.459991],
+            [165.460009, -20.800022],
+            [165.77999, -21.080005]
+          ]
+        ]
+      },
+      "id": "NCL"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Niger" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [2.154474, 11.94015],
+            [2.177108, 12.625018],
+            [1.024103, 12.851826],
+            [0.993046, 13.33575],
+            [0.429928, 13.988733],
+            [0.295646, 14.444235],
+            [0.374892, 14.928908],
+            [1.015783, 14.968182],
+            [1.385528, 15.323561],
+            [2.749993, 15.409525],
+            [3.638259, 15.56812],
+            [3.723422, 16.184284],
+            [4.27021, 16.852227],
+            [4.267419, 19.155265],
+            [5.677566, 19.601207],
+            [8.572893, 21.565661],
+            [11.999506, 23.471668],
+            [13.581425, 23.040506],
+            [14.143871, 22.491289],
+            [14.8513, 22.86295],
+            [15.096888, 21.308519],
+            [15.471077, 21.048457],
+            [15.487148, 20.730415],
+            [15.903247, 20.387619],
+            [15.685741, 19.95718],
+            [15.300441, 17.92795],
+            [15.247731, 16.627306],
+            [13.972202, 15.684366],
+            [13.540394, 14.367134],
+            [13.956699, 13.996691],
+            [13.954477, 13.353449],
+            [14.595781, 13.330427],
+            [14.495787, 12.859396],
+            [14.213531, 12.802035],
+            [14.181336, 12.483657],
+            [13.995353, 12.461565],
+            [13.318702, 13.556356],
+            [13.083987, 13.596147],
+            [12.302071, 13.037189],
+            [11.527803, 13.32898],
+            [10.989593, 13.387323],
+            [10.701032, 13.246918],
+            [10.114814, 13.277252],
+            [9.524928, 12.851102],
+            [9.014933, 12.826659],
+            [7.804671, 13.343527],
+            [7.330747, 13.098038],
+            [6.820442, 13.115091],
+            [6.445426, 13.492768],
+            [5.443058, 13.865924],
+            [4.368344, 13.747482],
+            [4.107946, 13.531216],
+            [3.967283, 12.956109],
+            [3.680634, 12.552903],
+            [3.61118, 11.660167],
+            [2.848643, 12.235636],
+            [2.490164, 12.233052],
+            [2.154474, 11.94015]
+          ]
+        ]
+      },
+      "id": "NER"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Nigeria" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [8.500288, 4.771983],
+            [7.462108, 4.412108],
+            [7.082596, 4.464689],
+            [6.698072, 4.240594],
+            [5.898173, 4.262453],
+            [5.362805, 4.887971],
+            [5.033574, 5.611802],
+            [4.325607, 6.270651],
+            [3.57418, 6.2583],
+            [2.691702, 6.258817],
+            [2.749063, 7.870734],
+            [2.723793, 8.506845],
+            [2.912308, 9.137608],
+            [3.220352, 9.444153],
+            [3.705438, 10.06321],
+            [3.60007, 10.332186],
+            [3.797112, 10.734746],
+            [3.572216, 11.327939],
+            [3.61118, 11.660167],
+            [3.680634, 12.552903],
+            [3.967283, 12.956109],
+            [4.107946, 13.531216],
+            [4.368344, 13.747482],
+            [5.443058, 13.865924],
+            [6.445426, 13.492768],
+            [6.820442, 13.115091],
+            [7.330747, 13.098038],
+            [7.804671, 13.343527],
+            [9.014933, 12.826659],
+            [9.524928, 12.851102],
+            [10.114814, 13.277252],
+            [10.701032, 13.246918],
+            [10.989593, 13.387323],
+            [11.527803, 13.32898],
+            [12.302071, 13.037189],
+            [13.083987, 13.596147],
+            [13.318702, 13.556356],
+            [13.995353, 12.461565],
+            [14.181336, 12.483657],
+            [14.577178, 12.085361],
+            [14.468192, 11.904752],
+            [14.415379, 11.572369],
+            [13.57295, 10.798566],
+            [13.308676, 10.160362],
+            [13.1676, 9.640626],
+            [12.955468, 9.417772],
+            [12.753672, 8.717763],
+            [12.218872, 8.305824],
+            [12.063946, 7.799808],
+            [11.839309, 7.397042],
+            [11.745774, 6.981383],
+            [11.058788, 6.644427],
+            [10.497375, 7.055358],
+            [10.118277, 7.03877],
+            [9.522706, 6.453482],
+            [9.233163, 6.444491],
+            [8.757533, 5.479666],
+            [8.500288, 4.771983]
+          ]
+        ]
+      },
+      "id": "NGA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Nicaragua" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-85.71254, 11.088445],
+            [-86.058488, 11.403439],
+            [-86.52585, 11.806877],
+            [-86.745992, 12.143962],
+            [-87.167516, 12.458258],
+            [-87.668493, 12.90991],
+            [-87.557467, 13.064552],
+            [-87.392386, 12.914018],
+            [-87.316654, 12.984686],
+            [-87.005769, 13.025794],
+            [-86.880557, 13.254204],
+            [-86.733822, 13.263093],
+            [-86.755087, 13.754845],
+            [-86.520708, 13.778487],
+            [-86.312142, 13.771356],
+            [-86.096264, 14.038187],
+            [-85.801295, 13.836055],
+            [-85.698665, 13.960078],
+            [-85.514413, 14.079012],
+            [-85.165365, 14.35437],
+            [-85.148751, 14.560197],
+            [-85.052787, 14.551541],
+            [-84.924501, 14.790493],
+            [-84.820037, 14.819587],
+            [-84.649582, 14.666805],
+            [-84.449336, 14.621614],
+            [-84.228342, 14.748764],
+            [-83.975721, 14.749436],
+            [-83.628585, 14.880074],
+            [-83.489989, 15.016267],
+            [-83.147219, 14.995829],
+            [-83.233234, 14.899866],
+            [-83.284162, 14.676624],
+            [-83.182126, 14.310703],
+            [-83.4125, 13.970078],
+            [-83.519832, 13.567699],
+            [-83.552207, 13.127054],
+            [-83.498515, 12.869292],
+            [-83.473323, 12.419087],
+            [-83.626104, 12.32085],
+            [-83.719613, 11.893124],
+            [-83.650858, 11.629032],
+            [-83.85547, 11.373311],
+            [-83.808936, 11.103044],
+            [-83.655612, 10.938764],
+            [-83.895054, 10.726839],
+            [-84.190179, 10.79345],
+            [-84.355931, 10.999226],
+            [-84.673069, 11.082657],
+            [-84.903003, 10.952303],
+            [-85.561852, 11.217119],
+            [-85.71254, 11.088445]
+          ]
+        ]
+      },
+      "id": "NIC"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Netherlands" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [6.074183, 53.510403],
+            [6.90514, 53.482162],
+            [7.092053, 53.144043],
+            [6.84287, 52.22844],
+            [6.589397, 51.852029],
+            [5.988658, 51.851616],
+            [6.156658, 50.803721],
+            [5.606976, 51.037298],
+            [4.973991, 51.475024],
+            [4.047071, 51.267259],
+            [3.314971, 51.345755],
+            [3.830289, 51.620545],
+            [4.705997, 53.091798],
+            [6.074183, 53.510403]
+          ]
+        ]
+      },
+      "id": "NLD"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Norway" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [28.165547, 71.185474],
+              [31.293418, 70.453788],
+              [30.005435, 70.186259],
+              [31.101079, 69.55808],
+              [29.399581, 69.156916],
+              [28.59193, 69.064777],
+              [29.015573, 69.766491],
+              [27.732292, 70.164193],
+              [26.179622, 69.825299],
+              [25.689213, 69.092114],
+              [24.735679, 68.649557],
+              [23.66205, 68.891247],
+              [22.356238, 68.841741],
+              [21.244936, 69.370443],
+              [20.645593, 69.106247],
+              [20.025269, 69.065139],
+              [19.87856, 68.407194],
+              [17.993868, 68.567391],
+              [17.729182, 68.010552],
+              [16.768879, 68.013937],
+              [16.108712, 67.302456],
+              [15.108411, 66.193867],
+              [13.55569, 64.787028],
+              [13.919905, 64.445421],
+              [13.571916, 64.049114],
+              [12.579935, 64.066219],
+              [11.930569, 63.128318],
+              [11.992064, 61.800362],
+              [12.631147, 61.293572],
+              [12.300366, 60.117933],
+              [11.468272, 59.432393],
+              [11.027369, 58.856149],
+              [10.356557, 59.469807],
+              [8.382, 58.313288],
+              [7.048748, 58.078884],
+              [5.665835, 58.588155],
+              [5.308234, 59.663232],
+              [4.992078, 61.970998],
+              [5.9129, 62.614473],
+              [8.553411, 63.454008],
+              [10.527709, 64.486038],
+              [12.358347, 65.879726],
+              [14.761146, 67.810642],
+              [16.435927, 68.563205],
+              [19.184028, 69.817444],
+              [21.378416, 70.255169],
+              [23.023742, 70.202072],
+              [24.546543, 71.030497],
+              [26.37005, 70.986262],
+              [28.165547, 71.185474]
+            ]
+          ],
+          [
+            [
+              [24.72412, 77.85385],
+              [22.49032, 77.44493],
+              [20.72601, 77.67704],
+              [21.41611, 77.93504],
+              [20.8119, 78.25463],
+              [22.88426, 78.45494],
+              [23.28134, 78.07954],
+              [24.72412, 77.85385]
+            ]
+          ],
+          [
+            [
+              [18.25183, 79.70175],
+              [21.54383, 78.95611],
+              [19.02737, 78.5626],
+              [18.47172, 77.82669],
+              [17.59441, 77.63796],
+              [17.1182, 76.80941],
+              [15.91315, 76.77045],
+              [13.76259, 77.38035],
+              [14.66956, 77.73565],
+              [13.1706, 78.02493],
+              [11.22231, 78.8693],
+              [10.44453, 79.65239],
+              [13.17077, 80.01046],
+              [13.71852, 79.66039],
+              [15.14282, 79.67431],
+              [15.52255, 80.01608],
+              [16.99085, 80.05086],
+              [18.25183, 79.70175]
+            ]
+          ],
+          [
+            [
+              [25.447625, 80.40734],
+              [27.407506, 80.056406],
+              [25.924651, 79.517834],
+              [23.024466, 79.400012],
+              [20.075188, 79.566823],
+              [19.897266, 79.842362],
+              [18.462264, 79.85988],
+              [17.368015, 80.318896],
+              [20.455992, 80.598156],
+              [21.907945, 80.357679],
+              [22.919253, 80.657144],
+              [25.447625, 80.40734]
+            ]
+          ]
+        ]
+      },
+      "id": "NOR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Nepal" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [88.120441, 27.876542],
+            [88.043133, 27.445819],
+            [88.174804, 26.810405],
+            [88.060238, 26.414615],
+            [87.227472, 26.397898],
+            [86.024393, 26.630985],
+            [85.251779, 26.726198],
+            [84.675018, 27.234901],
+            [83.304249, 27.364506],
+            [81.999987, 27.925479],
+            [81.057203, 28.416095],
+            [80.088425, 28.79447],
+            [80.476721, 29.729865],
+            [81.111256, 30.183481],
+            [81.525804, 30.422717],
+            [82.327513, 30.115268],
+            [83.337115, 29.463732],
+            [83.898993, 29.320226],
+            [84.23458, 28.839894],
+            [85.011638, 28.642774],
+            [85.82332, 28.203576],
+            [86.954517, 27.974262],
+            [88.120441, 27.876542]
+          ]
+        ]
+      },
+      "id": "NPL"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "New Zealand" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [173.020375, -40.919052],
+              [173.247234, -41.331999],
+              [173.958405, -40.926701],
+              [174.247587, -41.349155],
+              [174.248517, -41.770008],
+              [173.876447, -42.233184],
+              [173.22274, -42.970038],
+              [172.711246, -43.372288],
+              [173.080113, -43.853344],
+              [172.308584, -43.865694],
+              [171.452925, -44.242519],
+              [171.185138, -44.897104],
+              [170.616697, -45.908929],
+              [169.831422, -46.355775],
+              [169.332331, -46.641235],
+              [168.411354, -46.619945],
+              [167.763745, -46.290197],
+              [166.676886, -46.219917],
+              [166.509144, -45.852705],
+              [167.046424, -45.110941],
+              [168.303763, -44.123973],
+              [168.949409, -43.935819],
+              [169.667815, -43.555326],
+              [170.52492, -43.031688],
+              [171.12509, -42.512754],
+              [171.569714, -41.767424],
+              [171.948709, -41.514417],
+              [172.097227, -40.956104],
+              [172.79858, -40.493962],
+              [173.020375, -40.919052]
+            ]
+          ],
+          [
+            [
+              [174.612009, -36.156397],
+              [175.336616, -37.209098],
+              [175.357596, -36.526194],
+              [175.808887, -36.798942],
+              [175.95849, -37.555382],
+              [176.763195, -37.881253],
+              [177.438813, -37.961248],
+              [178.010354, -37.579825],
+              [178.517094, -37.695373],
+              [178.274731, -38.582813],
+              [177.97046, -39.166343],
+              [177.206993, -39.145776],
+              [176.939981, -39.449736],
+              [177.032946, -39.879943],
+              [176.885824, -40.065978],
+              [176.508017, -40.604808],
+              [176.01244, -41.289624],
+              [175.239567, -41.688308],
+              [175.067898, -41.425895],
+              [174.650973, -41.281821],
+              [175.22763, -40.459236],
+              [174.900157, -39.908933],
+              [173.824047, -39.508854],
+              [173.852262, -39.146602],
+              [174.574802, -38.797683],
+              [174.743474, -38.027808],
+              [174.697017, -37.381129],
+              [174.292028, -36.711092],
+              [174.319004, -36.534824],
+              [173.840997, -36.121981],
+              [173.054171, -35.237125],
+              [172.636005, -34.529107],
+              [173.007042, -34.450662],
+              [173.551298, -35.006183],
+              [174.32939, -35.265496],
+              [174.612009, -36.156397]
+            ]
+          ]
+        ]
+      },
+      "id": "NZL"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Oman" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [58.861141, 21.114035],
+              [58.487986, 20.428986],
+              [58.034318, 20.481437],
+              [57.826373, 20.243002],
+              [57.665762, 19.736005],
+              [57.7887, 19.06757],
+              [57.694391, 18.94471],
+              [57.234264, 18.947991],
+              [56.609651, 18.574267],
+              [56.512189, 18.087113],
+              [56.283521, 17.876067],
+              [55.661492, 17.884128],
+              [55.269939, 17.632309],
+              [55.2749, 17.228354],
+              [54.791002, 16.950697],
+              [54.239253, 17.044981],
+              [53.570508, 16.707663],
+              [53.108573, 16.651051],
+              [52.782184, 17.349742],
+              [52.00001, 19.000003],
+              [54.999982, 19.999994],
+              [55.666659, 22.000001],
+              [55.208341, 22.70833],
+              [55.234489, 23.110993],
+              [55.525841, 23.524869],
+              [55.528632, 23.933604],
+              [55.981214, 24.130543],
+              [55.804119, 24.269604],
+              [55.886233, 24.920831],
+              [56.396847, 24.924732],
+              [56.84514, 24.241673],
+              [57.403453, 23.878594],
+              [58.136948, 23.747931],
+              [58.729211, 23.565668],
+              [59.180502, 22.992395],
+              [59.450098, 22.660271],
+              [59.80806, 22.533612],
+              [59.806148, 22.310525],
+              [59.442191, 21.714541],
+              [59.282408, 21.433886],
+              [58.861141, 21.114035]
+            ]
+          ],
+          [
+            [
+              [56.391421, 25.895991],
+              [56.261042, 25.714606],
+              [56.070821, 26.055464],
+              [56.362017, 26.395934],
+              [56.485679, 26.309118],
+              [56.391421, 25.895991]
+            ]
+          ]
+        ]
+      },
+      "id": "OMN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Pakistan" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [75.158028, 37.133031],
+            [75.896897, 36.666806],
+            [76.192848, 35.898403],
+            [77.837451, 35.49401],
+            [76.871722, 34.653544],
+            [75.757061, 34.504923],
+            [74.240203, 34.748887],
+            [73.749948, 34.317699],
+            [74.104294, 33.441473],
+            [74.451559, 32.7649],
+            [75.258642, 32.271105],
+            [74.405929, 31.692639],
+            [74.42138, 30.979815],
+            [73.450638, 29.976413],
+            [72.823752, 28.961592],
+            [71.777666, 27.91318],
+            [70.616496, 27.989196],
+            [69.514393, 26.940966],
+            [70.168927, 26.491872],
+            [70.282873, 25.722229],
+            [70.844699, 25.215102],
+            [71.04324, 24.356524],
+            [68.842599, 24.359134],
+            [68.176645, 23.691965],
+            [67.443667, 23.944844],
+            [67.145442, 24.663611],
+            [66.372828, 25.425141],
+            [64.530408, 25.237039],
+            [62.905701, 25.218409],
+            [61.497363, 25.078237],
+            [61.874187, 26.239975],
+            [63.316632, 26.756532],
+            [63.233898, 27.217047],
+            [62.755426, 27.378923],
+            [62.72783, 28.259645],
+            [61.771868, 28.699334],
+            [61.369309, 29.303276],
+            [60.874248, 29.829239],
+            [62.549857, 29.318572],
+            [63.550261, 29.468331],
+            [64.148002, 29.340819],
+            [64.350419, 29.560031],
+            [65.046862, 29.472181],
+            [66.346473, 29.887943],
+            [66.381458, 30.738899],
+            [66.938891, 31.304911],
+            [67.683394, 31.303154],
+            [67.792689, 31.58293],
+            [68.556932, 31.71331],
+            [68.926677, 31.620189],
+            [69.317764, 31.901412],
+            [69.262522, 32.501944],
+            [69.687147, 33.105499],
+            [70.323594, 33.358533],
+            [69.930543, 34.02012],
+            [70.881803, 33.988856],
+            [71.156773, 34.348911],
+            [71.115019, 34.733126],
+            [71.613076, 35.153203],
+            [71.498768, 35.650563],
+            [71.262348, 36.074388],
+            [71.846292, 36.509942],
+            [72.920025, 36.720007],
+            [74.067552, 36.836176],
+            [74.575893, 37.020841],
+            [75.158028, 37.133031]
+          ]
+        ]
+      },
+      "id": "PAK"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Panama" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-77.881571, 7.223771],
+            [-78.214936, 7.512255],
+            [-78.429161, 8.052041],
+            [-78.182096, 8.319182],
+            [-78.435465, 8.387705],
+            [-78.622121, 8.718124],
+            [-79.120307, 8.996092],
+            [-79.557877, 8.932375],
+            [-79.760578, 8.584515],
+            [-80.164481, 8.333316],
+            [-80.382659, 8.298409],
+            [-80.480689, 8.090308],
+            [-80.00369, 7.547524],
+            [-80.276671, 7.419754],
+            [-80.421158, 7.271572],
+            [-80.886401, 7.220541],
+            [-81.059543, 7.817921],
+            [-81.189716, 7.647906],
+            [-81.519515, 7.70661],
+            [-81.721311, 8.108963],
+            [-82.131441, 8.175393],
+            [-82.390934, 8.292362],
+            [-82.820081, 8.290864],
+            [-82.850958, 8.073823],
+            [-82.965783, 8.225028],
+            [-82.913176, 8.423517],
+            [-82.829771, 8.626295],
+            [-82.868657, 8.807266],
+            [-82.719183, 8.925709],
+            [-82.927155, 9.07433],
+            [-82.932891, 9.476812],
+            [-82.546196, 9.566135],
+            [-82.187123, 9.207449],
+            [-82.207586, 8.995575],
+            [-81.808567, 8.950617],
+            [-81.714154, 9.031955],
+            [-81.439287, 8.786234],
+            [-80.947302, 8.858504],
+            [-80.521901, 9.111072],
+            [-79.9146, 9.312765],
+            [-79.573303, 9.61161],
+            [-79.021192, 9.552931],
+            [-79.05845, 9.454565],
+            [-78.500888, 9.420459],
+            [-78.055928, 9.24773],
+            [-77.729514, 8.946844],
+            [-77.353361, 8.670505],
+            [-77.474723, 8.524286],
+            [-77.242566, 7.935278],
+            [-77.431108, 7.638061],
+            [-77.753414, 7.70984],
+            [-77.881571, 7.223771]
+          ]
+        ]
+      },
+      "id": "PAN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Peru" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-69.590424, -17.580012],
+            [-69.858444, -18.092694],
+            [-70.372572, -18.347975],
+            [-71.37525, -17.773799],
+            [-71.462041, -17.363488],
+            [-73.44453, -16.359363],
+            [-75.237883, -15.265683],
+            [-76.009205, -14.649286],
+            [-76.423469, -13.823187],
+            [-76.259242, -13.535039],
+            [-77.106192, -12.222716],
+            [-78.092153, -10.377712],
+            [-79.036953, -8.386568],
+            [-79.44592, -7.930833],
+            [-79.760578, -7.194341],
+            [-80.537482, -6.541668],
+            [-81.249996, -6.136834],
+            [-80.926347, -5.690557],
+            [-81.410943, -4.736765],
+            [-81.09967, -4.036394],
+            [-80.302561, -3.404856],
+            [-80.184015, -3.821162],
+            [-80.469295, -4.059287],
+            [-80.442242, -4.425724],
+            [-80.028908, -4.346091],
+            [-79.624979, -4.454198],
+            [-79.205289, -4.959129],
+            [-78.639897, -4.547784],
+            [-78.450684, -3.873097],
+            [-77.837905, -3.003021],
+            [-76.635394, -2.608678],
+            [-75.544996, -1.56161],
+            [-75.233723, -0.911417],
+            [-75.373223, -0.152032],
+            [-75.106625, -0.057205],
+            [-74.441601, -0.53082],
+            [-74.122395, -1.002833],
+            [-73.659504, -1.260491],
+            [-73.070392, -2.308954],
+            [-72.325787, -2.434218],
+            [-71.774761, -2.16979],
+            [-71.413646, -2.342802],
+            [-70.813476, -2.256865],
+            [-70.047709, -2.725156],
+            [-70.692682, -3.742872],
+            [-70.394044, -3.766591],
+            [-69.893635, -4.298187],
+            [-70.794769, -4.251265],
+            [-70.928843, -4.401591],
+            [-71.748406, -4.593983],
+            [-72.891928, -5.274561],
+            [-72.964507, -5.741251],
+            [-73.219711, -6.089189],
+            [-73.120027, -6.629931],
+            [-73.724487, -6.918595],
+            [-73.723401, -7.340999],
+            [-73.987235, -7.52383],
+            [-73.571059, -8.424447],
+            [-73.015383, -9.032833],
+            [-73.226713, -9.462213],
+            [-72.563033, -9.520194],
+            [-72.184891, -10.053598],
+            [-71.302412, -10.079436],
+            [-70.481894, -9.490118],
+            [-70.548686, -11.009147],
+            [-70.093752, -11.123972],
+            [-69.529678, -10.951734],
+            [-68.66508, -12.5613],
+            [-68.88008, -12.899729],
+            [-68.929224, -13.602684],
+            [-68.948887, -14.453639],
+            [-69.339535, -14.953195],
+            [-69.160347, -15.323974],
+            [-69.389764, -15.660129],
+            [-68.959635, -16.500698],
+            [-69.590424, -17.580012]
+          ]
+        ]
+      },
+      "id": "PER"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Philippines" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [126.376814, 8.414706],
+              [126.478513, 7.750354],
+              [126.537424, 7.189381],
+              [126.196773, 6.274294],
+              [125.831421, 7.293715],
+              [125.363852, 6.786485],
+              [125.683161, 6.049657],
+              [125.396512, 5.581003],
+              [124.219788, 6.161355],
+              [123.93872, 6.885136],
+              [124.243662, 7.36061],
+              [123.610212, 7.833527],
+              [123.296071, 7.418876],
+              [122.825506, 7.457375],
+              [122.085499, 6.899424],
+              [121.919928, 7.192119],
+              [122.312359, 8.034962],
+              [122.942398, 8.316237],
+              [123.487688, 8.69301],
+              [123.841154, 8.240324],
+              [124.60147, 8.514158],
+              [124.764612, 8.960409],
+              [125.471391, 8.986997],
+              [125.412118, 9.760335],
+              [126.222714, 9.286074],
+              [126.306637, 8.782487],
+              [126.376814, 8.414706]
+            ]
+          ],
+          [
+            [
+              [123.982438, 10.278779],
+              [123.623183, 9.950091],
+              [123.309921, 9.318269],
+              [122.995883, 9.022189],
+              [122.380055, 9.713361],
+              [122.586089, 9.981045],
+              [122.837081, 10.261157],
+              [122.947411, 10.881868],
+              [123.49885, 10.940624],
+              [123.337774, 10.267384],
+              [124.077936, 11.232726],
+              [123.982438, 10.278779]
+            ]
+          ],
+          [
+            [
+              [118.504581, 9.316383],
+              [117.174275, 8.3675],
+              [117.664477, 9.066889],
+              [118.386914, 9.6845],
+              [118.987342, 10.376292],
+              [119.511496, 11.369668],
+              [119.689677, 10.554291],
+              [119.029458, 10.003653],
+              [118.504581, 9.316383]
+            ]
+          ],
+          [
+            [
+              [121.883548, 11.891755],
+              [122.483821, 11.582187],
+              [123.120217, 11.58366],
+              [123.100838, 11.165934],
+              [122.637714, 10.741308],
+              [122.00261, 10.441017],
+              [121.967367, 10.905691],
+              [122.03837, 11.415841],
+              [121.883548, 11.891755]
+            ]
+          ],
+          [
+            [
+              [125.502552, 12.162695],
+              [125.783465, 11.046122],
+              [125.011884, 11.311455],
+              [125.032761, 10.975816],
+              [125.277449, 10.358722],
+              [124.801819, 10.134679],
+              [124.760168, 10.837995],
+              [124.459101, 10.88993],
+              [124.302522, 11.495371],
+              [124.891013, 11.415583],
+              [124.87799, 11.79419],
+              [124.266762, 12.557761],
+              [125.227116, 12.535721],
+              [125.502552, 12.162695]
+            ]
+          ],
+          [
+            [
+              [121.527394, 13.06959],
+              [121.26219, 12.20556],
+              [120.833896, 12.704496],
+              [120.323436, 13.466413],
+              [121.180128, 13.429697],
+              [121.527394, 13.06959]
+            ]
+          ],
+          [
+            [
+              [121.321308, 18.504065],
+              [121.937601, 18.218552],
+              [122.246006, 18.47895],
+              [122.336957, 18.224883],
+              [122.174279, 17.810283],
+              [122.515654, 17.093505],
+              [122.252311, 16.262444],
+              [121.662786, 15.931018],
+              [121.50507, 15.124814],
+              [121.728829, 14.328376],
+              [122.258925, 14.218202],
+              [122.701276, 14.336541],
+              [123.950295, 13.782131],
+              [123.855107, 13.237771],
+              [124.181289, 12.997527],
+              [124.077419, 12.536677],
+              [123.298035, 13.027526],
+              [122.928652, 13.55292],
+              [122.671355, 13.185836],
+              [122.03465, 13.784482],
+              [121.126385, 13.636687],
+              [120.628637, 13.857656],
+              [120.679384, 14.271016],
+              [120.991819, 14.525393],
+              [120.693336, 14.756671],
+              [120.564145, 14.396279],
+              [120.070429, 14.970869],
+              [119.920929, 15.406347],
+              [119.883773, 16.363704],
+              [120.286488, 16.034629],
+              [120.390047, 17.599081],
+              [120.715867, 18.505227],
+              [121.321308, 18.504065]
+            ]
+          ]
+        ]
+      },
+      "id": "PHL"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Papua New Guinea" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [155.880026, -6.819997],
+              [155.599991, -6.919991],
+              [155.166994, -6.535931],
+              [154.729192, -5.900828],
+              [154.514114, -5.139118],
+              [154.652504, -5.042431],
+              [154.759991, -5.339984],
+              [155.062918, -5.566792],
+              [155.547746, -6.200655],
+              [156.019965, -6.540014],
+              [155.880026, -6.819997]
+            ]
+          ],
+          [
+            [
+              [151.982796, -5.478063],
+              [151.459107, -5.56028],
+              [151.30139, -5.840728],
+              [150.754447, -6.083763],
+              [150.241197, -6.317754],
+              [149.709963, -6.316513],
+              [148.890065, -6.02604],
+              [148.318937, -5.747142],
+              [148.401826, -5.437756],
+              [149.298412, -5.583742],
+              [149.845562, -5.505503],
+              [149.99625, -5.026101],
+              [150.139756, -5.001348],
+              [150.236908, -5.53222],
+              [150.807467, -5.455842],
+              [151.089672, -5.113693],
+              [151.647881, -4.757074],
+              [151.537862, -4.167807],
+              [152.136792, -4.14879],
+              [152.338743, -4.312966],
+              [152.318693, -4.867661],
+              [151.982796, -5.478063]
+            ]
+          ],
+          [
+            [
+              [147.191874, -7.388024],
+              [148.084636, -8.044108],
+              [148.734105, -9.104664],
+              [149.306835, -9.071436],
+              [149.266631, -9.514406],
+              [150.038728, -9.684318],
+              [149.738798, -9.872937],
+              [150.801628, -10.293687],
+              [150.690575, -10.582713],
+              [150.028393, -10.652476],
+              [149.78231, -10.393267],
+              [148.923138, -10.280923],
+              [147.913018, -10.130441],
+              [147.135443, -9.492444],
+              [146.567881, -8.942555],
+              [146.048481, -8.067414],
+              [144.744168, -7.630128],
+              [143.897088, -7.91533],
+              [143.286376, -8.245491],
+              [143.413913, -8.983069],
+              [142.628431, -9.326821],
+              [142.068259, -9.159596],
+              [141.033852, -9.117893],
+              [141.017057, -5.859022],
+              [141.00021, -2.600151],
+              [142.735247, -3.289153],
+              [144.583971, -3.861418],
+              [145.27318, -4.373738],
+              [145.829786, -4.876498],
+              [145.981922, -5.465609],
+              [147.648073, -6.083659],
+              [147.891108, -6.614015],
+              [146.970905, -6.721657],
+              [147.191874, -7.388024]
+            ]
+          ],
+          [
+            [
+              [153.140038, -4.499983],
+              [152.827292, -4.766427],
+              [152.638673, -4.176127],
+              [152.406026, -3.789743],
+              [151.953237, -3.462062],
+              [151.384279, -3.035422],
+              [150.66205, -2.741486],
+              [150.939965, -2.500002],
+              [151.479984, -2.779985],
+              [151.820015, -2.999972],
+              [152.239989, -3.240009],
+              [152.640017, -3.659983],
+              [153.019994, -3.980015],
+              [153.140038, -4.499983]
+            ]
+          ]
+        ]
+      },
+      "id": "PNG"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Poland" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [15.016996, 51.106674],
+            [14.607098, 51.745188],
+            [14.685026, 52.089947],
+            [14.4376, 52.62485],
+            [14.074521, 52.981263],
+            [14.353315, 53.248171],
+            [14.119686, 53.757029],
+            [14.8029, 54.050706],
+            [16.363477, 54.513159],
+            [17.622832, 54.851536],
+            [18.620859, 54.682606],
+            [18.696255, 54.438719],
+            [19.66064, 54.426084],
+            [20.892245, 54.312525],
+            [22.731099, 54.327537],
+            [23.243987, 54.220567],
+            [23.484128, 53.912498],
+            [23.527536, 53.470122],
+            [23.804935, 53.089731],
+            [23.799199, 52.691099],
+            [23.199494, 52.486977],
+            [23.508002, 52.023647],
+            [23.527071, 51.578454],
+            [24.029986, 50.705407],
+            [23.922757, 50.424881],
+            [23.426508, 50.308506],
+            [22.51845, 49.476774],
+            [22.776419, 49.027395],
+            [22.558138, 49.085738],
+            [21.607808, 49.470107],
+            [20.887955, 49.328772],
+            [20.415839, 49.431453],
+            [19.825023, 49.217125],
+            [19.320713, 49.571574],
+            [18.909575, 49.435846],
+            [18.853144, 49.49623],
+            [18.392914, 49.988629],
+            [17.649445, 50.049038],
+            [17.554567, 50.362146],
+            [16.868769, 50.473974],
+            [16.719476, 50.215747],
+            [16.176253, 50.422607],
+            [16.238627, 50.697733],
+            [15.490972, 50.78473],
+            [15.016996, 51.106674]
+          ]
+        ]
+      },
+      "id": "POL"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Puerto Rico" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-66.282434, 18.514762],
+            [-65.771303, 18.426679],
+            [-65.591004, 18.228035],
+            [-65.847164, 17.975906],
+            [-66.599934, 17.981823],
+            [-67.184162, 17.946553],
+            [-67.242428, 18.37446],
+            [-67.100679, 18.520601],
+            [-66.282434, 18.514762]
+          ]
+        ]
+      },
+      "id": "PRI"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "North Korea" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [130.640016, 42.395009],
+            [130.780007, 42.220007],
+            [130.400031, 42.280004],
+            [129.965949, 41.941368],
+            [129.667362, 41.601104],
+            [129.705189, 40.882828],
+            [129.188115, 40.661808],
+            [129.0104, 40.485436],
+            [128.633368, 40.189847],
+            [127.967414, 40.025413],
+            [127.533436, 39.75685],
+            [127.50212, 39.323931],
+            [127.385434, 39.213472],
+            [127.783343, 39.050898],
+            [128.349716, 38.612243],
+            [128.205746, 38.370397],
+            [127.780035, 38.304536],
+            [127.073309, 38.256115],
+            [126.68372, 37.804773],
+            [126.237339, 37.840378],
+            [126.174759, 37.749686],
+            [125.689104, 37.94001],
+            [125.568439, 37.752089],
+            [125.27533, 37.669071],
+            [125.240087, 37.857224],
+            [124.981033, 37.948821],
+            [124.712161, 38.108346],
+            [124.985994, 38.548474],
+            [125.221949, 38.665857],
+            [125.132859, 38.848559],
+            [125.38659, 39.387958],
+            [125.321116, 39.551385],
+            [124.737482, 39.660344],
+            [124.265625, 39.928493],
+            [125.079942, 40.569824],
+            [126.182045, 41.107336],
+            [126.869083, 41.816569],
+            [127.343783, 41.503152],
+            [128.208433, 41.466772],
+            [128.052215, 41.994285],
+            [129.596669, 42.424982],
+            [129.994267, 42.985387],
+            [130.640016, 42.395009]
+          ]
+        ]
+      },
+      "id": "PRK"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Portugal" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-9.034818, 41.880571],
+            [-8.671946, 42.134689],
+            [-8.263857, 42.280469],
+            [-8.013175, 41.790886],
+            [-7.422513, 41.792075],
+            [-7.251309, 41.918346],
+            [-6.668606, 41.883387],
+            [-6.389088, 41.381815],
+            [-6.851127, 41.111083],
+            [-6.86402, 40.330872],
+            [-7.026413, 40.184524],
+            [-7.066592, 39.711892],
+            [-7.498632, 39.629571],
+            [-7.098037, 39.030073],
+            [-7.374092, 38.373059],
+            [-7.029281, 38.075764],
+            [-7.166508, 37.803894],
+            [-7.537105, 37.428904],
+            [-7.453726, 37.097788],
+            [-7.855613, 36.838269],
+            [-8.382816, 36.97888],
+            [-8.898857, 36.868809],
+            [-8.746101, 37.651346],
+            [-8.839998, 38.266243],
+            [-9.287464, 38.358486],
+            [-9.526571, 38.737429],
+            [-9.446989, 39.392066],
+            [-9.048305, 39.755093],
+            [-8.977353, 40.159306],
+            [-8.768684, 40.760639],
+            [-8.790853, 41.184334],
+            [-8.990789, 41.543459],
+            [-9.034818, 41.880571]
+          ]
+        ]
+      },
+      "id": "PRT"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Paraguay" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-62.685057, -22.249029],
+            [-62.291179, -21.051635],
+            [-62.265961, -20.513735],
+            [-61.786326, -19.633737],
+            [-60.043565, -19.342747],
+            [-59.115042, -19.356906],
+            [-58.183471, -19.868399],
+            [-58.166392, -20.176701],
+            [-57.870674, -20.732688],
+            [-57.937156, -22.090176],
+            [-56.88151, -22.282154],
+            [-56.473317, -22.0863],
+            [-55.797958, -22.35693],
+            [-55.610683, -22.655619],
+            [-55.517639, -23.571998],
+            [-55.400747, -23.956935],
+            [-55.027902, -24.001274],
+            [-54.652834, -23.839578],
+            [-54.29296, -24.021014],
+            [-54.293476, -24.5708],
+            [-54.428946, -25.162185],
+            [-54.625291, -25.739255],
+            [-54.788795, -26.621786],
+            [-55.695846, -27.387837],
+            [-56.486702, -27.548499],
+            [-57.60976, -27.395899],
+            [-58.618174, -27.123719],
+            [-57.63366, -25.603657],
+            [-57.777217, -25.16234],
+            [-58.807128, -24.771459],
+            [-60.028966, -24.032796],
+            [-60.846565, -23.880713],
+            [-62.685057, -22.249029]
+          ]
+        ]
+      },
+      "id": "PRY"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Qatar" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [50.810108, 24.754743],
+            [50.743911, 25.482424],
+            [51.013352, 26.006992],
+            [51.286462, 26.114582],
+            [51.589079, 25.801113],
+            [51.6067, 25.21567],
+            [51.389608, 24.627386],
+            [51.112415, 24.556331],
+            [50.810108, 24.754743]
+          ]
+        ]
+      },
+      "id": "QAT"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Romania" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [22.710531, 47.882194],
+            [23.142236, 48.096341],
+            [23.760958, 47.985598],
+            [24.402056, 47.981878],
+            [24.866317, 47.737526],
+            [25.207743, 47.891056],
+            [25.945941, 47.987149],
+            [26.19745, 48.220881],
+            [26.619337, 48.220726],
+            [26.924176, 48.123264],
+            [27.233873, 47.826771],
+            [27.551166, 47.405117],
+            [28.12803, 46.810476],
+            [28.160018, 46.371563],
+            [28.054443, 45.944586],
+            [28.233554, 45.488283],
+            [28.679779, 45.304031],
+            [29.149725, 45.464925],
+            [29.603289, 45.293308],
+            [29.626543, 45.035391],
+            [29.141612, 44.82021],
+            [28.837858, 44.913874],
+            [28.558081, 43.707462],
+            [27.970107, 43.812468],
+            [27.2424, 44.175986],
+            [26.065159, 43.943494],
+            [25.569272, 43.688445],
+            [24.100679, 43.741051],
+            [23.332302, 43.897011],
+            [22.944832, 43.823785],
+            [22.65715, 44.234923],
+            [22.474008, 44.409228],
+            [22.705726, 44.578003],
+            [22.459022, 44.702517],
+            [22.145088, 44.478422],
+            [21.562023, 44.768947],
+            [21.483526, 45.18117],
+            [20.874313, 45.416375],
+            [20.762175, 45.734573],
+            [20.220192, 46.127469],
+            [21.021952, 46.316088],
+            [21.626515, 46.994238],
+            [22.099768, 47.672439],
+            [22.710531, 47.882194]
+          ]
+        ]
+      },
+      "id": "ROU"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Russia" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [143.648007, 50.7476],
+              [144.654148, 48.976391],
+              [143.173928, 49.306551],
+              [142.558668, 47.861575],
+              [143.533492, 46.836728],
+              [143.505277, 46.137908],
+              [142.747701, 46.740765],
+              [142.09203, 45.966755],
+              [141.906925, 46.805929],
+              [142.018443, 47.780133],
+              [141.904445, 48.859189],
+              [142.1358, 49.615163],
+              [142.179983, 50.952342],
+              [141.594076, 51.935435],
+              [141.682546, 53.301966],
+              [142.606934, 53.762145],
+              [142.209749, 54.225476],
+              [142.654786, 54.365881],
+              [142.914616, 53.704578],
+              [143.260848, 52.74076],
+              [143.235268, 51.75666],
+              [143.648007, 50.7476]
+            ]
+          ],
+          [
+            [
+              [22.731099, 54.327537],
+              [20.892245, 54.312525],
+              [19.66064, 54.426084],
+              [19.888481, 54.86616],
+              [21.268449, 55.190482],
+              [22.315724, 55.015299],
+              [22.757764, 54.856574],
+              [22.651052, 54.582741],
+              [22.731099, 54.327537]
+            ]
+          ],
+          [
+            [
+              [-175.01425, 66.58435],
+              [-174.33983, 66.33556],
+              [-174.57182, 67.06219],
+              [-171.85731, 66.91308],
+              [-169.89958, 65.97724],
+              [-170.89107, 65.54139],
+              [-172.53025, 65.43791],
+              [-172.555, 64.46079],
+              [-172.95533, 64.25269],
+              [-173.89184, 64.2826],
+              [-174.65392, 64.63125],
+              [-175.98353, 64.92288],
+              [-176.20716, 65.35667],
+              [-177.22266, 65.52024],
+              [-178.35993, 65.39052],
+              [-178.90332, 65.74044],
+              [-178.68611, 66.11211],
+              [-179.88377, 65.87456],
+              [-179.43268, 65.40411],
+              [-180, 64.979709],
+              [-180, 68.963636],
+              [-177.55, 68.2],
+              [-174.92825, 67.20589],
+              [-175.01425, 66.58435]
+            ]
+          ],
+          [
+            [
+              [180, 70.832199],
+              [178.903425, 70.78114],
+              [178.7253, 71.0988],
+              [180, 71.515714],
+              [180, 70.832199]
+            ]
+          ],
+          [
+            [
+              [-178.69378, 70.89302],
+              [-180, 70.832199],
+              [-180, 71.515714],
+              [-179.871875, 71.55762],
+              [-179.02433, 71.55553],
+              [-177.577945, 71.26948],
+              [-177.663575, 71.13277],
+              [-178.69378, 70.89302]
+            ]
+          ],
+          [
+            [
+              [143.60385, 73.21244],
+              [142.08763, 73.20544],
+              [140.038155, 73.31692],
+              [139.86312, 73.36983],
+              [140.81171, 73.76506],
+              [142.06207, 73.85758],
+              [143.48283, 73.47525],
+              [143.60385, 73.21244]
+            ]
+          ],
+          [
+            [
+              [150.73167, 75.08406],
+              [149.575925, 74.68892],
+              [147.977465, 74.778355],
+              [146.11919, 75.17298],
+              [146.358485, 75.49682],
+              [148.22223, 75.345845],
+              [150.73167, 75.08406]
+            ]
+          ],
+          [
+            [
+              [145.086285, 75.562625],
+              [144.3, 74.82],
+              [140.61381, 74.84768],
+              [138.95544, 74.61148],
+              [136.97439, 75.26167],
+              [137.51176, 75.94917],
+              [138.831075, 76.13676],
+              [141.471615, 76.09289],
+              [145.086285, 75.562625]
+            ]
+          ],
+          [
+            [
+              [57.535693, 70.720464],
+              [56.944979, 70.632743],
+              [53.677375, 70.762658],
+              [53.412017, 71.206662],
+              [51.601895, 71.474759],
+              [51.455754, 72.014881],
+              [52.478275, 72.229442],
+              [52.444169, 72.774731],
+              [54.427614, 73.627548],
+              [53.50829, 73.749814],
+              [55.902459, 74.627486],
+              [55.631933, 75.081412],
+              [57.868644, 75.60939],
+              [61.170044, 76.251883],
+              [64.498368, 76.439055],
+              [66.210977, 76.809782],
+              [68.15706, 76.939697],
+              [68.852211, 76.544811],
+              [68.180573, 76.233642],
+              [64.637326, 75.737755],
+              [61.583508, 75.260885],
+              [58.477082, 74.309056],
+              [56.986786, 73.333044],
+              [55.419336, 72.371268],
+              [55.622838, 71.540595],
+              [57.535693, 70.720464]
+            ]
+          ],
+          [
+            [
+              [106.97013, 76.97419],
+              [107.24, 76.48],
+              [108.1538, 76.72335],
+              [111.07726, 76.71],
+              [113.33151, 76.22224],
+              [114.13417, 75.84764],
+              [113.88539, 75.32779],
+              [112.77918, 75.03186],
+              [110.15125, 74.47673],
+              [109.4, 74.18],
+              [110.64, 74.04],
+              [112.11919, 73.78774],
+              [113.01954, 73.97693],
+              [113.52958, 73.33505],
+              [113.96881, 73.59488],
+              [115.56782, 73.75285],
+              [118.77633, 73.58772],
+              [119.02, 73.12],
+              [123.20066, 72.97122],
+              [123.25777, 73.73503],
+              [125.38, 73.56],
+              [126.97644, 73.56549],
+              [128.59126, 73.03871],
+              [129.05157, 72.39872],
+              [128.46, 71.98],
+              [129.71599, 71.19304],
+              [131.28858, 70.78699],
+              [132.2535, 71.8363],
+              [133.85766, 71.38642],
+              [135.56193, 71.65525],
+              [137.49755, 71.34763],
+              [138.23409, 71.62803],
+              [139.86983, 71.48783],
+              [139.14791, 72.41619],
+              [140.46817, 72.84941],
+              [149.5, 72.2],
+              [150.35118, 71.60643],
+              [152.9689, 70.84222],
+              [157.00688, 71.03141],
+              [158.99779, 70.86672],
+              [159.83031, 70.45324],
+              [159.70866, 69.72198],
+              [160.94053, 69.43728],
+              [162.27907, 69.64204],
+              [164.05248, 69.66823],
+              [165.94037, 69.47199],
+              [167.83567, 69.58269],
+              [169.57763, 68.6938],
+              [170.81688, 69.01363],
+              [170.0082, 69.65276],
+              [170.45345, 70.09703],
+              [173.64391, 69.81743],
+              [175.72403, 69.87725],
+              [178.6, 69.4],
+              [180, 68.963636],
+              [180, 64.979709],
+              [179.99281, 64.97433],
+              [178.7072, 64.53493],
+              [177.41128, 64.60821],
+              [178.313, 64.07593],
+              [178.90825, 63.25197],
+              [179.37034, 62.98262],
+              [179.48636, 62.56894],
+              [179.22825, 62.3041],
+              [177.3643, 62.5219],
+              [174.56929, 61.76915],
+              [173.68013, 61.65261],
+              [172.15, 60.95],
+              [170.6985, 60.33618],
+              [170.33085, 59.88177],
+              [168.90046, 60.57355],
+              [166.29498, 59.78855],
+              [165.84, 60.16],
+              [164.87674, 59.7316],
+              [163.53929, 59.86871],
+              [163.21711, 59.21101],
+              [162.01733, 58.24328],
+              [162.05297, 57.83912],
+              [163.19191, 57.61503],
+              [163.05794, 56.15924],
+              [162.12958, 56.12219],
+              [161.70146, 55.28568],
+              [162.11749, 54.85514],
+              [160.36877, 54.34433],
+              [160.02173, 53.20257],
+              [158.53094, 52.95868],
+              [158.23118, 51.94269],
+              [156.78979, 51.01105],
+              [156.42, 51.7],
+              [155.99182, 53.15895],
+              [155.43366, 55.38103],
+              [155.91442, 56.76792],
+              [156.75815, 57.3647],
+              [156.81035, 57.83204],
+              [158.36433, 58.05575],
+              [160.15064, 59.31477],
+              [161.87204, 60.343],
+              [163.66969, 61.1409],
+              [164.47355, 62.55061],
+              [163.25842, 62.46627],
+              [162.65791, 61.6425],
+              [160.12148, 60.54423],
+              [159.30232, 61.77396],
+              [156.72068, 61.43442],
+              [154.21806, 59.75818],
+              [155.04375, 59.14495],
+              [152.81185, 58.88385],
+              [151.26573, 58.78089],
+              [151.33815, 59.50396],
+              [149.78371, 59.65573],
+              [148.54481, 59.16448],
+              [145.48722, 59.33637],
+              [142.19782, 59.03998],
+              [138.95848, 57.08805],
+              [135.12619, 54.72959],
+              [136.70171, 54.60355],
+              [137.19342, 53.97732],
+              [138.1647, 53.75501],
+              [138.80463, 54.25455],
+              [139.90151, 54.18968],
+              [141.34531, 53.08957],
+              [141.37923, 52.23877],
+              [140.59742, 51.23967],
+              [140.51308, 50.04553],
+              [140.06193, 48.44671],
+              [138.55472, 46.99965],
+              [138.21971, 46.30795],
+              [136.86232, 45.1435],
+              [135.51535, 43.989],
+              [134.86939, 43.39821],
+              [133.53687, 42.81147],
+              [132.90627, 42.79849],
+              [132.27807, 43.28456],
+              [130.93587, 42.55274],
+              [130.78, 42.22],
+              [130.64, 42.395],
+              [130.633866, 42.903015],
+              [131.144688, 42.92999],
+              [131.288555, 44.11152],
+              [131.02519, 44.96796],
+              [131.883454, 45.321162],
+              [133.09712, 45.14409],
+              [133.769644, 46.116927],
+              [134.11235, 47.21248],
+              [134.50081, 47.57845],
+              [135.026311, 48.47823],
+              [133.373596, 48.183442],
+              [132.50669, 47.78896],
+              [130.98726, 47.79013],
+              [130.582293, 48.729687],
+              [129.397818, 49.4406],
+              [127.6574, 49.76027],
+              [127.287456, 50.739797],
+              [126.939157, 51.353894],
+              [126.564399, 51.784255],
+              [125.946349, 52.792799],
+              [125.068211, 53.161045],
+              [123.57147, 53.4588],
+              [122.245748, 53.431726],
+              [121.003085, 53.251401],
+              [120.177089, 52.753886],
+              [120.725789, 52.516226],
+              [120.7382, 51.96411],
+              [120.18208, 51.64355],
+              [119.27939, 50.58292],
+              [119.288461, 50.142883],
+              [117.879244, 49.510983],
+              [116.678801, 49.888531],
+              [115.485695, 49.805177],
+              [114.96211, 50.140247],
+              [114.362456, 50.248303],
+              [112.89774, 49.543565],
+              [111.581231, 49.377968],
+              [110.662011, 49.130128],
+              [109.402449, 49.292961],
+              [108.475167, 49.282548],
+              [107.868176, 49.793705],
+              [106.888804, 50.274296],
+              [105.886591, 50.406019],
+              [104.62158, 50.27532],
+              [103.676545, 50.089966],
+              [102.25589, 50.51056],
+              [102.06521, 51.25991],
+              [100.88948, 51.516856],
+              [99.981732, 51.634006],
+              [98.861491, 52.047366],
+              [97.82574, 51.010995],
+              [98.231762, 50.422401],
+              [97.25976, 49.72605],
+              [95.81402, 49.97746],
+              [94.815949, 50.013433],
+              [94.147566, 50.480537],
+              [93.10421, 50.49529],
+              [92.234712, 50.802171],
+              [90.713667, 50.331812],
+              [88.805567, 49.470521],
+              [87.751264, 49.297198],
+              [87.35997, 49.214981],
+              [86.829357, 49.826675],
+              [85.54127, 49.692859],
+              [85.11556, 50.117303],
+              [84.416377, 50.3114],
+              [83.935115, 50.889246],
+              [83.383004, 51.069183],
+              [81.945986, 50.812196],
+              [80.568447, 51.388336],
+              [80.03556, 50.864751],
+              [77.800916, 53.404415],
+              [76.525179, 54.177003],
+              [76.8911, 54.490524],
+              [74.38482, 53.54685],
+              [73.425679, 53.48981],
+              [73.508516, 54.035617],
+              [72.22415, 54.376655],
+              [71.180131, 54.133285],
+              [70.865267, 55.169734],
+              [69.068167, 55.38525],
+              [68.1691, 54.970392],
+              [65.66687, 54.60125],
+              [65.178534, 54.354228],
+              [61.4366, 54.00625],
+              [60.978066, 53.664993],
+              [61.699986, 52.979996],
+              [60.739993, 52.719986],
+              [60.927269, 52.447548],
+              [59.967534, 51.96042],
+              [61.588003, 51.272659],
+              [61.337424, 50.79907],
+              [59.932807, 50.842194],
+              [59.642282, 50.545442],
+              [58.36332, 51.06364],
+              [56.77798, 51.04355],
+              [55.71694, 50.62171],
+              [54.532878, 51.02624],
+              [52.328724, 51.718652],
+              [50.766648, 51.692762],
+              [48.702382, 50.605128],
+              [48.577841, 49.87476],
+              [47.54948, 50.454698],
+              [46.751596, 49.356006],
+              [47.043672, 49.152039],
+              [46.466446, 48.394152],
+              [47.31524, 47.71585],
+              [48.05725, 47.74377],
+              [48.694734, 47.075628],
+              [48.59325, 46.56104],
+              [49.10116, 46.39933],
+              [48.64541, 45.80629],
+              [47.67591, 45.64149],
+              [46.68201, 44.6092],
+              [47.59094, 43.66016],
+              [47.49252, 42.98658],
+              [48.58437, 41.80888],
+              [47.987283, 41.405819],
+              [47.815666, 41.151416],
+              [47.373315, 41.219732],
+              [46.686071, 41.827137],
+              [46.404951, 41.860675],
+              [45.7764, 42.09244],
+              [45.470279, 42.502781],
+              [44.537623, 42.711993],
+              [43.93121, 42.55496],
+              [43.75599, 42.74083],
+              [42.3944, 43.2203],
+              [40.92219, 43.38215],
+              [40.076965, 43.553104],
+              [39.955009, 43.434998],
+              [38.68, 44.28],
+              [37.53912, 44.65721],
+              [36.67546, 45.24469],
+              [37.40317, 45.40451],
+              [38.23295, 46.24087],
+              [37.67372, 46.63657],
+              [39.14767, 47.04475],
+              [39.1212, 47.26336],
+              [38.223538, 47.10219],
+              [38.255112, 47.5464],
+              [38.77057, 47.82562],
+              [39.738278, 47.898937],
+              [39.89562, 48.23241],
+              [39.67465, 48.78382],
+              [40.080789, 49.30743],
+              [40.06904, 49.60105],
+              [38.594988, 49.926462],
+              [38.010631, 49.915662],
+              [37.39346, 50.383953],
+              [36.626168, 50.225591],
+              [35.356116, 50.577197],
+              [35.37791, 50.77394],
+              [35.022183, 51.207572],
+              [34.224816, 51.255993],
+              [34.141978, 51.566413],
+              [34.391731, 51.768882],
+              [33.7527, 52.335075],
+              [32.715761, 52.238465],
+              [32.412058, 52.288695],
+              [32.15944, 52.06125],
+              [31.78597, 52.10168],
+              [31.540018, 52.742052],
+              [31.305201, 53.073996],
+              [31.49764, 53.16743],
+              [32.304519, 53.132726],
+              [32.693643, 53.351421],
+              [32.405599, 53.618045],
+              [31.731273, 53.794029],
+              [31.791424, 53.974639],
+              [31.384472, 54.157056],
+              [30.757534, 54.811771],
+              [30.971836, 55.081548],
+              [30.873909, 55.550976],
+              [29.896294, 55.789463],
+              [29.371572, 55.670091],
+              [29.229513, 55.918344],
+              [28.176709, 56.16913],
+              [27.855282, 56.759326],
+              [27.770016, 57.244258],
+              [27.288185, 57.474528],
+              [27.716686, 57.791899],
+              [27.42015, 58.72457],
+              [28.131699, 59.300825],
+              [27.98112, 59.47537],
+              [29.1177, 60.02805],
+              [28.07, 60.50352],
+              [30.211107, 61.780028],
+              [31.139991, 62.357693],
+              [31.516092, 62.867687],
+              [30.035872, 63.552814],
+              [30.444685, 64.204453],
+              [29.54443, 64.948672],
+              [30.21765, 65.80598],
+              [29.054589, 66.944286],
+              [29.977426, 67.698297],
+              [28.445944, 68.364613],
+              [28.59193, 69.064777],
+              [29.39955, 69.15692],
+              [31.10108, 69.55811],
+              [32.13272, 69.90595],
+              [33.77547, 69.30142],
+              [36.51396, 69.06342],
+              [40.29234, 67.9324],
+              [41.05987, 67.45713],
+              [41.12595, 66.79158],
+              [40.01583, 66.26618],
+              [38.38295, 65.99953],
+              [33.91871, 66.75961],
+              [33.18444, 66.63253],
+              [34.81477, 65.90015],
+              [34.878574, 65.436213],
+              [34.94391, 64.41437],
+              [36.23129, 64.10945],
+              [37.01273, 63.84983],
+              [37.14197, 64.33471],
+              [36.539579, 64.76446],
+              [37.17604, 65.14322],
+              [39.59345, 64.52079],
+              [40.4356, 64.76446],
+              [39.7626, 65.49682],
+              [42.09309, 66.47623],
+              [43.01604, 66.41858],
+              [43.94975, 66.06908],
+              [44.53226, 66.75634],
+              [43.69839, 67.35245],
+              [44.18795, 67.95051],
+              [43.45282, 68.57079],
+              [46.25, 68.25],
+              [46.82134, 67.68997],
+              [45.55517, 67.56652],
+              [45.56202, 67.01005],
+              [46.34915, 66.66767],
+              [47.89416, 66.88455],
+              [48.13876, 67.52238],
+              [50.22766, 67.99867],
+              [53.71743, 68.85738],
+              [54.47171, 68.80815],
+              [53.48582, 68.20131],
+              [54.72628, 68.09702],
+              [55.44268, 68.43866],
+              [57.31702, 68.46628],
+              [58.802, 68.88082],
+              [59.94142, 68.27844],
+              [61.07784, 68.94069],
+              [60.03, 69.52],
+              [60.55, 69.85],
+              [63.504, 69.54739],
+              [64.888115, 69.234835],
+              [68.51216, 68.09233],
+              [69.18068, 68.61563],
+              [68.16444, 69.14436],
+              [68.13522, 69.35649],
+              [66.93008, 69.45461],
+              [67.25976, 69.92873],
+              [66.72492, 70.70889],
+              [66.69466, 71.02897],
+              [68.54006, 71.9345],
+              [69.19636, 72.84336],
+              [69.94, 73.04],
+              [72.58754, 72.77629],
+              [72.79603, 72.22006],
+              [71.84811, 71.40898],
+              [72.47011, 71.09019],
+              [72.79188, 70.39114],
+              [72.5647, 69.02085],
+              [73.66787, 68.4079],
+              [73.2387, 67.7404],
+              [71.28, 66.32],
+              [72.42301, 66.17267],
+              [72.82077, 66.53267],
+              [73.92099, 66.78946],
+              [74.18651, 67.28429],
+              [75.052, 67.76047],
+              [74.46926, 68.32899],
+              [74.93584, 68.98918],
+              [73.84236, 69.07146],
+              [73.60187, 69.62763],
+              [74.3998, 70.63175],
+              [73.1011, 71.44717],
+              [74.89082, 72.12119],
+              [74.65926, 72.83227],
+              [75.15801, 72.85497],
+              [75.68351, 72.30056],
+              [75.28898, 71.33556],
+              [76.35911, 71.15287],
+              [75.90313, 71.87401],
+              [77.57665, 72.26717],
+              [79.65202, 72.32011],
+              [81.5, 71.75],
+              [80.61071, 72.58285],
+              [80.51109, 73.6482],
+              [82.25, 73.85],
+              [84.65526, 73.80591],
+              [86.8223, 73.93688],
+              [86.00956, 74.45967],
+              [87.16682, 75.11643],
+              [88.31571, 75.14393],
+              [90.26, 75.64],
+              [92.90058, 75.77333],
+              [93.23421, 76.0472],
+              [95.86, 76.14],
+              [96.67821, 75.91548],
+              [98.92254, 76.44689],
+              [100.75967, 76.43028],
+              [101.03532, 76.86189],
+              [101.99084, 77.28754],
+              [104.3516, 77.69792],
+              [106.06664, 77.37389],
+              [104.705, 77.1274],
+              [106.97013, 76.97419]
+            ]
+          ],
+          [
+            [
+              [105.07547, 78.30689],
+              [99.43814, 77.921],
+              [101.2649, 79.23399],
+              [102.08635, 79.34641],
+              [102.837815, 79.28129],
+              [105.37243, 78.71334],
+              [105.07547, 78.30689]
+            ]
+          ],
+          [
+            [
+              [51.136187, 80.54728],
+              [49.793685, 80.415428],
+              [48.894411, 80.339567],
+              [48.754937, 80.175468],
+              [47.586119, 80.010181],
+              [46.502826, 80.247247],
+              [47.072455, 80.559424],
+              [44.846958, 80.58981],
+              [46.799139, 80.771918],
+              [48.318477, 80.78401],
+              [48.522806, 80.514569],
+              [49.09719, 80.753986],
+              [50.039768, 80.918885],
+              [51.522933, 80.699726],
+              [51.136187, 80.54728]
+            ]
+          ],
+          [
+            [
+              [99.93976, 78.88094],
+              [97.75794, 78.7562],
+              [94.97259, 79.044745],
+              [93.31288, 79.4265],
+              [92.5454, 80.14379],
+              [91.18107, 80.34146],
+              [93.77766, 81.0246],
+              [95.940895, 81.2504],
+              [97.88385, 80.746975],
+              [100.186655, 79.780135],
+              [99.93976, 78.88094]
+            ]
+          ]
+        ]
+      },
+      "id": "RUS"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Rwanda" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [30.419105, -1.134659],
+            [30.816135, -1.698914],
+            [30.758309, -2.28725],
+            [30.469696, -2.413858],
+            [29.938359, -2.348487],
+            [29.632176, -2.917858],
+            [29.024926, -2.839258],
+            [29.117479, -2.292211],
+            [29.254835, -2.21511],
+            [29.291887, -1.620056],
+            [29.579466, -1.341313],
+            [29.821519, -1.443322],
+            [30.419105, -1.134659]
+          ]
+        ]
+      },
+      "id": "RWA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Western Sahara" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-8.794884, 27.120696],
+            [-8.817828, 27.656426],
+            [-8.66559, 27.656426],
+            [-8.665124, 27.589479],
+            [-8.6844, 27.395744],
+            [-8.687294, 25.881056],
+            [-11.969419, 25.933353],
+            [-11.937224, 23.374594],
+            [-12.874222, 23.284832],
+            [-13.118754, 22.77122],
+            [-12.929102, 21.327071],
+            [-16.845194, 21.333323],
+            [-17.063423, 20.999752],
+            [-17.020428, 21.42231],
+            [-17.002962, 21.420734],
+            [-14.750955, 21.5006],
+            [-14.630833, 21.86094],
+            [-14.221168, 22.310163],
+            [-13.89111, 23.691009],
+            [-12.500963, 24.770116],
+            [-12.030759, 26.030866],
+            [-11.71822, 26.104092],
+            [-11.392555, 26.883424],
+            [-10.551263, 26.990808],
+            [-10.189424, 26.860945],
+            [-9.735343, 26.860945],
+            [-9.413037, 27.088476],
+            [-8.794884, 27.120696]
+          ]
+        ]
+      },
+      "id": "ESH"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Saudi Arabia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [42.779332, 16.347891],
+            [42.649573, 16.774635],
+            [42.347989, 17.075806],
+            [42.270888, 17.474722],
+            [41.754382, 17.833046],
+            [41.221391, 18.6716],
+            [40.939341, 19.486485],
+            [40.247652, 20.174635],
+            [39.801685, 20.338862],
+            [39.139399, 21.291905],
+            [39.023696, 21.986875],
+            [39.066329, 22.579656],
+            [38.492772, 23.688451],
+            [38.02386, 24.078686],
+            [37.483635, 24.285495],
+            [37.154818, 24.858483],
+            [37.209491, 25.084542],
+            [36.931627, 25.602959],
+            [36.639604, 25.826228],
+            [36.249137, 26.570136],
+            [35.640182, 27.37652],
+            [35.130187, 28.063352],
+            [34.632336, 28.058546],
+            [34.787779, 28.607427],
+            [34.83222, 28.957483],
+            [34.956037, 29.356555],
+            [36.068941, 29.197495],
+            [36.501214, 29.505254],
+            [36.740528, 29.865283],
+            [37.503582, 30.003776],
+            [37.66812, 30.338665],
+            [37.998849, 30.5085],
+            [37.002166, 31.508413],
+            [39.004886, 32.010217],
+            [39.195468, 32.161009],
+            [40.399994, 31.889992],
+            [41.889981, 31.190009],
+            [44.709499, 29.178891],
+            [46.568713, 29.099025],
+            [47.459822, 29.002519],
+            [47.708851, 28.526063],
+            [48.416094, 28.552004],
+            [48.807595, 27.689628],
+            [49.299554, 27.461218],
+            [49.470914, 27.109999],
+            [50.152422, 26.689663],
+            [50.212935, 26.277027],
+            [50.113303, 25.943972],
+            [50.239859, 25.60805],
+            [50.527387, 25.327808],
+            [50.660557, 24.999896],
+            [50.810108, 24.754743],
+            [51.112415, 24.556331],
+            [51.389608, 24.627386],
+            [51.579519, 24.245497],
+            [51.617708, 24.014219],
+            [52.000733, 23.001154],
+            [55.006803, 22.496948],
+            [55.208341, 22.70833],
+            [55.666659, 22.000001],
+            [54.999982, 19.999994],
+            [52.00001, 19.000003],
+            [49.116672, 18.616668],
+            [48.183344, 18.166669],
+            [47.466695, 17.116682],
+            [47.000005, 16.949999],
+            [46.749994, 17.283338],
+            [46.366659, 17.233315],
+            [45.399999, 17.333335],
+            [45.216651, 17.433329],
+            [44.062613, 17.410359],
+            [43.791519, 17.319977],
+            [43.380794, 17.579987],
+            [43.115798, 17.08844],
+            [43.218375, 16.66689],
+            [42.779332, 16.347891]
+          ]
+        ]
+      },
+      "id": "SAU"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Sudan" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [33.963393, 9.464285],
+            [33.824963, 9.484061],
+            [33.842131, 9.981915],
+            [33.721959, 10.325262],
+            [33.206938, 10.720112],
+            [33.086766, 11.441141],
+            [33.206938, 12.179338],
+            [32.743419, 12.248008],
+            [32.67475, 12.024832],
+            [32.073892, 11.97333],
+            [32.314235, 11.681484],
+            [32.400072, 11.080626],
+            [31.850716, 10.531271],
+            [31.352862, 9.810241],
+            [30.837841, 9.707237],
+            [29.996639, 10.290927],
+            [29.618957, 10.084919],
+            [29.515953, 9.793074],
+            [29.000932, 9.604232],
+            [28.966597, 9.398224],
+            [27.97089, 9.398224],
+            [27.833551, 9.604232],
+            [27.112521, 9.638567],
+            [26.752006, 9.466893],
+            [26.477328, 9.55273],
+            [25.962307, 10.136421],
+            [25.790633, 10.411099],
+            [25.069604, 10.27376],
+            [24.794926, 9.810241],
+            [24.537415, 8.917538],
+            [24.194068, 8.728696],
+            [23.88698, 8.61973],
+            [23.805813, 8.666319],
+            [23.459013, 8.954286],
+            [23.394779, 9.265068],
+            [23.55725, 9.681218],
+            [23.554304, 10.089255],
+            [22.977544, 10.714463],
+            [22.864165, 11.142395],
+            [22.87622, 11.38461],
+            [22.50869, 11.67936],
+            [22.49762, 12.26024],
+            [22.28801, 12.64605],
+            [21.93681, 12.58818],
+            [22.03759, 12.95546],
+            [22.29658, 13.37232],
+            [22.18329, 13.78648],
+            [22.51202, 14.09318],
+            [22.30351, 14.32682],
+            [22.56795, 14.94429],
+            [23.02459, 15.68072],
+            [23.88689, 15.61084],
+            [23.83766, 19.58047],
+            [23.85, 20],
+            [25, 20.00304],
+            [25, 22],
+            [29.02, 22],
+            [32.9, 22],
+            [36.86623, 22],
+            [37.18872, 21.01885],
+            [36.96941, 20.83744],
+            [37.1147, 19.80796],
+            [37.48179, 18.61409],
+            [37.86276, 18.36786],
+            [38.41009, 17.998307],
+            [37.904, 17.42754],
+            [37.16747, 17.26314],
+            [36.85253, 16.95655],
+            [36.75389, 16.29186],
+            [36.32322, 14.82249],
+            [36.42951, 14.42211],
+            [36.27022, 13.56333],
+            [35.86363, 12.57828],
+            [35.26049, 12.08286],
+            [34.83163, 11.31896],
+            [34.73115, 10.91017],
+            [34.25745, 10.63009],
+            [33.96162, 9.58358],
+            [33.963393, 9.464285]
+          ]
+        ]
+      },
+      "id": "SDN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "South Sudan" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [33.963393, 9.464285],
+            [33.97498, 8.68456],
+            [33.8255, 8.37916],
+            [33.2948, 8.35458],
+            [32.95418, 7.78497],
+            [33.56829, 7.71334],
+            [34.0751, 7.22595],
+            [34.25032, 6.82607],
+            [34.70702, 6.59422],
+            [35.298007, 5.506],
+            [34.620196, 4.847123],
+            [34.005, 4.249885],
+            [33.39, 3.79],
+            [32.68642, 3.79232],
+            [31.88145, 3.55827],
+            [31.24556, 3.7819],
+            [30.83385, 3.50917],
+            [29.95349, 4.1737],
+            [29.715995, 4.600805],
+            [29.159078, 4.389267],
+            [28.696678, 4.455077],
+            [28.428994, 4.287155],
+            [27.979977, 4.408413],
+            [27.374226, 5.233944],
+            [27.213409, 5.550953],
+            [26.465909, 5.946717],
+            [26.213418, 6.546603],
+            [25.796648, 6.979316],
+            [25.124131, 7.500085],
+            [25.114932, 7.825104],
+            [24.567369, 8.229188],
+            [23.88698, 8.61973],
+            [24.194068, 8.728696],
+            [24.537415, 8.917538],
+            [24.794926, 9.810241],
+            [25.069604, 10.27376],
+            [25.790633, 10.411099],
+            [25.962307, 10.136421],
+            [26.477328, 9.55273],
+            [26.752006, 9.466893],
+            [27.112521, 9.638567],
+            [27.833551, 9.604232],
+            [27.97089, 9.398224],
+            [28.966597, 9.398224],
+            [29.000932, 9.604232],
+            [29.515953, 9.793074],
+            [29.618957, 10.084919],
+            [29.996639, 10.290927],
+            [30.837841, 9.707237],
+            [31.352862, 9.810241],
+            [31.850716, 10.531271],
+            [32.400072, 11.080626],
+            [32.314235, 11.681484],
+            [32.073892, 11.97333],
+            [32.67475, 12.024832],
+            [32.743419, 12.248008],
+            [33.206938, 12.179338],
+            [33.086766, 11.441141],
+            [33.206938, 10.720112],
+            [33.721959, 10.325262],
+            [33.842131, 9.981915],
+            [33.824963, 9.484061],
+            [33.963393, 9.464285]
+          ]
+        ]
+      },
+      "id": "SSD"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Senegal" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-16.713729, 13.594959],
+            [-17.126107, 14.373516],
+            [-17.625043, 14.729541],
+            [-17.185173, 14.919477],
+            [-16.700706, 15.621527],
+            [-16.463098, 16.135036],
+            [-16.12069, 16.455663],
+            [-15.623666, 16.369337],
+            [-15.135737, 16.587282],
+            [-14.577348, 16.598264],
+            [-14.099521, 16.304302],
+            [-13.435738, 16.039383],
+            [-12.830658, 15.303692],
+            [-12.17075, 14.616834],
+            [-12.124887, 13.994727],
+            [-11.927716, 13.422075],
+            [-11.553398, 13.141214],
+            [-11.467899, 12.754519],
+            [-11.513943, 12.442988],
+            [-11.658301, 12.386583],
+            [-12.203565, 12.465648],
+            [-12.278599, 12.35444],
+            [-12.499051, 12.33209],
+            [-13.217818, 12.575874],
+            [-13.700476, 12.586183],
+            [-15.548477, 12.62817],
+            [-15.816574, 12.515567],
+            [-16.147717, 12.547762],
+            [-16.677452, 12.384852],
+            [-16.841525, 13.151394],
+            [-15.931296, 13.130284],
+            [-15.691001, 13.270353],
+            [-15.511813, 13.27857],
+            [-15.141163, 13.509512],
+            [-14.712197, 13.298207],
+            [-14.277702, 13.280585],
+            [-13.844963, 13.505042],
+            [-14.046992, 13.794068],
+            [-14.376714, 13.62568],
+            [-14.687031, 13.630357],
+            [-15.081735, 13.876492],
+            [-15.39877, 13.860369],
+            [-15.624596, 13.623587],
+            [-16.713729, 13.594959]
+          ]
+        ]
+      },
+      "id": "SEN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Solomon Islands" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [162.119025, -10.482719],
+              [162.398646, -10.826367],
+              [161.700032, -10.820011],
+              [161.319797, -10.204751],
+              [161.917383, -10.446701],
+              [162.119025, -10.482719]
+            ]
+          ],
+          [
+            [
+              [160.852229, -9.872937],
+              [160.462588, -9.89521],
+              [159.849447, -9.794027],
+              [159.640003, -9.63998],
+              [159.702945, -9.24295],
+              [160.362956, -9.400304],
+              [160.688518, -9.610162],
+              [160.852229, -9.872937]
+            ]
+          ],
+          [
+            [
+              [161.679982, -9.599982],
+              [161.529397, -9.784312],
+              [160.788253, -8.917543],
+              [160.579997, -8.320009],
+              [160.920028, -8.320009],
+              [161.280006, -9.120011],
+              [161.679982, -9.599982]
+            ]
+          ],
+          [
+            [
+              [159.875027, -8.33732],
+              [159.917402, -8.53829],
+              [159.133677, -8.114181],
+              [158.586114, -7.754824],
+              [158.21115, -7.421872],
+              [158.359978, -7.320018],
+              [158.820001, -7.560003],
+              [159.640003, -8.020027],
+              [159.875027, -8.33732]
+            ]
+          ],
+          [
+            [
+              [157.538426, -7.34782],
+              [157.33942, -7.404767],
+              [156.90203, -7.176874],
+              [156.491358, -6.765943],
+              [156.542828, -6.599338],
+              [157.14, -7.021638],
+              [157.538426, -7.34782]
+            ]
+          ]
+        ]
+      },
+      "id": "SLB"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Sierra Leone" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-11.438779, 6.785917],
+            [-11.708195, 6.860098],
+            [-12.428099, 7.262942],
+            [-12.949049, 7.798646],
+            [-13.124025, 8.163946],
+            [-13.24655, 8.903049],
+            [-12.711958, 9.342712],
+            [-12.596719, 9.620188],
+            [-12.425929, 9.835834],
+            [-12.150338, 9.858572],
+            [-11.917277, 10.046984],
+            [-11.117481, 10.045873],
+            [-10.839152, 9.688246],
+            [-10.622395, 9.26791],
+            [-10.65477, 8.977178],
+            [-10.494315, 8.715541],
+            [-10.505477, 8.348896],
+            [-10.230094, 8.406206],
+            [-10.695595, 7.939464],
+            [-11.146704, 7.396706],
+            [-11.199802, 7.105846],
+            [-11.438779, 6.785917]
+          ]
+        ]
+      },
+      "id": "SLE"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "El Salvador" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-87.793111, 13.38448],
+            [-87.904112, 13.149017],
+            [-88.483302, 13.163951],
+            [-88.843228, 13.259734],
+            [-89.256743, 13.458533],
+            [-89.812394, 13.520622],
+            [-90.095555, 13.735338],
+            [-90.064678, 13.88197],
+            [-89.721934, 14.134228],
+            [-89.534219, 14.244816],
+            [-89.587343, 14.362586],
+            [-89.353326, 14.424133],
+            [-89.058512, 14.340029],
+            [-88.843073, 14.140507],
+            [-88.541231, 13.980155],
+            [-88.503998, 13.845486],
+            [-88.065343, 13.964626],
+            [-87.859515, 13.893312],
+            [-87.723503, 13.78505],
+            [-87.793111, 13.38448]
+          ]
+        ]
+      },
+      "id": "SLV"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Somaliland" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [48.93813, 9.451749],
+            [48.486736, 8.837626],
+            [47.78942, 8.003],
+            [46.948328, 7.996877],
+            [43.67875, 9.18358],
+            [43.296975, 9.540477],
+            [42.92812, 10.02194],
+            [42.55876, 10.57258],
+            [42.776852, 10.926879],
+            [43.145305, 11.46204],
+            [43.47066, 11.27771],
+            [43.666668, 10.864169],
+            [44.117804, 10.445538],
+            [44.614259, 10.442205],
+            [45.556941, 10.698029],
+            [46.645401, 10.816549],
+            [47.525658, 11.127228],
+            [48.021596, 11.193064],
+            [48.378784, 11.375482],
+            [48.948206, 11.410622],
+            [48.942005, 11.394266],
+            [48.938491, 10.982327],
+            [48.938233, 9.9735],
+            [48.93813, 9.451749]
+          ]
+        ]
+      },
+      "id": "-99"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Somalia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [49.72862, 11.5789],
+            [50.25878, 11.67957],
+            [50.73202, 12.0219],
+            [51.1112, 12.02464],
+            [51.13387, 11.74815],
+            [51.04153, 11.16651],
+            [51.04531, 10.6409],
+            [50.83418, 10.27972],
+            [50.55239, 9.19874],
+            [50.07092, 8.08173],
+            [49.4527, 6.80466],
+            [48.59455, 5.33911],
+            [47.74079, 4.2194],
+            [46.56476, 2.85529],
+            [45.56399, 2.04576],
+            [44.06815, 1.05283],
+            [43.13597, 0.2922],
+            [42.04157, -0.91916],
+            [41.81095, -1.44647],
+            [41.58513, -1.68325],
+            [40.993, -0.85829],
+            [40.98105, 2.78452],
+            [41.855083, 3.918912],
+            [42.12861, 4.23413],
+            [42.76967, 4.25259],
+            [43.66087, 4.95755],
+            [44.9636, 5.00162],
+            [47.78942, 8.003],
+            [48.486736, 8.837626],
+            [48.93813, 9.451749],
+            [48.938233, 9.9735],
+            [48.938491, 10.982327],
+            [48.942005, 11.394266],
+            [48.948205, 11.410617],
+            [49.26776, 11.43033],
+            [49.72862, 11.5789]
+          ]
+        ]
+      },
+      "id": "SOM"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Republic of Serbia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [20.874313, 45.416375],
+            [21.483526, 45.18117],
+            [21.562023, 44.768947],
+            [22.145088, 44.478422],
+            [22.459022, 44.702517],
+            [22.705726, 44.578003],
+            [22.474008, 44.409228],
+            [22.65715, 44.234923],
+            [22.410446, 44.008063],
+            [22.500157, 43.642814],
+            [22.986019, 43.211161],
+            [22.604801, 42.898519],
+            [22.436595, 42.580321],
+            [22.545012, 42.461362],
+            [22.380526, 42.32026],
+            [21.91708, 42.30364],
+            [21.576636, 42.245224],
+            [21.54332, 42.32025],
+            [21.66292, 42.43922],
+            [21.77505, 42.6827],
+            [21.63302, 42.67717],
+            [21.43866, 42.86255],
+            [21.27421, 42.90959],
+            [21.143395, 43.068685],
+            [20.95651, 43.13094],
+            [20.81448, 43.27205],
+            [20.63508, 43.21671],
+            [20.49679, 42.88469],
+            [20.25758, 42.81275],
+            [20.3398, 42.89852],
+            [19.95857, 43.10604],
+            [19.63, 43.21378],
+            [19.48389, 43.35229],
+            [19.21852, 43.52384],
+            [19.454, 43.5681],
+            [19.59976, 44.03847],
+            [19.11761, 44.42307],
+            [19.36803, 44.863],
+            [19.00548, 44.86023],
+            [19.390476, 45.236516],
+            [19.072769, 45.521511],
+            [18.82982, 45.90888],
+            [19.596045, 46.17173],
+            [20.220192, 46.127469],
+            [20.762175, 45.734573],
+            [20.874313, 45.416375]
+          ]
+        ]
+      },
+      "id": "SRB"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Suriname" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-57.147436, 5.97315],
+            [-55.949318, 5.772878],
+            [-55.84178, 5.953125],
+            [-55.03325, 6.025291],
+            [-53.958045, 5.756548],
+            [-54.478633, 4.896756],
+            [-54.399542, 4.212611],
+            [-54.006931, 3.620038],
+            [-54.181726, 3.18978],
+            [-54.269705, 2.732392],
+            [-54.524754, 2.311849],
+            [-55.097587, 2.523748],
+            [-55.569755, 2.421506],
+            [-55.973322, 2.510364],
+            [-56.073342, 2.220795],
+            [-55.9056, 2.021996],
+            [-55.995698, 1.817667],
+            [-56.539386, 1.899523],
+            [-57.150098, 2.768927],
+            [-57.281433, 3.333492],
+            [-57.601569, 3.334655],
+            [-58.044694, 4.060864],
+            [-57.86021, 4.576801],
+            [-57.914289, 4.812626],
+            [-57.307246, 5.073567],
+            [-57.147436, 5.97315]
+          ]
+        ]
+      },
+      "id": "SUR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Slovakia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [18.853144, 49.49623],
+            [18.909575, 49.435846],
+            [19.320713, 49.571574],
+            [19.825023, 49.217125],
+            [20.415839, 49.431453],
+            [20.887955, 49.328772],
+            [21.607808, 49.470107],
+            [22.558138, 49.085738],
+            [22.280842, 48.825392],
+            [22.085608, 48.422264],
+            [21.872236, 48.319971],
+            [20.801294, 48.623854],
+            [20.473562, 48.56285],
+            [20.239054, 48.327567],
+            [19.769471, 48.202691],
+            [19.661364, 48.266615],
+            [19.174365, 48.111379],
+            [18.777025, 48.081768],
+            [18.696513, 47.880954],
+            [17.857133, 47.758429],
+            [17.488473, 47.867466],
+            [16.979667, 48.123497],
+            [16.879983, 48.470013],
+            [16.960288, 48.596982],
+            [17.101985, 48.816969],
+            [17.545007, 48.800019],
+            [17.886485, 48.903475],
+            [17.913512, 48.996493],
+            [18.104973, 49.043983],
+            [18.170498, 49.271515],
+            [18.399994, 49.315001],
+            [18.554971, 49.495015],
+            [18.853144, 49.49623]
+          ]
+        ]
+      },
+      "id": "SVK"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Slovenia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [13.806475, 46.509306],
+            [14.632472, 46.431817],
+            [15.137092, 46.658703],
+            [16.011664, 46.683611],
+            [16.202298, 46.852386],
+            [16.370505, 46.841327],
+            [16.564808, 46.503751],
+            [15.768733, 46.238108],
+            [15.67153, 45.834154],
+            [15.323954, 45.731783],
+            [15.327675, 45.452316],
+            [14.935244, 45.471695],
+            [14.595109, 45.634941],
+            [14.411968, 45.466166],
+            [13.71506, 45.500324],
+            [13.93763, 45.591016],
+            [13.69811, 46.016778],
+            [13.806475, 46.509306]
+          ]
+        ]
+      },
+      "id": "SVN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Sweden" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [22.183173, 65.723741],
+            [21.213517, 65.026005],
+            [21.369631, 64.413588],
+            [19.778876, 63.609554],
+            [17.847779, 62.7494],
+            [17.119555, 61.341166],
+            [17.831346, 60.636583],
+            [18.787722, 60.081914],
+            [17.869225, 58.953766],
+            [16.829185, 58.719827],
+            [16.44771, 57.041118],
+            [15.879786, 56.104302],
+            [14.666681, 56.200885],
+            [14.100721, 55.407781],
+            [12.942911, 55.361737],
+            [12.625101, 56.30708],
+            [11.787942, 57.441817],
+            [11.027369, 58.856149],
+            [11.468272, 59.432393],
+            [12.300366, 60.117933],
+            [12.631147, 61.293572],
+            [11.992064, 61.800362],
+            [11.930569, 63.128318],
+            [12.579935, 64.066219],
+            [13.571916, 64.049114],
+            [13.919905, 64.445421],
+            [13.55569, 64.787028],
+            [15.108411, 66.193867],
+            [16.108712, 67.302456],
+            [16.768879, 68.013937],
+            [17.729182, 68.010552],
+            [17.993868, 68.567391],
+            [19.87856, 68.407194],
+            [20.025269, 69.065139],
+            [20.645593, 69.106247],
+            [21.978535, 68.616846],
+            [23.539473, 67.936009],
+            [23.56588, 66.396051],
+            [23.903379, 66.006927],
+            [22.183173, 65.723741]
+          ]
+        ]
+      },
+      "id": "SWE"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Swaziland" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [32.071665, -26.73382],
+            [31.86806, -27.177927],
+            [31.282773, -27.285879],
+            [30.685962, -26.743845],
+            [30.676609, -26.398078],
+            [30.949667, -26.022649],
+            [31.04408, -25.731452],
+            [31.333158, -25.660191],
+            [31.837778, -25.843332],
+            [31.985779, -26.29178],
+            [32.071665, -26.73382]
+          ]
+        ]
+      },
+      "id": "SWZ"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Syria" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [38.792341, 33.378686],
+            [36.834062, 32.312938],
+            [35.719918, 32.709192],
+            [35.700798, 32.716014],
+            [35.836397, 32.868123],
+            [35.821101, 33.277426],
+            [36.06646, 33.824912],
+            [36.61175, 34.201789],
+            [36.448194, 34.593935],
+            [35.998403, 34.644914],
+            [35.905023, 35.410009],
+            [36.149763, 35.821535],
+            [36.41755, 36.040617],
+            [36.685389, 36.259699],
+            [36.739494, 36.81752],
+            [37.066761, 36.623036],
+            [38.167727, 36.90121],
+            [38.699891, 36.712927],
+            [39.52258, 36.716054],
+            [40.673259, 37.091276],
+            [41.212089, 37.074352],
+            [42.349591, 37.229873],
+            [41.837064, 36.605854],
+            [41.289707, 36.358815],
+            [41.383965, 35.628317],
+            [41.006159, 34.419372],
+            [38.792341, 33.378686]
+          ]
+        ]
+      },
+      "id": "SYR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Chad" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [14.495787, 12.859396],
+            [14.595781, 13.330427],
+            [13.954477, 13.353449],
+            [13.956699, 13.996691],
+            [13.540394, 14.367134],
+            [13.97217, 15.68437],
+            [15.247731, 16.627306],
+            [15.300441, 17.92795],
+            [15.685741, 19.95718],
+            [15.903247, 20.387619],
+            [15.487148, 20.730415],
+            [15.47106, 21.04845],
+            [15.096888, 21.308519],
+            [14.8513, 22.86295],
+            [15.86085, 23.40972],
+            [19.84926, 21.49509],
+            [23.83766, 19.58047],
+            [23.88689, 15.61084],
+            [23.02459, 15.68072],
+            [22.56795, 14.94429],
+            [22.30351, 14.32682],
+            [22.51202, 14.09318],
+            [22.18329, 13.78648],
+            [22.29658, 13.37232],
+            [22.03759, 12.95546],
+            [21.93681, 12.58818],
+            [22.28801, 12.64605],
+            [22.49762, 12.26024],
+            [22.50869, 11.67936],
+            [22.87622, 11.38461],
+            [22.864165, 11.142395],
+            [22.231129, 10.971889],
+            [21.723822, 10.567056],
+            [21.000868, 9.475985],
+            [20.059685, 9.012706],
+            [19.094008, 9.074847],
+            [18.81201, 8.982915],
+            [18.911022, 8.630895],
+            [18.389555, 8.281304],
+            [17.96493, 7.890914],
+            [16.705988, 7.508328],
+            [16.456185, 7.734774],
+            [16.290562, 7.754307],
+            [16.106232, 7.497088],
+            [15.27946, 7.421925],
+            [15.436092, 7.692812],
+            [15.120866, 8.38215],
+            [14.979996, 8.796104],
+            [14.544467, 8.965861],
+            [13.954218, 9.549495],
+            [14.171466, 10.021378],
+            [14.627201, 9.920919],
+            [14.909354, 9.992129],
+            [15.467873, 9.982337],
+            [14.923565, 10.891325],
+            [14.960152, 11.555574],
+            [14.89336, 12.21905],
+            [14.495787, 12.859396]
+          ]
+        ]
+      },
+      "id": "TCD"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Togo" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [1.865241, 6.142158],
+            [1.060122, 5.928837],
+            [0.836931, 6.279979],
+            [0.570384, 6.914359],
+            [0.490957, 7.411744],
+            [0.712029, 8.312465],
+            [0.461192, 8.677223],
+            [0.365901, 9.465004],
+            [0.36758, 10.191213],
+            [-0.049785, 10.706918],
+            [0.023803, 11.018682],
+            [0.899563, 10.997339],
+            [0.772336, 10.470808],
+            [1.077795, 10.175607],
+            [1.425061, 9.825395],
+            [1.463043, 9.334624],
+            [1.664478, 9.12859],
+            [1.618951, 6.832038],
+            [1.865241, 6.142158]
+          ]
+        ]
+      },
+      "id": "TGO"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Thailand" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [102.584932, 12.186595],
+            [101.687158, 12.64574],
+            [100.83181, 12.627085],
+            [100.978467, 13.412722],
+            [100.097797, 13.406856],
+            [100.018733, 12.307001],
+            [99.478921, 10.846367],
+            [99.153772, 9.963061],
+            [99.222399, 9.239255],
+            [99.873832, 9.207862],
+            [100.279647, 8.295153],
+            [100.459274, 7.429573],
+            [101.017328, 6.856869],
+            [101.623079, 6.740622],
+            [102.141187, 6.221636],
+            [101.814282, 5.810808],
+            [101.154219, 5.691384],
+            [101.075516, 6.204867],
+            [100.259596, 6.642825],
+            [100.085757, 6.464489],
+            [99.690691, 6.848213],
+            [99.519642, 7.343454],
+            [98.988253, 7.907993],
+            [98.503786, 8.382305],
+            [98.339662, 7.794512],
+            [98.150009, 8.350007],
+            [98.25915, 8.973923],
+            [98.553551, 9.93296],
+            [99.038121, 10.960546],
+            [99.587286, 11.892763],
+            [99.196354, 12.804748],
+            [99.212012, 13.269294],
+            [99.097755, 13.827503],
+            [98.430819, 14.622028],
+            [98.192074, 15.123703],
+            [98.537376, 15.308497],
+            [98.903348, 16.177824],
+            [98.493761, 16.837836],
+            [97.859123, 17.567946],
+            [97.375896, 18.445438],
+            [97.797783, 18.62708],
+            [98.253724, 19.708203],
+            [98.959676, 19.752981],
+            [99.543309, 20.186598],
+            [100.115988, 20.41785],
+            [100.548881, 20.109238],
+            [100.606294, 19.508344],
+            [101.282015, 19.462585],
+            [101.035931, 18.408928],
+            [101.059548, 17.512497],
+            [102.113592, 18.109102],
+            [102.413005, 17.932782],
+            [102.998706, 17.961695],
+            [103.200192, 18.309632],
+            [103.956477, 18.240954],
+            [104.716947, 17.428859],
+            [104.779321, 16.441865],
+            [105.589039, 15.570316],
+            [105.544338, 14.723934],
+            [105.218777, 14.273212],
+            [104.281418, 14.416743],
+            [102.988422, 14.225721],
+            [102.348099, 13.394247],
+            [102.584932, 12.186595]
+          ]
+        ]
+      },
+      "id": "THA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Tajikistan" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [71.014198, 40.244366],
+            [70.648019, 39.935754],
+            [69.55961, 40.103211],
+            [69.464887, 39.526683],
+            [70.549162, 39.604198],
+            [71.784694, 39.279463],
+            [73.675379, 39.431237],
+            [73.928852, 38.505815],
+            [74.257514, 38.606507],
+            [74.864816, 38.378846],
+            [74.829986, 37.990007],
+            [74.980002, 37.41999],
+            [73.948696, 37.421566],
+            [73.260056, 37.495257],
+            [72.63689, 37.047558],
+            [72.193041, 36.948288],
+            [71.844638, 36.738171],
+            [71.448693, 37.065645],
+            [71.541918, 37.905774],
+            [71.239404, 37.953265],
+            [71.348131, 38.258905],
+            [70.806821, 38.486282],
+            [70.376304, 38.138396],
+            [70.270574, 37.735165],
+            [70.116578, 37.588223],
+            [69.518785, 37.608997],
+            [69.196273, 37.151144],
+            [68.859446, 37.344336],
+            [68.135562, 37.023115],
+            [67.83, 37.144994],
+            [68.392033, 38.157025],
+            [68.176025, 38.901553],
+            [67.44222, 39.140144],
+            [67.701429, 39.580478],
+            [68.536416, 39.533453],
+            [69.011633, 40.086158],
+            [69.329495, 40.727824],
+            [70.666622, 40.960213],
+            [70.45816, 40.496495],
+            [70.601407, 40.218527],
+            [71.014198, 40.244366]
+          ]
+        ]
+      },
+      "id": "TJK"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Turkmenistan" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [61.210817, 35.650072],
+            [61.123071, 36.491597],
+            [60.377638, 36.527383],
+            [59.234762, 37.412988],
+            [58.436154, 37.522309],
+            [57.330434, 38.029229],
+            [56.619366, 38.121394],
+            [56.180375, 37.935127],
+            [55.511578, 37.964117],
+            [54.800304, 37.392421],
+            [53.921598, 37.198918],
+            [53.735511, 37.906136],
+            [53.880929, 38.952093],
+            [53.101028, 39.290574],
+            [53.357808, 39.975286],
+            [52.693973, 40.033629],
+            [52.915251, 40.876523],
+            [53.858139, 40.631034],
+            [54.736845, 40.951015],
+            [54.008311, 41.551211],
+            [53.721713, 42.123191],
+            [52.91675, 41.868117],
+            [52.814689, 41.135371],
+            [52.50246, 41.783316],
+            [52.944293, 42.116034],
+            [54.079418, 42.324109],
+            [54.755345, 42.043971],
+            [55.455251, 41.259859],
+            [55.968191, 41.308642],
+            [57.096391, 41.32231],
+            [56.932215, 41.826026],
+            [57.78653, 42.170553],
+            [58.629011, 42.751551],
+            [59.976422, 42.223082],
+            [60.083341, 41.425146],
+            [60.465953, 41.220327],
+            [61.547179, 41.26637],
+            [61.882714, 41.084857],
+            [62.37426, 40.053886],
+            [63.518015, 39.363257],
+            [64.170223, 38.892407],
+            [65.215999, 38.402695],
+            [66.54615, 37.974685],
+            [66.518607, 37.362784],
+            [66.217385, 37.39379],
+            [65.745631, 37.661164],
+            [65.588948, 37.305217],
+            [64.746105, 37.111818],
+            [64.546479, 36.312073],
+            [63.982896, 36.007957],
+            [63.193538, 35.857166],
+            [62.984662, 35.404041],
+            [62.230651, 35.270664],
+            [61.210817, 35.650072]
+          ]
+        ]
+      },
+      "id": "TKM"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "East Timor" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [124.968682, -8.89279],
+            [125.086246, -8.656887],
+            [125.947072, -8.432095],
+            [126.644704, -8.398247],
+            [126.957243, -8.273345],
+            [127.335928, -8.397317],
+            [126.967992, -8.668256],
+            [125.925885, -9.106007],
+            [125.08852, -9.393173],
+            [125.07002, -9.089987],
+            [124.968682, -8.89279]
+          ]
+        ]
+      },
+      "id": "TLS"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Trinidad and Tobago" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-61.68, 10.76],
+            [-61.105, 10.89],
+            [-60.895, 10.855],
+            [-60.935, 10.11],
+            [-61.77, 10],
+            [-61.95, 10.09],
+            [-61.66, 10.365],
+            [-61.68, 10.76]
+          ]
+        ]
+      },
+      "id": "TTO"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Tunisia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [9.48214, 30.307556],
+            [9.055603, 32.102692],
+            [8.439103, 32.506285],
+            [8.430473, 32.748337],
+            [7.612642, 33.344115],
+            [7.524482, 34.097376],
+            [8.140981, 34.655146],
+            [8.376368, 35.479876],
+            [8.217824, 36.433177],
+            [8.420964, 36.946427],
+            [9.509994, 37.349994],
+            [10.210002, 37.230002],
+            [10.18065, 36.724038],
+            [11.028867, 37.092103],
+            [11.100026, 36.899996],
+            [10.600005, 36.41],
+            [10.593287, 35.947444],
+            [10.939519, 35.698984],
+            [10.807847, 34.833507],
+            [10.149593, 34.330773],
+            [10.339659, 33.785742],
+            [10.856836, 33.76874],
+            [11.108501, 33.293343],
+            [11.488787, 33.136996],
+            [11.432253, 32.368903],
+            [10.94479, 32.081815],
+            [10.636901, 31.761421],
+            [9.950225, 31.37607],
+            [10.056575, 30.961831],
+            [9.970017, 30.539325],
+            [9.48214, 30.307556]
+          ]
+        ]
+      },
+      "id": "TUN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Turkey" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [36.913127, 41.335358],
+              [38.347665, 40.948586],
+              [39.512607, 41.102763],
+              [40.373433, 41.013673],
+              [41.554084, 41.535656],
+              [42.619549, 41.583173],
+              [43.582746, 41.092143],
+              [43.752658, 40.740201],
+              [43.656436, 40.253564],
+              [44.400009, 40.005],
+              [44.79399, 39.713003],
+              [44.109225, 39.428136],
+              [44.421403, 38.281281],
+              [44.225756, 37.971584],
+              [44.772699, 37.170445],
+              [44.293452, 37.001514],
+              [43.942259, 37.256228],
+              [42.779126, 37.385264],
+              [42.349591, 37.229873],
+              [41.212089, 37.074352],
+              [40.673259, 37.091276],
+              [39.52258, 36.716054],
+              [38.699891, 36.712927],
+              [38.167727, 36.90121],
+              [37.066761, 36.623036],
+              [36.739494, 36.81752],
+              [36.685389, 36.259699],
+              [36.41755, 36.040617],
+              [36.149763, 35.821535],
+              [35.782085, 36.274995],
+              [36.160822, 36.650606],
+              [35.550936, 36.565443],
+              [34.714553, 36.795532],
+              [34.026895, 36.21996],
+              [32.509158, 36.107564],
+              [31.699595, 36.644275],
+              [30.621625, 36.677865],
+              [30.391096, 36.262981],
+              [29.699976, 36.144357],
+              [28.732903, 36.676831],
+              [27.641187, 36.658822],
+              [27.048768, 37.653361],
+              [26.318218, 38.208133],
+              [26.8047, 38.98576],
+              [26.170785, 39.463612],
+              [27.28002, 40.420014],
+              [28.819978, 40.460011],
+              [29.240004, 41.219991],
+              [31.145934, 41.087622],
+              [32.347979, 41.736264],
+              [33.513283, 42.01896],
+              [35.167704, 42.040225],
+              [36.913127, 41.335358]
+            ]
+          ],
+          [
+            [
+              [27.192377, 40.690566],
+              [26.358009, 40.151994],
+              [26.043351, 40.617754],
+              [26.056942, 40.824123],
+              [26.294602, 40.936261],
+              [26.604196, 41.562115],
+              [26.117042, 41.826905],
+              [27.135739, 42.141485],
+              [27.99672, 42.007359],
+              [28.115525, 41.622886],
+              [28.988443, 41.299934],
+              [28.806438, 41.054962],
+              [27.619017, 40.999823],
+              [27.192377, 40.690566]
+            ]
+          ]
+        ]
+      },
+      "id": "TUR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Taiwan" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [121.777818, 24.394274],
+            [121.175632, 22.790857],
+            [120.74708, 21.970571],
+            [120.220083, 22.814861],
+            [120.106189, 23.556263],
+            [120.69468, 24.538451],
+            [121.495044, 25.295459],
+            [121.951244, 24.997596],
+            [121.777818, 24.394274]
+          ]
+        ]
+      },
+      "id": "TWN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "United Republic of Tanzania" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [33.903711, -0.95],
+            [34.07262, -1.05982],
+            [37.69869, -3.09699],
+            [37.7669, -3.67712],
+            [39.20222, -4.67677],
+            [38.74054, -5.90895],
+            [38.79977, -6.47566],
+            [39.44, -6.84],
+            [39.47, -7.1],
+            [39.19469, -7.7039],
+            [39.25203, -8.00781],
+            [39.18652, -8.48551],
+            [39.53574, -9.11237],
+            [39.9496, -10.0984],
+            [40.31659, -10.3171],
+            [39.521, -10.89688],
+            [38.427557, -11.285202],
+            [37.82764, -11.26879],
+            [37.47129, -11.56876],
+            [36.775151, -11.594537],
+            [36.514082, -11.720938],
+            [35.312398, -11.439146],
+            [34.559989, -11.52002],
+            [34.28, -10.16],
+            [33.940838, -9.693674],
+            [33.73972, -9.41715],
+            [32.759375, -9.230599],
+            [32.191865, -8.930359],
+            [31.556348, -8.762049],
+            [31.157751, -8.594579],
+            [30.74, -8.34],
+            [30.2, -7.08],
+            [29.62, -6.52],
+            [29.419993, -5.939999],
+            [29.519987, -5.419979],
+            [29.339998, -4.499983],
+            [29.753512, -4.452389],
+            [30.11632, -4.09012],
+            [30.50554, -3.56858],
+            [30.75224, -3.35931],
+            [30.74301, -3.03431],
+            [30.52766, -2.80762],
+            [30.46967, -2.41383],
+            [30.758309, -2.28725],
+            [30.816135, -1.698914],
+            [30.419105, -1.134659],
+            [30.76986, -1.01455],
+            [31.86617, -1.02736],
+            [33.903711, -0.95]
+          ]
+        ]
+      },
+      "id": "TZA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Uganda" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [31.86617, -1.02736],
+            [30.76986, -1.01455],
+            [30.419105, -1.134659],
+            [29.821519, -1.443322],
+            [29.579466, -1.341313],
+            [29.587838, -0.587406],
+            [29.8195, -0.2053],
+            [29.875779, 0.59738],
+            [30.086154, 1.062313],
+            [30.468508, 1.583805],
+            [30.85267, 1.849396],
+            [31.174149, 2.204465],
+            [30.77332, 2.33989],
+            [30.83385, 3.50917],
+            [31.24556, 3.7819],
+            [31.88145, 3.55827],
+            [32.68642, 3.79232],
+            [33.39, 3.79],
+            [34.005, 4.249885],
+            [34.47913, 3.5556],
+            [34.59607, 3.05374],
+            [35.03599, 1.90584],
+            [34.6721, 1.17694],
+            [34.18, 0.515],
+            [33.893569, 0.109814],
+            [33.903711, -0.95],
+            [31.86617, -1.02736]
+          ]
+        ]
+      },
+      "id": "UGA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Ukraine" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [31.785998, 52.101678],
+            [32.159412, 52.061267],
+            [32.412058, 52.288695],
+            [32.715761, 52.238465],
+            [33.7527, 52.335075],
+            [34.391731, 51.768882],
+            [34.141978, 51.566413],
+            [34.224816, 51.255993],
+            [35.022183, 51.207572],
+            [35.377924, 50.773955],
+            [35.356116, 50.577197],
+            [36.626168, 50.225591],
+            [37.39346, 50.383953],
+            [38.010631, 49.915662],
+            [38.594988, 49.926462],
+            [40.069058, 49.601055],
+            [40.080789, 49.30743],
+            [39.674664, 48.783818],
+            [39.895632, 48.232405],
+            [39.738278, 47.898937],
+            [38.770585, 47.825608],
+            [38.255112, 47.5464],
+            [38.223538, 47.10219],
+            [37.425137, 47.022221],
+            [36.759855, 46.6987],
+            [35.823685, 46.645964],
+            [34.962342, 46.273197],
+            [35.020788, 45.651219],
+            [35.510009, 45.409993],
+            [36.529998, 45.46999],
+            [36.334713, 45.113216],
+            [35.239999, 44.939996],
+            [33.882511, 44.361479],
+            [33.326421, 44.564877],
+            [33.546924, 45.034771],
+            [32.454174, 45.327466],
+            [32.630804, 45.519186],
+            [33.588162, 45.851569],
+            [33.298567, 46.080598],
+            [31.74414, 46.333348],
+            [31.675307, 46.706245],
+            [30.748749, 46.5831],
+            [30.377609, 46.03241],
+            [29.603289, 45.293308],
+            [29.149725, 45.464925],
+            [28.679779, 45.304031],
+            [28.233554, 45.488283],
+            [28.485269, 45.596907],
+            [28.659987, 45.939987],
+            [28.933717, 46.25883],
+            [28.862972, 46.437889],
+            [29.072107, 46.517678],
+            [29.170654, 46.379262],
+            [29.759972, 46.349988],
+            [30.024659, 46.423937],
+            [29.83821, 46.525326],
+            [29.908852, 46.674361],
+            [29.559674, 46.928583],
+            [29.415135, 47.346645],
+            [29.050868, 47.510227],
+            [29.122698, 47.849095],
+            [28.670891, 48.118149],
+            [28.259547, 48.155562],
+            [27.522537, 48.467119],
+            [26.857824, 48.368211],
+            [26.619337, 48.220726],
+            [26.19745, 48.220881],
+            [25.945941, 47.987149],
+            [25.207743, 47.891056],
+            [24.866317, 47.737526],
+            [24.402056, 47.981878],
+            [23.760958, 47.985598],
+            [23.142236, 48.096341],
+            [22.710531, 47.882194],
+            [22.64082, 48.15024],
+            [22.085608, 48.422264],
+            [22.280842, 48.825392],
+            [22.558138, 49.085738],
+            [22.776419, 49.027395],
+            [22.51845, 49.476774],
+            [23.426508, 50.308506],
+            [23.922757, 50.424881],
+            [24.029986, 50.705407],
+            [23.527071, 51.578454],
+            [24.005078, 51.617444],
+            [24.553106, 51.888461],
+            [25.327788, 51.910656],
+            [26.337959, 51.832289],
+            [27.454066, 51.592303],
+            [28.241615, 51.572227],
+            [28.617613, 51.427714],
+            [28.992835, 51.602044],
+            [29.254938, 51.368234],
+            [30.157364, 51.416138],
+            [30.555117, 51.319503],
+            [30.619454, 51.822806],
+            [30.927549, 52.042353],
+            [31.785998, 52.101678]
+          ]
+        ]
+      },
+      "id": "UKR"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Uruguay" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-57.625133, -30.216295],
+            [-56.976026, -30.109686],
+            [-55.973245, -30.883076],
+            [-55.60151, -30.853879],
+            [-54.572452, -31.494511],
+            [-53.787952, -32.047243],
+            [-53.209589, -32.727666],
+            [-53.650544, -33.202004],
+            [-53.373662, -33.768378],
+            [-53.806426, -34.396815],
+            [-54.935866, -34.952647],
+            [-55.67409, -34.752659],
+            [-56.215297, -34.859836],
+            [-57.139685, -34.430456],
+            [-57.817861, -34.462547],
+            [-58.427074, -33.909454],
+            [-58.349611, -33.263189],
+            [-58.132648, -33.040567],
+            [-58.14244, -32.044504],
+            [-57.874937, -31.016556],
+            [-57.625133, -30.216295]
+          ]
+        ]
+      },
+      "id": "URY"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "United States of America" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [-155.54211, 19.08348],
+              [-155.68817, 18.91619],
+              [-155.93665, 19.05939],
+              [-155.90806, 19.33888],
+              [-156.07347, 19.70294],
+              [-156.02368, 19.81422],
+              [-155.85008, 19.97729],
+              [-155.91907, 20.17395],
+              [-155.86108, 20.26721],
+              [-155.78505, 20.2487],
+              [-155.40214, 20.07975],
+              [-155.22452, 19.99302],
+              [-155.06226, 19.8591],
+              [-154.80741, 19.50871],
+              [-154.83147, 19.45328],
+              [-155.22217, 19.23972],
+              [-155.54211, 19.08348]
+            ]
+          ],
+          [
+            [
+              [-156.07926, 20.64397],
+              [-156.41445, 20.57241],
+              [-156.58673, 20.783],
+              [-156.70167, 20.8643],
+              [-156.71055, 20.92676],
+              [-156.61258, 21.01249],
+              [-156.25711, 20.91745],
+              [-155.99566, 20.76404],
+              [-156.07926, 20.64397]
+            ]
+          ],
+          [
+            [
+              [-156.75824, 21.17684],
+              [-156.78933, 21.06873],
+              [-157.32521, 21.09777],
+              [-157.25027, 21.21958],
+              [-156.75824, 21.17684]
+            ]
+          ],
+          [
+            [
+              [-157.65283, 21.32217],
+              [-157.70703, 21.26442],
+              [-157.7786, 21.27729],
+              [-158.12667, 21.31244],
+              [-158.2538, 21.53919],
+              [-158.29265, 21.57912],
+              [-158.0252, 21.71696],
+              [-157.94161, 21.65272],
+              [-157.65283, 21.32217]
+            ]
+          ],
+          [
+            [
+              [-159.34512, 21.982],
+              [-159.46372, 21.88299],
+              [-159.80051, 22.06533],
+              [-159.74877, 22.1382],
+              [-159.5962, 22.23618],
+              [-159.36569, 22.21494],
+              [-159.34512, 21.982]
+            ]
+          ],
+          [
+            [
+              [-94.81758, 49.38905],
+              [-94.64, 48.84],
+              [-94.32914, 48.67074],
+              [-93.63087, 48.60926],
+              [-92.61, 48.45],
+              [-91.64, 48.14],
+              [-90.83, 48.27],
+              [-89.6, 48.01],
+              [-89.272917, 48.019808],
+              [-88.378114, 48.302918],
+              [-87.439793, 47.94],
+              [-86.461991, 47.553338],
+              [-85.652363, 47.220219],
+              [-84.87608, 46.900083],
+              [-84.779238, 46.637102],
+              [-84.543749, 46.538684],
+              [-84.6049, 46.4396],
+              [-84.3367, 46.40877],
+              [-84.14212, 46.512226],
+              [-84.091851, 46.275419],
+              [-83.890765, 46.116927],
+              [-83.616131, 46.116927],
+              [-83.469551, 45.994686],
+              [-83.592851, 45.816894],
+              [-82.550925, 45.347517],
+              [-82.337763, 44.44],
+              [-82.137642, 43.571088],
+              [-82.43, 42.98],
+              [-82.9, 42.43],
+              [-83.12, 42.08],
+              [-83.142, 41.975681],
+              [-83.02981, 41.832796],
+              [-82.690089, 41.675105],
+              [-82.439278, 41.675105],
+              [-81.277747, 42.209026],
+              [-80.247448, 42.3662],
+              [-78.939362, 42.863611],
+              [-78.92, 42.965],
+              [-79.01, 43.27],
+              [-79.171674, 43.466339],
+              [-78.72028, 43.625089],
+              [-77.737885, 43.629056],
+              [-76.820034, 43.628784],
+              [-76.5, 44.018459],
+              [-76.375, 44.09631],
+              [-75.31821, 44.81645],
+              [-74.867, 45.00048],
+              [-73.34783, 45.00738],
+              [-71.50506, 45.0082],
+              [-71.405, 45.255],
+              [-71.08482, 45.30524],
+              [-70.66, 45.46],
+              [-70.305, 45.915],
+              [-69.99997, 46.69307],
+              [-69.237216, 47.447781],
+              [-68.905, 47.185],
+              [-68.23444, 47.35486],
+              [-67.79046, 47.06636],
+              [-67.79134, 45.70281],
+              [-67.13741, 45.13753],
+              [-66.96466, 44.8097],
+              [-68.03252, 44.3252],
+              [-69.06, 43.98],
+              [-70.11617, 43.68405],
+              [-70.645476, 43.090238],
+              [-70.81489, 42.8653],
+              [-70.825, 42.335],
+              [-70.495, 41.805],
+              [-70.08, 41.78],
+              [-70.185, 42.145],
+              [-69.88497, 41.92283],
+              [-69.96503, 41.63717],
+              [-70.64, 41.475],
+              [-71.12039, 41.49445],
+              [-71.86, 41.32],
+              [-72.295, 41.27],
+              [-72.87643, 41.22065],
+              [-73.71, 40.931102],
+              [-72.24126, 41.11948],
+              [-71.945, 40.93],
+              [-73.345, 40.63],
+              [-73.982, 40.628],
+              [-73.952325, 40.75075],
+              [-74.25671, 40.47351],
+              [-73.96244, 40.42763],
+              [-74.17838, 39.70926],
+              [-74.90604, 38.93954],
+              [-74.98041, 39.1964],
+              [-75.20002, 39.24845],
+              [-75.52805, 39.4985],
+              [-75.32, 38.96],
+              [-75.071835, 38.782032],
+              [-75.05673, 38.40412],
+              [-75.37747, 38.01551],
+              [-75.94023, 37.21689],
+              [-76.03127, 37.2566],
+              [-75.72205, 37.93705],
+              [-76.23287, 38.319215],
+              [-76.35, 39.15],
+              [-76.542725, 38.717615],
+              [-76.32933, 38.08326],
+              [-76.989998, 38.239992],
+              [-76.30162, 37.917945],
+              [-76.25874, 36.9664],
+              [-75.9718, 36.89726],
+              [-75.86804, 36.55125],
+              [-75.72749, 35.55074],
+              [-76.36318, 34.80854],
+              [-77.397635, 34.51201],
+              [-78.05496, 33.92547],
+              [-78.55435, 33.86133],
+              [-79.06067, 33.49395],
+              [-79.20357, 33.15839],
+              [-80.301325, 32.509355],
+              [-80.86498, 32.0333],
+              [-81.33629, 31.44049],
+              [-81.49042, 30.72999],
+              [-81.31371, 30.03552],
+              [-80.98, 29.18],
+              [-80.535585, 28.47213],
+              [-80.53, 28.04],
+              [-80.056539, 26.88],
+              [-80.088015, 26.205765],
+              [-80.13156, 25.816775],
+              [-80.38103, 25.20616],
+              [-80.68, 25.08],
+              [-81.17213, 25.20126],
+              [-81.33, 25.64],
+              [-81.71, 25.87],
+              [-82.24, 26.73],
+              [-82.70515, 27.49504],
+              [-82.85526, 27.88624],
+              [-82.65, 28.55],
+              [-82.93, 29.1],
+              [-83.70959, 29.93656],
+              [-84.1, 30.09],
+              [-85.10882, 29.63615],
+              [-85.28784, 29.68612],
+              [-85.7731, 30.15261],
+              [-86.4, 30.4],
+              [-87.53036, 30.27433],
+              [-88.41782, 30.3849],
+              [-89.18049, 30.31598],
+              [-89.593831, 30.159994],
+              [-89.413735, 29.89419],
+              [-89.43, 29.48864],
+              [-89.21767, 29.29108],
+              [-89.40823, 29.15961],
+              [-89.77928, 29.30714],
+              [-90.15463, 29.11743],
+              [-90.880225, 29.148535],
+              [-91.626785, 29.677],
+              [-92.49906, 29.5523],
+              [-93.22637, 29.78375],
+              [-93.84842, 29.71363],
+              [-94.69, 29.48],
+              [-95.60026, 28.73863],
+              [-96.59404, 28.30748],
+              [-97.14, 27.83],
+              [-97.37, 27.38],
+              [-97.38, 26.69],
+              [-97.33, 26.21],
+              [-97.14, 25.87],
+              [-97.53, 25.84],
+              [-98.24, 26.06],
+              [-99.02, 26.37],
+              [-99.3, 26.84],
+              [-99.52, 27.54],
+              [-100.11, 28.11],
+              [-100.45584, 28.69612],
+              [-100.9576, 29.38071],
+              [-101.6624, 29.7793],
+              [-102.48, 29.76],
+              [-103.11, 28.97],
+              [-103.94, 29.27],
+              [-104.45697, 29.57196],
+              [-104.70575, 30.12173],
+              [-105.03737, 30.64402],
+              [-105.63159, 31.08383],
+              [-106.1429, 31.39995],
+              [-106.50759, 31.75452],
+              [-108.24, 31.754854],
+              [-108.24194, 31.34222],
+              [-109.035, 31.34194],
+              [-111.02361, 31.33472],
+              [-113.30498, 32.03914],
+              [-114.815, 32.52528],
+              [-114.72139, 32.72083],
+              [-115.99135, 32.61239],
+              [-117.12776, 32.53534],
+              [-117.295938, 33.046225],
+              [-117.944, 33.621236],
+              [-118.410602, 33.740909],
+              [-118.519895, 34.027782],
+              [-119.081, 34.078],
+              [-119.438841, 34.348477],
+              [-120.36778, 34.44711],
+              [-120.62286, 34.60855],
+              [-120.74433, 35.15686],
+              [-121.71457, 36.16153],
+              [-122.54747, 37.55176],
+              [-122.51201, 37.78339],
+              [-122.95319, 38.11371],
+              [-123.7272, 38.95166],
+              [-123.86517, 39.76699],
+              [-124.39807, 40.3132],
+              [-124.17886, 41.14202],
+              [-124.2137, 41.99964],
+              [-124.53284, 42.76599],
+              [-124.14214, 43.70838],
+              [-124.020535, 44.615895],
+              [-123.89893, 45.52341],
+              [-124.079635, 46.86475],
+              [-124.39567, 47.72017],
+              [-124.68721, 48.184433],
+              [-124.566101, 48.379715],
+              [-123.12, 48.04],
+              [-122.58736, 47.096],
+              [-122.34, 47.36],
+              [-122.5, 48.18],
+              [-122.84, 49],
+              [-120, 49],
+              [-117.03121, 49],
+              [-116.04818, 49],
+              [-113, 49],
+              [-110.05, 49],
+              [-107.05, 49],
+              [-104.04826, 48.99986],
+              [-100.65, 49],
+              [-97.22872, 49.0007],
+              [-95.15907, 49],
+              [-95.15609, 49.38425],
+              [-94.81758, 49.38905]
+            ]
+          ],
+          [
+            [
+              [-153.006314, 57.115842],
+              [-154.00509, 56.734677],
+              [-154.516403, 56.992749],
+              [-154.670993, 57.461196],
+              [-153.76278, 57.816575],
+              [-153.228729, 57.968968],
+              [-152.564791, 57.901427],
+              [-152.141147, 57.591059],
+              [-153.006314, 57.115842]
+            ]
+          ],
+          [
+            [
+              [-165.579164, 59.909987],
+              [-166.19277, 59.754441],
+              [-166.848337, 59.941406],
+              [-167.455277, 60.213069],
+              [-166.467792, 60.38417],
+              [-165.67443, 60.293607],
+              [-165.579164, 59.909987]
+            ]
+          ],
+          [
+            [
+              [-171.731657, 63.782515],
+              [-171.114434, 63.592191],
+              [-170.491112, 63.694975],
+              [-169.682505, 63.431116],
+              [-168.689439, 63.297506],
+              [-168.771941, 63.188598],
+              [-169.52944, 62.976931],
+              [-170.290556, 63.194438],
+              [-170.671386, 63.375822],
+              [-171.553063, 63.317789],
+              [-171.791111, 63.405846],
+              [-171.731657, 63.782515]
+            ]
+          ],
+          [
+            [
+              [-155.06779, 71.147776],
+              [-154.344165, 70.696409],
+              [-153.900006, 70.889989],
+              [-152.210006, 70.829992],
+              [-152.270002, 70.600006],
+              [-150.739992, 70.430017],
+              [-149.720003, 70.53001],
+              [-147.613362, 70.214035],
+              [-145.68999, 70.12001],
+              [-144.920011, 69.989992],
+              [-143.589446, 70.152514],
+              [-142.07251, 69.851938],
+              [-140.985988, 69.711998],
+              [-140.985988, 69.711998],
+              [-140.992499, 66.000029],
+              [-140.99777, 60.306397],
+              [-140.012998, 60.276838],
+              [-139.039, 60.000007],
+              [-138.34089, 59.56211],
+              [-137.4525, 58.905],
+              [-136.47972, 59.46389],
+              [-135.47583, 59.78778],
+              [-134.945, 59.27056],
+              [-134.27111, 58.86111],
+              [-133.355549, 58.410285],
+              [-132.73042, 57.69289],
+              [-131.70781, 56.55212],
+              [-130.00778, 55.91583],
+              [-129.979994, 55.284998],
+              [-130.53611, 54.802753],
+              [-131.085818, 55.178906],
+              [-131.967211, 55.497776],
+              [-132.250011, 56.369996],
+              [-133.539181, 57.178887],
+              [-134.078063, 58.123068],
+              [-135.038211, 58.187715],
+              [-136.628062, 58.212209],
+              [-137.800006, 58.499995],
+              [-139.867787, 59.537762],
+              [-140.825274, 59.727517],
+              [-142.574444, 60.084447],
+              [-143.958881, 59.99918],
+              [-145.925557, 60.45861],
+              [-147.114374, 60.884656],
+              [-148.224306, 60.672989],
+              [-148.018066, 59.978329],
+              [-148.570823, 59.914173],
+              [-149.727858, 59.705658],
+              [-150.608243, 59.368211],
+              [-151.716393, 59.155821],
+              [-151.859433, 59.744984],
+              [-151.409719, 60.725803],
+              [-150.346941, 61.033588],
+              [-150.621111, 61.284425],
+              [-151.895839, 60.727198],
+              [-152.57833, 60.061657],
+              [-154.019172, 59.350279],
+              [-153.287511, 58.864728],
+              [-154.232492, 58.146374],
+              [-155.307491, 57.727795],
+              [-156.308335, 57.422774],
+              [-156.556097, 56.979985],
+              [-158.117217, 56.463608],
+              [-158.433321, 55.994154],
+              [-159.603327, 55.566686],
+              [-160.28972, 55.643581],
+              [-161.223048, 55.364735],
+              [-162.237766, 55.024187],
+              [-163.069447, 54.689737],
+              [-164.785569, 54.404173],
+              [-164.942226, 54.572225],
+              [-163.84834, 55.039431],
+              [-162.870001, 55.348043],
+              [-161.804175, 55.894986],
+              [-160.563605, 56.008055],
+              [-160.07056, 56.418055],
+              [-158.684443, 57.016675],
+              [-158.461097, 57.216921],
+              [-157.72277, 57.570001],
+              [-157.550274, 58.328326],
+              [-157.041675, 58.918885],
+              [-158.194731, 58.615802],
+              [-158.517218, 58.787781],
+              [-159.058606, 58.424186],
+              [-159.711667, 58.93139],
+              [-159.981289, 58.572549],
+              [-160.355271, 59.071123],
+              [-161.355003, 58.670838],
+              [-161.968894, 58.671665],
+              [-162.054987, 59.266925],
+              [-161.874171, 59.633621],
+              [-162.518059, 59.989724],
+              [-163.818341, 59.798056],
+              [-164.662218, 60.267484],
+              [-165.346388, 60.507496],
+              [-165.350832, 61.073895],
+              [-166.121379, 61.500019],
+              [-165.734452, 62.074997],
+              [-164.919179, 62.633076],
+              [-164.562508, 63.146378],
+              [-163.753332, 63.219449],
+              [-163.067224, 63.059459],
+              [-162.260555, 63.541936],
+              [-161.53445, 63.455817],
+              [-160.772507, 63.766108],
+              [-160.958335, 64.222799],
+              [-161.518068, 64.402788],
+              [-160.777778, 64.788604],
+              [-161.391926, 64.777235],
+              [-162.45305, 64.559445],
+              [-162.757786, 64.338605],
+              [-163.546394, 64.55916],
+              [-164.96083, 64.446945],
+              [-166.425288, 64.686672],
+              [-166.845004, 65.088896],
+              [-168.11056, 65.669997],
+              [-166.705271, 66.088318],
+              [-164.47471, 66.57666],
+              [-163.652512, 66.57666],
+              [-163.788602, 66.077207],
+              [-161.677774, 66.11612],
+              [-162.489715, 66.735565],
+              [-163.719717, 67.116395],
+              [-164.430991, 67.616338],
+              [-165.390287, 68.042772],
+              [-166.764441, 68.358877],
+              [-166.204707, 68.883031],
+              [-164.430811, 68.915535],
+              [-163.168614, 69.371115],
+              [-162.930566, 69.858062],
+              [-161.908897, 70.33333],
+              [-160.934797, 70.44769],
+              [-159.039176, 70.891642],
+              [-158.119723, 70.824721],
+              [-156.580825, 71.357764],
+              [-155.06779, 71.147776]
+            ]
+          ]
+        ]
+      },
+      "id": "USA"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Uzbekistan" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [66.518607, 37.362784],
+            [66.54615, 37.974685],
+            [65.215999, 38.402695],
+            [64.170223, 38.892407],
+            [63.518015, 39.363257],
+            [62.37426, 40.053886],
+            [61.882714, 41.084857],
+            [61.547179, 41.26637],
+            [60.465953, 41.220327],
+            [60.083341, 41.425146],
+            [59.976422, 42.223082],
+            [58.629011, 42.751551],
+            [57.78653, 42.170553],
+            [56.932215, 41.826026],
+            [57.096391, 41.32231],
+            [55.968191, 41.308642],
+            [55.928917, 44.995858],
+            [58.503127, 45.586804],
+            [58.689989, 45.500014],
+            [60.239972, 44.784037],
+            [61.05832, 44.405817],
+            [62.0133, 43.504477],
+            [63.185787, 43.650075],
+            [64.900824, 43.728081],
+            [66.098012, 42.99766],
+            [66.023392, 41.994646],
+            [66.510649, 41.987644],
+            [66.714047, 41.168444],
+            [67.985856, 41.135991],
+            [68.259896, 40.662325],
+            [68.632483, 40.668681],
+            [69.070027, 41.384244],
+            [70.388965, 42.081308],
+            [70.962315, 42.266154],
+            [71.259248, 42.167711],
+            [70.420022, 41.519998],
+            [71.157859, 41.143587],
+            [71.870115, 41.3929],
+            [73.055417, 40.866033],
+            [71.774875, 40.145844],
+            [71.014198, 40.244366],
+            [70.601407, 40.218527],
+            [70.45816, 40.496495],
+            [70.666622, 40.960213],
+            [69.329495, 40.727824],
+            [69.011633, 40.086158],
+            [68.536416, 39.533453],
+            [67.701429, 39.580478],
+            [67.44222, 39.140144],
+            [68.176025, 38.901553],
+            [68.392033, 38.157025],
+            [67.83, 37.144994],
+            [67.075782, 37.356144],
+            [66.518607, 37.362784]
+          ]
+        ]
+      },
+      "id": "UZB"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Venezuela" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [-71.331584, 11.776284],
+            [-71.360006, 11.539994],
+            [-71.94705, 11.423282],
+            [-71.620868, 10.96946],
+            [-71.633064, 10.446494],
+            [-72.074174, 9.865651],
+            [-71.695644, 9.072263],
+            [-71.264559, 9.137195],
+            [-71.039999, 9.859993],
+            [-71.350084, 10.211935],
+            [-71.400623, 10.968969],
+            [-70.155299, 11.375482],
+            [-70.293843, 11.846822],
+            [-69.943245, 12.162307],
+            [-69.5843, 11.459611],
+            [-68.882999, 11.443385],
+            [-68.233271, 10.885744],
+            [-68.194127, 10.554653],
+            [-67.296249, 10.545868],
+            [-66.227864, 10.648627],
+            [-65.655238, 10.200799],
+            [-64.890452, 10.077215],
+            [-64.329479, 10.389599],
+            [-64.318007, 10.641418],
+            [-63.079322, 10.701724],
+            [-61.880946, 10.715625],
+            [-62.730119, 10.420269],
+            [-62.388512, 9.948204],
+            [-61.588767, 9.873067],
+            [-60.830597, 9.38134],
+            [-60.671252, 8.580174],
+            [-60.150096, 8.602757],
+            [-59.758285, 8.367035],
+            [-60.550588, 7.779603],
+            [-60.637973, 7.415],
+            [-60.295668, 7.043911],
+            [-60.543999, 6.856584],
+            [-61.159336, 6.696077],
+            [-61.139415, 6.234297],
+            [-61.410303, 5.959068],
+            [-60.733574, 5.200277],
+            [-60.601179, 4.918098],
+            [-60.966893, 4.536468],
+            [-62.08543, 4.162124],
+            [-62.804533, 4.006965],
+            [-63.093198, 3.770571],
+            [-63.888343, 4.02053],
+            [-64.628659, 4.148481],
+            [-64.816064, 4.056445],
+            [-64.368494, 3.79721],
+            [-64.408828, 3.126786],
+            [-64.269999, 2.497006],
+            [-63.422867, 2.411068],
+            [-63.368788, 2.2009],
+            [-64.083085, 1.916369],
+            [-64.199306, 1.492855],
+            [-64.611012, 1.328731],
+            [-65.354713, 1.095282],
+            [-65.548267, 0.789254],
+            [-66.325765, 0.724452],
+            [-66.876326, 1.253361],
+            [-67.181294, 2.250638],
+            [-67.447092, 2.600281],
+            [-67.809938, 2.820655],
+            [-67.303173, 3.318454],
+            [-67.337564, 3.542342],
+            [-67.621836, 3.839482],
+            [-67.823012, 4.503937],
+            [-67.744697, 5.221129],
+            [-67.521532, 5.55687],
+            [-67.34144, 6.095468],
+            [-67.695087, 6.267318],
+            [-68.265052, 6.153268],
+            [-68.985319, 6.206805],
+            [-69.38948, 6.099861],
+            [-70.093313, 6.960376],
+            [-70.674234, 7.087785],
+            [-71.960176, 6.991615],
+            [-72.198352, 7.340431],
+            [-72.444487, 7.423785],
+            [-72.479679, 7.632506],
+            [-72.360901, 8.002638],
+            [-72.439862, 8.405275],
+            [-72.660495, 8.625288],
+            [-72.78873, 9.085027],
+            [-73.304952, 9.152],
+            [-73.027604, 9.73677],
+            [-72.905286, 10.450344],
+            [-72.614658, 10.821975],
+            [-72.227575, 11.108702],
+            [-71.973922, 11.608672],
+            [-71.331584, 11.776284]
+          ]
+        ]
+      },
+      "id": "VEN"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Vietnam" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [108.05018, 21.55238],
+            [106.715068, 20.696851],
+            [105.881682, 19.75205],
+            [105.662006, 19.058165],
+            [106.426817, 18.004121],
+            [107.361954, 16.697457],
+            [108.269495, 16.079742],
+            [108.877107, 15.276691],
+            [109.33527, 13.426028],
+            [109.200136, 11.666859],
+            [108.36613, 11.008321],
+            [107.220929, 10.364484],
+            [106.405113, 9.53084],
+            [105.158264, 8.59976],
+            [104.795185, 9.241038],
+            [105.076202, 9.918491],
+            [104.334335, 10.486544],
+            [105.199915, 10.88931],
+            [106.24967, 10.961812],
+            [105.810524, 11.567615],
+            [107.491403, 12.337206],
+            [107.614548, 13.535531],
+            [107.382727, 14.202441],
+            [107.564525, 15.202173],
+            [107.312706, 15.908538],
+            [106.556008, 16.604284],
+            [105.925762, 17.485315],
+            [105.094598, 18.666975],
+            [103.896532, 19.265181],
+            [104.183388, 19.624668],
+            [104.822574, 19.886642],
+            [104.435, 20.758733],
+            [103.203861, 20.766562],
+            [102.754896, 21.675137],
+            [102.170436, 22.464753],
+            [102.706992, 22.708795],
+            [103.504515, 22.703757],
+            [104.476858, 22.81915],
+            [105.329209, 23.352063],
+            [105.811247, 22.976892],
+            [106.725403, 22.794268],
+            [106.567273, 22.218205],
+            [107.04342, 21.811899],
+            [108.05018, 21.55238]
+          ]
+        ]
+      },
+      "id": "VNM"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Vanuatu" },
+      "geometry": {
+        "type": "MultiPolygon",
+        "coordinates": [
+          [
+            [
+              [167.844877, -16.466333],
+              [167.515181, -16.59785],
+              [167.180008, -16.159995],
+              [167.216801, -15.891846],
+              [167.844877, -16.466333]
+            ]
+          ],
+          [
+            [
+              [167.107712, -14.93392],
+              [167.270028, -15.740021],
+              [167.001207, -15.614602],
+              [166.793158, -15.668811],
+              [166.649859, -15.392704],
+              [166.629137, -14.626497],
+              [167.107712, -14.93392]
+            ]
+          ]
+        ]
+      },
+      "id": "VUT"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "West Bank" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [35.545665, 32.393992],
+            [35.545252, 31.782505],
+            [35.397561, 31.489086],
+            [34.927408, 31.353435],
+            [34.970507, 31.616778],
+            [35.225892, 31.754341],
+            [34.974641, 31.866582],
+            [35.18393, 32.532511],
+            [35.545665, 32.393992]
+          ]
+        ]
+      },
+      "id": "PSE"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Yemen" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [53.108573, 16.651051],
+            [52.385206, 16.382411],
+            [52.191729, 15.938433],
+            [52.168165, 15.59742],
+            [51.172515, 15.17525],
+            [49.574576, 14.708767],
+            [48.679231, 14.003202],
+            [48.238947, 13.94809],
+            [47.938914, 14.007233],
+            [47.354454, 13.59222],
+            [46.717076, 13.399699],
+            [45.877593, 13.347764],
+            [45.62505, 13.290946],
+            [45.406459, 13.026905],
+            [45.144356, 12.953938],
+            [44.989533, 12.699587],
+            [44.494576, 12.721653],
+            [44.175113, 12.58595],
+            [43.482959, 12.6368],
+            [43.222871, 13.22095],
+            [43.251448, 13.767584],
+            [43.087944, 14.06263],
+            [42.892245, 14.802249],
+            [42.604873, 15.213335],
+            [42.805015, 15.261963],
+            [42.702438, 15.718886],
+            [42.823671, 15.911742],
+            [42.779332, 16.347891],
+            [43.218375, 16.66689],
+            [43.115798, 17.08844],
+            [43.380794, 17.579987],
+            [43.791519, 17.319977],
+            [44.062613, 17.410359],
+            [45.216651, 17.433329],
+            [45.399999, 17.333335],
+            [46.366659, 17.233315],
+            [46.749994, 17.283338],
+            [47.000005, 16.949999],
+            [47.466695, 17.116682],
+            [48.183344, 18.166669],
+            [49.116672, 18.616668],
+            [52.00001, 19.000003],
+            [52.782184, 17.349742],
+            [53.108573, 16.651051]
+          ]
+        ]
+      },
+      "id": "YEM"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "South Africa" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [31.521001, -29.257387],
+            [31.325561, -29.401978],
+            [30.901763, -29.909957],
+            [30.622813, -30.423776],
+            [30.055716, -31.140269],
+            [28.925553, -32.172041],
+            [28.219756, -32.771953],
+            [27.464608, -33.226964],
+            [26.419452, -33.61495],
+            [25.909664, -33.66704],
+            [25.780628, -33.944646],
+            [25.172862, -33.796851],
+            [24.677853, -33.987176],
+            [23.594043, -33.794474],
+            [22.988189, -33.916431],
+            [22.574157, -33.864083],
+            [21.542799, -34.258839],
+            [20.689053, -34.417175],
+            [20.071261, -34.795137],
+            [19.616405, -34.819166],
+            [19.193278, -34.462599],
+            [18.855315, -34.444306],
+            [18.424643, -33.997873],
+            [18.377411, -34.136521],
+            [18.244499, -33.867752],
+            [18.25008, -33.281431],
+            [17.92519, -32.611291],
+            [18.24791, -32.429131],
+            [18.221762, -31.661633],
+            [17.566918, -30.725721],
+            [17.064416, -29.878641],
+            [17.062918, -29.875954],
+            [16.344977, -28.576705],
+            [16.824017, -28.082162],
+            [17.218929, -28.355943],
+            [17.387497, -28.783514],
+            [17.836152, -28.856378],
+            [18.464899, -29.045462],
+            [19.002127, -28.972443],
+            [19.894734, -28.461105],
+            [19.895768, -24.76779],
+            [20.165726, -24.917962],
+            [20.758609, -25.868136],
+            [20.66647, -26.477453],
+            [20.889609, -26.828543],
+            [21.605896, -26.726534],
+            [22.105969, -26.280256],
+            [22.579532, -25.979448],
+            [22.824271, -25.500459],
+            [23.312097, -25.26869],
+            [23.73357, -25.390129],
+            [24.211267, -25.670216],
+            [25.025171, -25.71967],
+            [25.664666, -25.486816],
+            [25.765849, -25.174845],
+            [25.941652, -24.696373],
+            [26.485753, -24.616327],
+            [26.786407, -24.240691],
+            [27.11941, -23.574323],
+            [28.017236, -22.827754],
+            [29.432188, -22.091313],
+            [29.839037, -22.102216],
+            [30.322883, -22.271612],
+            [30.659865, -22.151567],
+            [31.191409, -22.25151],
+            [31.670398, -23.658969],
+            [31.930589, -24.369417],
+            [31.752408, -25.484284],
+            [31.837778, -25.843332],
+            [31.333158, -25.660191],
+            [31.04408, -25.731452],
+            [30.949667, -26.022649],
+            [30.676609, -26.398078],
+            [30.685962, -26.743845],
+            [31.282773, -27.285879],
+            [31.86806, -27.177927],
+            [32.071665, -26.73382],
+            [32.83012, -26.742192],
+            [32.580265, -27.470158],
+            [32.462133, -28.301011],
+            [32.203389, -28.752405],
+            [31.521001, -29.257387]
+          ],
+          [
+            [28.978263, -28.955597],
+            [28.5417, -28.647502],
+            [28.074338, -28.851469],
+            [27.532511, -29.242711],
+            [26.999262, -29.875954],
+            [27.749397, -30.645106],
+            [28.107205, -30.545732],
+            [28.291069, -30.226217],
+            [28.8484, -30.070051],
+            [29.018415, -29.743766],
+            [29.325166, -29.257387],
+            [28.978263, -28.955597]
+          ]
+        ]
+      },
+      "id": "ZAF"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Zambia" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [32.759375, -9.230599],
+            [33.231388, -9.676722],
+            [33.485688, -10.525559],
+            [33.31531, -10.79655],
+            [33.114289, -11.607198],
+            [33.306422, -12.435778],
+            [32.991764, -12.783871],
+            [32.688165, -13.712858],
+            [33.214025, -13.97186],
+            [30.179481, -14.796099],
+            [30.274256, -15.507787],
+            [29.516834, -15.644678],
+            [28.947463, -16.043051],
+            [28.825869, -16.389749],
+            [28.467906, -16.4684],
+            [27.598243, -17.290831],
+            [27.044427, -17.938026],
+            [26.706773, -17.961229],
+            [26.381935, -17.846042],
+            [25.264226, -17.73654],
+            [25.084443, -17.661816],
+            [25.07695, -17.578823],
+            [24.682349, -17.353411],
+            [24.033862, -17.295843],
+            [23.215048, -17.523116],
+            [22.562478, -16.898451],
+            [21.887843, -16.08031],
+            [21.933886, -12.898437],
+            [24.016137, -12.911046],
+            [23.930922, -12.565848],
+            [24.079905, -12.191297],
+            [23.904154, -11.722282],
+            [24.017894, -11.237298],
+            [23.912215, -10.926826],
+            [24.257155, -10.951993],
+            [24.314516, -11.262826],
+            [24.78317, -11.238694],
+            [25.418118, -11.330936],
+            [25.75231, -11.784965],
+            [26.553088, -11.92444],
+            [27.16442, -11.608748],
+            [27.388799, -12.132747],
+            [28.155109, -12.272481],
+            [28.523562, -12.698604],
+            [28.934286, -13.248958],
+            [29.699614, -13.257227],
+            [29.616001, -12.178895],
+            [29.341548, -12.360744],
+            [28.642417, -11.971569],
+            [28.372253, -11.793647],
+            [28.49607, -10.789884],
+            [28.673682, -9.605925],
+            [28.449871, -9.164918],
+            [28.734867, -8.526559],
+            [29.002912, -8.407032],
+            [30.346086, -8.238257],
+            [30.740015, -8.340007],
+            [31.157751, -8.594579],
+            [31.556348, -8.762049],
+            [32.191865, -8.930359],
+            [32.759375, -9.230599]
+          ]
+        ]
+      },
+      "id": "ZMB"
+    },
+    {
+      "type": "Feature",
+      "properties": { "name": "Zimbabwe" },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [31.191409, -22.25151],
+            [30.659865, -22.151567],
+            [30.322883, -22.271612],
+            [29.839037, -22.102216],
+            [29.432188, -22.091313],
+            [28.794656, -21.639454],
+            [28.02137, -21.485975],
+            [27.727228, -20.851802],
+            [27.724747, -20.499059],
+            [27.296505, -20.39152],
+            [26.164791, -19.293086],
+            [25.850391, -18.714413],
+            [25.649163, -18.536026],
+            [25.264226, -17.73654],
+            [26.381935, -17.846042],
+            [26.706773, -17.961229],
+            [27.044427, -17.938026],
+            [27.598243, -17.290831],
+            [28.467906, -16.4684],
+            [28.825869, -16.389749],
+            [28.947463, -16.043051],
+            [29.516834, -15.644678],
+            [30.274256, -15.507787],
+            [30.338955, -15.880839],
+            [31.173064, -15.860944],
+            [31.636498, -16.07199],
+            [31.852041, -16.319417],
+            [32.328239, -16.392074],
+            [32.847639, -16.713398],
+            [32.849861, -17.979057],
+            [32.654886, -18.67209],
+            [32.611994, -19.419383],
+            [32.772708, -19.715592],
+            [32.659743, -20.30429],
+            [32.508693, -20.395292],
+            [32.244988, -21.116489],
+            [31.191409, -22.25151]
+          ]
+        ]
+      },
+      "id": "ZWE"
+    }
+  ]
+}

From 8fef99b1f0e99bca951df7e33711e9008654239c Mon Sep 17 00:00:00 2001
From: Dinesh Salunke <dineshsalunke@Dineshs-MacBook-Air.local>
Date: Fri, 20 Sep 2024 09:23:01 +0530
Subject: [PATCH 364/438] fix: use the same id for event and event data for
 clickhouse

---
 src/queries/analytics/events/saveEvent.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/queries/analytics/events/saveEvent.ts b/src/queries/analytics/events/saveEvent.ts
index 6c0f917baa..f249dff29b 100644
--- a/src/queries/analytics/events/saveEvent.ts
+++ b/src/queries/analytics/events/saveEvent.ts
@@ -145,7 +145,7 @@ async function clickhouseQuery(data: {
     website_id: websiteId,
     session_id: sessionId,
     visit_id: visitId,
-    event_id: uuid(),
+    event_id: eventId,
     country: country,
     subdivision1:
       country && subdivision1

From 659cfb41eca59df3bdd9caa168361f7620d2f150 Mon Sep 17 00:00:00 2001
From: libin <libin@molaware.com>
Date: Wed, 25 Sep 2024 18:11:17 +0800
Subject: [PATCH 365/438] bugfix: events count amend

---
 src/queries/analytics/sessions/getWebsiteSession.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/queries/analytics/sessions/getWebsiteSession.ts b/src/queries/analytics/sessions/getWebsiteSession.ts
index f9b9f39a08..2c16741eee 100644
--- a/src/queries/analytics/sessions/getWebsiteSession.ts
+++ b/src/queries/analytics/sessions/getWebsiteSession.ts
@@ -47,7 +47,7 @@ async function relationalQuery(websiteId: string, sessionId: string) {
           min(website_event.created_at) as min_time,
           max(website_event.created_at) as max_time,
           sum(case when website_event.event_type = 1 then 1 else 0 end) as views,
-          sum(case when website_event.event_type = 1 then 1 else 0 end) as events
+          sum(case when website_event.event_type = 2 then 1 else 0 end) as events
     from session
     join website_event on website_event.session_id = session.session_id
     where session.website_id = {{websiteId::uuid}}

From e7ffcbd92abf14030740acbdcbe8704885f3d47e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 26 Sep 2024 19:21:56 +0000
Subject: [PATCH 366/438] Bump rollup from 3.29.4 to 3.29.5

Bumps [rollup](https://github.com/rollup/rollup) from 3.29.4 to 3.29.5.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v3.29.4...v3.29.5)

---
updated-dependencies:
- dependency-name: rollup
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index a53045fef1..00bd738bbb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9482,9 +9482,9 @@ rollup-pluginutils@^2.8.2:
     estree-walker "^0.6.1"
 
 rollup@^3.28.0:
-  version "3.29.4"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.4.tgz#4d70c0f9834146df8705bfb69a9a19c9e1109981"
-  integrity sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==
+  version "3.29.5"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.5.tgz#8a2e477a758b520fb78daf04bca4c522c1da8a54"
+  integrity sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==
   optionalDependencies:
     fsevents "~2.3.2"
 

From 2707b394733478875a366cad3a63468282a98649 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Thu, 26 Sep 2024 15:36:48 -0700
Subject: [PATCH 367/438] v1 revenue report for clickhouse

---
 next-env.d.ts                                 |   2 +-
 src/app/(main)/console/TestConsole.tsx        |  53 +++++-
 .../(main)/reports/create/ReportTemplates.tsx |  13 +-
 .../(main)/reports/revenue/RevenueChart.tsx   |  98 ----------
 .../reports/revenue/RevenueParameters.tsx     |  29 +--
 .../reports/revenue/RevenueReport.module.css  |  10 -
 .../(main)/reports/revenue/RevenueReport.tsx  |  14 +-
 .../(main)/reports/revenue/RevenueTable.tsx   |  38 ++++
 .../reports/revenue/RevenueView.module.css    |   5 +
 .../(main)/reports/revenue/RevenueView.tsx    | 140 ++++++++++++++
 .../[websiteId]/events/EventProperties.tsx    |   2 +-
 src/components/charts/BarChart.tsx            |   6 +-
 src/components/charts/BarChartTooltip.tsx     |  11 +-
 .../hooks/queries/useEventDataValues.ts       |   2 +-
 src/components/messages.ts                    |   5 +-
 src/lib/format.ts                             |  26 +++
 src/pages/api/reports/revenue.ts              |  27 +--
 src/queries/analytics/reports/getRevenue.ts   | 179 +++++++++++-------
 .../sessions/getWebsiteSessionsWeekly.ts      |   6 +-
 19 files changed, 425 insertions(+), 241 deletions(-)
 delete mode 100644 src/app/(main)/reports/revenue/RevenueChart.tsx
 delete mode 100644 src/app/(main)/reports/revenue/RevenueReport.module.css
 create mode 100644 src/app/(main)/reports/revenue/RevenueTable.tsx
 create mode 100644 src/app/(main)/reports/revenue/RevenueView.module.css
 create mode 100644 src/app/(main)/reports/revenue/RevenueView.tsx

diff --git a/next-env.d.ts b/next-env.d.ts
index fd36f9494e..725dd6f245 100644
--- a/next-env.d.ts
+++ b/next-env.d.ts
@@ -3,4 +3,4 @@
 /// <reference types="next/navigation-types/compat/navigation" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
diff --git a/src/app/(main)/console/TestConsole.tsx b/src/app/(main)/console/TestConsole.tsx
index 7461454f9e..8e7169d4a3 100644
--- a/src/app/(main)/console/TestConsole.tsx
+++ b/src/app/(main)/console/TestConsole.tsx
@@ -48,6 +48,46 @@ export function TestConsole({ websiteId }: { websiteId: string }) {
     });
   }
 
+  function handleRunRevenue() {
+    window['umami'].track(props => ({
+      ...props,
+      url: '/checkout-cart',
+      referrer: 'https://www.google.com',
+    }));
+    window['umami'].track('checkout-cart', {
+      revenue: parseFloat((Math.random() * 100000).toFixed(2)),
+      currency: 'USD',
+    });
+    window['umami'].track('affiliate-link', {
+      revenue: parseFloat((Math.random() * 100000).toFixed(2)),
+      currency: 'USD',
+    });
+    window['umami'].track('promotion-link', {
+      revenue: parseFloat((Math.random() * 100000).toFixed(2)),
+      currency: 'USD',
+    });
+    window['umami'].track('checkout-cart', {
+      revenue: parseFloat((Math.random() * 100000).toFixed(2)),
+      currency: 'EUR',
+    });
+    window['umami'].track('promotion-link', {
+      revenue: parseFloat((Math.random() * 100000).toFixed(2)),
+      currency: 'EUR',
+    });
+    window['umami'].track('affiliate-link', {
+      item1: {
+        productIdentity: 'ABC424',
+        revenue: parseFloat((Math.random() * 100000).toFixed(2)),
+        currency: 'MXN',
+      },
+      item2: {
+        productIdentity: 'ZYW684',
+        revenue: parseFloat((Math.random() * 100000).toFixed(2)),
+        currency: 'MXN',
+      },
+    });
+  }
+
   function handleRunIdentify() {
     window['umami'].identify({
       userId: 123,
@@ -127,10 +167,18 @@ export function TestConsole({ websiteId }: { websiteId: string }) {
               >
                 Send event with data
               </Button>
+              <Button
+                id="generate-revenue-button"
+                data-umami-event="checkout-cart"
+                data-umami-event-revenue={(Math.random() * 100).toFixed(2).toString()}
+                variant="primary"
+              >
+                Generate revenue data
+              </Button>
               <Button
                 id="button-with-div-button"
                 data-umami-event="button-click"
-                data-umami-event-name="bob"
+                data-umami-event-name={'bob'}
                 data-umami-event-id="123"
                 variant="primary"
               >
@@ -155,6 +203,9 @@ export function TestConsole({ websiteId }: { websiteId: string }) {
               <Button id="manual-button" variant="primary" onClick={handleRunIdentify}>
                 Run identify
               </Button>
+              <Button id="manual-button" variant="primary" onClick={handleRunRevenue}>
+                Revenue script
+              </Button>
             </div>
           </div>
           <WebsiteChart websiteId={website.id} />
diff --git a/src/app/(main)/reports/create/ReportTemplates.tsx b/src/app/(main)/reports/create/ReportTemplates.tsx
index fcfa6f6a92..af19d4aac4 100644
--- a/src/app/(main)/reports/create/ReportTemplates.tsx
+++ b/src/app/(main)/reports/create/ReportTemplates.tsx
@@ -1,4 +1,5 @@
 import Funnel from 'assets/funnel.svg';
+import Money from 'assets/money.svg';
 import Lightbulb from 'assets/lightbulb.svg';
 import Magnet from 'assets/magnet.svg';
 import Path from 'assets/path.svg';
@@ -51,12 +52,12 @@ export function ReportTemplates({ showHeader = true }: { showHeader?: boolean })
       url: renderTeamUrl('/reports/journey'),
       icon: <Path />,
     },
-    // {
-    //   title: formatMessage(labels.revenue),
-    //   description: formatMessage(labels.revenueDescription),
-    //   url: renderTeamUrl('/reports/revenue'),
-    //   icon: <Money />,
-    // },
+    {
+      title: formatMessage(labels.revenue),
+      description: formatMessage(labels.revenueDescription),
+      url: renderTeamUrl('/reports/revenue'),
+      icon: <Money />,
+    },
   ];
 
   return (
diff --git a/src/app/(main)/reports/revenue/RevenueChart.tsx b/src/app/(main)/reports/revenue/RevenueChart.tsx
deleted file mode 100644
index 602ab31c57..0000000000
--- a/src/app/(main)/reports/revenue/RevenueChart.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import BarChart, { BarChartProps } from 'components/charts/BarChart';
-import { useLocale, useMessages } from 'components/hooks';
-import MetricCard from 'components/metrics/MetricCard';
-import MetricsBar from 'components/metrics/MetricsBar';
-import { renderDateLabels } from 'lib/charts';
-import { formatLongNumber } from 'lib/format';
-import { useContext, useMemo } from 'react';
-import { ReportContext } from '../[reportId]/Report';
-
-export interface PageviewsChartProps extends BarChartProps {
-  isLoading?: boolean;
-}
-
-export function RevenueChart({ isLoading, ...props }: PageviewsChartProps) {
-  const { formatMessage, labels } = useMessages();
-  const { locale } = useLocale();
-  const { report } = useContext(ReportContext);
-  const { data, parameters } = report || {};
-
-  const chartData = useMemo(() => {
-    if (!data) {
-      return {};
-    }
-
-    return {
-      datasets: [
-        {
-          label: formatMessage(labels.average),
-          data: data?.chart.map(a => ({ x: a.time, y: a.avg })),
-          borderWidth: 2,
-          backgroundColor: '#8601B0',
-          borderColor: '#8601B0',
-          order: 1,
-        },
-        {
-          label: formatMessage(labels.total),
-          data: data?.chart.map(a => ({ x: a.time, y: a.sum })),
-          borderWidth: 2,
-          backgroundColor: '#f15bb5',
-          borderColor: '#f15bb5',
-          order: 2,
-        },
-      ],
-    };
-  }, [data, locale]);
-
-  const metricData = useMemo(() => {
-    if (!data) {
-      return [];
-    }
-
-    const { sum, avg, count, uniqueCount } = data.total;
-
-    return [
-      {
-        value: sum,
-        label: formatMessage(labels.total),
-        formatValue: formatLongNumber,
-      },
-      {
-        value: avg,
-        label: formatMessage(labels.average),
-        formatValue: formatLongNumber,
-      },
-      {
-        value: count,
-        label: formatMessage(labels.transactions),
-        formatValue: formatLongNumber,
-      },
-      {
-        value: uniqueCount,
-        label: formatMessage(labels.uniqueCustomers),
-        formatValue: formatLongNumber,
-      },
-    ] as any;
-  }, [data, locale]);
-
-  return (
-    <>
-      <MetricsBar isFetched={data}>
-        {metricData?.map(({ label, value, formatValue }) => {
-          return <MetricCard key={label} value={value} label={label} formatValue={formatValue} />;
-        })}
-      </MetricsBar>
-      {data && (
-        <BarChart
-          {...props}
-          data={chartData}
-          unit={parameters?.dateRange.unit}
-          isLoading={isLoading}
-          renderXLabel={renderDateLabels(parameters?.dateRange.unit, locale)}
-        />
-      )}
-    </>
-  );
-}
-
-export default RevenueChart;
diff --git a/src/app/(main)/reports/revenue/RevenueParameters.tsx b/src/app/(main)/reports/revenue/RevenueParameters.tsx
index ef6ed20939..253f3adf87 100644
--- a/src/app/(main)/reports/revenue/RevenueParameters.tsx
+++ b/src/app/(main)/reports/revenue/RevenueParameters.tsx
@@ -1,46 +1,35 @@
 import { useMessages } from 'components/hooks';
 import { useContext } from 'react';
-import { Form, FormButtons, FormInput, FormRow, SubmitButton, TextField } from 'react-basics';
+import { Dropdown, Form, FormButtons, FormInput, FormRow, Item, SubmitButton } from 'react-basics';
 import BaseParameters from '../[reportId]/BaseParameters';
 import { ReportContext } from '../[reportId]/Report';
 
 export function RevenueParameters() {
   const { report, runReport, isRunning } = useContext(ReportContext);
   const { formatMessage, labels } = useMessages();
-
   const { id, parameters } = report || {};
   const { websiteId, dateRange } = parameters || {};
-  const queryDisabled = !websiteId || !dateRange;
+  const queryEnabled = websiteId && dateRange;
 
   const handleSubmit = (data: any, e: any) => {
     e.stopPropagation();
     e.preventDefault();
 
-    if (!queryDisabled) {
-      runReport(data);
-    }
+    runReport(data);
   };
 
   return (
     <Form values={parameters} onSubmit={handleSubmit} preventSubmit={true}>
       <BaseParameters showDateSelect={true} allowWebsiteSelect={!id} />
-      <FormRow label={formatMessage(labels.event)}>
-        <FormInput name="eventName" rules={{ required: formatMessage(labels.required) }}>
-          <TextField autoComplete="off" />
-        </FormInput>
-      </FormRow>
-      <FormRow label={formatMessage(labels.revenueProperty)}>
-        <FormInput name="revenueProperty" rules={{ required: formatMessage(labels.required) }}>
-          <TextField autoComplete="off" />
-        </FormInput>
-      </FormRow>
-      <FormRow label={formatMessage(labels.userProperty)}>
-        <FormInput name="userProperty">
-          <TextField autoComplete="off" />
+      <FormRow label={formatMessage(labels.currency)}>
+        <FormInput name="currency" rules={{ required: formatMessage(labels.required) }}>
+          <Dropdown items={['USD', 'EUR', 'MXN']}>
+            {item => <Item key={item}>{item}</Item>}
+          </Dropdown>
         </FormInput>
       </FormRow>
       <FormButtons>
-        <SubmitButton variant="primary" disabled={queryDisabled} isLoading={isRunning}>
+        <SubmitButton variant="primary" disabled={!queryEnabled} isLoading={isRunning}>
           {formatMessage(labels.runQuery)}
         </SubmitButton>
       </FormButtons>
diff --git a/src/app/(main)/reports/revenue/RevenueReport.module.css b/src/app/(main)/reports/revenue/RevenueReport.module.css
deleted file mode 100644
index aed66b74ef..0000000000
--- a/src/app/(main)/reports/revenue/RevenueReport.module.css
+++ /dev/null
@@ -1,10 +0,0 @@
-.filters {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  border: 1px solid var(--base400);
-  border-radius: var(--border-radius);
-  line-height: 32px;
-  padding: 10px;
-  overflow: hidden;
-}
diff --git a/src/app/(main)/reports/revenue/RevenueReport.tsx b/src/app/(main)/reports/revenue/RevenueReport.tsx
index d67f57c0d8..7b75ebd24a 100644
--- a/src/app/(main)/reports/revenue/RevenueReport.tsx
+++ b/src/app/(main)/reports/revenue/RevenueReport.tsx
@@ -1,15 +1,15 @@
-import RevenueChart from './RevenueChart';
-import RevenueParameters from './RevenueParameters';
+import Money from 'assets/money.svg';
+import { REPORT_TYPES } from 'lib/constants';
 import Report from '../[reportId]/Report';
+import ReportBody from '../[reportId]/ReportBody';
 import ReportHeader from '../[reportId]/ReportHeader';
 import ReportMenu from '../[reportId]/ReportMenu';
-import ReportBody from '../[reportId]/ReportBody';
-import Money from 'assets/money.svg';
-import { REPORT_TYPES } from 'lib/constants';
+import RevenueParameters from './RevenueParameters';
+import RevenueView from './RevenueView';
 
 const defaultParameters = {
   type: REPORT_TYPES.revenue,
-  parameters: { Revenue: [] },
+  parameters: {},
 };
 
 export default function RevenueReport({ reportId }: { reportId?: string }) {
@@ -20,7 +20,7 @@ export default function RevenueReport({ reportId }: { reportId?: string }) {
         <RevenueParameters />
       </ReportMenu>
       <ReportBody>
-        <RevenueChart unit="day" />
+        <RevenueView />
       </ReportBody>
     </Report>
   );
diff --git a/src/app/(main)/reports/revenue/RevenueTable.tsx b/src/app/(main)/reports/revenue/RevenueTable.tsx
new file mode 100644
index 0000000000..f038aed99a
--- /dev/null
+++ b/src/app/(main)/reports/revenue/RevenueTable.tsx
@@ -0,0 +1,38 @@
+import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
+import { useMessages } from 'components/hooks';
+import { useContext } from 'react';
+import { GridColumn, GridTable } from 'react-basics';
+import { ReportContext } from '../[reportId]/Report';
+import { formatLongCurrency } from 'lib/format';
+
+export function RevenueTable() {
+  const { report } = useContext(ReportContext);
+  const { formatMessage, labels } = useMessages();
+  const { data } = report || {};
+
+  if (!data) {
+    return <EmptyPlaceholder />;
+  }
+
+  return (
+    <GridTable data={data.table || []}>
+      <GridColumn name="currency" label={formatMessage(labels.currency)} alignment="end">
+        {row => row.currency}
+      </GridColumn>
+      <GridColumn name="currency" label={formatMessage(labels.total)} width="300px" alignment="end">
+        {row => formatLongCurrency(row.sum, row.currency)}
+      </GridColumn>
+      <GridColumn name="currency" label={formatMessage(labels.average)} alignment="end">
+        {row => formatLongCurrency(row.avg, row.currency)}
+      </GridColumn>
+      <GridColumn name="currency" label={formatMessage(labels.transactions)} alignment="end">
+        {row => row.count}
+      </GridColumn>
+      <GridColumn name="currency" label={formatMessage(labels.uniqueCustomers)} alignment="end">
+        {row => row.uniqueCount}
+      </GridColumn>
+    </GridTable>
+  );
+}
+
+export default RevenueTable;
diff --git a/src/app/(main)/reports/revenue/RevenueView.module.css b/src/app/(main)/reports/revenue/RevenueView.module.css
new file mode 100644
index 0000000000..d9b10548fd
--- /dev/null
+++ b/src/app/(main)/reports/revenue/RevenueView.module.css
@@ -0,0 +1,5 @@
+.container {
+  display: grid;
+  gap: 20px;
+  margin-bottom: 40px;
+}
diff --git a/src/app/(main)/reports/revenue/RevenueView.tsx b/src/app/(main)/reports/revenue/RevenueView.tsx
new file mode 100644
index 0000000000..fa62778e42
--- /dev/null
+++ b/src/app/(main)/reports/revenue/RevenueView.tsx
@@ -0,0 +1,140 @@
+import { colord } from 'colord';
+import BarChart from 'components/charts/BarChart';
+import PieChart from 'components/charts/PieChart';
+import { useLocale, useMessages } from 'components/hooks';
+import { GridRow } from 'components/layout/Grid';
+import ListTable from 'components/metrics/ListTable';
+import MetricCard from 'components/metrics/MetricCard';
+import MetricsBar from 'components/metrics/MetricsBar';
+import { renderDateLabels } from 'lib/charts';
+import { CHART_COLORS } from 'lib/constants';
+import { formatLongCurrency, formatLongNumber } from 'lib/format';
+import { useContext, useMemo } from 'react';
+import { ReportContext } from '../[reportId]/Report';
+import RevenueTable from './RevenueTable';
+import styles from './RevenueView.module.css';
+
+export interface RevenueViewProps {
+  isLoading?: boolean;
+}
+
+export function RevenueView({ isLoading }: RevenueViewProps) {
+  const { formatMessage, labels } = useMessages();
+  const { locale } = useLocale();
+  const { report } = useContext(ReportContext);
+  const {
+    data,
+    parameters: { dateRange, currency },
+  } = report || {};
+  const showTable = data?.table.length > 1;
+
+  const chartData = useMemo(() => {
+    if (!data) return [];
+
+    const map = (data.chart as any[]).reduce((obj, { x, t, y }) => {
+      if (!obj[x]) {
+        obj[x] = [];
+      }
+
+      obj[x].push({ x: t, y });
+
+      return obj;
+    }, {});
+
+    return {
+      datasets: Object.keys(map).map((key, index) => {
+        const color = colord(CHART_COLORS[index % CHART_COLORS.length]);
+        return {
+          label: key,
+          data: map[key],
+          lineTension: 0,
+          backgroundColor: color.alpha(0.6).toRgbString(),
+          borderColor: color.alpha(0.7).toRgbString(),
+          borderWidth: 1,
+        };
+      }),
+    };
+  }, [data]);
+
+  const countryData = useMemo(() => {
+    if (!data) return [];
+
+    const labels = data.country.map(({ name }) => name);
+    const datasets = [
+      {
+        data: data.country.map(({ value }) => value),
+        backgroundColor: CHART_COLORS,
+        borderWidth: 0,
+      },
+    ];
+
+    return { labels, datasets };
+  }, [data]);
+
+  const metricData = useMemo(() => {
+    if (!data) return [];
+
+    const { sum, avg, count, uniqueCount } = data.total;
+
+    return [
+      {
+        value: sum,
+        label: formatMessage(labels.total),
+        formatValue: n => formatLongCurrency(n, currency),
+      },
+      {
+        value: avg,
+        label: formatMessage(labels.average),
+        formatValue: n => formatLongCurrency(n, currency),
+      },
+      {
+        value: count,
+        label: formatMessage(labels.transactions),
+        formatValue: formatLongNumber,
+      },
+      {
+        value: uniqueCount,
+        label: formatMessage(labels.uniqueCustomers),
+        formatValue: formatLongNumber,
+      },
+    ] as any;
+  }, [data, locale]);
+
+  return (
+    <>
+      <div className={styles.container}>
+        <MetricsBar isFetched={data}>
+          {metricData?.map(({ label, value, formatValue }) => {
+            return <MetricCard key={label} value={value} label={label} formatValue={formatValue} />;
+          })}
+        </MetricsBar>
+        <BarChart
+          minDate={dateRange?.startDate}
+          maxDate={dateRange?.endDate}
+          data={chartData}
+          unit={dateRange?.unit}
+          stacked={true}
+          currency={currency}
+          renderXLabel={renderDateLabels(dateRange?.unit, locale)}
+          isLoading={isLoading}
+        />
+        {data && (
+          <GridRow columns="one-two">
+            <ListTable
+              metric={formatMessage(labels.country)}
+              data={data?.country.map(({ name, value }) => ({
+                x: name,
+                y: value,
+                z: (value / data?.total.sum) * 100,
+              }))}
+            />
+            <PieChart type="doughnut" data={countryData} />
+          </GridRow>
+        )}
+        {showTable && <RevenueTable />}
+      </div>
+    </>
+  );
+}
+
+export default RevenueView;
diff --git a/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx b/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx
index 794a5053d5..760f34f90e 100644
--- a/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx
+++ b/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx
@@ -54,7 +54,7 @@ export function EventProperties({ websiteId }: { websiteId: string }) {
         {propertyName && (
           <div className={styles.chart}>
             <div className={styles.title}>{propertyName}</div>
-            <PieChart key={propertyName} type="doughnut" data={chartData} />
+            <PieChart key={propertyName + eventName} type="doughnut" data={chartData} />
           </div>
         )}
       </div>
diff --git a/src/components/charts/BarChart.tsx b/src/components/charts/BarChart.tsx
index 7624ba1c43..eadc4af738 100644
--- a/src/components/charts/BarChart.tsx
+++ b/src/components/charts/BarChart.tsx
@@ -7,6 +7,7 @@ import { useMemo, useState } from 'react';
 export interface BarChartProps extends ChartProps {
   unit: string;
   stacked?: boolean;
+  currency?: string;
   renderXLabel?: (label: string, index: number, values: any[]) => string;
   renderYLabel?: (label: string, index: number, values: any[]) => string;
   XAxisType?: string;
@@ -27,6 +28,7 @@ export function BarChart(props: BarChartProps) {
     stacked = false,
     minDate,
     maxDate,
+    currency,
   } = props;
 
   const options: any = useMemo(() => {
@@ -76,7 +78,9 @@ export function BarChart(props: BarChartProps) {
   const handleTooltip = ({ tooltip }: { tooltip: any }) => {
     const { opacity } = tooltip;
 
-    setTooltip(opacity ? <BarChartTooltip tooltip={tooltip} unit={unit} /> : null);
+    setTooltip(
+      opacity ? <BarChartTooltip tooltip={tooltip} unit={unit} currency={currency} /> : null,
+    );
   };
 
   return (
diff --git a/src/components/charts/BarChartTooltip.tsx b/src/components/charts/BarChartTooltip.tsx
index fed5af9247..201c6e4c1f 100644
--- a/src/components/charts/BarChartTooltip.tsx
+++ b/src/components/charts/BarChartTooltip.tsx
@@ -1,7 +1,7 @@
+import { useLocale } from 'components/hooks';
 import { formatDate } from 'lib/date';
+import { formatLongCurrency, formatLongNumber } from 'lib/format';
 import { Flexbox, StatusLight } from 'react-basics';
-import { formatLongNumber } from 'lib/format';
-import { useLocale } from 'components/hooks';
 
 const formats = {
   millisecond: 'T',
@@ -15,7 +15,7 @@ const formats = {
   year: 'yyyy',
 };
 
-export default function BarChartTooltip({ tooltip, unit }) {
+export default function BarChartTooltip({ tooltip, unit, currency }) {
   const { locale } = useLocale();
   const { labelColors, dataPoints } = tooltip;
 
@@ -26,7 +26,10 @@ export default function BarChartTooltip({ tooltip, unit }) {
       </div>
       <div>
         <StatusLight color={labelColors?.[0]?.backgroundColor}>
-          {formatLongNumber(dataPoints[0].raw.y)} {dataPoints[0].dataset.label}
+          {currency
+            ? formatLongCurrency(dataPoints[0].raw.y, currency)
+            : formatLongNumber(dataPoints[0].raw.y)}{' '}
+          {dataPoints[0].dataset.label}
         </StatusLight>
       </div>
     </Flexbox>
diff --git a/src/components/hooks/queries/useEventDataValues.ts b/src/components/hooks/queries/useEventDataValues.ts
index 61aea58e05..bad132c152 100644
--- a/src/components/hooks/queries/useEventDataValues.ts
+++ b/src/components/hooks/queries/useEventDataValues.ts
@@ -12,7 +12,7 @@ export function useEventDataValues(
   const params = useFilterParams(websiteId);
 
   return useQuery<any>({
-    queryKey: ['websites:event-data:values', { websiteId, propertyName, ...params }],
+    queryKey: ['websites:event-data:values', { websiteId, eventName, propertyName, ...params }],
     queryFn: () =>
       get(`/websites/${websiteId}/event-data/values`, { ...params, eventName, propertyName }),
     enabled: !!(websiteId && propertyName),
diff --git a/src/components/messages.ts b/src/components/messages.ts
index 933a7a0f4c..1d2cc9b29c 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -114,8 +114,6 @@ export const labels = defineMessages({
   none: { id: 'label.none', defaultMessage: 'None' },
   clearAll: { id: 'label.clear-all', defaultMessage: 'Clear all' },
   property: { id: 'label.property', defaultMessage: 'Property' },
-  revenueProperty: { id: 'label.revenue-property', defaultMessage: 'Revenue Property' },
-  userProperty: { id: 'label.user-property', defaultMessage: 'User Property' },
   today: { id: 'label.today', defaultMessage: 'Today' },
   lastHours: { id: 'label.last-hours', defaultMessage: 'Last {x} hours' },
   yesterday: { id: 'label.yesterday', defaultMessage: 'Yesterday' },
@@ -162,8 +160,9 @@ export const labels = defineMessages({
   revenue: { id: 'label.revenue', defaultMessage: 'Revenue' },
   revenueDescription: {
     id: 'label.revenue-description',
-    defaultMessage: 'Look into your revenue across time.',
+    defaultMessage: 'Look into your revenue data and how users are spending.',
   },
+  currency: { id: 'label.currency', defaultMessage: 'Currency' },
   url: { id: 'label.url', defaultMessage: 'URL' },
   urls: { id: 'label.urls', defaultMessage: 'URLs' },
   path: { id: 'label.path', defaultMessage: 'Path' },
diff --git a/src/lib/format.ts b/src/lib/format.ts
index a662a9eb49..ba3243f774 100644
--- a/src/lib/format.ts
+++ b/src/lib/format.ts
@@ -47,6 +47,9 @@ export function formatNumber(n: string | number) {
 export function formatLongNumber(value: number) {
   const n = Number(value);
 
+  if (n >= 1000000000) {
+    return `${(n / 1000000).toFixed(1)}b`;
+  }
   if (n >= 1000000) {
     return `${(n / 1000000).toFixed(1)}m`;
   }
@@ -78,3 +81,26 @@ export function stringToColor(str: string) {
   }
   return color;
 }
+
+export function formatCurrency(value: number, currency: string, locale = 'en-US') {
+  return new Intl.NumberFormat(locale, {
+    style: 'currency',
+    currency: currency,
+  }).format(value);
+}
+
+export function formatLongCurrency(value: number, currency: string, locale = 'en-US') {
+  const n = Number(value);
+
+  if (n >= 1000000000) {
+    return `${formatCurrency(n / 1000000000, currency, locale)}b`;
+  }
+  if (n >= 1000000) {
+    return `${formatCurrency(n / 1000000, currency, locale)}m`;
+  }
+  if (n >= 1000) {
+    return `${formatCurrency(n / 1000, currency, locale)}k`;
+  }
+
+  return formatCurrency(n / 1000, currency, locale);
+}
diff --git a/src/pages/api/reports/revenue.ts b/src/pages/api/reports/revenue.ts
index ac4dc6b364..39014d25f5 100644
--- a/src/pages/api/reports/revenue.ts
+++ b/src/pages/api/reports/revenue.ts
@@ -7,34 +7,30 @@ import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { getRevenue } from 'queries/analytics/reports/getRevenue';
 import * as yup from 'yup';
 
-export interface RetentionRequestBody {
+export interface RevenueRequestBody {
   websiteId: string;
-  dateRange: { startDate: string; endDate: string; unit?: string; timezone?: string };
-  eventName: string;
-  revenueProperty: string;
-  userProperty: string;
+  currency: string;
+  timezone: string;
+  dateRange: { startDate: string; endDate: string; unit?: string };
 }
 
 const schema = {
   POST: yup.object().shape({
     websiteId: yup.string().uuid().required(),
+    timezone: TimezoneTest,
     dateRange: yup
       .object()
       .shape({
         startDate: yup.date().required(),
         endDate: yup.date().required(),
         unit: UnitTypeTest,
-        timezone: TimezoneTest,
       })
       .required(),
-    eventName: yup.string().required(),
-    revenueProperty: yup.string().required(),
-    userProperty: yup.string(),
   }),
 };
 
 export default async (
-  req: NextApiRequestQueryBody<any, RetentionRequestBody>,
+  req: NextApiRequestQueryBody<any, RevenueRequestBody>,
   res: NextApiResponse,
 ) => {
   await useCors(req, res);
@@ -44,10 +40,9 @@ export default async (
   if (req.method === 'POST') {
     const {
       websiteId,
-      dateRange: { startDate, endDate, unit, timezone },
-      eventName,
-      revenueProperty,
-      userProperty,
+      currency,
+      timezone,
+      dateRange: { startDate, endDate, unit },
     } = req.body;
 
     if (!(await canViewWebsite(req.auth, websiteId))) {
@@ -59,9 +54,7 @@ export default async (
       endDate: new Date(endDate),
       unit,
       timezone,
-      eventName,
-      revenueProperty,
-      userProperty,
+      currency,
     });
 
     return ok(res, data);
diff --git a/src/queries/analytics/reports/getRevenue.ts b/src/queries/analytics/reports/getRevenue.ts
index 502505f44f..9d9a4a1474 100644
--- a/src/queries/analytics/reports/getRevenue.ts
+++ b/src/queries/analytics/reports/getRevenue.ts
@@ -10,9 +10,7 @@ export async function getRevenue(
       endDate: Date;
       unit: string;
       timezone: string;
-      eventName: string;
-      revenueProperty: string;
-      userProperty: string;
+      currency: string;
     },
   ]
 ) {
@@ -29,23 +27,12 @@ async function relationalQuery(
     endDate: Date;
     unit: string;
     timezone: string;
-    eventName: string;
-    revenueProperty: string;
-    userProperty: string;
   },
 ): Promise<{
   chart: { time: string; sum: number; avg: number; count: number; uniqueCount: number }[];
   total: { sum: number; avg: number; count: number; uniqueCount: number };
 }> {
-  const {
-    startDate,
-    endDate,
-    eventName,
-    revenueProperty,
-    userProperty,
-    timezone = 'UTC',
-    unit = 'day',
-  } = criteria;
+  const { startDate, endDate, timezone = 'UTC', unit = 'day' } = criteria;
   const { getDateSQL, rawQuery } = prisma;
 
   const chartRes = await rawQuery(
@@ -63,7 +50,7 @@ async function relationalQuery(
       and data_key in ({{revenueProperty}} , {{userProperty}})
     group by 1
     `,
-    { websiteId, startDate, endDate, eventName, revenueProperty, userProperty },
+    { websiteId, startDate, endDate },
   );
 
   const totalRes = await rawQuery(
@@ -80,7 +67,7 @@ async function relationalQuery(
       and data_key in ({{revenueProperty}} , {{userProperty}})
     group by 1
     `,
-    { websiteId, startDate, endDate, eventName, revenueProperty, userProperty },
+    { websiteId, startDate, endDate },
   );
 
   return { chart: chartRes, total: totalRes };
@@ -91,59 +78,81 @@ async function clickhouseQuery(
   criteria: {
     startDate: Date;
     endDate: Date;
-    eventName: string;
-    revenueProperty: string;
-    userProperty: string;
     unit: string;
     timezone: string;
+    currency: string;
   },
 ): Promise<{
-  chart: { time: string; sum: number; avg: number; count: number; uniqueCount: number }[];
+  chart: { x: string; t: string; y: number }[];
+  country: { name: string; value: number }[];
   total: { sum: number; avg: number; count: number; uniqueCount: number };
-}> {
-  const {
-    startDate,
-    endDate,
-    eventName,
-    revenueProperty,
-    userProperty = '',
-    timezone = 'UTC',
-    unit = 'day',
-  } = criteria;
-  const { getDateStringSQL, getDateSQL, rawQuery } = clickhouse;
-
-  const chartRes = await rawQuery<{
-    time: string;
+  table: {
+    currency: string;
     sum: number;
     avg: number;
     count: number;
     uniqueCount: number;
-  }>(
+  }[];
+}> {
+  const { startDate, endDate, timezone = 'UTC', unit = 'day', currency } = criteria;
+  const { getDateSQL, rawQuery } = clickhouse;
+
+  const chartRes = await rawQuery<
+    {
+      x: string;
+      t: string;
+      y: number;
+    }[]
+  >(
     `
     select
-      ${getDateStringSQL('g.time', unit)} as time, 
-      g.sum as sum,
-      g.avg as avg,
-      g.count as count,
-      g.uniqueCount as uniqueCount
-    from (
-      select 
-        ${getDateSQL('created_at', unit, timezone)} as time,
-        sumIf(number_value, data_key = {revenueProperty:String}) as sum,
-        avgIf(number_value, data_key = {revenueProperty:String}) as avg,
-        countIf(data_key = {revenueProperty:String}) as count,
-        uniqExactIf(string_value, data_key = {userProperty:String}) as uniqueCount
-      from event_data
-      where website_id = {websiteId:UUID}
-        and created_at between {startDate:DateTime64} and {endDate:DateTime64}
-        and event_name = {eventName:String}
-        and data_key in ({revenueProperty:String}, {userProperty:String})
-      group by time
-    ) as g
-    order by time
+      event_name x,
+      ${getDateSQL('created_at', unit, timezone)} t,
+      sum(coalesce(toDecimal64(number_value, 2), toDecimal64(string_value, 2))) y
+    from event_data
+    join (select event_id 
+          from event_data
+          where positionCaseInsensitive(data_key, 'currency') > 0
+            and string_value = {currency:String}) currency
+    on currency.event_id = event_data.event_id
+    where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      and positionCaseInsensitive(data_key, 'revenue') > 0
+    group by  x, t
+    order by t
     `,
-    { websiteId, startDate, endDate, eventName, revenueProperty, userProperty },
-  ).then(result => result?.[0]);
+    { websiteId, startDate, endDate, unit, timezone, currency },
+  );
+
+  const countryRes = await rawQuery<
+    {
+      name: string;
+      value: number;
+    }[]
+  >(
+    `
+    select
+      s.country as name,
+      sum(coalesce(toDecimal64(number_value, 2), toDecimal64(string_value, 2))) as value
+    from event_data ed
+    join (select event_id
+          from event_data
+          where positionCaseInsensitive(data_key, 'currency') > 0
+            and string_value = {currency:String}) c
+    on c.event_id = ed.event_id
+    join (select distinct website_id, session_id, country
+          from website_event_stats_hourly
+          where website_id = {websiteId:UUID}) s
+    on ed.website_id = s.website_id
+        and ed.session_id = s.session_id
+   where ed.website_id = {websiteId:UUID}
+      and ed.created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      and positionCaseInsensitive(ed.data_key, 'revenue') > 0
+    group by s.country
+
+    `,
+    { websiteId, startDate, endDate, currency },
+  );
 
   const totalRes = await rawQuery<{
     sum: number;
@@ -152,19 +161,53 @@ async function clickhouseQuery(
     uniqueCount: number;
   }>(
     `
-      select 
-        sumIf(number_value, data_key = {revenueProperty:String}) as sum,
-        avgIf(number_value, data_key = {revenueProperty:String}) as avg,
-        countIf(data_key = {revenueProperty:String}) as count,
-        uniqExactIf(string_value, data_key = {userProperty:String}) as uniqueCount
-      from event_data
+    select
+      sum(coalesce(toDecimal64(number_value, 2), toDecimal64(string_value, 2))) as sum,
+      avg(coalesce(toDecimal64(number_value, 2), toDecimal64(string_value, 2))) as avg,
+      uniqExact(event_id) as count,
+      uniqExact(session_id) as uniqueCount
+    from event_data
+    join (select event_id 
+          from event_data
+          where positionCaseInsensitive(data_key, 'currency') > 0
+            and string_value = {currency:String}) currency
+    on currency.event_id = event_data.event_id
       where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime64} and {endDate:DateTime64}
-        and event_name = {eventName:String}
-        and data_key in ({revenueProperty:String}, {userProperty:String})
+        and positionCaseInsensitive(data_key, 'revenue') > 0
     `,
-    { websiteId, startDate, endDate, eventName, revenueProperty, userProperty },
+    { websiteId, startDate, endDate, currency },
+  ).then(result => result?.[0]);
+
+  const tableRes = await rawQuery<
+    {
+      currency: string;
+      sum: number;
+      avg: number;
+      count: number;
+      uniqueCount: number;
+    }[]
+  >(
+    `
+    select
+      c.currency,
+      sum(coalesce(toDecimal64(ed.number_value, 2), toDecimal64(ed.string_value, 2))) as sum,
+      avg(coalesce(toDecimal64(ed.number_value, 2), toDecimal64(ed.string_value, 2))) as avg,
+      uniqExact(ed.event_id) as count,
+      uniqExact(ed.session_id) as uniqueCount
+    from event_data ed
+    join (select event_id, string_value as currency
+          from event_data
+          where positionCaseInsensitive(data_key, 'currency') > 0) c
+      ON c.event_id = ed.event_id
+    where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      and positionCaseInsensitive(data_key, 'revenue') > 0
+    group by c.currency
+    order by sum desc;
+    `,
+    { websiteId, startDate, endDate, unit, timezone, currency },
   );
 
-  return { chart: chartRes, total: totalRes };
+  return { chart: chartRes, country: countryRes, total: totalRes, table: tableRes };
 }
diff --git a/src/queries/analytics/sessions/getWebsiteSessionsWeekly.ts b/src/queries/analytics/sessions/getWebsiteSessionsWeekly.ts
index 153c9bb385..48d4f7a9fe 100644
--- a/src/queries/analytics/sessions/getWebsiteSessionsWeekly.ts
+++ b/src/queries/analytics/sessions/getWebsiteSessionsWeekly.ts
@@ -34,8 +34,8 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
 
 async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
   const { timezone = 'utc' } = filters;
-  const { rawQuery } = clickhouse;
-  const { startDate, endDate } = filters;
+  const { rawQuery, parseFilters } = clickhouse;
+  const { params } = await parseFilters(websiteId, filters);
 
   return rawQuery(
     `
@@ -48,7 +48,7 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
     group by time
     order by time
     `,
-    { websiteId, startDate, endDate },
+    params,
   ).then(formatResults);
 }
 

From 2cd38f1306312a5a1f4aa22e042a5850e1270550 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 26 Sep 2024 16:47:51 -0700
Subject: [PATCH 368/438] Moved files around.

---
 src/components/hooks/index.ts                            | 4 ++--
 src/components/hooks/queries/useConfig.ts                | 2 +-
 src/components/hooks/queries/useEventDataEvents.ts       | 2 +-
 src/components/hooks/queries/useEventDataProperties.ts   | 2 +-
 src/components/hooks/queries/useEventDataValues.ts       | 2 +-
 src/components/hooks/queries/useLogin.ts                 | 4 ++--
 src/components/hooks/queries/useRealtime.ts              | 2 +-
 src/components/hooks/queries/useReport.ts                | 2 +-
 src/components/hooks/queries/useReports.ts               | 4 ++--
 src/components/hooks/queries/useSessionActivity.ts       | 2 +-
 src/components/hooks/queries/useSessionData.ts           | 2 +-
 src/components/hooks/queries/useSessionDataProperties.ts | 2 +-
 src/components/hooks/queries/useSessionDataValues.ts     | 2 +-
 src/components/hooks/queries/useShareToken.ts            | 2 +-
 src/components/hooks/queries/useTeam.ts                  | 2 +-
 src/components/hooks/queries/useTeamMembers.ts           | 4 ++--
 src/components/hooks/queries/useTeamWebsites.ts          | 4 ++--
 src/components/hooks/queries/useTeams.ts                 | 4 ++--
 src/components/hooks/queries/useUser.ts                  | 2 +-
 src/components/hooks/queries/useUsers.ts                 | 4 ++--
 src/components/hooks/queries/useWebsite.ts               | 2 +-
 src/components/hooks/queries/useWebsiteEvents.ts         | 4 ++--
 src/components/hooks/queries/useWebsiteEventsSeries.ts   | 2 +-
 src/components/hooks/queries/useWebsiteMetrics.ts        | 2 +-
 src/components/hooks/queries/useWebsitePageviews.ts      | 2 +-
 src/components/hooks/queries/useWebsiteSession.ts        | 2 +-
 src/components/hooks/queries/useWebsiteSessionStats.ts   | 2 +-
 src/components/hooks/queries/useWebsiteSessions.ts       | 4 ++--
 src/components/hooks/queries/useWebsiteSessionsWeekly.ts | 2 +-
 src/components/hooks/queries/useWebsiteStats.ts          | 2 +-
 src/components/hooks/queries/useWebsiteValues.ts         | 2 +-
 src/components/hooks/queries/useWebsites.ts              | 4 ++--
 src/components/hooks/{queries => }/useApi.ts             | 0
 src/components/hooks/useDateRange.ts                     | 2 +-
 src/components/hooks/{queries => }/usePagedQuery.ts      | 4 ++--
 35 files changed, 45 insertions(+), 45 deletions(-)
 rename src/components/hooks/{queries => }/useApi.ts (100%)
 rename src/components/hooks/{queries => }/usePagedQuery.ts (94%)

diff --git a/src/components/hooks/index.ts b/src/components/hooks/index.ts
index 1be99732e0..7c16eeee38 100644
--- a/src/components/hooks/index.ts
+++ b/src/components/hooks/index.ts
@@ -1,9 +1,7 @@
-export * from './queries/useApi';
 export * from './queries/useConfig';
 export * from './queries/useEventDataEvents';
 export * from './queries/useEventDataProperties';
 export * from './queries/useEventDataValues';
-export * from './queries/usePagedQuery';
 export * from './queries/useLogin';
 export * from './queries/useRealtime';
 export * from './queries/useReport';
@@ -28,6 +26,7 @@ export * from './queries/useWebsiteEvents';
 export * from './queries/useWebsiteEventsSeries';
 export * from './queries/useWebsiteMetrics';
 export * from './queries/useWebsiteValues';
+export * from './useApi';
 export * from './useCountryNames';
 export * from './useDateRange';
 export * from './useDocumentClick';
@@ -41,6 +40,7 @@ export * from './useLocale';
 export * from './useMessages';
 export * from './useModified';
 export * from './useNavigation';
+export * from './usePagedQuery';
 export * from './useRegionNames';
 export * from './useSticky';
 export * from './useTeamUrl';
diff --git a/src/components/hooks/queries/useConfig.ts b/src/components/hooks/queries/useConfig.ts
index 72fe095d0f..f6293a44d6 100644
--- a/src/components/hooks/queries/useConfig.ts
+++ b/src/components/hooks/queries/useConfig.ts
@@ -1,6 +1,6 @@
 import { useEffect } from 'react';
 import useStore, { setConfig } from 'store/app';
-import { useApi } from './useApi';
+import { useApi } from '../useApi';
 
 let loading = false;
 
diff --git a/src/components/hooks/queries/useEventDataEvents.ts b/src/components/hooks/queries/useEventDataEvents.ts
index 1d7ccf2da1..5cad991695 100644
--- a/src/components/hooks/queries/useEventDataEvents.ts
+++ b/src/components/hooks/queries/useEventDataEvents.ts
@@ -1,4 +1,4 @@
-import useApi from './useApi';
+import { useApi } from '../useApi';
 import { UseQueryOptions } from '@tanstack/react-query';
 import { useFilterParams } from '../useFilterParams';
 
diff --git a/src/components/hooks/queries/useEventDataProperties.ts b/src/components/hooks/queries/useEventDataProperties.ts
index 4eabd0519e..b841a8f405 100644
--- a/src/components/hooks/queries/useEventDataProperties.ts
+++ b/src/components/hooks/queries/useEventDataProperties.ts
@@ -1,5 +1,5 @@
-import useApi from './useApi';
 import { UseQueryOptions } from '@tanstack/react-query';
+import { useApi } from '../useApi';
 import { useFilterParams } from '../useFilterParams';
 
 export function useEventDataProperties(
diff --git a/src/components/hooks/queries/useEventDataValues.ts b/src/components/hooks/queries/useEventDataValues.ts
index 61aea58e05..9960b3db9d 100644
--- a/src/components/hooks/queries/useEventDataValues.ts
+++ b/src/components/hooks/queries/useEventDataValues.ts
@@ -1,5 +1,5 @@
-import useApi from './useApi';
 import { UseQueryOptions } from '@tanstack/react-query';
+import { useApi } from '../useApi';
 import { useFilterParams } from '../useFilterParams';
 
 export function useEventDataValues(
diff --git a/src/components/hooks/queries/useLogin.ts b/src/components/hooks/queries/useLogin.ts
index c17687b041..a54f38d117 100644
--- a/src/components/hooks/queries/useLogin.ts
+++ b/src/components/hooks/queries/useLogin.ts
@@ -1,6 +1,6 @@
-import useStore, { setUser } from 'store/app';
-import useApi from './useApi';
 import { UseQueryResult } from '@tanstack/react-query';
+import useStore, { setUser } from 'store/app';
+import { useApi } from '../useApi';
 
 const selector = (state: { user: any }) => state.user;
 
diff --git a/src/components/hooks/queries/useRealtime.ts b/src/components/hooks/queries/useRealtime.ts
index 9c665e4f06..b87f74c468 100644
--- a/src/components/hooks/queries/useRealtime.ts
+++ b/src/components/hooks/queries/useRealtime.ts
@@ -1,7 +1,7 @@
 import { useTimezone } from 'components/hooks';
 import { REALTIME_INTERVAL } from 'lib/constants';
 import { RealtimeData } from 'lib/types';
-import { useApi } from './useApi';
+import { useApi } from '../useApi';
 
 export function useRealtime(websiteId: string) {
   const { get, useQuery } = useApi();
diff --git a/src/components/hooks/queries/useReport.ts b/src/components/hooks/queries/useReport.ts
index 2e63e4e6b8..f7d2a1a0cc 100644
--- a/src/components/hooks/queries/useReport.ts
+++ b/src/components/hooks/queries/useReport.ts
@@ -1,6 +1,6 @@
 import { produce } from 'immer';
 import { useCallback, useEffect, useState } from 'react';
-import { useApi } from './useApi';
+import { useApi } from '../useApi';
 import { useTimezone } from '../useTimezone';
 import { useMessages } from '../useMessages';
 
diff --git a/src/components/hooks/queries/useReports.ts b/src/components/hooks/queries/useReports.ts
index 88e4f02ebf..21db153689 100644
--- a/src/components/hooks/queries/useReports.ts
+++ b/src/components/hooks/queries/useReports.ts
@@ -1,5 +1,5 @@
-import useApi from './useApi';
-import usePagedQuery from './usePagedQuery';
+import useApi from '../useApi';
+import usePagedQuery from '../usePagedQuery';
 import useModified from '../useModified';
 
 export function useReports({ websiteId, teamId }: { websiteId?: string; teamId?: string }) {
diff --git a/src/components/hooks/queries/useSessionActivity.ts b/src/components/hooks/queries/useSessionActivity.ts
index 16c139ab38..1c9c8f57d5 100644
--- a/src/components/hooks/queries/useSessionActivity.ts
+++ b/src/components/hooks/queries/useSessionActivity.ts
@@ -1,4 +1,4 @@
-import { useApi } from './useApi';
+import { useApi } from '../useApi';
 
 export function useSessionActivity(
   websiteId: string,
diff --git a/src/components/hooks/queries/useSessionData.ts b/src/components/hooks/queries/useSessionData.ts
index 14e046d1d2..521ba7d562 100644
--- a/src/components/hooks/queries/useSessionData.ts
+++ b/src/components/hooks/queries/useSessionData.ts
@@ -1,4 +1,4 @@
-import { useApi } from './useApi';
+import { useApi } from '../useApi';
 
 export function useSessionData(websiteId: string, sessionId: string) {
   const { get, useQuery } = useApi();
diff --git a/src/components/hooks/queries/useSessionDataProperties.ts b/src/components/hooks/queries/useSessionDataProperties.ts
index 459dccd6a8..45590b3902 100644
--- a/src/components/hooks/queries/useSessionDataProperties.ts
+++ b/src/components/hooks/queries/useSessionDataProperties.ts
@@ -1,4 +1,4 @@
-import useApi from './useApi';
+import { useApi } from '../useApi';
 import { UseQueryOptions } from '@tanstack/react-query';
 import { useFilterParams } from '../useFilterParams';
 
diff --git a/src/components/hooks/queries/useSessionDataValues.ts b/src/components/hooks/queries/useSessionDataValues.ts
index ce9a67f3ec..85529fc09f 100644
--- a/src/components/hooks/queries/useSessionDataValues.ts
+++ b/src/components/hooks/queries/useSessionDataValues.ts
@@ -1,4 +1,4 @@
-import useApi from './useApi';
+import { useApi } from '../useApi';
 import { UseQueryOptions } from '@tanstack/react-query';
 import { useFilterParams } from '../useFilterParams';
 
diff --git a/src/components/hooks/queries/useShareToken.ts b/src/components/hooks/queries/useShareToken.ts
index 189657be42..f9db7dbfa4 100644
--- a/src/components/hooks/queries/useShareToken.ts
+++ b/src/components/hooks/queries/useShareToken.ts
@@ -1,5 +1,5 @@
 import useStore, { setShareToken } from 'store/app';
-import useApi from './useApi';
+import { useApi } from '../useApi';
 
 const selector = (state: { shareToken: string }) => state.shareToken;
 
diff --git a/src/components/hooks/queries/useTeam.ts b/src/components/hooks/queries/useTeam.ts
index e348531c6a..d0ce7499ce 100644
--- a/src/components/hooks/queries/useTeam.ts
+++ b/src/components/hooks/queries/useTeam.ts
@@ -1,4 +1,4 @@
-import useApi from './useApi';
+import { useApi } from '../useApi';
 
 export function useTeam(teamId: string) {
   const { get, useQuery } = useApi();
diff --git a/src/components/hooks/queries/useTeamMembers.ts b/src/components/hooks/queries/useTeamMembers.ts
index a3e8bcd235..b6353afc19 100644
--- a/src/components/hooks/queries/useTeamMembers.ts
+++ b/src/components/hooks/queries/useTeamMembers.ts
@@ -1,5 +1,5 @@
-import useApi from './useApi';
-import usePagedQuery from './usePagedQuery';
+import { useApi } from '../useApi';
+import usePagedQuery from '../usePagedQuery';
 import useModified from '../useModified';
 
 export function useTeamMembers(teamId: string) {
diff --git a/src/components/hooks/queries/useTeamWebsites.ts b/src/components/hooks/queries/useTeamWebsites.ts
index fac82d13bf..5606407ebd 100644
--- a/src/components/hooks/queries/useTeamWebsites.ts
+++ b/src/components/hooks/queries/useTeamWebsites.ts
@@ -1,5 +1,5 @@
-import useApi from './useApi';
-import usePagedQuery from './usePagedQuery';
+import { useApi } from '../useApi';
+import { usePagedQuery } from '../usePagedQuery';
 import useModified from '../useModified';
 
 export function useTeamWebsites(teamId: string) {
diff --git a/src/components/hooks/queries/useTeams.ts b/src/components/hooks/queries/useTeams.ts
index e1f7790a54..e5197c97ba 100644
--- a/src/components/hooks/queries/useTeams.ts
+++ b/src/components/hooks/queries/useTeams.ts
@@ -1,5 +1,5 @@
-import useApi from './useApi';
-import usePagedQuery from './usePagedQuery';
+import { useApi } from '../useApi';
+import { usePagedQuery } from '../usePagedQuery';
 import useModified from '../useModified';
 
 export function useTeams(userId: string) {
diff --git a/src/components/hooks/queries/useUser.ts b/src/components/hooks/queries/useUser.ts
index 61c22ecdf3..8541a2207e 100644
--- a/src/components/hooks/queries/useUser.ts
+++ b/src/components/hooks/queries/useUser.ts
@@ -1,4 +1,4 @@
-import useApi from './useApi';
+import { useApi } from '../useApi';
 
 export function useUser(userId: string, options?: { [key: string]: any }) {
   const { get, useQuery } = useApi();
diff --git a/src/components/hooks/queries/useUsers.ts b/src/components/hooks/queries/useUsers.ts
index 519fb89916..3d70d262d1 100644
--- a/src/components/hooks/queries/useUsers.ts
+++ b/src/components/hooks/queries/useUsers.ts
@@ -1,5 +1,5 @@
-import useApi from './useApi';
-import usePagedQuery from './usePagedQuery';
+import { useApi } from '../useApi';
+import { usePagedQuery } from '../usePagedQuery';
 import useModified from '../useModified';
 
 export function useUsers() {
diff --git a/src/components/hooks/queries/useWebsite.ts b/src/components/hooks/queries/useWebsite.ts
index 4121f97b2b..9151b55d73 100644
--- a/src/components/hooks/queries/useWebsite.ts
+++ b/src/components/hooks/queries/useWebsite.ts
@@ -1,4 +1,4 @@
-import useApi from './useApi';
+import { useApi } from '../useApi';
 
 export function useWebsite(websiteId: string, options?: { [key: string]: any }) {
   const { get, useQuery } = useApi();
diff --git a/src/components/hooks/queries/useWebsiteEvents.ts b/src/components/hooks/queries/useWebsiteEvents.ts
index 5d9bd19660..2a47c3eb26 100644
--- a/src/components/hooks/queries/useWebsiteEvents.ts
+++ b/src/components/hooks/queries/useWebsiteEvents.ts
@@ -1,7 +1,7 @@
-import useApi from './useApi';
+import { useApi } from '../useApi';
 import { UseQueryOptions } from '@tanstack/react-query';
 import { useFilterParams } from '../useFilterParams';
-import { usePagedQuery } from './usePagedQuery';
+import { usePagedQuery } from '../usePagedQuery';
 
 export function useWebsiteEvents(
   websiteId: string,
diff --git a/src/components/hooks/queries/useWebsiteEventsSeries.ts b/src/components/hooks/queries/useWebsiteEventsSeries.ts
index 88b493759a..91c50ffffd 100644
--- a/src/components/hooks/queries/useWebsiteEventsSeries.ts
+++ b/src/components/hooks/queries/useWebsiteEventsSeries.ts
@@ -1,4 +1,4 @@
-import useApi from './useApi';
+import { useApi } from '../useApi';
 import { UseQueryOptions } from '@tanstack/react-query';
 import { useFilterParams } from '../useFilterParams';
 
diff --git a/src/components/hooks/queries/useWebsiteMetrics.ts b/src/components/hooks/queries/useWebsiteMetrics.ts
index 184fd4d44c..8a3976e103 100644
--- a/src/components/hooks/queries/useWebsiteMetrics.ts
+++ b/src/components/hooks/queries/useWebsiteMetrics.ts
@@ -1,5 +1,5 @@
 import { UseQueryOptions } from '@tanstack/react-query';
-import useApi from './useApi';
+import { useApi } from '../useApi';
 import { useFilterParams } from '../useFilterParams';
 
 export function useWebsiteMetrics(
diff --git a/src/components/hooks/queries/useWebsitePageviews.ts b/src/components/hooks/queries/useWebsitePageviews.ts
index c9260bcbfb..42fb527e34 100644
--- a/src/components/hooks/queries/useWebsitePageviews.ts
+++ b/src/components/hooks/queries/useWebsitePageviews.ts
@@ -1,5 +1,5 @@
 import { UseQueryOptions } from '@tanstack/react-query';
-import { useApi } from './useApi';
+import { useApi } from '../useApi';
 import { useFilterParams } from '..//useFilterParams';
 
 export function useWebsitePageviews(
diff --git a/src/components/hooks/queries/useWebsiteSession.ts b/src/components/hooks/queries/useWebsiteSession.ts
index 64c7be58bf..93e9057c67 100644
--- a/src/components/hooks/queries/useWebsiteSession.ts
+++ b/src/components/hooks/queries/useWebsiteSession.ts
@@ -1,4 +1,4 @@
-import { useApi } from './useApi';
+import { useApi } from '../useApi';
 
 export function useWebsiteSession(websiteId: string, sessionId: string) {
   const { get, useQuery } = useApi();
diff --git a/src/components/hooks/queries/useWebsiteSessionStats.ts b/src/components/hooks/queries/useWebsiteSessionStats.ts
index 7671b2ebee..5c02cfdced 100644
--- a/src/components/hooks/queries/useWebsiteSessionStats.ts
+++ b/src/components/hooks/queries/useWebsiteSessionStats.ts
@@ -1,4 +1,4 @@
-import { useApi } from './useApi';
+import { useApi } from '../useApi';
 import { useFilterParams } from '../useFilterParams';
 
 export function useWebsiteSessionStats(websiteId: string, options?: { [key: string]: string }) {
diff --git a/src/components/hooks/queries/useWebsiteSessions.ts b/src/components/hooks/queries/useWebsiteSessions.ts
index ce65512c2f..ad7bb616d9 100644
--- a/src/components/hooks/queries/useWebsiteSessions.ts
+++ b/src/components/hooks/queries/useWebsiteSessions.ts
@@ -1,5 +1,5 @@
-import { useApi } from './useApi';
-import { usePagedQuery } from './usePagedQuery';
+import { useApi } from '../useApi';
+import { usePagedQuery } from '../usePagedQuery';
 import useModified from '../useModified';
 import { useFilterParams } from 'components/hooks/useFilterParams';
 
diff --git a/src/components/hooks/queries/useWebsiteSessionsWeekly.ts b/src/components/hooks/queries/useWebsiteSessionsWeekly.ts
index 5df543f507..c4e83f9871 100644
--- a/src/components/hooks/queries/useWebsiteSessionsWeekly.ts
+++ b/src/components/hooks/queries/useWebsiteSessionsWeekly.ts
@@ -1,4 +1,4 @@
-import { useApi } from './useApi';
+import { useApi } from '../useApi';
 import useModified from '../useModified';
 import { useFilterParams } from 'components/hooks/useFilterParams';
 
diff --git a/src/components/hooks/queries/useWebsiteStats.ts b/src/components/hooks/queries/useWebsiteStats.ts
index b24399fa91..6d42009ee6 100644
--- a/src/components/hooks/queries/useWebsiteStats.ts
+++ b/src/components/hooks/queries/useWebsiteStats.ts
@@ -1,4 +1,4 @@
-import { useApi } from './useApi';
+import { useApi } from '../useApi';
 import { useFilterParams } from '../useFilterParams';
 
 export function useWebsiteStats(
diff --git a/src/components/hooks/queries/useWebsiteValues.ts b/src/components/hooks/queries/useWebsiteValues.ts
index c5358df233..68e950f266 100644
--- a/src/components/hooks/queries/useWebsiteValues.ts
+++ b/src/components/hooks/queries/useWebsiteValues.ts
@@ -1,4 +1,4 @@
-import { useApi } from './useApi';
+import { useApi } from '../useApi';
 
 export function useWebsiteValues({
   websiteId,
diff --git a/src/components/hooks/queries/useWebsites.ts b/src/components/hooks/queries/useWebsites.ts
index d6fe00df79..7a5004d75e 100644
--- a/src/components/hooks/queries/useWebsites.ts
+++ b/src/components/hooks/queries/useWebsites.ts
@@ -1,5 +1,5 @@
-import { useApi } from './useApi';
-import { usePagedQuery } from './usePagedQuery';
+import { useApi } from '../useApi';
+import { usePagedQuery } from '../usePagedQuery';
 import { useLogin } from './useLogin';
 import useModified from '../useModified';
 
diff --git a/src/components/hooks/queries/useApi.ts b/src/components/hooks/useApi.ts
similarity index 100%
rename from src/components/hooks/queries/useApi.ts
rename to src/components/hooks/useApi.ts
diff --git a/src/components/hooks/useDateRange.ts b/src/components/hooks/useDateRange.ts
index 248070f47f..23cb6e70e0 100644
--- a/src/components/hooks/useDateRange.ts
+++ b/src/components/hooks/useDateRange.ts
@@ -5,7 +5,7 @@ import websiteStore, { setWebsiteDateRange, setWebsiteDateCompare } from 'store/
 import appStore, { setDateRange } from 'store/app';
 import { DateRange } from 'lib/types';
 import { useLocale } from './useLocale';
-import { useApi } from './queries/useApi';
+import { useApi } from './useApi';
 
 export function useDateRange(websiteId?: string): {
   dateRange: DateRange;
diff --git a/src/components/hooks/queries/usePagedQuery.ts b/src/components/hooks/usePagedQuery.ts
similarity index 94%
rename from src/components/hooks/queries/usePagedQuery.ts
rename to src/components/hooks/usePagedQuery.ts
index 253f809254..19471432d7 100644
--- a/src/components/hooks/queries/usePagedQuery.ts
+++ b/src/components/hooks/usePagedQuery.ts
@@ -1,8 +1,8 @@
 import { UseQueryOptions } from '@tanstack/react-query';
 import { useState } from 'react';
-import { useApi } from './useApi';
 import { PageResult, PageParams, PagedQueryResult } from 'lib/types';
-import { useNavigation } from '../useNavigation';
+import { useApi } from './useApi';
+import { useNavigation } from './useNavigation';
 
 export function usePagedQuery<T = any>({
   queryKey,

From be50e8a575410ee01aa2d4e4b7d1d499d7e777a3 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Thu, 26 Sep 2024 22:35:23 -0700
Subject: [PATCH 369/438] add dropdown logic for revenue report, defaults to
 USD for unknown currency code

---
 src/app/(main)/console/TestConsole.tsx        |  4 +-
 .../reports/revenue/RevenueParameters.tsx     |  4 +-
 .../reports/revenue/RevenueView.module.css    |  6 ++
 .../(main)/reports/revenue/RevenueView.tsx    | 20 ++++-
 .../hooks/queries/useRevenueValues.ts         | 18 +++++
 src/lib/format.ts                             | 20 ++++-
 src/pages/api/reports/revenue.ts              | 20 ++++-
 .../analytics/reports/getRevenueValues.ts     | 75 +++++++++++++++++++
 8 files changed, 155 insertions(+), 12 deletions(-)
 create mode 100644 src/components/hooks/queries/useRevenueValues.ts
 create mode 100644 src/queries/analytics/reports/getRevenueValues.ts

diff --git a/src/app/(main)/console/TestConsole.tsx b/src/app/(main)/console/TestConsole.tsx
index 8e7169d4a3..d33f95e9dc 100644
--- a/src/app/(main)/console/TestConsole.tsx
+++ b/src/app/(main)/console/TestConsole.tsx
@@ -56,11 +56,11 @@ export function TestConsole({ websiteId }: { websiteId: string }) {
     }));
     window['umami'].track('checkout-cart', {
       revenue: parseFloat((Math.random() * 100000).toFixed(2)),
-      currency: 'USD',
+      currency: 'SHIBA',
     });
     window['umami'].track('affiliate-link', {
       revenue: parseFloat((Math.random() * 100000).toFixed(2)),
-      currency: 'USD',
+      currency: 'ETH',
     });
     window['umami'].track('promotion-link', {
       revenue: parseFloat((Math.random() * 100000).toFixed(2)),
diff --git a/src/app/(main)/reports/revenue/RevenueParameters.tsx b/src/app/(main)/reports/revenue/RevenueParameters.tsx
index 253f3adf87..f231ce06e8 100644
--- a/src/app/(main)/reports/revenue/RevenueParameters.tsx
+++ b/src/app/(main)/reports/revenue/RevenueParameters.tsx
@@ -1,4 +1,5 @@
 import { useMessages } from 'components/hooks';
+import useRevenueValues from 'components/hooks/queries/useRevenueValues';
 import { useContext } from 'react';
 import { Dropdown, Form, FormButtons, FormInput, FormRow, Item, SubmitButton } from 'react-basics';
 import BaseParameters from '../[reportId]/BaseParameters';
@@ -10,6 +11,7 @@ export function RevenueParameters() {
   const { id, parameters } = report || {};
   const { websiteId, dateRange } = parameters || {};
   const queryEnabled = websiteId && dateRange;
+  const { data: values = [] } = useRevenueValues(websiteId, dateRange.startDate, dateRange.endDate);
 
   const handleSubmit = (data: any, e: any) => {
     e.stopPropagation();
@@ -23,7 +25,7 @@ export function RevenueParameters() {
       <BaseParameters showDateSelect={true} allowWebsiteSelect={!id} />
       <FormRow label={formatMessage(labels.currency)}>
         <FormInput name="currency" rules={{ required: formatMessage(labels.required) }}>
-          <Dropdown items={['USD', 'EUR', 'MXN']}>
+          <Dropdown items={values.map(item => item.currency)}>
             {item => <Item key={item}>{item}</Item>}
           </Dropdown>
         </FormInput>
diff --git a/src/app/(main)/reports/revenue/RevenueView.module.css b/src/app/(main)/reports/revenue/RevenueView.module.css
index d9b10548fd..9b35260e20 100644
--- a/src/app/(main)/reports/revenue/RevenueView.module.css
+++ b/src/app/(main)/reports/revenue/RevenueView.module.css
@@ -3,3 +3,9 @@
   gap: 20px;
   margin-bottom: 40px;
 }
+
+.row {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
diff --git a/src/app/(main)/reports/revenue/RevenueView.tsx b/src/app/(main)/reports/revenue/RevenueView.tsx
index fa62778e42..89247b6a86 100644
--- a/src/app/(main)/reports/revenue/RevenueView.tsx
+++ b/src/app/(main)/reports/revenue/RevenueView.tsx
@@ -1,7 +1,9 @@
+import classNames from 'classnames';
 import { colord } from 'colord';
 import BarChart from 'components/charts/BarChart';
 import PieChart from 'components/charts/PieChart';
-import { useLocale, useMessages } from 'components/hooks';
+import TypeIcon from 'components/common/TypeIcon';
+import { useCountryNames, useLocale, useMessages } from 'components/hooks';
 import { GridRow } from 'components/layout/Grid';
 import ListTable from 'components/metrics/ListTable';
 import MetricCard from 'components/metrics/MetricCard';
@@ -9,7 +11,7 @@ import MetricsBar from 'components/metrics/MetricsBar';
 import { renderDateLabels } from 'lib/charts';
 import { CHART_COLORS } from 'lib/constants';
 import { formatLongCurrency, formatLongNumber } from 'lib/format';
-import { useContext, useMemo } from 'react';
+import { useCallback, useContext, useMemo } from 'react';
 import { ReportContext } from '../[reportId]/Report';
 import RevenueTable from './RevenueTable';
 import styles from './RevenueView.module.css';
@@ -21,6 +23,7 @@ export interface RevenueViewProps {
 export function RevenueView({ isLoading }: RevenueViewProps) {
   const { formatMessage, labels } = useMessages();
   const { locale } = useLocale();
+  const { countryNames } = useCountryNames(locale);
   const { report } = useContext(ReportContext);
   const {
     data,
@@ -28,6 +31,16 @@ export function RevenueView({ isLoading }: RevenueViewProps) {
   } = report || {};
   const showTable = data?.table.length > 1;
 
+  const renderCountryName = useCallback(
+    ({ x: code }) => (
+      <span className={classNames(locale, styles.row)}>
+        <TypeIcon type="country" value={code?.toLowerCase()} />
+        {countryNames[code]}
+      </span>
+    ),
+    [countryNames, locale],
+  );
+
   const chartData = useMemo(() => {
     if (!data) return [];
 
@@ -119,7 +132,7 @@ export function RevenueView({ isLoading }: RevenueViewProps) {
           isLoading={isLoading}
         />
         {data && (
-          <GridRow columns="one-two">
+          <GridRow columns="two">
             <ListTable
               metric={formatMessage(labels.country)}
               data={data?.country.map(({ name, value }) => ({
@@ -127,6 +140,7 @@ export function RevenueView({ isLoading }: RevenueViewProps) {
                 y: value,
                 z: (value / data?.total.sum) * 100,
               }))}
+              renderLabel={renderCountryName}
             />
             <PieChart type="doughnut" data={countryData} />
           </GridRow>
diff --git a/src/components/hooks/queries/useRevenueValues.ts b/src/components/hooks/queries/useRevenueValues.ts
new file mode 100644
index 0000000000..cb7bd2830a
--- /dev/null
+++ b/src/components/hooks/queries/useRevenueValues.ts
@@ -0,0 +1,18 @@
+import { useApi } from './useApi';
+
+export function useRevenueValues(websiteId: string, startDate: Date, endDate: Date) {
+  const { get, useQuery } = useApi();
+
+  return useQuery({
+    queryKey: ['revenue:values', { websiteId, startDate, endDate }],
+    queryFn: () =>
+      get(`/reports/revenue`, {
+        websiteId,
+        startDate,
+        endDate,
+      }),
+    enabled: !!(websiteId && startDate && endDate),
+  });
+}
+
+export default useRevenueValues;
diff --git a/src/lib/format.ts b/src/lib/format.ts
index ba3243f774..71e4916d13 100644
--- a/src/lib/format.ts
+++ b/src/lib/format.ts
@@ -83,10 +83,22 @@ export function stringToColor(str: string) {
 }
 
 export function formatCurrency(value: number, currency: string, locale = 'en-US') {
-  return new Intl.NumberFormat(locale, {
-    style: 'currency',
-    currency: currency,
-  }).format(value);
+  let formattedValue;
+
+  try {
+    formattedValue = new Intl.NumberFormat(locale, {
+      style: 'currency',
+      currency: currency,
+    });
+  } catch (error) {
+    // Fallback to default currency format if an error occurs
+    formattedValue = new Intl.NumberFormat(locale, {
+      style: 'currency',
+      currency: 'USD',
+    });
+  }
+
+  return formattedValue.format(value);
 }
 
 export function formatLongCurrency(value: number, currency: string, locale = 'en-US') {
diff --git a/src/pages/api/reports/revenue.ts b/src/pages/api/reports/revenue.ts
index 39014d25f5..d23ce55aec 100644
--- a/src/pages/api/reports/revenue.ts
+++ b/src/pages/api/reports/revenue.ts
@@ -5,12 +5,13 @@ import { TimezoneTest, UnitTypeTest } from 'lib/yup';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { getRevenue } from 'queries/analytics/reports/getRevenue';
+import { getRevenueValues } from 'queries/analytics/reports/getRevenueValues';
 import * as yup from 'yup';
 
 export interface RevenueRequestBody {
   websiteId: string;
-  currency: string;
-  timezone: string;
+  currency?: string;
+  timezone?: string;
   dateRange: { startDate: string; endDate: string; unit?: string };
 }
 
@@ -37,6 +38,21 @@ export default async (
   await useAuth(req, res);
   await useValidate(schema, req, res);
 
+  if (req.method === 'GET') {
+    const { websiteId, startDate, endDate } = req.query;
+
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const data = await getRevenueValues(websiteId, {
+      startDate: new Date(startDate),
+      endDate: new Date(endDate),
+    });
+
+    return ok(res, data);
+  }
+
   if (req.method === 'POST') {
     const {
       websiteId,
diff --git a/src/queries/analytics/reports/getRevenueValues.ts b/src/queries/analytics/reports/getRevenueValues.ts
new file mode 100644
index 0000000000..e20672b4fa
--- /dev/null
+++ b/src/queries/analytics/reports/getRevenueValues.ts
@@ -0,0 +1,75 @@
+import prisma from 'lib/prisma';
+import clickhouse from 'lib/clickhouse';
+import { runQuery, CLICKHOUSE, PRISMA, getDatabaseType, POSTGRESQL } from 'lib/db';
+
+export async function getRevenueValues(
+  ...args: [
+    websiteId: string,
+    criteria: {
+      startDate: Date;
+      endDate: Date;
+    },
+  ]
+) {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(
+  websiteId: string,
+  criteria: {
+    startDate: Date;
+    endDate: Date;
+  },
+) {
+  const { rawQuery } = prisma;
+  const { startDate, endDate } = criteria;
+
+  const db = getDatabaseType();
+  const like = db === POSTGRESQL ? 'ilike' : 'like';
+
+  return rawQuery(
+    `
+    select distinct string_value as currency
+    from event_data
+    where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      and data_key ${like} '%currency%'
+    order by currency   
+    `,
+    {
+      websiteId,
+      startDate,
+      endDate,
+    },
+  );
+}
+
+async function clickhouseQuery(
+  websiteId: string,
+  criteria: {
+    startDate: Date;
+    endDate: Date;
+  },
+) {
+  const { rawQuery } = clickhouse;
+  const { startDate, endDate } = criteria;
+
+  return rawQuery(
+    `
+    select distinct string_value as currency
+    from event_data
+    where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      and positionCaseInsensitive(data_key, 'currency') > 0
+    order by currency      
+    `,
+    {
+      websiteId,
+      startDate,
+      endDate,
+    },
+  );
+}

From 430880c8c311dc5b3f4978bce23bd7f93321d15b Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 4 Oct 2024 16:05:22 -0700
Subject: [PATCH 370/438] Updated lang.

---
 public/intl/messages/ko-KR.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/intl/messages/ko-KR.json b/public/intl/messages/ko-KR.json
index 42a984191f..6fa360c15b 100644
--- a/public/intl/messages/ko-KR.json
+++ b/public/intl/messages/ko-KR.json
@@ -1012,7 +1012,7 @@
   "label.retention-description": [
     {
       "type": 0,
-      "value": "사용자가 얼마나 자주 돌아오는지를 추적하여 웹사이트의 리텐션을 측정하십시오."
+      "value": "사용자가 얼마나 자주 돌아오는지를 추적하여 웹사이트의 리텐션을 측정하세요."
     }
   ],
   "label.revenue": [
@@ -1372,7 +1372,7 @@
   "label.utm-description": [
     {
       "type": 0,
-      "value": "UTM 매개변수를 통해 캠페인을 추적합니다."
+      "value": "UTM 매개변수를 통해 캠페인을 추적하세요."
     }
   ],
   "label.value": [
@@ -1414,7 +1414,7 @@
   "label.visit-duration": [
     {
       "type": 0,
-      "value": "평균 방문 시간"
+      "value": "방문 시간"
     }
   ],
   "label.visitors": [
@@ -1548,7 +1548,7 @@
   "message.error": [
     {
       "type": 0,
-      "value": "오류가 발생했습니다."
+      "value": "문제가 발생했습니다."
     }
   ],
   "message.event-log": [

From 20b64100a643ef0a59e9eb8c369e9553f208df37 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 4 Oct 2024 19:23:07 -0700
Subject: [PATCH 371/438] Fixed import.

---
 src/components/hooks/queries/useRevenueValues.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/hooks/queries/useRevenueValues.ts b/src/components/hooks/queries/useRevenueValues.ts
index cb7bd2830a..007ca3c53b 100644
--- a/src/components/hooks/queries/useRevenueValues.ts
+++ b/src/components/hooks/queries/useRevenueValues.ts
@@ -1,4 +1,4 @@
-import { useApi } from './useApi';
+import { useApi } from '../useApi';
 
 export function useRevenueValues(websiteId: string, startDate: Date, endDate: Date) {
   const { get, useQuery } = useApi();

From d8e46e487c39a7ab5a9af89a869f79167b09c544 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@umami.is>
Date: Sat, 5 Oct 2024 10:16:21 -0700
Subject: [PATCH 372/438] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 33a5aac39a..b4bd8f3bd0 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="https://umami.is/images/umami-logo.png" alt="Umami Logo" width="100">
+  <img src="https://content.umami.is/website/images/umami-logo.png" alt="Umami Logo" width="100">
 </p>
 
 <h1 align="center">Umami</h1>

From ba078a11816d297b92586bb25b6d11dd0438d323 Mon Sep 17 00:00:00 2001
From: Andreas Bielawski <brawl@nyanya.de>
Date: Sun, 6 Oct 2024 12:46:35 +0200
Subject: [PATCH 373/438] Fix singular of Event in German translation

---
 src/lang/de-DE.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lang/de-DE.json b/src/lang/de-DE.json
index ad822b04f2..36090a8485 100644
--- a/src/lang/de-DE.json
+++ b/src/lang/de-DE.json
@@ -67,8 +67,8 @@
   "label.enable-share-url": "Freigabe-URL aktivieren",
   "label.end-step": "Schlussschritt",
   "label.entry": "Eingangs-URL",
-  "label.event": "Ereigniss",
-  "label.event-data": "Ereignissdaten",
+  "label.event": "Ereignis",
+  "label.event-data": "Ereignisdaten",
   "label.events": "Ereignisse",
   "label.exit": "Ausgangs-URL",
   "label.false": "Falsch",
@@ -271,7 +271,7 @@
   "message.transfer-team-website-to-user": "Diese Website zu Ihrem Account transferieren?",
   "message.transfer-user-website-to-team": "Wählen Sie ein Team aus, zu dem die Website transferiert werden soll.",
   "message.transfer-website": "Übertragen Sie die Eigentümerrechte zu Ihrem Account oder einem anderen Team.",
-  "message.triggered-event": "Ereigniss ausgelöst",
+  "message.triggered-event": "Ereignis ausgelöst",
   "message.user-deleted": "Benutzer gelöscht.",
   "message.viewed-page": "Seite besucht",
   "message.visitor-log": "Besucher aus {country} benutzt {browser} auf {os} {device}",

From 1a2ae439eeee66faf1f3a7e76ae398abdb7c9ab9 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Wed, 9 Oct 2024 11:36:23 -0700
Subject: [PATCH 374/438] Fix revenue report bugs

---
 .../reports/revenue/RevenueParameters.tsx     |   6 +-
 .../(main)/reports/revenue/RevenueTable.tsx   |   2 +-
 .../(main)/reports/revenue/RevenueView.tsx    |  48 +++---
 src/queries/analytics/reports/getRevenue.ts   | 153 +++++++++++++-----
 .../analytics/reports/getRevenueValues.ts     |   4 +-
 5 files changed, 143 insertions(+), 70 deletions(-)

diff --git a/src/app/(main)/reports/revenue/RevenueParameters.tsx b/src/app/(main)/reports/revenue/RevenueParameters.tsx
index f231ce06e8..8e344e4dca 100644
--- a/src/app/(main)/reports/revenue/RevenueParameters.tsx
+++ b/src/app/(main)/reports/revenue/RevenueParameters.tsx
@@ -11,7 +11,11 @@ export function RevenueParameters() {
   const { id, parameters } = report || {};
   const { websiteId, dateRange } = parameters || {};
   const queryEnabled = websiteId && dateRange;
-  const { data: values = [] } = useRevenueValues(websiteId, dateRange.startDate, dateRange.endDate);
+  const { data: values = [] } = useRevenueValues(
+    websiteId,
+    dateRange?.startDate,
+    dateRange?.endDate,
+  );
 
   const handleSubmit = (data: any, e: any) => {
     e.stopPropagation();
diff --git a/src/app/(main)/reports/revenue/RevenueTable.tsx b/src/app/(main)/reports/revenue/RevenueTable.tsx
index f038aed99a..bf7114e8fc 100644
--- a/src/app/(main)/reports/revenue/RevenueTable.tsx
+++ b/src/app/(main)/reports/revenue/RevenueTable.tsx
@@ -29,7 +29,7 @@ export function RevenueTable() {
         {row => row.count}
       </GridColumn>
       <GridColumn name="currency" label={formatMessage(labels.uniqueCustomers)} alignment="end">
-        {row => row.uniqueCount}
+        {row => row.unique_count}
       </GridColumn>
     </GridTable>
   );
diff --git a/src/app/(main)/reports/revenue/RevenueView.tsx b/src/app/(main)/reports/revenue/RevenueView.tsx
index 89247b6a86..cd53129a1c 100644
--- a/src/app/(main)/reports/revenue/RevenueView.tsx
+++ b/src/app/(main)/reports/revenue/RevenueView.tsx
@@ -87,7 +87,7 @@ export function RevenueView({ isLoading }: RevenueViewProps) {
   const metricData = useMemo(() => {
     if (!data) return [];
 
-    const { sum, avg, count, uniqueCount } = data.total;
+    const { sum, avg, count, unique_count } = data.total;
 
     return [
       {
@@ -106,7 +106,7 @@ export function RevenueView({ isLoading }: RevenueViewProps) {
         formatValue: formatLongNumber,
       },
       {
-        value: uniqueCount,
+        value: unique_count,
         label: formatMessage(labels.uniqueCustomers),
         formatValue: formatLongNumber,
       },
@@ -121,29 +121,31 @@ export function RevenueView({ isLoading }: RevenueViewProps) {
             return <MetricCard key={label} value={value} label={label} formatValue={formatValue} />;
           })}
         </MetricsBar>
-        <BarChart
-          minDate={dateRange?.startDate}
-          maxDate={dateRange?.endDate}
-          data={chartData}
-          unit={dateRange?.unit}
-          stacked={true}
-          currency={currency}
-          renderXLabel={renderDateLabels(dateRange?.unit, locale)}
-          isLoading={isLoading}
-        />
         {data && (
-          <GridRow columns="two">
-            <ListTable
-              metric={formatMessage(labels.country)}
-              data={data?.country.map(({ name, value }) => ({
-                x: name,
-                y: value,
-                z: (value / data?.total.sum) * 100,
-              }))}
-              renderLabel={renderCountryName}
+          <>
+            <BarChart
+              minDate={dateRange?.startDate}
+              maxDate={dateRange?.endDate}
+              data={chartData}
+              unit={dateRange?.unit}
+              stacked={true}
+              currency={currency}
+              renderXLabel={renderDateLabels(dateRange?.unit, locale)}
+              isLoading={isLoading}
             />
-            <PieChart type="doughnut" data={countryData} />
-          </GridRow>
+            <GridRow columns="two">
+              <ListTable
+                metric={formatMessage(labels.country)}
+                data={data?.country.map(({ name, value }) => ({
+                  x: name,
+                  y: Number(value),
+                  z: (value / data?.total.sum) * 100,
+                }))}
+                renderLabel={renderCountryName}
+              />
+              <PieChart type="doughnut" data={countryData} />
+            </GridRow>
+          </>
         )}
         {showTable && <RevenueTable />}
       </div>
diff --git a/src/queries/analytics/reports/getRevenue.ts b/src/queries/analytics/reports/getRevenue.ts
index 9d9a4a1474..5fb419c0e4 100644
--- a/src/queries/analytics/reports/getRevenue.ts
+++ b/src/queries/analytics/reports/getRevenue.ts
@@ -1,5 +1,5 @@
 import clickhouse from 'lib/clickhouse';
-import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import { CLICKHOUSE, getDatabaseType, POSTGRESQL, PRISMA, runQuery } from 'lib/db';
 import prisma from 'lib/prisma';
 
 export async function getRevenue(
@@ -27,50 +27,118 @@ async function relationalQuery(
     endDate: Date;
     unit: string;
     timezone: string;
+    currency: string;
   },
 ): Promise<{
-  chart: { time: string; sum: number; avg: number; count: number; uniqueCount: number }[];
-  total: { sum: number; avg: number; count: number; uniqueCount: number };
+  chart: { x: string; t: string; y: number }[];
+  country: { name: string; value: number }[];
+  total: { sum: number; avg: number; count: number; unique_count: number };
+  table: {
+    currency: string;
+    sum: number;
+    avg: number;
+    count: number;
+    unique_count: number;
+  }[];
 }> {
-  const { startDate, endDate, timezone = 'UTC', unit = 'day' } = criteria;
+  const { startDate, endDate, timezone = 'UTC', unit = 'day', currency } = criteria;
   const { getDateSQL, rawQuery } = prisma;
+  const db = getDatabaseType();
+  const like = db === POSTGRESQL ? 'ilike' : 'like';
 
   const chartRes = await rawQuery(
     `
     select
-      ${getDateSQL('website_event.created_at', unit, timezone)} time,
-      sum(case when data_key = {{revenueProperty}} then number_value else 0 end) sum,
-      avg(case when data_key = {{revenueProperty}} then number_value else 0 end) avg,
-      count(case when data_key = {{revenueProperty}} then 1 else 0 end) count,
-      count(distinct {{userProperty}}) uniqueCount
-    from event_data
-    where website_event.website_id = {{websiteId::uuid}}
-      and website_event.created_at between {{startDate}} and {{endDate}}
-      and event_name = {{eventType}}
-      and data_key in ({{revenueProperty}} , {{userProperty}})
-    group by 1
+      we.event_name x,
+      ${getDateSQL('ed.created_at', unit, timezone)} t,
+      sum(coalesce(cast(number_value as decimal(10,2)), cast(string_value as decimal(10,2)))) y
+    from event_data ed
+    join website_event we
+    on we.event_id = ed.website_event_id
+    join (select website_event_id
+          from event_data
+          where data_key ${like} '%currency%'
+            and string_value = {{currency}}) currency
+    on currency.website_event_id = ed.website_event_id
+    where ed.website_id = {{websiteId::uuid}}
+      and ed.created_at between {{startDate}} and {{endDate}}
+      and ed.data_key ${like} '%revenue%'
+    group by  x, t
+    order by t
     `,
-    { websiteId, startDate, endDate },
+    { websiteId, startDate, endDate, unit, timezone, currency },
+  );
+
+  const countryRes = await rawQuery(
+    `
+    select
+      s.country as name,
+      sum(coalesce(cast(number_value as decimal(10,2)), cast(string_value as decimal(10,2)))) value
+    from event_data ed
+    join website_event we
+    on we.event_id = ed.website_event_id
+    join session s
+    on s.session_id = we.session_id
+    join (select website_event_id
+          from event_data
+          where data_key ${like} '%currency%'
+            and string_value = 'USD') currency
+    on currency.website_event_id = ed.website_event_id
+    where ed.website_id = {{websiteId::uuid}}
+      and ed.created_at between {{startDate}} and {{endDate}}
+      and ed.data_key ${like} '%revenue%'
+    group by s.country
+    `,
+    { websiteId, startDate, endDate, currency },
   );
 
   const totalRes = await rawQuery(
     `
     select
-      sum(case when data_key = {{revenueProperty}} then number_value else 0 end) sum,
-      avg(case when data_key = {{revenueProperty}} then number_value else 0 end) avg,
-      count(case when data_key = {{revenueProperty}} then 1 else 0 end) count,
-      count(distinct {{userProperty}}) uniqueCount
-    from event_data
-    where website_event.website_id = {{websiteId::uuid}}
-      and website_event.created_at between {{startDate}} and {{endDate}}
-      and event_name = {{eventType}}
-      and data_key in ({{revenueProperty}} , {{userProperty}})
-    group by 1
+      sum(coalesce(cast(number_value as decimal(10,2)), cast(string_value as decimal(10,2)))) as sum,
+      avg(coalesce(cast(number_value as decimal(10,2)), cast(string_value as decimal(10,2)))) as avg,
+      count(distinct event_id) as count,
+      count(distinct session_id) as unique_count
+    from event_data ed
+    join website_event we
+    on we.event_id = ed.website_event_id
+    join (select website_event_id
+          from event_data
+          where data_key ${like} '%currency%'
+            and string_value = 'USD') currency
+      on currency.website_event_id = ed.website_event_id
+    where ed.website_id = {{websiteId::uuid}}
+      and ed.created_at between {{startDate}} and {{endDate}}
+      and ed.data_key ${like} '%revenue%'
+  `,
+    { websiteId, startDate, endDate, currency },
+  ).then(result => result?.[0]);
+
+  const tableRes = await rawQuery(
+    `
+    select
+      c.currency,
+      sum(coalesce(cast(number_value as decimal(10,2)), cast(string_value as decimal(10,2)))) as sum,
+      avg(coalesce(cast(number_value as decimal(10,2)), cast(string_value as decimal(10,2)))) as avg,
+      count(distinct ed.website_event_id) as count,
+      count(distinct we.session_id) as unique_count
+    from event_data ed
+    join website_event we
+      on we.event_id = ed.website_event_id
+    join (select website_event_id, string_value as currency
+          from event_data
+          where data_key ${like} '%currency%') c
+      on c.website_event_id = ed.website_event_id
+    where ed.website_id = {{websiteId::uuid}}
+      and ed.created_at between {{startDate}} and {{endDate}}
+      and ed.data_key ${like} '%revenue%'
+    group by c.currency
+    order by sum desc;
     `,
-    { websiteId, startDate, endDate },
+    { websiteId, startDate, endDate, unit, timezone, currency },
   );
 
-  return { chart: chartRes, total: totalRes };
+  return { chart: chartRes, country: countryRes, total: totalRes, table: tableRes };
 }
 
 async function clickhouseQuery(
@@ -85,13 +153,13 @@ async function clickhouseQuery(
 ): Promise<{
   chart: { x: string; t: string; y: number }[];
   country: { name: string; value: number }[];
-  total: { sum: number; avg: number; count: number; uniqueCount: number };
+  total: { sum: number; avg: number; count: number; unique_count: number };
   table: {
     currency: string;
     sum: number;
     avg: number;
     count: number;
-    uniqueCount: number;
+    unique_count: number;
   }[];
 }> {
   const { startDate, endDate, timezone = 'UTC', unit = 'day', currency } = criteria;
@@ -114,7 +182,7 @@ async function clickhouseQuery(
           from event_data
           where positionCaseInsensitive(data_key, 'currency') > 0
             and string_value = {currency:String}) currency
-    on currency.event_id = event_data.event_id
+      on currency.event_id = event_data.event_id
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}
       and positionCaseInsensitive(data_key, 'revenue') > 0
@@ -139,17 +207,16 @@ async function clickhouseQuery(
           from event_data
           where positionCaseInsensitive(data_key, 'currency') > 0
             and string_value = {currency:String}) c
-    on c.event_id = ed.event_id
+      on c.event_id = ed.event_id
     join (select distinct website_id, session_id, country
           from website_event_stats_hourly
           where website_id = {websiteId:UUID}) s
-    on ed.website_id = s.website_id
+      on ed.website_id = s.website_id
         and ed.session_id = s.session_id
    where ed.website_id = {websiteId:UUID}
       and ed.created_at between {startDate:DateTime64} and {endDate:DateTime64}
       and positionCaseInsensitive(ed.data_key, 'revenue') > 0
     group by s.country
-
     `,
     { websiteId, startDate, endDate, currency },
   );
@@ -158,23 +225,23 @@ async function clickhouseQuery(
     sum: number;
     avg: number;
     count: number;
-    uniqueCount: number;
+    unique_count: number;
   }>(
     `
     select
       sum(coalesce(toDecimal64(number_value, 2), toDecimal64(string_value, 2))) as sum,
       avg(coalesce(toDecimal64(number_value, 2), toDecimal64(string_value, 2))) as avg,
       uniqExact(event_id) as count,
-      uniqExact(session_id) as uniqueCount
+      uniqExact(session_id) as unique_count
     from event_data
     join (select event_id 
           from event_data
           where positionCaseInsensitive(data_key, 'currency') > 0
             and string_value = {currency:String}) currency
-    on currency.event_id = event_data.event_id
-      where website_id = {websiteId:UUID}
-        and created_at between {startDate:DateTime64} and {endDate:DateTime64}
-        and positionCaseInsensitive(data_key, 'revenue') > 0
+      on currency.event_id = event_data.event_id
+    where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      and positionCaseInsensitive(data_key, 'revenue') > 0
     `,
     { websiteId, startDate, endDate, currency },
   ).then(result => result?.[0]);
@@ -185,7 +252,7 @@ async function clickhouseQuery(
       sum: number;
       avg: number;
       count: number;
-      uniqueCount: number;
+      unique_count: number;
     }[]
   >(
     `
@@ -194,12 +261,12 @@ async function clickhouseQuery(
       sum(coalesce(toDecimal64(ed.number_value, 2), toDecimal64(ed.string_value, 2))) as sum,
       avg(coalesce(toDecimal64(ed.number_value, 2), toDecimal64(ed.string_value, 2))) as avg,
       uniqExact(ed.event_id) as count,
-      uniqExact(ed.session_id) as uniqueCount
+      uniqExact(ed.session_id) as unique_count
     from event_data ed
     join (select event_id, string_value as currency
           from event_data
           where positionCaseInsensitive(data_key, 'currency') > 0) c
-      ON c.event_id = ed.event_id
+      on c.event_id = ed.event_id
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}
       and positionCaseInsensitive(data_key, 'revenue') > 0
diff --git a/src/queries/analytics/reports/getRevenueValues.ts b/src/queries/analytics/reports/getRevenueValues.ts
index e20672b4fa..4dcc4a2208 100644
--- a/src/queries/analytics/reports/getRevenueValues.ts
+++ b/src/queries/analytics/reports/getRevenueValues.ts
@@ -34,8 +34,8 @@ async function relationalQuery(
     `
     select distinct string_value as currency
     from event_data
-    where website_id = {websiteId:UUID}
-      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+    where website_id = {{websiteId::uuid}}
+      and created_at between {{startDate}} and {{endDate}}
       and data_key ${like} '%currency%'
     order by currency   
     `,

From 801200c0bf99c758429c2484e336ee2dca1f2fa7 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Wed, 9 Oct 2024 12:39:45 -0700
Subject: [PATCH 375/438] Fixed tracker.

---
 src/tracker/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tracker/index.js b/src/tracker/index.js
index e1c269734a..16f714e45a 100644
--- a/src/tracker/index.js
+++ b/src/tracker/index.js
@@ -6,9 +6,9 @@
     document,
     history,
   } = window;
-  const localStorage = location.href.startsWith('data:') ? undefined : window.localStorage
   const { hostname, href } = location;
   const { currentScript, referrer } = document;
+  const localStorage = href.startsWith('data:') ? undefined : window.localStorage;
 
   if (!currentScript) return;
 
@@ -63,7 +63,7 @@
 
   const getPayload = () => ({
     website,
-    hostname || 'none',
+    hostname,
     screen,
     language,
     title: encode(title),

From d3c4dc47623e325ba1fd9f9369c2d07c04b87540 Mon Sep 17 00:00:00 2001
From: Alexej Sidorenko <fra.iesus@gmail.com>
Date: Sat, 12 Oct 2024 18:58:13 +0200
Subject: [PATCH 376/438] Update cs-CZ.json

Fixed translation "visits" instead of "visitors". A few more translations were added.
---
 src/lang/cs-CZ.json | 132 ++++++++++++++++++++++----------------------
 1 file changed, 66 insertions(+), 66 deletions(-)

diff --git a/src/lang/cs-CZ.json b/src/lang/cs-CZ.json
index 717bd97019..8adc5e368f 100644
--- a/src/lang/cs-CZ.json
+++ b/src/lang/cs-CZ.json
@@ -1,88 +1,88 @@
 {
-  "label.access-code": "Access code",
+  "label.access-code": "Přístupový kód",
   "label.actions": "Akce",
-  "label.activity": "Activity log",
-  "label.add": "Add",
-  "label.add-description": "Add description",
-  "label.add-member": "Add member",
-  "label.add-step": "Add step",
+  "label.activity": "Log aktivity",
+  "label.add": "Přidat",
+  "label.add-description": "Přidat popis",
+  "label.add-member": "Přidat člena",
+  "label.add-step": "Přidat krok",
   "label.add-website": "Přidat web",
   "label.admin": "Administrátor",
-  "label.after": "After",
+  "label.after": "Po",
   "label.all": "Vše",
-  "label.all-time": "All time",
+  "label.all-time": "Celá doba",
   "label.analytics": "Analytics",
-  "label.average": "Average",
+  "label.average": "Průměr",
   "label.back": "Zpět",
-  "label.before": "Before",
+  "label.before": "Před",
   "label.bounce-rate": "Okamžité opuštění",
   "label.breakdown": "Breakdown",
-  "label.browser": "Browser",
-  "label.browsers": "Prohlížeč",
+  "label.browser": "Prohlížeč",
+  "label.browsers": "Prohlížeče",
   "label.cancel": "Zrušit",
   "label.change-password": "Změnit heslo",
-  "label.cities": "Cities",
-  "label.city": "City",
-  "label.clear-all": "Clear all",
-  "label.compare": "Compare",
-  "label.confirm": "Confirm",
+  "label.cities": "Města",
+  "label.city": "Město",
+  "label.clear-all": "Vyčistit vše",
+  "label.compare": "Porovnat",
+  "label.confirm": "Potvrdit",
   "label.confirm-password": "Potvrdit heslo",
-  "label.contains": "Contains",
-  "label.continue": "Continue",
-  "label.count": "Count",
-  "label.countries": "Země",
-  "label.country": "Country",
-  "label.create": "Create",
-  "label.create-report": "Create report",
-  "label.create-team": "Create team",
-  "label.create-user": "Create user",
-  "label.created": "Created",
+  "label.contains": "Obsahuje",
+  "label.continue": "Pokračovat",
+  "label.count": "Počet",
+  "label.countries": "Státy",
+  "label.country": "Stát",
+  "label.create": "Vytvořit",
+  "label.create-report": "Vytvořit hlášení",
+  "label.create-team": "Vytvořit tým",
+  "label.create-user": "Vytvořit uživatele",
+  "label.created": "Vytvořeno",
   "label.created-by": "Created By",
-  "label.current": "Current",
+  "label.current": "Aktuální",
   "label.current-password": "Aktuální heslo",
   "label.custom-range": "Vlastní rozsah",
   "label.dashboard": "Přehled",
   "label.data": "Data",
-  "label.date": "Date",
+  "label.date": "Datum",
   "label.date-range": "Období",
-  "label.day": "Day",
+  "label.day": "Den",
   "label.default-date-range": "Výchozí období",
   "label.delete": "Smazat",
-  "label.delete-report": "Delete report",
-  "label.delete-team": "Delete team",
-  "label.delete-user": "Delete user",
+  "label.delete-report": "Smazat hlášení",
+  "label.delete-team": "Smazat tým",
+  "label.delete-user": "Smazat uživatele",
   "label.delete-website": "Smazat web",
-  "label.description": "Description",
+  "label.description": "Popis",
   "label.desktop": "Stolní počítač",
-  "label.details": "Details",
-  "label.device": "Device",
+  "label.details": "Detaily",
+  "label.device": "Zařízení",
   "label.devices": "Zařízení",
   "label.dismiss": "Odejít",
-  "label.does-not-contain": "Does not contain",
+  "label.does-not-contain": "Neobsahuje",
   "label.domain": "Doména",
   "label.dropoff": "Dropoff",
   "label.edit": "Upravit",
-  "label.edit-dashboard": "Edit dashboard",
-  "label.edit-member": "Edit member",
+  "label.edit-dashboard": "Upravit dashboard",
+  "label.edit-member": "Upravit člena",
   "label.enable-share-url": "Povolit sdílení URL",
   "label.end-step": "End Step",
-  "label.entry": "Entry URL",
-  "label.event": "Event",
+  "label.entry": "Vstupní URL",
+  "label.event": "Událost",
   "label.event-data": "Event data",
   "label.events": "Události",
   "label.exit": "Exit URL",
   "label.false": "False",
-  "label.field": "Field",
+  "label.field": "Pole",
   "label.fields": "Fields",
-  "label.filter": "Filter",
+  "label.filter": "Filtr",
   "label.filter-combined": "Kombinace",
   "label.filter-raw": "Nezpracované",
-  "label.filters": "Filters",
+  "label.filters": "Filtry",
   "label.first-seen": "First seen",
   "label.funnel": "Funnel",
   "label.funnel-description": "Understand the conversion and drop-off rate of users.",
-  "label.goal": "Goal",
-  "label.goals": "Goals",
+  "label.goal": "Cíl",
+  "label.goals": "Cíle",
   "label.goals-description": "Track your goals for pageviews and events.",
   "label.greater-than": "Greater than",
   "label.greater-than-equals": "Greater than or equals",
@@ -98,44 +98,44 @@
   "label.join-team": "Join team",
   "label.journey": "Journey",
   "label.journey-description": "Understand how users navigate through your website.",
-  "label.language": "Language",
-  "label.languages": "Languages",
+  "label.language": "Jazyk",
+  "label.languages": "Jazyky",
   "label.laptop": "Přenosný počítač",
   "label.last-days": "Posledních {x} dnů",
   "label.last-hours": "Posledních {x} hodin",
-  "label.last-months": "Last {x} months",
+  "label.last-months": "Posledních {x} měsíců",
   "label.last-seen": "Last seen",
-  "label.leave": "Leave",
-  "label.leave-team": "Leave team",
+  "label.leave": "Opustit",
+  "label.leave-team": "Opustit tým",
   "label.less-than": "Less than",
   "label.less-than-equals": "Less than or equals",
   "label.login": "Přihlásit",
   "label.logout": "Odhlásit",
-  "label.manage": "Manage",
-  "label.manager": "Manager",
+  "label.manage": "Spravovat",
+  "label.manager": "Správce",
   "label.max": "Max",
-  "label.member": "Member",
-  "label.members": "Members",
+  "label.member": "Člen",
+  "label.members": "Členové",
   "label.min": "Min",
   "label.mobile": "Mobilní telefon",
   "label.more": "Více",
-  "label.my-account": "My account",
-  "label.my-websites": "My websites",
+  "label.my-account": "Můj účet",
+  "label.my-websites": "Mé weby",
   "label.name": "Jméno",
   "label.new-password": "Nové heslo",
   "label.none": "None",
   "label.number-of-records": "{x} {x, plural, one {record} other {records}}",
   "label.ok": "OK",
   "label.os": "OS",
-  "label.overview": "Overview",
-  "label.owner": "Owner",
+  "label.overview": "Přehled",
+  "label.owner": "Vlastník",
   "label.page-of": "Page {current} of {total}",
   "label.page-views": "Zobrazení stránek",
-  "label.pageTitle": "Page title",
+  "label.pageTitle": "Název stránky",
   "label.pages": "Stránky",
   "label.password": "Heslo",
-  "label.path": "Path",
-  "label.paths": "Paths",
+  "label.path": "Cesta",
+  "label.paths": "Cesty",
   "label.powered-by": "Běží na {name}",
   "label.previous": "Previous",
   "label.previous-period": "Previous period",
@@ -228,13 +228,13 @@
   "label.views": "Zobrazení",
   "label.views-per-visit": "Views per visit",
   "label.visit-duration": "Průměrný čas návštěvy",
-  "label.visitors": "Návštěvy",
-  "label.visits": "Visits",
+  "label.visitors": "Návštěvníci",
+  "label.visits": "Návštěvy",
   "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Weby",
-  "label.window": "Window",
-  "label.yesterday": "Yesterday",
+  "label.window": "Okno",
+  "label.yesterday": "Včera",
   "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
   "message.active-users": "{x} aktuálně {x, plural, one {návštěvník} other {návštěvníci}}",
   "message.collected-data": "Collected data",

From 065499a3fa4d69d47958092a6dc9514e598da28a Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 15 Oct 2024 09:24:19 -0700
Subject: [PATCH 377/438] update avg aggregate for revenue report

---
 src/app/(main)/console/TestConsole.tsx        | 22 +++++++++----------
 .../(main)/reports/revenue/RevenueTable.tsx   |  2 +-
 .../(main)/reports/revenue/RevenueView.tsx    |  4 ++--
 src/lib/format.ts                             |  2 +-
 src/queries/analytics/reports/getRevenue.ts   | 10 ++-------
 5 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/src/app/(main)/console/TestConsole.tsx b/src/app/(main)/console/TestConsole.tsx
index d33f95e9dc..544aaa9ae0 100644
--- a/src/app/(main)/console/TestConsole.tsx
+++ b/src/app/(main)/console/TestConsole.tsx
@@ -55,35 +55,35 @@ export function TestConsole({ websiteId }: { websiteId: string }) {
       referrer: 'https://www.google.com',
     }));
     window['umami'].track('checkout-cart', {
-      revenue: parseFloat((Math.random() * 100000).toFixed(2)),
-      currency: 'SHIBA',
+      revenue: parseFloat((Math.random() * 1000).toFixed(2)),
+      currency: 'USD',
     });
     window['umami'].track('affiliate-link', {
-      revenue: parseFloat((Math.random() * 100000).toFixed(2)),
-      currency: 'ETH',
+      revenue: parseFloat((Math.random() * 1000).toFixed(2)),
+      currency: 'USD',
     });
     window['umami'].track('promotion-link', {
-      revenue: parseFloat((Math.random() * 100000).toFixed(2)),
+      revenue: parseFloat((Math.random() * 1000).toFixed(2)),
       currency: 'USD',
     });
     window['umami'].track('checkout-cart', {
-      revenue: parseFloat((Math.random() * 100000).toFixed(2)),
+      revenue: parseFloat((Math.random() * 1000).toFixed(2)),
       currency: 'EUR',
     });
     window['umami'].track('promotion-link', {
-      revenue: parseFloat((Math.random() * 100000).toFixed(2)),
+      revenue: parseFloat((Math.random() * 1000).toFixed(2)),
       currency: 'EUR',
     });
     window['umami'].track('affiliate-link', {
       item1: {
         productIdentity: 'ABC424',
-        revenue: parseFloat((Math.random() * 100000).toFixed(2)),
-        currency: 'MXN',
+        revenue: parseFloat((Math.random() * 10000).toFixed(2)),
+        currency: 'JPY',
       },
       item2: {
         productIdentity: 'ZYW684',
-        revenue: parseFloat((Math.random() * 100000).toFixed(2)),
-        currency: 'MXN',
+        revenue: parseFloat((Math.random() * 10000).toFixed(2)),
+        currency: 'JPY',
       },
     });
   }
diff --git a/src/app/(main)/reports/revenue/RevenueTable.tsx b/src/app/(main)/reports/revenue/RevenueTable.tsx
index bf7114e8fc..0b9fcdc3d5 100644
--- a/src/app/(main)/reports/revenue/RevenueTable.tsx
+++ b/src/app/(main)/reports/revenue/RevenueTable.tsx
@@ -23,7 +23,7 @@ export function RevenueTable() {
         {row => formatLongCurrency(row.sum, row.currency)}
       </GridColumn>
       <GridColumn name="currency" label={formatMessage(labels.average)} alignment="end">
-        {row => formatLongCurrency(row.avg, row.currency)}
+        {row => formatLongCurrency(row.count ? row.sum / row.count : 0, row.currency)}
       </GridColumn>
       <GridColumn name="currency" label={formatMessage(labels.transactions)} alignment="end">
         {row => row.count}
diff --git a/src/app/(main)/reports/revenue/RevenueView.tsx b/src/app/(main)/reports/revenue/RevenueView.tsx
index cd53129a1c..2d559893f5 100644
--- a/src/app/(main)/reports/revenue/RevenueView.tsx
+++ b/src/app/(main)/reports/revenue/RevenueView.tsx
@@ -87,7 +87,7 @@ export function RevenueView({ isLoading }: RevenueViewProps) {
   const metricData = useMemo(() => {
     if (!data) return [];
 
-    const { sum, avg, count, unique_count } = data.total;
+    const { sum, count, unique_count } = data.total;
 
     return [
       {
@@ -96,7 +96,7 @@ export function RevenueView({ isLoading }: RevenueViewProps) {
         formatValue: n => formatLongCurrency(n, currency),
       },
       {
-        value: avg,
+        value: count ? sum / count : 0,
         label: formatMessage(labels.average),
         formatValue: n => formatLongCurrency(n, currency),
       },
diff --git a/src/lib/format.ts b/src/lib/format.ts
index 71e4916d13..e497464a65 100644
--- a/src/lib/format.ts
+++ b/src/lib/format.ts
@@ -114,5 +114,5 @@ export function formatLongCurrency(value: number, currency: string, locale = 'en
     return `${formatCurrency(n / 1000, currency, locale)}k`;
   }
 
-  return formatCurrency(n / 1000, currency, locale);
+  return formatCurrency(n, currency, locale);
 }
diff --git a/src/queries/analytics/reports/getRevenue.ts b/src/queries/analytics/reports/getRevenue.ts
index 5fb419c0e4..caef94694e 100644
--- a/src/queries/analytics/reports/getRevenue.ts
+++ b/src/queries/analytics/reports/getRevenue.ts
@@ -32,11 +32,10 @@ async function relationalQuery(
 ): Promise<{
   chart: { x: string; t: string; y: number }[];
   country: { name: string; value: number }[];
-  total: { sum: number; avg: number; count: number; unique_count: number };
+  total: { sum: number; count: number; unique_count: number };
   table: {
     currency: string;
     sum: number;
-    avg: number;
     count: number;
     unique_count: number;
   }[];
@@ -96,7 +95,6 @@ async function relationalQuery(
     `
     select
       sum(coalesce(cast(number_value as decimal(10,2)), cast(string_value as decimal(10,2)))) as sum,
-      avg(coalesce(cast(number_value as decimal(10,2)), cast(string_value as decimal(10,2)))) as avg,
       count(distinct event_id) as count,
       count(distinct session_id) as unique_count
     from event_data ed
@@ -119,7 +117,6 @@ async function relationalQuery(
     select
       c.currency,
       sum(coalesce(cast(number_value as decimal(10,2)), cast(string_value as decimal(10,2)))) as sum,
-      avg(coalesce(cast(number_value as decimal(10,2)), cast(string_value as decimal(10,2)))) as avg,
       count(distinct ed.website_event_id) as count,
       count(distinct we.session_id) as unique_count
     from event_data ed
@@ -153,11 +150,10 @@ async function clickhouseQuery(
 ): Promise<{
   chart: { x: string; t: string; y: number }[];
   country: { name: string; value: number }[];
-  total: { sum: number; avg: number; count: number; unique_count: number };
+  total: { sum: number; count: number; unique_count: number };
   table: {
     currency: string;
     sum: number;
-    avg: number;
     count: number;
     unique_count: number;
   }[];
@@ -230,7 +226,6 @@ async function clickhouseQuery(
     `
     select
       sum(coalesce(toDecimal64(number_value, 2), toDecimal64(string_value, 2))) as sum,
-      avg(coalesce(toDecimal64(number_value, 2), toDecimal64(string_value, 2))) as avg,
       uniqExact(event_id) as count,
       uniqExact(session_id) as unique_count
     from event_data
@@ -259,7 +254,6 @@ async function clickhouseQuery(
     select
       c.currency,
       sum(coalesce(toDecimal64(ed.number_value, 2), toDecimal64(ed.string_value, 2))) as sum,
-      avg(coalesce(toDecimal64(ed.number_value, 2), toDecimal64(ed.string_value, 2))) as avg,
       uniqExact(ed.event_id) as count,
       uniqExact(ed.session_id) as unique_count
     from event_data ed

From 6ce9a8cef455b3d88179f554bc9a09f0e9d701b7 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 15 Oct 2024 09:34:15 -0700
Subject: [PATCH 378/438] add currency attribute to revenue button

---
 src/app/(main)/console/TestConsole.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/(main)/console/TestConsole.tsx b/src/app/(main)/console/TestConsole.tsx
index 544aaa9ae0..6842b26de4 100644
--- a/src/app/(main)/console/TestConsole.tsx
+++ b/src/app/(main)/console/TestConsole.tsx
@@ -170,7 +170,8 @@ export function TestConsole({ websiteId }: { websiteId: string }) {
               <Button
                 id="generate-revenue-button"
                 data-umami-event="checkout-cart"
-                data-umami-event-revenue={(Math.random() * 100).toFixed(2).toString()}
+                data-umami-event-revenue={(Math.random() * 10000).toFixed(2).toString()}
+                data-umami-event-currency="USD"
                 variant="primary"
               >
                 Generate revenue data

From bffb98cd5147e4f9daa03e21a1adc95384172568 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 15 Oct 2024 11:29:27 -0700
Subject: [PATCH 379/438] add tag migrations and update send / saveEvent

---
 db/clickhouse/migrations/04_add_tag.sql       | 78 +++++++++++++++++++
 db/mysql/migrations/07_add_tag/migration.sql  |  5 ++
 db/mysql/schema.prisma                        |  2 +
 .../migrations/07_add_tag/migration.sql       |  5 ++
 db/postgresql/schema.prisma                   |  3 +
 src/pages/api/send.ts                         |  3 +-
 src/queries/analytics/events/saveEvent.ts     |  7 ++
 7 files changed, 102 insertions(+), 1 deletion(-)
 create mode 100644 db/clickhouse/migrations/04_add_tag.sql
 create mode 100644 db/mysql/migrations/07_add_tag/migration.sql
 create mode 100644 db/postgresql/migrations/07_add_tag/migration.sql

diff --git a/db/clickhouse/migrations/04_add_tag.sql b/db/clickhouse/migrations/04_add_tag.sql
new file mode 100644
index 0000000000..cfe0de20bd
--- /dev/null
+++ b/db/clickhouse/migrations/04_add_tag.sql
@@ -0,0 +1,78 @@
+-- add tag column
+ALTER TABLE umami.website_event ADD COLUMN "tag" String AFTER "event_name";
+ALTER TABLE umami.website_event_stats_hourly ADD COLUMN "tag" String AFTER "max_time";
+
+-- update materialized view
+DROP TABLE umami.website_event_stats_hourly_mv;
+
+CREATE MATERIALIZED VIEW umami.website_event_stats_hourly_mv
+TO umami.website_event_stats_hourly
+AS
+SELECT
+    website_id,
+    session_id,
+    visit_id,
+    hostname,
+    browser,
+    os,
+    device,
+    screen,
+    language,
+    country,
+    subdivision1,
+    city,
+    entry_url,
+    exit_url,
+    url_paths as url_path,
+    url_query,
+    referrer_domain,
+    page_title,
+    event_type,
+    event_name,
+    views,
+    min_time,
+    max_time,
+    tag,
+    timestamp as created_at
+FROM (SELECT
+    website_id,
+    session_id,
+    visit_id,
+    hostname,
+    browser,
+    os,
+    device,
+    screen,
+    language,
+    country,
+    subdivision1,
+    city,
+    argMinState(url_path, created_at) entry_url,
+    argMaxState(url_path, created_at) exit_url,
+    arrayFilter(x -> x != '', groupArray(url_path)) as url_paths,
+    arrayFilter(x -> x != '', groupArray(url_query)) url_query,
+    arrayFilter(x -> x != '', groupArray(referrer_domain)) referrer_domain,
+    arrayFilter(x -> x != '', groupArray(page_title)) page_title,
+    event_type,
+    if(event_type = 2, groupArray(event_name), []) event_name,
+    sumIf(1, event_type = 1) views,
+    min(created_at) min_time,
+    max(created_at) max_time,
+    tag,
+    toStartOfHour(created_at) timestamp
+FROM umami.website_event
+GROUP BY website_id,
+    session_id,
+    visit_id,
+    hostname,
+    browser,
+    os,
+    device,
+    screen,
+    language,
+    country,
+    subdivision1,
+    city,
+    event_type,
+    tag,
+    timestamp);
\ No newline at end of file
diff --git a/db/mysql/migrations/07_add_tag/migration.sql b/db/mysql/migrations/07_add_tag/migration.sql
new file mode 100644
index 0000000000..f1c349bd42
--- /dev/null
+++ b/db/mysql/migrations/07_add_tag/migration.sql
@@ -0,0 +1,5 @@
+-- AlterTable
+ALTER TABLE `website_event` ADD COLUMN `tag` VARCHAR(50) NULL;
+
+-- CreateIndex
+CREATE INDEX `website_event_website_id_created_at_tag_idx` ON `website_event`(`website_id`, `created_at`, `tag`);
diff --git a/db/mysql/schema.prisma b/db/mysql/schema.prisma
index a7722accdc..5f9d4dff59 100644
--- a/db/mysql/schema.prisma
+++ b/db/mysql/schema.prisma
@@ -102,6 +102,7 @@ model WebsiteEvent {
   pageTitle      String?   @map("page_title") @db.VarChar(500)
   eventType      Int       @default(1) @map("event_type") @db.UnsignedInt
   eventName      String?   @map("event_name") @db.VarChar(50)
+  tag            String?   @db.VarChar(50)
 
   eventData EventData[]
   session   Session     @relation(fields: [sessionId], references: [id])
@@ -116,6 +117,7 @@ model WebsiteEvent {
   @@index([websiteId, createdAt, referrerDomain])
   @@index([websiteId, createdAt, pageTitle])
   @@index([websiteId, createdAt, eventName])
+  @@index([websiteId, createdAt, tag])
   @@index([websiteId, sessionId, createdAt])
   @@index([websiteId, visitId, createdAt])
   @@map("website_event")
diff --git a/db/postgresql/migrations/07_add_tag/migration.sql b/db/postgresql/migrations/07_add_tag/migration.sql
new file mode 100644
index 0000000000..ef465f838f
--- /dev/null
+++ b/db/postgresql/migrations/07_add_tag/migration.sql
@@ -0,0 +1,5 @@
+-- AlterTable
+ALTER TABLE "website_event" ADD COLUMN     "tag" VARCHAR(50);
+
+-- CreateIndex
+CREATE INDEX "website_event_website_id_created_at_tag_idx" ON "website_event"("website_id", "created_at", "tag");
diff --git a/db/postgresql/schema.prisma b/db/postgresql/schema.prisma
index b9009e0fb3..364986dcd2 100644
--- a/db/postgresql/schema.prisma
+++ b/db/postgresql/schema.prisma
@@ -102,6 +102,7 @@ model WebsiteEvent {
   pageTitle      String?   @map("page_title") @db.VarChar(500)
   eventType      Int       @default(1) @map("event_type") @db.Integer
   eventName      String?   @map("event_name") @db.VarChar(50)
+  tag            String?   @db.VarChar(50)
 
   eventData EventData[]
   session   Session     @relation(fields: [sessionId], references: [id])
@@ -111,11 +112,13 @@ model WebsiteEvent {
   @@index([visitId])
   @@index([websiteId])
   @@index([websiteId, createdAt])
+
   @@index([websiteId, createdAt, urlPath])
   @@index([websiteId, createdAt, urlQuery])
   @@index([websiteId, createdAt, referrerDomain])
   @@index([websiteId, createdAt, pageTitle])
   @@index([websiteId, createdAt, eventName])
+  @@index([websiteId, createdAt, tag])
   @@index([websiteId, sessionId, createdAt])
   @@index([websiteId, visitId, createdAt])
   @@map("website_event")
diff --git a/src/pages/api/send.ts b/src/pages/api/send.ts
index 23640de9f0..fb4e90c744 100644
--- a/src/pages/api/send.ts
+++ b/src/pages/api/send.ts
@@ -96,7 +96,7 @@ export default async (req: NextApiRequestCollect, res: NextApiResponse) => {
     }
 
     const { type, payload } = req.body;
-    const { url, referrer, name: eventName, data, title } = payload;
+    const { url, referrer, name: eventName, data, title, tag } = payload;
     const pageTitle = safeDecodeURI(title);
 
     await useSession(req, res);
@@ -143,6 +143,7 @@ export default async (req: NextApiRequestCollect, res: NextApiResponse) => {
         eventData: data,
         ...session,
         sessionId: session.id,
+        tag,
       });
     } else if (type === COLLECTION_TYPE.identify) {
       if (!data) {
diff --git a/src/queries/analytics/events/saveEvent.ts b/src/queries/analytics/events/saveEvent.ts
index 6c0f917baa..6a3391d674 100644
--- a/src/queries/analytics/events/saveEvent.ts
+++ b/src/queries/analytics/events/saveEvent.ts
@@ -28,6 +28,7 @@ export async function saveEvent(args: {
   subdivision1?: string;
   subdivision2?: string;
   city?: string;
+  tag?: string;
 }) {
   return runQuery({
     [PRISMA]: () => relationalQuery(args),
@@ -47,6 +48,7 @@ async function relationalQuery(data: {
   pageTitle?: string;
   eventName?: string;
   eventData?: any;
+  tag?: string;
 }) {
   const {
     websiteId,
@@ -60,6 +62,7 @@ async function relationalQuery(data: {
     eventName,
     eventData,
     pageTitle,
+    tag,
   } = data;
   const websiteEventId = uuid();
 
@@ -77,6 +80,7 @@ async function relationalQuery(data: {
       pageTitle: pageTitle?.substring(0, PAGE_TITLE_LENGTH),
       eventType: eventName ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
       eventName: eventName ? eventName?.substring(0, EVENT_NAME_LENGTH) : null,
+      tag,
     },
   });
 
@@ -116,6 +120,7 @@ async function clickhouseQuery(data: {
   subdivision1?: string;
   subdivision2?: string;
   city?: string;
+  tag?: string;
 }) {
   const {
     websiteId,
@@ -133,6 +138,7 @@ async function clickhouseQuery(data: {
     subdivision1,
     subdivision2,
     city,
+    tag,
     ...args
   } = data;
   const { insert, getUTCString } = clickhouse;
@@ -163,6 +169,7 @@ async function clickhouseQuery(data: {
     page_title: pageTitle?.substring(0, PAGE_TITLE_LENGTH),
     event_type: eventName ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
     event_name: eventName ? eventName?.substring(0, EVENT_NAME_LENGTH) : null,
+    tag: tag,
     created_at: createdAt,
   };
 

From 8759ba9916d1d86056f0a77d74e206e01ce86790 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 15 Oct 2024 16:46:57 -0700
Subject: [PATCH 380/438] add tags table and filters logic

---
 db/clickhouse/migrations/04_add_tag.sql       |  5 +--
 .../[websiteId]/WebsiteExpandedView.tsx       | 23 +++++++----
 .../compare/WebsiteCompareTables.tsx          | 40 ++++++++++++-------
 src/components/hooks/useFields.ts             |  1 +
 src/components/hooks/useFilterParams.ts       | 17 +++++++-
 src/components/messages.ts                    |  2 +
 src/components/metrics/HostsTable.tsx         |  2 +-
 src/components/metrics/TagsTable.tsx          | 30 ++++++++++++++
 src/lib/constants.ts                          |  3 +-
 src/lib/types.ts                              |  1 +
 .../api/websites/[websiteId]/events/series.ts |  2 +
 src/pages/api/websites/[websiteId]/metrics.ts |  2 +
 .../api/websites/[websiteId]/pageviews.ts     |  2 +
 .../websites/[websiteId]/sessions/stats.ts    |  2 +
 src/pages/api/websites/[websiteId]/stats.ts   |  2 +
 15 files changed, 106 insertions(+), 28 deletions(-)
 create mode 100644 src/components/metrics/TagsTable.tsx

diff --git a/db/clickhouse/migrations/04_add_tag.sql b/db/clickhouse/migrations/04_add_tag.sql
index cfe0de20bd..7ffc499520 100644
--- a/db/clickhouse/migrations/04_add_tag.sql
+++ b/db/clickhouse/migrations/04_add_tag.sql
@@ -1,6 +1,6 @@
 -- add tag column
 ALTER TABLE umami.website_event ADD COLUMN "tag" String AFTER "event_name";
-ALTER TABLE umami.website_event_stats_hourly ADD COLUMN "tag" String AFTER "max_time";
+ALTER TABLE umami.website_event_stats_hourly ADD COLUMN "tag" SimpleAggregateFunction(groupArrayArray, Array(String)) AFTER "max_time";
 
 -- update materialized view
 DROP TABLE umami.website_event_stats_hourly_mv;
@@ -58,7 +58,7 @@ FROM (SELECT
     sumIf(1, event_type = 1) views,
     min(created_at) min_time,
     max(created_at) max_time,
-    tag,
+    arrayFilter(x -> x != '', groupArray(tag)) tag,
     toStartOfHour(created_at) timestamp
 FROM umami.website_event
 GROUP BY website_id,
@@ -74,5 +74,4 @@ GROUP BY website_id,
     subdivision1,
     city,
     event_type,
-    tag,
     timestamp);
\ No newline at end of file
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx
index 86a7717fa8..95e718b42f 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx
@@ -1,20 +1,21 @@
-import { Icons, Icon, Text, Dropdown, Item } from 'react-basics';
+import LinkButton from 'components/common/LinkButton';
+import { useLocale, useMessages, useNavigation } from 'components/hooks';
+import SideNav from 'components/layout/SideNav';
 import BrowsersTable from 'components/metrics/BrowsersTable';
-import CountriesTable from 'components/metrics/CountriesTable';
-import RegionsTable from 'components/metrics/RegionsTable';
 import CitiesTable from 'components/metrics/CitiesTable';
+import CountriesTable from 'components/metrics/CountriesTable';
 import DevicesTable from 'components/metrics/DevicesTable';
+import EventsTable from 'components/metrics/EventsTable';
+import HostsTable from 'components/metrics/HostsTable';
 import LanguagesTable from 'components/metrics/LanguagesTable';
 import OSTable from 'components/metrics/OSTable';
 import PagesTable from 'components/metrics/PagesTable';
 import QueryParametersTable from 'components/metrics/QueryParametersTable';
 import ReferrersTable from 'components/metrics/ReferrersTable';
-import HostsTable from 'components/metrics/HostsTable';
+import RegionsTable from 'components/metrics/RegionsTable';
 import ScreenTable from 'components/metrics/ScreenTable';
-import EventsTable from 'components/metrics/EventsTable';
-import SideNav from 'components/layout/SideNav';
-import { useNavigation, useMessages, useLocale } from 'components/hooks';
-import LinkButton from 'components/common/LinkButton';
+import TagsTable from 'components/metrics/TagsTable';
+import { Dropdown, Icon, Icons, Item, Text } from 'react-basics';
 import styles from './WebsiteExpandedView.module.css';
 
 const views = {
@@ -34,6 +35,7 @@ const views = {
   language: LanguagesTable,
   event: EventsTable,
   query: QueryParametersTable,
+  tag: TagsTable,
 };
 
 export default function WebsiteExpandedView({
@@ -117,6 +119,11 @@ export default function WebsiteExpandedView({
       label: formatMessage(labels.hosts),
       url: renderUrl({ view: 'host' }),
     },
+    {
+      key: 'tag',
+      label: formatMessage(labels.tags),
+      url: renderUrl({ view: 'tag' }),
+    },
   ];
 
   const DetailsComponent = views[view] || (() => null);
diff --git a/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.tsx b/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.tsx
index 1b21103da9..af5a06d49a 100644
--- a/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.tsx
+++ b/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.tsx
@@ -1,24 +1,25 @@
-import { useState } from 'react';
-import SideNav from 'components/layout/SideNav';
 import { useDateRange, useMessages, useNavigation } from 'components/hooks';
-import PagesTable from 'components/metrics/PagesTable';
-import ReferrersTable from 'components/metrics/ReferrersTable';
+import { Grid, GridRow } from 'components/layout/Grid';
+import SideNav from 'components/layout/SideNav';
 import BrowsersTable from 'components/metrics/BrowsersTable';
-import OSTable from 'components/metrics/OSTable';
-import DevicesTable from 'components/metrics/DevicesTable';
-import ScreenTable from 'components/metrics/ScreenTable';
-import CountriesTable from 'components/metrics/CountriesTable';
-import RegionsTable from 'components/metrics/RegionsTable';
+import ChangeLabel from 'components/metrics/ChangeLabel';
 import CitiesTable from 'components/metrics/CitiesTable';
-import LanguagesTable from 'components/metrics/LanguagesTable';
+import CountriesTable from 'components/metrics/CountriesTable';
+import DevicesTable from 'components/metrics/DevicesTable';
 import EventsTable from 'components/metrics/EventsTable';
-import QueryParametersTable from 'components/metrics/QueryParametersTable';
-import { Grid, GridRow } from 'components/layout/Grid';
+import LanguagesTable from 'components/metrics/LanguagesTable';
 import MetricsTable from 'components/metrics/MetricsTable';
-import useStore from 'store/websites';
+import OSTable from 'components/metrics/OSTable';
+import PagesTable from 'components/metrics/PagesTable';
+import QueryParametersTable from 'components/metrics/QueryParametersTable';
+import ReferrersTable from 'components/metrics/ReferrersTable';
+import RegionsTable from 'components/metrics/RegionsTable';
+import ScreenTable from 'components/metrics/ScreenTable';
+import TagsTable from 'components/metrics/TagsTable';
 import { getCompareDate } from 'lib/date';
 import { formatNumber } from 'lib/format';
-import ChangeLabel from 'components/metrics/ChangeLabel';
+import { useState } from 'react';
+import useStore from 'store/websites';
 import styles from './WebsiteCompareTables.module.css';
 
 const views = {
@@ -35,6 +36,7 @@ const views = {
   language: LanguagesTable,
   event: EventsTable,
   query: QueryParametersTable,
+  tag: TagsTable,
 };
 
 export function WebsiteCompareTables({ websiteId }: { websiteId: string }) {
@@ -109,6 +111,16 @@ export function WebsiteCompareTables({ websiteId }: { websiteId: string }) {
       label: formatMessage(labels.queryParameters),
       url: renderUrl({ view: 'query' }),
     },
+    {
+      key: 'host',
+      label: formatMessage(labels.hosts),
+      url: renderUrl({ view: 'host' }),
+    },
+    {
+      key: 'tag',
+      label: formatMessage(labels.tags),
+      url: renderUrl({ view: 'tag' }),
+    },
   ];
 
   const renderChange = ({ x, y }) => {
diff --git a/src/components/hooks/useFields.ts b/src/components/hooks/useFields.ts
index e6fc54b3dc..859ca1ce45 100644
--- a/src/components/hooks/useFields.ts
+++ b/src/components/hooks/useFields.ts
@@ -15,6 +15,7 @@ export function useFields() {
     { name: 'region', type: 'string', label: formatMessage(labels.region) },
     { name: 'city', type: 'string', label: formatMessage(labels.city) },
     { name: 'host', type: 'string', label: formatMessage(labels.host) },
+    { name: 'tag', type: 'string', label: formatMessage(labels.tag) },
   ];
 
   return { fields };
diff --git a/src/components/hooks/useFilterParams.ts b/src/components/hooks/useFilterParams.ts
index 525f349298..55deed1415 100644
--- a/src/components/hooks/useFilterParams.ts
+++ b/src/components/hooks/useFilterParams.ts
@@ -7,7 +7,21 @@ export function useFilterParams(websiteId: string) {
   const { startDate, endDate, unit } = dateRange;
   const { timezone, toUtc } = useTimezone();
   const {
-    query: { url, referrer, title, query, host, os, browser, device, country, region, city, event },
+    query: {
+      url,
+      referrer,
+      title,
+      query,
+      host,
+      os,
+      browser,
+      device,
+      country,
+      region,
+      city,
+      event,
+      tag,
+    },
   } = useNavigation();
 
   return {
@@ -27,5 +41,6 @@ export function useFilterParams(websiteId: string) {
     region,
     city,
     event,
+    tag,
   };
 }
diff --git a/src/components/messages.ts b/src/components/messages.ts
index 1d2cc9b29c..688dd11d56 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -98,6 +98,7 @@ export const labels = defineMessages({
   devices: { id: 'label.devices', defaultMessage: 'Devices' },
   countries: { id: 'label.countries', defaultMessage: 'Countries' },
   languages: { id: 'label.languages', defaultMessage: 'Languages' },
+  tags: { id: 'label.tags', defaultMessage: 'Tags' },
   count: { id: 'label.count', defaultMessage: 'Count' },
   average: { id: 'label.average', defaultMessage: 'Average' },
   sum: { id: 'label.sum', defaultMessage: 'Sum' },
@@ -220,6 +221,7 @@ export const labels = defineMessages({
   browser: { id: 'label.browser', defaultMessage: 'Browser' },
   device: { id: 'label.device', defaultMessage: 'Device' },
   pageTitle: { id: 'label.pageTitle', defaultMessage: 'Page title' },
+  tag: { id: 'label.tag', defaultMessage: 'Tag' },
   day: { id: 'label.day', defaultMessage: 'Day' },
   date: { id: 'label.date', defaultMessage: 'Date' },
   pageOf: { id: 'label.page-of', defaultMessage: 'Page {current} of {total}' },
diff --git a/src/components/metrics/HostsTable.tsx b/src/components/metrics/HostsTable.tsx
index d3a0f3bf39..45147eac58 100644
--- a/src/components/metrics/HostsTable.tsx
+++ b/src/components/metrics/HostsTable.tsx
@@ -25,7 +25,7 @@ export function HostsTable(props: MetricsTableProps) {
         {...props}
         title={formatMessage(labels.hosts)}
         type="host"
-        metric={formatMessage(labels.views)}
+        metric={formatMessage(labels.visitors)}
         renderLabel={renderLink}
       />
     </>
diff --git a/src/components/metrics/TagsTable.tsx b/src/components/metrics/TagsTable.tsx
new file mode 100644
index 0000000000..a1130bb4fa
--- /dev/null
+++ b/src/components/metrics/TagsTable.tsx
@@ -0,0 +1,30 @@
+import MetricsTable, { MetricsTableProps } from './MetricsTable';
+import FilterLink from 'components/common/FilterLink';
+import { useMessages } from 'components/hooks';
+import { Flexbox } from 'react-basics';
+
+export function TagsTable(props: MetricsTableProps) {
+  const { formatMessage, labels } = useMessages();
+
+  const renderLink = ({ x: tag }) => {
+    return (
+      <Flexbox alignItems="center">
+        <FilterLink id="tag" value={tag} label={!tag && formatMessage(labels.none)} />
+      </Flexbox>
+    );
+  };
+
+  return (
+    <>
+      <MetricsTable
+        {...props}
+        title={formatMessage(labels.tags)}
+        type="tag"
+        metric={formatMessage(labels.views)}
+        renderLabel={renderLink}
+      />
+    </>
+  );
+}
+
+export default TagsTable;
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 5d3a9776b5..7f8acf886a 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -33,7 +33,7 @@ export const FILTER_REFERRERS = 'filter-referrers';
 export const FILTER_PAGES = 'filter-pages';
 
 export const UNIT_TYPES = ['year', 'month', 'hour', 'day', 'minute'];
-export const EVENT_COLUMNS = ['url', 'entry', 'exit', 'referrer', 'title', 'query', 'event'];
+export const EVENT_COLUMNS = ['url', 'entry', 'exit', 'referrer', 'title', 'query', 'event', 'tag'];
 
 export const SESSION_COLUMNS = [
   'browser',
@@ -63,6 +63,7 @@ export const FILTER_COLUMNS = {
   city: 'city',
   language: 'language',
   event: 'event_name',
+  tag: 'tag',
 };
 
 export const COLLECTION_TYPE = {
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 7fabbfc859..615882ef2d 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -179,6 +179,7 @@ export interface QueryFilters {
   language?: string;
   event?: string;
   search?: string;
+  tag?: string;
 }
 
 export interface QueryOptions {
diff --git a/src/pages/api/websites/[websiteId]/events/series.ts b/src/pages/api/websites/[websiteId]/events/series.ts
index 08cade1208..6d67a26441 100644
--- a/src/pages/api/websites/[websiteId]/events/series.ts
+++ b/src/pages/api/websites/[websiteId]/events/series.ts
@@ -24,6 +24,7 @@ export interface WebsiteEventsRequestQuery {
   country?: string;
   region: string;
   city?: string;
+  tag?: string;
 }
 
 const schema = {
@@ -43,6 +44,7 @@ const schema = {
     country: yup.string(),
     region: yup.string(),
     city: yup.string(),
+    tag: yup.string(),
   }),
 };
 
diff --git a/src/pages/api/websites/[websiteId]/metrics.ts b/src/pages/api/websites/[websiteId]/metrics.ts
index 3dac217b21..1996a61a1b 100644
--- a/src/pages/api/websites/[websiteId]/metrics.ts
+++ b/src/pages/api/websites/[websiteId]/metrics.ts
@@ -29,6 +29,7 @@ export interface WebsiteMetricsRequestQuery {
   limit?: number;
   offset?: number;
   search?: string;
+  tag?: string;
 }
 
 const schema = {
@@ -53,6 +54,7 @@ const schema = {
     limit: yup.number(),
     offset: yup.number(),
     search: yup.string(),
+    tag: yup.string(),
   }),
 };
 
diff --git a/src/pages/api/websites/[websiteId]/pageviews.ts b/src/pages/api/websites/[websiteId]/pageviews.ts
index badb8a47da..c3b6b7979d 100644
--- a/src/pages/api/websites/[websiteId]/pageviews.ts
+++ b/src/pages/api/websites/[websiteId]/pageviews.ts
@@ -25,6 +25,7 @@ export interface WebsitePageviewRequestQuery {
   country?: string;
   region: string;
   city?: string;
+  tag?: string;
   compare?: string;
 }
 
@@ -45,6 +46,7 @@ const schema = {
     country: yup.string(),
     region: yup.string(),
     city: yup.string(),
+    tag: yup.string(),
     compare: yup.string(),
   }),
 };
diff --git a/src/pages/api/websites/[websiteId]/sessions/stats.ts b/src/pages/api/websites/[websiteId]/sessions/stats.ts
index a522bd6bf5..fe92ce6fb6 100644
--- a/src/pages/api/websites/[websiteId]/sessions/stats.ts
+++ b/src/pages/api/websites/[websiteId]/sessions/stats.ts
@@ -23,6 +23,7 @@ export interface WebsiteSessionStatsRequestQuery {
   country?: string;
   region?: string;
   city?: string;
+  tag?: string;
 }
 
 const schema = {
@@ -42,6 +43,7 @@ const schema = {
     country: yup.string(),
     region: yup.string(),
     city: yup.string(),
+    tag: yup.string(),
   }),
 };
 
diff --git a/src/pages/api/websites/[websiteId]/stats.ts b/src/pages/api/websites/[websiteId]/stats.ts
index 9ca84c7440..dfc9198dfd 100644
--- a/src/pages/api/websites/[websiteId]/stats.ts
+++ b/src/pages/api/websites/[websiteId]/stats.ts
@@ -24,6 +24,7 @@ export interface WebsiteStatsRequestQuery {
   country?: string;
   region?: string;
   city?: string;
+  tag?: string;
   compare?: string;
 }
 
@@ -44,6 +45,7 @@ const schema = {
     country: yup.string(),
     region: yup.string(),
     city: yup.string(),
+    tag: yup.string(),
     compare: yup.string(),
   }),
 };

From 8a59bb0edff5825674e68cb71acd5493442038a2 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Tue, 15 Oct 2024 21:31:05 -0700
Subject: [PATCH 381/438] Changed tracker script name.

---
 next.config.js            | 6 +++++-
 rollup.tracker.config.mjs | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/next.config.js b/next.config.js
index b610eb2c83..cc295c8997 100644
--- a/next.config.js
+++ b/next.config.js
@@ -61,7 +61,7 @@ if (trackerScriptName) {
     names.forEach(name => {
       rewrites.push({
         source: `/${name.replace(/^\/+/, '')}`,
-        destination: '/script.js',
+        destination: '/tracker.js',
       });
     });
   }
@@ -163,6 +163,10 @@ const config = {
   async rewrites() {
     return [
       ...rewrites,
+      {
+        source: '/script.js',
+        destination: 'https://tracker-script.umami.dev/',
+      },
       {
         source: '/telemetry.js',
         destination: '/api/scripts/telemetry',
diff --git a/rollup.tracker.config.mjs b/rollup.tracker.config.mjs
index 05df28798d..4b1f0e0e25 100644
--- a/rollup.tracker.config.mjs
+++ b/rollup.tracker.config.mjs
@@ -5,7 +5,7 @@ import { terser } from 'rollup-plugin-terser';
 export default {
   input: 'src/tracker/index.js',
   output: {
-    file: 'public/script.js',
+    file: 'public/tracker.js',
     format: 'iife',
   },
   plugins: [

From a708e6c35087fd7a6a0e1bd3ffcac22ae21334e3 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Thu, 17 Oct 2024 09:53:07 -0700
Subject: [PATCH 382/438] add tags to ch schema file

---
 db/clickhouse/schema.sql | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/db/clickhouse/schema.sql b/db/clickhouse/schema.sql
index 3dcfda9f69..5ceaaa0eb6 100644
--- a/db/clickhouse/schema.sql
+++ b/db/clickhouse/schema.sql
@@ -26,6 +26,7 @@ CREATE TABLE umami.website_event
     --events
     event_type UInt32,
     event_name String,
+    tag String,
     created_at DateTime('UTC'),
     job_id Nullable(UUID)
 )
@@ -96,6 +97,7 @@ CREATE TABLE umami.website_event_stats_hourly
     views SimpleAggregateFunction(sum, UInt64),
     min_time SimpleAggregateFunction(min, DateTime('UTC')),
     max_time SimpleAggregateFunction(max, DateTime('UTC')),
+    tag SimpleAggregateFunction(groupArrayArray, Array(String)),
     created_at Datetime('UTC')
 )
 ENGINE = AggregatingMergeTree
@@ -136,6 +138,7 @@ SELECT
     views,
     min_time,
     max_time,
+    tag,
     timestamp as created_at
 FROM (SELECT
     website_id,
@@ -161,6 +164,7 @@ FROM (SELECT
     sumIf(1, event_type = 1) views,
     min(created_at) min_time,
     max(created_at) max_time,
+    arrayFilter(x -> x != '', groupArray(tag)) tag,
     toStartOfHour(created_at) timestamp
 FROM umami.website_event
 GROUP BY website_id,

From da47dce903af5b781ef1957092d35474e7a5ed15 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 21 Oct 2024 12:35:53 -0700
Subject: [PATCH 383/438] fix hardcoded currency query

---
 src/queries/analytics/reports/getRevenue.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/queries/analytics/reports/getRevenue.ts b/src/queries/analytics/reports/getRevenue.ts
index caef94694e..a2803e854d 100644
--- a/src/queries/analytics/reports/getRevenue.ts
+++ b/src/queries/analytics/reports/getRevenue.ts
@@ -81,7 +81,7 @@ async function relationalQuery(
     join (select website_event_id
           from event_data
           where data_key ${like} '%currency%'
-            and string_value = 'USD') currency
+            and string_value = {{currency}}) currency
     on currency.website_event_id = ed.website_event_id
     where ed.website_id = {{websiteId::uuid}}
       and ed.created_at between {{startDate}} and {{endDate}}
@@ -103,7 +103,7 @@ async function relationalQuery(
     join (select website_event_id
           from event_data
           where data_key ${like} '%currency%'
-            and string_value = 'USD') currency
+            and string_value = {{currency}}) currency
       on currency.website_event_id = ed.website_event_id
     where ed.website_id = {{websiteId::uuid}}
       and ed.created_at between {{startDate}} and {{endDate}}

From d1436d4fac250b9099a3bdb48775e0738fb73311 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20K=C3=BChne?=
 <18653821+ZerGo0@users.noreply.github.com>
Date: Fri, 25 Oct 2024 21:39:23 +0200
Subject: [PATCH 384/438] fix: added underscore support (#1)

---
 pnpm-lock.yaml       | 13380 +++++++++++++++++++++++++++++++++++++++++
 src/lib/constants.ts |     4 +-
 2 files changed, 13382 insertions(+), 2 deletions(-)
 create mode 100644 pnpm-lock.yaml

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
new file mode 100644
index 0000000000..fc57da9a15
--- /dev/null
+++ b/pnpm-lock.yaml
@@ -0,0 +1,13380 @@
+lockfileVersion: '9.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+importers:
+
+  .:
+    dependencies:
+      '@clickhouse/client':
+        specifier: ^1.4.1
+        version: 1.7.0
+      '@date-fns/utc':
+        specifier: ^1.2.0
+        version: 1.2.0
+      '@dicebear/collection':
+        specifier: ^9.2.1
+        version: 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/core':
+        specifier: ^9.2.1
+        version: 9.2.2
+      '@fontsource/inter':
+        specifier: ^4.5.15
+        version: 4.5.15
+      '@prisma/client':
+        specifier: '5.17'
+        version: 5.17.0(prisma@5.17.0)
+      '@prisma/extension-read-replicas':
+        specifier: ^0.3.0
+        version: 0.3.0(@prisma/client@5.17.0(prisma@5.17.0))
+      '@react-spring/web':
+        specifier: ^9.7.3
+        version: 9.7.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@tanstack/react-query':
+        specifier: ^5.28.6
+        version: 5.59.16(react@18.3.1)
+      '@umami/prisma-client':
+        specifier: ^0.14.0
+        version: 0.14.0(@prisma/client@5.17.0(prisma@5.17.0))(@prisma/extension-read-replicas@0.3.0(@prisma/client@5.17.0(prisma@5.17.0)))
+      '@umami/redis-client':
+        specifier: ^0.21.0
+        version: 0.21.0
+      chalk:
+        specifier: ^4.1.1
+        version: 4.1.2
+      chart.js:
+        specifier: ^4.4.2
+        version: 4.4.5
+      chartjs-adapter-date-fns:
+        specifier: ^3.0.0
+        version: 3.0.0(chart.js@4.4.5)(date-fns@2.30.0)
+      classnames:
+        specifier: ^2.3.1
+        version: 2.5.1
+      colord:
+        specifier: ^2.9.2
+        version: 2.9.3
+      cors:
+        specifier: ^2.8.5
+        version: 2.8.5
+      cross-spawn:
+        specifier: ^7.0.3
+        version: 7.0.3
+      date-fns:
+        specifier: ^2.23.0
+        version: 2.30.0
+      date-fns-tz:
+        specifier: ^1.1.4
+        version: 1.3.8(date-fns@2.30.0)
+      debug:
+        specifier: ^4.3.4
+        version: 4.3.7(supports-color@8.1.1)
+      del:
+        specifier: ^6.0.0
+        version: 6.1.1
+      detect-browser:
+        specifier: ^5.2.0
+        version: 5.3.0
+      dotenv:
+        specifier: ^10.0.0
+        version: 10.0.0
+      eslint-plugin-promise:
+        specifier: ^6.1.1
+        version: 6.6.0(eslint@8.57.1)
+      fs-extra:
+        specifier: ^10.0.1
+        version: 10.1.0
+      immer:
+        specifier: ^9.0.12
+        version: 9.0.21
+      ipaddr.js:
+        specifier: ^2.0.1
+        version: 2.2.0
+      is-ci:
+        specifier: ^3.0.1
+        version: 3.0.1
+      is-docker:
+        specifier: ^3.0.0
+        version: 3.0.0
+      is-localhost-ip:
+        specifier: ^1.4.0
+        version: 1.4.0
+      isbot:
+        specifier: ^5.1.16
+        version: 5.1.17
+      kafkajs:
+        specifier: ^2.1.0
+        version: 2.2.4
+      maxmind:
+        specifier: ^4.3.6
+        version: 4.3.22
+      md5:
+        specifier: ^2.3.0
+        version: 2.3.0
+      moment-timezone:
+        specifier: ^0.5.35
+        version: 0.5.46
+      next:
+        specifier: 14.2.10
+        version: 14.2.10(@babel/core@7.26.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      next-basics:
+        specifier: ^0.39.0
+        version: 0.39.0(next@14.2.10(@babel/core@7.26.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      node-fetch:
+        specifier: ^3.2.8
+        version: 3.3.2
+      npm-run-all:
+        specifier: ^4.1.5
+        version: 4.1.5
+      prisma:
+        specifier: '5.17'
+        version: 5.17.0
+      react:
+        specifier: ^18.2.0
+        version: 18.3.1
+      react-basics:
+        specifier: ^0.125.0
+        version: 0.125.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      react-beautiful-dnd:
+        specifier: ^13.1.0
+        version: 13.1.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      react-dom:
+        specifier: ^18.2.0
+        version: 18.3.1(react@18.3.1)
+      react-error-boundary:
+        specifier: ^4.0.4
+        version: 4.1.2(react@18.3.1)
+      react-intl:
+        specifier: ^6.5.5
+        version: 6.8.4(react@18.3.1)(typescript@5.6.3)
+      react-simple-maps:
+        specifier: ^2.3.0
+        version: 2.3.0(prop-types@15.8.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      react-use-measure:
+        specifier: ^2.0.4
+        version: 2.1.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      react-window:
+        specifier: ^1.8.6
+        version: 1.8.10(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      request-ip:
+        specifier: ^3.3.0
+        version: 3.3.0
+      semver:
+        specifier: ^7.5.4
+        version: 7.6.3
+      thenby:
+        specifier: ^1.3.4
+        version: 1.3.4
+      uuid:
+        specifier: ^9.0.0
+        version: 9.0.1
+      yup:
+        specifier: ^0.32.11
+        version: 0.32.11
+      zustand:
+        specifier: ^4.5.5
+        version: 4.5.5(@types/react@18.3.12)(immer@9.0.21)(react@18.3.1)
+    devDependencies:
+      '@formatjs/cli':
+        specifier: ^4.2.29
+        version: 4.8.4(ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3))
+      '@netlify/plugin-nextjs':
+        specifier: ^5.1.0
+        version: 5.8.1
+      '@rollup/plugin-alias':
+        specifier: ^5.0.0
+        version: 5.1.1(rollup@3.29.5)
+      '@rollup/plugin-commonjs':
+        specifier: ^25.0.4
+        version: 25.0.8(rollup@3.29.5)
+      '@rollup/plugin-json':
+        specifier: ^6.0.0
+        version: 6.1.0(rollup@3.29.5)
+      '@rollup/plugin-node-resolve':
+        specifier: ^15.2.0
+        version: 15.3.0(rollup@3.29.5)
+      '@rollup/plugin-replace':
+        specifier: ^5.0.2
+        version: 5.0.7(rollup@3.29.5)
+      '@svgr/rollup':
+        specifier: ^8.1.0
+        version: 8.1.0(rollup@3.29.5)(typescript@5.6.3)
+      '@svgr/webpack':
+        specifier: ^8.1.0
+        version: 8.1.0(typescript@5.6.3)
+      '@types/cypress':
+        specifier: ^1.1.3
+        version: 1.1.6
+      '@types/jest':
+        specifier: ^29.5.12
+        version: 29.5.14
+      '@types/node':
+        specifier: ^20.9.0
+        version: 20.17.1
+      '@types/react':
+        specifier: ^18.2.41
+        version: 18.3.12
+      '@types/react-dom':
+        specifier: ^18.2.17
+        version: 18.3.1
+      '@types/react-window':
+        specifier: ^1.8.8
+        version: 1.8.8
+      '@typescript-eslint/eslint-plugin':
+        specifier: ^6.7.3
+        version: 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1)(typescript@5.6.3)
+      '@typescript-eslint/parser':
+        specifier: ^6.7.3
+        version: 6.21.0(eslint@8.57.1)(typescript@5.6.3)
+      cross-env:
+        specifier: ^7.0.3
+        version: 7.0.3
+      cypress:
+        specifier: ^13.6.6
+        version: 13.15.1
+      esbuild:
+        specifier: ^0.17.17
+        version: 0.17.19
+      eslint:
+        specifier: ^8.33.0
+        version: 8.57.1
+      eslint-config-next:
+        specifier: ^14.0.4
+        version: 14.2.16(eslint@8.57.1)(typescript@5.6.3)
+      eslint-config-prettier:
+        specifier: ^8.5.0
+        version: 8.10.0(eslint@8.57.1)
+      eslint-import-resolver-alias:
+        specifier: ^1.1.2
+        version: 1.1.2(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))
+      eslint-plugin-css-modules:
+        specifier: ^2.12.0
+        version: 2.12.0(eslint@8.57.1)
+      eslint-plugin-cypress:
+        specifier: ^2.15.1
+        version: 2.15.2(eslint@8.57.1)
+      eslint-plugin-import:
+        specifier: ^2.29.1
+        version: 2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
+      eslint-plugin-jest:
+        specifier: ^27.9.0
+        version: 27.9.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3)
+      eslint-plugin-prettier:
+        specifier: ^4.0.0
+        version: 4.2.1(eslint-config-prettier@8.10.0(eslint@8.57.1))(eslint@8.57.1)(prettier@2.8.8)
+      extract-react-intl-messages:
+        specifier: ^4.1.1
+        version: 4.1.1(ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3))
+      husky:
+        specifier: ^8.0.3
+        version: 8.0.3
+      jest:
+        specifier: ^29.7.0
+        version: 29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3))
+      lint-staged:
+        specifier: ^14.0.1
+        version: 14.0.1(enquirer@2.4.1)
+      postcss:
+        specifier: ^8.4.31
+        version: 8.4.47
+      postcss-flexbugs-fixes:
+        specifier: ^5.0.2
+        version: 5.0.2(postcss@8.4.47)
+      postcss-import:
+        specifier: ^15.1.0
+        version: 15.1.0(postcss@8.4.47)
+      postcss-preset-env:
+        specifier: 7.8.3
+        version: 7.8.3(postcss@8.4.47)
+      postcss-rtlcss:
+        specifier: ^4.0.1
+        version: 4.0.9(postcss@8.4.47)
+      prettier:
+        specifier: ^2.6.2
+        version: 2.8.8
+      prompts:
+        specifier: 2.4.2
+        version: 2.4.2
+      rollup:
+        specifier: ^3.28.0
+        version: 3.29.5
+      rollup-plugin-copy:
+        specifier: ^3.4.0
+        version: 3.5.0
+      rollup-plugin-delete:
+        specifier: ^2.0.0
+        version: 2.1.0(rollup@3.29.5)
+      rollup-plugin-dts:
+        specifier: ^5.3.1
+        version: 5.3.1(rollup@3.29.5)(typescript@5.6.3)
+      rollup-plugin-esbuild:
+        specifier: ^5.0.0
+        version: 5.0.0(esbuild@0.17.19)(rollup@3.29.5)
+      rollup-plugin-node-externals:
+        specifier: ^6.1.1
+        version: 6.1.2(rollup@3.29.5)
+      rollup-plugin-postcss:
+        specifier: ^4.0.2
+        version: 4.0.2(postcss@8.4.47)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3))
+      rollup-plugin-terser:
+        specifier: ^7.0.2
+        version: 7.0.2(rollup@3.29.5)
+      stylelint:
+        specifier: ^15.10.1
+        version: 15.11.0(typescript@5.6.3)
+      stylelint-config-css-modules:
+        specifier: ^4.4.0
+        version: 4.4.0(stylelint@15.11.0(typescript@5.6.3))
+      stylelint-config-prettier:
+        specifier: ^9.0.3
+        version: 9.0.5(stylelint@15.11.0(typescript@5.6.3))
+      stylelint-config-recommended:
+        specifier: ^14.0.0
+        version: 14.0.1(stylelint@15.11.0(typescript@5.6.3))
+      tar:
+        specifier: ^6.1.2
+        version: 6.2.1
+      ts-jest:
+        specifier: ^29.1.2
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3)
+      ts-node:
+        specifier: ^10.9.1
+        version: 10.9.2(@types/node@20.17.1)(typescript@5.6.3)
+      typescript:
+        specifier: ^5.5.3
+        version: 5.6.3
+
+packages:
+
+  '@ampproject/remapping@2.3.0':
+    resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==}
+    engines: {node: '>=6.0.0'}
+
+  '@babel/code-frame@7.26.0':
+    resolution: {integrity: sha512-INCKxTtbXtcNbUZ3YXutwMpEleqttcswhAdee7dhuoVrD2cnuc3PqtERBtxkX5nziX9vnBL8WXmSGwv8CuPV6g==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/compat-data@7.26.0':
+    resolution: {integrity: sha512-qETICbZSLe7uXv9VE8T/RWOdIE5qqyTucOt4zLYMafj2MRO271VGgLd4RACJMeBO37UPWhXiKMBk7YlJ0fOzQA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/core@7.26.0':
+    resolution: {integrity: sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/generator@7.26.0':
+    resolution: {integrity: sha512-/AIkAmInnWwgEAJGQr9vY0c66Mj6kjkE2ZPB1PurTRaRAh3U+J45sAQMjQDJdh4WbR3l0x5xkimXBKyBXXAu2w==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-annotate-as-pure@7.25.9':
+    resolution: {integrity: sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-builder-binary-assignment-operator-visitor@7.25.9':
+    resolution: {integrity: sha512-C47lC7LIDCnz0h4vai/tpNOI95tCd5ZT3iBt/DBH5lXKHZsyNQv18yf1wIIg2ntiQNgmAvA+DgZ82iW8Qdym8g==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-compilation-targets@7.25.9':
+    resolution: {integrity: sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-create-class-features-plugin@7.25.9':
+    resolution: {integrity: sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-create-regexp-features-plugin@7.25.9':
+    resolution: {integrity: sha512-ORPNZ3h6ZRkOyAa/SaHU+XsLZr0UQzRwuDQ0cczIA17nAzZ+85G5cVkOJIj7QavLZGSe8QXUmNFxSZzjcZF9bw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-define-polyfill-provider@0.6.2':
+    resolution: {integrity: sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
+
+  '@babel/helper-member-expression-to-functions@7.25.9':
+    resolution: {integrity: sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-module-imports@7.25.9':
+    resolution: {integrity: sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-module-transforms@7.26.0':
+    resolution: {integrity: sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-optimise-call-expression@7.25.9':
+    resolution: {integrity: sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-plugin-utils@7.25.9':
+    resolution: {integrity: sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-remap-async-to-generator@7.25.9':
+    resolution: {integrity: sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-replace-supers@7.25.9':
+    resolution: {integrity: sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-simple-access@7.25.9':
+    resolution: {integrity: sha512-c6WHXuiaRsJTyHYLJV75t9IqsmTbItYfdj99PnzYGQZkYKvan5/2jKJ7gu31J3/BJ/A18grImSPModuyG/Eo0Q==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-skip-transparent-expression-wrappers@7.25.9':
+    resolution: {integrity: sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-string-parser@7.25.9':
+    resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-validator-identifier@7.25.9':
+    resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-validator-option@7.25.9':
+    resolution: {integrity: sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-wrap-function@7.25.9':
+    resolution: {integrity: sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helpers@7.26.0':
+    resolution: {integrity: sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/parser@7.26.0':
+    resolution: {integrity: sha512-aP8x5pIw3xvYr/sXT+SEUwyhrXT8rUJRZltK/qN3Db80dcKpTett8cJxHyjk+xYSVXvNnl2SfcJVjbwxpOSscA==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
+  '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.9':
+    resolution: {integrity: sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.25.9':
+    resolution: {integrity: sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.25.9':
+    resolution: {integrity: sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.25.9':
+    resolution: {integrity: sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.13.0
+
+  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.25.9':
+    resolution: {integrity: sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2':
+    resolution: {integrity: sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-async-generators@7.8.4':
+    resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-bigint@7.8.3':
+    resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-class-properties@7.12.13':
+    resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-class-static-block@7.14.5':
+    resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-import-assertions@7.26.0':
+    resolution: {integrity: sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-import-attributes@7.26.0':
+    resolution: {integrity: sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-import-meta@7.10.4':
+    resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-json-strings@7.8.3':
+    resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-jsx@7.25.9':
+    resolution: {integrity: sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-logical-assignment-operators@7.10.4':
+    resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3':
+    resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-numeric-separator@7.10.4':
+    resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-object-rest-spread@7.8.3':
+    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-optional-catch-binding@7.8.3':
+    resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-optional-chaining@7.8.3':
+    resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-private-property-in-object@7.14.5':
+    resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-top-level-await@7.14.5':
+    resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-typescript@7.25.9':
+    resolution: {integrity: sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-unicode-sets-regex@7.18.6':
+    resolution: {integrity: sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-transform-arrow-functions@7.25.9':
+    resolution: {integrity: sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-async-generator-functions@7.25.9':
+    resolution: {integrity: sha512-RXV6QAzTBbhDMO9fWwOmwwTuYaiPbggWQ9INdZqAYeSHyG7FzQ+nOZaUUjNwKv9pV3aE4WFqFm1Hnbci5tBCAw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-async-to-generator@7.25.9':
+    resolution: {integrity: sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-block-scoped-functions@7.25.9':
+    resolution: {integrity: sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-block-scoping@7.25.9':
+    resolution: {integrity: sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-class-properties@7.25.9':
+    resolution: {integrity: sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-class-static-block@7.26.0':
+    resolution: {integrity: sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.12.0
+
+  '@babel/plugin-transform-classes@7.25.9':
+    resolution: {integrity: sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-computed-properties@7.25.9':
+    resolution: {integrity: sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-destructuring@7.25.9':
+    resolution: {integrity: sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-dotall-regex@7.25.9':
+    resolution: {integrity: sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-duplicate-keys@7.25.9':
+    resolution: {integrity: sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.25.9':
+    resolution: {integrity: sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-transform-dynamic-import@7.25.9':
+    resolution: {integrity: sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-exponentiation-operator@7.25.9':
+    resolution: {integrity: sha512-KRhdhlVk2nObA5AYa7QMgTMTVJdfHprfpAk4DjZVtllqRg9qarilstTKEhpVjyt+Npi8ThRyiV8176Am3CodPA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-export-namespace-from@7.25.9':
+    resolution: {integrity: sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-for-of@7.25.9':
+    resolution: {integrity: sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-function-name@7.25.9':
+    resolution: {integrity: sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-json-strings@7.25.9':
+    resolution: {integrity: sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-literals@7.25.9':
+    resolution: {integrity: sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-logical-assignment-operators@7.25.9':
+    resolution: {integrity: sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-member-expression-literals@7.25.9':
+    resolution: {integrity: sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-modules-amd@7.25.9':
+    resolution: {integrity: sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-modules-commonjs@7.25.9':
+    resolution: {integrity: sha512-dwh2Ol1jWwL2MgkCzUSOvfmKElqQcuswAZypBSUsScMXvgdT8Ekq5YA6TtqpTVWH+4903NmboMuH1o9i8Rxlyg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-modules-systemjs@7.25.9':
+    resolution: {integrity: sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-modules-umd@7.25.9':
+    resolution: {integrity: sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-named-capturing-groups-regex@7.25.9':
+    resolution: {integrity: sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-transform-new-target@7.25.9':
+    resolution: {integrity: sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-nullish-coalescing-operator@7.25.9':
+    resolution: {integrity: sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-numeric-separator@7.25.9':
+    resolution: {integrity: sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-object-rest-spread@7.25.9':
+    resolution: {integrity: sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-object-super@7.25.9':
+    resolution: {integrity: sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-optional-catch-binding@7.25.9':
+    resolution: {integrity: sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-optional-chaining@7.25.9':
+    resolution: {integrity: sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-parameters@7.25.9':
+    resolution: {integrity: sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-private-methods@7.25.9':
+    resolution: {integrity: sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-private-property-in-object@7.25.9':
+    resolution: {integrity: sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-property-literals@7.25.9':
+    resolution: {integrity: sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-react-constant-elements@7.25.9':
+    resolution: {integrity: sha512-Ncw2JFsJVuvfRsa2lSHiC55kETQVLSnsYGQ1JDDwkUeWGTL/8Tom8aLTnlqgoeuopWrbbGndrc9AlLYrIosrow==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-react-display-name@7.25.9':
+    resolution: {integrity: sha512-KJfMlYIUxQB1CJfO3e0+h0ZHWOTLCPP115Awhaz8U0Zpq36Gl/cXlpoyMRnUWlhNUBAzldnCiAZNvCDj7CrKxQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-react-jsx-development@7.25.9':
+    resolution: {integrity: sha512-9mj6rm7XVYs4mdLIpbZnHOYdpW42uoiBCTVowg7sP1thUOiANgMb4UtpRivR0pp5iL+ocvUv7X4mZgFRpJEzGw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-react-jsx@7.25.9':
+    resolution: {integrity: sha512-s5XwpQYCqGerXl+Pu6VDL3x0j2d82eiV77UJ8a2mDHAW7j9SWRqQ2y1fNo1Z74CdcYipl5Z41zvjj4Nfzq36rw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-react-pure-annotations@7.25.9':
+    resolution: {integrity: sha512-KQ/Takk3T8Qzj5TppkS1be588lkbTp5uj7w6a0LeQaTMSckU/wK0oJ/pih+T690tkgI5jfmg2TqDJvd41Sj1Cg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-regenerator@7.25.9':
+    resolution: {integrity: sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-regexp-modifiers@7.26.0':
+    resolution: {integrity: sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-transform-reserved-words@7.25.9':
+    resolution: {integrity: sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-shorthand-properties@7.25.9':
+    resolution: {integrity: sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-spread@7.25.9':
+    resolution: {integrity: sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-sticky-regex@7.25.9':
+    resolution: {integrity: sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-template-literals@7.25.9':
+    resolution: {integrity: sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-typeof-symbol@7.25.9':
+    resolution: {integrity: sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-typescript@7.25.9':
+    resolution: {integrity: sha512-7PbZQZP50tzv2KGGnhh82GSyMB01yKY9scIjf1a+GfZCtInOWqUH5+1EBU4t9fyR5Oykkkc9vFTs4OHrhHXljQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-unicode-escapes@7.25.9':
+    resolution: {integrity: sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-unicode-property-regex@7.25.9':
+    resolution: {integrity: sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-unicode-regex@7.25.9':
+    resolution: {integrity: sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-unicode-sets-regex@7.25.9':
+    resolution: {integrity: sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/preset-env@7.26.0':
+    resolution: {integrity: sha512-H84Fxq0CQJNdPFT2DrfnylZ3cf5K43rGfWK4LJGPpjKHiZlk0/RzwEus3PDDZZg+/Er7lCA03MVacueUuXdzfw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/preset-modules@0.1.6-no-external-plugins':
+    resolution: {integrity: sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0 || ^8.0.0-0 <8.0.0
+
+  '@babel/preset-react@7.25.9':
+    resolution: {integrity: sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/preset-typescript@7.26.0':
+    resolution: {integrity: sha512-NMk1IGZ5I/oHhoXEElcm+xUnL/szL6xflkFZmoEU9xj1qSJXpiS7rsspYo92B4DRCDvZn2erT5LdsCeXAKNCkg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/runtime@7.26.0':
+    resolution: {integrity: sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/template@7.25.9':
+    resolution: {integrity: sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/traverse@7.25.9':
+    resolution: {integrity: sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/types@7.26.0':
+    resolution: {integrity: sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==}
+    engines: {node: '>=6.9.0'}
+
+  '@bcoe/v8-coverage@0.2.3':
+    resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
+
+  '@clickhouse/client-common@1.7.0':
+    resolution: {integrity: sha512-RkHYf23/wyv/6C0KcVD4nRX4JAn/Y+9AZBQPlrSId2JwXsmAnjDkkKpuPLwZPNVH6J3BkW+y8bQCEk3VHQzArw==}
+
+  '@clickhouse/client@1.7.0':
+    resolution: {integrity: sha512-2aESIFRbSPWEZIU++sXt1RYWgEKZH75C3jyXLcRBeafMDjq7bKV2AX1X9n9xscN+Y4VvnkBzkjFxcbuqFSBk6w==}
+    engines: {node: '>=16'}
+
+  '@colors/colors@1.5.0':
+    resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==}
+    engines: {node: '>=0.1.90'}
+
+  '@cspotcode/source-map-support@0.8.1':
+    resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
+    engines: {node: '>=12'}
+
+  '@csstools/css-parser-algorithms@2.7.1':
+    resolution: {integrity: sha512-2SJS42gxmACHgikc1WGesXLIT8d/q2l0UFM7TaEeIzdFCE/FPMtTiizcPGGJtlPo2xuQzY09OhrLTzRxqJqwGw==}
+    engines: {node: ^14 || ^16 || >=18}
+    peerDependencies:
+      '@csstools/css-tokenizer': ^2.4.1
+
+  '@csstools/css-tokenizer@2.4.1':
+    resolution: {integrity: sha512-eQ9DIktFJBhGjioABJRtUucoWR2mwllurfnM8LuNGAqX3ViZXaUchqk+1s7jjtkFiT9ySdACsFEA3etErkALUg==}
+    engines: {node: ^14 || ^16 || >=18}
+
+  '@csstools/media-query-list-parser@2.1.13':
+    resolution: {integrity: sha512-XaHr+16KRU9Gf8XLi3q8kDlI18d5vzKSKCY510Vrtc9iNR0NJzbY9hhTmwhzYZj/ZwGL4VmB3TA9hJW0Um2qFA==}
+    engines: {node: ^14 || ^16 || >=18}
+    peerDependencies:
+      '@csstools/css-parser-algorithms': ^2.7.1
+      '@csstools/css-tokenizer': ^2.4.1
+
+  '@csstools/postcss-cascade-layers@1.1.1':
+    resolution: {integrity: sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  '@csstools/postcss-color-function@1.1.1':
+    resolution: {integrity: sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  '@csstools/postcss-font-format-keywords@1.0.1':
+    resolution: {integrity: sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  '@csstools/postcss-hwb-function@1.0.2':
+    resolution: {integrity: sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  '@csstools/postcss-ic-unit@1.0.1':
+    resolution: {integrity: sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  '@csstools/postcss-is-pseudo-class@2.0.7':
+    resolution: {integrity: sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  '@csstools/postcss-nested-calc@1.0.0':
+    resolution: {integrity: sha512-JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  '@csstools/postcss-normalize-display-values@1.0.1':
+    resolution: {integrity: sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  '@csstools/postcss-oklab-function@1.1.1':
+    resolution: {integrity: sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  '@csstools/postcss-progressive-custom-properties@1.3.0':
+    resolution: {integrity: sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.3
+
+  '@csstools/postcss-stepped-value-functions@1.0.1':
+    resolution: {integrity: sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  '@csstools/postcss-text-decoration-shorthand@1.0.0':
+    resolution: {integrity: sha512-c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  '@csstools/postcss-trigonometric-functions@1.0.2':
+    resolution: {integrity: sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==}
+    engines: {node: ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  '@csstools/postcss-unset-value@1.0.2':
+    resolution: {integrity: sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  '@csstools/selector-specificity@2.2.0':
+    resolution: {integrity: sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==}
+    engines: {node: ^14 || ^16 || >=18}
+    peerDependencies:
+      postcss-selector-parser: ^6.0.10
+
+  '@csstools/selector-specificity@3.1.1':
+    resolution: {integrity: sha512-a7cxGcJ2wIlMFLlh8z2ONm+715QkPHiyJcxwQlKOz/03GPw1COpfhcmC9wm4xlZfp//jWHNNMwzjtqHXVWU9KA==}
+    engines: {node: ^14 || ^16 || >=18}
+    peerDependencies:
+      postcss-selector-parser: ^6.0.13
+
+  '@cypress/request@3.0.5':
+    resolution: {integrity: sha512-v+XHd9XmWbufxF1/bTaVm2yhbxY+TB4YtWRqF2zaXBlDNMkls34KiATz0AVDLavL3iB6bQk9/7n3oY1EoLSWGA==}
+    engines: {node: '>= 6'}
+
+  '@cypress/xvfb@1.2.4':
+    resolution: {integrity: sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==}
+
+  '@date-fns/utc@1.2.0':
+    resolution: {integrity: sha512-YLq+crMPJiBmIdkRmv9nZuZy1mVtMlDcUKlg4mvI0UsC/dZeIaGoGB5p/C4FrpeOhZ7zBTK03T58S0DFkRNMnw==}
+
+  '@dicebear/adventurer-neutral@9.2.2':
+    resolution: {integrity: sha512-XVAjhUWjav6luTZ7txz8zVJU/H0DiUy4uU1Z7IO5MDO6kWvum+If1+0OUgEWYZwM+RDI7rt2CgVP910DyZGd1w==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/adventurer@9.2.2':
+    resolution: {integrity: sha512-WjBXCP9EXbUul2zC3BS2/R3/4diw1uh/lU4jTEnujK1mhqwIwanFboIMzQsasNNL/xf+m3OHN7MUNJfHZ1fLZA==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/avataaars-neutral@9.2.2':
+    resolution: {integrity: sha512-pRj16P27dFDBI3LtdiHUDwIXIGndHAbZf5AxaMkn6/+0X93mVQ/btVJDXyW0G96WCsyC88wKAWr6/KJotPxU6Q==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/avataaars@9.2.2':
+    resolution: {integrity: sha512-WqJPQEt0OhBybTpI0TqU1uD1pSk9M2+VPIwvBye/dXo46b+0jHGpftmxjQwk6tX8z0+mRko8pwV5n+cWht1/+w==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/big-ears-neutral@9.2.2':
+    resolution: {integrity: sha512-IPHt8fi3dv9cyfBJBZ4s8T+PhFCrQvOCf91iRHBT3iOLNPdyZpI5GNLmGiV0XMAvIDP5NvA5+f6wdoBLhYhbDA==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/big-ears@9.2.2':
+    resolution: {integrity: sha512-hz4UXdPq4qqZpu0YVvlqM4RDFhk5i0WgPcuwj/MOLlgTjuj63uHUhCQSk6ZiW1DQOs12qpwUBMGWVHxBRBas9g==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/big-smile@9.2.2':
+    resolution: {integrity: sha512-D4td0GL8or1nTNnXvZqkEXlzyqzGPWs3znOnm1HIohtFTeIwXm72Ob2lNDsaQJSJvXmVlwaQQ0CCTvyCl8Stjw==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/bottts-neutral@9.2.2':
+    resolution: {integrity: sha512-lSgpqmSJtlnyxVuUgNdBwyzuA0O9xa5zRJtz7x2KyWbicXir5iYdX0MVMCkp1EDvlcxm9rGJsclktugOyakTlw==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/bottts@9.2.2':
+    resolution: {integrity: sha512-wugFkzw8JNWV1nftq/Wp/vmQsLAXDxrMtRK3AoMODuUpSVoP3EHRUfKS043xggOsQFvoj0HZ7kadmhn0AMLf5A==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/collection@9.2.2':
+    resolution: {integrity: sha512-vZAmXhPWCK3sf8Fj9/QflFC6XOLroJOT5K1HdnzHaPboEvffUQideGCrrEamnJtlH0iF0ZDXh8gqmwy2fu+yHA==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/core@9.2.2':
+    resolution: {integrity: sha512-ROhgHG249dPtcXgBHcqPEsDeAPRPRD/9d+tZCjLYyueO+cXDlIA8dUlxpwIVcOuZFvCyW6RJtqo8BhNAi16pIQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@dicebear/croodles-neutral@9.2.2':
+    resolution: {integrity: sha512-/4mNirxoQ+z1kHXnpDRbJ1JV1ZgXogeTeNp0MaFYxocCgHfJ7ckNM23EE1I7akoo9pqPxrKlaeNzGAjKHdS9vA==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/croodles@9.2.2':
+    resolution: {integrity: sha512-OzvAXQWsOgMwL3Sl+lBxCubqSOWoBJpC78c4TKnNTS21rR63TtXUyVdLLzgKVN4YHRnvMgtPf8F/W9YAgIDK4w==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/dylan@9.2.2':
+    resolution: {integrity: sha512-s7e3XliC1YXP+Wykj+j5kwdOWFRXFzYHYk/PB4oZ1F3sJandXiG0HS4chaNu4EoP0yZgKyFMUVTGZx+o6tMaYg==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/fun-emoji@9.2.2':
+    resolution: {integrity: sha512-M+rYTpB3lfwz18f+/i+ggNwNWUoEj58SJqXJ1wr7Jh/4E5uL+NmJg9JGwYNaVtGbCFrKAjSaILNUWGQSFgMfog==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/glass@9.2.2':
+    resolution: {integrity: sha512-imCMxcg+XScHYtQq2MUv1lCzhQSCUglMlPSezKEpXhTxgbgUpmGlSGVkOfmX5EEc7SQowKkF1W/1gNk6CXvBaQ==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/icons@9.2.2':
+    resolution: {integrity: sha512-Tqq2OVCdS7J02DNw58xwlgLGl40sWEckbqXT3qRvIF63FfVq+wQZBGuhuiyAURcSgvsc3h2oQeYFi9iXh7HTOA==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/identicon@9.2.2':
+    resolution: {integrity: sha512-POVKFulIrcuZf3rdAgxYaSm2XUg/TJg3tg9zq9150reEGPpzWR7ijyJ03dzAADPzS3DExfdYVT9+z3JKwwJnTQ==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/initials@9.2.2':
+    resolution: {integrity: sha512-/xNnsEmsstWjmF77htAOuwOMhFlP6eBVXgcgFlTl/CCH/Oc6H7t0vwX1he8KLQBBzjGpvJcvIAn4Wh9rE4D5/A==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/lorelei-neutral@9.2.2':
+    resolution: {integrity: sha512-Eys9Os6nt2Xll7Mvu66CfRR2YggTopWcmFcRZ9pPdohS96kT0MsLI2iTcfZXQ51K8hvT3IbwoGc86W8n0cDxAQ==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/lorelei@9.2.2':
+    resolution: {integrity: sha512-koXqVr/vcWUPo00VP5H6Czsit+uF1tmwd2NK7Q/e34/9Sd1f4QLLxHjjBNm/iNjCI1+UNTOvZ2Qqu0N5eo7Flw==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/micah@9.2.2':
+    resolution: {integrity: sha512-NCajcJV5yw8uMKiACp694w1T/UyYme2CUEzyTzWHgWnQ+drAuCcH8gpAoLWd67viNdQB/MTpNlaelUgTjmI4AQ==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/miniavs@9.2.2':
+    resolution: {integrity: sha512-vvkWXttdw+KHF3j+9qcUFzK+P0nbNnImGjvN48wwkPIh2h08WWFq0MnoOls4IHwUJC4GXBjWtiyVoCxz6hhtOA==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/notionists-neutral@9.2.2':
+    resolution: {integrity: sha512-AhOzk+lz6kB4uxGun8AJhV+W1nttnMlxmxd+5KbQ/txCIziYIaeD3il44wsAGegEpGFvAZyMYtR/jjfHcem3TA==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/notionists@9.2.2':
+    resolution: {integrity: sha512-Z9orRaHoj7Y9Ap4wEu8XOrFACsG1KbbBQUPV1R50uh6AHwsyNrm4cS84ICoGLvxgLNHHOae3YCjd8aMu2z19zg==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/open-peeps@9.2.2':
+    resolution: {integrity: sha512-6PeQDHYyjvKrGSl/gP+RE5dSYAQGKpcGnM65HorgyTIugZK7STo0W4hvEycedupZ3MCCEH8x/XyiChKM2sHXog==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/personas@9.2.2':
+    resolution: {integrity: sha512-705+ObNLC0w1fcgE/Utav+8bqO+Esu53TXegpX5j7trGEoIMf2bThqJGHuhknZ3+T2az3Wr89cGyOGlI0KLzLA==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/pixel-art-neutral@9.2.2':
+    resolution: {integrity: sha512-CdUY77H6Aj7dKLW3hdkv7tu0XQJArUjaWoXihQxlhl3oVYplWaoyu9omYy5pl8HTqs8YgVTGljjMXYoFuK0JUw==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/pixel-art@9.2.2':
+    resolution: {integrity: sha512-BvbFdrpzQl04+Y9UsWP63YGug+ENGC7GMG88qbEFWxb/IqRavGa4H3D0T4Zl2PSLiw7f2Ctv98bsCQZ1PtCznQ==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/rings@9.2.2':
+    resolution: {integrity: sha512-eD1J1k364Arny+UlvGrk12HP/XGG6WxPSm4BarFqdJGSV45XOZlwqoi7FlcMr9r9yvE/nGL8OizbwMYusEEdjw==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/shapes@9.2.2':
+    resolution: {integrity: sha512-e741NNWBa7fg0BjomxXa0fFPME2XCIR0FA+VHdq9AD2taTGHEPsg5x1QJhCRdK6ww85yeu3V3ucpZXdSrHVw5Q==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@dicebear/thumbs@9.2.2':
+    resolution: {integrity: sha512-FkPLDNu7n5kThLSk7lR/0cz/NkUqgGdZGfLZv6fLkGNGtv6W+e2vZaO7HCXVwIgJ+II+kImN41zVIZ6Jlll7pQ==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@dicebear/core': ^9.0.0
+
+  '@esbuild/android-arm64@0.17.19':
+    resolution: {integrity: sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+
+  '@esbuild/android-arm@0.17.19':
+    resolution: {integrity: sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [android]
+
+  '@esbuild/android-x64@0.17.19':
+    resolution: {integrity: sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+
+  '@esbuild/darwin-arm64@0.17.19':
+    resolution: {integrity: sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@esbuild/darwin-x64@0.17.19':
+    resolution: {integrity: sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@esbuild/freebsd-arm64@0.17.19':
+    resolution: {integrity: sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@esbuild/freebsd-x64@0.17.19':
+    resolution: {integrity: sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@esbuild/linux-arm64@0.17.19':
+    resolution: {integrity: sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@esbuild/linux-arm@0.17.19':
+    resolution: {integrity: sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+
+  '@esbuild/linux-ia32@0.17.19':
+    resolution: {integrity: sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+
+  '@esbuild/linux-loong64@0.17.19':
+    resolution: {integrity: sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==}
+    engines: {node: '>=12'}
+    cpu: [loong64]
+    os: [linux]
+
+  '@esbuild/linux-mips64el@0.17.19':
+    resolution: {integrity: sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+
+  '@esbuild/linux-ppc64@0.17.19':
+    resolution: {integrity: sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@esbuild/linux-riscv64@0.17.19':
+    resolution: {integrity: sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@esbuild/linux-s390x@0.17.19':
+    resolution: {integrity: sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+
+  '@esbuild/linux-x64@0.17.19':
+    resolution: {integrity: sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+
+  '@esbuild/netbsd-x64@0.17.19':
+    resolution: {integrity: sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+
+  '@esbuild/openbsd-x64@0.17.19':
+    resolution: {integrity: sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+
+  '@esbuild/sunos-x64@0.17.19':
+    resolution: {integrity: sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+
+  '@esbuild/win32-arm64@0.17.19':
+    resolution: {integrity: sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@esbuild/win32-ia32@0.17.19':
+    resolution: {integrity: sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@esbuild/win32-x64@0.17.19':
+    resolution: {integrity: sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+
+  '@eslint-community/eslint-utils@4.4.0':
+    resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+
+  '@eslint-community/regexpp@4.11.1':
+    resolution: {integrity: sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==}
+    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
+
+  '@eslint/eslintrc@2.1.4':
+    resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  '@eslint/js@8.57.1':
+    resolution: {integrity: sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  '@fontsource/inter@4.5.15':
+    resolution: {integrity: sha512-FzleM9AxZQK2nqsTDtBiY0PMEVWvnKnuu2i09+p6DHvrHsuucoV2j0tmw+kAT3L4hvsLdAIDv6MdGehsPIdT+Q==}
+
+  '@formatjs/cli@4.8.4':
+    resolution: {integrity: sha512-zZI8QYVl5CHaT6j9OHjS+0mMnWzopBVH0un4n5b4IhIJRzIKnxwFTkxBp5Ifqj6FntrwzIGqP+D6v8u7MPYsmw==}
+    hasBin: true
+
+  '@formatjs/ecma402-abstract@1.11.4':
+    resolution: {integrity: sha512-EBikYFp2JCdIfGEb5G9dyCkTGDmC57KSHhRQOC3aYxoPWVZvfWCDjZwkGYHN7Lis/fmuWl906bnNTJifDQ3sXw==}
+
+  '@formatjs/ecma402-abstract@1.4.0':
+    resolution: {integrity: sha512-Mv027hcLFjE45K8UJ8PjRpdDGfR0aManEFj1KzoN8zXNveHGEygpZGfFf/FTTMl+QEVSrPAUlyxaCApvmv47AQ==}
+
+  '@formatjs/ecma402-abstract@1.5.0':
+    resolution: {integrity: sha512-wXv36yo+mfWllweN0Fq7sUs7PUiNopn7I0JpLTe3hGu6ZMR4CV7LqK1llhB18pndwpKoafQKb1et2DCJAOW20Q==}
+
+  '@formatjs/ecma402-abstract@2.2.1':
+    resolution: {integrity: sha512-O4ywpkdJybrjFc9zyL8qK5aklleIAi5O4nYhBVJaOFtCkNrnU+lKFeJOFC48zpsZQmR8Aok2V79hGpHnzbmFpg==}
+
+  '@formatjs/fast-memoize@2.2.2':
+    resolution: {integrity: sha512-mzxZcS0g1pOzwZTslJOBTmLzDXseMLLvnh25ymRilCm8QLMObsQ7x/rj9GNrH0iUhZMlFisVOD6J1n6WQqpKPQ==}
+
+  '@formatjs/icu-messageformat-parser@2.1.0':
+    resolution: {integrity: sha512-Qxv/lmCN6hKpBSss2uQ8IROVnta2r9jd3ymUEIjm2UyIkUCHVcbUVRGL/KS/wv7876edvsPe+hjHVJ4z8YuVaw==}
+
+  '@formatjs/icu-messageformat-parser@2.9.1':
+    resolution: {integrity: sha512-7AYk4tjnLi5wBkxst2w7qFj38JLMJoqzj7BhdEl7oTlsWMlqwgx4p9oMmmvpXWTSDGNwOKBRc1SfwMh5MOHeNg==}
+
+  '@formatjs/icu-skeleton-parser@1.3.6':
+    resolution: {integrity: sha512-I96mOxvml/YLrwU2Txnd4klA7V8fRhb6JG/4hm3VMNmeJo1F03IpV2L3wWt7EweqNLES59SZ4d6hVOPCSf80Bg==}
+
+  '@formatjs/icu-skeleton-parser@1.8.5':
+    resolution: {integrity: sha512-zRZ/e3B5qY2+JCLs7puTzWS1Jb+t/K+8Jur/gEZpA2EjWeLDE17nsx8thyo9P48Mno7UmafnPupV2NCJXX17Dg==}
+
+  '@formatjs/intl-displaynames@6.8.1':
+    resolution: {integrity: sha512-nyWfJk4BZ1+GzLq9a40BgVPSRpBkRAVzrSpql+92i0i+lX11m9eS1trSRf/h3j/XcQ+h1h+ntA4Ra4jETK7nNg==}
+
+  '@formatjs/intl-listformat@7.7.1':
+    resolution: {integrity: sha512-bjBxWaUhYAbJFUlFSMWZGn3r2mglXwk+BLyGRu8dY8Q83ZPsqmmVQzjQKENHE3lV6eoQGHT2oZHxUaVndJlk6Q==}
+
+  '@formatjs/intl-localematcher@0.2.25':
+    resolution: {integrity: sha512-YmLcX70BxoSopLFdLr1Ds99NdlTI2oWoLbaUW2M406lxOIPzE1KQhRz2fPUkq34xVZQaihCoU29h0KK7An3bhA==}
+
+  '@formatjs/intl-localematcher@0.5.6':
+    resolution: {integrity: sha512-roz1+Ba5e23AHX6KUAWmLEyTRZegM5YDuxuvkHCyK3RJddf/UXB2f+s7pOMm9ktfPGla0g+mQXOn5vsuYirnaA==}
+
+  '@formatjs/intl-numberformat@5.7.6':
+    resolution: {integrity: sha512-ZlZfYtvbVHYZY5OG3RXizoCwxKxEKOrzEe2YOw9wbzoxF3PmFn0SAgojCFGLyNXkkR6xVxlylhbuOPf1dkIVNg==}
+
+  '@formatjs/intl@2.10.11':
+    resolution: {integrity: sha512-FNLZjzE1QRlv1Wf0oinnM97AbvZU1zQnQMHI0Oza2F7PxzrPf6bYFRs0ugapq/O4FrvNwDt9F9nyRNwsMM118g==}
+    peerDependencies:
+      typescript: ^4.7 || 5
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@formatjs/ts-transformer@2.13.0':
+    resolution: {integrity: sha512-mu7sHXZk1NWZrQ3eUqugpSYo8x5/tXkrI4uIbFqCEC0eNgQaIcoKgVeDFgDAcgG+cEme2atAUYSFF+DFWC4org==}
+    peerDependencies:
+      ts-jest: ^26.4.0
+    peerDependenciesMeta:
+      ts-jest:
+        optional: true
+
+  '@formatjs/ts-transformer@3.9.4':
+    resolution: {integrity: sha512-S5q/zsTodaKtxVxNvbRQ9APenJtm5smXE76usS+5yF2vWQdZHkagmOKWfgvfIbesP4SR2B+i3koqlnlpqSIp5w==}
+    peerDependencies:
+      ts-jest: '27'
+    peerDependenciesMeta:
+      ts-jest:
+        optional: true
+
+  '@humanwhocodes/config-array@0.13.0':
+    resolution: {integrity: sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==}
+    engines: {node: '>=10.10.0'}
+    deprecated: Use @eslint/config-array instead
+
+  '@humanwhocodes/module-importer@1.0.1':
+    resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
+    engines: {node: '>=12.22'}
+
+  '@humanwhocodes/object-schema@2.0.3':
+    resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==}
+    deprecated: Use @eslint/object-schema instead
+
+  '@isaacs/cliui@8.0.2':
+    resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}
+    engines: {node: '>=12'}
+
+  '@istanbuljs/load-nyc-config@1.1.0':
+    resolution: {integrity: sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==}
+    engines: {node: '>=8'}
+
+  '@istanbuljs/schema@0.1.3':
+    resolution: {integrity: sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==}
+    engines: {node: '>=8'}
+
+  '@jest/console@29.7.0':
+    resolution: {integrity: sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/core@29.7.0':
+    resolution: {integrity: sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    peerDependencies:
+      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+    peerDependenciesMeta:
+      node-notifier:
+        optional: true
+
+  '@jest/environment@29.7.0':
+    resolution: {integrity: sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/expect-utils@29.7.0':
+    resolution: {integrity: sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/expect@29.7.0':
+    resolution: {integrity: sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/fake-timers@29.7.0':
+    resolution: {integrity: sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/globals@29.7.0':
+    resolution: {integrity: sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/reporters@29.7.0':
+    resolution: {integrity: sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    peerDependencies:
+      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+    peerDependenciesMeta:
+      node-notifier:
+        optional: true
+
+  '@jest/schemas@29.6.3':
+    resolution: {integrity: sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/source-map@29.6.3':
+    resolution: {integrity: sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/test-result@29.7.0':
+    resolution: {integrity: sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/test-sequencer@29.7.0':
+    resolution: {integrity: sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/transform@29.7.0':
+    resolution: {integrity: sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/types@29.6.3':
+    resolution: {integrity: sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jridgewell/gen-mapping@0.3.5':
+    resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==}
+    engines: {node: '>=6.0.0'}
+
+  '@jridgewell/resolve-uri@3.1.2':
+    resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}
+    engines: {node: '>=6.0.0'}
+
+  '@jridgewell/set-array@1.2.1':
+    resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==}
+    engines: {node: '>=6.0.0'}
+
+  '@jridgewell/source-map@0.3.6':
+    resolution: {integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==}
+
+  '@jridgewell/sourcemap-codec@1.5.0':
+    resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==}
+
+  '@jridgewell/trace-mapping@0.3.25':
+    resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
+
+  '@jridgewell/trace-mapping@0.3.9':
+    resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==}
+
+  '@kurkle/color@0.3.2':
+    resolution: {integrity: sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==}
+
+  '@netlify/plugin-nextjs@5.8.1':
+    resolution: {integrity: sha512-WB1N0FslhWZ1yAVYTcB6CcFrFOUSQ0O2LfavYZrbAypeNxu2I+oO+cgmhfDgZ8Eoq1g4EMeoIGMkNoZ4ogZTsg==}
+    engines: {node: '>=18.0.0'}
+
+  '@next/env@14.2.10':
+    resolution: {integrity: sha512-dZIu93Bf5LUtluBXIv4woQw2cZVZ2DJTjax5/5DOs3lzEOeKLy7GxRSr4caK9/SCPdaW6bCgpye6+n4Dh9oJPw==}
+
+  '@next/eslint-plugin-next@14.2.16':
+    resolution: {integrity: sha512-noORwKUMkKc96MWjTOwrsUCjky0oFegHbeJ1yEnQBGbMHAaTEIgLZIIfsYF0x3a06PiS+2TXppfifR+O6VWslg==}
+
+  '@next/swc-darwin-arm64@14.2.10':
+    resolution: {integrity: sha512-V3z10NV+cvMAfxQUMhKgfQnPbjw+Ew3cnr64b0lr8MDiBJs3eLnM6RpGC46nhfMZsiXgQngCJKWGTC/yDcgrDQ==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@next/swc-darwin-x64@14.2.10':
+    resolution: {integrity: sha512-Y0TC+FXbFUQ2MQgimJ/7Ina2mXIKhE7F+GUe1SgnzRmwFY3hX2z8nyVCxE82I2RicspdkZnSWMn4oTjIKz4uzA==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@next/swc-linux-arm64-gnu@14.2.10':
+    resolution: {integrity: sha512-ZfQ7yOy5zyskSj9rFpa0Yd7gkrBnJTkYVSya95hX3zeBG9E55Z6OTNPn1j2BTFWvOVVj65C3T+qsjOyVI9DQpA==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@next/swc-linux-arm64-musl@14.2.10':
+    resolution: {integrity: sha512-n2i5o3y2jpBfXFRxDREr342BGIQCJbdAUi/K4q6Env3aSx8erM9VuKXHw5KNROK9ejFSPf0LhoSkU/ZiNdacpQ==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@next/swc-linux-x64-gnu@14.2.10':
+    resolution: {integrity: sha512-GXvajAWh2woTT0GKEDlkVhFNxhJS/XdDmrVHrPOA83pLzlGPQnixqxD8u3bBB9oATBKB//5e4vpACnx5Vaxdqg==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+
+  '@next/swc-linux-x64-musl@14.2.10':
+    resolution: {integrity: sha512-opFFN5B0SnO+HTz4Wq4HaylXGFV+iHrVxd3YvREUX9K+xfc4ePbRrxqOuPOFjtSuiVouwe6uLeDtabjEIbkmDA==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+
+  '@next/swc-win32-arm64-msvc@14.2.10':
+    resolution: {integrity: sha512-9NUzZuR8WiXTvv+EiU/MXdcQ1XUvFixbLIMNQiVHuzs7ZIFrJDLJDaOF1KaqttoTujpcxljM/RNAOmw1GhPPQQ==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@next/swc-win32-ia32-msvc@14.2.10':
+    resolution: {integrity: sha512-fr3aEbSd1GeW3YUMBkWAu4hcdjZ6g4NBl1uku4gAn661tcxd1bHs1THWYzdsbTRLcCKLjrDZlNp6j2HTfrw+Bg==}
+    engines: {node: '>= 10'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@next/swc-win32-x64-msvc@14.2.10':
+    resolution: {integrity: sha512-UjeVoRGKNL2zfbcQ6fscmgjBAS/inHBh63mjIlfPg/NG8Yn2ztqylXt5qilYb6hoHIwaU2ogHknHWWmahJjgZQ==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [win32]
+
+  '@nodelib/fs.scandir@2.1.5':
+    resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
+    engines: {node: '>= 8'}
+
+  '@nodelib/fs.stat@2.0.5':
+    resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
+    engines: {node: '>= 8'}
+
+  '@nodelib/fs.walk@1.2.8':
+    resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
+    engines: {node: '>= 8'}
+
+  '@nolyfill/is-core-module@1.0.39':
+    resolution: {integrity: sha512-nn5ozdjYQpUCZlWGuxcJY/KpxkWQs4DcbMCmKojjyrYDEAGy4Ce19NN4v5MduafTwJlbKc99UA8YhSVqq9yPZA==}
+    engines: {node: '>=12.4.0'}
+
+  '@pkgjs/parseargs@0.11.0':
+    resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
+    engines: {node: '>=14'}
+
+  '@prisma/client@5.17.0':
+    resolution: {integrity: sha512-N2tnyKayT0Zf7mHjwEyE8iG7FwTmXDHFZ1GnNhQp0pJUObsuel4ZZ1XwfuAYkq5mRIiC/Kot0kt0tGCfLJ70Jw==}
+    engines: {node: '>=16.13'}
+    peerDependencies:
+      prisma: '*'
+    peerDependenciesMeta:
+      prisma:
+        optional: true
+
+  '@prisma/debug@5.17.0':
+    resolution: {integrity: sha512-l7+AteR3P8FXiYyo496zkuoiJ5r9jLQEdUuxIxNCN1ud8rdbH3GTxm+f+dCyaSv9l9WY+29L9czaVRXz9mULfg==}
+
+  '@prisma/engines-version@5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053':
+    resolution: {integrity: sha512-tUuxZZysZDcrk5oaNOdrBnnkoTtmNQPkzINFDjz7eG6vcs9AVDmA/F6K5Plsb2aQc/l5M2EnFqn3htng9FA4hg==}
+
+  '@prisma/engines@5.17.0':
+    resolution: {integrity: sha512-+r+Nf+JP210Jur+/X8SIPLtz+uW9YA4QO5IXA+KcSOBe/shT47bCcRMTYCbOESw3FFYFTwe7vU6KTWHKPiwvtg==}
+
+  '@prisma/extension-read-replicas@0.3.0':
+    resolution: {integrity: sha512-F9+rSmYday6GT2qjhJtkZcBOpLO5LtpvFcMGqrBDHf+78LEdSuxfFjOxYlNuqk4B+th62yxpbhfpmB9/Mca14Q==}
+    peerDependencies:
+      '@prisma/client': ^5.2.0
+
+  '@prisma/fetch-engine@5.17.0':
+    resolution: {integrity: sha512-ESxiOaHuC488ilLPnrv/tM2KrPhQB5TRris/IeIV4ZvUuKeaicCl4Xj/JCQeG9IlxqOgf1cCg5h5vAzlewN91Q==}
+
+  '@prisma/get-platform@5.17.0':
+    resolution: {integrity: sha512-UlDgbRozCP1rfJ5Tlkf3Cnftb6srGrEQ4Nm3og+1Se2gWmCZ0hmPIi+tQikGDUVLlvOWx3Gyi9LzgRP+HTXV9w==}
+
+  '@react-spring/animated@9.7.5':
+    resolution: {integrity: sha512-Tqrwz7pIlsSDITzxoLS3n/v/YCUHQdOIKtOJf4yL6kYVSDTSmVK1LI1Q3M/uu2Sx4X3pIWF3xLUhlsA6SPNTNg==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+
+  '@react-spring/core@9.7.5':
+    resolution: {integrity: sha512-rmEqcxRcu7dWh7MnCcMXLvrf6/SDlSokLaLTxiPlAYi11nN3B5oiCUAblO72o+9z/87j2uzxa2Inm8UbLjXA+w==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+
+  '@react-spring/rafz@9.7.5':
+    resolution: {integrity: sha512-5ZenDQMC48wjUzPAm1EtwQ5Ot3bLIAwwqP2w2owG5KoNdNHpEJV263nGhCeKKmuA3vG2zLLOdu3or6kuDjA6Aw==}
+
+  '@react-spring/shared@9.7.5':
+    resolution: {integrity: sha512-wdtoJrhUeeyD/PP/zo+np2s1Z820Ohr/BbuVYv+3dVLW7WctoiN7std8rISoYoHpUXtbkpesSKuPIw/6U1w1Pw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+
+  '@react-spring/types@9.7.5':
+    resolution: {integrity: sha512-HVj7LrZ4ReHWBimBvu2SKND3cDVUPWKLqRTmWe/fNY6o1owGOX0cAHbdPDTMelgBlVbrTKrre6lFkhqGZErK/g==}
+
+  '@react-spring/web@9.7.5':
+    resolution: {integrity: sha512-lmvqGwpe+CSttsWNZVr+Dg62adtKhauGwLyGE/RRyZ8AAMLgb9x3NDMA5RMElXo+IMyTkPp7nxTB8ZQlmhb6JQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+
+  '@redis/bloom@1.2.0':
+    resolution: {integrity: sha512-HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg==}
+    peerDependencies:
+      '@redis/client': ^1.0.0
+
+  '@redis/client@1.6.0':
+    resolution: {integrity: sha512-aR0uffYI700OEEH4gYnitAnv3vzVGXCFvYfdpu/CJKvk4pHfLPEy/JSZyrpQ+15WhXe1yJRXLtfQ84s4mEXnPg==}
+    engines: {node: '>=14'}
+
+  '@redis/graph@1.1.1':
+    resolution: {integrity: sha512-FEMTcTHZozZciLRl6GiiIB4zGm5z5F3F6a6FZCyrfxdKOhFlGkiAqlexWMBzCi4DcRoyiOsuLfW+cjlGWyExOw==}
+    peerDependencies:
+      '@redis/client': ^1.0.0
+
+  '@redis/json@1.0.7':
+    resolution: {integrity: sha512-6UyXfjVaTBTJtKNG4/9Z8PSpKE6XgSyEb8iwaqDcy+uKrd/DGYHTWkUdnQDyzm727V7p21WUMhsqz5oy65kPcQ==}
+    peerDependencies:
+      '@redis/client': ^1.0.0
+
+  '@redis/search@1.2.0':
+    resolution: {integrity: sha512-tYoDBbtqOVigEDMAcTGsRlMycIIjwMCgD8eR2t0NANeQmgK/lvxNAvYyb6bZDD4frHRhIHkJu2TBRvB0ERkOmw==}
+    peerDependencies:
+      '@redis/client': ^1.0.0
+
+  '@redis/time-series@1.1.0':
+    resolution: {integrity: sha512-c1Q99M5ljsIuc4YdaCwfUEXsofakb9c8+Zse2qxTadu8TalLXuAESzLvFAvNVbkmSlvlzIQOLpBCmWI9wTOt+g==}
+    peerDependencies:
+      '@redis/client': ^1.0.0
+
+  '@rollup/plugin-alias@5.1.1':
+    resolution: {integrity: sha512-PR9zDb+rOzkRb2VD+EuKB7UC41vU5DIwZ5qqCpk0KJudcWAyi8rvYOhS7+L5aZCspw1stTViLgN5v6FF1p5cgQ==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
+    peerDependenciesMeta:
+      rollup:
+        optional: true
+
+  '@rollup/plugin-commonjs@25.0.8':
+    resolution: {integrity: sha512-ZEZWTK5n6Qde0to4vS9Mr5x/0UZoqCxPVR9KRUjU4kA2sO7GEUn1fop0DAwpO6z0Nw/kJON9bDmSxdWxO/TT1A==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      rollup: ^2.68.0||^3.0.0||^4.0.0
+    peerDependenciesMeta:
+      rollup:
+        optional: true
+
+  '@rollup/plugin-json@6.1.0':
+    resolution: {integrity: sha512-EGI2te5ENk1coGeADSIwZ7G2Q8CJS2sF120T7jLw4xFw9n7wIOXHo+kIYRAoVpJAN+kmqZSoO3Fp4JtoNF4ReA==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
+    peerDependenciesMeta:
+      rollup:
+        optional: true
+
+  '@rollup/plugin-node-resolve@15.3.0':
+    resolution: {integrity: sha512-9eO5McEICxMzJpDW9OnMYSv4Sta3hmt7VtBFz5zR9273suNOydOyq/FrGeGy+KsTRFm8w0SLVhzig2ILFT63Ag==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      rollup: ^2.78.0||^3.0.0||^4.0.0
+    peerDependenciesMeta:
+      rollup:
+        optional: true
+
+  '@rollup/plugin-replace@5.0.7':
+    resolution: {integrity: sha512-PqxSfuorkHz/SPpyngLyg5GCEkOcee9M1bkxiVDr41Pd61mqP1PLOoDPbpl44SB2mQGKwV/In74gqQmGITOhEQ==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
+    peerDependenciesMeta:
+      rollup:
+        optional: true
+
+  '@rollup/pluginutils@5.1.3':
+    resolution: {integrity: sha512-Pnsb6f32CD2W3uCaLZIzDmeFyQ2b8UWMFI7xtwUezpcGBDVDW6y9XgAWIlARiGAo6eNF5FK5aQTr0LFyNyqq5A==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
+    peerDependenciesMeta:
+      rollup:
+        optional: true
+
+  '@rtsao/scc@1.1.0':
+    resolution: {integrity: sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==}
+
+  '@rushstack/eslint-patch@1.10.4':
+    resolution: {integrity: sha512-WJgX9nzTqknM393q1QJDJmoW28kUfEnybeTfVNcNAPnIx210RXm2DiXiHzfNPJNIUUb1tJnz/l4QGtJ30PgWmA==}
+
+  '@sinclair/typebox@0.27.8':
+    resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==}
+
+  '@sinonjs/commons@3.0.1':
+    resolution: {integrity: sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==}
+
+  '@sinonjs/fake-timers@10.3.0':
+    resolution: {integrity: sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==}
+
+  '@svgr/babel-plugin-add-jsx-attribute@8.0.0':
+    resolution: {integrity: sha512-b9MIk7yhdS1pMCZM8VeNfUlSKVRhsHZNMl5O9SfaX0l0t5wjdgu4IDzGB8bpnGBBOjGST3rRFVsaaEtI4W6f7g==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@svgr/babel-plugin-remove-jsx-attribute@8.0.0':
+    resolution: {integrity: sha512-BcCkm/STipKvbCl6b7QFrMh/vx00vIP63k2eM66MfHJzPr6O2U0jYEViXkHJWqXqQYjdeA9cuCl5KWmlwjDvbA==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@svgr/babel-plugin-remove-jsx-empty-expression@8.0.0':
+    resolution: {integrity: sha512-5BcGCBfBxB5+XSDSWnhTThfI9jcO5f0Ai2V24gZpG+wXF14BzwxxdDb4g6trdOux0rhibGs385BeFMSmxtS3uA==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@svgr/babel-plugin-replace-jsx-attribute-value@8.0.0':
+    resolution: {integrity: sha512-KVQ+PtIjb1BuYT3ht8M5KbzWBhdAjjUPdlMtpuw/VjT8coTrItWX6Qafl9+ji831JaJcu6PJNKCV0bp01lBNzQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@svgr/babel-plugin-svg-dynamic-title@8.0.0':
+    resolution: {integrity: sha512-omNiKqwjNmOQJ2v6ge4SErBbkooV2aAWwaPFs2vUY7p7GhVkzRkJ00kILXQvRhA6miHnNpXv7MRnnSjdRjK8og==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@svgr/babel-plugin-svg-em-dimensions@8.0.0':
+    resolution: {integrity: sha512-mURHYnu6Iw3UBTbhGwE/vsngtCIbHE43xCRK7kCw4t01xyGqb2Pd+WXekRRoFOBIY29ZoOhUCTEweDMdrjfi9g==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@svgr/babel-plugin-transform-react-native-svg@8.1.0':
+    resolution: {integrity: sha512-Tx8T58CHo+7nwJ+EhUwx3LfdNSG9R2OKfaIXXs5soiy5HtgoAEkDay9LIimLOcG8dJQH1wPZp/cnAv6S9CrR1Q==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@svgr/babel-plugin-transform-svg-component@8.0.0':
+    resolution: {integrity: sha512-DFx8xa3cZXTdb/k3kfPeaixecQLgKh5NVBMwD0AQxOzcZawK4oo1Jh9LbrcACUivsCA7TLG8eeWgrDXjTMhRmw==}
+    engines: {node: '>=12'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@svgr/babel-preset@8.1.0':
+    resolution: {integrity: sha512-7EYDbHE7MxHpv4sxvnVPngw5fuR6pw79SkcrILHJ/iMpuKySNCl5W1qcwPEpU+LgyRXOaAFgH0KhwD18wwg6ug==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@svgr/core@8.1.0':
+    resolution: {integrity: sha512-8QqtOQT5ACVlmsvKOJNEaWmRPmcojMOzCz4Hs2BGG/toAp/K38LcsMRyLp349glq5AzJbCEeimEoxaX6v/fLrA==}
+    engines: {node: '>=14'}
+
+  '@svgr/hast-util-to-babel-ast@8.0.0':
+    resolution: {integrity: sha512-EbDKwO9GpfWP4jN9sGdYwPBU0kdomaPIL2Eu4YwmgP+sJeXT+L7bMwJUBnhzfH8Q2qMBqZ4fJwpCyYsAN3mt2Q==}
+    engines: {node: '>=14'}
+
+  '@svgr/plugin-jsx@8.1.0':
+    resolution: {integrity: sha512-0xiIyBsLlr8quN+WyuxooNW9RJ0Dpr8uOnH/xrCVO8GLUcwHISwj1AG0k+LFzteTkAA0GbX0kj9q6Dk70PTiPA==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@svgr/core': '*'
+
+  '@svgr/plugin-svgo@8.1.0':
+    resolution: {integrity: sha512-Ywtl837OGO9pTLIN/onoWLmDQ4zFUycI1g76vuKGEz6evR/ZTJlJuz3G/fIkb6OVBJ2g0o6CGJzaEjfmEo3AHA==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@svgr/core': '*'
+
+  '@svgr/rollup@8.1.0':
+    resolution: {integrity: sha512-0XR1poYvPQoPpmfDYLEqUGu5ePAQ4pdgN3VFsZBNAeze7qubVpsIY1o1R6PZpKep/DKu33GSm2NhwpCLkMs2Cw==}
+    engines: {node: '>=14'}
+
+  '@svgr/webpack@8.1.0':
+    resolution: {integrity: sha512-LnhVjMWyMQV9ZmeEy26maJk+8HTIbd59cH4F2MJ439k9DqejRisfFNGAPvRYlKETuh9LrImlS8aKsBgKjMA8WA==}
+    engines: {node: '>=14'}
+
+  '@swc/counter@0.1.3':
+    resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==}
+
+  '@swc/helpers@0.5.5':
+    resolution: {integrity: sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==}
+
+  '@tanstack/query-core@5.59.16':
+    resolution: {integrity: sha512-crHn+G3ltqb5JG0oUv6q+PMz1m1YkjpASrXTU+sYWW9pLk0t2GybUHNRqYPZWhxgjPaVGC4yp92gSFEJgYEsPw==}
+
+  '@tanstack/react-query@5.59.16':
+    resolution: {integrity: sha512-MuyWheG47h6ERd4PKQ6V8gDyBu3ThNG22e1fRVwvq6ap3EqsFhyuxCAwhNP/03m/mLg+DAb0upgbPaX6VB+CkQ==}
+    peerDependencies:
+      react: ^18 || ^19
+
+  '@trysound/sax@0.2.0':
+    resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
+    engines: {node: '>=10.13.0'}
+
+  '@tsconfig/node10@1.0.11':
+    resolution: {integrity: sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==}
+
+  '@tsconfig/node12@1.0.11':
+    resolution: {integrity: sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==}
+
+  '@tsconfig/node14@1.0.3':
+    resolution: {integrity: sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==}
+
+  '@tsconfig/node16@1.0.4':
+    resolution: {integrity: sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==}
+
+  '@types/babel__core@7.20.5':
+    resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==}
+
+  '@types/babel__generator@7.6.8':
+    resolution: {integrity: sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==}
+
+  '@types/babel__template@7.4.4':
+    resolution: {integrity: sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==}
+
+  '@types/babel__traverse@7.20.6':
+    resolution: {integrity: sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==}
+
+  '@types/cypress@1.1.6':
+    resolution: {integrity: sha512-CfeLLD3+6vIWe2AO5hR63f1c8EbRzrp/j1ExubAwOTpwZFZvF3Nm9cOPQiUwzNmAUmZuhO0QVH98Qlujni6nPw==}
+    deprecated: This is a stub types definition. cypress provides its own type definitions, so you do not need this installed.
+
+  '@types/estree@0.0.50':
+    resolution: {integrity: sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==}
+
+  '@types/estree@1.0.6':
+    resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==}
+
+  '@types/fs-extra@8.1.5':
+    resolution: {integrity: sha512-0dzKcwO+S8s2kuF5Z9oUWatQJj5Uq/iqphEtE3GQJVRRYm/tD1LglU2UnXi2A8jLq5umkGouOXOR9y0n613ZwQ==}
+
+  '@types/fs-extra@9.0.13':
+    resolution: {integrity: sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==}
+
+  '@types/glob@7.2.0':
+    resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==}
+
+  '@types/graceful-fs@4.1.9':
+    resolution: {integrity: sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==}
+
+  '@types/hoist-non-react-statics@3.3.5':
+    resolution: {integrity: sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==}
+
+  '@types/istanbul-lib-coverage@2.0.6':
+    resolution: {integrity: sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==}
+
+  '@types/istanbul-lib-report@3.0.3':
+    resolution: {integrity: sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==}
+
+  '@types/istanbul-reports@3.0.4':
+    resolution: {integrity: sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==}
+
+  '@types/jest@29.5.14':
+    resolution: {integrity: sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==}
+
+  '@types/json-schema@7.0.15':
+    resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
+
+  '@types/json-stable-stringify@1.1.0':
+    resolution: {integrity: sha512-ESTsHWB72QQq+pjUFIbEz9uSCZppD31YrVkbt2rnUciTYEvcwN6uZIhX5JZeBHqRlFJ41x/7MewCs7E2Qux6Cg==}
+
+  '@types/json5@0.0.29':
+    resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
+
+  '@types/lodash@4.17.12':
+    resolution: {integrity: sha512-sviUmCE8AYdaF/KIHLDJBQgeYzPBI0vf/17NaYehBJfYD1j6/L95Slh07NlyK2iNyBNaEkb3En2jRt+a8y3xZQ==}
+
+  '@types/minimatch@5.1.2':
+    resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==}
+
+  '@types/minimist@1.2.5':
+    resolution: {integrity: sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==}
+
+  '@types/node@14.18.63':
+    resolution: {integrity: sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==}
+
+  '@types/node@20.17.1':
+    resolution: {integrity: sha512-j2VlPv1NnwPJbaCNv69FO/1z4lId0QmGvpT41YxitRtWlg96g/j8qcv2RKsLKe2F6OJgyXhupN1Xo17b2m139Q==}
+
+  '@types/normalize-package-data@2.4.4':
+    resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==}
+
+  '@types/prop-types@15.7.13':
+    resolution: {integrity: sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA==}
+
+  '@types/react-dom@18.3.1':
+    resolution: {integrity: sha512-qW1Mfv8taImTthu4KoXgDfLuk4bydU6Q/TkADnDWWHwi4NX4BR+LWfTp2sVmTqRrsHvyDDTelgelxJ+SsejKKQ==}
+
+  '@types/react-redux@7.1.34':
+    resolution: {integrity: sha512-GdFaVjEbYv4Fthm2ZLvj1VSCedV7TqE5y1kNwnjSdBOTXuRSgowux6J8TAct15T3CKBr63UMk+2CO7ilRhyrAQ==}
+
+  '@types/react-window@1.8.8':
+    resolution: {integrity: sha512-8Ls660bHR1AUA2kuRvVG9D/4XpRC6wjAaPT9dil7Ckc76eP9TKWZwwmgfq8Q1LANX3QNDnoU4Zp48A3w+zK69Q==}
+
+  '@types/react@18.3.12':
+    resolution: {integrity: sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==}
+
+  '@types/resolve@1.20.2':
+    resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==}
+
+  '@types/schema-utils@2.4.0':
+    resolution: {integrity: sha512-454hrj5gz/FXcUE20ygfEiN4DxZ1sprUo0V1gqIqkNZ/CzoEzAZEll2uxMsuyz6BYjiQan4Aa65xbTemfzW9hQ==}
+    deprecated: This is a stub types definition. schema-utils provides its own type definitions, so you do not need this installed.
+
+  '@types/semver@7.5.8':
+    resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==}
+
+  '@types/sinonjs__fake-timers@8.1.1':
+    resolution: {integrity: sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==}
+
+  '@types/sizzle@2.3.9':
+    resolution: {integrity: sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==}
+
+  '@types/stack-utils@2.0.3':
+    resolution: {integrity: sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==}
+
+  '@types/yargs-parser@21.0.3':
+    resolution: {integrity: sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==}
+
+  '@types/yargs@17.0.33':
+    resolution: {integrity: sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==}
+
+  '@types/yauzl@2.10.3':
+    resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==}
+
+  '@typescript-eslint/eslint-plugin@6.21.0':
+    resolution: {integrity: sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    peerDependencies:
+      '@typescript-eslint/parser': ^6.0.0 || ^6.0.0-alpha
+      eslint: ^7.0.0 || ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/parser@6.21.0':
+    resolution: {integrity: sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    peerDependencies:
+      eslint: ^7.0.0 || ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/scope-manager@5.62.0':
+    resolution: {integrity: sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  '@typescript-eslint/scope-manager@6.21.0':
+    resolution: {integrity: sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+
+  '@typescript-eslint/type-utils@6.21.0':
+    resolution: {integrity: sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    peerDependencies:
+      eslint: ^7.0.0 || ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/types@5.62.0':
+    resolution: {integrity: sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  '@typescript-eslint/types@6.21.0':
+    resolution: {integrity: sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+
+  '@typescript-eslint/typescript-estree@5.62.0':
+    resolution: {integrity: sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/typescript-estree@6.21.0':
+    resolution: {integrity: sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/utils@5.62.0':
+    resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+
+  '@typescript-eslint/utils@6.21.0':
+    resolution: {integrity: sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    peerDependencies:
+      eslint: ^7.0.0 || ^8.0.0
+
+  '@typescript-eslint/visitor-keys@5.62.0':
+    resolution: {integrity: sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  '@typescript-eslint/visitor-keys@6.21.0':
+    resolution: {integrity: sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+
+  '@umami/prisma-client@0.14.0':
+    resolution: {integrity: sha512-62aAE5s5m/M1T88JIvOyZk2LzQIJ/iEeF57ewd/qKKNZdgXfP1aib+IAQ74db85vq6TwFyHMaXBeXztNNby5Fw==}
+    peerDependencies:
+      '@prisma/client': ^4.8.0
+      '@prisma/extension-read-replicas': ^0.3.0
+
+  '@umami/redis-client@0.21.0':
+    resolution: {integrity: sha512-PpdJunvT4sAsVWIeEl+cHU6iSV2r/Df9dof2gdUwSigfD88ACsVs1/BvlWERxk/T93rTgVJWSpLvdw/oMYvkcw==}
+
+  '@ungap/structured-clone@1.2.0':
+    resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
+
+  '@vue/compiler-core@3.5.12':
+    resolution: {integrity: sha512-ISyBTRMmMYagUxhcpyEH0hpXRd/KqDU4ymofPgl2XAkY9ZhQ+h0ovEZJIiPop13UmR/54oA2cgMDjgroRelaEw==}
+
+  '@vue/compiler-dom@3.5.12':
+    resolution: {integrity: sha512-9G6PbJ03uwxLHKQ3P42cMTi85lDRvGLB2rSGOiQqtXELat6uI4n8cNz9yjfVHRPIu+MsK6TE418Giruvgptckg==}
+
+  '@vue/compiler-sfc@3.5.12':
+    resolution: {integrity: sha512-2k973OGo2JuAa5+ZlekuQJtitI5CgLMOwgl94BzMCsKZCX/xiqzJYzapl4opFogKHqwJk34vfsaKpfEhd1k5nw==}
+
+  '@vue/compiler-ssr@3.5.12':
+    resolution: {integrity: sha512-eLwc7v6bfGBSM7wZOGPmRavSWzNFF6+PdRhE+VFJhNCgHiF8AM7ccoqcv5kBXA2eWUfigD7byekvf/JsOfKvPA==}
+
+  '@vue/reactivity@3.5.12':
+    resolution: {integrity: sha512-UzaN3Da7xnJXdz4Okb/BGbAaomRHc3RdoWqTzlvd9+WBR5m3J39J1fGcHes7U3za0ruYn/iYy/a1euhMEHvTAg==}
+
+  '@vue/runtime-core@3.5.12':
+    resolution: {integrity: sha512-hrMUYV6tpocr3TL3Ad8DqxOdpDe4zuQY4HPY3X/VRh+L2myQO8MFXPAMarIOSGNu0bFAjh1yBkMPXZBqCk62Uw==}
+
+  '@vue/runtime-dom@3.5.12':
+    resolution: {integrity: sha512-q8VFxR9A2MRfBr6/55Q3umyoN7ya836FzRXajPB6/Vvuv0zOPL+qltd9rIMzG/DbRLAIlREmnLsplEF/kotXKA==}
+
+  '@vue/server-renderer@3.5.12':
+    resolution: {integrity: sha512-I3QoeDDeEPZm8yR28JtY+rk880Oqmj43hreIBVTicisFTx/Dl7JpG72g/X7YF8hnQD3IFhkky5i2bPonwrTVPg==}
+    peerDependencies:
+      vue: 3.5.12
+
+  '@vue/shared@3.5.12':
+    resolution: {integrity: sha512-L2RPSAwUFbgZH20etwrXyVyCBu9OxRSi8T/38QsvnkJyvq2LufW2lDCOzm7t/U9C1mkhJGWYfCuFBCmIuNivrg==}
+
+  acorn-jsx@5.3.2:
+    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
+    peerDependencies:
+      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
+
+  acorn-walk@8.3.4:
+    resolution: {integrity: sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==}
+    engines: {node: '>=0.4.0'}
+
+  acorn@8.13.0:
+    resolution: {integrity: sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
+  aggregate-error@3.1.0:
+    resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==}
+    engines: {node: '>=8'}
+
+  ajv-keywords@3.5.2:
+    resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==}
+    peerDependencies:
+      ajv: ^6.9.1
+
+  ajv@6.12.6:
+    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
+
+  ajv@8.17.1:
+    resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==}
+
+  ansi-colors@4.1.3:
+    resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==}
+    engines: {node: '>=6'}
+
+  ansi-escapes@4.3.2:
+    resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==}
+    engines: {node: '>=8'}
+
+  ansi-escapes@5.0.0:
+    resolution: {integrity: sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==}
+    engines: {node: '>=12'}
+
+  ansi-regex@5.0.1:
+    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
+    engines: {node: '>=8'}
+
+  ansi-regex@6.1.0:
+    resolution: {integrity: sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==}
+    engines: {node: '>=12'}
+
+  ansi-styles@3.2.1:
+    resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
+    engines: {node: '>=4'}
+
+  ansi-styles@4.3.0:
+    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
+    engines: {node: '>=8'}
+
+  ansi-styles@5.2.0:
+    resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==}
+    engines: {node: '>=10'}
+
+  ansi-styles@6.2.1:
+    resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==}
+    engines: {node: '>=12'}
+
+  anymatch@3.1.3:
+    resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==}
+    engines: {node: '>= 8'}
+
+  arch@2.2.0:
+    resolution: {integrity: sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==}
+
+  arg@4.1.3:
+    resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==}
+
+  argparse@1.0.10:
+    resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
+
+  argparse@2.0.1:
+    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
+
+  aria-query@5.3.2:
+    resolution: {integrity: sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==}
+    engines: {node: '>= 0.4'}
+
+  array-buffer-byte-length@1.0.1:
+    resolution: {integrity: sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==}
+    engines: {node: '>= 0.4'}
+
+  array-find-index@1.0.2:
+    resolution: {integrity: sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==}
+    engines: {node: '>=0.10.0'}
+
+  array-includes@3.1.8:
+    resolution: {integrity: sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==}
+    engines: {node: '>= 0.4'}
+
+  array-union@2.1.0:
+    resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
+    engines: {node: '>=8'}
+
+  array.prototype.findlast@1.2.5:
+    resolution: {integrity: sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.findlastindex@1.2.5:
+    resolution: {integrity: sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.flat@1.3.2:
+    resolution: {integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.flatmap@1.3.2:
+    resolution: {integrity: sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.tosorted@1.1.4:
+    resolution: {integrity: sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==}
+    engines: {node: '>= 0.4'}
+
+  arraybuffer.prototype.slice@1.0.3:
+    resolution: {integrity: sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==}
+    engines: {node: '>= 0.4'}
+
+  arrify@1.0.1:
+    resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==}
+    engines: {node: '>=0.10.0'}
+
+  asn1@0.2.6:
+    resolution: {integrity: sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==}
+
+  assert-plus@1.0.0:
+    resolution: {integrity: sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==}
+    engines: {node: '>=0.8'}
+
+  ast-types-flow@0.0.8:
+    resolution: {integrity: sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==}
+
+  astral-regex@2.0.0:
+    resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
+    engines: {node: '>=8'}
+
+  async@3.2.6:
+    resolution: {integrity: sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==}
+
+  asynckit@0.4.0:
+    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
+
+  at-least-node@1.0.0:
+    resolution: {integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==}
+    engines: {node: '>= 4.0.0'}
+
+  autoprefixer@10.4.20:
+    resolution: {integrity: sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==}
+    engines: {node: ^10 || ^12 || >=14}
+    hasBin: true
+    peerDependencies:
+      postcss: ^8.1.0
+
+  available-typed-arrays@1.0.7:
+    resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
+    engines: {node: '>= 0.4'}
+
+  aws-sign2@0.7.0:
+    resolution: {integrity: sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==}
+
+  aws4@1.13.2:
+    resolution: {integrity: sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==}
+
+  axe-core@4.10.2:
+    resolution: {integrity: sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==}
+    engines: {node: '>=4'}
+
+  axobject-query@4.1.0:
+    resolution: {integrity: sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==}
+    engines: {node: '>= 0.4'}
+
+  babel-jest@29.7.0:
+    resolution: {integrity: sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    peerDependencies:
+      '@babel/core': ^7.8.0
+
+  babel-plugin-istanbul@6.1.1:
+    resolution: {integrity: sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==}
+    engines: {node: '>=8'}
+
+  babel-plugin-jest-hoist@29.6.3:
+    resolution: {integrity: sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  babel-plugin-polyfill-corejs2@0.4.11:
+    resolution: {integrity: sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
+
+  babel-plugin-polyfill-corejs3@0.10.6:
+    resolution: {integrity: sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
+
+  babel-plugin-polyfill-regenerator@0.6.2:
+    resolution: {integrity: sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
+
+  babel-plugin-react-intl@7.9.4:
+    resolution: {integrity: sha512-cMKrHEXrw43yT4M89Wbgq8A8N8lffSquj1Piwov/HVukR7jwOw8gf9btXNsQhT27ccyqEwy+M286JQYy0jby2g==}
+    deprecated: this package has been renamed to babel-plugin-formatjs
+
+  babel-preset-current-node-syntax@1.1.0:
+    resolution: {integrity: sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  babel-preset-jest@29.6.3:
+    resolution: {integrity: sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  balanced-match@1.0.2:
+    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
+
+  balanced-match@2.0.0:
+    resolution: {integrity: sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==}
+
+  base64-js@1.5.1:
+    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
+
+  bcrypt-pbkdf@1.0.2:
+    resolution: {integrity: sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==}
+
+  bcryptjs@2.4.3:
+    resolution: {integrity: sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==}
+
+  blob-util@2.0.2:
+    resolution: {integrity: sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==}
+
+  bluebird@3.7.2:
+    resolution: {integrity: sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==}
+
+  boolbase@1.0.0:
+    resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}
+
+  brace-expansion@1.1.11:
+    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
+
+  brace-expansion@2.0.1:
+    resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}
+
+  braces@3.0.3:
+    resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
+    engines: {node: '>=8'}
+
+  browserslist@4.24.2:
+    resolution: {integrity: sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==}
+    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
+    hasBin: true
+
+  bs-logger@0.2.6:
+    resolution: {integrity: sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==}
+    engines: {node: '>= 6'}
+
+  bser@2.1.1:
+    resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==}
+
+  buffer-crc32@0.2.13:
+    resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
+
+  buffer-equal-constant-time@1.0.1:
+    resolution: {integrity: sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==}
+
+  buffer-from@1.1.2:
+    resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
+
+  buffer@5.7.1:
+    resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
+
+  busboy@1.6.0:
+    resolution: {integrity: sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==}
+    engines: {node: '>=10.16.0'}
+
+  cachedir@2.4.0:
+    resolution: {integrity: sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==}
+    engines: {node: '>=6'}
+
+  call-bind@1.0.7:
+    resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==}
+    engines: {node: '>= 0.4'}
+
+  callsites@3.1.0:
+    resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
+    engines: {node: '>=6'}
+
+  camelcase-keys@6.2.2:
+    resolution: {integrity: sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==}
+    engines: {node: '>=8'}
+
+  camelcase-keys@7.0.2:
+    resolution: {integrity: sha512-Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg==}
+    engines: {node: '>=12'}
+
+  camelcase@5.3.1:
+    resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
+    engines: {node: '>=6'}
+
+  camelcase@6.3.0:
+    resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==}
+    engines: {node: '>=10'}
+
+  caniuse-api@3.0.0:
+    resolution: {integrity: sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==}
+
+  caniuse-lite@1.0.30001669:
+    resolution: {integrity: sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w==}
+
+  caseless@0.12.0:
+    resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}
+
+  chalk@2.4.2:
+    resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
+    engines: {node: '>=4'}
+
+  chalk@4.1.2:
+    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
+    engines: {node: '>=10'}
+
+  chalk@5.3.0:
+    resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==}
+    engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
+
+  char-regex@1.0.2:
+    resolution: {integrity: sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==}
+    engines: {node: '>=10'}
+
+  charenc@0.0.2:
+    resolution: {integrity: sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==}
+
+  chart.js@4.4.5:
+    resolution: {integrity: sha512-CVVjg1RYTJV9OCC8WeJPMx8gsV8K6WIyIEQUE3ui4AR9Hfgls9URri6Ja3hyMVBbTF8Q2KFa19PE815gWcWhng==}
+    engines: {pnpm: '>=8'}
+
+  chartjs-adapter-date-fns@3.0.0:
+    resolution: {integrity: sha512-Rs3iEB3Q5pJ973J93OBTpnP7qoGwvq3nUnoMdtxO+9aoJof7UFcRbWcIDteXuYd1fgAvct/32T9qaLyLuZVwCg==}
+    peerDependencies:
+      chart.js: '>=2.8.0'
+      date-fns: '>=2.0.0'
+
+  check-more-types@2.24.0:
+    resolution: {integrity: sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==}
+    engines: {node: '>= 0.8.0'}
+
+  chownr@2.0.0:
+    resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
+    engines: {node: '>=10'}
+
+  ci-info@3.9.0:
+    resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==}
+    engines: {node: '>=8'}
+
+  cjs-module-lexer@1.4.1:
+    resolution: {integrity: sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==}
+
+  classnames@2.5.1:
+    resolution: {integrity: sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==}
+
+  clean-stack@2.2.0:
+    resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==}
+    engines: {node: '>=6'}
+
+  cli-cursor@3.1.0:
+    resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}
+    engines: {node: '>=8'}
+
+  cli-cursor@4.0.0:
+    resolution: {integrity: sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  cli-table3@0.6.5:
+    resolution: {integrity: sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==}
+    engines: {node: 10.* || >= 12.*}
+
+  cli-truncate@2.1.0:
+    resolution: {integrity: sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==}
+    engines: {node: '>=8'}
+
+  cli-truncate@3.1.0:
+    resolution: {integrity: sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  client-only@0.0.1:
+    resolution: {integrity: sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==}
+
+  cliui@8.0.1:
+    resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
+    engines: {node: '>=12'}
+
+  cluster-key-slot@1.1.2:
+    resolution: {integrity: sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==}
+    engines: {node: '>=0.10.0'}
+
+  co@4.6.0:
+    resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==}
+    engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'}
+
+  collect-v8-coverage@1.0.2:
+    resolution: {integrity: sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==}
+
+  color-convert@1.9.3:
+    resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
+
+  color-convert@2.0.1:
+    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
+    engines: {node: '>=7.0.0'}
+
+  color-name@1.1.3:
+    resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
+
+  color-name@1.1.4:
+    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
+
+  colord@2.9.3:
+    resolution: {integrity: sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==}
+
+  colorette@1.4.0:
+    resolution: {integrity: sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==}
+
+  colorette@2.0.20:
+    resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==}
+
+  combined-stream@1.0.8:
+    resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
+    engines: {node: '>= 0.8'}
+
+  commander@11.0.0:
+    resolution: {integrity: sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==}
+    engines: {node: '>=16'}
+
+  commander@2.20.3:
+    resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
+
+  commander@6.2.1:
+    resolution: {integrity: sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==}
+    engines: {node: '>= 6'}
+
+  commander@7.2.0:
+    resolution: {integrity: sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==}
+    engines: {node: '>= 10'}
+
+  commander@8.3.0:
+    resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==}
+    engines: {node: '>= 12'}
+
+  common-tags@1.8.2:
+    resolution: {integrity: sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==}
+    engines: {node: '>=4.0.0'}
+
+  commondir@1.0.1:
+    resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==}
+
+  concat-map@0.0.1:
+    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
+
+  concat-with-sourcemaps@1.1.0:
+    resolution: {integrity: sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==}
+
+  convert-source-map@2.0.0:
+    resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
+
+  core-js-compat@3.38.1:
+    resolution: {integrity: sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==}
+
+  core-util-is@1.0.2:
+    resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==}
+
+  cors@2.8.5:
+    resolution: {integrity: sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==}
+    engines: {node: '>= 0.10'}
+
+  cosmiconfig@8.3.6:
+    resolution: {integrity: sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      typescript: '>=4.9.5'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  create-jest@29.7.0:
+    resolution: {integrity: sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    hasBin: true
+
+  create-require@1.1.1:
+    resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
+
+  cross-env@7.0.3:
+    resolution: {integrity: sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==}
+    engines: {node: '>=10.14', npm: '>=6', yarn: '>=1'}
+    hasBin: true
+
+  cross-spawn@6.0.5:
+    resolution: {integrity: sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==}
+    engines: {node: '>=4.8'}
+
+  cross-spawn@7.0.3:
+    resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
+    engines: {node: '>= 8'}
+
+  crypt@0.0.2:
+    resolution: {integrity: sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==}
+
+  css-blank-pseudo@3.0.3:
+    resolution: {integrity: sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==}
+    engines: {node: ^12 || ^14 || >=16}
+    hasBin: true
+    peerDependencies:
+      postcss: ^8.4
+
+  css-box-model@1.2.1:
+    resolution: {integrity: sha512-a7Vr4Q/kd/aw96bnJG332W9V9LkJO69JRcaCYDUqjp6/z0w6VcZjgAcTbgFxEPfBgdnAwlh3iwu+hLopa+flJw==}
+
+  css-declaration-sorter@6.4.1:
+    resolution: {integrity: sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==}
+    engines: {node: ^10 || ^12 || >=14}
+    peerDependencies:
+      postcss: ^8.0.9
+
+  css-functions-list@3.2.3:
+    resolution: {integrity: sha512-IQOkD3hbR5KrN93MtcYuad6YPuTSUhntLHDuLEbFWE+ff2/XSZNdZG+LcbbIW5AXKg/WFIfYItIzVoHngHXZzA==}
+    engines: {node: '>=12 || >=16'}
+
+  css-has-pseudo@3.0.4:
+    resolution: {integrity: sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==}
+    engines: {node: ^12 || ^14 || >=16}
+    hasBin: true
+    peerDependencies:
+      postcss: ^8.4
+
+  css-prefers-color-scheme@6.0.3:
+    resolution: {integrity: sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==}
+    engines: {node: ^12 || ^14 || >=16}
+    hasBin: true
+    peerDependencies:
+      postcss: ^8.4
+
+  css-select@4.3.0:
+    resolution: {integrity: sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==}
+
+  css-select@5.1.0:
+    resolution: {integrity: sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==}
+
+  css-tree@1.1.3:
+    resolution: {integrity: sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==}
+    engines: {node: '>=8.0.0'}
+
+  css-tree@2.2.1:
+    resolution: {integrity: sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==}
+    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0, npm: '>=7.0.0'}
+
+  css-tree@2.3.1:
+    resolution: {integrity: sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==}
+    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
+
+  css-tree@3.0.0:
+    resolution: {integrity: sha512-o88DVQ6GzsABn1+6+zo2ct801dBO5OASVyxbbvA2W20ue2puSh/VOuqUj90eUeMSX/xqGqBmOKiRQN7tJOuBXw==}
+    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
+
+  css-what@6.1.0:
+    resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==}
+    engines: {node: '>= 6'}
+
+  cssdb@7.11.2:
+    resolution: {integrity: sha512-lhQ32TFkc1X4eTefGfYPvgovRSzIMofHkigfH8nWtyRL4XJLsRhJFreRvEgKzept7x1rjBuy3J/MurXLaFxW/A==}
+
+  cssesc@3.0.0:
+    resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
+    engines: {node: '>=4'}
+    hasBin: true
+
+  cssnano-preset-default@5.2.14:
+    resolution: {integrity: sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  cssnano-utils@3.1.0:
+    resolution: {integrity: sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  cssnano@5.1.15:
+    resolution: {integrity: sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  csso@4.2.0:
+    resolution: {integrity: sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==}
+    engines: {node: '>=8.0.0'}
+
+  csso@5.0.5:
+    resolution: {integrity: sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==}
+    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0, npm: '>=7.0.0'}
+
+  csstype@3.1.3:
+    resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
+
+  currently-unhandled@0.4.1:
+    resolution: {integrity: sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng==}
+    engines: {node: '>=0.10.0'}
+
+  cypress@13.15.1:
+    resolution: {integrity: sha512-DwUFiKXo4lef9kA0M4iEhixFqoqp2hw8igr0lTqafRb9qtU3X0XGxKbkSYsUFdkrAkphc7MPDxoNPhk5pj9PVg==}
+    engines: {node: ^16.0.0 || ^18.0.0 || >=20.0.0}
+    hasBin: true
+
+  d3-array@2.12.1:
+    resolution: {integrity: sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==}
+
+  d3-color@2.0.0:
+    resolution: {integrity: sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==}
+
+  d3-dispatch@2.0.0:
+    resolution: {integrity: sha512-S/m2VsXI7gAti2pBoLClFFTMOO1HTtT0j99AuXLoGFKO6deHDdnv6ZGTxSTTUTgO1zVcv82fCOtDjYK4EECmWA==}
+
+  d3-drag@2.0.0:
+    resolution: {integrity: sha512-g9y9WbMnF5uqB9qKqwIIa/921RYWzlUDv9Jl1/yONQwxbOfszAWTCm8u7HOTgJgRDXiRZN56cHT9pd24dmXs8w==}
+
+  d3-ease@2.0.0:
+    resolution: {integrity: sha512-68/n9JWarxXkOWMshcT5IcjbB+agblQUaIsbnXmrzejn2O82n3p2A9R2zEB9HIEFWKFwPAEDDN8gR0VdSAyyAQ==}
+
+  d3-geo@2.0.2:
+    resolution: {integrity: sha512-8pM1WGMLGFuhq9S+FpPURxic+gKzjluCD/CHTuUF3mXMeiCo0i6R0tO1s4+GArRFde96SLcW/kOFRjoAosPsFA==}
+
+  d3-interpolate@2.0.1:
+    resolution: {integrity: sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==}
+
+  d3-selection@2.0.0:
+    resolution: {integrity: sha512-XoGGqhLUN/W14NmaqcO/bb1nqjDAw5WtSYb2X8wiuQWvSZUsUVYsOSkOybUrNvcBjaywBdYPy03eXHMXjk9nZA==}
+
+  d3-timer@2.0.0:
+    resolution: {integrity: sha512-TO4VLh0/420Y/9dO3+f9abDEFYeCUr2WZRlxJvbp4HPTQcSylXNiL6yZa9FIUvV1yRiFufl1bszTCLDqv9PWNA==}
+
+  d3-transition@2.0.0:
+    resolution: {integrity: sha512-42ltAGgJesfQE3u9LuuBHNbGrI/AJjNL2OAUdclE70UE6Vy239GCBEYD38uBPoLeNsOhFStGpPI0BAOV+HMxog==}
+    peerDependencies:
+      d3-selection: '2'
+
+  d3-zoom@2.0.0:
+    resolution: {integrity: sha512-fFg7aoaEm9/jf+qfstak0IYpnesZLiMX6GZvXtUSdv8RH2o4E2qeelgdU09eKS6wGuiGMfcnMI0nTIqWzRHGpw==}
+
+  damerau-levenshtein@1.0.8:
+    resolution: {integrity: sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==}
+
+  dashdash@1.14.1:
+    resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
+    engines: {node: '>=0.10'}
+
+  data-uri-to-buffer@4.0.1:
+    resolution: {integrity: sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==}
+    engines: {node: '>= 12'}
+
+  data-view-buffer@1.0.1:
+    resolution: {integrity: sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==}
+    engines: {node: '>= 0.4'}
+
+  data-view-byte-length@1.0.1:
+    resolution: {integrity: sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==}
+    engines: {node: '>= 0.4'}
+
+  data-view-byte-offset@1.0.0:
+    resolution: {integrity: sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==}
+    engines: {node: '>= 0.4'}
+
+  date-fns-tz@1.3.8:
+    resolution: {integrity: sha512-qwNXUFtMHTTU6CFSFjoJ80W8Fzzp24LntbjFFBgL/faqds4e5mo9mftoRLgr3Vi1trISsg4awSpYVsOQCRnapQ==}
+    peerDependencies:
+      date-fns: '>=2.0.0'
+
+  date-fns@2.30.0:
+    resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==}
+    engines: {node: '>=0.11'}
+
+  dayjs@1.11.13:
+    resolution: {integrity: sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==}
+
+  debounce@1.2.1:
+    resolution: {integrity: sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==}
+
+  debug@3.2.7:
+    resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  debug@4.3.4:
+    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  debug@4.3.7:
+    resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  decamelize-keys@1.1.1:
+    resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==}
+    engines: {node: '>=0.10.0'}
+
+  decamelize@1.2.0:
+    resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
+    engines: {node: '>=0.10.0'}
+
+  decamelize@5.0.1:
+    resolution: {integrity: sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==}
+    engines: {node: '>=10'}
+
+  dedent@1.5.3:
+    resolution: {integrity: sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==}
+    peerDependencies:
+      babel-plugin-macros: ^3.1.0
+    peerDependenciesMeta:
+      babel-plugin-macros:
+        optional: true
+
+  deep-is@0.1.4:
+    resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
+
+  deepmerge@4.3.1:
+    resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==}
+    engines: {node: '>=0.10.0'}
+
+  define-data-property@1.1.4:
+    resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==}
+    engines: {node: '>= 0.4'}
+
+  define-properties@1.2.1:
+    resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
+    engines: {node: '>= 0.4'}
+
+  del@5.1.0:
+    resolution: {integrity: sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==}
+    engines: {node: '>=8'}
+
+  del@6.1.1:
+    resolution: {integrity: sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==}
+    engines: {node: '>=10'}
+
+  delayed-stream@1.0.0:
+    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
+    engines: {node: '>=0.4.0'}
+
+  detect-browser@5.3.0:
+    resolution: {integrity: sha512-53rsFbGdwMwlF7qvCt0ypLM5V5/Mbl0szB7GPN8y9NCcbknYOeVVXdrXEq+90IwAfrrzt6Hd+u2E2ntakICU8w==}
+
+  detect-indent@6.1.0:
+    resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==}
+    engines: {node: '>=8'}
+
+  detect-newline@3.1.0:
+    resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==}
+    engines: {node: '>=8'}
+
+  diff-sequences@29.6.3:
+    resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  diff@4.0.2:
+    resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
+    engines: {node: '>=0.3.1'}
+
+  dir-glob@3.0.1:
+    resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
+    engines: {node: '>=8'}
+
+  doctrine@2.1.0:
+    resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==}
+    engines: {node: '>=0.10.0'}
+
+  doctrine@3.0.0:
+    resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
+    engines: {node: '>=6.0.0'}
+
+  dom-serializer@1.4.1:
+    resolution: {integrity: sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==}
+
+  dom-serializer@2.0.0:
+    resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==}
+
+  domelementtype@2.3.0:
+    resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==}
+
+  domhandler@4.3.1:
+    resolution: {integrity: sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==}
+    engines: {node: '>= 4'}
+
+  domhandler@5.0.3:
+    resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
+    engines: {node: '>= 4'}
+
+  domutils@2.8.0:
+    resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==}
+
+  domutils@3.1.0:
+    resolution: {integrity: sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==}
+
+  dot-case@3.0.4:
+    resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
+
+  dotenv@10.0.0:
+    resolution: {integrity: sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==}
+    engines: {node: '>=10'}
+
+  eastasianwidth@0.2.0:
+    resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
+
+  ecc-jsbn@0.1.2:
+    resolution: {integrity: sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==}
+
+  ecdsa-sig-formatter@1.0.11:
+    resolution: {integrity: sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==}
+
+  ejs@3.1.10:
+    resolution: {integrity: sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==}
+    engines: {node: '>=0.10.0'}
+    hasBin: true
+
+  electron-to-chromium@1.5.46:
+    resolution: {integrity: sha512-1XDk0Z8/YRgB2t5GeEg8DPK592DLjVmd/5uwAu6c/S4Z0CUwV/RwYqe5GWxQqcoN3bJ5U7hYMiMRPZzpCzSBhQ==}
+
+  emittery@0.13.1:
+    resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}
+    engines: {node: '>=12'}
+
+  emoji-regex@8.0.0:
+    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
+
+  emoji-regex@9.2.2:
+    resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
+
+  end-of-stream@1.4.4:
+    resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
+
+  enhanced-resolve@5.17.1:
+    resolution: {integrity: sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==}
+    engines: {node: '>=10.13.0'}
+
+  enquirer@2.4.1:
+    resolution: {integrity: sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==}
+    engines: {node: '>=8.6'}
+
+  entities@2.2.0:
+    resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==}
+
+  entities@4.5.0:
+    resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}
+    engines: {node: '>=0.12'}
+
+  error-ex@1.3.2:
+    resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
+
+  es-abstract@1.23.3:
+    resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==}
+    engines: {node: '>= 0.4'}
+
+  es-define-property@1.0.0:
+    resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==}
+    engines: {node: '>= 0.4'}
+
+  es-errors@1.3.0:
+    resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
+    engines: {node: '>= 0.4'}
+
+  es-iterator-helpers@1.1.0:
+    resolution: {integrity: sha512-/SurEfycdyssORP/E+bj4sEu1CWw4EmLDsHynHwSXQ7utgbrMRWW195pTrCjFgFCddf/UkYm3oqKPRq5i8bJbw==}
+    engines: {node: '>= 0.4'}
+
+  es-module-lexer@1.5.4:
+    resolution: {integrity: sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==}
+
+  es-object-atoms@1.0.0:
+    resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==}
+    engines: {node: '>= 0.4'}
+
+  es-set-tostringtag@2.0.3:
+    resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==}
+    engines: {node: '>= 0.4'}
+
+  es-shim-unscopables@1.0.2:
+    resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==}
+
+  es-to-primitive@1.2.1:
+    resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}
+    engines: {node: '>= 0.4'}
+
+  esbuild@0.17.19:
+    resolution: {integrity: sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==}
+    engines: {node: '>=12'}
+    hasBin: true
+
+  escalade@3.2.0:
+    resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
+    engines: {node: '>=6'}
+
+  escape-string-regexp@1.0.5:
+    resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
+    engines: {node: '>=0.8.0'}
+
+  escape-string-regexp@2.0.0:
+    resolution: {integrity: sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==}
+    engines: {node: '>=8'}
+
+  escape-string-regexp@4.0.0:
+    resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
+    engines: {node: '>=10'}
+
+  eslint-config-next@14.2.16:
+    resolution: {integrity: sha512-HOcnCJsyLXR7B8wmjaCgkTSpz+ijgOyAkP8OlvANvciP8PspBYFEBTmakNMxOf71fY0aKOm/blFIiKnrM4K03Q==}
+    peerDependencies:
+      eslint: ^7.23.0 || ^8.0.0
+      typescript: '>=3.3.1'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  eslint-config-prettier@8.10.0:
+    resolution: {integrity: sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==}
+    hasBin: true
+    peerDependencies:
+      eslint: '>=7.0.0'
+
+  eslint-import-resolver-alias@1.1.2:
+    resolution: {integrity: sha512-WdviM1Eu834zsfjHtcGHtGfcu+F30Od3V7I9Fi57uhBEwPkjDcii7/yW8jAT+gOhn4P/vOxxNAXbFAKsrrc15w==}
+    engines: {node: '>= 4'}
+    peerDependencies:
+      eslint-plugin-import: '>=1.4.0'
+
+  eslint-import-resolver-node@0.3.9:
+    resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==}
+
+  eslint-import-resolver-typescript@3.6.3:
+    resolution: {integrity: sha512-ud9aw4szY9cCT1EWWdGv1L1XR6hh2PaRWif0j2QjQ0pgTY/69iw+W0Z4qZv5wHahOl8isEr+k/JnyAqNQkLkIA==}
+    engines: {node: ^14.18.0 || >=16.0.0}
+    peerDependencies:
+      eslint: '*'
+      eslint-plugin-import: '*'
+      eslint-plugin-import-x: '*'
+    peerDependenciesMeta:
+      eslint-plugin-import:
+        optional: true
+      eslint-plugin-import-x:
+        optional: true
+
+  eslint-module-utils@2.12.0:
+    resolution: {integrity: sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: '*'
+      eslint-import-resolver-node: '*'
+      eslint-import-resolver-typescript: '*'
+      eslint-import-resolver-webpack: '*'
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+      eslint:
+        optional: true
+      eslint-import-resolver-node:
+        optional: true
+      eslint-import-resolver-typescript:
+        optional: true
+      eslint-import-resolver-webpack:
+        optional: true
+
+  eslint-plugin-css-modules@2.12.0:
+    resolution: {integrity: sha512-ruFBdad69ABrbCDCh5mXj7UzNmrvytfzPACjyvZWIAjFZAG8BXpYSbqmE8gU5wF+pIzV3jU2CWhLvfekXT/IgQ==}
+    engines: {node: '>=4.0.0'}
+    peerDependencies:
+      eslint: '>=2.0.0'
+
+  eslint-plugin-cypress@2.15.2:
+    resolution: {integrity: sha512-CtcFEQTDKyftpI22FVGpx8bkpKyYXBlNge6zSo0pl5/qJvBAnzaD76Vu2AsP16d6mTj478Ldn2mhgrWV+Xr0vQ==}
+    peerDependencies:
+      eslint: '>= 3.2.1'
+
+  eslint-plugin-import@2.31.0:
+    resolution: {integrity: sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+
+  eslint-plugin-jest@27.9.0:
+    resolution: {integrity: sha512-QIT7FH7fNmd9n4se7FFKHbsLKGQiw885Ds6Y/sxKgCZ6natwCsXdgPOADnYVxN2QrRweF0FZWbJ6S7Rsn7llug==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    peerDependencies:
+      '@typescript-eslint/eslint-plugin': ^5.0.0 || ^6.0.0 || ^7.0.0
+      eslint: ^7.0.0 || ^8.0.0
+      jest: '*'
+    peerDependenciesMeta:
+      '@typescript-eslint/eslint-plugin':
+        optional: true
+      jest:
+        optional: true
+
+  eslint-plugin-jsx-a11y@6.10.1:
+    resolution: {integrity: sha512-zHByM9WTUMnfsDTafGXRiqxp6lFtNoSOWBY6FonVRn3A+BUwN1L/tdBXT40BcBJi0cZjOGTXZ0eD/rTG9fEJ0g==}
+    engines: {node: '>=4.0'}
+    peerDependencies:
+      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9
+
+  eslint-plugin-prettier@4.2.1:
+    resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==}
+    engines: {node: '>=12.0.0'}
+    peerDependencies:
+      eslint: '>=7.28.0'
+      eslint-config-prettier: '*'
+      prettier: '>=2.0.0'
+    peerDependenciesMeta:
+      eslint-config-prettier:
+        optional: true
+
+  eslint-plugin-promise@6.6.0:
+    resolution: {integrity: sha512-57Zzfw8G6+Gq7axm2Pdo3gW/Rx3h9Yywgn61uE/3elTCOePEHVrn2i5CdfBwA1BLK0Q0WqctICIUSqXZW/VprQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
+
+  eslint-plugin-react-hooks@5.0.0-canary-7118f5dd7-20230705:
+    resolution: {integrity: sha512-AZYbMo/NW9chdL7vk6HQzQhT+PvTAEVqWk9ziruUoW2kAOcN5qNyelv70e0F1VNQAbvutOC9oc+xfWycI9FxDw==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
+
+  eslint-plugin-react@7.37.2:
+    resolution: {integrity: sha512-EsTAnj9fLVr/GZleBLFbj/sSuXeWmp1eXIN60ceYnZveqEaUCyW4X+Vh4WTdUhCkW4xutXYqTXCUSyqD4rB75w==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7
+
+  eslint-scope@5.1.1:
+    resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
+    engines: {node: '>=8.0.0'}
+
+  eslint-scope@7.2.2:
+    resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  eslint-visitor-keys@3.4.3:
+    resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  eslint@8.57.1:
+    resolution: {integrity: sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options.
+    hasBin: true
+
+  espree@9.6.1:
+    resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  esprima@4.0.1:
+    resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
+    engines: {node: '>=4'}
+    hasBin: true
+
+  esquery@1.6.0:
+    resolution: {integrity: sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==}
+    engines: {node: '>=0.10'}
+
+  esrecurse@4.3.0:
+    resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
+    engines: {node: '>=4.0'}
+
+  estraverse@4.3.0:
+    resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==}
+    engines: {node: '>=4.0'}
+
+  estraverse@5.3.0:
+    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
+    engines: {node: '>=4.0'}
+
+  estree-walker@0.6.1:
+    resolution: {integrity: sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==}
+
+  estree-walker@2.0.2:
+    resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
+
+  esutils@2.0.3:
+    resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
+    engines: {node: '>=0.10.0'}
+
+  eventemitter2@6.4.7:
+    resolution: {integrity: sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==}
+
+  eventemitter3@4.0.7:
+    resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
+
+  eventemitter3@5.0.1:
+    resolution: {integrity: sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==}
+
+  execa@4.1.0:
+    resolution: {integrity: sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==}
+    engines: {node: '>=10'}
+
+  execa@5.1.1:
+    resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==}
+    engines: {node: '>=10'}
+
+  execa@7.2.0:
+    resolution: {integrity: sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==}
+    engines: {node: ^14.18.0 || ^16.14.0 || >=18.0.0}
+
+  executable@4.1.1:
+    resolution: {integrity: sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==}
+    engines: {node: '>=4'}
+
+  exit@0.1.2:
+    resolution: {integrity: sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==}
+    engines: {node: '>= 0.8.0'}
+
+  expect@29.7.0:
+    resolution: {integrity: sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  extend@3.0.2:
+    resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==}
+
+  extract-react-intl-messages@4.1.1:
+    resolution: {integrity: sha512-dPogci5X7HVtV7VbUxajH/1YgfNRaW2VtEiVidZ/31Tq8314uzOtzVMNo0IrAPD2E+H1wHoPiu/j565TZsyIZg==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  extract-zip@2.0.1:
+    resolution: {integrity: sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==}
+    engines: {node: '>= 10.17.0'}
+    hasBin: true
+
+  extsprintf@1.3.0:
+    resolution: {integrity: sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==}
+    engines: {'0': node >=0.6.0}
+
+  fast-deep-equal@3.1.3:
+    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
+
+  fast-diff@1.3.0:
+    resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==}
+
+  fast-glob@3.3.2:
+    resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==}
+    engines: {node: '>=8.6.0'}
+
+  fast-json-stable-stringify@2.1.0:
+    resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
+
+  fast-levenshtein@2.0.6:
+    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
+
+  fast-uri@3.0.3:
+    resolution: {integrity: sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==}
+
+  fastest-levenshtein@1.0.16:
+    resolution: {integrity: sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==}
+    engines: {node: '>= 4.9.1'}
+
+  fastq@1.17.1:
+    resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==}
+
+  fb-watchman@2.0.2:
+    resolution: {integrity: sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==}
+
+  fd-slicer@1.1.0:
+    resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==}
+
+  fetch-blob@3.2.0:
+    resolution: {integrity: sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==}
+    engines: {node: ^12.20 || >= 14.13}
+
+  figures@3.2.0:
+    resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==}
+    engines: {node: '>=8'}
+
+  file-entry-cache@6.0.1:
+    resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
+    engines: {node: ^10.12.0 || >=12.0.0}
+
+  file-entry-cache@7.0.2:
+    resolution: {integrity: sha512-TfW7/1iI4Cy7Y8L6iqNdZQVvdXn0f8B4QcIXmkIbtTIe/Okm/nSlHb4IwGzRVOd3WfSieCgvf5cMzEfySAIl0g==}
+    engines: {node: '>=12.0.0'}
+
+  filelist@1.0.4:
+    resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==}
+
+  fill-range@7.1.1:
+    resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
+    engines: {node: '>=8'}
+
+  find-up@4.1.0:
+    resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}
+    engines: {node: '>=8'}
+
+  find-up@5.0.0:
+    resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
+    engines: {node: '>=10'}
+
+  flat-cache@3.2.0:
+    resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==}
+    engines: {node: ^10.12.0 || >=12.0.0}
+
+  flat@5.0.2:
+    resolution: {integrity: sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==}
+    hasBin: true
+
+  flatted@3.3.1:
+    resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==}
+
+  for-each@0.3.3:
+    resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
+
+  foreground-child@3.3.0:
+    resolution: {integrity: sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==}
+    engines: {node: '>=14'}
+
+  forever-agent@0.6.1:
+    resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==}
+
+  form-data@4.0.1:
+    resolution: {integrity: sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==}
+    engines: {node: '>= 6'}
+
+  formdata-polyfill@4.0.10:
+    resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==}
+    engines: {node: '>=12.20.0'}
+
+  fraction.js@4.3.7:
+    resolution: {integrity: sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==}
+
+  fs-extra@10.1.0:
+    resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
+    engines: {node: '>=12'}
+
+  fs-extra@8.1.0:
+    resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==}
+    engines: {node: '>=6 <7 || >=8'}
+
+  fs-extra@9.1.0:
+    resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==}
+    engines: {node: '>=10'}
+
+  fs-minipass@2.1.0:
+    resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==}
+    engines: {node: '>= 8'}
+
+  fs.realpath@1.0.0:
+    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
+
+  fsevents@2.3.3:
+    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+
+  function-bind@1.1.2:
+    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
+
+  function.prototype.name@1.1.6:
+    resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==}
+    engines: {node: '>= 0.4'}
+
+  functions-have-names@1.2.3:
+    resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
+
+  generic-names@4.0.0:
+    resolution: {integrity: sha512-ySFolZQfw9FoDb3ed9d80Cm9f0+r7qj+HJkWjeD9RBfpxEVTlVhol+gvaQB/78WbwYfbnNh8nWHHBSlg072y6A==}
+
+  generic-pool@3.9.0:
+    resolution: {integrity: sha512-hymDOu5B53XvN4QT9dBmZxPX4CWhBPPLguTZ9MMFeFa/Kg0xWVfylOVNlJji/E7yTZWFd/q9GO5TxDLq156D7g==}
+    engines: {node: '>= 4'}
+
+  gensync@1.0.0-beta.2:
+    resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
+    engines: {node: '>=6.9.0'}
+
+  get-caller-file@2.0.5:
+    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
+    engines: {node: 6.* || 8.* || >= 10.*}
+
+  get-intrinsic@1.2.4:
+    resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==}
+    engines: {node: '>= 0.4'}
+
+  get-package-type@0.1.0:
+    resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==}
+    engines: {node: '>=8.0.0'}
+
+  get-stream@5.2.0:
+    resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
+    engines: {node: '>=8'}
+
+  get-stream@6.0.1:
+    resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
+    engines: {node: '>=10'}
+
+  get-symbol-description@1.0.2:
+    resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==}
+    engines: {node: '>= 0.4'}
+
+  get-tsconfig@4.8.1:
+    resolution: {integrity: sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg==}
+
+  getos@3.2.1:
+    resolution: {integrity: sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==}
+
+  getpass@0.1.7:
+    resolution: {integrity: sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==}
+
+  glob-parent@5.1.2:
+    resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
+    engines: {node: '>= 6'}
+
+  glob-parent@6.0.2:
+    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
+    engines: {node: '>=10.13.0'}
+
+  glob@10.3.10:
+    resolution: {integrity: sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    hasBin: true
+
+  glob@7.2.3:
+    resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
+    deprecated: Glob versions prior to v9 are no longer supported
+
+  glob@8.1.0:
+    resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==}
+    engines: {node: '>=12'}
+    deprecated: Glob versions prior to v9 are no longer supported
+
+  global-dirs@3.0.1:
+    resolution: {integrity: sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==}
+    engines: {node: '>=10'}
+
+  global-modules@2.0.0:
+    resolution: {integrity: sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==}
+    engines: {node: '>=6'}
+
+  global-prefix@3.0.0:
+    resolution: {integrity: sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==}
+    engines: {node: '>=6'}
+
+  globals@11.12.0:
+    resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
+    engines: {node: '>=4'}
+
+  globals@13.24.0:
+    resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==}
+    engines: {node: '>=8'}
+
+  globalthis@1.0.4:
+    resolution: {integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==}
+    engines: {node: '>= 0.4'}
+
+  globby@10.0.1:
+    resolution: {integrity: sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==}
+    engines: {node: '>=8'}
+
+  globby@10.0.2:
+    resolution: {integrity: sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==}
+    engines: {node: '>=8'}
+
+  globby@11.1.0:
+    resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
+    engines: {node: '>=10'}
+
+  globjoin@0.1.4:
+    resolution: {integrity: sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==}
+
+  gonzales-pe@4.3.0:
+    resolution: {integrity: sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==}
+    engines: {node: '>=0.6.0'}
+    hasBin: true
+
+  gopd@1.0.1:
+    resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
+
+  graceful-fs@4.2.11:
+    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
+
+  graphemer@1.4.0:
+    resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
+
+  hard-rejection@2.1.0:
+    resolution: {integrity: sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==}
+    engines: {node: '>=6'}
+
+  has-bigints@1.0.2:
+    resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}
+
+  has-flag@3.0.0:
+    resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
+    engines: {node: '>=4'}
+
+  has-flag@4.0.0:
+    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
+    engines: {node: '>=8'}
+
+  has-property-descriptors@1.0.2:
+    resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}
+
+  has-proto@1.0.3:
+    resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==}
+    engines: {node: '>= 0.4'}
+
+  has-symbols@1.0.3:
+    resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
+    engines: {node: '>= 0.4'}
+
+  has-tostringtag@1.0.2:
+    resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
+    engines: {node: '>= 0.4'}
+
+  hasown@2.0.2:
+    resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
+    engines: {node: '>= 0.4'}
+
+  hoist-non-react-statics@3.3.2:
+    resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==}
+
+  hosted-git-info@2.8.9:
+    resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==}
+
+  hosted-git-info@4.1.0:
+    resolution: {integrity: sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==}
+    engines: {node: '>=10'}
+
+  html-escaper@2.0.2:
+    resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
+
+  html-tags@3.3.1:
+    resolution: {integrity: sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==}
+    engines: {node: '>=8'}
+
+  http-signature@1.4.0:
+    resolution: {integrity: sha512-G5akfn7eKbpDN+8nPS/cb57YeA1jLTVxjpCj7tmm3QKPdyDy7T+qSC40e9ptydSWvkwjSXw1VbkpyEm39ukeAg==}
+    engines: {node: '>=0.10'}
+
+  human-signals@1.1.1:
+    resolution: {integrity: sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==}
+    engines: {node: '>=8.12.0'}
+
+  human-signals@2.1.0:
+    resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
+    engines: {node: '>=10.17.0'}
+
+  human-signals@4.3.1:
+    resolution: {integrity: sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==}
+    engines: {node: '>=14.18.0'}
+
+  husky@8.0.3:
+    resolution: {integrity: sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==}
+    engines: {node: '>=14'}
+    hasBin: true
+
+  icss-replace-symbols@1.1.0:
+    resolution: {integrity: sha512-chIaY3Vh2mh2Q3RGXttaDIzeiPvaVXJ+C4DAh/w3c37SKZ/U6PGMmuicR2EQQp9bKG8zLMCl7I+PtIoOOPp8Gg==}
+
+  icss-utils@5.1.0:
+    resolution: {integrity: sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==}
+    engines: {node: ^10 || ^12 || >= 14}
+    peerDependencies:
+      postcss: ^8.1.0
+
+  ieee754@1.2.1:
+    resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
+
+  ignore@5.3.2:
+    resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
+    engines: {node: '>= 4'}
+
+  immer@9.0.21:
+    resolution: {integrity: sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==}
+
+  import-cwd@3.0.0:
+    resolution: {integrity: sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==}
+    engines: {node: '>=8'}
+
+  import-fresh@3.3.0:
+    resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
+    engines: {node: '>=6'}
+
+  import-from@3.0.0:
+    resolution: {integrity: sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==}
+    engines: {node: '>=8'}
+
+  import-lazy@4.0.0:
+    resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==}
+    engines: {node: '>=8'}
+
+  import-local@3.2.0:
+    resolution: {integrity: sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==}
+    engines: {node: '>=8'}
+    hasBin: true
+
+  imurmurhash@0.1.4:
+    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
+    engines: {node: '>=0.8.19'}
+
+  indent-string@4.0.0:
+    resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}
+    engines: {node: '>=8'}
+
+  indent-string@5.0.0:
+    resolution: {integrity: sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==}
+    engines: {node: '>=12'}
+
+  inflight@1.0.6:
+    resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
+    deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
+
+  inherits@2.0.4:
+    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
+
+  ini@1.3.8:
+    resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
+
+  ini@2.0.0:
+    resolution: {integrity: sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==}
+    engines: {node: '>=10'}
+
+  internal-slot@1.0.7:
+    resolution: {integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==}
+    engines: {node: '>= 0.4'}
+
+  internmap@1.0.1:
+    resolution: {integrity: sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==}
+
+  intl-messageformat-parser@5.5.1:
+    resolution: {integrity: sha512-TvB3LqF2VtP6yI6HXlRT5TxX98HKha6hCcrg9dwlPwNaedVNuQA9KgBdtWKgiyakyCTYHQ+KJeFEstNKfZr64w==}
+    deprecated: We've written a new parser that's 6x faster and is backwards compatible. Please use @formatjs/icu-messageformat-parser
+
+  intl-messageformat-parser@6.1.2:
+    resolution: {integrity: sha512-4GQDEPhl/ZMNDKwMsLqyw1LG2IAWjmLJXdmnRcHKeLQzpgtNYZI6lVw1279pqIkRk2MfKb9aDsVFzm565azK5A==}
+    deprecated: We've written a new parser that's 6x faster and is backwards compatible. Please use @formatjs/icu-messageformat-parser
+
+  intl-messageformat@10.7.3:
+    resolution: {integrity: sha512-AAo/3oyh7ROfPhDuh7DxTTydh97OC+lv7h1Eq5LuHWuLsUMKOhtzTYuyXlUReuwZ9vANDHo4CS1bGRrn7TZRtg==}
+
+  ipaddr.js@2.2.0:
+    resolution: {integrity: sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==}
+    engines: {node: '>= 10'}
+
+  is-array-buffer@3.0.4:
+    resolution: {integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==}
+    engines: {node: '>= 0.4'}
+
+  is-arrayish@0.2.1:
+    resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
+
+  is-async-function@2.0.0:
+    resolution: {integrity: sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==}
+    engines: {node: '>= 0.4'}
+
+  is-bigint@1.0.4:
+    resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==}
+
+  is-boolean-object@1.1.2:
+    resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==}
+    engines: {node: '>= 0.4'}
+
+  is-buffer@1.1.6:
+    resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==}
+
+  is-bun-module@1.2.1:
+    resolution: {integrity: sha512-AmidtEM6D6NmUiLOvvU7+IePxjEjOzra2h0pSrsfSAcXwl/83zLLXDByafUJy9k/rKK0pvXMLdwKwGHlX2Ke6Q==}
+
+  is-callable@1.2.7:
+    resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
+    engines: {node: '>= 0.4'}
+
+  is-ci@3.0.1:
+    resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==}
+    hasBin: true
+
+  is-core-module@2.15.1:
+    resolution: {integrity: sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==}
+    engines: {node: '>= 0.4'}
+
+  is-data-view@1.0.1:
+    resolution: {integrity: sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==}
+    engines: {node: '>= 0.4'}
+
+  is-date-object@1.0.5:
+    resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
+    engines: {node: '>= 0.4'}
+
+  is-docker@3.0.0:
+    resolution: {integrity: sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    hasBin: true
+
+  is-extglob@2.1.1:
+    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
+    engines: {node: '>=0.10.0'}
+
+  is-finalizationregistry@1.0.2:
+    resolution: {integrity: sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==}
+
+  is-fullwidth-code-point@3.0.0:
+    resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
+    engines: {node: '>=8'}
+
+  is-fullwidth-code-point@4.0.0:
+    resolution: {integrity: sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==}
+    engines: {node: '>=12'}
+
+  is-generator-fn@2.1.0:
+    resolution: {integrity: sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==}
+    engines: {node: '>=6'}
+
+  is-generator-function@1.0.10:
+    resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==}
+    engines: {node: '>= 0.4'}
+
+  is-glob@4.0.3:
+    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
+    engines: {node: '>=0.10.0'}
+
+  is-installed-globally@0.4.0:
+    resolution: {integrity: sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==}
+    engines: {node: '>=10'}
+
+  is-localhost-ip@1.4.0:
+    resolution: {integrity: sha512-cN7SzlY7BVxSeoJu5equjsZaKSgD4HCfXrTwu0Jgbq5BbT1BU+D7Lyi/l1KO8H0un0JTlxcQaT/GWVapu+DIDg==}
+    engines: {node: '>=10'}
+
+  is-map@2.0.3:
+    resolution: {integrity: sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==}
+    engines: {node: '>= 0.4'}
+
+  is-module@1.0.0:
+    resolution: {integrity: sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==}
+
+  is-negative-zero@2.0.3:
+    resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==}
+    engines: {node: '>= 0.4'}
+
+  is-number-object@1.0.7:
+    resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==}
+    engines: {node: '>= 0.4'}
+
+  is-number@7.0.0:
+    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
+    engines: {node: '>=0.12.0'}
+
+  is-path-cwd@2.2.0:
+    resolution: {integrity: sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==}
+    engines: {node: '>=6'}
+
+  is-path-inside@3.0.3:
+    resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
+    engines: {node: '>=8'}
+
+  is-plain-obj@1.1.0:
+    resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==}
+    engines: {node: '>=0.10.0'}
+
+  is-plain-obj@2.1.0:
+    resolution: {integrity: sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==}
+    engines: {node: '>=8'}
+
+  is-plain-object@3.0.1:
+    resolution: {integrity: sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==}
+    engines: {node: '>=0.10.0'}
+
+  is-plain-object@5.0.0:
+    resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
+    engines: {node: '>=0.10.0'}
+
+  is-reference@1.2.1:
+    resolution: {integrity: sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==}
+
+  is-regex@1.1.4:
+    resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
+    engines: {node: '>= 0.4'}
+
+  is-set@2.0.3:
+    resolution: {integrity: sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==}
+    engines: {node: '>= 0.4'}
+
+  is-shared-array-buffer@1.0.3:
+    resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==}
+    engines: {node: '>= 0.4'}
+
+  is-stream@2.0.1:
+    resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
+    engines: {node: '>=8'}
+
+  is-stream@3.0.0:
+    resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  is-string@1.0.7:
+    resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
+    engines: {node: '>= 0.4'}
+
+  is-symbol@1.0.4:
+    resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
+    engines: {node: '>= 0.4'}
+
+  is-typed-array@1.1.13:
+    resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==}
+    engines: {node: '>= 0.4'}
+
+  is-typedarray@1.0.0:
+    resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==}
+
+  is-unicode-supported@0.1.0:
+    resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}
+    engines: {node: '>=10'}
+
+  is-weakmap@2.0.2:
+    resolution: {integrity: sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==}
+    engines: {node: '>= 0.4'}
+
+  is-weakref@1.0.2:
+    resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
+
+  is-weakset@2.0.3:
+    resolution: {integrity: sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==}
+    engines: {node: '>= 0.4'}
+
+  isarray@2.0.5:
+    resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
+
+  isbot@5.1.17:
+    resolution: {integrity: sha512-/wch8pRKZE+aoVhRX/hYPY1C7dMCeeMyhkQLNLNlYAbGQn9bkvMB8fOUXNnk5I0m4vDYbBJ9ciVtkr9zfBJ7qA==}
+    engines: {node: '>=18'}
+
+  isexe@2.0.0:
+    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
+
+  isstream@0.1.2:
+    resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==}
+
+  istanbul-lib-coverage@3.2.2:
+    resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==}
+    engines: {node: '>=8'}
+
+  istanbul-lib-instrument@5.2.1:
+    resolution: {integrity: sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==}
+    engines: {node: '>=8'}
+
+  istanbul-lib-instrument@6.0.3:
+    resolution: {integrity: sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==}
+    engines: {node: '>=10'}
+
+  istanbul-lib-report@3.0.1:
+    resolution: {integrity: sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==}
+    engines: {node: '>=10'}
+
+  istanbul-lib-source-maps@4.0.1:
+    resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==}
+    engines: {node: '>=10'}
+
+  istanbul-reports@3.1.7:
+    resolution: {integrity: sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==}
+    engines: {node: '>=8'}
+
+  iterator.prototype@1.1.3:
+    resolution: {integrity: sha512-FW5iMbeQ6rBGm/oKgzq2aW4KvAGpxPzYES8N4g4xNXUKpL1mclMvOe+76AcLDTvD+Ze+sOpVhgdAQEKF4L9iGQ==}
+    engines: {node: '>= 0.4'}
+
+  jackspeak@2.3.6:
+    resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==}
+    engines: {node: '>=14'}
+
+  jake@10.9.2:
+    resolution: {integrity: sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  jest-changed-files@29.7.0:
+    resolution: {integrity: sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-circus@29.7.0:
+    resolution: {integrity: sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-cli@29.7.0:
+    resolution: {integrity: sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    hasBin: true
+    peerDependencies:
+      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+    peerDependenciesMeta:
+      node-notifier:
+        optional: true
+
+  jest-config@29.7.0:
+    resolution: {integrity: sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    peerDependencies:
+      '@types/node': '*'
+      ts-node: '>=9.0.0'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      ts-node:
+        optional: true
+
+  jest-diff@29.7.0:
+    resolution: {integrity: sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-docblock@29.7.0:
+    resolution: {integrity: sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-each@29.7.0:
+    resolution: {integrity: sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-environment-node@29.7.0:
+    resolution: {integrity: sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-get-type@29.6.3:
+    resolution: {integrity: sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-haste-map@29.7.0:
+    resolution: {integrity: sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-leak-detector@29.7.0:
+    resolution: {integrity: sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-matcher-utils@29.7.0:
+    resolution: {integrity: sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-message-util@29.7.0:
+    resolution: {integrity: sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-mock@29.7.0:
+    resolution: {integrity: sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-pnp-resolver@1.2.3:
+    resolution: {integrity: sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==}
+    engines: {node: '>=6'}
+    peerDependencies:
+      jest-resolve: '*'
+    peerDependenciesMeta:
+      jest-resolve:
+        optional: true
+
+  jest-regex-util@29.6.3:
+    resolution: {integrity: sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-resolve-dependencies@29.7.0:
+    resolution: {integrity: sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-resolve@29.7.0:
+    resolution: {integrity: sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-runner@29.7.0:
+    resolution: {integrity: sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-runtime@29.7.0:
+    resolution: {integrity: sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-snapshot@29.7.0:
+    resolution: {integrity: sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-util@29.7.0:
+    resolution: {integrity: sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-validate@29.7.0:
+    resolution: {integrity: sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-watcher@29.7.0:
+    resolution: {integrity: sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-worker@26.6.2:
+    resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==}
+    engines: {node: '>= 10.13.0'}
+
+  jest-worker@29.7.0:
+    resolution: {integrity: sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest@29.7.0:
+    resolution: {integrity: sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    hasBin: true
+    peerDependencies:
+      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+    peerDependenciesMeta:
+      node-notifier:
+        optional: true
+
+  joycon@3.1.1:
+    resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==}
+    engines: {node: '>=10'}
+
+  js-tokens@4.0.0:
+    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
+
+  js-yaml@3.14.1:
+    resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}
+    hasBin: true
+
+  js-yaml@4.1.0:
+    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
+    hasBin: true
+
+  jsbn@0.1.1:
+    resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==}
+
+  jsesc@3.0.2:
+    resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==}
+    engines: {node: '>=6'}
+    hasBin: true
+
+  json-buffer@3.0.1:
+    resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
+
+  json-parse-better-errors@1.0.2:
+    resolution: {integrity: sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==}
+
+  json-parse-even-better-errors@2.3.1:
+    resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
+
+  json-schema-traverse@0.4.1:
+    resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
+
+  json-schema-traverse@1.0.0:
+    resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
+
+  json-schema@0.4.0:
+    resolution: {integrity: sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==}
+
+  json-stable-stringify-without-jsonify@1.0.1:
+    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
+
+  json-stable-stringify@1.1.1:
+    resolution: {integrity: sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==}
+    engines: {node: '>= 0.4'}
+
+  json-stringify-safe@5.0.1:
+    resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==}
+
+  json5@1.0.2:
+    resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
+    hasBin: true
+
+  json5@2.2.3:
+    resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
+    engines: {node: '>=6'}
+    hasBin: true
+
+  jsonc-parser@3.3.1:
+    resolution: {integrity: sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==}
+
+  jsonfile@4.0.0:
+    resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==}
+
+  jsonfile@6.1.0:
+    resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
+
+  jsonify@0.0.1:
+    resolution: {integrity: sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==}
+
+  jsonwebtoken@9.0.2:
+    resolution: {integrity: sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==}
+    engines: {node: '>=12', npm: '>=6'}
+
+  jsprim@2.0.2:
+    resolution: {integrity: sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==}
+    engines: {'0': node >=0.6.0}
+
+  jsx-ast-utils@3.3.5:
+    resolution: {integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==}
+    engines: {node: '>=4.0'}
+
+  jwa@1.4.1:
+    resolution: {integrity: sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==}
+
+  jws@3.2.2:
+    resolution: {integrity: sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==}
+
+  kafkajs@2.2.4:
+    resolution: {integrity: sha512-j/YeapB1vfPT2iOIUn/vxdyKEuhuY2PxMBvf5JWux6iSaukAccrMtXEY/Lb7OvavDhOWME589bpLrEdnVHjfjA==}
+    engines: {node: '>=14.0.0'}
+
+  keyv@4.5.4:
+    resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
+
+  kind-of@6.0.3:
+    resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
+    engines: {node: '>=0.10.0'}
+
+  kleur@3.0.3:
+    resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
+    engines: {node: '>=6'}
+
+  known-css-properties@0.29.0:
+    resolution: {integrity: sha512-Ne7wqW7/9Cz54PDt4I3tcV+hAyat8ypyOGzYRJQfdxnnjeWsTxt1cy8pjvvKeI5kfXuyvULyeeAvwvvtAX3ayQ==}
+
+  known-css-properties@0.34.0:
+    resolution: {integrity: sha512-tBECoUqNFbyAY4RrbqsBQqDFpGXAEbdD5QKr8kACx3+rnArmuuR22nKQWKazvp07N9yjTyDZaw/20UIH8tL9DQ==}
+
+  language-subtag-registry@0.3.23:
+    resolution: {integrity: sha512-0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ==}
+
+  language-tags@1.0.9:
+    resolution: {integrity: sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==}
+    engines: {node: '>=0.10'}
+
+  lazy-ass@1.6.0:
+    resolution: {integrity: sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==}
+    engines: {node: '> 0.8'}
+
+  leven@3.1.0:
+    resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==}
+    engines: {node: '>=6'}
+
+  levn@0.4.1:
+    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
+    engines: {node: '>= 0.8.0'}
+
+  lilconfig@2.1.0:
+    resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==}
+    engines: {node: '>=10'}
+
+  lines-and-columns@1.2.4:
+    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
+
+  lint-staged@14.0.1:
+    resolution: {integrity: sha512-Mw0cL6HXnHN1ag0mN/Dg4g6sr8uf8sn98w2Oc1ECtFto9tvRF7nkXGJRbx8gPlHyoR0pLyBr2lQHbWwmUHe1Sw==}
+    engines: {node: ^16.14.0 || >=18.0.0}
+    hasBin: true
+
+  listr2@3.14.0:
+    resolution: {integrity: sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      enquirer: '>= 2.3.0 < 3'
+    peerDependenciesMeta:
+      enquirer:
+        optional: true
+
+  listr2@6.6.1:
+    resolution: {integrity: sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      enquirer: '>= 2.3.0 < 3'
+    peerDependenciesMeta:
+      enquirer:
+        optional: true
+
+  load-json-file@4.0.0:
+    resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
+    engines: {node: '>=4'}
+
+  load-json-file@6.2.0:
+    resolution: {integrity: sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ==}
+    engines: {node: '>=8'}
+
+  loader-utils@3.3.1:
+    resolution: {integrity: sha512-FMJTLMXfCLMLfJxcX9PFqX5qD88Z5MRGaZCVzfuqeZSPsyiBzs+pahDQjbIWz2QIzPZz0NX9Zy4FX3lmK6YHIg==}
+    engines: {node: '>= 12.13.0'}
+
+  locate-path@5.0.0:
+    resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
+    engines: {node: '>=8'}
+
+  locate-path@6.0.0:
+    resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
+    engines: {node: '>=10'}
+
+  lodash-es@4.17.21:
+    resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
+
+  lodash.camelcase@4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+
+  lodash.debounce@4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+
+  lodash.includes@4.3.0:
+    resolution: {integrity: sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==}
+
+  lodash.isboolean@3.0.3:
+    resolution: {integrity: sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==}
+
+  lodash.isinteger@4.0.4:
+    resolution: {integrity: sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==}
+
+  lodash.isnumber@3.0.3:
+    resolution: {integrity: sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==}
+
+  lodash.isplainobject@4.0.6:
+    resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
+
+  lodash.isstring@4.0.1:
+    resolution: {integrity: sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==}
+
+  lodash.memoize@4.1.2:
+    resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==}
+
+  lodash.merge@4.6.2:
+    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
+
+  lodash.mergewith@4.6.2:
+    resolution: {integrity: sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==}
+
+  lodash.once@4.1.1:
+    resolution: {integrity: sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==}
+
+  lodash.pick@4.4.0:
+    resolution: {integrity: sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==}
+
+  lodash.truncate@4.4.2:
+    resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
+
+  lodash.uniq@4.5.0:
+    resolution: {integrity: sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==}
+
+  lodash@4.17.21:
+    resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
+
+  log-symbols@4.1.0:
+    resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
+    engines: {node: '>=10'}
+
+  log-update@4.0.0:
+    resolution: {integrity: sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==}
+    engines: {node: '>=10'}
+
+  log-update@5.0.1:
+    resolution: {integrity: sha512-5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  loose-envify@1.4.0:
+    resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
+    hasBin: true
+
+  loud-rejection@2.2.0:
+    resolution: {integrity: sha512-S0FayMXku80toa5sZ6Ro4C+s+EtFDCsyJNG/AzFMfX3AxD5Si4dZsgzm/kKnbOxHl5Cv8jBlno8+3XYIh2pNjQ==}
+    engines: {node: '>=8'}
+
+  lower-case@2.0.2:
+    resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
+
+  lru-cache@10.4.3:
+    resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
+
+  lru-cache@5.1.1:
+    resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
+
+  lru-cache@6.0.0:
+    resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
+    engines: {node: '>=10'}
+
+  magic-string@0.30.12:
+    resolution: {integrity: sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==}
+
+  make-dir@3.1.0:
+    resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
+    engines: {node: '>=8'}
+
+  make-dir@4.0.0:
+    resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==}
+    engines: {node: '>=10'}
+
+  make-error@1.3.6:
+    resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
+
+  makeerror@1.0.12:
+    resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==}
+
+  map-obj@1.0.1:
+    resolution: {integrity: sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==}
+    engines: {node: '>=0.10.0'}
+
+  map-obj@4.3.0:
+    resolution: {integrity: sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==}
+    engines: {node: '>=8'}
+
+  mathml-tag-names@2.1.3:
+    resolution: {integrity: sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==}
+
+  maxmind@4.3.22:
+    resolution: {integrity: sha512-dfLO11mE77ELTEIXNezfW0eslodsFLsZ1lQkLauP+5Zsg1m7kCGtljqRyVOd9E5Ne2RJgvY6UU09qvnVocOZvA==}
+    engines: {node: '>=12', npm: '>=6'}
+
+  md5@2.3.0:
+    resolution: {integrity: sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==}
+
+  mdn-data@2.0.14:
+    resolution: {integrity: sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==}
+
+  mdn-data@2.0.28:
+    resolution: {integrity: sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==}
+
+  mdn-data@2.0.30:
+    resolution: {integrity: sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==}
+
+  mdn-data@2.10.0:
+    resolution: {integrity: sha512-qq7C3EtK3yJXMwz1zAab65pjl+UhohqMOctTgcqjLOWABqmwj+me02LSsCuEUxnst9X1lCBpoE0WArGKgdGDzw==}
+
+  mdn-data@2.11.1:
+    resolution: {integrity: sha512-Hdx3wmyqPFrhd6YHVuSkUK2eIGAcxR0xlndcgZqjA68yMJTbfXrjJwbgsBOsNjI7LnBIVUQnmyMVSdi/ob0GpQ==}
+
+  memoize-one@5.2.1:
+    resolution: {integrity: sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==}
+
+  memorystream@0.3.1:
+    resolution: {integrity: sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==}
+    engines: {node: '>= 0.10.0'}
+
+  meow@10.1.5:
+    resolution: {integrity: sha512-/d+PQ4GKmGvM9Bee/DPa8z3mXs/pkvJE2KEThngVNOqtmljC6K7NMPxtc2JeZYTmpWb9k/TmxjeL18ez3h7vCw==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  meow@6.1.1:
+    resolution: {integrity: sha512-3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg==}
+    engines: {node: '>=8'}
+
+  merge-stream@2.0.0:
+    resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
+
+  merge2@1.4.1:
+    resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
+    engines: {node: '>= 8'}
+
+  micromatch@4.0.5:
+    resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==}
+    engines: {node: '>=8.6'}
+
+  micromatch@4.0.8:
+    resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
+    engines: {node: '>=8.6'}
+
+  mime-db@1.52.0:
+    resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
+    engines: {node: '>= 0.6'}
+
+  mime-types@2.1.35:
+    resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
+    engines: {node: '>= 0.6'}
+
+  mimic-fn@2.1.0:
+    resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
+    engines: {node: '>=6'}
+
+  mimic-fn@4.0.0:
+    resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}
+    engines: {node: '>=12'}
+
+  min-indent@1.0.1:
+    resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
+    engines: {node: '>=4'}
+
+  minimatch@3.1.2:
+    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
+
+  minimatch@5.1.6:
+    resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==}
+    engines: {node: '>=10'}
+
+  minimatch@9.0.3:
+    resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==}
+    engines: {node: '>=16 || 14 >=14.17'}
+
+  minimatch@9.0.5:
+    resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==}
+    engines: {node: '>=16 || 14 >=14.17'}
+
+  minimist-options@4.1.0:
+    resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==}
+    engines: {node: '>= 6'}
+
+  minimist@1.2.8:
+    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
+
+  minipass@3.3.6:
+    resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==}
+    engines: {node: '>=8'}
+
+  minipass@5.0.0:
+    resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==}
+    engines: {node: '>=8'}
+
+  minipass@7.1.2:
+    resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
+    engines: {node: '>=16 || 14 >=14.17'}
+
+  minizlib@2.1.2:
+    resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==}
+    engines: {node: '>= 8'}
+
+  mkdirp@1.0.4:
+    resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  mmdb-lib@2.1.1:
+    resolution: {integrity: sha512-yx8H/1H5AfnufiLnzzPqPf4yr/dKU9IFT1rPVwSkrKWHsQEeVVd6+X+L0nUbXhlEFTu3y/7hu38CFmEVgzvyeg==}
+    engines: {node: '>=10', npm: '>=6'}
+
+  moment-timezone@0.5.46:
+    resolution: {integrity: sha512-ZXm9b36esbe7OmdABqIWJuBBiLLwAjrN7CE+7sYdCCx82Nabt1wHDj8TVseS59QIlfFPbOoiBPm6ca9BioG4hw==}
+
+  moment@2.30.1:
+    resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==}
+
+  ms@2.1.2:
+    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
+
+  ms@2.1.3:
+    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
+
+  nanoclone@0.2.1:
+    resolution: {integrity: sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==}
+
+  nanoid@3.3.7:
+    resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+    hasBin: true
+
+  natural-compare@1.4.0:
+    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
+
+  next-basics@0.39.0:
+    resolution: {integrity: sha512-5HWf3u7jgx5n4auIkArFP5+EVdyz7kSvxs86o2V4y8/t3J4scdIHgI8BBE6UhzB17WMbMgVql44IfcJH1CQc/w==}
+    peerDependencies:
+      next: ^13.4.0
+      react: ^18.2.0
+      react-dom: ^18.2.0
+
+  next@14.2.10:
+    resolution: {integrity: sha512-sDDExXnh33cY3RkS9JuFEKaS4HmlWmDKP1VJioucCG6z5KuA008DPsDZOzi8UfqEk3Ii+2NCQSJrfbEWtZZfww==}
+    engines: {node: '>=18.17.0'}
+    hasBin: true
+    peerDependencies:
+      '@opentelemetry/api': ^1.1.0
+      '@playwright/test': ^1.41.2
+      react: ^18.2.0
+      react-dom: ^18.2.0
+      sass: ^1.3.0
+    peerDependenciesMeta:
+      '@opentelemetry/api':
+        optional: true
+      '@playwright/test':
+        optional: true
+      sass:
+        optional: true
+
+  nice-try@1.0.5:
+    resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
+
+  no-case@3.0.4:
+    resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
+
+  node-domexception@1.0.0:
+    resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
+    engines: {node: '>=10.5.0'}
+
+  node-fetch@3.3.2:
+    resolution: {integrity: sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  node-int64@0.4.0:
+    resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==}
+
+  node-releases@2.0.18:
+    resolution: {integrity: sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==}
+
+  normalize-package-data@2.5.0:
+    resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==}
+
+  normalize-package-data@3.0.3:
+    resolution: {integrity: sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==}
+    engines: {node: '>=10'}
+
+  normalize-path@3.0.0:
+    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
+    engines: {node: '>=0.10.0'}
+
+  normalize-range@0.1.2:
+    resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==}
+    engines: {node: '>=0.10.0'}
+
+  normalize-url@6.1.0:
+    resolution: {integrity: sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==}
+    engines: {node: '>=10'}
+
+  npm-run-all@4.1.5:
+    resolution: {integrity: sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==}
+    engines: {node: '>= 4'}
+    hasBin: true
+
+  npm-run-path@4.0.1:
+    resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
+    engines: {node: '>=8'}
+
+  npm-run-path@5.3.0:
+    resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  nth-check@2.1.1:
+    resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
+
+  object-assign@4.1.1:
+    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
+    engines: {node: '>=0.10.0'}
+
+  object-inspect@1.13.2:
+    resolution: {integrity: sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==}
+    engines: {node: '>= 0.4'}
+
+  object-keys@1.1.1:
+    resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
+    engines: {node: '>= 0.4'}
+
+  object.assign@4.1.5:
+    resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==}
+    engines: {node: '>= 0.4'}
+
+  object.entries@1.1.8:
+    resolution: {integrity: sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==}
+    engines: {node: '>= 0.4'}
+
+  object.fromentries@2.0.8:
+    resolution: {integrity: sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==}
+    engines: {node: '>= 0.4'}
+
+  object.groupby@1.0.3:
+    resolution: {integrity: sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==}
+    engines: {node: '>= 0.4'}
+
+  object.values@1.2.0:
+    resolution: {integrity: sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==}
+    engines: {node: '>= 0.4'}
+
+  once@1.4.0:
+    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
+
+  onetime@5.1.2:
+    resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}
+    engines: {node: '>=6'}
+
+  onetime@6.0.0:
+    resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==}
+    engines: {node: '>=12'}
+
+  optionator@0.9.4:
+    resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
+    engines: {node: '>= 0.8.0'}
+
+  ospath@1.2.2:
+    resolution: {integrity: sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==}
+
+  p-finally@1.0.0:
+    resolution: {integrity: sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==}
+    engines: {node: '>=4'}
+
+  p-limit@2.3.0:
+    resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
+    engines: {node: '>=6'}
+
+  p-limit@3.1.0:
+    resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
+    engines: {node: '>=10'}
+
+  p-locate@4.1.0:
+    resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
+    engines: {node: '>=8'}
+
+  p-locate@5.0.0:
+    resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
+    engines: {node: '>=10'}
+
+  p-map@3.0.0:
+    resolution: {integrity: sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==}
+    engines: {node: '>=8'}
+
+  p-map@4.0.0:
+    resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==}
+    engines: {node: '>=10'}
+
+  p-queue@6.6.2:
+    resolution: {integrity: sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==}
+    engines: {node: '>=8'}
+
+  p-timeout@3.2.0:
+    resolution: {integrity: sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==}
+    engines: {node: '>=8'}
+
+  p-try@2.2.0:
+    resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
+    engines: {node: '>=6'}
+
+  parent-module@1.0.1:
+    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
+    engines: {node: '>=6'}
+
+  parse-json@4.0.0:
+    resolution: {integrity: sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==}
+    engines: {node: '>=4'}
+
+  parse-json@5.2.0:
+    resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
+    engines: {node: '>=8'}
+
+  path-exists@4.0.0:
+    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
+    engines: {node: '>=8'}
+
+  path-is-absolute@1.0.1:
+    resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
+    engines: {node: '>=0.10.0'}
+
+  path-key@2.0.1:
+    resolution: {integrity: sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==}
+    engines: {node: '>=4'}
+
+  path-key@3.1.1:
+    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
+    engines: {node: '>=8'}
+
+  path-key@4.0.0:
+    resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==}
+    engines: {node: '>=12'}
+
+  path-parse@1.0.7:
+    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
+
+  path-scurry@1.11.1:
+    resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==}
+    engines: {node: '>=16 || 14 >=14.18'}
+
+  path-type@3.0.0:
+    resolution: {integrity: sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==}
+    engines: {node: '>=4'}
+
+  path-type@4.0.0:
+    resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
+    engines: {node: '>=8'}
+
+  pend@1.2.0:
+    resolution: {integrity: sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==}
+
+  performance-now@2.1.0:
+    resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==}
+
+  picocolors@1.1.1:
+    resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
+
+  picomatch@2.3.1:
+    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
+    engines: {node: '>=8.6'}
+
+  picomatch@4.0.2:
+    resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==}
+    engines: {node: '>=12'}
+
+  pidtree@0.3.1:
+    resolution: {integrity: sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==}
+    engines: {node: '>=0.10'}
+    hasBin: true
+
+  pidtree@0.6.0:
+    resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==}
+    engines: {node: '>=0.10'}
+    hasBin: true
+
+  pify@2.3.0:
+    resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
+    engines: {node: '>=0.10.0'}
+
+  pify@3.0.0:
+    resolution: {integrity: sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==}
+    engines: {node: '>=4'}
+
+  pify@5.0.0:
+    resolution: {integrity: sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==}
+    engines: {node: '>=10'}
+
+  pirates@4.0.6:
+    resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==}
+    engines: {node: '>= 6'}
+
+  pkg-dir@4.2.0:
+    resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
+    engines: {node: '>=8'}
+
+  possible-typed-array-names@1.0.0:
+    resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==}
+    engines: {node: '>= 0.4'}
+
+  postcss-attribute-case-insensitive@5.0.2:
+    resolution: {integrity: sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  postcss-calc@8.2.4:
+    resolution: {integrity: sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==}
+    peerDependencies:
+      postcss: ^8.2.2
+
+  postcss-clamp@4.1.0:
+    resolution: {integrity: sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==}
+    engines: {node: '>=7.6.0'}
+    peerDependencies:
+      postcss: ^8.4.6
+
+  postcss-color-functional-notation@4.2.4:
+    resolution: {integrity: sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  postcss-color-hex-alpha@8.0.4:
+    resolution: {integrity: sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.4
+
+  postcss-color-rebeccapurple@7.1.1:
+    resolution: {integrity: sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  postcss-colormin@5.3.1:
+    resolution: {integrity: sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  postcss-convert-values@5.1.3:
+    resolution: {integrity: sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  postcss-custom-media@8.0.2:
+    resolution: {integrity: sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.3
+
+  postcss-custom-properties@12.1.11:
+    resolution: {integrity: sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  postcss-custom-selectors@6.0.3:
+    resolution: {integrity: sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.3
+
+  postcss-dir-pseudo-class@6.0.5:
+    resolution: {integrity: sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  postcss-discard-comments@5.1.2:
+    resolution: {integrity: sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  postcss-discard-duplicates@5.1.0:
+    resolution: {integrity: sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  postcss-discard-empty@5.1.1:
+    resolution: {integrity: sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  postcss-discard-overridden@5.1.0:
+    resolution: {integrity: sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  postcss-double-position-gradients@3.1.2:
+    resolution: {integrity: sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  postcss-env-function@4.0.6:
+    resolution: {integrity: sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.4
+
+  postcss-flexbugs-fixes@5.0.2:
+    resolution: {integrity: sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==}
+    peerDependencies:
+      postcss: ^8.1.4
+
+  postcss-focus-visible@6.0.4:
+    resolution: {integrity: sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.4
+
+  postcss-focus-within@5.0.4:
+    resolution: {integrity: sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.4
+
+  postcss-font-variant@5.0.0:
+    resolution: {integrity: sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==}
+    peerDependencies:
+      postcss: ^8.1.0
+
+  postcss-gap-properties@3.0.5:
+    resolution: {integrity: sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  postcss-image-set-function@4.0.7:
+    resolution: {integrity: sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  postcss-import@15.1.0:
+    resolution: {integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      postcss: ^8.0.0
+
+  postcss-initial@4.0.1:
+    resolution: {integrity: sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==}
+    peerDependencies:
+      postcss: ^8.0.0
+
+  postcss-lab-function@4.2.1:
+    resolution: {integrity: sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  postcss-load-config@3.1.4:
+    resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==}
+    engines: {node: '>= 10'}
+    peerDependencies:
+      postcss: '>=8.0.9'
+      ts-node: '>=9.0.0'
+    peerDependenciesMeta:
+      postcss:
+        optional: true
+      ts-node:
+        optional: true
+
+  postcss-logical@5.0.4:
+    resolution: {integrity: sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.4
+
+  postcss-media-minmax@5.0.0:
+    resolution: {integrity: sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      postcss: ^8.1.0
+
+  postcss-media-query-parser@0.2.3:
+    resolution: {integrity: sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==}
+
+  postcss-merge-longhand@5.1.7:
+    resolution: {integrity: sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  postcss-merge-rules@5.1.4:
+    resolution: {integrity: sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  postcss-minify-font-values@5.1.0:
+    resolution: {integrity: sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  postcss-minify-gradients@5.1.1:
+    resolution: {integrity: sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  postcss-minify-params@5.1.4:
+    resolution: {integrity: sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  postcss-minify-selectors@5.2.1:
+    resolution: {integrity: sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  postcss-modules-extract-imports@3.1.0:
+    resolution: {integrity: sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==}
+    engines: {node: ^10 || ^12 || >= 14}
+    peerDependencies:
+      postcss: ^8.1.0
+
+  postcss-modules-local-by-default@4.0.5:
+    resolution: {integrity: sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==}
+    engines: {node: ^10 || ^12 || >= 14}
+    peerDependencies:
+      postcss: ^8.1.0
+
+  postcss-modules-scope@3.2.0:
+    resolution: {integrity: sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==}
+    engines: {node: ^10 || ^12 || >= 14}
+    peerDependencies:
+      postcss: ^8.1.0
+
+  postcss-modules-values@4.0.0:
+    resolution: {integrity: sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==}
+    engines: {node: ^10 || ^12 || >= 14}
+    peerDependencies:
+      postcss: ^8.1.0
+
+  postcss-modules@4.3.1:
+    resolution: {integrity: sha512-ItUhSUxBBdNamkT3KzIZwYNNRFKmkJrofvC2nWab3CPKhYBQ1f27XXh1PAPE27Psx58jeelPsxWB/+og+KEH0Q==}
+    peerDependencies:
+      postcss: ^8.0.0
+
+  postcss-nesting@10.2.0:
+    resolution: {integrity: sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  postcss-normalize-charset@5.1.0:
+    resolution: {integrity: sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  postcss-normalize-display-values@5.1.0:
+    resolution: {integrity: sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  postcss-normalize-positions@5.1.1:
+    resolution: {integrity: sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  postcss-normalize-repeat-style@5.1.1:
+    resolution: {integrity: sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  postcss-normalize-string@5.1.0:
+    resolution: {integrity: sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  postcss-normalize-timing-functions@5.1.0:
+    resolution: {integrity: sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  postcss-normalize-unicode@5.1.1:
+    resolution: {integrity: sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  postcss-normalize-url@5.1.0:
+    resolution: {integrity: sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  postcss-normalize-whitespace@5.1.1:
+    resolution: {integrity: sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  postcss-opacity-percentage@1.1.3:
+    resolution: {integrity: sha512-An6Ba4pHBiDtyVpSLymUUERMo2cU7s+Obz6BTrS+gxkbnSBNKSuD0AVUc+CpBMrpVPKKfoVz0WQCX+Tnst0i4A==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  postcss-ordered-values@5.1.3:
+    resolution: {integrity: sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  postcss-overflow-shorthand@3.0.4:
+    resolution: {integrity: sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  postcss-page-break@3.0.4:
+    resolution: {integrity: sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==}
+    peerDependencies:
+      postcss: ^8
+
+  postcss-place@7.0.5:
+    resolution: {integrity: sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  postcss-preset-env@7.8.3:
+    resolution: {integrity: sha512-T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  postcss-pseudo-class-any-link@7.1.6:
+    resolution: {integrity: sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  postcss-reduce-initial@5.1.2:
+    resolution: {integrity: sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  postcss-reduce-transforms@5.1.0:
+    resolution: {integrity: sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  postcss-replace-overflow-wrap@4.0.0:
+    resolution: {integrity: sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==}
+    peerDependencies:
+      postcss: ^8.0.3
+
+  postcss-resolve-nested-selector@0.1.6:
+    resolution: {integrity: sha512-0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw==}
+
+  postcss-rtlcss@4.0.9:
+    resolution: {integrity: sha512-dCNKEf+FgTv+EA3XI8ysg2RnpS5s3/iZmU+9qpCNFxHU/BhK+4hz7jyCsCAfo0CLnDrMPtaQENhwb+EGm1wh7Q==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      postcss: ^8.4.21
+
+  postcss-safe-parser@6.0.0:
+    resolution: {integrity: sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==}
+    engines: {node: '>=12.0'}
+    peerDependencies:
+      postcss: ^8.3.3
+
+  postcss-selector-not@6.0.1:
+    resolution: {integrity: sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==}
+    engines: {node: ^12 || ^14 || >=16}
+    peerDependencies:
+      postcss: ^8.2
+
+  postcss-selector-parser@6.1.2:
+    resolution: {integrity: sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==}
+    engines: {node: '>=4'}
+
+  postcss-svgo@5.1.0:
+    resolution: {integrity: sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  postcss-unique-selectors@5.1.1:
+    resolution: {integrity: sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  postcss-value-parser@4.2.0:
+    resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
+
+  postcss@8.4.31:
+    resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==}
+    engines: {node: ^10 || ^12 || >=14}
+
+  postcss@8.4.47:
+    resolution: {integrity: sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==}
+    engines: {node: ^10 || ^12 || >=14}
+
+  prelude-ls@1.2.1:
+    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
+    engines: {node: '>= 0.8.0'}
+
+  prettier-linter-helpers@1.0.0:
+    resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==}
+    engines: {node: '>=6.0.0'}
+
+  prettier@2.8.8:
+    resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==}
+    engines: {node: '>=10.13.0'}
+    hasBin: true
+
+  pretty-bytes@5.6.0:
+    resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==}
+    engines: {node: '>=6'}
+
+  pretty-format@29.7.0:
+    resolution: {integrity: sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  prisma@5.17.0:
+    resolution: {integrity: sha512-m4UWkN5lBE6yevqeOxEvmepnL5cNPEjzMw2IqDB59AcEV6w7D8vGljDLd1gPFH+W6gUxw9x7/RmN5dCS/WTPxA==}
+    engines: {node: '>=16.13'}
+    hasBin: true
+
+  process@0.11.10:
+    resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
+    engines: {node: '>= 0.6.0'}
+
+  promise.series@0.2.0:
+    resolution: {integrity: sha512-VWQJyU2bcDTgZw8kpfBpB/ejZASlCrzwz5f2hjb/zlujOEB4oeiAhHygAWq8ubsX2GVkD4kCU5V2dwOTaCY5EQ==}
+    engines: {node: '>=0.12'}
+
+  prompts@2.4.2:
+    resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==}
+    engines: {node: '>= 6'}
+
+  prop-types@15.8.1:
+    resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
+
+  property-expr@2.0.6:
+    resolution: {integrity: sha512-SVtmxhRE/CGkn3eZY1T6pC8Nln6Fr/lu1mKSgRud0eC73whjGfoAogbn78LkD8aFL0zz3bAFerKSnOl7NlErBA==}
+
+  proxy-from-env@1.0.0:
+    resolution: {integrity: sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==}
+
+  psl@1.9.0:
+    resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==}
+
+  pump@3.0.2:
+    resolution: {integrity: sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==}
+
+  punycode@2.3.1:
+    resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
+    engines: {node: '>=6'}
+
+  pure-rand@6.1.0:
+    resolution: {integrity: sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==}
+
+  qs@6.13.0:
+    resolution: {integrity: sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==}
+    engines: {node: '>=0.6'}
+
+  querystringify@2.2.0:
+    resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==}
+
+  queue-microtask@1.2.3:
+    resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
+
+  quick-lru@4.0.1:
+    resolution: {integrity: sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==}
+    engines: {node: '>=8'}
+
+  quick-lru@5.1.1:
+    resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==}
+    engines: {node: '>=10'}
+
+  raf-schd@4.0.3:
+    resolution: {integrity: sha512-tQkJl2GRWh83ui2DiPTJz9wEiMN20syf+5oKfB03yYP7ioZcJwsIK8FjrtLwH1m7C7e+Tt2yYBlrOpdT+dyeIQ==}
+
+  randombytes@2.1.0:
+    resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==}
+
+  react-basics@0.125.0:
+    resolution: {integrity: sha512-8swjTaKfenwb+NunwzQo16V+dCA/38Kd+PSYWpBFyNmlFzs3Ax2ZgnysxDhW9IgfFr4wR6/0gzD3S31WzXq6Kw==}
+    engines: {node: '>= 14'}
+    peerDependencies:
+      react: ^18.2.0
+      react-dom: ^18.2.0
+
+  react-beautiful-dnd@13.1.1:
+    resolution: {integrity: sha512-0Lvs4tq2VcrEjEgDXHjT98r+63drkKEgqyxdA7qD3mvKwga6a5SscbdLPO2IExotU1jW8L0Ksdl0Cj2AF67nPQ==}
+    deprecated: 'react-beautiful-dnd is now deprecated. Context and options: https://github.com/atlassian/react-beautiful-dnd/issues/2672'
+    peerDependencies:
+      react: ^16.8.5 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.8.5 || ^17.0.0 || ^18.0.0
+
+  react-dom@18.3.1:
+    resolution: {integrity: sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==}
+    peerDependencies:
+      react: ^18.3.1
+
+  react-error-boundary@4.1.2:
+    resolution: {integrity: sha512-GQDxZ5Jd+Aq/qUxbCm1UtzmL/s++V7zKgE8yMktJiCQXCCFZnMZh9ng+6/Ne6PjNSXH0L9CjeOEREfRnq6Duag==}
+    peerDependencies:
+      react: '>=16.13.1'
+
+  react-hook-form@7.53.1:
+    resolution: {integrity: sha512-6aiQeBda4zjcuaugWvim9WsGqisoUk+etmFEsSUMm451/Ic8L/UAb7sRtMj3V+Hdzm6mMjU1VhiSzYUZeBm0Vg==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: ^16.8.0 || ^17 || ^18 || ^19
+
+  react-intl@6.8.4:
+    resolution: {integrity: sha512-UKYrCIztyvSiZCpvHjDwAHlXT735fDioABVP+uhRAOhDSBS9NQ2vVbxiUikvVEBdr2b0cTe1tUfOfvhbmSPi/A==}
+    peerDependencies:
+      react: ^16.6.0 || 17 || 18
+      typescript: ^4.7 || 5
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  react-is@16.13.1:
+    resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
+
+  react-is@17.0.2:
+    resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
+
+  react-is@18.3.1:
+    resolution: {integrity: sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==}
+
+  react-redux@7.2.9:
+    resolution: {integrity: sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==}
+    peerDependencies:
+      react: ^16.8.3 || ^17 || ^18
+      react-dom: '*'
+      react-native: '*'
+    peerDependenciesMeta:
+      react-dom:
+        optional: true
+      react-native:
+        optional: true
+
+  react-simple-maps@2.3.0:
+    resolution: {integrity: sha512-IZVeiPSRZKwD6I/2NvXpQ2uENYGDGZp8DvZjkapcxuJ/LQHTfl+Byb+KNgY7s+iatRA2ad8LnZ3AgqcjziCCsw==}
+    peerDependencies:
+      prop-types: ^15.7.2
+      react: ^16.8.0 || 17.x
+      react-dom: ^16.8.0 || 17.x
+
+  react-use-measure@2.1.1:
+    resolution: {integrity: sha512-nocZhN26cproIiIduswYpV5y5lQpSQS1y/4KuvUCjSKmw7ZWIS/+g3aFnX3WdBkyuGUtTLif3UTqnLLhbDoQig==}
+    peerDependencies:
+      react: '>=16.13'
+      react-dom: '>=16.13'
+
+  react-window@1.8.10:
+    resolution: {integrity: sha512-Y0Cx+dnU6NLa5/EvoHukUD0BklJ8qITCtVEPY1C/nL8wwoZ0b5aEw8Ff1dOVHw7fCzMt55XfJDd8S8W8LCaUCg==}
+    engines: {node: '>8.0.0'}
+    peerDependencies:
+      react: ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
+
+  react@18.3.1:
+    resolution: {integrity: sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==}
+    engines: {node: '>=0.10.0'}
+
+  read-babelrc-up@1.1.0:
+    resolution: {integrity: sha512-fcl0JeI85Ss3//kfC3z2rsG2VxSiHl1bJgpjQWrne2YuQEewZpAgAjb17A6q/Q3ozWeZsUSroiIBVsnjmOU8vw==}
+    engines: {node: '>=10'}
+
+  read-cache@1.0.0:
+    resolution: {integrity: sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==}
+
+  read-pkg-up@7.0.1:
+    resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==}
+    engines: {node: '>=8'}
+
+  read-pkg-up@8.0.0:
+    resolution: {integrity: sha512-snVCqPczksT0HS2EC+SxUndvSzn6LRCwpfSvLrIfR5BKDQQZMaI6jPRC9dYvYFDRAuFEAnkwww8kBBNE/3VvzQ==}
+    engines: {node: '>=12'}
+
+  read-pkg@3.0.0:
+    resolution: {integrity: sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==}
+    engines: {node: '>=4'}
+
+  read-pkg@5.2.0:
+    resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==}
+    engines: {node: '>=8'}
+
+  read-pkg@6.0.0:
+    resolution: {integrity: sha512-X1Fu3dPuk/8ZLsMhEj5f4wFAF0DWoK7qhGJvgaijocXxBmSToKfbFtqbxMO7bVjNA1dmE5huAzjXj/ey86iw9Q==}
+    engines: {node: '>=12'}
+
+  redent@3.0.0:
+    resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==}
+    engines: {node: '>=8'}
+
+  redent@4.0.0:
+    resolution: {integrity: sha512-tYkDkVVtYkSVhuQ4zBgfvciymHaeuel+zFKXShfDnFP5SyVEP7qo70Rf1jTOTCx3vGNAbnEi/xFkcfQVMIBWag==}
+    engines: {node: '>=12'}
+
+  redis@4.7.0:
+    resolution: {integrity: sha512-zvmkHEAdGMn+hMRXuMBtu4Vo5P6rHQjLoHftu+lBqq8ZTA3RCVC/WzD790bkKKiNFp7d5/9PcSD19fJyyRvOdQ==}
+
+  redux@4.2.1:
+    resolution: {integrity: sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==}
+
+  reflect.getprototypeof@1.0.6:
+    resolution: {integrity: sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==}
+    engines: {node: '>= 0.4'}
+
+  regenerate-unicode-properties@10.2.0:
+    resolution: {integrity: sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==}
+    engines: {node: '>=4'}
+
+  regenerate@1.4.2:
+    resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==}
+
+  regenerator-runtime@0.14.1:
+    resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==}
+
+  regenerator-transform@0.15.2:
+    resolution: {integrity: sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==}
+
+  regexp.prototype.flags@1.5.3:
+    resolution: {integrity: sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==}
+    engines: {node: '>= 0.4'}
+
+  regexpu-core@6.1.1:
+    resolution: {integrity: sha512-k67Nb9jvwJcJmVpw0jPttR1/zVfnKf8Km0IPatrU/zJ5XeG3+Slx0xLXs9HByJSzXzrlz5EDvN6yLNMDc2qdnw==}
+    engines: {node: '>=4'}
+
+  regjsgen@0.8.0:
+    resolution: {integrity: sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==}
+
+  regjsparser@0.11.1:
+    resolution: {integrity: sha512-1DHODs4B8p/mQHU9kr+jv8+wIC9mtG4eBHxWxIq5mhjE3D5oORhCc6deRKzTjs9DcfRFmj9BHSDguZklqCGFWQ==}
+    hasBin: true
+
+  request-ip@3.3.0:
+    resolution: {integrity: sha512-cA6Xh6e0fDBBBwH77SLJaJPBmD3nWVAcF9/XAcsrIHdjhFzFiB5aNQFytdjCGPezU3ROwrR11IddKAM08vohxA==}
+
+  request-progress@3.0.0:
+    resolution: {integrity: sha512-MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg==}
+
+  require-directory@2.1.1:
+    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
+    engines: {node: '>=0.10.0'}
+
+  require-from-string@2.0.2:
+    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
+    engines: {node: '>=0.10.0'}
+
+  requires-port@1.0.0:
+    resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
+
+  resolve-cwd@3.0.0:
+    resolution: {integrity: sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==}
+    engines: {node: '>=8'}
+
+  resolve-from@4.0.0:
+    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
+    engines: {node: '>=4'}
+
+  resolve-from@5.0.0:
+    resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
+    engines: {node: '>=8'}
+
+  resolve-pkg-maps@1.0.0:
+    resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==}
+
+  resolve.exports@2.0.2:
+    resolution: {integrity: sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==}
+    engines: {node: '>=10'}
+
+  resolve@1.22.8:
+    resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==}
+    hasBin: true
+
+  resolve@2.0.0-next.5:
+    resolution: {integrity: sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==}
+    hasBin: true
+
+  restore-cursor@3.1.0:
+    resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==}
+    engines: {node: '>=8'}
+
+  restore-cursor@4.0.0:
+    resolution: {integrity: sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  reusify@1.0.4:
+    resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
+    engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
+
+  rfdc@1.4.1:
+    resolution: {integrity: sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==}
+
+  rimraf@3.0.2:
+    resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
+    deprecated: Rimraf versions prior to v4 are no longer supported
+    hasBin: true
+
+  rollup-plugin-copy@3.5.0:
+    resolution: {integrity: sha512-wI8D5dvYovRMx/YYKtUNt3Yxaw4ORC9xo6Gt9t22kveWz1enG9QrhVlagzwrxSC455xD1dHMKhIJkbsQ7d48BA==}
+    engines: {node: '>=8.3'}
+
+  rollup-plugin-delete@2.1.0:
+    resolution: {integrity: sha512-TEbqJd7giLvzQDTu4jSPufwhTJs/iYVN2LfR/YIYkqjC/oZ0/h9Q0AeljifIhzBzJYZtHQTWKEbMms5fbh54pw==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      rollup: '*'
+
+  rollup-plugin-dts@5.3.1:
+    resolution: {integrity: sha512-gusMi+Z4gY/JaEQeXnB0RUdU82h1kF0WYzCWgVmV4p3hWXqelaKuCvcJawfeg+EKn2T1Ie+YWF2OiN1/L8bTVg==}
+    engines: {node: '>=v14.21.3'}
+    peerDependencies:
+      rollup: ^3.0
+      typescript: ^4.1 || ^5.0
+
+  rollup-plugin-esbuild@5.0.0:
+    resolution: {integrity: sha512-1cRIOHAPh8WQgdQQyyvFdeOdxuiyk+zB5zJ5+YOwrZP4cJ0MT3Fs48pQxrZeyZHcn+klFherytILVfE4aYrneg==}
+    engines: {node: '>=14.18.0', npm: '>=8.0.0'}
+    peerDependencies:
+      esbuild: '>=0.10.1'
+      rollup: ^1.20.0 || ^2.0.0 || ^3.0.0
+
+  rollup-plugin-node-externals@6.1.2:
+    resolution: {integrity: sha512-2TWan0u0/zHcgPrKpIPgKSY8OMqwDAYD380I0hxx7iUQw8mrN34DWwG9sQUMEo5Yy4xd6/5QEAySYgiKN9fdBQ==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      rollup: ^3.0.0 || ^4.0.0
+
+  rollup-plugin-postcss@4.0.2:
+    resolution: {integrity: sha512-05EaY6zvZdmvPUDi3uCcAQoESDcYnv8ogJJQRp6V5kZ6J6P7uAVJlrTZcaaA20wTH527YTnKfkAoPxWI/jPp4w==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      postcss: 8.x
+
+  rollup-plugin-terser@7.0.2:
+    resolution: {integrity: sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==}
+    deprecated: This package has been deprecated and is no longer maintained. Please use @rollup/plugin-terser
+    peerDependencies:
+      rollup: ^2.0.0
+
+  rollup-pluginutils@2.8.2:
+    resolution: {integrity: sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==}
+
+  rollup@3.29.5:
+    resolution: {integrity: sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==}
+    engines: {node: '>=14.18.0', npm: '>=8.0.0'}
+    hasBin: true
+
+  rtlcss@4.1.1:
+    resolution: {integrity: sha512-/oVHgBtnPNcggP2aVXQjSy6N1mMAfHg4GSag0QtZBlD5bdDgAHwr4pydqJGd+SUCu9260+Pjqbjwtvu7EMH1KQ==}
+    engines: {node: '>=12.0.0'}
+    hasBin: true
+
+  run-parallel@1.2.0:
+    resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
+
+  rxjs@7.8.1:
+    resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==}
+
+  safe-array-concat@1.1.2:
+    resolution: {integrity: sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==}
+    engines: {node: '>=0.4'}
+
+  safe-buffer@5.2.1:
+    resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
+
+  safe-identifier@0.4.2:
+    resolution: {integrity: sha512-6pNbSMW6OhAi9j+N8V+U715yBQsaWJ7eyEUaOrawX+isg5ZxhUlV1NipNtgaKHmFGiABwt+ZF04Ii+3Xjkg+8w==}
+
+  safe-regex-test@1.0.3:
+    resolution: {integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==}
+    engines: {node: '>= 0.4'}
+
+  safer-buffer@2.1.2:
+    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
+
+  scheduler@0.23.2:
+    resolution: {integrity: sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==}
+
+  schema-utils@2.7.1:
+    resolution: {integrity: sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==}
+    engines: {node: '>= 8.9.0'}
+
+  semver@5.7.2:
+    resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==}
+    hasBin: true
+
+  semver@6.3.1:
+    resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
+    hasBin: true
+
+  semver@7.6.3:
+    resolution: {integrity: sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  serialize-javascript@4.0.0:
+    resolution: {integrity: sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==}
+
+  set-function-length@1.2.2:
+    resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==}
+    engines: {node: '>= 0.4'}
+
+  set-function-name@2.0.2:
+    resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==}
+    engines: {node: '>= 0.4'}
+
+  shebang-command@1.2.0:
+    resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==}
+    engines: {node: '>=0.10.0'}
+
+  shebang-command@2.0.0:
+    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
+    engines: {node: '>=8'}
+
+  shebang-regex@1.0.0:
+    resolution: {integrity: sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==}
+    engines: {node: '>=0.10.0'}
+
+  shebang-regex@3.0.0:
+    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
+    engines: {node: '>=8'}
+
+  shell-quote@1.8.1:
+    resolution: {integrity: sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==}
+
+  side-channel@1.0.6:
+    resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==}
+    engines: {node: '>= 0.4'}
+
+  signal-exit@3.0.7:
+    resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
+
+  signal-exit@4.1.0:
+    resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
+    engines: {node: '>=14'}
+
+  sisteransi@1.0.5:
+    resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
+
+  slash@3.0.0:
+    resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
+    engines: {node: '>=8'}
+
+  slice-ansi@3.0.0:
+    resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
+    engines: {node: '>=8'}
+
+  slice-ansi@4.0.0:
+    resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==}
+    engines: {node: '>=10'}
+
+  slice-ansi@5.0.0:
+    resolution: {integrity: sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==}
+    engines: {node: '>=12'}
+
+  snake-case@3.0.4:
+    resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
+
+  sort-keys@4.2.0:
+    resolution: {integrity: sha512-aUYIEU/UviqPgc8mHR6IW1EGxkAXpeRETYcrzg8cLAvUPZcpAlleSXHV2mY7G12GphSH6Gzv+4MMVSSkbdteHg==}
+    engines: {node: '>=8'}
+
+  source-map-js@1.2.1:
+    resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
+    engines: {node: '>=0.10.0'}
+
+  source-map-support@0.5.13:
+    resolution: {integrity: sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==}
+
+  source-map-support@0.5.21:
+    resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
+
+  source-map@0.6.1:
+    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
+    engines: {node: '>=0.10.0'}
+
+  spdx-correct@3.2.0:
+    resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==}
+
+  spdx-exceptions@2.5.0:
+    resolution: {integrity: sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==}
+
+  spdx-expression-parse@3.0.1:
+    resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==}
+
+  spdx-license-ids@3.0.20:
+    resolution: {integrity: sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==}
+
+  sprintf-js@1.0.3:
+    resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
+
+  sshpk@1.18.0:
+    resolution: {integrity: sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==}
+    engines: {node: '>=0.10.0'}
+    hasBin: true
+
+  stable@0.1.8:
+    resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
+    deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
+
+  stack-utils@2.0.6:
+    resolution: {integrity: sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==}
+    engines: {node: '>=10'}
+
+  streamsearch@1.1.0:
+    resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==}
+    engines: {node: '>=10.0.0'}
+
+  string-argv@0.3.2:
+    resolution: {integrity: sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==}
+    engines: {node: '>=0.6.19'}
+
+  string-hash@1.1.3:
+    resolution: {integrity: sha512-kJUvRUFK49aub+a7T1nNE66EJbZBMnBgoC1UbCZ5n6bsZKBRga4KgBRTMn/pFkeCZSYtNeSyMxPDM0AXWELk2A==}
+
+  string-length@4.0.2:
+    resolution: {integrity: sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==}
+    engines: {node: '>=10'}
+
+  string-width@4.2.3:
+    resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
+    engines: {node: '>=8'}
+
+  string-width@5.1.2:
+    resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==}
+    engines: {node: '>=12'}
+
+  string.prototype.includes@2.0.1:
+    resolution: {integrity: sha512-o7+c9bW6zpAdJHTtujeePODAhkuicdAryFsfVKwA+wGw89wJ4GTY484WTucM9hLtDEOpOvI+aHnzqnC5lHp4Rg==}
+    engines: {node: '>= 0.4'}
+
+  string.prototype.matchall@4.0.11:
+    resolution: {integrity: sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==}
+    engines: {node: '>= 0.4'}
+
+  string.prototype.padend@3.1.6:
+    resolution: {integrity: sha512-XZpspuSB7vJWhvJc9DLSlrXl1mcA2BdoY5jjnS135ydXqLoqhs96JjDtCkjJEQHvfqZIp9hBuBMgI589peyx9Q==}
+    engines: {node: '>= 0.4'}
+
+  string.prototype.repeat@1.0.0:
+    resolution: {integrity: sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==}
+
+  string.prototype.trim@1.2.9:
+    resolution: {integrity: sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==}
+    engines: {node: '>= 0.4'}
+
+  string.prototype.trimend@1.0.8:
+    resolution: {integrity: sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==}
+
+  string.prototype.trimstart@1.0.8:
+    resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==}
+    engines: {node: '>= 0.4'}
+
+  strip-ansi@6.0.1:
+    resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
+    engines: {node: '>=8'}
+
+  strip-ansi@7.1.0:
+    resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==}
+    engines: {node: '>=12'}
+
+  strip-bom@3.0.0:
+    resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
+    engines: {node: '>=4'}
+
+  strip-bom@4.0.0:
+    resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==}
+    engines: {node: '>=8'}
+
+  strip-final-newline@2.0.0:
+    resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}
+    engines: {node: '>=6'}
+
+  strip-final-newline@3.0.0:
+    resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
+    engines: {node: '>=12'}
+
+  strip-indent@3.0.0:
+    resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
+    engines: {node: '>=8'}
+
+  strip-indent@4.0.0:
+    resolution: {integrity: sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==}
+    engines: {node: '>=12'}
+
+  strip-json-comments@3.1.1:
+    resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
+    engines: {node: '>=8'}
+
+  style-inject@0.3.0:
+    resolution: {integrity: sha512-IezA2qp+vcdlhJaVm5SOdPPTUu0FCEqfNSli2vRuSIBbu5Nq5UvygTk/VzeCqfLz2Atj3dVII5QBKGZRZ0edzw==}
+
+  style-search@0.1.0:
+    resolution: {integrity: sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==}
+
+  styled-jsx@5.1.1:
+    resolution: {integrity: sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==}
+    engines: {node: '>= 12.0.0'}
+    peerDependencies:
+      '@babel/core': '*'
+      babel-plugin-macros: '*'
+      react: '>= 16.8.0 || 17.x.x || ^18.0.0-0'
+    peerDependenciesMeta:
+      '@babel/core':
+        optional: true
+      babel-plugin-macros:
+        optional: true
+
+  stylehacks@5.1.1:
+    resolution: {integrity: sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  stylelint-config-css-modules@4.4.0:
+    resolution: {integrity: sha512-J93MtxPjRzs/TjwbJ5y9SQy4iIqULXwL1CF1yx2tQCJfS/VZUcDAmoGOwqlLbhHXSQtZO5XQiA75NVWUR3KDCQ==}
+    peerDependencies:
+      stylelint: ^14.5.1 || ^15.0.0 || ^16.0.0
+
+  stylelint-config-prettier@9.0.5:
+    resolution: {integrity: sha512-U44lELgLZhbAD/xy/vncZ2Pq8sh2TnpiPvo38Ifg9+zeioR+LAkHu0i6YORIOxFafZoVg0xqQwex6e6F25S5XA==}
+    engines: {node: '>= 12'}
+    hasBin: true
+    peerDependencies:
+      stylelint: '>= 11.x < 15'
+
+  stylelint-config-recommended@14.0.1:
+    resolution: {integrity: sha512-bLvc1WOz/14aPImu/cufKAZYfXs/A/owZfSMZ4N+16WGXLoX5lOir53M6odBxvhgmgdxCVnNySJmZKx73T93cg==}
+    engines: {node: '>=18.12.0'}
+    peerDependencies:
+      stylelint: ^16.1.0
+
+  stylelint-scss@6.8.1:
+    resolution: {integrity: sha512-al+5eRb72bKrFyVAY+CLWKUMX+k+wsDCgyooSfhISJA2exqnJq1PX1iIIpdrvhu3GtJgNJZl9/BIW6EVSMCxdg==}
+    engines: {node: '>=18.12.0'}
+    peerDependencies:
+      stylelint: ^16.0.2
+
+  stylelint@15.11.0:
+    resolution: {integrity: sha512-78O4c6IswZ9TzpcIiQJIN49K3qNoXTM8zEJzhaTE/xRTCZswaovSEVIa/uwbOltZrk16X4jAxjaOhzz/hTm1Kw==}
+    engines: {node: ^14.13.1 || >=16.0.0}
+    hasBin: true
+
+  supports-color@5.5.0:
+    resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
+    engines: {node: '>=4'}
+
+  supports-color@7.2.0:
+    resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
+    engines: {node: '>=8'}
+
+  supports-color@8.1.1:
+    resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==}
+    engines: {node: '>=10'}
+
+  supports-hyperlinks@3.1.0:
+    resolution: {integrity: sha512-2rn0BZ+/f7puLOHZm1HOJfwBggfaHXUpPUSSG/SWM4TWp5KCfmNYwnC3hruy2rZlMnmWZ+QAGpZfchu3f3695A==}
+    engines: {node: '>=14.18'}
+
+  supports-preserve-symlinks-flag@1.0.0:
+    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
+    engines: {node: '>= 0.4'}
+
+  svg-parser@2.0.4:
+    resolution: {integrity: sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==}
+
+  svg-tags@1.0.0:
+    resolution: {integrity: sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==}
+
+  svgo@2.8.0:
+    resolution: {integrity: sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==}
+    engines: {node: '>=10.13.0'}
+    hasBin: true
+
+  svgo@3.3.2:
+    resolution: {integrity: sha512-OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw==}
+    engines: {node: '>=14.0.0'}
+    hasBin: true
+
+  table@6.8.2:
+    resolution: {integrity: sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==}
+    engines: {node: '>=10.0.0'}
+
+  tapable@2.2.1:
+    resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
+    engines: {node: '>=6'}
+
+  tar@6.2.1:
+    resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==}
+    engines: {node: '>=10'}
+
+  terser@5.36.0:
+    resolution: {integrity: sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  test-exclude@6.0.0:
+    resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==}
+    engines: {node: '>=8'}
+
+  text-table@0.2.0:
+    resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
+
+  thenby@1.3.4:
+    resolution: {integrity: sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ==}
+
+  throttleit@1.0.1:
+    resolution: {integrity: sha512-vDZpf9Chs9mAdfY046mcPt8fg5QSZr37hEH4TXYBnDF+izxgrbRGUAAaBvIk/fJm9aOFCGFd1EsNg5AZCbnQCQ==}
+
+  through@2.3.8:
+    resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
+
+  tiny-invariant@1.3.3:
+    resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==}
+
+  tiny-lru@11.2.11:
+    resolution: {integrity: sha512-27BIW0dIWTYYoWNnqSmoNMKe5WIbkXsc0xaCQHd3/3xT2XMuMJrzHdrO9QBFR14emBz1Bu0dOAs2sCBBrvgPQA==}
+    engines: {node: '>=12'}
+
+  tmp@0.2.3:
+    resolution: {integrity: sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==}
+    engines: {node: '>=14.14'}
+
+  tmpl@1.0.5:
+    resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==}
+
+  to-regex-range@5.0.1:
+    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
+    engines: {node: '>=8.0'}
+
+  topojson-client@3.1.0:
+    resolution: {integrity: sha512-605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw==}
+    hasBin: true
+
+  toposort@2.0.2:
+    resolution: {integrity: sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==}
+
+  tough-cookie@4.1.4:
+    resolution: {integrity: sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==}
+    engines: {node: '>=6'}
+
+  tree-kill@1.2.2:
+    resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==}
+    hasBin: true
+
+  trim-newlines@3.0.1:
+    resolution: {integrity: sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==}
+    engines: {node: '>=8'}
+
+  trim-newlines@4.1.1:
+    resolution: {integrity: sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ==}
+    engines: {node: '>=12'}
+
+  ts-api-utils@1.3.0:
+    resolution: {integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==}
+    engines: {node: '>=16'}
+    peerDependencies:
+      typescript: '>=4.2.0'
+
+  ts-jest@29.2.5:
+    resolution: {integrity: sha512-KD8zB2aAZrcKIdGk4OwpJggeLcH1FgrICqDSROWqlnJXGCXK4Mn6FcdK2B6670Xr73lHMG1kHw8R87A0ecZ+vA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0}
+    hasBin: true
+    peerDependencies:
+      '@babel/core': '>=7.0.0-beta.0 <8'
+      '@jest/transform': ^29.0.0
+      '@jest/types': ^29.0.0
+      babel-jest: ^29.0.0
+      esbuild: '*'
+      jest: ^29.0.0
+      typescript: '>=4.3 <6'
+    peerDependenciesMeta:
+      '@babel/core':
+        optional: true
+      '@jest/transform':
+        optional: true
+      '@jest/types':
+        optional: true
+      babel-jest:
+        optional: true
+      esbuild:
+        optional: true
+
+  ts-node@10.9.2:
+    resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==}
+    hasBin: true
+    peerDependencies:
+      '@swc/core': '>=1.2.50'
+      '@swc/wasm': '>=1.2.50'
+      '@types/node': '*'
+      typescript: '>=2.7'
+    peerDependenciesMeta:
+      '@swc/core':
+        optional: true
+      '@swc/wasm':
+        optional: true
+
+  tsconfig-paths@3.15.0:
+    resolution: {integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==}
+
+  tslib@1.14.1:
+    resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
+
+  tslib@2.8.0:
+    resolution: {integrity: sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==}
+
+  tsutils@3.21.0:
+    resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
+    engines: {node: '>= 6'}
+    peerDependencies:
+      typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
+
+  tunnel-agent@0.6.0:
+    resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
+
+  tweetnacl@0.14.5:
+    resolution: {integrity: sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==}
+
+  type-check@0.4.0:
+    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
+    engines: {node: '>= 0.8.0'}
+
+  type-detect@4.0.8:
+    resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}
+    engines: {node: '>=4'}
+
+  type-fest@0.13.1:
+    resolution: {integrity: sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==}
+    engines: {node: '>=10'}
+
+  type-fest@0.20.2:
+    resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
+    engines: {node: '>=10'}
+
+  type-fest@0.21.3:
+    resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
+    engines: {node: '>=10'}
+
+  type-fest@0.6.0:
+    resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==}
+    engines: {node: '>=8'}
+
+  type-fest@0.8.1:
+    resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==}
+    engines: {node: '>=8'}
+
+  type-fest@1.4.0:
+    resolution: {integrity: sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==}
+    engines: {node: '>=10'}
+
+  typed-array-buffer@1.0.2:
+    resolution: {integrity: sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==}
+    engines: {node: '>= 0.4'}
+
+  typed-array-byte-length@1.0.1:
+    resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==}
+    engines: {node: '>= 0.4'}
+
+  typed-array-byte-offset@1.0.2:
+    resolution: {integrity: sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==}
+    engines: {node: '>= 0.4'}
+
+  typed-array-length@1.0.6:
+    resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==}
+    engines: {node: '>= 0.4'}
+
+  typedarray-to-buffer@3.1.5:
+    resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==}
+
+  typescript@4.9.5:
+    resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==}
+    engines: {node: '>=4.2.0'}
+    hasBin: true
+
+  typescript@5.6.3:
+    resolution: {integrity: sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==}
+    engines: {node: '>=14.17'}
+    hasBin: true
+
+  unbox-primitive@1.0.2:
+    resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
+
+  undici-types@6.19.8:
+    resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==}
+
+  unicode-canonical-property-names-ecmascript@2.0.1:
+    resolution: {integrity: sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==}
+    engines: {node: '>=4'}
+
+  unicode-match-property-ecmascript@2.0.0:
+    resolution: {integrity: sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==}
+    engines: {node: '>=4'}
+
+  unicode-match-property-value-ecmascript@2.2.0:
+    resolution: {integrity: sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==}
+    engines: {node: '>=4'}
+
+  unicode-property-aliases-ecmascript@2.1.0:
+    resolution: {integrity: sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==}
+    engines: {node: '>=4'}
+
+  universalify@0.1.2:
+    resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
+    engines: {node: '>= 4.0.0'}
+
+  universalify@0.2.0:
+    resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==}
+    engines: {node: '>= 4.0.0'}
+
+  universalify@2.0.1:
+    resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
+    engines: {node: '>= 10.0.0'}
+
+  untildify@4.0.0:
+    resolution: {integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==}
+    engines: {node: '>=8'}
+
+  update-browserslist-db@1.1.1:
+    resolution: {integrity: sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==}
+    hasBin: true
+    peerDependencies:
+      browserslist: '>= 4.21.0'
+
+  uri-js@4.4.1:
+    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
+
+  url-parse@1.5.10:
+    resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==}
+
+  use-memo-one@1.1.3:
+    resolution: {integrity: sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+
+  use-sync-external-store@1.2.2:
+    resolution: {integrity: sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+
+  util-deprecate@1.0.2:
+    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
+
+  uuid@8.3.2:
+    resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
+    hasBin: true
+
+  uuid@9.0.1:
+    resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==}
+    hasBin: true
+
+  v8-compile-cache-lib@3.0.1:
+    resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
+
+  v8-to-istanbul@9.3.0:
+    resolution: {integrity: sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==}
+    engines: {node: '>=10.12.0'}
+
+  validate-npm-package-license@3.0.4:
+    resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==}
+
+  vary@1.1.2:
+    resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
+    engines: {node: '>= 0.8'}
+
+  verror@1.10.0:
+    resolution: {integrity: sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==}
+    engines: {'0': node >=0.6.0}
+
+  vue@3.5.12:
+    resolution: {integrity: sha512-CLVZtXtn2ItBIi/zHZ0Sg1Xkb7+PU32bJJ8Bmy7ts3jxXTcbfsEfBivFYYWz1Hur+lalqGAh65Coin0r+HRUfg==}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  walker@1.0.8:
+    resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==}
+
+  web-streams-polyfill@3.3.3:
+    resolution: {integrity: sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==}
+    engines: {node: '>= 8'}
+
+  which-boxed-primitive@1.0.2:
+    resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
+
+  which-builtin-type@1.1.4:
+    resolution: {integrity: sha512-bppkmBSsHFmIMSl8BO9TbsyzsvGjVoppt8xUiGzwiu/bhDCGxnpOKCxgqj6GuyHE0mINMDecBFPlOm2hzY084w==}
+    engines: {node: '>= 0.4'}
+
+  which-collection@1.0.2:
+    resolution: {integrity: sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==}
+    engines: {node: '>= 0.4'}
+
+  which-typed-array@1.1.15:
+    resolution: {integrity: sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==}
+    engines: {node: '>= 0.4'}
+
+  which@1.3.1:
+    resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
+    hasBin: true
+
+  which@2.0.2:
+    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
+    engines: {node: '>= 8'}
+    hasBin: true
+
+  word-wrap@1.2.5:
+    resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
+    engines: {node: '>=0.10.0'}
+
+  wrap-ansi@6.2.0:
+    resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
+    engines: {node: '>=8'}
+
+  wrap-ansi@7.0.0:
+    resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
+    engines: {node: '>=10'}
+
+  wrap-ansi@8.1.0:
+    resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==}
+    engines: {node: '>=12'}
+
+  wrappy@1.0.2:
+    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
+
+  write-file-atomic@3.0.3:
+    resolution: {integrity: sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==}
+
+  write-file-atomic@4.0.2:
+    resolution: {integrity: sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==}
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
+
+  write-file-atomic@5.0.1:
+    resolution: {integrity: sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+
+  write-json-file@4.3.0:
+    resolution: {integrity: sha512-PxiShnxf0IlnQuMYOPPhPkhExoCQuTUNPOa/2JWCYTmBquU9njyyDuwRKN26IZBlp4yn1nt+Agh2HOOBl+55HQ==}
+    engines: {node: '>=8.3'}
+
+  y18n@5.0.8:
+    resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
+    engines: {node: '>=10'}
+
+  yallist@3.1.1:
+    resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
+
+  yallist@4.0.0:
+    resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
+
+  yaml@1.10.2:
+    resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}
+    engines: {node: '>= 6'}
+
+  yaml@2.3.1:
+    resolution: {integrity: sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==}
+    engines: {node: '>= 14'}
+
+  yargs-parser@18.1.3:
+    resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
+    engines: {node: '>=6'}
+
+  yargs-parser@20.2.9:
+    resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==}
+    engines: {node: '>=10'}
+
+  yargs-parser@21.1.1:
+    resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
+    engines: {node: '>=12'}
+
+  yargs@17.7.2:
+    resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
+    engines: {node: '>=12'}
+
+  yauzl@2.10.0:
+    resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}
+
+  yn@3.1.1:
+    resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==}
+    engines: {node: '>=6'}
+
+  yocto-queue@0.1.0:
+    resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
+    engines: {node: '>=10'}
+
+  yup@0.32.11:
+    resolution: {integrity: sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==}
+    engines: {node: '>=10'}
+
+  zustand@4.5.5:
+    resolution: {integrity: sha512-+0PALYNJNgK6hldkgDq2vLrw5f6g/jCInz52n9RTpropGgeAf/ioFUCdtsjCqu4gNhW9D01rUQBROoRjdzyn2Q==}
+    engines: {node: '>=12.7.0'}
+    peerDependencies:
+      '@types/react': '>=16.8'
+      immer: '>=9.0.6'
+      react: '>=16.8'
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      immer:
+        optional: true
+      react:
+        optional: true
+
+snapshots:
+
+  '@ampproject/remapping@2.3.0':
+    dependencies:
+      '@jridgewell/gen-mapping': 0.3.5
+      '@jridgewell/trace-mapping': 0.3.25
+
+  '@babel/code-frame@7.26.0':
+    dependencies:
+      '@babel/helper-validator-identifier': 7.25.9
+      js-tokens: 4.0.0
+      picocolors: 1.1.1
+
+  '@babel/compat-data@7.26.0': {}
+
+  '@babel/core@7.26.0':
+    dependencies:
+      '@ampproject/remapping': 2.3.0
+      '@babel/code-frame': 7.26.0
+      '@babel/generator': 7.26.0
+      '@babel/helper-compilation-targets': 7.25.9
+      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0)
+      '@babel/helpers': 7.26.0
+      '@babel/parser': 7.26.0
+      '@babel/template': 7.25.9
+      '@babel/traverse': 7.25.9
+      '@babel/types': 7.26.0
+      convert-source-map: 2.0.0
+      debug: 4.3.7(supports-color@8.1.1)
+      gensync: 1.0.0-beta.2
+      json5: 2.2.3
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/generator@7.26.0':
+    dependencies:
+      '@babel/parser': 7.26.0
+      '@babel/types': 7.26.0
+      '@jridgewell/gen-mapping': 0.3.5
+      '@jridgewell/trace-mapping': 0.3.25
+      jsesc: 3.0.2
+
+  '@babel/helper-annotate-as-pure@7.25.9':
+    dependencies:
+      '@babel/types': 7.26.0
+
+  '@babel/helper-builder-binary-assignment-operator-visitor@7.25.9':
+    dependencies:
+      '@babel/traverse': 7.25.9
+      '@babel/types': 7.26.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-compilation-targets@7.25.9':
+    dependencies:
+      '@babel/compat-data': 7.26.0
+      '@babel/helper-validator-option': 7.25.9
+      browserslist: 4.24.2
+      lru-cache: 5.1.1
+      semver: 6.3.1
+
+  '@babel/helper-create-class-features-plugin@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-member-expression-to-functions': 7.25.9
+      '@babel/helper-optimise-call-expression': 7.25.9
+      '@babel/helper-replace-supers': 7.25.9(@babel/core@7.26.0)
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+      '@babel/traverse': 7.25.9
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-create-regexp-features-plugin@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-annotate-as-pure': 7.25.9
+      regexpu-core: 6.1.1
+      semver: 6.3.1
+
+  '@babel/helper-define-polyfill-provider@0.6.2(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-compilation-targets': 7.25.9
+      '@babel/helper-plugin-utils': 7.25.9
+      debug: 4.3.7(supports-color@8.1.1)
+      lodash.debounce: 4.0.8
+      resolve: 1.22.8
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-member-expression-to-functions@7.25.9':
+    dependencies:
+      '@babel/traverse': 7.25.9
+      '@babel/types': 7.26.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-module-imports@7.25.9':
+    dependencies:
+      '@babel/traverse': 7.25.9
+      '@babel/types': 7.26.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-module-transforms@7.26.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-module-imports': 7.25.9
+      '@babel/helper-validator-identifier': 7.25.9
+      '@babel/traverse': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-optimise-call-expression@7.25.9':
+    dependencies:
+      '@babel/types': 7.26.0
+
+  '@babel/helper-plugin-utils@7.25.9': {}
+
+  '@babel/helper-remap-async-to-generator@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-wrap-function': 7.25.9
+      '@babel/traverse': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-replace-supers@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-member-expression-to-functions': 7.25.9
+      '@babel/helper-optimise-call-expression': 7.25.9
+      '@babel/traverse': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-simple-access@7.25.9':
+    dependencies:
+      '@babel/traverse': 7.25.9
+      '@babel/types': 7.26.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-skip-transparent-expression-wrappers@7.25.9':
+    dependencies:
+      '@babel/traverse': 7.25.9
+      '@babel/types': 7.26.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-string-parser@7.25.9': {}
+
+  '@babel/helper-validator-identifier@7.25.9': {}
+
+  '@babel/helper-validator-option@7.25.9': {}
+
+  '@babel/helper-wrap-function@7.25.9':
+    dependencies:
+      '@babel/template': 7.25.9
+      '@babel/traverse': 7.25.9
+      '@babel/types': 7.26.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helpers@7.26.0':
+    dependencies:
+      '@babel/template': 7.25.9
+      '@babel/types': 7.26.0
+
+  '@babel/parser@7.26.0':
+    dependencies:
+      '@babel/types': 7.26.0
+
+  '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/traverse': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+      '@babel/plugin-transform-optional-chaining': 7.25.9(@babel/core@7.26.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/traverse': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+
+  '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-syntax-import-assertions@7.26.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-syntax-import-attributes@7.26.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-syntax-jsx@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-syntax-typescript@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-regexp-features-plugin': 7.25.9(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-arrow-functions@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-async-generator-functions@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-remap-async-to-generator': 7.25.9(@babel/core@7.26.0)
+      '@babel/traverse': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-async-to-generator@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-module-imports': 7.25.9
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-remap-async-to-generator': 7.25.9(@babel/core@7.26.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-block-scoped-functions@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-block-scoping@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-class-properties@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-class-static-block@7.26.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-classes@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-compilation-targets': 7.25.9
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-replace-supers': 7.25.9(@babel/core@7.26.0)
+      '@babel/traverse': 7.25.9
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-computed-properties@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/template': 7.25.9
+
+  '@babel/plugin-transform-destructuring@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-dotall-regex@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-regexp-features-plugin': 7.25.9(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-duplicate-keys@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-regexp-features-plugin': 7.25.9(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-dynamic-import@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-exponentiation-operator@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-builder-binary-assignment-operator-visitor': 7.25.9
+      '@babel/helper-plugin-utils': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-export-namespace-from@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-for-of@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-function-name@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-compilation-targets': 7.25.9
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/traverse': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-json-strings@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-literals@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-logical-assignment-operators@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-member-expression-literals@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-modules-amd@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-modules-commonjs@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-simple-access': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-modules-systemjs@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-validator-identifier': 7.25.9
+      '@babel/traverse': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-modules-umd@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-named-capturing-groups-regex@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-regexp-features-plugin': 7.25.9(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-new-target@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-nullish-coalescing-operator@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-numeric-separator@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-object-rest-spread@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-compilation-targets': 7.25.9
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/plugin-transform-parameters': 7.25.9(@babel/core@7.26.0)
+
+  '@babel/plugin-transform-object-super@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-replace-supers': 7.25.9(@babel/core@7.26.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-optional-catch-binding@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-optional-chaining@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-parameters@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-private-methods@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-private-property-in-object@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-property-literals@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-react-constant-elements@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-react-display-name@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-react-jsx-development@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/plugin-transform-react-jsx': 7.25.9(@babel/core@7.26.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-react-jsx@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-module-imports': 7.25.9
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/plugin-syntax-jsx': 7.25.9(@babel/core@7.26.0)
+      '@babel/types': 7.26.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-react-pure-annotations@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-regenerator@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      regenerator-transform: 0.15.2
+
+  '@babel/plugin-transform-regexp-modifiers@7.26.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-regexp-features-plugin': 7.25.9(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-reserved-words@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-shorthand-properties@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-spread@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-sticky-regex@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-template-literals@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-typeof-symbol@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-typescript@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+      '@babel/plugin-syntax-typescript': 7.25.9(@babel/core@7.26.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-unicode-escapes@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-unicode-property-regex@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-regexp-features-plugin': 7.25.9(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-unicode-regex@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-regexp-features-plugin': 7.25.9(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-unicode-sets-regex@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-regexp-features-plugin': 7.25.9(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/preset-env@7.26.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/compat-data': 7.26.0
+      '@babel/core': 7.26.0
+      '@babel/helper-compilation-targets': 7.25.9
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-validator-option': 7.25.9
+      '@babel/plugin-bugfix-firefox-class-in-computed-class-key': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-bugfix-safari-class-field-initializer-scope': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.26.0)
+      '@babel/plugin-syntax-import-assertions': 7.26.0(@babel/core@7.26.0)
+      '@babel/plugin-syntax-import-attributes': 7.26.0(@babel/core@7.26.0)
+      '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.26.0)
+      '@babel/plugin-transform-arrow-functions': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-async-generator-functions': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-async-to-generator': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-block-scoped-functions': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-block-scoping': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-class-properties': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-class-static-block': 7.26.0(@babel/core@7.26.0)
+      '@babel/plugin-transform-classes': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-computed-properties': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-destructuring': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-dotall-regex': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-duplicate-keys': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-duplicate-named-capturing-groups-regex': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-dynamic-import': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-exponentiation-operator': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-export-namespace-from': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-for-of': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-function-name': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-json-strings': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-literals': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-logical-assignment-operators': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-member-expression-literals': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-modules-amd': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-modules-commonjs': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-modules-systemjs': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-modules-umd': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-new-target': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-nullish-coalescing-operator': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-numeric-separator': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-object-rest-spread': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-object-super': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-optional-catch-binding': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-optional-chaining': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-parameters': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-private-methods': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-private-property-in-object': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-property-literals': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-regenerator': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-regexp-modifiers': 7.26.0(@babel/core@7.26.0)
+      '@babel/plugin-transform-reserved-words': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-shorthand-properties': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-spread': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-sticky-regex': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-template-literals': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-typeof-symbol': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-unicode-escapes': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-unicode-property-regex': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-unicode-regex': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-unicode-sets-regex': 7.25.9(@babel/core@7.26.0)
+      '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.26.0)
+      babel-plugin-polyfill-corejs2: 0.4.11(@babel/core@7.26.0)
+      babel-plugin-polyfill-corejs3: 0.10.6(@babel/core@7.26.0)
+      babel-plugin-polyfill-regenerator: 0.6.2(@babel/core@7.26.0)
+      core-js-compat: 3.38.1
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/types': 7.26.0
+      esutils: 2.0.3
+
+  '@babel/preset-react@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-validator-option': 7.25.9
+      '@babel/plugin-transform-react-display-name': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-react-jsx': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-react-jsx-development': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-react-pure-annotations': 7.25.9(@babel/core@7.26.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/preset-typescript@7.26.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-validator-option': 7.25.9
+      '@babel/plugin-syntax-jsx': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-modules-commonjs': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-typescript': 7.25.9(@babel/core@7.26.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/runtime@7.26.0':
+    dependencies:
+      regenerator-runtime: 0.14.1
+
+  '@babel/template@7.25.9':
+    dependencies:
+      '@babel/code-frame': 7.26.0
+      '@babel/parser': 7.26.0
+      '@babel/types': 7.26.0
+
+  '@babel/traverse@7.25.9':
+    dependencies:
+      '@babel/code-frame': 7.26.0
+      '@babel/generator': 7.26.0
+      '@babel/parser': 7.26.0
+      '@babel/template': 7.25.9
+      '@babel/types': 7.26.0
+      debug: 4.3.7(supports-color@8.1.1)
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/types@7.26.0':
+    dependencies:
+      '@babel/helper-string-parser': 7.25.9
+      '@babel/helper-validator-identifier': 7.25.9
+
+  '@bcoe/v8-coverage@0.2.3': {}
+
+  '@clickhouse/client-common@1.7.0': {}
+
+  '@clickhouse/client@1.7.0':
+    dependencies:
+      '@clickhouse/client-common': 1.7.0
+
+  '@colors/colors@1.5.0':
+    optional: true
+
+  '@cspotcode/source-map-support@0.8.1':
+    dependencies:
+      '@jridgewell/trace-mapping': 0.3.9
+
+  '@csstools/css-parser-algorithms@2.7.1(@csstools/css-tokenizer@2.4.1)':
+    dependencies:
+      '@csstools/css-tokenizer': 2.4.1
+
+  '@csstools/css-tokenizer@2.4.1': {}
+
+  '@csstools/media-query-list-parser@2.1.13(@csstools/css-parser-algorithms@2.7.1(@csstools/css-tokenizer@2.4.1))(@csstools/css-tokenizer@2.4.1)':
+    dependencies:
+      '@csstools/css-parser-algorithms': 2.7.1(@csstools/css-tokenizer@2.4.1)
+      '@csstools/css-tokenizer': 2.4.1
+
+  '@csstools/postcss-cascade-layers@1.1.1(postcss@8.4.47)':
+    dependencies:
+      '@csstools/selector-specificity': 2.2.0(postcss-selector-parser@6.1.2)
+      postcss: 8.4.47
+      postcss-selector-parser: 6.1.2
+
+  '@csstools/postcss-color-function@1.1.1(postcss@8.4.47)':
+    dependencies:
+      '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.47)
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  '@csstools/postcss-font-format-keywords@1.0.1(postcss@8.4.47)':
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  '@csstools/postcss-hwb-function@1.0.2(postcss@8.4.47)':
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  '@csstools/postcss-ic-unit@1.0.1(postcss@8.4.47)':
+    dependencies:
+      '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.47)
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  '@csstools/postcss-is-pseudo-class@2.0.7(postcss@8.4.47)':
+    dependencies:
+      '@csstools/selector-specificity': 2.2.0(postcss-selector-parser@6.1.2)
+      postcss: 8.4.47
+      postcss-selector-parser: 6.1.2
+
+  '@csstools/postcss-nested-calc@1.0.0(postcss@8.4.47)':
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  '@csstools/postcss-normalize-display-values@1.0.1(postcss@8.4.47)':
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  '@csstools/postcss-oklab-function@1.1.1(postcss@8.4.47)':
+    dependencies:
+      '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.47)
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  '@csstools/postcss-progressive-custom-properties@1.3.0(postcss@8.4.47)':
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  '@csstools/postcss-stepped-value-functions@1.0.1(postcss@8.4.47)':
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  '@csstools/postcss-text-decoration-shorthand@1.0.0(postcss@8.4.47)':
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  '@csstools/postcss-trigonometric-functions@1.0.2(postcss@8.4.47)':
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  '@csstools/postcss-unset-value@1.0.2(postcss@8.4.47)':
+    dependencies:
+      postcss: 8.4.47
+
+  '@csstools/selector-specificity@2.2.0(postcss-selector-parser@6.1.2)':
+    dependencies:
+      postcss-selector-parser: 6.1.2
+
+  '@csstools/selector-specificity@3.1.1(postcss-selector-parser@6.1.2)':
+    dependencies:
+      postcss-selector-parser: 6.1.2
+
+  '@cypress/request@3.0.5':
+    dependencies:
+      aws-sign2: 0.7.0
+      aws4: 1.13.2
+      caseless: 0.12.0
+      combined-stream: 1.0.8
+      extend: 3.0.2
+      forever-agent: 0.6.1
+      form-data: 4.0.1
+      http-signature: 1.4.0
+      is-typedarray: 1.0.0
+      isstream: 0.1.2
+      json-stringify-safe: 5.0.1
+      mime-types: 2.1.35
+      performance-now: 2.1.0
+      qs: 6.13.0
+      safe-buffer: 5.2.1
+      tough-cookie: 4.1.4
+      tunnel-agent: 0.6.0
+      uuid: 8.3.2
+
+  '@cypress/xvfb@1.2.4(supports-color@8.1.1)':
+    dependencies:
+      debug: 3.2.7(supports-color@8.1.1)
+      lodash.once: 4.1.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@date-fns/utc@1.2.0': {}
+
+  '@dicebear/adventurer-neutral@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/adventurer@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/avataaars-neutral@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/avataaars@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/big-ears-neutral@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/big-ears@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/big-smile@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/bottts-neutral@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/bottts@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/collection@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/adventurer': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/adventurer-neutral': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/avataaars': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/avataaars-neutral': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/big-ears': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/big-ears-neutral': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/big-smile': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/bottts': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/bottts-neutral': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/core': 9.2.2
+      '@dicebear/croodles': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/croodles-neutral': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/dylan': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/fun-emoji': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/glass': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/icons': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/identicon': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/initials': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/lorelei': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/lorelei-neutral': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/micah': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/miniavs': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/notionists': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/notionists-neutral': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/open-peeps': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/personas': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/pixel-art': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/pixel-art-neutral': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/rings': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/shapes': 9.2.2(@dicebear/core@9.2.2)
+      '@dicebear/thumbs': 9.2.2(@dicebear/core@9.2.2)
+
+  '@dicebear/core@9.2.2':
+    dependencies:
+      '@types/json-schema': 7.0.15
+
+  '@dicebear/croodles-neutral@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/croodles@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/dylan@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/fun-emoji@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/glass@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/icons@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/identicon@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/initials@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/lorelei-neutral@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/lorelei@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/micah@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/miniavs@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/notionists-neutral@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/notionists@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/open-peeps@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/personas@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/pixel-art-neutral@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/pixel-art@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/rings@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/shapes@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@dicebear/thumbs@9.2.2(@dicebear/core@9.2.2)':
+    dependencies:
+      '@dicebear/core': 9.2.2
+
+  '@esbuild/android-arm64@0.17.19':
+    optional: true
+
+  '@esbuild/android-arm@0.17.19':
+    optional: true
+
+  '@esbuild/android-x64@0.17.19':
+    optional: true
+
+  '@esbuild/darwin-arm64@0.17.19':
+    optional: true
+
+  '@esbuild/darwin-x64@0.17.19':
+    optional: true
+
+  '@esbuild/freebsd-arm64@0.17.19':
+    optional: true
+
+  '@esbuild/freebsd-x64@0.17.19':
+    optional: true
+
+  '@esbuild/linux-arm64@0.17.19':
+    optional: true
+
+  '@esbuild/linux-arm@0.17.19':
+    optional: true
+
+  '@esbuild/linux-ia32@0.17.19':
+    optional: true
+
+  '@esbuild/linux-loong64@0.17.19':
+    optional: true
+
+  '@esbuild/linux-mips64el@0.17.19':
+    optional: true
+
+  '@esbuild/linux-ppc64@0.17.19':
+    optional: true
+
+  '@esbuild/linux-riscv64@0.17.19':
+    optional: true
+
+  '@esbuild/linux-s390x@0.17.19':
+    optional: true
+
+  '@esbuild/linux-x64@0.17.19':
+    optional: true
+
+  '@esbuild/netbsd-x64@0.17.19':
+    optional: true
+
+  '@esbuild/openbsd-x64@0.17.19':
+    optional: true
+
+  '@esbuild/sunos-x64@0.17.19':
+    optional: true
+
+  '@esbuild/win32-arm64@0.17.19':
+    optional: true
+
+  '@esbuild/win32-ia32@0.17.19':
+    optional: true
+
+  '@esbuild/win32-x64@0.17.19':
+    optional: true
+
+  '@eslint-community/eslint-utils@4.4.0(eslint@8.57.1)':
+    dependencies:
+      eslint: 8.57.1
+      eslint-visitor-keys: 3.4.3
+
+  '@eslint-community/regexpp@4.11.1': {}
+
+  '@eslint/eslintrc@2.1.4':
+    dependencies:
+      ajv: 6.12.6
+      debug: 4.3.7(supports-color@8.1.1)
+      espree: 9.6.1
+      globals: 13.24.0
+      ignore: 5.3.2
+      import-fresh: 3.3.0
+      js-yaml: 4.1.0
+      minimatch: 3.1.2
+      strip-json-comments: 3.1.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@eslint/js@8.57.1': {}
+
+  '@fontsource/inter@4.5.15': {}
+
+  '@formatjs/cli@4.8.4(ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3))':
+    dependencies:
+      '@formatjs/icu-messageformat-parser': 2.1.0
+      '@formatjs/ts-transformer': 3.9.4(ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3))
+      '@types/estree': 0.0.50
+      '@types/fs-extra': 9.0.13
+      '@types/json-stable-stringify': 1.1.0
+      '@types/node': 14.18.63
+      '@vue/compiler-core': 3.5.12
+      chalk: 4.1.2
+      commander: 8.3.0
+      fast-glob: 3.3.2
+      fs-extra: 10.1.0
+      json-stable-stringify: 1.1.1
+      loud-rejection: 2.2.0
+      tslib: 2.8.0
+      typescript: 4.9.5
+      vue: 3.5.12(typescript@4.9.5)
+    transitivePeerDependencies:
+      - ts-jest
+
+  '@formatjs/ecma402-abstract@1.11.4':
+    dependencies:
+      '@formatjs/intl-localematcher': 0.2.25
+      tslib: 2.8.0
+
+  '@formatjs/ecma402-abstract@1.4.0':
+    dependencies:
+      tslib: 2.8.0
+
+  '@formatjs/ecma402-abstract@1.5.0':
+    dependencies:
+      tslib: 2.8.0
+
+  '@formatjs/ecma402-abstract@2.2.1':
+    dependencies:
+      '@formatjs/fast-memoize': 2.2.2
+      '@formatjs/intl-localematcher': 0.5.6
+      tslib: 2.8.0
+
+  '@formatjs/fast-memoize@2.2.2':
+    dependencies:
+      tslib: 2.8.0
+
+  '@formatjs/icu-messageformat-parser@2.1.0':
+    dependencies:
+      '@formatjs/ecma402-abstract': 1.11.4
+      '@formatjs/icu-skeleton-parser': 1.3.6
+      tslib: 2.8.0
+
+  '@formatjs/icu-messageformat-parser@2.9.1':
+    dependencies:
+      '@formatjs/ecma402-abstract': 2.2.1
+      '@formatjs/icu-skeleton-parser': 1.8.5
+      tslib: 2.8.0
+
+  '@formatjs/icu-skeleton-parser@1.3.6':
+    dependencies:
+      '@formatjs/ecma402-abstract': 1.11.4
+      tslib: 2.8.0
+
+  '@formatjs/icu-skeleton-parser@1.8.5':
+    dependencies:
+      '@formatjs/ecma402-abstract': 2.2.1
+      tslib: 2.8.0
+
+  '@formatjs/intl-displaynames@6.8.1':
+    dependencies:
+      '@formatjs/ecma402-abstract': 2.2.1
+      '@formatjs/intl-localematcher': 0.5.6
+      tslib: 2.8.0
+
+  '@formatjs/intl-listformat@7.7.1':
+    dependencies:
+      '@formatjs/ecma402-abstract': 2.2.1
+      '@formatjs/intl-localematcher': 0.5.6
+      tslib: 2.8.0
+
+  '@formatjs/intl-localematcher@0.2.25':
+    dependencies:
+      tslib: 2.8.0
+
+  '@formatjs/intl-localematcher@0.5.6':
+    dependencies:
+      tslib: 2.8.0
+
+  '@formatjs/intl-numberformat@5.7.6':
+    dependencies:
+      '@formatjs/ecma402-abstract': 1.4.0
+      tslib: 2.8.0
+
+  '@formatjs/intl@2.10.11(typescript@5.6.3)':
+    dependencies:
+      '@formatjs/ecma402-abstract': 2.2.1
+      '@formatjs/fast-memoize': 2.2.2
+      '@formatjs/icu-messageformat-parser': 2.9.1
+      '@formatjs/intl-displaynames': 6.8.1
+      '@formatjs/intl-listformat': 7.7.1
+      intl-messageformat: 10.7.3
+      tslib: 2.8.0
+    optionalDependencies:
+      typescript: 5.6.3
+
+  '@formatjs/ts-transformer@2.13.0(ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3))':
+    dependencies:
+      intl-messageformat-parser: 6.1.2
+      tslib: 2.8.0
+      typescript: 4.9.5
+    optionalDependencies:
+      ts-jest: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3)
+
+  '@formatjs/ts-transformer@3.9.4(ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3))':
+    dependencies:
+      '@formatjs/icu-messageformat-parser': 2.1.0
+      '@types/node': 14.18.63
+      chalk: 4.1.2
+      tslib: 2.8.0
+      typescript: 4.9.5
+    optionalDependencies:
+      ts-jest: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3)
+
+  '@humanwhocodes/config-array@0.13.0':
+    dependencies:
+      '@humanwhocodes/object-schema': 2.0.3
+      debug: 4.3.7(supports-color@8.1.1)
+      minimatch: 3.1.2
+    transitivePeerDependencies:
+      - supports-color
+
+  '@humanwhocodes/module-importer@1.0.1': {}
+
+  '@humanwhocodes/object-schema@2.0.3': {}
+
+  '@isaacs/cliui@8.0.2':
+    dependencies:
+      string-width: 5.1.2
+      string-width-cjs: string-width@4.2.3
+      strip-ansi: 7.1.0
+      strip-ansi-cjs: strip-ansi@6.0.1
+      wrap-ansi: 8.1.0
+      wrap-ansi-cjs: wrap-ansi@7.0.0
+
+  '@istanbuljs/load-nyc-config@1.1.0':
+    dependencies:
+      camelcase: 5.3.1
+      find-up: 4.1.0
+      get-package-type: 0.1.0
+      js-yaml: 3.14.1
+      resolve-from: 5.0.0
+
+  '@istanbuljs/schema@0.1.3': {}
+
+  '@jest/console@29.7.0':
+    dependencies:
+      '@jest/types': 29.6.3
+      '@types/node': 20.17.1
+      chalk: 4.1.2
+      jest-message-util: 29.7.0
+      jest-util: 29.7.0
+      slash: 3.0.0
+
+  '@jest/core@29.7.0(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3))':
+    dependencies:
+      '@jest/console': 29.7.0
+      '@jest/reporters': 29.7.0
+      '@jest/test-result': 29.7.0
+      '@jest/transform': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 20.17.1
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      ci-info: 3.9.0
+      exit: 0.1.2
+      graceful-fs: 4.2.11
+      jest-changed-files: 29.7.0
+      jest-config: 29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3))
+      jest-haste-map: 29.7.0
+      jest-message-util: 29.7.0
+      jest-regex-util: 29.6.3
+      jest-resolve: 29.7.0
+      jest-resolve-dependencies: 29.7.0
+      jest-runner: 29.7.0
+      jest-runtime: 29.7.0
+      jest-snapshot: 29.7.0
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      jest-watcher: 29.7.0
+      micromatch: 4.0.8
+      pretty-format: 29.7.0
+      slash: 3.0.0
+      strip-ansi: 6.0.1
+    transitivePeerDependencies:
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
+  '@jest/environment@29.7.0':
+    dependencies:
+      '@jest/fake-timers': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 20.17.1
+      jest-mock: 29.7.0
+
+  '@jest/expect-utils@29.7.0':
+    dependencies:
+      jest-get-type: 29.6.3
+
+  '@jest/expect@29.7.0':
+    dependencies:
+      expect: 29.7.0
+      jest-snapshot: 29.7.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@jest/fake-timers@29.7.0':
+    dependencies:
+      '@jest/types': 29.6.3
+      '@sinonjs/fake-timers': 10.3.0
+      '@types/node': 20.17.1
+      jest-message-util: 29.7.0
+      jest-mock: 29.7.0
+      jest-util: 29.7.0
+
+  '@jest/globals@29.7.0':
+    dependencies:
+      '@jest/environment': 29.7.0
+      '@jest/expect': 29.7.0
+      '@jest/types': 29.6.3
+      jest-mock: 29.7.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@jest/reporters@29.7.0':
+    dependencies:
+      '@bcoe/v8-coverage': 0.2.3
+      '@jest/console': 29.7.0
+      '@jest/test-result': 29.7.0
+      '@jest/transform': 29.7.0
+      '@jest/types': 29.6.3
+      '@jridgewell/trace-mapping': 0.3.25
+      '@types/node': 20.17.1
+      chalk: 4.1.2
+      collect-v8-coverage: 1.0.2
+      exit: 0.1.2
+      glob: 7.2.3
+      graceful-fs: 4.2.11
+      istanbul-lib-coverage: 3.2.2
+      istanbul-lib-instrument: 6.0.3
+      istanbul-lib-report: 3.0.1
+      istanbul-lib-source-maps: 4.0.1
+      istanbul-reports: 3.1.7
+      jest-message-util: 29.7.0
+      jest-util: 29.7.0
+      jest-worker: 29.7.0
+      slash: 3.0.0
+      string-length: 4.0.2
+      strip-ansi: 6.0.1
+      v8-to-istanbul: 9.3.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@jest/schemas@29.6.3':
+    dependencies:
+      '@sinclair/typebox': 0.27.8
+
+  '@jest/source-map@29.6.3':
+    dependencies:
+      '@jridgewell/trace-mapping': 0.3.25
+      callsites: 3.1.0
+      graceful-fs: 4.2.11
+
+  '@jest/test-result@29.7.0':
+    dependencies:
+      '@jest/console': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/istanbul-lib-coverage': 2.0.6
+      collect-v8-coverage: 1.0.2
+
+  '@jest/test-sequencer@29.7.0':
+    dependencies:
+      '@jest/test-result': 29.7.0
+      graceful-fs: 4.2.11
+      jest-haste-map: 29.7.0
+      slash: 3.0.0
+
+  '@jest/transform@29.7.0':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@jest/types': 29.6.3
+      '@jridgewell/trace-mapping': 0.3.25
+      babel-plugin-istanbul: 6.1.1
+      chalk: 4.1.2
+      convert-source-map: 2.0.0
+      fast-json-stable-stringify: 2.1.0
+      graceful-fs: 4.2.11
+      jest-haste-map: 29.7.0
+      jest-regex-util: 29.6.3
+      jest-util: 29.7.0
+      micromatch: 4.0.8
+      pirates: 4.0.6
+      slash: 3.0.0
+      write-file-atomic: 4.0.2
+    transitivePeerDependencies:
+      - supports-color
+
+  '@jest/types@29.6.3':
+    dependencies:
+      '@jest/schemas': 29.6.3
+      '@types/istanbul-lib-coverage': 2.0.6
+      '@types/istanbul-reports': 3.0.4
+      '@types/node': 20.17.1
+      '@types/yargs': 17.0.33
+      chalk: 4.1.2
+
+  '@jridgewell/gen-mapping@0.3.5':
+    dependencies:
+      '@jridgewell/set-array': 1.2.1
+      '@jridgewell/sourcemap-codec': 1.5.0
+      '@jridgewell/trace-mapping': 0.3.25
+
+  '@jridgewell/resolve-uri@3.1.2': {}
+
+  '@jridgewell/set-array@1.2.1': {}
+
+  '@jridgewell/source-map@0.3.6':
+    dependencies:
+      '@jridgewell/gen-mapping': 0.3.5
+      '@jridgewell/trace-mapping': 0.3.25
+
+  '@jridgewell/sourcemap-codec@1.5.0': {}
+
+  '@jridgewell/trace-mapping@0.3.25':
+    dependencies:
+      '@jridgewell/resolve-uri': 3.1.2
+      '@jridgewell/sourcemap-codec': 1.5.0
+
+  '@jridgewell/trace-mapping@0.3.9':
+    dependencies:
+      '@jridgewell/resolve-uri': 3.1.2
+      '@jridgewell/sourcemap-codec': 1.5.0
+
+  '@kurkle/color@0.3.2': {}
+
+  '@netlify/plugin-nextjs@5.8.1': {}
+
+  '@next/env@14.2.10': {}
+
+  '@next/eslint-plugin-next@14.2.16':
+    dependencies:
+      glob: 10.3.10
+
+  '@next/swc-darwin-arm64@14.2.10':
+    optional: true
+
+  '@next/swc-darwin-x64@14.2.10':
+    optional: true
+
+  '@next/swc-linux-arm64-gnu@14.2.10':
+    optional: true
+
+  '@next/swc-linux-arm64-musl@14.2.10':
+    optional: true
+
+  '@next/swc-linux-x64-gnu@14.2.10':
+    optional: true
+
+  '@next/swc-linux-x64-musl@14.2.10':
+    optional: true
+
+  '@next/swc-win32-arm64-msvc@14.2.10':
+    optional: true
+
+  '@next/swc-win32-ia32-msvc@14.2.10':
+    optional: true
+
+  '@next/swc-win32-x64-msvc@14.2.10':
+    optional: true
+
+  '@nodelib/fs.scandir@2.1.5':
+    dependencies:
+      '@nodelib/fs.stat': 2.0.5
+      run-parallel: 1.2.0
+
+  '@nodelib/fs.stat@2.0.5': {}
+
+  '@nodelib/fs.walk@1.2.8':
+    dependencies:
+      '@nodelib/fs.scandir': 2.1.5
+      fastq: 1.17.1
+
+  '@nolyfill/is-core-module@1.0.39': {}
+
+  '@pkgjs/parseargs@0.11.0':
+    optional: true
+
+  '@prisma/client@5.17.0(prisma@5.17.0)':
+    optionalDependencies:
+      prisma: 5.17.0
+
+  '@prisma/debug@5.17.0': {}
+
+  '@prisma/engines-version@5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053': {}
+
+  '@prisma/engines@5.17.0':
+    dependencies:
+      '@prisma/debug': 5.17.0
+      '@prisma/engines-version': 5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053
+      '@prisma/fetch-engine': 5.17.0
+      '@prisma/get-platform': 5.17.0
+
+  '@prisma/extension-read-replicas@0.3.0(@prisma/client@5.17.0(prisma@5.17.0))':
+    dependencies:
+      '@prisma/client': 5.17.0(prisma@5.17.0)
+
+  '@prisma/fetch-engine@5.17.0':
+    dependencies:
+      '@prisma/debug': 5.17.0
+      '@prisma/engines-version': 5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053
+      '@prisma/get-platform': 5.17.0
+
+  '@prisma/get-platform@5.17.0':
+    dependencies:
+      '@prisma/debug': 5.17.0
+
+  '@react-spring/animated@9.7.5(react@18.3.1)':
+    dependencies:
+      '@react-spring/shared': 9.7.5(react@18.3.1)
+      '@react-spring/types': 9.7.5
+      react: 18.3.1
+
+  '@react-spring/core@9.7.5(react@18.3.1)':
+    dependencies:
+      '@react-spring/animated': 9.7.5(react@18.3.1)
+      '@react-spring/shared': 9.7.5(react@18.3.1)
+      '@react-spring/types': 9.7.5
+      react: 18.3.1
+
+  '@react-spring/rafz@9.7.5': {}
+
+  '@react-spring/shared@9.7.5(react@18.3.1)':
+    dependencies:
+      '@react-spring/rafz': 9.7.5
+      '@react-spring/types': 9.7.5
+      react: 18.3.1
+
+  '@react-spring/types@9.7.5': {}
+
+  '@react-spring/web@9.7.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+    dependencies:
+      '@react-spring/animated': 9.7.5(react@18.3.1)
+      '@react-spring/core': 9.7.5(react@18.3.1)
+      '@react-spring/shared': 9.7.5(react@18.3.1)
+      '@react-spring/types': 9.7.5
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+
+  '@redis/bloom@1.2.0(@redis/client@1.6.0)':
+    dependencies:
+      '@redis/client': 1.6.0
+
+  '@redis/client@1.6.0':
+    dependencies:
+      cluster-key-slot: 1.1.2
+      generic-pool: 3.9.0
+      yallist: 4.0.0
+
+  '@redis/graph@1.1.1(@redis/client@1.6.0)':
+    dependencies:
+      '@redis/client': 1.6.0
+
+  '@redis/json@1.0.7(@redis/client@1.6.0)':
+    dependencies:
+      '@redis/client': 1.6.0
+
+  '@redis/search@1.2.0(@redis/client@1.6.0)':
+    dependencies:
+      '@redis/client': 1.6.0
+
+  '@redis/time-series@1.1.0(@redis/client@1.6.0)':
+    dependencies:
+      '@redis/client': 1.6.0
+
+  '@rollup/plugin-alias@5.1.1(rollup@3.29.5)':
+    optionalDependencies:
+      rollup: 3.29.5
+
+  '@rollup/plugin-commonjs@25.0.8(rollup@3.29.5)':
+    dependencies:
+      '@rollup/pluginutils': 5.1.3(rollup@3.29.5)
+      commondir: 1.0.1
+      estree-walker: 2.0.2
+      glob: 8.1.0
+      is-reference: 1.2.1
+      magic-string: 0.30.12
+    optionalDependencies:
+      rollup: 3.29.5
+
+  '@rollup/plugin-json@6.1.0(rollup@3.29.5)':
+    dependencies:
+      '@rollup/pluginutils': 5.1.3(rollup@3.29.5)
+    optionalDependencies:
+      rollup: 3.29.5
+
+  '@rollup/plugin-node-resolve@15.3.0(rollup@3.29.5)':
+    dependencies:
+      '@rollup/pluginutils': 5.1.3(rollup@3.29.5)
+      '@types/resolve': 1.20.2
+      deepmerge: 4.3.1
+      is-module: 1.0.0
+      resolve: 1.22.8
+    optionalDependencies:
+      rollup: 3.29.5
+
+  '@rollup/plugin-replace@5.0.7(rollup@3.29.5)':
+    dependencies:
+      '@rollup/pluginutils': 5.1.3(rollup@3.29.5)
+      magic-string: 0.30.12
+    optionalDependencies:
+      rollup: 3.29.5
+
+  '@rollup/pluginutils@5.1.3(rollup@3.29.5)':
+    dependencies:
+      '@types/estree': 1.0.6
+      estree-walker: 2.0.2
+      picomatch: 4.0.2
+    optionalDependencies:
+      rollup: 3.29.5
+
+  '@rtsao/scc@1.1.0': {}
+
+  '@rushstack/eslint-patch@1.10.4': {}
+
+  '@sinclair/typebox@0.27.8': {}
+
+  '@sinonjs/commons@3.0.1':
+    dependencies:
+      type-detect: 4.0.8
+
+  '@sinonjs/fake-timers@10.3.0':
+    dependencies:
+      '@sinonjs/commons': 3.0.1
+
+  '@svgr/babel-plugin-add-jsx-attribute@8.0.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+
+  '@svgr/babel-plugin-remove-jsx-attribute@8.0.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+
+  '@svgr/babel-plugin-remove-jsx-empty-expression@8.0.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+
+  '@svgr/babel-plugin-replace-jsx-attribute-value@8.0.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+
+  '@svgr/babel-plugin-svg-dynamic-title@8.0.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+
+  '@svgr/babel-plugin-svg-em-dimensions@8.0.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+
+  '@svgr/babel-plugin-transform-react-native-svg@8.1.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+
+  '@svgr/babel-plugin-transform-svg-component@8.0.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+
+  '@svgr/babel-preset@8.1.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@svgr/babel-plugin-add-jsx-attribute': 8.0.0(@babel/core@7.26.0)
+      '@svgr/babel-plugin-remove-jsx-attribute': 8.0.0(@babel/core@7.26.0)
+      '@svgr/babel-plugin-remove-jsx-empty-expression': 8.0.0(@babel/core@7.26.0)
+      '@svgr/babel-plugin-replace-jsx-attribute-value': 8.0.0(@babel/core@7.26.0)
+      '@svgr/babel-plugin-svg-dynamic-title': 8.0.0(@babel/core@7.26.0)
+      '@svgr/babel-plugin-svg-em-dimensions': 8.0.0(@babel/core@7.26.0)
+      '@svgr/babel-plugin-transform-react-native-svg': 8.1.0(@babel/core@7.26.0)
+      '@svgr/babel-plugin-transform-svg-component': 8.0.0(@babel/core@7.26.0)
+
+  '@svgr/core@8.1.0(typescript@5.6.3)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@svgr/babel-preset': 8.1.0(@babel/core@7.26.0)
+      camelcase: 6.3.0
+      cosmiconfig: 8.3.6(typescript@5.6.3)
+      snake-case: 3.0.4
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+
+  '@svgr/hast-util-to-babel-ast@8.0.0':
+    dependencies:
+      '@babel/types': 7.26.0
+      entities: 4.5.0
+
+  '@svgr/plugin-jsx@8.1.0(@svgr/core@8.1.0(typescript@5.6.3))':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@svgr/babel-preset': 8.1.0(@babel/core@7.26.0)
+      '@svgr/core': 8.1.0(typescript@5.6.3)
+      '@svgr/hast-util-to-babel-ast': 8.0.0
+      svg-parser: 2.0.4
+    transitivePeerDependencies:
+      - supports-color
+
+  '@svgr/plugin-svgo@8.1.0(@svgr/core@8.1.0(typescript@5.6.3))(typescript@5.6.3)':
+    dependencies:
+      '@svgr/core': 8.1.0(typescript@5.6.3)
+      cosmiconfig: 8.3.6(typescript@5.6.3)
+      deepmerge: 4.3.1
+      svgo: 3.3.2
+    transitivePeerDependencies:
+      - typescript
+
+  '@svgr/rollup@8.1.0(rollup@3.29.5)(typescript@5.6.3)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/plugin-transform-react-constant-elements': 7.25.9(@babel/core@7.26.0)
+      '@babel/preset-env': 7.26.0(@babel/core@7.26.0)
+      '@babel/preset-react': 7.25.9(@babel/core@7.26.0)
+      '@babel/preset-typescript': 7.26.0(@babel/core@7.26.0)
+      '@rollup/pluginutils': 5.1.3(rollup@3.29.5)
+      '@svgr/core': 8.1.0(typescript@5.6.3)
+      '@svgr/plugin-jsx': 8.1.0(@svgr/core@8.1.0(typescript@5.6.3))
+      '@svgr/plugin-svgo': 8.1.0(@svgr/core@8.1.0(typescript@5.6.3))(typescript@5.6.3)
+    transitivePeerDependencies:
+      - rollup
+      - supports-color
+      - typescript
+
+  '@svgr/webpack@8.1.0(typescript@5.6.3)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/plugin-transform-react-constant-elements': 7.25.9(@babel/core@7.26.0)
+      '@babel/preset-env': 7.26.0(@babel/core@7.26.0)
+      '@babel/preset-react': 7.25.9(@babel/core@7.26.0)
+      '@babel/preset-typescript': 7.26.0(@babel/core@7.26.0)
+      '@svgr/core': 8.1.0(typescript@5.6.3)
+      '@svgr/plugin-jsx': 8.1.0(@svgr/core@8.1.0(typescript@5.6.3))
+      '@svgr/plugin-svgo': 8.1.0(@svgr/core@8.1.0(typescript@5.6.3))(typescript@5.6.3)
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+
+  '@swc/counter@0.1.3': {}
+
+  '@swc/helpers@0.5.5':
+    dependencies:
+      '@swc/counter': 0.1.3
+      tslib: 2.8.0
+
+  '@tanstack/query-core@5.59.16': {}
+
+  '@tanstack/react-query@5.59.16(react@18.3.1)':
+    dependencies:
+      '@tanstack/query-core': 5.59.16
+      react: 18.3.1
+
+  '@trysound/sax@0.2.0': {}
+
+  '@tsconfig/node10@1.0.11': {}
+
+  '@tsconfig/node12@1.0.11': {}
+
+  '@tsconfig/node14@1.0.3': {}
+
+  '@tsconfig/node16@1.0.4': {}
+
+  '@types/babel__core@7.20.5':
+    dependencies:
+      '@babel/parser': 7.26.0
+      '@babel/types': 7.26.0
+      '@types/babel__generator': 7.6.8
+      '@types/babel__template': 7.4.4
+      '@types/babel__traverse': 7.20.6
+
+  '@types/babel__generator@7.6.8':
+    dependencies:
+      '@babel/types': 7.26.0
+
+  '@types/babel__template@7.4.4':
+    dependencies:
+      '@babel/parser': 7.26.0
+      '@babel/types': 7.26.0
+
+  '@types/babel__traverse@7.20.6':
+    dependencies:
+      '@babel/types': 7.26.0
+
+  '@types/cypress@1.1.6':
+    dependencies:
+      cypress: 13.15.1
+
+  '@types/estree@0.0.50': {}
+
+  '@types/estree@1.0.6': {}
+
+  '@types/fs-extra@8.1.5':
+    dependencies:
+      '@types/node': 20.17.1
+
+  '@types/fs-extra@9.0.13':
+    dependencies:
+      '@types/node': 20.17.1
+
+  '@types/glob@7.2.0':
+    dependencies:
+      '@types/minimatch': 5.1.2
+      '@types/node': 20.17.1
+
+  '@types/graceful-fs@4.1.9':
+    dependencies:
+      '@types/node': 20.17.1
+
+  '@types/hoist-non-react-statics@3.3.5':
+    dependencies:
+      '@types/react': 18.3.12
+      hoist-non-react-statics: 3.3.2
+
+  '@types/istanbul-lib-coverage@2.0.6': {}
+
+  '@types/istanbul-lib-report@3.0.3':
+    dependencies:
+      '@types/istanbul-lib-coverage': 2.0.6
+
+  '@types/istanbul-reports@3.0.4':
+    dependencies:
+      '@types/istanbul-lib-report': 3.0.3
+
+  '@types/jest@29.5.14':
+    dependencies:
+      expect: 29.7.0
+      pretty-format: 29.7.0
+
+  '@types/json-schema@7.0.15': {}
+
+  '@types/json-stable-stringify@1.1.0': {}
+
+  '@types/json5@0.0.29': {}
+
+  '@types/lodash@4.17.12': {}
+
+  '@types/minimatch@5.1.2': {}
+
+  '@types/minimist@1.2.5': {}
+
+  '@types/node@14.18.63': {}
+
+  '@types/node@20.17.1':
+    dependencies:
+      undici-types: 6.19.8
+
+  '@types/normalize-package-data@2.4.4': {}
+
+  '@types/prop-types@15.7.13': {}
+
+  '@types/react-dom@18.3.1':
+    dependencies:
+      '@types/react': 18.3.12
+
+  '@types/react-redux@7.1.34':
+    dependencies:
+      '@types/hoist-non-react-statics': 3.3.5
+      '@types/react': 18.3.12
+      hoist-non-react-statics: 3.3.2
+      redux: 4.2.1
+
+  '@types/react-window@1.8.8':
+    dependencies:
+      '@types/react': 18.3.12
+
+  '@types/react@18.3.12':
+    dependencies:
+      '@types/prop-types': 15.7.13
+      csstype: 3.1.3
+
+  '@types/resolve@1.20.2': {}
+
+  '@types/schema-utils@2.4.0':
+    dependencies:
+      schema-utils: 2.7.1
+
+  '@types/semver@7.5.8': {}
+
+  '@types/sinonjs__fake-timers@8.1.1': {}
+
+  '@types/sizzle@2.3.9': {}
+
+  '@types/stack-utils@2.0.3': {}
+
+  '@types/yargs-parser@21.0.3': {}
+
+  '@types/yargs@17.0.33':
+    dependencies:
+      '@types/yargs-parser': 21.0.3
+
+  '@types/yauzl@2.10.3':
+    dependencies:
+      '@types/node': 20.17.1
+    optional: true
+
+  '@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1)(typescript@5.6.3)':
+    dependencies:
+      '@eslint-community/regexpp': 4.11.1
+      '@typescript-eslint/parser': 6.21.0(eslint@8.57.1)(typescript@5.6.3)
+      '@typescript-eslint/scope-manager': 6.21.0
+      '@typescript-eslint/type-utils': 6.21.0(eslint@8.57.1)(typescript@5.6.3)
+      '@typescript-eslint/utils': 6.21.0(eslint@8.57.1)(typescript@5.6.3)
+      '@typescript-eslint/visitor-keys': 6.21.0
+      debug: 4.3.7(supports-color@8.1.1)
+      eslint: 8.57.1
+      graphemer: 1.4.0
+      ignore: 5.3.2
+      natural-compare: 1.4.0
+      semver: 7.6.3
+      ts-api-utils: 1.3.0(typescript@5.6.3)
+    optionalDependencies:
+      typescript: 5.6.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3)':
+    dependencies:
+      '@typescript-eslint/scope-manager': 6.21.0
+      '@typescript-eslint/types': 6.21.0
+      '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.6.3)
+      '@typescript-eslint/visitor-keys': 6.21.0
+      debug: 4.3.7(supports-color@8.1.1)
+      eslint: 8.57.1
+    optionalDependencies:
+      typescript: 5.6.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/scope-manager@5.62.0':
+    dependencies:
+      '@typescript-eslint/types': 5.62.0
+      '@typescript-eslint/visitor-keys': 5.62.0
+
+  '@typescript-eslint/scope-manager@6.21.0':
+    dependencies:
+      '@typescript-eslint/types': 6.21.0
+      '@typescript-eslint/visitor-keys': 6.21.0
+
+  '@typescript-eslint/type-utils@6.21.0(eslint@8.57.1)(typescript@5.6.3)':
+    dependencies:
+      '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.6.3)
+      '@typescript-eslint/utils': 6.21.0(eslint@8.57.1)(typescript@5.6.3)
+      debug: 4.3.7(supports-color@8.1.1)
+      eslint: 8.57.1
+      ts-api-utils: 1.3.0(typescript@5.6.3)
+    optionalDependencies:
+      typescript: 5.6.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/types@5.62.0': {}
+
+  '@typescript-eslint/types@6.21.0': {}
+
+  '@typescript-eslint/typescript-estree@5.62.0(typescript@5.6.3)':
+    dependencies:
+      '@typescript-eslint/types': 5.62.0
+      '@typescript-eslint/visitor-keys': 5.62.0
+      debug: 4.3.7(supports-color@8.1.1)
+      globby: 11.1.0
+      is-glob: 4.0.3
+      semver: 7.6.3
+      tsutils: 3.21.0(typescript@5.6.3)
+    optionalDependencies:
+      typescript: 5.6.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/typescript-estree@6.21.0(typescript@5.6.3)':
+    dependencies:
+      '@typescript-eslint/types': 6.21.0
+      '@typescript-eslint/visitor-keys': 6.21.0
+      debug: 4.3.7(supports-color@8.1.1)
+      globby: 11.1.0
+      is-glob: 4.0.3
+      minimatch: 9.0.3
+      semver: 7.6.3
+      ts-api-utils: 1.3.0(typescript@5.6.3)
+    optionalDependencies:
+      typescript: 5.6.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/utils@5.62.0(eslint@8.57.1)(typescript@5.6.3)':
+    dependencies:
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.1)
+      '@types/json-schema': 7.0.15
+      '@types/semver': 7.5.8
+      '@typescript-eslint/scope-manager': 5.62.0
+      '@typescript-eslint/types': 5.62.0
+      '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.6.3)
+      eslint: 8.57.1
+      eslint-scope: 5.1.1
+      semver: 7.6.3
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+
+  '@typescript-eslint/utils@6.21.0(eslint@8.57.1)(typescript@5.6.3)':
+    dependencies:
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.1)
+      '@types/json-schema': 7.0.15
+      '@types/semver': 7.5.8
+      '@typescript-eslint/scope-manager': 6.21.0
+      '@typescript-eslint/types': 6.21.0
+      '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.6.3)
+      eslint: 8.57.1
+      semver: 7.6.3
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+
+  '@typescript-eslint/visitor-keys@5.62.0':
+    dependencies:
+      '@typescript-eslint/types': 5.62.0
+      eslint-visitor-keys: 3.4.3
+
+  '@typescript-eslint/visitor-keys@6.21.0':
+    dependencies:
+      '@typescript-eslint/types': 6.21.0
+      eslint-visitor-keys: 3.4.3
+
+  '@umami/prisma-client@0.14.0(@prisma/client@5.17.0(prisma@5.17.0))(@prisma/extension-read-replicas@0.3.0(@prisma/client@5.17.0(prisma@5.17.0)))':
+    dependencies:
+      '@prisma/client': 5.17.0(prisma@5.17.0)
+      '@prisma/extension-read-replicas': 0.3.0(@prisma/client@5.17.0(prisma@5.17.0))
+      chalk: 4.1.2
+      debug: 4.3.7(supports-color@8.1.1)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@umami/redis-client@0.21.0':
+    dependencies:
+      debug: 4.3.7(supports-color@8.1.1)
+      redis: 4.7.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@ungap/structured-clone@1.2.0': {}
+
+  '@vue/compiler-core@3.5.12':
+    dependencies:
+      '@babel/parser': 7.26.0
+      '@vue/shared': 3.5.12
+      entities: 4.5.0
+      estree-walker: 2.0.2
+      source-map-js: 1.2.1
+
+  '@vue/compiler-dom@3.5.12':
+    dependencies:
+      '@vue/compiler-core': 3.5.12
+      '@vue/shared': 3.5.12
+
+  '@vue/compiler-sfc@3.5.12':
+    dependencies:
+      '@babel/parser': 7.26.0
+      '@vue/compiler-core': 3.5.12
+      '@vue/compiler-dom': 3.5.12
+      '@vue/compiler-ssr': 3.5.12
+      '@vue/shared': 3.5.12
+      estree-walker: 2.0.2
+      magic-string: 0.30.12
+      postcss: 8.4.47
+      source-map-js: 1.2.1
+
+  '@vue/compiler-ssr@3.5.12':
+    dependencies:
+      '@vue/compiler-dom': 3.5.12
+      '@vue/shared': 3.5.12
+
+  '@vue/reactivity@3.5.12':
+    dependencies:
+      '@vue/shared': 3.5.12
+
+  '@vue/runtime-core@3.5.12':
+    dependencies:
+      '@vue/reactivity': 3.5.12
+      '@vue/shared': 3.5.12
+
+  '@vue/runtime-dom@3.5.12':
+    dependencies:
+      '@vue/reactivity': 3.5.12
+      '@vue/runtime-core': 3.5.12
+      '@vue/shared': 3.5.12
+      csstype: 3.1.3
+
+  '@vue/server-renderer@3.5.12(vue@3.5.12(typescript@5.6.3))':
+    dependencies:
+      '@vue/compiler-ssr': 3.5.12
+      '@vue/shared': 3.5.12
+      vue: 3.5.12(typescript@4.9.5)
+
+  '@vue/shared@3.5.12': {}
+
+  acorn-jsx@5.3.2(acorn@8.13.0):
+    dependencies:
+      acorn: 8.13.0
+
+  acorn-walk@8.3.4:
+    dependencies:
+      acorn: 8.13.0
+
+  acorn@8.13.0: {}
+
+  aggregate-error@3.1.0:
+    dependencies:
+      clean-stack: 2.2.0
+      indent-string: 4.0.0
+
+  ajv-keywords@3.5.2(ajv@6.12.6):
+    dependencies:
+      ajv: 6.12.6
+
+  ajv@6.12.6:
+    dependencies:
+      fast-deep-equal: 3.1.3
+      fast-json-stable-stringify: 2.1.0
+      json-schema-traverse: 0.4.1
+      uri-js: 4.4.1
+
+  ajv@8.17.1:
+    dependencies:
+      fast-deep-equal: 3.1.3
+      fast-uri: 3.0.3
+      json-schema-traverse: 1.0.0
+      require-from-string: 2.0.2
+
+  ansi-colors@4.1.3: {}
+
+  ansi-escapes@4.3.2:
+    dependencies:
+      type-fest: 0.21.3
+
+  ansi-escapes@5.0.0:
+    dependencies:
+      type-fest: 1.4.0
+
+  ansi-regex@5.0.1: {}
+
+  ansi-regex@6.1.0: {}
+
+  ansi-styles@3.2.1:
+    dependencies:
+      color-convert: 1.9.3
+
+  ansi-styles@4.3.0:
+    dependencies:
+      color-convert: 2.0.1
+
+  ansi-styles@5.2.0: {}
+
+  ansi-styles@6.2.1: {}
+
+  anymatch@3.1.3:
+    dependencies:
+      normalize-path: 3.0.0
+      picomatch: 2.3.1
+
+  arch@2.2.0: {}
+
+  arg@4.1.3: {}
+
+  argparse@1.0.10:
+    dependencies:
+      sprintf-js: 1.0.3
+
+  argparse@2.0.1: {}
+
+  aria-query@5.3.2: {}
+
+  array-buffer-byte-length@1.0.1:
+    dependencies:
+      call-bind: 1.0.7
+      is-array-buffer: 3.0.4
+
+  array-find-index@1.0.2: {}
+
+  array-includes@3.1.8:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-object-atoms: 1.0.0
+      get-intrinsic: 1.2.4
+      is-string: 1.0.7
+
+  array-union@2.1.0: {}
+
+  array.prototype.findlast@1.2.5:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-errors: 1.3.0
+      es-object-atoms: 1.0.0
+      es-shim-unscopables: 1.0.2
+
+  array.prototype.findlastindex@1.2.5:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-errors: 1.3.0
+      es-object-atoms: 1.0.0
+      es-shim-unscopables: 1.0.2
+
+  array.prototype.flat@1.3.2:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-shim-unscopables: 1.0.2
+
+  array.prototype.flatmap@1.3.2:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-shim-unscopables: 1.0.2
+
+  array.prototype.tosorted@1.1.4:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-errors: 1.3.0
+      es-shim-unscopables: 1.0.2
+
+  arraybuffer.prototype.slice@1.0.3:
+    dependencies:
+      array-buffer-byte-length: 1.0.1
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-errors: 1.3.0
+      get-intrinsic: 1.2.4
+      is-array-buffer: 3.0.4
+      is-shared-array-buffer: 1.0.3
+
+  arrify@1.0.1: {}
+
+  asn1@0.2.6:
+    dependencies:
+      safer-buffer: 2.1.2
+
+  assert-plus@1.0.0: {}
+
+  ast-types-flow@0.0.8: {}
+
+  astral-regex@2.0.0: {}
+
+  async@3.2.6: {}
+
+  asynckit@0.4.0: {}
+
+  at-least-node@1.0.0: {}
+
+  autoprefixer@10.4.20(postcss@8.4.47):
+    dependencies:
+      browserslist: 4.24.2
+      caniuse-lite: 1.0.30001669
+      fraction.js: 4.3.7
+      normalize-range: 0.1.2
+      picocolors: 1.1.1
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  available-typed-arrays@1.0.7:
+    dependencies:
+      possible-typed-array-names: 1.0.0
+
+  aws-sign2@0.7.0: {}
+
+  aws4@1.13.2: {}
+
+  axe-core@4.10.2: {}
+
+  axobject-query@4.1.0: {}
+
+  babel-jest@29.7.0(@babel/core@7.26.0):
+    dependencies:
+      '@babel/core': 7.26.0
+      '@jest/transform': 29.7.0
+      '@types/babel__core': 7.20.5
+      babel-plugin-istanbul: 6.1.1
+      babel-preset-jest: 29.6.3(@babel/core@7.26.0)
+      chalk: 4.1.2
+      graceful-fs: 4.2.11
+      slash: 3.0.0
+    transitivePeerDependencies:
+      - supports-color
+
+  babel-plugin-istanbul@6.1.1:
+    dependencies:
+      '@babel/helper-plugin-utils': 7.25.9
+      '@istanbuljs/load-nyc-config': 1.1.0
+      '@istanbuljs/schema': 0.1.3
+      istanbul-lib-instrument: 5.2.1
+      test-exclude: 6.0.0
+    transitivePeerDependencies:
+      - supports-color
+
+  babel-plugin-jest-hoist@29.6.3:
+    dependencies:
+      '@babel/template': 7.25.9
+      '@babel/types': 7.26.0
+      '@types/babel__core': 7.20.5
+      '@types/babel__traverse': 7.20.6
+
+  babel-plugin-polyfill-corejs2@0.4.11(@babel/core@7.26.0):
+    dependencies:
+      '@babel/compat-data': 7.26.0
+      '@babel/core': 7.26.0
+      '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.26.0)
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
+  babel-plugin-polyfill-corejs3@0.10.6(@babel/core@7.26.0):
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.26.0)
+      core-js-compat: 3.38.1
+    transitivePeerDependencies:
+      - supports-color
+
+  babel-plugin-polyfill-regenerator@0.6.2(@babel/core@7.26.0):
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.26.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  babel-plugin-react-intl@7.9.4(ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3)):
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/types': 7.26.0
+      '@formatjs/ts-transformer': 2.13.0(ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3))
+      '@types/babel__core': 7.20.5
+      '@types/fs-extra': 9.0.13
+      '@types/schema-utils': 2.4.0
+      fs-extra: 9.1.0
+      intl-messageformat-parser: 5.5.1
+      schema-utils: 2.7.1
+    transitivePeerDependencies:
+      - supports-color
+      - ts-jest
+
+  babel-preset-current-node-syntax@1.1.0(@babel/core@7.26.0):
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.26.0)
+      '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.26.0)
+      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.26.0)
+      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.26.0)
+      '@babel/plugin-syntax-import-attributes': 7.26.0(@babel/core@7.26.0)
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.26.0)
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.26.0)
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.26.0)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.26.0)
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.26.0)
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.26.0)
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.26.0)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.26.0)
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.26.0)
+      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.26.0)
+
+  babel-preset-jest@29.6.3(@babel/core@7.26.0):
+    dependencies:
+      '@babel/core': 7.26.0
+      babel-plugin-jest-hoist: 29.6.3
+      babel-preset-current-node-syntax: 1.1.0(@babel/core@7.26.0)
+
+  balanced-match@1.0.2: {}
+
+  balanced-match@2.0.0: {}
+
+  base64-js@1.5.1: {}
+
+  bcrypt-pbkdf@1.0.2:
+    dependencies:
+      tweetnacl: 0.14.5
+
+  bcryptjs@2.4.3: {}
+
+  blob-util@2.0.2: {}
+
+  bluebird@3.7.2: {}
+
+  boolbase@1.0.0: {}
+
+  brace-expansion@1.1.11:
+    dependencies:
+      balanced-match: 1.0.2
+      concat-map: 0.0.1
+
+  brace-expansion@2.0.1:
+    dependencies:
+      balanced-match: 1.0.2
+
+  braces@3.0.3:
+    dependencies:
+      fill-range: 7.1.1
+
+  browserslist@4.24.2:
+    dependencies:
+      caniuse-lite: 1.0.30001669
+      electron-to-chromium: 1.5.46
+      node-releases: 2.0.18
+      update-browserslist-db: 1.1.1(browserslist@4.24.2)
+
+  bs-logger@0.2.6:
+    dependencies:
+      fast-json-stable-stringify: 2.1.0
+
+  bser@2.1.1:
+    dependencies:
+      node-int64: 0.4.0
+
+  buffer-crc32@0.2.13: {}
+
+  buffer-equal-constant-time@1.0.1: {}
+
+  buffer-from@1.1.2: {}
+
+  buffer@5.7.1:
+    dependencies:
+      base64-js: 1.5.1
+      ieee754: 1.2.1
+
+  busboy@1.6.0:
+    dependencies:
+      streamsearch: 1.1.0
+
+  cachedir@2.4.0: {}
+
+  call-bind@1.0.7:
+    dependencies:
+      es-define-property: 1.0.0
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+      get-intrinsic: 1.2.4
+      set-function-length: 1.2.2
+
+  callsites@3.1.0: {}
+
+  camelcase-keys@6.2.2:
+    dependencies:
+      camelcase: 5.3.1
+      map-obj: 4.3.0
+      quick-lru: 4.0.1
+
+  camelcase-keys@7.0.2:
+    dependencies:
+      camelcase: 6.3.0
+      map-obj: 4.3.0
+      quick-lru: 5.1.1
+      type-fest: 1.4.0
+
+  camelcase@5.3.1: {}
+
+  camelcase@6.3.0: {}
+
+  caniuse-api@3.0.0:
+    dependencies:
+      browserslist: 4.24.2
+      caniuse-lite: 1.0.30001669
+      lodash.memoize: 4.1.2
+      lodash.uniq: 4.5.0
+
+  caniuse-lite@1.0.30001669: {}
+
+  caseless@0.12.0: {}
+
+  chalk@2.4.2:
+    dependencies:
+      ansi-styles: 3.2.1
+      escape-string-regexp: 1.0.5
+      supports-color: 5.5.0
+
+  chalk@4.1.2:
+    dependencies:
+      ansi-styles: 4.3.0
+      supports-color: 7.2.0
+
+  chalk@5.3.0: {}
+
+  char-regex@1.0.2: {}
+
+  charenc@0.0.2: {}
+
+  chart.js@4.4.5:
+    dependencies:
+      '@kurkle/color': 0.3.2
+
+  chartjs-adapter-date-fns@3.0.0(chart.js@4.4.5)(date-fns@2.30.0):
+    dependencies:
+      chart.js: 4.4.5
+      date-fns: 2.30.0
+
+  check-more-types@2.24.0: {}
+
+  chownr@2.0.0: {}
+
+  ci-info@3.9.0: {}
+
+  cjs-module-lexer@1.4.1: {}
+
+  classnames@2.5.1: {}
+
+  clean-stack@2.2.0: {}
+
+  cli-cursor@3.1.0:
+    dependencies:
+      restore-cursor: 3.1.0
+
+  cli-cursor@4.0.0:
+    dependencies:
+      restore-cursor: 4.0.0
+
+  cli-table3@0.6.5:
+    dependencies:
+      string-width: 4.2.3
+    optionalDependencies:
+      '@colors/colors': 1.5.0
+
+  cli-truncate@2.1.0:
+    dependencies:
+      slice-ansi: 3.0.0
+      string-width: 4.2.3
+
+  cli-truncate@3.1.0:
+    dependencies:
+      slice-ansi: 5.0.0
+      string-width: 5.1.2
+
+  client-only@0.0.1: {}
+
+  cliui@8.0.1:
+    dependencies:
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+      wrap-ansi: 7.0.0
+
+  cluster-key-slot@1.1.2: {}
+
+  co@4.6.0: {}
+
+  collect-v8-coverage@1.0.2: {}
+
+  color-convert@1.9.3:
+    dependencies:
+      color-name: 1.1.3
+
+  color-convert@2.0.1:
+    dependencies:
+      color-name: 1.1.4
+
+  color-name@1.1.3: {}
+
+  color-name@1.1.4: {}
+
+  colord@2.9.3: {}
+
+  colorette@1.4.0: {}
+
+  colorette@2.0.20: {}
+
+  combined-stream@1.0.8:
+    dependencies:
+      delayed-stream: 1.0.0
+
+  commander@11.0.0: {}
+
+  commander@2.20.3: {}
+
+  commander@6.2.1: {}
+
+  commander@7.2.0: {}
+
+  commander@8.3.0: {}
+
+  common-tags@1.8.2: {}
+
+  commondir@1.0.1: {}
+
+  concat-map@0.0.1: {}
+
+  concat-with-sourcemaps@1.1.0:
+    dependencies:
+      source-map: 0.6.1
+
+  convert-source-map@2.0.0: {}
+
+  core-js-compat@3.38.1:
+    dependencies:
+      browserslist: 4.24.2
+
+  core-util-is@1.0.2: {}
+
+  cors@2.8.5:
+    dependencies:
+      object-assign: 4.1.1
+      vary: 1.1.2
+
+  cosmiconfig@8.3.6(typescript@5.6.3):
+    dependencies:
+      import-fresh: 3.3.0
+      js-yaml: 4.1.0
+      parse-json: 5.2.0
+      path-type: 4.0.0
+    optionalDependencies:
+      typescript: 5.6.3
+
+  create-jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)):
+    dependencies:
+      '@jest/types': 29.6.3
+      chalk: 4.1.2
+      exit: 0.1.2
+      graceful-fs: 4.2.11
+      jest-config: 29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3))
+      jest-util: 29.7.0
+      prompts: 2.4.2
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
+  create-require@1.1.1: {}
+
+  cross-env@7.0.3:
+    dependencies:
+      cross-spawn: 7.0.3
+
+  cross-spawn@6.0.5:
+    dependencies:
+      nice-try: 1.0.5
+      path-key: 2.0.1
+      semver: 5.7.2
+      shebang-command: 1.2.0
+      which: 1.3.1
+
+  cross-spawn@7.0.3:
+    dependencies:
+      path-key: 3.1.1
+      shebang-command: 2.0.0
+      which: 2.0.2
+
+  crypt@0.0.2: {}
+
+  css-blank-pseudo@3.0.3(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-selector-parser: 6.1.2
+
+  css-box-model@1.2.1:
+    dependencies:
+      tiny-invariant: 1.3.3
+
+  css-declaration-sorter@6.4.1(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+
+  css-functions-list@3.2.3: {}
+
+  css-has-pseudo@3.0.4(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-selector-parser: 6.1.2
+
+  css-prefers-color-scheme@6.0.3(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+
+  css-select@4.3.0:
+    dependencies:
+      boolbase: 1.0.0
+      css-what: 6.1.0
+      domhandler: 4.3.1
+      domutils: 2.8.0
+      nth-check: 2.1.1
+
+  css-select@5.1.0:
+    dependencies:
+      boolbase: 1.0.0
+      css-what: 6.1.0
+      domhandler: 5.0.3
+      domutils: 3.1.0
+      nth-check: 2.1.1
+
+  css-tree@1.1.3:
+    dependencies:
+      mdn-data: 2.0.14
+      source-map: 0.6.1
+
+  css-tree@2.2.1:
+    dependencies:
+      mdn-data: 2.0.28
+      source-map-js: 1.2.1
+
+  css-tree@2.3.1:
+    dependencies:
+      mdn-data: 2.0.30
+      source-map-js: 1.2.1
+
+  css-tree@3.0.0:
+    dependencies:
+      mdn-data: 2.10.0
+      source-map-js: 1.2.1
+    optional: true
+
+  css-what@6.1.0: {}
+
+  cssdb@7.11.2: {}
+
+  cssesc@3.0.0: {}
+
+  cssnano-preset-default@5.2.14(postcss@8.4.47):
+    dependencies:
+      css-declaration-sorter: 6.4.1(postcss@8.4.47)
+      cssnano-utils: 3.1.0(postcss@8.4.47)
+      postcss: 8.4.47
+      postcss-calc: 8.2.4(postcss@8.4.47)
+      postcss-colormin: 5.3.1(postcss@8.4.47)
+      postcss-convert-values: 5.1.3(postcss@8.4.47)
+      postcss-discard-comments: 5.1.2(postcss@8.4.47)
+      postcss-discard-duplicates: 5.1.0(postcss@8.4.47)
+      postcss-discard-empty: 5.1.1(postcss@8.4.47)
+      postcss-discard-overridden: 5.1.0(postcss@8.4.47)
+      postcss-merge-longhand: 5.1.7(postcss@8.4.47)
+      postcss-merge-rules: 5.1.4(postcss@8.4.47)
+      postcss-minify-font-values: 5.1.0(postcss@8.4.47)
+      postcss-minify-gradients: 5.1.1(postcss@8.4.47)
+      postcss-minify-params: 5.1.4(postcss@8.4.47)
+      postcss-minify-selectors: 5.2.1(postcss@8.4.47)
+      postcss-normalize-charset: 5.1.0(postcss@8.4.47)
+      postcss-normalize-display-values: 5.1.0(postcss@8.4.47)
+      postcss-normalize-positions: 5.1.1(postcss@8.4.47)
+      postcss-normalize-repeat-style: 5.1.1(postcss@8.4.47)
+      postcss-normalize-string: 5.1.0(postcss@8.4.47)
+      postcss-normalize-timing-functions: 5.1.0(postcss@8.4.47)
+      postcss-normalize-unicode: 5.1.1(postcss@8.4.47)
+      postcss-normalize-url: 5.1.0(postcss@8.4.47)
+      postcss-normalize-whitespace: 5.1.1(postcss@8.4.47)
+      postcss-ordered-values: 5.1.3(postcss@8.4.47)
+      postcss-reduce-initial: 5.1.2(postcss@8.4.47)
+      postcss-reduce-transforms: 5.1.0(postcss@8.4.47)
+      postcss-svgo: 5.1.0(postcss@8.4.47)
+      postcss-unique-selectors: 5.1.1(postcss@8.4.47)
+
+  cssnano-utils@3.1.0(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+
+  cssnano@5.1.15(postcss@8.4.47):
+    dependencies:
+      cssnano-preset-default: 5.2.14(postcss@8.4.47)
+      lilconfig: 2.1.0
+      postcss: 8.4.47
+      yaml: 1.10.2
+
+  csso@4.2.0:
+    dependencies:
+      css-tree: 1.1.3
+
+  csso@5.0.5:
+    dependencies:
+      css-tree: 2.2.1
+
+  csstype@3.1.3: {}
+
+  currently-unhandled@0.4.1:
+    dependencies:
+      array-find-index: 1.0.2
+
+  cypress@13.15.1:
+    dependencies:
+      '@cypress/request': 3.0.5
+      '@cypress/xvfb': 1.2.4(supports-color@8.1.1)
+      '@types/sinonjs__fake-timers': 8.1.1
+      '@types/sizzle': 2.3.9
+      arch: 2.2.0
+      blob-util: 2.0.2
+      bluebird: 3.7.2
+      buffer: 5.7.1
+      cachedir: 2.4.0
+      chalk: 4.1.2
+      check-more-types: 2.24.0
+      cli-cursor: 3.1.0
+      cli-table3: 0.6.5
+      commander: 6.2.1
+      common-tags: 1.8.2
+      dayjs: 1.11.13
+      debug: 4.3.7(supports-color@8.1.1)
+      enquirer: 2.4.1
+      eventemitter2: 6.4.7
+      execa: 4.1.0
+      executable: 4.1.1
+      extract-zip: 2.0.1(supports-color@8.1.1)
+      figures: 3.2.0
+      fs-extra: 9.1.0
+      getos: 3.2.1
+      is-ci: 3.0.1
+      is-installed-globally: 0.4.0
+      lazy-ass: 1.6.0
+      listr2: 3.14.0(enquirer@2.4.1)
+      lodash: 4.17.21
+      log-symbols: 4.1.0
+      minimist: 1.2.8
+      ospath: 1.2.2
+      pretty-bytes: 5.6.0
+      process: 0.11.10
+      proxy-from-env: 1.0.0
+      request-progress: 3.0.0
+      semver: 7.6.3
+      supports-color: 8.1.1
+      tmp: 0.2.3
+      tree-kill: 1.2.2
+      untildify: 4.0.0
+      yauzl: 2.10.0
+
+  d3-array@2.12.1:
+    dependencies:
+      internmap: 1.0.1
+
+  d3-color@2.0.0: {}
+
+  d3-dispatch@2.0.0: {}
+
+  d3-drag@2.0.0:
+    dependencies:
+      d3-dispatch: 2.0.0
+      d3-selection: 2.0.0
+
+  d3-ease@2.0.0: {}
+
+  d3-geo@2.0.2:
+    dependencies:
+      d3-array: 2.12.1
+
+  d3-interpolate@2.0.1:
+    dependencies:
+      d3-color: 2.0.0
+
+  d3-selection@2.0.0: {}
+
+  d3-timer@2.0.0: {}
+
+  d3-transition@2.0.0(d3-selection@2.0.0):
+    dependencies:
+      d3-color: 2.0.0
+      d3-dispatch: 2.0.0
+      d3-ease: 2.0.0
+      d3-interpolate: 2.0.1
+      d3-selection: 2.0.0
+      d3-timer: 2.0.0
+
+  d3-zoom@2.0.0:
+    dependencies:
+      d3-dispatch: 2.0.0
+      d3-drag: 2.0.0
+      d3-interpolate: 2.0.1
+      d3-selection: 2.0.0
+      d3-transition: 2.0.0(d3-selection@2.0.0)
+
+  damerau-levenshtein@1.0.8: {}
+
+  dashdash@1.14.1:
+    dependencies:
+      assert-plus: 1.0.0
+
+  data-uri-to-buffer@4.0.1: {}
+
+  data-view-buffer@1.0.1:
+    dependencies:
+      call-bind: 1.0.7
+      es-errors: 1.3.0
+      is-data-view: 1.0.1
+
+  data-view-byte-length@1.0.1:
+    dependencies:
+      call-bind: 1.0.7
+      es-errors: 1.3.0
+      is-data-view: 1.0.1
+
+  data-view-byte-offset@1.0.0:
+    dependencies:
+      call-bind: 1.0.7
+      es-errors: 1.3.0
+      is-data-view: 1.0.1
+
+  date-fns-tz@1.3.8(date-fns@2.30.0):
+    dependencies:
+      date-fns: 2.30.0
+
+  date-fns@2.30.0:
+    dependencies:
+      '@babel/runtime': 7.26.0
+
+  dayjs@1.11.13: {}
+
+  debounce@1.2.1: {}
+
+  debug@3.2.7(supports-color@8.1.1):
+    dependencies:
+      ms: 2.1.3
+    optionalDependencies:
+      supports-color: 8.1.1
+
+  debug@4.3.4:
+    dependencies:
+      ms: 2.1.2
+
+  debug@4.3.7(supports-color@8.1.1):
+    dependencies:
+      ms: 2.1.3
+    optionalDependencies:
+      supports-color: 8.1.1
+
+  decamelize-keys@1.1.1:
+    dependencies:
+      decamelize: 1.2.0
+      map-obj: 1.0.1
+
+  decamelize@1.2.0: {}
+
+  decamelize@5.0.1: {}
+
+  dedent@1.5.3: {}
+
+  deep-is@0.1.4: {}
+
+  deepmerge@4.3.1: {}
+
+  define-data-property@1.1.4:
+    dependencies:
+      es-define-property: 1.0.0
+      es-errors: 1.3.0
+      gopd: 1.0.1
+
+  define-properties@1.2.1:
+    dependencies:
+      define-data-property: 1.1.4
+      has-property-descriptors: 1.0.2
+      object-keys: 1.1.1
+
+  del@5.1.0:
+    dependencies:
+      globby: 10.0.2
+      graceful-fs: 4.2.11
+      is-glob: 4.0.3
+      is-path-cwd: 2.2.0
+      is-path-inside: 3.0.3
+      p-map: 3.0.0
+      rimraf: 3.0.2
+      slash: 3.0.0
+
+  del@6.1.1:
+    dependencies:
+      globby: 11.1.0
+      graceful-fs: 4.2.11
+      is-glob: 4.0.3
+      is-path-cwd: 2.2.0
+      is-path-inside: 3.0.3
+      p-map: 4.0.0
+      rimraf: 3.0.2
+      slash: 3.0.0
+
+  delayed-stream@1.0.0: {}
+
+  detect-browser@5.3.0: {}
+
+  detect-indent@6.1.0: {}
+
+  detect-newline@3.1.0: {}
+
+  diff-sequences@29.6.3: {}
+
+  diff@4.0.2: {}
+
+  dir-glob@3.0.1:
+    dependencies:
+      path-type: 4.0.0
+
+  doctrine@2.1.0:
+    dependencies:
+      esutils: 2.0.3
+
+  doctrine@3.0.0:
+    dependencies:
+      esutils: 2.0.3
+
+  dom-serializer@1.4.1:
+    dependencies:
+      domelementtype: 2.3.0
+      domhandler: 4.3.1
+      entities: 2.2.0
+
+  dom-serializer@2.0.0:
+    dependencies:
+      domelementtype: 2.3.0
+      domhandler: 5.0.3
+      entities: 4.5.0
+
+  domelementtype@2.3.0: {}
+
+  domhandler@4.3.1:
+    dependencies:
+      domelementtype: 2.3.0
+
+  domhandler@5.0.3:
+    dependencies:
+      domelementtype: 2.3.0
+
+  domutils@2.8.0:
+    dependencies:
+      dom-serializer: 1.4.1
+      domelementtype: 2.3.0
+      domhandler: 4.3.1
+
+  domutils@3.1.0:
+    dependencies:
+      dom-serializer: 2.0.0
+      domelementtype: 2.3.0
+      domhandler: 5.0.3
+
+  dot-case@3.0.4:
+    dependencies:
+      no-case: 3.0.4
+      tslib: 2.8.0
+
+  dotenv@10.0.0: {}
+
+  eastasianwidth@0.2.0: {}
+
+  ecc-jsbn@0.1.2:
+    dependencies:
+      jsbn: 0.1.1
+      safer-buffer: 2.1.2
+
+  ecdsa-sig-formatter@1.0.11:
+    dependencies:
+      safe-buffer: 5.2.1
+
+  ejs@3.1.10:
+    dependencies:
+      jake: 10.9.2
+
+  electron-to-chromium@1.5.46: {}
+
+  emittery@0.13.1: {}
+
+  emoji-regex@8.0.0: {}
+
+  emoji-regex@9.2.2: {}
+
+  end-of-stream@1.4.4:
+    dependencies:
+      once: 1.4.0
+
+  enhanced-resolve@5.17.1:
+    dependencies:
+      graceful-fs: 4.2.11
+      tapable: 2.2.1
+
+  enquirer@2.4.1:
+    dependencies:
+      ansi-colors: 4.1.3
+      strip-ansi: 6.0.1
+
+  entities@2.2.0: {}
+
+  entities@4.5.0: {}
+
+  error-ex@1.3.2:
+    dependencies:
+      is-arrayish: 0.2.1
+
+  es-abstract@1.23.3:
+    dependencies:
+      array-buffer-byte-length: 1.0.1
+      arraybuffer.prototype.slice: 1.0.3
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.7
+      data-view-buffer: 1.0.1
+      data-view-byte-length: 1.0.1
+      data-view-byte-offset: 1.0.0
+      es-define-property: 1.0.0
+      es-errors: 1.3.0
+      es-object-atoms: 1.0.0
+      es-set-tostringtag: 2.0.3
+      es-to-primitive: 1.2.1
+      function.prototype.name: 1.1.6
+      get-intrinsic: 1.2.4
+      get-symbol-description: 1.0.2
+      globalthis: 1.0.4
+      gopd: 1.0.1
+      has-property-descriptors: 1.0.2
+      has-proto: 1.0.3
+      has-symbols: 1.0.3
+      hasown: 2.0.2
+      internal-slot: 1.0.7
+      is-array-buffer: 3.0.4
+      is-callable: 1.2.7
+      is-data-view: 1.0.1
+      is-negative-zero: 2.0.3
+      is-regex: 1.1.4
+      is-shared-array-buffer: 1.0.3
+      is-string: 1.0.7
+      is-typed-array: 1.1.13
+      is-weakref: 1.0.2
+      object-inspect: 1.13.2
+      object-keys: 1.1.1
+      object.assign: 4.1.5
+      regexp.prototype.flags: 1.5.3
+      safe-array-concat: 1.1.2
+      safe-regex-test: 1.0.3
+      string.prototype.trim: 1.2.9
+      string.prototype.trimend: 1.0.8
+      string.prototype.trimstart: 1.0.8
+      typed-array-buffer: 1.0.2
+      typed-array-byte-length: 1.0.1
+      typed-array-byte-offset: 1.0.2
+      typed-array-length: 1.0.6
+      unbox-primitive: 1.0.2
+      which-typed-array: 1.1.15
+
+  es-define-property@1.0.0:
+    dependencies:
+      get-intrinsic: 1.2.4
+
+  es-errors@1.3.0: {}
+
+  es-iterator-helpers@1.1.0:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-errors: 1.3.0
+      es-set-tostringtag: 2.0.3
+      function-bind: 1.1.2
+      get-intrinsic: 1.2.4
+      globalthis: 1.0.4
+      has-property-descriptors: 1.0.2
+      has-proto: 1.0.3
+      has-symbols: 1.0.3
+      internal-slot: 1.0.7
+      iterator.prototype: 1.1.3
+      safe-array-concat: 1.1.2
+
+  es-module-lexer@1.5.4: {}
+
+  es-object-atoms@1.0.0:
+    dependencies:
+      es-errors: 1.3.0
+
+  es-set-tostringtag@2.0.3:
+    dependencies:
+      get-intrinsic: 1.2.4
+      has-tostringtag: 1.0.2
+      hasown: 2.0.2
+
+  es-shim-unscopables@1.0.2:
+    dependencies:
+      hasown: 2.0.2
+
+  es-to-primitive@1.2.1:
+    dependencies:
+      is-callable: 1.2.7
+      is-date-object: 1.0.5
+      is-symbol: 1.0.4
+
+  esbuild@0.17.19:
+    optionalDependencies:
+      '@esbuild/android-arm': 0.17.19
+      '@esbuild/android-arm64': 0.17.19
+      '@esbuild/android-x64': 0.17.19
+      '@esbuild/darwin-arm64': 0.17.19
+      '@esbuild/darwin-x64': 0.17.19
+      '@esbuild/freebsd-arm64': 0.17.19
+      '@esbuild/freebsd-x64': 0.17.19
+      '@esbuild/linux-arm': 0.17.19
+      '@esbuild/linux-arm64': 0.17.19
+      '@esbuild/linux-ia32': 0.17.19
+      '@esbuild/linux-loong64': 0.17.19
+      '@esbuild/linux-mips64el': 0.17.19
+      '@esbuild/linux-ppc64': 0.17.19
+      '@esbuild/linux-riscv64': 0.17.19
+      '@esbuild/linux-s390x': 0.17.19
+      '@esbuild/linux-x64': 0.17.19
+      '@esbuild/netbsd-x64': 0.17.19
+      '@esbuild/openbsd-x64': 0.17.19
+      '@esbuild/sunos-x64': 0.17.19
+      '@esbuild/win32-arm64': 0.17.19
+      '@esbuild/win32-ia32': 0.17.19
+      '@esbuild/win32-x64': 0.17.19
+
+  escalade@3.2.0: {}
+
+  escape-string-regexp@1.0.5: {}
+
+  escape-string-regexp@2.0.0: {}
+
+  escape-string-regexp@4.0.0: {}
+
+  eslint-config-next@14.2.16(eslint@8.57.1)(typescript@5.6.3):
+    dependencies:
+      '@next/eslint-plugin-next': 14.2.16
+      '@rushstack/eslint-patch': 1.10.4
+      '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1)(typescript@5.6.3)
+      '@typescript-eslint/parser': 6.21.0(eslint@8.57.1)(typescript@5.6.3)
+      eslint: 8.57.1
+      eslint-import-resolver-node: 0.3.9
+      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1)
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
+      eslint-plugin-jsx-a11y: 6.10.1(eslint@8.57.1)
+      eslint-plugin-react: 7.37.2(eslint@8.57.1)
+      eslint-plugin-react-hooks: 5.0.0-canary-7118f5dd7-20230705(eslint@8.57.1)
+    optionalDependencies:
+      typescript: 5.6.3
+    transitivePeerDependencies:
+      - eslint-import-resolver-webpack
+      - eslint-plugin-import-x
+      - supports-color
+
+  eslint-config-prettier@8.10.0(eslint@8.57.1):
+    dependencies:
+      eslint: 8.57.1
+
+  eslint-import-resolver-alias@1.1.2(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1)):
+    dependencies:
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
+
+  eslint-import-resolver-node@0.3.9:
+    dependencies:
+      debug: 3.2.7(supports-color@8.1.1)
+      is-core-module: 2.15.1
+      resolve: 1.22.8
+    transitivePeerDependencies:
+      - supports-color
+
+  eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1):
+    dependencies:
+      '@nolyfill/is-core-module': 1.0.39
+      debug: 4.3.7(supports-color@8.1.1)
+      enhanced-resolve: 5.17.1
+      eslint: 8.57.1
+      eslint-module-utils: 2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
+      fast-glob: 3.3.2
+      get-tsconfig: 4.8.1
+      is-bun-module: 1.2.1
+      is-glob: 4.0.3
+    optionalDependencies:
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
+    transitivePeerDependencies:
+      - '@typescript-eslint/parser'
+      - eslint-import-resolver-node
+      - eslint-import-resolver-webpack
+      - supports-color
+
+  eslint-module-utils@2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1):
+    dependencies:
+      debug: 3.2.7(supports-color@8.1.1)
+    optionalDependencies:
+      '@typescript-eslint/parser': 6.21.0(eslint@8.57.1)(typescript@5.6.3)
+      eslint: 8.57.1
+      eslint-import-resolver-node: 0.3.9
+      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1)
+    transitivePeerDependencies:
+      - supports-color
+
+  eslint-plugin-css-modules@2.12.0(eslint@8.57.1):
+    dependencies:
+      eslint: 8.57.1
+      gonzales-pe: 4.3.0
+      lodash: 4.17.21
+
+  eslint-plugin-cypress@2.15.2(eslint@8.57.1):
+    dependencies:
+      eslint: 8.57.1
+      globals: 13.24.0
+
+  eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1):
+    dependencies:
+      '@rtsao/scc': 1.1.0
+      array-includes: 3.1.8
+      array.prototype.findlastindex: 1.2.5
+      array.prototype.flat: 1.3.2
+      array.prototype.flatmap: 1.3.2
+      debug: 3.2.7(supports-color@8.1.1)
+      doctrine: 2.1.0
+      eslint: 8.57.1
+      eslint-import-resolver-node: 0.3.9
+      eslint-module-utils: 2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
+      hasown: 2.0.2
+      is-core-module: 2.15.1
+      is-glob: 4.0.3
+      minimatch: 3.1.2
+      object.fromentries: 2.0.8
+      object.groupby: 1.0.3
+      object.values: 1.2.0
+      semver: 6.3.1
+      string.prototype.trimend: 1.0.8
+      tsconfig-paths: 3.15.0
+    optionalDependencies:
+      '@typescript-eslint/parser': 6.21.0(eslint@8.57.1)(typescript@5.6.3)
+    transitivePeerDependencies:
+      - eslint-import-resolver-typescript
+      - eslint-import-resolver-webpack
+      - supports-color
+
+  eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3):
+    dependencies:
+      '@typescript-eslint/utils': 5.62.0(eslint@8.57.1)(typescript@5.6.3)
+      eslint: 8.57.1
+    optionalDependencies:
+      '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1)(typescript@5.6.3)
+      jest: 29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3))
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+
+  eslint-plugin-jsx-a11y@6.10.1(eslint@8.57.1):
+    dependencies:
+      aria-query: 5.3.2
+      array-includes: 3.1.8
+      array.prototype.flatmap: 1.3.2
+      ast-types-flow: 0.0.8
+      axe-core: 4.10.2
+      axobject-query: 4.1.0
+      damerau-levenshtein: 1.0.8
+      emoji-regex: 9.2.2
+      es-iterator-helpers: 1.1.0
+      eslint: 8.57.1
+      hasown: 2.0.2
+      jsx-ast-utils: 3.3.5
+      language-tags: 1.0.9
+      minimatch: 3.1.2
+      object.fromentries: 2.0.8
+      safe-regex-test: 1.0.3
+      string.prototype.includes: 2.0.1
+
+  eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.10.0(eslint@8.57.1))(eslint@8.57.1)(prettier@2.8.8):
+    dependencies:
+      eslint: 8.57.1
+      prettier: 2.8.8
+      prettier-linter-helpers: 1.0.0
+    optionalDependencies:
+      eslint-config-prettier: 8.10.0(eslint@8.57.1)
+
+  eslint-plugin-promise@6.6.0(eslint@8.57.1):
+    dependencies:
+      eslint: 8.57.1
+
+  eslint-plugin-react-hooks@5.0.0-canary-7118f5dd7-20230705(eslint@8.57.1):
+    dependencies:
+      eslint: 8.57.1
+
+  eslint-plugin-react@7.37.2(eslint@8.57.1):
+    dependencies:
+      array-includes: 3.1.8
+      array.prototype.findlast: 1.2.5
+      array.prototype.flatmap: 1.3.2
+      array.prototype.tosorted: 1.1.4
+      doctrine: 2.1.0
+      es-iterator-helpers: 1.1.0
+      eslint: 8.57.1
+      estraverse: 5.3.0
+      hasown: 2.0.2
+      jsx-ast-utils: 3.3.5
+      minimatch: 3.1.2
+      object.entries: 1.1.8
+      object.fromentries: 2.0.8
+      object.values: 1.2.0
+      prop-types: 15.8.1
+      resolve: 2.0.0-next.5
+      semver: 6.3.1
+      string.prototype.matchall: 4.0.11
+      string.prototype.repeat: 1.0.0
+
+  eslint-scope@5.1.1:
+    dependencies:
+      esrecurse: 4.3.0
+      estraverse: 4.3.0
+
+  eslint-scope@7.2.2:
+    dependencies:
+      esrecurse: 4.3.0
+      estraverse: 5.3.0
+
+  eslint-visitor-keys@3.4.3: {}
+
+  eslint@8.57.1:
+    dependencies:
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.1)
+      '@eslint-community/regexpp': 4.11.1
+      '@eslint/eslintrc': 2.1.4
+      '@eslint/js': 8.57.1
+      '@humanwhocodes/config-array': 0.13.0
+      '@humanwhocodes/module-importer': 1.0.1
+      '@nodelib/fs.walk': 1.2.8
+      '@ungap/structured-clone': 1.2.0
+      ajv: 6.12.6
+      chalk: 4.1.2
+      cross-spawn: 7.0.3
+      debug: 4.3.7(supports-color@8.1.1)
+      doctrine: 3.0.0
+      escape-string-regexp: 4.0.0
+      eslint-scope: 7.2.2
+      eslint-visitor-keys: 3.4.3
+      espree: 9.6.1
+      esquery: 1.6.0
+      esutils: 2.0.3
+      fast-deep-equal: 3.1.3
+      file-entry-cache: 6.0.1
+      find-up: 5.0.0
+      glob-parent: 6.0.2
+      globals: 13.24.0
+      graphemer: 1.4.0
+      ignore: 5.3.2
+      imurmurhash: 0.1.4
+      is-glob: 4.0.3
+      is-path-inside: 3.0.3
+      js-yaml: 4.1.0
+      json-stable-stringify-without-jsonify: 1.0.1
+      levn: 0.4.1
+      lodash.merge: 4.6.2
+      minimatch: 3.1.2
+      natural-compare: 1.4.0
+      optionator: 0.9.4
+      strip-ansi: 6.0.1
+      text-table: 0.2.0
+    transitivePeerDependencies:
+      - supports-color
+
+  espree@9.6.1:
+    dependencies:
+      acorn: 8.13.0
+      acorn-jsx: 5.3.2(acorn@8.13.0)
+      eslint-visitor-keys: 3.4.3
+
+  esprima@4.0.1: {}
+
+  esquery@1.6.0:
+    dependencies:
+      estraverse: 5.3.0
+
+  esrecurse@4.3.0:
+    dependencies:
+      estraverse: 5.3.0
+
+  estraverse@4.3.0: {}
+
+  estraverse@5.3.0: {}
+
+  estree-walker@0.6.1: {}
+
+  estree-walker@2.0.2: {}
+
+  esutils@2.0.3: {}
+
+  eventemitter2@6.4.7: {}
+
+  eventemitter3@4.0.7: {}
+
+  eventemitter3@5.0.1: {}
+
+  execa@4.1.0:
+    dependencies:
+      cross-spawn: 7.0.3
+      get-stream: 5.2.0
+      human-signals: 1.1.1
+      is-stream: 2.0.1
+      merge-stream: 2.0.0
+      npm-run-path: 4.0.1
+      onetime: 5.1.2
+      signal-exit: 3.0.7
+      strip-final-newline: 2.0.0
+
+  execa@5.1.1:
+    dependencies:
+      cross-spawn: 7.0.3
+      get-stream: 6.0.1
+      human-signals: 2.1.0
+      is-stream: 2.0.1
+      merge-stream: 2.0.0
+      npm-run-path: 4.0.1
+      onetime: 5.1.2
+      signal-exit: 3.0.7
+      strip-final-newline: 2.0.0
+
+  execa@7.2.0:
+    dependencies:
+      cross-spawn: 7.0.3
+      get-stream: 6.0.1
+      human-signals: 4.3.1
+      is-stream: 3.0.0
+      merge-stream: 2.0.0
+      npm-run-path: 5.3.0
+      onetime: 6.0.0
+      signal-exit: 3.0.7
+      strip-final-newline: 3.0.0
+
+  executable@4.1.1:
+    dependencies:
+      pify: 2.3.0
+
+  exit@0.1.2: {}
+
+  expect@29.7.0:
+    dependencies:
+      '@jest/expect-utils': 29.7.0
+      jest-get-type: 29.6.3
+      jest-matcher-utils: 29.7.0
+      jest-message-util: 29.7.0
+      jest-util: 29.7.0
+
+  extend@3.0.2: {}
+
+  extract-react-intl-messages@4.1.1(ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3)):
+    dependencies:
+      '@babel/core': 7.26.0
+      babel-plugin-react-intl: 7.9.4(ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3))
+      flat: 5.0.2
+      glob: 7.2.3
+      js-yaml: 3.14.1
+      load-json-file: 6.2.0
+      lodash.merge: 4.6.2
+      lodash.mergewith: 4.6.2
+      lodash.pick: 4.4.0
+      meow: 6.1.1
+      mkdirp: 1.0.4
+      pify: 5.0.0
+      read-babelrc-up: 1.1.0
+      sort-keys: 4.2.0
+      write-json-file: 4.3.0
+    transitivePeerDependencies:
+      - supports-color
+      - ts-jest
+
+  extract-zip@2.0.1(supports-color@8.1.1):
+    dependencies:
+      debug: 4.3.7(supports-color@8.1.1)
+      get-stream: 5.2.0
+      yauzl: 2.10.0
+    optionalDependencies:
+      '@types/yauzl': 2.10.3
+    transitivePeerDependencies:
+      - supports-color
+
+  extsprintf@1.3.0: {}
+
+  fast-deep-equal@3.1.3: {}
+
+  fast-diff@1.3.0: {}
+
+  fast-glob@3.3.2:
+    dependencies:
+      '@nodelib/fs.stat': 2.0.5
+      '@nodelib/fs.walk': 1.2.8
+      glob-parent: 5.1.2
+      merge2: 1.4.1
+      micromatch: 4.0.8
+
+  fast-json-stable-stringify@2.1.0: {}
+
+  fast-levenshtein@2.0.6: {}
+
+  fast-uri@3.0.3: {}
+
+  fastest-levenshtein@1.0.16: {}
+
+  fastq@1.17.1:
+    dependencies:
+      reusify: 1.0.4
+
+  fb-watchman@2.0.2:
+    dependencies:
+      bser: 2.1.1
+
+  fd-slicer@1.1.0:
+    dependencies:
+      pend: 1.2.0
+
+  fetch-blob@3.2.0:
+    dependencies:
+      node-domexception: 1.0.0
+      web-streams-polyfill: 3.3.3
+
+  figures@3.2.0:
+    dependencies:
+      escape-string-regexp: 1.0.5
+
+  file-entry-cache@6.0.1:
+    dependencies:
+      flat-cache: 3.2.0
+
+  file-entry-cache@7.0.2:
+    dependencies:
+      flat-cache: 3.2.0
+
+  filelist@1.0.4:
+    dependencies:
+      minimatch: 5.1.6
+
+  fill-range@7.1.1:
+    dependencies:
+      to-regex-range: 5.0.1
+
+  find-up@4.1.0:
+    dependencies:
+      locate-path: 5.0.0
+      path-exists: 4.0.0
+
+  find-up@5.0.0:
+    dependencies:
+      locate-path: 6.0.0
+      path-exists: 4.0.0
+
+  flat-cache@3.2.0:
+    dependencies:
+      flatted: 3.3.1
+      keyv: 4.5.4
+      rimraf: 3.0.2
+
+  flat@5.0.2: {}
+
+  flatted@3.3.1: {}
+
+  for-each@0.3.3:
+    dependencies:
+      is-callable: 1.2.7
+
+  foreground-child@3.3.0:
+    dependencies:
+      cross-spawn: 7.0.3
+      signal-exit: 4.1.0
+
+  forever-agent@0.6.1: {}
+
+  form-data@4.0.1:
+    dependencies:
+      asynckit: 0.4.0
+      combined-stream: 1.0.8
+      mime-types: 2.1.35
+
+  formdata-polyfill@4.0.10:
+    dependencies:
+      fetch-blob: 3.2.0
+
+  fraction.js@4.3.7: {}
+
+  fs-extra@10.1.0:
+    dependencies:
+      graceful-fs: 4.2.11
+      jsonfile: 6.1.0
+      universalify: 2.0.1
+
+  fs-extra@8.1.0:
+    dependencies:
+      graceful-fs: 4.2.11
+      jsonfile: 4.0.0
+      universalify: 0.1.2
+
+  fs-extra@9.1.0:
+    dependencies:
+      at-least-node: 1.0.0
+      graceful-fs: 4.2.11
+      jsonfile: 6.1.0
+      universalify: 2.0.1
+
+  fs-minipass@2.1.0:
+    dependencies:
+      minipass: 3.3.6
+
+  fs.realpath@1.0.0: {}
+
+  fsevents@2.3.3:
+    optional: true
+
+  function-bind@1.1.2: {}
+
+  function.prototype.name@1.1.6:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      functions-have-names: 1.2.3
+
+  functions-have-names@1.2.3: {}
+
+  generic-names@4.0.0:
+    dependencies:
+      loader-utils: 3.3.1
+
+  generic-pool@3.9.0: {}
+
+  gensync@1.0.0-beta.2: {}
+
+  get-caller-file@2.0.5: {}
+
+  get-intrinsic@1.2.4:
+    dependencies:
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+      has-proto: 1.0.3
+      has-symbols: 1.0.3
+      hasown: 2.0.2
+
+  get-package-type@0.1.0: {}
+
+  get-stream@5.2.0:
+    dependencies:
+      pump: 3.0.2
+
+  get-stream@6.0.1: {}
+
+  get-symbol-description@1.0.2:
+    dependencies:
+      call-bind: 1.0.7
+      es-errors: 1.3.0
+      get-intrinsic: 1.2.4
+
+  get-tsconfig@4.8.1:
+    dependencies:
+      resolve-pkg-maps: 1.0.0
+
+  getos@3.2.1:
+    dependencies:
+      async: 3.2.6
+
+  getpass@0.1.7:
+    dependencies:
+      assert-plus: 1.0.0
+
+  glob-parent@5.1.2:
+    dependencies:
+      is-glob: 4.0.3
+
+  glob-parent@6.0.2:
+    dependencies:
+      is-glob: 4.0.3
+
+  glob@10.3.10:
+    dependencies:
+      foreground-child: 3.3.0
+      jackspeak: 2.3.6
+      minimatch: 9.0.5
+      minipass: 7.1.2
+      path-scurry: 1.11.1
+
+  glob@7.2.3:
+    dependencies:
+      fs.realpath: 1.0.0
+      inflight: 1.0.6
+      inherits: 2.0.4
+      minimatch: 3.1.2
+      once: 1.4.0
+      path-is-absolute: 1.0.1
+
+  glob@8.1.0:
+    dependencies:
+      fs.realpath: 1.0.0
+      inflight: 1.0.6
+      inherits: 2.0.4
+      minimatch: 5.1.6
+      once: 1.4.0
+
+  global-dirs@3.0.1:
+    dependencies:
+      ini: 2.0.0
+
+  global-modules@2.0.0:
+    dependencies:
+      global-prefix: 3.0.0
+
+  global-prefix@3.0.0:
+    dependencies:
+      ini: 1.3.8
+      kind-of: 6.0.3
+      which: 1.3.1
+
+  globals@11.12.0: {}
+
+  globals@13.24.0:
+    dependencies:
+      type-fest: 0.20.2
+
+  globalthis@1.0.4:
+    dependencies:
+      define-properties: 1.2.1
+      gopd: 1.0.1
+
+  globby@10.0.1:
+    dependencies:
+      '@types/glob': 7.2.0
+      array-union: 2.1.0
+      dir-glob: 3.0.1
+      fast-glob: 3.3.2
+      glob: 7.2.3
+      ignore: 5.3.2
+      merge2: 1.4.1
+      slash: 3.0.0
+
+  globby@10.0.2:
+    dependencies:
+      '@types/glob': 7.2.0
+      array-union: 2.1.0
+      dir-glob: 3.0.1
+      fast-glob: 3.3.2
+      glob: 7.2.3
+      ignore: 5.3.2
+      merge2: 1.4.1
+      slash: 3.0.0
+
+  globby@11.1.0:
+    dependencies:
+      array-union: 2.1.0
+      dir-glob: 3.0.1
+      fast-glob: 3.3.2
+      ignore: 5.3.2
+      merge2: 1.4.1
+      slash: 3.0.0
+
+  globjoin@0.1.4: {}
+
+  gonzales-pe@4.3.0:
+    dependencies:
+      minimist: 1.2.8
+
+  gopd@1.0.1:
+    dependencies:
+      get-intrinsic: 1.2.4
+
+  graceful-fs@4.2.11: {}
+
+  graphemer@1.4.0: {}
+
+  hard-rejection@2.1.0: {}
+
+  has-bigints@1.0.2: {}
+
+  has-flag@3.0.0: {}
+
+  has-flag@4.0.0: {}
+
+  has-property-descriptors@1.0.2:
+    dependencies:
+      es-define-property: 1.0.0
+
+  has-proto@1.0.3: {}
+
+  has-symbols@1.0.3: {}
+
+  has-tostringtag@1.0.2:
+    dependencies:
+      has-symbols: 1.0.3
+
+  hasown@2.0.2:
+    dependencies:
+      function-bind: 1.1.2
+
+  hoist-non-react-statics@3.3.2:
+    dependencies:
+      react-is: 16.13.1
+
+  hosted-git-info@2.8.9: {}
+
+  hosted-git-info@4.1.0:
+    dependencies:
+      lru-cache: 6.0.0
+
+  html-escaper@2.0.2: {}
+
+  html-tags@3.3.1: {}
+
+  http-signature@1.4.0:
+    dependencies:
+      assert-plus: 1.0.0
+      jsprim: 2.0.2
+      sshpk: 1.18.0
+
+  human-signals@1.1.1: {}
+
+  human-signals@2.1.0: {}
+
+  human-signals@4.3.1: {}
+
+  husky@8.0.3: {}
+
+  icss-replace-symbols@1.1.0: {}
+
+  icss-utils@5.1.0(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+
+  ieee754@1.2.1: {}
+
+  ignore@5.3.2: {}
+
+  immer@9.0.21: {}
+
+  import-cwd@3.0.0:
+    dependencies:
+      import-from: 3.0.0
+
+  import-fresh@3.3.0:
+    dependencies:
+      parent-module: 1.0.1
+      resolve-from: 4.0.0
+
+  import-from@3.0.0:
+    dependencies:
+      resolve-from: 5.0.0
+
+  import-lazy@4.0.0: {}
+
+  import-local@3.2.0:
+    dependencies:
+      pkg-dir: 4.2.0
+      resolve-cwd: 3.0.0
+
+  imurmurhash@0.1.4: {}
+
+  indent-string@4.0.0: {}
+
+  indent-string@5.0.0: {}
+
+  inflight@1.0.6:
+    dependencies:
+      once: 1.4.0
+      wrappy: 1.0.2
+
+  inherits@2.0.4: {}
+
+  ini@1.3.8: {}
+
+  ini@2.0.0: {}
+
+  internal-slot@1.0.7:
+    dependencies:
+      es-errors: 1.3.0
+      hasown: 2.0.2
+      side-channel: 1.0.6
+
+  internmap@1.0.1: {}
+
+  intl-messageformat-parser@5.5.1:
+    dependencies:
+      '@formatjs/intl-numberformat': 5.7.6
+
+  intl-messageformat-parser@6.1.2:
+    dependencies:
+      '@formatjs/ecma402-abstract': 1.5.0
+      tslib: 2.8.0
+
+  intl-messageformat@10.7.3:
+    dependencies:
+      '@formatjs/ecma402-abstract': 2.2.1
+      '@formatjs/fast-memoize': 2.2.2
+      '@formatjs/icu-messageformat-parser': 2.9.1
+      tslib: 2.8.0
+
+  ipaddr.js@2.2.0: {}
+
+  is-array-buffer@3.0.4:
+    dependencies:
+      call-bind: 1.0.7
+      get-intrinsic: 1.2.4
+
+  is-arrayish@0.2.1: {}
+
+  is-async-function@2.0.0:
+    dependencies:
+      has-tostringtag: 1.0.2
+
+  is-bigint@1.0.4:
+    dependencies:
+      has-bigints: 1.0.2
+
+  is-boolean-object@1.1.2:
+    dependencies:
+      call-bind: 1.0.7
+      has-tostringtag: 1.0.2
+
+  is-buffer@1.1.6: {}
+
+  is-bun-module@1.2.1:
+    dependencies:
+      semver: 7.6.3
+
+  is-callable@1.2.7: {}
+
+  is-ci@3.0.1:
+    dependencies:
+      ci-info: 3.9.0
+
+  is-core-module@2.15.1:
+    dependencies:
+      hasown: 2.0.2
+
+  is-data-view@1.0.1:
+    dependencies:
+      is-typed-array: 1.1.13
+
+  is-date-object@1.0.5:
+    dependencies:
+      has-tostringtag: 1.0.2
+
+  is-docker@3.0.0: {}
+
+  is-extglob@2.1.1: {}
+
+  is-finalizationregistry@1.0.2:
+    dependencies:
+      call-bind: 1.0.7
+
+  is-fullwidth-code-point@3.0.0: {}
+
+  is-fullwidth-code-point@4.0.0: {}
+
+  is-generator-fn@2.1.0: {}
+
+  is-generator-function@1.0.10:
+    dependencies:
+      has-tostringtag: 1.0.2
+
+  is-glob@4.0.3:
+    dependencies:
+      is-extglob: 2.1.1
+
+  is-installed-globally@0.4.0:
+    dependencies:
+      global-dirs: 3.0.1
+      is-path-inside: 3.0.3
+
+  is-localhost-ip@1.4.0: {}
+
+  is-map@2.0.3: {}
+
+  is-module@1.0.0: {}
+
+  is-negative-zero@2.0.3: {}
+
+  is-number-object@1.0.7:
+    dependencies:
+      has-tostringtag: 1.0.2
+
+  is-number@7.0.0: {}
+
+  is-path-cwd@2.2.0: {}
+
+  is-path-inside@3.0.3: {}
+
+  is-plain-obj@1.1.0: {}
+
+  is-plain-obj@2.1.0: {}
+
+  is-plain-object@3.0.1: {}
+
+  is-plain-object@5.0.0: {}
+
+  is-reference@1.2.1:
+    dependencies:
+      '@types/estree': 1.0.6
+
+  is-regex@1.1.4:
+    dependencies:
+      call-bind: 1.0.7
+      has-tostringtag: 1.0.2
+
+  is-set@2.0.3: {}
+
+  is-shared-array-buffer@1.0.3:
+    dependencies:
+      call-bind: 1.0.7
+
+  is-stream@2.0.1: {}
+
+  is-stream@3.0.0: {}
+
+  is-string@1.0.7:
+    dependencies:
+      has-tostringtag: 1.0.2
+
+  is-symbol@1.0.4:
+    dependencies:
+      has-symbols: 1.0.3
+
+  is-typed-array@1.1.13:
+    dependencies:
+      which-typed-array: 1.1.15
+
+  is-typedarray@1.0.0: {}
+
+  is-unicode-supported@0.1.0: {}
+
+  is-weakmap@2.0.2: {}
+
+  is-weakref@1.0.2:
+    dependencies:
+      call-bind: 1.0.7
+
+  is-weakset@2.0.3:
+    dependencies:
+      call-bind: 1.0.7
+      get-intrinsic: 1.2.4
+
+  isarray@2.0.5: {}
+
+  isbot@5.1.17: {}
+
+  isexe@2.0.0: {}
+
+  isstream@0.1.2: {}
+
+  istanbul-lib-coverage@3.2.2: {}
+
+  istanbul-lib-instrument@5.2.1:
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/parser': 7.26.0
+      '@istanbuljs/schema': 0.1.3
+      istanbul-lib-coverage: 3.2.2
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
+  istanbul-lib-instrument@6.0.3:
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/parser': 7.26.0
+      '@istanbuljs/schema': 0.1.3
+      istanbul-lib-coverage: 3.2.2
+      semver: 7.6.3
+    transitivePeerDependencies:
+      - supports-color
+
+  istanbul-lib-report@3.0.1:
+    dependencies:
+      istanbul-lib-coverage: 3.2.2
+      make-dir: 4.0.0
+      supports-color: 7.2.0
+
+  istanbul-lib-source-maps@4.0.1:
+    dependencies:
+      debug: 4.3.7(supports-color@8.1.1)
+      istanbul-lib-coverage: 3.2.2
+      source-map: 0.6.1
+    transitivePeerDependencies:
+      - supports-color
+
+  istanbul-reports@3.1.7:
+    dependencies:
+      html-escaper: 2.0.2
+      istanbul-lib-report: 3.0.1
+
+  iterator.prototype@1.1.3:
+    dependencies:
+      define-properties: 1.2.1
+      get-intrinsic: 1.2.4
+      has-symbols: 1.0.3
+      reflect.getprototypeof: 1.0.6
+      set-function-name: 2.0.2
+
+  jackspeak@2.3.6:
+    dependencies:
+      '@isaacs/cliui': 8.0.2
+    optionalDependencies:
+      '@pkgjs/parseargs': 0.11.0
+
+  jake@10.9.2:
+    dependencies:
+      async: 3.2.6
+      chalk: 4.1.2
+      filelist: 1.0.4
+      minimatch: 3.1.2
+
+  jest-changed-files@29.7.0:
+    dependencies:
+      execa: 5.1.1
+      jest-util: 29.7.0
+      p-limit: 3.1.0
+
+  jest-circus@29.7.0:
+    dependencies:
+      '@jest/environment': 29.7.0
+      '@jest/expect': 29.7.0
+      '@jest/test-result': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 20.17.1
+      chalk: 4.1.2
+      co: 4.6.0
+      dedent: 1.5.3
+      is-generator-fn: 2.1.0
+      jest-each: 29.7.0
+      jest-matcher-utils: 29.7.0
+      jest-message-util: 29.7.0
+      jest-runtime: 29.7.0
+      jest-snapshot: 29.7.0
+      jest-util: 29.7.0
+      p-limit: 3.1.0
+      pretty-format: 29.7.0
+      pure-rand: 6.1.0
+      slash: 3.0.0
+      stack-utils: 2.0.6
+    transitivePeerDependencies:
+      - babel-plugin-macros
+      - supports-color
+
+  jest-cli@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)):
+    dependencies:
+      '@jest/core': 29.7.0(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3))
+      '@jest/test-result': 29.7.0
+      '@jest/types': 29.6.3
+      chalk: 4.1.2
+      create-jest: 29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3))
+      exit: 0.1.2
+      import-local: 3.2.0
+      jest-config: 29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3))
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      yargs: 17.7.2
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
+  jest-config@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)):
+    dependencies:
+      '@babel/core': 7.26.0
+      '@jest/test-sequencer': 29.7.0
+      '@jest/types': 29.6.3
+      babel-jest: 29.7.0(@babel/core@7.26.0)
+      chalk: 4.1.2
+      ci-info: 3.9.0
+      deepmerge: 4.3.1
+      glob: 7.2.3
+      graceful-fs: 4.2.11
+      jest-circus: 29.7.0
+      jest-environment-node: 29.7.0
+      jest-get-type: 29.6.3
+      jest-regex-util: 29.6.3
+      jest-resolve: 29.7.0
+      jest-runner: 29.7.0
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      micromatch: 4.0.8
+      parse-json: 5.2.0
+      pretty-format: 29.7.0
+      slash: 3.0.0
+      strip-json-comments: 3.1.1
+    optionalDependencies:
+      '@types/node': 20.17.1
+      ts-node: 10.9.2(@types/node@20.17.1)(typescript@5.6.3)
+    transitivePeerDependencies:
+      - babel-plugin-macros
+      - supports-color
+
+  jest-diff@29.7.0:
+    dependencies:
+      chalk: 4.1.2
+      diff-sequences: 29.6.3
+      jest-get-type: 29.6.3
+      pretty-format: 29.7.0
+
+  jest-docblock@29.7.0:
+    dependencies:
+      detect-newline: 3.1.0
+
+  jest-each@29.7.0:
+    dependencies:
+      '@jest/types': 29.6.3
+      chalk: 4.1.2
+      jest-get-type: 29.6.3
+      jest-util: 29.7.0
+      pretty-format: 29.7.0
+
+  jest-environment-node@29.7.0:
+    dependencies:
+      '@jest/environment': 29.7.0
+      '@jest/fake-timers': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 20.17.1
+      jest-mock: 29.7.0
+      jest-util: 29.7.0
+
+  jest-get-type@29.6.3: {}
+
+  jest-haste-map@29.7.0:
+    dependencies:
+      '@jest/types': 29.6.3
+      '@types/graceful-fs': 4.1.9
+      '@types/node': 20.17.1
+      anymatch: 3.1.3
+      fb-watchman: 2.0.2
+      graceful-fs: 4.2.11
+      jest-regex-util: 29.6.3
+      jest-util: 29.7.0
+      jest-worker: 29.7.0
+      micromatch: 4.0.8
+      walker: 1.0.8
+    optionalDependencies:
+      fsevents: 2.3.3
+
+  jest-leak-detector@29.7.0:
+    dependencies:
+      jest-get-type: 29.6.3
+      pretty-format: 29.7.0
+
+  jest-matcher-utils@29.7.0:
+    dependencies:
+      chalk: 4.1.2
+      jest-diff: 29.7.0
+      jest-get-type: 29.6.3
+      pretty-format: 29.7.0
+
+  jest-message-util@29.7.0:
+    dependencies:
+      '@babel/code-frame': 7.26.0
+      '@jest/types': 29.6.3
+      '@types/stack-utils': 2.0.3
+      chalk: 4.1.2
+      graceful-fs: 4.2.11
+      micromatch: 4.0.8
+      pretty-format: 29.7.0
+      slash: 3.0.0
+      stack-utils: 2.0.6
+
+  jest-mock@29.7.0:
+    dependencies:
+      '@jest/types': 29.6.3
+      '@types/node': 20.17.1
+      jest-util: 29.7.0
+
+  jest-pnp-resolver@1.2.3(jest-resolve@29.7.0):
+    optionalDependencies:
+      jest-resolve: 29.7.0
+
+  jest-regex-util@29.6.3: {}
+
+  jest-resolve-dependencies@29.7.0:
+    dependencies:
+      jest-regex-util: 29.6.3
+      jest-snapshot: 29.7.0
+    transitivePeerDependencies:
+      - supports-color
+
+  jest-resolve@29.7.0:
+    dependencies:
+      chalk: 4.1.2
+      graceful-fs: 4.2.11
+      jest-haste-map: 29.7.0
+      jest-pnp-resolver: 1.2.3(jest-resolve@29.7.0)
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      resolve: 1.22.8
+      resolve.exports: 2.0.2
+      slash: 3.0.0
+
+  jest-runner@29.7.0:
+    dependencies:
+      '@jest/console': 29.7.0
+      '@jest/environment': 29.7.0
+      '@jest/test-result': 29.7.0
+      '@jest/transform': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 20.17.1
+      chalk: 4.1.2
+      emittery: 0.13.1
+      graceful-fs: 4.2.11
+      jest-docblock: 29.7.0
+      jest-environment-node: 29.7.0
+      jest-haste-map: 29.7.0
+      jest-leak-detector: 29.7.0
+      jest-message-util: 29.7.0
+      jest-resolve: 29.7.0
+      jest-runtime: 29.7.0
+      jest-util: 29.7.0
+      jest-watcher: 29.7.0
+      jest-worker: 29.7.0
+      p-limit: 3.1.0
+      source-map-support: 0.5.13
+    transitivePeerDependencies:
+      - supports-color
+
+  jest-runtime@29.7.0:
+    dependencies:
+      '@jest/environment': 29.7.0
+      '@jest/fake-timers': 29.7.0
+      '@jest/globals': 29.7.0
+      '@jest/source-map': 29.6.3
+      '@jest/test-result': 29.7.0
+      '@jest/transform': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 20.17.1
+      chalk: 4.1.2
+      cjs-module-lexer: 1.4.1
+      collect-v8-coverage: 1.0.2
+      glob: 7.2.3
+      graceful-fs: 4.2.11
+      jest-haste-map: 29.7.0
+      jest-message-util: 29.7.0
+      jest-mock: 29.7.0
+      jest-regex-util: 29.6.3
+      jest-resolve: 29.7.0
+      jest-snapshot: 29.7.0
+      jest-util: 29.7.0
+      slash: 3.0.0
+      strip-bom: 4.0.0
+    transitivePeerDependencies:
+      - supports-color
+
+  jest-snapshot@29.7.0:
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/generator': 7.26.0
+      '@babel/plugin-syntax-jsx': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-syntax-typescript': 7.25.9(@babel/core@7.26.0)
+      '@babel/types': 7.26.0
+      '@jest/expect-utils': 29.7.0
+      '@jest/transform': 29.7.0
+      '@jest/types': 29.6.3
+      babel-preset-current-node-syntax: 1.1.0(@babel/core@7.26.0)
+      chalk: 4.1.2
+      expect: 29.7.0
+      graceful-fs: 4.2.11
+      jest-diff: 29.7.0
+      jest-get-type: 29.6.3
+      jest-matcher-utils: 29.7.0
+      jest-message-util: 29.7.0
+      jest-util: 29.7.0
+      natural-compare: 1.4.0
+      pretty-format: 29.7.0
+      semver: 7.6.3
+    transitivePeerDependencies:
+      - supports-color
+
+  jest-util@29.7.0:
+    dependencies:
+      '@jest/types': 29.6.3
+      '@types/node': 20.17.1
+      chalk: 4.1.2
+      ci-info: 3.9.0
+      graceful-fs: 4.2.11
+      picomatch: 2.3.1
+
+  jest-validate@29.7.0:
+    dependencies:
+      '@jest/types': 29.6.3
+      camelcase: 6.3.0
+      chalk: 4.1.2
+      jest-get-type: 29.6.3
+      leven: 3.1.0
+      pretty-format: 29.7.0
+
+  jest-watcher@29.7.0:
+    dependencies:
+      '@jest/test-result': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 20.17.1
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      emittery: 0.13.1
+      jest-util: 29.7.0
+      string-length: 4.0.2
+
+  jest-worker@26.6.2:
+    dependencies:
+      '@types/node': 20.17.1
+      merge-stream: 2.0.0
+      supports-color: 7.2.0
+
+  jest-worker@29.7.0:
+    dependencies:
+      '@types/node': 20.17.1
+      jest-util: 29.7.0
+      merge-stream: 2.0.0
+      supports-color: 8.1.1
+
+  jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)):
+    dependencies:
+      '@jest/core': 29.7.0(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3))
+      '@jest/types': 29.6.3
+      import-local: 3.2.0
+      jest-cli: 29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3))
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
+  joycon@3.1.1: {}
+
+  js-tokens@4.0.0: {}
+
+  js-yaml@3.14.1:
+    dependencies:
+      argparse: 1.0.10
+      esprima: 4.0.1
+
+  js-yaml@4.1.0:
+    dependencies:
+      argparse: 2.0.1
+
+  jsbn@0.1.1: {}
+
+  jsesc@3.0.2: {}
+
+  json-buffer@3.0.1: {}
+
+  json-parse-better-errors@1.0.2: {}
+
+  json-parse-even-better-errors@2.3.1: {}
+
+  json-schema-traverse@0.4.1: {}
+
+  json-schema-traverse@1.0.0: {}
+
+  json-schema@0.4.0: {}
+
+  json-stable-stringify-without-jsonify@1.0.1: {}
+
+  json-stable-stringify@1.1.1:
+    dependencies:
+      call-bind: 1.0.7
+      isarray: 2.0.5
+      jsonify: 0.0.1
+      object-keys: 1.1.1
+
+  json-stringify-safe@5.0.1: {}
+
+  json5@1.0.2:
+    dependencies:
+      minimist: 1.2.8
+
+  json5@2.2.3: {}
+
+  jsonc-parser@3.3.1: {}
+
+  jsonfile@4.0.0:
+    optionalDependencies:
+      graceful-fs: 4.2.11
+
+  jsonfile@6.1.0:
+    dependencies:
+      universalify: 2.0.1
+    optionalDependencies:
+      graceful-fs: 4.2.11
+
+  jsonify@0.0.1: {}
+
+  jsonwebtoken@9.0.2:
+    dependencies:
+      jws: 3.2.2
+      lodash.includes: 4.3.0
+      lodash.isboolean: 3.0.3
+      lodash.isinteger: 4.0.4
+      lodash.isnumber: 3.0.3
+      lodash.isplainobject: 4.0.6
+      lodash.isstring: 4.0.1
+      lodash.once: 4.1.1
+      ms: 2.1.3
+      semver: 7.6.3
+
+  jsprim@2.0.2:
+    dependencies:
+      assert-plus: 1.0.0
+      extsprintf: 1.3.0
+      json-schema: 0.4.0
+      verror: 1.10.0
+
+  jsx-ast-utils@3.3.5:
+    dependencies:
+      array-includes: 3.1.8
+      array.prototype.flat: 1.3.2
+      object.assign: 4.1.5
+      object.values: 1.2.0
+
+  jwa@1.4.1:
+    dependencies:
+      buffer-equal-constant-time: 1.0.1
+      ecdsa-sig-formatter: 1.0.11
+      safe-buffer: 5.2.1
+
+  jws@3.2.2:
+    dependencies:
+      jwa: 1.4.1
+      safe-buffer: 5.2.1
+
+  kafkajs@2.2.4: {}
+
+  keyv@4.5.4:
+    dependencies:
+      json-buffer: 3.0.1
+
+  kind-of@6.0.3: {}
+
+  kleur@3.0.3: {}
+
+  known-css-properties@0.29.0: {}
+
+  known-css-properties@0.34.0:
+    optional: true
+
+  language-subtag-registry@0.3.23: {}
+
+  language-tags@1.0.9:
+    dependencies:
+      language-subtag-registry: 0.3.23
+
+  lazy-ass@1.6.0: {}
+
+  leven@3.1.0: {}
+
+  levn@0.4.1:
+    dependencies:
+      prelude-ls: 1.2.1
+      type-check: 0.4.0
+
+  lilconfig@2.1.0: {}
+
+  lines-and-columns@1.2.4: {}
+
+  lint-staged@14.0.1(enquirer@2.4.1):
+    dependencies:
+      chalk: 5.3.0
+      commander: 11.0.0
+      debug: 4.3.4
+      execa: 7.2.0
+      lilconfig: 2.1.0
+      listr2: 6.6.1(enquirer@2.4.1)
+      micromatch: 4.0.5
+      pidtree: 0.6.0
+      string-argv: 0.3.2
+      yaml: 2.3.1
+    transitivePeerDependencies:
+      - enquirer
+      - supports-color
+
+  listr2@3.14.0(enquirer@2.4.1):
+    dependencies:
+      cli-truncate: 2.1.0
+      colorette: 2.0.20
+      log-update: 4.0.0
+      p-map: 4.0.0
+      rfdc: 1.4.1
+      rxjs: 7.8.1
+      through: 2.3.8
+      wrap-ansi: 7.0.0
+    optionalDependencies:
+      enquirer: 2.4.1
+
+  listr2@6.6.1(enquirer@2.4.1):
+    dependencies:
+      cli-truncate: 3.1.0
+      colorette: 2.0.20
+      eventemitter3: 5.0.1
+      log-update: 5.0.1
+      rfdc: 1.4.1
+      wrap-ansi: 8.1.0
+    optionalDependencies:
+      enquirer: 2.4.1
+
+  load-json-file@4.0.0:
+    dependencies:
+      graceful-fs: 4.2.11
+      parse-json: 4.0.0
+      pify: 3.0.0
+      strip-bom: 3.0.0
+
+  load-json-file@6.2.0:
+    dependencies:
+      graceful-fs: 4.2.11
+      parse-json: 5.2.0
+      strip-bom: 4.0.0
+      type-fest: 0.6.0
+
+  loader-utils@3.3.1: {}
+
+  locate-path@5.0.0:
+    dependencies:
+      p-locate: 4.1.0
+
+  locate-path@6.0.0:
+    dependencies:
+      p-locate: 5.0.0
+
+  lodash-es@4.17.21: {}
+
+  lodash.camelcase@4.3.0: {}
+
+  lodash.debounce@4.0.8: {}
+
+  lodash.includes@4.3.0: {}
+
+  lodash.isboolean@3.0.3: {}
+
+  lodash.isinteger@4.0.4: {}
+
+  lodash.isnumber@3.0.3: {}
+
+  lodash.isplainobject@4.0.6: {}
+
+  lodash.isstring@4.0.1: {}
+
+  lodash.memoize@4.1.2: {}
+
+  lodash.merge@4.6.2: {}
+
+  lodash.mergewith@4.6.2: {}
+
+  lodash.once@4.1.1: {}
+
+  lodash.pick@4.4.0: {}
+
+  lodash.truncate@4.4.2: {}
+
+  lodash.uniq@4.5.0: {}
+
+  lodash@4.17.21: {}
+
+  log-symbols@4.1.0:
+    dependencies:
+      chalk: 4.1.2
+      is-unicode-supported: 0.1.0
+
+  log-update@4.0.0:
+    dependencies:
+      ansi-escapes: 4.3.2
+      cli-cursor: 3.1.0
+      slice-ansi: 4.0.0
+      wrap-ansi: 6.2.0
+
+  log-update@5.0.1:
+    dependencies:
+      ansi-escapes: 5.0.0
+      cli-cursor: 4.0.0
+      slice-ansi: 5.0.0
+      strip-ansi: 7.1.0
+      wrap-ansi: 8.1.0
+
+  loose-envify@1.4.0:
+    dependencies:
+      js-tokens: 4.0.0
+
+  loud-rejection@2.2.0:
+    dependencies:
+      currently-unhandled: 0.4.1
+      signal-exit: 3.0.7
+
+  lower-case@2.0.2:
+    dependencies:
+      tslib: 2.8.0
+
+  lru-cache@10.4.3: {}
+
+  lru-cache@5.1.1:
+    dependencies:
+      yallist: 3.1.1
+
+  lru-cache@6.0.0:
+    dependencies:
+      yallist: 4.0.0
+
+  magic-string@0.30.12:
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.5.0
+
+  make-dir@3.1.0:
+    dependencies:
+      semver: 6.3.1
+
+  make-dir@4.0.0:
+    dependencies:
+      semver: 7.6.3
+
+  make-error@1.3.6: {}
+
+  makeerror@1.0.12:
+    dependencies:
+      tmpl: 1.0.5
+
+  map-obj@1.0.1: {}
+
+  map-obj@4.3.0: {}
+
+  mathml-tag-names@2.1.3: {}
+
+  maxmind@4.3.22:
+    dependencies:
+      mmdb-lib: 2.1.1
+      tiny-lru: 11.2.11
+
+  md5@2.3.0:
+    dependencies:
+      charenc: 0.0.2
+      crypt: 0.0.2
+      is-buffer: 1.1.6
+
+  mdn-data@2.0.14: {}
+
+  mdn-data@2.0.28: {}
+
+  mdn-data@2.0.30: {}
+
+  mdn-data@2.10.0:
+    optional: true
+
+  mdn-data@2.11.1:
+    optional: true
+
+  memoize-one@5.2.1: {}
+
+  memorystream@0.3.1: {}
+
+  meow@10.1.5:
+    dependencies:
+      '@types/minimist': 1.2.5
+      camelcase-keys: 7.0.2
+      decamelize: 5.0.1
+      decamelize-keys: 1.1.1
+      hard-rejection: 2.1.0
+      minimist-options: 4.1.0
+      normalize-package-data: 3.0.3
+      read-pkg-up: 8.0.0
+      redent: 4.0.0
+      trim-newlines: 4.1.1
+      type-fest: 1.4.0
+      yargs-parser: 20.2.9
+
+  meow@6.1.1:
+    dependencies:
+      '@types/minimist': 1.2.5
+      camelcase-keys: 6.2.2
+      decamelize-keys: 1.1.1
+      hard-rejection: 2.1.0
+      minimist-options: 4.1.0
+      normalize-package-data: 2.5.0
+      read-pkg-up: 7.0.1
+      redent: 3.0.0
+      trim-newlines: 3.0.1
+      type-fest: 0.13.1
+      yargs-parser: 18.1.3
+
+  merge-stream@2.0.0: {}
+
+  merge2@1.4.1: {}
+
+  micromatch@4.0.5:
+    dependencies:
+      braces: 3.0.3
+      picomatch: 2.3.1
+
+  micromatch@4.0.8:
+    dependencies:
+      braces: 3.0.3
+      picomatch: 2.3.1
+
+  mime-db@1.52.0: {}
+
+  mime-types@2.1.35:
+    dependencies:
+      mime-db: 1.52.0
+
+  mimic-fn@2.1.0: {}
+
+  mimic-fn@4.0.0: {}
+
+  min-indent@1.0.1: {}
+
+  minimatch@3.1.2:
+    dependencies:
+      brace-expansion: 1.1.11
+
+  minimatch@5.1.6:
+    dependencies:
+      brace-expansion: 2.0.1
+
+  minimatch@9.0.3:
+    dependencies:
+      brace-expansion: 2.0.1
+
+  minimatch@9.0.5:
+    dependencies:
+      brace-expansion: 2.0.1
+
+  minimist-options@4.1.0:
+    dependencies:
+      arrify: 1.0.1
+      is-plain-obj: 1.1.0
+      kind-of: 6.0.3
+
+  minimist@1.2.8: {}
+
+  minipass@3.3.6:
+    dependencies:
+      yallist: 4.0.0
+
+  minipass@5.0.0: {}
+
+  minipass@7.1.2: {}
+
+  minizlib@2.1.2:
+    dependencies:
+      minipass: 3.3.6
+      yallist: 4.0.0
+
+  mkdirp@1.0.4: {}
+
+  mmdb-lib@2.1.1: {}
+
+  moment-timezone@0.5.46:
+    dependencies:
+      moment: 2.30.1
+
+  moment@2.30.1: {}
+
+  ms@2.1.2: {}
+
+  ms@2.1.3: {}
+
+  nanoclone@0.2.1: {}
+
+  nanoid@3.3.7: {}
+
+  natural-compare@1.4.0: {}
+
+  next-basics@0.39.0(next@14.2.10(@babel/core@7.26.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+    dependencies:
+      bcryptjs: 2.4.3
+      jsonwebtoken: 9.0.2
+      next: 14.2.10(@babel/core@7.26.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      pure-rand: 6.1.0
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+
+  next@14.2.10(@babel/core@7.26.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+    dependencies:
+      '@next/env': 14.2.10
+      '@swc/helpers': 0.5.5
+      busboy: 1.6.0
+      caniuse-lite: 1.0.30001669
+      graceful-fs: 4.2.11
+      postcss: 8.4.31
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+      styled-jsx: 5.1.1(@babel/core@7.26.0)(react@18.3.1)
+    optionalDependencies:
+      '@next/swc-darwin-arm64': 14.2.10
+      '@next/swc-darwin-x64': 14.2.10
+      '@next/swc-linux-arm64-gnu': 14.2.10
+      '@next/swc-linux-arm64-musl': 14.2.10
+      '@next/swc-linux-x64-gnu': 14.2.10
+      '@next/swc-linux-x64-musl': 14.2.10
+      '@next/swc-win32-arm64-msvc': 14.2.10
+      '@next/swc-win32-ia32-msvc': 14.2.10
+      '@next/swc-win32-x64-msvc': 14.2.10
+    transitivePeerDependencies:
+      - '@babel/core'
+      - babel-plugin-macros
+
+  nice-try@1.0.5: {}
+
+  no-case@3.0.4:
+    dependencies:
+      lower-case: 2.0.2
+      tslib: 2.8.0
+
+  node-domexception@1.0.0: {}
+
+  node-fetch@3.3.2:
+    dependencies:
+      data-uri-to-buffer: 4.0.1
+      fetch-blob: 3.2.0
+      formdata-polyfill: 4.0.10
+
+  node-int64@0.4.0: {}
+
+  node-releases@2.0.18: {}
+
+  normalize-package-data@2.5.0:
+    dependencies:
+      hosted-git-info: 2.8.9
+      resolve: 1.22.8
+      semver: 5.7.2
+      validate-npm-package-license: 3.0.4
+
+  normalize-package-data@3.0.3:
+    dependencies:
+      hosted-git-info: 4.1.0
+      is-core-module: 2.15.1
+      semver: 7.6.3
+      validate-npm-package-license: 3.0.4
+
+  normalize-path@3.0.0: {}
+
+  normalize-range@0.1.2: {}
+
+  normalize-url@6.1.0: {}
+
+  npm-run-all@4.1.5:
+    dependencies:
+      ansi-styles: 3.2.1
+      chalk: 2.4.2
+      cross-spawn: 6.0.5
+      memorystream: 0.3.1
+      minimatch: 3.1.2
+      pidtree: 0.3.1
+      read-pkg: 3.0.0
+      shell-quote: 1.8.1
+      string.prototype.padend: 3.1.6
+
+  npm-run-path@4.0.1:
+    dependencies:
+      path-key: 3.1.1
+
+  npm-run-path@5.3.0:
+    dependencies:
+      path-key: 4.0.0
+
+  nth-check@2.1.1:
+    dependencies:
+      boolbase: 1.0.0
+
+  object-assign@4.1.1: {}
+
+  object-inspect@1.13.2: {}
+
+  object-keys@1.1.1: {}
+
+  object.assign@4.1.5:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      has-symbols: 1.0.3
+      object-keys: 1.1.1
+
+  object.entries@1.1.8:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-object-atoms: 1.0.0
+
+  object.fromentries@2.0.8:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-object-atoms: 1.0.0
+
+  object.groupby@1.0.3:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+
+  object.values@1.2.0:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-object-atoms: 1.0.0
+
+  once@1.4.0:
+    dependencies:
+      wrappy: 1.0.2
+
+  onetime@5.1.2:
+    dependencies:
+      mimic-fn: 2.1.0
+
+  onetime@6.0.0:
+    dependencies:
+      mimic-fn: 4.0.0
+
+  optionator@0.9.4:
+    dependencies:
+      deep-is: 0.1.4
+      fast-levenshtein: 2.0.6
+      levn: 0.4.1
+      prelude-ls: 1.2.1
+      type-check: 0.4.0
+      word-wrap: 1.2.5
+
+  ospath@1.2.2: {}
+
+  p-finally@1.0.0: {}
+
+  p-limit@2.3.0:
+    dependencies:
+      p-try: 2.2.0
+
+  p-limit@3.1.0:
+    dependencies:
+      yocto-queue: 0.1.0
+
+  p-locate@4.1.0:
+    dependencies:
+      p-limit: 2.3.0
+
+  p-locate@5.0.0:
+    dependencies:
+      p-limit: 3.1.0
+
+  p-map@3.0.0:
+    dependencies:
+      aggregate-error: 3.1.0
+
+  p-map@4.0.0:
+    dependencies:
+      aggregate-error: 3.1.0
+
+  p-queue@6.6.2:
+    dependencies:
+      eventemitter3: 4.0.7
+      p-timeout: 3.2.0
+
+  p-timeout@3.2.0:
+    dependencies:
+      p-finally: 1.0.0
+
+  p-try@2.2.0: {}
+
+  parent-module@1.0.1:
+    dependencies:
+      callsites: 3.1.0
+
+  parse-json@4.0.0:
+    dependencies:
+      error-ex: 1.3.2
+      json-parse-better-errors: 1.0.2
+
+  parse-json@5.2.0:
+    dependencies:
+      '@babel/code-frame': 7.26.0
+      error-ex: 1.3.2
+      json-parse-even-better-errors: 2.3.1
+      lines-and-columns: 1.2.4
+
+  path-exists@4.0.0: {}
+
+  path-is-absolute@1.0.1: {}
+
+  path-key@2.0.1: {}
+
+  path-key@3.1.1: {}
+
+  path-key@4.0.0: {}
+
+  path-parse@1.0.7: {}
+
+  path-scurry@1.11.1:
+    dependencies:
+      lru-cache: 10.4.3
+      minipass: 7.1.2
+
+  path-type@3.0.0:
+    dependencies:
+      pify: 3.0.0
+
+  path-type@4.0.0: {}
+
+  pend@1.2.0: {}
+
+  performance-now@2.1.0: {}
+
+  picocolors@1.1.1: {}
+
+  picomatch@2.3.1: {}
+
+  picomatch@4.0.2: {}
+
+  pidtree@0.3.1: {}
+
+  pidtree@0.6.0: {}
+
+  pify@2.3.0: {}
+
+  pify@3.0.0: {}
+
+  pify@5.0.0: {}
+
+  pirates@4.0.6: {}
+
+  pkg-dir@4.2.0:
+    dependencies:
+      find-up: 4.1.0
+
+  possible-typed-array-names@1.0.0: {}
+
+  postcss-attribute-case-insensitive@5.0.2(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-selector-parser: 6.1.2
+
+  postcss-calc@8.2.4(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-selector-parser: 6.1.2
+      postcss-value-parser: 4.2.0
+
+  postcss-clamp@4.1.0(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  postcss-color-functional-notation@4.2.4(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  postcss-color-hex-alpha@8.0.4(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  postcss-color-rebeccapurple@7.1.1(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  postcss-colormin@5.3.1(postcss@8.4.47):
+    dependencies:
+      browserslist: 4.24.2
+      caniuse-api: 3.0.0
+      colord: 2.9.3
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  postcss-convert-values@5.1.3(postcss@8.4.47):
+    dependencies:
+      browserslist: 4.24.2
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  postcss-custom-media@8.0.2(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  postcss-custom-properties@12.1.11(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  postcss-custom-selectors@6.0.3(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-selector-parser: 6.1.2
+
+  postcss-dir-pseudo-class@6.0.5(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-selector-parser: 6.1.2
+
+  postcss-discard-comments@5.1.2(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+
+  postcss-discard-duplicates@5.1.0(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+
+  postcss-discard-empty@5.1.1(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+
+  postcss-discard-overridden@5.1.0(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+
+  postcss-double-position-gradients@3.1.2(postcss@8.4.47):
+    dependencies:
+      '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.47)
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  postcss-env-function@4.0.6(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  postcss-flexbugs-fixes@5.0.2(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+
+  postcss-focus-visible@6.0.4(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-selector-parser: 6.1.2
+
+  postcss-focus-within@5.0.4(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-selector-parser: 6.1.2
+
+  postcss-font-variant@5.0.0(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+
+  postcss-gap-properties@3.0.5(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+
+  postcss-image-set-function@4.0.7(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  postcss-import@15.1.0(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+      read-cache: 1.0.0
+      resolve: 1.22.8
+
+  postcss-initial@4.0.1(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+
+  postcss-lab-function@4.2.1(postcss@8.4.47):
+    dependencies:
+      '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.47)
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  postcss-load-config@3.1.4(postcss@8.4.47)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)):
+    dependencies:
+      lilconfig: 2.1.0
+      yaml: 1.10.2
+    optionalDependencies:
+      postcss: 8.4.47
+      ts-node: 10.9.2(@types/node@20.17.1)(typescript@5.6.3)
+
+  postcss-logical@5.0.4(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+
+  postcss-media-minmax@5.0.0(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+
+  postcss-media-query-parser@0.2.3:
+    optional: true
+
+  postcss-merge-longhand@5.1.7(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+      stylehacks: 5.1.1(postcss@8.4.47)
+
+  postcss-merge-rules@5.1.4(postcss@8.4.47):
+    dependencies:
+      browserslist: 4.24.2
+      caniuse-api: 3.0.0
+      cssnano-utils: 3.1.0(postcss@8.4.47)
+      postcss: 8.4.47
+      postcss-selector-parser: 6.1.2
+
+  postcss-minify-font-values@5.1.0(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  postcss-minify-gradients@5.1.1(postcss@8.4.47):
+    dependencies:
+      colord: 2.9.3
+      cssnano-utils: 3.1.0(postcss@8.4.47)
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  postcss-minify-params@5.1.4(postcss@8.4.47):
+    dependencies:
+      browserslist: 4.24.2
+      cssnano-utils: 3.1.0(postcss@8.4.47)
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  postcss-minify-selectors@5.2.1(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-selector-parser: 6.1.2
+
+  postcss-modules-extract-imports@3.1.0(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+
+  postcss-modules-local-by-default@4.0.5(postcss@8.4.47):
+    dependencies:
+      icss-utils: 5.1.0(postcss@8.4.47)
+      postcss: 8.4.47
+      postcss-selector-parser: 6.1.2
+      postcss-value-parser: 4.2.0
+
+  postcss-modules-scope@3.2.0(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-selector-parser: 6.1.2
+
+  postcss-modules-values@4.0.0(postcss@8.4.47):
+    dependencies:
+      icss-utils: 5.1.0(postcss@8.4.47)
+      postcss: 8.4.47
+
+  postcss-modules@4.3.1(postcss@8.4.47):
+    dependencies:
+      generic-names: 4.0.0
+      icss-replace-symbols: 1.1.0
+      lodash.camelcase: 4.3.0
+      postcss: 8.4.47
+      postcss-modules-extract-imports: 3.1.0(postcss@8.4.47)
+      postcss-modules-local-by-default: 4.0.5(postcss@8.4.47)
+      postcss-modules-scope: 3.2.0(postcss@8.4.47)
+      postcss-modules-values: 4.0.0(postcss@8.4.47)
+      string-hash: 1.1.3
+
+  postcss-nesting@10.2.0(postcss@8.4.47):
+    dependencies:
+      '@csstools/selector-specificity': 2.2.0(postcss-selector-parser@6.1.2)
+      postcss: 8.4.47
+      postcss-selector-parser: 6.1.2
+
+  postcss-normalize-charset@5.1.0(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+
+  postcss-normalize-display-values@5.1.0(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  postcss-normalize-positions@5.1.1(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  postcss-normalize-repeat-style@5.1.1(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  postcss-normalize-string@5.1.0(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  postcss-normalize-timing-functions@5.1.0(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  postcss-normalize-unicode@5.1.1(postcss@8.4.47):
+    dependencies:
+      browserslist: 4.24.2
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  postcss-normalize-url@5.1.0(postcss@8.4.47):
+    dependencies:
+      normalize-url: 6.1.0
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  postcss-normalize-whitespace@5.1.1(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  postcss-opacity-percentage@1.1.3(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+
+  postcss-ordered-values@5.1.3(postcss@8.4.47):
+    dependencies:
+      cssnano-utils: 3.1.0(postcss@8.4.47)
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  postcss-overflow-shorthand@3.0.4(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  postcss-page-break@3.0.4(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+
+  postcss-place@7.0.5(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  postcss-preset-env@7.8.3(postcss@8.4.47):
+    dependencies:
+      '@csstools/postcss-cascade-layers': 1.1.1(postcss@8.4.47)
+      '@csstools/postcss-color-function': 1.1.1(postcss@8.4.47)
+      '@csstools/postcss-font-format-keywords': 1.0.1(postcss@8.4.47)
+      '@csstools/postcss-hwb-function': 1.0.2(postcss@8.4.47)
+      '@csstools/postcss-ic-unit': 1.0.1(postcss@8.4.47)
+      '@csstools/postcss-is-pseudo-class': 2.0.7(postcss@8.4.47)
+      '@csstools/postcss-nested-calc': 1.0.0(postcss@8.4.47)
+      '@csstools/postcss-normalize-display-values': 1.0.1(postcss@8.4.47)
+      '@csstools/postcss-oklab-function': 1.1.1(postcss@8.4.47)
+      '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.47)
+      '@csstools/postcss-stepped-value-functions': 1.0.1(postcss@8.4.47)
+      '@csstools/postcss-text-decoration-shorthand': 1.0.0(postcss@8.4.47)
+      '@csstools/postcss-trigonometric-functions': 1.0.2(postcss@8.4.47)
+      '@csstools/postcss-unset-value': 1.0.2(postcss@8.4.47)
+      autoprefixer: 10.4.20(postcss@8.4.47)
+      browserslist: 4.24.2
+      css-blank-pseudo: 3.0.3(postcss@8.4.47)
+      css-has-pseudo: 3.0.4(postcss@8.4.47)
+      css-prefers-color-scheme: 6.0.3(postcss@8.4.47)
+      cssdb: 7.11.2
+      postcss: 8.4.47
+      postcss-attribute-case-insensitive: 5.0.2(postcss@8.4.47)
+      postcss-clamp: 4.1.0(postcss@8.4.47)
+      postcss-color-functional-notation: 4.2.4(postcss@8.4.47)
+      postcss-color-hex-alpha: 8.0.4(postcss@8.4.47)
+      postcss-color-rebeccapurple: 7.1.1(postcss@8.4.47)
+      postcss-custom-media: 8.0.2(postcss@8.4.47)
+      postcss-custom-properties: 12.1.11(postcss@8.4.47)
+      postcss-custom-selectors: 6.0.3(postcss@8.4.47)
+      postcss-dir-pseudo-class: 6.0.5(postcss@8.4.47)
+      postcss-double-position-gradients: 3.1.2(postcss@8.4.47)
+      postcss-env-function: 4.0.6(postcss@8.4.47)
+      postcss-focus-visible: 6.0.4(postcss@8.4.47)
+      postcss-focus-within: 5.0.4(postcss@8.4.47)
+      postcss-font-variant: 5.0.0(postcss@8.4.47)
+      postcss-gap-properties: 3.0.5(postcss@8.4.47)
+      postcss-image-set-function: 4.0.7(postcss@8.4.47)
+      postcss-initial: 4.0.1(postcss@8.4.47)
+      postcss-lab-function: 4.2.1(postcss@8.4.47)
+      postcss-logical: 5.0.4(postcss@8.4.47)
+      postcss-media-minmax: 5.0.0(postcss@8.4.47)
+      postcss-nesting: 10.2.0(postcss@8.4.47)
+      postcss-opacity-percentage: 1.1.3(postcss@8.4.47)
+      postcss-overflow-shorthand: 3.0.4(postcss@8.4.47)
+      postcss-page-break: 3.0.4(postcss@8.4.47)
+      postcss-place: 7.0.5(postcss@8.4.47)
+      postcss-pseudo-class-any-link: 7.1.6(postcss@8.4.47)
+      postcss-replace-overflow-wrap: 4.0.0(postcss@8.4.47)
+      postcss-selector-not: 6.0.1(postcss@8.4.47)
+      postcss-value-parser: 4.2.0
+
+  postcss-pseudo-class-any-link@7.1.6(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-selector-parser: 6.1.2
+
+  postcss-reduce-initial@5.1.2(postcss@8.4.47):
+    dependencies:
+      browserslist: 4.24.2
+      caniuse-api: 3.0.0
+      postcss: 8.4.47
+
+  postcss-reduce-transforms@5.1.0(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+
+  postcss-replace-overflow-wrap@4.0.0(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+
+  postcss-resolve-nested-selector@0.1.6: {}
+
+  postcss-rtlcss@4.0.9(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      rtlcss: 4.1.1
+
+  postcss-safe-parser@6.0.0(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+
+  postcss-selector-not@6.0.1(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-selector-parser: 6.1.2
+
+  postcss-selector-parser@6.1.2:
+    dependencies:
+      cssesc: 3.0.0
+      util-deprecate: 1.0.2
+
+  postcss-svgo@5.1.0(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-value-parser: 4.2.0
+      svgo: 2.8.0
+
+  postcss-unique-selectors@5.1.1(postcss@8.4.47):
+    dependencies:
+      postcss: 8.4.47
+      postcss-selector-parser: 6.1.2
+
+  postcss-value-parser@4.2.0: {}
+
+  postcss@8.4.31:
+    dependencies:
+      nanoid: 3.3.7
+      picocolors: 1.1.1
+      source-map-js: 1.2.1
+
+  postcss@8.4.47:
+    dependencies:
+      nanoid: 3.3.7
+      picocolors: 1.1.1
+      source-map-js: 1.2.1
+
+  prelude-ls@1.2.1: {}
+
+  prettier-linter-helpers@1.0.0:
+    dependencies:
+      fast-diff: 1.3.0
+
+  prettier@2.8.8: {}
+
+  pretty-bytes@5.6.0: {}
+
+  pretty-format@29.7.0:
+    dependencies:
+      '@jest/schemas': 29.6.3
+      ansi-styles: 5.2.0
+      react-is: 18.3.1
+
+  prisma@5.17.0:
+    dependencies:
+      '@prisma/engines': 5.17.0
+
+  process@0.11.10: {}
+
+  promise.series@0.2.0: {}
+
+  prompts@2.4.2:
+    dependencies:
+      kleur: 3.0.3
+      sisteransi: 1.0.5
+
+  prop-types@15.8.1:
+    dependencies:
+      loose-envify: 1.4.0
+      object-assign: 4.1.1
+      react-is: 16.13.1
+
+  property-expr@2.0.6: {}
+
+  proxy-from-env@1.0.0: {}
+
+  psl@1.9.0: {}
+
+  pump@3.0.2:
+    dependencies:
+      end-of-stream: 1.4.4
+      once: 1.4.0
+
+  punycode@2.3.1: {}
+
+  pure-rand@6.1.0: {}
+
+  qs@6.13.0:
+    dependencies:
+      side-channel: 1.0.6
+
+  querystringify@2.2.0: {}
+
+  queue-microtask@1.2.3: {}
+
+  quick-lru@4.0.1: {}
+
+  quick-lru@5.1.1: {}
+
+  raf-schd@4.0.3: {}
+
+  randombytes@2.1.0:
+    dependencies:
+      safe-buffer: 5.2.1
+
+  react-basics@0.125.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+    dependencies:
+      '@react-spring/web': 9.7.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      classnames: 2.5.1
+      date-fns: 2.30.0
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+      react-hook-form: 7.53.1(react@18.3.1)
+      react-window: 1.8.10(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+
+  react-beautiful-dnd@13.1.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+    dependencies:
+      '@babel/runtime': 7.26.0
+      css-box-model: 1.2.1
+      memoize-one: 5.2.1
+      raf-schd: 4.0.3
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+      react-redux: 7.2.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      redux: 4.2.1
+      use-memo-one: 1.1.3(react@18.3.1)
+    transitivePeerDependencies:
+      - react-native
+
+  react-dom@18.3.1(react@18.3.1):
+    dependencies:
+      loose-envify: 1.4.0
+      react: 18.3.1
+      scheduler: 0.23.2
+
+  react-error-boundary@4.1.2(react@18.3.1):
+    dependencies:
+      '@babel/runtime': 7.26.0
+      react: 18.3.1
+
+  react-hook-form@7.53.1(react@18.3.1):
+    dependencies:
+      react: 18.3.1
+
+  react-intl@6.8.4(react@18.3.1)(typescript@5.6.3):
+    dependencies:
+      '@formatjs/ecma402-abstract': 2.2.1
+      '@formatjs/icu-messageformat-parser': 2.9.1
+      '@formatjs/intl': 2.10.11(typescript@5.6.3)
+      '@formatjs/intl-displaynames': 6.8.1
+      '@formatjs/intl-listformat': 7.7.1
+      '@types/hoist-non-react-statics': 3.3.5
+      '@types/react': 18.3.12
+      hoist-non-react-statics: 3.3.2
+      intl-messageformat: 10.7.3
+      react: 18.3.1
+      tslib: 2.8.0
+    optionalDependencies:
+      typescript: 5.6.3
+
+  react-is@16.13.1: {}
+
+  react-is@17.0.2: {}
+
+  react-is@18.3.1: {}
+
+  react-redux@7.2.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+    dependencies:
+      '@babel/runtime': 7.26.0
+      '@types/react-redux': 7.1.34
+      hoist-non-react-statics: 3.3.2
+      loose-envify: 1.4.0
+      prop-types: 15.8.1
+      react: 18.3.1
+      react-is: 17.0.2
+    optionalDependencies:
+      react-dom: 18.3.1(react@18.3.1)
+
+  react-simple-maps@2.3.0(prop-types@15.8.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+    dependencies:
+      d3-geo: 2.0.2
+      d3-selection: 2.0.0
+      d3-zoom: 2.0.0
+      prop-types: 15.8.1
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+      topojson-client: 3.1.0
+
+  react-use-measure@2.1.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+    dependencies:
+      debounce: 1.2.1
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+
+  react-window@1.8.10(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+    dependencies:
+      '@babel/runtime': 7.26.0
+      memoize-one: 5.2.1
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+
+  react@18.3.1:
+    dependencies:
+      loose-envify: 1.4.0
+
+  read-babelrc-up@1.1.0:
+    dependencies:
+      find-up: 4.1.0
+      json5: 2.2.3
+
+  read-cache@1.0.0:
+    dependencies:
+      pify: 2.3.0
+
+  read-pkg-up@7.0.1:
+    dependencies:
+      find-up: 4.1.0
+      read-pkg: 5.2.0
+      type-fest: 0.8.1
+
+  read-pkg-up@8.0.0:
+    dependencies:
+      find-up: 5.0.0
+      read-pkg: 6.0.0
+      type-fest: 1.4.0
+
+  read-pkg@3.0.0:
+    dependencies:
+      load-json-file: 4.0.0
+      normalize-package-data: 2.5.0
+      path-type: 3.0.0
+
+  read-pkg@5.2.0:
+    dependencies:
+      '@types/normalize-package-data': 2.4.4
+      normalize-package-data: 2.5.0
+      parse-json: 5.2.0
+      type-fest: 0.6.0
+
+  read-pkg@6.0.0:
+    dependencies:
+      '@types/normalize-package-data': 2.4.4
+      normalize-package-data: 3.0.3
+      parse-json: 5.2.0
+      type-fest: 1.4.0
+
+  redent@3.0.0:
+    dependencies:
+      indent-string: 4.0.0
+      strip-indent: 3.0.0
+
+  redent@4.0.0:
+    dependencies:
+      indent-string: 5.0.0
+      strip-indent: 4.0.0
+
+  redis@4.7.0:
+    dependencies:
+      '@redis/bloom': 1.2.0(@redis/client@1.6.0)
+      '@redis/client': 1.6.0
+      '@redis/graph': 1.1.1(@redis/client@1.6.0)
+      '@redis/json': 1.0.7(@redis/client@1.6.0)
+      '@redis/search': 1.2.0(@redis/client@1.6.0)
+      '@redis/time-series': 1.1.0(@redis/client@1.6.0)
+
+  redux@4.2.1:
+    dependencies:
+      '@babel/runtime': 7.26.0
+
+  reflect.getprototypeof@1.0.6:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-errors: 1.3.0
+      get-intrinsic: 1.2.4
+      globalthis: 1.0.4
+      which-builtin-type: 1.1.4
+
+  regenerate-unicode-properties@10.2.0:
+    dependencies:
+      regenerate: 1.4.2
+
+  regenerate@1.4.2: {}
+
+  regenerator-runtime@0.14.1: {}
+
+  regenerator-transform@0.15.2:
+    dependencies:
+      '@babel/runtime': 7.26.0
+
+  regexp.prototype.flags@1.5.3:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-errors: 1.3.0
+      set-function-name: 2.0.2
+
+  regexpu-core@6.1.1:
+    dependencies:
+      regenerate: 1.4.2
+      regenerate-unicode-properties: 10.2.0
+      regjsgen: 0.8.0
+      regjsparser: 0.11.1
+      unicode-match-property-ecmascript: 2.0.0
+      unicode-match-property-value-ecmascript: 2.2.0
+
+  regjsgen@0.8.0: {}
+
+  regjsparser@0.11.1:
+    dependencies:
+      jsesc: 3.0.2
+
+  request-ip@3.3.0: {}
+
+  request-progress@3.0.0:
+    dependencies:
+      throttleit: 1.0.1
+
+  require-directory@2.1.1: {}
+
+  require-from-string@2.0.2: {}
+
+  requires-port@1.0.0: {}
+
+  resolve-cwd@3.0.0:
+    dependencies:
+      resolve-from: 5.0.0
+
+  resolve-from@4.0.0: {}
+
+  resolve-from@5.0.0: {}
+
+  resolve-pkg-maps@1.0.0: {}
+
+  resolve.exports@2.0.2: {}
+
+  resolve@1.22.8:
+    dependencies:
+      is-core-module: 2.15.1
+      path-parse: 1.0.7
+      supports-preserve-symlinks-flag: 1.0.0
+
+  resolve@2.0.0-next.5:
+    dependencies:
+      is-core-module: 2.15.1
+      path-parse: 1.0.7
+      supports-preserve-symlinks-flag: 1.0.0
+
+  restore-cursor@3.1.0:
+    dependencies:
+      onetime: 5.1.2
+      signal-exit: 3.0.7
+
+  restore-cursor@4.0.0:
+    dependencies:
+      onetime: 5.1.2
+      signal-exit: 3.0.7
+
+  reusify@1.0.4: {}
+
+  rfdc@1.4.1: {}
+
+  rimraf@3.0.2:
+    dependencies:
+      glob: 7.2.3
+
+  rollup-plugin-copy@3.5.0:
+    dependencies:
+      '@types/fs-extra': 8.1.5
+      colorette: 1.4.0
+      fs-extra: 8.1.0
+      globby: 10.0.1
+      is-plain-object: 3.0.1
+
+  rollup-plugin-delete@2.1.0(rollup@3.29.5):
+    dependencies:
+      del: 5.1.0
+      rollup: 3.29.5
+
+  rollup-plugin-dts@5.3.1(rollup@3.29.5)(typescript@5.6.3):
+    dependencies:
+      magic-string: 0.30.12
+      rollup: 3.29.5
+      typescript: 5.6.3
+    optionalDependencies:
+      '@babel/code-frame': 7.26.0
+
+  rollup-plugin-esbuild@5.0.0(esbuild@0.17.19)(rollup@3.29.5):
+    dependencies:
+      '@rollup/pluginutils': 5.1.3(rollup@3.29.5)
+      debug: 4.3.7(supports-color@8.1.1)
+      es-module-lexer: 1.5.4
+      esbuild: 0.17.19
+      joycon: 3.1.1
+      jsonc-parser: 3.3.1
+      rollup: 3.29.5
+    transitivePeerDependencies:
+      - supports-color
+
+  rollup-plugin-node-externals@6.1.2(rollup@3.29.5):
+    dependencies:
+      rollup: 3.29.5
+
+  rollup-plugin-postcss@4.0.2(postcss@8.4.47)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)):
+    dependencies:
+      chalk: 4.1.2
+      concat-with-sourcemaps: 1.1.0
+      cssnano: 5.1.15(postcss@8.4.47)
+      import-cwd: 3.0.0
+      p-queue: 6.6.2
+      pify: 5.0.0
+      postcss: 8.4.47
+      postcss-load-config: 3.1.4(postcss@8.4.47)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3))
+      postcss-modules: 4.3.1(postcss@8.4.47)
+      promise.series: 0.2.0
+      resolve: 1.22.8
+      rollup-pluginutils: 2.8.2
+      safe-identifier: 0.4.2
+      style-inject: 0.3.0
+    transitivePeerDependencies:
+      - ts-node
+
+  rollup-plugin-terser@7.0.2(rollup@3.29.5):
+    dependencies:
+      '@babel/code-frame': 7.26.0
+      jest-worker: 26.6.2
+      rollup: 3.29.5
+      serialize-javascript: 4.0.0
+      terser: 5.36.0
+
+  rollup-pluginutils@2.8.2:
+    dependencies:
+      estree-walker: 0.6.1
+
+  rollup@3.29.5:
+    optionalDependencies:
+      fsevents: 2.3.3
+
+  rtlcss@4.1.1:
+    dependencies:
+      escalade: 3.2.0
+      picocolors: 1.1.1
+      postcss: 8.4.47
+      strip-json-comments: 3.1.1
+
+  run-parallel@1.2.0:
+    dependencies:
+      queue-microtask: 1.2.3
+
+  rxjs@7.8.1:
+    dependencies:
+      tslib: 2.8.0
+
+  safe-array-concat@1.1.2:
+    dependencies:
+      call-bind: 1.0.7
+      get-intrinsic: 1.2.4
+      has-symbols: 1.0.3
+      isarray: 2.0.5
+
+  safe-buffer@5.2.1: {}
+
+  safe-identifier@0.4.2: {}
+
+  safe-regex-test@1.0.3:
+    dependencies:
+      call-bind: 1.0.7
+      es-errors: 1.3.0
+      is-regex: 1.1.4
+
+  safer-buffer@2.1.2: {}
+
+  scheduler@0.23.2:
+    dependencies:
+      loose-envify: 1.4.0
+
+  schema-utils@2.7.1:
+    dependencies:
+      '@types/json-schema': 7.0.15
+      ajv: 6.12.6
+      ajv-keywords: 3.5.2(ajv@6.12.6)
+
+  semver@5.7.2: {}
+
+  semver@6.3.1: {}
+
+  semver@7.6.3: {}
+
+  serialize-javascript@4.0.0:
+    dependencies:
+      randombytes: 2.1.0
+
+  set-function-length@1.2.2:
+    dependencies:
+      define-data-property: 1.1.4
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+      get-intrinsic: 1.2.4
+      gopd: 1.0.1
+      has-property-descriptors: 1.0.2
+
+  set-function-name@2.0.2:
+    dependencies:
+      define-data-property: 1.1.4
+      es-errors: 1.3.0
+      functions-have-names: 1.2.3
+      has-property-descriptors: 1.0.2
+
+  shebang-command@1.2.0:
+    dependencies:
+      shebang-regex: 1.0.0
+
+  shebang-command@2.0.0:
+    dependencies:
+      shebang-regex: 3.0.0
+
+  shebang-regex@1.0.0: {}
+
+  shebang-regex@3.0.0: {}
+
+  shell-quote@1.8.1: {}
+
+  side-channel@1.0.6:
+    dependencies:
+      call-bind: 1.0.7
+      es-errors: 1.3.0
+      get-intrinsic: 1.2.4
+      object-inspect: 1.13.2
+
+  signal-exit@3.0.7: {}
+
+  signal-exit@4.1.0: {}
+
+  sisteransi@1.0.5: {}
+
+  slash@3.0.0: {}
+
+  slice-ansi@3.0.0:
+    dependencies:
+      ansi-styles: 4.3.0
+      astral-regex: 2.0.0
+      is-fullwidth-code-point: 3.0.0
+
+  slice-ansi@4.0.0:
+    dependencies:
+      ansi-styles: 4.3.0
+      astral-regex: 2.0.0
+      is-fullwidth-code-point: 3.0.0
+
+  slice-ansi@5.0.0:
+    dependencies:
+      ansi-styles: 6.2.1
+      is-fullwidth-code-point: 4.0.0
+
+  snake-case@3.0.4:
+    dependencies:
+      dot-case: 3.0.4
+      tslib: 2.8.0
+
+  sort-keys@4.2.0:
+    dependencies:
+      is-plain-obj: 2.1.0
+
+  source-map-js@1.2.1: {}
+
+  source-map-support@0.5.13:
+    dependencies:
+      buffer-from: 1.1.2
+      source-map: 0.6.1
+
+  source-map-support@0.5.21:
+    dependencies:
+      buffer-from: 1.1.2
+      source-map: 0.6.1
+
+  source-map@0.6.1: {}
+
+  spdx-correct@3.2.0:
+    dependencies:
+      spdx-expression-parse: 3.0.1
+      spdx-license-ids: 3.0.20
+
+  spdx-exceptions@2.5.0: {}
+
+  spdx-expression-parse@3.0.1:
+    dependencies:
+      spdx-exceptions: 2.5.0
+      spdx-license-ids: 3.0.20
+
+  spdx-license-ids@3.0.20: {}
+
+  sprintf-js@1.0.3: {}
+
+  sshpk@1.18.0:
+    dependencies:
+      asn1: 0.2.6
+      assert-plus: 1.0.0
+      bcrypt-pbkdf: 1.0.2
+      dashdash: 1.14.1
+      ecc-jsbn: 0.1.2
+      getpass: 0.1.7
+      jsbn: 0.1.1
+      safer-buffer: 2.1.2
+      tweetnacl: 0.14.5
+
+  stable@0.1.8: {}
+
+  stack-utils@2.0.6:
+    dependencies:
+      escape-string-regexp: 2.0.0
+
+  streamsearch@1.1.0: {}
+
+  string-argv@0.3.2: {}
+
+  string-hash@1.1.3: {}
+
+  string-length@4.0.2:
+    dependencies:
+      char-regex: 1.0.2
+      strip-ansi: 6.0.1
+
+  string-width@4.2.3:
+    dependencies:
+      emoji-regex: 8.0.0
+      is-fullwidth-code-point: 3.0.0
+      strip-ansi: 6.0.1
+
+  string-width@5.1.2:
+    dependencies:
+      eastasianwidth: 0.2.0
+      emoji-regex: 9.2.2
+      strip-ansi: 7.1.0
+
+  string.prototype.includes@2.0.1:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+
+  string.prototype.matchall@4.0.11:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-errors: 1.3.0
+      es-object-atoms: 1.0.0
+      get-intrinsic: 1.2.4
+      gopd: 1.0.1
+      has-symbols: 1.0.3
+      internal-slot: 1.0.7
+      regexp.prototype.flags: 1.5.3
+      set-function-name: 2.0.2
+      side-channel: 1.0.6
+
+  string.prototype.padend@3.1.6:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-object-atoms: 1.0.0
+
+  string.prototype.repeat@1.0.0:
+    dependencies:
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+
+  string.prototype.trim@1.2.9:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-object-atoms: 1.0.0
+
+  string.prototype.trimend@1.0.8:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-object-atoms: 1.0.0
+
+  string.prototype.trimstart@1.0.8:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-object-atoms: 1.0.0
+
+  strip-ansi@6.0.1:
+    dependencies:
+      ansi-regex: 5.0.1
+
+  strip-ansi@7.1.0:
+    dependencies:
+      ansi-regex: 6.1.0
+
+  strip-bom@3.0.0: {}
+
+  strip-bom@4.0.0: {}
+
+  strip-final-newline@2.0.0: {}
+
+  strip-final-newline@3.0.0: {}
+
+  strip-indent@3.0.0:
+    dependencies:
+      min-indent: 1.0.1
+
+  strip-indent@4.0.0:
+    dependencies:
+      min-indent: 1.0.1
+
+  strip-json-comments@3.1.1: {}
+
+  style-inject@0.3.0: {}
+
+  style-search@0.1.0: {}
+
+  styled-jsx@5.1.1(@babel/core@7.26.0)(react@18.3.1):
+    dependencies:
+      client-only: 0.0.1
+      react: 18.3.1
+    optionalDependencies:
+      '@babel/core': 7.26.0
+
+  stylehacks@5.1.1(postcss@8.4.47):
+    dependencies:
+      browserslist: 4.24.2
+      postcss: 8.4.47
+      postcss-selector-parser: 6.1.2
+
+  stylelint-config-css-modules@4.4.0(stylelint@15.11.0(typescript@5.6.3)):
+    dependencies:
+      stylelint: 15.11.0(typescript@5.6.3)
+    optionalDependencies:
+      stylelint-scss: 6.8.1(stylelint@15.11.0(typescript@5.6.3))
+
+  stylelint-config-prettier@9.0.5(stylelint@15.11.0(typescript@5.6.3)):
+    dependencies:
+      stylelint: 15.11.0(typescript@5.6.3)
+
+  stylelint-config-recommended@14.0.1(stylelint@15.11.0(typescript@5.6.3)):
+    dependencies:
+      stylelint: 15.11.0(typescript@5.6.3)
+
+  stylelint-scss@6.8.1(stylelint@15.11.0(typescript@5.6.3)):
+    dependencies:
+      css-tree: 3.0.0
+      is-plain-object: 5.0.0
+      known-css-properties: 0.34.0
+      mdn-data: 2.11.1
+      postcss-media-query-parser: 0.2.3
+      postcss-resolve-nested-selector: 0.1.6
+      postcss-selector-parser: 6.1.2
+      postcss-value-parser: 4.2.0
+      stylelint: 15.11.0(typescript@5.6.3)
+    optional: true
+
+  stylelint@15.11.0(typescript@5.6.3):
+    dependencies:
+      '@csstools/css-parser-algorithms': 2.7.1(@csstools/css-tokenizer@2.4.1)
+      '@csstools/css-tokenizer': 2.4.1
+      '@csstools/media-query-list-parser': 2.1.13(@csstools/css-parser-algorithms@2.7.1(@csstools/css-tokenizer@2.4.1))(@csstools/css-tokenizer@2.4.1)
+      '@csstools/selector-specificity': 3.1.1(postcss-selector-parser@6.1.2)
+      balanced-match: 2.0.0
+      colord: 2.9.3
+      cosmiconfig: 8.3.6(typescript@5.6.3)
+      css-functions-list: 3.2.3
+      css-tree: 2.3.1
+      debug: 4.3.7(supports-color@8.1.1)
+      fast-glob: 3.3.2
+      fastest-levenshtein: 1.0.16
+      file-entry-cache: 7.0.2
+      global-modules: 2.0.0
+      globby: 11.1.0
+      globjoin: 0.1.4
+      html-tags: 3.3.1
+      ignore: 5.3.2
+      import-lazy: 4.0.0
+      imurmurhash: 0.1.4
+      is-plain-object: 5.0.0
+      known-css-properties: 0.29.0
+      mathml-tag-names: 2.1.3
+      meow: 10.1.5
+      micromatch: 4.0.8
+      normalize-path: 3.0.0
+      picocolors: 1.1.1
+      postcss: 8.4.47
+      postcss-resolve-nested-selector: 0.1.6
+      postcss-safe-parser: 6.0.0(postcss@8.4.47)
+      postcss-selector-parser: 6.1.2
+      postcss-value-parser: 4.2.0
+      resolve-from: 5.0.0
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+      style-search: 0.1.0
+      supports-hyperlinks: 3.1.0
+      svg-tags: 1.0.0
+      table: 6.8.2
+      write-file-atomic: 5.0.1
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+
+  supports-color@5.5.0:
+    dependencies:
+      has-flag: 3.0.0
+
+  supports-color@7.2.0:
+    dependencies:
+      has-flag: 4.0.0
+
+  supports-color@8.1.1:
+    dependencies:
+      has-flag: 4.0.0
+
+  supports-hyperlinks@3.1.0:
+    dependencies:
+      has-flag: 4.0.0
+      supports-color: 7.2.0
+
+  supports-preserve-symlinks-flag@1.0.0: {}
+
+  svg-parser@2.0.4: {}
+
+  svg-tags@1.0.0: {}
+
+  svgo@2.8.0:
+    dependencies:
+      '@trysound/sax': 0.2.0
+      commander: 7.2.0
+      css-select: 4.3.0
+      css-tree: 1.1.3
+      csso: 4.2.0
+      picocolors: 1.1.1
+      stable: 0.1.8
+
+  svgo@3.3.2:
+    dependencies:
+      '@trysound/sax': 0.2.0
+      commander: 7.2.0
+      css-select: 5.1.0
+      css-tree: 2.3.1
+      css-what: 6.1.0
+      csso: 5.0.5
+      picocolors: 1.1.1
+
+  table@6.8.2:
+    dependencies:
+      ajv: 8.17.1
+      lodash.truncate: 4.4.2
+      slice-ansi: 4.0.0
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+
+  tapable@2.2.1: {}
+
+  tar@6.2.1:
+    dependencies:
+      chownr: 2.0.0
+      fs-minipass: 2.1.0
+      minipass: 5.0.0
+      minizlib: 2.1.2
+      mkdirp: 1.0.4
+      yallist: 4.0.0
+
+  terser@5.36.0:
+    dependencies:
+      '@jridgewell/source-map': 0.3.6
+      acorn: 8.13.0
+      commander: 2.20.3
+      source-map-support: 0.5.21
+
+  test-exclude@6.0.0:
+    dependencies:
+      '@istanbuljs/schema': 0.1.3
+      glob: 7.2.3
+      minimatch: 3.1.2
+
+  text-table@0.2.0: {}
+
+  thenby@1.3.4: {}
+
+  throttleit@1.0.1: {}
+
+  through@2.3.8: {}
+
+  tiny-invariant@1.3.3: {}
+
+  tiny-lru@11.2.11: {}
+
+  tmp@0.2.3: {}
+
+  tmpl@1.0.5: {}
+
+  to-regex-range@5.0.1:
+    dependencies:
+      is-number: 7.0.0
+
+  topojson-client@3.1.0:
+    dependencies:
+      commander: 2.20.3
+
+  toposort@2.0.2: {}
+
+  tough-cookie@4.1.4:
+    dependencies:
+      psl: 1.9.0
+      punycode: 2.3.1
+      universalify: 0.2.0
+      url-parse: 1.5.10
+
+  tree-kill@1.2.2: {}
+
+  trim-newlines@3.0.1: {}
+
+  trim-newlines@4.1.1: {}
+
+  ts-api-utils@1.3.0(typescript@5.6.3):
+    dependencies:
+      typescript: 5.6.3
+
+  ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3):
+    dependencies:
+      bs-logger: 0.2.6
+      ejs: 3.1.10
+      fast-json-stable-stringify: 2.1.0
+      jest: 29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3))
+      jest-util: 29.7.0
+      json5: 2.2.3
+      lodash.memoize: 4.1.2
+      make-error: 1.3.6
+      semver: 7.6.3
+      typescript: 5.6.3
+      yargs-parser: 21.1.1
+    optionalDependencies:
+      '@babel/core': 7.26.0
+      '@jest/transform': 29.7.0
+      '@jest/types': 29.6.3
+      babel-jest: 29.7.0(@babel/core@7.26.0)
+      esbuild: 0.17.19
+
+  ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3):
+    dependencies:
+      '@cspotcode/source-map-support': 0.8.1
+      '@tsconfig/node10': 1.0.11
+      '@tsconfig/node12': 1.0.11
+      '@tsconfig/node14': 1.0.3
+      '@tsconfig/node16': 1.0.4
+      '@types/node': 20.17.1
+      acorn: 8.13.0
+      acorn-walk: 8.3.4
+      arg: 4.1.3
+      create-require: 1.1.1
+      diff: 4.0.2
+      make-error: 1.3.6
+      typescript: 5.6.3
+      v8-compile-cache-lib: 3.0.1
+      yn: 3.1.1
+
+  tsconfig-paths@3.15.0:
+    dependencies:
+      '@types/json5': 0.0.29
+      json5: 1.0.2
+      minimist: 1.2.8
+      strip-bom: 3.0.0
+
+  tslib@1.14.1: {}
+
+  tslib@2.8.0: {}
+
+  tsutils@3.21.0(typescript@5.6.3):
+    dependencies:
+      tslib: 1.14.1
+      typescript: 5.6.3
+
+  tunnel-agent@0.6.0:
+    dependencies:
+      safe-buffer: 5.2.1
+
+  tweetnacl@0.14.5: {}
+
+  type-check@0.4.0:
+    dependencies:
+      prelude-ls: 1.2.1
+
+  type-detect@4.0.8: {}
+
+  type-fest@0.13.1: {}
+
+  type-fest@0.20.2: {}
+
+  type-fest@0.21.3: {}
+
+  type-fest@0.6.0: {}
+
+  type-fest@0.8.1: {}
+
+  type-fest@1.4.0: {}
+
+  typed-array-buffer@1.0.2:
+    dependencies:
+      call-bind: 1.0.7
+      es-errors: 1.3.0
+      is-typed-array: 1.1.13
+
+  typed-array-byte-length@1.0.1:
+    dependencies:
+      call-bind: 1.0.7
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-proto: 1.0.3
+      is-typed-array: 1.1.13
+
+  typed-array-byte-offset@1.0.2:
+    dependencies:
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.7
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-proto: 1.0.3
+      is-typed-array: 1.1.13
+
+  typed-array-length@1.0.6:
+    dependencies:
+      call-bind: 1.0.7
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-proto: 1.0.3
+      is-typed-array: 1.1.13
+      possible-typed-array-names: 1.0.0
+
+  typedarray-to-buffer@3.1.5:
+    dependencies:
+      is-typedarray: 1.0.0
+
+  typescript@4.9.5: {}
+
+  typescript@5.6.3: {}
+
+  unbox-primitive@1.0.2:
+    dependencies:
+      call-bind: 1.0.7
+      has-bigints: 1.0.2
+      has-symbols: 1.0.3
+      which-boxed-primitive: 1.0.2
+
+  undici-types@6.19.8: {}
+
+  unicode-canonical-property-names-ecmascript@2.0.1: {}
+
+  unicode-match-property-ecmascript@2.0.0:
+    dependencies:
+      unicode-canonical-property-names-ecmascript: 2.0.1
+      unicode-property-aliases-ecmascript: 2.1.0
+
+  unicode-match-property-value-ecmascript@2.2.0: {}
+
+  unicode-property-aliases-ecmascript@2.1.0: {}
+
+  universalify@0.1.2: {}
+
+  universalify@0.2.0: {}
+
+  universalify@2.0.1: {}
+
+  untildify@4.0.0: {}
+
+  update-browserslist-db@1.1.1(browserslist@4.24.2):
+    dependencies:
+      browserslist: 4.24.2
+      escalade: 3.2.0
+      picocolors: 1.1.1
+
+  uri-js@4.4.1:
+    dependencies:
+      punycode: 2.3.1
+
+  url-parse@1.5.10:
+    dependencies:
+      querystringify: 2.2.0
+      requires-port: 1.0.0
+
+  use-memo-one@1.1.3(react@18.3.1):
+    dependencies:
+      react: 18.3.1
+
+  use-sync-external-store@1.2.2(react@18.3.1):
+    dependencies:
+      react: 18.3.1
+
+  util-deprecate@1.0.2: {}
+
+  uuid@8.3.2: {}
+
+  uuid@9.0.1: {}
+
+  v8-compile-cache-lib@3.0.1: {}
+
+  v8-to-istanbul@9.3.0:
+    dependencies:
+      '@jridgewell/trace-mapping': 0.3.25
+      '@types/istanbul-lib-coverage': 2.0.6
+      convert-source-map: 2.0.0
+
+  validate-npm-package-license@3.0.4:
+    dependencies:
+      spdx-correct: 3.2.0
+      spdx-expression-parse: 3.0.1
+
+  vary@1.1.2: {}
+
+  verror@1.10.0:
+    dependencies:
+      assert-plus: 1.0.0
+      core-util-is: 1.0.2
+      extsprintf: 1.3.0
+
+  vue@3.5.12(typescript@4.9.5):
+    dependencies:
+      '@vue/compiler-dom': 3.5.12
+      '@vue/compiler-sfc': 3.5.12
+      '@vue/runtime-dom': 3.5.12
+      '@vue/server-renderer': 3.5.12(vue@3.5.12(typescript@5.6.3))
+      '@vue/shared': 3.5.12
+    optionalDependencies:
+      typescript: 4.9.5
+
+  walker@1.0.8:
+    dependencies:
+      makeerror: 1.0.12
+
+  web-streams-polyfill@3.3.3: {}
+
+  which-boxed-primitive@1.0.2:
+    dependencies:
+      is-bigint: 1.0.4
+      is-boolean-object: 1.1.2
+      is-number-object: 1.0.7
+      is-string: 1.0.7
+      is-symbol: 1.0.4
+
+  which-builtin-type@1.1.4:
+    dependencies:
+      function.prototype.name: 1.1.6
+      has-tostringtag: 1.0.2
+      is-async-function: 2.0.0
+      is-date-object: 1.0.5
+      is-finalizationregistry: 1.0.2
+      is-generator-function: 1.0.10
+      is-regex: 1.1.4
+      is-weakref: 1.0.2
+      isarray: 2.0.5
+      which-boxed-primitive: 1.0.2
+      which-collection: 1.0.2
+      which-typed-array: 1.1.15
+
+  which-collection@1.0.2:
+    dependencies:
+      is-map: 2.0.3
+      is-set: 2.0.3
+      is-weakmap: 2.0.2
+      is-weakset: 2.0.3
+
+  which-typed-array@1.1.15:
+    dependencies:
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.7
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-tostringtag: 1.0.2
+
+  which@1.3.1:
+    dependencies:
+      isexe: 2.0.0
+
+  which@2.0.2:
+    dependencies:
+      isexe: 2.0.0
+
+  word-wrap@1.2.5: {}
+
+  wrap-ansi@6.2.0:
+    dependencies:
+      ansi-styles: 4.3.0
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+
+  wrap-ansi@7.0.0:
+    dependencies:
+      ansi-styles: 4.3.0
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+
+  wrap-ansi@8.1.0:
+    dependencies:
+      ansi-styles: 6.2.1
+      string-width: 5.1.2
+      strip-ansi: 7.1.0
+
+  wrappy@1.0.2: {}
+
+  write-file-atomic@3.0.3:
+    dependencies:
+      imurmurhash: 0.1.4
+      is-typedarray: 1.0.0
+      signal-exit: 3.0.7
+      typedarray-to-buffer: 3.1.5
+
+  write-file-atomic@4.0.2:
+    dependencies:
+      imurmurhash: 0.1.4
+      signal-exit: 3.0.7
+
+  write-file-atomic@5.0.1:
+    dependencies:
+      imurmurhash: 0.1.4
+      signal-exit: 4.1.0
+
+  write-json-file@4.3.0:
+    dependencies:
+      detect-indent: 6.1.0
+      graceful-fs: 4.2.11
+      is-plain-obj: 2.1.0
+      make-dir: 3.1.0
+      sort-keys: 4.2.0
+      write-file-atomic: 3.0.3
+
+  y18n@5.0.8: {}
+
+  yallist@3.1.1: {}
+
+  yallist@4.0.0: {}
+
+  yaml@1.10.2: {}
+
+  yaml@2.3.1: {}
+
+  yargs-parser@18.1.3:
+    dependencies:
+      camelcase: 5.3.1
+      decamelize: 1.2.0
+
+  yargs-parser@20.2.9: {}
+
+  yargs-parser@21.1.1: {}
+
+  yargs@17.7.2:
+    dependencies:
+      cliui: 8.0.1
+      escalade: 3.2.0
+      get-caller-file: 2.0.5
+      require-directory: 2.1.1
+      string-width: 4.2.3
+      y18n: 5.0.8
+      yargs-parser: 21.1.1
+
+  yauzl@2.10.0:
+    dependencies:
+      buffer-crc32: 0.2.13
+      fd-slicer: 1.1.0
+
+  yn@3.1.1: {}
+
+  yocto-queue@0.1.0: {}
+
+  yup@0.32.11:
+    dependencies:
+      '@babel/runtime': 7.26.0
+      '@types/lodash': 4.17.12
+      lodash: 4.17.21
+      lodash-es: 4.17.21
+      nanoclone: 0.2.1
+      property-expr: 2.0.6
+      toposort: 2.0.2
+
+  zustand@4.5.5(@types/react@18.3.12)(immer@9.0.21)(react@18.3.1):
+    dependencies:
+      use-sync-external-store: 1.2.2(react@18.3.1)
+    optionalDependencies:
+      '@types/react': 18.3.12
+      immer: 9.0.21
+      react: 18.3.1
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 5d3a9776b5..7e6fff6a8b 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -238,12 +238,12 @@ export const CHART_COLORS = [
 ];
 
 export const DOMAIN_REGEX =
-  /^(localhost(:[1-9]\d{0,4})?|((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9-]+(-[a-z0-9-]+)*\.)+(xn--)?[a-z0-9-]{2,63})$/;
+  /^(localhost(:[1-9]\d{0,4})?|((?=[a-z0-9-_]{1,63}\.)(xn--)?[a-z0-9-_]+(-[a-z0-9-_]+)*\.)+(xn--)?[a-z0-9-_]{2,63})$/;
 export const SHARE_ID_REGEX = /^[a-zA-Z0-9]{8,16}$/;
 export const UUID_REGEX =
   /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/;
 export const HOSTNAME_REGEX =
-  /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9])$/;
+  /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-_]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-_]*[A-Za-z0-9])$/;
 export const IP_REGEX =
   /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$|^(?:(?:[0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|(?:[0-9a-fA-F]{1,4}:){1,7}:|(?:[0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|(?:[0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|(?:[0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|(?:[0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|(?:[0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:(?:(:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]+|::(ffff(:0{1,4})?:)?((25[0-5]|(2[0-4]|1?[0-9])?[0-9])\.){3}(25[0-5]|(2[0-4]|1?[0-9])?[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1?[0-9])?[0-9])\.){3}(25[0-5]|(2[0-4]|1?[0-9])?[0-9]))$/;
 export const DATETIME_REGEX =

From 7bf1f955816ef23f5b27c7d618e4766119cd37a0 Mon Sep 17 00:00:00 2001
From: ZerGo0 <18653821+ZerGo0@users.noreply.github.com>
Date: Fri, 25 Oct 2024 21:55:32 +0200
Subject: [PATCH 385/438] chore: removed pnpm-loc.yaml

---
 pnpm-lock.yaml | 13380 -----------------------------------------------
 1 file changed, 13380 deletions(-)
 delete mode 100644 pnpm-lock.yaml

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
deleted file mode 100644
index fc57da9a15..0000000000
--- a/pnpm-lock.yaml
+++ /dev/null
@@ -1,13380 +0,0 @@
-lockfileVersion: '9.0'
-
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false
-
-importers:
-
-  .:
-    dependencies:
-      '@clickhouse/client':
-        specifier: ^1.4.1
-        version: 1.7.0
-      '@date-fns/utc':
-        specifier: ^1.2.0
-        version: 1.2.0
-      '@dicebear/collection':
-        specifier: ^9.2.1
-        version: 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/core':
-        specifier: ^9.2.1
-        version: 9.2.2
-      '@fontsource/inter':
-        specifier: ^4.5.15
-        version: 4.5.15
-      '@prisma/client':
-        specifier: '5.17'
-        version: 5.17.0(prisma@5.17.0)
-      '@prisma/extension-read-replicas':
-        specifier: ^0.3.0
-        version: 0.3.0(@prisma/client@5.17.0(prisma@5.17.0))
-      '@react-spring/web':
-        specifier: ^9.7.3
-        version: 9.7.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@tanstack/react-query':
-        specifier: ^5.28.6
-        version: 5.59.16(react@18.3.1)
-      '@umami/prisma-client':
-        specifier: ^0.14.0
-        version: 0.14.0(@prisma/client@5.17.0(prisma@5.17.0))(@prisma/extension-read-replicas@0.3.0(@prisma/client@5.17.0(prisma@5.17.0)))
-      '@umami/redis-client':
-        specifier: ^0.21.0
-        version: 0.21.0
-      chalk:
-        specifier: ^4.1.1
-        version: 4.1.2
-      chart.js:
-        specifier: ^4.4.2
-        version: 4.4.5
-      chartjs-adapter-date-fns:
-        specifier: ^3.0.0
-        version: 3.0.0(chart.js@4.4.5)(date-fns@2.30.0)
-      classnames:
-        specifier: ^2.3.1
-        version: 2.5.1
-      colord:
-        specifier: ^2.9.2
-        version: 2.9.3
-      cors:
-        specifier: ^2.8.5
-        version: 2.8.5
-      cross-spawn:
-        specifier: ^7.0.3
-        version: 7.0.3
-      date-fns:
-        specifier: ^2.23.0
-        version: 2.30.0
-      date-fns-tz:
-        specifier: ^1.1.4
-        version: 1.3.8(date-fns@2.30.0)
-      debug:
-        specifier: ^4.3.4
-        version: 4.3.7(supports-color@8.1.1)
-      del:
-        specifier: ^6.0.0
-        version: 6.1.1
-      detect-browser:
-        specifier: ^5.2.0
-        version: 5.3.0
-      dotenv:
-        specifier: ^10.0.0
-        version: 10.0.0
-      eslint-plugin-promise:
-        specifier: ^6.1.1
-        version: 6.6.0(eslint@8.57.1)
-      fs-extra:
-        specifier: ^10.0.1
-        version: 10.1.0
-      immer:
-        specifier: ^9.0.12
-        version: 9.0.21
-      ipaddr.js:
-        specifier: ^2.0.1
-        version: 2.2.0
-      is-ci:
-        specifier: ^3.0.1
-        version: 3.0.1
-      is-docker:
-        specifier: ^3.0.0
-        version: 3.0.0
-      is-localhost-ip:
-        specifier: ^1.4.0
-        version: 1.4.0
-      isbot:
-        specifier: ^5.1.16
-        version: 5.1.17
-      kafkajs:
-        specifier: ^2.1.0
-        version: 2.2.4
-      maxmind:
-        specifier: ^4.3.6
-        version: 4.3.22
-      md5:
-        specifier: ^2.3.0
-        version: 2.3.0
-      moment-timezone:
-        specifier: ^0.5.35
-        version: 0.5.46
-      next:
-        specifier: 14.2.10
-        version: 14.2.10(@babel/core@7.26.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      next-basics:
-        specifier: ^0.39.0
-        version: 0.39.0(next@14.2.10(@babel/core@7.26.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      node-fetch:
-        specifier: ^3.2.8
-        version: 3.3.2
-      npm-run-all:
-        specifier: ^4.1.5
-        version: 4.1.5
-      prisma:
-        specifier: '5.17'
-        version: 5.17.0
-      react:
-        specifier: ^18.2.0
-        version: 18.3.1
-      react-basics:
-        specifier: ^0.125.0
-        version: 0.125.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      react-beautiful-dnd:
-        specifier: ^13.1.0
-        version: 13.1.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      react-dom:
-        specifier: ^18.2.0
-        version: 18.3.1(react@18.3.1)
-      react-error-boundary:
-        specifier: ^4.0.4
-        version: 4.1.2(react@18.3.1)
-      react-intl:
-        specifier: ^6.5.5
-        version: 6.8.4(react@18.3.1)(typescript@5.6.3)
-      react-simple-maps:
-        specifier: ^2.3.0
-        version: 2.3.0(prop-types@15.8.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      react-use-measure:
-        specifier: ^2.0.4
-        version: 2.1.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      react-window:
-        specifier: ^1.8.6
-        version: 1.8.10(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      request-ip:
-        specifier: ^3.3.0
-        version: 3.3.0
-      semver:
-        specifier: ^7.5.4
-        version: 7.6.3
-      thenby:
-        specifier: ^1.3.4
-        version: 1.3.4
-      uuid:
-        specifier: ^9.0.0
-        version: 9.0.1
-      yup:
-        specifier: ^0.32.11
-        version: 0.32.11
-      zustand:
-        specifier: ^4.5.5
-        version: 4.5.5(@types/react@18.3.12)(immer@9.0.21)(react@18.3.1)
-    devDependencies:
-      '@formatjs/cli':
-        specifier: ^4.2.29
-        version: 4.8.4(ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3))
-      '@netlify/plugin-nextjs':
-        specifier: ^5.1.0
-        version: 5.8.1
-      '@rollup/plugin-alias':
-        specifier: ^5.0.0
-        version: 5.1.1(rollup@3.29.5)
-      '@rollup/plugin-commonjs':
-        specifier: ^25.0.4
-        version: 25.0.8(rollup@3.29.5)
-      '@rollup/plugin-json':
-        specifier: ^6.0.0
-        version: 6.1.0(rollup@3.29.5)
-      '@rollup/plugin-node-resolve':
-        specifier: ^15.2.0
-        version: 15.3.0(rollup@3.29.5)
-      '@rollup/plugin-replace':
-        specifier: ^5.0.2
-        version: 5.0.7(rollup@3.29.5)
-      '@svgr/rollup':
-        specifier: ^8.1.0
-        version: 8.1.0(rollup@3.29.5)(typescript@5.6.3)
-      '@svgr/webpack':
-        specifier: ^8.1.0
-        version: 8.1.0(typescript@5.6.3)
-      '@types/cypress':
-        specifier: ^1.1.3
-        version: 1.1.6
-      '@types/jest':
-        specifier: ^29.5.12
-        version: 29.5.14
-      '@types/node':
-        specifier: ^20.9.0
-        version: 20.17.1
-      '@types/react':
-        specifier: ^18.2.41
-        version: 18.3.12
-      '@types/react-dom':
-        specifier: ^18.2.17
-        version: 18.3.1
-      '@types/react-window':
-        specifier: ^1.8.8
-        version: 1.8.8
-      '@typescript-eslint/eslint-plugin':
-        specifier: ^6.7.3
-        version: 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1)(typescript@5.6.3)
-      '@typescript-eslint/parser':
-        specifier: ^6.7.3
-        version: 6.21.0(eslint@8.57.1)(typescript@5.6.3)
-      cross-env:
-        specifier: ^7.0.3
-        version: 7.0.3
-      cypress:
-        specifier: ^13.6.6
-        version: 13.15.1
-      esbuild:
-        specifier: ^0.17.17
-        version: 0.17.19
-      eslint:
-        specifier: ^8.33.0
-        version: 8.57.1
-      eslint-config-next:
-        specifier: ^14.0.4
-        version: 14.2.16(eslint@8.57.1)(typescript@5.6.3)
-      eslint-config-prettier:
-        specifier: ^8.5.0
-        version: 8.10.0(eslint@8.57.1)
-      eslint-import-resolver-alias:
-        specifier: ^1.1.2
-        version: 1.1.2(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))
-      eslint-plugin-css-modules:
-        specifier: ^2.12.0
-        version: 2.12.0(eslint@8.57.1)
-      eslint-plugin-cypress:
-        specifier: ^2.15.1
-        version: 2.15.2(eslint@8.57.1)
-      eslint-plugin-import:
-        specifier: ^2.29.1
-        version: 2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
-      eslint-plugin-jest:
-        specifier: ^27.9.0
-        version: 27.9.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3)
-      eslint-plugin-prettier:
-        specifier: ^4.0.0
-        version: 4.2.1(eslint-config-prettier@8.10.0(eslint@8.57.1))(eslint@8.57.1)(prettier@2.8.8)
-      extract-react-intl-messages:
-        specifier: ^4.1.1
-        version: 4.1.1(ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3))
-      husky:
-        specifier: ^8.0.3
-        version: 8.0.3
-      jest:
-        specifier: ^29.7.0
-        version: 29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3))
-      lint-staged:
-        specifier: ^14.0.1
-        version: 14.0.1(enquirer@2.4.1)
-      postcss:
-        specifier: ^8.4.31
-        version: 8.4.47
-      postcss-flexbugs-fixes:
-        specifier: ^5.0.2
-        version: 5.0.2(postcss@8.4.47)
-      postcss-import:
-        specifier: ^15.1.0
-        version: 15.1.0(postcss@8.4.47)
-      postcss-preset-env:
-        specifier: 7.8.3
-        version: 7.8.3(postcss@8.4.47)
-      postcss-rtlcss:
-        specifier: ^4.0.1
-        version: 4.0.9(postcss@8.4.47)
-      prettier:
-        specifier: ^2.6.2
-        version: 2.8.8
-      prompts:
-        specifier: 2.4.2
-        version: 2.4.2
-      rollup:
-        specifier: ^3.28.0
-        version: 3.29.5
-      rollup-plugin-copy:
-        specifier: ^3.4.0
-        version: 3.5.0
-      rollup-plugin-delete:
-        specifier: ^2.0.0
-        version: 2.1.0(rollup@3.29.5)
-      rollup-plugin-dts:
-        specifier: ^5.3.1
-        version: 5.3.1(rollup@3.29.5)(typescript@5.6.3)
-      rollup-plugin-esbuild:
-        specifier: ^5.0.0
-        version: 5.0.0(esbuild@0.17.19)(rollup@3.29.5)
-      rollup-plugin-node-externals:
-        specifier: ^6.1.1
-        version: 6.1.2(rollup@3.29.5)
-      rollup-plugin-postcss:
-        specifier: ^4.0.2
-        version: 4.0.2(postcss@8.4.47)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3))
-      rollup-plugin-terser:
-        specifier: ^7.0.2
-        version: 7.0.2(rollup@3.29.5)
-      stylelint:
-        specifier: ^15.10.1
-        version: 15.11.0(typescript@5.6.3)
-      stylelint-config-css-modules:
-        specifier: ^4.4.0
-        version: 4.4.0(stylelint@15.11.0(typescript@5.6.3))
-      stylelint-config-prettier:
-        specifier: ^9.0.3
-        version: 9.0.5(stylelint@15.11.0(typescript@5.6.3))
-      stylelint-config-recommended:
-        specifier: ^14.0.0
-        version: 14.0.1(stylelint@15.11.0(typescript@5.6.3))
-      tar:
-        specifier: ^6.1.2
-        version: 6.2.1
-      ts-jest:
-        specifier: ^29.1.2
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3)
-      ts-node:
-        specifier: ^10.9.1
-        version: 10.9.2(@types/node@20.17.1)(typescript@5.6.3)
-      typescript:
-        specifier: ^5.5.3
-        version: 5.6.3
-
-packages:
-
-  '@ampproject/remapping@2.3.0':
-    resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==}
-    engines: {node: '>=6.0.0'}
-
-  '@babel/code-frame@7.26.0':
-    resolution: {integrity: sha512-INCKxTtbXtcNbUZ3YXutwMpEleqttcswhAdee7dhuoVrD2cnuc3PqtERBtxkX5nziX9vnBL8WXmSGwv8CuPV6g==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/compat-data@7.26.0':
-    resolution: {integrity: sha512-qETICbZSLe7uXv9VE8T/RWOdIE5qqyTucOt4zLYMafj2MRO271VGgLd4RACJMeBO37UPWhXiKMBk7YlJ0fOzQA==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/core@7.26.0':
-    resolution: {integrity: sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/generator@7.26.0':
-    resolution: {integrity: sha512-/AIkAmInnWwgEAJGQr9vY0c66Mj6kjkE2ZPB1PurTRaRAh3U+J45sAQMjQDJdh4WbR3l0x5xkimXBKyBXXAu2w==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/helper-annotate-as-pure@7.25.9':
-    resolution: {integrity: sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/helper-builder-binary-assignment-operator-visitor@7.25.9':
-    resolution: {integrity: sha512-C47lC7LIDCnz0h4vai/tpNOI95tCd5ZT3iBt/DBH5lXKHZsyNQv18yf1wIIg2ntiQNgmAvA+DgZ82iW8Qdym8g==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/helper-compilation-targets@7.25.9':
-    resolution: {integrity: sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/helper-create-class-features-plugin@7.25.9':
-    resolution: {integrity: sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-
-  '@babel/helper-create-regexp-features-plugin@7.25.9':
-    resolution: {integrity: sha512-ORPNZ3h6ZRkOyAa/SaHU+XsLZr0UQzRwuDQ0cczIA17nAzZ+85G5cVkOJIj7QavLZGSe8QXUmNFxSZzjcZF9bw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-
-  '@babel/helper-define-polyfill-provider@0.6.2':
-    resolution: {integrity: sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==}
-    peerDependencies:
-      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
-
-  '@babel/helper-member-expression-to-functions@7.25.9':
-    resolution: {integrity: sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/helper-module-imports@7.25.9':
-    resolution: {integrity: sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/helper-module-transforms@7.26.0':
-    resolution: {integrity: sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-
-  '@babel/helper-optimise-call-expression@7.25.9':
-    resolution: {integrity: sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/helper-plugin-utils@7.25.9':
-    resolution: {integrity: sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/helper-remap-async-to-generator@7.25.9':
-    resolution: {integrity: sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-
-  '@babel/helper-replace-supers@7.25.9':
-    resolution: {integrity: sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-
-  '@babel/helper-simple-access@7.25.9':
-    resolution: {integrity: sha512-c6WHXuiaRsJTyHYLJV75t9IqsmTbItYfdj99PnzYGQZkYKvan5/2jKJ7gu31J3/BJ/A18grImSPModuyG/Eo0Q==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/helper-skip-transparent-expression-wrappers@7.25.9':
-    resolution: {integrity: sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/helper-string-parser@7.25.9':
-    resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/helper-validator-identifier@7.25.9':
-    resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/helper-validator-option@7.25.9':
-    resolution: {integrity: sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/helper-wrap-function@7.25.9':
-    resolution: {integrity: sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/helpers@7.26.0':
-    resolution: {integrity: sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/parser@7.26.0':
-    resolution: {integrity: sha512-aP8x5pIw3xvYr/sXT+SEUwyhrXT8rUJRZltK/qN3Db80dcKpTett8cJxHyjk+xYSVXvNnl2SfcJVjbwxpOSscA==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
-
-  '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.9':
-    resolution: {integrity: sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-
-  '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.25.9':
-    resolution: {integrity: sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-
-  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.25.9':
-    resolution: {integrity: sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-
-  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.25.9':
-    resolution: {integrity: sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.13.0
-
-  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.25.9':
-    resolution: {integrity: sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-
-  '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2':
-    resolution: {integrity: sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-async-generators@7.8.4':
-    resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-bigint@7.8.3':
-    resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-class-properties@7.12.13':
-    resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-class-static-block@7.14.5':
-    resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-import-assertions@7.26.0':
-    resolution: {integrity: sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-import-attributes@7.26.0':
-    resolution: {integrity: sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-import-meta@7.10.4':
-    resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-json-strings@7.8.3':
-    resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-jsx@7.25.9':
-    resolution: {integrity: sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-logical-assignment-operators@7.10.4':
-    resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3':
-    resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-numeric-separator@7.10.4':
-    resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-object-rest-spread@7.8.3':
-    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-optional-catch-binding@7.8.3':
-    resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-optional-chaining@7.8.3':
-    resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-private-property-in-object@7.14.5':
-    resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-top-level-await@7.14.5':
-    resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-typescript@7.25.9':
-    resolution: {integrity: sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-unicode-sets-regex@7.18.6':
-    resolution: {integrity: sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-
-  '@babel/plugin-transform-arrow-functions@7.25.9':
-    resolution: {integrity: sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-async-generator-functions@7.25.9':
-    resolution: {integrity: sha512-RXV6QAzTBbhDMO9fWwOmwwTuYaiPbggWQ9INdZqAYeSHyG7FzQ+nOZaUUjNwKv9pV3aE4WFqFm1Hnbci5tBCAw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-async-to-generator@7.25.9':
-    resolution: {integrity: sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-block-scoped-functions@7.25.9':
-    resolution: {integrity: sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-block-scoping@7.25.9':
-    resolution: {integrity: sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-class-properties@7.25.9':
-    resolution: {integrity: sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-class-static-block@7.26.0':
-    resolution: {integrity: sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.12.0
-
-  '@babel/plugin-transform-classes@7.25.9':
-    resolution: {integrity: sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-computed-properties@7.25.9':
-    resolution: {integrity: sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-destructuring@7.25.9':
-    resolution: {integrity: sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-dotall-regex@7.25.9':
-    resolution: {integrity: sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-duplicate-keys@7.25.9':
-    resolution: {integrity: sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.25.9':
-    resolution: {integrity: sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-
-  '@babel/plugin-transform-dynamic-import@7.25.9':
-    resolution: {integrity: sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-exponentiation-operator@7.25.9':
-    resolution: {integrity: sha512-KRhdhlVk2nObA5AYa7QMgTMTVJdfHprfpAk4DjZVtllqRg9qarilstTKEhpVjyt+Npi8ThRyiV8176Am3CodPA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-export-namespace-from@7.25.9':
-    resolution: {integrity: sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-for-of@7.25.9':
-    resolution: {integrity: sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-function-name@7.25.9':
-    resolution: {integrity: sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-json-strings@7.25.9':
-    resolution: {integrity: sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-literals@7.25.9':
-    resolution: {integrity: sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-logical-assignment-operators@7.25.9':
-    resolution: {integrity: sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-member-expression-literals@7.25.9':
-    resolution: {integrity: sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-modules-amd@7.25.9':
-    resolution: {integrity: sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-modules-commonjs@7.25.9':
-    resolution: {integrity: sha512-dwh2Ol1jWwL2MgkCzUSOvfmKElqQcuswAZypBSUsScMXvgdT8Ekq5YA6TtqpTVWH+4903NmboMuH1o9i8Rxlyg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-modules-systemjs@7.25.9':
-    resolution: {integrity: sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-modules-umd@7.25.9':
-    resolution: {integrity: sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-named-capturing-groups-regex@7.25.9':
-    resolution: {integrity: sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-
-  '@babel/plugin-transform-new-target@7.25.9':
-    resolution: {integrity: sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-nullish-coalescing-operator@7.25.9':
-    resolution: {integrity: sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-numeric-separator@7.25.9':
-    resolution: {integrity: sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-object-rest-spread@7.25.9':
-    resolution: {integrity: sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-object-super@7.25.9':
-    resolution: {integrity: sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-optional-catch-binding@7.25.9':
-    resolution: {integrity: sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-optional-chaining@7.25.9':
-    resolution: {integrity: sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-parameters@7.25.9':
-    resolution: {integrity: sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-private-methods@7.25.9':
-    resolution: {integrity: sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-private-property-in-object@7.25.9':
-    resolution: {integrity: sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-property-literals@7.25.9':
-    resolution: {integrity: sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-react-constant-elements@7.25.9':
-    resolution: {integrity: sha512-Ncw2JFsJVuvfRsa2lSHiC55kETQVLSnsYGQ1JDDwkUeWGTL/8Tom8aLTnlqgoeuopWrbbGndrc9AlLYrIosrow==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-react-display-name@7.25.9':
-    resolution: {integrity: sha512-KJfMlYIUxQB1CJfO3e0+h0ZHWOTLCPP115Awhaz8U0Zpq36Gl/cXlpoyMRnUWlhNUBAzldnCiAZNvCDj7CrKxQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-react-jsx-development@7.25.9':
-    resolution: {integrity: sha512-9mj6rm7XVYs4mdLIpbZnHOYdpW42uoiBCTVowg7sP1thUOiANgMb4UtpRivR0pp5iL+ocvUv7X4mZgFRpJEzGw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-react-jsx@7.25.9':
-    resolution: {integrity: sha512-s5XwpQYCqGerXl+Pu6VDL3x0j2d82eiV77UJ8a2mDHAW7j9SWRqQ2y1fNo1Z74CdcYipl5Z41zvjj4Nfzq36rw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-react-pure-annotations@7.25.9':
-    resolution: {integrity: sha512-KQ/Takk3T8Qzj5TppkS1be588lkbTp5uj7w6a0LeQaTMSckU/wK0oJ/pih+T690tkgI5jfmg2TqDJvd41Sj1Cg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-regenerator@7.25.9':
-    resolution: {integrity: sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-regexp-modifiers@7.26.0':
-    resolution: {integrity: sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-
-  '@babel/plugin-transform-reserved-words@7.25.9':
-    resolution: {integrity: sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-shorthand-properties@7.25.9':
-    resolution: {integrity: sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-spread@7.25.9':
-    resolution: {integrity: sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-sticky-regex@7.25.9':
-    resolution: {integrity: sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-template-literals@7.25.9':
-    resolution: {integrity: sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-typeof-symbol@7.25.9':
-    resolution: {integrity: sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-typescript@7.25.9':
-    resolution: {integrity: sha512-7PbZQZP50tzv2KGGnhh82GSyMB01yKY9scIjf1a+GfZCtInOWqUH5+1EBU4t9fyR5Oykkkc9vFTs4OHrhHXljQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-unicode-escapes@7.25.9':
-    resolution: {integrity: sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-unicode-property-regex@7.25.9':
-    resolution: {integrity: sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-unicode-regex@7.25.9':
-    resolution: {integrity: sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-unicode-sets-regex@7.25.9':
-    resolution: {integrity: sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-
-  '@babel/preset-env@7.26.0':
-    resolution: {integrity: sha512-H84Fxq0CQJNdPFT2DrfnylZ3cf5K43rGfWK4LJGPpjKHiZlk0/RzwEus3PDDZZg+/Er7lCA03MVacueUuXdzfw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/preset-modules@0.1.6-no-external-plugins':
-    resolution: {integrity: sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0 || ^8.0.0-0 <8.0.0
-
-  '@babel/preset-react@7.25.9':
-    resolution: {integrity: sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/preset-typescript@7.26.0':
-    resolution: {integrity: sha512-NMk1IGZ5I/oHhoXEElcm+xUnL/szL6xflkFZmoEU9xj1qSJXpiS7rsspYo92B4DRCDvZn2erT5LdsCeXAKNCkg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/runtime@7.26.0':
-    resolution: {integrity: sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/template@7.25.9':
-    resolution: {integrity: sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/traverse@7.25.9':
-    resolution: {integrity: sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/types@7.26.0':
-    resolution: {integrity: sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==}
-    engines: {node: '>=6.9.0'}
-
-  '@bcoe/v8-coverage@0.2.3':
-    resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
-
-  '@clickhouse/client-common@1.7.0':
-    resolution: {integrity: sha512-RkHYf23/wyv/6C0KcVD4nRX4JAn/Y+9AZBQPlrSId2JwXsmAnjDkkKpuPLwZPNVH6J3BkW+y8bQCEk3VHQzArw==}
-
-  '@clickhouse/client@1.7.0':
-    resolution: {integrity: sha512-2aESIFRbSPWEZIU++sXt1RYWgEKZH75C3jyXLcRBeafMDjq7bKV2AX1X9n9xscN+Y4VvnkBzkjFxcbuqFSBk6w==}
-    engines: {node: '>=16'}
-
-  '@colors/colors@1.5.0':
-    resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==}
-    engines: {node: '>=0.1.90'}
-
-  '@cspotcode/source-map-support@0.8.1':
-    resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
-    engines: {node: '>=12'}
-
-  '@csstools/css-parser-algorithms@2.7.1':
-    resolution: {integrity: sha512-2SJS42gxmACHgikc1WGesXLIT8d/q2l0UFM7TaEeIzdFCE/FPMtTiizcPGGJtlPo2xuQzY09OhrLTzRxqJqwGw==}
-    engines: {node: ^14 || ^16 || >=18}
-    peerDependencies:
-      '@csstools/css-tokenizer': ^2.4.1
-
-  '@csstools/css-tokenizer@2.4.1':
-    resolution: {integrity: sha512-eQ9DIktFJBhGjioABJRtUucoWR2mwllurfnM8LuNGAqX3ViZXaUchqk+1s7jjtkFiT9ySdACsFEA3etErkALUg==}
-    engines: {node: ^14 || ^16 || >=18}
-
-  '@csstools/media-query-list-parser@2.1.13':
-    resolution: {integrity: sha512-XaHr+16KRU9Gf8XLi3q8kDlI18d5vzKSKCY510Vrtc9iNR0NJzbY9hhTmwhzYZj/ZwGL4VmB3TA9hJW0Um2qFA==}
-    engines: {node: ^14 || ^16 || >=18}
-    peerDependencies:
-      '@csstools/css-parser-algorithms': ^2.7.1
-      '@csstools/css-tokenizer': ^2.4.1
-
-  '@csstools/postcss-cascade-layers@1.1.1':
-    resolution: {integrity: sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  '@csstools/postcss-color-function@1.1.1':
-    resolution: {integrity: sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  '@csstools/postcss-font-format-keywords@1.0.1':
-    resolution: {integrity: sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  '@csstools/postcss-hwb-function@1.0.2':
-    resolution: {integrity: sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  '@csstools/postcss-ic-unit@1.0.1':
-    resolution: {integrity: sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  '@csstools/postcss-is-pseudo-class@2.0.7':
-    resolution: {integrity: sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  '@csstools/postcss-nested-calc@1.0.0':
-    resolution: {integrity: sha512-JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  '@csstools/postcss-normalize-display-values@1.0.1':
-    resolution: {integrity: sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  '@csstools/postcss-oklab-function@1.1.1':
-    resolution: {integrity: sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  '@csstools/postcss-progressive-custom-properties@1.3.0':
-    resolution: {integrity: sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.3
-
-  '@csstools/postcss-stepped-value-functions@1.0.1':
-    resolution: {integrity: sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  '@csstools/postcss-text-decoration-shorthand@1.0.0':
-    resolution: {integrity: sha512-c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  '@csstools/postcss-trigonometric-functions@1.0.2':
-    resolution: {integrity: sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==}
-    engines: {node: ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  '@csstools/postcss-unset-value@1.0.2':
-    resolution: {integrity: sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  '@csstools/selector-specificity@2.2.0':
-    resolution: {integrity: sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==}
-    engines: {node: ^14 || ^16 || >=18}
-    peerDependencies:
-      postcss-selector-parser: ^6.0.10
-
-  '@csstools/selector-specificity@3.1.1':
-    resolution: {integrity: sha512-a7cxGcJ2wIlMFLlh8z2ONm+715QkPHiyJcxwQlKOz/03GPw1COpfhcmC9wm4xlZfp//jWHNNMwzjtqHXVWU9KA==}
-    engines: {node: ^14 || ^16 || >=18}
-    peerDependencies:
-      postcss-selector-parser: ^6.0.13
-
-  '@cypress/request@3.0.5':
-    resolution: {integrity: sha512-v+XHd9XmWbufxF1/bTaVm2yhbxY+TB4YtWRqF2zaXBlDNMkls34KiATz0AVDLavL3iB6bQk9/7n3oY1EoLSWGA==}
-    engines: {node: '>= 6'}
-
-  '@cypress/xvfb@1.2.4':
-    resolution: {integrity: sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==}
-
-  '@date-fns/utc@1.2.0':
-    resolution: {integrity: sha512-YLq+crMPJiBmIdkRmv9nZuZy1mVtMlDcUKlg4mvI0UsC/dZeIaGoGB5p/C4FrpeOhZ7zBTK03T58S0DFkRNMnw==}
-
-  '@dicebear/adventurer-neutral@9.2.2':
-    resolution: {integrity: sha512-XVAjhUWjav6luTZ7txz8zVJU/H0DiUy4uU1Z7IO5MDO6kWvum+If1+0OUgEWYZwM+RDI7rt2CgVP910DyZGd1w==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/adventurer@9.2.2':
-    resolution: {integrity: sha512-WjBXCP9EXbUul2zC3BS2/R3/4diw1uh/lU4jTEnujK1mhqwIwanFboIMzQsasNNL/xf+m3OHN7MUNJfHZ1fLZA==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/avataaars-neutral@9.2.2':
-    resolution: {integrity: sha512-pRj16P27dFDBI3LtdiHUDwIXIGndHAbZf5AxaMkn6/+0X93mVQ/btVJDXyW0G96WCsyC88wKAWr6/KJotPxU6Q==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/avataaars@9.2.2':
-    resolution: {integrity: sha512-WqJPQEt0OhBybTpI0TqU1uD1pSk9M2+VPIwvBye/dXo46b+0jHGpftmxjQwk6tX8z0+mRko8pwV5n+cWht1/+w==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/big-ears-neutral@9.2.2':
-    resolution: {integrity: sha512-IPHt8fi3dv9cyfBJBZ4s8T+PhFCrQvOCf91iRHBT3iOLNPdyZpI5GNLmGiV0XMAvIDP5NvA5+f6wdoBLhYhbDA==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/big-ears@9.2.2':
-    resolution: {integrity: sha512-hz4UXdPq4qqZpu0YVvlqM4RDFhk5i0WgPcuwj/MOLlgTjuj63uHUhCQSk6ZiW1DQOs12qpwUBMGWVHxBRBas9g==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/big-smile@9.2.2':
-    resolution: {integrity: sha512-D4td0GL8or1nTNnXvZqkEXlzyqzGPWs3znOnm1HIohtFTeIwXm72Ob2lNDsaQJSJvXmVlwaQQ0CCTvyCl8Stjw==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/bottts-neutral@9.2.2':
-    resolution: {integrity: sha512-lSgpqmSJtlnyxVuUgNdBwyzuA0O9xa5zRJtz7x2KyWbicXir5iYdX0MVMCkp1EDvlcxm9rGJsclktugOyakTlw==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/bottts@9.2.2':
-    resolution: {integrity: sha512-wugFkzw8JNWV1nftq/Wp/vmQsLAXDxrMtRK3AoMODuUpSVoP3EHRUfKS043xggOsQFvoj0HZ7kadmhn0AMLf5A==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/collection@9.2.2':
-    resolution: {integrity: sha512-vZAmXhPWCK3sf8Fj9/QflFC6XOLroJOT5K1HdnzHaPboEvffUQideGCrrEamnJtlH0iF0ZDXh8gqmwy2fu+yHA==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/core@9.2.2':
-    resolution: {integrity: sha512-ROhgHG249dPtcXgBHcqPEsDeAPRPRD/9d+tZCjLYyueO+cXDlIA8dUlxpwIVcOuZFvCyW6RJtqo8BhNAi16pIQ==}
-    engines: {node: '>=18.0.0'}
-
-  '@dicebear/croodles-neutral@9.2.2':
-    resolution: {integrity: sha512-/4mNirxoQ+z1kHXnpDRbJ1JV1ZgXogeTeNp0MaFYxocCgHfJ7ckNM23EE1I7akoo9pqPxrKlaeNzGAjKHdS9vA==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/croodles@9.2.2':
-    resolution: {integrity: sha512-OzvAXQWsOgMwL3Sl+lBxCubqSOWoBJpC78c4TKnNTS21rR63TtXUyVdLLzgKVN4YHRnvMgtPf8F/W9YAgIDK4w==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/dylan@9.2.2':
-    resolution: {integrity: sha512-s7e3XliC1YXP+Wykj+j5kwdOWFRXFzYHYk/PB4oZ1F3sJandXiG0HS4chaNu4EoP0yZgKyFMUVTGZx+o6tMaYg==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/fun-emoji@9.2.2':
-    resolution: {integrity: sha512-M+rYTpB3lfwz18f+/i+ggNwNWUoEj58SJqXJ1wr7Jh/4E5uL+NmJg9JGwYNaVtGbCFrKAjSaILNUWGQSFgMfog==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/glass@9.2.2':
-    resolution: {integrity: sha512-imCMxcg+XScHYtQq2MUv1lCzhQSCUglMlPSezKEpXhTxgbgUpmGlSGVkOfmX5EEc7SQowKkF1W/1gNk6CXvBaQ==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/icons@9.2.2':
-    resolution: {integrity: sha512-Tqq2OVCdS7J02DNw58xwlgLGl40sWEckbqXT3qRvIF63FfVq+wQZBGuhuiyAURcSgvsc3h2oQeYFi9iXh7HTOA==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/identicon@9.2.2':
-    resolution: {integrity: sha512-POVKFulIrcuZf3rdAgxYaSm2XUg/TJg3tg9zq9150reEGPpzWR7ijyJ03dzAADPzS3DExfdYVT9+z3JKwwJnTQ==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/initials@9.2.2':
-    resolution: {integrity: sha512-/xNnsEmsstWjmF77htAOuwOMhFlP6eBVXgcgFlTl/CCH/Oc6H7t0vwX1he8KLQBBzjGpvJcvIAn4Wh9rE4D5/A==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/lorelei-neutral@9.2.2':
-    resolution: {integrity: sha512-Eys9Os6nt2Xll7Mvu66CfRR2YggTopWcmFcRZ9pPdohS96kT0MsLI2iTcfZXQ51K8hvT3IbwoGc86W8n0cDxAQ==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/lorelei@9.2.2':
-    resolution: {integrity: sha512-koXqVr/vcWUPo00VP5H6Czsit+uF1tmwd2NK7Q/e34/9Sd1f4QLLxHjjBNm/iNjCI1+UNTOvZ2Qqu0N5eo7Flw==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/micah@9.2.2':
-    resolution: {integrity: sha512-NCajcJV5yw8uMKiACp694w1T/UyYme2CUEzyTzWHgWnQ+drAuCcH8gpAoLWd67viNdQB/MTpNlaelUgTjmI4AQ==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/miniavs@9.2.2':
-    resolution: {integrity: sha512-vvkWXttdw+KHF3j+9qcUFzK+P0nbNnImGjvN48wwkPIh2h08WWFq0MnoOls4IHwUJC4GXBjWtiyVoCxz6hhtOA==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/notionists-neutral@9.2.2':
-    resolution: {integrity: sha512-AhOzk+lz6kB4uxGun8AJhV+W1nttnMlxmxd+5KbQ/txCIziYIaeD3il44wsAGegEpGFvAZyMYtR/jjfHcem3TA==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/notionists@9.2.2':
-    resolution: {integrity: sha512-Z9orRaHoj7Y9Ap4wEu8XOrFACsG1KbbBQUPV1R50uh6AHwsyNrm4cS84ICoGLvxgLNHHOae3YCjd8aMu2z19zg==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/open-peeps@9.2.2':
-    resolution: {integrity: sha512-6PeQDHYyjvKrGSl/gP+RE5dSYAQGKpcGnM65HorgyTIugZK7STo0W4hvEycedupZ3MCCEH8x/XyiChKM2sHXog==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/personas@9.2.2':
-    resolution: {integrity: sha512-705+ObNLC0w1fcgE/Utav+8bqO+Esu53TXegpX5j7trGEoIMf2bThqJGHuhknZ3+T2az3Wr89cGyOGlI0KLzLA==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/pixel-art-neutral@9.2.2':
-    resolution: {integrity: sha512-CdUY77H6Aj7dKLW3hdkv7tu0XQJArUjaWoXihQxlhl3oVYplWaoyu9omYy5pl8HTqs8YgVTGljjMXYoFuK0JUw==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/pixel-art@9.2.2':
-    resolution: {integrity: sha512-BvbFdrpzQl04+Y9UsWP63YGug+ENGC7GMG88qbEFWxb/IqRavGa4H3D0T4Zl2PSLiw7f2Ctv98bsCQZ1PtCznQ==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/rings@9.2.2':
-    resolution: {integrity: sha512-eD1J1k364Arny+UlvGrk12HP/XGG6WxPSm4BarFqdJGSV45XOZlwqoi7FlcMr9r9yvE/nGL8OizbwMYusEEdjw==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/shapes@9.2.2':
-    resolution: {integrity: sha512-e741NNWBa7fg0BjomxXa0fFPME2XCIR0FA+VHdq9AD2taTGHEPsg5x1QJhCRdK6ww85yeu3V3ucpZXdSrHVw5Q==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@dicebear/thumbs@9.2.2':
-    resolution: {integrity: sha512-FkPLDNu7n5kThLSk7lR/0cz/NkUqgGdZGfLZv6fLkGNGtv6W+e2vZaO7HCXVwIgJ+II+kImN41zVIZ6Jlll7pQ==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@dicebear/core': ^9.0.0
-
-  '@esbuild/android-arm64@0.17.19':
-    resolution: {integrity: sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
-
-  '@esbuild/android-arm@0.17.19':
-    resolution: {integrity: sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [android]
-
-  '@esbuild/android-x64@0.17.19':
-    resolution: {integrity: sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
-
-  '@esbuild/darwin-arm64@0.17.19':
-    resolution: {integrity: sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-
-  '@esbuild/darwin-x64@0.17.19':
-    resolution: {integrity: sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-
-  '@esbuild/freebsd-arm64@0.17.19':
-    resolution: {integrity: sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
-
-  '@esbuild/freebsd-x64@0.17.19':
-    resolution: {integrity: sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
-
-  '@esbuild/linux-arm64@0.17.19':
-    resolution: {integrity: sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-
-  '@esbuild/linux-arm@0.17.19':
-    resolution: {integrity: sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-
-  '@esbuild/linux-ia32@0.17.19':
-    resolution: {integrity: sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
-
-  '@esbuild/linux-loong64@0.17.19':
-    resolution: {integrity: sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==}
-    engines: {node: '>=12'}
-    cpu: [loong64]
-    os: [linux]
-
-  '@esbuild/linux-mips64el@0.17.19':
-    resolution: {integrity: sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
-
-  '@esbuild/linux-ppc64@0.17.19':
-    resolution: {integrity: sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
-
-  '@esbuild/linux-riscv64@0.17.19':
-    resolution: {integrity: sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
-
-  '@esbuild/linux-s390x@0.17.19':
-    resolution: {integrity: sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
-
-  '@esbuild/linux-x64@0.17.19':
-    resolution: {integrity: sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-
-  '@esbuild/netbsd-x64@0.17.19':
-    resolution: {integrity: sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
-
-  '@esbuild/openbsd-x64@0.17.19':
-    resolution: {integrity: sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
-
-  '@esbuild/sunos-x64@0.17.19':
-    resolution: {integrity: sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
-
-  '@esbuild/win32-arm64@0.17.19':
-    resolution: {integrity: sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-
-  '@esbuild/win32-ia32@0.17.19':
-    resolution: {integrity: sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
-
-  '@esbuild/win32-x64@0.17.19':
-    resolution: {integrity: sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-
-  '@eslint-community/eslint-utils@4.4.0':
-    resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
-
-  '@eslint-community/regexpp@4.11.1':
-    resolution: {integrity: sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==}
-    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
-
-  '@eslint/eslintrc@2.1.4':
-    resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-
-  '@eslint/js@8.57.1':
-    resolution: {integrity: sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-
-  '@fontsource/inter@4.5.15':
-    resolution: {integrity: sha512-FzleM9AxZQK2nqsTDtBiY0PMEVWvnKnuu2i09+p6DHvrHsuucoV2j0tmw+kAT3L4hvsLdAIDv6MdGehsPIdT+Q==}
-
-  '@formatjs/cli@4.8.4':
-    resolution: {integrity: sha512-zZI8QYVl5CHaT6j9OHjS+0mMnWzopBVH0un4n5b4IhIJRzIKnxwFTkxBp5Ifqj6FntrwzIGqP+D6v8u7MPYsmw==}
-    hasBin: true
-
-  '@formatjs/ecma402-abstract@1.11.4':
-    resolution: {integrity: sha512-EBikYFp2JCdIfGEb5G9dyCkTGDmC57KSHhRQOC3aYxoPWVZvfWCDjZwkGYHN7Lis/fmuWl906bnNTJifDQ3sXw==}
-
-  '@formatjs/ecma402-abstract@1.4.0':
-    resolution: {integrity: sha512-Mv027hcLFjE45K8UJ8PjRpdDGfR0aManEFj1KzoN8zXNveHGEygpZGfFf/FTTMl+QEVSrPAUlyxaCApvmv47AQ==}
-
-  '@formatjs/ecma402-abstract@1.5.0':
-    resolution: {integrity: sha512-wXv36yo+mfWllweN0Fq7sUs7PUiNopn7I0JpLTe3hGu6ZMR4CV7LqK1llhB18pndwpKoafQKb1et2DCJAOW20Q==}
-
-  '@formatjs/ecma402-abstract@2.2.1':
-    resolution: {integrity: sha512-O4ywpkdJybrjFc9zyL8qK5aklleIAi5O4nYhBVJaOFtCkNrnU+lKFeJOFC48zpsZQmR8Aok2V79hGpHnzbmFpg==}
-
-  '@formatjs/fast-memoize@2.2.2':
-    resolution: {integrity: sha512-mzxZcS0g1pOzwZTslJOBTmLzDXseMLLvnh25ymRilCm8QLMObsQ7x/rj9GNrH0iUhZMlFisVOD6J1n6WQqpKPQ==}
-
-  '@formatjs/icu-messageformat-parser@2.1.0':
-    resolution: {integrity: sha512-Qxv/lmCN6hKpBSss2uQ8IROVnta2r9jd3ymUEIjm2UyIkUCHVcbUVRGL/KS/wv7876edvsPe+hjHVJ4z8YuVaw==}
-
-  '@formatjs/icu-messageformat-parser@2.9.1':
-    resolution: {integrity: sha512-7AYk4tjnLi5wBkxst2w7qFj38JLMJoqzj7BhdEl7oTlsWMlqwgx4p9oMmmvpXWTSDGNwOKBRc1SfwMh5MOHeNg==}
-
-  '@formatjs/icu-skeleton-parser@1.3.6':
-    resolution: {integrity: sha512-I96mOxvml/YLrwU2Txnd4klA7V8fRhb6JG/4hm3VMNmeJo1F03IpV2L3wWt7EweqNLES59SZ4d6hVOPCSf80Bg==}
-
-  '@formatjs/icu-skeleton-parser@1.8.5':
-    resolution: {integrity: sha512-zRZ/e3B5qY2+JCLs7puTzWS1Jb+t/K+8Jur/gEZpA2EjWeLDE17nsx8thyo9P48Mno7UmafnPupV2NCJXX17Dg==}
-
-  '@formatjs/intl-displaynames@6.8.1':
-    resolution: {integrity: sha512-nyWfJk4BZ1+GzLq9a40BgVPSRpBkRAVzrSpql+92i0i+lX11m9eS1trSRf/h3j/XcQ+h1h+ntA4Ra4jETK7nNg==}
-
-  '@formatjs/intl-listformat@7.7.1':
-    resolution: {integrity: sha512-bjBxWaUhYAbJFUlFSMWZGn3r2mglXwk+BLyGRu8dY8Q83ZPsqmmVQzjQKENHE3lV6eoQGHT2oZHxUaVndJlk6Q==}
-
-  '@formatjs/intl-localematcher@0.2.25':
-    resolution: {integrity: sha512-YmLcX70BxoSopLFdLr1Ds99NdlTI2oWoLbaUW2M406lxOIPzE1KQhRz2fPUkq34xVZQaihCoU29h0KK7An3bhA==}
-
-  '@formatjs/intl-localematcher@0.5.6':
-    resolution: {integrity: sha512-roz1+Ba5e23AHX6KUAWmLEyTRZegM5YDuxuvkHCyK3RJddf/UXB2f+s7pOMm9ktfPGla0g+mQXOn5vsuYirnaA==}
-
-  '@formatjs/intl-numberformat@5.7.6':
-    resolution: {integrity: sha512-ZlZfYtvbVHYZY5OG3RXizoCwxKxEKOrzEe2YOw9wbzoxF3PmFn0SAgojCFGLyNXkkR6xVxlylhbuOPf1dkIVNg==}
-
-  '@formatjs/intl@2.10.11':
-    resolution: {integrity: sha512-FNLZjzE1QRlv1Wf0oinnM97AbvZU1zQnQMHI0Oza2F7PxzrPf6bYFRs0ugapq/O4FrvNwDt9F9nyRNwsMM118g==}
-    peerDependencies:
-      typescript: ^4.7 || 5
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-
-  '@formatjs/ts-transformer@2.13.0':
-    resolution: {integrity: sha512-mu7sHXZk1NWZrQ3eUqugpSYo8x5/tXkrI4uIbFqCEC0eNgQaIcoKgVeDFgDAcgG+cEme2atAUYSFF+DFWC4org==}
-    peerDependencies:
-      ts-jest: ^26.4.0
-    peerDependenciesMeta:
-      ts-jest:
-        optional: true
-
-  '@formatjs/ts-transformer@3.9.4':
-    resolution: {integrity: sha512-S5q/zsTodaKtxVxNvbRQ9APenJtm5smXE76usS+5yF2vWQdZHkagmOKWfgvfIbesP4SR2B+i3koqlnlpqSIp5w==}
-    peerDependencies:
-      ts-jest: '27'
-    peerDependenciesMeta:
-      ts-jest:
-        optional: true
-
-  '@humanwhocodes/config-array@0.13.0':
-    resolution: {integrity: sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==}
-    engines: {node: '>=10.10.0'}
-    deprecated: Use @eslint/config-array instead
-
-  '@humanwhocodes/module-importer@1.0.1':
-    resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
-    engines: {node: '>=12.22'}
-
-  '@humanwhocodes/object-schema@2.0.3':
-    resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==}
-    deprecated: Use @eslint/object-schema instead
-
-  '@isaacs/cliui@8.0.2':
-    resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}
-    engines: {node: '>=12'}
-
-  '@istanbuljs/load-nyc-config@1.1.0':
-    resolution: {integrity: sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==}
-    engines: {node: '>=8'}
-
-  '@istanbuljs/schema@0.1.3':
-    resolution: {integrity: sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==}
-    engines: {node: '>=8'}
-
-  '@jest/console@29.7.0':
-    resolution: {integrity: sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  '@jest/core@29.7.0':
-    resolution: {integrity: sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    peerDependencies:
-      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-    peerDependenciesMeta:
-      node-notifier:
-        optional: true
-
-  '@jest/environment@29.7.0':
-    resolution: {integrity: sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  '@jest/expect-utils@29.7.0':
-    resolution: {integrity: sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  '@jest/expect@29.7.0':
-    resolution: {integrity: sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  '@jest/fake-timers@29.7.0':
-    resolution: {integrity: sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  '@jest/globals@29.7.0':
-    resolution: {integrity: sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  '@jest/reporters@29.7.0':
-    resolution: {integrity: sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    peerDependencies:
-      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-    peerDependenciesMeta:
-      node-notifier:
-        optional: true
-
-  '@jest/schemas@29.6.3':
-    resolution: {integrity: sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  '@jest/source-map@29.6.3':
-    resolution: {integrity: sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  '@jest/test-result@29.7.0':
-    resolution: {integrity: sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  '@jest/test-sequencer@29.7.0':
-    resolution: {integrity: sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  '@jest/transform@29.7.0':
-    resolution: {integrity: sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  '@jest/types@29.6.3':
-    resolution: {integrity: sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  '@jridgewell/gen-mapping@0.3.5':
-    resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==}
-    engines: {node: '>=6.0.0'}
-
-  '@jridgewell/resolve-uri@3.1.2':
-    resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}
-    engines: {node: '>=6.0.0'}
-
-  '@jridgewell/set-array@1.2.1':
-    resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==}
-    engines: {node: '>=6.0.0'}
-
-  '@jridgewell/source-map@0.3.6':
-    resolution: {integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==}
-
-  '@jridgewell/sourcemap-codec@1.5.0':
-    resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==}
-
-  '@jridgewell/trace-mapping@0.3.25':
-    resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
-
-  '@jridgewell/trace-mapping@0.3.9':
-    resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==}
-
-  '@kurkle/color@0.3.2':
-    resolution: {integrity: sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==}
-
-  '@netlify/plugin-nextjs@5.8.1':
-    resolution: {integrity: sha512-WB1N0FslhWZ1yAVYTcB6CcFrFOUSQ0O2LfavYZrbAypeNxu2I+oO+cgmhfDgZ8Eoq1g4EMeoIGMkNoZ4ogZTsg==}
-    engines: {node: '>=18.0.0'}
-
-  '@next/env@14.2.10':
-    resolution: {integrity: sha512-dZIu93Bf5LUtluBXIv4woQw2cZVZ2DJTjax5/5DOs3lzEOeKLy7GxRSr4caK9/SCPdaW6bCgpye6+n4Dh9oJPw==}
-
-  '@next/eslint-plugin-next@14.2.16':
-    resolution: {integrity: sha512-noORwKUMkKc96MWjTOwrsUCjky0oFegHbeJ1yEnQBGbMHAaTEIgLZIIfsYF0x3a06PiS+2TXppfifR+O6VWslg==}
-
-  '@next/swc-darwin-arm64@14.2.10':
-    resolution: {integrity: sha512-V3z10NV+cvMAfxQUMhKgfQnPbjw+Ew3cnr64b0lr8MDiBJs3eLnM6RpGC46nhfMZsiXgQngCJKWGTC/yDcgrDQ==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [darwin]
-
-  '@next/swc-darwin-x64@14.2.10':
-    resolution: {integrity: sha512-Y0TC+FXbFUQ2MQgimJ/7Ina2mXIKhE7F+GUe1SgnzRmwFY3hX2z8nyVCxE82I2RicspdkZnSWMn4oTjIKz4uzA==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [darwin]
-
-  '@next/swc-linux-arm64-gnu@14.2.10':
-    resolution: {integrity: sha512-ZfQ7yOy5zyskSj9rFpa0Yd7gkrBnJTkYVSya95hX3zeBG9E55Z6OTNPn1j2BTFWvOVVj65C3T+qsjOyVI9DQpA==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [linux]
-
-  '@next/swc-linux-arm64-musl@14.2.10':
-    resolution: {integrity: sha512-n2i5o3y2jpBfXFRxDREr342BGIQCJbdAUi/K4q6Env3aSx8erM9VuKXHw5KNROK9ejFSPf0LhoSkU/ZiNdacpQ==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [linux]
-
-  '@next/swc-linux-x64-gnu@14.2.10':
-    resolution: {integrity: sha512-GXvajAWh2woTT0GKEDlkVhFNxhJS/XdDmrVHrPOA83pLzlGPQnixqxD8u3bBB9oATBKB//5e4vpACnx5Vaxdqg==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [linux]
-
-  '@next/swc-linux-x64-musl@14.2.10':
-    resolution: {integrity: sha512-opFFN5B0SnO+HTz4Wq4HaylXGFV+iHrVxd3YvREUX9K+xfc4ePbRrxqOuPOFjtSuiVouwe6uLeDtabjEIbkmDA==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [linux]
-
-  '@next/swc-win32-arm64-msvc@14.2.10':
-    resolution: {integrity: sha512-9NUzZuR8WiXTvv+EiU/MXdcQ1XUvFixbLIMNQiVHuzs7ZIFrJDLJDaOF1KaqttoTujpcxljM/RNAOmw1GhPPQQ==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [win32]
-
-  '@next/swc-win32-ia32-msvc@14.2.10':
-    resolution: {integrity: sha512-fr3aEbSd1GeW3YUMBkWAu4hcdjZ6g4NBl1uku4gAn661tcxd1bHs1THWYzdsbTRLcCKLjrDZlNp6j2HTfrw+Bg==}
-    engines: {node: '>= 10'}
-    cpu: [ia32]
-    os: [win32]
-
-  '@next/swc-win32-x64-msvc@14.2.10':
-    resolution: {integrity: sha512-UjeVoRGKNL2zfbcQ6fscmgjBAS/inHBh63mjIlfPg/NG8Yn2ztqylXt5qilYb6hoHIwaU2ogHknHWWmahJjgZQ==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [win32]
-
-  '@nodelib/fs.scandir@2.1.5':
-    resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
-    engines: {node: '>= 8'}
-
-  '@nodelib/fs.stat@2.0.5':
-    resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
-    engines: {node: '>= 8'}
-
-  '@nodelib/fs.walk@1.2.8':
-    resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
-    engines: {node: '>= 8'}
-
-  '@nolyfill/is-core-module@1.0.39':
-    resolution: {integrity: sha512-nn5ozdjYQpUCZlWGuxcJY/KpxkWQs4DcbMCmKojjyrYDEAGy4Ce19NN4v5MduafTwJlbKc99UA8YhSVqq9yPZA==}
-    engines: {node: '>=12.4.0'}
-
-  '@pkgjs/parseargs@0.11.0':
-    resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
-    engines: {node: '>=14'}
-
-  '@prisma/client@5.17.0':
-    resolution: {integrity: sha512-N2tnyKayT0Zf7mHjwEyE8iG7FwTmXDHFZ1GnNhQp0pJUObsuel4ZZ1XwfuAYkq5mRIiC/Kot0kt0tGCfLJ70Jw==}
-    engines: {node: '>=16.13'}
-    peerDependencies:
-      prisma: '*'
-    peerDependenciesMeta:
-      prisma:
-        optional: true
-
-  '@prisma/debug@5.17.0':
-    resolution: {integrity: sha512-l7+AteR3P8FXiYyo496zkuoiJ5r9jLQEdUuxIxNCN1ud8rdbH3GTxm+f+dCyaSv9l9WY+29L9czaVRXz9mULfg==}
-
-  '@prisma/engines-version@5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053':
-    resolution: {integrity: sha512-tUuxZZysZDcrk5oaNOdrBnnkoTtmNQPkzINFDjz7eG6vcs9AVDmA/F6K5Plsb2aQc/l5M2EnFqn3htng9FA4hg==}
-
-  '@prisma/engines@5.17.0':
-    resolution: {integrity: sha512-+r+Nf+JP210Jur+/X8SIPLtz+uW9YA4QO5IXA+KcSOBe/shT47bCcRMTYCbOESw3FFYFTwe7vU6KTWHKPiwvtg==}
-
-  '@prisma/extension-read-replicas@0.3.0':
-    resolution: {integrity: sha512-F9+rSmYday6GT2qjhJtkZcBOpLO5LtpvFcMGqrBDHf+78LEdSuxfFjOxYlNuqk4B+th62yxpbhfpmB9/Mca14Q==}
-    peerDependencies:
-      '@prisma/client': ^5.2.0
-
-  '@prisma/fetch-engine@5.17.0':
-    resolution: {integrity: sha512-ESxiOaHuC488ilLPnrv/tM2KrPhQB5TRris/IeIV4ZvUuKeaicCl4Xj/JCQeG9IlxqOgf1cCg5h5vAzlewN91Q==}
-
-  '@prisma/get-platform@5.17.0':
-    resolution: {integrity: sha512-UlDgbRozCP1rfJ5Tlkf3Cnftb6srGrEQ4Nm3og+1Se2gWmCZ0hmPIi+tQikGDUVLlvOWx3Gyi9LzgRP+HTXV9w==}
-
-  '@react-spring/animated@9.7.5':
-    resolution: {integrity: sha512-Tqrwz7pIlsSDITzxoLS3n/v/YCUHQdOIKtOJf4yL6kYVSDTSmVK1LI1Q3M/uu2Sx4X3pIWF3xLUhlsA6SPNTNg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-
-  '@react-spring/core@9.7.5':
-    resolution: {integrity: sha512-rmEqcxRcu7dWh7MnCcMXLvrf6/SDlSokLaLTxiPlAYi11nN3B5oiCUAblO72o+9z/87j2uzxa2Inm8UbLjXA+w==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-
-  '@react-spring/rafz@9.7.5':
-    resolution: {integrity: sha512-5ZenDQMC48wjUzPAm1EtwQ5Ot3bLIAwwqP2w2owG5KoNdNHpEJV263nGhCeKKmuA3vG2zLLOdu3or6kuDjA6Aw==}
-
-  '@react-spring/shared@9.7.5':
-    resolution: {integrity: sha512-wdtoJrhUeeyD/PP/zo+np2s1Z820Ohr/BbuVYv+3dVLW7WctoiN7std8rISoYoHpUXtbkpesSKuPIw/6U1w1Pw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-
-  '@react-spring/types@9.7.5':
-    resolution: {integrity: sha512-HVj7LrZ4ReHWBimBvu2SKND3cDVUPWKLqRTmWe/fNY6o1owGOX0cAHbdPDTMelgBlVbrTKrre6lFkhqGZErK/g==}
-
-  '@react-spring/web@9.7.5':
-    resolution: {integrity: sha512-lmvqGwpe+CSttsWNZVr+Dg62adtKhauGwLyGE/RRyZ8AAMLgb9x3NDMA5RMElXo+IMyTkPp7nxTB8ZQlmhb6JQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-
-  '@redis/bloom@1.2.0':
-    resolution: {integrity: sha512-HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg==}
-    peerDependencies:
-      '@redis/client': ^1.0.0
-
-  '@redis/client@1.6.0':
-    resolution: {integrity: sha512-aR0uffYI700OEEH4gYnitAnv3vzVGXCFvYfdpu/CJKvk4pHfLPEy/JSZyrpQ+15WhXe1yJRXLtfQ84s4mEXnPg==}
-    engines: {node: '>=14'}
-
-  '@redis/graph@1.1.1':
-    resolution: {integrity: sha512-FEMTcTHZozZciLRl6GiiIB4zGm5z5F3F6a6FZCyrfxdKOhFlGkiAqlexWMBzCi4DcRoyiOsuLfW+cjlGWyExOw==}
-    peerDependencies:
-      '@redis/client': ^1.0.0
-
-  '@redis/json@1.0.7':
-    resolution: {integrity: sha512-6UyXfjVaTBTJtKNG4/9Z8PSpKE6XgSyEb8iwaqDcy+uKrd/DGYHTWkUdnQDyzm727V7p21WUMhsqz5oy65kPcQ==}
-    peerDependencies:
-      '@redis/client': ^1.0.0
-
-  '@redis/search@1.2.0':
-    resolution: {integrity: sha512-tYoDBbtqOVigEDMAcTGsRlMycIIjwMCgD8eR2t0NANeQmgK/lvxNAvYyb6bZDD4frHRhIHkJu2TBRvB0ERkOmw==}
-    peerDependencies:
-      '@redis/client': ^1.0.0
-
-  '@redis/time-series@1.1.0':
-    resolution: {integrity: sha512-c1Q99M5ljsIuc4YdaCwfUEXsofakb9c8+Zse2qxTadu8TalLXuAESzLvFAvNVbkmSlvlzIQOLpBCmWI9wTOt+g==}
-    peerDependencies:
-      '@redis/client': ^1.0.0
-
-  '@rollup/plugin-alias@5.1.1':
-    resolution: {integrity: sha512-PR9zDb+rOzkRb2VD+EuKB7UC41vU5DIwZ5qqCpk0KJudcWAyi8rvYOhS7+L5aZCspw1stTViLgN5v6FF1p5cgQ==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
-    peerDependenciesMeta:
-      rollup:
-        optional: true
-
-  '@rollup/plugin-commonjs@25.0.8':
-    resolution: {integrity: sha512-ZEZWTK5n6Qde0to4vS9Mr5x/0UZoqCxPVR9KRUjU4kA2sO7GEUn1fop0DAwpO6z0Nw/kJON9bDmSxdWxO/TT1A==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      rollup: ^2.68.0||^3.0.0||^4.0.0
-    peerDependenciesMeta:
-      rollup:
-        optional: true
-
-  '@rollup/plugin-json@6.1.0':
-    resolution: {integrity: sha512-EGI2te5ENk1coGeADSIwZ7G2Q8CJS2sF120T7jLw4xFw9n7wIOXHo+kIYRAoVpJAN+kmqZSoO3Fp4JtoNF4ReA==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
-    peerDependenciesMeta:
-      rollup:
-        optional: true
-
-  '@rollup/plugin-node-resolve@15.3.0':
-    resolution: {integrity: sha512-9eO5McEICxMzJpDW9OnMYSv4Sta3hmt7VtBFz5zR9273suNOydOyq/FrGeGy+KsTRFm8w0SLVhzig2ILFT63Ag==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      rollup: ^2.78.0||^3.0.0||^4.0.0
-    peerDependenciesMeta:
-      rollup:
-        optional: true
-
-  '@rollup/plugin-replace@5.0.7':
-    resolution: {integrity: sha512-PqxSfuorkHz/SPpyngLyg5GCEkOcee9M1bkxiVDr41Pd61mqP1PLOoDPbpl44SB2mQGKwV/In74gqQmGITOhEQ==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
-    peerDependenciesMeta:
-      rollup:
-        optional: true
-
-  '@rollup/pluginutils@5.1.3':
-    resolution: {integrity: sha512-Pnsb6f32CD2W3uCaLZIzDmeFyQ2b8UWMFI7xtwUezpcGBDVDW6y9XgAWIlARiGAo6eNF5FK5aQTr0LFyNyqq5A==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
-    peerDependenciesMeta:
-      rollup:
-        optional: true
-
-  '@rtsao/scc@1.1.0':
-    resolution: {integrity: sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==}
-
-  '@rushstack/eslint-patch@1.10.4':
-    resolution: {integrity: sha512-WJgX9nzTqknM393q1QJDJmoW28kUfEnybeTfVNcNAPnIx210RXm2DiXiHzfNPJNIUUb1tJnz/l4QGtJ30PgWmA==}
-
-  '@sinclair/typebox@0.27.8':
-    resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==}
-
-  '@sinonjs/commons@3.0.1':
-    resolution: {integrity: sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==}
-
-  '@sinonjs/fake-timers@10.3.0':
-    resolution: {integrity: sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==}
-
-  '@svgr/babel-plugin-add-jsx-attribute@8.0.0':
-    resolution: {integrity: sha512-b9MIk7yhdS1pMCZM8VeNfUlSKVRhsHZNMl5O9SfaX0l0t5wjdgu4IDzGB8bpnGBBOjGST3rRFVsaaEtI4W6f7g==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@svgr/babel-plugin-remove-jsx-attribute@8.0.0':
-    resolution: {integrity: sha512-BcCkm/STipKvbCl6b7QFrMh/vx00vIP63k2eM66MfHJzPr6O2U0jYEViXkHJWqXqQYjdeA9cuCl5KWmlwjDvbA==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@svgr/babel-plugin-remove-jsx-empty-expression@8.0.0':
-    resolution: {integrity: sha512-5BcGCBfBxB5+XSDSWnhTThfI9jcO5f0Ai2V24gZpG+wXF14BzwxxdDb4g6trdOux0rhibGs385BeFMSmxtS3uA==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@svgr/babel-plugin-replace-jsx-attribute-value@8.0.0':
-    resolution: {integrity: sha512-KVQ+PtIjb1BuYT3ht8M5KbzWBhdAjjUPdlMtpuw/VjT8coTrItWX6Qafl9+ji831JaJcu6PJNKCV0bp01lBNzQ==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@svgr/babel-plugin-svg-dynamic-title@8.0.0':
-    resolution: {integrity: sha512-omNiKqwjNmOQJ2v6ge4SErBbkooV2aAWwaPFs2vUY7p7GhVkzRkJ00kILXQvRhA6miHnNpXv7MRnnSjdRjK8og==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@svgr/babel-plugin-svg-em-dimensions@8.0.0':
-    resolution: {integrity: sha512-mURHYnu6Iw3UBTbhGwE/vsngtCIbHE43xCRK7kCw4t01xyGqb2Pd+WXekRRoFOBIY29ZoOhUCTEweDMdrjfi9g==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@svgr/babel-plugin-transform-react-native-svg@8.1.0':
-    resolution: {integrity: sha512-Tx8T58CHo+7nwJ+EhUwx3LfdNSG9R2OKfaIXXs5soiy5HtgoAEkDay9LIimLOcG8dJQH1wPZp/cnAv6S9CrR1Q==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@svgr/babel-plugin-transform-svg-component@8.0.0':
-    resolution: {integrity: sha512-DFx8xa3cZXTdb/k3kfPeaixecQLgKh5NVBMwD0AQxOzcZawK4oo1Jh9LbrcACUivsCA7TLG8eeWgrDXjTMhRmw==}
-    engines: {node: '>=12'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@svgr/babel-preset@8.1.0':
-    resolution: {integrity: sha512-7EYDbHE7MxHpv4sxvnVPngw5fuR6pw79SkcrILHJ/iMpuKySNCl5W1qcwPEpU+LgyRXOaAFgH0KhwD18wwg6ug==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@svgr/core@8.1.0':
-    resolution: {integrity: sha512-8QqtOQT5ACVlmsvKOJNEaWmRPmcojMOzCz4Hs2BGG/toAp/K38LcsMRyLp349glq5AzJbCEeimEoxaX6v/fLrA==}
-    engines: {node: '>=14'}
-
-  '@svgr/hast-util-to-babel-ast@8.0.0':
-    resolution: {integrity: sha512-EbDKwO9GpfWP4jN9sGdYwPBU0kdomaPIL2Eu4YwmgP+sJeXT+L7bMwJUBnhzfH8Q2qMBqZ4fJwpCyYsAN3mt2Q==}
-    engines: {node: '>=14'}
-
-  '@svgr/plugin-jsx@8.1.0':
-    resolution: {integrity: sha512-0xiIyBsLlr8quN+WyuxooNW9RJ0Dpr8uOnH/xrCVO8GLUcwHISwj1AG0k+LFzteTkAA0GbX0kj9q6Dk70PTiPA==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@svgr/core': '*'
-
-  '@svgr/plugin-svgo@8.1.0':
-    resolution: {integrity: sha512-Ywtl837OGO9pTLIN/onoWLmDQ4zFUycI1g76vuKGEz6evR/ZTJlJuz3G/fIkb6OVBJ2g0o6CGJzaEjfmEo3AHA==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@svgr/core': '*'
-
-  '@svgr/rollup@8.1.0':
-    resolution: {integrity: sha512-0XR1poYvPQoPpmfDYLEqUGu5ePAQ4pdgN3VFsZBNAeze7qubVpsIY1o1R6PZpKep/DKu33GSm2NhwpCLkMs2Cw==}
-    engines: {node: '>=14'}
-
-  '@svgr/webpack@8.1.0':
-    resolution: {integrity: sha512-LnhVjMWyMQV9ZmeEy26maJk+8HTIbd59cH4F2MJ439k9DqejRisfFNGAPvRYlKETuh9LrImlS8aKsBgKjMA8WA==}
-    engines: {node: '>=14'}
-
-  '@swc/counter@0.1.3':
-    resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==}
-
-  '@swc/helpers@0.5.5':
-    resolution: {integrity: sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==}
-
-  '@tanstack/query-core@5.59.16':
-    resolution: {integrity: sha512-crHn+G3ltqb5JG0oUv6q+PMz1m1YkjpASrXTU+sYWW9pLk0t2GybUHNRqYPZWhxgjPaVGC4yp92gSFEJgYEsPw==}
-
-  '@tanstack/react-query@5.59.16':
-    resolution: {integrity: sha512-MuyWheG47h6ERd4PKQ6V8gDyBu3ThNG22e1fRVwvq6ap3EqsFhyuxCAwhNP/03m/mLg+DAb0upgbPaX6VB+CkQ==}
-    peerDependencies:
-      react: ^18 || ^19
-
-  '@trysound/sax@0.2.0':
-    resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
-    engines: {node: '>=10.13.0'}
-
-  '@tsconfig/node10@1.0.11':
-    resolution: {integrity: sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==}
-
-  '@tsconfig/node12@1.0.11':
-    resolution: {integrity: sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==}
-
-  '@tsconfig/node14@1.0.3':
-    resolution: {integrity: sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==}
-
-  '@tsconfig/node16@1.0.4':
-    resolution: {integrity: sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==}
-
-  '@types/babel__core@7.20.5':
-    resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==}
-
-  '@types/babel__generator@7.6.8':
-    resolution: {integrity: sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==}
-
-  '@types/babel__template@7.4.4':
-    resolution: {integrity: sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==}
-
-  '@types/babel__traverse@7.20.6':
-    resolution: {integrity: sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==}
-
-  '@types/cypress@1.1.6':
-    resolution: {integrity: sha512-CfeLLD3+6vIWe2AO5hR63f1c8EbRzrp/j1ExubAwOTpwZFZvF3Nm9cOPQiUwzNmAUmZuhO0QVH98Qlujni6nPw==}
-    deprecated: This is a stub types definition. cypress provides its own type definitions, so you do not need this installed.
-
-  '@types/estree@0.0.50':
-    resolution: {integrity: sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==}
-
-  '@types/estree@1.0.6':
-    resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==}
-
-  '@types/fs-extra@8.1.5':
-    resolution: {integrity: sha512-0dzKcwO+S8s2kuF5Z9oUWatQJj5Uq/iqphEtE3GQJVRRYm/tD1LglU2UnXi2A8jLq5umkGouOXOR9y0n613ZwQ==}
-
-  '@types/fs-extra@9.0.13':
-    resolution: {integrity: sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==}
-
-  '@types/glob@7.2.0':
-    resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==}
-
-  '@types/graceful-fs@4.1.9':
-    resolution: {integrity: sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==}
-
-  '@types/hoist-non-react-statics@3.3.5':
-    resolution: {integrity: sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==}
-
-  '@types/istanbul-lib-coverage@2.0.6':
-    resolution: {integrity: sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==}
-
-  '@types/istanbul-lib-report@3.0.3':
-    resolution: {integrity: sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==}
-
-  '@types/istanbul-reports@3.0.4':
-    resolution: {integrity: sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==}
-
-  '@types/jest@29.5.14':
-    resolution: {integrity: sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==}
-
-  '@types/json-schema@7.0.15':
-    resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
-
-  '@types/json-stable-stringify@1.1.0':
-    resolution: {integrity: sha512-ESTsHWB72QQq+pjUFIbEz9uSCZppD31YrVkbt2rnUciTYEvcwN6uZIhX5JZeBHqRlFJ41x/7MewCs7E2Qux6Cg==}
-
-  '@types/json5@0.0.29':
-    resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
-
-  '@types/lodash@4.17.12':
-    resolution: {integrity: sha512-sviUmCE8AYdaF/KIHLDJBQgeYzPBI0vf/17NaYehBJfYD1j6/L95Slh07NlyK2iNyBNaEkb3En2jRt+a8y3xZQ==}
-
-  '@types/minimatch@5.1.2':
-    resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==}
-
-  '@types/minimist@1.2.5':
-    resolution: {integrity: sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==}
-
-  '@types/node@14.18.63':
-    resolution: {integrity: sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==}
-
-  '@types/node@20.17.1':
-    resolution: {integrity: sha512-j2VlPv1NnwPJbaCNv69FO/1z4lId0QmGvpT41YxitRtWlg96g/j8qcv2RKsLKe2F6OJgyXhupN1Xo17b2m139Q==}
-
-  '@types/normalize-package-data@2.4.4':
-    resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==}
-
-  '@types/prop-types@15.7.13':
-    resolution: {integrity: sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA==}
-
-  '@types/react-dom@18.3.1':
-    resolution: {integrity: sha512-qW1Mfv8taImTthu4KoXgDfLuk4bydU6Q/TkADnDWWHwi4NX4BR+LWfTp2sVmTqRrsHvyDDTelgelxJ+SsejKKQ==}
-
-  '@types/react-redux@7.1.34':
-    resolution: {integrity: sha512-GdFaVjEbYv4Fthm2ZLvj1VSCedV7TqE5y1kNwnjSdBOTXuRSgowux6J8TAct15T3CKBr63UMk+2CO7ilRhyrAQ==}
-
-  '@types/react-window@1.8.8':
-    resolution: {integrity: sha512-8Ls660bHR1AUA2kuRvVG9D/4XpRC6wjAaPT9dil7Ckc76eP9TKWZwwmgfq8Q1LANX3QNDnoU4Zp48A3w+zK69Q==}
-
-  '@types/react@18.3.12':
-    resolution: {integrity: sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==}
-
-  '@types/resolve@1.20.2':
-    resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==}
-
-  '@types/schema-utils@2.4.0':
-    resolution: {integrity: sha512-454hrj5gz/FXcUE20ygfEiN4DxZ1sprUo0V1gqIqkNZ/CzoEzAZEll2uxMsuyz6BYjiQan4Aa65xbTemfzW9hQ==}
-    deprecated: This is a stub types definition. schema-utils provides its own type definitions, so you do not need this installed.
-
-  '@types/semver@7.5.8':
-    resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==}
-
-  '@types/sinonjs__fake-timers@8.1.1':
-    resolution: {integrity: sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==}
-
-  '@types/sizzle@2.3.9':
-    resolution: {integrity: sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==}
-
-  '@types/stack-utils@2.0.3':
-    resolution: {integrity: sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==}
-
-  '@types/yargs-parser@21.0.3':
-    resolution: {integrity: sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==}
-
-  '@types/yargs@17.0.33':
-    resolution: {integrity: sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==}
-
-  '@types/yauzl@2.10.3':
-    resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==}
-
-  '@typescript-eslint/eslint-plugin@6.21.0':
-    resolution: {integrity: sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==}
-    engines: {node: ^16.0.0 || >=18.0.0}
-    peerDependencies:
-      '@typescript-eslint/parser': ^6.0.0 || ^6.0.0-alpha
-      eslint: ^7.0.0 || ^8.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-
-  '@typescript-eslint/parser@6.21.0':
-    resolution: {integrity: sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==}
-    engines: {node: ^16.0.0 || >=18.0.0}
-    peerDependencies:
-      eslint: ^7.0.0 || ^8.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-
-  '@typescript-eslint/scope-manager@5.62.0':
-    resolution: {integrity: sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-
-  '@typescript-eslint/scope-manager@6.21.0':
-    resolution: {integrity: sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==}
-    engines: {node: ^16.0.0 || >=18.0.0}
-
-  '@typescript-eslint/type-utils@6.21.0':
-    resolution: {integrity: sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==}
-    engines: {node: ^16.0.0 || >=18.0.0}
-    peerDependencies:
-      eslint: ^7.0.0 || ^8.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-
-  '@typescript-eslint/types@5.62.0':
-    resolution: {integrity: sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-
-  '@typescript-eslint/types@6.21.0':
-    resolution: {integrity: sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==}
-    engines: {node: ^16.0.0 || >=18.0.0}
-
-  '@typescript-eslint/typescript-estree@5.62.0':
-    resolution: {integrity: sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-
-  '@typescript-eslint/typescript-estree@6.21.0':
-    resolution: {integrity: sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==}
-    engines: {node: ^16.0.0 || >=18.0.0}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-
-  '@typescript-eslint/utils@5.62.0':
-    resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-
-  '@typescript-eslint/utils@6.21.0':
-    resolution: {integrity: sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==}
-    engines: {node: ^16.0.0 || >=18.0.0}
-    peerDependencies:
-      eslint: ^7.0.0 || ^8.0.0
-
-  '@typescript-eslint/visitor-keys@5.62.0':
-    resolution: {integrity: sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-
-  '@typescript-eslint/visitor-keys@6.21.0':
-    resolution: {integrity: sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==}
-    engines: {node: ^16.0.0 || >=18.0.0}
-
-  '@umami/prisma-client@0.14.0':
-    resolution: {integrity: sha512-62aAE5s5m/M1T88JIvOyZk2LzQIJ/iEeF57ewd/qKKNZdgXfP1aib+IAQ74db85vq6TwFyHMaXBeXztNNby5Fw==}
-    peerDependencies:
-      '@prisma/client': ^4.8.0
-      '@prisma/extension-read-replicas': ^0.3.0
-
-  '@umami/redis-client@0.21.0':
-    resolution: {integrity: sha512-PpdJunvT4sAsVWIeEl+cHU6iSV2r/Df9dof2gdUwSigfD88ACsVs1/BvlWERxk/T93rTgVJWSpLvdw/oMYvkcw==}
-
-  '@ungap/structured-clone@1.2.0':
-    resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
-
-  '@vue/compiler-core@3.5.12':
-    resolution: {integrity: sha512-ISyBTRMmMYagUxhcpyEH0hpXRd/KqDU4ymofPgl2XAkY9ZhQ+h0ovEZJIiPop13UmR/54oA2cgMDjgroRelaEw==}
-
-  '@vue/compiler-dom@3.5.12':
-    resolution: {integrity: sha512-9G6PbJ03uwxLHKQ3P42cMTi85lDRvGLB2rSGOiQqtXELat6uI4n8cNz9yjfVHRPIu+MsK6TE418Giruvgptckg==}
-
-  '@vue/compiler-sfc@3.5.12':
-    resolution: {integrity: sha512-2k973OGo2JuAa5+ZlekuQJtitI5CgLMOwgl94BzMCsKZCX/xiqzJYzapl4opFogKHqwJk34vfsaKpfEhd1k5nw==}
-
-  '@vue/compiler-ssr@3.5.12':
-    resolution: {integrity: sha512-eLwc7v6bfGBSM7wZOGPmRavSWzNFF6+PdRhE+VFJhNCgHiF8AM7ccoqcv5kBXA2eWUfigD7byekvf/JsOfKvPA==}
-
-  '@vue/reactivity@3.5.12':
-    resolution: {integrity: sha512-UzaN3Da7xnJXdz4Okb/BGbAaomRHc3RdoWqTzlvd9+WBR5m3J39J1fGcHes7U3za0ruYn/iYy/a1euhMEHvTAg==}
-
-  '@vue/runtime-core@3.5.12':
-    resolution: {integrity: sha512-hrMUYV6tpocr3TL3Ad8DqxOdpDe4zuQY4HPY3X/VRh+L2myQO8MFXPAMarIOSGNu0bFAjh1yBkMPXZBqCk62Uw==}
-
-  '@vue/runtime-dom@3.5.12':
-    resolution: {integrity: sha512-q8VFxR9A2MRfBr6/55Q3umyoN7ya836FzRXajPB6/Vvuv0zOPL+qltd9rIMzG/DbRLAIlREmnLsplEF/kotXKA==}
-
-  '@vue/server-renderer@3.5.12':
-    resolution: {integrity: sha512-I3QoeDDeEPZm8yR28JtY+rk880Oqmj43hreIBVTicisFTx/Dl7JpG72g/X7YF8hnQD3IFhkky5i2bPonwrTVPg==}
-    peerDependencies:
-      vue: 3.5.12
-
-  '@vue/shared@3.5.12':
-    resolution: {integrity: sha512-L2RPSAwUFbgZH20etwrXyVyCBu9OxRSi8T/38QsvnkJyvq2LufW2lDCOzm7t/U9C1mkhJGWYfCuFBCmIuNivrg==}
-
-  acorn-jsx@5.3.2:
-    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
-    peerDependencies:
-      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
-
-  acorn-walk@8.3.4:
-    resolution: {integrity: sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==}
-    engines: {node: '>=0.4.0'}
-
-  acorn@8.13.0:
-    resolution: {integrity: sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==}
-    engines: {node: '>=0.4.0'}
-    hasBin: true
-
-  aggregate-error@3.1.0:
-    resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==}
-    engines: {node: '>=8'}
-
-  ajv-keywords@3.5.2:
-    resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==}
-    peerDependencies:
-      ajv: ^6.9.1
-
-  ajv@6.12.6:
-    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
-
-  ajv@8.17.1:
-    resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==}
-
-  ansi-colors@4.1.3:
-    resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==}
-    engines: {node: '>=6'}
-
-  ansi-escapes@4.3.2:
-    resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==}
-    engines: {node: '>=8'}
-
-  ansi-escapes@5.0.0:
-    resolution: {integrity: sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==}
-    engines: {node: '>=12'}
-
-  ansi-regex@5.0.1:
-    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
-    engines: {node: '>=8'}
-
-  ansi-regex@6.1.0:
-    resolution: {integrity: sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==}
-    engines: {node: '>=12'}
-
-  ansi-styles@3.2.1:
-    resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
-    engines: {node: '>=4'}
-
-  ansi-styles@4.3.0:
-    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
-    engines: {node: '>=8'}
-
-  ansi-styles@5.2.0:
-    resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==}
-    engines: {node: '>=10'}
-
-  ansi-styles@6.2.1:
-    resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==}
-    engines: {node: '>=12'}
-
-  anymatch@3.1.3:
-    resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==}
-    engines: {node: '>= 8'}
-
-  arch@2.2.0:
-    resolution: {integrity: sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==}
-
-  arg@4.1.3:
-    resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==}
-
-  argparse@1.0.10:
-    resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
-
-  argparse@2.0.1:
-    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
-
-  aria-query@5.3.2:
-    resolution: {integrity: sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==}
-    engines: {node: '>= 0.4'}
-
-  array-buffer-byte-length@1.0.1:
-    resolution: {integrity: sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==}
-    engines: {node: '>= 0.4'}
-
-  array-find-index@1.0.2:
-    resolution: {integrity: sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==}
-    engines: {node: '>=0.10.0'}
-
-  array-includes@3.1.8:
-    resolution: {integrity: sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==}
-    engines: {node: '>= 0.4'}
-
-  array-union@2.1.0:
-    resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
-    engines: {node: '>=8'}
-
-  array.prototype.findlast@1.2.5:
-    resolution: {integrity: sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==}
-    engines: {node: '>= 0.4'}
-
-  array.prototype.findlastindex@1.2.5:
-    resolution: {integrity: sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==}
-    engines: {node: '>= 0.4'}
-
-  array.prototype.flat@1.3.2:
-    resolution: {integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==}
-    engines: {node: '>= 0.4'}
-
-  array.prototype.flatmap@1.3.2:
-    resolution: {integrity: sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==}
-    engines: {node: '>= 0.4'}
-
-  array.prototype.tosorted@1.1.4:
-    resolution: {integrity: sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==}
-    engines: {node: '>= 0.4'}
-
-  arraybuffer.prototype.slice@1.0.3:
-    resolution: {integrity: sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==}
-    engines: {node: '>= 0.4'}
-
-  arrify@1.0.1:
-    resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==}
-    engines: {node: '>=0.10.0'}
-
-  asn1@0.2.6:
-    resolution: {integrity: sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==}
-
-  assert-plus@1.0.0:
-    resolution: {integrity: sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==}
-    engines: {node: '>=0.8'}
-
-  ast-types-flow@0.0.8:
-    resolution: {integrity: sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==}
-
-  astral-regex@2.0.0:
-    resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
-    engines: {node: '>=8'}
-
-  async@3.2.6:
-    resolution: {integrity: sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==}
-
-  asynckit@0.4.0:
-    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
-
-  at-least-node@1.0.0:
-    resolution: {integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==}
-    engines: {node: '>= 4.0.0'}
-
-  autoprefixer@10.4.20:
-    resolution: {integrity: sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==}
-    engines: {node: ^10 || ^12 || >=14}
-    hasBin: true
-    peerDependencies:
-      postcss: ^8.1.0
-
-  available-typed-arrays@1.0.7:
-    resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
-    engines: {node: '>= 0.4'}
-
-  aws-sign2@0.7.0:
-    resolution: {integrity: sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==}
-
-  aws4@1.13.2:
-    resolution: {integrity: sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==}
-
-  axe-core@4.10.2:
-    resolution: {integrity: sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==}
-    engines: {node: '>=4'}
-
-  axobject-query@4.1.0:
-    resolution: {integrity: sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==}
-    engines: {node: '>= 0.4'}
-
-  babel-jest@29.7.0:
-    resolution: {integrity: sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    peerDependencies:
-      '@babel/core': ^7.8.0
-
-  babel-plugin-istanbul@6.1.1:
-    resolution: {integrity: sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==}
-    engines: {node: '>=8'}
-
-  babel-plugin-jest-hoist@29.6.3:
-    resolution: {integrity: sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  babel-plugin-polyfill-corejs2@0.4.11:
-    resolution: {integrity: sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==}
-    peerDependencies:
-      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
-
-  babel-plugin-polyfill-corejs3@0.10.6:
-    resolution: {integrity: sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==}
-    peerDependencies:
-      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
-
-  babel-plugin-polyfill-regenerator@0.6.2:
-    resolution: {integrity: sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==}
-    peerDependencies:
-      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
-
-  babel-plugin-react-intl@7.9.4:
-    resolution: {integrity: sha512-cMKrHEXrw43yT4M89Wbgq8A8N8lffSquj1Piwov/HVukR7jwOw8gf9btXNsQhT27ccyqEwy+M286JQYy0jby2g==}
-    deprecated: this package has been renamed to babel-plugin-formatjs
-
-  babel-preset-current-node-syntax@1.1.0:
-    resolution: {integrity: sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-
-  babel-preset-jest@29.6.3:
-    resolution: {integrity: sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-
-  balanced-match@1.0.2:
-    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
-
-  balanced-match@2.0.0:
-    resolution: {integrity: sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==}
-
-  base64-js@1.5.1:
-    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
-
-  bcrypt-pbkdf@1.0.2:
-    resolution: {integrity: sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==}
-
-  bcryptjs@2.4.3:
-    resolution: {integrity: sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==}
-
-  blob-util@2.0.2:
-    resolution: {integrity: sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==}
-
-  bluebird@3.7.2:
-    resolution: {integrity: sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==}
-
-  boolbase@1.0.0:
-    resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}
-
-  brace-expansion@1.1.11:
-    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
-
-  brace-expansion@2.0.1:
-    resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}
-
-  braces@3.0.3:
-    resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
-    engines: {node: '>=8'}
-
-  browserslist@4.24.2:
-    resolution: {integrity: sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==}
-    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
-    hasBin: true
-
-  bs-logger@0.2.6:
-    resolution: {integrity: sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==}
-    engines: {node: '>= 6'}
-
-  bser@2.1.1:
-    resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==}
-
-  buffer-crc32@0.2.13:
-    resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
-
-  buffer-equal-constant-time@1.0.1:
-    resolution: {integrity: sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==}
-
-  buffer-from@1.1.2:
-    resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
-
-  buffer@5.7.1:
-    resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
-
-  busboy@1.6.0:
-    resolution: {integrity: sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==}
-    engines: {node: '>=10.16.0'}
-
-  cachedir@2.4.0:
-    resolution: {integrity: sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==}
-    engines: {node: '>=6'}
-
-  call-bind@1.0.7:
-    resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==}
-    engines: {node: '>= 0.4'}
-
-  callsites@3.1.0:
-    resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
-    engines: {node: '>=6'}
-
-  camelcase-keys@6.2.2:
-    resolution: {integrity: sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==}
-    engines: {node: '>=8'}
-
-  camelcase-keys@7.0.2:
-    resolution: {integrity: sha512-Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg==}
-    engines: {node: '>=12'}
-
-  camelcase@5.3.1:
-    resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
-    engines: {node: '>=6'}
-
-  camelcase@6.3.0:
-    resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==}
-    engines: {node: '>=10'}
-
-  caniuse-api@3.0.0:
-    resolution: {integrity: sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==}
-
-  caniuse-lite@1.0.30001669:
-    resolution: {integrity: sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w==}
-
-  caseless@0.12.0:
-    resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}
-
-  chalk@2.4.2:
-    resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
-    engines: {node: '>=4'}
-
-  chalk@4.1.2:
-    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
-    engines: {node: '>=10'}
-
-  chalk@5.3.0:
-    resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==}
-    engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
-
-  char-regex@1.0.2:
-    resolution: {integrity: sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==}
-    engines: {node: '>=10'}
-
-  charenc@0.0.2:
-    resolution: {integrity: sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==}
-
-  chart.js@4.4.5:
-    resolution: {integrity: sha512-CVVjg1RYTJV9OCC8WeJPMx8gsV8K6WIyIEQUE3ui4AR9Hfgls9URri6Ja3hyMVBbTF8Q2KFa19PE815gWcWhng==}
-    engines: {pnpm: '>=8'}
-
-  chartjs-adapter-date-fns@3.0.0:
-    resolution: {integrity: sha512-Rs3iEB3Q5pJ973J93OBTpnP7qoGwvq3nUnoMdtxO+9aoJof7UFcRbWcIDteXuYd1fgAvct/32T9qaLyLuZVwCg==}
-    peerDependencies:
-      chart.js: '>=2.8.0'
-      date-fns: '>=2.0.0'
-
-  check-more-types@2.24.0:
-    resolution: {integrity: sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==}
-    engines: {node: '>= 0.8.0'}
-
-  chownr@2.0.0:
-    resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
-    engines: {node: '>=10'}
-
-  ci-info@3.9.0:
-    resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==}
-    engines: {node: '>=8'}
-
-  cjs-module-lexer@1.4.1:
-    resolution: {integrity: sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==}
-
-  classnames@2.5.1:
-    resolution: {integrity: sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==}
-
-  clean-stack@2.2.0:
-    resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==}
-    engines: {node: '>=6'}
-
-  cli-cursor@3.1.0:
-    resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}
-    engines: {node: '>=8'}
-
-  cli-cursor@4.0.0:
-    resolution: {integrity: sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
-  cli-table3@0.6.5:
-    resolution: {integrity: sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==}
-    engines: {node: 10.* || >= 12.*}
-
-  cli-truncate@2.1.0:
-    resolution: {integrity: sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==}
-    engines: {node: '>=8'}
-
-  cli-truncate@3.1.0:
-    resolution: {integrity: sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
-  client-only@0.0.1:
-    resolution: {integrity: sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==}
-
-  cliui@8.0.1:
-    resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
-    engines: {node: '>=12'}
-
-  cluster-key-slot@1.1.2:
-    resolution: {integrity: sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==}
-    engines: {node: '>=0.10.0'}
-
-  co@4.6.0:
-    resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==}
-    engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'}
-
-  collect-v8-coverage@1.0.2:
-    resolution: {integrity: sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==}
-
-  color-convert@1.9.3:
-    resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
-
-  color-convert@2.0.1:
-    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
-    engines: {node: '>=7.0.0'}
-
-  color-name@1.1.3:
-    resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
-
-  color-name@1.1.4:
-    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
-
-  colord@2.9.3:
-    resolution: {integrity: sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==}
-
-  colorette@1.4.0:
-    resolution: {integrity: sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==}
-
-  colorette@2.0.20:
-    resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==}
-
-  combined-stream@1.0.8:
-    resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
-    engines: {node: '>= 0.8'}
-
-  commander@11.0.0:
-    resolution: {integrity: sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==}
-    engines: {node: '>=16'}
-
-  commander@2.20.3:
-    resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
-
-  commander@6.2.1:
-    resolution: {integrity: sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==}
-    engines: {node: '>= 6'}
-
-  commander@7.2.0:
-    resolution: {integrity: sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==}
-    engines: {node: '>= 10'}
-
-  commander@8.3.0:
-    resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==}
-    engines: {node: '>= 12'}
-
-  common-tags@1.8.2:
-    resolution: {integrity: sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==}
-    engines: {node: '>=4.0.0'}
-
-  commondir@1.0.1:
-    resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==}
-
-  concat-map@0.0.1:
-    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
-
-  concat-with-sourcemaps@1.1.0:
-    resolution: {integrity: sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==}
-
-  convert-source-map@2.0.0:
-    resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
-
-  core-js-compat@3.38.1:
-    resolution: {integrity: sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==}
-
-  core-util-is@1.0.2:
-    resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==}
-
-  cors@2.8.5:
-    resolution: {integrity: sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==}
-    engines: {node: '>= 0.10'}
-
-  cosmiconfig@8.3.6:
-    resolution: {integrity: sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      typescript: '>=4.9.5'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-
-  create-jest@29.7.0:
-    resolution: {integrity: sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    hasBin: true
-
-  create-require@1.1.1:
-    resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
-
-  cross-env@7.0.3:
-    resolution: {integrity: sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==}
-    engines: {node: '>=10.14', npm: '>=6', yarn: '>=1'}
-    hasBin: true
-
-  cross-spawn@6.0.5:
-    resolution: {integrity: sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==}
-    engines: {node: '>=4.8'}
-
-  cross-spawn@7.0.3:
-    resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
-    engines: {node: '>= 8'}
-
-  crypt@0.0.2:
-    resolution: {integrity: sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==}
-
-  css-blank-pseudo@3.0.3:
-    resolution: {integrity: sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==}
-    engines: {node: ^12 || ^14 || >=16}
-    hasBin: true
-    peerDependencies:
-      postcss: ^8.4
-
-  css-box-model@1.2.1:
-    resolution: {integrity: sha512-a7Vr4Q/kd/aw96bnJG332W9V9LkJO69JRcaCYDUqjp6/z0w6VcZjgAcTbgFxEPfBgdnAwlh3iwu+hLopa+flJw==}
-
-  css-declaration-sorter@6.4.1:
-    resolution: {integrity: sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==}
-    engines: {node: ^10 || ^12 || >=14}
-    peerDependencies:
-      postcss: ^8.0.9
-
-  css-functions-list@3.2.3:
-    resolution: {integrity: sha512-IQOkD3hbR5KrN93MtcYuad6YPuTSUhntLHDuLEbFWE+ff2/XSZNdZG+LcbbIW5AXKg/WFIfYItIzVoHngHXZzA==}
-    engines: {node: '>=12 || >=16'}
-
-  css-has-pseudo@3.0.4:
-    resolution: {integrity: sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==}
-    engines: {node: ^12 || ^14 || >=16}
-    hasBin: true
-    peerDependencies:
-      postcss: ^8.4
-
-  css-prefers-color-scheme@6.0.3:
-    resolution: {integrity: sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==}
-    engines: {node: ^12 || ^14 || >=16}
-    hasBin: true
-    peerDependencies:
-      postcss: ^8.4
-
-  css-select@4.3.0:
-    resolution: {integrity: sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==}
-
-  css-select@5.1.0:
-    resolution: {integrity: sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==}
-
-  css-tree@1.1.3:
-    resolution: {integrity: sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==}
-    engines: {node: '>=8.0.0'}
-
-  css-tree@2.2.1:
-    resolution: {integrity: sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==}
-    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0, npm: '>=7.0.0'}
-
-  css-tree@2.3.1:
-    resolution: {integrity: sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==}
-    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
-
-  css-tree@3.0.0:
-    resolution: {integrity: sha512-o88DVQ6GzsABn1+6+zo2ct801dBO5OASVyxbbvA2W20ue2puSh/VOuqUj90eUeMSX/xqGqBmOKiRQN7tJOuBXw==}
-    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
-
-  css-what@6.1.0:
-    resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==}
-    engines: {node: '>= 6'}
-
-  cssdb@7.11.2:
-    resolution: {integrity: sha512-lhQ32TFkc1X4eTefGfYPvgovRSzIMofHkigfH8nWtyRL4XJLsRhJFreRvEgKzept7x1rjBuy3J/MurXLaFxW/A==}
-
-  cssesc@3.0.0:
-    resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
-    engines: {node: '>=4'}
-    hasBin: true
-
-  cssnano-preset-default@5.2.14:
-    resolution: {integrity: sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  cssnano-utils@3.1.0:
-    resolution: {integrity: sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  cssnano@5.1.15:
-    resolution: {integrity: sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  csso@4.2.0:
-    resolution: {integrity: sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==}
-    engines: {node: '>=8.0.0'}
-
-  csso@5.0.5:
-    resolution: {integrity: sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==}
-    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0, npm: '>=7.0.0'}
-
-  csstype@3.1.3:
-    resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
-
-  currently-unhandled@0.4.1:
-    resolution: {integrity: sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng==}
-    engines: {node: '>=0.10.0'}
-
-  cypress@13.15.1:
-    resolution: {integrity: sha512-DwUFiKXo4lef9kA0M4iEhixFqoqp2hw8igr0lTqafRb9qtU3X0XGxKbkSYsUFdkrAkphc7MPDxoNPhk5pj9PVg==}
-    engines: {node: ^16.0.0 || ^18.0.0 || >=20.0.0}
-    hasBin: true
-
-  d3-array@2.12.1:
-    resolution: {integrity: sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==}
-
-  d3-color@2.0.0:
-    resolution: {integrity: sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==}
-
-  d3-dispatch@2.0.0:
-    resolution: {integrity: sha512-S/m2VsXI7gAti2pBoLClFFTMOO1HTtT0j99AuXLoGFKO6deHDdnv6ZGTxSTTUTgO1zVcv82fCOtDjYK4EECmWA==}
-
-  d3-drag@2.0.0:
-    resolution: {integrity: sha512-g9y9WbMnF5uqB9qKqwIIa/921RYWzlUDv9Jl1/yONQwxbOfszAWTCm8u7HOTgJgRDXiRZN56cHT9pd24dmXs8w==}
-
-  d3-ease@2.0.0:
-    resolution: {integrity: sha512-68/n9JWarxXkOWMshcT5IcjbB+agblQUaIsbnXmrzejn2O82n3p2A9R2zEB9HIEFWKFwPAEDDN8gR0VdSAyyAQ==}
-
-  d3-geo@2.0.2:
-    resolution: {integrity: sha512-8pM1WGMLGFuhq9S+FpPURxic+gKzjluCD/CHTuUF3mXMeiCo0i6R0tO1s4+GArRFde96SLcW/kOFRjoAosPsFA==}
-
-  d3-interpolate@2.0.1:
-    resolution: {integrity: sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==}
-
-  d3-selection@2.0.0:
-    resolution: {integrity: sha512-XoGGqhLUN/W14NmaqcO/bb1nqjDAw5WtSYb2X8wiuQWvSZUsUVYsOSkOybUrNvcBjaywBdYPy03eXHMXjk9nZA==}
-
-  d3-timer@2.0.0:
-    resolution: {integrity: sha512-TO4VLh0/420Y/9dO3+f9abDEFYeCUr2WZRlxJvbp4HPTQcSylXNiL6yZa9FIUvV1yRiFufl1bszTCLDqv9PWNA==}
-
-  d3-transition@2.0.0:
-    resolution: {integrity: sha512-42ltAGgJesfQE3u9LuuBHNbGrI/AJjNL2OAUdclE70UE6Vy239GCBEYD38uBPoLeNsOhFStGpPI0BAOV+HMxog==}
-    peerDependencies:
-      d3-selection: '2'
-
-  d3-zoom@2.0.0:
-    resolution: {integrity: sha512-fFg7aoaEm9/jf+qfstak0IYpnesZLiMX6GZvXtUSdv8RH2o4E2qeelgdU09eKS6wGuiGMfcnMI0nTIqWzRHGpw==}
-
-  damerau-levenshtein@1.0.8:
-    resolution: {integrity: sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==}
-
-  dashdash@1.14.1:
-    resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
-    engines: {node: '>=0.10'}
-
-  data-uri-to-buffer@4.0.1:
-    resolution: {integrity: sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==}
-    engines: {node: '>= 12'}
-
-  data-view-buffer@1.0.1:
-    resolution: {integrity: sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==}
-    engines: {node: '>= 0.4'}
-
-  data-view-byte-length@1.0.1:
-    resolution: {integrity: sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==}
-    engines: {node: '>= 0.4'}
-
-  data-view-byte-offset@1.0.0:
-    resolution: {integrity: sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==}
-    engines: {node: '>= 0.4'}
-
-  date-fns-tz@1.3.8:
-    resolution: {integrity: sha512-qwNXUFtMHTTU6CFSFjoJ80W8Fzzp24LntbjFFBgL/faqds4e5mo9mftoRLgr3Vi1trISsg4awSpYVsOQCRnapQ==}
-    peerDependencies:
-      date-fns: '>=2.0.0'
-
-  date-fns@2.30.0:
-    resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==}
-    engines: {node: '>=0.11'}
-
-  dayjs@1.11.13:
-    resolution: {integrity: sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==}
-
-  debounce@1.2.1:
-    resolution: {integrity: sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==}
-
-  debug@3.2.7:
-    resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-
-  debug@4.3.4:
-    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-
-  debug@4.3.7:
-    resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-
-  decamelize-keys@1.1.1:
-    resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==}
-    engines: {node: '>=0.10.0'}
-
-  decamelize@1.2.0:
-    resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
-    engines: {node: '>=0.10.0'}
-
-  decamelize@5.0.1:
-    resolution: {integrity: sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==}
-    engines: {node: '>=10'}
-
-  dedent@1.5.3:
-    resolution: {integrity: sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==}
-    peerDependencies:
-      babel-plugin-macros: ^3.1.0
-    peerDependenciesMeta:
-      babel-plugin-macros:
-        optional: true
-
-  deep-is@0.1.4:
-    resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
-
-  deepmerge@4.3.1:
-    resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==}
-    engines: {node: '>=0.10.0'}
-
-  define-data-property@1.1.4:
-    resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==}
-    engines: {node: '>= 0.4'}
-
-  define-properties@1.2.1:
-    resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
-    engines: {node: '>= 0.4'}
-
-  del@5.1.0:
-    resolution: {integrity: sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==}
-    engines: {node: '>=8'}
-
-  del@6.1.1:
-    resolution: {integrity: sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==}
-    engines: {node: '>=10'}
-
-  delayed-stream@1.0.0:
-    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
-    engines: {node: '>=0.4.0'}
-
-  detect-browser@5.3.0:
-    resolution: {integrity: sha512-53rsFbGdwMwlF7qvCt0ypLM5V5/Mbl0szB7GPN8y9NCcbknYOeVVXdrXEq+90IwAfrrzt6Hd+u2E2ntakICU8w==}
-
-  detect-indent@6.1.0:
-    resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==}
-    engines: {node: '>=8'}
-
-  detect-newline@3.1.0:
-    resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==}
-    engines: {node: '>=8'}
-
-  diff-sequences@29.6.3:
-    resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  diff@4.0.2:
-    resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
-    engines: {node: '>=0.3.1'}
-
-  dir-glob@3.0.1:
-    resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
-    engines: {node: '>=8'}
-
-  doctrine@2.1.0:
-    resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==}
-    engines: {node: '>=0.10.0'}
-
-  doctrine@3.0.0:
-    resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
-    engines: {node: '>=6.0.0'}
-
-  dom-serializer@1.4.1:
-    resolution: {integrity: sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==}
-
-  dom-serializer@2.0.0:
-    resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==}
-
-  domelementtype@2.3.0:
-    resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==}
-
-  domhandler@4.3.1:
-    resolution: {integrity: sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==}
-    engines: {node: '>= 4'}
-
-  domhandler@5.0.3:
-    resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
-    engines: {node: '>= 4'}
-
-  domutils@2.8.0:
-    resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==}
-
-  domutils@3.1.0:
-    resolution: {integrity: sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==}
-
-  dot-case@3.0.4:
-    resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
-
-  dotenv@10.0.0:
-    resolution: {integrity: sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==}
-    engines: {node: '>=10'}
-
-  eastasianwidth@0.2.0:
-    resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
-
-  ecc-jsbn@0.1.2:
-    resolution: {integrity: sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==}
-
-  ecdsa-sig-formatter@1.0.11:
-    resolution: {integrity: sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==}
-
-  ejs@3.1.10:
-    resolution: {integrity: sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==}
-    engines: {node: '>=0.10.0'}
-    hasBin: true
-
-  electron-to-chromium@1.5.46:
-    resolution: {integrity: sha512-1XDk0Z8/YRgB2t5GeEg8DPK592DLjVmd/5uwAu6c/S4Z0CUwV/RwYqe5GWxQqcoN3bJ5U7hYMiMRPZzpCzSBhQ==}
-
-  emittery@0.13.1:
-    resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}
-    engines: {node: '>=12'}
-
-  emoji-regex@8.0.0:
-    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
-
-  emoji-regex@9.2.2:
-    resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
-
-  end-of-stream@1.4.4:
-    resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
-
-  enhanced-resolve@5.17.1:
-    resolution: {integrity: sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==}
-    engines: {node: '>=10.13.0'}
-
-  enquirer@2.4.1:
-    resolution: {integrity: sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==}
-    engines: {node: '>=8.6'}
-
-  entities@2.2.0:
-    resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==}
-
-  entities@4.5.0:
-    resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}
-    engines: {node: '>=0.12'}
-
-  error-ex@1.3.2:
-    resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
-
-  es-abstract@1.23.3:
-    resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==}
-    engines: {node: '>= 0.4'}
-
-  es-define-property@1.0.0:
-    resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==}
-    engines: {node: '>= 0.4'}
-
-  es-errors@1.3.0:
-    resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
-    engines: {node: '>= 0.4'}
-
-  es-iterator-helpers@1.1.0:
-    resolution: {integrity: sha512-/SurEfycdyssORP/E+bj4sEu1CWw4EmLDsHynHwSXQ7utgbrMRWW195pTrCjFgFCddf/UkYm3oqKPRq5i8bJbw==}
-    engines: {node: '>= 0.4'}
-
-  es-module-lexer@1.5.4:
-    resolution: {integrity: sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==}
-
-  es-object-atoms@1.0.0:
-    resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==}
-    engines: {node: '>= 0.4'}
-
-  es-set-tostringtag@2.0.3:
-    resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==}
-    engines: {node: '>= 0.4'}
-
-  es-shim-unscopables@1.0.2:
-    resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==}
-
-  es-to-primitive@1.2.1:
-    resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}
-    engines: {node: '>= 0.4'}
-
-  esbuild@0.17.19:
-    resolution: {integrity: sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==}
-    engines: {node: '>=12'}
-    hasBin: true
-
-  escalade@3.2.0:
-    resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
-    engines: {node: '>=6'}
-
-  escape-string-regexp@1.0.5:
-    resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
-    engines: {node: '>=0.8.0'}
-
-  escape-string-regexp@2.0.0:
-    resolution: {integrity: sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==}
-    engines: {node: '>=8'}
-
-  escape-string-regexp@4.0.0:
-    resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
-    engines: {node: '>=10'}
-
-  eslint-config-next@14.2.16:
-    resolution: {integrity: sha512-HOcnCJsyLXR7B8wmjaCgkTSpz+ijgOyAkP8OlvANvciP8PspBYFEBTmakNMxOf71fY0aKOm/blFIiKnrM4K03Q==}
-    peerDependencies:
-      eslint: ^7.23.0 || ^8.0.0
-      typescript: '>=3.3.1'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-
-  eslint-config-prettier@8.10.0:
-    resolution: {integrity: sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==}
-    hasBin: true
-    peerDependencies:
-      eslint: '>=7.0.0'
-
-  eslint-import-resolver-alias@1.1.2:
-    resolution: {integrity: sha512-WdviM1Eu834zsfjHtcGHtGfcu+F30Od3V7I9Fi57uhBEwPkjDcii7/yW8jAT+gOhn4P/vOxxNAXbFAKsrrc15w==}
-    engines: {node: '>= 4'}
-    peerDependencies:
-      eslint-plugin-import: '>=1.4.0'
-
-  eslint-import-resolver-node@0.3.9:
-    resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==}
-
-  eslint-import-resolver-typescript@3.6.3:
-    resolution: {integrity: sha512-ud9aw4szY9cCT1EWWdGv1L1XR6hh2PaRWif0j2QjQ0pgTY/69iw+W0Z4qZv5wHahOl8isEr+k/JnyAqNQkLkIA==}
-    engines: {node: ^14.18.0 || >=16.0.0}
-    peerDependencies:
-      eslint: '*'
-      eslint-plugin-import: '*'
-      eslint-plugin-import-x: '*'
-    peerDependenciesMeta:
-      eslint-plugin-import:
-        optional: true
-      eslint-plugin-import-x:
-        optional: true
-
-  eslint-module-utils@2.12.0:
-    resolution: {integrity: sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==}
-    engines: {node: '>=4'}
-    peerDependencies:
-      '@typescript-eslint/parser': '*'
-      eslint: '*'
-      eslint-import-resolver-node: '*'
-      eslint-import-resolver-typescript: '*'
-      eslint-import-resolver-webpack: '*'
-    peerDependenciesMeta:
-      '@typescript-eslint/parser':
-        optional: true
-      eslint:
-        optional: true
-      eslint-import-resolver-node:
-        optional: true
-      eslint-import-resolver-typescript:
-        optional: true
-      eslint-import-resolver-webpack:
-        optional: true
-
-  eslint-plugin-css-modules@2.12.0:
-    resolution: {integrity: sha512-ruFBdad69ABrbCDCh5mXj7UzNmrvytfzPACjyvZWIAjFZAG8BXpYSbqmE8gU5wF+pIzV3jU2CWhLvfekXT/IgQ==}
-    engines: {node: '>=4.0.0'}
-    peerDependencies:
-      eslint: '>=2.0.0'
-
-  eslint-plugin-cypress@2.15.2:
-    resolution: {integrity: sha512-CtcFEQTDKyftpI22FVGpx8bkpKyYXBlNge6zSo0pl5/qJvBAnzaD76Vu2AsP16d6mTj478Ldn2mhgrWV+Xr0vQ==}
-    peerDependencies:
-      eslint: '>= 3.2.1'
-
-  eslint-plugin-import@2.31.0:
-    resolution: {integrity: sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==}
-    engines: {node: '>=4'}
-    peerDependencies:
-      '@typescript-eslint/parser': '*'
-      eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9
-    peerDependenciesMeta:
-      '@typescript-eslint/parser':
-        optional: true
-
-  eslint-plugin-jest@27.9.0:
-    resolution: {integrity: sha512-QIT7FH7fNmd9n4se7FFKHbsLKGQiw885Ds6Y/sxKgCZ6natwCsXdgPOADnYVxN2QrRweF0FZWbJ6S7Rsn7llug==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    peerDependencies:
-      '@typescript-eslint/eslint-plugin': ^5.0.0 || ^6.0.0 || ^7.0.0
-      eslint: ^7.0.0 || ^8.0.0
-      jest: '*'
-    peerDependenciesMeta:
-      '@typescript-eslint/eslint-plugin':
-        optional: true
-      jest:
-        optional: true
-
-  eslint-plugin-jsx-a11y@6.10.1:
-    resolution: {integrity: sha512-zHByM9WTUMnfsDTafGXRiqxp6lFtNoSOWBY6FonVRn3A+BUwN1L/tdBXT40BcBJi0cZjOGTXZ0eD/rTG9fEJ0g==}
-    engines: {node: '>=4.0'}
-    peerDependencies:
-      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9
-
-  eslint-plugin-prettier@4.2.1:
-    resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==}
-    engines: {node: '>=12.0.0'}
-    peerDependencies:
-      eslint: '>=7.28.0'
-      eslint-config-prettier: '*'
-      prettier: '>=2.0.0'
-    peerDependenciesMeta:
-      eslint-config-prettier:
-        optional: true
-
-  eslint-plugin-promise@6.6.0:
-    resolution: {integrity: sha512-57Zzfw8G6+Gq7axm2Pdo3gW/Rx3h9Yywgn61uE/3elTCOePEHVrn2i5CdfBwA1BLK0Q0WqctICIUSqXZW/VprQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
-
-  eslint-plugin-react-hooks@5.0.0-canary-7118f5dd7-20230705:
-    resolution: {integrity: sha512-AZYbMo/NW9chdL7vk6HQzQhT+PvTAEVqWk9ziruUoW2kAOcN5qNyelv70e0F1VNQAbvutOC9oc+xfWycI9FxDw==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
-
-  eslint-plugin-react@7.37.2:
-    resolution: {integrity: sha512-EsTAnj9fLVr/GZleBLFbj/sSuXeWmp1eXIN60ceYnZveqEaUCyW4X+Vh4WTdUhCkW4xutXYqTXCUSyqD4rB75w==}
-    engines: {node: '>=4'}
-    peerDependencies:
-      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7
-
-  eslint-scope@5.1.1:
-    resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
-    engines: {node: '>=8.0.0'}
-
-  eslint-scope@7.2.2:
-    resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-
-  eslint-visitor-keys@3.4.3:
-    resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-
-  eslint@8.57.1:
-    resolution: {integrity: sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options.
-    hasBin: true
-
-  espree@9.6.1:
-    resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-
-  esprima@4.0.1:
-    resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
-    engines: {node: '>=4'}
-    hasBin: true
-
-  esquery@1.6.0:
-    resolution: {integrity: sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==}
-    engines: {node: '>=0.10'}
-
-  esrecurse@4.3.0:
-    resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
-    engines: {node: '>=4.0'}
-
-  estraverse@4.3.0:
-    resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==}
-    engines: {node: '>=4.0'}
-
-  estraverse@5.3.0:
-    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
-    engines: {node: '>=4.0'}
-
-  estree-walker@0.6.1:
-    resolution: {integrity: sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==}
-
-  estree-walker@2.0.2:
-    resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
-
-  esutils@2.0.3:
-    resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
-    engines: {node: '>=0.10.0'}
-
-  eventemitter2@6.4.7:
-    resolution: {integrity: sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==}
-
-  eventemitter3@4.0.7:
-    resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
-
-  eventemitter3@5.0.1:
-    resolution: {integrity: sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==}
-
-  execa@4.1.0:
-    resolution: {integrity: sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==}
-    engines: {node: '>=10'}
-
-  execa@5.1.1:
-    resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==}
-    engines: {node: '>=10'}
-
-  execa@7.2.0:
-    resolution: {integrity: sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==}
-    engines: {node: ^14.18.0 || ^16.14.0 || >=18.0.0}
-
-  executable@4.1.1:
-    resolution: {integrity: sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==}
-    engines: {node: '>=4'}
-
-  exit@0.1.2:
-    resolution: {integrity: sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==}
-    engines: {node: '>= 0.8.0'}
-
-  expect@29.7.0:
-    resolution: {integrity: sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  extend@3.0.2:
-    resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==}
-
-  extract-react-intl-messages@4.1.1:
-    resolution: {integrity: sha512-dPogci5X7HVtV7VbUxajH/1YgfNRaW2VtEiVidZ/31Tq8314uzOtzVMNo0IrAPD2E+H1wHoPiu/j565TZsyIZg==}
-    engines: {node: '>=10'}
-    hasBin: true
-
-  extract-zip@2.0.1:
-    resolution: {integrity: sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==}
-    engines: {node: '>= 10.17.0'}
-    hasBin: true
-
-  extsprintf@1.3.0:
-    resolution: {integrity: sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==}
-    engines: {'0': node >=0.6.0}
-
-  fast-deep-equal@3.1.3:
-    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
-
-  fast-diff@1.3.0:
-    resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==}
-
-  fast-glob@3.3.2:
-    resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==}
-    engines: {node: '>=8.6.0'}
-
-  fast-json-stable-stringify@2.1.0:
-    resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
-
-  fast-levenshtein@2.0.6:
-    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
-
-  fast-uri@3.0.3:
-    resolution: {integrity: sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==}
-
-  fastest-levenshtein@1.0.16:
-    resolution: {integrity: sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==}
-    engines: {node: '>= 4.9.1'}
-
-  fastq@1.17.1:
-    resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==}
-
-  fb-watchman@2.0.2:
-    resolution: {integrity: sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==}
-
-  fd-slicer@1.1.0:
-    resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==}
-
-  fetch-blob@3.2.0:
-    resolution: {integrity: sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==}
-    engines: {node: ^12.20 || >= 14.13}
-
-  figures@3.2.0:
-    resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==}
-    engines: {node: '>=8'}
-
-  file-entry-cache@6.0.1:
-    resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
-    engines: {node: ^10.12.0 || >=12.0.0}
-
-  file-entry-cache@7.0.2:
-    resolution: {integrity: sha512-TfW7/1iI4Cy7Y8L6iqNdZQVvdXn0f8B4QcIXmkIbtTIe/Okm/nSlHb4IwGzRVOd3WfSieCgvf5cMzEfySAIl0g==}
-    engines: {node: '>=12.0.0'}
-
-  filelist@1.0.4:
-    resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==}
-
-  fill-range@7.1.1:
-    resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
-    engines: {node: '>=8'}
-
-  find-up@4.1.0:
-    resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}
-    engines: {node: '>=8'}
-
-  find-up@5.0.0:
-    resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
-    engines: {node: '>=10'}
-
-  flat-cache@3.2.0:
-    resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==}
-    engines: {node: ^10.12.0 || >=12.0.0}
-
-  flat@5.0.2:
-    resolution: {integrity: sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==}
-    hasBin: true
-
-  flatted@3.3.1:
-    resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==}
-
-  for-each@0.3.3:
-    resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
-
-  foreground-child@3.3.0:
-    resolution: {integrity: sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==}
-    engines: {node: '>=14'}
-
-  forever-agent@0.6.1:
-    resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==}
-
-  form-data@4.0.1:
-    resolution: {integrity: sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==}
-    engines: {node: '>= 6'}
-
-  formdata-polyfill@4.0.10:
-    resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==}
-    engines: {node: '>=12.20.0'}
-
-  fraction.js@4.3.7:
-    resolution: {integrity: sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==}
-
-  fs-extra@10.1.0:
-    resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
-    engines: {node: '>=12'}
-
-  fs-extra@8.1.0:
-    resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==}
-    engines: {node: '>=6 <7 || >=8'}
-
-  fs-extra@9.1.0:
-    resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==}
-    engines: {node: '>=10'}
-
-  fs-minipass@2.1.0:
-    resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==}
-    engines: {node: '>= 8'}
-
-  fs.realpath@1.0.0:
-    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
-
-  fsevents@2.3.3:
-    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
-    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
-    os: [darwin]
-
-  function-bind@1.1.2:
-    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
-
-  function.prototype.name@1.1.6:
-    resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==}
-    engines: {node: '>= 0.4'}
-
-  functions-have-names@1.2.3:
-    resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
-
-  generic-names@4.0.0:
-    resolution: {integrity: sha512-ySFolZQfw9FoDb3ed9d80Cm9f0+r7qj+HJkWjeD9RBfpxEVTlVhol+gvaQB/78WbwYfbnNh8nWHHBSlg072y6A==}
-
-  generic-pool@3.9.0:
-    resolution: {integrity: sha512-hymDOu5B53XvN4QT9dBmZxPX4CWhBPPLguTZ9MMFeFa/Kg0xWVfylOVNlJji/E7yTZWFd/q9GO5TxDLq156D7g==}
-    engines: {node: '>= 4'}
-
-  gensync@1.0.0-beta.2:
-    resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
-    engines: {node: '>=6.9.0'}
-
-  get-caller-file@2.0.5:
-    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
-    engines: {node: 6.* || 8.* || >= 10.*}
-
-  get-intrinsic@1.2.4:
-    resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==}
-    engines: {node: '>= 0.4'}
-
-  get-package-type@0.1.0:
-    resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==}
-    engines: {node: '>=8.0.0'}
-
-  get-stream@5.2.0:
-    resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
-    engines: {node: '>=8'}
-
-  get-stream@6.0.1:
-    resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
-    engines: {node: '>=10'}
-
-  get-symbol-description@1.0.2:
-    resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==}
-    engines: {node: '>= 0.4'}
-
-  get-tsconfig@4.8.1:
-    resolution: {integrity: sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg==}
-
-  getos@3.2.1:
-    resolution: {integrity: sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==}
-
-  getpass@0.1.7:
-    resolution: {integrity: sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==}
-
-  glob-parent@5.1.2:
-    resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
-    engines: {node: '>= 6'}
-
-  glob-parent@6.0.2:
-    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
-    engines: {node: '>=10.13.0'}
-
-  glob@10.3.10:
-    resolution: {integrity: sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==}
-    engines: {node: '>=16 || 14 >=14.17'}
-    hasBin: true
-
-  glob@7.2.3:
-    resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
-    deprecated: Glob versions prior to v9 are no longer supported
-
-  glob@8.1.0:
-    resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==}
-    engines: {node: '>=12'}
-    deprecated: Glob versions prior to v9 are no longer supported
-
-  global-dirs@3.0.1:
-    resolution: {integrity: sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==}
-    engines: {node: '>=10'}
-
-  global-modules@2.0.0:
-    resolution: {integrity: sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==}
-    engines: {node: '>=6'}
-
-  global-prefix@3.0.0:
-    resolution: {integrity: sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==}
-    engines: {node: '>=6'}
-
-  globals@11.12.0:
-    resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
-    engines: {node: '>=4'}
-
-  globals@13.24.0:
-    resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==}
-    engines: {node: '>=8'}
-
-  globalthis@1.0.4:
-    resolution: {integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==}
-    engines: {node: '>= 0.4'}
-
-  globby@10.0.1:
-    resolution: {integrity: sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==}
-    engines: {node: '>=8'}
-
-  globby@10.0.2:
-    resolution: {integrity: sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==}
-    engines: {node: '>=8'}
-
-  globby@11.1.0:
-    resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
-    engines: {node: '>=10'}
-
-  globjoin@0.1.4:
-    resolution: {integrity: sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==}
-
-  gonzales-pe@4.3.0:
-    resolution: {integrity: sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==}
-    engines: {node: '>=0.6.0'}
-    hasBin: true
-
-  gopd@1.0.1:
-    resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
-
-  graceful-fs@4.2.11:
-    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
-
-  graphemer@1.4.0:
-    resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
-
-  hard-rejection@2.1.0:
-    resolution: {integrity: sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==}
-    engines: {node: '>=6'}
-
-  has-bigints@1.0.2:
-    resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}
-
-  has-flag@3.0.0:
-    resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
-    engines: {node: '>=4'}
-
-  has-flag@4.0.0:
-    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
-    engines: {node: '>=8'}
-
-  has-property-descriptors@1.0.2:
-    resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}
-
-  has-proto@1.0.3:
-    resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==}
-    engines: {node: '>= 0.4'}
-
-  has-symbols@1.0.3:
-    resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
-    engines: {node: '>= 0.4'}
-
-  has-tostringtag@1.0.2:
-    resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
-    engines: {node: '>= 0.4'}
-
-  hasown@2.0.2:
-    resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
-    engines: {node: '>= 0.4'}
-
-  hoist-non-react-statics@3.3.2:
-    resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==}
-
-  hosted-git-info@2.8.9:
-    resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==}
-
-  hosted-git-info@4.1.0:
-    resolution: {integrity: sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==}
-    engines: {node: '>=10'}
-
-  html-escaper@2.0.2:
-    resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
-
-  html-tags@3.3.1:
-    resolution: {integrity: sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==}
-    engines: {node: '>=8'}
-
-  http-signature@1.4.0:
-    resolution: {integrity: sha512-G5akfn7eKbpDN+8nPS/cb57YeA1jLTVxjpCj7tmm3QKPdyDy7T+qSC40e9ptydSWvkwjSXw1VbkpyEm39ukeAg==}
-    engines: {node: '>=0.10'}
-
-  human-signals@1.1.1:
-    resolution: {integrity: sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==}
-    engines: {node: '>=8.12.0'}
-
-  human-signals@2.1.0:
-    resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
-    engines: {node: '>=10.17.0'}
-
-  human-signals@4.3.1:
-    resolution: {integrity: sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==}
-    engines: {node: '>=14.18.0'}
-
-  husky@8.0.3:
-    resolution: {integrity: sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==}
-    engines: {node: '>=14'}
-    hasBin: true
-
-  icss-replace-symbols@1.1.0:
-    resolution: {integrity: sha512-chIaY3Vh2mh2Q3RGXttaDIzeiPvaVXJ+C4DAh/w3c37SKZ/U6PGMmuicR2EQQp9bKG8zLMCl7I+PtIoOOPp8Gg==}
-
-  icss-utils@5.1.0:
-    resolution: {integrity: sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==}
-    engines: {node: ^10 || ^12 || >= 14}
-    peerDependencies:
-      postcss: ^8.1.0
-
-  ieee754@1.2.1:
-    resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
-
-  ignore@5.3.2:
-    resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
-    engines: {node: '>= 4'}
-
-  immer@9.0.21:
-    resolution: {integrity: sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==}
-
-  import-cwd@3.0.0:
-    resolution: {integrity: sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==}
-    engines: {node: '>=8'}
-
-  import-fresh@3.3.0:
-    resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
-    engines: {node: '>=6'}
-
-  import-from@3.0.0:
-    resolution: {integrity: sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==}
-    engines: {node: '>=8'}
-
-  import-lazy@4.0.0:
-    resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==}
-    engines: {node: '>=8'}
-
-  import-local@3.2.0:
-    resolution: {integrity: sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==}
-    engines: {node: '>=8'}
-    hasBin: true
-
-  imurmurhash@0.1.4:
-    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
-    engines: {node: '>=0.8.19'}
-
-  indent-string@4.0.0:
-    resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}
-    engines: {node: '>=8'}
-
-  indent-string@5.0.0:
-    resolution: {integrity: sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==}
-    engines: {node: '>=12'}
-
-  inflight@1.0.6:
-    resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
-    deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
-
-  inherits@2.0.4:
-    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
-
-  ini@1.3.8:
-    resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
-
-  ini@2.0.0:
-    resolution: {integrity: sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==}
-    engines: {node: '>=10'}
-
-  internal-slot@1.0.7:
-    resolution: {integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==}
-    engines: {node: '>= 0.4'}
-
-  internmap@1.0.1:
-    resolution: {integrity: sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==}
-
-  intl-messageformat-parser@5.5.1:
-    resolution: {integrity: sha512-TvB3LqF2VtP6yI6HXlRT5TxX98HKha6hCcrg9dwlPwNaedVNuQA9KgBdtWKgiyakyCTYHQ+KJeFEstNKfZr64w==}
-    deprecated: We've written a new parser that's 6x faster and is backwards compatible. Please use @formatjs/icu-messageformat-parser
-
-  intl-messageformat-parser@6.1.2:
-    resolution: {integrity: sha512-4GQDEPhl/ZMNDKwMsLqyw1LG2IAWjmLJXdmnRcHKeLQzpgtNYZI6lVw1279pqIkRk2MfKb9aDsVFzm565azK5A==}
-    deprecated: We've written a new parser that's 6x faster and is backwards compatible. Please use @formatjs/icu-messageformat-parser
-
-  intl-messageformat@10.7.3:
-    resolution: {integrity: sha512-AAo/3oyh7ROfPhDuh7DxTTydh97OC+lv7h1Eq5LuHWuLsUMKOhtzTYuyXlUReuwZ9vANDHo4CS1bGRrn7TZRtg==}
-
-  ipaddr.js@2.2.0:
-    resolution: {integrity: sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==}
-    engines: {node: '>= 10'}
-
-  is-array-buffer@3.0.4:
-    resolution: {integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==}
-    engines: {node: '>= 0.4'}
-
-  is-arrayish@0.2.1:
-    resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
-
-  is-async-function@2.0.0:
-    resolution: {integrity: sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==}
-    engines: {node: '>= 0.4'}
-
-  is-bigint@1.0.4:
-    resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==}
-
-  is-boolean-object@1.1.2:
-    resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==}
-    engines: {node: '>= 0.4'}
-
-  is-buffer@1.1.6:
-    resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==}
-
-  is-bun-module@1.2.1:
-    resolution: {integrity: sha512-AmidtEM6D6NmUiLOvvU7+IePxjEjOzra2h0pSrsfSAcXwl/83zLLXDByafUJy9k/rKK0pvXMLdwKwGHlX2Ke6Q==}
-
-  is-callable@1.2.7:
-    resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
-    engines: {node: '>= 0.4'}
-
-  is-ci@3.0.1:
-    resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==}
-    hasBin: true
-
-  is-core-module@2.15.1:
-    resolution: {integrity: sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==}
-    engines: {node: '>= 0.4'}
-
-  is-data-view@1.0.1:
-    resolution: {integrity: sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==}
-    engines: {node: '>= 0.4'}
-
-  is-date-object@1.0.5:
-    resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
-    engines: {node: '>= 0.4'}
-
-  is-docker@3.0.0:
-    resolution: {integrity: sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    hasBin: true
-
-  is-extglob@2.1.1:
-    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
-    engines: {node: '>=0.10.0'}
-
-  is-finalizationregistry@1.0.2:
-    resolution: {integrity: sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==}
-
-  is-fullwidth-code-point@3.0.0:
-    resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
-    engines: {node: '>=8'}
-
-  is-fullwidth-code-point@4.0.0:
-    resolution: {integrity: sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==}
-    engines: {node: '>=12'}
-
-  is-generator-fn@2.1.0:
-    resolution: {integrity: sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==}
-    engines: {node: '>=6'}
-
-  is-generator-function@1.0.10:
-    resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==}
-    engines: {node: '>= 0.4'}
-
-  is-glob@4.0.3:
-    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
-    engines: {node: '>=0.10.0'}
-
-  is-installed-globally@0.4.0:
-    resolution: {integrity: sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==}
-    engines: {node: '>=10'}
-
-  is-localhost-ip@1.4.0:
-    resolution: {integrity: sha512-cN7SzlY7BVxSeoJu5equjsZaKSgD4HCfXrTwu0Jgbq5BbT1BU+D7Lyi/l1KO8H0un0JTlxcQaT/GWVapu+DIDg==}
-    engines: {node: '>=10'}
-
-  is-map@2.0.3:
-    resolution: {integrity: sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==}
-    engines: {node: '>= 0.4'}
-
-  is-module@1.0.0:
-    resolution: {integrity: sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==}
-
-  is-negative-zero@2.0.3:
-    resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==}
-    engines: {node: '>= 0.4'}
-
-  is-number-object@1.0.7:
-    resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==}
-    engines: {node: '>= 0.4'}
-
-  is-number@7.0.0:
-    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
-    engines: {node: '>=0.12.0'}
-
-  is-path-cwd@2.2.0:
-    resolution: {integrity: sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==}
-    engines: {node: '>=6'}
-
-  is-path-inside@3.0.3:
-    resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
-    engines: {node: '>=8'}
-
-  is-plain-obj@1.1.0:
-    resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==}
-    engines: {node: '>=0.10.0'}
-
-  is-plain-obj@2.1.0:
-    resolution: {integrity: sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==}
-    engines: {node: '>=8'}
-
-  is-plain-object@3.0.1:
-    resolution: {integrity: sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==}
-    engines: {node: '>=0.10.0'}
-
-  is-plain-object@5.0.0:
-    resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
-    engines: {node: '>=0.10.0'}
-
-  is-reference@1.2.1:
-    resolution: {integrity: sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==}
-
-  is-regex@1.1.4:
-    resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
-    engines: {node: '>= 0.4'}
-
-  is-set@2.0.3:
-    resolution: {integrity: sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==}
-    engines: {node: '>= 0.4'}
-
-  is-shared-array-buffer@1.0.3:
-    resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==}
-    engines: {node: '>= 0.4'}
-
-  is-stream@2.0.1:
-    resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
-    engines: {node: '>=8'}
-
-  is-stream@3.0.0:
-    resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
-  is-string@1.0.7:
-    resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
-    engines: {node: '>= 0.4'}
-
-  is-symbol@1.0.4:
-    resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
-    engines: {node: '>= 0.4'}
-
-  is-typed-array@1.1.13:
-    resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==}
-    engines: {node: '>= 0.4'}
-
-  is-typedarray@1.0.0:
-    resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==}
-
-  is-unicode-supported@0.1.0:
-    resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}
-    engines: {node: '>=10'}
-
-  is-weakmap@2.0.2:
-    resolution: {integrity: sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==}
-    engines: {node: '>= 0.4'}
-
-  is-weakref@1.0.2:
-    resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
-
-  is-weakset@2.0.3:
-    resolution: {integrity: sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==}
-    engines: {node: '>= 0.4'}
-
-  isarray@2.0.5:
-    resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
-
-  isbot@5.1.17:
-    resolution: {integrity: sha512-/wch8pRKZE+aoVhRX/hYPY1C7dMCeeMyhkQLNLNlYAbGQn9bkvMB8fOUXNnk5I0m4vDYbBJ9ciVtkr9zfBJ7qA==}
-    engines: {node: '>=18'}
-
-  isexe@2.0.0:
-    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
-
-  isstream@0.1.2:
-    resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==}
-
-  istanbul-lib-coverage@3.2.2:
-    resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==}
-    engines: {node: '>=8'}
-
-  istanbul-lib-instrument@5.2.1:
-    resolution: {integrity: sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==}
-    engines: {node: '>=8'}
-
-  istanbul-lib-instrument@6.0.3:
-    resolution: {integrity: sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==}
-    engines: {node: '>=10'}
-
-  istanbul-lib-report@3.0.1:
-    resolution: {integrity: sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==}
-    engines: {node: '>=10'}
-
-  istanbul-lib-source-maps@4.0.1:
-    resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==}
-    engines: {node: '>=10'}
-
-  istanbul-reports@3.1.7:
-    resolution: {integrity: sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==}
-    engines: {node: '>=8'}
-
-  iterator.prototype@1.1.3:
-    resolution: {integrity: sha512-FW5iMbeQ6rBGm/oKgzq2aW4KvAGpxPzYES8N4g4xNXUKpL1mclMvOe+76AcLDTvD+Ze+sOpVhgdAQEKF4L9iGQ==}
-    engines: {node: '>= 0.4'}
-
-  jackspeak@2.3.6:
-    resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==}
-    engines: {node: '>=14'}
-
-  jake@10.9.2:
-    resolution: {integrity: sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==}
-    engines: {node: '>=10'}
-    hasBin: true
-
-  jest-changed-files@29.7.0:
-    resolution: {integrity: sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  jest-circus@29.7.0:
-    resolution: {integrity: sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  jest-cli@29.7.0:
-    resolution: {integrity: sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    hasBin: true
-    peerDependencies:
-      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-    peerDependenciesMeta:
-      node-notifier:
-        optional: true
-
-  jest-config@29.7.0:
-    resolution: {integrity: sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    peerDependencies:
-      '@types/node': '*'
-      ts-node: '>=9.0.0'
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      ts-node:
-        optional: true
-
-  jest-diff@29.7.0:
-    resolution: {integrity: sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  jest-docblock@29.7.0:
-    resolution: {integrity: sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  jest-each@29.7.0:
-    resolution: {integrity: sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  jest-environment-node@29.7.0:
-    resolution: {integrity: sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  jest-get-type@29.6.3:
-    resolution: {integrity: sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  jest-haste-map@29.7.0:
-    resolution: {integrity: sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  jest-leak-detector@29.7.0:
-    resolution: {integrity: sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  jest-matcher-utils@29.7.0:
-    resolution: {integrity: sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  jest-message-util@29.7.0:
-    resolution: {integrity: sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  jest-mock@29.7.0:
-    resolution: {integrity: sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  jest-pnp-resolver@1.2.3:
-    resolution: {integrity: sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==}
-    engines: {node: '>=6'}
-    peerDependencies:
-      jest-resolve: '*'
-    peerDependenciesMeta:
-      jest-resolve:
-        optional: true
-
-  jest-regex-util@29.6.3:
-    resolution: {integrity: sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  jest-resolve-dependencies@29.7.0:
-    resolution: {integrity: sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  jest-resolve@29.7.0:
-    resolution: {integrity: sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  jest-runner@29.7.0:
-    resolution: {integrity: sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  jest-runtime@29.7.0:
-    resolution: {integrity: sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  jest-snapshot@29.7.0:
-    resolution: {integrity: sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  jest-util@29.7.0:
-    resolution: {integrity: sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  jest-validate@29.7.0:
-    resolution: {integrity: sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  jest-watcher@29.7.0:
-    resolution: {integrity: sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  jest-worker@26.6.2:
-    resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==}
-    engines: {node: '>= 10.13.0'}
-
-  jest-worker@29.7.0:
-    resolution: {integrity: sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  jest@29.7.0:
-    resolution: {integrity: sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    hasBin: true
-    peerDependencies:
-      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-    peerDependenciesMeta:
-      node-notifier:
-        optional: true
-
-  joycon@3.1.1:
-    resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==}
-    engines: {node: '>=10'}
-
-  js-tokens@4.0.0:
-    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
-
-  js-yaml@3.14.1:
-    resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}
-    hasBin: true
-
-  js-yaml@4.1.0:
-    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
-    hasBin: true
-
-  jsbn@0.1.1:
-    resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==}
-
-  jsesc@3.0.2:
-    resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==}
-    engines: {node: '>=6'}
-    hasBin: true
-
-  json-buffer@3.0.1:
-    resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
-
-  json-parse-better-errors@1.0.2:
-    resolution: {integrity: sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==}
-
-  json-parse-even-better-errors@2.3.1:
-    resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
-
-  json-schema-traverse@0.4.1:
-    resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
-
-  json-schema-traverse@1.0.0:
-    resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
-
-  json-schema@0.4.0:
-    resolution: {integrity: sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==}
-
-  json-stable-stringify-without-jsonify@1.0.1:
-    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
-
-  json-stable-stringify@1.1.1:
-    resolution: {integrity: sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==}
-    engines: {node: '>= 0.4'}
-
-  json-stringify-safe@5.0.1:
-    resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==}
-
-  json5@1.0.2:
-    resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
-    hasBin: true
-
-  json5@2.2.3:
-    resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
-    engines: {node: '>=6'}
-    hasBin: true
-
-  jsonc-parser@3.3.1:
-    resolution: {integrity: sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==}
-
-  jsonfile@4.0.0:
-    resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==}
-
-  jsonfile@6.1.0:
-    resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
-
-  jsonify@0.0.1:
-    resolution: {integrity: sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==}
-
-  jsonwebtoken@9.0.2:
-    resolution: {integrity: sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==}
-    engines: {node: '>=12', npm: '>=6'}
-
-  jsprim@2.0.2:
-    resolution: {integrity: sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==}
-    engines: {'0': node >=0.6.0}
-
-  jsx-ast-utils@3.3.5:
-    resolution: {integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==}
-    engines: {node: '>=4.0'}
-
-  jwa@1.4.1:
-    resolution: {integrity: sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==}
-
-  jws@3.2.2:
-    resolution: {integrity: sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==}
-
-  kafkajs@2.2.4:
-    resolution: {integrity: sha512-j/YeapB1vfPT2iOIUn/vxdyKEuhuY2PxMBvf5JWux6iSaukAccrMtXEY/Lb7OvavDhOWME589bpLrEdnVHjfjA==}
-    engines: {node: '>=14.0.0'}
-
-  keyv@4.5.4:
-    resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
-
-  kind-of@6.0.3:
-    resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
-    engines: {node: '>=0.10.0'}
-
-  kleur@3.0.3:
-    resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
-    engines: {node: '>=6'}
-
-  known-css-properties@0.29.0:
-    resolution: {integrity: sha512-Ne7wqW7/9Cz54PDt4I3tcV+hAyat8ypyOGzYRJQfdxnnjeWsTxt1cy8pjvvKeI5kfXuyvULyeeAvwvvtAX3ayQ==}
-
-  known-css-properties@0.34.0:
-    resolution: {integrity: sha512-tBECoUqNFbyAY4RrbqsBQqDFpGXAEbdD5QKr8kACx3+rnArmuuR22nKQWKazvp07N9yjTyDZaw/20UIH8tL9DQ==}
-
-  language-subtag-registry@0.3.23:
-    resolution: {integrity: sha512-0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ==}
-
-  language-tags@1.0.9:
-    resolution: {integrity: sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==}
-    engines: {node: '>=0.10'}
-
-  lazy-ass@1.6.0:
-    resolution: {integrity: sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==}
-    engines: {node: '> 0.8'}
-
-  leven@3.1.0:
-    resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==}
-    engines: {node: '>=6'}
-
-  levn@0.4.1:
-    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
-    engines: {node: '>= 0.8.0'}
-
-  lilconfig@2.1.0:
-    resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==}
-    engines: {node: '>=10'}
-
-  lines-and-columns@1.2.4:
-    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
-
-  lint-staged@14.0.1:
-    resolution: {integrity: sha512-Mw0cL6HXnHN1ag0mN/Dg4g6sr8uf8sn98w2Oc1ECtFto9tvRF7nkXGJRbx8gPlHyoR0pLyBr2lQHbWwmUHe1Sw==}
-    engines: {node: ^16.14.0 || >=18.0.0}
-    hasBin: true
-
-  listr2@3.14.0:
-    resolution: {integrity: sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==}
-    engines: {node: '>=10.0.0'}
-    peerDependencies:
-      enquirer: '>= 2.3.0 < 3'
-    peerDependenciesMeta:
-      enquirer:
-        optional: true
-
-  listr2@6.6.1:
-    resolution: {integrity: sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg==}
-    engines: {node: '>=16.0.0'}
-    peerDependencies:
-      enquirer: '>= 2.3.0 < 3'
-    peerDependenciesMeta:
-      enquirer:
-        optional: true
-
-  load-json-file@4.0.0:
-    resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
-    engines: {node: '>=4'}
-
-  load-json-file@6.2.0:
-    resolution: {integrity: sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ==}
-    engines: {node: '>=8'}
-
-  loader-utils@3.3.1:
-    resolution: {integrity: sha512-FMJTLMXfCLMLfJxcX9PFqX5qD88Z5MRGaZCVzfuqeZSPsyiBzs+pahDQjbIWz2QIzPZz0NX9Zy4FX3lmK6YHIg==}
-    engines: {node: '>= 12.13.0'}
-
-  locate-path@5.0.0:
-    resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
-    engines: {node: '>=8'}
-
-  locate-path@6.0.0:
-    resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
-    engines: {node: '>=10'}
-
-  lodash-es@4.17.21:
-    resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
-
-  lodash.camelcase@4.3.0:
-    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
-
-  lodash.debounce@4.0.8:
-    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
-
-  lodash.includes@4.3.0:
-    resolution: {integrity: sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==}
-
-  lodash.isboolean@3.0.3:
-    resolution: {integrity: sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==}
-
-  lodash.isinteger@4.0.4:
-    resolution: {integrity: sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==}
-
-  lodash.isnumber@3.0.3:
-    resolution: {integrity: sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==}
-
-  lodash.isplainobject@4.0.6:
-    resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
-
-  lodash.isstring@4.0.1:
-    resolution: {integrity: sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==}
-
-  lodash.memoize@4.1.2:
-    resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==}
-
-  lodash.merge@4.6.2:
-    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
-
-  lodash.mergewith@4.6.2:
-    resolution: {integrity: sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==}
-
-  lodash.once@4.1.1:
-    resolution: {integrity: sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==}
-
-  lodash.pick@4.4.0:
-    resolution: {integrity: sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==}
-
-  lodash.truncate@4.4.2:
-    resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
-
-  lodash.uniq@4.5.0:
-    resolution: {integrity: sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==}
-
-  lodash@4.17.21:
-    resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
-
-  log-symbols@4.1.0:
-    resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
-    engines: {node: '>=10'}
-
-  log-update@4.0.0:
-    resolution: {integrity: sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==}
-    engines: {node: '>=10'}
-
-  log-update@5.0.1:
-    resolution: {integrity: sha512-5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
-  loose-envify@1.4.0:
-    resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
-    hasBin: true
-
-  loud-rejection@2.2.0:
-    resolution: {integrity: sha512-S0FayMXku80toa5sZ6Ro4C+s+EtFDCsyJNG/AzFMfX3AxD5Si4dZsgzm/kKnbOxHl5Cv8jBlno8+3XYIh2pNjQ==}
-    engines: {node: '>=8'}
-
-  lower-case@2.0.2:
-    resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
-
-  lru-cache@10.4.3:
-    resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
-
-  lru-cache@5.1.1:
-    resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
-
-  lru-cache@6.0.0:
-    resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
-    engines: {node: '>=10'}
-
-  magic-string@0.30.12:
-    resolution: {integrity: sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==}
-
-  make-dir@3.1.0:
-    resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
-    engines: {node: '>=8'}
-
-  make-dir@4.0.0:
-    resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==}
-    engines: {node: '>=10'}
-
-  make-error@1.3.6:
-    resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
-
-  makeerror@1.0.12:
-    resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==}
-
-  map-obj@1.0.1:
-    resolution: {integrity: sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==}
-    engines: {node: '>=0.10.0'}
-
-  map-obj@4.3.0:
-    resolution: {integrity: sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==}
-    engines: {node: '>=8'}
-
-  mathml-tag-names@2.1.3:
-    resolution: {integrity: sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==}
-
-  maxmind@4.3.22:
-    resolution: {integrity: sha512-dfLO11mE77ELTEIXNezfW0eslodsFLsZ1lQkLauP+5Zsg1m7kCGtljqRyVOd9E5Ne2RJgvY6UU09qvnVocOZvA==}
-    engines: {node: '>=12', npm: '>=6'}
-
-  md5@2.3.0:
-    resolution: {integrity: sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==}
-
-  mdn-data@2.0.14:
-    resolution: {integrity: sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==}
-
-  mdn-data@2.0.28:
-    resolution: {integrity: sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==}
-
-  mdn-data@2.0.30:
-    resolution: {integrity: sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==}
-
-  mdn-data@2.10.0:
-    resolution: {integrity: sha512-qq7C3EtK3yJXMwz1zAab65pjl+UhohqMOctTgcqjLOWABqmwj+me02LSsCuEUxnst9X1lCBpoE0WArGKgdGDzw==}
-
-  mdn-data@2.11.1:
-    resolution: {integrity: sha512-Hdx3wmyqPFrhd6YHVuSkUK2eIGAcxR0xlndcgZqjA68yMJTbfXrjJwbgsBOsNjI7LnBIVUQnmyMVSdi/ob0GpQ==}
-
-  memoize-one@5.2.1:
-    resolution: {integrity: sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==}
-
-  memorystream@0.3.1:
-    resolution: {integrity: sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==}
-    engines: {node: '>= 0.10.0'}
-
-  meow@10.1.5:
-    resolution: {integrity: sha512-/d+PQ4GKmGvM9Bee/DPa8z3mXs/pkvJE2KEThngVNOqtmljC6K7NMPxtc2JeZYTmpWb9k/TmxjeL18ez3h7vCw==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
-  meow@6.1.1:
-    resolution: {integrity: sha512-3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg==}
-    engines: {node: '>=8'}
-
-  merge-stream@2.0.0:
-    resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
-
-  merge2@1.4.1:
-    resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
-    engines: {node: '>= 8'}
-
-  micromatch@4.0.5:
-    resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==}
-    engines: {node: '>=8.6'}
-
-  micromatch@4.0.8:
-    resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
-    engines: {node: '>=8.6'}
-
-  mime-db@1.52.0:
-    resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
-    engines: {node: '>= 0.6'}
-
-  mime-types@2.1.35:
-    resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
-    engines: {node: '>= 0.6'}
-
-  mimic-fn@2.1.0:
-    resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
-    engines: {node: '>=6'}
-
-  mimic-fn@4.0.0:
-    resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}
-    engines: {node: '>=12'}
-
-  min-indent@1.0.1:
-    resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
-    engines: {node: '>=4'}
-
-  minimatch@3.1.2:
-    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
-
-  minimatch@5.1.6:
-    resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==}
-    engines: {node: '>=10'}
-
-  minimatch@9.0.3:
-    resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==}
-    engines: {node: '>=16 || 14 >=14.17'}
-
-  minimatch@9.0.5:
-    resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==}
-    engines: {node: '>=16 || 14 >=14.17'}
-
-  minimist-options@4.1.0:
-    resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==}
-    engines: {node: '>= 6'}
-
-  minimist@1.2.8:
-    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
-
-  minipass@3.3.6:
-    resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==}
-    engines: {node: '>=8'}
-
-  minipass@5.0.0:
-    resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==}
-    engines: {node: '>=8'}
-
-  minipass@7.1.2:
-    resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
-    engines: {node: '>=16 || 14 >=14.17'}
-
-  minizlib@2.1.2:
-    resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==}
-    engines: {node: '>= 8'}
-
-  mkdirp@1.0.4:
-    resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}
-    engines: {node: '>=10'}
-    hasBin: true
-
-  mmdb-lib@2.1.1:
-    resolution: {integrity: sha512-yx8H/1H5AfnufiLnzzPqPf4yr/dKU9IFT1rPVwSkrKWHsQEeVVd6+X+L0nUbXhlEFTu3y/7hu38CFmEVgzvyeg==}
-    engines: {node: '>=10', npm: '>=6'}
-
-  moment-timezone@0.5.46:
-    resolution: {integrity: sha512-ZXm9b36esbe7OmdABqIWJuBBiLLwAjrN7CE+7sYdCCx82Nabt1wHDj8TVseS59QIlfFPbOoiBPm6ca9BioG4hw==}
-
-  moment@2.30.1:
-    resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==}
-
-  ms@2.1.2:
-    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
-
-  ms@2.1.3:
-    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
-
-  nanoclone@0.2.1:
-    resolution: {integrity: sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==}
-
-  nanoid@3.3.7:
-    resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==}
-    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
-    hasBin: true
-
-  natural-compare@1.4.0:
-    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
-
-  next-basics@0.39.0:
-    resolution: {integrity: sha512-5HWf3u7jgx5n4auIkArFP5+EVdyz7kSvxs86o2V4y8/t3J4scdIHgI8BBE6UhzB17WMbMgVql44IfcJH1CQc/w==}
-    peerDependencies:
-      next: ^13.4.0
-      react: ^18.2.0
-      react-dom: ^18.2.0
-
-  next@14.2.10:
-    resolution: {integrity: sha512-sDDExXnh33cY3RkS9JuFEKaS4HmlWmDKP1VJioucCG6z5KuA008DPsDZOzi8UfqEk3Ii+2NCQSJrfbEWtZZfww==}
-    engines: {node: '>=18.17.0'}
-    hasBin: true
-    peerDependencies:
-      '@opentelemetry/api': ^1.1.0
-      '@playwright/test': ^1.41.2
-      react: ^18.2.0
-      react-dom: ^18.2.0
-      sass: ^1.3.0
-    peerDependenciesMeta:
-      '@opentelemetry/api':
-        optional: true
-      '@playwright/test':
-        optional: true
-      sass:
-        optional: true
-
-  nice-try@1.0.5:
-    resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
-
-  no-case@3.0.4:
-    resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
-
-  node-domexception@1.0.0:
-    resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
-    engines: {node: '>=10.5.0'}
-
-  node-fetch@3.3.2:
-    resolution: {integrity: sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
-  node-int64@0.4.0:
-    resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==}
-
-  node-releases@2.0.18:
-    resolution: {integrity: sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==}
-
-  normalize-package-data@2.5.0:
-    resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==}
-
-  normalize-package-data@3.0.3:
-    resolution: {integrity: sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==}
-    engines: {node: '>=10'}
-
-  normalize-path@3.0.0:
-    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
-    engines: {node: '>=0.10.0'}
-
-  normalize-range@0.1.2:
-    resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==}
-    engines: {node: '>=0.10.0'}
-
-  normalize-url@6.1.0:
-    resolution: {integrity: sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==}
-    engines: {node: '>=10'}
-
-  npm-run-all@4.1.5:
-    resolution: {integrity: sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==}
-    engines: {node: '>= 4'}
-    hasBin: true
-
-  npm-run-path@4.0.1:
-    resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
-    engines: {node: '>=8'}
-
-  npm-run-path@5.3.0:
-    resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
-  nth-check@2.1.1:
-    resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
-
-  object-assign@4.1.1:
-    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
-    engines: {node: '>=0.10.0'}
-
-  object-inspect@1.13.2:
-    resolution: {integrity: sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==}
-    engines: {node: '>= 0.4'}
-
-  object-keys@1.1.1:
-    resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
-    engines: {node: '>= 0.4'}
-
-  object.assign@4.1.5:
-    resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==}
-    engines: {node: '>= 0.4'}
-
-  object.entries@1.1.8:
-    resolution: {integrity: sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==}
-    engines: {node: '>= 0.4'}
-
-  object.fromentries@2.0.8:
-    resolution: {integrity: sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==}
-    engines: {node: '>= 0.4'}
-
-  object.groupby@1.0.3:
-    resolution: {integrity: sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==}
-    engines: {node: '>= 0.4'}
-
-  object.values@1.2.0:
-    resolution: {integrity: sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==}
-    engines: {node: '>= 0.4'}
-
-  once@1.4.0:
-    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
-
-  onetime@5.1.2:
-    resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}
-    engines: {node: '>=6'}
-
-  onetime@6.0.0:
-    resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==}
-    engines: {node: '>=12'}
-
-  optionator@0.9.4:
-    resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
-    engines: {node: '>= 0.8.0'}
-
-  ospath@1.2.2:
-    resolution: {integrity: sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==}
-
-  p-finally@1.0.0:
-    resolution: {integrity: sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==}
-    engines: {node: '>=4'}
-
-  p-limit@2.3.0:
-    resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
-    engines: {node: '>=6'}
-
-  p-limit@3.1.0:
-    resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
-    engines: {node: '>=10'}
-
-  p-locate@4.1.0:
-    resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
-    engines: {node: '>=8'}
-
-  p-locate@5.0.0:
-    resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
-    engines: {node: '>=10'}
-
-  p-map@3.0.0:
-    resolution: {integrity: sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==}
-    engines: {node: '>=8'}
-
-  p-map@4.0.0:
-    resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==}
-    engines: {node: '>=10'}
-
-  p-queue@6.6.2:
-    resolution: {integrity: sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==}
-    engines: {node: '>=8'}
-
-  p-timeout@3.2.0:
-    resolution: {integrity: sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==}
-    engines: {node: '>=8'}
-
-  p-try@2.2.0:
-    resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
-    engines: {node: '>=6'}
-
-  parent-module@1.0.1:
-    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
-    engines: {node: '>=6'}
-
-  parse-json@4.0.0:
-    resolution: {integrity: sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==}
-    engines: {node: '>=4'}
-
-  parse-json@5.2.0:
-    resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
-    engines: {node: '>=8'}
-
-  path-exists@4.0.0:
-    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
-    engines: {node: '>=8'}
-
-  path-is-absolute@1.0.1:
-    resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
-    engines: {node: '>=0.10.0'}
-
-  path-key@2.0.1:
-    resolution: {integrity: sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==}
-    engines: {node: '>=4'}
-
-  path-key@3.1.1:
-    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
-    engines: {node: '>=8'}
-
-  path-key@4.0.0:
-    resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==}
-    engines: {node: '>=12'}
-
-  path-parse@1.0.7:
-    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
-
-  path-scurry@1.11.1:
-    resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==}
-    engines: {node: '>=16 || 14 >=14.18'}
-
-  path-type@3.0.0:
-    resolution: {integrity: sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==}
-    engines: {node: '>=4'}
-
-  path-type@4.0.0:
-    resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
-    engines: {node: '>=8'}
-
-  pend@1.2.0:
-    resolution: {integrity: sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==}
-
-  performance-now@2.1.0:
-    resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==}
-
-  picocolors@1.1.1:
-    resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
-
-  picomatch@2.3.1:
-    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
-    engines: {node: '>=8.6'}
-
-  picomatch@4.0.2:
-    resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==}
-    engines: {node: '>=12'}
-
-  pidtree@0.3.1:
-    resolution: {integrity: sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==}
-    engines: {node: '>=0.10'}
-    hasBin: true
-
-  pidtree@0.6.0:
-    resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==}
-    engines: {node: '>=0.10'}
-    hasBin: true
-
-  pify@2.3.0:
-    resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
-    engines: {node: '>=0.10.0'}
-
-  pify@3.0.0:
-    resolution: {integrity: sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==}
-    engines: {node: '>=4'}
-
-  pify@5.0.0:
-    resolution: {integrity: sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==}
-    engines: {node: '>=10'}
-
-  pirates@4.0.6:
-    resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==}
-    engines: {node: '>= 6'}
-
-  pkg-dir@4.2.0:
-    resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
-    engines: {node: '>=8'}
-
-  possible-typed-array-names@1.0.0:
-    resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==}
-    engines: {node: '>= 0.4'}
-
-  postcss-attribute-case-insensitive@5.0.2:
-    resolution: {integrity: sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  postcss-calc@8.2.4:
-    resolution: {integrity: sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==}
-    peerDependencies:
-      postcss: ^8.2.2
-
-  postcss-clamp@4.1.0:
-    resolution: {integrity: sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==}
-    engines: {node: '>=7.6.0'}
-    peerDependencies:
-      postcss: ^8.4.6
-
-  postcss-color-functional-notation@4.2.4:
-    resolution: {integrity: sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  postcss-color-hex-alpha@8.0.4:
-    resolution: {integrity: sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.4
-
-  postcss-color-rebeccapurple@7.1.1:
-    resolution: {integrity: sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  postcss-colormin@5.3.1:
-    resolution: {integrity: sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  postcss-convert-values@5.1.3:
-    resolution: {integrity: sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  postcss-custom-media@8.0.2:
-    resolution: {integrity: sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.3
-
-  postcss-custom-properties@12.1.11:
-    resolution: {integrity: sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  postcss-custom-selectors@6.0.3:
-    resolution: {integrity: sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.3
-
-  postcss-dir-pseudo-class@6.0.5:
-    resolution: {integrity: sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  postcss-discard-comments@5.1.2:
-    resolution: {integrity: sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  postcss-discard-duplicates@5.1.0:
-    resolution: {integrity: sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  postcss-discard-empty@5.1.1:
-    resolution: {integrity: sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  postcss-discard-overridden@5.1.0:
-    resolution: {integrity: sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  postcss-double-position-gradients@3.1.2:
-    resolution: {integrity: sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  postcss-env-function@4.0.6:
-    resolution: {integrity: sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.4
-
-  postcss-flexbugs-fixes@5.0.2:
-    resolution: {integrity: sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==}
-    peerDependencies:
-      postcss: ^8.1.4
-
-  postcss-focus-visible@6.0.4:
-    resolution: {integrity: sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.4
-
-  postcss-focus-within@5.0.4:
-    resolution: {integrity: sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.4
-
-  postcss-font-variant@5.0.0:
-    resolution: {integrity: sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==}
-    peerDependencies:
-      postcss: ^8.1.0
-
-  postcss-gap-properties@3.0.5:
-    resolution: {integrity: sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  postcss-image-set-function@4.0.7:
-    resolution: {integrity: sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  postcss-import@15.1.0:
-    resolution: {integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      postcss: ^8.0.0
-
-  postcss-initial@4.0.1:
-    resolution: {integrity: sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==}
-    peerDependencies:
-      postcss: ^8.0.0
-
-  postcss-lab-function@4.2.1:
-    resolution: {integrity: sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  postcss-load-config@3.1.4:
-    resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==}
-    engines: {node: '>= 10'}
-    peerDependencies:
-      postcss: '>=8.0.9'
-      ts-node: '>=9.0.0'
-    peerDependenciesMeta:
-      postcss:
-        optional: true
-      ts-node:
-        optional: true
-
-  postcss-logical@5.0.4:
-    resolution: {integrity: sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.4
-
-  postcss-media-minmax@5.0.0:
-    resolution: {integrity: sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==}
-    engines: {node: '>=10.0.0'}
-    peerDependencies:
-      postcss: ^8.1.0
-
-  postcss-media-query-parser@0.2.3:
-    resolution: {integrity: sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==}
-
-  postcss-merge-longhand@5.1.7:
-    resolution: {integrity: sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  postcss-merge-rules@5.1.4:
-    resolution: {integrity: sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  postcss-minify-font-values@5.1.0:
-    resolution: {integrity: sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  postcss-minify-gradients@5.1.1:
-    resolution: {integrity: sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  postcss-minify-params@5.1.4:
-    resolution: {integrity: sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  postcss-minify-selectors@5.2.1:
-    resolution: {integrity: sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  postcss-modules-extract-imports@3.1.0:
-    resolution: {integrity: sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==}
-    engines: {node: ^10 || ^12 || >= 14}
-    peerDependencies:
-      postcss: ^8.1.0
-
-  postcss-modules-local-by-default@4.0.5:
-    resolution: {integrity: sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==}
-    engines: {node: ^10 || ^12 || >= 14}
-    peerDependencies:
-      postcss: ^8.1.0
-
-  postcss-modules-scope@3.2.0:
-    resolution: {integrity: sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==}
-    engines: {node: ^10 || ^12 || >= 14}
-    peerDependencies:
-      postcss: ^8.1.0
-
-  postcss-modules-values@4.0.0:
-    resolution: {integrity: sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==}
-    engines: {node: ^10 || ^12 || >= 14}
-    peerDependencies:
-      postcss: ^8.1.0
-
-  postcss-modules@4.3.1:
-    resolution: {integrity: sha512-ItUhSUxBBdNamkT3KzIZwYNNRFKmkJrofvC2nWab3CPKhYBQ1f27XXh1PAPE27Psx58jeelPsxWB/+og+KEH0Q==}
-    peerDependencies:
-      postcss: ^8.0.0
-
-  postcss-nesting@10.2.0:
-    resolution: {integrity: sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  postcss-normalize-charset@5.1.0:
-    resolution: {integrity: sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  postcss-normalize-display-values@5.1.0:
-    resolution: {integrity: sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  postcss-normalize-positions@5.1.1:
-    resolution: {integrity: sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  postcss-normalize-repeat-style@5.1.1:
-    resolution: {integrity: sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  postcss-normalize-string@5.1.0:
-    resolution: {integrity: sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  postcss-normalize-timing-functions@5.1.0:
-    resolution: {integrity: sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  postcss-normalize-unicode@5.1.1:
-    resolution: {integrity: sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  postcss-normalize-url@5.1.0:
-    resolution: {integrity: sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  postcss-normalize-whitespace@5.1.1:
-    resolution: {integrity: sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  postcss-opacity-percentage@1.1.3:
-    resolution: {integrity: sha512-An6Ba4pHBiDtyVpSLymUUERMo2cU7s+Obz6BTrS+gxkbnSBNKSuD0AVUc+CpBMrpVPKKfoVz0WQCX+Tnst0i4A==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  postcss-ordered-values@5.1.3:
-    resolution: {integrity: sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  postcss-overflow-shorthand@3.0.4:
-    resolution: {integrity: sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  postcss-page-break@3.0.4:
-    resolution: {integrity: sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==}
-    peerDependencies:
-      postcss: ^8
-
-  postcss-place@7.0.5:
-    resolution: {integrity: sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  postcss-preset-env@7.8.3:
-    resolution: {integrity: sha512-T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  postcss-pseudo-class-any-link@7.1.6:
-    resolution: {integrity: sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  postcss-reduce-initial@5.1.2:
-    resolution: {integrity: sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  postcss-reduce-transforms@5.1.0:
-    resolution: {integrity: sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  postcss-replace-overflow-wrap@4.0.0:
-    resolution: {integrity: sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==}
-    peerDependencies:
-      postcss: ^8.0.3
-
-  postcss-resolve-nested-selector@0.1.6:
-    resolution: {integrity: sha512-0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw==}
-
-  postcss-rtlcss@4.0.9:
-    resolution: {integrity: sha512-dCNKEf+FgTv+EA3XI8ysg2RnpS5s3/iZmU+9qpCNFxHU/BhK+4hz7jyCsCAfo0CLnDrMPtaQENhwb+EGm1wh7Q==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      postcss: ^8.4.21
-
-  postcss-safe-parser@6.0.0:
-    resolution: {integrity: sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==}
-    engines: {node: '>=12.0'}
-    peerDependencies:
-      postcss: ^8.3.3
-
-  postcss-selector-not@6.0.1:
-    resolution: {integrity: sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==}
-    engines: {node: ^12 || ^14 || >=16}
-    peerDependencies:
-      postcss: ^8.2
-
-  postcss-selector-parser@6.1.2:
-    resolution: {integrity: sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==}
-    engines: {node: '>=4'}
-
-  postcss-svgo@5.1.0:
-    resolution: {integrity: sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  postcss-unique-selectors@5.1.1:
-    resolution: {integrity: sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  postcss-value-parser@4.2.0:
-    resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
-
-  postcss@8.4.31:
-    resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==}
-    engines: {node: ^10 || ^12 || >=14}
-
-  postcss@8.4.47:
-    resolution: {integrity: sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==}
-    engines: {node: ^10 || ^12 || >=14}
-
-  prelude-ls@1.2.1:
-    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
-    engines: {node: '>= 0.8.0'}
-
-  prettier-linter-helpers@1.0.0:
-    resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==}
-    engines: {node: '>=6.0.0'}
-
-  prettier@2.8.8:
-    resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==}
-    engines: {node: '>=10.13.0'}
-    hasBin: true
-
-  pretty-bytes@5.6.0:
-    resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==}
-    engines: {node: '>=6'}
-
-  pretty-format@29.7.0:
-    resolution: {integrity: sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  prisma@5.17.0:
-    resolution: {integrity: sha512-m4UWkN5lBE6yevqeOxEvmepnL5cNPEjzMw2IqDB59AcEV6w7D8vGljDLd1gPFH+W6gUxw9x7/RmN5dCS/WTPxA==}
-    engines: {node: '>=16.13'}
-    hasBin: true
-
-  process@0.11.10:
-    resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
-    engines: {node: '>= 0.6.0'}
-
-  promise.series@0.2.0:
-    resolution: {integrity: sha512-VWQJyU2bcDTgZw8kpfBpB/ejZASlCrzwz5f2hjb/zlujOEB4oeiAhHygAWq8ubsX2GVkD4kCU5V2dwOTaCY5EQ==}
-    engines: {node: '>=0.12'}
-
-  prompts@2.4.2:
-    resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==}
-    engines: {node: '>= 6'}
-
-  prop-types@15.8.1:
-    resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
-
-  property-expr@2.0.6:
-    resolution: {integrity: sha512-SVtmxhRE/CGkn3eZY1T6pC8Nln6Fr/lu1mKSgRud0eC73whjGfoAogbn78LkD8aFL0zz3bAFerKSnOl7NlErBA==}
-
-  proxy-from-env@1.0.0:
-    resolution: {integrity: sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==}
-
-  psl@1.9.0:
-    resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==}
-
-  pump@3.0.2:
-    resolution: {integrity: sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==}
-
-  punycode@2.3.1:
-    resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
-    engines: {node: '>=6'}
-
-  pure-rand@6.1.0:
-    resolution: {integrity: sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==}
-
-  qs@6.13.0:
-    resolution: {integrity: sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==}
-    engines: {node: '>=0.6'}
-
-  querystringify@2.2.0:
-    resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==}
-
-  queue-microtask@1.2.3:
-    resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
-
-  quick-lru@4.0.1:
-    resolution: {integrity: sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==}
-    engines: {node: '>=8'}
-
-  quick-lru@5.1.1:
-    resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==}
-    engines: {node: '>=10'}
-
-  raf-schd@4.0.3:
-    resolution: {integrity: sha512-tQkJl2GRWh83ui2DiPTJz9wEiMN20syf+5oKfB03yYP7ioZcJwsIK8FjrtLwH1m7C7e+Tt2yYBlrOpdT+dyeIQ==}
-
-  randombytes@2.1.0:
-    resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==}
-
-  react-basics@0.125.0:
-    resolution: {integrity: sha512-8swjTaKfenwb+NunwzQo16V+dCA/38Kd+PSYWpBFyNmlFzs3Ax2ZgnysxDhW9IgfFr4wR6/0gzD3S31WzXq6Kw==}
-    engines: {node: '>= 14'}
-    peerDependencies:
-      react: ^18.2.0
-      react-dom: ^18.2.0
-
-  react-beautiful-dnd@13.1.1:
-    resolution: {integrity: sha512-0Lvs4tq2VcrEjEgDXHjT98r+63drkKEgqyxdA7qD3mvKwga6a5SscbdLPO2IExotU1jW8L0Ksdl0Cj2AF67nPQ==}
-    deprecated: 'react-beautiful-dnd is now deprecated. Context and options: https://github.com/atlassian/react-beautiful-dnd/issues/2672'
-    peerDependencies:
-      react: ^16.8.5 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.5 || ^17.0.0 || ^18.0.0
-
-  react-dom@18.3.1:
-    resolution: {integrity: sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==}
-    peerDependencies:
-      react: ^18.3.1
-
-  react-error-boundary@4.1.2:
-    resolution: {integrity: sha512-GQDxZ5Jd+Aq/qUxbCm1UtzmL/s++V7zKgE8yMktJiCQXCCFZnMZh9ng+6/Ne6PjNSXH0L9CjeOEREfRnq6Duag==}
-    peerDependencies:
-      react: '>=16.13.1'
-
-  react-hook-form@7.53.1:
-    resolution: {integrity: sha512-6aiQeBda4zjcuaugWvim9WsGqisoUk+etmFEsSUMm451/Ic8L/UAb7sRtMj3V+Hdzm6mMjU1VhiSzYUZeBm0Vg==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^16.8.0 || ^17 || ^18 || ^19
-
-  react-intl@6.8.4:
-    resolution: {integrity: sha512-UKYrCIztyvSiZCpvHjDwAHlXT735fDioABVP+uhRAOhDSBS9NQ2vVbxiUikvVEBdr2b0cTe1tUfOfvhbmSPi/A==}
-    peerDependencies:
-      react: ^16.6.0 || 17 || 18
-      typescript: ^4.7 || 5
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-
-  react-is@16.13.1:
-    resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
-
-  react-is@17.0.2:
-    resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
-
-  react-is@18.3.1:
-    resolution: {integrity: sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==}
-
-  react-redux@7.2.9:
-    resolution: {integrity: sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==}
-    peerDependencies:
-      react: ^16.8.3 || ^17 || ^18
-      react-dom: '*'
-      react-native: '*'
-    peerDependenciesMeta:
-      react-dom:
-        optional: true
-      react-native:
-        optional: true
-
-  react-simple-maps@2.3.0:
-    resolution: {integrity: sha512-IZVeiPSRZKwD6I/2NvXpQ2uENYGDGZp8DvZjkapcxuJ/LQHTfl+Byb+KNgY7s+iatRA2ad8LnZ3AgqcjziCCsw==}
-    peerDependencies:
-      prop-types: ^15.7.2
-      react: ^16.8.0 || 17.x
-      react-dom: ^16.8.0 || 17.x
-
-  react-use-measure@2.1.1:
-    resolution: {integrity: sha512-nocZhN26cproIiIduswYpV5y5lQpSQS1y/4KuvUCjSKmw7ZWIS/+g3aFnX3WdBkyuGUtTLif3UTqnLLhbDoQig==}
-    peerDependencies:
-      react: '>=16.13'
-      react-dom: '>=16.13'
-
-  react-window@1.8.10:
-    resolution: {integrity: sha512-Y0Cx+dnU6NLa5/EvoHukUD0BklJ8qITCtVEPY1C/nL8wwoZ0b5aEw8Ff1dOVHw7fCzMt55XfJDd8S8W8LCaUCg==}
-    engines: {node: '>8.0.0'}
-    peerDependencies:
-      react: ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
-
-  react@18.3.1:
-    resolution: {integrity: sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==}
-    engines: {node: '>=0.10.0'}
-
-  read-babelrc-up@1.1.0:
-    resolution: {integrity: sha512-fcl0JeI85Ss3//kfC3z2rsG2VxSiHl1bJgpjQWrne2YuQEewZpAgAjb17A6q/Q3ozWeZsUSroiIBVsnjmOU8vw==}
-    engines: {node: '>=10'}
-
-  read-cache@1.0.0:
-    resolution: {integrity: sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==}
-
-  read-pkg-up@7.0.1:
-    resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==}
-    engines: {node: '>=8'}
-
-  read-pkg-up@8.0.0:
-    resolution: {integrity: sha512-snVCqPczksT0HS2EC+SxUndvSzn6LRCwpfSvLrIfR5BKDQQZMaI6jPRC9dYvYFDRAuFEAnkwww8kBBNE/3VvzQ==}
-    engines: {node: '>=12'}
-
-  read-pkg@3.0.0:
-    resolution: {integrity: sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==}
-    engines: {node: '>=4'}
-
-  read-pkg@5.2.0:
-    resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==}
-    engines: {node: '>=8'}
-
-  read-pkg@6.0.0:
-    resolution: {integrity: sha512-X1Fu3dPuk/8ZLsMhEj5f4wFAF0DWoK7qhGJvgaijocXxBmSToKfbFtqbxMO7bVjNA1dmE5huAzjXj/ey86iw9Q==}
-    engines: {node: '>=12'}
-
-  redent@3.0.0:
-    resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==}
-    engines: {node: '>=8'}
-
-  redent@4.0.0:
-    resolution: {integrity: sha512-tYkDkVVtYkSVhuQ4zBgfvciymHaeuel+zFKXShfDnFP5SyVEP7qo70Rf1jTOTCx3vGNAbnEi/xFkcfQVMIBWag==}
-    engines: {node: '>=12'}
-
-  redis@4.7.0:
-    resolution: {integrity: sha512-zvmkHEAdGMn+hMRXuMBtu4Vo5P6rHQjLoHftu+lBqq8ZTA3RCVC/WzD790bkKKiNFp7d5/9PcSD19fJyyRvOdQ==}
-
-  redux@4.2.1:
-    resolution: {integrity: sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==}
-
-  reflect.getprototypeof@1.0.6:
-    resolution: {integrity: sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==}
-    engines: {node: '>= 0.4'}
-
-  regenerate-unicode-properties@10.2.0:
-    resolution: {integrity: sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==}
-    engines: {node: '>=4'}
-
-  regenerate@1.4.2:
-    resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==}
-
-  regenerator-runtime@0.14.1:
-    resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==}
-
-  regenerator-transform@0.15.2:
-    resolution: {integrity: sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==}
-
-  regexp.prototype.flags@1.5.3:
-    resolution: {integrity: sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==}
-    engines: {node: '>= 0.4'}
-
-  regexpu-core@6.1.1:
-    resolution: {integrity: sha512-k67Nb9jvwJcJmVpw0jPttR1/zVfnKf8Km0IPatrU/zJ5XeG3+Slx0xLXs9HByJSzXzrlz5EDvN6yLNMDc2qdnw==}
-    engines: {node: '>=4'}
-
-  regjsgen@0.8.0:
-    resolution: {integrity: sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==}
-
-  regjsparser@0.11.1:
-    resolution: {integrity: sha512-1DHODs4B8p/mQHU9kr+jv8+wIC9mtG4eBHxWxIq5mhjE3D5oORhCc6deRKzTjs9DcfRFmj9BHSDguZklqCGFWQ==}
-    hasBin: true
-
-  request-ip@3.3.0:
-    resolution: {integrity: sha512-cA6Xh6e0fDBBBwH77SLJaJPBmD3nWVAcF9/XAcsrIHdjhFzFiB5aNQFytdjCGPezU3ROwrR11IddKAM08vohxA==}
-
-  request-progress@3.0.0:
-    resolution: {integrity: sha512-MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg==}
-
-  require-directory@2.1.1:
-    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
-    engines: {node: '>=0.10.0'}
-
-  require-from-string@2.0.2:
-    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
-    engines: {node: '>=0.10.0'}
-
-  requires-port@1.0.0:
-    resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
-
-  resolve-cwd@3.0.0:
-    resolution: {integrity: sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==}
-    engines: {node: '>=8'}
-
-  resolve-from@4.0.0:
-    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
-    engines: {node: '>=4'}
-
-  resolve-from@5.0.0:
-    resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
-    engines: {node: '>=8'}
-
-  resolve-pkg-maps@1.0.0:
-    resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==}
-
-  resolve.exports@2.0.2:
-    resolution: {integrity: sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==}
-    engines: {node: '>=10'}
-
-  resolve@1.22.8:
-    resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==}
-    hasBin: true
-
-  resolve@2.0.0-next.5:
-    resolution: {integrity: sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==}
-    hasBin: true
-
-  restore-cursor@3.1.0:
-    resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==}
-    engines: {node: '>=8'}
-
-  restore-cursor@4.0.0:
-    resolution: {integrity: sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
-  reusify@1.0.4:
-    resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
-    engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
-
-  rfdc@1.4.1:
-    resolution: {integrity: sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==}
-
-  rimraf@3.0.2:
-    resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
-    deprecated: Rimraf versions prior to v4 are no longer supported
-    hasBin: true
-
-  rollup-plugin-copy@3.5.0:
-    resolution: {integrity: sha512-wI8D5dvYovRMx/YYKtUNt3Yxaw4ORC9xo6Gt9t22kveWz1enG9QrhVlagzwrxSC455xD1dHMKhIJkbsQ7d48BA==}
-    engines: {node: '>=8.3'}
-
-  rollup-plugin-delete@2.1.0:
-    resolution: {integrity: sha512-TEbqJd7giLvzQDTu4jSPufwhTJs/iYVN2LfR/YIYkqjC/oZ0/h9Q0AeljifIhzBzJYZtHQTWKEbMms5fbh54pw==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      rollup: '*'
-
-  rollup-plugin-dts@5.3.1:
-    resolution: {integrity: sha512-gusMi+Z4gY/JaEQeXnB0RUdU82h1kF0WYzCWgVmV4p3hWXqelaKuCvcJawfeg+EKn2T1Ie+YWF2OiN1/L8bTVg==}
-    engines: {node: '>=v14.21.3'}
-    peerDependencies:
-      rollup: ^3.0
-      typescript: ^4.1 || ^5.0
-
-  rollup-plugin-esbuild@5.0.0:
-    resolution: {integrity: sha512-1cRIOHAPh8WQgdQQyyvFdeOdxuiyk+zB5zJ5+YOwrZP4cJ0MT3Fs48pQxrZeyZHcn+klFherytILVfE4aYrneg==}
-    engines: {node: '>=14.18.0', npm: '>=8.0.0'}
-    peerDependencies:
-      esbuild: '>=0.10.1'
-      rollup: ^1.20.0 || ^2.0.0 || ^3.0.0
-
-  rollup-plugin-node-externals@6.1.2:
-    resolution: {integrity: sha512-2TWan0u0/zHcgPrKpIPgKSY8OMqwDAYD380I0hxx7iUQw8mrN34DWwG9sQUMEo5Yy4xd6/5QEAySYgiKN9fdBQ==}
-    engines: {node: '>=16.0.0'}
-    peerDependencies:
-      rollup: ^3.0.0 || ^4.0.0
-
-  rollup-plugin-postcss@4.0.2:
-    resolution: {integrity: sha512-05EaY6zvZdmvPUDi3uCcAQoESDcYnv8ogJJQRp6V5kZ6J6P7uAVJlrTZcaaA20wTH527YTnKfkAoPxWI/jPp4w==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      postcss: 8.x
-
-  rollup-plugin-terser@7.0.2:
-    resolution: {integrity: sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==}
-    deprecated: This package has been deprecated and is no longer maintained. Please use @rollup/plugin-terser
-    peerDependencies:
-      rollup: ^2.0.0
-
-  rollup-pluginutils@2.8.2:
-    resolution: {integrity: sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==}
-
-  rollup@3.29.5:
-    resolution: {integrity: sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==}
-    engines: {node: '>=14.18.0', npm: '>=8.0.0'}
-    hasBin: true
-
-  rtlcss@4.1.1:
-    resolution: {integrity: sha512-/oVHgBtnPNcggP2aVXQjSy6N1mMAfHg4GSag0QtZBlD5bdDgAHwr4pydqJGd+SUCu9260+Pjqbjwtvu7EMH1KQ==}
-    engines: {node: '>=12.0.0'}
-    hasBin: true
-
-  run-parallel@1.2.0:
-    resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
-
-  rxjs@7.8.1:
-    resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==}
-
-  safe-array-concat@1.1.2:
-    resolution: {integrity: sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==}
-    engines: {node: '>=0.4'}
-
-  safe-buffer@5.2.1:
-    resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
-
-  safe-identifier@0.4.2:
-    resolution: {integrity: sha512-6pNbSMW6OhAi9j+N8V+U715yBQsaWJ7eyEUaOrawX+isg5ZxhUlV1NipNtgaKHmFGiABwt+ZF04Ii+3Xjkg+8w==}
-
-  safe-regex-test@1.0.3:
-    resolution: {integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==}
-    engines: {node: '>= 0.4'}
-
-  safer-buffer@2.1.2:
-    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
-
-  scheduler@0.23.2:
-    resolution: {integrity: sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==}
-
-  schema-utils@2.7.1:
-    resolution: {integrity: sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==}
-    engines: {node: '>= 8.9.0'}
-
-  semver@5.7.2:
-    resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==}
-    hasBin: true
-
-  semver@6.3.1:
-    resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
-    hasBin: true
-
-  semver@7.6.3:
-    resolution: {integrity: sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==}
-    engines: {node: '>=10'}
-    hasBin: true
-
-  serialize-javascript@4.0.0:
-    resolution: {integrity: sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==}
-
-  set-function-length@1.2.2:
-    resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==}
-    engines: {node: '>= 0.4'}
-
-  set-function-name@2.0.2:
-    resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==}
-    engines: {node: '>= 0.4'}
-
-  shebang-command@1.2.0:
-    resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==}
-    engines: {node: '>=0.10.0'}
-
-  shebang-command@2.0.0:
-    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
-    engines: {node: '>=8'}
-
-  shebang-regex@1.0.0:
-    resolution: {integrity: sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==}
-    engines: {node: '>=0.10.0'}
-
-  shebang-regex@3.0.0:
-    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
-    engines: {node: '>=8'}
-
-  shell-quote@1.8.1:
-    resolution: {integrity: sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==}
-
-  side-channel@1.0.6:
-    resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==}
-    engines: {node: '>= 0.4'}
-
-  signal-exit@3.0.7:
-    resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
-
-  signal-exit@4.1.0:
-    resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
-    engines: {node: '>=14'}
-
-  sisteransi@1.0.5:
-    resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
-
-  slash@3.0.0:
-    resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
-    engines: {node: '>=8'}
-
-  slice-ansi@3.0.0:
-    resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
-    engines: {node: '>=8'}
-
-  slice-ansi@4.0.0:
-    resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==}
-    engines: {node: '>=10'}
-
-  slice-ansi@5.0.0:
-    resolution: {integrity: sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==}
-    engines: {node: '>=12'}
-
-  snake-case@3.0.4:
-    resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
-
-  sort-keys@4.2.0:
-    resolution: {integrity: sha512-aUYIEU/UviqPgc8mHR6IW1EGxkAXpeRETYcrzg8cLAvUPZcpAlleSXHV2mY7G12GphSH6Gzv+4MMVSSkbdteHg==}
-    engines: {node: '>=8'}
-
-  source-map-js@1.2.1:
-    resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
-    engines: {node: '>=0.10.0'}
-
-  source-map-support@0.5.13:
-    resolution: {integrity: sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==}
-
-  source-map-support@0.5.21:
-    resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
-
-  source-map@0.6.1:
-    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
-    engines: {node: '>=0.10.0'}
-
-  spdx-correct@3.2.0:
-    resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==}
-
-  spdx-exceptions@2.5.0:
-    resolution: {integrity: sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==}
-
-  spdx-expression-parse@3.0.1:
-    resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==}
-
-  spdx-license-ids@3.0.20:
-    resolution: {integrity: sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==}
-
-  sprintf-js@1.0.3:
-    resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
-
-  sshpk@1.18.0:
-    resolution: {integrity: sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==}
-    engines: {node: '>=0.10.0'}
-    hasBin: true
-
-  stable@0.1.8:
-    resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
-    deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
-
-  stack-utils@2.0.6:
-    resolution: {integrity: sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==}
-    engines: {node: '>=10'}
-
-  streamsearch@1.1.0:
-    resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==}
-    engines: {node: '>=10.0.0'}
-
-  string-argv@0.3.2:
-    resolution: {integrity: sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==}
-    engines: {node: '>=0.6.19'}
-
-  string-hash@1.1.3:
-    resolution: {integrity: sha512-kJUvRUFK49aub+a7T1nNE66EJbZBMnBgoC1UbCZ5n6bsZKBRga4KgBRTMn/pFkeCZSYtNeSyMxPDM0AXWELk2A==}
-
-  string-length@4.0.2:
-    resolution: {integrity: sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==}
-    engines: {node: '>=10'}
-
-  string-width@4.2.3:
-    resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
-    engines: {node: '>=8'}
-
-  string-width@5.1.2:
-    resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==}
-    engines: {node: '>=12'}
-
-  string.prototype.includes@2.0.1:
-    resolution: {integrity: sha512-o7+c9bW6zpAdJHTtujeePODAhkuicdAryFsfVKwA+wGw89wJ4GTY484WTucM9hLtDEOpOvI+aHnzqnC5lHp4Rg==}
-    engines: {node: '>= 0.4'}
-
-  string.prototype.matchall@4.0.11:
-    resolution: {integrity: sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==}
-    engines: {node: '>= 0.4'}
-
-  string.prototype.padend@3.1.6:
-    resolution: {integrity: sha512-XZpspuSB7vJWhvJc9DLSlrXl1mcA2BdoY5jjnS135ydXqLoqhs96JjDtCkjJEQHvfqZIp9hBuBMgI589peyx9Q==}
-    engines: {node: '>= 0.4'}
-
-  string.prototype.repeat@1.0.0:
-    resolution: {integrity: sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==}
-
-  string.prototype.trim@1.2.9:
-    resolution: {integrity: sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==}
-    engines: {node: '>= 0.4'}
-
-  string.prototype.trimend@1.0.8:
-    resolution: {integrity: sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==}
-
-  string.prototype.trimstart@1.0.8:
-    resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==}
-    engines: {node: '>= 0.4'}
-
-  strip-ansi@6.0.1:
-    resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
-    engines: {node: '>=8'}
-
-  strip-ansi@7.1.0:
-    resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==}
-    engines: {node: '>=12'}
-
-  strip-bom@3.0.0:
-    resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
-    engines: {node: '>=4'}
-
-  strip-bom@4.0.0:
-    resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==}
-    engines: {node: '>=8'}
-
-  strip-final-newline@2.0.0:
-    resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}
-    engines: {node: '>=6'}
-
-  strip-final-newline@3.0.0:
-    resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
-    engines: {node: '>=12'}
-
-  strip-indent@3.0.0:
-    resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
-    engines: {node: '>=8'}
-
-  strip-indent@4.0.0:
-    resolution: {integrity: sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==}
-    engines: {node: '>=12'}
-
-  strip-json-comments@3.1.1:
-    resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
-    engines: {node: '>=8'}
-
-  style-inject@0.3.0:
-    resolution: {integrity: sha512-IezA2qp+vcdlhJaVm5SOdPPTUu0FCEqfNSli2vRuSIBbu5Nq5UvygTk/VzeCqfLz2Atj3dVII5QBKGZRZ0edzw==}
-
-  style-search@0.1.0:
-    resolution: {integrity: sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==}
-
-  styled-jsx@5.1.1:
-    resolution: {integrity: sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==}
-    engines: {node: '>= 12.0.0'}
-    peerDependencies:
-      '@babel/core': '*'
-      babel-plugin-macros: '*'
-      react: '>= 16.8.0 || 17.x.x || ^18.0.0-0'
-    peerDependenciesMeta:
-      '@babel/core':
-        optional: true
-      babel-plugin-macros:
-        optional: true
-
-  stylehacks@5.1.1:
-    resolution: {integrity: sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-
-  stylelint-config-css-modules@4.4.0:
-    resolution: {integrity: sha512-J93MtxPjRzs/TjwbJ5y9SQy4iIqULXwL1CF1yx2tQCJfS/VZUcDAmoGOwqlLbhHXSQtZO5XQiA75NVWUR3KDCQ==}
-    peerDependencies:
-      stylelint: ^14.5.1 || ^15.0.0 || ^16.0.0
-
-  stylelint-config-prettier@9.0.5:
-    resolution: {integrity: sha512-U44lELgLZhbAD/xy/vncZ2Pq8sh2TnpiPvo38Ifg9+zeioR+LAkHu0i6YORIOxFafZoVg0xqQwex6e6F25S5XA==}
-    engines: {node: '>= 12'}
-    hasBin: true
-    peerDependencies:
-      stylelint: '>= 11.x < 15'
-
-  stylelint-config-recommended@14.0.1:
-    resolution: {integrity: sha512-bLvc1WOz/14aPImu/cufKAZYfXs/A/owZfSMZ4N+16WGXLoX5lOir53M6odBxvhgmgdxCVnNySJmZKx73T93cg==}
-    engines: {node: '>=18.12.0'}
-    peerDependencies:
-      stylelint: ^16.1.0
-
-  stylelint-scss@6.8.1:
-    resolution: {integrity: sha512-al+5eRb72bKrFyVAY+CLWKUMX+k+wsDCgyooSfhISJA2exqnJq1PX1iIIpdrvhu3GtJgNJZl9/BIW6EVSMCxdg==}
-    engines: {node: '>=18.12.0'}
-    peerDependencies:
-      stylelint: ^16.0.2
-
-  stylelint@15.11.0:
-    resolution: {integrity: sha512-78O4c6IswZ9TzpcIiQJIN49K3qNoXTM8zEJzhaTE/xRTCZswaovSEVIa/uwbOltZrk16X4jAxjaOhzz/hTm1Kw==}
-    engines: {node: ^14.13.1 || >=16.0.0}
-    hasBin: true
-
-  supports-color@5.5.0:
-    resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
-    engines: {node: '>=4'}
-
-  supports-color@7.2.0:
-    resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
-    engines: {node: '>=8'}
-
-  supports-color@8.1.1:
-    resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==}
-    engines: {node: '>=10'}
-
-  supports-hyperlinks@3.1.0:
-    resolution: {integrity: sha512-2rn0BZ+/f7puLOHZm1HOJfwBggfaHXUpPUSSG/SWM4TWp5KCfmNYwnC3hruy2rZlMnmWZ+QAGpZfchu3f3695A==}
-    engines: {node: '>=14.18'}
-
-  supports-preserve-symlinks-flag@1.0.0:
-    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
-    engines: {node: '>= 0.4'}
-
-  svg-parser@2.0.4:
-    resolution: {integrity: sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==}
-
-  svg-tags@1.0.0:
-    resolution: {integrity: sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==}
-
-  svgo@2.8.0:
-    resolution: {integrity: sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==}
-    engines: {node: '>=10.13.0'}
-    hasBin: true
-
-  svgo@3.3.2:
-    resolution: {integrity: sha512-OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw==}
-    engines: {node: '>=14.0.0'}
-    hasBin: true
-
-  table@6.8.2:
-    resolution: {integrity: sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==}
-    engines: {node: '>=10.0.0'}
-
-  tapable@2.2.1:
-    resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
-    engines: {node: '>=6'}
-
-  tar@6.2.1:
-    resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==}
-    engines: {node: '>=10'}
-
-  terser@5.36.0:
-    resolution: {integrity: sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w==}
-    engines: {node: '>=10'}
-    hasBin: true
-
-  test-exclude@6.0.0:
-    resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==}
-    engines: {node: '>=8'}
-
-  text-table@0.2.0:
-    resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
-
-  thenby@1.3.4:
-    resolution: {integrity: sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ==}
-
-  throttleit@1.0.1:
-    resolution: {integrity: sha512-vDZpf9Chs9mAdfY046mcPt8fg5QSZr37hEH4TXYBnDF+izxgrbRGUAAaBvIk/fJm9aOFCGFd1EsNg5AZCbnQCQ==}
-
-  through@2.3.8:
-    resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
-
-  tiny-invariant@1.3.3:
-    resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==}
-
-  tiny-lru@11.2.11:
-    resolution: {integrity: sha512-27BIW0dIWTYYoWNnqSmoNMKe5WIbkXsc0xaCQHd3/3xT2XMuMJrzHdrO9QBFR14emBz1Bu0dOAs2sCBBrvgPQA==}
-    engines: {node: '>=12'}
-
-  tmp@0.2.3:
-    resolution: {integrity: sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==}
-    engines: {node: '>=14.14'}
-
-  tmpl@1.0.5:
-    resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==}
-
-  to-regex-range@5.0.1:
-    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
-    engines: {node: '>=8.0'}
-
-  topojson-client@3.1.0:
-    resolution: {integrity: sha512-605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw==}
-    hasBin: true
-
-  toposort@2.0.2:
-    resolution: {integrity: sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==}
-
-  tough-cookie@4.1.4:
-    resolution: {integrity: sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==}
-    engines: {node: '>=6'}
-
-  tree-kill@1.2.2:
-    resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==}
-    hasBin: true
-
-  trim-newlines@3.0.1:
-    resolution: {integrity: sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==}
-    engines: {node: '>=8'}
-
-  trim-newlines@4.1.1:
-    resolution: {integrity: sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ==}
-    engines: {node: '>=12'}
-
-  ts-api-utils@1.3.0:
-    resolution: {integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==}
-    engines: {node: '>=16'}
-    peerDependencies:
-      typescript: '>=4.2.0'
-
-  ts-jest@29.2.5:
-    resolution: {integrity: sha512-KD8zB2aAZrcKIdGk4OwpJggeLcH1FgrICqDSROWqlnJXGCXK4Mn6FcdK2B6670Xr73lHMG1kHw8R87A0ecZ+vA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0}
-    hasBin: true
-    peerDependencies:
-      '@babel/core': '>=7.0.0-beta.0 <8'
-      '@jest/transform': ^29.0.0
-      '@jest/types': ^29.0.0
-      babel-jest: ^29.0.0
-      esbuild: '*'
-      jest: ^29.0.0
-      typescript: '>=4.3 <6'
-    peerDependenciesMeta:
-      '@babel/core':
-        optional: true
-      '@jest/transform':
-        optional: true
-      '@jest/types':
-        optional: true
-      babel-jest:
-        optional: true
-      esbuild:
-        optional: true
-
-  ts-node@10.9.2:
-    resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==}
-    hasBin: true
-    peerDependencies:
-      '@swc/core': '>=1.2.50'
-      '@swc/wasm': '>=1.2.50'
-      '@types/node': '*'
-      typescript: '>=2.7'
-    peerDependenciesMeta:
-      '@swc/core':
-        optional: true
-      '@swc/wasm':
-        optional: true
-
-  tsconfig-paths@3.15.0:
-    resolution: {integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==}
-
-  tslib@1.14.1:
-    resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
-
-  tslib@2.8.0:
-    resolution: {integrity: sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==}
-
-  tsutils@3.21.0:
-    resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
-    engines: {node: '>= 6'}
-    peerDependencies:
-      typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
-
-  tunnel-agent@0.6.0:
-    resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
-
-  tweetnacl@0.14.5:
-    resolution: {integrity: sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==}
-
-  type-check@0.4.0:
-    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
-    engines: {node: '>= 0.8.0'}
-
-  type-detect@4.0.8:
-    resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}
-    engines: {node: '>=4'}
-
-  type-fest@0.13.1:
-    resolution: {integrity: sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==}
-    engines: {node: '>=10'}
-
-  type-fest@0.20.2:
-    resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
-    engines: {node: '>=10'}
-
-  type-fest@0.21.3:
-    resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
-    engines: {node: '>=10'}
-
-  type-fest@0.6.0:
-    resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==}
-    engines: {node: '>=8'}
-
-  type-fest@0.8.1:
-    resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==}
-    engines: {node: '>=8'}
-
-  type-fest@1.4.0:
-    resolution: {integrity: sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==}
-    engines: {node: '>=10'}
-
-  typed-array-buffer@1.0.2:
-    resolution: {integrity: sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==}
-    engines: {node: '>= 0.4'}
-
-  typed-array-byte-length@1.0.1:
-    resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==}
-    engines: {node: '>= 0.4'}
-
-  typed-array-byte-offset@1.0.2:
-    resolution: {integrity: sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==}
-    engines: {node: '>= 0.4'}
-
-  typed-array-length@1.0.6:
-    resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==}
-    engines: {node: '>= 0.4'}
-
-  typedarray-to-buffer@3.1.5:
-    resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==}
-
-  typescript@4.9.5:
-    resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==}
-    engines: {node: '>=4.2.0'}
-    hasBin: true
-
-  typescript@5.6.3:
-    resolution: {integrity: sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==}
-    engines: {node: '>=14.17'}
-    hasBin: true
-
-  unbox-primitive@1.0.2:
-    resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
-
-  undici-types@6.19.8:
-    resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==}
-
-  unicode-canonical-property-names-ecmascript@2.0.1:
-    resolution: {integrity: sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==}
-    engines: {node: '>=4'}
-
-  unicode-match-property-ecmascript@2.0.0:
-    resolution: {integrity: sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==}
-    engines: {node: '>=4'}
-
-  unicode-match-property-value-ecmascript@2.2.0:
-    resolution: {integrity: sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==}
-    engines: {node: '>=4'}
-
-  unicode-property-aliases-ecmascript@2.1.0:
-    resolution: {integrity: sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==}
-    engines: {node: '>=4'}
-
-  universalify@0.1.2:
-    resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
-    engines: {node: '>= 4.0.0'}
-
-  universalify@0.2.0:
-    resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==}
-    engines: {node: '>= 4.0.0'}
-
-  universalify@2.0.1:
-    resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
-    engines: {node: '>= 10.0.0'}
-
-  untildify@4.0.0:
-    resolution: {integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==}
-    engines: {node: '>=8'}
-
-  update-browserslist-db@1.1.1:
-    resolution: {integrity: sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==}
-    hasBin: true
-    peerDependencies:
-      browserslist: '>= 4.21.0'
-
-  uri-js@4.4.1:
-    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
-
-  url-parse@1.5.10:
-    resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==}
-
-  use-memo-one@1.1.3:
-    resolution: {integrity: sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-
-  use-sync-external-store@1.2.2:
-    resolution: {integrity: sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-
-  util-deprecate@1.0.2:
-    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
-
-  uuid@8.3.2:
-    resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
-    hasBin: true
-
-  uuid@9.0.1:
-    resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==}
-    hasBin: true
-
-  v8-compile-cache-lib@3.0.1:
-    resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
-
-  v8-to-istanbul@9.3.0:
-    resolution: {integrity: sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==}
-    engines: {node: '>=10.12.0'}
-
-  validate-npm-package-license@3.0.4:
-    resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==}
-
-  vary@1.1.2:
-    resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
-    engines: {node: '>= 0.8'}
-
-  verror@1.10.0:
-    resolution: {integrity: sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==}
-    engines: {'0': node >=0.6.0}
-
-  vue@3.5.12:
-    resolution: {integrity: sha512-CLVZtXtn2ItBIi/zHZ0Sg1Xkb7+PU32bJJ8Bmy7ts3jxXTcbfsEfBivFYYWz1Hur+lalqGAh65Coin0r+HRUfg==}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-
-  walker@1.0.8:
-    resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==}
-
-  web-streams-polyfill@3.3.3:
-    resolution: {integrity: sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==}
-    engines: {node: '>= 8'}
-
-  which-boxed-primitive@1.0.2:
-    resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
-
-  which-builtin-type@1.1.4:
-    resolution: {integrity: sha512-bppkmBSsHFmIMSl8BO9TbsyzsvGjVoppt8xUiGzwiu/bhDCGxnpOKCxgqj6GuyHE0mINMDecBFPlOm2hzY084w==}
-    engines: {node: '>= 0.4'}
-
-  which-collection@1.0.2:
-    resolution: {integrity: sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==}
-    engines: {node: '>= 0.4'}
-
-  which-typed-array@1.1.15:
-    resolution: {integrity: sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==}
-    engines: {node: '>= 0.4'}
-
-  which@1.3.1:
-    resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
-    hasBin: true
-
-  which@2.0.2:
-    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
-    engines: {node: '>= 8'}
-    hasBin: true
-
-  word-wrap@1.2.5:
-    resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
-    engines: {node: '>=0.10.0'}
-
-  wrap-ansi@6.2.0:
-    resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
-    engines: {node: '>=8'}
-
-  wrap-ansi@7.0.0:
-    resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
-    engines: {node: '>=10'}
-
-  wrap-ansi@8.1.0:
-    resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==}
-    engines: {node: '>=12'}
-
-  wrappy@1.0.2:
-    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
-
-  write-file-atomic@3.0.3:
-    resolution: {integrity: sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==}
-
-  write-file-atomic@4.0.2:
-    resolution: {integrity: sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==}
-    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
-
-  write-file-atomic@5.0.1:
-    resolution: {integrity: sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-
-  write-json-file@4.3.0:
-    resolution: {integrity: sha512-PxiShnxf0IlnQuMYOPPhPkhExoCQuTUNPOa/2JWCYTmBquU9njyyDuwRKN26IZBlp4yn1nt+Agh2HOOBl+55HQ==}
-    engines: {node: '>=8.3'}
-
-  y18n@5.0.8:
-    resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
-    engines: {node: '>=10'}
-
-  yallist@3.1.1:
-    resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
-
-  yallist@4.0.0:
-    resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
-
-  yaml@1.10.2:
-    resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}
-    engines: {node: '>= 6'}
-
-  yaml@2.3.1:
-    resolution: {integrity: sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==}
-    engines: {node: '>= 14'}
-
-  yargs-parser@18.1.3:
-    resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
-    engines: {node: '>=6'}
-
-  yargs-parser@20.2.9:
-    resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==}
-    engines: {node: '>=10'}
-
-  yargs-parser@21.1.1:
-    resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
-    engines: {node: '>=12'}
-
-  yargs@17.7.2:
-    resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
-    engines: {node: '>=12'}
-
-  yauzl@2.10.0:
-    resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}
-
-  yn@3.1.1:
-    resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==}
-    engines: {node: '>=6'}
-
-  yocto-queue@0.1.0:
-    resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
-    engines: {node: '>=10'}
-
-  yup@0.32.11:
-    resolution: {integrity: sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==}
-    engines: {node: '>=10'}
-
-  zustand@4.5.5:
-    resolution: {integrity: sha512-+0PALYNJNgK6hldkgDq2vLrw5f6g/jCInz52n9RTpropGgeAf/ioFUCdtsjCqu4gNhW9D01rUQBROoRjdzyn2Q==}
-    engines: {node: '>=12.7.0'}
-    peerDependencies:
-      '@types/react': '>=16.8'
-      immer: '>=9.0.6'
-      react: '>=16.8'
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      immer:
-        optional: true
-      react:
-        optional: true
-
-snapshots:
-
-  '@ampproject/remapping@2.3.0':
-    dependencies:
-      '@jridgewell/gen-mapping': 0.3.5
-      '@jridgewell/trace-mapping': 0.3.25
-
-  '@babel/code-frame@7.26.0':
-    dependencies:
-      '@babel/helper-validator-identifier': 7.25.9
-      js-tokens: 4.0.0
-      picocolors: 1.1.1
-
-  '@babel/compat-data@7.26.0': {}
-
-  '@babel/core@7.26.0':
-    dependencies:
-      '@ampproject/remapping': 2.3.0
-      '@babel/code-frame': 7.26.0
-      '@babel/generator': 7.26.0
-      '@babel/helper-compilation-targets': 7.25.9
-      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0)
-      '@babel/helpers': 7.26.0
-      '@babel/parser': 7.26.0
-      '@babel/template': 7.25.9
-      '@babel/traverse': 7.25.9
-      '@babel/types': 7.26.0
-      convert-source-map: 2.0.0
-      debug: 4.3.7(supports-color@8.1.1)
-      gensync: 1.0.0-beta.2
-      json5: 2.2.3
-      semver: 6.3.1
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/generator@7.26.0':
-    dependencies:
-      '@babel/parser': 7.26.0
-      '@babel/types': 7.26.0
-      '@jridgewell/gen-mapping': 0.3.5
-      '@jridgewell/trace-mapping': 0.3.25
-      jsesc: 3.0.2
-
-  '@babel/helper-annotate-as-pure@7.25.9':
-    dependencies:
-      '@babel/types': 7.26.0
-
-  '@babel/helper-builder-binary-assignment-operator-visitor@7.25.9':
-    dependencies:
-      '@babel/traverse': 7.25.9
-      '@babel/types': 7.26.0
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/helper-compilation-targets@7.25.9':
-    dependencies:
-      '@babel/compat-data': 7.26.0
-      '@babel/helper-validator-option': 7.25.9
-      browserslist: 4.24.2
-      lru-cache: 5.1.1
-      semver: 6.3.1
-
-  '@babel/helper-create-class-features-plugin@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-annotate-as-pure': 7.25.9
-      '@babel/helper-member-expression-to-functions': 7.25.9
-      '@babel/helper-optimise-call-expression': 7.25.9
-      '@babel/helper-replace-supers': 7.25.9(@babel/core@7.26.0)
-      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
-      '@babel/traverse': 7.25.9
-      semver: 6.3.1
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/helper-create-regexp-features-plugin@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-annotate-as-pure': 7.25.9
-      regexpu-core: 6.1.1
-      semver: 6.3.1
-
-  '@babel/helper-define-polyfill-provider@0.6.2(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-compilation-targets': 7.25.9
-      '@babel/helper-plugin-utils': 7.25.9
-      debug: 4.3.7(supports-color@8.1.1)
-      lodash.debounce: 4.0.8
-      resolve: 1.22.8
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/helper-member-expression-to-functions@7.25.9':
-    dependencies:
-      '@babel/traverse': 7.25.9
-      '@babel/types': 7.26.0
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/helper-module-imports@7.25.9':
-    dependencies:
-      '@babel/traverse': 7.25.9
-      '@babel/types': 7.26.0
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/helper-module-transforms@7.26.0(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-module-imports': 7.25.9
-      '@babel/helper-validator-identifier': 7.25.9
-      '@babel/traverse': 7.25.9
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/helper-optimise-call-expression@7.25.9':
-    dependencies:
-      '@babel/types': 7.26.0
-
-  '@babel/helper-plugin-utils@7.25.9': {}
-
-  '@babel/helper-remap-async-to-generator@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-annotate-as-pure': 7.25.9
-      '@babel/helper-wrap-function': 7.25.9
-      '@babel/traverse': 7.25.9
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/helper-replace-supers@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-member-expression-to-functions': 7.25.9
-      '@babel/helper-optimise-call-expression': 7.25.9
-      '@babel/traverse': 7.25.9
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/helper-simple-access@7.25.9':
-    dependencies:
-      '@babel/traverse': 7.25.9
-      '@babel/types': 7.26.0
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/helper-skip-transparent-expression-wrappers@7.25.9':
-    dependencies:
-      '@babel/traverse': 7.25.9
-      '@babel/types': 7.26.0
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/helper-string-parser@7.25.9': {}
-
-  '@babel/helper-validator-identifier@7.25.9': {}
-
-  '@babel/helper-validator-option@7.25.9': {}
-
-  '@babel/helper-wrap-function@7.25.9':
-    dependencies:
-      '@babel/template': 7.25.9
-      '@babel/traverse': 7.25.9
-      '@babel/types': 7.26.0
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/helpers@7.26.0':
-    dependencies:
-      '@babel/template': 7.25.9
-      '@babel/types': 7.26.0
-
-  '@babel/parser@7.26.0':
-    dependencies:
-      '@babel/types': 7.26.0
-
-  '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-      '@babel/traverse': 7.25.9
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
-      '@babel/plugin-transform-optional-chaining': 7.25.9(@babel/core@7.26.0)
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-      '@babel/traverse': 7.25.9
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-
-  '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-syntax-import-assertions@7.26.0(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-syntax-import-attributes@7.26.0(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-syntax-jsx@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-syntax-typescript@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-create-regexp-features-plugin': 7.25.9(@babel/core@7.26.0)
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-arrow-functions@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-async-generator-functions@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-      '@babel/helper-remap-async-to-generator': 7.25.9(@babel/core@7.26.0)
-      '@babel/traverse': 7.25.9
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/plugin-transform-async-to-generator@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-module-imports': 7.25.9
-      '@babel/helper-plugin-utils': 7.25.9
-      '@babel/helper-remap-async-to-generator': 7.25.9(@babel/core@7.26.0)
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/plugin-transform-block-scoped-functions@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-block-scoping@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-class-properties@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0)
-      '@babel/helper-plugin-utils': 7.25.9
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/plugin-transform-class-static-block@7.26.0(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0)
-      '@babel/helper-plugin-utils': 7.25.9
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/plugin-transform-classes@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-annotate-as-pure': 7.25.9
-      '@babel/helper-compilation-targets': 7.25.9
-      '@babel/helper-plugin-utils': 7.25.9
-      '@babel/helper-replace-supers': 7.25.9(@babel/core@7.26.0)
-      '@babel/traverse': 7.25.9
-      globals: 11.12.0
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/plugin-transform-computed-properties@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-      '@babel/template': 7.25.9
-
-  '@babel/plugin-transform-destructuring@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-dotall-regex@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-create-regexp-features-plugin': 7.25.9(@babel/core@7.26.0)
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-duplicate-keys@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-create-regexp-features-plugin': 7.25.9(@babel/core@7.26.0)
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-dynamic-import@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-exponentiation-operator@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-builder-binary-assignment-operator-visitor': 7.25.9
-      '@babel/helper-plugin-utils': 7.25.9
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/plugin-transform-export-namespace-from@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-for-of@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/plugin-transform-function-name@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-compilation-targets': 7.25.9
-      '@babel/helper-plugin-utils': 7.25.9
-      '@babel/traverse': 7.25.9
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/plugin-transform-json-strings@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-literals@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-logical-assignment-operators@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-member-expression-literals@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-modules-amd@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0)
-      '@babel/helper-plugin-utils': 7.25.9
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/plugin-transform-modules-commonjs@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0)
-      '@babel/helper-plugin-utils': 7.25.9
-      '@babel/helper-simple-access': 7.25.9
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/plugin-transform-modules-systemjs@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0)
-      '@babel/helper-plugin-utils': 7.25.9
-      '@babel/helper-validator-identifier': 7.25.9
-      '@babel/traverse': 7.25.9
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/plugin-transform-modules-umd@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0)
-      '@babel/helper-plugin-utils': 7.25.9
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/plugin-transform-named-capturing-groups-regex@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-create-regexp-features-plugin': 7.25.9(@babel/core@7.26.0)
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-new-target@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-nullish-coalescing-operator@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-numeric-separator@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-object-rest-spread@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-compilation-targets': 7.25.9
-      '@babel/helper-plugin-utils': 7.25.9
-      '@babel/plugin-transform-parameters': 7.25.9(@babel/core@7.26.0)
-
-  '@babel/plugin-transform-object-super@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-      '@babel/helper-replace-supers': 7.25.9(@babel/core@7.26.0)
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/plugin-transform-optional-catch-binding@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-optional-chaining@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/plugin-transform-parameters@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-private-methods@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0)
-      '@babel/helper-plugin-utils': 7.25.9
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/plugin-transform-private-property-in-object@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-annotate-as-pure': 7.25.9
-      '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0)
-      '@babel/helper-plugin-utils': 7.25.9
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/plugin-transform-property-literals@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-react-constant-elements@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-react-display-name@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-react-jsx-development@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/plugin-transform-react-jsx': 7.25.9(@babel/core@7.26.0)
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/plugin-transform-react-jsx@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-annotate-as-pure': 7.25.9
-      '@babel/helper-module-imports': 7.25.9
-      '@babel/helper-plugin-utils': 7.25.9
-      '@babel/plugin-syntax-jsx': 7.25.9(@babel/core@7.26.0)
-      '@babel/types': 7.26.0
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/plugin-transform-react-pure-annotations@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-annotate-as-pure': 7.25.9
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-regenerator@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-      regenerator-transform: 0.15.2
-
-  '@babel/plugin-transform-regexp-modifiers@7.26.0(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-create-regexp-features-plugin': 7.25.9(@babel/core@7.26.0)
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-reserved-words@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-shorthand-properties@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-spread@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/plugin-transform-sticky-regex@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-template-literals@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-typeof-symbol@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-typescript@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-annotate-as-pure': 7.25.9
-      '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0)
-      '@babel/helper-plugin-utils': 7.25.9
-      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
-      '@babel/plugin-syntax-typescript': 7.25.9(@babel/core@7.26.0)
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/plugin-transform-unicode-escapes@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-unicode-property-regex@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-create-regexp-features-plugin': 7.25.9(@babel/core@7.26.0)
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-unicode-regex@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-create-regexp-features-plugin': 7.25.9(@babel/core@7.26.0)
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/plugin-transform-unicode-sets-regex@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-create-regexp-features-plugin': 7.25.9(@babel/core@7.26.0)
-      '@babel/helper-plugin-utils': 7.25.9
-
-  '@babel/preset-env@7.26.0(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/compat-data': 7.26.0
-      '@babel/core': 7.26.0
-      '@babel/helper-compilation-targets': 7.25.9
-      '@babel/helper-plugin-utils': 7.25.9
-      '@babel/helper-validator-option': 7.25.9
-      '@babel/plugin-bugfix-firefox-class-in-computed-class-key': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-bugfix-safari-class-field-initializer-scope': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.26.0)
-      '@babel/plugin-syntax-import-assertions': 7.26.0(@babel/core@7.26.0)
-      '@babel/plugin-syntax-import-attributes': 7.26.0(@babel/core@7.26.0)
-      '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.26.0)
-      '@babel/plugin-transform-arrow-functions': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-async-generator-functions': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-async-to-generator': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-block-scoped-functions': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-block-scoping': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-class-properties': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-class-static-block': 7.26.0(@babel/core@7.26.0)
-      '@babel/plugin-transform-classes': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-computed-properties': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-destructuring': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-dotall-regex': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-duplicate-keys': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-duplicate-named-capturing-groups-regex': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-dynamic-import': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-exponentiation-operator': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-export-namespace-from': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-for-of': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-function-name': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-json-strings': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-literals': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-logical-assignment-operators': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-member-expression-literals': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-modules-amd': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-modules-commonjs': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-modules-systemjs': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-modules-umd': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-named-capturing-groups-regex': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-new-target': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-nullish-coalescing-operator': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-numeric-separator': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-object-rest-spread': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-object-super': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-optional-catch-binding': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-optional-chaining': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-parameters': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-private-methods': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-private-property-in-object': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-property-literals': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-regenerator': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-regexp-modifiers': 7.26.0(@babel/core@7.26.0)
-      '@babel/plugin-transform-reserved-words': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-shorthand-properties': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-spread': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-sticky-regex': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-template-literals': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-typeof-symbol': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-unicode-escapes': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-unicode-property-regex': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-unicode-regex': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-unicode-sets-regex': 7.25.9(@babel/core@7.26.0)
-      '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.26.0)
-      babel-plugin-polyfill-corejs2: 0.4.11(@babel/core@7.26.0)
-      babel-plugin-polyfill-corejs3: 0.10.6(@babel/core@7.26.0)
-      babel-plugin-polyfill-regenerator: 0.6.2(@babel/core@7.26.0)
-      core-js-compat: 3.38.1
-      semver: 6.3.1
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-      '@babel/types': 7.26.0
-      esutils: 2.0.3
-
-  '@babel/preset-react@7.25.9(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-      '@babel/helper-validator-option': 7.25.9
-      '@babel/plugin-transform-react-display-name': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-react-jsx': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-react-jsx-development': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-react-pure-annotations': 7.25.9(@babel/core@7.26.0)
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/preset-typescript@7.26.0(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-      '@babel/helper-validator-option': 7.25.9
-      '@babel/plugin-syntax-jsx': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-modules-commonjs': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-transform-typescript': 7.25.9(@babel/core@7.26.0)
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/runtime@7.26.0':
-    dependencies:
-      regenerator-runtime: 0.14.1
-
-  '@babel/template@7.25.9':
-    dependencies:
-      '@babel/code-frame': 7.26.0
-      '@babel/parser': 7.26.0
-      '@babel/types': 7.26.0
-
-  '@babel/traverse@7.25.9':
-    dependencies:
-      '@babel/code-frame': 7.26.0
-      '@babel/generator': 7.26.0
-      '@babel/parser': 7.26.0
-      '@babel/template': 7.25.9
-      '@babel/types': 7.26.0
-      debug: 4.3.7(supports-color@8.1.1)
-      globals: 11.12.0
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/types@7.26.0':
-    dependencies:
-      '@babel/helper-string-parser': 7.25.9
-      '@babel/helper-validator-identifier': 7.25.9
-
-  '@bcoe/v8-coverage@0.2.3': {}
-
-  '@clickhouse/client-common@1.7.0': {}
-
-  '@clickhouse/client@1.7.0':
-    dependencies:
-      '@clickhouse/client-common': 1.7.0
-
-  '@colors/colors@1.5.0':
-    optional: true
-
-  '@cspotcode/source-map-support@0.8.1':
-    dependencies:
-      '@jridgewell/trace-mapping': 0.3.9
-
-  '@csstools/css-parser-algorithms@2.7.1(@csstools/css-tokenizer@2.4.1)':
-    dependencies:
-      '@csstools/css-tokenizer': 2.4.1
-
-  '@csstools/css-tokenizer@2.4.1': {}
-
-  '@csstools/media-query-list-parser@2.1.13(@csstools/css-parser-algorithms@2.7.1(@csstools/css-tokenizer@2.4.1))(@csstools/css-tokenizer@2.4.1)':
-    dependencies:
-      '@csstools/css-parser-algorithms': 2.7.1(@csstools/css-tokenizer@2.4.1)
-      '@csstools/css-tokenizer': 2.4.1
-
-  '@csstools/postcss-cascade-layers@1.1.1(postcss@8.4.47)':
-    dependencies:
-      '@csstools/selector-specificity': 2.2.0(postcss-selector-parser@6.1.2)
-      postcss: 8.4.47
-      postcss-selector-parser: 6.1.2
-
-  '@csstools/postcss-color-function@1.1.1(postcss@8.4.47)':
-    dependencies:
-      '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.47)
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  '@csstools/postcss-font-format-keywords@1.0.1(postcss@8.4.47)':
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  '@csstools/postcss-hwb-function@1.0.2(postcss@8.4.47)':
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  '@csstools/postcss-ic-unit@1.0.1(postcss@8.4.47)':
-    dependencies:
-      '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.47)
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  '@csstools/postcss-is-pseudo-class@2.0.7(postcss@8.4.47)':
-    dependencies:
-      '@csstools/selector-specificity': 2.2.0(postcss-selector-parser@6.1.2)
-      postcss: 8.4.47
-      postcss-selector-parser: 6.1.2
-
-  '@csstools/postcss-nested-calc@1.0.0(postcss@8.4.47)':
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  '@csstools/postcss-normalize-display-values@1.0.1(postcss@8.4.47)':
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  '@csstools/postcss-oklab-function@1.1.1(postcss@8.4.47)':
-    dependencies:
-      '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.47)
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  '@csstools/postcss-progressive-custom-properties@1.3.0(postcss@8.4.47)':
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  '@csstools/postcss-stepped-value-functions@1.0.1(postcss@8.4.47)':
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  '@csstools/postcss-text-decoration-shorthand@1.0.0(postcss@8.4.47)':
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  '@csstools/postcss-trigonometric-functions@1.0.2(postcss@8.4.47)':
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  '@csstools/postcss-unset-value@1.0.2(postcss@8.4.47)':
-    dependencies:
-      postcss: 8.4.47
-
-  '@csstools/selector-specificity@2.2.0(postcss-selector-parser@6.1.2)':
-    dependencies:
-      postcss-selector-parser: 6.1.2
-
-  '@csstools/selector-specificity@3.1.1(postcss-selector-parser@6.1.2)':
-    dependencies:
-      postcss-selector-parser: 6.1.2
-
-  '@cypress/request@3.0.5':
-    dependencies:
-      aws-sign2: 0.7.0
-      aws4: 1.13.2
-      caseless: 0.12.0
-      combined-stream: 1.0.8
-      extend: 3.0.2
-      forever-agent: 0.6.1
-      form-data: 4.0.1
-      http-signature: 1.4.0
-      is-typedarray: 1.0.0
-      isstream: 0.1.2
-      json-stringify-safe: 5.0.1
-      mime-types: 2.1.35
-      performance-now: 2.1.0
-      qs: 6.13.0
-      safe-buffer: 5.2.1
-      tough-cookie: 4.1.4
-      tunnel-agent: 0.6.0
-      uuid: 8.3.2
-
-  '@cypress/xvfb@1.2.4(supports-color@8.1.1)':
-    dependencies:
-      debug: 3.2.7(supports-color@8.1.1)
-      lodash.once: 4.1.1
-    transitivePeerDependencies:
-      - supports-color
-
-  '@date-fns/utc@1.2.0': {}
-
-  '@dicebear/adventurer-neutral@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/adventurer@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/avataaars-neutral@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/avataaars@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/big-ears-neutral@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/big-ears@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/big-smile@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/bottts-neutral@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/bottts@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/collection@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/adventurer': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/adventurer-neutral': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/avataaars': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/avataaars-neutral': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/big-ears': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/big-ears-neutral': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/big-smile': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/bottts': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/bottts-neutral': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/core': 9.2.2
-      '@dicebear/croodles': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/croodles-neutral': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/dylan': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/fun-emoji': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/glass': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/icons': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/identicon': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/initials': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/lorelei': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/lorelei-neutral': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/micah': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/miniavs': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/notionists': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/notionists-neutral': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/open-peeps': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/personas': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/pixel-art': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/pixel-art-neutral': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/rings': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/shapes': 9.2.2(@dicebear/core@9.2.2)
-      '@dicebear/thumbs': 9.2.2(@dicebear/core@9.2.2)
-
-  '@dicebear/core@9.2.2':
-    dependencies:
-      '@types/json-schema': 7.0.15
-
-  '@dicebear/croodles-neutral@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/croodles@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/dylan@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/fun-emoji@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/glass@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/icons@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/identicon@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/initials@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/lorelei-neutral@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/lorelei@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/micah@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/miniavs@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/notionists-neutral@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/notionists@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/open-peeps@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/personas@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/pixel-art-neutral@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/pixel-art@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/rings@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/shapes@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@dicebear/thumbs@9.2.2(@dicebear/core@9.2.2)':
-    dependencies:
-      '@dicebear/core': 9.2.2
-
-  '@esbuild/android-arm64@0.17.19':
-    optional: true
-
-  '@esbuild/android-arm@0.17.19':
-    optional: true
-
-  '@esbuild/android-x64@0.17.19':
-    optional: true
-
-  '@esbuild/darwin-arm64@0.17.19':
-    optional: true
-
-  '@esbuild/darwin-x64@0.17.19':
-    optional: true
-
-  '@esbuild/freebsd-arm64@0.17.19':
-    optional: true
-
-  '@esbuild/freebsd-x64@0.17.19':
-    optional: true
-
-  '@esbuild/linux-arm64@0.17.19':
-    optional: true
-
-  '@esbuild/linux-arm@0.17.19':
-    optional: true
-
-  '@esbuild/linux-ia32@0.17.19':
-    optional: true
-
-  '@esbuild/linux-loong64@0.17.19':
-    optional: true
-
-  '@esbuild/linux-mips64el@0.17.19':
-    optional: true
-
-  '@esbuild/linux-ppc64@0.17.19':
-    optional: true
-
-  '@esbuild/linux-riscv64@0.17.19':
-    optional: true
-
-  '@esbuild/linux-s390x@0.17.19':
-    optional: true
-
-  '@esbuild/linux-x64@0.17.19':
-    optional: true
-
-  '@esbuild/netbsd-x64@0.17.19':
-    optional: true
-
-  '@esbuild/openbsd-x64@0.17.19':
-    optional: true
-
-  '@esbuild/sunos-x64@0.17.19':
-    optional: true
-
-  '@esbuild/win32-arm64@0.17.19':
-    optional: true
-
-  '@esbuild/win32-ia32@0.17.19':
-    optional: true
-
-  '@esbuild/win32-x64@0.17.19':
-    optional: true
-
-  '@eslint-community/eslint-utils@4.4.0(eslint@8.57.1)':
-    dependencies:
-      eslint: 8.57.1
-      eslint-visitor-keys: 3.4.3
-
-  '@eslint-community/regexpp@4.11.1': {}
-
-  '@eslint/eslintrc@2.1.4':
-    dependencies:
-      ajv: 6.12.6
-      debug: 4.3.7(supports-color@8.1.1)
-      espree: 9.6.1
-      globals: 13.24.0
-      ignore: 5.3.2
-      import-fresh: 3.3.0
-      js-yaml: 4.1.0
-      minimatch: 3.1.2
-      strip-json-comments: 3.1.1
-    transitivePeerDependencies:
-      - supports-color
-
-  '@eslint/js@8.57.1': {}
-
-  '@fontsource/inter@4.5.15': {}
-
-  '@formatjs/cli@4.8.4(ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3))':
-    dependencies:
-      '@formatjs/icu-messageformat-parser': 2.1.0
-      '@formatjs/ts-transformer': 3.9.4(ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3))
-      '@types/estree': 0.0.50
-      '@types/fs-extra': 9.0.13
-      '@types/json-stable-stringify': 1.1.0
-      '@types/node': 14.18.63
-      '@vue/compiler-core': 3.5.12
-      chalk: 4.1.2
-      commander: 8.3.0
-      fast-glob: 3.3.2
-      fs-extra: 10.1.0
-      json-stable-stringify: 1.1.1
-      loud-rejection: 2.2.0
-      tslib: 2.8.0
-      typescript: 4.9.5
-      vue: 3.5.12(typescript@4.9.5)
-    transitivePeerDependencies:
-      - ts-jest
-
-  '@formatjs/ecma402-abstract@1.11.4':
-    dependencies:
-      '@formatjs/intl-localematcher': 0.2.25
-      tslib: 2.8.0
-
-  '@formatjs/ecma402-abstract@1.4.0':
-    dependencies:
-      tslib: 2.8.0
-
-  '@formatjs/ecma402-abstract@1.5.0':
-    dependencies:
-      tslib: 2.8.0
-
-  '@formatjs/ecma402-abstract@2.2.1':
-    dependencies:
-      '@formatjs/fast-memoize': 2.2.2
-      '@formatjs/intl-localematcher': 0.5.6
-      tslib: 2.8.0
-
-  '@formatjs/fast-memoize@2.2.2':
-    dependencies:
-      tslib: 2.8.0
-
-  '@formatjs/icu-messageformat-parser@2.1.0':
-    dependencies:
-      '@formatjs/ecma402-abstract': 1.11.4
-      '@formatjs/icu-skeleton-parser': 1.3.6
-      tslib: 2.8.0
-
-  '@formatjs/icu-messageformat-parser@2.9.1':
-    dependencies:
-      '@formatjs/ecma402-abstract': 2.2.1
-      '@formatjs/icu-skeleton-parser': 1.8.5
-      tslib: 2.8.0
-
-  '@formatjs/icu-skeleton-parser@1.3.6':
-    dependencies:
-      '@formatjs/ecma402-abstract': 1.11.4
-      tslib: 2.8.0
-
-  '@formatjs/icu-skeleton-parser@1.8.5':
-    dependencies:
-      '@formatjs/ecma402-abstract': 2.2.1
-      tslib: 2.8.0
-
-  '@formatjs/intl-displaynames@6.8.1':
-    dependencies:
-      '@formatjs/ecma402-abstract': 2.2.1
-      '@formatjs/intl-localematcher': 0.5.6
-      tslib: 2.8.0
-
-  '@formatjs/intl-listformat@7.7.1':
-    dependencies:
-      '@formatjs/ecma402-abstract': 2.2.1
-      '@formatjs/intl-localematcher': 0.5.6
-      tslib: 2.8.0
-
-  '@formatjs/intl-localematcher@0.2.25':
-    dependencies:
-      tslib: 2.8.0
-
-  '@formatjs/intl-localematcher@0.5.6':
-    dependencies:
-      tslib: 2.8.0
-
-  '@formatjs/intl-numberformat@5.7.6':
-    dependencies:
-      '@formatjs/ecma402-abstract': 1.4.0
-      tslib: 2.8.0
-
-  '@formatjs/intl@2.10.11(typescript@5.6.3)':
-    dependencies:
-      '@formatjs/ecma402-abstract': 2.2.1
-      '@formatjs/fast-memoize': 2.2.2
-      '@formatjs/icu-messageformat-parser': 2.9.1
-      '@formatjs/intl-displaynames': 6.8.1
-      '@formatjs/intl-listformat': 7.7.1
-      intl-messageformat: 10.7.3
-      tslib: 2.8.0
-    optionalDependencies:
-      typescript: 5.6.3
-
-  '@formatjs/ts-transformer@2.13.0(ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3))':
-    dependencies:
-      intl-messageformat-parser: 6.1.2
-      tslib: 2.8.0
-      typescript: 4.9.5
-    optionalDependencies:
-      ts-jest: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3)
-
-  '@formatjs/ts-transformer@3.9.4(ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3))':
-    dependencies:
-      '@formatjs/icu-messageformat-parser': 2.1.0
-      '@types/node': 14.18.63
-      chalk: 4.1.2
-      tslib: 2.8.0
-      typescript: 4.9.5
-    optionalDependencies:
-      ts-jest: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3)
-
-  '@humanwhocodes/config-array@0.13.0':
-    dependencies:
-      '@humanwhocodes/object-schema': 2.0.3
-      debug: 4.3.7(supports-color@8.1.1)
-      minimatch: 3.1.2
-    transitivePeerDependencies:
-      - supports-color
-
-  '@humanwhocodes/module-importer@1.0.1': {}
-
-  '@humanwhocodes/object-schema@2.0.3': {}
-
-  '@isaacs/cliui@8.0.2':
-    dependencies:
-      string-width: 5.1.2
-      string-width-cjs: string-width@4.2.3
-      strip-ansi: 7.1.0
-      strip-ansi-cjs: strip-ansi@6.0.1
-      wrap-ansi: 8.1.0
-      wrap-ansi-cjs: wrap-ansi@7.0.0
-
-  '@istanbuljs/load-nyc-config@1.1.0':
-    dependencies:
-      camelcase: 5.3.1
-      find-up: 4.1.0
-      get-package-type: 0.1.0
-      js-yaml: 3.14.1
-      resolve-from: 5.0.0
-
-  '@istanbuljs/schema@0.1.3': {}
-
-  '@jest/console@29.7.0':
-    dependencies:
-      '@jest/types': 29.6.3
-      '@types/node': 20.17.1
-      chalk: 4.1.2
-      jest-message-util: 29.7.0
-      jest-util: 29.7.0
-      slash: 3.0.0
-
-  '@jest/core@29.7.0(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3))':
-    dependencies:
-      '@jest/console': 29.7.0
-      '@jest/reporters': 29.7.0
-      '@jest/test-result': 29.7.0
-      '@jest/transform': 29.7.0
-      '@jest/types': 29.6.3
-      '@types/node': 20.17.1
-      ansi-escapes: 4.3.2
-      chalk: 4.1.2
-      ci-info: 3.9.0
-      exit: 0.1.2
-      graceful-fs: 4.2.11
-      jest-changed-files: 29.7.0
-      jest-config: 29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3))
-      jest-haste-map: 29.7.0
-      jest-message-util: 29.7.0
-      jest-regex-util: 29.6.3
-      jest-resolve: 29.7.0
-      jest-resolve-dependencies: 29.7.0
-      jest-runner: 29.7.0
-      jest-runtime: 29.7.0
-      jest-snapshot: 29.7.0
-      jest-util: 29.7.0
-      jest-validate: 29.7.0
-      jest-watcher: 29.7.0
-      micromatch: 4.0.8
-      pretty-format: 29.7.0
-      slash: 3.0.0
-      strip-ansi: 6.0.1
-    transitivePeerDependencies:
-      - babel-plugin-macros
-      - supports-color
-      - ts-node
-
-  '@jest/environment@29.7.0':
-    dependencies:
-      '@jest/fake-timers': 29.7.0
-      '@jest/types': 29.6.3
-      '@types/node': 20.17.1
-      jest-mock: 29.7.0
-
-  '@jest/expect-utils@29.7.0':
-    dependencies:
-      jest-get-type: 29.6.3
-
-  '@jest/expect@29.7.0':
-    dependencies:
-      expect: 29.7.0
-      jest-snapshot: 29.7.0
-    transitivePeerDependencies:
-      - supports-color
-
-  '@jest/fake-timers@29.7.0':
-    dependencies:
-      '@jest/types': 29.6.3
-      '@sinonjs/fake-timers': 10.3.0
-      '@types/node': 20.17.1
-      jest-message-util: 29.7.0
-      jest-mock: 29.7.0
-      jest-util: 29.7.0
-
-  '@jest/globals@29.7.0':
-    dependencies:
-      '@jest/environment': 29.7.0
-      '@jest/expect': 29.7.0
-      '@jest/types': 29.6.3
-      jest-mock: 29.7.0
-    transitivePeerDependencies:
-      - supports-color
-
-  '@jest/reporters@29.7.0':
-    dependencies:
-      '@bcoe/v8-coverage': 0.2.3
-      '@jest/console': 29.7.0
-      '@jest/test-result': 29.7.0
-      '@jest/transform': 29.7.0
-      '@jest/types': 29.6.3
-      '@jridgewell/trace-mapping': 0.3.25
-      '@types/node': 20.17.1
-      chalk: 4.1.2
-      collect-v8-coverage: 1.0.2
-      exit: 0.1.2
-      glob: 7.2.3
-      graceful-fs: 4.2.11
-      istanbul-lib-coverage: 3.2.2
-      istanbul-lib-instrument: 6.0.3
-      istanbul-lib-report: 3.0.1
-      istanbul-lib-source-maps: 4.0.1
-      istanbul-reports: 3.1.7
-      jest-message-util: 29.7.0
-      jest-util: 29.7.0
-      jest-worker: 29.7.0
-      slash: 3.0.0
-      string-length: 4.0.2
-      strip-ansi: 6.0.1
-      v8-to-istanbul: 9.3.0
-    transitivePeerDependencies:
-      - supports-color
-
-  '@jest/schemas@29.6.3':
-    dependencies:
-      '@sinclair/typebox': 0.27.8
-
-  '@jest/source-map@29.6.3':
-    dependencies:
-      '@jridgewell/trace-mapping': 0.3.25
-      callsites: 3.1.0
-      graceful-fs: 4.2.11
-
-  '@jest/test-result@29.7.0':
-    dependencies:
-      '@jest/console': 29.7.0
-      '@jest/types': 29.6.3
-      '@types/istanbul-lib-coverage': 2.0.6
-      collect-v8-coverage: 1.0.2
-
-  '@jest/test-sequencer@29.7.0':
-    dependencies:
-      '@jest/test-result': 29.7.0
-      graceful-fs: 4.2.11
-      jest-haste-map: 29.7.0
-      slash: 3.0.0
-
-  '@jest/transform@29.7.0':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@jest/types': 29.6.3
-      '@jridgewell/trace-mapping': 0.3.25
-      babel-plugin-istanbul: 6.1.1
-      chalk: 4.1.2
-      convert-source-map: 2.0.0
-      fast-json-stable-stringify: 2.1.0
-      graceful-fs: 4.2.11
-      jest-haste-map: 29.7.0
-      jest-regex-util: 29.6.3
-      jest-util: 29.7.0
-      micromatch: 4.0.8
-      pirates: 4.0.6
-      slash: 3.0.0
-      write-file-atomic: 4.0.2
-    transitivePeerDependencies:
-      - supports-color
-
-  '@jest/types@29.6.3':
-    dependencies:
-      '@jest/schemas': 29.6.3
-      '@types/istanbul-lib-coverage': 2.0.6
-      '@types/istanbul-reports': 3.0.4
-      '@types/node': 20.17.1
-      '@types/yargs': 17.0.33
-      chalk: 4.1.2
-
-  '@jridgewell/gen-mapping@0.3.5':
-    dependencies:
-      '@jridgewell/set-array': 1.2.1
-      '@jridgewell/sourcemap-codec': 1.5.0
-      '@jridgewell/trace-mapping': 0.3.25
-
-  '@jridgewell/resolve-uri@3.1.2': {}
-
-  '@jridgewell/set-array@1.2.1': {}
-
-  '@jridgewell/source-map@0.3.6':
-    dependencies:
-      '@jridgewell/gen-mapping': 0.3.5
-      '@jridgewell/trace-mapping': 0.3.25
-
-  '@jridgewell/sourcemap-codec@1.5.0': {}
-
-  '@jridgewell/trace-mapping@0.3.25':
-    dependencies:
-      '@jridgewell/resolve-uri': 3.1.2
-      '@jridgewell/sourcemap-codec': 1.5.0
-
-  '@jridgewell/trace-mapping@0.3.9':
-    dependencies:
-      '@jridgewell/resolve-uri': 3.1.2
-      '@jridgewell/sourcemap-codec': 1.5.0
-
-  '@kurkle/color@0.3.2': {}
-
-  '@netlify/plugin-nextjs@5.8.1': {}
-
-  '@next/env@14.2.10': {}
-
-  '@next/eslint-plugin-next@14.2.16':
-    dependencies:
-      glob: 10.3.10
-
-  '@next/swc-darwin-arm64@14.2.10':
-    optional: true
-
-  '@next/swc-darwin-x64@14.2.10':
-    optional: true
-
-  '@next/swc-linux-arm64-gnu@14.2.10':
-    optional: true
-
-  '@next/swc-linux-arm64-musl@14.2.10':
-    optional: true
-
-  '@next/swc-linux-x64-gnu@14.2.10':
-    optional: true
-
-  '@next/swc-linux-x64-musl@14.2.10':
-    optional: true
-
-  '@next/swc-win32-arm64-msvc@14.2.10':
-    optional: true
-
-  '@next/swc-win32-ia32-msvc@14.2.10':
-    optional: true
-
-  '@next/swc-win32-x64-msvc@14.2.10':
-    optional: true
-
-  '@nodelib/fs.scandir@2.1.5':
-    dependencies:
-      '@nodelib/fs.stat': 2.0.5
-      run-parallel: 1.2.0
-
-  '@nodelib/fs.stat@2.0.5': {}
-
-  '@nodelib/fs.walk@1.2.8':
-    dependencies:
-      '@nodelib/fs.scandir': 2.1.5
-      fastq: 1.17.1
-
-  '@nolyfill/is-core-module@1.0.39': {}
-
-  '@pkgjs/parseargs@0.11.0':
-    optional: true
-
-  '@prisma/client@5.17.0(prisma@5.17.0)':
-    optionalDependencies:
-      prisma: 5.17.0
-
-  '@prisma/debug@5.17.0': {}
-
-  '@prisma/engines-version@5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053': {}
-
-  '@prisma/engines@5.17.0':
-    dependencies:
-      '@prisma/debug': 5.17.0
-      '@prisma/engines-version': 5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053
-      '@prisma/fetch-engine': 5.17.0
-      '@prisma/get-platform': 5.17.0
-
-  '@prisma/extension-read-replicas@0.3.0(@prisma/client@5.17.0(prisma@5.17.0))':
-    dependencies:
-      '@prisma/client': 5.17.0(prisma@5.17.0)
-
-  '@prisma/fetch-engine@5.17.0':
-    dependencies:
-      '@prisma/debug': 5.17.0
-      '@prisma/engines-version': 5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053
-      '@prisma/get-platform': 5.17.0
-
-  '@prisma/get-platform@5.17.0':
-    dependencies:
-      '@prisma/debug': 5.17.0
-
-  '@react-spring/animated@9.7.5(react@18.3.1)':
-    dependencies:
-      '@react-spring/shared': 9.7.5(react@18.3.1)
-      '@react-spring/types': 9.7.5
-      react: 18.3.1
-
-  '@react-spring/core@9.7.5(react@18.3.1)':
-    dependencies:
-      '@react-spring/animated': 9.7.5(react@18.3.1)
-      '@react-spring/shared': 9.7.5(react@18.3.1)
-      '@react-spring/types': 9.7.5
-      react: 18.3.1
-
-  '@react-spring/rafz@9.7.5': {}
-
-  '@react-spring/shared@9.7.5(react@18.3.1)':
-    dependencies:
-      '@react-spring/rafz': 9.7.5
-      '@react-spring/types': 9.7.5
-      react: 18.3.1
-
-  '@react-spring/types@9.7.5': {}
-
-  '@react-spring/web@9.7.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
-    dependencies:
-      '@react-spring/animated': 9.7.5(react@18.3.1)
-      '@react-spring/core': 9.7.5(react@18.3.1)
-      '@react-spring/shared': 9.7.5(react@18.3.1)
-      '@react-spring/types': 9.7.5
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
-
-  '@redis/bloom@1.2.0(@redis/client@1.6.0)':
-    dependencies:
-      '@redis/client': 1.6.0
-
-  '@redis/client@1.6.0':
-    dependencies:
-      cluster-key-slot: 1.1.2
-      generic-pool: 3.9.0
-      yallist: 4.0.0
-
-  '@redis/graph@1.1.1(@redis/client@1.6.0)':
-    dependencies:
-      '@redis/client': 1.6.0
-
-  '@redis/json@1.0.7(@redis/client@1.6.0)':
-    dependencies:
-      '@redis/client': 1.6.0
-
-  '@redis/search@1.2.0(@redis/client@1.6.0)':
-    dependencies:
-      '@redis/client': 1.6.0
-
-  '@redis/time-series@1.1.0(@redis/client@1.6.0)':
-    dependencies:
-      '@redis/client': 1.6.0
-
-  '@rollup/plugin-alias@5.1.1(rollup@3.29.5)':
-    optionalDependencies:
-      rollup: 3.29.5
-
-  '@rollup/plugin-commonjs@25.0.8(rollup@3.29.5)':
-    dependencies:
-      '@rollup/pluginutils': 5.1.3(rollup@3.29.5)
-      commondir: 1.0.1
-      estree-walker: 2.0.2
-      glob: 8.1.0
-      is-reference: 1.2.1
-      magic-string: 0.30.12
-    optionalDependencies:
-      rollup: 3.29.5
-
-  '@rollup/plugin-json@6.1.0(rollup@3.29.5)':
-    dependencies:
-      '@rollup/pluginutils': 5.1.3(rollup@3.29.5)
-    optionalDependencies:
-      rollup: 3.29.5
-
-  '@rollup/plugin-node-resolve@15.3.0(rollup@3.29.5)':
-    dependencies:
-      '@rollup/pluginutils': 5.1.3(rollup@3.29.5)
-      '@types/resolve': 1.20.2
-      deepmerge: 4.3.1
-      is-module: 1.0.0
-      resolve: 1.22.8
-    optionalDependencies:
-      rollup: 3.29.5
-
-  '@rollup/plugin-replace@5.0.7(rollup@3.29.5)':
-    dependencies:
-      '@rollup/pluginutils': 5.1.3(rollup@3.29.5)
-      magic-string: 0.30.12
-    optionalDependencies:
-      rollup: 3.29.5
-
-  '@rollup/pluginutils@5.1.3(rollup@3.29.5)':
-    dependencies:
-      '@types/estree': 1.0.6
-      estree-walker: 2.0.2
-      picomatch: 4.0.2
-    optionalDependencies:
-      rollup: 3.29.5
-
-  '@rtsao/scc@1.1.0': {}
-
-  '@rushstack/eslint-patch@1.10.4': {}
-
-  '@sinclair/typebox@0.27.8': {}
-
-  '@sinonjs/commons@3.0.1':
-    dependencies:
-      type-detect: 4.0.8
-
-  '@sinonjs/fake-timers@10.3.0':
-    dependencies:
-      '@sinonjs/commons': 3.0.1
-
-  '@svgr/babel-plugin-add-jsx-attribute@8.0.0(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-
-  '@svgr/babel-plugin-remove-jsx-attribute@8.0.0(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-
-  '@svgr/babel-plugin-remove-jsx-empty-expression@8.0.0(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-
-  '@svgr/babel-plugin-replace-jsx-attribute-value@8.0.0(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-
-  '@svgr/babel-plugin-svg-dynamic-title@8.0.0(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-
-  '@svgr/babel-plugin-svg-em-dimensions@8.0.0(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-
-  '@svgr/babel-plugin-transform-react-native-svg@8.1.0(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-
-  '@svgr/babel-plugin-transform-svg-component@8.0.0(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-
-  '@svgr/babel-preset@8.1.0(@babel/core@7.26.0)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@svgr/babel-plugin-add-jsx-attribute': 8.0.0(@babel/core@7.26.0)
-      '@svgr/babel-plugin-remove-jsx-attribute': 8.0.0(@babel/core@7.26.0)
-      '@svgr/babel-plugin-remove-jsx-empty-expression': 8.0.0(@babel/core@7.26.0)
-      '@svgr/babel-plugin-replace-jsx-attribute-value': 8.0.0(@babel/core@7.26.0)
-      '@svgr/babel-plugin-svg-dynamic-title': 8.0.0(@babel/core@7.26.0)
-      '@svgr/babel-plugin-svg-em-dimensions': 8.0.0(@babel/core@7.26.0)
-      '@svgr/babel-plugin-transform-react-native-svg': 8.1.0(@babel/core@7.26.0)
-      '@svgr/babel-plugin-transform-svg-component': 8.0.0(@babel/core@7.26.0)
-
-  '@svgr/core@8.1.0(typescript@5.6.3)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@svgr/babel-preset': 8.1.0(@babel/core@7.26.0)
-      camelcase: 6.3.0
-      cosmiconfig: 8.3.6(typescript@5.6.3)
-      snake-case: 3.0.4
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
-  '@svgr/hast-util-to-babel-ast@8.0.0':
-    dependencies:
-      '@babel/types': 7.26.0
-      entities: 4.5.0
-
-  '@svgr/plugin-jsx@8.1.0(@svgr/core@8.1.0(typescript@5.6.3))':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@svgr/babel-preset': 8.1.0(@babel/core@7.26.0)
-      '@svgr/core': 8.1.0(typescript@5.6.3)
-      '@svgr/hast-util-to-babel-ast': 8.0.0
-      svg-parser: 2.0.4
-    transitivePeerDependencies:
-      - supports-color
-
-  '@svgr/plugin-svgo@8.1.0(@svgr/core@8.1.0(typescript@5.6.3))(typescript@5.6.3)':
-    dependencies:
-      '@svgr/core': 8.1.0(typescript@5.6.3)
-      cosmiconfig: 8.3.6(typescript@5.6.3)
-      deepmerge: 4.3.1
-      svgo: 3.3.2
-    transitivePeerDependencies:
-      - typescript
-
-  '@svgr/rollup@8.1.0(rollup@3.29.5)(typescript@5.6.3)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/plugin-transform-react-constant-elements': 7.25.9(@babel/core@7.26.0)
-      '@babel/preset-env': 7.26.0(@babel/core@7.26.0)
-      '@babel/preset-react': 7.25.9(@babel/core@7.26.0)
-      '@babel/preset-typescript': 7.26.0(@babel/core@7.26.0)
-      '@rollup/pluginutils': 5.1.3(rollup@3.29.5)
-      '@svgr/core': 8.1.0(typescript@5.6.3)
-      '@svgr/plugin-jsx': 8.1.0(@svgr/core@8.1.0(typescript@5.6.3))
-      '@svgr/plugin-svgo': 8.1.0(@svgr/core@8.1.0(typescript@5.6.3))(typescript@5.6.3)
-    transitivePeerDependencies:
-      - rollup
-      - supports-color
-      - typescript
-
-  '@svgr/webpack@8.1.0(typescript@5.6.3)':
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/plugin-transform-react-constant-elements': 7.25.9(@babel/core@7.26.0)
-      '@babel/preset-env': 7.26.0(@babel/core@7.26.0)
-      '@babel/preset-react': 7.25.9(@babel/core@7.26.0)
-      '@babel/preset-typescript': 7.26.0(@babel/core@7.26.0)
-      '@svgr/core': 8.1.0(typescript@5.6.3)
-      '@svgr/plugin-jsx': 8.1.0(@svgr/core@8.1.0(typescript@5.6.3))
-      '@svgr/plugin-svgo': 8.1.0(@svgr/core@8.1.0(typescript@5.6.3))(typescript@5.6.3)
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
-  '@swc/counter@0.1.3': {}
-
-  '@swc/helpers@0.5.5':
-    dependencies:
-      '@swc/counter': 0.1.3
-      tslib: 2.8.0
-
-  '@tanstack/query-core@5.59.16': {}
-
-  '@tanstack/react-query@5.59.16(react@18.3.1)':
-    dependencies:
-      '@tanstack/query-core': 5.59.16
-      react: 18.3.1
-
-  '@trysound/sax@0.2.0': {}
-
-  '@tsconfig/node10@1.0.11': {}
-
-  '@tsconfig/node12@1.0.11': {}
-
-  '@tsconfig/node14@1.0.3': {}
-
-  '@tsconfig/node16@1.0.4': {}
-
-  '@types/babel__core@7.20.5':
-    dependencies:
-      '@babel/parser': 7.26.0
-      '@babel/types': 7.26.0
-      '@types/babel__generator': 7.6.8
-      '@types/babel__template': 7.4.4
-      '@types/babel__traverse': 7.20.6
-
-  '@types/babel__generator@7.6.8':
-    dependencies:
-      '@babel/types': 7.26.0
-
-  '@types/babel__template@7.4.4':
-    dependencies:
-      '@babel/parser': 7.26.0
-      '@babel/types': 7.26.0
-
-  '@types/babel__traverse@7.20.6':
-    dependencies:
-      '@babel/types': 7.26.0
-
-  '@types/cypress@1.1.6':
-    dependencies:
-      cypress: 13.15.1
-
-  '@types/estree@0.0.50': {}
-
-  '@types/estree@1.0.6': {}
-
-  '@types/fs-extra@8.1.5':
-    dependencies:
-      '@types/node': 20.17.1
-
-  '@types/fs-extra@9.0.13':
-    dependencies:
-      '@types/node': 20.17.1
-
-  '@types/glob@7.2.0':
-    dependencies:
-      '@types/minimatch': 5.1.2
-      '@types/node': 20.17.1
-
-  '@types/graceful-fs@4.1.9':
-    dependencies:
-      '@types/node': 20.17.1
-
-  '@types/hoist-non-react-statics@3.3.5':
-    dependencies:
-      '@types/react': 18.3.12
-      hoist-non-react-statics: 3.3.2
-
-  '@types/istanbul-lib-coverage@2.0.6': {}
-
-  '@types/istanbul-lib-report@3.0.3':
-    dependencies:
-      '@types/istanbul-lib-coverage': 2.0.6
-
-  '@types/istanbul-reports@3.0.4':
-    dependencies:
-      '@types/istanbul-lib-report': 3.0.3
-
-  '@types/jest@29.5.14':
-    dependencies:
-      expect: 29.7.0
-      pretty-format: 29.7.0
-
-  '@types/json-schema@7.0.15': {}
-
-  '@types/json-stable-stringify@1.1.0': {}
-
-  '@types/json5@0.0.29': {}
-
-  '@types/lodash@4.17.12': {}
-
-  '@types/minimatch@5.1.2': {}
-
-  '@types/minimist@1.2.5': {}
-
-  '@types/node@14.18.63': {}
-
-  '@types/node@20.17.1':
-    dependencies:
-      undici-types: 6.19.8
-
-  '@types/normalize-package-data@2.4.4': {}
-
-  '@types/prop-types@15.7.13': {}
-
-  '@types/react-dom@18.3.1':
-    dependencies:
-      '@types/react': 18.3.12
-
-  '@types/react-redux@7.1.34':
-    dependencies:
-      '@types/hoist-non-react-statics': 3.3.5
-      '@types/react': 18.3.12
-      hoist-non-react-statics: 3.3.2
-      redux: 4.2.1
-
-  '@types/react-window@1.8.8':
-    dependencies:
-      '@types/react': 18.3.12
-
-  '@types/react@18.3.12':
-    dependencies:
-      '@types/prop-types': 15.7.13
-      csstype: 3.1.3
-
-  '@types/resolve@1.20.2': {}
-
-  '@types/schema-utils@2.4.0':
-    dependencies:
-      schema-utils: 2.7.1
-
-  '@types/semver@7.5.8': {}
-
-  '@types/sinonjs__fake-timers@8.1.1': {}
-
-  '@types/sizzle@2.3.9': {}
-
-  '@types/stack-utils@2.0.3': {}
-
-  '@types/yargs-parser@21.0.3': {}
-
-  '@types/yargs@17.0.33':
-    dependencies:
-      '@types/yargs-parser': 21.0.3
-
-  '@types/yauzl@2.10.3':
-    dependencies:
-      '@types/node': 20.17.1
-    optional: true
-
-  '@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1)(typescript@5.6.3)':
-    dependencies:
-      '@eslint-community/regexpp': 4.11.1
-      '@typescript-eslint/parser': 6.21.0(eslint@8.57.1)(typescript@5.6.3)
-      '@typescript-eslint/scope-manager': 6.21.0
-      '@typescript-eslint/type-utils': 6.21.0(eslint@8.57.1)(typescript@5.6.3)
-      '@typescript-eslint/utils': 6.21.0(eslint@8.57.1)(typescript@5.6.3)
-      '@typescript-eslint/visitor-keys': 6.21.0
-      debug: 4.3.7(supports-color@8.1.1)
-      eslint: 8.57.1
-      graphemer: 1.4.0
-      ignore: 5.3.2
-      natural-compare: 1.4.0
-      semver: 7.6.3
-      ts-api-utils: 1.3.0(typescript@5.6.3)
-    optionalDependencies:
-      typescript: 5.6.3
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3)':
-    dependencies:
-      '@typescript-eslint/scope-manager': 6.21.0
-      '@typescript-eslint/types': 6.21.0
-      '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.6.3)
-      '@typescript-eslint/visitor-keys': 6.21.0
-      debug: 4.3.7(supports-color@8.1.1)
-      eslint: 8.57.1
-    optionalDependencies:
-      typescript: 5.6.3
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/scope-manager@5.62.0':
-    dependencies:
-      '@typescript-eslint/types': 5.62.0
-      '@typescript-eslint/visitor-keys': 5.62.0
-
-  '@typescript-eslint/scope-manager@6.21.0':
-    dependencies:
-      '@typescript-eslint/types': 6.21.0
-      '@typescript-eslint/visitor-keys': 6.21.0
-
-  '@typescript-eslint/type-utils@6.21.0(eslint@8.57.1)(typescript@5.6.3)':
-    dependencies:
-      '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.6.3)
-      '@typescript-eslint/utils': 6.21.0(eslint@8.57.1)(typescript@5.6.3)
-      debug: 4.3.7(supports-color@8.1.1)
-      eslint: 8.57.1
-      ts-api-utils: 1.3.0(typescript@5.6.3)
-    optionalDependencies:
-      typescript: 5.6.3
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/types@5.62.0': {}
-
-  '@typescript-eslint/types@6.21.0': {}
-
-  '@typescript-eslint/typescript-estree@5.62.0(typescript@5.6.3)':
-    dependencies:
-      '@typescript-eslint/types': 5.62.0
-      '@typescript-eslint/visitor-keys': 5.62.0
-      debug: 4.3.7(supports-color@8.1.1)
-      globby: 11.1.0
-      is-glob: 4.0.3
-      semver: 7.6.3
-      tsutils: 3.21.0(typescript@5.6.3)
-    optionalDependencies:
-      typescript: 5.6.3
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/typescript-estree@6.21.0(typescript@5.6.3)':
-    dependencies:
-      '@typescript-eslint/types': 6.21.0
-      '@typescript-eslint/visitor-keys': 6.21.0
-      debug: 4.3.7(supports-color@8.1.1)
-      globby: 11.1.0
-      is-glob: 4.0.3
-      minimatch: 9.0.3
-      semver: 7.6.3
-      ts-api-utils: 1.3.0(typescript@5.6.3)
-    optionalDependencies:
-      typescript: 5.6.3
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/utils@5.62.0(eslint@8.57.1)(typescript@5.6.3)':
-    dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.1)
-      '@types/json-schema': 7.0.15
-      '@types/semver': 7.5.8
-      '@typescript-eslint/scope-manager': 5.62.0
-      '@typescript-eslint/types': 5.62.0
-      '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.6.3)
-      eslint: 8.57.1
-      eslint-scope: 5.1.1
-      semver: 7.6.3
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
-  '@typescript-eslint/utils@6.21.0(eslint@8.57.1)(typescript@5.6.3)':
-    dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.1)
-      '@types/json-schema': 7.0.15
-      '@types/semver': 7.5.8
-      '@typescript-eslint/scope-manager': 6.21.0
-      '@typescript-eslint/types': 6.21.0
-      '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.6.3)
-      eslint: 8.57.1
-      semver: 7.6.3
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
-  '@typescript-eslint/visitor-keys@5.62.0':
-    dependencies:
-      '@typescript-eslint/types': 5.62.0
-      eslint-visitor-keys: 3.4.3
-
-  '@typescript-eslint/visitor-keys@6.21.0':
-    dependencies:
-      '@typescript-eslint/types': 6.21.0
-      eslint-visitor-keys: 3.4.3
-
-  '@umami/prisma-client@0.14.0(@prisma/client@5.17.0(prisma@5.17.0))(@prisma/extension-read-replicas@0.3.0(@prisma/client@5.17.0(prisma@5.17.0)))':
-    dependencies:
-      '@prisma/client': 5.17.0(prisma@5.17.0)
-      '@prisma/extension-read-replicas': 0.3.0(@prisma/client@5.17.0(prisma@5.17.0))
-      chalk: 4.1.2
-      debug: 4.3.7(supports-color@8.1.1)
-    transitivePeerDependencies:
-      - supports-color
-
-  '@umami/redis-client@0.21.0':
-    dependencies:
-      debug: 4.3.7(supports-color@8.1.1)
-      redis: 4.7.0
-    transitivePeerDependencies:
-      - supports-color
-
-  '@ungap/structured-clone@1.2.0': {}
-
-  '@vue/compiler-core@3.5.12':
-    dependencies:
-      '@babel/parser': 7.26.0
-      '@vue/shared': 3.5.12
-      entities: 4.5.0
-      estree-walker: 2.0.2
-      source-map-js: 1.2.1
-
-  '@vue/compiler-dom@3.5.12':
-    dependencies:
-      '@vue/compiler-core': 3.5.12
-      '@vue/shared': 3.5.12
-
-  '@vue/compiler-sfc@3.5.12':
-    dependencies:
-      '@babel/parser': 7.26.0
-      '@vue/compiler-core': 3.5.12
-      '@vue/compiler-dom': 3.5.12
-      '@vue/compiler-ssr': 3.5.12
-      '@vue/shared': 3.5.12
-      estree-walker: 2.0.2
-      magic-string: 0.30.12
-      postcss: 8.4.47
-      source-map-js: 1.2.1
-
-  '@vue/compiler-ssr@3.5.12':
-    dependencies:
-      '@vue/compiler-dom': 3.5.12
-      '@vue/shared': 3.5.12
-
-  '@vue/reactivity@3.5.12':
-    dependencies:
-      '@vue/shared': 3.5.12
-
-  '@vue/runtime-core@3.5.12':
-    dependencies:
-      '@vue/reactivity': 3.5.12
-      '@vue/shared': 3.5.12
-
-  '@vue/runtime-dom@3.5.12':
-    dependencies:
-      '@vue/reactivity': 3.5.12
-      '@vue/runtime-core': 3.5.12
-      '@vue/shared': 3.5.12
-      csstype: 3.1.3
-
-  '@vue/server-renderer@3.5.12(vue@3.5.12(typescript@5.6.3))':
-    dependencies:
-      '@vue/compiler-ssr': 3.5.12
-      '@vue/shared': 3.5.12
-      vue: 3.5.12(typescript@4.9.5)
-
-  '@vue/shared@3.5.12': {}
-
-  acorn-jsx@5.3.2(acorn@8.13.0):
-    dependencies:
-      acorn: 8.13.0
-
-  acorn-walk@8.3.4:
-    dependencies:
-      acorn: 8.13.0
-
-  acorn@8.13.0: {}
-
-  aggregate-error@3.1.0:
-    dependencies:
-      clean-stack: 2.2.0
-      indent-string: 4.0.0
-
-  ajv-keywords@3.5.2(ajv@6.12.6):
-    dependencies:
-      ajv: 6.12.6
-
-  ajv@6.12.6:
-    dependencies:
-      fast-deep-equal: 3.1.3
-      fast-json-stable-stringify: 2.1.0
-      json-schema-traverse: 0.4.1
-      uri-js: 4.4.1
-
-  ajv@8.17.1:
-    dependencies:
-      fast-deep-equal: 3.1.3
-      fast-uri: 3.0.3
-      json-schema-traverse: 1.0.0
-      require-from-string: 2.0.2
-
-  ansi-colors@4.1.3: {}
-
-  ansi-escapes@4.3.2:
-    dependencies:
-      type-fest: 0.21.3
-
-  ansi-escapes@5.0.0:
-    dependencies:
-      type-fest: 1.4.0
-
-  ansi-regex@5.0.1: {}
-
-  ansi-regex@6.1.0: {}
-
-  ansi-styles@3.2.1:
-    dependencies:
-      color-convert: 1.9.3
-
-  ansi-styles@4.3.0:
-    dependencies:
-      color-convert: 2.0.1
-
-  ansi-styles@5.2.0: {}
-
-  ansi-styles@6.2.1: {}
-
-  anymatch@3.1.3:
-    dependencies:
-      normalize-path: 3.0.0
-      picomatch: 2.3.1
-
-  arch@2.2.0: {}
-
-  arg@4.1.3: {}
-
-  argparse@1.0.10:
-    dependencies:
-      sprintf-js: 1.0.3
-
-  argparse@2.0.1: {}
-
-  aria-query@5.3.2: {}
-
-  array-buffer-byte-length@1.0.1:
-    dependencies:
-      call-bind: 1.0.7
-      is-array-buffer: 3.0.4
-
-  array-find-index@1.0.2: {}
-
-  array-includes@3.1.8:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-object-atoms: 1.0.0
-      get-intrinsic: 1.2.4
-      is-string: 1.0.7
-
-  array-union@2.1.0: {}
-
-  array.prototype.findlast@1.2.5:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-errors: 1.3.0
-      es-object-atoms: 1.0.0
-      es-shim-unscopables: 1.0.2
-
-  array.prototype.findlastindex@1.2.5:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-errors: 1.3.0
-      es-object-atoms: 1.0.0
-      es-shim-unscopables: 1.0.2
-
-  array.prototype.flat@1.3.2:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-shim-unscopables: 1.0.2
-
-  array.prototype.flatmap@1.3.2:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-shim-unscopables: 1.0.2
-
-  array.prototype.tosorted@1.1.4:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-errors: 1.3.0
-      es-shim-unscopables: 1.0.2
-
-  arraybuffer.prototype.slice@1.0.3:
-    dependencies:
-      array-buffer-byte-length: 1.0.1
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-errors: 1.3.0
-      get-intrinsic: 1.2.4
-      is-array-buffer: 3.0.4
-      is-shared-array-buffer: 1.0.3
-
-  arrify@1.0.1: {}
-
-  asn1@0.2.6:
-    dependencies:
-      safer-buffer: 2.1.2
-
-  assert-plus@1.0.0: {}
-
-  ast-types-flow@0.0.8: {}
-
-  astral-regex@2.0.0: {}
-
-  async@3.2.6: {}
-
-  asynckit@0.4.0: {}
-
-  at-least-node@1.0.0: {}
-
-  autoprefixer@10.4.20(postcss@8.4.47):
-    dependencies:
-      browserslist: 4.24.2
-      caniuse-lite: 1.0.30001669
-      fraction.js: 4.3.7
-      normalize-range: 0.1.2
-      picocolors: 1.1.1
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  available-typed-arrays@1.0.7:
-    dependencies:
-      possible-typed-array-names: 1.0.0
-
-  aws-sign2@0.7.0: {}
-
-  aws4@1.13.2: {}
-
-  axe-core@4.10.2: {}
-
-  axobject-query@4.1.0: {}
-
-  babel-jest@29.7.0(@babel/core@7.26.0):
-    dependencies:
-      '@babel/core': 7.26.0
-      '@jest/transform': 29.7.0
-      '@types/babel__core': 7.20.5
-      babel-plugin-istanbul: 6.1.1
-      babel-preset-jest: 29.6.3(@babel/core@7.26.0)
-      chalk: 4.1.2
-      graceful-fs: 4.2.11
-      slash: 3.0.0
-    transitivePeerDependencies:
-      - supports-color
-
-  babel-plugin-istanbul@6.1.1:
-    dependencies:
-      '@babel/helper-plugin-utils': 7.25.9
-      '@istanbuljs/load-nyc-config': 1.1.0
-      '@istanbuljs/schema': 0.1.3
-      istanbul-lib-instrument: 5.2.1
-      test-exclude: 6.0.0
-    transitivePeerDependencies:
-      - supports-color
-
-  babel-plugin-jest-hoist@29.6.3:
-    dependencies:
-      '@babel/template': 7.25.9
-      '@babel/types': 7.26.0
-      '@types/babel__core': 7.20.5
-      '@types/babel__traverse': 7.20.6
-
-  babel-plugin-polyfill-corejs2@0.4.11(@babel/core@7.26.0):
-    dependencies:
-      '@babel/compat-data': 7.26.0
-      '@babel/core': 7.26.0
-      '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.26.0)
-      semver: 6.3.1
-    transitivePeerDependencies:
-      - supports-color
-
-  babel-plugin-polyfill-corejs3@0.10.6(@babel/core@7.26.0):
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.26.0)
-      core-js-compat: 3.38.1
-    transitivePeerDependencies:
-      - supports-color
-
-  babel-plugin-polyfill-regenerator@0.6.2(@babel/core@7.26.0):
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.26.0)
-    transitivePeerDependencies:
-      - supports-color
-
-  babel-plugin-react-intl@7.9.4(ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3)):
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/helper-plugin-utils': 7.25.9
-      '@babel/types': 7.26.0
-      '@formatjs/ts-transformer': 2.13.0(ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3))
-      '@types/babel__core': 7.20.5
-      '@types/fs-extra': 9.0.13
-      '@types/schema-utils': 2.4.0
-      fs-extra: 9.1.0
-      intl-messageformat-parser: 5.5.1
-      schema-utils: 2.7.1
-    transitivePeerDependencies:
-      - supports-color
-      - ts-jest
-
-  babel-preset-current-node-syntax@1.1.0(@babel/core@7.26.0):
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.26.0)
-      '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.26.0)
-      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.26.0)
-      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.26.0)
-      '@babel/plugin-syntax-import-attributes': 7.26.0(@babel/core@7.26.0)
-      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.26.0)
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.26.0)
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.26.0)
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.26.0)
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.26.0)
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.26.0)
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.26.0)
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.26.0)
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.26.0)
-      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.26.0)
-
-  babel-preset-jest@29.6.3(@babel/core@7.26.0):
-    dependencies:
-      '@babel/core': 7.26.0
-      babel-plugin-jest-hoist: 29.6.3
-      babel-preset-current-node-syntax: 1.1.0(@babel/core@7.26.0)
-
-  balanced-match@1.0.2: {}
-
-  balanced-match@2.0.0: {}
-
-  base64-js@1.5.1: {}
-
-  bcrypt-pbkdf@1.0.2:
-    dependencies:
-      tweetnacl: 0.14.5
-
-  bcryptjs@2.4.3: {}
-
-  blob-util@2.0.2: {}
-
-  bluebird@3.7.2: {}
-
-  boolbase@1.0.0: {}
-
-  brace-expansion@1.1.11:
-    dependencies:
-      balanced-match: 1.0.2
-      concat-map: 0.0.1
-
-  brace-expansion@2.0.1:
-    dependencies:
-      balanced-match: 1.0.2
-
-  braces@3.0.3:
-    dependencies:
-      fill-range: 7.1.1
-
-  browserslist@4.24.2:
-    dependencies:
-      caniuse-lite: 1.0.30001669
-      electron-to-chromium: 1.5.46
-      node-releases: 2.0.18
-      update-browserslist-db: 1.1.1(browserslist@4.24.2)
-
-  bs-logger@0.2.6:
-    dependencies:
-      fast-json-stable-stringify: 2.1.0
-
-  bser@2.1.1:
-    dependencies:
-      node-int64: 0.4.0
-
-  buffer-crc32@0.2.13: {}
-
-  buffer-equal-constant-time@1.0.1: {}
-
-  buffer-from@1.1.2: {}
-
-  buffer@5.7.1:
-    dependencies:
-      base64-js: 1.5.1
-      ieee754: 1.2.1
-
-  busboy@1.6.0:
-    dependencies:
-      streamsearch: 1.1.0
-
-  cachedir@2.4.0: {}
-
-  call-bind@1.0.7:
-    dependencies:
-      es-define-property: 1.0.0
-      es-errors: 1.3.0
-      function-bind: 1.1.2
-      get-intrinsic: 1.2.4
-      set-function-length: 1.2.2
-
-  callsites@3.1.0: {}
-
-  camelcase-keys@6.2.2:
-    dependencies:
-      camelcase: 5.3.1
-      map-obj: 4.3.0
-      quick-lru: 4.0.1
-
-  camelcase-keys@7.0.2:
-    dependencies:
-      camelcase: 6.3.0
-      map-obj: 4.3.0
-      quick-lru: 5.1.1
-      type-fest: 1.4.0
-
-  camelcase@5.3.1: {}
-
-  camelcase@6.3.0: {}
-
-  caniuse-api@3.0.0:
-    dependencies:
-      browserslist: 4.24.2
-      caniuse-lite: 1.0.30001669
-      lodash.memoize: 4.1.2
-      lodash.uniq: 4.5.0
-
-  caniuse-lite@1.0.30001669: {}
-
-  caseless@0.12.0: {}
-
-  chalk@2.4.2:
-    dependencies:
-      ansi-styles: 3.2.1
-      escape-string-regexp: 1.0.5
-      supports-color: 5.5.0
-
-  chalk@4.1.2:
-    dependencies:
-      ansi-styles: 4.3.0
-      supports-color: 7.2.0
-
-  chalk@5.3.0: {}
-
-  char-regex@1.0.2: {}
-
-  charenc@0.0.2: {}
-
-  chart.js@4.4.5:
-    dependencies:
-      '@kurkle/color': 0.3.2
-
-  chartjs-adapter-date-fns@3.0.0(chart.js@4.4.5)(date-fns@2.30.0):
-    dependencies:
-      chart.js: 4.4.5
-      date-fns: 2.30.0
-
-  check-more-types@2.24.0: {}
-
-  chownr@2.0.0: {}
-
-  ci-info@3.9.0: {}
-
-  cjs-module-lexer@1.4.1: {}
-
-  classnames@2.5.1: {}
-
-  clean-stack@2.2.0: {}
-
-  cli-cursor@3.1.0:
-    dependencies:
-      restore-cursor: 3.1.0
-
-  cli-cursor@4.0.0:
-    dependencies:
-      restore-cursor: 4.0.0
-
-  cli-table3@0.6.5:
-    dependencies:
-      string-width: 4.2.3
-    optionalDependencies:
-      '@colors/colors': 1.5.0
-
-  cli-truncate@2.1.0:
-    dependencies:
-      slice-ansi: 3.0.0
-      string-width: 4.2.3
-
-  cli-truncate@3.1.0:
-    dependencies:
-      slice-ansi: 5.0.0
-      string-width: 5.1.2
-
-  client-only@0.0.1: {}
-
-  cliui@8.0.1:
-    dependencies:
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-      wrap-ansi: 7.0.0
-
-  cluster-key-slot@1.1.2: {}
-
-  co@4.6.0: {}
-
-  collect-v8-coverage@1.0.2: {}
-
-  color-convert@1.9.3:
-    dependencies:
-      color-name: 1.1.3
-
-  color-convert@2.0.1:
-    dependencies:
-      color-name: 1.1.4
-
-  color-name@1.1.3: {}
-
-  color-name@1.1.4: {}
-
-  colord@2.9.3: {}
-
-  colorette@1.4.0: {}
-
-  colorette@2.0.20: {}
-
-  combined-stream@1.0.8:
-    dependencies:
-      delayed-stream: 1.0.0
-
-  commander@11.0.0: {}
-
-  commander@2.20.3: {}
-
-  commander@6.2.1: {}
-
-  commander@7.2.0: {}
-
-  commander@8.3.0: {}
-
-  common-tags@1.8.2: {}
-
-  commondir@1.0.1: {}
-
-  concat-map@0.0.1: {}
-
-  concat-with-sourcemaps@1.1.0:
-    dependencies:
-      source-map: 0.6.1
-
-  convert-source-map@2.0.0: {}
-
-  core-js-compat@3.38.1:
-    dependencies:
-      browserslist: 4.24.2
-
-  core-util-is@1.0.2: {}
-
-  cors@2.8.5:
-    dependencies:
-      object-assign: 4.1.1
-      vary: 1.1.2
-
-  cosmiconfig@8.3.6(typescript@5.6.3):
-    dependencies:
-      import-fresh: 3.3.0
-      js-yaml: 4.1.0
-      parse-json: 5.2.0
-      path-type: 4.0.0
-    optionalDependencies:
-      typescript: 5.6.3
-
-  create-jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)):
-    dependencies:
-      '@jest/types': 29.6.3
-      chalk: 4.1.2
-      exit: 0.1.2
-      graceful-fs: 4.2.11
-      jest-config: 29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3))
-      jest-util: 29.7.0
-      prompts: 2.4.2
-    transitivePeerDependencies:
-      - '@types/node'
-      - babel-plugin-macros
-      - supports-color
-      - ts-node
-
-  create-require@1.1.1: {}
-
-  cross-env@7.0.3:
-    dependencies:
-      cross-spawn: 7.0.3
-
-  cross-spawn@6.0.5:
-    dependencies:
-      nice-try: 1.0.5
-      path-key: 2.0.1
-      semver: 5.7.2
-      shebang-command: 1.2.0
-      which: 1.3.1
-
-  cross-spawn@7.0.3:
-    dependencies:
-      path-key: 3.1.1
-      shebang-command: 2.0.0
-      which: 2.0.2
-
-  crypt@0.0.2: {}
-
-  css-blank-pseudo@3.0.3(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-selector-parser: 6.1.2
-
-  css-box-model@1.2.1:
-    dependencies:
-      tiny-invariant: 1.3.3
-
-  css-declaration-sorter@6.4.1(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-
-  css-functions-list@3.2.3: {}
-
-  css-has-pseudo@3.0.4(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-selector-parser: 6.1.2
-
-  css-prefers-color-scheme@6.0.3(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-
-  css-select@4.3.0:
-    dependencies:
-      boolbase: 1.0.0
-      css-what: 6.1.0
-      domhandler: 4.3.1
-      domutils: 2.8.0
-      nth-check: 2.1.1
-
-  css-select@5.1.0:
-    dependencies:
-      boolbase: 1.0.0
-      css-what: 6.1.0
-      domhandler: 5.0.3
-      domutils: 3.1.0
-      nth-check: 2.1.1
-
-  css-tree@1.1.3:
-    dependencies:
-      mdn-data: 2.0.14
-      source-map: 0.6.1
-
-  css-tree@2.2.1:
-    dependencies:
-      mdn-data: 2.0.28
-      source-map-js: 1.2.1
-
-  css-tree@2.3.1:
-    dependencies:
-      mdn-data: 2.0.30
-      source-map-js: 1.2.1
-
-  css-tree@3.0.0:
-    dependencies:
-      mdn-data: 2.10.0
-      source-map-js: 1.2.1
-    optional: true
-
-  css-what@6.1.0: {}
-
-  cssdb@7.11.2: {}
-
-  cssesc@3.0.0: {}
-
-  cssnano-preset-default@5.2.14(postcss@8.4.47):
-    dependencies:
-      css-declaration-sorter: 6.4.1(postcss@8.4.47)
-      cssnano-utils: 3.1.0(postcss@8.4.47)
-      postcss: 8.4.47
-      postcss-calc: 8.2.4(postcss@8.4.47)
-      postcss-colormin: 5.3.1(postcss@8.4.47)
-      postcss-convert-values: 5.1.3(postcss@8.4.47)
-      postcss-discard-comments: 5.1.2(postcss@8.4.47)
-      postcss-discard-duplicates: 5.1.0(postcss@8.4.47)
-      postcss-discard-empty: 5.1.1(postcss@8.4.47)
-      postcss-discard-overridden: 5.1.0(postcss@8.4.47)
-      postcss-merge-longhand: 5.1.7(postcss@8.4.47)
-      postcss-merge-rules: 5.1.4(postcss@8.4.47)
-      postcss-minify-font-values: 5.1.0(postcss@8.4.47)
-      postcss-minify-gradients: 5.1.1(postcss@8.4.47)
-      postcss-minify-params: 5.1.4(postcss@8.4.47)
-      postcss-minify-selectors: 5.2.1(postcss@8.4.47)
-      postcss-normalize-charset: 5.1.0(postcss@8.4.47)
-      postcss-normalize-display-values: 5.1.0(postcss@8.4.47)
-      postcss-normalize-positions: 5.1.1(postcss@8.4.47)
-      postcss-normalize-repeat-style: 5.1.1(postcss@8.4.47)
-      postcss-normalize-string: 5.1.0(postcss@8.4.47)
-      postcss-normalize-timing-functions: 5.1.0(postcss@8.4.47)
-      postcss-normalize-unicode: 5.1.1(postcss@8.4.47)
-      postcss-normalize-url: 5.1.0(postcss@8.4.47)
-      postcss-normalize-whitespace: 5.1.1(postcss@8.4.47)
-      postcss-ordered-values: 5.1.3(postcss@8.4.47)
-      postcss-reduce-initial: 5.1.2(postcss@8.4.47)
-      postcss-reduce-transforms: 5.1.0(postcss@8.4.47)
-      postcss-svgo: 5.1.0(postcss@8.4.47)
-      postcss-unique-selectors: 5.1.1(postcss@8.4.47)
-
-  cssnano-utils@3.1.0(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-
-  cssnano@5.1.15(postcss@8.4.47):
-    dependencies:
-      cssnano-preset-default: 5.2.14(postcss@8.4.47)
-      lilconfig: 2.1.0
-      postcss: 8.4.47
-      yaml: 1.10.2
-
-  csso@4.2.0:
-    dependencies:
-      css-tree: 1.1.3
-
-  csso@5.0.5:
-    dependencies:
-      css-tree: 2.2.1
-
-  csstype@3.1.3: {}
-
-  currently-unhandled@0.4.1:
-    dependencies:
-      array-find-index: 1.0.2
-
-  cypress@13.15.1:
-    dependencies:
-      '@cypress/request': 3.0.5
-      '@cypress/xvfb': 1.2.4(supports-color@8.1.1)
-      '@types/sinonjs__fake-timers': 8.1.1
-      '@types/sizzle': 2.3.9
-      arch: 2.2.0
-      blob-util: 2.0.2
-      bluebird: 3.7.2
-      buffer: 5.7.1
-      cachedir: 2.4.0
-      chalk: 4.1.2
-      check-more-types: 2.24.0
-      cli-cursor: 3.1.0
-      cli-table3: 0.6.5
-      commander: 6.2.1
-      common-tags: 1.8.2
-      dayjs: 1.11.13
-      debug: 4.3.7(supports-color@8.1.1)
-      enquirer: 2.4.1
-      eventemitter2: 6.4.7
-      execa: 4.1.0
-      executable: 4.1.1
-      extract-zip: 2.0.1(supports-color@8.1.1)
-      figures: 3.2.0
-      fs-extra: 9.1.0
-      getos: 3.2.1
-      is-ci: 3.0.1
-      is-installed-globally: 0.4.0
-      lazy-ass: 1.6.0
-      listr2: 3.14.0(enquirer@2.4.1)
-      lodash: 4.17.21
-      log-symbols: 4.1.0
-      minimist: 1.2.8
-      ospath: 1.2.2
-      pretty-bytes: 5.6.0
-      process: 0.11.10
-      proxy-from-env: 1.0.0
-      request-progress: 3.0.0
-      semver: 7.6.3
-      supports-color: 8.1.1
-      tmp: 0.2.3
-      tree-kill: 1.2.2
-      untildify: 4.0.0
-      yauzl: 2.10.0
-
-  d3-array@2.12.1:
-    dependencies:
-      internmap: 1.0.1
-
-  d3-color@2.0.0: {}
-
-  d3-dispatch@2.0.0: {}
-
-  d3-drag@2.0.0:
-    dependencies:
-      d3-dispatch: 2.0.0
-      d3-selection: 2.0.0
-
-  d3-ease@2.0.0: {}
-
-  d3-geo@2.0.2:
-    dependencies:
-      d3-array: 2.12.1
-
-  d3-interpolate@2.0.1:
-    dependencies:
-      d3-color: 2.0.0
-
-  d3-selection@2.0.0: {}
-
-  d3-timer@2.0.0: {}
-
-  d3-transition@2.0.0(d3-selection@2.0.0):
-    dependencies:
-      d3-color: 2.0.0
-      d3-dispatch: 2.0.0
-      d3-ease: 2.0.0
-      d3-interpolate: 2.0.1
-      d3-selection: 2.0.0
-      d3-timer: 2.0.0
-
-  d3-zoom@2.0.0:
-    dependencies:
-      d3-dispatch: 2.0.0
-      d3-drag: 2.0.0
-      d3-interpolate: 2.0.1
-      d3-selection: 2.0.0
-      d3-transition: 2.0.0(d3-selection@2.0.0)
-
-  damerau-levenshtein@1.0.8: {}
-
-  dashdash@1.14.1:
-    dependencies:
-      assert-plus: 1.0.0
-
-  data-uri-to-buffer@4.0.1: {}
-
-  data-view-buffer@1.0.1:
-    dependencies:
-      call-bind: 1.0.7
-      es-errors: 1.3.0
-      is-data-view: 1.0.1
-
-  data-view-byte-length@1.0.1:
-    dependencies:
-      call-bind: 1.0.7
-      es-errors: 1.3.0
-      is-data-view: 1.0.1
-
-  data-view-byte-offset@1.0.0:
-    dependencies:
-      call-bind: 1.0.7
-      es-errors: 1.3.0
-      is-data-view: 1.0.1
-
-  date-fns-tz@1.3.8(date-fns@2.30.0):
-    dependencies:
-      date-fns: 2.30.0
-
-  date-fns@2.30.0:
-    dependencies:
-      '@babel/runtime': 7.26.0
-
-  dayjs@1.11.13: {}
-
-  debounce@1.2.1: {}
-
-  debug@3.2.7(supports-color@8.1.1):
-    dependencies:
-      ms: 2.1.3
-    optionalDependencies:
-      supports-color: 8.1.1
-
-  debug@4.3.4:
-    dependencies:
-      ms: 2.1.2
-
-  debug@4.3.7(supports-color@8.1.1):
-    dependencies:
-      ms: 2.1.3
-    optionalDependencies:
-      supports-color: 8.1.1
-
-  decamelize-keys@1.1.1:
-    dependencies:
-      decamelize: 1.2.0
-      map-obj: 1.0.1
-
-  decamelize@1.2.0: {}
-
-  decamelize@5.0.1: {}
-
-  dedent@1.5.3: {}
-
-  deep-is@0.1.4: {}
-
-  deepmerge@4.3.1: {}
-
-  define-data-property@1.1.4:
-    dependencies:
-      es-define-property: 1.0.0
-      es-errors: 1.3.0
-      gopd: 1.0.1
-
-  define-properties@1.2.1:
-    dependencies:
-      define-data-property: 1.1.4
-      has-property-descriptors: 1.0.2
-      object-keys: 1.1.1
-
-  del@5.1.0:
-    dependencies:
-      globby: 10.0.2
-      graceful-fs: 4.2.11
-      is-glob: 4.0.3
-      is-path-cwd: 2.2.0
-      is-path-inside: 3.0.3
-      p-map: 3.0.0
-      rimraf: 3.0.2
-      slash: 3.0.0
-
-  del@6.1.1:
-    dependencies:
-      globby: 11.1.0
-      graceful-fs: 4.2.11
-      is-glob: 4.0.3
-      is-path-cwd: 2.2.0
-      is-path-inside: 3.0.3
-      p-map: 4.0.0
-      rimraf: 3.0.2
-      slash: 3.0.0
-
-  delayed-stream@1.0.0: {}
-
-  detect-browser@5.3.0: {}
-
-  detect-indent@6.1.0: {}
-
-  detect-newline@3.1.0: {}
-
-  diff-sequences@29.6.3: {}
-
-  diff@4.0.2: {}
-
-  dir-glob@3.0.1:
-    dependencies:
-      path-type: 4.0.0
-
-  doctrine@2.1.0:
-    dependencies:
-      esutils: 2.0.3
-
-  doctrine@3.0.0:
-    dependencies:
-      esutils: 2.0.3
-
-  dom-serializer@1.4.1:
-    dependencies:
-      domelementtype: 2.3.0
-      domhandler: 4.3.1
-      entities: 2.2.0
-
-  dom-serializer@2.0.0:
-    dependencies:
-      domelementtype: 2.3.0
-      domhandler: 5.0.3
-      entities: 4.5.0
-
-  domelementtype@2.3.0: {}
-
-  domhandler@4.3.1:
-    dependencies:
-      domelementtype: 2.3.0
-
-  domhandler@5.0.3:
-    dependencies:
-      domelementtype: 2.3.0
-
-  domutils@2.8.0:
-    dependencies:
-      dom-serializer: 1.4.1
-      domelementtype: 2.3.0
-      domhandler: 4.3.1
-
-  domutils@3.1.0:
-    dependencies:
-      dom-serializer: 2.0.0
-      domelementtype: 2.3.0
-      domhandler: 5.0.3
-
-  dot-case@3.0.4:
-    dependencies:
-      no-case: 3.0.4
-      tslib: 2.8.0
-
-  dotenv@10.0.0: {}
-
-  eastasianwidth@0.2.0: {}
-
-  ecc-jsbn@0.1.2:
-    dependencies:
-      jsbn: 0.1.1
-      safer-buffer: 2.1.2
-
-  ecdsa-sig-formatter@1.0.11:
-    dependencies:
-      safe-buffer: 5.2.1
-
-  ejs@3.1.10:
-    dependencies:
-      jake: 10.9.2
-
-  electron-to-chromium@1.5.46: {}
-
-  emittery@0.13.1: {}
-
-  emoji-regex@8.0.0: {}
-
-  emoji-regex@9.2.2: {}
-
-  end-of-stream@1.4.4:
-    dependencies:
-      once: 1.4.0
-
-  enhanced-resolve@5.17.1:
-    dependencies:
-      graceful-fs: 4.2.11
-      tapable: 2.2.1
-
-  enquirer@2.4.1:
-    dependencies:
-      ansi-colors: 4.1.3
-      strip-ansi: 6.0.1
-
-  entities@2.2.0: {}
-
-  entities@4.5.0: {}
-
-  error-ex@1.3.2:
-    dependencies:
-      is-arrayish: 0.2.1
-
-  es-abstract@1.23.3:
-    dependencies:
-      array-buffer-byte-length: 1.0.1
-      arraybuffer.prototype.slice: 1.0.3
-      available-typed-arrays: 1.0.7
-      call-bind: 1.0.7
-      data-view-buffer: 1.0.1
-      data-view-byte-length: 1.0.1
-      data-view-byte-offset: 1.0.0
-      es-define-property: 1.0.0
-      es-errors: 1.3.0
-      es-object-atoms: 1.0.0
-      es-set-tostringtag: 2.0.3
-      es-to-primitive: 1.2.1
-      function.prototype.name: 1.1.6
-      get-intrinsic: 1.2.4
-      get-symbol-description: 1.0.2
-      globalthis: 1.0.4
-      gopd: 1.0.1
-      has-property-descriptors: 1.0.2
-      has-proto: 1.0.3
-      has-symbols: 1.0.3
-      hasown: 2.0.2
-      internal-slot: 1.0.7
-      is-array-buffer: 3.0.4
-      is-callable: 1.2.7
-      is-data-view: 1.0.1
-      is-negative-zero: 2.0.3
-      is-regex: 1.1.4
-      is-shared-array-buffer: 1.0.3
-      is-string: 1.0.7
-      is-typed-array: 1.1.13
-      is-weakref: 1.0.2
-      object-inspect: 1.13.2
-      object-keys: 1.1.1
-      object.assign: 4.1.5
-      regexp.prototype.flags: 1.5.3
-      safe-array-concat: 1.1.2
-      safe-regex-test: 1.0.3
-      string.prototype.trim: 1.2.9
-      string.prototype.trimend: 1.0.8
-      string.prototype.trimstart: 1.0.8
-      typed-array-buffer: 1.0.2
-      typed-array-byte-length: 1.0.1
-      typed-array-byte-offset: 1.0.2
-      typed-array-length: 1.0.6
-      unbox-primitive: 1.0.2
-      which-typed-array: 1.1.15
-
-  es-define-property@1.0.0:
-    dependencies:
-      get-intrinsic: 1.2.4
-
-  es-errors@1.3.0: {}
-
-  es-iterator-helpers@1.1.0:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-errors: 1.3.0
-      es-set-tostringtag: 2.0.3
-      function-bind: 1.1.2
-      get-intrinsic: 1.2.4
-      globalthis: 1.0.4
-      has-property-descriptors: 1.0.2
-      has-proto: 1.0.3
-      has-symbols: 1.0.3
-      internal-slot: 1.0.7
-      iterator.prototype: 1.1.3
-      safe-array-concat: 1.1.2
-
-  es-module-lexer@1.5.4: {}
-
-  es-object-atoms@1.0.0:
-    dependencies:
-      es-errors: 1.3.0
-
-  es-set-tostringtag@2.0.3:
-    dependencies:
-      get-intrinsic: 1.2.4
-      has-tostringtag: 1.0.2
-      hasown: 2.0.2
-
-  es-shim-unscopables@1.0.2:
-    dependencies:
-      hasown: 2.0.2
-
-  es-to-primitive@1.2.1:
-    dependencies:
-      is-callable: 1.2.7
-      is-date-object: 1.0.5
-      is-symbol: 1.0.4
-
-  esbuild@0.17.19:
-    optionalDependencies:
-      '@esbuild/android-arm': 0.17.19
-      '@esbuild/android-arm64': 0.17.19
-      '@esbuild/android-x64': 0.17.19
-      '@esbuild/darwin-arm64': 0.17.19
-      '@esbuild/darwin-x64': 0.17.19
-      '@esbuild/freebsd-arm64': 0.17.19
-      '@esbuild/freebsd-x64': 0.17.19
-      '@esbuild/linux-arm': 0.17.19
-      '@esbuild/linux-arm64': 0.17.19
-      '@esbuild/linux-ia32': 0.17.19
-      '@esbuild/linux-loong64': 0.17.19
-      '@esbuild/linux-mips64el': 0.17.19
-      '@esbuild/linux-ppc64': 0.17.19
-      '@esbuild/linux-riscv64': 0.17.19
-      '@esbuild/linux-s390x': 0.17.19
-      '@esbuild/linux-x64': 0.17.19
-      '@esbuild/netbsd-x64': 0.17.19
-      '@esbuild/openbsd-x64': 0.17.19
-      '@esbuild/sunos-x64': 0.17.19
-      '@esbuild/win32-arm64': 0.17.19
-      '@esbuild/win32-ia32': 0.17.19
-      '@esbuild/win32-x64': 0.17.19
-
-  escalade@3.2.0: {}
-
-  escape-string-regexp@1.0.5: {}
-
-  escape-string-regexp@2.0.0: {}
-
-  escape-string-regexp@4.0.0: {}
-
-  eslint-config-next@14.2.16(eslint@8.57.1)(typescript@5.6.3):
-    dependencies:
-      '@next/eslint-plugin-next': 14.2.16
-      '@rushstack/eslint-patch': 1.10.4
-      '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1)(typescript@5.6.3)
-      '@typescript-eslint/parser': 6.21.0(eslint@8.57.1)(typescript@5.6.3)
-      eslint: 8.57.1
-      eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1)
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
-      eslint-plugin-jsx-a11y: 6.10.1(eslint@8.57.1)
-      eslint-plugin-react: 7.37.2(eslint@8.57.1)
-      eslint-plugin-react-hooks: 5.0.0-canary-7118f5dd7-20230705(eslint@8.57.1)
-    optionalDependencies:
-      typescript: 5.6.3
-    transitivePeerDependencies:
-      - eslint-import-resolver-webpack
-      - eslint-plugin-import-x
-      - supports-color
-
-  eslint-config-prettier@8.10.0(eslint@8.57.1):
-    dependencies:
-      eslint: 8.57.1
-
-  eslint-import-resolver-alias@1.1.2(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1)):
-    dependencies:
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
-
-  eslint-import-resolver-node@0.3.9:
-    dependencies:
-      debug: 3.2.7(supports-color@8.1.1)
-      is-core-module: 2.15.1
-      resolve: 1.22.8
-    transitivePeerDependencies:
-      - supports-color
-
-  eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1):
-    dependencies:
-      '@nolyfill/is-core-module': 1.0.39
-      debug: 4.3.7(supports-color@8.1.1)
-      enhanced-resolve: 5.17.1
-      eslint: 8.57.1
-      eslint-module-utils: 2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
-      fast-glob: 3.3.2
-      get-tsconfig: 4.8.1
-      is-bun-module: 1.2.1
-      is-glob: 4.0.3
-    optionalDependencies:
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
-    transitivePeerDependencies:
-      - '@typescript-eslint/parser'
-      - eslint-import-resolver-node
-      - eslint-import-resolver-webpack
-      - supports-color
-
-  eslint-module-utils@2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1):
-    dependencies:
-      debug: 3.2.7(supports-color@8.1.1)
-    optionalDependencies:
-      '@typescript-eslint/parser': 6.21.0(eslint@8.57.1)(typescript@5.6.3)
-      eslint: 8.57.1
-      eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1)
-    transitivePeerDependencies:
-      - supports-color
-
-  eslint-plugin-css-modules@2.12.0(eslint@8.57.1):
-    dependencies:
-      eslint: 8.57.1
-      gonzales-pe: 4.3.0
-      lodash: 4.17.21
-
-  eslint-plugin-cypress@2.15.2(eslint@8.57.1):
-    dependencies:
-      eslint: 8.57.1
-      globals: 13.24.0
-
-  eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1):
-    dependencies:
-      '@rtsao/scc': 1.1.0
-      array-includes: 3.1.8
-      array.prototype.findlastindex: 1.2.5
-      array.prototype.flat: 1.3.2
-      array.prototype.flatmap: 1.3.2
-      debug: 3.2.7(supports-color@8.1.1)
-      doctrine: 2.1.0
-      eslint: 8.57.1
-      eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1)
-      hasown: 2.0.2
-      is-core-module: 2.15.1
-      is-glob: 4.0.3
-      minimatch: 3.1.2
-      object.fromentries: 2.0.8
-      object.groupby: 1.0.3
-      object.values: 1.2.0
-      semver: 6.3.1
-      string.prototype.trimend: 1.0.8
-      tsconfig-paths: 3.15.0
-    optionalDependencies:
-      '@typescript-eslint/parser': 6.21.0(eslint@8.57.1)(typescript@5.6.3)
-    transitivePeerDependencies:
-      - eslint-import-resolver-typescript
-      - eslint-import-resolver-webpack
-      - supports-color
-
-  eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3):
-    dependencies:
-      '@typescript-eslint/utils': 5.62.0(eslint@8.57.1)(typescript@5.6.3)
-      eslint: 8.57.1
-    optionalDependencies:
-      '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.3))(eslint@8.57.1)(typescript@5.6.3)
-      jest: 29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3))
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
-  eslint-plugin-jsx-a11y@6.10.1(eslint@8.57.1):
-    dependencies:
-      aria-query: 5.3.2
-      array-includes: 3.1.8
-      array.prototype.flatmap: 1.3.2
-      ast-types-flow: 0.0.8
-      axe-core: 4.10.2
-      axobject-query: 4.1.0
-      damerau-levenshtein: 1.0.8
-      emoji-regex: 9.2.2
-      es-iterator-helpers: 1.1.0
-      eslint: 8.57.1
-      hasown: 2.0.2
-      jsx-ast-utils: 3.3.5
-      language-tags: 1.0.9
-      minimatch: 3.1.2
-      object.fromentries: 2.0.8
-      safe-regex-test: 1.0.3
-      string.prototype.includes: 2.0.1
-
-  eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.10.0(eslint@8.57.1))(eslint@8.57.1)(prettier@2.8.8):
-    dependencies:
-      eslint: 8.57.1
-      prettier: 2.8.8
-      prettier-linter-helpers: 1.0.0
-    optionalDependencies:
-      eslint-config-prettier: 8.10.0(eslint@8.57.1)
-
-  eslint-plugin-promise@6.6.0(eslint@8.57.1):
-    dependencies:
-      eslint: 8.57.1
-
-  eslint-plugin-react-hooks@5.0.0-canary-7118f5dd7-20230705(eslint@8.57.1):
-    dependencies:
-      eslint: 8.57.1
-
-  eslint-plugin-react@7.37.2(eslint@8.57.1):
-    dependencies:
-      array-includes: 3.1.8
-      array.prototype.findlast: 1.2.5
-      array.prototype.flatmap: 1.3.2
-      array.prototype.tosorted: 1.1.4
-      doctrine: 2.1.0
-      es-iterator-helpers: 1.1.0
-      eslint: 8.57.1
-      estraverse: 5.3.0
-      hasown: 2.0.2
-      jsx-ast-utils: 3.3.5
-      minimatch: 3.1.2
-      object.entries: 1.1.8
-      object.fromentries: 2.0.8
-      object.values: 1.2.0
-      prop-types: 15.8.1
-      resolve: 2.0.0-next.5
-      semver: 6.3.1
-      string.prototype.matchall: 4.0.11
-      string.prototype.repeat: 1.0.0
-
-  eslint-scope@5.1.1:
-    dependencies:
-      esrecurse: 4.3.0
-      estraverse: 4.3.0
-
-  eslint-scope@7.2.2:
-    dependencies:
-      esrecurse: 4.3.0
-      estraverse: 5.3.0
-
-  eslint-visitor-keys@3.4.3: {}
-
-  eslint@8.57.1:
-    dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.1)
-      '@eslint-community/regexpp': 4.11.1
-      '@eslint/eslintrc': 2.1.4
-      '@eslint/js': 8.57.1
-      '@humanwhocodes/config-array': 0.13.0
-      '@humanwhocodes/module-importer': 1.0.1
-      '@nodelib/fs.walk': 1.2.8
-      '@ungap/structured-clone': 1.2.0
-      ajv: 6.12.6
-      chalk: 4.1.2
-      cross-spawn: 7.0.3
-      debug: 4.3.7(supports-color@8.1.1)
-      doctrine: 3.0.0
-      escape-string-regexp: 4.0.0
-      eslint-scope: 7.2.2
-      eslint-visitor-keys: 3.4.3
-      espree: 9.6.1
-      esquery: 1.6.0
-      esutils: 2.0.3
-      fast-deep-equal: 3.1.3
-      file-entry-cache: 6.0.1
-      find-up: 5.0.0
-      glob-parent: 6.0.2
-      globals: 13.24.0
-      graphemer: 1.4.0
-      ignore: 5.3.2
-      imurmurhash: 0.1.4
-      is-glob: 4.0.3
-      is-path-inside: 3.0.3
-      js-yaml: 4.1.0
-      json-stable-stringify-without-jsonify: 1.0.1
-      levn: 0.4.1
-      lodash.merge: 4.6.2
-      minimatch: 3.1.2
-      natural-compare: 1.4.0
-      optionator: 0.9.4
-      strip-ansi: 6.0.1
-      text-table: 0.2.0
-    transitivePeerDependencies:
-      - supports-color
-
-  espree@9.6.1:
-    dependencies:
-      acorn: 8.13.0
-      acorn-jsx: 5.3.2(acorn@8.13.0)
-      eslint-visitor-keys: 3.4.3
-
-  esprima@4.0.1: {}
-
-  esquery@1.6.0:
-    dependencies:
-      estraverse: 5.3.0
-
-  esrecurse@4.3.0:
-    dependencies:
-      estraverse: 5.3.0
-
-  estraverse@4.3.0: {}
-
-  estraverse@5.3.0: {}
-
-  estree-walker@0.6.1: {}
-
-  estree-walker@2.0.2: {}
-
-  esutils@2.0.3: {}
-
-  eventemitter2@6.4.7: {}
-
-  eventemitter3@4.0.7: {}
-
-  eventemitter3@5.0.1: {}
-
-  execa@4.1.0:
-    dependencies:
-      cross-spawn: 7.0.3
-      get-stream: 5.2.0
-      human-signals: 1.1.1
-      is-stream: 2.0.1
-      merge-stream: 2.0.0
-      npm-run-path: 4.0.1
-      onetime: 5.1.2
-      signal-exit: 3.0.7
-      strip-final-newline: 2.0.0
-
-  execa@5.1.1:
-    dependencies:
-      cross-spawn: 7.0.3
-      get-stream: 6.0.1
-      human-signals: 2.1.0
-      is-stream: 2.0.1
-      merge-stream: 2.0.0
-      npm-run-path: 4.0.1
-      onetime: 5.1.2
-      signal-exit: 3.0.7
-      strip-final-newline: 2.0.0
-
-  execa@7.2.0:
-    dependencies:
-      cross-spawn: 7.0.3
-      get-stream: 6.0.1
-      human-signals: 4.3.1
-      is-stream: 3.0.0
-      merge-stream: 2.0.0
-      npm-run-path: 5.3.0
-      onetime: 6.0.0
-      signal-exit: 3.0.7
-      strip-final-newline: 3.0.0
-
-  executable@4.1.1:
-    dependencies:
-      pify: 2.3.0
-
-  exit@0.1.2: {}
-
-  expect@29.7.0:
-    dependencies:
-      '@jest/expect-utils': 29.7.0
-      jest-get-type: 29.6.3
-      jest-matcher-utils: 29.7.0
-      jest-message-util: 29.7.0
-      jest-util: 29.7.0
-
-  extend@3.0.2: {}
-
-  extract-react-intl-messages@4.1.1(ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3)):
-    dependencies:
-      '@babel/core': 7.26.0
-      babel-plugin-react-intl: 7.9.4(ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3))
-      flat: 5.0.2
-      glob: 7.2.3
-      js-yaml: 3.14.1
-      load-json-file: 6.2.0
-      lodash.merge: 4.6.2
-      lodash.mergewith: 4.6.2
-      lodash.pick: 4.4.0
-      meow: 6.1.1
-      mkdirp: 1.0.4
-      pify: 5.0.0
-      read-babelrc-up: 1.1.0
-      sort-keys: 4.2.0
-      write-json-file: 4.3.0
-    transitivePeerDependencies:
-      - supports-color
-      - ts-jest
-
-  extract-zip@2.0.1(supports-color@8.1.1):
-    dependencies:
-      debug: 4.3.7(supports-color@8.1.1)
-      get-stream: 5.2.0
-      yauzl: 2.10.0
-    optionalDependencies:
-      '@types/yauzl': 2.10.3
-    transitivePeerDependencies:
-      - supports-color
-
-  extsprintf@1.3.0: {}
-
-  fast-deep-equal@3.1.3: {}
-
-  fast-diff@1.3.0: {}
-
-  fast-glob@3.3.2:
-    dependencies:
-      '@nodelib/fs.stat': 2.0.5
-      '@nodelib/fs.walk': 1.2.8
-      glob-parent: 5.1.2
-      merge2: 1.4.1
-      micromatch: 4.0.8
-
-  fast-json-stable-stringify@2.1.0: {}
-
-  fast-levenshtein@2.0.6: {}
-
-  fast-uri@3.0.3: {}
-
-  fastest-levenshtein@1.0.16: {}
-
-  fastq@1.17.1:
-    dependencies:
-      reusify: 1.0.4
-
-  fb-watchman@2.0.2:
-    dependencies:
-      bser: 2.1.1
-
-  fd-slicer@1.1.0:
-    dependencies:
-      pend: 1.2.0
-
-  fetch-blob@3.2.0:
-    dependencies:
-      node-domexception: 1.0.0
-      web-streams-polyfill: 3.3.3
-
-  figures@3.2.0:
-    dependencies:
-      escape-string-regexp: 1.0.5
-
-  file-entry-cache@6.0.1:
-    dependencies:
-      flat-cache: 3.2.0
-
-  file-entry-cache@7.0.2:
-    dependencies:
-      flat-cache: 3.2.0
-
-  filelist@1.0.4:
-    dependencies:
-      minimatch: 5.1.6
-
-  fill-range@7.1.1:
-    dependencies:
-      to-regex-range: 5.0.1
-
-  find-up@4.1.0:
-    dependencies:
-      locate-path: 5.0.0
-      path-exists: 4.0.0
-
-  find-up@5.0.0:
-    dependencies:
-      locate-path: 6.0.0
-      path-exists: 4.0.0
-
-  flat-cache@3.2.0:
-    dependencies:
-      flatted: 3.3.1
-      keyv: 4.5.4
-      rimraf: 3.0.2
-
-  flat@5.0.2: {}
-
-  flatted@3.3.1: {}
-
-  for-each@0.3.3:
-    dependencies:
-      is-callable: 1.2.7
-
-  foreground-child@3.3.0:
-    dependencies:
-      cross-spawn: 7.0.3
-      signal-exit: 4.1.0
-
-  forever-agent@0.6.1: {}
-
-  form-data@4.0.1:
-    dependencies:
-      asynckit: 0.4.0
-      combined-stream: 1.0.8
-      mime-types: 2.1.35
-
-  formdata-polyfill@4.0.10:
-    dependencies:
-      fetch-blob: 3.2.0
-
-  fraction.js@4.3.7: {}
-
-  fs-extra@10.1.0:
-    dependencies:
-      graceful-fs: 4.2.11
-      jsonfile: 6.1.0
-      universalify: 2.0.1
-
-  fs-extra@8.1.0:
-    dependencies:
-      graceful-fs: 4.2.11
-      jsonfile: 4.0.0
-      universalify: 0.1.2
-
-  fs-extra@9.1.0:
-    dependencies:
-      at-least-node: 1.0.0
-      graceful-fs: 4.2.11
-      jsonfile: 6.1.0
-      universalify: 2.0.1
-
-  fs-minipass@2.1.0:
-    dependencies:
-      minipass: 3.3.6
-
-  fs.realpath@1.0.0: {}
-
-  fsevents@2.3.3:
-    optional: true
-
-  function-bind@1.1.2: {}
-
-  function.prototype.name@1.1.6:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      functions-have-names: 1.2.3
-
-  functions-have-names@1.2.3: {}
-
-  generic-names@4.0.0:
-    dependencies:
-      loader-utils: 3.3.1
-
-  generic-pool@3.9.0: {}
-
-  gensync@1.0.0-beta.2: {}
-
-  get-caller-file@2.0.5: {}
-
-  get-intrinsic@1.2.4:
-    dependencies:
-      es-errors: 1.3.0
-      function-bind: 1.1.2
-      has-proto: 1.0.3
-      has-symbols: 1.0.3
-      hasown: 2.0.2
-
-  get-package-type@0.1.0: {}
-
-  get-stream@5.2.0:
-    dependencies:
-      pump: 3.0.2
-
-  get-stream@6.0.1: {}
-
-  get-symbol-description@1.0.2:
-    dependencies:
-      call-bind: 1.0.7
-      es-errors: 1.3.0
-      get-intrinsic: 1.2.4
-
-  get-tsconfig@4.8.1:
-    dependencies:
-      resolve-pkg-maps: 1.0.0
-
-  getos@3.2.1:
-    dependencies:
-      async: 3.2.6
-
-  getpass@0.1.7:
-    dependencies:
-      assert-plus: 1.0.0
-
-  glob-parent@5.1.2:
-    dependencies:
-      is-glob: 4.0.3
-
-  glob-parent@6.0.2:
-    dependencies:
-      is-glob: 4.0.3
-
-  glob@10.3.10:
-    dependencies:
-      foreground-child: 3.3.0
-      jackspeak: 2.3.6
-      minimatch: 9.0.5
-      minipass: 7.1.2
-      path-scurry: 1.11.1
-
-  glob@7.2.3:
-    dependencies:
-      fs.realpath: 1.0.0
-      inflight: 1.0.6
-      inherits: 2.0.4
-      minimatch: 3.1.2
-      once: 1.4.0
-      path-is-absolute: 1.0.1
-
-  glob@8.1.0:
-    dependencies:
-      fs.realpath: 1.0.0
-      inflight: 1.0.6
-      inherits: 2.0.4
-      minimatch: 5.1.6
-      once: 1.4.0
-
-  global-dirs@3.0.1:
-    dependencies:
-      ini: 2.0.0
-
-  global-modules@2.0.0:
-    dependencies:
-      global-prefix: 3.0.0
-
-  global-prefix@3.0.0:
-    dependencies:
-      ini: 1.3.8
-      kind-of: 6.0.3
-      which: 1.3.1
-
-  globals@11.12.0: {}
-
-  globals@13.24.0:
-    dependencies:
-      type-fest: 0.20.2
-
-  globalthis@1.0.4:
-    dependencies:
-      define-properties: 1.2.1
-      gopd: 1.0.1
-
-  globby@10.0.1:
-    dependencies:
-      '@types/glob': 7.2.0
-      array-union: 2.1.0
-      dir-glob: 3.0.1
-      fast-glob: 3.3.2
-      glob: 7.2.3
-      ignore: 5.3.2
-      merge2: 1.4.1
-      slash: 3.0.0
-
-  globby@10.0.2:
-    dependencies:
-      '@types/glob': 7.2.0
-      array-union: 2.1.0
-      dir-glob: 3.0.1
-      fast-glob: 3.3.2
-      glob: 7.2.3
-      ignore: 5.3.2
-      merge2: 1.4.1
-      slash: 3.0.0
-
-  globby@11.1.0:
-    dependencies:
-      array-union: 2.1.0
-      dir-glob: 3.0.1
-      fast-glob: 3.3.2
-      ignore: 5.3.2
-      merge2: 1.4.1
-      slash: 3.0.0
-
-  globjoin@0.1.4: {}
-
-  gonzales-pe@4.3.0:
-    dependencies:
-      minimist: 1.2.8
-
-  gopd@1.0.1:
-    dependencies:
-      get-intrinsic: 1.2.4
-
-  graceful-fs@4.2.11: {}
-
-  graphemer@1.4.0: {}
-
-  hard-rejection@2.1.0: {}
-
-  has-bigints@1.0.2: {}
-
-  has-flag@3.0.0: {}
-
-  has-flag@4.0.0: {}
-
-  has-property-descriptors@1.0.2:
-    dependencies:
-      es-define-property: 1.0.0
-
-  has-proto@1.0.3: {}
-
-  has-symbols@1.0.3: {}
-
-  has-tostringtag@1.0.2:
-    dependencies:
-      has-symbols: 1.0.3
-
-  hasown@2.0.2:
-    dependencies:
-      function-bind: 1.1.2
-
-  hoist-non-react-statics@3.3.2:
-    dependencies:
-      react-is: 16.13.1
-
-  hosted-git-info@2.8.9: {}
-
-  hosted-git-info@4.1.0:
-    dependencies:
-      lru-cache: 6.0.0
-
-  html-escaper@2.0.2: {}
-
-  html-tags@3.3.1: {}
-
-  http-signature@1.4.0:
-    dependencies:
-      assert-plus: 1.0.0
-      jsprim: 2.0.2
-      sshpk: 1.18.0
-
-  human-signals@1.1.1: {}
-
-  human-signals@2.1.0: {}
-
-  human-signals@4.3.1: {}
-
-  husky@8.0.3: {}
-
-  icss-replace-symbols@1.1.0: {}
-
-  icss-utils@5.1.0(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-
-  ieee754@1.2.1: {}
-
-  ignore@5.3.2: {}
-
-  immer@9.0.21: {}
-
-  import-cwd@3.0.0:
-    dependencies:
-      import-from: 3.0.0
-
-  import-fresh@3.3.0:
-    dependencies:
-      parent-module: 1.0.1
-      resolve-from: 4.0.0
-
-  import-from@3.0.0:
-    dependencies:
-      resolve-from: 5.0.0
-
-  import-lazy@4.0.0: {}
-
-  import-local@3.2.0:
-    dependencies:
-      pkg-dir: 4.2.0
-      resolve-cwd: 3.0.0
-
-  imurmurhash@0.1.4: {}
-
-  indent-string@4.0.0: {}
-
-  indent-string@5.0.0: {}
-
-  inflight@1.0.6:
-    dependencies:
-      once: 1.4.0
-      wrappy: 1.0.2
-
-  inherits@2.0.4: {}
-
-  ini@1.3.8: {}
-
-  ini@2.0.0: {}
-
-  internal-slot@1.0.7:
-    dependencies:
-      es-errors: 1.3.0
-      hasown: 2.0.2
-      side-channel: 1.0.6
-
-  internmap@1.0.1: {}
-
-  intl-messageformat-parser@5.5.1:
-    dependencies:
-      '@formatjs/intl-numberformat': 5.7.6
-
-  intl-messageformat-parser@6.1.2:
-    dependencies:
-      '@formatjs/ecma402-abstract': 1.5.0
-      tslib: 2.8.0
-
-  intl-messageformat@10.7.3:
-    dependencies:
-      '@formatjs/ecma402-abstract': 2.2.1
-      '@formatjs/fast-memoize': 2.2.2
-      '@formatjs/icu-messageformat-parser': 2.9.1
-      tslib: 2.8.0
-
-  ipaddr.js@2.2.0: {}
-
-  is-array-buffer@3.0.4:
-    dependencies:
-      call-bind: 1.0.7
-      get-intrinsic: 1.2.4
-
-  is-arrayish@0.2.1: {}
-
-  is-async-function@2.0.0:
-    dependencies:
-      has-tostringtag: 1.0.2
-
-  is-bigint@1.0.4:
-    dependencies:
-      has-bigints: 1.0.2
-
-  is-boolean-object@1.1.2:
-    dependencies:
-      call-bind: 1.0.7
-      has-tostringtag: 1.0.2
-
-  is-buffer@1.1.6: {}
-
-  is-bun-module@1.2.1:
-    dependencies:
-      semver: 7.6.3
-
-  is-callable@1.2.7: {}
-
-  is-ci@3.0.1:
-    dependencies:
-      ci-info: 3.9.0
-
-  is-core-module@2.15.1:
-    dependencies:
-      hasown: 2.0.2
-
-  is-data-view@1.0.1:
-    dependencies:
-      is-typed-array: 1.1.13
-
-  is-date-object@1.0.5:
-    dependencies:
-      has-tostringtag: 1.0.2
-
-  is-docker@3.0.0: {}
-
-  is-extglob@2.1.1: {}
-
-  is-finalizationregistry@1.0.2:
-    dependencies:
-      call-bind: 1.0.7
-
-  is-fullwidth-code-point@3.0.0: {}
-
-  is-fullwidth-code-point@4.0.0: {}
-
-  is-generator-fn@2.1.0: {}
-
-  is-generator-function@1.0.10:
-    dependencies:
-      has-tostringtag: 1.0.2
-
-  is-glob@4.0.3:
-    dependencies:
-      is-extglob: 2.1.1
-
-  is-installed-globally@0.4.0:
-    dependencies:
-      global-dirs: 3.0.1
-      is-path-inside: 3.0.3
-
-  is-localhost-ip@1.4.0: {}
-
-  is-map@2.0.3: {}
-
-  is-module@1.0.0: {}
-
-  is-negative-zero@2.0.3: {}
-
-  is-number-object@1.0.7:
-    dependencies:
-      has-tostringtag: 1.0.2
-
-  is-number@7.0.0: {}
-
-  is-path-cwd@2.2.0: {}
-
-  is-path-inside@3.0.3: {}
-
-  is-plain-obj@1.1.0: {}
-
-  is-plain-obj@2.1.0: {}
-
-  is-plain-object@3.0.1: {}
-
-  is-plain-object@5.0.0: {}
-
-  is-reference@1.2.1:
-    dependencies:
-      '@types/estree': 1.0.6
-
-  is-regex@1.1.4:
-    dependencies:
-      call-bind: 1.0.7
-      has-tostringtag: 1.0.2
-
-  is-set@2.0.3: {}
-
-  is-shared-array-buffer@1.0.3:
-    dependencies:
-      call-bind: 1.0.7
-
-  is-stream@2.0.1: {}
-
-  is-stream@3.0.0: {}
-
-  is-string@1.0.7:
-    dependencies:
-      has-tostringtag: 1.0.2
-
-  is-symbol@1.0.4:
-    dependencies:
-      has-symbols: 1.0.3
-
-  is-typed-array@1.1.13:
-    dependencies:
-      which-typed-array: 1.1.15
-
-  is-typedarray@1.0.0: {}
-
-  is-unicode-supported@0.1.0: {}
-
-  is-weakmap@2.0.2: {}
-
-  is-weakref@1.0.2:
-    dependencies:
-      call-bind: 1.0.7
-
-  is-weakset@2.0.3:
-    dependencies:
-      call-bind: 1.0.7
-      get-intrinsic: 1.2.4
-
-  isarray@2.0.5: {}
-
-  isbot@5.1.17: {}
-
-  isexe@2.0.0: {}
-
-  isstream@0.1.2: {}
-
-  istanbul-lib-coverage@3.2.2: {}
-
-  istanbul-lib-instrument@5.2.1:
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/parser': 7.26.0
-      '@istanbuljs/schema': 0.1.3
-      istanbul-lib-coverage: 3.2.2
-      semver: 6.3.1
-    transitivePeerDependencies:
-      - supports-color
-
-  istanbul-lib-instrument@6.0.3:
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/parser': 7.26.0
-      '@istanbuljs/schema': 0.1.3
-      istanbul-lib-coverage: 3.2.2
-      semver: 7.6.3
-    transitivePeerDependencies:
-      - supports-color
-
-  istanbul-lib-report@3.0.1:
-    dependencies:
-      istanbul-lib-coverage: 3.2.2
-      make-dir: 4.0.0
-      supports-color: 7.2.0
-
-  istanbul-lib-source-maps@4.0.1:
-    dependencies:
-      debug: 4.3.7(supports-color@8.1.1)
-      istanbul-lib-coverage: 3.2.2
-      source-map: 0.6.1
-    transitivePeerDependencies:
-      - supports-color
-
-  istanbul-reports@3.1.7:
-    dependencies:
-      html-escaper: 2.0.2
-      istanbul-lib-report: 3.0.1
-
-  iterator.prototype@1.1.3:
-    dependencies:
-      define-properties: 1.2.1
-      get-intrinsic: 1.2.4
-      has-symbols: 1.0.3
-      reflect.getprototypeof: 1.0.6
-      set-function-name: 2.0.2
-
-  jackspeak@2.3.6:
-    dependencies:
-      '@isaacs/cliui': 8.0.2
-    optionalDependencies:
-      '@pkgjs/parseargs': 0.11.0
-
-  jake@10.9.2:
-    dependencies:
-      async: 3.2.6
-      chalk: 4.1.2
-      filelist: 1.0.4
-      minimatch: 3.1.2
-
-  jest-changed-files@29.7.0:
-    dependencies:
-      execa: 5.1.1
-      jest-util: 29.7.0
-      p-limit: 3.1.0
-
-  jest-circus@29.7.0:
-    dependencies:
-      '@jest/environment': 29.7.0
-      '@jest/expect': 29.7.0
-      '@jest/test-result': 29.7.0
-      '@jest/types': 29.6.3
-      '@types/node': 20.17.1
-      chalk: 4.1.2
-      co: 4.6.0
-      dedent: 1.5.3
-      is-generator-fn: 2.1.0
-      jest-each: 29.7.0
-      jest-matcher-utils: 29.7.0
-      jest-message-util: 29.7.0
-      jest-runtime: 29.7.0
-      jest-snapshot: 29.7.0
-      jest-util: 29.7.0
-      p-limit: 3.1.0
-      pretty-format: 29.7.0
-      pure-rand: 6.1.0
-      slash: 3.0.0
-      stack-utils: 2.0.6
-    transitivePeerDependencies:
-      - babel-plugin-macros
-      - supports-color
-
-  jest-cli@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)):
-    dependencies:
-      '@jest/core': 29.7.0(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3))
-      '@jest/test-result': 29.7.0
-      '@jest/types': 29.6.3
-      chalk: 4.1.2
-      create-jest: 29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3))
-      exit: 0.1.2
-      import-local: 3.2.0
-      jest-config: 29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3))
-      jest-util: 29.7.0
-      jest-validate: 29.7.0
-      yargs: 17.7.2
-    transitivePeerDependencies:
-      - '@types/node'
-      - babel-plugin-macros
-      - supports-color
-      - ts-node
-
-  jest-config@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)):
-    dependencies:
-      '@babel/core': 7.26.0
-      '@jest/test-sequencer': 29.7.0
-      '@jest/types': 29.6.3
-      babel-jest: 29.7.0(@babel/core@7.26.0)
-      chalk: 4.1.2
-      ci-info: 3.9.0
-      deepmerge: 4.3.1
-      glob: 7.2.3
-      graceful-fs: 4.2.11
-      jest-circus: 29.7.0
-      jest-environment-node: 29.7.0
-      jest-get-type: 29.6.3
-      jest-regex-util: 29.6.3
-      jest-resolve: 29.7.0
-      jest-runner: 29.7.0
-      jest-util: 29.7.0
-      jest-validate: 29.7.0
-      micromatch: 4.0.8
-      parse-json: 5.2.0
-      pretty-format: 29.7.0
-      slash: 3.0.0
-      strip-json-comments: 3.1.1
-    optionalDependencies:
-      '@types/node': 20.17.1
-      ts-node: 10.9.2(@types/node@20.17.1)(typescript@5.6.3)
-    transitivePeerDependencies:
-      - babel-plugin-macros
-      - supports-color
-
-  jest-diff@29.7.0:
-    dependencies:
-      chalk: 4.1.2
-      diff-sequences: 29.6.3
-      jest-get-type: 29.6.3
-      pretty-format: 29.7.0
-
-  jest-docblock@29.7.0:
-    dependencies:
-      detect-newline: 3.1.0
-
-  jest-each@29.7.0:
-    dependencies:
-      '@jest/types': 29.6.3
-      chalk: 4.1.2
-      jest-get-type: 29.6.3
-      jest-util: 29.7.0
-      pretty-format: 29.7.0
-
-  jest-environment-node@29.7.0:
-    dependencies:
-      '@jest/environment': 29.7.0
-      '@jest/fake-timers': 29.7.0
-      '@jest/types': 29.6.3
-      '@types/node': 20.17.1
-      jest-mock: 29.7.0
-      jest-util: 29.7.0
-
-  jest-get-type@29.6.3: {}
-
-  jest-haste-map@29.7.0:
-    dependencies:
-      '@jest/types': 29.6.3
-      '@types/graceful-fs': 4.1.9
-      '@types/node': 20.17.1
-      anymatch: 3.1.3
-      fb-watchman: 2.0.2
-      graceful-fs: 4.2.11
-      jest-regex-util: 29.6.3
-      jest-util: 29.7.0
-      jest-worker: 29.7.0
-      micromatch: 4.0.8
-      walker: 1.0.8
-    optionalDependencies:
-      fsevents: 2.3.3
-
-  jest-leak-detector@29.7.0:
-    dependencies:
-      jest-get-type: 29.6.3
-      pretty-format: 29.7.0
-
-  jest-matcher-utils@29.7.0:
-    dependencies:
-      chalk: 4.1.2
-      jest-diff: 29.7.0
-      jest-get-type: 29.6.3
-      pretty-format: 29.7.0
-
-  jest-message-util@29.7.0:
-    dependencies:
-      '@babel/code-frame': 7.26.0
-      '@jest/types': 29.6.3
-      '@types/stack-utils': 2.0.3
-      chalk: 4.1.2
-      graceful-fs: 4.2.11
-      micromatch: 4.0.8
-      pretty-format: 29.7.0
-      slash: 3.0.0
-      stack-utils: 2.0.6
-
-  jest-mock@29.7.0:
-    dependencies:
-      '@jest/types': 29.6.3
-      '@types/node': 20.17.1
-      jest-util: 29.7.0
-
-  jest-pnp-resolver@1.2.3(jest-resolve@29.7.0):
-    optionalDependencies:
-      jest-resolve: 29.7.0
-
-  jest-regex-util@29.6.3: {}
-
-  jest-resolve-dependencies@29.7.0:
-    dependencies:
-      jest-regex-util: 29.6.3
-      jest-snapshot: 29.7.0
-    transitivePeerDependencies:
-      - supports-color
-
-  jest-resolve@29.7.0:
-    dependencies:
-      chalk: 4.1.2
-      graceful-fs: 4.2.11
-      jest-haste-map: 29.7.0
-      jest-pnp-resolver: 1.2.3(jest-resolve@29.7.0)
-      jest-util: 29.7.0
-      jest-validate: 29.7.0
-      resolve: 1.22.8
-      resolve.exports: 2.0.2
-      slash: 3.0.0
-
-  jest-runner@29.7.0:
-    dependencies:
-      '@jest/console': 29.7.0
-      '@jest/environment': 29.7.0
-      '@jest/test-result': 29.7.0
-      '@jest/transform': 29.7.0
-      '@jest/types': 29.6.3
-      '@types/node': 20.17.1
-      chalk: 4.1.2
-      emittery: 0.13.1
-      graceful-fs: 4.2.11
-      jest-docblock: 29.7.0
-      jest-environment-node: 29.7.0
-      jest-haste-map: 29.7.0
-      jest-leak-detector: 29.7.0
-      jest-message-util: 29.7.0
-      jest-resolve: 29.7.0
-      jest-runtime: 29.7.0
-      jest-util: 29.7.0
-      jest-watcher: 29.7.0
-      jest-worker: 29.7.0
-      p-limit: 3.1.0
-      source-map-support: 0.5.13
-    transitivePeerDependencies:
-      - supports-color
-
-  jest-runtime@29.7.0:
-    dependencies:
-      '@jest/environment': 29.7.0
-      '@jest/fake-timers': 29.7.0
-      '@jest/globals': 29.7.0
-      '@jest/source-map': 29.6.3
-      '@jest/test-result': 29.7.0
-      '@jest/transform': 29.7.0
-      '@jest/types': 29.6.3
-      '@types/node': 20.17.1
-      chalk: 4.1.2
-      cjs-module-lexer: 1.4.1
-      collect-v8-coverage: 1.0.2
-      glob: 7.2.3
-      graceful-fs: 4.2.11
-      jest-haste-map: 29.7.0
-      jest-message-util: 29.7.0
-      jest-mock: 29.7.0
-      jest-regex-util: 29.6.3
-      jest-resolve: 29.7.0
-      jest-snapshot: 29.7.0
-      jest-util: 29.7.0
-      slash: 3.0.0
-      strip-bom: 4.0.0
-    transitivePeerDependencies:
-      - supports-color
-
-  jest-snapshot@29.7.0:
-    dependencies:
-      '@babel/core': 7.26.0
-      '@babel/generator': 7.26.0
-      '@babel/plugin-syntax-jsx': 7.25.9(@babel/core@7.26.0)
-      '@babel/plugin-syntax-typescript': 7.25.9(@babel/core@7.26.0)
-      '@babel/types': 7.26.0
-      '@jest/expect-utils': 29.7.0
-      '@jest/transform': 29.7.0
-      '@jest/types': 29.6.3
-      babel-preset-current-node-syntax: 1.1.0(@babel/core@7.26.0)
-      chalk: 4.1.2
-      expect: 29.7.0
-      graceful-fs: 4.2.11
-      jest-diff: 29.7.0
-      jest-get-type: 29.6.3
-      jest-matcher-utils: 29.7.0
-      jest-message-util: 29.7.0
-      jest-util: 29.7.0
-      natural-compare: 1.4.0
-      pretty-format: 29.7.0
-      semver: 7.6.3
-    transitivePeerDependencies:
-      - supports-color
-
-  jest-util@29.7.0:
-    dependencies:
-      '@jest/types': 29.6.3
-      '@types/node': 20.17.1
-      chalk: 4.1.2
-      ci-info: 3.9.0
-      graceful-fs: 4.2.11
-      picomatch: 2.3.1
-
-  jest-validate@29.7.0:
-    dependencies:
-      '@jest/types': 29.6.3
-      camelcase: 6.3.0
-      chalk: 4.1.2
-      jest-get-type: 29.6.3
-      leven: 3.1.0
-      pretty-format: 29.7.0
-
-  jest-watcher@29.7.0:
-    dependencies:
-      '@jest/test-result': 29.7.0
-      '@jest/types': 29.6.3
-      '@types/node': 20.17.1
-      ansi-escapes: 4.3.2
-      chalk: 4.1.2
-      emittery: 0.13.1
-      jest-util: 29.7.0
-      string-length: 4.0.2
-
-  jest-worker@26.6.2:
-    dependencies:
-      '@types/node': 20.17.1
-      merge-stream: 2.0.0
-      supports-color: 7.2.0
-
-  jest-worker@29.7.0:
-    dependencies:
-      '@types/node': 20.17.1
-      jest-util: 29.7.0
-      merge-stream: 2.0.0
-      supports-color: 8.1.1
-
-  jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)):
-    dependencies:
-      '@jest/core': 29.7.0(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3))
-      '@jest/types': 29.6.3
-      import-local: 3.2.0
-      jest-cli: 29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3))
-    transitivePeerDependencies:
-      - '@types/node'
-      - babel-plugin-macros
-      - supports-color
-      - ts-node
-
-  joycon@3.1.1: {}
-
-  js-tokens@4.0.0: {}
-
-  js-yaml@3.14.1:
-    dependencies:
-      argparse: 1.0.10
-      esprima: 4.0.1
-
-  js-yaml@4.1.0:
-    dependencies:
-      argparse: 2.0.1
-
-  jsbn@0.1.1: {}
-
-  jsesc@3.0.2: {}
-
-  json-buffer@3.0.1: {}
-
-  json-parse-better-errors@1.0.2: {}
-
-  json-parse-even-better-errors@2.3.1: {}
-
-  json-schema-traverse@0.4.1: {}
-
-  json-schema-traverse@1.0.0: {}
-
-  json-schema@0.4.0: {}
-
-  json-stable-stringify-without-jsonify@1.0.1: {}
-
-  json-stable-stringify@1.1.1:
-    dependencies:
-      call-bind: 1.0.7
-      isarray: 2.0.5
-      jsonify: 0.0.1
-      object-keys: 1.1.1
-
-  json-stringify-safe@5.0.1: {}
-
-  json5@1.0.2:
-    dependencies:
-      minimist: 1.2.8
-
-  json5@2.2.3: {}
-
-  jsonc-parser@3.3.1: {}
-
-  jsonfile@4.0.0:
-    optionalDependencies:
-      graceful-fs: 4.2.11
-
-  jsonfile@6.1.0:
-    dependencies:
-      universalify: 2.0.1
-    optionalDependencies:
-      graceful-fs: 4.2.11
-
-  jsonify@0.0.1: {}
-
-  jsonwebtoken@9.0.2:
-    dependencies:
-      jws: 3.2.2
-      lodash.includes: 4.3.0
-      lodash.isboolean: 3.0.3
-      lodash.isinteger: 4.0.4
-      lodash.isnumber: 3.0.3
-      lodash.isplainobject: 4.0.6
-      lodash.isstring: 4.0.1
-      lodash.once: 4.1.1
-      ms: 2.1.3
-      semver: 7.6.3
-
-  jsprim@2.0.2:
-    dependencies:
-      assert-plus: 1.0.0
-      extsprintf: 1.3.0
-      json-schema: 0.4.0
-      verror: 1.10.0
-
-  jsx-ast-utils@3.3.5:
-    dependencies:
-      array-includes: 3.1.8
-      array.prototype.flat: 1.3.2
-      object.assign: 4.1.5
-      object.values: 1.2.0
-
-  jwa@1.4.1:
-    dependencies:
-      buffer-equal-constant-time: 1.0.1
-      ecdsa-sig-formatter: 1.0.11
-      safe-buffer: 5.2.1
-
-  jws@3.2.2:
-    dependencies:
-      jwa: 1.4.1
-      safe-buffer: 5.2.1
-
-  kafkajs@2.2.4: {}
-
-  keyv@4.5.4:
-    dependencies:
-      json-buffer: 3.0.1
-
-  kind-of@6.0.3: {}
-
-  kleur@3.0.3: {}
-
-  known-css-properties@0.29.0: {}
-
-  known-css-properties@0.34.0:
-    optional: true
-
-  language-subtag-registry@0.3.23: {}
-
-  language-tags@1.0.9:
-    dependencies:
-      language-subtag-registry: 0.3.23
-
-  lazy-ass@1.6.0: {}
-
-  leven@3.1.0: {}
-
-  levn@0.4.1:
-    dependencies:
-      prelude-ls: 1.2.1
-      type-check: 0.4.0
-
-  lilconfig@2.1.0: {}
-
-  lines-and-columns@1.2.4: {}
-
-  lint-staged@14.0.1(enquirer@2.4.1):
-    dependencies:
-      chalk: 5.3.0
-      commander: 11.0.0
-      debug: 4.3.4
-      execa: 7.2.0
-      lilconfig: 2.1.0
-      listr2: 6.6.1(enquirer@2.4.1)
-      micromatch: 4.0.5
-      pidtree: 0.6.0
-      string-argv: 0.3.2
-      yaml: 2.3.1
-    transitivePeerDependencies:
-      - enquirer
-      - supports-color
-
-  listr2@3.14.0(enquirer@2.4.1):
-    dependencies:
-      cli-truncate: 2.1.0
-      colorette: 2.0.20
-      log-update: 4.0.0
-      p-map: 4.0.0
-      rfdc: 1.4.1
-      rxjs: 7.8.1
-      through: 2.3.8
-      wrap-ansi: 7.0.0
-    optionalDependencies:
-      enquirer: 2.4.1
-
-  listr2@6.6.1(enquirer@2.4.1):
-    dependencies:
-      cli-truncate: 3.1.0
-      colorette: 2.0.20
-      eventemitter3: 5.0.1
-      log-update: 5.0.1
-      rfdc: 1.4.1
-      wrap-ansi: 8.1.0
-    optionalDependencies:
-      enquirer: 2.4.1
-
-  load-json-file@4.0.0:
-    dependencies:
-      graceful-fs: 4.2.11
-      parse-json: 4.0.0
-      pify: 3.0.0
-      strip-bom: 3.0.0
-
-  load-json-file@6.2.0:
-    dependencies:
-      graceful-fs: 4.2.11
-      parse-json: 5.2.0
-      strip-bom: 4.0.0
-      type-fest: 0.6.0
-
-  loader-utils@3.3.1: {}
-
-  locate-path@5.0.0:
-    dependencies:
-      p-locate: 4.1.0
-
-  locate-path@6.0.0:
-    dependencies:
-      p-locate: 5.0.0
-
-  lodash-es@4.17.21: {}
-
-  lodash.camelcase@4.3.0: {}
-
-  lodash.debounce@4.0.8: {}
-
-  lodash.includes@4.3.0: {}
-
-  lodash.isboolean@3.0.3: {}
-
-  lodash.isinteger@4.0.4: {}
-
-  lodash.isnumber@3.0.3: {}
-
-  lodash.isplainobject@4.0.6: {}
-
-  lodash.isstring@4.0.1: {}
-
-  lodash.memoize@4.1.2: {}
-
-  lodash.merge@4.6.2: {}
-
-  lodash.mergewith@4.6.2: {}
-
-  lodash.once@4.1.1: {}
-
-  lodash.pick@4.4.0: {}
-
-  lodash.truncate@4.4.2: {}
-
-  lodash.uniq@4.5.0: {}
-
-  lodash@4.17.21: {}
-
-  log-symbols@4.1.0:
-    dependencies:
-      chalk: 4.1.2
-      is-unicode-supported: 0.1.0
-
-  log-update@4.0.0:
-    dependencies:
-      ansi-escapes: 4.3.2
-      cli-cursor: 3.1.0
-      slice-ansi: 4.0.0
-      wrap-ansi: 6.2.0
-
-  log-update@5.0.1:
-    dependencies:
-      ansi-escapes: 5.0.0
-      cli-cursor: 4.0.0
-      slice-ansi: 5.0.0
-      strip-ansi: 7.1.0
-      wrap-ansi: 8.1.0
-
-  loose-envify@1.4.0:
-    dependencies:
-      js-tokens: 4.0.0
-
-  loud-rejection@2.2.0:
-    dependencies:
-      currently-unhandled: 0.4.1
-      signal-exit: 3.0.7
-
-  lower-case@2.0.2:
-    dependencies:
-      tslib: 2.8.0
-
-  lru-cache@10.4.3: {}
-
-  lru-cache@5.1.1:
-    dependencies:
-      yallist: 3.1.1
-
-  lru-cache@6.0.0:
-    dependencies:
-      yallist: 4.0.0
-
-  magic-string@0.30.12:
-    dependencies:
-      '@jridgewell/sourcemap-codec': 1.5.0
-
-  make-dir@3.1.0:
-    dependencies:
-      semver: 6.3.1
-
-  make-dir@4.0.0:
-    dependencies:
-      semver: 7.6.3
-
-  make-error@1.3.6: {}
-
-  makeerror@1.0.12:
-    dependencies:
-      tmpl: 1.0.5
-
-  map-obj@1.0.1: {}
-
-  map-obj@4.3.0: {}
-
-  mathml-tag-names@2.1.3: {}
-
-  maxmind@4.3.22:
-    dependencies:
-      mmdb-lib: 2.1.1
-      tiny-lru: 11.2.11
-
-  md5@2.3.0:
-    dependencies:
-      charenc: 0.0.2
-      crypt: 0.0.2
-      is-buffer: 1.1.6
-
-  mdn-data@2.0.14: {}
-
-  mdn-data@2.0.28: {}
-
-  mdn-data@2.0.30: {}
-
-  mdn-data@2.10.0:
-    optional: true
-
-  mdn-data@2.11.1:
-    optional: true
-
-  memoize-one@5.2.1: {}
-
-  memorystream@0.3.1: {}
-
-  meow@10.1.5:
-    dependencies:
-      '@types/minimist': 1.2.5
-      camelcase-keys: 7.0.2
-      decamelize: 5.0.1
-      decamelize-keys: 1.1.1
-      hard-rejection: 2.1.0
-      minimist-options: 4.1.0
-      normalize-package-data: 3.0.3
-      read-pkg-up: 8.0.0
-      redent: 4.0.0
-      trim-newlines: 4.1.1
-      type-fest: 1.4.0
-      yargs-parser: 20.2.9
-
-  meow@6.1.1:
-    dependencies:
-      '@types/minimist': 1.2.5
-      camelcase-keys: 6.2.2
-      decamelize-keys: 1.1.1
-      hard-rejection: 2.1.0
-      minimist-options: 4.1.0
-      normalize-package-data: 2.5.0
-      read-pkg-up: 7.0.1
-      redent: 3.0.0
-      trim-newlines: 3.0.1
-      type-fest: 0.13.1
-      yargs-parser: 18.1.3
-
-  merge-stream@2.0.0: {}
-
-  merge2@1.4.1: {}
-
-  micromatch@4.0.5:
-    dependencies:
-      braces: 3.0.3
-      picomatch: 2.3.1
-
-  micromatch@4.0.8:
-    dependencies:
-      braces: 3.0.3
-      picomatch: 2.3.1
-
-  mime-db@1.52.0: {}
-
-  mime-types@2.1.35:
-    dependencies:
-      mime-db: 1.52.0
-
-  mimic-fn@2.1.0: {}
-
-  mimic-fn@4.0.0: {}
-
-  min-indent@1.0.1: {}
-
-  minimatch@3.1.2:
-    dependencies:
-      brace-expansion: 1.1.11
-
-  minimatch@5.1.6:
-    dependencies:
-      brace-expansion: 2.0.1
-
-  minimatch@9.0.3:
-    dependencies:
-      brace-expansion: 2.0.1
-
-  minimatch@9.0.5:
-    dependencies:
-      brace-expansion: 2.0.1
-
-  minimist-options@4.1.0:
-    dependencies:
-      arrify: 1.0.1
-      is-plain-obj: 1.1.0
-      kind-of: 6.0.3
-
-  minimist@1.2.8: {}
-
-  minipass@3.3.6:
-    dependencies:
-      yallist: 4.0.0
-
-  minipass@5.0.0: {}
-
-  minipass@7.1.2: {}
-
-  minizlib@2.1.2:
-    dependencies:
-      minipass: 3.3.6
-      yallist: 4.0.0
-
-  mkdirp@1.0.4: {}
-
-  mmdb-lib@2.1.1: {}
-
-  moment-timezone@0.5.46:
-    dependencies:
-      moment: 2.30.1
-
-  moment@2.30.1: {}
-
-  ms@2.1.2: {}
-
-  ms@2.1.3: {}
-
-  nanoclone@0.2.1: {}
-
-  nanoid@3.3.7: {}
-
-  natural-compare@1.4.0: {}
-
-  next-basics@0.39.0(next@14.2.10(@babel/core@7.26.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
-    dependencies:
-      bcryptjs: 2.4.3
-      jsonwebtoken: 9.0.2
-      next: 14.2.10(@babel/core@7.26.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      pure-rand: 6.1.0
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
-
-  next@14.2.10(@babel/core@7.26.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
-    dependencies:
-      '@next/env': 14.2.10
-      '@swc/helpers': 0.5.5
-      busboy: 1.6.0
-      caniuse-lite: 1.0.30001669
-      graceful-fs: 4.2.11
-      postcss: 8.4.31
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
-      styled-jsx: 5.1.1(@babel/core@7.26.0)(react@18.3.1)
-    optionalDependencies:
-      '@next/swc-darwin-arm64': 14.2.10
-      '@next/swc-darwin-x64': 14.2.10
-      '@next/swc-linux-arm64-gnu': 14.2.10
-      '@next/swc-linux-arm64-musl': 14.2.10
-      '@next/swc-linux-x64-gnu': 14.2.10
-      '@next/swc-linux-x64-musl': 14.2.10
-      '@next/swc-win32-arm64-msvc': 14.2.10
-      '@next/swc-win32-ia32-msvc': 14.2.10
-      '@next/swc-win32-x64-msvc': 14.2.10
-    transitivePeerDependencies:
-      - '@babel/core'
-      - babel-plugin-macros
-
-  nice-try@1.0.5: {}
-
-  no-case@3.0.4:
-    dependencies:
-      lower-case: 2.0.2
-      tslib: 2.8.0
-
-  node-domexception@1.0.0: {}
-
-  node-fetch@3.3.2:
-    dependencies:
-      data-uri-to-buffer: 4.0.1
-      fetch-blob: 3.2.0
-      formdata-polyfill: 4.0.10
-
-  node-int64@0.4.0: {}
-
-  node-releases@2.0.18: {}
-
-  normalize-package-data@2.5.0:
-    dependencies:
-      hosted-git-info: 2.8.9
-      resolve: 1.22.8
-      semver: 5.7.2
-      validate-npm-package-license: 3.0.4
-
-  normalize-package-data@3.0.3:
-    dependencies:
-      hosted-git-info: 4.1.0
-      is-core-module: 2.15.1
-      semver: 7.6.3
-      validate-npm-package-license: 3.0.4
-
-  normalize-path@3.0.0: {}
-
-  normalize-range@0.1.2: {}
-
-  normalize-url@6.1.0: {}
-
-  npm-run-all@4.1.5:
-    dependencies:
-      ansi-styles: 3.2.1
-      chalk: 2.4.2
-      cross-spawn: 6.0.5
-      memorystream: 0.3.1
-      minimatch: 3.1.2
-      pidtree: 0.3.1
-      read-pkg: 3.0.0
-      shell-quote: 1.8.1
-      string.prototype.padend: 3.1.6
-
-  npm-run-path@4.0.1:
-    dependencies:
-      path-key: 3.1.1
-
-  npm-run-path@5.3.0:
-    dependencies:
-      path-key: 4.0.0
-
-  nth-check@2.1.1:
-    dependencies:
-      boolbase: 1.0.0
-
-  object-assign@4.1.1: {}
-
-  object-inspect@1.13.2: {}
-
-  object-keys@1.1.1: {}
-
-  object.assign@4.1.5:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      has-symbols: 1.0.3
-      object-keys: 1.1.1
-
-  object.entries@1.1.8:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-object-atoms: 1.0.0
-
-  object.fromentries@2.0.8:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-object-atoms: 1.0.0
-
-  object.groupby@1.0.3:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-
-  object.values@1.2.0:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-object-atoms: 1.0.0
-
-  once@1.4.0:
-    dependencies:
-      wrappy: 1.0.2
-
-  onetime@5.1.2:
-    dependencies:
-      mimic-fn: 2.1.0
-
-  onetime@6.0.0:
-    dependencies:
-      mimic-fn: 4.0.0
-
-  optionator@0.9.4:
-    dependencies:
-      deep-is: 0.1.4
-      fast-levenshtein: 2.0.6
-      levn: 0.4.1
-      prelude-ls: 1.2.1
-      type-check: 0.4.0
-      word-wrap: 1.2.5
-
-  ospath@1.2.2: {}
-
-  p-finally@1.0.0: {}
-
-  p-limit@2.3.0:
-    dependencies:
-      p-try: 2.2.0
-
-  p-limit@3.1.0:
-    dependencies:
-      yocto-queue: 0.1.0
-
-  p-locate@4.1.0:
-    dependencies:
-      p-limit: 2.3.0
-
-  p-locate@5.0.0:
-    dependencies:
-      p-limit: 3.1.0
-
-  p-map@3.0.0:
-    dependencies:
-      aggregate-error: 3.1.0
-
-  p-map@4.0.0:
-    dependencies:
-      aggregate-error: 3.1.0
-
-  p-queue@6.6.2:
-    dependencies:
-      eventemitter3: 4.0.7
-      p-timeout: 3.2.0
-
-  p-timeout@3.2.0:
-    dependencies:
-      p-finally: 1.0.0
-
-  p-try@2.2.0: {}
-
-  parent-module@1.0.1:
-    dependencies:
-      callsites: 3.1.0
-
-  parse-json@4.0.0:
-    dependencies:
-      error-ex: 1.3.2
-      json-parse-better-errors: 1.0.2
-
-  parse-json@5.2.0:
-    dependencies:
-      '@babel/code-frame': 7.26.0
-      error-ex: 1.3.2
-      json-parse-even-better-errors: 2.3.1
-      lines-and-columns: 1.2.4
-
-  path-exists@4.0.0: {}
-
-  path-is-absolute@1.0.1: {}
-
-  path-key@2.0.1: {}
-
-  path-key@3.1.1: {}
-
-  path-key@4.0.0: {}
-
-  path-parse@1.0.7: {}
-
-  path-scurry@1.11.1:
-    dependencies:
-      lru-cache: 10.4.3
-      minipass: 7.1.2
-
-  path-type@3.0.0:
-    dependencies:
-      pify: 3.0.0
-
-  path-type@4.0.0: {}
-
-  pend@1.2.0: {}
-
-  performance-now@2.1.0: {}
-
-  picocolors@1.1.1: {}
-
-  picomatch@2.3.1: {}
-
-  picomatch@4.0.2: {}
-
-  pidtree@0.3.1: {}
-
-  pidtree@0.6.0: {}
-
-  pify@2.3.0: {}
-
-  pify@3.0.0: {}
-
-  pify@5.0.0: {}
-
-  pirates@4.0.6: {}
-
-  pkg-dir@4.2.0:
-    dependencies:
-      find-up: 4.1.0
-
-  possible-typed-array-names@1.0.0: {}
-
-  postcss-attribute-case-insensitive@5.0.2(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-selector-parser: 6.1.2
-
-  postcss-calc@8.2.4(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-selector-parser: 6.1.2
-      postcss-value-parser: 4.2.0
-
-  postcss-clamp@4.1.0(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  postcss-color-functional-notation@4.2.4(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  postcss-color-hex-alpha@8.0.4(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  postcss-color-rebeccapurple@7.1.1(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  postcss-colormin@5.3.1(postcss@8.4.47):
-    dependencies:
-      browserslist: 4.24.2
-      caniuse-api: 3.0.0
-      colord: 2.9.3
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  postcss-convert-values@5.1.3(postcss@8.4.47):
-    dependencies:
-      browserslist: 4.24.2
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  postcss-custom-media@8.0.2(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  postcss-custom-properties@12.1.11(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  postcss-custom-selectors@6.0.3(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-selector-parser: 6.1.2
-
-  postcss-dir-pseudo-class@6.0.5(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-selector-parser: 6.1.2
-
-  postcss-discard-comments@5.1.2(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-
-  postcss-discard-duplicates@5.1.0(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-
-  postcss-discard-empty@5.1.1(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-
-  postcss-discard-overridden@5.1.0(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-
-  postcss-double-position-gradients@3.1.2(postcss@8.4.47):
-    dependencies:
-      '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.47)
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  postcss-env-function@4.0.6(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  postcss-flexbugs-fixes@5.0.2(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-
-  postcss-focus-visible@6.0.4(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-selector-parser: 6.1.2
-
-  postcss-focus-within@5.0.4(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-selector-parser: 6.1.2
-
-  postcss-font-variant@5.0.0(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-
-  postcss-gap-properties@3.0.5(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-
-  postcss-image-set-function@4.0.7(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  postcss-import@15.1.0(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-      read-cache: 1.0.0
-      resolve: 1.22.8
-
-  postcss-initial@4.0.1(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-
-  postcss-lab-function@4.2.1(postcss@8.4.47):
-    dependencies:
-      '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.47)
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  postcss-load-config@3.1.4(postcss@8.4.47)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)):
-    dependencies:
-      lilconfig: 2.1.0
-      yaml: 1.10.2
-    optionalDependencies:
-      postcss: 8.4.47
-      ts-node: 10.9.2(@types/node@20.17.1)(typescript@5.6.3)
-
-  postcss-logical@5.0.4(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-
-  postcss-media-minmax@5.0.0(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-
-  postcss-media-query-parser@0.2.3:
-    optional: true
-
-  postcss-merge-longhand@5.1.7(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-      stylehacks: 5.1.1(postcss@8.4.47)
-
-  postcss-merge-rules@5.1.4(postcss@8.4.47):
-    dependencies:
-      browserslist: 4.24.2
-      caniuse-api: 3.0.0
-      cssnano-utils: 3.1.0(postcss@8.4.47)
-      postcss: 8.4.47
-      postcss-selector-parser: 6.1.2
-
-  postcss-minify-font-values@5.1.0(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  postcss-minify-gradients@5.1.1(postcss@8.4.47):
-    dependencies:
-      colord: 2.9.3
-      cssnano-utils: 3.1.0(postcss@8.4.47)
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  postcss-minify-params@5.1.4(postcss@8.4.47):
-    dependencies:
-      browserslist: 4.24.2
-      cssnano-utils: 3.1.0(postcss@8.4.47)
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  postcss-minify-selectors@5.2.1(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-selector-parser: 6.1.2
-
-  postcss-modules-extract-imports@3.1.0(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-
-  postcss-modules-local-by-default@4.0.5(postcss@8.4.47):
-    dependencies:
-      icss-utils: 5.1.0(postcss@8.4.47)
-      postcss: 8.4.47
-      postcss-selector-parser: 6.1.2
-      postcss-value-parser: 4.2.0
-
-  postcss-modules-scope@3.2.0(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-selector-parser: 6.1.2
-
-  postcss-modules-values@4.0.0(postcss@8.4.47):
-    dependencies:
-      icss-utils: 5.1.0(postcss@8.4.47)
-      postcss: 8.4.47
-
-  postcss-modules@4.3.1(postcss@8.4.47):
-    dependencies:
-      generic-names: 4.0.0
-      icss-replace-symbols: 1.1.0
-      lodash.camelcase: 4.3.0
-      postcss: 8.4.47
-      postcss-modules-extract-imports: 3.1.0(postcss@8.4.47)
-      postcss-modules-local-by-default: 4.0.5(postcss@8.4.47)
-      postcss-modules-scope: 3.2.0(postcss@8.4.47)
-      postcss-modules-values: 4.0.0(postcss@8.4.47)
-      string-hash: 1.1.3
-
-  postcss-nesting@10.2.0(postcss@8.4.47):
-    dependencies:
-      '@csstools/selector-specificity': 2.2.0(postcss-selector-parser@6.1.2)
-      postcss: 8.4.47
-      postcss-selector-parser: 6.1.2
-
-  postcss-normalize-charset@5.1.0(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-
-  postcss-normalize-display-values@5.1.0(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  postcss-normalize-positions@5.1.1(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  postcss-normalize-repeat-style@5.1.1(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  postcss-normalize-string@5.1.0(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  postcss-normalize-timing-functions@5.1.0(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  postcss-normalize-unicode@5.1.1(postcss@8.4.47):
-    dependencies:
-      browserslist: 4.24.2
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  postcss-normalize-url@5.1.0(postcss@8.4.47):
-    dependencies:
-      normalize-url: 6.1.0
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  postcss-normalize-whitespace@5.1.1(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  postcss-opacity-percentage@1.1.3(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-
-  postcss-ordered-values@5.1.3(postcss@8.4.47):
-    dependencies:
-      cssnano-utils: 3.1.0(postcss@8.4.47)
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  postcss-overflow-shorthand@3.0.4(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  postcss-page-break@3.0.4(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-
-  postcss-place@7.0.5(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  postcss-preset-env@7.8.3(postcss@8.4.47):
-    dependencies:
-      '@csstools/postcss-cascade-layers': 1.1.1(postcss@8.4.47)
-      '@csstools/postcss-color-function': 1.1.1(postcss@8.4.47)
-      '@csstools/postcss-font-format-keywords': 1.0.1(postcss@8.4.47)
-      '@csstools/postcss-hwb-function': 1.0.2(postcss@8.4.47)
-      '@csstools/postcss-ic-unit': 1.0.1(postcss@8.4.47)
-      '@csstools/postcss-is-pseudo-class': 2.0.7(postcss@8.4.47)
-      '@csstools/postcss-nested-calc': 1.0.0(postcss@8.4.47)
-      '@csstools/postcss-normalize-display-values': 1.0.1(postcss@8.4.47)
-      '@csstools/postcss-oklab-function': 1.1.1(postcss@8.4.47)
-      '@csstools/postcss-progressive-custom-properties': 1.3.0(postcss@8.4.47)
-      '@csstools/postcss-stepped-value-functions': 1.0.1(postcss@8.4.47)
-      '@csstools/postcss-text-decoration-shorthand': 1.0.0(postcss@8.4.47)
-      '@csstools/postcss-trigonometric-functions': 1.0.2(postcss@8.4.47)
-      '@csstools/postcss-unset-value': 1.0.2(postcss@8.4.47)
-      autoprefixer: 10.4.20(postcss@8.4.47)
-      browserslist: 4.24.2
-      css-blank-pseudo: 3.0.3(postcss@8.4.47)
-      css-has-pseudo: 3.0.4(postcss@8.4.47)
-      css-prefers-color-scheme: 6.0.3(postcss@8.4.47)
-      cssdb: 7.11.2
-      postcss: 8.4.47
-      postcss-attribute-case-insensitive: 5.0.2(postcss@8.4.47)
-      postcss-clamp: 4.1.0(postcss@8.4.47)
-      postcss-color-functional-notation: 4.2.4(postcss@8.4.47)
-      postcss-color-hex-alpha: 8.0.4(postcss@8.4.47)
-      postcss-color-rebeccapurple: 7.1.1(postcss@8.4.47)
-      postcss-custom-media: 8.0.2(postcss@8.4.47)
-      postcss-custom-properties: 12.1.11(postcss@8.4.47)
-      postcss-custom-selectors: 6.0.3(postcss@8.4.47)
-      postcss-dir-pseudo-class: 6.0.5(postcss@8.4.47)
-      postcss-double-position-gradients: 3.1.2(postcss@8.4.47)
-      postcss-env-function: 4.0.6(postcss@8.4.47)
-      postcss-focus-visible: 6.0.4(postcss@8.4.47)
-      postcss-focus-within: 5.0.4(postcss@8.4.47)
-      postcss-font-variant: 5.0.0(postcss@8.4.47)
-      postcss-gap-properties: 3.0.5(postcss@8.4.47)
-      postcss-image-set-function: 4.0.7(postcss@8.4.47)
-      postcss-initial: 4.0.1(postcss@8.4.47)
-      postcss-lab-function: 4.2.1(postcss@8.4.47)
-      postcss-logical: 5.0.4(postcss@8.4.47)
-      postcss-media-minmax: 5.0.0(postcss@8.4.47)
-      postcss-nesting: 10.2.0(postcss@8.4.47)
-      postcss-opacity-percentage: 1.1.3(postcss@8.4.47)
-      postcss-overflow-shorthand: 3.0.4(postcss@8.4.47)
-      postcss-page-break: 3.0.4(postcss@8.4.47)
-      postcss-place: 7.0.5(postcss@8.4.47)
-      postcss-pseudo-class-any-link: 7.1.6(postcss@8.4.47)
-      postcss-replace-overflow-wrap: 4.0.0(postcss@8.4.47)
-      postcss-selector-not: 6.0.1(postcss@8.4.47)
-      postcss-value-parser: 4.2.0
-
-  postcss-pseudo-class-any-link@7.1.6(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-selector-parser: 6.1.2
-
-  postcss-reduce-initial@5.1.2(postcss@8.4.47):
-    dependencies:
-      browserslist: 4.24.2
-      caniuse-api: 3.0.0
-      postcss: 8.4.47
-
-  postcss-reduce-transforms@5.1.0(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-
-  postcss-replace-overflow-wrap@4.0.0(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-
-  postcss-resolve-nested-selector@0.1.6: {}
-
-  postcss-rtlcss@4.0.9(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      rtlcss: 4.1.1
-
-  postcss-safe-parser@6.0.0(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-
-  postcss-selector-not@6.0.1(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-selector-parser: 6.1.2
-
-  postcss-selector-parser@6.1.2:
-    dependencies:
-      cssesc: 3.0.0
-      util-deprecate: 1.0.2
-
-  postcss-svgo@5.1.0(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-value-parser: 4.2.0
-      svgo: 2.8.0
-
-  postcss-unique-selectors@5.1.1(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-      postcss-selector-parser: 6.1.2
-
-  postcss-value-parser@4.2.0: {}
-
-  postcss@8.4.31:
-    dependencies:
-      nanoid: 3.3.7
-      picocolors: 1.1.1
-      source-map-js: 1.2.1
-
-  postcss@8.4.47:
-    dependencies:
-      nanoid: 3.3.7
-      picocolors: 1.1.1
-      source-map-js: 1.2.1
-
-  prelude-ls@1.2.1: {}
-
-  prettier-linter-helpers@1.0.0:
-    dependencies:
-      fast-diff: 1.3.0
-
-  prettier@2.8.8: {}
-
-  pretty-bytes@5.6.0: {}
-
-  pretty-format@29.7.0:
-    dependencies:
-      '@jest/schemas': 29.6.3
-      ansi-styles: 5.2.0
-      react-is: 18.3.1
-
-  prisma@5.17.0:
-    dependencies:
-      '@prisma/engines': 5.17.0
-
-  process@0.11.10: {}
-
-  promise.series@0.2.0: {}
-
-  prompts@2.4.2:
-    dependencies:
-      kleur: 3.0.3
-      sisteransi: 1.0.5
-
-  prop-types@15.8.1:
-    dependencies:
-      loose-envify: 1.4.0
-      object-assign: 4.1.1
-      react-is: 16.13.1
-
-  property-expr@2.0.6: {}
-
-  proxy-from-env@1.0.0: {}
-
-  psl@1.9.0: {}
-
-  pump@3.0.2:
-    dependencies:
-      end-of-stream: 1.4.4
-      once: 1.4.0
-
-  punycode@2.3.1: {}
-
-  pure-rand@6.1.0: {}
-
-  qs@6.13.0:
-    dependencies:
-      side-channel: 1.0.6
-
-  querystringify@2.2.0: {}
-
-  queue-microtask@1.2.3: {}
-
-  quick-lru@4.0.1: {}
-
-  quick-lru@5.1.1: {}
-
-  raf-schd@4.0.3: {}
-
-  randombytes@2.1.0:
-    dependencies:
-      safe-buffer: 5.2.1
-
-  react-basics@0.125.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
-    dependencies:
-      '@react-spring/web': 9.7.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      classnames: 2.5.1
-      date-fns: 2.30.0
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
-      react-hook-form: 7.53.1(react@18.3.1)
-      react-window: 1.8.10(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-
-  react-beautiful-dnd@13.1.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
-    dependencies:
-      '@babel/runtime': 7.26.0
-      css-box-model: 1.2.1
-      memoize-one: 5.2.1
-      raf-schd: 4.0.3
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
-      react-redux: 7.2.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      redux: 4.2.1
-      use-memo-one: 1.1.3(react@18.3.1)
-    transitivePeerDependencies:
-      - react-native
-
-  react-dom@18.3.1(react@18.3.1):
-    dependencies:
-      loose-envify: 1.4.0
-      react: 18.3.1
-      scheduler: 0.23.2
-
-  react-error-boundary@4.1.2(react@18.3.1):
-    dependencies:
-      '@babel/runtime': 7.26.0
-      react: 18.3.1
-
-  react-hook-form@7.53.1(react@18.3.1):
-    dependencies:
-      react: 18.3.1
-
-  react-intl@6.8.4(react@18.3.1)(typescript@5.6.3):
-    dependencies:
-      '@formatjs/ecma402-abstract': 2.2.1
-      '@formatjs/icu-messageformat-parser': 2.9.1
-      '@formatjs/intl': 2.10.11(typescript@5.6.3)
-      '@formatjs/intl-displaynames': 6.8.1
-      '@formatjs/intl-listformat': 7.7.1
-      '@types/hoist-non-react-statics': 3.3.5
-      '@types/react': 18.3.12
-      hoist-non-react-statics: 3.3.2
-      intl-messageformat: 10.7.3
-      react: 18.3.1
-      tslib: 2.8.0
-    optionalDependencies:
-      typescript: 5.6.3
-
-  react-is@16.13.1: {}
-
-  react-is@17.0.2: {}
-
-  react-is@18.3.1: {}
-
-  react-redux@7.2.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
-    dependencies:
-      '@babel/runtime': 7.26.0
-      '@types/react-redux': 7.1.34
-      hoist-non-react-statics: 3.3.2
-      loose-envify: 1.4.0
-      prop-types: 15.8.1
-      react: 18.3.1
-      react-is: 17.0.2
-    optionalDependencies:
-      react-dom: 18.3.1(react@18.3.1)
-
-  react-simple-maps@2.3.0(prop-types@15.8.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
-    dependencies:
-      d3-geo: 2.0.2
-      d3-selection: 2.0.0
-      d3-zoom: 2.0.0
-      prop-types: 15.8.1
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
-      topojson-client: 3.1.0
-
-  react-use-measure@2.1.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
-    dependencies:
-      debounce: 1.2.1
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
-
-  react-window@1.8.10(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
-    dependencies:
-      '@babel/runtime': 7.26.0
-      memoize-one: 5.2.1
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
-
-  react@18.3.1:
-    dependencies:
-      loose-envify: 1.4.0
-
-  read-babelrc-up@1.1.0:
-    dependencies:
-      find-up: 4.1.0
-      json5: 2.2.3
-
-  read-cache@1.0.0:
-    dependencies:
-      pify: 2.3.0
-
-  read-pkg-up@7.0.1:
-    dependencies:
-      find-up: 4.1.0
-      read-pkg: 5.2.0
-      type-fest: 0.8.1
-
-  read-pkg-up@8.0.0:
-    dependencies:
-      find-up: 5.0.0
-      read-pkg: 6.0.0
-      type-fest: 1.4.0
-
-  read-pkg@3.0.0:
-    dependencies:
-      load-json-file: 4.0.0
-      normalize-package-data: 2.5.0
-      path-type: 3.0.0
-
-  read-pkg@5.2.0:
-    dependencies:
-      '@types/normalize-package-data': 2.4.4
-      normalize-package-data: 2.5.0
-      parse-json: 5.2.0
-      type-fest: 0.6.0
-
-  read-pkg@6.0.0:
-    dependencies:
-      '@types/normalize-package-data': 2.4.4
-      normalize-package-data: 3.0.3
-      parse-json: 5.2.0
-      type-fest: 1.4.0
-
-  redent@3.0.0:
-    dependencies:
-      indent-string: 4.0.0
-      strip-indent: 3.0.0
-
-  redent@4.0.0:
-    dependencies:
-      indent-string: 5.0.0
-      strip-indent: 4.0.0
-
-  redis@4.7.0:
-    dependencies:
-      '@redis/bloom': 1.2.0(@redis/client@1.6.0)
-      '@redis/client': 1.6.0
-      '@redis/graph': 1.1.1(@redis/client@1.6.0)
-      '@redis/json': 1.0.7(@redis/client@1.6.0)
-      '@redis/search': 1.2.0(@redis/client@1.6.0)
-      '@redis/time-series': 1.1.0(@redis/client@1.6.0)
-
-  redux@4.2.1:
-    dependencies:
-      '@babel/runtime': 7.26.0
-
-  reflect.getprototypeof@1.0.6:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-errors: 1.3.0
-      get-intrinsic: 1.2.4
-      globalthis: 1.0.4
-      which-builtin-type: 1.1.4
-
-  regenerate-unicode-properties@10.2.0:
-    dependencies:
-      regenerate: 1.4.2
-
-  regenerate@1.4.2: {}
-
-  regenerator-runtime@0.14.1: {}
-
-  regenerator-transform@0.15.2:
-    dependencies:
-      '@babel/runtime': 7.26.0
-
-  regexp.prototype.flags@1.5.3:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-errors: 1.3.0
-      set-function-name: 2.0.2
-
-  regexpu-core@6.1.1:
-    dependencies:
-      regenerate: 1.4.2
-      regenerate-unicode-properties: 10.2.0
-      regjsgen: 0.8.0
-      regjsparser: 0.11.1
-      unicode-match-property-ecmascript: 2.0.0
-      unicode-match-property-value-ecmascript: 2.2.0
-
-  regjsgen@0.8.0: {}
-
-  regjsparser@0.11.1:
-    dependencies:
-      jsesc: 3.0.2
-
-  request-ip@3.3.0: {}
-
-  request-progress@3.0.0:
-    dependencies:
-      throttleit: 1.0.1
-
-  require-directory@2.1.1: {}
-
-  require-from-string@2.0.2: {}
-
-  requires-port@1.0.0: {}
-
-  resolve-cwd@3.0.0:
-    dependencies:
-      resolve-from: 5.0.0
-
-  resolve-from@4.0.0: {}
-
-  resolve-from@5.0.0: {}
-
-  resolve-pkg-maps@1.0.0: {}
-
-  resolve.exports@2.0.2: {}
-
-  resolve@1.22.8:
-    dependencies:
-      is-core-module: 2.15.1
-      path-parse: 1.0.7
-      supports-preserve-symlinks-flag: 1.0.0
-
-  resolve@2.0.0-next.5:
-    dependencies:
-      is-core-module: 2.15.1
-      path-parse: 1.0.7
-      supports-preserve-symlinks-flag: 1.0.0
-
-  restore-cursor@3.1.0:
-    dependencies:
-      onetime: 5.1.2
-      signal-exit: 3.0.7
-
-  restore-cursor@4.0.0:
-    dependencies:
-      onetime: 5.1.2
-      signal-exit: 3.0.7
-
-  reusify@1.0.4: {}
-
-  rfdc@1.4.1: {}
-
-  rimraf@3.0.2:
-    dependencies:
-      glob: 7.2.3
-
-  rollup-plugin-copy@3.5.0:
-    dependencies:
-      '@types/fs-extra': 8.1.5
-      colorette: 1.4.0
-      fs-extra: 8.1.0
-      globby: 10.0.1
-      is-plain-object: 3.0.1
-
-  rollup-plugin-delete@2.1.0(rollup@3.29.5):
-    dependencies:
-      del: 5.1.0
-      rollup: 3.29.5
-
-  rollup-plugin-dts@5.3.1(rollup@3.29.5)(typescript@5.6.3):
-    dependencies:
-      magic-string: 0.30.12
-      rollup: 3.29.5
-      typescript: 5.6.3
-    optionalDependencies:
-      '@babel/code-frame': 7.26.0
-
-  rollup-plugin-esbuild@5.0.0(esbuild@0.17.19)(rollup@3.29.5):
-    dependencies:
-      '@rollup/pluginutils': 5.1.3(rollup@3.29.5)
-      debug: 4.3.7(supports-color@8.1.1)
-      es-module-lexer: 1.5.4
-      esbuild: 0.17.19
-      joycon: 3.1.1
-      jsonc-parser: 3.3.1
-      rollup: 3.29.5
-    transitivePeerDependencies:
-      - supports-color
-
-  rollup-plugin-node-externals@6.1.2(rollup@3.29.5):
-    dependencies:
-      rollup: 3.29.5
-
-  rollup-plugin-postcss@4.0.2(postcss@8.4.47)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)):
-    dependencies:
-      chalk: 4.1.2
-      concat-with-sourcemaps: 1.1.0
-      cssnano: 5.1.15(postcss@8.4.47)
-      import-cwd: 3.0.0
-      p-queue: 6.6.2
-      pify: 5.0.0
-      postcss: 8.4.47
-      postcss-load-config: 3.1.4(postcss@8.4.47)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3))
-      postcss-modules: 4.3.1(postcss@8.4.47)
-      promise.series: 0.2.0
-      resolve: 1.22.8
-      rollup-pluginutils: 2.8.2
-      safe-identifier: 0.4.2
-      style-inject: 0.3.0
-    transitivePeerDependencies:
-      - ts-node
-
-  rollup-plugin-terser@7.0.2(rollup@3.29.5):
-    dependencies:
-      '@babel/code-frame': 7.26.0
-      jest-worker: 26.6.2
-      rollup: 3.29.5
-      serialize-javascript: 4.0.0
-      terser: 5.36.0
-
-  rollup-pluginutils@2.8.2:
-    dependencies:
-      estree-walker: 0.6.1
-
-  rollup@3.29.5:
-    optionalDependencies:
-      fsevents: 2.3.3
-
-  rtlcss@4.1.1:
-    dependencies:
-      escalade: 3.2.0
-      picocolors: 1.1.1
-      postcss: 8.4.47
-      strip-json-comments: 3.1.1
-
-  run-parallel@1.2.0:
-    dependencies:
-      queue-microtask: 1.2.3
-
-  rxjs@7.8.1:
-    dependencies:
-      tslib: 2.8.0
-
-  safe-array-concat@1.1.2:
-    dependencies:
-      call-bind: 1.0.7
-      get-intrinsic: 1.2.4
-      has-symbols: 1.0.3
-      isarray: 2.0.5
-
-  safe-buffer@5.2.1: {}
-
-  safe-identifier@0.4.2: {}
-
-  safe-regex-test@1.0.3:
-    dependencies:
-      call-bind: 1.0.7
-      es-errors: 1.3.0
-      is-regex: 1.1.4
-
-  safer-buffer@2.1.2: {}
-
-  scheduler@0.23.2:
-    dependencies:
-      loose-envify: 1.4.0
-
-  schema-utils@2.7.1:
-    dependencies:
-      '@types/json-schema': 7.0.15
-      ajv: 6.12.6
-      ajv-keywords: 3.5.2(ajv@6.12.6)
-
-  semver@5.7.2: {}
-
-  semver@6.3.1: {}
-
-  semver@7.6.3: {}
-
-  serialize-javascript@4.0.0:
-    dependencies:
-      randombytes: 2.1.0
-
-  set-function-length@1.2.2:
-    dependencies:
-      define-data-property: 1.1.4
-      es-errors: 1.3.0
-      function-bind: 1.1.2
-      get-intrinsic: 1.2.4
-      gopd: 1.0.1
-      has-property-descriptors: 1.0.2
-
-  set-function-name@2.0.2:
-    dependencies:
-      define-data-property: 1.1.4
-      es-errors: 1.3.0
-      functions-have-names: 1.2.3
-      has-property-descriptors: 1.0.2
-
-  shebang-command@1.2.0:
-    dependencies:
-      shebang-regex: 1.0.0
-
-  shebang-command@2.0.0:
-    dependencies:
-      shebang-regex: 3.0.0
-
-  shebang-regex@1.0.0: {}
-
-  shebang-regex@3.0.0: {}
-
-  shell-quote@1.8.1: {}
-
-  side-channel@1.0.6:
-    dependencies:
-      call-bind: 1.0.7
-      es-errors: 1.3.0
-      get-intrinsic: 1.2.4
-      object-inspect: 1.13.2
-
-  signal-exit@3.0.7: {}
-
-  signal-exit@4.1.0: {}
-
-  sisteransi@1.0.5: {}
-
-  slash@3.0.0: {}
-
-  slice-ansi@3.0.0:
-    dependencies:
-      ansi-styles: 4.3.0
-      astral-regex: 2.0.0
-      is-fullwidth-code-point: 3.0.0
-
-  slice-ansi@4.0.0:
-    dependencies:
-      ansi-styles: 4.3.0
-      astral-regex: 2.0.0
-      is-fullwidth-code-point: 3.0.0
-
-  slice-ansi@5.0.0:
-    dependencies:
-      ansi-styles: 6.2.1
-      is-fullwidth-code-point: 4.0.0
-
-  snake-case@3.0.4:
-    dependencies:
-      dot-case: 3.0.4
-      tslib: 2.8.0
-
-  sort-keys@4.2.0:
-    dependencies:
-      is-plain-obj: 2.1.0
-
-  source-map-js@1.2.1: {}
-
-  source-map-support@0.5.13:
-    dependencies:
-      buffer-from: 1.1.2
-      source-map: 0.6.1
-
-  source-map-support@0.5.21:
-    dependencies:
-      buffer-from: 1.1.2
-      source-map: 0.6.1
-
-  source-map@0.6.1: {}
-
-  spdx-correct@3.2.0:
-    dependencies:
-      spdx-expression-parse: 3.0.1
-      spdx-license-ids: 3.0.20
-
-  spdx-exceptions@2.5.0: {}
-
-  spdx-expression-parse@3.0.1:
-    dependencies:
-      spdx-exceptions: 2.5.0
-      spdx-license-ids: 3.0.20
-
-  spdx-license-ids@3.0.20: {}
-
-  sprintf-js@1.0.3: {}
-
-  sshpk@1.18.0:
-    dependencies:
-      asn1: 0.2.6
-      assert-plus: 1.0.0
-      bcrypt-pbkdf: 1.0.2
-      dashdash: 1.14.1
-      ecc-jsbn: 0.1.2
-      getpass: 0.1.7
-      jsbn: 0.1.1
-      safer-buffer: 2.1.2
-      tweetnacl: 0.14.5
-
-  stable@0.1.8: {}
-
-  stack-utils@2.0.6:
-    dependencies:
-      escape-string-regexp: 2.0.0
-
-  streamsearch@1.1.0: {}
-
-  string-argv@0.3.2: {}
-
-  string-hash@1.1.3: {}
-
-  string-length@4.0.2:
-    dependencies:
-      char-regex: 1.0.2
-      strip-ansi: 6.0.1
-
-  string-width@4.2.3:
-    dependencies:
-      emoji-regex: 8.0.0
-      is-fullwidth-code-point: 3.0.0
-      strip-ansi: 6.0.1
-
-  string-width@5.1.2:
-    dependencies:
-      eastasianwidth: 0.2.0
-      emoji-regex: 9.2.2
-      strip-ansi: 7.1.0
-
-  string.prototype.includes@2.0.1:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-
-  string.prototype.matchall@4.0.11:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-errors: 1.3.0
-      es-object-atoms: 1.0.0
-      get-intrinsic: 1.2.4
-      gopd: 1.0.1
-      has-symbols: 1.0.3
-      internal-slot: 1.0.7
-      regexp.prototype.flags: 1.5.3
-      set-function-name: 2.0.2
-      side-channel: 1.0.6
-
-  string.prototype.padend@3.1.6:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-object-atoms: 1.0.0
-
-  string.prototype.repeat@1.0.0:
-    dependencies:
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-
-  string.prototype.trim@1.2.9:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-object-atoms: 1.0.0
-
-  string.prototype.trimend@1.0.8:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-object-atoms: 1.0.0
-
-  string.prototype.trimstart@1.0.8:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-object-atoms: 1.0.0
-
-  strip-ansi@6.0.1:
-    dependencies:
-      ansi-regex: 5.0.1
-
-  strip-ansi@7.1.0:
-    dependencies:
-      ansi-regex: 6.1.0
-
-  strip-bom@3.0.0: {}
-
-  strip-bom@4.0.0: {}
-
-  strip-final-newline@2.0.0: {}
-
-  strip-final-newline@3.0.0: {}
-
-  strip-indent@3.0.0:
-    dependencies:
-      min-indent: 1.0.1
-
-  strip-indent@4.0.0:
-    dependencies:
-      min-indent: 1.0.1
-
-  strip-json-comments@3.1.1: {}
-
-  style-inject@0.3.0: {}
-
-  style-search@0.1.0: {}
-
-  styled-jsx@5.1.1(@babel/core@7.26.0)(react@18.3.1):
-    dependencies:
-      client-only: 0.0.1
-      react: 18.3.1
-    optionalDependencies:
-      '@babel/core': 7.26.0
-
-  stylehacks@5.1.1(postcss@8.4.47):
-    dependencies:
-      browserslist: 4.24.2
-      postcss: 8.4.47
-      postcss-selector-parser: 6.1.2
-
-  stylelint-config-css-modules@4.4.0(stylelint@15.11.0(typescript@5.6.3)):
-    dependencies:
-      stylelint: 15.11.0(typescript@5.6.3)
-    optionalDependencies:
-      stylelint-scss: 6.8.1(stylelint@15.11.0(typescript@5.6.3))
-
-  stylelint-config-prettier@9.0.5(stylelint@15.11.0(typescript@5.6.3)):
-    dependencies:
-      stylelint: 15.11.0(typescript@5.6.3)
-
-  stylelint-config-recommended@14.0.1(stylelint@15.11.0(typescript@5.6.3)):
-    dependencies:
-      stylelint: 15.11.0(typescript@5.6.3)
-
-  stylelint-scss@6.8.1(stylelint@15.11.0(typescript@5.6.3)):
-    dependencies:
-      css-tree: 3.0.0
-      is-plain-object: 5.0.0
-      known-css-properties: 0.34.0
-      mdn-data: 2.11.1
-      postcss-media-query-parser: 0.2.3
-      postcss-resolve-nested-selector: 0.1.6
-      postcss-selector-parser: 6.1.2
-      postcss-value-parser: 4.2.0
-      stylelint: 15.11.0(typescript@5.6.3)
-    optional: true
-
-  stylelint@15.11.0(typescript@5.6.3):
-    dependencies:
-      '@csstools/css-parser-algorithms': 2.7.1(@csstools/css-tokenizer@2.4.1)
-      '@csstools/css-tokenizer': 2.4.1
-      '@csstools/media-query-list-parser': 2.1.13(@csstools/css-parser-algorithms@2.7.1(@csstools/css-tokenizer@2.4.1))(@csstools/css-tokenizer@2.4.1)
-      '@csstools/selector-specificity': 3.1.1(postcss-selector-parser@6.1.2)
-      balanced-match: 2.0.0
-      colord: 2.9.3
-      cosmiconfig: 8.3.6(typescript@5.6.3)
-      css-functions-list: 3.2.3
-      css-tree: 2.3.1
-      debug: 4.3.7(supports-color@8.1.1)
-      fast-glob: 3.3.2
-      fastest-levenshtein: 1.0.16
-      file-entry-cache: 7.0.2
-      global-modules: 2.0.0
-      globby: 11.1.0
-      globjoin: 0.1.4
-      html-tags: 3.3.1
-      ignore: 5.3.2
-      import-lazy: 4.0.0
-      imurmurhash: 0.1.4
-      is-plain-object: 5.0.0
-      known-css-properties: 0.29.0
-      mathml-tag-names: 2.1.3
-      meow: 10.1.5
-      micromatch: 4.0.8
-      normalize-path: 3.0.0
-      picocolors: 1.1.1
-      postcss: 8.4.47
-      postcss-resolve-nested-selector: 0.1.6
-      postcss-safe-parser: 6.0.0(postcss@8.4.47)
-      postcss-selector-parser: 6.1.2
-      postcss-value-parser: 4.2.0
-      resolve-from: 5.0.0
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-      style-search: 0.1.0
-      supports-hyperlinks: 3.1.0
-      svg-tags: 1.0.0
-      table: 6.8.2
-      write-file-atomic: 5.0.1
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
-  supports-color@5.5.0:
-    dependencies:
-      has-flag: 3.0.0
-
-  supports-color@7.2.0:
-    dependencies:
-      has-flag: 4.0.0
-
-  supports-color@8.1.1:
-    dependencies:
-      has-flag: 4.0.0
-
-  supports-hyperlinks@3.1.0:
-    dependencies:
-      has-flag: 4.0.0
-      supports-color: 7.2.0
-
-  supports-preserve-symlinks-flag@1.0.0: {}
-
-  svg-parser@2.0.4: {}
-
-  svg-tags@1.0.0: {}
-
-  svgo@2.8.0:
-    dependencies:
-      '@trysound/sax': 0.2.0
-      commander: 7.2.0
-      css-select: 4.3.0
-      css-tree: 1.1.3
-      csso: 4.2.0
-      picocolors: 1.1.1
-      stable: 0.1.8
-
-  svgo@3.3.2:
-    dependencies:
-      '@trysound/sax': 0.2.0
-      commander: 7.2.0
-      css-select: 5.1.0
-      css-tree: 2.3.1
-      css-what: 6.1.0
-      csso: 5.0.5
-      picocolors: 1.1.1
-
-  table@6.8.2:
-    dependencies:
-      ajv: 8.17.1
-      lodash.truncate: 4.4.2
-      slice-ansi: 4.0.0
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-
-  tapable@2.2.1: {}
-
-  tar@6.2.1:
-    dependencies:
-      chownr: 2.0.0
-      fs-minipass: 2.1.0
-      minipass: 5.0.0
-      minizlib: 2.1.2
-      mkdirp: 1.0.4
-      yallist: 4.0.0
-
-  terser@5.36.0:
-    dependencies:
-      '@jridgewell/source-map': 0.3.6
-      acorn: 8.13.0
-      commander: 2.20.3
-      source-map-support: 0.5.21
-
-  test-exclude@6.0.0:
-    dependencies:
-      '@istanbuljs/schema': 0.1.3
-      glob: 7.2.3
-      minimatch: 3.1.2
-
-  text-table@0.2.0: {}
-
-  thenby@1.3.4: {}
-
-  throttleit@1.0.1: {}
-
-  through@2.3.8: {}
-
-  tiny-invariant@1.3.3: {}
-
-  tiny-lru@11.2.11: {}
-
-  tmp@0.2.3: {}
-
-  tmpl@1.0.5: {}
-
-  to-regex-range@5.0.1:
-    dependencies:
-      is-number: 7.0.0
-
-  topojson-client@3.1.0:
-    dependencies:
-      commander: 2.20.3
-
-  toposort@2.0.2: {}
-
-  tough-cookie@4.1.4:
-    dependencies:
-      psl: 1.9.0
-      punycode: 2.3.1
-      universalify: 0.2.0
-      url-parse: 1.5.10
-
-  tree-kill@1.2.2: {}
-
-  trim-newlines@3.0.1: {}
-
-  trim-newlines@4.1.1: {}
-
-  ts-api-utils@1.3.0(typescript@5.6.3):
-    dependencies:
-      typescript: 5.6.3
-
-  ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.17.19)(jest@29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3)))(typescript@5.6.3):
-    dependencies:
-      bs-logger: 0.2.6
-      ejs: 3.1.10
-      fast-json-stable-stringify: 2.1.0
-      jest: 29.7.0(@types/node@20.17.1)(ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3))
-      jest-util: 29.7.0
-      json5: 2.2.3
-      lodash.memoize: 4.1.2
-      make-error: 1.3.6
-      semver: 7.6.3
-      typescript: 5.6.3
-      yargs-parser: 21.1.1
-    optionalDependencies:
-      '@babel/core': 7.26.0
-      '@jest/transform': 29.7.0
-      '@jest/types': 29.6.3
-      babel-jest: 29.7.0(@babel/core@7.26.0)
-      esbuild: 0.17.19
-
-  ts-node@10.9.2(@types/node@20.17.1)(typescript@5.6.3):
-    dependencies:
-      '@cspotcode/source-map-support': 0.8.1
-      '@tsconfig/node10': 1.0.11
-      '@tsconfig/node12': 1.0.11
-      '@tsconfig/node14': 1.0.3
-      '@tsconfig/node16': 1.0.4
-      '@types/node': 20.17.1
-      acorn: 8.13.0
-      acorn-walk: 8.3.4
-      arg: 4.1.3
-      create-require: 1.1.1
-      diff: 4.0.2
-      make-error: 1.3.6
-      typescript: 5.6.3
-      v8-compile-cache-lib: 3.0.1
-      yn: 3.1.1
-
-  tsconfig-paths@3.15.0:
-    dependencies:
-      '@types/json5': 0.0.29
-      json5: 1.0.2
-      minimist: 1.2.8
-      strip-bom: 3.0.0
-
-  tslib@1.14.1: {}
-
-  tslib@2.8.0: {}
-
-  tsutils@3.21.0(typescript@5.6.3):
-    dependencies:
-      tslib: 1.14.1
-      typescript: 5.6.3
-
-  tunnel-agent@0.6.0:
-    dependencies:
-      safe-buffer: 5.2.1
-
-  tweetnacl@0.14.5: {}
-
-  type-check@0.4.0:
-    dependencies:
-      prelude-ls: 1.2.1
-
-  type-detect@4.0.8: {}
-
-  type-fest@0.13.1: {}
-
-  type-fest@0.20.2: {}
-
-  type-fest@0.21.3: {}
-
-  type-fest@0.6.0: {}
-
-  type-fest@0.8.1: {}
-
-  type-fest@1.4.0: {}
-
-  typed-array-buffer@1.0.2:
-    dependencies:
-      call-bind: 1.0.7
-      es-errors: 1.3.0
-      is-typed-array: 1.1.13
-
-  typed-array-byte-length@1.0.1:
-    dependencies:
-      call-bind: 1.0.7
-      for-each: 0.3.3
-      gopd: 1.0.1
-      has-proto: 1.0.3
-      is-typed-array: 1.1.13
-
-  typed-array-byte-offset@1.0.2:
-    dependencies:
-      available-typed-arrays: 1.0.7
-      call-bind: 1.0.7
-      for-each: 0.3.3
-      gopd: 1.0.1
-      has-proto: 1.0.3
-      is-typed-array: 1.1.13
-
-  typed-array-length@1.0.6:
-    dependencies:
-      call-bind: 1.0.7
-      for-each: 0.3.3
-      gopd: 1.0.1
-      has-proto: 1.0.3
-      is-typed-array: 1.1.13
-      possible-typed-array-names: 1.0.0
-
-  typedarray-to-buffer@3.1.5:
-    dependencies:
-      is-typedarray: 1.0.0
-
-  typescript@4.9.5: {}
-
-  typescript@5.6.3: {}
-
-  unbox-primitive@1.0.2:
-    dependencies:
-      call-bind: 1.0.7
-      has-bigints: 1.0.2
-      has-symbols: 1.0.3
-      which-boxed-primitive: 1.0.2
-
-  undici-types@6.19.8: {}
-
-  unicode-canonical-property-names-ecmascript@2.0.1: {}
-
-  unicode-match-property-ecmascript@2.0.0:
-    dependencies:
-      unicode-canonical-property-names-ecmascript: 2.0.1
-      unicode-property-aliases-ecmascript: 2.1.0
-
-  unicode-match-property-value-ecmascript@2.2.0: {}
-
-  unicode-property-aliases-ecmascript@2.1.0: {}
-
-  universalify@0.1.2: {}
-
-  universalify@0.2.0: {}
-
-  universalify@2.0.1: {}
-
-  untildify@4.0.0: {}
-
-  update-browserslist-db@1.1.1(browserslist@4.24.2):
-    dependencies:
-      browserslist: 4.24.2
-      escalade: 3.2.0
-      picocolors: 1.1.1
-
-  uri-js@4.4.1:
-    dependencies:
-      punycode: 2.3.1
-
-  url-parse@1.5.10:
-    dependencies:
-      querystringify: 2.2.0
-      requires-port: 1.0.0
-
-  use-memo-one@1.1.3(react@18.3.1):
-    dependencies:
-      react: 18.3.1
-
-  use-sync-external-store@1.2.2(react@18.3.1):
-    dependencies:
-      react: 18.3.1
-
-  util-deprecate@1.0.2: {}
-
-  uuid@8.3.2: {}
-
-  uuid@9.0.1: {}
-
-  v8-compile-cache-lib@3.0.1: {}
-
-  v8-to-istanbul@9.3.0:
-    dependencies:
-      '@jridgewell/trace-mapping': 0.3.25
-      '@types/istanbul-lib-coverage': 2.0.6
-      convert-source-map: 2.0.0
-
-  validate-npm-package-license@3.0.4:
-    dependencies:
-      spdx-correct: 3.2.0
-      spdx-expression-parse: 3.0.1
-
-  vary@1.1.2: {}
-
-  verror@1.10.0:
-    dependencies:
-      assert-plus: 1.0.0
-      core-util-is: 1.0.2
-      extsprintf: 1.3.0
-
-  vue@3.5.12(typescript@4.9.5):
-    dependencies:
-      '@vue/compiler-dom': 3.5.12
-      '@vue/compiler-sfc': 3.5.12
-      '@vue/runtime-dom': 3.5.12
-      '@vue/server-renderer': 3.5.12(vue@3.5.12(typescript@5.6.3))
-      '@vue/shared': 3.5.12
-    optionalDependencies:
-      typescript: 4.9.5
-
-  walker@1.0.8:
-    dependencies:
-      makeerror: 1.0.12
-
-  web-streams-polyfill@3.3.3: {}
-
-  which-boxed-primitive@1.0.2:
-    dependencies:
-      is-bigint: 1.0.4
-      is-boolean-object: 1.1.2
-      is-number-object: 1.0.7
-      is-string: 1.0.7
-      is-symbol: 1.0.4
-
-  which-builtin-type@1.1.4:
-    dependencies:
-      function.prototype.name: 1.1.6
-      has-tostringtag: 1.0.2
-      is-async-function: 2.0.0
-      is-date-object: 1.0.5
-      is-finalizationregistry: 1.0.2
-      is-generator-function: 1.0.10
-      is-regex: 1.1.4
-      is-weakref: 1.0.2
-      isarray: 2.0.5
-      which-boxed-primitive: 1.0.2
-      which-collection: 1.0.2
-      which-typed-array: 1.1.15
-
-  which-collection@1.0.2:
-    dependencies:
-      is-map: 2.0.3
-      is-set: 2.0.3
-      is-weakmap: 2.0.2
-      is-weakset: 2.0.3
-
-  which-typed-array@1.1.15:
-    dependencies:
-      available-typed-arrays: 1.0.7
-      call-bind: 1.0.7
-      for-each: 0.3.3
-      gopd: 1.0.1
-      has-tostringtag: 1.0.2
-
-  which@1.3.1:
-    dependencies:
-      isexe: 2.0.0
-
-  which@2.0.2:
-    dependencies:
-      isexe: 2.0.0
-
-  word-wrap@1.2.5: {}
-
-  wrap-ansi@6.2.0:
-    dependencies:
-      ansi-styles: 4.3.0
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-
-  wrap-ansi@7.0.0:
-    dependencies:
-      ansi-styles: 4.3.0
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-
-  wrap-ansi@8.1.0:
-    dependencies:
-      ansi-styles: 6.2.1
-      string-width: 5.1.2
-      strip-ansi: 7.1.0
-
-  wrappy@1.0.2: {}
-
-  write-file-atomic@3.0.3:
-    dependencies:
-      imurmurhash: 0.1.4
-      is-typedarray: 1.0.0
-      signal-exit: 3.0.7
-      typedarray-to-buffer: 3.1.5
-
-  write-file-atomic@4.0.2:
-    dependencies:
-      imurmurhash: 0.1.4
-      signal-exit: 3.0.7
-
-  write-file-atomic@5.0.1:
-    dependencies:
-      imurmurhash: 0.1.4
-      signal-exit: 4.1.0
-
-  write-json-file@4.3.0:
-    dependencies:
-      detect-indent: 6.1.0
-      graceful-fs: 4.2.11
-      is-plain-obj: 2.1.0
-      make-dir: 3.1.0
-      sort-keys: 4.2.0
-      write-file-atomic: 3.0.3
-
-  y18n@5.0.8: {}
-
-  yallist@3.1.1: {}
-
-  yallist@4.0.0: {}
-
-  yaml@1.10.2: {}
-
-  yaml@2.3.1: {}
-
-  yargs-parser@18.1.3:
-    dependencies:
-      camelcase: 5.3.1
-      decamelize: 1.2.0
-
-  yargs-parser@20.2.9: {}
-
-  yargs-parser@21.1.1: {}
-
-  yargs@17.7.2:
-    dependencies:
-      cliui: 8.0.1
-      escalade: 3.2.0
-      get-caller-file: 2.0.5
-      require-directory: 2.1.1
-      string-width: 4.2.3
-      y18n: 5.0.8
-      yargs-parser: 21.1.1
-
-  yauzl@2.10.0:
-    dependencies:
-      buffer-crc32: 0.2.13
-      fd-slicer: 1.1.0
-
-  yn@3.1.1: {}
-
-  yocto-queue@0.1.0: {}
-
-  yup@0.32.11:
-    dependencies:
-      '@babel/runtime': 7.26.0
-      '@types/lodash': 4.17.12
-      lodash: 4.17.21
-      lodash-es: 4.17.21
-      nanoclone: 0.2.1
-      property-expr: 2.0.6
-      toposort: 2.0.2
-
-  zustand@4.5.5(@types/react@18.3.12)(immer@9.0.21)(react@18.3.1):
-    dependencies:
-      use-sync-external-store: 1.2.2(react@18.3.1)
-    optionalDependencies:
-      '@types/react': 18.3.12
-      immer: 9.0.21
-      react: 18.3.1

From 1384a734a604cedc3b16fd27c1b871744b9c844f Mon Sep 17 00:00:00 2001
From: Rafael Schranz <106320220+rafaelschranz@users.noreply.github.com>
Date: Sat, 26 Oct 2024 15:30:43 +0200
Subject: [PATCH 386/438] edited de-CH

---
 src/lang/de-CH.json | 278 ++++++++++++++++++++++----------------------
 1 file changed, 139 insertions(+), 139 deletions(-)

diff --git a/src/lang/de-CH.json b/src/lang/de-CH.json
index aa57f90c9c..e99ecaca28 100644
--- a/src/lang/de-CH.json
+++ b/src/lang/de-CH.json
@@ -2,278 +2,278 @@
   "label.access-code": "Zuegangscode",
   "label.actions": "Aktione",
   "label.activity": "Aktivitätsverlauf",
-  "label.add": "Add",
-  "label.add-description": "Add description",
-  "label.add-member": "Add member",
-  "label.add-step": "Add step",
+  "label.add": "hinzuefüege",
+  "label.add-description": "Beschriibig hinzuefüege",
+  "label.add-member": "Mitglied hinzuefüege",
+  "label.add-step": "Schritt hinzuefüege",
   "label.add-website": "Websiite hinzuefüege",
   "label.admin": "Administrator",
-  "label.after": "After",
+  "label.after": "Nach",
   "label.all": "Alli",
-  "label.all-time": "Gesamte Zitruum",
+  "label.all-time": "Gsamte Zitruum",
   "label.analytics": "Analytics",
-  "label.average": "Average",
+  "label.average": "Durchschnitt",
   "label.back": "Zrugg",
-  "label.before": "Before",
+  "label.before": "Vor",
   "label.bounce-rate": "Absprungsrate",
-  "label.breakdown": "Breakdown",
+  "label.breakdown": "Uufschlüsselig",
   "label.browser": "Browser",
   "label.browsers": "Browser",
   "label.cancel": "Abbreche",
   "label.change-password": "Passwort ändere",
   "label.cities": "Städt",
-  "label.city": "City",
+  "label.city": "Stadt",
   "label.clear-all": "Alles lösche",
-  "label.compare": "Compare",
+  "label.compare": "Vergliiche",
   "label.confirm": "Bestätige",
   "label.confirm-password": "Passwort widerhole",
-  "label.contains": "Contains",
+  "label.contains": "Enthaltet",
   "label.continue": "Wiiter",
-  "label.count": "Count",
+  "label.count": "Azahl",
   "label.countries": "Länder",
-  "label.country": "Country",
-  "label.create": "Create",
-  "label.create-report": "Create report",
+  "label.country": "Land",
+  "label.create": "Erstelle",
+  "label.create-report": "Bricht erstelle",
   "label.create-team": "Team erstelle",
   "label.create-user": "Benutzer erstelle",
   "label.created": "Erstellt",
   "label.created-by": "Created By",
-  "label.current": "Current",
-  "label.current-password": "Jetzigs Passwort",
+  "label.current": "Aktuell",
+  "label.current-password": "Aktuells Passwort",
   "label.custom-range": "Benutzerdefinierte Bereich",
   "label.dashboard": "Übersicht",
   "label.data": "Datä",
-  "label.date": "Date",
+  "label.date": "Datum",
   "label.date-range": "Datumsbereich",
-  "label.day": "Day",
-  "label.default-date-range": "Vorigstellte Datumsbereich",
+  "label.day": "Tag",
+  "label.default-date-range": "Voriigstellte Datumsbereich",
   "label.delete": "Lösche",
-  "label.delete-report": "Delete report",
+  "label.delete-report": "Bricht lösche",
   "label.delete-team": "Team lösche",
   "label.delete-user": "Benutzer lösche",
   "label.delete-website": "Websiite lösche",
-  "label.description": "Description",
+  "label.description": "Beschriibig",
   "label.desktop": "Desktop",
   "label.details": "Details",
-  "label.device": "Device",
+  "label.device": "Grät",
   "label.devices": "Grät",
-  "label.dismiss": "Verwerfe",
-  "label.does-not-contain": "Does not contain",
+  "label.dismiss": "Verwärfe",
+  "label.does-not-contain": "Enthaltet nid",
   "label.domain": "Domain",
-  "label.dropoff": "Dropoff",
+  "label.dropoff": "Absprung",
   "label.edit": "Bearbeite",
   "label.edit-dashboard": "Dashboard bearbeite",
-  "label.edit-member": "Edit member",
+  "label.edit-member": "Mitglied bearbeite",
   "label.enable-share-url": "Freigab-URL aktiviere",
-  "label.end-step": "End Step",
-  "label.entry": "Entry URL",
-  "label.event": "Event",
-  "label.event-data": "Event data",
+  "label.end-step": "Schlussschritt",
+  "label.entry": "Iigangs URL",
+  "label.event": "Ereigniss",
+  "label.event-data": "Ereigniss Date",
   "label.events": "Ereigniss",
-  "label.exit": "Exit URL",
-  "label.false": "False",
-  "label.field": "Field",
-  "label.fields": "Fields",
+  "label.exit": "Uusgangs URL",
+  "label.false": "Falsch",
+  "label.field": "Fäld",
+  "label.fields": "Fälder",
   "label.filter": "Filter",
   "label.filter-combined": "Kombiniert",
   "label.filter-raw": "Rohdate",
   "label.filters": "Filters",
-  "label.first-seen": "First seen",
-  "label.funnel": "Funnel",
-  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
-  "label.goal": "Goal",
-  "label.goals": "Goals",
-  "label.goals-description": "Track your goals for pageviews and events.",
-  "label.greater-than": "Greater than",
-  "label.greater-than-equals": "Greater than or equals",
+  "label.first-seen": "Erstmal gse",
+  "label.funnel": "Tunnel",
+  "label.funnel-description": "Verstönd Sie d Konversions- und Abspruungsrate vo Nutzer.",
+  "label.goal": "Ziel",
+  "label.goals": "Ziele",
+  "label.goals-description": "verfolged Sie Ihri Ziel für Siitenufrüef und Ereigniss.",
+  "label.greater-than": "Grösser als",
+  "label.greater-than-equals": "Grösser oder gliich",
   "label.host": "Host",
   "label.hosts": "Hosts",
-  "label.insights": "Insights",
-  "label.insights-description": "Dive deeper into your data by using segments and filters.",
-  "label.is": "Is",
-  "label.is-not": "Is not",
-  "label.is-not-set": "Is not set",
-  "label.is-set": "Is set",
+  "label.insights": "Iiblick",
+  "label.insights-description": "Vertüfed Sie sich i Ihri Date, mit Hilf vo Segment und Filter.",
+  "label.is": "Isch",
+  "label.is-not": "Isch nid",
+  "label.is-not-set": "Isch ned gsetzt",
+  "label.is-set": "Isch gsetzt",
   "label.join": "Biträte",
   "label.join-team": "Team biträte",
-  "label.journey": "Journey",
-  "label.journey-description": "Understand how users navigate through your website.",
+  "label.journey": "Reis",
+  "label.journey-description": "Verstönd Sie, wie Nutzer dur Ihri Website navigiered.",
   "label.language": "Sprach",
   "label.languages": "Sprache",
   "label.laptop": "Laptop",
   "label.last-days": "Letzti {x} Täg",
   "label.last-hours": "Letzti {x} Stunde",
-  "label.last-months": "Last {x} months",
-  "label.last-seen": "Last seen",
+  "label.last-months": "Letzti {x} Mönet",
+  "label.last-seen": "Zletzt gse",
   "label.leave": "Verlah",
   "label.leave-team": "Team verlah",
-  "label.less-than": "Less than",
-  "label.less-than-equals": "Less than or equals",
-  "label.login": "Aamelde",
-  "label.logout": "Abmelde",
-  "label.manage": "Manage",
+  "label.less-than": "Kliiner als",
+  "label.less-than-equals": "Kliiner oder gliich",
+  "label.login": "Aamälde",
+  "label.logout": "Abmälde",
+  "label.manage": "Verwalte",
   "label.manager": "Manager",
   "label.max": "Max",
-  "label.member": "Member",
+  "label.member": "Mitglied",
   "label.members": "Mitglieder",
   "label.min": "Min",
-  "label.mobile": "Handy",
+  "label.mobile": "Händy",
   "label.more": "Meh",
-  "label.my-account": "My account",
-  "label.my-websites": "My websites",
+  "label.my-account": "Min Account",
+  "label.my-websites": "Mini Websiite",
   "label.name": "Name",
   "label.new-password": "Neus Passwort",
   "label.none": "Keis",
   "label.number-of-records": "{x} {x, plural, one {record} other {records}}",
   "label.ok": "OK",
   "label.os": "OS",
-  "label.overview": "Overview",
+  "label.overview": "Übersicht",
   "label.owner": "Bsitzer",
-  "label.page-of": "Page {current} of {total}",
+  "label.page-of": "Siite {current} vo {total}",
   "label.page-views": "Siitenufrüef",
-  "label.pageTitle": "Page title",
+  "label.pageTitle": "Siitetitel",
   "label.pages": "Siite",
   "label.password": "Passwort",
-  "label.path": "Path",
-  "label.paths": "Paths",
-  "label.powered-by": "Betribe dur {name}",
-  "label.previous": "Previous",
-  "label.previous-period": "Previous period",
-  "label.previous-year": "Previous year",
+  "label.path": "Pfad",
+  "label.paths": "Pfade",
+  "label.powered-by": "Betriibe dur {name}",
+  "label.previous": "Vorherig",
+  "label.previous-period": "Vorherigi Periode",
+  "label.previous-year": "Vorherigs Jahr",
   "label.profile": "Profil",
   "label.properties": "Properties",
   "label.property": "Property",
   "label.queries": "Abfrage",
-  "label.query": "Query",
+  "label.query": "Abfrag",
   "label.query-parameters": "Abfragparameter",
   "label.realtime": "Echtzit",
-  "label.referrer": "Referrer",
-  "label.referrers": "Referrer",
+  "label.referrer": "Verwiiser",
+  "label.referrers": "Verwiisendi",
   "label.refresh": "Aktualisiere",
   "label.regenerate": "Erneuere",
   "label.region": "Region",
   "label.regions": "Regionä",
   "label.remove": "Entferne",
-  "label.remove-member": "Remove member",
-  "label.reports": "Reports",
+  "label.remove-member": "Mitglied entferne",
+  "label.reports": "Brichte",
   "label.required": "Erforderlich",
   "label.reset": "Zruggsetze",
   "label.reset-website": "Statistik zruggsetze",
   "label.retention": "Retention",
-  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
-  "label.revenue": "Revenue",
-  "label.revenue-description": "Look into your revenue across time.",
-  "label.revenue-property": "Revenue Property",
+  "label.retention-description": "Mässed Sie d Verwiilduur vo Ihrere Website, indem Sie verfolged wie oft ihri Nutzer zruggkehred.",
+  "label.revenue": "Umsatz",
+  "label.revenue-description": "Lueged Sie sich Ihre Umsatz im Lauf vor Ziit a.",
+  "label.revenue-property": "Umsatzeigenschafte",
   "label.role": "Rollä",
-  "label.run-query": "Run query",
+  "label.run-query": "Abfrag starte",
   "label.save": "Speichere",
   "label.screens": "Bildschirmuflösige",
-  "label.search": "Search",
-  "label.select": "Select",
-  "label.select-date": "Select date",
-  "label.select-role": "Select role",
+  "label.search": "Sueche",
+  "label.select": "Auswähle",
+  "label.select-date": "Datä uuswähle",
+  "label.select-role": "Rollä uuswähle",
   "label.select-website": "Websiite uuswähle",
-  "label.session": "Session",
-  "label.sessions": "Sessions",
+  "label.session": "Sitzig",
+  "label.sessions": "Sitzige",
   "label.settings": "Istellige",
   "label.share-url": "Freigab-URL",
   "label.single-day": "Ein Tag",
-  "label.start-step": "Start Step",
-  "label.steps": "Steps",
-  "label.sum": "Sum",
+  "label.start-step": "Startschritt",
+  "label.steps": "Schritt",
+  "label.sum": "Summe",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-id": "Team ID",
-  "label.team-manager": "Team manager",
+  "label.team-manager": "Team Manager",
   "label.team-member": "Team Mitglied",
-  "label.team-name": "Team name",
+  "label.team-name": "Team Name",
   "label.team-owner": "Team Bsitzer",
-  "label.team-view-only": "Team view only",
-  "label.team-websites": "Team websites",
+  "label.team-view-only": "Nur für Teammitglieder sichtbar",
+  "label.team-websites": "Team Websiite",
   "label.teams": "Teams",
   "label.theme": "Thema",
-  "label.this-month": "De Monet",
-  "label.this-week": "Die Wuche",
-  "label.this-year": "Das Jahr",
+  "label.this-month": "Dä Monet",
+  "label.this-week": "Diä Wuuche",
+  "label.this-year": "Das Johr",
   "label.timezone": "Ziitzone",
   "label.title": "Titel",
   "label.today": "Hüt",
-  "label.toggle-charts": "Schaubilder umschalte",
+  "label.toggle-charts": "Charts umschalte",
   "label.total": "Total",
-  "label.total-records": "Total records",
+  "label.total-records": "Gsamti Datesätz",
   "label.tracking-code": "Tracking Code",
-  "label.transactions": "Transactions",
-  "label.transfer": "Transfer",
-  "label.transfer-website": "Transfer website",
-  "label.true": "True",
-  "label.type": "Type",
-  "label.unique": "Unique",
-  "label.unique-visitors": "Eidütigi Bsuecher",
-  "label.uniqueCustomers": "Unique Customers",
+  "label.transactions": "Transaktione",
+  "label.transfer": "Transferiere",
+  "label.transfer-website": "Websiite transferiere",
+  "label.true": "Wahr",
+  "label.type": "Typ",
+  "label.unique": "Einzigartigi",
+  "label.unique-visitors": "Einzigartigi Bsuecher",
+  "label.uniqueCustomers": "Einzigartigi Kunde",
   "label.unknown": "Unbekannt",
-  "label.untitled": "Untitled",
+  "label.untitled": "Unbennant",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Benutzer",
-  "label.user-property": "User Property",
+  "label.user-property": "Benutzereigeschafte",
   "label.username": "Benutzername",
   "label.users": "Benutzer",
   "label.utm": "UTM",
-  "label.utm-description": "Track your campaigns through UTM parameters.",
-  "label.value": "Value",
+  "label.utm-description": "Tracked Sie Ihri Kampagnen mit UTM Parameters.",
+  "label.value": "Wärt",
   "label.view": "Azeige",
   "label.view-details": "Details azeige",
-  "label.view-only": "View only",
+  "label.view-only": "Nume aluege",
   "label.views": "Ufrüef",
-  "label.views-per-visit": "Views per visit",
+  "label.views-per-visit": "Ufrüef pro Bsuech",
   "label.visit-duration": "Durchschn. Bsuechsziit",
   "label.visitors": "Bsuecher",
-  "label.visits": "Visits",
+  "label.visits": "Bsüech",
   "label.website": "Website",
   "label.website-id": "Websiite ID",
   "label.websites": "Websiite",
-  "label.window": "Window",
+  "label.window": "Fenster",
   "label.yesterday": "Gester",
-  "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
+  "message.action-confirmation": "Typed Sie {confirmation} is Feld underhalb um z bestätige.",
   "message.active-users": "{x} {x, plural, one {aktive Bsuecher} other {aktivi Bsuecher}}",
-  "message.collected-data": "Collected data",
+  "message.collected-data": "Gsammleti Date",
   "message.confirm-delete": "Sind Sie sich sicher, {target} zlösche?",
   "message.confirm-leave": "Sind Sie sich sicher, {target} zverlah?",
-  "message.confirm-remove": "Are you sure you want to remove {target}?",
-  "message.confirm-reset": "Sind Sie sicher, dass Sie dStatistike vo {target} zruggsetze wend?",
-  "message.delete-team-warning": "Deleting a team will also delete all team websites.",
-  "message.delete-website-warning": "Alli dezueghörige Date werdet ebefalls glöscht.",
-  "message.error": "Es isch en Fehler uftrete.",
+  "message.confirm-remove": "Sind Sie sich sicher, dass Sie {target} wänd entferne?",
+  "message.confirm-reset": "Sind Sie sicher, dass Sie d Statistike vo {target} zruggsetze wänd?",
+  "message.delete-team-warning": "Es Team lösche dued ebefalls alli team Websiite lösche.",
+  "message.delete-website-warning": "Alli dezueghörige Date werded ebefalls glöscht.",
+  "message.error": "Es isch en Fehler ufträte.",
   "message.event-log": "{event} uf {url}",
   "message.go-to-settings": "Zu de Istellige",
-  "message.incorrect-username-password": "Falschs Passwort oder Benutzername.",
+  "message.incorrect-username-password": "Falsches Passwort oder Benutzername.",
   "message.invalid-domain": "Ungültigi Domain",
   "message.min-password-length": "Miminamli längi vo {n} Zeiche",
-  "message.new-version-available": "A new version of Umami {version} is available!",
+  "message.new-version-available": "Es isch en neue Version vo Umami {version} verfügbar!",
   "message.no-data-available": "Kei Date vorhande.",
-  "message.no-event-data": "No event data is available.",
+  "message.no-event-data": "Es sind kei Event Date verfügbar.",
   "message.no-match-password": "Passwörter stimmed ned überi",
-  "message.no-results-found": "No results were found.",
+  "message.no-results-found": "Kei Ergäbnis gfunde.",
   "message.no-team-websites": "Dem Team sind kei Websiite zuegordnet.",
   "message.no-teams": "Bisher sind no kei Teams erstellt worde.",
   "message.no-users": "Da gits kei Benutzer",
   "message.no-websites-configured": "Es isch kei Websiite vorhande.",
   "message.page-not-found": "Siite ned gfunde.",
-  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
+  "message.reset-website": "Um die Websiite zruggzsetze, typed Sie {confirmation} is Feld unde dran.",
   "message.reset-website-warning": "Alli Date für die Websiite werdet glöscht, nur de Tracking Code blibt bestah.",
   "message.saved": "Erfolgrich gspeichert.",
   "message.share-url": "Ihri Websiitestatistik isch under de folgende URL öffentlich zuegänglich:",
-  "message.team-already-member": "Sie sind bereits es Mitglied vo dem Team.",
+  "message.team-already-member": "Sie sind bereits es Mitglied vo däm Team.",
   "message.team-not-found": "Team nöd gfunde.",
-  "message.team-websites-info": "Websiite chönd vo jedem im Team agluegt werde",
+  "message.team-websites-info": "Websiite chöi vo jedem im Team agluegt werde",
   "message.tracking-code": "Tracking Code",
-  "message.transfer-team-website-to-user": "Transfer this website to your account?",
-  "message.transfer-user-website-to-team": "Select the team to transfer this website to.",
-  "message.transfer-website": "Transfer website ownership to your account or another team.",
-  "message.triggered-event": "Triggered event",
-  "message.user-deleted": "Benutzer glöscht.",
-  "message.viewed-page": "Viewed page",
-  "message.visitor-log": "Bsuecher us {country} benutzt {browser} uf {os} {device}",
-  "message.visitors-dropped-off": "Visitors dropped off"
-}
+  "message.transfer-team-website-to-user": "Websiite uf zu Ihrem Account transferiere?",
+  "message.transfer-user-website-to-team": "Wähled Sie s Team zum däm Websiite transferiert werde söll.",
+  "message.transfer-website": "Übertraged Sie d Websiite Eigetümerrecht uf Ihre Account oder uf es anders Team",
+  "message.triggered-event": "Usglösts Ereigniss",
+  "message.user-deleted": "Bnutzer glöscht.",
+  "message.viewed-page": "Siite agluegt",
+  "message.visitor-log": "Bsuecher us {country} nutzt {browser} uf {os} {device}",
+  "message.visitors-dropped-off": "Bsuercher verlore"
+}
\ No newline at end of file

From 586d223bdd220b4329cfbcca71a9e968060caf9a Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Sat, 26 Oct 2024 11:36:43 -0700
Subject: [PATCH 387/438] Updated lang files.

---
 public/intl/messages/cs-CZ.json | 134 +++++++--------
 public/intl/messages/de-CH.json | 290 ++++++++++++++++----------------
 public/intl/messages/de-DE.json |   6 +-
 public/intl/messages/ru-RU.json | 268 ++++++++++++++---------------
 src/lang/ru-RU.json             |   2 +-
 5 files changed, 350 insertions(+), 350 deletions(-)

diff --git a/public/intl/messages/cs-CZ.json b/public/intl/messages/cs-CZ.json
index 26ae71415c..aa08174e13 100644
--- a/public/intl/messages/cs-CZ.json
+++ b/public/intl/messages/cs-CZ.json
@@ -2,7 +2,7 @@
   "label.access-code": [
     {
       "type": 0,
-      "value": "Access code"
+      "value": "Přístupový kód"
     }
   ],
   "label.actions": [
@@ -14,31 +14,31 @@
   "label.activity": [
     {
       "type": 0,
-      "value": "Activity log"
+      "value": "Log aktivity"
     }
   ],
   "label.add": [
     {
       "type": 0,
-      "value": "Add"
+      "value": "Přidat"
     }
   ],
   "label.add-description": [
     {
       "type": 0,
-      "value": "Add description"
+      "value": "Přidat popis"
     }
   ],
   "label.add-member": [
     {
       "type": 0,
-      "value": "Add member"
+      "value": "Přidat člena"
     }
   ],
   "label.add-step": [
     {
       "type": 0,
-      "value": "Add step"
+      "value": "Přidat krok"
     }
   ],
   "label.add-website": [
@@ -56,7 +56,7 @@
   "label.after": [
     {
       "type": 0,
-      "value": "After"
+      "value": "Po"
     }
   ],
   "label.all": [
@@ -68,7 +68,7 @@
   "label.all-time": [
     {
       "type": 0,
-      "value": "All time"
+      "value": "Celá doba"
     }
   ],
   "label.analytics": [
@@ -80,7 +80,7 @@
   "label.average": [
     {
       "type": 0,
-      "value": "Average"
+      "value": "Průměr"
     }
   ],
   "label.back": [
@@ -92,7 +92,7 @@
   "label.before": [
     {
       "type": 0,
-      "value": "Before"
+      "value": "Před"
     }
   ],
   "label.bounce-rate": [
@@ -110,13 +110,13 @@
   "label.browser": [
     {
       "type": 0,
-      "value": "Browser"
+      "value": "Prohlížeč"
     }
   ],
   "label.browsers": [
     {
       "type": 0,
-      "value": "Prohlížeč"
+      "value": "Prohlížeče"
     }
   ],
   "label.cancel": [
@@ -134,31 +134,31 @@
   "label.cities": [
     {
       "type": 0,
-      "value": "Cities"
+      "value": "Města"
     }
   ],
   "label.city": [
     {
       "type": 0,
-      "value": "City"
+      "value": "Město"
     }
   ],
   "label.clear-all": [
     {
       "type": 0,
-      "value": "Clear all"
+      "value": "Vyčistit vše"
     }
   ],
   "label.compare": [
     {
       "type": 0,
-      "value": "Compare"
+      "value": "Porovnat"
     }
   ],
   "label.confirm": [
     {
       "type": 0,
-      "value": "Confirm"
+      "value": "Potvrdit"
     }
   ],
   "label.confirm-password": [
@@ -170,61 +170,61 @@
   "label.contains": [
     {
       "type": 0,
-      "value": "Contains"
+      "value": "Obsahuje"
     }
   ],
   "label.continue": [
     {
       "type": 0,
-      "value": "Continue"
+      "value": "Pokračovat"
     }
   ],
   "label.count": [
     {
       "type": 0,
-      "value": "Count"
+      "value": "Počet"
     }
   ],
   "label.countries": [
     {
       "type": 0,
-      "value": "Země"
+      "value": "Státy"
     }
   ],
   "label.country": [
     {
       "type": 0,
-      "value": "Country"
+      "value": "Stát"
     }
   ],
   "label.create": [
     {
       "type": 0,
-      "value": "Create"
+      "value": "Vytvořit"
     }
   ],
   "label.create-report": [
     {
       "type": 0,
-      "value": "Create report"
+      "value": "Vytvořit hlášení"
     }
   ],
   "label.create-team": [
     {
       "type": 0,
-      "value": "Create team"
+      "value": "Vytvořit tým"
     }
   ],
   "label.create-user": [
     {
       "type": 0,
-      "value": "Create user"
+      "value": "Vytvořit uživatele"
     }
   ],
   "label.created": [
     {
       "type": 0,
-      "value": "Created"
+      "value": "Vytvořeno"
     }
   ],
   "label.created-by": [
@@ -236,7 +236,7 @@
   "label.current": [
     {
       "type": 0,
-      "value": "Current"
+      "value": "Aktuální"
     }
   ],
   "label.current-password": [
@@ -266,7 +266,7 @@
   "label.date": [
     {
       "type": 0,
-      "value": "Date"
+      "value": "Datum"
     }
   ],
   "label.date-range": [
@@ -278,7 +278,7 @@
   "label.day": [
     {
       "type": 0,
-      "value": "Day"
+      "value": "Den"
     }
   ],
   "label.default-date-range": [
@@ -296,19 +296,19 @@
   "label.delete-report": [
     {
       "type": 0,
-      "value": "Delete report"
+      "value": "Smazat hlášení"
     }
   ],
   "label.delete-team": [
     {
       "type": 0,
-      "value": "Delete team"
+      "value": "Smazat tým"
     }
   ],
   "label.delete-user": [
     {
       "type": 0,
-      "value": "Delete user"
+      "value": "Smazat uživatele"
     }
   ],
   "label.delete-website": [
@@ -320,7 +320,7 @@
   "label.description": [
     {
       "type": 0,
-      "value": "Description"
+      "value": "Popis"
     }
   ],
   "label.desktop": [
@@ -332,13 +332,13 @@
   "label.details": [
     {
       "type": 0,
-      "value": "Details"
+      "value": "Detaily"
     }
   ],
   "label.device": [
     {
       "type": 0,
-      "value": "Device"
+      "value": "Zařízení"
     }
   ],
   "label.devices": [
@@ -356,7 +356,7 @@
   "label.does-not-contain": [
     {
       "type": 0,
-      "value": "Does not contain"
+      "value": "Neobsahuje"
     }
   ],
   "label.domain": [
@@ -380,13 +380,13 @@
   "label.edit-dashboard": [
     {
       "type": 0,
-      "value": "Edit dashboard"
+      "value": "Upravit dashboard"
     }
   ],
   "label.edit-member": [
     {
       "type": 0,
-      "value": "Edit member"
+      "value": "Upravit člena"
     }
   ],
   "label.enable-share-url": [
@@ -404,13 +404,13 @@
   "label.entry": [
     {
       "type": 0,
-      "value": "Entry URL"
+      "value": "Vstupní URL"
     }
   ],
   "label.event": [
     {
       "type": 0,
-      "value": "Event"
+      "value": "Událost"
     }
   ],
   "label.event-data": [
@@ -440,7 +440,7 @@
   "label.field": [
     {
       "type": 0,
-      "value": "Field"
+      "value": "Pole"
     }
   ],
   "label.fields": [
@@ -452,7 +452,7 @@
   "label.filter": [
     {
       "type": 0,
-      "value": "Filter"
+      "value": "Filtr"
     }
   ],
   "label.filter-combined": [
@@ -470,7 +470,7 @@
   "label.filters": [
     {
       "type": 0,
-      "value": "Filters"
+      "value": "Filtry"
     }
   ],
   "label.first-seen": [
@@ -494,13 +494,13 @@
   "label.goal": [
     {
       "type": 0,
-      "value": "Goal"
+      "value": "Cíl"
     }
   ],
   "label.goals": [
     {
       "type": 0,
-      "value": "Goals"
+      "value": "Cíle"
     }
   ],
   "label.goals-description": [
@@ -596,13 +596,13 @@
   "label.language": [
     {
       "type": 0,
-      "value": "Language"
+      "value": "Jazyk"
     }
   ],
   "label.languages": [
     {
       "type": 0,
-      "value": "Languages"
+      "value": "Jazyky"
     }
   ],
   "label.laptop": [
@@ -642,7 +642,7 @@
   "label.last-months": [
     {
       "type": 0,
-      "value": "Last "
+      "value": "Posledních "
     },
     {
       "type": 1,
@@ -650,7 +650,7 @@
     },
     {
       "type": 0,
-      "value": " months"
+      "value": " měsíců"
     }
   ],
   "label.last-seen": [
@@ -662,13 +662,13 @@
   "label.leave": [
     {
       "type": 0,
-      "value": "Leave"
+      "value": "Opustit"
     }
   ],
   "label.leave-team": [
     {
       "type": 0,
-      "value": "Leave team"
+      "value": "Opustit tým"
     }
   ],
   "label.less-than": [
@@ -698,13 +698,13 @@
   "label.manage": [
     {
       "type": 0,
-      "value": "Manage"
+      "value": "Spravovat"
     }
   ],
   "label.manager": [
     {
       "type": 0,
-      "value": "Manager"
+      "value": "Správce"
     }
   ],
   "label.max": [
@@ -716,13 +716,13 @@
   "label.member": [
     {
       "type": 0,
-      "value": "Member"
+      "value": "Člen"
     }
   ],
   "label.members": [
     {
       "type": 0,
-      "value": "Members"
+      "value": "Členové"
     }
   ],
   "label.min": [
@@ -746,13 +746,13 @@
   "label.my-account": [
     {
       "type": 0,
-      "value": "My account"
+      "value": "Můj účet"
     }
   ],
   "label.my-websites": [
     {
       "type": 0,
-      "value": "My websites"
+      "value": "Mé weby"
     }
   ],
   "label.name": [
@@ -822,13 +822,13 @@
   "label.overview": [
     {
       "type": 0,
-      "value": "Overview"
+      "value": "Přehled"
     }
   ],
   "label.owner": [
     {
       "type": 0,
-      "value": "Owner"
+      "value": "Vlastník"
     }
   ],
   "label.page-of": [
@@ -858,7 +858,7 @@
   "label.pageTitle": [
     {
       "type": 0,
-      "value": "Page title"
+      "value": "Název stránky"
     }
   ],
   "label.pages": [
@@ -876,13 +876,13 @@
   "label.path": [
     {
       "type": 0,
-      "value": "Path"
+      "value": "Cesta"
     }
   ],
   "label.paths": [
     {
       "type": 0,
-      "value": "Paths"
+      "value": "Cesty"
     }
   ],
   "label.powered-by": [
@@ -1444,13 +1444,13 @@
   "label.visitors": [
     {
       "type": 0,
-      "value": "Návštěvy"
+      "value": "Návštěvníci"
     }
   ],
   "label.visits": [
     {
       "type": 0,
-      "value": "Visits"
+      "value": "Návštěvy"
     }
   ],
   "label.website": [
@@ -1474,13 +1474,13 @@
   "label.window": [
     {
       "type": 0,
-      "value": "Window"
+      "value": "Okno"
     }
   ],
   "label.yesterday": [
     {
       "type": 0,
-      "value": "Yesterday"
+      "value": "Včera"
     }
   ],
   "message.action-confirmation": [
diff --git a/public/intl/messages/de-CH.json b/public/intl/messages/de-CH.json
index 7b46c539b0..37f1b9de6e 100644
--- a/public/intl/messages/de-CH.json
+++ b/public/intl/messages/de-CH.json
@@ -20,25 +20,25 @@
   "label.add": [
     {
       "type": 0,
-      "value": "Add"
+      "value": "hinzuefüege"
     }
   ],
   "label.add-description": [
     {
       "type": 0,
-      "value": "Add description"
+      "value": "Beschriibig hinzuefüege"
     }
   ],
   "label.add-member": [
     {
       "type": 0,
-      "value": "Add member"
+      "value": "Mitglied hinzuefüege"
     }
   ],
   "label.add-step": [
     {
       "type": 0,
-      "value": "Add step"
+      "value": "Schritt hinzuefüege"
     }
   ],
   "label.add-website": [
@@ -56,7 +56,7 @@
   "label.after": [
     {
       "type": 0,
-      "value": "After"
+      "value": "Nach"
     }
   ],
   "label.all": [
@@ -68,7 +68,7 @@
   "label.all-time": [
     {
       "type": 0,
-      "value": "Gesamte Zitruum"
+      "value": "Gsamte Zitruum"
     }
   ],
   "label.analytics": [
@@ -80,7 +80,7 @@
   "label.average": [
     {
       "type": 0,
-      "value": "Average"
+      "value": "Durchschnitt"
     }
   ],
   "label.back": [
@@ -92,7 +92,7 @@
   "label.before": [
     {
       "type": 0,
-      "value": "Before"
+      "value": "Vor"
     }
   ],
   "label.bounce-rate": [
@@ -104,7 +104,7 @@
   "label.breakdown": [
     {
       "type": 0,
-      "value": "Breakdown"
+      "value": "Uufschlüsselig"
     }
   ],
   "label.browser": [
@@ -140,7 +140,7 @@
   "label.city": [
     {
       "type": 0,
-      "value": "City"
+      "value": "Stadt"
     }
   ],
   "label.clear-all": [
@@ -152,7 +152,7 @@
   "label.compare": [
     {
       "type": 0,
-      "value": "Compare"
+      "value": "Vergliiche"
     }
   ],
   "label.confirm": [
@@ -170,7 +170,7 @@
   "label.contains": [
     {
       "type": 0,
-      "value": "Contains"
+      "value": "Enthaltet"
     }
   ],
   "label.continue": [
@@ -182,7 +182,7 @@
   "label.count": [
     {
       "type": 0,
-      "value": "Count"
+      "value": "Azahl"
     }
   ],
   "label.countries": [
@@ -194,19 +194,19 @@
   "label.country": [
     {
       "type": 0,
-      "value": "Country"
+      "value": "Land"
     }
   ],
   "label.create": [
     {
       "type": 0,
-      "value": "Create"
+      "value": "Erstelle"
     }
   ],
   "label.create-report": [
     {
       "type": 0,
-      "value": "Create report"
+      "value": "Bricht erstelle"
     }
   ],
   "label.create-team": [
@@ -236,13 +236,13 @@
   "label.current": [
     {
       "type": 0,
-      "value": "Current"
+      "value": "Aktuell"
     }
   ],
   "label.current-password": [
     {
       "type": 0,
-      "value": "Jetzigs Passwort"
+      "value": "Aktuells Passwort"
     }
   ],
   "label.custom-range": [
@@ -266,7 +266,7 @@
   "label.date": [
     {
       "type": 0,
-      "value": "Date"
+      "value": "Datum"
     }
   ],
   "label.date-range": [
@@ -278,13 +278,13 @@
   "label.day": [
     {
       "type": 0,
-      "value": "Day"
+      "value": "Tag"
     }
   ],
   "label.default-date-range": [
     {
       "type": 0,
-      "value": "Vorigstellte Datumsbereich"
+      "value": "Voriigstellte Datumsbereich"
     }
   ],
   "label.delete": [
@@ -296,7 +296,7 @@
   "label.delete-report": [
     {
       "type": 0,
-      "value": "Delete report"
+      "value": "Bricht lösche"
     }
   ],
   "label.delete-team": [
@@ -320,7 +320,7 @@
   "label.description": [
     {
       "type": 0,
-      "value": "Description"
+      "value": "Beschriibig"
     }
   ],
   "label.desktop": [
@@ -338,7 +338,7 @@
   "label.device": [
     {
       "type": 0,
-      "value": "Device"
+      "value": "Grät"
     }
   ],
   "label.devices": [
@@ -350,13 +350,13 @@
   "label.dismiss": [
     {
       "type": 0,
-      "value": "Verwerfe"
+      "value": "Verwärfe"
     }
   ],
   "label.does-not-contain": [
     {
       "type": 0,
-      "value": "Does not contain"
+      "value": "Enthaltet nid"
     }
   ],
   "label.domain": [
@@ -368,7 +368,7 @@
   "label.dropoff": [
     {
       "type": 0,
-      "value": "Dropoff"
+      "value": "Absprung"
     }
   ],
   "label.edit": [
@@ -386,7 +386,7 @@
   "label.edit-member": [
     {
       "type": 0,
-      "value": "Edit member"
+      "value": "Mitglied bearbeite"
     }
   ],
   "label.enable-share-url": [
@@ -398,25 +398,25 @@
   "label.end-step": [
     {
       "type": 0,
-      "value": "End Step"
+      "value": "Schlussschritt"
     }
   ],
   "label.entry": [
     {
       "type": 0,
-      "value": "Entry URL"
+      "value": "Iigangs URL"
     }
   ],
   "label.event": [
     {
       "type": 0,
-      "value": "Event"
+      "value": "Ereigniss"
     }
   ],
   "label.event-data": [
     {
       "type": 0,
-      "value": "Event data"
+      "value": "Ereigniss Date"
     }
   ],
   "label.events": [
@@ -428,25 +428,25 @@
   "label.exit": [
     {
       "type": 0,
-      "value": "Exit URL"
+      "value": "Uusgangs URL"
     }
   ],
   "label.false": [
     {
       "type": 0,
-      "value": "False"
+      "value": "Falsch"
     }
   ],
   "label.field": [
     {
       "type": 0,
-      "value": "Field"
+      "value": "Fäld"
     }
   ],
   "label.fields": [
     {
       "type": 0,
-      "value": "Fields"
+      "value": "Fälder"
     }
   ],
   "label.filter": [
@@ -476,49 +476,49 @@
   "label.first-seen": [
     {
       "type": 0,
-      "value": "First seen"
+      "value": "Erstmal gse"
     }
   ],
   "label.funnel": [
     {
       "type": 0,
-      "value": "Funnel"
+      "value": "Tunnel"
     }
   ],
   "label.funnel-description": [
     {
       "type": 0,
-      "value": "Understand the conversion and drop-off rate of users."
+      "value": "Verstönd Sie d Konversions- und Abspruungsrate vo Nutzer."
     }
   ],
   "label.goal": [
     {
       "type": 0,
-      "value": "Goal"
+      "value": "Ziel"
     }
   ],
   "label.goals": [
     {
       "type": 0,
-      "value": "Goals"
+      "value": "Ziele"
     }
   ],
   "label.goals-description": [
     {
       "type": 0,
-      "value": "Track your goals for pageviews and events."
+      "value": "verfolged Sie Ihri Ziel für Siitenufrüef und Ereigniss."
     }
   ],
   "label.greater-than": [
     {
       "type": 0,
-      "value": "Greater than"
+      "value": "Grösser als"
     }
   ],
   "label.greater-than-equals": [
     {
       "type": 0,
-      "value": "Greater than or equals"
+      "value": "Grösser oder gliich"
     }
   ],
   "label.host": [
@@ -536,37 +536,37 @@
   "label.insights": [
     {
       "type": 0,
-      "value": "Insights"
+      "value": "Iiblick"
     }
   ],
   "label.insights-description": [
     {
       "type": 0,
-      "value": "Dive deeper into your data by using segments and filters."
+      "value": "Vertüfed Sie sich i Ihri Date, mit Hilf vo Segment und Filter."
     }
   ],
   "label.is": [
     {
       "type": 0,
-      "value": "Is"
+      "value": "Isch"
     }
   ],
   "label.is-not": [
     {
       "type": 0,
-      "value": "Is not"
+      "value": "Isch nid"
     }
   ],
   "label.is-not-set": [
     {
       "type": 0,
-      "value": "Is not set"
+      "value": "Isch ned gsetzt"
     }
   ],
   "label.is-set": [
     {
       "type": 0,
-      "value": "Is set"
+      "value": "Isch gsetzt"
     }
   ],
   "label.join": [
@@ -584,13 +584,13 @@
   "label.journey": [
     {
       "type": 0,
-      "value": "Journey"
+      "value": "Reis"
     }
   ],
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users navigate through your website."
+      "value": "Verstönd Sie, wie Nutzer dur Ihri Website navigiered."
     }
   ],
   "label.language": [
@@ -642,7 +642,7 @@
   "label.last-months": [
     {
       "type": 0,
-      "value": "Last "
+      "value": "Letzti "
     },
     {
       "type": 1,
@@ -650,13 +650,13 @@
     },
     {
       "type": 0,
-      "value": " months"
+      "value": " Mönet"
     }
   ],
   "label.last-seen": [
     {
       "type": 0,
-      "value": "Last seen"
+      "value": "Zletzt gse"
     }
   ],
   "label.leave": [
@@ -674,31 +674,31 @@
   "label.less-than": [
     {
       "type": 0,
-      "value": "Less than"
+      "value": "Kliiner als"
     }
   ],
   "label.less-than-equals": [
     {
       "type": 0,
-      "value": "Less than or equals"
+      "value": "Kliiner oder gliich"
     }
   ],
   "label.login": [
     {
       "type": 0,
-      "value": "Aamelde"
+      "value": "Aamälde"
     }
   ],
   "label.logout": [
     {
       "type": 0,
-      "value": "Abmelde"
+      "value": "Abmälde"
     }
   ],
   "label.manage": [
     {
       "type": 0,
-      "value": "Manage"
+      "value": "Verwalte"
     }
   ],
   "label.manager": [
@@ -716,7 +716,7 @@
   "label.member": [
     {
       "type": 0,
-      "value": "Member"
+      "value": "Mitglied"
     }
   ],
   "label.members": [
@@ -734,7 +734,7 @@
   "label.mobile": [
     {
       "type": 0,
-      "value": "Handy"
+      "value": "Händy"
     }
   ],
   "label.more": [
@@ -746,13 +746,13 @@
   "label.my-account": [
     {
       "type": 0,
-      "value": "My account"
+      "value": "Min Account"
     }
   ],
   "label.my-websites": [
     {
       "type": 0,
-      "value": "My websites"
+      "value": "Mini Websiite"
     }
   ],
   "label.name": [
@@ -822,7 +822,7 @@
   "label.overview": [
     {
       "type": 0,
-      "value": "Overview"
+      "value": "Übersicht"
     }
   ],
   "label.owner": [
@@ -834,7 +834,7 @@
   "label.page-of": [
     {
       "type": 0,
-      "value": "Page "
+      "value": "Siite "
     },
     {
       "type": 1,
@@ -842,7 +842,7 @@
     },
     {
       "type": 0,
-      "value": " of "
+      "value": " vo "
     },
     {
       "type": 1,
@@ -858,7 +858,7 @@
   "label.pageTitle": [
     {
       "type": 0,
-      "value": "Page title"
+      "value": "Siitetitel"
     }
   ],
   "label.pages": [
@@ -876,19 +876,19 @@
   "label.path": [
     {
       "type": 0,
-      "value": "Path"
+      "value": "Pfad"
     }
   ],
   "label.paths": [
     {
       "type": 0,
-      "value": "Paths"
+      "value": "Pfade"
     }
   ],
   "label.powered-by": [
     {
       "type": 0,
-      "value": "Betribe dur "
+      "value": "Betriibe dur "
     },
     {
       "type": 1,
@@ -898,19 +898,19 @@
   "label.previous": [
     {
       "type": 0,
-      "value": "Previous"
+      "value": "Vorherig"
     }
   ],
   "label.previous-period": [
     {
       "type": 0,
-      "value": "Previous period"
+      "value": "Vorherigi Periode"
     }
   ],
   "label.previous-year": [
     {
       "type": 0,
-      "value": "Previous year"
+      "value": "Vorherigs Jahr"
     }
   ],
   "label.profile": [
@@ -940,7 +940,7 @@
   "label.query": [
     {
       "type": 0,
-      "value": "Query"
+      "value": "Abfrag"
     }
   ],
   "label.query-parameters": [
@@ -958,13 +958,13 @@
   "label.referrer": [
     {
       "type": 0,
-      "value": "Referrer"
+      "value": "Verwiiser"
     }
   ],
   "label.referrers": [
     {
       "type": 0,
-      "value": "Referrer"
+      "value": "Verwiisendi"
     }
   ],
   "label.refresh": [
@@ -1000,13 +1000,13 @@
   "label.remove-member": [
     {
       "type": 0,
-      "value": "Remove member"
+      "value": "Mitglied entferne"
     }
   ],
   "label.reports": [
     {
       "type": 0,
-      "value": "Reports"
+      "value": "Brichte"
     }
   ],
   "label.required": [
@@ -1036,25 +1036,25 @@
   "label.retention-description": [
     {
       "type": 0,
-      "value": "Measure your website stickiness by tracking how often users return."
+      "value": "Mässed Sie d Verwiilduur vo Ihrere Website, indem Sie verfolged wie oft ihri Nutzer zruggkehred."
     }
   ],
   "label.revenue": [
     {
       "type": 0,
-      "value": "Revenue"
+      "value": "Umsatz"
     }
   ],
   "label.revenue-description": [
     {
       "type": 0,
-      "value": "Look into your revenue across time."
+      "value": "Lueged Sie sich Ihre Umsatz im Lauf vor Ziit a."
     }
   ],
   "label.revenue-property": [
     {
       "type": 0,
-      "value": "Revenue Property"
+      "value": "Umsatzeigenschafte"
     }
   ],
   "label.role": [
@@ -1066,7 +1066,7 @@
   "label.run-query": [
     {
       "type": 0,
-      "value": "Run query"
+      "value": "Abfrag starte"
     }
   ],
   "label.save": [
@@ -1084,25 +1084,25 @@
   "label.search": [
     {
       "type": 0,
-      "value": "Search"
+      "value": "Sueche"
     }
   ],
   "label.select": [
     {
       "type": 0,
-      "value": "Select"
+      "value": "Auswähle"
     }
   ],
   "label.select-date": [
     {
       "type": 0,
-      "value": "Select date"
+      "value": "Datä uuswähle"
     }
   ],
   "label.select-role": [
     {
       "type": 0,
-      "value": "Select role"
+      "value": "Rollä uuswähle"
     }
   ],
   "label.select-website": [
@@ -1114,13 +1114,13 @@
   "label.session": [
     {
       "type": 0,
-      "value": "Session"
+      "value": "Sitzig"
     }
   ],
   "label.sessions": [
     {
       "type": 0,
-      "value": "Sessions"
+      "value": "Sitzige"
     }
   ],
   "label.settings": [
@@ -1144,19 +1144,19 @@
   "label.start-step": [
     {
       "type": 0,
-      "value": "Start Step"
+      "value": "Startschritt"
     }
   ],
   "label.steps": [
     {
       "type": 0,
-      "value": "Steps"
+      "value": "Schritt"
     }
   ],
   "label.sum": [
     {
       "type": 0,
-      "value": "Sum"
+      "value": "Summe"
     }
   ],
   "label.tablet": [
@@ -1180,7 +1180,7 @@
   "label.team-manager": [
     {
       "type": 0,
-      "value": "Team manager"
+      "value": "Team Manager"
     }
   ],
   "label.team-member": [
@@ -1192,7 +1192,7 @@
   "label.team-name": [
     {
       "type": 0,
-      "value": "Team name"
+      "value": "Team Name"
     }
   ],
   "label.team-owner": [
@@ -1204,13 +1204,13 @@
   "label.team-view-only": [
     {
       "type": 0,
-      "value": "Team view only"
+      "value": "Nur für Teammitglieder sichtbar"
     }
   ],
   "label.team-websites": [
     {
       "type": 0,
-      "value": "Team websites"
+      "value": "Team Websiite"
     }
   ],
   "label.teams": [
@@ -1228,19 +1228,19 @@
   "label.this-month": [
     {
       "type": 0,
-      "value": "De Monet"
+      "value": "Dä Monet"
     }
   ],
   "label.this-week": [
     {
       "type": 0,
-      "value": "Die Wuche"
+      "value": "Diä Wuuche"
     }
   ],
   "label.this-year": [
     {
       "type": 0,
-      "value": "Das Jahr"
+      "value": "Das Johr"
     }
   ],
   "label.timezone": [
@@ -1264,7 +1264,7 @@
   "label.toggle-charts": [
     {
       "type": 0,
-      "value": "Schaubilder umschalte"
+      "value": "Charts umschalte"
     }
   ],
   "label.total": [
@@ -1276,7 +1276,7 @@
   "label.total-records": [
     {
       "type": 0,
-      "value": "Total records"
+      "value": "Gsamti Datesätz"
     }
   ],
   "label.tracking-code": [
@@ -1288,49 +1288,49 @@
   "label.transactions": [
     {
       "type": 0,
-      "value": "Transactions"
+      "value": "Transaktione"
     }
   ],
   "label.transfer": [
     {
       "type": 0,
-      "value": "Transfer"
+      "value": "Transferiere"
     }
   ],
   "label.transfer-website": [
     {
       "type": 0,
-      "value": "Transfer website"
+      "value": "Websiite transferiere"
     }
   ],
   "label.true": [
     {
       "type": 0,
-      "value": "True"
+      "value": "Wahr"
     }
   ],
   "label.type": [
     {
       "type": 0,
-      "value": "Type"
+      "value": "Typ"
     }
   ],
   "label.unique": [
     {
       "type": 0,
-      "value": "Unique"
+      "value": "Einzigartigi"
     }
   ],
   "label.unique-visitors": [
     {
       "type": 0,
-      "value": "Eidütigi Bsuecher"
+      "value": "Einzigartigi Bsuecher"
     }
   ],
   "label.uniqueCustomers": [
     {
       "type": 0,
-      "value": "Unique Customers"
+      "value": "Einzigartigi Kunde"
     }
   ],
   "label.unknown": [
@@ -1342,7 +1342,7 @@
   "label.untitled": [
     {
       "type": 0,
-      "value": "Untitled"
+      "value": "Unbennant"
     }
   ],
   "label.update": [
@@ -1372,7 +1372,7 @@
   "label.user-property": [
     {
       "type": 0,
-      "value": "User Property"
+      "value": "Benutzereigeschafte"
     }
   ],
   "label.username": [
@@ -1396,13 +1396,13 @@
   "label.utm-description": [
     {
       "type": 0,
-      "value": "Track your campaigns through UTM parameters."
+      "value": "Tracked Sie Ihri Kampagnen mit UTM Parameters."
     }
   ],
   "label.value": [
     {
       "type": 0,
-      "value": "Value"
+      "value": "Wärt"
     }
   ],
   "label.view": [
@@ -1420,7 +1420,7 @@
   "label.view-only": [
     {
       "type": 0,
-      "value": "View only"
+      "value": "Nume aluege"
     }
   ],
   "label.views": [
@@ -1432,7 +1432,7 @@
   "label.views-per-visit": [
     {
       "type": 0,
-      "value": "Views per visit"
+      "value": "Ufrüef pro Bsuech"
     }
   ],
   "label.visit-duration": [
@@ -1450,7 +1450,7 @@
   "label.visits": [
     {
       "type": 0,
-      "value": "Visits"
+      "value": "Bsüech"
     }
   ],
   "label.website": [
@@ -1474,7 +1474,7 @@
   "label.window": [
     {
       "type": 0,
-      "value": "Window"
+      "value": "Fenster"
     }
   ],
   "label.yesterday": [
@@ -1486,7 +1486,7 @@
   "message.action-confirmation": [
     {
       "type": 0,
-      "value": "Type "
+      "value": "Typed Sie "
     },
     {
       "type": 1,
@@ -1494,7 +1494,7 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " is Feld underhalb um z bestätige."
     }
   ],
   "message.active-users": [
@@ -1534,7 +1534,7 @@
   "message.collected-data": [
     {
       "type": 0,
-      "value": "Collected data"
+      "value": "Gsammleti Date"
     }
   ],
   "message.confirm-delete": [
@@ -1568,7 +1568,7 @@
   "message.confirm-remove": [
     {
       "type": 0,
-      "value": "Are you sure you want to remove "
+      "value": "Sind Sie sich sicher, dass Sie "
     },
     {
       "type": 1,
@@ -1576,13 +1576,13 @@
     },
     {
       "type": 0,
-      "value": "?"
+      "value": " wänd entferne?"
     }
   ],
   "message.confirm-reset": [
     {
       "type": 0,
-      "value": "Sind Sie sicher, dass Sie dStatistike vo "
+      "value": "Sind Sie sicher, dass Sie d Statistike vo "
     },
     {
       "type": 1,
@@ -1590,25 +1590,25 @@
     },
     {
       "type": 0,
-      "value": " zruggsetze wend?"
+      "value": " zruggsetze wänd?"
     }
   ],
   "message.delete-team-warning": [
     {
       "type": 0,
-      "value": "Deleting a team will also delete all team websites."
+      "value": "Es Team lösche dued ebefalls alli team Websiite lösche."
     }
   ],
   "message.delete-website-warning": [
     {
       "type": 0,
-      "value": "Alli dezueghörige Date werdet ebefalls glöscht."
+      "value": "Alli dezueghörige Date werded ebefalls glöscht."
     }
   ],
   "message.error": [
     {
       "type": 0,
-      "value": "Es isch en Fehler uftrete."
+      "value": "Es isch en Fehler ufträte."
     }
   ],
   "message.event-log": [
@@ -1634,7 +1634,7 @@
   "message.incorrect-username-password": [
     {
       "type": 0,
-      "value": "Falschs Passwort oder Benutzername."
+      "value": "Falsches Passwort oder Benutzername."
     }
   ],
   "message.invalid-domain": [
@@ -1660,7 +1660,7 @@
   "message.new-version-available": [
     {
       "type": 0,
-      "value": "A new version of Umami "
+      "value": "Es isch en neue Version vo Umami "
     },
     {
       "type": 1,
@@ -1668,7 +1668,7 @@
     },
     {
       "type": 0,
-      "value": " is available!"
+      "value": " verfügbar!"
     }
   ],
   "message.no-data-available": [
@@ -1680,7 +1680,7 @@
   "message.no-event-data": [
     {
       "type": 0,
-      "value": "No event data is available."
+      "value": "Es sind kei Event Date verfügbar."
     }
   ],
   "message.no-match-password": [
@@ -1692,7 +1692,7 @@
   "message.no-results-found": [
     {
       "type": 0,
-      "value": "No results were found."
+      "value": "Kei Ergäbnis gfunde."
     }
   ],
   "message.no-team-websites": [
@@ -1728,7 +1728,7 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "To reset this website, type "
+      "value": "Um die Websiite zruggzsetze, typed Sie "
     },
     {
       "type": 1,
@@ -1736,7 +1736,7 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " is Feld unde dran."
     }
   ],
   "message.reset-website-warning": [
@@ -1760,7 +1760,7 @@
   "message.team-already-member": [
     {
       "type": 0,
-      "value": "Sie sind bereits es Mitglied vo dem Team."
+      "value": "Sie sind bereits es Mitglied vo däm Team."
     }
   ],
   "message.team-not-found": [
@@ -1772,7 +1772,7 @@
   "message.team-websites-info": [
     {
       "type": 0,
-      "value": "Websiite chönd vo jedem im Team agluegt werde"
+      "value": "Websiite chöi vo jedem im Team agluegt werde"
     }
   ],
   "message.tracking-code": [
@@ -1784,37 +1784,37 @@
   "message.transfer-team-website-to-user": [
     {
       "type": 0,
-      "value": "Transfer this website to your account?"
+      "value": "Websiite uf zu Ihrem Account transferiere?"
     }
   ],
   "message.transfer-user-website-to-team": [
     {
       "type": 0,
-      "value": "Select the team to transfer this website to."
+      "value": "Wähled Sie s Team zum däm Websiite transferiert werde söll."
     }
   ],
   "message.transfer-website": [
     {
       "type": 0,
-      "value": "Transfer website ownership to your account or another team."
+      "value": "Übertraged Sie d Websiite Eigetümerrecht uf Ihre Account oder uf es anders Team"
     }
   ],
   "message.triggered-event": [
     {
       "type": 0,
-      "value": "Triggered event"
+      "value": "Usglösts Ereigniss"
     }
   ],
   "message.user-deleted": [
     {
       "type": 0,
-      "value": "Benutzer glöscht."
+      "value": "Bnutzer glöscht."
     }
   ],
   "message.viewed-page": [
     {
       "type": 0,
-      "value": "Viewed page"
+      "value": "Siite agluegt"
     }
   ],
   "message.visitor-log": [
@@ -1828,7 +1828,7 @@
     },
     {
       "type": 0,
-      "value": " benutzt "
+      "value": " nutzt "
     },
     {
       "type": 1,
@@ -1854,7 +1854,7 @@
   "message.visitors-dropped-off": [
     {
       "type": 0,
-      "value": "Visitors dropped off"
+      "value": "Bsuercher verlore"
     }
   ]
 }
diff --git a/public/intl/messages/de-DE.json b/public/intl/messages/de-DE.json
index 84e7364c53..b5ec879314 100644
--- a/public/intl/messages/de-DE.json
+++ b/public/intl/messages/de-DE.json
@@ -410,13 +410,13 @@
   "label.event": [
     {
       "type": 0,
-      "value": "Ereigniss"
+      "value": "Ereignis"
     }
   ],
   "label.event-data": [
     {
       "type": 0,
-      "value": "Ereignissdaten"
+      "value": "Ereignisdaten"
     }
   ],
   "label.events": [
@@ -1798,7 +1798,7 @@
   "message.triggered-event": [
     {
       "type": 0,
-      "value": "Ausgelöstes Ereigniss"
+      "value": "Ereignis ausgelöst"
     }
   ],
   "message.user-deleted": [
diff --git a/public/intl/messages/ru-RU.json b/public/intl/messages/ru-RU.json
index e8f7f5b4fc..b7c0165ca8 100644
--- a/public/intl/messages/ru-RU.json
+++ b/public/intl/messages/ru-RU.json
@@ -20,25 +20,25 @@
   "label.add": [
     {
       "type": 0,
-      "value": "Add"
+      "value": "Добавить"
     }
   ],
   "label.add-description": [
     {
       "type": 0,
-      "value": "Add description"
+      "value": "Добавить описание"
     }
   ],
   "label.add-member": [
     {
       "type": 0,
-      "value": "Add member"
+      "value": "Добавить участника"
     }
   ],
   "label.add-step": [
     {
       "type": 0,
-      "value": "Add step"
+      "value": "Добавить шаг"
     }
   ],
   "label.add-website": [
@@ -56,7 +56,7 @@
   "label.after": [
     {
       "type": 0,
-      "value": "After"
+      "value": "После"
     }
   ],
   "label.all": [
@@ -80,7 +80,7 @@
   "label.average": [
     {
       "type": 0,
-      "value": "Average"
+      "value": "Средний"
     }
   ],
   "label.back": [
@@ -92,7 +92,7 @@
   "label.before": [
     {
       "type": 0,
-      "value": "Before"
+      "value": "До"
     }
   ],
   "label.bounce-rate": [
@@ -104,13 +104,13 @@
   "label.breakdown": [
     {
       "type": 0,
-      "value": "Breakdown"
+      "value": "Авария"
     }
   ],
   "label.browser": [
     {
       "type": 0,
-      "value": "Browser"
+      "value": "Браузер"
     }
   ],
   "label.browsers": [
@@ -140,7 +140,7 @@
   "label.city": [
     {
       "type": 0,
-      "value": "City"
+      "value": "Город"
     }
   ],
   "label.clear-all": [
@@ -152,7 +152,7 @@
   "label.compare": [
     {
       "type": 0,
-      "value": "Compare"
+      "value": "Сравнить"
     }
   ],
   "label.confirm": [
@@ -170,7 +170,7 @@
   "label.contains": [
     {
       "type": 0,
-      "value": "Contains"
+      "value": "Содержит"
     }
   ],
   "label.continue": [
@@ -182,7 +182,7 @@
   "label.count": [
     {
       "type": 0,
-      "value": "Count"
+      "value": "Считать"
     }
   ],
   "label.countries": [
@@ -194,19 +194,19 @@
   "label.country": [
     {
       "type": 0,
-      "value": "Country"
+      "value": "Страна"
     }
   ],
   "label.create": [
     {
       "type": 0,
-      "value": "Create"
+      "value": "Создать"
     }
   ],
   "label.create-report": [
     {
       "type": 0,
-      "value": "Create report"
+      "value": "Создать отчет"
     }
   ],
   "label.create-team": [
@@ -230,13 +230,13 @@
   "label.created-by": [
     {
       "type": 0,
-      "value": "Created By"
+      "value": "Создано"
     }
   ],
   "label.current": [
     {
       "type": 0,
-      "value": "Current"
+      "value": "Текущий"
     }
   ],
   "label.current-password": [
@@ -266,7 +266,7 @@
   "label.date": [
     {
       "type": 0,
-      "value": "Date"
+      "value": "Дата"
     }
   ],
   "label.date-range": [
@@ -278,7 +278,7 @@
   "label.day": [
     {
       "type": 0,
-      "value": "Day"
+      "value": "День"
     }
   ],
   "label.default-date-range": [
@@ -296,7 +296,7 @@
   "label.delete-report": [
     {
       "type": 0,
-      "value": "Delete report"
+      "value": "Удалить отчет"
     }
   ],
   "label.delete-team": [
@@ -320,7 +320,7 @@
   "label.description": [
     {
       "type": 0,
-      "value": "Description"
+      "value": "Описание"
     }
   ],
   "label.desktop": [
@@ -338,7 +338,7 @@
   "label.device": [
     {
       "type": 0,
-      "value": "Device"
+      "value": "Устройство"
     }
   ],
   "label.devices": [
@@ -356,7 +356,7 @@
   "label.does-not-contain": [
     {
       "type": 0,
-      "value": "Does not contain"
+      "value": "Не содержит"
     }
   ],
   "label.domain": [
@@ -368,7 +368,7 @@
   "label.dropoff": [
     {
       "type": 0,
-      "value": "Dropoff"
+      "value": "Высадка"
     }
   ],
   "label.edit": [
@@ -386,7 +386,7 @@
   "label.edit-member": [
     {
       "type": 0,
-      "value": "Edit member"
+      "value": "Редактировать участника"
     }
   ],
   "label.enable-share-url": [
@@ -398,25 +398,25 @@
   "label.end-step": [
     {
       "type": 0,
-      "value": "End Step"
+      "value": "Конечный шаг"
     }
   ],
   "label.entry": [
     {
       "type": 0,
-      "value": "Entry URL"
+      "value": "URL-адрес входа"
     }
   ],
   "label.event": [
     {
       "type": 0,
-      "value": "Event"
+      "value": "Событие"
     }
   ],
   "label.event-data": [
     {
       "type": 0,
-      "value": "Event data"
+      "value": "Данные о событии"
     }
   ],
   "label.events": [
@@ -428,31 +428,31 @@
   "label.exit": [
     {
       "type": 0,
-      "value": "Exit URL"
+      "value": "URL-адрес выхода"
     }
   ],
   "label.false": [
     {
       "type": 0,
-      "value": "False"
+      "value": "Ложь"
     }
   ],
   "label.field": [
     {
       "type": 0,
-      "value": "Field"
+      "value": "Поле"
     }
   ],
   "label.fields": [
     {
       "type": 0,
-      "value": "Fields"
+      "value": "Поля"
     }
   ],
   "label.filter": [
     {
       "type": 0,
-      "value": "Filter"
+      "value": "Фильтр"
     }
   ],
   "label.filter-combined": [
@@ -470,55 +470,55 @@
   "label.filters": [
     {
       "type": 0,
-      "value": "Filters"
+      "value": "Фильтры"
     }
   ],
   "label.first-seen": [
     {
       "type": 0,
-      "value": "First seen"
+      "value": "Первый вход"
     }
   ],
   "label.funnel": [
     {
       "type": 0,
-      "value": "Funnel"
+      "value": "Воронка"
     }
   ],
   "label.funnel-description": [
     {
       "type": 0,
-      "value": "Understand the conversion and drop-off rate of users."
+      "value": "Изучите коэффициент конверсии и ухода пользователей."
     }
   ],
   "label.goal": [
     {
       "type": 0,
-      "value": "Goal"
+      "value": "Цель"
     }
   ],
   "label.goals": [
     {
       "type": 0,
-      "value": "Goals"
+      "value": "Цели"
     }
   ],
   "label.goals-description": [
     {
       "type": 0,
-      "value": "Track your goals for pageviews and events."
+      "value": "Отслеживайте свои цели по просмотрам страниц и событиям."
     }
   ],
   "label.greater-than": [
     {
       "type": 0,
-      "value": "Greater than"
+      "value": "Больше, чем"
     }
   ],
   "label.greater-than-equals": [
     {
       "type": 0,
-      "value": "Greater than or equals"
+      "value": "Больше или равно"
     }
   ],
   "label.host": [
@@ -536,37 +536,37 @@
   "label.insights": [
     {
       "type": 0,
-      "value": "Insights"
+      "value": "Информация"
     }
   ],
   "label.insights-description": [
     {
       "type": 0,
-      "value": "Dive deeper into your data by using segments and filters."
+      "value": "Погрузитесь глубже в свои данные с помощью сегментов и фильтров."
     }
   ],
   "label.is": [
     {
       "type": 0,
-      "value": "Is"
+      "value": "Является"
     }
   ],
   "label.is-not": [
     {
       "type": 0,
-      "value": "Is not"
+      "value": "Не установлен"
     }
   ],
   "label.is-not-set": [
     {
       "type": 0,
-      "value": "Is not set"
+      "value": "Не установлено"
     }
   ],
   "label.is-set": [
     {
       "type": 0,
-      "value": "Is set"
+      "value": "Установлен"
     }
   ],
   "label.join": [
@@ -590,7 +590,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users navigate through your website."
+      "value": "Поймите, как пользователи перемещаются по вашему сайту."
     }
   ],
   "label.language": [
@@ -642,7 +642,7 @@
   "label.last-months": [
     {
       "type": 0,
-      "value": "Last "
+      "value": "Последние "
     },
     {
       "type": 1,
@@ -650,13 +650,13 @@
     },
     {
       "type": 0,
-      "value": " months"
+      "value": " месяцев"
     }
   ],
   "label.last-seen": [
     {
       "type": 0,
-      "value": "Last seen"
+      "value": "Последний вход"
     }
   ],
   "label.leave": [
@@ -674,13 +674,13 @@
   "label.less-than": [
     {
       "type": 0,
-      "value": "Less than"
+      "value": "Меньше, чем"
     }
   ],
   "label.less-than-equals": [
     {
       "type": 0,
-      "value": "Less than or equals"
+      "value": "Меньше или равно"
     }
   ],
   "label.login": [
@@ -698,25 +698,25 @@
   "label.manage": [
     {
       "type": 0,
-      "value": "Manage"
+      "value": "Управление"
     }
   ],
   "label.manager": [
     {
       "type": 0,
-      "value": "Manager"
+      "value": "Менеджер"
     }
   ],
   "label.max": [
     {
       "type": 0,
-      "value": "Max"
+      "value": "Максимум"
     }
   ],
   "label.member": [
     {
       "type": 0,
-      "value": "Member"
+      "value": "Участник"
     }
   ],
   "label.members": [
@@ -728,7 +728,7 @@
   "label.min": [
     {
       "type": 0,
-      "value": "Min"
+      "value": "Минимум"
     }
   ],
   "label.mobile": [
@@ -746,13 +746,13 @@
   "label.my-account": [
     {
       "type": 0,
-      "value": "My account"
+      "value": "Мой профиль"
     }
   ],
   "label.my-websites": [
     {
       "type": 0,
-      "value": "My websites"
+      "value": "Мои сайты"
     }
   ],
   "label.name": [
@@ -789,7 +789,7 @@
           "value": [
             {
               "type": 0,
-              "value": "record"
+              "value": "запись"
             }
           ]
         },
@@ -797,7 +797,7 @@
           "value": [
             {
               "type": 0,
-              "value": "records"
+              "value": "записи"
             }
           ]
         }
@@ -822,7 +822,7 @@
   "label.overview": [
     {
       "type": 0,
-      "value": "Overview"
+      "value": "Обзор"
     }
   ],
   "label.owner": [
@@ -834,7 +834,7 @@
   "label.page-of": [
     {
       "type": 0,
-      "value": "Page "
+      "value": "Страница "
     },
     {
       "type": 1,
@@ -842,7 +842,7 @@
     },
     {
       "type": 0,
-      "value": " of "
+      "value": " из "
     },
     {
       "type": 1,
@@ -858,7 +858,7 @@
   "label.pageTitle": [
     {
       "type": 0,
-      "value": "Page title"
+      "value": "Название страницы"
     }
   ],
   "label.pages": [
@@ -876,13 +876,13 @@
   "label.path": [
     {
       "type": 0,
-      "value": "Path"
+      "value": "Путь"
     }
   ],
   "label.paths": [
     {
       "type": 0,
-      "value": "Paths"
+      "value": "Пути"
     }
   ],
   "label.powered-by": [
@@ -898,19 +898,19 @@
   "label.previous": [
     {
       "type": 0,
-      "value": "Previous"
+      "value": "Предыдущий"
     }
   ],
   "label.previous-period": [
     {
       "type": 0,
-      "value": "Previous period"
+      "value": "Предыдущий период"
     }
   ],
   "label.previous-year": [
     {
       "type": 0,
-      "value": "Previous year"
+      "value": "Предыдущий год"
     }
   ],
   "label.profile": [
@@ -922,13 +922,13 @@
   "label.properties": [
     {
       "type": 0,
-      "value": "Properties"
+      "value": "Свойства"
     }
   ],
   "label.property": [
     {
       "type": 0,
-      "value": "Property"
+      "value": "Свойство"
     }
   ],
   "label.queries": [
@@ -940,7 +940,7 @@
   "label.query": [
     {
       "type": 0,
-      "value": "Query"
+      "value": "Запрос"
     }
   ],
   "label.query-parameters": [
@@ -958,7 +958,7 @@
   "label.referrer": [
     {
       "type": 0,
-      "value": "Referrer"
+      "value": "Реферер"
     }
   ],
   "label.referrers": [
@@ -982,7 +982,7 @@
   "label.region": [
     {
       "type": 0,
-      "value": "Region"
+      "value": "Регион"
     }
   ],
   "label.regions": [
@@ -1000,13 +1000,13 @@
   "label.remove-member": [
     {
       "type": 0,
-      "value": "Remove member"
+      "value": "Удалить участника"
     }
   ],
   "label.reports": [
     {
       "type": 0,
-      "value": "Reports"
+      "value": "Отчеты"
     }
   ],
   "label.required": [
@@ -1030,31 +1030,31 @@
   "label.retention": [
     {
       "type": 0,
-      "value": "Retention"
+      "value": "Удержание"
     }
   ],
   "label.retention-description": [
     {
       "type": 0,
-      "value": "Measure your website stickiness by tracking how often users return."
+      "value": "Измерьте «прилипаемость» вашего сайта, отслеживая, как часто пользователи возвращаются на него."
     }
   ],
   "label.revenue": [
     {
       "type": 0,
-      "value": "Revenue"
+      "value": "Выручка"
     }
   ],
   "label.revenue-description": [
     {
       "type": 0,
-      "value": "Look into your revenue across time."
+      "value": "Изучите свои доходы за определенное время."
     }
   ],
   "label.revenue-property": [
     {
       "type": 0,
-      "value": "Revenue Property"
+      "value": "Доходная недвижимость"
     }
   ],
   "label.role": [
@@ -1066,7 +1066,7 @@
   "label.run-query": [
     {
       "type": 0,
-      "value": "Run query"
+      "value": "Выполнить запрос"
     }
   ],
   "label.save": [
@@ -1084,25 +1084,25 @@
   "label.search": [
     {
       "type": 0,
-      "value": "Search"
+      "value": "Поиск"
     }
   ],
   "label.select": [
     {
       "type": 0,
-      "value": "Select"
+      "value": "Выберите"
     }
   ],
   "label.select-date": [
     {
       "type": 0,
-      "value": "Select date"
+      "value": "Выберите дату"
     }
   ],
   "label.select-role": [
     {
       "type": 0,
-      "value": "Select role"
+      "value": "Выберите роль"
     }
   ],
   "label.select-website": [
@@ -1114,7 +1114,7 @@
   "label.session": [
     {
       "type": 0,
-      "value": "Session"
+      "value": "Сессия"
     }
   ],
   "label.sessions": [
@@ -1144,19 +1144,19 @@
   "label.start-step": [
     {
       "type": 0,
-      "value": "Start Step"
+      "value": "Начальный этап"
     }
   ],
   "label.steps": [
     {
       "type": 0,
-      "value": "Steps"
+      "value": "Шаги"
     }
   ],
   "label.sum": [
     {
       "type": 0,
-      "value": "Sum"
+      "value": "Сумма"
     }
   ],
   "label.tablet": [
@@ -1180,7 +1180,7 @@
   "label.team-manager": [
     {
       "type": 0,
-      "value": "Team manager"
+      "value": "Менеджер команды"
     }
   ],
   "label.team-member": [
@@ -1192,7 +1192,7 @@
   "label.team-name": [
     {
       "type": 0,
-      "value": "Team name"
+      "value": "Название команды"
     }
   ],
   "label.team-owner": [
@@ -1204,13 +1204,13 @@
   "label.team-view-only": [
     {
       "type": 0,
-      "value": "Team view only"
+      "value": "Только командный просмотр"
     }
   ],
   "label.team-websites": [
     {
       "type": 0,
-      "value": "Team websites"
+      "value": "Веб-сайты команды"
     }
   ],
   "label.teams": [
@@ -1270,13 +1270,13 @@
   "label.total": [
     {
       "type": 0,
-      "value": "Total"
+      "value": "Всего"
     }
   ],
   "label.total-records": [
     {
       "type": 0,
-      "value": "Total records"
+      "value": "Всего записей"
     }
   ],
   "label.tracking-code": [
@@ -1288,37 +1288,37 @@
   "label.transactions": [
     {
       "type": 0,
-      "value": "Transactions"
+      "value": "Транзакции"
     }
   ],
   "label.transfer": [
     {
       "type": 0,
-      "value": "Transfer"
+      "value": "Передача"
     }
   ],
   "label.transfer-website": [
     {
       "type": 0,
-      "value": "Transfer website"
+      "value": "Передать сайт"
     }
   ],
   "label.true": [
     {
       "type": 0,
-      "value": "True"
+      "value": "Правда"
     }
   ],
   "label.type": [
     {
       "type": 0,
-      "value": "Type"
+      "value": "Тип"
     }
   ],
   "label.unique": [
     {
       "type": 0,
-      "value": "Unique"
+      "value": "Уникальный"
     }
   ],
   "label.unique-visitors": [
@@ -1330,7 +1330,7 @@
   "label.uniqueCustomers": [
     {
       "type": 0,
-      "value": "Unique Customers"
+      "value": "Уникальные клиенты"
     }
   ],
   "label.unknown": [
@@ -1342,13 +1342,13 @@
   "label.untitled": [
     {
       "type": 0,
-      "value": "Untitled"
+      "value": "Без названия"
     }
   ],
   "label.update": [
     {
       "type": 0,
-      "value": "Update"
+      "value": "Обновление"
     }
   ],
   "label.url": [
@@ -1372,7 +1372,7 @@
   "label.user-property": [
     {
       "type": 0,
-      "value": "User Property"
+      "value": "Собственность пользователя"
     }
   ],
   "label.username": [
@@ -1396,13 +1396,13 @@
   "label.utm-description": [
     {
       "type": 0,
-      "value": "Track your campaigns through UTM parameters."
+      "value": "Отслеживайте свои кампании с помощью UTM-параметров."
     }
   ],
   "label.value": [
     {
       "type": 0,
-      "value": "Value"
+      "value": "Значение"
     }
   ],
   "label.view": [
@@ -1420,7 +1420,7 @@
   "label.view-only": [
     {
       "type": 0,
-      "value": "View only"
+      "value": "Только просмотр"
     }
   ],
   "label.views": [
@@ -1432,7 +1432,7 @@
   "label.views-per-visit": [
     {
       "type": 0,
-      "value": "Views per visit"
+      "value": "Просмотров за посещение"
     }
   ],
   "label.visit-duration": [
@@ -1450,13 +1450,13 @@
   "label.visits": [
     {
       "type": 0,
-      "value": "Visits"
+      "value": "Посещения"
     }
   ],
   "label.website": [
     {
       "type": 0,
-      "value": "Website"
+      "value": "Сайт"
     }
   ],
   "label.website-id": [
@@ -1474,7 +1474,7 @@
   "label.window": [
     {
       "type": 0,
-      "value": "Window"
+      "value": "Окно"
     }
   ],
   "label.yesterday": [
@@ -1486,7 +1486,7 @@
   "message.action-confirmation": [
     {
       "type": 0,
-      "value": "Type "
+      "value": "Введите "
     },
     {
       "type": 1,
@@ -1494,7 +1494,7 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " в поле ниже, чтобы подтвердить."
     }
   ],
   "message.active-users": [
@@ -1510,7 +1510,7 @@
   "message.collected-data": [
     {
       "type": 0,
-      "value": "Collected data"
+      "value": "Собранные данные"
     }
   ],
   "message.confirm-delete": [
@@ -1544,7 +1544,7 @@
   "message.confirm-remove": [
     {
       "type": 0,
-      "value": "Are you sure you want to remove "
+      "value": "Вы уверены, что хотите удалить "
     },
     {
       "type": 1,
@@ -1572,7 +1572,7 @@
   "message.delete-team-warning": [
     {
       "type": 0,
-      "value": "Deleting a team will also delete all team websites."
+      "value": "При удалении команды будут удалены и все ее веб-сайты."
     }
   ],
   "message.delete-website-warning": [
@@ -1594,7 +1594,7 @@
     },
     {
       "type": 0,
-      "value": " on "
+      "value": " на "
     },
     {
       "type": 1,
@@ -1636,7 +1636,7 @@
   "message.new-version-available": [
     {
       "type": 0,
-      "value": "A new version of Umami "
+      "value": "Вышла новая версия Umami "
     },
     {
       "type": 1,
@@ -1644,7 +1644,7 @@
     },
     {
       "type": 0,
-      "value": " is available!"
+      "value": "!"
     }
   ],
   "message.no-data-available": [
@@ -1656,7 +1656,7 @@
   "message.no-event-data": [
     {
       "type": 0,
-      "value": "No event data is available."
+      "value": "Данные о событиях отсутствуют."
     }
   ],
   "message.no-match-password": [
@@ -1668,7 +1668,7 @@
   "message.no-results-found": [
     {
       "type": 0,
-      "value": "No results were found."
+      "value": "Результаты не найдены."
     }
   ],
   "message.no-team-websites": [
@@ -1760,25 +1760,25 @@
   "message.transfer-team-website-to-user": [
     {
       "type": 0,
-      "value": "Transfer this website to your account?"
+      "value": "Перенести этот сайт в свой прфоиль?"
     }
   ],
   "message.transfer-user-website-to-team": [
     {
       "type": 0,
-      "value": "Select the team to transfer this website to."
+      "value": "Выберите команду, которой нужно передать этот сайт."
     }
   ],
   "message.transfer-website": [
     {
       "type": 0,
-      "value": "Transfer website ownership to your account or another team."
+      "value": "Передайте право владения сайтом своей учетной записи или другой команде."
     }
   ],
   "message.triggered-event": [
     {
       "type": 0,
-      "value": "Triggered event"
+      "value": "Запущенное событие"
     }
   ],
   "message.user-deleted": [
@@ -1790,7 +1790,7 @@
   "message.viewed-page": [
     {
       "type": 0,
-      "value": "Viewed page"
+      "value": "Просмотренная страница"
     }
   ],
   "message.visitor-log": [
@@ -1830,7 +1830,7 @@
   "message.visitors-dropped-off": [
     {
       "type": 0,
-      "value": "Visitors dropped off"
+      "value": "Высадка посетителей"
     }
   ]
 }
diff --git a/src/lang/ru-RU.json b/src/lang/ru-RU.json
index 745f2179b6..558b411a34 100644
--- a/src/lang/ru-RU.json
+++ b/src/lang/ru-RU.json
@@ -124,7 +124,7 @@
   "label.name": "Имя",
   "label.new-password": "Новый пароль",
   "label.none": "Не указано",
-  "label.number-of-records": "{x} {x, множественное число, один {запись} другие {записи}}",
+  "label.number-of-records": "{x} {x, plural, one {запись} other {записи}}",
   "label.ok": "OK",
   "label.os": "OS",
   "label.overview": "Обзор",

From 3fb68e168442a9dc142505e4570ed411393d2189 Mon Sep 17 00:00:00 2001
From: wuzhiqing <gtawu12138@gmail.com>
Date: Mon, 28 Oct 2024 02:01:46 +0000
Subject: [PATCH 388/438] feat: Add support for hash-based routing tracking

---
 src/tracker/index.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/tracker/index.js b/src/tracker/index.js
index 707594cf40..1cf7c18606 100644
--- a/src/tracker/index.js
+++ b/src/tracker/index.js
@@ -53,8 +53,9 @@
 
   const parseURL = url => {
     try {
-      const { pathname, search } = new URL(url);
-      url = pathname + search;
+      // use location.origin as the base to handle cases where the url is a relative path
+      const { pathname, search, hash } = new URL(url, location.origin);
+      url = pathname + search + hash;
     } catch (e) {
       /* empty */
     }

From 1225473c2008cd9e4a0479c6f58f96b4d798aab2 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Tue, 29 Oct 2024 16:39:51 -0700
Subject: [PATCH 389/438] Added TRACKER_SCRIPT_URL env var.

---
 next.config.js            | 18 ++++++++++++------
 package.json              |  2 +-
 rollup.tracker.config.mjs |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/next.config.js b/next.config.js
index b7d7331d6a..33a43ee7bb 100644
--- a/next.config.js
+++ b/next.config.js
@@ -3,6 +3,8 @@ require('dotenv').config();
 const path = require('path');
 const pkg = require('./package.json');
 
+const TRACKER_SCRIPT = '/script.js';
+
 const basePath = process.env.BASE_PATH;
 const collectApiEndpoint = process.env.COLLECT_API_ENDPOINT;
 const cloudMode = process.env.CLOUD_MODE;
@@ -14,6 +16,7 @@ const forceSSL = process.env.FORCE_SSL;
 const frameAncestors = process.env.ALLOWED_FRAME_URLS;
 const privateMode = process.env.PRIVATE_MODE;
 const trackerScriptName = process.env.TRACKER_SCRIPT_NAME;
+const trackerScriptURL = process.env.TRACKER_SCRIPT_URL;
 
 const contentSecurityPolicy = [
   `default-src 'self'`,
@@ -58,13 +61,20 @@ const headers = [
     headers: defaultHeaders,
   },
   {
-    source: '/script.js',
+    source: TRACKER_SCRIPT,
     headers: trackerHeaders,
   },
 ];
 
 const rewrites = [];
 
+if (trackerScriptURL) {
+  rewrites.push({
+    source: TRACKER_SCRIPT,
+    destination: trackerScriptURL,
+  });
+}
+
 if (collectApiEndpoint) {
   rewrites.push({
     source: collectApiEndpoint,
@@ -100,7 +110,7 @@ if (trackerScriptName) {
 
       rewrites.push({
         source: normalizedSource,
-        destination: '/script.js',
+        destination: TRACKER_SCRIPT,
       });
 
       headers.push({
@@ -184,10 +194,6 @@ const config = {
   async rewrites() {
     return [
       ...rewrites,
-      {
-        source: '/script.js',
-        destination: 'https://tracker-script.umami.dev/',
-      },
       {
         source: '/telemetry.js',
         destination: '/api/scripts/telemetry',
diff --git a/package.json b/package.json
index c78a113750..77c40cae32 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "2.13.2",
+  "version": "2.14.0",
   "description": "A simple, fast, privacy-focused alternative to Google Analytics.",
   "author": "Umami Software, Inc. <hello@umami.is>",
   "license": "MIT",
diff --git a/rollup.tracker.config.mjs b/rollup.tracker.config.mjs
index 4b1f0e0e25..05df28798d 100644
--- a/rollup.tracker.config.mjs
+++ b/rollup.tracker.config.mjs
@@ -5,7 +5,7 @@ import { terser } from 'rollup-plugin-terser';
 export default {
   input: 'src/tracker/index.js',
   output: {
-    file: 'public/tracker.js',
+    file: 'public/script.js',
     format: 'iife',
   },
   plugins: [

From 1d4f1a84bb99f9c39f515f5cefd568bbd8097c5d Mon Sep 17 00:00:00 2001
From: Tudor Marze <hello@tudormarze.com>
Date: Fri, 1 Nov 2024 17:02:37 +0200
Subject: [PATCH 390/438] Set engine to InnoDB for MySQL

---
 db/mysql/migrations/01_init/migration.sql        | 16 ++++++++--------
 .../02_report_schema_session_data/migration.sql  |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/db/mysql/migrations/01_init/migration.sql b/db/mysql/migrations/01_init/migration.sql
index bd332805a4..d66e2a9ccf 100644
--- a/db/mysql/migrations/01_init/migration.sql
+++ b/db/mysql/migrations/01_init/migration.sql
@@ -11,7 +11,7 @@ CREATE TABLE `user` (
     UNIQUE INDEX `user_user_id_key`(`user_id`),
     UNIQUE INDEX `user_username_key`(`username`),
     PRIMARY KEY (`user_id`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 -- CreateTable
 CREATE TABLE `session` (
@@ -33,7 +33,7 @@ CREATE TABLE `session` (
     INDEX `session_created_at_idx`(`created_at`),
     INDEX `session_website_id_idx`(`website_id`),
     PRIMARY KEY (`session_id`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 -- CreateTable
 CREATE TABLE `website` (
@@ -53,7 +53,7 @@ CREATE TABLE `website` (
     INDEX `website_created_at_idx`(`created_at`),
     INDEX `website_share_id_idx`(`share_id`),
     PRIMARY KEY (`website_id`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 -- CreateTable
 CREATE TABLE `website_event` (
@@ -76,7 +76,7 @@ CREATE TABLE `website_event` (
     INDEX `website_event_website_id_created_at_idx`(`website_id`, `created_at`),
     INDEX `website_event_website_id_session_id_created_at_idx`(`website_id`, `session_id`, `created_at`),
     PRIMARY KEY (`event_id`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 -- CreateTable
 CREATE TABLE `event_data` (
@@ -95,7 +95,7 @@ CREATE TABLE `event_data` (
     INDEX `event_data_website_event_id_idx`(`website_event_id`),
     INDEX `event_data_website_id_website_event_id_created_at_idx`(`website_id`, `website_event_id`, `created_at`),
     PRIMARY KEY (`event_id`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 -- CreateTable
 CREATE TABLE `team` (
@@ -109,7 +109,7 @@ CREATE TABLE `team` (
     UNIQUE INDEX `team_access_code_key`(`access_code`),
     INDEX `team_access_code_idx`(`access_code`),
     PRIMARY KEY (`team_id`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 -- CreateTable
 CREATE TABLE `team_user` (
@@ -124,7 +124,7 @@ CREATE TABLE `team_user` (
     INDEX `team_user_team_id_idx`(`team_id`),
     INDEX `team_user_user_id_idx`(`user_id`),
     PRIMARY KEY (`team_user_id`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 -- CreateTable
 CREATE TABLE `team_website` (
@@ -137,7 +137,7 @@ CREATE TABLE `team_website` (
     INDEX `team_website_team_id_idx`(`team_id`),
     INDEX `team_website_website_id_idx`(`website_id`),
     PRIMARY KEY (`team_website_id`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 -- AddSystemUser
 INSERT INTO user (user_id, username, role, password) VALUES ('41e2b680-648e-4b09-bcd7-3e2b10c06264' , 'admin', 'admin', '$2b$10$BUli0c.muyCW1ErNJc3jL.vFRFtFJWrT8/GcR4A.sUdCznaXiqFXa');
\ No newline at end of file
diff --git a/db/mysql/migrations/02_report_schema_session_data/migration.sql b/db/mysql/migrations/02_report_schema_session_data/migration.sql
index 1649ace2d8..b165383a6c 100644
--- a/db/mysql/migrations/02_report_schema_session_data/migration.sql
+++ b/db/mysql/migrations/02_report_schema_session_data/migration.sql
@@ -21,7 +21,7 @@ CREATE TABLE `session_data` (
     INDEX `session_data_website_id_idx`(`website_id`),
     INDEX `session_data_session_id_idx`(`session_id`),
     PRIMARY KEY (`session_data_id`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 -- CreateTable
 CREATE TABLE `report` (
@@ -41,7 +41,7 @@ CREATE TABLE `report` (
     INDEX `report_type_idx`(`type`),
     INDEX `report_name_idx`(`name`),
     PRIMARY KEY (`report_id`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 -- EventData migration
 UPDATE event_data

From 92bbaf739fb93f59c4c882980c1739d2b5977773 Mon Sep 17 00:00:00 2001
From: Ru Chern Chong <ruchern.chong@sgcarstrends.com>
Date: Sat, 2 Nov 2024 00:04:56 +0800
Subject: [PATCH 391/438] Upgrade Netlify Next.js plugin

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index c78a113750..a19f93766a 100644
--- a/package.json
+++ b/package.json
@@ -123,7 +123,7 @@
   },
   "devDependencies": {
     "@formatjs/cli": "^4.2.29",
-    "@netlify/plugin-nextjs": "^5.1.0",
+    "@netlify/plugin-nextjs": "^5.8.1",
     "@rollup/plugin-alias": "^5.0.0",
     "@rollup/plugin-commonjs": "^25.0.4",
     "@rollup/plugin-json": "^6.0.0",
diff --git a/yarn.lock b/yarn.lock
index a53045fef1..e9411e7646 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2192,10 +2192,10 @@
   resolved "https://registry.yarnpkg.com/@kurkle/color/-/color-0.3.2.tgz#5acd38242e8bde4f9986e7913c8fdf49d3aa199f"
   integrity sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==
 
-"@netlify/plugin-nextjs@^5.1.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@netlify/plugin-nextjs/-/plugin-nextjs-5.6.0.tgz#970f96b11bee4fe115fad8e3e4f3c6121f97a370"
-  integrity sha512-PBrsd/GJZ9MN8BdyIoleTkY22lAUMfcRxrbb8wgxGzXtTW0RU0GW2mc99ISB6zOwWMZ11rSjeN0GS6znnukvww==
+"@netlify/plugin-nextjs@^5.8.1":
+  version "5.8.1"
+  resolved "https://registry.yarnpkg.com/@netlify/plugin-nextjs/-/plugin-nextjs-5.8.1.tgz#9da15bb4a13c5644e9b58b968c7da51939206ee4"
+  integrity sha512-WB1N0FslhWZ1yAVYTcB6CcFrFOUSQ0O2LfavYZrbAypeNxu2I+oO+cgmhfDgZ8Eoq1g4EMeoIGMkNoZ4ogZTsg==
 
 "@next/env@14.2.10":
   version "14.2.10"

From ae25be6af2fce7ed426e2ca1ca7a4a7c0c5f43fa Mon Sep 17 00:00:00 2001
From: Tudor Marze <hello@tudormarze.com>
Date: Fri, 1 Nov 2024 17:56:03 +0200
Subject: [PATCH 392/438] Update translations for ro-RO

---
 src/lang/ro-RO.json | 84 ++++++++++++++++++++++-----------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/lang/ro-RO.json b/src/lang/ro-RO.json
index f60f8f2baa..cce51a2546 100644
--- a/src/lang/ro-RO.json
+++ b/src/lang/ro-RO.json
@@ -5,8 +5,8 @@
   "label.add": "Adaugă",
   "label.add-description": "Adaugă descriere",
   "label.add-member": "Adaugă membru",
-  "label.add-step": "Add step",
-  "label.add-website": "Adăugare site web",
+  "label.add-step": "Adaugă pas",
+  "label.add-website": "Adaugă site web",
   "label.admin": "Administrator",
   "label.after": "După",
   "label.all": "Toate",
@@ -24,12 +24,12 @@
   "label.cities": "Orașe",
   "label.city": "Oraș",
   "label.clear-all": "Șterge tot",
-  "label.compare": "Compare",
+  "label.compare": "Compară",
   "label.confirm": "Confirm",
   "label.confirm-password": "Confirmare parolă",
   "label.contains": "Conține",
   "label.continue": "Continuă",
-  "label.count": "Count",
+  "label.count": "Număr",
   "label.countries": "Țări",
   "label.country": "Țară",
   "label.create": "Crează",
@@ -37,21 +37,21 @@
   "label.create-team": "Crează echipă",
   "label.create-user": "Crează utilizator",
   "label.created": "Creat",
-  "label.created-by": "Created By",
-  "label.current": "Current",
+  "label.created-by": "Creat de",
+  "label.current": "Curent",
   "label.current-password": "Parola curentă",
   "label.custom-range": "Interval personalizat",
   "label.dashboard": "Tablou de bord",
   "label.data": "Date",
-  "label.date": "Data",
-  "label.date-range": "Interval de date",
+  "label.date": "Dată",
+  "label.date-range": "Interval",
   "label.day": "Zi",
-  "label.default-date-range": "Interval de date implicit",
+  "label.default-date-range": "Interval implicit",
   "label.delete": "Șterge",
   "label.delete-report": "Șterge raport",
   "label.delete-team": "Șterge echipă",
   "label.delete-user": "Șterge utilizator",
-  "label.delete-website": "Ștergere site web",
+  "label.delete-website": "Șterge site web",
   "label.description": "Descriere",
   "label.desktop": "Desktop",
   "label.details": "Detalii",
@@ -65,12 +65,12 @@
   "label.edit-dashboard": "Editare tablou de bord",
   "label.edit-member": "Editare membru",
   "label.enable-share-url": "Activare adresă URL de distribuire",
-  "label.end-step": "End Step",
-  "label.entry": "Entry URL",
+  "label.end-step": "Pas final",
+  "label.entry": "URL de intrare",
   "label.event": "Eveniment",
   "label.event-data": "Date despre eveniment",
   "label.events": "Evenimente",
-  "label.exit": "Exit URL",
+  "label.exit": "URL de ieșire",
   "label.false": "Fals",
   "label.field": "Câmp",
   "label.fields": "Câmpuri",
@@ -78,12 +78,12 @@
   "label.filter-combined": "Combinat",
   "label.filter-raw": "Brut",
   "label.filters": "Filtre",
-  "label.first-seen": "First seen",
+  "label.first-seen": "Văzut pentru prima dată",
   "label.funnel": "Parcursul utilizatorului",
   "label.funnel-description": "Înțelege rata de conversie și rata de abandon a utilizatorilor.",
-  "label.goal": "Goal",
-  "label.goals": "Goals",
-  "label.goals-description": "Track your goals for pageviews and events.",
+  "label.goal": "Obiectiv",
+  "label.goals": "Obiective",
+  "label.goals-description": "Urmărește obiectivele de vizualizări și evenimente.",
   "label.greater-than": "Mai mare decât",
   "label.greater-than-equals": "Mai mare sau egal cu",
   "label.host": "Host",
@@ -96,15 +96,15 @@
   "label.is-set": "Este setat",
   "label.join": "Alătură-te",
   "label.join-team": "Alătură-te echipei",
-  "label.journey": "Journey",
-  "label.journey-description": "Understand how users navigate through your website.",
+  "label.journey": "Traseu",
+  "label.journey-description": "Înțelege cum navighează vizitatorii prin website.",
   "label.language": "Limbă",
   "label.languages": "Limbi",
   "label.laptop": "Laptop",
   "label.last-days": "Ultimele {x} zile",
   "label.last-hours": "Ultimele {x} ore",
-  "label.last-months": "Last {x} months",
-  "label.last-seen": "Last seen",
+  "label.last-months": "Ultimele {x} luni",
+  "label.last-seen": "Văzut ultima dată",
   "label.leave": "Părăsește",
   "label.leave-team": "Părăsește echipa",
   "label.less-than": "Mai puțin decât",
@@ -134,15 +134,15 @@
   "label.pageTitle": "Titlul paginii",
   "label.pages": "Pagini",
   "label.password": "Parolă",
-  "label.path": "Path",
-  "label.paths": "Paths",
+  "label.path": "Rută",
+  "label.paths": "Rute",
   "label.powered-by": "Cu sprijinul {name}",
-  "label.previous": "Previous",
-  "label.previous-period": "Previous period",
-  "label.previous-year": "Previous year",
+  "label.previous": "Anterior",
+  "label.previous-period": "Perioda anterioară",
+  "label.previous-year": "Anul anterior",
   "label.profile": "Profil",
-  "label.properties": "Properties",
-  "label.property": "Property",
+  "label.properties": "Proprietăți",
+  "label.property": "Proprietate",
   "label.queries": "Interogări",
   "label.query": "Interogare",
   "label.query-parameters": "Parametri de interogare",
@@ -161,8 +161,8 @@
   "label.reset-website": "Resetează statisticile pentru site",
   "label.retention": "Retenție",
   "label.retention-description": "Măsoară atractivitatea site-ului tău prin urmărirea frecvenței cu care utilizatorii se întorc.",
-  "label.revenue": "Revenue",
-  "label.revenue-description": "Look into your revenue across time.",
+  "label.revenue": "Venit",
+  "label.revenue-description": "Urmărește venitul în timp.",
   "label.revenue-property": "Revenue Property",
   "label.role": "Rol",
   "label.run-query": "Execută interogarea",
@@ -173,18 +173,18 @@
   "label.select-date": "Selectează data",
   "label.select-role": "Selectează rolul",
   "label.select-website": "Selectează website",
-  "label.session": "Session",
+  "label.session": "Sesiune",
   "label.sessions": "Sesiuni",
   "label.settings": "Setări",
   "label.share-url": "Partajare URL",
   "label.single-day": "O singură zi",
-  "label.start-step": "Start Step",
-  "label.steps": "Steps",
+  "label.start-step": "Pas de început",
+  "label.steps": "Pași",
   "label.sum": "Sumă",
   "label.tablet": "Tabletă",
   "label.team": "Echipă",
-  "label.team-id": "ID Echipa",
-  "label.team-manager": "Team manager",
+  "label.team-id": "ID Echipă",
+  "label.team-manager": "Manager echipă",
   "label.team-member": "Membru echipă",
   "label.team-name": "Nume echipă",
   "label.team-owner": "Titular echipă",
@@ -202,34 +202,34 @@
   "label.total": "Total",
   "label.total-records": "Total înregistrări",
   "label.tracking-code": "Cod de urmărire",
-  "label.transactions": "Transactions",
+  "label.transactions": "Tranzacții",
   "label.transfer": "Transfer",
   "label.transfer-website": "Transfer website",
   "label.true": "Adevărat",
   "label.type": "Tip",
   "label.unique": "Unici",
   "label.unique-visitors": "Vizitatori unici",
-  "label.uniqueCustomers": "Unique Customers",
+  "label.uniqueCustomers": "Clienți unici",
   "label.unknown": "Necunoscut",
   "label.untitled": "Fără titlu",
   "label.update": "Update",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Utilizator",
-  "label.user-property": "User Property",
+  "label.user-property": "Proprietatea userului",
   "label.username": "Nume utilizator",
   "label.users": "Utilizatori",
   "label.utm": "UTM",
-  "label.utm-description": "Track your campaigns through UTM parameters.",
+  "label.utm-description": "Urmărește campaniile tale cu parametri UTM.",
   "label.value": "Valoare",
   "label.view": "Vizualizare",
   "label.view-details": "Vizualizare detalii",
   "label.view-only": "Doar vizualizare",
   "label.views": "Vizualizări",
-  "label.views-per-visit": "Views per visit",
+  "label.views-per-visit": "Vizualizări per vizită",
   "label.visit-duration": "Timp mediu de vizitare",
   "label.visitors": "Vizitatori",
-  "label.visits": "Visits",
+  "label.visits": "Vizite",
   "label.website": "Website",
   "label.website-id": "ID Website",
   "label.websites": "Site-uri web",
@@ -237,7 +237,7 @@
   "label.yesterday": "Ieri",
   "message.action-confirmation": "Scrie {confirmation} în câmpul de mai jos pentru a confirma.",
   "message.active-users": "{x} {x, plural, one {vizitator activ} other {vizitatori activi}}",
-  "message.collected-data": "Collected data",
+  "message.collected-data": "Date colectate",
   "message.confirm-delete": "Ești sigur că vrei să ștergi {target}?",
   "message.confirm-leave": "Ești sigur că vrei să părăsești {target}?",
   "message.confirm-remove": "Ești sigur că vrei să ștergi {target}?",

From d031f80739afb05ce0583fe7d8d586b79ede2a13 Mon Sep 17 00:00:00 2001
From: Tudor Marze <hello@tudormarze.com>
Date: Fri, 1 Nov 2024 18:10:48 +0200
Subject: [PATCH 393/438] Improve translation

---
 src/lang/ro-RO.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lang/ro-RO.json b/src/lang/ro-RO.json
index cce51a2546..feb3dd5b3a 100644
--- a/src/lang/ro-RO.json
+++ b/src/lang/ro-RO.json
@@ -216,7 +216,7 @@
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Utilizator",
-  "label.user-property": "Proprietatea userului",
+  "label.user-property": "Proprietatea utilizatorului",
   "label.username": "Nume utilizator",
   "label.users": "Utilizatori",
   "label.utm": "UTM",

From 68c68f9a1fbc567da4a050ee674aa1d560e95988 Mon Sep 17 00:00:00 2001
From: SigmazZ <70803186+SigmazZ@users.noreply.github.com>
Date: Tue, 5 Nov 2024 15:04:22 +0100
Subject: [PATCH 394/438] Update fr-FR.json

Fixed some fr-FR messages
---
 src/lang/fr-FR.json | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/lang/fr-FR.json b/src/lang/fr-FR.json
index e1c9befef6..8e390dc5cf 100644
--- a/src/lang/fr-FR.json
+++ b/src/lang/fr-FR.json
@@ -66,7 +66,7 @@
   "label.edit-member": "Modifier le membre",
   "label.enable-share-url": "Activer l'URL de partage",
   "label.end-step": "End Step",
-  "label.entry": "Entry URL",
+  "label.entry": "URL d'entrée",
   "label.event": "Évènement",
   "label.event-data": "Données d'évènements",
   "label.events": "Évènements",
@@ -78,12 +78,12 @@
   "label.filter-combined": "Combiné",
   "label.filter-raw": "Brut",
   "label.filters": "Filtres",
-  "label.first-seen": "First seen",
+  "label.first-seen": "Vu pour la première fois",
   "label.funnel": "Entonnoir",
   "label.funnel-description": "Suivi des conversions et des taux d'abandons.",
   "label.goal": "Goal",
   "label.goals": "Goals",
-  "label.goals-description": "Track your goals for pageviews and events.",
+  "label.goals-description": "Suivez vos objectifs en matière de pages vues et d'événements.",
   "label.greater-than": "Supérieur à",
   "label.greater-than-equals": "Supérieur ou égal à",
   "label.host": "Host",
@@ -97,7 +97,7 @@
   "label.join": "Rejoindre",
   "label.join-team": "Rejoindre une équipe",
   "label.journey": "Journey",
-  "label.journey-description": "Understand how users navigate through your website.",
+  "label.journey-description": "Comprendre comment les utilisateurs naviguent sur votre site web.",
   "label.language": "Langue",
   "label.languages": "Langues",
   "label.laptop": "Portable",
@@ -137,12 +137,12 @@
   "label.path": "Path",
   "label.paths": "Paths",
   "label.powered-by": "Propulsé par {name}",
-  "label.previous": "Previous",
-  "label.previous-period": "Previous period",
-  "label.previous-year": "Previous year",
+  "label.previous": "Précédent",
+  "label.previous-period": "Période précédente",
+  "label.previous-year": "Année précédente",
   "label.profile": "Profil",
-  "label.properties": "Properties",
-  "label.property": "Property",
+  "label.properties": "Propriétés",
+  "label.property": "Propriété",
   "label.queries": "Requêtes",
   "label.query": "Requête",
   "label.query-parameters": "Paramètres de requête",
@@ -162,14 +162,14 @@
   "label.retention": "Rétention",
   "label.retention-description": "Mesure de l'attractivité du site en visualisant les taux de visiteurs qui reviennent.",
   "label.revenue": "Revenue",
-  "label.revenue-description": "Look into your revenue across time.",
-  "label.revenue-property": "Revenue Property",
+  "label.revenue-description": "Examinez vos revenus au fil du temps.",
+  "label.revenue-property": "Propriétés des revenues",
   "label.role": "Rôle",
   "label.run-query": "Éxécuter la requête",
   "label.save": "Enregistrer",
   "label.screens": "Résolutions d'écran",
   "label.search": "Rechercher",
-  "label.select": "Select",
+  "label.select": "Selectionner",
   "label.select-date": "Choisir une période",
   "label.select-role": "Choisir un rôle",
   "label.select-website": "Choisir un site",
@@ -178,17 +178,17 @@
   "label.settings": "Paramètres",
   "label.share-url": "URL de partage",
   "label.single-day": "Journée",
-  "label.start-step": "Start Step",
+  "label.start-step": "Etape de démarrage",
   "label.steps": "Étapes",
   "label.sum": "Somme",
   "label.tablet": "Tablette",
   "label.team": "Équipe",
   "label.team-id": "ID d'équipe",
-  "label.team-manager": "Team manager",
+  "label.team-manager": "Manager de l'équipe",
   "label.team-member": "Membre de l'équipe",
   "label.team-name": "Nom de l'équipe",
   "label.team-owner": "Propriétaire de l'équipe",
-  "label.team-view-only": "Team view only",
+  "label.team-view-only": "Vue d'équipe uniquement",
   "label.team-websites": "Sites d'équipes",
   "label.teams": "Équipes",
   "label.theme": "Thème",
@@ -209,14 +209,14 @@
   "label.type": "Type",
   "label.unique": "Unique",
   "label.unique-visitors": "Visiteurs uniques",
-  "label.uniqueCustomers": "Unique Customers",
+  "label.uniqueCustomers": "Clients uniques",
   "label.unknown": "Inconnu",
   "label.untitled": "Sans titre",
   "label.update": "Modifier",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Utilisateur",
-  "label.user-property": "User Property",
+  "label.user-property": "Propriétés d'utilisateurs",
   "label.username": "Nom d'utilisateur",
   "label.users": "Utilisateurs",
   "label.utm": "UTM",

From bc2f8bcdaee97282052ff03e6ae2c4615d84dc3c Mon Sep 17 00:00:00 2001
From: chelsey-g <97612806+chelsey-g@users.noreply.github.com>
Date: Wed, 6 Nov 2024 14:46:51 -0500
Subject: [PATCH 395/438] redirects to last selected team on login

---
 src/app/(main)/NavBar.tsx | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/app/(main)/NavBar.tsx b/src/app/(main)/NavBar.tsx
index 5e0e3da26b..53e25532b1 100644
--- a/src/app/(main)/NavBar.tsx
+++ b/src/app/(main)/NavBar.tsx
@@ -10,6 +10,8 @@ import TeamsButton from 'components/input/TeamsButton';
 import Icons from 'components/icons';
 import { useMessages, useNavigation, useTeamUrl } from 'components/hooks';
 import styles from './NavBar.module.css';
+import { useEffect } from 'react';
+import Cookies from 'js-cookie';
 
 export function NavBar() {
   const { formatMessage, labels } = useMessages();
@@ -74,10 +76,21 @@ export function NavBar() {
 
   const handleTeamChange = (teamId: string) => {
     const url = teamId ? `/teams/${teamId}` : '/';
-
+    Cookies.set('teamId', teamId);
     router.push(cloudMode ? `${process.env.cloudUrl}${url}` : url);
   };
 
+  useEffect(() => {
+    const teamIdCookie = Cookies.get('teamId');
+    if (teamIdCookie && pathname !== '/' && pathname !== '/dashboard') {
+      const url = '/';
+      router.push(cloudMode ? `${process.env.cloudUrl}${url}` : url);
+    } else if (teamIdCookie) {
+      const url = `/teams/${teamIdCookie}/dashboard`;
+      router.push(cloudMode ? `${process.env.cloudUrl}${url}` : url);
+    }
+  }, []);
+
   return (
     <div className={styles.navbar}>
       <div className={styles.logo}>

From 88b0e62d0bd226b8c983ba428c6d676c586ddae9 Mon Sep 17 00:00:00 2001
From: Michael Payne <10254938+michaelpayne02@users.noreply.github.com>
Date: Fri, 8 Nov 2024 17:38:33 -0600
Subject: [PATCH 396/438] add Cache-Control headers to tracking script

---
 next.config.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/next.config.js b/next.config.js
index b610eb2c83..50ce67f896 100644
--- a/next.config.js
+++ b/next.config.js
@@ -158,6 +158,16 @@ const config = {
         source: '/:path*',
         headers,
       },
+      {
+        source: '/script.js',
+        headers: [
+          ...headers,
+          {
+            key: 'Cache-Control',
+            value: 'public, max-age=86400, must-revalidate',
+          },
+        ],
+      },
     ];
   },
   async rewrites() {

From 378ba451a92f6c2d07564a28156ab43b071cea04 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Fri, 8 Nov 2024 19:55:51 -0800
Subject: [PATCH 397/438] Updated tracker docker script.

---
 scripts/update-tracker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/update-tracker.js b/scripts/update-tracker.js
index 4dcbf24572..736dc2efbc 100644
--- a/scripts/update-tracker.js
+++ b/scripts/update-tracker.js
@@ -6,7 +6,7 @@ const path = require('path');
 const endPoint = process.env.COLLECT_API_ENDPOINT;
 
 if (endPoint) {
-  const file = path.resolve(__dirname, '../public/script.js');
+  const file = path.resolve(__dirname, '../public/tracker.js');
 
   const tracker = fs.readFileSync(file);
 

From fe98d6ccb82b29c9839f53e59fad07e4dbedc42e Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Fri, 8 Nov 2024 19:56:33 -0800
Subject: [PATCH 398/438] Updated lang files.

---
 public/intl/messages/fr-FR.json | 34 ++++++-------
 public/intl/messages/ro-RO.json | 86 ++++++++++++++++-----------------
 2 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/public/intl/messages/fr-FR.json b/public/intl/messages/fr-FR.json
index 0bfe6e7a0e..ba620b6054 100644
--- a/public/intl/messages/fr-FR.json
+++ b/public/intl/messages/fr-FR.json
@@ -404,7 +404,7 @@
   "label.entry": [
     {
       "type": 0,
-      "value": "Entry URL"
+      "value": "URL d'entrée"
     }
   ],
   "label.event": [
@@ -476,7 +476,7 @@
   "label.first-seen": [
     {
       "type": 0,
-      "value": "First seen"
+      "value": "Vu pour la première fois"
     }
   ],
   "label.funnel": [
@@ -506,7 +506,7 @@
   "label.goals-description": [
     {
       "type": 0,
-      "value": "Track your goals for pageviews and events."
+      "value": "Suivez vos objectifs en matière de pages vues et d'événements."
     }
   ],
   "label.greater-than": [
@@ -590,7 +590,7 @@
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users navigate through your website."
+      "value": "Comprendre comment les utilisateurs naviguent sur votre site web."
     }
   ],
   "label.language": [
@@ -886,19 +886,19 @@
   "label.previous": [
     {
       "type": 0,
-      "value": "Previous"
+      "value": "Précédent"
     }
   ],
   "label.previous-period": [
     {
       "type": 0,
-      "value": "Previous period"
+      "value": "Période précédente"
     }
   ],
   "label.previous-year": [
     {
       "type": 0,
-      "value": "Previous year"
+      "value": "Année précédente"
     }
   ],
   "label.profile": [
@@ -910,13 +910,13 @@
   "label.properties": [
     {
       "type": 0,
-      "value": "Properties"
+      "value": "Propriétés"
     }
   ],
   "label.property": [
     {
       "type": 0,
-      "value": "Property"
+      "value": "Propriété"
     }
   ],
   "label.queries": [
@@ -1036,13 +1036,13 @@
   "label.revenue-description": [
     {
       "type": 0,
-      "value": "Look into your revenue across time."
+      "value": "Examinez vos revenus au fil du temps."
     }
   ],
   "label.revenue-property": [
     {
       "type": 0,
-      "value": "Revenue Property"
+      "value": "Propriétés des revenues"
     }
   ],
   "label.role": [
@@ -1078,7 +1078,7 @@
   "label.select": [
     {
       "type": 0,
-      "value": "Select"
+      "value": "Selectionner"
     }
   ],
   "label.select-date": [
@@ -1132,7 +1132,7 @@
   "label.start-step": [
     {
       "type": 0,
-      "value": "Start Step"
+      "value": "Etape de démarrage"
     }
   ],
   "label.steps": [
@@ -1168,7 +1168,7 @@
   "label.team-manager": [
     {
       "type": 0,
-      "value": "Team manager"
+      "value": "Manager de l'équipe"
     }
   ],
   "label.team-member": [
@@ -1192,7 +1192,7 @@
   "label.team-view-only": [
     {
       "type": 0,
-      "value": "Team view only"
+      "value": "Vue d'équipe uniquement"
     }
   ],
   "label.team-websites": [
@@ -1318,7 +1318,7 @@
   "label.uniqueCustomers": [
     {
       "type": 0,
-      "value": "Unique Customers"
+      "value": "Clients uniques"
     }
   ],
   "label.unknown": [
@@ -1360,7 +1360,7 @@
   "label.user-property": [
     {
       "type": 0,
-      "value": "User Property"
+      "value": "Propriétés d'utilisateurs"
     }
   ],
   "label.username": [
diff --git a/public/intl/messages/ro-RO.json b/public/intl/messages/ro-RO.json
index 1e5ac13af9..19541aca14 100644
--- a/public/intl/messages/ro-RO.json
+++ b/public/intl/messages/ro-RO.json
@@ -38,13 +38,13 @@
   "label.add-step": [
     {
       "type": 0,
-      "value": "Add step"
+      "value": "Adaugă pas"
     }
   ],
   "label.add-website": [
     {
       "type": 0,
-      "value": "Adăugare site web"
+      "value": "Adaugă site web"
     }
   ],
   "label.admin": [
@@ -152,7 +152,7 @@
   "label.compare": [
     {
       "type": 0,
-      "value": "Compare"
+      "value": "Compară"
     }
   ],
   "label.confirm": [
@@ -182,7 +182,7 @@
   "label.count": [
     {
       "type": 0,
-      "value": "Count"
+      "value": "Număr"
     }
   ],
   "label.countries": [
@@ -230,13 +230,13 @@
   "label.created-by": [
     {
       "type": 0,
-      "value": "Created By"
+      "value": "Creat de"
     }
   ],
   "label.current": [
     {
       "type": 0,
-      "value": "Current"
+      "value": "Curent"
     }
   ],
   "label.current-password": [
@@ -266,13 +266,13 @@
   "label.date": [
     {
       "type": 0,
-      "value": "Data"
+      "value": "Dată"
     }
   ],
   "label.date-range": [
     {
       "type": 0,
-      "value": "Interval de date"
+      "value": "Interval"
     }
   ],
   "label.day": [
@@ -284,7 +284,7 @@
   "label.default-date-range": [
     {
       "type": 0,
-      "value": "Interval de date implicit"
+      "value": "Interval implicit"
     }
   ],
   "label.delete": [
@@ -314,7 +314,7 @@
   "label.delete-website": [
     {
       "type": 0,
-      "value": "Ștergere site web"
+      "value": "Șterge site web"
     }
   ],
   "label.description": [
@@ -398,13 +398,13 @@
   "label.end-step": [
     {
       "type": 0,
-      "value": "End Step"
+      "value": "Pas final"
     }
   ],
   "label.entry": [
     {
       "type": 0,
-      "value": "Entry URL"
+      "value": "URL de intrare"
     }
   ],
   "label.event": [
@@ -428,7 +428,7 @@
   "label.exit": [
     {
       "type": 0,
-      "value": "Exit URL"
+      "value": "URL de ieșire"
     }
   ],
   "label.false": [
@@ -476,7 +476,7 @@
   "label.first-seen": [
     {
       "type": 0,
-      "value": "First seen"
+      "value": "Văzut pentru prima dată"
     }
   ],
   "label.funnel": [
@@ -494,19 +494,19 @@
   "label.goal": [
     {
       "type": 0,
-      "value": "Goal"
+      "value": "Obiectiv"
     }
   ],
   "label.goals": [
     {
       "type": 0,
-      "value": "Goals"
+      "value": "Obiective"
     }
   ],
   "label.goals-description": [
     {
       "type": 0,
-      "value": "Track your goals for pageviews and events."
+      "value": "Urmărește obiectivele de vizualizări și evenimente."
     }
   ],
   "label.greater-than": [
@@ -584,13 +584,13 @@
   "label.journey": [
     {
       "type": 0,
-      "value": "Journey"
+      "value": "Traseu"
     }
   ],
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users navigate through your website."
+      "value": "Înțelege cum navighează vizitatorii prin website."
     }
   ],
   "label.language": [
@@ -642,7 +642,7 @@
   "label.last-months": [
     {
       "type": 0,
-      "value": "Last "
+      "value": "Ultimele "
     },
     {
       "type": 1,
@@ -650,13 +650,13 @@
     },
     {
       "type": 0,
-      "value": " months"
+      "value": " luni"
     }
   ],
   "label.last-seen": [
     {
       "type": 0,
-      "value": "Last seen"
+      "value": "Văzut ultima dată"
     }
   ],
   "label.leave": [
@@ -876,13 +876,13 @@
   "label.path": [
     {
       "type": 0,
-      "value": "Path"
+      "value": "Rută"
     }
   ],
   "label.paths": [
     {
       "type": 0,
-      "value": "Paths"
+      "value": "Rute"
     }
   ],
   "label.powered-by": [
@@ -898,19 +898,19 @@
   "label.previous": [
     {
       "type": 0,
-      "value": "Previous"
+      "value": "Anterior"
     }
   ],
   "label.previous-period": [
     {
       "type": 0,
-      "value": "Previous period"
+      "value": "Perioda anterioară"
     }
   ],
   "label.previous-year": [
     {
       "type": 0,
-      "value": "Previous year"
+      "value": "Anul anterior"
     }
   ],
   "label.profile": [
@@ -922,13 +922,13 @@
   "label.properties": [
     {
       "type": 0,
-      "value": "Properties"
+      "value": "Proprietăți"
     }
   ],
   "label.property": [
     {
       "type": 0,
-      "value": "Property"
+      "value": "Proprietate"
     }
   ],
   "label.queries": [
@@ -1042,13 +1042,13 @@
   "label.revenue": [
     {
       "type": 0,
-      "value": "Revenue"
+      "value": "Venit"
     }
   ],
   "label.revenue-description": [
     {
       "type": 0,
-      "value": "Look into your revenue across time."
+      "value": "Urmărește venitul în timp."
     }
   ],
   "label.revenue-property": [
@@ -1114,7 +1114,7 @@
   "label.session": [
     {
       "type": 0,
-      "value": "Session"
+      "value": "Sesiune"
     }
   ],
   "label.sessions": [
@@ -1144,13 +1144,13 @@
   "label.start-step": [
     {
       "type": 0,
-      "value": "Start Step"
+      "value": "Pas de început"
     }
   ],
   "label.steps": [
     {
       "type": 0,
-      "value": "Steps"
+      "value": "Pași"
     }
   ],
   "label.sum": [
@@ -1174,13 +1174,13 @@
   "label.team-id": [
     {
       "type": 0,
-      "value": "ID Echipa"
+      "value": "ID Echipă"
     }
   ],
   "label.team-manager": [
     {
       "type": 0,
-      "value": "Team manager"
+      "value": "Manager echipă"
     }
   ],
   "label.team-member": [
@@ -1288,7 +1288,7 @@
   "label.transactions": [
     {
       "type": 0,
-      "value": "Transactions"
+      "value": "Tranzacții"
     }
   ],
   "label.transfer": [
@@ -1330,7 +1330,7 @@
   "label.uniqueCustomers": [
     {
       "type": 0,
-      "value": "Unique Customers"
+      "value": "Clienți unici"
     }
   ],
   "label.unknown": [
@@ -1372,7 +1372,7 @@
   "label.user-property": [
     {
       "type": 0,
-      "value": "User Property"
+      "value": "Proprietatea utilizatorului"
     }
   ],
   "label.username": [
@@ -1396,7 +1396,7 @@
   "label.utm-description": [
     {
       "type": 0,
-      "value": "Track your campaigns through UTM parameters."
+      "value": "Urmărește campaniile tale cu parametri UTM."
     }
   ],
   "label.value": [
@@ -1432,7 +1432,7 @@
   "label.views-per-visit": [
     {
       "type": 0,
-      "value": "Views per visit"
+      "value": "Vizualizări per vizită"
     }
   ],
   "label.visit-duration": [
@@ -1450,7 +1450,7 @@
   "label.visits": [
     {
       "type": 0,
-      "value": "Visits"
+      "value": "Vizite"
     }
   ],
   "label.website": [
@@ -1534,7 +1534,7 @@
   "message.collected-data": [
     {
       "type": 0,
-      "value": "Collected data"
+      "value": "Date colectate"
     }
   ],
   "message.confirm-delete": [

From 65c4627900a5cc4fc696fda714913e6de1a418c3 Mon Sep 17 00:00:00 2001
From: chelsey-g <97612806+chelsey-g@users.noreply.github.com>
Date: Mon, 11 Nov 2024 13:29:32 -0500
Subject: [PATCH 399/438] add active website tracking with pin icon

---
 .../(main)/dashboard/DashboardEdit.module.css | 17 +++++++++++++++++
 src/app/(main)/dashboard/DashboardEdit.tsx    | 19 +++++++++++++++++--
 .../websites/[websiteId]/WebsiteChartList.tsx | 15 +++++++--------
 src/assets/pushpin.svg                        |  8 ++++++++
 src/components/icons.ts                       |  2 ++
 src/store/dashboard.ts                        |  1 +
 6 files changed, 52 insertions(+), 10 deletions(-)
 create mode 100644 src/assets/pushpin.svg

diff --git a/src/app/(main)/dashboard/DashboardEdit.module.css b/src/app/(main)/dashboard/DashboardEdit.module.css
index febc551d44..cd498982e6 100644
--- a/src/app/(main)/dashboard/DashboardEdit.module.css
+++ b/src/app/(main)/dashboard/DashboardEdit.module.css
@@ -7,6 +7,19 @@
 
 .item {
   padding: 5px 0;
+  position: relative;
+}
+
+.pinActive {
+  position: absolute;
+  top: 10px;
+  right: 10px;
+  padding: 5px;
+}
+
+.pin {
+  width: 20px;
+  height: 20px;
 }
 
 .item h1 {
@@ -26,6 +39,10 @@
   background: var(--base50);
 }
 
+.websiteActive .text {
+  border: 1px solid var(--base800);
+}
+
 .active .text {
   border-color: var(--base600);
   box-shadow: 4px 4px 4px var(--base100);
diff --git a/src/app/(main)/dashboard/DashboardEdit.tsx b/src/app/(main)/dashboard/DashboardEdit.tsx
index d702612f6e..63cace7d67 100644
--- a/src/app/(main)/dashboard/DashboardEdit.tsx
+++ b/src/app/(main)/dashboard/DashboardEdit.tsx
@@ -2,6 +2,7 @@ import { useState, useMemo } from 'react';
 import { DragDropContext, Draggable, Droppable } from 'react-beautiful-dnd';
 import classNames from 'classnames';
 import { Button, Loading } from 'react-basics';
+import Icons from 'components/icons';
 import { firstBy } from 'thenby';
 import useDashboard, { saveDashboard } from 'store/dashboard';
 import { useMessages, useWebsites } from 'components/hooks';
@@ -11,9 +12,10 @@ const DRAG_ID = 'dashboard-website-ordering';
 
 export function DashboardEdit({ teamId }: { teamId: string }) {
   const settings = useDashboard();
-  const { websiteOrder } = settings;
+  const { websiteOrder, websiteActive } = settings;
   const { formatMessage, labels } = useMessages();
   const [order, setOrder] = useState(websiteOrder || []);
+  const [active, setActive] = useState(websiteActive || []);
   const {
     result,
     query: { isLoading },
@@ -40,19 +42,27 @@ export function DashboardEdit({ teamId }: { teamId: string }) {
     setOrder(orderedWebsites.map(website => website?.id || 0));
   }
 
+  function handleActiveWebsites(id: string) {
+    setActive(prevActive =>
+      prevActive.includes(id) ? prevActive.filter(a => a !== id) : [...prevActive, id],
+    );
+  }
+
   function handleSave() {
     saveDashboard({
       editing: false,
       websiteOrder: order,
+      websiteActive: active,
     });
   }
 
   function handleCancel() {
-    saveDashboard({ editing: false, websiteOrder });
+    saveDashboard({ editing: false, websiteOrder, websiteActive });
   }
 
   function handleReset() {
     setOrder([]);
+    setActive([]);
   }
 
   if (isLoading) {
@@ -88,11 +98,16 @@ export function DashboardEdit({ teamId }: { teamId: string }) {
                         ref={provided.innerRef}
                         className={classNames(styles.item, {
                           [styles.active]: snapshot.isDragging,
+                          [styles.websiteActive]: active.includes(id),
                         })}
                         {...provided.draggableProps}
                         {...provided.dragHandleProps}
+                        onClick={() => handleActiveWebsites(id)}
                       >
                         <div className={styles.text}>
+                          <div className={styles.pinActive}>
+                            {active.includes(id) ? <Icons.PushPin className={styles.pin} /> : null}
+                          </div>
                           <h1>{name}</h1>
                           <h2>{domain}</h2>
                         </div>
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteChartList.tsx b/src/app/(main)/websites/[websiteId]/WebsiteChartList.tsx
index 398fbf8fde..e33e948af0 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteChartList.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteChartList.tsx
@@ -18,17 +18,16 @@ export default function WebsiteChartList({
   limit?: number;
 }) {
   const { formatMessage, labels } = useMessages();
-  const { websiteOrder } = useDashboard();
+  const { websiteOrder, websiteActive } = useDashboard();
   const { renderTeamUrl } = useTeamUrl();
   const { dir } = useLocale();
 
-  const ordered = useMemo(
-    () =>
-      websites
-        .map(website => ({ ...website, order: websiteOrder.indexOf(website.id) || 0 }))
-        .sort(firstBy('order')),
-    [websites, websiteOrder],
-  );
+  const ordered = useMemo(() => {
+    return websites
+      .filter(website => (websiteActive.length ? websiteActive.includes(website.id) : true))
+      .map(website => ({ ...website, order: websiteOrder.indexOf(website.id) || 0 }))
+      .sort(firstBy('order'));
+  }, [websites, websiteOrder, websiteActive]);
 
   return (
     <div>
diff --git a/src/assets/pushpin.svg b/src/assets/pushpin.svg
new file mode 100644
index 0000000000..653a552d92
--- /dev/null
+++ b/src/assets/pushpin.svg
@@ -0,0 +1,8 @@
+ <svg
+      viewBox="0 0 1024 1024"
+      fill="currentColor"
+      height="1em"
+      width="1em"
+    >
+      <path d="M878.3 392.1L631.9 145.7c-6.5-6.5-15-9.7-23.5-9.7s-17 3.2-23.5 9.7L423.8 306.9c-12.2-1.4-24.5-2-36.8-2-73.2 0-146.4 24.1-206.5 72.3-15.4 12.3-16.6 35.4-2.7 49.4l181.7 181.7-215.4 215.2a15.8 15.8 0 00-4.6 9.8l-3.4 37.2c-.9 9.4 6.6 17.4 15.9 17.4.5 0 1 0 1.5-.1l37.2-3.4c3.7-.3 7.2-2 9.8-4.6l215.4-215.4 181.7 181.7c6.5 6.5 15 9.7 23.5 9.7 9.7 0 19.3-4.2 25.9-12.4 56.3-70.3 79.7-158.3 70.2-243.4l161.1-161.1c12.9-12.8 12.9-33.8 0-46.8z" />
+      </svg>
\ No newline at end of file
diff --git a/src/components/icons.ts b/src/components/icons.ts
index 422f042ab2..1cf26543bc 100644
--- a/src/components/icons.ts
+++ b/src/components/icons.ts
@@ -19,6 +19,7 @@ import Moon from 'assets/moon.svg';
 import Nodes from 'assets/nodes.svg';
 import Overview from 'assets/overview.svg';
 import Profile from 'assets/profile.svg';
+import PushPin from 'assets/pushpin.svg';
 import Reports from 'assets/reports.svg';
 import Sun from 'assets/sun.svg';
 import User from 'assets/user.svg';
@@ -47,6 +48,7 @@ const icons = {
   Nodes,
   Overview,
   Profile,
+  PushPin,
   Reports,
   Sun,
   User,
diff --git a/src/store/dashboard.ts b/src/store/dashboard.ts
index f667754288..801d53e1dc 100644
--- a/src/store/dashboard.ts
+++ b/src/store/dashboard.ts
@@ -6,6 +6,7 @@ export const initialState = {
   showCharts: true,
   limit: DEFAULT_WEBSITE_LIMIT,
   websiteOrder: [],
+  websiteActive: [],
   editing: false,
 };
 

From ac302c9a967c21a6bd99741c767ee7271f2c1595 Mon Sep 17 00:00:00 2001
From: chelsey-g <97612806+chelsey-g@users.noreply.github.com>
Date: Mon, 11 Nov 2024 15:10:07 -0500
Subject: [PATCH 400/438] replaces cookies with localStorage

---
 src/app/(main)/NavBar.tsx | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/app/(main)/NavBar.tsx b/src/app/(main)/NavBar.tsx
index 53e25532b1..f0280c4510 100644
--- a/src/app/(main)/NavBar.tsx
+++ b/src/app/(main)/NavBar.tsx
@@ -11,7 +11,6 @@ import Icons from 'components/icons';
 import { useMessages, useNavigation, useTeamUrl } from 'components/hooks';
 import styles from './NavBar.module.css';
 import { useEffect } from 'react';
-import Cookies from 'js-cookie';
 
 export function NavBar() {
   const { formatMessage, labels } = useMessages();
@@ -76,17 +75,17 @@ export function NavBar() {
 
   const handleTeamChange = (teamId: string) => {
     const url = teamId ? `/teams/${teamId}` : '/';
-    Cookies.set('teamId', teamId);
+    localStorage.setItem('teamId', teamId);
     router.push(cloudMode ? `${process.env.cloudUrl}${url}` : url);
   };
 
   useEffect(() => {
-    const teamIdCookie = Cookies.get('teamId');
-    if (teamIdCookie && pathname !== '/' && pathname !== '/dashboard') {
+    const teamIdLocal = localStorage.getItem('teamId');
+    if (teamIdLocal && pathname !== '/' && pathname !== '/dashboard') {
       const url = '/';
       router.push(cloudMode ? `${process.env.cloudUrl}${url}` : url);
-    } else if (teamIdCookie) {
-      const url = `/teams/${teamIdCookie}/dashboard`;
+    } else if (teamIdLocal) {
+      const url = `/teams/${teamIdLocal}/dashboard`;
       router.push(cloudMode ? `${process.env.cloudUrl}${url}` : url);
     }
   }, []);

From c50b0c9d422ec322084cdf094d02031cdd13b447 Mon Sep 17 00:00:00 2001
From: chelsey-g <97612806+chelsey-g@users.noreply.github.com>
Date: Mon, 11 Nov 2024 16:21:02 -0500
Subject: [PATCH 401/438] updated localStorage to next-basics

---
 src/app/(main)/NavBar.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/(main)/NavBar.tsx b/src/app/(main)/NavBar.tsx
index f0280c4510..f4123b0cb3 100644
--- a/src/app/(main)/NavBar.tsx
+++ b/src/app/(main)/NavBar.tsx
@@ -11,6 +11,7 @@ import Icons from 'components/icons';
 import { useMessages, useNavigation, useTeamUrl } from 'components/hooks';
 import styles from './NavBar.module.css';
 import { useEffect } from 'react';
+import { getItem, setItem } from 'next-basics';
 
 export function NavBar() {
   const { formatMessage, labels } = useMessages();
@@ -75,12 +76,12 @@ export function NavBar() {
 
   const handleTeamChange = (teamId: string) => {
     const url = teamId ? `/teams/${teamId}` : '/';
-    localStorage.setItem('teamId', teamId);
+    setItem('umami.team', { id: teamId });
     router.push(cloudMode ? `${process.env.cloudUrl}${url}` : url);
   };
 
   useEffect(() => {
-    const teamIdLocal = localStorage.getItem('teamId');
+    const teamIdLocal = getItem('umami.team')?.id;
     if (teamIdLocal && pathname !== '/' && pathname !== '/dashboard') {
       const url = '/';
       router.push(cloudMode ? `${process.env.cloudUrl}${url}` : url);

From 1a5ae45c580dcd73bfe6ae76d61f80fdd5b1537a Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Mon, 11 Nov 2024 23:18:55 -0800
Subject: [PATCH 402/438] Updated packages.

---
 yarn.lock | 716 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 373 insertions(+), 343 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 002e223352..348bf68f1e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1113,9 +1113,9 @@
     regenerator-runtime "^0.14.0"
 
 "@babel/runtime@^7.12.5":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.0.tgz#584c450063ffda59697021430cb47101b085951e"
-  integrity sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.26.0.tgz#8600c2f595f277c60815256418b85356a65173c1"
+  integrity sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==
   dependencies:
     regenerator-runtime "^0.14.0"
 
@@ -1199,17 +1199,17 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@clickhouse/client-common@1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@clickhouse/client-common/-/client-common-1.4.1.tgz#23c6ffbff5717729e533301c9f595cd79af221ef"
-  integrity sha512-f5eoTrUSDplrMoi3ddeZ0MzGTn0iGMByEQ8j63eVMoBSOI2+F6jEIPcW2tWofT79Rvnn3RRlveYcShiaIiCJyw==
+"@clickhouse/client-common@1.8.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@clickhouse/client-common/-/client-common-1.8.0.tgz#6775c4f1f4b56f393cbacec0a1b544dafcf8d5ed"
+  integrity sha512-aQgH0UODGuFHfL8rgeLSrGCoh3NCoNUs0tFGl0o79iyfASfvWtT/K/X3RM0QJpXXOgXpB//T2nD5XvCFtdk32w==
 
 "@clickhouse/client@^1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@clickhouse/client/-/client-1.4.1.tgz#be4303d81f42835c5f168de61babd1a67d821f5a"
-  integrity sha512-12iV+MeykxdQySRFHwaVU+hKUv3JP6kdwOI+z3zzyfPVYHynTlV8emJjjGZR0+VfRaj3PCMuQfryfsJ82nh9WQ==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@clickhouse/client/-/client-1.8.0.tgz#d891fae75efcf6e404ef1e810d4e2aceecabf8f4"
+  integrity sha512-IJ+/r3Wbg2t67sEtTA9dUgP2HjyGuze7ksNqeDfb7Ahnws1dzSVP2kg1Y9xOrb2e37K29JWWr26cX+rOiESm1A==
   dependencies:
-    "@clickhouse/client-common" "1.4.1"
+    "@clickhouse/client-common" "1.8.0"
 
 "@colors/colors@1.5.0":
   version "1.5.0"
@@ -1386,198 +1386,198 @@
   resolved "https://registry.yarnpkg.com/@date-fns/utc/-/utc-1.2.0.tgz#fb705b025b6769840608782c8fa7f3919d1b3337"
   integrity sha512-YLq+crMPJiBmIdkRmv9nZuZy1mVtMlDcUKlg4mvI0UsC/dZeIaGoGB5p/C4FrpeOhZ7zBTK03T58S0DFkRNMnw==
 
-"@dicebear/adventurer-neutral@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/adventurer-neutral/-/adventurer-neutral-9.2.1.tgz#0416ff71d0dd3ff391db9c9fda2acb166b074c5f"
-  integrity sha512-iP6Tc6CgrJt63j08i/hlyNiGEbDNgP9Ws6WKT9n/0oTU9X/DKLncGStV3uhgYPIOVQE/tw9a/GjbGjrwBlN8CQ==
-
-"@dicebear/adventurer@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/adventurer/-/adventurer-9.2.1.tgz#3d522d2aaabe17d172ea2302bfdf62d601ebcd64"
-  integrity sha512-utJr8oEOwPy9y+7rIOnB7mls+2XQrc3Kdlx/ay9KBY/HEUMnwMoN/GJhg4HcyGnV+DS7VhN6JSrnwwD9+SQyBw==
-
-"@dicebear/avataaars-neutral@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/avataaars-neutral/-/avataaars-neutral-9.2.1.tgz#61d3894f4d08d9ee3722f3a64c36725729c6aaf3"
-  integrity sha512-yceQMVBLimAHgZDL8VKCDGNs5JQ8BERaUMNIJXXRKEYZXlofoXZpYtcWPKQY9lmRJJznO1GX7ZK12ILnZjRPBQ==
-
-"@dicebear/avataaars@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/avataaars/-/avataaars-9.2.1.tgz#2460fb0d7d364a12e546b40b6e56c220db71c851"
-  integrity sha512-WIZL7CWSsmzLswY/4ZrgtE/7EvnaNrYreLyT8hjiGyVb9J4cQaVZXSMuDIGFa5wT062AW/4/i82kh/7nh0oL+w==
-
-"@dicebear/big-ears-neutral@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/big-ears-neutral/-/big-ears-neutral-9.2.1.tgz#dfee12787f8a0efa7b3552fca5e9f24c9102fc44"
-  integrity sha512-98qOCFEhbqCHeyO7ZXBAMMov8bquZt8vhtjj0YeHjGjI/OEWbA2gxq2ryv1BHSehVc/vTrd1KbHag7yYoeCDuw==
-
-"@dicebear/big-ears@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/big-ears/-/big-ears-9.2.1.tgz#4a7f2f3d987c11d76602b6ee8b398f9dcd2ce486"
-  integrity sha512-BUVTonwSYiGKcnk8wdwUHZ1b34GhfzRpG1kguK4kWAKlayBq7Q+iDJlmk4Bch0XdDQc2bqFf1GQCCj+xXWRHyg==
-
-"@dicebear/big-smile@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/big-smile/-/big-smile-9.2.1.tgz#d6cf95d34d65a393901925df370a1afbd0b0ae76"
-  integrity sha512-bspur+wtnlv/Z4QDvRWg9rs3snf+iuBkamkgw4nZOUFKMlZdPQGqNoh1DkycRcLXNX1Q61KM172K6bS60ZlKxw==
-
-"@dicebear/bottts-neutral@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/bottts-neutral/-/bottts-neutral-9.2.1.tgz#cc89b1ed834b7e8b7163dee2928dc1aa74077f75"
-  integrity sha512-uwd+xcbRQUIHKQ1iEiLjf5RwCaVzOfBgIu2WRE+6MUaahYi6cJ0eJAs0h1q+zpgYyvqPDPDAi9j7AUwjmig0GA==
-
-"@dicebear/bottts@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/bottts/-/bottts-9.2.1.tgz#922ccdba942d8c2c15655be0b6f25f4e9691cb80"
-  integrity sha512-AQQ/WKd54G9sa+TkQptcu6c+Tjfc9hitgB70uA5GqJe+w6Bal+gwY6kPm5sJ1CY2mk/UBh1rXBuauQZ25bgTcQ==
+"@dicebear/adventurer-neutral@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/adventurer-neutral/-/adventurer-neutral-9.2.2.tgz#2831c34c6e8818a319478b15b6b1741b95ef5bdb"
+  integrity sha512-XVAjhUWjav6luTZ7txz8zVJU/H0DiUy4uU1Z7IO5MDO6kWvum+If1+0OUgEWYZwM+RDI7rt2CgVP910DyZGd1w==
+
+"@dicebear/adventurer@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/adventurer/-/adventurer-9.2.2.tgz#cac7dddbd743078942df1391370191cbd235dde2"
+  integrity sha512-WjBXCP9EXbUul2zC3BS2/R3/4diw1uh/lU4jTEnujK1mhqwIwanFboIMzQsasNNL/xf+m3OHN7MUNJfHZ1fLZA==
+
+"@dicebear/avataaars-neutral@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/avataaars-neutral/-/avataaars-neutral-9.2.2.tgz#513369601d3e491b303c0760479da92b3f131883"
+  integrity sha512-pRj16P27dFDBI3LtdiHUDwIXIGndHAbZf5AxaMkn6/+0X93mVQ/btVJDXyW0G96WCsyC88wKAWr6/KJotPxU6Q==
+
+"@dicebear/avataaars@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/avataaars/-/avataaars-9.2.2.tgz#0c072c410ec5fdb8b5c5c7d440d038b02a42669e"
+  integrity sha512-WqJPQEt0OhBybTpI0TqU1uD1pSk9M2+VPIwvBye/dXo46b+0jHGpftmxjQwk6tX8z0+mRko8pwV5n+cWht1/+w==
+
+"@dicebear/big-ears-neutral@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/big-ears-neutral/-/big-ears-neutral-9.2.2.tgz#98906d453f49896f948b0d6d93c07e95ad057a9a"
+  integrity sha512-IPHt8fi3dv9cyfBJBZ4s8T+PhFCrQvOCf91iRHBT3iOLNPdyZpI5GNLmGiV0XMAvIDP5NvA5+f6wdoBLhYhbDA==
+
+"@dicebear/big-ears@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/big-ears/-/big-ears-9.2.2.tgz#66866ac6cfc4174ad875051892e40999e2f294a6"
+  integrity sha512-hz4UXdPq4qqZpu0YVvlqM4RDFhk5i0WgPcuwj/MOLlgTjuj63uHUhCQSk6ZiW1DQOs12qpwUBMGWVHxBRBas9g==
+
+"@dicebear/big-smile@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/big-smile/-/big-smile-9.2.2.tgz#6ba6b385c16da3f94ae414b641848cbd498e13bb"
+  integrity sha512-D4td0GL8or1nTNnXvZqkEXlzyqzGPWs3znOnm1HIohtFTeIwXm72Ob2lNDsaQJSJvXmVlwaQQ0CCTvyCl8Stjw==
+
+"@dicebear/bottts-neutral@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/bottts-neutral/-/bottts-neutral-9.2.2.tgz#6e48ba93d69f7d5f82a743834b7972e5c1c8d967"
+  integrity sha512-lSgpqmSJtlnyxVuUgNdBwyzuA0O9xa5zRJtz7x2KyWbicXir5iYdX0MVMCkp1EDvlcxm9rGJsclktugOyakTlw==
+
+"@dicebear/bottts@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/bottts/-/bottts-9.2.2.tgz#8f2587469a5f6fe1a69c4b4ef5504455c3a4dd68"
+  integrity sha512-wugFkzw8JNWV1nftq/Wp/vmQsLAXDxrMtRK3AoMODuUpSVoP3EHRUfKS043xggOsQFvoj0HZ7kadmhn0AMLf5A==
 
 "@dicebear/collection@^9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/collection/-/collection-9.2.1.tgz#b2de84ef654ac1550458a17049b02a0013213b92"
-  integrity sha512-Su1eygO8llKuJ68N+xhBCzBN2Lqrsx9ZNdlvfZeH/s70RjL0raNQaI6/hRABDmlbLYwW4AjRh2lOgDdGfCp5DQ==
-  dependencies:
-    "@dicebear/adventurer" "9.2.1"
-    "@dicebear/adventurer-neutral" "9.2.1"
-    "@dicebear/avataaars" "9.2.1"
-    "@dicebear/avataaars-neutral" "9.2.1"
-    "@dicebear/big-ears" "9.2.1"
-    "@dicebear/big-ears-neutral" "9.2.1"
-    "@dicebear/big-smile" "9.2.1"
-    "@dicebear/bottts" "9.2.1"
-    "@dicebear/bottts-neutral" "9.2.1"
-    "@dicebear/croodles" "9.2.1"
-    "@dicebear/croodles-neutral" "9.2.1"
-    "@dicebear/dylan" "9.2.1"
-    "@dicebear/fun-emoji" "9.2.1"
-    "@dicebear/glass" "9.2.1"
-    "@dicebear/icons" "9.2.1"
-    "@dicebear/identicon" "9.2.1"
-    "@dicebear/initials" "9.2.1"
-    "@dicebear/lorelei" "9.2.1"
-    "@dicebear/lorelei-neutral" "9.2.1"
-    "@dicebear/micah" "9.2.1"
-    "@dicebear/miniavs" "9.2.1"
-    "@dicebear/notionists" "9.2.1"
-    "@dicebear/notionists-neutral" "9.2.1"
-    "@dicebear/open-peeps" "9.2.1"
-    "@dicebear/personas" "9.2.1"
-    "@dicebear/pixel-art" "9.2.1"
-    "@dicebear/pixel-art-neutral" "9.2.1"
-    "@dicebear/rings" "9.2.1"
-    "@dicebear/shapes" "9.2.1"
-    "@dicebear/thumbs" "9.2.1"
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/collection/-/collection-9.2.2.tgz#1f8affc2c19c670b7696e7c23a2fe4072dc64af4"
+  integrity sha512-vZAmXhPWCK3sf8Fj9/QflFC6XOLroJOT5K1HdnzHaPboEvffUQideGCrrEamnJtlH0iF0ZDXh8gqmwy2fu+yHA==
+  dependencies:
+    "@dicebear/adventurer" "9.2.2"
+    "@dicebear/adventurer-neutral" "9.2.2"
+    "@dicebear/avataaars" "9.2.2"
+    "@dicebear/avataaars-neutral" "9.2.2"
+    "@dicebear/big-ears" "9.2.2"
+    "@dicebear/big-ears-neutral" "9.2.2"
+    "@dicebear/big-smile" "9.2.2"
+    "@dicebear/bottts" "9.2.2"
+    "@dicebear/bottts-neutral" "9.2.2"
+    "@dicebear/croodles" "9.2.2"
+    "@dicebear/croodles-neutral" "9.2.2"
+    "@dicebear/dylan" "9.2.2"
+    "@dicebear/fun-emoji" "9.2.2"
+    "@dicebear/glass" "9.2.2"
+    "@dicebear/icons" "9.2.2"
+    "@dicebear/identicon" "9.2.2"
+    "@dicebear/initials" "9.2.2"
+    "@dicebear/lorelei" "9.2.2"
+    "@dicebear/lorelei-neutral" "9.2.2"
+    "@dicebear/micah" "9.2.2"
+    "@dicebear/miniavs" "9.2.2"
+    "@dicebear/notionists" "9.2.2"
+    "@dicebear/notionists-neutral" "9.2.2"
+    "@dicebear/open-peeps" "9.2.2"
+    "@dicebear/personas" "9.2.2"
+    "@dicebear/pixel-art" "9.2.2"
+    "@dicebear/pixel-art-neutral" "9.2.2"
+    "@dicebear/rings" "9.2.2"
+    "@dicebear/shapes" "9.2.2"
+    "@dicebear/thumbs" "9.2.2"
 
 "@dicebear/core@^9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/core/-/core-9.2.1.tgz#b93800ac7e21ae955cceaa2370e7dc033a3cc557"
-  integrity sha512-Y3E59+3xO2UWKdf3Zt/rwMdy9r7uccTgM89Kv8aXN1vmdrnA4YYmr4jslRRRqPLVpenuT4105nkboC4rMnDgHw==
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/core/-/core-9.2.2.tgz#dcaf941e4d9e79046d466b3197dfa3393288e5b2"
+  integrity sha512-ROhgHG249dPtcXgBHcqPEsDeAPRPRD/9d+tZCjLYyueO+cXDlIA8dUlxpwIVcOuZFvCyW6RJtqo8BhNAi16pIQ==
   dependencies:
     "@types/json-schema" "^7.0.11"
 
-"@dicebear/croodles-neutral@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/croodles-neutral/-/croodles-neutral-9.2.1.tgz#379646cf53ba4d61b6c94c13b3ec3386359e3541"
-  integrity sha512-2iyr+B/y795P7cSIpFg4RjxUu6kljesKjtepvMzfeBR9xKyI84exBNHRoCTEVwOCFePmlPJX1qtw/YWM0sAPJw==
-
-"@dicebear/croodles@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/croodles/-/croodles-9.2.1.tgz#74fa6aa8c0ee0dc303c0ad82fd78f5d6cd66610d"
-  integrity sha512-V7+m21BizYTGgLgxmh5dxHHADeD3gkeuPYkhKqP8Uu8jZFBgh5wKFqqfVI/XSQkx/+lRla5c6l55mymgjt4k8Q==
-
-"@dicebear/dylan@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/dylan/-/dylan-9.2.1.tgz#997aff74b4bf112e4895463eeea0adc2456d332f"
-  integrity sha512-UeKz3Gxprh4bJ73Q2DjDpmjt854G3xfakc5KfeBmPV25EP+al7HCsM/HE+ZgKTSh+PPz5/mVtZQYU40pTzJEyg==
-
-"@dicebear/fun-emoji@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/fun-emoji/-/fun-emoji-9.2.1.tgz#e88c8c2db7927d732ef2d0af3a24c4d4152a7f02"
-  integrity sha512-F08p+Ggdxo4Ryji+3aCJXAKnjx4rM4UMtrJU4eA2t8lAkpwFNgfGK6mpMYPnxmKULYljGOgySmw7AyWcbX8s2Q==
-
-"@dicebear/glass@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/glass/-/glass-9.2.1.tgz#61bc231a5b0bd8d15cfa94c76ac608ab8fe98ac1"
-  integrity sha512-UoErQwg7/qkEKWyEDTyt8FYhw/aZryP0Tr7cwBEuxMXZ585NUTvEel0K5j9aDkBrimJVEM+jKzOFIIMAGLlR0g==
-
-"@dicebear/icons@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/icons/-/icons-9.2.1.tgz#0ef78e8ff742bd9985a3c36cd9cbd2705449e789"
-  integrity sha512-0VuWohGMiv4n1nxwehYi6w+PIT9OBRlV721yNoewQWgQCrnMKBvM0cFRX9Dtg+MvwLMslQCIU3pEauEZ5FNmFA==
-
-"@dicebear/identicon@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/identicon/-/identicon-9.2.1.tgz#aebd7b692de9a6601746ab47711359f81471841c"
-  integrity sha512-Dlqpn3tzqimR8KPIRkSJCKd5XwKgTLVXzT5KiY+2ysMZZQh4uJvBjVfY5SLrHDHC2a42W6EdwQxU6tFTRiKQuQ==
-
-"@dicebear/initials@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/initials/-/initials-9.2.1.tgz#d4e435c18e48837f97086ba5210d4742594ba181"
-  integrity sha512-d6Shnt1LiCf9yAEck3y/w4pXG4bWYVjBFCeI43l0BAR39Mk2Dq05UEFZH5Dtj2kyfNozMjh6vG1cQyBigtamug==
-
-"@dicebear/lorelei-neutral@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/lorelei-neutral/-/lorelei-neutral-9.2.1.tgz#5d5d6400c0e2232081f58f8d82efff00ee307b81"
-  integrity sha512-4YkkR697qXAYxN5N/zVsRe955QLhw0yLib2CzeBga1QXXMIkywq2nRFa3fr4toSRPl45kl1eF8J5HC17CU9inw==
-
-"@dicebear/lorelei@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/lorelei/-/lorelei-9.2.1.tgz#b23ddb02b098578ef1bcb121c7a638795f3de89e"
-  integrity sha512-DNjZpUpe/CxKK8Byn1meBvRz/NJWtBizcoS2DzIIyqPYOwA5cLIa2g/qKkESvXzU9naEMkiHfMZb1RYYzN2FAA==
-
-"@dicebear/micah@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/micah/-/micah-9.2.1.tgz#2e65fdb15b6ee6338123329c92e5afb98f694718"
-  integrity sha512-FK91igiVpPNhGCsfGpOgwYFKRP+FNR1V45Z4Tg/f82ux9TBdTmeoIfkgwrfhcXmCgagoYg2EAY+L72stUVapcA==
-
-"@dicebear/miniavs@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/miniavs/-/miniavs-9.2.1.tgz#de1e571663775b4b2a30944d8033d6a8b972aca3"
-  integrity sha512-r0TcaSrKJDPMqMYIiXNArq9i//cZzA1yuiXJw46iTloBDTh7yL1tpnL84CDxMpQ+OZLeMiRA6jVBx0coer4vmg==
-
-"@dicebear/notionists-neutral@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/notionists-neutral/-/notionists-neutral-9.2.1.tgz#2e77ae7330201628c4b3e4789b1aa83ffc684b82"
-  integrity sha512-Vi/FwMXzc1m/U2TjBnY9NHedoLbPc3BBsNQL8jPU27wdkXoyJHuXBevcUtsF0Zf8OuRbNpZKPbfYy6OYBr9qvw==
-
-"@dicebear/notionists@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/notionists/-/notionists-9.2.1.tgz#70aa14e8846a49096648f891a625a92b04513c75"
-  integrity sha512-oAyvPlp3xfFnDpW3nXhdAPGVm5WYj6VW6RgdzLAHoRO2EOYDNkQruIXd+d8JYo1DMTLUbgp3onr5AF9UU2OBzw==
-
-"@dicebear/open-peeps@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/open-peeps/-/open-peeps-9.2.1.tgz#dd9be6721ff7226e3a0286aec699fd6b0e0ad2b2"
-  integrity sha512-oPA/ljbPtuj2cdM0QtyJu2i24AaEMTIIk/FJbnrBK765WPnQcCZh84w+ZuInTMIfF9gYszNY34gaRD8Z6UiYxQ==
-
-"@dicebear/personas@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/personas/-/personas-9.2.1.tgz#dfa8291ebba098e8cebdeb04a4fba9e4384c4496"
-  integrity sha512-OgtyT9dnY8U60sUo0SLKCFVt0+dIr3a4vR0bDs/zwK4Qb/yTdB1VPdfxq0Fwk2q1vfn9YgbDrb0YYRgMRl60qQ==
-
-"@dicebear/pixel-art-neutral@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/pixel-art-neutral/-/pixel-art-neutral-9.2.1.tgz#457b4e038c9516e75d41c6c1efd9ff9d4099162a"
-  integrity sha512-GUtxJYX7/9XDgSZhkx24PB+yLcKkLHblDldvRr5xGlGxhgAovTBQFHLgCJxmUJgIaNW7pvSWCw7txguyxbBN9A==
-
-"@dicebear/pixel-art@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/pixel-art/-/pixel-art-9.2.1.tgz#e50bcc300a43c16ad3f69de1b6bf3dad92528274"
-  integrity sha512-ftKPKCvnS1cJ2OvuQLmtEIwdb9PzF5C2ofWBdVI/RFvhH1BhYc3OsdQ28o90+ZJQO4fivKwfsh8MPUTaqToQ7Q==
-
-"@dicebear/rings@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/rings/-/rings-9.2.1.tgz#ed6e930c02b09ebbd774fc104cffc5c23ffa6b4c"
-  integrity sha512-BlFYCaKB+wdpWWS28ZnQ/MvHeuNSRvkvWRoiw7pgS653LXx4kz/erVMmeVMSAr82y4BV+K8He2Rl2dMjuLyrXw==
-
-"@dicebear/shapes@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/shapes/-/shapes-9.2.1.tgz#e076b9aabd67bf611e9bbf7149919000e3d74197"
-  integrity sha512-cQzTcYimtuiAun55uPdIIhK53QTyjWqF/YN7LqEBGBqrJuGqHZBm1HXCcj7wPpoQ3zSy/2u8Rp0Etv7+5XFzyw==
-
-"@dicebear/thumbs@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/thumbs/-/thumbs-9.2.1.tgz#174be721256e5ff97e19586a54bde8fd25468e74"
-  integrity sha512-ziX5HFmhiApO2k7QKj41+dGXbMdmQUUgFBYPyzTwnubhkDldJk7tpRoa5u2OsyTVDQCcPMv5mFSQpbANfmFwMg==
+"@dicebear/croodles-neutral@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/croodles-neutral/-/croodles-neutral-9.2.2.tgz#8eec838892dd5c9d8646fea7b46b57fe6ce3cf78"
+  integrity sha512-/4mNirxoQ+z1kHXnpDRbJ1JV1ZgXogeTeNp0MaFYxocCgHfJ7ckNM23EE1I7akoo9pqPxrKlaeNzGAjKHdS9vA==
+
+"@dicebear/croodles@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/croodles/-/croodles-9.2.2.tgz#7b2e2b1337bde23b582a8f5a04ef334f4f8c898a"
+  integrity sha512-OzvAXQWsOgMwL3Sl+lBxCubqSOWoBJpC78c4TKnNTS21rR63TtXUyVdLLzgKVN4YHRnvMgtPf8F/W9YAgIDK4w==
+
+"@dicebear/dylan@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/dylan/-/dylan-9.2.2.tgz#5ad87ae8c36f4edfffd87ab5fdf0fb4570ba682e"
+  integrity sha512-s7e3XliC1YXP+Wykj+j5kwdOWFRXFzYHYk/PB4oZ1F3sJandXiG0HS4chaNu4EoP0yZgKyFMUVTGZx+o6tMaYg==
+
+"@dicebear/fun-emoji@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/fun-emoji/-/fun-emoji-9.2.2.tgz#9f6786dc96068e1c8728765e675ddc8c6201bc77"
+  integrity sha512-M+rYTpB3lfwz18f+/i+ggNwNWUoEj58SJqXJ1wr7Jh/4E5uL+NmJg9JGwYNaVtGbCFrKAjSaILNUWGQSFgMfog==
+
+"@dicebear/glass@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/glass/-/glass-9.2.2.tgz#6c878fb8d2f380e3797c51d322b0dd013ea4b4b6"
+  integrity sha512-imCMxcg+XScHYtQq2MUv1lCzhQSCUglMlPSezKEpXhTxgbgUpmGlSGVkOfmX5EEc7SQowKkF1W/1gNk6CXvBaQ==
+
+"@dicebear/icons@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/icons/-/icons-9.2.2.tgz#c56168b574829a988105e360bc379868227d925e"
+  integrity sha512-Tqq2OVCdS7J02DNw58xwlgLGl40sWEckbqXT3qRvIF63FfVq+wQZBGuhuiyAURcSgvsc3h2oQeYFi9iXh7HTOA==
+
+"@dicebear/identicon@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/identicon/-/identicon-9.2.2.tgz#9210f5bf117b568ea59a30f3290ad55d8ab93087"
+  integrity sha512-POVKFulIrcuZf3rdAgxYaSm2XUg/TJg3tg9zq9150reEGPpzWR7ijyJ03dzAADPzS3DExfdYVT9+z3JKwwJnTQ==
+
+"@dicebear/initials@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/initials/-/initials-9.2.2.tgz#f55fbcaa1a701b4c99251298f2e4c76e3ce8a260"
+  integrity sha512-/xNnsEmsstWjmF77htAOuwOMhFlP6eBVXgcgFlTl/CCH/Oc6H7t0vwX1he8KLQBBzjGpvJcvIAn4Wh9rE4D5/A==
+
+"@dicebear/lorelei-neutral@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/lorelei-neutral/-/lorelei-neutral-9.2.2.tgz#c7efaa5f4c7784863929a3b162a6c880920426ec"
+  integrity sha512-Eys9Os6nt2Xll7Mvu66CfRR2YggTopWcmFcRZ9pPdohS96kT0MsLI2iTcfZXQ51K8hvT3IbwoGc86W8n0cDxAQ==
+
+"@dicebear/lorelei@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/lorelei/-/lorelei-9.2.2.tgz#2be5e72f8bd8bdae90e005e743872f563e825965"
+  integrity sha512-koXqVr/vcWUPo00VP5H6Czsit+uF1tmwd2NK7Q/e34/9Sd1f4QLLxHjjBNm/iNjCI1+UNTOvZ2Qqu0N5eo7Flw==
+
+"@dicebear/micah@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/micah/-/micah-9.2.2.tgz#8cded41bc857089b6df7530b81f20cf43e5dc7be"
+  integrity sha512-NCajcJV5yw8uMKiACp694w1T/UyYme2CUEzyTzWHgWnQ+drAuCcH8gpAoLWd67viNdQB/MTpNlaelUgTjmI4AQ==
+
+"@dicebear/miniavs@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/miniavs/-/miniavs-9.2.2.tgz#b588faf88c4dbfc8ab9de31da364b2bb31dcad5b"
+  integrity sha512-vvkWXttdw+KHF3j+9qcUFzK+P0nbNnImGjvN48wwkPIh2h08WWFq0MnoOls4IHwUJC4GXBjWtiyVoCxz6hhtOA==
+
+"@dicebear/notionists-neutral@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/notionists-neutral/-/notionists-neutral-9.2.2.tgz#d7b7fb70a742e528ec67bbf9fe608af51406a0fc"
+  integrity sha512-AhOzk+lz6kB4uxGun8AJhV+W1nttnMlxmxd+5KbQ/txCIziYIaeD3il44wsAGegEpGFvAZyMYtR/jjfHcem3TA==
+
+"@dicebear/notionists@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/notionists/-/notionists-9.2.2.tgz#d70b86392a0830351f026d6893380e8c7bf87467"
+  integrity sha512-Z9orRaHoj7Y9Ap4wEu8XOrFACsG1KbbBQUPV1R50uh6AHwsyNrm4cS84ICoGLvxgLNHHOae3YCjd8aMu2z19zg==
+
+"@dicebear/open-peeps@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/open-peeps/-/open-peeps-9.2.2.tgz#6f7aa648f02f8a0f24107b1ffcd462c8a065f3eb"
+  integrity sha512-6PeQDHYyjvKrGSl/gP+RE5dSYAQGKpcGnM65HorgyTIugZK7STo0W4hvEycedupZ3MCCEH8x/XyiChKM2sHXog==
+
+"@dicebear/personas@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/personas/-/personas-9.2.2.tgz#02b6787d91d1af4ab358eb5a49fb30f40b9a62a3"
+  integrity sha512-705+ObNLC0w1fcgE/Utav+8bqO+Esu53TXegpX5j7trGEoIMf2bThqJGHuhknZ3+T2az3Wr89cGyOGlI0KLzLA==
+
+"@dicebear/pixel-art-neutral@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/pixel-art-neutral/-/pixel-art-neutral-9.2.2.tgz#2772edbff67fc993ecc9eb2c3099246f7a212f88"
+  integrity sha512-CdUY77H6Aj7dKLW3hdkv7tu0XQJArUjaWoXihQxlhl3oVYplWaoyu9omYy5pl8HTqs8YgVTGljjMXYoFuK0JUw==
+
+"@dicebear/pixel-art@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/pixel-art/-/pixel-art-9.2.2.tgz#6416f61e1c2825db516b6c467ce47596f9f865b8"
+  integrity sha512-BvbFdrpzQl04+Y9UsWP63YGug+ENGC7GMG88qbEFWxb/IqRavGa4H3D0T4Zl2PSLiw7f2Ctv98bsCQZ1PtCznQ==
+
+"@dicebear/rings@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/rings/-/rings-9.2.2.tgz#731b55b4a1442ae3edf89387841dc147181906a6"
+  integrity sha512-eD1J1k364Arny+UlvGrk12HP/XGG6WxPSm4BarFqdJGSV45XOZlwqoi7FlcMr9r9yvE/nGL8OizbwMYusEEdjw==
+
+"@dicebear/shapes@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/shapes/-/shapes-9.2.2.tgz#440d1d97882bd476499d95e5180c04e30d721bc1"
+  integrity sha512-e741NNWBa7fg0BjomxXa0fFPME2XCIR0FA+VHdq9AD2taTGHEPsg5x1QJhCRdK6ww85yeu3V3ucpZXdSrHVw5Q==
+
+"@dicebear/thumbs@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/thumbs/-/thumbs-9.2.2.tgz#234814c889509682992bd3f93daaa960cb5326a2"
+  integrity sha512-FkPLDNu7n5kThLSk7lR/0cz/NkUqgGdZGfLZv6fLkGNGtv6W+e2vZaO7HCXVwIgJ+II+kImN41zVIZ6Jlll7pQ==
 
 "@esbuild/android-arm64@0.17.19":
   version "0.17.19"
@@ -1770,20 +1770,21 @@
   dependencies:
     tslib "^2.0.1"
 
-"@formatjs/ecma402-abstract@2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-2.0.0.tgz#39197ab90b1c78b7342b129a56a7acdb8f512e17"
-  integrity sha512-rRqXOqdFmk7RYvj4khklyqzcfQl9vEL/usogncBHRZfZBDOwMGuSRNFl02fu5KGHXdbinju+YXyuR+Nk8xlr/g==
+"@formatjs/ecma402-abstract@2.2.3":
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-2.2.3.tgz#dc5a032e1971c709b32b9ab511fa35504a7d3bc9"
+  integrity sha512-aElGmleuReGnk2wtYOzYFmNWYoiWWmf1pPPCYg0oiIQSJj0mjc4eUfzUXaSOJ4S8WzI/cLqnCTWjqz904FT2OQ==
   dependencies:
-    "@formatjs/intl-localematcher" "0.5.4"
-    tslib "^2.4.0"
+    "@formatjs/fast-memoize" "2.2.3"
+    "@formatjs/intl-localematcher" "0.5.7"
+    tslib "2"
 
-"@formatjs/fast-memoize@2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-2.2.0.tgz#33bd616d2e486c3e8ef4e68c99648c196887802b"
-  integrity sha512-hnk/nY8FyrL5YxwP9e4r9dqeM6cAbo8PeU9UjyXojZMNvVad2Z06FAVHyR3Ecw6fza+0GH7vdJgiKIVXTMbSBA==
+"@formatjs/fast-memoize@2.2.3":
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-2.2.3.tgz#74e64109279d5244f9fc281f3ae90c407cece823"
+  integrity sha512-3jeJ+HyOfu8osl3GNSL4vVHUuWFXR03Iz9jjgI7RwjG6ysu/Ymdr0JRCPHfF5yGbTE6JCrd63EpvX1/WybYRbA==
   dependencies:
-    tslib "^2.4.0"
+    tslib "2"
 
 "@formatjs/icu-messageformat-parser@2.1.0":
   version "2.1.0"
@@ -1794,14 +1795,14 @@
     "@formatjs/icu-skeleton-parser" "1.3.6"
     tslib "^2.1.0"
 
-"@formatjs/icu-messageformat-parser@2.7.8":
-  version "2.7.8"
-  resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.7.8.tgz#f6d7643001e9bb5930d812f1f9a9856f30fa0343"
-  integrity sha512-nBZJYmhpcSX0WeJ5SDYUkZ42AgR3xiyhNCsQweFx3cz/ULJjym8bHAzWKvG5e2+1XO98dBYC0fWeeAECAVSwLA==
+"@formatjs/icu-messageformat-parser@2.9.3":
+  version "2.9.3"
+  resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.9.3.tgz#7785cb48ba980ebcbe67a0a3fe12837032b95518"
+  integrity sha512-9L99QsH14XjOCIp4TmbT8wxuffJxGK8uLNO1zNhLtcZaVXvv626N0s4A2qgRCKG3dfYWx9psvGlFmvyVBa6u/w==
   dependencies:
-    "@formatjs/ecma402-abstract" "2.0.0"
-    "@formatjs/icu-skeleton-parser" "1.8.2"
-    tslib "^2.4.0"
+    "@formatjs/ecma402-abstract" "2.2.3"
+    "@formatjs/icu-skeleton-parser" "1.8.7"
+    tslib "2"
 
 "@formatjs/icu-skeleton-parser@1.3.6":
   version "1.3.6"
@@ -1811,31 +1812,31 @@
     "@formatjs/ecma402-abstract" "1.11.4"
     tslib "^2.1.0"
 
-"@formatjs/icu-skeleton-parser@1.8.2":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.2.tgz#2252c949ae84ee66930e726130ea66731a123c9f"
-  integrity sha512-k4ERKgw7aKGWJZgTarIcNEmvyTVD9FYh0mTrrBMHZ1b8hUu6iOJ4SzsZlo3UNAvHYa+PnvntIwRPt1/vy4nA9Q==
+"@formatjs/icu-skeleton-parser@1.8.7":
+  version "1.8.7"
+  resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.7.tgz#c0c21d75428bf7213ac23a0efbf4dbfa868b800d"
+  integrity sha512-fI+6SmS2g7h3srfAKSWa5dwreU5zNEfon2uFo99OToiLF6yxGE+WikvFSbsvMAYkscucvVmTYNlWlaDPp0n5HA==
   dependencies:
-    "@formatjs/ecma402-abstract" "2.0.0"
-    tslib "^2.4.0"
+    "@formatjs/ecma402-abstract" "2.2.3"
+    tslib "2"
 
-"@formatjs/intl-displaynames@6.6.8":
-  version "6.6.8"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-6.6.8.tgz#2f5afac8df83167f5a6ef8543600eaf1ef99c885"
-  integrity sha512-Lgx6n5KxN16B3Pb05z3NLEBQkGoXnGjkTBNCZI+Cn17YjHJ3fhCeEJJUqRlIZmJdmaXQhjcQVDp6WIiNeRYT5g==
+"@formatjs/intl-displaynames@6.8.4":
+  version "6.8.4"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-6.8.4.tgz#5fbfa6fa08fd306bf4ed6f056eba12a71404cbbd"
+  integrity sha512-HDVNBspDAOW0yTWluWTPHX2fk/9iBO4oST4R96f/IUaPGsFtjsHrpakwc+XDRPa3U5RniSEU2z34ZY0W78+E6Q==
   dependencies:
-    "@formatjs/ecma402-abstract" "2.0.0"
-    "@formatjs/intl-localematcher" "0.5.4"
-    tslib "^2.4.0"
+    "@formatjs/ecma402-abstract" "2.2.3"
+    "@formatjs/intl-localematcher" "0.5.7"
+    tslib "2"
 
-"@formatjs/intl-listformat@7.5.7":
-  version "7.5.7"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-7.5.7.tgz#125e05105fabd1ae5f11881d6ab74484f2098ee4"
-  integrity sha512-MG2TSChQJQT9f7Rlv+eXwUFiG24mKSzmF144PLb8m8OixyXqn4+YWU+5wZracZGCgVTVmx8viCf7IH3QXoiB2g==
+"@formatjs/intl-listformat@7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-7.7.4.tgz#a102e418f4b7846317e8835a31eecd670c428d0a"
+  integrity sha512-lipFspH2MZcoeXxR6WSR/Jy9unzJ/iT0w+gbL8vgv25Ap0S9cUtcDVAce4ECEKI1bDtAvEU3b6+9Dha27gAikA==
   dependencies:
-    "@formatjs/ecma402-abstract" "2.0.0"
-    "@formatjs/intl-localematcher" "0.5.4"
-    tslib "^2.4.0"
+    "@formatjs/ecma402-abstract" "2.2.3"
+    "@formatjs/intl-localematcher" "0.5.7"
+    tslib "2"
 
 "@formatjs/intl-localematcher@0.2.25":
   version "0.2.25"
@@ -1844,12 +1845,12 @@
   dependencies:
     tslib "^2.1.0"
 
-"@formatjs/intl-localematcher@0.5.4":
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.5.4.tgz#caa71f2e40d93e37d58be35cfffe57865f2b366f"
-  integrity sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g==
+"@formatjs/intl-localematcher@0.5.7":
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.5.7.tgz#f889d076881b785d11ff993b966f527d199436d0"
+  integrity sha512-GGFtfHGQVFe/niOZp24Kal5b2i36eE2bNL0xi9Sg/yd0TR8aLjcteApZdHmismP5QQax1cMnZM9yWySUUjJteA==
   dependencies:
-    tslib "^2.4.0"
+    tslib "2"
 
 "@formatjs/intl-numberformat@^5.5.2":
   version "5.7.6"
@@ -1859,18 +1860,18 @@
     "@formatjs/ecma402-abstract" "1.4.0"
     tslib "^2.0.1"
 
-"@formatjs/intl@2.10.4":
-  version "2.10.4"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-2.10.4.tgz#e1819e0858fb05ca65923a020f346bc74e894e92"
-  integrity sha512-56483O+HVcL0c7VucAS2tyH020mt9XTozZO67cwtGg0a7KWDukS/FzW3OnvaHmTHDuYsoPIzO+ZHVfU6fT/bJw==
-  dependencies:
-    "@formatjs/ecma402-abstract" "2.0.0"
-    "@formatjs/fast-memoize" "2.2.0"
-    "@formatjs/icu-messageformat-parser" "2.7.8"
-    "@formatjs/intl-displaynames" "6.6.8"
-    "@formatjs/intl-listformat" "7.5.7"
-    intl-messageformat "10.5.14"
-    tslib "^2.4.0"
+"@formatjs/intl@2.10.14":
+  version "2.10.14"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-2.10.14.tgz#3de1c6dfb39c286a4f48125740d45a5cb4dc3923"
+  integrity sha512-4CA1EO75i/mSMHdjwfpgRj3Rsdsm6WjALeu/nlzYhBmAPxGu/Ha5GIRHAet5SO05TnpmqxmEGOsskWqFm0IeoA==
+  dependencies:
+    "@formatjs/ecma402-abstract" "2.2.3"
+    "@formatjs/fast-memoize" "2.2.3"
+    "@formatjs/icu-messageformat-parser" "2.9.3"
+    "@formatjs/intl-displaynames" "6.8.4"
+    "@formatjs/intl-listformat" "7.7.4"
+    intl-messageformat "10.7.6"
+    tslib "2"
 
 "@formatjs/ts-transformer@3.9.4":
   version "3.9.4"
@@ -2326,50 +2327,50 @@
   dependencies:
     "@prisma/debug" "5.17.0"
 
-"@react-spring/animated@~9.7.4":
-  version "9.7.4"
-  resolved "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.7.4.tgz#c712b2d3dc9312ef41aa8886818b539151bda062"
-  integrity sha512-7As+8Pty2QlemJ9O5ecsuPKjmO0NKvmVkRR1n6mEotFgWar8FKuQt2xgxz3RTgxcccghpx1YdS1FCdElQNexmQ==
+"@react-spring/animated@~9.7.5":
+  version "9.7.5"
+  resolved "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.7.5.tgz#eb0373aaf99b879736b380c2829312dae3b05f28"
+  integrity sha512-Tqrwz7pIlsSDITzxoLS3n/v/YCUHQdOIKtOJf4yL6kYVSDTSmVK1LI1Q3M/uu2Sx4X3pIWF3xLUhlsA6SPNTNg==
   dependencies:
-    "@react-spring/shared" "~9.7.4"
-    "@react-spring/types" "~9.7.4"
+    "@react-spring/shared" "~9.7.5"
+    "@react-spring/types" "~9.7.5"
 
-"@react-spring/core@~9.7.4":
-  version "9.7.4"
-  resolved "https://registry.yarnpkg.com/@react-spring/core/-/core-9.7.4.tgz#0eaa0b5da3d18036d87a571f23079819d45a9f46"
-  integrity sha512-GzjA44niEJBFUe9jN3zubRDDDP2E4tBlhNlSIkTChiNf9p4ZQlgXBg50qbXfSXHQPHak/ExYxwhipKVsQ/sUTw==
+"@react-spring/core@~9.7.5":
+  version "9.7.5"
+  resolved "https://registry.yarnpkg.com/@react-spring/core/-/core-9.7.5.tgz#72159079f52c1c12813d78b52d4f17c0bf6411f7"
+  integrity sha512-rmEqcxRcu7dWh7MnCcMXLvrf6/SDlSokLaLTxiPlAYi11nN3B5oiCUAblO72o+9z/87j2uzxa2Inm8UbLjXA+w==
   dependencies:
-    "@react-spring/animated" "~9.7.4"
-    "@react-spring/shared" "~9.7.4"
-    "@react-spring/types" "~9.7.4"
+    "@react-spring/animated" "~9.7.5"
+    "@react-spring/shared" "~9.7.5"
+    "@react-spring/types" "~9.7.5"
 
-"@react-spring/rafz@~9.7.4":
-  version "9.7.4"
-  resolved "https://registry.yarnpkg.com/@react-spring/rafz/-/rafz-9.7.4.tgz#d53aa45a8cb116b81b27ba29e0cc15470ccfd449"
-  integrity sha512-mqDI6rW0Ca8IdryOMiXRhMtVGiEGLIO89vIOyFQXRIwwIMX30HLya24g9z4olDvFyeDW3+kibiKwtZnA4xhldA==
+"@react-spring/rafz@~9.7.5":
+  version "9.7.5"
+  resolved "https://registry.yarnpkg.com/@react-spring/rafz/-/rafz-9.7.5.tgz#ee7959676e7b5d6a3813e8c17d5e50df98b95df9"
+  integrity sha512-5ZenDQMC48wjUzPAm1EtwQ5Ot3bLIAwwqP2w2owG5KoNdNHpEJV263nGhCeKKmuA3vG2zLLOdu3or6kuDjA6Aw==
 
-"@react-spring/shared@~9.7.4":
-  version "9.7.4"
-  resolved "https://registry.yarnpkg.com/@react-spring/shared/-/shared-9.7.4.tgz#8ac57505072c2aee33d77c47c4269347061a3377"
-  integrity sha512-bEPI7cQp94dOtCFSEYpxvLxj0+xQfB5r9Ru1h8OMycsIq7zFZon1G0sHrBLaLQIWeMCllc4tVDYRTLIRv70C8w==
+"@react-spring/shared@~9.7.5":
+  version "9.7.5"
+  resolved "https://registry.yarnpkg.com/@react-spring/shared/-/shared-9.7.5.tgz#6d513622df6ad750bbbd4dedb4ca0a653ec92073"
+  integrity sha512-wdtoJrhUeeyD/PP/zo+np2s1Z820Ohr/BbuVYv+3dVLW7WctoiN7std8rISoYoHpUXtbkpesSKuPIw/6U1w1Pw==
   dependencies:
-    "@react-spring/rafz" "~9.7.4"
-    "@react-spring/types" "~9.7.4"
+    "@react-spring/rafz" "~9.7.5"
+    "@react-spring/types" "~9.7.5"
 
-"@react-spring/types@~9.7.4":
-  version "9.7.4"
-  resolved "https://registry.yarnpkg.com/@react-spring/types/-/types-9.7.4.tgz#c849a7f062b5163d078e5e75f28c8f6acf91792e"
-  integrity sha512-iQVztO09ZVfsletMiY+DpT/JRiBntdsdJ4uqk3UJFhrhS8mIC9ZOZbmfGSRs/kdbNPQkVyzucceDicQ/3Mlj9g==
+"@react-spring/types@~9.7.5":
+  version "9.7.5"
+  resolved "https://registry.yarnpkg.com/@react-spring/types/-/types-9.7.5.tgz#e5dd180f3ed985b44fd2cd2f32aa9203752ef3e8"
+  integrity sha512-HVj7LrZ4ReHWBimBvu2SKND3cDVUPWKLqRTmWe/fNY6o1owGOX0cAHbdPDTMelgBlVbrTKrre6lFkhqGZErK/g==
 
 "@react-spring/web@^9.7.3":
-  version "9.7.4"
-  resolved "https://registry.yarnpkg.com/@react-spring/web/-/web-9.7.4.tgz#0086ab5dcf17e6a8f3d7e7f8041ccb4cc2fa10dc"
-  integrity sha512-UMvCZp7I5HCVIleSa4BwbNxynqvj+mJjG2m20VO2yPoi2pnCYANy58flvz9v/YcXTAvsmL655FV3pm5fbr6akA==
+  version "9.7.5"
+  resolved "https://registry.yarnpkg.com/@react-spring/web/-/web-9.7.5.tgz#7d7782560b3a6fb9066b52824690da738605de80"
+  integrity sha512-lmvqGwpe+CSttsWNZVr+Dg62adtKhauGwLyGE/RRyZ8AAMLgb9x3NDMA5RMElXo+IMyTkPp7nxTB8ZQlmhb6JQ==
   dependencies:
-    "@react-spring/animated" "~9.7.4"
-    "@react-spring/core" "~9.7.4"
-    "@react-spring/shared" "~9.7.4"
-    "@react-spring/types" "~9.7.4"
+    "@react-spring/animated" "~9.7.5"
+    "@react-spring/core" "~9.7.5"
+    "@react-spring/shared" "~9.7.5"
+    "@react-spring/types" "~9.7.5"
 
 "@redis/bloom@1.2.0":
   version "1.2.0"
@@ -2627,17 +2628,17 @@
     "@swc/counter" "^0.1.3"
     tslib "^2.4.0"
 
-"@tanstack/query-core@5.51.21":
-  version "5.51.21"
-  resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-5.51.21.tgz#a510469c6c30d3de2a8b8798e340169a4b0fd08f"
-  integrity sha512-POQxm42IUp6n89kKWF4IZi18v3fxQWFRolvBA6phNVmA8psdfB1MvDnGacCJdS+EOX12w/CyHM62z//rHmYmvw==
+"@tanstack/query-core@5.59.20":
+  version "5.59.20"
+  resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-5.59.20.tgz#356718976536727b9af0ad1163a21fd6a44ee0a9"
+  integrity sha512-e8vw0lf7KwfGe1if4uPFhvZRWULqHjFcz3K8AebtieXvnMOz5FSzlZe3mTLlPuUBcydCnBRqYs2YJ5ys68wwLg==
 
 "@tanstack/react-query@^5.28.6":
-  version "5.51.23"
-  resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-5.51.23.tgz#83c223f4cb6054b206de8856b73ca7e41a63ba1f"
-  integrity sha512-CfJCfX45nnVIZjQBRYYtvVMIsGgWLKLYC4xcUiYEey671n1alvTZoCBaU9B85O8mF/tx9LPyrI04A6Bs2THv4A==
+  version "5.59.20"
+  resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-5.59.20.tgz#bacf1983f44c5690bb99b518f2ef71dc2fa875a4"
+  integrity sha512-Zly0egsK0tFdfSbh5/mapSa+Zfc3Et0Zkar7Wo5sQkFzWyB3p3uZWOHR2wrlAEEV2L953eLuDBtbgFvMYiLvUw==
   dependencies:
-    "@tanstack/query-core" "5.51.21"
+    "@tanstack/query-core" "5.59.20"
 
 "@trysound/sax@0.2.0":
   version "0.2.0"
@@ -2761,18 +2762,18 @@
   dependencies:
     "@types/node" "*"
 
-"@types/hoist-non-react-statics@^3.3.0":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.4.tgz#cc477ce0283bb9d19ea0cbfa2941fe2c8493a1be"
-  integrity sha512-ZchYkbieA+7tnxwX/SCBySx9WwvWR8TaP5tb2jRAzwvLb/rWchGw3v0w3pqUbUvj0GCwW2Xz/AVPSk6kUGctXQ==
+"@types/hoist-non-react-statics@3":
+  version "3.3.5"
+  resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz#dab7867ef789d87e2b4b0003c9d65c49cc44a494"
+  integrity sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==
   dependencies:
     "@types/react" "*"
     hoist-non-react-statics "^3.3.0"
 
-"@types/hoist-non-react-statics@^3.3.1":
-  version "3.3.5"
-  resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz#dab7867ef789d87e2b4b0003c9d65c49cc44a494"
-  integrity sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==
+"@types/hoist-non-react-statics@^3.3.0":
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.4.tgz#cc477ce0283bb9d19ea0cbfa2941fe2c8493a1be"
+  integrity sha512-ZchYkbieA+7tnxwX/SCBySx9WwvWR8TaP5tb2jRAzwvLb/rWchGw3v0w3pqUbUvj0GCwW2Xz/AVPSk6kUGctXQ==
   dependencies:
     "@types/react" "*"
     hoist-non-react-statics "^3.3.0"
@@ -2874,9 +2875,9 @@
   integrity sha512-ehPtgRgaULsFG8x0NeYJvmyH1hmlfsNLujHe9dQEia/7MAJYdzMSi19JtchUHjmBA6XC/75dK55mzZH+RyieSg==
 
 "@types/prop-types@*":
-  version "15.7.12"
-  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.12.tgz#12bb1e2be27293c1406acb6af1c3f3a1481d98c6"
-  integrity sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==
+  version "15.7.13"
+  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.13.tgz#2af91918ee12d9d32914feb13f5326658461b451"
+  integrity sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA==
 
 "@types/react-dom@^18.2.17":
   version "18.3.0"
@@ -2902,7 +2903,15 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@16 || 17 || 18", "@types/react@^18.2.41":
+"@types/react@*", "@types/react@16 || 17 || 18":
+  version "18.3.12"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.12.tgz#99419f182ccd69151813b7ee24b792fe08774f60"
+  integrity sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==
+  dependencies:
+    "@types/prop-types" "*"
+    csstype "^3.0.2"
+
+"@types/react@^18.2.41":
   version "18.3.3"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.3.tgz#9679020895318b0915d7a3ab004d92d33375c45f"
   integrity sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==
@@ -3933,9 +3942,9 @@ charenc@0.0.2:
   integrity sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==
 
 chart.js@^4.4.2:
-  version "4.4.3"
-  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-4.4.3.tgz#3b2e11e7010fefa99b07d0349236f5098e5226ad"
-  integrity sha512-qK1gkGSRYcJzqrrzdR6a+I0vQ4/R+SoODXyAjscQ/4mzuNzySaMCd+hyVxitSY1+L2fjPD1Gbn+ibNqRmwQeLw==
+  version "4.4.6"
+  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-4.4.6.tgz#da39b84ca752298270d4c0519675c7659936abec"
+  integrity sha512-8Y406zevUPbbIBA/HRk33khEmQPk5+cxeflWE/2rx1NJsjVWMPw/9mSP9rxHP5eqi6LNoPBVMfZHxbwLSgldYA==
   dependencies:
     "@kurkle/color" "^0.3.0"
 
@@ -4206,7 +4215,7 @@ cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
+cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -4215,6 +4224,15 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
+cross-spawn@^7.0.3:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.5.tgz#910aac880ff5243da96b728bc6521a5f6c2f2f82"
+  integrity sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
 crypt@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
@@ -4649,13 +4667,20 @@ debug@^3.1.0, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.1, debug@^4.3.4:
+debug@^4.1.1:
   version "4.3.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b"
   integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==
   dependencies:
     ms "2.1.2"
 
+debug@^4.3.4:
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
+  integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
+  dependencies:
+    ms "^2.1.3"
+
 decamelize-keys@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8"
@@ -6107,7 +6132,7 @@ hasown@^2.0.0, hasown@^2.0.1, hasown@^2.0.2:
   dependencies:
     function-bind "^1.1.2"
 
-hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
+hoist-non-react-statics@3, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
   integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
@@ -6297,15 +6322,15 @@ intl-messageformat-parser@^5.3.7:
   dependencies:
     "@formatjs/intl-numberformat" "^5.5.2"
 
-intl-messageformat@10.5.14:
-  version "10.5.14"
-  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.5.14.tgz#e5bb373f8a37b88fbe647d7b941f3ab2a37ed00a"
-  integrity sha512-IjC6sI0X7YRjjyVH9aUgdftcmZK7WXdHeil4KwbjDnRWjnVitKpAx3rr6t6di1joFp5188VqKcobOPA6mCLG/w==
+intl-messageformat@10.7.6:
+  version "10.7.6"
+  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.7.6.tgz#d486c780508a2fb8c383e95462951276cf0bcdf4"
+  integrity sha512-IsMU/hqyy3FJwNJ0hxDfY2heJ7MteSuFvcnCebxRp67di4Fhx1gKKE+qS0bBwUF8yXkX9SsPUhLeX/B6h5SKUA==
   dependencies:
-    "@formatjs/ecma402-abstract" "2.0.0"
-    "@formatjs/fast-memoize" "2.2.0"
-    "@formatjs/icu-messageformat-parser" "2.7.8"
-    tslib "^2.4.0"
+    "@formatjs/ecma402-abstract" "2.2.3"
+    "@formatjs/fast-memoize" "2.2.3"
+    "@formatjs/icu-messageformat-parser" "2.9.3"
+    tslib "2"
 
 ipaddr.js@^2.0.1:
   version "2.2.0"
@@ -6617,9 +6642,9 @@ isarray@^2.0.5:
   integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
 
 isbot@^5.1.16:
-  version "5.1.16"
-  resolved "https://registry.yarnpkg.com/isbot/-/isbot-5.1.16.tgz#652fac0ab5ba181cefc53aa156edcb76f28ac07d"
-  integrity sha512-zvRjcw/4UfKiCVx+/PqXPKthufO5m2PpJSbA0tVZY9ns7hlQRV1xqWpEFcqyfkK/MrChsXPmu1zpxECjcaEuKg==
+  version "5.1.17"
+  resolved "https://registry.yarnpkg.com/isbot/-/isbot-5.1.17.tgz#ad7da5690a61bbb19056a069975c9a73182682a0"
+  integrity sha512-/wch8pRKZE+aoVhRX/hYPY1C7dMCeeMyhkQLNLNlYAbGQn9bkvMB8fOUXNnk5I0m4vDYbBJ9ciVtkr9zfBJ7qA==
 
 isexe@^2.0.0:
   version "2.0.0"
@@ -7825,9 +7850,9 @@ mmdb-lib@2.1.1:
   integrity sha512-yx8H/1H5AfnufiLnzzPqPf4yr/dKU9IFT1rPVwSkrKWHsQEeVVd6+X+L0nUbXhlEFTu3y/7hu38CFmEVgzvyeg==
 
 moment-timezone@^0.5.35:
-  version "0.5.45"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.45.tgz#cb685acd56bac10e69d93c536366eb65aa6bcf5c"
-  integrity sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==
+  version "0.5.46"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.46.tgz#a21aa6392b3c6b3ed916cd5e95858a28d893704a"
+  integrity sha512-ZXm9b36esbe7OmdABqIWJuBBiLLwAjrN7CE+7sYdCCx82Nabt1wHDj8TVseS59QIlfFPbOoiBPm6ca9BioG4hw==
   dependencies:
     moment "^2.29.4"
 
@@ -7841,7 +7866,7 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@^2.1.1:
+ms@^2.1.1, ms@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -9048,9 +9073,9 @@ react-dom@^18.2.0:
     scheduler "^0.23.2"
 
 react-error-boundary@^4.0.4:
-  version "4.0.13"
-  resolved "https://registry.yarnpkg.com/react-error-boundary/-/react-error-boundary-4.0.13.tgz#80386b7b27b1131c5fbb7368b8c0d983354c7947"
-  integrity sha512-b6PwbdSv8XeOSYvjt8LpgpKrZ0yGdtZokYwkwV2wlcZbxgopHX/hgPl5VgpnoVOWd868n1hktM8Qm4b+02MiLQ==
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/react-error-boundary/-/react-error-boundary-4.1.2.tgz#bc750ad962edb8b135d6ae922c046051eb58f289"
+  integrity sha512-GQDxZ5Jd+Aq/qUxbCm1UtzmL/s++V7zKgE8yMktJiCQXCCFZnMZh9ng+6/Ne6PjNSXH0L9CjeOEREfRnq6Duag==
   dependencies:
     "@babel/runtime" "^7.12.5"
 
@@ -9060,20 +9085,20 @@ react-hook-form@^7.34.2:
   integrity sha512-F/TroLjTICipmHeFlMrLtNLceO2xr1jU3CyiNla5zdwsGUGu2UOxxR4UyJgLlhMwLW/Wzp4cpJ7CPfgJIeKdSg==
 
 react-intl@^6.5.5:
-  version "6.6.8"
-  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-6.6.8.tgz#cb60c90502d0025caf9f86ec298cdc4348da17c2"
-  integrity sha512-M0pkhzcgV31h++2901BiRXWl69hp2zPyLxRrSwRjd1ErXbNoubz/f4M6DrRTd4OiSUrT4ajRQzrmtS5plG4FtA==
-  dependencies:
-    "@formatjs/ecma402-abstract" "2.0.0"
-    "@formatjs/icu-messageformat-parser" "2.7.8"
-    "@formatjs/intl" "2.10.4"
-    "@formatjs/intl-displaynames" "6.6.8"
-    "@formatjs/intl-listformat" "7.5.7"
-    "@types/hoist-non-react-statics" "^3.3.1"
+  version "6.8.7"
+  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-6.8.7.tgz#e6f08f365810a366031358ff1c7dd8cf7e649bdd"
+  integrity sha512-Ocv8Tg6fXqBdVdkkYohQ79T9rJls3G1lmDSjhqHdK9873BdQFLSeITGgwuGWTRBd6Mg5FL33TBen4FtujCTP0g==
+  dependencies:
+    "@formatjs/ecma402-abstract" "2.2.3"
+    "@formatjs/icu-messageformat-parser" "2.9.3"
+    "@formatjs/intl" "2.10.14"
+    "@formatjs/intl-displaynames" "6.8.4"
+    "@formatjs/intl-listformat" "7.7.4"
+    "@types/hoist-non-react-statics" "3"
     "@types/react" "16 || 17 || 18"
-    hoist-non-react-statics "^3.3.2"
-    intl-messageformat "10.5.14"
-    tslib "^2.4.0"
+    hoist-non-react-statics "3"
+    intl-messageformat "10.7.6"
+    tslib "2"
 
 react-is@^16.13.1, react-is@^16.7.0:
   version "16.13.1"
@@ -10353,6 +10378,11 @@ tsconfig-paths@^3.15.0:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
+tslib@2, tslib@^2.4.0:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
+  integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
+
 tslib@^1.8.1:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
@@ -10363,7 +10393,7 @@ tslib@^2.0.1, tslib@^2.0.3:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
 
-tslib@^2.1.0, tslib@^2.4.0:
+tslib@^2.1.0:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
   integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==

From 8d63d23c165bb693a717a2da8ae1ff5c4667eea0 Mon Sep 17 00:00:00 2001
From: chelsey-g <97612806+chelsey-g@users.noreply.github.com>
Date: Fri, 15 Nov 2024 16:41:20 -0500
Subject: [PATCH 403/438] loads all websites in order to edit them

---
 src/app/(main)/dashboard/DashboardEdit.tsx | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/app/(main)/dashboard/DashboardEdit.tsx b/src/app/(main)/dashboard/DashboardEdit.tsx
index d702612f6e..9e4e8ec185 100644
--- a/src/app/(main)/dashboard/DashboardEdit.tsx
+++ b/src/app/(main)/dashboard/DashboardEdit.tsx
@@ -1,4 +1,4 @@
-import { useState, useMemo } from 'react';
+import { useState, useMemo, useEffect } from 'react';
 import { DragDropContext, Draggable, Droppable } from 'react-beautiful-dnd';
 import classNames from 'classnames';
 import { Button, Loading } from 'react-basics';
@@ -14,12 +14,25 @@ export function DashboardEdit({ teamId }: { teamId: string }) {
   const { websiteOrder } = settings;
   const { formatMessage, labels } = useMessages();
   const [order, setOrder] = useState(websiteOrder || []);
+  const [websites, setWebsites] = useState([]);
+
   const {
     result,
     query: { isLoading },
+    setParams,
   } = useWebsites({ teamId });
 
-  const websites = result?.data;
+  useEffect(() => {
+    if (result?.data) {
+      setWebsites(prevWebsites => {
+        const newWebsites = [...prevWebsites, ...result.data];
+        if (newWebsites.length < result.count) {
+          setParams(prevParams => ({ ...prevParams, page: prevParams.page + 1 }));
+        }
+        return newWebsites;
+      });
+    }
+  }, [result]);
 
   const ordered = useMemo(() => {
     if (websites) {

From 3decad5198c19d8191451cb2454c7b42310f54f0 Mon Sep 17 00:00:00 2001
From: Max Schmidt <max.schmidt@outlook.de>
Date: Sat, 16 Nov 2024 13:26:42 +0100
Subject: [PATCH 404/438] use params

Signed-off-by: Max Schmidt <max.schmidt@outlook.de>
---
 src/components/hooks/queries/useWebsiteMetrics.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/hooks/queries/useWebsiteMetrics.ts b/src/components/hooks/queries/useWebsiteMetrics.ts
index 184fd4d44c..530eb5aa4c 100644
--- a/src/components/hooks/queries/useWebsiteMetrics.ts
+++ b/src/components/hooks/queries/useWebsiteMetrics.ts
@@ -20,12 +20,8 @@ export function useWebsiteMetrics(
       },
     ],
     queryFn: async () => {
-      const filters = { ...params };
-
-      filters[queryParams.type] = undefined;
-
       const data = await get(`/websites/${websiteId}/metrics`, {
-        ...filters,
+        ...params,
         ...queryParams,
       });
 

From 8b676c637000a29d804fcd5fd64d593dcbb1c8a0 Mon Sep 17 00:00:00 2001
From: Max Schmidt <max.schmidt@outlook.de>
Date: Sat, 16 Nov 2024 13:56:58 +0100
Subject: [PATCH 405/438] respect expanded view

Signed-off-by: Max Schmidt <max.schmidt@outlook.de>
---
 src/components/hooks/queries/useWebsiteMetrics.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/components/hooks/queries/useWebsiteMetrics.ts b/src/components/hooks/queries/useWebsiteMetrics.ts
index 530eb5aa4c..c64983834d 100644
--- a/src/components/hooks/queries/useWebsiteMetrics.ts
+++ b/src/components/hooks/queries/useWebsiteMetrics.ts
@@ -1,6 +1,7 @@
 import { UseQueryOptions } from '@tanstack/react-query';
 import useApi from './useApi';
 import { useFilterParams } from '../useFilterParams';
+import { useSearchParams } from 'next/navigation';
 
 export function useWebsiteMetrics(
   websiteId: string,
@@ -9,6 +10,7 @@ export function useWebsiteMetrics(
 ) {
   const { get, useQuery } = useApi();
   const params = useFilterParams(websiteId);
+  const searchParams = useSearchParams();
 
   return useQuery({
     queryKey: [
@@ -20,8 +22,15 @@ export function useWebsiteMetrics(
       },
     ],
     queryFn: async () => {
+      const filters = { ...params };
+      const view = searchParams.get('view');
+
+      if (view && filters[view]) {
+        filters[view] = undefined;
+      }
+
       const data = await get(`/websites/${websiteId}/metrics`, {
-        ...params,
+        ...filters,
         ...queryParams,
       });
 

From 7e6e79c19528a23848fea2fb4c73fd17a3bbb666 Mon Sep 17 00:00:00 2001
From: Max Schmidt <max.schmidt@outlook.de>
Date: Sat, 16 Nov 2024 14:05:02 +0100
Subject: [PATCH 406/438] cleanup

Signed-off-by: Max Schmidt <max.schmidt@outlook.de>
---
 src/components/hooks/queries/useWebsiteMetrics.ts | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/components/hooks/queries/useWebsiteMetrics.ts b/src/components/hooks/queries/useWebsiteMetrics.ts
index c64983834d..9fa9ab2892 100644
--- a/src/components/hooks/queries/useWebsiteMetrics.ts
+++ b/src/components/hooks/queries/useWebsiteMetrics.ts
@@ -22,15 +22,9 @@ export function useWebsiteMetrics(
       },
     ],
     queryFn: async () => {
-      const filters = { ...params };
-      const view = searchParams.get('view');
-
-      if (view && filters[view]) {
-        filters[view] = undefined;
-      }
-
       const data = await get(`/websites/${websiteId}/metrics`, {
-        ...filters,
+        ...params,
+        [searchParams.get('view')]: undefined,
         ...queryParams,
       });
 

From 6d6a3d409d65fa7fa218ba45dc4153c9813b5291 Mon Sep 17 00:00:00 2001
From: Max Schmidt <max.schmidt@outlook.de>
Date: Sun, 17 Nov 2024 16:57:13 +0100
Subject: [PATCH 407/438] add z-index

Signed-off-by: Max Schmidt <max.schmidt@outlook.de>
---
 .../(main)/websites/[websiteId]/WebsiteExpandedView.module.css   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.module.css b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.module.css
index 007fa7f1b7..afe2028aed 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.module.css
+++ b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.module.css
@@ -59,5 +59,6 @@
     align-items: center;
     justify-content: space-between;
     padding-inline-end: 0;
+    z-index: 10;
   }
 }

From 4e48adac75a2b11501847ae1e68111ae6a44c096 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Nov 2024 17:33:54 +0000
Subject: [PATCH 408/438] Bump cross-spawn from 7.0.3 to 7.0.5

Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.5.
- [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v7.0.3...v7.0.5)

---
updated-dependencies:
- dependency-name: cross-spawn
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index a53045fef1..6d979e97c5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4207,9 +4207,9 @@ cross-spawn@^6.0.5:
     which "^1.2.9"
 
 cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.5.tgz#910aac880ff5243da96b728bc6521a5f6c2f2f82"
+  integrity sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"
@@ -9582,14 +9582,7 @@ semver@^6.0.0, semver@^6.3.0, semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.4, semver@^7.3.7:
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
-  integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@^7.5.3, semver@^7.5.4:
+semver@^7.3.4, semver@^7.3.7, semver@^7.5.3, semver@^7.5.4:
   version "7.6.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
   integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==

From 613143b50009c7df719ba1f7eac80f10f06357dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Nov 2024 21:14:39 +0000
Subject: [PATCH 409/438] Bump rollup from 3.29.4 to 3.29.5

Bumps [rollup](https://github.com/rollup/rollup) from 3.29.4 to 3.29.5.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v3.29.4...v3.29.5)

---
updated-dependencies:
- dependency-name: rollup
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 6d979e97c5..22a438f2c7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9482,9 +9482,9 @@ rollup-pluginutils@^2.8.2:
     estree-walker "^0.6.1"
 
 rollup@^3.28.0:
-  version "3.29.4"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.4.tgz#4d70c0f9834146df8705bfb69a9a19c9e1109981"
-  integrity sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==
+  version "3.29.5"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.5.tgz#8a2e477a758b520fb78daf04bca4c522c1da8a54"
+  integrity sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==
   optionalDependencies:
     fsevents "~2.3.2"
 

From fb0ff247a8503fcb8715147ee4fed29f6e02c578 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Mon, 18 Nov 2024 13:40:32 -0800
Subject: [PATCH 410/438] Fixed headers.

---
 next.config.js | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/next.config.js b/next.config.js
index 21601b7fdd..5e3a1225bb 100644
--- a/next.config.js
+++ b/next.config.js
@@ -53,6 +53,10 @@ const trackerHeaders = [
     key: 'Access-Control-Allow-Origin',
     value: '*',
   },
+  {
+    key: 'Cache-Control',
+    value: 'public, max-age=86400, must-revalidate',
+  },
 ];
 
 const headers = [
@@ -189,22 +193,7 @@ const config = {
     return config;
   },
   async headers() {
-    return [
-      {
-        source: '/:path*',
-        headers,
-      },
-      {
-        source: '/script.js',
-        headers: [
-          ...headers,
-          {
-            key: 'Cache-Control',
-            value: 'public, max-age=86400, must-revalidate',
-          },
-        ],
-      },
-    ];
+    return headers;
   },
   async rewrites() {
     return [

From 27295380b739a6b155a2060933225beca1eb9e1b Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Mon, 18 Nov 2024 13:54:28 -0800
Subject: [PATCH 411/438] Updated packages.

---
 yarn.lock | 1681 ++++++++++++++++++++++++++---------------------------
 1 file changed, 819 insertions(+), 862 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index d7b637b529..836d5a1d18 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,11 +2,6 @@
 # yarn lockfile v1
 
 
-"@aashutoshrathi/word-wrap@^1.2.3":
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
-  integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
-
 "@ampproject/remapping@^2.2.0":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
@@ -23,7 +18,16 @@
     "@babel/highlight" "^7.22.13"
     chalk "^2.4.2"
 
-"@babel/code-frame@^7.12.13", "@babel/code-frame@^7.23.5":
+"@babel/code-frame@^7.12.13":
+  version "7.26.2"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85"
+  integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.25.9"
+    js-tokens "^4.0.0"
+    picocolors "^1.0.0"
+
+"@babel/code-frame@^7.23.5":
   version "7.23.5"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244"
   integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==
@@ -291,10 +295,10 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83"
   integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==
 
-"@babel/helper-validator-identifier@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
-  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
+"@babel/helper-validator-identifier@^7.22.20", "@babel/helper-validator-identifier@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7"
+  integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==
 
 "@babel/helper-validator-option@^7.22.15":
   version "7.22.15"
@@ -343,13 +347,14 @@
     js-tokens "^4.0.0"
 
 "@babel/highlight@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b"
-  integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.25.9.tgz#8141ce68fc73757946f983b343f1231f4691acc6"
+  integrity sha512-llL88JShoCsth8fF8R4SJnIn+WLvR6ccFxu1H3FlMhDontdcmZWf2HgIZ7AIqV3Xcck1idlohrN4EUBQz6klbw==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-validator-identifier" "^7.25.9"
     chalk "^2.4.2"
     js-tokens "^4.0.0"
+    picocolors "^1.0.0"
 
 "@babel/parser@^7.1.0", "@babel/parser@^7.20.15", "@babel/parser@^7.20.7", "@babel/parser@^7.21.3", "@babel/parser@^7.22.15", "@babel/parser@^7.23.0":
   version "7.23.0"
@@ -1199,17 +1204,17 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@clickhouse/client-common@1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@clickhouse/client-common/-/client-common-1.4.1.tgz#23c6ffbff5717729e533301c9f595cd79af221ef"
-  integrity sha512-f5eoTrUSDplrMoi3ddeZ0MzGTn0iGMByEQ8j63eVMoBSOI2+F6jEIPcW2tWofT79Rvnn3RRlveYcShiaIiCJyw==
+"@clickhouse/client-common@1.8.1":
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/@clickhouse/client-common/-/client-common-1.8.1.tgz#1b7994990d867ba195e05a43e3413f4cf3b119cb"
+  integrity sha512-Z0R5zKaS3N35Op338WVRHIfoqDh9gotXZwekm0lbHQmwNaj3nY2iJ113dFYKjb1V+ESu+PvLEA//LJUGZyPQOg==
 
 "@clickhouse/client@^1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@clickhouse/client/-/client-1.4.1.tgz#be4303d81f42835c5f168de61babd1a67d821f5a"
-  integrity sha512-12iV+MeykxdQySRFHwaVU+hKUv3JP6kdwOI+z3zzyfPVYHynTlV8emJjjGZR0+VfRaj3PCMuQfryfsJ82nh9WQ==
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/@clickhouse/client/-/client-1.8.1.tgz#2273f6b993d21351c32d4e2a6a1b35b0c05d435b"
+  integrity sha512-Ec0pCdwftIPD7hCxhOukHS0Zxr2tDc5mNAHBqkT3c0c6GO2WQdZkME9+EcfGcoF7+foUp82F5a0bPfSDDjfWmg==
   dependencies:
-    "@clickhouse/client-common" "1.4.1"
+    "@clickhouse/client-common" "1.8.1"
 
 "@colors/colors@1.5.0":
   version "1.5.0"
@@ -1349,10 +1354,10 @@
   resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-3.0.2.tgz#ea61ba7bb24be3502c6aaa3190ed231f4633a81e"
   integrity sha512-RpHaZ1h9LE7aALeQXmXrJkRG84ZxIsctEN2biEUmFyKpzFM3zZ35eUMcIzZFsw/2olQE6v69+esEqU2f1MKycg==
 
-"@cypress/request@^3.0.0", "@cypress/request@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-3.0.1.tgz#72d7d5425236a2413bd3d8bb66d02d9dc3168960"
-  integrity sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==
+"@cypress/request@^3.0.6":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-3.0.6.tgz#f5580add6acee0e183b4d4e07eff4f31327ae12b"
+  integrity sha512-fi0eVdCOtKu5Ed6+E8mYxUF6ZTFJDZvHogCBelM0xVXmrDEkyM22gRArQzq1YcHPm1V47Vf/iAD+WgVdUlJCGg==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -1360,16 +1365,16 @@
     combined-stream "~1.0.6"
     extend "~3.0.2"
     forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    http-signature "~1.3.6"
+    form-data "~4.0.0"
+    http-signature "~1.4.0"
     is-typedarray "~1.0.0"
     isstream "~0.1.2"
     json-stringify-safe "~5.0.1"
     mime-types "~2.1.19"
     performance-now "^2.1.0"
-    qs "6.10.4"
+    qs "6.13.0"
     safe-buffer "^5.1.2"
-    tough-cookie "^4.1.3"
+    tough-cookie "^5.0.0"
     tunnel-agent "^0.6.0"
     uuid "^8.3.2"
 
@@ -1386,198 +1391,198 @@
   resolved "https://registry.yarnpkg.com/@date-fns/utc/-/utc-1.2.0.tgz#fb705b025b6769840608782c8fa7f3919d1b3337"
   integrity sha512-YLq+crMPJiBmIdkRmv9nZuZy1mVtMlDcUKlg4mvI0UsC/dZeIaGoGB5p/C4FrpeOhZ7zBTK03T58S0DFkRNMnw==
 
-"@dicebear/adventurer-neutral@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/adventurer-neutral/-/adventurer-neutral-9.2.1.tgz#0416ff71d0dd3ff391db9c9fda2acb166b074c5f"
-  integrity sha512-iP6Tc6CgrJt63j08i/hlyNiGEbDNgP9Ws6WKT9n/0oTU9X/DKLncGStV3uhgYPIOVQE/tw9a/GjbGjrwBlN8CQ==
-
-"@dicebear/adventurer@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/adventurer/-/adventurer-9.2.1.tgz#3d522d2aaabe17d172ea2302bfdf62d601ebcd64"
-  integrity sha512-utJr8oEOwPy9y+7rIOnB7mls+2XQrc3Kdlx/ay9KBY/HEUMnwMoN/GJhg4HcyGnV+DS7VhN6JSrnwwD9+SQyBw==
-
-"@dicebear/avataaars-neutral@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/avataaars-neutral/-/avataaars-neutral-9.2.1.tgz#61d3894f4d08d9ee3722f3a64c36725729c6aaf3"
-  integrity sha512-yceQMVBLimAHgZDL8VKCDGNs5JQ8BERaUMNIJXXRKEYZXlofoXZpYtcWPKQY9lmRJJznO1GX7ZK12ILnZjRPBQ==
-
-"@dicebear/avataaars@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/avataaars/-/avataaars-9.2.1.tgz#2460fb0d7d364a12e546b40b6e56c220db71c851"
-  integrity sha512-WIZL7CWSsmzLswY/4ZrgtE/7EvnaNrYreLyT8hjiGyVb9J4cQaVZXSMuDIGFa5wT062AW/4/i82kh/7nh0oL+w==
-
-"@dicebear/big-ears-neutral@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/big-ears-neutral/-/big-ears-neutral-9.2.1.tgz#dfee12787f8a0efa7b3552fca5e9f24c9102fc44"
-  integrity sha512-98qOCFEhbqCHeyO7ZXBAMMov8bquZt8vhtjj0YeHjGjI/OEWbA2gxq2ryv1BHSehVc/vTrd1KbHag7yYoeCDuw==
-
-"@dicebear/big-ears@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/big-ears/-/big-ears-9.2.1.tgz#4a7f2f3d987c11d76602b6ee8b398f9dcd2ce486"
-  integrity sha512-BUVTonwSYiGKcnk8wdwUHZ1b34GhfzRpG1kguK4kWAKlayBq7Q+iDJlmk4Bch0XdDQc2bqFf1GQCCj+xXWRHyg==
-
-"@dicebear/big-smile@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/big-smile/-/big-smile-9.2.1.tgz#d6cf95d34d65a393901925df370a1afbd0b0ae76"
-  integrity sha512-bspur+wtnlv/Z4QDvRWg9rs3snf+iuBkamkgw4nZOUFKMlZdPQGqNoh1DkycRcLXNX1Q61KM172K6bS60ZlKxw==
-
-"@dicebear/bottts-neutral@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/bottts-neutral/-/bottts-neutral-9.2.1.tgz#cc89b1ed834b7e8b7163dee2928dc1aa74077f75"
-  integrity sha512-uwd+xcbRQUIHKQ1iEiLjf5RwCaVzOfBgIu2WRE+6MUaahYi6cJ0eJAs0h1q+zpgYyvqPDPDAi9j7AUwjmig0GA==
-
-"@dicebear/bottts@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/bottts/-/bottts-9.2.1.tgz#922ccdba942d8c2c15655be0b6f25f4e9691cb80"
-  integrity sha512-AQQ/WKd54G9sa+TkQptcu6c+Tjfc9hitgB70uA5GqJe+w6Bal+gwY6kPm5sJ1CY2mk/UBh1rXBuauQZ25bgTcQ==
+"@dicebear/adventurer-neutral@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/adventurer-neutral/-/adventurer-neutral-9.2.2.tgz#2831c34c6e8818a319478b15b6b1741b95ef5bdb"
+  integrity sha512-XVAjhUWjav6luTZ7txz8zVJU/H0DiUy4uU1Z7IO5MDO6kWvum+If1+0OUgEWYZwM+RDI7rt2CgVP910DyZGd1w==
+
+"@dicebear/adventurer@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/adventurer/-/adventurer-9.2.2.tgz#cac7dddbd743078942df1391370191cbd235dde2"
+  integrity sha512-WjBXCP9EXbUul2zC3BS2/R3/4diw1uh/lU4jTEnujK1mhqwIwanFboIMzQsasNNL/xf+m3OHN7MUNJfHZ1fLZA==
+
+"@dicebear/avataaars-neutral@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/avataaars-neutral/-/avataaars-neutral-9.2.2.tgz#513369601d3e491b303c0760479da92b3f131883"
+  integrity sha512-pRj16P27dFDBI3LtdiHUDwIXIGndHAbZf5AxaMkn6/+0X93mVQ/btVJDXyW0G96WCsyC88wKAWr6/KJotPxU6Q==
+
+"@dicebear/avataaars@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/avataaars/-/avataaars-9.2.2.tgz#0c072c410ec5fdb8b5c5c7d440d038b02a42669e"
+  integrity sha512-WqJPQEt0OhBybTpI0TqU1uD1pSk9M2+VPIwvBye/dXo46b+0jHGpftmxjQwk6tX8z0+mRko8pwV5n+cWht1/+w==
+
+"@dicebear/big-ears-neutral@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/big-ears-neutral/-/big-ears-neutral-9.2.2.tgz#98906d453f49896f948b0d6d93c07e95ad057a9a"
+  integrity sha512-IPHt8fi3dv9cyfBJBZ4s8T+PhFCrQvOCf91iRHBT3iOLNPdyZpI5GNLmGiV0XMAvIDP5NvA5+f6wdoBLhYhbDA==
+
+"@dicebear/big-ears@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/big-ears/-/big-ears-9.2.2.tgz#66866ac6cfc4174ad875051892e40999e2f294a6"
+  integrity sha512-hz4UXdPq4qqZpu0YVvlqM4RDFhk5i0WgPcuwj/MOLlgTjuj63uHUhCQSk6ZiW1DQOs12qpwUBMGWVHxBRBas9g==
+
+"@dicebear/big-smile@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/big-smile/-/big-smile-9.2.2.tgz#6ba6b385c16da3f94ae414b641848cbd498e13bb"
+  integrity sha512-D4td0GL8or1nTNnXvZqkEXlzyqzGPWs3znOnm1HIohtFTeIwXm72Ob2lNDsaQJSJvXmVlwaQQ0CCTvyCl8Stjw==
+
+"@dicebear/bottts-neutral@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/bottts-neutral/-/bottts-neutral-9.2.2.tgz#6e48ba93d69f7d5f82a743834b7972e5c1c8d967"
+  integrity sha512-lSgpqmSJtlnyxVuUgNdBwyzuA0O9xa5zRJtz7x2KyWbicXir5iYdX0MVMCkp1EDvlcxm9rGJsclktugOyakTlw==
+
+"@dicebear/bottts@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/bottts/-/bottts-9.2.2.tgz#8f2587469a5f6fe1a69c4b4ef5504455c3a4dd68"
+  integrity sha512-wugFkzw8JNWV1nftq/Wp/vmQsLAXDxrMtRK3AoMODuUpSVoP3EHRUfKS043xggOsQFvoj0HZ7kadmhn0AMLf5A==
 
 "@dicebear/collection@^9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/collection/-/collection-9.2.1.tgz#b2de84ef654ac1550458a17049b02a0013213b92"
-  integrity sha512-Su1eygO8llKuJ68N+xhBCzBN2Lqrsx9ZNdlvfZeH/s70RjL0raNQaI6/hRABDmlbLYwW4AjRh2lOgDdGfCp5DQ==
-  dependencies:
-    "@dicebear/adventurer" "9.2.1"
-    "@dicebear/adventurer-neutral" "9.2.1"
-    "@dicebear/avataaars" "9.2.1"
-    "@dicebear/avataaars-neutral" "9.2.1"
-    "@dicebear/big-ears" "9.2.1"
-    "@dicebear/big-ears-neutral" "9.2.1"
-    "@dicebear/big-smile" "9.2.1"
-    "@dicebear/bottts" "9.2.1"
-    "@dicebear/bottts-neutral" "9.2.1"
-    "@dicebear/croodles" "9.2.1"
-    "@dicebear/croodles-neutral" "9.2.1"
-    "@dicebear/dylan" "9.2.1"
-    "@dicebear/fun-emoji" "9.2.1"
-    "@dicebear/glass" "9.2.1"
-    "@dicebear/icons" "9.2.1"
-    "@dicebear/identicon" "9.2.1"
-    "@dicebear/initials" "9.2.1"
-    "@dicebear/lorelei" "9.2.1"
-    "@dicebear/lorelei-neutral" "9.2.1"
-    "@dicebear/micah" "9.2.1"
-    "@dicebear/miniavs" "9.2.1"
-    "@dicebear/notionists" "9.2.1"
-    "@dicebear/notionists-neutral" "9.2.1"
-    "@dicebear/open-peeps" "9.2.1"
-    "@dicebear/personas" "9.2.1"
-    "@dicebear/pixel-art" "9.2.1"
-    "@dicebear/pixel-art-neutral" "9.2.1"
-    "@dicebear/rings" "9.2.1"
-    "@dicebear/shapes" "9.2.1"
-    "@dicebear/thumbs" "9.2.1"
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/collection/-/collection-9.2.2.tgz#1f8affc2c19c670b7696e7c23a2fe4072dc64af4"
+  integrity sha512-vZAmXhPWCK3sf8Fj9/QflFC6XOLroJOT5K1HdnzHaPboEvffUQideGCrrEamnJtlH0iF0ZDXh8gqmwy2fu+yHA==
+  dependencies:
+    "@dicebear/adventurer" "9.2.2"
+    "@dicebear/adventurer-neutral" "9.2.2"
+    "@dicebear/avataaars" "9.2.2"
+    "@dicebear/avataaars-neutral" "9.2.2"
+    "@dicebear/big-ears" "9.2.2"
+    "@dicebear/big-ears-neutral" "9.2.2"
+    "@dicebear/big-smile" "9.2.2"
+    "@dicebear/bottts" "9.2.2"
+    "@dicebear/bottts-neutral" "9.2.2"
+    "@dicebear/croodles" "9.2.2"
+    "@dicebear/croodles-neutral" "9.2.2"
+    "@dicebear/dylan" "9.2.2"
+    "@dicebear/fun-emoji" "9.2.2"
+    "@dicebear/glass" "9.2.2"
+    "@dicebear/icons" "9.2.2"
+    "@dicebear/identicon" "9.2.2"
+    "@dicebear/initials" "9.2.2"
+    "@dicebear/lorelei" "9.2.2"
+    "@dicebear/lorelei-neutral" "9.2.2"
+    "@dicebear/micah" "9.2.2"
+    "@dicebear/miniavs" "9.2.2"
+    "@dicebear/notionists" "9.2.2"
+    "@dicebear/notionists-neutral" "9.2.2"
+    "@dicebear/open-peeps" "9.2.2"
+    "@dicebear/personas" "9.2.2"
+    "@dicebear/pixel-art" "9.2.2"
+    "@dicebear/pixel-art-neutral" "9.2.2"
+    "@dicebear/rings" "9.2.2"
+    "@dicebear/shapes" "9.2.2"
+    "@dicebear/thumbs" "9.2.2"
 
 "@dicebear/core@^9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/core/-/core-9.2.1.tgz#b93800ac7e21ae955cceaa2370e7dc033a3cc557"
-  integrity sha512-Y3E59+3xO2UWKdf3Zt/rwMdy9r7uccTgM89Kv8aXN1vmdrnA4YYmr4jslRRRqPLVpenuT4105nkboC4rMnDgHw==
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/core/-/core-9.2.2.tgz#dcaf941e4d9e79046d466b3197dfa3393288e5b2"
+  integrity sha512-ROhgHG249dPtcXgBHcqPEsDeAPRPRD/9d+tZCjLYyueO+cXDlIA8dUlxpwIVcOuZFvCyW6RJtqo8BhNAi16pIQ==
   dependencies:
     "@types/json-schema" "^7.0.11"
 
-"@dicebear/croodles-neutral@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/croodles-neutral/-/croodles-neutral-9.2.1.tgz#379646cf53ba4d61b6c94c13b3ec3386359e3541"
-  integrity sha512-2iyr+B/y795P7cSIpFg4RjxUu6kljesKjtepvMzfeBR9xKyI84exBNHRoCTEVwOCFePmlPJX1qtw/YWM0sAPJw==
-
-"@dicebear/croodles@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/croodles/-/croodles-9.2.1.tgz#74fa6aa8c0ee0dc303c0ad82fd78f5d6cd66610d"
-  integrity sha512-V7+m21BizYTGgLgxmh5dxHHADeD3gkeuPYkhKqP8Uu8jZFBgh5wKFqqfVI/XSQkx/+lRla5c6l55mymgjt4k8Q==
-
-"@dicebear/dylan@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/dylan/-/dylan-9.2.1.tgz#997aff74b4bf112e4895463eeea0adc2456d332f"
-  integrity sha512-UeKz3Gxprh4bJ73Q2DjDpmjt854G3xfakc5KfeBmPV25EP+al7HCsM/HE+ZgKTSh+PPz5/mVtZQYU40pTzJEyg==
-
-"@dicebear/fun-emoji@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/fun-emoji/-/fun-emoji-9.2.1.tgz#e88c8c2db7927d732ef2d0af3a24c4d4152a7f02"
-  integrity sha512-F08p+Ggdxo4Ryji+3aCJXAKnjx4rM4UMtrJU4eA2t8lAkpwFNgfGK6mpMYPnxmKULYljGOgySmw7AyWcbX8s2Q==
-
-"@dicebear/glass@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/glass/-/glass-9.2.1.tgz#61bc231a5b0bd8d15cfa94c76ac608ab8fe98ac1"
-  integrity sha512-UoErQwg7/qkEKWyEDTyt8FYhw/aZryP0Tr7cwBEuxMXZ585NUTvEel0K5j9aDkBrimJVEM+jKzOFIIMAGLlR0g==
-
-"@dicebear/icons@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/icons/-/icons-9.2.1.tgz#0ef78e8ff742bd9985a3c36cd9cbd2705449e789"
-  integrity sha512-0VuWohGMiv4n1nxwehYi6w+PIT9OBRlV721yNoewQWgQCrnMKBvM0cFRX9Dtg+MvwLMslQCIU3pEauEZ5FNmFA==
-
-"@dicebear/identicon@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/identicon/-/identicon-9.2.1.tgz#aebd7b692de9a6601746ab47711359f81471841c"
-  integrity sha512-Dlqpn3tzqimR8KPIRkSJCKd5XwKgTLVXzT5KiY+2ysMZZQh4uJvBjVfY5SLrHDHC2a42W6EdwQxU6tFTRiKQuQ==
-
-"@dicebear/initials@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/initials/-/initials-9.2.1.tgz#d4e435c18e48837f97086ba5210d4742594ba181"
-  integrity sha512-d6Shnt1LiCf9yAEck3y/w4pXG4bWYVjBFCeI43l0BAR39Mk2Dq05UEFZH5Dtj2kyfNozMjh6vG1cQyBigtamug==
-
-"@dicebear/lorelei-neutral@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/lorelei-neutral/-/lorelei-neutral-9.2.1.tgz#5d5d6400c0e2232081f58f8d82efff00ee307b81"
-  integrity sha512-4YkkR697qXAYxN5N/zVsRe955QLhw0yLib2CzeBga1QXXMIkywq2nRFa3fr4toSRPl45kl1eF8J5HC17CU9inw==
-
-"@dicebear/lorelei@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/lorelei/-/lorelei-9.2.1.tgz#b23ddb02b098578ef1bcb121c7a638795f3de89e"
-  integrity sha512-DNjZpUpe/CxKK8Byn1meBvRz/NJWtBizcoS2DzIIyqPYOwA5cLIa2g/qKkESvXzU9naEMkiHfMZb1RYYzN2FAA==
-
-"@dicebear/micah@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/micah/-/micah-9.2.1.tgz#2e65fdb15b6ee6338123329c92e5afb98f694718"
-  integrity sha512-FK91igiVpPNhGCsfGpOgwYFKRP+FNR1V45Z4Tg/f82ux9TBdTmeoIfkgwrfhcXmCgagoYg2EAY+L72stUVapcA==
-
-"@dicebear/miniavs@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/miniavs/-/miniavs-9.2.1.tgz#de1e571663775b4b2a30944d8033d6a8b972aca3"
-  integrity sha512-r0TcaSrKJDPMqMYIiXNArq9i//cZzA1yuiXJw46iTloBDTh7yL1tpnL84CDxMpQ+OZLeMiRA6jVBx0coer4vmg==
-
-"@dicebear/notionists-neutral@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/notionists-neutral/-/notionists-neutral-9.2.1.tgz#2e77ae7330201628c4b3e4789b1aa83ffc684b82"
-  integrity sha512-Vi/FwMXzc1m/U2TjBnY9NHedoLbPc3BBsNQL8jPU27wdkXoyJHuXBevcUtsF0Zf8OuRbNpZKPbfYy6OYBr9qvw==
-
-"@dicebear/notionists@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/notionists/-/notionists-9.2.1.tgz#70aa14e8846a49096648f891a625a92b04513c75"
-  integrity sha512-oAyvPlp3xfFnDpW3nXhdAPGVm5WYj6VW6RgdzLAHoRO2EOYDNkQruIXd+d8JYo1DMTLUbgp3onr5AF9UU2OBzw==
-
-"@dicebear/open-peeps@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/open-peeps/-/open-peeps-9.2.1.tgz#dd9be6721ff7226e3a0286aec699fd6b0e0ad2b2"
-  integrity sha512-oPA/ljbPtuj2cdM0QtyJu2i24AaEMTIIk/FJbnrBK765WPnQcCZh84w+ZuInTMIfF9gYszNY34gaRD8Z6UiYxQ==
-
-"@dicebear/personas@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/personas/-/personas-9.2.1.tgz#dfa8291ebba098e8cebdeb04a4fba9e4384c4496"
-  integrity sha512-OgtyT9dnY8U60sUo0SLKCFVt0+dIr3a4vR0bDs/zwK4Qb/yTdB1VPdfxq0Fwk2q1vfn9YgbDrb0YYRgMRl60qQ==
-
-"@dicebear/pixel-art-neutral@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/pixel-art-neutral/-/pixel-art-neutral-9.2.1.tgz#457b4e038c9516e75d41c6c1efd9ff9d4099162a"
-  integrity sha512-GUtxJYX7/9XDgSZhkx24PB+yLcKkLHblDldvRr5xGlGxhgAovTBQFHLgCJxmUJgIaNW7pvSWCw7txguyxbBN9A==
-
-"@dicebear/pixel-art@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/pixel-art/-/pixel-art-9.2.1.tgz#e50bcc300a43c16ad3f69de1b6bf3dad92528274"
-  integrity sha512-ftKPKCvnS1cJ2OvuQLmtEIwdb9PzF5C2ofWBdVI/RFvhH1BhYc3OsdQ28o90+ZJQO4fivKwfsh8MPUTaqToQ7Q==
-
-"@dicebear/rings@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/rings/-/rings-9.2.1.tgz#ed6e930c02b09ebbd774fc104cffc5c23ffa6b4c"
-  integrity sha512-BlFYCaKB+wdpWWS28ZnQ/MvHeuNSRvkvWRoiw7pgS653LXx4kz/erVMmeVMSAr82y4BV+K8He2Rl2dMjuLyrXw==
-
-"@dicebear/shapes@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/shapes/-/shapes-9.2.1.tgz#e076b9aabd67bf611e9bbf7149919000e3d74197"
-  integrity sha512-cQzTcYimtuiAun55uPdIIhK53QTyjWqF/YN7LqEBGBqrJuGqHZBm1HXCcj7wPpoQ3zSy/2u8Rp0Etv7+5XFzyw==
-
-"@dicebear/thumbs@9.2.1":
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/@dicebear/thumbs/-/thumbs-9.2.1.tgz#174be721256e5ff97e19586a54bde8fd25468e74"
-  integrity sha512-ziX5HFmhiApO2k7QKj41+dGXbMdmQUUgFBYPyzTwnubhkDldJk7tpRoa5u2OsyTVDQCcPMv5mFSQpbANfmFwMg==
+"@dicebear/croodles-neutral@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/croodles-neutral/-/croodles-neutral-9.2.2.tgz#8eec838892dd5c9d8646fea7b46b57fe6ce3cf78"
+  integrity sha512-/4mNirxoQ+z1kHXnpDRbJ1JV1ZgXogeTeNp0MaFYxocCgHfJ7ckNM23EE1I7akoo9pqPxrKlaeNzGAjKHdS9vA==
+
+"@dicebear/croodles@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/croodles/-/croodles-9.2.2.tgz#7b2e2b1337bde23b582a8f5a04ef334f4f8c898a"
+  integrity sha512-OzvAXQWsOgMwL3Sl+lBxCubqSOWoBJpC78c4TKnNTS21rR63TtXUyVdLLzgKVN4YHRnvMgtPf8F/W9YAgIDK4w==
+
+"@dicebear/dylan@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/dylan/-/dylan-9.2.2.tgz#5ad87ae8c36f4edfffd87ab5fdf0fb4570ba682e"
+  integrity sha512-s7e3XliC1YXP+Wykj+j5kwdOWFRXFzYHYk/PB4oZ1F3sJandXiG0HS4chaNu4EoP0yZgKyFMUVTGZx+o6tMaYg==
+
+"@dicebear/fun-emoji@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/fun-emoji/-/fun-emoji-9.2.2.tgz#9f6786dc96068e1c8728765e675ddc8c6201bc77"
+  integrity sha512-M+rYTpB3lfwz18f+/i+ggNwNWUoEj58SJqXJ1wr7Jh/4E5uL+NmJg9JGwYNaVtGbCFrKAjSaILNUWGQSFgMfog==
+
+"@dicebear/glass@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/glass/-/glass-9.2.2.tgz#6c878fb8d2f380e3797c51d322b0dd013ea4b4b6"
+  integrity sha512-imCMxcg+XScHYtQq2MUv1lCzhQSCUglMlPSezKEpXhTxgbgUpmGlSGVkOfmX5EEc7SQowKkF1W/1gNk6CXvBaQ==
+
+"@dicebear/icons@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/icons/-/icons-9.2.2.tgz#c56168b574829a988105e360bc379868227d925e"
+  integrity sha512-Tqq2OVCdS7J02DNw58xwlgLGl40sWEckbqXT3qRvIF63FfVq+wQZBGuhuiyAURcSgvsc3h2oQeYFi9iXh7HTOA==
+
+"@dicebear/identicon@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/identicon/-/identicon-9.2.2.tgz#9210f5bf117b568ea59a30f3290ad55d8ab93087"
+  integrity sha512-POVKFulIrcuZf3rdAgxYaSm2XUg/TJg3tg9zq9150reEGPpzWR7ijyJ03dzAADPzS3DExfdYVT9+z3JKwwJnTQ==
+
+"@dicebear/initials@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/initials/-/initials-9.2.2.tgz#f55fbcaa1a701b4c99251298f2e4c76e3ce8a260"
+  integrity sha512-/xNnsEmsstWjmF77htAOuwOMhFlP6eBVXgcgFlTl/CCH/Oc6H7t0vwX1he8KLQBBzjGpvJcvIAn4Wh9rE4D5/A==
+
+"@dicebear/lorelei-neutral@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/lorelei-neutral/-/lorelei-neutral-9.2.2.tgz#c7efaa5f4c7784863929a3b162a6c880920426ec"
+  integrity sha512-Eys9Os6nt2Xll7Mvu66CfRR2YggTopWcmFcRZ9pPdohS96kT0MsLI2iTcfZXQ51K8hvT3IbwoGc86W8n0cDxAQ==
+
+"@dicebear/lorelei@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/lorelei/-/lorelei-9.2.2.tgz#2be5e72f8bd8bdae90e005e743872f563e825965"
+  integrity sha512-koXqVr/vcWUPo00VP5H6Czsit+uF1tmwd2NK7Q/e34/9Sd1f4QLLxHjjBNm/iNjCI1+UNTOvZ2Qqu0N5eo7Flw==
+
+"@dicebear/micah@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/micah/-/micah-9.2.2.tgz#8cded41bc857089b6df7530b81f20cf43e5dc7be"
+  integrity sha512-NCajcJV5yw8uMKiACp694w1T/UyYme2CUEzyTzWHgWnQ+drAuCcH8gpAoLWd67viNdQB/MTpNlaelUgTjmI4AQ==
+
+"@dicebear/miniavs@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/miniavs/-/miniavs-9.2.2.tgz#b588faf88c4dbfc8ab9de31da364b2bb31dcad5b"
+  integrity sha512-vvkWXttdw+KHF3j+9qcUFzK+P0nbNnImGjvN48wwkPIh2h08WWFq0MnoOls4IHwUJC4GXBjWtiyVoCxz6hhtOA==
+
+"@dicebear/notionists-neutral@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/notionists-neutral/-/notionists-neutral-9.2.2.tgz#d7b7fb70a742e528ec67bbf9fe608af51406a0fc"
+  integrity sha512-AhOzk+lz6kB4uxGun8AJhV+W1nttnMlxmxd+5KbQ/txCIziYIaeD3il44wsAGegEpGFvAZyMYtR/jjfHcem3TA==
+
+"@dicebear/notionists@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/notionists/-/notionists-9.2.2.tgz#d70b86392a0830351f026d6893380e8c7bf87467"
+  integrity sha512-Z9orRaHoj7Y9Ap4wEu8XOrFACsG1KbbBQUPV1R50uh6AHwsyNrm4cS84ICoGLvxgLNHHOae3YCjd8aMu2z19zg==
+
+"@dicebear/open-peeps@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/open-peeps/-/open-peeps-9.2.2.tgz#6f7aa648f02f8a0f24107b1ffcd462c8a065f3eb"
+  integrity sha512-6PeQDHYyjvKrGSl/gP+RE5dSYAQGKpcGnM65HorgyTIugZK7STo0W4hvEycedupZ3MCCEH8x/XyiChKM2sHXog==
+
+"@dicebear/personas@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/personas/-/personas-9.2.2.tgz#02b6787d91d1af4ab358eb5a49fb30f40b9a62a3"
+  integrity sha512-705+ObNLC0w1fcgE/Utav+8bqO+Esu53TXegpX5j7trGEoIMf2bThqJGHuhknZ3+T2az3Wr89cGyOGlI0KLzLA==
+
+"@dicebear/pixel-art-neutral@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/pixel-art-neutral/-/pixel-art-neutral-9.2.2.tgz#2772edbff67fc993ecc9eb2c3099246f7a212f88"
+  integrity sha512-CdUY77H6Aj7dKLW3hdkv7tu0XQJArUjaWoXihQxlhl3oVYplWaoyu9omYy5pl8HTqs8YgVTGljjMXYoFuK0JUw==
+
+"@dicebear/pixel-art@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/pixel-art/-/pixel-art-9.2.2.tgz#6416f61e1c2825db516b6c467ce47596f9f865b8"
+  integrity sha512-BvbFdrpzQl04+Y9UsWP63YGug+ENGC7GMG88qbEFWxb/IqRavGa4H3D0T4Zl2PSLiw7f2Ctv98bsCQZ1PtCznQ==
+
+"@dicebear/rings@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/rings/-/rings-9.2.2.tgz#731b55b4a1442ae3edf89387841dc147181906a6"
+  integrity sha512-eD1J1k364Arny+UlvGrk12HP/XGG6WxPSm4BarFqdJGSV45XOZlwqoi7FlcMr9r9yvE/nGL8OizbwMYusEEdjw==
+
+"@dicebear/shapes@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/shapes/-/shapes-9.2.2.tgz#440d1d97882bd476499d95e5180c04e30d721bc1"
+  integrity sha512-e741NNWBa7fg0BjomxXa0fFPME2XCIR0FA+VHdq9AD2taTGHEPsg5x1QJhCRdK6ww85yeu3V3ucpZXdSrHVw5Q==
+
+"@dicebear/thumbs@9.2.2":
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/@dicebear/thumbs/-/thumbs-9.2.2.tgz#234814c889509682992bd3f93daaa960cb5326a2"
+  integrity sha512-FkPLDNu7n5kThLSk7lR/0cz/NkUqgGdZGfLZv6fLkGNGtv6W+e2vZaO7HCXVwIgJ+II+kImN41zVIZ6Jlll7pQ==
 
 "@esbuild/android-arm64@0.17.19":
   version "0.17.19"
@@ -1689,14 +1694,26 @@
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz#8cfaf2ff603e9aabb910e9c0558c26cf32744061"
   integrity sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==
 
-"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
+"@eslint-community/eslint-utils@^4.2.0":
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz#d1145bf2c20132d6400495d6df4bf59362fd9d56"
+  integrity sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==
+  dependencies:
+    eslint-visitor-keys "^3.4.3"
+
+"@eslint-community/eslint-utils@^4.4.0":
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
   integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
   dependencies:
     eslint-visitor-keys "^3.3.0"
 
-"@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1":
+"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.6.1":
+  version "4.12.1"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.1.tgz#cfc6cffe39df390a3841cde2abccf92eaa7ae0e0"
+  integrity sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==
+
+"@eslint-community/regexpp@^4.5.1":
   version "4.10.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
   integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
@@ -1716,10 +1733,10 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.57.0":
-  version "8.57.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
-  integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
+"@eslint/js@8.57.1":
+  version "8.57.1"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2"
+  integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==
 
 "@fontsource/inter@^4.5.15":
   version "4.5.15"
@@ -1770,20 +1787,21 @@
   dependencies:
     tslib "^2.0.1"
 
-"@formatjs/ecma402-abstract@2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-2.0.0.tgz#39197ab90b1c78b7342b129a56a7acdb8f512e17"
-  integrity sha512-rRqXOqdFmk7RYvj4khklyqzcfQl9vEL/usogncBHRZfZBDOwMGuSRNFl02fu5KGHXdbinju+YXyuR+Nk8xlr/g==
+"@formatjs/ecma402-abstract@2.2.4":
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-2.2.4.tgz#355e42d375678229d46dc8ad7a7139520dd03e7b"
+  integrity sha512-lFyiQDVvSbQOpU+WFd//ILolGj4UgA/qXrKeZxdV14uKiAUiPAtX6XAn7WBCRi7Mx6I7EybM9E5yYn4BIpZWYg==
   dependencies:
-    "@formatjs/intl-localematcher" "0.5.4"
-    tslib "^2.4.0"
+    "@formatjs/fast-memoize" "2.2.3"
+    "@formatjs/intl-localematcher" "0.5.8"
+    tslib "2"
 
-"@formatjs/fast-memoize@2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-2.2.0.tgz#33bd616d2e486c3e8ef4e68c99648c196887802b"
-  integrity sha512-hnk/nY8FyrL5YxwP9e4r9dqeM6cAbo8PeU9UjyXojZMNvVad2Z06FAVHyR3Ecw6fza+0GH7vdJgiKIVXTMbSBA==
+"@formatjs/fast-memoize@2.2.3":
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-2.2.3.tgz#74e64109279d5244f9fc281f3ae90c407cece823"
+  integrity sha512-3jeJ+HyOfu8osl3GNSL4vVHUuWFXR03Iz9jjgI7RwjG6ysu/Ymdr0JRCPHfF5yGbTE6JCrd63EpvX1/WybYRbA==
   dependencies:
-    tslib "^2.4.0"
+    tslib "2"
 
 "@formatjs/icu-messageformat-parser@2.1.0":
   version "2.1.0"
@@ -1794,14 +1812,14 @@
     "@formatjs/icu-skeleton-parser" "1.3.6"
     tslib "^2.1.0"
 
-"@formatjs/icu-messageformat-parser@2.7.8":
-  version "2.7.8"
-  resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.7.8.tgz#f6d7643001e9bb5930d812f1f9a9856f30fa0343"
-  integrity sha512-nBZJYmhpcSX0WeJ5SDYUkZ42AgR3xiyhNCsQweFx3cz/ULJjym8bHAzWKvG5e2+1XO98dBYC0fWeeAECAVSwLA==
+"@formatjs/icu-messageformat-parser@2.9.4":
+  version "2.9.4"
+  resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.9.4.tgz#52501fbdc122a86097644f03ae1117b9ced00872"
+  integrity sha512-Tbvp5a9IWuxUcpWNIW6GlMQYEc4rwNHR259uUFoKWNN1jM9obf9Ul0e+7r7MvFOBNcN+13K7NuKCKqQiAn1QEg==
   dependencies:
-    "@formatjs/ecma402-abstract" "2.0.0"
-    "@formatjs/icu-skeleton-parser" "1.8.2"
-    tslib "^2.4.0"
+    "@formatjs/ecma402-abstract" "2.2.4"
+    "@formatjs/icu-skeleton-parser" "1.8.8"
+    tslib "2"
 
 "@formatjs/icu-skeleton-parser@1.3.6":
   version "1.3.6"
@@ -1811,31 +1829,31 @@
     "@formatjs/ecma402-abstract" "1.11.4"
     tslib "^2.1.0"
 
-"@formatjs/icu-skeleton-parser@1.8.2":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.2.tgz#2252c949ae84ee66930e726130ea66731a123c9f"
-  integrity sha512-k4ERKgw7aKGWJZgTarIcNEmvyTVD9FYh0mTrrBMHZ1b8hUu6iOJ4SzsZlo3UNAvHYa+PnvntIwRPt1/vy4nA9Q==
+"@formatjs/icu-skeleton-parser@1.8.8":
+  version "1.8.8"
+  resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.8.tgz#a16eff7fd040acf096fb1853c99527181d38cf90"
+  integrity sha512-vHwK3piXwamFcx5YQdCdJxUQ1WdTl6ANclt5xba5zLGDv5Bsur7qz8AD7BevaKxITwpgDeU0u8My3AIibW9ywA==
   dependencies:
-    "@formatjs/ecma402-abstract" "2.0.0"
-    tslib "^2.4.0"
+    "@formatjs/ecma402-abstract" "2.2.4"
+    tslib "2"
 
-"@formatjs/intl-displaynames@6.6.8":
-  version "6.6.8"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-6.6.8.tgz#2f5afac8df83167f5a6ef8543600eaf1ef99c885"
-  integrity sha512-Lgx6n5KxN16B3Pb05z3NLEBQkGoXnGjkTBNCZI+Cn17YjHJ3fhCeEJJUqRlIZmJdmaXQhjcQVDp6WIiNeRYT5g==
+"@formatjs/intl-displaynames@6.8.5":
+  version "6.8.5"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-6.8.5.tgz#e9cd778764209534795f2a579d0269b26631d1ae"
+  integrity sha512-85b+GdAKCsleS6cqVxf/Aw/uBd+20EM0wDpgaxzHo3RIR3bxF4xCJqH/Grbzx8CXurTgDDZHPdPdwJC+May41w==
   dependencies:
-    "@formatjs/ecma402-abstract" "2.0.0"
-    "@formatjs/intl-localematcher" "0.5.4"
-    tslib "^2.4.0"
+    "@formatjs/ecma402-abstract" "2.2.4"
+    "@formatjs/intl-localematcher" "0.5.8"
+    tslib "2"
 
-"@formatjs/intl-listformat@7.5.7":
-  version "7.5.7"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-7.5.7.tgz#125e05105fabd1ae5f11881d6ab74484f2098ee4"
-  integrity sha512-MG2TSChQJQT9f7Rlv+eXwUFiG24mKSzmF144PLb8m8OixyXqn4+YWU+5wZracZGCgVTVmx8viCf7IH3QXoiB2g==
+"@formatjs/intl-listformat@7.7.5":
+  version "7.7.5"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-7.7.5.tgz#e7d9fd66b648bbe878f9c64fcba756f1634a7794"
+  integrity sha512-Wzes10SMNeYgnxYiKsda4rnHP3Q3II4XT2tZyOgnH5fWuHDtIkceuWlRQNsvrI3uiwP4hLqp2XdQTCsfkhXulg==
   dependencies:
-    "@formatjs/ecma402-abstract" "2.0.0"
-    "@formatjs/intl-localematcher" "0.5.4"
-    tslib "^2.4.0"
+    "@formatjs/ecma402-abstract" "2.2.4"
+    "@formatjs/intl-localematcher" "0.5.8"
+    tslib "2"
 
 "@formatjs/intl-localematcher@0.2.25":
   version "0.2.25"
@@ -1844,12 +1862,12 @@
   dependencies:
     tslib "^2.1.0"
 
-"@formatjs/intl-localematcher@0.5.4":
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.5.4.tgz#caa71f2e40d93e37d58be35cfffe57865f2b366f"
-  integrity sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g==
+"@formatjs/intl-localematcher@0.5.8":
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.5.8.tgz#b11bbd04bd3551f7cadcb1ef1e231822d0e3c97e"
+  integrity sha512-I+WDNWWJFZie+jkfkiK5Mp4hEDyRSEvmyfYadflOno/mmKJKcB17fEpEH0oJu/OWhhCJ8kJBDz2YMd/6cDl7Mg==
   dependencies:
-    tslib "^2.4.0"
+    tslib "2"
 
 "@formatjs/intl-numberformat@^5.5.2":
   version "5.7.6"
@@ -1859,18 +1877,18 @@
     "@formatjs/ecma402-abstract" "1.4.0"
     tslib "^2.0.1"
 
-"@formatjs/intl@2.10.4":
-  version "2.10.4"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-2.10.4.tgz#e1819e0858fb05ca65923a020f346bc74e894e92"
-  integrity sha512-56483O+HVcL0c7VucAS2tyH020mt9XTozZO67cwtGg0a7KWDukS/FzW3OnvaHmTHDuYsoPIzO+ZHVfU6fT/bJw==
-  dependencies:
-    "@formatjs/ecma402-abstract" "2.0.0"
-    "@formatjs/fast-memoize" "2.2.0"
-    "@formatjs/icu-messageformat-parser" "2.7.8"
-    "@formatjs/intl-displaynames" "6.6.8"
-    "@formatjs/intl-listformat" "7.5.7"
-    intl-messageformat "10.5.14"
-    tslib "^2.4.0"
+"@formatjs/intl@2.10.15":
+  version "2.10.15"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-2.10.15.tgz#c592507512d7827c760b74bb8afc37629f89523a"
+  integrity sha512-i6+xVqT+6KCz7nBfk4ybMXmbKO36tKvbMKtgFz9KV+8idYFyFbfwKooYk8kGjyA5+T5f1kEPQM5IDLXucTAQ9g==
+  dependencies:
+    "@formatjs/ecma402-abstract" "2.2.4"
+    "@formatjs/fast-memoize" "2.2.3"
+    "@formatjs/icu-messageformat-parser" "2.9.4"
+    "@formatjs/intl-displaynames" "6.8.5"
+    "@formatjs/intl-listformat" "7.7.5"
+    intl-messageformat "10.7.7"
+    tslib "2"
 
 "@formatjs/ts-transformer@3.9.4":
   version "3.9.4"
@@ -1892,12 +1910,12 @@
     tslib "^2.0.1"
     typescript "^4.0"
 
-"@humanwhocodes/config-array@^0.11.14":
-  version "0.11.14"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
-  integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==
+"@humanwhocodes/config-array@^0.13.0":
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.13.0.tgz#fb907624df3256d04b9aa2df50d7aa97ec648748"
+  integrity sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==
   dependencies:
-    "@humanwhocodes/object-schema" "^2.0.2"
+    "@humanwhocodes/object-schema" "^2.0.3"
     debug "^4.3.1"
     minimatch "^3.0.5"
 
@@ -1906,10 +1924,10 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@humanwhocodes/object-schema@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917"
-  integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==
+"@humanwhocodes/object-schema@^2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
+  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
 
 "@isaacs/cliui@^8.0.2":
   version "8.0.2"
@@ -2202,10 +2220,10 @@
   resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.10.tgz#1d3178340028ced2d679f84140877db4f420333c"
   integrity sha512-dZIu93Bf5LUtluBXIv4woQw2cZVZ2DJTjax5/5DOs3lzEOeKLy7GxRSr4caK9/SCPdaW6bCgpye6+n4Dh9oJPw==
 
-"@next/eslint-plugin-next@14.2.5":
-  version "14.2.5"
-  resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-14.2.5.tgz#f7e3ff3efe40a2855e5f29bc2692175f85913ba8"
-  integrity sha512-LY3btOpPh+OTIpviNojDpUdIbHW9j0JBYBjsIp8IxtDFfYFyORvw3yNq6N231FVqQA7n7lwaf7xHbVJlA1ED7g==
+"@next/eslint-plugin-next@14.2.18":
+  version "14.2.18"
+  resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-14.2.18.tgz#602d2b1b1083e3d290116beb6d340e00930e63ab"
+  integrity sha512-KyYTbZ3GQwWOjX3Vi1YcQbekyGP0gdammb7pbmmi25HBUCINzDReyrzCMOJIeZisK1Q3U6DT5Rlc4nm2/pQeXA==
   dependencies:
     glob "10.3.10"
 
@@ -2275,6 +2293,11 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
+"@nolyfill/is-core-module@1.0.39":
+  version "1.0.39"
+  resolved "https://registry.yarnpkg.com/@nolyfill/is-core-module/-/is-core-module-1.0.39.tgz#3dc35ba0f1e66b403c00b39344f870298ebb1c8e"
+  integrity sha512-nn5ozdjYQpUCZlWGuxcJY/KpxkWQs4DcbMCmKojjyrYDEAGy4Ce19NN4v5MduafTwJlbKc99UA8YhSVqq9yPZA==
+
 "@pkgjs/parseargs@^0.11.0":
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
@@ -2326,50 +2349,50 @@
   dependencies:
     "@prisma/debug" "5.17.0"
 
-"@react-spring/animated@~9.7.4":
-  version "9.7.4"
-  resolved "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.7.4.tgz#c712b2d3dc9312ef41aa8886818b539151bda062"
-  integrity sha512-7As+8Pty2QlemJ9O5ecsuPKjmO0NKvmVkRR1n6mEotFgWar8FKuQt2xgxz3RTgxcccghpx1YdS1FCdElQNexmQ==
+"@react-spring/animated@~9.7.5":
+  version "9.7.5"
+  resolved "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.7.5.tgz#eb0373aaf99b879736b380c2829312dae3b05f28"
+  integrity sha512-Tqrwz7pIlsSDITzxoLS3n/v/YCUHQdOIKtOJf4yL6kYVSDTSmVK1LI1Q3M/uu2Sx4X3pIWF3xLUhlsA6SPNTNg==
   dependencies:
-    "@react-spring/shared" "~9.7.4"
-    "@react-spring/types" "~9.7.4"
+    "@react-spring/shared" "~9.7.5"
+    "@react-spring/types" "~9.7.5"
 
-"@react-spring/core@~9.7.4":
-  version "9.7.4"
-  resolved "https://registry.yarnpkg.com/@react-spring/core/-/core-9.7.4.tgz#0eaa0b5da3d18036d87a571f23079819d45a9f46"
-  integrity sha512-GzjA44niEJBFUe9jN3zubRDDDP2E4tBlhNlSIkTChiNf9p4ZQlgXBg50qbXfSXHQPHak/ExYxwhipKVsQ/sUTw==
+"@react-spring/core@~9.7.5":
+  version "9.7.5"
+  resolved "https://registry.yarnpkg.com/@react-spring/core/-/core-9.7.5.tgz#72159079f52c1c12813d78b52d4f17c0bf6411f7"
+  integrity sha512-rmEqcxRcu7dWh7MnCcMXLvrf6/SDlSokLaLTxiPlAYi11nN3B5oiCUAblO72o+9z/87j2uzxa2Inm8UbLjXA+w==
   dependencies:
-    "@react-spring/animated" "~9.7.4"
-    "@react-spring/shared" "~9.7.4"
-    "@react-spring/types" "~9.7.4"
+    "@react-spring/animated" "~9.7.5"
+    "@react-spring/shared" "~9.7.5"
+    "@react-spring/types" "~9.7.5"
 
-"@react-spring/rafz@~9.7.4":
-  version "9.7.4"
-  resolved "https://registry.yarnpkg.com/@react-spring/rafz/-/rafz-9.7.4.tgz#d53aa45a8cb116b81b27ba29e0cc15470ccfd449"
-  integrity sha512-mqDI6rW0Ca8IdryOMiXRhMtVGiEGLIO89vIOyFQXRIwwIMX30HLya24g9z4olDvFyeDW3+kibiKwtZnA4xhldA==
+"@react-spring/rafz@~9.7.5":
+  version "9.7.5"
+  resolved "https://registry.yarnpkg.com/@react-spring/rafz/-/rafz-9.7.5.tgz#ee7959676e7b5d6a3813e8c17d5e50df98b95df9"
+  integrity sha512-5ZenDQMC48wjUzPAm1EtwQ5Ot3bLIAwwqP2w2owG5KoNdNHpEJV263nGhCeKKmuA3vG2zLLOdu3or6kuDjA6Aw==
 
-"@react-spring/shared@~9.7.4":
-  version "9.7.4"
-  resolved "https://registry.yarnpkg.com/@react-spring/shared/-/shared-9.7.4.tgz#8ac57505072c2aee33d77c47c4269347061a3377"
-  integrity sha512-bEPI7cQp94dOtCFSEYpxvLxj0+xQfB5r9Ru1h8OMycsIq7zFZon1G0sHrBLaLQIWeMCllc4tVDYRTLIRv70C8w==
+"@react-spring/shared@~9.7.5":
+  version "9.7.5"
+  resolved "https://registry.yarnpkg.com/@react-spring/shared/-/shared-9.7.5.tgz#6d513622df6ad750bbbd4dedb4ca0a653ec92073"
+  integrity sha512-wdtoJrhUeeyD/PP/zo+np2s1Z820Ohr/BbuVYv+3dVLW7WctoiN7std8rISoYoHpUXtbkpesSKuPIw/6U1w1Pw==
   dependencies:
-    "@react-spring/rafz" "~9.7.4"
-    "@react-spring/types" "~9.7.4"
+    "@react-spring/rafz" "~9.7.5"
+    "@react-spring/types" "~9.7.5"
 
-"@react-spring/types@~9.7.4":
-  version "9.7.4"
-  resolved "https://registry.yarnpkg.com/@react-spring/types/-/types-9.7.4.tgz#c849a7f062b5163d078e5e75f28c8f6acf91792e"
-  integrity sha512-iQVztO09ZVfsletMiY+DpT/JRiBntdsdJ4uqk3UJFhrhS8mIC9ZOZbmfGSRs/kdbNPQkVyzucceDicQ/3Mlj9g==
+"@react-spring/types@~9.7.5":
+  version "9.7.5"
+  resolved "https://registry.yarnpkg.com/@react-spring/types/-/types-9.7.5.tgz#e5dd180f3ed985b44fd2cd2f32aa9203752ef3e8"
+  integrity sha512-HVj7LrZ4ReHWBimBvu2SKND3cDVUPWKLqRTmWe/fNY6o1owGOX0cAHbdPDTMelgBlVbrTKrre6lFkhqGZErK/g==
 
 "@react-spring/web@^9.7.3":
-  version "9.7.4"
-  resolved "https://registry.yarnpkg.com/@react-spring/web/-/web-9.7.4.tgz#0086ab5dcf17e6a8f3d7e7f8041ccb4cc2fa10dc"
-  integrity sha512-UMvCZp7I5HCVIleSa4BwbNxynqvj+mJjG2m20VO2yPoi2pnCYANy58flvz9v/YcXTAvsmL655FV3pm5fbr6akA==
+  version "9.7.5"
+  resolved "https://registry.yarnpkg.com/@react-spring/web/-/web-9.7.5.tgz#7d7782560b3a6fb9066b52824690da738605de80"
+  integrity sha512-lmvqGwpe+CSttsWNZVr+Dg62adtKhauGwLyGE/RRyZ8AAMLgb9x3NDMA5RMElXo+IMyTkPp7nxTB8ZQlmhb6JQ==
   dependencies:
-    "@react-spring/animated" "~9.7.4"
-    "@react-spring/core" "~9.7.4"
-    "@react-spring/shared" "~9.7.4"
-    "@react-spring/types" "~9.7.4"
+    "@react-spring/animated" "~9.7.5"
+    "@react-spring/core" "~9.7.5"
+    "@react-spring/shared" "~9.7.5"
+    "@react-spring/types" "~9.7.5"
 
 "@redis/bloom@1.2.0":
   version "1.2.0"
@@ -2406,11 +2429,9 @@
   integrity sha512-IFjIgTusQym2B5IZJG3XKr5llka7ey84fw/NOYqESP5WUfQs9zz1ww/9+qoz4ka/S6KcGBodzlCeZ5UImKbscg==
 
 "@rollup/plugin-alias@^5.0.0":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-alias/-/plugin-alias-5.1.0.tgz#99a94accc4ff9a3483be5baeedd5d7da3b597e93"
-  integrity sha512-lpA3RZ9PdIG7qqhEfv79tBffNaoDuukFDrmhLqg9ifv99u/ehn+lOg30x2zmhf8AQqQUZaMk/B9fZraQ6/acDQ==
-  dependencies:
-    slash "^4.0.0"
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-alias/-/plugin-alias-5.1.1.tgz#53601d88cda8b1577aa130b4a6e452283605bf26"
+  integrity sha512-PR9zDb+rOzkRb2VD+EuKB7UC41vU5DIwZ5qqCpk0KJudcWAyi8rvYOhS7+L5aZCspw1stTViLgN5v6FF1p5cgQ==
 
 "@rollup/plugin-commonjs@^25.0.4":
   version "25.0.8"
@@ -2432,14 +2453,13 @@
     "@rollup/pluginutils" "^5.1.0"
 
 "@rollup/plugin-node-resolve@^15.2.0":
-  version "15.2.3"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz#e5e0b059bd85ca57489492f295ce88c2d4b0daf9"
-  integrity sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==
+  version "15.3.0"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.3.0.tgz#efbb35515c9672e541c08d59caba2eff492a55d5"
+  integrity sha512-9eO5McEICxMzJpDW9OnMYSv4Sta3hmt7VtBFz5zR9273suNOydOyq/FrGeGy+KsTRFm8w0SLVhzig2ILFT63Ag==
   dependencies:
     "@rollup/pluginutils" "^5.0.1"
     "@types/resolve" "1.20.2"
     deepmerge "^4.2.2"
-    is-builtin-module "^3.2.1"
     is-module "^1.0.0"
     resolve "^1.22.1"
 
@@ -2451,14 +2471,14 @@
     "@rollup/pluginutils" "^5.0.1"
     magic-string "^0.30.3"
 
-"@rollup/pluginutils@^5.0.1", "@rollup/pluginutils@^5.1.0":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.1.0.tgz#7e53eddc8c7f483a4ad0b94afb1f7f5fd3c771e0"
-  integrity sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==
+"@rollup/pluginutils@^5.0.1":
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.1.3.tgz#3001bf1a03f3ad24457591f2c259c8e514e0dbdf"
+  integrity sha512-Pnsb6f32CD2W3uCaLZIzDmeFyQ2b8UWMFI7xtwUezpcGBDVDW6y9XgAWIlARiGAo6eNF5FK5aQTr0LFyNyqq5A==
   dependencies:
     "@types/estree" "^1.0.0"
     estree-walker "^2.0.2"
-    picomatch "^2.3.1"
+    picomatch "^4.0.2"
 
 "@rollup/pluginutils@^5.0.2":
   version "5.0.5"
@@ -2469,6 +2489,20 @@
     estree-walker "^2.0.2"
     picomatch "^2.3.1"
 
+"@rollup/pluginutils@^5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.1.0.tgz#7e53eddc8c7f483a4ad0b94afb1f7f5fd3c771e0"
+  integrity sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==
+  dependencies:
+    "@types/estree" "^1.0.0"
+    estree-walker "^2.0.2"
+    picomatch "^2.3.1"
+
+"@rtsao/scc@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
+  integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
+
 "@rushstack/eslint-patch@^1.3.3":
   version "1.10.4"
   resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.10.4.tgz#427d5549943a9c6fce808e39ea64dbe60d4047f1"
@@ -2627,17 +2661,17 @@
     "@swc/counter" "^0.1.3"
     tslib "^2.4.0"
 
-"@tanstack/query-core@5.51.21":
-  version "5.51.21"
-  resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-5.51.21.tgz#a510469c6c30d3de2a8b8798e340169a4b0fd08f"
-  integrity sha512-POQxm42IUp6n89kKWF4IZi18v3fxQWFRolvBA6phNVmA8psdfB1MvDnGacCJdS+EOX12w/CyHM62z//rHmYmvw==
+"@tanstack/query-core@5.60.5":
+  version "5.60.5"
+  resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-5.60.5.tgz#37b7c5ab7e6894cea9ef341299a7a3febc2ea361"
+  integrity sha512-jiS1aC3XI3BJp83ZiTuDLerTmn9P3U95r6p+6/SNauLJaYxfIC4dMuWygwnBHIZxjn2zJqEpj3nysmPieoxfPQ==
 
 "@tanstack/react-query@^5.28.6":
-  version "5.51.23"
-  resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-5.51.23.tgz#83c223f4cb6054b206de8856b73ca7e41a63ba1f"
-  integrity sha512-CfJCfX45nnVIZjQBRYYtvVMIsGgWLKLYC4xcUiYEey671n1alvTZoCBaU9B85O8mF/tx9LPyrI04A6Bs2THv4A==
+  version "5.60.5"
+  resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-5.60.5.tgz#3194c390f7eff20542b321c3042880dc3f1a81e2"
+  integrity sha512-M77bOsPwj1wYE56gk7iJvxGAr4IC12NWdIDhT+Eo8ldkWRHMvIR8I/rufIvT1OXoV/bl7EECwuRuMlxxWtvW2Q==
   dependencies:
-    "@tanstack/query-core" "5.51.21"
+    "@tanstack/query-core" "5.60.5"
 
 "@trysound/sax@0.2.0":
   version "0.2.0"
@@ -2716,13 +2750,13 @@
     "@babel/types" "^7.20.7"
 
 "@types/cypress@^1.1.3":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@types/cypress/-/cypress-1.1.3.tgz#0a700c040d53e9e12b5af98e41d4a88c39f39b6a"
-  integrity sha512-OXe0Gw8LeCflkG1oPgFpyrYWJmEKqYncBsD/J0r17r0ETx/TnIGDNLwXt/pFYSYuYTpzcq1q3g62M9DrfsBL4g==
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/@types/cypress/-/cypress-1.1.6.tgz#b190688acffb847a3f5c4cee15c82d4f2a342ee6"
+  integrity sha512-CfeLLD3+6vIWe2AO5hR63f1c8EbRzrp/j1ExubAwOTpwZFZvF3Nm9cOPQiUwzNmAUmZuhO0QVH98Qlujni6nPw==
   dependencies:
     cypress "*"
 
-"@types/estree@*", "@types/estree@^1.0.0":
+"@types/estree@*":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
   integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
@@ -2732,6 +2766,11 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"
   integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==
 
+"@types/estree@^1.0.0":
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
+  integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
+
 "@types/fs-extra@^8.0.1":
   version "8.1.4"
   resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.4.tgz#8171df1d16a80d69fc9c3aab07d7961349a5cb8b"
@@ -2761,18 +2800,18 @@
   dependencies:
     "@types/node" "*"
 
-"@types/hoist-non-react-statics@^3.3.0":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.4.tgz#cc477ce0283bb9d19ea0cbfa2941fe2c8493a1be"
-  integrity sha512-ZchYkbieA+7tnxwX/SCBySx9WwvWR8TaP5tb2jRAzwvLb/rWchGw3v0w3pqUbUvj0GCwW2Xz/AVPSk6kUGctXQ==
+"@types/hoist-non-react-statics@3":
+  version "3.3.5"
+  resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz#dab7867ef789d87e2b4b0003c9d65c49cc44a494"
+  integrity sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==
   dependencies:
     "@types/react" "*"
     hoist-non-react-statics "^3.3.0"
 
-"@types/hoist-non-react-statics@^3.3.1":
-  version "3.3.5"
-  resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz#dab7867ef789d87e2b4b0003c9d65c49cc44a494"
-  integrity sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==
+"@types/hoist-non-react-statics@^3.3.0":
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.4.tgz#cc477ce0283bb9d19ea0cbfa2941fe2c8493a1be"
+  integrity sha512-ZchYkbieA+7tnxwX/SCBySx9WwvWR8TaP5tb2jRAzwvLb/rWchGw3v0w3pqUbUvj0GCwW2Xz/AVPSk6kUGctXQ==
   dependencies:
     "@types/react" "*"
     hoist-non-react-statics "^3.3.0"
@@ -2797,9 +2836,9 @@
     "@types/istanbul-lib-report" "*"
 
 "@types/jest@^29.5.12":
-  version "29.5.12"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.12.tgz#7f7dc6eb4cf246d2474ed78744b05d06ce025544"
-  integrity sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==
+  version "29.5.14"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.14.tgz#2b910912fa1d6856cadcd0c1f95af7df1d6049e5"
+  integrity sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==
   dependencies:
     expect "^29.0.0"
     pretty-format "^29.0.0"
@@ -2845,11 +2884,11 @@
   integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==
 
 "@types/node@*":
-  version "22.4.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.4.0.tgz#c295fe1d6f5f58916cc61dbef8cf65b5b9b71de9"
-  integrity sha512-49AbMDwYUz7EXxKU/r7mXOsxwFr4BYbvB7tWYxVuLdb2ibd30ijjXINSMAHiEEZk5PCRBmW1gUeisn2VMKt3cQ==
+  version "22.9.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.9.0.tgz#b7f16e5c3384788542c72dc3d561a7ceae2c0365"
+  integrity sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==
   dependencies:
-    undici-types "~6.19.2"
+    undici-types "~6.19.8"
 
 "@types/node@14":
   version "14.18.63"
@@ -2862,11 +2901,11 @@
   integrity sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==
 
 "@types/node@^20.9.0":
-  version "20.15.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.15.0.tgz#7305f7fe7c62cd31047ed8d65c5092f0b0e1c55d"
-  integrity sha512-eQf4OkH6gA9v1W0iEpht/neozCsZKMTK+C4cU6/fv7wtJCCL8LEQ4hie2Ln8ZP/0YYM2xGj7//f8xyqItkJ6QA==
+  version "20.17.6"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.17.6.tgz#6e4073230c180d3579e8c60141f99efdf5df0081"
+  integrity sha512-VEI7OdvK2wP7XHnsuXbAJnEpEkF6NjSN45QJlL4VGqZSXsnicpesdTWsg9RISeSdYd3yeRj/y3k5KGjUXYnFwQ==
   dependencies:
-    undici-types "~6.13.0"
+    undici-types "~6.19.2"
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.3"
@@ -2874,14 +2913,14 @@
   integrity sha512-ehPtgRgaULsFG8x0NeYJvmyH1hmlfsNLujHe9dQEia/7MAJYdzMSi19JtchUHjmBA6XC/75dK55mzZH+RyieSg==
 
 "@types/prop-types@*":
-  version "15.7.12"
-  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.12.tgz#12bb1e2be27293c1406acb6af1c3f3a1481d98c6"
-  integrity sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==
+  version "15.7.13"
+  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.13.tgz#2af91918ee12d9d32914feb13f5326658461b451"
+  integrity sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA==
 
 "@types/react-dom@^18.2.17":
-  version "18.3.0"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.3.0.tgz#0cbc818755d87066ab6ca74fbedb2547d74a82b0"
-  integrity sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==
+  version "18.3.1"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.3.1.tgz#1e4654c08a9cdcfb6594c780ac59b55aad42fe07"
+  integrity sha512-qW1Mfv8taImTthu4KoXgDfLuk4bydU6Q/TkADnDWWHwi4NX4BR+LWfTp2sVmTqRrsHvyDDTelgelxJ+SsejKKQ==
   dependencies:
     "@types/react" "*"
 
@@ -2903,9 +2942,9 @@
     "@types/react" "*"
 
 "@types/react@*", "@types/react@16 || 17 || 18", "@types/react@^18.2.41":
-  version "18.3.3"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.3.tgz#9679020895318b0915d7a3ab004d92d33375c45f"
-  integrity sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==
+  version "18.3.12"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.12.tgz#99419f182ccd69151813b7ee24b792fe08774f60"
+  integrity sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==
   dependencies:
     "@types/prop-types" "*"
     csstype "^3.0.2"
@@ -2933,9 +2972,9 @@
   integrity sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==
 
 "@types/sizzle@^2.3.2":
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.8.tgz#518609aefb797da19bf222feb199e8f653ff7627"
-  integrity sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==
+  version "2.3.9"
+  resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.9.tgz#d4597dbd4618264c414d7429363e3f50acb66ea2"
+  integrity sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==
 
 "@types/stack-utils@^2.0.0":
   version "2.0.3"
@@ -2948,9 +2987,9 @@
   integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==
 
 "@types/yargs@^17.0.8":
-  version "17.0.32"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.32.tgz#030774723a2f7faafebf645f4e5a48371dca6229"
-  integrity sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==
+  version "17.0.33"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.33.tgz#8c32303da83eec050a84b3c7ae7b9f922d13e32d"
+  integrity sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==
   dependencies:
     "@types/yargs-parser" "*"
 
@@ -2961,6 +3000,21 @@
   dependencies:
     "@types/node" "*"
 
+"@typescript-eslint/eslint-plugin@^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0":
+  version "8.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.15.0.tgz#c95c6521e70c8b095a684d884d96c0c1c63747d2"
+  integrity sha512-+zkm9AR1Ds9uLWN3fkoeXgFppaQ+uEVtfOV62dDmsy9QCNqlRHWNEck4yarvRNrvRcHQLGfqBNui3cimoz8XAg==
+  dependencies:
+    "@eslint-community/regexpp" "^4.10.0"
+    "@typescript-eslint/scope-manager" "8.15.0"
+    "@typescript-eslint/type-utils" "8.15.0"
+    "@typescript-eslint/utils" "8.15.0"
+    "@typescript-eslint/visitor-keys" "8.15.0"
+    graphemer "^1.4.0"
+    ignore "^5.3.1"
+    natural-compare "^1.4.0"
+    ts-api-utils "^1.3.0"
+
 "@typescript-eslint/eslint-plugin@^6.7.3":
   version "6.21.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz#30830c1ca81fd5f3c2714e524c4303e0194f9cd3"
@@ -2978,15 +3032,15 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/parser@^5.4.2 || ^6.0.0 || 7.0.0 - 7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.2.0.tgz#44356312aea8852a3a82deebdacd52ba614ec07a"
-  integrity sha512-5FKsVcHTk6TafQKQbuIVkXq58Fnbkd2wDL4LB7AURN7RUOu1utVP+G8+6u3ZhEroW3DF6hyo3ZEXxgKgp4KeCg==
+"@typescript-eslint/parser@^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0":
+  version "8.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.15.0.tgz#92610da2b3af702cfbc02a46e2a2daa6260a9045"
+  integrity sha512-7n59qFpghG4uazrF9qtGKBZXn7Oz4sOMm8dwNWDQY96Xlm2oX67eipqcblDj+oY1lLCbf1oltMZFpUso66Kl1A==
   dependencies:
-    "@typescript-eslint/scope-manager" "7.2.0"
-    "@typescript-eslint/types" "7.2.0"
-    "@typescript-eslint/typescript-estree" "7.2.0"
-    "@typescript-eslint/visitor-keys" "7.2.0"
+    "@typescript-eslint/scope-manager" "8.15.0"
+    "@typescript-eslint/types" "8.15.0"
+    "@typescript-eslint/typescript-estree" "8.15.0"
+    "@typescript-eslint/visitor-keys" "8.15.0"
     debug "^4.3.4"
 
 "@typescript-eslint/parser@^6.7.3":
@@ -3016,13 +3070,13 @@
     "@typescript-eslint/types" "6.21.0"
     "@typescript-eslint/visitor-keys" "6.21.0"
 
-"@typescript-eslint/scope-manager@7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.2.0.tgz#cfb437b09a84f95a0930a76b066e89e35d94e3da"
-  integrity sha512-Qh976RbQM/fYtjx9hs4XkayYujB/aPwglw2choHmf3zBjB4qOywWSdt9+KLRdHubGcoSwBnXUH2sR3hkyaERRg==
+"@typescript-eslint/scope-manager@8.15.0":
+  version "8.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.15.0.tgz#28a1a0f13038f382424f45a988961acaca38f7c6"
+  integrity sha512-QRGy8ADi4J7ii95xz4UoiymmmMd/zuy9azCaamnZ3FM8T5fZcex8UfJcjkiEZjJSztKfEBe3dZ5T/5RHAmw2mA==
   dependencies:
-    "@typescript-eslint/types" "7.2.0"
-    "@typescript-eslint/visitor-keys" "7.2.0"
+    "@typescript-eslint/types" "8.15.0"
+    "@typescript-eslint/visitor-keys" "8.15.0"
 
 "@typescript-eslint/type-utils@6.21.0":
   version "6.21.0"
@@ -3034,6 +3088,16 @@
     debug "^4.3.4"
     ts-api-utils "^1.0.1"
 
+"@typescript-eslint/type-utils@8.15.0":
+  version "8.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.15.0.tgz#a6da0f93aef879a68cc66c73fe42256cb7426c72"
+  integrity sha512-UU6uwXDoI3JGSXmcdnP5d8Fffa2KayOhUUqr/AiBnG1Gl7+7ut/oyagVeSkh7bxQ0zSXV9ptRh/4N15nkCqnpw==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "8.15.0"
+    "@typescript-eslint/utils" "8.15.0"
+    debug "^4.3.4"
+    ts-api-utils "^1.3.0"
+
 "@typescript-eslint/types@5.62.0":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
@@ -3044,10 +3108,10 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d"
   integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==
 
-"@typescript-eslint/types@7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.2.0.tgz#0feb685f16de320e8520f13cca30779c8b7c403f"
-  integrity sha512-XFtUHPI/abFhm4cbCDc5Ykc8npOKBSJePY3a3s+lwumt7XWJuzP5cZcfZ610MIPHjQjNsOLlYK8ASPaNG8UiyA==
+"@typescript-eslint/types@8.15.0":
+  version "8.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.15.0.tgz#4958edf3d83e97f77005f794452e595aaf6430fc"
+  integrity sha512-n3Gt8Y/KyJNe0S3yDCD2RVKrHBC4gTUcLTebVBXacPy091E6tNspFLKRXlk3hwT4G55nfr1n2AdFqi/XMxzmPQ==
 
 "@typescript-eslint/typescript-estree@5.62.0":
   version "5.62.0"
@@ -3076,19 +3140,19 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/typescript-estree@7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.2.0.tgz#5beda2876c4137f8440c5a84b4f0370828682556"
-  integrity sha512-cyxS5WQQCoBwSakpMrvMXuMDEbhOo9bNHHrNcEWis6XHx6KF518tkF1wBvKIn/tpq5ZpUYK7Bdklu8qY0MsFIA==
+"@typescript-eslint/typescript-estree@8.15.0":
+  version "8.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.15.0.tgz#915c94e387892b114a2a2cc0df2d7f19412c8ba7"
+  integrity sha512-1eMp2JgNec/niZsR7ioFBlsh/Fk0oJbhaqO0jRyQBMgkz7RrFfkqF9lYYmBoGBaSiLnu8TAPQTwoTUiSTUW9dg==
   dependencies:
-    "@typescript-eslint/types" "7.2.0"
-    "@typescript-eslint/visitor-keys" "7.2.0"
+    "@typescript-eslint/types" "8.15.0"
+    "@typescript-eslint/visitor-keys" "8.15.0"
     debug "^4.3.4"
-    globby "^11.1.0"
+    fast-glob "^3.3.2"
     is-glob "^4.0.3"
-    minimatch "9.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
+    minimatch "^9.0.4"
+    semver "^7.6.0"
+    ts-api-utils "^1.3.0"
 
 "@typescript-eslint/utils@6.21.0":
   version "6.21.0"
@@ -3103,6 +3167,16 @@
     "@typescript-eslint/typescript-estree" "6.21.0"
     semver "^7.5.4"
 
+"@typescript-eslint/utils@8.15.0":
+  version "8.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.15.0.tgz#ac04679ad19252776b38b81954b8e5a65567cef6"
+  integrity sha512-k82RI9yGhr0QM3Dnq+egEpz9qB6Un+WLYhmoNcvl8ltMEededhh7otBVVIDDsEEttauwdY/hQoSsOv13lxrFzQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.4.0"
+    "@typescript-eslint/scope-manager" "8.15.0"
+    "@typescript-eslint/types" "8.15.0"
+    "@typescript-eslint/typescript-estree" "8.15.0"
+
 "@typescript-eslint/utils@^5.10.0":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86"
@@ -3133,13 +3207,13 @@
     "@typescript-eslint/types" "6.21.0"
     eslint-visitor-keys "^3.4.1"
 
-"@typescript-eslint/visitor-keys@7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.2.0.tgz#5035f177752538a5750cca1af6044b633610bf9e"
-  integrity sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A==
+"@typescript-eslint/visitor-keys@8.15.0":
+  version "8.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.15.0.tgz#9ea5a85eb25401d2aa74ec8a478af4e97899ea12"
+  integrity sha512-h8vYOulWec9LhpwfAdZf2bjr8xIp0KNKnpgqSz0qqYYKAW/QZKw3ktRndbiAtUz4acH4QLQavwZBYCc0wulA/Q==
   dependencies:
-    "@typescript-eslint/types" "7.2.0"
-    eslint-visitor-keys "^3.4.1"
+    "@typescript-eslint/types" "8.15.0"
+    eslint-visitor-keys "^4.2.0"
 
 "@umami/prisma-client@^0.14.0":
   version "0.14.0"
@@ -3274,9 +3348,9 @@ acorn@^8.8.2:
   integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
 
 acorn@^8.9.0:
-  version "8.11.3"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
-  integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
+  version "8.14.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0"
+  integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==
 
 aggregate-error@^3.0.0:
   version "3.1.0"
@@ -3350,9 +3424,9 @@ ansi-regex@^5.0.1:
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
 ansi-regex@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
-  integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.1.0.tgz#95ec409c69619d6cb1b8b34f14b660ef28ebd654"
+  integrity sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==
 
 ansi-styles@^3.2.1:
   version "3.2.1"
@@ -3408,14 +3482,12 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-aria-query@~5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.1.3.tgz#19db27cd101152773631396f7a95a3b58c22c35e"
-  integrity sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==
-  dependencies:
-    deep-equal "^2.0.5"
+aria-query@^5.3.2:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.2.tgz#93f81a43480e33a338f19163a3d10a50c01dcd59"
+  integrity sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==
 
-array-buffer-byte-length@^1.0.0, array-buffer-byte-length@^1.0.1:
+array-buffer-byte-length@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f"
   integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==
@@ -3428,7 +3500,7 @@ array-find-index@^1.0.1:
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
   integrity sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==
 
-array-includes@^3.1.6, array-includes@^3.1.7, array-includes@^3.1.8:
+array-includes@^3.1.6, array-includes@^3.1.8:
   version "3.1.8"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.8.tgz#5e370cbe172fdd5dd6530c1d4aadda25281ba97d"
   integrity sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==
@@ -3457,7 +3529,7 @@ array.prototype.findlast@^1.2.5:
     es-object-atoms "^1.0.0"
     es-shim-unscopables "^1.0.2"
 
-array.prototype.findlastindex@^1.2.3:
+array.prototype.findlastindex@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz#8c35a755c72908719453f87145ca011e39334d0d"
   integrity sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==
@@ -3542,9 +3614,9 @@ astral-regex@^2.0.0:
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
 async@^3.2.0, async@^3.2.3:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66"
-  integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
+  integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==
 
 asynckit@^0.4.0:
   version "0.4.0"
@@ -3581,21 +3653,19 @@ aws-sign2@~0.7.0:
   integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
 
 aws4@^1.8.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.13.1.tgz#bb5f8b8a20739f6ae1caeaf7eea2c7913df8048e"
-  integrity sha512-u5w79Rd7SU4JaIlA/zFqG+gOiuq25q5VLyZ8E+ijJeILuTxVzZgp2CaGw/UTw6pXYN9XMO9yiqj/nEHmhTG5CA==
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.13.2.tgz#0aa167216965ac9474ccfa83892cfb6b3e1e52ef"
+  integrity sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==
 
-axe-core@^4.9.1:
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.10.0.tgz#d9e56ab0147278272739a000880196cdfe113b59"
-  integrity sha512-Mr2ZakwQ7XUAjp7pAwQWRhhK8mQQ6JAaNWSjmjxil0R8BPioMtQsTLOolGYkji1rcL++3dCqZA3zWqpT+9Ew6g==
+axe-core@^4.10.0:
+  version "4.10.2"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.10.2.tgz#85228e3e1d8b8532a27659b332e39b7fa0e022df"
+  integrity sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==
 
-axobject-query@~3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-3.1.1.tgz#3b6e5c6d4e43ca7ba51c5babf99d22a9c68485e1"
-  integrity sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==
-  dependencies:
-    deep-equal "^2.0.5"
+axobject-query@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-4.1.0.tgz#28768c76d0e3cff21bc62a9e2d0b6ac30042a1ee"
+  integrity sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==
 
 babel-jest@^29.7.0:
   version "29.7.0"
@@ -3781,7 +3851,7 @@ browserslist@^4.22.2:
     node-releases "^2.0.14"
     update-browserslist-db "^1.0.13"
 
-bs-logger@0.x:
+bs-logger@^0.2.6:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
   integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==
@@ -3818,11 +3888,6 @@ buffer@^5.7.1:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
-builtin-modules@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6"
-  integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==
-
 busboy@1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893"
@@ -3933,9 +3998,9 @@ charenc@0.0.2:
   integrity sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==
 
 chart.js@^4.4.2:
-  version "4.4.3"
-  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-4.4.3.tgz#3b2e11e7010fefa99b07d0349236f5098e5226ad"
-  integrity sha512-qK1gkGSRYcJzqrrzdR6a+I0vQ4/R+SoODXyAjscQ/4mzuNzySaMCd+hyVxitSY1+L2fjPD1Gbn+ibNqRmwQeLw==
+  version "4.4.6"
+  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-4.4.6.tgz#da39b84ca752298270d4c0519675c7659936abec"
+  integrity sha512-8Y406zevUPbbIBA/HRk33khEmQPk5+cxeflWE/2rx1NJsjVWMPw/9mSP9rxHP5eqi6LNoPBVMfZHxbwLSgldYA==
   dependencies:
     "@kurkle/color" "^0.3.0"
 
@@ -3959,6 +4024,11 @@ ci-info@^3.2.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
   integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
 
+ci-info@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-4.1.0.tgz#92319d2fa29d2620180ea5afed31f589bc98cf83"
+  integrity sha512-HutrvTNsF48wnxkzERIXOe5/mlcfFcbfCmwcg6CJnizbSue78AbDt+1cgl26zwn61WFxhcPykPfZrbqjGmBb4A==
+
 cjs-module-lexer@^1.0.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107"
@@ -4081,7 +4151,7 @@ colorette@^2.0.16, colorette@^2.0.20:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
   integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
 
-combined-stream@^1.0.6, combined-stream@~1.0.6:
+combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -4206,19 +4276,19 @@ cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-cross-spawn@^7.0.3:
-  version "7.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.5.tgz#910aac880ff5243da96b728bc6521a5f6c2f2f82"
-  integrity sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==
+cross-spawn@^7.0.1:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"
@@ -4406,60 +4476,12 @@ currently-unhandled@^0.4.1:
   dependencies:
     array-find-index "^1.0.1"
 
-cypress@*:
-  version "13.6.6"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.6.6.tgz#5133f231ed1c6e57dc8dcbf60aade220bcd6884b"
-  integrity sha512-S+2S9S94611hXimH9a3EAYt81QM913ZVA03pUmGDfLTFa5gyp85NJ8dJGSlEAEmyRsYkioS1TtnWtbv/Fzt11A==
-  dependencies:
-    "@cypress/request" "^3.0.0"
-    "@cypress/xvfb" "^1.2.4"
-    "@types/sinonjs__fake-timers" "8.1.1"
-    "@types/sizzle" "^2.3.2"
-    arch "^2.2.0"
-    blob-util "^2.0.2"
-    bluebird "^3.7.2"
-    buffer "^5.7.1"
-    cachedir "^2.3.0"
-    chalk "^4.1.0"
-    check-more-types "^2.24.0"
-    cli-cursor "^3.1.0"
-    cli-table3 "~0.6.1"
-    commander "^6.2.1"
-    common-tags "^1.8.0"
-    dayjs "^1.10.4"
-    debug "^4.3.4"
-    enquirer "^2.3.6"
-    eventemitter2 "6.4.7"
-    execa "4.1.0"
-    executable "^4.1.1"
-    extract-zip "2.0.1"
-    figures "^3.2.0"
-    fs-extra "^9.1.0"
-    getos "^3.2.1"
-    is-ci "^3.0.1"
-    is-installed-globally "~0.4.0"
-    lazy-ass "^1.6.0"
-    listr2 "^3.8.3"
-    lodash "^4.17.21"
-    log-symbols "^4.0.0"
-    minimist "^1.2.8"
-    ospath "^1.2.2"
-    pretty-bytes "^5.6.0"
-    process "^0.11.10"
-    proxy-from-env "1.0.0"
-    request-progress "^3.0.0"
-    semver "^7.5.3"
-    supports-color "^8.1.1"
-    tmp "~0.2.1"
-    untildify "^4.0.0"
-    yauzl "^2.10.0"
-
-cypress@^13.6.6:
-  version "13.13.3"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.13.3.tgz#21ee054bb4e00b3858f2e33b4f8f4e69128470a9"
-  integrity sha512-hUxPrdbJXhUOTzuML+y9Av7CKoYznbD83pt8g3klgpioEha0emfx4WNIuVRx0C76r0xV2MIwAW9WYiXfVJYFQw==
+cypress@*, cypress@^13.6.6:
+  version "13.15.2"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.15.2.tgz#ef19554c274bc4ff23802aeb5c52951677fa67f1"
+  integrity sha512-ARbnUorjcCM3XiPwgHKuqsyr5W9Qn+pIIBPaoilnoBkLdSC2oLQjV1BUpnmc7KR+b7Avah3Ly2RMFnfxr96E/A==
   dependencies:
-    "@cypress/request" "^3.0.1"
+    "@cypress/request" "^3.0.6"
     "@cypress/xvfb" "^1.2.4"
     "@types/sinonjs__fake-timers" "8.1.1"
     "@types/sizzle" "^2.3.2"
@@ -4470,6 +4492,7 @@ cypress@^13.6.6:
     cachedir "^2.3.0"
     chalk "^4.1.0"
     check-more-types "^2.24.0"
+    ci-info "^4.0.0"
     cli-cursor "^3.1.0"
     cli-table3 "~0.6.1"
     commander "^6.2.1"
@@ -4484,7 +4507,6 @@ cypress@^13.6.6:
     figures "^3.2.0"
     fs-extra "^9.1.0"
     getos "^3.2.1"
-    is-ci "^3.0.1"
     is-installed-globally "~0.4.0"
     lazy-ass "^1.6.0"
     listr2 "^3.8.3"
@@ -4499,6 +4521,7 @@ cypress@^13.6.6:
     semver "^7.5.3"
     supports-color "^8.1.1"
     tmp "~0.2.3"
+    tree-kill "1.2.2"
     untildify "^4.0.0"
     yauzl "^2.10.0"
 
@@ -4635,16 +4658,16 @@ date-fns@^2.23.0, date-fns@^2.29.3:
     "@babel/runtime" "^7.21.0"
 
 dayjs@^1.10.4:
-  version "1.11.12"
-  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.12.tgz#5245226cc7f40a15bf52e0b99fd2a04669ccac1d"
-  integrity sha512-Rt2g+nTbLlDWZTwwrIXjy9MeiZmSDI375FvZs72ngxx8PDC6YXOeR3q5LAuPzjZQxhiWdRKac7RKV+YyQYfYIg==
+  version "1.11.13"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.13.tgz#92430b0139055c3ebb60150aa13e860a4b5a366c"
+  integrity sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==
 
 debounce@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
   integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
 
-debug@4.3.4, debug@^4.1.0, debug@^4.3.1, debug@^4.3.2:
+debug@4.3.4, debug@^4.1.0:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -4658,12 +4681,12 @@ debug@^3.1.0, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.1, debug@^4.3.4:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b"
-  integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==
+debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5:
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
+  integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
   dependencies:
-    ms "2.1.2"
+    ms "^2.1.3"
 
 decamelize-keys@^1.1.0:
   version "1.1.1"
@@ -4688,30 +4711,6 @@ dedent@^1.0.0:
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.5.1.tgz#4f3fc94c8b711e9bb2800d185cd6ad20f2a90aff"
   integrity sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==
 
-deep-equal@^2.0.5:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.2.3.tgz#af89dafb23a396c7da3e862abc0be27cf51d56e1"
-  integrity sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==
-  dependencies:
-    array-buffer-byte-length "^1.0.0"
-    call-bind "^1.0.5"
-    es-get-iterator "^1.1.3"
-    get-intrinsic "^1.2.2"
-    is-arguments "^1.1.1"
-    is-array-buffer "^3.0.2"
-    is-date-object "^1.0.5"
-    is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.2"
-    isarray "^2.0.5"
-    object-is "^1.1.5"
-    object-keys "^1.1.1"
-    object.assign "^4.1.4"
-    regexp.prototype.flags "^1.5.1"
-    side-channel "^1.0.4"
-    which-boxed-primitive "^1.0.2"
-    which-collection "^1.0.1"
-    which-typed-array "^1.1.13"
-
 deep-is@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
@@ -4946,7 +4945,7 @@ end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^5.12.0:
+enhanced-resolve@^5.15.0:
   version "5.17.1"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
   integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
@@ -4980,9 +4979,9 @@ error-ex@^1.3.1:
     is-arrayish "^0.2.1"
 
 es-abstract@^1.17.5, es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.1, es-abstract@^1.23.2, es-abstract@^1.23.3:
-  version "1.23.3"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0"
-  integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==
+  version "1.23.5"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.5.tgz#f4599a4946d57ed467515ed10e4f157289cd52fb"
+  integrity sha512-vlmniQ0WNPwXqA0BnmwV3Ng7HxiGlh6r5U6JcTMNx8OilcAGqVJBHJcPjqOMaczU9fRuRK5Px2BdVyPRnKMMVQ==
   dependencies:
     array-buffer-byte-length "^1.0.1"
     arraybuffer.prototype.slice "^1.0.3"
@@ -4999,7 +4998,7 @@ es-abstract@^1.17.5, es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23
     function.prototype.name "^1.1.6"
     get-intrinsic "^1.2.4"
     get-symbol-description "^1.0.2"
-    globalthis "^1.0.3"
+    globalthis "^1.0.4"
     gopd "^1.0.1"
     has-property-descriptors "^1.0.2"
     has-proto "^1.0.3"
@@ -5015,10 +5014,10 @@ es-abstract@^1.17.5, es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23
     is-string "^1.0.7"
     is-typed-array "^1.1.13"
     is-weakref "^1.0.2"
-    object-inspect "^1.13.1"
+    object-inspect "^1.13.3"
     object-keys "^1.1.1"
     object.assign "^4.1.5"
-    regexp.prototype.flags "^1.5.2"
+    regexp.prototype.flags "^1.5.3"
     safe-array-concat "^1.1.2"
     safe-regex-test "^1.0.3"
     string.prototype.trim "^1.2.9"
@@ -5043,25 +5042,10 @@ es-errors@^1.2.1, es-errors@^1.3.0:
   resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
   integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
 
-es-get-iterator@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.3.tgz#3ef87523c5d464d41084b2c3c9c214f1199763d6"
-  integrity sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==
-  dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.3"
-    has-symbols "^1.0.3"
-    is-arguments "^1.1.1"
-    is-map "^2.0.2"
-    is-set "^2.0.2"
-    is-string "^1.0.7"
-    isarray "^2.0.5"
-    stop-iteration-iterator "^1.0.0"
-
-es-iterator-helpers@^1.0.19:
-  version "1.0.19"
-  resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz#117003d0e5fec237b4b5c08aded722e0c6d50ca8"
-  integrity sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw==
+es-iterator-helpers@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.2.0.tgz#2f1a3ab998b30cb2d10b195b587c6d9ebdebf152"
+  integrity sha512-tpxqxncxnpw3c93u8n3VOzACmRFoVmWJqbWXvX/JfKbkhBw1oslgPrUfeSt2psuqyEJFD6N/9lg5i7bsKpoq+Q==
   dependencies:
     call-bind "^1.0.7"
     define-properties "^1.2.1"
@@ -5070,12 +5054,13 @@ es-iterator-helpers@^1.0.19:
     es-set-tostringtag "^2.0.3"
     function-bind "^1.1.2"
     get-intrinsic "^1.2.4"
-    globalthis "^1.0.3"
+    globalthis "^1.0.4"
+    gopd "^1.0.1"
     has-property-descriptors "^1.0.2"
     has-proto "^1.0.3"
     has-symbols "^1.0.3"
     internal-slot "^1.0.7"
-    iterator.prototype "^1.1.2"
+    iterator.prototype "^1.1.3"
     safe-array-concat "^1.1.2"
 
 es-module-lexer@^1.0.5:
@@ -5164,13 +5149,14 @@ escape-string-regexp@^4.0.0:
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
 eslint-config-next@^14.0.4:
-  version "14.2.5"
-  resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-14.2.5.tgz#cdd43d89047eb7391ba25445d5855b4600b6adb9"
-  integrity sha512-zogs9zlOiZ7ka+wgUnmcM0KBEDjo4Jis7kxN1jvC0N4wynQ2MIx/KBkg4mVF63J5EK4W0QMCn7xO3vNisjaAoA==
+  version "14.2.18"
+  resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-14.2.18.tgz#e689e348a1db4bc563580cf77705eec894eaece1"
+  integrity sha512-SuDRcpJY5VHBkhz5DijJ4iA4bVnBA0n48Rb+YSJSCDr+h7kKAcb1mZHusLbW+WA8LDB6edSolomXA55eG3eOVA==
   dependencies:
-    "@next/eslint-plugin-next" "14.2.5"
+    "@next/eslint-plugin-next" "14.2.18"
     "@rushstack/eslint-patch" "^1.3.3"
-    "@typescript-eslint/parser" "^5.4.2 || ^6.0.0 || 7.0.0 - 7.2.0"
+    "@typescript-eslint/eslint-plugin" "^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0"
+    "@typescript-eslint/parser" "^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0"
     eslint-import-resolver-node "^0.3.6"
     eslint-import-resolver-typescript "^3.5.2"
     eslint-plugin-import "^2.28.1"
@@ -5198,22 +5184,23 @@ eslint-import-resolver-node@^0.3.6, eslint-import-resolver-node@^0.3.9:
     resolve "^1.22.4"
 
 eslint-import-resolver-typescript@^3.5.2:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.1.tgz#7b983680edd3f1c5bce1a5829ae0bc2d57fe9efa"
-  integrity sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg==
-  dependencies:
-    debug "^4.3.4"
-    enhanced-resolve "^5.12.0"
-    eslint-module-utils "^2.7.4"
-    fast-glob "^3.3.1"
-    get-tsconfig "^4.5.0"
-    is-core-module "^2.11.0"
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.3.tgz#bb8e388f6afc0f940ce5d2c5fd4a3d147f038d9e"
+  integrity sha512-ud9aw4szY9cCT1EWWdGv1L1XR6hh2PaRWif0j2QjQ0pgTY/69iw+W0Z4qZv5wHahOl8isEr+k/JnyAqNQkLkIA==
+  dependencies:
+    "@nolyfill/is-core-module" "1.0.39"
+    debug "^4.3.5"
+    enhanced-resolve "^5.15.0"
+    eslint-module-utils "^2.8.1"
+    fast-glob "^3.3.2"
+    get-tsconfig "^4.7.5"
+    is-bun-module "^1.0.2"
     is-glob "^4.0.3"
 
-eslint-module-utils@^2.7.4, eslint-module-utils@^2.8.0:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz#52f2404300c3bd33deece9d7372fb337cc1d7c34"
-  integrity sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==
+eslint-module-utils@^2.12.0, eslint-module-utils@^2.8.1:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz#fe4cfb948d61f49203d7b08871982b65b9af0b0b"
+  integrity sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==
   dependencies:
     debug "^3.2.7"
 
@@ -5233,26 +5220,28 @@ eslint-plugin-cypress@^2.15.1:
     globals "^13.20.0"
 
 eslint-plugin-import@^2.28.1, eslint-plugin-import@^2.29.1:
-  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz#d45b37b5ef5901d639c15270d74d46d161150643"
-  integrity sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==
+  version "2.31.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz#310ce7e720ca1d9c0bb3f69adfd1c6bdd7d9e0e7"
+  integrity sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==
   dependencies:
-    array-includes "^3.1.7"
-    array.prototype.findlastindex "^1.2.3"
+    "@rtsao/scc" "^1.1.0"
+    array-includes "^3.1.8"
+    array.prototype.findlastindex "^1.2.5"
     array.prototype.flat "^1.3.2"
     array.prototype.flatmap "^1.3.2"
     debug "^3.2.7"
     doctrine "^2.1.0"
     eslint-import-resolver-node "^0.3.9"
-    eslint-module-utils "^2.8.0"
-    hasown "^2.0.0"
-    is-core-module "^2.13.1"
+    eslint-module-utils "^2.12.0"
+    hasown "^2.0.2"
+    is-core-module "^2.15.1"
     is-glob "^4.0.3"
     minimatch "^3.1.2"
-    object.fromentries "^2.0.7"
-    object.groupby "^1.0.1"
-    object.values "^1.1.7"
+    object.fromentries "^2.0.8"
+    object.groupby "^1.0.3"
+    object.values "^1.2.0"
     semver "^6.3.1"
+    string.prototype.trimend "^1.0.8"
     tsconfig-paths "^3.15.0"
 
 eslint-plugin-jest@^27.9.0:
@@ -5263,26 +5252,25 @@ eslint-plugin-jest@^27.9.0:
     "@typescript-eslint/utils" "^5.10.0"
 
 eslint-plugin-jsx-a11y@^6.7.1:
-  version "6.9.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.9.0.tgz#67ab8ff460d4d3d6a0b4a570e9c1670a0a8245c8"
-  integrity sha512-nOFOCaJG2pYqORjK19lqPqxMO/JpvdCZdPtNdxY3kvom3jTvkAbOvQvD8wuD0G8BYR0IGAGYDlzqWJOh/ybn2g==
+  version "6.10.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.2.tgz#d2812bb23bf1ab4665f1718ea442e8372e638483"
+  integrity sha512-scB3nz4WmG75pV8+3eRUQOHZlNSUhFNq37xnpgRkCCELU3XMvXAxLk1eqWWyE22Ki4Q01Fnsw9BA3cJHDPgn2Q==
   dependencies:
-    aria-query "~5.1.3"
+    aria-query "^5.3.2"
     array-includes "^3.1.8"
     array.prototype.flatmap "^1.3.2"
     ast-types-flow "^0.0.8"
-    axe-core "^4.9.1"
-    axobject-query "~3.1.1"
+    axe-core "^4.10.0"
+    axobject-query "^4.1.0"
     damerau-levenshtein "^1.0.8"
     emoji-regex "^9.2.2"
-    es-iterator-helpers "^1.0.19"
     hasown "^2.0.2"
     jsx-ast-utils "^3.3.5"
     language-tags "^1.0.9"
     minimatch "^3.1.2"
     object.fromentries "^2.0.8"
     safe-regex-test "^1.0.3"
-    string.prototype.includes "^2.0.0"
+    string.prototype.includes "^2.0.1"
 
 eslint-plugin-prettier@^4.0.0:
   version "4.2.1"
@@ -5297,21 +5285,21 @@ eslint-plugin-promise@^6.1.1:
   integrity sha512-57Zzfw8G6+Gq7axm2Pdo3gW/Rx3h9Yywgn61uE/3elTCOePEHVrn2i5CdfBwA1BLK0Q0WqctICIUSqXZW/VprQ==
 
 "eslint-plugin-react-hooks@^4.5.0 || 5.0.0-canary-7118f5dd7-20230705":
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz#c829eb06c0e6f484b3fbb85a97e57784f328c596"
-  integrity sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==
+  version "5.0.0-canary-7118f5dd7-20230705"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.0.0-canary-7118f5dd7-20230705.tgz#4d55c50e186f1a2b0636433d2b0b2f592ddbccfd"
+  integrity sha512-AZYbMo/NW9chdL7vk6HQzQhT+PvTAEVqWk9ziruUoW2kAOcN5qNyelv70e0F1VNQAbvutOC9oc+xfWycI9FxDw==
 
 eslint-plugin-react@^7.33.2:
-  version "7.35.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.35.0.tgz#00b1e4559896710e58af6358898f2ff917ea4c41"
-  integrity sha512-v501SSMOWv8gerHkk+IIQBkcGRGrO2nfybfj5pLxuJNFTPxxA3PSryhXTK+9pNbtkggheDdsC0E9Q8CuPk6JKA==
+  version "7.37.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.37.2.tgz#cd0935987876ba2900df2f58339f6d92305acc7a"
+  integrity sha512-EsTAnj9fLVr/GZleBLFbj/sSuXeWmp1eXIN60ceYnZveqEaUCyW4X+Vh4WTdUhCkW4xutXYqTXCUSyqD4rB75w==
   dependencies:
     array-includes "^3.1.8"
     array.prototype.findlast "^1.2.5"
     array.prototype.flatmap "^1.3.2"
     array.prototype.tosorted "^1.1.4"
     doctrine "^2.1.0"
-    es-iterator-helpers "^1.0.19"
+    es-iterator-helpers "^1.1.0"
     estraverse "^5.3.0"
     hasown "^2.0.2"
     jsx-ast-utils "^2.4.1 || ^3.0.0"
@@ -5346,16 +5334,21 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
+eslint-visitor-keys@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz#687bacb2af884fcdda8a6e7d65c606f46a14cd45"
+  integrity sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==
+
 eslint@^8.33.0:
-  version "8.57.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668"
-  integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==
+  version "8.57.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.1.tgz#7df109654aba7e3bbe5c8eae533c5e461d3c6ca9"
+  integrity sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.6.1"
     "@eslint/eslintrc" "^2.1.4"
-    "@eslint/js" "8.57.0"
-    "@humanwhocodes/config-array" "^0.11.14"
+    "@eslint/js" "8.57.1"
+    "@humanwhocodes/config-array" "^0.13.0"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
     "@ungap/structured-clone" "^1.2.0"
@@ -5405,9 +5398,9 @@ esprima@^4.0.0:
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esquery@^1.4.2:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
-  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7"
+  integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==
   dependencies:
     estraverse "^5.1.0"
 
@@ -5583,10 +5576,10 @@ fast-diff@^1.1.2:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
   integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
 
-fast-glob@^3.0.3, fast-glob@^3.2.7:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4"
-  integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==
+fast-glob@^3.0.3, fast-glob@^3.2.9, fast-glob@^3.3.1, fast-glob@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
+  integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -5594,10 +5587,10 @@ fast-glob@^3.0.3, fast-glob@^3.2.7:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
-fast-glob@^3.2.9, fast-glob@^3.3.1:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
-  integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
+fast-glob@^3.2.7:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4"
+  integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -5715,9 +5708,9 @@ flat@^5.0.0:
   integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
 
 flatted@^3.2.9:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
-  integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.2.tgz#adba1448a9841bec72b42c532ea23dbbedef1a27"
+  integrity sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==
 
 for-each@^0.3.3:
   version "0.3.3"
@@ -5727,9 +5720,9 @@ for-each@^0.3.3:
     is-callable "^1.1.3"
 
 foreground-child@^3.1.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.2.1.tgz#767004ccf3a5b30df39bed90718bab43fe0a59f7"
-  integrity sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.0.tgz#0ac8644c06e431439f8561db8ecf29a7b5519c77"
+  integrity sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==
   dependencies:
     cross-spawn "^7.0.0"
     signal-exit "^4.0.1"
@@ -5739,13 +5732,13 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
 
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+form-data@~4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.1.tgz#ba1076daaaa5bfd7e99c1a6cb02aa0a5cff90d48"
+  integrity sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==
   dependencies:
     asynckit "^0.4.0"
-    combined-stream "^1.0.6"
+    combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
 formdata-polyfill@^4.0.10:
@@ -5847,7 +5840,7 @@ get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4:
+get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd"
   integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
@@ -5884,10 +5877,10 @@ get-symbol-description@^1.0.2:
     es-errors "^1.3.0"
     get-intrinsic "^1.2.4"
 
-get-tsconfig@^4.5.0:
-  version "4.7.6"
-  resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.7.6.tgz#118fd5b7b9bae234cc7705a00cd771d7eb65d62a"
-  integrity sha512-ZAqrLlu18NbDdRaHq+AKXzAmqIUPswPWKUchfytdAjiRFnCe5ojG2bstg6mRiZabkKfCoL/e98pbBELIV/YCeA==
+get-tsconfig@^4.7.5:
+  version "4.8.1"
+  resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.8.1.tgz#8995eb391ae6e1638d251118c7b56de7eb425471"
+  integrity sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg==
   dependencies:
     resolve-pkg-maps "^1.0.0"
 
@@ -5988,7 +5981,7 @@ globals@^13.19.0, globals@^13.20.0:
   dependencies:
     type-fest "^0.20.2"
 
-globalthis@^1.0.3:
+globalthis@^1.0.3, globalthis@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236"
   integrity sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==
@@ -6116,7 +6109,7 @@ hasown@^2.0.0, hasown@^2.0.1, hasown@^2.0.2:
   dependencies:
     function-bind "^1.1.2"
 
-hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
+hoist-non-react-statics@3, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
   integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
@@ -6145,14 +6138,14 @@ html-tags@^3.3.1:
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.3.1.tgz#a04026a18c882e4bba8a01a3d39cfe465d40b5ce"
   integrity sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==
 
-http-signature@~1.3.6:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.3.6.tgz#cb6fbfdf86d1c974f343be94e87f7fc128662cf9"
-  integrity sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==
+http-signature@~1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.4.0.tgz#dee5a9ba2bf49416abc544abd6d967f6a94c8c3f"
+  integrity sha512-G5akfn7eKbpDN+8nPS/cb57YeA1jLTVxjpCj7tmm3QKPdyDy7T+qSC40e9ptydSWvkwjSXw1VbkpyEm39ukeAg==
   dependencies:
     assert-plus "^1.0.0"
     jsprim "^2.0.2"
-    sshpk "^1.14.1"
+    sshpk "^1.18.0"
 
 human-signals@^1.1.1:
   version "1.1.1"
@@ -6189,12 +6182,12 @@ ieee754@^1.1.13:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-ignore@^5.1.1:
-  version "5.2.4"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
-  integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
+ignore@^5.1.1, ignore@^5.2.0, ignore@^5.3.1:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
+  integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
 
-ignore@^5.2.0, ignore@^5.2.4:
+ignore@^5.2.4:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
   integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==
@@ -6277,7 +6270,7 @@ ini@^1.3.5:
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
-internal-slot@^1.0.4, internal-slot@^1.0.7:
+internal-slot@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802"
   integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==
@@ -6306,30 +6299,22 @@ intl-messageformat-parser@^5.3.7:
   dependencies:
     "@formatjs/intl-numberformat" "^5.5.2"
 
-intl-messageformat@10.5.14:
-  version "10.5.14"
-  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.5.14.tgz#e5bb373f8a37b88fbe647d7b941f3ab2a37ed00a"
-  integrity sha512-IjC6sI0X7YRjjyVH9aUgdftcmZK7WXdHeil4KwbjDnRWjnVitKpAx3rr6t6di1joFp5188VqKcobOPA6mCLG/w==
+intl-messageformat@10.7.7:
+  version "10.7.7"
+  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.7.7.tgz#42085e1664729d02240a03346e31a2540b1112a0"
+  integrity sha512-F134jIoeYMro/3I0h08D0Yt4N9o9pjddU/4IIxMMURqbAtI2wu70X8hvG1V48W49zXHXv3RKSF/po+0fDfsGjA==
   dependencies:
-    "@formatjs/ecma402-abstract" "2.0.0"
-    "@formatjs/fast-memoize" "2.2.0"
-    "@formatjs/icu-messageformat-parser" "2.7.8"
-    tslib "^2.4.0"
+    "@formatjs/ecma402-abstract" "2.2.4"
+    "@formatjs/fast-memoize" "2.2.3"
+    "@formatjs/icu-messageformat-parser" "2.9.4"
+    tslib "2"
 
 ipaddr.js@^2.0.1:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.2.0.tgz#d33fa7bac284f4de7af949638c9d68157c6b92e8"
   integrity sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==
 
-is-arguments@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"
-  integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==
-  dependencies:
-    call-bind "^1.0.2"
-    has-tostringtag "^1.0.0"
-
-is-array-buffer@^3.0.2, is-array-buffer@^3.0.4:
+is-array-buffer@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98"
   integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==
@@ -6369,12 +6354,12 @@ is-buffer@~1.1.6:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-builtin-module@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.2.1.tgz#f03271717d8654cfcaf07ab0463faa3571581169"
-  integrity sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==
+is-bun-module@^1.0.2:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/is-bun-module/-/is-bun-module-1.2.1.tgz#495e706f42e29f086fd5fe1ac3c51f106062b9fc"
+  integrity sha512-AmidtEM6D6NmUiLOvvU7+IePxjEjOzra2h0pSrsfSAcXwl/83zLLXDByafUJy9k/rKK0pvXMLdwKwGHlX2Ke6Q==
   dependencies:
-    builtin-modules "^3.3.0"
+    semver "^7.6.3"
 
 is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
   version "1.2.7"
@@ -6388,10 +6373,10 @@ is-ci@^3.0.1:
   dependencies:
     ci-info "^3.2.0"
 
-is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.13.1:
-  version "2.15.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.0.tgz#71c72ec5442ace7e76b306e9d48db361f22699ea"
-  integrity sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==
+is-core-module@^2.13.0, is-core-module@^2.15.1:
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37"
+  integrity sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==
   dependencies:
     hasown "^2.0.2"
 
@@ -6475,7 +6460,7 @@ is-localhost-ip@^1.4.0:
   resolved "https://registry.yarnpkg.com/is-localhost-ip/-/is-localhost-ip-1.4.0.tgz#dd66aaabcbb5dbbc943e00adad5f715d2c3b3a1d"
   integrity sha512-cN7SzlY7BVxSeoJu5equjsZaKSgD4HCfXrTwu0Jgbq5BbT1BU+D7Lyi/l1KO8H0un0JTlxcQaT/GWVapu+DIDg==
 
-is-map@^2.0.2, is-map@^2.0.3:
+is-map@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e"
   integrity sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==
@@ -6547,7 +6532,7 @@ is-regex@^1.1.4:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-set@^2.0.2, is-set@^2.0.3:
+is-set@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.3.tgz#8ab209ea424608141372ded6e0cb200ef1d9d01d"
   integrity sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==
@@ -6626,9 +6611,9 @@ isarray@^2.0.5:
   integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
 
 isbot@^5.1.16:
-  version "5.1.16"
-  resolved "https://registry.yarnpkg.com/isbot/-/isbot-5.1.16.tgz#652fac0ab5ba181cefc53aa156edcb76f28ac07d"
-  integrity sha512-zvRjcw/4UfKiCVx+/PqXPKthufO5m2PpJSbA0tVZY9ns7hlQRV1xqWpEFcqyfkK/MrChsXPmu1zpxECjcaEuKg==
+  version "5.1.17"
+  resolved "https://registry.yarnpkg.com/isbot/-/isbot-5.1.17.tgz#ad7da5690a61bbb19056a069975c9a73182682a0"
+  integrity sha512-/wch8pRKZE+aoVhRX/hYPY1C7dMCeeMyhkQLNLNlYAbGQn9bkvMB8fOUXNnk5I0m4vDYbBJ9ciVtkr9zfBJ7qA==
 
 isexe@^2.0.0:
   version "2.0.0"
@@ -6693,10 +6678,10 @@ istanbul-reports@^3.1.3:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
-iterator.prototype@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.2.tgz#5e29c8924f01916cb9335f1ff80619dcff22b0c0"
-  integrity sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==
+iterator.prototype@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.3.tgz#016c2abe0be3bbdb8319852884f60908ac62bf9c"
+  integrity sha512-FW5iMbeQ6rBGm/oKgzq2aW4KvAGpxPzYES8N4g4xNXUKpL1mclMvOe+76AcLDTvD+Ze+sOpVhgdAQEKF4L9iGQ==
   dependencies:
     define-properties "^1.2.1"
     get-intrinsic "^1.2.1"
@@ -7461,7 +7446,7 @@ lodash.isstring@^4.0.1:
   resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
   integrity sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==
 
-lodash.memoize@4.x, lodash.memoize@^4.1.2:
+lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
   integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==
@@ -7599,7 +7584,7 @@ make-dir@^4.0.0:
   dependencies:
     semver "^7.5.3"
 
-make-error@1.x, make-error@^1.1.1:
+make-error@^1.1.1, make-error@^1.3.6:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
@@ -7722,9 +7707,9 @@ micromatch@4.0.5, micromatch@^4.0.5:
     picomatch "^2.3.1"
 
 micromatch@^4.0.4:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5"
-  integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
   dependencies:
     braces "^3.0.3"
     picomatch "^2.3.1"
@@ -7777,7 +7762,7 @@ minimatch@^5.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^9.0.1:
+minimatch@^9.0.1, minimatch@^9.0.4:
   version "9.0.5"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
   integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
@@ -7834,9 +7819,9 @@ mmdb-lib@2.1.1:
   integrity sha512-yx8H/1H5AfnufiLnzzPqPf4yr/dKU9IFT1rPVwSkrKWHsQEeVVd6+X+L0nUbXhlEFTu3y/7hu38CFmEVgzvyeg==
 
 moment-timezone@^0.5.35:
-  version "0.5.45"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.45.tgz#cb685acd56bac10e69d93c536366eb65aa6bcf5c"
-  integrity sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==
+  version "0.5.46"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.46.tgz#a21aa6392b3c6b3ed916cd5e95858a28d893704a"
+  integrity sha512-ZXm9b36esbe7OmdABqIWJuBBiLLwAjrN7CE+7sYdCCx82Nabt1wHDj8TVseS59QIlfFPbOoiBPm6ca9BioG4hw==
   dependencies:
     moment "^2.29.4"
 
@@ -7850,7 +7835,7 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@^2.1.1:
+ms@^2.1.1, ms@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -8020,18 +8005,10 @@ object-assign@^4, object-assign@^4.1.1:
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
-object-inspect@^1.13.1:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.2.tgz#dea0088467fb991e67af4058147a24824a3043ff"
-  integrity sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==
-
-object-is@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.6.tgz#1a6a53aed2dd8f7e6775ff870bea58545956ab07"
-  integrity sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==
-  dependencies:
-    call-bind "^1.0.7"
-    define-properties "^1.2.1"
+object-inspect@^1.13.1, object-inspect@^1.13.3:
+  version "1.13.3"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.3.tgz#f14c183de51130243d6d18ae149375ff50ea488a"
+  integrity sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==
 
 object-keys@^1.1.1:
   version "1.1.1"
@@ -8057,7 +8034,7 @@ object.entries@^1.1.8:
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
-object.fromentries@^2.0.7, object.fromentries@^2.0.8:
+object.fromentries@^2.0.8:
   version "2.0.8"
   resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.8.tgz#f7195d8a9b97bd95cbc1999ea939ecd1a2b00c65"
   integrity sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==
@@ -8067,7 +8044,7 @@ object.fromentries@^2.0.7, object.fromentries@^2.0.8:
     es-abstract "^1.23.2"
     es-object-atoms "^1.0.0"
 
-object.groupby@^1.0.1:
+object.groupby@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.3.tgz#9b125c36238129f6f7b61954a1e7176148d5002e"
   integrity sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==
@@ -8076,7 +8053,7 @@ object.groupby@^1.0.1:
     define-properties "^1.2.1"
     es-abstract "^1.23.2"
 
-object.values@^1.1.6, object.values@^1.1.7, object.values@^1.2.0:
+object.values@^1.1.6, object.values@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.0.tgz#65405a9d92cee68ac2d303002e0b8470a4d9ab1b"
   integrity sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==
@@ -8107,16 +8084,16 @@ onetime@^6.0.0:
     mimic-fn "^4.0.0"
 
 optionator@^0.9.3:
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
-  integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734"
+  integrity sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==
   dependencies:
-    "@aashutoshrathi/word-wrap" "^1.2.3"
     deep-is "^0.1.3"
     fast-levenshtein "^2.0.6"
     levn "^0.4.1"
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
+    word-wrap "^1.2.5"
 
 ospath@^1.2.2:
   version "1.2.2"
@@ -8285,6 +8262,11 @@ picomatch@^2.0.4, picomatch@^2.2.3, picomatch@^2.3.1:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
+picomatch@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.2.tgz#77c742931e8f3b8820946c76cd0c1f13730d1dab"
+  integrity sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==
+
 pidtree@0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz#90ad7b6d42d5841e69e0a2419ef38f8883aa057c"
@@ -8962,20 +8944,15 @@ proxy-from-env@1.0.0:
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
   integrity sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==
 
-psl@^1.1.33:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
-  integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
-
 pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.2.tgz#836f3edd6bc2ee599256c924ffe0d88573ddcbf8"
+  integrity sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-punycode@^2.1.0, punycode@^2.1.1:
+punycode@^2.1.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
   integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
@@ -8985,17 +8962,12 @@ pure-rand@^6.0.0, pure-rand@^6.0.2:
   resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.0.4.tgz#50b737f6a925468679bff00ad20eade53f37d5c7"
   integrity sha512-LA0Y9kxMYv47GIPJy6MI84fqTd2HmYZI83W/kM/SkKfDlajnZYfmXFTxkbY+xSBPkLJxltMa9hIkmdc29eguMA==
 
-qs@6.10.4:
-  version "6.10.4"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.4.tgz#6a3003755add91c0ec9eacdc5f878b034e73f9e7"
-  integrity sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==
+qs@6.13.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906"
+  integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==
   dependencies:
-    side-channel "^1.0.4"
-
-querystringify@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
-  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
+    side-channel "^1.0.6"
 
 queue-microtask@^1.2.2:
   version "1.2.3"
@@ -9057,9 +9029,9 @@ react-dom@^18.2.0:
     scheduler "^0.23.2"
 
 react-error-boundary@^4.0.4:
-  version "4.0.13"
-  resolved "https://registry.yarnpkg.com/react-error-boundary/-/react-error-boundary-4.0.13.tgz#80386b7b27b1131c5fbb7368b8c0d983354c7947"
-  integrity sha512-b6PwbdSv8XeOSYvjt8LpgpKrZ0yGdtZokYwkwV2wlcZbxgopHX/hgPl5VgpnoVOWd868n1hktM8Qm4b+02MiLQ==
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/react-error-boundary/-/react-error-boundary-4.1.2.tgz#bc750ad962edb8b135d6ae922c046051eb58f289"
+  integrity sha512-GQDxZ5Jd+Aq/qUxbCm1UtzmL/s++V7zKgE8yMktJiCQXCCFZnMZh9ng+6/Ne6PjNSXH0L9CjeOEREfRnq6Duag==
   dependencies:
     "@babel/runtime" "^7.12.5"
 
@@ -9069,20 +9041,20 @@ react-hook-form@^7.34.2:
   integrity sha512-F/TroLjTICipmHeFlMrLtNLceO2xr1jU3CyiNla5zdwsGUGu2UOxxR4UyJgLlhMwLW/Wzp4cpJ7CPfgJIeKdSg==
 
 react-intl@^6.5.5:
-  version "6.6.8"
-  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-6.6.8.tgz#cb60c90502d0025caf9f86ec298cdc4348da17c2"
-  integrity sha512-M0pkhzcgV31h++2901BiRXWl69hp2zPyLxRrSwRjd1ErXbNoubz/f4M6DrRTd4OiSUrT4ajRQzrmtS5plG4FtA==
-  dependencies:
-    "@formatjs/ecma402-abstract" "2.0.0"
-    "@formatjs/icu-messageformat-parser" "2.7.8"
-    "@formatjs/intl" "2.10.4"
-    "@formatjs/intl-displaynames" "6.6.8"
-    "@formatjs/intl-listformat" "7.5.7"
-    "@types/hoist-non-react-statics" "^3.3.1"
+  version "6.8.9"
+  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-6.8.9.tgz#ef36b2a19a0eb97afbeaeab9679273fcbf2ea261"
+  integrity sha512-TUfj5E7lyUDvz/GtovC9OMh441kBr08rtIbgh3p0R8iF3hVY+V2W9Am7rb8BpJ/29BH1utJOqOOhmvEVh3GfZg==
+  dependencies:
+    "@formatjs/ecma402-abstract" "2.2.4"
+    "@formatjs/icu-messageformat-parser" "2.9.4"
+    "@formatjs/intl" "2.10.15"
+    "@formatjs/intl-displaynames" "6.8.5"
+    "@formatjs/intl-listformat" "7.7.5"
+    "@types/hoist-non-react-statics" "3"
     "@types/react" "16 || 17 || 18"
-    hoist-non-react-statics "^3.3.2"
-    intl-messageformat "10.5.14"
-    tslib "^2.4.0"
+    hoist-non-react-statics "3"
+    intl-messageformat "10.7.7"
+    tslib "2"
 
 react-is@^16.13.1, react-is@^16.7.0:
   version "16.13.1"
@@ -9095,9 +9067,9 @@ react-is@^17.0.2:
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
 react-is@^18.0.0:
-  version "18.2.0"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
-  integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
+  version "18.3.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
+  integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
 
 react-redux@^7.2.0:
   version "7.2.9"
@@ -9277,15 +9249,15 @@ regenerator-transform@^0.15.2:
   dependencies:
     "@babel/runtime" "^7.8.4"
 
-regexp.prototype.flags@^1.5.1, regexp.prototype.flags@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334"
-  integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==
+regexp.prototype.flags@^1.5.2, regexp.prototype.flags@^1.5.3:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz#b3ae40b1d2499b8350ab2c3fe6ef3845d3a96f42"
+  integrity sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==
   dependencies:
-    call-bind "^1.0.6"
+    call-bind "^1.0.7"
     define-properties "^1.2.1"
     es-errors "^1.3.0"
-    set-function-name "^2.0.1"
+    set-function-name "^2.0.2"
 
 regexpu-core@^5.3.1:
   version "5.3.2"
@@ -9328,11 +9300,6 @@ require-from-string@^2.0.2:
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
   integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
 
-requires-port@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
-
 resolve-cwd@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
@@ -9423,9 +9390,9 @@ rollup-plugin-copy@^3.4.0:
     is-plain-object "^3.0.0"
 
 rollup-plugin-delete@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-delete/-/rollup-plugin-delete-2.0.0.tgz#262acf80660d48c3b167fb0baabd0c3ab985c153"
-  integrity sha512-/VpLMtDy+8wwRlDANuYmDa9ss/knGsAgrDhM+tEwB1npHwNu4DYNmDfUL55csse/GHs9Q+SMT/rw9uiaZ3pnzA==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-delete/-/rollup-plugin-delete-2.1.0.tgz#41d26b5c9dc16b7e5545030692fba9ac89f57b44"
+  integrity sha512-TEbqJd7giLvzQDTu4jSPufwhTJs/iYVN2LfR/YIYkqjC/oZ0/h9Q0AeljifIhzBzJYZtHQTWKEbMms5fbh54pw==
   dependencies:
     del "^5.1.0"
 
@@ -9591,7 +9558,7 @@ semver@^6.0.0, semver@^6.3.0, semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.4, semver@^7.3.7, semver@^7.5.3, semver@^7.5.4:
+semver@^7.3.4, semver@^7.3.7, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.3:
   version "7.6.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
   integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
@@ -9684,11 +9651,6 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-slash@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
-  integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
-
 slice-ansi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787"
@@ -9792,7 +9754,7 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
-sshpk@^1.14.1:
+sshpk@^1.18.0:
   version "1.18.0"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.18.0.tgz#1663e55cddf4d688b86a46b77f0d5fe363aba028"
   integrity sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==
@@ -9819,13 +9781,6 @@ stack-utils@^2.0.3:
   dependencies:
     escape-string-regexp "^2.0.0"
 
-stop-iteration-iterator@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz#6a60be0b4ee757d1ed5254858ec66b10c49285e4"
-  integrity sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==
-  dependencies:
-    internal-slot "^1.0.4"
-
 streamsearch@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764"
@@ -9876,13 +9831,14 @@ string-width@^5.0.0, string-width@^5.0.1, string-width@^5.1.2:
     emoji-regex "^9.2.2"
     strip-ansi "^7.0.1"
 
-string.prototype.includes@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.includes/-/string.prototype.includes-2.0.0.tgz#8986d57aee66d5460c144620a6d873778ad7289f"
-  integrity sha512-E34CkBgyeqNDcrbU76cDjL5JLcVrtSdYq0MEh/B10r17pRP4ciHLwTgnuLV8Ay6cgEMLkcBkFCKyFZ43YldYzg==
+string.prototype.includes@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.includes/-/string.prototype.includes-2.0.1.tgz#eceef21283640761a81dbe16d6c7171a4edf7d92"
+  integrity sha512-o7+c9bW6zpAdJHTtujeePODAhkuicdAryFsfVKwA+wGw89wJ4GTY484WTucM9hLtDEOpOvI+aHnzqnC5lHp4Rg==
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.3"
 
 string.prototype.matchall@^4.0.11:
   version "4.0.11"
@@ -10252,7 +10208,19 @@ tiny-lru@11.2.11:
   resolved "https://registry.yarnpkg.com/tiny-lru/-/tiny-lru-11.2.11.tgz#5089a6a4a157f5a97b82aa930b44d550ac5c4778"
   integrity sha512-27BIW0dIWTYYoWNnqSmoNMKe5WIbkXsc0xaCQHd3/3xT2XMuMJrzHdrO9QBFR14emBz1Bu0dOAs2sCBBrvgPQA==
 
-tmp@~0.2.1, tmp@~0.2.3:
+tldts-core@^6.1.61:
+  version "6.1.61"
+  resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-6.1.61.tgz#5cd6507535ef5f5027ac9a1f52b9b60ecb9edfbd"
+  integrity sha512-In7VffkDWUPgwa+c9picLUxvb0RltVwTkSgMNFgvlGSWveCzGBemBqTsgJCL4EDFWZ6WH0fKTsot6yNhzy3ZzQ==
+
+tldts@^6.1.32:
+  version "6.1.61"
+  resolved "https://registry.yarnpkg.com/tldts/-/tldts-6.1.61.tgz#85df9810aa4c24bff281bf1fd0b838e087beef9c"
+  integrity sha512-rv8LUyez4Ygkopqn+M6OLItAOT9FF3REpPQDkdMx5ix8w4qkuE7Vo2o/vw1nxKQYmJDV8JpAMJQr1b+lTKf0FA==
+  dependencies:
+    tldts-core "^6.1.61"
+
+tmp@~0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae"
   integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==
@@ -10286,15 +10254,17 @@ toposort@^2.0.2:
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
   integrity sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==
 
-tough-cookie@^4.1.3:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.4.tgz#945f1461b45b5a8c76821c33ea49c3ac192c1b36"
-  integrity sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==
+tough-cookie@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-5.0.0.tgz#6b6518e2b5c070cf742d872ee0f4f92d69eac1af"
+  integrity sha512-FRKsF7cz96xIIeMZ82ehjC3xW2E+O2+v11udrDYewUbszngYhsGa8z6YUMMzO9QJZzzyd0nGGXnML/TReX6W8Q==
   dependencies:
-    psl "^1.1.33"
-    punycode "^2.1.1"
-    universalify "^0.2.0"
-    url-parse "^1.5.3"
+    tldts "^6.1.32"
+
+tree-kill@1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
+  integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
 trim-newlines@^3.0.0:
   version "3.0.1"
@@ -10306,25 +10276,25 @@ trim-newlines@^4.0.2:
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-4.1.1.tgz#28c88deb50ed10c7ba6dc2474421904a00139125"
   integrity sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ==
 
-ts-api-utils@^1.0.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
-  integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
+ts-api-utils@^1.0.1, ts-api-utils@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.4.0.tgz#709c6f2076e511a81557f3d07a0cbd566ae8195c"
+  integrity sha512-032cPxaEKwM+GT3vA5JXNzIaizx388rhsSW79vGRNGXfRRAdEAn2mvk36PvK5HnOchyWZ7afLEXqYCvPCrzuzQ==
 
 ts-jest@^29.1.2:
-  version "29.2.4"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.2.4.tgz#38ccf487407d7a63054a72689f6f99b075e296e5"
-  integrity sha512-3d6tgDyhCI29HlpwIq87sNuI+3Q6GLTTCeYRHCs7vDz+/3GCMwEtV9jezLyl4ZtnBgx00I7hm8PCP8cTksMGrw==
+  version "29.2.5"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.2.5.tgz#591a3c108e1f5ebd013d3152142cb5472b399d63"
+  integrity sha512-KD8zB2aAZrcKIdGk4OwpJggeLcH1FgrICqDSROWqlnJXGCXK4Mn6FcdK2B6670Xr73lHMG1kHw8R87A0ecZ+vA==
   dependencies:
-    bs-logger "0.x"
+    bs-logger "^0.2.6"
     ejs "^3.1.10"
-    fast-json-stable-stringify "2.x"
+    fast-json-stable-stringify "^2.1.0"
     jest-util "^29.0.0"
     json5 "^2.2.3"
-    lodash.memoize "4.x"
-    make-error "1.x"
-    semver "^7.5.3"
-    yargs-parser "^21.0.1"
+    lodash.memoize "^4.1.2"
+    make-error "^1.3.6"
+    semver "^7.6.3"
+    yargs-parser "^21.1.1"
 
 ts-node@^10.9.1:
   version "10.9.2"
@@ -10355,6 +10325,11 @@ tsconfig-paths@^3.15.0:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
+tslib@2, tslib@^2.1.0, tslib@^2.4.0:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
+  integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
+
 tslib@^1.8.1:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
@@ -10365,11 +10340,6 @@ tslib@^2.0.1, tslib@^2.0.3:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
 
-tslib@^2.1.0, tslib@^2.4.0:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
-  integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==
-
 tsutils@^3.21.0:
   version "3.21.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
@@ -10488,9 +10458,9 @@ typescript@^4.0, typescript@^4.5:
   integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
 typescript@^5.5.3:
-  version "5.5.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba"
-  integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==
+  version "5.6.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b"
+  integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==
 
 unbox-primitive@^1.0.2:
   version "1.0.2"
@@ -10502,15 +10472,10 @@ unbox-primitive@^1.0.2:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
-undici-types@~6.13.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.13.0.tgz#e3e79220ab8c81ed1496b5812471afd7cf075ea5"
-  integrity sha512-xtFJHudx8S2DSoujjMd1WeWvn7KKWFRESZTMeL1RptAYERu29D6jphMjjY+vn96jvN3kVPDNxU/E13VTaXj6jg==
-
-undici-types@~6.19.2:
-  version "6.19.6"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.6.tgz#e218c3df0987f4c0e0008ca00d6b6472d9b89b36"
-  integrity sha512-e/vggGopEfTKSvj4ihnOLTsqhrKRN3LeO6qSN/GxohhuRv8qH9bNQ4B8W7e/vFL+0XTnmHPB4/kegunZGA4Org==
+undici-types@~6.19.2, undici-types@~6.19.8:
+  version "6.19.8"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
+  integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
 
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
@@ -10540,11 +10505,6 @@ universalify@^0.1.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
-universalify@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
-  integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
-
 universalify@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
@@ -10570,14 +10530,6 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
-url-parse@^1.5.3:
-  version "1.5.10"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
-  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
-  dependencies:
-    querystringify "^2.1.1"
-    requires-port "^1.0.0"
-
 use-memo-one@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/use-memo-one/-/use-memo-one-1.1.3.tgz#2fd2e43a2169eabc7496960ace8c79efef975e99"
@@ -10691,7 +10643,7 @@ which-builtin-type@^1.1.3:
     which-collection "^1.0.2"
     which-typed-array "^1.1.15"
 
-which-collection@^1.0.1, which-collection@^1.0.2:
+which-collection@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.2.tgz#627ef76243920a107e7ce8e96191debe4b16c2a0"
   integrity sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==
@@ -10701,7 +10653,7 @@ which-collection@^1.0.1, which-collection@^1.0.2:
     is-weakmap "^2.0.2"
     is-weakset "^2.0.3"
 
-which-typed-array@^1.1.13, which-typed-array@^1.1.14, which-typed-array@^1.1.15:
+which-typed-array@^1.1.14, which-typed-array@^1.1.15:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d"
   integrity sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==
@@ -10726,6 +10678,11 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
+word-wrap@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
+  integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
+
 "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
@@ -10843,7 +10800,7 @@ yargs-parser@^20.2.9:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs-parser@^21.0.1, yargs-parser@^21.1.1:
+yargs-parser@^21.1.1:
   version "21.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==

From 70f919be335ca819603cf62e664935586963885e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ere=20M=C3=A4nnist=C3=B6?= <connect@eremannisto.com>
Date: Tue, 19 Nov 2024 10:30:11 +0200
Subject: [PATCH 412/438] Use `unknown` label for `undefined` countries

---
 src/components/metrics/WorldMap.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/metrics/WorldMap.tsx b/src/components/metrics/WorldMap.tsx
index 4a16f98f77..5dfc5f742f 100644
--- a/src/components/metrics/WorldMap.tsx
+++ b/src/components/metrics/WorldMap.tsx
@@ -28,6 +28,7 @@ export function WorldMap({
   const { formatMessage, labels } = useMessages();
   const { countryNames } = useCountryNames(locale);
   const visitorsLabel = formatMessage(labels.visitors).toLocaleLowerCase(locale);
+  const unknownLabel = formatMessage(labels.unknown);
   const {
     dateRange: { startDate, endDate },
   } = useDateRange(websiteId);
@@ -62,7 +63,9 @@ export function WorldMap({
     if (code === 'AQ') return;
     const country = metrics?.find(({ x }) => x === code);
     setTooltipPopup(
-      `${countryNames[code]}: ${formatLongNumber(country?.y || 0)} ${visitorsLabel}` as any,
+      `${countryNames[code] || unknownLabel}: ${formatLongNumber(
+        country?.y || 0,
+      )} ${visitorsLabel}` as any,
     );
   };
 

From ec2f5203fe75cfa634155089b756d0ced4e7a677 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 19 Nov 2024 11:22:37 -0800
Subject: [PATCH 413/438] update pinned ui. remove paging if dashboard edited

---
 .../(main)/dashboard/DashboardEdit.module.css |  5 ----
 src/app/(main)/dashboard/DashboardEdit.tsx    | 23 ++++++++++++++-----
 src/app/(main)/dashboard/DashboardPage.tsx    |  4 ++--
 src/store/dashboard.ts                        |  1 +
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/app/(main)/dashboard/DashboardEdit.module.css b/src/app/(main)/dashboard/DashboardEdit.module.css
index cd498982e6..071dd6a415 100644
--- a/src/app/(main)/dashboard/DashboardEdit.module.css
+++ b/src/app/(main)/dashboard/DashboardEdit.module.css
@@ -17,11 +17,6 @@
   padding: 5px;
 }
 
-.pin {
-  width: 20px;
-  height: 20px;
-}
-
 .item h1 {
   font-weight: 600;
   font-size: 16px;
diff --git a/src/app/(main)/dashboard/DashboardEdit.tsx b/src/app/(main)/dashboard/DashboardEdit.tsx
index 84c5fdc573..b599b8405b 100644
--- a/src/app/(main)/dashboard/DashboardEdit.tsx
+++ b/src/app/(main)/dashboard/DashboardEdit.tsx
@@ -1,7 +1,7 @@
 import { useState, useMemo, useEffect } from 'react';
 import { DragDropContext, Draggable, Droppable } from 'react-beautiful-dnd';
 import classNames from 'classnames';
-import { Button, Loading } from 'react-basics';
+import { Button, Icon, Loading } from 'react-basics';
 import Icons from 'components/icons';
 import { firstBy } from 'thenby';
 import useDashboard, { saveDashboard } from 'store/dashboard';
@@ -12,10 +12,11 @@ const DRAG_ID = 'dashboard-website-ordering';
 
 export function DashboardEdit({ teamId }: { teamId: string }) {
   const settings = useDashboard();
-  const { websiteOrder, websiteActive } = settings;
+  const { websiteOrder, websiteActive, isEdited } = settings;
   const { formatMessage, labels } = useMessages();
   const [order, setOrder] = useState(websiteOrder || []);
   const [active, setActive] = useState(websiteActive || []);
+  const [edited, setEdited] = useState(isEdited);
   const [websites, setWebsites] = useState([]);
 
   const {
@@ -39,7 +40,10 @@ export function DashboardEdit({ teamId }: { teamId: string }) {
   const ordered = useMemo(() => {
     if (websites) {
       return websites
-        .map((website: { id: any }) => ({ ...website, order: order.indexOf(website.id) }))
+        .map((website: { id: any; name: string; domain: string }) => ({
+          ...website,
+          order: order.indexOf(website.id),
+        }))
         .sort(firstBy('order'));
     }
     return [];
@@ -53,29 +57,33 @@ export function DashboardEdit({ teamId }: { teamId: string }) {
     orderedWebsites.splice(destination.index, 0, removed);
 
     setOrder(orderedWebsites.map(website => website?.id || 0));
+    setEdited(true);
   }
 
   function handleActiveWebsites(id: string) {
     setActive(prevActive =>
       prevActive.includes(id) ? prevActive.filter(a => a !== id) : [...prevActive, id],
     );
+    setEdited(true);
   }
 
   function handleSave() {
     saveDashboard({
       editing: false,
+      isEdited: edited,
       websiteOrder: order,
       websiteActive: active,
     });
   }
 
   function handleCancel() {
-    saveDashboard({ editing: false, websiteOrder, websiteActive });
+    saveDashboard({ editing: false, websiteOrder, websiteActive, isEdited });
   }
 
   function handleReset() {
     setOrder([]);
     setActive([]);
+    setEdited(false);
   }
 
   if (isLoading) {
@@ -115,11 +123,14 @@ export function DashboardEdit({ teamId }: { teamId: string }) {
                         })}
                         {...provided.draggableProps}
                         {...provided.dragHandleProps}
-                        onClick={() => handleActiveWebsites(id)}
                       >
                         <div className={styles.text}>
                           <div className={styles.pinActive}>
-                            {active.includes(id) ? <Icons.PushPin className={styles.pin} /> : null}
+                            <Button size="sm" onClick={() => handleActiveWebsites(id)}>
+                              <Icon rotate={active.includes(id) ? 0 : 45}>
+                                <Icons.PushPin />
+                              </Icon>
+                            </Button>
                           </div>
                           <h1>{name}</h1>
                           <h2>{domain}</h2>
diff --git a/src/app/(main)/dashboard/DashboardPage.tsx b/src/app/(main)/dashboard/DashboardPage.tsx
index 60bf17998d..2a4bb91658 100644
--- a/src/app/(main)/dashboard/DashboardPage.tsx
+++ b/src/app/(main)/dashboard/DashboardPage.tsx
@@ -13,9 +13,9 @@ import LinkButton from 'components/common/LinkButton';
 export function DashboardPage() {
   const { formatMessage, labels, messages } = useMessages();
   const { teamId, renderTeamUrl } = useTeamUrl();
-  const { showCharts, editing } = useDashboard();
+  const { showCharts, editing, isEdited } = useDashboard();
   const { dir } = useLocale();
-  const pageSize = 10;
+  const pageSize = isEdited ? 200 : 10;
 
   const { result, query, params, setParams } = useWebsites({ teamId }, { pageSize });
   const { page } = params;
diff --git a/src/store/dashboard.ts b/src/store/dashboard.ts
index 801d53e1dc..0cfc78b92b 100644
--- a/src/store/dashboard.ts
+++ b/src/store/dashboard.ts
@@ -8,6 +8,7 @@ export const initialState = {
   websiteOrder: [],
   websiteActive: [],
   editing: false,
+  isEdited: false,
 };
 
 const store = create(() => ({ ...initialState, ...getItem(DASHBOARD_CONFIG) }));

From 6ed660d8a78cfbe94a48142dbc918aaf4fac5b25 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Wed, 20 Nov 2024 15:13:02 -0800
Subject: [PATCH 414/438] Fixed referrer check. Closes #3016.

---
 src/tracker/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tracker/index.js b/src/tracker/index.js
index 6b5b706620..e0c036894d 100644
--- a/src/tracker/index.js
+++ b/src/tracker/index.js
@@ -6,7 +6,7 @@
     document,
     history,
   } = window;
-  const { hostname, href } = location;
+  const { hostname, href, origin } = location;
   const { currentScript, referrer } = document;
   const localStorage = href.startsWith('data:') ? undefined : window.localStorage;
 
@@ -260,7 +260,7 @@
   }
 
   let currentUrl = parseURL(href);
-  let currentRef = referrer !== hostname ? referrer : '';
+  let currentRef = referrer.startsWith(origin) ? '' : referrer;
   let title = document.title;
   let cache;
   let initialized;

From 4de884010a5be9f2093609e436507c21d9c783c7 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Wed, 20 Nov 2024 21:09:01 -0800
Subject: [PATCH 415/438] Code cleanup.

---
 src/tracker/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tracker/index.js b/src/tracker/index.js
index e0c036894d..c17a76e8df 100644
--- a/src/tracker/index.js
+++ b/src/tracker/index.js
@@ -54,7 +54,7 @@
   const parseURL = url => {
     try {
       // use location.origin as the base to handle cases where the url is a relative path
-      const { pathname, search, hash } = new URL(url, location.origin);
+      const { pathname, search, hash } = new URL(url, origin);
       url = pathname + search + hash;
     } catch (e) {
       /* empty */

From 9c2bfe8956baebb949b6f8d4a836f5e7e9c82725 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Wed, 20 Nov 2024 21:20:46 -0800
Subject: [PATCH 416/438] Revert to script.js.

---
 scripts/update-tracker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/update-tracker.js b/scripts/update-tracker.js
index 736dc2efbc..4dcbf24572 100644
--- a/scripts/update-tracker.js
+++ b/scripts/update-tracker.js
@@ -6,7 +6,7 @@ const path = require('path');
 const endPoint = process.env.COLLECT_API_ENDPOINT;
 
 if (endPoint) {
-  const file = path.resolve(__dirname, '../public/tracker.js');
+  const file = path.resolve(__dirname, '../public/script.js');
 
   const tracker = fs.readFileSync(file);
 

From b8a2b071d9fe4bb0a8267d67968c6b3a9a75af74 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 21 Nov 2024 05:50:46 -0800
Subject: [PATCH 417/438] Updated packages.

---
 yarn.lock | 47 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 836d5a1d18..cccf0949e7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2661,17 +2661,17 @@
     "@swc/counter" "^0.1.3"
     tslib "^2.4.0"
 
-"@tanstack/query-core@5.60.5":
-  version "5.60.5"
-  resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-5.60.5.tgz#37b7c5ab7e6894cea9ef341299a7a3febc2ea361"
-  integrity sha512-jiS1aC3XI3BJp83ZiTuDLerTmn9P3U95r6p+6/SNauLJaYxfIC4dMuWygwnBHIZxjn2zJqEpj3nysmPieoxfPQ==
+"@tanstack/query-core@5.60.6":
+  version "5.60.6"
+  resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-5.60.6.tgz#0dd33fe231b0d18bf66d0c615b29899738300658"
+  integrity sha512-tI+k0KyCo1EBJ54vxK1kY24LWj673ujTydCZmzEZKAew4NqZzTaVQJEuaG1qKj2M03kUHN46rchLRd+TxVq/zQ==
 
 "@tanstack/react-query@^5.28.6":
-  version "5.60.5"
-  resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-5.60.5.tgz#3194c390f7eff20542b321c3042880dc3f1a81e2"
-  integrity sha512-M77bOsPwj1wYE56gk7iJvxGAr4IC12NWdIDhT+Eo8ldkWRHMvIR8I/rufIvT1OXoV/bl7EECwuRuMlxxWtvW2Q==
+  version "5.61.0"
+  resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-5.61.0.tgz#73473feb37aa28ceb410e297ee060e18f06f88e0"
+  integrity sha512-SBzV27XAeCRBOQ8QcC94w2H1Md0+LI0gTWwc3qRJoaGuewKn5FNW4LSqwPFJZVEItfhMfGT7RpZuSFXjTi12pQ==
   dependencies:
-    "@tanstack/query-core" "5.60.5"
+    "@tanstack/query-core" "5.60.6"
 
 "@trysound/sax@0.2.0":
   version "0.2.0"
@@ -7612,9 +7612,9 @@ mathml-tag-names@^2.1.3:
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
 maxmind@^4.3.6:
-  version "4.3.21"
-  resolved "https://registry.yarnpkg.com/maxmind/-/maxmind-4.3.21.tgz#cc3af09775e9b96434a56b6ac63c9bf4878d23b8"
-  integrity sha512-orda4yI01roTa4pP5Jf43u5HPOoEIGaLudTn9cdgCPyZDPipTJdbz1boZQR9QE96hvwNDrJwt1ak9vHIE6iZSQ==
+  version "4.3.22"
+  resolved "https://registry.yarnpkg.com/maxmind/-/maxmind-4.3.22.tgz#8168a2d890d88626613b97eeecbb13fabe0074c4"
+  integrity sha512-dfLO11mE77ELTEIXNezfW0eslodsFLsZ1lQkLauP+5Zsg1m7kCGtljqRyVOd9E5Ne2RJgvY6UU09qvnVocOZvA==
   dependencies:
     mmdb-lib "2.1.1"
     tiny-lru "11.2.11"
@@ -8252,11 +8252,16 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
 
-picocolors@^1.0.0, picocolors@^1.0.1:
+picocolors@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1"
   integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==
 
+picocolors@^1.0.1, picocolors@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
+  integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
+
 picomatch@^2.0.4, picomatch@^2.2.3, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
@@ -8860,7 +8865,7 @@ postcss@8.4.31:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-postcss@^8.1.10, postcss@^8.4.21, postcss@^8.4.28, postcss@^8.4.31:
+postcss@^8.1.10, postcss@^8.4.21, postcss@^8.4.28:
   version "8.4.41"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.41.tgz#d6104d3ba272d882fe18fc07d15dc2da62fa2681"
   integrity sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==
@@ -8869,6 +8874,15 @@ postcss@^8.1.10, postcss@^8.4.21, postcss@^8.4.28, postcss@^8.4.31:
     picocolors "^1.0.1"
     source-map-js "^1.2.0"
 
+postcss@^8.4.31:
+  version "8.4.49"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19"
+  integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==
+  dependencies:
+    nanoid "^3.3.7"
+    picocolors "^1.1.1"
+    source-map-js "^1.2.1"
+
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@@ -9697,11 +9711,16 @@ source-map-js@^1.0.1:
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
   integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
 
-source-map-js@^1.0.2, source-map-js@^1.2.0:
+source-map-js@^1.0.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
   integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
 
+source-map-js@^1.2.0, source-map-js@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
+  integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
+
 source-map-support@0.5.13:
   version "0.5.13"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"

From 7803f7253080eb84a945bccbcca1559d2c66e93c Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 21 Nov 2024 13:26:04 -0800
Subject: [PATCH 418/438] Removed team redirect for cloud mode.

---
 src/app/(main)/NavBar.tsx | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/app/(main)/NavBar.tsx b/src/app/(main)/NavBar.tsx
index f4123b0cb3..6daae0357a 100644
--- a/src/app/(main)/NavBar.tsx
+++ b/src/app/(main)/NavBar.tsx
@@ -76,20 +76,25 @@ export function NavBar() {
 
   const handleTeamChange = (teamId: string) => {
     const url = teamId ? `/teams/${teamId}` : '/';
-    setItem('umami.team', { id: teamId });
+    if (!cloudMode) {
+      setItem('umami.team', { id: teamId });
+    }
     router.push(cloudMode ? `${process.env.cloudUrl}${url}` : url);
   };
 
   useEffect(() => {
-    const teamIdLocal = getItem('umami.team')?.id;
-    if (teamIdLocal && pathname !== '/' && pathname !== '/dashboard') {
-      const url = '/';
-      router.push(cloudMode ? `${process.env.cloudUrl}${url}` : url);
-    } else if (teamIdLocal) {
-      const url = `/teams/${teamIdLocal}/dashboard`;
-      router.push(cloudMode ? `${process.env.cloudUrl}${url}` : url);
+    if (!cloudMode) {
+      const teamIdLocal = getItem('umami.team')?.id;
+
+      if (teamIdLocal && pathname !== '/' && pathname !== '/dashboard') {
+        const url = '/';
+        router.push(url);
+      } else if (teamIdLocal) {
+        const url = `/teams/${teamIdLocal}/dashboard`;
+        router.push(url);
+      }
     }
-  }, []);
+  }, [cloudMode]);
 
   return (
     <div className={styles.navbar}>

From 620a8381733ebf7c81b41dd76edb0c4953cd93d7 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 21 Nov 2024 15:39:50 -0800
Subject: [PATCH 419/438] Updated dashboard edit.

---
 .../(main)/dashboard/DashboardEdit.module.css | 53 ++++++------
 src/app/(main)/dashboard/DashboardEdit.tsx    | 82 ++++++++++---------
 2 files changed, 74 insertions(+), 61 deletions(-)

diff --git a/src/app/(main)/dashboard/DashboardEdit.module.css b/src/app/(main)/dashboard/DashboardEdit.module.css
index 071dd6a415..19266d17a4 100644
--- a/src/app/(main)/dashboard/DashboardEdit.module.css
+++ b/src/app/(main)/dashboard/DashboardEdit.module.css
@@ -1,52 +1,57 @@
 .buttons {
   display: flex;
+  align-items: center;
   justify-content: flex-end;
   gap: 10px;
-  margin-bottom: 20px;
 }
 
 .item {
-  padding: 5px 0;
-  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  padding: 20px;
+  border-radius: 5px;
+  border: 1px solid var(--base400);
+  background: var(--base50);
+  margin-bottom: 10px;
 }
 
-.pinActive {
-  position: absolute;
-  top: 10px;
-  right: 10px;
-  padding: 5px;
+.text {
+  position: relative;
 }
 
-.item h1 {
+.name {
   font-weight: 600;
   font-size: 16px;
 }
 
-.item h2 {
+.domain {
   font-size: 14px;
   color: var(--base700);
 }
 
-.text {
-  padding: 20px;
-  border-radius: 5px;
-  border: 1px solid var(--base400);
-  background: var(--base50);
+.dragActive {
+  cursor: grab;
 }
 
-.websiteActive .text {
-  border: 1px solid var(--base800);
+.dragActive:active {
+  cursor: grabbing;
 }
 
-.active .text {
-  border-color: var(--base600);
-  box-shadow: 4px 4px 4px var(--base100);
+.header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 20px;
+  gap: 20px;
 }
 
-.dragActive {
-  cursor: grab;
+.search {
+  max-width: 360px;
 }
 
-.dragActive:active {
-  cursor: grabbing;
+.active {
+  border-color: var(--base600);
+  box-shadow: 4px 4px 4px var(--base100);
 }
diff --git a/src/app/(main)/dashboard/DashboardEdit.tsx b/src/app/(main)/dashboard/DashboardEdit.tsx
index b599b8405b..42eb99ac87 100644
--- a/src/app/(main)/dashboard/DashboardEdit.tsx
+++ b/src/app/(main)/dashboard/DashboardEdit.tsx
@@ -1,8 +1,7 @@
 import { useState, useMemo, useEffect } from 'react';
 import { DragDropContext, Draggable, Droppable } from 'react-beautiful-dnd';
 import classNames from 'classnames';
-import { Button, Icon, Loading } from 'react-basics';
-import Icons from 'components/icons';
+import { Button, Loading, Toggle, SearchField } from 'react-basics';
 import { firstBy } from 'thenby';
 import useDashboard, { saveDashboard } from 'store/dashboard';
 import { useMessages, useWebsites } from 'components/hooks';
@@ -18,6 +17,7 @@ export function DashboardEdit({ teamId }: { teamId: string }) {
   const [active, setActive] = useState(websiteActive || []);
   const [edited, setEdited] = useState(isEdited);
   const [websites, setWebsites] = useState([]);
+  const [search, setSearch] = useState('');
 
   const {
     result,
@@ -92,16 +92,19 @@ export function DashboardEdit({ teamId }: { teamId: string }) {
 
   return (
     <>
-      <div className={styles.buttons}>
-        <Button onClick={handleSave} variant="primary" size="sm">
-          {formatMessage(labels.save)}
-        </Button>
-        <Button onClick={handleCancel} size="sm">
-          {formatMessage(labels.cancel)}
-        </Button>
-        <Button onClick={handleReset} size="sm">
-          {formatMessage(labels.reset)}
-        </Button>
+      <div className={styles.header}>
+        <SearchField className={styles.search} value={search} onSearch={setSearch} />
+        <div className={styles.buttons}>
+          <Button onClick={handleSave} variant="primary" size="sm">
+            {formatMessage(labels.save)}
+          </Button>
+          <Button onClick={handleCancel} size="sm">
+            {formatMessage(labels.cancel)}
+          </Button>
+          <Button onClick={handleReset} size="sm">
+            {formatMessage(labels.reset)}
+          </Button>
+        </div>
       </div>
       <div className={styles.dragActive}>
         <DragDropContext onDragEnd={handleWebsiteDrag}>
@@ -112,33 +115,38 @@ export function DashboardEdit({ teamId }: { teamId: string }) {
                 ref={provided.innerRef}
                 style={{ marginBottom: snapshot.isDraggingOver ? 260 : null }}
               >
-                {ordered.map(({ id, name, domain }, index) => (
-                  <Draggable key={id} draggableId={`${DRAG_ID}-${id}`} index={index}>
-                    {(provided, snapshot) => (
-                      <div
-                        ref={provided.innerRef}
-                        className={classNames(styles.item, {
-                          [styles.active]: snapshot.isDragging,
-                          [styles.websiteActive]: active.includes(id),
-                        })}
-                        {...provided.draggableProps}
-                        {...provided.dragHandleProps}
-                      >
-                        <div className={styles.text}>
-                          <div className={styles.pinActive}>
-                            <Button size="sm" onClick={() => handleActiveWebsites(id)}>
-                              <Icon rotate={active.includes(id) ? 0 : 45}>
-                                <Icons.PushPin />
-                              </Icon>
-                            </Button>
+                {ordered.map(({ id, name, domain }, index) => {
+                  if (
+                    search &&
+                    !`${name.toLowerCase()}${domain.toLowerCase()}`.includes(search.toLowerCase())
+                  ) {
+                    return null;
+                  }
+
+                  return (
+                    <Draggable key={id} draggableId={`${DRAG_ID}-${id}`} index={index}>
+                      {(provided, snapshot) => (
+                        <div
+                          ref={provided.innerRef}
+                          className={classNames(styles.item, {
+                            [styles.active]: snapshot.isDragging,
+                          })}
+                          {...provided.draggableProps}
+                          {...provided.dragHandleProps}
+                        >
+                          <div className={styles.text}>
+                            <div className={styles.name}>{name}</div>
+                            <div className={styles.domain}>{domain}</div>
                           </div>
-                          <h1>{name}</h1>
-                          <h2>{domain}</h2>
+                          <Toggle
+                            checked={active.includes(id)}
+                            onChange={() => handleActiveWebsites(id)}
+                          />
                         </div>
-                      </div>
-                    )}
-                  </Draggable>
-                ))}
+                      )}
+                    </Draggable>
+                  );
+                })}
                 {provided.placeholder}
               </div>
             )}

From fccb1ddd9ade7cdbe0b5bae2a042865694e87f3e Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 22 Nov 2024 04:04:13 -0800
Subject: [PATCH 420/438] Upgraded next and prisma. Replaced moment-timezone.

---
 package.json                               |   10 +-
 src/app/(main)/profile/TimezoneSetting.tsx |    3 +-
 src/app/layout.tsx                         |    4 +-
 src/lib/date.ts                            |   12 +-
 src/lib/prisma.ts                          |    6 +-
 src/lib/yup.ts                             |    4 +-
 yarn.lock                                  | 3173 +++++++++++++++++++-
 7 files changed, 3044 insertions(+), 168 deletions(-)

diff --git a/package.json b/package.json
index 2352466bf7..1234820322 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "2.14.0",
+  "version": "2.15.0",
   "description": "A simple, fast, privacy-focused alternative to Google Analytics.",
   "author": "Umami Software, Inc. <hello@umami.is>",
   "license": "MIT",
@@ -69,11 +69,12 @@
     "@dicebear/collection": "^9.2.1",
     "@dicebear/core": "^9.2.1",
     "@fontsource/inter": "^4.5.15",
-    "@prisma/client": "5.17",
+    "@prisma/client": "5.22.0",
     "@prisma/extension-read-replicas": "^0.3.0",
     "@react-spring/web": "^9.7.3",
     "@tanstack/react-query": "^5.28.6",
     "@umami/prisma-client": "^0.14.0",
+    "@umami/react-zen": "^0.16.0",
     "@umami/redis-client": "^0.21.0",
     "chalk": "^4.1.1",
     "chart.js": "^4.4.2",
@@ -99,12 +100,11 @@
     "kafkajs": "^2.1.0",
     "maxmind": "^4.3.6",
     "md5": "^2.3.0",
-    "moment-timezone": "^0.5.35",
-    "next": "14.2.10",
+    "next": "15.0.3",
     "next-basics": "^0.39.0",
     "node-fetch": "^3.2.8",
     "npm-run-all": "^4.1.5",
-    "prisma": "5.17",
+    "prisma": "5.22.0",
     "react": "^18.2.0",
     "react-basics": "^0.125.0",
     "react-beautiful-dnd": "^13.1.0",
diff --git a/src/app/(main)/profile/TimezoneSetting.tsx b/src/app/(main)/profile/TimezoneSetting.tsx
index 02f3e186f4..00858ac708 100644
--- a/src/app/(main)/profile/TimezoneSetting.tsx
+++ b/src/app/(main)/profile/TimezoneSetting.tsx
@@ -1,11 +1,10 @@
 import { useState } from 'react';
 import { Dropdown, Item, Button, Flexbox } from 'react-basics';
-import moment from 'moment-timezone';
 import { useTimezone, useMessages } from 'components/hooks';
 import { getTimezone } from 'lib/date';
 import styles from './TimezoneSetting.module.css';
 
-const timezones = moment.tz.names();
+const timezones = Intl.supportedValuesOf('timeZone');
 
 export function TimezoneSetting() {
   const [search, setSearch] = useState('');
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 999cea0321..b1489436ce 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,11 +1,13 @@
 import { Metadata } from 'next';
 import Providers from './Providers';
+import '@fontsource/inter/300.css';
 import '@fontsource/inter/400.css';
+import '@fontsource/inter/500.css';
 import '@fontsource/inter/700.css';
-import '@fontsource/inter/800.css';
 import 'react-basics/dist/styles.css';
 import 'styles/index.css';
 import 'styles/variables.css';
+import '@umami/react-zen/dist/styles.css';
 
 export default function ({ children }) {
   return (
diff --git a/src/lib/date.ts b/src/lib/date.ts
index b731140cf2..b7755ffc24 100644
--- a/src/lib/date.ts
+++ b/src/lib/date.ts
@@ -1,4 +1,3 @@
-import moment from 'moment-timezone';
 import {
   addMinutes,
   addHours,
@@ -105,8 +104,17 @@ const DATE_FUNCTIONS = {
   },
 };
 
+export function isValidTimezone(timezone: string) {
+  try {
+    Intl.DateTimeFormat(undefined, { timeZone: timezone });
+    return true;
+  } catch (error) {
+    return false;
+  }
+}
+
 export function getTimezone() {
-  return moment.tz.guess();
+  return Intl.DateTimeFormat().resolvedOptions().timeZone;
 }
 
 export function parseDateValue(value: string) {
diff --git a/src/lib/prisma.ts b/src/lib/prisma.ts
index 32ac65eb5f..4e3de37e03 100644
--- a/src/lib/prisma.ts
+++ b/src/lib/prisma.ts
@@ -1,7 +1,7 @@
 import debug from 'debug';
 import { Prisma } from '@prisma/client';
 import prisma from '@umami/prisma-client';
-import moment from 'moment-timezone';
+import { formatInTimeZone } from 'date-fns-tz';
 import { MYSQL, POSTGRESQL, getDatabaseType } from 'lib/db';
 import { SESSION_COLUMNS, OPERATORS, DEFAULT_PAGE_SIZE } from './constants';
 import { fetchWebsite } from './load';
@@ -75,7 +75,7 @@ function getDateSQL(field: string, unit: string, timezone?: string): string {
 
   if (db === MYSQL) {
     if (timezone) {
-      const tz = moment.tz(timezone).format('Z');
+      const tz = formatInTimeZone(new Date(), timezone, 'yyyy-MM-dd HH:mm:ss');
       return `date_format(convert_tz(${field},'+00:00','${tz}'), '${MYSQL_DATE_FORMATS[unit]}')`;
     }
     return `date_format(${field}, '${MYSQL_DATE_FORMATS[unit]}')`;
@@ -90,7 +90,7 @@ function getDateWeeklySQL(field: string, timezone?: string) {
   }
 
   if (db === MYSQL) {
-    const tz = moment.tz(timezone).format('Z');
+    const tz = formatInTimeZone(new Date(), timezone, 'yyyy-MM-dd HH:mm:ss');
     return `date_format(convert_tz(${field},'+00:00','${tz}'), '%w:%H')`;
   }
 }
diff --git a/src/lib/yup.ts b/src/lib/yup.ts
index 4008e44f22..d2652eda10 100644
--- a/src/lib/yup.ts
+++ b/src/lib/yup.ts
@@ -1,5 +1,5 @@
-import moment from 'moment-timezone';
 import * as yup from 'yup';
+import { isValidTimezone } from 'lib/date';
 import { UNIT_TYPES } from './constants';
 
 export const TimezoneTest = yup
@@ -8,7 +8,7 @@ export const TimezoneTest = yup
   .test(
     'timezone',
     () => `Invalid timezone`,
-    value => moment.tz.zone(value) !== null,
+    value => isValidTimezone(value),
   );
 
 export const UnitTypeTest = yup.string().test(
diff --git a/yarn.lock b/yarn.lock
index cccf0949e7..ea4e1752c0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1584,6 +1584,13 @@
   resolved "https://registry.yarnpkg.com/@dicebear/thumbs/-/thumbs-9.2.2.tgz#234814c889509682992bd3f93daaa960cb5326a2"
   integrity sha512-FkPLDNu7n5kThLSk7lR/0cz/NkUqgGdZGfLZv6fLkGNGtv6W+e2vZaO7HCXVwIgJ+II+kImN41zVIZ6Jlll7pQ==
 
+"@emnapi/runtime@^1.2.0":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.3.1.tgz#0fcaa575afc31f455fd33534c19381cfce6c6f60"
+  integrity sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw==
+  dependencies:
+    tslib "^2.4.0"
+
 "@esbuild/android-arm64@0.17.19":
   version "0.17.19"
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz#bafb75234a5d3d1b690e7c2956a599345e84a2fd"
@@ -1743,6 +1750,11 @@
   resolved "https://registry.yarnpkg.com/@fontsource/inter/-/inter-4.5.15.tgz#eed1873d68755d3b52d6fcfcfa3493118430a512"
   integrity sha512-FzleM9AxZQK2nqsTDtBiY0PMEVWvnKnuu2i09+p6DHvrHsuucoV2j0tmw+kAT3L4hvsLdAIDv6MdGehsPIdT+Q==
 
+"@fontsource/jetbrains-mono@^5.0.18":
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/@fontsource/jetbrains-mono/-/jetbrains-mono-5.1.1.tgz#451e9a592c46582e61f28311b0dfe5a222f499bf"
+  integrity sha512-5rwvmdQQpXev4LlBX1P+7h2dguu6iwW/9Npjde4+DEq+HgpVJI/7QY8DI1NVVFdvLtXZNP+vO2L/5BQED6FUhA==
+
 "@formatjs/cli@^4.2.29":
   version "4.8.4"
   resolved "https://registry.yarnpkg.com/@formatjs/cli/-/cli-4.8.4.tgz#c4f4e589b8c77c950b659948dbf0e877a4d910fd"
@@ -1929,6 +1941,148 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
   integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
 
+"@img/sharp-darwin-arm64@0.33.5":
+  version "0.33.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.5.tgz#ef5b5a07862805f1e8145a377c8ba6e98813ca08"
+  integrity sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ==
+  optionalDependencies:
+    "@img/sharp-libvips-darwin-arm64" "1.0.4"
+
+"@img/sharp-darwin-x64@0.33.5":
+  version "0.33.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.5.tgz#e03d3451cd9e664faa72948cc70a403ea4063d61"
+  integrity sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==
+  optionalDependencies:
+    "@img/sharp-libvips-darwin-x64" "1.0.4"
+
+"@img/sharp-libvips-darwin-arm64@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.4.tgz#447c5026700c01a993c7804eb8af5f6e9868c07f"
+  integrity sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg==
+
+"@img/sharp-libvips-darwin-x64@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.4.tgz#e0456f8f7c623f9dbfbdc77383caa72281d86062"
+  integrity sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==
+
+"@img/sharp-libvips-linux-arm64@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.4.tgz#979b1c66c9a91f7ff2893556ef267f90ebe51704"
+  integrity sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==
+
+"@img/sharp-libvips-linux-arm@1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.5.tgz#99f922d4e15216ec205dcb6891b721bfd2884197"
+  integrity sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==
+
+"@img/sharp-libvips-linux-s390x@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.0.4.tgz#f8a5eb1f374a082f72b3f45e2fb25b8118a8a5ce"
+  integrity sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==
+
+"@img/sharp-libvips-linux-x64@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.4.tgz#d4c4619cdd157774906e15770ee119931c7ef5e0"
+  integrity sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==
+
+"@img/sharp-libvips-linuxmusl-arm64@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.4.tgz#166778da0f48dd2bded1fa3033cee6b588f0d5d5"
+  integrity sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==
+
+"@img/sharp-libvips-linuxmusl-x64@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.4.tgz#93794e4d7720b077fcad3e02982f2f1c246751ff"
+  integrity sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==
+
+"@img/sharp-linux-arm64@0.33.5":
+  version "0.33.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.5.tgz#edb0697e7a8279c9fc829a60fc35644c4839bb22"
+  integrity sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==
+  optionalDependencies:
+    "@img/sharp-libvips-linux-arm64" "1.0.4"
+
+"@img/sharp-linux-arm@0.33.5":
+  version "0.33.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.5.tgz#422c1a352e7b5832842577dc51602bcd5b6f5eff"
+  integrity sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==
+  optionalDependencies:
+    "@img/sharp-libvips-linux-arm" "1.0.5"
+
+"@img/sharp-linux-s390x@0.33.5":
+  version "0.33.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.5.tgz#f5c077926b48e97e4a04d004dfaf175972059667"
+  integrity sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==
+  optionalDependencies:
+    "@img/sharp-libvips-linux-s390x" "1.0.4"
+
+"@img/sharp-linux-x64@0.33.5":
+  version "0.33.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.5.tgz#d806e0afd71ae6775cc87f0da8f2d03a7c2209cb"
+  integrity sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==
+  optionalDependencies:
+    "@img/sharp-libvips-linux-x64" "1.0.4"
+
+"@img/sharp-linuxmusl-arm64@0.33.5":
+  version "0.33.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.5.tgz#252975b915894fb315af5deea174651e208d3d6b"
+  integrity sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==
+  optionalDependencies:
+    "@img/sharp-libvips-linuxmusl-arm64" "1.0.4"
+
+"@img/sharp-linuxmusl-x64@0.33.5":
+  version "0.33.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.5.tgz#3f4609ac5d8ef8ec7dadee80b560961a60fd4f48"
+  integrity sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==
+  optionalDependencies:
+    "@img/sharp-libvips-linuxmusl-x64" "1.0.4"
+
+"@img/sharp-wasm32@0.33.5":
+  version "0.33.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-wasm32/-/sharp-wasm32-0.33.5.tgz#6f44f3283069d935bb5ca5813153572f3e6f61a1"
+  integrity sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==
+  dependencies:
+    "@emnapi/runtime" "^1.2.0"
+
+"@img/sharp-win32-ia32@0.33.5":
+  version "0.33.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.5.tgz#1a0c839a40c5351e9885628c85f2e5dfd02b52a9"
+  integrity sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ==
+
+"@img/sharp-win32-x64@0.33.5":
+  version "0.33.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.5.tgz#56f00962ff0c4e0eb93d34a047d29fa995e3e342"
+  integrity sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==
+
+"@internationalized/date@^3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@internationalized/date/-/date-3.6.0.tgz#b30d43030bfed1855f20c9503606926d75bfdf64"
+  integrity sha512-+z6ti+CcJnRlLHok/emGEsWQhe7kfSmEW+/6qCzvKY67YPh7YOBfvc7+/+NXq+zJlbArg30tYpqLjNgcAYv2YQ==
+  dependencies:
+    "@swc/helpers" "^0.5.0"
+
+"@internationalized/message@^3.1.6":
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/@internationalized/message/-/message-3.1.6.tgz#e5a832788a17214bfb3e5bbf5f0e23ed2f568ad7"
+  integrity sha512-JxbK3iAcTIeNr1p0WIFg/wQJjIzJt9l/2KNY/48vXV7GRGZSv3zMxJsce008fZclk2cDC8y0Ig3odceHO7EfNQ==
+  dependencies:
+    "@swc/helpers" "^0.5.0"
+    intl-messageformat "^10.1.0"
+
+"@internationalized/number@^3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@internationalized/number/-/number-3.6.0.tgz#dc6ba20c41b25eb605f1d5cac7d8668e9022c224"
+  integrity sha512-PtrRcJVy7nw++wn4W2OuePQQfTqDzfusSuY1QTtui4wa7r+rGVtR75pO8CyKvHvzyQYi3Q1uO5sY0AsB4e65Bw==
+  dependencies:
+    "@swc/helpers" "^0.5.0"
+
+"@internationalized/string@^3.2.5":
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/@internationalized/string/-/string-3.2.5.tgz#2f387b256e79596a2e62ddd5e15c619fe241189c"
+  integrity sha512-rKs71Zvl2OKOHM+mzAFMIyqR5hI1d1O6BBkMK2/lkfg3fkmVh9Eeg0awcA8W2WqYqDOv6a86DIOlFpggwLtbuw==
+  dependencies:
+    "@swc/helpers" "^0.5.0"
+
 "@isaacs/cliui@^8.0.2":
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
@@ -2210,15 +2364,65 @@
   resolved "https://registry.yarnpkg.com/@kurkle/color/-/color-0.3.2.tgz#5acd38242e8bde4f9986e7913c8fdf49d3aa199f"
   integrity sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==
 
+"@mdx-js/loader@^3.0.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@mdx-js/loader/-/loader-3.1.0.tgz#715fdab11d0c9567e45049c16a7d9c83cec88214"
+  integrity sha512-xU/lwKdOyfXtQGqn3VnJjlDrmKXEvMi1mgYxVmukEUtVycIz1nh7oQ40bKTd4cA7rLStqu0740pnhGYxGoqsCg==
+  dependencies:
+    "@mdx-js/mdx" "^3.0.0"
+    source-map "^0.7.0"
+
+"@mdx-js/mdx@^3.0.0", "@mdx-js/mdx@^3.0.1":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-3.1.0.tgz#10235cab8ad7d356c262e8c21c68df5850a97dc3"
+  integrity sha512-/QxEhPAvGwbQmy1Px8F899L5Uc2KZ6JtXwlCgJmjSTBedwOZkByYcBG4GceIGPXRDsmfxhHazuS+hlOShRLeDw==
+  dependencies:
+    "@types/estree" "^1.0.0"
+    "@types/estree-jsx" "^1.0.0"
+    "@types/hast" "^3.0.0"
+    "@types/mdx" "^2.0.0"
+    collapse-white-space "^2.0.0"
+    devlop "^1.0.0"
+    estree-util-is-identifier-name "^3.0.0"
+    estree-util-scope "^1.0.0"
+    estree-walker "^3.0.0"
+    hast-util-to-jsx-runtime "^2.0.0"
+    markdown-extensions "^2.0.0"
+    recma-build-jsx "^1.0.0"
+    recma-jsx "^1.0.0"
+    recma-stringify "^1.0.0"
+    rehype-recma "^1.0.0"
+    remark-mdx "^3.0.0"
+    remark-parse "^11.0.0"
+    remark-rehype "^11.0.0"
+    source-map "^0.7.0"
+    unified "^11.0.0"
+    unist-util-position-from-estree "^2.0.0"
+    unist-util-stringify-position "^4.0.0"
+    unist-util-visit "^5.0.0"
+    vfile "^6.0.0"
+
+"@mdx-js/react@^3.0.0", "@mdx-js/react@^3.0.1":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@mdx-js/react/-/react-3.1.0.tgz#c4522e335b3897b9a845db1dbdd2f966ae8fb0ed"
+  integrity sha512-QjHtSaoameoalGnKDT3FoIl4+9RwyTmo9ZJGBdLOks/YOiWHoRDI3PUwEzOE7kEmGcV3AFcp9K6dYu9rEuKLAQ==
+  dependencies:
+    "@types/mdx" "^2.0.0"
+
 "@netlify/plugin-nextjs@^5.8.1":
   version "5.8.1"
   resolved "https://registry.yarnpkg.com/@netlify/plugin-nextjs/-/plugin-nextjs-5.8.1.tgz#9da15bb4a13c5644e9b58b968c7da51939206ee4"
   integrity sha512-WB1N0FslhWZ1yAVYTcB6CcFrFOUSQ0O2LfavYZrbAypeNxu2I+oO+cgmhfDgZ8Eoq1g4EMeoIGMkNoZ4ogZTsg==
 
-"@next/env@14.2.10":
-  version "14.2.10"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.10.tgz#1d3178340028ced2d679f84140877db4f420333c"
-  integrity sha512-dZIu93Bf5LUtluBXIv4woQw2cZVZ2DJTjax5/5DOs3lzEOeKLy7GxRSr4caK9/SCPdaW6bCgpye6+n4Dh9oJPw==
+"@next/env@15.0.2":
+  version "15.0.2"
+  resolved "https://registry.yarnpkg.com/@next/env/-/env-15.0.2.tgz#4e921af3faf8a16c6be98ec6a81a32a40050a8b7"
+  integrity sha512-c0Zr0ModK5OX7D4ZV8Jt/wqoXtitLNPwUfG9zElCZztdaZyNVnN40rDXVZ/+FGuR4CcNV5AEfM6N8f+Ener7Dg==
+
+"@next/env@15.0.3":
+  version "15.0.3"
+  resolved "https://registry.yarnpkg.com/@next/env/-/env-15.0.3.tgz#a2e9bf274743c52b74d30f415f3eba750d51313a"
+  integrity sha512-t9Xy32pjNOvVn2AS+Utt6VmyrshbpfUMhIjFO60gI58deSo/KgLOp31XZ4O+kY/Is8WAGYwA5gR7kOb1eORDBA==
 
 "@next/eslint-plugin-next@14.2.18":
   version "14.2.18"
@@ -2227,50 +2431,92 @@
   dependencies:
     glob "10.3.10"
 
-"@next/swc-darwin-arm64@14.2.10":
-  version "14.2.10"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.10.tgz#49d10ca4086fbd59ee68e204f75d7136eda2aa80"
-  integrity sha512-V3z10NV+cvMAfxQUMhKgfQnPbjw+Ew3cnr64b0lr8MDiBJs3eLnM6RpGC46nhfMZsiXgQngCJKWGTC/yDcgrDQ==
-
-"@next/swc-darwin-x64@14.2.10":
-  version "14.2.10"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.10.tgz#0ebeae3afb8eac433882b79543295ab83624a1a8"
-  integrity sha512-Y0TC+FXbFUQ2MQgimJ/7Ina2mXIKhE7F+GUe1SgnzRmwFY3hX2z8nyVCxE82I2RicspdkZnSWMn4oTjIKz4uzA==
-
-"@next/swc-linux-arm64-gnu@14.2.10":
-  version "14.2.10"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.10.tgz#7e602916d2fb55a3c532f74bed926a0137c16f20"
-  integrity sha512-ZfQ7yOy5zyskSj9rFpa0Yd7gkrBnJTkYVSya95hX3zeBG9E55Z6OTNPn1j2BTFWvOVVj65C3T+qsjOyVI9DQpA==
-
-"@next/swc-linux-arm64-musl@14.2.10":
-  version "14.2.10"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.10.tgz#6b143f628ccee490b527562e934f8de578d4be47"
-  integrity sha512-n2i5o3y2jpBfXFRxDREr342BGIQCJbdAUi/K4q6Env3aSx8erM9VuKXHw5KNROK9ejFSPf0LhoSkU/ZiNdacpQ==
-
-"@next/swc-linux-x64-gnu@14.2.10":
-  version "14.2.10"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.10.tgz#086f2f16a0678890a1eb46518c4dda381b046082"
-  integrity sha512-GXvajAWh2woTT0GKEDlkVhFNxhJS/XdDmrVHrPOA83pLzlGPQnixqxD8u3bBB9oATBKB//5e4vpACnx5Vaxdqg==
-
-"@next/swc-linux-x64-musl@14.2.10":
-  version "14.2.10"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.10.tgz#1befef10ed8dbcc5047b5d637a25ae3c30a0bfc3"
-  integrity sha512-opFFN5B0SnO+HTz4Wq4HaylXGFV+iHrVxd3YvREUX9K+xfc4ePbRrxqOuPOFjtSuiVouwe6uLeDtabjEIbkmDA==
-
-"@next/swc-win32-arm64-msvc@14.2.10":
-  version "14.2.10"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.10.tgz#731f52c3ae3c56a26cf21d474b11ae1529531209"
-  integrity sha512-9NUzZuR8WiXTvv+EiU/MXdcQ1XUvFixbLIMNQiVHuzs7ZIFrJDLJDaOF1KaqttoTujpcxljM/RNAOmw1GhPPQQ==
-
-"@next/swc-win32-ia32-msvc@14.2.10":
-  version "14.2.10"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.10.tgz#32723ef7f04e25be12af357cc72ddfdd42fd1041"
-  integrity sha512-fr3aEbSd1GeW3YUMBkWAu4hcdjZ6g4NBl1uku4gAn661tcxd1bHs1THWYzdsbTRLcCKLjrDZlNp6j2HTfrw+Bg==
-
-"@next/swc-win32-x64-msvc@14.2.10":
-  version "14.2.10"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.10.tgz#ee1d036cb5ec871816f96baee7991035bb242455"
-  integrity sha512-UjeVoRGKNL2zfbcQ6fscmgjBAS/inHBh63mjIlfPg/NG8Yn2ztqylXt5qilYb6hoHIwaU2ogHknHWWmahJjgZQ==
+"@next/mdx@^15.0.2":
+  version "15.0.3"
+  resolved "https://registry.yarnpkg.com/@next/mdx/-/mdx-15.0.3.tgz#a079f79b619682da27251fc804f11d2e492ce479"
+  integrity sha512-EwCJKDeJqfbHbsS7rIdWpKDOZsOPsif9AX4PaIhy5ghSMsZvi+/vIZVc07pZT7BdwCIoL9XM1KZMd/vzxCxF5A==
+  dependencies:
+    source-map "^0.7.0"
+
+"@next/swc-darwin-arm64@15.0.2":
+  version "15.0.2"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.0.2.tgz#66f84083f1f564d09bbacff8d6b24bd833783bef"
+  integrity sha512-GK+8w88z+AFlmt+ondytZo2xpwlfAR8U6CRwXancHImh6EdGfHMIrTSCcx5sOSBei00GyLVL0ioo1JLKTfprgg==
+
+"@next/swc-darwin-arm64@15.0.3":
+  version "15.0.3"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.0.3.tgz#4c40c506cf3d4d87da0204f4cccf39e6bdc46a71"
+  integrity sha512-s3Q/NOorCsLYdCKvQlWU+a+GeAd3C8Rb3L1YnetsgwXzhc3UTWrtQpB/3eCjFOdGUj5QmXfRak12uocd1ZiiQw==
+
+"@next/swc-darwin-x64@15.0.2":
+  version "15.0.2"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-15.0.2.tgz#1aef085642f363b89acf264cf1b9848632b52914"
+  integrity sha512-KUpBVxIbjzFiUZhiLIpJiBoelqzQtVZbdNNsehhUn36e2YzKHphnK8eTUW1s/4aPy5kH/UTid8IuVbaOpedhpw==
+
+"@next/swc-darwin-x64@15.0.3":
+  version "15.0.3"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-15.0.3.tgz#8e06cacae3dae279744f9fbe88dea679ec2c1ca3"
+  integrity sha512-Zxl/TwyXVZPCFSf0u2BNj5sE0F2uR6iSKxWpq4Wlk/Sv9Ob6YCKByQTkV2y6BCic+fkabp9190hyrDdPA/dNrw==
+
+"@next/swc-linux-arm64-gnu@15.0.2":
+  version "15.0.2"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.0.2.tgz#203b41742e60642587e004773a8c203053b6832e"
+  integrity sha512-9J7TPEcHNAZvwxXRzOtiUvwtTD+fmuY0l7RErf8Yyc7kMpE47MIQakl+3jecmkhOoIyi/Rp+ddq7j4wG6JDskQ==
+
+"@next/swc-linux-arm64-gnu@15.0.3":
+  version "15.0.3"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.0.3.tgz#c144ad1f21091b9c6e1e330ecc2d56188763191d"
+  integrity sha512-T5+gg2EwpsY3OoaLxUIofmMb7ohAUlcNZW0fPQ6YAutaWJaxt1Z1h+8zdl4FRIOr5ABAAhXtBcpkZNwUcKI2fw==
+
+"@next/swc-linux-arm64-musl@15.0.2":
+  version "15.0.2"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.0.2.tgz#d256932ec11051f376348862508be9017b23f3d8"
+  integrity sha512-BjH4ZSzJIoTTZRh6rG+a/Ry4SW0HlizcPorqNBixBWc3wtQtj4Sn9FnRZe22QqrPnzoaW0ctvSz4FaH4eGKMww==
+
+"@next/swc-linux-arm64-musl@15.0.3":
+  version "15.0.3"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.0.3.tgz#3ccb71c6703bf421332f177d1bb0e10528bc73a2"
+  integrity sha512-WkAk6R60mwDjH4lG/JBpb2xHl2/0Vj0ZRu1TIzWuOYfQ9tt9NFsIinI1Epma77JVgy81F32X/AeD+B2cBu/YQA==
+
+"@next/swc-linux-x64-gnu@15.0.2":
+  version "15.0.2"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.0.2.tgz#06c52a23a7e13d5ccd0ded1cf295b32df58e0932"
+  integrity sha512-i3U2TcHgo26sIhcwX/Rshz6avM6nizrZPvrDVDY1bXcLH1ndjbO8zuC7RoHp0NSK7wjJMPYzm7NYL1ksSKFreA==
+
+"@next/swc-linux-x64-gnu@15.0.3":
+  version "15.0.3"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.0.3.tgz#b90aa9b07001b4000427c35ab347a9273cbeebb3"
+  integrity sha512-gWL/Cta1aPVqIGgDb6nxkqy06DkwJ9gAnKORdHWX1QBbSZZB+biFYPFti8aKIQL7otCE1pjyPaXpFzGeG2OS2w==
+
+"@next/swc-linux-x64-musl@15.0.2":
+  version "15.0.2"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.0.2.tgz#eb70a81a1c66d4935d50bf6fe1021e440f27fe9f"
+  integrity sha512-AMfZfSVOIR8fa+TXlAooByEF4OB00wqnms1sJ1v+iu8ivwvtPvnkwdzzFMpsK5jA2S9oNeeQ04egIWVb4QWmtQ==
+
+"@next/swc-linux-x64-musl@15.0.3":
+  version "15.0.3"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.0.3.tgz#0ac9724fb44718fc97bfea971ac3fe17e486590e"
+  integrity sha512-QQEMwFd8r7C0GxQS62Zcdy6GKx999I/rTO2ubdXEe+MlZk9ZiinsrjwoiBL5/57tfyjikgh6GOU2WRQVUej3UA==
+
+"@next/swc-win32-arm64-msvc@15.0.2":
+  version "15.0.2"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.0.2.tgz#29a763bdc3a1281633af10cf8428e916e02f079a"
+  integrity sha512-JkXysDT0/hEY47O+Hvs8PbZAeiCQVxKfGtr4GUpNAhlG2E0Mkjibuo8ryGD29Qb5a3IOnKYNoZlh/MyKd2Nbww==
+
+"@next/swc-win32-arm64-msvc@15.0.3":
+  version "15.0.3"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.0.3.tgz#932437d4cf27814e963ba8ae5f033b4421fab9ca"
+  integrity sha512-9TEp47AAd/ms9fPNgtgnT7F3M1Hf7koIYYWCMQ9neOwjbVWJsHZxrFbI3iEDJ8rf1TDGpmHbKxXf2IFpAvheIQ==
+
+"@next/swc-win32-x64-msvc@15.0.2":
+  version "15.0.2"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.0.2.tgz#0f70d8146990886a85099875353539fc6dd68338"
+  integrity sha512-foaUL0NqJY/dX0Pi/UcZm5zsmSk5MtP/gxx3xOPyREkMFN+CTjctPfu3QaqrQHinaKdPnMWPJDKt4VjDfTBe/Q==
+
+"@next/swc-win32-x64-msvc@15.0.3":
+  version "15.0.3"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.0.3.tgz#940a6f7b370cdde0cc67eabe945d9e6d97e0be9f"
+  integrity sha512-VNAz+HN4OGgvZs6MOoVfnn41kBzT+M+tB+OK4cww6DNyWS6wKaDpaAm/qLeOUbnMh0oVx1+mg0uoYARF69dJyA==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
@@ -2303,51 +2549,812 @@
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
   integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
 
-"@prisma/client@5.17":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.17.0.tgz#9079947bd749689c2dabfb9ecc70a24ebefb1f43"
-  integrity sha512-N2tnyKayT0Zf7mHjwEyE8iG7FwTmXDHFZ1GnNhQp0pJUObsuel4ZZ1XwfuAYkq5mRIiC/Kot0kt0tGCfLJ70Jw==
+"@prisma/client@5.22.0":
+  version "5.22.0"
+  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.22.0.tgz#da1ca9c133fbefe89e0da781c75e1c59da5f8802"
+  integrity sha512-M0SVXfyHnQREBKxCgyo7sffrKttwE6R8PMq330MIUF0pTwjUhLbW84pFDlf06B27XyCR++VtjugEnIHdr07SVA==
 
-"@prisma/debug@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.17.0.tgz#a765105848993984535b6066f8ebc6e6ead26533"
-  integrity sha512-l7+AteR3P8FXiYyo496zkuoiJ5r9jLQEdUuxIxNCN1ud8rdbH3GTxm+f+dCyaSv9l9WY+29L9czaVRXz9mULfg==
+"@prisma/debug@5.22.0":
+  version "5.22.0"
+  resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.22.0.tgz#58af56ed7f6f313df9fb1042b6224d3174bbf412"
+  integrity sha512-AUt44v3YJeggO2ZU5BkXI7M4hu9BF2zzH2iF2V5pyXT/lRTyWiElZ7It+bRH1EshoMRxHgpYg4VB6rCM+mG5jQ==
 
-"@prisma/engines-version@5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053":
-  version "5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053"
-  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053.tgz#3c7cc1ef3ebc34cbd069e5873b9982f2aabf5acd"
-  integrity sha512-tUuxZZysZDcrk5oaNOdrBnnkoTtmNQPkzINFDjz7eG6vcs9AVDmA/F6K5Plsb2aQc/l5M2EnFqn3htng9FA4hg==
+"@prisma/engines-version@5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2":
+  version "5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2"
+  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2.tgz#d534dd7235c1ba5a23bacd5b92cc0ca3894c28f4"
+  integrity sha512-2PTmxFR2yHW/eB3uqWtcgRcgAbG1rwG9ZriSvQw+nnb7c4uCr3RAcGMb6/zfE88SKlC1Nj2ziUvc96Z379mHgQ==
 
-"@prisma/engines@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.17.0.tgz#74dd1aabb22675892760b3cf69a448e3aef4616b"
-  integrity sha512-+r+Nf+JP210Jur+/X8SIPLtz+uW9YA4QO5IXA+KcSOBe/shT47bCcRMTYCbOESw3FFYFTwe7vU6KTWHKPiwvtg==
+"@prisma/engines@5.22.0":
+  version "5.22.0"
+  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.22.0.tgz#28f3f52a2812c990a8b66eb93a0987816a5b6d84"
+  integrity sha512-UNjfslWhAt06kVL3CjkuYpHAWSO6L4kDCVPegV6itt7nD1kSJavd3vhgAEhjglLJJKEdJ7oIqDJ+yHk6qO8gPA==
   dependencies:
-    "@prisma/debug" "5.17.0"
-    "@prisma/engines-version" "5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053"
-    "@prisma/fetch-engine" "5.17.0"
-    "@prisma/get-platform" "5.17.0"
+    "@prisma/debug" "5.22.0"
+    "@prisma/engines-version" "5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2"
+    "@prisma/fetch-engine" "5.22.0"
+    "@prisma/get-platform" "5.22.0"
 
 "@prisma/extension-read-replicas@^0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/@prisma/extension-read-replicas/-/extension-read-replicas-0.3.0.tgz#2842a7c928f957c1dd58a6256104797596d43426"
   integrity sha512-F9+rSmYday6GT2qjhJtkZcBOpLO5LtpvFcMGqrBDHf+78LEdSuxfFjOxYlNuqk4B+th62yxpbhfpmB9/Mca14Q==
 
-"@prisma/fetch-engine@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.17.0.tgz#f718dc7426411d1ebeeee53e2d0d38652387f87c"
-  integrity sha512-ESxiOaHuC488ilLPnrv/tM2KrPhQB5TRris/IeIV4ZvUuKeaicCl4Xj/JCQeG9IlxqOgf1cCg5h5vAzlewN91Q==
+"@prisma/fetch-engine@5.22.0":
+  version "5.22.0"
+  resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.22.0.tgz#4fb691b483a450c5548aac2f837b267dd50ef52e"
+  integrity sha512-bkrD/Mc2fSvkQBV5EpoFcZ87AvOgDxbG99488a5cexp5Ccny+UM6MAe/UFkUC0wLYD9+9befNOqGiIJhhq+HbA==
+  dependencies:
+    "@prisma/debug" "5.22.0"
+    "@prisma/engines-version" "5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2"
+    "@prisma/get-platform" "5.22.0"
+
+"@prisma/get-platform@5.22.0":
+  version "5.22.0"
+  resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.22.0.tgz#fc675bc9d12614ca2dade0506c9c4a77e7dddacd"
+  integrity sha512-pHhpQdr1UPFpt+zFfnPazhulaZYCUqeIcPpJViYoq9R+D/yw4fjE+CtnsnKzPYm0ddUbeXUzjGVGIRVgPDCk4Q==
+  dependencies:
+    "@prisma/debug" "5.22.0"
+
+"@radix-ui/primitive@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/primitive/-/primitive-1.1.0.tgz#42ef83b3b56dccad5d703ae8c42919a68798bbe2"
+  integrity sha512-4Z8dn6Upk0qk4P74xBhZ6Hd/w0mPEzOOLxy4xiPXOXqjF7jZS0VAKk7/x/H6FyY2zCkYJqePf1G5KmkmNJ4RBA==
+
+"@radix-ui/react-collection@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-collection/-/react-collection-1.1.0.tgz#f18af78e46454a2360d103c2251773028b7724ed"
+  integrity sha512-GZsZslMJEyo1VKm5L1ZJY8tGDxZNPAoUeQUIbKeJfoi7Q4kmig5AsgLMYYuyYbfjd8fBmFORAIwYAkXMnXZgZw==
+  dependencies:
+    "@radix-ui/react-compose-refs" "1.1.0"
+    "@radix-ui/react-context" "1.1.0"
+    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-slot" "1.1.0"
+
+"@radix-ui/react-compose-refs@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.0.tgz#656432461fc8283d7b591dcf0d79152fae9ecc74"
+  integrity sha512-b4inOtiaOnYf9KWyO3jAeeCG6FeyfY6ldiEPanbUjWd+xIk5wZeHa8yVwmrJ2vderhu/BQvzCrJI0lHd+wIiqw==
+
+"@radix-ui/react-context@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-context/-/react-context-1.1.0.tgz#6df8d983546cfd1999c8512f3a8ad85a6e7fcee8"
+  integrity sha512-OKrckBy+sMEgYM/sMmqmErVn0kZqrHPJze+Ql3DzYsDDp0hl0L62nx/2122/Bvps1qz645jlcu2tD9lrRSdf8A==
+
+"@radix-ui/react-context@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-context/-/react-context-1.1.1.tgz#82074aa83a472353bb22e86f11bcbd1c61c4c71a"
+  integrity sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q==
+
+"@radix-ui/react-dismissable-layer@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.1.tgz#cbdcb739c5403382bdde5f9243042ba643883396"
+  integrity sha512-QSxg29lfr/xcev6kSz7MAlmDnzbP1eI/Dwn3Tp1ip0KT5CUELsxkekFEMVBEoykI3oV39hKT4TKZzBNMbcTZYQ==
+  dependencies:
+    "@radix-ui/primitive" "1.1.0"
+    "@radix-ui/react-compose-refs" "1.1.0"
+    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-use-callback-ref" "1.1.0"
+    "@radix-ui/react-use-escape-keydown" "1.1.0"
+
+"@radix-ui/react-portal@1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-portal/-/react-portal-1.1.2.tgz#51eb46dae7505074b306ebcb985bf65cc547d74e"
+  integrity sha512-WeDYLGPxJb/5EGBoedyJbT0MpoULmwnIPMJMSldkuiMsBAv7N1cRdsTWZWht9vpPOiN3qyiGAtbK2is47/uMFg==
+  dependencies:
+    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-use-layout-effect" "1.1.0"
+
+"@radix-ui/react-presence@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-presence/-/react-presence-1.1.1.tgz#98aba423dba5e0c687a782c0669dcd99de17f9b1"
+  integrity sha512-IeFXVi4YS1K0wVZzXNrbaaUvIJ3qdY+/Ih4eHFhWA9SwGR9UDX7Ck8abvL57C4cv3wwMvUE0OG69Qc3NCcTe/A==
+  dependencies:
+    "@radix-ui/react-compose-refs" "1.1.0"
+    "@radix-ui/react-use-layout-effect" "1.1.0"
+
+"@radix-ui/react-primitive@2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-primitive/-/react-primitive-2.0.0.tgz#fe05715faa9203a223ccc0be15dc44b9f9822884"
+  integrity sha512-ZSpFm0/uHa8zTvKBDjLFWLo8dkr4MBsiDLz0g3gMUwqgLHz9rTaRRGYDgvZPtBJgYCBKXkS9fzmoySgr8CO6Cw==
+  dependencies:
+    "@radix-ui/react-slot" "1.1.0"
+
+"@radix-ui/react-slot@1.1.0", "@radix-ui/react-slot@^1.0.2":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-1.1.0.tgz#7c5e48c36ef5496d97b08f1357bb26ed7c714b84"
+  integrity sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==
+  dependencies:
+    "@radix-ui/react-compose-refs" "1.1.0"
+
+"@radix-ui/react-toast@^1.2.1":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-toast/-/react-toast-1.2.2.tgz#fdd8ed0b80f47d6631dfd90278fee6debc06bf33"
+  integrity sha512-Z6pqSzmAP/bFJoqMAston4eSNa+ud44NSZTiZUmUen+IOZ5nBY8kzuU5WDBVyFXPtcW6yUalOHsxM/BP6Sv8ww==
+  dependencies:
+    "@radix-ui/primitive" "1.1.0"
+    "@radix-ui/react-collection" "1.1.0"
+    "@radix-ui/react-compose-refs" "1.1.0"
+    "@radix-ui/react-context" "1.1.1"
+    "@radix-ui/react-dismissable-layer" "1.1.1"
+    "@radix-ui/react-portal" "1.1.2"
+    "@radix-ui/react-presence" "1.1.1"
+    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-use-callback-ref" "1.1.0"
+    "@radix-ui/react-use-controllable-state" "1.1.0"
+    "@radix-ui/react-use-layout-effect" "1.1.0"
+    "@radix-ui/react-visually-hidden" "1.1.0"
+
+"@radix-ui/react-use-callback-ref@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz#bce938ca413675bc937944b0d01ef6f4a6dc5bf1"
+  integrity sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==
+
+"@radix-ui/react-use-controllable-state@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.1.0.tgz#1321446857bb786917df54c0d4d084877aab04b0"
+  integrity sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==
   dependencies:
-    "@prisma/debug" "5.17.0"
-    "@prisma/engines-version" "5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053"
-    "@prisma/get-platform" "5.17.0"
+    "@radix-ui/react-use-callback-ref" "1.1.0"
 
-"@prisma/get-platform@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.17.0.tgz#89fdcae2adddebbbf0e7bd0474a6c49d6023519b"
-  integrity sha512-UlDgbRozCP1rfJ5Tlkf3Cnftb6srGrEQ4Nm3og+1Se2gWmCZ0hmPIi+tQikGDUVLlvOWx3Gyi9LzgRP+HTXV9w==
+"@radix-ui/react-use-escape-keydown@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.0.tgz#31a5b87c3b726504b74e05dac1edce7437b98754"
+  integrity sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==
   dependencies:
-    "@prisma/debug" "5.17.0"
+    "@radix-ui/react-use-callback-ref" "1.1.0"
+
+"@radix-ui/react-use-layout-effect@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.0.tgz#3c2c8ce04827b26a39e442ff4888d9212268bd27"
+  integrity sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==
+
+"@radix-ui/react-visually-hidden@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.1.0.tgz#ad47a8572580f7034b3807c8e6740cd41038a5a2"
+  integrity sha512-N8MDZqtgCgG5S3aV60INAB475osJousYpZ4cTJ2cFbMpdHS5Y6loLTH8LPtkj2QN0x93J30HT/M3qJXM0+lyeQ==
+  dependencies:
+    "@radix-ui/react-primitive" "2.0.0"
+
+"@react-aria/breadcrumbs@^3.5.19":
+  version "3.5.19"
+  resolved "https://registry.yarnpkg.com/@react-aria/breadcrumbs/-/breadcrumbs-3.5.19.tgz#e0a67e0e7017089fa0ee5eadd51a6da505b94cd4"
+  integrity sha512-mVngOPFYVVhec89rf/CiYQGTfaLRfHFtX+JQwY7sNYNqSA+gO8p4lNARe3Be6bJPgH+LUQuruIY9/ZDL6LT3HA==
+  dependencies:
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/link" "^3.7.7"
+    "@react-aria/utils" "^3.26.0"
+    "@react-types/breadcrumbs" "^3.7.9"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/button@^3.11.0":
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/button/-/button-3.11.0.tgz#cb7790db23949ec9c1e698fa531ee5471cf2b515"
+  integrity sha512-b37eIV6IW11KmNIAm65F3SEl2/mgj5BrHIysW6smZX3KoKWTGYsYfcQkmtNgY0GOSFfDxMCoolsZ6mxC00nSDA==
+  dependencies:
+    "@react-aria/focus" "^3.19.0"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/toolbar" "3.0.0-beta.11"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/toggle" "^3.8.0"
+    "@react-types/button" "^3.10.1"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/calendar@^3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/calendar/-/calendar-3.6.0.tgz#d5e7cf4beb8724648a7042dbc5bb519de4351906"
+  integrity sha512-tZ3nd5DP8uxckbj83Pt+4RqgcTWDlGi7njzc7QqFOG2ApfnYDUXbIpb/Q4KY6JNlJskG8q33wo0XfOwNy8J+eg==
+  dependencies:
+    "@internationalized/date" "^3.6.0"
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/live-announcer" "^3.4.1"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/calendar" "^3.6.0"
+    "@react-types/button" "^3.10.1"
+    "@react-types/calendar" "^3.5.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/checkbox@^3.15.0":
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/checkbox/-/checkbox-3.15.0.tgz#4d224b71c65d6a079ff935ab22c806323f84b746"
+  integrity sha512-z/8xd4em7o0MroBXwkkwv7QRwiJaA1FwqMhRUb7iqtBGP2oSytBEDf0N7L09oci32a1P4ZPz2rMK5GlLh/PD6g==
+  dependencies:
+    "@react-aria/form" "^3.0.11"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/label" "^3.7.13"
+    "@react-aria/toggle" "^3.10.10"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/checkbox" "^3.6.10"
+    "@react-stately/form" "^3.1.0"
+    "@react-stately/toggle" "^3.8.0"
+    "@react-types/checkbox" "^3.9.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/collections@3.0.0-alpha.6":
+  version "3.0.0-alpha.6"
+  resolved "https://registry.yarnpkg.com/@react-aria/collections/-/collections-3.0.0-alpha.6.tgz#2fab7192ba4ac1452ad01b2c5456195a16f353e1"
+  integrity sha512-A+7Eap/zvsghMb5/C3EAPn41axSzRhtX2glQRXSBj1mK31CTPCZ9BhrMIMC5DL7ZnfA7C+Ysilo9nI2YQh5PMg==
+  dependencies:
+    "@react-aria/ssr" "^3.9.7"
+    "@react-aria/utils" "^3.26.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+    use-sync-external-store "^1.2.0"
+
+"@react-aria/color@^3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@react-aria/color/-/color-3.0.2.tgz#3abeb7e9fa9756e1823e513921e04dcaa47b25cc"
+  integrity sha512-dSM5qQRcR1gRGYCBw0IGRmc29gjfoht3cQleKb8MMNcgHYa2oi5VdCs2yKXmYFwwVC6uPtnlNy9S6e0spqdr+w==
+  dependencies:
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/numberfield" "^3.11.9"
+    "@react-aria/slider" "^3.7.14"
+    "@react-aria/spinbutton" "^3.6.10"
+    "@react-aria/textfield" "^3.15.0"
+    "@react-aria/utils" "^3.26.0"
+    "@react-aria/visually-hidden" "^3.8.18"
+    "@react-stately/color" "^3.8.1"
+    "@react-stately/form" "^3.1.0"
+    "@react-types/color" "^3.0.1"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/combobox@^3.11.0":
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/combobox/-/combobox-3.11.0.tgz#9489aaad342d092bf1fe1c4c382f6714316ac1c4"
+  integrity sha512-s88YMmPkMO1WSoiH1KIyZDLJqUwvM2wHXXakj3cYw1tBHGo4rOUFq+JWQIbM5EDO4HOR4AUUqzIUd0NO7t3zyg==
+  dependencies:
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/listbox" "^3.13.6"
+    "@react-aria/live-announcer" "^3.4.1"
+    "@react-aria/menu" "^3.16.0"
+    "@react-aria/overlays" "^3.24.0"
+    "@react-aria/selection" "^3.21.0"
+    "@react-aria/textfield" "^3.15.0"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/collections" "^3.12.0"
+    "@react-stately/combobox" "^3.10.1"
+    "@react-stately/form" "^3.1.0"
+    "@react-types/button" "^3.10.1"
+    "@react-types/combobox" "^3.13.1"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/datepicker@^3.12.0":
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/datepicker/-/datepicker-3.12.0.tgz#a82ff3ebd3ead20a00096d082c1e6be47bbd5886"
+  integrity sha512-VYNXioLfddIHpwQx211+rTYuunDmI7VHWBRetCpH3loIsVFuhFSRchTQpclAzxolO3g0vO7pMVj9VYt7Swp6kg==
+  dependencies:
+    "@internationalized/date" "^3.6.0"
+    "@internationalized/number" "^3.6.0"
+    "@internationalized/string" "^3.2.5"
+    "@react-aria/focus" "^3.19.0"
+    "@react-aria/form" "^3.0.11"
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/label" "^3.7.13"
+    "@react-aria/spinbutton" "^3.6.10"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/datepicker" "^3.11.0"
+    "@react-stately/form" "^3.1.0"
+    "@react-types/button" "^3.10.1"
+    "@react-types/calendar" "^3.5.0"
+    "@react-types/datepicker" "^3.9.0"
+    "@react-types/dialog" "^3.5.14"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/dialog@^3.5.20":
+  version "3.5.20"
+  resolved "https://registry.yarnpkg.com/@react-aria/dialog/-/dialog-3.5.20.tgz#6404d2c1bab1ea9ecce3ebc7adce64733ecea985"
+  integrity sha512-l0GZVLgeOd3kL3Yj8xQW7wN3gn9WW3RLd/SGI9t7ciTq+I/FhftjXCWzXLlOCCTLMf+gv7eazecECtmoWUaZWQ==
+  dependencies:
+    "@react-aria/focus" "^3.19.0"
+    "@react-aria/overlays" "^3.24.0"
+    "@react-aria/utils" "^3.26.0"
+    "@react-types/dialog" "^3.5.14"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/disclosure@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/disclosure/-/disclosure-3.0.0.tgz#36342210740fd659ad97678fe5a57896a7fcbd10"
+  integrity sha512-xO9QTQSvymujTjCs1iCQ4+dKZvtF/rVVaFZBKlUtqIqwTHMdqeZu4fh5miLEnTyVLNHMGzLrFggsd8Q+niC9Og==
+  dependencies:
+    "@react-aria/ssr" "^3.9.7"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/disclosure" "^3.0.0"
+    "@react-types/button" "^3.10.1"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/dnd@^3.8.0":
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/dnd/-/dnd-3.8.0.tgz#7e3bfa3f509efeb9a872686e65641a719684e95a"
+  integrity sha512-JiqHY3E9fDU5Kb4gN22cuK6QNlpMCGe6ngR/BV+Q8mLEsdoWcoUAYOtYXVNNTRvCdVbEWI87FUU+ThyPpoDhNQ==
+  dependencies:
+    "@internationalized/string" "^3.2.5"
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/live-announcer" "^3.4.1"
+    "@react-aria/overlays" "^3.24.0"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/dnd" "^3.5.0"
+    "@react-types/button" "^3.10.1"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/focus@^3.19.0":
+  version "3.19.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/focus/-/focus-3.19.0.tgz#82b9a5b83f023b943a7970df3d059f49d61df05d"
+  integrity sha512-hPF9EXoUQeQl1Y21/rbV2H4FdUR2v+4/I0/vB+8U3bT1CJ+1AFj1hc/rqx2DqEwDlEwOHN+E4+mRahQmlybq0A==
+  dependencies:
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/utils" "^3.26.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+    clsx "^2.0.0"
+
+"@react-aria/form@^3.0.11":
+  version "3.0.11"
+  resolved "https://registry.yarnpkg.com/@react-aria/form/-/form-3.0.11.tgz#84511874e1fad5f981bae97ebd4d549923849455"
+  integrity sha512-oXzjTiwVuuWjZ8muU0hp3BrDH5qjVctLOF50mjPvqUbvXQTHhoDxWweyIXPQjGshaqBd2w4pWaE4A2rG2O/apw==
+  dependencies:
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/form" "^3.1.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/grid@^3.11.0":
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/grid/-/grid-3.11.0.tgz#5ad6596745482e109b3b47f1fec7ce372f632707"
+  integrity sha512-lN5FpQgu2Rq0CzTPWmzRpq6QHcMmzsXYeClsgO3108uVp1/genBNAObYVTxGOKe/jb9q99trz8EtIn05O6KN1g==
+  dependencies:
+    "@react-aria/focus" "^3.19.0"
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/live-announcer" "^3.4.1"
+    "@react-aria/selection" "^3.21.0"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/collections" "^3.12.0"
+    "@react-stately/grid" "^3.10.0"
+    "@react-stately/selection" "^3.18.0"
+    "@react-types/checkbox" "^3.9.0"
+    "@react-types/grid" "^3.2.10"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/gridlist@^3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/gridlist/-/gridlist-3.10.0.tgz#adc2f9896a2759bb29cec428378c8ac85235a110"
+  integrity sha512-UcblfSZ7kJBrjg9mQ5VbnRevN81UiYB4NuL5PwIpBpridO7tnl4ew6+96PYU7Wj1chHhPS3x0b0zmuSVN7A0LA==
+  dependencies:
+    "@react-aria/focus" "^3.19.0"
+    "@react-aria/grid" "^3.11.0"
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/selection" "^3.21.0"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/collections" "^3.12.0"
+    "@react-stately/list" "^3.11.1"
+    "@react-stately/tree" "^3.8.6"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/i18n@^3.12.4":
+  version "3.12.4"
+  resolved "https://registry.yarnpkg.com/@react-aria/i18n/-/i18n-3.12.4.tgz#4520ce48a1b6ebe4aa470d72eba300e65de01814"
+  integrity sha512-j9+UL3q0Ls8MhXV9gtnKlyozq4aM95YywXqnmJtzT1rYeBx7w28hooqrWkCYLfqr4OIryv1KUnPiCSLwC2OC7w==
+  dependencies:
+    "@internationalized/date" "^3.6.0"
+    "@internationalized/message" "^3.1.6"
+    "@internationalized/number" "^3.6.0"
+    "@internationalized/string" "^3.2.5"
+    "@react-aria/ssr" "^3.9.7"
+    "@react-aria/utils" "^3.26.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/interactions@^3.22.5":
+  version "3.22.5"
+  resolved "https://registry.yarnpkg.com/@react-aria/interactions/-/interactions-3.22.5.tgz#9cd8c93b8b6988f1d315d3efb450119d1432bbb8"
+  integrity sha512-kMwiAD9E0TQp+XNnOs13yVJghiy8ET8L0cbkeuTgNI96sOAp/63EJ1FSrDf17iD8sdjt41LafwX/dKXW9nCcLQ==
+  dependencies:
+    "@react-aria/ssr" "^3.9.7"
+    "@react-aria/utils" "^3.26.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/label@^3.7.13":
+  version "3.7.13"
+  resolved "https://registry.yarnpkg.com/@react-aria/label/-/label-3.7.13.tgz#9e7153a1ded878b5147d141effc3eb226f3c6c1f"
+  integrity sha512-brSAXZVTey5RG/Ex6mTrV/9IhGSQFU4Al34qmjEDho+Z2qT4oPwf8k7TRXWWqzOU0ugYxekYbsLd2zlN3XvWcg==
+  dependencies:
+    "@react-aria/utils" "^3.26.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/link@^3.7.7":
+  version "3.7.7"
+  resolved "https://registry.yarnpkg.com/@react-aria/link/-/link-3.7.7.tgz#5879c75068b63d55353b3e96b4fda0fa8753d1ad"
+  integrity sha512-eVBRcHKhNSsATYWv5wRnZXRqPVcKAWWakyvfrYePIKpC3s4BaHZyTGYdefk8ZwZdEOuQZBqLMnjW80q1uhtkuA==
+  dependencies:
+    "@react-aria/focus" "^3.19.0"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/utils" "^3.26.0"
+    "@react-types/link" "^3.5.9"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/listbox@^3.13.6":
+  version "3.13.6"
+  resolved "https://registry.yarnpkg.com/@react-aria/listbox/-/listbox-3.13.6.tgz#43ff24f4a6540a9952729833201460fa6ab081f7"
+  integrity sha512-6hEXEXIZVau9lgBZ4VVjFR3JnGU+fJaPmV3HP0UZ2ucUptfG0MZo24cn+ZQJsWiuaCfNFv5b8qribiv+BcO+Kg==
+  dependencies:
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/label" "^3.7.13"
+    "@react-aria/selection" "^3.21.0"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/collections" "^3.12.0"
+    "@react-stately/list" "^3.11.1"
+    "@react-types/listbox" "^3.5.3"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/live-announcer@^3.4.1":
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/@react-aria/live-announcer/-/live-announcer-3.4.1.tgz#efedf706b23f6e1b526a3a35c14c202ac3e68487"
+  integrity sha512-4X2mcxgqLvvkqxv2l1n00jTzUxxe0kkLiapBGH1LHX/CxA1oQcHDqv8etJ2ZOwmS/MSBBiWnv3DwYHDOF6ubig==
+  dependencies:
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/menu@^3.16.0":
+  version "3.16.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/menu/-/menu-3.16.0.tgz#119e562806e9f8a39fd468ab790d788905c6df83"
+  integrity sha512-TNk+Vd3TbpBPUxEloAdHRTaRxf9JBK7YmkHYiq0Yj5Lc22KS0E2eTyhpPM9xJvEWN2TlC5TEvNfdyui2kYWFFQ==
+  dependencies:
+    "@react-aria/focus" "^3.19.0"
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/overlays" "^3.24.0"
+    "@react-aria/selection" "^3.21.0"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/collections" "^3.12.0"
+    "@react-stately/menu" "^3.9.0"
+    "@react-stately/selection" "^3.18.0"
+    "@react-stately/tree" "^3.8.6"
+    "@react-types/button" "^3.10.1"
+    "@react-types/menu" "^3.9.13"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/meter@^3.4.18":
+  version "3.4.18"
+  resolved "https://registry.yarnpkg.com/@react-aria/meter/-/meter-3.4.18.tgz#ff3f85f32ea30285e7e73386a641efdcedd88205"
+  integrity sha512-tTX3LLlmDIHqrC42dkdf+upb1c4UbhlpZ52gqB64lZD4OD4HE+vMTwNSe+7MRKMLvcdKPWCRC35PnxIHZ15kfQ==
+  dependencies:
+    "@react-aria/progress" "^3.4.18"
+    "@react-types/meter" "^3.4.5"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/numberfield@^3.11.9":
+  version "3.11.9"
+  resolved "https://registry.yarnpkg.com/@react-aria/numberfield/-/numberfield-3.11.9.tgz#175f801b18740534dca023cfd9ce0349eff940b0"
+  integrity sha512-3tiGPx2y4zyOV7PmdBASes99ZZsFTZAJTnU45Z+p1CW4131lw7y2ZhbojBl7U6DaXAJvi1z6zY6cq2UE9w5a0Q==
+  dependencies:
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/spinbutton" "^3.6.10"
+    "@react-aria/textfield" "^3.15.0"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/form" "^3.1.0"
+    "@react-stately/numberfield" "^3.9.8"
+    "@react-types/button" "^3.10.1"
+    "@react-types/numberfield" "^3.8.7"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/overlays@^3.24.0":
+  version "3.24.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/overlays/-/overlays-3.24.0.tgz#7f97cd12506961abfab3ae653822cea05d1cacd3"
+  integrity sha512-0kAXBsMNTc/a3M07tK9Cdt/ea8CxTAEJ223g8YgqImlmoBBYAL7dl5G01IOj67TM64uWPTmZrOklBchHWgEm3A==
+  dependencies:
+    "@react-aria/focus" "^3.19.0"
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/ssr" "^3.9.7"
+    "@react-aria/utils" "^3.26.0"
+    "@react-aria/visually-hidden" "^3.8.18"
+    "@react-stately/overlays" "^3.6.12"
+    "@react-types/button" "^3.10.1"
+    "@react-types/overlays" "^3.8.11"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/progress@^3.4.18":
+  version "3.4.18"
+  resolved "https://registry.yarnpkg.com/@react-aria/progress/-/progress-3.4.18.tgz#948859ce1b0e13d935da7d4cbe6812d451472fe4"
+  integrity sha512-FOLgJ9t9i1u3oAAimybJG6r7/soNPBnJfWo4Yr6MmaUv90qVGa1h6kiuM5m9H/bm5JobAebhdfHit9lFlgsCmg==
+  dependencies:
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/label" "^3.7.13"
+    "@react-aria/utils" "^3.26.0"
+    "@react-types/progress" "^3.5.8"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/radio@^3.10.10":
+  version "3.10.10"
+  resolved "https://registry.yarnpkg.com/@react-aria/radio/-/radio-3.10.10.tgz#18e2811fb3e72298414c880bd9405ea3f1d83f1f"
+  integrity sha512-NVdeOVrsrHgSfwL2jWCCXFsWZb+RMRZErj5vthHQW4nkHECGOzeX56VaLWTSvdoCPqi9wdIX8A6K9peeAIgxzA==
+  dependencies:
+    "@react-aria/focus" "^3.19.0"
+    "@react-aria/form" "^3.0.11"
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/label" "^3.7.13"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/radio" "^3.10.9"
+    "@react-types/radio" "^3.8.5"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/searchfield@^3.7.11":
+  version "3.7.11"
+  resolved "https://registry.yarnpkg.com/@react-aria/searchfield/-/searchfield-3.7.11.tgz#2be234280cc4fb58a316db6ba1f95ea34754c043"
+  integrity sha512-wFf6QxtBFfoxy0ANxI0+ftFEBGynVCY0+ce4H4Y9LpUTQsIKMp3sdc7LoUFORWw5Yee6Eid5cFPQX0Ymnk+ZJg==
+  dependencies:
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/textfield" "^3.15.0"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/searchfield" "^3.5.8"
+    "@react-types/button" "^3.10.1"
+    "@react-types/searchfield" "^3.5.10"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/select@^3.15.0":
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/select/-/select-3.15.0.tgz#e0b955ed908039f734805e852b58dec4b159adc9"
+  integrity sha512-zgBOUNy81aJplfc3NKDJMv8HkXjBGzaFF3XDzNfW8vJ7nD9rcTRUN5SQ1XCEnKMv12B/Euk9zt6kd+tX0wk1vQ==
+  dependencies:
+    "@react-aria/form" "^3.0.11"
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/label" "^3.7.13"
+    "@react-aria/listbox" "^3.13.6"
+    "@react-aria/menu" "^3.16.0"
+    "@react-aria/selection" "^3.21.0"
+    "@react-aria/utils" "^3.26.0"
+    "@react-aria/visually-hidden" "^3.8.18"
+    "@react-stately/select" "^3.6.9"
+    "@react-types/button" "^3.10.1"
+    "@react-types/select" "^3.9.8"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/selection@^3.21.0":
+  version "3.21.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/selection/-/selection-3.21.0.tgz#c5660e73a38db5e3e1cdc722e408b4489f5f589a"
+  integrity sha512-52JJ6hlPcM+gt0VV3DBmz6Kj1YAJr13TfutrKfGWcK36LvNCBm1j0N+TDqbdnlp8Nue6w0+5FIwZq44XPYiBGg==
+  dependencies:
+    "@react-aria/focus" "^3.19.0"
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/selection" "^3.18.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/separator@^3.4.4":
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/@react-aria/separator/-/separator-3.4.4.tgz#7975177d256d8e864625d9823bf7a6de5a6b6460"
+  integrity sha512-dH+qt0Mdh0nhKXCHW6AR4DF8DKLUBP26QYWaoThPdBwIpypH/JVKowpPtWms1P4b36U6XzHXHnTTEn/ZVoCqNA==
+  dependencies:
+    "@react-aria/utils" "^3.26.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/slider@^3.7.14":
+  version "3.7.14"
+  resolved "https://registry.yarnpkg.com/@react-aria/slider/-/slider-3.7.14.tgz#25a362725d6cd71e9b86477362a36c847c73384e"
+  integrity sha512-7rOiKjLkEZ0j7mPMlwrqivc+K4OSfL14slaQp06GHRiJkhiWXh2/drPe15hgNq55HmBQBpA0umKMkJcqVgmXPA==
+  dependencies:
+    "@react-aria/focus" "^3.19.0"
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/label" "^3.7.13"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/slider" "^3.6.0"
+    "@react-types/shared" "^3.26.0"
+    "@react-types/slider" "^3.7.7"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/spinbutton@^3.6.10":
+  version "3.6.10"
+  resolved "https://registry.yarnpkg.com/@react-aria/spinbutton/-/spinbutton-3.6.10.tgz#72154873de807638e17570bd57e8491912b613b7"
+  integrity sha512-nhYEYk7xUNOZDaqiQ5w/nHH9ouqjJbabTWXH+KK7UR1oVGfo4z1wG94l8KWF3Z6SGGnBxzLJyTBguZ4g9aYTSg==
+  dependencies:
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/live-announcer" "^3.4.1"
+    "@react-aria/utils" "^3.26.0"
+    "@react-types/button" "^3.10.1"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/ssr@^3.9.7":
+  version "3.9.7"
+  resolved "https://registry.yarnpkg.com/@react-aria/ssr/-/ssr-3.9.7.tgz#d89d129f7bbc5148657e6c952ac31c9353183770"
+  integrity sha512-GQygZaGlmYjmYM+tiNBA5C6acmiDWF52Nqd40bBp0Znk4M4hP+LTmI0lpI1BuKMw45T8RIhrAsICIfKwZvi2Gg==
+  dependencies:
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/switch@^3.6.10":
+  version "3.6.10"
+  resolved "https://registry.yarnpkg.com/@react-aria/switch/-/switch-3.6.10.tgz#8fa5729bc4e76ac3df51389a8996873142daedb8"
+  integrity sha512-FtaI9WaEP1tAmra1sYlAkYXg9x75P5UtgY8pSbe9+1WRyWbuE1QZT+RNCTi3IU4fZ7iJQmXH6+VaMyzPlSUagw==
+  dependencies:
+    "@react-aria/toggle" "^3.10.10"
+    "@react-stately/toggle" "^3.8.0"
+    "@react-types/shared" "^3.26.0"
+    "@react-types/switch" "^3.5.7"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/table@^3.16.0":
+  version "3.16.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/table/-/table-3.16.0.tgz#f0ffb51f52494e68f2c3b81fba44278fbdc48c28"
+  integrity sha512-9xF9S3CJ7XRiiK92hsIKxPedD0kgcQWwqTMtj3IBynpQ4vsnRiW3YNIzrn9C3apjknRZDTSta8O2QPYCUMmw2A==
+  dependencies:
+    "@react-aria/focus" "^3.19.0"
+    "@react-aria/grid" "^3.11.0"
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/live-announcer" "^3.4.1"
+    "@react-aria/utils" "^3.26.0"
+    "@react-aria/visually-hidden" "^3.8.18"
+    "@react-stately/collections" "^3.12.0"
+    "@react-stately/flags" "^3.0.5"
+    "@react-stately/table" "^3.13.0"
+    "@react-types/checkbox" "^3.9.0"
+    "@react-types/grid" "^3.2.10"
+    "@react-types/shared" "^3.26.0"
+    "@react-types/table" "^3.10.3"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/tabs@^3.9.8":
+  version "3.9.8"
+  resolved "https://registry.yarnpkg.com/@react-aria/tabs/-/tabs-3.9.8.tgz#a0a647a4e2d1783125779473536419fd8caa9cfa"
+  integrity sha512-Nur/qRFBe+Zrt4xcCJV/ULXCS3Mlae+B89bp1Gl20vSDqk6uaPtGk+cS5k03eugOvas7AQapqNJsJgKd66TChw==
+  dependencies:
+    "@react-aria/focus" "^3.19.0"
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/selection" "^3.21.0"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/tabs" "^3.7.0"
+    "@react-types/shared" "^3.26.0"
+    "@react-types/tabs" "^3.3.11"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/tag@^3.4.8":
+  version "3.4.8"
+  resolved "https://registry.yarnpkg.com/@react-aria/tag/-/tag-3.4.8.tgz#856899a53c2be2b8aea3d5aca020edf8608246b2"
+  integrity sha512-exWl52bsFtJuzaqMYvSnLteUoPqb3Wf+uICru/yRtREJsWVqjJF38NCVlU73Yqd9qMPTctDrboSZFAWAWKDxoA==
+  dependencies:
+    "@react-aria/gridlist" "^3.10.0"
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/label" "^3.7.13"
+    "@react-aria/selection" "^3.21.0"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/list" "^3.11.1"
+    "@react-types/button" "^3.10.1"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/textfield@^3.15.0":
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/textfield/-/textfield-3.15.0.tgz#17ebac0b73f084622aaf9697576b82155bed67cb"
+  integrity sha512-V5mg7y1OR6WXYHdhhm4FC7QyGc9TideVRDFij1SdOJrIo5IFB7lvwpOS0GmgwkVbtr71PTRMjZnNbrJUFU6VNA==
+  dependencies:
+    "@react-aria/focus" "^3.19.0"
+    "@react-aria/form" "^3.0.11"
+    "@react-aria/label" "^3.7.13"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/form" "^3.1.0"
+    "@react-stately/utils" "^3.10.5"
+    "@react-types/shared" "^3.26.0"
+    "@react-types/textfield" "^3.10.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/toggle@^3.10.10":
+  version "3.10.10"
+  resolved "https://registry.yarnpkg.com/@react-aria/toggle/-/toggle-3.10.10.tgz#444658bf606e6d56b1fd96737d5a552c93493979"
+  integrity sha512-QwMT/vTNrbrILxWVHfd9zVQ3mV2NdBwyRu+DphVQiFAXcmc808LEaIX2n0lI6FCsUDC9ZejCyvzd91/YemdZ1Q==
+  dependencies:
+    "@react-aria/focus" "^3.19.0"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/toggle" "^3.8.0"
+    "@react-types/checkbox" "^3.9.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/toolbar@3.0.0-beta.11":
+  version "3.0.0-beta.11"
+  resolved "https://registry.yarnpkg.com/@react-aria/toolbar/-/toolbar-3.0.0-beta.11.tgz#019c9ff2a47ad207504a95afeb0f863cf71a114b"
+  integrity sha512-LM3jTRFNDgoEpoL568WaiuqiVM7eynSQLJis1hV0vlVnhTd7M7kzt7zoOjzxVb5Uapz02uCp1Fsm4wQMz09qwQ==
+  dependencies:
+    "@react-aria/focus" "^3.19.0"
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/utils" "^3.26.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/tooltip@^3.7.10":
+  version "3.7.10"
+  resolved "https://registry.yarnpkg.com/@react-aria/tooltip/-/tooltip-3.7.10.tgz#d710532e80337e50be818dfbf2cc54d0a9b8c592"
+  integrity sha512-Udi3XOnrF/SYIz72jw9bgB74MG/yCOzF5pozHj2FH2HiJlchYv/b6rHByV/77IZemdlkmL/uugrv/7raPLSlnw==
+  dependencies:
+    "@react-aria/focus" "^3.19.0"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/tooltip" "^3.5.0"
+    "@react-types/shared" "^3.26.0"
+    "@react-types/tooltip" "^3.4.13"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/tree@3.0.0-beta.2":
+  version "3.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/@react-aria/tree/-/tree-3.0.0-beta.2.tgz#f4edf593e0a5acbc19f2a17d2d78fb0633a105e5"
+  integrity sha512-lH3hVl2VgG3YLN+ee1zQzm+2F+BGLd/HBhfMYPuI3IjHvDb+m+jCJXHdBOGrfG2Qydk2LYheqX8QXCluulu0qQ==
+  dependencies:
+    "@react-aria/gridlist" "^3.10.0"
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/selection" "^3.21.0"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/tree" "^3.8.6"
+    "@react-types/button" "^3.10.1"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/utils@^3.26.0":
+  version "3.26.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/utils/-/utils-3.26.0.tgz#833cbfa33e75d15835b757791b3f754432d2f948"
+  integrity sha512-LkZouGSjjQ0rEqo4XJosS4L3YC/zzQkfRM3KoqK6fUOmUJ9t0jQ09WjiF+uOoG9u+p30AVg3TrZRUWmoTS+koQ==
+  dependencies:
+    "@react-aria/ssr" "^3.9.7"
+    "@react-stately/utils" "^3.10.5"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+    clsx "^2.0.0"
+
+"@react-aria/virtualizer@^4.1.0":
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/@react-aria/virtualizer/-/virtualizer-4.1.0.tgz#df00bfba82fa5e0d622cc24699be67a60be7ab4f"
+  integrity sha512-ziSq3Y7iuaAMJWGZU1RRs/TykuPapQfx8dyH2eyKPLgEjBUoXRGWE7n6jklBwal14b0lPK0wkCzRoQbkUvX3cg==
+  dependencies:
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/utils" "^3.26.0"
+    "@react-stately/virtualizer" "^4.2.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-aria/visually-hidden@^3.8.18":
+  version "3.8.18"
+  resolved "https://registry.yarnpkg.com/@react-aria/visually-hidden/-/visually-hidden-3.8.18.tgz#13c168736944cbe19cd8917ec33a4e6f5f694119"
+  integrity sha512-l/0igp+uub/salP35SsNWq5mGmg3G5F5QMS1gDZ8p28n7CgjvzyiGhJbbca7Oxvaw1HRFzVl9ev+89I7moNnFQ==
+  dependencies:
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/utils" "^3.26.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
 
 "@react-spring/animated@~9.7.5":
   version "9.7.5"
@@ -2394,6 +3401,508 @@
     "@react-spring/shared" "~9.7.5"
     "@react-spring/types" "~9.7.5"
 
+"@react-stately/calendar@^3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@react-stately/calendar/-/calendar-3.6.0.tgz#c770890160c33826206a015eb7da32fe8ece81d5"
+  integrity sha512-GqUtOtGnwWjtNrJud8nY/ywI4VBP5byToNVRTnxbMl+gYO1Qe/uc5NG7zjwMxhb2kqSBHZFdkF0DXVqG2Ul+BA==
+  dependencies:
+    "@internationalized/date" "^3.6.0"
+    "@react-stately/utils" "^3.10.5"
+    "@react-types/calendar" "^3.5.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/checkbox@^3.6.10":
+  version "3.6.10"
+  resolved "https://registry.yarnpkg.com/@react-stately/checkbox/-/checkbox-3.6.10.tgz#69b619fdfcf1e15d2d93392e13289a36d85a8a6c"
+  integrity sha512-LHm7i4YI8A/RdgWAuADrnSAYIaYYpQeZqsp1a03Og0pJHAlZL0ymN3y2IFwbZueY0rnfM+yF+kWNXjJqbKrFEQ==
+  dependencies:
+    "@react-stately/form" "^3.1.0"
+    "@react-stately/utils" "^3.10.5"
+    "@react-types/checkbox" "^3.9.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/collections@^3.12.0":
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/@react-stately/collections/-/collections-3.12.0.tgz#6240d3517d0d86f7d9eb4997108fb432d569e8d7"
+  integrity sha512-MfR9hwCxe5oXv4qrLUnjidwM50U35EFmInUeFf8i9mskYwWlRYS0O1/9PZ0oF1M0cKambaRHKEy98jczgb9ycA==
+  dependencies:
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/color@^3.8.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@react-stately/color/-/color-3.8.1.tgz#13969f61f1c1b468fd891cc94582056fc2da9b9b"
+  integrity sha512-7eN7K+KJRu+rxK351eGrzoq2cG+yipr90i5b1cUu4lioYmcH4WdsfjmM5Ku6gypbafH+kTDfflvO6hiY1NZH+A==
+  dependencies:
+    "@internationalized/number" "^3.6.0"
+    "@internationalized/string" "^3.2.5"
+    "@react-aria/i18n" "^3.12.4"
+    "@react-stately/form" "^3.1.0"
+    "@react-stately/numberfield" "^3.9.8"
+    "@react-stately/slider" "^3.6.0"
+    "@react-stately/utils" "^3.10.5"
+    "@react-types/color" "^3.0.1"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/combobox@^3.10.1":
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/@react-stately/combobox/-/combobox-3.10.1.tgz#ebae28c5341d06d69cc8e50055fa816dee19522b"
+  integrity sha512-Rso+H+ZEDGFAhpKWbnRxRR/r7YNmYVtt+Rn0eNDNIUp3bYaxIBCdCySyAtALs4I8RZXZQ9zoUznP7YeVwG3cLg==
+  dependencies:
+    "@react-stately/collections" "^3.12.0"
+    "@react-stately/form" "^3.1.0"
+    "@react-stately/list" "^3.11.1"
+    "@react-stately/overlays" "^3.6.12"
+    "@react-stately/select" "^3.6.9"
+    "@react-stately/utils" "^3.10.5"
+    "@react-types/combobox" "^3.13.1"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/data@^3.12.0":
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/@react-stately/data/-/data-3.12.0.tgz#4f0fd89be2fa64ca7c0ad92d8cf20f2cba961fc0"
+  integrity sha512-6PiW2oA56lcH1CVjDcajutzsv91w/PER8K61/OGxtNFFUWaIZH80RWmK4kjU/Lf0vygzXCxout3kEb388lUk0w==
+  dependencies:
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/datepicker@^3.11.0":
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/@react-stately/datepicker/-/datepicker-3.11.0.tgz#5f4daff449f756dc40b4201ae337dd4a3f29facc"
+  integrity sha512-d9MJF34A0VrhL5y5S8mAISA8uwfNCQKmR2k4KoQJm3De1J8SQeNzSjLviAwh1faDow6FXGlA6tVbTrHyDcBgBg==
+  dependencies:
+    "@internationalized/date" "^3.6.0"
+    "@internationalized/string" "^3.2.5"
+    "@react-stately/form" "^3.1.0"
+    "@react-stately/overlays" "^3.6.12"
+    "@react-stately/utils" "^3.10.5"
+    "@react-types/datepicker" "^3.9.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/disclosure@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@react-stately/disclosure/-/disclosure-3.0.0.tgz#6eca061727eb27e391cc09a871f838228c597e14"
+  integrity sha512-Z9+fi0/41ZXHjGopORQza7mk4lFEFslKhy65ehEo6O6j2GuIV0659ExIVDsmJoJSFjXCfGh0sX8oTSOlXi9gqg==
+  dependencies:
+    "@react-stately/utils" "^3.10.5"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/dnd@^3.5.0":
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/@react-stately/dnd/-/dnd-3.5.0.tgz#3061233709f7113f6492de33204aea507c243a2e"
+  integrity sha512-ZcWFw1npEDnATiy3TEdzA1skQ3UEIyfbNA6VhPNO8yiSVLxoxBOaEaq8VVS72fRGAtxud6dgOy8BnsP9JwDClQ==
+  dependencies:
+    "@react-stately/selection" "^3.18.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/flags@^3.0.5":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@react-stately/flags/-/flags-3.0.5.tgz#b35bcbd3b80c4f821e23e9c649566a4af11e97bf"
+  integrity sha512-6wks4csxUwPCp23LgJSnkBRhrWpd9jGd64DjcCTNB2AHIFu7Ab1W59pJpUL6TW7uAxVxdNKjgn6D1hlBy8qWsA==
+  dependencies:
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/form@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@react-stately/form/-/form-3.1.0.tgz#7fdb4ca153be18e7516a02e507ada393ad38945d"
+  integrity sha512-E2wxNQ0QaTyDHD0nJFtTSnEH9A3bpJurwxhS4vgcUmESHgjFEMLlC9irUSZKgvOgb42GAq+fHoWBsgKeTp9Big==
+  dependencies:
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/grid@^3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@react-stately/grid/-/grid-3.10.0.tgz#d74e46f85a662092c61812a8508cf4ac8721ec6d"
+  integrity sha512-ii+DdsOBvCnHMgL0JvUfFwO1kiAPP19Bpdpl6zn/oOltk6F5TmnoyNrzyz+2///1hCiySI3FE1O7ujsAQs7a6Q==
+  dependencies:
+    "@react-stately/collections" "^3.12.0"
+    "@react-stately/selection" "^3.18.0"
+    "@react-types/grid" "^3.2.10"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/layout@^4.1.0":
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/@react-stately/layout/-/layout-4.1.0.tgz#dd5c376c6dee90922597bcd7af2d7dedfabb6c82"
+  integrity sha512-pSBqn+4EeOaf2QMK+w2SHgsWKYHdgMZWY3qgJijdzWGZ4JpYmHuiD0yOq80qFdUwxcexPW3vFg3hqIQlMpXeCw==
+  dependencies:
+    "@react-stately/collections" "^3.12.0"
+    "@react-stately/table" "^3.13.0"
+    "@react-stately/virtualizer" "^4.2.0"
+    "@react-types/grid" "^3.2.10"
+    "@react-types/shared" "^3.26.0"
+    "@react-types/table" "^3.10.3"
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/list@^3.11.1":
+  version "3.11.1"
+  resolved "https://registry.yarnpkg.com/@react-stately/list/-/list-3.11.1.tgz#d1493e5b9c5cac6cafb3cb3a6edb852bf3cb208f"
+  integrity sha512-UCOpIvqBOjwLtk7zVTYWuKU1m1Oe61Q5lNar/GwHaV1nAiSQ8/yYlhr40NkBEs9X3plEfsV28UIpzOrYnu1tPg==
+  dependencies:
+    "@react-stately/collections" "^3.12.0"
+    "@react-stately/selection" "^3.18.0"
+    "@react-stately/utils" "^3.10.5"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/menu@^3.9.0":
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/@react-stately/menu/-/menu-3.9.0.tgz#b1e55996405f4e43ff844cbd325df9842914efe4"
+  integrity sha512-++sm0fzZeUs9GvtRbj5RwrP+KL9KPANp9f4SvtI3s+MP+Y/X3X7LNNePeeccGeyikB5fzMsuyvd82bRRW9IhDQ==
+  dependencies:
+    "@react-stately/overlays" "^3.6.12"
+    "@react-types/menu" "^3.9.13"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/numberfield@^3.9.8":
+  version "3.9.8"
+  resolved "https://registry.yarnpkg.com/@react-stately/numberfield/-/numberfield-3.9.8.tgz#863a6c0f7a4249759dd0c586f2e27dd2548aadee"
+  integrity sha512-J6qGILxDNEtu7yvd3/y+FpbrxEaAeIODwlrFo6z1kvuDlLAm/KszXAc75yoDi0OtakFTCMP6/HR5VnHaQdMJ3w==
+  dependencies:
+    "@internationalized/number" "^3.6.0"
+    "@react-stately/form" "^3.1.0"
+    "@react-stately/utils" "^3.10.5"
+    "@react-types/numberfield" "^3.8.7"
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/overlays@^3.6.12":
+  version "3.6.12"
+  resolved "https://registry.yarnpkg.com/@react-stately/overlays/-/overlays-3.6.12.tgz#beb594a0e140dbd7957bfa181006854f91480bea"
+  integrity sha512-QinvZhwZgj8obUyPIcyURSCjTZlqZYRRCS60TF8jH8ZpT0tEAuDb3wvhhSXuYA3Xo9EHLwvLjEf3tQKKdAQArw==
+  dependencies:
+    "@react-stately/utils" "^3.10.5"
+    "@react-types/overlays" "^3.8.11"
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/radio@^3.10.9":
+  version "3.10.9"
+  resolved "https://registry.yarnpkg.com/@react-stately/radio/-/radio-3.10.9.tgz#cf74b8f47cbef56836424d2e7d06c01fe9d9ea05"
+  integrity sha512-kUQ7VdqFke8SDRCatw2jW3rgzMWbvw+n2imN2THETynI47NmNLzNP11dlGO2OllRtTrsLhmBNlYHa3W62pFpAw==
+  dependencies:
+    "@react-stately/form" "^3.1.0"
+    "@react-stately/utils" "^3.10.5"
+    "@react-types/radio" "^3.8.5"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/searchfield@^3.5.8":
+  version "3.5.8"
+  resolved "https://registry.yarnpkg.com/@react-stately/searchfield/-/searchfield-3.5.8.tgz#b927e25afd32b1a32f22d54df6d7b4968cb4cf33"
+  integrity sha512-jtquvGadx1DmtQqPKaVO6Qg/xpBjNxsOd59ciig9xRxpxV+90i996EX1E2R6R+tGJdSM1pD++7PVOO4yE++HOg==
+  dependencies:
+    "@react-stately/utils" "^3.10.5"
+    "@react-types/searchfield" "^3.5.10"
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/select@^3.6.9":
+  version "3.6.9"
+  resolved "https://registry.yarnpkg.com/@react-stately/select/-/select-3.6.9.tgz#088bb0fe7b16cc67d833f17c330df63c4310a5da"
+  integrity sha512-vASUDv7FhEYQURzM+JIwcusPv7/x/l3zHc/oKJPvoCl3aa9pwS8hZwS82SC00o2iFnrDscfDJju4IE/cd4hucg==
+  dependencies:
+    "@react-stately/form" "^3.1.0"
+    "@react-stately/list" "^3.11.1"
+    "@react-stately/overlays" "^3.6.12"
+    "@react-types/select" "^3.9.8"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/selection@^3.18.0":
+  version "3.18.0"
+  resolved "https://registry.yarnpkg.com/@react-stately/selection/-/selection-3.18.0.tgz#eb723dc26eafd9b016c55056fb550bdde8b4f87b"
+  integrity sha512-6EaNNP3exxBhW2LkcRR4a3pg+3oDguZlBSqIVVR7lyahv/D8xXHRC4dX+m0mgGHJpsgjs7664Xx6c8v193TFxg==
+  dependencies:
+    "@react-stately/collections" "^3.12.0"
+    "@react-stately/utils" "^3.10.5"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/slider@^3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@react-stately/slider/-/slider-3.6.0.tgz#20439e08915725c4f6ba2285a561ae92fe59d997"
+  integrity sha512-w5vJxVh267pmD1X+Ppd9S3ZzV1hcg0cV8q5P4Egr160b9WMcWlUspZPtsthwUlN7qQe/C8y5IAhtde4s29eNag==
+  dependencies:
+    "@react-stately/utils" "^3.10.5"
+    "@react-types/shared" "^3.26.0"
+    "@react-types/slider" "^3.7.7"
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/table@^3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@react-stately/table/-/table-3.13.0.tgz#8465030f568b5ee779623d99b2ef22940a99a6cd"
+  integrity sha512-mRbNYrwQIE7xzVs09Lk3kPteEVFVyOc20vA8ph6EP54PiUf/RllJpxZe/WUYLf4eom9lUkRYej5sffuUBpxjCA==
+  dependencies:
+    "@react-stately/collections" "^3.12.0"
+    "@react-stately/flags" "^3.0.5"
+    "@react-stately/grid" "^3.10.0"
+    "@react-stately/selection" "^3.18.0"
+    "@react-stately/utils" "^3.10.5"
+    "@react-types/grid" "^3.2.10"
+    "@react-types/shared" "^3.26.0"
+    "@react-types/table" "^3.10.3"
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/tabs@^3.7.0":
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/@react-stately/tabs/-/tabs-3.7.0.tgz#f849b334c5e7d39a37c2e9ffa3114531bf8ce6e4"
+  integrity sha512-ox4hTkfZCoR4Oyr3Op3rBlWNq2Wxie04vhEYpTZQ2hobR3l4fYaOkd7CPClILktJ3TC104j8wcb0knWxIBRx9w==
+  dependencies:
+    "@react-stately/list" "^3.11.1"
+    "@react-types/shared" "^3.26.0"
+    "@react-types/tabs" "^3.3.11"
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/toggle@^3.8.0":
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/@react-stately/toggle/-/toggle-3.8.0.tgz#39a3e45989f56e236809d8fe69c160cc88a616f5"
+  integrity sha512-pyt/k/J8BwE/2g6LL6Z6sMSWRx9HEJB83Sm/MtovXnI66sxJ2EfQ1OaXB7Su5PEL9OMdoQF6Mb+N1RcW3zAoPw==
+  dependencies:
+    "@react-stately/utils" "^3.10.5"
+    "@react-types/checkbox" "^3.9.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/tooltip@^3.5.0":
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/@react-stately/tooltip/-/tooltip-3.5.0.tgz#1016952eb4427d5b848e2efcb24eee47e2a26b59"
+  integrity sha512-+xzPNztJDd2XJD0X3DgWKlrgOhMqZpSzsIssXeJgO7uCnP8/Z513ESaipJhJCFC8fxj5caO/DK4Uu8hEtlB8cQ==
+  dependencies:
+    "@react-stately/overlays" "^3.6.12"
+    "@react-types/tooltip" "^3.4.13"
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/tree@^3.8.6":
+  version "3.8.6"
+  resolved "https://registry.yarnpkg.com/@react-stately/tree/-/tree-3.8.6.tgz#85dc33c5d5b9a455ffc0b474300957e511db1ea4"
+  integrity sha512-lblUaxf1uAuIz5jm6PYtcJ+rXNNVkqyFWTIMx6g6gW/mYvm8GNx1G/0MLZE7E6CuDGaO9dkLSY2bB1uqyKHidA==
+  dependencies:
+    "@react-stately/collections" "^3.12.0"
+    "@react-stately/selection" "^3.18.0"
+    "@react-stately/utils" "^3.10.5"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/utils@^3.10.5":
+  version "3.10.5"
+  resolved "https://registry.yarnpkg.com/@react-stately/utils/-/utils-3.10.5.tgz#47bb91cd5afd1bafe39353614e5e281b818ebccc"
+  integrity sha512-iMQSGcpaecghDIh3mZEpZfoFH3ExBwTtuBEcvZ2XnGzCgQjeYXcMdIUwAfVQLXFTdHUHGF6Gu6/dFrYsCzySBQ==
+  dependencies:
+    "@swc/helpers" "^0.5.0"
+
+"@react-stately/virtualizer@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@react-stately/virtualizer/-/virtualizer-4.2.0.tgz#5906ac9d10ec48bc12a81879991a0b05154605d6"
+  integrity sha512-aTMpa9AQoz/xLqn8AI1BR/caUUY7/OUo9GbuF434w2u5eGCL7+SAn3Fmq7WSCwqYyDsO+jEIERek4JTX7pEW0A==
+  dependencies:
+    "@react-aria/utils" "^3.26.0"
+    "@react-types/shared" "^3.26.0"
+    "@swc/helpers" "^0.5.0"
+
+"@react-types/breadcrumbs@^3.7.9":
+  version "3.7.9"
+  resolved "https://registry.yarnpkg.com/@react-types/breadcrumbs/-/breadcrumbs-3.7.9.tgz#c75eae6158bd3631854bff7521c2373b42b0e37c"
+  integrity sha512-eARYJo8J+VfNV8vP4uw3L2Qliba9wLV2bx9YQCYf5Lc/OE5B/y4gaTLz+Y2P3Rtn6gBPLXY447zCs5i7gf+ICg==
+  dependencies:
+    "@react-types/link" "^3.5.9"
+    "@react-types/shared" "^3.26.0"
+
+"@react-types/button@^3.10.1":
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/@react-types/button/-/button-3.10.1.tgz#fc7ada2e83bc661b31c1473a82ec86dc11de057c"
+  integrity sha512-XTtap8o04+4QjPNAshFWOOAusUTxQlBjU2ai0BTVLShQEjHhRVDBIWsI2B2FKJ4KXT6AZ25llaxhNrreWGonmA==
+  dependencies:
+    "@react-types/shared" "^3.26.0"
+
+"@react-types/calendar@^3.5.0":
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/@react-types/calendar/-/calendar-3.5.0.tgz#a72fa15e08c7785b145005560baa35ad9b44627b"
+  integrity sha512-O3IRE7AGwAWYnvJIJ80cOy7WwoJ0m8GtX/qSmvXQAjC4qx00n+b5aFNBYAQtcyc3RM5QpW6obs9BfwGetFiI8w==
+  dependencies:
+    "@internationalized/date" "^3.6.0"
+    "@react-types/shared" "^3.26.0"
+
+"@react-types/checkbox@^3.9.0":
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/@react-types/checkbox/-/checkbox-3.9.0.tgz#d4621fef81850543f7a028917e9c2781cd871443"
+  integrity sha512-9hbHx0Oo2Hp5a8nV8Q75LQR0DHtvOIJbFaeqESSopqmV9EZoYjtY/h0NS7cZetgahQgnqYWQi44XGooMDCsmxA==
+  dependencies:
+    "@react-types/shared" "^3.26.0"
+
+"@react-types/color@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@react-types/color/-/color-3.0.1.tgz#42d49736cf606b8434d3fe0ab60b75bb0f44f554"
+  integrity sha512-KemFziO3GbmT3HEKrgOGdqNA6Gsmy9xrwFO3f8qXSG7gVz6M27Ic4R9HVQv4iAjap5uti6W13/pk2bc/jLVcEA==
+  dependencies:
+    "@react-types/shared" "^3.26.0"
+    "@react-types/slider" "^3.7.7"
+
+"@react-types/combobox@^3.13.1":
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/@react-types/combobox/-/combobox-3.13.1.tgz#d7d843f45501ad141f74ba62ed46d2e991b2d6a0"
+  integrity sha512-7xr+HknfhReN4QPqKff5tbKTe2kGZvH+DGzPYskAtb51FAAiZsKo+WvnNAvLwg3kRoC9Rkn4TAiVBp/HgymRDw==
+  dependencies:
+    "@react-types/shared" "^3.26.0"
+
+"@react-types/datepicker@^3.9.0":
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/@react-types/datepicker/-/datepicker-3.9.0.tgz#86e2a4e23e9fbf8299a12bd8aba9b1a52cf44725"
+  integrity sha512-dbKL5Qsm2MQwOTtVQdOcKrrphcXAqDD80WLlSQrBLg+waDuuQ7H+TrvOT0thLKloNBlFUGnZZfXGRHINpih/0g==
+  dependencies:
+    "@internationalized/date" "^3.6.0"
+    "@react-types/calendar" "^3.5.0"
+    "@react-types/overlays" "^3.8.11"
+    "@react-types/shared" "^3.26.0"
+
+"@react-types/dialog@^3.5.14":
+  version "3.5.14"
+  resolved "https://registry.yarnpkg.com/@react-types/dialog/-/dialog-3.5.14.tgz#97e568dc38ede4312ba6a12eda855c5e32c7cd47"
+  integrity sha512-OXWMjrALwrlgw8aHD8SeRm/s3tbAssdaEh2h73KUSeFau3fU3n5mfKv+WnFqsEaOtN261o48l7hTlS6615H9AA==
+  dependencies:
+    "@react-types/overlays" "^3.8.11"
+    "@react-types/shared" "^3.26.0"
+
+"@react-types/form@^3.7.8":
+  version "3.7.8"
+  resolved "https://registry.yarnpkg.com/@react-types/form/-/form-3.7.8.tgz#4d6b9e78770b9345cc9e1041990a7a26fb65e0ee"
+  integrity sha512-0wOS97/X0ijTVuIqik1lHYTZnk13QkvMTKvIEhM7c6YMU3vPiirBwLbT2kJiAdwLiymwcCkrBdDF1NTRG6kPFA==
+  dependencies:
+    "@react-types/shared" "^3.26.0"
+
+"@react-types/grid@^3.2.10":
+  version "3.2.10"
+  resolved "https://registry.yarnpkg.com/@react-types/grid/-/grid-3.2.10.tgz#d2d1d124ed9472e3dedc48e91c941a7ad23bdc83"
+  integrity sha512-Z5cG0ITwqjUE4kWyU5/7VqiPl4wqMJ7kG/ZP7poAnLmwRsR8Ai0ceVn+qzp5nTA19cgURi8t3LsXn3Ar1FBoog==
+  dependencies:
+    "@react-types/shared" "^3.26.0"
+
+"@react-types/link@^3.5.9":
+  version "3.5.9"
+  resolved "https://registry.yarnpkg.com/@react-types/link/-/link-3.5.9.tgz#bf61ff2780581de03920e6e43260844a81a38d2f"
+  integrity sha512-JcKDiDMqrq/5Vpn+BdWQEuXit4KN4HR/EgIi3yKnNbYkLzxBoeQZpQgvTaC7NEQeZnSqkyXQo3/vMUeX/ZNIKw==
+  dependencies:
+    "@react-types/shared" "^3.26.0"
+
+"@react-types/listbox@^3.5.3":
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/@react-types/listbox/-/listbox-3.5.3.tgz#c5dbe8a67d67ca59de6b88aaa2f20fcf61fee1c5"
+  integrity sha512-v1QXd9/XU3CCKr2Vgs7WLcTr6VMBur7CrxHhWZQQFExsf9bgJ/3wbUdjy4aThY/GsYHiaS38EKucCZFr1QAfqA==
+  dependencies:
+    "@react-types/shared" "^3.26.0"
+
+"@react-types/menu@^3.9.13":
+  version "3.9.13"
+  resolved "https://registry.yarnpkg.com/@react-types/menu/-/menu-3.9.13.tgz#a666c2233cbdb495202586df86a798601788f74d"
+  integrity sha512-7SuX6E2tDsqQ+HQdSvIda1ji/+ujmR86dtS9CUu5yWX91P25ufRjZ72EvLRqClWNQsj1Xl4+2zBDLWlceznAjw==
+  dependencies:
+    "@react-types/overlays" "^3.8.11"
+    "@react-types/shared" "^3.26.0"
+
+"@react-types/meter@^3.4.5":
+  version "3.4.5"
+  resolved "https://registry.yarnpkg.com/@react-types/meter/-/meter-3.4.5.tgz#e06d4a2fabd24989c73541b032123c5de495b613"
+  integrity sha512-04w1lEtvP/c3Ep8ND8hhH2rwjz2MtQ8o8SNLhahen3u0rX3jKOgD4BvHujsyvXXTMjj1Djp74sGzNawb4Ppi9w==
+  dependencies:
+    "@react-types/progress" "^3.5.8"
+
+"@react-types/numberfield@^3.8.7":
+  version "3.8.7"
+  resolved "https://registry.yarnpkg.com/@react-types/numberfield/-/numberfield-3.8.7.tgz#5a697fdf1bc405dbf55dafed713d47ed79f8e54b"
+  integrity sha512-KccMPi39cLoVkB2T0V7HW6nsxQVAwt89WWCltPZJVGzsebv/k0xTQlPVAgrUake4kDLoE687e3Fr/Oe3+1bDhw==
+  dependencies:
+    "@react-types/shared" "^3.26.0"
+
+"@react-types/overlays@^3.8.11":
+  version "3.8.11"
+  resolved "https://registry.yarnpkg.com/@react-types/overlays/-/overlays-3.8.11.tgz#313964703b2a23572138120b619d35da33445dfd"
+  integrity sha512-aw7T0rwVI3EuyG5AOaEIk8j7dZJQ9m34XAztXJVZ/W2+4pDDkLDbJ/EAPnuo2xGYRGhowuNDn4tDju01eHYi+w==
+  dependencies:
+    "@react-types/shared" "^3.26.0"
+
+"@react-types/progress@^3.5.8":
+  version "3.5.8"
+  resolved "https://registry.yarnpkg.com/@react-types/progress/-/progress-3.5.8.tgz#62ce4207c7e8d640b794c6d89063ce21bdb5970d"
+  integrity sha512-PR0rN5mWevfblR/zs30NdZr+82Gka/ba7UHmYOW9/lkKlWeD7PHgl1iacpd/3zl/jUF22evAQbBHmk1mS6Mpqw==
+  dependencies:
+    "@react-types/shared" "^3.26.0"
+
+"@react-types/radio@^3.8.5":
+  version "3.8.5"
+  resolved "https://registry.yarnpkg.com/@react-types/radio/-/radio-3.8.5.tgz#8e2dd1911fba829b7f1ebb40bccf9ca483f021fc"
+  integrity sha512-gSImTPid6rsbJmwCkTliBIU/npYgJHOFaI3PNJo7Y0QTAnFelCtYeFtBiWrFodSArSv7ASqpLLUEj9hZu/rxIg==
+  dependencies:
+    "@react-types/shared" "^3.26.0"
+
+"@react-types/searchfield@^3.5.10":
+  version "3.5.10"
+  resolved "https://registry.yarnpkg.com/@react-types/searchfield/-/searchfield-3.5.10.tgz#015a42bf8417618b848035b88f0aba98572beceb"
+  integrity sha512-7wW4pJzbReawoGPu8a4l+CODTCDN088EN/ysUzl622ewim57PjArjix+lpO4+aEtJqS9HKpq8UEbjwo9axpcUA==
+  dependencies:
+    "@react-types/shared" "^3.26.0"
+    "@react-types/textfield" "^3.10.0"
+
+"@react-types/select@^3.9.8":
+  version "3.9.8"
+  resolved "https://registry.yarnpkg.com/@react-types/select/-/select-3.9.8.tgz#2443b82549b65821f85876a5b803e6d04ae6343e"
+  integrity sha512-RGsYj2oFjXpLnfcvWMBQnkcDuKkwT43xwYWZGI214/gp/B64tJiIUgTM5wFTRAeGDX23EePkhCQF+9ctnqFd6g==
+  dependencies:
+    "@react-types/shared" "^3.26.0"
+
+"@react-types/shared@^3.26.0":
+  version "3.26.0"
+  resolved "https://registry.yarnpkg.com/@react-types/shared/-/shared-3.26.0.tgz#21a8b579f0097ee78de18e3e580421ced89e4c8c"
+  integrity sha512-6FuPqvhmjjlpEDLTiYx29IJCbCNWPlsyO+ZUmCUXzhUv2ttShOXfw8CmeHWHftT/b2KweAWuzqSlfeXPR76jpw==
+
+"@react-types/slider@^3.7.7":
+  version "3.7.7"
+  resolved "https://registry.yarnpkg.com/@react-types/slider/-/slider-3.7.7.tgz#f00450c6268665ff2ad38ad69bdf51d84ff2341a"
+  integrity sha512-lYTR9zXQV2fSEm/G3gwDENWiki1IXd/oorsgf0zu1DBi2SQDbOsLsGUXiwvD24Xy6OkUuhAqjLPPexezo7+u9g==
+  dependencies:
+    "@react-types/shared" "^3.26.0"
+
+"@react-types/switch@^3.5.7":
+  version "3.5.7"
+  resolved "https://registry.yarnpkg.com/@react-types/switch/-/switch-3.5.7.tgz#f3fb589fce5819ca1c15f12479bf348e053adc27"
+  integrity sha512-1IKiq510rPTHumEZuhxuazuXBa2Cuxz6wBIlwf3NCVmgWEvU+uk1ETG0sH2yymjwCqhtJDKXi+qi9HSgPEDwAg==
+  dependencies:
+    "@react-types/shared" "^3.26.0"
+
+"@react-types/table@^3.10.3":
+  version "3.10.3"
+  resolved "https://registry.yarnpkg.com/@react-types/table/-/table-3.10.3.tgz#33959348641500e406abe330074f84b0c75ae4ac"
+  integrity sha512-Ac+W+m/zgRzlTU8Z2GEg26HkuJFswF9S6w26r+R3MHwr8z2duGPvv37XRtE1yf3dbpRBgHEAO141xqS2TqGwNg==
+  dependencies:
+    "@react-types/grid" "^3.2.10"
+    "@react-types/shared" "^3.26.0"
+
+"@react-types/tabs@^3.3.11":
+  version "3.3.11"
+  resolved "https://registry.yarnpkg.com/@react-types/tabs/-/tabs-3.3.11.tgz#b7db710ce2ca42a4e72cd2a581070212d2b07793"
+  integrity sha512-BjF2TqBhZaIcC4lc82R5pDJd1F7kstj1K0Nokhz99AGYn8C0ITdp6lR+DPVY9JZRxKgP9R2EKfWGI90Lo7NQdA==
+  dependencies:
+    "@react-types/shared" "^3.26.0"
+
+"@react-types/textfield@^3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@react-types/textfield/-/textfield-3.10.0.tgz#10df39b75334174490a539ecae71ad19f5ea074d"
+  integrity sha512-ShU3d6kLJGQjPXccVFjM3KOXdj3uyhYROqH9YgSIEVxgA9W6LRflvk/IVBamD9pJYTPbwmVzuP0wQkTDupfZ1w==
+  dependencies:
+    "@react-types/shared" "^3.26.0"
+
+"@react-types/tooltip@^3.4.13":
+  version "3.4.13"
+  resolved "https://registry.yarnpkg.com/@react-types/tooltip/-/tooltip-3.4.13.tgz#f73fdc5c56790b7bd7c0d5382d0c758bd659e9d7"
+  integrity sha512-KPekFC17RTT8kZlk7ZYubueZnfsGTDOpLw7itzolKOXGddTXsrJGBzSB4Bb060PBVllaDO0MOrhPap8OmrIl1Q==
+  dependencies:
+    "@react-types/overlays" "^3.8.11"
+    "@react-types/shared" "^3.26.0"
+
 "@redis/bloom@1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@redis/bloom/-/bloom-1.2.0.tgz#d3fd6d3c0af3ef92f26767b56414a370c7b63b71"
@@ -2648,19 +4157,25 @@
     "@svgr/plugin-jsx" "8.1.0"
     "@svgr/plugin-svgo" "8.1.0"
 
-"@swc/counter@^0.1.3":
+"@swc/counter@0.1.3":
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/@swc/counter/-/counter-0.1.3.tgz#cc7463bd02949611c6329596fccd2b0ec782b0e9"
   integrity sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==
 
-"@swc/helpers@0.5.5":
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.5.tgz#12689df71bfc9b21c4f4ca00ae55f2f16c8b77c0"
-  integrity sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==
+"@swc/helpers@0.5.13":
+  version "0.5.13"
+  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.13.tgz#33e63ff3cd0cade557672bd7888a39ce7d115a8c"
+  integrity sha512-UoKGxQ3r5kYI9dALKJapMmuK+1zWM/H17Z1+iwnNmzcJRnfFuevZs375TA5rW31pu4BS4NoSy1fRsexDXfWn5w==
   dependencies:
-    "@swc/counter" "^0.1.3"
     tslib "^2.4.0"
 
+"@swc/helpers@^0.5.0":
+  version "0.5.15"
+  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.15.tgz#79efab344c5819ecf83a43f3f9f811fc84b516d7"
+  integrity sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==
+  dependencies:
+    tslib "^2.8.0"
+
 "@tanstack/query-core@5.60.6":
   version "5.60.6"
   resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-5.60.6.tgz#0dd33fe231b0d18bf66d0c615b29899738300658"
@@ -2698,6 +4213,13 @@
   resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
   integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
 
+"@types/acorn@^4.0.0":
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/@types/acorn/-/acorn-4.0.6.tgz#d61ca5480300ac41a7d973dd5b84d0a591154a22"
+  integrity sha512-veQTnWP+1D/xbxVrPC3zHnCZRjSrKfhbMUlEA43iMZLu7EsnTtkJklIuwrCPbOi8YkvDQAiW05VQQFvvz9oieQ==
+  dependencies:
+    "@types/estree" "*"
+
 "@types/babel__core@^7.1.14":
   version "7.20.5"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.5.tgz#3df15f27ba85319caa07ba08d0721889bb39c017"
@@ -2756,6 +4278,25 @@
   dependencies:
     cypress "*"
 
+"@types/debug@^4.0.0":
+  version "4.1.12"
+  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.12.tgz#a155f21690871953410df4b6b6f53187f0500917"
+  integrity sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==
+  dependencies:
+    "@types/ms" "*"
+
+"@types/detect-indent@0.1.30":
+  version "0.1.30"
+  resolved "https://registry.yarnpkg.com/@types/detect-indent/-/detect-indent-0.1.30.tgz#dc682bb412b4e65ba098e70edad73b4833fb910d"
+  integrity sha512-AUmj9JHuHTD94slY1WR1VulFxRGC6D1pcNCN0MCulKFyiihvV/28lLS8oRHgfmc2Cxq954J8Vmosa8qzm7PLGQ==
+
+"@types/estree-jsx@^1.0.0":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@types/estree-jsx/-/estree-jsx-1.0.5.tgz#858a88ea20f34fe65111f005a689fa1ebf70dc18"
+  integrity sha512-52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg==
+  dependencies:
+    "@types/estree" "*"
+
 "@types/estree@*":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
@@ -2785,6 +4326,14 @@
   dependencies:
     "@types/node" "*"
 
+"@types/glob@5.0.30":
+  version "5.0.30"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-5.0.30.tgz#1026409c5625a8689074602808d082b2867b8a51"
+  integrity sha512-ZM05wDByI+WA153sfirJyEHoYYoIuZ7lA2dB/Gl8ymmpMTR78fNRtDMqa7Z6SdH4fZdLWZNRE6mZpx3XqBOrHw==
+  dependencies:
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
 "@types/glob@^7.1.1":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
@@ -2800,6 +4349,13 @@
   dependencies:
     "@types/node" "*"
 
+"@types/hast@^3.0.0":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@types/hast/-/hast-3.0.4.tgz#1d6b39993b82cea6ad783945b0508c25903e15aa"
+  integrity sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==
+  dependencies:
+    "@types/unist" "*"
+
 "@types/hoist-non-react-statics@3":
   version "3.3.5"
   resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz#dab7867ef789d87e2b4b0003c9d65c49cc44a494"
@@ -2868,6 +4424,18 @@
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.200.tgz#435b6035c7eba9cdf1e039af8212c9e9281e7149"
   integrity sha512-YI/M/4HRImtNf3pJgbF+W6FrXovqj+T+/HpENLTooK9PnkacBsDpeP3IpHab40CClUfhNmdM2WTNP2sa2dni5Q==
 
+"@types/mdast@^4.0.0":
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-4.0.4.tgz#7ccf72edd2f1aa7dd3437e180c64373585804dd6"
+  integrity sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==
+  dependencies:
+    "@types/unist" "*"
+
+"@types/mdx@^2.0.0":
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/@types/mdx/-/mdx-2.0.13.tgz#68f6877043d377092890ff5b298152b0a21671bd"
+  integrity sha512-+OWZQfAYyio6YkJb3HLxDrvnx6SWWDbC0zVPfBRzUk0/nqoDyf6dNxQi3eArPe8rJ473nobTMQ/8Zk+LxJ+Yuw==
+
 "@types/minimatch@*":
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
@@ -2883,6 +4451,16 @@
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.5.tgz#ec10755e871497bcd83efe927e43ec46e8c0747e"
   integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==
 
+"@types/mkdirp@0.3.29":
+  version "0.3.29"
+  resolved "https://registry.yarnpkg.com/@types/mkdirp/-/mkdirp-0.3.29.tgz#7f2ad7ec55f914482fc9b1ec4bb1ae6028d46066"
+  integrity sha512-QRLQpFsIQGO2k8pupga9abfei85GKotAtQ+F6xuQmSGomUt6C52TyMiTFpP8kUwuPKr00gNtu3itLlC6gvI/NA==
+
+"@types/ms@*":
+  version "0.7.34"
+  resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.34.tgz#10964ba0dee6ac4cd462e2795b6bebd407303433"
+  integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==
+
 "@types/node@*":
   version "22.9.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-22.9.0.tgz#b7f16e5c3384788542c72dc3d561a7ceae2c0365"
@@ -2900,6 +4478,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.45.tgz#2c0fafd78705e7a18b7906b5201a522719dc5190"
   integrity sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==
 
+"@types/node@8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.0.tgz#acaa89247afddc7967e9902fd11761dadea1a555"
+  integrity sha512-j2tekvJCO7j22cs+LO6i0kRPhmQ9MXaPZ55TzOc1lzkN5b6BWqq4AFjl04s1oRRQ1v5rSe+KEvnLUSTonuls/A==
+
 "@types/node@^20.9.0":
   version "20.17.6"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-20.17.6.tgz#6e4073230c180d3579e8c60141f99efdf5df0081"
@@ -2981,6 +4564,16 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.3.tgz#6209321eb2c1712a7e7466422b8cb1fc0d9dd5d8"
   integrity sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==
 
+"@types/unist@*", "@types/unist@^3.0.0":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-3.0.3.tgz#acaab0f919ce69cce629c2d4ed2eb4adc1b6c20c"
+  integrity sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==
+
+"@types/unist@^2.0.0":
+  version "2.0.11"
+  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.11.tgz#11af57b127e32487774841f7a4e54eab166d03c4"
+  integrity sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==
+
 "@types/yargs-parser@*":
   version "21.0.3"
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15"
@@ -3224,6 +4817,32 @@
     chalk "^4.1.2"
     debug "^4.3.4"
 
+"@umami/react-zen@^0.16.0":
+  version "0.16.0"
+  resolved "https://registry.yarnpkg.com/@umami/react-zen/-/react-zen-0.16.0.tgz#8f14815e175fb93915f9ab48239d138fec1a8561"
+  integrity sha512-NyLV+DKaye9zZ6p+TH7JCoUJX859UxfMFbFq7k0CIGl+n6Eg6ePQyVIm/IGk+wVCgnCxfYQv4VRgj6m4QBhiPw==
+  dependencies:
+    "@fontsource/jetbrains-mono" "^5.0.18"
+    "@mdx-js/loader" "^3.0.0"
+    "@mdx-js/react" "^3.0.0"
+    "@next/mdx" "^15.0.2"
+    "@radix-ui/react-slot" "^1.0.2"
+    "@radix-ui/react-toast" "^1.2.1"
+    classnames "^2.5.1"
+    dts-bundle "^0.7.3"
+    glob "^10.3.10"
+    gray-matter "^4.0.3"
+    next "15.0.2"
+    next-mdx-remote "^5.0.0"
+    react "^19.0.0-rc-66855b96-20241106"
+    react-aria-components "^1.2.1"
+    react-dom "^19.0.0-rc-66855b96-20241106"
+    react-hook-form "^7.53.0"
+    react-icons "^5.2.1"
+    recursive-readdir "^2.2.3"
+    thenby "^1.3.4"
+    zustand "^4.5.0"
+
 "@umami/redis-client@^0.21.0":
   version "0.21.0"
   resolved "https://registry.yarnpkg.com/@umami/redis-client/-/redis-client-0.21.0.tgz#96426b28860b8b06fae8825fc2f2d9575b64e863"
@@ -3232,7 +4851,7 @@
     debug "^4.3.4"
     redis "^4.5.1"
 
-"@ungap/structured-clone@^1.2.0":
+"@ungap/structured-clone@^1.0.0", "@ungap/structured-clone@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
   integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
@@ -3327,7 +4946,7 @@
   resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.3.4.tgz#06e83c5027f464eef861c329be81454bc8b70780"
   integrity sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==
 
-acorn-jsx@^5.3.2:
+acorn-jsx@^5.0.0, acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
@@ -3337,6 +4956,11 @@ acorn-walk@^8.1.1:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.1.tgz#2f10f5b69329d90ae18c58bf1fa8fccd8b959a43"
   integrity sha512-TgUZgYvqZprrl7YldZNoa9OciCAyZR+Ejm9eXzKCmjsF5IKp/wgQ7Z/ZpjpGTIUPwrHQIcYeI8qDh4PsEwxMbw==
 
+acorn@^8.0.0, acorn@^8.9.0:
+  version "8.14.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0"
+  integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==
+
 acorn@^8.4.1:
   version "8.11.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b"
@@ -3347,11 +4971,6 @@ acorn@^8.8.2:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
   integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
 
-acorn@^8.9.0:
-  version "8.14.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0"
-  integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==
-
 aggregate-error@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
@@ -3613,6 +5232,11 @@ astral-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
+astring@^1.8.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/astring/-/astring-1.9.0.tgz#cc73e6062a7eb03e7d19c22d8b0b3451fd9bfeef"
+  integrity sha512-LElXdjswlqjWrPpJFg1Fx4wpkOCxj1TDHlSV4PlaRxHGWko024xICaa97ZkMfs6DRKlCguiAI+rbXv5GWwXIkg==
+
 async@^3.2.0, async@^3.2.3:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
@@ -3767,6 +5391,11 @@ babel-preset-jest@^29.6.3:
     babel-plugin-jest-hoist "^29.6.3"
     babel-preset-current-node-syntax "^1.0.0"
 
+bail@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/bail/-/bail-2.0.2.tgz#d26f5cd8fe5d6f832a31517b9f7c356040ba6d5d"
+  integrity sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==
+
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -3965,6 +5594,11 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
 
+ccount@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ccount/-/ccount-2.0.1.tgz#17a3bf82302e0870d6da43a01311a8bc02a3ecf5"
+  integrity sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==
+
 chalk@5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385"
@@ -3992,6 +5626,26 @@ char-regex@^1.0.2:
   resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
   integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
 
+character-entities-html4@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-2.1.0.tgz#1f1adb940c971a4b22ba39ddca6b618dc6e56b2b"
+  integrity sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==
+
+character-entities-legacy@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz#76bc83a90738901d7bc223a9e93759fdd560125b"
+  integrity sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==
+
+character-entities@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-2.0.2.tgz#2d09c2e72cd9523076ccb21157dff66ad43fcc22"
+  integrity sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==
+
+character-reference-invalid@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-2.0.1.tgz#85c66b041e43b47210faf401278abf808ac45cb9"
+  integrity sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==
+
 charenc@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
@@ -4034,7 +5688,7 @@ cjs-module-lexer@^1.0.0:
   resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107"
   integrity sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==
 
-classnames@^2.3.1:
+classnames@^2.3.1, classnames@^2.5.1:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.5.1.tgz#ba774c614be0f016da105c858e7159eae8e7687b"
   integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==
@@ -4083,7 +5737,7 @@ cli-truncate@^3.1.0:
     slice-ansi "^5.0.0"
     string-width "^5.0.0"
 
-client-only@0.0.1:
+client-only@0.0.1, client-only@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/client-only/-/client-only-0.0.1.tgz#38bba5d403c41ab150bff64a95c85013cf73bca1"
   integrity sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==
@@ -4097,6 +5751,11 @@ cliui@^8.0.1:
     strip-ansi "^6.0.1"
     wrap-ansi "^7.0.0"
 
+clsx@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.1.1.tgz#eed397c9fd8bd882bfb18deab7102049a2f32999"
+  integrity sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==
+
 cluster-key-slot@1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz#88ddaa46906e303b5de30d3153b7d9fe0a0c19ac"
@@ -4107,6 +5766,11 @@ co@^4.6.0:
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
 
+collapse-white-space@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-2.1.0.tgz#640257174f9f42c740b40f3b55ee752924feefca"
+  integrity sha512-loKTxY1zCOuG4j9f6EPnuyyYkf58RnhhWTvRoZEokgB+WbdXehfjFviyOVYkqzEWz1Q5kRiZdBYS5SwxbQYwzw==
+
 collect-v8-coverage@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz#c0b29bcd33bcd0779a1344c2136051e6afd3d9e9"
@@ -4131,11 +5795,27 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
-color-name@~1.1.4:
+color-name@^1.0.0, color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+color-string@^1.9.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4"
+  integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==
+  dependencies:
+    color-name "^1.0.0"
+    simple-swizzle "^0.2.2"
+
+color@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/color/-/color-4.2.3.tgz#d781ecb5e57224ee43ea9627560107c0e0c6463a"
+  integrity sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==
+  dependencies:
+    color-convert "^2.0.1"
+    color-string "^1.9.0"
+
 colord@^2.9.1, colord@^2.9.2, colord@^2.9.3:
   version "2.9.3"
   resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43"
@@ -4158,12 +5838,17 @@ combined-stream@^1.0.8, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
+comma-separated-tokens@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz#4e89c9458acb61bc8fef19f4529973b2392839ee"
+  integrity sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==
+
 commander@11.0.0:
   version "11.0.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-11.0.0.tgz#43e19c25dbedc8256203538e8d7e9346877a6f67"
   integrity sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==
 
-commander@2, commander@^2.20.0:
+commander@2, commander@^2.20.0, commander@^2.9.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -4681,7 +6366,7 @@ debug@^3.1.0, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5:
+debug@^4.0.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5:
   version "4.3.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
   integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
@@ -4706,6 +6391,13 @@ decamelize@^5.0.0:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-5.0.1.tgz#db11a92e58c741ef339fb0a2868d8a06a9a7b1e9"
   integrity sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==
 
+decode-named-character-reference@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/decode-named-character-reference/-/decode-named-character-reference-1.0.2.tgz#daabac9690874c394c81e4162a0304b35d824f0e"
+  integrity sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==
+  dependencies:
+    character-entities "^2.0.0"
+
 dedent@^1.0.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.5.1.tgz#4f3fc94c8b711e9bb2800d185cd6ad20f2a90aff"
@@ -4772,21 +6464,46 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
+dequal@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
+  integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
+
 detect-browser@^5.2.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.3.0.tgz#9705ef2bddf46072d0f7265a1fe300e36fe7ceca"
   integrity sha512-53rsFbGdwMwlF7qvCt0ypLM5V5/Mbl0szB7GPN8y9NCcbknYOeVVXdrXEq+90IwAfrrzt6Hd+u2E2ntakICU8w==
 
+detect-indent@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-0.2.0.tgz#042914498979ac2d9f3c73e4ff3e6877d3bc92b6"
+  integrity sha512-C6jyrDu/eGH4KT0ZxAzijiH+ts5YLy7DqGFoDuHGxZjMOdjzRltp3jByySnpFBVIy4Em0ZkLN8tIV6mcREdw5A==
+  dependencies:
+    get-stdin "^0.1.0"
+    minimist "^0.1.0"
+
 detect-indent@^6.0.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"
   integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==
 
+detect-libc@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.3.tgz#f0cd503b40f9939b894697d19ad50895e30cf700"
+  integrity sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==
+
 detect-newline@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
+devlop@^1.0.0, devlop@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/devlop/-/devlop-1.1.0.tgz#4db7c2ca4dc6e0e834c30be70c94bbc976dc7018"
+  integrity sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==
+  dependencies:
+    dequal "^2.0.0"
+
 diff-sequences@^29.6.3:
   version "29.6.3"
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921"
@@ -4886,6 +6603,20 @@ dotenv@^10.0.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
   integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
 
+dts-bundle@^0.7.3:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/dts-bundle/-/dts-bundle-0.7.3.tgz#372b7bb69c820782e6382f400739a69dced3d59a"
+  integrity sha512-EEAEuPRk8QyKhoN90NHTh+spSQujkkvOnKWUfuzpmC/fgryiWopL1SegSktx0UsoPfNidIGVDN7/AXpBDBv0WQ==
+  dependencies:
+    "@types/detect-indent" "0.1.30"
+    "@types/glob" "5.0.30"
+    "@types/mkdirp" "0.3.29"
+    "@types/node" "8.0.0"
+    commander "^2.9.0"
+    detect-indent "^0.2.0"
+    glob "^6.0.4"
+    mkdirp "^0.5.0"
+
 eastasianwidth@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
@@ -5100,6 +6831,26 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
+esast-util-from-estree@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/esast-util-from-estree/-/esast-util-from-estree-2.0.0.tgz#8d1cfb51ad534d2f159dc250e604f3478a79f1ad"
+  integrity sha512-4CyanoAudUSBAn5K13H4JhsMH6L9ZP7XbLVe/dKybkxMO7eDyLsT8UHl9TRNrU2Gr9nz+FovfSIjuXWJ81uVwQ==
+  dependencies:
+    "@types/estree-jsx" "^1.0.0"
+    devlop "^1.0.0"
+    estree-util-visit "^2.0.0"
+    unist-util-position-from-estree "^2.0.0"
+
+esast-util-from-js@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/esast-util-from-js/-/esast-util-from-js-2.0.1.tgz#5147bec34cc9da44accf52f87f239a40ac3e8225"
+  integrity sha512-8Ja+rNJ0Lt56Pcf3TAmpBZjmx8ZcK5Ts4cAzIOjsjevg9oSXJnl6SUQ2EevU8tv3h6ZLWmoKL5H4fgWvdvfETw==
+  dependencies:
+    "@types/estree-jsx" "^1.0.0"
+    acorn "^8.0.0"
+    esast-util-from-estree "^2.0.0"
+    vfile-message "^4.0.0"
+
 esbuild@^0.17.17:
   version "0.17.19"
   resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.19.tgz#087a727e98299f0462a3d0bcdd9cd7ff100bd955"
@@ -5421,6 +7172,53 @@ estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
+estree-util-attach-comments@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/estree-util-attach-comments/-/estree-util-attach-comments-3.0.0.tgz#344bde6a64c8a31d15231e5ee9e297566a691c2d"
+  integrity sha512-cKUwm/HUcTDsYh/9FgnuFqpfquUbwIqwKM26BVCGDPVgvaCl/nDCCjUfiLlx6lsEZ3Z4RFxNbOQ60pkaEwFxGw==
+  dependencies:
+    "@types/estree" "^1.0.0"
+
+estree-util-build-jsx@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/estree-util-build-jsx/-/estree-util-build-jsx-3.0.1.tgz#b6d0bced1dcc4f06f25cf0ceda2b2dcaf98168f1"
+  integrity sha512-8U5eiL6BTrPxp/CHbs2yMgP8ftMhR5ww1eIKoWRMlqvltHF8fZn5LRDvTKuxD3DUn+shRbLGqXemcP51oFCsGQ==
+  dependencies:
+    "@types/estree-jsx" "^1.0.0"
+    devlop "^1.0.0"
+    estree-util-is-identifier-name "^3.0.0"
+    estree-walker "^3.0.0"
+
+estree-util-is-identifier-name@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/estree-util-is-identifier-name/-/estree-util-is-identifier-name-3.0.0.tgz#0b5ef4c4ff13508b34dcd01ecfa945f61fce5dbd"
+  integrity sha512-hFtqIDZTIUZ9BXLb8y4pYGyk6+wekIivNVTcmvk8NoOh+VeRn5y6cEHzbURrWbfp1fIqdVipilzj+lfaadNZmg==
+
+estree-util-scope@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/estree-util-scope/-/estree-util-scope-1.0.0.tgz#9cbdfc77f5cb51e3d9ed4ad9c4adbff22d43e585"
+  integrity sha512-2CAASclonf+JFWBNJPndcOpA8EMJwa0Q8LUFJEKqXLW6+qBvbFZuF5gItbQOs/umBUkjviCSDCbBwU2cXbmrhQ==
+  dependencies:
+    "@types/estree" "^1.0.0"
+    devlop "^1.0.0"
+
+estree-util-to-js@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/estree-util-to-js/-/estree-util-to-js-2.0.0.tgz#10a6fb924814e6abb62becf0d2bc4dea51d04f17"
+  integrity sha512-WDF+xj5rRWmD5tj6bIqRi6CkLIXbbNQUcxQHzGysQzvHmdYG2G7p/Tf0J0gpxGgkeMZNTIjT/AoSvC9Xehcgdg==
+  dependencies:
+    "@types/estree-jsx" "^1.0.0"
+    astring "^1.8.0"
+    source-map "^0.7.0"
+
+estree-util-visit@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/estree-util-visit/-/estree-util-visit-2.0.0.tgz#13a9a9f40ff50ed0c022f831ddf4b58d05446feb"
+  integrity sha512-m5KgiH85xAhhW8Wta0vShLcUvOsh3LLPI2YVwcbio1l7E09NTLL1EyMZFM1OyWowoH0skScNbhOPl4kcBgzTww==
+  dependencies:
+    "@types/estree-jsx" "^1.0.0"
+    "@types/unist" "^3.0.0"
+
 estree-walker@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
@@ -5431,6 +7229,13 @@ estree-walker@^2.0.2:
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
   integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
 
+estree-walker@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-3.0.3.tgz#67c3e549ec402a487b4fc193d1953a524752340d"
+  integrity sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==
+  dependencies:
+    "@types/estree" "^1.0.0"
+
 esutils@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
@@ -5519,7 +7324,14 @@ expect@^29.0.0, expect@^29.7.0:
     jest-message-util "^29.7.0"
     jest-util "^29.7.0"
 
-extend@~3.0.2:
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==
+  dependencies:
+    is-extendable "^0.1.0"
+
+extend@^3.0.0, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@@ -5793,7 +7605,7 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
-fsevents@^2.3.2, fsevents@~2.3.2:
+fsevents@2.3.3, fsevents@^2.3.2, fsevents@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
   integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
@@ -5856,6 +7668,11 @@ get-package-type@^0.1.0:
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
   integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
 
+get-stdin@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-0.1.0.tgz#5998af24aafc802d15c82c685657eeb8b10d4a91"
+  integrity sha512-/WBu3IaQZxE3bs3BhBmR10ipDY4pjN+U4EZgXULa1eqKA0B/Lka/MVoAqhTVYBkkRlCrEGDOU9itrzIgm9Ksng==
+
 get-stream@^5.0.0, get-stream@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
@@ -5923,6 +7740,29 @@ glob@10.3.10:
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
     path-scurry "^1.10.1"
 
+glob@^10.3.10:
+  version "10.4.5"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956"
+  integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^3.1.2"
+    minimatch "^9.0.4"
+    minipass "^7.1.2"
+    package-json-from-dist "^1.0.0"
+    path-scurry "^1.11.1"
+
+glob@^6.0.4:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
+  integrity sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
@@ -6048,7 +7888,7 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
+graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -6058,6 +7898,16 @@ graphemer@^1.4.0:
   resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
   integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
 
+gray-matter@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/gray-matter/-/gray-matter-4.0.3.tgz#e893c064825de73ea1f5f7d88c7a9f7274288798"
+  integrity sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==
+  dependencies:
+    js-yaml "^3.13.1"
+    kind-of "^6.0.2"
+    section-matter "^1.0.0"
+    strip-bom-string "^1.0.0"
+
 hard-rejection@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
@@ -6109,6 +7959,56 @@ hasown@^2.0.0, hasown@^2.0.1, hasown@^2.0.2:
   dependencies:
     function-bind "^1.1.2"
 
+hast-util-to-estree@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/hast-util-to-estree/-/hast-util-to-estree-3.1.0.tgz#f2afe5e869ddf0cf690c75f9fc699f3180b51b19"
+  integrity sha512-lfX5g6hqVh9kjS/B9E2gSkvHH4SZNiQFiqWS0x9fENzEl+8W12RqdRxX6d/Cwxi30tPQs3bIO+aolQJNp1bIyw==
+  dependencies:
+    "@types/estree" "^1.0.0"
+    "@types/estree-jsx" "^1.0.0"
+    "@types/hast" "^3.0.0"
+    comma-separated-tokens "^2.0.0"
+    devlop "^1.0.0"
+    estree-util-attach-comments "^3.0.0"
+    estree-util-is-identifier-name "^3.0.0"
+    hast-util-whitespace "^3.0.0"
+    mdast-util-mdx-expression "^2.0.0"
+    mdast-util-mdx-jsx "^3.0.0"
+    mdast-util-mdxjs-esm "^2.0.0"
+    property-information "^6.0.0"
+    space-separated-tokens "^2.0.0"
+    style-to-object "^0.4.0"
+    unist-util-position "^5.0.0"
+    zwitch "^2.0.0"
+
+hast-util-to-jsx-runtime@^2.0.0:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/hast-util-to-jsx-runtime/-/hast-util-to-jsx-runtime-2.3.2.tgz#6d11b027473e69adeaa00ca4cfb5bb68e3d282fa"
+  integrity sha512-1ngXYb+V9UT5h+PxNRa1O1FYguZK/XL+gkeqvp7EdHlB9oHUG0eYRo/vY5inBdcqo3RkPMC58/H94HvkbfGdyg==
+  dependencies:
+    "@types/estree" "^1.0.0"
+    "@types/hast" "^3.0.0"
+    "@types/unist" "^3.0.0"
+    comma-separated-tokens "^2.0.0"
+    devlop "^1.0.0"
+    estree-util-is-identifier-name "^3.0.0"
+    hast-util-whitespace "^3.0.0"
+    mdast-util-mdx-expression "^2.0.0"
+    mdast-util-mdx-jsx "^3.0.0"
+    mdast-util-mdxjs-esm "^2.0.0"
+    property-information "^6.0.0"
+    space-separated-tokens "^2.0.0"
+    style-to-object "^1.0.0"
+    unist-util-position "^5.0.0"
+    vfile-message "^4.0.0"
+
+hast-util-whitespace@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-3.0.0.tgz#7778ed9d3c92dd9e8c5c8f648a49c21fc51cb621"
+  integrity sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==
+  dependencies:
+    "@types/hast" "^3.0.0"
+
 hoist-non-react-statics@3, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
@@ -6270,6 +8170,16 @@ ini@^1.3.5:
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
+inline-style-parser@0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1"
+  integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==
+
+inline-style-parser@0.2.4:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.2.4.tgz#f4af5fe72e612839fcd453d989a586566d695f22"
+  integrity sha512-0aO8FkhNZlj/ZIbNi7Lxxr12obT7cL1moPfE4tg1LkX7LlLfC6DeX4l2ZEud1ukP9jNQyNnfzQVqwbwmAATY4Q==
+
 internal-slot@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802"
@@ -6299,7 +8209,7 @@ intl-messageformat-parser@^5.3.7:
   dependencies:
     "@formatjs/intl-numberformat" "^5.5.2"
 
-intl-messageformat@10.7.7:
+intl-messageformat@10.7.7, intl-messageformat@^10.1.0:
   version "10.7.7"
   resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.7.7.tgz#42085e1664729d02240a03346e31a2540b1112a0"
   integrity sha512-F134jIoeYMro/3I0h08D0Yt4N9o9pjddU/4IIxMMURqbAtI2wu70X8hvG1V48W49zXHXv3RKSF/po+0fDfsGjA==
@@ -6314,6 +8224,19 @@ ipaddr.js@^2.0.1:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.2.0.tgz#d33fa7bac284f4de7af949638c9d68157c6b92e8"
   integrity sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==
 
+is-alphabetical@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-2.0.1.tgz#01072053ea7c1036df3c7d19a6daaec7f19e789b"
+  integrity sha512-FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ==
+
+is-alphanumerical@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-2.0.1.tgz#7c03fbe96e3e931113e57f964b0a368cc2dfd875"
+  integrity sha512-hmbYhX/9MUMF5uh7tOXyK/n0ZvWpad5caBA17GsC6vyuCqaWliRG5K1qS9inmUhEMaOBIW7/whAnSwveW/LtZw==
+  dependencies:
+    is-alphabetical "^2.0.0"
+    is-decimal "^2.0.0"
+
 is-array-buffer@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98"
@@ -6327,6 +8250,11 @@ is-arrayish@^0.2.1:
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
 
+is-arrayish@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
+  integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
+
 is-async-function@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.0.0.tgz#8e4418efd3e5d3a6ebb0164c05ef5afb69aa9646"
@@ -6401,11 +8329,21 @@ is-date-object@^1.0.1, is-date-object@^1.0.5:
   dependencies:
     has-tostringtag "^1.0.0"
 
+is-decimal@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-2.0.1.tgz#9469d2dc190d0214fd87d78b78caecc0cc14eef7"
+  integrity sha512-AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A==
+
 is-docker@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-3.0.0.tgz#90093aa3106277d8a77a5910dbae71747e15a200"
   integrity sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==
 
+is-extendable@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==
+
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
@@ -6447,6 +8385,11 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3:
   dependencies:
     is-extglob "^2.1.1"
 
+is-hexadecimal@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-2.0.1.tgz#86b5bf668fca307498d319dfc03289d781a90027"
+  integrity sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==
+
 is-installed-globally@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520"
@@ -6507,6 +8450,11 @@ is-plain-obj@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
   integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
 
+is-plain-obj@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-4.1.0.tgz#d65025edec3657ce032fd7db63c97883eaed71f0"
+  integrity sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==
+
 is-plain-object@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.1.tgz#662d92d24c0aa4302407b0d45d21f2251c85f85b"
@@ -6698,6 +8646,15 @@ jackspeak@^2.3.5:
   optionalDependencies:
     "@pkgjs/parseargs" "^0.11.0"
 
+jackspeak@^3.1.2:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.3.tgz#8833a9d89ab4acde6188942bd1c53b6390ed5a8a"
+  integrity sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==
+  dependencies:
+    "@isaacs/cliui" "^8.0.2"
+  optionalDependencies:
+    "@pkgjs/parseargs" "^0.11.0"
+
 jake@^10.8.5:
   version "10.9.2"
   resolved "https://registry.yarnpkg.com/jake/-/jake-10.9.2.tgz#6ae487e6a69afec3a5e167628996b59f35ae2b7f"
@@ -7265,7 +9222,7 @@ keyv@^4.5.3:
   dependencies:
     json-buffer "3.0.1"
 
-kind-of@^6.0.2, kind-of@^6.0.3:
+kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
@@ -7515,6 +9472,11 @@ log-update@^5.0.1:
     strip-ansi "^7.0.1"
     wrap-ansi "^8.0.1"
 
+longest-streak@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-3.1.0.tgz#62fa67cd958742a1574af9f39866364102d90cd4"
+  integrity sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==
+
 loose-envify@^1.1.0, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
@@ -7606,6 +9568,11 @@ map-obj@^4.0.0, map-obj@^4.1.0:
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
   integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
 
+markdown-extensions@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/markdown-extensions/-/markdown-extensions-2.0.0.tgz#34bebc83e9938cae16e0e017e4a9814a8330d3c4"
+  integrity sha512-o5vL7aDWatOTX8LzaS1WMoaoxIiLRQJuIKKe2wAw6IeULDHaqbiqiggmx+pKvZDb1Sj+pE46Sn1T7lCqfFtg1Q==
+
 mathml-tag-names@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
@@ -7628,6 +9595,122 @@ md5@^2.3.0:
     crypt "0.0.2"
     is-buffer "~1.1.6"
 
+mdast-util-from-markdown@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-2.0.2.tgz#4850390ca7cf17413a9b9a0fbefcd1bc0eb4160a"
+  integrity sha512-uZhTV/8NBuw0WHkPTrCqDOl0zVe1BIng5ZtHoDk49ME1qqcjYmmLmOf0gELgcRMxN4w2iuIeVso5/6QymSrgmA==
+  dependencies:
+    "@types/mdast" "^4.0.0"
+    "@types/unist" "^3.0.0"
+    decode-named-character-reference "^1.0.0"
+    devlop "^1.0.0"
+    mdast-util-to-string "^4.0.0"
+    micromark "^4.0.0"
+    micromark-util-decode-numeric-character-reference "^2.0.0"
+    micromark-util-decode-string "^2.0.0"
+    micromark-util-normalize-identifier "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+    unist-util-stringify-position "^4.0.0"
+
+mdast-util-mdx-expression@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-mdx-expression/-/mdast-util-mdx-expression-2.0.1.tgz#43f0abac9adc756e2086f63822a38c8d3c3a5096"
+  integrity sha512-J6f+9hUp+ldTZqKRSg7Vw5V6MqjATc+3E4gf3CFNcuZNWD8XdyI6zQ8GqH7f8169MM6P7hMBRDVGnn7oHB9kXQ==
+  dependencies:
+    "@types/estree-jsx" "^1.0.0"
+    "@types/hast" "^3.0.0"
+    "@types/mdast" "^4.0.0"
+    devlop "^1.0.0"
+    mdast-util-from-markdown "^2.0.0"
+    mdast-util-to-markdown "^2.0.0"
+
+mdast-util-mdx-jsx@^3.0.0:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-3.1.3.tgz#76b957b3da18ebcfd0de3a9b4451dcd6fdec2320"
+  integrity sha512-bfOjvNt+1AcbPLTFMFWY149nJz0OjmewJs3LQQ5pIyVGxP4CdOqNVJL6kTaM5c68p8q82Xv3nCyFfUnuEcH3UQ==
+  dependencies:
+    "@types/estree-jsx" "^1.0.0"
+    "@types/hast" "^3.0.0"
+    "@types/mdast" "^4.0.0"
+    "@types/unist" "^3.0.0"
+    ccount "^2.0.0"
+    devlop "^1.1.0"
+    mdast-util-from-markdown "^2.0.0"
+    mdast-util-to-markdown "^2.0.0"
+    parse-entities "^4.0.0"
+    stringify-entities "^4.0.0"
+    unist-util-stringify-position "^4.0.0"
+    vfile-message "^4.0.0"
+
+mdast-util-mdx@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-mdx/-/mdast-util-mdx-3.0.0.tgz#792f9cf0361b46bee1fdf1ef36beac424a099c41"
+  integrity sha512-JfbYLAW7XnYTTbUsmpu0kdBUVe+yKVJZBItEjwyYJiDJuZ9w4eeaqks4HQO+R7objWgS2ymV60GYpI14Ug554w==
+  dependencies:
+    mdast-util-from-markdown "^2.0.0"
+    mdast-util-mdx-expression "^2.0.0"
+    mdast-util-mdx-jsx "^3.0.0"
+    mdast-util-mdxjs-esm "^2.0.0"
+    mdast-util-to-markdown "^2.0.0"
+
+mdast-util-mdxjs-esm@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-2.0.1.tgz#019cfbe757ad62dd557db35a695e7314bcc9fa97"
+  integrity sha512-EcmOpxsZ96CvlP03NghtH1EsLtr0n9Tm4lPUJUBccV9RwUOneqSycg19n5HGzCf+10LozMRSObtVr3ee1WoHtg==
+  dependencies:
+    "@types/estree-jsx" "^1.0.0"
+    "@types/hast" "^3.0.0"
+    "@types/mdast" "^4.0.0"
+    devlop "^1.0.0"
+    mdast-util-from-markdown "^2.0.0"
+    mdast-util-to-markdown "^2.0.0"
+
+mdast-util-phrasing@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-phrasing/-/mdast-util-phrasing-4.1.0.tgz#7cc0a8dec30eaf04b7b1a9661a92adb3382aa6e3"
+  integrity sha512-TqICwyvJJpBwvGAMZjj4J2n0X8QWp21b9l0o7eXyVJ25YNWYbJDVIyD1bZXE6WtV6RmKJVYmQAKWa0zWOABz2w==
+  dependencies:
+    "@types/mdast" "^4.0.0"
+    unist-util-is "^6.0.0"
+
+mdast-util-to-hast@^13.0.0:
+  version "13.2.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-13.2.0.tgz#5ca58e5b921cc0a3ded1bc02eed79a4fe4fe41f4"
+  integrity sha512-QGYKEuUsYT9ykKBCMOEDLsU5JRObWQusAolFMeko/tYPufNkRffBAQjIE+99jbA87xv6FgmjLtwjh9wBWajwAA==
+  dependencies:
+    "@types/hast" "^3.0.0"
+    "@types/mdast" "^4.0.0"
+    "@ungap/structured-clone" "^1.0.0"
+    devlop "^1.0.0"
+    micromark-util-sanitize-uri "^2.0.0"
+    trim-lines "^3.0.0"
+    unist-util-position "^5.0.0"
+    unist-util-visit "^5.0.0"
+    vfile "^6.0.0"
+
+mdast-util-to-markdown@^2.0.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-2.1.2.tgz#f910ffe60897f04bb4b7e7ee434486f76288361b"
+  integrity sha512-xj68wMTvGXVOKonmog6LwyJKrYXZPvlwabaryTjLh9LuvovB/KAH+kvi8Gjj+7rJjsFi23nkUxRQv1KqSroMqA==
+  dependencies:
+    "@types/mdast" "^4.0.0"
+    "@types/unist" "^3.0.0"
+    longest-streak "^3.0.0"
+    mdast-util-phrasing "^4.0.0"
+    mdast-util-to-string "^4.0.0"
+    micromark-util-classify-character "^2.0.0"
+    micromark-util-decode-string "^2.0.0"
+    unist-util-visit "^5.0.0"
+    zwitch "^2.0.0"
+
+mdast-util-to-string@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-4.0.0.tgz#7a5121475556a04e7eddeb67b264aae79d312814"
+  integrity sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg==
+  dependencies:
+    "@types/mdast" "^4.0.0"
+
 mdn-data@2.0.14:
   version "2.0.14"
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
@@ -7698,6 +9781,296 @@ merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
+micromark-core-commonmark@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/micromark-core-commonmark/-/micromark-core-commonmark-2.0.2.tgz#6a45bbb139e126b3f8b361a10711ccc7c6e15e93"
+  integrity sha512-FKjQKbxd1cibWMM1P9N+H8TwlgGgSkWZMmfuVucLCHaYqeSvJ0hFeHsIa65pA2nYbes0f8LDHPMrd9X7Ujxg9w==
+  dependencies:
+    decode-named-character-reference "^1.0.0"
+    devlop "^1.0.0"
+    micromark-factory-destination "^2.0.0"
+    micromark-factory-label "^2.0.0"
+    micromark-factory-space "^2.0.0"
+    micromark-factory-title "^2.0.0"
+    micromark-factory-whitespace "^2.0.0"
+    micromark-util-character "^2.0.0"
+    micromark-util-chunked "^2.0.0"
+    micromark-util-classify-character "^2.0.0"
+    micromark-util-html-tag-name "^2.0.0"
+    micromark-util-normalize-identifier "^2.0.0"
+    micromark-util-resolve-all "^2.0.0"
+    micromark-util-subtokenize "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+
+micromark-extension-mdx-expression@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-extension-mdx-expression/-/micromark-extension-mdx-expression-3.0.0.tgz#1407b9ce69916cf5e03a196ad9586889df25302a"
+  integrity sha512-sI0nwhUDz97xyzqJAbHQhp5TfaxEvZZZ2JDqUo+7NvyIYG6BZ5CPPqj2ogUoPJlmXHBnyZUzISg9+oUmU6tUjQ==
+  dependencies:
+    "@types/estree" "^1.0.0"
+    devlop "^1.0.0"
+    micromark-factory-mdx-expression "^2.0.0"
+    micromark-factory-space "^2.0.0"
+    micromark-util-character "^2.0.0"
+    micromark-util-events-to-acorn "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+
+micromark-extension-mdx-jsx@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-extension-mdx-jsx/-/micromark-extension-mdx-jsx-3.0.1.tgz#5abb83da5ddc8e473a374453e6ea56fbd66b59ad"
+  integrity sha512-vNuFb9czP8QCtAQcEJn0UJQJZA8Dk6DXKBqx+bg/w0WGuSxDxNr7hErW89tHUY31dUW4NqEOWwmEUNhjTFmHkg==
+  dependencies:
+    "@types/acorn" "^4.0.0"
+    "@types/estree" "^1.0.0"
+    devlop "^1.0.0"
+    estree-util-is-identifier-name "^3.0.0"
+    micromark-factory-mdx-expression "^2.0.0"
+    micromark-factory-space "^2.0.0"
+    micromark-util-character "^2.0.0"
+    micromark-util-events-to-acorn "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+    vfile-message "^4.0.0"
+
+micromark-extension-mdx-md@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-extension-mdx-md/-/micromark-extension-mdx-md-2.0.0.tgz#1d252881ea35d74698423ab44917e1f5b197b92d"
+  integrity sha512-EpAiszsB3blw4Rpba7xTOUptcFeBFi+6PY8VnJ2hhimH+vCQDirWgsMpz7w1XcZE7LVrSAUGb9VJpG9ghlYvYQ==
+  dependencies:
+    micromark-util-types "^2.0.0"
+
+micromark-extension-mdxjs-esm@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-extension-mdxjs-esm/-/micromark-extension-mdxjs-esm-3.0.0.tgz#de21b2b045fd2059bd00d36746081de38390d54a"
+  integrity sha512-DJFl4ZqkErRpq/dAPyeWp15tGrcrrJho1hKK5uBS70BCtfrIFg81sqcTVu3Ta+KD1Tk5vAtBNElWxtAa+m8K9A==
+  dependencies:
+    "@types/estree" "^1.0.0"
+    devlop "^1.0.0"
+    micromark-core-commonmark "^2.0.0"
+    micromark-util-character "^2.0.0"
+    micromark-util-events-to-acorn "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+    unist-util-position-from-estree "^2.0.0"
+    vfile-message "^4.0.0"
+
+micromark-extension-mdxjs@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-extension-mdxjs/-/micromark-extension-mdxjs-3.0.0.tgz#b5a2e0ed449288f3f6f6c544358159557549de18"
+  integrity sha512-A873fJfhnJ2siZyUrJ31l34Uqwy4xIFmvPY1oj+Ean5PHcPBYzEsvqvWGaWcfEIr11O5Dlw3p2y0tZWpKHDejQ==
+  dependencies:
+    acorn "^8.0.0"
+    acorn-jsx "^5.0.0"
+    micromark-extension-mdx-expression "^3.0.0"
+    micromark-extension-mdx-jsx "^3.0.0"
+    micromark-extension-mdx-md "^2.0.0"
+    micromark-extension-mdxjs-esm "^3.0.0"
+    micromark-util-combine-extensions "^2.0.0"
+    micromark-util-types "^2.0.0"
+
+micromark-factory-destination@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-factory-destination/-/micromark-factory-destination-2.0.1.tgz#8fef8e0f7081f0474fbdd92deb50c990a0264639"
+  integrity sha512-Xe6rDdJlkmbFRExpTOmRj9N3MaWmbAgdpSrBQvCFqhezUn4AHqJHbaEnfbVYYiexVSs//tqOdY/DxhjdCiJnIA==
+  dependencies:
+    micromark-util-character "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+
+micromark-factory-label@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-factory-label/-/micromark-factory-label-2.0.1.tgz#5267efa97f1e5254efc7f20b459a38cb21058ba1"
+  integrity sha512-VFMekyQExqIW7xIChcXn4ok29YE3rnuyveW3wZQWWqF4Nv9Wk5rgJ99KzPvHjkmPXF93FXIbBp6YdW3t71/7Vg==
+  dependencies:
+    devlop "^1.0.0"
+    micromark-util-character "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+
+micromark-factory-mdx-expression@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/micromark-factory-mdx-expression/-/micromark-factory-mdx-expression-2.0.2.tgz#2afaa8ba6d5f63e0cead3e4dee643cad184ca260"
+  integrity sha512-5E5I2pFzJyg2CtemqAbcyCktpHXuJbABnsb32wX2U8IQKhhVFBqkcZR5LRm1WVoFqa4kTueZK4abep7wdo9nrw==
+  dependencies:
+    "@types/estree" "^1.0.0"
+    devlop "^1.0.0"
+    micromark-factory-space "^2.0.0"
+    micromark-util-character "^2.0.0"
+    micromark-util-events-to-acorn "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+    unist-util-position-from-estree "^2.0.0"
+    vfile-message "^4.0.0"
+
+micromark-factory-space@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-factory-space/-/micromark-factory-space-2.0.1.tgz#36d0212e962b2b3121f8525fc7a3c7c029f334fc"
+  integrity sha512-zRkxjtBxxLd2Sc0d+fbnEunsTj46SWXgXciZmHq0kDYGnck/ZSGj9/wULTV95uoeYiK5hRXP2mJ98Uo4cq/LQg==
+  dependencies:
+    micromark-util-character "^2.0.0"
+    micromark-util-types "^2.0.0"
+
+micromark-factory-title@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-factory-title/-/micromark-factory-title-2.0.1.tgz#237e4aa5d58a95863f01032d9ee9b090f1de6e94"
+  integrity sha512-5bZ+3CjhAd9eChYTHsjy6TGxpOFSKgKKJPJxr293jTbfry2KDoWkhBb6TcPVB4NmzaPhMs1Frm9AZH7OD4Cjzw==
+  dependencies:
+    micromark-factory-space "^2.0.0"
+    micromark-util-character "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+
+micromark-factory-whitespace@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-factory-whitespace/-/micromark-factory-whitespace-2.0.1.tgz#06b26b2983c4d27bfcc657b33e25134d4868b0b1"
+  integrity sha512-Ob0nuZ3PKt/n0hORHyvoD9uZhr+Za8sFoP+OnMcnWK5lngSzALgQYKMr9RJVOWLqQYuyn6ulqGWSXdwf6F80lQ==
+  dependencies:
+    micromark-factory-space "^2.0.0"
+    micromark-util-character "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+
+micromark-util-character@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-character/-/micromark-util-character-2.1.1.tgz#2f987831a40d4c510ac261e89852c4e9703ccda6"
+  integrity sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==
+  dependencies:
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+
+micromark-util-chunked@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-chunked/-/micromark-util-chunked-2.0.1.tgz#47fbcd93471a3fccab86cff03847fc3552db1051"
+  integrity sha512-QUNFEOPELfmvv+4xiNg2sRYeS/P84pTW0TCgP5zc9FpXetHY0ab7SxKyAQCNCc1eK0459uoLI1y5oO5Vc1dbhA==
+  dependencies:
+    micromark-util-symbol "^2.0.0"
+
+micromark-util-classify-character@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-classify-character/-/micromark-util-classify-character-2.0.1.tgz#d399faf9c45ca14c8b4be98b1ea481bced87b629"
+  integrity sha512-K0kHzM6afW/MbeWYWLjoHQv1sgg2Q9EccHEDzSkxiP/EaagNzCm7T/WMKZ3rjMbvIpvBiZgwR3dKMygtA4mG1Q==
+  dependencies:
+    micromark-util-character "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+
+micromark-util-combine-extensions@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-combine-extensions/-/micromark-util-combine-extensions-2.0.1.tgz#2a0f490ab08bff5cc2fd5eec6dd0ca04f89b30a9"
+  integrity sha512-OnAnH8Ujmy59JcyZw8JSbK9cGpdVY44NKgSM7E9Eh7DiLS2E9RNQf0dONaGDzEG9yjEl5hcqeIsj4hfRkLH/Bg==
+  dependencies:
+    micromark-util-chunked "^2.0.0"
+    micromark-util-types "^2.0.0"
+
+micromark-util-decode-numeric-character-reference@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-2.0.2.tgz#fcf15b660979388e6f118cdb6bf7d79d73d26fe5"
+  integrity sha512-ccUbYk6CwVdkmCQMyr64dXz42EfHGkPQlBj5p7YVGzq8I7CtjXZJrubAYezf7Rp+bjPseiROqe7G6foFd+lEuw==
+  dependencies:
+    micromark-util-symbol "^2.0.0"
+
+micromark-util-decode-string@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-decode-string/-/micromark-util-decode-string-2.0.1.tgz#6cb99582e5d271e84efca8e61a807994d7161eb2"
+  integrity sha512-nDV/77Fj6eH1ynwscYTOsbK7rR//Uj0bZXBwJZRfaLEJ1iGBR6kIfNmlNqaqJf649EP0F3NWNdeJi03elllNUQ==
+  dependencies:
+    decode-named-character-reference "^1.0.0"
+    micromark-util-character "^2.0.0"
+    micromark-util-decode-numeric-character-reference "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+
+micromark-util-encode@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-encode/-/micromark-util-encode-2.0.1.tgz#0d51d1c095551cfaac368326963cf55f15f540b8"
+  integrity sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==
+
+micromark-util-events-to-acorn@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/micromark-util-events-to-acorn/-/micromark-util-events-to-acorn-2.0.2.tgz#4275834f5453c088bd29cd72dfbf80e3327cec07"
+  integrity sha512-Fk+xmBrOv9QZnEDguL9OI9/NQQp6Hz4FuQ4YmCb/5V7+9eAh1s6AYSvL20kHkD67YIg7EpE54TiSlcsf3vyZgA==
+  dependencies:
+    "@types/acorn" "^4.0.0"
+    "@types/estree" "^1.0.0"
+    "@types/unist" "^3.0.0"
+    devlop "^1.0.0"
+    estree-util-visit "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+    vfile-message "^4.0.0"
+
+micromark-util-html-tag-name@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-html-tag-name/-/micromark-util-html-tag-name-2.0.1.tgz#e40403096481986b41c106627f98f72d4d10b825"
+  integrity sha512-2cNEiYDhCWKI+Gs9T0Tiysk136SnR13hhO8yW6BGNyhOC4qYFnwF1nKfD3HFAIXA5c45RrIG1ub11GiXeYd1xA==
+
+micromark-util-normalize-identifier@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-2.0.1.tgz#c30d77b2e832acf6526f8bf1aa47bc9c9438c16d"
+  integrity sha512-sxPqmo70LyARJs0w2UclACPUUEqltCkJ6PhKdMIDuJ3gSf/Q+/GIe3WKl0Ijb/GyH9lOpUkRAO2wp0GVkLvS9Q==
+  dependencies:
+    micromark-util-symbol "^2.0.0"
+
+micromark-util-resolve-all@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-resolve-all/-/micromark-util-resolve-all-2.0.1.tgz#e1a2d62cdd237230a2ae11839027b19381e31e8b"
+  integrity sha512-VdQyxFWFT2/FGJgwQnJYbe1jjQoNTS4RjglmSjTUlpUMa95Htx9NHeYW4rGDJzbjvCsl9eLjMQwGeElsqmzcHg==
+  dependencies:
+    micromark-util-types "^2.0.0"
+
+micromark-util-sanitize-uri@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.1.tgz#ab89789b818a58752b73d6b55238621b7faa8fd7"
+  integrity sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ==
+  dependencies:
+    micromark-util-character "^2.0.0"
+    micromark-util-encode "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+
+micromark-util-subtokenize@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/micromark-util-subtokenize/-/micromark-util-subtokenize-2.0.3.tgz#70ffb99a454bd8c913c8b709c3dc97baefb65f96"
+  integrity sha512-VXJJuNxYWSoYL6AJ6OQECCFGhIU2GGHMw8tahogePBrjkG8aCCas3ibkp7RnVOSTClg2is05/R7maAhF1XyQMg==
+  dependencies:
+    devlop "^1.0.0"
+    micromark-util-chunked "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+
+micromark-util-symbol@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz#e5da494e8eb2b071a0d08fb34f6cefec6c0a19b8"
+  integrity sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==
+
+micromark-util-types@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-types/-/micromark-util-types-2.0.1.tgz#a3edfda3022c6c6b55bfb049ef5b75d70af50709"
+  integrity sha512-534m2WhVTddrcKVepwmVEVnUAmtrx9bfIjNoQHRqfnvdaHQiFytEhJoTgpWJvDEXCO5gLTQh3wYC1PgOJA4NSQ==
+
+micromark@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/micromark/-/micromark-4.0.1.tgz#294c2f12364759e5f9e925a767ae3dfde72223ff"
+  integrity sha512-eBPdkcoCNvYcxQOAKAlceo5SNdzZWfF+FcSupREAzdAh9rRmE239CEQAiTwIgblwnoM8zzj35sZ5ZwvSEOF6Kw==
+  dependencies:
+    "@types/debug" "^4.0.0"
+    debug "^4.0.0"
+    decode-named-character-reference "^1.0.0"
+    devlop "^1.0.0"
+    micromark-core-commonmark "^2.0.0"
+    micromark-factory-space "^2.0.0"
+    micromark-util-character "^2.0.0"
+    micromark-util-chunked "^2.0.0"
+    micromark-util-combine-extensions "^2.0.0"
+    micromark-util-decode-numeric-character-reference "^2.0.0"
+    micromark-util-encode "^2.0.0"
+    micromark-util-normalize-identifier "^2.0.0"
+    micromark-util-resolve-all "^2.0.0"
+    micromark-util-sanitize-uri "^2.0.0"
+    micromark-util-subtokenize "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+
 micromatch@4.0.5, micromatch@^4.0.5:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
@@ -7741,6 +10114,13 @@ min-indent@^1.0.0, min-indent@^1.0.1:
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
+"minimatch@2 || 3", minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+  dependencies:
+    brace-expansion "^1.1.7"
+
 minimatch@9.0.3:
   version "9.0.3"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
@@ -7748,13 +10128,6 @@ minimatch@9.0.3:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
-  dependencies:
-    brace-expansion "^1.1.7"
-
 minimatch@^5.0.1:
   version "5.1.6"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
@@ -7778,6 +10151,11 @@ minimist-options@4.1.0, minimist-options@^4.0.2:
     is-plain-obj "^1.1.0"
     kind-of "^6.0.3"
 
+minimist@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"
+  integrity sha512-wR5Ipl99t0mTGwLjQJnBjrP/O7zBbLZqvA3aw32DmLx+nXHfWctUjzDjnDx09pX1Po86WFQazF9xUzfMea3Cnw==
+
 minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
@@ -7795,7 +10173,7 @@ minipass@^5.0.0:
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
   integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
 
-"minipass@^5.0.0 || ^6.0.2 || ^7.0.0":
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
   integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
@@ -7808,6 +10186,13 @@ minizlib@^2.1.1:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
+mkdirp@^0.5.0:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
+  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
+  dependencies:
+    minimist "^1.2.6"
+
 mkdirp@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
@@ -7818,18 +10203,6 @@ mmdb-lib@2.1.1:
   resolved "https://registry.yarnpkg.com/mmdb-lib/-/mmdb-lib-2.1.1.tgz#c0d0bd35dc1fca41f0ebd043e43227ab04eb1792"
   integrity sha512-yx8H/1H5AfnufiLnzzPqPf4yr/dKU9IFT1rPVwSkrKWHsQEeVVd6+X+L0nUbXhlEFTu3y/7hu38CFmEVgzvyeg==
 
-moment-timezone@^0.5.35:
-  version "0.5.46"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.46.tgz#a21aa6392b3c6b3ed916cd5e95858a28d893704a"
-  integrity sha512-ZXm9b36esbe7OmdABqIWJuBBiLLwAjrN7CE+7sYdCCx82Nabt1wHDj8TVseS59QIlfFPbOoiBPm6ca9BioG4hw==
-  dependencies:
-    moment "^2.29.4"
-
-moment@^2.29.4:
-  version "2.30.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae"
-  integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==
-
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
@@ -7864,28 +10237,63 @@ next-basics@^0.39.0:
     jsonwebtoken "^9.0.0"
     pure-rand "^6.0.2"
 
-next@14.2.10:
-  version "14.2.10"
-  resolved "https://registry.yarnpkg.com/next/-/next-14.2.10.tgz#331981a4fecb1ae8af1817d4db98fc9687ee1cb6"
-  integrity sha512-sDDExXnh33cY3RkS9JuFEKaS4HmlWmDKP1VJioucCG6z5KuA008DPsDZOzi8UfqEk3Ii+2NCQSJrfbEWtZZfww==
+next-mdx-remote@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/next-mdx-remote/-/next-mdx-remote-5.0.0.tgz#028a2cf5cf7f814d988d7ab11a401bed0f31b4ee"
+  integrity sha512-RNNbqRpK9/dcIFZs/esQhuLA8jANqlH694yqoDBK8hkVdJUndzzGmnPHa2nyi90N4Z9VmzuSWNRpr5ItT3M7xQ==
   dependencies:
-    "@next/env" "14.2.10"
-    "@swc/helpers" "0.5.5"
+    "@babel/code-frame" "^7.23.5"
+    "@mdx-js/mdx" "^3.0.1"
+    "@mdx-js/react" "^3.0.1"
+    unist-util-remove "^3.1.0"
+    vfile "^6.0.1"
+    vfile-matter "^5.0.0"
+
+next@15.0.2:
+  version "15.0.2"
+  resolved "https://registry.yarnpkg.com/next/-/next-15.0.2.tgz#4a2224c007856118010b8cef5e9b2383cd743388"
+  integrity sha512-rxIWHcAu4gGSDmwsELXacqAPUk+j8dV/A9cDF5fsiCMpkBDYkO2AEaL1dfD+nNmDiU6QMCFN8Q30VEKapT9UHQ==
+  dependencies:
+    "@next/env" "15.0.2"
+    "@swc/counter" "0.1.3"
+    "@swc/helpers" "0.5.13"
+    busboy "1.6.0"
+    caniuse-lite "^1.0.30001579"
+    postcss "8.4.31"
+    styled-jsx "5.1.6"
+  optionalDependencies:
+    "@next/swc-darwin-arm64" "15.0.2"
+    "@next/swc-darwin-x64" "15.0.2"
+    "@next/swc-linux-arm64-gnu" "15.0.2"
+    "@next/swc-linux-arm64-musl" "15.0.2"
+    "@next/swc-linux-x64-gnu" "15.0.2"
+    "@next/swc-linux-x64-musl" "15.0.2"
+    "@next/swc-win32-arm64-msvc" "15.0.2"
+    "@next/swc-win32-x64-msvc" "15.0.2"
+    sharp "^0.33.5"
+
+next@15.0.3:
+  version "15.0.3"
+  resolved "https://registry.yarnpkg.com/next/-/next-15.0.3.tgz#804f5b772e7570ef1f088542a59860914d3288e9"
+  integrity sha512-ontCbCRKJUIoivAdGB34yCaOcPgYXr9AAkV/IwqFfWWTXEPUgLYkSkqBhIk9KK7gGmgjc64B+RdoeIDM13Irnw==
+  dependencies:
+    "@next/env" "15.0.3"
+    "@swc/counter" "0.1.3"
+    "@swc/helpers" "0.5.13"
     busboy "1.6.0"
     caniuse-lite "^1.0.30001579"
-    graceful-fs "^4.2.11"
     postcss "8.4.31"
-    styled-jsx "5.1.1"
+    styled-jsx "5.1.6"
   optionalDependencies:
-    "@next/swc-darwin-arm64" "14.2.10"
-    "@next/swc-darwin-x64" "14.2.10"
-    "@next/swc-linux-arm64-gnu" "14.2.10"
-    "@next/swc-linux-arm64-musl" "14.2.10"
-    "@next/swc-linux-x64-gnu" "14.2.10"
-    "@next/swc-linux-x64-musl" "14.2.10"
-    "@next/swc-win32-arm64-msvc" "14.2.10"
-    "@next/swc-win32-ia32-msvc" "14.2.10"
-    "@next/swc-win32-x64-msvc" "14.2.10"
+    "@next/swc-darwin-arm64" "15.0.3"
+    "@next/swc-darwin-x64" "15.0.3"
+    "@next/swc-linux-arm64-gnu" "15.0.3"
+    "@next/swc-linux-arm64-musl" "15.0.3"
+    "@next/swc-linux-x64-gnu" "15.0.3"
+    "@next/swc-linux-x64-musl" "15.0.3"
+    "@next/swc-win32-arm64-msvc" "15.0.3"
+    "@next/swc-win32-x64-msvc" "15.0.3"
+    sharp "^0.33.5"
 
 nice-try@^1.0.4:
   version "1.0.5"
@@ -8167,6 +10575,11 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
+package-json-from-dist@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz#4f1471a010827a86f94cfd9b0727e36d267de505"
+  integrity sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==
+
 parent-module@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
@@ -8174,6 +10587,20 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
+parse-entities@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-4.0.1.tgz#4e2a01111fb1c986549b944af39eeda258fc9e4e"
+  integrity sha512-SWzvYcSJh4d/SGLIOQfZ/CoNv6BTlI6YEQ7Nj82oDVnRpwe/Z/F1EMx42x3JAOwGBlCjeCH0BRJQbQ/opHL17w==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    character-entities "^2.0.0"
+    character-entities-legacy "^3.0.0"
+    character-reference-invalid "^2.0.0"
+    decode-named-character-reference "^1.0.0"
+    is-alphanumerical "^2.0.0"
+    is-decimal "^2.0.0"
+    is-hexadecimal "^2.0.0"
+
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
@@ -8222,7 +10649,7 @@ path-parse@^1.0.7:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
-path-scurry@^1.10.1:
+path-scurry@^1.10.1, path-scurry@^1.11.1:
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2"
   integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==
@@ -8914,12 +11341,14 @@ pretty-format@^29.0.0, pretty-format@^29.7.0:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
-prisma@5.17:
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.17.0.tgz#267b43921ab94805b010537cffa5ccaf530fa066"
-  integrity sha512-m4UWkN5lBE6yevqeOxEvmepnL5cNPEjzMw2IqDB59AcEV6w7D8vGljDLd1gPFH+W6gUxw9x7/RmN5dCS/WTPxA==
+prisma@5.22.0:
+  version "5.22.0"
+  resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.22.0.tgz#1f6717ff487cdef5f5799cc1010459920e2e6197"
+  integrity sha512-vtpjW3XuYCSnMsNVBjLMNkTj6OZbudcPPTPYHqX0CJfpcdWciI1dM8uHETwmDxxiqEwCIE6WvXucWUetJgfu/A==
   dependencies:
-    "@prisma/engines" "5.17.0"
+    "@prisma/engines" "5.22.0"
+  optionalDependencies:
+    fsevents "2.3.3"
 
 process@^0.11.10:
   version "0.11.10"
@@ -8953,6 +11382,11 @@ property-expr@^2.0.4:
   resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.6.tgz#f77bc00d5928a6c748414ad12882e83f24aec1e8"
   integrity sha512-SVtmxhRE/CGkn3eZY1T6pC8Nln6Fr/lu1mKSgRud0eC73whjGfoAogbn78LkD8aFL0zz3bAFerKSnOl7NlErBA==
 
+property-information@^6.0.0:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/property-information/-/property-information-6.5.0.tgz#6212fbb52ba757e92ef4fb9d657563b933b7ffec"
+  integrity sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==
+
 proxy-from-env@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
@@ -9010,6 +11444,89 @@ randombytes@^2.1.0:
   dependencies:
     safe-buffer "^5.1.0"
 
+react-aria-components@^1.2.1:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/react-aria-components/-/react-aria-components-1.5.0.tgz#9c51ba8427e827d1192f965249e16ff7d34cbb55"
+  integrity sha512-wzf0g6cvWrqAJd4FkisAfFnslx6AJREgOd/NEmVE/RGuDxGTzss4awcwbo98rIVmqbTTFApiygy0SyWGrRZfDA==
+  dependencies:
+    "@internationalized/date" "^3.6.0"
+    "@internationalized/string" "^3.2.5"
+    "@react-aria/collections" "3.0.0-alpha.6"
+    "@react-aria/color" "^3.0.2"
+    "@react-aria/disclosure" "^3.0.0"
+    "@react-aria/dnd" "^3.8.0"
+    "@react-aria/focus" "^3.19.0"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/live-announcer" "^3.4.1"
+    "@react-aria/menu" "^3.16.0"
+    "@react-aria/toolbar" "3.0.0-beta.11"
+    "@react-aria/tree" "3.0.0-beta.2"
+    "@react-aria/utils" "^3.26.0"
+    "@react-aria/virtualizer" "^4.1.0"
+    "@react-stately/color" "^3.8.1"
+    "@react-stately/disclosure" "^3.0.0"
+    "@react-stately/layout" "^4.1.0"
+    "@react-stately/menu" "^3.9.0"
+    "@react-stately/selection" "^3.18.0"
+    "@react-stately/table" "^3.13.0"
+    "@react-stately/utils" "^3.10.5"
+    "@react-stately/virtualizer" "^4.2.0"
+    "@react-types/color" "^3.0.1"
+    "@react-types/form" "^3.7.8"
+    "@react-types/grid" "^3.2.10"
+    "@react-types/shared" "^3.26.0"
+    "@react-types/table" "^3.10.3"
+    "@swc/helpers" "^0.5.0"
+    client-only "^0.0.1"
+    react-aria "^3.36.0"
+    react-stately "^3.34.0"
+    use-sync-external-store "^1.2.0"
+
+react-aria@^3.36.0:
+  version "3.36.0"
+  resolved "https://registry.yarnpkg.com/react-aria/-/react-aria-3.36.0.tgz#95a8e3340ab400bfec4d159e47da8861469e5bcd"
+  integrity sha512-AK5XyIhAN+e5HDlwlF+YwFrOrVI7RYmZ6kg/o7ZprQjkYqYKapXeUpWscmNm/3H2kDboE5Z4ymUnK6ZhobLqOw==
+  dependencies:
+    "@internationalized/string" "^3.2.5"
+    "@react-aria/breadcrumbs" "^3.5.19"
+    "@react-aria/button" "^3.11.0"
+    "@react-aria/calendar" "^3.6.0"
+    "@react-aria/checkbox" "^3.15.0"
+    "@react-aria/color" "^3.0.2"
+    "@react-aria/combobox" "^3.11.0"
+    "@react-aria/datepicker" "^3.12.0"
+    "@react-aria/dialog" "^3.5.20"
+    "@react-aria/disclosure" "^3.0.0"
+    "@react-aria/dnd" "^3.8.0"
+    "@react-aria/focus" "^3.19.0"
+    "@react-aria/gridlist" "^3.10.0"
+    "@react-aria/i18n" "^3.12.4"
+    "@react-aria/interactions" "^3.22.5"
+    "@react-aria/label" "^3.7.13"
+    "@react-aria/link" "^3.7.7"
+    "@react-aria/listbox" "^3.13.6"
+    "@react-aria/menu" "^3.16.0"
+    "@react-aria/meter" "^3.4.18"
+    "@react-aria/numberfield" "^3.11.9"
+    "@react-aria/overlays" "^3.24.0"
+    "@react-aria/progress" "^3.4.18"
+    "@react-aria/radio" "^3.10.10"
+    "@react-aria/searchfield" "^3.7.11"
+    "@react-aria/select" "^3.15.0"
+    "@react-aria/selection" "^3.21.0"
+    "@react-aria/separator" "^3.4.4"
+    "@react-aria/slider" "^3.7.14"
+    "@react-aria/ssr" "^3.9.7"
+    "@react-aria/switch" "^3.6.10"
+    "@react-aria/table" "^3.16.0"
+    "@react-aria/tabs" "^3.9.8"
+    "@react-aria/tag" "^3.4.8"
+    "@react-aria/textfield" "^3.15.0"
+    "@react-aria/tooltip" "^3.7.10"
+    "@react-aria/utils" "^3.26.0"
+    "@react-aria/visually-hidden" "^3.8.18"
+    "@react-types/shared" "^3.26.0"
+
 react-basics@^0.125.0:
   version "0.125.0"
   resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.125.0.tgz#6baf3fea503fb4475f51877efa05d1a734b232c6"
@@ -9042,6 +11559,13 @@ react-dom@^18.2.0:
     loose-envify "^1.1.0"
     scheduler "^0.23.2"
 
+react-dom@^19.0.0-rc-66855b96-20241106:
+  version "19.0.0-rc-fb9a90fa48-20240614"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-19.0.0-rc-fb9a90fa48-20240614.tgz#8dce9ed0650096d65437e4bce790628e483831a2"
+  integrity sha512-PoEsPe32F7KPLYOBvZfjylEI1B67N44PwY3lyvpmBkhlluLnLz0jH8q2Wg9YidAi6z0k3iUnNRm5x10wurzt9Q==
+  dependencies:
+    scheduler "0.25.0-rc-fb9a90fa48-20240614"
+
 react-error-boundary@^4.0.4:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/react-error-boundary/-/react-error-boundary-4.1.2.tgz#bc750ad962edb8b135d6ae922c046051eb58f289"
@@ -9054,6 +11578,16 @@ react-hook-form@^7.34.2:
   resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.47.0.tgz#a42f07266bd297ddf1f914f08f4b5f9783262f31"
   integrity sha512-F/TroLjTICipmHeFlMrLtNLceO2xr1jU3CyiNla5zdwsGUGu2UOxxR4UyJgLlhMwLW/Wzp4cpJ7CPfgJIeKdSg==
 
+react-hook-form@^7.53.0:
+  version "7.53.2"
+  resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.53.2.tgz#6fa37ae27330af81089baadd7f322cc987b8e2ac"
+  integrity sha512-YVel6fW5sOeedd1524pltpHX+jgU2u3DSDtXEaBORNdqiNrsX/nUI/iGXONegttg0mJVnfrIkiV0cmTU6Oo2xw==
+
+react-icons@^5.2.1:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-5.3.0.tgz#ccad07a30aebd40a89f8cfa7d82e466019203f1c"
+  integrity sha512-DnUk8aFbTyQPSkCfF8dbX6kQjXA9DktMeJqfjrg6cK9vwQVMxmcA3BfP4QoiztVmEHtwlTgLFsPuH2NskKT6eg==
+
 react-intl@^6.5.5:
   version "6.8.9"
   resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-6.8.9.tgz#ef36b2a19a0eb97afbeaeab9679273fcbf2ea261"
@@ -9107,6 +11641,37 @@ react-simple-maps@^2.3.0:
     d3-zoom "^2.0.0"
     topojson-client "^3.1.0"
 
+react-stately@^3.34.0:
+  version "3.34.0"
+  resolved "https://registry.yarnpkg.com/react-stately/-/react-stately-3.34.0.tgz#981713fa00bb2ef07b981dbce466d9a5774101d4"
+  integrity sha512-0N9tZ8qQ/CxpJH7ao0O6gr+8955e7VrOskg9N+TIxkFknPetwOCtgppMYhnTfteBV8WfM/vv4OC1NbkgYTqXJA==
+  dependencies:
+    "@react-stately/calendar" "^3.6.0"
+    "@react-stately/checkbox" "^3.6.10"
+    "@react-stately/collections" "^3.12.0"
+    "@react-stately/color" "^3.8.1"
+    "@react-stately/combobox" "^3.10.1"
+    "@react-stately/data" "^3.12.0"
+    "@react-stately/datepicker" "^3.11.0"
+    "@react-stately/disclosure" "^3.0.0"
+    "@react-stately/dnd" "^3.5.0"
+    "@react-stately/form" "^3.1.0"
+    "@react-stately/list" "^3.11.1"
+    "@react-stately/menu" "^3.9.0"
+    "@react-stately/numberfield" "^3.9.8"
+    "@react-stately/overlays" "^3.6.12"
+    "@react-stately/radio" "^3.10.9"
+    "@react-stately/searchfield" "^3.5.8"
+    "@react-stately/select" "^3.6.9"
+    "@react-stately/selection" "^3.18.0"
+    "@react-stately/slider" "^3.6.0"
+    "@react-stately/table" "^3.13.0"
+    "@react-stately/tabs" "^3.7.0"
+    "@react-stately/toggle" "^3.8.0"
+    "@react-stately/tooltip" "^3.5.0"
+    "@react-stately/tree" "^3.8.6"
+    "@react-types/shared" "^3.26.0"
+
 react-use-measure@^2.0.4:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/react-use-measure/-/react-use-measure-2.1.1.tgz#5824537f4ee01c9469c45d5f7a8446177c6cc4ba"
@@ -9129,6 +11694,11 @@ react@^18.2.0:
   dependencies:
     loose-envify "^1.1.0"
 
+react@^19.0.0-rc-66855b96-20241106:
+  version "19.0.0-rc-fb9a90fa48-20240614"
+  resolved "https://registry.yarnpkg.com/react/-/react-19.0.0-rc-fb9a90fa48-20240614.tgz#90eb43a0b005e8cc3cbf0d801c14816d01df1b08"
+  integrity sha512-nvE3Gy+IOIfH/DXhkyxFVQSrITarFcQz4+shzC/McxQXEUSonpw2oDy/Wi9hdDtV3hlP12VYuDL95iiBREedNQ==
+
 read-babelrc-up@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-babelrc-up/-/read-babelrc-up-1.1.0.tgz#10fd5baaf6ca03eaba6748fa65ddae25bca61e70"
@@ -9191,6 +11761,53 @@ read-pkg@^6.0.0:
     parse-json "^5.2.0"
     type-fest "^1.0.1"
 
+recma-build-jsx@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/recma-build-jsx/-/recma-build-jsx-1.0.0.tgz#c02f29e047e103d2fab2054954e1761b8ea253c4"
+  integrity sha512-8GtdyqaBcDfva+GUKDr3nev3VpKAhup1+RvkMvUxURHpW7QyIvk9F5wz7Vzo06CEMSilw6uArgRqhpiUcWp8ew==
+  dependencies:
+    "@types/estree" "^1.0.0"
+    estree-util-build-jsx "^3.0.0"
+    vfile "^6.0.0"
+
+recma-jsx@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/recma-jsx/-/recma-jsx-1.0.0.tgz#f7bef02e571a49d6ba3efdfda8e2efab48dbe3aa"
+  integrity sha512-5vwkv65qWwYxg+Atz95acp8DMu1JDSqdGkA2Of1j6rCreyFUE/gp15fC8MnGEuG1W68UKjM6x6+YTWIh7hZM/Q==
+  dependencies:
+    acorn-jsx "^5.0.0"
+    estree-util-to-js "^2.0.0"
+    recma-parse "^1.0.0"
+    recma-stringify "^1.0.0"
+    unified "^11.0.0"
+
+recma-parse@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/recma-parse/-/recma-parse-1.0.0.tgz#c351e161bb0ab47d86b92a98a9d891f9b6814b52"
+  integrity sha512-OYLsIGBB5Y5wjnSnQW6t3Xg7q3fQ7FWbw/vcXtORTnyaSFscOtABg+7Pnz6YZ6c27fG1/aN8CjfwoUEUIdwqWQ==
+  dependencies:
+    "@types/estree" "^1.0.0"
+    esast-util-from-js "^2.0.0"
+    unified "^11.0.0"
+    vfile "^6.0.0"
+
+recma-stringify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/recma-stringify/-/recma-stringify-1.0.0.tgz#54632030631e0c7546136ff9ef8fde8e7b44f130"
+  integrity sha512-cjwII1MdIIVloKvC9ErQ+OgAtwHBmcZ0Bg4ciz78FtbT8In39aAYbaA7zvxQ61xVMSPE8WxhLwLbhif4Js2C+g==
+  dependencies:
+    "@types/estree" "^1.0.0"
+    estree-util-to-js "^2.0.0"
+    unified "^11.0.0"
+    vfile "^6.0.0"
+
+recursive-readdir@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.3.tgz#e726f328c0d69153bcabd5c322d3195252379372"
+  integrity sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==
+  dependencies:
+    minimatch "^3.0.5"
+
 redent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
@@ -9292,6 +11909,44 @@ regjsparser@^0.9.1:
   dependencies:
     jsesc "~0.5.0"
 
+rehype-recma@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/rehype-recma/-/rehype-recma-1.0.0.tgz#d68ef6344d05916bd96e25400c6261775411aa76"
+  integrity sha512-lqA4rGUf1JmacCNWWZx0Wv1dHqMwxzsDWYMTowuplHF3xH0N/MmrZ/G3BDZnzAkRmxDadujCjaKM2hqYdCBOGw==
+  dependencies:
+    "@types/estree" "^1.0.0"
+    "@types/hast" "^3.0.0"
+    hast-util-to-estree "^3.0.0"
+
+remark-mdx@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/remark-mdx/-/remark-mdx-3.1.0.tgz#f979be729ecb35318fa48e2135c1169607a78343"
+  integrity sha512-Ngl/H3YXyBV9RcRNdlYsZujAmhsxwzxpDzpDEhFBVAGthS4GDgnctpDjgFl/ULx5UEDzqtW1cyBSNKqYYrqLBA==
+  dependencies:
+    mdast-util-mdx "^3.0.0"
+    micromark-extension-mdxjs "^3.0.0"
+
+remark-parse@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-11.0.0.tgz#aa60743fcb37ebf6b069204eb4da304e40db45a1"
+  integrity sha512-FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA==
+  dependencies:
+    "@types/mdast" "^4.0.0"
+    mdast-util-from-markdown "^2.0.0"
+    micromark-util-types "^2.0.0"
+    unified "^11.0.0"
+
+remark-rehype@^11.0.0:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/remark-rehype/-/remark-rehype-11.1.1.tgz#f864dd2947889a11997c0a2667cd6b38f685bca7"
+  integrity sha512-g/osARvjkBXb6Wo0XvAeXQohVta8i84ACbenPpoSsxTOQH/Ae0/RGP4WZgnMH5pMLpsj4FG7OHmcIcXxpza8eQ==
+  dependencies:
+    "@types/hast" "^3.0.0"
+    "@types/mdast" "^4.0.0"
+    mdast-util-to-hast "^13.0.0"
+    unified "^11.0.0"
+    vfile "^6.0.0"
+
 request-ip@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/request-ip/-/request-ip-3.3.0.tgz#863451e8fec03847d44f223e30a5d63e369fa611"
@@ -9536,6 +12191,11 @@ safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
+scheduler@0.25.0-rc-fb9a90fa48-20240614:
+  version "0.25.0-rc-fb9a90fa48-20240614"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.25.0-rc-fb9a90fa48-20240614.tgz#9ee11063b7c0f47aef3fea53d9f1be3f13794dce"
+  integrity sha512-HHqQ/SqbeiDfXXVKgNxTpbQTD4n7IUb4hZATvHjp03jr3TF7igehCyHdOjeYTrzIseLO93cTTfSb5f4qWcirMQ==
+
 scheduler@^0.23.2:
   version "0.23.2"
   resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.2.tgz#414ba64a3b282892e944cf2108ecc078d115cdc3"
@@ -9562,6 +12222,14 @@ schema-utils@^2.6.6:
     ajv "^6.12.4"
     ajv-keywords "^3.5.2"
 
+section-matter@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/section-matter/-/section-matter-1.0.0.tgz#e9041953506780ec01d59f292a19c7b850b84167"
+  integrity sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==
+  dependencies:
+    extend-shallow "^2.0.1"
+    kind-of "^6.0.0"
+
 "semver@2 || 3 || 4 || 5", semver@^5.5.0:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
@@ -9606,6 +12274,35 @@ set-function-name@^2.0.1, set-function-name@^2.0.2:
     functions-have-names "^1.2.3"
     has-property-descriptors "^1.0.2"
 
+sharp@^0.33.5:
+  version "0.33.5"
+  resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.33.5.tgz#13e0e4130cc309d6a9497596715240b2ec0c594e"
+  integrity sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==
+  dependencies:
+    color "^4.2.3"
+    detect-libc "^2.0.3"
+    semver "^7.6.3"
+  optionalDependencies:
+    "@img/sharp-darwin-arm64" "0.33.5"
+    "@img/sharp-darwin-x64" "0.33.5"
+    "@img/sharp-libvips-darwin-arm64" "1.0.4"
+    "@img/sharp-libvips-darwin-x64" "1.0.4"
+    "@img/sharp-libvips-linux-arm" "1.0.5"
+    "@img/sharp-libvips-linux-arm64" "1.0.4"
+    "@img/sharp-libvips-linux-s390x" "1.0.4"
+    "@img/sharp-libvips-linux-x64" "1.0.4"
+    "@img/sharp-libvips-linuxmusl-arm64" "1.0.4"
+    "@img/sharp-libvips-linuxmusl-x64" "1.0.4"
+    "@img/sharp-linux-arm" "0.33.5"
+    "@img/sharp-linux-arm64" "0.33.5"
+    "@img/sharp-linux-s390x" "0.33.5"
+    "@img/sharp-linux-x64" "0.33.5"
+    "@img/sharp-linuxmusl-arm64" "0.33.5"
+    "@img/sharp-linuxmusl-x64" "0.33.5"
+    "@img/sharp-wasm32" "0.33.5"
+    "@img/sharp-win32-ia32" "0.33.5"
+    "@img/sharp-win32-x64" "0.33.5"
+
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -9655,6 +12352,13 @@ signal-exit@^4.0.1:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
   integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
 
+simple-swizzle@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
+  integrity sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==
+  dependencies:
+    is-arrayish "^0.3.1"
+
 sisteransi@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
@@ -9742,6 +12446,16 @@ source-map@^0.6.0, source-map@^0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
+source-map@^0.7.0:
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
+  integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
+
+space-separated-tokens@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz#1ecd9d2350a3844572c3f4a312bceb018348859f"
+  integrity sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==
+
 spdx-correct@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c"
@@ -9922,6 +12636,14 @@ string.prototype.trimstart@^1.0.8:
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
+stringify-entities@^4.0.0:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-4.0.4.tgz#b3b79ef5f277cc4ac73caeb0236c5ba939b3a4f3"
+  integrity sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==
+  dependencies:
+    character-entities-html4 "^2.0.0"
+    character-entities-legacy "^3.0.0"
+
 "strip-ansi-cjs@npm:strip-ansi@^6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -9943,6 +12665,11 @@ strip-ansi@^7.0.1:
   dependencies:
     ansi-regex "^6.0.1"
 
+strip-bom-string@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92"
+  integrity sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==
+
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
@@ -9992,10 +12719,24 @@ style-search@^0.1.0:
   resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
   integrity sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==
 
-styled-jsx@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-5.1.1.tgz#839a1c3aaacc4e735fed0781b8619ea5d0009d1f"
-  integrity sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==
+style-to-object@^0.4.0:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.4.4.tgz#266e3dfd56391a7eefb7770423612d043c3f33ec"
+  integrity sha512-HYNoHZa2GorYNyqiCaBgsxvcJIn7OHq6inEga+E6Ke3m5JkoqpQbnFssk4jwe+K7AhGa2fcha4wSOf1Kn01dMg==
+  dependencies:
+    inline-style-parser "0.1.1"
+
+style-to-object@^1.0.0:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-1.0.8.tgz#67a29bca47eaa587db18118d68f9d95955e81292"
+  integrity sha512-xT47I/Eo0rwJmaXC4oilDGDWLohVhR6o/xAQcPQN8q6QBuZVL8qMYL85kLmST5cPjAorwvqIA4qXTRQoYHaL6g==
+  dependencies:
+    inline-style-parser "0.2.4"
+
+styled-jsx@5.1.6:
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-5.1.6.tgz#83b90c077e6c6a80f7f5e8781d0f311b2fe41499"
+  integrity sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==
   dependencies:
     client-only "0.0.1"
 
@@ -10285,6 +13026,11 @@ tree-kill@1.2.2:
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
   integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
+trim-lines@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/trim-lines/-/trim-lines-3.0.1.tgz#d802e332a07df861c48802c04321017b1bd87338"
+  integrity sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==
+
 trim-newlines@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
@@ -10295,6 +13041,11 @@ trim-newlines@^4.0.2:
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-4.1.1.tgz#28c88deb50ed10c7ba6dc2474421904a00139125"
   integrity sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ==
 
+trough@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/trough/-/trough-2.2.0.tgz#94a60bd6bd375c152c1df911a4b11d5b0256f50f"
+  integrity sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==
+
 ts-api-utils@^1.0.1, ts-api-utils@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.4.0.tgz#709c6f2076e511a81557f3d07a0cbd566ae8195c"
@@ -10344,7 +13095,7 @@ tsconfig-paths@^3.15.0:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@2, tslib@^2.1.0, tslib@^2.4.0:
+tslib@2, tslib@^2.1.0, tslib@^2.4.0, tslib@^2.8.0:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
   integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
@@ -10519,6 +13270,88 @@ unicode-property-aliases-ecmascript@^2.0.0:
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
   integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
 
+unified@^11.0.0:
+  version "11.0.5"
+  resolved "https://registry.yarnpkg.com/unified/-/unified-11.0.5.tgz#f66677610a5c0a9ee90cab2b8d4d66037026d9e1"
+  integrity sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==
+  dependencies:
+    "@types/unist" "^3.0.0"
+    bail "^2.0.0"
+    devlop "^1.0.0"
+    extend "^3.0.0"
+    is-plain-obj "^4.0.0"
+    trough "^2.0.0"
+    vfile "^6.0.0"
+
+unist-util-is@^5.0.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-5.2.1.tgz#b74960e145c18dcb6226bc57933597f5486deae9"
+  integrity sha512-u9njyyfEh43npf1M+yGKDGVPbY/JWEemg5nH05ncKPfi+kBbKBJoTdsogMu33uhytuLlv9y0O7GH7fEdwLdLQw==
+  dependencies:
+    "@types/unist" "^2.0.0"
+
+unist-util-is@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-6.0.0.tgz#b775956486aff107a9ded971d996c173374be424"
+  integrity sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==
+  dependencies:
+    "@types/unist" "^3.0.0"
+
+unist-util-position-from-estree@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unist-util-position-from-estree/-/unist-util-position-from-estree-2.0.0.tgz#d94da4df596529d1faa3de506202f0c9a23f2200"
+  integrity sha512-KaFVRjoqLyF6YXCbVLNad/eS4+OfPQQn2yOd7zF/h5T/CSL2v8NpN6a5TPvtbXthAGw5nG+PuTtq+DdIZr+cRQ==
+  dependencies:
+    "@types/unist" "^3.0.0"
+
+unist-util-position@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-5.0.0.tgz#678f20ab5ca1207a97d7ea8a388373c9cf896be4"
+  integrity sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==
+  dependencies:
+    "@types/unist" "^3.0.0"
+
+unist-util-remove@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/unist-util-remove/-/unist-util-remove-3.1.1.tgz#8bfa181aff916bd32a4ed30b3ed76d0c21c077df"
+  integrity sha512-kfCqZK5YVY5yEa89tvpl7KnBBHu2c6CzMkqHUrlOqaRgGOMp0sMvwWOVrbAtj03KhovQB7i96Gda72v/EFE0vw==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-is "^5.0.0"
+    unist-util-visit-parents "^5.0.0"
+
+unist-util-stringify-position@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz#449c6e21a880e0855bf5aabadeb3a740314abac2"
+  integrity sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==
+  dependencies:
+    "@types/unist" "^3.0.0"
+
+unist-util-visit-parents@^5.0.0:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-5.1.3.tgz#b4520811b0ca34285633785045df7a8d6776cfeb"
+  integrity sha512-x6+y8g7wWMyQhL1iZfhIPhDAs7Xwbn9nRosDXl7qoPTSCy0yNxnKc+hWokFifWQIDGi154rdUqKvbCa4+1kLhg==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-is "^5.0.0"
+
+unist-util-visit-parents@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz#4d5f85755c3b8f0dc69e21eca5d6d82d22162815"
+  integrity sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==
+  dependencies:
+    "@types/unist" "^3.0.0"
+    unist-util-is "^6.0.0"
+
+unist-util-visit@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-5.0.0.tgz#a7de1f31f72ffd3519ea71814cccf5fd6a9217d6"
+  integrity sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==
+  dependencies:
+    "@types/unist" "^3.0.0"
+    unist-util-is "^6.0.0"
+    unist-util-visit-parents "^6.0.0"
+
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
@@ -10554,7 +13387,7 @@ use-memo-one@^1.1.1:
   resolved "https://registry.yarnpkg.com/use-memo-one/-/use-memo-one-1.1.3.tgz#2fd2e43a2169eabc7496960ace8c79efef975e99"
   integrity sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==
 
-use-sync-external-store@1.2.2:
+use-sync-external-store@1.2.2, use-sync-external-store@^1.2.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.2.tgz#c3b6390f3a30eba13200d2302dcdf1e7b57b2ef9"
   integrity sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw==
@@ -10610,6 +13443,30 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
+vfile-matter@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/vfile-matter/-/vfile-matter-5.0.0.tgz#4f8d6476a432f9556784a8b538f7da0ba25e053d"
+  integrity sha512-jhPSqlj8hTSkTXOqyxbUeZAFFVq/iwu/jukcApEqc/7DOidaAth6rDc0Zgg0vWpzUnWkwFP7aK28l6nBmxMqdQ==
+  dependencies:
+    vfile "^6.0.0"
+    yaml "^2.0.0"
+
+vfile-message@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-4.0.2.tgz#c883c9f677c72c166362fd635f21fc165a7d1181"
+  integrity sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==
+  dependencies:
+    "@types/unist" "^3.0.0"
+    unist-util-stringify-position "^4.0.0"
+
+vfile@^6.0.0, vfile@^6.0.1:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/vfile/-/vfile-6.0.3.tgz#3652ab1c496531852bf55a6bac57af981ebc38ab"
+  integrity sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==
+  dependencies:
+    "@types/unist" "^3.0.0"
+    vfile-message "^4.0.0"
+
 vue@^3.2.23:
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/vue/-/vue-3.3.4.tgz#8ed945d3873667df1d0fcf3b2463ada028f88bd6"
@@ -10806,6 +13663,11 @@ yaml@^1.10.2:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
+yaml@^2.0.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.6.1.tgz#42f2b1ba89203f374609572d5349fb8686500773"
+  integrity sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==
+
 yargs-parser@^18.1.3:
   version "18.1.3"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
@@ -10868,9 +13730,14 @@ yup@^0.32.11:
     property-expr "^2.0.4"
     toposort "^2.0.2"
 
-zustand@^4.5.5:
+zustand@^4.5.0, zustand@^4.5.5:
   version "4.5.5"
   resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.5.5.tgz#f8c713041543715ec81a2adda0610e1dc82d4ad1"
   integrity sha512-+0PALYNJNgK6hldkgDq2vLrw5f6g/jCInz52n9RTpropGgeAf/ioFUCdtsjCqu4gNhW9D01rUQBROoRjdzyn2Q==
   dependencies:
     use-sync-external-store "1.2.2"
+
+zwitch@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-2.0.4.tgz#c827d4b0acb76fc3e685a4c6ec2902d51070e9d7"
+  integrity sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==

From b61e14962af6da7566cfff6af65e6784ef7ddf66 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 25 Nov 2024 13:46:38 -0800
Subject: [PATCH 421/438] fix unknown icon and country render link

---
 package.json                              |  2 +-
 src/components/common/TypeIcon.tsx        |  9 +++--
 src/components/metrics/CountriesTable.tsx |  6 +++-
 yarn.lock                                 | 43 +++++------------------
 4 files changed, 21 insertions(+), 39 deletions(-)

diff --git a/package.json b/package.json
index 1234820322..4bc7a57f4f 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
     "@react-spring/web": "^9.7.3",
     "@tanstack/react-query": "^5.28.6",
     "@umami/prisma-client": "^0.14.0",
-    "@umami/react-zen": "^0.16.0",
+    "@umami/react-zen": "^0.19.0",
     "@umami/redis-client": "^0.21.0",
     "chalk": "^4.1.1",
     "chart.js": "^4.4.2",
diff --git a/src/components/common/TypeIcon.tsx b/src/components/common/TypeIcon.tsx
index d617e75925..2a180445fe 100644
--- a/src/components/common/TypeIcon.tsx
+++ b/src/components/common/TypeIcon.tsx
@@ -12,9 +12,12 @@ export function TypeIcon({
   return (
     <>
       <img
-        src={`${process.env.basePath || ''}/images/${type}/${
-          value?.replaceAll(' ', '-').toLowerCase() || 'unknown'
-        }.png`}
+        src={`${process.env.basePath || ''}/images/${type}/${value
+          ?.replaceAll(' ', '-')
+          .toLowerCase()}.png`}
+        onError={e => {
+          e.currentTarget.src = `${process.env.basePath || ''}/images/${type}/unknown.png`;
+        }}
         alt={value}
         width={type === 'country' ? undefined : 16}
         height={type === 'country' ? undefined : 16}
diff --git a/src/components/metrics/CountriesTable.tsx b/src/components/metrics/CountriesTable.tsx
index c1fc28318c..d94aebf6f6 100644
--- a/src/components/metrics/CountriesTable.tsx
+++ b/src/components/metrics/CountriesTable.tsx
@@ -12,7 +12,11 @@ export function CountriesTable({ ...props }: MetricsTableProps) {
 
   const renderLink = ({ x: code }) => {
     return (
-      <FilterLink id="country" value={countryNames[code] && code} label={formatCountry(code)}>
+      <FilterLink
+        id="country"
+        value={(countryNames[code] && code) || code}
+        label={formatCountry(code)}
+      >
         <TypeIcon type="country" value={code?.toLowerCase()} />
       </FilterLink>
     );
diff --git a/yarn.lock b/yarn.lock
index ea4e1752c0..2def5524a4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4817,10 +4817,10 @@
     chalk "^4.1.2"
     debug "^4.3.4"
 
-"@umami/react-zen@^0.16.0":
-  version "0.16.0"
-  resolved "https://registry.yarnpkg.com/@umami/react-zen/-/react-zen-0.16.0.tgz#8f14815e175fb93915f9ab48239d138fec1a8561"
-  integrity sha512-NyLV+DKaye9zZ6p+TH7JCoUJX859UxfMFbFq7k0CIGl+n6Eg6ePQyVIm/IGk+wVCgnCxfYQv4VRgj6m4QBhiPw==
+"@umami/react-zen@^0.19.0":
+  version "0.19.0"
+  resolved "https://registry.yarnpkg.com/@umami/react-zen/-/react-zen-0.19.0.tgz#31665002892a56f2d2925bcbeed0c6a853f59838"
+  integrity sha512-TgZzHXW0yRzjO0zeDd9op3TyF+oJDZo8vrd4bgH0B/L4jaqMM+p2UgUykb4/TyXQ9FJ2AHuyuDR8Q1UAeB3IzQ==
   dependencies:
     "@fontsource/jetbrains-mono" "^5.0.18"
     "@mdx-js/loader" "^3.0.0"
@@ -4835,7 +4835,7 @@
     next "15.0.2"
     next-mdx-remote "^5.0.0"
     react "^19.0.0-rc-66855b96-20241106"
-    react-aria-components "^1.2.1"
+    react-aria-components "^1.5.0"
     react-dom "^19.0.0-rc-66855b96-20241106"
     react-hook-form "^7.53.0"
     react-icons "^5.2.1"
@@ -11444,7 +11444,7 @@ randombytes@^2.1.0:
   dependencies:
     safe-buffer "^5.1.0"
 
-react-aria-components@^1.2.1:
+react-aria-components@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/react-aria-components/-/react-aria-components-1.5.0.tgz#9c51ba8427e827d1192f965249e16ff7d34cbb55"
   integrity sha512-wzf0g6cvWrqAJd4FkisAfFnslx6AJREgOd/NEmVE/RGuDxGTzss4awcwbo98rIVmqbTTFApiygy0SyWGrRZfDA==
@@ -12537,16 +12537,7 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -12644,14 +12635,7 @@ stringify-entities@^4.0.0:
     character-entities-html4 "^2.0.0"
     character-entities-legacy "^3.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -13559,7 +13543,7 @@ word-wrap@^1.2.5:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
   integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -13577,15 +13561,6 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

From 6f9beda696e26e4ea1629cfe2fa8385324ab8d7e Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Mon, 25 Nov 2024 14:08:00 -0800
Subject: [PATCH 422/438] Updated packages.

---
 package.json |    4 +-
 yarn.lock    | 2782 +-------------------------------------------------
 2 files changed, 56 insertions(+), 2730 deletions(-)

diff --git a/package.json b/package.json
index 4bc7a57f4f..b0679d7559 100644
--- a/package.json
+++ b/package.json
@@ -63,6 +63,9 @@
   "cacheDirectories": [
     ".next/cache"
   ],
+  "resolutions": {
+    "jackspeak": "2.1.1"
+  },
   "dependencies": {
     "@clickhouse/client": "^1.4.1",
     "@date-fns/utc": "^1.2.0",
@@ -74,7 +77,6 @@
     "@react-spring/web": "^9.7.3",
     "@tanstack/react-query": "^5.28.6",
     "@umami/prisma-client": "^0.14.0",
-    "@umami/react-zen": "^0.19.0",
     "@umami/redis-client": "^0.21.0",
     "chalk": "^4.1.1",
     "chart.js": "^4.4.2",
diff --git a/yarn.lock b/yarn.lock
index 2def5524a4..9e0633efad 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1750,11 +1750,6 @@
   resolved "https://registry.yarnpkg.com/@fontsource/inter/-/inter-4.5.15.tgz#eed1873d68755d3b52d6fcfcfa3493118430a512"
   integrity sha512-FzleM9AxZQK2nqsTDtBiY0PMEVWvnKnuu2i09+p6DHvrHsuucoV2j0tmw+kAT3L4hvsLdAIDv6MdGehsPIdT+Q==
 
-"@fontsource/jetbrains-mono@^5.0.18":
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/@fontsource/jetbrains-mono/-/jetbrains-mono-5.1.1.tgz#451e9a592c46582e61f28311b0dfe5a222f499bf"
-  integrity sha512-5rwvmdQQpXev4LlBX1P+7h2dguu6iwW/9Npjde4+DEq+HgpVJI/7QY8DI1NVVFdvLtXZNP+vO2L/5BQED6FUhA==
-
 "@formatjs/cli@^4.2.29":
   version "4.8.4"
   resolved "https://registry.yarnpkg.com/@formatjs/cli/-/cli-4.8.4.tgz#c4f4e589b8c77c950b659948dbf0e877a4d910fd"
@@ -2054,35 +2049,6 @@
   resolved "https://registry.yarnpkg.com/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.5.tgz#56f00962ff0c4e0eb93d34a047d29fa995e3e342"
   integrity sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==
 
-"@internationalized/date@^3.6.0":
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/@internationalized/date/-/date-3.6.0.tgz#b30d43030bfed1855f20c9503606926d75bfdf64"
-  integrity sha512-+z6ti+CcJnRlLHok/emGEsWQhe7kfSmEW+/6qCzvKY67YPh7YOBfvc7+/+NXq+zJlbArg30tYpqLjNgcAYv2YQ==
-  dependencies:
-    "@swc/helpers" "^0.5.0"
-
-"@internationalized/message@^3.1.6":
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/@internationalized/message/-/message-3.1.6.tgz#e5a832788a17214bfb3e5bbf5f0e23ed2f568ad7"
-  integrity sha512-JxbK3iAcTIeNr1p0WIFg/wQJjIzJt9l/2KNY/48vXV7GRGZSv3zMxJsce008fZclk2cDC8y0Ig3odceHO7EfNQ==
-  dependencies:
-    "@swc/helpers" "^0.5.0"
-    intl-messageformat "^10.1.0"
-
-"@internationalized/number@^3.6.0":
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/@internationalized/number/-/number-3.6.0.tgz#dc6ba20c41b25eb605f1d5cac7d8668e9022c224"
-  integrity sha512-PtrRcJVy7nw++wn4W2OuePQQfTqDzfusSuY1QTtui4wa7r+rGVtR75pO8CyKvHvzyQYi3Q1uO5sY0AsB4e65Bw==
-  dependencies:
-    "@swc/helpers" "^0.5.0"
-
-"@internationalized/string@^3.2.5":
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/@internationalized/string/-/string-3.2.5.tgz#2f387b256e79596a2e62ddd5e15c619fe241189c"
-  integrity sha512-rKs71Zvl2OKOHM+mzAFMIyqR5hI1d1O6BBkMK2/lkfg3fkmVh9Eeg0awcA8W2WqYqDOv6a86DIOlFpggwLtbuw==
-  dependencies:
-    "@swc/helpers" "^0.5.0"
-
 "@isaacs/cliui@^8.0.2":
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
@@ -2364,61 +2330,11 @@
   resolved "https://registry.yarnpkg.com/@kurkle/color/-/color-0.3.2.tgz#5acd38242e8bde4f9986e7913c8fdf49d3aa199f"
   integrity sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==
 
-"@mdx-js/loader@^3.0.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@mdx-js/loader/-/loader-3.1.0.tgz#715fdab11d0c9567e45049c16a7d9c83cec88214"
-  integrity sha512-xU/lwKdOyfXtQGqn3VnJjlDrmKXEvMi1mgYxVmukEUtVycIz1nh7oQ40bKTd4cA7rLStqu0740pnhGYxGoqsCg==
-  dependencies:
-    "@mdx-js/mdx" "^3.0.0"
-    source-map "^0.7.0"
-
-"@mdx-js/mdx@^3.0.0", "@mdx-js/mdx@^3.0.1":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-3.1.0.tgz#10235cab8ad7d356c262e8c21c68df5850a97dc3"
-  integrity sha512-/QxEhPAvGwbQmy1Px8F899L5Uc2KZ6JtXwlCgJmjSTBedwOZkByYcBG4GceIGPXRDsmfxhHazuS+hlOShRLeDw==
-  dependencies:
-    "@types/estree" "^1.0.0"
-    "@types/estree-jsx" "^1.0.0"
-    "@types/hast" "^3.0.0"
-    "@types/mdx" "^2.0.0"
-    collapse-white-space "^2.0.0"
-    devlop "^1.0.0"
-    estree-util-is-identifier-name "^3.0.0"
-    estree-util-scope "^1.0.0"
-    estree-walker "^3.0.0"
-    hast-util-to-jsx-runtime "^2.0.0"
-    markdown-extensions "^2.0.0"
-    recma-build-jsx "^1.0.0"
-    recma-jsx "^1.0.0"
-    recma-stringify "^1.0.0"
-    rehype-recma "^1.0.0"
-    remark-mdx "^3.0.0"
-    remark-parse "^11.0.0"
-    remark-rehype "^11.0.0"
-    source-map "^0.7.0"
-    unified "^11.0.0"
-    unist-util-position-from-estree "^2.0.0"
-    unist-util-stringify-position "^4.0.0"
-    unist-util-visit "^5.0.0"
-    vfile "^6.0.0"
-
-"@mdx-js/react@^3.0.0", "@mdx-js/react@^3.0.1":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@mdx-js/react/-/react-3.1.0.tgz#c4522e335b3897b9a845db1dbdd2f966ae8fb0ed"
-  integrity sha512-QjHtSaoameoalGnKDT3FoIl4+9RwyTmo9ZJGBdLOks/YOiWHoRDI3PUwEzOE7kEmGcV3AFcp9K6dYu9rEuKLAQ==
-  dependencies:
-    "@types/mdx" "^2.0.0"
-
 "@netlify/plugin-nextjs@^5.8.1":
   version "5.8.1"
   resolved "https://registry.yarnpkg.com/@netlify/plugin-nextjs/-/plugin-nextjs-5.8.1.tgz#9da15bb4a13c5644e9b58b968c7da51939206ee4"
   integrity sha512-WB1N0FslhWZ1yAVYTcB6CcFrFOUSQ0O2LfavYZrbAypeNxu2I+oO+cgmhfDgZ8Eoq1g4EMeoIGMkNoZ4ogZTsg==
 
-"@next/env@15.0.2":
-  version "15.0.2"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-15.0.2.tgz#4e921af3faf8a16c6be98ec6a81a32a40050a8b7"
-  integrity sha512-c0Zr0ModK5OX7D4ZV8Jt/wqoXtitLNPwUfG9zElCZztdaZyNVnN40rDXVZ/+FGuR4CcNV5AEfM6N8f+Ener7Dg==
-
 "@next/env@15.0.3":
   version "15.0.3"
   resolved "https://registry.yarnpkg.com/@next/env/-/env-15.0.3.tgz#a2e9bf274743c52b74d30f415f3eba750d51313a"
@@ -2431,88 +2347,41 @@
   dependencies:
     glob "10.3.10"
 
-"@next/mdx@^15.0.2":
-  version "15.0.3"
-  resolved "https://registry.yarnpkg.com/@next/mdx/-/mdx-15.0.3.tgz#a079f79b619682da27251fc804f11d2e492ce479"
-  integrity sha512-EwCJKDeJqfbHbsS7rIdWpKDOZsOPsif9AX4PaIhy5ghSMsZvi+/vIZVc07pZT7BdwCIoL9XM1KZMd/vzxCxF5A==
-  dependencies:
-    source-map "^0.7.0"
-
-"@next/swc-darwin-arm64@15.0.2":
-  version "15.0.2"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.0.2.tgz#66f84083f1f564d09bbacff8d6b24bd833783bef"
-  integrity sha512-GK+8w88z+AFlmt+ondytZo2xpwlfAR8U6CRwXancHImh6EdGfHMIrTSCcx5sOSBei00GyLVL0ioo1JLKTfprgg==
-
 "@next/swc-darwin-arm64@15.0.3":
   version "15.0.3"
   resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.0.3.tgz#4c40c506cf3d4d87da0204f4cccf39e6bdc46a71"
   integrity sha512-s3Q/NOorCsLYdCKvQlWU+a+GeAd3C8Rb3L1YnetsgwXzhc3UTWrtQpB/3eCjFOdGUj5QmXfRak12uocd1ZiiQw==
 
-"@next/swc-darwin-x64@15.0.2":
-  version "15.0.2"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-15.0.2.tgz#1aef085642f363b89acf264cf1b9848632b52914"
-  integrity sha512-KUpBVxIbjzFiUZhiLIpJiBoelqzQtVZbdNNsehhUn36e2YzKHphnK8eTUW1s/4aPy5kH/UTid8IuVbaOpedhpw==
-
 "@next/swc-darwin-x64@15.0.3":
   version "15.0.3"
   resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-15.0.3.tgz#8e06cacae3dae279744f9fbe88dea679ec2c1ca3"
   integrity sha512-Zxl/TwyXVZPCFSf0u2BNj5sE0F2uR6iSKxWpq4Wlk/Sv9Ob6YCKByQTkV2y6BCic+fkabp9190hyrDdPA/dNrw==
 
-"@next/swc-linux-arm64-gnu@15.0.2":
-  version "15.0.2"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.0.2.tgz#203b41742e60642587e004773a8c203053b6832e"
-  integrity sha512-9J7TPEcHNAZvwxXRzOtiUvwtTD+fmuY0l7RErf8Yyc7kMpE47MIQakl+3jecmkhOoIyi/Rp+ddq7j4wG6JDskQ==
-
 "@next/swc-linux-arm64-gnu@15.0.3":
   version "15.0.3"
   resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.0.3.tgz#c144ad1f21091b9c6e1e330ecc2d56188763191d"
   integrity sha512-T5+gg2EwpsY3OoaLxUIofmMb7ohAUlcNZW0fPQ6YAutaWJaxt1Z1h+8zdl4FRIOr5ABAAhXtBcpkZNwUcKI2fw==
 
-"@next/swc-linux-arm64-musl@15.0.2":
-  version "15.0.2"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.0.2.tgz#d256932ec11051f376348862508be9017b23f3d8"
-  integrity sha512-BjH4ZSzJIoTTZRh6rG+a/Ry4SW0HlizcPorqNBixBWc3wtQtj4Sn9FnRZe22QqrPnzoaW0ctvSz4FaH4eGKMww==
-
 "@next/swc-linux-arm64-musl@15.0.3":
   version "15.0.3"
   resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.0.3.tgz#3ccb71c6703bf421332f177d1bb0e10528bc73a2"
   integrity sha512-WkAk6R60mwDjH4lG/JBpb2xHl2/0Vj0ZRu1TIzWuOYfQ9tt9NFsIinI1Epma77JVgy81F32X/AeD+B2cBu/YQA==
 
-"@next/swc-linux-x64-gnu@15.0.2":
-  version "15.0.2"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.0.2.tgz#06c52a23a7e13d5ccd0ded1cf295b32df58e0932"
-  integrity sha512-i3U2TcHgo26sIhcwX/Rshz6avM6nizrZPvrDVDY1bXcLH1ndjbO8zuC7RoHp0NSK7wjJMPYzm7NYL1ksSKFreA==
-
 "@next/swc-linux-x64-gnu@15.0.3":
   version "15.0.3"
   resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.0.3.tgz#b90aa9b07001b4000427c35ab347a9273cbeebb3"
   integrity sha512-gWL/Cta1aPVqIGgDb6nxkqy06DkwJ9gAnKORdHWX1QBbSZZB+biFYPFti8aKIQL7otCE1pjyPaXpFzGeG2OS2w==
 
-"@next/swc-linux-x64-musl@15.0.2":
-  version "15.0.2"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.0.2.tgz#eb70a81a1c66d4935d50bf6fe1021e440f27fe9f"
-  integrity sha512-AMfZfSVOIR8fa+TXlAooByEF4OB00wqnms1sJ1v+iu8ivwvtPvnkwdzzFMpsK5jA2S9oNeeQ04egIWVb4QWmtQ==
-
 "@next/swc-linux-x64-musl@15.0.3":
   version "15.0.3"
   resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.0.3.tgz#0ac9724fb44718fc97bfea971ac3fe17e486590e"
   integrity sha512-QQEMwFd8r7C0GxQS62Zcdy6GKx999I/rTO2ubdXEe+MlZk9ZiinsrjwoiBL5/57tfyjikgh6GOU2WRQVUej3UA==
 
-"@next/swc-win32-arm64-msvc@15.0.2":
-  version "15.0.2"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.0.2.tgz#29a763bdc3a1281633af10cf8428e916e02f079a"
-  integrity sha512-JkXysDT0/hEY47O+Hvs8PbZAeiCQVxKfGtr4GUpNAhlG2E0Mkjibuo8ryGD29Qb5a3IOnKYNoZlh/MyKd2Nbww==
-
 "@next/swc-win32-arm64-msvc@15.0.3":
   version "15.0.3"
   resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.0.3.tgz#932437d4cf27814e963ba8ae5f033b4421fab9ca"
   integrity sha512-9TEp47AAd/ms9fPNgtgnT7F3M1Hf7koIYYWCMQ9neOwjbVWJsHZxrFbI3iEDJ8rf1TDGpmHbKxXf2IFpAvheIQ==
 
-"@next/swc-win32-x64-msvc@15.0.2":
-  version "15.0.2"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.0.2.tgz#0f70d8146990886a85099875353539fc6dd68338"
-  integrity sha512-foaUL0NqJY/dX0Pi/UcZm5zsmSk5MtP/gxx3xOPyREkMFN+CTjctPfu3QaqrQHinaKdPnMWPJDKt4VjDfTBe/Q==
-
 "@next/swc-win32-x64-msvc@15.0.3":
   version "15.0.3"
   resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.0.3.tgz#940a6f7b370cdde0cc67eabe945d9e6d97e0be9f"
@@ -2595,767 +2464,6 @@
   dependencies:
     "@prisma/debug" "5.22.0"
 
-"@radix-ui/primitive@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/primitive/-/primitive-1.1.0.tgz#42ef83b3b56dccad5d703ae8c42919a68798bbe2"
-  integrity sha512-4Z8dn6Upk0qk4P74xBhZ6Hd/w0mPEzOOLxy4xiPXOXqjF7jZS0VAKk7/x/H6FyY2zCkYJqePf1G5KmkmNJ4RBA==
-
-"@radix-ui/react-collection@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-collection/-/react-collection-1.1.0.tgz#f18af78e46454a2360d103c2251773028b7724ed"
-  integrity sha512-GZsZslMJEyo1VKm5L1ZJY8tGDxZNPAoUeQUIbKeJfoi7Q4kmig5AsgLMYYuyYbfjd8fBmFORAIwYAkXMnXZgZw==
-  dependencies:
-    "@radix-ui/react-compose-refs" "1.1.0"
-    "@radix-ui/react-context" "1.1.0"
-    "@radix-ui/react-primitive" "2.0.0"
-    "@radix-ui/react-slot" "1.1.0"
-
-"@radix-ui/react-compose-refs@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.0.tgz#656432461fc8283d7b591dcf0d79152fae9ecc74"
-  integrity sha512-b4inOtiaOnYf9KWyO3jAeeCG6FeyfY6ldiEPanbUjWd+xIk5wZeHa8yVwmrJ2vderhu/BQvzCrJI0lHd+wIiqw==
-
-"@radix-ui/react-context@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-context/-/react-context-1.1.0.tgz#6df8d983546cfd1999c8512f3a8ad85a6e7fcee8"
-  integrity sha512-OKrckBy+sMEgYM/sMmqmErVn0kZqrHPJze+Ql3DzYsDDp0hl0L62nx/2122/Bvps1qz645jlcu2tD9lrRSdf8A==
-
-"@radix-ui/react-context@1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-context/-/react-context-1.1.1.tgz#82074aa83a472353bb22e86f11bcbd1c61c4c71a"
-  integrity sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q==
-
-"@radix-ui/react-dismissable-layer@1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.1.tgz#cbdcb739c5403382bdde5f9243042ba643883396"
-  integrity sha512-QSxg29lfr/xcev6kSz7MAlmDnzbP1eI/Dwn3Tp1ip0KT5CUELsxkekFEMVBEoykI3oV39hKT4TKZzBNMbcTZYQ==
-  dependencies:
-    "@radix-ui/primitive" "1.1.0"
-    "@radix-ui/react-compose-refs" "1.1.0"
-    "@radix-ui/react-primitive" "2.0.0"
-    "@radix-ui/react-use-callback-ref" "1.1.0"
-    "@radix-ui/react-use-escape-keydown" "1.1.0"
-
-"@radix-ui/react-portal@1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-portal/-/react-portal-1.1.2.tgz#51eb46dae7505074b306ebcb985bf65cc547d74e"
-  integrity sha512-WeDYLGPxJb/5EGBoedyJbT0MpoULmwnIPMJMSldkuiMsBAv7N1cRdsTWZWht9vpPOiN3qyiGAtbK2is47/uMFg==
-  dependencies:
-    "@radix-ui/react-primitive" "2.0.0"
-    "@radix-ui/react-use-layout-effect" "1.1.0"
-
-"@radix-ui/react-presence@1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-presence/-/react-presence-1.1.1.tgz#98aba423dba5e0c687a782c0669dcd99de17f9b1"
-  integrity sha512-IeFXVi4YS1K0wVZzXNrbaaUvIJ3qdY+/Ih4eHFhWA9SwGR9UDX7Ck8abvL57C4cv3wwMvUE0OG69Qc3NCcTe/A==
-  dependencies:
-    "@radix-ui/react-compose-refs" "1.1.0"
-    "@radix-ui/react-use-layout-effect" "1.1.0"
-
-"@radix-ui/react-primitive@2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-primitive/-/react-primitive-2.0.0.tgz#fe05715faa9203a223ccc0be15dc44b9f9822884"
-  integrity sha512-ZSpFm0/uHa8zTvKBDjLFWLo8dkr4MBsiDLz0g3gMUwqgLHz9rTaRRGYDgvZPtBJgYCBKXkS9fzmoySgr8CO6Cw==
-  dependencies:
-    "@radix-ui/react-slot" "1.1.0"
-
-"@radix-ui/react-slot@1.1.0", "@radix-ui/react-slot@^1.0.2":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-1.1.0.tgz#7c5e48c36ef5496d97b08f1357bb26ed7c714b84"
-  integrity sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==
-  dependencies:
-    "@radix-ui/react-compose-refs" "1.1.0"
-
-"@radix-ui/react-toast@^1.2.1":
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-toast/-/react-toast-1.2.2.tgz#fdd8ed0b80f47d6631dfd90278fee6debc06bf33"
-  integrity sha512-Z6pqSzmAP/bFJoqMAston4eSNa+ud44NSZTiZUmUen+IOZ5nBY8kzuU5WDBVyFXPtcW6yUalOHsxM/BP6Sv8ww==
-  dependencies:
-    "@radix-ui/primitive" "1.1.0"
-    "@radix-ui/react-collection" "1.1.0"
-    "@radix-ui/react-compose-refs" "1.1.0"
-    "@radix-ui/react-context" "1.1.1"
-    "@radix-ui/react-dismissable-layer" "1.1.1"
-    "@radix-ui/react-portal" "1.1.2"
-    "@radix-ui/react-presence" "1.1.1"
-    "@radix-ui/react-primitive" "2.0.0"
-    "@radix-ui/react-use-callback-ref" "1.1.0"
-    "@radix-ui/react-use-controllable-state" "1.1.0"
-    "@radix-ui/react-use-layout-effect" "1.1.0"
-    "@radix-ui/react-visually-hidden" "1.1.0"
-
-"@radix-ui/react-use-callback-ref@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz#bce938ca413675bc937944b0d01ef6f4a6dc5bf1"
-  integrity sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==
-
-"@radix-ui/react-use-controllable-state@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.1.0.tgz#1321446857bb786917df54c0d4d084877aab04b0"
-  integrity sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==
-  dependencies:
-    "@radix-ui/react-use-callback-ref" "1.1.0"
-
-"@radix-ui/react-use-escape-keydown@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.0.tgz#31a5b87c3b726504b74e05dac1edce7437b98754"
-  integrity sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==
-  dependencies:
-    "@radix-ui/react-use-callback-ref" "1.1.0"
-
-"@radix-ui/react-use-layout-effect@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.0.tgz#3c2c8ce04827b26a39e442ff4888d9212268bd27"
-  integrity sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==
-
-"@radix-ui/react-visually-hidden@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.1.0.tgz#ad47a8572580f7034b3807c8e6740cd41038a5a2"
-  integrity sha512-N8MDZqtgCgG5S3aV60INAB475osJousYpZ4cTJ2cFbMpdHS5Y6loLTH8LPtkj2QN0x93J30HT/M3qJXM0+lyeQ==
-  dependencies:
-    "@radix-ui/react-primitive" "2.0.0"
-
-"@react-aria/breadcrumbs@^3.5.19":
-  version "3.5.19"
-  resolved "https://registry.yarnpkg.com/@react-aria/breadcrumbs/-/breadcrumbs-3.5.19.tgz#e0a67e0e7017089fa0ee5eadd51a6da505b94cd4"
-  integrity sha512-mVngOPFYVVhec89rf/CiYQGTfaLRfHFtX+JQwY7sNYNqSA+gO8p4lNARe3Be6bJPgH+LUQuruIY9/ZDL6LT3HA==
-  dependencies:
-    "@react-aria/i18n" "^3.12.4"
-    "@react-aria/link" "^3.7.7"
-    "@react-aria/utils" "^3.26.0"
-    "@react-types/breadcrumbs" "^3.7.9"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/button@^3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@react-aria/button/-/button-3.11.0.tgz#cb7790db23949ec9c1e698fa531ee5471cf2b515"
-  integrity sha512-b37eIV6IW11KmNIAm65F3SEl2/mgj5BrHIysW6smZX3KoKWTGYsYfcQkmtNgY0GOSFfDxMCoolsZ6mxC00nSDA==
-  dependencies:
-    "@react-aria/focus" "^3.19.0"
-    "@react-aria/interactions" "^3.22.5"
-    "@react-aria/toolbar" "3.0.0-beta.11"
-    "@react-aria/utils" "^3.26.0"
-    "@react-stately/toggle" "^3.8.0"
-    "@react-types/button" "^3.10.1"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/calendar@^3.6.0":
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/@react-aria/calendar/-/calendar-3.6.0.tgz#d5e7cf4beb8724648a7042dbc5bb519de4351906"
-  integrity sha512-tZ3nd5DP8uxckbj83Pt+4RqgcTWDlGi7njzc7QqFOG2ApfnYDUXbIpb/Q4KY6JNlJskG8q33wo0XfOwNy8J+eg==
-  dependencies:
-    "@internationalized/date" "^3.6.0"
-    "@react-aria/i18n" "^3.12.4"
-    "@react-aria/interactions" "^3.22.5"
-    "@react-aria/live-announcer" "^3.4.1"
-    "@react-aria/utils" "^3.26.0"
-    "@react-stately/calendar" "^3.6.0"
-    "@react-types/button" "^3.10.1"
-    "@react-types/calendar" "^3.5.0"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/checkbox@^3.15.0":
-  version "3.15.0"
-  resolved "https://registry.yarnpkg.com/@react-aria/checkbox/-/checkbox-3.15.0.tgz#4d224b71c65d6a079ff935ab22c806323f84b746"
-  integrity sha512-z/8xd4em7o0MroBXwkkwv7QRwiJaA1FwqMhRUb7iqtBGP2oSytBEDf0N7L09oci32a1P4ZPz2rMK5GlLh/PD6g==
-  dependencies:
-    "@react-aria/form" "^3.0.11"
-    "@react-aria/interactions" "^3.22.5"
-    "@react-aria/label" "^3.7.13"
-    "@react-aria/toggle" "^3.10.10"
-    "@react-aria/utils" "^3.26.0"
-    "@react-stately/checkbox" "^3.6.10"
-    "@react-stately/form" "^3.1.0"
-    "@react-stately/toggle" "^3.8.0"
-    "@react-types/checkbox" "^3.9.0"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/collections@3.0.0-alpha.6":
-  version "3.0.0-alpha.6"
-  resolved "https://registry.yarnpkg.com/@react-aria/collections/-/collections-3.0.0-alpha.6.tgz#2fab7192ba4ac1452ad01b2c5456195a16f353e1"
-  integrity sha512-A+7Eap/zvsghMb5/C3EAPn41axSzRhtX2glQRXSBj1mK31CTPCZ9BhrMIMC5DL7ZnfA7C+Ysilo9nI2YQh5PMg==
-  dependencies:
-    "@react-aria/ssr" "^3.9.7"
-    "@react-aria/utils" "^3.26.0"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-    use-sync-external-store "^1.2.0"
-
-"@react-aria/color@^3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@react-aria/color/-/color-3.0.2.tgz#3abeb7e9fa9756e1823e513921e04dcaa47b25cc"
-  integrity sha512-dSM5qQRcR1gRGYCBw0IGRmc29gjfoht3cQleKb8MMNcgHYa2oi5VdCs2yKXmYFwwVC6uPtnlNy9S6e0spqdr+w==
-  dependencies:
-    "@react-aria/i18n" "^3.12.4"
-    "@react-aria/interactions" "^3.22.5"
-    "@react-aria/numberfield" "^3.11.9"
-    "@react-aria/slider" "^3.7.14"
-    "@react-aria/spinbutton" "^3.6.10"
-    "@react-aria/textfield" "^3.15.0"
-    "@react-aria/utils" "^3.26.0"
-    "@react-aria/visually-hidden" "^3.8.18"
-    "@react-stately/color" "^3.8.1"
-    "@react-stately/form" "^3.1.0"
-    "@react-types/color" "^3.0.1"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/combobox@^3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@react-aria/combobox/-/combobox-3.11.0.tgz#9489aaad342d092bf1fe1c4c382f6714316ac1c4"
-  integrity sha512-s88YMmPkMO1WSoiH1KIyZDLJqUwvM2wHXXakj3cYw1tBHGo4rOUFq+JWQIbM5EDO4HOR4AUUqzIUd0NO7t3zyg==
-  dependencies:
-    "@react-aria/i18n" "^3.12.4"
-    "@react-aria/listbox" "^3.13.6"
-    "@react-aria/live-announcer" "^3.4.1"
-    "@react-aria/menu" "^3.16.0"
-    "@react-aria/overlays" "^3.24.0"
-    "@react-aria/selection" "^3.21.0"
-    "@react-aria/textfield" "^3.15.0"
-    "@react-aria/utils" "^3.26.0"
-    "@react-stately/collections" "^3.12.0"
-    "@react-stately/combobox" "^3.10.1"
-    "@react-stately/form" "^3.1.0"
-    "@react-types/button" "^3.10.1"
-    "@react-types/combobox" "^3.13.1"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/datepicker@^3.12.0":
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/@react-aria/datepicker/-/datepicker-3.12.0.tgz#a82ff3ebd3ead20a00096d082c1e6be47bbd5886"
-  integrity sha512-VYNXioLfddIHpwQx211+rTYuunDmI7VHWBRetCpH3loIsVFuhFSRchTQpclAzxolO3g0vO7pMVj9VYt7Swp6kg==
-  dependencies:
-    "@internationalized/date" "^3.6.0"
-    "@internationalized/number" "^3.6.0"
-    "@internationalized/string" "^3.2.5"
-    "@react-aria/focus" "^3.19.0"
-    "@react-aria/form" "^3.0.11"
-    "@react-aria/i18n" "^3.12.4"
-    "@react-aria/interactions" "^3.22.5"
-    "@react-aria/label" "^3.7.13"
-    "@react-aria/spinbutton" "^3.6.10"
-    "@react-aria/utils" "^3.26.0"
-    "@react-stately/datepicker" "^3.11.0"
-    "@react-stately/form" "^3.1.0"
-    "@react-types/button" "^3.10.1"
-    "@react-types/calendar" "^3.5.0"
-    "@react-types/datepicker" "^3.9.0"
-    "@react-types/dialog" "^3.5.14"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/dialog@^3.5.20":
-  version "3.5.20"
-  resolved "https://registry.yarnpkg.com/@react-aria/dialog/-/dialog-3.5.20.tgz#6404d2c1bab1ea9ecce3ebc7adce64733ecea985"
-  integrity sha512-l0GZVLgeOd3kL3Yj8xQW7wN3gn9WW3RLd/SGI9t7ciTq+I/FhftjXCWzXLlOCCTLMf+gv7eazecECtmoWUaZWQ==
-  dependencies:
-    "@react-aria/focus" "^3.19.0"
-    "@react-aria/overlays" "^3.24.0"
-    "@react-aria/utils" "^3.26.0"
-    "@react-types/dialog" "^3.5.14"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/disclosure@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@react-aria/disclosure/-/disclosure-3.0.0.tgz#36342210740fd659ad97678fe5a57896a7fcbd10"
-  integrity sha512-xO9QTQSvymujTjCs1iCQ4+dKZvtF/rVVaFZBKlUtqIqwTHMdqeZu4fh5miLEnTyVLNHMGzLrFggsd8Q+niC9Og==
-  dependencies:
-    "@react-aria/ssr" "^3.9.7"
-    "@react-aria/utils" "^3.26.0"
-    "@react-stately/disclosure" "^3.0.0"
-    "@react-types/button" "^3.10.1"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/dnd@^3.8.0":
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/@react-aria/dnd/-/dnd-3.8.0.tgz#7e3bfa3f509efeb9a872686e65641a719684e95a"
-  integrity sha512-JiqHY3E9fDU5Kb4gN22cuK6QNlpMCGe6ngR/BV+Q8mLEsdoWcoUAYOtYXVNNTRvCdVbEWI87FUU+ThyPpoDhNQ==
-  dependencies:
-    "@internationalized/string" "^3.2.5"
-    "@react-aria/i18n" "^3.12.4"
-    "@react-aria/interactions" "^3.22.5"
-    "@react-aria/live-announcer" "^3.4.1"
-    "@react-aria/overlays" "^3.24.0"
-    "@react-aria/utils" "^3.26.0"
-    "@react-stately/dnd" "^3.5.0"
-    "@react-types/button" "^3.10.1"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/focus@^3.19.0":
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/@react-aria/focus/-/focus-3.19.0.tgz#82b9a5b83f023b943a7970df3d059f49d61df05d"
-  integrity sha512-hPF9EXoUQeQl1Y21/rbV2H4FdUR2v+4/I0/vB+8U3bT1CJ+1AFj1hc/rqx2DqEwDlEwOHN+E4+mRahQmlybq0A==
-  dependencies:
-    "@react-aria/interactions" "^3.22.5"
-    "@react-aria/utils" "^3.26.0"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-    clsx "^2.0.0"
-
-"@react-aria/form@^3.0.11":
-  version "3.0.11"
-  resolved "https://registry.yarnpkg.com/@react-aria/form/-/form-3.0.11.tgz#84511874e1fad5f981bae97ebd4d549923849455"
-  integrity sha512-oXzjTiwVuuWjZ8muU0hp3BrDH5qjVctLOF50mjPvqUbvXQTHhoDxWweyIXPQjGshaqBd2w4pWaE4A2rG2O/apw==
-  dependencies:
-    "@react-aria/interactions" "^3.22.5"
-    "@react-aria/utils" "^3.26.0"
-    "@react-stately/form" "^3.1.0"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/grid@^3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@react-aria/grid/-/grid-3.11.0.tgz#5ad6596745482e109b3b47f1fec7ce372f632707"
-  integrity sha512-lN5FpQgu2Rq0CzTPWmzRpq6QHcMmzsXYeClsgO3108uVp1/genBNAObYVTxGOKe/jb9q99trz8EtIn05O6KN1g==
-  dependencies:
-    "@react-aria/focus" "^3.19.0"
-    "@react-aria/i18n" "^3.12.4"
-    "@react-aria/interactions" "^3.22.5"
-    "@react-aria/live-announcer" "^3.4.1"
-    "@react-aria/selection" "^3.21.0"
-    "@react-aria/utils" "^3.26.0"
-    "@react-stately/collections" "^3.12.0"
-    "@react-stately/grid" "^3.10.0"
-    "@react-stately/selection" "^3.18.0"
-    "@react-types/checkbox" "^3.9.0"
-    "@react-types/grid" "^3.2.10"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/gridlist@^3.10.0":
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/@react-aria/gridlist/-/gridlist-3.10.0.tgz#adc2f9896a2759bb29cec428378c8ac85235a110"
-  integrity sha512-UcblfSZ7kJBrjg9mQ5VbnRevN81UiYB4NuL5PwIpBpridO7tnl4ew6+96PYU7Wj1chHhPS3x0b0zmuSVN7A0LA==
-  dependencies:
-    "@react-aria/focus" "^3.19.0"
-    "@react-aria/grid" "^3.11.0"
-    "@react-aria/i18n" "^3.12.4"
-    "@react-aria/interactions" "^3.22.5"
-    "@react-aria/selection" "^3.21.0"
-    "@react-aria/utils" "^3.26.0"
-    "@react-stately/collections" "^3.12.0"
-    "@react-stately/list" "^3.11.1"
-    "@react-stately/tree" "^3.8.6"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/i18n@^3.12.4":
-  version "3.12.4"
-  resolved "https://registry.yarnpkg.com/@react-aria/i18n/-/i18n-3.12.4.tgz#4520ce48a1b6ebe4aa470d72eba300e65de01814"
-  integrity sha512-j9+UL3q0Ls8MhXV9gtnKlyozq4aM95YywXqnmJtzT1rYeBx7w28hooqrWkCYLfqr4OIryv1KUnPiCSLwC2OC7w==
-  dependencies:
-    "@internationalized/date" "^3.6.0"
-    "@internationalized/message" "^3.1.6"
-    "@internationalized/number" "^3.6.0"
-    "@internationalized/string" "^3.2.5"
-    "@react-aria/ssr" "^3.9.7"
-    "@react-aria/utils" "^3.26.0"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/interactions@^3.22.5":
-  version "3.22.5"
-  resolved "https://registry.yarnpkg.com/@react-aria/interactions/-/interactions-3.22.5.tgz#9cd8c93b8b6988f1d315d3efb450119d1432bbb8"
-  integrity sha512-kMwiAD9E0TQp+XNnOs13yVJghiy8ET8L0cbkeuTgNI96sOAp/63EJ1FSrDf17iD8sdjt41LafwX/dKXW9nCcLQ==
-  dependencies:
-    "@react-aria/ssr" "^3.9.7"
-    "@react-aria/utils" "^3.26.0"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/label@^3.7.13":
-  version "3.7.13"
-  resolved "https://registry.yarnpkg.com/@react-aria/label/-/label-3.7.13.tgz#9e7153a1ded878b5147d141effc3eb226f3c6c1f"
-  integrity sha512-brSAXZVTey5RG/Ex6mTrV/9IhGSQFU4Al34qmjEDho+Z2qT4oPwf8k7TRXWWqzOU0ugYxekYbsLd2zlN3XvWcg==
-  dependencies:
-    "@react-aria/utils" "^3.26.0"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/link@^3.7.7":
-  version "3.7.7"
-  resolved "https://registry.yarnpkg.com/@react-aria/link/-/link-3.7.7.tgz#5879c75068b63d55353b3e96b4fda0fa8753d1ad"
-  integrity sha512-eVBRcHKhNSsATYWv5wRnZXRqPVcKAWWakyvfrYePIKpC3s4BaHZyTGYdefk8ZwZdEOuQZBqLMnjW80q1uhtkuA==
-  dependencies:
-    "@react-aria/focus" "^3.19.0"
-    "@react-aria/interactions" "^3.22.5"
-    "@react-aria/utils" "^3.26.0"
-    "@react-types/link" "^3.5.9"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/listbox@^3.13.6":
-  version "3.13.6"
-  resolved "https://registry.yarnpkg.com/@react-aria/listbox/-/listbox-3.13.6.tgz#43ff24f4a6540a9952729833201460fa6ab081f7"
-  integrity sha512-6hEXEXIZVau9lgBZ4VVjFR3JnGU+fJaPmV3HP0UZ2ucUptfG0MZo24cn+ZQJsWiuaCfNFv5b8qribiv+BcO+Kg==
-  dependencies:
-    "@react-aria/interactions" "^3.22.5"
-    "@react-aria/label" "^3.7.13"
-    "@react-aria/selection" "^3.21.0"
-    "@react-aria/utils" "^3.26.0"
-    "@react-stately/collections" "^3.12.0"
-    "@react-stately/list" "^3.11.1"
-    "@react-types/listbox" "^3.5.3"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/live-announcer@^3.4.1":
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/@react-aria/live-announcer/-/live-announcer-3.4.1.tgz#efedf706b23f6e1b526a3a35c14c202ac3e68487"
-  integrity sha512-4X2mcxgqLvvkqxv2l1n00jTzUxxe0kkLiapBGH1LHX/CxA1oQcHDqv8etJ2ZOwmS/MSBBiWnv3DwYHDOF6ubig==
-  dependencies:
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/menu@^3.16.0":
-  version "3.16.0"
-  resolved "https://registry.yarnpkg.com/@react-aria/menu/-/menu-3.16.0.tgz#119e562806e9f8a39fd468ab790d788905c6df83"
-  integrity sha512-TNk+Vd3TbpBPUxEloAdHRTaRxf9JBK7YmkHYiq0Yj5Lc22KS0E2eTyhpPM9xJvEWN2TlC5TEvNfdyui2kYWFFQ==
-  dependencies:
-    "@react-aria/focus" "^3.19.0"
-    "@react-aria/i18n" "^3.12.4"
-    "@react-aria/interactions" "^3.22.5"
-    "@react-aria/overlays" "^3.24.0"
-    "@react-aria/selection" "^3.21.0"
-    "@react-aria/utils" "^3.26.0"
-    "@react-stately/collections" "^3.12.0"
-    "@react-stately/menu" "^3.9.0"
-    "@react-stately/selection" "^3.18.0"
-    "@react-stately/tree" "^3.8.6"
-    "@react-types/button" "^3.10.1"
-    "@react-types/menu" "^3.9.13"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/meter@^3.4.18":
-  version "3.4.18"
-  resolved "https://registry.yarnpkg.com/@react-aria/meter/-/meter-3.4.18.tgz#ff3f85f32ea30285e7e73386a641efdcedd88205"
-  integrity sha512-tTX3LLlmDIHqrC42dkdf+upb1c4UbhlpZ52gqB64lZD4OD4HE+vMTwNSe+7MRKMLvcdKPWCRC35PnxIHZ15kfQ==
-  dependencies:
-    "@react-aria/progress" "^3.4.18"
-    "@react-types/meter" "^3.4.5"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/numberfield@^3.11.9":
-  version "3.11.9"
-  resolved "https://registry.yarnpkg.com/@react-aria/numberfield/-/numberfield-3.11.9.tgz#175f801b18740534dca023cfd9ce0349eff940b0"
-  integrity sha512-3tiGPx2y4zyOV7PmdBASes99ZZsFTZAJTnU45Z+p1CW4131lw7y2ZhbojBl7U6DaXAJvi1z6zY6cq2UE9w5a0Q==
-  dependencies:
-    "@react-aria/i18n" "^3.12.4"
-    "@react-aria/interactions" "^3.22.5"
-    "@react-aria/spinbutton" "^3.6.10"
-    "@react-aria/textfield" "^3.15.0"
-    "@react-aria/utils" "^3.26.0"
-    "@react-stately/form" "^3.1.0"
-    "@react-stately/numberfield" "^3.9.8"
-    "@react-types/button" "^3.10.1"
-    "@react-types/numberfield" "^3.8.7"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/overlays@^3.24.0":
-  version "3.24.0"
-  resolved "https://registry.yarnpkg.com/@react-aria/overlays/-/overlays-3.24.0.tgz#7f97cd12506961abfab3ae653822cea05d1cacd3"
-  integrity sha512-0kAXBsMNTc/a3M07tK9Cdt/ea8CxTAEJ223g8YgqImlmoBBYAL7dl5G01IOj67TM64uWPTmZrOklBchHWgEm3A==
-  dependencies:
-    "@react-aria/focus" "^3.19.0"
-    "@react-aria/i18n" "^3.12.4"
-    "@react-aria/interactions" "^3.22.5"
-    "@react-aria/ssr" "^3.9.7"
-    "@react-aria/utils" "^3.26.0"
-    "@react-aria/visually-hidden" "^3.8.18"
-    "@react-stately/overlays" "^3.6.12"
-    "@react-types/button" "^3.10.1"
-    "@react-types/overlays" "^3.8.11"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/progress@^3.4.18":
-  version "3.4.18"
-  resolved "https://registry.yarnpkg.com/@react-aria/progress/-/progress-3.4.18.tgz#948859ce1b0e13d935da7d4cbe6812d451472fe4"
-  integrity sha512-FOLgJ9t9i1u3oAAimybJG6r7/soNPBnJfWo4Yr6MmaUv90qVGa1h6kiuM5m9H/bm5JobAebhdfHit9lFlgsCmg==
-  dependencies:
-    "@react-aria/i18n" "^3.12.4"
-    "@react-aria/label" "^3.7.13"
-    "@react-aria/utils" "^3.26.0"
-    "@react-types/progress" "^3.5.8"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/radio@^3.10.10":
-  version "3.10.10"
-  resolved "https://registry.yarnpkg.com/@react-aria/radio/-/radio-3.10.10.tgz#18e2811fb3e72298414c880bd9405ea3f1d83f1f"
-  integrity sha512-NVdeOVrsrHgSfwL2jWCCXFsWZb+RMRZErj5vthHQW4nkHECGOzeX56VaLWTSvdoCPqi9wdIX8A6K9peeAIgxzA==
-  dependencies:
-    "@react-aria/focus" "^3.19.0"
-    "@react-aria/form" "^3.0.11"
-    "@react-aria/i18n" "^3.12.4"
-    "@react-aria/interactions" "^3.22.5"
-    "@react-aria/label" "^3.7.13"
-    "@react-aria/utils" "^3.26.0"
-    "@react-stately/radio" "^3.10.9"
-    "@react-types/radio" "^3.8.5"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/searchfield@^3.7.11":
-  version "3.7.11"
-  resolved "https://registry.yarnpkg.com/@react-aria/searchfield/-/searchfield-3.7.11.tgz#2be234280cc4fb58a316db6ba1f95ea34754c043"
-  integrity sha512-wFf6QxtBFfoxy0ANxI0+ftFEBGynVCY0+ce4H4Y9LpUTQsIKMp3sdc7LoUFORWw5Yee6Eid5cFPQX0Ymnk+ZJg==
-  dependencies:
-    "@react-aria/i18n" "^3.12.4"
-    "@react-aria/textfield" "^3.15.0"
-    "@react-aria/utils" "^3.26.0"
-    "@react-stately/searchfield" "^3.5.8"
-    "@react-types/button" "^3.10.1"
-    "@react-types/searchfield" "^3.5.10"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/select@^3.15.0":
-  version "3.15.0"
-  resolved "https://registry.yarnpkg.com/@react-aria/select/-/select-3.15.0.tgz#e0b955ed908039f734805e852b58dec4b159adc9"
-  integrity sha512-zgBOUNy81aJplfc3NKDJMv8HkXjBGzaFF3XDzNfW8vJ7nD9rcTRUN5SQ1XCEnKMv12B/Euk9zt6kd+tX0wk1vQ==
-  dependencies:
-    "@react-aria/form" "^3.0.11"
-    "@react-aria/i18n" "^3.12.4"
-    "@react-aria/interactions" "^3.22.5"
-    "@react-aria/label" "^3.7.13"
-    "@react-aria/listbox" "^3.13.6"
-    "@react-aria/menu" "^3.16.0"
-    "@react-aria/selection" "^3.21.0"
-    "@react-aria/utils" "^3.26.0"
-    "@react-aria/visually-hidden" "^3.8.18"
-    "@react-stately/select" "^3.6.9"
-    "@react-types/button" "^3.10.1"
-    "@react-types/select" "^3.9.8"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/selection@^3.21.0":
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/@react-aria/selection/-/selection-3.21.0.tgz#c5660e73a38db5e3e1cdc722e408b4489f5f589a"
-  integrity sha512-52JJ6hlPcM+gt0VV3DBmz6Kj1YAJr13TfutrKfGWcK36LvNCBm1j0N+TDqbdnlp8Nue6w0+5FIwZq44XPYiBGg==
-  dependencies:
-    "@react-aria/focus" "^3.19.0"
-    "@react-aria/i18n" "^3.12.4"
-    "@react-aria/interactions" "^3.22.5"
-    "@react-aria/utils" "^3.26.0"
-    "@react-stately/selection" "^3.18.0"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/separator@^3.4.4":
-  version "3.4.4"
-  resolved "https://registry.yarnpkg.com/@react-aria/separator/-/separator-3.4.4.tgz#7975177d256d8e864625d9823bf7a6de5a6b6460"
-  integrity sha512-dH+qt0Mdh0nhKXCHW6AR4DF8DKLUBP26QYWaoThPdBwIpypH/JVKowpPtWms1P4b36U6XzHXHnTTEn/ZVoCqNA==
-  dependencies:
-    "@react-aria/utils" "^3.26.0"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/slider@^3.7.14":
-  version "3.7.14"
-  resolved "https://registry.yarnpkg.com/@react-aria/slider/-/slider-3.7.14.tgz#25a362725d6cd71e9b86477362a36c847c73384e"
-  integrity sha512-7rOiKjLkEZ0j7mPMlwrqivc+K4OSfL14slaQp06GHRiJkhiWXh2/drPe15hgNq55HmBQBpA0umKMkJcqVgmXPA==
-  dependencies:
-    "@react-aria/focus" "^3.19.0"
-    "@react-aria/i18n" "^3.12.4"
-    "@react-aria/interactions" "^3.22.5"
-    "@react-aria/label" "^3.7.13"
-    "@react-aria/utils" "^3.26.0"
-    "@react-stately/slider" "^3.6.0"
-    "@react-types/shared" "^3.26.0"
-    "@react-types/slider" "^3.7.7"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/spinbutton@^3.6.10":
-  version "3.6.10"
-  resolved "https://registry.yarnpkg.com/@react-aria/spinbutton/-/spinbutton-3.6.10.tgz#72154873de807638e17570bd57e8491912b613b7"
-  integrity sha512-nhYEYk7xUNOZDaqiQ5w/nHH9ouqjJbabTWXH+KK7UR1oVGfo4z1wG94l8KWF3Z6SGGnBxzLJyTBguZ4g9aYTSg==
-  dependencies:
-    "@react-aria/i18n" "^3.12.4"
-    "@react-aria/live-announcer" "^3.4.1"
-    "@react-aria/utils" "^3.26.0"
-    "@react-types/button" "^3.10.1"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/ssr@^3.9.7":
-  version "3.9.7"
-  resolved "https://registry.yarnpkg.com/@react-aria/ssr/-/ssr-3.9.7.tgz#d89d129f7bbc5148657e6c952ac31c9353183770"
-  integrity sha512-GQygZaGlmYjmYM+tiNBA5C6acmiDWF52Nqd40bBp0Znk4M4hP+LTmI0lpI1BuKMw45T8RIhrAsICIfKwZvi2Gg==
-  dependencies:
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/switch@^3.6.10":
-  version "3.6.10"
-  resolved "https://registry.yarnpkg.com/@react-aria/switch/-/switch-3.6.10.tgz#8fa5729bc4e76ac3df51389a8996873142daedb8"
-  integrity sha512-FtaI9WaEP1tAmra1sYlAkYXg9x75P5UtgY8pSbe9+1WRyWbuE1QZT+RNCTi3IU4fZ7iJQmXH6+VaMyzPlSUagw==
-  dependencies:
-    "@react-aria/toggle" "^3.10.10"
-    "@react-stately/toggle" "^3.8.0"
-    "@react-types/shared" "^3.26.0"
-    "@react-types/switch" "^3.5.7"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/table@^3.16.0":
-  version "3.16.0"
-  resolved "https://registry.yarnpkg.com/@react-aria/table/-/table-3.16.0.tgz#f0ffb51f52494e68f2c3b81fba44278fbdc48c28"
-  integrity sha512-9xF9S3CJ7XRiiK92hsIKxPedD0kgcQWwqTMtj3IBynpQ4vsnRiW3YNIzrn9C3apjknRZDTSta8O2QPYCUMmw2A==
-  dependencies:
-    "@react-aria/focus" "^3.19.0"
-    "@react-aria/grid" "^3.11.0"
-    "@react-aria/i18n" "^3.12.4"
-    "@react-aria/interactions" "^3.22.5"
-    "@react-aria/live-announcer" "^3.4.1"
-    "@react-aria/utils" "^3.26.0"
-    "@react-aria/visually-hidden" "^3.8.18"
-    "@react-stately/collections" "^3.12.0"
-    "@react-stately/flags" "^3.0.5"
-    "@react-stately/table" "^3.13.0"
-    "@react-types/checkbox" "^3.9.0"
-    "@react-types/grid" "^3.2.10"
-    "@react-types/shared" "^3.26.0"
-    "@react-types/table" "^3.10.3"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/tabs@^3.9.8":
-  version "3.9.8"
-  resolved "https://registry.yarnpkg.com/@react-aria/tabs/-/tabs-3.9.8.tgz#a0a647a4e2d1783125779473536419fd8caa9cfa"
-  integrity sha512-Nur/qRFBe+Zrt4xcCJV/ULXCS3Mlae+B89bp1Gl20vSDqk6uaPtGk+cS5k03eugOvas7AQapqNJsJgKd66TChw==
-  dependencies:
-    "@react-aria/focus" "^3.19.0"
-    "@react-aria/i18n" "^3.12.4"
-    "@react-aria/selection" "^3.21.0"
-    "@react-aria/utils" "^3.26.0"
-    "@react-stately/tabs" "^3.7.0"
-    "@react-types/shared" "^3.26.0"
-    "@react-types/tabs" "^3.3.11"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/tag@^3.4.8":
-  version "3.4.8"
-  resolved "https://registry.yarnpkg.com/@react-aria/tag/-/tag-3.4.8.tgz#856899a53c2be2b8aea3d5aca020edf8608246b2"
-  integrity sha512-exWl52bsFtJuzaqMYvSnLteUoPqb3Wf+uICru/yRtREJsWVqjJF38NCVlU73Yqd9qMPTctDrboSZFAWAWKDxoA==
-  dependencies:
-    "@react-aria/gridlist" "^3.10.0"
-    "@react-aria/i18n" "^3.12.4"
-    "@react-aria/interactions" "^3.22.5"
-    "@react-aria/label" "^3.7.13"
-    "@react-aria/selection" "^3.21.0"
-    "@react-aria/utils" "^3.26.0"
-    "@react-stately/list" "^3.11.1"
-    "@react-types/button" "^3.10.1"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/textfield@^3.15.0":
-  version "3.15.0"
-  resolved "https://registry.yarnpkg.com/@react-aria/textfield/-/textfield-3.15.0.tgz#17ebac0b73f084622aaf9697576b82155bed67cb"
-  integrity sha512-V5mg7y1OR6WXYHdhhm4FC7QyGc9TideVRDFij1SdOJrIo5IFB7lvwpOS0GmgwkVbtr71PTRMjZnNbrJUFU6VNA==
-  dependencies:
-    "@react-aria/focus" "^3.19.0"
-    "@react-aria/form" "^3.0.11"
-    "@react-aria/label" "^3.7.13"
-    "@react-aria/utils" "^3.26.0"
-    "@react-stately/form" "^3.1.0"
-    "@react-stately/utils" "^3.10.5"
-    "@react-types/shared" "^3.26.0"
-    "@react-types/textfield" "^3.10.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/toggle@^3.10.10":
-  version "3.10.10"
-  resolved "https://registry.yarnpkg.com/@react-aria/toggle/-/toggle-3.10.10.tgz#444658bf606e6d56b1fd96737d5a552c93493979"
-  integrity sha512-QwMT/vTNrbrILxWVHfd9zVQ3mV2NdBwyRu+DphVQiFAXcmc808LEaIX2n0lI6FCsUDC9ZejCyvzd91/YemdZ1Q==
-  dependencies:
-    "@react-aria/focus" "^3.19.0"
-    "@react-aria/interactions" "^3.22.5"
-    "@react-aria/utils" "^3.26.0"
-    "@react-stately/toggle" "^3.8.0"
-    "@react-types/checkbox" "^3.9.0"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/toolbar@3.0.0-beta.11":
-  version "3.0.0-beta.11"
-  resolved "https://registry.yarnpkg.com/@react-aria/toolbar/-/toolbar-3.0.0-beta.11.tgz#019c9ff2a47ad207504a95afeb0f863cf71a114b"
-  integrity sha512-LM3jTRFNDgoEpoL568WaiuqiVM7eynSQLJis1hV0vlVnhTd7M7kzt7zoOjzxVb5Uapz02uCp1Fsm4wQMz09qwQ==
-  dependencies:
-    "@react-aria/focus" "^3.19.0"
-    "@react-aria/i18n" "^3.12.4"
-    "@react-aria/utils" "^3.26.0"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/tooltip@^3.7.10":
-  version "3.7.10"
-  resolved "https://registry.yarnpkg.com/@react-aria/tooltip/-/tooltip-3.7.10.tgz#d710532e80337e50be818dfbf2cc54d0a9b8c592"
-  integrity sha512-Udi3XOnrF/SYIz72jw9bgB74MG/yCOzF5pozHj2FH2HiJlchYv/b6rHByV/77IZemdlkmL/uugrv/7raPLSlnw==
-  dependencies:
-    "@react-aria/focus" "^3.19.0"
-    "@react-aria/interactions" "^3.22.5"
-    "@react-aria/utils" "^3.26.0"
-    "@react-stately/tooltip" "^3.5.0"
-    "@react-types/shared" "^3.26.0"
-    "@react-types/tooltip" "^3.4.13"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/tree@3.0.0-beta.2":
-  version "3.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/@react-aria/tree/-/tree-3.0.0-beta.2.tgz#f4edf593e0a5acbc19f2a17d2d78fb0633a105e5"
-  integrity sha512-lH3hVl2VgG3YLN+ee1zQzm+2F+BGLd/HBhfMYPuI3IjHvDb+m+jCJXHdBOGrfG2Qydk2LYheqX8QXCluulu0qQ==
-  dependencies:
-    "@react-aria/gridlist" "^3.10.0"
-    "@react-aria/i18n" "^3.12.4"
-    "@react-aria/selection" "^3.21.0"
-    "@react-aria/utils" "^3.26.0"
-    "@react-stately/tree" "^3.8.6"
-    "@react-types/button" "^3.10.1"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/utils@^3.26.0":
-  version "3.26.0"
-  resolved "https://registry.yarnpkg.com/@react-aria/utils/-/utils-3.26.0.tgz#833cbfa33e75d15835b757791b3f754432d2f948"
-  integrity sha512-LkZouGSjjQ0rEqo4XJosS4L3YC/zzQkfRM3KoqK6fUOmUJ9t0jQ09WjiF+uOoG9u+p30AVg3TrZRUWmoTS+koQ==
-  dependencies:
-    "@react-aria/ssr" "^3.9.7"
-    "@react-stately/utils" "^3.10.5"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-    clsx "^2.0.0"
-
-"@react-aria/virtualizer@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@react-aria/virtualizer/-/virtualizer-4.1.0.tgz#df00bfba82fa5e0d622cc24699be67a60be7ab4f"
-  integrity sha512-ziSq3Y7iuaAMJWGZU1RRs/TykuPapQfx8dyH2eyKPLgEjBUoXRGWE7n6jklBwal14b0lPK0wkCzRoQbkUvX3cg==
-  dependencies:
-    "@react-aria/i18n" "^3.12.4"
-    "@react-aria/interactions" "^3.22.5"
-    "@react-aria/utils" "^3.26.0"
-    "@react-stately/virtualizer" "^4.2.0"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-aria/visually-hidden@^3.8.18":
-  version "3.8.18"
-  resolved "https://registry.yarnpkg.com/@react-aria/visually-hidden/-/visually-hidden-3.8.18.tgz#13c168736944cbe19cd8917ec33a4e6f5f694119"
-  integrity sha512-l/0igp+uub/salP35SsNWq5mGmg3G5F5QMS1gDZ8p28n7CgjvzyiGhJbbca7Oxvaw1HRFzVl9ev+89I7moNnFQ==
-  dependencies:
-    "@react-aria/interactions" "^3.22.5"
-    "@react-aria/utils" "^3.26.0"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
 "@react-spring/animated@~9.7.5":
   version "9.7.5"
   resolved "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.7.5.tgz#eb0373aaf99b879736b380c2829312dae3b05f28"
@@ -3401,508 +2509,6 @@
     "@react-spring/shared" "~9.7.5"
     "@react-spring/types" "~9.7.5"
 
-"@react-stately/calendar@^3.6.0":
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/@react-stately/calendar/-/calendar-3.6.0.tgz#c770890160c33826206a015eb7da32fe8ece81d5"
-  integrity sha512-GqUtOtGnwWjtNrJud8nY/ywI4VBP5byToNVRTnxbMl+gYO1Qe/uc5NG7zjwMxhb2kqSBHZFdkF0DXVqG2Ul+BA==
-  dependencies:
-    "@internationalized/date" "^3.6.0"
-    "@react-stately/utils" "^3.10.5"
-    "@react-types/calendar" "^3.5.0"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/checkbox@^3.6.10":
-  version "3.6.10"
-  resolved "https://registry.yarnpkg.com/@react-stately/checkbox/-/checkbox-3.6.10.tgz#69b619fdfcf1e15d2d93392e13289a36d85a8a6c"
-  integrity sha512-LHm7i4YI8A/RdgWAuADrnSAYIaYYpQeZqsp1a03Og0pJHAlZL0ymN3y2IFwbZueY0rnfM+yF+kWNXjJqbKrFEQ==
-  dependencies:
-    "@react-stately/form" "^3.1.0"
-    "@react-stately/utils" "^3.10.5"
-    "@react-types/checkbox" "^3.9.0"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/collections@^3.12.0":
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/@react-stately/collections/-/collections-3.12.0.tgz#6240d3517d0d86f7d9eb4997108fb432d569e8d7"
-  integrity sha512-MfR9hwCxe5oXv4qrLUnjidwM50U35EFmInUeFf8i9mskYwWlRYS0O1/9PZ0oF1M0cKambaRHKEy98jczgb9ycA==
-  dependencies:
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/color@^3.8.1":
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/@react-stately/color/-/color-3.8.1.tgz#13969f61f1c1b468fd891cc94582056fc2da9b9b"
-  integrity sha512-7eN7K+KJRu+rxK351eGrzoq2cG+yipr90i5b1cUu4lioYmcH4WdsfjmM5Ku6gypbafH+kTDfflvO6hiY1NZH+A==
-  dependencies:
-    "@internationalized/number" "^3.6.0"
-    "@internationalized/string" "^3.2.5"
-    "@react-aria/i18n" "^3.12.4"
-    "@react-stately/form" "^3.1.0"
-    "@react-stately/numberfield" "^3.9.8"
-    "@react-stately/slider" "^3.6.0"
-    "@react-stately/utils" "^3.10.5"
-    "@react-types/color" "^3.0.1"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/combobox@^3.10.1":
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/@react-stately/combobox/-/combobox-3.10.1.tgz#ebae28c5341d06d69cc8e50055fa816dee19522b"
-  integrity sha512-Rso+H+ZEDGFAhpKWbnRxRR/r7YNmYVtt+Rn0eNDNIUp3bYaxIBCdCySyAtALs4I8RZXZQ9zoUznP7YeVwG3cLg==
-  dependencies:
-    "@react-stately/collections" "^3.12.0"
-    "@react-stately/form" "^3.1.0"
-    "@react-stately/list" "^3.11.1"
-    "@react-stately/overlays" "^3.6.12"
-    "@react-stately/select" "^3.6.9"
-    "@react-stately/utils" "^3.10.5"
-    "@react-types/combobox" "^3.13.1"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/data@^3.12.0":
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/@react-stately/data/-/data-3.12.0.tgz#4f0fd89be2fa64ca7c0ad92d8cf20f2cba961fc0"
-  integrity sha512-6PiW2oA56lcH1CVjDcajutzsv91w/PER8K61/OGxtNFFUWaIZH80RWmK4kjU/Lf0vygzXCxout3kEb388lUk0w==
-  dependencies:
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/datepicker@^3.11.0":
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/@react-stately/datepicker/-/datepicker-3.11.0.tgz#5f4daff449f756dc40b4201ae337dd4a3f29facc"
-  integrity sha512-d9MJF34A0VrhL5y5S8mAISA8uwfNCQKmR2k4KoQJm3De1J8SQeNzSjLviAwh1faDow6FXGlA6tVbTrHyDcBgBg==
-  dependencies:
-    "@internationalized/date" "^3.6.0"
-    "@internationalized/string" "^3.2.5"
-    "@react-stately/form" "^3.1.0"
-    "@react-stately/overlays" "^3.6.12"
-    "@react-stately/utils" "^3.10.5"
-    "@react-types/datepicker" "^3.9.0"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/disclosure@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@react-stately/disclosure/-/disclosure-3.0.0.tgz#6eca061727eb27e391cc09a871f838228c597e14"
-  integrity sha512-Z9+fi0/41ZXHjGopORQza7mk4lFEFslKhy65ehEo6O6j2GuIV0659ExIVDsmJoJSFjXCfGh0sX8oTSOlXi9gqg==
-  dependencies:
-    "@react-stately/utils" "^3.10.5"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/dnd@^3.5.0":
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/@react-stately/dnd/-/dnd-3.5.0.tgz#3061233709f7113f6492de33204aea507c243a2e"
-  integrity sha512-ZcWFw1npEDnATiy3TEdzA1skQ3UEIyfbNA6VhPNO8yiSVLxoxBOaEaq8VVS72fRGAtxud6dgOy8BnsP9JwDClQ==
-  dependencies:
-    "@react-stately/selection" "^3.18.0"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/flags@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@react-stately/flags/-/flags-3.0.5.tgz#b35bcbd3b80c4f821e23e9c649566a4af11e97bf"
-  integrity sha512-6wks4csxUwPCp23LgJSnkBRhrWpd9jGd64DjcCTNB2AHIFu7Ab1W59pJpUL6TW7uAxVxdNKjgn6D1hlBy8qWsA==
-  dependencies:
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/form@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@react-stately/form/-/form-3.1.0.tgz#7fdb4ca153be18e7516a02e507ada393ad38945d"
-  integrity sha512-E2wxNQ0QaTyDHD0nJFtTSnEH9A3bpJurwxhS4vgcUmESHgjFEMLlC9irUSZKgvOgb42GAq+fHoWBsgKeTp9Big==
-  dependencies:
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/grid@^3.10.0":
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/@react-stately/grid/-/grid-3.10.0.tgz#d74e46f85a662092c61812a8508cf4ac8721ec6d"
-  integrity sha512-ii+DdsOBvCnHMgL0JvUfFwO1kiAPP19Bpdpl6zn/oOltk6F5TmnoyNrzyz+2///1hCiySI3FE1O7ujsAQs7a6Q==
-  dependencies:
-    "@react-stately/collections" "^3.12.0"
-    "@react-stately/selection" "^3.18.0"
-    "@react-types/grid" "^3.2.10"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/layout@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@react-stately/layout/-/layout-4.1.0.tgz#dd5c376c6dee90922597bcd7af2d7dedfabb6c82"
-  integrity sha512-pSBqn+4EeOaf2QMK+w2SHgsWKYHdgMZWY3qgJijdzWGZ4JpYmHuiD0yOq80qFdUwxcexPW3vFg3hqIQlMpXeCw==
-  dependencies:
-    "@react-stately/collections" "^3.12.0"
-    "@react-stately/table" "^3.13.0"
-    "@react-stately/virtualizer" "^4.2.0"
-    "@react-types/grid" "^3.2.10"
-    "@react-types/shared" "^3.26.0"
-    "@react-types/table" "^3.10.3"
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/list@^3.11.1":
-  version "3.11.1"
-  resolved "https://registry.yarnpkg.com/@react-stately/list/-/list-3.11.1.tgz#d1493e5b9c5cac6cafb3cb3a6edb852bf3cb208f"
-  integrity sha512-UCOpIvqBOjwLtk7zVTYWuKU1m1Oe61Q5lNar/GwHaV1nAiSQ8/yYlhr40NkBEs9X3plEfsV28UIpzOrYnu1tPg==
-  dependencies:
-    "@react-stately/collections" "^3.12.0"
-    "@react-stately/selection" "^3.18.0"
-    "@react-stately/utils" "^3.10.5"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/menu@^3.9.0":
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/@react-stately/menu/-/menu-3.9.0.tgz#b1e55996405f4e43ff844cbd325df9842914efe4"
-  integrity sha512-++sm0fzZeUs9GvtRbj5RwrP+KL9KPANp9f4SvtI3s+MP+Y/X3X7LNNePeeccGeyikB5fzMsuyvd82bRRW9IhDQ==
-  dependencies:
-    "@react-stately/overlays" "^3.6.12"
-    "@react-types/menu" "^3.9.13"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/numberfield@^3.9.8":
-  version "3.9.8"
-  resolved "https://registry.yarnpkg.com/@react-stately/numberfield/-/numberfield-3.9.8.tgz#863a6c0f7a4249759dd0c586f2e27dd2548aadee"
-  integrity sha512-J6qGILxDNEtu7yvd3/y+FpbrxEaAeIODwlrFo6z1kvuDlLAm/KszXAc75yoDi0OtakFTCMP6/HR5VnHaQdMJ3w==
-  dependencies:
-    "@internationalized/number" "^3.6.0"
-    "@react-stately/form" "^3.1.0"
-    "@react-stately/utils" "^3.10.5"
-    "@react-types/numberfield" "^3.8.7"
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/overlays@^3.6.12":
-  version "3.6.12"
-  resolved "https://registry.yarnpkg.com/@react-stately/overlays/-/overlays-3.6.12.tgz#beb594a0e140dbd7957bfa181006854f91480bea"
-  integrity sha512-QinvZhwZgj8obUyPIcyURSCjTZlqZYRRCS60TF8jH8ZpT0tEAuDb3wvhhSXuYA3Xo9EHLwvLjEf3tQKKdAQArw==
-  dependencies:
-    "@react-stately/utils" "^3.10.5"
-    "@react-types/overlays" "^3.8.11"
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/radio@^3.10.9":
-  version "3.10.9"
-  resolved "https://registry.yarnpkg.com/@react-stately/radio/-/radio-3.10.9.tgz#cf74b8f47cbef56836424d2e7d06c01fe9d9ea05"
-  integrity sha512-kUQ7VdqFke8SDRCatw2jW3rgzMWbvw+n2imN2THETynI47NmNLzNP11dlGO2OllRtTrsLhmBNlYHa3W62pFpAw==
-  dependencies:
-    "@react-stately/form" "^3.1.0"
-    "@react-stately/utils" "^3.10.5"
-    "@react-types/radio" "^3.8.5"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/searchfield@^3.5.8":
-  version "3.5.8"
-  resolved "https://registry.yarnpkg.com/@react-stately/searchfield/-/searchfield-3.5.8.tgz#b927e25afd32b1a32f22d54df6d7b4968cb4cf33"
-  integrity sha512-jtquvGadx1DmtQqPKaVO6Qg/xpBjNxsOd59ciig9xRxpxV+90i996EX1E2R6R+tGJdSM1pD++7PVOO4yE++HOg==
-  dependencies:
-    "@react-stately/utils" "^3.10.5"
-    "@react-types/searchfield" "^3.5.10"
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/select@^3.6.9":
-  version "3.6.9"
-  resolved "https://registry.yarnpkg.com/@react-stately/select/-/select-3.6.9.tgz#088bb0fe7b16cc67d833f17c330df63c4310a5da"
-  integrity sha512-vASUDv7FhEYQURzM+JIwcusPv7/x/l3zHc/oKJPvoCl3aa9pwS8hZwS82SC00o2iFnrDscfDJju4IE/cd4hucg==
-  dependencies:
-    "@react-stately/form" "^3.1.0"
-    "@react-stately/list" "^3.11.1"
-    "@react-stately/overlays" "^3.6.12"
-    "@react-types/select" "^3.9.8"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/selection@^3.18.0":
-  version "3.18.0"
-  resolved "https://registry.yarnpkg.com/@react-stately/selection/-/selection-3.18.0.tgz#eb723dc26eafd9b016c55056fb550bdde8b4f87b"
-  integrity sha512-6EaNNP3exxBhW2LkcRR4a3pg+3oDguZlBSqIVVR7lyahv/D8xXHRC4dX+m0mgGHJpsgjs7664Xx6c8v193TFxg==
-  dependencies:
-    "@react-stately/collections" "^3.12.0"
-    "@react-stately/utils" "^3.10.5"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/slider@^3.6.0":
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/@react-stately/slider/-/slider-3.6.0.tgz#20439e08915725c4f6ba2285a561ae92fe59d997"
-  integrity sha512-w5vJxVh267pmD1X+Ppd9S3ZzV1hcg0cV8q5P4Egr160b9WMcWlUspZPtsthwUlN7qQe/C8y5IAhtde4s29eNag==
-  dependencies:
-    "@react-stately/utils" "^3.10.5"
-    "@react-types/shared" "^3.26.0"
-    "@react-types/slider" "^3.7.7"
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/table@^3.13.0":
-  version "3.13.0"
-  resolved "https://registry.yarnpkg.com/@react-stately/table/-/table-3.13.0.tgz#8465030f568b5ee779623d99b2ef22940a99a6cd"
-  integrity sha512-mRbNYrwQIE7xzVs09Lk3kPteEVFVyOc20vA8ph6EP54PiUf/RllJpxZe/WUYLf4eom9lUkRYej5sffuUBpxjCA==
-  dependencies:
-    "@react-stately/collections" "^3.12.0"
-    "@react-stately/flags" "^3.0.5"
-    "@react-stately/grid" "^3.10.0"
-    "@react-stately/selection" "^3.18.0"
-    "@react-stately/utils" "^3.10.5"
-    "@react-types/grid" "^3.2.10"
-    "@react-types/shared" "^3.26.0"
-    "@react-types/table" "^3.10.3"
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/tabs@^3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@react-stately/tabs/-/tabs-3.7.0.tgz#f849b334c5e7d39a37c2e9ffa3114531bf8ce6e4"
-  integrity sha512-ox4hTkfZCoR4Oyr3Op3rBlWNq2Wxie04vhEYpTZQ2hobR3l4fYaOkd7CPClILktJ3TC104j8wcb0knWxIBRx9w==
-  dependencies:
-    "@react-stately/list" "^3.11.1"
-    "@react-types/shared" "^3.26.0"
-    "@react-types/tabs" "^3.3.11"
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/toggle@^3.8.0":
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/@react-stately/toggle/-/toggle-3.8.0.tgz#39a3e45989f56e236809d8fe69c160cc88a616f5"
-  integrity sha512-pyt/k/J8BwE/2g6LL6Z6sMSWRx9HEJB83Sm/MtovXnI66sxJ2EfQ1OaXB7Su5PEL9OMdoQF6Mb+N1RcW3zAoPw==
-  dependencies:
-    "@react-stately/utils" "^3.10.5"
-    "@react-types/checkbox" "^3.9.0"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/tooltip@^3.5.0":
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/@react-stately/tooltip/-/tooltip-3.5.0.tgz#1016952eb4427d5b848e2efcb24eee47e2a26b59"
-  integrity sha512-+xzPNztJDd2XJD0X3DgWKlrgOhMqZpSzsIssXeJgO7uCnP8/Z513ESaipJhJCFC8fxj5caO/DK4Uu8hEtlB8cQ==
-  dependencies:
-    "@react-stately/overlays" "^3.6.12"
-    "@react-types/tooltip" "^3.4.13"
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/tree@^3.8.6":
-  version "3.8.6"
-  resolved "https://registry.yarnpkg.com/@react-stately/tree/-/tree-3.8.6.tgz#85dc33c5d5b9a455ffc0b474300957e511db1ea4"
-  integrity sha512-lblUaxf1uAuIz5jm6PYtcJ+rXNNVkqyFWTIMx6g6gW/mYvm8GNx1G/0MLZE7E6CuDGaO9dkLSY2bB1uqyKHidA==
-  dependencies:
-    "@react-stately/collections" "^3.12.0"
-    "@react-stately/selection" "^3.18.0"
-    "@react-stately/utils" "^3.10.5"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/utils@^3.10.5":
-  version "3.10.5"
-  resolved "https://registry.yarnpkg.com/@react-stately/utils/-/utils-3.10.5.tgz#47bb91cd5afd1bafe39353614e5e281b818ebccc"
-  integrity sha512-iMQSGcpaecghDIh3mZEpZfoFH3ExBwTtuBEcvZ2XnGzCgQjeYXcMdIUwAfVQLXFTdHUHGF6Gu6/dFrYsCzySBQ==
-  dependencies:
-    "@swc/helpers" "^0.5.0"
-
-"@react-stately/virtualizer@^4.2.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@react-stately/virtualizer/-/virtualizer-4.2.0.tgz#5906ac9d10ec48bc12a81879991a0b05154605d6"
-  integrity sha512-aTMpa9AQoz/xLqn8AI1BR/caUUY7/OUo9GbuF434w2u5eGCL7+SAn3Fmq7WSCwqYyDsO+jEIERek4JTX7pEW0A==
-  dependencies:
-    "@react-aria/utils" "^3.26.0"
-    "@react-types/shared" "^3.26.0"
-    "@swc/helpers" "^0.5.0"
-
-"@react-types/breadcrumbs@^3.7.9":
-  version "3.7.9"
-  resolved "https://registry.yarnpkg.com/@react-types/breadcrumbs/-/breadcrumbs-3.7.9.tgz#c75eae6158bd3631854bff7521c2373b42b0e37c"
-  integrity sha512-eARYJo8J+VfNV8vP4uw3L2Qliba9wLV2bx9YQCYf5Lc/OE5B/y4gaTLz+Y2P3Rtn6gBPLXY447zCs5i7gf+ICg==
-  dependencies:
-    "@react-types/link" "^3.5.9"
-    "@react-types/shared" "^3.26.0"
-
-"@react-types/button@^3.10.1":
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/@react-types/button/-/button-3.10.1.tgz#fc7ada2e83bc661b31c1473a82ec86dc11de057c"
-  integrity sha512-XTtap8o04+4QjPNAshFWOOAusUTxQlBjU2ai0BTVLShQEjHhRVDBIWsI2B2FKJ4KXT6AZ25llaxhNrreWGonmA==
-  dependencies:
-    "@react-types/shared" "^3.26.0"
-
-"@react-types/calendar@^3.5.0":
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/@react-types/calendar/-/calendar-3.5.0.tgz#a72fa15e08c7785b145005560baa35ad9b44627b"
-  integrity sha512-O3IRE7AGwAWYnvJIJ80cOy7WwoJ0m8GtX/qSmvXQAjC4qx00n+b5aFNBYAQtcyc3RM5QpW6obs9BfwGetFiI8w==
-  dependencies:
-    "@internationalized/date" "^3.6.0"
-    "@react-types/shared" "^3.26.0"
-
-"@react-types/checkbox@^3.9.0":
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/@react-types/checkbox/-/checkbox-3.9.0.tgz#d4621fef81850543f7a028917e9c2781cd871443"
-  integrity sha512-9hbHx0Oo2Hp5a8nV8Q75LQR0DHtvOIJbFaeqESSopqmV9EZoYjtY/h0NS7cZetgahQgnqYWQi44XGooMDCsmxA==
-  dependencies:
-    "@react-types/shared" "^3.26.0"
-
-"@react-types/color@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@react-types/color/-/color-3.0.1.tgz#42d49736cf606b8434d3fe0ab60b75bb0f44f554"
-  integrity sha512-KemFziO3GbmT3HEKrgOGdqNA6Gsmy9xrwFO3f8qXSG7gVz6M27Ic4R9HVQv4iAjap5uti6W13/pk2bc/jLVcEA==
-  dependencies:
-    "@react-types/shared" "^3.26.0"
-    "@react-types/slider" "^3.7.7"
-
-"@react-types/combobox@^3.13.1":
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/@react-types/combobox/-/combobox-3.13.1.tgz#d7d843f45501ad141f74ba62ed46d2e991b2d6a0"
-  integrity sha512-7xr+HknfhReN4QPqKff5tbKTe2kGZvH+DGzPYskAtb51FAAiZsKo+WvnNAvLwg3kRoC9Rkn4TAiVBp/HgymRDw==
-  dependencies:
-    "@react-types/shared" "^3.26.0"
-
-"@react-types/datepicker@^3.9.0":
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/@react-types/datepicker/-/datepicker-3.9.0.tgz#86e2a4e23e9fbf8299a12bd8aba9b1a52cf44725"
-  integrity sha512-dbKL5Qsm2MQwOTtVQdOcKrrphcXAqDD80WLlSQrBLg+waDuuQ7H+TrvOT0thLKloNBlFUGnZZfXGRHINpih/0g==
-  dependencies:
-    "@internationalized/date" "^3.6.0"
-    "@react-types/calendar" "^3.5.0"
-    "@react-types/overlays" "^3.8.11"
-    "@react-types/shared" "^3.26.0"
-
-"@react-types/dialog@^3.5.14":
-  version "3.5.14"
-  resolved "https://registry.yarnpkg.com/@react-types/dialog/-/dialog-3.5.14.tgz#97e568dc38ede4312ba6a12eda855c5e32c7cd47"
-  integrity sha512-OXWMjrALwrlgw8aHD8SeRm/s3tbAssdaEh2h73KUSeFau3fU3n5mfKv+WnFqsEaOtN261o48l7hTlS6615H9AA==
-  dependencies:
-    "@react-types/overlays" "^3.8.11"
-    "@react-types/shared" "^3.26.0"
-
-"@react-types/form@^3.7.8":
-  version "3.7.8"
-  resolved "https://registry.yarnpkg.com/@react-types/form/-/form-3.7.8.tgz#4d6b9e78770b9345cc9e1041990a7a26fb65e0ee"
-  integrity sha512-0wOS97/X0ijTVuIqik1lHYTZnk13QkvMTKvIEhM7c6YMU3vPiirBwLbT2kJiAdwLiymwcCkrBdDF1NTRG6kPFA==
-  dependencies:
-    "@react-types/shared" "^3.26.0"
-
-"@react-types/grid@^3.2.10":
-  version "3.2.10"
-  resolved "https://registry.yarnpkg.com/@react-types/grid/-/grid-3.2.10.tgz#d2d1d124ed9472e3dedc48e91c941a7ad23bdc83"
-  integrity sha512-Z5cG0ITwqjUE4kWyU5/7VqiPl4wqMJ7kG/ZP7poAnLmwRsR8Ai0ceVn+qzp5nTA19cgURi8t3LsXn3Ar1FBoog==
-  dependencies:
-    "@react-types/shared" "^3.26.0"
-
-"@react-types/link@^3.5.9":
-  version "3.5.9"
-  resolved "https://registry.yarnpkg.com/@react-types/link/-/link-3.5.9.tgz#bf61ff2780581de03920e6e43260844a81a38d2f"
-  integrity sha512-JcKDiDMqrq/5Vpn+BdWQEuXit4KN4HR/EgIi3yKnNbYkLzxBoeQZpQgvTaC7NEQeZnSqkyXQo3/vMUeX/ZNIKw==
-  dependencies:
-    "@react-types/shared" "^3.26.0"
-
-"@react-types/listbox@^3.5.3":
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/@react-types/listbox/-/listbox-3.5.3.tgz#c5dbe8a67d67ca59de6b88aaa2f20fcf61fee1c5"
-  integrity sha512-v1QXd9/XU3CCKr2Vgs7WLcTr6VMBur7CrxHhWZQQFExsf9bgJ/3wbUdjy4aThY/GsYHiaS38EKucCZFr1QAfqA==
-  dependencies:
-    "@react-types/shared" "^3.26.0"
-
-"@react-types/menu@^3.9.13":
-  version "3.9.13"
-  resolved "https://registry.yarnpkg.com/@react-types/menu/-/menu-3.9.13.tgz#a666c2233cbdb495202586df86a798601788f74d"
-  integrity sha512-7SuX6E2tDsqQ+HQdSvIda1ji/+ujmR86dtS9CUu5yWX91P25ufRjZ72EvLRqClWNQsj1Xl4+2zBDLWlceznAjw==
-  dependencies:
-    "@react-types/overlays" "^3.8.11"
-    "@react-types/shared" "^3.26.0"
-
-"@react-types/meter@^3.4.5":
-  version "3.4.5"
-  resolved "https://registry.yarnpkg.com/@react-types/meter/-/meter-3.4.5.tgz#e06d4a2fabd24989c73541b032123c5de495b613"
-  integrity sha512-04w1lEtvP/c3Ep8ND8hhH2rwjz2MtQ8o8SNLhahen3u0rX3jKOgD4BvHujsyvXXTMjj1Djp74sGzNawb4Ppi9w==
-  dependencies:
-    "@react-types/progress" "^3.5.8"
-
-"@react-types/numberfield@^3.8.7":
-  version "3.8.7"
-  resolved "https://registry.yarnpkg.com/@react-types/numberfield/-/numberfield-3.8.7.tgz#5a697fdf1bc405dbf55dafed713d47ed79f8e54b"
-  integrity sha512-KccMPi39cLoVkB2T0V7HW6nsxQVAwt89WWCltPZJVGzsebv/k0xTQlPVAgrUake4kDLoE687e3Fr/Oe3+1bDhw==
-  dependencies:
-    "@react-types/shared" "^3.26.0"
-
-"@react-types/overlays@^3.8.11":
-  version "3.8.11"
-  resolved "https://registry.yarnpkg.com/@react-types/overlays/-/overlays-3.8.11.tgz#313964703b2a23572138120b619d35da33445dfd"
-  integrity sha512-aw7T0rwVI3EuyG5AOaEIk8j7dZJQ9m34XAztXJVZ/W2+4pDDkLDbJ/EAPnuo2xGYRGhowuNDn4tDju01eHYi+w==
-  dependencies:
-    "@react-types/shared" "^3.26.0"
-
-"@react-types/progress@^3.5.8":
-  version "3.5.8"
-  resolved "https://registry.yarnpkg.com/@react-types/progress/-/progress-3.5.8.tgz#62ce4207c7e8d640b794c6d89063ce21bdb5970d"
-  integrity sha512-PR0rN5mWevfblR/zs30NdZr+82Gka/ba7UHmYOW9/lkKlWeD7PHgl1iacpd/3zl/jUF22evAQbBHmk1mS6Mpqw==
-  dependencies:
-    "@react-types/shared" "^3.26.0"
-
-"@react-types/radio@^3.8.5":
-  version "3.8.5"
-  resolved "https://registry.yarnpkg.com/@react-types/radio/-/radio-3.8.5.tgz#8e2dd1911fba829b7f1ebb40bccf9ca483f021fc"
-  integrity sha512-gSImTPid6rsbJmwCkTliBIU/npYgJHOFaI3PNJo7Y0QTAnFelCtYeFtBiWrFodSArSv7ASqpLLUEj9hZu/rxIg==
-  dependencies:
-    "@react-types/shared" "^3.26.0"
-
-"@react-types/searchfield@^3.5.10":
-  version "3.5.10"
-  resolved "https://registry.yarnpkg.com/@react-types/searchfield/-/searchfield-3.5.10.tgz#015a42bf8417618b848035b88f0aba98572beceb"
-  integrity sha512-7wW4pJzbReawoGPu8a4l+CODTCDN088EN/ysUzl622ewim57PjArjix+lpO4+aEtJqS9HKpq8UEbjwo9axpcUA==
-  dependencies:
-    "@react-types/shared" "^3.26.0"
-    "@react-types/textfield" "^3.10.0"
-
-"@react-types/select@^3.9.8":
-  version "3.9.8"
-  resolved "https://registry.yarnpkg.com/@react-types/select/-/select-3.9.8.tgz#2443b82549b65821f85876a5b803e6d04ae6343e"
-  integrity sha512-RGsYj2oFjXpLnfcvWMBQnkcDuKkwT43xwYWZGI214/gp/B64tJiIUgTM5wFTRAeGDX23EePkhCQF+9ctnqFd6g==
-  dependencies:
-    "@react-types/shared" "^3.26.0"
-
-"@react-types/shared@^3.26.0":
-  version "3.26.0"
-  resolved "https://registry.yarnpkg.com/@react-types/shared/-/shared-3.26.0.tgz#21a8b579f0097ee78de18e3e580421ced89e4c8c"
-  integrity sha512-6FuPqvhmjjlpEDLTiYx29IJCbCNWPlsyO+ZUmCUXzhUv2ttShOXfw8CmeHWHftT/b2KweAWuzqSlfeXPR76jpw==
-
-"@react-types/slider@^3.7.7":
-  version "3.7.7"
-  resolved "https://registry.yarnpkg.com/@react-types/slider/-/slider-3.7.7.tgz#f00450c6268665ff2ad38ad69bdf51d84ff2341a"
-  integrity sha512-lYTR9zXQV2fSEm/G3gwDENWiki1IXd/oorsgf0zu1DBi2SQDbOsLsGUXiwvD24Xy6OkUuhAqjLPPexezo7+u9g==
-  dependencies:
-    "@react-types/shared" "^3.26.0"
-
-"@react-types/switch@^3.5.7":
-  version "3.5.7"
-  resolved "https://registry.yarnpkg.com/@react-types/switch/-/switch-3.5.7.tgz#f3fb589fce5819ca1c15f12479bf348e053adc27"
-  integrity sha512-1IKiq510rPTHumEZuhxuazuXBa2Cuxz6wBIlwf3NCVmgWEvU+uk1ETG0sH2yymjwCqhtJDKXi+qi9HSgPEDwAg==
-  dependencies:
-    "@react-types/shared" "^3.26.0"
-
-"@react-types/table@^3.10.3":
-  version "3.10.3"
-  resolved "https://registry.yarnpkg.com/@react-types/table/-/table-3.10.3.tgz#33959348641500e406abe330074f84b0c75ae4ac"
-  integrity sha512-Ac+W+m/zgRzlTU8Z2GEg26HkuJFswF9S6w26r+R3MHwr8z2duGPvv37XRtE1yf3dbpRBgHEAO141xqS2TqGwNg==
-  dependencies:
-    "@react-types/grid" "^3.2.10"
-    "@react-types/shared" "^3.26.0"
-
-"@react-types/tabs@^3.3.11":
-  version "3.3.11"
-  resolved "https://registry.yarnpkg.com/@react-types/tabs/-/tabs-3.3.11.tgz#b7db710ce2ca42a4e72cd2a581070212d2b07793"
-  integrity sha512-BjF2TqBhZaIcC4lc82R5pDJd1F7kstj1K0Nokhz99AGYn8C0ITdp6lR+DPVY9JZRxKgP9R2EKfWGI90Lo7NQdA==
-  dependencies:
-    "@react-types/shared" "^3.26.0"
-
-"@react-types/textfield@^3.10.0":
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/@react-types/textfield/-/textfield-3.10.0.tgz#10df39b75334174490a539ecae71ad19f5ea074d"
-  integrity sha512-ShU3d6kLJGQjPXccVFjM3KOXdj3uyhYROqH9YgSIEVxgA9W6LRflvk/IVBamD9pJYTPbwmVzuP0wQkTDupfZ1w==
-  dependencies:
-    "@react-types/shared" "^3.26.0"
-
-"@react-types/tooltip@^3.4.13":
-  version "3.4.13"
-  resolved "https://registry.yarnpkg.com/@react-types/tooltip/-/tooltip-3.4.13.tgz#f73fdc5c56790b7bd7c0d5382d0c758bd659e9d7"
-  integrity sha512-KPekFC17RTT8kZlk7ZYubueZnfsGTDOpLw7itzolKOXGddTXsrJGBzSB4Bb060PBVllaDO0MOrhPap8OmrIl1Q==
-  dependencies:
-    "@react-types/overlays" "^3.8.11"
-    "@react-types/shared" "^3.26.0"
-
 "@redis/bloom@1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@redis/bloom/-/bloom-1.2.0.tgz#d3fd6d3c0af3ef92f26767b56414a370c7b63b71"
@@ -4169,13 +2775,6 @@
   dependencies:
     tslib "^2.4.0"
 
-"@swc/helpers@^0.5.0":
-  version "0.5.15"
-  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.15.tgz#79efab344c5819ecf83a43f3f9f811fc84b516d7"
-  integrity sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==
-  dependencies:
-    tslib "^2.8.0"
-
 "@tanstack/query-core@5.60.6":
   version "5.60.6"
   resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-5.60.6.tgz#0dd33fe231b0d18bf66d0c615b29899738300658"
@@ -4213,13 +2812,6 @@
   resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
   integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
 
-"@types/acorn@^4.0.0":
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/@types/acorn/-/acorn-4.0.6.tgz#d61ca5480300ac41a7d973dd5b84d0a591154a22"
-  integrity sha512-veQTnWP+1D/xbxVrPC3zHnCZRjSrKfhbMUlEA43iMZLu7EsnTtkJklIuwrCPbOi8YkvDQAiW05VQQFvvz9oieQ==
-  dependencies:
-    "@types/estree" "*"
-
 "@types/babel__core@^7.1.14":
   version "7.20.5"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.5.tgz#3df15f27ba85319caa07ba08d0721889bb39c017"
@@ -4278,25 +2870,6 @@
   dependencies:
     cypress "*"
 
-"@types/debug@^4.0.0":
-  version "4.1.12"
-  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.12.tgz#a155f21690871953410df4b6b6f53187f0500917"
-  integrity sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==
-  dependencies:
-    "@types/ms" "*"
-
-"@types/detect-indent@0.1.30":
-  version "0.1.30"
-  resolved "https://registry.yarnpkg.com/@types/detect-indent/-/detect-indent-0.1.30.tgz#dc682bb412b4e65ba098e70edad73b4833fb910d"
-  integrity sha512-AUmj9JHuHTD94slY1WR1VulFxRGC6D1pcNCN0MCulKFyiihvV/28lLS8oRHgfmc2Cxq954J8Vmosa8qzm7PLGQ==
-
-"@types/estree-jsx@^1.0.0":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@types/estree-jsx/-/estree-jsx-1.0.5.tgz#858a88ea20f34fe65111f005a689fa1ebf70dc18"
-  integrity sha512-52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg==
-  dependencies:
-    "@types/estree" "*"
-
 "@types/estree@*":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
@@ -4326,14 +2899,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/glob@5.0.30":
-  version "5.0.30"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-5.0.30.tgz#1026409c5625a8689074602808d082b2867b8a51"
-  integrity sha512-ZM05wDByI+WA153sfirJyEHoYYoIuZ7lA2dB/Gl8ymmpMTR78fNRtDMqa7Z6SdH4fZdLWZNRE6mZpx3XqBOrHw==
-  dependencies:
-    "@types/minimatch" "*"
-    "@types/node" "*"
-
 "@types/glob@^7.1.1":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
@@ -4349,13 +2914,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/hast@^3.0.0":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@types/hast/-/hast-3.0.4.tgz#1d6b39993b82cea6ad783945b0508c25903e15aa"
-  integrity sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==
-  dependencies:
-    "@types/unist" "*"
-
 "@types/hoist-non-react-statics@3":
   version "3.3.5"
   resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz#dab7867ef789d87e2b4b0003c9d65c49cc44a494"
@@ -4424,18 +2982,6 @@
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.200.tgz#435b6035c7eba9cdf1e039af8212c9e9281e7149"
   integrity sha512-YI/M/4HRImtNf3pJgbF+W6FrXovqj+T+/HpENLTooK9PnkacBsDpeP3IpHab40CClUfhNmdM2WTNP2sa2dni5Q==
 
-"@types/mdast@^4.0.0":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-4.0.4.tgz#7ccf72edd2f1aa7dd3437e180c64373585804dd6"
-  integrity sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==
-  dependencies:
-    "@types/unist" "*"
-
-"@types/mdx@^2.0.0":
-  version "2.0.13"
-  resolved "https://registry.yarnpkg.com/@types/mdx/-/mdx-2.0.13.tgz#68f6877043d377092890ff5b298152b0a21671bd"
-  integrity sha512-+OWZQfAYyio6YkJb3HLxDrvnx6SWWDbC0zVPfBRzUk0/nqoDyf6dNxQi3eArPe8rJ473nobTMQ/8Zk+LxJ+Yuw==
-
 "@types/minimatch@*":
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
@@ -4451,16 +2997,6 @@
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.5.tgz#ec10755e871497bcd83efe927e43ec46e8c0747e"
   integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==
 
-"@types/mkdirp@0.3.29":
-  version "0.3.29"
-  resolved "https://registry.yarnpkg.com/@types/mkdirp/-/mkdirp-0.3.29.tgz#7f2ad7ec55f914482fc9b1ec4bb1ae6028d46066"
-  integrity sha512-QRLQpFsIQGO2k8pupga9abfei85GKotAtQ+F6xuQmSGomUt6C52TyMiTFpP8kUwuPKr00gNtu3itLlC6gvI/NA==
-
-"@types/ms@*":
-  version "0.7.34"
-  resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.34.tgz#10964ba0dee6ac4cd462e2795b6bebd407303433"
-  integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==
-
 "@types/node@*":
   version "22.9.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-22.9.0.tgz#b7f16e5c3384788542c72dc3d561a7ceae2c0365"
@@ -4478,11 +3014,6 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.45.tgz#2c0fafd78705e7a18b7906b5201a522719dc5190"
   integrity sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==
 
-"@types/node@8.0.0":
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.0.tgz#acaa89247afddc7967e9902fd11761dadea1a555"
-  integrity sha512-j2tekvJCO7j22cs+LO6i0kRPhmQ9MXaPZ55TzOc1lzkN5b6BWqq4AFjl04s1oRRQ1v5rSe+KEvnLUSTonuls/A==
-
 "@types/node@^20.9.0":
   version "20.17.6"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-20.17.6.tgz#6e4073230c180d3579e8c60141f99efdf5df0081"
@@ -4564,16 +3095,6 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.3.tgz#6209321eb2c1712a7e7466422b8cb1fc0d9dd5d8"
   integrity sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==
 
-"@types/unist@*", "@types/unist@^3.0.0":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-3.0.3.tgz#acaab0f919ce69cce629c2d4ed2eb4adc1b6c20c"
-  integrity sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==
-
-"@types/unist@^2.0.0":
-  version "2.0.11"
-  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.11.tgz#11af57b127e32487774841f7a4e54eab166d03c4"
-  integrity sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==
-
 "@types/yargs-parser@*":
   version "21.0.3"
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15"
@@ -4817,32 +3338,6 @@
     chalk "^4.1.2"
     debug "^4.3.4"
 
-"@umami/react-zen@^0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@umami/react-zen/-/react-zen-0.19.0.tgz#31665002892a56f2d2925bcbeed0c6a853f59838"
-  integrity sha512-TgZzHXW0yRzjO0zeDd9op3TyF+oJDZo8vrd4bgH0B/L4jaqMM+p2UgUykb4/TyXQ9FJ2AHuyuDR8Q1UAeB3IzQ==
-  dependencies:
-    "@fontsource/jetbrains-mono" "^5.0.18"
-    "@mdx-js/loader" "^3.0.0"
-    "@mdx-js/react" "^3.0.0"
-    "@next/mdx" "^15.0.2"
-    "@radix-ui/react-slot" "^1.0.2"
-    "@radix-ui/react-toast" "^1.2.1"
-    classnames "^2.5.1"
-    dts-bundle "^0.7.3"
-    glob "^10.3.10"
-    gray-matter "^4.0.3"
-    next "15.0.2"
-    next-mdx-remote "^5.0.0"
-    react "^19.0.0-rc-66855b96-20241106"
-    react-aria-components "^1.5.0"
-    react-dom "^19.0.0-rc-66855b96-20241106"
-    react-hook-form "^7.53.0"
-    react-icons "^5.2.1"
-    recursive-readdir "^2.2.3"
-    thenby "^1.3.4"
-    zustand "^4.5.0"
-
 "@umami/redis-client@^0.21.0":
   version "0.21.0"
   resolved "https://registry.yarnpkg.com/@umami/redis-client/-/redis-client-0.21.0.tgz#96426b28860b8b06fae8825fc2f2d9575b64e863"
@@ -4851,7 +3346,7 @@
     debug "^4.3.4"
     redis "^4.5.1"
 
-"@ungap/structured-clone@^1.0.0", "@ungap/structured-clone@^1.2.0":
+"@ungap/structured-clone@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
   integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
@@ -4946,7 +3441,7 @@
   resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.3.4.tgz#06e83c5027f464eef861c329be81454bc8b70780"
   integrity sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==
 
-acorn-jsx@^5.0.0, acorn-jsx@^5.3.2:
+acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
@@ -4956,11 +3451,6 @@ acorn-walk@^8.1.1:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.1.tgz#2f10f5b69329d90ae18c58bf1fa8fccd8b959a43"
   integrity sha512-TgUZgYvqZprrl7YldZNoa9OciCAyZR+Ejm9eXzKCmjsF5IKp/wgQ7Z/ZpjpGTIUPwrHQIcYeI8qDh4PsEwxMbw==
 
-acorn@^8.0.0, acorn@^8.9.0:
-  version "8.14.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0"
-  integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==
-
 acorn@^8.4.1:
   version "8.11.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b"
@@ -4971,6 +3461,11 @@ acorn@^8.8.2:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
   integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
 
+acorn@^8.9.0:
+  version "8.14.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0"
+  integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==
+
 aggregate-error@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
@@ -5232,11 +3727,6 @@ astral-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
-astring@^1.8.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/astring/-/astring-1.9.0.tgz#cc73e6062a7eb03e7d19c22d8b0b3451fd9bfeef"
-  integrity sha512-LElXdjswlqjWrPpJFg1Fx4wpkOCxj1TDHlSV4PlaRxHGWko024xICaa97ZkMfs6DRKlCguiAI+rbXv5GWwXIkg==
-
 async@^3.2.0, async@^3.2.3:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
@@ -5391,11 +3881,6 @@ babel-preset-jest@^29.6.3:
     babel-plugin-jest-hoist "^29.6.3"
     babel-preset-current-node-syntax "^1.0.0"
 
-bail@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/bail/-/bail-2.0.2.tgz#d26f5cd8fe5d6f832a31517b9f7c356040ba6d5d"
-  integrity sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==
-
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -5594,11 +4079,6 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
 
-ccount@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/ccount/-/ccount-2.0.1.tgz#17a3bf82302e0870d6da43a01311a8bc02a3ecf5"
-  integrity sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==
-
 chalk@5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385"
@@ -5626,26 +4106,6 @@ char-regex@^1.0.2:
   resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
   integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
 
-character-entities-html4@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-2.1.0.tgz#1f1adb940c971a4b22ba39ddca6b618dc6e56b2b"
-  integrity sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==
-
-character-entities-legacy@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz#76bc83a90738901d7bc223a9e93759fdd560125b"
-  integrity sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==
-
-character-entities@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-2.0.2.tgz#2d09c2e72cd9523076ccb21157dff66ad43fcc22"
-  integrity sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==
-
-character-reference-invalid@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-2.0.1.tgz#85c66b041e43b47210faf401278abf808ac45cb9"
-  integrity sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==
-
 charenc@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
@@ -5688,7 +4148,7 @@ cjs-module-lexer@^1.0.0:
   resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107"
   integrity sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==
 
-classnames@^2.3.1, classnames@^2.5.1:
+classnames@^2.3.1:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.5.1.tgz#ba774c614be0f016da105c858e7159eae8e7687b"
   integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==
@@ -5737,7 +4197,7 @@ cli-truncate@^3.1.0:
     slice-ansi "^5.0.0"
     string-width "^5.0.0"
 
-client-only@0.0.1, client-only@^0.0.1:
+client-only@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/client-only/-/client-only-0.0.1.tgz#38bba5d403c41ab150bff64a95c85013cf73bca1"
   integrity sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==
@@ -5751,11 +4211,6 @@ cliui@^8.0.1:
     strip-ansi "^6.0.1"
     wrap-ansi "^7.0.0"
 
-clsx@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.1.1.tgz#eed397c9fd8bd882bfb18deab7102049a2f32999"
-  integrity sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==
-
 cluster-key-slot@1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz#88ddaa46906e303b5de30d3153b7d9fe0a0c19ac"
@@ -5766,11 +4221,6 @@ co@^4.6.0:
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
 
-collapse-white-space@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-2.1.0.tgz#640257174f9f42c740b40f3b55ee752924feefca"
-  integrity sha512-loKTxY1zCOuG4j9f6EPnuyyYkf58RnhhWTvRoZEokgB+WbdXehfjFviyOVYkqzEWz1Q5kRiZdBYS5SwxbQYwzw==
-
 collect-v8-coverage@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz#c0b29bcd33bcd0779a1344c2136051e6afd3d9e9"
@@ -5838,17 +4288,12 @@ combined-stream@^1.0.8, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-comma-separated-tokens@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz#4e89c9458acb61bc8fef19f4529973b2392839ee"
-  integrity sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==
-
 commander@11.0.0:
   version "11.0.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-11.0.0.tgz#43e19c25dbedc8256203538e8d7e9346877a6f67"
   integrity sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==
 
-commander@2, commander@^2.20.0, commander@^2.9.0:
+commander@2, commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -6366,7 +4811,7 @@ debug@^3.1.0, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5:
+debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5:
   version "4.3.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
   integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
@@ -6391,13 +4836,6 @@ decamelize@^5.0.0:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-5.0.1.tgz#db11a92e58c741ef339fb0a2868d8a06a9a7b1e9"
   integrity sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==
 
-decode-named-character-reference@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/decode-named-character-reference/-/decode-named-character-reference-1.0.2.tgz#daabac9690874c394c81e4162a0304b35d824f0e"
-  integrity sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==
-  dependencies:
-    character-entities "^2.0.0"
-
 dedent@^1.0.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.5.1.tgz#4f3fc94c8b711e9bb2800d185cd6ad20f2a90aff"
@@ -6464,24 +4902,11 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
-dequal@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
-  integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
-
 detect-browser@^5.2.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.3.0.tgz#9705ef2bddf46072d0f7265a1fe300e36fe7ceca"
   integrity sha512-53rsFbGdwMwlF7qvCt0ypLM5V5/Mbl0szB7GPN8y9NCcbknYOeVVXdrXEq+90IwAfrrzt6Hd+u2E2ntakICU8w==
 
-detect-indent@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-0.2.0.tgz#042914498979ac2d9f3c73e4ff3e6877d3bc92b6"
-  integrity sha512-C6jyrDu/eGH4KT0ZxAzijiH+ts5YLy7DqGFoDuHGxZjMOdjzRltp3jByySnpFBVIy4Em0ZkLN8tIV6mcREdw5A==
-  dependencies:
-    get-stdin "^0.1.0"
-    minimist "^0.1.0"
-
 detect-indent@^6.0.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"
@@ -6497,13 +4922,6 @@ detect-newline@^3.0.0:
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
-devlop@^1.0.0, devlop@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/devlop/-/devlop-1.1.0.tgz#4db7c2ca4dc6e0e834c30be70c94bbc976dc7018"
-  integrity sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==
-  dependencies:
-    dequal "^2.0.0"
-
 diff-sequences@^29.6.3:
   version "29.6.3"
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921"
@@ -6603,20 +5021,6 @@ dotenv@^10.0.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
   integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
 
-dts-bundle@^0.7.3:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/dts-bundle/-/dts-bundle-0.7.3.tgz#372b7bb69c820782e6382f400739a69dced3d59a"
-  integrity sha512-EEAEuPRk8QyKhoN90NHTh+spSQujkkvOnKWUfuzpmC/fgryiWopL1SegSktx0UsoPfNidIGVDN7/AXpBDBv0WQ==
-  dependencies:
-    "@types/detect-indent" "0.1.30"
-    "@types/glob" "5.0.30"
-    "@types/mkdirp" "0.3.29"
-    "@types/node" "8.0.0"
-    commander "^2.9.0"
-    detect-indent "^0.2.0"
-    glob "^6.0.4"
-    mkdirp "^0.5.0"
-
 eastasianwidth@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
@@ -6831,26 +5235,6 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-esast-util-from-estree@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/esast-util-from-estree/-/esast-util-from-estree-2.0.0.tgz#8d1cfb51ad534d2f159dc250e604f3478a79f1ad"
-  integrity sha512-4CyanoAudUSBAn5K13H4JhsMH6L9ZP7XbLVe/dKybkxMO7eDyLsT8UHl9TRNrU2Gr9nz+FovfSIjuXWJ81uVwQ==
-  dependencies:
-    "@types/estree-jsx" "^1.0.0"
-    devlop "^1.0.0"
-    estree-util-visit "^2.0.0"
-    unist-util-position-from-estree "^2.0.0"
-
-esast-util-from-js@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/esast-util-from-js/-/esast-util-from-js-2.0.1.tgz#5147bec34cc9da44accf52f87f239a40ac3e8225"
-  integrity sha512-8Ja+rNJ0Lt56Pcf3TAmpBZjmx8ZcK5Ts4cAzIOjsjevg9oSXJnl6SUQ2EevU8tv3h6ZLWmoKL5H4fgWvdvfETw==
-  dependencies:
-    "@types/estree-jsx" "^1.0.0"
-    acorn "^8.0.0"
-    esast-util-from-estree "^2.0.0"
-    vfile-message "^4.0.0"
-
 esbuild@^0.17.17:
   version "0.17.19"
   resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.19.tgz#087a727e98299f0462a3d0bcdd9cd7ff100bd955"
@@ -7172,53 +5556,6 @@ estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
-estree-util-attach-comments@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/estree-util-attach-comments/-/estree-util-attach-comments-3.0.0.tgz#344bde6a64c8a31d15231e5ee9e297566a691c2d"
-  integrity sha512-cKUwm/HUcTDsYh/9FgnuFqpfquUbwIqwKM26BVCGDPVgvaCl/nDCCjUfiLlx6lsEZ3Z4RFxNbOQ60pkaEwFxGw==
-  dependencies:
-    "@types/estree" "^1.0.0"
-
-estree-util-build-jsx@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/estree-util-build-jsx/-/estree-util-build-jsx-3.0.1.tgz#b6d0bced1dcc4f06f25cf0ceda2b2dcaf98168f1"
-  integrity sha512-8U5eiL6BTrPxp/CHbs2yMgP8ftMhR5ww1eIKoWRMlqvltHF8fZn5LRDvTKuxD3DUn+shRbLGqXemcP51oFCsGQ==
-  dependencies:
-    "@types/estree-jsx" "^1.0.0"
-    devlop "^1.0.0"
-    estree-util-is-identifier-name "^3.0.0"
-    estree-walker "^3.0.0"
-
-estree-util-is-identifier-name@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/estree-util-is-identifier-name/-/estree-util-is-identifier-name-3.0.0.tgz#0b5ef4c4ff13508b34dcd01ecfa945f61fce5dbd"
-  integrity sha512-hFtqIDZTIUZ9BXLb8y4pYGyk6+wekIivNVTcmvk8NoOh+VeRn5y6cEHzbURrWbfp1fIqdVipilzj+lfaadNZmg==
-
-estree-util-scope@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/estree-util-scope/-/estree-util-scope-1.0.0.tgz#9cbdfc77f5cb51e3d9ed4ad9c4adbff22d43e585"
-  integrity sha512-2CAASclonf+JFWBNJPndcOpA8EMJwa0Q8LUFJEKqXLW6+qBvbFZuF5gItbQOs/umBUkjviCSDCbBwU2cXbmrhQ==
-  dependencies:
-    "@types/estree" "^1.0.0"
-    devlop "^1.0.0"
-
-estree-util-to-js@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/estree-util-to-js/-/estree-util-to-js-2.0.0.tgz#10a6fb924814e6abb62becf0d2bc4dea51d04f17"
-  integrity sha512-WDF+xj5rRWmD5tj6bIqRi6CkLIXbbNQUcxQHzGysQzvHmdYG2G7p/Tf0J0gpxGgkeMZNTIjT/AoSvC9Xehcgdg==
-  dependencies:
-    "@types/estree-jsx" "^1.0.0"
-    astring "^1.8.0"
-    source-map "^0.7.0"
-
-estree-util-visit@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/estree-util-visit/-/estree-util-visit-2.0.0.tgz#13a9a9f40ff50ed0c022f831ddf4b58d05446feb"
-  integrity sha512-m5KgiH85xAhhW8Wta0vShLcUvOsh3LLPI2YVwcbio1l7E09NTLL1EyMZFM1OyWowoH0skScNbhOPl4kcBgzTww==
-  dependencies:
-    "@types/estree-jsx" "^1.0.0"
-    "@types/unist" "^3.0.0"
-
 estree-walker@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
@@ -7229,13 +5566,6 @@ estree-walker@^2.0.2:
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
   integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
 
-estree-walker@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-3.0.3.tgz#67c3e549ec402a487b4fc193d1953a524752340d"
-  integrity sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==
-  dependencies:
-    "@types/estree" "^1.0.0"
-
 esutils@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
@@ -7324,14 +5654,7 @@ expect@^29.0.0, expect@^29.7.0:
     jest-message-util "^29.7.0"
     jest-util "^29.7.0"
 
-extend-shallow@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==
-  dependencies:
-    is-extendable "^0.1.0"
-
-extend@^3.0.0, extend@~3.0.2:
+extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@@ -7668,11 +5991,6 @@ get-package-type@^0.1.0:
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
   integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
 
-get-stdin@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-0.1.0.tgz#5998af24aafc802d15c82c685657eeb8b10d4a91"
-  integrity sha512-/WBu3IaQZxE3bs3BhBmR10ipDY4pjN+U4EZgXULa1eqKA0B/Lka/MVoAqhTVYBkkRlCrEGDOU9itrzIgm9Ksng==
-
 get-stream@^5.0.0, get-stream@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
@@ -7740,29 +6058,6 @@ glob@10.3.10:
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
     path-scurry "^1.10.1"
 
-glob@^10.3.10:
-  version "10.4.5"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956"
-  integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==
-  dependencies:
-    foreground-child "^3.1.0"
-    jackspeak "^3.1.2"
-    minimatch "^9.0.4"
-    minipass "^7.1.2"
-    package-json-from-dist "^1.0.0"
-    path-scurry "^1.11.1"
-
-glob@^6.0.4:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
-  integrity sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
@@ -7898,16 +6193,6 @@ graphemer@^1.4.0:
   resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
   integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
 
-gray-matter@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/gray-matter/-/gray-matter-4.0.3.tgz#e893c064825de73ea1f5f7d88c7a9f7274288798"
-  integrity sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==
-  dependencies:
-    js-yaml "^3.13.1"
-    kind-of "^6.0.2"
-    section-matter "^1.0.0"
-    strip-bom-string "^1.0.0"
-
 hard-rejection@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
@@ -7959,56 +6244,6 @@ hasown@^2.0.0, hasown@^2.0.1, hasown@^2.0.2:
   dependencies:
     function-bind "^1.1.2"
 
-hast-util-to-estree@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/hast-util-to-estree/-/hast-util-to-estree-3.1.0.tgz#f2afe5e869ddf0cf690c75f9fc699f3180b51b19"
-  integrity sha512-lfX5g6hqVh9kjS/B9E2gSkvHH4SZNiQFiqWS0x9fENzEl+8W12RqdRxX6d/Cwxi30tPQs3bIO+aolQJNp1bIyw==
-  dependencies:
-    "@types/estree" "^1.0.0"
-    "@types/estree-jsx" "^1.0.0"
-    "@types/hast" "^3.0.0"
-    comma-separated-tokens "^2.0.0"
-    devlop "^1.0.0"
-    estree-util-attach-comments "^3.0.0"
-    estree-util-is-identifier-name "^3.0.0"
-    hast-util-whitespace "^3.0.0"
-    mdast-util-mdx-expression "^2.0.0"
-    mdast-util-mdx-jsx "^3.0.0"
-    mdast-util-mdxjs-esm "^2.0.0"
-    property-information "^6.0.0"
-    space-separated-tokens "^2.0.0"
-    style-to-object "^0.4.0"
-    unist-util-position "^5.0.0"
-    zwitch "^2.0.0"
-
-hast-util-to-jsx-runtime@^2.0.0:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/hast-util-to-jsx-runtime/-/hast-util-to-jsx-runtime-2.3.2.tgz#6d11b027473e69adeaa00ca4cfb5bb68e3d282fa"
-  integrity sha512-1ngXYb+V9UT5h+PxNRa1O1FYguZK/XL+gkeqvp7EdHlB9oHUG0eYRo/vY5inBdcqo3RkPMC58/H94HvkbfGdyg==
-  dependencies:
-    "@types/estree" "^1.0.0"
-    "@types/hast" "^3.0.0"
-    "@types/unist" "^3.0.0"
-    comma-separated-tokens "^2.0.0"
-    devlop "^1.0.0"
-    estree-util-is-identifier-name "^3.0.0"
-    hast-util-whitespace "^3.0.0"
-    mdast-util-mdx-expression "^2.0.0"
-    mdast-util-mdx-jsx "^3.0.0"
-    mdast-util-mdxjs-esm "^2.0.0"
-    property-information "^6.0.0"
-    space-separated-tokens "^2.0.0"
-    style-to-object "^1.0.0"
-    unist-util-position "^5.0.0"
-    vfile-message "^4.0.0"
-
-hast-util-whitespace@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-3.0.0.tgz#7778ed9d3c92dd9e8c5c8f648a49c21fc51cb621"
-  integrity sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==
-  dependencies:
-    "@types/hast" "^3.0.0"
-
 hoist-non-react-statics@3, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
@@ -8170,16 +6405,6 @@ ini@^1.3.5:
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
-inline-style-parser@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1"
-  integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==
-
-inline-style-parser@0.2.4:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.2.4.tgz#f4af5fe72e612839fcd453d989a586566d695f22"
-  integrity sha512-0aO8FkhNZlj/ZIbNi7Lxxr12obT7cL1moPfE4tg1LkX7LlLfC6DeX4l2ZEud1ukP9jNQyNnfzQVqwbwmAATY4Q==
-
 internal-slot@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802"
@@ -8209,7 +6434,7 @@ intl-messageformat-parser@^5.3.7:
   dependencies:
     "@formatjs/intl-numberformat" "^5.5.2"
 
-intl-messageformat@10.7.7, intl-messageformat@^10.1.0:
+intl-messageformat@10.7.7:
   version "10.7.7"
   resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.7.7.tgz#42085e1664729d02240a03346e31a2540b1112a0"
   integrity sha512-F134jIoeYMro/3I0h08D0Yt4N9o9pjddU/4IIxMMURqbAtI2wu70X8hvG1V48W49zXHXv3RKSF/po+0fDfsGjA==
@@ -8224,19 +6449,6 @@ ipaddr.js@^2.0.1:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.2.0.tgz#d33fa7bac284f4de7af949638c9d68157c6b92e8"
   integrity sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==
 
-is-alphabetical@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-2.0.1.tgz#01072053ea7c1036df3c7d19a6daaec7f19e789b"
-  integrity sha512-FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ==
-
-is-alphanumerical@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-2.0.1.tgz#7c03fbe96e3e931113e57f964b0a368cc2dfd875"
-  integrity sha512-hmbYhX/9MUMF5uh7tOXyK/n0ZvWpad5caBA17GsC6vyuCqaWliRG5K1qS9inmUhEMaOBIW7/whAnSwveW/LtZw==
-  dependencies:
-    is-alphabetical "^2.0.0"
-    is-decimal "^2.0.0"
-
 is-array-buffer@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98"
@@ -8329,21 +6541,11 @@ is-date-object@^1.0.1, is-date-object@^1.0.5:
   dependencies:
     has-tostringtag "^1.0.0"
 
-is-decimal@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-2.0.1.tgz#9469d2dc190d0214fd87d78b78caecc0cc14eef7"
-  integrity sha512-AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A==
-
 is-docker@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-3.0.0.tgz#90093aa3106277d8a77a5910dbae71747e15a200"
   integrity sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==
 
-is-extendable@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==
-
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
@@ -8385,11 +6587,6 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3:
   dependencies:
     is-extglob "^2.1.1"
 
-is-hexadecimal@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-2.0.1.tgz#86b5bf668fca307498d319dfc03289d781a90027"
-  integrity sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==
-
 is-installed-globally@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520"
@@ -8448,12 +6645,7 @@ is-plain-obj@^1.1.0:
 is-plain-obj@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
-  integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
-
-is-plain-obj@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-4.1.0.tgz#d65025edec3657ce032fd7db63c97883eaed71f0"
-  integrity sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==
+  integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
 
 is-plain-object@^3.0.0:
   version "3.0.1"
@@ -8646,15 +6838,6 @@ jackspeak@^2.3.5:
   optionalDependencies:
     "@pkgjs/parseargs" "^0.11.0"
 
-jackspeak@^3.1.2:
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.3.tgz#8833a9d89ab4acde6188942bd1c53b6390ed5a8a"
-  integrity sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==
-  dependencies:
-    "@isaacs/cliui" "^8.0.2"
-  optionalDependencies:
-    "@pkgjs/parseargs" "^0.11.0"
-
 jake@^10.8.5:
   version "10.9.2"
   resolved "https://registry.yarnpkg.com/jake/-/jake-10.9.2.tgz#6ae487e6a69afec3a5e167628996b59f35ae2b7f"
@@ -9222,7 +7405,7 @@ keyv@^4.5.3:
   dependencies:
     json-buffer "3.0.1"
 
-kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
+kind-of@^6.0.2, kind-of@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
@@ -9472,11 +7655,6 @@ log-update@^5.0.1:
     strip-ansi "^7.0.1"
     wrap-ansi "^8.0.1"
 
-longest-streak@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-3.1.0.tgz#62fa67cd958742a1574af9f39866364102d90cd4"
-  integrity sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==
-
 loose-envify@^1.1.0, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
@@ -9568,11 +7746,6 @@ map-obj@^4.0.0, map-obj@^4.1.0:
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
   integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
 
-markdown-extensions@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/markdown-extensions/-/markdown-extensions-2.0.0.tgz#34bebc83e9938cae16e0e017e4a9814a8330d3c4"
-  integrity sha512-o5vL7aDWatOTX8LzaS1WMoaoxIiLRQJuIKKe2wAw6IeULDHaqbiqiggmx+pKvZDb1Sj+pE46Sn1T7lCqfFtg1Q==
-
 mathml-tag-names@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
@@ -9595,122 +7768,6 @@ md5@^2.3.0:
     crypt "0.0.2"
     is-buffer "~1.1.6"
 
-mdast-util-from-markdown@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-2.0.2.tgz#4850390ca7cf17413a9b9a0fbefcd1bc0eb4160a"
-  integrity sha512-uZhTV/8NBuw0WHkPTrCqDOl0zVe1BIng5ZtHoDk49ME1qqcjYmmLmOf0gELgcRMxN4w2iuIeVso5/6QymSrgmA==
-  dependencies:
-    "@types/mdast" "^4.0.0"
-    "@types/unist" "^3.0.0"
-    decode-named-character-reference "^1.0.0"
-    devlop "^1.0.0"
-    mdast-util-to-string "^4.0.0"
-    micromark "^4.0.0"
-    micromark-util-decode-numeric-character-reference "^2.0.0"
-    micromark-util-decode-string "^2.0.0"
-    micromark-util-normalize-identifier "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-    unist-util-stringify-position "^4.0.0"
-
-mdast-util-mdx-expression@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/mdast-util-mdx-expression/-/mdast-util-mdx-expression-2.0.1.tgz#43f0abac9adc756e2086f63822a38c8d3c3a5096"
-  integrity sha512-J6f+9hUp+ldTZqKRSg7Vw5V6MqjATc+3E4gf3CFNcuZNWD8XdyI6zQ8GqH7f8169MM6P7hMBRDVGnn7oHB9kXQ==
-  dependencies:
-    "@types/estree-jsx" "^1.0.0"
-    "@types/hast" "^3.0.0"
-    "@types/mdast" "^4.0.0"
-    devlop "^1.0.0"
-    mdast-util-from-markdown "^2.0.0"
-    mdast-util-to-markdown "^2.0.0"
-
-mdast-util-mdx-jsx@^3.0.0:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-3.1.3.tgz#76b957b3da18ebcfd0de3a9b4451dcd6fdec2320"
-  integrity sha512-bfOjvNt+1AcbPLTFMFWY149nJz0OjmewJs3LQQ5pIyVGxP4CdOqNVJL6kTaM5c68p8q82Xv3nCyFfUnuEcH3UQ==
-  dependencies:
-    "@types/estree-jsx" "^1.0.0"
-    "@types/hast" "^3.0.0"
-    "@types/mdast" "^4.0.0"
-    "@types/unist" "^3.0.0"
-    ccount "^2.0.0"
-    devlop "^1.1.0"
-    mdast-util-from-markdown "^2.0.0"
-    mdast-util-to-markdown "^2.0.0"
-    parse-entities "^4.0.0"
-    stringify-entities "^4.0.0"
-    unist-util-stringify-position "^4.0.0"
-    vfile-message "^4.0.0"
-
-mdast-util-mdx@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-mdx/-/mdast-util-mdx-3.0.0.tgz#792f9cf0361b46bee1fdf1ef36beac424a099c41"
-  integrity sha512-JfbYLAW7XnYTTbUsmpu0kdBUVe+yKVJZBItEjwyYJiDJuZ9w4eeaqks4HQO+R7objWgS2ymV60GYpI14Ug554w==
-  dependencies:
-    mdast-util-from-markdown "^2.0.0"
-    mdast-util-mdx-expression "^2.0.0"
-    mdast-util-mdx-jsx "^3.0.0"
-    mdast-util-mdxjs-esm "^2.0.0"
-    mdast-util-to-markdown "^2.0.0"
-
-mdast-util-mdxjs-esm@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-2.0.1.tgz#019cfbe757ad62dd557db35a695e7314bcc9fa97"
-  integrity sha512-EcmOpxsZ96CvlP03NghtH1EsLtr0n9Tm4lPUJUBccV9RwUOneqSycg19n5HGzCf+10LozMRSObtVr3ee1WoHtg==
-  dependencies:
-    "@types/estree-jsx" "^1.0.0"
-    "@types/hast" "^3.0.0"
-    "@types/mdast" "^4.0.0"
-    devlop "^1.0.0"
-    mdast-util-from-markdown "^2.0.0"
-    mdast-util-to-markdown "^2.0.0"
-
-mdast-util-phrasing@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-phrasing/-/mdast-util-phrasing-4.1.0.tgz#7cc0a8dec30eaf04b7b1a9661a92adb3382aa6e3"
-  integrity sha512-TqICwyvJJpBwvGAMZjj4J2n0X8QWp21b9l0o7eXyVJ25YNWYbJDVIyD1bZXE6WtV6RmKJVYmQAKWa0zWOABz2w==
-  dependencies:
-    "@types/mdast" "^4.0.0"
-    unist-util-is "^6.0.0"
-
-mdast-util-to-hast@^13.0.0:
-  version "13.2.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-13.2.0.tgz#5ca58e5b921cc0a3ded1bc02eed79a4fe4fe41f4"
-  integrity sha512-QGYKEuUsYT9ykKBCMOEDLsU5JRObWQusAolFMeko/tYPufNkRffBAQjIE+99jbA87xv6FgmjLtwjh9wBWajwAA==
-  dependencies:
-    "@types/hast" "^3.0.0"
-    "@types/mdast" "^4.0.0"
-    "@ungap/structured-clone" "^1.0.0"
-    devlop "^1.0.0"
-    micromark-util-sanitize-uri "^2.0.0"
-    trim-lines "^3.0.0"
-    unist-util-position "^5.0.0"
-    unist-util-visit "^5.0.0"
-    vfile "^6.0.0"
-
-mdast-util-to-markdown@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-2.1.2.tgz#f910ffe60897f04bb4b7e7ee434486f76288361b"
-  integrity sha512-xj68wMTvGXVOKonmog6LwyJKrYXZPvlwabaryTjLh9LuvovB/KAH+kvi8Gjj+7rJjsFi23nkUxRQv1KqSroMqA==
-  dependencies:
-    "@types/mdast" "^4.0.0"
-    "@types/unist" "^3.0.0"
-    longest-streak "^3.0.0"
-    mdast-util-phrasing "^4.0.0"
-    mdast-util-to-string "^4.0.0"
-    micromark-util-classify-character "^2.0.0"
-    micromark-util-decode-string "^2.0.0"
-    unist-util-visit "^5.0.0"
-    zwitch "^2.0.0"
-
-mdast-util-to-string@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-4.0.0.tgz#7a5121475556a04e7eddeb67b264aae79d312814"
-  integrity sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg==
-  dependencies:
-    "@types/mdast" "^4.0.0"
-
 mdn-data@2.0.14:
   version "2.0.14"
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
@@ -9781,296 +7838,6 @@ merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-micromark-core-commonmark@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/micromark-core-commonmark/-/micromark-core-commonmark-2.0.2.tgz#6a45bbb139e126b3f8b361a10711ccc7c6e15e93"
-  integrity sha512-FKjQKbxd1cibWMM1P9N+H8TwlgGgSkWZMmfuVucLCHaYqeSvJ0hFeHsIa65pA2nYbes0f8LDHPMrd9X7Ujxg9w==
-  dependencies:
-    decode-named-character-reference "^1.0.0"
-    devlop "^1.0.0"
-    micromark-factory-destination "^2.0.0"
-    micromark-factory-label "^2.0.0"
-    micromark-factory-space "^2.0.0"
-    micromark-factory-title "^2.0.0"
-    micromark-factory-whitespace "^2.0.0"
-    micromark-util-character "^2.0.0"
-    micromark-util-chunked "^2.0.0"
-    micromark-util-classify-character "^2.0.0"
-    micromark-util-html-tag-name "^2.0.0"
-    micromark-util-normalize-identifier "^2.0.0"
-    micromark-util-resolve-all "^2.0.0"
-    micromark-util-subtokenize "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-extension-mdx-expression@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-extension-mdx-expression/-/micromark-extension-mdx-expression-3.0.0.tgz#1407b9ce69916cf5e03a196ad9586889df25302a"
-  integrity sha512-sI0nwhUDz97xyzqJAbHQhp5TfaxEvZZZ2JDqUo+7NvyIYG6BZ5CPPqj2ogUoPJlmXHBnyZUzISg9+oUmU6tUjQ==
-  dependencies:
-    "@types/estree" "^1.0.0"
-    devlop "^1.0.0"
-    micromark-factory-mdx-expression "^2.0.0"
-    micromark-factory-space "^2.0.0"
-    micromark-util-character "^2.0.0"
-    micromark-util-events-to-acorn "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-extension-mdx-jsx@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/micromark-extension-mdx-jsx/-/micromark-extension-mdx-jsx-3.0.1.tgz#5abb83da5ddc8e473a374453e6ea56fbd66b59ad"
-  integrity sha512-vNuFb9czP8QCtAQcEJn0UJQJZA8Dk6DXKBqx+bg/w0WGuSxDxNr7hErW89tHUY31dUW4NqEOWwmEUNhjTFmHkg==
-  dependencies:
-    "@types/acorn" "^4.0.0"
-    "@types/estree" "^1.0.0"
-    devlop "^1.0.0"
-    estree-util-is-identifier-name "^3.0.0"
-    micromark-factory-mdx-expression "^2.0.0"
-    micromark-factory-space "^2.0.0"
-    micromark-util-character "^2.0.0"
-    micromark-util-events-to-acorn "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-    vfile-message "^4.0.0"
-
-micromark-extension-mdx-md@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-extension-mdx-md/-/micromark-extension-mdx-md-2.0.0.tgz#1d252881ea35d74698423ab44917e1f5b197b92d"
-  integrity sha512-EpAiszsB3blw4Rpba7xTOUptcFeBFi+6PY8VnJ2hhimH+vCQDirWgsMpz7w1XcZE7LVrSAUGb9VJpG9ghlYvYQ==
-  dependencies:
-    micromark-util-types "^2.0.0"
-
-micromark-extension-mdxjs-esm@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-extension-mdxjs-esm/-/micromark-extension-mdxjs-esm-3.0.0.tgz#de21b2b045fd2059bd00d36746081de38390d54a"
-  integrity sha512-DJFl4ZqkErRpq/dAPyeWp15tGrcrrJho1hKK5uBS70BCtfrIFg81sqcTVu3Ta+KD1Tk5vAtBNElWxtAa+m8K9A==
-  dependencies:
-    "@types/estree" "^1.0.0"
-    devlop "^1.0.0"
-    micromark-core-commonmark "^2.0.0"
-    micromark-util-character "^2.0.0"
-    micromark-util-events-to-acorn "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-    unist-util-position-from-estree "^2.0.0"
-    vfile-message "^4.0.0"
-
-micromark-extension-mdxjs@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-extension-mdxjs/-/micromark-extension-mdxjs-3.0.0.tgz#b5a2e0ed449288f3f6f6c544358159557549de18"
-  integrity sha512-A873fJfhnJ2siZyUrJ31l34Uqwy4xIFmvPY1oj+Ean5PHcPBYzEsvqvWGaWcfEIr11O5Dlw3p2y0tZWpKHDejQ==
-  dependencies:
-    acorn "^8.0.0"
-    acorn-jsx "^5.0.0"
-    micromark-extension-mdx-expression "^3.0.0"
-    micromark-extension-mdx-jsx "^3.0.0"
-    micromark-extension-mdx-md "^2.0.0"
-    micromark-extension-mdxjs-esm "^3.0.0"
-    micromark-util-combine-extensions "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-factory-destination@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/micromark-factory-destination/-/micromark-factory-destination-2.0.1.tgz#8fef8e0f7081f0474fbdd92deb50c990a0264639"
-  integrity sha512-Xe6rDdJlkmbFRExpTOmRj9N3MaWmbAgdpSrBQvCFqhezUn4AHqJHbaEnfbVYYiexVSs//tqOdY/DxhjdCiJnIA==
-  dependencies:
-    micromark-util-character "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-factory-label@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/micromark-factory-label/-/micromark-factory-label-2.0.1.tgz#5267efa97f1e5254efc7f20b459a38cb21058ba1"
-  integrity sha512-VFMekyQExqIW7xIChcXn4ok29YE3rnuyveW3wZQWWqF4Nv9Wk5rgJ99KzPvHjkmPXF93FXIbBp6YdW3t71/7Vg==
-  dependencies:
-    devlop "^1.0.0"
-    micromark-util-character "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-factory-mdx-expression@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/micromark-factory-mdx-expression/-/micromark-factory-mdx-expression-2.0.2.tgz#2afaa8ba6d5f63e0cead3e4dee643cad184ca260"
-  integrity sha512-5E5I2pFzJyg2CtemqAbcyCktpHXuJbABnsb32wX2U8IQKhhVFBqkcZR5LRm1WVoFqa4kTueZK4abep7wdo9nrw==
-  dependencies:
-    "@types/estree" "^1.0.0"
-    devlop "^1.0.0"
-    micromark-factory-space "^2.0.0"
-    micromark-util-character "^2.0.0"
-    micromark-util-events-to-acorn "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-    unist-util-position-from-estree "^2.0.0"
-    vfile-message "^4.0.0"
-
-micromark-factory-space@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/micromark-factory-space/-/micromark-factory-space-2.0.1.tgz#36d0212e962b2b3121f8525fc7a3c7c029f334fc"
-  integrity sha512-zRkxjtBxxLd2Sc0d+fbnEunsTj46SWXgXciZmHq0kDYGnck/ZSGj9/wULTV95uoeYiK5hRXP2mJ98Uo4cq/LQg==
-  dependencies:
-    micromark-util-character "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-factory-title@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/micromark-factory-title/-/micromark-factory-title-2.0.1.tgz#237e4aa5d58a95863f01032d9ee9b090f1de6e94"
-  integrity sha512-5bZ+3CjhAd9eChYTHsjy6TGxpOFSKgKKJPJxr293jTbfry2KDoWkhBb6TcPVB4NmzaPhMs1Frm9AZH7OD4Cjzw==
-  dependencies:
-    micromark-factory-space "^2.0.0"
-    micromark-util-character "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-factory-whitespace@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/micromark-factory-whitespace/-/micromark-factory-whitespace-2.0.1.tgz#06b26b2983c4d27bfcc657b33e25134d4868b0b1"
-  integrity sha512-Ob0nuZ3PKt/n0hORHyvoD9uZhr+Za8sFoP+OnMcnWK5lngSzALgQYKMr9RJVOWLqQYuyn6ulqGWSXdwf6F80lQ==
-  dependencies:
-    micromark-factory-space "^2.0.0"
-    micromark-util-character "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-util-character@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/micromark-util-character/-/micromark-util-character-2.1.1.tgz#2f987831a40d4c510ac261e89852c4e9703ccda6"
-  integrity sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==
-  dependencies:
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-util-chunked@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/micromark-util-chunked/-/micromark-util-chunked-2.0.1.tgz#47fbcd93471a3fccab86cff03847fc3552db1051"
-  integrity sha512-QUNFEOPELfmvv+4xiNg2sRYeS/P84pTW0TCgP5zc9FpXetHY0ab7SxKyAQCNCc1eK0459uoLI1y5oO5Vc1dbhA==
-  dependencies:
-    micromark-util-symbol "^2.0.0"
-
-micromark-util-classify-character@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/micromark-util-classify-character/-/micromark-util-classify-character-2.0.1.tgz#d399faf9c45ca14c8b4be98b1ea481bced87b629"
-  integrity sha512-K0kHzM6afW/MbeWYWLjoHQv1sgg2Q9EccHEDzSkxiP/EaagNzCm7T/WMKZ3rjMbvIpvBiZgwR3dKMygtA4mG1Q==
-  dependencies:
-    micromark-util-character "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-util-combine-extensions@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/micromark-util-combine-extensions/-/micromark-util-combine-extensions-2.0.1.tgz#2a0f490ab08bff5cc2fd5eec6dd0ca04f89b30a9"
-  integrity sha512-OnAnH8Ujmy59JcyZw8JSbK9cGpdVY44NKgSM7E9Eh7DiLS2E9RNQf0dONaGDzEG9yjEl5hcqeIsj4hfRkLH/Bg==
-  dependencies:
-    micromark-util-chunked "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-util-decode-numeric-character-reference@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-2.0.2.tgz#fcf15b660979388e6f118cdb6bf7d79d73d26fe5"
-  integrity sha512-ccUbYk6CwVdkmCQMyr64dXz42EfHGkPQlBj5p7YVGzq8I7CtjXZJrubAYezf7Rp+bjPseiROqe7G6foFd+lEuw==
-  dependencies:
-    micromark-util-symbol "^2.0.0"
-
-micromark-util-decode-string@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/micromark-util-decode-string/-/micromark-util-decode-string-2.0.1.tgz#6cb99582e5d271e84efca8e61a807994d7161eb2"
-  integrity sha512-nDV/77Fj6eH1ynwscYTOsbK7rR//Uj0bZXBwJZRfaLEJ1iGBR6kIfNmlNqaqJf649EP0F3NWNdeJi03elllNUQ==
-  dependencies:
-    decode-named-character-reference "^1.0.0"
-    micromark-util-character "^2.0.0"
-    micromark-util-decode-numeric-character-reference "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-
-micromark-util-encode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/micromark-util-encode/-/micromark-util-encode-2.0.1.tgz#0d51d1c095551cfaac368326963cf55f15f540b8"
-  integrity sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==
-
-micromark-util-events-to-acorn@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/micromark-util-events-to-acorn/-/micromark-util-events-to-acorn-2.0.2.tgz#4275834f5453c088bd29cd72dfbf80e3327cec07"
-  integrity sha512-Fk+xmBrOv9QZnEDguL9OI9/NQQp6Hz4FuQ4YmCb/5V7+9eAh1s6AYSvL20kHkD67YIg7EpE54TiSlcsf3vyZgA==
-  dependencies:
-    "@types/acorn" "^4.0.0"
-    "@types/estree" "^1.0.0"
-    "@types/unist" "^3.0.0"
-    devlop "^1.0.0"
-    estree-util-visit "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-    vfile-message "^4.0.0"
-
-micromark-util-html-tag-name@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/micromark-util-html-tag-name/-/micromark-util-html-tag-name-2.0.1.tgz#e40403096481986b41c106627f98f72d4d10b825"
-  integrity sha512-2cNEiYDhCWKI+Gs9T0Tiysk136SnR13hhO8yW6BGNyhOC4qYFnwF1nKfD3HFAIXA5c45RrIG1ub11GiXeYd1xA==
-
-micromark-util-normalize-identifier@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-2.0.1.tgz#c30d77b2e832acf6526f8bf1aa47bc9c9438c16d"
-  integrity sha512-sxPqmo70LyARJs0w2UclACPUUEqltCkJ6PhKdMIDuJ3gSf/Q+/GIe3WKl0Ijb/GyH9lOpUkRAO2wp0GVkLvS9Q==
-  dependencies:
-    micromark-util-symbol "^2.0.0"
-
-micromark-util-resolve-all@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/micromark-util-resolve-all/-/micromark-util-resolve-all-2.0.1.tgz#e1a2d62cdd237230a2ae11839027b19381e31e8b"
-  integrity sha512-VdQyxFWFT2/FGJgwQnJYbe1jjQoNTS4RjglmSjTUlpUMa95Htx9NHeYW4rGDJzbjvCsl9eLjMQwGeElsqmzcHg==
-  dependencies:
-    micromark-util-types "^2.0.0"
-
-micromark-util-sanitize-uri@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.1.tgz#ab89789b818a58752b73d6b55238621b7faa8fd7"
-  integrity sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ==
-  dependencies:
-    micromark-util-character "^2.0.0"
-    micromark-util-encode "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-
-micromark-util-subtokenize@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/micromark-util-subtokenize/-/micromark-util-subtokenize-2.0.3.tgz#70ffb99a454bd8c913c8b709c3dc97baefb65f96"
-  integrity sha512-VXJJuNxYWSoYL6AJ6OQECCFGhIU2GGHMw8tahogePBrjkG8aCCas3ibkp7RnVOSTClg2is05/R7maAhF1XyQMg==
-  dependencies:
-    devlop "^1.0.0"
-    micromark-util-chunked "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-util-symbol@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz#e5da494e8eb2b071a0d08fb34f6cefec6c0a19b8"
-  integrity sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==
-
-micromark-util-types@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/micromark-util-types/-/micromark-util-types-2.0.1.tgz#a3edfda3022c6c6b55bfb049ef5b75d70af50709"
-  integrity sha512-534m2WhVTddrcKVepwmVEVnUAmtrx9bfIjNoQHRqfnvdaHQiFytEhJoTgpWJvDEXCO5gLTQh3wYC1PgOJA4NSQ==
-
-micromark@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/micromark/-/micromark-4.0.1.tgz#294c2f12364759e5f9e925a767ae3dfde72223ff"
-  integrity sha512-eBPdkcoCNvYcxQOAKAlceo5SNdzZWfF+FcSupREAzdAh9rRmE239CEQAiTwIgblwnoM8zzj35sZ5ZwvSEOF6Kw==
-  dependencies:
-    "@types/debug" "^4.0.0"
-    debug "^4.0.0"
-    decode-named-character-reference "^1.0.0"
-    devlop "^1.0.0"
-    micromark-core-commonmark "^2.0.0"
-    micromark-factory-space "^2.0.0"
-    micromark-util-character "^2.0.0"
-    micromark-util-chunked "^2.0.0"
-    micromark-util-combine-extensions "^2.0.0"
-    micromark-util-decode-numeric-character-reference "^2.0.0"
-    micromark-util-encode "^2.0.0"
-    micromark-util-normalize-identifier "^2.0.0"
-    micromark-util-resolve-all "^2.0.0"
-    micromark-util-sanitize-uri "^2.0.0"
-    micromark-util-subtokenize "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-
 micromatch@4.0.5, micromatch@^4.0.5:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
@@ -10114,13 +7881,6 @@ min-indent@^1.0.0, min-indent@^1.0.1:
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
-"minimatch@2 || 3", minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
-  dependencies:
-    brace-expansion "^1.1.7"
-
 minimatch@9.0.3:
   version "9.0.3"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
@@ -10128,6 +7888,13 @@ minimatch@9.0.3:
   dependencies:
     brace-expansion "^2.0.1"
 
+minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+  dependencies:
+    brace-expansion "^1.1.7"
+
 minimatch@^5.0.1:
   version "5.1.6"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
@@ -10151,11 +7918,6 @@ minimist-options@4.1.0, minimist-options@^4.0.2:
     is-plain-obj "^1.1.0"
     kind-of "^6.0.3"
 
-minimist@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"
-  integrity sha512-wR5Ipl99t0mTGwLjQJnBjrP/O7zBbLZqvA3aw32DmLx+nXHfWctUjzDjnDx09pX1Po86WFQazF9xUzfMea3Cnw==
-
 minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
@@ -10173,7 +7935,7 @@ minipass@^5.0.0:
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
   integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
 
-"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.1.2:
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
   integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
@@ -10186,13 +7948,6 @@ minizlib@^2.1.1:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
-mkdirp@^0.5.0:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
-  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
-  dependencies:
-    minimist "^1.2.6"
-
 mkdirp@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
@@ -10237,41 +7992,6 @@ next-basics@^0.39.0:
     jsonwebtoken "^9.0.0"
     pure-rand "^6.0.2"
 
-next-mdx-remote@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/next-mdx-remote/-/next-mdx-remote-5.0.0.tgz#028a2cf5cf7f814d988d7ab11a401bed0f31b4ee"
-  integrity sha512-RNNbqRpK9/dcIFZs/esQhuLA8jANqlH694yqoDBK8hkVdJUndzzGmnPHa2nyi90N4Z9VmzuSWNRpr5ItT3M7xQ==
-  dependencies:
-    "@babel/code-frame" "^7.23.5"
-    "@mdx-js/mdx" "^3.0.1"
-    "@mdx-js/react" "^3.0.1"
-    unist-util-remove "^3.1.0"
-    vfile "^6.0.1"
-    vfile-matter "^5.0.0"
-
-next@15.0.2:
-  version "15.0.2"
-  resolved "https://registry.yarnpkg.com/next/-/next-15.0.2.tgz#4a2224c007856118010b8cef5e9b2383cd743388"
-  integrity sha512-rxIWHcAu4gGSDmwsELXacqAPUk+j8dV/A9cDF5fsiCMpkBDYkO2AEaL1dfD+nNmDiU6QMCFN8Q30VEKapT9UHQ==
-  dependencies:
-    "@next/env" "15.0.2"
-    "@swc/counter" "0.1.3"
-    "@swc/helpers" "0.5.13"
-    busboy "1.6.0"
-    caniuse-lite "^1.0.30001579"
-    postcss "8.4.31"
-    styled-jsx "5.1.6"
-  optionalDependencies:
-    "@next/swc-darwin-arm64" "15.0.2"
-    "@next/swc-darwin-x64" "15.0.2"
-    "@next/swc-linux-arm64-gnu" "15.0.2"
-    "@next/swc-linux-arm64-musl" "15.0.2"
-    "@next/swc-linux-x64-gnu" "15.0.2"
-    "@next/swc-linux-x64-musl" "15.0.2"
-    "@next/swc-win32-arm64-msvc" "15.0.2"
-    "@next/swc-win32-x64-msvc" "15.0.2"
-    sharp "^0.33.5"
-
 next@15.0.3:
   version "15.0.3"
   resolved "https://registry.yarnpkg.com/next/-/next-15.0.3.tgz#804f5b772e7570ef1f088542a59860914d3288e9"
@@ -10575,11 +8295,6 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-package-json-from-dist@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz#4f1471a010827a86f94cfd9b0727e36d267de505"
-  integrity sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==
-
 parent-module@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
@@ -10587,20 +8302,6 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-entities@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-4.0.1.tgz#4e2a01111fb1c986549b944af39eeda258fc9e4e"
-  integrity sha512-SWzvYcSJh4d/SGLIOQfZ/CoNv6BTlI6YEQ7Nj82oDVnRpwe/Z/F1EMx42x3JAOwGBlCjeCH0BRJQbQ/opHL17w==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    character-entities "^2.0.0"
-    character-entities-legacy "^3.0.0"
-    character-reference-invalid "^2.0.0"
-    decode-named-character-reference "^1.0.0"
-    is-alphanumerical "^2.0.0"
-    is-decimal "^2.0.0"
-    is-hexadecimal "^2.0.0"
-
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
@@ -10649,7 +8350,7 @@ path-parse@^1.0.7:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
-path-scurry@^1.10.1, path-scurry@^1.11.1:
+path-scurry@^1.10.1:
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2"
   integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==
@@ -11382,11 +9083,6 @@ property-expr@^2.0.4:
   resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.6.tgz#f77bc00d5928a6c748414ad12882e83f24aec1e8"
   integrity sha512-SVtmxhRE/CGkn3eZY1T6pC8Nln6Fr/lu1mKSgRud0eC73whjGfoAogbn78LkD8aFL0zz3bAFerKSnOl7NlErBA==
 
-property-information@^6.0.0:
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/property-information/-/property-information-6.5.0.tgz#6212fbb52ba757e92ef4fb9d657563b933b7ffec"
-  integrity sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==
-
 proxy-from-env@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
@@ -11444,89 +9140,6 @@ randombytes@^2.1.0:
   dependencies:
     safe-buffer "^5.1.0"
 
-react-aria-components@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/react-aria-components/-/react-aria-components-1.5.0.tgz#9c51ba8427e827d1192f965249e16ff7d34cbb55"
-  integrity sha512-wzf0g6cvWrqAJd4FkisAfFnslx6AJREgOd/NEmVE/RGuDxGTzss4awcwbo98rIVmqbTTFApiygy0SyWGrRZfDA==
-  dependencies:
-    "@internationalized/date" "^3.6.0"
-    "@internationalized/string" "^3.2.5"
-    "@react-aria/collections" "3.0.0-alpha.6"
-    "@react-aria/color" "^3.0.2"
-    "@react-aria/disclosure" "^3.0.0"
-    "@react-aria/dnd" "^3.8.0"
-    "@react-aria/focus" "^3.19.0"
-    "@react-aria/interactions" "^3.22.5"
-    "@react-aria/live-announcer" "^3.4.1"
-    "@react-aria/menu" "^3.16.0"
-    "@react-aria/toolbar" "3.0.0-beta.11"
-    "@react-aria/tree" "3.0.0-beta.2"
-    "@react-aria/utils" "^3.26.0"
-    "@react-aria/virtualizer" "^4.1.0"
-    "@react-stately/color" "^3.8.1"
-    "@react-stately/disclosure" "^3.0.0"
-    "@react-stately/layout" "^4.1.0"
-    "@react-stately/menu" "^3.9.0"
-    "@react-stately/selection" "^3.18.0"
-    "@react-stately/table" "^3.13.0"
-    "@react-stately/utils" "^3.10.5"
-    "@react-stately/virtualizer" "^4.2.0"
-    "@react-types/color" "^3.0.1"
-    "@react-types/form" "^3.7.8"
-    "@react-types/grid" "^3.2.10"
-    "@react-types/shared" "^3.26.0"
-    "@react-types/table" "^3.10.3"
-    "@swc/helpers" "^0.5.0"
-    client-only "^0.0.1"
-    react-aria "^3.36.0"
-    react-stately "^3.34.0"
-    use-sync-external-store "^1.2.0"
-
-react-aria@^3.36.0:
-  version "3.36.0"
-  resolved "https://registry.yarnpkg.com/react-aria/-/react-aria-3.36.0.tgz#95a8e3340ab400bfec4d159e47da8861469e5bcd"
-  integrity sha512-AK5XyIhAN+e5HDlwlF+YwFrOrVI7RYmZ6kg/o7ZprQjkYqYKapXeUpWscmNm/3H2kDboE5Z4ymUnK6ZhobLqOw==
-  dependencies:
-    "@internationalized/string" "^3.2.5"
-    "@react-aria/breadcrumbs" "^3.5.19"
-    "@react-aria/button" "^3.11.0"
-    "@react-aria/calendar" "^3.6.0"
-    "@react-aria/checkbox" "^3.15.0"
-    "@react-aria/color" "^3.0.2"
-    "@react-aria/combobox" "^3.11.0"
-    "@react-aria/datepicker" "^3.12.0"
-    "@react-aria/dialog" "^3.5.20"
-    "@react-aria/disclosure" "^3.0.0"
-    "@react-aria/dnd" "^3.8.0"
-    "@react-aria/focus" "^3.19.0"
-    "@react-aria/gridlist" "^3.10.0"
-    "@react-aria/i18n" "^3.12.4"
-    "@react-aria/interactions" "^3.22.5"
-    "@react-aria/label" "^3.7.13"
-    "@react-aria/link" "^3.7.7"
-    "@react-aria/listbox" "^3.13.6"
-    "@react-aria/menu" "^3.16.0"
-    "@react-aria/meter" "^3.4.18"
-    "@react-aria/numberfield" "^3.11.9"
-    "@react-aria/overlays" "^3.24.0"
-    "@react-aria/progress" "^3.4.18"
-    "@react-aria/radio" "^3.10.10"
-    "@react-aria/searchfield" "^3.7.11"
-    "@react-aria/select" "^3.15.0"
-    "@react-aria/selection" "^3.21.0"
-    "@react-aria/separator" "^3.4.4"
-    "@react-aria/slider" "^3.7.14"
-    "@react-aria/ssr" "^3.9.7"
-    "@react-aria/switch" "^3.6.10"
-    "@react-aria/table" "^3.16.0"
-    "@react-aria/tabs" "^3.9.8"
-    "@react-aria/tag" "^3.4.8"
-    "@react-aria/textfield" "^3.15.0"
-    "@react-aria/tooltip" "^3.7.10"
-    "@react-aria/utils" "^3.26.0"
-    "@react-aria/visually-hidden" "^3.8.18"
-    "@react-types/shared" "^3.26.0"
-
 react-basics@^0.125.0:
   version "0.125.0"
   resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.125.0.tgz#6baf3fea503fb4475f51877efa05d1a734b232c6"
@@ -11559,13 +9172,6 @@ react-dom@^18.2.0:
     loose-envify "^1.1.0"
     scheduler "^0.23.2"
 
-react-dom@^19.0.0-rc-66855b96-20241106:
-  version "19.0.0-rc-fb9a90fa48-20240614"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-19.0.0-rc-fb9a90fa48-20240614.tgz#8dce9ed0650096d65437e4bce790628e483831a2"
-  integrity sha512-PoEsPe32F7KPLYOBvZfjylEI1B67N44PwY3lyvpmBkhlluLnLz0jH8q2Wg9YidAi6z0k3iUnNRm5x10wurzt9Q==
-  dependencies:
-    scheduler "0.25.0-rc-fb9a90fa48-20240614"
-
 react-error-boundary@^4.0.4:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/react-error-boundary/-/react-error-boundary-4.1.2.tgz#bc750ad962edb8b135d6ae922c046051eb58f289"
@@ -11578,16 +9184,6 @@ react-hook-form@^7.34.2:
   resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.47.0.tgz#a42f07266bd297ddf1f914f08f4b5f9783262f31"
   integrity sha512-F/TroLjTICipmHeFlMrLtNLceO2xr1jU3CyiNla5zdwsGUGu2UOxxR4UyJgLlhMwLW/Wzp4cpJ7CPfgJIeKdSg==
 
-react-hook-form@^7.53.0:
-  version "7.53.2"
-  resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.53.2.tgz#6fa37ae27330af81089baadd7f322cc987b8e2ac"
-  integrity sha512-YVel6fW5sOeedd1524pltpHX+jgU2u3DSDtXEaBORNdqiNrsX/nUI/iGXONegttg0mJVnfrIkiV0cmTU6Oo2xw==
-
-react-icons@^5.2.1:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-5.3.0.tgz#ccad07a30aebd40a89f8cfa7d82e466019203f1c"
-  integrity sha512-DnUk8aFbTyQPSkCfF8dbX6kQjXA9DktMeJqfjrg6cK9vwQVMxmcA3BfP4QoiztVmEHtwlTgLFsPuH2NskKT6eg==
-
 react-intl@^6.5.5:
   version "6.8.9"
   resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-6.8.9.tgz#ef36b2a19a0eb97afbeaeab9679273fcbf2ea261"
@@ -11641,37 +9237,6 @@ react-simple-maps@^2.3.0:
     d3-zoom "^2.0.0"
     topojson-client "^3.1.0"
 
-react-stately@^3.34.0:
-  version "3.34.0"
-  resolved "https://registry.yarnpkg.com/react-stately/-/react-stately-3.34.0.tgz#981713fa00bb2ef07b981dbce466d9a5774101d4"
-  integrity sha512-0N9tZ8qQ/CxpJH7ao0O6gr+8955e7VrOskg9N+TIxkFknPetwOCtgppMYhnTfteBV8WfM/vv4OC1NbkgYTqXJA==
-  dependencies:
-    "@react-stately/calendar" "^3.6.0"
-    "@react-stately/checkbox" "^3.6.10"
-    "@react-stately/collections" "^3.12.0"
-    "@react-stately/color" "^3.8.1"
-    "@react-stately/combobox" "^3.10.1"
-    "@react-stately/data" "^3.12.0"
-    "@react-stately/datepicker" "^3.11.0"
-    "@react-stately/disclosure" "^3.0.0"
-    "@react-stately/dnd" "^3.5.0"
-    "@react-stately/form" "^3.1.0"
-    "@react-stately/list" "^3.11.1"
-    "@react-stately/menu" "^3.9.0"
-    "@react-stately/numberfield" "^3.9.8"
-    "@react-stately/overlays" "^3.6.12"
-    "@react-stately/radio" "^3.10.9"
-    "@react-stately/searchfield" "^3.5.8"
-    "@react-stately/select" "^3.6.9"
-    "@react-stately/selection" "^3.18.0"
-    "@react-stately/slider" "^3.6.0"
-    "@react-stately/table" "^3.13.0"
-    "@react-stately/tabs" "^3.7.0"
-    "@react-stately/toggle" "^3.8.0"
-    "@react-stately/tooltip" "^3.5.0"
-    "@react-stately/tree" "^3.8.6"
-    "@react-types/shared" "^3.26.0"
-
 react-use-measure@^2.0.4:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/react-use-measure/-/react-use-measure-2.1.1.tgz#5824537f4ee01c9469c45d5f7a8446177c6cc4ba"
@@ -11694,11 +9259,6 @@ react@^18.2.0:
   dependencies:
     loose-envify "^1.1.0"
 
-react@^19.0.0-rc-66855b96-20241106:
-  version "19.0.0-rc-fb9a90fa48-20240614"
-  resolved "https://registry.yarnpkg.com/react/-/react-19.0.0-rc-fb9a90fa48-20240614.tgz#90eb43a0b005e8cc3cbf0d801c14816d01df1b08"
-  integrity sha512-nvE3Gy+IOIfH/DXhkyxFVQSrITarFcQz4+shzC/McxQXEUSonpw2oDy/Wi9hdDtV3hlP12VYuDL95iiBREedNQ==
-
 read-babelrc-up@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-babelrc-up/-/read-babelrc-up-1.1.0.tgz#10fd5baaf6ca03eaba6748fa65ddae25bca61e70"
@@ -11761,53 +9321,6 @@ read-pkg@^6.0.0:
     parse-json "^5.2.0"
     type-fest "^1.0.1"
 
-recma-build-jsx@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/recma-build-jsx/-/recma-build-jsx-1.0.0.tgz#c02f29e047e103d2fab2054954e1761b8ea253c4"
-  integrity sha512-8GtdyqaBcDfva+GUKDr3nev3VpKAhup1+RvkMvUxURHpW7QyIvk9F5wz7Vzo06CEMSilw6uArgRqhpiUcWp8ew==
-  dependencies:
-    "@types/estree" "^1.0.0"
-    estree-util-build-jsx "^3.0.0"
-    vfile "^6.0.0"
-
-recma-jsx@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/recma-jsx/-/recma-jsx-1.0.0.tgz#f7bef02e571a49d6ba3efdfda8e2efab48dbe3aa"
-  integrity sha512-5vwkv65qWwYxg+Atz95acp8DMu1JDSqdGkA2Of1j6rCreyFUE/gp15fC8MnGEuG1W68UKjM6x6+YTWIh7hZM/Q==
-  dependencies:
-    acorn-jsx "^5.0.0"
-    estree-util-to-js "^2.0.0"
-    recma-parse "^1.0.0"
-    recma-stringify "^1.0.0"
-    unified "^11.0.0"
-
-recma-parse@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/recma-parse/-/recma-parse-1.0.0.tgz#c351e161bb0ab47d86b92a98a9d891f9b6814b52"
-  integrity sha512-OYLsIGBB5Y5wjnSnQW6t3Xg7q3fQ7FWbw/vcXtORTnyaSFscOtABg+7Pnz6YZ6c27fG1/aN8CjfwoUEUIdwqWQ==
-  dependencies:
-    "@types/estree" "^1.0.0"
-    esast-util-from-js "^2.0.0"
-    unified "^11.0.0"
-    vfile "^6.0.0"
-
-recma-stringify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/recma-stringify/-/recma-stringify-1.0.0.tgz#54632030631e0c7546136ff9ef8fde8e7b44f130"
-  integrity sha512-cjwII1MdIIVloKvC9ErQ+OgAtwHBmcZ0Bg4ciz78FtbT8In39aAYbaA7zvxQ61xVMSPE8WxhLwLbhif4Js2C+g==
-  dependencies:
-    "@types/estree" "^1.0.0"
-    estree-util-to-js "^2.0.0"
-    unified "^11.0.0"
-    vfile "^6.0.0"
-
-recursive-readdir@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.3.tgz#e726f328c0d69153bcabd5c322d3195252379372"
-  integrity sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==
-  dependencies:
-    minimatch "^3.0.5"
-
 redent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
@@ -11909,44 +9422,6 @@ regjsparser@^0.9.1:
   dependencies:
     jsesc "~0.5.0"
 
-rehype-recma@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/rehype-recma/-/rehype-recma-1.0.0.tgz#d68ef6344d05916bd96e25400c6261775411aa76"
-  integrity sha512-lqA4rGUf1JmacCNWWZx0Wv1dHqMwxzsDWYMTowuplHF3xH0N/MmrZ/G3BDZnzAkRmxDadujCjaKM2hqYdCBOGw==
-  dependencies:
-    "@types/estree" "^1.0.0"
-    "@types/hast" "^3.0.0"
-    hast-util-to-estree "^3.0.0"
-
-remark-mdx@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/remark-mdx/-/remark-mdx-3.1.0.tgz#f979be729ecb35318fa48e2135c1169607a78343"
-  integrity sha512-Ngl/H3YXyBV9RcRNdlYsZujAmhsxwzxpDzpDEhFBVAGthS4GDgnctpDjgFl/ULx5UEDzqtW1cyBSNKqYYrqLBA==
-  dependencies:
-    mdast-util-mdx "^3.0.0"
-    micromark-extension-mdxjs "^3.0.0"
-
-remark-parse@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-11.0.0.tgz#aa60743fcb37ebf6b069204eb4da304e40db45a1"
-  integrity sha512-FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA==
-  dependencies:
-    "@types/mdast" "^4.0.0"
-    mdast-util-from-markdown "^2.0.0"
-    micromark-util-types "^2.0.0"
-    unified "^11.0.0"
-
-remark-rehype@^11.0.0:
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/remark-rehype/-/remark-rehype-11.1.1.tgz#f864dd2947889a11997c0a2667cd6b38f685bca7"
-  integrity sha512-g/osARvjkBXb6Wo0XvAeXQohVta8i84ACbenPpoSsxTOQH/Ae0/RGP4WZgnMH5pMLpsj4FG7OHmcIcXxpza8eQ==
-  dependencies:
-    "@types/hast" "^3.0.0"
-    "@types/mdast" "^4.0.0"
-    mdast-util-to-hast "^13.0.0"
-    unified "^11.0.0"
-    vfile "^6.0.0"
-
 request-ip@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/request-ip/-/request-ip-3.3.0.tgz#863451e8fec03847d44f223e30a5d63e369fa611"
@@ -12191,11 +9666,6 @@ safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-scheduler@0.25.0-rc-fb9a90fa48-20240614:
-  version "0.25.0-rc-fb9a90fa48-20240614"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.25.0-rc-fb9a90fa48-20240614.tgz#9ee11063b7c0f47aef3fea53d9f1be3f13794dce"
-  integrity sha512-HHqQ/SqbeiDfXXVKgNxTpbQTD4n7IUb4hZATvHjp03jr3TF7igehCyHdOjeYTrzIseLO93cTTfSb5f4qWcirMQ==
-
 scheduler@^0.23.2:
   version "0.23.2"
   resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.2.tgz#414ba64a3b282892e944cf2108ecc078d115cdc3"
@@ -12222,14 +9692,6 @@ schema-utils@^2.6.6:
     ajv "^6.12.4"
     ajv-keywords "^3.5.2"
 
-section-matter@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/section-matter/-/section-matter-1.0.0.tgz#e9041953506780ec01d59f292a19c7b850b84167"
-  integrity sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==
-  dependencies:
-    extend-shallow "^2.0.1"
-    kind-of "^6.0.0"
-
 "semver@2 || 3 || 4 || 5", semver@^5.5.0:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
@@ -12446,16 +9908,6 @@ source-map@^0.6.0, source-map@^0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@^0.7.0:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
-  integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
-
-space-separated-tokens@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz#1ecd9d2350a3844572c3f4a312bceb018348859f"
-  integrity sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==
-
 spdx-correct@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c"
@@ -12537,7 +9989,16 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -12627,15 +10088,14 @@ string.prototype.trimstart@^1.0.8:
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
-stringify-entities@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-4.0.4.tgz#b3b79ef5f277cc4ac73caeb0236c5ba939b3a4f3"
-  integrity sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
   dependencies:
-    character-entities-html4 "^2.0.0"
-    character-entities-legacy "^3.0.0"
+    ansi-regex "^5.0.1"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -12649,11 +10109,6 @@ strip-ansi@^7.0.1:
   dependencies:
     ansi-regex "^6.0.1"
 
-strip-bom-string@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92"
-  integrity sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==
-
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
@@ -12703,20 +10158,6 @@ style-search@^0.1.0:
   resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
   integrity sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==
 
-style-to-object@^0.4.0:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.4.4.tgz#266e3dfd56391a7eefb7770423612d043c3f33ec"
-  integrity sha512-HYNoHZa2GorYNyqiCaBgsxvcJIn7OHq6inEga+E6Ke3m5JkoqpQbnFssk4jwe+K7AhGa2fcha4wSOf1Kn01dMg==
-  dependencies:
-    inline-style-parser "0.1.1"
-
-style-to-object@^1.0.0:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-1.0.8.tgz#67a29bca47eaa587db18118d68f9d95955e81292"
-  integrity sha512-xT47I/Eo0rwJmaXC4oilDGDWLohVhR6o/xAQcPQN8q6QBuZVL8qMYL85kLmST5cPjAorwvqIA4qXTRQoYHaL6g==
-  dependencies:
-    inline-style-parser "0.2.4"
-
 styled-jsx@5.1.6:
   version "5.1.6"
   resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-5.1.6.tgz#83b90c077e6c6a80f7f5e8781d0f311b2fe41499"
@@ -13010,11 +10451,6 @@ tree-kill@1.2.2:
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
   integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
-trim-lines@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/trim-lines/-/trim-lines-3.0.1.tgz#d802e332a07df861c48802c04321017b1bd87338"
-  integrity sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==
-
 trim-newlines@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
@@ -13025,11 +10461,6 @@ trim-newlines@^4.0.2:
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-4.1.1.tgz#28c88deb50ed10c7ba6dc2474421904a00139125"
   integrity sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ==
 
-trough@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/trough/-/trough-2.2.0.tgz#94a60bd6bd375c152c1df911a4b11d5b0256f50f"
-  integrity sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==
-
 ts-api-utils@^1.0.1, ts-api-utils@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.4.0.tgz#709c6f2076e511a81557f3d07a0cbd566ae8195c"
@@ -13079,7 +10510,7 @@ tsconfig-paths@^3.15.0:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@2, tslib@^2.1.0, tslib@^2.4.0, tslib@^2.8.0:
+tslib@2, tslib@^2.1.0, tslib@^2.4.0:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
   integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
@@ -13254,88 +10685,6 @@ unicode-property-aliases-ecmascript@^2.0.0:
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
   integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
 
-unified@^11.0.0:
-  version "11.0.5"
-  resolved "https://registry.yarnpkg.com/unified/-/unified-11.0.5.tgz#f66677610a5c0a9ee90cab2b8d4d66037026d9e1"
-  integrity sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==
-  dependencies:
-    "@types/unist" "^3.0.0"
-    bail "^2.0.0"
-    devlop "^1.0.0"
-    extend "^3.0.0"
-    is-plain-obj "^4.0.0"
-    trough "^2.0.0"
-    vfile "^6.0.0"
-
-unist-util-is@^5.0.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-5.2.1.tgz#b74960e145c18dcb6226bc57933597f5486deae9"
-  integrity sha512-u9njyyfEh43npf1M+yGKDGVPbY/JWEemg5nH05ncKPfi+kBbKBJoTdsogMu33uhytuLlv9y0O7GH7fEdwLdLQw==
-  dependencies:
-    "@types/unist" "^2.0.0"
-
-unist-util-is@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-6.0.0.tgz#b775956486aff107a9ded971d996c173374be424"
-  integrity sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==
-  dependencies:
-    "@types/unist" "^3.0.0"
-
-unist-util-position-from-estree@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unist-util-position-from-estree/-/unist-util-position-from-estree-2.0.0.tgz#d94da4df596529d1faa3de506202f0c9a23f2200"
-  integrity sha512-KaFVRjoqLyF6YXCbVLNad/eS4+OfPQQn2yOd7zF/h5T/CSL2v8NpN6a5TPvtbXthAGw5nG+PuTtq+DdIZr+cRQ==
-  dependencies:
-    "@types/unist" "^3.0.0"
-
-unist-util-position@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-5.0.0.tgz#678f20ab5ca1207a97d7ea8a388373c9cf896be4"
-  integrity sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==
-  dependencies:
-    "@types/unist" "^3.0.0"
-
-unist-util-remove@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/unist-util-remove/-/unist-util-remove-3.1.1.tgz#8bfa181aff916bd32a4ed30b3ed76d0c21c077df"
-  integrity sha512-kfCqZK5YVY5yEa89tvpl7KnBBHu2c6CzMkqHUrlOqaRgGOMp0sMvwWOVrbAtj03KhovQB7i96Gda72v/EFE0vw==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    unist-util-is "^5.0.0"
-    unist-util-visit-parents "^5.0.0"
-
-unist-util-stringify-position@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz#449c6e21a880e0855bf5aabadeb3a740314abac2"
-  integrity sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==
-  dependencies:
-    "@types/unist" "^3.0.0"
-
-unist-util-visit-parents@^5.0.0:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-5.1.3.tgz#b4520811b0ca34285633785045df7a8d6776cfeb"
-  integrity sha512-x6+y8g7wWMyQhL1iZfhIPhDAs7Xwbn9nRosDXl7qoPTSCy0yNxnKc+hWokFifWQIDGi154rdUqKvbCa4+1kLhg==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    unist-util-is "^5.0.0"
-
-unist-util-visit-parents@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz#4d5f85755c3b8f0dc69e21eca5d6d82d22162815"
-  integrity sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==
-  dependencies:
-    "@types/unist" "^3.0.0"
-    unist-util-is "^6.0.0"
-
-unist-util-visit@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-5.0.0.tgz#a7de1f31f72ffd3519ea71814cccf5fd6a9217d6"
-  integrity sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==
-  dependencies:
-    "@types/unist" "^3.0.0"
-    unist-util-is "^6.0.0"
-    unist-util-visit-parents "^6.0.0"
-
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
@@ -13371,7 +10720,7 @@ use-memo-one@^1.1.1:
   resolved "https://registry.yarnpkg.com/use-memo-one/-/use-memo-one-1.1.3.tgz#2fd2e43a2169eabc7496960ace8c79efef975e99"
   integrity sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==
 
-use-sync-external-store@1.2.2, use-sync-external-store@^1.2.0:
+use-sync-external-store@1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.2.tgz#c3b6390f3a30eba13200d2302dcdf1e7b57b2ef9"
   integrity sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw==
@@ -13427,30 +10776,6 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vfile-matter@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/vfile-matter/-/vfile-matter-5.0.0.tgz#4f8d6476a432f9556784a8b538f7da0ba25e053d"
-  integrity sha512-jhPSqlj8hTSkTXOqyxbUeZAFFVq/iwu/jukcApEqc/7DOidaAth6rDc0Zgg0vWpzUnWkwFP7aK28l6nBmxMqdQ==
-  dependencies:
-    vfile "^6.0.0"
-    yaml "^2.0.0"
-
-vfile-message@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-4.0.2.tgz#c883c9f677c72c166362fd635f21fc165a7d1181"
-  integrity sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==
-  dependencies:
-    "@types/unist" "^3.0.0"
-    unist-util-stringify-position "^4.0.0"
-
-vfile@^6.0.0, vfile@^6.0.1:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/vfile/-/vfile-6.0.3.tgz#3652ab1c496531852bf55a6bac57af981ebc38ab"
-  integrity sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==
-  dependencies:
-    "@types/unist" "^3.0.0"
-    vfile-message "^4.0.0"
-
 vue@^3.2.23:
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/vue/-/vue-3.3.4.tgz#8ed945d3873667df1d0fcf3b2463ada028f88bd6"
@@ -13543,7 +10868,7 @@ word-wrap@^1.2.5:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
   integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -13561,6 +10886,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
@@ -13638,11 +10972,6 @@ yaml@^1.10.2:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-yaml@^2.0.0:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.6.1.tgz#42f2b1ba89203f374609572d5349fb8686500773"
-  integrity sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==
-
 yargs-parser@^18.1.3:
   version "18.1.3"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
@@ -13705,14 +11034,9 @@ yup@^0.32.11:
     property-expr "^2.0.4"
     toposort "^2.0.2"
 
-zustand@^4.5.0, zustand@^4.5.5:
+zustand@^4.5.5:
   version "4.5.5"
   resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.5.5.tgz#f8c713041543715ec81a2adda0610e1dc82d4ad1"
   integrity sha512-+0PALYNJNgK6hldkgDq2vLrw5f6g/jCInz52n9RTpropGgeAf/ioFUCdtsjCqu4gNhW9D01rUQBROoRjdzyn2Q==
   dependencies:
     use-sync-external-store "1.2.2"
-
-zwitch@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-2.0.4.tgz#c827d4b0acb76fc3e685a4c6ec2902d51070e9d7"
-  integrity sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==

From 1c377bcdc3ec00168b9b7dd24dd57ad03c85ea5e Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Mon, 25 Nov 2024 14:11:17 -0800
Subject: [PATCH 423/438] Removed zen styles.

---
 src/app/layout.tsx |  1 -
 yarn.lock          | 49 ++++++----------------------------------------
 2 files changed, 6 insertions(+), 44 deletions(-)

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index b1489436ce..3c0ed43c9c 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -7,7 +7,6 @@ import '@fontsource/inter/700.css';
 import 'react-basics/dist/styles.css';
 import 'styles/index.css';
 import 'styles/variables.css';
-import '@umami/react-zen/dist/styles.css';
 
 export default function ({ children }) {
   return (
diff --git a/yarn.lock b/yarn.lock
index 9e0633efad..637f352dcc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2049,18 +2049,6 @@
   resolved "https://registry.yarnpkg.com/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.5.tgz#56f00962ff0c4e0eb93d34a047d29fa995e3e342"
   integrity sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==
 
-"@isaacs/cliui@^8.0.2":
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
-  integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
-  dependencies:
-    string-width "^5.1.2"
-    string-width-cjs "npm:string-width@^4.2.0"
-    strip-ansi "^7.0.1"
-    strip-ansi-cjs "npm:strip-ansi@^6.0.1"
-    wrap-ansi "^8.1.0"
-    wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
-
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
@@ -6829,12 +6817,12 @@ iterator.prototype@^1.1.3:
     reflect.getprototypeof "^1.0.4"
     set-function-name "^2.0.1"
 
-jackspeak@^2.3.5:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8"
-  integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==
+jackspeak@2.1.1, jackspeak@^2.3.5:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.1.1.tgz#2a42db4cfbb7e55433c28b6f75d8b796af9669cd"
+  integrity sha512-juf9stUEwUaILepraGOWIJTLwg48bUnBmRqd2ln2Os1sW987zeoj/hzhbvRB95oMuS2ZTpjULmdwHNX4rzZIZw==
   dependencies:
-    "@isaacs/cliui" "^8.0.2"
+    cliui "^8.0.1"
   optionalDependencies:
     "@pkgjs/parseargs" "^0.11.0"
 
@@ -9989,15 +9977,6 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
 string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -10007,7 +9986,7 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string-width@^5.0.0, string-width@^5.0.1, string-width@^5.1.2:
+string-width@^5.0.0, string-width@^5.0.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
   integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
@@ -10088,13 +10067,6 @@ string.prototype.trimstart@^1.0.8:
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -10868,15 +10840,6 @@ word-wrap@^1.2.5:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
   integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"

From 83af7fa18ae1cc6f16479e5971e77b0c4a1fd680 Mon Sep 17 00:00:00 2001
From: Max Beer <max-beer@web.de>
Date: Tue, 26 Nov 2024 13:20:48 +0100
Subject: [PATCH 424/438] respect www subdomain when fetching website favicon

---
 src/components/common/Favicon.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/common/Favicon.tsx b/src/components/common/Favicon.tsx
index e78bdbc7de..47c65aab14 100644
--- a/src/components/common/Favicon.tsx
+++ b/src/components/common/Favicon.tsx
@@ -1,5 +1,5 @@
 function getHostName(url: string) {
-  const match = url.match(/^(?:https?:\/\/)?(?:[^@\n]+@)?(?:www\.)?([^:/\n?=]+)/im);
+  const match = url.match(/^(?:https?:\/\/)?(?:[^@\n]+@)?([^:/\n?=]+)/im);
   return match && match.length > 1 ? match[1] : null;
 }
 

From dfc13ced55782238ba1b2c637df7ae2cfa1256e4 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 26 Nov 2024 09:28:57 -0800
Subject: [PATCH 425/438] next.js 15 sync-dynamic-apis update

---
 src/app/(main)/console/[[...websiteId]]/page.tsx       |  4 +++-
 src/app/(main)/reports/[reportId]/page.tsx             |  4 +++-
 src/app/(main)/settings/users/[userId]/page.tsx        |  4 +++-
 src/app/(main)/settings/websites/[websiteId]/page.tsx  |  4 +++-
 src/app/(main)/settings/websites/page.tsx              |  4 +++-
 src/app/(main)/teams/[teamId]/layout.tsx               | 10 +++++++++-
 .../(main)/teams/[teamId]/settings/members/page.tsx    |  6 ++++--
 src/app/(main)/teams/[teamId]/settings/team/page.tsx   |  4 +++-
 .../(main)/teams/[teamId]/settings/websites/page.tsx   |  4 +++-
 src/app/(main)/websites/[websiteId]/compare/page.tsx   |  4 +++-
 src/app/(main)/websites/[websiteId]/events/page.tsx    |  4 +++-
 src/app/(main)/websites/[websiteId]/layout.tsx         | 10 +++++++++-
 src/app/(main)/websites/[websiteId]/page.tsx           |  4 +++-
 src/app/(main)/websites/[websiteId]/realtime/page.tsx  |  4 +++-
 src/app/(main)/websites/[websiteId]/reports/page.tsx   |  4 +++-
 .../websites/[websiteId]/sessions/[sessionId]/page.tsx |  8 +++++++-
 src/app/(main)/websites/[websiteId]/sessions/page.tsx  |  4 +++-
 src/app/share/[...shareId]/page.tsx                    |  4 +++-
 18 files changed, 71 insertions(+), 19 deletions(-)

diff --git a/src/app/(main)/console/[[...websiteId]]/page.tsx b/src/app/(main)/console/[[...websiteId]]/page.tsx
index 2cbdddcc0a..93eafee470 100644
--- a/src/app/(main)/console/[[...websiteId]]/page.tsx
+++ b/src/app/(main)/console/[[...websiteId]]/page.tsx
@@ -5,7 +5,9 @@ async function getEnabled() {
   return !!process.env.ENABLE_TEST_CONSOLE;
 }
 
-export default async function ({ params: { websiteId } }) {
+export default async function ({ params }: { params: { websiteId: string } }) {
+  const { websiteId } = await params;
+
   const enabled = await getEnabled();
 
   if (!enabled) {
diff --git a/src/app/(main)/reports/[reportId]/page.tsx b/src/app/(main)/reports/[reportId]/page.tsx
index 690daf4780..85a97d1ca2 100644
--- a/src/app/(main)/reports/[reportId]/page.tsx
+++ b/src/app/(main)/reports/[reportId]/page.tsx
@@ -1,7 +1,9 @@
 import { Metadata } from 'next';
 import ReportPage from './ReportPage';
 
-export default function ({ params: { reportId } }) {
+export default async function ({ params }: { params: { reportId: string } }) {
+  const { reportId } = await params;
+
   return <ReportPage reportId={reportId} />;
 }
 
diff --git a/src/app/(main)/settings/users/[userId]/page.tsx b/src/app/(main)/settings/users/[userId]/page.tsx
index d5dc5005dd..3b3a3fac9c 100644
--- a/src/app/(main)/settings/users/[userId]/page.tsx
+++ b/src/app/(main)/settings/users/[userId]/page.tsx
@@ -1,7 +1,9 @@
 import UserPage from './UserPage';
 import { Metadata } from 'next';
 
-export default function ({ params: { userId } }) {
+export default async function ({ params }: { params: { userId: string } }) {
+  const { userId } = await params;
+
   return <UserPage userId={userId} />;
 }
 
diff --git a/src/app/(main)/settings/websites/[websiteId]/page.tsx b/src/app/(main)/settings/websites/[websiteId]/page.tsx
index f3d87c7883..7e2feaf26e 100644
--- a/src/app/(main)/settings/websites/[websiteId]/page.tsx
+++ b/src/app/(main)/settings/websites/[websiteId]/page.tsx
@@ -1,7 +1,9 @@
 import WebsiteSettingsPage from './WebsiteSettingsPage';
 import { Metadata } from 'next';
 
-export default async function ({ params: { websiteId } }) {
+export default async function ({ params }: { params: { websiteId: string } }) {
+  const { websiteId } = await params;
+
   return <WebsiteSettingsPage websiteId={websiteId} />;
 }
 
diff --git a/src/app/(main)/settings/websites/page.tsx b/src/app/(main)/settings/websites/page.tsx
index d073b32b58..d05be0a5c8 100644
--- a/src/app/(main)/settings/websites/page.tsx
+++ b/src/app/(main)/settings/websites/page.tsx
@@ -1,7 +1,9 @@
 import { Metadata } from 'next';
 import WebsitesSettingsPage from './WebsitesSettingsPage';
 
-export default function ({ params: { teamId } }: { params: { teamId: string } }) {
+export default async function ({ params }: { params: { teamId: string } }) {
+  const { teamId } = await params;
+
   return <WebsitesSettingsPage teamId={teamId} />;
 }
 
diff --git a/src/app/(main)/teams/[teamId]/layout.tsx b/src/app/(main)/teams/[teamId]/layout.tsx
index e10cdb9431..0452ae9769 100644
--- a/src/app/(main)/teams/[teamId]/layout.tsx
+++ b/src/app/(main)/teams/[teamId]/layout.tsx
@@ -2,7 +2,15 @@ import TeamProvider from './TeamProvider';
 import { Metadata } from 'next';
 import TeamSettingsLayout from './settings/TeamSettingsLayout';
 
-export default function ({ children, params: { teamId } }) {
+export default async function ({
+  children,
+  params,
+}: {
+  children: any;
+  params: { teamId: string };
+}) {
+  const { teamId } = await params;
+
   return (
     <TeamProvider teamId={teamId}>
       <TeamSettingsLayout>{children}</TeamSettingsLayout>
diff --git a/src/app/(main)/teams/[teamId]/settings/members/page.tsx b/src/app/(main)/teams/[teamId]/settings/members/page.tsx
index fbee6a8ea0..9810f7a20f 100644
--- a/src/app/(main)/teams/[teamId]/settings/members/page.tsx
+++ b/src/app/(main)/teams/[teamId]/settings/members/page.tsx
@@ -1,7 +1,9 @@
-import TeamMembersPage from './TeamMembersPage';
 import { Metadata } from 'next';
+import TeamMembersPage from './TeamMembersPage';
+
+export default async function ({ params }: { params: { teamId: string } }) {
+  const { teamId } = await params;
 
-export default function ({ params: { teamId } }) {
   return <TeamMembersPage teamId={teamId} />;
 }
 
diff --git a/src/app/(main)/teams/[teamId]/settings/team/page.tsx b/src/app/(main)/teams/[teamId]/settings/team/page.tsx
index 0c4dd2012b..f15d5fb61f 100644
--- a/src/app/(main)/teams/[teamId]/settings/team/page.tsx
+++ b/src/app/(main)/teams/[teamId]/settings/team/page.tsx
@@ -1,7 +1,9 @@
 import { Metadata } from 'next';
 import TeamPage from './TeamPage';
 
-export default function ({ params: { teamId } }) {
+export default async function ({ params }: { params: { teamId: string } }) {
+  const { teamId } = await params;
+
   return <TeamPage teamId={teamId} />;
 }
 
diff --git a/src/app/(main)/teams/[teamId]/settings/websites/page.tsx b/src/app/(main)/teams/[teamId]/settings/websites/page.tsx
index cfb465fb42..6709eb6715 100644
--- a/src/app/(main)/teams/[teamId]/settings/websites/page.tsx
+++ b/src/app/(main)/teams/[teamId]/settings/websites/page.tsx
@@ -1,7 +1,9 @@
 import TeamWebsitesPage from './TeamWebsitesPage';
 import { Metadata } from 'next';
 
-export default function ({ params: { teamId } }) {
+export default async function ({ params }: { params: { teamId: string } }) {
+  const { teamId } = await params;
+
   return <TeamWebsitesPage teamId={teamId} />;
 }
 
diff --git a/src/app/(main)/websites/[websiteId]/compare/page.tsx b/src/app/(main)/websites/[websiteId]/compare/page.tsx
index b3009fcaaa..bdd29bd54f 100644
--- a/src/app/(main)/websites/[websiteId]/compare/page.tsx
+++ b/src/app/(main)/websites/[websiteId]/compare/page.tsx
@@ -1,7 +1,9 @@
 import WebsiteComparePage from './WebsiteComparePage';
 import { Metadata } from 'next';
 
-export default function ({ params: { websiteId } }) {
+export default async function ({ params }: { params: { websiteId: string } }) {
+  const { websiteId } = await params;
+
   return <WebsiteComparePage websiteId={websiteId} />;
 }
 
diff --git a/src/app/(main)/websites/[websiteId]/events/page.tsx b/src/app/(main)/websites/[websiteId]/events/page.tsx
index b5dc4d62ca..1b88824452 100644
--- a/src/app/(main)/websites/[websiteId]/events/page.tsx
+++ b/src/app/(main)/websites/[websiteId]/events/page.tsx
@@ -1,7 +1,9 @@
 import { Metadata } from 'next';
 import EventsPage from './EventsPage';
 
-export default async function ({ params: { websiteId } }) {
+export default async function ({ params }: { params: { websiteId: string } }) {
+  const { websiteId } = await params;
+
   return <EventsPage websiteId={websiteId} />;
 }
 
diff --git a/src/app/(main)/websites/[websiteId]/layout.tsx b/src/app/(main)/websites/[websiteId]/layout.tsx
index f8756ea3e7..1df69cd316 100644
--- a/src/app/(main)/websites/[websiteId]/layout.tsx
+++ b/src/app/(main)/websites/[websiteId]/layout.tsx
@@ -1,7 +1,15 @@
 import { Metadata } from 'next';
 import WebsiteProvider from './WebsiteProvider';
 
-export default function ({ children, params: { websiteId } }) {
+export default async function ({
+  children,
+  params,
+}: {
+  children: any;
+  params: { websiteId: string };
+}) {
+  const { websiteId } = await params;
+
   return <WebsiteProvider websiteId={websiteId}>{children}</WebsiteProvider>;
 }
 
diff --git a/src/app/(main)/websites/[websiteId]/page.tsx b/src/app/(main)/websites/[websiteId]/page.tsx
index 49bca9b6f4..d3aa1633ac 100644
--- a/src/app/(main)/websites/[websiteId]/page.tsx
+++ b/src/app/(main)/websites/[websiteId]/page.tsx
@@ -1,7 +1,9 @@
 import WebsiteDetailsPage from './WebsiteDetailsPage';
 import { Metadata } from 'next';
 
-export default function WebsitePage({ params: { websiteId } }) {
+export default async function WebsitePage({ params }: { params: { websiteId: string } }) {
+  const { websiteId } = await params;
+
   return <WebsiteDetailsPage websiteId={websiteId} />;
 }
 
diff --git a/src/app/(main)/websites/[websiteId]/realtime/page.tsx b/src/app/(main)/websites/[websiteId]/realtime/page.tsx
index 0ca7ffd83c..f205caddfc 100644
--- a/src/app/(main)/websites/[websiteId]/realtime/page.tsx
+++ b/src/app/(main)/websites/[websiteId]/realtime/page.tsx
@@ -1,7 +1,9 @@
 import WebsiteRealtimePage from './WebsiteRealtimePage';
 import { Metadata } from 'next';
 
-export default function ({ params: { websiteId } }) {
+export default async function ({ params }: { params: { websiteId: string } }) {
+  const { websiteId } = await params;
+
   return <WebsiteRealtimePage websiteId={websiteId} />;
 }
 
diff --git a/src/app/(main)/websites/[websiteId]/reports/page.tsx b/src/app/(main)/websites/[websiteId]/reports/page.tsx
index caa805a63c..15c79de9a6 100644
--- a/src/app/(main)/websites/[websiteId]/reports/page.tsx
+++ b/src/app/(main)/websites/[websiteId]/reports/page.tsx
@@ -1,7 +1,9 @@
 import WebsiteReportsPage from './WebsiteReportsPage';
 import { Metadata } from 'next';
 
-export default function ({ params: { websiteId } }) {
+export default async function ({ params }: { params: { websiteId: string } }) {
+  const { websiteId } = await params;
+
   return <WebsiteReportsPage websiteId={websiteId} />;
 }
 
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/page.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/page.tsx
index 952e8cc580..f4882880cb 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/page.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/page.tsx
@@ -1,7 +1,13 @@
 import SessionDetailsPage from './SessionDetailsPage';
 import { Metadata } from 'next';
 
-export default function WebsitePage({ params: { websiteId, sessionId } }) {
+export default async function WebsitePage({
+  params,
+}: {
+  params: { websiteId: string; sessionId: string };
+}) {
+  const { websiteId, sessionId } = await params;
+
   return <SessionDetailsPage websiteId={websiteId} sessionId={sessionId} />;
 }
 
diff --git a/src/app/(main)/websites/[websiteId]/sessions/page.tsx b/src/app/(main)/websites/[websiteId]/sessions/page.tsx
index 771f682ddc..d1ff96f58a 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/page.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/page.tsx
@@ -1,7 +1,9 @@
 import SessionsPage from './SessionsPage';
 import { Metadata } from 'next';
 
-export default function ({ params: { websiteId } }) {
+export default async function ({ params }: { params: { websiteId: string } }) {
+  const { websiteId } = await params;
+
   return <SessionsPage websiteId={websiteId} />;
 }
 
diff --git a/src/app/share/[...shareId]/page.tsx b/src/app/share/[...shareId]/page.tsx
index e8ca8e607e..c06274aa03 100644
--- a/src/app/share/[...shareId]/page.tsx
+++ b/src/app/share/[...shareId]/page.tsx
@@ -1,5 +1,7 @@
 import SharePage from './SharePage';
 
-export default function ({ params: { shareId } }) {
+export default async function ({ params }: { params: { shareId: string } }) {
+  const { shareId } = await params;
+
   return <SharePage shareId={shareId[0]} />;
 }

From d800b42b6b58fdabaa7e145881d3b3cc6c870fa1 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 26 Nov 2024 11:02:34 -0800
Subject: [PATCH 426/438] fix sessionactivity overflow

---
 .../sessions/[sessionId]/SessionActivity.module.css        | 7 ++-----
 .../[websiteId]/sessions/[sessionId]/SessionActivity.tsx   | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.module.css b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.module.css
index b49230c7b8..fb830d3822 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.module.css
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.module.css
@@ -5,7 +5,8 @@
 }
 
 .row {
-  display: flex;
+  display: grid;
+  grid-template-columns: max-content max-content 1fr;
   align-items: center;
   gap: 20px;
 }
@@ -15,10 +16,6 @@
   width: 150px;
 }
 
-.value {
-  white-space: nowrap;
-}
-
 .header {
   font-weight: bold;
 }
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
index fd498ac3ab..642b93d996 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
@@ -42,7 +42,7 @@ export function SessionActivity({
                 </StatusLight>
               </div>
               <Icon>{eventName ? <Icons.Bolt /> : <Icons.Eye />}</Icon>
-              <div className={styles.value}>{eventName || urlPath}</div>
+              <div>{eventName || urlPath}</div>
             </div>
           </>
         );

From b5f5f07b1efb12de1dbb284c0876e4987b83dde6 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 26 Nov 2024 13:05:12 -0800
Subject: [PATCH 427/438] get min/max date from website_event_stats_hourly view

---
 src/queries/analytics/getWebsiteDateRange.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/queries/analytics/getWebsiteDateRange.ts b/src/queries/analytics/getWebsiteDateRange.ts
index a4daaafc70..ef07712eb7 100644
--- a/src/queries/analytics/getWebsiteDateRange.ts
+++ b/src/queries/analytics/getWebsiteDateRange.ts
@@ -38,7 +38,7 @@ async function clickhouseQuery(websiteId: string) {
     select
       min(created_at) as mindate,
       max(created_at) as maxdate
-    from website_event
+    from website_event_stats_hourly
     where website_id = {websiteId:UUID}
       and created_at >= {startDate:DateTime64}
     `,

From c851f3bb3cf9ec6017b157d2e0b2cdf9b4988bb6 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Wed, 27 Nov 2024 10:38:45 -0800
Subject: [PATCH 428/438] fix min date chart bug when using all time

---
 src/app/(main)/websites/[websiteId]/WebsiteChart.tsx |  3 ++-
 src/components/charts/BarChart.tsx                   |  4 +++-
 src/components/metrics/EventsChart.tsx               |  9 +++++----
 src/components/metrics/PageviewsChart.tsx            | 10 +++++++++-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx b/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
index fa5ab69423..ddeba789d1 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
@@ -11,7 +11,7 @@ export function WebsiteChart({
   compareMode?: boolean;
 }) {
   const { dateRange, dateCompare } = useDateRange(websiteId);
-  const { startDate, endDate, unit } = dateRange;
+  const { startDate, endDate, unit, value } = dateRange;
   const { data, isLoading } = useWebsitePageviews(websiteId, compareMode ? dateCompare : undefined);
   const { pageviews, sessions, compare } = (data || {}) as any;
 
@@ -49,6 +49,7 @@ export function WebsiteChart({
       maxDate={endDate.toISOString()}
       unit={unit}
       isLoading={isLoading}
+      isAllTime={value === 'all'}
     />
   );
 }
diff --git a/src/components/charts/BarChart.tsx b/src/components/charts/BarChart.tsx
index eadc4af738..7c16730e7b 100644
--- a/src/components/charts/BarChart.tsx
+++ b/src/components/charts/BarChart.tsx
@@ -14,6 +14,7 @@ export interface BarChartProps extends ChartProps {
   YAxisType?: string;
   minDate?: number | string;
   maxDate?: number | string;
+  isAllTime?: boolean;
 }
 
 export function BarChart(props: BarChartProps) {
@@ -29,6 +30,7 @@ export function BarChart(props: BarChartProps) {
     minDate,
     maxDate,
     currency,
+    isAllTime,
   } = props;
 
   const options: any = useMemo(() => {
@@ -37,7 +39,7 @@ export function BarChart(props: BarChartProps) {
         x: {
           type: XAxisType,
           stacked: true,
-          min: minDate && new Date(minDate).getSeconds() === 0 ? minDate : '',
+          min: isAllTime ? '' : minDate,
           max: maxDate,
           time: {
             unit,
diff --git a/src/components/metrics/EventsChart.tsx b/src/components/metrics/EventsChart.tsx
index f5b283449b..2ba2caeecc 100644
--- a/src/components/metrics/EventsChart.tsx
+++ b/src/components/metrics/EventsChart.tsx
@@ -1,9 +1,9 @@
-import { useMemo } from 'react';
 import { colord } from 'colord';
 import BarChart from 'components/charts/BarChart';
-import { useLocale, useDateRange, useWebsiteEventsSeries } from 'components/hooks';
-import { CHART_COLORS } from 'lib/constants';
+import { useDateRange, useLocale, useWebsiteEventsSeries } from 'components/hooks';
 import { renderDateLabels } from 'lib/charts';
+import { CHART_COLORS } from 'lib/constants';
+import { useMemo } from 'react';
 
 export interface EventsChartProps {
   websiteId: string;
@@ -12,7 +12,7 @@ export interface EventsChartProps {
 
 export function EventsChart({ websiteId, className }: EventsChartProps) {
   const {
-    dateRange: { startDate, endDate, unit },
+    dateRange: { startDate, endDate, unit, value },
   } = useDateRange(websiteId);
   const { locale } = useLocale();
   const { data, isLoading } = useWebsiteEventsSeries(websiteId);
@@ -55,6 +55,7 @@ export function EventsChart({ websiteId, className }: EventsChartProps) {
       stacked={true}
       renderXLabel={renderDateLabels(unit, locale)}
       isLoading={isLoading}
+      isAllTime={value === 'all'}
     />
   );
 }
diff --git a/src/components/metrics/PageviewsChart.tsx b/src/components/metrics/PageviewsChart.tsx
index 6ca0309494..6274defc09 100644
--- a/src/components/metrics/PageviewsChart.tsx
+++ b/src/components/metrics/PageviewsChart.tsx
@@ -14,9 +14,16 @@ export interface PagepageviewsChartProps extends BarChartProps {
   };
   unit: string;
   isLoading?: boolean;
+  isAllTime?: boolean;
 }
 
-export function PagepageviewsChart({ data, unit, isLoading, ...props }: PagepageviewsChartProps) {
+export function PagepageviewsChart({
+  data,
+  unit,
+  isLoading,
+  isAllTime,
+  ...props
+}: PagepageviewsChartProps) {
   const { formatMessage, labels } = useMessages();
   const { colors } = useTheme();
   const { locale } = useLocale();
@@ -74,6 +81,7 @@ export function PagepageviewsChart({ data, unit, isLoading, ...props }: Pagepage
       data={chartData}
       unit={unit}
       isLoading={isLoading}
+      isAllTime={isAllTime}
       renderXLabel={renderDateLabels(unit, locale)}
     />
   );

From afa903a4a0710a71b50b6203e8047deda9c383e4 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Wed, 27 Nov 2024 11:56:52 -0800
Subject: [PATCH 429/438] Don't return deleted website on share page.

---
 src/queries/prisma/website.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/queries/prisma/website.ts b/src/queries/prisma/website.ts
index c24cdd0d23..5c8debc9fe 100644
--- a/src/queries/prisma/website.ts
+++ b/src/queries/prisma/website.ts
@@ -21,6 +21,7 @@ export async function getSharedWebsite(shareId: string) {
   return findWebsite({
     where: {
       shareId,
+      deletedAt: null,
     },
   });
 }

From 4af275a7ab62afb74d8a034c5d0b440b3c1b5a36 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Wed, 27 Nov 2024 19:52:35 -0800
Subject: [PATCH 430/438] Ignore missing website id.

---
 src/pages/api/send.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/pages/api/send.ts b/src/pages/api/send.ts
index fb4e90c744..412f07d124 100644
--- a/src/pages/api/send.ts
+++ b/src/pages/api/send.ts
@@ -111,6 +111,10 @@ export default async (req: NextApiRequestCollect, res: NextApiResponse) => {
 
     session.iat = iat;
 
+    if (!session.websiteId) {
+      return;
+    }
+
     if (type === COLLECTION_TYPE.event) {
       // eslint-disable-next-line prefer-const
       let [urlPath, urlQuery] = safeDecodeURI(url)?.split('?') || [];

From c6fd20974d5b6e2f4816e6d0f1ecb3d5fc707d63 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Wed, 27 Nov 2024 22:37:47 -0800
Subject: [PATCH 431/438] Should not redirect if already on the right team.

---
 src/app/(main)/NavBar.tsx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/app/(main)/NavBar.tsx b/src/app/(main)/NavBar.tsx
index 6daae0357a..5c8bba01ad 100644
--- a/src/app/(main)/NavBar.tsx
+++ b/src/app/(main)/NavBar.tsx
@@ -86,12 +86,10 @@ export function NavBar() {
     if (!cloudMode) {
       const teamIdLocal = getItem('umami.team')?.id;
 
-      if (teamIdLocal && pathname !== '/' && pathname !== '/dashboard') {
-        const url = '/';
-        router.push(url);
-      } else if (teamIdLocal) {
-        const url = `/teams/${teamIdLocal}/dashboard`;
-        router.push(url);
+      if (teamIdLocal && teamIdLocal !== teamId) {
+        router.push(
+          pathname !== '/' && pathname !== '/dashboard' ? '/' : `/teams/${teamIdLocal}/dashboard`,
+        );
       }
     }
   }, [cloudMode]);

From 2ed7628997bdb534402b2474dab97648e43e7b6e Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Wed, 27 Nov 2024 22:51:50 -0800
Subject: [PATCH 432/438] Allow filter search for country and region.

---
 .../hooks/queries/useWebsiteValues.ts         | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/components/hooks/queries/useWebsiteValues.ts b/src/components/hooks/queries/useWebsiteValues.ts
index 68e950f266..da0406ae6b 100644
--- a/src/components/hooks/queries/useWebsiteValues.ts
+++ b/src/components/hooks/queries/useWebsiteValues.ts
@@ -1,4 +1,6 @@
 import { useApi } from '../useApi';
+import { useCountryNames, useRegionNames } from 'components/hooks';
+import useLocale from '../useLocale';
 
 export function useWebsiteValues({
   websiteId,
@@ -14,6 +16,26 @@ export function useWebsiteValues({
   search?: string;
 }) {
   const { get, useQuery } = useApi();
+  const { locale } = useLocale();
+  const { countryNames } = useCountryNames(locale);
+  const { regionNames } = useRegionNames(locale);
+
+  const names = {
+    country: countryNames,
+    region: regionNames,
+  };
+
+  const getSearch = (type: string, value: string) => {
+    if (value) {
+      const values = names[type];
+      return Object.keys(values).reduce((code: string, key: string) => {
+        if (!code && values[key].toLowerCase().includes(value.toLowerCase())) {
+          code = key;
+        }
+        return code;
+      }, '');
+    }
+  };
 
   return useQuery({
     queryKey: ['websites:values', { websiteId, type, startDate, endDate, search }],
@@ -22,7 +44,7 @@ export function useWebsiteValues({
         type,
         startAt: +startDate,
         endAt: +endDate,
-        search,
+        search: getSearch(type, search),
       }),
     enabled: !!(websiteId && type && startDate && endDate),
   });

From a18d1a923cc75c28eaaf597bce65f6be82f4224e Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Wed, 27 Nov 2024 23:43:28 -0800
Subject: [PATCH 433/438] Allow filter search for country and region.

---
 .../hooks/queries/useWebsiteValues.ts         | 15 ++++---
 src/lib/clickhouse.ts                         |  5 +++
 src/lib/prisma.ts                             |  4 +-
 src/pages/api/websites/[websiteId]/values.ts  |  8 +---
 src/queries/analytics/getValues.ts            | 40 ++++++++++++++++++-
 5 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/src/components/hooks/queries/useWebsiteValues.ts b/src/components/hooks/queries/useWebsiteValues.ts
index da0406ae6b..21985fdfc4 100644
--- a/src/components/hooks/queries/useWebsiteValues.ts
+++ b/src/components/hooks/queries/useWebsiteValues.ts
@@ -28,12 +28,15 @@ export function useWebsiteValues({
   const getSearch = (type: string, value: string) => {
     if (value) {
       const values = names[type];
-      return Object.keys(values).reduce((code: string, key: string) => {
-        if (!code && values[key].toLowerCase().includes(value.toLowerCase())) {
-          code = key;
-        }
-        return code;
-      }, '');
+      return Object.keys(values)
+        .reduce((arr: string[], key: string) => {
+          if (values[key].toLowerCase().includes(value.toLowerCase())) {
+            return arr.concat(key);
+          }
+          return arr;
+        }, [])
+        .slice(0, 5)
+        .join(',');
     }
   };
 
diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index b588ec84e5..5f0248b49c 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -68,6 +68,10 @@ function getDateSQL(field: string, unit: string, timezone?: string) {
   return `toDateTime(date_trunc('${unit}', ${field}))`;
 }
 
+function getSearchSQL(column: string, param: string = 'search'): string {
+  return `and positionCaseInsensitive(${column}, {${param}:String}) > 0`;
+}
+
 function mapFilter(column: string, operator: string, name: string, type: string = 'String') {
   const value = `{${name}:${type}}`;
 
@@ -229,6 +233,7 @@ export default {
   connect,
   getDateStringSQL,
   getDateSQL,
+  getSearchSQL,
   getFilterQuery,
   getUTCString,
   parseFilters,
diff --git a/src/lib/prisma.ts b/src/lib/prisma.ts
index 4e3de37e03..a8f7eb0633 100644
--- a/src/lib/prisma.ts
+++ b/src/lib/prisma.ts
@@ -119,11 +119,11 @@ function getTimestampDiffSQL(field1: string, field2: string): string {
   }
 }
 
-function getSearchSQL(column: string): string {
+function getSearchSQL(column: string, param: string = 'search'): string {
   const db = getDatabaseType();
   const like = db === POSTGRESQL ? 'ilike' : 'like';
 
-  return `and ${column} ${like} {{search}}`;
+  return `and ${column} ${like} {{${param}}`;
 }
 
 function mapFilter(column: string, operator: string, name: string, type: string = '') {
diff --git a/src/pages/api/websites/[websiteId]/values.ts b/src/pages/api/websites/[websiteId]/values.ts
index 364261d9dc..53d717a511 100644
--- a/src/pages/api/websites/[websiteId]/values.ts
+++ b/src/pages/api/websites/[websiteId]/values.ts
@@ -49,13 +49,7 @@ export default async (req: NextApiRequestQueryBody<ValuesRequestQuery>, res: Nex
       return unauthorized(res);
     }
 
-    const values = await getValues(
-      websiteId,
-      FILTER_COLUMNS[type as string],
-      startDate,
-      endDate,
-      search,
-    );
+    const values = await getValues(websiteId, FILTER_COLUMNS[type], startDate, endDate, search);
 
     return ok(
       res,
diff --git a/src/queries/analytics/getValues.ts b/src/queries/analytics/getValues.ts
index 8b1afb3f0b..f303faff7e 100644
--- a/src/queries/analytics/getValues.ts
+++ b/src/queries/analytics/getValues.ts
@@ -19,10 +19,25 @@ async function relationalQuery(
   search: string,
 ) {
   const { rawQuery, getSearchSQL } = prisma;
+  const params = {};
   let searchQuery = '';
 
   if (search) {
-    searchQuery = getSearchSQL(column);
+    if (decodeURIComponent(search).includes(',')) {
+      searchQuery = `AND (${decodeURIComponent(search)
+        .split(',')
+        .slice(0, 5)
+        .map((value: string, index: number) => {
+          const key = `search${index}`;
+
+          params[key] = value;
+
+          return getSearchSQL(column, key).replace('and ', '');
+        })
+        .join(' OR ')})`;
+    } else {
+      searchQuery = getSearchSQL(column);
+    }
   }
 
   return rawQuery(
@@ -43,6 +58,7 @@ async function relationalQuery(
       startDate,
       endDate,
       search: `%${search}%`,
+      ...params,
     },
   );
 }
@@ -54,13 +70,32 @@ async function clickhouseQuery(
   endDate: Date,
   search: string,
 ) {
-  const { rawQuery } = clickhouse;
+  const { rawQuery, getSearchSQL } = clickhouse;
+  const params = {};
   let searchQuery = '';
 
   if (search) {
     searchQuery = `and positionCaseInsensitive(${column}, {search:String}) > 0`;
   }
 
+  if (search) {
+    if (decodeURIComponent(search).includes(',')) {
+      searchQuery = `AND (${decodeURIComponent(search)
+        .split(',')
+        .slice(0, 5)
+        .map((value: string, index: number) => {
+          const key = `search${index}`;
+
+          params[key] = value;
+
+          return getSearchSQL(column, key).replace('and ', '');
+        })
+        .join(' OR ')})`;
+    } else {
+      searchQuery = getSearchSQL(column);
+    }
+  }
+
   return rawQuery(
     `
     select ${column} as value, count(*)
@@ -77,6 +112,7 @@ async function clickhouseQuery(
       startDate,
       endDate,
       search,
+      ...params,
     },
   );
 }

From 726212120f4055addf43e6788d1705d2fa40ac7d Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Wed, 27 Nov 2024 23:47:58 -0800
Subject: [PATCH 434/438] Use original search value if no results.

---
 .../hooks/queries/useWebsiteValues.ts         | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/components/hooks/queries/useWebsiteValues.ts b/src/components/hooks/queries/useWebsiteValues.ts
index 21985fdfc4..892af6ad4f 100644
--- a/src/components/hooks/queries/useWebsiteValues.ts
+++ b/src/components/hooks/queries/useWebsiteValues.ts
@@ -28,15 +28,17 @@ export function useWebsiteValues({
   const getSearch = (type: string, value: string) => {
     if (value) {
       const values = names[type];
-      return Object.keys(values)
-        .reduce((arr: string[], key: string) => {
-          if (values[key].toLowerCase().includes(value.toLowerCase())) {
-            return arr.concat(key);
-          }
-          return arr;
-        }, [])
-        .slice(0, 5)
-        .join(',');
+      return (
+        Object.keys(values)
+          .reduce((arr: string[], key: string) => {
+            if (values[key].toLowerCase().includes(value.toLowerCase())) {
+              return arr.concat(key);
+            }
+            return arr;
+          }, [])
+          .slice(0, 5)
+          .join(',') || value
+      );
     }
   };
 

From c744f0b0010d469cec821cb836a18c670ddfbab5 Mon Sep 17 00:00:00 2001
From: Peter Dave Hello <hsu@peterdavehello.org>
Date: Thu, 28 Nov 2024 02:11:42 +0800
Subject: [PATCH 435/438] Improve zh-TW Traditional Chinese translation a bit

---
 src/lang/zh-TW.json | 226 ++++++++++++++++++++++----------------------
 1 file changed, 113 insertions(+), 113 deletions(-)

diff --git a/src/lang/zh-TW.json b/src/lang/zh-TW.json
index a2c5d2c31b..46cdbde1fc 100644
--- a/src/lang/zh-TW.json
+++ b/src/lang/zh-TW.json
@@ -1,11 +1,11 @@
 {
   "label.access-code": "存取碼",
-  "label.actions": "行動",
-  "label.activity": "活動日誌",
+  "label.actions": "行為",
+  "label.activity": "活動紀錄",
   "label.add": "新增",
   "label.add-description": "新增描述",
-  "label.add-member": "Add member",
-  "label.add-step": "Add step",
+  "label.add-member": "新增成員",
+  "label.add-step": "新增步驟",
   "label.add-website": "新增網站",
   "label.admin": "管理員",
   "label.after": "之後",
@@ -16,7 +16,7 @@
   "label.back": "返回",
   "label.before": "之前",
   "label.bounce-rate": "跳出率",
-  "label.breakdown": "分解",
+  "label.breakdown": "細項分析",
   "label.browser": "瀏覽器",
   "label.browsers": "瀏覽器",
   "label.cancel": "取消",
@@ -24,21 +24,21 @@
   "label.cities": "城市",
   "label.city": "城市",
   "label.clear-all": "全部清除",
-  "label.compare": "Compare",
+  "label.compare": "比較",
   "label.confirm": "確認",
   "label.confirm-password": "確認密碼",
   "label.contains": "包含",
   "label.continue": "繼續",
-  "label.count": "Count",
+  "label.count": "數量",
   "label.countries": "國家",
   "label.country": "國家",
   "label.create": "建立",
-  "label.create-report": "建立報告",
+  "label.create-report": "建立報表",
   "label.create-team": "建立團隊",
   "label.create-user": "建立使用者",
   "label.created": "已建立",
-  "label.created-by": "Created By",
-  "label.current": "Current",
+  "label.created-by": "建立者",
+  "label.current": "目前",
   "label.current-password": "目前密碼",
   "label.custom-range": "自訂範圍",
   "label.dashboard": "儀表板",
@@ -48,7 +48,7 @@
   "label.day": "日",
   "label.default-date-range": "預設日期範圍",
   "label.delete": "刪除",
-  "label.delete-report": "Delete report",
+  "label.delete-report": "刪除報表",
   "label.delete-team": "刪除團隊",
   "label.delete-user": "刪除使用者",
   "label.delete-website": "刪除網站",
@@ -60,89 +60,89 @@
   "label.dismiss": "關閉",
   "label.does-not-contain": "不包含",
   "label.domain": "網域",
-  "label.dropoff": "退出",
+  "label.dropoff": "離開",
   "label.edit": "編輯",
   "label.edit-dashboard": "編輯儀表板",
-  "label.edit-member": "Edit member",
-  "label.enable-share-url": "啟用分享網址",
-  "label.end-step": "End Step",
-  "label.entry": "Entry URL",
+  "label.edit-member": "編輯成員",
+  "label.enable-share-url": "啟用分享連結",
+  "label.end-step": "結束步驟",
+  "label.entry": "進入網址",
   "label.event": "事件",
   "label.event-data": "事件資料",
   "label.events": "事件",
-  "label.exit": "Exit URL",
+  "label.exit": "離開網址",
   "label.false": "否",
   "label.field": "欄位",
   "label.fields": "欄位",
   "label.filter": "篩選器",
   "label.filter-combined": "組合",
   "label.filter-raw": "原始",
-  "label.filters": "篩選器",
-  "label.first-seen": "First seen",
-  "label.funnel": "漏斗",
-  "label.funnel-description": "瞭解使用者的轉換率和退出率",
-  "label.goal": "Goal",
-  "label.goals": "Goals",
-  "label.goals-description": "Track your goals for pageviews and events.",
+  "label.filters": "篩選條件",
+  "label.first-seen": "首次造訪",
+  "label.funnel": "漏斗分析",
+  "label.funnel-description": "瞭解使用者的轉換率與流失率。",
+  "label.goal": "目標",
+  "label.goals": "目標",
+  "label.goals-description": "追蹤網頁瀏覽和事件的目標。",
   "label.greater-than": "大於",
   "label.greater-than-equals": "大於或等於",
-  "label.host": "Host",
-  "label.hosts": "Hosts",
+  "label.host": "主機名稱",
+  "label.hosts": "主機名稱",
   "label.insights": "洞察",
-  "label.insights-description": "透過使用區段和篩選器來深入探索你的數據",
+  "label.insights-description": "使用區段和篩選器來深入分析您的資料。",
   "label.is": "是",
   "label.is-not": "不是",
   "label.is-not-set": "未設定",
   "label.is-set": "已設定",
   "label.join": "加入",
   "label.join-team": "加入團隊",
-  "label.journey": "Journey",
-  "label.journey-description": "Understand how users navigate through your website.",
+  "label.journey": "使用者旅程",
+  "label.journey-description": "瞭解使用者如何瀏覽您的網站。",
   "label.language": "語言",
   "label.languages": "語言",
   "label.laptop": "筆記型電腦",
   "label.last-days": "最近 {x} 天",
   "label.last-hours": "最近 {x} 小時",
-  "label.last-months": "Last {x} months",
-  "label.last-seen": "Last seen",
+  "label.last-months": "最近 {x} 個月",
+  "label.last-seen": "最後造訪",
   "label.leave": "離開",
   "label.leave-team": "離開團隊",
   "label.less-than": "小於",
   "label.less-than-equals": "小於或等於",
   "label.login": "登入",
   "label.logout": "登出",
-  "label.manage": "Manage",
-  "label.manager": "Manager",
-  "label.max": "最大",
-  "label.member": "Member",
+  "label.manage": "管理",
+  "label.manager": "管理者",
+  "label.max": "最大值",
+  "label.member": "成員",
   "label.members": "成員",
-  "label.min": "最小",
+  "label.min": "最小值",
   "label.mobile": "行動裝置",
   "label.more": "更多",
-  "label.my-account": "My account",
+  "label.my-account": "我的帳號",
   "label.my-websites": "我的網站",
   "label.name": "名稱",
   "label.new-password": "新密碼",
   "label.none": "無",
-  "label.number-of-records": "{x} {x, plural, one {record} other {records}}",
+  "label.number-of-records": "{x} 筆紀錄",
   "label.ok": "OK",
   "label.os": "作業系統",
-  "label.overview": "概覽",
+  "label.overview": "總覽",
   "label.owner": "擁有者",
-  "label.page-of": "頁面 {current} / {total}",
-  "label.page-views": "頁面瀏覽",
-  "label.pageTitle": "頁面標題",
-  "label.pages": "頁面",
+  "label.page-of": "第 {current} 頁，共 {total} 頁",
+  "label.page-views": "網頁瀏覽次數",
+  "label.pageTitle": "網頁標題",
+  "label.pages": "網頁",
   "label.password": "密碼",
-  "label.path": "Path",
-  "label.paths": "Paths",
-  "label.powered-by": "由 {name} 提供",
-  "label.previous": "Previous",
-  "label.previous-period": "Previous period",
-  "label.previous-year": "Previous year",
-  "label.profile": "個人資料",
-  "label.properties": "Properties",
-  "label.property": "Property",
+  "label.path": "路徑",
+  "label.paths": "路徑",
+  "label.powered-by": "由 {name} 提供技術支援",
+  "label.previous": "上一個",
+  "label.previous-period": "上一期間",
+  "label.previous-year": "去年",
+  "label.profile": "個人檔案",
+  "label.properties": "屬性",
+  "label.property": "屬性",
   "label.queries": "查詢",
   "label.query": "查詢",
   "label.query-parameters": "查詢參數",
@@ -151,44 +151,44 @@
   "label.referrers": "參照來源",
   "label.refresh": "重新整理",
   "label.regenerate": "重新產生",
-  "label.region": "區域",
-  "label.regions": "區域",
+  "label.region": "地區",
+  "label.regions": "地區",
   "label.remove": "移除",
-  "label.remove-member": "Remove member",
-  "label.reports": "報告",
+  "label.remove-member": "移除成員",
+  "label.reports": "報表",
   "label.required": "必填",
   "label.reset": "重設",
-  "label.reset-website": "重設網站",
-  "label.retention": "保留",
+  "label.reset-website": "重設網站統計資料",
+  "label.retention": "留存率",
   "label.retention-description": "透過追蹤使用者回訪的頻率來衡量您的網站黏著度。",
-  "label.revenue": "Revenue",
-  "label.revenue-description": "Look into your revenue across time.",
-  "label.revenue-property": "Revenue Property",
+  "label.revenue": "營收",
+  "label.revenue-description": "查看您的營收趨勢。",
+  "label.revenue-property": "營收屬性",
   "label.role": "角色",
   "label.run-query": "執行查詢",
   "label.save": "儲存",
   "label.screens": "螢幕",
-  "label.search": "Search",
-  "label.select": "Select",
-  "label.select-date": "選擇日期",
-  "label.select-role": "Select role",
-  "label.select-website": "選擇網站",
-  "label.session": "Session",
+  "label.search": "搜尋",
+  "label.select": "選取",
+  "label.select-date": "選取日期",
+  "label.select-role": "選取角色",
+  "label.select-website": "選取網站",
+  "label.session": "工作階段",
   "label.sessions": "工作階段",
   "label.settings": "設定",
-  "label.share-url": "分享網址",
+  "label.share-url": "分享連結",
   "label.single-day": "單日",
-  "label.start-step": "Start Step",
-  "label.steps": "Steps",
+  "label.start-step": "起始步驟",
+  "label.steps": "步驟",
   "label.sum": "總和",
   "label.tablet": "平板",
   "label.team": "團隊",
   "label.team-id": "團隊 ID",
-  "label.team-manager": "Team manager",
+  "label.team-manager": "團隊管理者",
   "label.team-member": "團隊成員",
   "label.team-name": "團隊名稱",
   "label.team-owner": "團隊擁有者",
-  "label.team-view-only": "Team view only",
+  "label.team-view-only": "團隊僅供檢視",
   "label.team-websites": "團隊網站",
   "label.teams": "團隊",
   "label.theme": "主題",
@@ -200,80 +200,80 @@
   "label.today": "今天",
   "label.toggle-charts": "切換圖表",
   "label.total": "總計",
-  "label.total-records": "總記錄",
+  "label.total-records": "紀錄總數",
   "label.tracking-code": "追蹤代碼",
-  "label.transactions": "Transactions",
-  "label.transfer": "Transfer",
-  "label.transfer-website": "Transfer website",
+  "label.transactions": "交易",
+  "label.transfer": "轉移",
+  "label.transfer-website": "轉移網站",
   "label.true": "是",
   "label.type": "類型",
-  "label.unique": "獨立",
-  "label.unique-visitors": "獨立訪客",
-  "label.uniqueCustomers": "Unique Customers",
+  "label.unique": "不重複",
+  "label.unique-visitors": "不重複訪客",
+  "label.uniqueCustomers": "不重複客戶",
   "label.unknown": "未知",
-  "label.untitled": "無標題",
-  "label.update": "Update",
+  "label.untitled": "未命名",
+  "label.update": "更新",
   "label.url": "網址",
   "label.urls": "網址",
   "label.user": "使用者",
-  "label.user-property": "User Property",
+  "label.user-property": "使用者屬性",
   "label.username": "使用者名稱",
   "label.users": "使用者",
   "label.utm": "UTM",
-  "label.utm-description": "Track your campaigns through UTM parameters.",
+  "label.utm-description": "透過 UTM 參數追蹤您的行銷活動。",
   "label.value": "值",
   "label.view": "檢視",
   "label.view-details": "檢視詳細資訊",
   "label.view-only": "僅供檢視",
-  "label.views": "檢視",
-  "label.views-per-visit": "Views per visit",
-  "label.visit-duration": "平均造訪時間",
+  "label.views": "瀏覽次數",
+  "label.views-per-visit": "每次造訪的瀏覽次數",
+  "label.visit-duration": "造訪時間",
   "label.visitors": "訪客",
-  "label.visits": "Visits",
+  "label.visits": "造訪次數",
   "label.website": "網站",
   "label.website-id": "網站 ID",
   "label.websites": "網站",
   "label.window": "視窗",
   "label.yesterday": "昨天",
-  "message.action-confirmation": "Type {confirmation} in the box below to confirm.",
-  "message.active-users": "目前有 {x} 個活躍的訪客",
-  "message.collected-data": "Collected data",
+  "message.action-confirmation": "請在下方欄位輸入 {confirmation} 以確認。",
+  "message.active-users": "目前有 {x} 位訪客",
+  "message.collected-data": "已蒐集的資料",
   "message.confirm-delete": "您確定要刪除 {target} 嗎？",
   "message.confirm-leave": "您確定要離開 {target} 嗎？",
-  "message.confirm-remove": "Are you sure you want to remove {target}?",
-  "message.confirm-reset": "您確定要重設 {target} 嗎？",
-  "message.delete-team-warning": "Deleting a team will also delete all team websites.",
-  "message.delete-website-warning": "所有網站資料將被刪除。",
+  "message.confirm-remove": "您確定要移除 {target} 嗎？",
+  "message.confirm-reset": "您確定要重設 {target} 的統計資料嗎？",
+  "message.delete-team-warning": "刪除團隊的同時也會刪除所有團隊的網站。",
+  "message.delete-website-warning": "所有網站資料都將被刪除。",
   "message.error": "發生錯誤。",
-  "message.event-log": "{event} 在 {url}",
+  "message.event-log": "在 {url} 上的 {event}",
   "message.go-to-settings": "前往設定",
-  "message.incorrect-username-password": "使用者名稱和/或密碼不正確。",
-  "message.invalid-domain": "無效的網域。請不要包含 http/https。",
-  "message.min-password-length": "最少需要 {n} 個字元",
-  "message.new-version-available": "Umami {version} 的新版本已經可以使用！",
+  "message.incorrect-username-password": "使用者名稱或密碼不正確。",
+  "message.invalid-domain": "無效的網域。請勿包含 http/https。",
+  "message.min-password-length": "密碼長度至少需 {n} 個字元",
+  "message.new-version-available": "Umami {version} 的新版本已推出！",
   "message.no-data-available": "沒有可用的資料。",
   "message.no-event-data": "沒有可用的事件資料。",
   "message.no-match-password": "密碼不一致。",
   "message.no-results-found": "找不到結果。",
   "message.no-team-websites": "此團隊沒有任何網站。",
   "message.no-teams": "您尚未建立任何團隊。",
-  "message.no-users": "沒有使用者。",
+  "message.no-users": "沒有任何使用者。",
   "message.no-websites-configured": "您尚未設定任何網站。",
-  "message.page-not-found": "找不到頁面",
-  "message.reset-website": "要重設此網站，請在下方的方框中輸入 {confirmation} 以確認。",
-  "message.reset-website-warning": "此網站的所有統計將被刪除，但您的設定將保持不變。",
+  "message.page-not-found": "找不到網頁",
+  "message.reset-website": "要重設此網站的統計資料，請在下方欄位輸入 {confirmation} 以確認。",
+  "message.reset-website-warning": "此網站的所有統計資料都將被刪除，但您的設定將保持不變。",
   "message.saved": "已儲存。",
-  "message.share-url": "您的網站統計資料可以在以下網址公開檢視：",
-  "message.team-already-member": "您已經是團隊的成員。",
+  "message.share-url": "您的網站統計資料可在以下網址公開檢視：",
+  "message.team-already-member": "您已是該團隊的成員。",
   "message.team-not-found": "找不到團隊。",
-  "message.team-websites-info": "團隊的任何成員都可以檢視網站。",
-  "message.tracking-code": "要追蹤此網站的統計，請將以下代碼放在您的 HTML 的 <head>...</head> 區段中。",
-  "message.transfer-team-website-to-user": "Transfer this website to your account?",
-  "message.transfer-user-website-to-team": "Select the team to transfer this website to.",
-  "message.transfer-website": "Transfer website ownership to your account or another team.",
-  "message.triggered-event": "Triggered event",
+  "message.team-websites-info": "團隊中的所有成員都可以檢視網站。",
+  "message.tracking-code": "要追蹤此網站的統計資料，請將以下程式碼放在您 HTML 的 <head>...</head> 區段中。",
+  "message.transfer-team-website-to-user": "要將此網站轉移至您的帳號嗎？",
+  "message.transfer-user-website-to-team": "請選擇要轉移此網站的團隊。",
+  "message.transfer-website": "將網站所有權轉移至您的帳號或其他團隊。",
+  "message.triggered-event": "已觸發的事件",
   "message.user-deleted": "使用者已刪除。",
-  "message.viewed-page": "Viewed page",
+  "message.viewed-page": "已瀏覽的網頁",
   "message.visitor-log": "來自 {country} 的訪客在 {device} 上的 {os} 使用 {browser} 瀏覽。",
-  "message.visitors-dropped-off": "Visitors dropped off"
+  "message.visitors-dropped-off": "訪客已離開"
 }

From 99559c2b352a8a525b1bb31f089b9b20ab6d88cd Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Thu, 28 Nov 2024 09:35:07 -0800
Subject: [PATCH 436/438] Fixed filter search.

---
 .../hooks/queries/useWebsiteValues.ts         | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/components/hooks/queries/useWebsiteValues.ts b/src/components/hooks/queries/useWebsiteValues.ts
index 892af6ad4f..73a7c75536 100644
--- a/src/components/hooks/queries/useWebsiteValues.ts
+++ b/src/components/hooks/queries/useWebsiteValues.ts
@@ -28,17 +28,22 @@ export function useWebsiteValues({
   const getSearch = (type: string, value: string) => {
     if (value) {
       const values = names[type];
-      return (
-        Object.keys(values)
-          .reduce((arr: string[], key: string) => {
-            if (values[key].toLowerCase().includes(value.toLowerCase())) {
-              return arr.concat(key);
-            }
-            return arr;
-          }, [])
-          .slice(0, 5)
-          .join(',') || value
-      );
+
+      if (values) {
+        return (
+          Object.keys(values)
+            .reduce((arr: string[], key: string) => {
+              if (values[key].toLowerCase().includes(value.toLowerCase())) {
+                return arr.concat(key);
+              }
+              return arr;
+            }, [])
+            .slice(0, 5)
+            .join(',') || value
+        );
+      }
+
+      return value;
     }
   };
 

From 356e95330487d7168146076d433b7cd0c8fea227 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Thu, 28 Nov 2024 16:17:28 -0800
Subject: [PATCH 437/438] Updated languageNames export.

---
 src/components/hooks/useLanguageNames.ts  | 2 +-
 src/components/metrics/LanguagesTable.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/hooks/useLanguageNames.ts b/src/components/hooks/useLanguageNames.ts
index 276faa1499..07b36a2c70 100644
--- a/src/components/hooks/useLanguageNames.ts
+++ b/src/components/hooks/useLanguageNames.ts
@@ -28,7 +28,7 @@ export function useLanguageNames(locale) {
     }
   }, [locale]);
 
-  return list;
+  return { languageNames: list };
 }
 
 export default useLanguageNames;
diff --git a/src/components/metrics/LanguagesTable.tsx b/src/components/metrics/LanguagesTable.tsx
index f4b0b50386..cbdac2e3e3 100644
--- a/src/components/metrics/LanguagesTable.tsx
+++ b/src/components/metrics/LanguagesTable.tsx
@@ -10,7 +10,7 @@ export function LanguagesTable({
 }: { onDataLoad: (data: any) => void } & MetricsTableProps) {
   const { formatMessage, labels } = useMessages();
   const { locale } = useLocale();
-  const languageNames = useLanguageNames(locale);
+  const { languageNames } = useLanguageNames(locale);
 
   const renderLabel = ({ x }) => {
     return languageNames[x?.split('-')[0]] ?? x;

From 6880ec85068bcfc4e4f7183d93811da55da8175b Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Thu, 28 Nov 2024 16:18:23 -0800
Subject: [PATCH 438/438] Updated lang files.

---
 public/intl/messages/zh-TW.json | 270 +++++++++++++++-----------------
 1 file changed, 127 insertions(+), 143 deletions(-)

diff --git a/public/intl/messages/zh-TW.json b/public/intl/messages/zh-TW.json
index e03059f8d6..d8fb3d42dd 100644
--- a/public/intl/messages/zh-TW.json
+++ b/public/intl/messages/zh-TW.json
@@ -8,13 +8,13 @@
   "label.actions": [
     {
       "type": 0,
-      "value": "行動"
+      "value": "行為"
     }
   ],
   "label.activity": [
     {
       "type": 0,
-      "value": "活動日誌"
+      "value": "活動紀錄"
     }
   ],
   "label.add": [
@@ -32,13 +32,13 @@
   "label.add-member": [
     {
       "type": 0,
-      "value": "Add member"
+      "value": "新增成員"
     }
   ],
   "label.add-step": [
     {
       "type": 0,
-      "value": "Add step"
+      "value": "新增步驟"
     }
   ],
   "label.add-website": [
@@ -104,7 +104,7 @@
   "label.breakdown": [
     {
       "type": 0,
-      "value": "分解"
+      "value": "細項分析"
     }
   ],
   "label.browser": [
@@ -152,7 +152,7 @@
   "label.compare": [
     {
       "type": 0,
-      "value": "Compare"
+      "value": "比較"
     }
   ],
   "label.confirm": [
@@ -182,7 +182,7 @@
   "label.count": [
     {
       "type": 0,
-      "value": "Count"
+      "value": "數量"
     }
   ],
   "label.countries": [
@@ -206,7 +206,7 @@
   "label.create-report": [
     {
       "type": 0,
-      "value": "建立報告"
+      "value": "建立報表"
     }
   ],
   "label.create-team": [
@@ -230,13 +230,13 @@
   "label.created-by": [
     {
       "type": 0,
-      "value": "Created By"
+      "value": "建立者"
     }
   ],
   "label.current": [
     {
       "type": 0,
-      "value": "Current"
+      "value": "目前"
     }
   ],
   "label.current-password": [
@@ -296,7 +296,7 @@
   "label.delete-report": [
     {
       "type": 0,
-      "value": "Delete report"
+      "value": "刪除報表"
     }
   ],
   "label.delete-team": [
@@ -368,7 +368,7 @@
   "label.dropoff": [
     {
       "type": 0,
-      "value": "退出"
+      "value": "離開"
     }
   ],
   "label.edit": [
@@ -386,25 +386,25 @@
   "label.edit-member": [
     {
       "type": 0,
-      "value": "Edit member"
+      "value": "編輯成員"
     }
   ],
   "label.enable-share-url": [
     {
       "type": 0,
-      "value": "啟用分享網址"
+      "value": "啟用分享連結"
     }
   ],
   "label.end-step": [
     {
       "type": 0,
-      "value": "End Step"
+      "value": "結束步驟"
     }
   ],
   "label.entry": [
     {
       "type": 0,
-      "value": "Entry URL"
+      "value": "進入網址"
     }
   ],
   "label.event": [
@@ -428,7 +428,7 @@
   "label.exit": [
     {
       "type": 0,
-      "value": "Exit URL"
+      "value": "離開網址"
     }
   ],
   "label.false": [
@@ -470,43 +470,43 @@
   "label.filters": [
     {
       "type": 0,
-      "value": "篩選器"
+      "value": "篩選條件"
     }
   ],
   "label.first-seen": [
     {
       "type": 0,
-      "value": "First seen"
+      "value": "首次造訪"
     }
   ],
   "label.funnel": [
     {
       "type": 0,
-      "value": "漏斗"
+      "value": "漏斗分析"
     }
   ],
   "label.funnel-description": [
     {
       "type": 0,
-      "value": "瞭解使用者的轉換率和退出率"
+      "value": "瞭解使用者的轉換率與流失率。"
     }
   ],
   "label.goal": [
     {
       "type": 0,
-      "value": "Goal"
+      "value": "目標"
     }
   ],
   "label.goals": [
     {
       "type": 0,
-      "value": "Goals"
+      "value": "目標"
     }
   ],
   "label.goals-description": [
     {
       "type": 0,
-      "value": "Track your goals for pageviews and events."
+      "value": "追蹤網頁瀏覽和事件的目標。"
     }
   ],
   "label.greater-than": [
@@ -524,13 +524,13 @@
   "label.host": [
     {
       "type": 0,
-      "value": "Host"
+      "value": "主機名稱"
     }
   ],
   "label.hosts": [
     {
       "type": 0,
-      "value": "Hosts"
+      "value": "主機名稱"
     }
   ],
   "label.insights": [
@@ -542,7 +542,7 @@
   "label.insights-description": [
     {
       "type": 0,
-      "value": "透過使用區段和篩選器來深入探索你的數據"
+      "value": "使用區段和篩選器來深入分析您的資料。"
     }
   ],
   "label.is": [
@@ -584,13 +584,13 @@
   "label.journey": [
     {
       "type": 0,
-      "value": "Journey"
+      "value": "使用者旅程"
     }
   ],
   "label.journey-description": [
     {
       "type": 0,
-      "value": "Understand how users navigate through your website."
+      "value": "瞭解使用者如何瀏覽您的網站。"
     }
   ],
   "label.language": [
@@ -642,7 +642,7 @@
   "label.last-months": [
     {
       "type": 0,
-      "value": "Last "
+      "value": "最近 "
     },
     {
       "type": 1,
@@ -650,13 +650,13 @@
     },
     {
       "type": 0,
-      "value": " months"
+      "value": " 個月"
     }
   ],
   "label.last-seen": [
     {
       "type": 0,
-      "value": "Last seen"
+      "value": "最後造訪"
     }
   ],
   "label.leave": [
@@ -698,25 +698,25 @@
   "label.manage": [
     {
       "type": 0,
-      "value": "Manage"
+      "value": "管理"
     }
   ],
   "label.manager": [
     {
       "type": 0,
-      "value": "Manager"
+      "value": "管理者"
     }
   ],
   "label.max": [
     {
       "type": 0,
-      "value": "最大"
+      "value": "最大值"
     }
   ],
   "label.member": [
     {
       "type": 0,
-      "value": "Member"
+      "value": "成員"
     }
   ],
   "label.members": [
@@ -728,7 +728,7 @@
   "label.min": [
     {
       "type": 0,
-      "value": "最小"
+      "value": "最小值"
     }
   ],
   "label.mobile": [
@@ -746,7 +746,7 @@
   "label.my-account": [
     {
       "type": 0,
-      "value": "My account"
+      "value": "我的帳號"
     }
   ],
   "label.my-websites": [
@@ -780,31 +780,7 @@
     },
     {
       "type": 0,
-      "value": " "
-    },
-    {
-      "offset": 0,
-      "options": {
-        "one": {
-          "value": [
-            {
-              "type": 0,
-              "value": "record"
-            }
-          ]
-        },
-        "other": {
-          "value": [
-            {
-              "type": 0,
-              "value": "records"
-            }
-          ]
-        }
-      },
-      "pluralType": "cardinal",
-      "type": 6,
-      "value": "x"
+      "value": " 筆紀錄"
     }
   ],
   "label.ok": [
@@ -822,7 +798,7 @@
   "label.overview": [
     {
       "type": 0,
-      "value": "概覽"
+      "value": "總覽"
     }
   ],
   "label.owner": [
@@ -834,7 +810,7 @@
   "label.page-of": [
     {
       "type": 0,
-      "value": "頁面 "
+      "value": "第 "
     },
     {
       "type": 1,
@@ -842,29 +818,33 @@
     },
     {
       "type": 0,
-      "value": " / "
+      "value": " 頁，共 "
     },
     {
       "type": 1,
       "value": "total"
+    },
+    {
+      "type": 0,
+      "value": " 頁"
     }
   ],
   "label.page-views": [
     {
       "type": 0,
-      "value": "頁面瀏覽"
+      "value": "網頁瀏覽次數"
     }
   ],
   "label.pageTitle": [
     {
       "type": 0,
-      "value": "頁面標題"
+      "value": "網頁標題"
     }
   ],
   "label.pages": [
     {
       "type": 0,
-      "value": "頁面"
+      "value": "網頁"
     }
   ],
   "label.password": [
@@ -876,13 +856,13 @@
   "label.path": [
     {
       "type": 0,
-      "value": "Path"
+      "value": "路徑"
     }
   ],
   "label.paths": [
     {
       "type": 0,
-      "value": "Paths"
+      "value": "路徑"
     }
   ],
   "label.powered-by": [
@@ -896,43 +876,43 @@
     },
     {
       "type": 0,
-      "value": " 提供"
+      "value": " 提供技術支援"
     }
   ],
   "label.previous": [
     {
       "type": 0,
-      "value": "Previous"
+      "value": "上一個"
     }
   ],
   "label.previous-period": [
     {
       "type": 0,
-      "value": "Previous period"
+      "value": "上一期間"
     }
   ],
   "label.previous-year": [
     {
       "type": 0,
-      "value": "Previous year"
+      "value": "去年"
     }
   ],
   "label.profile": [
     {
       "type": 0,
-      "value": "個人資料"
+      "value": "個人檔案"
     }
   ],
   "label.properties": [
     {
       "type": 0,
-      "value": "Properties"
+      "value": "屬性"
     }
   ],
   "label.property": [
     {
       "type": 0,
-      "value": "Property"
+      "value": "屬性"
     }
   ],
   "label.queries": [
@@ -986,13 +966,13 @@
   "label.region": [
     {
       "type": 0,
-      "value": "區域"
+      "value": "地區"
     }
   ],
   "label.regions": [
     {
       "type": 0,
-      "value": "區域"
+      "value": "地區"
     }
   ],
   "label.remove": [
@@ -1004,13 +984,13 @@
   "label.remove-member": [
     {
       "type": 0,
-      "value": "Remove member"
+      "value": "移除成員"
     }
   ],
   "label.reports": [
     {
       "type": 0,
-      "value": "報告"
+      "value": "報表"
     }
   ],
   "label.required": [
@@ -1028,13 +1008,13 @@
   "label.reset-website": [
     {
       "type": 0,
-      "value": "重設網站"
+      "value": "重設網站統計資料"
     }
   ],
   "label.retention": [
     {
       "type": 0,
-      "value": "保留"
+      "value": "留存率"
     }
   ],
   "label.retention-description": [
@@ -1046,19 +1026,19 @@
   "label.revenue": [
     {
       "type": 0,
-      "value": "Revenue"
+      "value": "營收"
     }
   ],
   "label.revenue-description": [
     {
       "type": 0,
-      "value": "Look into your revenue across time."
+      "value": "查看您的營收趨勢。"
     }
   ],
   "label.revenue-property": [
     {
       "type": 0,
-      "value": "Revenue Property"
+      "value": "營收屬性"
     }
   ],
   "label.role": [
@@ -1088,37 +1068,37 @@
   "label.search": [
     {
       "type": 0,
-      "value": "Search"
+      "value": "搜尋"
     }
   ],
   "label.select": [
     {
       "type": 0,
-      "value": "Select"
+      "value": "選取"
     }
   ],
   "label.select-date": [
     {
       "type": 0,
-      "value": "選擇日期"
+      "value": "選取日期"
     }
   ],
   "label.select-role": [
     {
       "type": 0,
-      "value": "Select role"
+      "value": "選取角色"
     }
   ],
   "label.select-website": [
     {
       "type": 0,
-      "value": "選擇網站"
+      "value": "選取網站"
     }
   ],
   "label.session": [
     {
       "type": 0,
-      "value": "Session"
+      "value": "工作階段"
     }
   ],
   "label.sessions": [
@@ -1136,7 +1116,7 @@
   "label.share-url": [
     {
       "type": 0,
-      "value": "分享網址"
+      "value": "分享連結"
     }
   ],
   "label.single-day": [
@@ -1148,13 +1128,13 @@
   "label.start-step": [
     {
       "type": 0,
-      "value": "Start Step"
+      "value": "起始步驟"
     }
   ],
   "label.steps": [
     {
       "type": 0,
-      "value": "Steps"
+      "value": "步驟"
     }
   ],
   "label.sum": [
@@ -1184,7 +1164,7 @@
   "label.team-manager": [
     {
       "type": 0,
-      "value": "Team manager"
+      "value": "團隊管理者"
     }
   ],
   "label.team-member": [
@@ -1208,7 +1188,7 @@
   "label.team-view-only": [
     {
       "type": 0,
-      "value": "Team view only"
+      "value": "團隊僅供檢視"
     }
   ],
   "label.team-websites": [
@@ -1280,7 +1260,7 @@
   "label.total-records": [
     {
       "type": 0,
-      "value": "總記錄"
+      "value": "紀錄總數"
     }
   ],
   "label.tracking-code": [
@@ -1292,19 +1272,19 @@
   "label.transactions": [
     {
       "type": 0,
-      "value": "Transactions"
+      "value": "交易"
     }
   ],
   "label.transfer": [
     {
       "type": 0,
-      "value": "Transfer"
+      "value": "轉移"
     }
   ],
   "label.transfer-website": [
     {
       "type": 0,
-      "value": "Transfer website"
+      "value": "轉移網站"
     }
   ],
   "label.true": [
@@ -1322,19 +1302,19 @@
   "label.unique": [
     {
       "type": 0,
-      "value": "獨立"
+      "value": "不重複"
     }
   ],
   "label.unique-visitors": [
     {
       "type": 0,
-      "value": "獨立訪客"
+      "value": "不重複訪客"
     }
   ],
   "label.uniqueCustomers": [
     {
       "type": 0,
-      "value": "Unique Customers"
+      "value": "不重複客戶"
     }
   ],
   "label.unknown": [
@@ -1346,13 +1326,13 @@
   "label.untitled": [
     {
       "type": 0,
-      "value": "無標題"
+      "value": "未命名"
     }
   ],
   "label.update": [
     {
       "type": 0,
-      "value": "Update"
+      "value": "更新"
     }
   ],
   "label.url": [
@@ -1376,7 +1356,7 @@
   "label.user-property": [
     {
       "type": 0,
-      "value": "User Property"
+      "value": "使用者屬性"
     }
   ],
   "label.username": [
@@ -1400,7 +1380,7 @@
   "label.utm-description": [
     {
       "type": 0,
-      "value": "Track your campaigns through UTM parameters."
+      "value": "透過 UTM 參數追蹤您的行銷活動。"
     }
   ],
   "label.value": [
@@ -1430,19 +1410,19 @@
   "label.views": [
     {
       "type": 0,
-      "value": "檢視"
+      "value": "瀏覽次數"
     }
   ],
   "label.views-per-visit": [
     {
       "type": 0,
-      "value": "Views per visit"
+      "value": "每次造訪的瀏覽次數"
     }
   ],
   "label.visit-duration": [
     {
       "type": 0,
-      "value": "平均造訪時間"
+      "value": "造訪時間"
     }
   ],
   "label.visitors": [
@@ -1454,7 +1434,7 @@
   "label.visits": [
     {
       "type": 0,
-      "value": "Visits"
+      "value": "造訪次數"
     }
   ],
   "label.website": [
@@ -1490,7 +1470,7 @@
   "message.action-confirmation": [
     {
       "type": 0,
-      "value": "Type "
+      "value": "請在下方欄位輸入 "
     },
     {
       "type": 1,
@@ -1498,7 +1478,7 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " 以確認。"
     }
   ],
   "message.active-users": [
@@ -1512,13 +1492,13 @@
     },
     {
       "type": 0,
-      "value": " 個活躍的訪客"
+      "value": " 位訪客"
     }
   ],
   "message.collected-data": [
     {
       "type": 0,
-      "value": "Collected data"
+      "value": "已蒐集的資料"
     }
   ],
   "message.confirm-delete": [
@@ -1552,7 +1532,7 @@
   "message.confirm-remove": [
     {
       "type": 0,
-      "value": "Are you sure you want to remove "
+      "value": "您確定要移除 "
     },
     {
       "type": 1,
@@ -1560,7 +1540,7 @@
     },
     {
       "type": 0,
-      "value": "?"
+      "value": " 嗎？"
     }
   ],
   "message.confirm-reset": [
@@ -1574,19 +1554,19 @@
     },
     {
       "type": 0,
-      "value": " 嗎？"
+      "value": " 的統計資料嗎？"
     }
   ],
   "message.delete-team-warning": [
     {
       "type": 0,
-      "value": "Deleting a team will also delete all team websites."
+      "value": "刪除團隊的同時也會刪除所有團隊的網站。"
     }
   ],
   "message.delete-website-warning": [
     {
       "type": 0,
-      "value": "所有網站資料將被刪除。"
+      "value": "所有網站資料都將被刪除。"
     }
   ],
   "message.error": [
@@ -1596,17 +1576,21 @@
     }
   ],
   "message.event-log": [
+    {
+      "type": 0,
+      "value": "在 "
+    },
     {
       "type": 1,
-      "value": "event"
+      "value": "url"
     },
     {
       "type": 0,
-      "value": " 在 "
+      "value": " 上的 "
     },
     {
       "type": 1,
-      "value": "url"
+      "value": "event"
     }
   ],
   "message.go-to-settings": [
@@ -1618,19 +1602,19 @@
   "message.incorrect-username-password": [
     {
       "type": 0,
-      "value": "使用者名稱和/或密碼不正確。"
+      "value": "使用者名稱或密碼不正確。"
     }
   ],
   "message.invalid-domain": [
     {
       "type": 0,
-      "value": "無效的網域。請不要包含 http/https。"
+      "value": "無效的網域。請勿包含 http/https。"
     }
   ],
   "message.min-password-length": [
     {
       "type": 0,
-      "value": "最少需要 "
+      "value": "密碼長度至少需 "
     },
     {
       "type": 1,
@@ -1652,7 +1636,7 @@
     },
     {
       "type": 0,
-      "value": " 的新版本已經可以使用！"
+      "value": " 的新版本已推出！"
     }
   ],
   "message.no-data-available": [
@@ -1694,7 +1678,7 @@
   "message.no-users": [
     {
       "type": 0,
-      "value": "沒有使用者。"
+      "value": "沒有任何使用者。"
     }
   ],
   "message.no-websites-configured": [
@@ -1706,13 +1690,13 @@
   "message.page-not-found": [
     {
       "type": 0,
-      "value": "找不到頁面"
+      "value": "找不到網頁"
     }
   ],
   "message.reset-website": [
     {
       "type": 0,
-      "value": "要重設此網站，請在下方的方框中輸入 "
+      "value": "要重設此網站的統計資料，請在下方欄位輸入 "
     },
     {
       "type": 1,
@@ -1726,7 +1710,7 @@
   "message.reset-website-warning": [
     {
       "type": 0,
-      "value": "此網站的所有統計將被刪除，但您的設定將保持不變。"
+      "value": "此網站的所有統計資料都將被刪除，但您的設定將保持不變。"
     }
   ],
   "message.saved": [
@@ -1738,13 +1722,13 @@
   "message.share-url": [
     {
       "type": 0,
-      "value": "您的網站統計資料可以在以下網址公開檢視："
+      "value": "您的網站統計資料可在以下網址公開檢視："
     }
   ],
   "message.team-already-member": [
     {
       "type": 0,
-      "value": "您已經是團隊的成員。"
+      "value": "您已是該團隊的成員。"
     }
   ],
   "message.team-not-found": [
@@ -1756,13 +1740,13 @@
   "message.team-websites-info": [
     {
       "type": 0,
-      "value": "團隊的任何成員都可以檢視網站。"
+      "value": "團隊中的所有成員都可以檢視網站。"
     }
   ],
   "message.tracking-code": [
     {
       "type": 0,
-      "value": "要追蹤此網站的統計，請將以下代碼放在您的 HTML 的 "
+      "value": "要追蹤此網站的統計資料，請將以下程式碼放在您 HTML 的 "
     },
     {
       "children": [
@@ -1782,25 +1766,25 @@
   "message.transfer-team-website-to-user": [
     {
       "type": 0,
-      "value": "Transfer this website to your account?"
+      "value": "要將此網站轉移至您的帳號嗎？"
     }
   ],
   "message.transfer-user-website-to-team": [
     {
       "type": 0,
-      "value": "Select the team to transfer this website to."
+      "value": "請選擇要轉移此網站的團隊。"
     }
   ],
   "message.transfer-website": [
     {
       "type": 0,
-      "value": "Transfer website ownership to your account or another team."
+      "value": "將網站所有權轉移至您的帳號或其他團隊。"
     }
   ],
   "message.triggered-event": [
     {
       "type": 0,
-      "value": "Triggered event"
+      "value": "已觸發的事件"
     }
   ],
   "message.user-deleted": [
@@ -1812,7 +1796,7 @@
   "message.viewed-page": [
     {
       "type": 0,
-      "value": "Viewed page"
+      "value": "已瀏覽的網頁"
     }
   ],
   "message.visitor-log": [
@@ -1856,7 +1840,7 @@
   "message.visitors-dropped-off": [
     {
       "type": 0,
-      "value": "Visitors dropped off"
+      "value": "訪客已離開"
     }
   ]
 }