From 9b349b53c44923e464a87c9b081d7a2ebb54b8e1 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 25 Apr 2023 22:52:53 -0700
Subject: [PATCH 01/88] limit realtime record set to 15

---
 components/pages/realtime/RealtimeUrls.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/components/pages/realtime/RealtimeUrls.js b/components/pages/realtime/RealtimeUrls.js
index dfbf1fda..18d8f2f6 100644
--- a/components/pages/realtime/RealtimeUrls.js
+++ b/components/pages/realtime/RealtimeUrls.js
@@ -10,6 +10,7 @@ export function RealtimeUrls({ websiteDomain, data = {} }) {
   const { formatMessage, labels } = useMessages();
   const { pageviews } = data;
   const [filter, setFilter] = useState(FILTER_REFERRERS);
+  const limit = 15;
 
   const buttons = [
     {
@@ -47,7 +48,8 @@ export function RealtimeUrls({ websiteDomain, data = {} }) {
             }
             return arr;
           }, [])
-          .sort(firstBy('y', -1)),
+          .sort(firstBy('y', -1))
+          .slice(0, limit),
       );
 
       const pages = percentFilter(
@@ -62,7 +64,8 @@ export function RealtimeUrls({ websiteDomain, data = {} }) {
             }
             return arr;
           }, [])
-          .sort(firstBy('y', -1)),
+          .sort(firstBy('y', -1))
+          .slice(0, limit),
       );
 
       return [referrers, pages];

From dcb9f69c43cca6b2656d9b864db7066f6776f71f Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 25 Apr 2023 23:25:51 -0700
Subject: [PATCH 02/88] Fix Title filters

---
 components/metrics/MetricsBar.js     |  5 +++--
 components/metrics/MetricsTable.js   | 18 ++++++++++++++++--
 pages/api/websites/[id]/pageviews.ts |  8 ++++----
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/components/metrics/MetricsBar.js b/components/metrics/MetricsBar.js
index 25b93115..ccaf627c 100644
--- a/components/metrics/MetricsBar.js
+++ b/components/metrics/MetricsBar.js
@@ -16,13 +16,13 @@ export function MetricsBar({ websiteId }) {
   const { startDate, endDate, modified } = dateRange;
   const [format, setFormat] = useState(true);
   const {
-    query: { url, referrer, os, browser, device, country, region, city },
+    query: { url, referrer, title, os, browser, device, country, region, city },
   } = usePageQuery();
 
   const { data, error, isLoading, isFetched } = useQuery(
     [
       'websites:stats',
-      { websiteId, modified, url, referrer, os, browser, device, country, region, city },
+      { websiteId, modified, url, referrer, title, os, browser, device, country, region, city },
     ],
     () =>
       get(`/websites/${websiteId}/stats`, {
@@ -30,6 +30,7 @@ export function MetricsBar({ websiteId }) {
         endAt: +endDate,
         url,
         referrer,
+        title,
         os,
         browser,
         device,
diff --git a/components/metrics/MetricsTable.js b/components/metrics/MetricsTable.js
index 97deb39d..3ad7f434 100644
--- a/components/metrics/MetricsTable.js
+++ b/components/metrics/MetricsTable.js
@@ -30,7 +30,7 @@ export function MetricsTable({
   const {
     resolveUrl,
     router,
-    query: { url, referrer, os, browser, device, country, region, city },
+    query: { url, referrer, title, os, browser, device, country, region, city },
   } = usePageQuery();
   const { formatMessage, labels } = useMessages();
   const { get, useQuery } = useApi();
@@ -38,7 +38,20 @@ export function MetricsTable({
   const { data, isLoading, isFetched, error } = useQuery(
     [
       'websites:metrics',
-      { websiteId, type, modified, url, referrer, os, browser, device, country, region, city },
+      {
+        websiteId,
+        type,
+        modified,
+        url,
+        referrer,
+        os,
+        title,
+        browser,
+        device,
+        country,
+        region,
+        city,
+      },
     ],
     () =>
       get(`/websites/${websiteId}/metrics`, {
@@ -46,6 +59,7 @@ export function MetricsTable({
         startAt: +startDate,
         endAt: +endDate,
         url,
+        title,
         referrer,
         os,
         browser,
diff --git a/pages/api/websites/[id]/pageviews.ts b/pages/api/websites/[id]/pageviews.ts
index 775a4d82..9dfd2264 100644
--- a/pages/api/websites/[id]/pageviews.ts
+++ b/pages/api/websites/[id]/pageviews.ts
@@ -16,7 +16,7 @@ export interface WebsitePageviewRequestQuery {
   timezone: string;
   url?: string;
   referrer?: string;
-  pageTitle?: string;
+  title?: string;
   os?: string;
   browser?: string;
   device?: string;
@@ -40,7 +40,7 @@ export default async (
     timezone,
     url,
     referrer,
-    pageTitle,
+    title,
     os,
     browser,
     device,
@@ -71,7 +71,7 @@ export default async (
         filters: {
           url,
           referrer,
-          pageTitle,
+          title,
           os,
           browser,
           device,
@@ -88,7 +88,7 @@ export default async (
         count: 'distinct website_event.',
         filters: {
           url,
-          pageTitle,
+          title,
           os,
           browser,
           device,

From c954bb2ce74628097f1b30e1ab36a8bd0925be17 Mon Sep 17 00:00:00 2001
From: Bilguun Ochirbat <bilguun0203@gmail.com>
Date: Wed, 26 Apr 2023 17:07:19 +0800
Subject: [PATCH 03/88] Update mn-MN.json

---
 lang/mn-MN.json | 108 ++++++++++++++++++++++++------------------------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/lang/mn-MN.json b/lang/mn-MN.json
index 9e3b4499..b15076ad 100644
--- a/lang/mn-MN.json
+++ b/lang/mn-MN.json
@@ -1,7 +1,7 @@
 {
-  "label.access-code": "Access code",
+  "label.access-code": "Хандалтын код",
   "label.actions": "Үйлдлүүд",
-  "label.activity-log": "Activity log",
+  "label.activity-log": "Үйл ажиллагааны бүртгэл",
   "label.add-website": "Веб нэмэх",
   "label.admin": "Админ",
   "label.all": "Бүх",
@@ -13,27 +13,27 @@
   "label.browsers": "Хөтөч",
   "label.cancel": "Цуцлах",
   "label.change-password": "Нууц үг солих",
-  "label.cities": "Cities",
-  "label.clear-all": "Clear all",
-  "label.confirm": "Confirm",
+  "label.cities": "Хотууд",
+  "label.clear-all": "Бүгдийг арилгах",
+  "label.confirm": "Батлах",
   "label.confirm-password": "Шинэ нууц үгээ давтах",
-  "label.continue": "Continue",
+  "label.continue": "Үргэлжлүүлэх",
   "label.countries": "Улс",
-  "label.create-team": "Create team",
-  "label.create-user": "Create user",
-  "label.created": "Created",
+  "label.create-team": "Баг үүсгэх",
+  "label.create-user": "Хэрэглэгч үүсгэх",
+  "label.created": "Үүсгэсэн",
   "label.current-password": "Ашиглаж буй нууц үг",
   "label.custom-range": "Дурын хугацаа",
   "label.dashboard": "Хянах самбар",
-  "label.data": "Data",
-  "label.date-range": "Хугацааны мужид",
+  "label.data": "Өгөгдөл",
+  "label.date-range": "Хугацааны муж",
   "label.default-date-range": "Өгөгдмөл хугацааны муж",
   "label.delete": "Устгах",
-  "label.delete-team": "Delete team",
-  "label.delete-user": "Delete user",
+  "label.delete-team": "Баг устгах",
+  "label.delete-user": "Хэрэглэгч устгах",
   "label.delete-website": "Веб устгах",
   "label.desktop": "Суурин компьютер",
-  "label.details": "Details",
+  "label.details": "Мэдээлэл",
   "label.devices": "Төхөөрөмж",
   "label.dismiss": "Үл хэргэсэх",
   "label.domain": "Домэйн",
@@ -43,18 +43,18 @@
   "label.events": "Үйлдэл",
   "label.filter-combined": "Нэгтгэсэн",
   "label.filter-raw": "Түүхий",
-  "label.join": "Join",
-  "label.join-team": "Join team",
+  "label.join": "Нэгдэх",
+  "label.join-team": "Багт нэгдэх",
   "label.language": "Хэл",
   "label.languages": "Хэл",
   "label.laptop": "Зөөврийн компьютер",
   "label.last-days": "Сүүлийн {x} хоног",
   "label.last-hours": "Сүүлийн {x} цаг",
-  "label.leave": "Leave",
-  "label.leave-team": "Leave team",
+  "label.leave": "Гарах",
+  "label.leave-team": "Багаас гарах",
   "label.login": "Нэвтрэх",
   "label.logout": "Гарах",
-  "label.members": "Members",
+  "label.members": "Гишүүд",
   "label.mobile": "Утас",
   "label.more": "Цааш",
   "label.name": "Нэр",
@@ -67,80 +67,80 @@
   "label.password": "Нууц үг",
   "label.powered-by": "{name} дээр суурилсан",
   "label.profile": "Бүртгэл",
-  "label.queries": "Queries",
+  "label.queries": "Query-нүүд",
   "label.query-parameters": "Query параметр",
   "label.realtime": "Яг одоо",
   "label.referrers": "Чиглүүлэгч",
   "label.refresh": "Сэргээх",
-  "label.regenerate": "Regenerate",
-  "label.regions": "Regions",
-  "label.remove": "Remove",
+  "label.regenerate": "Дахин үүсгэх",
+  "label.regions": "Бүсүүд",
+  "label.remove": "Устгах",
   "label.required": "Шаардлагатай",
-  "label.reset": "Хуучин хэвд нь оруулах",
+  "label.reset": "Дахин эхлүүлэх",
   "label.reset-website": "Тоон үзүүлэлтийг дахин эхлүүлэх",
-  "label.role": "Role",
+  "label.role": "Эрх",
   "label.save": "Хадгалах",
   "label.screens": "Дэлгэц",
-  "label.select-website": "Select website",
+  "label.select-website": "Веб сонгох",
   "label.sessions": "Sessions",
   "label.settings": "Тохиргоо",
   "label.share-url": "Хуваалцах холбоос",
   "label.single-day": "Нэг өдөр",
   "label.tablet": "Таблет",
-  "label.team": "Team",
-  "label.team-guest": "Team guest",
-  "label.team-id": "Team ID",
-  "label.team-member": "Team member",
-  "label.team-owner": "Team owner",
-  "label.teams": "Teams",
+  "label.team": "Баг",
+  "label.team-guest": "Багийн зочин",
+  "label.team-id": "Багийн ID",
+  "label.team-member": "Багийн гишүүн",
+  "label.team-owner": "Багийн эзэмшигч",
+  "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.tracking-code": "Мөрдөх код",
   "label.unique-visitors": "Зочин",
   "label.unknown": "Тодорхойгүй",
-  "label.user": "User",
+  "label.user": "Хэрэглэгч",
   "label.username": "Хэрэглэгчийн нэр",
-  "label.users": "Users",
-  "label.view": "View",
+  "label.users": "Хэрэглэгчид",
+  "label.view": "Харах",
   "label.view-details": "Дэлгэрүүлж харах",
   "label.views": "Үзсэн",
   "label.visitors": "Зочин",
-  "label.website-id": "Website ID",
+  "label.website-id": "Вебийн ID",
   "label.websites": "Вебүүд",
   "label.yesterday": "Өчигдөр",
   "message.active-users": "одоо {x} {x, plural, one {зочин} other {зочин}} байна",
   "message.confirm-delete": "Та {target}-г устгахдаа итгэлтэй байна уу?",
-  "message.confirm-leave": "Are you sure you want to leave {target}?",
+  "message.confirm-leave": "Та {target}-с гарахдаа итгэлтэй байна уу?",
   "message.confirm-reset": "Та {target}-н тоон үзүүлэлтүүдийг устгахдаа итгэлтэй байна уу?",
-  "message.delete-website": "Веб устгах",
-  "message.delete-website-warning": "Үүнтэй холбоотой бүх өгөгдөл устах болно.",
+  "message.delete-website": "Веб устгахын тулд доорх хэсэгт {confirmation} гэж бичиж, баталгаажуулна уу.",
+  "message.delete-website-warning": "Энэ вебтэй холбоотой бүх өгөгдөл устах болно.",
   "message.error": "Ямар нэг зүйл буруу боллоо.",
-  "message.event-log": "{event} on {url}",
+  "message.event-log": "{url}-д {event}",
   "message.go-to-settings": "Тохиргоо руу очих",
   "message.incorrect-username-password": "Буруу хэрэглэгчийн нэр/нууц үг.",
   "message.invalid-domain": "Буруу домэйн",
-  "message.min-password-length": "Minimum length of {n} characters",
+  "message.min-password-length": "Хамгийн багадаа {n} тэмдэгт",
   "message.no-data-available": "Өгөгдөл алга.",
-  "message.no-match-password": "Нууц үг тохирохгүй байна",
-  "message.no-teams": "You have not created any teams.",
-  "message.no-users": "There are no users.",
+  "message.no-match-password": "Нууц үг тохирохгүй байна.",
+  "message.no-teams": "Та ямар ч баг үүсгээгүй байна.",
+  "message.no-users": "Хэрэглэгч байхгүй байна.",
   "message.page-not-found": "Хуудас олдсонгүй.",
-  "message.reset-website": "Тоон үзүүлэлтийг дахин эхлүүлэх",
+  "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.tracking-code": "Мөрдөх код",
-  "message.user-deleted": "User deleted.",
+  "message.saved": "Хадгалсан.",
+  "message.share-url": "Таны вебийн тоон үзүүлэлтүүд доорх URL дээр нийтэд харагдах болно:",
+  "message.team-already-member": "Та аль хэдийн энэ багийн гишүүн болсон байна.",
+  "message.team-not-found": "Баг олдсонгүй.",
+  "message.tracking-code": "Энэ вебийн хандалтуудыг мөрдөхийн тулд доорх кодыг HTML-нхээ <head>...</head> хэсэгт байрлуулна уу.",
+  "message.user-deleted": "Хэрэглэгч устсан.",
   "message.visitor-log": "{country} улсаас {os} {device} дээр {browser} хөтөч ашиглан орсон",
-  "messages.no-team-websites": "This team does not have any websites.",
+  "messages.no-team-websites": "Энэ багт ямар ч веб алга.",
   "messages.no-websites-configured": "Та ямар нэгэн веб тохируулаагүй байна.",
-  "messages.team-websites-info": "Websites can be viewed by anyone on the team."
+  "messages.team-websites-info": "Вебийг багийн бүх гишүүд үзэж болно."
 }

From d38dc1b5ab510e00b88dbc5dfe96a04df1b9b2e7 Mon Sep 17 00:00:00 2001
From: Felipe Valtl de Mello <3065339+valtlfelipe@users.noreply.github.com>
Date: Wed, 26 Apr 2023 10:53:25 -0300
Subject: [PATCH 04/88] Update pt-BR.json translations

---
 lang/pt-BR.json | 96 ++++++++++++++++++++++++-------------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/lang/pt-BR.json b/lang/pt-BR.json
index f02b7fb9..fa40b4d2 100644
--- a/lang/pt-BR.json
+++ b/lang/pt-BR.json
@@ -1,27 +1,27 @@
 {
-  "label.access-code": "Access code",
+  "label.access-code": "Código de acesso",
   "label.actions": "Ações",
-  "label.activity-log": "Activity log",
+  "label.activity-log": "Log de atividade",
   "label.add-website": "Adicionar site",
   "label.admin": "Administrador",
   "label.all": "Todos",
   "label.all-time": "Todo o período",
-  "label.analytics": "Analytics",
+  "label.analytics": "Estatísticas",
   "label.average-visit-time": "Tempo médio da visita",
   "label.back": "Voltar",
   "label.bounce-rate": "Taxa de rejeição",
   "label.browsers": "Navegadores",
   "label.cancel": "Cancelar",
   "label.change-password": "Alterar a senha",
-  "label.cities": "Cities",
-  "label.clear-all": "Clear all",
-  "label.confirm": "Confirm",
+  "label.cities": "Cidades",
+  "label.clear-all": "Limpar tudo",
+  "label.confirm": "Confirmar",
   "label.confirm-password": "Confirme a nova senha",
-  "label.continue": "Continue",
+  "label.continue": "Continuar",
   "label.countries": "Países",
-  "label.create-team": "Create team",
-  "label.create-user": "Create user",
-  "label.created": "Created",
+  "label.create-team": "Criar time",
+  "label.create-user": "Criar usuário",
+  "label.created": "Criado",
   "label.current-password": "Senha atual",
   "label.custom-range": "Intervalo personalizado",
   "label.dashboard": "Painel",
@@ -29,37 +29,37 @@
   "label.date-range": "Intervalo de datas",
   "label.default-date-range": "Intervalo de datas predefinido",
   "label.delete": "Remover",
-  "label.delete-team": "Delete team",
-  "label.delete-user": "Delete user",
+  "label.delete-team": "Remover time",
+  "label.delete-user": "Remover usuário",
   "label.delete-website": "Remover site",
   "label.desktop": "Computador",
-  "label.details": "Details",
+  "label.details": "Detalhes",
   "label.devices": "Dispositivos",
   "label.dismiss": "Dispensar",
   "label.domain": "Domínio",
   "label.edit": "Editar",
-  "label.edit-dashboard": "Edit dashboard",
+  "label.edit-dashboard": "Editar painel",
   "label.enable-share-url": "Ativar link de compartilhamento",
   "label.events": "Eventos",
   "label.filter-combined": "Combinado",
   "label.filter-raw": "Dados brutos",
-  "label.join": "Join",
-  "label.join-team": "Join team",
+  "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.leave": "Leave",
-  "label.leave-team": "Leave team",
+  "label.leave": "Sair",
+  "label.leave-team": "Sair do time",
   "label.login": "Iniciar sessão",
   "label.logout": "Sair",
-  "label.members": "Members",
+  "label.members": "Membros",
   "label.mobile": "Celular",
   "label.more": "Mais",
   "label.name": "Nome",
   "label.new-password": "Nova senha",
-  "label.none": "None",
+  "label.none": "nenhum",
   "label.operating-systems": "Sistemas operacionais",
   "label.owner": "Proprietário",
   "label.page-views": "Visualizações de página",
@@ -67,80 +67,80 @@
   "label.password": "Senha",
   "label.powered-by": "Distribuído por {name}",
   "label.profile": "Perfil",
-  "label.queries": "Queries",
+  "label.queries": "Parâmetros",
   "label.query-parameters": "Parâmetros de Consulta",
   "label.realtime": "Tempo real",
   "label.referrers": "Referências",
   "label.refresh": "Atualizar",
-  "label.regenerate": "Regenerate",
-  "label.regions": "Regions",
-  "label.remove": "Remove",
+  "label.regenerate": "Regerar",
+  "label.regions": "Regiões",
+  "label.remove": "Remover",
   "label.required": "Obrigatório",
   "label.reset": "Redefinir",
   "label.reset-website": "Redefinir estatísticas",
-  "label.role": "Role",
+  "label.role": "Papel",
   "label.save": "Salvar",
   "label.screens": "Telas",
-  "label.select-website": "Select website",
-  "label.sessions": "Sessions",
+  "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.tablet": "Tablet",
-  "label.team": "Team",
-  "label.team-guest": "Team guest",
-  "label.team-id": "Team ID",
-  "label.team-member": "Team member",
-  "label.team-owner": "Team owner",
-  "label.teams": "Teams",
+  "label.team": "Time",
+  "label.team-guest": "Convidado",
+  "label.team-id": "ID do Time",
+  "label.team-member": "Membro",
+  "label.team-owner": "Proprietário",
+  "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": "Title",
+  "label.title": "Título",
   "label.today": "Hoje",
   "label.toggle-charts": "Mostrar/Esconder gráficos",
   "label.tracking-code": "Código de rastreamento",
   "label.unique-visitors": "Visitantes únicos",
   "label.unknown": "Desconhecido",
-  "label.user": "User",
+  "label.user": "Usuário",
   "label.username": "Nome de usuário",
-  "label.users": "Users",
-  "label.view": "View",
+  "label.users": "Usuários",
+  "label.view": "Ver",
   "label.view-details": "Ver detalhes",
   "label.views": "Visualizações",
   "label.visitors": "Visitantes",
-  "label.website-id": "Website ID",
+  "label.website-id": "ID do Site",
   "label.websites": "Sites",
   "label.yesterday": "Ontem",
   "message.active-users": "{x} {x, plural, one {visitante} other {visitantes}} neste momento",
   "message.confirm-delete": "Deseja realmente remover {target}?",
-  "message.confirm-leave": "Are you sure you want to leave {target}?",
+  "message.confirm-leave": "Você tem certeza que deseja sair de {target}?",
   "message.confirm-reset": "Você tem certeza que deseja redefinir as estatísticas de {target}?",
   "message.delete-website": "Remover site",
   "message.delete-website-warning": "Todos os dados associados também serão eliminados.",
   "message.error": "Ocorreu um erro.",
-  "message.event-log": "{event} on {url}",
+  "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": "Minimum length of {n} characters",
+  "message.min-password-length": "Quantidade mínima de {n} caracteres",
   "message.no-data-available": "Sem dados disponíveis.",
   "message.no-match-password": "As senhas não correspondem",
-  "message.no-teams": "You have not created any teams.",
-  "message.no-users": "There are no users.",
+  "message.no-teams": "Você não criou nenhum time.",
+  "message.no-users": "Não há usuários.",
   "message.page-not-found": "Página não encontrada.",
   "message.reset-website": "Redefinir estatísticas",
   "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": "You are already a member of the team.",
-  "message.team-not-found": "Team not found.",
+  "message.team-already-member": "Você já um membro do time.",
+  "message.team-not-found": "Time não encontrado.",
   "message.tracking-code": "Código de rastreamento",
-  "message.user-deleted": "User deleted.",
+  "message.user-deleted": "Usuário removido.",
   "message.visitor-log": "Visitante de {country} usando {browser} no {device} {os}",
-  "messages.no-team-websites": "This team does not have any websites.",
+  "messages.no-team-websites": "Este time não possui nenhum site.",
   "messages.no-websites-configured": "Nenhum site foi configurado ainda.",
-  "messages.team-websites-info": "Websites can be viewed by anyone on the team."
+  "messages.team-websites-info": "Os sites podem ser visualizados por qualquer membro da equipe."
 }

From f5cb18b9b50f83b169e98d1680695c89f123ea16 Mon Sep 17 00:00:00 2001
From: Felipe Valtl de Mello <3065339+valtlfelipe@users.noreply.github.com>
Date: Wed, 26 Apr 2023 10:55:12 -0300
Subject: [PATCH 05/88] Update pt-BR.json

---
 lang/pt-BR.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lang/pt-BR.json b/lang/pt-BR.json
index fa40b4d2..590cb33c 100644
--- a/lang/pt-BR.json
+++ b/lang/pt-BR.json
@@ -59,7 +59,7 @@
   "label.more": "Mais",
   "label.name": "Nome",
   "label.new-password": "Nova senha",
-  "label.none": "nenhum",
+  "label.none": "Nenhum",
   "label.operating-systems": "Sistemas operacionais",
   "label.owner": "Proprietário",
   "label.page-views": "Visualizações de página",
@@ -129,7 +129,7 @@
   "message.no-data-available": "Sem dados disponíveis.",
   "message.no-match-password": "As senhas não correspondem",
   "message.no-teams": "Você não criou nenhum time.",
-  "message.no-users": "Não há usuários.",
+  "message.no-users": "Não há nenhum usuário.",
   "message.page-not-found": "Página não encontrada.",
   "message.reset-website": "Redefinir estatísticas",
   "message.reset-website-warning": "Todas as estatísticas deste site serão removidas, mas seu código de rastreamento permanecerá intacto.",

From ac0efb29aa5a8ba235c7f36429fcc0caa2ba8e85 Mon Sep 17 00:00:00 2001
From: Maxime-J <Maxime-J@users.noreply.github.com>
Date: Thu, 27 Apr 2023 13:38:07 +0000
Subject: [PATCH 06/88] Cleanup check-db

---
 scripts/check-db.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/check-db.js b/scripts/check-db.js
index 3fd3a908..a84a775c 100644
--- a/scripts/check-db.js
+++ b/scripts/check-db.js
@@ -11,7 +11,7 @@ if (process.env.SKIP_DB_CHECK) {
 }
 
 function getDatabaseType(url = process.env.DATABASE_URL) {
-  const type = process.env.DATABASE_TYPE || (url && url.split(':')[0]);
+  const type = url && url.split(':')[0];
 
   if (type === 'postgres') {
     return 'postgresql';
@@ -20,7 +20,6 @@ function getDatabaseType(url = process.env.DATABASE_URL) {
   return type;
 }
 
-const databaseType = getDatabaseType();
 const prisma = new PrismaClient();
 
 function success(msg) {
@@ -49,10 +48,11 @@ async function checkConnection() {
   }
 }
 
-async function checkDatabaseVersion(databaseType) {
+async function checkDatabaseVersion() {
   const query = await prisma.$queryRaw`select version() as version`;
   const version = semver.valid(semver.coerce(query[0].version));
 
+  const databaseType = getDatabaseType();
   const minVersion = databaseType === 'postgresql' ? '9.4.0' : '5.7.0';
 
   if (semver.lt(version, minVersion)) {
@@ -87,7 +87,7 @@ async function applyMigration() {
   let err = false;
   for (let fn of [checkEnv, checkConnection, checkDatabaseVersion, checkV1Tables, applyMigration]) {
     try {
-      fn.name === 'checkDatabaseVersion' ? await fn(databaseType) : await fn();
+      await fn();
     } catch (e) {
       error(e.message);
       err = true;

From 0a1ed145af1d69212352e8900e70349423f724cb Mon Sep 17 00:00:00 2001
From: Florian Roher <dev@florianrohrer.ch>
Date: Fri, 28 Apr 2023 21:51:07 +0200
Subject: [PATCH 07/88] swiss german translations

---
 lang-ignore.json                | 42 +++++++++------
 lang/de-CH.json                 | 88 +++++++++++++++----------------
 lang/de-DE.json                 | 32 ++++++------
 public/intl/messages/de-CH.json | 92 ++++++++++++++++-----------------
 public/intl/messages/de-DE.json | 32 ++++++------
 5 files changed, 149 insertions(+), 137 deletions(-)

diff --git a/lang-ignore.json b/lang-ignore.json
index d4707cda..0efa7258 100644
--- a/lang-ignore.json
+++ b/lang-ignore.json
@@ -1,16 +1,32 @@
 {
   "cs-CZ": ["label.reset", "metrics.device.tablet"],
-  "de-DE": [
-    "label.administrator",
-    "label.name",
+  "de-CH": [
+    "label.admin",
+    "label.analytics",
+    "label.desktop",
+    "label.details",
     "label.domain",
-    "label.theme",
-    "metrics.device.desktop",
-    "metrics.device.laptop",
-    "metrics.device.tablet",
-    "metrics.referrers",
-    "metrics.utm",
-    "metrics.utm_medium"
+    "label.laptop",
+    "label.tablet",
+    "label.name",
+    "label.sessions",
+    "label.team",
+    "label.team-id",
+    "label.teams"
+  ],
+  "de-DE": [
+    "label.admin",
+    "label.analytics",
+    "label.desktop",
+    "label.details",
+    "label.domain",
+    "label.laptop",
+    "label.tablet",
+    "label.name",
+    "label.sessions",
+    "label.team",
+    "label.team-id",
+    "label.teams"
   ],
   "en-GB": "*",
   "fr-FR": ["metrics.actions", "metrics.pages"],
@@ -37,9 +53,5 @@
     "metrics.device.tablet",
     "metrics.filter.raw"
   ],
-  "pt-PT": [
-    "label.websites",
-    "metrics.device.desktop",
-    "metrics.device.tablet"
-  ]
+  "pt-PT": ["label.websites", "metrics.device.desktop", "metrics.device.tablet"]
 }
diff --git a/lang/de-CH.json b/lang/de-CH.json
index 03980e5c..981f1590 100644
--- a/lang/de-CH.json
+++ b/lang/de-CH.json
@@ -1,7 +1,7 @@
 {
-  "label.access-code": "Access code",
+  "label.access-code": "Zuegangscode",
   "label.actions": "Aktione",
-  "label.activity-log": "Activity log",
+  "label.activity-log": "Aktivitätsverlauf",
   "label.add-website": "Websiite hinzuefüege",
   "label.admin": "Administrator",
   "label.all": "Alli",
@@ -13,24 +13,24 @@
   "label.browsers": "Browser",
   "label.cancel": "Abbreche",
   "label.change-password": "Passwort ändere",
-  "label.cities": "Cities",
-  "label.clear-all": "Clear all",
-  "label.confirm": "Confirm",
+  "label.cities": "Städt",
+  "label.clear-all": "Alles lösche",
+  "label.confirm": "Bestätige",
   "label.confirm-password": "Passwort widerhole",
-  "label.continue": "Continue",
+  "label.continue": "Wiiter",
   "label.countries": "Länder",
-  "label.create-team": "Create team",
-  "label.create-user": "Create user",
-  "label.created": "Created",
+  "label.create-team": "Team erstelle",
+  "label.create-user": "Benutzer erstelle",
+  "label.created": "Erstellt",
   "label.current-password": "Jetzigs Passwort",
   "label.custom-range": "Benutzerdefinierte Bereich",
   "label.dashboard": "Übersicht",
-  "label.data": "Data",
+  "label.data": "Datä",
   "label.date-range": "Datumsbereich",
   "label.default-date-range": "Vorigstellte Datumsbereich",
   "label.delete": "Lösche",
-  "label.delete-team": "Delete team",
-  "label.delete-user": "Delete user",
+  "label.delete-team": "Team lösche",
+  "label.delete-user": "Benutzer lösche",
   "label.delete-website": "Websiite lösche",
   "label.desktop": "Desktop",
   "label.details": "Details",
@@ -43,104 +43,104 @@
   "label.events": "Ereigniss",
   "label.filter-combined": "Kombiniert",
   "label.filter-raw": "Rohdate",
-  "label.join": "Join",
-  "label.join-team": "Join team",
+  "label.join": "Biträte",
+  "label.join-team": "Team biträte",
   "label.language": "Sprach",
   "label.languages": "Sprache",
   "label.laptop": "Laptop",
   "label.last-days": "Letzti {x} Täg",
   "label.last-hours": "Letzti {x} Stunde",
-  "label.leave": "Leave",
-  "label.leave-team": "Leave team",
-  "label.login": "Login",
+  "label.leave": "Verlah",
+  "label.leave-team": "Team verlah",
+  "label.login": "Aamelde",
   "label.logout": "Abmelde",
-  "label.members": "Members",
+  "label.members": "Mitglieder",
   "label.mobile": "Handy",
   "label.more": "Meh",
   "label.name": "Name",
   "label.new-password": "Neus Passwort",
   "label.none": "Keis",
-  "label.operating-systems": "Betriebssystem",
+  "label.operating-systems": "Betriibssystem",
   "label.owner": "Bsitzer",
   "label.page-views": "Siitenufrüef",
   "label.pages": "Siite",
   "label.password": "Passwort",
   "label.powered-by": "Betribe dur {name}",
   "label.profile": "Profil",
-  "label.queries": "Queries",
+  "label.queries": "Abfrage",
   "label.query-parameters": "Abfragparameter",
   "label.realtime": "Echtzit",
   "label.referrers": "Referrer",
   "label.refresh": "Aktualisiere",
-  "label.regenerate": "Regenerate",
-  "label.regions": "Regions",
-  "label.remove": "Remove",
+  "label.regenerate": "Erneuere",
+  "label.regions": "Regionä",
+  "label.remove": "Entferne",
   "label.required": "Erforderlich",
   "label.reset": "Zruggsetze",
   "label.reset-website": "Statistik zruggsetze",
-  "label.role": "Role",
+  "label.role": "Rollä",
   "label.save": "Speichere",
   "label.screens": "Bildschirmuflösige",
-  "label.select-website": "Select website",
+  "label.select-website": "Websiite uuswähle",
   "label.sessions": "Sessions",
   "label.settings": "Istellige",
   "label.share-url": "Freigab-URL",
   "label.single-day": "Ein Tag",
   "label.tablet": "Tablet",
   "label.team": "Team",
-  "label.team-guest": "Team guest",
+  "label.team-guest": "Team Gast",
   "label.team-id": "Team ID",
-  "label.team-member": "Team member",
-  "label.team-owner": "Team owner",
+  "label.team-member": "Team Mitglied",
+  "label.team-owner": "Team Bsitzer",
   "label.teams": "Teams",
   "label.theme": "Thema",
   "label.this-month": "De Monet",
   "label.this-week": "Die Wuche",
   "label.this-year": "Das Jahr",
-  "label.timezone": "Zitzone",
-  "label.title": "Title",
+  "label.timezone": "Ziitzone",
+  "label.title": "Titel",
   "label.today": "Hüt",
   "label.toggle-charts": "Schaubilder umschalte",
   "label.tracking-code": "Tracking Code",
   "label.unique-visitors": "Eidütigi Bsuecher",
   "label.unknown": "Unbekannt",
-  "label.user": "User",
+  "label.user": "Benutzer",
   "label.username": "Benutzername",
-  "label.users": "Users",
-  "label.view": "View",
+  "label.users": "Benutzer",
+  "label.view": "Azeige",
   "label.view-details": "Details azeige",
   "label.views": "Ufrüef",
   "label.visitors": "Bsuecher",
-  "label.website-id": "Website ID",
+  "label.website-id": "Websiite ID",
   "label.websites": "Websiite",
   "label.yesterday": "Gester",
   "message.active-users": "{x} {x, plural, one {aktive Bsuecher} other {aktivi Bsuecher}}",
   "message.confirm-delete": "Sind Sie sich sicher, {target} zlösche?",
-  "message.confirm-leave": "Are you sure you want to leave {target}?",
+  "message.confirm-leave": "Sind Sie sich sicher, {target} zverlah?",
   "message.confirm-reset": "Sind Sie sicher, dass Sie dStatistike vo {target} zruggsetze wend?",
   "message.delete-website": "Websiite lösche",
   "message.delete-website-warning": "Alli dezueghörige Date werdet ebefalls glöscht.",
   "message.error": "Es isch en Fehler uftrete.",
-  "message.event-log": "{event} on {url}",
+  "message.event-log": "{event} uf {url}",
   "message.go-to-settings": "Zu de Istellige",
   "message.incorrect-username-password": "Falschs Passwort oder Benutzername.",
   "message.invalid-domain": "Ungültigi Domain",
-  "message.min-password-length": "Minimum length of {n} characters",
+  "message.min-password-length": "Miminamli längi vo {n} Zeiche",
   "message.no-data-available": "Kei Date vorhande.",
   "message.no-match-password": "Passwörter stimmed ned überi",
-  "message.no-teams": "You have not created any teams.",
-  "message.no-users": "There are no users.",
+  "message.no-teams": "Bisher sind no kei Teams erstellt worde.",
+  "message.no-users": "Da gits kei Benutzer",
   "message.page-not-found": "Siite ned gfunde.",
   "message.reset-website": "Statistik zruggsetze",
   "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": "Das isch die öffentlichi URL zum Teile für {target}.",
-  "message.team-already-member": "You are already a member of the team.",
-  "message.team-not-found": "Team not found.",
+  "message.team-already-member": "Sie sind bereits es Mitglied vo dem Team.",
+  "message.team-not-found": "Team nöd gfunde.",
   "message.tracking-code": "Tracking Code",
-  "message.user-deleted": "User deleted.",
+  "message.user-deleted": "Benutzer glöscht.",
   "message.visitor-log": "Bsuecher us {country} benutzt {browser} uf {os} {device}",
-  "messages.no-team-websites": "This team does not have any websites.",
+  "messages.no-team-websites": "Dem Team sind kei Websiite zuegordnet.",
   "messages.no-websites-configured": "Es isch kei Websiite vorhande.",
-  "messages.team-websites-info": "Websites can be viewed by anyone on the team."
+  "messages.team-websites-info": "Websiite chönd vo jedem im Team agluegt werde"
 }
diff --git a/lang/de-DE.json b/lang/de-DE.json
index 0190d13c..0a69423d 100644
--- a/lang/de-DE.json
+++ b/lang/de-DE.json
@@ -19,8 +19,8 @@
   "label.confirm-password": "Passwort wiederholen",
   "label.continue": "Weiter",
   "label.countries": "Länder",
-  "label.create-team": "Erstelle Team",
-  "label.create-user": "Erstelle Nutzer",
+  "label.create-team": "Team erstellen",
+  "label.create-user": "Benutzer erstellen",
   "label.created": "Erstellt",
   "label.current-password": "Derzeitiges Passwort",
   "label.custom-range": "Benutzerdefinierter Bereich",
@@ -29,8 +29,8 @@
   "label.date-range": "Datumsbereich",
   "label.default-date-range": "Voreingestellter Datumsbereich",
   "label.delete": "Löschen",
-  "label.delete-team": "Lösche Team",
-  "label.delete-user": "Lösche Nutzer",
+  "label.delete-team": "Team löschen",
+  "label.delete-user": "Benutzer löschen",
   "label.delete-website": "Webseite löschen",
   "label.desktop": "Desktop",
   "label.details": "Details",
@@ -48,8 +48,8 @@
   "label.language": "Sprache",
   "label.languages": "Sprachen",
   "label.laptop": "Laptop",
-  "label.last-days": "Letzten {x} Tage",
-  "label.last-hours": "Letzten {x} Stunden",
+  "label.last-days": "Letzte {x} Tage",
+  "label.last-hours": "Letzte {x} Stunden",
   "label.leave": "Verlassen",
   "label.leave-team": "Team verlassen",
   "label.login": "Anmelden",
@@ -73,7 +73,7 @@
   "label.referrers": "Referrer",
   "label.refresh": "Aktualisieren",
   "label.regenerate": "Erneuern",
-  "label.regions": "Regions",
+  "label.regions": "Regionen",
   "label.remove": "Entfernen",
   "label.required": "Erforderlich",
   "label.reset": "Zurücksetzen",
@@ -101,17 +101,17 @@
   "label.title": "Titel",
   "label.today": "Heute",
   "label.toggle-charts": "Schaubilder umschalten",
-  "label.tracking-code": "Tracking Kennung",
+  "label.tracking-code": "Tracking Code",
   "label.unique-visitors": "Eindeutige Besucher",
   "label.unknown": "Unbekannt",
-  "label.user": "User",
+  "label.user": "Benutzer",
   "label.username": "Benutzername",
-  "label.users": "Users",
-  "label.view": "View",
+  "label.users": "Benutzer",
+  "label.view": "Anzeigen",
   "label.view-details": "Details anzeigen",
   "label.views": "Aufrufe",
   "label.visitors": "Besucher",
-  "label.website-id": "Website ID",
+  "label.website-id": "Webseite ID",
   "label.websites": "Webseiten",
   "label.yesterday": "Gestern",
   "message.active-users": "{x} {x, plural, one {aktiver Besucher} other {aktive Besucher}}",
@@ -121,7 +121,7 @@
   "message.delete-website": "Webseite 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} on {url}",
+  "message.event-log": "{event} auf {url}",
   "message.go-to-settings": "Zu den Einstellungen",
   "message.incorrect-username-password": "Falsches Passwort oder Benutzername.",
   "message.invalid-domain": "Ungültige Domain",
@@ -129,7 +129,7 @@
   "message.no-data-available": "Keine Daten vorhanden.",
   "message.no-match-password": "Passwörter stimmen nicht überein",
   "message.no-teams": "Bisher wurden keine Teams erstellt.",
-  "message.no-users": "Hier gibt es keine Nutzer.",
+  "message.no-users": "Hier gibt es keine Benutzer.",
   "message.page-not-found": "Seite nicht gefunden.",
   "message.reset-website": "Statistik zurücksetzen",
   "message.reset-website-warning": "Alle Daten für diese Webseite werden gelöscht, jedoch bleibt der Tracking Code bestehen.",
@@ -137,8 +137,8 @@
   "message.share-url": "Dies ist die öffentliche URL zum Teilen für {target}.",
   "message.team-already-member": "Sie sind bereits Mitglied des Teams.",
   "message.team-not-found": "Team nicht gefunden.",
-  "message.tracking-code": "Tracking Kennung",
-  "message.user-deleted": "Nutzer gelöscht.",
+  "message.tracking-code": "Tracking Code",
+  "message.user-deleted": "Benutzer gelöscht.",
   "message.visitor-log": "Besucher aus {country} benutzt {browser} auf {os} {device}",
   "messages.no-team-websites": "Diesem Team sind keine Websites zugeordnet.",
   "messages.no-websites-configured": "Es ist keine Webseite vorhanden.",
diff --git a/public/intl/messages/de-CH.json b/public/intl/messages/de-CH.json
index 8e2630ad..f3cfaf6b 100644
--- a/public/intl/messages/de-CH.json
+++ b/public/intl/messages/de-CH.json
@@ -2,7 +2,7 @@
   "label.access-code": [
     {
       "type": 0,
-      "value": "Access code"
+      "value": "Zuegangscode"
     }
   ],
   "label.actions": [
@@ -14,7 +14,7 @@
   "label.activity-log": [
     {
       "type": 0,
-      "value": "Activity log"
+      "value": "Aktivitätsverlauf"
     }
   ],
   "label.add-website": [
@@ -86,19 +86,19 @@
   "label.cities": [
     {
       "type": 0,
-      "value": "Cities"
+      "value": "Städt"
     }
   ],
   "label.clear-all": [
     {
       "type": 0,
-      "value": "Clear all"
+      "value": "Alles lösche"
     }
   ],
   "label.confirm": [
     {
       "type": 0,
-      "value": "Confirm"
+      "value": "Bestätige"
     }
   ],
   "label.confirm-password": [
@@ -110,7 +110,7 @@
   "label.continue": [
     {
       "type": 0,
-      "value": "Continue"
+      "value": "Wiiter"
     }
   ],
   "label.countries": [
@@ -122,19 +122,19 @@
   "label.create-team": [
     {
       "type": 0,
-      "value": "Create team"
+      "value": "Team erstelle"
     }
   ],
   "label.create-user": [
     {
       "type": 0,
-      "value": "Create user"
+      "value": "Benutzer erstelle"
     }
   ],
   "label.created": [
     {
       "type": 0,
-      "value": "Created"
+      "value": "Erstellt"
     }
   ],
   "label.current-password": [
@@ -158,7 +158,7 @@
   "label.data": [
     {
       "type": 0,
-      "value": "Data"
+      "value": "Datä"
     }
   ],
   "label.date-range": [
@@ -182,13 +182,13 @@
   "label.delete-team": [
     {
       "type": 0,
-      "value": "Delete team"
+      "value": "Team lösche"
     }
   ],
   "label.delete-user": [
     {
       "type": 0,
-      "value": "Delete user"
+      "value": "Benutzer lösche"
     }
   ],
   "label.delete-website": [
@@ -266,13 +266,13 @@
   "label.join": [
     {
       "type": 0,
-      "value": "Join"
+      "value": "Biträte"
     }
   ],
   "label.join-team": [
     {
       "type": 0,
-      "value": "Join team"
+      "value": "Team biträte"
     }
   ],
   "label.language": [
@@ -324,19 +324,19 @@
   "label.leave": [
     {
       "type": 0,
-      "value": "Leave"
+      "value": "Verlah"
     }
   ],
   "label.leave-team": [
     {
       "type": 0,
-      "value": "Leave team"
+      "value": "Team verlah"
     }
   ],
   "label.login": [
     {
       "type": 0,
-      "value": "Login"
+      "value": "Aamelde"
     }
   ],
   "label.logout": [
@@ -348,7 +348,7 @@
   "label.members": [
     {
       "type": 0,
-      "value": "Members"
+      "value": "Mitglieder"
     }
   ],
   "label.mobile": [
@@ -384,7 +384,7 @@
   "label.operating-systems": [
     {
       "type": 0,
-      "value": "Betriebssystem"
+      "value": "Betriibssystem"
     }
   ],
   "label.owner": [
@@ -430,7 +430,7 @@
   "label.queries": [
     {
       "type": 0,
-      "value": "Queries"
+      "value": "Abfrage"
     }
   ],
   "label.query-parameters": [
@@ -460,19 +460,19 @@
   "label.regenerate": [
     {
       "type": 0,
-      "value": "Regenerate"
+      "value": "Erneuere"
     }
   ],
   "label.regions": [
     {
       "type": 0,
-      "value": "Regions"
+      "value": "Regionä"
     }
   ],
   "label.remove": [
     {
       "type": 0,
-      "value": "Remove"
+      "value": "Entferne"
     }
   ],
   "label.required": [
@@ -496,7 +496,7 @@
   "label.role": [
     {
       "type": 0,
-      "value": "Role"
+      "value": "Rollä"
     }
   ],
   "label.save": [
@@ -514,7 +514,7 @@
   "label.select-website": [
     {
       "type": 0,
-      "value": "Select website"
+      "value": "Websiite uuswähle"
     }
   ],
   "label.sessions": [
@@ -556,7 +556,7 @@
   "label.team-guest": [
     {
       "type": 0,
-      "value": "Team guest"
+      "value": "Team Gast"
     }
   ],
   "label.team-id": [
@@ -568,13 +568,13 @@
   "label.team-member": [
     {
       "type": 0,
-      "value": "Team member"
+      "value": "Team Mitglied"
     }
   ],
   "label.team-owner": [
     {
       "type": 0,
-      "value": "Team owner"
+      "value": "Team Bsitzer"
     }
   ],
   "label.teams": [
@@ -610,13 +610,13 @@
   "label.timezone": [
     {
       "type": 0,
-      "value": "Zitzone"
+      "value": "Ziitzone"
     }
   ],
   "label.title": [
     {
       "type": 0,
-      "value": "Title"
+      "value": "Titel"
     }
   ],
   "label.today": [
@@ -652,7 +652,7 @@
   "label.user": [
     {
       "type": 0,
-      "value": "User"
+      "value": "Benutzer"
     }
   ],
   "label.username": [
@@ -664,13 +664,13 @@
   "label.users": [
     {
       "type": 0,
-      "value": "Users"
+      "value": "Benutzer"
     }
   ],
   "label.view": [
     {
       "type": 0,
-      "value": "View"
+      "value": "Azeige"
     }
   ],
   "label.view-details": [
@@ -694,7 +694,7 @@
   "label.website-id": [
     {
       "type": 0,
-      "value": "Website ID"
+      "value": "Websiite ID"
     }
   ],
   "label.websites": [
@@ -760,7 +760,7 @@
   "message.confirm-leave": [
     {
       "type": 0,
-      "value": "Are you sure you want to leave "
+      "value": "Sind Sie sich sicher, "
     },
     {
       "type": 1,
@@ -768,7 +768,7 @@
     },
     {
       "type": 0,
-      "value": "?"
+      "value": " zverlah?"
     }
   ],
   "message.confirm-reset": [
@@ -810,7 +810,7 @@
     },
     {
       "type": 0,
-      "value": " on "
+      "value": " uf "
     },
     {
       "type": 1,
@@ -838,7 +838,7 @@
   "message.min-password-length": [
     {
       "type": 0,
-      "value": "Minimum length of "
+      "value": "Miminamli längi vo "
     },
     {
       "type": 1,
@@ -846,7 +846,7 @@
     },
     {
       "type": 0,
-      "value": " characters"
+      "value": " Zeiche"
     }
   ],
   "message.no-data-available": [
@@ -864,13 +864,13 @@
   "message.no-teams": [
     {
       "type": 0,
-      "value": "You have not created any teams."
+      "value": "Bisher sind no kei Teams erstellt worde."
     }
   ],
   "message.no-users": [
     {
       "type": 0,
-      "value": "There are no users."
+      "value": "Da gits kei Benutzer"
     }
   ],
   "message.page-not-found": [
@@ -914,13 +914,13 @@
   "message.team-already-member": [
     {
       "type": 0,
-      "value": "You are already a member of the team."
+      "value": "Sie sind bereits es Mitglied vo dem Team."
     }
   ],
   "message.team-not-found": [
     {
       "type": 0,
-      "value": "Team not found."
+      "value": "Team nöd gfunde."
     }
   ],
   "message.tracking-code": [
@@ -932,7 +932,7 @@
   "message.user-deleted": [
     {
       "type": 0,
-      "value": "User deleted."
+      "value": "Benutzer glöscht."
     }
   ],
   "message.visitor-log": [
@@ -972,7 +972,7 @@
   "messages.no-team-websites": [
     {
       "type": 0,
-      "value": "This team does not have any websites."
+      "value": "Dem Team sind kei Websiite zuegordnet."
     }
   ],
   "messages.no-websites-configured": [
@@ -984,7 +984,7 @@
   "messages.team-websites-info": [
     {
       "type": 0,
-      "value": "Websites can be viewed by anyone on the team."
+      "value": "Websiite chönd vo jedem im Team agluegt werde"
     }
   ]
 }
diff --git a/public/intl/messages/de-DE.json b/public/intl/messages/de-DE.json
index 84e252f4..17df2e6d 100644
--- a/public/intl/messages/de-DE.json
+++ b/public/intl/messages/de-DE.json
@@ -122,13 +122,13 @@
   "label.create-team": [
     {
       "type": 0,
-      "value": "Erstelle Team"
+      "value": "Team erstellen"
     }
   ],
   "label.create-user": [
     {
       "type": 0,
-      "value": "Erstelle Nutzer"
+      "value": "Benutzer erstellen"
     }
   ],
   "label.created": [
@@ -182,13 +182,13 @@
   "label.delete-team": [
     {
       "type": 0,
-      "value": "Lösche Team"
+      "value": "Team löschen"
     }
   ],
   "label.delete-user": [
     {
       "type": 0,
-      "value": "Lösche Nutzer"
+      "value": "Benutzer löschen"
     }
   ],
   "label.delete-website": [
@@ -296,7 +296,7 @@
   "label.last-days": [
     {
       "type": 0,
-      "value": "Letzten "
+      "value": "Letzte "
     },
     {
       "type": 1,
@@ -310,7 +310,7 @@
   "label.last-hours": [
     {
       "type": 0,
-      "value": "Letzten "
+      "value": "Letzte "
     },
     {
       "type": 1,
@@ -466,7 +466,7 @@
   "label.regions": [
     {
       "type": 0,
-      "value": "Regions"
+      "value": "Regionen"
     }
   ],
   "label.remove": [
@@ -634,7 +634,7 @@
   "label.tracking-code": [
     {
       "type": 0,
-      "value": "Tracking Kennung"
+      "value": "Tracking Code"
     }
   ],
   "label.unique-visitors": [
@@ -652,7 +652,7 @@
   "label.user": [
     {
       "type": 0,
-      "value": "User"
+      "value": "Benutzer"
     }
   ],
   "label.username": [
@@ -664,13 +664,13 @@
   "label.users": [
     {
       "type": 0,
-      "value": "Users"
+      "value": "Benutzer"
     }
   ],
   "label.view": [
     {
       "type": 0,
-      "value": "View"
+      "value": "Anzeigen"
     }
   ],
   "label.view-details": [
@@ -694,7 +694,7 @@
   "label.website-id": [
     {
       "type": 0,
-      "value": "Website ID"
+      "value": "Webseite ID"
     }
   ],
   "label.websites": [
@@ -810,7 +810,7 @@
     },
     {
       "type": 0,
-      "value": " on "
+      "value": " auf "
     },
     {
       "type": 1,
@@ -870,7 +870,7 @@
   "message.no-users": [
     {
       "type": 0,
-      "value": "Hier gibt es keine Nutzer."
+      "value": "Hier gibt es keine Benutzer."
     }
   ],
   "message.page-not-found": [
@@ -926,13 +926,13 @@
   "message.tracking-code": [
     {
       "type": 0,
-      "value": "Tracking Kennung"
+      "value": "Tracking Code"
     }
   ],
   "message.user-deleted": [
     {
       "type": 0,
-      "value": "Nutzer gelöscht."
+      "value": "Benutzer gelöscht."
     }
   ],
   "message.visitor-log": [

From 004e5a954a1843ee5a2d3533e7b10398c247e136 Mon Sep 17 00:00:00 2001
From: Florian Roher <dev@florianrohrer.ch>
Date: Fri, 28 Apr 2023 23:15:40 +0200
Subject: [PATCH 08/88] fix message.share-url

---
 lang/de-CH.json                 |  2 +-
 lang/de-DE.json                 |  2 +-
 public/intl/messages/de-CH.json | 10 +---------
 public/intl/messages/de-DE.json | 10 +---------
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/lang/de-CH.json b/lang/de-CH.json
index 981f1590..f8602bc3 100644
--- a/lang/de-CH.json
+++ b/lang/de-CH.json
@@ -134,7 +134,7 @@
   "message.reset-website": "Statistik zruggsetze",
   "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": "Das isch die öffentlichi URL zum Teile für {target}.",
+  "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-not-found": "Team nöd gfunde.",
   "message.tracking-code": "Tracking Code",
diff --git a/lang/de-DE.json b/lang/de-DE.json
index 0a69423d..b3611d5b 100644
--- a/lang/de-DE.json
+++ b/lang/de-DE.json
@@ -134,7 +134,7 @@
   "message.reset-website": "Statistik zurücksetzen",
   "message.reset-website-warning": "Alle Daten für diese Webseite werden gelöscht, jedoch bleibt der Tracking Code bestehen.",
   "message.saved": "Erfolgreich gespeichert.",
-  "message.share-url": "Dies ist die öffentliche URL zum Teilen für {target}.",
+  "message.share-url": "Ihre Webseitenstatistik ist unter der folgenden URL öffentlich zugänglich:",
   "message.team-already-member": "Sie sind bereits Mitglied des Teams.",
   "message.team-not-found": "Team nicht gefunden.",
   "message.tracking-code": "Tracking Code",
diff --git a/public/intl/messages/de-CH.json b/public/intl/messages/de-CH.json
index f3cfaf6b..88a93208 100644
--- a/public/intl/messages/de-CH.json
+++ b/public/intl/messages/de-CH.json
@@ -900,15 +900,7 @@
   "message.share-url": [
     {
       "type": 0,
-      "value": "Das isch die öffentlichi URL zum Teile für "
-    },
-    {
-      "type": 1,
-      "value": "target"
-    },
-    {
-      "type": 0,
-      "value": "."
+      "value": "Ihri Websiitestatistik isch under de folgende URL öffentlich zuegänglich:"
     }
   ],
   "message.team-already-member": [
diff --git a/public/intl/messages/de-DE.json b/public/intl/messages/de-DE.json
index 17df2e6d..d8a64915 100644
--- a/public/intl/messages/de-DE.json
+++ b/public/intl/messages/de-DE.json
@@ -900,15 +900,7 @@
   "message.share-url": [
     {
       "type": 0,
-      "value": "Dies ist die öffentliche URL zum Teilen für "
-    },
-    {
-      "type": 1,
-      "value": "target"
-    },
-    {
-      "type": 0,
-      "value": "."
+      "value": "Ihre Webseitenstatistik ist unter der folgenden URL öffentlich zugänglich:"
     }
   ],
   "message.team-already-member": [

From 65ebb26a700746d17a61d9cedb994b1fc651cdc1 Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Sun, 30 Apr 2023 22:55:54 -0700
Subject: [PATCH 09/88] Fix boolean event data.

---
 components/pages/console/TestConsole.js | 2 ++
 lib/eventData.ts                        | 1 +
 queries/analytics/event/getEvents.ts    | 5 ++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/components/pages/console/TestConsole.js b/components/pages/console/TestConsole.js
index 745bf94c..6c14c2c1 100644
--- a/components/pages/console/TestConsole.js
+++ b/components/pages/console/TestConsole.js
@@ -30,6 +30,8 @@ export function TestConsole() {
     window.umami.track('track-event-with-data', {
       data: {
         test: 'test-data',
+        boolean: true,
+        booleanError: 'true',
         time: new Date(),
         number: 1,
         time2: new Date().toISOString(),
diff --git a/lib/eventData.ts b/lib/eventData.ts
index 4588d081..aee1f9b4 100644
--- a/lib/eventData.ts
+++ b/lib/eventData.ts
@@ -49,6 +49,7 @@ function createKey(key, value, acc: { keyValues: any[]; parentKey: string }) {
       break;
     case 'boolean':
       eventDataType = EVENT_DATA_TYPE.boolean;
+      value = value ? 'true' : 'false';
       break;
     case 'date':
       eventDataType = EVENT_DATA_TYPE.date;
diff --git a/queries/analytics/event/getEvents.ts b/queries/analytics/event/getEvents.ts
index b3853f2d..8197019d 100644
--- a/queries/analytics/event/getEvents.ts
+++ b/queries/analytics/event/getEvents.ts
@@ -1,7 +1,6 @@
-import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
-import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
-import { EVENT_TYPE } from 'lib/constants';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import prisma from 'lib/prisma';
 
 export function getEvents(...args: [websiteId: string, startAt: Date, eventType: number]) {
   return runQuery({

From 714a331cd2cea7683184f6c1d6fbda55866f3c19 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 1 May 2023 11:33:08 -0700
Subject: [PATCH 10/88] remove navbar logo pointer

---
 components/layout/NavBar.module.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/layout/NavBar.module.css b/components/layout/NavBar.module.css
index 05dce2af..dd5085a0 100644
--- a/components/layout/NavBar.module.css
+++ b/components/layout/NavBar.module.css
@@ -27,7 +27,6 @@
   gap: 10px;
   font-size: 16px;
   font-weight: 700;
-  cursor: pointer;
   min-width: 0;
 }
 

From f01e3ad502f46d167c92c4006ce1ad5c93358704 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Sun, 30 Apr 2023 08:21:17 -0700
Subject: [PATCH 11/88] Update Next.js 13.2.4.

---
 next.config.js |   2 -
 package.json   |   2 +-
 yarn.lock      | 145 +++++++++++++++++++++----------------------------
 3 files changed, 62 insertions(+), 87 deletions(-)

diff --git a/next.config.js b/next.config.js
index 8efb45bc..7ba1a7ea 100644
--- a/next.config.js
+++ b/next.config.js
@@ -2,8 +2,6 @@
 require('dotenv').config();
 const pkg = require('./package.json');
 
-const CLOUD_URL = 'https://cloud.umami.is';
-
 const contentSecurityPolicy = `
   default-src 'self';
   img-src *;
diff --git a/package.json b/package.json
index c1981e7f..736ec659 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,7 @@
     "kafkajs": "^2.1.0",
     "maxmind": "^4.3.6",
     "moment-timezone": "^0.5.35",
-    "next": "13.2.4",
+    "next": "13.3.1",
     "next-basics": "^0.27.0",
     "node-fetch": "^3.2.8",
     "npm-run-all": "^4.1.5",
diff --git a/yarn.lock b/yarn.lock
index 47d67290..cc31006a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2301,10 +2301,10 @@
     slash "^3.0.0"
     tiny-glob "^0.2.9"
 
-"@next/env@13.2.4":
-  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-13.2.4.tgz#8b763700262b2445140a44a8c8d088cef676dbae"
-  integrity sha512-+Mq3TtpkeeKFZanPturjcXt+KHfKYnLlX6jMLyCrmpq6OOs4i1GqBOAauSkii9QeKCMTYzGppar21JU57b/GEA==
+"@next/env@13.3.1":
+  version "13.3.1"
+  resolved "https://registry.yarnpkg.com/@next/env/-/env-13.3.1.tgz#589707043065f6b71d411ed9b8f1ffd057c0fd4a"
+  integrity sha512-EDtCoedIZC7JlUQ3uaQpSc4aVmyhbLHmQVALg7pFfQgOTjgSnn7mKtA0DiCMkYvvsx6aFb5octGMtWrOtGXW9A==
 
 "@next/eslint-plugin-next@12.3.4":
   version "12.3.4"
@@ -2313,70 +2313,50 @@
   dependencies:
     glob "7.1.7"
 
-"@next/swc-android-arm-eabi@13.2.4":
-  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-13.2.4.tgz#758d0403771e549f9cee71cbabc0cb16a6c947c0"
-  integrity sha512-DWlalTSkLjDU11MY11jg17O1gGQzpRccM9Oes2yTqj2DpHndajrXHGxj9HGtJ+idq2k7ImUdJVWS2h2l/EDJOw==
+"@next/swc-darwin-arm64@13.3.1":
+  version "13.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.3.1.tgz#2c9719dd10a9cdf63bf50a7576b05dcf78999fe8"
+  integrity sha512-UXPtriEc/pBP8luSLSCZBcbzPeVv+SSjs9cH/KygTbhmACye8/OOXRZO13Z2Wq1G0gLmEAIHQAOuF+vafPd2lw==
 
-"@next/swc-android-arm64@13.2.4":
-  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-android-arm64/-/swc-android-arm64-13.2.4.tgz#834d586523045110d5602e0c8aae9028835ac427"
-  integrity sha512-sRavmUImUCf332Gy+PjIfLkMhiRX1Ez4SI+3vFDRs1N5eXp+uNzjFUK/oLMMOzk6KFSkbiK/3Wt8+dHQR/flNg==
+"@next/swc-darwin-x64@13.3.1":
+  version "13.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-13.3.1.tgz#0be90342c89e53a390ccd9bece15f7f5cd480049"
+  integrity sha512-lT36yYxosCfLtplFzJWgo0hrPu6/do8+msgM7oQkPeohDNdhjtjFUgOOwdSnPublLR6Mo2Ym4P/wl5OANuD2bw==
 
-"@next/swc-darwin-arm64@13.2.4":
-  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.2.4.tgz#5006fca179a36ef3a24d293abadec7438dbb48c6"
-  integrity sha512-S6vBl+OrInP47TM3LlYx65betocKUUlTZDDKzTiRDbsRESeyIkBtZ6Qi5uT2zQs4imqllJznVjFd1bXLx3Aa6A==
+"@next/swc-linux-arm64-gnu@13.3.1":
+  version "13.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.3.1.tgz#a7353265839f8b8569a346a444dc3ab3770d297e"
+  integrity sha512-wRb76nLWJhonH8s3kxC/1tFguEkeOPayIwe9mkaz1G/yeS3OrjeyKMJsb4+Kdg0zbTo53bNCOl59NNtDM7yyyw==
 
-"@next/swc-darwin-x64@13.2.4":
-  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-13.2.4.tgz#6549c7c04322766acc3264ccdb3e1b43fcaf7946"
-  integrity sha512-a6LBuoYGcFOPGd4o8TPo7wmv5FnMr+Prz+vYHopEDuhDoMSHOnC+v+Ab4D7F0NMZkvQjEJQdJS3rqgFhlZmKlw==
+"@next/swc-linux-arm64-musl@13.3.1":
+  version "13.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.3.1.tgz#24552e6102c350e372f83f505a1d93c880551a50"
+  integrity sha512-qz3BzjJRZ16Iq/jrp+pjiYOc0jTjHlfmxQmZk9x/+5uhRP6/eWQSTAPVJ33BMo6oK5O5N4644OgTAbzXzorecg==
 
-"@next/swc-freebsd-x64@13.2.4":
-  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-freebsd-x64/-/swc-freebsd-x64-13.2.4.tgz#0bbe28979e3e868debc2cc06e45e186ce195b7f4"
-  integrity sha512-kkbzKVZGPaXRBPisoAQkh3xh22r+TD+5HwoC5bOkALraJ0dsOQgSMAvzMXKsN3tMzJUPS0tjtRf1cTzrQ0I5vQ==
+"@next/swc-linux-x64-gnu@13.3.1":
+  version "13.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.3.1.tgz#5f335a683b6eafa52307b12af97782993b6c45ff"
+  integrity sha512-6mgkLmwlyWlomQmpl21I3hxgqE5INoW4owTlcLpNsd1V4wP+J46BlI/5zV5KWWbzjfncIqzXoeGs5Eg+1GHODA==
 
-"@next/swc-linux-arm-gnueabihf@13.2.4":
-  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-13.2.4.tgz#1d28d2203f5a7427d6e7119d7bcb5fc40959fb3e"
-  integrity sha512-7qA1++UY0fjprqtjBZaOA6cas/7GekpjVsZn/0uHvquuITFCdKGFCsKNBx3S0Rpxmx6WYo0GcmhNRM9ru08BGg==
+"@next/swc-linux-x64-musl@13.3.1":
+  version "13.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.3.1.tgz#58e5aad6f97203a0788783f66324456c8f9cdb50"
+  integrity sha512-uqm5sielhQmKJM+qayIhgZv1KlS5pqTdQ99b+Z7hMWryXS96qE0DftTmMZowBcUL6x7s2vSXyH5wPtO1ON7LBg==
 
-"@next/swc-linux-arm64-gnu@13.2.4":
-  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.2.4.tgz#eb26448190948cdf4c44b8f34110a3ecea32f1d0"
-  integrity sha512-xzYZdAeq883MwXgcwc72hqo/F/dwUxCukpDOkx/j1HTq/J0wJthMGjinN9wH5bPR98Mfeh1MZJ91WWPnZOedOg==
+"@next/swc-win32-arm64-msvc@13.3.1":
+  version "13.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.3.1.tgz#f8ed1badab57ed4503969758754e6fb0cf326753"
+  integrity sha512-WomIiTj/v3LevltlibNQKmvrOymNRYL+a0dp5R73IwPWN5FvXWwSELN/kiNALig/+T3luc4qHNTyvMCp9L6U5Q==
 
-"@next/swc-linux-arm64-musl@13.2.4":
-  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.2.4.tgz#c4227c0acd94a420bb14924820710e6284d234d3"
-  integrity sha512-8rXr3WfmqSiYkb71qzuDP6I6R2T2tpkmf83elDN8z783N9nvTJf2E7eLx86wu2OJCi4T05nuxCsh4IOU3LQ5xw==
+"@next/swc-win32-ia32-msvc@13.3.1":
+  version "13.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.3.1.tgz#7f599c8975b09ee5527cc49b9e5a4d13be50635a"
+  integrity sha512-M+PoH+0+q658wRUbs285RIaSTYnGBSTdweH/0CdzDgA6Q4rBM0sQs4DHmO3BPP0ltCO/vViIoyG7ks66XmCA5g==
 
-"@next/swc-linux-x64-gnu@13.2.4":
-  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.2.4.tgz#6bcb540944ee9b0209b33bfc23b240c2044dfc3e"
-  integrity sha512-Ngxh51zGSlYJ4EfpKG4LI6WfquulNdtmHg1yuOYlaAr33KyPJp4HeN/tivBnAHcZkoNy0hh/SbwDyCnz5PFJQQ==
-
-"@next/swc-linux-x64-musl@13.2.4":
-  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.2.4.tgz#ce21e43251eaf09a09df39372b2c3e38028c30ff"
-  integrity sha512-gOvwIYoSxd+j14LOcvJr+ekd9fwYT1RyMAHOp7znA10+l40wkFiMONPLWiZuHxfRk+Dy7YdNdDh3ImumvL6VwA==
-
-"@next/swc-win32-arm64-msvc@13.2.4":
-  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.2.4.tgz#68220063d8e5e082f5465498675640dedb670ff1"
-  integrity sha512-q3NJzcfClgBm4HvdcnoEncmztxrA5GXqKeiZ/hADvC56pwNALt3ngDC6t6qr1YW9V/EPDxCYeaX4zYxHciW4Dw==
-
-"@next/swc-win32-ia32-msvc@13.2.4":
-  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.2.4.tgz#7c120ab54a081be9566df310bed834f168252990"
-  integrity sha512-/eZ5ncmHUYtD2fc6EUmAIZlAJnVT2YmxDsKs1Ourx0ttTtvtma/WKlMV5NoUsyOez0f9ExLyOpeCoz5aj+MPXw==
-
-"@next/swc-win32-x64-msvc@13.2.4":
-  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.2.4.tgz#5abda92fe12b9829bf7951c4a221282c56041144"
-  integrity sha512-0MffFmyv7tBLlji01qc0IaPP/LVExzvj7/R5x1Jph1bTAIj4Vu81yFQWHHQAP6r4ff9Ukj1mBK6MDNVXm7Tcvw==
+"@next/swc-win32-x64-msvc@13.3.1":
+  version "13.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.3.1.tgz#192d43ab44ebb98bd4f5865d0e1d7ce62703182f"
+  integrity sha512-Sl1F4Vp5Z1rNXWZYqJwMuWRRol4bqOB6+/d7KqkgQ4AcafKPN1PZmpkCoxv4UFHtFNIB7EotnuIhtXu3zScicQ==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
@@ -2912,10 +2892,10 @@
     "@svgr/plugin-jsx" "^6.5.1"
     "@svgr/plugin-svgo" "^6.5.1"
 
-"@swc/helpers@0.4.14":
-  version "0.4.14"
-  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.4.14.tgz#1352ac6d95e3617ccb7c1498ff019654f1e12a74"
-  integrity sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==
+"@swc/helpers@0.5.0":
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.0.tgz#bf1d807b60f7290d0ec763feea7ccdeda06e85f1"
+  integrity sha512-SjY/p4MmECVVEWspzSRpQEM3sjR17sP8PbGxELWrT+YZMBfiUyt1MRUNjMV23zohwlG2HYtCQOsCwsTHguXkyg==
   dependencies:
     tslib "^2.4.0"
 
@@ -3847,7 +3827,7 @@ builtin-modules@^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:
+busboy@1.6.0, busboy@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893"
   integrity sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==
@@ -7034,30 +7014,27 @@ next-basics@^0.27.0:
     bcryptjs "^2.4.3"
     jsonwebtoken "^9.0.0"
 
-next@13.2.4:
-  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/next/-/next-13.2.4.tgz#2363330392b0f7da02ab41301f60857ffa7f67d6"
-  integrity sha512-g1I30317cThkEpvzfXujf0O4wtaQHtDCLhlivwlTJ885Ld+eOgcz7r3TGQzeU+cSRoNHtD8tsJgzxVdYojFssw==
+next@13.3.1:
+  version "13.3.1"
+  resolved "https://registry.yarnpkg.com/next/-/next-13.3.1.tgz#17625f7423db2e059d71b41bd9031756cf2b33bc"
+  integrity sha512-eByWRxPzKHs2oQz1yE41LX35umhz86ZSZ+mYyXBqn2IBi2hyUqxBA88avywdr4uyH+hCJczegGsDGWbzQA5Rqw==
   dependencies:
-    "@next/env" "13.2.4"
-    "@swc/helpers" "0.4.14"
+    "@next/env" "13.3.1"
+    "@swc/helpers" "0.5.0"
+    busboy "1.6.0"
     caniuse-lite "^1.0.30001406"
     postcss "8.4.14"
     styled-jsx "5.1.1"
   optionalDependencies:
-    "@next/swc-android-arm-eabi" "13.2.4"
-    "@next/swc-android-arm64" "13.2.4"
-    "@next/swc-darwin-arm64" "13.2.4"
-    "@next/swc-darwin-x64" "13.2.4"
-    "@next/swc-freebsd-x64" "13.2.4"
-    "@next/swc-linux-arm-gnueabihf" "13.2.4"
-    "@next/swc-linux-arm64-gnu" "13.2.4"
-    "@next/swc-linux-arm64-musl" "13.2.4"
-    "@next/swc-linux-x64-gnu" "13.2.4"
-    "@next/swc-linux-x64-musl" "13.2.4"
-    "@next/swc-win32-arm64-msvc" "13.2.4"
-    "@next/swc-win32-ia32-msvc" "13.2.4"
-    "@next/swc-win32-x64-msvc" "13.2.4"
+    "@next/swc-darwin-arm64" "13.3.1"
+    "@next/swc-darwin-x64" "13.3.1"
+    "@next/swc-linux-arm64-gnu" "13.3.1"
+    "@next/swc-linux-arm64-musl" "13.3.1"
+    "@next/swc-linux-x64-gnu" "13.3.1"
+    "@next/swc-linux-x64-musl" "13.3.1"
+    "@next/swc-win32-arm64-msvc" "13.3.1"
+    "@next/swc-win32-ia32-msvc" "13.3.1"
+    "@next/swc-win32-x64-msvc" "13.3.1"
 
 nice-try@^1.0.4:
   version "1.0.5"

From c41fb5ee1b2748416b9527bb8da0d26e3f06597c Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Mon, 1 May 2023 08:31:41 -0700
Subject: [PATCH 12/88] Updated packages.

---
 yarn.lock | 114 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 64 insertions(+), 50 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index cc31006a..d98ada11 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1518,6 +1518,13 @@
   dependencies:
     regenerator-runtime "^0.13.10"
 
+"@babel/runtime@^7.21.0":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.5.tgz#8492dddda9644ae3bda3b45eabe87382caee7200"
+  integrity sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q==
+  dependencies:
+    regenerator-runtime "^0.13.11"
+
 "@babel/runtime@^7.8.4":
   version "7.20.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.0.tgz#824a9ef325ffde6f78056059db3168c08785e24a"
@@ -1862,9 +1869,9 @@
     eslint-visitor-keys "^3.3.0"
 
 "@eslint-community/regexpp@^4.4.0":
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.0.tgz#f6f729b02feee2c749f57e334b7a1b5f40a81724"
-  integrity sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ==
+  version "4.5.1"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.1.tgz#cdd35dce4fa1a89a4fd42b1599eb35b3af408884"
+  integrity sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==
 
 "@eslint/eslintrc@^2.0.2":
   version "2.0.2"
@@ -3131,14 +3138,14 @@
   integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
 
 "@typescript-eslint/eslint-plugin@^5.50.0":
-  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.1.tgz#9b09ee1541bff1d2cebdcb87e7ce4a4003acde08"
-  integrity sha512-AVi0uazY5quFB9hlp2Xv+ogpfpk77xzsgsIEWyVS7uK/c7MZ5tw7ZPbapa0SbfkqE0fsAMkz5UwtgMLVk2BQAg==
+  version "5.59.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.2.tgz#684a2ce7182f3b4dac342eef7caa1c2bae476abd"
+  integrity sha512-yVrXupeHjRxLDcPKL10sGQ/QlVrA8J5IYOEWVqk0lJaSZP7X5DfnP7Ns3cc74/blmbipQ1htFNVGsHX6wsYm0A==
   dependencies:
     "@eslint-community/regexpp" "^4.4.0"
-    "@typescript-eslint/scope-manager" "5.59.1"
-    "@typescript-eslint/type-utils" "5.59.1"
-    "@typescript-eslint/utils" "5.59.1"
+    "@typescript-eslint/scope-manager" "5.59.2"
+    "@typescript-eslint/type-utils" "5.59.2"
+    "@typescript-eslint/utils" "5.59.2"
     debug "^4.3.4"
     grapheme-splitter "^1.0.4"
     ignore "^5.2.0"
@@ -3157,13 +3164,13 @@
     debug "^4.3.4"
 
 "@typescript-eslint/parser@^5.50.0":
-  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.59.1.tgz#73c2c12127c5c1182d2e5b71a8fa2a85d215cbb4"
-  integrity sha512-nzjFAN8WEu6yPRDizIFyzAfgK7nybPodMNFGNH0M9tei2gYnYszRDqVA0xlnRjkl7Hkx2vYrEdb6fP2a21cG1g==
+  version "5.59.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.59.2.tgz#c2c443247901d95865b9f77332d9eee7c55655e8"
+  integrity sha512-uq0sKyw6ao1iFOZZGk9F8Nro/8+gfB5ezl1cA06SrqbgJAt0SRoFhb9pXaHvkrxUpZaoLxt8KlovHNk8Gp6/HQ==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.59.1"
-    "@typescript-eslint/types" "5.59.1"
-    "@typescript-eslint/typescript-estree" "5.59.1"
+    "@typescript-eslint/scope-manager" "5.59.2"
+    "@typescript-eslint/types" "5.59.2"
+    "@typescript-eslint/typescript-estree" "5.59.2"
     debug "^4.3.4"
 
 "@typescript-eslint/scope-manager@5.45.0":
@@ -3174,21 +3181,21 @@
     "@typescript-eslint/types" "5.45.0"
     "@typescript-eslint/visitor-keys" "5.45.0"
 
-"@typescript-eslint/scope-manager@5.59.1":
-  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.1.tgz#8a20222719cebc5198618a5d44113705b51fd7fe"
-  integrity sha512-mau0waO5frJctPuAzcxiNWqJR5Z8V0190FTSqRw1Q4Euop6+zTwHAf8YIXNwDOT29tyUDrQ65jSg9aTU/H0omA==
+"@typescript-eslint/scope-manager@5.59.2":
+  version "5.59.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.2.tgz#f699fe936ee4e2c996d14f0fdd3a7da5ba7b9a4c"
+  integrity sha512-dB1v7ROySwQWKqQ8rEWcdbTsFjh2G0vn8KUyvTXdPoyzSL6lLGkiXEV5CvpJsEe9xIdKV+8Zqb7wif2issoOFA==
   dependencies:
-    "@typescript-eslint/types" "5.59.1"
-    "@typescript-eslint/visitor-keys" "5.59.1"
+    "@typescript-eslint/types" "5.59.2"
+    "@typescript-eslint/visitor-keys" "5.59.2"
 
-"@typescript-eslint/type-utils@5.59.1":
-  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.59.1.tgz#63981d61684fd24eda2f9f08c0a47ecb000a2111"
-  integrity sha512-ZMWQ+Oh82jWqWzvM3xU+9y5U7MEMVv6GLioM3R5NJk6uvP47kZ7YvlgSHJ7ERD6bOY7Q4uxWm25c76HKEwIjZw==
+"@typescript-eslint/type-utils@5.59.2":
+  version "5.59.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.59.2.tgz#0729c237503604cd9a7084b5af04c496c9a4cdcf"
+  integrity sha512-b1LS2phBOsEy/T381bxkkywfQXkV1dWda/z0PhnIy3bC5+rQWQDS7fk9CSpcXBccPY27Z6vBEuaPBCKCgYezyQ==
   dependencies:
-    "@typescript-eslint/typescript-estree" "5.59.1"
-    "@typescript-eslint/utils" "5.59.1"
+    "@typescript-eslint/typescript-estree" "5.59.2"
+    "@typescript-eslint/utils" "5.59.2"
     debug "^4.3.4"
     tsutils "^3.21.0"
 
@@ -3197,10 +3204,10 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.45.0.tgz#794760b9037ee4154c09549ef5a96599621109c5"
   integrity sha512-QQij+u/vgskA66azc9dCmx+rev79PzX8uDHpsqSjEFtfF2gBUTRCpvYMh2gw2ghkJabNkPlSUCimsyBEQZd1DA==
 
-"@typescript-eslint/types@5.59.1":
-  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.1.tgz#03f3fedd1c044cb336ebc34cc7855f121991f41d"
-  integrity sha512-dg0ICB+RZwHlysIy/Dh1SP+gnXNzwd/KS0JprD3Lmgmdq+dJAJnUPe1gNG34p0U19HvRlGX733d/KqscrGC1Pg==
+"@typescript-eslint/types@5.59.2":
+  version "5.59.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.2.tgz#b511d2b9847fe277c5cb002a2318bd329ef4f655"
+  integrity sha512-LbJ/HqoVs2XTGq5shkiKaNTuVv5tTejdHgfdjqRUGdYhjW1crm/M7og2jhVskMt8/4wS3T1+PfFvL1K3wqYj4w==
 
 "@typescript-eslint/typescript-estree@5.45.0":
   version "5.45.0"
@@ -3215,30 +3222,30 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/typescript-estree@5.59.1":
-  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.1.tgz#4aa546d27fd0d477c618f0ca00b483f0ec84c43c"
-  integrity sha512-lYLBBOCsFltFy7XVqzX0Ju+Lh3WPIAWxYpmH/Q7ZoqzbscLiCW00LeYCdsUnnfnj29/s1WovXKh2gwCoinHNGA==
+"@typescript-eslint/typescript-estree@5.59.2":
+  version "5.59.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.2.tgz#6e2fabd3ba01db5d69df44e0b654c0b051fe9936"
+  integrity sha512-+j4SmbwVmZsQ9jEyBMgpuBD0rKwi9RxRpjX71Brr73RsYnEr3Lt5QZ624Bxphp8HUkSKfqGnPJp1kA5nl0Sh7Q==
   dependencies:
-    "@typescript-eslint/types" "5.59.1"
-    "@typescript-eslint/visitor-keys" "5.59.1"
+    "@typescript-eslint/types" "5.59.2"
+    "@typescript-eslint/visitor-keys" "5.59.2"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.59.1":
-  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.1.tgz#d89fc758ad23d2157cfae53f0b429bdf15db9473"
-  integrity sha512-MkTe7FE+K1/GxZkP5gRj3rCztg45bEhsd8HYjczBuYm+qFHP5vtZmjx3B0yUCDotceQ4sHgTyz60Ycl225njmA==
+"@typescript-eslint/utils@5.59.2":
+  version "5.59.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.2.tgz#0c45178124d10cc986115885688db6abc37939f4"
+  integrity sha512-kSuF6/77TZzyGPhGO4uVp+f0SBoYxCDf+lW3GKhtKru/L8k/Hd7NFQxyWUeY7Z/KGB2C6Fe3yf2vVi4V9TsCSQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@types/json-schema" "^7.0.9"
     "@types/semver" "^7.3.12"
-    "@typescript-eslint/scope-manager" "5.59.1"
-    "@typescript-eslint/types" "5.59.1"
-    "@typescript-eslint/typescript-estree" "5.59.1"
+    "@typescript-eslint/scope-manager" "5.59.2"
+    "@typescript-eslint/types" "5.59.2"
+    "@typescript-eslint/typescript-estree" "5.59.2"
     eslint-scope "^5.1.1"
     semver "^7.3.7"
 
@@ -3250,12 +3257,12 @@
     "@typescript-eslint/types" "5.45.0"
     eslint-visitor-keys "^3.3.0"
 
-"@typescript-eslint/visitor-keys@5.59.1":
-  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.1.tgz#0d96c36efb6560d7fb8eb85de10442c10d8f6058"
-  integrity sha512-6waEYwBTCWryx0VJmP7JaM4FpipLsFl9CvYf2foAE8Qh/Y0s+bxWysciwOs0LTBED4JCaNxTZ5rGadB14M6dwA==
+"@typescript-eslint/visitor-keys@5.59.2":
+  version "5.59.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.2.tgz#37a419dc2723a3eacbf722512b86d6caf7d3b750"
+  integrity sha512-EEpsO8m3RASrKAHI9jpavNv9NlEUebV4qmF1OWxSTtKSFBpC1NCmWazDQHFivRf0O1DV11BA645yrLEVQ0/Lig==
   dependencies:
-    "@typescript-eslint/types" "5.59.1"
+    "@typescript-eslint/types" "5.59.2"
     eslint-visitor-keys "^3.3.0"
 
 "@umami/prisma-client@^0.2.0":
@@ -4485,7 +4492,14 @@ date-fns-tz@^1.1.4:
   resolved "https://registry.yarnpkg.com/date-fns-tz/-/date-fns-tz-1.3.8.tgz#083e3a4e1f19b7857fa0c18deea6c2bc46ded7b9"
   integrity sha512-qwNXUFtMHTTU6CFSFjoJ80W8Fzzp24LntbjFFBgL/faqds4e5mo9mftoRLgr3Vi1trISsg4awSpYVsOQCRnapQ==
 
-date-fns@^2.23.0, date-fns@^2.29.3:
+date-fns@^2.23.0:
+  version "2.30.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0"
+  integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==
+  dependencies:
+    "@babel/runtime" "^7.21.0"
+
+date-fns@^2.29.3:
   version "2.29.3"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
   integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==

From 5692c0e07df333eb56207860c05997ab23c7658b Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 2 May 2023 23:44:42 -0700
Subject: [PATCH 13/88] add formatted message to reset website

---
 components/messages.js                                 | 4 ++++
 components/pages/settings/websites/WebsiteResetForm.js | 9 +++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/components/messages.js b/components/messages.js
index aa268225..245e8591 100644
--- a/components/messages.js
+++ b/components/messages.js
@@ -158,6 +158,10 @@ export const messages = defineMessages({
     id: 'message.team-already-member',
     defaultMessage: 'You are already a member of the team.',
   },
+  deleteAccount: {
+    id: 'message.delete-account',
+    defaultMessage: 'To delete this account, type {confirmation} in the box below to confirm.',
+  },
   deleteWebsite: {
     id: 'message.delete-website',
     defaultMessage: 'To delete this website, type {confirmation} in the box below to confirm.',
diff --git a/components/pages/settings/websites/WebsiteResetForm.js b/components/pages/settings/websites/WebsiteResetForm.js
index 4ac24169..5fc0acf7 100644
--- a/components/pages/settings/websites/WebsiteResetForm.js
+++ b/components/pages/settings/websites/WebsiteResetForm.js
@@ -13,7 +13,7 @@ import useMessages from 'hooks/useMessages';
 const CONFIRM_VALUE = 'RESET';
 
 export function WebsiteResetForm({ websiteId, onSave, onClose }) {
-  const { formatMessage, labels, messages } = useMessages();
+  const { formatMessage, labels, messages, FormattedMessage } = useMessages();
   const { post, useMutation } = useApi();
   const { mutate, error } = useMutation(data => post(`/websites/${websiteId}/reset`, data));
 
@@ -28,7 +28,12 @@ export function WebsiteResetForm({ websiteId, onSave, onClose }) {
 
   return (
     <Form onSubmit={handleSubmit} error={error}>
-      <p>{formatMessage(messages.resetWebsite, { confirmation: CONFIRM_VALUE })}</p>
+      <p>
+        <FormattedMessage
+          {...messages.resetWebsite}
+          values={{ confirmation: <b>{CONFIRM_VALUE}</b> }}
+        />
+      </p>
       <FormRow label={formatMessage(labels.confirm)}>
         <FormInput name="confirm" rules={{ validate: value => value === CONFIRM_VALUE }}>
           <TextField autoComplete="off" />

From d00d4f7343f06873f850a6faa91a17d734fc81bb Mon Sep 17 00:00:00 2001
From: C-A de Salaberry <cadesalaberry@yahoo.com>
Date: Wed, 3 May 2023 19:52:59 +0200
Subject: [PATCH 14/88] chore(tracker): :label: add types for tracker

---
 tracker/index.d.ts | 138 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 138 insertions(+)
 create mode 100644 tracker/index.d.ts

diff --git a/tracker/index.d.ts b/tracker/index.d.ts
new file mode 100644
index 00000000..67cebc08
--- /dev/null
+++ b/tracker/index.d.ts
@@ -0,0 +1,138 @@
+type TrackedProperties = {
+  /**
+   * Hostname of server
+   *
+   * @description extracted from `window.location.hostname`
+   * @example 'analytics.umami.is'
+   */
+  hostname: string;
+
+  /**
+   * Browser language
+   *
+   * @description extracted from `window.navigator.language`
+   * @example 'en-US', 'fr-FR'
+   */
+  language: string;
+
+  /**
+   * Page referrer
+   *
+   * @description extracted from `window.navigator.language`
+   * @example 'https://analytics.umami.is/docs/getting-started'
+   */
+  referrer: string;
+
+  /**
+   * Screen dimensions
+   *
+   * @description extracted from `window.screen.width` and `window.screen.height`
+   * @example '1920x1080', '2560x1440'
+   */
+  screen: string;
+
+  /**
+   * Page title
+   *
+   * @description extracted from `document.querySelector('head > title')`
+   * @example 'umami'
+   */
+  title: string;
+
+  /**
+   * Page url
+   *
+   * @description built from `${window.location.pathname}${window.location.search}`
+   * @example 'docs/getting-started'
+   */
+  url: string;
+
+  /**
+   * Website ID (required)
+   *
+   * @example 'b59e9c65-ae32-47f1-8400-119fcf4861c4'
+   */
+  website: string;
+};
+
+type WithRequired<T, K extends keyof T> = T & { [P in K]-?: T[P] }
+
+/**
+ *
+ * Event Data can work with any JSON data. There are a few rules in place to maintain performance.
+ * - Numbers have a max precision of 4.
+ * - Strings have a max length of 500.
+ * - Arrays are converted to a String, with the same max length of 500.
+ * - Objects have a max of 50 properties. Arrays are considered 1 property.
+ */
+type EventData = Record<string, object>;
+type EventProperties = {
+  name: string;
+  data?: EventData;
+} & WithRequired<TrackedProperties, 'website'>
+| WithRequired<TrackedProperties, 'website'>;
+
+interface Window {
+  umami: {
+    track: {
+      /**
+       * Track a page view
+       *
+       * @example ```
+       * umami.track();
+       * ```
+       */
+      (): Promise<string>;
+
+      /**
+       * Track an event with a given name
+       *
+       * @example ```
+       * umami.track('signup-button');
+       * ```
+       */
+      (eventName: string): Promise<string>;
+
+      /**
+       * Tracks an event with dynamic data.
+       *
+       * When tracking events, the default properties are included in the payload. This is equivalent to running:
+       *
+       * ```js
+       * umami.track(props => ({
+       *   ...props,
+       *   name: 'signup-button',
+       *   data: {
+       *     name: 'newsletter',
+       *     id: 123
+       *   }
+       * }));
+       * ```
+       *
+       * @example ```
+       * umami.track('signup-button', { name: 'newsletter', id: 123 });
+       * ```
+       */
+      (eventName: string, obj: EventData): Promise<string>;
+
+      /**
+       * Tracks a page view with custom properties
+       *
+       * @example ```
+       * umami.track({ website: 'e676c9b4-11e4-4ef1-a4d7-87001773e9f2', url: '/home', title: 'Home page' });
+       * ```
+       */
+      (properties: WithRequired<Partial<TrackedProperties>, 'website'>): Promise<string>;
+
+      /**
+       * Tracks an event with fully customizable dynamic data
+       * Ilf you don't specify any `name` and/or `data`, it will be treated as a page view
+       *
+       * @example ```
+       * umami.track((props) => ({ ...props, url: path }));
+       * ```
+       */
+      (eventFunction: (prop: TrackedProperties) => EventProperties): Promise<string>;
+    };
+  };
+}

From d5b413eb90e444edc0aa114fb0e5c57804adbd18 Mon Sep 17 00:00:00 2001
From: Marc Hagen <hello@marchagen.nl>
Date: Thu, 4 May 2023 01:43:22 +0200
Subject: [PATCH 15/88] Update NL language

---
 lang-ignore.json |  21 +++++-----
 lang/nl-NL.json  | 100 +++++++++++++++++++++++------------------------
 2 files changed, 60 insertions(+), 61 deletions(-)

diff --git a/lang-ignore.json b/lang-ignore.json
index d4707cda..de185407 100644
--- a/lang-ignore.json
+++ b/lang-ignore.json
@@ -22,12 +22,15 @@
   ],
   "nb-NO": ["label.administrator", "label.dashboard"],
   "nl-NL": [
-    "label.administrator",
-    "label.websites",
-    "metrics.browsers",
-    "metrics.device.desktop",
-    "metrics.device.laptop",
-    "metrics.device.tablet"
+    "label.analytics",
+    "label.browsers",
+    "label.laptop",
+    "label.tablet",
+    "label.team",
+    "label.team-id",
+    "label.teams",
+    "label.website-id",
+    "label.websites"
   ],
   "it-IT": [
     "label.password",
@@ -37,9 +40,5 @@
     "metrics.device.tablet",
     "metrics.filter.raw"
   ],
-  "pt-PT": [
-    "label.websites",
-    "metrics.device.desktop",
-    "metrics.device.tablet"
-  ]
+  "pt-PT": ["label.websites", "metrics.device.desktop", "metrics.device.tablet"]
 }
diff --git a/lang/nl-NL.json b/lang/nl-NL.json
index bac675f9..b86ff423 100644
--- a/lang/nl-NL.json
+++ b/lang/nl-NL.json
@@ -1,9 +1,9 @@
 {
-  "label.access-code": "Access code",
+  "label.access-code": "Toegangscode",
   "label.actions": "Acties",
-  "label.activity-log": "Activity log",
-  "label.add-website": "Website toevoegen",
-  "label.admin": "Administrator",
+  "label.activity-log": "Activiteiten logboek",
+  "label.add-website": "Website koppelen",
+  "label.admin": "Beheerder",
   "label.all": "Alles",
   "label.all-time": "Onbeperkt",
   "label.analytics": "Analytics",
@@ -13,48 +13,48 @@
   "label.browsers": "Browsers",
   "label.cancel": "Annuleren",
   "label.change-password": "Wachtwoord wijzigen",
-  "label.cities": "Cities",
-  "label.clear-all": "Clear all",
-  "label.confirm": "Confirm",
+  "label.cities": "Steden",
+  "label.clear-all": "Filters wissen",
+  "label.confirm": "Bevestigen",
   "label.confirm-password": "Wachtwoord bevestigen",
-  "label.continue": "Continue",
+  "label.continue": "Doorgaan",
   "label.countries": "Landen",
-  "label.create-team": "Create team",
-  "label.create-user": "Create user",
-  "label.created": "Created",
+  "label.create-team": "Team aanmaken",
+  "label.create-user": "Gebruiker maken",
+  "label.created": "Gemaakt",
   "label.current-password": "Huidig wachtwoord",
   "label.custom-range": "Aangepast bereik",
   "label.dashboard": "Overzicht",
-  "label.data": "Data",
+  "label.data": "Gegevens",
   "label.date-range": "Datumbereik",
   "label.default-date-range": "Standaard bereik",
   "label.delete": "Verwijderen",
-  "label.delete-team": "Delete team",
-  "label.delete-user": "Delete user",
+  "label.delete-team": "Team verwijderen",
+  "label.delete-user": "Verwijder gebruiker",
   "label.delete-website": "Website verwijderen",
-  "label.desktop": "Desktop",
-  "label.details": "Details",
+  "label.desktop": "Computer",
+  "label.details": "Informatie",
   "label.devices": "Apparaten",
   "label.dismiss": "Negeren",
   "label.domain": "Domein",
   "label.edit": "Bewerken",
-  "label.edit-dashboard": "Edit dashboard",
+  "label.edit-dashboard": "Dashboard aanpassen",
   "label.enable-share-url": "Sta delen via openbare URL toe",
   "label.events": "Gebeurtenissen",
   "label.filter-combined": "Gecombineerd",
   "label.filter-raw": "Ruw",
-  "label.join": "Join",
-  "label.join-team": "Join team",
+  "label.join": "Lid worden",
+  "label.join-team": "Word lid van een team",
   "label.language": "Taal",
-  "label.languages": "Languages",
+  "label.languages": "Talen",
   "label.laptop": "Laptop",
   "label.last-days": "Laatste {x} dagen",
   "label.last-hours": "Laatste {x} uur",
-  "label.leave": "Leave",
-  "label.leave-team": "Leave team",
+  "label.leave": "Verlaten",
+  "label.leave-team": "Verlaat team",
   "label.login": "Inloggen",
   "label.logout": "Uitloggen",
-  "label.members": "Members",
+  "label.members": "Gebruikers",
   "label.mobile": "Mobiel",
   "label.more": "Toon meer",
   "label.name": "Naam",
@@ -67,80 +67,80 @@
   "label.password": "Wachtwoord",
   "label.powered-by": "mogelijk gemaakt door {name}",
   "label.profile": "Profiel",
-  "label.queries": "Queries",
-  "label.query-parameters": "Query parameters",
+  "label.queries": "Parameters",
+  "label.query-parameters": "URL-parameters",
   "label.realtime": "Actueel",
   "label.referrers": "Verwijzers",
   "label.refresh": "Vernieuwen",
-  "label.regenerate": "Regenerate",
-  "label.regions": "Regions",
-  "label.remove": "Remove",
+  "label.regenerate": "Opnieuw genereren",
+  "label.regions": "Regio's",
+  "label.remove": "Verwijderen",
   "label.required": "Verplicht",
-  "label.reset": "Resetten",
+  "label.reset": "Opnieuw instellen",
   "label.reset-website": "Statistieken opnieuw instellen",
-  "label.role": "Role",
+  "label.role": "Gebruikersrol",
   "label.save": "Opslaan",
   "label.screens": "Schermen",
-  "label.select-website": "Select website",
-  "label.sessions": "Sessions",
+  "label.select-website": "Website selecteren",
+  "label.sessions": "Sessies",
   "label.settings": "Instellingen",
   "label.share-url": "URL delen",
   "label.single-day": "Enkele dag",
   "label.tablet": "Tablet",
   "label.team": "Team",
-  "label.team-guest": "Team guest",
+  "label.team-guest": "Team gast",
   "label.team-id": "Team ID",
-  "label.team-member": "Team member",
-  "label.team-owner": "Team owner",
+  "label.team-member": "Teamlid",
+  "label.team-owner": "Teameigenaar",
   "label.teams": "Teams",
   "label.theme": "Thema",
   "label.this-month": "Deze maand",
   "label.this-week": "Deze week",
   "label.this-year": "Dit jaar",
   "label.timezone": "Tijdzone",
-  "label.title": "Title",
+  "label.title": "Titel",
   "label.today": "Vandaag",
   "label.toggle-charts": "Grafieken tonen/verbergen",
   "label.tracking-code": "Volgcode",
   "label.unique-visitors": "Unieke bezoekers",
   "label.unknown": "Onbekend",
-  "label.user": "User",
+  "label.user": "Gebruiker",
   "label.username": "Gebruikersnaam",
-  "label.users": "Users",
-  "label.view": "View",
+  "label.users": "Gebruikers",
+  "label.view": "Weergave",
   "label.view-details": "Meer details",
   "label.views": "Weergaven",
   "label.visitors": "Bezoekers",
   "label.website-id": "Website ID",
   "label.websites": "Websites",
-  "label.yesterday": "Yesterday",
+  "label.yesterday": "Gisteren",
   "message.active-users": "{x} actieve {x, plural, one {bezoeker} other {bezoekers}}",
   "message.confirm-delete": "Weet je zeker dat je {target} wilt verwijderen?",
-  "message.confirm-leave": "Are you sure you want to leave {target}?",
+  "message.confirm-leave": "Weet je zeker dat je {target} wilt verlaten?",
   "message.confirm-reset": "Weet je zeker dat je de statistieken van {target} opnieuw wilt instellen?",
   "message.delete-website": "Website verwijderen",
   "message.delete-website-warning": "Alle verwante gegezens zullen ook verwijderd worden.",
   "message.error": "Er is iets misgegaan.",
-  "message.event-log": "{event} on {url}",
+  "message.event-log": "{event} op {url}",
   "message.go-to-settings": "Naar instellingen",
   "message.incorrect-username-password": "Incorrecte gebruikersnaam/wachtwoord.",
   "message.invalid-domain": "Ongeldig domein",
-  "message.min-password-length": "Minimum length of {n} characters",
+  "message.min-password-length": "Minimale lengte van {n} tekens",
   "message.no-data-available": "Geen gegevens beschikbaar.",
   "message.no-match-password": "Wachtwoorden komen niet overeen",
-  "message.no-teams": "You have not created any teams.",
-  "message.no-users": "There are no users.",
+  "message.no-teams": "Er zijn nog geen teams aangemaakt.",
+  "message.no-users": "Er zijn geen gebruikers.",
   "message.page-not-found": "Pagina niet gevonden.",
   "message.reset-website": "Statistieken opnieuw instellen",
   "message.reset-website-warning": "Alle bijhorende statistieken van deze website worden verwijderd, maar jouw volgcode blijft gelden.",
   "message.saved": "Opslaan succesvol.",
   "message.share-url": "Met deze URL kan {target} openbaar gedeeld worden.",
-  "message.team-already-member": "You are already a member of the team.",
-  "message.team-not-found": "Team not found.",
+  "message.team-already-member": "Je bent al lid van het team.",
+  "message.team-not-found": "Team niet gevonden.",
   "message.tracking-code": "Volgcode",
-  "message.user-deleted": "User deleted.",
+  "message.user-deleted": "Gebruiker verwijderd.",
   "message.visitor-log": "Bezoeker uit {country} met {browser} op een {os} {device}",
-  "messages.no-team-websites": "This team does not have any websites.",
+  "messages.no-team-websites": "Er zijn geen websites gekoppeld aan dit team.",
   "messages.no-websites-configured": "Je hebt geen websites ingesteld.",
-  "messages.team-websites-info": "Websites can be viewed by anyone on the team."
+  "messages.team-websites-info": "Websites kunnen door iedereen in het team worden bekeken."
 }

From 9e2a47800153b301bb685b54d3b5dbdb67b05fae Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Wed, 3 May 2023 17:17:57 -0700
Subject: [PATCH 16/88] Add user usage.

---
 pages/api/users/[id]/usage.ts                 | 74 +++++++++++++++++++
 pages/api/users/[id]/websites.ts              |  4 +-
 queries/analytics/event/getEventUsage.ts      | 32 ++++++++
 .../analytics/eventData/getEventDataUsage.ts  | 32 ++++++++
 queries/index.js                              |  2 +
 5 files changed, 142 insertions(+), 2 deletions(-)
 create mode 100644 pages/api/users/[id]/usage.ts
 create mode 100644 queries/analytics/event/getEventUsage.ts
 create mode 100644 queries/analytics/eventData/getEventDataUsage.ts

diff --git a/pages/api/users/[id]/usage.ts b/pages/api/users/[id]/usage.ts
new file mode 100644
index 00000000..0118df92
--- /dev/null
+++ b/pages/api/users/[id]/usage.ts
@@ -0,0 +1,74 @@
+import { useAuth, useCors } from 'lib/middleware';
+import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getEventDataUsage, getEventUsage, getUserWebsites } from 'queries';
+
+export interface UserUsageRequestQuery {
+  id: string;
+  startAt: string;
+  endAt: string;
+}
+
+export interface UserUsageRequestResponse {
+  websiteEventUsage: number;
+  eventDataUsage: number;
+  websites: {
+    websiteEventUsage: number;
+    eventDataUsage: number;
+    websiteId: string;
+    websiteName: string;
+  }[];
+}
+
+export default async (
+  req: NextApiRequestQueryBody<UserUsageRequestQuery>,
+  res: NextApiResponse<UserUsageRequestResponse>,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+
+  const { user } = req.auth;
+
+  if (req.method === 'GET') {
+    if (!user.isAdmin) {
+      return unauthorized(res);
+    }
+
+    const { id: userId, startAt, endAt } = req.query;
+
+    const startDate = new Date(+startAt);
+    const endDate = new Date(+endAt);
+
+    const websites = await getUserWebsites(userId);
+
+    const websiteIds = websites.map(a => a.id);
+
+    const websiteEventUsage = await getEventUsage(websiteIds, startDate, endDate);
+    const eventDataUsage = await getEventDataUsage(websiteIds, startDate, endDate);
+
+    const websiteUsage = websites.map(a => ({
+      websiteId: a.id,
+      websiteName: a.name,
+      websiteEventUsage: websiteEventUsage.find(b => a.id === b.websiteId)?.count || 0,
+      eventDataUsage: eventDataUsage.find(b => a.id === b.websiteId)?.count || 0,
+    }));
+
+    const usage = websiteUsage.reduce(
+      (acc, cv) => {
+        acc.websiteEventUsage += cv.websiteEventUsage;
+        acc.eventDataUsage += cv.eventDataUsage;
+
+        return acc;
+      },
+      { websiteEventUsage: 0, eventDataUsage: 0 },
+    );
+
+    return ok(res, {
+      ...usage,
+      websites: websiteUsage,
+    });
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/pages/api/users/[id]/websites.ts b/pages/api/users/[id]/websites.ts
index c8b874bb..de4a3a3a 100644
--- a/pages/api/users/[id]/websites.ts
+++ b/pages/api/users/[id]/websites.ts
@@ -4,14 +4,14 @@ import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { getUserWebsites } from 'queries';
 
-export interface WebsitesRequestBody {
+export interface UserWebsitesRequestBody {
   name: string;
   domain: string;
   shareId: string;
 }
 
 export default async (
-  req: NextApiRequestQueryBody<any, WebsitesRequestBody>,
+  req: NextApiRequestQueryBody<any, UserWebsitesRequestBody>,
   res: NextApiResponse,
 ) => {
   await useCors(req, res);
diff --git a/queries/analytics/event/getEventUsage.ts b/queries/analytics/event/getEventUsage.ts
new file mode 100644
index 00000000..1465264c
--- /dev/null
+++ b/queries/analytics/event/getEventUsage.ts
@@ -0,0 +1,32 @@
+import clickhouse from 'lib/clickhouse';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+
+export function getEventUsage(...args: [websiteIds: string[], startDate: Date, endDate: Date]) {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+function relationalQuery(websiteIds: string[], startDate: Date, endDate: Date) {
+  throw new Error('Not Implemented');
+}
+
+function clickhouseQuery(websiteIds: string[], startDate: Date, endDate: Date) {
+  const { rawQuery } = clickhouse;
+
+  return rawQuery(
+    `select 
+        website_id as websiteId,
+        count(*) as count
+    from website_event 
+    where created_at between {startDate:DateTime64} and {endDate:DateTime64}
+    and website_id in {websiteIds:Array(UUID)}
+    group by website_id`,
+    {
+      websiteIds,
+      startDate,
+      endDate,
+    },
+  );
+}
diff --git a/queries/analytics/eventData/getEventDataUsage.ts b/queries/analytics/eventData/getEventDataUsage.ts
new file mode 100644
index 00000000..5d470c3c
--- /dev/null
+++ b/queries/analytics/eventData/getEventDataUsage.ts
@@ -0,0 +1,32 @@
+import clickhouse from 'lib/clickhouse';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+
+export function getEventDataUsage(...args: [websiteIds: string[], startDate: Date, endDate: Date]) {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+function relationalQuery(websiteIds: string[], startDate: Date, endDate: Date) {
+  throw new Error('Not Implemented');
+}
+
+function clickhouseQuery(websiteIds: string[], startDate: Date, endDate: Date) {
+  const { rawQuery } = clickhouse;
+
+  return rawQuery(
+    `select 
+        website_id as websiteId,
+        count(*) as count
+    from event_data 
+    where created_at between {startDate:DateTime64} and {endDate:DateTime64}
+    and website_id in {websiteIds:Array(UUID)}
+    group by website_id`,
+    {
+      websiteIds,
+      startDate,
+      endDate,
+    },
+  );
+}
diff --git a/queries/index.js b/queries/index.js
index 1275e173..d87d5dd5 100644
--- a/queries/index.js
+++ b/queries/index.js
@@ -3,8 +3,10 @@ export * from './admin/teamUser';
 export * from './admin/user';
 export * from './admin/website';
 export * from './analytics/event/getEventMetrics';
+export * from './analytics/event/getEventUsage';
 export * from './analytics/event/getEvents';
 export * from './analytics/eventData/getEventData';
+export * from './analytics/eventData/getEventDataUsage';
 export * from './analytics/event/saveEvent';
 export * from './analytics/pageview/getPageviewMetrics';
 export * from './analytics/pageview/getPageviewStats';

From 37b94e5b96e4864714ef3062e522a7cd070f49b2 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Thu, 4 May 2023 14:54:05 -0700
Subject: [PATCH 17/88] Updated message bundles.

---
 public/intl/messages/mn-MN.json | 150 +++++++++++++++++++-------------
 public/intl/messages/nl-NL.json | 104 +++++++++++-----------
 public/intl/messages/pt-BR.json |  98 ++++++++++-----------
 3 files changed, 189 insertions(+), 163 deletions(-)

diff --git a/public/intl/messages/mn-MN.json b/public/intl/messages/mn-MN.json
index 92befd98..beaab2d7 100644
--- a/public/intl/messages/mn-MN.json
+++ b/public/intl/messages/mn-MN.json
@@ -2,7 +2,7 @@
   "label.access-code": [
     {
       "type": 0,
-      "value": "Access code"
+      "value": "Хандалтын код"
     }
   ],
   "label.actions": [
@@ -14,7 +14,7 @@
   "label.activity-log": [
     {
       "type": 0,
-      "value": "Activity log"
+      "value": "Үйл ажиллагааны бүртгэл"
     }
   ],
   "label.add-website": [
@@ -86,19 +86,19 @@
   "label.cities": [
     {
       "type": 0,
-      "value": "Cities"
+      "value": "Хотууд"
     }
   ],
   "label.clear-all": [
     {
       "type": 0,
-      "value": "Clear all"
+      "value": "Бүгдийг арилгах"
     }
   ],
   "label.confirm": [
     {
       "type": 0,
-      "value": "Confirm"
+      "value": "Батлах"
     }
   ],
   "label.confirm-password": [
@@ -110,7 +110,7 @@
   "label.continue": [
     {
       "type": 0,
-      "value": "Continue"
+      "value": "Үргэлжлүүлэх"
     }
   ],
   "label.countries": [
@@ -122,19 +122,19 @@
   "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.current-password": [
@@ -158,13 +158,13 @@
   "label.data": [
     {
       "type": 0,
-      "value": "Data"
+      "value": "Өгөгдөл"
     }
   ],
   "label.date-range": [
     {
       "type": 0,
-      "value": "Хугацааны мужид"
+      "value": "Хугацааны муж"
     }
   ],
   "label.default-date-range": [
@@ -182,13 +182,13 @@
   "label.delete-team": [
     {
       "type": 0,
-      "value": "Delete team"
+      "value": "Баг устгах"
     }
   ],
   "label.delete-user": [
     {
       "type": 0,
-      "value": "Delete user"
+      "value": "Хэрэглэгч устгах"
     }
   ],
   "label.delete-website": [
@@ -206,7 +206,7 @@
   "label.details": [
     {
       "type": 0,
-      "value": "Details"
+      "value": "Мэдээлэл"
     }
   ],
   "label.devices": [
@@ -266,13 +266,13 @@
   "label.join": [
     {
       "type": 0,
-      "value": "Join"
+      "value": "Нэгдэх"
     }
   ],
   "label.join-team": [
     {
       "type": 0,
-      "value": "Join team"
+      "value": "Багт нэгдэх"
     }
   ],
   "label.language": [
@@ -324,13 +324,13 @@
   "label.leave": [
     {
       "type": 0,
-      "value": "Leave"
+      "value": "Гарах"
     }
   ],
   "label.leave-team": [
     {
       "type": 0,
-      "value": "Leave team"
+      "value": "Багаас гарах"
     }
   ],
   "label.login": [
@@ -348,7 +348,7 @@
   "label.members": [
     {
       "type": 0,
-      "value": "Members"
+      "value": "Гишүүд"
     }
   ],
   "label.mobile": [
@@ -430,7 +430,7 @@
   "label.queries": [
     {
       "type": 0,
-      "value": "Queries"
+      "value": "Query-нүүд"
     }
   ],
   "label.query-parameters": [
@@ -460,19 +460,19 @@
   "label.regenerate": [
     {
       "type": 0,
-      "value": "Regenerate"
+      "value": "Дахин үүсгэх"
     }
   ],
   "label.regions": [
     {
       "type": 0,
-      "value": "Regions"
+      "value": "Бүсүүд"
     }
   ],
   "label.remove": [
     {
       "type": 0,
-      "value": "Remove"
+      "value": "Устгах"
     }
   ],
   "label.required": [
@@ -484,7 +484,7 @@
   "label.reset": [
     {
       "type": 0,
-      "value": "Хуучин хэвд нь оруулах"
+      "value": "Дахин эхлүүлэх"
     }
   ],
   "label.reset-website": [
@@ -496,7 +496,7 @@
   "label.role": [
     {
       "type": 0,
-      "value": "Role"
+      "value": "Эрх"
     }
   ],
   "label.save": [
@@ -514,7 +514,7 @@
   "label.select-website": [
     {
       "type": 0,
-      "value": "Select website"
+      "value": "Веб сонгох"
     }
   ],
   "label.sessions": [
@@ -550,37 +550,37 @@
   "label.team": [
     {
       "type": 0,
-      "value": "Team"
+      "value": "Баг"
     }
   ],
   "label.team-guest": [
     {
       "type": 0,
-      "value": "Team guest"
+      "value": "Багийн зочин"
     }
   ],
   "label.team-id": [
     {
       "type": 0,
-      "value": "Team ID"
+      "value": "Багийн ID"
     }
   ],
   "label.team-member": [
     {
       "type": 0,
-      "value": "Team member"
+      "value": "Багийн гишүүн"
     }
   ],
   "label.team-owner": [
     {
       "type": 0,
-      "value": "Team owner"
+      "value": "Багийн эзэмшигч"
     }
   ],
   "label.teams": [
     {
       "type": 0,
-      "value": "Teams"
+      "value": "Багууд"
     }
   ],
   "label.theme": [
@@ -616,7 +616,7 @@
   "label.title": [
     {
       "type": 0,
-      "value": "Title"
+      "value": "Гарчиг"
     }
   ],
   "label.today": [
@@ -652,7 +652,7 @@
   "label.user": [
     {
       "type": 0,
-      "value": "User"
+      "value": "Хэрэглэгч"
     }
   ],
   "label.username": [
@@ -664,13 +664,13 @@
   "label.users": [
     {
       "type": 0,
-      "value": "Users"
+      "value": "Хэрэглэгчид"
     }
   ],
   "label.view": [
     {
       "type": 0,
-      "value": "View"
+      "value": "Харах"
     }
   ],
   "label.view-details": [
@@ -694,7 +694,7 @@
   "label.website-id": [
     {
       "type": 0,
-      "value": "Website ID"
+      "value": "Вебийн ID"
     }
   ],
   "label.websites": [
@@ -768,7 +768,7 @@
   "message.confirm-leave": [
     {
       "type": 0,
-      "value": "Are you sure you want to leave "
+      "value": "Та "
     },
     {
       "type": 1,
@@ -776,7 +776,7 @@
     },
     {
       "type": 0,
-      "value": "?"
+      "value": "-с гарахдаа итгэлтэй байна уу?"
     }
   ],
   "message.confirm-reset": [
@@ -796,13 +796,21 @@
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Веб устгах"
+      "value": "Веб устгахын тулд доорх хэсэгт "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " гэж бичиж, баталгаажуулна уу."
     }
   ],
   "message.delete-website-warning": [
     {
       "type": 0,
-      "value": "Үүнтэй холбоотой бүх өгөгдөл устах болно."
+      "value": "Энэ вебтэй холбоотой бүх өгөгдөл устах болно."
     }
   ],
   "message.error": [
@@ -814,15 +822,15 @@
   "message.event-log": [
     {
       "type": 1,
-      "value": "event"
+      "value": "url"
     },
     {
       "type": 0,
-      "value": " on "
+      "value": "-д "
     },
     {
       "type": 1,
-      "value": "url"
+      "value": "event"
     }
   ],
   "message.go-to-settings": [
@@ -846,7 +854,7 @@
   "message.min-password-length": [
     {
       "type": 0,
-      "value": "Minimum length of "
+      "value": "Хамгийн багадаа "
     },
     {
       "type": 1,
@@ -854,7 +862,7 @@
     },
     {
       "type": 0,
-      "value": " characters"
+      "value": " тэмдэгт"
     }
   ],
   "message.no-data-available": [
@@ -866,19 +874,19 @@
   "message.no-match-password": [
     {
       "type": 0,
-      "value": "Нууц үг тохирохгүй байна"
+      "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.page-not-found": [
@@ -890,7 +898,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Тоон үзүүлэлтийг дахин эхлүүлэх"
+      "value": "Тоон үзүүлэлийг дахин эхлүүлэхийн тулд доорх хэсэгт "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " гэж бичиж, баталгаажуулна уу."
     }
   ],
   "message.reset-website-warning": [
@@ -902,41 +918,51 @@
   "message.saved": [
     {
       "type": 0,
-      "value": "Амжилттай хадгаллаа."
+      "value": "Хадгалсан."
     }
   ],
   "message.share-url": [
-    {
-      "type": 1,
-      "value": "target"
-    },
     {
       "type": 0,
-      "value": "-г нийтэд хуваалцах холбоос."
+      "value": "Таны вебийн тоон үзүүлэлтүүд доорх URL дээр нийтэд харагдах болно:"
     }
   ],
   "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.tracking-code": [
     {
       "type": 0,
-      "value": "Мөрдөх код"
+      "value": "Энэ вебийн хандалтуудыг мөрдөхийн тулд доорх кодыг HTML-нхээ "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "..."
+        }
+      ],
+      "type": 8,
+      "value": "head"
+    },
+    {
+      "type": 0,
+      "value": " хэсэгт байрлуулна уу."
     }
   ],
   "message.user-deleted": [
     {
       "type": 0,
-      "value": "User deleted."
+      "value": "Хэрэглэгч устсан."
     }
   ],
   "message.visitor-log": [
@@ -976,7 +1002,7 @@
   "messages.no-team-websites": [
     {
       "type": 0,
-      "value": "This team does not have any websites."
+      "value": "Энэ багт ямар ч веб алга."
     }
   ],
   "messages.no-websites-configured": [
@@ -988,7 +1014,7 @@
   "messages.team-websites-info": [
     {
       "type": 0,
-      "value": "Websites can be viewed by anyone on the team."
+      "value": "Вебийг багийн бүх гишүүд үзэж болно."
     }
   ]
 }
diff --git a/public/intl/messages/nl-NL.json b/public/intl/messages/nl-NL.json
index bdaa16cb..714c31a0 100644
--- a/public/intl/messages/nl-NL.json
+++ b/public/intl/messages/nl-NL.json
@@ -2,7 +2,7 @@
   "label.access-code": [
     {
       "type": 0,
-      "value": "Access code"
+      "value": "Toegangscode"
     }
   ],
   "label.actions": [
@@ -14,19 +14,19 @@
   "label.activity-log": [
     {
       "type": 0,
-      "value": "Activity log"
+      "value": "Activiteiten logboek"
     }
   ],
   "label.add-website": [
     {
       "type": 0,
-      "value": "Website toevoegen"
+      "value": "Website koppelen"
     }
   ],
   "label.admin": [
     {
       "type": 0,
-      "value": "Administrator"
+      "value": "Beheerder"
     }
   ],
   "label.all": [
@@ -86,19 +86,19 @@
   "label.cities": [
     {
       "type": 0,
-      "value": "Cities"
+      "value": "Steden"
     }
   ],
   "label.clear-all": [
     {
       "type": 0,
-      "value": "Clear all"
+      "value": "Filters wissen"
     }
   ],
   "label.confirm": [
     {
       "type": 0,
-      "value": "Confirm"
+      "value": "Bevestigen"
     }
   ],
   "label.confirm-password": [
@@ -110,7 +110,7 @@
   "label.continue": [
     {
       "type": 0,
-      "value": "Continue"
+      "value": "Doorgaan"
     }
   ],
   "label.countries": [
@@ -122,19 +122,19 @@
   "label.create-team": [
     {
       "type": 0,
-      "value": "Create team"
+      "value": "Team aanmaken"
     }
   ],
   "label.create-user": [
     {
       "type": 0,
-      "value": "Create user"
+      "value": "Gebruiker maken"
     }
   ],
   "label.created": [
     {
       "type": 0,
-      "value": "Created"
+      "value": "Gemaakt"
     }
   ],
   "label.current-password": [
@@ -158,7 +158,7 @@
   "label.data": [
     {
       "type": 0,
-      "value": "Data"
+      "value": "Gegevens"
     }
   ],
   "label.date-range": [
@@ -182,13 +182,13 @@
   "label.delete-team": [
     {
       "type": 0,
-      "value": "Delete team"
+      "value": "Team verwijderen"
     }
   ],
   "label.delete-user": [
     {
       "type": 0,
-      "value": "Delete user"
+      "value": "Verwijder gebruiker"
     }
   ],
   "label.delete-website": [
@@ -200,13 +200,13 @@
   "label.desktop": [
     {
       "type": 0,
-      "value": "Desktop"
+      "value": "Computer"
     }
   ],
   "label.details": [
     {
       "type": 0,
-      "value": "Details"
+      "value": "Informatie"
     }
   ],
   "label.devices": [
@@ -236,7 +236,7 @@
   "label.edit-dashboard": [
     {
       "type": 0,
-      "value": "Edit dashboard"
+      "value": "Dashboard aanpassen"
     }
   ],
   "label.enable-share-url": [
@@ -266,13 +266,13 @@
   "label.join": [
     {
       "type": 0,
-      "value": "Join"
+      "value": "Lid worden"
     }
   ],
   "label.join-team": [
     {
       "type": 0,
-      "value": "Join team"
+      "value": "Word lid van een team"
     }
   ],
   "label.language": [
@@ -284,7 +284,7 @@
   "label.languages": [
     {
       "type": 0,
-      "value": "Languages"
+      "value": "Talen"
     }
   ],
   "label.laptop": [
@@ -324,13 +324,13 @@
   "label.leave": [
     {
       "type": 0,
-      "value": "Leave"
+      "value": "Verlaten"
     }
   ],
   "label.leave-team": [
     {
       "type": 0,
-      "value": "Leave team"
+      "value": "Verlaat team"
     }
   ],
   "label.login": [
@@ -348,7 +348,7 @@
   "label.members": [
     {
       "type": 0,
-      "value": "Members"
+      "value": "Gebruikers"
     }
   ],
   "label.mobile": [
@@ -430,13 +430,13 @@
   "label.queries": [
     {
       "type": 0,
-      "value": "Queries"
+      "value": "Parameters"
     }
   ],
   "label.query-parameters": [
     {
       "type": 0,
-      "value": "Query parameters"
+      "value": "URL-parameters"
     }
   ],
   "label.realtime": [
@@ -460,19 +460,19 @@
   "label.regenerate": [
     {
       "type": 0,
-      "value": "Regenerate"
+      "value": "Opnieuw genereren"
     }
   ],
   "label.regions": [
     {
       "type": 0,
-      "value": "Regions"
+      "value": "Regio's"
     }
   ],
   "label.remove": [
     {
       "type": 0,
-      "value": "Remove"
+      "value": "Verwijderen"
     }
   ],
   "label.required": [
@@ -484,7 +484,7 @@
   "label.reset": [
     {
       "type": 0,
-      "value": "Resetten"
+      "value": "Opnieuw instellen"
     }
   ],
   "label.reset-website": [
@@ -496,7 +496,7 @@
   "label.role": [
     {
       "type": 0,
-      "value": "Role"
+      "value": "Gebruikersrol"
     }
   ],
   "label.save": [
@@ -514,13 +514,13 @@
   "label.select-website": [
     {
       "type": 0,
-      "value": "Select website"
+      "value": "Website selecteren"
     }
   ],
   "label.sessions": [
     {
       "type": 0,
-      "value": "Sessions"
+      "value": "Sessies"
     }
   ],
   "label.settings": [
@@ -556,7 +556,7 @@
   "label.team-guest": [
     {
       "type": 0,
-      "value": "Team guest"
+      "value": "Team gast"
     }
   ],
   "label.team-id": [
@@ -568,13 +568,13 @@
   "label.team-member": [
     {
       "type": 0,
-      "value": "Team member"
+      "value": "Teamlid"
     }
   ],
   "label.team-owner": [
     {
       "type": 0,
-      "value": "Team owner"
+      "value": "Teameigenaar"
     }
   ],
   "label.teams": [
@@ -616,7 +616,7 @@
   "label.title": [
     {
       "type": 0,
-      "value": "Title"
+      "value": "Titel"
     }
   ],
   "label.today": [
@@ -652,7 +652,7 @@
   "label.user": [
     {
       "type": 0,
-      "value": "User"
+      "value": "Gebruiker"
     }
   ],
   "label.username": [
@@ -664,13 +664,13 @@
   "label.users": [
     {
       "type": 0,
-      "value": "Users"
+      "value": "Gebruikers"
     }
   ],
   "label.view": [
     {
       "type": 0,
-      "value": "View"
+      "value": "Weergave"
     }
   ],
   "label.view-details": [
@@ -706,7 +706,7 @@
   "label.yesterday": [
     {
       "type": 0,
-      "value": "Yesterday"
+      "value": "Gisteren"
     }
   ],
   "message.active-users": [
@@ -760,7 +760,7 @@
   "message.confirm-leave": [
     {
       "type": 0,
-      "value": "Are you sure you want to leave "
+      "value": "Weet je zeker dat je "
     },
     {
       "type": 1,
@@ -768,7 +768,7 @@
     },
     {
       "type": 0,
-      "value": "?"
+      "value": " wilt verlaten?"
     }
   ],
   "message.confirm-reset": [
@@ -810,7 +810,7 @@
     },
     {
       "type": 0,
-      "value": " on "
+      "value": " op "
     },
     {
       "type": 1,
@@ -838,7 +838,7 @@
   "message.min-password-length": [
     {
       "type": 0,
-      "value": "Minimum length of "
+      "value": "Minimale lengte van "
     },
     {
       "type": 1,
@@ -846,7 +846,7 @@
     },
     {
       "type": 0,
-      "value": " characters"
+      "value": " tekens"
     }
   ],
   "message.no-data-available": [
@@ -864,13 +864,13 @@
   "message.no-teams": [
     {
       "type": 0,
-      "value": "You have not created any teams."
+      "value": "Er zijn nog geen teams aangemaakt."
     }
   ],
   "message.no-users": [
     {
       "type": 0,
-      "value": "There are no users."
+      "value": "Er zijn geen gebruikers."
     }
   ],
   "message.page-not-found": [
@@ -914,13 +914,13 @@
   "message.team-already-member": [
     {
       "type": 0,
-      "value": "You are already a member of the team."
+      "value": "Je bent al lid van het team."
     }
   ],
   "message.team-not-found": [
     {
       "type": 0,
-      "value": "Team not found."
+      "value": "Team niet gevonden."
     }
   ],
   "message.tracking-code": [
@@ -932,7 +932,7 @@
   "message.user-deleted": [
     {
       "type": 0,
-      "value": "User deleted."
+      "value": "Gebruiker verwijderd."
     }
   ],
   "message.visitor-log": [
@@ -972,7 +972,7 @@
   "messages.no-team-websites": [
     {
       "type": 0,
-      "value": "This team does not have any websites."
+      "value": "Er zijn geen websites gekoppeld aan dit team."
     }
   ],
   "messages.no-websites-configured": [
@@ -984,7 +984,7 @@
   "messages.team-websites-info": [
     {
       "type": 0,
-      "value": "Websites can be viewed by anyone on the team."
+      "value": "Websites kunnen door iedereen in het team worden bekeken."
     }
   ]
 }
diff --git a/public/intl/messages/pt-BR.json b/public/intl/messages/pt-BR.json
index ffd77c16..63e9a49e 100644
--- a/public/intl/messages/pt-BR.json
+++ b/public/intl/messages/pt-BR.json
@@ -2,7 +2,7 @@
   "label.access-code": [
     {
       "type": 0,
-      "value": "Access code"
+      "value": "Código de acesso"
     }
   ],
   "label.actions": [
@@ -14,7 +14,7 @@
   "label.activity-log": [
     {
       "type": 0,
-      "value": "Activity log"
+      "value": "Log de atividade"
     }
   ],
   "label.add-website": [
@@ -44,7 +44,7 @@
   "label.analytics": [
     {
       "type": 0,
-      "value": "Analytics"
+      "value": "Estatísticas"
     }
   ],
   "label.average-visit-time": [
@@ -86,19 +86,19 @@
   "label.cities": [
     {
       "type": 0,
-      "value": "Cities"
+      "value": "Cidades"
     }
   ],
   "label.clear-all": [
     {
       "type": 0,
-      "value": "Clear all"
+      "value": "Limpar tudo"
     }
   ],
   "label.confirm": [
     {
       "type": 0,
-      "value": "Confirm"
+      "value": "Confirmar"
     }
   ],
   "label.confirm-password": [
@@ -110,7 +110,7 @@
   "label.continue": [
     {
       "type": 0,
-      "value": "Continue"
+      "value": "Continuar"
     }
   ],
   "label.countries": [
@@ -122,19 +122,19 @@
   "label.create-team": [
     {
       "type": 0,
-      "value": "Create team"
+      "value": "Criar time"
     }
   ],
   "label.create-user": [
     {
       "type": 0,
-      "value": "Create user"
+      "value": "Criar usuário"
     }
   ],
   "label.created": [
     {
       "type": 0,
-      "value": "Created"
+      "value": "Criado"
     }
   ],
   "label.current-password": [
@@ -182,13 +182,13 @@
   "label.delete-team": [
     {
       "type": 0,
-      "value": "Delete team"
+      "value": "Remover time"
     }
   ],
   "label.delete-user": [
     {
       "type": 0,
-      "value": "Delete user"
+      "value": "Remover usuário"
     }
   ],
   "label.delete-website": [
@@ -206,7 +206,7 @@
   "label.details": [
     {
       "type": 0,
-      "value": "Details"
+      "value": "Detalhes"
     }
   ],
   "label.devices": [
@@ -236,7 +236,7 @@
   "label.edit-dashboard": [
     {
       "type": 0,
-      "value": "Edit dashboard"
+      "value": "Editar painel"
     }
   ],
   "label.enable-share-url": [
@@ -266,13 +266,13 @@
   "label.join": [
     {
       "type": 0,
-      "value": "Join"
+      "value": "Entrar"
     }
   ],
   "label.join-team": [
     {
       "type": 0,
-      "value": "Join team"
+      "value": "Entrar no time"
     }
   ],
   "label.language": [
@@ -324,13 +324,13 @@
   "label.leave": [
     {
       "type": 0,
-      "value": "Leave"
+      "value": "Sair"
     }
   ],
   "label.leave-team": [
     {
       "type": 0,
-      "value": "Leave team"
+      "value": "Sair do time"
     }
   ],
   "label.login": [
@@ -348,7 +348,7 @@
   "label.members": [
     {
       "type": 0,
-      "value": "Members"
+      "value": "Membros"
     }
   ],
   "label.mobile": [
@@ -378,7 +378,7 @@
   "label.none": [
     {
       "type": 0,
-      "value": "None"
+      "value": "Nenhum"
     }
   ],
   "label.operating-systems": [
@@ -430,7 +430,7 @@
   "label.queries": [
     {
       "type": 0,
-      "value": "Queries"
+      "value": "Parâmetros"
     }
   ],
   "label.query-parameters": [
@@ -460,19 +460,19 @@
   "label.regenerate": [
     {
       "type": 0,
-      "value": "Regenerate"
+      "value": "Regerar"
     }
   ],
   "label.regions": [
     {
       "type": 0,
-      "value": "Regions"
+      "value": "Regiões"
     }
   ],
   "label.remove": [
     {
       "type": 0,
-      "value": "Remove"
+      "value": "Remover"
     }
   ],
   "label.required": [
@@ -496,7 +496,7 @@
   "label.role": [
     {
       "type": 0,
-      "value": "Role"
+      "value": "Papel"
     }
   ],
   "label.save": [
@@ -514,13 +514,13 @@
   "label.select-website": [
     {
       "type": 0,
-      "value": "Select website"
+      "value": "Selecionar site"
     }
   ],
   "label.sessions": [
     {
       "type": 0,
-      "value": "Sessions"
+      "value": "Sessões"
     }
   ],
   "label.settings": [
@@ -550,37 +550,37 @@
   "label.team": [
     {
       "type": 0,
-      "value": "Team"
+      "value": "Time"
     }
   ],
   "label.team-guest": [
     {
       "type": 0,
-      "value": "Team guest"
+      "value": "Convidado"
     }
   ],
   "label.team-id": [
     {
       "type": 0,
-      "value": "Team ID"
+      "value": "ID do Time"
     }
   ],
   "label.team-member": [
     {
       "type": 0,
-      "value": "Team member"
+      "value": "Membro"
     }
   ],
   "label.team-owner": [
     {
       "type": 0,
-      "value": "Team owner"
+      "value": "Proprietário"
     }
   ],
   "label.teams": [
     {
       "type": 0,
-      "value": "Teams"
+      "value": "Times"
     }
   ],
   "label.theme": [
@@ -616,7 +616,7 @@
   "label.title": [
     {
       "type": 0,
-      "value": "Title"
+      "value": "Título"
     }
   ],
   "label.today": [
@@ -652,7 +652,7 @@
   "label.user": [
     {
       "type": 0,
-      "value": "User"
+      "value": "Usuário"
     }
   ],
   "label.username": [
@@ -664,13 +664,13 @@
   "label.users": [
     {
       "type": 0,
-      "value": "Users"
+      "value": "Usuários"
     }
   ],
   "label.view": [
     {
       "type": 0,
-      "value": "View"
+      "value": "Ver"
     }
   ],
   "label.view-details": [
@@ -694,7 +694,7 @@
   "label.website-id": [
     {
       "type": 0,
-      "value": "Website ID"
+      "value": "ID do Site"
     }
   ],
   "label.websites": [
@@ -764,7 +764,7 @@
   "message.confirm-leave": [
     {
       "type": 0,
-      "value": "Are you sure you want to leave "
+      "value": "Você tem certeza que deseja sair de "
     },
     {
       "type": 1,
@@ -814,7 +814,7 @@
     },
     {
       "type": 0,
-      "value": " on "
+      "value": " em "
     },
     {
       "type": 1,
@@ -842,7 +842,7 @@
   "message.min-password-length": [
     {
       "type": 0,
-      "value": "Minimum length of "
+      "value": "Quantidade mínima de "
     },
     {
       "type": 1,
@@ -850,7 +850,7 @@
     },
     {
       "type": 0,
-      "value": " characters"
+      "value": " caracteres"
     }
   ],
   "message.no-data-available": [
@@ -868,13 +868,13 @@
   "message.no-teams": [
     {
       "type": 0,
-      "value": "You have not created any teams."
+      "value": "Você não criou nenhum time."
     }
   ],
   "message.no-users": [
     {
       "type": 0,
-      "value": "There are no users."
+      "value": "Não há nenhum usuário."
     }
   ],
   "message.page-not-found": [
@@ -918,13 +918,13 @@
   "message.team-already-member": [
     {
       "type": 0,
-      "value": "You are already a member of the team."
+      "value": "Você já um membro do time."
     }
   ],
   "message.team-not-found": [
     {
       "type": 0,
-      "value": "Team not found."
+      "value": "Time não encontrado."
     }
   ],
   "message.tracking-code": [
@@ -936,7 +936,7 @@
   "message.user-deleted": [
     {
       "type": 0,
-      "value": "User deleted."
+      "value": "Usuário removido."
     }
   ],
   "message.visitor-log": [
@@ -976,7 +976,7 @@
   "messages.no-team-websites": [
     {
       "type": 0,
-      "value": "This team does not have any websites."
+      "value": "Este time não possui nenhum site."
     }
   ],
   "messages.no-websites-configured": [
@@ -988,7 +988,7 @@
   "messages.team-websites-info": [
     {
       "type": 0,
-      "value": "Websites can be viewed by anyone on the team."
+      "value": "Os sites podem ser visualizados por qualquer membro da equipe."
     }
   ]
 }

From 98e58581e28ade0f305332494bc1ece0c91dd2f6 Mon Sep 17 00:00:00 2001
From: theshamuel <theshamuel@gmail.com>
Date: Fri, 5 May 2023 23:53:16 +0100
Subject: [PATCH 18/88] add health-check for db container

I'd like to propose a minor changes that can bring more stability in launching the umami server with docker-compose by adding a certain healthcheck for db container and a certain condition for depends_on directive for umami-app container
---
 docker-compose.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index bd63c68b..9b63c580 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,8 @@ services:
       DATABASE_TYPE: postgresql
       APP_SECRET: replace-me-with-a-random-string
     depends_on:
-      - db
+      db:
+        condition: service_healthy
     restart: always
   db:
     image: postgres:15-alpine
@@ -22,5 +23,10 @@ services:
       - ./sql/schema.postgresql.sql:/docker-entrypoint-initdb.d/schema.postgresql.sql:ro
       - umami-db-data:/var/lib/postgresql/data
     restart: always
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
 volumes:
   umami-db-data:

From e773451679dc63f4361324d220c8aa10a3721f43 Mon Sep 17 00:00:00 2001
From: theshamuel <theshamuel@gmail.com>
Date: Fri, 5 May 2023 23:57:58 +0100
Subject: [PATCH 19/88] delete a redundant volume mapping

I'd like to propose to delete from docker-compose a redundant volume mapping. As I see that `sql` directory had been deleted and now umami-app is responsible for migration.
---
 docker-compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index bd63c68b..33ae3708 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,7 +19,6 @@ services:
       POSTGRES_USER: umami
       POSTGRES_PASSWORD: umami
     volumes:
-      - ./sql/schema.postgresql.sql:/docker-entrypoint-initdb.d/schema.postgresql.sql:ro
       - umami-db-data:/var/lib/postgresql/data
     restart: always
 volumes:

From e92d958b24112ff746b6eababc37a4b90ae9b09b Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Fri, 5 May 2023 21:16:13 -0700
Subject: [PATCH 20/88] Updated redis client. Soft deletes reset username.

---
 lib/cache.ts                     | 30 +-----------------------------
 package.json                     |  2 +-
 pages/api/users/[id]/index.ts    |  2 +-
 pages/api/websites/[id]/index.ts |  4 ++--
 queries/admin/user.ts            |  2 ++
 yarn.lock                        |  8 ++++----
 6 files changed, 11 insertions(+), 37 deletions(-)

diff --git a/lib/cache.ts b/lib/cache.ts
index 2aad7ed8..528dd012 100644
--- a/lib/cache.ts
+++ b/lib/cache.ts
@@ -2,35 +2,7 @@ import { User, Website } from '@prisma/client';
 import redis from '@umami/redis-client';
 import { getSession, getUser, getWebsite } from '../queries';
 
-const DELETED = 'DELETED';
-
-async function fetchObject(key, query) {
-  const obj = await redis.get(key);
-
-  if (obj === DELETED) {
-    return null;
-  }
-
-  if (!obj) {
-    return query().then(async data => {
-      if (data) {
-        await redis.set(key, data);
-      }
-
-      return data;
-    });
-  }
-
-  return obj;
-}
-
-async function storeObject(key, data) {
-  return redis.set(key, data);
-}
-
-async function deleteObject(key, soft = false) {
-  return soft ? redis.set(key, DELETED) : redis.del(key);
-}
+const { fetchObject, storeObject, deleteObject } = redis;
 
 async function fetchWebsite(id): Promise<Website> {
   return fetchObject(`website:${id}`, () => getWebsite({ id }));
diff --git a/package.json b/package.json
index 736ec659..0db07f49 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "@prisma/client": "4.13.0",
     "@tanstack/react-query": "^4.16.1",
     "@umami/prisma-client": "^0.2.0",
-    "@umami/redis-client": "^0.2.0",
+    "@umami/redis-client": "^0.5.0",
     "chalk": "^4.1.1",
     "chart.js": "^4.2.1",
     "chartjs-adapter-date-fns": "^3.0.0",
diff --git a/pages/api/users/[id]/index.ts b/pages/api/users/[id]/index.ts
index 8219c4a7..de4642cb 100644
--- a/pages/api/users/[id]/index.ts
+++ b/pages/api/users/[id]/index.ts
@@ -51,11 +51,11 @@ export default async (
       data.password = hashPassword(password);
     }
 
+    // Only admin can change these fields
     if (role && isAdmin) {
       data.role = role;
     }
 
-    // Only admin can change these fields
     if (username && isAdmin) {
       data.username = username;
     }
diff --git a/pages/api/websites/[id]/index.ts b/pages/api/websites/[id]/index.ts
index c1907fce..3f660a91 100644
--- a/pages/api/websites/[id]/index.ts
+++ b/pages/api/websites/[id]/index.ts
@@ -1,8 +1,8 @@
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, serverError, unauthorized } from 'next-basics';
 import { Website, NextApiRequestQueryBody } from 'lib/types';
 import { canViewWebsite, canUpdateWebsite, canDeleteWebsite } from 'lib/auth';
 import { useAuth, useCors } from 'lib/middleware';
-import { NextApiResponse } from 'next';
-import { methodNotAllowed, ok, serverError, unauthorized } from 'next-basics';
 import { deleteWebsite, getWebsite, updateWebsite } from 'queries';
 
 export interface WebsiteRequestQuery {
diff --git a/queries/admin/user.ts b/queries/admin/user.ts
index 412c7785..a81a76ef 100644
--- a/queries/admin/user.ts
+++ b/queries/admin/user.ts
@@ -1,4 +1,5 @@
 import { Prisma, Team, TeamUser } from '@prisma/client';
+import { getRandomChars } from 'next-basics';
 import cache from 'lib/cache';
 import { ROLES } from 'lib/constants';
 import prisma from 'lib/prisma';
@@ -222,6 +223,7 @@ export async function deleteUser(
       cloudMode
         ? client.user.update({
             data: {
+              username: getRandomChars(32),
               deletedAt: new Date(),
             },
             where: {
diff --git a/yarn.lock b/yarn.lock
index d98ada11..41cca434 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3272,10 +3272,10 @@
   dependencies:
     debug "^4.3.4"
 
-"@umami/redis-client@^0.2.0":
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/@umami/redis-client/-/redis-client-0.2.0.tgz#bdb1cd8b5c99afc5230621f19296c6d3559d68af"
-  integrity sha512-TONWhkuC//K2hRo3Psk7FHsuvu3XkQIYMY62/CERPtlIJz4Ac7DqsmYw4jO9/RkljA9XLl/5u+OggD4ARhMV8A==
+"@umami/redis-client@^0.5.0":
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/@umami/redis-client/-/redis-client-0.5.0.tgz#09b15458001bc172fc856d65316efbe5ff749461"
+  integrity sha512-x7wx/pMjyg3AAYzgjGOw031bNhyZ81h6tRMAl60RQQI9xlJaJEA1r0TEUrWfFi21gHAvdBLJGYCsvHzpix4LKQ==
   dependencies:
     debug "^4.3.4"
     redis "^4.5.1"

From d827bf1417dd989c314f0253b1bafe55c0ccf6d6 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Sun, 7 May 2023 23:13:40 -0700
Subject: [PATCH 21/88] update CH kafka engine tables for error handling

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

diff --git a/db/clickhouse/schema.sql b/db/clickhouse/schema.sql
index 77176413..8f48b434 100644
--- a/db/clickhouse/schema.sql
+++ b/db/clickhouse/schema.sql
@@ -58,7 +58,10 @@ CREATE TABLE umami.website_event_queue (
     --event
     event_type UInt32,
     event_name String,
-    created_at DateTime('UTC')
+    created_at DateTime('UTC'),
+    --virtual columns
+    _error String,
+    _raw_message String
 )
 ENGINE = Kafka
 SETTINGS kafka_broker_list = 'domain:9092,domain:9093,domain:9094', -- input broker list
@@ -66,7 +69,7 @@ SETTINGS kafka_broker_list = 'domain:9092,domain:9093,domain:9094', -- input bro
        kafka_group_name = 'event_consumer_group',
        kafka_format = 'JSONEachRow',
        kafka_max_block_size = 1048576,
-       kafka_skip_broken_messages = 100;
+       kafka_handle_error_mode = 'stream'
 
 CREATE MATERIALIZED VIEW umami.website_event_queue_mv TO umami.website_event AS
 SELECT website_id,
@@ -93,6 +96,19 @@ SELECT website_id,
     created_at
 FROM umami.website_event_queue;
 
+CREATE MATERIALIZED VIEW umami.website_event_errors_mv
+(
+    error String,
+    raw String
+)
+ENGINE = MergeTree
+ORDER BY (error, raw)
+SETTINGS index_granularity = 8192 AS
+SELECT _error AS error,
+    _raw_message AS raw
+FROM umami.website_event_queue
+WHERE length(_error) > 0
+
 CREATE TABLE umami.event_data
 (
     website_id UUID,
@@ -122,7 +138,10 @@ CREATE TABLE umami.event_data_queue (
     event_numeric_value Nullable(Decimal64(4)), --922337203685477.5625
     event_date_value Nullable(DateTime('UTC')),
     event_data_type UInt32,
-    created_at DateTime('UTC')
+    created_at DateTime('UTC'),
+    --virtual columns
+    _error String,
+    _raw_message String
 )
 ENGINE = Kafka
 SETTINGS kafka_broker_list = 'domain:9092,domain:9093,domain:9094', -- input broker list
@@ -130,7 +149,7 @@ SETTINGS kafka_broker_list = 'domain:9092,domain:9093,domain:9094', -- input bro
        kafka_group_name = 'event_data_consumer_group',
        kafka_format = 'JSONEachRow',
        kafka_max_block_size = 1048576,
-       kafka_skip_broken_messages = 100;
+       kafka_handle_error_mode = 'stream'
 
 CREATE MATERIALIZED VIEW umami.event_data_queue_mv TO umami.event_data AS
 SELECT website_id,
@@ -144,4 +163,17 @@ SELECT website_id,
     event_date_value,
     event_data_type,
     created_at
-FROM umami.event_data_queue;
\ No newline at end of file
+FROM umami.event_data_queue;
+
+CREATE MATERIALIZED VIEW umami.event_data_errors_mv
+(
+    error String,
+    raw String
+)
+ENGINE = MergeTree
+ORDER BY (error, raw)
+SETTINGS index_granularity = 8192 AS
+SELECT _error AS error,
+    _raw_message AS raw
+FROM umami.event_data_queue
+WHERE length(_error) > 0
\ No newline at end of file

From d01aa5cd52dfa00e89a2b49b9477cac456da0159 Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Mon, 8 May 2023 23:46:58 -0700
Subject: [PATCH 22/88]  Add funnel queries

---
 .../migrations/02_report_schema/migration.sql | 18 ++++
 db/postgresql/schema.prisma                   | 28 ++++--
 lib/clickhouse.ts                             | 24 +++++
 lib/prisma.ts                                 | 56 +++++++++++
 pages/api/reports/funnel.ts                   | 50 ++++++++++
 .../analytics/pageview/getPageviewFunnel.ts   | 97 +++++++++++++++++++
 queries/index.js                              |  1 +
 7 files changed, 268 insertions(+), 6 deletions(-)
 create mode 100644 db/postgresql/migrations/02_report_schema/migration.sql
 create mode 100644 pages/api/reports/funnel.ts
 create mode 100644 queries/analytics/pageview/getPageviewFunnel.ts

diff --git a/db/postgresql/migrations/02_report_schema/migration.sql b/db/postgresql/migrations/02_report_schema/migration.sql
new file mode 100644
index 00000000..61f1164d
--- /dev/null
+++ b/db/postgresql/migrations/02_report_schema/migration.sql
@@ -0,0 +1,18 @@
+-- CreateTable
+CREATE TABLE "report" (
+    "report_id" UUID NOT NULL,
+    "user_id" UUID NOT NULL,
+    "report_name" VARCHAR(200) NOT NULL,
+    "template_name" VARCHAR(200) NOT NULL,
+    "parameters" VARCHAR(6000) NOT NULL,
+    "created_at" TIMESTAMPTZ(6) DEFAULT CURRENT_TIMESTAMP,
+    "updated_at" TIMESTAMPTZ(6),
+
+    CONSTRAINT "report_pkey" PRIMARY KEY ("report_id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "report_report_id_key" ON "report"("report_id");
+
+-- CreateIndex
+CREATE INDEX "report_user_id_idx" ON "report"("user_id");
diff --git a/db/postgresql/schema.prisma b/db/postgresql/schema.prisma
index b336bce4..7523ce21 100644
--- a/db/postgresql/schema.prisma
+++ b/db/postgresql/schema.prisma
@@ -14,11 +14,12 @@ model User {
   password  String    @db.VarChar(60)
   role      String    @map("role") @db.VarChar(50)
   createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6)
-  updatedAt DateTime? @map("updated_at") @updatedAt @db.Timestamptz(6)
+  updatedAt DateTime? @updatedAt @map("updated_at") @db.Timestamptz(6)
   deletedAt DateTime? @map("deleted_at") @db.Timestamptz(6)
 
-  website  Website[]
-  teamUser TeamUser[]
+  website        Website[]
+  teamUser       TeamUser[]
+  ReportTemplate ReportTemplate[]
 
   @@map("user")
 }
@@ -53,7 +54,7 @@ model Website {
   resetAt   DateTime? @map("reset_at") @db.Timestamptz(6)
   userId    String?   @map("user_id") @db.Uuid
   createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6)
-  updatedAt DateTime? @map("updated_at") @updatedAt @db.Timestamptz(6)
+  updatedAt DateTime? @updatedAt @map("updated_at") @db.Timestamptz(6)
   deletedAt DateTime? @map("deleted_at") @db.Timestamptz(6)
 
   user        User?         @relation(fields: [userId], references: [id])
@@ -116,7 +117,7 @@ model Team {
   name       String    @db.VarChar(50)
   accessCode String?   @unique @map("access_code") @db.VarChar(50)
   createdAt  DateTime? @default(now()) @map("created_at") @db.Timestamptz(6)
-  updatedAt  DateTime? @map("updated_at") @updatedAt @db.Timestamptz(6)
+  updatedAt  DateTime? @updatedAt @map("updated_at") @db.Timestamptz(6)
 
   teamUser    TeamUser[]
   teamWebsite TeamWebsite[]
@@ -131,7 +132,7 @@ model TeamUser {
   userId    String    @map("user_id") @db.Uuid
   role      String    @map("role") @db.VarChar(50)
   createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6)
-  updatedAt DateTime? @map("updated_at") @updatedAt @db.Timestamptz(6)
+  updatedAt DateTime? @updatedAt @map("updated_at") @db.Timestamptz(6)
 
   team Team @relation(fields: [teamId], references: [id])
   user User @relation(fields: [userId], references: [id])
@@ -154,3 +155,18 @@ model TeamWebsite {
   @@index([websiteId])
   @@map("team_website")
 }
+
+model ReportTemplate {
+  id           String    @id() @unique() @map("report_id") @db.Uuid
+  userId       String    @map("user_id") @db.Uuid
+  reportName   String    @map("report_name") @db.VarChar(200)
+  templateName String    @map("template_name") @db.VarChar(200)
+  parameters   String    @map("parameters") @db.VarChar(6000)
+  createdAt    DateTime? @default(now()) @map("created_at") @db.Timestamptz(6)
+  updatedAt    DateTime? @updatedAt @map("updated_at") @db.Timestamptz(6)
+
+  user User @relation(fields: [userId], references: [id])
+
+  @@index([userId])
+  @@map("report")
+}
diff --git a/lib/clickhouse.ts b/lib/clickhouse.ts
index 90cf6088..88922c0f 100644
--- a/lib/clickhouse.ts
+++ b/lib/clickhouse.ts
@@ -121,6 +121,29 @@ function getFilterQuery(filters = {}, params = {}) {
   return query.join('\n');
 }
 
+function getFunnelQuery(urls: string[]): {
+  columnsQuery: string;
+  conditionQuery: string;
+  urlParams: { [key: string]: string };
+} {
+  return urls.reduce(
+    (pv, cv, i) => {
+      pv.columnsQuery += `\n,url_path = {url${i}:String}${
+        i > 0 && urls[i - 1] ? ` AND request_url = {url${i - 1}:String}` : ''
+      },'`;
+      pv.conditionQuery += `${i > 0 ? ',' : ''} {url${i}:String}`;
+      pv.urlParams[`url${i}`] = cv;
+
+      return pv;
+    },
+    {
+      columnsQuery: '',
+      conditionQuery: '',
+      urlParams: {},
+    },
+  );
+}
+
 function parseFilters(filters: WebsiteMetricFilter = {}, params: any = {}) {
   return {
     filterQuery: getFilterQuery(filters, params),
@@ -168,6 +191,7 @@ export default {
   getDateFormat,
   getBetweenDates,
   getFilterQuery,
+  getFunnelQuery,
   getEventDataFilterQuery,
   parseFilters,
   findUnique,
diff --git a/lib/prisma.ts b/lib/prisma.ts
index 0a10d981..ce2238b6 100644
--- a/lib/prisma.ts
+++ b/lib/prisma.ts
@@ -32,6 +32,18 @@ function toUuid(): string {
   }
 }
 
+function getAddMinutesQuery(field: string, minutes: number) {
+  const db = getDatabaseType(process.env.DATABASE_URL);
+
+  if (db === POSTGRESQL) {
+    return `${field} + interval '${minutes} minute'`;
+  }
+
+  if (db === MYSQL) {
+    return `DATE_ADD(${field}, interval ${minutes} minute)`;
+  }
+}
+
 function getDateQuery(field: string, unit: string, timezone?: string): string {
   const db = getDatabaseType(process.env.DATABASE_URL);
 
@@ -122,6 +134,48 @@ function getFilterQuery(filters = {}, params = []): string {
   return query.join('\n');
 }
 
+function getFunnelQuery(
+  urls: string[],
+  windowMinutes: number,
+  initParamLength = 3,
+): {
+  levelQuery: string;
+  sumQuery: string;
+  urlFilterQuery: string;
+} {
+  return urls.reduce(
+    (pv, cv, i) => {
+      const levelNumber = i + 1;
+      const start = i > 0 ? ',' : '';
+
+      pv.levelQuery += `\n
+        , level${levelNumber} AS (
+          select cl.*,
+            l0.created_at level_${levelNumber}_created_at,
+            l0.url_path as level_${levelNumber}_url
+          from level${i} cl
+              left join level0 l0
+                  on cl.session_id = l0.session_id
+                  and l0.created_at between cl.level_${levelNumber}_created_at 
+                    and ${getAddMinutesQuery(`cl.level_${levelNumber}_created_at`, windowMinutes)}
+                  and l0.referrer_path = $${i + initParamLength}
+                  and l0.url_path = $${i + initParamLength}
+        )`;
+
+      pv.sumQuery += `\n${start}SUM(CASE WHEN l1_url is not null THEN 1 ELSE 0 END) AS level1`;
+
+      pv.urlFilterQuery += `\n${start}$${levelNumber + initParamLength} `;
+
+      return pv;
+    },
+    {
+      levelQuery: '',
+      sumQuery: '',
+      urlFilterQuery: '',
+    },
+  );
+}
+
 function parseFilters(
   filters: { [key: string]: any } = {},
   params = [],
@@ -152,9 +206,11 @@ async function rawQuery(query: string, params: never[] = []): Promise<any> {
 
 export default {
   ...prisma,
+  getAddMinutesQuery,
   getDateQuery,
   getTimestampInterval,
   getFilterQuery,
+  getFunnelQuery,
   getEventDataFilterQuery,
   toUuid,
   parseFilters,
diff --git a/pages/api/reports/funnel.ts b/pages/api/reports/funnel.ts
new file mode 100644
index 00000000..080130de
--- /dev/null
+++ b/pages/api/reports/funnel.ts
@@ -0,0 +1,50 @@
+import { canViewWebsite } from 'lib/auth';
+import { useCors, useAuth } from 'lib/middleware';
+import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { ok, methodNotAllowed, unauthorized } from 'next-basics';
+import { getPageviewFunnel } from 'queries';
+
+export interface FunnelRequestBody {
+  websiteId: string;
+  urls: string[];
+  window: number;
+  startAt: number;
+  endAt: number;
+}
+
+export interface FunnelResponse {
+  urls: string[];
+  window: number;
+  startAt: number;
+  endAt: number;
+}
+
+export default async (
+  req: NextApiRequestQueryBody<any, FunnelRequestBody>,
+  res: NextApiResponse<FunnelResponse>,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+
+  if (req.method === 'POST') {
+    const { websiteId, urls, window, startAt, endAt } = req.body;
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const startDate = new Date(+startAt);
+    const endDate = new Date(+endAt);
+
+    const data = getPageviewFunnel(websiteId, {
+      startDate,
+      endDate,
+      urls,
+      windowMinutes: window,
+    });
+
+    return ok(res);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/queries/analytics/pageview/getPageviewFunnel.ts b/queries/analytics/pageview/getPageviewFunnel.ts
new file mode 100644
index 00000000..f7751630
--- /dev/null
+++ b/queries/analytics/pageview/getPageviewFunnel.ts
@@ -0,0 +1,97 @@
+import clickhouse from 'lib/clickhouse';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import prisma from 'lib/prisma';
+
+export async function getPageviewFunnel(
+  ...args: [
+    websiteId: string,
+    criteria: {
+      windowMinutes: number;
+      startDate: Date;
+      endDate: Date;
+      urls: string[];
+    },
+  ]
+) {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(
+  websiteId: string,
+  criteria: {
+    windowMinutes: number;
+    startDate: Date;
+    endDate: Date;
+    urls: string[];
+  },
+) {
+  const { windowMinutes, startDate, endDate, urls } = criteria;
+  const { rawQuery, getFunnelQuery, toUuid } = prisma;
+  const { levelQuery, sumQuery, urlFilterQuery } = getFunnelQuery(urls, windowMinutes);
+
+  const params: any = [websiteId, startDate, endDate, ...urls];
+
+  return rawQuery(
+    `WITH level0 AS (
+        select session_id, url_path, created_at
+        from website_event
+        where url_path in (${urlFilterQuery})
+            website_event.website_id = $1${toUuid()}
+            and created_at between $2 and $3
+    ),level1 AS (
+        select session_id, url_path as level1_url, created_at as level1_created_at
+        from level0
+    )${levelQuery}
+    
+    SELECT ${sumQuery}
+    from level3;
+    `,
+    params,
+  );
+}
+
+async function clickhouseQuery(
+  websiteId: string,
+  criteria: {
+    windowMinutes: number;
+    startDate: Date;
+    endDate: Date;
+    urls: string[];
+  },
+) {
+  const { windowMinutes, startDate, endDate, urls } = criteria;
+  const { rawQuery, getBetweenDates, getFunnelQuery } = clickhouse;
+  const { columnsQuery, conditionQuery, urlParams } = getFunnelQuery(urls);
+
+  const params = {
+    websiteId,
+    window: windowMinutes * 60,
+    ...urlParams,
+  };
+
+  return rawQuery(
+    `
+    SELECT level,
+        count(*) AS count
+    FROM (
+    SELECT session_id,
+            windowFunnel({window:UInt32}, 'strict_order')
+            (
+                created_at,
+                ${columnsQuery}
+            ) AS level
+        FROM website_event
+        WHERE website_id = {websiteId:UUID}
+            and ${getBetweenDates('created_at', startDate, endDate)}             
+            AND (url_path in [${conditionQuery}])
+        GROUP BY 1
+        )
+    GROUP BY level
+    ORDER BY level ASC;
+    `,
+    params,
+  );
+}
diff --git a/queries/index.js b/queries/index.js
index d87d5dd5..5c295fff 100644
--- a/queries/index.js
+++ b/queries/index.js
@@ -8,6 +8,7 @@ export * from './analytics/event/getEvents';
 export * from './analytics/eventData/getEventData';
 export * from './analytics/eventData/getEventDataUsage';
 export * from './analytics/event/saveEvent';
+export * from './analytics/pageview/getPageviewFunnel';
 export * from './analytics/pageview/getPageviewMetrics';
 export * from './analytics/pageview/getPageviewStats';
 export * from './analytics/session/createSession';

From 97f4a3bccc490d4856cb1dd782355fe71a879d2e Mon Sep 17 00:00:00 2001
From: Ammar <61558359+ammar-madni@users.noreply.github.com>
Date: Thu, 11 May 2023 17:27:37 +0100
Subject: [PATCH 23/88] Update index.js

---
 pages/realtime/[id]/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/realtime/[id]/index.js b/pages/realtime/[id]/index.js
index 43475fa5..ba13ded3 100644
--- a/pages/realtime/[id]/index.js
+++ b/pages/realtime/[id]/index.js
@@ -10,7 +10,7 @@ export default function RealtimeDetailsPage() {
   const { formatMessage, labels } = useMessages();
   const { get, useQuery } = useApi();
   const { data: website } = useQuery(['websites', websiteId], () =>
-    get(`/websites/${websiteId}`, { enabled: !!websiteId }),
+    websiteId ? get(`/websites/${websiteId}`, { enabled: !!websiteId }) : null,
   );
   const title = `${formatMessage(labels.realtime)}${website?.name ? ` - ${website.name}` : ''}`;
 

From 1130bca1951c136bc9d7926deeb7163619bb8109 Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Thu, 11 May 2023 16:42:58 -0700
Subject: [PATCH 24/88] Funnel form.

---
 components/input/DateFilter.js                |  24 ++-
 components/metrics/WebsiteChart.js            |   7 +-
 components/pages/reports/FunnelChart.js       |  43 +++++
 components/pages/reports/FunnelDetails.js     |   0
 components/pages/reports/FunnelForm.js        | 104 ++++++++++++
 .../pages/reports/FunnelForm.module.css       |  19 +++
 components/pages/reports/FunnelPage.js        |  26 +++
 .../settings/profile/DateRangeSetting.js      |   8 +-
 .../migrations/02_report_schema/migration.sql |   9 +-
 db/postgresql/schema.prisma                   |   7 +-
 lib/clickhouse.ts                             |   8 +-
 lib/prisma.ts                                 |  12 +-
 package.json                                  |   1 +
 pages/_app.js                                 |   1 +
 pages/api/reports/funnel.ts                   |   4 +-
 pages/reports/funnel.js                       |  22 +++
 .../analytics/pageview/getPageviewFunnel.ts   |  57 ++++---
 styles/funnelChart.css                        | 148 ++++++++++++++++++
 yarn.lock                                     |   5 +
 19 files changed, 460 insertions(+), 45 deletions(-)
 create mode 100644 components/pages/reports/FunnelChart.js
 create mode 100644 components/pages/reports/FunnelDetails.js
 create mode 100644 components/pages/reports/FunnelForm.js
 create mode 100644 components/pages/reports/FunnelForm.module.css
 create mode 100644 components/pages/reports/FunnelPage.js
 create mode 100644 pages/reports/funnel.js
 create mode 100644 styles/funnelChart.css

diff --git a/components/input/DateFilter.js b/components/input/DateFilter.js
index b6c1ee72..ecdf9039 100644
--- a/components/input/DateFilter.js
+++ b/components/input/DateFilter.js
@@ -9,7 +9,7 @@ import useApi from 'hooks/useApi';
 import useDateRange from 'hooks/useDateRange';
 import useMessages from 'hooks/useMessages';
 
-export function DateFilter({ websiteId, value, className }) {
+export function DateFilter({ websiteId, value, className, onChange, isForm, alignment }) {
   const { formatMessage, labels } = useMessages();
   const { get } = useApi();
   const [dateRange, setDateRange] = useDateRange(websiteId);
@@ -21,10 +21,26 @@ export function DateFilter({ websiteId, value, className }) {
       const data = await get(`/websites/${websiteId}`);
 
       if (data) {
-        setDateRange({ value, ...getDateRangeValues(new Date(data.createdAt), Date.now()) });
+        const websiteRange = { value, ...getDateRangeValues(new Date(data.createdAt), Date.now()) };
+
+        if (!isForm) {
+          setDateRange(websiteRange);
+        }
+
+        if (onChange) {
+          onChange(websiteRange);
+        }
       }
     } else if (value !== 'all') {
-      setDateRange(value);
+      if (!isForm) {
+        setDateRange(value);
+      }
+
+      if (onChange) {
+        onChange(value);
+      }
+
+      console.log(value);
     }
   }
 
@@ -103,7 +119,7 @@ export function DateFilter({ websiteId, value, className }) {
         items={options}
         renderValue={renderValue}
         value={value}
-        alignment="end"
+        alignment={alignment || 'end'}
         onChange={handleChange}
       >
         {({ label, value, divider }) => (
diff --git a/components/metrics/WebsiteChart.js b/components/metrics/WebsiteChart.js
index 6614d40f..cab0821e 100644
--- a/components/metrics/WebsiteChart.js
+++ b/components/metrics/WebsiteChart.js
@@ -107,7 +107,12 @@ export function WebsiteChart({
         <Column defaultSize={12} xl={4}>
           <div className={styles.actions}>
             <RefreshButton websiteId={websiteId} isLoading={isLoading} />
-            <DateFilter websiteId={websiteId} value={value} className={styles.dropdown} />
+            <DateFilter
+              websiteId={websiteId}
+              value={value}
+              className={styles.dropdown}
+              updateSettings={true}
+            />
           </div>
         </Column>
       </Row>
diff --git a/components/pages/reports/FunnelChart.js b/components/pages/reports/FunnelChart.js
new file mode 100644
index 00000000..44c99092
--- /dev/null
+++ b/components/pages/reports/FunnelChart.js
@@ -0,0 +1,43 @@
+import FunnelGraph from 'funnel-graph-js/dist/js/funnel-graph';
+import { useEffect, useRef } from 'react';
+
+export default function FunnelChart() {
+  const funnel = useRef(null);
+
+  useEffect(() => {
+    funnel.current.innerHTML = '';
+
+    const data = {
+      labels: ['Cv Sent', '1st  Interview', '2nd Interview', '3rd Interview', 'Offer'],
+      subLabels: ['Cv Sent', '1st  Interview', '2nd Interview', '3rd Interview', 'Offer'],
+      colors: [
+        ['#FFB178', '#FF78B1', '#FF3C8E'],
+        ['#FFB178', '#FF78B1', '#FF3C8E'],
+        ['#A0BBFF', '#EC77FF'],
+        ['#A0F9FF', '#7795FF'],
+        ['#FFB178', '#FF78B1', '#FF3C8E'],
+      ],
+      values: [[3500], [3300], [2000], [600], [330]],
+    };
+
+    const graph = new FunnelGraph({
+      container: '.funnel',
+      gradientDirection: 'horizontal',
+      data: data,
+      displayPercent: true,
+      direction: 'Vertical',
+      width: 1000,
+      height: 350,
+      subLabelValue: 'values',
+    });
+
+    graph.draw();
+  }, []);
+
+  return (
+    <div>
+      FunnelChart
+      <div className="funnel" ref={funnel} />
+    </div>
+  );
+}
diff --git a/components/pages/reports/FunnelDetails.js b/components/pages/reports/FunnelDetails.js
new file mode 100644
index 00000000..e69de29b
diff --git a/components/pages/reports/FunnelForm.js b/components/pages/reports/FunnelForm.js
new file mode 100644
index 00000000..081105f1
--- /dev/null
+++ b/components/pages/reports/FunnelForm.js
@@ -0,0 +1,104 @@
+import { useMutation } from '@tanstack/react-query';
+import DateFilter from 'components/input/DateFilter';
+import WebsiteSelect from 'components/input/WebsiteSelect';
+import useApi from 'hooks/useApi';
+import useMessages from 'hooks/useMessages';
+import useUser from 'hooks/useUser';
+import { parseDateRange } from 'lib/date';
+import { useRouter } from 'next/router';
+import { useEffect, useState } from 'react';
+import {
+  Button,
+  Form,
+  FormButtons,
+  FormInput,
+  FormRow,
+  SubmitButton,
+  TextField,
+} from 'react-basics';
+import styles from './FunnelForm.module.css';
+import { getNextInternalQuery } from 'next/dist/server/request-meta';
+
+export function FunnelForm({ onSearch }) {
+  const { formatMessage, labels, getMessage } = useMessages();
+  const [dateRange, setDateRange] = useState(null);
+  const [startDate, setStartDate] = useState(null);
+  const [endDate, setEndDate] = useState(null);
+  const [urls, setUrls] = useState(['']);
+  const [websiteId, setWebsiteId] = useState('');
+
+  const handleSubmit = async data => {
+    onSearch(data);
+  };
+
+  const handleDateChange = value => {
+    const { startDate, endDate } = parseDateRange(value);
+
+    setDateRange(value);
+    setStartDate(startDate);
+    setEndDate(endDate);
+  };
+
+  const handleAddUrl = () => setUrls([...urls, 'meow']);
+
+  const handleRemoveUrl = i => setUrls(urls.splice(i, 1));
+
+  const handleUrlChange = (value, i) => {
+    const nextUrls = [...urls];
+
+    nextUrls[i] = value.target.value;
+    setUrls(nextUrls);
+  };
+
+  return (
+    <>
+      <Form
+        values={{
+          websiteId,
+          startDate,
+          endDate,
+          urls,
+        }}
+        onSubmit={handleSubmit}
+      >
+        <FormRow label="website">
+          <WebsiteSelect websiteId={websiteId} onSelect={value => setWebsiteId(value)} />
+          <FormInput name="websiteId" rules={{ required: formatMessage(labels.required) }}>
+            <TextField value={websiteId} className={styles.hiddenInput} />
+          </FormInput>
+        </FormRow>
+        <FormRow label="Date">
+          <DateFilter
+            className={styles.filter}
+            value={dateRange}
+            alignment="start"
+            onChange={handleDateChange}
+          />
+          <FormInput
+            name="startDate"
+            className={styles.hiddenInput}
+            rules={{ required: formatMessage(labels.required) }}
+          >
+            <TextField value={startDate} />
+          </FormInput>
+          <FormInput name="endDate" rules={{ required: formatMessage(labels.required) }}>
+            <TextField value={endDate} className={styles.hiddenInput} />
+          </FormInput>
+        </FormRow>
+        <Button onClick={handleAddUrl}>Add URL</Button>
+        {urls.map((a, i) => (
+          <FormRow key={`url${i}`} label={`URL ${i + 1}`}>
+            <Button onClick={() => handleRemoveUrl(i)}>Remove URL</Button>
+            <TextField value={urls[i]} onChange={value => handleUrlChange(value, i)} />
+          </FormRow>
+        ))}
+
+        <FormButtons>
+          <SubmitButton variant="primary">Search</SubmitButton>
+        </FormButtons>
+      </Form>
+    </>
+  );
+}
+
+export default FunnelForm;
diff --git a/components/pages/reports/FunnelForm.module.css b/components/pages/reports/FunnelForm.module.css
new file mode 100644
index 00000000..9a8d924b
--- /dev/null
+++ b/components/pages/reports/FunnelForm.module.css
@@ -0,0 +1,19 @@
+.filter {
+  min-width: 200px;
+}
+
+.hiddenInput {
+  max-height: 100px;
+}
+
+.hiddenInput {
+  visibility: hidden;
+  min-height: 0px;
+  max-height: 0px;
+}
+
+.hidden {
+  visibility: hidden;
+  min-height: 0px;
+  max-height: 0px;
+}
diff --git a/components/pages/reports/FunnelPage.js b/components/pages/reports/FunnelPage.js
new file mode 100644
index 00000000..3cfa63a8
--- /dev/null
+++ b/components/pages/reports/FunnelPage.js
@@ -0,0 +1,26 @@
+import Page from 'components/layout/Page';
+import FunnelChart from './FunnelChart';
+import FunnelForm from './FunnelForm';
+
+export default function FunnelPage() {
+  function handleOnSearch() {
+    // do API CALL to api/reports/funnel to get funnelData
+    // Get DATA
+  }
+
+  return (
+    <Page>
+      funnelPage
+      {/* <ReportForm /> */}
+      <FunnelForm onSearchClick={handleOnSearch} /> website / start/endDate urls: []
+      <FunnelChart />
+      {/* {!chartLoaded && <Loading icon="dots" style={{ minHeight: 300 }} />}
+      {chartLoaded && (
+        <>
+          {!view && <WebsiteTableView websiteId={websiteId} />}
+          {view && <WebsiteMenuView websiteId={websiteId} />}
+        </>
+      )} */}
+    </Page>
+  );
+}
diff --git a/components/pages/settings/profile/DateRangeSetting.js b/components/pages/settings/profile/DateRangeSetting.js
index 152aba1d..202bbbe1 100644
--- a/components/pages/settings/profile/DateRangeSetting.js
+++ b/components/pages/settings/profile/DateRangeSetting.js
@@ -7,13 +7,15 @@ import useMessages from 'hooks/useMessages';
 export function DateRangeSetting() {
   const { formatMessage, labels } = useMessages();
   const [dateRange, setDateRange] = useDateRange();
-  const { startDate, endDate, value } = dateRange;
+  const { value } = dateRange;
 
-  const handleReset = () => setDateRange(DEFAULT_DATE_RANGE);
+  const handleReset = () => {
+    setDateRange(DEFAULT_DATE_RANGE);
+  };
 
   return (
     <Flexbox gap={10}>
-      <DateFilter value={value} startDate={startDate} endDate={endDate} />
+      <DateFilter value={value} />
       <Button onClick={handleReset}>{formatMessage(labels.reset)}</Button>
     </Flexbox>
   );
diff --git a/db/postgresql/migrations/02_report_schema/migration.sql b/db/postgresql/migrations/02_report_schema/migration.sql
index 61f1164d..8b2bf0f5 100644
--- a/db/postgresql/migrations/02_report_schema/migration.sql
+++ b/db/postgresql/migrations/02_report_schema/migration.sql
@@ -1,18 +1,19 @@
 -- CreateTable
-CREATE TABLE "report" (
+CREATE TABLE "user_report" (
     "report_id" UUID NOT NULL,
     "user_id" UUID NOT NULL,
+    "website_id" UUID NOT NULL,
     "report_name" VARCHAR(200) NOT NULL,
     "template_name" VARCHAR(200) NOT NULL,
     "parameters" VARCHAR(6000) NOT NULL,
     "created_at" TIMESTAMPTZ(6) DEFAULT CURRENT_TIMESTAMP,
     "updated_at" TIMESTAMPTZ(6),
 
-    CONSTRAINT "report_pkey" PRIMARY KEY ("report_id")
+    CONSTRAINT "user_report_pkey" PRIMARY KEY ("report_id")
 );
 
 -- CreateIndex
-CREATE UNIQUE INDEX "report_report_id_key" ON "report"("report_id");
+CREATE UNIQUE INDEX "user_report_report_id_key" ON "user_report"("report_id");
 
 -- CreateIndex
-CREATE INDEX "report_user_id_idx" ON "report"("user_id");
+CREATE INDEX "user_report_user_id_idx" ON "user_report"("user_id");
diff --git a/db/postgresql/schema.prisma b/db/postgresql/schema.prisma
index 7523ce21..ee5ff4b4 100644
--- a/db/postgresql/schema.prisma
+++ b/db/postgresql/schema.prisma
@@ -19,7 +19,7 @@ model User {
 
   website        Website[]
   teamUser       TeamUser[]
-  ReportTemplate ReportTemplate[]
+  ReportTemplate UserReport[]
 
   @@map("user")
 }
@@ -156,9 +156,10 @@ model TeamWebsite {
   @@map("team_website")
 }
 
-model ReportTemplate {
+model UserReport {
   id           String    @id() @unique() @map("report_id") @db.Uuid
   userId       String    @map("user_id") @db.Uuid
+  websiteId    String    @map("website_id") @db.Uuid
   reportName   String    @map("report_name") @db.VarChar(200)
   templateName String    @map("template_name") @db.VarChar(200)
   parameters   String    @map("parameters") @db.VarChar(6000)
@@ -168,5 +169,5 @@ model ReportTemplate {
   user User @relation(fields: [userId], references: [id])
 
   @@index([userId])
-  @@map("report")
+  @@map("user_report")
 }
diff --git a/lib/clickhouse.ts b/lib/clickhouse.ts
index 88922c0f..e97be806 100644
--- a/lib/clickhouse.ts
+++ b/lib/clickhouse.ts
@@ -129,8 +129,8 @@ function getFunnelQuery(urls: string[]): {
   return urls.reduce(
     (pv, cv, i) => {
       pv.columnsQuery += `\n,url_path = {url${i}:String}${
-        i > 0 && urls[i - 1] ? ` AND request_url = {url${i - 1}:String}` : ''
-      },'`;
+        i > 0 && urls[i - 1] ? ` AND referrer_path = {url${i - 1}:String}` : ''
+      }`;
       pv.conditionQuery += `${i > 0 ? ',' : ''} {url${i}:String}`;
       pv.urlParams[`url${i}`] = cv;
 
@@ -150,7 +150,7 @@ function parseFilters(filters: WebsiteMetricFilter = {}, params: any = {}) {
   };
 }
 
-async function rawQuery(query, params = {}) {
+async function rawQuery<T>(query, params = {}): Promise<T> {
   if (process.env.LOG_QUERY) {
     log('QUERY:\n', query);
     log('PARAMETERS:\n', params);
@@ -158,7 +158,7 @@ async function rawQuery(query, params = {}) {
 
   await connect();
 
-  return clickhouse.query(query, { params }).toPromise();
+  return clickhouse.query(query, { params }).toPromise() as Promise<T>;
 }
 
 async function findUnique(data) {
diff --git a/lib/prisma.ts b/lib/prisma.ts
index ce2238b6..fdd8a58d 100644
--- a/lib/prisma.ts
+++ b/lib/prisma.ts
@@ -148,7 +148,8 @@ function getFunnelQuery(
       const levelNumber = i + 1;
       const start = i > 0 ? ',' : '';
 
-      pv.levelQuery += `\n
+      if (levelNumber >= 2) {
+        pv.levelQuery += `\n
         , level${levelNumber} AS (
           select cl.*,
             l0.created_at level_${levelNumber}_created_at,
@@ -156,13 +157,14 @@ function getFunnelQuery(
           from level${i} cl
               left join level0 l0
                   on cl.session_id = l0.session_id
-                  and l0.created_at between cl.level_${levelNumber}_created_at 
-                    and ${getAddMinutesQuery(`cl.level_${levelNumber}_created_at`, windowMinutes)}
+                  and l0.created_at between cl.level_${i}_created_at 
+                    and ${getAddMinutesQuery(`cl.level_${i}_created_at`, windowMinutes)}
                   and l0.referrer_path = $${i + initParamLength}
-                  and l0.url_path = $${i + initParamLength}
+                  and l0.url_path = $${levelNumber + initParamLength}
         )`;
+      }
 
-      pv.sumQuery += `\n${start}SUM(CASE WHEN l1_url is not null THEN 1 ELSE 0 END) AS level1`;
+      pv.sumQuery += `\n${start}SUM(CASE WHEN level_${levelNumber}_url is not null THEN 1 ELSE 0 END) AS level${levelNumber}`;
 
       pv.urlFilterQuery += `\n${start}$${levelNumber + initParamLength} `;
 
diff --git a/package.json b/package.json
index 0db07f49..7f365db1 100644
--- a/package.json
+++ b/package.json
@@ -80,6 +80,7 @@
     "dotenv": "^10.0.0",
     "formik": "^2.2.9",
     "fs-extra": "^10.0.1",
+    "funnel-graph-js": "^1.3.7",
     "immer": "^9.0.12",
     "ipaddr.js": "^2.0.1",
     "is-ci": "^3.0.1",
diff --git a/pages/_app.js b/pages/_app.js
index 22458215..bc55355b 100644
--- a/pages/_app.js
+++ b/pages/_app.js
@@ -9,6 +9,7 @@ import useConfig from 'hooks/useConfig';
 import '@fontsource/inter/400.css';
 import '@fontsource/inter/700.css';
 import 'react-basics/dist/styles.css';
+import 'styles/funnelChart.css';
 import 'styles/variables.css';
 import 'styles/locale.css';
 import 'styles/index.css';
diff --git a/pages/api/reports/funnel.ts b/pages/api/reports/funnel.ts
index 080130de..ee450eb6 100644
--- a/pages/api/reports/funnel.ts
+++ b/pages/api/reports/funnel.ts
@@ -36,14 +36,14 @@ export default async (
     const startDate = new Date(+startAt);
     const endDate = new Date(+endAt);
 
-    const data = getPageviewFunnel(websiteId, {
+    const data = await getPageviewFunnel(websiteId, {
       startDate,
       endDate,
       urls,
       windowMinutes: window,
     });
 
-    return ok(res);
+    return ok(res, data);
   }
 
   return methodNotAllowed(res);
diff --git a/pages/reports/funnel.js b/pages/reports/funnel.js
new file mode 100644
index 00000000..d4bf7dd2
--- /dev/null
+++ b/pages/reports/funnel.js
@@ -0,0 +1,22 @@
+import { useRouter } from 'next/router';
+import AppLayout from 'components/layout/AppLayout';
+import FunnelPage from 'components/pages/reports/FunnelPage';
+import useMessages from 'hooks/useMessages';
+
+export default function DetailsPage() {
+  //   const { formatMessage, labels } = useMessages();
+  //   const router = useRouter();
+  //   const { id } = router.query;
+
+  //   if (!id) {
+  //     return null;
+  //   }
+
+  //   return <AppLayout title={formatMessage(labels.websites)}>{/* <FunnelPage /> */}</AppLayout>;
+
+  return (
+    <div>
+      <FunnelPage />
+    </div>
+  );
+}
diff --git a/queries/analytics/pageview/getPageviewFunnel.ts b/queries/analytics/pageview/getPageviewFunnel.ts
index f7751630..d80a681c 100644
--- a/queries/analytics/pageview/getPageviewFunnel.ts
+++ b/queries/analytics/pageview/getPageviewFunnel.ts
@@ -27,7 +27,13 @@ async function relationalQuery(
     endDate: Date;
     urls: string[];
   },
-) {
+): Promise<
+  {
+    level: number;
+    url: string;
+    count: any;
+  }[]
+> {
   const { windowMinutes, startDate, endDate, urls } = criteria;
   const { rawQuery, getFunnelQuery, toUuid } = prisma;
   const { levelQuery, sumQuery, urlFilterQuery } = getFunnelQuery(urls, windowMinutes);
@@ -36,21 +42,24 @@ async function relationalQuery(
 
   return rawQuery(
     `WITH level0 AS (
-        select session_id, url_path, created_at
-        from website_event
-        where url_path in (${urlFilterQuery})
-            website_event.website_id = $1${toUuid()}
-            and created_at between $2 and $3
-    ),level1 AS (
-        select session_id, url_path as level1_url, created_at as level1_created_at
-        from level0
-    )${levelQuery}
-    
-    SELECT ${sumQuery}
-    from level3;
-    `,
+      select session_id, url_path, referrer_path, created_at
+      from website_event
+      where url_path in (${urlFilterQuery})
+          and website_id = $1${toUuid()}
+          and created_at between $2 and $3
+  ),level1 AS (
+      select session_id, url_path as level_1_url, created_at as level_1_created_at
+      from level0
+      where url_path = $4
+  )${levelQuery}
+  
+  SELECT ${sumQuery}
+  from level3;
+  `,
     params,
-  );
+  ).then((a: { [key: string]: number }) => {
+    return urls.map((b, i) => ({ level: i + 1, url: b, count: a[`level${i + 1}`] || 0 }));
+  });
 }
 
 async function clickhouseQuery(
@@ -61,7 +70,13 @@ async function clickhouseQuery(
     endDate: Date;
     urls: string[];
   },
-) {
+): Promise<
+  {
+    level: number;
+    url: string;
+    count: any;
+  }[]
+> {
   const { windowMinutes, startDate, endDate, urls } = criteria;
   const { rawQuery, getBetweenDates, getFunnelQuery } = clickhouse;
   const { columnsQuery, conditionQuery, urlParams } = getFunnelQuery(urls);
@@ -72,7 +87,7 @@ async function clickhouseQuery(
     ...urlParams,
   };
 
-  return rawQuery(
+  return rawQuery<{ level: number; count: number }[]>(
     `
     SELECT level,
         count(*) AS count
@@ -80,7 +95,7 @@ async function clickhouseQuery(
     SELECT session_id,
             windowFunnel({window:UInt32}, 'strict_order')
             (
-                created_at,
+                created_at
                 ${columnsQuery}
             ) AS level
         FROM website_event
@@ -93,5 +108,9 @@ async function clickhouseQuery(
     ORDER BY level ASC;
     `,
     params,
-  );
+  ).then(a => {
+    return a
+      .filter(b => b.level !== 0)
+      .map((c, i) => ({ level: c.level, url: urls[i], count: c.count }));
+  });
 }
diff --git a/styles/funnelChart.css b/styles/funnelChart.css
new file mode 100644
index 00000000..c72d42e7
--- /dev/null
+++ b/styles/funnelChart.css
@@ -0,0 +1,148 @@
+.svg-funnel-js {
+  display: inline-block;
+  position: relative;
+}
+.svg-funnel-js svg {
+  display: block;
+}
+.svg-funnel-js .svg-funnel-js__labels {
+  position: absolute;
+  display: flex;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+}
+.svg-funnel-js.svg-funnel-js--vertical .svg-funnel-js__labels {
+  flex-direction: column;
+}
+
+.svg-funnel-js body {
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.svg-funnel-js {
+  font-family: 'Open Sans', sans-serif;
+}
+.svg-funnel-js .svg-funnel-js__container {
+  width: 100%;
+  height: 100%;
+}
+.svg-funnel-js .svg-funnel-js__labels {
+  width: 100%;
+  box-sizing: border-box;
+}
+.svg-funnel-js .svg-funnel-js__labels .svg-funnel-js__label {
+  flex: 1 1 0;
+  position: relative;
+}
+.svg-funnel-js .svg-funnel-js__labels .svg-funnel-js__label .label__value {
+  font-size: 24px;
+  color: #fff;
+  line-height: 18px;
+  margin-bottom: 6px;
+}
+.svg-funnel-js .svg-funnel-js__labels .svg-funnel-js__label .label__title {
+  font-size: 12px;
+  font-weight: bold;
+  color: #21ffa2;
+}
+.svg-funnel-js .svg-funnel-js__labels .svg-funnel-js__label .label__percentage {
+  font-size: 16px;
+  font-weight: bold;
+  color: #9896dc;
+}
+.svg-funnel-js .svg-funnel-js__labels .svg-funnel-js__label .label__segment-percentages {
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+  width: 100%;
+  left: 0;
+  padding: 8px 24px;
+  box-sizing: border-box;
+  background-color: rgba(8, 7, 48, 0.8);
+  margin-top: 24px;
+  opacity: 0;
+  transition: opacity 0.1s ease;
+  cursor: default;
+}
+.svg-funnel-js .svg-funnel-js__labels .svg-funnel-js__label .label__segment-percentages ul {
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
+}
+.svg-funnel-js .svg-funnel-js__labels .svg-funnel-js__label .label__segment-percentages ul li {
+  font-size: 13px;
+  line-height: 16px;
+  color: #fff;
+  margin: 18px 0;
+}
+.svg-funnel-js
+  .svg-funnel-js__labels
+  .svg-funnel-js__label
+  .label__segment-percentages
+  ul
+  li
+  .percentage__list-label {
+  font-weight: bold;
+  color: #05df9d;
+}
+.svg-funnel-js .svg-funnel-js__labels .svg-funnel-js__label:hover .label__segment-percentages {
+  opacity: 1;
+}
+.svg-funnel-js:not(.svg-funnel-js--vertical) {
+  padding-top: 64px;
+  padding-bottom: 16px;
+}
+.svg-funnel-js:not(.svg-funnel-js--vertical) .svg-funnel-js__label {
+  padding-left: 24px;
+}
+.svg-funnel-js:not(.svg-funnel-js--vertical) .svg-funnel-js__label:not(:first-child) {
+  border-left: 1px solid #9896dc;
+}
+.svg-funnel-js.svg-funnel-js--vertical {
+  padding-left: 120px;
+  padding-right: 16px;
+}
+.svg-funnel-js.svg-funnel-js--vertical .svg-funnel-js__label {
+  padding-top: 24px;
+}
+.svg-funnel-js.svg-funnel-js--vertical .svg-funnel-js__label:not(:first-child) {
+  border-top: 1px solid #9896dc;
+}
+.svg-funnel-js.svg-funnel-js--vertical .svg-funnel-js__label .label__segment-percentages {
+  margin-top: 0;
+  margin-left: 106px;
+  width: calc(100% - 106px);
+}
+.svg-funnel-js.svg-funnel-js--vertical
+  .svg-funnel-js__label
+  .label__segment-percentages
+  .segment-percentage__list {
+  display: flex;
+  justify-content: space-around;
+}
+.svg-funnel-js .svg-funnel-js__subLabels {
+  display: flex;
+  justify-content: center;
+  margin-top: 24px;
+  position: absolute;
+  width: 100%;
+  left: 0;
+}
+.svg-funnel-js .svg-funnel-js__subLabels .svg-funnel-js__subLabel {
+  display: flex;
+  font-size: 12px;
+  color: #fff;
+  line-height: 16px;
+}
+.svg-funnel-js .svg-funnel-js__subLabels .svg-funnel-js__subLabel:not(:first-child) {
+  margin-left: 16px;
+}
+.svg-funnel-js .svg-funnel-js__subLabels .svg-funnel-js__subLabel .svg-funnel-js__subLabel--color {
+  width: 12px;
+  height: 12px;
+  border-radius: 50%;
+  margin: 2px 8px 2px 0;
+}
diff --git a/yarn.lock b/yarn.lock
index 41cca434..1f9ea77a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5500,6 +5500,11 @@ functions-have-names@^1.2.2:
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
+funnel-graph-js@^1.3.7:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/funnel-graph-js/-/funnel-graph-js-1.4.2.tgz#b82150189e8afa59104d881d5dcf55a28d715342"
+  integrity sha512-9bnmcBve7RDH9dTF9BLuUpuisKkDka3yrfhs+Z/106ZgJvqIse1RfKQWjW+QdAlTrZqC9oafen7t/KuJKv9ohA==
+
 generic-names@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/generic-names/-/generic-names-4.0.0.tgz#0bd8a2fd23fe8ea16cbd0a279acd69c06933d9a3"

From c8ebb7695cb69da04380681216cf67757f364d0d Mon Sep 17 00:00:00 2001
From: AkashRajpurohit <akashrajpurohit.009@gmail.com>
Date: Fri, 12 May 2023 22:38:12 +0530
Subject: [PATCH 25/88] fix: :adhesive_bandage: null value check for metric
 data

---
 components/metrics/MetricsTable.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/components/metrics/MetricsTable.js b/components/metrics/MetricsTable.js
index 97deb39d..df2b8a69 100644
--- a/components/metrics/MetricsTable.js
+++ b/components/metrics/MetricsTable.js
@@ -59,7 +59,10 @@ export function MetricsTable({
 
   const filteredData = useMemo(() => {
     if (data) {
-      let items = percentFilter(dataFilter ? dataFilter(data, filterOptions) : data);
+      const dataWithoutNullValues = data.filter(val => val.x !== null);
+      let items = percentFilter(
+        dataFilter ? dataFilter(dataWithoutNullValues, filterOptions) : dataWithoutNullValues,
+      );
       if (limit) {
         items = items.filter((e, i) => i < limit);
       }

From 07cb9f621d930caa6f262e9d1462a72cc49afae5 Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Sun, 14 May 2023 21:38:03 -0700
Subject: [PATCH 26/88] Funnel Table/Chart hooked up.

---
 components/input/DateFilter.js                |  8 +--
 components/layout/SettingsLayout.js           |  1 +
 components/messages.js                        |  6 ++
 components/pages/reports/FunnelChart.js       | 57 +++++++++----------
 components/pages/reports/FunnelForm.js        | 56 ++++++++++--------
 .../pages/reports/FunnelForm.module.css       |  9 +++
 components/pages/reports/FunnelPage.js        | 34 +++++++----
 .../pages/reports/FunnelPage.module.css       | 10 ++++
 components/pages/reports/FunnelTable.js       | 17 ++++++
 db/postgresql/schema.prisma                   | 32 ++++++-----
 pages/api/reports/funnel.ts                   |  2 +-
 pages/settings/reports/funnel.js              | 16 ++++++
 .../funnel.js => settings/reports/index.js}   |  9 ++-
 13 files changed, 170 insertions(+), 87 deletions(-)
 create mode 100644 components/pages/reports/FunnelPage.module.css
 create mode 100644 components/pages/reports/FunnelTable.js
 create mode 100644 pages/settings/reports/funnel.js
 rename pages/{reports/funnel.js => settings/reports/index.js} (76%)

diff --git a/components/input/DateFilter.js b/components/input/DateFilter.js
index ecdf9039..4d60627d 100644
--- a/components/input/DateFilter.js
+++ b/components/input/DateFilter.js
@@ -9,7 +9,7 @@ import useApi from 'hooks/useApi';
 import useDateRange from 'hooks/useDateRange';
 import useMessages from 'hooks/useMessages';
 
-export function DateFilter({ websiteId, value, className, onChange, isForm, alignment }) {
+export function DateFilter({ websiteId, value, className, onChange, alignment }) {
   const { formatMessage, labels } = useMessages();
   const { get } = useApi();
   const [dateRange, setDateRange] = useDateRange(websiteId);
@@ -23,7 +23,7 @@ export function DateFilter({ websiteId, value, className, onChange, isForm, alig
       if (data) {
         const websiteRange = { value, ...getDateRangeValues(new Date(data.createdAt), Date.now()) };
 
-        if (!isForm) {
+        if (!onChange) {
           setDateRange(websiteRange);
         }
 
@@ -32,15 +32,13 @@ export function DateFilter({ websiteId, value, className, onChange, isForm, alig
         }
       }
     } else if (value !== 'all') {
-      if (!isForm) {
+      if (!onChange) {
         setDateRange(value);
       }
 
       if (onChange) {
         onChange(value);
       }
-
-      console.log(value);
     }
   }
 
diff --git a/components/layout/SettingsLayout.js b/components/layout/SettingsLayout.js
index c79f0909..d58154ca 100644
--- a/components/layout/SettingsLayout.js
+++ b/components/layout/SettingsLayout.js
@@ -15,6 +15,7 @@ export function SettingsLayout({ children }) {
   const items = [
     { key: 'websites', label: formatMessage(labels.websites), url: '/settings/websites' },
     { key: 'teams', label: formatMessage(labels.teams), url: '/settings/teams' },
+    { key: 'reports', label: 'Reports', url: '/settings/reports/funnel' },
     user.isAdmin && { key: 'users', label: formatMessage(labels.users), url: '/settings/users' },
     { key: 'profile', label: formatMessage(labels.profile), url: '/settings/profile' },
   ].filter(n => n);
diff --git a/components/messages.js b/components/messages.js
index 245e8591..fe4b833a 100644
--- a/components/messages.js
+++ b/components/messages.js
@@ -18,7 +18,9 @@ export const labels = defineMessages({
   admin: { id: 'label.admin', defaultMessage: 'Administrator' },
   confirm: { id: 'label.confirm', defaultMessage: 'Confirm' },
   details: { id: 'label.details', defaultMessage: 'Details' },
+  website: { id: 'label.website', defaultMessage: 'Website' },
   websites: { id: 'label.websites', defaultMessage: 'Websites' },
+  reports: { id: 'label.reports', defaultMessage: 'Reports' },
   created: { id: 'label.created', defaultMessage: 'Created' },
   edit: { id: 'label.edit', defaultMessage: 'Edit' },
   name: { id: 'label.name', defaultMessage: 'Name' },
@@ -183,6 +185,10 @@ export const messages = defineMessages({
     id: 'message.delete-website-warning',
     defaultMessage: 'All website data will be deleted.',
   },
+  noResultsFound: {
+    id: 'messages.no-results-found',
+    defaultMessage: 'No results were found.',
+  },
   noWebsitesConfigured: {
     id: 'messages.no-websites-configured',
     defaultMessage: 'You do not have any websites configured.',
diff --git a/components/pages/reports/FunnelChart.js b/components/pages/reports/FunnelChart.js
index 44c99092..8739e1da 100644
--- a/components/pages/reports/FunnelChart.js
+++ b/components/pages/reports/FunnelChart.js
@@ -1,43 +1,40 @@
 import FunnelGraph from 'funnel-graph-js/dist/js/funnel-graph';
 import { useEffect, useRef } from 'react';
+import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
+import useMessages from 'hooks/useMessages';
 
-export default function FunnelChart() {
+export default function FunnelChart({ data }) {
+  const { formatMessage, labels, messages } = useMessages();
   const funnel = useRef(null);
 
   useEffect(() => {
-    funnel.current.innerHTML = '';
+    if (data && data.length > 0) {
+      funnel.current.innerHTML = '';
 
-    const data = {
-      labels: ['Cv Sent', '1st  Interview', '2nd Interview', '3rd Interview', 'Offer'],
-      subLabels: ['Cv Sent', '1st  Interview', '2nd Interview', '3rd Interview', 'Offer'],
-      colors: [
-        ['#FFB178', '#FF78B1', '#FF3C8E'],
-        ['#FFB178', '#FF78B1', '#FF3C8E'],
-        ['#A0BBFF', '#EC77FF'],
-        ['#A0F9FF', '#7795FF'],
-        ['#FFB178', '#FF78B1', '#FF3C8E'],
-      ],
-      values: [[3500], [3300], [2000], [600], [330]],
-    };
+      const chartData = {
+        labels: data.map(a => a.url),
+        colors: ['#147af3', '#e0f2ff'],
+        values: data.map(a => a.count),
+      };
 
-    const graph = new FunnelGraph({
-      container: '.funnel',
-      gradientDirection: 'horizontal',
-      data: data,
-      displayPercent: true,
-      direction: 'Vertical',
-      width: 1000,
-      height: 350,
-      subLabelValue: 'values',
-    });
+      const graph = new FunnelGraph({
+        container: '.funnel',
+        gradientDirection: 'horizontal',
+        data: chartData,
+        displayPercent: true,
+        direction: 'Vertical',
+        width: 1000,
+        height: 350,
+      });
 
-    graph.draw();
-  }, []);
+      graph.draw();
+    }
+  }, [data]);
 
   return (
-    <div>
-      FunnelChart
-      <div className="funnel" ref={funnel} />
-    </div>
+    <>
+      {data?.length > 0 && <div className="funnel" ref={funnel} />}
+      {data?.length === 0 && <EmptyPlaceholder message={formatMessage(messages.noResultsFound)} />}
+    </>
   );
 }
diff --git a/components/pages/reports/FunnelForm.js b/components/pages/reports/FunnelForm.js
index 081105f1..56be6732 100644
--- a/components/pages/reports/FunnelForm.js
+++ b/components/pages/reports/FunnelForm.js
@@ -1,12 +1,8 @@
-import { useMutation } from '@tanstack/react-query';
 import DateFilter from 'components/input/DateFilter';
 import WebsiteSelect from 'components/input/WebsiteSelect';
-import useApi from 'hooks/useApi';
 import useMessages from 'hooks/useMessages';
-import useUser from 'hooks/useUser';
 import { parseDateRange } from 'lib/date';
-import { useRouter } from 'next/router';
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 import {
   Button,
   Form,
@@ -17,15 +13,15 @@ import {
   TextField,
 } from 'react-basics';
 import styles from './FunnelForm.module.css';
-import { getNextInternalQuery } from 'next/dist/server/request-meta';
 
 export function FunnelForm({ onSearch }) {
-  const { formatMessage, labels, getMessage } = useMessages();
-  const [dateRange, setDateRange] = useState(null);
-  const [startDate, setStartDate] = useState(null);
-  const [endDate, setEndDate] = useState(null);
+  const { formatMessage, labels } = useMessages();
+  const [dateRange, setDateRange] = useState('');
+  const [startAt, setStartAt] = useState();
+  const [endAt, setEndAt] = useState();
   const [urls, setUrls] = useState(['']);
   const [websiteId, setWebsiteId] = useState('');
+  const [window, setWindow] = useState(60);
 
   const handleSubmit = async data => {
     onSearch(data);
@@ -35,14 +31,16 @@ export function FunnelForm({ onSearch }) {
     const { startDate, endDate } = parseDateRange(value);
 
     setDateRange(value);
-    setStartDate(startDate);
-    setEndDate(endDate);
+    setStartAt(startDate.getTime());
+    setEndAt(endDate.getTime());
   };
 
-  const handleAddUrl = () => setUrls([...urls, 'meow']);
+  const handleAddUrl = () => setUrls([...urls, '']);
 
   const handleRemoveUrl = i => setUrls(urls.splice(i, 1));
 
+  const handleWindowChange = value => setWindow(value.target.value);
+
   const handleUrlChange = (value, i) => {
     const nextUrls = [...urls];
 
@@ -55,13 +53,14 @@ export function FunnelForm({ onSearch }) {
       <Form
         values={{
           websiteId,
-          startDate,
-          endDate,
+          startAt,
+          endAt,
           urls,
+          window,
         }}
         onSubmit={handleSubmit}
       >
-        <FormRow label="website">
+        <FormRow label={formatMessage(labels.website)}>
           <WebsiteSelect websiteId={websiteId} onSelect={value => setWebsiteId(value)} />
           <FormInput name="websiteId" rules={{ required: formatMessage(labels.required) }}>
             <TextField value={websiteId} className={styles.hiddenInput} />
@@ -73,28 +72,39 @@ export function FunnelForm({ onSearch }) {
             value={dateRange}
             alignment="start"
             onChange={handleDateChange}
+            isF
           />
           <FormInput
-            name="startDate"
+            name="startAt"
             className={styles.hiddenInput}
             rules={{ required: formatMessage(labels.required) }}
           >
-            <TextField value={startDate} />
+            <TextField value={startAt} />
           </FormInput>
-          <FormInput name="endDate" rules={{ required: formatMessage(labels.required) }}>
-            <TextField value={endDate} className={styles.hiddenInput} />
+          <FormInput name="endAt" rules={{ required: formatMessage(labels.required) }}>
+            <TextField value={endAt} className={styles.hiddenInput} />
+          </FormInput>
+        </FormRow>
+        <FormRow label="Window (minutes)">
+          <FormInput
+            name="window"
+            rules={{ required: formatMessage(labels.required), pattern: /[0-9]+/ }}
+          >
+            <TextField value={window} onChange={handleWindowChange} />
           </FormInput>
         </FormRow>
         <Button onClick={handleAddUrl}>Add URL</Button>
         {urls.map((a, i) => (
-          <FormRow key={`url${i}`} label={`URL ${i + 1}`}>
-            <Button onClick={() => handleRemoveUrl(i)}>Remove URL</Button>
+          <FormRow className={styles.urlFormRow} key={`url${i}`} label={`URL ${i + 1}`}>
             <TextField value={urls[i]} onChange={value => handleUrlChange(value, i)} />
+            <Button onClick={() => handleRemoveUrl(i)}>Remove URL</Button>
           </FormRow>
         ))}
 
         <FormButtons>
-          <SubmitButton variant="primary">Search</SubmitButton>
+          <SubmitButton variant="primary" disabled={false}>
+            Search
+          </SubmitButton>
         </FormButtons>
       </Form>
     </>
diff --git a/components/pages/reports/FunnelForm.module.css b/components/pages/reports/FunnelForm.module.css
index 9a8d924b..2706a99a 100644
--- a/components/pages/reports/FunnelForm.module.css
+++ b/components/pages/reports/FunnelForm.module.css
@@ -17,3 +17,12 @@
   min-height: 0px;
   max-height: 0px;
 }
+
+.urlFormRow {
+  flex-direction: row;
+  gap: 0em;
+}
+
+.urlFormRow label {
+  min-width: 80px;
+}
diff --git a/components/pages/reports/FunnelPage.js b/components/pages/reports/FunnelPage.js
index 3cfa63a8..c715d857 100644
--- a/components/pages/reports/FunnelPage.js
+++ b/components/pages/reports/FunnelPage.js
@@ -1,26 +1,38 @@
+import { useMutation } from '@tanstack/react-query';
 import Page from 'components/layout/Page';
+import PageHeader from 'components/layout/PageHeader';
+import useApi from 'hooks/useApi';
+import { useState } from 'react';
 import FunnelChart from './FunnelChart';
+import FunnelTable from './FunnelTable';
 import FunnelForm from './FunnelForm';
+import styles from './FunnelPage.module.css';
 
 export default function FunnelPage() {
-  function handleOnSearch() {
+  const { post } = useApi();
+  const { mutate, error, isLoading } = useMutation(data => post('/reports/funnel', data));
+  const [data, setData] = useState();
+
+  function handleOnSearch(data) {
     // do API CALL to api/reports/funnel to get funnelData
     // Get DATA
+    mutate(data, {
+      onSuccess: async data => {
+        setData(data);
+      },
+    });
   }
 
   return (
     <Page>
-      funnelPage
+      <PageHeader title="Funnel Report"></PageHeader>
+      <FunnelChart data={data} />
+      <FunnelTable data={data} />
       {/* <ReportForm /> */}
-      <FunnelForm onSearchClick={handleOnSearch} /> website / start/endDate urls: []
-      <FunnelChart />
-      {/* {!chartLoaded && <Loading icon="dots" style={{ minHeight: 300 }} />}
-      {chartLoaded && (
-        <>
-          {!view && <WebsiteTableView websiteId={websiteId} />}
-          {view && <WebsiteMenuView websiteId={websiteId} />}
-        </>
-      )} */}
+      <div>
+        <h2>Filters</h2>
+        <FunnelForm onSearch={handleOnSearch} />
+      </div>
     </Page>
   );
 }
diff --git a/components/pages/reports/FunnelPage.module.css b/components/pages/reports/FunnelPage.module.css
new file mode 100644
index 00000000..aed66b74
--- /dev/null
+++ b/components/pages/reports/FunnelPage.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/components/pages/reports/FunnelTable.js b/components/pages/reports/FunnelTable.js
new file mode 100644
index 00000000..fa40fd13
--- /dev/null
+++ b/components/pages/reports/FunnelTable.js
@@ -0,0 +1,17 @@
+import DataTable from 'components/metrics/DataTable';
+import useMessages from 'hooks/useMessages';
+import { useState } from 'react';
+
+export function DevicesTable({ ...props }) {
+  const { formatMessage, labels } = useMessages();
+  const { data } = props;
+
+  const tableData =
+    data?.map(a => ({ x: a.url, y: a.count, z: (a.count / data[0].count) * 100 })) || [];
+
+  console.log(tableData);
+
+  return <DataTable data={tableData} title="Url" type="device" />;
+}
+
+export default DevicesTable;
diff --git a/db/postgresql/schema.prisma b/db/postgresql/schema.prisma
index ee5ff4b4..318d455d 100644
--- a/db/postgresql/schema.prisma
+++ b/db/postgresql/schema.prisma
@@ -17,9 +17,9 @@ model User {
   updatedAt DateTime? @updatedAt @map("updated_at") @db.Timestamptz(6)
   deletedAt DateTime? @map("deleted_at") @db.Timestamptz(6)
 
-  website        Website[]
-  teamUser       TeamUser[]
-  ReportTemplate UserReport[]
+  website  Website[]
+  teamUser TeamUser[]
+  Report   Report[]
 
   @@map("user")
 }
@@ -60,6 +60,7 @@ model Website {
   user        User?         @relation(fields: [userId], references: [id])
   teamWebsite TeamWebsite[]
   eventData   EventData[]
+  Report      Report[]
 
   @@index([userId])
   @@index([createdAt])
@@ -156,18 +157,21 @@ model TeamWebsite {
   @@map("team_website")
 }
 
-model UserReport {
-  id           String    @id() @unique() @map("report_id") @db.Uuid
-  userId       String    @map("user_id") @db.Uuid
-  websiteId    String    @map("website_id") @db.Uuid
-  reportName   String    @map("report_name") @db.VarChar(200)
-  templateName String    @map("template_name") @db.VarChar(200)
-  parameters   String    @map("parameters") @db.VarChar(6000)
-  createdAt    DateTime? @default(now()) @map("created_at") @db.Timestamptz(6)
-  updatedAt    DateTime? @updatedAt @map("updated_at") @db.Timestamptz(6)
+model Report {
+  id          String    @id() @unique() @map("report_id") @db.Uuid
+  userId      String    @map("user_id") @db.Uuid
+  websiteId   String    @map("website_id") @db.Uuid
+  type        String    @map("type") @db.VarChar(200)
+  name        String    @map("name") @db.VarChar(200)
+  description String    @map("description") @db.VarChar(500)
+  parameters  String    @map("parameters") @db.VarChar(6000)
+  createdAt   DateTime? @default(now()) @map("created_at") @db.Timestamptz(6)
+  updatedAt   DateTime? @updatedAt @map("updated_at") @db.Timestamptz(6)
 
-  user User @relation(fields: [userId], references: [id])
+  user    User    @relation(fields: [userId], references: [id])
+  website Website @relation(fields: [websiteId], references: [id])
 
   @@index([userId])
-  @@map("user_report")
+  @@index([websiteId])
+  @@map("report")
 }
diff --git a/pages/api/reports/funnel.ts b/pages/api/reports/funnel.ts
index ee450eb6..6e3eb602 100644
--- a/pages/api/reports/funnel.ts
+++ b/pages/api/reports/funnel.ts
@@ -40,7 +40,7 @@ export default async (
       startDate,
       endDate,
       urls,
-      windowMinutes: window,
+      windowMinutes: +window,
     });
 
     return ok(res, data);
diff --git a/pages/settings/reports/funnel.js b/pages/settings/reports/funnel.js
new file mode 100644
index 00000000..d8d7a5b8
--- /dev/null
+++ b/pages/settings/reports/funnel.js
@@ -0,0 +1,16 @@
+import AppLayout from 'components/layout/AppLayout';
+import SettingsLayout from 'components/layout/SettingsLayout';
+import FunnelPage from 'components/pages/reports/FunnelPage';
+import useMessages from 'hooks/useMessages';
+
+export default function DetailsPage() {
+  const { formatMessage, labels } = useMessages();
+
+  return (
+    <AppLayout title={`${formatMessage(labels.settings)} - ${formatMessage(labels.reports)}`}>
+      <SettingsLayout>
+        <FunnelPage />
+      </SettingsLayout>
+    </AppLayout>
+  );
+}
diff --git a/pages/reports/funnel.js b/pages/settings/reports/index.js
similarity index 76%
rename from pages/reports/funnel.js
rename to pages/settings/reports/index.js
index d4bf7dd2..ce0a3726 100644
--- a/pages/reports/funnel.js
+++ b/pages/settings/reports/index.js
@@ -2,6 +2,7 @@ import { useRouter } from 'next/router';
 import AppLayout from 'components/layout/AppLayout';
 import FunnelPage from 'components/pages/reports/FunnelPage';
 import useMessages from 'hooks/useMessages';
+import SettingsLayout from 'components/layout/SettingsLayout';
 
 export default function DetailsPage() {
   //   const { formatMessage, labels } = useMessages();
@@ -15,8 +16,10 @@ export default function DetailsPage() {
   //   return <AppLayout title={formatMessage(labels.websites)}>{/* <FunnelPage /> */}</AppLayout>;
 
   return (
-    <div>
-      <FunnelPage />
-    </div>
+    <AppLayout>
+      <SettingsLayout>
+        <FunnelPage />
+      </SettingsLayout>
+    </AppLayout>
   );
 }

From b5f84159d2925bb05585f62200c7593aa91f8194 Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Mon, 15 May 2023 14:03:42 -0700
Subject: [PATCH 27/88] funnel checkpoint

---
 components/pages/reports/FunnelChart.js         |  4 +++-
 components/pages/reports/FunnelChart.module.css |  7 +++++++
 components/pages/reports/FunnelForm.js          |  2 +-
 components/pages/reports/FunnelPage.js          |  6 +++---
 components/pages/reports/FunnelTable.js         |  2 --
 components/pages/reports/ReportDropdown.js      |  0
 components/pages/reports/ReportForm.js          |  0
 queries/analytics/pageview/getPageviewFunnel.ts | 12 +++++++-----
 8 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 components/pages/reports/FunnelChart.module.css
 create mode 100644 components/pages/reports/ReportDropdown.js
 create mode 100644 components/pages/reports/ReportForm.js

diff --git a/components/pages/reports/FunnelChart.js b/components/pages/reports/FunnelChart.js
index 8739e1da..ec03acab 100644
--- a/components/pages/reports/FunnelChart.js
+++ b/components/pages/reports/FunnelChart.js
@@ -2,6 +2,8 @@ import FunnelGraph from 'funnel-graph-js/dist/js/funnel-graph';
 import { useEffect, useRef } from 'react';
 import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
 import useMessages from 'hooks/useMessages';
+import styles from './FunnelChart.module.css';
+import classNames from 'classnames';
 
 export default function FunnelChart({ data }) {
   const { formatMessage, labels, messages } = useMessages();
@@ -33,7 +35,7 @@ export default function FunnelChart({ data }) {
 
   return (
     <>
-      {data?.length > 0 && <div className="funnel" ref={funnel} />}
+      {data?.length > 0 && <div className={classNames(styles.funnel, 'funnel')} ref={funnel} />}
       {data?.length === 0 && <EmptyPlaceholder message={formatMessage(messages.noResultsFound)} />}
     </>
   );
diff --git a/components/pages/reports/FunnelChart.module.css b/components/pages/reports/FunnelChart.module.css
new file mode 100644
index 00000000..1d7eb37e
--- /dev/null
+++ b/components/pages/reports/FunnelChart.module.css
@@ -0,0 +1,7 @@
+.funnel div {
+  color: var(--font-color100) !important;
+}
+
+.funnel svg {
+  max-width: 100%;
+}
diff --git a/components/pages/reports/FunnelForm.js b/components/pages/reports/FunnelForm.js
index 56be6732..5f9758f0 100644
--- a/components/pages/reports/FunnelForm.js
+++ b/components/pages/reports/FunnelForm.js
@@ -19,7 +19,7 @@ export function FunnelForm({ onSearch }) {
   const [dateRange, setDateRange] = useState('');
   const [startAt, setStartAt] = useState();
   const [endAt, setEndAt] = useState();
-  const [urls, setUrls] = useState(['']);
+  const [urls, setUrls] = useState(['/', '/docs/getting-started', '/docs/intall']);
   const [websiteId, setWebsiteId] = useState('');
   const [window, setWindow] = useState(60);
 
diff --git a/components/pages/reports/FunnelPage.js b/components/pages/reports/FunnelPage.js
index c715d857..b69319b1 100644
--- a/components/pages/reports/FunnelPage.js
+++ b/components/pages/reports/FunnelPage.js
@@ -12,10 +12,11 @@ export default function FunnelPage() {
   const { post } = useApi();
   const { mutate, error, isLoading } = useMutation(data => post('/reports/funnel', data));
   const [data, setData] = useState();
+  const [formData, setFormData] = useState();
 
   function handleOnSearch(data) {
-    // do API CALL to api/reports/funnel to get funnelData
-    // Get DATA
+    setFormData(data);
+
     mutate(data, {
       onSuccess: async data => {
         setData(data);
@@ -28,7 +29,6 @@ export default function FunnelPage() {
       <PageHeader title="Funnel Report"></PageHeader>
       <FunnelChart data={data} />
       <FunnelTable data={data} />
-      {/* <ReportForm /> */}
       <div>
         <h2>Filters</h2>
         <FunnelForm onSearch={handleOnSearch} />
diff --git a/components/pages/reports/FunnelTable.js b/components/pages/reports/FunnelTable.js
index fa40fd13..036e20c3 100644
--- a/components/pages/reports/FunnelTable.js
+++ b/components/pages/reports/FunnelTable.js
@@ -9,8 +9,6 @@ export function DevicesTable({ ...props }) {
   const tableData =
     data?.map(a => ({ x: a.url, y: a.count, z: (a.count / data[0].count) * 100 })) || [];
 
-  console.log(tableData);
-
   return <DataTable data={tableData} title="Url" type="device" />;
 }
 
diff --git a/components/pages/reports/ReportDropdown.js b/components/pages/reports/ReportDropdown.js
new file mode 100644
index 00000000..e69de29b
diff --git a/components/pages/reports/ReportForm.js b/components/pages/reports/ReportForm.js
new file mode 100644
index 00000000..e69de29b
diff --git a/queries/analytics/pageview/getPageviewFunnel.ts b/queries/analytics/pageview/getPageviewFunnel.ts
index d80a681c..591310cf 100644
--- a/queries/analytics/pageview/getPageviewFunnel.ts
+++ b/queries/analytics/pageview/getPageviewFunnel.ts
@@ -74,7 +74,7 @@ async function clickhouseQuery(
   {
     level: number;
     url: string;
-    count: any;
+    count: number;
   }[]
 > {
   const { windowMinutes, startDate, endDate, urls } = criteria;
@@ -108,9 +108,11 @@ async function clickhouseQuery(
     ORDER BY level ASC;
     `,
     params,
-  ).then(a => {
-    return a
-      .filter(b => b.level !== 0)
-      .map((c, i) => ({ level: c.level, url: urls[i], count: c.count }));
+  ).then(results => {
+    return urls.map((a, i) => ({
+      level: i + 1,
+      url: a,
+      count: results[i + 1]?.count || 0,
+    }));
   });
 }

From 2ce62c10232d3b6e3fb454fd7ef83a630025c528 Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Mon, 15 May 2023 20:41:12 -0700
Subject: [PATCH 28/88] Add usage.

---
 lib/cache.ts      |  6 ++++++
 lib/middleware.ts | 11 ++++++++++-
 lib/session.ts    | 13 ++++++++++++-
 pages/api/send.ts |  1 +
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/lib/cache.ts b/lib/cache.ts
index 528dd012..e63a53bb 100644
--- a/lib/cache.ts
+++ b/lib/cache.ts
@@ -49,6 +49,11 @@ async function deleteSession(id) {
   return deleteObject(`session:${id}`);
 }
 
+async function fetchUserBlock(userId: string) {
+  const key = `user:block:${userId}`;
+  return redis.get(key);
+}
+
 export default {
   fetchWebsite,
   storeWebsite,
@@ -59,5 +64,6 @@ export default {
   fetchSession,
   storeSession,
   deleteSession,
+  fetchUserBlock,
   enabled: redis.enabled,
 };
diff --git a/lib/middleware.ts b/lib/middleware.ts
index 79c48404..1fd13b09 100644
--- a/lib/middleware.ts
+++ b/lib/middleware.ts
@@ -1,4 +1,10 @@
-import { createMiddleware, unauthorized, badRequest, parseSecureToken } from 'next-basics';
+import {
+  createMiddleware,
+  unauthorized,
+  badRequest,
+  parseSecureToken,
+  tooManyRequest,
+} from 'next-basics';
 import debug from 'debug';
 import cors from 'cors';
 import { validate } from 'uuid';
@@ -30,6 +36,9 @@ 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);
+    }
     return badRequest(res, e.message);
   }
 
diff --git a/lib/session.ts b/lib/session.ts
index 937bfef2..32f3bdc8 100644
--- a/lib/session.ts
+++ b/lib/session.ts
@@ -6,6 +6,7 @@ import { CollectRequestBody, NextApiRequestCollect } from 'pages/api/send';
 import { createSession } from 'queries';
 import { validate } from 'uuid';
 import { loadSession, loadWebsite } from './query';
+import cache from './cache';
 
 export async function findSession(req: NextApiRequestCollect) {
   const { payload } = getJsonBody<CollectRequestBody>(req);
@@ -21,6 +22,8 @@ export async function findSession(req: NextApiRequestCollect) {
     const result = await parseToken(cacheToken, secret());
 
     if (result) {
+      await checkUserBlock(result?.ownerId);
+
       return result;
     }
   }
@@ -39,6 +42,8 @@ export async function findSession(req: NextApiRequestCollect) {
     throw new Error(`Website not found: ${websiteId}.`);
   }
 
+  await checkUserBlock(website.userId);
+
   const { userAgent, browser, os, ip, country, subdivision1, subdivision2, city, device } =
     await getClientInfo(req, payload);
   const sessionId = uuid(websiteId, hostname, ip, userAgent);
@@ -88,5 +93,11 @@ export async function findSession(req: NextApiRequestCollect) {
     }
   }
 
-  return session;
+  return { ...session, ownerId: website.userId };
+}
+
+async function checkUserBlock(userId: string) {
+  if (process.env.ENABLE_BLOCKER && (await cache.fetchUserBlock(userId))) {
+    throw new Error('Usage Limit.');
+  }
 }
diff --git a/pages/api/send.ts b/pages/api/send.ts
index 51ddb980..df7ceb6e 100644
--- a/pages/api/send.ts
+++ b/pages/api/send.ts
@@ -28,6 +28,7 @@ export interface NextApiRequestCollect extends NextApiRequest {
   session: {
     id: string;
     websiteId: string;
+    ownerId: string;
     hostname: string;
     browser: string;
     os: string;

From f528fac7be6e47bd20a306ef408d77b0dc75bb8d Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 16 May 2023 11:06:42 -0700
Subject: [PATCH 29/88] fix teams api route and messaging

---
 components/pages/settings/teams/TeamLeaveForm.js          | 4 ++--
 components/pages/settings/teams/TeamMemberRemoveButton.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/pages/settings/teams/TeamLeaveForm.js b/components/pages/settings/teams/TeamLeaveForm.js
index 9b61d4d9..954006ab 100644
--- a/components/pages/settings/teams/TeamLeaveForm.js
+++ b/components/pages/settings/teams/TeamLeaveForm.js
@@ -5,7 +5,7 @@ import useMessages from 'hooks/useMessages';
 export function TeamLeaveForm({ teamId, userId, teamName, onSave, onClose }) {
   const { formatMessage, labels, messages, FormattedMessage } = useMessages();
   const { del, useMutation } = useApi();
-  const { mutate, error, isLoading } = useMutation(() => del(`/team/${teamId}/users/${userId}`));
+  const { mutate, error, isLoading } = useMutation(() => del(`/teams/${teamId}/users/${userId}`));
 
   const handleSubmit = async () => {
     mutate(
@@ -22,7 +22,7 @@ export function TeamLeaveForm({ teamId, userId, teamName, onSave, onClose }) {
   return (
     <Form onSubmit={handleSubmit} error={error}>
       <p>
-        <FormattedMessage {...messages.confirmLeave} values={{ name: <b>{teamName}</b> }} />
+        <FormattedMessage {...messages.confirmDelete} values={{ target: <b>{teamName}</b> }} />
       </p>
       <FormButtons flex>
         <SubmitButton variant="danger" disabled={isLoading}>
diff --git a/components/pages/settings/teams/TeamMemberRemoveButton.js b/components/pages/settings/teams/TeamMemberRemoveButton.js
index 9dde180b..9f326476 100644
--- a/components/pages/settings/teams/TeamMemberRemoveButton.js
+++ b/components/pages/settings/teams/TeamMemberRemoveButton.js
@@ -5,7 +5,7 @@ import { Icon, Icons, LoadingButton, Text } from 'react-basics';
 export function TeamMemberRemoveButton({ teamId, userId, disabled, onSave }) {
   const { formatMessage, labels } = useMessages();
   const { del, useMutation } = useApi();
-  const { mutate, isLoading } = useMutation(() => del(`/team/${teamId}/users/${userId}`));
+  const { mutate, isLoading } = useMutation(() => del(`/teams/${teamId}/users/${userId}`));
 
   const handleRemoveTeamMember = () => {
     mutate(

From 2b5429aa1f0d8c25225e1d596854f16b5cfb0294 Mon Sep 17 00:00:00 2001
From: Aitor Alonso <aitor@aalonso.dev>
Date: Tue, 16 May 2023 21:02:56 +0200
Subject: [PATCH 30/88] fix: show year instead of epoch

---
 components/metrics/BarChart.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/metrics/BarChart.js b/components/metrics/BarChart.js
index cd7070e8..8e1784df 100644
--- a/components/metrics/BarChart.js
+++ b/components/metrics/BarChart.js
@@ -52,6 +52,8 @@ export function BarChart({
           return dateFormat(d, 'MMM d', locale);
         case 'month':
           return dateFormat(d, 'MMM', locale);
+        case 'year':
+          return dateFormat(d, 'YYY', locale);
         default:
           return label;
       }

From f01668f4c8c4db0f993e63345b79028df12e3c5f Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 16 May 2023 12:17:51 -0700
Subject: [PATCH 31/88] add user role to login response

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

diff --git a/pages/api/auth/login.ts b/pages/api/auth/login.ts
index 10c92647..64c2c26d 100644
--- a/pages/api/auth/login.ts
+++ b/pages/api/auth/login.ts
@@ -50,7 +50,7 @@ export default async (
 
       return ok(res, {
         token,
-        user: { id: user.id, username: user.username, createdAt: user.createdAt },
+        user: { id: user.id, username: user.username, role: user.role, createdAt: user.createdAt },
       });
     }
 

From b48efef38b80d75c1da7e7ad202ccfa20d638752 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Tue, 16 May 2023 19:17:12 -0700
Subject: [PATCH 32/88] Allow multiple filters.

---
 components/metrics/MetricsTable.js         | 19 +++++++++++++++----
 components/metrics/QueryParametersTable.js |  2 +-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/components/metrics/MetricsTable.js b/components/metrics/MetricsTable.js
index 3bb313cd..a918c0fb 100644
--- a/components/metrics/MetricsTable.js
+++ b/components/metrics/MetricsTable.js
@@ -73,16 +73,27 @@ export function MetricsTable({
 
   const filteredData = useMemo(() => {
     if (data) {
-      const dataWithoutNullValues = data.filter(val => val.x !== null);
-      let items = percentFilter(
-        dataFilter ? dataFilter(dataWithoutNullValues, filterOptions) : dataWithoutNullValues,
-      );
+      let items;
+
+      if (dataFilter) {
+        if (Array.isArray(dataFilter)) {
+          items = dataFilter.reduce((arr, filter) => {
+            return filter(arr);
+          }, data);
+        } else {
+          items = dataFilter(data);
+        }
+      }
+
+      items = percentFilter(items);
+
       if (limit) {
         items = items.filter((e, i) => i < limit);
       }
       if (filterOptions?.sort === false) {
         return items;
       }
+
       return items.sort(firstBy('y', -1).thenBy('x'));
     }
     return [];
diff --git a/components/metrics/QueryParametersTable.js b/components/metrics/QueryParametersTable.js
index c5f573e3..23193c2e 100644
--- a/components/metrics/QueryParametersTable.js
+++ b/components/metrics/QueryParametersTable.js
@@ -9,7 +9,7 @@ import styles from './QueryParametersTable.module.css';
 
 const filters = {
   [FILTER_RAW]: emptyFilter,
-  [FILTER_COMBINED]: paramFilter,
+  [FILTER_COMBINED]: [emptyFilter, paramFilter],
 };
 
 export function QueryParametersTable({ websiteId, showFilters, ...props }) {

From b663146ad5ef654937b861bfb096037f885ad692 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Tue, 16 May 2023 19:31:40 -0700
Subject: [PATCH 33/88] Fixed data being undefined.

---
 components/metrics/MetricsTable.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/metrics/MetricsTable.js b/components/metrics/MetricsTable.js
index a918c0fb..50262798 100644
--- a/components/metrics/MetricsTable.js
+++ b/components/metrics/MetricsTable.js
@@ -73,13 +73,13 @@ export function MetricsTable({
 
   const filteredData = useMemo(() => {
     if (data) {
-      let items;
+      let items = data;
 
       if (dataFilter) {
         if (Array.isArray(dataFilter)) {
           items = dataFilter.reduce((arr, filter) => {
             return filter(arr);
-          }, data);
+          }, items);
         } else {
           items = dataFilter(data);
         }

From c567eddff99c518cc128a3668d5762354898c096 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Tue, 16 May 2023 19:40:02 -0700
Subject: [PATCH 34/88] Fixed website undefined issue.

---
 pages/realtime/[id]/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/realtime/[id]/index.js b/pages/realtime/[id]/index.js
index ba13ded3..c9e82622 100644
--- a/pages/realtime/[id]/index.js
+++ b/pages/realtime/[id]/index.js
@@ -9,9 +9,9 @@ export default function RealtimeDetailsPage() {
   const { id: websiteId } = router.query;
   const { formatMessage, labels } = useMessages();
   const { get, useQuery } = useApi();
-  const { data: website } = useQuery(['websites', websiteId], () =>
-    websiteId ? get(`/websites/${websiteId}`, { enabled: !!websiteId }) : null,
-  );
+  const { data: website } = useQuery(['websites', websiteId], () => get(`/websites/${websiteId}`), {
+    enabled: !!websiteId,
+  });
   const title = `${formatMessage(labels.realtime)}${website?.name ? ` - ${website.name}` : ''}`;
 
   if (!websiteId) {

From 19ac0fce3632c7ebc9226462a14d5b292a7c9ec1 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Tue, 16 May 2023 20:41:20 -0700
Subject: [PATCH 35/88] Added check-env script.

---
 package.json         |  3 ++-
 scripts/check-env.js | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 scripts/check-env.js

diff --git a/package.json b/package.json
index 0db07f49..02820f22 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
   },
   "scripts": {
     "dev": "next dev -p 3000",
-    "build": "npm-run-all build-db check-db build-tracker build-geo build-app",
+    "build": "npm-run-all check-env build-db check-db build-tracker build-geo build-app",
     "start": "next start",
     "build-docker": "npm-run-all build-db build-tracker build-geo build-app",
     "start-docker": "npm-run-all check-db update-tracker start-server",
@@ -27,6 +27,7 @@
     "update-tracker": "node scripts/update-tracker.js",
     "update-db": "prisma migrate deploy",
     "check-db": "node scripts/check-db.js",
+    "check-env": "node scripts/check-env.js",
     "copy-db-files": "node scripts/copy-db-files.js",
     "extract-messages": "formatjs extract \"{pages,components}/**/*.js\" --out-file build/messages.json",
     "merge-messages": "node scripts/merge-messages.js",
diff --git a/scripts/check-env.js b/scripts/check-env.js
new file mode 100644
index 00000000..612e658c
--- /dev/null
+++ b/scripts/check-env.js
@@ -0,0 +1,32 @@
+/* eslint-disable no-console */
+require('dotenv').config();
+
+function checkMissing(vars) {
+  const missing = vars.reduce((arr, key) => {
+    if (!process.env[key]) {
+      arr.push(key);
+    }
+  }, []);
+
+  if (missing.length) {
+    console.log(`The following environment variables are not defined:`);
+    for (const item of missing) {
+      console.log(' - ', item);
+    }
+    process.exit(1);
+  }
+}
+
+checkMissing(['DATABASE_URL']);
+
+if (process.env.CLICKHOUSE_URL) {
+  checkMissing(['CA_CERT', 'CLIENT_CERT', 'CLIENT_KEY', 'KAFKA_BROKER', 'KAFKA_URL', 'REDIS_URL']);
+}
+
+if (process.env.CLOUD_MODE) {
+  checkMissing(['CLOUD_URL']);
+}
+
+if (process.env.ENABLE_BLOCKER) {
+  checkMissing(['REDIS_URL']);
+}

From 2259d4fae562168da7868ed1be8fb37c6b6d0c9a Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Tue, 16 May 2023 20:46:15 -0700
Subject: [PATCH 36/88] Fixed script.

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

diff --git a/scripts/check-env.js b/scripts/check-env.js
index 612e658c..10685517 100644
--- a/scripts/check-env.js
+++ b/scripts/check-env.js
@@ -6,6 +6,7 @@ function checkMissing(vars) {
     if (!process.env[key]) {
       arr.push(key);
     }
+    return arr;
   }, []);
 
   if (missing.length) {

From 9d4808f5ef92d7cda75446780eff8f8594acb186 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Tue, 16 May 2023 21:13:17 -0700
Subject: [PATCH 37/88] Update check-env for CI build.

---
 scripts/check-env.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/check-env.js b/scripts/check-env.js
index 10685517..a68fd822 100644
--- a/scripts/check-env.js
+++ b/scripts/check-env.js
@@ -18,7 +18,9 @@ function checkMissing(vars) {
   }
 }
 
-checkMissing(['DATABASE_URL']);
+if (!process.env.SKIP_DB_CHECK && !process.env.DATABASE_TYPE) {
+  checkMissing(['DATABASE_URL']);
+}
 
 if (process.env.CLICKHOUSE_URL) {
   checkMissing(['CA_CERT', 'CLIENT_CERT', 'CLIENT_KEY', 'KAFKA_BROKER', 'KAFKA_URL', 'REDIS_URL']);

From ad918c5bba1b618b7ddc286080d521e923b3fcbe Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Tue, 16 May 2023 21:19:39 -0700
Subject: [PATCH 38/88] Update CI workflow.

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c24c2e6d..c140f626 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,9 +26,9 @@ jobs:
           db-type: mysql
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'npm'

From 416fee0f537861b884c87fbe1b01d9e78a7a84e7 Mon Sep 17 00:00:00 2001
From: Abhilaksh Bansal <abhilakshbansal2001@gmail.com>
Date: Wed, 17 May 2023 15:31:41 +0530
Subject: [PATCH 39/88] Fixed user delete error 500

---
 queries/admin/user.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/queries/admin/user.ts b/queries/admin/user.ts
index 412c7785..449a3e9b 100644
--- a/queries/admin/user.ts
+++ b/queries/admin/user.ts
@@ -197,9 +197,16 @@ export async function deleteUser(
       }),
       client.teamUser.deleteMany({
         where: {
-          teamId: {
-            in: teamIds,
-          },
+          OR: [
+            {
+              teamId: {
+                in: teamIds,
+              },
+            },
+            {
+              userId,
+            },
+          ],
         },
       }),
       client.team.deleteMany({

From a5700d4a257f7e7cf6e0820cceebee664c7f452a Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Wed, 17 May 2023 23:20:06 -0700
Subject: [PATCH 40/88] Added reports section.

---
 assets/funnel.svg                             |  1 +
 assets/lightbulb.svg                          | 80 +++++++++++++++++++
 assets/nodes.svg                              |  1 +
 components/input/DateFilter.js                | 38 ++++-----
 components/input/WebsiteDateFilter.js         | 26 ++++++
 components/layout/NavBar.js                   |  1 +
 components/messages.js                        |  3 +
 components/metrics/WebsiteChart.js            |  4 +-
 components/pages/reports/EventDataReport.js   | 33 ++++++++
 components/pages/reports/Report.js            |  5 ++
 components/pages/reports/ReportHeader.js      | 42 ++++++++++
 components/pages/reports/ReportsList.js       | 66 +++++++++++++++
 .../pages/reports/ReportsList.module.css      | 32 ++++++++
 components/pages/reports/reports.module.css   | 14 ++++
 .../settings/profile/DateRangeSetting.js      |  3 +-
 hooks/index.js                                | 17 ++++
 hooks/useApi.ts                               |  4 +-
 hooks/useConfig.js                            |  4 +-
 hooks/useCountryNames.js                      |  4 +-
 hooks/useDateRange.js                         |  4 +-
 hooks/useDocumentClick.js                     |  4 +-
 hooks/useEscapeKey.js                         |  4 +-
 hooks/useForceUpdate.js                       |  4 +-
 hooks/useLanguageNames.js                     |  4 +-
 hooks/useLocale.js                            |  4 +-
 hooks/useMessages.js                          |  4 +-
 hooks/usePageQuery.js                         |  4 +-
 hooks/useRequireLogin.js                      |  4 +-
 hooks/useShareToken.js                        |  4 +-
 hooks/useSticky.js                            |  4 +-
 hooks/useTheme.js                             |  4 +-
 hooks/useTimezone.js                          |  4 +-
 hooks/useUser.js                              |  4 +-
 pages/api/websites/[id]/data.ts               | 13 +++
 pages/reports/event-data/index.js             |  5 ++
 pages/reports/index.js                        | 13 +++
 36 files changed, 422 insertions(+), 43 deletions(-)
 create mode 100644 assets/funnel.svg
 create mode 100644 assets/lightbulb.svg
 create mode 100644 assets/nodes.svg
 create mode 100644 components/input/WebsiteDateFilter.js
 create mode 100644 components/pages/reports/EventDataReport.js
 create mode 100644 components/pages/reports/Report.js
 create mode 100644 components/pages/reports/ReportHeader.js
 create mode 100644 components/pages/reports/ReportsList.js
 create mode 100644 components/pages/reports/ReportsList.module.css
 create mode 100644 components/pages/reports/reports.module.css
 create mode 100644 hooks/index.js
 create mode 100644 pages/api/websites/[id]/data.ts
 create mode 100644 pages/reports/event-data/index.js
 create mode 100644 pages/reports/index.js

diff --git a/assets/funnel.svg b/assets/funnel.svg
new file mode 100644
index 00000000..46f4623f
--- /dev/null
+++ b/assets/funnel.svg
@@ -0,0 +1 @@
+<svg enable-background="new 0 0 32 32" height="512" viewBox="0 0 32 32" width="512" xmlns="http://www.w3.org/2000/svg"><g id="_x31_6"><path d="m29 11h-26c-.5522 0-1-.4473-1-1v-6c0-.5527.4478-1 1-1h26c.5522 0 1 .4473 1 1v6c0 .5527-.4478 1-1 1zm-25-2h24v-4h-24z"/><path d="m25 17h-18c-.5522 0-1-.4473-1-1v-6c0-.5527.4478-1 1-1h18c.5522 0 1 .4473 1 1v6c0 .5527-.4478 1-1 1zm-17-2h16v-4h-16z"/><path d="m22 23h-12c-.5522 0-1-.4473-1-1v-6c0-.5527.4478-1 1-1h12c.5522 0 1 .4473 1 1v6c0 .5527-.4478 1-1 1zm-11-2h10v-4h-10z"/><path d="m19 29h-6c-.5522 0-1-.4473-1-1v-6c0-.5527.4478-1 1-1h6c.5522 0 1 .4473 1 1v6c0 .5527-.4478 1-1 1zm-5-2h4v-4h-4z"/></g></svg>
\ No newline at end of file
diff --git a/assets/lightbulb.svg b/assets/lightbulb.svg
new file mode 100644
index 00000000..73b699a3
--- /dev/null
+++ b/assets/lightbulb.svg
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<g>
+	<g>
+		<path d="M223.718,124.76c-48.027,11.198-86.688,49.285-98.494,97.031c-11.843,47.899,1.711,96.722,36.259,130.601
+			C173.703,364.377,181,383.586,181,403.777V407c0,13.296,5.801,25.26,15,33.505V467c0,24.813,20.187,45,45,45h30
+			c24.813,0,45-20.187,45-45v-26.495c9.199-8.245,15-20.208,15-33.505v-3.282c0-19.884,7.687-39.458,20.563-52.361
+			C376.994,325.87,391,292.005,391,256C391,169.921,311.231,104.362,223.718,124.76z M286,467c0,8.271-6.729,15-15,15h-30
+			c-8.271,0-15-6.729-15-15v-15h60V467z M330.326,330.166C311.689,348.843,301,375.651,301,403.718V407c0,8.271-6.729,15-15,15h-60
+			c-8.271,0-15-6.729-15-15v-3.223c0-28.499-10.393-55.035-28.513-72.804c-26.89-26.37-37.409-64.493-28.141-101.981
+			c9.125-36.907,39.029-66.353,76.184-75.015C299.202,137.964,361,189.228,361,256C361,284.004,350.106,310.343,330.326,330.166z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path d="M139.327,118.114L96.9,75.688c-5.857-5.858-15.355-5.858-21.213,0c-5.858,5.858-5.858,15.355,0,21.213l42.427,42.426
+			c5.857,5.858,15.356,5.858,21.213,0C145.185,133.469,145.185,123.972,139.327,118.114z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path d="M76,241H15c-8.284,0-15,6.716-15,15s6.716,15,15,15h61c8.284,0,15-6.716,15-15S84.284,241,76,241z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path d="M497,241h-61c-8.284,0-15,6.716-15,15s6.716,15,15,15h61c8.284,0,15-6.716,15-15S505.284,241,497,241z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path d="M436.313,75.688c-5.856-5.858-15.354-5.858-21.213,0l-42.427,42.426c-5.858,5.857-5.858,15.355,0,21.213
+			c5.857,5.858,15.355,5.858,21.213,0l42.427-42.426C442.171,91.044,442.171,81.546,436.313,75.688z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path d="M256,0c-8.284,0-15,6.716-15,15v61c0,8.284,6.716,15,15,15s15-6.716,15-15V15C271,6.716,264.284,0,256,0z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path d="M256,181c-6.166,0-12.447,0.739-18.658,2.194c-25.865,6.037-47.518,27.328-53.879,52.979
+			c-1.994,8.041,2.907,16.175,10.947,18.17c8.042,1.994,16.176-2.909,18.17-10.948c3.661-14.758,16.647-27.5,31.593-30.989
+			C248.155,211.473,252.135,211,256,211c8.284,0,15-6.716,15-15S264.284,181,256,181z"/>
+	</g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>
diff --git a/assets/nodes.svg b/assets/nodes.svg
new file mode 100644
index 00000000..0bbd37c4
--- /dev/null
+++ b/assets/nodes.svg
@@ -0,0 +1 @@
+<svg fill="none" height="512" viewBox="0 0 24 24" width="512" xmlns="http://www.w3.org/2000/svg"><path clip-rule="evenodd" d="m19 9.87398c1.7252-.44404 3-2.01014 3-3.87398 0-2.20914-1.7909-4-4-4-1.8638 0-3.4299 1.27477-3.874 3h-4.25202c-.44404-1.72523-2.01014-3-3.87398-3-2.20914 0-4 1.79086-4 4 0 1.86384 1.27477 3.42994 3 3.87398v4.25202c-1.72523.4441-3 2.0102-3 3.874 0 2.2091 1.79086 4 4 4 1.86384 0 3.42994-1.2748 3.87398-3h4.25202c.4441 1.7252 2.0102 3 3.874 3 2.2091 0 4-1.7909 4-4 0-1.8638-1.2748-3.4299-3-3.874zm-13-5.87398c1.10457 0 2 .89543 2 2 0 1.1043-.895 1.99957-1.99919 2-1.10457 0-2.00081-.89543-2.00081-2s.89543-2 2-2zm3.87398 3c-.36178 1.40561-1.46837 2.5122-2.87398 2.87398v4.25202c1.40561.3618 2.5122 1.4684 2.87398 2.874h4.25202c.3618-1.4056 1.4684-2.5122 2.874-2.874v-4.25202c-1.4056-.36178-2.5122-1.46837-2.874-2.87398zm8.12602 1c-1.1046 0-2-.89543-2-2s.8954-2 2-2 2 .89543 2 2-.8954 2-2 2zm0 8c-1.1046 0-2 .8954-2 2s.8954 2 2 2 2-.8954 2-2-.8954-2-2-2zm-10 2c0-1.1046-.89543-2-2-2s-2 .8954-2 2 .89543 2 2 2 2-.8954 2-2z" fill="rgb(0,0,0)" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/components/input/DateFilter.js b/components/input/DateFilter.js
index b6c1ee72..b7521e27 100644
--- a/components/input/DateFilter.js
+++ b/components/input/DateFilter.js
@@ -3,31 +3,22 @@ import { Icon, Modal, Dropdown, Item, Text, Flexbox } from 'react-basics';
 import { endOfYear, isSameDay } from 'date-fns';
 import DatePickerForm from 'components/metrics/DatePickerForm';
 import useLocale from 'hooks/useLocale';
-import { dateFormat, getDateRangeValues } from 'lib/date';
+import { dateFormat } from 'lib/date';
 import Icons from 'components/icons';
-import useApi from 'hooks/useApi';
-import useDateRange from 'hooks/useDateRange';
 import useMessages from 'hooks/useMessages';
 
-export function DateFilter({ websiteId, value, className }) {
+export function DateFilter({
+  value,
+  startDate,
+  endDate,
+  className,
+  onChange,
+  showAllTime = false,
+  alignment = 'end',
+}) {
   const { formatMessage, labels } = useMessages();
-  const { get } = useApi();
-  const [dateRange, setDateRange] = useDateRange(websiteId);
-  const { startDate, endDate } = dateRange;
   const [showPicker, setShowPicker] = useState(false);
 
-  async function handleDateChange(value) {
-    if (value === 'all' && websiteId) {
-      const data = await get(`/websites/${websiteId}`);
-
-      if (data) {
-        setDateRange({ value, ...getDateRangeValues(new Date(data.createdAt), Date.now()) });
-      }
-    } else if (value !== 'all') {
-      setDateRange(value);
-    }
-  }
-
   const options = [
     { label: formatMessage(labels.today), value: '1day' },
     {
@@ -61,7 +52,7 @@ export function DateFilter({ websiteId, value, className }) {
       value: '90day',
     },
     { label: formatMessage(labels.thisYear), value: '1year' },
-    websiteId && {
+    showAllTime && {
       label: formatMessage(labels.allTime),
       value: 'all',
       divider: true,
@@ -86,12 +77,12 @@ export function DateFilter({ websiteId, value, className }) {
       setShowPicker(true);
       return;
     }
-    handleDateChange(value);
+    onChange(value);
   };
 
   const handlePickerChange = value => {
     setShowPicker(false);
-    handleDateChange(value);
+    onChange(value);
   };
 
   const handleClose = () => setShowPicker(false);
@@ -103,7 +94,8 @@ export function DateFilter({ websiteId, value, className }) {
         items={options}
         renderValue={renderValue}
         value={value}
-        alignment="end"
+        alignment={alignment}
+        placeholder={formatMessage(labels.selectDate)}
         onChange={handleChange}
       >
         {({ label, value, divider }) => (
diff --git a/components/input/WebsiteDateFilter.js b/components/input/WebsiteDateFilter.js
new file mode 100644
index 00000000..0d5d7569
--- /dev/null
+++ b/components/input/WebsiteDateFilter.js
@@ -0,0 +1,26 @@
+import { getDateRangeValues } from 'lib/date';
+import useApi from 'hooks/useApi';
+import useDateRange from 'hooks/useDateRange';
+import DateFilter from './DateFilter';
+
+export default function WebsiteDateFilter({ websiteId, value }) {
+  const { get } = useApi();
+  const [dateRange, setDateRange] = useDateRange(websiteId);
+  const { startDate, endDate } = dateRange;
+
+  const handleChange = async value => {
+    if (value === 'all' && websiteId) {
+      const data = await get(`/websites/${websiteId}`);
+
+      if (data) {
+        setDateRange({ value, ...getDateRangeValues(new Date(data.createdAt), Date.now()) });
+      }
+    } else if (value !== 'all') {
+      setDateRange(value);
+    }
+  };
+
+  return (
+    <DateFilter value={value} startDate={startDate} endDate={endDate} onChange={handleChange} />
+  );
+}
diff --git a/components/layout/NavBar.js b/components/layout/NavBar.js
index 5a6c877e..b5532ba0 100644
--- a/components/layout/NavBar.js
+++ b/components/layout/NavBar.js
@@ -18,6 +18,7 @@ export function NavBar() {
 
   const links = [
     { label: formatMessage(labels.dashboard), url: '/dashboard' },
+    { label: formatMessage(labels.reports), url: '/reports' },
     { label: formatMessage(labels.realtime), url: '/realtime' },
     !cloudMode && { label: formatMessage(labels.settings), url: '/settings' },
   ].filter(n => n);
diff --git a/components/messages.js b/components/messages.js
index 245e8591..bdc8770d 100644
--- a/components/messages.js
+++ b/components/messages.js
@@ -97,6 +97,7 @@ export const labels = defineMessages({
   allTime: { id: 'label.all-time', defaultMessage: 'All time' },
   customRange: { id: 'label.custom-range', defaultMessage: 'Custom range' },
   selectWebsite: { id: 'label.select-website', defaultMessage: 'Select website' },
+  selectDate: { id: 'label.select-date', defaultMessage: 'Select date' },
   all: { id: 'label.all', defaultMessage: 'All' },
   sessions: { id: 'label.sessions', defaultMessage: 'Sessions' },
   pageNotFound: { id: 'message.page-not-found', defaultMessage: 'Page not found' },
@@ -117,6 +118,8 @@ export const labels = defineMessages({
   view: { id: 'label.view', defaultMessage: 'View' },
   cities: { id: 'label.cities', defaultMessage: 'Cities' },
   regions: { id: 'label.regions', defaultMessage: 'Regions' },
+  reports: { id: 'label.reports', defaultMessage: 'Reports' },
+  eventData: { id: 'label.event-data', defaultMessage: 'Event data' },
 });
 
 export const messages = defineMessages({
diff --git a/components/metrics/WebsiteChart.js b/components/metrics/WebsiteChart.js
index 6614d40f..7b902df1 100644
--- a/components/metrics/WebsiteChart.js
+++ b/components/metrics/WebsiteChart.js
@@ -5,7 +5,7 @@ import classNames from 'classnames';
 import PageviewsChart from './PageviewsChart';
 import MetricsBar from './MetricsBar';
 import WebsiteHeader from './WebsiteHeader';
-import DateFilter from 'components/input/DateFilter';
+import WebsiteDateFilter from 'components/input/WebsiteDateFilter';
 import ErrorMessage from 'components/common/ErrorMessage';
 import FilterTags from 'components/metrics/FilterTags';
 import RefreshButton from 'components/input/RefreshButton';
@@ -107,7 +107,7 @@ export function WebsiteChart({
         <Column defaultSize={12} xl={4}>
           <div className={styles.actions}>
             <RefreshButton websiteId={websiteId} isLoading={isLoading} />
-            <DateFilter websiteId={websiteId} value={value} className={styles.dropdown} />
+            <WebsiteDateFilter websiteId={websiteId} value={value} className={styles.dropdown} />
           </div>
         </Column>
       </Row>
diff --git a/components/pages/reports/EventDataReport.js b/components/pages/reports/EventDataReport.js
new file mode 100644
index 00000000..8c01e25f
--- /dev/null
+++ b/components/pages/reports/EventDataReport.js
@@ -0,0 +1,33 @@
+import { useState } from 'react';
+import { Form, FormRow, FormInput, TextField } from 'react-basics';
+import AppLayout from 'components/layout/AppLayout';
+import Report from './Report';
+import ReportHeader from './ReportHeader';
+import useMessages from 'hooks/useMessages';
+import Nodes from 'assets/nodes.svg';
+import styles from './reports.module.css';
+
+export default function EventDataReport({ websiteId, data }) {
+  const [values, setValues] = useState({ query: '' });
+  const { formatMessage, labels } = useMessages();
+
+  return (
+    <AppLayout>
+      <Report>
+        <ReportHeader title={formatMessage(labels.eventData)} icon={<Nodes />} />
+        <div className={styles.container}>
+          <div className={styles.menu}>
+            <Form>
+              <FormRow label="Properties">
+                <FormInput name="query">
+                  <TextField value={values.query} />
+                </FormInput>
+              </FormRow>
+            </Form>
+          </div>
+          <div className={styles.content}></div>
+        </div>
+      </Report>
+    </AppLayout>
+  );
+}
diff --git a/components/pages/reports/Report.js b/components/pages/reports/Report.js
new file mode 100644
index 00000000..1754e89f
--- /dev/null
+++ b/components/pages/reports/Report.js
@@ -0,0 +1,5 @@
+import Page from 'components/layout/Page';
+
+export default function Report({ children, ...props }) {
+  return <Page {...props}>{children}</Page>;
+}
diff --git a/components/pages/reports/ReportHeader.js b/components/pages/reports/ReportHeader.js
new file mode 100644
index 00000000..44502149
--- /dev/null
+++ b/components/pages/reports/ReportHeader.js
@@ -0,0 +1,42 @@
+import { useState } from 'react';
+import { Flexbox, Icon, Text } from 'react-basics';
+import WebsiteSelect from 'components/input/WebsiteSelect';
+import PageHeader from 'components/layout/PageHeader';
+import DateFilter from 'components/input/DateFilter';
+import { parseDateRange } from 'lib/date';
+
+export default function ReportHeader({ title, icon }) {
+  const [websiteId, setWebsiteId] = useState();
+  const [dateRange, setDateRange] = useState({});
+  const { value, startDate, endDate } = dateRange;
+
+  const handleSelect = id => {
+    setWebsiteId(id);
+  };
+
+  const handleDateChange = value => setDateRange(parseDateRange(value));
+
+  const Title = () => {
+    return (
+      <>
+        <Icon size="xl">{icon}</Icon>
+        <Text>{title}</Text>
+      </>
+    );
+  };
+
+  return (
+    <PageHeader title={<Title />}>
+      <Flexbox gap={20}>
+        <DateFilter
+          value={value}
+          startDate={startDate}
+          endDate={endDate}
+          onChange={handleDateChange}
+          showAllTime
+        />
+        <WebsiteSelect websiteId={websiteId} onSelect={handleSelect} />
+      </Flexbox>
+    </PageHeader>
+  );
+}
diff --git a/components/pages/reports/ReportsList.js b/components/pages/reports/ReportsList.js
new file mode 100644
index 00000000..44dc556d
--- /dev/null
+++ b/components/pages/reports/ReportsList.js
@@ -0,0 +1,66 @@
+import Link from 'next/link';
+import { Button, Icons, Text, Icon } from 'react-basics';
+import Page from 'components/layout/Page';
+import PageHeader from 'components/layout/PageHeader';
+import Funnel from 'assets/funnel.svg';
+import Nodes from 'assets/nodes.svg';
+import Lightbulb from 'assets/lightbulb.svg';
+import styles from './ReportsList.module.css';
+
+const reports = [
+  {
+    title: 'Event data',
+    description: 'Query your event data.',
+    url: '/reports/event-data',
+    icon: <Nodes />,
+  },
+  {
+    title: 'Funnel',
+    description: 'Understand the conversion and drop-off rate of users.',
+    url: '/reports/funnel',
+    icon: <Funnel />,
+  },
+  {
+    title: 'Insights',
+    description: 'Explore your data by applying segments and filters.',
+    url: '/reports/insights',
+    icon: <Lightbulb />,
+  },
+];
+
+function Report({ title, description, url, icon }) {
+  return (
+    <div className={styles.report}>
+      <div className={styles.title}>
+        <Icon size="lg">{icon}</Icon>
+        <Text>{title}</Text>
+      </div>
+      <div className={styles.description}>{description}</div>
+      <div className={styles.buttons}>
+        <Link href={url}>
+          <Button variant="primary">
+            <Icon>
+              <Icons.Plus />
+            </Icon>
+            <Text>Create</Text>
+          </Button>
+        </Link>
+      </div>
+    </div>
+  );
+}
+
+export default function ReportsList() {
+  return (
+    <Page>
+      <PageHeader title="Reports" />
+      <div className={styles.reports}>
+        {reports.map(({ title, description, url, icon }) => {
+          return (
+            <Report key={title} icon={icon} title={title} description={description} url={url} />
+          );
+        })}
+      </div>
+    </Page>
+  );
+}
diff --git a/components/pages/reports/ReportsList.module.css b/components/pages/reports/ReportsList.module.css
new file mode 100644
index 00000000..0cdcb835
--- /dev/null
+++ b/components/pages/reports/ReportsList.module.css
@@ -0,0 +1,32 @@
+.reports {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(360px, 1fr));
+  gap: 20px;
+}
+
+.report {
+  display: flex;
+  flex-direction: column;
+  gap: 20px;
+  padding: 20px;
+  border: 1px solid var(--base500);
+  border-radius: var(--border-radius);
+}
+
+.title {
+  display: flex;
+  gap: 10px;
+  align-items: center;
+  font-size: var(--font-size-lg);
+  font-weight: 700;
+}
+
+.description {
+  flex: 1;
+}
+
+.buttons {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
diff --git a/components/pages/reports/reports.module.css b/components/pages/reports/reports.module.css
new file mode 100644
index 00000000..e18a857a
--- /dev/null
+++ b/components/pages/reports/reports.module.css
@@ -0,0 +1,14 @@
+.container {
+  display: grid;
+  grid-template-rows: 1fr;
+  grid-template-columns: max-content 1fr;
+}
+
+.menu {
+  width: 300px;
+  grid-column: 1 / 2;
+}
+
+.content {
+  grid-column: 2 / 3;
+}
diff --git a/components/pages/settings/profile/DateRangeSetting.js b/components/pages/settings/profile/DateRangeSetting.js
index 152aba1d..44c3dc42 100644
--- a/components/pages/settings/profile/DateRangeSetting.js
+++ b/components/pages/settings/profile/DateRangeSetting.js
@@ -9,11 +9,12 @@ export function DateRangeSetting() {
   const [dateRange, setDateRange] = useDateRange();
   const { startDate, endDate, value } = dateRange;
 
+  const handleChange = value => setDateRange(value);
   const handleReset = () => setDateRange(DEFAULT_DATE_RANGE);
 
   return (
     <Flexbox gap={10}>
-      <DateFilter value={value} startDate={startDate} endDate={endDate} />
+      <DateFilter value={value} startDate={startDate} endDate={endDate} onChange={handleChange} />
       <Button onClick={handleReset}>{formatMessage(labels.reset)}</Button>
     </Flexbox>
   );
diff --git a/hooks/index.js b/hooks/index.js
new file mode 100644
index 00000000..15898eb5
--- /dev/null
+++ b/hooks/index.js
@@ -0,0 +1,17 @@
+export * from './useApi';
+export * from './useConfig';
+export * from './useCountryNames';
+export * from './useDateRange';
+export * from './useDocumentClick';
+export * from './useEscapeKey';
+export * from './useForceUpdate';
+export * from './useLanguageNames';
+export * from './useLocale';
+export * from './useMessages';
+export * from './usePageQuery';
+export * from './useRequireLogin';
+export * from './useShareToken';
+export * from './useSticky';
+export * from './useTheme';
+export * from './useTimezone';
+export * from './useUser';
diff --git a/hooks/useApi.ts b/hooks/useApi.ts
index 9e1e7e20..f41547a9 100644
--- a/hooks/useApi.ts
+++ b/hooks/useApi.ts
@@ -7,7 +7,7 @@ import useStore from 'store/app';
 
 const selector = state => state.shareToken;
 
-export default function useApi() {
+export function useApi() {
   const { basePath } = useRouter();
   const shareToken = useStore(selector);
 
@@ -18,3 +18,5 @@ export default function useApi() {
 
   return { get, post, put, del, ...reactQuery };
 }
+
+export default useApi;
diff --git a/hooks/useConfig.js b/hooks/useConfig.js
index b395829c..6dda7b74 100644
--- a/hooks/useConfig.js
+++ b/hooks/useConfig.js
@@ -4,7 +4,7 @@ import useApi from 'hooks/useApi';
 
 let loading = false;
 
-export default function useConfig() {
+export function useConfig() {
   const { config } = useStore();
   const { get } = useApi();
 
@@ -23,3 +23,5 @@ export default function useConfig() {
 
   return config || {};
 }
+
+export default useConfig;
diff --git a/hooks/useCountryNames.js b/hooks/useCountryNames.js
index 0834202b..60c992a5 100644
--- a/hooks/useCountryNames.js
+++ b/hooks/useCountryNames.js
@@ -7,7 +7,7 @@ const countryNames = {
   'en-US': enUS,
 };
 
-export default function useCountryNames(locale) {
+export function useCountryNames(locale) {
   const [list, setList] = useState(countryNames[locale] || enUS);
   const { basePath } = useRouter();
 
@@ -32,3 +32,5 @@ export default function useCountryNames(locale) {
 
   return list;
 }
+
+export default useCountryNames;
diff --git a/hooks/useDateRange.js b/hooks/useDateRange.js
index a9896065..e8a542f4 100644
--- a/hooks/useDateRange.js
+++ b/hooks/useDateRange.js
@@ -5,7 +5,7 @@ import useLocale from './useLocale';
 import websiteStore, { setWebsiteDateRange } from 'store/websites';
 import appStore, { setDateRange } from 'store/app';
 
-export default function useDateRange(websiteId) {
+export function useDateRange(websiteId) {
   const { locale } = useLocale();
   const websiteConfig = websiteStore(state => state[websiteId]?.dateRange);
   const defaultConfig = DEFAULT_DATE_RANGE;
@@ -23,3 +23,5 @@ export default function useDateRange(websiteId) {
 
   return [dateRange, saveDateRange];
 }
+
+export default useDateRange;
diff --git a/hooks/useDocumentClick.js b/hooks/useDocumentClick.js
index e1baae7e..be3d09be 100644
--- a/hooks/useDocumentClick.js
+++ b/hooks/useDocumentClick.js
@@ -1,6 +1,6 @@
 import { useEffect } from 'react';
 
-export default function useDocumentClick(handler) {
+export function useDocumentClick(handler) {
   useEffect(() => {
     document.addEventListener('click', handler);
 
@@ -11,3 +11,5 @@ export default function useDocumentClick(handler) {
 
   return null;
 }
+
+export default useDocumentClick;
diff --git a/hooks/useEscapeKey.js b/hooks/useEscapeKey.js
index b8020c31..1a17f18f 100644
--- a/hooks/useEscapeKey.js
+++ b/hooks/useEscapeKey.js
@@ -1,6 +1,6 @@
 import { useEffect, useCallback } from 'react';
 
-export default function useEscapeKey(handler) {
+export function useEscapeKey(handler) {
   const escFunction = useCallback(event => {
     if (event.keyCode === 27) {
       handler(event);
@@ -17,3 +17,5 @@ export default function useEscapeKey(handler) {
 
   return null;
 }
+
+export default useEscapeKey;
diff --git a/hooks/useForceUpdate.js b/hooks/useForceUpdate.js
index 2b8d6101..35f7fe16 100644
--- a/hooks/useForceUpdate.js
+++ b/hooks/useForceUpdate.js
@@ -1,9 +1,11 @@
 import { useCallback, useState } from 'react';
 
-export default function useForceUpdate() {
+export function useForceUpdate() {
   const [, update] = useState(Object.create(null));
 
   return useCallback(() => {
     update(Object.create(null));
   }, [update]);
 }
+
+export default useForceUpdate;
diff --git a/hooks/useLanguageNames.js b/hooks/useLanguageNames.js
index 3b153f28..aa5cbe39 100644
--- a/hooks/useLanguageNames.js
+++ b/hooks/useLanguageNames.js
@@ -7,7 +7,7 @@ const languageNames = {
   'en-US': enUS,
 };
 
-export default function useLanguageNames(locale) {
+export function useLanguageNames(locale) {
   const [list, setList] = useState(languageNames[locale] || enUS);
   const { basePath } = useRouter();
 
@@ -32,3 +32,5 @@ export default function useLanguageNames(locale) {
 
   return list;
 }
+
+export default useLanguageNames;
diff --git a/hooks/useLocale.js b/hooks/useLocale.js
index 5cece347..1279cea9 100644
--- a/hooks/useLocale.js
+++ b/hooks/useLocale.js
@@ -13,7 +13,7 @@ const messages = {
 
 const selector = state => state.locale;
 
-export default function useLocale() {
+export function useLocale() {
   const locale = useStore(selector);
   const { basePath } = useRouter();
   const forceUpdate = useForceUpdate();
@@ -61,3 +61,5 @@ export default function useLocale() {
 
   return { locale, saveLocale, messages, dir, dateLocale };
 }
+
+export default useLocale;
diff --git a/hooks/useMessages.js b/hooks/useMessages.js
index 1bb65778..0719afd8 100644
--- a/hooks/useMessages.js
+++ b/hooks/useMessages.js
@@ -1,7 +1,7 @@
 import { useIntl, FormattedMessage } from 'react-intl';
 import { messages, labels } from 'components/messages';
 
-export default function useMessages() {
+export function useMessages() {
   const { formatMessage } = useIntl();
 
   function getMessage(id) {
@@ -12,3 +12,5 @@ export default function useMessages() {
 
   return { formatMessage, FormattedMessage, messages, labels, getMessage };
 }
+
+export default useMessages;
diff --git a/hooks/usePageQuery.js b/hooks/usePageQuery.js
index b2f0acf1..b275d580 100644
--- a/hooks/usePageQuery.js
+++ b/hooks/usePageQuery.js
@@ -2,7 +2,7 @@ import { useMemo } from 'react';
 import { useRouter } from 'next/router';
 import { buildUrl } from 'next-basics';
 
-export default function usePageQuery() {
+export function usePageQuery() {
   const router = useRouter();
   const { pathname, search } = location;
   const { asPath } = router;
@@ -29,3 +29,5 @@ export default function usePageQuery() {
 
   return { pathname, query, resolveUrl, router };
 }
+
+export default usePageQuery;
diff --git a/hooks/useRequireLogin.js b/hooks/useRequireLogin.js
index 24cfdf0b..3a95c988 100644
--- a/hooks/useRequireLogin.js
+++ b/hooks/useRequireLogin.js
@@ -3,7 +3,7 @@ import { useRouter } from 'next/router';
 import useApi from 'hooks/useApi';
 import useUser from 'hooks/useUser';
 
-export default function useRequireLogin() {
+export function useRequireLogin() {
   const router = useRouter();
   const { get } = useApi();
   const { user, setUser } = useUser();
@@ -26,3 +26,5 @@ export default function useRequireLogin() {
 
   return { user };
 }
+
+export default useRequireLogin;
diff --git a/hooks/useShareToken.js b/hooks/useShareToken.js
index bac7ec97..3d6b9698 100644
--- a/hooks/useShareToken.js
+++ b/hooks/useShareToken.js
@@ -4,7 +4,7 @@ import useApi from './useApi';
 
 const selector = state => state.shareToken;
 
-export default function useShareToken(shareId) {
+export function useShareToken(shareId) {
   const shareToken = useStore(selector);
   const { get } = useApi();
 
@@ -24,3 +24,5 @@ export default function useShareToken(shareId) {
 
   return shareToken;
 }
+
+export default useShareToken;
diff --git a/hooks/useSticky.js b/hooks/useSticky.js
index ae4dce72..be33f6ed 100644
--- a/hooks/useSticky.js
+++ b/hooks/useSticky.js
@@ -1,6 +1,6 @@
 import { useState, useEffect, useRef } from 'react';
 
-export default function useSticky({ enabled = true, threshold = 1 }) {
+export function useSticky({ enabled = true, threshold = 1 }) {
   const [isSticky, setIsSticky] = useState(false);
   const ref = useRef(null);
 
@@ -21,3 +21,5 @@ export default function useSticky({ enabled = true, threshold = 1 }) {
 
   return { ref, isSticky };
 }
+
+export default useSticky;
diff --git a/hooks/useTheme.js b/hooks/useTheme.js
index c50f442f..a10894e5 100644
--- a/hooks/useTheme.js
+++ b/hooks/useTheme.js
@@ -5,7 +5,7 @@ import { THEME_CONFIG } from 'lib/constants';
 
 const selector = state => state.theme;
 
-export default function useTheme() {
+export function useTheme() {
   const defaultTheme =
     typeof window !== 'undefined'
       ? window?.matchMedia('(prefers-color-scheme: dark)')?.matches
@@ -34,3 +34,5 @@ export default function useTheme() {
 
   return [theme, saveTheme];
 }
+
+export default useTheme;
diff --git a/hooks/useTimezone.js b/hooks/useTimezone.js
index 8eb5d5f8..fb347c4d 100644
--- a/hooks/useTimezone.js
+++ b/hooks/useTimezone.js
@@ -3,7 +3,7 @@ import { getTimezone } from 'lib/date';
 import { getItem, setItem } from 'next-basics';
 import { TIMEZONE_CONFIG } from 'lib/constants';
 
-export default function useTimezone() {
+export function useTimezone() {
   const [timezone, setTimezone] = useState(getItem(TIMEZONE_CONFIG) || getTimezone());
 
   const saveTimezone = useCallback(
@@ -16,3 +16,5 @@ export default function useTimezone() {
 
   return [timezone, saveTimezone];
 }
+
+export default useTimezone;
diff --git a/hooks/useUser.js b/hooks/useUser.js
index 6b73c113..c5f1a826 100644
--- a/hooks/useUser.js
+++ b/hooks/useUser.js
@@ -2,8 +2,10 @@ import useStore, { setUser } from 'store/app';
 
 const selector = state => state.user;
 
-export default function useUser() {
+export function useUser() {
   const user = useStore(selector);
 
   return { user, setUser };
 }
+
+export default useUser;
diff --git a/pages/api/websites/[id]/data.ts b/pages/api/websites/[id]/data.ts
new file mode 100644
index 00000000..93e97067
--- /dev/null
+++ b/pages/api/websites/[id]/data.ts
@@ -0,0 +1,13 @@
+import { NextApiResponse } from 'next';
+import { useAuth } from 'lib/middleware';
+import { NextApiRequestQueryBody, User } from 'lib/types';
+import { ok } from 'next-basics';
+
+export default async (
+  req: NextApiRequestQueryBody<unknown, unknown>,
+  res: NextApiResponse<User>,
+) => {
+  await useAuth(req, res);
+
+  return ok(res, req.auth.user);
+};
diff --git a/pages/reports/event-data/index.js b/pages/reports/event-data/index.js
new file mode 100644
index 00000000..154c79be
--- /dev/null
+++ b/pages/reports/event-data/index.js
@@ -0,0 +1,5 @@
+import EventDataReport from 'components/pages/reports/EventDataReport';
+
+export default function Report() {
+  return <EventDataReport />;
+}
diff --git a/pages/reports/index.js b/pages/reports/index.js
new file mode 100644
index 00000000..b26023cc
--- /dev/null
+++ b/pages/reports/index.js
@@ -0,0 +1,13 @@
+import AppLayout from 'components/layout/AppLayout';
+import ReportsList from 'components/pages/reports/ReportsList';
+import useMessages from 'hooks/useMessages';
+
+export default function ReportsPage() {
+  const { formatMessage, labels } = useMessages();
+
+  return (
+    <AppLayout title={formatMessage(labels.reports)}>
+      <ReportsList />
+    </AppLayout>
+  );
+}

From 55e91d56596e008548710755932b30f1675e4ff4 Mon Sep 17 00:00:00 2001
From: Joseph Lee <joseph@jc-lab.net>
Date: Thu, 18 May 2023 17:26:52 +0900
Subject: [PATCH 41/88] Fix to add basePath to trackingCode generation

---
 components/pages/settings/websites/TrackingCode.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/pages/settings/websites/TrackingCode.js b/components/pages/settings/websites/TrackingCode.js
index 425dda06..c847ed0d 100644
--- a/components/pages/settings/websites/TrackingCode.js
+++ b/components/pages/settings/websites/TrackingCode.js
@@ -4,10 +4,12 @@ import useConfig from 'hooks/useConfig';
 
 export function TrackingCode({ websiteId }) {
   const { formatMessage, messages } = useMessages();
-  const { trackerScriptName } = useConfig();
+  const { basePath, trackerScriptName } = useConfig();
   const url = trackerScriptName?.startsWith('http')
     ? trackerScriptName
-    : `${location.origin}/${trackerScriptName?.split(',')?.map(n => n.trim())?.[0] || 'script.js'}`;
+    : `${location.origin}${basePath}/${
+        trackerScriptName?.split(',')?.map(n => n.trim())?.[0] || 'script.js'
+      }`;
 
   const code = `<script async src="${url}" data-website-id="${websiteId}"></script>`;
 

From de509e7cccfbe988a627f498ea3a400a893e563e Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Thu, 18 May 2023 11:17:35 -0700
Subject: [PATCH 42/88] checkpoint

---
 components/layout/NavBar.js                   |   1 +
 components/layout/ReportsLayout.js            |  23 +++
 components/layout/ReportsLayout.module.css    |  23 +++
 components/layout/SettingsLayout.js           |   1 -
 components/pages/reports/FunnelChart.js       |  42 ----
 .../pages/reports/FunnelChart.module.css      |   7 -
 components/pages/reports/FunnelDetails.js     |   0
 components/pages/reports/ReportDropdown.js    |   0
 components/pages/reports/ReportForm.js        |  28 +++
 .../pages/reports/ReportForm.module.css       |  23 +++
 .../pages/reports/funnel/FunnelChart.js       | 186 ++++++++++++++++++
 .../reports/funnel/FunnelChart.module.css     |  23 +++
 .../pages/reports/{ => funnel}/FunnelForm.js  |   8 +-
 .../{ => funnel}/FunnelForm.module.css        |   5 -
 .../pages/reports/{ => funnel}/FunnelPage.js  |  20 +-
 .../{ => funnel}/FunnelPage.module.css        |   0
 .../pages/reports/{ => funnel}/FunnelTable.js |   3 +-
 package.json                                  |   1 -
 pages/_app.js                                 |   1 -
 pages/{settings => }/reports/funnel.js        |   9 +-
 pages/{settings => }/reports/index.js         |   2 +-
 .../analytics/pageview/getPageviewFunnel.ts   |  17 +-
 styles/funnelChart.css                        | 148 --------------
 23 files changed, 335 insertions(+), 236 deletions(-)
 create mode 100644 components/layout/ReportsLayout.js
 create mode 100644 components/layout/ReportsLayout.module.css
 delete mode 100644 components/pages/reports/FunnelChart.js
 delete mode 100644 components/pages/reports/FunnelChart.module.css
 delete mode 100644 components/pages/reports/FunnelDetails.js
 delete mode 100644 components/pages/reports/ReportDropdown.js
 create mode 100644 components/pages/reports/ReportForm.module.css
 create mode 100644 components/pages/reports/funnel/FunnelChart.js
 create mode 100644 components/pages/reports/funnel/FunnelChart.module.css
 rename components/pages/reports/{ => funnel}/FunnelForm.js (96%)
 rename components/pages/reports/{ => funnel}/FunnelForm.module.css (83%)
 rename components/pages/reports/{ => funnel}/FunnelPage.js (67%)
 rename components/pages/reports/{ => funnel}/FunnelPage.module.css (100%)
 rename components/pages/reports/{ => funnel}/FunnelTable.js (73%)
 rename pages/{settings => }/reports/funnel.js (54%)
 rename pages/{settings => }/reports/index.js (90%)
 delete mode 100644 styles/funnelChart.css

diff --git a/components/layout/NavBar.js b/components/layout/NavBar.js
index 5a6c877e..ba06d172 100644
--- a/components/layout/NavBar.js
+++ b/components/layout/NavBar.js
@@ -19,6 +19,7 @@ export function NavBar() {
   const links = [
     { label: formatMessage(labels.dashboard), url: '/dashboard' },
     { label: formatMessage(labels.realtime), url: '/realtime' },
+    { label: formatMessage(labels.reports), url: '/reports/funnel' },
     !cloudMode && { label: formatMessage(labels.settings), url: '/settings' },
   ].filter(n => n);
 
diff --git a/components/layout/ReportsLayout.js b/components/layout/ReportsLayout.js
new file mode 100644
index 00000000..fd63a67e
--- /dev/null
+++ b/components/layout/ReportsLayout.js
@@ -0,0 +1,23 @@
+import { Column, Row } from 'react-basics';
+import styles from './ReportsLayout.module.css';
+
+export function SettingsLayout({ children, filter, header }) {
+  return (
+    <>
+      <Row>{header}</Row>
+      <Row>
+        {filter && (
+          <Column className={styles.filter} defaultSize={12} md={4} lg={3} xl={3}>
+            <h2>Filters</h2>
+            {filter}
+          </Column>
+        )}
+        <Column className={styles.content} defaultSize={12} md={8} lg={9} xl={9}>
+          {children}
+        </Column>
+      </Row>
+    </>
+  );
+}
+
+export default SettingsLayout;
diff --git a/components/layout/ReportsLayout.module.css b/components/layout/ReportsLayout.module.css
new file mode 100644
index 00000000..6922665f
--- /dev/null
+++ b/components/layout/ReportsLayout.module.css
@@ -0,0 +1,23 @@
+.filter {
+  margin-top: 30px;
+  min-width: 200px;
+  max-width: 100vw;
+  padding: 10px;
+  background: var(--base50);
+  border-radius: 5px;
+  border: 1px solid var(--border-color);
+}
+
+.filter h2 {
+  padding-bottom: 20px;
+}
+
+.content {
+  min-height: 50vh;
+}
+
+@media only screen and (max-width: 768px) {
+  .menu {
+    display: none;
+  }
+}
diff --git a/components/layout/SettingsLayout.js b/components/layout/SettingsLayout.js
index d58154ca..c79f0909 100644
--- a/components/layout/SettingsLayout.js
+++ b/components/layout/SettingsLayout.js
@@ -15,7 +15,6 @@ export function SettingsLayout({ children }) {
   const items = [
     { key: 'websites', label: formatMessage(labels.websites), url: '/settings/websites' },
     { key: 'teams', label: formatMessage(labels.teams), url: '/settings/teams' },
-    { key: 'reports', label: 'Reports', url: '/settings/reports/funnel' },
     user.isAdmin && { key: 'users', label: formatMessage(labels.users), url: '/settings/users' },
     { key: 'profile', label: formatMessage(labels.profile), url: '/settings/profile' },
   ].filter(n => n);
diff --git a/components/pages/reports/FunnelChart.js b/components/pages/reports/FunnelChart.js
deleted file mode 100644
index ec03acab..00000000
--- a/components/pages/reports/FunnelChart.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import FunnelGraph from 'funnel-graph-js/dist/js/funnel-graph';
-import { useEffect, useRef } from 'react';
-import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
-import useMessages from 'hooks/useMessages';
-import styles from './FunnelChart.module.css';
-import classNames from 'classnames';
-
-export default function FunnelChart({ data }) {
-  const { formatMessage, labels, messages } = useMessages();
-  const funnel = useRef(null);
-
-  useEffect(() => {
-    if (data && data.length > 0) {
-      funnel.current.innerHTML = '';
-
-      const chartData = {
-        labels: data.map(a => a.url),
-        colors: ['#147af3', '#e0f2ff'],
-        values: data.map(a => a.count),
-      };
-
-      const graph = new FunnelGraph({
-        container: '.funnel',
-        gradientDirection: 'horizontal',
-        data: chartData,
-        displayPercent: true,
-        direction: 'Vertical',
-        width: 1000,
-        height: 350,
-      });
-
-      graph.draw();
-    }
-  }, [data]);
-
-  return (
-    <>
-      {data?.length > 0 && <div className={classNames(styles.funnel, 'funnel')} ref={funnel} />}
-      {data?.length === 0 && <EmptyPlaceholder message={formatMessage(messages.noResultsFound)} />}
-    </>
-  );
-}
diff --git a/components/pages/reports/FunnelChart.module.css b/components/pages/reports/FunnelChart.module.css
deleted file mode 100644
index 1d7eb37e..00000000
--- a/components/pages/reports/FunnelChart.module.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.funnel div {
-  color: var(--font-color100) !important;
-}
-
-.funnel svg {
-  max-width: 100%;
-}
diff --git a/components/pages/reports/FunnelDetails.js b/components/pages/reports/FunnelDetails.js
deleted file mode 100644
index e69de29b..00000000
diff --git a/components/pages/reports/ReportDropdown.js b/components/pages/reports/ReportDropdown.js
deleted file mode 100644
index e69de29b..00000000
diff --git a/components/pages/reports/ReportForm.js b/components/pages/reports/ReportForm.js
index e69de29b..b32a8531 100644
--- a/components/pages/reports/ReportForm.js
+++ b/components/pages/reports/ReportForm.js
@@ -0,0 +1,28 @@
+import useMessages from 'hooks/useMessages';
+import { Form, FormButtons, FormInput, FormRow, SubmitButton, TextField } from 'react-basics';
+
+export function FunnelForm({ onSearch }) {
+  const { formatMessage, labels } = useMessages();
+
+  const handleSubmit = () => {};
+
+  return (
+    <>
+      <Form onSubmit={handleSubmit}>
+        <FormRow label={formatMessage(labels.website)}>
+          <FormInput name="name" rules={{ required: formatMessage(labels.required) }}>
+            <TextField />
+          </FormInput>
+        </FormRow>
+
+        <FormButtons>
+          <SubmitButton variant="primary" disabled={false}>
+            Save
+          </SubmitButton>
+        </FormButtons>
+      </Form>
+    </>
+  );
+}
+
+export default FunnelForm;
diff --git a/components/pages/reports/ReportForm.module.css b/components/pages/reports/ReportForm.module.css
new file mode 100644
index 00000000..2a07d552
--- /dev/null
+++ b/components/pages/reports/ReportForm.module.css
@@ -0,0 +1,23 @@
+.filter {
+  min-width: 200px;
+}
+
+.hiddenInput {
+  max-height: 100px;
+}
+
+.hiddenInput {
+  visibility: hidden;
+  min-height: 0px;
+  max-height: 0px;
+}
+
+.hidden {
+  visibility: hidden;
+  min-height: 0px;
+  max-height: 0px;
+}
+
+.urlFormRow label {
+  min-width: 80px;
+}
diff --git a/components/pages/reports/funnel/FunnelChart.js b/components/pages/reports/funnel/FunnelChart.js
new file mode 100644
index 00000000..5a0b5699
--- /dev/null
+++ b/components/pages/reports/funnel/FunnelChart.js
@@ -0,0 +1,186 @@
+import Chart from 'chart.js/auto';
+import classNames from 'classnames';
+import { colord } from 'colord';
+import HoverTooltip from 'components/common/HoverTooltip';
+import Legend from 'components/metrics/Legend';
+import useLocale from 'hooks/useLocale';
+import useMessages from 'hooks/useMessages';
+import useTheme from 'hooks/useTheme';
+import { DEFAULT_ANIMATION_DURATION, THEME_COLORS } from 'lib/constants';
+import { dateFormat } from 'lib/date';
+import { formatLongNumber } from 'lib/format';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { Loading, StatusLight } from 'react-basics';
+import styles from './FunnelChart.module.css';
+
+export function FunnelChart({
+  data,
+  animationDuration = DEFAULT_ANIMATION_DURATION,
+  stacked = false,
+  loading = false,
+  onCreate = () => {},
+  onUpdate = () => {},
+  className,
+}) {
+  const { formatMessage, labels } = useMessages();
+  const canvas = useRef();
+  const chart = useRef(null);
+  const [tooltip, setTooltip] = useState(null);
+  const { locale } = useLocale();
+  const [theme] = useTheme();
+
+  const datasets = useMemo(() => {
+    const primaryColor = colord(THEME_COLORS[theme].primary);
+    return [
+      {
+        label: formatMessage(labels.uniqueVisitors),
+        data: data,
+        borderWidth: 1,
+        hoverBackgroundColor: primaryColor.alpha(0.9).toRgbString(),
+        backgroundColor: primaryColor.alpha(0.6).toRgbString(),
+        borderColor: primaryColor.alpha(0.9).toRgbString(),
+        hoverBorderColor: primaryColor.toRgbString(),
+      },
+    ];
+  }, [data]);
+
+  const colors = useMemo(
+    () => ({
+      text: THEME_COLORS[theme].gray700,
+      line: THEME_COLORS[theme].gray200,
+    }),
+    [theme],
+  );
+
+  const renderYLabel = label => {
+    return +label > 1000 ? formatLongNumber(label) : label;
+  };
+
+  const renderTooltip = useCallback(model => {
+    const { opacity, labelColors, dataPoints } = model.tooltip;
+
+    if (!dataPoints?.length || !opacity) {
+      setTooltip(null);
+      return;
+    }
+
+    setTooltip(
+      <div className={styles.tooltip}>
+        <div>
+          <StatusLight color={labelColors?.[0]?.backgroundColor}>
+            <div className={styles.value}>
+              <div>{dataPoints[0].raw.x}</div>
+              <div>{formatLongNumber(dataPoints[0].raw.y)}</div>
+            </div>
+          </StatusLight>
+        </div>
+      </div>,
+    );
+  }, []);
+
+  const getOptions = useCallback(() => {
+    return {
+      responsive: true,
+      maintainAspectRatio: false,
+      animation: {
+        duration: animationDuration,
+        resize: {
+          duration: 0,
+        },
+        active: {
+          duration: 0,
+        },
+      },
+      plugins: {
+        legend: {
+          display: false,
+        },
+        tooltip: {
+          enabled: false,
+          external: renderTooltip,
+        },
+      },
+      scales: {
+        x: {
+          grid: {
+            display: false,
+          },
+          border: {
+            color: colors.line,
+          },
+          ticks: {
+            color: colors.text,
+            autoSkip: false,
+            maxRotation: 0,
+          },
+        },
+        y: {
+          type: 'linear',
+          min: 0,
+          beginAtZero: true,
+          stacked,
+          grid: {
+            color: colors.line,
+          },
+          border: {
+            color: colors.line,
+          },
+          ticks: {
+            color: colors.text,
+            callback: renderYLabel,
+          },
+        },
+      },
+    };
+  }, [animationDuration, renderTooltip, stacked, colors, locale]);
+
+  const createChart = () => {
+    Chart.defaults.font.family = 'Inter';
+
+    const options = getOptions();
+
+    chart.current = new Chart(canvas.current, {
+      type: 'bar',
+      data: { datasets },
+      options,
+    });
+
+    onCreate(chart.current);
+  };
+
+  const updateChart = () => {
+    setTooltip(null);
+
+    chart.current.data.datasets[0].data = datasets[0].data;
+    chart.current.data.datasets[0].label = datasets[0].label;
+
+    chart.current.options = getOptions();
+
+    onUpdate(chart.current);
+
+    chart.current.update();
+  };
+
+  useEffect(() => {
+    if (datasets) {
+      if (!chart.current) {
+        createChart();
+      } else {
+        updateChart();
+      }
+    }
+  }, [datasets, theme, animationDuration, locale]);
+
+  return (
+    <>
+      <div className={classNames(styles.chart, className)}>
+        {loading && <Loading position="page" icon="dots" />}
+        <canvas ref={canvas} />
+      </div>
+      <Legend chart={chart.current} />
+      {tooltip && <HoverTooltip tooltip={tooltip} />}
+    </>
+  );
+}
+
+export default FunnelChart;
diff --git a/components/pages/reports/funnel/FunnelChart.module.css b/components/pages/reports/funnel/FunnelChart.module.css
new file mode 100644
index 00000000..f071a29e
--- /dev/null
+++ b/components/pages/reports/funnel/FunnelChart.module.css
@@ -0,0 +1,23 @@
+.chart {
+  position: relative;
+  height: 400px;
+  overflow: hidden;
+}
+
+.tooltip {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+
+.tooltip .value {
+  display: flex;
+  flex-direction: column;
+  text-transform: lowercase;
+}
+
+@media only screen and (max-width: 992px) {
+  .chart {
+    /*height: 200px;*/
+  }
+}
diff --git a/components/pages/reports/FunnelForm.js b/components/pages/reports/funnel/FunnelForm.js
similarity index 96%
rename from components/pages/reports/FunnelForm.js
rename to components/pages/reports/funnel/FunnelForm.js
index 5f9758f0..30edcc56 100644
--- a/components/pages/reports/FunnelForm.js
+++ b/components/pages/reports/funnel/FunnelForm.js
@@ -37,7 +37,11 @@ export function FunnelForm({ onSearch }) {
 
   const handleAddUrl = () => setUrls([...urls, '']);
 
-  const handleRemoveUrl = i => setUrls(urls.splice(i, 1));
+  const handleRemoveUrl = i => {
+    const nextUrls = [...urls];
+    nextUrls.splice(i, 1);
+    setUrls(nextUrls);
+  };
 
   const handleWindowChange = value => setWindow(value.target.value);
 
@@ -103,7 +107,7 @@ export function FunnelForm({ onSearch }) {
 
         <FormButtons>
           <SubmitButton variant="primary" disabled={false}>
-            Search
+            Query
           </SubmitButton>
         </FormButtons>
       </Form>
diff --git a/components/pages/reports/FunnelForm.module.css b/components/pages/reports/funnel/FunnelForm.module.css
similarity index 83%
rename from components/pages/reports/FunnelForm.module.css
rename to components/pages/reports/funnel/FunnelForm.module.css
index 2706a99a..2a07d552 100644
--- a/components/pages/reports/FunnelForm.module.css
+++ b/components/pages/reports/funnel/FunnelForm.module.css
@@ -18,11 +18,6 @@
   max-height: 0px;
 }
 
-.urlFormRow {
-  flex-direction: row;
-  gap: 0em;
-}
-
 .urlFormRow label {
   min-width: 80px;
 }
diff --git a/components/pages/reports/FunnelPage.js b/components/pages/reports/funnel/FunnelPage.js
similarity index 67%
rename from components/pages/reports/FunnelPage.js
rename to components/pages/reports/funnel/FunnelPage.js
index b69319b1..3bfbb9e3 100644
--- a/components/pages/reports/FunnelPage.js
+++ b/components/pages/reports/funnel/FunnelPage.js
@@ -1,17 +1,19 @@
 import { useMutation } from '@tanstack/react-query';
 import Page from 'components/layout/Page';
 import PageHeader from 'components/layout/PageHeader';
+import ReportsLayout from 'components/layout/ReportsLayout';
 import useApi from 'hooks/useApi';
 import { useState } from 'react';
 import FunnelChart from './FunnelChart';
 import FunnelTable from './FunnelTable';
 import FunnelForm from './FunnelForm';
+
 import styles from './FunnelPage.module.css';
 
 export default function FunnelPage() {
   const { post } = useApi();
   const { mutate, error, isLoading } = useMutation(data => post('/reports/funnel', data));
-  const [data, setData] = useState();
+  const [data, setData] = useState([{}]);
   const [formData, setFormData] = useState();
 
   function handleOnSearch(data) {
@@ -25,14 +27,12 @@ export default function FunnelPage() {
   }
 
   return (
-    <Page>
-      <PageHeader title="Funnel Report"></PageHeader>
-      <FunnelChart data={data} />
-      <FunnelTable data={data} />
-      <div>
-        <h2>Filters</h2>
-        <FunnelForm onSearch={handleOnSearch} />
-      </div>
-    </Page>
+    <ReportsLayout filter={<FunnelForm onSearch={handleOnSearch} />} header={'test'}>
+      <Page>
+        <PageHeader title="Funnel Report"></PageHeader>
+        <FunnelChart data={data} />
+        <FunnelTable data={data} />
+      </Page>
+    </ReportsLayout>
   );
 }
diff --git a/components/pages/reports/FunnelPage.module.css b/components/pages/reports/funnel/FunnelPage.module.css
similarity index 100%
rename from components/pages/reports/FunnelPage.module.css
rename to components/pages/reports/funnel/FunnelPage.module.css
diff --git a/components/pages/reports/FunnelTable.js b/components/pages/reports/funnel/FunnelTable.js
similarity index 73%
rename from components/pages/reports/FunnelTable.js
rename to components/pages/reports/funnel/FunnelTable.js
index 036e20c3..2bbabc81 100644
--- a/components/pages/reports/FunnelTable.js
+++ b/components/pages/reports/funnel/FunnelTable.js
@@ -1,13 +1,12 @@
 import DataTable from 'components/metrics/DataTable';
 import useMessages from 'hooks/useMessages';
-import { useState } from 'react';
 
 export function DevicesTable({ ...props }) {
   const { formatMessage, labels } = useMessages();
   const { data } = props;
 
   const tableData =
-    data?.map(a => ({ x: a.url, y: a.count, z: (a.count / data[0].count) * 100 })) || [];
+    data?.map(a => ({ x: a.x, y: a.y, z: Math.floor(a.y / data[0].y) * 100 })) || [];
 
   return <DataTable data={tableData} title="Url" type="device" />;
 }
diff --git a/package.json b/package.json
index 7f365db1..0db07f49 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,6 @@
     "dotenv": "^10.0.0",
     "formik": "^2.2.9",
     "fs-extra": "^10.0.1",
-    "funnel-graph-js": "^1.3.7",
     "immer": "^9.0.12",
     "ipaddr.js": "^2.0.1",
     "is-ci": "^3.0.1",
diff --git a/pages/_app.js b/pages/_app.js
index bc55355b..22458215 100644
--- a/pages/_app.js
+++ b/pages/_app.js
@@ -9,7 +9,6 @@ import useConfig from 'hooks/useConfig';
 import '@fontsource/inter/400.css';
 import '@fontsource/inter/700.css';
 import 'react-basics/dist/styles.css';
-import 'styles/funnelChart.css';
 import 'styles/variables.css';
 import 'styles/locale.css';
 import 'styles/index.css';
diff --git a/pages/settings/reports/funnel.js b/pages/reports/funnel.js
similarity index 54%
rename from pages/settings/reports/funnel.js
rename to pages/reports/funnel.js
index d8d7a5b8..3ba11306 100644
--- a/pages/settings/reports/funnel.js
+++ b/pages/reports/funnel.js
@@ -1,16 +1,13 @@
 import AppLayout from 'components/layout/AppLayout';
-import SettingsLayout from 'components/layout/SettingsLayout';
-import FunnelPage from 'components/pages/reports/FunnelPage';
+import FunnelPage from 'components/pages/reports/funnel/FunnelPage';
 import useMessages from 'hooks/useMessages';
 
-export default function DetailsPage() {
+export default function Funnel() {
   const { formatMessage, labels } = useMessages();
 
   return (
     <AppLayout title={`${formatMessage(labels.settings)} - ${formatMessage(labels.reports)}`}>
-      <SettingsLayout>
-        <FunnelPage />
-      </SettingsLayout>
+      <FunnelPage />
     </AppLayout>
   );
 }
diff --git a/pages/settings/reports/index.js b/pages/reports/index.js
similarity index 90%
rename from pages/settings/reports/index.js
rename to pages/reports/index.js
index ce0a3726..cdd6ae38 100644
--- a/pages/settings/reports/index.js
+++ b/pages/reports/index.js
@@ -1,6 +1,6 @@
 import { useRouter } from 'next/router';
 import AppLayout from 'components/layout/AppLayout';
-import FunnelPage from 'components/pages/reports/FunnelPage';
+import FunnelPage from 'components/pages/reports/funnel/FunnelPage';
 import useMessages from 'hooks/useMessages';
 import SettingsLayout from 'components/layout/SettingsLayout';
 
diff --git a/queries/analytics/pageview/getPageviewFunnel.ts b/queries/analytics/pageview/getPageviewFunnel.ts
index 591310cf..ef62e526 100644
--- a/queries/analytics/pageview/getPageviewFunnel.ts
+++ b/queries/analytics/pageview/getPageviewFunnel.ts
@@ -29,9 +29,8 @@ async function relationalQuery(
   },
 ): Promise<
   {
-    level: number;
-    url: string;
-    count: any;
+    x: string;
+    y: number;
   }[]
 > {
   const { windowMinutes, startDate, endDate, urls } = criteria;
@@ -58,7 +57,7 @@ async function relationalQuery(
   `,
     params,
   ).then((a: { [key: string]: number }) => {
-    return urls.map((b, i) => ({ level: i + 1, url: b, count: a[`level${i + 1}`] || 0 }));
+    return urls.map((b, i) => ({ x: b, y: a[`level${i + 1}`] || 0 }));
   });
 }
 
@@ -72,9 +71,8 @@ async function clickhouseQuery(
   },
 ): Promise<
   {
-    level: number;
-    url: string;
-    count: number;
+    x: string;
+    y: number;
   }[]
 > {
   const { windowMinutes, startDate, endDate, urls } = criteria;
@@ -110,9 +108,8 @@ async function clickhouseQuery(
     params,
   ).then(results => {
     return urls.map((a, i) => ({
-      level: i + 1,
-      url: a,
-      count: results[i + 1]?.count || 0,
+      x: a,
+      y: results[i + 1]?.count || 0,
     }));
   });
 }
diff --git a/styles/funnelChart.css b/styles/funnelChart.css
deleted file mode 100644
index c72d42e7..00000000
--- a/styles/funnelChart.css
+++ /dev/null
@@ -1,148 +0,0 @@
-.svg-funnel-js {
-  display: inline-block;
-  position: relative;
-}
-.svg-funnel-js svg {
-  display: block;
-}
-.svg-funnel-js .svg-funnel-js__labels {
-  position: absolute;
-  display: flex;
-  width: 100%;
-  height: 100%;
-  top: 0;
-  left: 0;
-}
-.svg-funnel-js.svg-funnel-js--vertical .svg-funnel-js__labels {
-  flex-direction: column;
-}
-
-.svg-funnel-js body {
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.svg-funnel-js {
-  font-family: 'Open Sans', sans-serif;
-}
-.svg-funnel-js .svg-funnel-js__container {
-  width: 100%;
-  height: 100%;
-}
-.svg-funnel-js .svg-funnel-js__labels {
-  width: 100%;
-  box-sizing: border-box;
-}
-.svg-funnel-js .svg-funnel-js__labels .svg-funnel-js__label {
-  flex: 1 1 0;
-  position: relative;
-}
-.svg-funnel-js .svg-funnel-js__labels .svg-funnel-js__label .label__value {
-  font-size: 24px;
-  color: #fff;
-  line-height: 18px;
-  margin-bottom: 6px;
-}
-.svg-funnel-js .svg-funnel-js__labels .svg-funnel-js__label .label__title {
-  font-size: 12px;
-  font-weight: bold;
-  color: #21ffa2;
-}
-.svg-funnel-js .svg-funnel-js__labels .svg-funnel-js__label .label__percentage {
-  font-size: 16px;
-  font-weight: bold;
-  color: #9896dc;
-}
-.svg-funnel-js .svg-funnel-js__labels .svg-funnel-js__label .label__segment-percentages {
-  position: absolute;
-  top: 50%;
-  transform: translateY(-50%);
-  width: 100%;
-  left: 0;
-  padding: 8px 24px;
-  box-sizing: border-box;
-  background-color: rgba(8, 7, 48, 0.8);
-  margin-top: 24px;
-  opacity: 0;
-  transition: opacity 0.1s ease;
-  cursor: default;
-}
-.svg-funnel-js .svg-funnel-js__labels .svg-funnel-js__label .label__segment-percentages ul {
-  margin: 0;
-  padding: 0;
-  list-style-type: none;
-}
-.svg-funnel-js .svg-funnel-js__labels .svg-funnel-js__label .label__segment-percentages ul li {
-  font-size: 13px;
-  line-height: 16px;
-  color: #fff;
-  margin: 18px 0;
-}
-.svg-funnel-js
-  .svg-funnel-js__labels
-  .svg-funnel-js__label
-  .label__segment-percentages
-  ul
-  li
-  .percentage__list-label {
-  font-weight: bold;
-  color: #05df9d;
-}
-.svg-funnel-js .svg-funnel-js__labels .svg-funnel-js__label:hover .label__segment-percentages {
-  opacity: 1;
-}
-.svg-funnel-js:not(.svg-funnel-js--vertical) {
-  padding-top: 64px;
-  padding-bottom: 16px;
-}
-.svg-funnel-js:not(.svg-funnel-js--vertical) .svg-funnel-js__label {
-  padding-left: 24px;
-}
-.svg-funnel-js:not(.svg-funnel-js--vertical) .svg-funnel-js__label:not(:first-child) {
-  border-left: 1px solid #9896dc;
-}
-.svg-funnel-js.svg-funnel-js--vertical {
-  padding-left: 120px;
-  padding-right: 16px;
-}
-.svg-funnel-js.svg-funnel-js--vertical .svg-funnel-js__label {
-  padding-top: 24px;
-}
-.svg-funnel-js.svg-funnel-js--vertical .svg-funnel-js__label:not(:first-child) {
-  border-top: 1px solid #9896dc;
-}
-.svg-funnel-js.svg-funnel-js--vertical .svg-funnel-js__label .label__segment-percentages {
-  margin-top: 0;
-  margin-left: 106px;
-  width: calc(100% - 106px);
-}
-.svg-funnel-js.svg-funnel-js--vertical
-  .svg-funnel-js__label
-  .label__segment-percentages
-  .segment-percentage__list {
-  display: flex;
-  justify-content: space-around;
-}
-.svg-funnel-js .svg-funnel-js__subLabels {
-  display: flex;
-  justify-content: center;
-  margin-top: 24px;
-  position: absolute;
-  width: 100%;
-  left: 0;
-}
-.svg-funnel-js .svg-funnel-js__subLabels .svg-funnel-js__subLabel {
-  display: flex;
-  font-size: 12px;
-  color: #fff;
-  line-height: 16px;
-}
-.svg-funnel-js .svg-funnel-js__subLabels .svg-funnel-js__subLabel:not(:first-child) {
-  margin-left: 16px;
-}
-.svg-funnel-js .svg-funnel-js__subLabels .svg-funnel-js__subLabel .svg-funnel-js__subLabel--color {
-  width: 12px;
-  height: 12px;
-  border-radius: 50%;
-  margin: 2px 8px 2px 0;
-}

From 4df7d6a2a12d0bcc43d0d1e6fc8ddb2fee647b22 Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Thu, 18 May 2023 13:13:18 -0700
Subject: [PATCH 43/88] Add userReport api

---
 lib/auth.ts                 | 31 +++++++++++++++++--
 pages/api/reports/[id].ts   | 60 +++++++++++++++++++++++++++++++++++++
 pages/api/reports/index.ts  | 43 ++++++++++++++++++++++++++
 queries/admin/user.ts       | 14 +++++++++
 queries/admin/userReport.ts | 37 +++++++++++++++++++++++
 queries/admin/website.ts    |  5 ++++
 queries/index.js            |  1 +
 7 files changed, 189 insertions(+), 2 deletions(-)
 create mode 100644 pages/api/reports/[id].ts
 create mode 100644 pages/api/reports/index.ts
 create mode 100644 queries/admin/userReport.ts

diff --git a/lib/auth.ts b/lib/auth.ts
index 2195ad8f..4d11a289 100644
--- a/lib/auth.ts
+++ b/lib/auth.ts
@@ -15,6 +15,7 @@ import { getTeamWebsite, getTeamWebsiteByTeamMemberId } from 'queries/admin/team
 import { validate } from 'uuid';
 import { Auth } from './types';
 import { loadWebsite } from './query';
+import { UserReport } from '@prisma/client';
 
 const log = debug('umami:auth');
 
@@ -135,7 +136,34 @@ export async function canDeleteWebsite({ user }: Auth, websiteId: string) {
   return false;
 }
 
-// To-do: Implement when payments are setup.
+export async function canViewUserReport(auth: Auth, userReport: UserReport) {
+  if (auth.user.isAdmin) {
+    return true;
+  }
+
+  if ((auth.user.id = userReport.userId)) {
+    return true;
+  }
+
+  if (await canViewWebsite(auth, userReport.websiteId)) {
+    return true;
+  }
+
+  return false;
+}
+
+export async function canUpdateUserReport(auth: Auth, userReport: UserReport) {
+  if (auth.user.isAdmin) {
+    return true;
+  }
+
+  if ((auth.user.id = userReport.userId)) {
+    return true;
+  }
+
+  return false;
+}
+
 export async function canCreateTeam({ user }: Auth) {
   if (user.isAdmin) {
     return true;
@@ -144,7 +172,6 @@ export async function canCreateTeam({ user }: Auth) {
   return !!user;
 }
 
-// To-do: Implement when payments are setup.
 export async function canViewTeam({ user }: Auth, teamId: string) {
   if (user.isAdmin) {
     return true;
diff --git a/pages/api/reports/[id].ts b/pages/api/reports/[id].ts
new file mode 100644
index 00000000..42002d18
--- /dev/null
+++ b/pages/api/reports/[id].ts
@@ -0,0 +1,60 @@
+import { canUpdateUserReport, canViewUserReport } from 'lib/auth';
+import { useAuth, useCors } from 'lib/middleware';
+import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getUserReportById, updateUserReport } from 'queries';
+
+export interface UserReportRequestQuery {
+  id: string;
+}
+
+export interface UserReportRequestBody {
+  websiteId: string;
+  reportName: string;
+  templateName: string;
+  parameters: string;
+}
+
+export default async (
+  req: NextApiRequestQueryBody<UserReportRequestQuery, UserReportRequestBody>,
+  res: NextApiResponse,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+
+  if (req.method === 'GET') {
+    const { id: userReportId } = req.query;
+
+    const data = await getUserReportById(userReportId);
+
+    if (!(await canViewUserReport(req.auth, data))) {
+      return unauthorized(res);
+    }
+
+    return ok(res, data);
+  }
+
+  if (req.method === 'POST') {
+    const { id: userReportId } = req.query;
+
+    const data = await getUserReportById(userReportId);
+
+    if (!(await canUpdateUserReport(req.auth, data))) {
+      return unauthorized(res);
+    }
+
+    const updated = await updateUserReport(
+      {
+        ...req.body,
+      },
+      {
+        id: userReportId,
+      },
+    );
+
+    return ok(res, updated);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/pages/api/reports/index.ts b/pages/api/reports/index.ts
new file mode 100644
index 00000000..e5855355
--- /dev/null
+++ b/pages/api/reports/index.ts
@@ -0,0 +1,43 @@
+import { uuid } from 'lib/crypto';
+import { useAuth, useCors } from 'lib/middleware';
+import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok } from 'next-basics';
+import { createUserReport, getUserReports } from 'queries';
+
+export interface UserReportRequestBody {
+  websiteId: string;
+  reportName: string;
+  templateName: string;
+  parameters: string;
+}
+
+export default async (
+  req: NextApiRequestQueryBody<any, UserReportRequestBody>,
+  res: NextApiResponse,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+
+  const {
+    user: { id: userId },
+  } = req.auth;
+
+  if (req.method === 'GET') {
+    const data = await getUserReports(userId);
+
+    return ok(res, data);
+  }
+
+  if (req.method === 'POST') {
+    const data = await createUserReport({
+      id: uuid(),
+      userId,
+      ...req.body,
+    });
+
+    return ok(res, data);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/queries/admin/user.ts b/queries/admin/user.ts
index a81a76ef..b7f452c7 100644
--- a/queries/admin/user.ts
+++ b/queries/admin/user.ts
@@ -210,6 +210,20 @@ export async function deleteUser(
           },
         },
       }),
+      client.userReport.deleteMany({
+        where: {
+          OR: [
+            {
+              websiteId: {
+                in: websiteIds,
+              },
+            },
+            {
+              userId,
+            },
+          ],
+        },
+      }),
       cloudMode
         ? client.website.updateMany({
             data: {
diff --git a/queries/admin/userReport.ts b/queries/admin/userReport.ts
new file mode 100644
index 00000000..d31b512e
--- /dev/null
+++ b/queries/admin/userReport.ts
@@ -0,0 +1,37 @@
+import { Prisma, UserReport } from '@prisma/client';
+import prisma from 'lib/prisma';
+
+export async function createUserReport(
+  data: Prisma.UserReportUncheckedCreateInput,
+): Promise<UserReport> {
+  return prisma.client.userReport.create({ data });
+}
+
+export async function getUserReportById(userReportId: string): Promise<UserReport> {
+  return prisma.client.userReport.findUnique({
+    where: {
+      id: userReportId,
+    },
+  });
+}
+
+export async function getUserReports(userId: string): Promise<UserReport[]> {
+  return prisma.client.userReport.findMany({
+    where: {
+      userId,
+    },
+  });
+}
+
+export async function updateUserReport(
+  data: Prisma.UserReportUpdateInput,
+  where: Prisma.UserReportWhereUniqueInput,
+): Promise<UserReport> {
+  return prisma.client.userReport.update({ data, where });
+}
+
+export async function deleteUserReport(
+  where: Prisma.UserReportWhereUniqueInput,
+): Promise<UserReport> {
+  return prisma.client.userReport.delete({ where });
+}
diff --git a/queries/admin/website.ts b/queries/admin/website.ts
index f5ce5739..e6d53fce 100644
--- a/queries/admin/website.ts
+++ b/queries/admin/website.ts
@@ -92,6 +92,11 @@ export async function deleteWebsite(
         websiteId,
       },
     }),
+    client.userReport.deleteMany({
+      where: {
+        websiteId,
+      },
+    }),
     cloudMode
       ? prisma.client.website.update({
           data: {
diff --git a/queries/index.js b/queries/index.js
index 5c295fff..e565df25 100644
--- a/queries/index.js
+++ b/queries/index.js
@@ -1,6 +1,7 @@
 export * from './admin/team';
 export * from './admin/teamUser';
 export * from './admin/user';
+export * from './admin/userReport';
 export * from './admin/website';
 export * from './analytics/event/getEventMetrics';
 export * from './analytics/event/getEventUsage';

From 0fb93ff00b545fabdbd80aa79eec48c902cc5d97 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Sat, 20 May 2023 09:02:08 -0700
Subject: [PATCH 44/88] Report updates.

---
 assets/add-user.svg                           |   2 +-
 assets/clock.svg                              |   2 +-
 assets/dashboard.svg                          |   2 +-
 assets/funnel.svg                             |   2 +-
 assets/lightbulb.svg                          |  81 +---------
 assets/lock.svg                               |   2 +-
 assets/logo.svg                               |   2 +-
 assets/nodes.svg                              |   2 +-
 assets/profile.svg                            |   2 +-
 assets/user.svg                               |   2 +-
 assets/users.svg                              |   2 +-
 assets/website.svg                            |   2 +-
 components/input/LanguageButton.js            |   3 +-
 components/layout/NavBar.js                   |   3 +-
 components/layout/PageHeader.js               |   5 +-
 components/messages.js                        |   5 +-
 components/pages/reports/EventDataReport.js   |  33 ----
 components/pages/reports/Report.js            |  11 +-
 components/pages/reports/ReportBody.js        |   7 +
 components/pages/reports/ReportForm.js        |  28 ----
 .../pages/reports/ReportForm.module.css       |  19 ---
 components/pages/reports/ReportHeader.js      |  53 ++++--
 .../reports/{ReportsList.js => ReportList.js} |  10 +-
 ...sList.module.css => ReportList.module.css} |   0
 components/pages/reports/ReportMenu.js        |   7 +
 .../reports/event-data/EventDataReport.js     |  30 ++++
 components/pages/reports/funnel/FunnelForm.js | 118 --------------
 .../reports/funnel/FunnelForm.module.css      |  13 --
 components/pages/reports/funnel/FunnelPage.js |  36 -----
 .../pages/reports/funnel/FunnelParameters.js  |  67 ++++++++
 .../funnel/FunnelParameters.module.css        |   7 +
 .../pages/reports/funnel/FunnelReport.js      |  28 ++++
 ...age.module.css => FunnelReport.module.css} |   0
 components/pages/reports/reports.module.css   |  14 +-
 hooks/index.js                                |   1 +
 hooks/useDateRange.js                         |   4 +-
 hooks/useReport.js                            |  22 +++
 lang/am-ET.json                               | 151 +++++++++++-------
 lang/ar-SA.json                               |   9 ++
 lang/be-BY.json                               |   9 ++
 lang/bn-BD.json                               |   9 ++
 lang/ca-ES.json                               |   9 ++
 lang/cs-CZ.json                               |   9 ++
 lang/da-DK.json                               |   9 ++
 lang/de-CH.json                               |   9 ++
 lang/de-DE.json                               |   9 ++
 lang/el-GR.json                               |   9 ++
 lang/en-GB.json                               |   9 ++
 lang/en-US.json                               |  11 +-
 lang/es-MX.json                               |   9 ++
 lang/fa-IR.json                               |   9 ++
 lang/fi-FI.json                               |   9 ++
 lang/fo-FO.json                               |   9 ++
 lang/fr-FR.json                               |   9 ++
 lang/ga-ES.json                               |   9 ++
 lang/he-IL.json                               |   9 ++
 lang/hi-IN.json                               |   9 ++
 lang/hr-HR.json                               | 151 +++++++++++-------
 lang/hu-HU.json                               |   9 ++
 lang/id-ID.json                               |   9 ++
 lang/it-IT.json                               |   9 ++
 lang/ja-JP.json                               |   9 ++
 lang/km-KH.json                               |   9 ++
 lang/ko-KR.json                               |   9 ++
 lang/lt-LT.json                               |   9 ++
 lang/mn-MN.json                               |   9 ++
 lang/ms-MY.json                               |   9 ++
 lang/nb-NO.json                               |   9 ++
 lang/nl-NL.json                               |   9 ++
 lang/pl-PL.json                               |   9 ++
 lang/pt-BR.json                               |   9 ++
 lang/pt-PT.json                               |   9 ++
 lang/ro-RO.json                               |   9 ++
 lang/ru-RU.json                               |   9 ++
 lang/si-LK.json                               | 151 +++++++++++-------
 lang/sk-SK.json                               |   9 ++
 lang/sl-SI.json                               |   9 ++
 lang/sv-SE.json                               |   9 ++
 lang/ta-IN.json                               |   9 ++
 lang/th-TH.json                               |   9 ++
 lang/tr-TR.json                               |   9 ++
 lang/uk-UA.json                               |   9 ++
 lang/ur-PK.json                               |   9 ++
 lang/vi-VN.json                               |   9 ++
 lang/zh-CN.json                               |   9 ++
 lang/zh-TW.json                               |   9 ++
 package.json                                  |   2 +-
 pages/api/websites/[id]/data.ts               |  13 --
 pages/api/websites/[id]/eventData.ts          |   2 +-
 pages/reports/event-data.js                   |  13 ++
 pages/reports/event-data/index.js             |   5 -
 pages/reports/funnel.js                       |   6 +-
 pages/reports/index.js                        |   4 +-
 public/intl/messages/ar-SA.json               |   2 +-
 public/intl/messages/be-BY.json               |   2 +-
 public/intl/messages/bn-BD.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-MX.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/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/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/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 +-
 rollup.tracker.config.js                      |   2 +-
 store/app.js                                  |   2 +-
 store/dashboard.js                            |   2 +-
 store/queries.js                              |   2 +-
 store/reports.js                              |  61 +++++++
 store/version.js                              |   2 +-
 store/websites.js                             |   2 +-
 yarn.lock                                     |  17 +-
 147 files changed, 1095 insertions(+), 628 deletions(-)
 delete mode 100644 components/pages/reports/EventDataReport.js
 create mode 100644 components/pages/reports/ReportBody.js
 delete mode 100644 components/pages/reports/ReportForm.js
 delete mode 100644 components/pages/reports/ReportForm.module.css
 rename components/pages/reports/{ReportsList.js => ReportList.js} (85%)
 rename components/pages/reports/{ReportsList.module.css => ReportList.module.css} (100%)
 create mode 100644 components/pages/reports/ReportMenu.js
 create mode 100644 components/pages/reports/event-data/EventDataReport.js
 delete mode 100644 components/pages/reports/funnel/FunnelForm.js
 delete mode 100644 components/pages/reports/funnel/FunnelForm.module.css
 delete mode 100644 components/pages/reports/funnel/FunnelPage.js
 create mode 100644 components/pages/reports/funnel/FunnelParameters.js
 create mode 100644 components/pages/reports/funnel/FunnelParameters.module.css
 create mode 100644 components/pages/reports/funnel/FunnelReport.js
 rename components/pages/reports/funnel/{FunnelPage.module.css => FunnelReport.module.css} (100%)
 create mode 100644 hooks/useReport.js
 delete mode 100644 pages/api/websites/[id]/data.ts
 create mode 100644 pages/reports/event-data.js
 delete mode 100644 pages/reports/event-data/index.js
 create mode 100644 store/reports.js

diff --git a/assets/add-user.svg b/assets/add-user.svg
index 9d0544c6..c6b4f484 100644
--- a/assets/add-user.svg
+++ b/assets/add-user.svg
@@ -1 +1 @@
-<svg id="Layer_2" height="512" viewBox="0 0 30 30" width="512" xmlns="http://www.w3.org/2000/svg" data-name="Layer 2"><g fill="rgb(0,0,0)"><path d="m15 14a5.5 5.5 0 1 1 5.5-5.5 5.51 5.51 0 0 1 -5.5 5.5zm0-9a3.5 3.5 0 1 0 3.5 3.5 3.5 3.5 0 0 0 -3.5-3.5z"/><path d="m7.5 24.5a1 1 0 0 1 -1-1 8.5 8.5 0 0 1 13.6-6.8 1 1 0 1 1 -1.2 1.6 6.44 6.44 0 0 0 -3.9-1.3 6.51 6.51 0 0 0 -6.5 6.5 1 1 0 0 1 -1 1z"/><path d="m23 27a1 1 0 0 1 -1-1v-6a1 1 0 0 1 2 0v6a1 1 0 0 1 -1 1z"/><path d="m26 24h-6a1 1 0 0 1 0-2h6a1 1 0 0 1 0 2z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" data-name="Layer 2" viewBox="0 0 30 30"><path d="M15 14a5.5 5.5 0 1 1 5.5-5.5A5.51 5.51 0 0 1 15 14zm0-9a3.5 3.5 0 1 0 3.5 3.5A3.5 3.5 0 0 0 15 5zM7.5 24.5a1 1 0 0 1-1-1 8.5 8.5 0 0 1 13.6-6.8 1 1 0 1 1-1.2 1.6A6.44 6.44 0 0 0 15 17a6.51 6.51 0 0 0-6.5 6.5 1 1 0 0 1-1 1zM23 27a1 1 0 0 1-1-1v-6a1 1 0 0 1 2 0v6a1 1 0 0 1-1 1z"/><path d="M26 24h-6a1 1 0 0 1 0-2h6a1 1 0 0 1 0 2z"/></svg>
\ No newline at end of file
diff --git a/assets/clock.svg b/assets/clock.svg
index 9c2a9a41..ab4c1dec 100644
--- a/assets/clock.svg
+++ b/assets/clock.svg
@@ -1 +1 @@
-<svg height="512" viewBox="0 0 24 24" width="512" xmlns="http://www.w3.org/2000/svg"><g clip-rule="evenodd"><path d="M12 4a8 8 0 1 0 0 16 8 8 0 0 0 0-16zM2 12C2 6.477 6.477 2 12 2s10 4.477 10 10-4.477 10-10 10S2 17.523 2 12z"/><path d="M11.168 11.445a1 1 0 0 1 1.387-.277l3 2a1 1 0 0 1-1.11 1.664l-3-2a1 1 0 0 1-.277-1.387z"/><path d="M12 6a1 1 0 0 1 1 1v5a1 1 0 1 1-2 0V7a1 1 0 0 1 1-1z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 24 24"><g clip-rule="evenodd"><path d="M12 4a8 8 0 1 0 0 16 8 8 0 0 0 0-16zM2 12C2 6.477 6.477 2 12 2s10 4.477 10 10-4.477 10-10 10S2 17.523 2 12z"/><path d="M11.168 11.445a1 1 0 0 1 1.387-.277l3 2a1 1 0 0 1-1.11 1.664l-3-2a1 1 0 0 1-.277-1.387z"/><path d="M12 6a1 1 0 0 1 1 1v5a1 1 0 1 1-2 0V7a1 1 0 0 1 1-1z"/></g></svg>
\ No newline at end of file
diff --git a/assets/dashboard.svg b/assets/dashboard.svg
index 11859d28..2090e5dc 100644
--- a/assets/dashboard.svg
+++ b/assets/dashboard.svg
@@ -1 +1 @@
-<svg height="512pt" viewBox="0 0 512 512" width="512pt" xmlns="http://www.w3.org/2000/svg"><path d="M197.332 170.668h-160C16.746 170.668 0 153.922 0 133.332v-96C0 16.746 16.746 0 37.332 0h160c20.59 0 37.336 16.746 37.336 37.332v96c0 20.59-16.746 37.336-37.336 37.336zM37.332 32A5.336 5.336 0 0 0 32 37.332v96a5.337 5.337 0 0 0 5.332 5.336h160a5.338 5.338 0 0 0 5.336-5.336v-96A5.337 5.337 0 0 0 197.332 32zM197.332 512h-160C16.746 512 0 495.254 0 474.668v-224c0-20.59 16.746-37.336 37.332-37.336h160c20.59 0 37.336 16.746 37.336 37.336v224c0 20.586-16.746 37.332-37.336 37.332zm-160-266.668A5.337 5.337 0 0 0 32 250.668v224A5.336 5.336 0 0 0 37.332 480h160a5.337 5.337 0 0 0 5.336-5.332v-224a5.338 5.338 0 0 0-5.336-5.336zM474.668 512h-160c-20.59 0-37.336-16.746-37.336-37.332v-96c0-20.59 16.746-37.336 37.336-37.336h160c20.586 0 37.332 16.746 37.332 37.336v96C512 495.254 495.254 512 474.668 512zm-160-138.668a5.338 5.338 0 0 0-5.336 5.336v96a5.337 5.337 0 0 0 5.336 5.332h160a5.336 5.336 0 0 0 5.332-5.332v-96a5.337 5.337 0 0 0-5.332-5.336zM474.668 298.668h-160c-20.59 0-37.336-16.746-37.336-37.336v-224C277.332 16.746 294.078 0 314.668 0h160C495.254 0 512 16.746 512 37.332v224c0 20.59-16.746 37.336-37.332 37.336zM314.668 32a5.337 5.337 0 0 0-5.336 5.332v224a5.338 5.338 0 0 0 5.336 5.336h160a5.337 5.337 0 0 0 5.332-5.336v-224A5.336 5.336 0 0 0 474.668 32zm0 0"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="512pt" height="512pt" viewBox="0 0 512 512"><path d="M197.332 170.668h-160C16.746 170.668 0 153.922 0 133.332v-96C0 16.746 16.746 0 37.332 0h160c20.59 0 37.336 16.746 37.336 37.332v96c0 20.59-16.746 37.336-37.336 37.336zM37.332 32A5.336 5.336 0 0 0 32 37.332v96a5.337 5.337 0 0 0 5.332 5.336h160a5.338 5.338 0 0 0 5.336-5.336v-96A5.337 5.337 0 0 0 197.332 32zm160 480h-160C16.746 512 0 495.254 0 474.668v-224c0-20.59 16.746-37.336 37.332-37.336h160c20.59 0 37.336 16.746 37.336 37.336v224c0 20.586-16.746 37.332-37.336 37.332zm-160-266.668A5.337 5.337 0 0 0 32 250.668v224A5.336 5.336 0 0 0 37.332 480h160a5.337 5.337 0 0 0 5.336-5.332v-224a5.338 5.338 0 0 0-5.336-5.336zM474.668 512h-160c-20.59 0-37.336-16.746-37.336-37.332v-96c0-20.59 16.746-37.336 37.336-37.336h160c20.586 0 37.332 16.746 37.332 37.336v96C512 495.254 495.254 512 474.668 512zm-160-138.668a5.338 5.338 0 0 0-5.336 5.336v96a5.337 5.337 0 0 0 5.336 5.332h160a5.336 5.336 0 0 0 5.332-5.332v-96a5.337 5.337 0 0 0-5.332-5.336zm160-74.664h-160c-20.59 0-37.336-16.746-37.336-37.336v-224C277.332 16.746 294.078 0 314.668 0h160C495.254 0 512 16.746 512 37.332v224c0 20.59-16.746 37.336-37.332 37.336zM314.668 32a5.337 5.337 0 0 0-5.336 5.332v224a5.338 5.338 0 0 0 5.336 5.336h160a5.337 5.337 0 0 0 5.332-5.336v-224A5.336 5.336 0 0 0 474.668 32zm0 0"/></svg>
\ No newline at end of file
diff --git a/assets/funnel.svg b/assets/funnel.svg
index 46f4623f..63fb7158 100644
--- a/assets/funnel.svg
+++ b/assets/funnel.svg
@@ -1 +1 @@
-<svg enable-background="new 0 0 32 32" height="512" viewBox="0 0 32 32" width="512" xmlns="http://www.w3.org/2000/svg"><g id="_x31_6"><path d="m29 11h-26c-.5522 0-1-.4473-1-1v-6c0-.5527.4478-1 1-1h26c.5522 0 1 .4473 1 1v6c0 .5527-.4478 1-1 1zm-25-2h24v-4h-24z"/><path d="m25 17h-18c-.5522 0-1-.4473-1-1v-6c0-.5527.4478-1 1-1h18c.5522 0 1 .4473 1 1v6c0 .5527-.4478 1-1 1zm-17-2h16v-4h-16z"/><path d="m22 23h-12c-.5522 0-1-.4473-1-1v-6c0-.5527.4478-1 1-1h12c.5522 0 1 .4473 1 1v6c0 .5527-.4478 1-1 1zm-11-2h10v-4h-10z"/><path d="m19 29h-6c-.5522 0-1-.4473-1-1v-6c0-.5527.4478-1 1-1h6c.5522 0 1 .4473 1 1v6c0 .5527-.4478 1-1 1zm-5-2h4v-4h-4z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 32 32"><path d="M29 11H3a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1h26a1 1 0 0 1 1 1v6a1 1 0 0 1-1 1zM4 9h24V5H4z"/><path d="M25 17H7a1 1 0 0 1-1-1v-6a1 1 0 0 1 1-1h18a1 1 0 0 1 1 1v6a1 1 0 0 1-1 1zM8 15h16v-4H8z"/><path d="M22 23H10a1 1 0 0 1-1-1v-6a1 1 0 0 1 1-1h12a1 1 0 0 1 1 1v6a1 1 0 0 1-1 1zm-11-2h10v-4H11z"/><path d="M19 29h-6a1 1 0 0 1-1-1v-6a1 1 0 0 1 1-1h6a1 1 0 0 1 1 1v6a1 1 0 0 1-1 1zm-5-2h4v-4h-4z"/></svg>
\ No newline at end of file
diff --git a/assets/lightbulb.svg b/assets/lightbulb.svg
index 73b699a3..c7895a7d 100644
--- a/assets/lightbulb.svg
+++ b/assets/lightbulb.svg
@@ -1,80 +1 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<g>
-	<g>
-		<path d="M223.718,124.76c-48.027,11.198-86.688,49.285-98.494,97.031c-11.843,47.899,1.711,96.722,36.259,130.601
-			C173.703,364.377,181,383.586,181,403.777V407c0,13.296,5.801,25.26,15,33.505V467c0,24.813,20.187,45,45,45h30
-			c24.813,0,45-20.187,45-45v-26.495c9.199-8.245,15-20.208,15-33.505v-3.282c0-19.884,7.687-39.458,20.563-52.361
-			C376.994,325.87,391,292.005,391,256C391,169.921,311.231,104.362,223.718,124.76z M286,467c0,8.271-6.729,15-15,15h-30
-			c-8.271,0-15-6.729-15-15v-15h60V467z M330.326,330.166C311.689,348.843,301,375.651,301,403.718V407c0,8.271-6.729,15-15,15h-60
-			c-8.271,0-15-6.729-15-15v-3.223c0-28.499-10.393-55.035-28.513-72.804c-26.89-26.37-37.409-64.493-28.141-101.981
-			c9.125-36.907,39.029-66.353,76.184-75.015C299.202,137.964,361,189.228,361,256C361,284.004,350.106,310.343,330.326,330.166z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M139.327,118.114L96.9,75.688c-5.857-5.858-15.355-5.858-21.213,0c-5.858,5.858-5.858,15.355,0,21.213l42.427,42.426
-			c5.857,5.858,15.356,5.858,21.213,0C145.185,133.469,145.185,123.972,139.327,118.114z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M76,241H15c-8.284,0-15,6.716-15,15s6.716,15,15,15h61c8.284,0,15-6.716,15-15S84.284,241,76,241z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M497,241h-61c-8.284,0-15,6.716-15,15s6.716,15,15,15h61c8.284,0,15-6.716,15-15S505.284,241,497,241z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M436.313,75.688c-5.856-5.858-15.354-5.858-21.213,0l-42.427,42.426c-5.858,5.857-5.858,15.355,0,21.213
-			c5.857,5.858,15.355,5.858,21.213,0l42.427-42.426C442.171,91.044,442.171,81.546,436.313,75.688z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M256,0c-8.284,0-15,6.716-15,15v61c0,8.284,6.716,15,15,15s15-6.716,15-15V15C271,6.716,264.284,0,256,0z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M256,181c-6.166,0-12.447,0.739-18.658,2.194c-25.865,6.037-47.518,27.328-53.879,52.979
-			c-1.994,8.041,2.907,16.175,10.947,18.17c8.042,1.994,16.176-2.909,18.17-10.948c3.661-14.758,16.647-27.5,31.593-30.989
-			C248.155,211.473,252.135,211,256,211c8.284,0,15-6.716,15-15S264.284,181,256,181z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="enable-background:new 0 0 512 512" viewBox="0 0 512 512"><path d="M223.718 124.76c-48.027 11.198-86.688 49.285-98.494 97.031-11.843 47.899 1.711 96.722 36.259 130.601C173.703 364.377 181 383.586 181 403.777V407c0 13.296 5.801 25.26 15 33.505V467c0 24.813 20.187 45 45 45h30c24.813 0 45-20.187 45-45v-26.495c9.199-8.245 15-20.208 15-33.505v-3.282c0-19.884 7.687-39.458 20.563-52.361C376.994 325.87 391 292.005 391 256c0-86.079-79.769-151.638-167.282-131.24zM286 467c0 8.271-6.729 15-15 15h-30c-8.271 0-15-6.729-15-15v-15h60v15zm44.326-136.834C311.689 348.843 301 375.651 301 403.718V407c0 8.271-6.729 15-15 15h-60c-8.271 0-15-6.729-15-15v-3.223c0-28.499-10.393-55.035-28.513-72.804-26.89-26.37-37.409-64.493-28.141-101.981 9.125-36.907 39.029-66.353 76.184-75.015C299.202 137.964 361 189.228 361 256c0 28.004-10.894 54.343-30.674 74.166zM139.327 118.114 96.9 75.688c-5.857-5.858-15.355-5.858-21.213 0-5.858 5.858-5.858 15.355 0 21.213l42.427 42.426c5.857 5.858 15.356 5.858 21.213 0 5.858-5.858 5.858-15.355 0-21.213zM76 241H15c-8.284 0-15 6.716-15 15s6.716 15 15 15h61c8.284 0 15-6.716 15-15s-6.716-15-15-15zM497 241h-61c-8.284 0-15 6.716-15 15s6.716 15 15 15h61c8.284 0 15-6.716 15-15s-6.716-15-15-15zM436.313 75.688c-5.856-5.858-15.354-5.858-21.213 0l-42.427 42.426c-5.858 5.857-5.858 15.355 0 21.213 5.857 5.858 15.355 5.858 21.213 0l42.427-42.426c5.858-5.857 5.858-15.355 0-21.213zM256 0c-8.284 0-15 6.716-15 15v61c0 8.284 6.716 15 15 15s15-6.716 15-15V15c0-8.284-6.716-15-15-15z"/><path d="M256 181c-6.166 0-12.447.739-18.658 2.194-25.865 6.037-47.518 27.328-53.879 52.979-1.994 8.041 2.907 16.175 10.947 18.17 8.042 1.994 16.176-2.909 18.17-10.948 3.661-14.758 16.647-27.5 31.593-30.989 3.982-.933 7.962-1.406 11.827-1.406 8.284 0 15-6.716 15-15s-6.716-15-15-15z"/></svg>
\ No newline at end of file
diff --git a/assets/lock.svg b/assets/lock.svg
index c13fb7c7..27fcc5e1 100644
--- a/assets/lock.svg
+++ b/assets/lock.svg
@@ -1 +1 @@
-<svg height="512" viewBox="0 0 24 24" width="512" xmlns="http://www.w3.org/2000/svg"><path d="M18.75 9H18V6c0-3.309-2.691-6-6-6S6 2.691 6 6v3h-.75A2.253 2.253 0 0 0 3 11.25v10.5C3 22.991 4.01 24 5.25 24h13.5c1.24 0 2.25-1.009 2.25-2.25v-10.5C21 10.009 19.99 9 18.75 9zM8 6c0-2.206 1.794-4 4-4s4 1.794 4 4v3H8zm5 10.722V19a1 1 0 1 1-2 0v-2.278c-.595-.347-1-.985-1-1.722 0-1.103.897-2 2-2s2 .897 2 2c0 .737-.405 1.375-1 1.722z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 24 24"><path d="M18.75 9H18V6c0-3.309-2.691-6-6-6S6 2.691 6 6v3h-.75A2.253 2.253 0 0 0 3 11.25v10.5C3 22.991 4.01 24 5.25 24h13.5c1.24 0 2.25-1.009 2.25-2.25v-10.5C21 10.009 19.99 9 18.75 9zM8 6c0-2.206 1.794-4 4-4s4 1.794 4 4v3H8zm5 10.722V19a1 1 0 1 1-2 0v-2.278c-.595-.347-1-.985-1-1.722 0-1.103.897-2 2-2s2 .897 2 2c0 .737-.405 1.375-1 1.722z"/></svg>
\ No newline at end of file
diff --git a/assets/logo.svg b/assets/logo.svg
index d2c71326..b1395313 100644
--- a/assets/logo.svg
+++ b/assets/logo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 428 389.11" width="20" height="20"><circle cx="214.15" cy="181" r="171" fill="none" stroke="currentColor" 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"/></svg>
\ No newline at end of file
+<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"/><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"/></svg>
\ No newline at end of file
diff --git a/assets/nodes.svg b/assets/nodes.svg
index 0bbd37c4..b3e22a75 100644
--- a/assets/nodes.svg
+++ b/assets/nodes.svg
@@ -1 +1 @@
-<svg fill="none" height="512" viewBox="0 0 24 24" width="512" xmlns="http://www.w3.org/2000/svg"><path clip-rule="evenodd" d="m19 9.87398c1.7252-.44404 3-2.01014 3-3.87398 0-2.20914-1.7909-4-4-4-1.8638 0-3.4299 1.27477-3.874 3h-4.25202c-.44404-1.72523-2.01014-3-3.87398-3-2.20914 0-4 1.79086-4 4 0 1.86384 1.27477 3.42994 3 3.87398v4.25202c-1.72523.4441-3 2.0102-3 3.874 0 2.2091 1.79086 4 4 4 1.86384 0 3.42994-1.2748 3.87398-3h4.25202c.4441 1.7252 2.0102 3 3.874 3 2.2091 0 4-1.7909 4-4 0-1.8638-1.2748-3.4299-3-3.874zm-13-5.87398c1.10457 0 2 .89543 2 2 0 1.1043-.895 1.99957-1.99919 2-1.10457 0-2.00081-.89543-2.00081-2s.89543-2 2-2zm3.87398 3c-.36178 1.40561-1.46837 2.5122-2.87398 2.87398v4.25202c1.40561.3618 2.5122 1.4684 2.87398 2.874h4.25202c.3618-1.4056 1.4684-2.5122 2.874-2.874v-4.25202c-1.4056-.36178-2.5122-1.46837-2.874-2.87398zm8.12602 1c-1.1046 0-2-.89543-2-2s.8954-2 2-2 2 .89543 2 2-.8954 2-2 2zm0 8c-1.1046 0-2 .8954-2 2s.8954 2 2 2 2-.8954 2-2-.8954-2-2-2zm-10 2c0-1.1046-.89543-2-2-2s-2 .8954-2 2 .89543 2 2 2 2-.8954 2-2z" fill="rgb(0,0,0)" fill-rule="evenodd"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M19 9.874A4.002 4.002 0 0 0 18 2a4.002 4.002 0 0 0-3.874 3H9.874A4.002 4.002 0 0 0 2 6a4.002 4.002 0 0 0 3 3.874v4.252A4.002 4.002 0 0 0 6 22a4.002 4.002 0 0 0 3.874-3h4.252A4.002 4.002 0 0 0 22 18a4.002 4.002 0 0 0-3-3.874zM6 4a2 2 0 1 1 0 4 2 2 0 0 1 0-4zm3.874 3A4.007 4.007 0 0 1 7 9.874v4.252A4.007 4.007 0 0 1 9.874 17h4.252A4.007 4.007 0 0 1 17 14.126V9.874A4.007 4.007 0 0 1 14.126 7zM18 8a2 2 0 1 1 0-4 2 2 0 0 1 0 4zm0 8a2 2 0 1 0 0 4 2 2 0 0 0 0-4zM8 18a2 2 0 1 0-4 0 2 2 0 0 0 4 0z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/assets/profile.svg b/assets/profile.svg
index 133b1bc1..6a1af5a0 100644
--- a/assets/profile.svg
+++ b/assets/profile.svg
@@ -1 +1 @@
-<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><path d="M437.02 74.98C388.668 26.63 324.379 0 256 0S123.332 26.629 74.98 74.98C26.63 123.332 0 187.621 0 256s26.629 132.668 74.98 181.02C123.332 485.37 187.621 512 256 512s132.668-26.629 181.02-74.98C485.37 388.668 512 324.379 512 256s-26.629-132.668-74.98-181.02zM111.105 429.297c8.454-72.735 70.989-128.89 144.895-128.89 38.96 0 75.598 15.179 103.156 42.734 23.281 23.285 37.965 53.687 41.742 86.152C361.641 462.172 311.094 482 256 482s-105.637-19.824-144.895-52.703zM256 269.507c-42.871 0-77.754-34.882-77.754-77.753C178.246 148.879 213.13 114 256 114s77.754 34.879 77.754 77.754c0 42.871-34.883 77.754-77.754 77.754zm170.719 134.427a175.9 175.9 0 0 0-46.352-82.004c-18.437-18.438-40.25-32.27-64.039-40.938 28.598-19.394 47.426-52.16 47.426-89.238C363.754 132.34 315.414 84 256 84s-107.754 48.34-107.754 107.754c0 37.098 18.844 69.875 47.465 89.266-21.887 7.976-42.14 20.308-59.566 36.542-25.235 23.5-42.758 53.465-50.883 86.348C50.852 364.242 30 312.512 30 256 30 131.383 131.383 30 256 30s226 101.383 226 226c0 56.523-20.86 108.266-55.281 147.934zm0 0"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M437.02 74.98C388.668 26.63 324.379 0 256 0S123.332 26.629 74.98 74.98C26.63 123.332 0 187.621 0 256s26.629 132.668 74.98 181.02C123.332 485.37 187.621 512 256 512s132.668-26.629 181.02-74.98C485.37 388.668 512 324.379 512 256s-26.629-132.668-74.98-181.02zM111.105 429.297c8.454-72.735 70.989-128.89 144.895-128.89 38.96 0 75.598 15.179 103.156 42.734 23.281 23.285 37.965 53.687 41.742 86.152C361.641 462.172 311.094 482 256 482s-105.637-19.824-144.895-52.703zM256 269.507c-42.871 0-77.754-34.882-77.754-77.753C178.246 148.879 213.13 114 256 114s77.754 34.879 77.754 77.754c0 42.871-34.883 77.754-77.754 77.754zm170.719 134.427a175.9 175.9 0 0 0-46.352-82.004c-18.437-18.438-40.25-32.27-64.039-40.938 28.598-19.394 47.426-52.16 47.426-89.238C363.754 132.34 315.414 84 256 84s-107.754 48.34-107.754 107.754c0 37.098 18.844 69.875 47.465 89.266-21.887 7.976-42.14 20.308-59.566 36.542-25.235 23.5-42.758 53.465-50.883 86.348C50.852 364.242 30 312.512 30 256 30 131.383 131.383 30 256 30s226 101.383 226 226c0 56.523-20.86 108.266-55.281 147.934zm0 0"/></svg>
\ No newline at end of file
diff --git a/assets/user.svg b/assets/user.svg
index a75cbb8d..245a67f6 100644
--- a/assets/user.svg
+++ b/assets/user.svg
@@ -1 +1 @@
-<svg height="512pt" viewBox="-56 0 512 512" width="512pt" xmlns="http://www.w3.org/2000/svg"><path d="M267 236.375c36.254-22.582 60.434-62.797 60.434-108.563C327.434 57.337 270.098 0 199.62 0 129.145 0 71.81 57.336 71.81 127.813c0 45.765 24.18 85.976 60.43 108.558C55.222 264.071 0 337.84 0 424.273v72.243C0 505.066 6.934 512 15.484 512H383.75c8.55 0 15.48-6.934 15.48-15.484v-72.243c0-86.43-55.218-160.195-132.23-187.898zm101.266 244.656H30.969v-56.758c0-92.992 75.652-168.644 168.648-168.644 92.992 0 168.649 75.652 168.649 168.644zm-71.801-353.219c0 53.403-43.442 96.848-96.844 96.848s-96.844-43.445-96.844-96.847c0-53.399 43.442-96.844 96.844-96.844s96.844 43.445 96.844 96.844zm0 0"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="512pt" height="512pt" viewBox="-56 0 512 512"><path d="M267 236.375c36.254-22.582 60.434-62.797 60.434-108.563C327.434 57.337 270.098 0 199.62 0 129.145 0 71.81 57.336 71.81 127.813c0 45.765 24.18 85.976 60.43 108.558C55.222 264.071 0 337.84 0 424.273v72.243C0 505.066 6.934 512 15.484 512H383.75c8.55 0 15.48-6.934 15.48-15.484v-72.243c0-86.43-55.218-160.195-132.23-187.898zm101.266 244.656H30.969v-56.758c0-92.992 75.652-168.644 168.648-168.644 92.992 0 168.649 75.652 168.649 168.644zm-71.801-353.219c0 53.403-43.442 96.848-96.844 96.848s-96.844-43.445-96.844-96.847c0-53.399 43.442-96.844 96.844-96.844s96.844 43.445 96.844 96.844zm0 0"/></svg>
\ No newline at end of file
diff --git a/assets/users.svg b/assets/users.svg
index f775ea91..7036a22c 100644
--- a/assets/users.svg
+++ b/assets/users.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 477.869 477.869" style="enable-background:new 0 0 477.869 477.869" xml:space="preserve"><path d="M387.415 233.496c48.976-44.029 52.987-119.424 8.958-168.4C355.991 20.177 288.4 12.546 239.02 47.332c-53.83-37.99-128.264-25.149-166.254 28.68-34.859 49.393-27.259 117.054 17.689 157.483C34.606 262.935-.251 320.976.002 384.108v51.2c0 9.426 7.641 17.067 17.067 17.067h443.733c9.426 0 17.067-7.641 17.067-17.067v-51.2c.252-63.132-34.605-121.173-90.454-150.612zM307.201 59.842c47.062-.052 85.256 38.057 85.309 85.119.037 33.564-19.631 64.023-50.237 77.799-1.314.597-2.628 1.143-3.959 1.707a83.66 83.66 0 0 1-12.988 4.045c-.853.188-1.707.29-2.577.461a85.366 85.366 0 0 1-15.019 1.519c-2.27 0-4.557-.171-6.827-.375-.853 0-1.707 0-2.56-.171a86.219 86.219 0 0 1-27.904-8.226c-.324-.154-.7-.137-1.024-.273-1.707-.819-3.413-1.536-4.932-2.458.137-.171.222-.358.358-.529a119.721 119.721 0 0 0 18.278-33.297l.529-1.434a120.381 120.381 0 0 0 4.523-17.562c.154-.87.273-1.707.41-2.645.987-6.067 1.506-12.2 1.553-18.347a120.041 120.041 0 0 0-1.553-18.313c-.137-.887-.256-1.707-.41-2.645a120.414 120.414 0 0 0-4.523-17.562l-.529-1.434a119.747 119.747 0 0 0-18.278-33.297c-.137-.171-.222-.358-.358-.529a84.787 84.787 0 0 1 42.718-11.553zM85.335 145.176c-.121-47.006 37.886-85.21 84.892-85.331a85.112 85.112 0 0 1 59.134 23.686c.99.956 1.963 1.911 2.918 2.901a87.748 87.748 0 0 1 8.09 9.813c.751 1.058 1.434 2.185 2.133 3.277a83.951 83.951 0 0 1 6.263 11.52c.427.973.751 1.963 1.126 2.935a83.422 83.422 0 0 1 4.233 13.653c.12.512.154 1.024.256 1.553a80.338 80.338 0 0 1 0 32.119c-.102.529-.137 1.041-.256 1.553a83.228 83.228 0 0 1-4.233 13.653c-.375.973-.7 1.963-1.126 2.935a84.251 84.251 0 0 1-6.263 11.503c-.7 1.092-1.382 2.219-2.133 3.277a87.549 87.549 0 0 1-8.09 9.813c-.956.99-1.929 1.946-2.918 2.901a85.187 85.187 0 0 1-23.569 15.906 49.35 49.35 0 0 1-4.198 1.707 85.839 85.839 0 0 1-12.663 3.925c-1.075.239-2.185.375-3.277.563a84.67 84.67 0 0 1-14.046 1.417h-1.877a84.563 84.563 0 0 1-14.046-1.417c-1.092-.188-2.202-.324-3.277-.563a85.802 85.802 0 0 1-12.663-3.925c-1.417-.563-2.816-1.143-4.198-1.707-30.534-13.786-50.173-44.166-50.212-77.667zm221.866 273.066H34.135v-34.133c-.25-57.833 36.188-109.468 90.76-128.614a119.092 119.092 0 0 0 91.546 0 137.138 137.138 0 0 1 16.623 7.356c3.55 1.826 6.827 3.908 10.24 6.007 2.219 1.382 4.471 2.731 6.605 4.25 3.294 2.338 6.4 4.881 9.455 7.492 1.963 1.707 3.908 3.413 5.751 5.12 2.816 2.662 5.461 5.478 8.004 8.363a134.465 134.465 0 0 1 5.291 6.383 132.594 132.594 0 0 1 6.349 8.823c1.707 2.56 3.226 5.222 4.727 7.885 1.707 2.935 3.277 5.871 4.71 8.926 1.434 3.055 2.697 6.4 3.925 9.66 1.075 2.833 2.219 5.649 3.106 8.533 1.195 3.959 2.031 8.055 2.867 12.151.512 2.423 1.178 4.796 1.553 7.253a141.153 141.153 0 0 1 1.553 20.412v34.133zm136.534 0h-102.4v-34.133c0-5.342-.307-10.633-.785-15.872-.137-1.536-.375-3.055-.546-4.591-.461-3.772-.99-7.509-1.707-11.213a246.936 246.936 0 0 0-.973-4.762c-.819-3.8-1.769-7.566-2.85-11.298-.358-1.229-.683-2.475-1.058-3.686a169.105 169.105 0 0 0-20.565-43.127l-.666-.973a168.958 168.958 0 0 0-9.404-12.646l-.119-.154a154.895 154.895 0 0 0-11.008-12.237h.7a120.8 120.8 0 0 0 14.524 1.024h.939c4.496-.039 8.985-.33 13.449-.87 1.399-.171 2.782-.427 4.181-.649a117.43 117.43 0 0 0 10.752-2.167c1.007-.256 2.031-.495 3.055-.785a116.211 116.211 0 0 0 13.653-4.642c54.612 19.127 91.083 70.785 90.829 128.649v34.132z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="enable-background:new 0 0 477.869 477.869" viewBox="0 0 477.869 477.869"><path d="M387.415 233.496c48.976-44.029 52.987-119.424 8.958-168.4C355.991 20.177 288.4 12.546 239.02 47.332c-53.83-37.99-128.264-25.149-166.254 28.68-34.859 49.393-27.259 117.054 17.689 157.483C34.606 262.935-.251 320.976.002 384.108v51.2c0 9.426 7.641 17.067 17.067 17.067h443.733c9.426 0 17.067-7.641 17.067-17.067v-51.2c.252-63.132-34.605-121.173-90.454-150.612zM307.201 59.842c47.062-.052 85.256 38.057 85.309 85.119.037 33.564-19.631 64.023-50.237 77.799-1.314.597-2.628 1.143-3.959 1.707a83.66 83.66 0 0 1-12.988 4.045c-.853.188-1.707.29-2.577.461a85.366 85.366 0 0 1-15.019 1.519c-2.27 0-4.557-.171-6.827-.375-.853 0-1.707 0-2.56-.171a86.219 86.219 0 0 1-27.904-8.226c-.324-.154-.7-.137-1.024-.273-1.707-.819-3.413-1.536-4.932-2.458.137-.171.222-.358.358-.529a119.721 119.721 0 0 0 18.278-33.297l.529-1.434a120.381 120.381 0 0 0 4.523-17.562c.154-.87.273-1.707.41-2.645.987-6.067 1.506-12.2 1.553-18.347a120.041 120.041 0 0 0-1.553-18.313c-.137-.887-.256-1.707-.41-2.645a120.414 120.414 0 0 0-4.523-17.562l-.529-1.434a119.747 119.747 0 0 0-18.278-33.297c-.137-.171-.222-.358-.358-.529a84.787 84.787 0 0 1 42.718-11.553zM85.335 145.176c-.121-47.006 37.886-85.21 84.892-85.331a85.112 85.112 0 0 1 59.134 23.686c.99.956 1.963 1.911 2.918 2.901a87.748 87.748 0 0 1 8.09 9.813c.751 1.058 1.434 2.185 2.133 3.277a83.951 83.951 0 0 1 6.263 11.52c.427.973.751 1.963 1.126 2.935a83.422 83.422 0 0 1 4.233 13.653c.12.512.154 1.024.256 1.553a80.338 80.338 0 0 1 0 32.119c-.102.529-.137 1.041-.256 1.553a83.228 83.228 0 0 1-4.233 13.653c-.375.973-.7 1.963-1.126 2.935a84.251 84.251 0 0 1-6.263 11.503c-.7 1.092-1.382 2.219-2.133 3.277a87.549 87.549 0 0 1-8.09 9.813c-.956.99-1.929 1.946-2.918 2.901a85.187 85.187 0 0 1-23.569 15.906 49.35 49.35 0 0 1-4.198 1.707 85.839 85.839 0 0 1-12.663 3.925c-1.075.239-2.185.375-3.277.563a84.67 84.67 0 0 1-14.046 1.417h-1.877a84.563 84.563 0 0 1-14.046-1.417c-1.092-.188-2.202-.324-3.277-.563a85.802 85.802 0 0 1-12.663-3.925c-1.417-.563-2.816-1.143-4.198-1.707-30.534-13.786-50.173-44.166-50.212-77.667zm221.866 273.066H34.135v-34.133c-.25-57.833 36.188-109.468 90.76-128.614a119.092 119.092 0 0 0 91.546 0 137.138 137.138 0 0 1 16.623 7.356c3.55 1.826 6.827 3.908 10.24 6.007 2.219 1.382 4.471 2.731 6.605 4.25 3.294 2.338 6.4 4.881 9.455 7.492 1.963 1.707 3.908 3.413 5.751 5.12 2.816 2.662 5.461 5.478 8.004 8.363a134.465 134.465 0 0 1 5.291 6.383 132.594 132.594 0 0 1 6.349 8.823c1.707 2.56 3.226 5.222 4.727 7.885 1.707 2.935 3.277 5.871 4.71 8.926 1.434 3.055 2.697 6.4 3.925 9.66 1.075 2.833 2.219 5.649 3.106 8.533 1.195 3.959 2.031 8.055 2.867 12.151.512 2.423 1.178 4.796 1.553 7.253a141.153 141.153 0 0 1 1.553 20.412v34.133zm136.534 0h-102.4v-34.133c0-5.342-.307-10.633-.785-15.872-.137-1.536-.375-3.055-.546-4.591-.461-3.772-.99-7.509-1.707-11.213a246.936 246.936 0 0 0-.973-4.762c-.819-3.8-1.769-7.566-2.85-11.298-.358-1.229-.683-2.475-1.058-3.686a169.105 169.105 0 0 0-20.565-43.127l-.666-.973a168.958 168.958 0 0 0-9.404-12.646l-.119-.154a154.895 154.895 0 0 0-11.008-12.237h.7a120.8 120.8 0 0 0 14.524 1.024h.939c4.496-.039 8.985-.33 13.449-.87 1.399-.171 2.782-.427 4.181-.649a117.43 117.43 0 0 0 10.752-2.167c1.007-.256 2.031-.495 3.055-.785a116.211 116.211 0 0 0 13.653-4.642c54.612 19.127 91.083 70.785 90.829 128.649v34.132z"/></svg>
\ No newline at end of file
diff --git a/assets/website.svg b/assets/website.svg
index cfa9e565..6096a650 100644
--- a/assets/website.svg
+++ b/assets/website.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 511.999 511.999" style="enable-background:new 0 0 511.999 511.999" xml:space="preserve"><path d="M437.019 74.981C388.667 26.628 324.38 0 256 0 187.62 0 123.332 26.628 74.981 74.98 26.628 123.332 0 187.62 0 256s26.628 132.667 74.981 181.019c48.351 48.352 112.639 74.98 181.019 74.98 68.381 0 132.667-26.628 181.02-74.981C485.371 388.667 512 324.379 512 255.999s-26.629-132.667-74.981-181.018zM96.216 96.216c22.511-22.511 48.938-39.681 77.742-50.888-7.672 9.578-14.851 20.587-21.43 32.969-7.641 14.38-14.234 30.173-19.725 47.042-19.022-3.157-36.647-7.039-52.393-11.595a230.423 230.423 0 0 1 15.806-17.528zm-33.987 43.369c18.417 5.897 39.479 10.87 62.461 14.809-6.4 27.166-10.167 56.399-11.066 86.591H30.536c2.36-36.233 13.242-70.813 31.693-101.4zm-1.635 230.053c-17.455-29.899-27.769-63.481-30.059-98.623h83.146c.982 29.329 4.674 57.731 10.858 84.186-23.454 3.802-45.045 8.649-63.945 14.437zm35.622 46.146a229.917 229.917 0 0 1-17.831-20.055c16.323-4.526 34.571-8.359 54.214-11.433 5.53 17.103 12.194 33.105 19.928 47.662 7.17 13.493 15.053 25.349 23.51 35.505-29.61-11.183-56.769-28.629-79.821-51.679zm144.768 62.331c-22.808-6.389-44.384-27.217-61.936-60.249-6.139-11.552-11.531-24.155-16.15-37.587 24.73-2.722 51.045-4.331 78.086-4.709v102.545zm0-132.578c-29.988.409-59.217 2.292-86.59 5.507-6.038-24.961-9.671-51.978-10.668-80.028h97.259v74.521zm0-104.553h-97.315c.911-28.834 4.602-56.605 10.828-82.201 27.198 3.4 56.366 5.468 86.487 6.06v76.141zm0-106.176c-27.146-.547-53.403-2.317-77.958-5.205 4.591-13.292 9.941-25.768 16.022-37.215 17.551-33.032 39.128-53.86 61.936-60.249v102.669zm209.733 6.372c17.874 30.193 28.427 64.199 30.749 99.804h-83.088c-.889-29.844-4.584-58.749-10.85-85.647 23.133-3.736 44.456-8.489 63.189-14.157zm-34.934-44.964a230.122 230.122 0 0 1 16.914 18.91c-16.073 4.389-33.972 8.114-53.204 11.112-5.548-17.208-12.243-33.305-20.02-47.941-6.579-12.382-13.758-23.391-21.43-32.969 28.802 11.207 55.23 28.377 77.74 50.888zm-144.767 174.8h97.259c-1.004 28.268-4.686 55.49-10.81 80.612-27.194-3.381-56.349-5.43-86.449-6.006v-74.606zm0-30.032v-76.041c30.005-.394 59.257-2.261 86.656-5.464 6.125 25.403 9.756 52.932 10.659 81.505h-97.315zm-.002-208.845h.001c22.808 6.389 44.384 27.217 61.936 60.249 6.178 11.627 11.601 24.318 16.24 37.848-24.763 2.712-51.108 4.309-78.177 4.674V32.139zm.002 445.976V375.657c27.12.532 53.357 2.286 77.903 5.156-4.579 13.232-9.911 25.654-15.967 37.053-17.552 33.032-39.128 53.86-61.936 60.249zm144.767-62.331c-23.051 23.051-50.21 40.496-79.821 51.678 8.457-10.156 16.34-22.011 23.51-35.504 7.62-14.341 14.198-30.088 19.68-46.906 19.465 3.213 37.473 7.186 53.515 11.859a230.268 230.268 0 0 1-16.884 18.873zm34.823-44.775c-18.635-5.991-40-11.032-63.326-15.01 6.296-26.68 10.048-55.36 11.041-84.983h83.146c-2.328 35.678-12.918 69.753-30.861 99.993z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="enable-background:new 0 0 511.999 511.999" viewBox="0 0 511.999 511.999"><path d="M437.019 74.981C388.667 26.628 324.38 0 256 0 187.62 0 123.332 26.628 74.981 74.98 26.628 123.332 0 187.62 0 256s26.628 132.667 74.981 181.019c48.351 48.352 112.639 74.98 181.019 74.98 68.381 0 132.667-26.628 181.02-74.981C485.371 388.667 512 324.379 512 255.999s-26.629-132.667-74.981-181.018zM96.216 96.216c22.511-22.511 48.938-39.681 77.742-50.888-7.672 9.578-14.851 20.587-21.43 32.969-7.641 14.38-14.234 30.173-19.725 47.042-19.022-3.157-36.647-7.039-52.393-11.595a230.423 230.423 0 0 1 15.806-17.528zm-33.987 43.369c18.417 5.897 39.479 10.87 62.461 14.809-6.4 27.166-10.167 56.399-11.066 86.591H30.536c2.36-36.233 13.242-70.813 31.693-101.4zm-1.635 230.053c-17.455-29.899-27.769-63.481-30.059-98.623h83.146c.982 29.329 4.674 57.731 10.858 84.186-23.454 3.802-45.045 8.649-63.945 14.437zm35.622 46.146a229.917 229.917 0 0 1-17.831-20.055c16.323-4.526 34.571-8.359 54.214-11.433 5.53 17.103 12.194 33.105 19.928 47.662 7.17 13.493 15.053 25.349 23.51 35.505-29.61-11.183-56.769-28.629-79.821-51.679zm144.768 62.331c-22.808-6.389-44.384-27.217-61.936-60.249-6.139-11.552-11.531-24.155-16.15-37.587 24.73-2.722 51.045-4.331 78.086-4.709v102.545zm0-132.578c-29.988.409-59.217 2.292-86.59 5.507-6.038-24.961-9.671-51.978-10.668-80.028h97.259v74.521zm0-104.553h-97.315c.911-28.834 4.602-56.605 10.828-82.201 27.198 3.4 56.366 5.468 86.487 6.06v76.141zm0-106.176c-27.146-.547-53.403-2.317-77.958-5.205 4.591-13.292 9.941-25.768 16.022-37.215 17.551-33.032 39.128-53.86 61.936-60.249v102.669zm209.733 6.372c17.874 30.193 28.427 64.199 30.749 99.804h-83.088c-.889-29.844-4.584-58.749-10.85-85.647 23.133-3.736 44.456-8.489 63.189-14.157zm-34.934-44.964a230.122 230.122 0 0 1 16.914 18.91c-16.073 4.389-33.972 8.114-53.204 11.112-5.548-17.208-12.243-33.305-20.02-47.941-6.579-12.382-13.758-23.391-21.43-32.969 28.802 11.207 55.23 28.377 77.74 50.888zm-144.767 174.8h97.259c-1.004 28.268-4.686 55.49-10.81 80.612-27.194-3.381-56.349-5.43-86.449-6.006v-74.606zm0-30.032v-76.041c30.005-.394 59.257-2.261 86.656-5.464 6.125 25.403 9.756 52.932 10.659 81.505h-97.315zm-.002-208.845h.001c22.808 6.389 44.384 27.217 61.936 60.249 6.178 11.627 11.601 24.318 16.24 37.848-24.763 2.712-51.108 4.309-78.177 4.674V32.139zm.002 445.976V375.657c27.12.532 53.357 2.286 77.903 5.156-4.579 13.232-9.911 25.654-15.967 37.053-17.552 33.032-39.128 53.86-61.936 60.249zm144.767-62.331c-23.051 23.051-50.21 40.496-79.821 51.678 8.457-10.156 16.34-22.011 23.51-35.504 7.62-14.341 14.198-30.088 19.68-46.906 19.465 3.213 37.473 7.186 53.515 11.859a230.268 230.268 0 0 1-16.884 18.873zm34.823-44.775c-18.635-5.991-40-11.032-63.326-15.01 6.296-26.68 10.048-55.36 11.041-84.983h83.146c-2.328 35.678-12.918 69.753-30.861 99.993z"/></svg>
\ No newline at end of file
diff --git a/components/input/LanguageButton.js b/components/input/LanguageButton.js
index 1297d6c2..e2a51223 100644
--- a/components/input/LanguageButton.js
+++ b/components/input/LanguageButton.js
@@ -10,7 +10,8 @@ export function LanguageButton() {
   const items = Object.keys(languages).map(key => ({ ...languages[key], value: key }));
 
   function handleSelect(value) {
-    saveLocale(value);
+    //saveLocale(value);
+    console.log('WTFFFF');
   }
 
   return (
diff --git a/components/layout/NavBar.js b/components/layout/NavBar.js
index 95d27306..a5ac35ef 100644
--- a/components/layout/NavBar.js
+++ b/components/layout/NavBar.js
@@ -18,9 +18,8 @@ export function NavBar() {
 
   const links = [
     { label: formatMessage(labels.dashboard), url: '/dashboard' },
-    { label: formatMessage(labels.reports), url: '/reports' },
     { label: formatMessage(labels.realtime), url: '/realtime' },
-    { label: formatMessage(labels.reports), url: '/reports/funnel' },
+    { label: formatMessage(labels.reports), url: '/reports' },
     !cloudMode && { label: formatMessage(labels.settings), url: '/settings' },
   ].filter(n => n);
 
diff --git a/components/layout/PageHeader.js b/components/layout/PageHeader.js
index bf243c21..c01192d2 100644
--- a/components/layout/PageHeader.js
+++ b/components/layout/PageHeader.js
@@ -1,9 +1,10 @@
+import classNames from 'classnames';
 import React from 'react';
 import styles from './PageHeader.module.css';
 
-export function PageHeader({ title, children }) {
+export function PageHeader({ title, children, className }) {
   return (
-    <div className={styles.header}>
+    <div className={classNames(styles.header, className)}>
       <div className={styles.title}>{title}</div>
       <div className={styles.actions}>{children}</div>
     </div>
diff --git a/components/messages.js b/components/messages.js
index a89a800b..fb0dee3c 100644
--- a/components/messages.js
+++ b/components/messages.js
@@ -80,7 +80,8 @@ export const labels = defineMessages({
   countries: { id: 'label.countries', defaultMessage: 'Countries' },
   languages: { id: 'label.languages', defaultMessage: 'Languages' },
   events: { id: 'label.events', defaultMessage: 'Events' },
-  query: { id: 'label.query-parameters', defaultMessage: 'Query parameters' },
+  query: { id: 'label.query', defaultMessage: 'Query' },
+  queryParameters: { id: 'label.query-parameters', defaultMessage: 'Query parameters' },
   back: { id: 'label.back', defaultMessage: 'Back' },
   visitors: { id: 'label.visitors', defaultMessage: 'Visitors' },
   filterCombined: { id: 'label.filter-combined', defaultMessage: 'Combined' },
@@ -121,6 +122,8 @@ export const labels = defineMessages({
   regions: { id: 'label.regions', defaultMessage: 'Regions' },
   reports: { id: 'label.reports', defaultMessage: 'Reports' },
   eventData: { id: 'label.event-data', defaultMessage: 'Event data' },
+  funnel: { id: 'label.funnel', defaultMessage: 'Funnel' },
+  urls: { id: 'label.urls', defaultMessage: 'URLs' },
 });
 
 export const messages = defineMessages({
diff --git a/components/pages/reports/EventDataReport.js b/components/pages/reports/EventDataReport.js
deleted file mode 100644
index 8c01e25f..00000000
--- a/components/pages/reports/EventDataReport.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import { useState } from 'react';
-import { Form, FormRow, FormInput, TextField } from 'react-basics';
-import AppLayout from 'components/layout/AppLayout';
-import Report from './Report';
-import ReportHeader from './ReportHeader';
-import useMessages from 'hooks/useMessages';
-import Nodes from 'assets/nodes.svg';
-import styles from './reports.module.css';
-
-export default function EventDataReport({ websiteId, data }) {
-  const [values, setValues] = useState({ query: '' });
-  const { formatMessage, labels } = useMessages();
-
-  return (
-    <AppLayout>
-      <Report>
-        <ReportHeader title={formatMessage(labels.eventData)} icon={<Nodes />} />
-        <div className={styles.container}>
-          <div className={styles.menu}>
-            <Form>
-              <FormRow label="Properties">
-                <FormInput name="query">
-                  <TextField value={values.query} />
-                </FormInput>
-              </FormRow>
-            </Form>
-          </div>
-          <div className={styles.content}></div>
-        </div>
-      </Report>
-    </AppLayout>
-  );
-}
diff --git a/components/pages/reports/Report.js b/components/pages/reports/Report.js
index 1754e89f..4e3fcd04 100644
--- a/components/pages/reports/Report.js
+++ b/components/pages/reports/Report.js
@@ -1,5 +1,12 @@
 import Page from 'components/layout/Page';
+import styles from './reports.module.css';
 
-export default function Report({ children, ...props }) {
-  return <Page {...props}>{children}</Page>;
+export function Report({ children, ...props }) {
+  return (
+    <Page {...props} className={styles.container}>
+      {children}
+    </Page>
+  );
 }
+
+export default Report;
diff --git a/components/pages/reports/ReportBody.js b/components/pages/reports/ReportBody.js
new file mode 100644
index 00000000..2310c8af
--- /dev/null
+++ b/components/pages/reports/ReportBody.js
@@ -0,0 +1,7 @@
+import styles from './reports.module.css';
+
+export function ReportBody({ children }) {
+  return <div className={styles.body}>{children}</div>;
+}
+
+export default ReportBody;
diff --git a/components/pages/reports/ReportForm.js b/components/pages/reports/ReportForm.js
deleted file mode 100644
index cdf47eab..00000000
--- a/components/pages/reports/ReportForm.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import useMessages from 'hooks/useMessages';
-import { Form, FormButtons, FormInput, FormRow, SubmitButton, TextField } from 'react-basics';
-
-export function FunnelForm() {
-  const { formatMessage, labels } = useMessages();
-
-  const handleSubmit = () => {};
-
-  return (
-    <>
-      <Form onSubmit={handleSubmit}>
-        <FormRow label={formatMessage(labels.website)}>
-          <FormInput name="name" rules={{ required: formatMessage(labels.required) }}>
-            <TextField />
-          </FormInput>
-        </FormRow>
-
-        <FormButtons>
-          <SubmitButton variant="primary" disabled={false}>
-            Save
-          </SubmitButton>
-        </FormButtons>
-      </Form>
-    </>
-  );
-}
-
-export default FunnelForm;
diff --git a/components/pages/reports/ReportForm.module.css b/components/pages/reports/ReportForm.module.css
deleted file mode 100644
index 4b12238f..00000000
--- a/components/pages/reports/ReportForm.module.css
+++ /dev/null
@@ -1,19 +0,0 @@
-.filter {
-  min-width: 200px;
-}
-
-.hiddenInput {
-  visibility: hidden;
-  min-height: 0px;
-  max-height: 0px;
-}
-
-.hidden {
-  visibility: hidden;
-  min-height: 0px;
-  max-height: 0px;
-}
-
-.urlFormRow label {
-  min-width: 80px;
-}
diff --git a/components/pages/reports/ReportHeader.js b/components/pages/reports/ReportHeader.js
index 44502149..90d58ca8 100644
--- a/components/pages/reports/ReportHeader.js
+++ b/components/pages/reports/ReportHeader.js
@@ -1,32 +1,50 @@
-import { useState } from 'react';
-import { Flexbox, Icon, Text } from 'react-basics';
+import { Flexbox, Icon, LoadingButton, Text, useToast } from 'react-basics';
 import WebsiteSelect from 'components/input/WebsiteSelect';
 import PageHeader from 'components/layout/PageHeader';
 import DateFilter from 'components/input/DateFilter';
 import { parseDateRange } from 'lib/date';
+import { updateReport } from 'store/reports';
+import { useMessages, useApi } from 'hooks';
+import styles from './reports.module.css';
 
-export default function ReportHeader({ title, icon }) {
-  const [websiteId, setWebsiteId] = useState();
-  const [dateRange, setDateRange] = useState({});
-  const { value, startDate, endDate } = dateRange;
+export function ReportHeader({ report, icon }) {
+  const { formatMessage, labels, messages } = useMessages();
+  const { toast, showToast } = useToast();
+  const { post, useMutation } = useApi();
+  const { mutate, isLoading } = useMutation(data => post(`/reports`, data));
 
-  const handleSelect = id => {
-    setWebsiteId(id);
+  const { id, websiteId, name, parameters } = report || {};
+  const { value, startDate, endDate } = parameters?.dateRange || {};
+
+  console.log('REPORT HEADER', report);
+
+  const handleSelect = websiteId => {
+    updateReport(id, { websiteId });
   };
 
-  const handleDateChange = value => setDateRange(parseDateRange(value));
+  const handleDateChange = value => {
+    updateReport(id, { parameters: { dateRange: { ...parseDateRange(value) } } });
+  };
+
+  const handleSave = async () => {
+    mutate(report, {
+      onSuccess: async () => {
+        showToast({ message: formatMessage(messages.saved), variant: 'success' });
+      },
+    });
+  };
 
   const Title = () => {
     return (
       <>
-        <Icon size="xl">{icon}</Icon>
-        <Text>{title}</Text>
+        <Icon size="lg">{icon}</Icon>
+        <Text>{name}</Text>
       </>
     );
   };
 
   return (
-    <PageHeader title={<Title />}>
+    <PageHeader title={<Title />} className={styles.header}>
       <Flexbox gap={20}>
         <DateFilter
           value={value}
@@ -36,7 +54,18 @@ export default function ReportHeader({ title, icon }) {
           showAllTime
         />
         <WebsiteSelect websiteId={websiteId} onSelect={handleSelect} />
+        <LoadingButton
+          variant="primary"
+          loading={isLoading}
+          disabled={!websiteId || !value}
+          onClick={handleSave}
+        >
+          {formatMessage(labels.save)}
+        </LoadingButton>
       </Flexbox>
+      {toast}
     </PageHeader>
   );
 }
+
+export default ReportHeader;
diff --git a/components/pages/reports/ReportsList.js b/components/pages/reports/ReportList.js
similarity index 85%
rename from components/pages/reports/ReportsList.js
rename to components/pages/reports/ReportList.js
index 44dc556d..da0a622c 100644
--- a/components/pages/reports/ReportsList.js
+++ b/components/pages/reports/ReportList.js
@@ -5,7 +5,7 @@ import PageHeader from 'components/layout/PageHeader';
 import Funnel from 'assets/funnel.svg';
 import Nodes from 'assets/nodes.svg';
 import Lightbulb from 'assets/lightbulb.svg';
-import styles from './ReportsList.module.css';
+import styles from './ReportList.module.css';
 
 const reports = [
   {
@@ -28,7 +28,7 @@ const reports = [
   },
 ];
 
-function Report({ title, description, url, icon }) {
+function ReportItem({ title, description, url, icon }) {
   return (
     <div className={styles.report}>
       <div className={styles.title}>
@@ -50,17 +50,19 @@ function Report({ title, description, url, icon }) {
   );
 }
 
-export default function ReportsList() {
+export function ReportList() {
   return (
     <Page>
       <PageHeader title="Reports" />
       <div className={styles.reports}>
         {reports.map(({ title, description, url, icon }) => {
           return (
-            <Report key={title} icon={icon} title={title} description={description} url={url} />
+            <ReportItem key={title} icon={icon} title={title} description={description} url={url} />
           );
         })}
       </div>
     </Page>
   );
 }
+
+export default ReportList;
diff --git a/components/pages/reports/ReportsList.module.css b/components/pages/reports/ReportList.module.css
similarity index 100%
rename from components/pages/reports/ReportsList.module.css
rename to components/pages/reports/ReportList.module.css
diff --git a/components/pages/reports/ReportMenu.js b/components/pages/reports/ReportMenu.js
new file mode 100644
index 00000000..abfea6fe
--- /dev/null
+++ b/components/pages/reports/ReportMenu.js
@@ -0,0 +1,7 @@
+import styles from './reports.module.css';
+
+export function ReportMenu({ children }) {
+  return <div className={styles.menu}>{children}</div>;
+}
+
+export default ReportMenu;
diff --git a/components/pages/reports/event-data/EventDataReport.js b/components/pages/reports/event-data/EventDataReport.js
new file mode 100644
index 00000000..a32cd6e2
--- /dev/null
+++ b/components/pages/reports/event-data/EventDataReport.js
@@ -0,0 +1,30 @@
+import { useState } from 'react';
+import { Form, FormRow, FormInput, TextField } from 'react-basics';
+import Report from '../Report';
+import ReportHeader from '../ReportHeader';
+import useMessages from 'hooks/useMessages';
+import Nodes from 'assets/nodes.svg';
+import styles from '../reports.module.css';
+
+export default function EventDataReport({ websiteId, data }) {
+  const [values, setValues] = useState({ query: '' });
+  const { formatMessage, labels } = useMessages();
+
+  return (
+    <Report>
+      <ReportHeader title={formatMessage(labels.eventData)} icon={<Nodes />} />
+      <div className={styles.container}>
+        <div className={styles.menu}>
+          <Form>
+            <FormRow label="Properties">
+              <FormInput name="query">
+                <TextField value={values.query} />
+              </FormInput>
+            </FormRow>
+          </Form>
+        </div>
+        <div className={styles.content}></div>
+      </div>
+    </Report>
+  );
+}
diff --git a/components/pages/reports/funnel/FunnelForm.js b/components/pages/reports/funnel/FunnelForm.js
deleted file mode 100644
index 30edcc56..00000000
--- a/components/pages/reports/funnel/FunnelForm.js
+++ /dev/null
@@ -1,118 +0,0 @@
-import DateFilter from 'components/input/DateFilter';
-import WebsiteSelect from 'components/input/WebsiteSelect';
-import useMessages from 'hooks/useMessages';
-import { parseDateRange } from 'lib/date';
-import { useState } from 'react';
-import {
-  Button,
-  Form,
-  FormButtons,
-  FormInput,
-  FormRow,
-  SubmitButton,
-  TextField,
-} from 'react-basics';
-import styles from './FunnelForm.module.css';
-
-export function FunnelForm({ onSearch }) {
-  const { formatMessage, labels } = useMessages();
-  const [dateRange, setDateRange] = useState('');
-  const [startAt, setStartAt] = useState();
-  const [endAt, setEndAt] = useState();
-  const [urls, setUrls] = useState(['/', '/docs/getting-started', '/docs/intall']);
-  const [websiteId, setWebsiteId] = useState('');
-  const [window, setWindow] = useState(60);
-
-  const handleSubmit = async data => {
-    onSearch(data);
-  };
-
-  const handleDateChange = value => {
-    const { startDate, endDate } = parseDateRange(value);
-
-    setDateRange(value);
-    setStartAt(startDate.getTime());
-    setEndAt(endDate.getTime());
-  };
-
-  const handleAddUrl = () => setUrls([...urls, '']);
-
-  const handleRemoveUrl = i => {
-    const nextUrls = [...urls];
-    nextUrls.splice(i, 1);
-    setUrls(nextUrls);
-  };
-
-  const handleWindowChange = value => setWindow(value.target.value);
-
-  const handleUrlChange = (value, i) => {
-    const nextUrls = [...urls];
-
-    nextUrls[i] = value.target.value;
-    setUrls(nextUrls);
-  };
-
-  return (
-    <>
-      <Form
-        values={{
-          websiteId,
-          startAt,
-          endAt,
-          urls,
-          window,
-        }}
-        onSubmit={handleSubmit}
-      >
-        <FormRow label={formatMessage(labels.website)}>
-          <WebsiteSelect websiteId={websiteId} onSelect={value => setWebsiteId(value)} />
-          <FormInput name="websiteId" rules={{ required: formatMessage(labels.required) }}>
-            <TextField value={websiteId} className={styles.hiddenInput} />
-          </FormInput>
-        </FormRow>
-        <FormRow label="Date">
-          <DateFilter
-            className={styles.filter}
-            value={dateRange}
-            alignment="start"
-            onChange={handleDateChange}
-            isF
-          />
-          <FormInput
-            name="startAt"
-            className={styles.hiddenInput}
-            rules={{ required: formatMessage(labels.required) }}
-          >
-            <TextField value={startAt} />
-          </FormInput>
-          <FormInput name="endAt" rules={{ required: formatMessage(labels.required) }}>
-            <TextField value={endAt} className={styles.hiddenInput} />
-          </FormInput>
-        </FormRow>
-        <FormRow label="Window (minutes)">
-          <FormInput
-            name="window"
-            rules={{ required: formatMessage(labels.required), pattern: /[0-9]+/ }}
-          >
-            <TextField value={window} onChange={handleWindowChange} />
-          </FormInput>
-        </FormRow>
-        <Button onClick={handleAddUrl}>Add URL</Button>
-        {urls.map((a, i) => (
-          <FormRow className={styles.urlFormRow} key={`url${i}`} label={`URL ${i + 1}`}>
-            <TextField value={urls[i]} onChange={value => handleUrlChange(value, i)} />
-            <Button onClick={() => handleRemoveUrl(i)}>Remove URL</Button>
-          </FormRow>
-        ))}
-
-        <FormButtons>
-          <SubmitButton variant="primary" disabled={false}>
-            Query
-          </SubmitButton>
-        </FormButtons>
-      </Form>
-    </>
-  );
-}
-
-export default FunnelForm;
diff --git a/components/pages/reports/funnel/FunnelForm.module.css b/components/pages/reports/funnel/FunnelForm.module.css
deleted file mode 100644
index f251b63f..00000000
--- a/components/pages/reports/funnel/FunnelForm.module.css
+++ /dev/null
@@ -1,13 +0,0 @@
-.filter {
-  min-width: 200px;
-}
-
-.hiddenInput {
-  visibility: hidden;
-  min-height: 0px;
-  max-height: 0px;
-}
-
-.urlFormRow label {
-  min-width: 80px;
-}
diff --git a/components/pages/reports/funnel/FunnelPage.js b/components/pages/reports/funnel/FunnelPage.js
deleted file mode 100644
index 9f4f9bdf..00000000
--- a/components/pages/reports/funnel/FunnelPage.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { useMutation } from '@tanstack/react-query';
-import Page from 'components/layout/Page';
-import PageHeader from 'components/layout/PageHeader';
-import ReportsLayout from 'components/layout/ReportsLayout';
-import useApi from 'hooks/useApi';
-import { useState } from 'react';
-import FunnelChart from './FunnelChart';
-import FunnelTable from './FunnelTable';
-import FunnelForm from './FunnelForm';
-
-export default function FunnelPage() {
-  const { post } = useApi();
-  const { mutate } = useMutation(data => post('/reports/funnel', data));
-  const [data, setData] = useState([{}]);
-  const [setFormData] = useState();
-
-  function handleOnSearch(data) {
-    setFormData(data);
-
-    mutate(data, {
-      onSuccess: async data => {
-        setData(data);
-      },
-    });
-  }
-
-  return (
-    <ReportsLayout filter={<FunnelForm onSearch={handleOnSearch} />} header={'test'}>
-      <Page>
-        <PageHeader title="Funnel Report"></PageHeader>
-        <FunnelChart data={data} />
-        <FunnelTable data={data} />
-      </Page>
-    </ReportsLayout>
-  );
-}
diff --git a/components/pages/reports/funnel/FunnelParameters.js b/components/pages/reports/funnel/FunnelParameters.js
new file mode 100644
index 00000000..d387686e
--- /dev/null
+++ b/components/pages/reports/funnel/FunnelParameters.js
@@ -0,0 +1,67 @@
+import { useMessages } from 'hooks';
+import {
+  Icon,
+  Form,
+  FormButtons,
+  FormInput,
+  FormRow,
+  PopupTrigger,
+  Popup,
+  SubmitButton,
+  TextField,
+} from 'react-basics';
+import Icons from 'components/icons';
+import { updateReport } from 'store/reports';
+import { useRef } from 'react';
+import styles from './FunnelParameters.module.css';
+
+export function FunnelParameters({ report }) {
+  const { formatMessage, labels } = useMessages();
+  const ref = useRef(null);
+  const { id, websiteId, parameters, isLoading } = report || {};
+
+  const handleSubmit = values => {
+    console.log({ values });
+    updateReport(id, { parameters: values, isLoading: false });
+  };
+
+  console.log('PARAMETERS', parameters);
+
+  return (
+    <>
+      <Form ref={ref} values={parameters} onSubmit={handleSubmit}>
+        <FormRow label="Window (minutes)">
+          <FormInput
+            name="window"
+            rules={{ required: formatMessage(labels.required), pattern: /[0-9]+/ }}
+          >
+            <TextField autoComplete="off" />
+          </FormInput>
+        </FormRow>
+        <FormRow label={formatMessage(labels.urls)} action={<AddURLButton />}>
+          hi
+        </FormRow>
+        <FormButtons>
+          <SubmitButton variant="primary" disabled={!websiteId} loading={isLoading}>
+            {formatMessage(labels.query)}
+          </SubmitButton>
+        </FormButtons>
+      </Form>
+    </>
+  );
+}
+
+function AddURLButton() {
+  return (
+    <PopupTrigger>
+      <Icon>
+        <Icons.Plus />
+      </Icon>
+      <Popup className={styles.popup} position="right" alignment="start">
+        HALLO
+      </Popup>
+    </PopupTrigger>
+  );
+}
+
+export default FunnelParameters;
diff --git a/components/pages/reports/funnel/FunnelParameters.module.css b/components/pages/reports/funnel/FunnelParameters.module.css
new file mode 100644
index 00000000..0e68e095
--- /dev/null
+++ b/components/pages/reports/funnel/FunnelParameters.module.css
@@ -0,0 +1,7 @@
+.popup {
+  background: var(--base50);
+  padding: 20px;
+  margin-left: 10px;
+  border: 1px solid var(--base400);
+  border-radius: var(--border-radius);
+}
\ No newline at end of file
diff --git a/components/pages/reports/funnel/FunnelReport.js b/components/pages/reports/funnel/FunnelReport.js
new file mode 100644
index 00000000..3c466050
--- /dev/null
+++ b/components/pages/reports/funnel/FunnelReport.js
@@ -0,0 +1,28 @@
+import FunnelChart from './FunnelChart';
+import FunnelTable from './FunnelTable';
+import FunnelParameters from './FunnelParameters';
+import Report from '../Report';
+import ReportHeader from '../ReportHeader';
+import ReportMenu from '../ReportMenu';
+import ReportBody from '../ReportBody';
+import Funnel from 'assets/funnel.svg';
+import { useReport } from 'hooks';
+
+export default function FunnelReport({ reportId }) {
+  const report = useReport(reportId);
+
+  console.log('REPORT', { report });
+
+  return (
+    <Report>
+      <ReportHeader icon={<Funnel />} report={report} />
+      <ReportMenu>
+        <FunnelParameters report={report} />
+      </ReportMenu>
+      <ReportBody>
+        <FunnelChart report={report} />
+        <FunnelTable report={report} />
+      </ReportBody>
+    </Report>
+  );
+}
diff --git a/components/pages/reports/funnel/FunnelPage.module.css b/components/pages/reports/funnel/FunnelReport.module.css
similarity index 100%
rename from components/pages/reports/funnel/FunnelPage.module.css
rename to components/pages/reports/funnel/FunnelReport.module.css
diff --git a/components/pages/reports/reports.module.css b/components/pages/reports/reports.module.css
index e18a857a..b75aee64 100644
--- a/components/pages/reports/reports.module.css
+++ b/components/pages/reports/reports.module.css
@@ -1,14 +1,24 @@
 .container {
   display: grid;
-  grid-template-rows: 1fr;
+  grid-template-rows: max-content 1fr;
   grid-template-columns: max-content 1fr;
 }
 
+.header {
+  grid-row: 1 / 2;
+  grid-column: 1 / 3;
+}
+
 .menu {
   width: 300px;
+  padding-right: 20px;
+  border-right: 1px solid var(--base300);
+  grid-row: 2/3;
   grid-column: 1 / 2;
 }
 
-.content {
+.body {
+  padding-left: 20px;
+  grid-row: 2/3;
   grid-column: 2 / 3;
 }
diff --git a/hooks/index.js b/hooks/index.js
index 15898eb5..3f2ba4d7 100644
--- a/hooks/index.js
+++ b/hooks/index.js
@@ -9,6 +9,7 @@ export * from './useLanguageNames';
 export * from './useLocale';
 export * from './useMessages';
 export * from './usePageQuery';
+export * from './useReport';
 export * from './useRequireLogin';
 export * from './useShareToken';
 export * from './useSticky';
diff --git a/hooks/useDateRange.js b/hooks/useDateRange.js
index e8a542f4..17552805 100644
--- a/hooks/useDateRange.js
+++ b/hooks/useDateRange.js
@@ -12,14 +12,14 @@ export function useDateRange(websiteId) {
   const globalConfig = appStore(state => state.dateRange);
   const dateRange = parseDateRange(websiteConfig || globalConfig || defaultConfig, locale);
 
-  function saveDateRange(value) {
+  const saveDateRange = value => {
     if (websiteId) {
       setWebsiteDateRange(websiteId, value);
     } else {
       setItem(DATE_RANGE_CONFIG, value);
       setDateRange(value);
     }
-  }
+  };
 
   return [dateRange, saveDateRange];
 }
diff --git a/hooks/useReport.js b/hooks/useReport.js
new file mode 100644
index 00000000..1b1c6f0e
--- /dev/null
+++ b/hooks/useReport.js
@@ -0,0 +1,22 @@
+import useStore, { createReport } from 'store/reports';
+import { useCallback, useEffect, useState } from 'react';
+import { useForceUpdate } from 'hooks';
+
+export function useReport(reportId) {
+  const [id, setId] = useState(reportId);
+
+  const selector = useCallback(state => state[id], [id]);
+  const report = useStore(selector);
+
+  useEffect(() => {
+    if (!report) {
+      setId(createReport().id);
+    }
+  }, []);
+
+  console.log('USE REPORT', report);
+
+  return report;
+}
+
+export default useReport;
diff --git a/lang/am-ET.json b/lang/am-ET.json
index f58a25cd..14bcc9ae 100644
--- a/lang/am-ET.json
+++ b/lang/am-ET.json
@@ -1,120 +1,155 @@
 {
-  "label.accounts": "Accounts",
-  "label.add-account": "Add account",
-  "label.add-column": "Add column",
-  "label.add-filter": "Add filter",
+  "label.access-code": "Access code",
+  "label.actions": "Actions",
+  "label.activity-log": "Activity log",
   "label.add-website": "Add website",
-  "label.administrator": "Administrator",
+  "label.admin": "Administrator",
   "label.all": "All",
   "label.all-time": "All time",
-  "label.all-websites": "All websites",
+  "label.analytics": "Analytics",
+  "label.average-visit-time": "Average visit time",
   "label.back": "Back",
+  "label.bounce-rate": "Bounce rate",
+  "label.browsers": "Browsers",
   "label.cancel": "Cancel",
   "label.change-password": "Change password",
+  "label.cities": "Cities",
+  "label.clear-all": "Clear all",
+  "label.confirm": "Confirm",
   "label.confirm-password": "Confirm password",
-  "label.copy-to-clipboard": "Copy to clipboard",
+  "label.continue": "Continue",
+  "label.countries": "Countries",
+  "label.create-team": "Create team",
+  "label.create-user": "Create user",
+  "label.created": "Created",
   "label.current-password": "Current password",
   "label.custom-range": "Custom range",
   "label.dashboard": "Dashboard",
+  "label.data": "Data",
   "label.date-range": "Date range",
   "label.default-date-range": "Default date range",
   "label.delete": "Delete",
-  "label.delete-account": "Delete account",
+  "label.delete-team": "Delete team",
+  "label.delete-user": "Delete user",
   "label.delete-website": "Delete website",
+  "label.desktop": "Desktop",
+  "label.details": "Details",
+  "label.devices": "Devices",
   "label.dismiss": "Dismiss",
   "label.domain": "Domain",
   "label.edit": "Edit",
-  "label.edit-account": "Edit account",
-  "label.edit-website": "Edit website",
+  "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "Enable share URL",
   "label.event-data": "Event Data",
-  "label.field-name": "Field Name",
-  "label.invalid": "Invalid",
-  "label.invalid-domain": "Invalid domain",
+  "label.events": "Events",
+  "label.filter-combined": "Combined",
+  "label.filter-raw": "Raw",
+  "label.funnel": "Funnel",
+  "label.join": "Join",
+  "label.join-team": "Join team",
   "label.language": "Language",
+  "label.languages": "Languages",
+  "label.laptop": "Laptop",
   "label.last-days": "Last {x} days",
   "label.last-hours": "Last {x} hours",
-  "label.logged-in-as": "Logged in as {username}",
+  "label.leave": "Leave",
+  "label.leave-team": "Leave team",
   "label.login": "Login",
   "label.logout": "Logout",
+  "label.members": "Members",
+  "label.mobile": "Mobile",
   "label.more": "More",
   "label.name": "Name",
   "label.new-password": "New password",
   "label.none": "None",
+  "label.operating-systems": "Operating systems",
   "label.owner": "Owner",
+  "label.page-views": "Page views",
+  "label.pages": "Pages",
   "label.password": "Password",
-  "label.passwords-dont-match": "Passwords don't match",
+  "label.powered-by": "Powered by {name}",
   "label.profile": "Profile",
+  "label.queries": "Queries",
+  "label.query": "Query",
+  "label.query-parameters": "Query parameters",
   "label.realtime": "Realtime",
-  "label.realtime-logs": "Realtime logs",
+  "label.referrers": "Referrers",
   "label.refresh": "Refresh",
+  "label.regenerate": "Regenerate",
+  "label.regions": "Regions",
+  "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "Required",
   "label.reset": "Reset",
   "label.reset-website": "Reset statistics",
+  "label.role": "Role",
   "label.save": "Save",
-  "label.search": "Search",
+  "label.screens": "Screens",
+  "label.select-date": "Select date",
+  "label.select-website": "Select website",
+  "label.sessions": "Sessions",
   "label.settings": "Settings",
   "label.share-url": "Share URL",
   "label.single-day": "Single day",
+  "label.tablet": "Tablet",
+  "label.team": "Team",
+  "label.team-guest": "Team guest",
+  "label.team-id": "Team ID",
+  "label.team-member": "Team member",
+  "label.team-owner": "Team owner",
+  "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "This month",
   "label.this-week": "This week",
   "label.this-year": "This year",
   "label.timezone": "Timezone",
+  "label.title": "Title",
   "label.today": "Today",
+  "label.toggle-charts": "Toggle charts",
   "label.tracking-code": "Tracking code",
-  "label.type": "Type",
+  "label.unique-visitors": "Unique visitors",
   "label.unknown": "Unknown",
+  "label.urls": "URLs",
+  "label.user": "User",
   "label.username": "Username",
-  "label.value": "Value",
+  "label.users": "Users",
+  "label.view": "View",
   "label.view-details": "View details",
+  "label.views": "Views",
+  "label.visitors": "Visitors",
+  "label.website": "Website",
+  "label.website-id": "Website ID",
   "label.websites": "Websites",
   "label.yesterday": "Yesterday",
   "message.active-users": "{x} current {x, plural, one {visitor} other {visitors}}",
   "message.confirm-delete": "Are you sure you want to delete {target}?",
+  "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are you sure you want to reset {target}'s statistics?",
-  "message.copied": "Copied!",
-  "message.delete-warning": "All associated data will be deleted as well.",
-  "message.edit-dashboard": "Edit dashboard",
-  "message.failure": "Something went wrong.",
-  "message.get-share-url": "Get share URL",
-  "message.get-tracking-code": "Get tracking code",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
+  "message.delete-website-warning": "All website data will be deleted.",
+  "message.error": "Something went wrong.",
+  "message.event-log": "{event} on {url}",
   "message.go-to-settings": "Go to settings",
   "message.incorrect-username-password": "Incorrect username/password.",
-  "message.log.visitor": "Visitor from {country} using {browser} on {os} {device}",
-  "message.new-version-available": "A new version of umami {version} is available!",
+  "message.invalid-domain": "Invalid domain. Do not include http/https.",
+  "message.min-password-length": "Minimum length of {n} characters",
   "message.no-data-available": "No data available.",
-  "message.no-websites-configured": "You don't have any websites configured.",
+  "message.no-match-password": "Passwords do not match.",
+  "message.no-teams": "You have not created any teams.",
+  "message.no-users": "There are no users.",
   "message.page-not-found": "Page not found.",
-  "message.powered-by": "Powered by {name}",
-  "message.reset-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
-  "message.save-success": "Saved successfully.",
+  "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 settings will remain intact.",
+  "message.saved": "Saved.",
   "message.share-url": "This is the publicly shared URL for {target}.",
-  "message.toggle-charts": "Toggle charts",
-  "message.track-stats": "To track stats for {target}, place the following code in the {head} section of your website.",
-  "message.type-delete": "Type {delete} in the box below to confirm.",
-  "message.type-reset": "Type {reset} in the box below to confirm.",
-  "metrics.actions": "Actions",
-  "metrics.average-visit-time": "Average visit time",
-  "metrics.bounce-rate": "Bounce rate",
-  "metrics.browsers": "Browsers",
-  "metrics.countries": "Countries",
-  "metrics.device.desktop": "Desktop",
-  "metrics.device.laptop": "Laptop",
-  "metrics.device.mobile": "Mobile",
-  "metrics.device.tablet": "Tablet",
-  "metrics.devices": "Devices",
-  "metrics.events": "Events",
-  "metrics.filter.combined": "Combined",
-  "metrics.filter.raw": "Raw",
-  "metrics.languages": "Languages",
-  "metrics.operating-systems": "Operating systems",
-  "metrics.page-views": "Page views",
-  "metrics.pages": "Pages",
-  "metrics.query-parameters": "Query parameters",
-  "metrics.referrers": "Referrers",
-  "metrics.screens": "Screens",
-  "metrics.unique-visitors": "Unique visitors",
-  "metrics.views": "Views",
-  "metrics.visitors": "Visitors"
+  "message.team-already-member": "You are already a member of the team.",
+  "message.team-not-found": "Team not found.",
+  "message.tracking-code": "To track stats for this website, place the following code in the <head>...</head> section of your HTML.",
+  "message.user-deleted": "User deleted.",
+  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}",
+  "messages.no-results-found": "No results were found.",
+  "messages.no-team-websites": "This team does not have any websites.",
+  "messages.no-websites-configured": "You do not have any websites configured.",
+  "messages.team-websites-info": "Websites can be viewed by anyone on the team."
 }
diff --git a/lang/ar-SA.json b/lang/ar-SA.json
index 6bb39439..3ed0d3a5 100644
--- a/lang/ar-SA.json
+++ b/lang/ar-SA.json
@@ -40,9 +40,11 @@
   "label.edit": "تعديل",
   "label.edit-dashboard": "تعديل لوحة التحكم",
   "label.enable-share-url": "تفعيل مشاركة الرابط",
+  "label.event-data": "Event data",
   "label.events": "الأحداث",
   "label.filter-combined": "مجمعة",
   "label.filter-raw": "مفصلة",
+  "label.funnel": "Funnel",
   "label.join": "انضمام",
   "label.join-team": "الانضمام للمجموعة",
   "label.language": "اللغة",
@@ -68,6 +70,7 @@
   "label.powered-by": "مشغل بواسطة {name}",
   "label.profile": "الملف الشخصي",
   "label.queries": "استعلامات",
+  "label.query": "Query",
   "label.query-parameters": "متغيرات الرابط",
   "label.realtime": "الوقت الفعلي",
   "label.referrers": "التحويلات",
@@ -75,12 +78,14 @@
   "label.regenerate": "اعادة انشاء",
   "label.regions": "المناطق",
   "label.remove": "إزالة",
+  "label.reports": "Reports",
   "label.required": "اجباري",
   "label.reset": "اعادة تعيين",
   "label.reset-website": "اعادة تعيين الإحصائيات",
   "label.role": "الصلاحية",
   "label.save": "حفظ",
   "label.screens": "الشاشات",
+  "label.select-date": "Select date",
   "label.select-website": "اختيار موقع",
   "label.sessions": "الزيارات",
   "label.settings": "اعدادات",
@@ -104,6 +109,7 @@
   "label.tracking-code": "كود التتبع",
   "label.unique-visitors": "زائرون فريدون",
   "label.unknown": "غير معروف",
+  "label.urls": "URLs",
   "label.user": "مستخدم",
   "label.username": "اسم المستخدم",
   "label.users": "المستخدمين",
@@ -111,6 +117,7 @@
   "label.view-details": "عرض التفاصيل",
   "label.views": "المشاهدات",
   "label.visitors": "الزوار",
+  "label.website": "Website",
   "label.website-id": "معرف الموقع",
   "label.websites": "المواقع",
   "label.yesterday": "الأمس",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "هل أنت متأكد من حذف {target}?",
   "message.confirm-leave": "هل أنت متأكد من مغادرة {target}?",
   "message.confirm-reset": "هل أنت متأكد من اعادة تعيين الإحصائيات لـ {target}؟",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "حذف الموقع",
   "message.delete-website-warning": "كافة البيانات المرتبطة سيم حذفها ايضا.",
   "message.error": "حدث خطأ ما.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "كود التتبع",
   "message.user-deleted": "تم حذف المستخدم.",
   "message.visitor-log": "زائر من {country} يستخدم {browser} على {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "هذه المجموعة ليس لديه اي موقع.",
   "messages.no-websites-configured": "لم تقم بإعداد اي موقع.",
   "messages.team-websites-info": "يمكن مشاهدة الموقع من اي عضو في المجموعة."
diff --git a/lang/be-BY.json b/lang/be-BY.json
index ed8b9be8..76844060 100644
--- a/lang/be-BY.json
+++ b/lang/be-BY.json
@@ -40,9 +40,11 @@
   "label.edit": "Змяніць",
   "label.edit-dashboard": "Змяніць інфармацыйную панэль",
   "label.enable-share-url": "Дазволіць дзяліцца спасылкай",
+  "label.event-data": "Event data",
   "label.events": "Падзеі",
   "label.filter-combined": "Камбініаваны",
   "label.filter-raw": "Сырыя",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Мова",
@@ -68,6 +70,7 @@
   "label.powered-by": "Зроблена {name}",
   "label.profile": "Профіль",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "У рэяльным часе",
   "label.referrers": "Referrers",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "Абавязкова",
   "label.reset": "Скінуць",
   "label.reset-website": "Скінуць статыстыку",
   "label.role": "Role",
   "label.save": "Захаваць",
   "label.screens": "Экраны",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Налады",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Код адсочвання",
   "label.unique-visitors": "Унікальныя наведвальнікі",
   "label.unknown": "Невядома",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Імя карыстальніка",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "Пабачыць дэталі",
   "label.views": "Прагляды",
   "label.visitors": "Наведвальнікі",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Сайты",
   "label.yesterday": "Учора",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "Вы дакладна хочаце выдаліць {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Вы дакладна хочаце скінуць {target} статыстыку?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Выдаліць сайт",
   "message.delete-website-warning": "Усе асацыяваныя дадзеныя будуць таксама выдалены.",
   "message.error": "Нешта пайшло не так.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Код адсочвання",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "Наведвальнік з {country} праз {browser} на {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "Вы не наладзілі ніводнага сайту.",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/bn-BD.json b/lang/bn-BD.json
index eca1363b..01af693c 100644
--- a/lang/bn-BD.json
+++ b/lang/bn-BD.json
@@ -40,9 +40,11 @@
   "label.edit": "সম্পাদনা করুন",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "শেয়ার ইউআরএল শেয়ার করুন",
+  "label.event-data": "Event data",
   "label.events": "ঘটনা",
   "label.filter-combined": "সম্মিলিত",
   "label.filter-raw": "অপরিশোধিত",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "ভাষা",
@@ -68,6 +70,7 @@
   "label.powered-by": "{name} দ্বারা চালিত",
   "label.profile": "প্রোফাইল",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "সরাসরি",
   "label.referrers": "রেফারার্স",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "প্রয়োজনীয়",
   "label.reset": "রিসেট",
   "label.reset-website": "ওয়েবসাইট রিসেট করুন",
   "label.role": "Role",
   "label.save": "সংরক্ষণ",
   "label.screens": "স্ক্রিনগুলি",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "সেটিংস",
@@ -104,6 +109,7 @@
   "label.tracking-code": "ট্র্যাকিং কোড",
   "label.unique-visitors": "অনন্য ভিজিটর",
   "label.unknown": "অজানা",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "ব্যবহারকারীর নাম",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "বিস্তারিত দেখুন",
   "label.views": "ভিউস",
   "label.visitors": "পরিদর্শনার্থী",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "সবগুলো ওয়েবসাইট",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "আপনি কি নিশ্চিত যে আপনি {target} মুছতে চান?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "আপনি কি নিশ্চিত যে আপনি {target} এর পরিসংখ্যান পুনরায় সেট করতে চান?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "ওয়েবসাইট মুছুন",
   "message.delete-website-warning": "সমস্ত সম্পর্কিত ডেটা পাশাপাশি মুছে ফেলা হবে।",
   "message.error": "কিছু ভুল হয়েছে।",
@@ -140,6 +148,7 @@
   "message.tracking-code": "ট্র্যাকিং কোড",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "{country} থেকে একজন ভিসিটর {ব্রাউজার}, ব্যবহার করছেন {os} {device} এর মধ্যে।",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "কোনও ওয়েবসাইট কনফিগার করা নেই।",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/ca-ES.json b/lang/ca-ES.json
index 3f1d7910..31c6c3e5 100644
--- a/lang/ca-ES.json
+++ b/lang/ca-ES.json
@@ -40,9 +40,11 @@
   "label.edit": "Edita",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "Activa l'enllaç per compartir",
+  "label.event-data": "Event data",
   "label.events": "Esdeveniments",
   "label.filter-combined": "Combinat",
   "label.filter-raw": "En cru",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -68,6 +70,7 @@
   "label.powered-by": "Funciona amb {name}",
   "label.profile": "Perfil",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Temps real",
   "label.referrers": "Referents",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "Obligatori",
   "label.reset": "Restableix",
   "label.reset-website": "Restableix estadístiques",
   "label.role": "Role",
   "label.save": "Desa",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Configuració",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Codi de seguiment",
   "label.unique-visitors": "Visitants únics",
   "label.unknown": "Desconegut",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Nom d'usuari",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "Veure els detalls",
   "label.views": "Vistes",
   "label.visitors": "Visitants",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Llocs web",
   "label.yesterday": "Ahir",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "Segur que vols esborrar {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Segur que vols restablir les estadístiques de {target}?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Esborra el lloc web",
   "message.delete-website-warning": "També s'esborraran totes les dades relacionades.",
   "message.error": "S'ha produït un error.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Codi de seguiment",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "Visitant de {country} usant {browser} a {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "No hi ha cap lloc web configurat.",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/cs-CZ.json b/lang/cs-CZ.json
index baf8d5e1..a2bc4577 100644
--- a/lang/cs-CZ.json
+++ b/lang/cs-CZ.json
@@ -40,9 +40,11 @@
   "label.edit": "Upravit",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "Povolit sdílení URL",
+  "label.event-data": "Event data",
   "label.events": "Události",
   "label.filter-combined": "Kombinace",
   "label.filter-raw": "Nezpracované",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -68,6 +70,7 @@
   "label.powered-by": "Běží na {name}",
   "label.profile": "Profil",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Aktuálně",
   "label.referrers": "Odkazy",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "Vyžadováno",
   "label.reset": "Reset",
   "label.reset-website": "Reset statistics",
   "label.role": "Role",
   "label.save": "Uložit",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Nastavení",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Sledovací kód",
   "label.unique-visitors": "Jedinečné návštěvy",
   "label.unknown": "Neznámý",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Uživatelské jméno",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "Zobrazit detaily",
   "label.views": "Zobrazení",
   "label.visitors": "Návštěvy",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Weby",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "Opravdu smazat {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Smazat web",
   "message.delete-website-warning": "Všechna související data budou také smazána.",
   "message.error": "Něco se pokazilo.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Sledovací kód",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "Návštěvník z {country} s prohlížečem {browser} na {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "Nemáte nastavený žádný web.",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/da-DK.json b/lang/da-DK.json
index d8c94f84..2b437fbd 100644
--- a/lang/da-DK.json
+++ b/lang/da-DK.json
@@ -40,9 +40,11 @@
   "label.edit": "Rediger",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "Aktivér delings-URL",
+  "label.event-data": "Event data",
   "label.events": "Hændelser",
   "label.filter-combined": "Kombineret",
   "label.filter-raw": "Rå",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Sprog",
@@ -68,6 +70,7 @@
   "label.powered-by": "Drevet af {name}",
   "label.profile": "Profil",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Realtid",
   "label.referrers": "Henvisninger",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "Påkrævet",
   "label.reset": "Nulstil",
   "label.reset-website": "Nulstil statistikker",
   "label.role": "Role",
   "label.save": "Gem",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Indstillinger",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Sporingskode",
   "label.unique-visitors": "Unikke besøgende",
   "label.unknown": "Ukendt",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Brugernavn",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "Vis detajler",
   "label.views": "Visninger",
   "label.visitors": "Besøgende",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Hjemmesider",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "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-reset": "Er du sikker på at du ville nulstille {target}'s statistikker?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Slet hjemmeside",
   "message.delete-website-warning": "Alle tilknyttede data slettes også.",
   "message.error": "Noget gik galt.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Sporingskode",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "Besøgende fra {country} bruger {browser} på {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "Du har ikke konfigureret nogen hjemmesider.",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/de-CH.json b/lang/de-CH.json
index f8602bc3..1c2f8fde 100644
--- a/lang/de-CH.json
+++ b/lang/de-CH.json
@@ -40,9 +40,11 @@
   "label.edit": "Bearbeite",
   "label.edit-dashboard": "Dashboard bearbeite",
   "label.enable-share-url": "Freigab-URL aktiviere",
+  "label.event-data": "Event data",
   "label.events": "Ereigniss",
   "label.filter-combined": "Kombiniert",
   "label.filter-raw": "Rohdate",
+  "label.funnel": "Funnel",
   "label.join": "Biträte",
   "label.join-team": "Team biträte",
   "label.language": "Sprach",
@@ -68,6 +70,7 @@
   "label.powered-by": "Betribe dur {name}",
   "label.profile": "Profil",
   "label.queries": "Abfrage",
+  "label.query": "Query",
   "label.query-parameters": "Abfragparameter",
   "label.realtime": "Echtzit",
   "label.referrers": "Referrer",
@@ -75,12 +78,14 @@
   "label.regenerate": "Erneuere",
   "label.regions": "Regionä",
   "label.remove": "Entferne",
+  "label.reports": "Reports",
   "label.required": "Erforderlich",
   "label.reset": "Zruggsetze",
   "label.reset-website": "Statistik zruggsetze",
   "label.role": "Rollä",
   "label.save": "Speichere",
   "label.screens": "Bildschirmuflösige",
+  "label.select-date": "Select date",
   "label.select-website": "Websiite uuswähle",
   "label.sessions": "Sessions",
   "label.settings": "Istellige",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Tracking Code",
   "label.unique-visitors": "Eidütigi Bsuecher",
   "label.unknown": "Unbekannt",
+  "label.urls": "URLs",
   "label.user": "Benutzer",
   "label.username": "Benutzername",
   "label.users": "Benutzer",
@@ -111,6 +117,7 @@
   "label.view-details": "Details azeige",
   "label.views": "Ufrüef",
   "label.visitors": "Bsuecher",
+  "label.website": "Website",
   "label.website-id": "Websiite ID",
   "label.websites": "Websiite",
   "label.yesterday": "Gester",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "Sind Sie sich sicher, {target} zlösche?",
   "message.confirm-leave": "Sind Sie sich sicher, {target} zverlah?",
   "message.confirm-reset": "Sind Sie sicher, dass Sie dStatistike vo {target} zruggsetze wend?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Websiite lösche",
   "message.delete-website-warning": "Alli dezueghörige Date werdet ebefalls glöscht.",
   "message.error": "Es isch en Fehler uftrete.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Tracking Code",
   "message.user-deleted": "Benutzer glöscht.",
   "message.visitor-log": "Bsuecher us {country} benutzt {browser} uf {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "Dem Team sind kei Websiite zuegordnet.",
   "messages.no-websites-configured": "Es isch kei Websiite vorhande.",
   "messages.team-websites-info": "Websiite chönd vo jedem im Team agluegt werde"
diff --git a/lang/de-DE.json b/lang/de-DE.json
index b3611d5b..aa84f725 100644
--- a/lang/de-DE.json
+++ b/lang/de-DE.json
@@ -40,9 +40,11 @@
   "label.edit": "Bearbeiten",
   "label.edit-dashboard": "Dashboard bearbeiten",
   "label.enable-share-url": "Freigabe-URL aktivieren",
+  "label.event-data": "Event data",
   "label.events": "Ereignisse",
   "label.filter-combined": "Kombiniert",
   "label.filter-raw": "Rohdaten",
+  "label.funnel": "Funnel",
   "label.join": "Beitreten",
   "label.join-team": "Team beitreten",
   "label.language": "Sprache",
@@ -68,6 +70,7 @@
   "label.powered-by": "Betrieben durch {name}",
   "label.profile": "Profil",
   "label.queries": "Abfragen",
+  "label.query": "Query",
   "label.query-parameters": "Abfrageparameter",
   "label.realtime": "Echtzeit",
   "label.referrers": "Referrer",
@@ -75,12 +78,14 @@
   "label.regenerate": "Erneuern",
   "label.regions": "Regionen",
   "label.remove": "Entfernen",
+  "label.reports": "Reports",
   "label.required": "Erforderlich",
   "label.reset": "Zurücksetzen",
   "label.reset-website": "Statistik zurücksetzen",
   "label.role": "Rolle",
   "label.save": "Speichern",
   "label.screens": "Bildschirmauflösungen",
+  "label.select-date": "Select date",
   "label.select-website": "Website auswählen",
   "label.sessions": "Sessions",
   "label.settings": "Einstellungen",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Tracking Code",
   "label.unique-visitors": "Eindeutige Besucher",
   "label.unknown": "Unbekannt",
+  "label.urls": "URLs",
   "label.user": "Benutzer",
   "label.username": "Benutzername",
   "label.users": "Benutzer",
@@ -111,6 +117,7 @@
   "label.view-details": "Details anzeigen",
   "label.views": "Aufrufe",
   "label.visitors": "Besucher",
+  "label.website": "Website",
   "label.website-id": "Webseite ID",
   "label.websites": "Webseiten",
   "label.yesterday": "Gestern",
@@ -118,6 +125,7 @@
   "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-reset": "Sind Sie sicher, dass Sie die Statistiken von {target} zurücksetzen wollen?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Webseite löschen",
   "message.delete-website-warning": "Alle zugehörigen Daten werden ebenfalls gelöscht.",
   "message.error": "Es ist ein Fehler aufgetreten.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Tracking Code",
   "message.user-deleted": "Benutzer gelöscht.",
   "message.visitor-log": "Besucher aus {country} benutzt {browser} auf {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "Diesem Team sind keine Websites zugeordnet.",
   "messages.no-websites-configured": "Es ist keine Webseite vorhanden.",
   "messages.team-websites-info": "Webseiten können von jedem im Team eingesehen werden."
diff --git a/lang/el-GR.json b/lang/el-GR.json
index f32cd93a..06f82484 100644
--- a/lang/el-GR.json
+++ b/lang/el-GR.json
@@ -40,9 +40,11 @@
   "label.edit": "Επεξεργασία",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "Ενεργοποίηση κοινής χρήσης URL",
+  "label.event-data": "Event data",
   "label.events": "Γεγονότα",
   "label.filter-combined": "Σε συνδυασμό",
   "label.filter-raw": "Ακατέργαστο",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -68,6 +70,7 @@
   "label.powered-by": "Με την υποστήριξη του {name}",
   "label.profile": "Προφίλ",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Realtime",
   "label.referrers": "Παραπομπές",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "Απαιτείται",
   "label.reset": "Επαναφορά",
   "label.reset-website": "Reset statistics",
   "label.role": "Role",
   "label.save": "Αποθήκευση",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Ρυθμίσεις",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Κωδικός παρακολούθησης",
   "label.unique-visitors": "Μοναδικοί επισκέπτες",
   "label.unknown": "Άγνωστο",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Όνομα χρήστη",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "Λεπτομέρειες",
   "label.views": "Προβολές",
   "label.visitors": "Επισκέπτες",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Ιστότοποι",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "Είστε βέβαιοι ότι θέλετε να διαγράψετε το {target};",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Διαγραφή ιστότοπου",
   "message.delete-website-warning": "Όλα τα σχετικά δεδομένα θα διαγραφούν επίσης.",
   "message.error": "Κάτι πήγε στραβά.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Κωδικός παρακολούθησης",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "Δεν έχετε ρυθμίσει κανένα ιστότοπο.",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/en-GB.json b/lang/en-GB.json
index 296106f2..95fe2439 100644
--- a/lang/en-GB.json
+++ b/lang/en-GB.json
@@ -40,9 +40,11 @@
   "label.edit": "Edit",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "Enable share URL",
+  "label.event-data": "Event data",
   "label.events": "Events",
   "label.filter-combined": "Combined",
   "label.filter-raw": "Raw",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -68,6 +70,7 @@
   "label.powered-by": "Powered by {name}",
   "label.profile": "Profile",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Realtime",
   "label.referrers": "Referrers",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "Required",
   "label.reset": "Reset",
   "label.reset-website": "Reset statistics",
   "label.role": "Role",
   "label.save": "Save",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Settings",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Tracking code",
   "label.unique-visitors": "Unique visitors",
   "label.unknown": "Unknown",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Username",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "View details",
   "label.views": "Views",
   "label.visitors": "Visitors",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Websites",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "Are you sure you want to delete {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are you sure you want to reset {target}'s statistics?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Delete website",
   "message.delete-website-warning": "All associated data will be deleted as well.",
   "message.error": "Something went wrong.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Tracking code",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "You don't have any websites configured.",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/en-US.json b/lang/en-US.json
index e80398c6..f963688f 100644
--- a/lang/en-US.json
+++ b/lang/en-US.json
@@ -23,7 +23,7 @@
   "label.create-user": "Create user",
   "label.created": "Created",
   "label.current-password": "Current password",
-  "label.custom-range": "Custom-range",
+  "label.custom-range": "Custom range",
   "label.dashboard": "Dashboard",
   "label.data": "Data",
   "label.date-range": "Date range",
@@ -40,9 +40,11 @@
   "label.edit": "Edit",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "Enable share URL",
+  "label.event-data": "Event data",
   "label.events": "Events",
   "label.filter-combined": "Combined",
   "label.filter-raw": "Raw",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -68,6 +70,7 @@
   "label.powered-by": "Powered by {name}",
   "label.profile": "Profile",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Realtime",
   "label.referrers": "Referrers",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "Required",
   "label.reset": "Reset",
   "label.reset-website": "Reset website",
   "label.role": "Role",
   "label.save": "Save",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Settings",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Tracking code",
   "label.unique-visitors": "Unique visitors",
   "label.unknown": "Unknown",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Username",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "View details",
   "label.views": "Views",
   "label.visitors": "Visitors",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Websites",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "Are you sure you want to delete {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are you sure you want to reset {target}?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "All website data will be deleted.",
   "message.error": "Something went wrong.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "To track stats for this website, place the following code in the <head>...</head> section of your HTML.",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "You do not have any websites configured.",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/es-MX.json b/lang/es-MX.json
index 999c1d8f..6435758d 100644
--- a/lang/es-MX.json
+++ b/lang/es-MX.json
@@ -40,9 +40,11 @@
   "label.edit": "Editar",
   "label.edit-dashboard": "Editar panel",
   "label.enable-share-url": "Habilitar compartir URL",
+  "label.event-data": "Event data",
   "label.events": "Eventos",
   "label.filter-combined": "Combinado",
   "label.filter-raw": "Personalizado",
+  "label.funnel": "Funnel",
   "label.join": "Unir",
   "label.join-team": "Unir a equipo",
   "label.language": "Idioma",
@@ -68,6 +70,7 @@
   "label.powered-by": "Analíticas de {name}",
   "label.profile": "Perfil",
   "label.queries": "Consultas",
+  "label.query": "Query",
   "label.query-parameters": "Parámetros de petición",
   "label.realtime": "Tiempo real",
   "label.referrers": "Referido desde",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerar",
   "label.regions": "Regiones",
   "label.remove": "Quitar",
+  "label.reports": "Reports",
   "label.required": "Obligatorio",
   "label.reset": "Reiniciar",
   "label.reset-website": "Reiniciar estadísticas",
   "label.role": "Rol",
   "label.save": "Guardar",
   "label.screens": "Pantallas",
+  "label.select-date": "Select date",
   "label.select-website": "Seleccionar sitio web",
   "label.sessions": "Sesiones",
   "label.settings": "Configuraciones",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Código de rastreo",
   "label.unique-visitors": "Visitantes únicos",
   "label.unknown": "Desconocida",
+  "label.urls": "URLs",
   "label.user": "Usuario",
   "label.username": "Nombre de usuario",
   "label.users": "Usuarios",
@@ -111,6 +117,7 @@
   "label.view-details": "Ver detalles",
   "label.views": "Vistas",
   "label.visitors": "Visitantes",
+  "label.website": "Website",
   "label.website-id": "ID del sitio web",
   "label.websites": "Sitios",
   "label.yesterday": "Ayer",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "¿Seguro que quieres eliminar {target}?",
   "message.confirm-leave": "¿Seguro que quieres abandonar {target}?",
   "message.confirm-reset": "¿Seguro que quieres BORRAR las analíticas de {target}?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Eliminar sitio web",
   "message.delete-website-warning": "Toda la información relacionada será eliminada.",
   "message.error": "Algo falló.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Código de rastreo",
   "message.user-deleted": "Usuario eliminado.",
   "message.visitor-log": "Visitante desde {country} usando {browser} en {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "Este equipo no tiene ningún sitio web configurado.",
   "messages.no-websites-configured": "No tienes ningún sitio configurado.",
   "messages.team-websites-info": "Las analíticas de tus sitios pueden verse por cualquier miembro del equipo."
diff --git a/lang/fa-IR.json b/lang/fa-IR.json
index 94330ce3..477481c2 100644
--- a/lang/fa-IR.json
+++ b/lang/fa-IR.json
@@ -40,9 +40,11 @@
   "label.edit": "ویرایش",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "فعال کردن اشتراک گذاری URL",
+  "label.event-data": "Event data",
   "label.events": "رویدادها",
   "label.filter-combined": "ترکیب شده",
   "label.filter-raw": "خام",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "زبان",
@@ -68,6 +70,7 @@
   "label.powered-by": "قدرت گرفته توسط {name}",
   "label.profile": "پروفایل",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "آمار زنده",
   "label.referrers": "ارجاع دهندگان",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "ضروری",
   "label.reset": "بازنشانی",
   "label.reset-website": "بازنشانی آمار",
   "label.role": "Role",
   "label.save": "ذخیره",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "تنظیمات",
@@ -104,6 +109,7 @@
   "label.tracking-code": "کد رهگیری",
   "label.unique-visitors": "بازدیدکننده‌های یکتا",
   "label.unknown": "ناشناخته",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "نام کاربری",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "مشاهده‌ی جزئیات",
   "label.views": "بازدید",
   "label.visitors": "بازدیدکننده",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "وب‌سایت‌ها",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "آیا مطمئن هستید می‌خواهید {target} را حذف کنید?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "آیا از بازنشانی آمار {target} مطمئن هستید?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "حذف وب‌سایت",
   "message.delete-website-warning": "همه‌ی داده‌های مرتبط هم حذف خواهد شد.",
   "message.error": "مشکلی پیش آمده است.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "کد رهگیری",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "بازدیدکننده از کشور {country} با مروگر {browser} در {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "شما هیچ وب‌سایتی را پیکربندی نکرده‌اید.",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/fi-FI.json b/lang/fi-FI.json
index 28ef3e72..4031f115 100644
--- a/lang/fi-FI.json
+++ b/lang/fi-FI.json
@@ -40,9 +40,11 @@
   "label.edit": "Muokkaa",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "Ota jakamisen URL-osoite käyttöön",
+  "label.event-data": "Event data",
   "label.events": "Tapahtumat",
   "label.filter-combined": "Yhdistetty",
   "label.filter-raw": "Käsittelemätön",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Kieli",
@@ -68,6 +70,7 @@
   "label.powered-by": "Voimanlähteenä {name}",
   "label.profile": "Profiili",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Juuri nyt",
   "label.referrers": "Viittaajat",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "Vaaditaan",
   "label.reset": "Nollaa",
   "label.reset-website": "Nollaa tilastot",
   "label.role": "Role",
   "label.save": "Tallenna",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Asetukset",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Seurantakoodi",
   "label.unique-visitors": "Yksittäiset kävijät",
   "label.unknown": "Tuntematon",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Käyttäjänimi",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "Katso tiedot",
   "label.views": "Näyttökerrat",
   "label.visitors": "Vierailijat",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Verkkosivut",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "Haluatko varmasti poistaa sivuston {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Haluatko varmasti poistaa sivuston {target} tilastot?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Poista verkkosivu",
   "message.delete-website-warning": "Kaikki siihen liittyvät tiedot poistetaan.",
   "message.error": "Jotain meni pieleen.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Seurantakoodi",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "Vierailija maasta {country} selaimella {browser} laitteella {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "Sinulla ei ole määritettyjä verkkosivustoja.",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/fo-FO.json b/lang/fo-FO.json
index 63e7742f..ed8e7208 100644
--- a/lang/fo-FO.json
+++ b/lang/fo-FO.json
@@ -40,9 +40,11 @@
   "label.edit": "Ger broyting",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "Virkja deili leinki",
+  "label.event-data": "Event data",
   "label.events": "Hendingar/tiltøk",
   "label.filter-combined": "Samansett",
   "label.filter-raw": "Óviðgjørt",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -68,6 +70,7 @@
   "label.powered-by": "Powered by {name}",
   "label.profile": "Vangi",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Beinleiðis",
   "label.referrers": "Framsendingar",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "Kravt",
   "label.reset": "Nulstilla",
   "label.reset-website": "Reset statistics",
   "label.role": "Role",
   "label.save": "Goym",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Stillingar",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Spori kota",
   "label.unique-visitors": "Einsýna vitjanir",
   "label.unknown": "Ókent",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Brúkaranavn",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "Vís frágreiðing",
   "label.views": "Sýningar",
   "label.visitors": "Vitjandi",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Heimasíður",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "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-reset": "Are your sure you want to reset {target}'s statistics?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Sletta heimasíðu",
   "message.delete-website-warning": "Øll data ið er knýtt at verður eisini strika.",
   "message.error": "Okkurt bleiv gali.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Spori kota",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "Vitjandi frá {country} brúkar {browser} á {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "Tú hevur ongar heimasíður stillaða til.",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/fr-FR.json b/lang/fr-FR.json
index 162a6f8f..a7f54219 100644
--- a/lang/fr-FR.json
+++ b/lang/fr-FR.json
@@ -40,9 +40,11 @@
   "label.edit": "Modifier",
   "label.edit-dashboard": "Modifier le tableau de bord",
   "label.enable-share-url": "Activer l'URL de partage",
+  "label.event-data": "Event data",
   "label.events": "Événements",
   "label.filter-combined": "Combiné",
   "label.filter-raw": "Brut",
+  "label.funnel": "Funnel",
   "label.join": "Rejoindre",
   "label.join-team": "Rejoindre une équipe",
   "label.language": "Langue",
@@ -68,6 +70,7 @@
   "label.powered-by": "Propulsé par {name}",
   "label.profile": "Profil",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Paramètres d'URL",
   "label.realtime": "Temps réel",
   "label.referrers": "Sources",
@@ -75,12 +78,14 @@
   "label.regenerate": "Régénérer",
   "label.regions": "Régions",
   "label.remove": "Retirer",
+  "label.reports": "Reports",
   "label.required": "Requis",
   "label.reset": "Réinitialiser",
   "label.reset-website": "Réinitialiser les statistiques",
   "label.role": "Rôle",
   "label.save": "Enregistrer",
   "label.screens": "Résolutions d'écran",
+  "label.select-date": "Select date",
   "label.select-website": "Choisir un site",
   "label.sessions": "Sessions",
   "label.settings": "Paramètres",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Code de suivi",
   "label.unique-visitors": "Visiteurs uniques",
   "label.unknown": "Inconnu",
+  "label.urls": "URLs",
   "label.user": "Utilisateur",
   "label.username": "Nom d'utilisateur",
   "label.users": "Utilisateurs",
@@ -111,6 +117,7 @@
   "label.view-details": "Voir les détails",
   "label.views": "Vues",
   "label.visitors": "Visiteurs",
+  "label.website": "Website",
   "label.website-id": "ID de site",
   "label.websites": "Sites",
   "label.yesterday": "Hier",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "Êtes-vous sûr de vouloir supprimer {target} ?",
   "message.confirm-leave": "Êtes-vous sûr de vouloir quitter {target} ?",
   "message.confirm-reset": "Êtes-vous sûr de vouloir réinitialiser les statistiques de {target} ?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Pour supprimer ce site, taper {confirmation} ci-dessous pour confirmer.",
   "message.delete-website-warning": "Toutes les données associées seront supprimées.",
   "message.error": "Un problème est survenu.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Code de suivi",
   "message.user-deleted": "Utilisateur supprimé.",
   "message.visitor-log": "Visiteur de {country} utilisant {browser} sur {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "Cette équipe n'a aucun site.",
   "messages.no-websites-configured": "Vous n'avez configuré aucun site.",
   "messages.team-websites-info": "Les sites peuvent être vus par tout utilisateur dans l'équipe."
diff --git a/lang/ga-ES.json b/lang/ga-ES.json
index a8aa0383..35f312c7 100644
--- a/lang/ga-ES.json
+++ b/lang/ga-ES.json
@@ -40,9 +40,11 @@
   "label.edit": "Editar",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "Activar URL de compartición",
+  "label.event-data": "Event data",
   "label.events": "Eventos",
   "label.filter-combined": "Combinado",
   "label.filter-raw": "Raw",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Idioma",
@@ -68,6 +70,7 @@
   "label.powered-by": "Funciona grazas a {name}",
   "label.profile": "Perfil",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Agora mesmo",
   "label.referrers": "Orixes",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "Requerido",
   "label.reset": "Restablecer",
   "label.reset-website": "Restablecer estatísticas",
   "label.role": "Role",
   "label.save": "Gardar",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Axustes",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Código de seguimento",
   "label.unique-visitors": "Visitas únicas",
   "label.unknown": "Descoñecido",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Identificador",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "Ver detalles",
   "label.views": "Visualizacións",
   "label.visitors": "Visitantes",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Sitios web",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "Tes a certeza de querer eliminar {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Tes a certeza de querer restablecer as estatísticas de {target}?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Eliminar sitio web",
   "message.delete-website-warning": "Tamén serán borrados tódolos datos asociados.",
   "message.error": "Houbo un fallo.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Código de seguimento",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "Visitante desde {country} usando {browser} en {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "Non tes sitios web configurados.",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/he-IL.json b/lang/he-IL.json
index f9284e17..df9a5cd6 100644
--- a/lang/he-IL.json
+++ b/lang/he-IL.json
@@ -40,9 +40,11 @@
   "label.edit": "עריכה",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "הפעלת URL שיתוף",
+  "label.event-data": "Event data",
   "label.events": "אירועים",
   "label.filter-combined": "משותף",
   "label.filter-raw": "גולמי",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -68,6 +70,7 @@
   "label.powered-by": "Powered by {name}",
   "label.profile": "פרופיל",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "זמן אמת",
   "label.referrers": "מפנים",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "נדרש",
   "label.reset": "איפוס",
   "label.reset-website": "Reset statistics",
   "label.role": "Role",
   "label.save": "שמירה",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "הגדרות",
@@ -104,6 +109,7 @@
   "label.tracking-code": "קוד מעקב",
   "label.unique-visitors": "מבקרים ייחודיים",
   "label.unknown": "לא ידוע",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "שם משתמש",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "פרטים נוספים",
   "label.views": "צפיות",
   "label.visitors": "מבקרים",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "אתרים",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "האם באמת למחוק את {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "הסרת אתר",
   "message.delete-website-warning": "כל המידע המקושר יימחק",
   "message.error": "משהו השתבש",
@@ -140,6 +148,7 @@
   "message.tracking-code": "קוד מעקב",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "מבקר ממדינת {country} משתמבש בדפדפן {browser} ב-{os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "לא מוגדרים אתרים",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/hi-IN.json b/lang/hi-IN.json
index 794e0cd5..bddae4c8 100644
--- a/lang/hi-IN.json
+++ b/lang/hi-IN.json
@@ -40,9 +40,11 @@
   "label.edit": "संपादित करें",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "शेयर URL सक्षम करें",
+  "label.event-data": "Event data",
   "label.events": "स्पर्धाएँ",
   "label.filter-combined": "संयुक्त",
   "label.filter-raw": "रॉ",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -68,6 +70,7 @@
   "label.powered-by": "{name} द्वारा संचालित",
   "label.profile": "प्रोफ़ाइल",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "वास्तव काल",
   "label.referrers": "सन्दर्भदाता",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "अपेक्षित",
   "label.reset": "रीसेट",
   "label.reset-website": "Reset statistics",
   "label.role": "Role",
   "label.save": "सहेजें",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "समायोजन",
@@ -104,6 +109,7 @@
   "label.tracking-code": "ट्रैकिंग कोड",
   "label.unique-visitors": "अद्वितीय आगंतुकों",
   "label.unknown": "अज्ञात",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "उपयोगकर्ता नाम",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "विवरण देखें",
   "label.views": "दृश्य",
   "label.visitors": "आगंतुकों",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "वेबसाइटों",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "क्या आप वाकई में {target} हटाना चाहते हैं?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "वेबसाइट हटाएं",
   "message.delete-website-warning": "सभी संबद्ध डेटा को भी हटा दिया जाएगा।",
   "message.error": "कुछ गलत हो गया।",
@@ -140,6 +148,7 @@
   "message.tracking-code": "ट्रैकिंग कोड",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "{country} का आगंतुक, जो {browser} का उपयोग करता है, {os} यन्त्र पर",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "आपके पास कोई वेबसाइट कॉन्फ़िगर नहीं है।",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/hr-HR.json b/lang/hr-HR.json
index e9072a89..263852fe 100644
--- a/lang/hr-HR.json
+++ b/lang/hr-HR.json
@@ -1,120 +1,155 @@
 {
-  "label.accounts": "Računi",
-  "label.add-account": "Dodaj račun",
-  "label.add-column": "Dodaj stupac",
-  "label.add-filter": "Dodaj filter",
+  "label.access-code": "Access code",
+  "label.actions": "Actions",
+  "label.activity-log": "Activity log",
   "label.add-website": "Dodaj web stranicu",
-  "label.administrator": "Administrator",
+  "label.admin": "Administrator",
   "label.all": "Sve",
   "label.all-time": "Svo vrijeme",
-  "label.all-websites": "Sve web stranice",
+  "label.analytics": "Analytics",
+  "label.average-visit-time": "Average visit time",
   "label.back": "Natrag ",
+  "label.bounce-rate": "Bounce rate",
+  "label.browsers": "Browsers",
   "label.cancel": "Odustani",
   "label.change-password": "Promijeni lozinku",
+  "label.cities": "Cities",
+  "label.clear-all": "Clear all",
+  "label.confirm": "Confirm",
   "label.confirm-password": "Potvrdi lozinku",
-  "label.copy-to-clipboard": "Kopiraj u međuspremnik",
+  "label.continue": "Continue",
+  "label.countries": "Countries",
+  "label.create-team": "Create team",
+  "label.create-user": "Create user",
+  "label.created": "Created",
   "label.current-password": "Trenutna lozinka",
   "label.custom-range": "Prilagođeni raspon",
   "label.dashboard": "Nadzorna ploča",
+  "label.data": "Data",
   "label.date-range": "Raspon datuma",
   "label.default-date-range": "Zadani datumski raspon",
   "label.delete": "Obriši",
-  "label.delete-account": "Obriši račun",
+  "label.delete-team": "Delete team",
+  "label.delete-user": "Delete user",
   "label.delete-website": "Obriši web stranicu",
+  "label.desktop": "Desktop",
+  "label.details": "Details",
+  "label.devices": "Devices",
   "label.dismiss": "Odbaci",
   "label.domain": "Domena",
   "label.edit": "Uredi",
-  "label.edit-account": "Uredi račun",
-  "label.edit-website": "Uredi web stranicu",
+  "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "Omogući dijeljenje poveznice",
   "label.event-data": "Podaci događaja",
-  "label.field-name": "Naziv polja",
-  "label.invalid": "Neispravno",
-  "label.invalid-domain": "Neispravna domena",
+  "label.events": "Events",
+  "label.filter-combined": "Combined",
+  "label.filter-raw": "Raw",
+  "label.funnel": "Funnel",
+  "label.join": "Join",
+  "label.join-team": "Join team",
   "label.language": "Jezik",
+  "label.languages": "Languages",
+  "label.laptop": "Laptop",
   "label.last-days": "Zadnjih {x} dana",
   "label.last-hours": "Zadnjih {x} sati",
-  "label.logged-in-as": "Prijavljen kao {username}",
+  "label.leave": "Leave",
+  "label.leave-team": "Leave team",
   "label.login": "Prijava",
   "label.logout": "Odjava",
+  "label.members": "Members",
+  "label.mobile": "Mobile",
   "label.more": "Više",
   "label.name": "Ime",
   "label.new-password": "Nova lozinka",
   "label.none": "Ništa",
+  "label.operating-systems": "Operating systems",
   "label.owner": "Vlasnik",
+  "label.page-views": "Page views",
+  "label.pages": "Pages",
   "label.password": "Lozinka",
-  "label.passwords-dont-match": "Lozinke se ne podudaraju",
+  "label.powered-by": "Powered by {name}",
   "label.profile": "Profil",
+  "label.queries": "Queries",
+  "label.query": "Query",
+  "label.query-parameters": "Query parameters",
   "label.realtime": "Stvarno vrijeme",
-  "label.realtime-logs": "Trenutni zapisi",
+  "label.referrers": "Referrers",
   "label.refresh": "Osvježi",
+  "label.regenerate": "Regenerate",
+  "label.regions": "Regions",
+  "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "Potrebna",
   "label.reset": "Resetirati",
   "label.reset-website": "Resetirati web stranicu",
+  "label.role": "Role",
   "label.save": "Spremi",
-  "label.search": "Pretraži",
+  "label.screens": "Screens",
+  "label.select-date": "Select date",
+  "label.select-website": "Select website",
+  "label.sessions": "Sessions",
   "label.settings": "Postavke",
   "label.share-url": "Podijeli poveznicu",
   "label.single-day": "Jedan dan",
+  "label.tablet": "Tablet",
+  "label.team": "Team",
+  "label.team-guest": "Team guest",
+  "label.team-id": "Team ID",
+  "label.team-member": "Team member",
+  "label.team-owner": "Team owner",
+  "label.teams": "Teams",
   "label.theme": "Tema",
   "label.this-month": "Ovaj mjesec",
   "label.this-week": "Ovaj tjedan",
   "label.this-year": "Ova godina",
   "label.timezone": "Vremenska zona",
+  "label.title": "Title",
   "label.today": "Danas",
+  "label.toggle-charts": "Toggle charts",
   "label.tracking-code": "Kod za praćenje",
-  "label.type": "Tip",
+  "label.unique-visitors": "Unique visitors",
   "label.unknown": "Nepoznato",
+  "label.urls": "URLs",
+  "label.user": "User",
   "label.username": "Korisničko ime",
-  "label.value": "Vrijednost",
+  "label.users": "Users",
+  "label.view": "View",
   "label.view-details": "Pogledaj detalje",
+  "label.views": "Views",
+  "label.visitors": "Visitors",
+  "label.website": "Website",
+  "label.website-id": "Website ID",
   "label.websites": "Web stranice",
   "label.yesterday": "Jučer",
   "message.active-users": "{x} Trenutno {x, plural, one {posjetitelj} other {posjetitelja}}",
   "message.confirm-delete": "Jeste li sigurni da želite obrisati {target}?",
+  "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Jeste li sigurni da želite resetirati {target}'s statistiku?",
-  "message.copied": "Kopirano!",
-  "message.delete-warning": "Izbrisat će se svi povezani podaci.",
-  "message.edit-dashboard": "Uredi nadzornu ploču",
-  "message.failure": "Nešto je pošlo po zlu.",
-  "message.get-share-url": "Dohvati poveznicu za dijeljenje",
-  "message.get-tracking-code": "Dohvati kod za praćenje",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
+  "message.delete-website-warning": "All website data will be deleted.",
+  "message.error": "Something went wrong.",
+  "message.event-log": "{event} on {url}",
   "message.go-to-settings": "Idi u postavke",
   "message.incorrect-username-password": "Neispravno korisničke ime/lozinka.",
-  "message.log.visitor": "Posjetitelj iz {country} koristi {browser} na {os} {device}",
-  "message.new-version-available": "Nova verzija umami {version} je dostupna!",
+  "message.invalid-domain": "Invalid domain. Do not include http/https.",
+  "message.min-password-length": "Minimum length of {n} characters",
   "message.no-data-available": "Nema dostupnih podataka.",
-  "message.no-websites-configured": "Nemate konfiguriranu nijednu web stranicu.",
+  "message.no-match-password": "Passwords do not match.",
+  "message.no-teams": "You have not created any teams.",
+  "message.no-users": "There are no users.",
   "message.page-not-found": "Stranica nije pronađena.",
-  "message.powered-by": "Pokreće {name}",
-  "message.reset-warning": "Sve statistike za ovu web stranicu bit će izbrisane, ali će vaš kod za praćenje ostati netaknut.",
-  "message.save-success": "Uspješno spremljeno.",
+  "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 settings will remain intact.",
+  "message.saved": "Saved.",
   "message.share-url": "Ovo je javno dijeljena poveznica za {target}.",
-  "message.toggle-charts": "Uključi/isključi grafikone",
-  "message.track-stats": "Da biste pratili statistiku za {target}, postavite sljedeći kod u odjeljak {head} svoje web stranice.",
-  "message.type-delete": "Upišite {delete} u donji okvir za potvrdu.",
-  "message.type-reset": "  Upišite {reset} u donji okvir za potvrdu. ",
-  "metrics.actions": "Akcije",
-  "metrics.average-visit-time": "Prosječno vrijeme posjeta",
-  "metrics.bounce-rate": "Stopa napuštanja stranice",
-  "metrics.browsers": "Web preglednici",
-  "metrics.countries": "Zemlje",
-  "metrics.device.desktop": "Pc",
-  "metrics.device.laptop": "Laptop",
-  "metrics.device.mobile": "Mobitel",
-  "metrics.device.tablet": "Tablet",
-  "metrics.devices": "Uređaji",
-  "metrics.events": "Događaji",
-  "metrics.filter.combined": "Kombinirano",
-  "metrics.filter.raw": "Neobrađeni podaci",
-  "metrics.languages": "Jezici",
-  "metrics.operating-systems": "Operativni sustavi",
-  "metrics.page-views": "Pregledi stranice",
-  "metrics.pages": "Stranice",
-  "metrics.query-parameters": "Parametri upita",
-  "metrics.referrers": "Upučivaći",
-  "metrics.screens": "Zasloni",
-  "metrics.unique-visitors": "Jedinstveni posjetitelji",
-  "metrics.views": "Pregledi",
-  "metrics.visitors": "Posjetitelji"
+  "message.team-already-member": "You are already a member of the team.",
+  "message.team-not-found": "Team not found.",
+  "message.tracking-code": "To track stats for this website, place the following code in the <head>...</head> section of your HTML.",
+  "message.user-deleted": "User deleted.",
+  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}",
+  "messages.no-results-found": "No results were found.",
+  "messages.no-team-websites": "This team does not have any websites.",
+  "messages.no-websites-configured": "You do not have any websites configured.",
+  "messages.team-websites-info": "Websites can be viewed by anyone on the team."
 }
diff --git a/lang/hu-HU.json b/lang/hu-HU.json
index 803a2332..23ddf608 100644
--- a/lang/hu-HU.json
+++ b/lang/hu-HU.json
@@ -40,9 +40,11 @@
   "label.edit": "Módosítás",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "URL-megosztás engedélyezése",
+  "label.event-data": "Event data",
   "label.events": "Események",
   "label.filter-combined": "Összevont",
   "label.filter-raw": "Nyers",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -68,6 +70,7 @@
   "label.powered-by": "Működteti az {name}",
   "label.profile": "Profil",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Valós idejű",
   "label.referrers": "Hivatkozók",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "Kötelező",
   "label.reset": "Visszaállítás",
   "label.reset-website": "Reset statistics",
   "label.role": "Role",
   "label.save": "Mentés",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Beállítások",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Követési kód",
   "label.unique-visitors": "Egyedi látogatók",
   "label.unknown": "Ismeretlen",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Felhasználónév",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "Részletek",
   "label.views": "Megtekintések",
   "label.visitors": "Látogatók",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Weboldalak",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "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-reset": "Are your sure you want to reset {target}'s statistics?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Weboldal eltávolítása",
   "message.delete-website-warning": "Minden társított adat törlésre kerül.",
   "message.error": "Valami baj történt.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Követési kód",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "Látógató {country} területéről, {os} {device} eszközön, {browser} böngészőből.",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "Még nem állítottál be egyetlen weboldalt sem.",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/id-ID.json b/lang/id-ID.json
index b93172cf..b8d396c1 100644
--- a/lang/id-ID.json
+++ b/lang/id-ID.json
@@ -40,9 +40,11 @@
   "label.edit": "Sunting",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "Aktifkan URL berbagi",
+  "label.event-data": "Event data",
   "label.events": "Perihal",
   "label.filter-combined": "Gabungan",
   "label.filter-raw": "Mentah",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Bahasa",
@@ -68,6 +70,7 @@
   "label.powered-by": "Didukung oleh {name}",
   "label.profile": "Profil",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Waktu nyata",
   "label.referrers": "Perujuk",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "Wajib",
   "label.reset": "Atur ulang",
   "label.reset-website": "Atur ulang statistik",
   "label.role": "Role",
   "label.save": "Simpan",
   "label.screens": "Layar",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Pengaturan",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Kode lacak",
   "label.unique-visitors": "Pengunjung unik",
   "label.unknown": "Tidak diketahui",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Nama pengguna",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "Lihat Detil",
   "label.views": "Tampilan",
   "label.visitors": "Pengunjung",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Situs web",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "Apakah kamu yakin ingin menghapus {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Anda yakin ingin mengatur ulang statistik {target}?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Hapus situs web",
   "message.delete-website-warning": "Semua data terkait juga akan dihapus.",
   "message.error": "Ada yang salah.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Kode lacak",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "Pengunjung dari {country} dengan {browser} di {device} {os}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "Anda tidak memiliki situs web yang dikonfigurasi.",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/it-IT.json b/lang/it-IT.json
index 87c2f7c3..efdacda3 100644
--- a/lang/it-IT.json
+++ b/lang/it-IT.json
@@ -40,9 +40,11 @@
   "label.edit": "Modifica",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "Abilita URL di condivisione",
+  "label.event-data": "Event data",
   "label.events": "Eventi",
   "label.filter-combined": "Aggregati",
   "label.filter-raw": "Raw",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Lingua",
@@ -68,6 +70,7 @@
   "label.powered-by": "Powered by {name}",
   "label.profile": "Profilo",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Tempo reale",
   "label.referrers": "Referrers",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "Obbligatorio",
   "label.reset": "Reset",
   "label.reset-website": "Resetta le statistiche",
   "label.role": "Role",
   "label.save": "Salva",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Impostazioni",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Codice di tracking",
   "label.unique-visitors": "Visitatori unici",
   "label.unknown": "Sconosciuto",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Nome utente",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "Vedi dettagli",
   "label.views": "Visualizzazioni",
   "label.visitors": "Visitatori",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Siti web",
   "label.yesterday": "Ieri",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "Sei sicuro di voler eliminare {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Sei sicuro di voler azzerare le statistiche di {target}?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Elimina sito",
   "message.delete-website-warning": "Saranno eliminati anche tutti i dati associati.",
   "message.error": "Si è verificato un errore.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Codice di tracking",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "Utenti da {country} tramite {browser} su {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "Non hai ancora configurato alcun sito.",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/ja-JP.json b/lang/ja-JP.json
index 58a326bd..14031177 100644
--- a/lang/ja-JP.json
+++ b/lang/ja-JP.json
@@ -40,9 +40,11 @@
   "label.edit": "編集",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "共有リンクを有効にする",
+  "label.event-data": "Event data",
   "label.events": "イベント",
   "label.filter-combined": "パスまで",
   "label.filter-raw": "すべて表示",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -68,6 +70,7 @@
   "label.powered-by": "このシステムは {name} で実行されています。",
   "label.profile": "プロファイル",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "リアルタイム",
   "label.referrers": "リファラー",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "必須",
   "label.reset": "リセット",
   "label.reset-website": "Reset statistics",
   "label.role": "Role",
   "label.save": "保存",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "設定",
@@ -104,6 +109,7 @@
   "label.tracking-code": "トラッキングコード",
   "label.unique-visitors": "ユニーク訪問者数",
   "label.unknown": "不明",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "ユーザー名",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "詳細を見る",
   "label.views": "閲覧数",
   "label.visitors": "訪問者数",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Webサイト",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "{target}を削除してもよろしいですか？",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Webサイトの削除",
   "message.delete-website-warning": "関連するすべてのデータも削除されます。",
   "message.error": "問題が発生しました。",
@@ -140,6 +148,7 @@
   "message.tracking-code": "トラッキングコード",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "{os}（{device}）で{browser}を使用している{country}からの訪問者",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "Webサイトが設定されていません。",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/km-KH.json b/lang/km-KH.json
index 4eec564f..edcb25e7 100644
--- a/lang/km-KH.json
+++ b/lang/km-KH.json
@@ -40,9 +40,11 @@
   "label.edit": "កែប្រែ",
   "label.edit-dashboard": "កែផ្ទាំងគ្រប់គ្រង",
   "label.enable-share-url": "បើកការចែករំលែក URL",
+  "label.event-data": "Event data",
   "label.events": "ព្រឹត្តិការណ៍",
   "label.filter-combined": "រួមបញ្ចូលគ្នា",
   "label.filter-raw": "ដើម",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "ភាសា",
@@ -68,6 +70,7 @@
   "label.powered-by": "ដំណើរការដោយ {name}",
   "label.profile": "ប្រវត្តិរូប",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "ប៉ារ៉ាម៉ែត្រ Query",
   "label.realtime": "ឥលូវនេះ",
   "label.referrers": "អ្នកណែនាំ",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "ទាមទារ",
   "label.reset": "កំណត់ឡើងវិញ",
   "label.reset-website": "កំណត់ស្ថិតិឡើងវិញ",
   "label.role": "Role",
   "label.save": "រក្សាទុក",
   "label.screens": "ប្រភេទឧបករណ៍",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "ការកំណត់",
@@ -104,6 +109,7 @@
   "label.tracking-code": "លេខកូដតាមដាន",
   "label.unique-visitors": "អ្នកចូលមើលម្នាក់ៗ",
   "label.unknown": "មិនស្គាល់",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "ឈ្មោះ​អ្នកប្រើប្រាស់",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "មើលព័ត៌មានលម្អិត",
   "label.views": "អ្នកចូលមើល",
   "label.visitors": "អ្នកទស្សនា",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "គេហទំព័រ",
   "label.yesterday": "ម្សិលមិញ",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "តើអ្នកប្រាកដថាចង់លុប {target} ទេ?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "តើអ្នកប្រាកដថាចង់កំណត់ស្ថិតិរបស់ {target} ឡើងវិញទេ?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "លុបគេហទំព័រ",
   "message.delete-website-warning": "ទិន្នន័យដែលពាក់ព័ន្ធទាំងអស់នឹងត្រូវបានលុបផងដែរ។",
   "message.error": "មាន​អ្វីមួយ​មិន​ប្រក្រតី។",
@@ -140,6 +148,7 @@
   "message.tracking-code": "លេខកូដតាមដាន",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "អ្នកមើលពីប្រទេស {country} ប្រើប្រាស់កម្មវិធី {browser} លើឧបករណ៍ {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "អ្នកមិនទាន់បានដាក់គេហទំព័រណាមួយចូលទេ។",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/ko-KR.json b/lang/ko-KR.json
index 633552a7..d927dd77 100644
--- a/lang/ko-KR.json
+++ b/lang/ko-KR.json
@@ -40,9 +40,11 @@
   "label.edit": "편집",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "URL 공유 활성화",
+  "label.event-data": "Event data",
   "label.events": "이벤트",
   "label.filter-combined": "합쳐서 보기",
   "label.filter-raw": "전체 보기",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -68,6 +70,7 @@
   "label.powered-by": "이 시스템은 {name}에서 구동되고 있습니다.",
   "label.profile": "프로필",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "실시간",
   "label.referrers": "리퍼러",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "필수",
   "label.reset": "리셋",
   "label.reset-website": "Reset statistics",
   "label.role": "Role",
   "label.save": "저장",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "설정",
@@ -104,6 +109,7 @@
   "label.tracking-code": "추적 코드",
   "label.unique-visitors": "순방문자(UV)",
   "label.unknown": "알 수 없음",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "사용자명",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "상세보기",
   "label.views": "조회수",
   "label.visitors": "방문객",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "웹사이트",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "{target}을(를) 삭제하시겠습니까?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "웹사이트 삭제",
   "message.delete-website-warning": "관련된 모든 데이터도 삭제됩니다.",
   "message.error": "오류가 발생하였습니다.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "추적 코드",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "{os} {device}에서 {browser}을(를) 사용하는 {country}의 방문자",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "구성된 웹 사이트가 없습니다.",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/lt-LT.json b/lang/lt-LT.json
index 768c32dd..9ccf6202 100644
--- a/lang/lt-LT.json
+++ b/lang/lt-LT.json
@@ -40,9 +40,11 @@
   "label.edit": "Redaguoti",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "Įjungti bendrinimą su nuoroda",
+  "label.event-data": "Event data",
   "label.events": "Įvykiai",
   "label.filter-combined": "Kombinuoti",
   "label.filter-raw": "Neapdoroti",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -68,6 +70,7 @@
   "label.powered-by": "Powered by {name}",
   "label.profile": "Profilis",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Realiuoju laiku",
   "label.referrers": "Referrers",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "Reikalinga",
   "label.reset": "Atstatyti",
   "label.reset-website": "Atstatyti statistikos duomenis",
   "label.role": "Role",
   "label.save": "Išsaugoti",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Nustatymai",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Sekimo kodas",
   "label.unique-visitors": "Unikalūs lankytojai",
   "label.unknown": "Nežinoma",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Vartotojo vardas",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "Peržiūrėti detaliau",
   "label.views": "Peržiūros",
   "label.visitors": "Lankytojai",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Svetainės",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "Ar esate tikri, jog norite ištrinti svetainę {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are esate tikri, jog norite atstatyti svetainės {target} statistikos duomenis?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Ištrinti svetainę",
   "message.delete-website-warning": "Visi susiję duomenys taip pat bus ištrinti.",
   "message.error": "Kažkas įvyko ne taip.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Sekimo kodas",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "Lankytojas iš {country}, naudojantis {browser} sistemoje {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "Jūs nesate susikonfiguravę jokių svetainių.",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/mn-MN.json b/lang/mn-MN.json
index b15076ad..e9d9fa34 100644
--- a/lang/mn-MN.json
+++ b/lang/mn-MN.json
@@ -40,9 +40,11 @@
   "label.edit": "Засах",
   "label.edit-dashboard": "Хянах самбар засах",
   "label.enable-share-url": "Хуваалцах холбоос идэвхжүүлэх",
+  "label.event-data": "Event data",
   "label.events": "Үйлдэл",
   "label.filter-combined": "Нэгтгэсэн",
   "label.filter-raw": "Түүхий",
+  "label.funnel": "Funnel",
   "label.join": "Нэгдэх",
   "label.join-team": "Багт нэгдэх",
   "label.language": "Хэл",
@@ -68,6 +70,7 @@
   "label.powered-by": "{name} дээр суурилсан",
   "label.profile": "Бүртгэл",
   "label.queries": "Query-нүүд",
+  "label.query": "Query",
   "label.query-parameters": "Query параметр",
   "label.realtime": "Яг одоо",
   "label.referrers": "Чиглүүлэгч",
@@ -75,12 +78,14 @@
   "label.regenerate": "Дахин үүсгэх",
   "label.regions": "Бүсүүд",
   "label.remove": "Устгах",
+  "label.reports": "Reports",
   "label.required": "Шаардлагатай",
   "label.reset": "Дахин эхлүүлэх",
   "label.reset-website": "Тоон үзүүлэлтийг дахин эхлүүлэх",
   "label.role": "Эрх",
   "label.save": "Хадгалах",
   "label.screens": "Дэлгэц",
+  "label.select-date": "Select date",
   "label.select-website": "Веб сонгох",
   "label.sessions": "Sessions",
   "label.settings": "Тохиргоо",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Мөрдөх код",
   "label.unique-visitors": "Зочин",
   "label.unknown": "Тодорхойгүй",
+  "label.urls": "URLs",
   "label.user": "Хэрэглэгч",
   "label.username": "Хэрэглэгчийн нэр",
   "label.users": "Хэрэглэгчид",
@@ -111,6 +117,7 @@
   "label.view-details": "Дэлгэрүүлж харах",
   "label.views": "Үзсэн",
   "label.visitors": "Зочин",
+  "label.website": "Website",
   "label.website-id": "Вебийн ID",
   "label.websites": "Вебүүд",
   "label.yesterday": "Өчигдөр",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "Та {target}-г устгахдаа итгэлтэй байна уу?",
   "message.confirm-leave": "Та {target}-с гарахдаа итгэлтэй байна уу?",
   "message.confirm-reset": "Та {target}-н тоон үзүүлэлтүүдийг устгахдаа итгэлтэй байна уу?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Веб устгахын тулд доорх хэсэгт {confirmation} гэж бичиж, баталгаажуулна уу.",
   "message.delete-website-warning": "Энэ вебтэй холбоотой бүх өгөгдөл устах болно.",
   "message.error": "Ямар нэг зүйл буруу боллоо.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Энэ вебийн хандалтуудыг мөрдөхийн тулд доорх кодыг HTML-нхээ <head>...</head> хэсэгт байрлуулна уу.",
   "message.user-deleted": "Хэрэглэгч устсан.",
   "message.visitor-log": "{country} улсаас {os} {device} дээр {browser} хөтөч ашиглан орсон",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "Энэ багт ямар ч веб алга.",
   "messages.no-websites-configured": "Та ямар нэгэн веб тохируулаагүй байна.",
   "messages.team-websites-info": "Вебийг багийн бүх гишүүд үзэж болно."
diff --git a/lang/ms-MY.json b/lang/ms-MY.json
index a9469af8..97c37c58 100644
--- a/lang/ms-MY.json
+++ b/lang/ms-MY.json
@@ -40,9 +40,11 @@
   "label.edit": "Edit",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "Aktifkan url berkongsi",
+  "label.event-data": "Event data",
   "label.events": "Peristiwa",
   "label.filter-combined": "Digabungkan",
   "label.filter-raw": "Mentah",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -68,6 +70,7 @@
   "label.powered-by": "Disediakan oleh {name}",
   "label.profile": "Profil",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Siaran langsung",
   "label.referrers": "Perujuk",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "Diperlukan",
   "label.reset": "Tetapkan semula",
   "label.reset-website": "Reset statistics",
   "label.role": "Role",
   "label.save": "Simpan",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Tetapan",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Kod penjejakan",
   "label.unique-visitors": "Pelawat unik",
   "label.unknown": "Tidak diketahui",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Nama pengguna",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "Lihat butiran",
   "label.views": "Lawatan",
   "label.visitors": "Pelawat",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Laman web",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "Pastikah anda ingin memadam {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Padam laman web",
   "message.delete-website-warning": "Semua data yang berkaitan juga akan dihapuskan.",
   "message.error": "Ada yang tidak kena.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Kod penjejakan",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "Pelawat dari {country} mengguna {browser} pada {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "Anda tidak ada sebarang laman web yang telah dikonfigurasikan.",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/nb-NO.json b/lang/nb-NO.json
index 4bb8c74f..84ab9b9f 100644
--- a/lang/nb-NO.json
+++ b/lang/nb-NO.json
@@ -40,9 +40,11 @@
   "label.edit": "Rediger",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "Aktiver delings-URL",
+  "label.event-data": "Event data",
   "label.events": "Arrangementer",
   "label.filter-combined": "Kombinert",
   "label.filter-raw": "Rå",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Språk",
@@ -68,6 +70,7 @@
   "label.powered-by": "Drevet av {name}",
   "label.profile": "Profil",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Sanntid",
   "label.referrers": "Referanser",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "Påkrevd",
   "label.reset": "Nullstill",
   "label.reset-website": "Nullstill statistikk",
   "label.role": "Role",
   "label.save": "Lagre",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Innstillinger",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Sporingskode",
   "label.unique-visitors": "Unike besøkende",
   "label.unknown": "Ukjent",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Brukernavn",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "Vis detaljer",
   "label.views": "Visninger",
   "label.visitors": "Besøkende",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Nettsteder",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "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-reset": "Er du sikker på at du vil nullstille {target}'s statistikk?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Slett nettstedet",
   "message.delete-website-warning": "Alle tilknyttede data slettes også.",
   "message.error": "Noe gikk galt.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Sporingskode",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "Besøkende fra {country} med {browser} på {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "Du har ikke satt opp noen nettsteder.",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/nl-NL.json b/lang/nl-NL.json
index b86ff423..9291dace 100644
--- a/lang/nl-NL.json
+++ b/lang/nl-NL.json
@@ -40,9 +40,11 @@
   "label.edit": "Bewerken",
   "label.edit-dashboard": "Dashboard aanpassen",
   "label.enable-share-url": "Sta delen via openbare URL toe",
+  "label.event-data": "Event data",
   "label.events": "Gebeurtenissen",
   "label.filter-combined": "Gecombineerd",
   "label.filter-raw": "Ruw",
+  "label.funnel": "Funnel",
   "label.join": "Lid worden",
   "label.join-team": "Word lid van een team",
   "label.language": "Taal",
@@ -68,6 +70,7 @@
   "label.powered-by": "mogelijk gemaakt door {name}",
   "label.profile": "Profiel",
   "label.queries": "Parameters",
+  "label.query": "Query",
   "label.query-parameters": "URL-parameters",
   "label.realtime": "Actueel",
   "label.referrers": "Verwijzers",
@@ -75,12 +78,14 @@
   "label.regenerate": "Opnieuw genereren",
   "label.regions": "Regio's",
   "label.remove": "Verwijderen",
+  "label.reports": "Reports",
   "label.required": "Verplicht",
   "label.reset": "Opnieuw instellen",
   "label.reset-website": "Statistieken opnieuw instellen",
   "label.role": "Gebruikersrol",
   "label.save": "Opslaan",
   "label.screens": "Schermen",
+  "label.select-date": "Select date",
   "label.select-website": "Website selecteren",
   "label.sessions": "Sessies",
   "label.settings": "Instellingen",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Volgcode",
   "label.unique-visitors": "Unieke bezoekers",
   "label.unknown": "Onbekend",
+  "label.urls": "URLs",
   "label.user": "Gebruiker",
   "label.username": "Gebruikersnaam",
   "label.users": "Gebruikers",
@@ -111,6 +117,7 @@
   "label.view-details": "Meer details",
   "label.views": "Weergaven",
   "label.visitors": "Bezoekers",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Websites",
   "label.yesterday": "Gisteren",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "Weet je zeker dat je {target} wilt verwijderen?",
   "message.confirm-leave": "Weet je zeker dat je {target} wilt verlaten?",
   "message.confirm-reset": "Weet je zeker dat je de statistieken van {target} opnieuw wilt instellen?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Website verwijderen",
   "message.delete-website-warning": "Alle verwante gegezens zullen ook verwijderd worden.",
   "message.error": "Er is iets misgegaan.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Volgcode",
   "message.user-deleted": "Gebruiker verwijderd.",
   "message.visitor-log": "Bezoeker uit {country} met {browser} op een {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "Er zijn geen websites gekoppeld aan dit team.",
   "messages.no-websites-configured": "Je hebt geen websites ingesteld.",
   "messages.team-websites-info": "Websites kunnen door iedereen in het team worden bekeken."
diff --git a/lang/pl-PL.json b/lang/pl-PL.json
index 919fd9b3..899ad891 100644
--- a/lang/pl-PL.json
+++ b/lang/pl-PL.json
@@ -40,9 +40,11 @@
   "label.edit": "Edytuj",
   "label.edit-dashboard": "Edytuj panel",
   "label.enable-share-url": "Włącz udostępnianie adresu URL",
+  "label.event-data": "Event data",
   "label.events": "Zdarzenia",
   "label.filter-combined": "Połączone",
   "label.filter-raw": "Surowe dane",
+  "label.funnel": "Funnel",
   "label.join": "Dołącz",
   "label.join-team": "Dołącz do zespołu",
   "label.language": "Język",
@@ -68,6 +70,7 @@
   "label.powered-by": "Obsługiwane przez {name}",
   "label.profile": "Profil",
   "label.queries": "Zapytania",
+  "label.query": "Query",
   "label.query-parameters": "Parametry query",
   "label.realtime": "Czas rzeczywisty",
   "label.referrers": "Źródła odsyłające",
@@ -75,12 +78,14 @@
   "label.regenerate": "Wygeneruj ponownie",
   "label.regions": "Regiony",
   "label.remove": "Usuń",
+  "label.reports": "Reports",
   "label.required": "Wymagany",
   "label.reset": "Zresetuj",
   "label.reset-website": "Zresetuj statystyki",
   "label.role": "Role",
   "label.save": "Zapisz",
   "label.screens": "Ekrany",
+  "label.select-date": "Select date",
   "label.select-website": "Wybierz witrynę",
   "label.sessions": "Sesje",
   "label.settings": "Ustawienia",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Kod śledzenia",
   "label.unique-visitors": "Unikalni odwiedzający",
   "label.unknown": "Nieznany",
+  "label.urls": "URLs",
   "label.user": "Użytkownik",
   "label.username": "Nazwa użytkownika",
   "label.users": "Użytkownicy",
@@ -111,6 +117,7 @@
   "label.view-details": "Pokaż szczegóły",
   "label.views": "Wyświetlenia",
   "label.visitors": "Odwiedzający",
+  "label.website": "Website",
   "label.website-id": "ID witryny",
   "label.websites": "Witryny",
   "label.yesterday": "Wczoraj",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "Czy na pewno chcesz usunąć {target}?",
   "message.confirm-leave": "Czy na pewno chcesz opuścić {target}?",
   "message.confirm-reset": "Czy na pewno chcesz zresetować statystyki {target}?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Usuń witrynę",
   "message.delete-website-warning": "Wszystkie powiązane dane również zostaną usunięte.",
   "message.error": "Coś poszło nie tak.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Kod śledzenia",
   "message.user-deleted": "Użytkownik usunięty.",
   "message.visitor-log": "Odwiedzający z {country} używa {browser} na {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "Ten zespół nie ma żadnych witryn internetowych.",
   "messages.no-websites-configured": "Nie masz skonfigurowanych żadnych witryn internetowych.",
   "messages.team-websites-info": "Strony internetowe mogą być przeglądane przez każdego członka zespołu."
diff --git a/lang/pt-BR.json b/lang/pt-BR.json
index 590cb33c..0835544f 100644
--- a/lang/pt-BR.json
+++ b/lang/pt-BR.json
@@ -40,9 +40,11 @@
   "label.edit": "Editar",
   "label.edit-dashboard": "Editar painel",
   "label.enable-share-url": "Ativar link de compartilhamento",
+  "label.event-data": "Event data",
   "label.events": "Eventos",
   "label.filter-combined": "Combinado",
   "label.filter-raw": "Dados brutos",
+  "label.funnel": "Funnel",
   "label.join": "Entrar",
   "label.join-team": "Entrar no time",
   "label.language": "Idioma",
@@ -68,6 +70,7 @@
   "label.powered-by": "Distribuído por {name}",
   "label.profile": "Perfil",
   "label.queries": "Parâmetros",
+  "label.query": "Query",
   "label.query-parameters": "Parâmetros de Consulta",
   "label.realtime": "Tempo real",
   "label.referrers": "Referências",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regerar",
   "label.regions": "Regiões",
   "label.remove": "Remover",
+  "label.reports": "Reports",
   "label.required": "Obrigatório",
   "label.reset": "Redefinir",
   "label.reset-website": "Redefinir estatísticas",
   "label.role": "Papel",
   "label.save": "Salvar",
   "label.screens": "Telas",
+  "label.select-date": "Select date",
   "label.select-website": "Selecionar site",
   "label.sessions": "Sessões",
   "label.settings": "Configurações",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Código de rastreamento",
   "label.unique-visitors": "Visitantes únicos",
   "label.unknown": "Desconhecido",
+  "label.urls": "URLs",
   "label.user": "Usuário",
   "label.username": "Nome de usuário",
   "label.users": "Usuários",
@@ -111,6 +117,7 @@
   "label.view-details": "Ver detalhes",
   "label.views": "Visualizações",
   "label.visitors": "Visitantes",
+  "label.website": "Website",
   "label.website-id": "ID do Site",
   "label.websites": "Sites",
   "label.yesterday": "Ontem",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "Deseja realmente remover {target}?",
   "message.confirm-leave": "Você tem certeza que deseja sair de {target}?",
   "message.confirm-reset": "Você tem certeza que deseja redefinir as estatísticas de {target}?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Remover site",
   "message.delete-website-warning": "Todos os dados associados também serão eliminados.",
   "message.error": "Ocorreu um erro.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Código de rastreamento",
   "message.user-deleted": "Usuário removido.",
   "message.visitor-log": "Visitante de {country} usando {browser} no {device} {os}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "Este time não possui nenhum site.",
   "messages.no-websites-configured": "Nenhum site foi configurado ainda.",
   "messages.team-websites-info": "Os sites podem ser visualizados por qualquer membro da equipe."
diff --git a/lang/pt-PT.json b/lang/pt-PT.json
index e67479e5..e39c89cc 100644
--- a/lang/pt-PT.json
+++ b/lang/pt-PT.json
@@ -40,9 +40,11 @@
   "label.edit": "Editar",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "Ativar link de partilha",
+  "label.event-data": "Event data",
   "label.events": "Eventos",
   "label.filter-combined": "Combinado",
   "label.filter-raw": "Dados brutos",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Língua",
@@ -68,6 +70,7 @@
   "label.powered-by": "Distribuído por {name}",
   "label.profile": "Perfil",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Tempo real",
   "label.referrers": "Referenciadores",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "Obrigatório",
   "label.reset": "Repor",
   "label.reset-website": "Repor estatísticas",
   "label.role": "Role",
   "label.save": "Guardar",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Definições",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Código de rastreamento",
   "label.unique-visitors": "Visitantes únicos",
   "label.unknown": "Desconhecido",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Nome de utilizador",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "Ver detalhes",
   "label.views": "Visualizações",
   "label.visitors": "Visitantes",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Websites",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "Tem a certeza que pretende eliminar {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Tem a certeza que pretende restaurar as estatísticas de {target}?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Eliminar website",
   "message.delete-website-warning": "Todos os dados associados também serão eliminados.",
   "message.error": "Ocorreu um erro.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Código de rastreamento",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "Visitante de {country} a usar {browser} no {device} {os}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "Não tens nenhum website configurado.",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/ro-RO.json b/lang/ro-RO.json
index deefd899..22d93713 100644
--- a/lang/ro-RO.json
+++ b/lang/ro-RO.json
@@ -40,9 +40,11 @@
   "label.edit": "Editare",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "Activare adresă URL de distribuire",
+  "label.event-data": "Event data",
   "label.events": "Evenimente",
   "label.filter-combined": "Combinat",
   "label.filter-raw": "Brut",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -68,6 +70,7 @@
   "label.powered-by": "Cu sprijinul {name}",
   "label.profile": "Profil",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Realtime",
   "label.referrers": "Site-uri de proveniență",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "Obligatoriu",
   "label.reset": "Resetează",
   "label.reset-website": "Resetează statisticile pentru site",
   "label.role": "Role",
   "label.save": "Salvează",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Setări",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Cod de urmărire",
   "label.unique-visitors": "Vizitatori unici",
   "label.unknown": "Necunoscut",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Nume utilizator",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "Vizualizare detalii",
   "label.views": "Vizualizări",
   "label.visitors": "Vizitatori",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Site-uri web",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "Sunteți sigur că doriți să ștergeți {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Sunteți sigur că doriți să resetați statisticile pentru {target}?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Ștergere site web",
   "message.delete-website-warning": "Toate datele asociate vor fi șterse, de asemenea.",
   "message.error": "Ceva n-a mers bine.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Cod de urmărire",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "Vizitator din {country} folosind {browser} pe {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "Nu aveți niciun site web configurat.",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/ru-RU.json b/lang/ru-RU.json
index c5093c8c..475d9598 100644
--- a/lang/ru-RU.json
+++ b/lang/ru-RU.json
@@ -40,9 +40,11 @@
   "label.edit": "Редактировать",
   "label.edit-dashboard": "Редактировать дашборд",
   "label.enable-share-url": "Разрешить делиться ссылкой",
+  "label.event-data": "Event data",
   "label.events": "События",
   "label.filter-combined": "Объединенные",
   "label.filter-raw": "Сырые данные",
+  "label.funnel": "Funnel",
   "label.join": "Присоединиться",
   "label.join-team": "Присоединиться к команде",
   "label.language": "Язык",
@@ -68,6 +70,7 @@
   "label.powered-by": "На движке {name}",
   "label.profile": "Профиль",
   "label.queries": "Запросы",
+  "label.query": "Query",
   "label.query-parameters": "Параметры запроса",
   "label.realtime": "Реальное время",
   "label.referrers": "Источники",
@@ -75,12 +78,14 @@
   "label.regenerate": "Обновить",
   "label.regions": "Регионы",
   "label.remove": "Удалить",
+  "label.reports": "Reports",
   "label.required": "Обязательное",
   "label.reset": "Сбросить",
   "label.reset-website": "Сбросить статистику",
   "label.role": "Роль",
   "label.save": "Сохранить",
   "label.screens": "Экраны",
+  "label.select-date": "Select date",
   "label.select-website": "Выбрать сайт",
   "label.sessions": "Сессии",
   "label.settings": "Настройки",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Код отслеживания",
   "label.unique-visitors": "Уникальные посетители",
   "label.unknown": "Неизвестно",
+  "label.urls": "URLs",
   "label.user": "Пользователь",
   "label.username": "Имя пользователя",
   "label.users": "Пользователи",
@@ -111,6 +117,7 @@
   "label.view-details": "Посмотреть детали",
   "label.views": "Просмотры",
   "label.visitors": "Посетители",
+  "label.website": "Website",
   "label.website-id": "ID сайта",
   "label.websites": "Сайты",
   "label.yesterday": "Вчера",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "Вы уверены, что хотите удалить {target}?",
   "message.confirm-leave": "Вы уверены, что хотите уйти {target}?",
   "message.confirm-reset": "Вы уверены, что хотите сбросить статистику {target}?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Удалить сайт",
   "message.delete-website-warning": "Все связанные данные будут также удалены.",
   "message.error": "Что-то пошло не так.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Код отслеживания",
   "message.user-deleted": "Пользователь удален.",
   "message.visitor-log": "Посетитель из {country} используя {browser} на {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "У этой команды нет ни одного сайта.",
   "messages.no-websites-configured": "У вас нет настроенных сайтов.",
   "messages.team-websites-info": "Сайты могут просматривать все члены команды."
diff --git a/lang/si-LK.json b/lang/si-LK.json
index 33346087..c592790d 100644
--- a/lang/si-LK.json
+++ b/lang/si-LK.json
@@ -1,120 +1,155 @@
 {
-  "label.accounts": "ගිණුම්",
-  "label.add-account": "ගිණුම එකතු කරන්න",
-  "label.add-column": "තීරුව එක් කරන්න",
-  "label.add-filter": "පෙරහන එකතු කරන්න",
+  "label.access-code": "Access code",
+  "label.actions": "Actions",
+  "label.activity-log": "Activity log",
   "label.add-website": "වෙබ් අඩවිය එක් කරන්න",
-  "label.administrator": "පරිපාලක",
+  "label.admin": "Administrator",
   "label.all": "සියල්ල",
   "label.all-time": "හැම වෙලාවෙම",
-  "label.all-websites": "සියලුම වෙබ් අඩවි",
+  "label.analytics": "Analytics",
+  "label.average-visit-time": "Average visit time",
   "label.back": "ආපසු",
+  "label.bounce-rate": "Bounce rate",
+  "label.browsers": "Browsers",
   "label.cancel": "අවලංගු කරන්න",
   "label.change-password": "මුරපදය වෙනස් කරන්න",
+  "label.cities": "Cities",
+  "label.clear-all": "Clear all",
+  "label.confirm": "Confirm",
   "label.confirm-password": "මුරපදය සත්‍යාපනය කරන්න",
-  "label.copy-to-clipboard": "පසුරු පුවරුවට පිටපත් කරන්න",
+  "label.continue": "Continue",
+  "label.countries": "Countries",
+  "label.create-team": "Create team",
+  "label.create-user": "Create user",
+  "label.created": "Created",
   "label.current-password": "වත්මන් මුරපදය",
   "label.custom-range": "අභිරුචි පරාසය",
   "label.dashboard": "උපකරණ පුවරුව",
+  "label.data": "Data",
   "label.date-range": "දින පරාසය",
   "label.default-date-range": "පෙරනිමි දින පරාසය",
   "label.delete": "මකන්න",
-  "label.delete-account": "ගිණුම මකන්න",
+  "label.delete-team": "Delete team",
+  "label.delete-user": "Delete user",
   "label.delete-website": "වෙබ් අඩවිය මකන්න",
+  "label.desktop": "Desktop",
+  "label.details": "Details",
+  "label.devices": "Devices",
   "label.dismiss": "මගහරින්න",
   "label.domain": "වසම",
   "label.edit": "සංස්කරණය කරන්න",
-  "label.edit-account": "ගිණුම සංස්කරණය කරන්න",
-  "label.edit-website": "වෙබ් අඩවිය සංස්කරණය කරන්න",
+  "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "බෙදාගැනීමේ URL සබල කරන්න",
   "label.event-data": "සිදුවීම් දත්ත",
-  "label.field-name": "ක්ෂේත්‍ර නාම",
-  "label.invalid": "වලංගු නැත",
-  "label.invalid-domain": "වලංගු නොවන වසමක්",
+  "label.events": "Events",
+  "label.filter-combined": "Combined",
+  "label.filter-raw": "Raw",
+  "label.funnel": "Funnel",
+  "label.join": "Join",
+  "label.join-team": "Join team",
   "label.language": "භාෂාව",
+  "label.languages": "Languages",
+  "label.laptop": "Laptop",
   "label.last-days": "අන්තිම {x} දින",
   "label.last-hours": "අන්තිම {x} පැය",
-  "label.logged-in-as": "ලොග් වී ඇත්තේ {username}",
+  "label.leave": "Leave",
+  "label.leave-team": "Leave team",
   "label.login": "ලොග් වෙන්න",
   "label.logout": "පිටවීම",
+  "label.members": "Members",
+  "label.mobile": "Mobile",
   "label.more": "තවත්",
   "label.name": "නම",
   "label.new-password": "අලුත් මුරපදය",
   "label.none": "කිසිවක් නැත",
+  "label.operating-systems": "Operating systems",
   "label.owner": "හිමිකරු",
+  "label.page-views": "Page views",
+  "label.pages": "Pages",
   "label.password": "මුරපදය",
-  "label.passwords-dont-match": "මුරපද නොගැලපේ",
+  "label.powered-by": "Powered by {name}",
   "label.profile": "පැතිකඩ",
+  "label.queries": "Queries",
+  "label.query": "Query",
+  "label.query-parameters": "Query parameters",
   "label.realtime": "තත්ය කාල",
-  "label.realtime-logs": "තත්‍ය කාලීන ලොග්",
+  "label.referrers": "Referrers",
   "label.refresh": "නැවුම් කරන්න",
+  "label.regenerate": "Regenerate",
+  "label.regions": "Regions",
+  "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "අවශ්‍යයි",
   "label.reset": "යළි පිහිටුවන්න",
   "label.reset-website": "සංඛ්යා ලේඛන නැවත සකසන්න",
+  "label.role": "Role",
   "label.save": "සුරකින්න",
-  "label.search": "සෙවීම",
+  "label.screens": "Screens",
+  "label.select-date": "Select date",
+  "label.select-website": "Select website",
+  "label.sessions": "Sessions",
   "label.settings": "සැකසුම්",
   "label.share-url": "බෙදාගැනීමේ URL",
   "label.single-day": "තනි දවස",
+  "label.tablet": "Tablet",
+  "label.team": "Team",
+  "label.team-guest": "Team guest",
+  "label.team-id": "Team ID",
+  "label.team-member": "Team member",
+  "label.team-owner": "Team owner",
+  "label.teams": "Teams",
   "label.theme": "තේමාව",
   "label.this-month": "මෙ මාසය",
   "label.this-week": "මේ සතිය",
   "label.this-year": "මේ අවුරුද්ද",
   "label.timezone": "වේලා කලාපය",
+  "label.title": "Title",
   "label.today": "අද",
+  "label.toggle-charts": "Toggle charts",
   "label.tracking-code": "ලුහුබැඳීමේ කේතය",
-  "label.type": "වර්ගය",
+  "label.unique-visitors": "Unique visitors",
   "label.unknown": "නොදනී",
+  "label.urls": "URLs",
+  "label.user": "User",
   "label.username": "පරිශීලක නාමය",
-  "label.value": "වටිනාකම",
+  "label.users": "Users",
+  "label.view": "View",
   "label.view-details": "තොරතුරු පෙන්වන්න",
+  "label.views": "Views",
+  "label.visitors": "Visitors",
+  "label.website": "Website",
+  "label.website-id": "Website ID",
   "label.websites": "වෙබ් අඩවි",
   "label.yesterday": "ඊයේ",
   "message.active-users": "{x} දැන් {x, plural, one {අමුත්තා} other {අමුත්තන්}}",
   "message.confirm-delete": "{target} මකා දැමීම ගැන විශ්වාසද?",
+  "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "{target} ට අදාල සංඛ්‍යාලේඛන නැවත පිහිටුවීමට අවශ්‍යද?",
-  "message.copied": "පිටපත් කරගත්තා!",
-  "message.delete-warning": "සියලුම ආශ්‍රිත දත්ත ද මකා දැමෙනු ඇත.",
-  "message.edit-dashboard": "උපකරණ පුවරුව සංස්කරණය කරන්න",
-  "message.failure": "යම් ගැටලුවක් මතු වී ඇත.",
-  "message.get-share-url": "බෙදාගැනීමේ URL ලබා ගන්න",
-  "message.get-tracking-code": "ලුහුබැඳීමේ කේතය ලබා ගන්න",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
+  "message.delete-website-warning": "All website data will be deleted.",
+  "message.error": "Something went wrong.",
+  "message.event-log": "{event} on {url}",
   "message.go-to-settings": "සැකසීම් වෙත යන්න",
   "message.incorrect-username-password": "වැරදි පරිශීලක නාමය/මුරපදය.",
-  "message.log.visitor": "{country} වලින් පැමිණි අමුත්තකු {device} එකේ, මේ {os} එකේ, මේ {browser} එකෙන් ඉන්නවා",
-  "message.new-version-available": "umami අලුත්ම {version} වන අනුවාදය නිකුත් උනා!",
+  "message.invalid-domain": "Invalid domain. Do not include http/https.",
+  "message.min-password-length": "Minimum length of {n} characters",
   "message.no-data-available": "පෙන්වීමට දත්ත නොමැත.",
-  "message.no-websites-configured": "ඔබට වින්‍යාස කර ඇති වෙබ් අඩවි කිසිවක් නොමැත.",
+  "message.no-match-password": "Passwords do not match.",
+  "message.no-teams": "You have not created any teams.",
+  "message.no-users": "There are no users.",
   "message.page-not-found": "පිටුව හමු නොවීය.",
-  "message.powered-by": "බල ගැන්වුයේ {name}",
-  "message.reset-warning": "සියලුම සංඛ්‍යාලේඛන මකා දමනු ඇත. නමුත් ඔබගේ නිරීක්ෂණ කේතය නොවෙනස්ව පවතිනු ඇත.",
-  "message.save-success": "සාර්තකව සුරැකිණි.",
+  "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 settings will remain intact.",
+  "message.saved": "Saved.",
   "message.share-url": "මේ {target} සඳහා ප්‍රසිද්ධියේ බෙදාගත් URL එකයි.",
-  "message.toggle-charts": "ප්‍රස්ථාර ටොගල් කරන්න",
-  "message.track-stats": "{target} හි සංඛ්යාලේඛන බැලීම සදහා, පහත කේතය {head} කොටසට ඇතුලත් කරන්න.",
-  "message.type-delete": "සත්‍යාපනය සදහා {delete} ලෙස පහල කොටුවේ ටයිප් කරන්න",
-  "message.type-reset": "සත්‍යාපනය සදහා {reset} ලෙස පහල කොටුවේ ටයිප් කරන්න",
-  "metrics.actions": "ක්රියාවන්",
-  "metrics.average-visit-time": "සාමාන්‍ය සංචාර කාලය",
-  "metrics.bounce-rate": "හැරී යන ප්‍රමාණය",
-  "metrics.browsers": "බ්‍රව්සර්",
-  "metrics.countries": "රටවල්",
-  "metrics.device.desktop": "ඩෙස්ක්ටොප්",
-  "metrics.device.laptop": "ලැප්ටොප්",
-  "metrics.device.mobile": "ජංගම",
-  "metrics.device.tablet": "ටැබ්ලට්",
-  "metrics.devices": "උපකරණ",
-  "metrics.events": "සිද්ධීන්",
-  "metrics.filter.combined": "ඒකාබද්ධ",
-  "metrics.filter.raw": "අමු",
-  "metrics.languages": "භාෂා",
-  "metrics.operating-systems": "මෙහෙයුම් පද්ධති",
-  "metrics.page-views": "පිටු බැලීම්",
-  "metrics.pages": "පිටු",
-  "metrics.query-parameters": "විමසුම් පරාමිතීන්",
-  "metrics.referrers": "යොමු කරන්නන්",
-  "metrics.screens": "තිර",
-  "metrics.unique-visitors": "අලුත්ම අමුත්තන්",
-  "metrics.views": "බැලූ ගණන",
-  "metrics.visitors": "අමුත්තන්"
+  "message.team-already-member": "You are already a member of the team.",
+  "message.team-not-found": "Team not found.",
+  "message.tracking-code": "To track stats for this website, place the following code in the <head>...</head> section of your HTML.",
+  "message.user-deleted": "User deleted.",
+  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}",
+  "messages.no-results-found": "No results were found.",
+  "messages.no-team-websites": "This team does not have any websites.",
+  "messages.no-websites-configured": "You do not have any websites configured.",
+  "messages.team-websites-info": "Websites can be viewed by anyone on the team."
 }
diff --git a/lang/sk-SK.json b/lang/sk-SK.json
index 2d05cd2e..57948263 100644
--- a/lang/sk-SK.json
+++ b/lang/sk-SK.json
@@ -40,9 +40,11 @@
   "label.edit": "Upraviť",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "Povoliť zdielanie URL",
+  "label.event-data": "Event data",
   "label.events": "Udalosti",
   "label.filter-combined": "Kombinácie",
   "label.filter-raw": "Nezpracované",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -68,6 +70,7 @@
   "label.powered-by": "Powered by {name}",
   "label.profile": "Profil",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Aktuálne",
   "label.referrers": "Odkazy",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "Povinné",
   "label.reset": "Reset",
   "label.reset-website": "Reset statistics",
   "label.role": "Role",
   "label.save": "Uložiť",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Nastavenia",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Sledovací kód",
   "label.unique-visitors": "Jedinečné návštevy",
   "label.unknown": "Neznámý",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Užívateľské meno",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "Zobraziť detaily",
   "label.views": "Zobrazení",
   "label.visitors": "Návštevy",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Weby",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "Naozaj zmazať {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Zmazať web",
   "message.delete-website-warning": "Všetky príbuzné data budu tiež zmazané.",
   "message.error": "Niečo sa pokazilo.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Sledovací kód",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "Návštevník z {country} s prehliadačom {browser} na {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "Nemáte nastavený žiadny web.",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/sl-SI.json b/lang/sl-SI.json
index 459e5e7f..b27b2065 100644
--- a/lang/sl-SI.json
+++ b/lang/sl-SI.json
@@ -40,9 +40,11 @@
   "label.edit": "Uredi",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "Omogoči URL za skupno rabo",
+  "label.event-data": "Event data",
   "label.events": "Dogodki",
   "label.filter-combined": "Skupno",
   "label.filter-raw": "Neobdelane meritve",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -68,6 +70,7 @@
   "label.powered-by": "Zagotavlja {name}",
   "label.profile": "Profil",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "V realnem času",
   "label.referrers": "Viri",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "Zahtevano",
   "label.reset": "Ponastavi",
   "label.reset-website": "Reset statistics",
   "label.role": "Role",
   "label.save": "Shrani",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Nastavitve",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Koda za sledenje",
   "label.unique-visitors": "Unikatni obiskovalci",
   "label.unknown": "Neznano",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Uporabniško ime",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "Prikaži podrobnosti",
   "label.views": "Ogledi",
   "label.visitors": "Obiskovalci",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Spletna mesta",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "Ste prepričani, da želite izbrisati {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Izbriši spletno mesto",
   "message.delete-website-warning": "Izbrisani bodo tudi vsi povezani podatki.",
   "message.error": "Prišlo je do napake.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Koda za sledenje",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "Obiskovalec iz {country} uporablja {browser} na {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "Ni nastavljenih spletnih mest.",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/sv-SE.json b/lang/sv-SE.json
index 16a8d62a..c3155fc8 100644
--- a/lang/sv-SE.json
+++ b/lang/sv-SE.json
@@ -40,9 +40,11 @@
   "label.edit": "Redigera",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "Aktivera delnings-URL",
+  "label.event-data": "Event data",
   "label.events": "Händelser",
   "label.filter-combined": "Kombinerade",
   "label.filter-raw": "Rådata",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Språk",
@@ -68,6 +70,7 @@
   "label.powered-by": "Drivs av {name}",
   "label.profile": "Profil",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Realtid",
   "label.referrers": "Hänvisare",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "Krävs",
   "label.reset": "Återställ",
   "label.reset-website": "Återställ statistik",
   "label.role": "Role",
   "label.save": "Spara",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Inställningar",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Spårningskod",
   "label.unique-visitors": "Unika besökare",
   "label.unknown": "Okänd",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Användarnamn",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "Visa detaljer",
   "label.views": "Visningar",
   "label.visitors": "Besökare",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Webbsajt",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "Är du säker på att du vill radera {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Är du säker på att du vill återställa statistiken för {target}?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Radera webbsajt",
   "message.delete-website-warning": "All tillhörande data kommer också raderas.",
   "message.error": "Något gick fel.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Spårningskod",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "Besökare från {country} med {browser} på {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "Du har inga webbsajter.",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/ta-IN.json b/lang/ta-IN.json
index e4fc9f7e..2d7efa16 100644
--- a/lang/ta-IN.json
+++ b/lang/ta-IN.json
@@ -40,9 +40,11 @@
   "label.edit": "திருத்துதல்",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "கள முகவரியை பகிரலாம்",
+  "label.event-data": "Event data",
   "label.events": "நிகழ்வுகள்",
   "label.filter-combined": "ஒருங்கிணைந்த",
   "label.filter-raw": "மூல",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -68,6 +70,7 @@
   "label.powered-by": "{name} ஆல் இயக்கப்படுகிறது",
   "label.profile": "சுயவிவரம்",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "தற்போதைய",
   "label.referrers": "குறிப்பிடுவோர்",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "தேவையானவை",
   "label.reset": "மீட்டமை",
   "label.reset-website": "Reset statistics",
   "label.role": "Role",
   "label.save": "சேமி",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "அமைப்புகள்",
@@ -104,6 +109,7 @@
   "label.tracking-code": "கண்காணிப்பு குறியீடு",
   "label.unique-visitors": "தனிப்பட்ட பார்வையாளர்கள்",
   "label.unknown": "தெரியாத",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "பயனர்பெயர்",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "விபரங்களை பார்",
   "label.views": "பார்வைகள்",
   "label.visitors": "பார்வையாளர்கள்",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "வலைத்தளங்கள்",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "நீங்கள் நிச்சயமாக {target} நீக்க விரும்புகிறீர்களா?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "வலைத்தளத்தை நீக்கு",
   "message.delete-website-warning": "தொடர்புடைய எல்லா தரவும் நீக்கப்படும்.",
   "message.error": "ஏதோ தவறு நடந்துவிட்டது.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "கண்காணிப்பு குறியீடு",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "{country}வில் இருந்து பார்வையாளர் {browser} ஐ {os} {device}லில் பயன்படுத்துகிறார்",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "உங்களிடம் எந்த வலைத்தளங்களும் கட்டமைக்கப்படவில்லை.",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/th-TH.json b/lang/th-TH.json
index d71f4633..4f12f420 100644
--- a/lang/th-TH.json
+++ b/lang/th-TH.json
@@ -40,9 +40,11 @@
   "label.edit": "แก้ไข",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "เปิดใช้งานการแชร์ลิงก์",
+  "label.event-data": "Event data",
   "label.events": "เหตุการณ์",
   "label.filter-combined": "ข้อมูลรวม",
   "label.filter-raw": "ข้อมูลดิบ",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "ภาษา",
@@ -68,6 +70,7 @@
   "label.powered-by": "ขับเคลื่อนโดย {name}",
   "label.profile": "โปรไฟล์",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "เรียลไทม์",
   "label.referrers": "แหล่งที่มา",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "ต้องการ",
   "label.reset": "รีเซต",
   "label.reset-website": "รีเซตข้อมูลสถิติ",
   "label.role": "Role",
   "label.save": "บันทึก",
   "label.screens": "ขนาดหน้าจอ",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "ตั้งค่า",
@@ -104,6 +109,7 @@
   "label.tracking-code": "โค้ดสำหรับใช้ติดตาม",
   "label.unique-visitors": "ผู้เข้าชม",
   "label.unknown": "ไม่รู้จัก",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "ชื่อผู้ใช้",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "แสดงรายละเอียด",
   "label.views": "การเข้าชม",
   "label.visitors": "ผู้เข้าชม",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "เว็บไซต์",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "คุณแน่ใจหรือไม่ว่าต้องการลบ {target} ?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "คุณแน่ใจหรือไม่ว่าต้องการรีเซตข้อมูลสถิติของ {target} ?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "ลบเว็บไซต์",
   "message.delete-website-warning": "ข้อมูลที่เกี่ยวข้องทั้งหมดจะถูกลบ.",
   "message.error": "เกิดข้อผิดพลาด.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "โค้ดสำหรับใช้ติดตาม",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "ผู้เข้าชมจาก {country} กำลังใช้งานผ่าน {browser} บน {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "คุณยังไม่ได้ตั้งค่าเว็บไซต์ใด ๆ ไว้.",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/tr-TR.json b/lang/tr-TR.json
index 97556349..47ed7ab3 100644
--- a/lang/tr-TR.json
+++ b/lang/tr-TR.json
@@ -40,9 +40,11 @@
   "label.edit": "Düzenle",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "Anonim paylaşım URL'i aktif",
+  "label.event-data": "Event data",
   "label.events": "Olaylar",
   "label.filter-combined": "Birleşik",
   "label.filter-raw": "Ham",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -68,6 +70,7 @@
   "label.powered-by": "Sağlayıcı: {name}",
   "label.profile": "Profil",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Gerçek Zamanlı",
   "label.referrers": "Yönlendirenler",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "Zorunlu alan",
   "label.reset": "Sıfırla",
   "label.reset-website": "Reset statistics",
   "label.role": "Role",
   "label.save": "Kaydet",
   "label.screens": "Ekranlar",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Ayarlar",
@@ -104,6 +109,7 @@
   "label.tracking-code": "İzleme kodu",
   "label.unique-visitors": "Tekil kullanıcı",
   "label.unknown": "Bilinmeyen",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Kullanıcı adı",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "Detayı incele",
   "label.views": "Görüntüleme",
   "label.visitors": "Ziyaretçi",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Web siteleri",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "{target} kaydını silmek istediğinizden emin misiniz?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Web sitesini sil",
   "message.delete-website-warning": "İlişkili tüm veriler de  silinecektir.",
   "message.error": "Bir şeyler ters gitti!",
@@ -140,6 +148,7 @@
   "message.tracking-code": "İzleme kodu",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "Yeni ziyaretçi: {country}, {os}, {device}, {browser}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "Henüz hiç web sitesi tanımlamadınız",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/uk-UA.json b/lang/uk-UA.json
index 413f2dad..e475c39b 100644
--- a/lang/uk-UA.json
+++ b/lang/uk-UA.json
@@ -40,9 +40,11 @@
   "label.edit": "Редагувати",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "Дозволити ділитися посиланням",
+  "label.event-data": "Event data",
   "label.events": "Події",
   "label.filter-combined": "Об'єднані",
   "label.filter-raw": "Сирі дані",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -68,6 +70,7 @@
   "label.powered-by": "На базі {name}",
   "label.profile": "Профіль",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "У реальному часі",
   "label.referrers": "Джерела",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "Обов'язкове",
   "label.reset": "Скинути",
   "label.reset-website": "Скинути статистику сайту",
   "label.role": "Role",
   "label.save": "Зберегти",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Налаштування",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Код для відслідковування",
   "label.unique-visitors": "Унікальні відвідувачі",
   "label.unknown": "Невідомо",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Ім'я користувача",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "Переглянути деталі",
   "label.views": "Перегляди",
   "label.visitors": "Відвідувачі",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Сайти",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "Ви впевнені, що бажаєте видалити {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Ви впевнені, що бажаєте скинути статистику для {target}?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Видалити сайт",
   "message.delete-website-warning": "Усі пов'язані дані будуть видалені також.",
   "message.error": "Щось пішло не так.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Код для відслідковування",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "Відвідувач з {country} використовуючи {browser} на {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "У вас немає налаштованих сайтів.",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/ur-PK.json b/lang/ur-PK.json
index d206de64..a3cae9e4 100644
--- a/lang/ur-PK.json
+++ b/lang/ur-PK.json
@@ -40,9 +40,11 @@
   "label.edit": "ترمیم",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "شیئر یو آر ایل کو فعال کریں",
+  "label.event-data": "Event data",
   "label.events": "واقعات",
   "label.filter-combined": "مشترکہ",
   "label.filter-raw": "خام",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -68,6 +70,7 @@
   "label.powered-by": "تقویت یافتہ بذریعہ {name}",
   "label.profile": "پروفائل",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "براہ راست",
   "label.referrers": "بھیجنے والے",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "درکار ہے",
   "label.reset": "دوبارہ ترتیب دیں",
   "label.reset-website": "اعدادوشمار کو دوبارہ ترتیب دیں",
   "label.role": "Role",
   "label.save": "محفوظ کریں",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "ترتیبات",
@@ -104,6 +109,7 @@
   "label.tracking-code": "ٹریکنگ کوڈ",
   "label.unique-visitors": "منفرد زائرین",
   "label.unknown": "نامعلوم",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "صارف نام",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "تفصیلات دیکھیں",
   "label.views": "مناظر",
   "label.visitors": "زائرین",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "ویب سائٹس",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "کیا آپ واقعی {target} کو حذف کرنا چاہتے ہیں؟",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "کیا آپ واقعی {target} کے اعدادوشمار کو دوبارہ ترتیب دینا چاہتے ہیں؟",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "ویب سائٹ مٹایں",
   "message.delete-website-warning": "تمام متعلقہ ڈیٹا بھی حذف کر دیا جائے گا۔",
   "message.error": "کچھ غلط ہو گیا.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "ٹریکنگ کوڈ",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "{os} {device} پر {browser} کا استعمال کرتے ہوئے {country} سے آنے والا",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "آپ کے پاس کوئی ویب سائٹ کنفیگر نہیں ہے۔",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/vi-VN.json b/lang/vi-VN.json
index fe27ce4d..81e507bc 100644
--- a/lang/vi-VN.json
+++ b/lang/vi-VN.json
@@ -40,9 +40,11 @@
   "label.edit": "Chỉnh sửa",
   "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "Bật khả năng chia sẻ URL",
+  "label.event-data": "Event data",
   "label.events": "Sự kiện",
   "label.filter-combined": "Kết hợp",
   "label.filter-raw": "Gốc",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -68,6 +70,7 @@
   "label.powered-by": "Bản quyền thuộc về {name}",
   "label.profile": "Hồ sơ",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Thời gian thực",
   "label.referrers": "Liên kết giới thiệu",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "Yêu cầu",
   "label.reset": "Tái thiết lập",
   "label.reset-website": "Tái thiết lập thống kê",
   "label.role": "Role",
   "label.save": "Lưu",
   "label.screens": "Screens",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Cài đặt",
@@ -104,6 +109,7 @@
   "label.tracking-code": "Mã theo dõi",
   "label.unique-visitors": "Khách truy cập một lần",
   "label.unknown": "Không rõ",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Tên đăng nhập",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "Xem chi tiết",
   "label.views": "Xem",
   "label.visitors": "Khách",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "Websites",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "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-reset": "Bạn có chắc chắn muốn tái thiết lập thống kê {target}?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "Xóa website",
   "message.delete-website-warning": "Tất cả các dữ liệu liên quan cũng sẽ bị xoá.",
   "message.error": "Đã xảy ra lỗi.",
@@ -140,6 +148,7 @@
   "message.tracking-code": "Mã theo dõi",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "Khách từ {country} đang dùng {browser} trên {os} {device}",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "Bạn chưa có bất cứ website nào.",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/lang/zh-CN.json b/lang/zh-CN.json
index 1aba3988..d120ed1a 100644
--- a/lang/zh-CN.json
+++ b/lang/zh-CN.json
@@ -40,9 +40,11 @@
   "label.edit": "编辑",
   "label.edit-dashboard": "编辑仪表板",
   "label.enable-share-url": "启用共享链接",
+  "label.event-data": "Event data",
   "label.events": "行为类别",
   "label.filter-combined": "合并",
   "label.filter-raw": "原始",
+  "label.funnel": "Funnel",
   "label.join": "加入",
   "label.join-team": "加入团队",
   "label.language": "语言",
@@ -68,6 +70,7 @@
   "label.powered-by": "由 {name} 提供支持",
   "label.profile": "个人资料",
   "label.queries": "查询",
+  "label.query": "Query",
   "label.query-parameters": "查询参数",
   "label.realtime": "实时",
   "label.referrers": "来源域名",
@@ -75,12 +78,14 @@
   "label.regenerate": "重新生成",
   "label.regions": "州/省",
   "label.remove": "移除",
+  "label.reports": "Reports",
   "label.required": "必填",
   "label.reset": "重置",
   "label.reset-website": "重置统计数据",
   "label.role": "角色",
   "label.save": "保存",
   "label.screens": "屏幕尺寸",
+  "label.select-date": "Select date",
   "label.select-website": "选择网站",
   "label.sessions": "会话",
   "label.settings": "设置",
@@ -104,6 +109,7 @@
   "label.tracking-code": "跟踪代码",
   "label.unique-visitors": "独立访客",
   "label.unknown": "未知",
+  "label.urls": "URLs",
   "label.user": "用户",
   "label.username": "用户名",
   "label.users": "用户",
@@ -111,6 +117,7 @@
   "label.view-details": "查看更多",
   "label.views": "浏览量",
   "label.visitors": "访客",
+  "label.website": "Website",
   "label.website-id": "网站 ID",
   "label.websites": "网站",
   "label.yesterday": "昨天",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "你确定要删除 {target} 吗？",
   "message.confirm-leave": "你确定要离开 {target} 吗？",
   "message.confirm-reset": "您确定要重置 {target} 的数据吗?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "删除网站",
   "message.delete-website-warning": "所有相关数据将会被删除。",
   "message.error": "出现错误。",
@@ -140,6 +148,7 @@
   "message.tracking-code": "跟踪代码",
   "message.user-deleted": "User detected.",
   "message.visitor-log": "来自{country}的访客在搭载 {os} 的{device}上使用 {browser} 浏览器进行访问。",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "这个团队没有任何网站。",
   "messages.no-websites-configured": "你还没有设置任何网站。",
   "messages.team-websites-info": "团队中的任何人都可查看网站。"
diff --git a/lang/zh-TW.json b/lang/zh-TW.json
index 42370059..d15136a8 100644
--- a/lang/zh-TW.json
+++ b/lang/zh-TW.json
@@ -40,9 +40,11 @@
   "label.edit": "編輯",
   "label.edit-dashboard": "編輯管理面板",
   "label.enable-share-url": "啟用分享連結",
+  "label.event-data": "Event data",
   "label.events": "行為類別",
   "label.filter-combined": "總和",
   "label.filter-raw": "原始",
+  "label.funnel": "Funnel",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "語言",
@@ -68,6 +70,7 @@
   "label.powered-by": "運行 {name}",
   "label.profile": "個人資料",
   "label.queries": "Queries",
+  "label.query": "Query",
   "label.query-parameters": "查詢參數",
   "label.realtime": "實時",
   "label.referrers": "指入域名",
@@ -75,12 +78,14 @@
   "label.regenerate": "Regenerate",
   "label.regions": "Regions",
   "label.remove": "Remove",
+  "label.reports": "Reports",
   "label.required": "必填",
   "label.reset": "重置",
   "label.reset-website": "重置統計數據",
   "label.role": "Role",
   "label.save": "保存",
   "label.screens": "屏幕尺寸",
+  "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "設置",
@@ -104,6 +109,7 @@
   "label.tracking-code": "追蹤代碼",
   "label.unique-visitors": "獨立訪客",
   "label.unknown": "未知",
+  "label.urls": "URLs",
   "label.user": "User",
   "label.username": "用户名",
   "label.users": "Users",
@@ -111,6 +117,7 @@
   "label.view-details": "查看更多",
   "label.views": "頁面流量",
   "label.visitors": "獨立訪客",
+  "label.website": "Website",
   "label.website-id": "Website ID",
   "label.websites": "網站",
   "label.yesterday": "Yesterday",
@@ -118,6 +125,7 @@
   "message.confirm-delete": "你確定要刪除 {target} 嗎？",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "您確定要重置 {target} 的數據嗎?",
+  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
   "message.delete-website": "刪除網站",
   "message.delete-website-warning": "所有相關數據將會被刪除。",
   "message.error": "出現錯誤。",
@@ -140,6 +148,7 @@
   "message.tracking-code": "追蹤代碼",
   "message.user-deleted": "User deleted.",
   "message.visitor-log": "來自{country}的訪客在搭載 {os} 的{device}上使用 {browser} 進行訪問。",
+  "messages.no-results-found": "No results were found.",
   "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "目前無任何網站設定。",
   "messages.team-websites-info": "Websites can be viewed by anyone on the team."
diff --git a/package.json b/package.json
index 02820f22..c4a790dd 100644
--- a/package.json
+++ b/package.json
@@ -110,7 +110,7 @@
     "timezone-support": "^2.0.2",
     "uuid": "^8.3.2",
     "yup": "^0.32.11",
-    "zustand": "^3.7.2"
+    "zustand": "^4.3.8"
   },
   "devDependencies": {
     "@formatjs/cli": "^4.2.29",
diff --git a/pages/api/websites/[id]/data.ts b/pages/api/websites/[id]/data.ts
deleted file mode 100644
index 93e97067..00000000
--- a/pages/api/websites/[id]/data.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { NextApiResponse } from 'next';
-import { useAuth } from 'lib/middleware';
-import { NextApiRequestQueryBody, User } from 'lib/types';
-import { ok } from 'next-basics';
-
-export default async (
-  req: NextApiRequestQueryBody<unknown, unknown>,
-  res: NextApiResponse<User>,
-) => {
-  await useAuth(req, res);
-
-  return ok(res, req.auth.user);
-};
diff --git a/pages/api/websites/[id]/eventData.ts b/pages/api/websites/[id]/eventData.ts
index 65c4d687..04a6d83b 100644
--- a/pages/api/websites/[id]/eventData.ts
+++ b/pages/api/websites/[id]/eventData.ts
@@ -35,7 +35,7 @@ export default async (
 
   const { id: websiteId } = req.query;
 
-  if (req.method === 'POST') {
+  if (req.method === 'GET') {
     if (!(await canViewWebsite(req.auth, websiteId))) {
       return unauthorized(res);
     }
diff --git a/pages/reports/event-data.js b/pages/reports/event-data.js
new file mode 100644
index 00000000..b5749c96
--- /dev/null
+++ b/pages/reports/event-data.js
@@ -0,0 +1,13 @@
+import AppLayout from 'components/layout/AppLayout';
+import EventDataReport from 'components/pages/reports/event-data/EventDataReport';
+import { useMessages } from 'hooks';
+
+export default function Report() {
+  const { formatMessage, labels } = useMessages();
+
+  return (
+    <AppLayout title={`${formatMessage(labels.eventData)} - ${formatMessage(labels.reports)}`}>
+      <EventDataReport />
+    </AppLayout>
+  );
+}
diff --git a/pages/reports/event-data/index.js b/pages/reports/event-data/index.js
deleted file mode 100644
index 154c79be..00000000
--- a/pages/reports/event-data/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import EventDataReport from 'components/pages/reports/EventDataReport';
-
-export default function Report() {
-  return <EventDataReport />;
-}
diff --git a/pages/reports/funnel.js b/pages/reports/funnel.js
index 3ba11306..731ffa47 100644
--- a/pages/reports/funnel.js
+++ b/pages/reports/funnel.js
@@ -1,13 +1,13 @@
 import AppLayout from 'components/layout/AppLayout';
-import FunnelPage from 'components/pages/reports/funnel/FunnelPage';
+import FunnelReport from 'components/pages/reports/funnel/FunnelReport';
 import useMessages from 'hooks/useMessages';
 
 export default function Funnel() {
   const { formatMessage, labels } = useMessages();
 
   return (
-    <AppLayout title={`${formatMessage(labels.settings)} - ${formatMessage(labels.reports)}`}>
-      <FunnelPage />
+    <AppLayout title={`${formatMessage(labels.funnel)} - ${formatMessage(labels.reports)}`}>
+      <FunnelReport />
     </AppLayout>
   );
 }
diff --git a/pages/reports/index.js b/pages/reports/index.js
index b26023cc..70f684cb 100644
--- a/pages/reports/index.js
+++ b/pages/reports/index.js
@@ -1,5 +1,5 @@
 import AppLayout from 'components/layout/AppLayout';
-import ReportsList from 'components/pages/reports/ReportsList';
+import ReportList from 'components/pages/reports/ReportList';
 import useMessages from 'hooks/useMessages';
 
 export default function ReportsPage() {
@@ -7,7 +7,7 @@ export default function ReportsPage() {
 
   return (
     <AppLayout title={formatMessage(labels.reports)}>
-      <ReportsList />
+      <ReportList />
     </AppLayout>
   );
 }
diff --git a/public/intl/messages/ar-SA.json b/public/intl/messages/ar-SA.json
index fc38707d..c7723665 100644
--- a/public/intl/messages/ar-SA.json
+++ b/public/intl/messages/ar-SA.json
@@ -987,4 +987,4 @@
       "value": "يمكن مشاهدة الموقع من اي عضو في المجموعة."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/be-BY.json b/public/intl/messages/be-BY.json
index 56604985..37718636 100644
--- a/public/intl/messages/be-BY.json
+++ b/public/intl/messages/be-BY.json
@@ -987,4 +987,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/bn-BD.json b/public/intl/messages/bn-BD.json
index 145815a5..7a2e5176 100644
--- a/public/intl/messages/bn-BD.json
+++ b/public/intl/messages/bn-BD.json
@@ -987,4 +987,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/ca-ES.json b/public/intl/messages/ca-ES.json
index 5d5d6ff7..9ae29bcf 100644
--- a/public/intl/messages/ca-ES.json
+++ b/public/intl/messages/ca-ES.json
@@ -987,4 +987,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/cs-CZ.json b/public/intl/messages/cs-CZ.json
index fc617b4e..1ea0c864 100644
--- a/public/intl/messages/cs-CZ.json
+++ b/public/intl/messages/cs-CZ.json
@@ -987,4 +987,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/da-DK.json b/public/intl/messages/da-DK.json
index 4401b5d8..bd68b67f 100644
--- a/public/intl/messages/da-DK.json
+++ b/public/intl/messages/da-DK.json
@@ -987,4 +987,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/de-CH.json b/public/intl/messages/de-CH.json
index 88a93208..6861f5a4 100644
--- a/public/intl/messages/de-CH.json
+++ b/public/intl/messages/de-CH.json
@@ -979,4 +979,4 @@
       "value": "Websiite chönd vo jedem im Team agluegt werde"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/de-DE.json b/public/intl/messages/de-DE.json
index d8a64915..85239abc 100644
--- a/public/intl/messages/de-DE.json
+++ b/public/intl/messages/de-DE.json
@@ -979,4 +979,4 @@
       "value": "Webseiten können von jedem im Team eingesehen werden."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/el-GR.json b/public/intl/messages/el-GR.json
index ecc6c306..688b73c0 100644
--- a/public/intl/messages/el-GR.json
+++ b/public/intl/messages/el-GR.json
@@ -987,4 +987,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/en-GB.json b/public/intl/messages/en-GB.json
index a0dffae5..ffd74588 100644
--- a/public/intl/messages/en-GB.json
+++ b/public/intl/messages/en-GB.json
@@ -987,4 +987,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/en-US.json b/public/intl/messages/en-US.json
index 0c7bb7dd..21fb9de8 100644
--- a/public/intl/messages/en-US.json
+++ b/public/intl/messages/en-US.json
@@ -1009,4 +1009,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/es-MX.json b/public/intl/messages/es-MX.json
index fdc2483d..9a07a296 100644
--- a/public/intl/messages/es-MX.json
+++ b/public/intl/messages/es-MX.json
@@ -987,4 +987,4 @@
       "value": "Las analíticas de tus sitios pueden verse por cualquier miembro del equipo."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/fa-IR.json b/public/intl/messages/fa-IR.json
index 8f9cdc68..34c8544a 100644
--- a/public/intl/messages/fa-IR.json
+++ b/public/intl/messages/fa-IR.json
@@ -987,4 +987,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/fi-FI.json b/public/intl/messages/fi-FI.json
index 9a23d285..03b0aef0 100644
--- a/public/intl/messages/fi-FI.json
+++ b/public/intl/messages/fi-FI.json
@@ -987,4 +987,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/fo-FO.json b/public/intl/messages/fo-FO.json
index 52e2bc33..e1e45a1d 100644
--- a/public/intl/messages/fo-FO.json
+++ b/public/intl/messages/fo-FO.json
@@ -987,4 +987,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/fr-FR.json b/public/intl/messages/fr-FR.json
index 7361eca2..11754452 100644
--- a/public/intl/messages/fr-FR.json
+++ b/public/intl/messages/fr-FR.json
@@ -983,4 +983,4 @@
       "value": "Les sites peuvent être vus par tout utilisateur dans l'équipe."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/ga-ES.json b/public/intl/messages/ga-ES.json
index 114a55eb..35d98325 100644
--- a/public/intl/messages/ga-ES.json
+++ b/public/intl/messages/ga-ES.json
@@ -987,4 +987,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/he-IL.json b/public/intl/messages/he-IL.json
index 57704b11..3e0b844b 100644
--- a/public/intl/messages/he-IL.json
+++ b/public/intl/messages/he-IL.json
@@ -975,4 +975,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/hi-IN.json b/public/intl/messages/hi-IN.json
index aa550dfb..d51f71fe 100644
--- a/public/intl/messages/hi-IN.json
+++ b/public/intl/messages/hi-IN.json
@@ -979,4 +979,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/hu-HU.json b/public/intl/messages/hu-HU.json
index 8bb833bf..a41352a0 100644
--- a/public/intl/messages/hu-HU.json
+++ b/public/intl/messages/hu-HU.json
@@ -991,4 +991,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/id-ID.json b/public/intl/messages/id-ID.json
index 00a84f18..02e50783 100644
--- a/public/intl/messages/id-ID.json
+++ b/public/intl/messages/id-ID.json
@@ -955,4 +955,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/it-IT.json b/public/intl/messages/it-IT.json
index 3cc27fd4..ad026521 100644
--- a/public/intl/messages/it-IT.json
+++ b/public/intl/messages/it-IT.json
@@ -991,4 +991,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/ja-JP.json b/public/intl/messages/ja-JP.json
index 55941ebf..384d8014 100644
--- a/public/intl/messages/ja-JP.json
+++ b/public/intl/messages/ja-JP.json
@@ -963,4 +963,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/km-KH.json b/public/intl/messages/km-KH.json
index cfa45bbf..b6e93a33 100644
--- a/public/intl/messages/km-KH.json
+++ b/public/intl/messages/km-KH.json
@@ -959,4 +959,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/ko-KR.json b/public/intl/messages/ko-KR.json
index 7b368a5f..9665bc3d 100644
--- a/public/intl/messages/ko-KR.json
+++ b/public/intl/messages/ko-KR.json
@@ -963,4 +963,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/lt-LT.json b/public/intl/messages/lt-LT.json
index 3bc4d21b..113a1394 100644
--- a/public/intl/messages/lt-LT.json
+++ b/public/intl/messages/lt-LT.json
@@ -1112,4 +1112,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/mn-MN.json b/public/intl/messages/mn-MN.json
index beaab2d7..6ad96b19 100644
--- a/public/intl/messages/mn-MN.json
+++ b/public/intl/messages/mn-MN.json
@@ -1017,4 +1017,4 @@
       "value": "Вебийг багийн бүх гишүүд үзэж болно."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/ms-MY.json b/public/intl/messages/ms-MY.json
index 31eee0d2..771672a7 100644
--- a/public/intl/messages/ms-MY.json
+++ b/public/intl/messages/ms-MY.json
@@ -979,4 +979,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/nb-NO.json b/public/intl/messages/nb-NO.json
index bf9ffcd9..50a9ec18 100644
--- a/public/intl/messages/nb-NO.json
+++ b/public/intl/messages/nb-NO.json
@@ -991,4 +991,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/nl-NL.json b/public/intl/messages/nl-NL.json
index 714c31a0..e775f2d5 100644
--- a/public/intl/messages/nl-NL.json
+++ b/public/intl/messages/nl-NL.json
@@ -987,4 +987,4 @@
       "value": "Websites kunnen door iedereen in het team worden bekeken."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/pl-PL.json b/public/intl/messages/pl-PL.json
index ba133523..0f5667ff 100644
--- a/public/intl/messages/pl-PL.json
+++ b/public/intl/messages/pl-PL.json
@@ -987,4 +987,4 @@
       "value": "Strony internetowe mogą być przeglądane przez każdego członka zespołu."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/pt-BR.json b/public/intl/messages/pt-BR.json
index 63e9a49e..6eade1e3 100644
--- a/public/intl/messages/pt-BR.json
+++ b/public/intl/messages/pt-BR.json
@@ -991,4 +991,4 @@
       "value": "Os sites podem ser visualizados por qualquer membro da equipe."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/pt-PT.json b/public/intl/messages/pt-PT.json
index 079af91b..a858ff8c 100644
--- a/public/intl/messages/pt-PT.json
+++ b/public/intl/messages/pt-PT.json
@@ -991,4 +991,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/ro-RO.json b/public/intl/messages/ro-RO.json
index 5ea1dece..e7305a38 100644
--- a/public/intl/messages/ro-RO.json
+++ b/public/intl/messages/ro-RO.json
@@ -987,4 +987,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/ru-RU.json b/public/intl/messages/ru-RU.json
index 155828c5..5d164635 100644
--- a/public/intl/messages/ru-RU.json
+++ b/public/intl/messages/ru-RU.json
@@ -963,4 +963,4 @@
       "value": "Сайты могут просматривать все члены команды."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/sk-SK.json b/public/intl/messages/sk-SK.json
index ad3e9b19..3abce8ef 100644
--- a/public/intl/messages/sk-SK.json
+++ b/public/intl/messages/sk-SK.json
@@ -987,4 +987,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/sl-SI.json b/public/intl/messages/sl-SI.json
index aa584730..93dbb9d5 100644
--- a/public/intl/messages/sl-SI.json
+++ b/public/intl/messages/sl-SI.json
@@ -987,4 +987,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/sv-SE.json b/public/intl/messages/sv-SE.json
index 93040948..2b3663a8 100644
--- a/public/intl/messages/sv-SE.json
+++ b/public/intl/messages/sv-SE.json
@@ -991,4 +991,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/ta-IN.json b/public/intl/messages/ta-IN.json
index d46893d6..b7210292 100644
--- a/public/intl/messages/ta-IN.json
+++ b/public/intl/messages/ta-IN.json
@@ -983,4 +983,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/th-TH.json b/public/intl/messages/th-TH.json
index 74ab2981..54641c9c 100644
--- a/public/intl/messages/th-TH.json
+++ b/public/intl/messages/th-TH.json
@@ -983,4 +983,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/tr-TR.json b/public/intl/messages/tr-TR.json
index f8c3a275..a8b03f95 100644
--- a/public/intl/messages/tr-TR.json
+++ b/public/intl/messages/tr-TR.json
@@ -955,4 +955,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/uk-UA.json b/public/intl/messages/uk-UA.json
index 0cf3d7c1..a198c74e 100644
--- a/public/intl/messages/uk-UA.json
+++ b/public/intl/messages/uk-UA.json
@@ -963,4 +963,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/ur-PK.json b/public/intl/messages/ur-PK.json
index 303ca457..fffff35e 100644
--- a/public/intl/messages/ur-PK.json
+++ b/public/intl/messages/ur-PK.json
@@ -987,4 +987,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/vi-VN.json b/public/intl/messages/vi-VN.json
index e9b65724..400fd678 100644
--- a/public/intl/messages/vi-VN.json
+++ b/public/intl/messages/vi-VN.json
@@ -979,4 +979,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/zh-CN.json b/public/intl/messages/zh-CN.json
index 53421291..d17a7d16 100644
--- a/public/intl/messages/zh-CN.json
+++ b/public/intl/messages/zh-CN.json
@@ -975,4 +975,4 @@
       "value": "团队中的任何人都可查看网站。"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/public/intl/messages/zh-TW.json b/public/intl/messages/zh-TW.json
index a306e4cc..135d3647 100644
--- a/public/intl/messages/zh-TW.json
+++ b/public/intl/messages/zh-TW.json
@@ -971,4 +971,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/rollup.tracker.config.js b/rollup.tracker.config.js
index f4e7223c..8003e0da 100644
--- a/rollup.tracker.config.js
+++ b/rollup.tracker.config.js
@@ -4,7 +4,7 @@ import replace from '@rollup/plugin-replace';
 import { terser } from 'rollup-plugin-terser';
 
 export default {
-  input: 'tracker/index.js',
+  input: 'tracker/event-data.js',
   output: {
     file: 'public/script.js',
     format: 'iife',
diff --git a/store/app.js b/store/app.js
index 594bc169..53fdbd92 100644
--- a/store/app.js
+++ b/store/app.js
@@ -1,4 +1,4 @@
-import create from 'zustand';
+import { create } from 'zustand';
 import {
   DATE_RANGE_CONFIG,
   DEFAULT_DATE_RANGE,
diff --git a/store/dashboard.js b/store/dashboard.js
index 7c512228..f6677542 100644
--- a/store/dashboard.js
+++ b/store/dashboard.js
@@ -1,4 +1,4 @@
-import create from 'zustand';
+import { create } from 'zustand';
 import { DASHBOARD_CONFIG, DEFAULT_WEBSITE_LIMIT } from 'lib/constants';
 import { getItem, setItem } from 'next-basics';
 
diff --git a/store/queries.js b/store/queries.js
index 92a8f3d5..1de2f04b 100644
--- a/store/queries.js
+++ b/store/queries.js
@@ -1,4 +1,4 @@
-import create from 'zustand';
+import { create } from 'zustand';
 
 const store = create(() => ({}));
 
diff --git a/store/reports.js b/store/reports.js
new file mode 100644
index 00000000..4716aa43
--- /dev/null
+++ b/store/reports.js
@@ -0,0 +1,61 @@
+import { create } from 'zustand';
+import produce from 'immer';
+import { getRandomChars } from 'next-basics';
+
+const emptyReport = {
+  name: 'Untitled',
+  description: '',
+  parameters: {},
+};
+
+const initialState = {};
+
+const store = create(() => ({ ...initialState }));
+
+export function updateReport(id, data) {
+  const report = store.getState()[id];
+
+  console.log('UPDATE STORE START', id, report);
+
+  if (report) {
+    store.setState(
+      produce(state => {
+        const item = state[id];
+        const { parameters, ...rest } = data;
+
+        if (parameters) {
+          item.parameters = { ...item.parameters, ...parameters };
+        }
+
+        for (const key in rest) {
+          item[key] = rest[key];
+        }
+
+        return state;
+      }),
+    );
+  }
+}
+
+export function createReport() {
+  const id = `new_${getRandomChars(16)}`;
+  const report = { ...emptyReport, id };
+
+  store.setState(
+    produce(state => {
+      state[id] = report;
+
+      return state;
+    }),
+  );
+
+  console.log('CREATE STORE', report);
+
+  return report;
+}
+
+export default store;
+
+if (typeof window !== 'undefined') {
+  window.__STORE__ = store;
+}
diff --git a/store/version.js b/store/version.js
index cb5208fa..c232c7fa 100644
--- a/store/version.js
+++ b/store/version.js
@@ -1,4 +1,4 @@
-import create from 'zustand';
+import { create } from 'zustand';
 import produce from 'immer';
 import semver from 'semver';
 import { CURRENT_VERSION, VERSION_CHECK, UPDATES_URL } from 'lib/constants';
diff --git a/store/websites.js b/store/websites.js
index e174cbac..34f8242d 100644
--- a/store/websites.js
+++ b/store/websites.js
@@ -1,4 +1,4 @@
-import create from 'zustand';
+import { create } from 'zustand';
 import produce from 'immer';
 import app from './app';
 import { parseDateRange } from 'lib/date';
diff --git a/yarn.lock b/yarn.lock
index 1f9ea77a..1d0bc7fd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5500,11 +5500,6 @@ functions-have-names@^1.2.2:
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
-funnel-graph-js@^1.3.7:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/funnel-graph-js/-/funnel-graph-js-1.4.2.tgz#b82150189e8afa59104d881d5dcf55a28d715342"
-  integrity sha512-9bnmcBve7RDH9dTF9BLuUpuisKkDka3yrfhs+Z/106ZgJvqIse1RfKQWjW+QdAlTrZqC9oafen7t/KuJKv9ohA==
-
 generic-names@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/generic-names/-/generic-names-4.0.0.tgz#0bd8a2fd23fe8ea16cbd0a279acd69c06933d9a3"
@@ -9749,7 +9744,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.0:
+use-sync-external-store@1.2.0, 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==
@@ -9984,7 +9979,9 @@ yup@^0.32.11:
     property-expr "^2.0.4"
     toposort "^2.0.2"
 
-zustand@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.npmjs.org/zustand/-/zustand-3.7.2.tgz"
-  integrity sha512-PIJDIZKtokhof+9+60cpockVOq05sJzHCriyvaLBmEJixseQ1a5Kdov6fWZfWOu5SK9c+FhH1jU0tntLxRJYMA==
+zustand@^4.3.8:
+  version "4.3.8"
+  resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.3.8.tgz#37113df8e9e1421b0be1b2dca02b49b76210e7c4"
+  integrity sha512-4h28KCkHg5ii/wcFFJ5Fp+k1J3gJoasaIbppdgZFO4BPJnsNxL0mQXBSFgOgAdCdBj35aDTPvdAJReTMntFPGg==
+  dependencies:
+    use-sync-external-store "1.2.0"

From 1f799f17e9141ae7095c2605e992294fb66fcc1d Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Mon, 22 May 2023 15:38:03 -0700
Subject: [PATCH 45/88] Fix permissions.

---
 pages/api/me/websites.ts   | 11 +----------
 pages/api/realtime/[id].ts | 24 +++++++++++++++++++-----
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/pages/api/me/websites.ts b/pages/api/me/websites.ts
index 15ea2485..dc9c0d62 100644
--- a/pages/api/me/websites.ts
+++ b/pages/api/me/websites.ts
@@ -4,16 +4,7 @@ import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok } from 'next-basics';
 import { getUserWebsites } from 'queries';
 
-export interface WebsitesRequestBody {
-  name: string;
-  domain: string;
-  shareId: string;
-}
-
-export default async (
-  req: NextApiRequestQueryBody<any, WebsitesRequestBody>,
-  res: NextApiResponse,
-) => {
+export default async (req: NextApiRequestQueryBody, res: NextApiResponse) => {
   await useCors(req, res);
   await useAuth(req, res);
 
diff --git a/pages/api/realtime/[id].ts b/pages/api/realtime/[id].ts
index 069db54a..e78599c6 100644
--- a/pages/api/realtime/[id].ts
+++ b/pages/api/realtime/[id].ts
@@ -1,22 +1,36 @@
 import { subMinutes } from 'date-fns';
-import { RealtimeInit, NextApiRequestAuth } from 'lib/types';
+import { canViewWebsite } from 'lib/auth';
 import { useAuth } from 'lib/middleware';
+import { NextApiRequestQueryBody, RealtimeInit } from 'lib/types';
 import { NextApiResponse } from 'next';
-import { methodNotAllowed, ok } from 'next-basics';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { getRealtimeData } from 'queries';
 
-export default async (req: NextApiRequestAuth, res: NextApiResponse<RealtimeInit>) => {
+export interface RealtimeRequestQuery {
+  id: string;
+  startAt: number;
+}
+
+export default async (
+  req: NextApiRequestQueryBody<RealtimeRequestQuery>,
+  res: NextApiResponse<RealtimeInit>,
+) => {
   await useAuth(req, res);
 
   if (req.method === 'GET') {
-    const { id, startAt } = req.query;
+    const { id: websiteId, startAt } = req.query;
+
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
     let startTime = subMinutes(new Date(), 30);
 
     if (+startAt > startTime.getTime()) {
       startTime = new Date(+startAt);
     }
 
-    const data = await getRealtimeData(id, startTime);
+    const data = await getRealtimeData(websiteId, startTime);
 
     return ok(res, data);
   }

From fb4dd75e18cebabe5a47175aee0ed3c622b5eae3 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Wed, 24 May 2023 21:40:02 -0700
Subject: [PATCH 46/88] Refactored funnel report. Made BarChart more generic.

---
 components/common/HoverTooltip.js             |   6 +-
 components/common/WorldMap.js                 |   2 +-
 components/input/LanguageButton.js            |  46 +++--
 components/input/ThemeButton.js               |   4 +-
 components/messages.js                        |   4 +
 components/metrics/BarChart.js                | 131 ++++--------
 components/metrics/DataTable.js               |   2 +-
 components/metrics/DataTable.module.css       |   2 +-
 components/metrics/MetricsBar.module.css      |   2 +-
 components/metrics/PageviewsChart.js          |  91 +++++---
 components/metrics/WebsiteHeader.module.css   |   6 +
 components/pages/reports/ReportHeader.js      |   2 -
 .../pages/reports/funnel/FunnelChart.js       | 194 ++++--------------
 .../reports/funnel/FunnelChart.module.css     |  24 +--
 .../pages/reports/funnel/FunnelParameters.js  |  67 +++++-
 .../funnel/FunnelParameters.module.css        |  20 +-
 .../pages/reports/funnel/FunnelReport.js      |  24 ++-
 .../pages/reports/funnel/FunnelTable.js       |  17 +-
 .../pages/settings/profile/ThemeSetting.js    |   6 +-
 hooks/useReport.js                            |   8 +-
 hooks/useTheme.js                             |  25 ++-
 pages/api/reports/funnel.ts                   |   1 +
 rollup.tracker.config.js                      |   2 +-
 store/reports.js                              |   8 +-
 24 files changed, 327 insertions(+), 367 deletions(-)

diff --git a/components/common/HoverTooltip.js b/components/common/HoverTooltip.js
index 2a98ab84..59fd6277 100644
--- a/components/common/HoverTooltip.js
+++ b/components/common/HoverTooltip.js
@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react';
 import { Tooltip } from 'react-basics';
 import styles from './HoverTooltip.module.css';
 
-export function HoverTooltip({ tooltip }) {
+export function HoverTooltip({ children }) {
   const [position, setPosition] = useState({ x: -1000, y: -1000 });
 
   useEffect(() => {
@@ -18,8 +18,8 @@ export function HoverTooltip({ tooltip }) {
   }, []);
 
   return (
-    <div className={styles.tooltip} style={{ left: position.x, top: position.y }}>
-      <Tooltip position="top" action="none" label={tooltip} />
+    <div className={styles.tooltip} style={{ left: position.x, top: position.y - 16 }}>
+      <Tooltip position="top" action="none" label={children} />
     </div>
   );
 }
diff --git a/components/common/WorldMap.js b/components/common/WorldMap.js
index 55a13f0b..a371e2d3 100644
--- a/components/common/WorldMap.js
+++ b/components/common/WorldMap.js
@@ -15,7 +15,7 @@ import styles from './WorldMap.module.css';
 export function WorldMap({ data, className }) {
   const { basePath } = useRouter();
   const [tooltip, setTooltip] = useState();
-  const [theme] = useTheme();
+  const { theme } = useTheme();
   const colors = useMemo(
     () => ({
       baseColor: THEME_COLORS[theme].primary,
diff --git a/components/input/LanguageButton.js b/components/input/LanguageButton.js
index e2a51223..049b49f3 100644
--- a/components/input/LanguageButton.js
+++ b/components/input/LanguageButton.js
@@ -9,9 +9,9 @@ export function LanguageButton() {
   const { locale, saveLocale, dir } = useLocale();
   const items = Object.keys(languages).map(key => ({ ...languages[key], value: key }));
 
-  function handleSelect(value) {
-    //saveLocale(value);
-    console.log('WTFFFF');
+  function handleSelect(value, close) {
+    saveLocale(value);
+    close();
   }
 
   return (
@@ -22,24 +22,28 @@ export function LanguageButton() {
         </Icon>
       </Button>
       <Popup position="bottom" alignment={dir === 'rtl' ? 'start' : 'end'}>
-        <div className={styles.menu}>
-          {items.map(({ value, label }) => {
-            return (
-              <div
-                key={value}
-                className={classNames(styles.item, { [styles.selected]: value === locale })}
-                onClick={handleSelect.bind(null, value)}
-              >
-                <Text>{label}</Text>
-                {value === locale && (
-                  <Icon className={styles.icon}>
-                    <Icons.Check />
-                  </Icon>
-                )}
-              </div>
-            );
-          })}
-        </div>
+        {close => {
+          return (
+            <div className={styles.menu}>
+              {items.map(({ value, label }) => {
+                return (
+                  <div
+                    key={value}
+                    className={classNames(styles.item, { [styles.selected]: value === locale })}
+                    onClick={handleSelect.bind(null, value, close)}
+                  >
+                    <Text>{label}</Text>
+                    {value === locale && (
+                      <Icon className={styles.icon}>
+                        <Icons.Check />
+                      </Icon>
+                    )}
+                  </div>
+                );
+              })}
+            </div>
+          );
+        }}
       </Popup>
     </PopupTrigger>
   );
diff --git a/components/input/ThemeButton.js b/components/input/ThemeButton.js
index b945ab7d..8ab0cdcd 100644
--- a/components/input/ThemeButton.js
+++ b/components/input/ThemeButton.js
@@ -5,7 +5,7 @@ import Icons from 'components/icons';
 import styles from './ThemeButton.module.css';
 
 export function ThemeButton() {
-  const [theme, setTheme] = useTheme();
+  const { theme, saveTheme } = useTheme();
 
   const transitions = useTransition(theme, {
     initial: { opacity: 1 },
@@ -21,7 +21,7 @@ export function ThemeButton() {
   });
 
   function handleClick() {
-    setTheme(theme === 'light' ? 'dark' : 'light');
+    saveTheme(theme === 'light' ? 'dark' : 'light');
   }
 
   return (
diff --git a/components/messages.js b/components/messages.js
index fb0dee3c..0de3a44c 100644
--- a/components/messages.js
+++ b/components/messages.js
@@ -123,7 +123,11 @@ export const labels = defineMessages({
   reports: { id: 'label.reports', defaultMessage: 'Reports' },
   eventData: { id: 'label.event-data', defaultMessage: 'Event data' },
   funnel: { id: 'label.funnel', defaultMessage: 'Funnel' },
+  url: { id: 'label.url', defaultMessage: 'URL' },
   urls: { id: 'label.urls', defaultMessage: 'URLs' },
+  add: { id: 'label.add', defaultMessage: 'Add' },
+  window: { id: 'label.window', defaultMessage: 'Window' },
+  addUrl: { id: 'label.add-url', defaultMessage: 'Add URL' },
 });
 
 export const messages = defineMessages({
diff --git a/components/metrics/BarChart.js b/components/metrics/BarChart.js
index 8e1784df..9206b800 100644
--- a/components/metrics/BarChart.js
+++ b/components/metrics/BarChart.js
@@ -1,102 +1,39 @@
-import { useState, useRef, useEffect, useMemo, useCallback } from 'react';
-import { StatusLight, Loading } from 'react-basics';
+import { useState, useRef, useEffect, useCallback } from 'react';
+import { Loading } from 'react-basics';
 import classNames from 'classnames';
 import Chart from 'chart.js/auto';
 import HoverTooltip from 'components/common/HoverTooltip';
 import Legend from 'components/metrics/Legend';
 import { formatLongNumber } from 'lib/format';
-import { dateFormat } from 'lib/date';
 import useLocale from 'hooks/useLocale';
 import useTheme from 'hooks/useTheme';
-import { DEFAULT_ANIMATION_DURATION, THEME_COLORS } from 'lib/constants';
+import { DEFAULT_ANIMATION_DURATION } from 'lib/constants';
 import styles from './BarChart.module.css';
 
+function defaultRenderYLabel(label) {
+  return +label > 1000 ? formatLongNumber(label) : label;
+}
+
 export function BarChart({
   datasets,
   unit,
   animationDuration = DEFAULT_ANIMATION_DURATION,
   stacked = false,
   loading = false,
-  onCreate = () => {},
-  onUpdate = () => {},
+  renderXLabel,
+  renderYLabel,
+  XAxisType = 'time',
+  YAxisType = 'linear',
+  renderTooltip,
+  onCreate,
+  onUpdate,
   className,
 }) {
   const canvas = useRef();
   const chart = useRef(null);
   const [tooltip, setTooltip] = useState(null);
   const { locale } = useLocale();
-  const [theme] = useTheme();
-
-  const colors = useMemo(
-    () => ({
-      text: THEME_COLORS[theme].gray700,
-      line: THEME_COLORS[theme].gray200,
-    }),
-    [theme],
-  );
-
-  const renderYLabel = label => {
-    return +label > 1000 ? formatLongNumber(label) : label;
-  };
-
-  const renderXLabel = useCallback(
-    (label, index, values) => {
-      const d = new Date(values[index].value);
-
-      switch (unit) {
-        case 'minute':
-          return dateFormat(d, 'h:mm', locale);
-        case 'hour':
-          return dateFormat(d, 'p', locale);
-        case 'day':
-          return dateFormat(d, 'MMM d', locale);
-        case 'month':
-          return dateFormat(d, 'MMM', locale);
-        case 'year':
-          return dateFormat(d, 'YYY', locale);
-        default:
-          return label;
-      }
-    },
-    [locale, unit],
-  );
-
-  const renderTooltip = useCallback(
-    model => {
-      const { opacity, labelColors, dataPoints } = model.tooltip;
-
-      if (!dataPoints?.length || !opacity) {
-        setTooltip(null);
-        return;
-      }
-
-      const formats = {
-        millisecond: 'T',
-        second: 'pp',
-        minute: 'p',
-        hour: 'h:mm aaa - PP',
-        day: 'PPPP',
-        week: 'PPPP',
-        month: 'LLLL yyyy',
-        quarter: 'qqq',
-        year: 'yyyy',
-      };
-
-      setTooltip(
-        <div className={styles.tooltip}>
-          <div>{dateFormat(new Date(dataPoints[0].raw.x), formats[unit], locale)}</div>
-          <div>
-            <StatusLight color={labelColors?.[0]?.backgroundColor}>
-              <div className={styles.value}>
-                {formatLongNumber(dataPoints[0].raw.y)} {dataPoints[0].dataset.label}
-              </div>
-            </StatusLight>
-          </div>
-        </div>,
-      );
-    },
-    [unit],
-  );
+  const { theme, colors } = useTheme();
 
   const getOptions = useCallback(() => {
     return {
@@ -117,12 +54,12 @@ export function BarChart({
         },
         tooltip: {
           enabled: false,
-          external: renderTooltip,
+          external: renderTooltip ? renderTooltip.bind(null, setTooltip) : undefined,
         },
       },
       scales: {
         x: {
-          type: 'time',
+          type: XAxisType,
           stacked: true,
           time: {
             unit,
@@ -131,34 +68,44 @@ export function BarChart({
             display: false,
           },
           border: {
-            color: colors.line,
+            color: colors.chart.line,
           },
           ticks: {
-            color: colors.text,
+            color: colors.chart.text,
             autoSkip: false,
             maxRotation: 0,
             callback: renderXLabel,
           },
         },
         y: {
-          type: 'linear',
+          type: YAxisType,
           min: 0,
           beginAtZero: true,
           stacked,
           grid: {
-            color: colors.line,
+            color: colors.chart.line,
           },
           border: {
-            color: colors.line,
+            color: colors.chart.line,
           },
           ticks: {
             color: colors.text,
-            callback: renderYLabel,
+            callback: renderYLabel || defaultRenderYLabel,
           },
         },
       },
     };
-  }, [animationDuration, renderTooltip, renderXLabel, stacked, colors, unit, locale]);
+  }, [
+    animationDuration,
+    renderTooltip,
+    renderXLabel,
+    XAxisType,
+    YAxisType,
+    stacked,
+    colors,
+    unit,
+    locale,
+  ]);
 
   const createChart = () => {
     Chart.defaults.font.family = 'Inter';
@@ -173,7 +120,7 @@ export function BarChart({
       options,
     });
 
-    onCreate(chart.current);
+    onCreate?.(chart.current);
   };
 
   const updateChart = () => {
@@ -186,7 +133,7 @@ export function BarChart({
 
     chart.current.options = getOptions();
 
-    onUpdate(chart.current);
+    onUpdate?.(chart.current);
 
     chart.current.update();
   };
@@ -208,7 +155,11 @@ export function BarChart({
         <canvas ref={canvas} />
       </div>
       <Legend chart={chart.current} />
-      {tooltip && <HoverTooltip tooltip={tooltip} />}
+      {tooltip && (
+        <HoverTooltip>
+          <div className={styles.tooltip}>{tooltip}</div>
+        </HoverTooltip>
+      )}
     </>
   );
 }
diff --git a/components/metrics/DataTable.js b/components/metrics/DataTable.js
index 086f98ae..a2c1a568 100644
--- a/components/metrics/DataTable.js
+++ b/components/metrics/DataTable.js
@@ -5,8 +5,8 @@ import { useSpring, animated, config } from 'react-spring';
 import classNames from 'classnames';
 import NoData from 'components/common/NoData';
 import { formatNumber, formatLongNumber } from 'lib/format';
+import useMessages from 'hooks/useMessages';
 import styles from './DataTable.module.css';
-import useMessages from '../../hooks/useMessages';
 
 export function DataTable({
   data = [],
diff --git a/components/metrics/DataTable.module.css b/components/metrics/DataTable.module.css
index c5b2bd7c..04e12e9b 100644
--- a/components/metrics/DataTable.module.css
+++ b/components/metrics/DataTable.module.css
@@ -1,9 +1,9 @@
 .table {
   position: relative;
-  height: 100%;
   display: grid;
   grid-template-rows: fit-content(100%) auto;
   overflow: hidden;
+  flex: 1;
 }
 
 .body {
diff --git a/components/metrics/MetricsBar.module.css b/components/metrics/MetricsBar.module.css
index 0e305c70..eaf81c48 100644
--- a/components/metrics/MetricsBar.module.css
+++ b/components/metrics/MetricsBar.module.css
@@ -1,7 +1,7 @@
 .bar {
   display: flex;
   cursor: pointer;
-  min-height: 80px;
+  min-height: 110px;
   gap: 20px;
   flex-wrap: wrap;
 }
diff --git a/components/metrics/PageviewsChart.js b/components/metrics/PageviewsChart.js
index 6ea16226..0dcf0ac5 100644
--- a/components/metrics/PageviewsChart.js
+++ b/components/metrics/PageviewsChart.js
@@ -1,33 +1,73 @@
-import { useMemo } from 'react';
-import { colord } from 'colord';
+import { useCallback, useMemo } from 'react';
+import { StatusLight } from 'react-basics';
 import BarChart from './BarChart';
-import { THEME_COLORS } from 'lib/constants';
 import useTheme from 'hooks/useTheme';
 import useMessages from 'hooks/useMessages';
 import useLocale from 'hooks/useLocale';
+import { dateFormat } from 'lib/date';
+import { formatLongNumber } from 'lib/format';
 
-export function PageviewsChart({ websiteId, data, unit, records, className, loading, ...props }) {
+export function PageviewsChart({ websiteId, data, unit, className, loading, ...props }) {
   const { formatMessage, labels } = useMessages();
-  const [theme] = useTheme();
+  const { colors } = useTheme();
   const { locale } = useLocale();
 
-  const colors = useMemo(() => {
-    const primaryColor = colord(THEME_COLORS[theme].primary);
-    return {
-      views: {
-        hoverBackgroundColor: primaryColor.alpha(0.7).toRgbString(),
-        backgroundColor: primaryColor.alpha(0.4).toRgbString(),
-        borderColor: primaryColor.alpha(0.7).toRgbString(),
-        hoverBorderColor: primaryColor.toRgbString(),
-      },
-      visitors: {
-        hoverBackgroundColor: primaryColor.alpha(0.9).toRgbString(),
-        backgroundColor: primaryColor.alpha(0.6).toRgbString(),
-        borderColor: primaryColor.alpha(0.9).toRgbString(),
-        hoverBorderColor: primaryColor.toRgbString(),
-      },
-    };
-  }, [theme]);
+  const renderXLabel = useCallback(
+    (label, index, values) => {
+      const d = new Date(values[index].value);
+
+      switch (unit) {
+        case 'minute':
+          return dateFormat(d, 'h:mm', locale);
+        case 'hour':
+          return dateFormat(d, 'p', locale);
+        case 'day':
+          return dateFormat(d, 'MMM d', locale);
+        case 'month':
+          return dateFormat(d, 'MMM', locale);
+        case 'year':
+          return dateFormat(d, 'YYY', locale);
+        default:
+          return label;
+      }
+    },
+    [locale, unit],
+  );
+
+  const renderTooltip = useCallback(
+    (setTooltip, model) => {
+      const { opacity, labelColors, dataPoints } = model.tooltip;
+
+      if (!dataPoints?.length || !opacity) {
+        setTooltip(null);
+        return;
+      }
+
+      const formats = {
+        millisecond: 'T',
+        second: 'pp',
+        minute: 'p',
+        hour: 'h:mm aaa - PP',
+        day: 'PPPP',
+        week: 'PPPP',
+        month: 'LLLL yyyy',
+        quarter: 'qqq',
+        year: 'yyyy',
+      };
+
+      setTooltip(
+        <>
+          <div>{dateFormat(new Date(dataPoints[0].raw.x), formats[unit], locale)}</div>
+          <div>
+            <StatusLight color={labelColors?.[0]?.backgroundColor}>
+              {formatLongNumber(dataPoints[0].raw.y)} {dataPoints[0].dataset.label}
+            </StatusLight>
+          </div>
+        </>,
+      );
+    },
+    [unit],
+  );
 
   const datasets = useMemo(() => {
     if (!data) return [];
@@ -37,13 +77,13 @@ export function PageviewsChart({ websiteId, data, unit, records, className, load
         label: formatMessage(labels.uniqueVisitors),
         data: data.sessions,
         borderWidth: 1,
-        ...colors.visitors,
+        ...colors.chart.visitors,
       },
       {
         label: formatMessage(labels.pageViews),
         data: data.pageviews,
         borderWidth: 1,
-        ...colors.views,
+        ...colors.chart.views,
       },
     ];
   }, [data, locale, colors]);
@@ -55,8 +95,9 @@ export function PageviewsChart({ websiteId, data, unit, records, className, load
       className={className}
       datasets={datasets}
       unit={unit}
-      records={records}
       loading={loading}
+      renderXLabel={renderXLabel}
+      renderTooltip={renderTooltip}
     />
   );
 }
diff --git a/components/metrics/WebsiteHeader.module.css b/components/metrics/WebsiteHeader.module.css
index e5ebcca7..68fd22f8 100644
--- a/components/metrics/WebsiteHeader.module.css
+++ b/components/metrics/WebsiteHeader.module.css
@@ -1,3 +1,9 @@
+.header {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
 .title {
   display: flex;
   flex-direction: row;
diff --git a/components/pages/reports/ReportHeader.js b/components/pages/reports/ReportHeader.js
index 90d58ca8..7da47245 100644
--- a/components/pages/reports/ReportHeader.js
+++ b/components/pages/reports/ReportHeader.js
@@ -16,8 +16,6 @@ export function ReportHeader({ report, icon }) {
   const { id, websiteId, name, parameters } = report || {};
   const { value, startDate, endDate } = parameters?.dateRange || {};
 
-  console.log('REPORT HEADER', report);
-
   const handleSelect = websiteId => {
     updateReport(id, { websiteId });
   };
diff --git a/components/pages/reports/funnel/FunnelChart.js b/components/pages/reports/funnel/FunnelChart.js
index 307c78ee..aecd48a7 100644
--- a/components/pages/reports/funnel/FunnelChart.js
+++ b/components/pages/reports/funnel/FunnelChart.js
@@ -1,184 +1,60 @@
-import Chart from 'chart.js/auto';
-import classNames from 'classnames';
-import { colord } from 'colord';
-import HoverTooltip from 'components/common/HoverTooltip';
-import Legend from 'components/metrics/Legend';
-import useLocale from 'hooks/useLocale';
+import { useCallback, useMemo } from 'react';
+import { Loading } from 'react-basics';
 import useMessages from 'hooks/useMessages';
 import useTheme from 'hooks/useTheme';
-import { DEFAULT_ANIMATION_DURATION, THEME_COLORS } from 'lib/constants';
+import BarChart from 'components/metrics/BarChart';
 import { formatLongNumber } from 'lib/format';
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { Loading, StatusLight } from 'react-basics';
 import styles from './FunnelChart.module.css';
 
-export function FunnelChart({
-  data,
-  animationDuration = DEFAULT_ANIMATION_DURATION,
-  stacked = false,
-  loading = false,
-  onCreate = () => {},
-  onUpdate = () => {},
-  className,
-}) {
+export function FunnelChart({ report, data, loading, className }) {
   const { formatMessage, labels } = useMessages();
-  const canvas = useRef();
-  const chart = useRef(null);
-  const [tooltip, setTooltip] = useState(null);
-  const { locale } = useLocale();
-  const [theme] = useTheme();
+  const { colors } = useTheme();
 
-  const datasets = useMemo(() => {
-    const primaryColor = colord(THEME_COLORS[theme].primary);
-    return [
-      {
-        label: formatMessage(labels.uniqueVisitors),
-        data: data,
-        borderWidth: 1,
-        hoverBackgroundColor: primaryColor.alpha(0.9).toRgbString(),
-        backgroundColor: primaryColor.alpha(0.6).toRgbString(),
-        borderColor: primaryColor.alpha(0.9).toRgbString(),
-        hoverBorderColor: primaryColor.toRgbString(),
-      },
-    ];
-  }, [data]);
+  const { parameters } = report || {};
 
-  const colors = useMemo(
-    () => ({
-      text: THEME_COLORS[theme].gray700,
-      line: THEME_COLORS[theme].gray200,
-    }),
-    [theme],
+  const renderXLabel = useCallback(
+    (label, index) => {
+      return parameters.urls[index];
+    },
+    [parameters],
   );
 
-  const renderYLabel = label => {
-    return +label > 1000 ? formatLongNumber(label) : label;
-  };
-
-  const renderTooltip = useCallback(model => {
-    const { opacity, labelColors, dataPoints } = model.tooltip;
+  const renderTooltip = useCallback((setTooltip, model) => {
+    const { opacity, dataPoints } = model.tooltip;
 
     if (!dataPoints?.length || !opacity) {
       setTooltip(null);
       return;
     }
 
-    setTooltip(
-      <div className={styles.tooltip}>
-        <div>
-          <StatusLight color={labelColors?.[0]?.backgroundColor}>
-            <div className={styles.value}>
-              <div>{dataPoints[0].raw.x}</div>
-              <div>{formatLongNumber(dataPoints[0].raw.y)}</div>
-            </div>
-          </StatusLight>
-        </div>
-      </div>,
-    );
+    setTooltip(`${formatLongNumber(dataPoints[0].raw.y)} ${formatMessage(labels.visitors)}`);
   }, []);
 
-  const getOptions = useCallback(() => {
-    return {
-      responsive: true,
-      maintainAspectRatio: false,
-      animation: {
-        duration: animationDuration,
-        resize: {
-          duration: 0,
-        },
-        active: {
-          duration: 0,
-        },
+  const datasets = useMemo(() => {
+    return [
+      {
+        label: formatMessage(labels.uniqueVisitors),
+        data: data,
+        borderWidth: 1,
+        ...colors.chart.visitors,
       },
-      plugins: {
-        legend: {
-          display: false,
-        },
-        tooltip: {
-          enabled: false,
-          external: renderTooltip,
-        },
-      },
-      scales: {
-        x: {
-          grid: {
-            display: false,
-          },
-          border: {
-            color: colors.line,
-          },
-          ticks: {
-            color: colors.text,
-            autoSkip: false,
-            maxRotation: 0,
-          },
-        },
-        y: {
-          type: 'linear',
-          min: 0,
-          beginAtZero: true,
-          stacked,
-          grid: {
-            color: colors.line,
-          },
-          border: {
-            color: colors.line,
-          },
-          ticks: {
-            color: colors.text,
-            callback: renderYLabel,
-          },
-        },
-      },
-    };
-  }, [animationDuration, renderTooltip, stacked, colors, locale]);
+    ];
+  }, [data]);
 
-  const createChart = () => {
-    Chart.defaults.font.family = 'Inter';
-
-    const options = getOptions();
-
-    chart.current = new Chart(canvas.current, {
-      type: 'bar',
-      data: { datasets },
-      options,
-    });
-
-    onCreate(chart.current);
-  };
-
-  const updateChart = () => {
-    setTooltip(null);
-
-    chart.current.data.datasets[0].data = datasets[0].data;
-    chart.current.data.datasets[0].label = datasets[0].label;
-
-    chart.current.options = getOptions();
-
-    onUpdate(chart.current);
-
-    chart.current.update();
-  };
-
-  useEffect(() => {
-    if (datasets) {
-      if (!chart.current) {
-        createChart();
-      } else {
-        updateChart();
-      }
-    }
-  }, [datasets, theme, animationDuration, locale]);
+  if (loading) {
+    return <Loading icon="dots" className={styles.loading} />;
+  }
 
   return (
-    <>
-      <div className={classNames(styles.chart, className)}>
-        {loading && <Loading position="page" icon="dots" />}
-        <canvas ref={canvas} />
-      </div>
-      <Legend chart={chart.current} />
-      {tooltip && <HoverTooltip tooltip={tooltip} />}
-    </>
+    <BarChart
+      className={className}
+      datasets={datasets}
+      unit="day"
+      loading={loading}
+      renderXLabel={renderXLabel}
+      renderTooltip={renderTooltip}
+      XAxisType="category"
+    />
   );
 }
 
diff --git a/components/pages/reports/funnel/FunnelChart.module.css b/components/pages/reports/funnel/FunnelChart.module.css
index f071a29e..9e1690b3 100644
--- a/components/pages/reports/funnel/FunnelChart.module.css
+++ b/components/pages/reports/funnel/FunnelChart.module.css
@@ -1,23 +1,3 @@
-.chart {
-  position: relative;
-  height: 400px;
-  overflow: hidden;
-}
-
-.tooltip {
-  display: flex;
-  flex-direction: column;
-  gap: 10px;
-}
-
-.tooltip .value {
-  display: flex;
-  flex-direction: column;
-  text-transform: lowercase;
-}
-
-@media only screen and (max-width: 992px) {
-  .chart {
-    /*height: 200px;*/
-  }
+.loading {
+  height: 300px;
 }
diff --git a/components/pages/reports/funnel/FunnelParameters.js b/components/pages/reports/funnel/FunnelParameters.js
index d387686e..f43728c7 100644
--- a/components/pages/reports/funnel/FunnelParameters.js
+++ b/components/pages/reports/funnel/FunnelParameters.js
@@ -1,5 +1,6 @@
 import { useMessages } from 'hooks';
 import {
+  Button,
   Icon,
   Form,
   FormButtons,
@@ -8,29 +9,38 @@ import {
   PopupTrigger,
   Popup,
   SubmitButton,
+  Text,
   TextField,
 } from 'react-basics';
 import Icons from 'components/icons';
 import { updateReport } from 'store/reports';
-import { useRef } from 'react';
+import { useRef, useState } from 'react';
 import styles from './FunnelParameters.module.css';
 
 export function FunnelParameters({ report }) {
   const { formatMessage, labels } = useMessages();
   const ref = useRef(null);
   const { id, websiteId, parameters, isLoading } = report || {};
+  const queryDisabled = !websiteId || parameters?.urls?.length < 2;
 
   const handleSubmit = values => {
-    console.log({ values });
-    updateReport(id, { parameters: values, isLoading: false });
+    updateReport(id, { parameters: values, isLoading: false, update: Date.now() });
   };
 
-  console.log('PARAMETERS', parameters);
+  const handleAdd = url => {
+    updateReport(id, { parameters: { ...parameters, urls: parameters.urls.concat(url) } });
+  };
+
+  const handleRemove = index => {
+    const urls = [...parameters.urls];
+    urls.splice(index, 1);
+    updateReport(id, { parameters: { ...parameters, urls } });
+  };
 
   return (
     <>
       <Form ref={ref} values={parameters} onSubmit={handleSubmit}>
-        <FormRow label="Window (minutes)">
+        <FormRow label={formatMessage(labels.window)}>
           <FormInput
             name="window"
             rules={{ required: formatMessage(labels.required), pattern: /[0-9]+/ }}
@@ -38,11 +48,22 @@ export function FunnelParameters({ report }) {
             <TextField autoComplete="off" />
           </FormInput>
         </FormRow>
-        <FormRow label={formatMessage(labels.urls)} action={<AddURLButton />}>
-          hi
+        <FormRow label={formatMessage(labels.urls)} action={<AddURLButton onAdd={handleAdd} />}>
+          <div className={styles.urls}>
+            {parameters?.urls.map((url, index) => {
+              return (
+                <div key={index} className={styles.url}>
+                  <Text>{url}</Text>
+                  <Icon onClick={() => handleRemove(index)}>
+                    <Icons.Close />
+                  </Icon>
+                </div>
+              );
+            })}
+          </div>
         </FormRow>
         <FormButtons>
-          <SubmitButton variant="primary" disabled={!websiteId} loading={isLoading}>
+          <SubmitButton variant="primary" disabled={queryDisabled} loading={isLoading}>
             {formatMessage(labels.query)}
           </SubmitButton>
         </FormButtons>
@@ -51,14 +72,40 @@ export function FunnelParameters({ report }) {
   );
 }
 
-function AddURLButton() {
+function AddURLButton({ onAdd }) {
+  const [url, setUrl] = useState('');
+  const { formatMessage, labels } = useMessages();
+
+  const handleAdd = close => {
+    onAdd?.(url);
+    setUrl('');
+    close();
+  };
+
+  const handleChange = e => {
+    setUrl(e.target.value);
+  };
+
   return (
     <PopupTrigger>
       <Icon>
         <Icons.Plus />
       </Icon>
       <Popup className={styles.popup} position="right" alignment="start">
-        HALLO
+        {close => {
+          return (
+            <Form>
+              <FormRow label={formatMessage(labels.url)}>
+                <TextField name="url" value={url} onChange={handleChange} autoComplete="off" />
+              </FormRow>
+              <FormButtons>
+                <Button variant="primary" onClick={() => handleAdd(close)}>
+                  {formatMessage(labels.add)}
+                </Button>
+              </FormButtons>
+            </Form>
+          );
+        }}
       </Popup>
     </PopupTrigger>
   );
diff --git a/components/pages/reports/funnel/FunnelParameters.module.css b/components/pages/reports/funnel/FunnelParameters.module.css
index 0e68e095..d60048a7 100644
--- a/components/pages/reports/funnel/FunnelParameters.module.css
+++ b/components/pages/reports/funnel/FunnelParameters.module.css
@@ -4,4 +4,22 @@
   margin-left: 10px;
   border: 1px solid var(--base400);
   border-radius: var(--border-radius);
-}
\ No newline at end of file
+  width: 400px;
+}
+
+.urls {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+
+.url {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding: 12px;
+  border: 1px solid var(--base400);
+  border-radius: var(--border-radius);
+  box-shadow: 1px 1px 1px var(--base400);
+}
diff --git a/components/pages/reports/funnel/FunnelReport.js b/components/pages/reports/funnel/FunnelReport.js
index 3c466050..da422d54 100644
--- a/components/pages/reports/funnel/FunnelReport.js
+++ b/components/pages/reports/funnel/FunnelReport.js
@@ -7,21 +7,35 @@ import ReportMenu from '../ReportMenu';
 import ReportBody from '../ReportBody';
 import Funnel from 'assets/funnel.svg';
 import { useReport } from 'hooks';
+import useApi from 'hooks/useApi';
 
 export default function FunnelReport({ reportId }) {
-  const report = useReport(reportId);
+  const report = useReport(reportId, { window: 60, urls: ['/', '/docs'] });
+  const { post, useQuery } = useApi();
+  const { data, isLoading, error } = useQuery(
+    ['report:funnel', report?.update],
+    () => {
+      const { websiteId, parameters } = report || {};
 
-  console.log('REPORT', { report });
+      return post(`/reports/funnel`, {
+        websiteId: websiteId,
+        ...parameters,
+        startAt: +parameters.dateRange.startDate,
+        endAt: +parameters.dateRange.endDate,
+      });
+    },
+    { enabled: !!report?.update },
+  );
 
   return (
-    <Report>
+    <Report error={error} loading={data && isLoading}>
       <ReportHeader icon={<Funnel />} report={report} />
       <ReportMenu>
         <FunnelParameters report={report} />
       </ReportMenu>
       <ReportBody>
-        <FunnelChart report={report} />
-        <FunnelTable report={report} />
+        <FunnelChart report={report} data={data} />
+        <FunnelTable data={data} />
       </ReportBody>
     </Report>
   );
diff --git a/components/pages/reports/funnel/FunnelTable.js b/components/pages/reports/funnel/FunnelTable.js
index 27b4bbfc..7b726e48 100644
--- a/components/pages/reports/funnel/FunnelTable.js
+++ b/components/pages/reports/funnel/FunnelTable.js
@@ -1,12 +1,17 @@
 import DataTable from 'components/metrics/DataTable';
+import { useMessages } from 'hooks';
 
-export function FunnelTable({ ...props }) {
-  const { data } = props;
+export function FunnelTable({ data }) {
+  const { formatMessage, labels } = useMessages();
 
-  const tableData =
-    data?.map(a => ({ x: a.x, y: a.y, z: Math.floor(a.y / data[0].y) * 100 })) || [];
-
-  return <DataTable data={tableData} title="Url" type="device" />;
+  return (
+    <DataTable
+      data={data}
+      title={formatMessage(labels.url)}
+      metric={formatMessage(labels.visitors)}
+      showPercentage={false}
+    />
+  );
 }
 
 export default FunnelTable;
diff --git a/components/pages/settings/profile/ThemeSetting.js b/components/pages/settings/profile/ThemeSetting.js
index f4503268..54a8dac8 100644
--- a/components/pages/settings/profile/ThemeSetting.js
+++ b/components/pages/settings/profile/ThemeSetting.js
@@ -6,13 +6,13 @@ import Moon from 'assets/moon.svg';
 import styles from './ThemeSetting.module.css';
 
 export function ThemeSetting() {
-  const [theme, setTheme] = useTheme();
+  const { theme, saveTheme } = useTheme();
 
   return (
     <div className={styles.buttons}>
       <Button
         className={classNames({ [styles.active]: theme === 'light' })}
-        onClick={() => setTheme('light')}
+        onClick={() => saveTheme('light')}
       >
         <Icon>
           <Sun />
@@ -20,7 +20,7 @@ export function ThemeSetting() {
       </Button>
       <Button
         className={classNames({ [styles.active]: theme === 'dark' })}
-        onClick={() => setTheme('dark')}
+        onClick={() => saveTheme('dark')}
       >
         <Icon>
           <Moon />
diff --git a/hooks/useReport.js b/hooks/useReport.js
index 1b1c6f0e..6eb16711 100644
--- a/hooks/useReport.js
+++ b/hooks/useReport.js
@@ -1,8 +1,7 @@
 import useStore, { createReport } from 'store/reports';
 import { useCallback, useEffect, useState } from 'react';
-import { useForceUpdate } from 'hooks';
 
-export function useReport(reportId) {
+export function useReport(reportId, defaultParameters) {
   const [id, setId] = useState(reportId);
 
   const selector = useCallback(state => state[id], [id]);
@@ -10,12 +9,11 @@ export function useReport(reportId) {
 
   useEffect(() => {
     if (!report) {
-      setId(createReport().id);
+      const newReport = createReport(defaultParameters);
+      setId(newReport.id);
     }
   }, []);
 
-  console.log('USE REPORT', report);
-
   return report;
 }
 
diff --git a/hooks/useTheme.js b/hooks/useTheme.js
index a10894e5..b8b51226 100644
--- a/hooks/useTheme.js
+++ b/hooks/useTheme.js
@@ -1,7 +1,8 @@
 import { useEffect } from 'react';
 import useStore, { setTheme } from 'store/app';
 import { getItem, setItem } from 'next-basics';
-import { THEME_CONFIG } from 'lib/constants';
+import { THEME_COLORS, THEME_CONFIG } from 'lib/constants';
+import { colord } from 'colord';
 
 const selector = state => state.theme;
 
@@ -13,6 +14,26 @@ export function useTheme() {
         : 'light'
       : 'light';
   const theme = useStore(selector) || getItem(THEME_CONFIG) || defaultTheme;
+  const primaryColor = colord(THEME_COLORS[theme].primary);
+
+  const colors = {
+    chart: {
+      text: THEME_COLORS[theme].gray700,
+      line: THEME_COLORS[theme].gray200,
+      views: {
+        hoverBackgroundColor: primaryColor.alpha(0.7).toRgbString(),
+        backgroundColor: primaryColor.alpha(0.4).toRgbString(),
+        borderColor: primaryColor.alpha(0.7).toRgbString(),
+        hoverBorderColor: primaryColor.toRgbString(),
+      },
+      visitors: {
+        hoverBackgroundColor: primaryColor.alpha(0.9).toRgbString(),
+        backgroundColor: primaryColor.alpha(0.6).toRgbString(),
+        borderColor: primaryColor.alpha(0.9).toRgbString(),
+        hoverBorderColor: primaryColor.toRgbString(),
+      },
+    },
+  };
 
   function saveTheme(value) {
     setItem(THEME_CONFIG, value);
@@ -32,7 +53,7 @@ export function useTheme() {
     }
   }, []);
 
-  return [theme, saveTheme];
+  return { theme, saveTheme, colors };
 }
 
 export default useTheme;
diff --git a/pages/api/reports/funnel.ts b/pages/api/reports/funnel.ts
index 6e3eb602..4308c09d 100644
--- a/pages/api/reports/funnel.ts
+++ b/pages/api/reports/funnel.ts
@@ -29,6 +29,7 @@ export default async (
 
   if (req.method === 'POST') {
     const { websiteId, urls, window, startAt, endAt } = req.body;
+
     if (!(await canViewWebsite(req.auth, websiteId))) {
       return unauthorized(res);
     }
diff --git a/rollup.tracker.config.js b/rollup.tracker.config.js
index 8003e0da..f4e7223c 100644
--- a/rollup.tracker.config.js
+++ b/rollup.tracker.config.js
@@ -4,7 +4,7 @@ import replace from '@rollup/plugin-replace';
 import { terser } from 'rollup-plugin-terser';
 
 export default {
-  input: 'tracker/event-data.js',
+  input: 'tracker/index.js',
   output: {
     file: 'public/script.js',
     format: 'iife',
diff --git a/store/reports.js b/store/reports.js
index 4716aa43..fa658d4d 100644
--- a/store/reports.js
+++ b/store/reports.js
@@ -15,8 +15,6 @@ const store = create(() => ({ ...initialState }));
 export function updateReport(id, data) {
   const report = store.getState()[id];
 
-  console.log('UPDATE STORE START', id, report);
-
   if (report) {
     store.setState(
       produce(state => {
@@ -37,9 +35,9 @@ export function updateReport(id, data) {
   }
 }
 
-export function createReport() {
+export function createReport(parameters) {
   const id = `new_${getRandomChars(16)}`;
-  const report = { ...emptyReport, id };
+  const report = { ...emptyReport, id, parameters };
 
   store.setState(
     produce(state => {
@@ -49,8 +47,6 @@ export function createReport() {
     }),
   );
 
-  console.log('CREATE STORE', report);
-
   return report;
 }
 

From 5a5127c9212f25dcebeb790bfcc6c71df171351b Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Wed, 24 May 2023 21:54:49 -0700
Subject: [PATCH 47/88] Converted popup into modal.

---
 .../pages/reports/funnel/FunnelParameters.js  | 19 ++++++++++++-------
 .../funnel/FunnelParameters.module.css        |  9 ---------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/components/pages/reports/funnel/FunnelParameters.js b/components/pages/reports/funnel/FunnelParameters.js
index f43728c7..bced9a1a 100644
--- a/components/pages/reports/funnel/FunnelParameters.js
+++ b/components/pages/reports/funnel/FunnelParameters.js
@@ -6,8 +6,8 @@ import {
   FormButtons,
   FormInput,
   FormRow,
-  PopupTrigger,
-  Popup,
+  ModalTrigger,
+  Modal,
   SubmitButton,
   Text,
   TextField,
@@ -85,29 +85,34 @@ function AddURLButton({ onAdd }) {
   const handleChange = e => {
     setUrl(e.target.value);
   };
+  const handleClose = close => {
+    setUrl('');
+    close();
+  };
 
   return (
-    <PopupTrigger>
+    <ModalTrigger>
       <Icon>
         <Icons.Plus />
       </Icon>
-      <Popup className={styles.popup} position="right" alignment="start">
+      <Modal>
         {close => {
           return (
             <Form>
               <FormRow label={formatMessage(labels.url)}>
                 <TextField name="url" value={url} onChange={handleChange} autoComplete="off" />
               </FormRow>
-              <FormButtons>
+              <FormButtons align="center" flex>
                 <Button variant="primary" onClick={() => handleAdd(close)}>
                   {formatMessage(labels.add)}
                 </Button>
+                <Button onClick={() => handleClose(close)}>{formatMessage(labels.cancel)}</Button>
               </FormButtons>
             </Form>
           );
         }}
-      </Popup>
-    </PopupTrigger>
+      </Modal>
+    </ModalTrigger>
   );
 }
 
diff --git a/components/pages/reports/funnel/FunnelParameters.module.css b/components/pages/reports/funnel/FunnelParameters.module.css
index d60048a7..25ef0241 100644
--- a/components/pages/reports/funnel/FunnelParameters.module.css
+++ b/components/pages/reports/funnel/FunnelParameters.module.css
@@ -1,12 +1,3 @@
-.popup {
-  background: var(--base50);
-  padding: 20px;
-  margin-left: 10px;
-  border: 1px solid var(--base400);
-  border-radius: var(--border-radius);
-  width: 400px;
-}
-
 .urls {
   display: flex;
   flex-direction: column;

From 3ccdd95f49948202ada769530f07bc71bb58fa46 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Thu, 25 May 2023 10:26:00 -0700
Subject: [PATCH 48/88] Moved render functions into lib/charts.

---
 components/common/WorldMap.js                 |  2 +-
 components/metrics/BarChart.js                |  8 +--
 components/metrics/EventsChart.js             | 12 ++--
 components/metrics/PageviewsChart.js          | 71 ++-----------------
 .../pages/reports/funnel/FunnelParameters.js  | 47 ++++++------
 lib/charts.js                                 | 62 ++++++++++++++++
 6 files changed, 101 insertions(+), 101 deletions(-)
 create mode 100644 lib/charts.js

diff --git a/components/common/WorldMap.js b/components/common/WorldMap.js
index a371e2d3..31c6686b 100644
--- a/components/common/WorldMap.js
+++ b/components/common/WorldMap.js
@@ -86,7 +86,7 @@ export function WorldMap({ data, className }) {
           </Geographies>
         </ZoomableGroup>
       </ComposableMap>
-      {tooltip && <HoverTooltip tooltip={tooltip} />}
+      {tooltip && <HoverTooltip>{tooltip}</HoverTooltip>}
     </div>
   );
 }
diff --git a/components/metrics/BarChart.js b/components/metrics/BarChart.js
index 9206b800..2aba3ea5 100644
--- a/components/metrics/BarChart.js
+++ b/components/metrics/BarChart.js
@@ -4,16 +4,12 @@ import classNames from 'classnames';
 import Chart from 'chart.js/auto';
 import HoverTooltip from 'components/common/HoverTooltip';
 import Legend from 'components/metrics/Legend';
-import { formatLongNumber } from 'lib/format';
 import useLocale from 'hooks/useLocale';
 import useTheme from 'hooks/useTheme';
 import { DEFAULT_ANIMATION_DURATION } from 'lib/constants';
+import { renderNumberLabels } from 'lib/charts';
 import styles from './BarChart.module.css';
 
-function defaultRenderYLabel(label) {
-  return +label > 1000 ? formatLongNumber(label) : label;
-}
-
 export function BarChart({
   datasets,
   unit,
@@ -90,7 +86,7 @@ export function BarChart({
           },
           ticks: {
             color: colors.text,
-            callback: renderYLabel || defaultRenderYLabel,
+            callback: renderYLabel || renderNumberLabels,
           },
         },
       },
diff --git a/components/metrics/EventsChart.js b/components/metrics/EventsChart.js
index eb397cc9..334ee591 100644
--- a/components/metrics/EventsChart.js
+++ b/components/metrics/EventsChart.js
@@ -2,16 +2,15 @@ import { useMemo } from 'react';
 import { Loading } from 'react-basics';
 import { colord } from 'colord';
 import BarChart from './BarChart';
-import { getDateArray, getDateLength } from 'lib/date';
-import useApi from 'hooks/useApi';
-import useDateRange from 'hooks/useDateRange';
-import useTimezone from 'hooks/useTimezone';
-import usePageQuery from 'hooks/usePageQuery';
+import { getDateArray } from 'lib/date';
+import { useApi, useLocale, useDateRange, useTimezone, usePageQuery } from 'hooks';
 import { EVENT_COLORS } from 'lib/constants';
+import { renderDateLabels, renderStatusTooltip } from 'lib/charts';
 
 export function EventsChart({ websiteId, className, token }) {
   const { get, useQuery } = useApi();
   const [{ startDate, endDate, unit, modified }] = useDateRange(websiteId);
+  const { locale } = useLocale();
   const [timezone] = useTimezone();
   const {
     query: { url, eventName },
@@ -70,9 +69,10 @@ export function EventsChart({ websiteId, className, token }) {
       datasets={datasets}
       unit={unit}
       height={300}
-      records={getDateLength(startDate, endDate, unit)}
       loading={isLoading}
       stacked
+      renderXLabel={renderDateLabels(unit, locale)}
+      renderTooltip={renderStatusTooltip(unit, locale)}
     />
   );
 }
diff --git a/components/metrics/PageviewsChart.js b/components/metrics/PageviewsChart.js
index 0dcf0ac5..bf56a0bd 100644
--- a/components/metrics/PageviewsChart.js
+++ b/components/metrics/PageviewsChart.js
@@ -1,74 +1,13 @@
-import { useCallback, useMemo } from 'react';
-import { StatusLight } from 'react-basics';
+import { useMemo } from 'react';
 import BarChart from './BarChart';
-import useTheme from 'hooks/useTheme';
-import useMessages from 'hooks/useMessages';
-import useLocale from 'hooks/useLocale';
-import { dateFormat } from 'lib/date';
-import { formatLongNumber } from 'lib/format';
+import { useLocale, useTheme, useMessages } from 'hooks';
+import { renderDateLabels, renderStatusTooltip } from 'lib/charts';
 
 export function PageviewsChart({ websiteId, data, unit, className, loading, ...props }) {
   const { formatMessage, labels } = useMessages();
   const { colors } = useTheme();
   const { locale } = useLocale();
 
-  const renderXLabel = useCallback(
-    (label, index, values) => {
-      const d = new Date(values[index].value);
-
-      switch (unit) {
-        case 'minute':
-          return dateFormat(d, 'h:mm', locale);
-        case 'hour':
-          return dateFormat(d, 'p', locale);
-        case 'day':
-          return dateFormat(d, 'MMM d', locale);
-        case 'month':
-          return dateFormat(d, 'MMM', locale);
-        case 'year':
-          return dateFormat(d, 'YYY', locale);
-        default:
-          return label;
-      }
-    },
-    [locale, unit],
-  );
-
-  const renderTooltip = useCallback(
-    (setTooltip, model) => {
-      const { opacity, labelColors, dataPoints } = model.tooltip;
-
-      if (!dataPoints?.length || !opacity) {
-        setTooltip(null);
-        return;
-      }
-
-      const formats = {
-        millisecond: 'T',
-        second: 'pp',
-        minute: 'p',
-        hour: 'h:mm aaa - PP',
-        day: 'PPPP',
-        week: 'PPPP',
-        month: 'LLLL yyyy',
-        quarter: 'qqq',
-        year: 'yyyy',
-      };
-
-      setTooltip(
-        <>
-          <div>{dateFormat(new Date(dataPoints[0].raw.x), formats[unit], locale)}</div>
-          <div>
-            <StatusLight color={labelColors?.[0]?.backgroundColor}>
-              {formatLongNumber(dataPoints[0].raw.y)} {dataPoints[0].dataset.label}
-            </StatusLight>
-          </div>
-        </>,
-      );
-    },
-    [unit],
-  );
-
   const datasets = useMemo(() => {
     if (!data) return [];
 
@@ -96,8 +35,8 @@ export function PageviewsChart({ websiteId, data, unit, className, loading, ...p
       datasets={datasets}
       unit={unit}
       loading={loading}
-      renderXLabel={renderXLabel}
-      renderTooltip={renderTooltip}
+      renderXLabel={renderDateLabels(unit, locale)}
+      renderTooltip={renderStatusTooltip(unit, locale)}
     />
   );
 }
diff --git a/components/pages/reports/funnel/FunnelParameters.js b/components/pages/reports/funnel/FunnelParameters.js
index bced9a1a..3caf6a8e 100644
--- a/components/pages/reports/funnel/FunnelParameters.js
+++ b/components/pages/reports/funnel/FunnelParameters.js
@@ -11,6 +11,7 @@ import {
   SubmitButton,
   Text,
   TextField,
+  Tooltip,
 } from 'react-basics';
 import Icons from 'components/icons';
 import { updateReport } from 'store/reports';
@@ -91,28 +92,30 @@ function AddURLButton({ onAdd }) {
   };
 
   return (
-    <ModalTrigger>
-      <Icon>
-        <Icons.Plus />
-      </Icon>
-      <Modal>
-        {close => {
-          return (
-            <Form>
-              <FormRow label={formatMessage(labels.url)}>
-                <TextField name="url" value={url} onChange={handleChange} autoComplete="off" />
-              </FormRow>
-              <FormButtons align="center" flex>
-                <Button variant="primary" onClick={() => handleAdd(close)}>
-                  {formatMessage(labels.add)}
-                </Button>
-                <Button onClick={() => handleClose(close)}>{formatMessage(labels.cancel)}</Button>
-              </FormButtons>
-            </Form>
-          );
-        }}
-      </Modal>
-    </ModalTrigger>
+    <Tooltip label={formatMessage(labels.addUrl)}>
+      <ModalTrigger>
+        <Icon>
+          <Icons.Plus />
+        </Icon>
+        <Modal>
+          {close => {
+            return (
+              <Form>
+                <FormRow label={formatMessage(labels.url)}>
+                  <TextField name="url" value={url} onChange={handleChange} autoComplete="off" />
+                </FormRow>
+                <FormButtons align="center" flex>
+                  <Button variant="primary" onClick={() => handleAdd(close)}>
+                    {formatMessage(labels.add)}
+                  </Button>
+                  <Button onClick={() => handleClose(close)}>{formatMessage(labels.cancel)}</Button>
+                </FormButtons>
+              </Form>
+            );
+          }}
+        </Modal>
+      </ModalTrigger>
+    </Tooltip>
   );
 }
 
diff --git a/lib/charts.js b/lib/charts.js
new file mode 100644
index 00000000..c9d54218
--- /dev/null
+++ b/lib/charts.js
@@ -0,0 +1,62 @@
+import { StatusLight } from 'react-basics';
+import { dateFormat } from 'lib/date';
+import { formatLongNumber } from 'lib/format';
+
+export function renderNumberLabels(label) {
+  return +label > 1000 ? formatLongNumber(label) : label;
+}
+
+export function renderDateLabels(unit, locale) {
+  return (label, index, values) => {
+    const d = new Date(values[index].value);
+
+    switch (unit) {
+      case 'minute':
+        return dateFormat(d, 'h:mm', locale);
+      case 'hour':
+        return dateFormat(d, 'p', locale);
+      case 'day':
+        return dateFormat(d, 'MMM d', locale);
+      case 'month':
+        return dateFormat(d, 'MMM', locale);
+      case 'year':
+        return dateFormat(d, 'YYY', locale);
+      default:
+        return label;
+    }
+  };
+}
+
+export function renderStatusTooltip(unit, locale) {
+  return (setTooltip, model) => {
+    const { opacity, labelColors, dataPoints } = model.tooltip;
+
+    if (!dataPoints?.length || !opacity) {
+      setTooltip(null);
+      return;
+    }
+
+    const formats = {
+      millisecond: 'T',
+      second: 'pp',
+      minute: 'p',
+      hour: 'h:mm aaa - PP',
+      day: 'PPPP',
+      week: 'PPPP',
+      month: 'LLLL yyyy',
+      quarter: 'qqq',
+      year: 'yyyy',
+    };
+
+    setTooltip(
+      <>
+        <div>{dateFormat(new Date(dataPoints[0].raw.x), formats[unit], locale)}</div>
+        <div>
+          <StatusLight color={labelColors?.[0]?.backgroundColor}>
+            {formatLongNumber(dataPoints[0].raw.y)} {dataPoints[0].dataset.label}
+          </StatusLight>
+        </div>
+      </>,
+    );
+  };
+}

From 06e6cbec9aa8e81759d966ce20b64792e67aa6d4 Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Thu, 25 May 2023 16:46:37 -0700
Subject: [PATCH 49/88] Add share_id validation.

---
 lib/constants.ts                 | 2 ++
 pages/api/websites/[id]/index.ts | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/lib/constants.ts b/lib/constants.ts
index 425d729f..7eef10b1 100644
--- a/lib/constants.ts
+++ b/lib/constants.ts
@@ -147,6 +147,8 @@ export const EVENT_COLORS = [
 export const DOMAIN_REGEX =
   /^(localhost(:[1-9]\d{0,4})?|((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,63})$/;
 
+export const SHARE_ID_REGEX = /^[a-zA-Z0-9]{16}$/;
+
 export const DESKTOP_SCREEN_WIDTH = 1920;
 export const LAPTOP_SCREEN_WIDTH = 1024;
 export const MOBILE_SCREEN_WIDTH = 479;
diff --git a/pages/api/websites/[id]/index.ts b/pages/api/websites/[id]/index.ts
index 3f660a91..1d7e4ac3 100644
--- a/pages/api/websites/[id]/index.ts
+++ b/pages/api/websites/[id]/index.ts
@@ -4,6 +4,7 @@ import { Website, NextApiRequestQueryBody } from 'lib/types';
 import { canViewWebsite, canUpdateWebsite, canDeleteWebsite } from 'lib/auth';
 import { useAuth, useCors } from 'lib/middleware';
 import { deleteWebsite, getWebsite, updateWebsite } from 'queries';
+import { SHARE_ID_REGEX } from 'lib/constants';
 
 export interface WebsiteRequestQuery {
   id: string;
@@ -43,6 +44,10 @@ export default async (
 
     let website;
 
+    if (shareId && !shareId.match(SHARE_ID_REGEX)) {
+      return serverError(res, 'Invalid share ID.');
+    }
+
     try {
       website = await updateWebsite(websiteId, { name, domain, shareId });
     } catch (e: any) {

From 9d936fe8e59634f9b545827fb47a350d10dda730 Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Thu, 25 May 2023 20:07:58 -0700
Subject: [PATCH 50/88] add ownerId to non-cache.

---
 lib/session.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/session.ts b/lib/session.ts
index 32f3bdc8..1fedb91b 100644
--- a/lib/session.ts
+++ b/lib/session.ts
@@ -63,6 +63,7 @@ export async function findSession(req: NextApiRequestCollect) {
       subdivision1,
       subdivision2,
       city,
+      ownerId: website.userId,
     };
   }
 

From 0724201f695df711c66c4fcb74d414d20aaf3242 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Sat, 27 May 2023 13:29:09 -0700
Subject: [PATCH 51/88] Added indexes. Removed old migration.

---
 .../migrations/02_report_schema/migration.sql | 19 -------------------
 db/postgresql/schema.prisma                   |  2 ++
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 db/postgresql/migrations/02_report_schema/migration.sql

diff --git a/db/postgresql/migrations/02_report_schema/migration.sql b/db/postgresql/migrations/02_report_schema/migration.sql
deleted file mode 100644
index 8b2bf0f5..00000000
--- a/db/postgresql/migrations/02_report_schema/migration.sql
+++ /dev/null
@@ -1,19 +0,0 @@
--- CreateTable
-CREATE TABLE "user_report" (
-    "report_id" UUID NOT NULL,
-    "user_id" UUID NOT NULL,
-    "website_id" UUID NOT NULL,
-    "report_name" VARCHAR(200) NOT NULL,
-    "template_name" VARCHAR(200) NOT NULL,
-    "parameters" VARCHAR(6000) NOT NULL,
-    "created_at" TIMESTAMPTZ(6) DEFAULT CURRENT_TIMESTAMP,
-    "updated_at" TIMESTAMPTZ(6),
-
-    CONSTRAINT "user_report_pkey" PRIMARY KEY ("report_id")
-);
-
--- CreateIndex
-CREATE UNIQUE INDEX "user_report_report_id_key" ON "user_report"("report_id");
-
--- CreateIndex
-CREATE INDEX "user_report_user_id_idx" ON "user_report"("user_id");
diff --git a/db/postgresql/schema.prisma b/db/postgresql/schema.prisma
index 318d455d..7c4cb94f 100644
--- a/db/postgresql/schema.prisma
+++ b/db/postgresql/schema.prisma
@@ -173,5 +173,7 @@ model Report {
 
   @@index([userId])
   @@index([websiteId])
+  @@index([type])
+  @@index([name])
   @@map("report")
 }

From bc37f5124e6edd168912809a7ec2a23ee7bd5660 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Sat, 27 May 2023 22:36:41 -0700
Subject: [PATCH 52/88] Update report migration.

---
 .../migrations/02_report_schema/migration.sql | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 db/postgresql/migrations/02_report_schema/migration.sql

diff --git a/db/postgresql/migrations/02_report_schema/migration.sql b/db/postgresql/migrations/02_report_schema/migration.sql
new file mode 100644
index 00000000..f4f3e885
--- /dev/null
+++ b/db/postgresql/migrations/02_report_schema/migration.sql
@@ -0,0 +1,29 @@
+-- CreateTable
+CREATE TABLE "report" (
+    "report_id" UUID NOT NULL,
+    "user_id" UUID NOT NULL,
+    "website_id" UUID NOT NULL,
+    "type" VARCHAR(200) NOT NULL,
+    "name" VARCHAR(200) NOT NULL,
+    "description" VARCHAR(500) NOT NULL,
+    "parameters" VARCHAR(6000) NOT NULL,
+    "created_at" TIMESTAMPTZ(6) DEFAULT CURRENT_TIMESTAMP,
+    "updated_at" TIMESTAMPTZ(6),
+
+    CONSTRAINT "report_pkey" PRIMARY KEY ("report_id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "report_report_id_key" ON "report"("report_id");
+
+-- CreateIndex
+CREATE INDEX "report_user_id_idx" ON "report"("user_id");
+
+-- CreateIndex
+CREATE INDEX "report_website_id_idx" ON "report"("website_id");
+
+-- CreateIndex
+CREATE INDEX "report_type_idx" ON "report"("type");
+
+-- CreateIndex
+CREATE INDEX "report_name_idx" ON "report"("name");

From bfb52eb6785be6442bc2c635fd0bc6ed0f580862 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Sun, 28 May 2023 21:37:34 -0700
Subject: [PATCH 53/88] Added report context. Removed report store.

---
 components/common/WorldMap.js                 | 21 ++---
 components/messages.js                        |  1 +
 components/pages/reports/Report.js            | 16 +++-
 components/pages/reports/ReportHeader.js      | 50 +++++++---
 components/pages/reports/funnel/AddUrlForm.js | 45 +++++++++
 .../pages/reports/funnel/FunnelChart.js       |  8 +-
 .../pages/reports/funnel/FunnelParameters.js  | 94 ++++++++-----------
 .../funnel/FunnelParameters.module.css        |  6 +-
 .../pages/reports/funnel/FunnelReport.js      | 36 +++----
 .../pages/reports/funnel/FunnelTable.js       |  7 +-
 hooks/useReport.js                            | 76 +++++++++++++--
 hooks/useTheme.js                             |  9 ++
 lib/auth.ts                                   | 12 +--
 package.json                                  |  2 +-
 pages/api/reports/[id].ts                     | 45 +++++----
 pages/api/reports/index.ts                    | 32 ++++---
 pages/realtime/{[id]/index.js => [id].js}     |  0
 pages/reports/[id].js                         | 20 ++++
 pages/reports/index.js                        | 10 +-
 .../settings/teams/{[id]/index.js => [id].js} |  0
 .../settings/users/{[id]/index.js => [id].js} |  0
 .../websites/{[id]/index.js => [id].js}       |  0
 pages/websites/{[id]/index.js => [id].js}     |  0
 queries/admin/report.ts                       | 33 +++++++
 queries/admin/user.ts                         |  2 +-
 queries/admin/userReport.ts                   | 37 --------
 queries/admin/website.ts                      |  2 +-
 queries/index.js                              |  2 +-
 rollup.tracker.config.js                      |  2 +-
 store/reports.js                              | 57 -----------
 yarn.lock                                     | 20 ++--
 31 files changed, 372 insertions(+), 273 deletions(-)
 create mode 100644 components/pages/reports/funnel/AddUrlForm.js
 rename pages/realtime/{[id]/index.js => [id].js} (100%)
 create mode 100644 pages/reports/[id].js
 rename pages/settings/teams/{[id]/index.js => [id].js} (100%)
 rename pages/settings/users/{[id]/index.js => [id].js} (100%)
 rename pages/settings/websites/{[id]/index.js => [id].js} (100%)
 rename pages/websites/{[id]/index.js => [id].js} (100%)
 create mode 100644 queries/admin/report.ts
 delete mode 100644 queries/admin/userReport.ts
 delete mode 100644 store/reports.js

diff --git a/components/common/WorldMap.js b/components/common/WorldMap.js
index 31c6686b..985160d8 100644
--- a/components/common/WorldMap.js
+++ b/components/common/WorldMap.js
@@ -4,7 +4,7 @@ import { ComposableMap, Geographies, Geography, ZoomableGroup } from 'react-simp
 import classNames from 'classnames';
 import { colord } from 'colord';
 import HoverTooltip from 'components/common/HoverTooltip';
-import { ISO_COUNTRIES, THEME_COLORS, MAP_FILE } from 'lib/constants';
+import { ISO_COUNTRIES, MAP_FILE } from 'lib/constants';
 import useTheme from 'hooks/useTheme';
 import useCountryNames from 'hooks/useCountryNames';
 import useLocale from 'hooks/useLocale';
@@ -15,16 +15,7 @@ import styles from './WorldMap.module.css';
 export function WorldMap({ data, className }) {
   const { basePath } = useRouter();
   const [tooltip, setTooltip] = useState();
-  const { theme } = useTheme();
-  const colors = useMemo(
-    () => ({
-      baseColor: THEME_COLORS[theme].primary,
-      fillColor: THEME_COLORS[theme].gray100,
-      strokeColor: THEME_COLORS[theme].primary,
-      hoverColor: THEME_COLORS[theme].primary,
-    }),
-    [theme],
-  );
+  const { theme, colors } = useTheme();
   const { locale } = useLocale();
   const countryNames = useCountryNames(locale);
   const metrics = useMemo(() => (data ? percentFilter(data) : []), [data]);
@@ -34,10 +25,10 @@ export function WorldMap({ data, className }) {
     const country = metrics?.find(({ x }) => x === code);
 
     if (!country) {
-      return colors.fillColor;
+      return colors.map.fillColor;
     }
 
-    return colord(colors.baseColor)
+    return colord(colors.map.baseColor)
       [theme === 'light' ? 'lighten' : 'darken'](0.4 * (1.0 - country.z / 100))
       .toHex();
   }
@@ -70,11 +61,11 @@ export function WorldMap({ data, className }) {
                     key={geo.rsmKey}
                     geography={geo}
                     fill={getFillColor(code)}
-                    stroke={colors.strokeColor}
+                    stroke={colors.map.strokeColor}
                     opacity={getOpacity(code)}
                     style={{
                       default: { outline: 'none' },
-                      hover: { outline: 'none', fill: colors.hoverColor },
+                      hover: { outline: 'none', fill: colors.map.hoverColor },
                       pressed: { outline: 'none' },
                     }}
                     onMouseOver={() => handleHover(code)}
diff --git a/components/messages.js b/components/messages.js
index 0de3a44c..adae6aa2 100644
--- a/components/messages.js
+++ b/components/messages.js
@@ -128,6 +128,7 @@ export const labels = defineMessages({
   add: { id: 'label.add', defaultMessage: 'Add' },
   window: { id: 'label.window', defaultMessage: 'Window' },
   addUrl: { id: 'label.add-url', defaultMessage: 'Add URL' },
+  runQuery: { id: 'label.run-query', defaultMessage: 'Run query' },
 });
 
 export const messages = defineMessages({
diff --git a/components/pages/reports/Report.js b/components/pages/reports/Report.js
index 4e3fcd04..0a98ef75 100644
--- a/components/pages/reports/Report.js
+++ b/components/pages/reports/Report.js
@@ -1,11 +1,19 @@
+import { createContext } from 'react';
 import Page from 'components/layout/Page';
 import styles from './reports.module.css';
+import { useReport } from 'hooks';
+
+export const ReportContext = createContext(null);
+
+export function Report({ reportId, defaultParameters, children, ...props }) {
+  const report = useReport(reportId, defaultParameters);
 
-export function Report({ children, ...props }) {
   return (
-    <Page {...props} className={styles.container}>
-      {children}
-    </Page>
+    <ReportContext.Provider value={{ ...report }}>
+      <Page {...props} className={styles.container}>
+        {children}
+      </Page>
+    </ReportContext.Provider>
   );
 }
 
diff --git a/components/pages/reports/ReportHeader.js b/components/pages/reports/ReportHeader.js
index 7da47245..bf2c7fa8 100644
--- a/components/pages/reports/ReportHeader.js
+++ b/components/pages/reports/ReportHeader.js
@@ -1,42 +1,62 @@
-import { Flexbox, Icon, LoadingButton, Text, useToast } from 'react-basics';
+import { useContext } from 'react';
+import { useRouter } from 'next/router';
+import { Flexbox, Icon, LoadingButton, InlineEditField, useToast } from 'react-basics';
 import WebsiteSelect from 'components/input/WebsiteSelect';
 import PageHeader from 'components/layout/PageHeader';
 import DateFilter from 'components/input/DateFilter';
 import { parseDateRange } from 'lib/date';
-import { updateReport } from 'store/reports';
 import { useMessages, useApi } from 'hooks';
+import { ReportContext } from './Report';
 import styles from './reports.module.css';
 
-export function ReportHeader({ report, icon }) {
+export function ReportHeader({ icon }) {
+  const { report, updateReport } = useContext(ReportContext);
   const { formatMessage, labels, messages } = useMessages();
   const { toast, showToast } = useToast();
   const { post, useMutation } = useApi();
-  const { mutate, isLoading } = useMutation(data => post(`/reports`, data));
+  const router = useRouter();
+  const { mutate: create, isLoading: isCreating } = useMutation(data => post(`/reports`, data));
+  const { mutate: update, isLoading: isUpdating } = useMutation(data =>
+    post(`/reports/${data.id}`, data),
+  );
 
-  const { id, websiteId, name, parameters } = report || {};
-  const { value, startDate, endDate } = parameters?.dateRange || {};
+  const { websiteId, name, dateRange } = report || {};
+  const { value, startDate, endDate } = dateRange || {};
 
   const handleSelect = websiteId => {
-    updateReport(id, { websiteId });
+    updateReport({ websiteId });
   };
 
   const handleDateChange = value => {
-    updateReport(id, { parameters: { dateRange: { ...parseDateRange(value) } } });
+    updateReport({ dateRange: { ...parseDateRange(value) } });
   };
 
   const handleSave = async () => {
-    mutate(report, {
-      onSuccess: async () => {
-        showToast({ message: formatMessage(messages.saved), variant: 'success' });
-      },
-    });
+    if (!report.id) {
+      create(report, {
+        onSuccess: async ({ id }) => {
+          router.push(`/reports/${id}`, null, { shallow: true });
+          showToast({ message: formatMessage(messages.saved), variant: 'success' });
+        },
+      });
+    } else {
+      update(report, {
+        onSuccess: async () => {
+          showToast({ message: formatMessage(messages.saved), variant: 'success' });
+        },
+      });
+    }
+  };
+
+  const handleNameChange = name => {
+    updateReport({ name });
   };
 
   const Title = () => {
     return (
       <>
         <Icon size="lg">{icon}</Icon>
-        <Text>{name}</Text>
+        <InlineEditField value={name} onCommit={handleNameChange} />
       </>
     );
   };
@@ -54,7 +74,7 @@ export function ReportHeader({ report, icon }) {
         <WebsiteSelect websiteId={websiteId} onSelect={handleSelect} />
         <LoadingButton
           variant="primary"
-          loading={isLoading}
+          loading={isCreating || isUpdating}
           disabled={!websiteId || !value}
           onClick={handleSave}
         >
diff --git a/components/pages/reports/funnel/AddUrlForm.js b/components/pages/reports/funnel/AddUrlForm.js
new file mode 100644
index 00000000..07f34867
--- /dev/null
+++ b/components/pages/reports/funnel/AddUrlForm.js
@@ -0,0 +1,45 @@
+import { useState } from 'react';
+import { useMessages } from 'hooks';
+import { Button, Form, FormButtons, FormRow, TextField } from 'react-basics';
+
+export function AddUrlForm({ defaultValue = '', onSave, onClose }) {
+  const [url, setUrl] = useState(defaultValue);
+  const { formatMessage, labels } = useMessages();
+
+  const handleSave = () => {
+    onSave?.(url);
+    setUrl('');
+    onClose();
+  };
+
+  const handleChange = e => {
+    setUrl(e.target.value);
+  };
+
+  const handleClose = () => {
+    setUrl('');
+    onClose();
+  };
+
+  return (
+    <Form>
+      <FormRow label={formatMessage(labels.url)}>
+        <TextField
+          name="url"
+          value={url}
+          onChange={handleChange}
+          autoFocus={true}
+          autoComplete="off"
+        />
+      </FormRow>
+      <FormButtons align="center" flex>
+        <Button variant="primary" onClick={handleSave}>
+          {formatMessage(labels.save)}
+        </Button>
+        <Button onClick={handleClose}>{formatMessage(labels.cancel)}</Button>
+      </FormButtons>
+    </Form>
+  );
+}
+
+export default AddUrlForm;
diff --git a/components/pages/reports/funnel/FunnelChart.js b/components/pages/reports/funnel/FunnelChart.js
index aecd48a7..3dfeb19e 100644
--- a/components/pages/reports/funnel/FunnelChart.js
+++ b/components/pages/reports/funnel/FunnelChart.js
@@ -1,16 +1,18 @@
-import { useCallback, useMemo } from 'react';
+import { useCallback, useContext, useMemo } from 'react';
 import { Loading } from 'react-basics';
 import useMessages from 'hooks/useMessages';
 import useTheme from 'hooks/useTheme';
 import BarChart from 'components/metrics/BarChart';
 import { formatLongNumber } from 'lib/format';
 import styles from './FunnelChart.module.css';
+import { ReportContext } from '../Report';
 
-export function FunnelChart({ report, data, loading, className }) {
+export function FunnelChart({ className, loading }) {
+  const { report } = useContext(ReportContext);
   const { formatMessage, labels } = useMessages();
   const { colors } = useTheme();
 
-  const { parameters } = report || {};
+  const { parameters, data } = report || {};
 
   const renderXLabel = useCallback(
     (label, index) => {
diff --git a/components/pages/reports/funnel/FunnelParameters.js b/components/pages/reports/funnel/FunnelParameters.js
index 3caf6a8e..c87d52e4 100644
--- a/components/pages/reports/funnel/FunnelParameters.js
+++ b/components/pages/reports/funnel/FunnelParameters.js
@@ -1,12 +1,11 @@
+import { useContext, useRef, useState } from 'react';
 import { useMessages } from 'hooks';
 import {
-  Button,
   Icon,
   Form,
   FormButtons,
   FormInput,
   FormRow,
-  ModalTrigger,
   Modal,
   SubmitButton,
   Text,
@@ -14,30 +13,36 @@ import {
   Tooltip,
 } from 'react-basics';
 import Icons from 'components/icons';
-import { updateReport } from 'store/reports';
-import { useRef, useState } from 'react';
+import AddUrlForm from './AddUrlForm';
+import { ReportContext } from 'components/pages/reports/Report';
 import styles from './FunnelParameters.module.css';
 
-export function FunnelParameters({ report }) {
+export function FunnelParameters() {
+  const { report, runReport, updateReport, isRunning } = useContext(ReportContext);
   const { formatMessage, labels } = useMessages();
+  const [show, setShow] = useState(false);
   const ref = useRef(null);
-  const { id, websiteId, parameters, isLoading } = report || {};
+  const { websiteId, parameters } = report || {};
   const queryDisabled = !websiteId || parameters?.urls?.length < 2;
 
   const handleSubmit = values => {
-    updateReport(id, { parameters: values, isLoading: false, update: Date.now() });
+    runReport(values);
   };
 
-  const handleAdd = url => {
-    updateReport(id, { parameters: { ...parameters, urls: parameters.urls.concat(url) } });
+  const handleAddUrl = url => {
+    updateReport({ parameters: { ...parameters, urls: parameters.urls.concat(url) } });
   };
 
-  const handleRemove = index => {
+  const handleRemoveUrl = (index, e) => {
+    e.stopPropagation();
     const urls = [...parameters.urls];
     urls.splice(index, 1);
-    updateReport(id, { parameters: { ...parameters, urls } });
+    updateReport({ parameters: { ...parameters, urls } });
   };
 
+  const showAddForm = () => setShow(true);
+  const hideAddForm = () => setShow(false);
+
   return (
     <>
       <Form ref={ref} values={parameters} onSubmit={handleSubmit}>
@@ -49,72 +54,49 @@ export function FunnelParameters({ report }) {
             <TextField autoComplete="off" />
           </FormInput>
         </FormRow>
-        <FormRow label={formatMessage(labels.urls)} action={<AddURLButton onAdd={handleAdd} />}>
+        <FormRow label={formatMessage(labels.urls)} action={<AddUrlButton onClick={showAddForm} />}>
           <div className={styles.urls}>
-            {parameters?.urls.map((url, index) => {
+            {parameters?.urls?.map((url, index) => {
               return (
                 <div key={index} className={styles.url}>
                   <Text>{url}</Text>
-                  <Icon onClick={() => handleRemove(index)}>
-                    <Icons.Close />
-                  </Icon>
+                  <Tooltip
+                    className={styles.icon}
+                    label={formatMessage(labels.remove)}
+                    position="right"
+                  >
+                    <Icon onClick={handleRemoveUrl.bind(null, index)}>
+                      <Icons.Close />
+                    </Icon>
+                  </Tooltip>
                 </div>
               );
             })}
           </div>
         </FormRow>
         <FormButtons>
-          <SubmitButton variant="primary" disabled={queryDisabled} loading={isLoading}>
-            {formatMessage(labels.query)}
+          <SubmitButton variant="primary" disabled={queryDisabled} loading={isRunning}>
+            {formatMessage(labels.runQuery)}
           </SubmitButton>
         </FormButtons>
       </Form>
+      {show && (
+        <Modal onClose={hideAddForm}>
+          <AddUrlForm onSave={handleAddUrl} onClose={hideAddForm} />
+        </Modal>
+      )}
     </>
   );
 }
 
-function AddURLButton({ onAdd }) {
-  const [url, setUrl] = useState('');
+function AddUrlButton({ onClick }) {
   const { formatMessage, labels } = useMessages();
 
-  const handleAdd = close => {
-    onAdd?.(url);
-    setUrl('');
-    close();
-  };
-
-  const handleChange = e => {
-    setUrl(e.target.value);
-  };
-  const handleClose = close => {
-    setUrl('');
-    close();
-  };
-
   return (
     <Tooltip label={formatMessage(labels.addUrl)}>
-      <ModalTrigger>
-        <Icon>
-          <Icons.Plus />
-        </Icon>
-        <Modal>
-          {close => {
-            return (
-              <Form>
-                <FormRow label={formatMessage(labels.url)}>
-                  <TextField name="url" value={url} onChange={handleChange} autoComplete="off" />
-                </FormRow>
-                <FormButtons align="center" flex>
-                  <Button variant="primary" onClick={() => handleAdd(close)}>
-                    {formatMessage(labels.add)}
-                  </Button>
-                  <Button onClick={() => handleClose(close)}>{formatMessage(labels.cancel)}</Button>
-                </FormButtons>
-              </Form>
-            );
-          }}
-        </Modal>
-      </ModalTrigger>
+      <Icon onClick={onClick}>
+        <Icons.Plus />
+      </Icon>
     </Tooltip>
   );
 }
diff --git a/components/pages/reports/funnel/FunnelParameters.module.css b/components/pages/reports/funnel/FunnelParameters.module.css
index 25ef0241..98ae0831 100644
--- a/components/pages/reports/funnel/FunnelParameters.module.css
+++ b/components/pages/reports/funnel/FunnelParameters.module.css
@@ -1,7 +1,7 @@
 .urls {
   display: flex;
   flex-direction: column;
-  gap: 10px;
+  gap: 16px;
 }
 
 .url {
@@ -14,3 +14,7 @@
   border-radius: var(--border-radius);
   box-shadow: 1px 1px 1px var(--base400);
 }
+
+.icon {
+  align-self: center;
+}
diff --git a/components/pages/reports/funnel/FunnelReport.js b/components/pages/reports/funnel/FunnelReport.js
index da422d54..26a81a09 100644
--- a/components/pages/reports/funnel/FunnelReport.js
+++ b/components/pages/reports/funnel/FunnelReport.js
@@ -1,41 +1,29 @@
+import { useContext } from 'react';
 import FunnelChart from './FunnelChart';
 import FunnelTable from './FunnelTable';
 import FunnelParameters from './FunnelParameters';
-import Report from '../Report';
+import Report, { ReportContext } from '../Report';
 import ReportHeader from '../ReportHeader';
 import ReportMenu from '../ReportMenu';
 import ReportBody from '../ReportBody';
 import Funnel from 'assets/funnel.svg';
 import { useReport } from 'hooks';
-import useApi from 'hooks/useApi';
+
+const defaultParameters = {
+  type: 'funnel',
+  parameters: { window: 60, urls: ['/', '/docs'] },
+};
 
 export default function FunnelReport({ reportId }) {
-  const report = useReport(reportId, { window: 60, urls: ['/', '/docs'] });
-  const { post, useQuery } = useApi();
-  const { data, isLoading, error } = useQuery(
-    ['report:funnel', report?.update],
-    () => {
-      const { websiteId, parameters } = report || {};
-
-      return post(`/reports/funnel`, {
-        websiteId: websiteId,
-        ...parameters,
-        startAt: +parameters.dateRange.startDate,
-        endAt: +parameters.dateRange.endDate,
-      });
-    },
-    { enabled: !!report?.update },
-  );
-
   return (
-    <Report error={error} loading={data && isLoading}>
-      <ReportHeader icon={<Funnel />} report={report} />
+    <Report reportId={reportId} defaultParameters={defaultParameters}>
+      <ReportHeader icon={<Funnel />} />
       <ReportMenu>
-        <FunnelParameters report={report} />
+        <FunnelParameters />
       </ReportMenu>
       <ReportBody>
-        <FunnelChart report={report} data={data} />
-        <FunnelTable data={data} />
+        <FunnelChart />
+        <FunnelTable />
       </ReportBody>
     </Report>
   );
diff --git a/components/pages/reports/funnel/FunnelTable.js b/components/pages/reports/funnel/FunnelTable.js
index 7b726e48..ff6bdfb5 100644
--- a/components/pages/reports/funnel/FunnelTable.js
+++ b/components/pages/reports/funnel/FunnelTable.js
@@ -1,12 +1,15 @@
+import { useContext } from 'react';
 import DataTable from 'components/metrics/DataTable';
 import { useMessages } from 'hooks';
+import { ReportContext } from '../Report';
 
-export function FunnelTable({ data }) {
+export function FunnelTable() {
+  const { report } = useContext(ReportContext);
   const { formatMessage, labels } = useMessages();
 
   return (
     <DataTable
-      data={data}
+      data={report?.data}
       title={formatMessage(labels.url)}
       metric={formatMessage(labels.visitors)}
       showPercentage={false}
diff --git a/hooks/useReport.js b/hooks/useReport.js
index 6eb16711..617e02e2 100644
--- a/hooks/useReport.js
+++ b/hooks/useReport.js
@@ -1,20 +1,80 @@
-import useStore, { createReport } from 'store/reports';
+import { produce } from 'immer';
 import { useCallback, useEffect, useState } from 'react';
+import useApi from './useApi';
+
+const baseParameters = {
+  name: 'Untitled',
+  description: '',
+  parameters: {},
+};
 
 export function useReport(reportId, defaultParameters) {
-  const [id, setId] = useState(reportId);
+  const [report, setReport] = useState(null);
+  const [isRunning, setIsRunning] = useState(false);
+  const { get, post } = useApi();
 
-  const selector = useCallback(state => state[id], [id]);
-  const report = useStore(selector);
+  const loadReport = async id => {
+    const data = await get(`/reports/${id}`);
+
+    setReport(data);
+  };
+
+  const runReport = useCallback(
+    async parameters => {
+      const { websiteId, type, dateRange } = report;
+      setIsRunning(true);
+
+      const data = await post(`/reports/${type}`, {
+        websiteId: websiteId,
+        ...parameters,
+        startAt: +dateRange?.startDate,
+        endAt: +dateRange?.endDate,
+      });
+
+      setReport(
+        produce(state => {
+          state.parameters = parameters;
+          state.data = data;
+
+          return state;
+        }),
+      );
+
+      setIsRunning(false);
+    },
+    [report],
+  );
+
+  const updateReport = useCallback(
+    async data => {
+      setReport(
+        produce(state => {
+          const { parameters, ...rest } = data;
+
+          if (parameters) {
+            state.parameters = { ...state.parameters, ...parameters };
+          }
+
+          for (const key in rest) {
+            state[key] = rest[key];
+          }
+
+          return state;
+        }),
+      );
+    },
+    [report],
+  );
 
   useEffect(() => {
-    if (!report) {
-      const newReport = createReport(defaultParameters);
-      setId(newReport.id);
+    if (!reportId) {
+      setReport({ ...baseParameters, ...defaultParameters });
+    } else {
+      loadReport(reportId);
     }
   }, []);
 
-  return report;
+  return { report, runReport, updateReport, isRunning };
 }
 
 export default useReport;
diff --git a/hooks/useTheme.js b/hooks/useTheme.js
index b8b51226..7e40f601 100644
--- a/hooks/useTheme.js
+++ b/hooks/useTheme.js
@@ -17,6 +17,9 @@ export function useTheme() {
   const primaryColor = colord(THEME_COLORS[theme].primary);
 
   const colors = {
+    theme: {
+      ...THEME_COLORS[theme],
+    },
     chart: {
       text: THEME_COLORS[theme].gray700,
       line: THEME_COLORS[theme].gray200,
@@ -33,6 +36,12 @@ export function useTheme() {
         hoverBorderColor: primaryColor.toRgbString(),
       },
     },
+    map: {
+      baseColor: THEME_COLORS[theme].primary,
+      fillColor: THEME_COLORS[theme].gray100,
+      strokeColor: THEME_COLORS[theme].primary,
+      hoverColor: THEME_COLORS[theme].primary,
+    },
   };
 
   function saveTheme(value) {
diff --git a/lib/auth.ts b/lib/auth.ts
index 37dc6acb..bf01a1ab 100644
--- a/lib/auth.ts
+++ b/lib/auth.ts
@@ -1,4 +1,4 @@
-import { UserReport } from '@prisma/client';
+import { Report } from '@prisma/client';
 import redis from '@umami/redis-client';
 import debug from 'debug';
 import { PERMISSIONS, ROLE_PERMISSIONS, SHARE_TOKEN_HEADER } from 'lib/constants';
@@ -135,28 +135,28 @@ export async function canDeleteWebsite({ user }: Auth, websiteId: string) {
   return false;
 }
 
-export async function canViewUserReport(auth: Auth, userReport: UserReport) {
+export async function canViewReport(auth: Auth, report: Report) {
   if (auth.user.isAdmin) {
     return true;
   }
 
-  if ((auth.user.id = userReport.userId)) {
+  if ((auth.user.id = report.userId)) {
     return true;
   }
 
-  if (await canViewWebsite(auth, userReport.websiteId)) {
+  if (await canViewWebsite(auth, report.websiteId)) {
     return true;
   }
 
   return false;
 }
 
-export async function canUpdateUserReport(auth: Auth, userReport: UserReport) {
+export async function canUpdateReport(auth: Auth, report: Report) {
   if (auth.user.isAdmin) {
     return true;
   }
 
-  if ((auth.user.id = userReport.userId)) {
+  if ((auth.user.id = report.userId)) {
     return true;
   }
 
diff --git a/package.json b/package.json
index c4a790dd..bd195662 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
     "maxmind": "^4.3.6",
     "moment-timezone": "^0.5.35",
     "next": "13.3.1",
-    "next-basics": "^0.27.0",
+    "next-basics": "^0.30.0",
     "node-fetch": "^3.2.8",
     "npm-run-all": "^4.1.5",
     "react": "^18.2.0",
diff --git a/pages/api/reports/[id].ts b/pages/api/reports/[id].ts
index 42002d18..d1c6c89a 100644
--- a/pages/api/reports/[id].ts
+++ b/pages/api/reports/[id].ts
@@ -1,59 +1,68 @@
-import { canUpdateUserReport, canViewUserReport } from 'lib/auth';
+import { canUpdateReport, canViewReport } from 'lib/auth';
 import { useAuth, useCors } from 'lib/middleware';
 import { NextApiRequestQueryBody } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { getUserReportById, updateUserReport } from 'queries';
+import { getReportById, updateReport } from 'queries';
 
-export interface UserReportRequestQuery {
+export interface ReportRequestQuery {
   id: string;
 }
 
-export interface UserReportRequestBody {
+export interface ReportRequestBody {
   websiteId: string;
-  reportName: string;
-  templateName: string;
+  type: string;
+  name: string;
+  description: string;
   parameters: string;
 }
 
 export default async (
-  req: NextApiRequestQueryBody<UserReportRequestQuery, UserReportRequestBody>,
+  req: NextApiRequestQueryBody<ReportRequestQuery, ReportRequestBody>,
   res: NextApiResponse,
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
 
   if (req.method === 'GET') {
-    const { id: userReportId } = req.query;
+    const { id: reportId } = req.query;
 
-    const data = await getUserReportById(userReportId);
+    const data = await getReportById(reportId);
 
-    if (!(await canViewUserReport(req.auth, data))) {
+    if (!(await canViewReport(req.auth, data))) {
       return unauthorized(res);
     }
 
+    data.parameters = JSON.parse(data.parameters);
+
     return ok(res, data);
   }
 
   if (req.method === 'POST') {
-    const { id: userReportId } = req.query;
+    const { id: reportId } = req.query;
 
-    const data = await getUserReportById(userReportId);
+    const { websiteId, type, name, description, parameters } = req.body;
 
-    if (!(await canUpdateUserReport(req.auth, data))) {
+    const data = await getReportById(reportId);
+
+    if (!(await canUpdateReport(req.auth, data))) {
       return unauthorized(res);
     }
 
-    const updated = await updateUserReport(
+    const result = await updateReport(
       {
-        ...req.body,
-      },
+        websiteId,
+        type,
+        name,
+        description,
+        parameters: JSON.stringify(parameters),
+      } as any,
       {
-        id: userReportId,
+        id: reportId,
       },
     );
 
-    return ok(res, updated);
+    return ok(res, result);
   }
 
   return methodNotAllowed(res);
diff --git a/pages/api/reports/index.ts b/pages/api/reports/index.ts
index e5855355..55dc4bf5 100644
--- a/pages/api/reports/index.ts
+++ b/pages/api/reports/index.ts
@@ -3,17 +3,21 @@ import { useAuth, useCors } from 'lib/middleware';
 import { NextApiRequestQueryBody } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok } from 'next-basics';
-import { createUserReport, getUserReports } from 'queries';
+import { createReport, getReports } from 'queries';
 
-export interface UserReportRequestBody {
+export interface ReportRequestBody {
   websiteId: string;
-  reportName: string;
-  templateName: string;
-  parameters: string;
+  name: string;
+  type: string;
+  description: string;
+  parameters: {
+    window: string;
+    urls: string[];
+  };
 }
 
 export default async (
-  req: NextApiRequestQueryBody<any, UserReportRequestBody>,
+  req: NextApiRequestQueryBody<any, ReportRequestBody>,
   res: NextApiResponse,
 ) => {
   await useCors(req, res);
@@ -24,19 +28,25 @@ export default async (
   } = req.auth;
 
   if (req.method === 'GET') {
-    const data = await getUserReports(userId);
+    const data = await getReports(userId);
 
     return ok(res, data);
   }
 
   if (req.method === 'POST') {
-    const data = await createUserReport({
+    const { websiteId, type, name, description, parameters } = req.body;
+
+    const result = await createReport({
       id: uuid(),
       userId,
-      ...req.body,
-    });
+      websiteId,
+      type,
+      name,
+      description,
+      parameters: JSON.stringify(parameters),
+    } as any);
 
-    return ok(res, data);
+    return ok(res, result);
   }
 
   return methodNotAllowed(res);
diff --git a/pages/realtime/[id]/index.js b/pages/realtime/[id].js
similarity index 100%
rename from pages/realtime/[id]/index.js
rename to pages/realtime/[id].js
diff --git a/pages/reports/[id].js b/pages/reports/[id].js
new file mode 100644
index 00000000..95f20a78
--- /dev/null
+++ b/pages/reports/[id].js
@@ -0,0 +1,20 @@
+import { useRouter } from 'next/router';
+import AppLayout from 'components/layout/AppLayout';
+import FunnelReport from 'components/pages/reports/funnel/FunnelReport';
+import useMessages from 'hooks/useMessages';
+
+export default function ReportsPage() {
+  const { formatMessage, labels } = useMessages();
+  const router = useRouter();
+  const { id } = router.query;
+
+  if (!id) {
+    return null;
+  }
+
+  return (
+    <AppLayout title={formatMessage(labels.websites)}>
+      <FunnelReport reportId={id} />
+    </AppLayout>
+  );
+}
diff --git a/pages/reports/index.js b/pages/reports/index.js
index 70f684cb..6da2b943 100644
--- a/pages/reports/index.js
+++ b/pages/reports/index.js
@@ -1,13 +1,21 @@
+import { useState } from 'react';
+import { Item, Tabs } from 'react-basics';
 import AppLayout from 'components/layout/AppLayout';
 import ReportList from 'components/pages/reports/ReportList';
 import useMessages from 'hooks/useMessages';
 
 export default function ReportsPage() {
+  const [tab, setTab] = useState('create');
   const { formatMessage, labels } = useMessages();
 
   return (
     <AppLayout title={formatMessage(labels.reports)}>
-      <ReportList />
+      <Tabs selectedKey={tab} onSelect={setTab} style={{ marginBottom: 30, fontSize: 14 }}>
+        <Item key="create">{formatMessage(labels.reports)}</Item>
+        <Item key="saved">{formatMessage(labels.save)}</Item>
+      </Tabs>
+      {tab === 'create' && <ReportList />}
+      {tab === 'saved' && <h1>My reports</h1>}
     </AppLayout>
   );
 }
diff --git a/pages/settings/teams/[id]/index.js b/pages/settings/teams/[id].js
similarity index 100%
rename from pages/settings/teams/[id]/index.js
rename to pages/settings/teams/[id].js
diff --git a/pages/settings/users/[id]/index.js b/pages/settings/users/[id].js
similarity index 100%
rename from pages/settings/users/[id]/index.js
rename to pages/settings/users/[id].js
diff --git a/pages/settings/websites/[id]/index.js b/pages/settings/websites/[id].js
similarity index 100%
rename from pages/settings/websites/[id]/index.js
rename to pages/settings/websites/[id].js
diff --git a/pages/websites/[id]/index.js b/pages/websites/[id].js
similarity index 100%
rename from pages/websites/[id]/index.js
rename to pages/websites/[id].js
diff --git a/queries/admin/report.ts b/queries/admin/report.ts
new file mode 100644
index 00000000..506902f5
--- /dev/null
+++ b/queries/admin/report.ts
@@ -0,0 +1,33 @@
+import { Prisma, Report } from '@prisma/client';
+import prisma from 'lib/prisma';
+
+export async function createReport(data: Prisma.ReportUncheckedCreateInput): Promise<Report> {
+  return prisma.client.report.create({ data });
+}
+
+export async function getReportById(reportId: string): Promise<Report> {
+  return prisma.client.report.findUnique({
+    where: {
+      id: reportId,
+    },
+  });
+}
+
+export async function getReports(userId: string): Promise<Report[]> {
+  return prisma.client.report.findMany({
+    where: {
+      userId,
+    },
+  });
+}
+
+export async function updateReport(
+  data: Prisma.ReportUpdateInput,
+  where: Prisma.ReportWhereUniqueInput,
+): Promise<Report> {
+  return prisma.client.report.update({ data, where });
+}
+
+export async function deleteReport(where: Prisma.ReportWhereUniqueInput): Promise<Report> {
+  return prisma.client.report.delete({ where });
+}
diff --git a/queries/admin/user.ts b/queries/admin/user.ts
index b7f452c7..3ba2654b 100644
--- a/queries/admin/user.ts
+++ b/queries/admin/user.ts
@@ -210,7 +210,7 @@ export async function deleteUser(
           },
         },
       }),
-      client.userReport.deleteMany({
+      client.report.deleteMany({
         where: {
           OR: [
             {
diff --git a/queries/admin/userReport.ts b/queries/admin/userReport.ts
deleted file mode 100644
index d31b512e..00000000
--- a/queries/admin/userReport.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Prisma, UserReport } from '@prisma/client';
-import prisma from 'lib/prisma';
-
-export async function createUserReport(
-  data: Prisma.UserReportUncheckedCreateInput,
-): Promise<UserReport> {
-  return prisma.client.userReport.create({ data });
-}
-
-export async function getUserReportById(userReportId: string): Promise<UserReport> {
-  return prisma.client.userReport.findUnique({
-    where: {
-      id: userReportId,
-    },
-  });
-}
-
-export async function getUserReports(userId: string): Promise<UserReport[]> {
-  return prisma.client.userReport.findMany({
-    where: {
-      userId,
-    },
-  });
-}
-
-export async function updateUserReport(
-  data: Prisma.UserReportUpdateInput,
-  where: Prisma.UserReportWhereUniqueInput,
-): Promise<UserReport> {
-  return prisma.client.userReport.update({ data, where });
-}
-
-export async function deleteUserReport(
-  where: Prisma.UserReportWhereUniqueInput,
-): Promise<UserReport> {
-  return prisma.client.userReport.delete({ where });
-}
diff --git a/queries/admin/website.ts b/queries/admin/website.ts
index e6d53fce..8c381d6d 100644
--- a/queries/admin/website.ts
+++ b/queries/admin/website.ts
@@ -92,7 +92,7 @@ export async function deleteWebsite(
         websiteId,
       },
     }),
-    client.userReport.deleteMany({
+    client.report.deleteMany({
       where: {
         websiteId,
       },
diff --git a/queries/index.js b/queries/index.js
index e565df25..302c88db 100644
--- a/queries/index.js
+++ b/queries/index.js
@@ -1,7 +1,7 @@
 export * from './admin/team';
 export * from './admin/teamUser';
 export * from './admin/user';
-export * from './admin/userReport';
+export * from './admin/report';
 export * from './admin/website';
 export * from './analytics/event/getEventMetrics';
 export * from './analytics/event/getEventUsage';
diff --git a/rollup.tracker.config.js b/rollup.tracker.config.js
index f4e7223c..827e46f3 100644
--- a/rollup.tracker.config.js
+++ b/rollup.tracker.config.js
@@ -4,7 +4,7 @@ import replace from '@rollup/plugin-replace';
 import { terser } from 'rollup-plugin-terser';
 
 export default {
-  input: 'tracker/index.js',
+  input: 'tracker/[id].js',
   output: {
     file: 'public/script.js',
     format: 'iife',
diff --git a/store/reports.js b/store/reports.js
deleted file mode 100644
index fa658d4d..00000000
--- a/store/reports.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import { create } from 'zustand';
-import produce from 'immer';
-import { getRandomChars } from 'next-basics';
-
-const emptyReport = {
-  name: 'Untitled',
-  description: '',
-  parameters: {},
-};
-
-const initialState = {};
-
-const store = create(() => ({ ...initialState }));
-
-export function updateReport(id, data) {
-  const report = store.getState()[id];
-
-  if (report) {
-    store.setState(
-      produce(state => {
-        const item = state[id];
-        const { parameters, ...rest } = data;
-
-        if (parameters) {
-          item.parameters = { ...item.parameters, ...parameters };
-        }
-
-        for (const key in rest) {
-          item[key] = rest[key];
-        }
-
-        return state;
-      }),
-    );
-  }
-}
-
-export function createReport(parameters) {
-  const id = `new_${getRandomChars(16)}`;
-  const report = { ...emptyReport, id, parameters };
-
-  store.setState(
-    produce(state => {
-      state[id] = report;
-
-      return state;
-    }),
-  );
-
-  return report;
-}
-
-export default store;
-
-if (typeof window !== 'undefined') {
-  window.__STORE__ = store;
-}
diff --git a/yarn.lock b/yarn.lock
index 1d0bc7fd..e2c1432d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3715,11 +3715,6 @@ balanced-match@^2.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz#dc70f920d78db8b858535795867bf48f820633d9"
   integrity sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==
 
-base-x@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/base-x/-/base-x-4.0.0.tgz#d0e3b7753450c73f8ad2389b5c018a4af7b2224a"
-  integrity sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw==
-
 base64-js@^1.3.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
@@ -7019,14 +7014,14 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
-next-basics@^0.27.0:
-  version "0.27.0"
-  resolved "https://registry.yarnpkg.com/next-basics/-/next-basics-0.27.0.tgz#7d46c88de4b53cadfef86230f8cbe7dba6f10dc6"
-  integrity sha512-ZviF4O4/14eBjGG7fK83oswuM/rur37TRxcjXCKPJN4kOTUgrzn9Sz+vpzkB8PZ2WaHv5ONQ7TkBEwnhMCEyMQ==
+next-basics@^0.30.0:
+  version "0.30.0"
+  resolved "https://registry.yarnpkg.com/next-basics/-/next-basics-0.30.0.tgz#1d5f1b3bd3cd66218f00ab0390659a819ed274fa"
+  integrity sha512-IWNrBsxM8watkvWHWkUp5PC0WypqeHMEaj5rCufjEfwuIe++ePtDrYgUKY6Se6y6QJWbyHliozCpa1KpVyZHnQ==
   dependencies:
-    base-x "^4.0.0"
     bcryptjs "^2.4.3"
     jsonwebtoken "^9.0.0"
+    pure-rand "^6.0.2"
 
 next@13.3.1:
   version "13.3.1"
@@ -8144,6 +8139,11 @@ punycode@^2.1.0:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
   integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
 
+pure-rand@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.0.2.tgz#a9c2ddcae9b68d736a8163036f088a2781c8b306"
+  integrity sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ==
+
 qs@~6.5.2:
   version "6.5.3"
   resolved "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz"

From e9b0d3f7963a400acbaeb7a1fb310635c30b264a Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Sun, 28 May 2023 22:28:11 -0700
Subject: [PATCH 54/88] Updated date range handling.

---
 components/input/DateFilter.js        |  2 +-
 components/input/WebsiteDateFilter.js |  3 +--
 components/metrics/DatePickerForm.js  | 16 ++++++++++------
 lib/date.js                           | 19 +++++++++++++------
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/components/input/DateFilter.js b/components/input/DateFilter.js
index b7521e27..7fc4319d 100644
--- a/components/input/DateFilter.js
+++ b/components/input/DateFilter.js
@@ -65,7 +65,7 @@ export function DateFilter({
   ].filter(n => n);
 
   const renderValue = value => {
-    return value === 'custom' ? (
+    return value.startsWith('range') ? (
       <CustomRange startDate={startDate} endDate={endDate} onClick={() => handleChange('custom')} />
     ) : (
       options.find(e => e.value === value).label
diff --git a/components/input/WebsiteDateFilter.js b/components/input/WebsiteDateFilter.js
index 0d5d7569..71075dd7 100644
--- a/components/input/WebsiteDateFilter.js
+++ b/components/input/WebsiteDateFilter.js
@@ -1,4 +1,3 @@
-import { getDateRangeValues } from 'lib/date';
 import useApi from 'hooks/useApi';
 import useDateRange from 'hooks/useDateRange';
 import DateFilter from './DateFilter';
@@ -13,7 +12,7 @@ export default function WebsiteDateFilter({ websiteId, value }) {
       const data = await get(`/websites/${websiteId}`);
 
       if (data) {
-        setDateRange({ value, ...getDateRangeValues(new Date(data.createdAt), Date.now()) });
+        setDateRange(`range:${new Date(data.createdAt)}:${Date.now()}`);
       }
     } else if (value !== 'all') {
       setDateRange(value);
diff --git a/components/metrics/DatePickerForm.js b/components/metrics/DatePickerForm.js
index 96730591..53f027bb 100644
--- a/components/metrics/DatePickerForm.js
+++ b/components/metrics/DatePickerForm.js
@@ -2,7 +2,6 @@ import { useState } from 'react';
 import { Button, ButtonGroup, Calendar } from 'react-basics';
 import { isAfter, isBefore, isSameDay } from 'date-fns';
 import useLocale from 'hooks/useLocale';
-import { getDateRangeValues } from 'lib/date';
 import { getDateLocale } from 'lib/lang';
 import { FILTER_DAY, FILTER_RANGE } from 'lib/constants';
 import useMessages from 'hooks/useMessages';
@@ -19,7 +18,7 @@ export function DatePickerForm({
   const [selected, setSelected] = useState(
     isSameDay(defaultStartDate, defaultEndDate) ? FILTER_DAY : FILTER_RANGE,
   );
-  const [date, setDate] = useState(defaultStartDate);
+  const [singleDate, setSingleDate] = useState(defaultStartDate);
   const [startDate, setStartDate] = useState(defaultStartDate);
   const [endDate, setEndDate] = useState(defaultEndDate);
   const { locale } = useLocale();
@@ -27,14 +26,14 @@ export function DatePickerForm({
 
   const disabled =
     selected === FILTER_DAY
-      ? isAfter(minDate, date) && isBefore(maxDate, date)
+      ? isAfter(minDate, singleDate) && isBefore(maxDate, singleDate)
       : isAfter(startDate, endDate);
 
   const handleSave = () => {
     if (selected === FILTER_DAY) {
-      onChange({ ...getDateRangeValues(date, date), value: 'custom' });
+      onChange(`range:${singleDate.getTime()}:${singleDate.getTime()}`);
     } else {
-      onChange({ ...getDateRangeValues(startDate, endDate), value: 'custom' });
+      onChange(`range:${startDate.getTime()}:${endDate.getTime()}`);
     }
   };
 
@@ -48,7 +47,12 @@ export function DatePickerForm({
       </div>
       <div className={styles.calendars}>
         {selected === FILTER_DAY && (
-          <Calendar date={date} minDate={minDate} maxDate={maxDate} onChange={setDate} />
+          <Calendar
+            date={singleDate}
+            minDate={minDate}
+            maxDate={maxDate}
+            onChange={setSingleDate}
+          />
         )}
         {selected === FILTER_RANGE && (
           <>
diff --git a/lib/date.js b/lib/date.js
index 1cfca75d..526354b3 100644
--- a/lib/date.js
+++ b/lib/date.js
@@ -40,20 +40,27 @@ export function getLocalTime(t) {
 
 export function parseDateRange(value, locale = 'en-US') {
   if (typeof value === 'object') {
-    const { startDate, endDate } = value;
+    return value;
+  }
+
+  if (value?.startsWith?.('range')) {
+    const [, startAt, endAt] = value.split(':');
+
+    const startDate = new Date(+startAt);
+    const endDate = new Date(+endAt);
+
     return {
-      ...value,
-      startDate: typeof startDate === 'string' ? parseISO(startDate) : startDate,
-      endDate: typeof endDate === 'string' ? parseISO(endDate) : endDate,
+      ...getDateRangeValues(startDate, endDate),
+      value,
     };
   }
 
   const now = new Date();
   const dateLocale = getDateLocale(locale);
 
-  const match = value.match(/^(?<num>[0-9-]+)(?<unit>hour|day|week|month|year)$/);
+  const match = value?.match?.(/^(?<num>[0-9-]+)(?<unit>hour|day|week|month|year)$/);
 
-  if (!match) return {};
+  if (!match) return null;
 
   const { num, unit } = match.groups;
 

From 0d567ebe603cc9e5ee2710c2455e12b01e84343a Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 29 May 2023 21:19:53 -0700
Subject: [PATCH 55/88] Delete event_data on website reset

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

diff --git a/queries/admin/website.ts b/queries/admin/website.ts
index 8c381d6d..8714d8c9 100644
--- a/queries/admin/website.ts
+++ b/queries/admin/website.ts
@@ -50,6 +50,9 @@ export async function resetWebsite(
   const { client, transaction } = prisma;
 
   return transaction([
+    client.eventData.deleteMany({
+      where: { websiteId },
+    }),
     client.websiteEvent.deleteMany({
       where: { websiteId },
     }),

From 43f5854f157c3e356cb6f9ad8b5722fdd536545a Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Tue, 30 May 2023 16:49:22 -0700
Subject: [PATCH 56/88] Update report parameters.

---
 components/pages/reports/Report.js       |  2 ++
 components/pages/reports/ReportHeader.js | 11 ++++++-----
 hooks/useReport.js                       | 10 +++-------
 pages/api/reports/[id].ts                |  4 ++++
 pages/api/reports/funnel.ts              | 20 ++++++++++++--------
 5 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/components/pages/reports/Report.js b/components/pages/reports/Report.js
index 0a98ef75..0239e64f 100644
--- a/components/pages/reports/Report.js
+++ b/components/pages/reports/Report.js
@@ -8,6 +8,8 @@ export const ReportContext = createContext(null);
 export function Report({ reportId, defaultParameters, children, ...props }) {
   const report = useReport(reportId, defaultParameters);
 
+  //console.log(report);
+
   return (
     <ReportContext.Provider value={{ ...report }}>
       <Page {...props} className={styles.container}>
diff --git a/components/pages/reports/ReportHeader.js b/components/pages/reports/ReportHeader.js
index bf2c7fa8..42d78e75 100644
--- a/components/pages/reports/ReportHeader.js
+++ b/components/pages/reports/ReportHeader.js
@@ -20,15 +20,16 @@ export function ReportHeader({ icon }) {
     post(`/reports/${data.id}`, data),
   );
 
-  const { websiteId, name, dateRange } = report || {};
+  const { name, parameters } = report || {};
+  const { websiteId, dateRange } = parameters || {};
   const { value, startDate, endDate } = dateRange || {};
 
-  const handleSelect = websiteId => {
-    updateReport({ websiteId });
+  const handleWebsiteSelect = websiteId => {
+    updateReport({ parameters: { websiteId } });
   };
 
   const handleDateChange = value => {
-    updateReport({ dateRange: { ...parseDateRange(value) } });
+    updateReport({ parameters: { dateRange: { ...parseDateRange(value) } } });
   };
 
   const handleSave = async () => {
@@ -71,7 +72,7 @@ export function ReportHeader({ icon }) {
           onChange={handleDateChange}
           showAllTime
         />
-        <WebsiteSelect websiteId={websiteId} onSelect={handleSelect} />
+        <WebsiteSelect websiteId={websiteId} onSelect={handleWebsiteSelect} />
         <LoadingButton
           variant="primary"
           loading={isCreating || isUpdating}
diff --git a/hooks/useReport.js b/hooks/useReport.js
index 617e02e2..5bd5624f 100644
--- a/hooks/useReport.js
+++ b/hooks/useReport.js
@@ -21,15 +21,11 @@ export function useReport(reportId, defaultParameters) {
 
   const runReport = useCallback(
     async parameters => {
-      const { websiteId, type, dateRange } = report;
       setIsRunning(true);
 
-      const data = await post(`/reports/${type}`, {
-        websiteId: websiteId,
-        ...parameters,
-        startAt: +dateRange?.startDate,
-        endAt: +dateRange?.endDate,
-      });
+      const { type } = report;
+
+      const data = await post(`/reports/${type}`, parameters);
 
       setReport(
         produce(state => {
diff --git a/pages/api/reports/[id].ts b/pages/api/reports/[id].ts
index d1c6c89a..bcd22b4e 100644
--- a/pages/api/reports/[id].ts
+++ b/pages/api/reports/[id].ts
@@ -40,6 +40,9 @@ export default async (
 
   if (req.method === 'POST') {
     const { id: reportId } = req.query;
+    const {
+      user: { id: userId },
+    } = req.auth;
 
     const { websiteId, type, name, description, parameters } = req.body;
 
@@ -52,6 +55,7 @@ export default async (
     const result = await updateReport(
       {
         websiteId,
+        userId,
         type,
         name,
         description,
diff --git a/pages/api/reports/funnel.ts b/pages/api/reports/funnel.ts
index 4308c09d..1e121326 100644
--- a/pages/api/reports/funnel.ts
+++ b/pages/api/reports/funnel.ts
@@ -9,8 +9,10 @@ export interface FunnelRequestBody {
   websiteId: string;
   urls: string[];
   window: number;
-  startAt: number;
-  endAt: number;
+  dateRange: {
+    startDate: string;
+    endDate: string;
+  };
 }
 
 export interface FunnelResponse {
@@ -28,18 +30,20 @@ export default async (
   await useAuth(req, res);
 
   if (req.method === 'POST') {
-    const { websiteId, urls, window, startAt, endAt } = req.body;
+    const {
+      websiteId,
+      urls,
+      window,
+      dateRange: { startDate, endDate },
+    } = req.body;
 
     if (!(await canViewWebsite(req.auth, websiteId))) {
       return unauthorized(res);
     }
 
-    const startDate = new Date(+startAt);
-    const endDate = new Date(+endAt);
-
     const data = await getPageviewFunnel(websiteId, {
-      startDate,
-      endDate,
+      startDate: new Date(startDate),
+      endDate: new Date(endDate),
       urls,
       windowMinutes: +window,
     });

From 77f758205bf3acfbfd1f313141afbbf1ee73a9ca Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Tue, 30 May 2023 19:58:28 -0700
Subject: [PATCH 57/88] Fixed tracker config.

---
 rollup.tracker.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rollup.tracker.config.js b/rollup.tracker.config.js
index 827e46f3..f4e7223c 100644
--- a/rollup.tracker.config.js
+++ b/rollup.tracker.config.js
@@ -4,7 +4,7 @@ import replace from '@rollup/plugin-replace';
 import { terser } from 'rollup-plugin-terser';
 
 export default {
-  input: 'tracker/[id].js',
+  input: 'tracker/index.js',
   output: {
     file: 'public/script.js',
     format: 'iife',

From 1038a54fe4c46aa3edc0641dfa07c0c6c9aff411 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Wed, 31 May 2023 12:01:16 -0700
Subject: [PATCH 58/88] add mysql 02 migration

---
 .../migrations/02_report_schema/migration.sql | 19 +++++++++++++++
 db/mysql/schema.prisma                        | 23 +++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 db/mysql/migrations/02_report_schema/migration.sql

diff --git a/db/mysql/migrations/02_report_schema/migration.sql b/db/mysql/migrations/02_report_schema/migration.sql
new file mode 100644
index 00000000..0476e9f7
--- /dev/null
+++ b/db/mysql/migrations/02_report_schema/migration.sql
@@ -0,0 +1,19 @@
+-- CreateTable
+CREATE TABLE `report` (
+    `report_id` VARCHAR(36) NOT NULL,
+    `user_id` VARCHAR(36) NOT NULL,
+    `website_id` VARCHAR(36) NOT NULL,
+    `type` VARCHAR(200) NOT NULL,
+    `name` VARCHAR(200) NOT NULL,
+    `description` VARCHAR(500) NOT NULL,
+    `parameters` VARCHAR(6000) NOT NULL,
+    `created_at` TIMESTAMP(0) NULL DEFAULT CURRENT_TIMESTAMP(0),
+    `updated_at` TIMESTAMP(0) NULL,
+
+    UNIQUE INDEX `report_report_id_key`(`report_id`),
+    INDEX `report_user_id_idx`(`user_id`),
+    INDEX `report_website_id_idx`(`website_id`),
+    INDEX `report_type_idx`(`type`),
+    INDEX `report_name_idx`(`name`),
+    PRIMARY KEY (`report_id`)
+) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
diff --git a/db/mysql/schema.prisma b/db/mysql/schema.prisma
index 6455c8c0..0752f418 100644
--- a/db/mysql/schema.prisma
+++ b/db/mysql/schema.prisma
@@ -19,6 +19,7 @@ model User {
 
   website  Website[]
   teamUser TeamUser[]
+  Report      Report[]
 
   @@map("user")
 }
@@ -59,6 +60,7 @@ model Website {
   user        User?         @relation(fields: [userId], references: [id])
   teamWebsite TeamWebsite[]
   eventData   EventData[]
+  Report      Report[]
 
   @@index([userId])
   @@index([createdAt])
@@ -155,3 +157,24 @@ model TeamWebsite {
   @@index([websiteId])
   @@map("team_website")
 }
+
+model Report {
+  id          String    @id() @unique() @map("report_id") @db.VarChar(36)
+  userId      String    @map("user_id") @db.VarChar(36)
+  websiteId   String    @map("website_id") @db.VarChar(36)
+  type        String    @map("type") @db.VarChar(200)
+  name        String    @map("name") @db.VarChar(200)
+  description String    @map("description") @db.VarChar(500)
+  parameters  String    @map("parameters") @db.VarChar(6000)
+  createdAt   DateTime? @default(now()) @map("created_at") @db.Timestamp(0)
+  updatedAt   DateTime? @updatedAt @map("updated_at") @db.Timestamp(0)
+
+  user    User    @relation(fields: [userId], references: [id])
+  website Website @relation(fields: [websiteId], references: [id])
+
+  @@index([userId])
+  @@index([websiteId])
+  @@index([type])
+  @@index([name])
+  @@map("report")
+}
\ No newline at end of file

From b484286523273c3bc2bbd40cb28ab011bab356c9 Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Wed, 31 May 2023 21:46:49 -0700
Subject: [PATCH 59/88] Feat/um 305 unique session ch (#2065)

* Add session_data / session redis to CH.

* Add mysql migration.
---
 components/pages/console/TestConsole.js       |  45 +++++--
 db/clickhouse/migrations/01_edit_keys.sql     |   4 +
 db/clickhouse/schema.sql                      |  24 ++--
 .../migrations/03_session_data/migration.sql  |  37 ++++++
 db/mysql/schema.prisma                        |  54 +++++---
 .../migrations/03_session_data/migration.sql  |  31 +++++
 db/postgresql/schema.prisma                   |  45 +++++--
 lib/clickhouse.ts                             |   4 +-
 lib/constants.ts                              |   7 +-
 lib/{eventData.ts => dynamicData.ts}          |  28 ++--
 lib/prisma.ts                                 |   4 +-
 lib/session.ts                                |  23 +---
 lib/types.ts                                  |  16 ++-
 pages/api/send.ts                             | 124 +++++++++++-------
 pages/api/users/[id]/index.ts                 |   4 +-
 pages/api/users/index.ts                      |   4 +-
 queries/admin/user.ts                         |   4 +-
 queries/analytics/event/saveEvent.ts          |   4 +-
 queries/analytics/eventData/saveEventData.ts  |  42 +++---
 queries/analytics/session/createSession.ts    | 112 ++++------------
 queries/analytics/session/getSession.ts       |  39 +-----
 queries/analytics/session/saveSessionData.ts  |  43 ++++++
 tracker/index.js                              |   7 +-
 23 files changed, 405 insertions(+), 300 deletions(-)
 create mode 100644 db/clickhouse/migrations/01_edit_keys.sql
 create mode 100644 db/mysql/migrations/03_session_data/migration.sql
 create mode 100644 db/postgresql/migrations/03_session_data/migration.sql
 rename lib/{eventData.ts => dynamicData.ts} (63%)
 create mode 100644 queries/analytics/session/saveSessionData.ts

diff --git a/components/pages/console/TestConsole.js b/components/pages/console/TestConsole.js
index 6c14c2c1..eda93f0b 100644
--- a/components/pages/console/TestConsole.js
+++ b/components/pages/console/TestConsole.js
@@ -28,22 +28,41 @@ export function TestConsole() {
     window.umami.track({ url: '/page-view', referrer: 'https://www.google.com' });
     window.umami.track('track-event-no-data');
     window.umami.track('track-event-with-data', {
-      data: {
+      test: 'test-data',
+      boolean: true,
+      booleanError: 'true',
+      time: new Date(),
+      number: 1,
+      time2: new Date().toISOString(),
+      nested: {
         test: 'test-data',
-        boolean: true,
-        booleanError: 'true',
-        time: new Date(),
         number: 1,
-        time2: new Date().toISOString(),
-        nested: {
+        object: {
           test: 'test-data',
-          number: 1,
-          object: {
-            test: 'test-data',
-          },
         },
-        array: [1, 2, 3],
       },
+      array: [1, 2, 3],
+    });
+  }
+
+  function handleIdentifyClick() {
+    window.umami.identify({
+      userId: 123,
+      name: 'brian',
+      number: Math.random() * 100,
+      test: 'test-data',
+      boolean: true,
+      booleanError: 'true',
+      time: new Date(),
+      time2: new Date().toISOString(),
+      nested: {
+        test: 'test-data',
+        number: 1,
+        object: {
+          test: 'test-data',
+        },
+      },
+      array: [1, 2, 3],
     });
   }
 
@@ -116,6 +135,10 @@ export function TestConsole() {
               <Button id="manual-button" variant="action" onClick={handleClick}>
                 Run script
               </Button>
+              <p />
+              <Button id="manual-button" variant="action" onClick={handleIdentifyClick}>
+                Run identify
+              </Button>
             </Column>
           </Row>
           <Row>
diff --git a/db/clickhouse/migrations/01_edit_keys.sql b/db/clickhouse/migrations/01_edit_keys.sql
new file mode 100644
index 00000000..b948ff38
--- /dev/null
+++ b/db/clickhouse/migrations/01_edit_keys.sql
@@ -0,0 +1,4 @@
+ALTER TABLE "event_data" RENAME COLUMN "event_date_value" TO "date_value";
+ALTER TABLE "event_data" RENAME COLUMN "event_numeric_value" TO "numeric_value";
+ALTER TABLE "event_data" RENAME COLUMN "event_string_value" TO "string_value";
+ALTER TABLE "event_data" RENAME COLUMN "event_data_type" TO "data_type";
\ No newline at end of file
diff --git a/db/clickhouse/schema.sql b/db/clickhouse/schema.sql
index 8f48b434..de1082ec 100644
--- a/db/clickhouse/schema.sql
+++ b/db/clickhouse/schema.sql
@@ -117,10 +117,10 @@ CREATE TABLE umami.event_data
     url_path String,
     event_name String,
     event_key String,
-    event_string_value Nullable(String),
-    event_numeric_value Nullable(Decimal64(4)), --922337203685477.5625
-    event_date_value Nullable(DateTime('UTC')),
-    event_data_type UInt32,
+    string_value Nullable(String),
+    numeric_value Nullable(Decimal64(4)), --922337203685477.5625
+    date_value Nullable(DateTime('UTC')),
+    data_type UInt32,
     created_at DateTime('UTC')
 )
     engine = MergeTree
@@ -134,10 +134,10 @@ CREATE TABLE umami.event_data_queue (
     url_path String,
     event_name String,
     event_key String,
-    event_string_value Nullable(String),
-    event_numeric_value Nullable(Decimal64(4)), --922337203685477.5625
-    event_date_value Nullable(DateTime('UTC')),
-    event_data_type UInt32,
+    string_value Nullable(String),
+    numeric_value Nullable(Decimal64(4)), --922337203685477.5625
+    date_value Nullable(DateTime('UTC')),
+    data_type UInt32,
     created_at DateTime('UTC'),
     --virtual columns
     _error String,
@@ -158,10 +158,10 @@ SELECT website_id,
     url_path,
     event_name,
     event_key,
-    event_string_value,
-    event_numeric_value,
-    event_date_value,
-    event_data_type,
+    string_value,
+    numeric_value,
+    date_value,
+    data_type,
     created_at
 FROM umami.event_data_queue;
 
diff --git a/db/mysql/migrations/03_session_data/migration.sql b/db/mysql/migrations/03_session_data/migration.sql
new file mode 100644
index 00000000..3618080d
--- /dev/null
+++ b/db/mysql/migrations/03_session_data/migration.sql
@@ -0,0 +1,37 @@
+/*
+  Warnings:
+
+  - The primary key for the `event_data` table will be changed. If it partially fails, the table could be left without primary key constraint.
+  - You are about to drop the column `event_data_type` on the `event_data` table. All the data in the column will be lost.
+  - You are about to drop the column `event_date_value` on the `event_data` table. All the data in the column will be lost.
+  - You are about to drop the column `event_id` on the `event_data` table. All the data in the column will be lost.
+  - You are about to drop the column `event_numeric_value` on the `event_data` table. All the data in the column will be lost.
+  - You are about to drop the column `event_string_value` on the `event_data` table. All the data in the column will be lost.
+  - Added the required column `data_type` to the `event_data` table without a default value. This is not possible if the table is not empty.
+  - Added the required column `event_data_id` to the `event_data` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE `event_data` RENAME COLUMN `event_data_type` TO `data_type`;
+ALTER TABLE `event_data` RENAME COLUMN `event_date_value` TO `date_value`;
+ALTER TABLE `event_data` RENAME COLUMN `event_id` TO `event_data_id`;
+ALTER TABLE `event_data` RENAME COLUMN `event_numeric_value` TO `numeric_value`;
+ALTER TABLE `event_data` RENAME COLUMN `event_string_value` TO `string_value`;
+
+-- CreateTable
+CREATE TABLE `session_data` (
+    `session_data_id` VARCHAR(36) NOT NULL,
+    `website_id` VARCHAR(36) NOT NULL,
+    `session_id` VARCHAR(36) NOT NULL,
+    `event_key` VARCHAR(500) NOT NULL,
+    `event_string_value` VARCHAR(500) NULL,
+    `event_numeric_value` DECIMAL(19, 4) NULL,
+    `event_date_value` TIMESTAMP(0) NULL,
+    `event_data_type` INTEGER UNSIGNED NOT NULL,
+    `created_at` TIMESTAMP(0) NULL DEFAULT CURRENT_TIMESTAMP(0),
+
+    INDEX `session_data_created_at_idx`(`created_at`),
+    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;
diff --git a/db/mysql/schema.prisma b/db/mysql/schema.prisma
index 0752f418..88d5ef80 100644
--- a/db/mysql/schema.prisma
+++ b/db/mysql/schema.prisma
@@ -14,12 +14,12 @@ model User {
   password  String    @db.VarChar(60)
   role      String    @map("role") @db.VarChar(50)
   createdAt DateTime? @default(now()) @map("created_at") @db.Timestamp(0)
-  updatedAt DateTime? @map("updated_at") @updatedAt @db.Timestamp(0)
+  updatedAt DateTime? @updatedAt @map("updated_at") @db.Timestamp(0)
   deletedAt DateTime? @map("deleted_at") @db.Timestamp(0)
 
   website  Website[]
   teamUser TeamUser[]
-  Report      Report[]
+  report   Report[]
 
   @@map("user")
 }
@@ -40,6 +40,7 @@ model Session {
   createdAt    DateTime? @default(now()) @map("created_at") @db.Timestamp(0)
 
   websiteEvent WebsiteEvent[]
+  sessionData  SessionData[]
 
   @@index([createdAt])
   @@index([websiteId])
@@ -54,13 +55,14 @@ model Website {
   resetAt   DateTime? @map("reset_at") @db.Timestamp(0)
   userId    String?   @map("user_id") @db.VarChar(36)
   createdAt DateTime? @default(now()) @map("created_at") @db.Timestamp(0)
-  updatedAt DateTime? @map("updated_at") @updatedAt @db.Timestamp(0)
+  updatedAt DateTime? @updatedAt @map("updated_at") @db.Timestamp(0)
   deletedAt DateTime? @map("deleted_at") @db.Timestamp(0)
 
   user        User?         @relation(fields: [userId], references: [id])
   teamWebsite TeamWebsite[]
   eventData   EventData[]
-  Report      Report[]
+  report      Report[]
+  sessionData SessionData[]
 
   @@index([userId])
   @@index([createdAt])
@@ -94,15 +96,15 @@ model WebsiteEvent {
 }
 
 model EventData {
-  id                String    @id() @map("event_id") @db.VarChar(36)
-  websiteEventId    String    @map("website_event_id") @db.VarChar(36)
-  websiteId         String    @map("website_id") @db.VarChar(36)
-  eventKey          String    @map("event_key") @db.VarChar(500)
-  eventStringValue  String?   @map("event_string_value") @db.VarChar(500)
-  eventNumericValue Decimal?  @map("event_numeric_value") @db.Decimal(19, 4)
-  eventDateValue    DateTime? @map("event_date_value") @db.Timestamp(0)
-  eventDataType     Int       @map("event_data_type") @db.UnsignedInt
-  createdAt         DateTime? @default(now()) @map("created_at") @db.Timestamp(0)
+  id             String    @id() @map("event_data_id") @db.VarChar(36)
+  websiteEventId String    @map("website_event_id") @db.VarChar(36)
+  websiteId      String    @map("website_id") @db.VarChar(36)
+  eventKey       String    @map("event_key") @db.VarChar(500)
+  stringValue    String?   @map("string_value") @db.VarChar(500)
+  numericValue   Decimal?  @map("numeric_value") @db.Decimal(19, 4)
+  dateValue      DateTime? @map("date_value") @db.Timestamp(0)
+  dataType       Int       @map("data_type") @db.UnsignedInt
+  createdAt      DateTime? @default(now()) @map("created_at") @db.Timestamp(0)
 
   website      Website      @relation(fields: [websiteId], references: [id])
   websiteEvent WebsiteEvent @relation(fields: [websiteEventId], references: [id])
@@ -114,12 +116,32 @@ model EventData {
   @@map("event_data")
 }
 
+model SessionData {
+  id                String    @id() @map("session_data_id") @db.VarChar(36)
+  websiteId         String    @map("website_id") @db.VarChar(36)
+  sessionId         String    @map("session_id") @db.VarChar(36)
+  eventKey          String    @map("event_key") @db.VarChar(500)
+  eventStringValue  String?   @map("event_string_value") @db.VarChar(500)
+  eventNumericValue Decimal?  @map("event_numeric_value") @db.Decimal(19, 4)
+  eventDateValue    DateTime? @map("event_date_value") @db.Timestamp(0)
+  eventDataType     Int       @map("event_data_type") @db.UnsignedInt
+  createdAt         DateTime? @default(now()) @map("created_at") @db.Timestamp(0)
+
+  website Website @relation(fields: [websiteId], references: [id])
+  session Session @relation(fields: [sessionId], references: [id])
+
+  @@index([createdAt])
+  @@index([websiteId])
+  @@index([sessionId])
+  @@map("session_data")
+}
+
 model Team {
   id         String    @id() @unique() @map("team_id") @db.VarChar(36)
   name       String    @db.VarChar(50)
   accessCode String?   @unique @map("access_code") @db.VarChar(50)
   createdAt  DateTime? @default(now()) @map("created_at") @db.Timestamp(0)
-  updatedAt  DateTime? @map("updated_at") @updatedAt @db.Timestamp(0)
+  updatedAt  DateTime? @updatedAt @map("updated_at") @db.Timestamp(0)
 
   teamUser    TeamUser[]
   teamWebsite TeamWebsite[]
@@ -134,7 +156,7 @@ model TeamUser {
   userId    String    @map("user_id") @db.VarChar(36)
   role      String    @map("role") @db.VarChar(50)
   createdAt DateTime? @default(now()) @map("created_at") @db.Timestamp(0)
-  updatedAt DateTime? @map("updated_at") @updatedAt @db.Timestamp(0)
+  updatedAt DateTime? @updatedAt @map("updated_at") @db.Timestamp(0)
 
   team Team @relation(fields: [teamId], references: [id])
   user User @relation(fields: [userId], references: [id])
@@ -177,4 +199,4 @@ model Report {
   @@index([type])
   @@index([name])
   @@map("report")
-}
\ No newline at end of file
+}
diff --git a/db/postgresql/migrations/03_session_data/migration.sql b/db/postgresql/migrations/03_session_data/migration.sql
new file mode 100644
index 00000000..233c3793
--- /dev/null
+++ b/db/postgresql/migrations/03_session_data/migration.sql
@@ -0,0 +1,31 @@
+-- AlterTable
+ALTER TABLE "event_data" RENAME COLUMN "event_data_type" TO "data_type";
+ALTER TABLE "event_data" RENAME COLUMN "event_date_value" TO "date_value";
+ALTER TABLE "event_data" RENAME COLUMN "event_id" TO "event_data_id";
+ALTER TABLE "event_data" RENAME COLUMN "event_numeric_value" TO "numeric_value";
+ALTER TABLE "event_data" RENAME COLUMN "event_string_value" TO "string_value";
+
+-- CreateTable
+CREATE TABLE "session_data" (
+    "session_data_id" UUID NOT NULL,
+    "website_id" UUID NOT NULL,
+    "session_id" UUID NOT NULL,
+    "session_key" VARCHAR(500) NOT NULL,
+    "string_value" VARCHAR(500),
+    "numeric_value" DECIMAL(19,4),
+    "date_value" TIMESTAMPTZ(6),
+    "data_type" INTEGER NOT NULL,
+    "created_at" TIMESTAMPTZ(6) DEFAULT CURRENT_TIMESTAMP,
+    "deleted_at" TIMESTAMPTZ(6) DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "session_data_pkey" PRIMARY KEY ("session_data_id")
+);
+
+-- CreateIndex
+CREATE INDEX "session_data_created_at_idx" ON "session_data"("created_at");
+
+-- CreateIndex
+CREATE INDEX "session_data_website_id_idx" ON "session_data"("website_id");
+
+-- CreateIndex
+CREATE INDEX "session_data_session_id_idx" ON "session_data"("session_id");
diff --git a/db/postgresql/schema.prisma b/db/postgresql/schema.prisma
index 7c4cb94f..bfd71fd1 100644
--- a/db/postgresql/schema.prisma
+++ b/db/postgresql/schema.prisma
@@ -19,7 +19,7 @@ model User {
 
   website  Website[]
   teamUser TeamUser[]
-  Report   Report[]
+  report   Report[]
 
   @@map("user")
 }
@@ -40,6 +40,7 @@ model Session {
   createdAt    DateTime? @default(now()) @map("created_at") @db.Timestamptz(6)
 
   websiteEvent WebsiteEvent[]
+  sessionData  SessionData[]
 
   @@index([createdAt])
   @@index([websiteId])
@@ -60,7 +61,8 @@ model Website {
   user        User?         @relation(fields: [userId], references: [id])
   teamWebsite TeamWebsite[]
   eventData   EventData[]
-  Report      Report[]
+  report      Report[]
+  sessionData SessionData[]
 
   @@index([userId])
   @@index([createdAt])
@@ -94,15 +96,15 @@ model WebsiteEvent {
 }
 
 model EventData {
-  id                String    @id() @map("event_id") @db.Uuid
-  websiteId         String    @map("website_id") @db.Uuid
-  websiteEventId    String    @map("website_event_id") @db.Uuid
-  eventKey          String    @map("event_key") @db.VarChar(500)
-  eventStringValue  String?   @map("event_string_value") @db.VarChar(500)
-  eventNumericValue Decimal?  @map("event_numeric_value") @db.Decimal(19, 4)
-  eventDateValue    DateTime? @map("event_date_value") @db.Timestamptz(6)
-  eventDataType     Int       @map("event_data_type") @db.Integer
-  createdAt         DateTime? @default(now()) @map("created_at") @db.Timestamptz(6)
+  id             String    @id() @map("event_data_id") @db.Uuid
+  websiteId      String    @map("website_id") @db.Uuid
+  websiteEventId String    @map("website_event_id") @db.Uuid
+  eventKey       String    @map("event_key") @db.VarChar(500)
+  stringValue    String?   @map("string_value") @db.VarChar(500)
+  numericValue   Decimal?  @map("numeric_value") @db.Decimal(19, 4)
+  dateValue      DateTime? @map("date_value") @db.Timestamptz(6)
+  dataType       Int       @map("data_type") @db.Integer
+  createdAt      DateTime? @default(now()) @map("created_at") @db.Timestamptz(6)
 
   website      Website      @relation(fields: [websiteId], references: [id])
   websiteEvent WebsiteEvent @relation(fields: [websiteEventId], references: [id])
@@ -113,6 +115,27 @@ model EventData {
   @@map("event_data")
 }
 
+model SessionData {
+  id           String    @id() @map("session_data_id") @db.Uuid
+  websiteId    String    @map("website_id") @db.Uuid
+  sessionId    String    @map("session_id") @db.Uuid
+  sessionKey   String    @map("session_key") @db.VarChar(500)
+  stringValue  String?   @map("string_value") @db.VarChar(500)
+  numericValue Decimal?  @map("numeric_value") @db.Decimal(19, 4)
+  dateValue    DateTime? @map("date_value") @db.Timestamptz(6)
+  dataType     Int       @map("data_type") @db.Integer
+  createdAt    DateTime? @default(now()) @map("created_at") @db.Timestamptz(6)
+  deletedAt    DateTime? @default(now()) @map("deleted_at") @db.Timestamptz(6)
+
+  website Website @relation(fields: [websiteId], references: [id])
+  session Session @relation(fields: [sessionId], references: [id])
+
+  @@index([createdAt])
+  @@index([websiteId])
+  @@index([sessionId])
+  @@map("session_data")
+}
+
 model Team {
   id         String    @id() @unique() @map("team_id") @db.Uuid
   name       String    @db.VarChar(50)
diff --git a/lib/clickhouse.ts b/lib/clickhouse.ts
index e97be806..c91cf3da 100644
--- a/lib/clickhouse.ts
+++ b/lib/clickhouse.ts
@@ -2,7 +2,7 @@ import { ClickHouse } from 'clickhouse';
 import dateFormat from 'dateformat';
 import debug from 'debug';
 import { CLICKHOUSE } from 'lib/db';
-import { getEventDataType } from './eventData';
+import { getDynamicDataType } from './dynamicData';
 import { WebsiteMetricFilter } from './types';
 import { FILTER_COLUMNS } from './constants';
 
@@ -74,7 +74,7 @@ function getEventDataFilterQuery(
   params: any,
 ) {
   const query = filters.reduce((ac, cv, i) => {
-    const type = getEventDataType(cv.eventValue);
+    const type = getDynamicDataType(cv.eventValue);
 
     let value = cv.eventValue;
 
diff --git a/lib/constants.ts b/lib/constants.ts
index 7eef10b1..9edbe100 100644
--- a/lib/constants.ts
+++ b/lib/constants.ts
@@ -42,6 +42,11 @@ export const SESSION_COLUMNS = [
   'city',
 ];
 
+export const COLLECTION_TYPE = {
+  event: 'event',
+  identify: 'identify',
+};
+
 export const FILTER_COLUMNS = {
   url: 'url_path',
   referrer: 'referrer_domain',
@@ -56,7 +61,7 @@ export const EVENT_TYPE = {
   customEvent: 2,
 } as const;
 
-export const EVENT_DATA_TYPE = {
+export const DYNAMIC_DATA_TYPE = {
   string: 1,
   number: 2,
   boolean: 3,
diff --git a/lib/eventData.ts b/lib/dynamicData.ts
similarity index 63%
rename from lib/eventData.ts
rename to lib/dynamicData.ts
index aee1f9b4..da8eb8b2 100644
--- a/lib/eventData.ts
+++ b/lib/dynamicData.ts
@@ -1,12 +1,12 @@
 import { isValid, parseISO } from 'date-fns';
-import { EVENT_DATA_TYPE } from './constants';
-import { EventDataTypes } from './types';
+import { DYNAMIC_DATA_TYPE } from './constants';
+import { DynamicDataType } from './types';
 
 export function flattenJSON(
   eventData: { [key: string]: any },
-  keyValues: { key: string; value: any; eventDataType: EventDataTypes }[] = [],
+  keyValues: { key: string; value: any; dynamicDataType: DynamicDataType }[] = [],
   parentKey = '',
-): { key: string; value: any; eventDataType: EventDataTypes }[] {
+): { key: string; value: any; dynamicDataType: DynamicDataType }[] {
   return Object.keys(eventData).reduce(
     (acc, key) => {
       const value = eventData[key];
@@ -25,7 +25,7 @@ export function flattenJSON(
   ).keyValues;
 }
 
-export function getEventDataType(value: any): string {
+export function getDynamicDataType(value: any): string {
   let type: string = typeof value;
 
   if ((type === 'string' && isValid(value)) || isValid(parseISO(value))) {
@@ -36,34 +36,34 @@ export function getEventDataType(value: any): string {
 }
 
 function createKey(key, value, acc: { keyValues: any[]; parentKey: string }) {
-  const type = getEventDataType(value);
+  const type = getDynamicDataType(value);
 
-  let eventDataType = null;
+  let dynamicDataType = null;
 
   switch (type) {
     case 'number':
-      eventDataType = EVENT_DATA_TYPE.number;
+      dynamicDataType = DYNAMIC_DATA_TYPE.number;
       break;
     case 'string':
-      eventDataType = EVENT_DATA_TYPE.string;
+      dynamicDataType = DYNAMIC_DATA_TYPE.string;
       break;
     case 'boolean':
-      eventDataType = EVENT_DATA_TYPE.boolean;
+      dynamicDataType = DYNAMIC_DATA_TYPE.boolean;
       value = value ? 'true' : 'false';
       break;
     case 'date':
-      eventDataType = EVENT_DATA_TYPE.date;
+      dynamicDataType = DYNAMIC_DATA_TYPE.date;
       break;
     case 'object':
-      eventDataType = EVENT_DATA_TYPE.array;
+      dynamicDataType = DYNAMIC_DATA_TYPE.array;
       value = JSON.stringify(value);
       break;
     default:
-      eventDataType = EVENT_DATA_TYPE.string;
+      dynamicDataType = DYNAMIC_DATA_TYPE.string;
       break;
   }
 
-  acc.keyValues.push({ key, value, eventDataType });
+  acc.keyValues.push({ key, value, dynamicDataType });
 }
 
 function getKeyName(key, parentKey) {
diff --git a/lib/prisma.ts b/lib/prisma.ts
index fdd8a58d..51707049 100644
--- a/lib/prisma.ts
+++ b/lib/prisma.ts
@@ -1,7 +1,7 @@
 import prisma from '@umami/prisma-client';
 import moment from 'moment-timezone';
 import { MYSQL, POSTGRESQL, getDatabaseType } from 'lib/db';
-import { getEventDataType } from './eventData';
+import { getDynamicDataType } from './dynamicData';
 import { FILTER_COLUMNS } from './constants';
 
 const MYSQL_DATE_FORMATS = {
@@ -85,7 +85,7 @@ function getEventDataFilterQuery(
   params: any[],
 ) {
   const query = filters.reduce((ac, cv) => {
-    const type = getEventDataType(cv.eventValue);
+    const type = getDynamicDataType(cv.eventValue);
 
     let value = cv.eventValue;
 
diff --git a/lib/session.ts b/lib/session.ts
index 1fedb91b..04cbc9b0 100644
--- a/lib/session.ts
+++ b/lib/session.ts
@@ -1,12 +1,11 @@
-import clickhouse from 'lib/clickhouse';
 import { secret, uuid } from 'lib/crypto';
 import { getClientInfo, getJsonBody } from 'lib/detect';
 import { parseToken } from 'next-basics';
 import { CollectRequestBody, NextApiRequestCollect } from 'pages/api/send';
 import { createSession } from 'queries';
 import { validate } from 'uuid';
-import { loadSession, loadWebsite } from './query';
 import cache from './cache';
+import { loadSession, loadWebsite } from './query';
 
 export async function findSession(req: NextApiRequestCollect) {
   const { payload } = getJsonBody<CollectRequestBody>(req);
@@ -46,26 +45,8 @@ export async function findSession(req: NextApiRequestCollect) {
 
   const { userAgent, browser, os, ip, country, subdivision1, subdivision2, city, device } =
     await getClientInfo(req, payload);
-  const sessionId = uuid(websiteId, hostname, ip, userAgent);
 
-  // Clickhouse does not require session lookup
-  if (clickhouse.enabled) {
-    return {
-      id: sessionId,
-      websiteId,
-      hostname,
-      browser,
-      os,
-      device,
-      screen,
-      language,
-      country,
-      subdivision1,
-      subdivision2,
-      city,
-      ownerId: website.userId,
-    };
-  }
+  const sessionId = uuid(websiteId, hostname, ip, userAgent);
 
   // Find session
   let session = await loadSession(sessionId);
diff --git a/lib/types.ts b/lib/types.ts
index 37c1ffdc..05c09120 100644
--- a/lib/types.ts
+++ b/lib/types.ts
@@ -1,18 +1,20 @@
 import { NextApiRequest } from 'next';
-import { EVENT_DATA_TYPE, EVENT_TYPE, KAFKA_TOPIC, ROLES } from './constants';
+import { COLLECTION_TYPE, DYNAMIC_DATA_TYPE, EVENT_TYPE, KAFKA_TOPIC, ROLES } from './constants';
 
 type ObjectValues<T> = T[keyof T];
 
-export type Roles = ObjectValues<typeof ROLES>;
+export type CollectionType = ObjectValues<typeof COLLECTION_TYPE>;
 
-export type EventTypes = ObjectValues<typeof EVENT_TYPE>;
+export type Role = ObjectValues<typeof ROLES>;
 
-export type EventDataTypes = ObjectValues<typeof EVENT_DATA_TYPE>;
+export type EventType = ObjectValues<typeof EVENT_TYPE>;
 
-export type KafkaTopics = ObjectValues<typeof KAFKA_TOPIC>;
+export type DynamicDataType = ObjectValues<typeof DYNAMIC_DATA_TYPE>;
 
-export interface EventData {
-  [key: string]: number | string | EventData | number[] | string[] | EventData[];
+export type KafkaTopic = ObjectValues<typeof KAFKA_TOPIC>;
+
+export interface DynamicData {
+  [key: string]: number | string | DynamicData | number[] | string[] | DynamicData[];
 }
 
 export interface Auth {
diff --git a/pages/api/send.ts b/pages/api/send.ts
index df7ceb6e..24264fa3 100644
--- a/pages/api/send.ts
+++ b/pages/api/send.ts
@@ -7,6 +7,9 @@ import { getJsonBody, getIpAddress } from 'lib/detect';
 import { secret } from 'lib/crypto';
 import { NextApiRequest, NextApiResponse } from 'next';
 import { Resolver } from 'dns/promises';
+import { CollectionType } from 'lib/types';
+import { COLLECTION_TYPE } from 'lib/constants';
+import { saveSessionData } from 'queries/analytics/session/saveSessionData';
 
 export interface CollectRequestBody {
   payload: {
@@ -20,7 +23,7 @@ export interface CollectRequestBody {
     website: string;
     name: string;
   };
-  type: string;
+  type: CollectionType;
 }
 
 export interface NextApiRequestCollect extends NextApiRequest {
@@ -52,17 +55,81 @@ export default async (req: NextApiRequestCollect, res: NextApiResponse) => {
 
   const { type, payload } = getJsonBody<CollectRequestBody>(req);
 
-  if (type !== 'event') {
+  validateBody(res, { type, payload });
+
+  if (await hasBlockedIp(req)) {
+    return forbidden(res);
+  }
+
+  const { url, referrer, name: eventName, data: dynamicData, title: pageTitle } = payload;
+
+  await useSession(req, res);
+
+  const session = req.session;
+
+  if (type === COLLECTION_TYPE.event) {
+    // eslint-disable-next-line prefer-const
+    let [urlPath, urlQuery] = url?.split('?') || [];
+    let [referrerPath, referrerQuery] = referrer?.split('?') || [];
+    let referrerDomain;
+
+    if (!urlPath) {
+      urlPath = '/';
+    }
+
+    if (referrerPath?.startsWith('http')) {
+      const refUrl = new URL(referrer);
+      referrerPath = refUrl.pathname;
+      referrerQuery = refUrl.search.substring(1);
+      referrerDomain = refUrl.hostname.replace(/www\./, '');
+    }
+
+    if (process.env.REMOVE_TRAILING_SLASH) {
+      urlPath = urlPath.replace(/.+\/$/, '');
+    }
+
+    await saveEvent({
+      urlPath,
+      urlQuery,
+      referrerPath,
+      referrerQuery,
+      referrerDomain,
+      pageTitle,
+      eventName,
+      eventData: dynamicData,
+      ...session,
+      sessionId: session.id,
+    });
+  }
+
+  if (type === COLLECTION_TYPE.identify) {
+    if (!dynamicData) {
+      return badRequest(res, 'Data required.');
+    }
+
+    await saveSessionData({ ...session, sessionData: dynamicData, sessionId: session.id });
+  }
+
+  const token = createToken(session, secret());
+
+  return send(res, token);
+};
+
+function validateBody(res: NextApiResponse, { type, payload }: CollectRequestBody) {
+  const { data } = payload;
+
+  // Validate type
+  if (type !== COLLECTION_TYPE.event && type !== COLLECTION_TYPE.identify) {
     return badRequest(res, 'Wrong payload type.');
   }
 
-  const { url, referrer, name: eventName, data: eventData, title: pageTitle } = payload;
-
   // Validate eventData is JSON
-  if (eventData && !(typeof eventData === 'object' && !Array.isArray(eventData))) {
+  if (data && !(typeof data === 'object' && !Array.isArray(data))) {
     return badRequest(res, 'Invalid event data.');
   }
+}
 
+async function hasBlockedIp(req: NextApiRequestCollect) {
   const ignoreIps = process.env.IGNORE_IP;
   const ignoreHostnames = process.env.IGNORE_HOSTNAME;
 
@@ -100,49 +167,6 @@ export default async (req: NextApiRequestCollect, res: NextApiResponse) => {
       return false;
     });
 
-    if (blocked) {
-      return forbidden(res);
-    }
+    return blocked;
   }
-
-  await useSession(req, res);
-
-  const session = req.session;
-
-  // eslint-disable-next-line prefer-const
-  let [urlPath, urlQuery] = url?.split('?') || [];
-  let [referrerPath, referrerQuery] = referrer?.split('?') || [];
-  let referrerDomain;
-
-  if (!urlPath) {
-    urlPath = '/';
-  }
-
-  if (referrerPath?.startsWith('http')) {
-    const refUrl = new URL(referrer);
-    referrerPath = refUrl.pathname;
-    referrerQuery = refUrl.search.substring(1);
-    referrerDomain = refUrl.hostname.replace(/www\./, '');
-  }
-
-  if (process.env.REMOVE_TRAILING_SLASH) {
-    urlPath = urlPath.replace(/.+\/$/, '');
-  }
-
-  await saveEvent({
-    urlPath,
-    urlQuery,
-    referrerPath,
-    referrerQuery,
-    referrerDomain,
-    pageTitle,
-    eventName,
-    eventData,
-    ...session,
-    sessionId: session.id,
-  });
-
-  const token = createToken(session, secret());
-
-  return send(res, token);
-};
+}
diff --git a/pages/api/users/[id]/index.ts b/pages/api/users/[id]/index.ts
index de4642cb..a4ab05ff 100644
--- a/pages/api/users/[id]/index.ts
+++ b/pages/api/users/[id]/index.ts
@@ -1,4 +1,4 @@
-import { NextApiRequestQueryBody, Roles, User } from 'lib/types';
+import { NextApiRequestQueryBody, Role, User } from 'lib/types';
 import { canDeleteUser, canUpdateUser, canViewUser } from 'lib/auth';
 import { useAuth } from 'lib/middleware';
 import { NextApiResponse } from 'next';
@@ -12,7 +12,7 @@ export interface UserRequestQuery {
 export interface UserRequestBody {
   username: string;
   password: string;
-  role: Roles;
+  role: Role;
 }
 
 export default async (
diff --git a/pages/api/users/index.ts b/pages/api/users/index.ts
index 4d35d856..c6103c35 100644
--- a/pages/api/users/index.ts
+++ b/pages/api/users/index.ts
@@ -2,7 +2,7 @@ import { canCreateUser, canViewUsers } from 'lib/auth';
 import { ROLES } from 'lib/constants';
 import { uuid } from 'lib/crypto';
 import { useAuth } from 'lib/middleware';
-import { NextApiRequestQueryBody, Roles, User } from 'lib/types';
+import { NextApiRequestQueryBody, Role, User } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { badRequest, hashPassword, methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { createUser, getUser, getUsers } from 'queries';
@@ -11,7 +11,7 @@ export interface UsersRequestBody {
   username: string;
   password: string;
   id: string;
-  role?: Roles;
+  role?: Role;
 }
 
 export default async (
diff --git a/queries/admin/user.ts b/queries/admin/user.ts
index 3ba2654b..ec23559f 100644
--- a/queries/admin/user.ts
+++ b/queries/admin/user.ts
@@ -3,7 +3,7 @@ import { getRandomChars } from 'next-basics';
 import cache from 'lib/cache';
 import { ROLES } from 'lib/constants';
 import prisma from 'lib/prisma';
-import { Website, User, Roles } from 'lib/types';
+import { Website, User, Role } from 'lib/types';
 
 export async function getUser(
   where: Prisma.UserWhereInput | Prisma.UserWhereUniqueInput,
@@ -91,7 +91,7 @@ export async function createUser(data: {
   id: string;
   username: string;
   password: string;
-  role: Roles;
+  role: Role;
 }): Promise<{
   id: string;
   username: string;
diff --git a/queries/analytics/event/saveEvent.ts b/queries/analytics/event/saveEvent.ts
index 9a7db00d..51087a59 100644
--- a/queries/analytics/event/saveEvent.ts
+++ b/queries/analytics/event/saveEvent.ts
@@ -133,9 +133,10 @@ async function clickhouseQuery(data: {
   const createdAt = getDateFormat(new Date());
 
   const message = {
+    ...args,
     website_id: websiteId,
     session_id: sessionId,
-    event_id: eventId,
+    event_id: uuid(),
     country: country ? country : null,
     subdivision1: country && subdivision1 ? `${country}-${subdivision1}` : null,
     subdivision2: subdivision2 ? subdivision2 : null,
@@ -149,7 +150,6 @@ async function clickhouseQuery(data: {
     event_type: eventName ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
     event_name: eventName ? eventName?.substring(0, EVENT_NAME_LENGTH) : null,
     created_at: createdAt,
-    ...args,
   };
 
   await sendMessage(message, 'event');
diff --git a/queries/analytics/eventData/saveEventData.ts b/queries/analytics/eventData/saveEventData.ts
index 90e63565..96ea8831 100644
--- a/queries/analytics/eventData/saveEventData.ts
+++ b/queries/analytics/eventData/saveEventData.ts
@@ -1,11 +1,11 @@
 import { Prisma } from '@prisma/client';
-import { EVENT_DATA_TYPE } from 'lib/constants';
+import { DYNAMIC_DATA_TYPE } from 'lib/constants';
 import { uuid } from 'lib/crypto';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
-import { flattenJSON } from 'lib/eventData';
+import { flattenJSON } from 'lib/dynamicData';
 import kafka from 'lib/kafka';
 import prisma from 'lib/prisma';
-import { EventData } from 'lib/types';
+import { DynamicData } from 'lib/types';
 
 export async function saveEventData(args: {
   websiteId: string;
@@ -13,7 +13,7 @@ export async function saveEventData(args: {
   sessionId?: string;
   urlPath?: string;
   eventName?: string;
-  eventData: EventData;
+  eventData: DynamicData;
   createdAt?: string;
 }) {
   return runQuery({
@@ -25,7 +25,7 @@ export async function saveEventData(args: {
 async function relationalQuery(data: {
   websiteId: string;
   eventId: string;
-  eventData: EventData;
+  eventData: DynamicData;
 }): Promise<Prisma.BatchPayload> {
   const { websiteId, eventId, eventData } = data;
 
@@ -36,16 +36,16 @@ async function relationalQuery(data: {
     id: uuid(),
     websiteEventId: eventId,
     websiteId,
-    eventKey: a.key,
-    eventStringValue:
-      a.eventDataType === EVENT_DATA_TYPE.string ||
-      a.eventDataType === EVENT_DATA_TYPE.boolean ||
-      a.eventDataType === EVENT_DATA_TYPE.array
+    key: a.key,
+    stringValue:
+      a.dynamicDataType === DYNAMIC_DATA_TYPE.string ||
+      a.dynamicDataType === DYNAMIC_DATA_TYPE.boolean ||
+      a.dynamicDataType === DYNAMIC_DATA_TYPE.array
         ? a.value
         : null,
-    eventNumericValue: a.eventDataType === EVENT_DATA_TYPE.number ? a.value : null,
-    eventDateValue: a.eventDataType === EVENT_DATA_TYPE.date ? new Date(a.value) : null,
-    eventDataType: a.eventDataType,
+    numericValue: a.dynamicDataType === DYNAMIC_DATA_TYPE.number ? a.value : null,
+    dateValue: a.dynamicDataType === DYNAMIC_DATA_TYPE.date ? new Date(a.value) : null,
+    dataType: a.dynamicDataType,
   }));
 
   return prisma.client.eventData.createMany({
@@ -59,7 +59,7 @@ async function clickhouseQuery(data: {
   sessionId?: string;
   urlPath?: string;
   eventName?: string;
-  eventData: EventData;
+  eventData: DynamicData;
   createdAt?: string;
 }) {
   const { websiteId, sessionId, eventId, urlPath, eventName, eventData, createdAt } = data;
@@ -75,15 +75,15 @@ async function clickhouseQuery(data: {
     url_path: urlPath,
     event_name: eventName,
     event_key: a.key,
-    event_string_value:
-      a.eventDataType === EVENT_DATA_TYPE.string ||
-      a.eventDataType === EVENT_DATA_TYPE.boolean ||
-      a.eventDataType === EVENT_DATA_TYPE.array
+    string_value:
+      a.dynamicDataType === DYNAMIC_DATA_TYPE.string ||
+      a.dynamicDataType === DYNAMIC_DATA_TYPE.boolean ||
+      a.dynamicDataType === DYNAMIC_DATA_TYPE.array
         ? a.value
         : null,
-    event_numeric_value: a.eventDataType === EVENT_DATA_TYPE.number ? a.value : null,
-    event_date_value: a.eventDataType === EVENT_DATA_TYPE.date ? getDateFormat(a.value) : null,
-    event_data_type: a.eventDataType,
+    numeric_value: a.dynamicDataType === DYNAMIC_DATA_TYPE.number ? a.value : null,
+    date_value: a.dynamicDataType === DYNAMIC_DATA_TYPE.date ? getDateFormat(a.value) : null,
+    data_type: a.dynamicDataType,
     created_at: createdAt,
   }));
 
diff --git a/queries/analytics/session/createSession.ts b/queries/analytics/session/createSession.ts
index 22f7892f..4fd36d2e 100644
--- a/queries/analytics/session/createSession.ts
+++ b/queries/analytics/session/createSession.ts
@@ -1,23 +1,8 @@
-import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
-import kafka from 'lib/kafka';
-import prisma from 'lib/prisma';
-import cache from 'lib/cache';
 import { Prisma } from '@prisma/client';
+import cache from 'lib/cache';
+import prisma from 'lib/prisma';
 
-export async function createSession(args: Prisma.SessionCreateInput) {
-  return runQuery({
-    [PRISMA]: () => relationalQuery(args),
-    [CLICKHOUSE]: () => clickhouseQuery(args),
-  }).then(async data => {
-    if (cache.enabled) {
-      await cache.storeSession(data);
-    }
-
-    return data;
-  });
-}
-
-async function relationalQuery(data: Prisma.SessionCreateInput) {
+export async function createSession(data: Prisma.SessionCreateInput) {
   const {
     id,
     websiteId,
@@ -33,71 +18,28 @@ async function relationalQuery(data: Prisma.SessionCreateInput) {
     city,
   } = data;
 
-  return prisma.client.session.create({
-    data: {
-      id,
-      websiteId,
-      hostname,
-      browser,
-      os,
-      device,
-      screen,
-      language,
-      country,
-      subdivision1: country && subdivision1 ? `${country}-${subdivision1}` : null,
-      subdivision2,
-      city,
-    },
-  });
-}
-
-async function clickhouseQuery(data: {
-  id: string;
-  websiteId: string;
-  hostname?: string;
-  browser?: string;
-  os?: string;
-  device?: string;
-  screen?: string;
-  language?: string;
-  country?: string;
-  subdivision1?: string;
-  subdivision2?: string;
-  city?: string;
-}) {
-  const {
-    id,
-    websiteId,
-    hostname,
-    browser,
-    os,
-    device,
-    screen,
-    language,
-    country,
-    subdivision1,
-    subdivision2,
-    city,
-  } = data;
-  const { getDateFormat, sendMessage } = kafka;
-
-  const msg = {
-    session_id: id,
-    website_id: websiteId,
-    hostname,
-    browser,
-    os,
-    device,
-    screen,
-    language,
-    country,
-    subdivision1,
-    subdivision2,
-    city,
-    created_at: getDateFormat(new Date()),
-  };
-
-  await sendMessage(msg, 'event');
-
-  return data;
+  return prisma.client.session
+    .create({
+      data: {
+        id,
+        websiteId,
+        hostname,
+        browser,
+        os,
+        device,
+        screen,
+        language,
+        country,
+        subdivision1: country && subdivision1 ? `${country}-${subdivision1}` : null,
+        subdivision2,
+        city,
+      },
+    })
+    .then(async data => {
+      if (cache.enabled) {
+        await cache.storeSession(data);
+      }
+
+      return data;
+    });
 }
diff --git a/queries/analytics/session/getSession.ts b/queries/analytics/session/getSession.ts
index d226e832..2fd8d18f 100644
--- a/queries/analytics/session/getSession.ts
+++ b/queries/analytics/session/getSession.ts
@@ -1,43 +1,8 @@
-import clickhouse from 'lib/clickhouse';
-import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
-import prisma from 'lib/prisma';
 import { Prisma } from '@prisma/client';
+import prisma from 'lib/prisma';
 
-export async function getSession(args: { id: string }) {
-  return runQuery({
-    [PRISMA]: () => relationalQuery(args),
-    [CLICKHOUSE]: () => clickhouseQuery(args),
-  });
-}
-
-async function relationalQuery(where: Prisma.SessionWhereUniqueInput) {
+export async function getSession(where: Prisma.SessionWhereUniqueInput) {
   return prisma.client.session.findUnique({
     where,
   });
 }
-
-async function clickhouseQuery({ id: sessionId }: { id: string }) {
-  const { rawQuery, findFirst } = clickhouse;
-  const params = { sessionId };
-
-  return rawQuery(
-    `select
-      session_id, 
-      website_id, 
-      created_at, 
-      hostname, 
-      browser, 
-      os, 
-      device, 
-      screen,
-      language, 
-      country,
-      subdivision1,
-      subdivision2,
-      city
-    from website_event
-      where session_id = {sessionId:UUID}
-    limit 1`,
-    params,
-  ).then(result => findFirst(result));
-}
diff --git a/queries/analytics/session/saveSessionData.ts b/queries/analytics/session/saveSessionData.ts
new file mode 100644
index 00000000..76842b4f
--- /dev/null
+++ b/queries/analytics/session/saveSessionData.ts
@@ -0,0 +1,43 @@
+import { DYNAMIC_DATA_TYPE } from 'lib/constants';
+import { uuid } from 'lib/crypto';
+import { flattenJSON } from 'lib/dynamicData';
+import prisma from 'lib/prisma';
+import { DynamicData } from 'lib/types';
+
+export async function saveSessionData(data: {
+  websiteId: string;
+  sessionId: string;
+  sessionData: DynamicData;
+}) {
+  const { client, transaction } = prisma;
+  const { websiteId, sessionId, sessionData } = data;
+
+  const jsonKeys = flattenJSON(sessionData);
+
+  const flattendData = jsonKeys.map(a => ({
+    id: uuid(),
+    websiteId,
+    sessionId,
+    key: a.key,
+    stringValue:
+      a.dynamicDataType === DYNAMIC_DATA_TYPE.string ||
+      a.dynamicDataType === DYNAMIC_DATA_TYPE.boolean ||
+      a.dynamicDataType === DYNAMIC_DATA_TYPE.array
+        ? a.value
+        : null,
+    numericValue: a.dynamicDataType === DYNAMIC_DATA_TYPE.number ? a.value : null,
+    dateValue: a.dynamicDataType === DYNAMIC_DATA_TYPE.date ? new Date(a.value) : null,
+    dataType: a.dynamicDataType,
+  }));
+
+  return transaction([
+    client.sessionData.deleteMany({
+      where: {
+        sessionId,
+      },
+    }),
+    client.sessionData.createMany({
+      data: flattendData,
+    }),
+  ]);
+}
diff --git a/tracker/index.js b/tracker/index.js
index 1c40036e..6127ed19 100644
--- a/tracker/index.js
+++ b/tracker/index.js
@@ -173,7 +173,7 @@
     }
   };
 
-  const send = payload => {
+  const send = (payload, type = 'event') => {
     if (trackingDisabled()) return;
     const headers = {
       'Content-Type': 'application/json',
@@ -183,7 +183,7 @@
     }
     return fetch(endpoint, {
       method: 'POST',
-      body: JSON.stringify({ type: 'event', payload }),
+      body: JSON.stringify({ type, payload }),
       headers,
     })
       .then(res => res.text())
@@ -205,11 +205,14 @@
     return send(getPayload());
   };
 
+  const identify = data => send({ ...getPayload(), data }, 'identify');
+
   /* Start */
 
   if (!window.umami) {
     window.umami = {
       track,
+      identify,
     };
   }
 

From dc6da1e41fe5546e5217379ff54d4cd6eadeaa98 Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Thu, 1 Jun 2023 10:34:39 -0700
Subject: [PATCH 60/88] Update yarn.

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

diff --git a/package.json b/package.json
index bd195662..1eb7aa5a 100644
--- a/package.json
+++ b/package.json
@@ -95,7 +95,7 @@
     "node-fetch": "^3.2.8",
     "npm-run-all": "^4.1.5",
     "react": "^18.2.0",
-    "react-basics": "^0.77.0",
+    "react-basics": "^0.82.0",
     "react-beautiful-dnd": "^13.1.0",
     "react-dom": "^18.2.0",
     "react-error-boundary": "^4.0.4",
diff --git a/yarn.lock b/yarn.lock
index e2c1432d..e7d7e8e1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8191,10 +8191,10 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-basics@^0.77.0:
-  version "0.77.0"
-  resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.77.0.tgz#31d35b4db8119c699eeab24a7cab10a613b549f4"
-  integrity sha512-L14dZqlg7P9m700OvND1fsdZA/vvLH3W0Ntw5Oyk2RxE47K6oMESSuPhDi1yC2QjDYwFdKzGSsgJGfWlc++Kww==
+react-basics@^0.82.0:
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.82.0.tgz#1df241f4ef97a8d0c7c81d4954d065efc2c415a5"
+  integrity sha512-DrHuRJqncx7cWYFz4rAahEsCsF3s5W1CJyJY276EUphfn0NDKZcvnrSnr6G+KTUAEkvksvlAm1t3nDv85coUxg==
   dependencies:
     classnames "^2.3.1"
     date-fns "^2.29.3"

From a3639d59a348f63e42a09ac17f6d828037baf559 Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Thu, 1 Jun 2023 11:54:24 -0700
Subject: [PATCH 61/88] Add increment to usage.

---
 lib/cache.ts   | 6 ++++++
 lib/session.ts | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/lib/cache.ts b/lib/cache.ts
index e63a53bb..7ee7bf28 100644
--- a/lib/cache.ts
+++ b/lib/cache.ts
@@ -54,6 +54,11 @@ async function fetchUserBlock(userId: string) {
   return redis.get(key);
 }
 
+async function incrementUserBlock(userId: string) {
+  const key = `user:block:${userId}`;
+  return redis.incr(key);
+}
+
 export default {
   fetchWebsite,
   storeWebsite,
@@ -65,5 +70,6 @@ export default {
   storeSession,
   deleteSession,
   fetchUserBlock,
+  incrementUserBlock,
   enabled: redis.enabled,
 };
diff --git a/lib/session.ts b/lib/session.ts
index 04cbc9b0..29ff694f 100644
--- a/lib/session.ts
+++ b/lib/session.ts
@@ -80,6 +80,8 @@ export async function findSession(req: NextApiRequestCollect) {
 
 async function checkUserBlock(userId: string) {
   if (process.env.ENABLE_BLOCKER && (await cache.fetchUserBlock(userId))) {
+    await cache.incrementUserBlock(userId);
+
     throw new Error('Usage Limit.');
   }
 }

From 1869a809cfdccb3b4443dff187b9f34fdb6466bb Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Thu, 1 Jun 2023 19:30:07 -0700
Subject: [PATCH 62/88] Fixed incorrect data field.

---
 tracker/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tracker/index.js b/tracker/index.js
index 6127ed19..1686df42 100644
--- a/tracker/index.js
+++ b/tracker/index.js
@@ -106,7 +106,7 @@
           }
         });
 
-        return track(eventName, { data: eventData });
+        return track(eventName, eventData);
       }
       return Promise.resolve();
     };

From d575b9c377c580dd30918b2fdb734c9aac6854eb Mon Sep 17 00:00:00 2001
From: C-A de Salaberry <ca.s@padoa.fr>
Date: Fri, 2 Jun 2023 15:06:19 +0200
Subject: [PATCH 63/88] chore(tracker): :label: could not use `string` in
 `EventData`

- EventData was incorrectly typed `Record<string, object>` which did not allow for the most common `string` attribute
- UmamiTracker is now exported to be used elsewhere if needed
- A note has been added on event names being truncated to 50 characters
---
 tracker/index.d.ts | 151 +++++++++++++++++++++++++--------------------
 1 file changed, 83 insertions(+), 68 deletions(-)

diff --git a/tracker/index.d.ts b/tracker/index.d.ts
index 67cebc08..f9bd4b24 100644
--- a/tracker/index.d.ts
+++ b/tracker/index.d.ts
@@ -1,4 +1,4 @@
-type TrackedProperties = {
+export type TrackedProperties = {
   /**
    * Hostname of server
    *
@@ -55,7 +55,7 @@ type TrackedProperties = {
   website: string;
 };
 
-type WithRequired<T, K extends keyof T> = T & { [P in K]-?: T[P] }
+export type WithRequired<T, K extends keyof T> = T & { [P in K]-?: T[P] };
 
 /**
  *
@@ -65,74 +65,89 @@ type WithRequired<T, K extends keyof T> = T & { [P in K]-?: T[P] }
  * - Arrays are converted to a String, with the same max length of 500.
  * - Objects have a max of 50 properties. Arrays are considered 1 property.
  */
-type EventData = Record<string, object>;
-type EventProperties = {
+export interface EventData {
+  [key: string]: number | string | EventData | number[] | string[] | EventData[];
+}
+
+export type EventProperties = {
+  /**
+   * NOTE: event names will be truncated past 50 characters
+   */
   name: string;
   data?: EventData;
-} & WithRequired<TrackedProperties, 'website'>
-| WithRequired<TrackedProperties, 'website'>;
+} & WithRequired<TrackedProperties, 'website'>;
+export type PageViewProperties = WithRequired<TrackedProperties, 'website'>;
+export type CustomEventFunction = (
+  props: PageViewProperties,
+) => EventProperties | PageViewProperties;
+
+export type UmamiTracker = {
+  track: {
+    /**
+     * Track a page view
+     *
+     * @example ```
+     * umami.track();
+     * ```
+     */
+    (): Promise<string>;
+
+    /**
+     * Track an event with a given name
+     *
+     * NOTE: event names will be truncated past 50 characters
+     *
+     * @example ```
+     * umami.track('signup-button');
+     * ```
+     */
+    (eventName: string): Promise<string>;
+
+    /**
+     * Tracks an event with dynamic data.
+     *
+     * NOTE: event names will be truncated past 50 characters
+     *
+     * When tracking events, the default properties are included in the payload. This is equivalent to running:
+     *
+     * ```js
+     * umami.track(props => ({
+     *   ...props,
+     *   name: 'signup-button',
+     *   data: {
+     *     name: 'newsletter',
+     *     id: 123
+     *   }
+     * }));
+     * ```
+     *
+     * @example ```
+     * umami.track('signup-button', { name: 'newsletter', id: 123 });
+     * ```
+     */
+    (eventName: string, obj: EventData): Promise<string>;
+
+    /**
+     * Tracks a page view with custom properties
+     *
+     * @example ```
+     * umami.track({ website: 'e676c9b4-11e4-4ef1-a4d7-87001773e9f2', url: '/home', title: 'Home page' });
+     * ```
+     */
+    (properties: PageViewProperties): Promise<string>;
+
+    /**
+     * Tracks an event with fully customizable dynamic data
+     * Ilf you don't specify any `name` and/or `data`, it will be treated as a page view
+     *
+     * @example ```
+     * umami.track((props) => ({ ...props, url: path }));
+     * ```
+     */
+    (eventFunction: CustomEventFunction): Promise<string>;
+  };
+};
 
 interface Window {
-  umami: {
-    track: {
-      /**
-       * Track a page view
-       *
-       * @example ```
-       * umami.track();
-       * ```
-       */
-      (): Promise<string>;
-
-      /**
-       * Track an event with a given name
-       *
-       * @example ```
-       * umami.track('signup-button');
-       * ```
-       */
-      (eventName: string): Promise<string>;
-
-      /**
-       * Tracks an event with dynamic data.
-       *
-       * When tracking events, the default properties are included in the payload. This is equivalent to running:
-       *
-       * ```js
-       * umami.track(props => ({
-       *   ...props,
-       *   name: 'signup-button',
-       *   data: {
-       *     name: 'newsletter',
-       *     id: 123
-       *   }
-       * }));
-       * ```
-       *
-       * @example ```
-       * umami.track('signup-button', { name: 'newsletter', id: 123 });
-       * ```
-       */
-      (eventName: string, obj: EventData): Promise<string>;
-
-      /**
-       * Tracks a page view with custom properties
-       *
-       * @example ```
-       * umami.track({ website: 'e676c9b4-11e4-4ef1-a4d7-87001773e9f2', url: '/home', title: 'Home page' });
-       * ```
-       */
-      (properties: WithRequired<Partial<TrackedProperties>, 'website'>): Promise<string>;
-
-      /**
-       * Tracks an event with fully customizable dynamic data
-       * Ilf you don't specify any `name` and/or `data`, it will be treated as a page view
-       *
-       * @example ```
-       * umami.track((props) => ({ ...props, url: path }));
-       * ```
-       */
-      (eventFunction: (prop: TrackedProperties) => EventProperties): Promise<string>;
-    };
-  };
+  umami: UmamiTracker;
 }

From 22d477b98b9882a963863cf3127fb5e49f8be548 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Fri, 2 Jun 2023 23:10:59 -0700
Subject: [PATCH 64/88] Updates to reports.

---
 components/input/LanguageButton.module.css    |   3 +-
 components/messages.js                        |   2 +
 components/pages/reports/BaseParameters.js    |  43 +++++++
 components/pages/reports/Report.js            |   2 -
 components/pages/reports/ReportHeader.js      |  26 ++--
 components/pages/reports/ReportList.js        |   2 +-
 .../reports/event-data/EventDataParameters.js |  66 ++++++++++
 .../event-data/EventDataParameters.module.css |  27 ++++
 .../reports/event-data/EventDataReport.js     |  35 +++---
 .../pages/reports/event-data/FieldAddForm.js  |  28 +++++
 .../pages/reports/funnel/FunnelParameters.js  | 117 +++++++++---------
 .../pages/reports/funnel/FunnelReport.js      |   6 +-
 .../funnel/{AddUrlForm.js => UrlAddForm.js}   |   7 +-
 .../reports/funnel/UrlAddForm.module.css      |   8 ++
 hooks/useLocale.js                            |   4 +-
 lib/constants.ts                              |   8 ++
 package.json                                  |   2 +-
 pages/api/reports/event-data.ts               |  60 +++++++++
 .../analytics/eventData/getEventDataFields.ts |  48 +++++++
 queries/analytics/session/saveSessionData.ts  |   2 +-
 queries/index.js                              |   1 +
 yarn.lock                                     |   8 +-
 22 files changed, 388 insertions(+), 117 deletions(-)
 create mode 100644 components/pages/reports/BaseParameters.js
 create mode 100644 components/pages/reports/event-data/EventDataParameters.js
 create mode 100644 components/pages/reports/event-data/EventDataParameters.module.css
 create mode 100644 components/pages/reports/event-data/FieldAddForm.js
 rename components/pages/reports/funnel/{AddUrlForm.js => UrlAddForm.js} (85%)
 create mode 100644 components/pages/reports/funnel/UrlAddForm.module.css
 create mode 100644 pages/api/reports/event-data.ts
 create mode 100644 queries/analytics/eventData/getEventDataFields.ts

diff --git a/components/input/LanguageButton.module.css b/components/input/LanguageButton.module.css
index 16d61978..e46729c0 100644
--- a/components/input/LanguageButton.module.css
+++ b/components/input/LanguageButton.module.css
@@ -1,8 +1,7 @@
 .menu {
   display: flex;
   flex-flow: row wrap;
-  min-width: 600px;
-  max-width: 100vw;
+  max-width: 640px;
   padding: 10px;
   background: var(--base50);
   z-index: var(--z-index-popup);
diff --git a/components/messages.js b/components/messages.js
index adae6aa2..bcb2a5c1 100644
--- a/components/messages.js
+++ b/components/messages.js
@@ -129,6 +129,8 @@ export const labels = defineMessages({
   window: { id: 'label.window', defaultMessage: 'Window' },
   addUrl: { id: 'label.add-url', defaultMessage: 'Add URL' },
   runQuery: { id: 'label.run-query', defaultMessage: 'Run query' },
+  fields: { id: 'label.fields', defaultMessage: 'Fields' },
+  addField: { id: 'label.add-field', defaultMessage: 'Add field' },
 });
 
 export const messages = defineMessages({
diff --git a/components/pages/reports/BaseParameters.js b/components/pages/reports/BaseParameters.js
new file mode 100644
index 00000000..2d04f228
--- /dev/null
+++ b/components/pages/reports/BaseParameters.js
@@ -0,0 +1,43 @@
+import { FormRow } from 'react-basics';
+import DateFilter from 'components/input/DateFilter';
+import WebsiteSelect from 'components/input/WebsiteSelect';
+import { parseDateRange } from 'lib/date';
+import { useContext } from 'react';
+import { ReportContext } from './Report';
+import { useMessages } from 'hooks';
+
+export function BaseParameters() {
+  const { report, updateReport } = useContext(ReportContext);
+  const { formatMessage, labels } = useMessages();
+
+  const { parameters } = report || {};
+  const { websiteId, dateRange } = parameters || {};
+  const { value, startDate, endDate } = dateRange || {};
+
+  const handleWebsiteSelect = websiteId => {
+    updateReport({ parameters: { websiteId } });
+  };
+
+  const handleDateChange = value => {
+    updateReport({ parameters: { dateRange: { ...parseDateRange(value) } } });
+  };
+
+  return (
+    <>
+      <FormRow label={formatMessage(labels.website)}>
+        <WebsiteSelect websiteId={websiteId} onSelect={handleWebsiteSelect} />
+      </FormRow>
+      <FormRow label={formatMessage(labels.dateRange)}>
+        <DateFilter
+          value={value}
+          startDate={startDate}
+          endDate={endDate}
+          onChange={handleDateChange}
+          showAllTime
+        />
+      </FormRow>
+    </>
+  );
+}
+
+export default BaseParameters;
diff --git a/components/pages/reports/Report.js b/components/pages/reports/Report.js
index 0239e64f..0a98ef75 100644
--- a/components/pages/reports/Report.js
+++ b/components/pages/reports/Report.js
@@ -8,8 +8,6 @@ export const ReportContext = createContext(null);
 export function Report({ reportId, defaultParameters, children, ...props }) {
   const report = useReport(reportId, defaultParameters);
 
-  //console.log(report);
-
   return (
     <ReportContext.Provider value={{ ...report }}>
       <Page {...props} className={styles.container}>
diff --git a/components/pages/reports/ReportHeader.js b/components/pages/reports/ReportHeader.js
index 42d78e75..08465ef9 100644
--- a/components/pages/reports/ReportHeader.js
+++ b/components/pages/reports/ReportHeader.js
@@ -64,24 +64,14 @@ export function ReportHeader({ icon }) {
 
   return (
     <PageHeader title={<Title />} className={styles.header}>
-      <Flexbox gap={20}>
-        <DateFilter
-          value={value}
-          startDate={startDate}
-          endDate={endDate}
-          onChange={handleDateChange}
-          showAllTime
-        />
-        <WebsiteSelect websiteId={websiteId} onSelect={handleWebsiteSelect} />
-        <LoadingButton
-          variant="primary"
-          loading={isCreating || isUpdating}
-          disabled={!websiteId || !value}
-          onClick={handleSave}
-        >
-          {formatMessage(labels.save)}
-        </LoadingButton>
-      </Flexbox>
+      <LoadingButton
+        variant="primary"
+        loading={isCreating || isUpdating}
+        disabled={!websiteId || !value}
+        onClick={handleSave}
+      >
+        {formatMessage(labels.save)}
+      </LoadingButton>
       {toast}
     </PageHeader>
   );
diff --git a/components/pages/reports/ReportList.js b/components/pages/reports/ReportList.js
index da0a622c..6e07c81e 100644
--- a/components/pages/reports/ReportList.js
+++ b/components/pages/reports/ReportList.js
@@ -10,7 +10,7 @@ import styles from './ReportList.module.css';
 const reports = [
   {
     title: 'Event data',
-    description: 'Query your event data.',
+    description: 'Query your custom event data.',
     url: '/reports/event-data',
     icon: <Nodes />,
   },
diff --git a/components/pages/reports/event-data/EventDataParameters.js b/components/pages/reports/event-data/EventDataParameters.js
new file mode 100644
index 00000000..cbb14193
--- /dev/null
+++ b/components/pages/reports/event-data/EventDataParameters.js
@@ -0,0 +1,66 @@
+import { useContext, useRef } from 'react';
+import { useApi, useMessages } from 'hooks';
+import { Form, FormRow, FormButtons, SubmitButton, Loading } from 'react-basics';
+import { ReportContext } from 'components/pages/reports/Report';
+import NoData from 'components/common/NoData';
+import styles from './EventDataParameters.module.css';
+import { DATA_TYPES } from 'lib/constants';
+
+function useFields(websiteId, startDate, endDate) {
+  const { get, useQuery } = useApi();
+  const { data, error, isLoading } = useQuery(
+    ['fields', websiteId, startDate, endDate],
+    () => get('/reports/event-data', { websiteId, startAt: +startDate, endAt: +endDate }),
+    { enabled: !!(websiteId && startDate && endDate) },
+  );
+
+  return { data, error, isLoading };
+}
+
+export function EventDataParameters() {
+  const { report, runReport, isRunning } = useContext(ReportContext);
+  const { formatMessage, labels } = useMessages();
+  const ref = useRef(null);
+  const { parameters } = report || {};
+  const { websiteId, dateRange } = parameters || {};
+  const { startDate, endDate } = dateRange || {};
+  const queryDisabled = !websiteId || !dateRange;
+  const { data, error, isLoading } = useFields(websiteId, startDate, endDate);
+
+  const handleSubmit = values => {
+    runReport(values);
+  };
+
+  if (!websiteId || !dateRange) {
+    return null;
+  }
+
+  if (isLoading) {
+    return <Loading icon="dots" />;
+  }
+
+  return (
+    <Form ref={ref} values={parameters} error={error} onSubmit={handleSubmit}>
+      <FormRow label={formatMessage(labels.fields)}>
+        <div className={styles.fields}>
+          {!data?.length && <NoData />}
+          {data?.map?.(({ eventKey, eventDataType }) => {
+            return (
+              <div className={styles.field} key={eventKey}>
+                <div className={styles.key}>{eventKey}</div>
+                <div className={styles.type}>{DATA_TYPES[eventDataType]}</div>
+              </div>
+            );
+          })}
+        </div>
+      </FormRow>
+      <FormButtons>
+        <SubmitButton variant="primary" disabled={queryDisabled} loading={isRunning}>
+          {formatMessage(labels.runQuery)}
+        </SubmitButton>
+      </FormButtons>
+    </Form>
+  );
+}
+
+export default EventDataParameters;
diff --git a/components/pages/reports/event-data/EventDataParameters.module.css b/components/pages/reports/event-data/EventDataParameters.module.css
new file mode 100644
index 00000000..66c82842
--- /dev/null
+++ b/components/pages/reports/event-data/EventDataParameters.module.css
@@ -0,0 +1,27 @@
+.fields {
+  max-height: 300px;
+  overflow: auto;
+}
+
+.field {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  height: 30px;
+  cursor: pointer;
+  padding: 4px;
+  border-radius: var(--border-radius);
+}
+
+.field:hover {
+  background: var(--base75);
+}
+
+.key {
+  font-weight: 400;
+}
+
+.type {
+  color: var(--font-color300);
+}
diff --git a/components/pages/reports/event-data/EventDataReport.js b/components/pages/reports/event-data/EventDataReport.js
index a32cd6e2..16382982 100644
--- a/components/pages/reports/event-data/EventDataReport.js
+++ b/components/pages/reports/event-data/EventDataReport.js
@@ -1,30 +1,23 @@
-import { useState } from 'react';
-import { Form, FormRow, FormInput, TextField } from 'react-basics';
 import Report from '../Report';
 import ReportHeader from '../ReportHeader';
-import useMessages from 'hooks/useMessages';
+import ReportMenu from '../ReportMenu';
+import ReportBody from '../ReportBody';
+import EventDataParameters from './EventDataParameters';
 import Nodes from 'assets/nodes.svg';
-import styles from '../reports.module.css';
 
-export default function EventDataReport({ websiteId, data }) {
-  const [values, setValues] = useState({ query: '' });
-  const { formatMessage, labels } = useMessages();
+const defaultParameters = {
+  type: 'event-data',
+  parameters: { fields: [], filters: [] },
+};
 
+export default function EventDataReport({ reportId }) {
   return (
-    <Report>
-      <ReportHeader title={formatMessage(labels.eventData)} icon={<Nodes />} />
-      <div className={styles.container}>
-        <div className={styles.menu}>
-          <Form>
-            <FormRow label="Properties">
-              <FormInput name="query">
-                <TextField value={values.query} />
-              </FormInput>
-            </FormRow>
-          </Form>
-        </div>
-        <div className={styles.content}></div>
-      </div>
+    <Report reportId={reportId} defaultParameters={defaultParameters}>
+      <ReportHeader icon={<Nodes />} />
+      <ReportMenu>
+        <EventDataParameters />
+      </ReportMenu>
+      <ReportBody>hi.</ReportBody>
     </Report>
   );
 }
diff --git a/components/pages/reports/event-data/FieldAddForm.js b/components/pages/reports/event-data/FieldAddForm.js
new file mode 100644
index 00000000..b0258608
--- /dev/null
+++ b/components/pages/reports/event-data/FieldAddForm.js
@@ -0,0 +1,28 @@
+import { useMessages } from 'hooks';
+import { Button, Form, FormButtons, FormRow } from 'react-basics';
+
+export function FieldAddForm({ onClose }) {
+  const { formatMessage, labels } = useMessages();
+
+  const handleSave = () => {
+    onClose();
+  };
+
+  const handleClose = () => {
+    onClose();
+  };
+
+  return (
+    <Form>
+      <FormRow label={formatMessage(labels.url)}></FormRow>
+      <FormButtons align="center" flex>
+        <Button variant="primary" onClick={handleSave}>
+          {formatMessage(labels.save)}
+        </Button>
+        <Button onClick={handleClose}>{formatMessage(labels.cancel)}</Button>
+      </FormButtons>
+    </Form>
+  );
+}
+
+export default FieldAddForm;
diff --git a/components/pages/reports/funnel/FunnelParameters.js b/components/pages/reports/funnel/FunnelParameters.js
index c87d52e4..991bf690 100644
--- a/components/pages/reports/funnel/FunnelParameters.js
+++ b/components/pages/reports/funnel/FunnelParameters.js
@@ -6,98 +6,99 @@ import {
   FormButtons,
   FormInput,
   FormRow,
-  Modal,
+  PopupTrigger,
+  Popup,
   SubmitButton,
   Text,
   TextField,
   Tooltip,
 } from 'react-basics';
 import Icons from 'components/icons';
-import AddUrlForm from './AddUrlForm';
+import UrlAddForm from './UrlAddForm';
 import { ReportContext } from 'components/pages/reports/Report';
 import styles from './FunnelParameters.module.css';
+import BaseParameters from '../BaseParameters';
 
 export function FunnelParameters() {
   const { report, runReport, updateReport, isRunning } = useContext(ReportContext);
   const { formatMessage, labels } = useMessages();
-  const [show, setShow] = useState(false);
   const ref = useRef(null);
-  const { websiteId, parameters } = report || {};
-  const queryDisabled = !websiteId || parameters?.urls?.length < 2;
+
+  const { parameters } = report || {};
+  const { websiteId, dateRange, urls } = parameters || {};
+  const queryDisabled = !websiteId || !dateRange || urls?.length < 2;
 
   const handleSubmit = values => {
     runReport(values);
   };
 
   const handleAddUrl = url => {
-    updateReport({ parameters: { ...parameters, urls: parameters.urls.concat(url) } });
+    updateReport({ parameters: { urls: parameters.urls.concat(url) } });
   };
 
   const handleRemoveUrl = (index, e) => {
     e.stopPropagation();
     const urls = [...parameters.urls];
     urls.splice(index, 1);
-    updateReport({ parameters: { ...parameters, urls } });
+    updateReport({ parameters: { urls } });
   };
 
-  const showAddForm = () => setShow(true);
-  const hideAddForm = () => setShow(false);
-
   return (
-    <>
-      <Form ref={ref} values={parameters} onSubmit={handleSubmit}>
-        <FormRow label={formatMessage(labels.window)}>
-          <FormInput
-            name="window"
-            rules={{ required: formatMessage(labels.required), pattern: /[0-9]+/ }}
-          >
-            <TextField autoComplete="off" />
-          </FormInput>
-        </FormRow>
-        <FormRow label={formatMessage(labels.urls)} action={<AddUrlButton onClick={showAddForm} />}>
-          <div className={styles.urls}>
-            {parameters?.urls?.map((url, index) => {
-              return (
-                <div key={index} className={styles.url}>
-                  <Text>{url}</Text>
-                  <Tooltip
-                    className={styles.icon}
-                    label={formatMessage(labels.remove)}
-                    position="right"
-                  >
-                    <Icon onClick={handleRemoveUrl.bind(null, index)}>
-                      <Icons.Close />
-                    </Icon>
-                  </Tooltip>
-                </div>
-              );
-            })}
-          </div>
-        </FormRow>
-        <FormButtons>
-          <SubmitButton variant="primary" disabled={queryDisabled} loading={isRunning}>
-            {formatMessage(labels.runQuery)}
-          </SubmitButton>
-        </FormButtons>
-      </Form>
-      {show && (
-        <Modal onClose={hideAddForm}>
-          <AddUrlForm onSave={handleAddUrl} onClose={hideAddForm} />
-        </Modal>
-      )}
-    </>
+    <Form ref={ref} values={parameters} onSubmit={handleSubmit}>
+      <BaseParameters />
+      <FormRow label={formatMessage(labels.window)}>
+        <FormInput
+          name="window"
+          rules={{ required: formatMessage(labels.required), pattern: /[0-9]+/ }}
+        >
+          <TextField autoComplete="off" />
+        </FormInput>
+      </FormRow>
+      <FormRow label={formatMessage(labels.urls)} action={<AddUrlButton onAdd={handleAddUrl} />}>
+        <div className={styles.urls}>
+          {parameters?.urls?.map((url, index) => {
+            return (
+              <div key={index} className={styles.url}>
+                <Text>{url}</Text>
+                <Tooltip
+                  className={styles.icon}
+                  label={formatMessage(labels.remove)}
+                  position="right"
+                >
+                  <Icon onClick={handleRemoveUrl.bind(null, index)}>
+                    <Icons.Close />
+                  </Icon>
+                </Tooltip>
+              </div>
+            );
+          })}
+        </div>
+      </FormRow>
+      <FormButtons>
+        <SubmitButton variant="primary" disabled={queryDisabled} loading={isRunning}>
+          {formatMessage(labels.runQuery)}
+        </SubmitButton>
+      </FormButtons>
+    </Form>
   );
 }
 
-function AddUrlButton({ onClick }) {
+function AddUrlButton({ onAdd }) {
   const { formatMessage, labels } = useMessages();
 
   return (
-    <Tooltip label={formatMessage(labels.addUrl)}>
-      <Icon onClick={onClick}>
-        <Icons.Plus />
-      </Icon>
-    </Tooltip>
+    <PopupTrigger>
+      <Tooltip label={formatMessage(labels.addUrl)}>
+        <Icon>
+          <Icons.Plus />
+        </Icon>
+      </Tooltip>
+      <Popup position="bottom" alignment="start">
+        {close => {
+          return <UrlAddForm onSave={onAdd} onClose={close} />;
+        }}
+      </Popup>
+    </PopupTrigger>
   );
 }
 
diff --git a/components/pages/reports/funnel/FunnelReport.js b/components/pages/reports/funnel/FunnelReport.js
index 26a81a09..7b4d8ece 100644
--- a/components/pages/reports/funnel/FunnelReport.js
+++ b/components/pages/reports/funnel/FunnelReport.js
@@ -1,17 +1,15 @@
-import { useContext } from 'react';
 import FunnelChart from './FunnelChart';
 import FunnelTable from './FunnelTable';
 import FunnelParameters from './FunnelParameters';
-import Report, { ReportContext } from '../Report';
+import Report from '../Report';
 import ReportHeader from '../ReportHeader';
 import ReportMenu from '../ReportMenu';
 import ReportBody from '../ReportBody';
 import Funnel from 'assets/funnel.svg';
-import { useReport } from 'hooks';
 
 const defaultParameters = {
   type: 'funnel',
-  parameters: { window: 60, urls: ['/', '/docs'] },
+  parameters: { window: 60, urls: [] },
 };
 
 export default function FunnelReport({ reportId }) {
diff --git a/components/pages/reports/funnel/AddUrlForm.js b/components/pages/reports/funnel/UrlAddForm.js
similarity index 85%
rename from components/pages/reports/funnel/AddUrlForm.js
rename to components/pages/reports/funnel/UrlAddForm.js
index 07f34867..b9d25f29 100644
--- a/components/pages/reports/funnel/AddUrlForm.js
+++ b/components/pages/reports/funnel/UrlAddForm.js
@@ -1,8 +1,9 @@
 import { useState } from 'react';
 import { useMessages } from 'hooks';
 import { Button, Form, FormButtons, FormRow, TextField } from 'react-basics';
+import styles from './UrlAddForm.module.css';
 
-export function AddUrlForm({ defaultValue = '', onSave, onClose }) {
+export function UrlAddForm({ defaultValue = '', onSave, onClose }) {
   const [url, setUrl] = useState(defaultValue);
   const { formatMessage, labels } = useMessages();
 
@@ -22,7 +23,7 @@ export function AddUrlForm({ defaultValue = '', onSave, onClose }) {
   };
 
   return (
-    <Form>
+    <Form className={styles.form}>
       <FormRow label={formatMessage(labels.url)}>
         <TextField
           name="url"
@@ -42,4 +43,4 @@ export function AddUrlForm({ defaultValue = '', onSave, onClose }) {
   );
 }
 
-export default AddUrlForm;
+export default UrlAddForm;
diff --git a/components/pages/reports/funnel/UrlAddForm.module.css b/components/pages/reports/funnel/UrlAddForm.module.css
new file mode 100644
index 00000000..4674ad70
--- /dev/null
+++ b/components/pages/reports/funnel/UrlAddForm.module.css
@@ -0,0 +1,8 @@
+.form {
+  background: var(--base50);
+  padding: 30px;
+  margin-top: 10px;
+  border: 1px solid var(--base400);
+  border-radius: var(--border-radius);
+  box-shadow: 0 0 0 5px rgba(0, 0, 0, 0.1);
+}
diff --git a/hooks/useLocale.js b/hooks/useLocale.js
index 1279cea9..86ca9904 100644
--- a/hooks/useLocale.js
+++ b/hooks/useLocale.js
@@ -1,6 +1,6 @@
 import { useEffect } from 'react';
 import { useRouter } from 'next/router';
-import { get, setItem } from 'next-basics';
+import { httpGet, setItem } from 'next-basics';
 import { LOCALE_CONFIG } from 'lib/constants';
 import { getDateLocale, getTextDirection } from 'lib/lang';
 import useStore, { setLocale } from 'store/app';
@@ -21,7 +21,7 @@ export function useLocale() {
   const dateLocale = getDateLocale(locale);
 
   async function loadMessages(locale) {
-    const { ok, data } = await get(`${basePath}/intl/messages/${locale}.json`);
+    const { ok, data } = await httpGet(`${basePath}/intl/messages/${locale}.json`);
 
     if (ok) {
       messages[locale] = data;
diff --git a/lib/constants.ts b/lib/constants.ts
index 9edbe100..b9d99b30 100644
--- a/lib/constants.ts
+++ b/lib/constants.ts
@@ -69,6 +69,14 @@ export const DYNAMIC_DATA_TYPE = {
   array: 5,
 } as const;
 
+export const DATA_TYPES = {
+  [DYNAMIC_DATA_TYPE.string]: 'string',
+  [DYNAMIC_DATA_TYPE.number]: 'number',
+  [DYNAMIC_DATA_TYPE.boolean]: 'boolean',
+  [DYNAMIC_DATA_TYPE.date]: 'date',
+  [DYNAMIC_DATA_TYPE.array]: 'array',
+};
+
 export const KAFKA_TOPIC = {
   event: 'event',
   eventData: 'event_data',
diff --git a/package.json b/package.json
index 1eb7aa5a..8e03a3a9 100644
--- a/package.json
+++ b/package.json
@@ -95,7 +95,7 @@
     "node-fetch": "^3.2.8",
     "npm-run-all": "^4.1.5",
     "react": "^18.2.0",
-    "react-basics": "^0.82.0",
+    "react-basics": "^0.83.0",
     "react-beautiful-dnd": "^13.1.0",
     "react-dom": "^18.2.0",
     "react-error-boundary": "^4.0.4",
diff --git a/pages/api/reports/event-data.ts b/pages/api/reports/event-data.ts
new file mode 100644
index 00000000..65a86d1f
--- /dev/null
+++ b/pages/api/reports/event-data.ts
@@ -0,0 +1,60 @@
+import { canViewWebsite } from 'lib/auth';
+import { useCors, useAuth } from 'lib/middleware';
+import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { ok, methodNotAllowed, unauthorized } from 'next-basics';
+import { getEventDataFields } from 'queries/analytics/eventData/getEventDataFields';
+
+export interface EventDataRequestBody {
+  websiteId: string;
+  urls: string[];
+  window: number;
+  dateRange: {
+    startDate: string;
+    endDate: string;
+  };
+}
+
+export interface EventDataResponse {
+  urls: string[];
+  window: number;
+  startAt: number;
+  endAt: number;
+}
+
+export default async (
+  req: NextApiRequestQueryBody<any, EventDataRequestBody>,
+  res: NextApiResponse<EventDataResponse>,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+
+  if (req.method === 'GET') {
+    const { websiteId, startAt, endAt } = req.query;
+
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const data = await getEventDataFields(websiteId, new Date(+startAt), new Date(+endAt));
+
+    return ok(res, data);
+  }
+
+  if (req.method === 'POST') {
+    const {
+      websiteId,
+      dateRange: { startDate, endDate },
+    } = req.body;
+
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const data = {};
+
+    return ok(res, data);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/queries/analytics/eventData/getEventDataFields.ts b/queries/analytics/eventData/getEventDataFields.ts
new file mode 100644
index 00000000..5d2b9ef0
--- /dev/null
+++ b/queries/analytics/eventData/getEventDataFields.ts
@@ -0,0 +1,48 @@
+import clickhouse from 'lib/clickhouse';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import prisma from 'lib/prisma';
+import { WebsiteEventDataMetric } from 'lib/types';
+import { loadWebsite } from 'lib/query';
+
+export async function getEventDataFields(
+  ...args: [websiteId: string, startDate: Date, endDate: Date]
+): Promise<WebsiteEventDataMetric[]> {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(websiteId: string, startDate: Date, endDate: Date) {
+  const { toUuid, rawQuery } = prisma;
+  const website = await loadWebsite(websiteId);
+  const resetDate = new Date(website?.resetAt || website?.createdAt);
+  const params: any = [websiteId, resetDate, startDate, endDate];
+
+  return rawQuery(
+    `select
+        distinct event_key as eventKey, data_type as eventDataType
+    from event_data
+    where website_id = $1${toUuid()}
+      and created_at >= $2
+      and created_at between $3 and $4`,
+    params,
+  );
+}
+
+async function clickhouseQuery(websiteId: string, startDate: Date, endDate: Date) {
+  const { rawQuery, getDateFormat, getBetweenDates } = clickhouse;
+  const website = await loadWebsite(websiteId);
+  const resetDate = new Date(website?.resetAt || website?.createdAt);
+  const params = { websiteId };
+
+  return rawQuery(
+    `select
+        distinct event_key as eventKey, data_type as eventDataType
+    from event_data
+    where website_id = {websiteId:UUID}
+      and created_at >= ${getDateFormat(resetDate)}
+      and ${getBetweenDates('created_at', startDate, endDate)}`,
+    params,
+  );
+}
diff --git a/queries/analytics/session/saveSessionData.ts b/queries/analytics/session/saveSessionData.ts
index 76842b4f..beec27f7 100644
--- a/queries/analytics/session/saveSessionData.ts
+++ b/queries/analytics/session/saveSessionData.ts
@@ -37,7 +37,7 @@ export async function saveSessionData(data: {
       },
     }),
     client.sessionData.createMany({
-      data: flattendData,
+      data: flattendData as any,
     }),
   ]);
 }
diff --git a/queries/index.js b/queries/index.js
index 302c88db..8a4b42bf 100644
--- a/queries/index.js
+++ b/queries/index.js
@@ -7,6 +7,7 @@ export * from './analytics/event/getEventMetrics';
 export * from './analytics/event/getEventUsage';
 export * from './analytics/event/getEvents';
 export * from './analytics/eventData/getEventData';
+export * from './analytics/eventData/getEventDataFields';
 export * from './analytics/eventData/getEventDataUsage';
 export * from './analytics/event/saveEvent';
 export * from './analytics/pageview/getPageviewFunnel';
diff --git a/yarn.lock b/yarn.lock
index e7d7e8e1..579d52af 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8191,10 +8191,10 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-basics@^0.82.0:
-  version "0.82.0"
-  resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.82.0.tgz#1df241f4ef97a8d0c7c81d4954d065efc2c415a5"
-  integrity sha512-DrHuRJqncx7cWYFz4rAahEsCsF3s5W1CJyJY276EUphfn0NDKZcvnrSnr6G+KTUAEkvksvlAm1t3nDv85coUxg==
+react-basics@^0.83.0:
+  version "0.83.0"
+  resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.83.0.tgz#bc4a962967383ecec20a0eb49b88c004c67a7f3a"
+  integrity sha512-3P74I1Tp8Ih8gw3xG65mB0aTzG0oTOYg72Gpfbd3igKjg/L1wgN6stWjIwzNP7mgWFc0FQ63BB13P7pL025bNQ==
   dependencies:
     classnames "^2.3.1"
     date-fns "^2.29.3"

From 64c6d73b77c7f6b1d8081c8c7d6aed80d7d87515 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Mon, 5 Jun 2023 03:08:43 -0700
Subject: [PATCH 65/88] Update report parameters.

---
 components/input/WebsiteSelect.js             |  1 -
 components/layout/PageHeader.js               |  2 +-
 components/layout/PageHeader.module.css       |  2 +-
 components/messages.js                        |  4 +-
 components/pages/reports/BaseParameters.js    |  2 +-
 components/pages/reports/ReportHeader.js      | 55 ++++++++++---------
 .../pages/reports/ReportHeader.module.css     |  3 +
 .../pages/reports/funnel/FunnelParameters.js  |  6 +-
 components/pages/reports/funnel/UrlAddForm.js |  8 +--
 components/pages/reports/reports.module.css   |  1 +
 10 files changed, 44 insertions(+), 40 deletions(-)
 create mode 100644 components/pages/reports/ReportHeader.module.css

diff --git a/components/input/WebsiteSelect.js b/components/input/WebsiteSelect.js
index a0ac38e4..b77ae57c 100644
--- a/components/input/WebsiteSelect.js
+++ b/components/input/WebsiteSelect.js
@@ -19,7 +19,6 @@ export function WebsiteSelect({ websiteId, onSelect }) {
       onChange={onSelect}
       alignment="end"
       placeholder={formatMessage(labels.selectWebsite)}
-      style={{ width: 200 }}
     >
       {({ id, name }) => <Item key={id}>{name}</Item>}
     </Dropdown>
diff --git a/components/layout/PageHeader.js b/components/layout/PageHeader.js
index c01192d2..f1363140 100644
--- a/components/layout/PageHeader.js
+++ b/components/layout/PageHeader.js
@@ -5,7 +5,7 @@ import styles from './PageHeader.module.css';
 export function PageHeader({ title, children, className }) {
   return (
     <div className={classNames(styles.header, className)}>
-      <div className={styles.title}>{title}</div>
+      {title && <div className={styles.title}>{title}</div>}
       <div className={styles.actions}>{children}</div>
     </div>
   );
diff --git a/components/layout/PageHeader.module.css b/components/layout/PageHeader.module.css
index 5ea85b70..03a1c7c8 100644
--- a/components/layout/PageHeader.module.css
+++ b/components/layout/PageHeader.module.css
@@ -4,7 +4,6 @@
   align-items: center;
   align-content: center;
   align-self: stretch;
-  margin-bottom: 40px;
   flex-wrap: wrap;
 }
 
@@ -23,6 +22,7 @@
   font-weight: 700;
   gap: 20px;
   height: 60px;
+  flex: 1;
 }
 
 .actions {
diff --git a/components/messages.js b/components/messages.js
index bcb2a5c1..166a121b 100644
--- a/components/messages.js
+++ b/components/messages.js
@@ -48,6 +48,8 @@ export const labels = defineMessages({
   deleteWebsite: { id: 'label.delete-website', defaultMessage: 'Delete website' },
   reset: { id: 'label.reset', defaultMessage: 'Reset' },
   addWebsite: { id: 'label.add-website', defaultMessage: 'Add website' },
+  addField: { id: 'label.add-field', defaultMessage: 'Add field' },
+  addDescription: { id: 'label.add-description', defaultMessage: 'Add description' },
   changePassword: { id: 'label.change-password', defaultMessage: 'Change password' },
   currentPassword: { id: 'label.current-password', defaultMessage: 'Current password' },
   newPassword: { id: 'label.new-password', defaultMessage: 'New password' },
@@ -129,8 +131,8 @@ export const labels = defineMessages({
   window: { id: 'label.window', defaultMessage: 'Window' },
   addUrl: { id: 'label.add-url', defaultMessage: 'Add URL' },
   runQuery: { id: 'label.run-query', defaultMessage: 'Run query' },
+  field: { id: 'label.field', defaultMessage: 'Field' },
   fields: { id: 'label.fields', defaultMessage: 'Fields' },
-  addField: { id: 'label.add-field', defaultMessage: 'Add field' },
 });
 
 export const messages = defineMessages({
diff --git a/components/pages/reports/BaseParameters.js b/components/pages/reports/BaseParameters.js
index 2d04f228..5dbe0f60 100644
--- a/components/pages/reports/BaseParameters.js
+++ b/components/pages/reports/BaseParameters.js
@@ -15,7 +15,7 @@ export function BaseParameters() {
   const { value, startDate, endDate } = dateRange || {};
 
   const handleWebsiteSelect = websiteId => {
-    updateReport({ parameters: { websiteId } });
+    updateReport({ websiteId, parameters: { websiteId } });
   };
 
   const handleDateChange = value => {
diff --git a/components/pages/reports/ReportHeader.js b/components/pages/reports/ReportHeader.js
index 08465ef9..b8104203 100644
--- a/components/pages/reports/ReportHeader.js
+++ b/components/pages/reports/ReportHeader.js
@@ -1,13 +1,11 @@
 import { useContext } from 'react';
 import { useRouter } from 'next/router';
-import { Flexbox, Icon, LoadingButton, InlineEditField, useToast } from 'react-basics';
-import WebsiteSelect from 'components/input/WebsiteSelect';
+import { Icon, LoadingButton, InlineEditField, useToast } from 'react-basics';
 import PageHeader from 'components/layout/PageHeader';
-import DateFilter from 'components/input/DateFilter';
-import { parseDateRange } from 'lib/date';
 import { useMessages, useApi } from 'hooks';
 import { ReportContext } from './Report';
-import styles from './reports.module.css';
+import styles from './ReportHeader.module.css';
+import reportStyles from './reports.module.css';
 
 export function ReportHeader({ icon }) {
   const { report, updateReport } = useContext(ReportContext);
@@ -20,17 +18,8 @@ export function ReportHeader({ icon }) {
     post(`/reports/${data.id}`, data),
   );
 
-  const { name, parameters } = report || {};
+  const { name, description, parameters } = report || {};
   const { websiteId, dateRange } = parameters || {};
-  const { value, startDate, endDate } = dateRange || {};
-
-  const handleWebsiteSelect = websiteId => {
-    updateReport({ parameters: { websiteId } });
-  };
-
-  const handleDateChange = value => {
-    updateReport({ parameters: { dateRange: { ...parseDateRange(value) } } });
-  };
 
   const handleSave = async () => {
     if (!report.id) {
@@ -53,27 +42,41 @@ export function ReportHeader({ icon }) {
     updateReport({ name });
   };
 
+  const handleDescriptionChange = description => {
+    updateReport({ description });
+  };
+
   const Title = () => {
     return (
       <>
         <Icon size="lg">{icon}</Icon>
-        <InlineEditField value={name} onCommit={handleNameChange} />
+        <InlineEditField name="name" value={name} onCommit={handleNameChange} />
       </>
     );
   };
 
   return (
-    <PageHeader title={<Title />} className={styles.header}>
-      <LoadingButton
-        variant="primary"
-        loading={isCreating || isUpdating}
-        disabled={!websiteId || !value}
-        onClick={handleSave}
-      >
-        {formatMessage(labels.save)}
-      </LoadingButton>
+    <div className={reportStyles.header}>
+      <PageHeader title={<Title />}>
+        <LoadingButton
+          variant="primary"
+          loading={isCreating || isUpdating}
+          disabled={!websiteId || !dateRange?.value || !name}
+          onClick={handleSave}
+        >
+          {formatMessage(labels.save)}
+        </LoadingButton>
+      </PageHeader>
+      <div className={styles.description}>
+        <InlineEditField
+          name="description"
+          value={description}
+          placeholder={`+ ${formatMessage(labels.addDescription)}`}
+          onCommit={handleDescriptionChange}
+        />
+      </div>
       {toast}
-    </PageHeader>
+    </div>
   );
 }
 
diff --git a/components/pages/reports/ReportHeader.module.css b/components/pages/reports/ReportHeader.module.css
new file mode 100644
index 00000000..01e483a0
--- /dev/null
+++ b/components/pages/reports/ReportHeader.module.css
@@ -0,0 +1,3 @@
+.description {
+  color: var(--font-color300);
+}
diff --git a/components/pages/reports/funnel/FunnelParameters.js b/components/pages/reports/funnel/FunnelParameters.js
index 991bf690..cf22f19c 100644
--- a/components/pages/reports/funnel/FunnelParameters.js
+++ b/components/pages/reports/funnel/FunnelParameters.js
@@ -28,8 +28,10 @@ export function FunnelParameters() {
   const { websiteId, dateRange, urls } = parameters || {};
   const queryDisabled = !websiteId || !dateRange || urls?.length < 2;
 
-  const handleSubmit = values => {
-    runReport(values);
+  const handleSubmit = data => {
+    if (!queryDisabled) {
+      runReport(data);
+    }
   };
 
   const handleAddUrl = url => {
diff --git a/components/pages/reports/funnel/UrlAddForm.js b/components/pages/reports/funnel/UrlAddForm.js
index b9d25f29..17d19a91 100644
--- a/components/pages/reports/funnel/UrlAddForm.js
+++ b/components/pages/reports/funnel/UrlAddForm.js
@@ -17,13 +17,8 @@ export function UrlAddForm({ defaultValue = '', onSave, onClose }) {
     setUrl(e.target.value);
   };
 
-  const handleClose = () => {
-    setUrl('');
-    onClose();
-  };
-
   return (
-    <Form className={styles.form}>
+    <Form className={styles.form} onSubmit={handleSave}>
       <FormRow label={formatMessage(labels.url)}>
         <TextField
           name="url"
@@ -37,7 +32,6 @@ export function UrlAddForm({ defaultValue = '', onSave, onClose }) {
         <Button variant="primary" onClick={handleSave}>
           {formatMessage(labels.save)}
         </Button>
-        <Button onClick={handleClose}>{formatMessage(labels.cancel)}</Button>
       </FormButtons>
     </Form>
   );
diff --git a/components/pages/reports/reports.module.css b/components/pages/reports/reports.module.css
index b75aee64..6fa54281 100644
--- a/components/pages/reports/reports.module.css
+++ b/components/pages/reports/reports.module.css
@@ -7,6 +7,7 @@
 .header {
   grid-row: 1 / 2;
   grid-column: 1 / 3;
+  margin-bottom: 40px;
 }
 
 .menu {

From 6ee27affc4dfa93640cd7a2b8ab2f62de8a111ed Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Tue, 13 Jun 2023 11:59:12 -0700
Subject: [PATCH 66/88] Added new react basics provider.

---
 components/pages/reports/ReportHeader.js      |  5 +-
 .../settings/profile/PasswordChangeButton.js  |  5 +-
 .../pages/settings/teams/TeamMembers.js       |  5 +-
 .../pages/settings/teams/TeamSettings.js      |  5 +-
 .../pages/settings/teams/TeamWebsites.js      |  5 +-
 components/pages/settings/teams/TeamsList.js  |  5 +-
 .../pages/settings/users/UserSettings.js      |  5 +-
 components/pages/settings/users/UsersList.js  |  5 +-
 .../settings/websites/WebsiteSettings.js      |  5 +-
 .../pages/settings/websites/WebsitesList.js   |  5 +-
 package.json                                  |  2 +-
 pages/_app.js                                 | 65 ++++++++++---------
 yarn.lock                                     |  8 +--
 13 files changed, 59 insertions(+), 66 deletions(-)

diff --git a/components/pages/reports/ReportHeader.js b/components/pages/reports/ReportHeader.js
index b8104203..805e45b6 100644
--- a/components/pages/reports/ReportHeader.js
+++ b/components/pages/reports/ReportHeader.js
@@ -1,6 +1,6 @@
 import { useContext } from 'react';
 import { useRouter } from 'next/router';
-import { Icon, LoadingButton, InlineEditField, useToast } from 'react-basics';
+import { Icon, LoadingButton, InlineEditField, useToasts } from 'react-basics';
 import PageHeader from 'components/layout/PageHeader';
 import { useMessages, useApi } from 'hooks';
 import { ReportContext } from './Report';
@@ -10,7 +10,7 @@ import reportStyles from './reports.module.css';
 export function ReportHeader({ icon }) {
   const { report, updateReport } = useContext(ReportContext);
   const { formatMessage, labels, messages } = useMessages();
-  const { toast, showToast } = useToast();
+  const { showToast } = useToasts();
   const { post, useMutation } = useApi();
   const router = useRouter();
   const { mutate: create, isLoading: isCreating } = useMutation(data => post(`/reports`, data));
@@ -75,7 +75,6 @@ export function ReportHeader({ icon }) {
           onCommit={handleDescriptionChange}
         />
       </div>
-      {toast}
     </div>
   );
 }
diff --git a/components/pages/settings/profile/PasswordChangeButton.js b/components/pages/settings/profile/PasswordChangeButton.js
index 9aa6fdca..03bf74bc 100644
--- a/components/pages/settings/profile/PasswordChangeButton.js
+++ b/components/pages/settings/profile/PasswordChangeButton.js
@@ -1,11 +1,11 @@
-import { Button, Icon, Text, useToast, ModalTrigger, Modal } from 'react-basics';
+import { Button, Icon, Text, useToasts, ModalTrigger, Modal } from 'react-basics';
 import PasswordEditForm from 'components/pages/settings/profile/PasswordEditForm';
 import Icons from 'components/icons';
 import useMessages from 'hooks/useMessages';
 
 export function PasswordChangeButton() {
   const { formatMessage, labels, messages } = useMessages();
-  const { toast, showToast } = useToast();
+  const { showToast } = useToasts();
 
   const handleSave = () => {
     showToast({ message: formatMessage(messages.saved), variant: 'success' });
@@ -13,7 +13,6 @@ export function PasswordChangeButton() {
 
   return (
     <>
-      {toast}
       <ModalTrigger>
         <Button>
           <Icon>
diff --git a/components/pages/settings/teams/TeamMembers.js b/components/pages/settings/teams/TeamMembers.js
index 333e176d..3ea8232c 100644
--- a/components/pages/settings/teams/TeamMembers.js
+++ b/components/pages/settings/teams/TeamMembers.js
@@ -1,10 +1,10 @@
-import { Loading, useToast } from 'react-basics';
+import { Loading, useToasts } from 'react-basics';
 import TeamMembersTable from 'components/pages/settings/teams/TeamMembersTable';
 import useApi from 'hooks/useApi';
 import useMessages from 'hooks/useMessages';
 
 export function TeamMembers({ teamId, readOnly }) {
-  const { toast, showToast } = useToast();
+  const { showToast } = useToasts();
   const { get, useQuery } = useApi();
   const { formatMessage, messages } = useMessages();
   const { data, isLoading, refetch } = useQuery(['teams:users', teamId], () =>
@@ -22,7 +22,6 @@ export function TeamMembers({ teamId, readOnly }) {
 
   return (
     <>
-      {toast}
       <TeamMembersTable onSave={handleSave} data={data} readOnly={readOnly} />
     </>
   );
diff --git a/components/pages/settings/teams/TeamSettings.js b/components/pages/settings/teams/TeamSettings.js
index 1bff1289..64160578 100644
--- a/components/pages/settings/teams/TeamSettings.js
+++ b/components/pages/settings/teams/TeamSettings.js
@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { Breadcrumbs, Item, Tabs, useToast } from 'react-basics';
+import { Breadcrumbs, Item, Tabs, useToasts } from 'react-basics';
 import Link from 'next/link';
 import Page from 'components/layout/Page';
 import PageHeader from 'components/layout/PageHeader';
@@ -17,7 +17,7 @@ export function TeamSettings({ teamId }) {
   const [values, setValues] = useState(null);
   const [tab, setTab] = useState('details');
   const { get, useQuery } = useApi();
-  const { toast, showToast } = useToast();
+  const { showToast } = useToasts();
   const { data, isLoading } = useQuery(
     ['team', teamId],
     () => {
@@ -44,7 +44,6 @@ export function TeamSettings({ teamId }) {
 
   return (
     <Page loading={isLoading || !values}>
-      {toast}
       <PageHeader
         title={
           <Breadcrumbs>
diff --git a/components/pages/settings/teams/TeamWebsites.js b/components/pages/settings/teams/TeamWebsites.js
index 9ceda8d4..9a5761e5 100644
--- a/components/pages/settings/teams/TeamWebsites.js
+++ b/components/pages/settings/teams/TeamWebsites.js
@@ -7,7 +7,7 @@ import {
   Modal,
   ModalTrigger,
   Text,
-  useToast,
+  useToasts,
 } from 'react-basics';
 import TeamWebsitesTable from 'components/pages/settings/teams/TeamWebsitesTable';
 import TeamAddWebsiteForm from 'components/pages/settings/teams/TeamAddWebsiteForm';
@@ -15,7 +15,7 @@ import useApi from 'hooks/useApi';
 import useMessages from 'hooks/useMessages';
 
 export function TeamWebsites({ teamId }) {
-  const { toast, showToast } = useToast();
+  const { showToast } = useToasts();
   const { formatMessage, labels, messages } = useMessages();
   const { get, useQuery } = useApi();
   const { data, isLoading, refetch } = useQuery(['teams:websites', teamId], () =>
@@ -48,7 +48,6 @@ export function TeamWebsites({ teamId }) {
 
   return (
     <div>
-      {toast}
       <ActionForm description={formatMessage(messages.teamWebsitesInfo)}>{addButton}</ActionForm>
       {hasData && <TeamWebsitesTable teamId={teamId} data={data} onSave={handleSave} />}
     </div>
diff --git a/components/pages/settings/teams/TeamsList.js b/components/pages/settings/teams/TeamsList.js
index 73dcb17d..783696b1 100644
--- a/components/pages/settings/teams/TeamsList.js
+++ b/components/pages/settings/teams/TeamsList.js
@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import { Button, Icon, Modal, ModalTrigger, useToast, Text, Flexbox } from 'react-basics';
+import { Button, Icon, Modal, ModalTrigger, useToasts, Text, Flexbox } from 'react-basics';
 import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
 import TeamAddForm from 'components/pages/settings/teams/TeamAddForm';
 import PageHeader from 'components/layout/PageHeader';
@@ -16,7 +16,7 @@ export default function TeamsList() {
   const { get, useQuery } = useApi();
   const { data, isLoading, error } = useQuery(['teams', update], () => get(`/teams`));
   const hasData = data && data.length !== 0;
-  const { toast, showToast } = useToast();
+  const { showToast } = useToasts();
 
   const handleSave = () => {
     setUpdate(state => state + 1);
@@ -63,7 +63,6 @@ export default function TeamsList() {
 
   return (
     <Page loading={isLoading} error={error}>
-      {toast}
       <PageHeader title={formatMessage(labels.teams)}>
         {hasData && (
           <Flexbox gap={10}>
diff --git a/components/pages/settings/users/UserSettings.js b/components/pages/settings/users/UserSettings.js
index cd3bea42..d703e964 100644
--- a/components/pages/settings/users/UserSettings.js
+++ b/components/pages/settings/users/UserSettings.js
@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { Breadcrumbs, Item, Tabs, useToast } from 'react-basics';
+import { Breadcrumbs, Item, Tabs, useToasts } from 'react-basics';
 import Link from 'next/link';
 import UserEditForm from 'components/pages/settings/users//UserEditForm';
 import Page from 'components/layout/Page';
@@ -14,7 +14,7 @@ export function UserSettings({ userId }) {
   const [values, setValues] = useState(null);
   const [tab, setTab] = useState('details');
   const { get, useQuery } = useApi();
-  const { toast, showToast } = useToast();
+  const { showToast } = useToasts();
   const { data, isLoading } = useQuery(
     ['user', userId],
     () => {
@@ -44,7 +44,6 @@ export function UserSettings({ userId }) {
 
   return (
     <Page loading={isLoading || !values}>
-      {toast}
       <PageHeader
         title={
           <Breadcrumbs>
diff --git a/components/pages/settings/users/UsersList.js b/components/pages/settings/users/UsersList.js
index 1605cb51..8886203b 100644
--- a/components/pages/settings/users/UsersList.js
+++ b/components/pages/settings/users/UsersList.js
@@ -1,4 +1,4 @@
-import { useToast } from 'react-basics';
+import { useToasts } from 'react-basics';
 import Page from 'components/layout/Page';
 import PageHeader from 'components/layout/PageHeader';
 import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
@@ -15,7 +15,7 @@ export function UsersList() {
   const { data, isLoading, error, refetch } = useQuery(['user'], () => get(`/users`), {
     enabled: !!user,
   });
-  const { toast, showToast } = useToast();
+  const { showToast } = useToasts();
   const hasData = data && data.length !== 0;
 
   const handleSave = () => {
@@ -30,7 +30,6 @@ export function UsersList() {
 
   return (
     <Page loading={isLoading} error={error}>
-      {toast}
       <PageHeader title={formatMessage(labels.users)}>
         <UserAddButton onSave={handleSave} />
       </PageHeader>
diff --git a/components/pages/settings/websites/WebsiteSettings.js b/components/pages/settings/websites/WebsiteSettings.js
index 0a70a731..5a96fa8c 100644
--- a/components/pages/settings/websites/WebsiteSettings.js
+++ b/components/pages/settings/websites/WebsiteSettings.js
@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { Breadcrumbs, Item, Tabs, useToast, Button, Text, Icon, Icons } from 'react-basics';
+import { Breadcrumbs, Item, Tabs, useToasts, Button, Text, Icon, Icons } from 'react-basics';
 import { useRouter } from 'next/router';
 import Link from 'next/link';
 import Page from 'components/layout/Page';
@@ -17,7 +17,7 @@ export function WebsiteSettings({ websiteId }) {
   const { formatMessage, labels, messages } = useMessages();
   const { openExternal } = useConfig();
   const { get, useQuery } = useApi();
-  const { toast, showToast } = useToast();
+  const { showToast } = useToasts();
   const { data, isLoading } = useQuery(
     ['website', websiteId],
     () => get(`/websites/${websiteId}`),
@@ -51,7 +51,6 @@ export function WebsiteSettings({ websiteId }) {
 
   return (
     <Page loading={isLoading || !values}>
-      {toast}
       <PageHeader
         title={
           <Breadcrumbs>
diff --git a/components/pages/settings/websites/WebsitesList.js b/components/pages/settings/websites/WebsitesList.js
index 84f96c83..23abd897 100644
--- a/components/pages/settings/websites/WebsitesList.js
+++ b/components/pages/settings/websites/WebsitesList.js
@@ -1,4 +1,4 @@
-import { Button, Icon, Text, Modal, ModalTrigger, useToast, Icons } from 'react-basics';
+import { Button, Icon, Text, Modal, ModalTrigger, useToasts, Icons } from 'react-basics';
 import Page from 'components/layout/Page';
 import PageHeader from 'components/layout/PageHeader';
 import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
@@ -17,7 +17,7 @@ export function WebsitesList() {
     () => get(`/users/${user?.id}/websites`),
     { enabled: !!user },
   );
-  const { toast, showToast } = useToast();
+  const { showToast } = useToasts();
   const hasData = data && data.length !== 0;
 
   const handleSave = async () => {
@@ -41,7 +41,6 @@ export function WebsitesList() {
 
   return (
     <Page loading={isLoading} error={error}>
-      {toast}
       <PageHeader title={formatMessage(labels.websites)}>{addButton}</PageHeader>
       {hasData && <WebsitesTable data={data} />}
       {!hasData && (
diff --git a/package.json b/package.json
index 8e03a3a9..5cfc9823 100644
--- a/package.json
+++ b/package.json
@@ -95,7 +95,7 @@
     "node-fetch": "^3.2.8",
     "npm-run-all": "^4.1.5",
     "react": "^18.2.0",
-    "react-basics": "^0.83.0",
+    "react-basics": "^0.84.0",
     "react-beautiful-dnd": "^13.1.0",
     "react-dom": "^18.2.0",
     "react-error-boundary": "^4.0.4",
diff --git a/pages/_app.js b/pages/_app.js
index 22458215..8d549773 100644
--- a/pages/_app.js
+++ b/pages/_app.js
@@ -1,5 +1,6 @@
 import { IntlProvider } from 'react-intl';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { ReactBasicsProvider } from 'react-basics';
 import Head from 'next/head';
 import Script from 'next/script';
 import { useRouter } from 'next/router';
@@ -42,37 +43,39 @@ export default function App({ Component, pageProps }) {
         textComponent={Wrapper}
         onError={() => null}
       >
-        <ErrorBoundary>
-          <Head>
-            <link rel="icon" href={`${basePath}/favicon.ico`} />
-            <link
-              rel="apple-touch-icon"
-              sizes="180x180"
-              href={`${basePath}/apple-touch-icon.png`}
-            />
-            <link
-              rel="icon"
-              type="image/png"
-              sizes="32x32"
-              href={`${basePath}/favicon-32x32.png`}
-            />
-            <link
-              rel="icon"
-              type="image/png"
-              sizes="16x16"
-              href={`${basePath}/favicon-16x16.png`}
-            />
-            <link rel="manifest" href={`${basePath}/site.webmanifest`} />
-            <link rel="mask-icon" href={`${basePath}/safari-pinned-tab.svg`} color="#5bbad5" />
-            <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>
-          <Component {...pageProps} />
-          {!pathname.includes('/share/') && <Script src={`${basePath}/telemetry.js`} />}
-        </ErrorBoundary>
+        <ReactBasicsProvider>
+          <ErrorBoundary>
+            <Head>
+              <link rel="icon" href={`${basePath}/favicon.ico`} />
+              <link
+                rel="apple-touch-icon"
+                sizes="180x180"
+                href={`${basePath}/apple-touch-icon.png`}
+              />
+              <link
+                rel="icon"
+                type="image/png"
+                sizes="32x32"
+                href={`${basePath}/favicon-32x32.png`}
+              />
+              <link
+                rel="icon"
+                type="image/png"
+                sizes="16x16"
+                href={`${basePath}/favicon-16x16.png`}
+              />
+              <link rel="manifest" href={`${basePath}/site.webmanifest`} />
+              <link rel="mask-icon" href={`${basePath}/safari-pinned-tab.svg`} color="#5bbad5" />
+              <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>
+            <Component {...pageProps} />
+            {!pathname.includes('/share/') && <Script src={`${basePath}/telemetry.js`} />}
+          </ErrorBoundary>
+        </ReactBasicsProvider>
       </IntlProvider>
     </QueryClientProvider>
   );
diff --git a/yarn.lock b/yarn.lock
index 579d52af..aa847d57 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8191,10 +8191,10 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-basics@^0.83.0:
-  version "0.83.0"
-  resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.83.0.tgz#bc4a962967383ecec20a0eb49b88c004c67a7f3a"
-  integrity sha512-3P74I1Tp8Ih8gw3xG65mB0aTzG0oTOYg72Gpfbd3igKjg/L1wgN6stWjIwzNP7mgWFc0FQ63BB13P7pL025bNQ==
+react-basics@^0.84.0:
+  version "0.84.0"
+  resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.84.0.tgz#cfea2ae6b64d9318406a0c6cf0d5d9e8a0790a28"
+  integrity sha512-QWnUkw7kVbBK0Z1xvvsNgrUBlUI0FzL39jQAZR5EutE83BlkAtYeisXooPZk3PJuGHZzJvY6+JzMYmvALLjqnQ==
   dependencies:
     classnames "^2.3.1"
     date-fns "^2.29.3"

From a00972748fcd5333f1c02417e76d94cf3c8c1073 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Wed, 14 Jun 2023 22:32:06 -0700
Subject: [PATCH 67/88] remove >= website created at logic

---
 lib/constants.ts                                  | 1 +
 queries/analytics/event/getEventMetrics.ts        | 6 +++---
 queries/analytics/eventData/getEventData.ts       | 5 +++--
 queries/analytics/eventData/getEventDataFields.ts | 5 +++--
 queries/analytics/pageview/getPageviewMetrics.ts  | 6 +++---
 queries/analytics/pageview/getPageviewStats.ts    | 6 +++---
 queries/analytics/session/getSessionMetrics.ts    | 6 +++---
 queries/analytics/stats/getWebsiteStats.ts        | 6 +++---
 8 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/lib/constants.ts b/lib/constants.ts
index b9d99b30..15b2444d 100644
--- a/lib/constants.ts
+++ b/lib/constants.ts
@@ -18,6 +18,7 @@ export const DEFAULT_THEME = 'light';
 export const DEFAULT_ANIMATION_DURATION = 300;
 export const DEFAULT_DATE_RANGE = '24hour';
 export const DEFAULT_WEBSITE_LIMIT = 10;
+export const DEFAULT_CREATED_AT = '2000-01-01';
 
 export const REALTIME_RANGE = 30;
 export const REALTIME_INTERVAL = 5000;
diff --git a/queries/analytics/event/getEventMetrics.ts b/queries/analytics/event/getEventMetrics.ts
index 32c4c3d0..ea05dae4 100644
--- a/queries/analytics/event/getEventMetrics.ts
+++ b/queries/analytics/event/getEventMetrics.ts
@@ -2,7 +2,7 @@ import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
 import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
 import { WebsiteEventMetric } from 'lib/types';
-import { EVENT_TYPE } from 'lib/constants';
+import { DEFAULT_CREATED_AT, EVENT_TYPE } from 'lib/constants';
 import { loadWebsite } from 'lib/query';
 
 export async function getEventMetrics(
@@ -47,7 +47,7 @@ async function relationalQuery(
 ) {
   const { toUuid, rawQuery, getDateQuery, getFilterQuery } = prisma;
   const website = await loadWebsite(websiteId);
-  const resetDate = new Date(website?.resetAt || website?.createdAt);
+  const resetDate = new Date(website?.resetAt || DEFAULT_CREATED_AT);
   const params: any = [websiteId, resetDate, startDate, endDate];
   const filterQuery = getFilterQuery(filters, params);
 
@@ -89,7 +89,7 @@ async function clickhouseQuery(
 ) {
   const { rawQuery, getDateQuery, getDateFormat, getBetweenDates, getFilterQuery } = clickhouse;
   const website = await loadWebsite(websiteId);
-  const resetDate = new Date(website?.resetAt || website?.createdAt);
+  const resetDate = new Date(website?.resetAt || DEFAULT_CREATED_AT);
   const params = { websiteId };
 
   return rawQuery(
diff --git a/queries/analytics/eventData/getEventData.ts b/queries/analytics/eventData/getEventData.ts
index 73a71386..7369ad13 100644
--- a/queries/analytics/eventData/getEventData.ts
+++ b/queries/analytics/eventData/getEventData.ts
@@ -3,6 +3,7 @@ import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import prisma from 'lib/prisma';
 import { WebsiteEventDataMetric } from 'lib/types';
 import { loadWebsite } from 'lib/query';
+import { DEFAULT_CREATED_AT } from 'lib/constants';
 
 export async function getEventData(
   ...args: [
@@ -49,7 +50,7 @@ async function relationalQuery(
   const { startDate, endDate, timeSeries, eventName, urlPath, filters } = data;
   const { toUuid, rawQuery, getEventDataFilterQuery, getDateQuery } = prisma;
   const website = await loadWebsite(websiteId);
-  const resetDate = new Date(website?.resetAt || website?.createdAt);
+  const resetDate = new Date(website?.resetAt || DEFAULT_CREATED_AT);
   const params: any = [websiteId, resetDate, startDate, endDate, eventName || ''];
 
   return rawQuery(
@@ -99,7 +100,7 @@ async function clickhouseQuery(
   const { rawQuery, getDateFormat, getBetweenDates, getDateQuery, getEventDataFilterQuery } =
     clickhouse;
   const website = await loadWebsite(websiteId);
-  const resetDate = new Date(website?.resetAt || website?.createdAt);
+  const resetDate = new Date(website?.resetAt || DEFAULT_CREATED_AT);
   const params = { websiteId };
 
   return rawQuery(
diff --git a/queries/analytics/eventData/getEventDataFields.ts b/queries/analytics/eventData/getEventDataFields.ts
index 5d2b9ef0..43c3363a 100644
--- a/queries/analytics/eventData/getEventDataFields.ts
+++ b/queries/analytics/eventData/getEventDataFields.ts
@@ -3,6 +3,7 @@ import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import prisma from 'lib/prisma';
 import { WebsiteEventDataMetric } from 'lib/types';
 import { loadWebsite } from 'lib/query';
+import { DEFAULT_CREATED_AT } from 'lib/constants';
 
 export async function getEventDataFields(
   ...args: [websiteId: string, startDate: Date, endDate: Date]
@@ -16,7 +17,7 @@ export async function getEventDataFields(
 async function relationalQuery(websiteId: string, startDate: Date, endDate: Date) {
   const { toUuid, rawQuery } = prisma;
   const website = await loadWebsite(websiteId);
-  const resetDate = new Date(website?.resetAt || website?.createdAt);
+  const resetDate = new Date(website?.resetAt || DEFAULT_CREATED_AT);
   const params: any = [websiteId, resetDate, startDate, endDate];
 
   return rawQuery(
@@ -33,7 +34,7 @@ async function relationalQuery(websiteId: string, startDate: Date, endDate: Date
 async function clickhouseQuery(websiteId: string, startDate: Date, endDate: Date) {
   const { rawQuery, getDateFormat, getBetweenDates } = clickhouse;
   const website = await loadWebsite(websiteId);
-  const resetDate = new Date(website?.resetAt || website?.createdAt);
+  const resetDate = new Date(website?.resetAt || DEFAULT_CREATED_AT);
   const params = { websiteId };
 
   return rawQuery(
diff --git a/queries/analytics/pageview/getPageviewMetrics.ts b/queries/analytics/pageview/getPageviewMetrics.ts
index db82720d..5f575a89 100644
--- a/queries/analytics/pageview/getPageviewMetrics.ts
+++ b/queries/analytics/pageview/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 } from 'lib/constants';
+import { DEFAULT_CREATED_AT, EVENT_TYPE } from 'lib/constants';
 import { loadWebsite } from 'lib/query';
 
 export async function getPageviewMetrics(
@@ -33,7 +33,7 @@ async function relationalQuery(
   const { startDate, endDate, filters = {}, column } = criteria;
   const { rawQuery, parseFilters, toUuid } = prisma;
   const website = await loadWebsite(websiteId);
-  const resetDate = new Date(website?.resetAt || website?.createdAt);
+  const resetDate = new Date(website?.resetAt || DEFAULT_CREATED_AT);
   const params: any = [
     websiteId,
     resetDate,
@@ -80,7 +80,7 @@ async function clickhouseQuery(
   const { startDate, endDate, filters = {}, column } = criteria;
   const { rawQuery, getDateFormat, parseFilters, getBetweenDates } = clickhouse;
   const website = await loadWebsite(websiteId);
-  const resetDate = new Date(website?.resetAt || website?.createdAt);
+  const resetDate = new Date(website?.resetAt || DEFAULT_CREATED_AT);
   const params = {
     websiteId,
     eventType: column === 'event_name' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
diff --git a/queries/analytics/pageview/getPageviewStats.ts b/queries/analytics/pageview/getPageviewStats.ts
index 01e4ab14..989a6d4d 100644
--- a/queries/analytics/pageview/getPageviewStats.ts
+++ b/queries/analytics/pageview/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 { DEFAULT_CREATED_AT, EVENT_TYPE } from 'lib/constants';
 import { loadWebsite } from 'lib/query';
 
 export async function getPageviewStats(
@@ -47,7 +47,7 @@ async function relationalQuery(
   } = criteria;
   const { toUuid, getDateQuery, parseFilters, rawQuery } = prisma;
   const website = await loadWebsite(websiteId);
-  const resetDate = new Date(website?.resetAt || website?.createdAt);
+  const resetDate = new Date(website?.resetAt || DEFAULT_CREATED_AT);
   const params: any = [websiteId, resetDate, startDate, endDate];
   const { filterQuery, joinSession } = parseFilters(filters, params);
 
@@ -95,7 +95,7 @@ async function clickhouseQuery(
     getBetweenDates,
   } = clickhouse;
   const website = await loadWebsite(websiteId);
-  const resetDate = new Date(website?.resetAt || website?.createdAt);
+  const resetDate = new Date(website?.resetAt || DEFAULT_CREATED_AT);
   const params = { websiteId };
   const { filterQuery } = parseFilters(filters, params);
 
diff --git a/queries/analytics/session/getSessionMetrics.ts b/queries/analytics/session/getSessionMetrics.ts
index 57d4a736..ef8c79c5 100644
--- a/queries/analytics/session/getSessionMetrics.ts
+++ b/queries/analytics/session/getSessionMetrics.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 } from 'lib/constants';
+import { DEFAULT_CREATED_AT, EVENT_TYPE } from 'lib/constants';
 import { loadWebsite } from 'lib/query';
 
 export async function getSessionMetrics(
@@ -21,7 +21,7 @@ async function relationalQuery(
   criteria: { startDate: Date; endDate: Date; column: string; filters: object },
 ) {
   const website = await loadWebsite(websiteId);
-  const resetDate = new Date(website?.resetAt || website?.createdAt);
+  const resetDate = new Date(website?.resetAt || DEFAULT_CREATED_AT);
   const { startDate, endDate, column, filters = {} } = criteria;
   const { toUuid, parseFilters, rawQuery } = prisma;
   const params: any = [websiteId, resetDate, startDate, endDate];
@@ -55,7 +55,7 @@ async function clickhouseQuery(
   const { startDate, endDate, column, filters = {} } = data;
   const { getDateFormat, parseFilters, getBetweenDates, rawQuery } = clickhouse;
   const website = await loadWebsite(websiteId);
-  const resetDate = new Date(website?.resetAt || website?.createdAt);
+  const resetDate = new Date(website?.resetAt || DEFAULT_CREATED_AT);
   const params = { websiteId };
   const { filterQuery } = parseFilters(filters, params);
 
diff --git a/queries/analytics/stats/getWebsiteStats.ts b/queries/analytics/stats/getWebsiteStats.ts
index 0021e793..5d5a1f9a 100644
--- a/queries/analytics/stats/getWebsiteStats.ts
+++ b/queries/analytics/stats/getWebsiteStats.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 } from 'lib/constants';
+import { DEFAULT_CREATED_AT, EVENT_TYPE } from 'lib/constants';
 import { loadWebsite } from 'lib/query';
 
 export async function getWebsiteStats(
@@ -23,7 +23,7 @@ async function relationalQuery(
   const { startDate, endDate, filters = {} } = criteria;
   const { toUuid, getDateQuery, getTimestampInterval, parseFilters, rawQuery } = prisma;
   const website = await loadWebsite(websiteId);
-  const resetDate = new Date(website?.resetAt || website?.createdAt);
+  const resetDate = new Date(website?.resetAt || DEFAULT_CREATED_AT);
   const params: any = [websiteId, resetDate, startDate, endDate];
   const { filterQuery, joinSession } = parseFilters(filters, params);
 
@@ -59,7 +59,7 @@ async function clickhouseQuery(
   const { startDate, endDate, filters = {} } = criteria;
   const { rawQuery, getDateFormat, getDateQuery, getBetweenDates, parseFilters } = clickhouse;
   const website = await loadWebsite(websiteId);
-  const resetDate = new Date(website?.resetAt || website?.createdAt);
+  const resetDate = new Date(website?.resetAt || DEFAULT_CREATED_AT);
   const params = { websiteId };
   const { filterQuery } = parseFilters(filters, params);
 

From e7fef80d79b192be57e03feb49150fc88014a760 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Wed, 14 Jun 2023 23:48:11 -0700
Subject: [PATCH 68/88] Report parameters.

---
 components/pages/reports/ReportHeader.js             |  2 +-
 .../pages/reports/event-data/EventDataParameters.js  | 10 ++--------
 components/pages/reports/funnel/FunnelParameters.js  |  2 +-
 pages/api/send.ts                                    | 12 +++++-------
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/components/pages/reports/ReportHeader.js b/components/pages/reports/ReportHeader.js
index 805e45b6..0b2054d0 100644
--- a/components/pages/reports/ReportHeader.js
+++ b/components/pages/reports/ReportHeader.js
@@ -25,8 +25,8 @@ export function ReportHeader({ icon }) {
     if (!report.id) {
       create(report, {
         onSuccess: async ({ id }) => {
-          router.push(`/reports/${id}`, null, { shallow: true });
           showToast({ message: formatMessage(messages.saved), variant: 'success' });
+          router.push(`/reports/${id}`, null, { shallow: true });
         },
       });
     } else {
diff --git a/components/pages/reports/event-data/EventDataParameters.js b/components/pages/reports/event-data/EventDataParameters.js
index cbb14193..8255ae92 100644
--- a/components/pages/reports/event-data/EventDataParameters.js
+++ b/components/pages/reports/event-data/EventDataParameters.js
@@ -5,6 +5,7 @@ import { ReportContext } from 'components/pages/reports/Report';
 import NoData from 'components/common/NoData';
 import styles from './EventDataParameters.module.css';
 import { DATA_TYPES } from 'lib/constants';
+import BaseParameters from '../BaseParameters';
 
 function useFields(websiteId, startDate, endDate) {
   const { get, useQuery } = useApi();
@@ -31,16 +32,9 @@ export function EventDataParameters() {
     runReport(values);
   };
 
-  if (!websiteId || !dateRange) {
-    return null;
-  }
-
-  if (isLoading) {
-    return <Loading icon="dots" />;
-  }
-
   return (
     <Form ref={ref} values={parameters} error={error} onSubmit={handleSubmit}>
+      <BaseParameters />
       <FormRow label={formatMessage(labels.fields)}>
         <div className={styles.fields}>
           {!data?.length && <NoData />}
diff --git a/components/pages/reports/funnel/FunnelParameters.js b/components/pages/reports/funnel/FunnelParameters.js
index cf22f19c..77f0fdf5 100644
--- a/components/pages/reports/funnel/FunnelParameters.js
+++ b/components/pages/reports/funnel/FunnelParameters.js
@@ -1,4 +1,4 @@
-import { useContext, useRef, useState } from 'react';
+import { useContext, useRef } from 'react';
 import { useMessages } from 'hooks';
 import {
   Icon,
diff --git a/pages/api/send.ts b/pages/api/send.ts
index 24264fa3..ec5f55b3 100644
--- a/pages/api/send.ts
+++ b/pages/api/send.ts
@@ -61,7 +61,7 @@ export default async (req: NextApiRequestCollect, res: NextApiResponse) => {
     return forbidden(res);
   }
 
-  const { url, referrer, name: eventName, data: dynamicData, title: pageTitle } = payload;
+  const { url, referrer, name: eventName, data: eventData, title: pageTitle } = payload;
 
   await useSession(req, res);
 
@@ -96,18 +96,18 @@ export default async (req: NextApiRequestCollect, res: NextApiResponse) => {
       referrerDomain,
       pageTitle,
       eventName,
-      eventData: dynamicData,
+      eventData,
       ...session,
       sessionId: session.id,
     });
   }
 
   if (type === COLLECTION_TYPE.identify) {
-    if (!dynamicData) {
+    if (!eventData) {
       return badRequest(res, 'Data required.');
     }
 
-    await saveSessionData({ ...session, sessionData: dynamicData, sessionId: session.id });
+    await saveSessionData({ ...session, sessionData: eventData, sessionId: session.id });
   }
 
   const token = createToken(session, secret());
@@ -153,7 +153,7 @@ async function hasBlockedIp(req: NextApiRequestCollect) {
 
     const clientIp = getIpAddress(req);
 
-    const blocked = ips.find(ip => {
+    return ips.find(ip => {
       if (ip === clientIp) return true;
 
       // CIDR notation
@@ -166,7 +166,5 @@ async function hasBlockedIp(req: NextApiRequestCollect) {
 
       return false;
     });
-
-    return blocked;
   }
 }

From 2b13002f1b678cec875d0e06b8fdca95ffd80a81 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Thu, 15 Jun 2023 03:27:41 -0700
Subject: [PATCH 69/88] New reports screens.

---
 components/messages.js                        |  2 +
 .../{ReportList.js => ReportTemplates.js}     | 11 ++++--
 ....module.css => ReportTemplates.module.css} |  0
 components/pages/reports/ReportsList.js       | 29 +++++++++++++++
 components/pages/reports/ReportsTable.js      | 37 +++++++++++++++++++
 hooks/index.js                                |  1 +
 hooks/useReports.js                           | 10 +++++
 pages/reports/create.js                       | 13 +++++++
 pages/reports/index.js                        | 12 +-----
 9 files changed, 101 insertions(+), 14 deletions(-)
 rename components/pages/reports/{ReportList.js => ReportTemplates.js} (85%)
 rename components/pages/reports/{ReportList.module.css => ReportTemplates.module.css} (100%)
 create mode 100644 components/pages/reports/ReportsList.js
 create mode 100644 components/pages/reports/ReportsTable.js
 create mode 100644 hooks/useReports.js
 create mode 100644 pages/reports/create.js

diff --git a/components/messages.js b/components/messages.js
index 166a121b..c6ddae60 100644
--- a/components/messages.js
+++ b/components/messages.js
@@ -133,6 +133,8 @@ export const labels = defineMessages({
   runQuery: { id: 'label.run-query', defaultMessage: 'Run query' },
   field: { id: 'label.field', defaultMessage: 'Field' },
   fields: { id: 'label.fields', defaultMessage: 'Fields' },
+  createReport: { id: 'labels.create-report', defaultMessage: 'Create report' },
+  description: { id: 'labels.description', defaultMessage: 'Description' },
 });
 
 export const messages = defineMessages({
diff --git a/components/pages/reports/ReportList.js b/components/pages/reports/ReportTemplates.js
similarity index 85%
rename from components/pages/reports/ReportList.js
rename to components/pages/reports/ReportTemplates.js
index 6e07c81e..7ed40af7 100644
--- a/components/pages/reports/ReportList.js
+++ b/components/pages/reports/ReportTemplates.js
@@ -5,7 +5,8 @@ import PageHeader from 'components/layout/PageHeader';
 import Funnel from 'assets/funnel.svg';
 import Nodes from 'assets/nodes.svg';
 import Lightbulb from 'assets/lightbulb.svg';
-import styles from './ReportList.module.css';
+import styles from './ReportTemplates.module.css';
+import { useMessages } from 'hooks';
 
 const reports = [
   {
@@ -50,10 +51,12 @@ function ReportItem({ title, description, url, icon }) {
   );
 }
 
-export function ReportList() {
+export function ReportTemplates() {
+  const { formatMessage, labels } = useMessages();
+
   return (
     <Page>
-      <PageHeader title="Reports" />
+      <PageHeader title={formatMessage(labels.reports)} />
       <div className={styles.reports}>
         {reports.map(({ title, description, url, icon }) => {
           return (
@@ -65,4 +68,4 @@ export function ReportList() {
   );
 }
 
-export default ReportList;
+export default ReportTemplates;
diff --git a/components/pages/reports/ReportList.module.css b/components/pages/reports/ReportTemplates.module.css
similarity index 100%
rename from components/pages/reports/ReportList.module.css
rename to components/pages/reports/ReportTemplates.module.css
diff --git a/components/pages/reports/ReportsList.js b/components/pages/reports/ReportsList.js
new file mode 100644
index 00000000..255cb546
--- /dev/null
+++ b/components/pages/reports/ReportsList.js
@@ -0,0 +1,29 @@
+import Page from 'components/layout/Page';
+import PageHeader from 'components/layout/PageHeader';
+import Link from 'next/link';
+import { Button, Icon, Icons, Text } from 'react-basics';
+import { useMessages, useReports } from 'hooks';
+import ReportsTable from './ReportsTable';
+
+export function ReportsList() {
+  const { formatMessage, labels } = useMessages();
+  const { reports, error, isLoading } = useReports();
+
+  return (
+    <Page loading={isLoading} error={error}>
+      <PageHeader title="Reports">
+        <Link href="/reports/create">
+          <Button variant="primary">
+            <Icon>
+              <Icons.Plus />
+            </Icon>
+            <Text>{formatMessage(labels.createReport)}</Text>
+          </Button>
+        </Link>
+      </PageHeader>
+      <ReportsTable data={reports} />
+    </Page>
+  );
+}
+
+export default ReportsList;
diff --git a/components/pages/reports/ReportsTable.js b/components/pages/reports/ReportsTable.js
new file mode 100644
index 00000000..dfb3a97a
--- /dev/null
+++ b/components/pages/reports/ReportsTable.js
@@ -0,0 +1,37 @@
+import Link from 'next/link';
+import { Button, Text, Icon, Icons } from 'react-basics';
+import SettingsTable from 'components/common/SettingsTable';
+import useMessages from 'hooks/useMessages';
+import useConfig from 'hooks/useConfig';
+
+export function ReportsTable({ data = [] }) {
+  const { formatMessage, labels } = useMessages();
+  const { openExternal } = useConfig();
+
+  const columns = [
+    { name: 'name', label: formatMessage(labels.name) },
+    { name: 'description', label: formatMessage(labels.description) },
+    { name: 'action', label: ' ' },
+  ];
+
+  return (
+    <SettingsTable columns={columns} data={data}>
+      {row => {
+        const { id } = row;
+
+        return (
+          <Link href={`/reports/${id}`}>
+            <Button>
+              <Icon>
+                <Icons.ArrowRight />
+              </Icon>
+              <Text>{formatMessage(labels.view)}</Text>
+            </Button>
+          </Link>
+        );
+      }}
+    </SettingsTable>
+  );
+}
+
+export default ReportsTable;
diff --git a/hooks/index.js b/hooks/index.js
index 3f2ba4d7..cca6ca29 100644
--- a/hooks/index.js
+++ b/hooks/index.js
@@ -10,6 +10,7 @@ export * from './useLocale';
 export * from './useMessages';
 export * from './usePageQuery';
 export * from './useReport';
+export * from './useReports';
 export * from './useRequireLogin';
 export * from './useShareToken';
 export * from './useSticky';
diff --git a/hooks/useReports.js b/hooks/useReports.js
new file mode 100644
index 00000000..0b5e60d0
--- /dev/null
+++ b/hooks/useReports.js
@@ -0,0 +1,10 @@
+import useApi from './useApi';
+
+export function useReports() {
+  const { get, useQuery } = useApi();
+  const { data, error, isLoading } = useQuery(['reports'], () => get(`/reports`));
+
+  return { reports: data, error, isLoading };
+}
+
+export default useReports;
diff --git a/pages/reports/create.js b/pages/reports/create.js
new file mode 100644
index 00000000..421b9c0a
--- /dev/null
+++ b/pages/reports/create.js
@@ -0,0 +1,13 @@
+import AppLayout from 'components/layout/AppLayout';
+import ReportTemplates from 'components/pages/reports/ReportTemplates';
+import { useMessages } from 'hooks';
+
+export default function ReportsPage() {
+  const { formatMessage, labels } = useMessages();
+
+  return (
+    <AppLayout title={formatMessage(labels.reports)}>
+      <ReportTemplates />
+    </AppLayout>
+  );
+}
diff --git a/pages/reports/index.js b/pages/reports/index.js
index 6da2b943..237f31ee 100644
--- a/pages/reports/index.js
+++ b/pages/reports/index.js
@@ -1,21 +1,13 @@
-import { useState } from 'react';
-import { Item, Tabs } from 'react-basics';
 import AppLayout from 'components/layout/AppLayout';
-import ReportList from 'components/pages/reports/ReportList';
 import useMessages from 'hooks/useMessages';
+import ReportsList from 'components/pages/reports/ReportsList';
 
 export default function ReportsPage() {
-  const [tab, setTab] = useState('create');
   const { formatMessage, labels } = useMessages();
 
   return (
     <AppLayout title={formatMessage(labels.reports)}>
-      <Tabs selectedKey={tab} onSelect={setTab} style={{ marginBottom: 30, fontSize: 14 }}>
-        <Item key="create">{formatMessage(labels.reports)}</Item>
-        <Item key="saved">{formatMessage(labels.save)}</Item>
-      </Tabs>
-      {tab === 'create' && <ReportList />}
-      {tab === 'saved' && <h1>My reports</h1>}
+      <ReportsList />
     </AppLayout>
   );
 }

From 8cf3a8ad42aa3f02e8795547c5e5516651660200 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adam=20G=C4=85sowski?= <adam.gasowski@gander.pl>
Date: Thu, 15 Jun 2023 18:31:46 +0200
Subject: [PATCH 70/88] Update pl-PL.json

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

diff --git a/lang/pl-PL.json b/lang/pl-PL.json
index 919fd9b3..a0c59171 100644
--- a/lang/pl-PL.json
+++ b/lang/pl-PL.json
@@ -131,7 +131,7 @@
   "message.no-teams": "Nie stworzyłeś żadnych zespołów.",
   "message.no-users": "Nie ma żadnych użytkowników.",
   "message.page-not-found": "Strona nie znaleziona.",
-  "message.reset-website": "Zresetuj statystyki",
+  "message.reset-website": "Aby zresetować tę witrynę, wpisz {confirmation} w polu poniżej, aby potwierdzić.",
   "message.reset-website-warning": "Wszystkie statystyki tej witryny zostaną usunięte, ale kod śledzenia pozostanie nienaruszony.",
   "message.saved": "Zapisano pomyślnie.",
   "message.share-url": "To jest publicznie udostępniany adres URL dla {target}.",

From d10dd9ed95571d84c49a7eaca38d3f6a1b83a61d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adam=20G=C4=85sowski?= <adam.gasowski@gander.pl>
Date: Thu, 15 Jun 2023 18:32:01 +0200
Subject: [PATCH 71/88] Update en-GB.json

---
 lang/en-GB.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang/en-GB.json b/lang/en-GB.json
index 296106f2..33170816 100644
--- a/lang/en-GB.json
+++ b/lang/en-GB.json
@@ -131,7 +131,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "Page not found.",
-  "message.reset-website": "Reset statistics",
+  "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.saved": "Saved successfully.",
   "message.share-url": "This is the publicly shared URL for {target}.",

From ab0838e27210f871d105b16a49baa246ee750442 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Thu, 15 Jun 2023 20:15:31 -0700
Subject: [PATCH 72/88] Fixed issue with hover tooltips.

---
 components/common/HoverTooltip.js             |  6 +--
 components/common/HoverTooltip.module.css     | 39 +------------------
 components/common/WorldMap.js                 |  6 +--
 components/input/LanguageButton.js            |  3 +-
 components/input/LanguageButton.module.css    |  2 +-
 components/input/LogoutButton.js              |  6 +--
 components/input/RefreshButton.js             |  6 +--
 components/layout/AppLayout.module.css        |  1 +
 components/layout/NavGroup.js                 |  6 +--
 components/metrics/BarChart.js                | 10 ++---
 components/metrics/BarChart.module.css        |  6 ---
 components/metrics/EventsChart.js             |  4 +-
 components/metrics/PageviewsChart.js          |  4 +-
 components/pages/reports/ReportHeader.js      |  2 +-
 .../pages/reports/funnel/FunnelChart.js       |  8 ++--
 .../pages/reports/funnel/FunnelParameters.js  | 10 ++---
 hooks/useCountryNames.js                      |  4 +-
 lib/charts.js                                 |  8 ++--
 package.json                                  |  2 +-
 yarn.lock                                     |  8 ++--
 20 files changed, 50 insertions(+), 91 deletions(-)

diff --git a/components/common/HoverTooltip.js b/components/common/HoverTooltip.js
index 59fd6277..614841df 100644
--- a/components/common/HoverTooltip.js
+++ b/components/common/HoverTooltip.js
@@ -18,9 +18,9 @@ export function HoverTooltip({ children }) {
   }, []);
 
   return (
-    <div className={styles.tooltip} style={{ left: position.x, top: position.y - 16 }}>
-      <Tooltip position="top" action="none" label={children} />
-    </div>
+    <Tooltip className={styles.tooltip} style={{ left: position.x, top: position.y }}>
+      {children}
+    </Tooltip>
   );
 }
 
diff --git a/components/common/HoverTooltip.module.css b/components/common/HoverTooltip.module.css
index ec1abc1c..c4bb76ea 100644
--- a/components/common/HoverTooltip.module.css
+++ b/components/common/HoverTooltip.module.css
@@ -1,43 +1,6 @@
-.chart {
-  position: relative;
-}
-
 .tooltip {
   position: fixed;
   pointer-events: none;
   z-index: var(--z-index-popup);
-}
-
-.content {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  text-align: center;
-}
-
-.title {
-  font-size: var(--font-size-xs);
-  font-weight: 600;
-}
-
-.metric {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  font-size: var(--font-size-sm);
-  font-weight: 600;
-}
-
-.dot {
-  position: relative;
-  overflow: hidden;
-  border-radius: 100%;
-  margin-right: 8px;
-  background: var(--base50);
-}
-
-.color {
-  width: 10px;
-  height: 10px;
+  transform: translate(-50%, calc(-100% - 5px));
 }
diff --git a/components/common/WorldMap.js b/components/common/WorldMap.js
index 985160d8..9c91e4a4 100644
--- a/components/common/WorldMap.js
+++ b/components/common/WorldMap.js
@@ -14,7 +14,7 @@ import styles from './WorldMap.module.css';
 
 export function WorldMap({ data, className }) {
   const { basePath } = useRouter();
-  const [tooltip, setTooltip] = useState();
+  const [tooltip, setTooltipPopup] = useState();
   const { theme, colors } = useTheme();
   const { locale } = useLocale();
   const countryNames = useCountryNames(locale);
@@ -40,7 +40,7 @@ export function WorldMap({ data, className }) {
   function handleHover(code) {
     if (code === 'AQ') return;
     const country = metrics?.find(({ x }) => x === code);
-    setTooltip(`${countryNames[code]}: ${formatLongNumber(country?.y || 0)} visitors`);
+    setTooltipPopup(`${countryNames[code]}: ${formatLongNumber(country?.y || 0)} visitors`);
   }
 
   return (
@@ -69,7 +69,7 @@ export function WorldMap({ data, className }) {
                       pressed: { outline: 'none' },
                     }}
                     onMouseOver={() => handleHover(code)}
-                    onMouseOut={() => setTooltip(null)}
+                    onMouseOut={() => setTooltipPopup(null)}
                   />
                 );
               });
diff --git a/components/input/LanguageButton.js b/components/input/LanguageButton.js
index 049b49f3..d4c1cbc3 100644
--- a/components/input/LanguageButton.js
+++ b/components/input/LanguageButton.js
@@ -9,7 +9,8 @@ export function LanguageButton() {
   const { locale, saveLocale, dir } = useLocale();
   const items = Object.keys(languages).map(key => ({ ...languages[key], value: key }));
 
-  function handleSelect(value, close) {
+  function handleSelect(value, close, e) {
+    e.stopPropagation();
     saveLocale(value);
     close();
   }
diff --git a/components/input/LanguageButton.module.css b/components/input/LanguageButton.module.css
index e46729c0..3d4c0c56 100644
--- a/components/input/LanguageButton.module.css
+++ b/components/input/LanguageButton.module.css
@@ -1,7 +1,7 @@
 .menu {
   display: flex;
   flex-flow: row wrap;
-  max-width: 640px;
+  min-width: 640px;
   padding: 10px;
   background: var(--base50);
   z-index: var(--z-index-popup);
diff --git a/components/input/LogoutButton.js b/components/input/LogoutButton.js
index 3314956e..4a15cd68 100644
--- a/components/input/LogoutButton.js
+++ b/components/input/LogoutButton.js
@@ -1,4 +1,4 @@
-import { Button, Icon, Icons, Tooltip } from 'react-basics';
+import { Button, Icon, Icons, TooltipPopup } from 'react-basics';
 import Link from 'next/link';
 import useMessages from 'hooks/useMessages';
 
@@ -6,13 +6,13 @@ export function LogoutButton({ tooltipPosition = 'top' }) {
   const { formatMessage, labels } = useMessages();
   return (
     <Link href="/logout">
-      <Tooltip label={formatMessage(labels.logout)} position={tooltipPosition}>
+      <TooltipPopup label={formatMessage(labels.logout)} position={tooltipPosition}>
         <Button variant="quiet">
           <Icon>
             <Icons.Logout />
           </Icon>
         </Button>
-      </Tooltip>
+      </TooltipPopup>
     </Link>
   );
 }
diff --git a/components/input/RefreshButton.js b/components/input/RefreshButton.js
index b3e2b815..444f3247 100644
--- a/components/input/RefreshButton.js
+++ b/components/input/RefreshButton.js
@@ -1,4 +1,4 @@
-import { LoadingButton, Icon, Tooltip } from 'react-basics';
+import { LoadingButton, Icon, TooltipPopup } from 'react-basics';
 import { setWebsiteDateRange } from 'store/websites';
 import useDateRange from 'hooks/useDateRange';
 import Icons from 'components/icons';
@@ -19,13 +19,13 @@ export function RefreshButton({ websiteId, isLoading }) {
   }
 
   return (
-    <Tooltip label={formatMessage(labels.refresh)}>
+    <TooltipPopup label={formatMessage(labels.refresh)}>
       <LoadingButton loading={isLoading} onClick={handleClick}>
         <Icon>
           <Icons.Refresh />
         </Icon>
       </LoadingButton>
-    </Tooltip>
+    </TooltipPopup>
   );
 }
 
diff --git a/components/layout/AppLayout.module.css b/components/layout/AppLayout.module.css
index 6cc9e414..a83039ce 100644
--- a/components/layout/AppLayout.module.css
+++ b/components/layout/AppLayout.module.css
@@ -2,6 +2,7 @@
   display: grid;
   grid-template-rows: max-content 1fr;
   grid-template-columns: 1fr;
+  overflow: hidden;
 }
 
 .nav {
diff --git a/components/layout/NavGroup.js b/components/layout/NavGroup.js
index b9e7155d..94f9d8e6 100644
--- a/components/layout/NavGroup.js
+++ b/components/layout/NavGroup.js
@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import { Icon, Text, Tooltip } from 'react-basics';
+import { Icon, Text, TooltipPopup } from 'react-basics';
 import classNames from 'classnames';
 import { useRouter } from 'next/router';
 import Link from 'next/link';
@@ -36,7 +36,7 @@ export function NavGroup({
       <div className={styles.body}>
         {items.map(({ label, url, icon, divider }) => {
           return (
-            <Tooltip key={label} label={label} position="right" disabled={!minimized}>
+            <TooltipPopup key={label} label={label} position="right" disabled={!minimized}>
               <Link
                 href={url}
                 className={classNames(styles.item, {
@@ -47,7 +47,7 @@ export function NavGroup({
                 <Icon>{icon}</Icon>
                 <Text className={styles.text}>{label}</Text>
               </Link>
-            </Tooltip>
+            </TooltipPopup>
           );
         })}
       </div>
diff --git a/components/metrics/BarChart.js b/components/metrics/BarChart.js
index 2aba3ea5..c086017e 100644
--- a/components/metrics/BarChart.js
+++ b/components/metrics/BarChart.js
@@ -20,14 +20,14 @@ export function BarChart({
   renderYLabel,
   XAxisType = 'time',
   YAxisType = 'linear',
-  renderTooltip,
+  renderTooltipPopup,
   onCreate,
   onUpdate,
   className,
 }) {
   const canvas = useRef();
   const chart = useRef(null);
-  const [tooltip, setTooltip] = useState(null);
+  const [tooltip, setTooltipPopup] = useState(null);
   const { locale } = useLocale();
   const { theme, colors } = useTheme();
 
@@ -50,7 +50,7 @@ export function BarChart({
         },
         tooltip: {
           enabled: false,
-          external: renderTooltip ? renderTooltip.bind(null, setTooltip) : undefined,
+          external: renderTooltipPopup ? renderTooltipPopup.bind(null, setTooltipPopup) : undefined,
         },
       },
       scales: {
@@ -93,7 +93,7 @@ export function BarChart({
     };
   }, [
     animationDuration,
-    renderTooltip,
+    renderTooltipPopup,
     renderXLabel,
     XAxisType,
     YAxisType,
@@ -120,7 +120,7 @@ export function BarChart({
   };
 
   const updateChart = () => {
-    setTooltip(null);
+    setTooltipPopup(null);
 
     datasets.forEach((dataset, index) => {
       chart.current.data.datasets[index].data = dataset.data;
diff --git a/components/metrics/BarChart.module.css b/components/metrics/BarChart.module.css
index 850d1ea7..f2e26db1 100644
--- a/components/metrics/BarChart.module.css
+++ b/components/metrics/BarChart.module.css
@@ -13,9 +13,3 @@
 .tooltip .value {
   text-transform: lowercase;
 }
-
-@media only screen and (max-width: 992px) {
-  .chart {
-    /*height: 200px;*/
-  }
-}
diff --git a/components/metrics/EventsChart.js b/components/metrics/EventsChart.js
index 334ee591..82b8c8f7 100644
--- a/components/metrics/EventsChart.js
+++ b/components/metrics/EventsChart.js
@@ -5,7 +5,7 @@ import BarChart from './BarChart';
 import { getDateArray } from 'lib/date';
 import { useApi, useLocale, useDateRange, useTimezone, usePageQuery } from 'hooks';
 import { EVENT_COLORS } from 'lib/constants';
-import { renderDateLabels, renderStatusTooltip } from 'lib/charts';
+import { renderDateLabels, renderStatusTooltipPopup } from 'lib/charts';
 
 export function EventsChart({ websiteId, className, token }) {
   const { get, useQuery } = useApi();
@@ -72,7 +72,7 @@ export function EventsChart({ websiteId, className, token }) {
       loading={isLoading}
       stacked
       renderXLabel={renderDateLabels(unit, locale)}
-      renderTooltip={renderStatusTooltip(unit, locale)}
+      renderTooltipPopup={renderStatusTooltipPopup(unit, locale)}
     />
   );
 }
diff --git a/components/metrics/PageviewsChart.js b/components/metrics/PageviewsChart.js
index bf56a0bd..362c616e 100644
--- a/components/metrics/PageviewsChart.js
+++ b/components/metrics/PageviewsChart.js
@@ -1,7 +1,7 @@
 import { useMemo } from 'react';
 import BarChart from './BarChart';
 import { useLocale, useTheme, useMessages } from 'hooks';
-import { renderDateLabels, renderStatusTooltip } from 'lib/charts';
+import { renderDateLabels, renderStatusTooltipPopup } from 'lib/charts';
 
 export function PageviewsChart({ websiteId, data, unit, className, loading, ...props }) {
   const { formatMessage, labels } = useMessages();
@@ -36,7 +36,7 @@ export function PageviewsChart({ websiteId, data, unit, className, loading, ...p
       unit={unit}
       loading={loading}
       renderXLabel={renderDateLabels(unit, locale)}
-      renderTooltip={renderStatusTooltip(unit, locale)}
+      renderTooltipPopup={renderStatusTooltipPopup(unit, locale)}
     />
   );
 }
diff --git a/components/pages/reports/ReportHeader.js b/components/pages/reports/ReportHeader.js
index 0b2054d0..7de45d9a 100644
--- a/components/pages/reports/ReportHeader.js
+++ b/components/pages/reports/ReportHeader.js
@@ -39,7 +39,7 @@ export function ReportHeader({ icon }) {
   };
 
   const handleNameChange = name => {
-    updateReport({ name });
+    updateReport({ name: name || 'Untitled' });
   };
 
   const handleDescriptionChange = description => {
diff --git a/components/pages/reports/funnel/FunnelChart.js b/components/pages/reports/funnel/FunnelChart.js
index 3dfeb19e..7253c3fa 100644
--- a/components/pages/reports/funnel/FunnelChart.js
+++ b/components/pages/reports/funnel/FunnelChart.js
@@ -21,15 +21,15 @@ export function FunnelChart({ className, loading }) {
     [parameters],
   );
 
-  const renderTooltip = useCallback((setTooltip, model) => {
+  const renderTooltipPopup = useCallback((setTooltipPopup, model) => {
     const { opacity, dataPoints } = model.tooltip;
 
     if (!dataPoints?.length || !opacity) {
-      setTooltip(null);
+      setTooltipPopup(null);
       return;
     }
 
-    setTooltip(`${formatLongNumber(dataPoints[0].raw.y)} ${formatMessage(labels.visitors)}`);
+    setTooltipPopup(`${formatLongNumber(dataPoints[0].raw.y)} ${formatMessage(labels.visitors)}`);
   }, []);
 
   const datasets = useMemo(() => {
@@ -54,7 +54,7 @@ export function FunnelChart({ className, loading }) {
       unit="day"
       loading={loading}
       renderXLabel={renderXLabel}
-      renderTooltip={renderTooltip}
+      renderTooltipPopup={renderTooltipPopup}
       XAxisType="category"
     />
   );
diff --git a/components/pages/reports/funnel/FunnelParameters.js b/components/pages/reports/funnel/FunnelParameters.js
index 77f0fdf5..4c788798 100644
--- a/components/pages/reports/funnel/FunnelParameters.js
+++ b/components/pages/reports/funnel/FunnelParameters.js
@@ -11,7 +11,7 @@ import {
   SubmitButton,
   Text,
   TextField,
-  Tooltip,
+  TooltipPopup,
 } from 'react-basics';
 import Icons from 'components/icons';
 import UrlAddForm from './UrlAddForm';
@@ -62,7 +62,7 @@ export function FunnelParameters() {
             return (
               <div key={index} className={styles.url}>
                 <Text>{url}</Text>
-                <Tooltip
+                <TooltipPopup
                   className={styles.icon}
                   label={formatMessage(labels.remove)}
                   position="right"
@@ -70,7 +70,7 @@ export function FunnelParameters() {
                   <Icon onClick={handleRemoveUrl.bind(null, index)}>
                     <Icons.Close />
                   </Icon>
-                </Tooltip>
+                </TooltipPopup>
               </div>
             );
           })}
@@ -90,11 +90,11 @@ function AddUrlButton({ onAdd }) {
 
   return (
     <PopupTrigger>
-      <Tooltip label={formatMessage(labels.addUrl)}>
+      <TooltipPopup label={formatMessage(labels.addUrl)}>
         <Icon>
           <Icons.Plus />
         </Icon>
-      </Tooltip>
+      </TooltipPopup>
       <Popup position="bottom" alignment="start">
         {close => {
           return <UrlAddForm onSave={onAdd} onClose={close} />;
diff --git a/hooks/useCountryNames.js b/hooks/useCountryNames.js
index 60c992a5..51cabf34 100644
--- a/hooks/useCountryNames.js
+++ b/hooks/useCountryNames.js
@@ -1,6 +1,6 @@
 import { useState, useEffect } from 'react';
 import { useRouter } from 'next/router';
-import { get } from 'next-basics';
+import { httpGet } from 'next-basics';
 import enUS from 'public/intl/country/en-US.json';
 
 const countryNames = {
@@ -12,7 +12,7 @@ export function useCountryNames(locale) {
   const { basePath } = useRouter();
 
   async function loadData(locale) {
-    const { data } = await get(`${basePath}/intl/country/${locale}.json`);
+    const { data } = await httpGet(`${basePath}/intl/country/${locale}.json`);
 
     if (data) {
       countryNames[locale] = data;
diff --git a/lib/charts.js b/lib/charts.js
index c9d54218..0571a9a9 100644
--- a/lib/charts.js
+++ b/lib/charts.js
@@ -27,12 +27,12 @@ export function renderDateLabels(unit, locale) {
   };
 }
 
-export function renderStatusTooltip(unit, locale) {
-  return (setTooltip, model) => {
+export function renderStatusTooltipPopup(unit, locale) {
+  return (setTooltipPopup, model) => {
     const { opacity, labelColors, dataPoints } = model.tooltip;
 
     if (!dataPoints?.length || !opacity) {
-      setTooltip(null);
+      setTooltipPopup(null);
       return;
     }
 
@@ -48,7 +48,7 @@ export function renderStatusTooltip(unit, locale) {
       year: 'yyyy',
     };
 
-    setTooltip(
+    setTooltipPopup(
       <>
         <div>{dateFormat(new Date(dataPoints[0].raw.x), formats[unit], locale)}</div>
         <div>
diff --git a/package.json b/package.json
index 5cfc9823..3bf8343f 100644
--- a/package.json
+++ b/package.json
@@ -95,7 +95,7 @@
     "node-fetch": "^3.2.8",
     "npm-run-all": "^4.1.5",
     "react": "^18.2.0",
-    "react-basics": "^0.84.0",
+    "react-basics": "^0.85.0",
     "react-beautiful-dnd": "^13.1.0",
     "react-dom": "^18.2.0",
     "react-error-boundary": "^4.0.4",
diff --git a/yarn.lock b/yarn.lock
index aa847d57..55adc5e8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8191,10 +8191,10 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-basics@^0.84.0:
-  version "0.84.0"
-  resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.84.0.tgz#cfea2ae6b64d9318406a0c6cf0d5d9e8a0790a28"
-  integrity sha512-QWnUkw7kVbBK0Z1xvvsNgrUBlUI0FzL39jQAZR5EutE83BlkAtYeisXooPZk3PJuGHZzJvY6+JzMYmvALLjqnQ==
+react-basics@^0.85.0:
+  version "0.85.0"
+  resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.85.0.tgz#407c413e56b004120b5e11074a7d9f17a697c6b7"
+  integrity sha512-RPxYiMdOmlWZXh2tKbUay97lsOFWtNYTzx5Jpcd9IUxBrNzYWgTCgtSHJLHAuycUCDNVepX+do+HdRG3uMkE0Q==
   dependencies:
     classnames "^2.3.1"
     date-fns "^2.29.3"

From bb2622b0cce4a7428d04f47aa6c479e8b26b8574 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Thu, 15 Jun 2023 20:23:11 -0700
Subject: [PATCH 73/88] Updated packages.

---
 yarn.lock | 642 +++++++++++++++++++++++++++---------------------------
 1 file changed, 324 insertions(+), 318 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 55adc5e8..afd2a71f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1497,7 +1497,7 @@
     core-js-pure "^3.25.1"
     regenerator-runtime "^0.13.11"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.12.5":
+"@babel/runtime@^7.0.0":
   version "7.21.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673"
   integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==
@@ -1511,6 +1511,13 @@
   dependencies:
     regenerator-runtime "^0.13.11"
 
+"@babel/runtime@^7.12.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec"
+  integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==
+  dependencies:
+    regenerator-runtime "^0.13.11"
+
 "@babel/runtime@^7.15.4", "@babel/runtime@^7.9.2":
   version "7.20.1"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.1.tgz#1148bb33ab252b165a06698fde7576092a78b4a9"
@@ -1751,115 +1758,115 @@
   resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz#1bfafe4b7ed0f3e4105837e056e0a89b108ebe36"
   integrity sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==
 
-"@esbuild/android-arm64@0.17.18":
-  version "0.17.18"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.18.tgz#4aa8d8afcffb4458736ca9b32baa97d7cb5861ea"
-  integrity sha512-/iq0aK0eeHgSC3z55ucMAHO05OIqmQehiGay8eP5l/5l+iEr4EIbh4/MI8xD9qRFjqzgkc0JkX0LculNC9mXBw==
+"@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"
+  integrity sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==
 
-"@esbuild/android-arm@0.17.18":
-  version "0.17.18"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.17.18.tgz#74a7e95af4ee212ebc9db9baa87c06a594f2a427"
-  integrity sha512-EmwL+vUBZJ7mhFCs5lA4ZimpUH3WMAoqvOIYhVQwdIgSpHC8ImHdsRyhHAVxpDYUSm0lWvd63z0XH1IlImS2Qw==
+"@esbuild/android-arm@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.17.19.tgz#5898f7832c2298bc7d0ab53701c57beb74d78b4d"
+  integrity sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==
 
-"@esbuild/android-x64@0.17.18":
-  version "0.17.18"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.17.18.tgz#1dcd13f201997c9fe0b204189d3a0da4eb4eb9b6"
-  integrity sha512-x+0efYNBF3NPW2Xc5bFOSFW7tTXdAcpfEg2nXmxegm4mJuVeS+i109m/7HMiOQ6M12aVGGFlqJX3RhNdYM2lWg==
+"@esbuild/android-x64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.17.19.tgz#658368ef92067866d95fb268719f98f363d13ae1"
+  integrity sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==
 
-"@esbuild/darwin-arm64@0.17.18":
-  version "0.17.18"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.18.tgz#444f3b961d4da7a89eb9bd35cfa4415141537c2a"
-  integrity sha512-6tY+djEAdF48M1ONWnQb1C+6LiXrKjmqjzPNPWXhu/GzOHTHX2nh8Mo2ZAmBFg0kIodHhciEgUBtcYCAIjGbjQ==
+"@esbuild/darwin-arm64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz#584c34c5991b95d4d48d333300b1a4e2ff7be276"
+  integrity sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==
 
-"@esbuild/darwin-x64@0.17.18":
-  version "0.17.18"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.17.18.tgz#a6da308d0ac8a498c54d62e0b2bfb7119b22d315"
-  integrity sha512-Qq84ykvLvya3dO49wVC9FFCNUfSrQJLbxhoQk/TE1r6MjHo3sFF2tlJCwMjhkBVq3/ahUisj7+EpRSz0/+8+9A==
+"@esbuild/darwin-x64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz#7751d236dfe6ce136cce343dce69f52d76b7f6cb"
+  integrity sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==
 
-"@esbuild/freebsd-arm64@0.17.18":
-  version "0.17.18"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.18.tgz#b83122bb468889399d0d63475d5aea8d6829c2c2"
-  integrity sha512-fw/ZfxfAzuHfaQeMDhbzxp9mc+mHn1Y94VDHFHjGvt2Uxl10mT4CDavHm+/L9KG441t1QdABqkVYwakMUeyLRA==
+"@esbuild/freebsd-arm64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz#cacd171665dd1d500f45c167d50c6b7e539d5fd2"
+  integrity sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==
 
-"@esbuild/freebsd-x64@0.17.18":
-  version "0.17.18"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.18.tgz#af59e0e03fcf7f221b34d4c5ab14094862c9c864"
-  integrity sha512-FQFbRtTaEi8ZBi/A6kxOC0V0E9B/97vPdYjY9NdawyLd4Qk5VD5g2pbWN2VR1c0xhzcJm74HWpObPszWC+qTew==
+"@esbuild/freebsd-x64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz#0769456eee2a08b8d925d7c00b79e861cb3162e4"
+  integrity sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==
 
-"@esbuild/linux-arm64@0.17.18":
-  version "0.17.18"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.17.18.tgz#8551d72ba540c5bce4bab274a81c14ed01eafdcf"
-  integrity sha512-R7pZvQZFOY2sxUG8P6A21eq6q+eBv7JPQYIybHVf1XkQYC+lT7nDBdC7wWKTrbvMXKRaGudp/dzZCwL/863mZQ==
+"@esbuild/linux-arm64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz#38e162ecb723862c6be1c27d6389f48960b68edb"
+  integrity sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==
 
-"@esbuild/linux-arm@0.17.18":
-  version "0.17.18"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.17.18.tgz#e09e76e526df4f665d4d2720d28ff87d15cdf639"
-  integrity sha512-jW+UCM40LzHcouIaqv3e/oRs0JM76JfhHjCavPxMUti7VAPh8CaGSlS7cmyrdpzSk7A+8f0hiedHqr/LMnfijg==
+"@esbuild/linux-arm@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz#1a2cd399c50040184a805174a6d89097d9d1559a"
+  integrity sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==
 
-"@esbuild/linux-ia32@0.17.18":
-  version "0.17.18"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.17.18.tgz#47878860ce4fe73a36fd8627f5647bcbbef38ba4"
-  integrity sha512-ygIMc3I7wxgXIxk6j3V00VlABIjq260i967Cp9BNAk5pOOpIXmd1RFQJQX9Io7KRsthDrQYrtcx7QCof4o3ZoQ==
+"@esbuild/linux-ia32@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz#e28c25266b036ce1cabca3c30155222841dc035a"
+  integrity sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==
 
-"@esbuild/linux-loong64@0.17.18":
-  version "0.17.18"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.17.18.tgz#3f8fbf5267556fc387d20b2e708ce115de5c967a"
-  integrity sha512-bvPG+MyFs5ZlwYclCG1D744oHk1Pv7j8psF5TfYx7otCVmcJsEXgFEhQkbhNW8otDHL1a2KDINW20cfCgnzgMQ==
+"@esbuild/linux-loong64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz#0f887b8bb3f90658d1a0117283e55dbd4c9dcf72"
+  integrity sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==
 
-"@esbuild/linux-mips64el@0.17.18":
-  version "0.17.18"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.18.tgz#9d896d8f3c75f6c226cbeb840127462e37738226"
-  integrity sha512-oVqckATOAGuiUOa6wr8TXaVPSa+6IwVJrGidmNZS1cZVx0HqkTMkqFGD2HIx9H1RvOwFeWYdaYbdY6B89KUMxA==
+"@esbuild/linux-mips64el@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz#f5d2a0b8047ea9a5d9f592a178ea054053a70289"
+  integrity sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==
 
-"@esbuild/linux-ppc64@0.17.18":
-  version "0.17.18"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.18.tgz#3d9deb60b2d32c9985bdc3e3be090d30b7472783"
-  integrity sha512-3dLlQO+b/LnQNxgH4l9rqa2/IwRJVN9u/bK63FhOPB4xqiRqlQAU0qDU3JJuf0BmaH0yytTBdoSBHrb2jqc5qQ==
+"@esbuild/linux-ppc64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz#876590e3acbd9fa7f57a2c7d86f83717dbbac8c7"
+  integrity sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==
 
-"@esbuild/linux-riscv64@0.17.18":
-  version "0.17.18"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.18.tgz#8a943cf13fd24ff7ed58aefb940ef178f93386bc"
-  integrity sha512-/x7leOyDPjZV3TcsdfrSI107zItVnsX1q2nho7hbbQoKnmoeUWjs+08rKKt4AUXju7+3aRZSsKrJtaRmsdL1xA==
+"@esbuild/linux-riscv64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz#7f49373df463cd9f41dc34f9b2262d771688bf09"
+  integrity sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==
 
-"@esbuild/linux-s390x@0.17.18":
-  version "0.17.18"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.17.18.tgz#66cb01f4a06423e5496facabdce4f7cae7cb80e5"
-  integrity sha512-cX0I8Q9xQkL/6F5zWdYmVf5JSQt+ZfZD2bJudZrWD+4mnUvoZ3TDDXtDX2mUaq6upMFv9FlfIh4Gfun0tbGzuw==
+"@esbuild/linux-s390x@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz#e2afd1afcaf63afe2c7d9ceacd28ec57c77f8829"
+  integrity sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==
 
-"@esbuild/linux-x64@0.17.18":
-  version "0.17.18"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.17.18.tgz#23c26050c6c5d1359c7b774823adc32b3883b6c9"
-  integrity sha512-66RmRsPlYy4jFl0vG80GcNRdirx4nVWAzJmXkevgphP1qf4dsLQCpSKGM3DUQCojwU1hnepI63gNZdrr02wHUA==
+"@esbuild/linux-x64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz#8a0e9738b1635f0c53389e515ae83826dec22aa4"
+  integrity sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==
 
-"@esbuild/netbsd-x64@0.17.18":
-  version "0.17.18"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.18.tgz#789a203d3115a52633ff6504f8cbf757f15e703b"
-  integrity sha512-95IRY7mI2yrkLlTLb1gpDxdC5WLC5mZDi+kA9dmM5XAGxCME0F8i4bYH4jZreaJ6lIZ0B8hTrweqG1fUyW7jbg==
+"@esbuild/netbsd-x64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz#c29fb2453c6b7ddef9a35e2c18b37bda1ae5c462"
+  integrity sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==
 
-"@esbuild/openbsd-x64@0.17.18":
-  version "0.17.18"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.18.tgz#d7b998a30878f8da40617a10af423f56f12a5e90"
-  integrity sha512-WevVOgcng+8hSZ4Q3BKL3n1xTv5H6Nb53cBrtzzEjDbbnOmucEVcZeGCsCOi9bAOcDYEeBZbD2SJNBxlfP3qiA==
+"@esbuild/openbsd-x64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz#95e75a391403cb10297280d524d66ce04c920691"
+  integrity sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==
 
-"@esbuild/sunos-x64@0.17.18":
-  version "0.17.18"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.17.18.tgz#ecad0736aa7dae07901ba273db9ef3d3e93df31f"
-  integrity sha512-Rzf4QfQagnwhQXVBS3BYUlxmEbcV7MY+BH5vfDZekU5eYpcffHSyjU8T0xucKVuOcdCsMo+Ur5wmgQJH2GfNrg==
+"@esbuild/sunos-x64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz#722eaf057b83c2575937d3ffe5aeb16540da7273"
+  integrity sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==
 
-"@esbuild/win32-arm64@0.17.18":
-  version "0.17.18"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.17.18.tgz#58dfc177da30acf956252d7c8ae9e54e424887c4"
-  integrity sha512-Kb3Ko/KKaWhjeAm2YoT/cNZaHaD1Yk/pa3FTsmqo9uFh1D1Rfco7BBLIPdDOozrObj2sahslFuAQGvWbgWldAg==
+"@esbuild/win32-arm64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz#9aa9dc074399288bdcdd283443e9aeb6b9552b6f"
+  integrity sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==
 
-"@esbuild/win32-ia32@0.17.18":
-  version "0.17.18"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.17.18.tgz#340f6163172b5272b5ae60ec12c312485f69232b"
-  integrity sha512-0/xUMIdkVHwkvxfbd5+lfG7mHOf2FRrxNbPiKWg9C4fFrB8H0guClmaM3BFiRUYrznVoyxTIyC/Ou2B7QQSwmw==
+"@esbuild/win32-ia32@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz#95ad43c62ad62485e210f6299c7b2571e48d2b03"
+  integrity sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==
 
-"@esbuild/win32-x64@0.17.18":
-  version "0.17.18"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.18.tgz#3a8e57153905308db357fd02f57c180ee3a0a1fa"
-  integrity sha512-qU25Ma1I3NqTSHJUOKi9sAH1/Mzuvlke0ioMJRthLXKm7JiSKVwFghlGbDLOO2sARECGhja4xYfRAZNPAkooYg==
+"@esbuild/win32-x64@0.17.19":
+  version "0.17.19"
+  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":
   version "4.4.0"
@@ -1873,14 +1880,14 @@
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.1.tgz#cdd35dce4fa1a89a4fd42b1599eb35b3af408884"
   integrity sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==
 
-"@eslint/eslintrc@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.2.tgz#01575e38707add677cf73ca1589abba8da899a02"
-  integrity sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==
+"@eslint/eslintrc@^2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.3.tgz#4910db5505f4d503f27774bf356e3704818a0331"
+  integrity sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.5.1"
+    espree "^9.5.2"
     globals "^13.19.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
@@ -1888,10 +1895,10 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.39.0":
-  version "8.39.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.39.0.tgz#58b536bcc843f4cd1e02a7e6171da5c040f4d44b"
-  integrity sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==
+"@eslint/js@8.42.0":
+  version "8.42.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.42.0.tgz#484a1d638de2911e6f5a30c12f49c7e4a3270fb6"
+  integrity sha512-6SWlXpWU5AvId8Ac7zjzmIOqMOba/JWY8XZ4A7q7Gn1Vlfg/SFFIlrtHXt9nPn4op9ZPAkl91Jao+QQv3r/ukw==
 
 "@fontsource/inter@^4.5.15":
   version "4.5.15"
@@ -2032,10 +2039,10 @@
     tslib "^2.0.1"
     typescript "^4.0"
 
-"@humanwhocodes/config-array@^0.11.8":
-  version "0.11.8"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9"
-  integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==
+"@humanwhocodes/config-array@^0.11.10":
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.10.tgz#5a3ffe32cc9306365fb3fd572596cd602d5e12d2"
+  integrity sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==
   dependencies:
     "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
@@ -2256,10 +2263,10 @@
     "@netlify/esbuild-windows-64" "0.14.39"
     "@netlify/esbuild-windows-arm64" "0.14.39"
 
-"@netlify/functions@^1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@netlify/functions/-/functions-1.4.0.tgz#027a2e5d54df5519ccbd14cf450231e97bbbf93a"
-  integrity sha512-gy7ULTIRroc2/jyFVGx1djCmmBMVisIwrvkqggq5B6iDcInRSy2Tpkm+V5C63hKJVkNRskKWtLQKm9ecCaQTjA==
+"@netlify/functions@^1.4.0", "@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"
 
@@ -2280,12 +2287,12 @@
     unstorage "^1.0.0"
 
 "@netlify/plugin-nextjs@^4.27.3":
-  version "4.36.0"
-  resolved "https://registry.yarnpkg.com/@netlify/plugin-nextjs/-/plugin-nextjs-4.36.0.tgz#148c00c3034b8e350772ca0a9d3f121341dea8b9"
-  integrity sha512-xFcfYyK/p52xYWoCxWkIAVBsD/gzbyfLYJ70OFZm8NnlLMOqxJvNsO4XofJHJlNshteVZTF339oZTT4dgQ48Uw==
+  version "4.37.4"
+  resolved "https://registry.yarnpkg.com/@netlify/plugin-nextjs/-/plugin-nextjs-4.37.4.tgz#dfbeff83a67b9f9c3959506a8838f5fb1c0b104c"
+  integrity sha512-3LMKzF/EMnsE8EAc6i3BVUBcnwTC0K80fMPprdVo6L315dkqgCNXhOOvsBWyG14U8yhgd2YuD+X78kykfvQtqA==
   dependencies:
     "@netlify/esbuild" "0.14.39"
-    "@netlify/functions" "^1.4.0"
+    "@netlify/functions" "^1.6.0"
     "@netlify/ipx" "^1.4.0"
     "@vercel/node-bridge" "^2.1.0"
     chalk "^4.1.2"
@@ -2645,9 +2652,9 @@
     "@rollup/pluginutils" "^5.0.1"
 
 "@rollup/plugin-node-resolve@^15.0.2":
-  version "15.0.2"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.0.2.tgz#8183a80c2cbf7b471f5ac86b16747997f3b5d185"
-  integrity sha512-Y35fRGUjC3FaurG722uhUuG8YHOJRJQbI6/CkbRkdPotSpDj9NtIN85z1zrcyDcCQIW4qp5mgG72U+gJ0TAFEg==
+  version "15.1.0"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.1.0.tgz#9ffcd8e8c457080dba89bb9fcb583a6778dc757e"
+  integrity sha512-xeZHCgsiZ9pzYVgAo9580eCGqwh/XCEUM9q6iQfGNocjgkufHAqC3exA+45URvhiYV8sBF9RlBai650eNs7AsA==
   dependencies:
     "@rollup/pluginutils" "^5.0.1"
     "@types/resolve" "1.20.2"
@@ -3028,9 +3035,9 @@
   integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
 
 "@types/json-schema@^7.0.9":
-  version "7.0.11"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
-  integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
+  version "7.0.12"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
+  integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
 
 "@types/json-stable-stringify@^1.0.32":
   version "1.0.34"
@@ -3133,19 +3140,19 @@
     schema-utils "*"
 
 "@types/semver@^7.3.12":
-  version "7.3.13"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91"
-  integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.0.tgz#591c1ce3a702c45ee15f47a42ade72c2fd78978a"
+  integrity sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==
 
 "@typescript-eslint/eslint-plugin@^5.50.0":
-  version "5.59.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.2.tgz#684a2ce7182f3b4dac342eef7caa1c2bae476abd"
-  integrity sha512-yVrXupeHjRxLDcPKL10sGQ/QlVrA8J5IYOEWVqk0lJaSZP7X5DfnP7Ns3cc74/blmbipQ1htFNVGsHX6wsYm0A==
+  version "5.59.11"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.11.tgz#8d466aa21abea4c3f37129997b198d141f09e76f"
+  integrity sha512-XxuOfTkCUiOSyBWIvHlUraLw/JT/6Io1365RO6ZuI88STKMavJZPNMU0lFcUTeQXEhHiv64CbxYxBNoDVSmghg==
   dependencies:
     "@eslint-community/regexpp" "^4.4.0"
-    "@typescript-eslint/scope-manager" "5.59.2"
-    "@typescript-eslint/type-utils" "5.59.2"
-    "@typescript-eslint/utils" "5.59.2"
+    "@typescript-eslint/scope-manager" "5.59.11"
+    "@typescript-eslint/type-utils" "5.59.11"
+    "@typescript-eslint/utils" "5.59.11"
     debug "^4.3.4"
     grapheme-splitter "^1.0.4"
     ignore "^5.2.0"
@@ -3164,13 +3171,13 @@
     debug "^4.3.4"
 
 "@typescript-eslint/parser@^5.50.0":
-  version "5.59.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.59.2.tgz#c2c443247901d95865b9f77332d9eee7c55655e8"
-  integrity sha512-uq0sKyw6ao1iFOZZGk9F8Nro/8+gfB5ezl1cA06SrqbgJAt0SRoFhb9pXaHvkrxUpZaoLxt8KlovHNk8Gp6/HQ==
+  version "5.59.11"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.59.11.tgz#af7d4b7110e3068ce0b97550736de455e4250103"
+  integrity sha512-s9ZF3M+Nym6CAZEkJJeO2TFHHDsKAM3ecNkLuH4i4s8/RCPnF5JRip2GyviYkeEAcwGMJxkqG9h2dAsnA1nZpA==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.59.2"
-    "@typescript-eslint/types" "5.59.2"
-    "@typescript-eslint/typescript-estree" "5.59.2"
+    "@typescript-eslint/scope-manager" "5.59.11"
+    "@typescript-eslint/types" "5.59.11"
+    "@typescript-eslint/typescript-estree" "5.59.11"
     debug "^4.3.4"
 
 "@typescript-eslint/scope-manager@5.45.0":
@@ -3181,21 +3188,21 @@
     "@typescript-eslint/types" "5.45.0"
     "@typescript-eslint/visitor-keys" "5.45.0"
 
-"@typescript-eslint/scope-manager@5.59.2":
-  version "5.59.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.2.tgz#f699fe936ee4e2c996d14f0fdd3a7da5ba7b9a4c"
-  integrity sha512-dB1v7ROySwQWKqQ8rEWcdbTsFjh2G0vn8KUyvTXdPoyzSL6lLGkiXEV5CvpJsEe9xIdKV+8Zqb7wif2issoOFA==
+"@typescript-eslint/scope-manager@5.59.11":
+  version "5.59.11"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.11.tgz#5d131a67a19189c42598af9fb2ea1165252001ce"
+  integrity sha512-dHFOsxoLFtrIcSj5h0QoBT/89hxQONwmn3FOQ0GOQcLOOXm+MIrS8zEAhs4tWl5MraxCY3ZJpaXQQdFMc2Tu+Q==
   dependencies:
-    "@typescript-eslint/types" "5.59.2"
-    "@typescript-eslint/visitor-keys" "5.59.2"
+    "@typescript-eslint/types" "5.59.11"
+    "@typescript-eslint/visitor-keys" "5.59.11"
 
-"@typescript-eslint/type-utils@5.59.2":
-  version "5.59.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.59.2.tgz#0729c237503604cd9a7084b5af04c496c9a4cdcf"
-  integrity sha512-b1LS2phBOsEy/T381bxkkywfQXkV1dWda/z0PhnIy3bC5+rQWQDS7fk9CSpcXBccPY27Z6vBEuaPBCKCgYezyQ==
+"@typescript-eslint/type-utils@5.59.11":
+  version "5.59.11"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.59.11.tgz#5eb67121808a84cb57d65a15f48f5bdda25f2346"
+  integrity sha512-LZqVY8hMiVRF2a7/swmkStMYSoXMFlzL6sXV6U/2gL5cwnLWQgLEG8tjWPpaE4rMIdZ6VKWwcffPlo1jPfk43g==
   dependencies:
-    "@typescript-eslint/typescript-estree" "5.59.2"
-    "@typescript-eslint/utils" "5.59.2"
+    "@typescript-eslint/typescript-estree" "5.59.11"
+    "@typescript-eslint/utils" "5.59.11"
     debug "^4.3.4"
     tsutils "^3.21.0"
 
@@ -3204,10 +3211,10 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.45.0.tgz#794760b9037ee4154c09549ef5a96599621109c5"
   integrity sha512-QQij+u/vgskA66azc9dCmx+rev79PzX8uDHpsqSjEFtfF2gBUTRCpvYMh2gw2ghkJabNkPlSUCimsyBEQZd1DA==
 
-"@typescript-eslint/types@5.59.2":
-  version "5.59.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.2.tgz#b511d2b9847fe277c5cb002a2318bd329ef4f655"
-  integrity sha512-LbJ/HqoVs2XTGq5shkiKaNTuVv5tTejdHgfdjqRUGdYhjW1crm/M7og2jhVskMt8/4wS3T1+PfFvL1K3wqYj4w==
+"@typescript-eslint/types@5.59.11":
+  version "5.59.11"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.11.tgz#1a9018fe3c565ba6969561f2a49f330cf1fe8db1"
+  integrity sha512-epoN6R6tkvBYSc+cllrz+c2sOFWkbisJZWkOE+y3xHtvYaOE6Wk6B8e114McRJwFRjGvYdJwLXQH5c9osME/AA==
 
 "@typescript-eslint/typescript-estree@5.45.0":
   version "5.45.0"
@@ -3222,30 +3229,30 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/typescript-estree@5.59.2":
-  version "5.59.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.2.tgz#6e2fabd3ba01db5d69df44e0b654c0b051fe9936"
-  integrity sha512-+j4SmbwVmZsQ9jEyBMgpuBD0rKwi9RxRpjX71Brr73RsYnEr3Lt5QZ624Bxphp8HUkSKfqGnPJp1kA5nl0Sh7Q==
+"@typescript-eslint/typescript-estree@5.59.11":
+  version "5.59.11"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.11.tgz#b2caaa31725e17c33970c1197bcd54e3c5f42b9f"
+  integrity sha512-YupOpot5hJO0maupJXixi6l5ETdrITxeo5eBOeuV7RSKgYdU3G5cxO49/9WRnJq9EMrB7AuTSLH/bqOsXi7wPA==
   dependencies:
-    "@typescript-eslint/types" "5.59.2"
-    "@typescript-eslint/visitor-keys" "5.59.2"
+    "@typescript-eslint/types" "5.59.11"
+    "@typescript-eslint/visitor-keys" "5.59.11"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.59.2":
-  version "5.59.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.2.tgz#0c45178124d10cc986115885688db6abc37939f4"
-  integrity sha512-kSuF6/77TZzyGPhGO4uVp+f0SBoYxCDf+lW3GKhtKru/L8k/Hd7NFQxyWUeY7Z/KGB2C6Fe3yf2vVi4V9TsCSQ==
+"@typescript-eslint/utils@5.59.11":
+  version "5.59.11"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.11.tgz#9dbff49dc80bfdd9289f9f33548f2e8db3c59ba1"
+  integrity sha512-didu2rHSOMUdJThLk4aZ1Or8IcO3HzCw/ZvEjTTIfjIrcdd5cvSIwwDy2AOlE7htSNp7QIZ10fLMyRCveesMLg==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@types/json-schema" "^7.0.9"
     "@types/semver" "^7.3.12"
-    "@typescript-eslint/scope-manager" "5.59.2"
-    "@typescript-eslint/types" "5.59.2"
-    "@typescript-eslint/typescript-estree" "5.59.2"
+    "@typescript-eslint/scope-manager" "5.59.11"
+    "@typescript-eslint/types" "5.59.11"
+    "@typescript-eslint/typescript-estree" "5.59.11"
     eslint-scope "^5.1.1"
     semver "^7.3.7"
 
@@ -3257,12 +3264,12 @@
     "@typescript-eslint/types" "5.45.0"
     eslint-visitor-keys "^3.3.0"
 
-"@typescript-eslint/visitor-keys@5.59.2":
-  version "5.59.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.2.tgz#37a419dc2723a3eacbf722512b86d6caf7d3b750"
-  integrity sha512-EEpsO8m3RASrKAHI9jpavNv9NlEUebV4qmF1OWxSTtKSFBpC1NCmWazDQHFivRf0O1DV11BA645yrLEVQ0/Lig==
+"@typescript-eslint/visitor-keys@5.59.11":
+  version "5.59.11"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.11.tgz#dca561ddad169dc27d62396d64f45b2d2c3ecc56"
+  integrity sha512-KGYniTGG3AMTuKF9QBD7EIrvufkB6O6uX3knP73xbKLMpH+QRPcgnCxjWXSHjMRuOxFLovljqQgQpR0c7GvjoA==
   dependencies:
-    "@typescript-eslint/types" "5.59.2"
+    "@typescript-eslint/types" "5.59.11"
     eslint-visitor-keys "^3.3.0"
 
 "@umami/prisma-client@^0.2.0":
@@ -4124,10 +4131,10 @@ convert-source-map@^1.7.0:
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
   integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
 
-cookie-es@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/cookie-es/-/cookie-es-0.5.0.tgz#a6ad89923e68c542fc9e760b07aefa5ab020d719"
-  integrity sha512-RyZrFi6PNpBFbIaQjXDlFIhFVqV42QeKSZX1yQIl6ihImq6vcHNGMtqQ/QzY3RMPuYSkvsRwtnt5M9NeYxKt0g==
+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.25.1:
   version "3.26.0"
@@ -4558,12 +4565,7 @@ deepmerge@^2.1.1:
   resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz"
   integrity sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==
 
-deepmerge@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
-  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
-
-deepmerge@^4.3.1:
+deepmerge@^4.2.2, deepmerge@^4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
   integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
@@ -4896,32 +4898,32 @@ es-to-primitive@^1.2.1:
     is-symbol "^1.0.2"
 
 esbuild@^0.17.17:
-  version "0.17.18"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.18.tgz#f4f8eb6d77384d68cd71c53eb6601c7efe05e746"
-  integrity sha512-z1lix43jBs6UKjcZVKOw2xx69ffE2aG0PygLL5qJ9OS/gy0Ewd1gW/PUQIOIQGXBHWNywSc0floSKoMFF8aK2w==
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.19.tgz#087a727e98299f0462a3d0bcdd9cd7ff100bd955"
+  integrity sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==
   optionalDependencies:
-    "@esbuild/android-arm" "0.17.18"
-    "@esbuild/android-arm64" "0.17.18"
-    "@esbuild/android-x64" "0.17.18"
-    "@esbuild/darwin-arm64" "0.17.18"
-    "@esbuild/darwin-x64" "0.17.18"
-    "@esbuild/freebsd-arm64" "0.17.18"
-    "@esbuild/freebsd-x64" "0.17.18"
-    "@esbuild/linux-arm" "0.17.18"
-    "@esbuild/linux-arm64" "0.17.18"
-    "@esbuild/linux-ia32" "0.17.18"
-    "@esbuild/linux-loong64" "0.17.18"
-    "@esbuild/linux-mips64el" "0.17.18"
-    "@esbuild/linux-ppc64" "0.17.18"
-    "@esbuild/linux-riscv64" "0.17.18"
-    "@esbuild/linux-s390x" "0.17.18"
-    "@esbuild/linux-x64" "0.17.18"
-    "@esbuild/netbsd-x64" "0.17.18"
-    "@esbuild/openbsd-x64" "0.17.18"
-    "@esbuild/sunos-x64" "0.17.18"
-    "@esbuild/win32-arm64" "0.17.18"
-    "@esbuild/win32-ia32" "0.17.18"
-    "@esbuild/win32-x64" "0.17.18"
+    "@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.1.1:
   version "3.1.1"
@@ -5079,21 +5081,21 @@ eslint-scope@^7.2.0:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz#c7f0f956124ce677047ddbc192a68f999454dedc"
-  integrity sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994"
+  integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
 
 eslint@^8.33.0:
-  version "8.39.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.39.0.tgz#7fd20a295ef92d43809e914b70c39fd5a23cf3f1"
-  integrity sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==
+  version "8.42.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.42.0.tgz#7bebdc3a55f9ed7167251fe7259f75219cade291"
+  integrity sha512-ulg9Ms6E1WPf67PHaEY4/6E2tEn5/f7FXGzr3t9cBMugOmf1INYvuUwwh1aXQN4MfJ6a5K2iNwP3w4AColvI9A==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.4.0"
-    "@eslint/eslintrc" "^2.0.2"
-    "@eslint/js" "8.39.0"
-    "@humanwhocodes/config-array" "^0.11.8"
+    "@eslint/eslintrc" "^2.0.3"
+    "@eslint/js" "8.42.0"
+    "@humanwhocodes/config-array" "^0.11.10"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
     ajv "^6.10.0"
@@ -5103,8 +5105,8 @@ eslint@^8.33.0:
     doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
     eslint-scope "^7.2.0"
-    eslint-visitor-keys "^3.4.0"
-    espree "^9.5.1"
+    eslint-visitor-keys "^3.4.1"
+    espree "^9.5.2"
     esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
@@ -5112,13 +5114,12 @@ eslint@^8.33.0:
     find-up "^5.0.0"
     glob-parent "^6.0.2"
     globals "^13.19.0"
-    grapheme-splitter "^1.0.4"
+    graphemer "^1.4.0"
     ignore "^5.2.0"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
     is-path-inside "^3.0.3"
-    js-sdsl "^4.1.4"
     js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
@@ -5130,14 +5131,14 @@ eslint@^8.33.0:
     strip-json-comments "^3.1.0"
     text-table "^0.2.0"
 
-espree@^9.5.1:
-  version "9.5.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.1.tgz#4f26a4d5f18905bf4f2e0bd99002aab807e96dd4"
-  integrity sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==
+espree@^9.5.2:
+  version "9.5.2"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.2.tgz#e994e7dc33a082a7a82dceaf12883a829353215b"
+  integrity sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==
   dependencies:
     acorn "^8.8.0"
     acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.4.0"
+    eslint-visitor-keys "^3.4.1"
 
 esprima@^4.0.0:
   version "4.0.1"
@@ -5180,7 +5181,7 @@ estree-walker@^1.0.1:
 
 estree-walker@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
   integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
 
 esutils@^2.0.2:
@@ -5715,17 +5716,22 @@ grapheme-splitter@^1.0.4:
   resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
   integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
 
-h3@^1.6.4:
-  version "1.6.4"
-  resolved "https://registry.yarnpkg.com/h3/-/h3-1.6.4.tgz#0575995014f6a1a63ff3bbfe3eaf58da0972b9e8"
-  integrity sha512-uoDNeaoeDRwWBtwwi4siZ6l5sBmDJpnpcBssuAbvsaPBonl8vP7Ym4tFPe+tAvGM0GbUoC24wYcloCG+J9hqmA==
+graphemer@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
+
+h3@^1.6.6:
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/h3/-/h3-1.6.6.tgz#f7da8517ae3bf906716975e38f2d3c24ab79a239"
+  integrity sha512-DWu2s11OuuO9suEkX99dXaJoxd1RgPXiM4iDmLdrhGV63GLoav13f3Kdd5/Rw7xNKzhzn2+F2dleQjG66SnMPQ==
   dependencies:
-    cookie-es "^0.5.0"
+    cookie-es "^1.0.0"
     defu "^6.1.2"
     destr "^1.2.2"
-    iron-webcrypto "^0.6.0"
+    iron-webcrypto "^0.7.0"
     radix3 "^1.0.1"
-    ufo "^1.1.1"
+    ufo "^1.1.2"
     uncrypto "^0.1.2"
 
 har-schema@^2.0.0:
@@ -6006,10 +6012,10 @@ ipx@^0.9.11:
     ufo "^0.8.5"
     xss "^1.0.14"
 
-iron-webcrypto@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/iron-webcrypto/-/iron-webcrypto-0.6.0.tgz#3e597930b41363fc81a6ec415d25eb5000092144"
-  integrity sha512-WYgEQttulX/+JTv1BTJFYY3OsAb+ZnCuA53IjppZMyiRsVdGeEuZ/k4fJrg77Rzn0pp9/PgWtXUF+5HndDA5SQ==
+iron-webcrypto@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/iron-webcrypto/-/iron-webcrypto-0.7.0.tgz#781262e56127404c4e49e5e150a49408d3dec30f"
+  integrity sha512-WkX32iTcwd79ZsWRPP5wq1Jq6XXfPwO783ZiUBY8uMw4/AByx5WvBmxvYGnpVt6AOVJ0F41Qo420r8lIneT9Wg==
 
 is-array-buffer@^3.0.1:
   version "3.0.1"
@@ -6071,13 +6077,20 @@ is-ci@^3.0.1:
   dependencies:
     ci-info "^3.2.0"
 
-is-core-module@^2.11.0, is-core-module@^2.5.0, is-core-module@^2.8.1, is-core-module@^2.9.0:
+is-core-module@^2.11.0, is-core-module@^2.5.0, is-core-module@^2.8.1:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
   integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
   dependencies:
     has "^1.0.3"
 
+is-core-module@^2.9.0:
+  version "2.12.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd"
+  integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==
+  dependencies:
+    has "^1.0.3"
+
 is-date-object@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
@@ -6279,11 +6292,6 @@ joycon@^3.1.1:
   resolved "https://registry.yarnpkg.com/joycon/-/joycon-3.1.1.tgz#bce8596d6ae808f8b68168f5fc69280996894f03"
   integrity sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==
 
-js-sdsl@^4.1.4:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.4.0.tgz#8b437dbe642daa95760400b602378ed8ffea8430"
-  integrity sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg==
-
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -6696,10 +6704,10 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^9.0.3:
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-9.1.1.tgz#c58a93de58630b688de39ad04ef02ef26f1902f1"
-  integrity sha512-65/Jky17UwSb0BuB9V+MyDpsOtXKmYwzhyl+cOa9XUiI4uV2Ouy/2voFP3+al0BjZbJgMBD8FojMpAf+Z+qn4A==
+lru-cache@^9.1.1:
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-9.1.2.tgz#255fdbc14b75589d6d0e73644ca167a8db506835"
+  integrity sha512-ERJq3FOzJTxBbFjZ7iDs+NiK4VI9Wz+RdrrAB8dio1oV+YvdPzUEE4QNiT2VD51DkIbCYRUUzCRkssXCHqSnKQ==
 
 magic-string@^0.25.0, magic-string@^0.25.7:
   version "0.25.9"
@@ -6827,10 +6835,10 @@ 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.0.11:
-  version "4.0.14"
-  resolved "https://registry.yarnpkg.com/micro-memoize/-/micro-memoize-4.0.14.tgz#d1239ce2e5831125ac518509f5a23b54e7ca3e17"
-  integrity sha512-2tzWP1w2Hh+r7kCYa4f//jpBEA6dAueiuLco38NxfjF9Py3KCCI7wVOTdCvOhmTC043t+ulclVBdl3v+s+UJIQ==
+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.4, micromatch@^4.0.5:
   version "4.0.5"
@@ -6912,12 +6920,10 @@ minipass@^3.0.0:
   dependencies:
     yallist "^4.0.0"
 
-minipass@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.0.0.tgz#7cebb0f9fa7d56f0c5b17853cbe28838a8dbbd3b"
-  integrity sha512-g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw==
-  dependencies:
-    yallist "^4.0.0"
+minipass@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
+  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
 
 minizlib@^2.1.1:
   version "2.1.2"
@@ -6943,12 +6949,12 @@ mmdb-lib@2.0.2:
   integrity sha512-shi1I+fCPQonhTi7qyb6hr7hi87R7YS69FlfJiMFuJ12+grx0JyL56gLNzGTYXPU7EhAPkMLliGeyHer0K+AVA==
 
 moize@^6.1.0:
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/moize/-/moize-6.1.5.tgz#e9a589685a3de4266eeb5f2bbfdfe1a173265f1a"
-  integrity sha512-Fu46qKV9F8DOi2vXimR3yRw/JAJfFRQEFZeclvOFnG92AEFERqwFtu4PIxETYFtCghHGlU1itKcvvNioKgWGIw==
+  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.0.11"
+    micro-memoize "^4.1.2"
 
 moment-timezone@0.5.26:
   version "0.5.26"
@@ -7051,9 +7057,9 @@ nice-try@^1.0.4:
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
 node-abi@^3.3.0:
-  version "3.40.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.40.0.tgz#51d8ed44534f70ff1357dfbc3a89717b1ceac1b4"
-  integrity sha512-zNy02qivjjRosswoYmPi8hIKJRr8MpQyeKT6qlcq/OnOgA3Rhoae+IYOqsM9V5+JnHWmxKnWOT2GxvtqdtOCXA==
+  version "3.45.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.45.0.tgz#f568f163a3bfca5aacfce1fbeee1fa2cc98441f5"
+  integrity sha512-iwXuFrMAcFVi/ZoZiqq8BzAdsLw9kxDfTC0HMyjXfSL/6CSDAGD5UmR7azrAgWV1zKYq7dUUMj4owusBWKLsiQ==
   dependencies:
     semver "^7.3.5"
 
@@ -7072,15 +7078,15 @@ node-fetch-native@^0.1.8:
   resolved "https://registry.yarnpkg.com/node-fetch-native/-/node-fetch-native-0.1.8.tgz#19e2eaf6d86ac14e711ebd2612f40517c3468f2a"
   integrity sha512-ZNaury9r0NxaT2oL65GvdGDy+5PlSaHTovT6JV5tOW07k1TQmgC0olZETa4C9KZg0+6zBr99ctTYa3Utqj9P/Q==
 
-node-fetch-native@^1.0.2, node-fetch-native@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/node-fetch-native/-/node-fetch-native-1.1.0.tgz#a530f5c4cadb49b382dcf81d8f5f19ed0f457fbe"
-  integrity sha512-nl5goFCig93JZ9FIV8GHT9xpNqXbxQUzkOmKIMKmncsBH9jhg7qKex8hirpymkBFmNQ114chEEG5lS4wgK2I+Q==
+node-fetch-native@^1.1.1, node-fetch-native@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/node-fetch-native/-/node-fetch-native-1.2.0.tgz#13ec6df98f33168958dbfb6945f10aedf42e7ea8"
+  integrity sha512-5IAMBTl9p6PaAjYCnMv5FmqIF6GcZnawAVnzaCG0rX2aYZJ4CxEkZNtVPuTRug7fL7wyM5BQYTlAzcyMPi6oTQ==
 
 node-fetch@^2.0.0, node-fetch@^2.6.6:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6"
-  integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==
+  version "2.6.11"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.11.tgz#cde7fc71deef3131ef80a738919f999e6edfff25"
+  integrity sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==
   dependencies:
     whatwg-url "^5.0.0"
 
@@ -7243,13 +7249,13 @@ object.values@^1.1.6:
     es-abstract "^1.20.4"
 
 ofetch@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ofetch/-/ofetch-1.0.1.tgz#68b410d4494e37fa67b99e9a60172ae447b2c44c"
-  integrity sha512-icBz2JYfEpt+wZz1FRoGcrMigjNKjzvufE26m9+yUiacRQRHwnNlGRPiDnW4op7WX/MR6aniwS8xw8jyVelF2g==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ofetch/-/ofetch-1.1.0.tgz#f97ce927b3eb1384ce50fab0f81d039ad452c587"
+  integrity sha512-yjq2ZUUMto1ITpge2J5vNlUfteLzxfHn9aJC55WtVGD3okKwSfPoLaKpcHXmmKd2kZZUGo+jdkFuuj09Blyeig==
   dependencies:
     destr "^1.2.2"
-    node-fetch-native "^1.0.2"
-    ufo "^1.1.0"
+    node-fetch-native "^1.2.0"
+    ufo "^1.1.2"
 
 ohmyfetch@^0.4.18:
   version "0.4.21"
@@ -7961,11 +7967,11 @@ postcss-resolve-nested-selector@^0.1.1:
   integrity sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==
 
 postcss-rtlcss@^4.0.1:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-rtlcss/-/postcss-rtlcss-4.0.5.tgz#42001d456e38a9d86acbbe4ea4eb6ef300fdc4d4"
-  integrity sha512-Yh5DKJwiqwSsCV9frm41kHNY+IMiaqS+ERRGNZ7jkYXqtrEwfQoKZG55dUESz8Vq7NJlDefjOiZ3KlQ8Nomsfg==
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/postcss-rtlcss/-/postcss-rtlcss-4.0.6.tgz#86b58d2b4aa95396eb85065c14a679f0602a95d6"
+  integrity sha512-YNm6g2Y7Gngqtrpq3GC7cUkzH5Gq7aB+Lw9MSgF9s2ro1BDY7W4zqnd15g2ueatUUpSTg2/F5KDjQoTdjhbAKg==
   dependencies:
-    rtlcss "4.0.0"
+    rtlcss "4.1.0"
 
 postcss-safe-parser@^6.0.0:
   version "6.0.0"
@@ -8033,10 +8039,10 @@ postcss@^8.4.19:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-postcss@^8.4.21, postcss@^8.4.6:
-  version "8.4.23"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.23.tgz#df0aee9ac7c5e53e1075c24a3613496f9e6552ab"
-  integrity sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA==
+postcss@^8.4.21:
+  version "8.4.24"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.24.tgz#f714dba9b2284be3cc07dbd2fc57ee4dc972d2df"
+  integrity sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==
   dependencies:
     nanoid "^3.3.6"
     picocolors "^1.0.0"
@@ -8226,9 +8232,9 @@ react-dom@^18.2.0:
     scheduler "^0.23.0"
 
 react-error-boundary@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/react-error-boundary/-/react-error-boundary-4.0.4.tgz#d2e84505b0a67cec7a6bf33b0146faadfe31597d"
-  integrity sha512-AbqMFx8bCsob8rCHZvJYQ42MQijK0/034RUvan9qrqyJCpazr8d9vKHrysbxcr6odoHLZvQEcYomFPoIqH9fow==
+  version "4.0.10"
+  resolved "https://registry.yarnpkg.com/react-error-boundary/-/react-error-boundary-4.0.10.tgz#975cc298e93ab7760d1460b7ea5a7855621e355a"
+  integrity sha512-pvVKdi77j2OoPHo+p3rorgE43OjDWiqFkaqkJz8sJKK6uf/u8xtzuaVfj5qJ2JnDLIgF1De3zY5AJDijp+LVPA==
   dependencies:
     "@babel/runtime" "^7.12.5"
 
@@ -8473,9 +8479,9 @@ regenerator-transform@^0.15.1:
     "@babel/runtime" "^7.8.4"
 
 regexp-tree@^0.1.24:
-  version "0.1.25"
-  resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.25.tgz#1c864b07c06a198fc8153ddbe047897a5547305e"
-  integrity sha512-szcL3aqw+vEeuxhL1AMYRyeMP+goYF5I/guaH10uJX5xbGyeQeNPPneaj3ZWVmGLCDxrVaaYekkr5R12gk4dJw==
+  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.4.3:
   version "1.4.3"
@@ -8601,7 +8607,7 @@ resolve@^1.1.7:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-resolve@^1.10.0, resolve@^1.14.2, resolve@^1.22.0, resolve@^1.22.1:
+resolve@^1.10.0, resolve@^1.14.2, resolve@^1.22.0:
   version "1.22.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
   integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
@@ -8610,7 +8616,7 @@ resolve@^1.10.0, resolve@^1.14.2, resolve@^1.22.0, resolve@^1.22.1:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-resolve@^1.19.0:
+resolve@^1.19.0, resolve@^1.22.1:
   version "1.22.2"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
   integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
@@ -8681,9 +8687,9 @@ rollup-plugin-esbuild@^5.0.0:
     jsonc-parser "^3.2.0"
 
 rollup-plugin-node-externals@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-node-externals/-/rollup-plugin-node-externals-5.1.2.tgz#a0bb3a44f4a2ec9faaedce9e8a688414febe43e9"
-  integrity sha512-M32v8yPeVT0dYOYHfd6SNyl0X1xskB15jYFlwUPzIIVpLQ200KVlilbFsoNMUho4SnQuT7Di3s/aLm79bnP48w==
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-node-externals/-/rollup-plugin-node-externals-5.1.3.tgz#56dc316081187afbf943d81750c75d735f80c970"
+  integrity sha512-Q3VMjsn39r0/mjKrX++rFlC7kwL7YZdScdyU7BEo+PrEremal3mnol/1X+wQUU++7NeqC1ZNAeRYnHGtsTu9GQ==
 
 rollup-plugin-postcss@^4.0.2:
   version "4.0.2"
@@ -8728,14 +8734,14 @@ rollup@^2.70.1:
   optionalDependencies:
     fsevents "~2.3.2"
 
-rtlcss@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/rtlcss/-/rtlcss-4.0.0.tgz#ba73233b9c79fbf66eb867f2ae937713acbf2b40"
-  integrity sha512-j6oypPP+mgFwDXL1JkLCtm6U/DQntMUqlv5SOhpgHhdIE+PmBcjrtAHIpXfbIup47kD5Sgja9JDsDF1NNOsBwQ==
+rtlcss@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/rtlcss/-/rtlcss-4.1.0.tgz#f69b78d9752c970ddfe2aa590896f44353ab1c98"
+  integrity sha512-W+N4hh0nVqVrrn3mRkHakxpB+c9cQ4CRT67O39kgA+1DjyhrdsqyCqIuHXyvWaXn4/835n+oX3fYJCi4+G/06A==
   dependencies:
     escalade "^3.1.1"
     picocolors "^1.0.0"
-    postcss "^8.4.6"
+    postcss "^8.4.21"
     strip-json-comments "^3.1.1"
 
 run-parallel@^1.1.9:
@@ -8832,9 +8838,9 @@ semver@^7.3.4, semver@^7.3.8:
     lru-cache "^6.0.0"
 
 semver@^7.3.5, semver@^7.3.6, semver@^7.3.7:
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0"
-  integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==
+  version "7.5.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.2.tgz#5b851e66d1be07c1cdaf37dfc856f543325a2beb"
+  integrity sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==
   dependencies:
     lru-cache "^6.0.0"
 
@@ -9366,13 +9372,13 @@ tar-stream@^2.1.4:
     readable-stream "^3.1.1"
 
 tar@^6.1.2:
-  version "6.1.13"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b"
-  integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==
+  version "6.1.15"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.15.tgz#c9738b0b98845a3b344d334b8fa3041aaba53a69"
+  integrity sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
-    minipass "^4.0.0"
+    minipass "^5.0.0"
     minizlib "^2.1.1"
     mkdirp "^1.0.3"
     yallist "^4.0.0"
@@ -9616,10 +9622,10 @@ ufo@^0.8.5, ufo@^0.8.6:
   resolved "https://registry.yarnpkg.com/ufo/-/ufo-0.8.6.tgz#c0ec89bc0e0c9fa59a683680feb0f28b55ec323b"
   integrity sha512-fk6CmUgwKCfX79EzcDQQpSCMxrHstvbLswFChHS0Vump+kFkw7nJBfTZoC1j0bOGoY9I7R3n2DGek5ajbcYnOw==
 
-ufo@^1.0.0, ufo@^1.1.0, ufo@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.1.1.tgz#e70265e7152f3aba425bd013d150b2cdf4056d7c"
-  integrity sha512-MvlCc4GHrmZdAllBc0iUDowff36Q9Ndw/UzqmEKyrfSzokTd9ZCy1i+IIk5hrYKkjoYVQyNbrw7/F8XJ2rEwTg==
+ufo@^1.0.0, ufo@^1.1.1, ufo@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.1.2.tgz#d0d9e0fa09dece0c31ffd57bd363f030a35cfe76"
+  integrity sha512-TrY6DsjTQQgyS3E3dBaOXf0TpPD8u9FVrVYmKVegJuFw51n/YB9XPt+U6ydzFG5ZIN7+DIjPbNmXoBj9esYhgQ==
 
 unbox-primitive@^1.0.2:
   version "1.0.2"
@@ -9632,14 +9638,14 @@ unbox-primitive@^1.0.2:
     which-boxed-primitive "^1.0.2"
 
 uncrypto@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/uncrypto/-/uncrypto-0.1.2.tgz#225aa7d41a13e4ad07ed837aedfa975a93afa924"
-  integrity sha512-kuZwRKV615lEw/Xx3Iz56FKk3nOeOVGaVmw0eg+x4Mne28lCotNFbBhDW7dEBCBKyKbRQiCadEZeNAFPVC5cgw==
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/uncrypto/-/uncrypto-0.1.3.tgz#e1288d609226f2d02d8d69ee861fa20d8348ef2b"
+  integrity sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==
 
 undici@^5.12.0:
-  version "5.22.0"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-5.22.0.tgz#5e205d82a5aecc003fc4388ccd3d2c6e8674a0ad"
-  integrity sha512-fR9RXCc+6Dxav4P9VV/sp5w3eFiSdOjJYsbtWfd4s5L5C4ogyuVpdKIVHeW0vV1MloM65/f7W45nR9ZxwVdyiA==
+  version "5.22.1"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-5.22.1.tgz#877d512effef2ac8be65e695f3586922e1a57d7b"
+  integrity sha512-Ji2IJhFXZY0x/0tVBXeQwgPlLWw13GVzpsWPQ3rV50IFMMof2I55PZZxtm4P6iNq+L5znYN9nSTAq0ZyE6lSJw==
   dependencies:
     busboy "^1.6.0"
 
@@ -9700,21 +9706,21 @@ universalify@^2.0.0:
   integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
 
 unstorage@^1.0.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/unstorage/-/unstorage-1.5.0.tgz#0e1b6939ac17a3d6d1d7c44abe8dacb48ebcb464"
-  integrity sha512-bL6sHwTKp2ns0SAGNHAbLP9LwmtPGMtaOVrHRA4V8ngQMHQR18q0uRgkeGB4qF84XSDu/o8ebv54p/HBJESXFA==
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/unstorage/-/unstorage-1.6.1.tgz#144ea7d36852b69b74009e3bafa947154f6ac2c0"
+  integrity sha512-GUJzwbP5IStEGZy9/0peRqef5CY9icqApsSu8vxj13admjISyz1g5eYk2wPRBjmZhQ3DUMQ36q+zwTbe68khew==
   dependencies:
     anymatch "^3.1.3"
     chokidar "^3.5.3"
     destr "^1.2.2"
-    h3 "^1.6.4"
+    h3 "^1.6.6"
     ioredis "^5.3.2"
     listhen "^1.0.4"
-    lru-cache "^9.0.3"
+    lru-cache "^9.1.1"
     mri "^1.2.0"
-    node-fetch-native "^1.1.0"
+    node-fetch-native "^1.1.1"
     ofetch "^1.0.1"
-    ufo "^1.1.1"
+    ufo "^1.1.2"
 
 update-browserslist-db@^1.0.10:
   version "1.0.11"

From d950b2190f843868f11ae179e0b569c479bbfd07 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Thu, 15 Jun 2023 20:46:51 -0700
Subject: [PATCH 74/88] Upgrade prisma and next.

---
 package.json |   6 +-
 yarn.lock    | 174 ++++++++++++++++++++++++++++-----------------------
 2 files changed, 100 insertions(+), 80 deletions(-)

diff --git a/package.json b/package.json
index 3bf8343f..79a30883 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
   ],
   "dependencies": {
     "@fontsource/inter": "^4.5.15",
-    "@prisma/client": "4.13.0",
+    "@prisma/client": "4.15.0",
     "@tanstack/react-query": "^4.16.1",
     "@umami/prisma-client": "^0.2.0",
     "@umami/redis-client": "^0.5.0",
@@ -90,7 +90,7 @@
     "kafkajs": "^2.1.0",
     "maxmind": "^4.3.6",
     "moment-timezone": "^0.5.35",
-    "next": "13.3.1",
+    "next": "13.4.6",
     "next-basics": "^0.30.0",
     "node-fetch": "^3.2.8",
     "npm-run-all": "^4.1.5",
@@ -142,7 +142,7 @@
     "postcss-preset-env": "7.8.3",
     "postcss-rtlcss": "^4.0.1",
     "prettier": "^2.6.2",
-    "prisma": "4.13.0",
+    "prisma": "4.15.0",
     "prompts": "2.4.2",
     "rollup": "^2.70.1",
     "rollup-plugin-delete": "^2.0.0",
diff --git a/yarn.lock b/yarn.lock
index afd2a71f..31fbe8e0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2315,10 +2315,10 @@
     slash "^3.0.0"
     tiny-glob "^0.2.9"
 
-"@next/env@13.3.1":
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-13.3.1.tgz#589707043065f6b71d411ed9b8f1ffd057c0fd4a"
-  integrity sha512-EDtCoedIZC7JlUQ3uaQpSc4aVmyhbLHmQVALg7pFfQgOTjgSnn7mKtA0DiCMkYvvsx6aFb5octGMtWrOtGXW9A==
+"@next/env@13.4.6":
+  version "13.4.6"
+  resolved "https://registry.yarnpkg.com/@next/env/-/env-13.4.6.tgz#3f2041c7758660d7255707ae4cb9166519113dea"
+  integrity sha512-nqUxEtvDqFhmV1/awSg0K2XHNwkftNaiUqCYO9e6+MYmqNObpKVl7OgMkGaQ2SZnFx5YqF0t60ZJTlyJIDAijg==
 
 "@next/eslint-plugin-next@12.3.4":
   version "12.3.4"
@@ -2327,50 +2327,50 @@
   dependencies:
     glob "7.1.7"
 
-"@next/swc-darwin-arm64@13.3.1":
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.3.1.tgz#2c9719dd10a9cdf63bf50a7576b05dcf78999fe8"
-  integrity sha512-UXPtriEc/pBP8luSLSCZBcbzPeVv+SSjs9cH/KygTbhmACye8/OOXRZO13Z2Wq1G0gLmEAIHQAOuF+vafPd2lw==
+"@next/swc-darwin-arm64@13.4.6":
+  version "13.4.6"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.4.6.tgz#47485f3deaee6681b4a4036c74bb9c4b728d5ddd"
+  integrity sha512-ahi6VP98o4HV19rkOXPSUu+ovfHfUxbJQ7VVJ7gL2FnZRr7onEFC1oGQ6NQHpm8CxpIzSSBW79kumlFMOmZVjg==
 
-"@next/swc-darwin-x64@13.3.1":
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-13.3.1.tgz#0be90342c89e53a390ccd9bece15f7f5cd480049"
-  integrity sha512-lT36yYxosCfLtplFzJWgo0hrPu6/do8+msgM7oQkPeohDNdhjtjFUgOOwdSnPublLR6Mo2Ym4P/wl5OANuD2bw==
+"@next/swc-darwin-x64@13.4.6":
+  version "13.4.6"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-13.4.6.tgz#a6a5b232ec0f2079224fb8ed6bf11dc479af1acf"
+  integrity sha512-13cXxKFsPJIJKzUqrU5XB1mc0xbUgYsRcdH6/rB8c4NMEbWGdtD4QoK9ShN31TZdePpD4k416Ur7p+deMIxnnA==
 
-"@next/swc-linux-arm64-gnu@13.3.1":
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.3.1.tgz#a7353265839f8b8569a346a444dc3ab3770d297e"
-  integrity sha512-wRb76nLWJhonH8s3kxC/1tFguEkeOPayIwe9mkaz1G/yeS3OrjeyKMJsb4+Kdg0zbTo53bNCOl59NNtDM7yyyw==
+"@next/swc-linux-arm64-gnu@13.4.6":
+  version "13.4.6"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.4.6.tgz#2a67144e863d9c45fdbd13c7827370e7f2a28405"
+  integrity sha512-Ti+NMHEjTNktCVxNjeWbYgmZvA2AqMMI2AMlzkXsU7W4pXCMhrryAmAIoo+7YdJbsx01JQWYVxGe62G6DoCLaA==
 
-"@next/swc-linux-arm64-musl@13.3.1":
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.3.1.tgz#24552e6102c350e372f83f505a1d93c880551a50"
-  integrity sha512-qz3BzjJRZ16Iq/jrp+pjiYOc0jTjHlfmxQmZk9x/+5uhRP6/eWQSTAPVJ33BMo6oK5O5N4644OgTAbzXzorecg==
+"@next/swc-linux-arm64-musl@13.4.6":
+  version "13.4.6"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.4.6.tgz#5a191ac3575a70598e9e9c6e7264fc0b8a90b2db"
+  integrity sha512-OHoC6gO7XfjstgwR+z6UHKlvhqJfyMtNaJidjx3sEcfaDwS7R2lqR5AABi8PuilGgi0BO0O0sCXqLlpp3a0emQ==
 
-"@next/swc-linux-x64-gnu@13.3.1":
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.3.1.tgz#5f335a683b6eafa52307b12af97782993b6c45ff"
-  integrity sha512-6mgkLmwlyWlomQmpl21I3hxgqE5INoW4owTlcLpNsd1V4wP+J46BlI/5zV5KWWbzjfncIqzXoeGs5Eg+1GHODA==
+"@next/swc-linux-x64-gnu@13.4.6":
+  version "13.4.6"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.4.6.tgz#d38adf842a8b8f9de492454328fd32a2c53350f3"
+  integrity sha512-zHZxPGkUlpfNJCboUrFqwlwEX5vI9LSN70b8XEb0DYzzlrZyCyOi7hwDp/+3Urm9AB7YCAJkgR5Sp1XBVjHdfQ==
 
-"@next/swc-linux-x64-musl@13.3.1":
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.3.1.tgz#58e5aad6f97203a0788783f66324456c8f9cdb50"
-  integrity sha512-uqm5sielhQmKJM+qayIhgZv1KlS5pqTdQ99b+Z7hMWryXS96qE0DftTmMZowBcUL6x7s2vSXyH5wPtO1ON7LBg==
+"@next/swc-linux-x64-musl@13.4.6":
+  version "13.4.6"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.4.6.tgz#74c745774358b78be7f958e7a8b7d93936cd6ebc"
+  integrity sha512-K/Y8lYGTwTpv5ME8PSJxwxLolaDRdVy+lOd9yMRMiQE0BLUhtxtCWC9ypV42uh9WpLjoaD0joOsB9Q6mbrSGJg==
 
-"@next/swc-win32-arm64-msvc@13.3.1":
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.3.1.tgz#f8ed1badab57ed4503969758754e6fb0cf326753"
-  integrity sha512-WomIiTj/v3LevltlibNQKmvrOymNRYL+a0dp5R73IwPWN5FvXWwSELN/kiNALig/+T3luc4qHNTyvMCp9L6U5Q==
+"@next/swc-win32-arm64-msvc@13.4.6":
+  version "13.4.6"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.4.6.tgz#1e1e02c175573e64808fc1a7e8650e3e217f1edc"
+  integrity sha512-U6LtxEUrjBL2tpW+Kr1nHCSJWNeIed7U7l5o7FiKGGwGgIlFi4UHDiLI6TQ2lxi20fAU33CsruV3U0GuzMlXIw==
 
-"@next/swc-win32-ia32-msvc@13.3.1":
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.3.1.tgz#7f599c8975b09ee5527cc49b9e5a4d13be50635a"
-  integrity sha512-M+PoH+0+q658wRUbs285RIaSTYnGBSTdweH/0CdzDgA6Q4rBM0sQs4DHmO3BPP0ltCO/vViIoyG7ks66XmCA5g==
+"@next/swc-win32-ia32-msvc@13.4.6":
+  version "13.4.6"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.4.6.tgz#2b528ae3ec7f6e727f4f0d81a1015f63da55c7a6"
+  integrity sha512-eEBeAqpCfhdPSlCZCayjCiyIllVqy4tcqvm1xmg3BgJG0G5ITiMM4Cw2WVeRSgWDJqQGRyyb+q8Y2ltzhXOWsQ==
 
-"@next/swc-win32-x64-msvc@13.3.1":
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.3.1.tgz#192d43ab44ebb98bd4f5865d0e1d7ce62703182f"
-  integrity sha512-Sl1F4Vp5Z1rNXWZYqJwMuWRRol4bqOB6+/d7KqkgQ4AcafKPN1PZmpkCoxv4UFHtFNIB7EotnuIhtXu3zScicQ==
+"@next/swc-win32-x64-msvc@13.4.6":
+  version "13.4.6"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.4.6.tgz#38620bd68267ff13e50ecd432f1822eac51382a8"
+  integrity sha512-OrZs94AuO3ZS5tnqlyPRNgfWvboXaDQCi5aXGve3o3C+Sj0ctMUV9+Do+0zMvvLRumR8E0PTWKvtz9n5vzIsWw==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
@@ -2393,22 +2393,22 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@prisma/client@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-4.13.0.tgz#271d2b9756503ea17bbdb459c7995536cf2a6191"
-  integrity sha512-YaiiICcRB2hatxsbnfB66uWXjcRw3jsZdlAVxmx0cFcTc/Ad/sKdHCcWSnqyDX47vAewkjRFwiLwrOUjswVvmA==
+"@prisma/client@4.15.0":
+  version "4.15.0"
+  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-4.15.0.tgz#f52ec6ca6fbde37395a54b0a9e5da603a9de15f3"
+  integrity sha512-xnROvyABcGiwqRNdrObHVZkD9EjkJYHOmVdlKy1yGgI+XOzvMzJ4tRg3dz1pUlsyhKxXGCnjIQjWW+2ur+YXuw==
   dependencies:
-    "@prisma/engines-version" "4.13.0-50.1e7af066ee9cb95cf3a403c78d9aab3e6b04f37a"
+    "@prisma/engines-version" "4.15.0-28.8fbc245156db7124f997f4cecdd8d1219e360944"
 
-"@prisma/engines-version@4.13.0-50.1e7af066ee9cb95cf3a403c78d9aab3e6b04f37a":
-  version "4.13.0-50.1e7af066ee9cb95cf3a403c78d9aab3e6b04f37a"
-  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-4.13.0-50.1e7af066ee9cb95cf3a403c78d9aab3e6b04f37a.tgz#ae338908d11685dee50e7683502d75442b955bf9"
-  integrity sha512-fsQlbkhPJf08JOzKoyoD9atdUijuGBekwoOPZC3YOygXEml1MTtgXVpnUNchQlRSY82OQ6pSGQ9PxUe4arcSLQ==
+"@prisma/engines-version@4.15.0-28.8fbc245156db7124f997f4cecdd8d1219e360944":
+  version "4.15.0-28.8fbc245156db7124f997f4cecdd8d1219e360944"
+  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-4.15.0-28.8fbc245156db7124f997f4cecdd8d1219e360944.tgz#8d880becf996cffe08c78ad5afab6bc06090c990"
+  integrity sha512-sVOig4tjGxxlYaFcXgE71f/rtFhzyYrfyfNFUsxCIEJyVKU9rdOWIlIwQ2NQ7PntvGnn+x0XuFo4OC1jvPJKzg==
 
-"@prisma/engines@4.13.0":
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-4.13.0.tgz#582a6b90b6efeb0f465984f1fe0e72a4afaaa5ae"
-  integrity sha512-HrniowHRZXHuGT9XRgoXEaP2gJLXM5RMoItaY2PkjvuZ+iHc0Zjbm/302MB8YsPdWozAPHHn+jpFEcEn71OgPw==
+"@prisma/engines@4.15.0":
+  version "4.15.0"
+  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-4.15.0.tgz#d8687a9fda615fab88b75b466931280289de9e26"
+  integrity sha512-FTaOCGs0LL0OW68juZlGxFtYviZa4xdQj/rQEdat2txw0s3Vu/saAPKjNVXfIgUsGXmQ72HPgNr6935/P8FNAA==
 
 "@react-spring/animated@~9.5.5":
   version "9.5.5"
@@ -2906,10 +2906,10 @@
     "@svgr/plugin-jsx" "^6.5.1"
     "@svgr/plugin-svgo" "^6.5.1"
 
-"@swc/helpers@0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.0.tgz#bf1d807b60f7290d0ec763feea7ccdeda06e85f1"
-  integrity sha512-SjY/p4MmECVVEWspzSRpQEM3sjR17sP8PbGxELWrT+YZMBfiUyt1MRUNjMV23zohwlG2HYtCQOsCwsTHguXkyg==
+"@swc/helpers@0.5.1":
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.1.tgz#e9031491aa3f26bfcc974a67f48bd456c8a5357a"
+  integrity sha512-sJ902EfIzn1Fa+qYmjdQqh8tPsoxyBz+8yBKC2HKUxyezKJFwPGOn7pv4WY6QuQW//ySQi5lJjA/ZT9sNWWNTg==
   dependencies:
     tslib "^2.4.0"
 
@@ -5578,6 +5578,11 @@ glob-parent@^6.0.2:
   dependencies:
     is-glob "^4.0.3"
 
+glob-to-regexp@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
+  integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
+
 glob@7.1.7:
   version "7.1.7"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
@@ -7029,27 +7034,29 @@ next-basics@^0.30.0:
     jsonwebtoken "^9.0.0"
     pure-rand "^6.0.2"
 
-next@13.3.1:
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/next/-/next-13.3.1.tgz#17625f7423db2e059d71b41bd9031756cf2b33bc"
-  integrity sha512-eByWRxPzKHs2oQz1yE41LX35umhz86ZSZ+mYyXBqn2IBi2hyUqxBA88avywdr4uyH+hCJczegGsDGWbzQA5Rqw==
+next@13.4.6:
+  version "13.4.6"
+  resolved "https://registry.yarnpkg.com/next/-/next-13.4.6.tgz#ebe52f5c74d60176d45b45e73f25a51103713ea4"
+  integrity sha512-sjVqjxU+U2aXZnYt4Ud6CTLNNwWjdSfMgemGpIQJcN3Z7Jni9xRWbR0ie5fQzCg87aLqQVhKA2ud2gPoqJ9lGw==
   dependencies:
-    "@next/env" "13.3.1"
-    "@swc/helpers" "0.5.0"
+    "@next/env" "13.4.6"
+    "@swc/helpers" "0.5.1"
     busboy "1.6.0"
     caniuse-lite "^1.0.30001406"
     postcss "8.4.14"
     styled-jsx "5.1.1"
+    watchpack "2.4.0"
+    zod "3.21.4"
   optionalDependencies:
-    "@next/swc-darwin-arm64" "13.3.1"
-    "@next/swc-darwin-x64" "13.3.1"
-    "@next/swc-linux-arm64-gnu" "13.3.1"
-    "@next/swc-linux-arm64-musl" "13.3.1"
-    "@next/swc-linux-x64-gnu" "13.3.1"
-    "@next/swc-linux-x64-musl" "13.3.1"
-    "@next/swc-win32-arm64-msvc" "13.3.1"
-    "@next/swc-win32-ia32-msvc" "13.3.1"
-    "@next/swc-win32-x64-msvc" "13.3.1"
+    "@next/swc-darwin-arm64" "13.4.6"
+    "@next/swc-darwin-x64" "13.4.6"
+    "@next/swc-linux-arm64-gnu" "13.4.6"
+    "@next/swc-linux-arm64-musl" "13.4.6"
+    "@next/swc-linux-x64-gnu" "13.4.6"
+    "@next/swc-linux-x64-musl" "13.4.6"
+    "@next/swc-win32-arm64-msvc" "13.4.6"
+    "@next/swc-win32-ia32-msvc" "13.4.6"
+    "@next/swc-win32-x64-msvc" "13.4.6"
 
 nice-try@^1.0.4:
   version "1.0.5"
@@ -8088,12 +8095,12 @@ pretty-bytes@^5.6.0:
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
   integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
 
-prisma@4.13.0:
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/prisma/-/prisma-4.13.0.tgz#0b83f40acf50cd47d7463a135c4e9b275713e602"
-  integrity sha512-L9mqjnSmvWIRCYJ9mQkwCtj4+JDYYTdhoyo8hlsHNDXaZLh/b4hR0IoKIBbTKxZuyHQzLopb/+0Rvb69uGV7uA==
+prisma@4.15.0:
+  version "4.15.0"
+  resolved "https://registry.yarnpkg.com/prisma/-/prisma-4.15.0.tgz#4faa94f0d584828b68468953ff0bc88f37912c8c"
+  integrity sha512-iKZZpobPl48gTcSZVawLMQ3lEy6BnXwtoMj7hluoGFYu2kQ6F9LBuBrUyF95zRVnNo8/3KzLXJXJ5TEnLSJFiA==
   dependencies:
-    "@prisma/engines" "4.13.0"
+    "@prisma/engines" "4.15.0"
 
 promise.series@^0.2.0:
   version "0.2.0"
@@ -9813,6 +9820,14 @@ vue@^3.2.23:
     "@vue/server-renderer" "3.2.36"
     "@vue/shared" "3.2.36"
 
+watchpack@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
+  integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
+  dependencies:
+    glob-to-regexp "^0.4.1"
+    graceful-fs "^4.1.2"
+
 web-streams-polyfill@^3.0.3:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz#71c2718c52b45fd49dbeee88634b3a60ceab42a6"
@@ -9985,6 +10000,11 @@ yup@^0.32.11:
     property-expr "^2.0.4"
     toposort "^2.0.2"
 
+zod@3.21.4:
+  version "3.21.4"
+  resolved "https://registry.yarnpkg.com/zod/-/zod-3.21.4.tgz#10882231d992519f0a10b5dd58a38c9dabbb64db"
+  integrity sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==
+
 zustand@^4.3.8:
   version "4.3.8"
   resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.3.8.tgz#37113df8e9e1421b0be1b2dca02b49b76210e7c4"

From 292fa8c7dd6b19d8d0fcb2f7ce5559bc1ff2ed84 Mon Sep 17 00:00:00 2001
From: Anders <anders@liljeberg.nu>
Date: Sun, 18 Jun 2023 18:20:19 +0200
Subject: [PATCH 75/88] Update sv-SE.json

Long overdue update of Swedish
---
 lang/sv-SE.json | 94 ++++++++++++++++++++++++-------------------------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/lang/sv-SE.json b/lang/sv-SE.json
index 16a8d62a..53892e6a 100644
--- a/lang/sv-SE.json
+++ b/lang/sv-SE.json
@@ -1,27 +1,27 @@
 {
   "label.access-code": "Access code",
   "label.actions": "Händelser",
-  "label.activity-log": "Activity log",
+  "label.activity-log": "Aktivitetslogg",
   "label.add-website": "Lägg till webbsajt",
   "label.admin": "Administratör",
   "label.all": "Alla",
   "label.all-time": "Sedan början",
-  "label.analytics": "Analytics",
+  "label.analytics": "Analys",
   "label.average-visit-time": "Medelbesökstid",
   "label.back": "Tillbaka",
   "label.bounce-rate": "Avvisningfrekvens",
   "label.browsers": "Webbläsare",
   "label.cancel": "Avbryt",
   "label.change-password": "Byt lösenord",
-  "label.cities": "Cities",
-  "label.clear-all": "Clear all",
-  "label.confirm": "Confirm",
+  "label.cities": "Städer",
+  "label.clear-all": "Rensa alla",
+  "label.confirm": "Bekräfta",
   "label.confirm-password": "Bekräfta lösenord",
-  "label.continue": "Continue",
+  "label.continue": "Fortsätt",
   "label.countries": "Länder",
-  "label.create-team": "Create team",
-  "label.create-user": "Create user",
-  "label.created": "Created",
+  "label.create-team": "Skapa team",
+  "label.create-user": "Skapa användare",
+  "label.created": "Skapad",
   "label.current-password": "Nuvarande lösenord",
   "label.custom-range": "Anpassat urval",
   "label.dashboard": "Översikt",
@@ -29,37 +29,37 @@
   "label.date-range": "Datumomfång",
   "label.default-date-range": "Standard datum-urval",
   "label.delete": "Radera",
-  "label.delete-team": "Delete team",
-  "label.delete-user": "Delete user",
+  "label.delete-team": "Radera team",
+  "label.delete-user": "Radera användare",
   "label.delete-website": "Radera webbsajt",
   "label.desktop": "Stationär",
-  "label.details": "Details",
+  "label.details": "Detailjer",
   "label.devices": "Enheter",
   "label.dismiss": "Avbryt",
   "label.domain": "Domän",
   "label.edit": "Redigera",
-  "label.edit-dashboard": "Edit dashboard",
+  "label.edit-dashboard": "Redigera översikt",
   "label.enable-share-url": "Aktivera delnings-URL",
   "label.events": "Händelser",
   "label.filter-combined": "Kombinerade",
   "label.filter-raw": "Rådata",
-  "label.join": "Join",
-  "label.join-team": "Join team",
+  "label.join": "Gå med",
+  "label.join-team": "gå med i team",
   "label.language": "Språk",
   "label.languages": "Språk",
   "label.laptop": "Bärbar",
   "label.last-days": "Senaste {x} dagarna",
   "label.last-hours": "Senaste {x} timmarna",
-  "label.leave": "Leave",
-  "label.leave-team": "Leave team",
+  "label.leave": "Lämna",
+  "label.leave-team": "Lämna team",
   "label.login": "Logga in",
   "label.logout": "Logga ut",
-  "label.members": "Members",
+  "label.members": "Medlemmar",
   "label.mobile": "Mobil",
   "label.more": "Mer",
   "label.name": "Namn",
   "label.new-password": "Nytt lösenord",
-  "label.none": "None",
+  "label.none": "Inga",
   "label.operating-systems": "Operativsystem",
   "label.owner": "Ägare",
   "label.page-views": "Sidvisningar",
@@ -67,80 +67,80 @@
   "label.password": "Lösenord",
   "label.powered-by": "Drivs av {name}",
   "label.profile": "Profil",
-  "label.queries": "Queries",
-  "label.query-parameters": "Query parameters",
+  "label.queries": "Frågor",
+  "label.query-parameters": "Fråge-parametrar",
   "label.realtime": "Realtid",
   "label.referrers": "Hänvisare",
   "label.refresh": "Uppdatera",
-  "label.regenerate": "Regenerate",
-  "label.regions": "Regions",
-  "label.remove": "Remove",
+  "label.regenerate": "Regenerera",
+  "label.regions": "Regioner",
+  "label.remove": "Ta bort",
   "label.required": "Krävs",
   "label.reset": "Återställ",
   "label.reset-website": "Återställ statistik",
-  "label.role": "Role",
+  "label.role": "Roll",
   "label.save": "Spara",
-  "label.screens": "Screens",
-  "label.select-website": "Select website",
-  "label.sessions": "Sessions",
+  "label.screens": "Upplösning",
+  "label.select-website": "Välj webbsajt",
+  "label.sessions": "Session",
   "label.settings": "Inställningar",
   "label.share-url": "Delnings-URL",
   "label.single-day": "En dag",
   "label.tablet": "Platta",
   "label.team": "Team",
-  "label.team-guest": "Team guest",
+  "label.team-guest": "Team-gäst",
   "label.team-id": "Team ID",
-  "label.team-member": "Team member",
-  "label.team-owner": "Team owner",
-  "label.teams": "Teams",
+  "label.team-member": "Team-medlem",
+  "label.team-owner": "Team-ägare",
+  "label.teams": "Team",
   "label.theme": "Tema",
   "label.this-month": "Denna månad",
   "label.this-week": "Denna vecka",
   "label.this-year": "Detta år",
   "label.timezone": "Tidszon",
-  "label.title": "Title",
+  "label.title": "Titel",
   "label.today": "Idag",
   "label.toggle-charts": "Visa/göm grafer",
   "label.tracking-code": "Spårningskod",
   "label.unique-visitors": "Unika besökare",
   "label.unknown": "Okänd",
-  "label.user": "User",
+  "label.user": "Användare",
   "label.username": "Användarnamn",
   "label.users": "Users",
-  "label.view": "View",
+  "label.view": "Visa",
   "label.view-details": "Visa detaljer",
   "label.views": "Visningar",
   "label.visitors": "Besökare",
-  "label.website-id": "Website ID",
+  "label.website-id": "Webbsajt-ID",
   "label.websites": "Webbsajt",
-  "label.yesterday": "Yesterday",
+  "label.yesterday": "Igår",
   "message.active-users": "{x} {x, plural, one {besökare} other {besökare}} just nu",
   "message.confirm-delete": "Är du säker på att du vill radera {target}?",
-  "message.confirm-leave": "Are you sure you want to leave {target}?",
+  "message.confirm-leave": "Är du säker på att du vill lämna {target}?",
   "message.confirm-reset": "Är du säker på att du vill återställa statistiken för {target}?",
   "message.delete-website": "Radera webbsajt",
   "message.delete-website-warning": "All tillhörande data kommer också raderas.",
   "message.error": "Något gick fel.",
-  "message.event-log": "{event} on {url}",
+  "message.event-log": "{event} på {url}",
   "message.go-to-settings": "Gå till inställningar",
   "message.incorrect-username-password": "Felaktigt användarnamn/lösenord.",
   "message.invalid-domain": "Ogiltig domän",
-  "message.min-password-length": "Minimum length of {n} characters",
+  "message.min-password-length": "Minst {n} tecken",
   "message.no-data-available": "Ingen data tillgänglig.",
   "message.no-match-password": "Lösenorden är inte samma",
-  "message.no-teams": "You have not created any teams.",
-  "message.no-users": "There are no users.",
+  "message.no-teams": "Du har inte skapat några team.",
+  "message.no-users": "Det finns inga användare.",
   "message.page-not-found": "Sidan kan inte hittas.",
   "message.reset-website": "Återställ statistik",
   "message.reset-website-warning": "All statistik för webbsajten tas bort men spårningskoden förblir oförändrad.",
   "message.saved": "Sparades!",
   "message.share-url": "Det här är den offentliga delnings-URL:en för {target}.",
-  "message.team-already-member": "You are already a member of the team.",
-  "message.team-not-found": "Team not found.",
+  "message.team-already-member": "Du är redan medlem i teamet.",
+  "message.team-not-found": "Team kan inte hittas.",
   "message.tracking-code": "Spårningskod",
-  "message.user-deleted": "User deleted.",
+  "message.user-deleted": "Användare raderad.",
   "message.visitor-log": "Besökare från {country} med {browser} på {os} {device}",
-  "messages.no-team-websites": "This team does not have any websites.",
+  "messages.no-team-websites": "Det här teamet har inga webbsajter.",
   "messages.no-websites-configured": "Du har inga webbsajter.",
-  "messages.team-websites-info": "Websites can be viewed by anyone on the team."
+  "messages.team-websites-info": "Websajter kan ses av alla i teamet."
 }

From 689c40a670ee7e1f06bd2b8008934965f611f958 Mon Sep 17 00:00:00 2001
From: Anders <anders@liljeberg.nu>
Date: Sun, 18 Jun 2023 18:25:21 +0200
Subject: [PATCH 76/88] Update sv-SE.json

---
 lang/sv-SE.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang/sv-SE.json b/lang/sv-SE.json
index 53892e6a..1b641fbf 100644
--- a/lang/sv-SE.json
+++ b/lang/sv-SE.json
@@ -131,7 +131,7 @@
   "message.no-teams": "Du har inte skapat några team.",
   "message.no-users": "Det finns inga användare.",
   "message.page-not-found": "Sidan kan inte hittas.",
-  "message.reset-website": "Återställ statistik",
+  "message.reset-website": "För att återställa statistiken skriv {confirmation} i rutan nedan.",
   "message.reset-website-warning": "All statistik för webbsajten tas bort men spårningskoden förblir oförändrad.",
   "message.saved": "Sparades!",
   "message.share-url": "Det här är den offentliga delnings-URL:en för {target}.",

From 56f313493616911550e40279fd9a80e4790d4bee Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 19 Jun 2023 08:59:17 -0700
Subject: [PATCH 77/88] fix reset/delete website to english until proper
 translations. build language.

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

diff --git a/lang/ar-SA.json b/lang/ar-SA.json
index 3ed0d3a5..704ec7a7 100644
--- a/lang/ar-SA.json
+++ b/lang/ar-SA.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "هل أنت متأكد من مغادرة {target}?",
   "message.confirm-reset": "هل أنت متأكد من اعادة تعيين الإحصائيات لـ {target}؟",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "حذف الموقع",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "كافة البيانات المرتبطة سيم حذفها ايضا.",
   "message.error": "حدث خطأ ما.",
   "message.event-log": "{event} في {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "لم تقم بإنشاء اي مجموعة.",
   "message.no-users": "لا يوجد مستخدمين.",
   "message.page-not-found": "الصفحة غير موجودة.",
-  "message.reset-website": "اعادة تعيين الإحصائيات",
+  "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}.",
diff --git a/lang/be-BY.json b/lang/be-BY.json
index 76844060..8f021fa4 100644
--- a/lang/be-BY.json
+++ b/lang/be-BY.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Вы дакладна хочаце скінуць {target} статыстыку?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Выдаліць сайт",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "Усе асацыяваныя дадзеныя будуць таксама выдалены.",
   "message.error": "Нешта пайшло не так.",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "Старонка не знойдзена.",
-  "message.reset-website": "Скінуць статыстыку",
+  "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}.",
diff --git a/lang/bn-BD.json b/lang/bn-BD.json
index 01af693c..e09e3f6c 100644
--- a/lang/bn-BD.json
+++ b/lang/bn-BD.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "আপনি কি নিশ্চিত যে আপনি {target} এর পরিসংখ্যান পুনরায় সেট করতে চান?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "ওয়েবসাইট মুছুন",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "সমস্ত সম্পর্কিত ডেটা পাশাপাশি মুছে ফেলা হবে।",
   "message.error": "কিছু ভুল হয়েছে।",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "পৃষ্ঠা খুঁজে পাওয়া যায়নি।",
-  "message.reset-website": "ওয়েবসাইট রিসেট করুন",
+  "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} এর জন্য প্রকাশ্যে শেয়ার করার ইউআরএল।",
diff --git a/lang/ca-ES.json b/lang/ca-ES.json
index 31c6c3e5..e81aa208 100644
--- a/lang/ca-ES.json
+++ b/lang/ca-ES.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Segur que vols restablir les estadístiques de {target}?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Esborra el lloc web",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "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}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "No s'ha trobat la pàgina.",
-  "message.reset-website": "Restableix estadístiques",
+  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "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}.",
diff --git a/lang/cs-CZ.json b/lang/cs-CZ.json
index a2bc4577..0dd231c7 100644
--- a/lang/cs-CZ.json
+++ b/lang/cs-CZ.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Smazat web",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "Všechna související data budou také smazána.",
   "message.error": "Něco se pokazilo.",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "Stránka nenalezena.",
-  "message.reset-website": "Reset statistics",
+  "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.saved": "Úspěšně uloženo.",
   "message.share-url": "Toto je sdílené URL pro {target}.",
diff --git a/lang/da-DK.json b/lang/da-DK.json
index 2b437fbd..3a9e31dd 100644
--- a/lang/da-DK.json
+++ b/lang/da-DK.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Er du sikker på at du ville nulstille {target}'s statistikker?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Slet hjemmeside",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "Alle tilknyttede data slettes også.",
   "message.error": "Noget gik galt.",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "Side ikke fundet.",
-  "message.reset-website": "Nulstil statistikker",
+  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Alle statistikker for denne hjemmeside ville blive slettet, men sporingskode ville forblive intakt.",
   "message.saved": "Gemt!",
   "message.share-url": "Dette er den offentlige delings-URL til {target}.",
diff --git a/lang/de-CH.json b/lang/de-CH.json
index 1c2f8fde..b0514a87 100644
--- a/lang/de-CH.json
+++ b/lang/de-CH.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Sind Sie sich sicher, {target} zverlah?",
   "message.confirm-reset": "Sind Sie sicher, dass Sie dStatistike vo {target} zruggsetze wend?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Websiite lösche",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "Alli dezueghörige Date werdet ebefalls glöscht.",
   "message.error": "Es isch en Fehler uftrete.",
   "message.event-log": "{event} uf {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "Bisher sind no kei Teams erstellt worde.",
   "message.no-users": "Da gits kei Benutzer",
   "message.page-not-found": "Siite ned gfunde.",
-  "message.reset-website": "Statistik zruggsetze",
+  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "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:",
diff --git a/lang/de-DE.json b/lang/de-DE.json
index aa84f725..da9e2a57 100644
--- a/lang/de-DE.json
+++ b/lang/de-DE.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Sind Sie sicher, dass die {target} verlassen möchten?",
   "message.confirm-reset": "Sind Sie sicher, dass Sie die Statistiken von {target} zurücksetzen wollen?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Webseite löschen",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "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}",
@@ -139,7 +139,7 @@
   "message.no-teams": "Bisher wurden keine Teams erstellt.",
   "message.no-users": "Hier gibt es keine Benutzer.",
   "message.page-not-found": "Seite nicht gefunden.",
-  "message.reset-website": "Statistik zurücksetzen",
+  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Alle Daten für diese Webseite werden gelöscht, jedoch bleibt der Tracking Code bestehen.",
   "message.saved": "Erfolgreich gespeichert.",
   "message.share-url": "Ihre Webseitenstatistik ist unter der folgenden URL öffentlich zugänglich:",
diff --git a/lang/el-GR.json b/lang/el-GR.json
index 06f82484..4e46fe11 100644
--- a/lang/el-GR.json
+++ b/lang/el-GR.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Διαγραφή ιστότοπου",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "Όλα τα σχετικά δεδομένα θα διαγραφούν επίσης.",
   "message.error": "Κάτι πήγε στραβά.",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "Η σελίδα δεν βρέθηκε.",
-  "message.reset-website": "Reset statistics",
+  "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.saved": "Αποθηκεύτηκε επιτυχώς.",
   "message.share-url": "Αυτό είναι το κοινόχρηστο URL για το {target}.",
diff --git a/lang/en-GB.json b/lang/en-GB.json
index 95fe2439..300a5c31 100644
--- a/lang/en-GB.json
+++ b/lang/en-GB.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are you sure you want to reset {target}'s statistics?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Delete website",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "All associated data will be deleted as well.",
   "message.error": "Something went wrong.",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "Page not found.",
-  "message.reset-website": "Reset statistics",
+  "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.saved": "Saved successfully.",
   "message.share-url": "This is the publicly shared URL for {target}.",
diff --git a/lang/es-MX.json b/lang/es-MX.json
index 6435758d..220f9490 100644
--- a/lang/es-MX.json
+++ b/lang/es-MX.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "¿Seguro que quieres abandonar {target}?",
   "message.confirm-reset": "¿Seguro que quieres BORRAR las analíticas de {target}?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Eliminar sitio web",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "Toda la información relacionada será eliminada.",
   "message.error": "Algo falló.",
   "message.event-log": "{event} en {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "No has creado ningún equipo.",
   "message.no-users": "No hay usuarios.",
   "message.page-not-found": "Página no encontrada",
-  "message.reset-website": "Reiniciar estadísticas",
+  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Todas las estadísticas de esta página serán eliminadas, pero el código de rastreo permanecerá intacto.",
   "message.saved": "Guardado.",
   "message.share-url": "Esta es la URL compartida públicamente para {target}.",
diff --git a/lang/fa-IR.json b/lang/fa-IR.json
index 477481c2..ccdfa14f 100644
--- a/lang/fa-IR.json
+++ b/lang/fa-IR.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "آیا از بازنشانی آمار {target} مطمئن هستید?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "حذف وب‌سایت",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "همه‌ی داده‌های مرتبط هم حذف خواهد شد.",
   "message.error": "مشکلی پیش آمده است.",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "صفحه یافت نشد.",
-  "message.reset-website": "بازنشانی آمار",
+  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "تمامی آمارهای این وب‌سایت حذف خواهد شد اما tracking code بدون تغییر باقی می‌ماند.",
   "message.saved": "با موفقیت ذخیره شد.",
   "message.share-url": "این URL به اشتراک گذاشته شده عمومی برای {target} است.",
diff --git a/lang/fi-FI.json b/lang/fi-FI.json
index 4031f115..015283dc 100644
--- a/lang/fi-FI.json
+++ b/lang/fi-FI.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Haluatko varmasti poistaa sivuston {target} tilastot?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Poista verkkosivu",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "Kaikki siihen liittyvät tiedot poistetaan.",
   "message.error": "Jotain meni pieleen.",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "Sivua ei löydetty.",
-  "message.reset-website": "Nollaa tilastot",
+  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Kaikki sivuston tilastot poistetaan, mutta seurantakoodi pysyy muuttumattomana.",
   "message.saved": "Tallennettu onnistuneesti.",
   "message.share-url": "Tämä on julkisesti jaettu URL sivustolle {target}.",
diff --git a/lang/fo-FO.json b/lang/fo-FO.json
index ed8e7208..e5aa0e6d 100644
--- a/lang/fo-FO.json
+++ b/lang/fo-FO.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Sletta heimasíðu",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "Øll data ið er knýtt at verður eisini strika.",
   "message.error": "Okkurt bleiv gali.",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "Síðan bleiv ikki funnin.",
-  "message.reset-website": "Reset statistics",
+  "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.saved": "Goymt.",
   "message.share-url": "Hettar er tann almenna leinkan av {target}.",
diff --git a/lang/fr-FR.json b/lang/fr-FR.json
index a7f54219..7eb64816 100644
--- a/lang/fr-FR.json
+++ b/lang/fr-FR.json
@@ -139,7 +139,7 @@
   "message.no-teams": "Vous n'avez créé aucune équipe.",
   "message.no-users": "Il n'y aucun utilisateur.",
   "message.page-not-found": "Page non trouvée.",
-  "message.reset-website": "Réinitialiser les statistiques",
+  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Toutes les statistiques pour ce site seront supprimées, mais votre code de suivi restera intact.",
   "message.saved": "Enregistré avec succès.",
   "message.share-url": "Les statistiques de votre site sont accessibles publiquement sur cette URL :",
diff --git a/lang/ga-ES.json b/lang/ga-ES.json
index 35f312c7..73a6ef7b 100644
--- a/lang/ga-ES.json
+++ b/lang/ga-ES.json
@@ -81,7 +81,7 @@
   "label.reports": "Reports",
   "label.required": "Requerido",
   "label.reset": "Restablecer",
-  "label.reset-website": "Restablecer estatísticas",
+  "label.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "label.role": "Role",
   "label.save": "Gardar",
   "label.screens": "Screens",
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Tes a certeza de querer restablecer as estatísticas de {target}?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Eliminar sitio web",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "Tamén serán borrados tódolos datos asociados.",
   "message.error": "Houbo un fallo.",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "Páxina non atopada.",
-  "message.reset-website": "Restablecer estatísticas",
+  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Vanse eliminar tódalas estatísticas deste sitio web, pero o código de seguimento permanecerá sen cambios.",
   "message.saved": "Gardouse correctamente.",
   "message.share-url": "Este é o URL da compartición pública de {target}.",
diff --git a/lang/he-IL.json b/lang/he-IL.json
index df9a5cd6..881ad018 100644
--- a/lang/he-IL.json
+++ b/lang/he-IL.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "הסרת אתר",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "כל המידע המקושר יימחק",
   "message.error": "משהו השתבש",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "דף לא נמצא",
-  "message.reset-website": "Reset statistics",
+  "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.saved": "נשמר בהצלחה",
   "message.share-url": "זהו URL ציבורי עבור {target}",
diff --git a/lang/hi-IN.json b/lang/hi-IN.json
index bddae4c8..0129395b 100644
--- a/lang/hi-IN.json
+++ b/lang/hi-IN.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "वेबसाइट हटाएं",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "सभी संबद्ध डेटा को भी हटा दिया जाएगा।",
   "message.error": "कुछ गलत हो गया।",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "पृष्ठ नहीं मिला।",
-  "message.reset-website": "Reset statistics",
+  "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.saved": "सफलतापूर्वक संचित कर लिया गया है।",
   "message.share-url": "यह {target} के लिए सार्वजनिक रूप से साझा किया गया URL है।",
diff --git a/lang/hu-HU.json b/lang/hu-HU.json
index 23ddf608..5acaaf38 100644
--- a/lang/hu-HU.json
+++ b/lang/hu-HU.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Weboldal eltávolítása",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "Minden társított adat törlésre kerül.",
   "message.error": "Valami baj történt.",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "Oldal nem található.",
-  "message.reset-website": "Reset statistics",
+  "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.saved": "Sikeres mentés.",
   "message.share-url": "{target} nyilvánosan megosztott URL címe.",
diff --git a/lang/id-ID.json b/lang/id-ID.json
index b8d396c1..764bdb37 100644
--- a/lang/id-ID.json
+++ b/lang/id-ID.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Anda yakin ingin mengatur ulang statistik {target}?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Hapus situs web",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "Semua data terkait juga akan dihapus.",
   "message.error": "Ada yang salah.",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "Halaman tidak ditemukan.",
-  "message.reset-website": "Atur ulang statistik",
+  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Semua statistik pada website ini akan dihapus, tetapi kode lacak akan tetap terpasang",
   "message.saved": "Berhasil disimpan.",
   "message.share-url": "Ini adalah URL yang dibagikan secara publik untuk {target}.",
diff --git a/lang/it-IT.json b/lang/it-IT.json
index efdacda3..88b301aa 100644
--- a/lang/it-IT.json
+++ b/lang/it-IT.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Sei sicuro di voler azzerare le statistiche di {target}?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Elimina sito",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "Saranno eliminati anche tutti i dati associati.",
   "message.error": "Si è verificato un errore.",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "Pagina non trovata",
-  "message.reset-website": "Resetta le statistiche",
+  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Tutte le statistiche verranno cancellate per questo sito, ma il tuo codice di tracciamento rimarrà invariato.",
   "message.saved": "Salvato!",
   "message.share-url": "Questo è l'URL di condivisione per {target}.",
diff --git a/lang/ja-JP.json b/lang/ja-JP.json
index 14031177..df9ef289 100644
--- a/lang/ja-JP.json
+++ b/lang/ja-JP.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Webサイトの削除",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "関連するすべてのデータも削除されます。",
   "message.error": "問題が発生しました。",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "ページが見つかりません。",
-  "message.reset-website": "Reset statistics",
+  "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.saved": "正常に保存されました。",
   "message.share-url": "これは{target}の共有リンクです。",
diff --git a/lang/km-KH.json b/lang/km-KH.json
index edcb25e7..7721bde2 100644
--- a/lang/km-KH.json
+++ b/lang/km-KH.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "តើអ្នកប្រាកដថាចង់កំណត់ស្ថិតិរបស់ {target} ឡើងវិញទេ?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "លុបគេហទំព័រ",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "ទិន្នន័យដែលពាក់ព័ន្ធទាំងអស់នឹងត្រូវបានលុបផងដែរ។",
   "message.error": "មាន​អ្វីមួយ​មិន​ប្រក្រតី។",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "រកមិនឃើញទំព័រ។",
-  "message.reset-website": "កំណត់ស្ថិតិឡើងវិញ",
+  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "ស្ថិតិទាំងអស់សម្រាប់គេហទំព័រនេះនឹងត្រូវបានលុប ប៉ុន្តែកូដតាមដានរបស់អ្នកនឹងនៅដដែល។",
   "message.saved": "រក្សាទុកដោយជោគជ័យ។",
   "message.share-url": "នេះគឺជា URL ដែលបានចែករំលែកជាសាធារណៈសម្រាប់ {target}។",
diff --git a/lang/ko-KR.json b/lang/ko-KR.json
index d927dd77..6cb7a782 100644
--- a/lang/ko-KR.json
+++ b/lang/ko-KR.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "웹사이트 삭제",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "관련된 모든 데이터도 삭제됩니다.",
   "message.error": "오류가 발생하였습니다.",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "페이지를 찾을 수 없습니다.",
-  "message.reset-website": "Reset statistics",
+  "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.saved": "성공적으로 저장되었습니다.",
   "message.share-url": "이것은 {target}의 공개적으로 공유된 URL입니다.",
diff --git a/lang/lt-LT.json b/lang/lt-LT.json
index 9ccf6202..da13479b 100644
--- a/lang/lt-LT.json
+++ b/lang/lt-LT.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are esate tikri, jog norite atstatyti svetainės {target} statistikos duomenis?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Ištrinti svetainę",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "Visi susiję duomenys taip pat bus ištrinti.",
   "message.error": "Kažkas įvyko ne taip.",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "Puslapis nerastas.",
-  "message.reset-website": "Atstatyti statistikos duomenis",
+  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Visi šios svetainės statistikos duomenys bus ištrinti, bet sekimo kodas išliks nepaliestas.",
   "message.saved": "Sėkmingai išsaugota.",
   "message.share-url": "Tai yra viešai prieinama {target} nuoroda (URL).",
diff --git a/lang/mn-MN.json b/lang/mn-MN.json
index e9d9fa34..3cd9a4b7 100644
--- a/lang/mn-MN.json
+++ b/lang/mn-MN.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Та {target}-с гарахдаа итгэлтэй байна уу?",
   "message.confirm-reset": "Та {target}-н тоон үзүүлэлтүүдийг устгахдаа итгэлтэй байна уу?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Веб устгахын тулд доорх хэсэгт {confirmation} гэж бичиж, баталгаажуулна уу.",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "Энэ вебтэй холбоотой бүх өгөгдөл устах болно.",
   "message.error": "Ямар нэг зүйл буруу боллоо.",
   "message.event-log": "{url}-д {event}",
diff --git a/lang/ms-MY.json b/lang/ms-MY.json
index 97c37c58..6cfecaaf 100644
--- a/lang/ms-MY.json
+++ b/lang/ms-MY.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Padam laman web",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "Semua data yang berkaitan juga akan dihapuskan.",
   "message.error": "Ada yang tidak kena.",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "Halaman tidak dijumpai.",
-  "message.reset-website": "Reset statistics",
+  "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.saved": "Berjaya disimpan.",
   "message.share-url": "Ini adalah URL berkongsi untuk {target}.",
diff --git a/lang/nb-NO.json b/lang/nb-NO.json
index 84ab9b9f..c8d79463 100644
--- a/lang/nb-NO.json
+++ b/lang/nb-NO.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Er du sikker på at du vil nullstille {target}'s statistikk?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Slett nettstedet",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "Alle tilknyttede data slettes også.",
   "message.error": "Noe gikk galt.",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "Side ikke funnet.",
-  "message.reset-website": "Nullstill statistikk",
+  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistikk for denne nettsiden vil bli slettet, men sporingskoden din vil forbli uberørt.",
   "message.saved": "Lagret!",
   "message.share-url": "Dette er den offentlige delings-URL-en for {target}.",
diff --git a/lang/nl-NL.json b/lang/nl-NL.json
index 9291dace..59866387 100644
--- a/lang/nl-NL.json
+++ b/lang/nl-NL.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Weet je zeker dat je {target} wilt verlaten?",
   "message.confirm-reset": "Weet je zeker dat je de statistieken van {target} opnieuw wilt instellen?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Website verwijderen",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "Alle verwante gegezens zullen ook verwijderd worden.",
   "message.error": "Er is iets misgegaan.",
   "message.event-log": "{event} op {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "Er zijn nog geen teams aangemaakt.",
   "message.no-users": "Er zijn geen gebruikers.",
   "message.page-not-found": "Pagina niet gevonden.",
-  "message.reset-website": "Statistieken opnieuw instellen",
+  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Alle bijhorende statistieken van deze website worden verwijderd, maar jouw volgcode blijft gelden.",
   "message.saved": "Opslaan succesvol.",
   "message.share-url": "Met deze URL kan {target} openbaar gedeeld worden.",
diff --git a/lang/pl-PL.json b/lang/pl-PL.json
index 899ad891..bc710b45 100644
--- a/lang/pl-PL.json
+++ b/lang/pl-PL.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Czy na pewno chcesz opuścić {target}?",
   "message.confirm-reset": "Czy na pewno chcesz zresetować statystyki {target}?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Usuń witrynę",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "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}",
@@ -139,7 +139,7 @@
   "message.no-teams": "Nie stworzyłeś żadnych zespołów.",
   "message.no-users": "Nie ma żadnych użytkowników.",
   "message.page-not-found": "Strona nie znaleziona.",
-  "message.reset-website": "Zresetuj statystyki",
+  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Wszystkie statystyki tej witryny zostaną usunięte, ale kod śledzenia pozostanie nienaruszony.",
   "message.saved": "Zapisano pomyślnie.",
   "message.share-url": "To jest publicznie udostępniany adres URL dla {target}.",
diff --git a/lang/pt-BR.json b/lang/pt-BR.json
index 0835544f..56f06a14 100644
--- a/lang/pt-BR.json
+++ b/lang/pt-BR.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Você tem certeza que deseja sair de {target}?",
   "message.confirm-reset": "Você tem certeza que deseja redefinir as estatísticas de {target}?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Remover site",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "Todos os dados associados também serão eliminados.",
   "message.error": "Ocorreu um erro.",
   "message.event-log": "{event} em {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "Você não criou nenhum time.",
   "message.no-users": "Não há nenhum usuário.",
   "message.page-not-found": "Página não encontrada.",
-  "message.reset-website": "Redefinir estatísticas",
+  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "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}.",
diff --git a/lang/pt-PT.json b/lang/pt-PT.json
index e39c89cc..d3d60f13 100644
--- a/lang/pt-PT.json
+++ b/lang/pt-PT.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Tem a certeza que pretende restaurar as estatísticas de {target}?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Eliminar website",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "Todos os dados associados também serão eliminados.",
   "message.error": "Ocorreu um erro.",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "Página não encontrada.",
-  "message.reset-website": "Repor estatísticas",
+  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Todas as estatísticas deste site serão eliminadas, mas o seu código de rastreamento permanecerá intacto.",
   "message.saved": "Guardado com sucesso.",
   "message.share-url": "Este é o link de partilha público para {target}.",
diff --git a/lang/ro-RO.json b/lang/ro-RO.json
index 22d93713..10c210bf 100644
--- a/lang/ro-RO.json
+++ b/lang/ro-RO.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Sunteți sigur că doriți să resetați statisticile pentru {target}?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Ștergere site web",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "Toate datele asociate vor fi șterse, de asemenea.",
   "message.error": "Ceva n-a mers bine.",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "Pagina nu a fost găsită.",
-  "message.reset-website": "Resetează statisticile pentru site",
+  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Toate statisticile pentru acest site web vor fi șterse, dar codul de urmărire va rămâne intact.",
   "message.saved": "Salvat cu succes.",
   "message.share-url": "Aceasta este adresa URL de partajare pentru {target}.",
diff --git a/lang/ru-RU.json b/lang/ru-RU.json
index 475d9598..385c094f 100644
--- a/lang/ru-RU.json
+++ b/lang/ru-RU.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Вы уверены, что хотите уйти {target}?",
   "message.confirm-reset": "Вы уверены, что хотите сбросить статистику {target}?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Удалить сайт",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "Все связанные данные будут также удалены.",
   "message.error": "Что-то пошло не так.",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "Вы не создали ни одной команды.",
   "message.no-users": "Нет пользователей.",
   "message.page-not-found": "Страница не найдена.",
-  "message.reset-website": "Сбросить статистику",
+  "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}.",
diff --git a/lang/sk-SK.json b/lang/sk-SK.json
index 57948263..cb248aef 100644
--- a/lang/sk-SK.json
+++ b/lang/sk-SK.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Zmazať web",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "Všetky príbuzné data budu tiež zmazané.",
   "message.error": "Niečo sa pokazilo.",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "Stránka sa nenašla.",
-  "message.reset-website": "Reset statistics",
+  "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.saved": "Úspešne uložené.",
   "message.share-url": "Toto je zdielané URL pre {target}.",
diff --git a/lang/sl-SI.json b/lang/sl-SI.json
index b27b2065..c7c77a1b 100644
--- a/lang/sl-SI.json
+++ b/lang/sl-SI.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Izbriši spletno mesto",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "Izbrisani bodo tudi vsi povezani podatki.",
   "message.error": "Prišlo je do napake.",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "Stran ni bila najdena.",
-  "message.reset-website": "Reset statistics",
+  "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.saved": "Uspešno shranjeno.",
   "message.share-url": "To je javno dostopen naslov URL za {target}.",
diff --git a/lang/sv-SE.json b/lang/sv-SE.json
index c3155fc8..f01bc7b1 100644
--- a/lang/sv-SE.json
+++ b/lang/sv-SE.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Är du säker på att du vill återställa statistiken för {target}?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Radera webbsajt",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "All tillhörande data kommer också raderas.",
   "message.error": "Något gick fel.",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "Sidan kan inte hittas.",
-  "message.reset-website": "Återställ statistik",
+  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistik för webbsajten tas bort men spårningskoden förblir oförändrad.",
   "message.saved": "Sparades!",
   "message.share-url": "Det här är den offentliga delnings-URL:en för {target}.",
diff --git a/lang/ta-IN.json b/lang/ta-IN.json
index 2d7efa16..6ebe2326 100644
--- a/lang/ta-IN.json
+++ b/lang/ta-IN.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "வலைத்தளத்தை நீக்கு",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "தொடர்புடைய எல்லா தரவும் நீக்கப்படும்.",
   "message.error": "ஏதோ தவறு நடந்துவிட்டது.",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "பக்கம் கிடைக்கவில்லை.",
-  "message.reset-website": "Reset statistics",
+  "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.saved": "வெற்றிகரமாக சேமிக்கப்பட்டது.",
   "message.share-url": "{target} இது பொதுவில் பகிரும் வலைத்தள முகவரி.",
diff --git a/lang/th-TH.json b/lang/th-TH.json
index 4f12f420..4555d5c4 100644
--- a/lang/th-TH.json
+++ b/lang/th-TH.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "คุณแน่ใจหรือไม่ว่าต้องการรีเซตข้อมูลสถิติของ {target} ?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "ลบเว็บไซต์",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "ข้อมูลที่เกี่ยวข้องทั้งหมดจะถูกลบ.",
   "message.error": "เกิดข้อผิดพลาด.",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "ไม่พบหน้านี้.",
-  "message.reset-website": "รีเซตข้อมูลสถิติ",
+  "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}.",
diff --git a/lang/tr-TR.json b/lang/tr-TR.json
index 47ed7ab3..3c9dcb45 100644
--- a/lang/tr-TR.json
+++ b/lang/tr-TR.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Web sitesini sil",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "İlişkili tüm veriler de  silinecektir.",
   "message.error": "Bir şeyler ters gitti!",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "Sayfa bulunamadı.",
-  "message.reset-website": "Reset statistics",
+  "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.saved": "Başarıyla kaydedildi.",
   "message.share-url": "{target} için kullanılabilir anonim paylaşım adresidir.",
diff --git a/lang/uk-UA.json b/lang/uk-UA.json
index e475c39b..20b41c8b 100644
--- a/lang/uk-UA.json
+++ b/lang/uk-UA.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Ви впевнені, що бажаєте скинути статистику для {target}?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Видалити сайт",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "Усі пов'язані дані будуть видалені також.",
   "message.error": "Щось пішло не так.",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "Сторінку не знайдено.",
-  "message.reset-website": "Скинути статистику сайту",
+  "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}.",
diff --git a/lang/ur-PK.json b/lang/ur-PK.json
index a3cae9e4..243fec5f 100644
--- a/lang/ur-PK.json
+++ b/lang/ur-PK.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "کیا آپ واقعی {target} کے اعدادوشمار کو دوبارہ ترتیب دینا چاہتے ہیں؟",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "ویب سائٹ مٹایں",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "تمام متعلقہ ڈیٹا بھی حذف کر دیا جائے گا۔",
   "message.error": "کچھ غلط ہو گیا.",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "صفحہ نہیں ملا.",
-  "message.reset-website": "اعدادوشمار کو دوبارہ ترتیب دیں",
+  "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} کے لیے عوامی طور پر اشتراک کردہ URL ہے۔",
diff --git a/lang/vi-VN.json b/lang/vi-VN.json
index 81e507bc..3a2b16be 100644
--- a/lang/vi-VN.json
+++ b/lang/vi-VN.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "Bạn có chắc chắn muốn tái thiết lập thống kê {target}?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "Xóa website",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "Tất cả các dữ liệu liên quan cũng sẽ bị xoá.",
   "message.error": "Đã xảy ra lỗi.",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "Trang không tìm thấy.",
-  "message.reset-website": "Tái thiết lập thống kê",
+  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Tất cả số liệu thống kê của website này sẽ bị xoá, nhưng mã theo dõi sẽ vẫn giữ nguyên.",
   "message.saved": "Đã lưu thành công.",
   "message.share-url": "Đây là đường dẫn URL cho {target}.",
diff --git a/lang/zh-CN.json b/lang/zh-CN.json
index d120ed1a..9f0dc629 100644
--- a/lang/zh-CN.json
+++ b/lang/zh-CN.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "你确定要离开 {target} 吗？",
   "message.confirm-reset": "您确定要重置 {target} 的数据吗?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "删除网站",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "所有相关数据将会被删除。",
   "message.error": "出现错误。",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "你还没有创建任何团队。",
   "message.no-users": "没有任何用户。",
   "message.page-not-found": "网页未找到。",
-  "message.reset-website": "重置统计数据",
+  "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} 的共享链接。",
diff --git a/lang/zh-TW.json b/lang/zh-TW.json
index d15136a8..020ad0ce 100644
--- a/lang/zh-TW.json
+++ b/lang/zh-TW.json
@@ -126,7 +126,7 @@
   "message.confirm-leave": "Are you sure you want to leave {target}?",
   "message.confirm-reset": "您確定要重置 {target} 的數據嗎?",
   "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "刪除網站",
+  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
   "message.delete-website-warning": "所有相關數據將會被刪除。",
   "message.error": "出現錯誤。",
   "message.event-log": "{event} on {url}",
@@ -139,7 +139,7 @@
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
   "message.page-not-found": "網頁未找到。",
-  "message.reset-website": "重置統計數據",
+  "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} 的分享連結。",
diff --git a/public/intl/messages/am-ET.json b/public/intl/messages/am-ET.json
index d1ff296c..f367c254 100644
--- a/public/intl/messages/am-ET.json
+++ b/public/intl/messages/am-ET.json
@@ -1,26 +1,20 @@
 {
-  "label.accounts": [
+  "label.access-code": [
     {
       "type": 0,
-      "value": "Accounts"
+      "value": "Access code"
     }
   ],
-  "label.add-account": [
+  "label.actions": [
     {
       "type": 0,
-      "value": "Add account"
+      "value": "Actions"
     }
   ],
-  "label.add-column": [
+  "label.activity-log": [
     {
       "type": 0,
-      "value": "Add column"
-    }
-  ],
-  "label.add-filter": [
-    {
-      "type": 0,
-      "value": "Add filter"
+      "value": "Activity log"
     }
   ],
   "label.add-website": [
@@ -29,7 +23,7 @@
       "value": "Add website"
     }
   ],
-  "label.administrator": [
+  "label.admin": [
     {
       "type": 0,
       "value": "Administrator"
@@ -47,10 +41,16 @@
       "value": "All time"
     }
   ],
-  "label.all-websites": [
+  "label.analytics": [
     {
       "type": 0,
-      "value": "All websites"
+      "value": "Analytics"
+    }
+  ],
+  "label.average-visit-time": [
+    {
+      "type": 0,
+      "value": "Average visit time"
     }
   ],
   "label.back": [
@@ -59,6 +59,18 @@
       "value": "Back"
     }
   ],
+  "label.bounce-rate": [
+    {
+      "type": 0,
+      "value": "Bounce rate"
+    }
+  ],
+  "label.browsers": [
+    {
+      "type": 0,
+      "value": "Browsers"
+    }
+  ],
   "label.cancel": [
     {
       "type": 0,
@@ -71,16 +83,58 @@
       "value": "Change password"
     }
   ],
+  "label.cities": [
+    {
+      "type": 0,
+      "value": "Cities"
+    }
+  ],
+  "label.clear-all": [
+    {
+      "type": 0,
+      "value": "Clear all"
+    }
+  ],
+  "label.confirm": [
+    {
+      "type": 0,
+      "value": "Confirm"
+    }
+  ],
   "label.confirm-password": [
     {
       "type": 0,
       "value": "Confirm password"
     }
   ],
-  "label.copy-to-clipboard": [
+  "label.continue": [
     {
       "type": 0,
-      "value": "Copy to clipboard"
+      "value": "Continue"
+    }
+  ],
+  "label.countries": [
+    {
+      "type": 0,
+      "value": "Countries"
+    }
+  ],
+  "label.create-team": [
+    {
+      "type": 0,
+      "value": "Create team"
+    }
+  ],
+  "label.create-user": [
+    {
+      "type": 0,
+      "value": "Create user"
+    }
+  ],
+  "label.created": [
+    {
+      "type": 0,
+      "value": "Created"
     }
   ],
   "label.current-password": [
@@ -101,6 +155,12 @@
       "value": "Dashboard"
     }
   ],
+  "label.data": [
+    {
+      "type": 0,
+      "value": "Data"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
@@ -119,10 +179,16 @@
       "value": "Delete"
     }
   ],
-  "label.delete-account": [
+  "label.delete-team": [
     {
       "type": 0,
-      "value": "Delete account"
+      "value": "Delete team"
+    }
+  ],
+  "label.delete-user": [
+    {
+      "type": 0,
+      "value": "Delete user"
     }
   ],
   "label.delete-website": [
@@ -131,6 +197,24 @@
       "value": "Delete website"
     }
   ],
+  "label.desktop": [
+    {
+      "type": 0,
+      "value": "Desktop"
+    }
+  ],
+  "label.details": [
+    {
+      "type": 0,
+      "value": "Details"
+    }
+  ],
+  "label.devices": [
+    {
+      "type": 0,
+      "value": "Devices"
+    }
+  ],
   "label.dismiss": [
     {
       "type": 0,
@@ -149,16 +233,10 @@
       "value": "Edit"
     }
   ],
-  "label.edit-account": [
+  "label.edit-dashboard": [
     {
       "type": 0,
-      "value": "Edit account"
-    }
-  ],
-  "label.edit-website": [
-    {
-      "type": 0,
-      "value": "Edit website"
+      "value": "Edit dashboard"
     }
   ],
   "label.enable-share-url": [
@@ -173,22 +251,40 @@
       "value": "Event Data"
     }
   ],
-  "label.field-name": [
+  "label.events": [
     {
       "type": 0,
-      "value": "Field Name"
+      "value": "Events"
     }
   ],
-  "label.invalid": [
+  "label.filter-combined": [
     {
       "type": 0,
-      "value": "Invalid"
+      "value": "Combined"
     }
   ],
-  "label.invalid-domain": [
+  "label.filter-raw": [
     {
       "type": 0,
-      "value": "Invalid domain"
+      "value": "Raw"
+    }
+  ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
+  "label.join": [
+    {
+      "type": 0,
+      "value": "Join"
+    }
+  ],
+  "label.join-team": [
+    {
+      "type": 0,
+      "value": "Join team"
     }
   ],
   "label.language": [
@@ -197,6 +293,18 @@
       "value": "Language"
     }
   ],
+  "label.languages": [
+    {
+      "type": 0,
+      "value": "Languages"
+    }
+  ],
+  "label.laptop": [
+    {
+      "type": 0,
+      "value": "Laptop"
+    }
+  ],
   "label.last-days": [
     {
       "type": 0,
@@ -225,14 +333,16 @@
       "value": " hours"
     }
   ],
-  "label.logged-in-as": [
+  "label.leave": [
     {
       "type": 0,
-      "value": "Logged in as "
-    },
+      "value": "Leave"
+    }
+  ],
+  "label.leave-team": [
     {
-      "type": 1,
-      "value": "username"
+      "type": 0,
+      "value": "Leave team"
     }
   ],
   "label.login": [
@@ -247,6 +357,18 @@
       "value": "Logout"
     }
   ],
+  "label.members": [
+    {
+      "type": 0,
+      "value": "Members"
+    }
+  ],
+  "label.mobile": [
+    {
+      "type": 0,
+      "value": "Mobile"
+    }
+  ],
   "label.more": [
     {
       "type": 0,
@@ -271,22 +393,44 @@
       "value": "None"
     }
   ],
+  "label.operating-systems": [
+    {
+      "type": 0,
+      "value": "Operating systems"
+    }
+  ],
   "label.owner": [
     {
       "type": 0,
       "value": "Owner"
     }
   ],
+  "label.page-views": [
+    {
+      "type": 0,
+      "value": "Page views"
+    }
+  ],
+  "label.pages": [
+    {
+      "type": 0,
+      "value": "Pages"
+    }
+  ],
   "label.password": [
     {
       "type": 0,
       "value": "Password"
     }
   ],
-  "label.passwords-dont-match": [
+  "label.powered-by": [
     {
       "type": 0,
-      "value": "Passwords don't match"
+      "value": "Powered by "
+    },
+    {
+      "type": 1,
+      "value": "name"
     }
   ],
   "label.profile": [
@@ -295,16 +439,34 @@
       "value": "Profile"
     }
   ],
+  "label.queries": [
+    {
+      "type": 0,
+      "value": "Queries"
+    }
+  ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
+  "label.query-parameters": [
+    {
+      "type": 0,
+      "value": "Query parameters"
+    }
+  ],
   "label.realtime": [
     {
       "type": 0,
       "value": "Realtime"
     }
   ],
-  "label.realtime-logs": [
+  "label.referrers": [
     {
       "type": 0,
-      "value": "Realtime logs"
+      "value": "Referrers"
     }
   ],
   "label.refresh": [
@@ -313,6 +475,30 @@
       "value": "Refresh"
     }
   ],
+  "label.regenerate": [
+    {
+      "type": 0,
+      "value": "Regenerate"
+    }
+  ],
+  "label.regions": [
+    {
+      "type": 0,
+      "value": "Regions"
+    }
+  ],
+  "label.remove": [
+    {
+      "type": 0,
+      "value": "Remove"
+    }
+  ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -331,16 +517,40 @@
       "value": "Reset statistics"
     }
   ],
+  "label.role": [
+    {
+      "type": 0,
+      "value": "Role"
+    }
+  ],
   "label.save": [
     {
       "type": 0,
       "value": "Save"
     }
   ],
-  "label.search": [
+  "label.screens": [
     {
       "type": 0,
-      "value": "Search"
+      "value": "Screens"
+    }
+  ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
+  "label.select-website": [
+    {
+      "type": 0,
+      "value": "Select website"
+    }
+  ],
+  "label.sessions": [
+    {
+      "type": 0,
+      "value": "Sessions"
     }
   ],
   "label.settings": [
@@ -361,6 +571,48 @@
       "value": "Single day"
     }
   ],
+  "label.tablet": [
+    {
+      "type": 0,
+      "value": "Tablet"
+    }
+  ],
+  "label.team": [
+    {
+      "type": 0,
+      "value": "Team"
+    }
+  ],
+  "label.team-guest": [
+    {
+      "type": 0,
+      "value": "Team guest"
+    }
+  ],
+  "label.team-id": [
+    {
+      "type": 0,
+      "value": "Team ID"
+    }
+  ],
+  "label.team-member": [
+    {
+      "type": 0,
+      "value": "Team member"
+    }
+  ],
+  "label.team-owner": [
+    {
+      "type": 0,
+      "value": "Team owner"
+    }
+  ],
+  "label.teams": [
+    {
+      "type": 0,
+      "value": "Teams"
+    }
+  ],
   "label.theme": [
     {
       "type": 0,
@@ -391,22 +643,34 @@
       "value": "Timezone"
     }
   ],
+  "label.title": [
+    {
+      "type": 0,
+      "value": "Title"
+    }
+  ],
   "label.today": [
     {
       "type": 0,
       "value": "Today"
     }
   ],
+  "label.toggle-charts": [
+    {
+      "type": 0,
+      "value": "Toggle charts"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Tracking code"
     }
   ],
-  "label.type": [
+  "label.unique-visitors": [
     {
       "type": 0,
-      "value": "Type"
+      "value": "Unique visitors"
     }
   ],
   "label.unknown": [
@@ -415,16 +679,34 @@
       "value": "Unknown"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
+  "label.user": [
+    {
+      "type": 0,
+      "value": "User"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
       "value": "Username"
     }
   ],
-  "label.value": [
+  "label.users": [
     {
       "type": 0,
-      "value": "Value"
+      "value": "Users"
+    }
+  ],
+  "label.view": [
+    {
+      "type": 0,
+      "value": "View"
     }
   ],
   "label.view-details": [
@@ -433,6 +715,30 @@
       "value": "View details"
     }
   ],
+  "label.views": [
+    {
+      "type": 0,
+      "value": "Views"
+    }
+  ],
+  "label.visitors": [
+    {
+      "type": 0,
+      "value": "Visitors"
+    }
+  ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
+  "label.website-id": [
+    {
+      "type": 0,
+      "value": "Website ID"
+    }
+  ],
   "label.websites": [
     {
       "type": 0,
@@ -493,6 +799,20 @@
       "value": "?"
     }
   ],
+  "message.confirm-leave": [
+    {
+      "type": 0,
+      "value": "Are you sure you want to leave "
+    },
+    {
+      "type": 1,
+      "value": "target"
+    },
+    {
+      "type": 0,
+      "value": "?"
+    }
+  ],
   "message.confirm-reset": [
     {
       "type": 0,
@@ -507,40 +827,58 @@
       "value": "'s statistics?"
     }
   ],
-  "message.copied": [
+  "message.delete-account": [
     {
       "type": 0,
-      "value": "Copied!"
-    }
-  ],
-  "message.delete-warning": [
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
     {
       "type": 0,
-      "value": "All associated data will be deleted as well."
+      "value": " in the box below to confirm."
     }
   ],
-  "message.edit-dashboard": [
+  "message.delete-website": [
     {
       "type": 0,
-      "value": "Edit dashboard"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
-  "message.failure": [
+  "message.delete-website-warning": [
+    {
+      "type": 0,
+      "value": "All website data will be deleted."
+    }
+  ],
+  "message.error": [
     {
       "type": 0,
       "value": "Something went wrong."
     }
   ],
-  "message.get-share-url": [
+  "message.event-log": [
+    {
+      "type": 1,
+      "value": "event"
+    },
     {
       "type": 0,
-      "value": "Get share URL"
-    }
-  ],
-  "message.get-tracking-code": [
+      "value": " on "
+    },
     {
-      "type": 0,
-      "value": "Get tracking code"
+      "type": 1,
+      "value": "url"
     }
   ],
   "message.go-to-settings": [
@@ -555,7 +893,135 @@
       "value": "Incorrect username/password."
     }
   ],
-  "message.log.visitor": [
+  "message.invalid-domain": [
+    {
+      "type": 0,
+      "value": "Invalid domain. Do not include http/https."
+    }
+  ],
+  "message.min-password-length": [
+    {
+      "type": 0,
+      "value": "Minimum length of "
+    },
+    {
+      "type": 1,
+      "value": "n"
+    },
+    {
+      "type": 0,
+      "value": " characters"
+    }
+  ],
+  "message.no-data-available": [
+    {
+      "type": 0,
+      "value": "No data available."
+    }
+  ],
+  "message.no-match-password": [
+    {
+      "type": 0,
+      "value": "Passwords do not match."
+    }
+  ],
+  "message.no-teams": [
+    {
+      "type": 0,
+      "value": "You have not created any teams."
+    }
+  ],
+  "message.no-users": [
+    {
+      "type": 0,
+      "value": "There are no users."
+    }
+  ],
+  "message.page-not-found": [
+    {
+      "type": 0,
+      "value": "Page not found."
+    }
+  ],
+  "message.reset-website": [
+    {
+      "type": 0,
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
+  "message.reset-website-warning": [
+    {
+      "type": 0,
+      "value": "All statistics for this website will be deleted, but your settings will remain intact."
+    }
+  ],
+  "message.saved": [
+    {
+      "type": 0,
+      "value": "Saved."
+    }
+  ],
+  "message.share-url": [
+    {
+      "type": 0,
+      "value": "This is the publicly shared URL for "
+    },
+    {
+      "type": 1,
+      "value": "target"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
+  "message.team-already-member": [
+    {
+      "type": 0,
+      "value": "You are already a member of the team."
+    }
+  ],
+  "message.team-not-found": [
+    {
+      "type": 0,
+      "value": "Team not found."
+    }
+  ],
+  "message.tracking-code": [
+    {
+      "type": 0,
+      "value": "To track stats for this website, place the following code in the "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "..."
+        }
+      ],
+      "type": 8,
+      "value": "head"
+    },
+    {
+      "type": 0,
+      "value": " section of your HTML."
+    }
+  ],
+  "message.user-deleted": [
+    {
+      "type": 0,
+      "value": "User deleted."
+    }
+  ],
+  "message.visitor-log": [
     {
       "type": 0,
       "value": "Visitor from "
@@ -589,266 +1055,28 @@
       "value": "device"
     }
   ],
-  "message.new-version-available": [
+  "messages.no-results-found": [
     {
       "type": 0,
-      "value": "A new version of umami "
-    },
-    {
-      "type": 1,
-      "value": "version"
-    },
-    {
-      "type": 0,
-      "value": " is available!"
+      "value": "No results were found."
     }
   ],
-  "message.no-data-available": [
+  "messages.no-team-websites": [
     {
       "type": 0,
-      "value": "No data available."
+      "value": "This team does not have any websites."
     }
   ],
-  "message.no-websites-configured": [
+  "messages.no-websites-configured": [
     {
       "type": 0,
-      "value": "You don't have any websites configured."
+      "value": "You do not have any websites configured."
     }
   ],
-  "message.page-not-found": [
+  "messages.team-websites-info": [
     {
       "type": 0,
-      "value": "Page not found."
-    }
-  ],
-  "message.powered-by": [
-    {
-      "type": 0,
-      "value": "Powered by "
-    },
-    {
-      "type": 1,
-      "value": "name"
-    }
-  ],
-  "message.reset-warning": [
-    {
-      "type": 0,
-      "value": "All statistics for this website will be deleted, but your tracking code will remain intact."
-    }
-  ],
-  "message.save-success": [
-    {
-      "type": 0,
-      "value": "Saved successfully."
-    }
-  ],
-  "message.share-url": [
-    {
-      "type": 0,
-      "value": "This is the publicly shared URL for "
-    },
-    {
-      "type": 1,
-      "value": "target"
-    },
-    {
-      "type": 0,
-      "value": "."
-    }
-  ],
-  "message.toggle-charts": [
-    {
-      "type": 0,
-      "value": "Toggle charts"
-    }
-  ],
-  "message.track-stats": [
-    {
-      "type": 0,
-      "value": "To track stats for "
-    },
-    {
-      "type": 1,
-      "value": "target"
-    },
-    {
-      "type": 0,
-      "value": ", place the following code in the "
-    },
-    {
-      "type": 1,
-      "value": "head"
-    },
-    {
-      "type": 0,
-      "value": " section of your website."
-    }
-  ],
-  "message.type-delete": [
-    {
-      "type": 0,
-      "value": "Type "
-    },
-    {
-      "type": 1,
-      "value": "delete"
-    },
-    {
-      "type": 0,
-      "value": " in the box below to confirm."
-    }
-  ],
-  "message.type-reset": [
-    {
-      "type": 0,
-      "value": "Type "
-    },
-    {
-      "type": 1,
-      "value": "reset"
-    },
-    {
-      "type": 0,
-      "value": " in the box below to confirm."
-    }
-  ],
-  "metrics.actions": [
-    {
-      "type": 0,
-      "value": "Actions"
-    }
-  ],
-  "metrics.average-visit-time": [
-    {
-      "type": 0,
-      "value": "Average visit time"
-    }
-  ],
-  "metrics.bounce-rate": [
-    {
-      "type": 0,
-      "value": "Bounce rate"
-    }
-  ],
-  "metrics.browsers": [
-    {
-      "type": 0,
-      "value": "Browsers"
-    }
-  ],
-  "metrics.countries": [
-    {
-      "type": 0,
-      "value": "Countries"
-    }
-  ],
-  "metrics.device.desktop": [
-    {
-      "type": 0,
-      "value": "Desktop"
-    }
-  ],
-  "metrics.device.laptop": [
-    {
-      "type": 0,
-      "value": "Laptop"
-    }
-  ],
-  "metrics.device.mobile": [
-    {
-      "type": 0,
-      "value": "Mobile"
-    }
-  ],
-  "metrics.device.tablet": [
-    {
-      "type": 0,
-      "value": "Tablet"
-    }
-  ],
-  "metrics.devices": [
-    {
-      "type": 0,
-      "value": "Devices"
-    }
-  ],
-  "metrics.events": [
-    {
-      "type": 0,
-      "value": "Events"
-    }
-  ],
-  "metrics.filter.combined": [
-    {
-      "type": 0,
-      "value": "Combined"
-    }
-  ],
-  "metrics.filter.raw": [
-    {
-      "type": 0,
-      "value": "Raw"
-    }
-  ],
-  "metrics.languages": [
-    {
-      "type": 0,
-      "value": "Languages"
-    }
-  ],
-  "metrics.operating-systems": [
-    {
-      "type": 0,
-      "value": "Operating systems"
-    }
-  ],
-  "metrics.page-views": [
-    {
-      "type": 0,
-      "value": "Page views"
-    }
-  ],
-  "metrics.pages": [
-    {
-      "type": 0,
-      "value": "Pages"
-    }
-  ],
-  "metrics.query-parameters": [
-    {
-      "type": 0,
-      "value": "Query parameters"
-    }
-  ],
-  "metrics.referrers": [
-    {
-      "type": 0,
-      "value": "Referrers"
-    }
-  ],
-  "metrics.screens": [
-    {
-      "type": 0,
-      "value": "Screens"
-    }
-  ],
-  "metrics.unique-visitors": [
-    {
-      "type": 0,
-      "value": "Unique visitors"
-    }
-  ],
-  "metrics.views": [
-    {
-      "type": 0,
-      "value": "Views"
-    }
-  ],
-  "metrics.visitors": [
-    {
-      "type": 0,
-      "value": "Visitors"
+      "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/ar-SA.json b/public/intl/messages/ar-SA.json
index c7723665..33673f06 100644
--- a/public/intl/messages/ar-SA.json
+++ b/public/intl/messages/ar-SA.json
@@ -245,6 +245,12 @@
       "value": "تفعيل مشاركة الرابط"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "مفصلة"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "استعلامات"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "إزالة"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "الشاشات"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "غير معروف"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "الزوار"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -785,10 +827,32 @@
       "value": "؟"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "حذف الموقع"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -882,7 +946,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "اعادة تعيين الإحصائيات"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -969,6 +1041,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -987,4 +1065,4 @@
       "value": "يمكن مشاهدة الموقع من اي عضو في المجموعة."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/be-BY.json b/public/intl/messages/be-BY.json
index 37718636..5e1d6a13 100644
--- a/public/intl/messages/be-BY.json
+++ b/public/intl/messages/be-BY.json
@@ -245,6 +245,12 @@
       "value": "Дазволіць дзяліцца спасылкай"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Сырыя"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Экраны"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "Невядома"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "Наведвальнікі"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -785,10 +827,32 @@
       "value": " статыстыку?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Выдаліць сайт"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -882,7 +946,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Скінуць статыстыку"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -969,6 +1041,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -987,4 +1065,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/bn-BD.json b/public/intl/messages/bn-BD.json
index 7a2e5176..f068cd19 100644
--- a/public/intl/messages/bn-BD.json
+++ b/public/intl/messages/bn-BD.json
@@ -245,6 +245,12 @@
       "value": "শেয়ার ইউআরএল শেয়ার করুন"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "অপরিশোধিত"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "স্ক্রিনগুলি"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "অজানা"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "পরিদর্শনার্থী"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -785,10 +827,32 @@
       "value": " এর পরিসংখ্যান পুনরায় সেট করতে চান?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "ওয়েবসাইট মুছুন"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -882,7 +946,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "ওয়েবসাইট রিসেট করুন"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -969,6 +1041,12 @@
       "value": " এর মধ্যে।"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -987,4 +1065,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/ca-ES.json b/public/intl/messages/ca-ES.json
index 9ae29bcf..e9835ab5 100644
--- a/public/intl/messages/ca-ES.json
+++ b/public/intl/messages/ca-ES.json
@@ -245,6 +245,12 @@
       "value": "Activa l'enllaç per compartir"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "En cru"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "Desconegut"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "Visitants"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -785,10 +827,32 @@
       "value": "?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Esborra el lloc web"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -882,7 +946,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Restableix estadístiques"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -969,6 +1041,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -987,4 +1065,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/cs-CZ.json b/public/intl/messages/cs-CZ.json
index 1ea0c864..573ee2d8 100644
--- a/public/intl/messages/cs-CZ.json
+++ b/public/intl/messages/cs-CZ.json
@@ -245,6 +245,12 @@
       "value": "Povolit sdílení URL"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Nezpracované"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "Neznámý"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "Návštěvy"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -785,10 +827,32 @@
       "value": "'s statistics?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Smazat web"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -882,7 +946,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Reset statistics"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -969,6 +1041,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -987,4 +1065,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/da-DK.json b/public/intl/messages/da-DK.json
index bd68b67f..5a18cd72 100644
--- a/public/intl/messages/da-DK.json
+++ b/public/intl/messages/da-DK.json
@@ -245,6 +245,12 @@
       "value": "Aktivér delings-URL"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Rå"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "Ukendt"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "Besøgende"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -785,10 +827,32 @@
       "value": "'s statistikker?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Slet hjemmeside"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -882,7 +946,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Nulstil statistikker"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -969,6 +1041,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -987,4 +1065,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/de-CH.json b/public/intl/messages/de-CH.json
index 6861f5a4..d35cabeb 100644
--- a/public/intl/messages/de-CH.json
+++ b/public/intl/messages/de-CH.json
@@ -245,6 +245,12 @@
       "value": "Freigab-URL aktiviere"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Rohdate"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Abfrage"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Entferne"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Bildschirmuflösige"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "Unbekannt"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "Bsuecher"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -785,10 +827,32 @@
       "value": " zruggsetze wend?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Websiite lösche"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -882,7 +946,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Statistik zruggsetze"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -961,6 +1033,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -979,4 +1057,4 @@
       "value": "Websiite chönd vo jedem im Team agluegt werde"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/de-DE.json b/public/intl/messages/de-DE.json
index 85239abc..2cb5a482 100644
--- a/public/intl/messages/de-DE.json
+++ b/public/intl/messages/de-DE.json
@@ -245,6 +245,12 @@
       "value": "Freigabe-URL aktivieren"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Rohdaten"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Abfragen"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Entfernen"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Bildschirmauflösungen"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "Unbekannt"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "Besucher"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -785,10 +827,32 @@
       "value": " zurücksetzen wollen?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Webseite löschen"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -882,7 +946,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Statistik zurücksetzen"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -961,6 +1033,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -979,4 +1057,4 @@
       "value": "Webseiten können von jedem im Team eingesehen werden."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/el-GR.json b/public/intl/messages/el-GR.json
index 688b73c0..0818eac3 100644
--- a/public/intl/messages/el-GR.json
+++ b/public/intl/messages/el-GR.json
@@ -245,6 +245,12 @@
       "value": "Ενεργοποίηση κοινής χρήσης URL"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Ακατέργαστο"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "Άγνωστο"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "Επισκέπτες"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -785,10 +827,32 @@
       "value": "'s statistics?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Διαγραφή ιστότοπου"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -882,7 +946,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Reset statistics"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -969,6 +1041,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -987,4 +1065,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/en-GB.json b/public/intl/messages/en-GB.json
index ffd74588..970c0546 100644
--- a/public/intl/messages/en-GB.json
+++ b/public/intl/messages/en-GB.json
@@ -245,6 +245,12 @@
       "value": "Enable share URL"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Raw"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "Unknown"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "Visitors"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -785,10 +827,32 @@
       "value": "'s statistics?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Delete website"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -882,7 +946,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Reset statistics"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -969,6 +1041,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -987,4 +1065,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/en-US.json b/public/intl/messages/en-US.json
index 21fb9de8..11b34295 100644
--- a/public/intl/messages/en-US.json
+++ b/public/intl/messages/en-US.json
@@ -146,7 +146,7 @@
   "label.custom-range": [
     {
       "type": 0,
-      "value": "Custom-range"
+      "value": "Custom range"
     }
   ],
   "label.dashboard": [
@@ -245,6 +245,12 @@
       "value": "Enable share URL"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Raw"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "Unknown"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "Visitors"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -785,6 +827,20 @@
       "value": "?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
@@ -991,6 +1047,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -1009,4 +1071,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/es-MX.json b/public/intl/messages/es-MX.json
index 9a07a296..48d54fe9 100644
--- a/public/intl/messages/es-MX.json
+++ b/public/intl/messages/es-MX.json
@@ -245,6 +245,12 @@
       "value": "Habilitar compartir URL"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Personalizado"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Consultas"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Quitar"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Pantallas"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "Desconocida"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "Visitantes"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -785,10 +827,32 @@
       "value": "?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Eliminar sitio web"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -882,7 +946,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Reiniciar estadísticas"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -969,6 +1041,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -987,4 +1065,4 @@
       "value": "Las analíticas de tus sitios pueden verse por cualquier miembro del equipo."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/fa-IR.json b/public/intl/messages/fa-IR.json
index 34c8544a..f41a80a4 100644
--- a/public/intl/messages/fa-IR.json
+++ b/public/intl/messages/fa-IR.json
@@ -245,6 +245,12 @@
       "value": "فعال کردن اشتراک گذاری URL"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "خام"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "ناشناخته"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "بازدیدکننده"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -785,10 +827,32 @@
       "value": " مطمئن هستید?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "حذف وب‌سایت"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -882,7 +946,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "بازنشانی آمار"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -969,6 +1041,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -987,4 +1065,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/fi-FI.json b/public/intl/messages/fi-FI.json
index 03b0aef0..fa70253a 100644
--- a/public/intl/messages/fi-FI.json
+++ b/public/intl/messages/fi-FI.json
@@ -245,6 +245,12 @@
       "value": "Ota jakamisen URL-osoite käyttöön"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Käsittelemätön"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "Tuntematon"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "Vierailijat"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -785,10 +827,32 @@
       "value": " tilastot?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Poista verkkosivu"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -882,7 +946,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Nollaa tilastot"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -969,6 +1041,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -987,4 +1065,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/fo-FO.json b/public/intl/messages/fo-FO.json
index e1e45a1d..0b5b66f1 100644
--- a/public/intl/messages/fo-FO.json
+++ b/public/intl/messages/fo-FO.json
@@ -245,6 +245,12 @@
       "value": "Virkja deili leinki"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Óviðgjørt"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "Ókent"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "Vitjandi"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -785,10 +827,32 @@
       "value": "'s statistics?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Sletta heimasíðu"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -882,7 +946,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Reset statistics"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -969,6 +1041,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -987,4 +1065,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/fr-FR.json b/public/intl/messages/fr-FR.json
index 11754452..0251929e 100644
--- a/public/intl/messages/fr-FR.json
+++ b/public/intl/messages/fr-FR.json
@@ -245,6 +245,12 @@
       "value": "Activer l'URL de partage"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Brut"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -425,6 +437,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -467,6 +485,12 @@
       "value": "Retirer"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -503,6 +527,12 @@
       "value": "Résolutions d'écran"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -641,6 +671,12 @@
       "value": "Inconnu"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -683,6 +719,12 @@
       "value": "Visiteurs"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -781,6 +823,20 @@
       "value": " ?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
@@ -886,7 +942,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Réinitialiser les statistiques"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -965,6 +1029,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -983,4 +1053,4 @@
       "value": "Les sites peuvent être vus par tout utilisateur dans l'équipe."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/ga-ES.json b/public/intl/messages/ga-ES.json
index 35d98325..2d4fb153 100644
--- a/public/intl/messages/ga-ES.json
+++ b/public/intl/messages/ga-ES.json
@@ -245,6 +245,12 @@
       "value": "Activar URL de compartición"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Raw"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -490,7 +514,15 @@
   "label.reset-website": [
     {
       "type": 0,
-      "value": "Restablecer estatísticas"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "label.role": [
@@ -511,6 +543,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +687,12 @@
       "value": "Descoñecido"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +735,12 @@
       "value": "Visitantes"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -785,10 +835,32 @@
       "value": "?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Eliminar sitio web"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -882,7 +954,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Restablecer estatísticas"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -969,6 +1049,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -987,4 +1073,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/he-IL.json b/public/intl/messages/he-IL.json
index 3e0b844b..ca5b8e2b 100644
--- a/public/intl/messages/he-IL.json
+++ b/public/intl/messages/he-IL.json
@@ -245,6 +245,12 @@
       "value": "הפעלת URL שיתוף"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "גולמי"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -425,6 +437,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -467,6 +485,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -503,6 +527,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -641,6 +671,12 @@
       "value": "לא ידוע"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -683,6 +719,12 @@
       "value": "מבקרים"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -777,10 +819,32 @@
       "value": "'s statistics?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "הסרת אתר"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -874,7 +938,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Reset statistics"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -957,6 +1029,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -975,4 +1053,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/hi-IN.json b/public/intl/messages/hi-IN.json
index d51f71fe..1eb32bf9 100644
--- a/public/intl/messages/hi-IN.json
+++ b/public/intl/messages/hi-IN.json
@@ -245,6 +245,12 @@
       "value": "शेयर URL सक्षम करें"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "रॉ"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "अज्ञात"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "आगंतुकों"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -785,10 +827,32 @@
       "value": "'s statistics?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "वेबसाइट हटाएं"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -882,7 +946,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Reset statistics"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -961,6 +1033,12 @@
       "value": " यन्त्र पर"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -979,4 +1057,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/hr-HR.json b/public/intl/messages/hr-HR.json
index e9bec50f..9a085047 100644
--- a/public/intl/messages/hr-HR.json
+++ b/public/intl/messages/hr-HR.json
@@ -1,26 +1,20 @@
 {
-  "label.accounts": [
+  "label.access-code": [
     {
       "type": 0,
-      "value": "Računi"
+      "value": "Access code"
     }
   ],
-  "label.add-account": [
+  "label.actions": [
     {
       "type": 0,
-      "value": "Dodaj račun"
+      "value": "Actions"
     }
   ],
-  "label.add-column": [
+  "label.activity-log": [
     {
       "type": 0,
-      "value": "Dodaj stupac"
-    }
-  ],
-  "label.add-filter": [
-    {
-      "type": 0,
-      "value": "Dodaj filter"
+      "value": "Activity log"
     }
   ],
   "label.add-website": [
@@ -29,7 +23,7 @@
       "value": "Dodaj web stranicu"
     }
   ],
-  "label.administrator": [
+  "label.admin": [
     {
       "type": 0,
       "value": "Administrator"
@@ -47,10 +41,16 @@
       "value": "Svo vrijeme"
     }
   ],
-  "label.all-websites": [
+  "label.analytics": [
     {
       "type": 0,
-      "value": "Sve web stranice"
+      "value": "Analytics"
+    }
+  ],
+  "label.average-visit-time": [
+    {
+      "type": 0,
+      "value": "Average visit time"
     }
   ],
   "label.back": [
@@ -59,6 +59,18 @@
       "value": "Natrag "
     }
   ],
+  "label.bounce-rate": [
+    {
+      "type": 0,
+      "value": "Bounce rate"
+    }
+  ],
+  "label.browsers": [
+    {
+      "type": 0,
+      "value": "Browsers"
+    }
+  ],
   "label.cancel": [
     {
       "type": 0,
@@ -71,16 +83,58 @@
       "value": "Promijeni lozinku"
     }
   ],
+  "label.cities": [
+    {
+      "type": 0,
+      "value": "Cities"
+    }
+  ],
+  "label.clear-all": [
+    {
+      "type": 0,
+      "value": "Clear all"
+    }
+  ],
+  "label.confirm": [
+    {
+      "type": 0,
+      "value": "Confirm"
+    }
+  ],
   "label.confirm-password": [
     {
       "type": 0,
       "value": "Potvrdi lozinku"
     }
   ],
-  "label.copy-to-clipboard": [
+  "label.continue": [
     {
       "type": 0,
-      "value": "Kopiraj u međuspremnik"
+      "value": "Continue"
+    }
+  ],
+  "label.countries": [
+    {
+      "type": 0,
+      "value": "Countries"
+    }
+  ],
+  "label.create-team": [
+    {
+      "type": 0,
+      "value": "Create team"
+    }
+  ],
+  "label.create-user": [
+    {
+      "type": 0,
+      "value": "Create user"
+    }
+  ],
+  "label.created": [
+    {
+      "type": 0,
+      "value": "Created"
     }
   ],
   "label.current-password": [
@@ -101,6 +155,12 @@
       "value": "Nadzorna ploča"
     }
   ],
+  "label.data": [
+    {
+      "type": 0,
+      "value": "Data"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
@@ -119,10 +179,16 @@
       "value": "Obriši"
     }
   ],
-  "label.delete-account": [
+  "label.delete-team": [
     {
       "type": 0,
-      "value": "Obriši račun"
+      "value": "Delete team"
+    }
+  ],
+  "label.delete-user": [
+    {
+      "type": 0,
+      "value": "Delete user"
     }
   ],
   "label.delete-website": [
@@ -131,6 +197,24 @@
       "value": "Obriši web stranicu"
     }
   ],
+  "label.desktop": [
+    {
+      "type": 0,
+      "value": "Desktop"
+    }
+  ],
+  "label.details": [
+    {
+      "type": 0,
+      "value": "Details"
+    }
+  ],
+  "label.devices": [
+    {
+      "type": 0,
+      "value": "Devices"
+    }
+  ],
   "label.dismiss": [
     {
       "type": 0,
@@ -149,16 +233,10 @@
       "value": "Uredi"
     }
   ],
-  "label.edit-account": [
+  "label.edit-dashboard": [
     {
       "type": 0,
-      "value": "Uredi račun"
-    }
-  ],
-  "label.edit-website": [
-    {
-      "type": 0,
-      "value": "Uredi web stranicu"
+      "value": "Edit dashboard"
     }
   ],
   "label.enable-share-url": [
@@ -173,22 +251,40 @@
       "value": "Podaci događaja"
     }
   ],
-  "label.field-name": [
+  "label.events": [
     {
       "type": 0,
-      "value": "Naziv polja"
+      "value": "Events"
     }
   ],
-  "label.invalid": [
+  "label.filter-combined": [
     {
       "type": 0,
-      "value": "Neispravno"
+      "value": "Combined"
     }
   ],
-  "label.invalid-domain": [
+  "label.filter-raw": [
     {
       "type": 0,
-      "value": "Neispravna domena"
+      "value": "Raw"
+    }
+  ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
+  "label.join": [
+    {
+      "type": 0,
+      "value": "Join"
+    }
+  ],
+  "label.join-team": [
+    {
+      "type": 0,
+      "value": "Join team"
     }
   ],
   "label.language": [
@@ -197,6 +293,18 @@
       "value": "Jezik"
     }
   ],
+  "label.languages": [
+    {
+      "type": 0,
+      "value": "Languages"
+    }
+  ],
+  "label.laptop": [
+    {
+      "type": 0,
+      "value": "Laptop"
+    }
+  ],
   "label.last-days": [
     {
       "type": 0,
@@ -225,14 +333,16 @@
       "value": " sati"
     }
   ],
-  "label.logged-in-as": [
+  "label.leave": [
     {
       "type": 0,
-      "value": "Prijavljen kao "
-    },
+      "value": "Leave"
+    }
+  ],
+  "label.leave-team": [
     {
-      "type": 1,
-      "value": "username"
+      "type": 0,
+      "value": "Leave team"
     }
   ],
   "label.login": [
@@ -247,6 +357,18 @@
       "value": "Odjava"
     }
   ],
+  "label.members": [
+    {
+      "type": 0,
+      "value": "Members"
+    }
+  ],
+  "label.mobile": [
+    {
+      "type": 0,
+      "value": "Mobile"
+    }
+  ],
   "label.more": [
     {
       "type": 0,
@@ -271,22 +393,44 @@
       "value": "Ništa"
     }
   ],
+  "label.operating-systems": [
+    {
+      "type": 0,
+      "value": "Operating systems"
+    }
+  ],
   "label.owner": [
     {
       "type": 0,
       "value": "Vlasnik"
     }
   ],
+  "label.page-views": [
+    {
+      "type": 0,
+      "value": "Page views"
+    }
+  ],
+  "label.pages": [
+    {
+      "type": 0,
+      "value": "Pages"
+    }
+  ],
   "label.password": [
     {
       "type": 0,
       "value": "Lozinka"
     }
   ],
-  "label.passwords-dont-match": [
+  "label.powered-by": [
     {
       "type": 0,
-      "value": "Lozinke se ne podudaraju"
+      "value": "Powered by "
+    },
+    {
+      "type": 1,
+      "value": "name"
     }
   ],
   "label.profile": [
@@ -295,16 +439,34 @@
       "value": "Profil"
     }
   ],
+  "label.queries": [
+    {
+      "type": 0,
+      "value": "Queries"
+    }
+  ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
+  "label.query-parameters": [
+    {
+      "type": 0,
+      "value": "Query parameters"
+    }
+  ],
   "label.realtime": [
     {
       "type": 0,
       "value": "Stvarno vrijeme"
     }
   ],
-  "label.realtime-logs": [
+  "label.referrers": [
     {
       "type": 0,
-      "value": "Trenutni zapisi"
+      "value": "Referrers"
     }
   ],
   "label.refresh": [
@@ -313,6 +475,30 @@
       "value": "Osvježi"
     }
   ],
+  "label.regenerate": [
+    {
+      "type": 0,
+      "value": "Regenerate"
+    }
+  ],
+  "label.regions": [
+    {
+      "type": 0,
+      "value": "Regions"
+    }
+  ],
+  "label.remove": [
+    {
+      "type": 0,
+      "value": "Remove"
+    }
+  ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -331,16 +517,40 @@
       "value": "Resetirati web stranicu"
     }
   ],
+  "label.role": [
+    {
+      "type": 0,
+      "value": "Role"
+    }
+  ],
   "label.save": [
     {
       "type": 0,
       "value": "Spremi"
     }
   ],
-  "label.search": [
+  "label.screens": [
     {
       "type": 0,
-      "value": "Pretraži"
+      "value": "Screens"
+    }
+  ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
+  "label.select-website": [
+    {
+      "type": 0,
+      "value": "Select website"
+    }
+  ],
+  "label.sessions": [
+    {
+      "type": 0,
+      "value": "Sessions"
     }
   ],
   "label.settings": [
@@ -361,6 +571,48 @@
       "value": "Jedan dan"
     }
   ],
+  "label.tablet": [
+    {
+      "type": 0,
+      "value": "Tablet"
+    }
+  ],
+  "label.team": [
+    {
+      "type": 0,
+      "value": "Team"
+    }
+  ],
+  "label.team-guest": [
+    {
+      "type": 0,
+      "value": "Team guest"
+    }
+  ],
+  "label.team-id": [
+    {
+      "type": 0,
+      "value": "Team ID"
+    }
+  ],
+  "label.team-member": [
+    {
+      "type": 0,
+      "value": "Team member"
+    }
+  ],
+  "label.team-owner": [
+    {
+      "type": 0,
+      "value": "Team owner"
+    }
+  ],
+  "label.teams": [
+    {
+      "type": 0,
+      "value": "Teams"
+    }
+  ],
   "label.theme": [
     {
       "type": 0,
@@ -391,22 +643,34 @@
       "value": "Vremenska zona"
     }
   ],
+  "label.title": [
+    {
+      "type": 0,
+      "value": "Title"
+    }
+  ],
   "label.today": [
     {
       "type": 0,
       "value": "Danas"
     }
   ],
+  "label.toggle-charts": [
+    {
+      "type": 0,
+      "value": "Toggle charts"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Kod za praćenje"
     }
   ],
-  "label.type": [
+  "label.unique-visitors": [
     {
       "type": 0,
-      "value": "Tip"
+      "value": "Unique visitors"
     }
   ],
   "label.unknown": [
@@ -415,16 +679,34 @@
       "value": "Nepoznato"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
+  "label.user": [
+    {
+      "type": 0,
+      "value": "User"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
       "value": "Korisničko ime"
     }
   ],
-  "label.value": [
+  "label.users": [
     {
       "type": 0,
-      "value": "Vrijednost"
+      "value": "Users"
+    }
+  ],
+  "label.view": [
+    {
+      "type": 0,
+      "value": "View"
     }
   ],
   "label.view-details": [
@@ -433,6 +715,30 @@
       "value": "Pogledaj detalje"
     }
   ],
+  "label.views": [
+    {
+      "type": 0,
+      "value": "Views"
+    }
+  ],
+  "label.visitors": [
+    {
+      "type": 0,
+      "value": "Visitors"
+    }
+  ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
+  "label.website-id": [
+    {
+      "type": 0,
+      "value": "Website ID"
+    }
+  ],
   "label.websites": [
     {
       "type": 0,
@@ -493,6 +799,20 @@
       "value": "?"
     }
   ],
+  "message.confirm-leave": [
+    {
+      "type": 0,
+      "value": "Are you sure you want to leave "
+    },
+    {
+      "type": 1,
+      "value": "target"
+    },
+    {
+      "type": 0,
+      "value": "?"
+    }
+  ],
   "message.confirm-reset": [
     {
       "type": 0,
@@ -507,40 +827,58 @@
       "value": "'s statistiku?"
     }
   ],
-  "message.copied": [
+  "message.delete-account": [
     {
       "type": 0,
-      "value": "Kopirano!"
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
-  "message.delete-warning": [
+  "message.delete-website": [
     {
       "type": 0,
-      "value": "Izbrisat će se svi povezani podaci."
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
-  "message.edit-dashboard": [
+  "message.delete-website-warning": [
     {
       "type": 0,
-      "value": "Uredi nadzornu ploču"
+      "value": "All website data will be deleted."
     }
   ],
-  "message.failure": [
+  "message.error": [
     {
       "type": 0,
-      "value": "Nešto je pošlo po zlu."
+      "value": "Something went wrong."
     }
   ],
-  "message.get-share-url": [
+  "message.event-log": [
+    {
+      "type": 1,
+      "value": "event"
+    },
     {
       "type": 0,
-      "value": "Dohvati poveznicu za dijeljenje"
-    }
-  ],
-  "message.get-tracking-code": [
+      "value": " on "
+    },
     {
-      "type": 0,
-      "value": "Dohvati kod za praćenje"
+      "type": 1,
+      "value": "url"
     }
   ],
   "message.go-to-settings": [
@@ -555,52 +893,24 @@
       "value": "Neispravno korisničke ime/lozinka."
     }
   ],
-  "message.log.visitor": [
+  "message.invalid-domain": [
     {
       "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"
+      "value": "Invalid domain. Do not include http/https."
     }
   ],
-  "message.new-version-available": [
+  "message.min-password-length": [
     {
       "type": 0,
-      "value": "Nova verzija umami "
+      "value": "Minimum length of "
     },
     {
       "type": 1,
-      "value": "version"
+      "value": "n"
     },
     {
       "type": 0,
-      "value": " je dostupna!"
+      "value": " characters"
     }
   ],
   "message.no-data-available": [
@@ -609,10 +919,22 @@
       "value": "Nema dostupnih podataka."
     }
   ],
-  "message.no-websites-configured": [
+  "message.no-match-password": [
     {
       "type": 0,
-      "value": "Nemate konfiguriranu nijednu web stranicu."
+      "value": "Passwords do not match."
+    }
+  ],
+  "message.no-teams": [
+    {
+      "type": 0,
+      "value": "You have not created any teams."
+    }
+  ],
+  "message.no-users": [
+    {
+      "type": 0,
+      "value": "There are no users."
     }
   ],
   "message.page-not-found": [
@@ -621,26 +943,30 @@
       "value": "Stranica nije pronađena."
     }
   ],
-  "message.powered-by": [
+  "message.reset-website": [
     {
       "type": 0,
-      "value": "Pokreće "
+      "value": "To reset this website, type "
     },
     {
       "type": 1,
-      "value": "name"
-    }
-  ],
-  "message.reset-warning": [
+      "value": "confirmation"
+    },
     {
       "type": 0,
-      "value": "Sve statistike za ovu web stranicu bit će izbrisane, ali će vaš kod za praćenje ostati netaknut."
+      "value": " in the box below to confirm."
     }
   ],
-  "message.save-success": [
+  "message.reset-website-warning": [
     {
       "type": 0,
-      "value": "Uspješno spremljeno."
+      "value": "All statistics for this website will be deleted, but your settings will remain intact."
+    }
+  ],
+  "message.saved": [
+    {
+      "type": 0,
+      "value": "Saved."
     }
   ],
   "message.share-url": [
@@ -657,198 +983,100 @@
       "value": "."
     }
   ],
-  "message.toggle-charts": [
+  "message.team-already-member": [
     {
       "type": 0,
-      "value": "Uključi/isključi grafikone"
+      "value": "You are already a member of the team."
     }
   ],
-  "message.track-stats": [
+  "message.team-not-found": [
     {
       "type": 0,
-      "value": "Da biste pratili statistiku za "
-    },
-    {
-      "type": 1,
-      "value": "target"
-    },
+      "value": "Team not found."
+    }
+  ],
+  "message.tracking-code": [
     {
       "type": 0,
-      "value": ", postavite sljedeći kod u odjeljak "
+      "value": "To track stats for this website, place the following code in the "
     },
     {
-      "type": 1,
+      "children": [
+        {
+          "type": 0,
+          "value": "..."
+        }
+      ],
+      "type": 8,
       "value": "head"
     },
     {
       "type": 0,
-      "value": " svoje web stranice."
+      "value": " section of your HTML."
     }
   ],
-  "message.type-delete": [
+  "message.user-deleted": [
     {
       "type": 0,
-      "value": "Upišite "
+      "value": "User deleted."
+    }
+  ],
+  "message.visitor-log": [
+    {
+      "type": 0,
+      "value": "Visitor from "
     },
     {
       "type": 1,
-      "value": "delete"
+      "value": "country"
     },
     {
       "type": 0,
-      "value": " u donji okvir za potvrdu."
-    }
-  ],
-  "message.type-reset": [
-    {
-      "type": 0,
-      "value": "  Upišite "
+      "value": " using "
     },
     {
       "type": 1,
-      "value": "reset"
+      "value": "browser"
     },
     {
       "type": 0,
-      "value": " u donji okvir za potvrdu. "
-    }
-  ],
-  "metrics.actions": [
+      "value": " on "
+    },
+    {
+      "type": 1,
+      "value": "os"
+    },
     {
       "type": 0,
-      "value": "Akcije"
+      "value": " "
+    },
+    {
+      "type": 1,
+      "value": "device"
     }
   ],
-  "metrics.average-visit-time": [
+  "messages.no-results-found": [
     {
       "type": 0,
-      "value": "Prosječno vrijeme posjeta"
+      "value": "No results were found."
     }
   ],
-  "metrics.bounce-rate": [
+  "messages.no-team-websites": [
     {
       "type": 0,
-      "value": "Stopa napuštanja stranice"
+      "value": "This team does not have any websites."
     }
   ],
-  "metrics.browsers": [
+  "messages.no-websites-configured": [
     {
       "type": 0,
-      "value": "Web preglednici"
+      "value": "You do not have any websites configured."
     }
   ],
-  "metrics.countries": [
+  "messages.team-websites-info": [
     {
       "type": 0,
-      "value": "Zemlje"
-    }
-  ],
-  "metrics.device.desktop": [
-    {
-      "type": 0,
-      "value": "Pc"
-    }
-  ],
-  "metrics.device.laptop": [
-    {
-      "type": 0,
-      "value": "Laptop"
-    }
-  ],
-  "metrics.device.mobile": [
-    {
-      "type": 0,
-      "value": "Mobitel"
-    }
-  ],
-  "metrics.device.tablet": [
-    {
-      "type": 0,
-      "value": "Tablet"
-    }
-  ],
-  "metrics.devices": [
-    {
-      "type": 0,
-      "value": "Uređaji"
-    }
-  ],
-  "metrics.events": [
-    {
-      "type": 0,
-      "value": "Događaji"
-    }
-  ],
-  "metrics.filter.combined": [
-    {
-      "type": 0,
-      "value": "Kombinirano"
-    }
-  ],
-  "metrics.filter.raw": [
-    {
-      "type": 0,
-      "value": "Neobrađeni podaci"
-    }
-  ],
-  "metrics.languages": [
-    {
-      "type": 0,
-      "value": "Jezici"
-    }
-  ],
-  "metrics.operating-systems": [
-    {
-      "type": 0,
-      "value": "Operativni sustavi"
-    }
-  ],
-  "metrics.page-views": [
-    {
-      "type": 0,
-      "value": "Pregledi stranice"
-    }
-  ],
-  "metrics.pages": [
-    {
-      "type": 0,
-      "value": "Stranice"
-    }
-  ],
-  "metrics.query-parameters": [
-    {
-      "type": 0,
-      "value": "Parametri upita"
-    }
-  ],
-  "metrics.referrers": [
-    {
-      "type": 0,
-      "value": "Upučivaći"
-    }
-  ],
-  "metrics.screens": [
-    {
-      "type": 0,
-      "value": "Zasloni"
-    }
-  ],
-  "metrics.unique-visitors": [
-    {
-      "type": 0,
-      "value": "Jedinstveni posjetitelji"
-    }
-  ],
-  "metrics.views": [
-    {
-      "type": 0,
-      "value": "Pregledi"
-    }
-  ],
-  "metrics.visitors": [
-    {
-      "type": 0,
-      "value": "Posjetitelji"
+      "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/hu-HU.json b/public/intl/messages/hu-HU.json
index a41352a0..502e55e1 100644
--- a/public/intl/messages/hu-HU.json
+++ b/public/intl/messages/hu-HU.json
@@ -245,6 +245,12 @@
       "value": "URL-megosztás engedélyezése"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Nyers"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "Ismeretlen"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "Látogatók"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -789,10 +831,32 @@
       "value": "'s statistics?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Weboldal eltávolítása"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -886,7 +950,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Reset statistics"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -973,6 +1045,12 @@
       "value": " böngészőből."
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -991,4 +1069,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/id-ID.json b/public/intl/messages/id-ID.json
index 02e50783..b19e5f73 100644
--- a/public/intl/messages/id-ID.json
+++ b/public/intl/messages/id-ID.json
@@ -245,6 +245,12 @@
       "value": "Aktifkan URL berbagi"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Mentah"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -425,6 +437,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -467,6 +485,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -503,6 +527,12 @@
       "value": "Layar"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -641,6 +671,12 @@
       "value": "Tidak diketahui"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -683,6 +719,12 @@
       "value": "Pengunjung"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -753,10 +795,32 @@
       "value": "?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Hapus situs web"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -850,7 +914,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Atur ulang statistik"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -937,6 +1009,12 @@
       "value": "os"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -955,4 +1033,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/it-IT.json b/public/intl/messages/it-IT.json
index ad026521..b5f7c14d 100644
--- a/public/intl/messages/it-IT.json
+++ b/public/intl/messages/it-IT.json
@@ -245,6 +245,12 @@
       "value": "Abilita URL di condivisione"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Raw"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "Sconosciuto"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "Visitatori"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -789,10 +831,32 @@
       "value": "?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Elimina sito"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -886,7 +950,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Resetta le statistiche"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -973,6 +1045,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -991,4 +1069,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/ja-JP.json b/public/intl/messages/ja-JP.json
index 384d8014..febaa8de 100644
--- a/public/intl/messages/ja-JP.json
+++ b/public/intl/messages/ja-JP.json
@@ -245,6 +245,12 @@
       "value": "共有リンクを有効にする"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "すべて表示"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -437,6 +449,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -479,6 +497,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -515,6 +539,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -653,6 +683,12 @@
       "value": "不明"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -695,6 +731,12 @@
       "value": "訪問者数"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -761,10 +803,32 @@
       "value": "'s statistics?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Webサイトの削除"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -858,7 +922,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Reset statistics"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -945,6 +1017,12 @@
       "value": "からの訪問者"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -963,4 +1041,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/km-KH.json b/public/intl/messages/km-KH.json
index b6e93a33..7200d49d 100644
--- a/public/intl/messages/km-KH.json
+++ b/public/intl/messages/km-KH.json
@@ -245,6 +245,12 @@
       "value": "បើកការចែករំលែក URL"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "ដើម"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -425,6 +437,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -467,6 +485,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -503,6 +527,12 @@
       "value": "ប្រភេទឧបករណ៍"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -641,6 +671,12 @@
       "value": "មិនស្គាល់"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -683,6 +719,12 @@
       "value": "អ្នកទស្សនា"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -757,10 +799,32 @@
       "value": " ឡើងវិញទេ?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "លុបគេហទំព័រ"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -854,7 +918,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "កំណត់ស្ថិតិឡើងវិញ"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -941,6 +1013,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -959,4 +1037,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/ko-KR.json b/public/intl/messages/ko-KR.json
index 9665bc3d..c2c879d8 100644
--- a/public/intl/messages/ko-KR.json
+++ b/public/intl/messages/ko-KR.json
@@ -245,6 +245,12 @@
       "value": "URL 공유 활성화"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "전체 보기"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -437,6 +449,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -479,6 +497,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -515,6 +539,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -653,6 +683,12 @@
       "value": "알 수 없음"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -695,6 +731,12 @@
       "value": "방문객"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -761,10 +803,32 @@
       "value": "'s statistics?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "웹사이트 삭제"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -858,7 +922,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Reset statistics"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -945,6 +1017,12 @@
       "value": "의 방문자"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -963,4 +1041,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/lt-LT.json b/public/intl/messages/lt-LT.json
index 113a1394..21becd38 100644
--- a/public/intl/messages/lt-LT.json
+++ b/public/intl/messages/lt-LT.json
@@ -245,6 +245,12 @@
       "value": "Įjungti bendrinimą su nuoroda"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Neapdoroti"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -538,6 +550,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -580,6 +598,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -616,6 +640,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -754,6 +784,12 @@
       "value": "Nežinoma"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -796,6 +832,12 @@
       "value": "Lankytojai"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -910,10 +952,32 @@
       "value": " statistikos duomenis?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Ištrinti svetainę"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -1007,7 +1071,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Atstatyti statistikos duomenis"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -1094,6 +1166,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -1112,4 +1190,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/mn-MN.json b/public/intl/messages/mn-MN.json
index 6ad96b19..2638ee43 100644
--- a/public/intl/messages/mn-MN.json
+++ b/public/intl/messages/mn-MN.json
@@ -245,6 +245,12 @@
       "value": "Хуваалцах холбоос идэвхжүүлэх"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Түүхий"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Query-нүүд"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Устгах"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Дэлгэц"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "Тодорхойгүй"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "Зочин"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -793,10 +835,10 @@
       "value": "-н тоон үзүүлэлтүүдийг устгахдаа итгэлтэй байна уу?"
     }
   ],
-  "message.delete-website": [
+  "message.delete-account": [
     {
       "type": 0,
-      "value": "Веб устгахын тулд доорх хэсэгт "
+      "value": "To delete this account, type "
     },
     {
       "type": 1,
@@ -804,7 +846,21 @@
     },
     {
       "type": 0,
-      "value": " гэж бичиж, баталгаажуулна уу."
+      "value": " in the box below to confirm."
+    }
+  ],
+  "message.delete-website": [
+    {
+      "type": 0,
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -999,6 +1055,12 @@
       "value": " хөтөч ашиглан орсон"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -1017,4 +1079,4 @@
       "value": "Вебийг багийн бүх гишүүд үзэж болно."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/ms-MY.json b/public/intl/messages/ms-MY.json
index 771672a7..bf2aef02 100644
--- a/public/intl/messages/ms-MY.json
+++ b/public/intl/messages/ms-MY.json
@@ -245,6 +245,12 @@
       "value": "Aktifkan url berkongsi"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Mentah"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -425,6 +437,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -467,6 +485,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -503,6 +527,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -641,6 +671,12 @@
       "value": "Tidak diketahui"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -683,6 +719,12 @@
       "value": "Pelawat"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -777,10 +819,32 @@
       "value": "'s statistics?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Padam laman web"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -874,7 +938,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Reset statistics"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -961,6 +1033,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -979,4 +1057,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/nb-NO.json b/public/intl/messages/nb-NO.json
index 50a9ec18..ee95b9c5 100644
--- a/public/intl/messages/nb-NO.json
+++ b/public/intl/messages/nb-NO.json
@@ -245,6 +245,12 @@
       "value": "Aktiver delings-URL"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Rå"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "Ukjent"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "Besøkende"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -789,10 +831,32 @@
       "value": "'s statistikk?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Slett nettstedet"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -886,7 +950,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Nullstill statistikk"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -973,6 +1045,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -991,4 +1069,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/nl-NL.json b/public/intl/messages/nl-NL.json
index e775f2d5..149f095b 100644
--- a/public/intl/messages/nl-NL.json
+++ b/public/intl/messages/nl-NL.json
@@ -245,6 +245,12 @@
       "value": "Sta delen via openbare URL toe"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Ruw"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Parameters"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Verwijderen"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Schermen"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "Onbekend"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "Bezoekers"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -785,10 +827,32 @@
       "value": " opnieuw wilt instellen?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Website verwijderen"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -882,7 +946,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Statistieken opnieuw instellen"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -969,6 +1041,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -987,4 +1065,4 @@
       "value": "Websites kunnen door iedereen in het team worden bekeken."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/pl-PL.json b/public/intl/messages/pl-PL.json
index 0f5667ff..ed2c711e 100644
--- a/public/intl/messages/pl-PL.json
+++ b/public/intl/messages/pl-PL.json
@@ -245,6 +245,12 @@
       "value": "Włącz udostępnianie adresu URL"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Surowe dane"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Zapytania"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Usuń"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Ekrany"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "Nieznany"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "Odwiedzający"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -785,10 +827,32 @@
       "value": "?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Usuń witrynę"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -882,7 +946,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Zresetuj statystyki"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -969,6 +1041,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -987,4 +1065,4 @@
       "value": "Strony internetowe mogą być przeglądane przez każdego członka zespołu."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/pt-BR.json b/public/intl/messages/pt-BR.json
index 6eade1e3..d19c9ab2 100644
--- a/public/intl/messages/pt-BR.json
+++ b/public/intl/messages/pt-BR.json
@@ -245,6 +245,12 @@
       "value": "Ativar link de compartilhamento"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Dados brutos"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Parâmetros"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Remover"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Telas"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "Desconhecido"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "Visitantes"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -789,10 +831,32 @@
       "value": "?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Remover site"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -886,7 +950,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Redefinir estatísticas"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -973,6 +1045,12 @@
       "value": "os"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -991,4 +1069,4 @@
       "value": "Os sites podem ser visualizados por qualquer membro da equipe."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/pt-PT.json b/public/intl/messages/pt-PT.json
index a858ff8c..e36b5f26 100644
--- a/public/intl/messages/pt-PT.json
+++ b/public/intl/messages/pt-PT.json
@@ -245,6 +245,12 @@
       "value": "Ativar link de partilha"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Dados brutos"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "Desconhecido"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "Visitantes"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -789,10 +831,32 @@
       "value": "?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Eliminar website"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -886,7 +950,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Repor estatísticas"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -973,6 +1045,12 @@
       "value": "os"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -991,4 +1069,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/ro-RO.json b/public/intl/messages/ro-RO.json
index e7305a38..47984700 100644
--- a/public/intl/messages/ro-RO.json
+++ b/public/intl/messages/ro-RO.json
@@ -245,6 +245,12 @@
       "value": "Activare adresă URL de distribuire"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Brut"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "Necunoscut"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "Vizitatori"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -785,10 +827,32 @@
       "value": "?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Ștergere site web"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -882,7 +946,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Resetează statisticile pentru site"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -969,6 +1041,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -987,4 +1065,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/ru-RU.json b/public/intl/messages/ru-RU.json
index 5d164635..6048d7e9 100644
--- a/public/intl/messages/ru-RU.json
+++ b/public/intl/messages/ru-RU.json
@@ -245,6 +245,12 @@
       "value": "Разрешить делиться ссылкой"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Сырые данные"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Запросы"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Удалить"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Экраны"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "Неизвестно"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "Посетители"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -761,10 +803,32 @@
       "value": "?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Удалить сайт"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -858,7 +922,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Сбросить статистику"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -945,6 +1017,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -963,4 +1041,4 @@
       "value": "Сайты могут просматривать все члены команды."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/si-LK.json b/public/intl/messages/si-LK.json
index 82898fbd..e12f3008 100644
--- a/public/intl/messages/si-LK.json
+++ b/public/intl/messages/si-LK.json
@@ -1,26 +1,20 @@
 {
-  "label.accounts": [
+  "label.access-code": [
     {
       "type": 0,
-      "value": "ගිණුම්"
+      "value": "Access code"
     }
   ],
-  "label.add-account": [
+  "label.actions": [
     {
       "type": 0,
-      "value": "ගිණුම එකතු කරන්න"
+      "value": "Actions"
     }
   ],
-  "label.add-column": [
+  "label.activity-log": [
     {
       "type": 0,
-      "value": "තීරුව එක් කරන්න"
-    }
-  ],
-  "label.add-filter": [
-    {
-      "type": 0,
-      "value": "පෙරහන එකතු කරන්න"
+      "value": "Activity log"
     }
   ],
   "label.add-website": [
@@ -29,10 +23,10 @@
       "value": "වෙබ් අඩවිය එක් කරන්න"
     }
   ],
-  "label.administrator": [
+  "label.admin": [
     {
       "type": 0,
-      "value": "පරිපාලක"
+      "value": "Administrator"
     }
   ],
   "label.all": [
@@ -47,10 +41,16 @@
       "value": "හැම වෙලාවෙම"
     }
   ],
-  "label.all-websites": [
+  "label.analytics": [
     {
       "type": 0,
-      "value": "සියලුම වෙබ් අඩවි"
+      "value": "Analytics"
+    }
+  ],
+  "label.average-visit-time": [
+    {
+      "type": 0,
+      "value": "Average visit time"
     }
   ],
   "label.back": [
@@ -59,6 +59,18 @@
       "value": "ආපසු"
     }
   ],
+  "label.bounce-rate": [
+    {
+      "type": 0,
+      "value": "Bounce rate"
+    }
+  ],
+  "label.browsers": [
+    {
+      "type": 0,
+      "value": "Browsers"
+    }
+  ],
   "label.cancel": [
     {
       "type": 0,
@@ -71,16 +83,58 @@
       "value": "මුරපදය වෙනස් කරන්න"
     }
   ],
+  "label.cities": [
+    {
+      "type": 0,
+      "value": "Cities"
+    }
+  ],
+  "label.clear-all": [
+    {
+      "type": 0,
+      "value": "Clear all"
+    }
+  ],
+  "label.confirm": [
+    {
+      "type": 0,
+      "value": "Confirm"
+    }
+  ],
   "label.confirm-password": [
     {
       "type": 0,
       "value": "මුරපදය සත්‍යාපනය කරන්න"
     }
   ],
-  "label.copy-to-clipboard": [
+  "label.continue": [
     {
       "type": 0,
-      "value": "පසුරු පුවරුවට පිටපත් කරන්න"
+      "value": "Continue"
+    }
+  ],
+  "label.countries": [
+    {
+      "type": 0,
+      "value": "Countries"
+    }
+  ],
+  "label.create-team": [
+    {
+      "type": 0,
+      "value": "Create team"
+    }
+  ],
+  "label.create-user": [
+    {
+      "type": 0,
+      "value": "Create user"
+    }
+  ],
+  "label.created": [
+    {
+      "type": 0,
+      "value": "Created"
     }
   ],
   "label.current-password": [
@@ -101,6 +155,12 @@
       "value": "උපකරණ පුවරුව"
     }
   ],
+  "label.data": [
+    {
+      "type": 0,
+      "value": "Data"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
@@ -119,10 +179,16 @@
       "value": "මකන්න"
     }
   ],
-  "label.delete-account": [
+  "label.delete-team": [
     {
       "type": 0,
-      "value": "ගිණුම මකන්න"
+      "value": "Delete team"
+    }
+  ],
+  "label.delete-user": [
+    {
+      "type": 0,
+      "value": "Delete user"
     }
   ],
   "label.delete-website": [
@@ -131,6 +197,24 @@
       "value": "වෙබ් අඩවිය මකන්න"
     }
   ],
+  "label.desktop": [
+    {
+      "type": 0,
+      "value": "Desktop"
+    }
+  ],
+  "label.details": [
+    {
+      "type": 0,
+      "value": "Details"
+    }
+  ],
+  "label.devices": [
+    {
+      "type": 0,
+      "value": "Devices"
+    }
+  ],
   "label.dismiss": [
     {
       "type": 0,
@@ -149,16 +233,10 @@
       "value": "සංස්කරණය කරන්න"
     }
   ],
-  "label.edit-account": [
+  "label.edit-dashboard": [
     {
       "type": 0,
-      "value": "ගිණුම සංස්කරණය කරන්න"
-    }
-  ],
-  "label.edit-website": [
-    {
-      "type": 0,
-      "value": "වෙබ් අඩවිය සංස්කරණය කරන්න"
+      "value": "Edit dashboard"
     }
   ],
   "label.enable-share-url": [
@@ -173,22 +251,40 @@
       "value": "සිදුවීම් දත්ත"
     }
   ],
-  "label.field-name": [
+  "label.events": [
     {
       "type": 0,
-      "value": "ක්ෂේත්‍ර නාම"
+      "value": "Events"
     }
   ],
-  "label.invalid": [
+  "label.filter-combined": [
     {
       "type": 0,
-      "value": "වලංගු නැත"
+      "value": "Combined"
     }
   ],
-  "label.invalid-domain": [
+  "label.filter-raw": [
     {
       "type": 0,
-      "value": "වලංගු නොවන වසමක්"
+      "value": "Raw"
+    }
+  ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
+  "label.join": [
+    {
+      "type": 0,
+      "value": "Join"
+    }
+  ],
+  "label.join-team": [
+    {
+      "type": 0,
+      "value": "Join team"
     }
   ],
   "label.language": [
@@ -197,6 +293,18 @@
       "value": "භාෂාව"
     }
   ],
+  "label.languages": [
+    {
+      "type": 0,
+      "value": "Languages"
+    }
+  ],
+  "label.laptop": [
+    {
+      "type": 0,
+      "value": "Laptop"
+    }
+  ],
   "label.last-days": [
     {
       "type": 0,
@@ -225,14 +333,16 @@
       "value": " පැය"
     }
   ],
-  "label.logged-in-as": [
+  "label.leave": [
     {
       "type": 0,
-      "value": "ලොග් වී ඇත්තේ "
-    },
+      "value": "Leave"
+    }
+  ],
+  "label.leave-team": [
     {
-      "type": 1,
-      "value": "username"
+      "type": 0,
+      "value": "Leave team"
     }
   ],
   "label.login": [
@@ -247,6 +357,18 @@
       "value": "පිටවීම"
     }
   ],
+  "label.members": [
+    {
+      "type": 0,
+      "value": "Members"
+    }
+  ],
+  "label.mobile": [
+    {
+      "type": 0,
+      "value": "Mobile"
+    }
+  ],
   "label.more": [
     {
       "type": 0,
@@ -271,22 +393,44 @@
       "value": "කිසිවක් නැත"
     }
   ],
+  "label.operating-systems": [
+    {
+      "type": 0,
+      "value": "Operating systems"
+    }
+  ],
   "label.owner": [
     {
       "type": 0,
       "value": "හිමිකරු"
     }
   ],
+  "label.page-views": [
+    {
+      "type": 0,
+      "value": "Page views"
+    }
+  ],
+  "label.pages": [
+    {
+      "type": 0,
+      "value": "Pages"
+    }
+  ],
   "label.password": [
     {
       "type": 0,
       "value": "මුරපදය"
     }
   ],
-  "label.passwords-dont-match": [
+  "label.powered-by": [
     {
       "type": 0,
-      "value": "මුරපද නොගැලපේ"
+      "value": "Powered by "
+    },
+    {
+      "type": 1,
+      "value": "name"
     }
   ],
   "label.profile": [
@@ -295,16 +439,34 @@
       "value": "පැතිකඩ"
     }
   ],
+  "label.queries": [
+    {
+      "type": 0,
+      "value": "Queries"
+    }
+  ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
+  "label.query-parameters": [
+    {
+      "type": 0,
+      "value": "Query parameters"
+    }
+  ],
   "label.realtime": [
     {
       "type": 0,
       "value": "තත්ය කාල"
     }
   ],
-  "label.realtime-logs": [
+  "label.referrers": [
     {
       "type": 0,
-      "value": "තත්‍ය කාලීන ලොග්"
+      "value": "Referrers"
     }
   ],
   "label.refresh": [
@@ -313,6 +475,30 @@
       "value": "නැවුම් කරන්න"
     }
   ],
+  "label.regenerate": [
+    {
+      "type": 0,
+      "value": "Regenerate"
+    }
+  ],
+  "label.regions": [
+    {
+      "type": 0,
+      "value": "Regions"
+    }
+  ],
+  "label.remove": [
+    {
+      "type": 0,
+      "value": "Remove"
+    }
+  ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -331,16 +517,40 @@
       "value": "සංඛ්යා ලේඛන නැවත සකසන්න"
     }
   ],
+  "label.role": [
+    {
+      "type": 0,
+      "value": "Role"
+    }
+  ],
   "label.save": [
     {
       "type": 0,
       "value": "සුරකින්න"
     }
   ],
-  "label.search": [
+  "label.screens": [
     {
       "type": 0,
-      "value": "සෙවීම"
+      "value": "Screens"
+    }
+  ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
+  "label.select-website": [
+    {
+      "type": 0,
+      "value": "Select website"
+    }
+  ],
+  "label.sessions": [
+    {
+      "type": 0,
+      "value": "Sessions"
     }
   ],
   "label.settings": [
@@ -361,6 +571,48 @@
       "value": "තනි දවස"
     }
   ],
+  "label.tablet": [
+    {
+      "type": 0,
+      "value": "Tablet"
+    }
+  ],
+  "label.team": [
+    {
+      "type": 0,
+      "value": "Team"
+    }
+  ],
+  "label.team-guest": [
+    {
+      "type": 0,
+      "value": "Team guest"
+    }
+  ],
+  "label.team-id": [
+    {
+      "type": 0,
+      "value": "Team ID"
+    }
+  ],
+  "label.team-member": [
+    {
+      "type": 0,
+      "value": "Team member"
+    }
+  ],
+  "label.team-owner": [
+    {
+      "type": 0,
+      "value": "Team owner"
+    }
+  ],
+  "label.teams": [
+    {
+      "type": 0,
+      "value": "Teams"
+    }
+  ],
   "label.theme": [
     {
       "type": 0,
@@ -391,22 +643,34 @@
       "value": "වේලා කලාපය"
     }
   ],
+  "label.title": [
+    {
+      "type": 0,
+      "value": "Title"
+    }
+  ],
   "label.today": [
     {
       "type": 0,
       "value": "අද"
     }
   ],
+  "label.toggle-charts": [
+    {
+      "type": 0,
+      "value": "Toggle charts"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "ලුහුබැඳීමේ කේතය"
     }
   ],
-  "label.type": [
+  "label.unique-visitors": [
     {
       "type": 0,
-      "value": "වර්ගය"
+      "value": "Unique visitors"
     }
   ],
   "label.unknown": [
@@ -415,16 +679,34 @@
       "value": "නොදනී"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
+  "label.user": [
+    {
+      "type": 0,
+      "value": "User"
+    }
+  ],
   "label.username": [
     {
       "type": 0,
       "value": "පරිශීලක නාමය"
     }
   ],
-  "label.value": [
+  "label.users": [
     {
       "type": 0,
-      "value": "වටිනාකම"
+      "value": "Users"
+    }
+  ],
+  "label.view": [
+    {
+      "type": 0,
+      "value": "View"
     }
   ],
   "label.view-details": [
@@ -433,6 +715,30 @@
       "value": "තොරතුරු පෙන්වන්න"
     }
   ],
+  "label.views": [
+    {
+      "type": 0,
+      "value": "Views"
+    }
+  ],
+  "label.visitors": [
+    {
+      "type": 0,
+      "value": "Visitors"
+    }
+  ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
+  "label.website-id": [
+    {
+      "type": 0,
+      "value": "Website ID"
+    }
+  ],
   "label.websites": [
     {
       "type": 0,
@@ -489,6 +795,20 @@
       "value": " මකා දැමීම ගැන විශ්වාසද?"
     }
   ],
+  "message.confirm-leave": [
+    {
+      "type": 0,
+      "value": "Are you sure you want to leave "
+    },
+    {
+      "type": 1,
+      "value": "target"
+    },
+    {
+      "type": 0,
+      "value": "?"
+    }
+  ],
   "message.confirm-reset": [
     {
       "type": 1,
@@ -499,40 +819,58 @@
       "value": " ට අදාල සංඛ්‍යාලේඛන නැවත පිහිටුවීමට අවශ්‍යද?"
     }
   ],
-  "message.copied": [
+  "message.delete-account": [
     {
       "type": 0,
-      "value": "පිටපත් කරගත්තා!"
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
-  "message.delete-warning": [
+  "message.delete-website": [
     {
       "type": 0,
-      "value": "සියලුම ආශ්‍රිත දත්ත ද මකා දැමෙනු ඇත."
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
-  "message.edit-dashboard": [
+  "message.delete-website-warning": [
     {
       "type": 0,
-      "value": "උපකරණ පුවරුව සංස්කරණය කරන්න"
+      "value": "All website data will be deleted."
     }
   ],
-  "message.failure": [
+  "message.error": [
     {
       "type": 0,
-      "value": "යම් ගැටලුවක් මතු වී ඇත."
+      "value": "Something went wrong."
     }
   ],
-  "message.get-share-url": [
+  "message.event-log": [
+    {
+      "type": 1,
+      "value": "event"
+    },
     {
       "type": 0,
-      "value": "බෙදාගැනීමේ URL ලබා ගන්න"
-    }
-  ],
-  "message.get-tracking-code": [
+      "value": " on "
+    },
     {
-      "type": 0,
-      "value": "ලුහුබැඳීමේ කේතය ලබා ගන්න"
+      "type": 1,
+      "value": "url"
     }
   ],
   "message.go-to-settings": [
@@ -547,52 +885,24 @@
       "value": "වැරදි පරිශීලක නාමය/මුරපදය."
     }
   ],
-  "message.log.visitor": [
-    {
-      "type": 1,
-      "value": "country"
-    },
+  "message.invalid-domain": [
     {
       "type": 0,
-      "value": " වලින් පැමිණි අමුත්තකු "
-    },
-    {
-      "type": 1,
-      "value": "device"
-    },
-    {
-      "type": 0,
-      "value": " එකේ, මේ "
-    },
-    {
-      "type": 1,
-      "value": "os"
-    },
-    {
-      "type": 0,
-      "value": " එකේ, මේ "
-    },
-    {
-      "type": 1,
-      "value": "browser"
-    },
-    {
-      "type": 0,
-      "value": " එකෙන් ඉන්නවා"
+      "value": "Invalid domain. Do not include http/https."
     }
   ],
-  "message.new-version-available": [
+  "message.min-password-length": [
     {
       "type": 0,
-      "value": "umami අලුත්ම "
+      "value": "Minimum length of "
     },
     {
       "type": 1,
-      "value": "version"
+      "value": "n"
     },
     {
       "type": 0,
-      "value": " වන අනුවාදය නිකුත් උනා!"
+      "value": " characters"
     }
   ],
   "message.no-data-available": [
@@ -601,10 +911,22 @@
       "value": "පෙන්වීමට දත්ත නොමැත."
     }
   ],
-  "message.no-websites-configured": [
+  "message.no-match-password": [
     {
       "type": 0,
-      "value": "ඔබට වින්‍යාස කර ඇති වෙබ් අඩවි කිසිවක් නොමැත."
+      "value": "Passwords do not match."
+    }
+  ],
+  "message.no-teams": [
+    {
+      "type": 0,
+      "value": "You have not created any teams."
+    }
+  ],
+  "message.no-users": [
+    {
+      "type": 0,
+      "value": "There are no users."
     }
   ],
   "message.page-not-found": [
@@ -613,26 +935,30 @@
       "value": "පිටුව හමු නොවීය."
     }
   ],
-  "message.powered-by": [
+  "message.reset-website": [
     {
       "type": 0,
-      "value": "බල ගැන්වුයේ "
+      "value": "To reset this website, type "
     },
     {
       "type": 1,
-      "value": "name"
-    }
-  ],
-  "message.reset-warning": [
+      "value": "confirmation"
+    },
     {
       "type": 0,
-      "value": "සියලුම සංඛ්‍යාලේඛන මකා දමනු ඇත. නමුත් ඔබගේ නිරීක්ෂණ කේතය නොවෙනස්ව පවතිනු ඇත."
+      "value": " in the box below to confirm."
     }
   ],
-  "message.save-success": [
+  "message.reset-website-warning": [
     {
       "type": 0,
-      "value": "සාර්තකව සුරැකිණි."
+      "value": "All statistics for this website will be deleted, but your settings will remain intact."
+    }
+  ],
+  "message.saved": [
+    {
+      "type": 0,
+      "value": "Saved."
     }
   ],
   "message.share-url": [
@@ -649,194 +975,100 @@
       "value": " සඳහා ප්‍රසිද්ධියේ බෙදාගත් URL එකයි."
     }
   ],
-  "message.toggle-charts": [
+  "message.team-already-member": [
     {
       "type": 0,
-      "value": "ප්‍රස්ථාර ටොගල් කරන්න"
+      "value": "You are already a member of the team."
     }
   ],
-  "message.track-stats": [
-    {
-      "type": 1,
-      "value": "target"
-    },
+  "message.team-not-found": [
     {
       "type": 0,
-      "value": " හි සංඛ්යාලේඛන බැලීම සදහා, පහත කේතය "
+      "value": "Team not found."
+    }
+  ],
+  "message.tracking-code": [
+    {
+      "type": 0,
+      "value": "To track stats for this website, place the following code in the "
     },
     {
-      "type": 1,
+      "children": [
+        {
+          "type": 0,
+          "value": "..."
+        }
+      ],
+      "type": 8,
       "value": "head"
     },
     {
       "type": 0,
-      "value": " කොටසට ඇතුලත් කරන්න."
+      "value": " section of your HTML."
     }
   ],
-  "message.type-delete": [
+  "message.user-deleted": [
     {
       "type": 0,
-      "value": "සත්‍යාපනය සදහා "
+      "value": "User deleted."
+    }
+  ],
+  "message.visitor-log": [
+    {
+      "type": 0,
+      "value": "Visitor from "
     },
     {
       "type": 1,
-      "value": "delete"
+      "value": "country"
     },
     {
       "type": 0,
-      "value": " ලෙස පහල කොටුවේ ටයිප් කරන්න"
-    }
-  ],
-  "message.type-reset": [
-    {
-      "type": 0,
-      "value": "සත්‍යාපනය සදහා "
+      "value": " using "
     },
     {
       "type": 1,
-      "value": "reset"
+      "value": "browser"
     },
     {
       "type": 0,
-      "value": " ලෙස පහල කොටුවේ ටයිප් කරන්න"
-    }
-  ],
-  "metrics.actions": [
+      "value": " on "
+    },
+    {
+      "type": 1,
+      "value": "os"
+    },
     {
       "type": 0,
-      "value": "ක්රියාවන්"
+      "value": " "
+    },
+    {
+      "type": 1,
+      "value": "device"
     }
   ],
-  "metrics.average-visit-time": [
+  "messages.no-results-found": [
     {
       "type": 0,
-      "value": "සාමාන්‍ය සංචාර කාලය"
+      "value": "No results were found."
     }
   ],
-  "metrics.bounce-rate": [
+  "messages.no-team-websites": [
     {
       "type": 0,
-      "value": "හැරී යන ප්‍රමාණය"
+      "value": "This team does not have any websites."
     }
   ],
-  "metrics.browsers": [
+  "messages.no-websites-configured": [
     {
       "type": 0,
-      "value": "බ්‍රව්සර්"
+      "value": "You do not have any websites configured."
     }
   ],
-  "metrics.countries": [
+  "messages.team-websites-info": [
     {
       "type": 0,
-      "value": "රටවල්"
-    }
-  ],
-  "metrics.device.desktop": [
-    {
-      "type": 0,
-      "value": "ඩෙස්ක්ටොප්"
-    }
-  ],
-  "metrics.device.laptop": [
-    {
-      "type": 0,
-      "value": "ලැප්ටොප්"
-    }
-  ],
-  "metrics.device.mobile": [
-    {
-      "type": 0,
-      "value": "ජංගම"
-    }
-  ],
-  "metrics.device.tablet": [
-    {
-      "type": 0,
-      "value": "ටැබ්ලට්"
-    }
-  ],
-  "metrics.devices": [
-    {
-      "type": 0,
-      "value": "උපකරණ"
-    }
-  ],
-  "metrics.events": [
-    {
-      "type": 0,
-      "value": "සිද්ධීන්"
-    }
-  ],
-  "metrics.filter.combined": [
-    {
-      "type": 0,
-      "value": "ඒකාබද්ධ"
-    }
-  ],
-  "metrics.filter.raw": [
-    {
-      "type": 0,
-      "value": "අමු"
-    }
-  ],
-  "metrics.languages": [
-    {
-      "type": 0,
-      "value": "භාෂා"
-    }
-  ],
-  "metrics.operating-systems": [
-    {
-      "type": 0,
-      "value": "මෙහෙයුම් පද්ධති"
-    }
-  ],
-  "metrics.page-views": [
-    {
-      "type": 0,
-      "value": "පිටු බැලීම්"
-    }
-  ],
-  "metrics.pages": [
-    {
-      "type": 0,
-      "value": "පිටු"
-    }
-  ],
-  "metrics.query-parameters": [
-    {
-      "type": 0,
-      "value": "විමසුම් පරාමිතීන්"
-    }
-  ],
-  "metrics.referrers": [
-    {
-      "type": 0,
-      "value": "යොමු කරන්නන්"
-    }
-  ],
-  "metrics.screens": [
-    {
-      "type": 0,
-      "value": "තිර"
-    }
-  ],
-  "metrics.unique-visitors": [
-    {
-      "type": 0,
-      "value": "අලුත්ම අමුත්තන්"
-    }
-  ],
-  "metrics.views": [
-    {
-      "type": 0,
-      "value": "බැලූ ගණන"
-    }
-  ],
-  "metrics.visitors": [
-    {
-      "type": 0,
-      "value": "අමුත්තන්"
+      "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/sk-SK.json b/public/intl/messages/sk-SK.json
index 3abce8ef..e475e20f 100644
--- a/public/intl/messages/sk-SK.json
+++ b/public/intl/messages/sk-SK.json
@@ -245,6 +245,12 @@
       "value": "Povoliť zdielanie URL"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Nezpracované"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "Neznámý"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "Návštevy"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -785,10 +827,32 @@
       "value": "'s statistics?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Zmazať web"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -882,7 +946,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Reset statistics"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -969,6 +1041,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -987,4 +1065,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/sl-SI.json b/public/intl/messages/sl-SI.json
index 93dbb9d5..d358eaaa 100644
--- a/public/intl/messages/sl-SI.json
+++ b/public/intl/messages/sl-SI.json
@@ -245,6 +245,12 @@
       "value": "Omogoči URL za skupno rabo"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Neobdelane meritve"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "Neznano"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "Obiskovalci"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -785,10 +827,32 @@
       "value": "'s statistics?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Izbriši spletno mesto"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -882,7 +946,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Reset statistics"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -969,6 +1041,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -987,4 +1065,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/sv-SE.json b/public/intl/messages/sv-SE.json
index 2b3663a8..59e9721a 100644
--- a/public/intl/messages/sv-SE.json
+++ b/public/intl/messages/sv-SE.json
@@ -245,6 +245,12 @@
       "value": "Aktivera delnings-URL"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Rådata"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "Okänd"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "Besökare"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -789,10 +831,32 @@
       "value": "?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Radera webbsajt"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -886,7 +950,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Återställ statistik"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -973,6 +1045,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -991,4 +1069,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/ta-IN.json b/public/intl/messages/ta-IN.json
index b7210292..3f4f03b5 100644
--- a/public/intl/messages/ta-IN.json
+++ b/public/intl/messages/ta-IN.json
@@ -245,6 +245,12 @@
       "value": "கள முகவரியை பகிரலாம்"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "மூல"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "தெரியாத"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "பார்வையாளர்கள்"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -785,10 +827,32 @@
       "value": "'s statistics?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "வலைத்தளத்தை நீக்கு"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -882,7 +946,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Reset statistics"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -965,6 +1037,12 @@
       "value": "லில் பயன்படுத்துகிறார்"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -983,4 +1061,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/th-TH.json b/public/intl/messages/th-TH.json
index 54641c9c..b8b9e46f 100644
--- a/public/intl/messages/th-TH.json
+++ b/public/intl/messages/th-TH.json
@@ -245,6 +245,12 @@
       "value": "เปิดใช้งานการแชร์ลิงก์"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "ข้อมูลดิบ"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -425,6 +437,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -467,6 +485,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -503,6 +527,12 @@
       "value": "ขนาดหน้าจอ"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -641,6 +671,12 @@
       "value": "ไม่รู้จัก"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -683,6 +719,12 @@
       "value": "ผู้เข้าชม"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -781,10 +823,32 @@
       "value": " ?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "ลบเว็บไซต์"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -878,7 +942,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "รีเซตข้อมูลสถิติ"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -965,6 +1037,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -983,4 +1061,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/tr-TR.json b/public/intl/messages/tr-TR.json
index a8b03f95..4fc75603 100644
--- a/public/intl/messages/tr-TR.json
+++ b/public/intl/messages/tr-TR.json
@@ -245,6 +245,12 @@
       "value": "Anonim paylaşım URL'i aktif"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Ham"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Ekranlar"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "Bilinmeyen"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "Ziyaretçi"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -757,10 +799,32 @@
       "value": "'s statistics?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Web sitesini sil"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -854,7 +918,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Reset statistics"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -937,6 +1009,12 @@
       "value": "browser"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -955,4 +1033,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/uk-UA.json b/public/intl/messages/uk-UA.json
index a198c74e..7ff7f5d0 100644
--- a/public/intl/messages/uk-UA.json
+++ b/public/intl/messages/uk-UA.json
@@ -245,6 +245,12 @@
       "value": "Дозволити ділитися посиланням"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Сирі дані"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "Невідомо"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "Відвідувачі"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -761,10 +803,32 @@
       "value": "?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Видалити сайт"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -858,7 +922,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Скинути статистику сайту"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -945,6 +1017,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -963,4 +1041,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/ur-PK.json b/public/intl/messages/ur-PK.json
index fffff35e..196d62c6 100644
--- a/public/intl/messages/ur-PK.json
+++ b/public/intl/messages/ur-PK.json
@@ -245,6 +245,12 @@
       "value": "شیئر یو آر ایل کو فعال کریں"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "خام"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "نامعلوم"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "زائرین"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -785,10 +827,32 @@
       "value": " کے اعدادوشمار کو دوبارہ ترتیب دینا چاہتے ہیں؟"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "ویب سائٹ مٹایں"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -882,7 +946,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "اعدادوشمار کو دوبارہ ترتیب دیں"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -969,6 +1041,12 @@
       "value": " سے آنے والا"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -987,4 +1065,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/vi-VN.json b/public/intl/messages/vi-VN.json
index 400fd678..2a432b00 100644
--- a/public/intl/messages/vi-VN.json
+++ b/public/intl/messages/vi-VN.json
@@ -245,6 +245,12 @@
       "value": "Bật khả năng chia sẻ URL"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "Gốc"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -425,6 +437,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -467,6 +485,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -503,6 +527,12 @@
       "value": "Screens"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -641,6 +671,12 @@
       "value": "Không rõ"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -683,6 +719,12 @@
       "value": "Khách"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -777,10 +819,32 @@
       "value": "?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Xóa website"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -874,7 +938,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Tái thiết lập thống kê"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -961,6 +1033,12 @@
       "value": "device"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -979,4 +1057,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/zh-CN.json b/public/intl/messages/zh-CN.json
index d17a7d16..075cbf72 100644
--- a/public/intl/messages/zh-CN.json
+++ b/public/intl/messages/zh-CN.json
@@ -245,6 +245,12 @@
       "value": "启用共享链接"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "原始"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -437,6 +449,12 @@
       "value": "查询"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -479,6 +497,12 @@
       "value": "移除"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -515,6 +539,12 @@
       "value": "屏幕尺寸"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -653,6 +683,12 @@
       "value": "未知"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -695,6 +731,12 @@
       "value": "访客"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -769,10 +811,32 @@
       "value": " 的数据吗?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "删除网站"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -866,7 +930,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "重置统计数据"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -957,6 +1029,12 @@
       "value": " 浏览器进行访问。"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -975,4 +1053,4 @@
       "value": "团队中的任何人都可查看网站。"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/public/intl/messages/zh-TW.json b/public/intl/messages/zh-TW.json
index 135d3647..63d9a69e 100644
--- a/public/intl/messages/zh-TW.json
+++ b/public/intl/messages/zh-TW.json
@@ -245,6 +245,12 @@
       "value": "啟用分享連結"
     }
   ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "Event data"
+    }
+  ],
   "label.events": [
     {
       "type": 0,
@@ -263,6 +269,12 @@
       "value": "原始"
     }
   ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "Funnel"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -433,6 +445,12 @@
       "value": "Queries"
     }
   ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query"
+    }
+  ],
   "label.query-parameters": [
     {
       "type": 0,
@@ -475,6 +493,12 @@
       "value": "Remove"
     }
   ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "Reports"
+    }
+  ],
   "label.required": [
     {
       "type": 0,
@@ -511,6 +535,12 @@
       "value": "屏幕尺寸"
     }
   ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "Select date"
+    }
+  ],
   "label.select-website": [
     {
       "type": 0,
@@ -649,6 +679,12 @@
       "value": "未知"
     }
   ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URLs"
+    }
+  ],
   "label.user": [
     {
       "type": 0,
@@ -691,6 +727,12 @@
       "value": "獨立訪客"
     }
   ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "Website"
+    }
+  ],
   "label.website-id": [
     {
       "type": 0,
@@ -765,10 +807,32 @@
       "value": " 的數據嗎?"
     }
   ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "To delete this account, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
+    }
+  ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "刪除網站"
+      "value": "To delete this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.delete-website-warning": [
@@ -862,7 +926,15 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "重置統計數據"
+      "value": "To reset this website, type "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " in the box below to confirm."
     }
   ],
   "message.reset-website-warning": [
@@ -953,6 +1025,12 @@
       "value": " 進行訪問。"
     }
   ],
+  "messages.no-results-found": [
+    {
+      "type": 0,
+      "value": "No results were found."
+    }
+  ],
   "messages.no-team-websites": [
     {
       "type": 0,
@@ -971,4 +1049,4 @@
       "value": "Websites can be viewed by anyone on the team."
     }
   ]
-}
\ No newline at end of file
+}

From 414854b064fb7e1e5c4f74d77dfe64cd531603f2 Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Tue, 20 Jun 2023 10:22:12 -0700
Subject: [PATCH 78/88] Fix funnel report.

---
 lib/prisma.ts                                   |  7 +++++--
 queries/analytics/pageview/getPageviewFunnel.ts | 11 +++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/lib/prisma.ts b/lib/prisma.ts
index 51707049..910c1c71 100644
--- a/lib/prisma.ts
+++ b/lib/prisma.ts
@@ -137,12 +137,13 @@ function getFilterQuery(filters = {}, params = []): string {
 function getFunnelQuery(
   urls: string[],
   windowMinutes: number,
-  initParamLength = 3,
 ): {
   levelQuery: string;
   sumQuery: string;
   urlFilterQuery: string;
 } {
+  const initParamLength = 3;
+
   return urls.reduce(
     (pv, cv, i) => {
       const levelNumber = i + 1;
@@ -155,12 +156,14 @@ function getFunnelQuery(
             l0.created_at level_${levelNumber}_created_at,
             l0.url_path as level_${levelNumber}_url
           from level${i} cl
-              left join level0 l0
+              left join website_event l0
                   on cl.session_id = l0.session_id
                   and l0.created_at between cl.level_${i}_created_at 
                     and ${getAddMinutesQuery(`cl.level_${i}_created_at`, windowMinutes)}
                   and l0.referrer_path = $${i + initParamLength}
                   and l0.url_path = $${levelNumber + initParamLength}
+                  and created_at between $2 and $3
+                  and website_id = $1${toUuid()}
         )`;
       }
 
diff --git a/queries/analytics/pageview/getPageviewFunnel.ts b/queries/analytics/pageview/getPageviewFunnel.ts
index ef62e526..7305e545 100644
--- a/queries/analytics/pageview/getPageviewFunnel.ts
+++ b/queries/analytics/pageview/getPageviewFunnel.ts
@@ -41,23 +41,23 @@ async function relationalQuery(
 
   return rawQuery(
     `WITH level0 AS (
-      select session_id, url_path, referrer_path, created_at
+      select distinct session_id, url_path, referrer_path, created_at
       from website_event
       where url_path in (${urlFilterQuery})
           and website_id = $1${toUuid()}
           and created_at between $2 and $3
   ),level1 AS (
-      select session_id, url_path as level_1_url, created_at as level_1_created_at
+      select distinct session_id, url_path as level_1_url, created_at as level_1_created_at
       from level0
       where url_path = $4
   )${levelQuery}
   
   SELECT ${sumQuery}
-  from level3;
+  from level${urls.length};
   `,
     params,
   ).then((a: { [key: string]: number }) => {
-    return urls.map((b, i) => ({ x: b, y: a[`level${i + 1}`] || 0 }));
+    return urls.map((b, i) => ({ x: b, y: a[0][`level${i + 1}`] || 0 }));
   });
 }
 
@@ -91,7 +91,7 @@ async function clickhouseQuery(
         count(*) AS count
     FROM (
     SELECT session_id,
-            windowFunnel({window:UInt32}, 'strict_order')
+            windowFunnel({window:UInt32})
             (
                 created_at
                 ${columnsQuery}
@@ -99,7 +99,6 @@ async function clickhouseQuery(
         FROM website_event
         WHERE website_id = {websiteId:UUID}
             and ${getBetweenDates('created_at', startDate, endDate)}             
-            AND (url_path in [${conditionQuery}])
         GROUP BY 1
         )
     GROUP BY level

From 3d0d29ec109c021ae039b315bcccbd176af5322e Mon Sep 17 00:00:00 2001
From: Blyamur <409434+blyamur@users.noreply.github.com>
Date: Thu, 22 Jun 2023 08:54:17 +0300
Subject: [PATCH 79/88] Update ru-RU.json

---
 lang/ru-RU.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lang/ru-RU.json b/lang/ru-RU.json
index c5093c8c..b793809b 100644
--- a/lang/ru-RU.json
+++ b/lang/ru-RU.json
@@ -118,7 +118,7 @@
   "message.confirm-delete": "Вы уверены, что хотите удалить {target}?",
   "message.confirm-leave": "Вы уверены, что хотите уйти {target}?",
   "message.confirm-reset": "Вы уверены, что хотите сбросить статистику {target}?",
-  "message.delete-website": "Удалить сайт",
+  "message.delete-website": "Для удаления введите DELETE",
   "message.delete-website-warning": "Все связанные данные будут также удалены.",
   "message.error": "Что-то пошло не так.",
   "message.event-log": "{event} on {url}",
@@ -131,7 +131,7 @@
   "message.no-teams": "Вы не создали ни одной команды.",
   "message.no-users": "Нет пользователей.",
   "message.page-not-found": "Страница не найдена.",
-  "message.reset-website": "Сбросить статистику",
+  "message.reset-website": "Для сброса введите RESET",
   "message.reset-website-warning": "Вся статистика для этого сайта будет удалена, но ваш код отслеживания останется нетронутым.",
   "message.saved": "Успешно сохранено.",
   "message.share-url": "Это публичная ссылка для {target}.",

From de9e5db0d6bc70392652b293446922c321d3c35c Mon Sep 17 00:00:00 2001
From: Blyamur <409434+blyamur@users.noreply.github.com>
Date: Thu, 22 Jun 2023 08:55:00 +0300
Subject: [PATCH 80/88] Update ru-RU.json

---
 lang/ru-RU.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang/ru-RU.json b/lang/ru-RU.json
index b793809b..7421d0c2 100644
--- a/lang/ru-RU.json
+++ b/lang/ru-RU.json
@@ -37,7 +37,7 @@
   "label.devices": "Устройства",
   "label.dismiss": "Отклонить",
   "label.domain": "Домен",
-  "label.edit": "Редактировать",
+  "label.edit": "Изменить",
   "label.edit-dashboard": "Редактировать дашборд",
   "label.enable-share-url": "Разрешить делиться ссылкой",
   "label.events": "События",

From 79856867fbdaf22e9bf3b14ca0a1c2eee8705d20 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Fri, 23 Jun 2023 01:19:08 -0700
Subject: [PATCH 81/88] Fixed report issues.

---
 components/messages.js                        |    2 +
 components/pages/reports/ReportHeader.js      |    9 +-
 components/pages/reports/ReportsTable.js      |    3 +-
 .../pages/reports/funnel/FunnelParameters.js  |    6 +-
 components/pages/reports/funnel/UrlAddForm.js |   44 +-
 .../reports/funnel/UrlAddForm.module.css      |    6 +
 package.json                                  |    6 +-
 yarn.lock                                     | 3235 ++++++-----------
 8 files changed, 1199 insertions(+), 2112 deletions(-)

diff --git a/components/messages.js b/components/messages.js
index c6ddae60..9499e2a6 100644
--- a/components/messages.js
+++ b/components/messages.js
@@ -135,6 +135,8 @@ export const labels = defineMessages({
   fields: { id: 'label.fields', defaultMessage: 'Fields' },
   createReport: { id: 'labels.create-report', defaultMessage: 'Create report' },
   description: { id: 'labels.description', defaultMessage: 'Description' },
+  untitled: { id: 'labels.untitled', defaultMessage: 'Untitled' },
+  type: { id: 'labels.type', defaultMessage: 'Type' },
 });
 
 export const messages = defineMessages({
diff --git a/components/pages/reports/ReportHeader.js b/components/pages/reports/ReportHeader.js
index 7de45d9a..394b1951 100644
--- a/components/pages/reports/ReportHeader.js
+++ b/components/pages/reports/ReportHeader.js
@@ -50,7 +50,13 @@ export function ReportHeader({ icon }) {
     return (
       <>
         <Icon size="lg">{icon}</Icon>
-        <InlineEditField name="name" value={name} onCommit={handleNameChange} />
+        <InlineEditField
+          key={name}
+          name="name"
+          value={name}
+          placeholder={formatMessage(labels.untitled)}
+          onCommit={handleNameChange}
+        />
       </>
     );
   };
@@ -69,6 +75,7 @@ export function ReportHeader({ icon }) {
       </PageHeader>
       <div className={styles.description}>
         <InlineEditField
+          key={description}
           name="description"
           value={description}
           placeholder={`+ ${formatMessage(labels.addDescription)}`}
diff --git a/components/pages/reports/ReportsTable.js b/components/pages/reports/ReportsTable.js
index dfb3a97a..bcc97204 100644
--- a/components/pages/reports/ReportsTable.js
+++ b/components/pages/reports/ReportsTable.js
@@ -2,15 +2,14 @@ import Link from 'next/link';
 import { Button, Text, Icon, Icons } from 'react-basics';
 import SettingsTable from 'components/common/SettingsTable';
 import useMessages from 'hooks/useMessages';
-import useConfig from 'hooks/useConfig';
 
 export function ReportsTable({ data = [] }) {
   const { formatMessage, labels } = useMessages();
-  const { openExternal } = useConfig();
 
   const columns = [
     { name: 'name', label: formatMessage(labels.name) },
     { name: 'description', label: formatMessage(labels.description) },
+    { name: 'type', label: formatMessage(labels.type) },
     { name: 'action', label: ' ' },
   ];
 
diff --git a/components/pages/reports/funnel/FunnelParameters.js b/components/pages/reports/funnel/FunnelParameters.js
index 4c788798..5ce671a8 100644
--- a/components/pages/reports/funnel/FunnelParameters.js
+++ b/components/pages/reports/funnel/FunnelParameters.js
@@ -96,8 +96,10 @@ function AddUrlButton({ onAdd }) {
         </Icon>
       </TooltipPopup>
       <Popup position="bottom" alignment="start">
-        {close => {
-          return <UrlAddForm onSave={onAdd} onClose={close} />;
+        {(close, element) => {
+          const { right, bottom } = element.getBoundingClientRect();
+
+          return <UrlAddForm onSave={onAdd} onClose={close} style={{ left: right, top: bottom }} />;
         }}
       </Popup>
     </PopupTrigger>
diff --git a/components/pages/reports/funnel/UrlAddForm.js b/components/pages/reports/funnel/UrlAddForm.js
index 17d19a91..b1ee37f0 100644
--- a/components/pages/reports/funnel/UrlAddForm.js
+++ b/components/pages/reports/funnel/UrlAddForm.js
@@ -1,13 +1,15 @@
 import { useState } from 'react';
+import { createPortal } from 'react-dom';
 import { useMessages } from 'hooks';
-import { Button, Form, FormButtons, FormRow, TextField } from 'react-basics';
+import { Button, Form, FormRow, TextField, Flexbox } from 'react-basics';
 import styles from './UrlAddForm.module.css';
 
-export function UrlAddForm({ defaultValue = '', onSave, onClose }) {
+export function UrlAddForm({ defaultValue = '', style, onSave, onClose }) {
   const [url, setUrl] = useState(defaultValue);
   const { formatMessage, labels } = useMessages();
 
-  const handleSave = () => {
+  const handleSave = e => {
+    e?.stopPropagation?.();
     onSave?.(url);
     setUrl('');
     onClose();
@@ -17,23 +19,29 @@ export function UrlAddForm({ defaultValue = '', onSave, onClose }) {
     setUrl(e.target.value);
   };
 
-  return (
-    <Form className={styles.form} onSubmit={handleSave}>
+  const handleClick = e => {
+    e.stopPropagation();
+  };
+
+  return createPortal(
+    <Form className={styles.form} onSubmit={handleSave} style={style} onClick={handleClick}>
       <FormRow label={formatMessage(labels.url)}>
-        <TextField
-          name="url"
-          value={url}
-          onChange={handleChange}
-          autoFocus={true}
-          autoComplete="off"
-        />
+        <Flexbox gap={10}>
+          <TextField
+            className={styles.input}
+            name="url"
+            value={url}
+            onChange={handleChange}
+            autoFocus={true}
+            autoComplete="off"
+          />
+          <Button variant="primary" onClick={handleSave}>
+            {formatMessage(labels.add)}
+          </Button>
+        </Flexbox>
       </FormRow>
-      <FormButtons align="center" flex>
-        <Button variant="primary" onClick={handleSave}>
-          {formatMessage(labels.save)}
-        </Button>
-      </FormButtons>
-    </Form>
+    </Form>,
+    document.body,
   );
 }
 
diff --git a/components/pages/reports/funnel/UrlAddForm.module.css b/components/pages/reports/funnel/UrlAddForm.module.css
index 4674ad70..6a3e03b5 100644
--- a/components/pages/reports/funnel/UrlAddForm.module.css
+++ b/components/pages/reports/funnel/UrlAddForm.module.css
@@ -1,8 +1,14 @@
 .form {
+  position: absolute;
   background: var(--base50);
+  width: 300px;
   padding: 30px;
   margin-top: 10px;
   border: 1px solid var(--base400);
   border-radius: var(--border-radius);
   box-shadow: 0 0 0 5px rgba(0, 0, 0, 0.1);
 }
+
+.input {
+  width: 100%;
+}
diff --git a/package.json b/package.json
index 79a30883..6d5ed0fe 100644
--- a/package.json
+++ b/package.json
@@ -90,12 +90,12 @@
     "kafkajs": "^2.1.0",
     "maxmind": "^4.3.6",
     "moment-timezone": "^0.5.35",
-    "next": "13.4.6",
-    "next-basics": "^0.30.0",
+    "next": "13.3.1",
+    "next-basics": "^0.31.0",
     "node-fetch": "^3.2.8",
     "npm-run-all": "^4.1.5",
     "react": "^18.2.0",
-    "react-basics": "^0.85.0",
+    "react-basics": "^0.89.0",
     "react-beautiful-dnd": "^13.1.0",
     "react-dom": "^18.2.0",
     "react-error-boundary": "^4.0.4",
diff --git a/yarn.lock b/yarn.lock
index 31fbe8e0..fc94a0f7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,193 +2,86 @@
 # yarn lockfile v1
 
 
-"@ampproject/remapping@^2.1.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
-  integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
-  dependencies:
-    "@jridgewell/gen-mapping" "^0.1.0"
-    "@jridgewell/trace-mapping" "^0.3.9"
-
 "@ampproject/remapping@^2.2.0":
   version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
+  resolved "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz"
   integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==
   dependencies:
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz"
-  integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz"
+  integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==
   dependencies:
-    "@babel/highlight" "^7.18.6"
+    "@babel/highlight" "^7.22.5"
 
-"@babel/code-frame@^7.10.4":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz"
-  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
-  dependencies:
-    "@babel/highlight" "^7.16.7"
+"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.21.4", "@babel/compat-data@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.5.tgz"
+  integrity sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==
 
-"@babel/code-frame@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39"
-  integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==
-  dependencies:
-    "@babel/highlight" "^7.18.6"
-
-"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.8", "@babel/compat-data@^7.19.4", "@babel/compat-data@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.0.tgz#9b61938c5f688212c7b9ae363a819df7d29d4093"
-  integrity sha512-Gt9jszFJYq7qzXVK4slhc6NzJXnOVmRECWcVjF/T23rNXD9NtWQ0W3qxdg+p9wWIB+VQw3GYV/U2Ha9bRTfs4w==
-
-"@babel/compat-data@^7.20.5", "@babel/compat-data@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.4.tgz#457ffe647c480dff59c2be092fc3acf71195c87f"
-  integrity sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g==
-
-"@babel/core@^7.19.6":
-  version "7.19.6"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.19.6.tgz#7122ae4f5c5a37c0946c066149abd8e75f81540f"
-  integrity sha512-D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg==
-  dependencies:
-    "@ampproject/remapping" "^2.1.0"
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.19.6"
-    "@babel/helper-compilation-targets" "^7.19.3"
-    "@babel/helper-module-transforms" "^7.19.6"
-    "@babel/helpers" "^7.19.4"
-    "@babel/parser" "^7.19.6"
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.19.6"
-    "@babel/types" "^7.19.4"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.2.1"
-    semver "^6.3.0"
-
-"@babel/core@^7.21.3":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.4.tgz#c6dc73242507b8e2a27fd13a9c1814f9fa34a659"
-  integrity sha512-qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA==
+"@babel/core@^7.19.6", "@babel/core@^7.21.3", "@babel/core@^7.9.0":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/core/-/core-7.22.5.tgz"
+  integrity sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.21.4"
-    "@babel/generator" "^7.21.4"
-    "@babel/helper-compilation-targets" "^7.21.4"
-    "@babel/helper-module-transforms" "^7.21.2"
-    "@babel/helpers" "^7.21.0"
-    "@babel/parser" "^7.21.4"
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.21.4"
-    "@babel/types" "^7.21.4"
+    "@babel/code-frame" "^7.22.5"
+    "@babel/generator" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helpers" "^7.22.5"
+    "@babel/parser" "^7.22.5"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.5"
+    "@babel/types" "^7.22.5"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.2"
     semver "^6.3.0"
 
-"@babel/core@^7.9.0":
-  version "7.17.5"
-  resolved "https://registry.npmjs.org/@babel/core/-/core-7.17.5.tgz"
-  integrity sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA==
+"@babel/generator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.22.5.tgz"
+  integrity sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==
   dependencies:
-    "@ampproject/remapping" "^2.1.0"
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.17.3"
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helpers" "^7.17.2"
-    "@babel/parser" "^7.17.3"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.3"
-    "@babel/types" "^7.17.0"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.1.2"
-    semver "^6.3.0"
-
-"@babel/generator@^7.17.3":
-  version "7.18.13"
-  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.18.13.tgz"
-  integrity sha512-CkPg8ySSPuHTYPJYo7IRALdqyjM9HCbt/3uOBEFbzyGVP6Mn8bwFPB0jX6982JVNBlYzM1nnPkfjuXSOPtQeEQ==
-  dependencies:
-    "@babel/types" "^7.18.13"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    jsesc "^2.5.1"
-
-"@babel/generator@^7.18.13", "@babel/generator@^7.19.6", "@babel/generator@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.0.tgz#0bfc5379e0efb05ca6092091261fcdf7ec36249d"
-  integrity sha512-GUPcXxWibClgmYJuIwC2Bc2Lg+8b9VjaJ+HlNdACEVt+Wlr1eoU1OPZjZRm7Hzl0gaTsUZNQfeihvZJhG7oc3w==
-  dependencies:
-    "@babel/types" "^7.20.0"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    jsesc "^2.5.1"
-
-"@babel/generator@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.4.tgz#64a94b7448989f421f919d5239ef553b37bb26bc"
-  integrity sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==
-  dependencies:
-    "@babel/types" "^7.21.4"
+    "@babel/types" "^7.22.5"
     "@jridgewell/gen-mapping" "^0.3.2"
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
 "@babel/helper-annotate-as-pure@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
+  resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz"
   integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==
   dependencies:
     "@babel/types" "^7.18.6"
 
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz#acd4edfd7a566d1d51ea975dff38fd52906981bb"
+  resolved "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz"
   integrity sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==
   dependencies:
     "@babel/helper-explode-assignable-expression" "^7.18.6"
     "@babel/types" "^7.18.9"
 
-"@babel/helper-compilation-targets@^7.16.7":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz"
-  integrity sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==
+"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.21.4", "@babel/helper-compilation-targets@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz"
+  integrity sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==
   dependencies:
-    "@babel/compat-data" "^7.18.8"
-    "@babel/helper-validator-option" "^7.18.6"
-    browserslist "^4.20.2"
-    semver "^6.3.0"
-
-"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.19.0", "@babel/helper-compilation-targets@^7.19.3":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz#6bf5374d424e1b3922822f1d9bdaa43b1a139d0a"
-  integrity sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==
-  dependencies:
-    "@babel/compat-data" "^7.20.0"
-    "@babel/helper-validator-option" "^7.18.6"
-    browserslist "^4.21.3"
-    semver "^6.3.0"
-
-"@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.4.tgz#770cd1ce0889097ceacb99418ee6934ef0572656"
-  integrity sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg==
-  dependencies:
-    "@babel/compat-data" "^7.21.4"
-    "@babel/helper-validator-option" "^7.21.0"
+    "@babel/compat-data" "^7.22.5"
+    "@babel/helper-validator-option" "^7.22.5"
     browserslist "^4.21.3"
     lru-cache "^5.1.1"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.19.0":
+"@babel/helper-create-class-features-plugin@^7.18.6":
   version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz#bfd6904620df4e46470bae4850d66be1054c404b"
+  resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz"
   integrity sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
@@ -201,7 +94,7 @@
 
 "@babel/helper-create-class-features-plugin@^7.21.0":
   version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.4.tgz#3a017163dc3c2ba7deb9a7950849a9586ea24c18"
+  resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.4.tgz"
   integrity sha512-46QrX2CQlaFRF4TkwfTt6nJD7IHq8539cCL7SDpqWSDeJKY1xylKKY5F/33mJhLZ3mFvKv2gGrVS6NkyF6qs+Q==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
@@ -213,9 +106,9 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
     "@babel/helper-split-export-declaration" "^7.18.6"
 
-"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.19.0":
+"@babel/helper-create-regexp-features-plugin@^7.18.6":
   version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz#7976aca61c0984202baca73d84e2337a5424a41b"
+  resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz"
   integrity sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
@@ -223,7 +116,7 @@
 
 "@babel/helper-create-regexp-features-plugin@^7.20.5":
   version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.4.tgz#40411a8ab134258ad2cf3a3d987ec6aa0723cee5"
+  resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.4.tgz"
   integrity sha512-M00OuhU+0GyZ5iBBN9czjugzWrEq2vDpf/zCYHxxf93ul/Q5rv+a5h+/+0WnI1AebHNVtl5bFV0qsJoH23DbfA==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
@@ -231,7 +124,7 @@
 
 "@babel/helper-define-polyfill-provider@^0.3.3":
   version "0.3.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a"
+  resolved "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz"
   integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==
   dependencies:
     "@babel/helper-compilation-targets" "^7.17.7"
@@ -241,124 +134,83 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
-"@babel/helper-environment-visitor@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
-  integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
+"@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz"
+  integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==
 
 "@babel/helper-explode-assignable-expression@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096"
+  resolved "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz"
   integrity sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c"
-  integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==
+"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0", "@babel/helper-function-name@^7.21.0", "@babel/helper-function-name@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz"
+  integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==
   dependencies:
-    "@babel/template" "^7.18.10"
-    "@babel/types" "^7.19.0"
+    "@babel/template" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-function-name@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4"
-  integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==
+"@babel/helper-hoist-variables@^7.18.6", "@babel/helper-hoist-variables@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz"
+  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
   dependencies:
-    "@babel/template" "^7.20.7"
-    "@babel/types" "^7.21.0"
-
-"@babel/helper-hoist-variables@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
-  integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
-  dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/types" "^7.22.5"
 
 "@babel/helper-member-expression-to-functions@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz#1531661e8375af843ad37ac692c132841e2fd815"
+  resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz"
   integrity sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==
   dependencies:
     "@babel/types" "^7.18.9"
 
 "@babel/helper-member-expression-to-functions@^7.20.7", "@babel/helper-member-expression-to-functions@^7.21.0":
   version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz#319c6a940431a133897148515877d2f3269c3ba5"
+  resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz"
   integrity sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q==
   dependencies:
     "@babel/types" "^7.21.0"
 
-"@babel/helper-module-imports@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
-  integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
+"@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz"
+  integrity sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-module-transforms@^7.16.7":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz"
-  integrity sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==
+"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.2", "@babel/helper-module-transforms@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz"
+  integrity sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-simple-access" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/helper-validator-identifier" "^7.18.6"
-    "@babel/template" "^7.18.6"
-    "@babel/traverse" "^7.18.9"
-    "@babel/types" "^7.18.9"
-
-"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6":
-  version "7.19.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz#6c52cc3ac63b70952d33ee987cbee1c9368b533f"
-  integrity sha512-fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-simple-access" "^7.19.4"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/helper-validator-identifier" "^7.19.1"
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.19.6"
-    "@babel/types" "^7.19.4"
-
-"@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.2":
-  version "7.21.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz#160caafa4978ac8c00ac66636cb0fa37b024e2d2"
-  integrity sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-simple-access" "^7.20.2"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/helper-validator-identifier" "^7.19.1"
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.21.2"
-    "@babel/types" "^7.21.2"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-simple-access" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.5"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
 "@babel/helper-optimise-call-expression@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
+  resolved "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz"
   integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz#4796bb14961521f0f8715990bee2fb6e51ce21bf"
-  integrity sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz"
+  integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
 
-"@babel/helper-plugin-utils@^7.20.2":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629"
-  integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==
-
-"@babel/helper-remap-async-to-generator@^7.18.6", "@babel/helper-remap-async-to-generator@^7.18.9":
+"@babel/helper-remap-async-to-generator@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519"
+  resolved "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz"
   integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
@@ -368,7 +220,7 @@
 
 "@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.18.9":
   version "7.19.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz#e1592a9b4b368aa6bdb8784a711e0bcbf0612b78"
+  resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz"
   integrity sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==
   dependencies:
     "@babel/helper-environment-visitor" "^7.18.9"
@@ -379,7 +231,7 @@
 
 "@babel/helper-replace-supers@^7.20.7":
   version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz#243ecd2724d2071532b2c8ad2f0f9f083bcae331"
+  resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz"
   integrity sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==
   dependencies:
     "@babel/helper-environment-visitor" "^7.18.9"
@@ -389,57 +241,45 @@
     "@babel/traverse" "^7.20.7"
     "@babel/types" "^7.20.7"
 
-"@babel/helper-simple-access@^7.18.6", "@babel/helper-simple-access@^7.19.4":
-  version "7.19.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz#be553f4951ac6352df2567f7daa19a0ee15668e7"
-  integrity sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==
+"@babel/helper-simple-access@^7.20.2", "@babel/helper-simple-access@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz"
+  integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
   dependencies:
-    "@babel/types" "^7.19.4"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-simple-access@^7.20.2":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9"
-  integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==
-  dependencies:
-    "@babel/types" "^7.20.2"
-
-"@babel/helper-skip-transparent-expression-wrappers@^7.18.9", "@babel/helper-skip-transparent-expression-wrappers@^7.20.0":
+"@babel/helper-skip-transparent-expression-wrappers@^7.20.0":
   version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684"
+  resolved "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz"
   integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==
   dependencies:
     "@babel/types" "^7.20.0"
 
-"@babel/helper-split-export-declaration@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
-  integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
+"@babel/helper-split-export-declaration@^7.18.6", "@babel/helper-split-export-declaration@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz"
+  integrity sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-string-parser@^7.18.10", "@babel/helper-string-parser@^7.19.4":
-  version "7.19.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
-  integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
+"@babel/helper-string-parser@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz"
+  integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
 
-"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
-  version "7.19.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
-  integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
+"@babel/helper-validator-identifier@^7.19.1", "@babel/helper-validator-identifier@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz"
+  integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==
 
-"@babel/helper-validator-option@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
-  integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
-
-"@babel/helper-validator-option@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180"
-  integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==
+"@babel/helper-validator-option@^7.18.6", "@babel/helper-validator-option@^7.21.0", "@babel/helper-validator-option@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz"
+  integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==
 
 "@babel/helper-wrap-function@^7.18.9":
   version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz#89f18335cff1152373222f76a4b37799636ae8b1"
+  resolved "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz"
   integrity sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==
   dependencies:
     "@babel/helper-function-name" "^7.19.0"
@@ -447,105 +287,48 @@
     "@babel/traverse" "^7.19.0"
     "@babel/types" "^7.19.0"
 
-"@babel/helpers@^7.17.2":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.9.tgz"
-  integrity sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==
+"@babel/helpers@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.5.tgz"
+  integrity sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==
   dependencies:
-    "@babel/template" "^7.18.6"
-    "@babel/traverse" "^7.18.9"
-    "@babel/types" "^7.18.9"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
-"@babel/helpers@^7.19.4":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.0.tgz#27c8ffa8cc32a2ed3762fba48886e7654dbcf77f"
-  integrity sha512-aGMjYraN0zosCEthoGLdqot1oRsmxVTQRHadsUPz5QM44Zej2PYRz7XiDE7GqnkZnNtLbOuxqoZw42vkU7+XEQ==
+"@babel/highlight@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz"
+  integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==
   dependencies:
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.20.0"
-    "@babel/types" "^7.20.0"
-
-"@babel/helpers@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.0.tgz#9dd184fb5599862037917cdc9eecb84577dc4e7e"
-  integrity sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==
-  dependencies:
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.21.0"
-    "@babel/types" "^7.21.0"
-
-"@babel/highlight@^7.16.7", "@babel/highlight@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
-  integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.18.6"
+    "@babel/helper-validator-identifier" "^7.22.5"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0":
-  version "7.17.3"
-  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.17.3.tgz"
-  integrity sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA==
-
-"@babel/parser@^7.16.4":
-  version "7.18.4"
-  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.18.4.tgz"
-  integrity sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow==
-
-"@babel/parser@^7.17.3":
-  version "7.18.13"
-  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.18.13.tgz"
-  integrity sha512-dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg==
-
-"@babel/parser@^7.18.10", "@babel/parser@^7.18.13", "@babel/parser@^7.19.6", "@babel/parser@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.0.tgz#b26133c888da4d79b0d3edcf42677bcadc783046"
-  integrity sha512-G9VgAhEaICnz8iiJeGJQyVl6J2nTjbW0xeisva0PK6XcKsga7BIaqm4ZF8Rg1Wbaqmy6znspNqhPaPkyukujzg==
-
-"@babel/parser@^7.20.7", "@babel/parser@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.4.tgz#94003fdfc520bbe2875d4ae557b43ddb6d880f17"
-  integrity sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==
+"@babel/parser@^7.1.0", "@babel/parser@^7.16.4", "@babel/parser@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz"
+  integrity sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==
 
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
+  resolved "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz"
   integrity sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz#a11af19aa373d68d561f08e0a57242350ed0ec50"
-  integrity sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
-    "@babel/plugin-proposal-optional-chaining" "^7.18.9"
-
 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.20.7":
   version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz#d9c85589258539a22a901033853101a6198d4ef1"
+  resolved "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz"
   integrity sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
     "@babel/plugin-proposal-optional-chaining" "^7.20.7"
 
-"@babel/plugin-proposal-async-generator-functions@^7.19.1":
-  version "7.19.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz#34f6f5174b688529342288cd264f80c9ea9fb4a7"
-  integrity sha512-0yu8vNATgLy4ivqMNBIwb1HebCelqN7YX8SL3FDXORv/RqT0zEEWUCH4GH44JsSrvCu6GqnAdR5EBFAPeNBB4Q==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.19.0"
-    "@babel/helper-remap-async-to-generator" "^7.18.9"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-
 "@babel/plugin-proposal-async-generator-functions@^7.20.7":
   version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz"
   integrity sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==
   dependencies:
     "@babel/helper-environment-visitor" "^7.18.9"
@@ -555,24 +338,15 @@
 
 "@babel/plugin-proposal-class-properties@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz"
   integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
   dependencies:
     "@babel/helper-create-class-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-class-static-block@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz#8aa81d403ab72d3962fc06c26e222dacfc9b9020"
-  integrity sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-class-static-block" "^7.14.5"
-
 "@babel/plugin-proposal-class-static-block@^7.21.0":
   version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz#77bdd66fb7b605f3a61302d224bdfacf5547977d"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz"
   integrity sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==
   dependencies:
     "@babel/helper-create-class-features-plugin" "^7.21.0"
@@ -581,7 +355,7 @@
 
 "@babel/plugin-proposal-dynamic-import@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz"
   integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
@@ -589,7 +363,7 @@
 
 "@babel/plugin-proposal-export-namespace-from@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz"
   integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
@@ -597,23 +371,15 @@
 
 "@babel/plugin-proposal-json-strings@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz"
   integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-proposal-logical-assignment-operators@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz#8148cbb350483bf6220af06fa6db3690e14b2e23"
-  integrity sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-
 "@babel/plugin-proposal-logical-assignment-operators@^7.20.7":
   version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz"
   integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
@@ -621,7 +387,7 @@
 
 "@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz"
   integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
@@ -629,26 +395,15 @@
 
 "@babel/plugin-proposal-numeric-separator@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz"
   integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.19.4":
-  version "7.19.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.19.4.tgz#a8fc86e8180ff57290c91a75d83fe658189b642d"
-  integrity sha512-wHmj6LDxVDnL+3WhXteUBaoM1aVILZODAUjg11kHqG4cOlfgMQGxw6aCgvrXrmaJR3Bn14oZhImyCPZzRpC93Q==
-  dependencies:
-    "@babel/compat-data" "^7.19.4"
-    "@babel/helper-compilation-targets" "^7.19.3"
-    "@babel/helper-plugin-utils" "^7.19.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.18.8"
-
 "@babel/plugin-proposal-object-rest-spread@^7.20.7":
   version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz"
   integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==
   dependencies:
     "@babel/compat-data" "^7.20.5"
@@ -659,24 +414,15 @@
 
 "@babel/plugin-proposal-optional-catch-binding@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz"
   integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-proposal-optional-chaining@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz#e8e8fe0723f2563960e4bf5e9690933691915993"
-  integrity sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-
 "@babel/plugin-proposal-optional-chaining@^7.20.7", "@babel/plugin-proposal-optional-chaining@^7.21.0":
   version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz"
   integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
@@ -685,25 +431,15 @@
 
 "@babel/plugin-proposal-private-methods@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz"
   integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==
   dependencies:
     "@babel/helper-create-class-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-private-property-in-object@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz#a64137b232f0aca3733a67eb1a144c192389c503"
-  integrity sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-create-class-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-
 "@babel/plugin-proposal-private-property-in-object@^7.21.0":
   version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz#19496bd9883dd83c23c7d7fc45dcd9ad02dfa1dc"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz"
   integrity sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
@@ -713,7 +449,7 @@
 
 "@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz"
   integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.18.6"
@@ -721,156 +457,133 @@
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"
   integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-class-properties@^7.12.13":
   version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"
   integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
 "@babel/plugin-syntax-class-static-block@^7.14.5":
   version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz"
   integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"
   integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-export-namespace-from@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"
   integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-import-assertions@^7.18.6", "@babel/plugin-syntax-import-assertions@^7.20.0":
+"@babel/plugin-syntax-import-assertions@^7.20.0":
   version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz#bb50e0d4bea0957235390641209394e87bdb9cc4"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz"
   integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.19.0"
 
 "@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"
   integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz#a8feef63b010150abd97f1649ec296e849943ca0"
-  integrity sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-syntax-jsx@^7.21.4":
+"@babel/plugin-syntax-jsx@^7.18.6", "@babel/plugin-syntax-jsx@^7.21.4":
   version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.21.4.tgz#f264ed7bf40ffc9ec239edabc17a50c4f5b6fea2"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.21.4.tgz"
   integrity sha512-5hewiLct5OKyh6PLKEYaFclcqtIgCb6bmELouxjF6up5q3Sov7rOayW4RwhbaBL0dit8rA80GNfY+UuDp2mBbQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
 
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
   version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"
   integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"
   integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-numeric-separator@^7.10.4":
   version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"
   integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-object-rest-spread@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"
   integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-optional-catch-binding@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"
   integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-optional-chaining@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"
   integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-private-property-in-object@^7.14.5":
   version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz"
   integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-syntax-top-level-await@^7.14.5":
   version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz"
   integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-syntax-typescript@^7.20.0":
   version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz#4e9a0cfc769c85689b77a2e642d24e9f697fc8c7"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz"
   integrity sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.19.0"
 
-"@babel/plugin-transform-arrow-functions@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz#19063fcf8771ec7b31d742339dac62433d0611fe"
-  integrity sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
 "@babel/plugin-transform-arrow-functions@^7.20.7":
   version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz#bea332b0e8b2dab3dafe55a163d8227531ab0551"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz"
   integrity sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-async-to-generator@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz#ccda3d1ab9d5ced5265fdb13f1882d5476c71615"
-  integrity sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==
-  dependencies:
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/helper-remap-async-to-generator" "^7.18.6"
-
 "@babel/plugin-transform-async-to-generator@^7.20.7":
   version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz#dfee18623c8cb31deb796aa3ca84dda9cea94354"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz"
   integrity sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==
   dependencies:
     "@babel/helper-module-imports" "^7.18.6"
@@ -879,43 +592,21 @@
 
 "@babel/plugin-transform-block-scoped-functions@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz"
   integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-block-scoping@^7.19.4":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.0.tgz#91fe5e6ffc9ba13cb6c95ed7f0b1204f68c988c5"
-  integrity sha512-sXOohbpHZSk7GjxK9b3dKB7CfqUD5DwOH+DggKzOQ7TXYP+RCSbRykfjQmn/zq+rBjycVRtLf9pYhAaEJA786w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.19.0"
-
 "@babel/plugin-transform-block-scoping@^7.21.0":
   version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz#e737b91037e5186ee16b76e7ae093358a5634f02"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz"
   integrity sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-classes@^7.19.0":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz#0e61ec257fba409c41372175e7c1e606dc79bb20"
-  integrity sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-compilation-targets" "^7.19.0"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.19.0"
-    "@babel/helper-replace-supers" "^7.18.9"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    globals "^11.1.0"
-
 "@babel/plugin-transform-classes@^7.21.0":
   version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz#f469d0b07a4c5a7dbb21afad9e27e57b47031665"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz"
   integrity sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
@@ -928,38 +619,24 @@
     "@babel/helper-split-export-declaration" "^7.18.6"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz#2357a8224d402dad623caf6259b611e56aec746e"
-  integrity sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-
 "@babel/plugin-transform-computed-properties@^7.20.7":
   version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz#704cc2fd155d1c996551db8276d55b9d46e4d0aa"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz"
   integrity sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/template" "^7.20.7"
 
-"@babel/plugin-transform-destructuring@^7.19.4":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.0.tgz#712829ef4825d9cc04bb379de316f981e9a6f648"
-  integrity sha512-1dIhvZfkDVx/zn2S1aFwlruspTt4189j7fEkH0Y0VyuDM6bQt7bD6kLcz3l4IlLG+e5OReaBz9ROAbttRtUHqA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.19.0"
-
 "@babel/plugin-transform-destructuring@^7.21.3":
   version "7.21.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.21.3.tgz#73b46d0fd11cd6ef57dea8a381b1215f4959d401"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.21.3.tgz"
   integrity sha512-bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
 
 "@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz"
   integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.18.6"
@@ -967,36 +644,29 @@
 
 "@babel/plugin-transform-duplicate-keys@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz"
   integrity sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
 "@babel/plugin-transform-exponentiation-operator@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz"
   integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==
   dependencies:
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-for-of@^7.18.8":
-  version "7.18.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz#6ef8a50b244eb6a0bdbad0c7c61877e4e30097c1"
-  integrity sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
 "@babel/plugin-transform-for-of@^7.21.0":
   version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz#964108c9988de1a60b4be2354a7d7e245f36e86e"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz"
   integrity sha512-LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
 
 "@babel/plugin-transform-function-name@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz"
   integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==
   dependencies:
     "@babel/helper-compilation-targets" "^7.18.9"
@@ -1005,65 +675,38 @@
 
 "@babel/plugin-transform-literals@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz"
   integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
 "@babel/plugin-transform-member-expression-literals@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz"
   integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-modules-amd@^7.18.6":
-  version "7.19.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz#aca391801ae55d19c4d8d2ebfeaa33df5f2a2cbd"
-  integrity sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.19.6"
-    "@babel/helper-plugin-utils" "^7.19.0"
-
 "@babel/plugin-transform-modules-amd@^7.20.11":
   version "7.20.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz#3daccca8e4cc309f03c3a0c4b41dc4b26f55214a"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz"
   integrity sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==
   dependencies:
     "@babel/helper-module-transforms" "^7.20.11"
     "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-modules-commonjs@^7.18.6":
-  version "7.19.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz#25b32feef24df8038fc1ec56038917eacb0b730c"
-  integrity sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.19.6"
-    "@babel/helper-plugin-utils" "^7.19.0"
-    "@babel/helper-simple-access" "^7.19.4"
-
 "@babel/plugin-transform-modules-commonjs@^7.21.2":
   version "7.21.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz#6ff5070e71e3192ef2b7e39820a06fb78e3058e7"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz"
   integrity sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA==
   dependencies:
     "@babel/helper-module-transforms" "^7.21.2"
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/helper-simple-access" "^7.20.2"
 
-"@babel/plugin-transform-modules-systemjs@^7.19.0":
-  version "7.19.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz#59e2a84064b5736a4471b1aa7b13d4431d327e0d"
-  integrity sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-module-transforms" "^7.19.6"
-    "@babel/helper-plugin-utils" "^7.19.0"
-    "@babel/helper-validator-identifier" "^7.19.1"
-
 "@babel/plugin-transform-modules-systemjs@^7.20.11":
   version "7.20.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz#467ec6bba6b6a50634eea61c9c232654d8a4696e"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz"
   integrity sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==
   dependencies:
     "@babel/helper-hoist-variables" "^7.18.6"
@@ -1073,23 +716,15 @@
 
 "@babel/plugin-transform-modules-umd@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz"
   integrity sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==
   dependencies:
     "@babel/helper-module-transforms" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.19.1":
-  version "7.19.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz#ec7455bab6cd8fb05c525a94876f435a48128888"
-  integrity sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.19.0"
-    "@babel/helper-plugin-utils" "^7.19.0"
-
 "@babel/plugin-transform-named-capturing-groups-regex@^7.20.5":
   version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz#626298dd62ea51d452c3be58b285d23195ba69a8"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz"
   integrity sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.20.5"
@@ -1097,71 +732,57 @@
 
 "@babel/plugin-transform-new-target@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz#d128f376ae200477f37c4ddfcc722a8a1b3246a8"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz"
   integrity sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-object-super@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz"
   integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/helper-replace-supers" "^7.18.6"
 
-"@babel/plugin-transform-parameters@^7.18.8":
-  version "7.18.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz#ee9f1a0ce6d78af58d0956a9378ea3427cccb48a"
-  integrity sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
 "@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.21.3":
   version "7.21.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.21.3.tgz#18fc4e797cf6d6d972cb8c411dbe8a809fa157db"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.21.3.tgz"
   integrity sha512-Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
 
 "@babel/plugin-transform-property-literals@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz"
   integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-react-constant-elements@^7.18.12":
-  version "7.18.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.18.12.tgz#edf3bec47eb98f14e84fa0af137fcc6aad8e0443"
-  integrity sha512-Q99U9/ttiu+LMnRU8psd23HhvwXmKWDQIpocm0JKaICcZHnw+mdQbHm6xnSy7dOl8I5PELakYtNBubNQlBXbZw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-
-"@babel/plugin-transform-react-constant-elements@^7.21.3":
+"@babel/plugin-transform-react-constant-elements@^7.18.12", "@babel/plugin-transform-react-constant-elements@^7.21.3":
   version "7.21.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.21.3.tgz#b32a5556100d424b25e388dd689050d78396884d"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.21.3.tgz"
   integrity sha512-4DVcFeWe/yDYBLp0kBmOGFJ6N2UYg7coGid1gdxb4co62dy/xISDMaYBXBVXEDhfgMk7qkbcYiGtwd5Q/hwDDQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
 
 "@babel/plugin-transform-react-display-name@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz#8b1125f919ef36ebdfff061d664e266c666b9415"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz"
   integrity sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-react-jsx-development@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.18.6.tgz#dbe5c972811e49c7405b630e4d0d2e1380c0ddc5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.18.6.tgz"
   integrity sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA==
   dependencies:
     "@babel/plugin-transform-react-jsx" "^7.18.6"
 
 "@babel/plugin-transform-react-jsx@^7.18.6":
   version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.19.0.tgz#b3cbb7c3a00b92ec8ae1027910e331ba5c500eb9"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.19.0.tgz"
   integrity sha512-UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
@@ -1172,23 +793,15 @@
 
 "@babel/plugin-transform-react-pure-annotations@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.6.tgz#561af267f19f3e5d59291f9950fd7b9663d0d844"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.6.tgz"
   integrity sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-regenerator@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz#585c66cb84d4b4bf72519a34cfce761b8676ca73"
-  integrity sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    regenerator-transform "^0.15.0"
-
 "@babel/plugin-transform-regenerator@^7.20.5":
   version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz#57cda588c7ffb7f4f8483cc83bdcea02a907f04d"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz"
   integrity sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
@@ -1196,29 +809,21 @@
 
 "@babel/plugin-transform-reserved-words@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz#b1abd8ebf8edaa5f7fe6bbb8d2133d23b6a6f76a"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz"
   integrity sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-shorthand-properties@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz"
   integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-spread@^7.19.0":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz#dd60b4620c2fec806d60cfaae364ec2188d593b6"
-  integrity sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.19.0"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
-
 "@babel/plugin-transform-spread@^7.20.7":
   version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz#c2d83e0b99d3bf83e07b11995ee24bf7ca09401e"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz"
   integrity sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
@@ -1226,37 +831,28 @@
 
 "@babel/plugin-transform-sticky-regex@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz"
   integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-template-literals@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz"
   integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
 "@babel/plugin-transform-typeof-symbol@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz"
   integrity sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-typescript@^7.18.6":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.20.0.tgz#2c7ec62b8bfc21482f3748789ba294a46a375169"
-  integrity sha512-xOAsAFaun3t9hCwZ13Qe7gq423UgMZ6zAgmLxeGGapFqlT/X3L5qT2btjiVLlFn7gWtMaVyceS5VxGAuKbgizw==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.19.0"
-    "@babel/helper-plugin-utils" "^7.19.0"
-    "@babel/plugin-syntax-typescript" "^7.20.0"
-
 "@babel/plugin-transform-typescript@^7.21.3":
   version "7.21.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.21.3.tgz#316c5be579856ea890a57ebc5116c5d064658f2b"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.21.3.tgz"
   integrity sha512-RQxPz6Iqt8T0uw/WsJNReuBpWpBqs/n7mNo18sKLoTbMp+UrEekhH+pKSVC7gWz+DNjo9gryfV8YzCiT45RgMw==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
@@ -1266,103 +862,22 @@
 
 "@babel/plugin-transform-unicode-escapes@^7.18.10":
   version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz#1ecfb0eda83d09bbcb77c09970c2dd55832aa246"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz"
   integrity sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
 "@babel/plugin-transform-unicode-regex@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz"
   integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/preset-env@^7.19.4":
-  version "7.19.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.19.4.tgz#4c91ce2e1f994f717efb4237891c3ad2d808c94b"
-  integrity sha512-5QVOTXUdqTCjQuh2GGtdd7YEhoRXBMVGROAtsBeLGIbIz3obCBIfRMT1I3ZKkMgNzwkyCkftDXSSkHxnfVf4qg==
-  dependencies:
-    "@babel/compat-data" "^7.19.4"
-    "@babel/helper-compilation-targets" "^7.19.3"
-    "@babel/helper-plugin-utils" "^7.19.0"
-    "@babel/helper-validator-option" "^7.18.6"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.9"
-    "@babel/plugin-proposal-async-generator-functions" "^7.19.1"
-    "@babel/plugin-proposal-class-properties" "^7.18.6"
-    "@babel/plugin-proposal-class-static-block" "^7.18.6"
-    "@babel/plugin-proposal-dynamic-import" "^7.18.6"
-    "@babel/plugin-proposal-export-namespace-from" "^7.18.9"
-    "@babel/plugin-proposal-json-strings" "^7.18.6"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.18.9"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
-    "@babel/plugin-proposal-numeric-separator" "^7.18.6"
-    "@babel/plugin-proposal-object-rest-spread" "^7.19.4"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.18.6"
-    "@babel/plugin-proposal-optional-chaining" "^7.18.9"
-    "@babel/plugin-proposal-private-methods" "^7.18.6"
-    "@babel/plugin-proposal-private-property-in-object" "^7.18.6"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.18.6"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-    "@babel/plugin-syntax-class-properties" "^7.12.13"
-    "@babel/plugin-syntax-class-static-block" "^7.14.5"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-    "@babel/plugin-syntax-import-assertions" "^7.18.6"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-    "@babel/plugin-syntax-top-level-await" "^7.14.5"
-    "@babel/plugin-transform-arrow-functions" "^7.18.6"
-    "@babel/plugin-transform-async-to-generator" "^7.18.6"
-    "@babel/plugin-transform-block-scoped-functions" "^7.18.6"
-    "@babel/plugin-transform-block-scoping" "^7.19.4"
-    "@babel/plugin-transform-classes" "^7.19.0"
-    "@babel/plugin-transform-computed-properties" "^7.18.9"
-    "@babel/plugin-transform-destructuring" "^7.19.4"
-    "@babel/plugin-transform-dotall-regex" "^7.18.6"
-    "@babel/plugin-transform-duplicate-keys" "^7.18.9"
-    "@babel/plugin-transform-exponentiation-operator" "^7.18.6"
-    "@babel/plugin-transform-for-of" "^7.18.8"
-    "@babel/plugin-transform-function-name" "^7.18.9"
-    "@babel/plugin-transform-literals" "^7.18.9"
-    "@babel/plugin-transform-member-expression-literals" "^7.18.6"
-    "@babel/plugin-transform-modules-amd" "^7.18.6"
-    "@babel/plugin-transform-modules-commonjs" "^7.18.6"
-    "@babel/plugin-transform-modules-systemjs" "^7.19.0"
-    "@babel/plugin-transform-modules-umd" "^7.18.6"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.19.1"
-    "@babel/plugin-transform-new-target" "^7.18.6"
-    "@babel/plugin-transform-object-super" "^7.18.6"
-    "@babel/plugin-transform-parameters" "^7.18.8"
-    "@babel/plugin-transform-property-literals" "^7.18.6"
-    "@babel/plugin-transform-regenerator" "^7.18.6"
-    "@babel/plugin-transform-reserved-words" "^7.18.6"
-    "@babel/plugin-transform-shorthand-properties" "^7.18.6"
-    "@babel/plugin-transform-spread" "^7.19.0"
-    "@babel/plugin-transform-sticky-regex" "^7.18.6"
-    "@babel/plugin-transform-template-literals" "^7.18.9"
-    "@babel/plugin-transform-typeof-symbol" "^7.18.9"
-    "@babel/plugin-transform-unicode-escapes" "^7.18.10"
-    "@babel/plugin-transform-unicode-regex" "^7.18.6"
-    "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.19.4"
-    babel-plugin-polyfill-corejs2 "^0.3.3"
-    babel-plugin-polyfill-corejs3 "^0.6.0"
-    babel-plugin-polyfill-regenerator "^0.4.1"
-    core-js-compat "^3.25.1"
-    semver "^6.3.0"
-
-"@babel/preset-env@^7.20.2":
+"@babel/preset-env@^7.19.4", "@babel/preset-env@^7.20.2":
   version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.21.4.tgz#a952482e634a8dd8271a3fe5459a16eb10739c58"
+  resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.21.4.tgz"
   integrity sha512-2W57zHs2yDLm6GD5ZpvNn71lZ0B/iypSdIeq25OurDKji6AdzV07qp4s3n1/x5BqtiGaTrPN3nerlSCaC5qNTw==
   dependencies:
     "@babel/compat-data" "^7.21.4"
@@ -1443,7 +958,7 @@
 
 "@babel/preset-modules@^0.1.5":
   version "0.1.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9"
+  resolved "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz"
   integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -1454,7 +969,7 @@
 
 "@babel/preset-react@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.18.6.tgz#979f76d6277048dc19094c217b507f3ad517dd2d"
+  resolved "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.18.6.tgz"
   integrity sha512-zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
@@ -1464,18 +979,9 @@
     "@babel/plugin-transform-react-jsx-development" "^7.18.6"
     "@babel/plugin-transform-react-pure-annotations" "^7.18.6"
 
-"@babel/preset-typescript@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.18.6.tgz#ce64be3e63eddc44240c6358daefac17b3186399"
-  integrity sha512-s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/helper-validator-option" "^7.18.6"
-    "@babel/plugin-transform-typescript" "^7.18.6"
-
-"@babel/preset-typescript@^7.21.0":
+"@babel/preset-typescript@^7.18.6", "@babel/preset-typescript@^7.21.0":
   version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.21.4.tgz#b913ac8e6aa8932e47c21b01b4368d8aa239a529"
+  resolved "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.21.4.tgz"
   integrity sha512-sMLNWY37TCdRH/bJ6ZeeOH1nPuanED7Ai9Y/vH31IPqalioJ6ZNFUWONsakhv4r4n+I6gm5lmoE0olkgib/j/A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
@@ -1486,170 +992,89 @@
 
 "@babel/regjsgen@^0.8.0":
   version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
+  resolved "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz"
   integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
 
 "@babel/runtime-corejs3@^7.10.2":
   version "7.20.6"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.20.6.tgz#63dae945963539ab0ad578efbf3eff271e7067ae"
+  resolved "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.20.6.tgz"
   integrity sha512-tqeujPiuEfcH067mx+7otTQWROVMKHXEaOQcAeNV5dDdbPWvPcFA8/W9LXw2NfjNmOetqLl03dfnG2WALPlsRQ==
   dependencies:
     core-js-pure "^3.25.1"
     regenerator-runtime "^0.13.11"
 
-"@babel/runtime@^7.0.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673"
-  integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.15.4", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
+  version "7.20.1"
+  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.1.tgz"
+  integrity sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg==
   dependencies:
-    regenerator-runtime "^0.13.11"
+    regenerator-runtime "^0.13.10"
 
 "@babel/runtime@^7.10.2", "@babel/runtime@^7.18.9":
   version "7.20.6"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.6.tgz#facf4879bfed9b5326326273a64220f099b0fce3"
+  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.6.tgz"
   integrity sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==
   dependencies:
     regenerator-runtime "^0.13.11"
 
 "@babel/runtime@^7.12.5":
   version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec"
+  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.5.tgz"
   integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==
   dependencies:
     regenerator-runtime "^0.13.11"
 
-"@babel/runtime@^7.15.4", "@babel/runtime@^7.9.2":
-  version "7.20.1"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.1.tgz#1148bb33ab252b165a06698fde7576092a78b4a9"
-  integrity sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg==
-  dependencies:
-    regenerator-runtime "^0.13.10"
-
 "@babel/runtime@^7.21.0":
   version "7.21.5"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.5.tgz#8492dddda9644ae3bda3b45eabe87382caee7200"
+  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.5.tgz"
   integrity sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q==
   dependencies:
     regenerator-runtime "^0.13.11"
 
-"@babel/runtime@^7.8.4":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.0.tgz#824a9ef325ffde6f78056059db3168c08785e24a"
-  integrity sha512-NDYdls71fTXoU8TZHfbBWg7DiZfNzClcKui/+kyi6ppD2L1qnWW3VV6CjtaBXSUGGhiTWJ6ereOIkUvenif66Q==
+"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz"
+  integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==
   dependencies:
-    regenerator-runtime "^0.13.10"
+    "@babel/code-frame" "^7.22.5"
+    "@babel/parser" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
-"@babel/template@^7.16.7", "@babel/template@^7.18.10", "@babel/template@^7.18.6":
-  version "7.18.10"
-  resolved "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz"
-  integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==
+"@babel/traverse@^7.19.0", "@babel/traverse@^7.19.1", "@babel/traverse@^7.20.7", "@babel/traverse@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.5.tgz"
+  integrity sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==
   dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/parser" "^7.18.10"
-    "@babel/types" "^7.18.10"
-
-"@babel/template@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
-  integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/parser" "^7.20.7"
-    "@babel/types" "^7.20.7"
-
-"@babel/traverse@^7.17.3":
-  version "7.18.13"
-  resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.13.tgz"
-  integrity sha512-N6kt9X1jRMLPxxxPYWi7tgvJRH/rtoU+dbKAPDM44RFHiMH8igdsaSBgFeskhSl/kLWLDUvIh1RXCrTmg0/zvA==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.18.13"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.18.9"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.18.13"
-    "@babel/types" "^7.18.13"
+    "@babel/code-frame" "^7.22.5"
+    "@babel/generator" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.5"
+    "@babel/parser" "^7.22.5"
+    "@babel/types" "^7.22.5"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/traverse@^7.18.9", "@babel/traverse@^7.19.0", "@babel/traverse@^7.19.1", "@babel/traverse@^7.19.6", "@babel/traverse@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.0.tgz#538c4c6ce6255f5666eba02252a7b59fc2d5ed98"
-  integrity sha512-5+cAXQNARgjRUK0JWu2UBwja4JLSO/rBMPJzpsKb+oBF5xlUuCfljQepS4XypBQoiigL0VQjTZy6WiONtUdScQ==
+"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.3", "@babel/types@^7.21.4", "@babel/types@^7.22.5", "@babel/types@^7.3.0", "@babel/types@^7.4.4", "@babel/types@^7.9.5":
+  version "7.22.5"
+  resolved "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz"
+  integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==
   dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.20.0"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.20.0"
-    "@babel/types" "^7.20.0"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.4.tgz#a836aca7b116634e97a6ed99976236b3282c9d36"
-  integrity sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q==
-  dependencies:
-    "@babel/code-frame" "^7.21.4"
-    "@babel/generator" "^7.21.4"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.21.0"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.21.4"
-    "@babel/types" "^7.21.4"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/types@^7.0.0", "@babel/types@^7.17.0":
-  version "7.18.13"
-  resolved "https://registry.npmjs.org/@babel/types/-/types-7.18.13.tgz"
-  integrity sha512-ePqfTihzW0W6XAU+aMw2ykilisStJfDnsejDCXRchCcMJ4O0+8DhPXf2YUbZ6wjBlsEmZwLK/sPweWtu8hcJYQ==
-  dependencies:
-    "@babel/helper-string-parser" "^7.18.10"
-    "@babel/helper-validator-identifier" "^7.18.6"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.18.10", "@babel/types@^7.18.13", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.19.4", "@babel/types@^7.20.0", "@babel/types@^7.4.4":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.0.tgz#52c94cf8a7e24e89d2a194c25c35b17a64871479"
-  integrity sha512-Jlgt3H0TajCW164wkTOTzHkZb075tMQMULzrLUoUeKmO7eFL96GgDxf7/Axhc5CAuKE3KFyVW1p6ysKsi2oXAg==
-  dependencies:
-    "@babel/helper-string-parser" "^7.19.4"
-    "@babel/helper-validator-identifier" "^7.19.1"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.3", "@babel/types@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.4.tgz#2d5d6bb7908699b3b416409ffd3b5daa25b030d4"
-  integrity sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==
-  dependencies:
-    "@babel/helper-string-parser" "^7.19.4"
-    "@babel/helper-validator-identifier" "^7.19.1"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.3.0", "@babel/types@^7.9.5":
-  version "7.18.7"
-  resolved "https://registry.npmjs.org/@babel/types/-/types-7.18.7.tgz"
-  integrity sha512-QG3yxTcTIBoAcQmkCs+wAPYZhu7Dk9rXKacINfNbdJDNERTbLQbHGyVG8q/YGMPeCJRIhSY0+fTc5+xuh6WPSQ==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.18.6"
+    "@babel/helper-string-parser" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.5"
     to-fast-properties "^2.0.0"
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"
-  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
+  resolved "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz"
   integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
 "@csstools/postcss-cascade-layers@^1.1.1":
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz#8a997edf97d34071dd2e37ea6022447dd9e795ad"
+  resolved "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz"
   integrity sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==
   dependencies:
     "@csstools/selector-specificity" "^2.0.2"
@@ -1657,7 +1082,7 @@
 
 "@csstools/postcss-color-function@^1.1.1":
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz#2bd36ab34f82d0497cfacdc9b18d34b5e6f64b6b"
+  resolved "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz"
   integrity sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==
   dependencies:
     "@csstools/postcss-progressive-custom-properties" "^1.1.0"
@@ -1665,21 +1090,21 @@
 
 "@csstools/postcss-font-format-keywords@^1.0.1":
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz#677b34e9e88ae997a67283311657973150e8b16a"
+  resolved "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz"
   integrity sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 "@csstools/postcss-hwb-function@^1.0.2":
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz#ab54a9fce0ac102c754854769962f2422ae8aa8b"
+  resolved "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz"
   integrity sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 "@csstools/postcss-ic-unit@^1.0.1":
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz#28237d812a124d1a16a5acc5c3832b040b303e58"
+  resolved "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz"
   integrity sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==
   dependencies:
     "@csstools/postcss-progressive-custom-properties" "^1.1.0"
@@ -1687,7 +1112,7 @@
 
 "@csstools/postcss-is-pseudo-class@^2.0.7":
   version "2.0.7"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz#846ae6c0d5a1eaa878fce352c544f9c295509cd1"
+  resolved "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz"
   integrity sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==
   dependencies:
     "@csstools/selector-specificity" "^2.0.0"
@@ -1695,21 +1120,21 @@
 
 "@csstools/postcss-nested-calc@^1.0.0":
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz#d7e9d1d0d3d15cf5ac891b16028af2a1044d0c26"
+  resolved "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz"
   integrity sha512-JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 "@csstools/postcss-normalize-display-values@^1.0.1":
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz#15da54a36e867b3ac5163ee12c1d7f82d4d612c3"
+  resolved "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz"
   integrity sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 "@csstools/postcss-oklab-function@^1.1.1":
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz#88cee0fbc8d6df27079ebd2fa016ee261eecf844"
+  resolved "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz"
   integrity sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==
   dependencies:
     "@csstools/postcss-progressive-custom-properties" "^1.1.0"
@@ -1724,28 +1149,28 @@
 
 "@csstools/postcss-stepped-value-functions@^1.0.1":
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz#f8772c3681cc2befed695e2b0b1d68e22f08c4f4"
+  resolved "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz"
   integrity sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 "@csstools/postcss-text-decoration-shorthand@^1.0.0":
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz#ea96cfbc87d921eca914d3ad29340d9bcc4c953f"
+  resolved "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz"
   integrity sha512-c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 "@csstools/postcss-trigonometric-functions@^1.0.2":
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz#94d3e4774c36d35dcdc88ce091336cb770d32756"
+  resolved "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz"
   integrity sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 "@csstools/postcss-unset-value@^1.0.2":
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz#c99bb70e2cdc7312948d1eb41df2412330b81f77"
+  resolved "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz"
   integrity sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==
 
 "@csstools/selector-specificity@^2.0.0":
@@ -1755,7 +1180,7 @@
 
 "@csstools/selector-specificity@^2.0.2":
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz#1bfafe4b7ed0f3e4105837e056e0a89b108ebe36"
+  resolved "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz"
   integrity sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==
 
 "@esbuild/android-arm64@0.17.19":
@@ -1865,24 +1290,24 @@
 
 "@esbuild/win32-x64@0.17.19":
   version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz#8cfaf2ff603e9aabb910e9c0558c26cf32744061"
+  resolved "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz"
   integrity sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==
 
 "@eslint-community/eslint-utils@^4.2.0":
   version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
+  resolved "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz"
   integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
   dependencies:
     eslint-visitor-keys "^3.3.0"
 
 "@eslint-community/regexpp@^4.4.0":
   version "4.5.1"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.1.tgz#cdd35dce4fa1a89a4fd42b1599eb35b3af408884"
+  resolved "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz"
   integrity sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==
 
 "@eslint/eslintrc@^2.0.3":
   version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.3.tgz#4910db5505f4d503f27774bf356e3704818a0331"
+  resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.3.tgz"
   integrity sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==
   dependencies:
     ajv "^6.12.4"
@@ -1897,12 +1322,12 @@
 
 "@eslint/js@8.42.0":
   version "8.42.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.42.0.tgz#484a1d638de2911e6f5a30c12f49c7e4a3270fb6"
+  resolved "https://registry.npmjs.org/@eslint/js/-/js-8.42.0.tgz"
   integrity sha512-6SWlXpWU5AvId8Ac7zjzmIOqMOba/JWY8XZ4A7q7Gn1Vlfg/SFFIlrtHXt9nPn4op9ZPAkl91Jao+QQv3r/ukw==
 
 "@fontsource/inter@^4.5.15":
   version "4.5.15"
-  resolved "https://registry.yarnpkg.com/@fontsource/inter/-/inter-4.5.15.tgz#eed1873d68755d3b52d6fcfcfa3493118430a512"
+  resolved "https://registry.npmjs.org/@fontsource/inter/-/inter-4.5.15.tgz"
   integrity sha512-FzleM9AxZQK2nqsTDtBiY0PMEVWvnKnuu2i09+p6DHvrHsuucoV2j0tmw+kAT3L4hvsLdAIDv6MdGehsPIdT+Q==
 
 "@formatjs/cli@^4.2.29":
@@ -2041,7 +1466,7 @@
 
 "@humanwhocodes/config-array@^0.11.10":
   version "0.11.10"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.10.tgz#5a3ffe32cc9306365fb3fd572596cd602d5e12d2"
+  resolved "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz"
   integrity sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==
   dependencies:
     "@humanwhocodes/object-schema" "^1.2.1"
@@ -2050,30 +1475,22 @@
 
 "@humanwhocodes/module-importer@^1.0.1":
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  resolved "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz"
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
 "@humanwhocodes/object-schema@^1.2.1":
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
+  resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
 "@ioredis/commands@^1.1.1":
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@ioredis/commands/-/commands-1.2.0.tgz#6d61b3097470af1fdbbe622795b8921d42018e11"
+  resolved "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz"
   integrity sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==
 
-"@jridgewell/gen-mapping@^0.1.0":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
-  integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==
-  dependencies:
-    "@jridgewell/set-array" "^1.0.0"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
 "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
   version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
+  resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz"
   integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
   dependencies:
     "@jridgewell/set-array" "^1.0.1"
@@ -2082,51 +1499,43 @@
 
 "@jridgewell/resolve-uri@3.1.0", "@jridgewell/resolve-uri@^3.0.3":
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
+  resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"
   integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
 
-"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
+"@jridgewell/set-array@^1.0.1":
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
+  resolved "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
 
-"@jridgewell/source-map@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz"
-  integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==
+"@jridgewell/source-map@^0.3.3":
+  version "0.3.3"
+  resolved "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.3.tgz"
+  integrity sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==
   dependencies:
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
 "@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10":
   version "1.4.14"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
+  resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
 "@jridgewell/sourcemap-codec@^1.4.13":
   version "1.4.15"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
+  resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz"
   integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
 
 "@jridgewell/trace-mapping@0.3.9":
   version "0.3.9"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
+  resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz"
   integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
   dependencies:
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@jridgewell/trace-mapping@^0.3.17":
-  version "0.3.18"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6"
-  integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==
-  dependencies:
-    "@jridgewell/resolve-uri" "3.1.0"
-    "@jridgewell/sourcemap-codec" "1.4.14"
-
-"@jridgewell/trace-mapping@^0.3.9":
+"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
   version "0.3.17"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
+  resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz"
   integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==
   dependencies:
     "@jridgewell/resolve-uri" "3.1.0"
@@ -2134,7 +1543,7 @@
 
 "@kurkle/color@^0.3.0":
   version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@kurkle/color/-/color-0.3.2.tgz#5acd38242e8bde4f9986e7913c8fdf49d3aa199f"
+  resolved "https://registry.npmjs.org/@kurkle/color/-/color-0.3.2.tgz"
   integrity sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==
 
 "@netlify/esbuild-android-64@0.14.39":
@@ -2229,7 +1638,7 @@
 
 "@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"
+  resolved "https://registry.npmjs.org/@netlify/esbuild-windows-64/-/esbuild-windows-64-0.14.39.tgz"
   integrity sha512-I3gCdO8+6IDhT4Y1ZmV4o2Gg0oELv7N4kCcE4kqclz10fWHNjf19HQNHyBJe0AWnFV5ZfT154VVD31dqgwpgFw==
 
 "@netlify/esbuild-windows-arm64@0.14.39":
@@ -2239,7 +1648,7 @@
 
 "@netlify/esbuild@0.14.39":
   version "0.14.39"
-  resolved "https://registry.yarnpkg.com/@netlify/esbuild/-/esbuild-0.14.39.tgz#66897af6d26336e5960b5ba74f1642f1d02a9c6a"
+  resolved "https://registry.npmjs.org/@netlify/esbuild/-/esbuild-0.14.39.tgz"
   integrity sha512-C3xpwdT2xw6SnSb+hLQoxjtikAKiz6BjQjzlIaysHDpGbmIcmUHZ/X+dyLtCqAvf15WNK5GSBZYOlpgcOE0WZA==
   optionalDependencies:
     "@netlify/esbuild-android-64" "0.14.39"
@@ -2265,14 +1674,14 @@
 
 "@netlify/functions@^1.4.0", "@netlify/functions@^1.6.0":
   version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@netlify/functions/-/functions-1.6.0.tgz#c373423e6fef0e6f7422ac0345e8bbf2cb692366"
+  resolved "https://registry.npmjs.org/@netlify/functions/-/functions-1.6.0.tgz"
   integrity sha512-6G92AlcpFrQG72XU8YH8pg94eDnq7+Q0YJhb8x4qNpdGsvuzvrfHWBmqFGp/Yshmv4wex9lpsTRZOocdrA2erQ==
   dependencies:
     is-promise "^4.0.0"
 
 "@netlify/ipx@^1.4.0":
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@netlify/ipx/-/ipx-1.4.0.tgz#8bc77ef84f36a0cfead3ab49f68e8126c474edd9"
+  resolved "https://registry.npmjs.org/@netlify/ipx/-/ipx-1.4.0.tgz"
   integrity sha512-Ibqg1W41EVMHNT/W6JSDUyxjhcxsbEL9vL9ZaNjn9tVKnDYxJ8JqRTwSbzfns+K+M3FLqoC4PLW32qW+vT1pKQ==
   dependencies:
     "@netlify/functions" "^1.4.0"
@@ -2288,7 +1697,7 @@
 
 "@netlify/plugin-nextjs@^4.27.3":
   version "4.37.4"
-  resolved "https://registry.yarnpkg.com/@netlify/plugin-nextjs/-/plugin-nextjs-4.37.4.tgz#dfbeff83a67b9f9c3959506a8838f5fb1c0b104c"
+  resolved "https://registry.npmjs.org/@netlify/plugin-nextjs/-/plugin-nextjs-4.37.4.tgz"
   integrity sha512-3LMKzF/EMnsE8EAc6i3BVUBcnwTC0K80fMPprdVo6L315dkqgCNXhOOvsBWyG14U8yhgd2YuD+X78kykfvQtqA==
   dependencies:
     "@netlify/esbuild" "0.14.39"
@@ -2315,66 +1724,66 @@
     slash "^3.0.0"
     tiny-glob "^0.2.9"
 
-"@next/env@13.4.6":
-  version "13.4.6"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-13.4.6.tgz#3f2041c7758660d7255707ae4cb9166519113dea"
-  integrity sha512-nqUxEtvDqFhmV1/awSg0K2XHNwkftNaiUqCYO9e6+MYmqNObpKVl7OgMkGaQ2SZnFx5YqF0t60ZJTlyJIDAijg==
+"@next/env@13.3.1":
+  version "13.3.1"
+  resolved "https://registry.yarnpkg.com/@next/env/-/env-13.3.1.tgz#589707043065f6b71d411ed9b8f1ffd057c0fd4a"
+  integrity sha512-EDtCoedIZC7JlUQ3uaQpSc4aVmyhbLHmQVALg7pFfQgOTjgSnn7mKtA0DiCMkYvvsx6aFb5octGMtWrOtGXW9A==
 
 "@next/eslint-plugin-next@12.3.4":
   version "12.3.4"
-  resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-12.3.4.tgz#e7dc00e2e89ed361f111d687b8534483ec15518b"
+  resolved "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-12.3.4.tgz"
   integrity sha512-BFwj8ykJY+zc1/jWANsDprDIu2MgwPOIKxNVnrKvPs+f5TPegrVnem8uScND+1veT4B7F6VeqgaNLFW1Hzl9Og==
   dependencies:
     glob "7.1.7"
 
-"@next/swc-darwin-arm64@13.4.6":
-  version "13.4.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.4.6.tgz#47485f3deaee6681b4a4036c74bb9c4b728d5ddd"
-  integrity sha512-ahi6VP98o4HV19rkOXPSUu+ovfHfUxbJQ7VVJ7gL2FnZRr7onEFC1oGQ6NQHpm8CxpIzSSBW79kumlFMOmZVjg==
+"@next/swc-darwin-arm64@13.3.1":
+  version "13.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.3.1.tgz#2c9719dd10a9cdf63bf50a7576b05dcf78999fe8"
+  integrity sha512-UXPtriEc/pBP8luSLSCZBcbzPeVv+SSjs9cH/KygTbhmACye8/OOXRZO13Z2Wq1G0gLmEAIHQAOuF+vafPd2lw==
 
-"@next/swc-darwin-x64@13.4.6":
-  version "13.4.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-13.4.6.tgz#a6a5b232ec0f2079224fb8ed6bf11dc479af1acf"
-  integrity sha512-13cXxKFsPJIJKzUqrU5XB1mc0xbUgYsRcdH6/rB8c4NMEbWGdtD4QoK9ShN31TZdePpD4k416Ur7p+deMIxnnA==
+"@next/swc-darwin-x64@13.3.1":
+  version "13.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-13.3.1.tgz#0be90342c89e53a390ccd9bece15f7f5cd480049"
+  integrity sha512-lT36yYxosCfLtplFzJWgo0hrPu6/do8+msgM7oQkPeohDNdhjtjFUgOOwdSnPublLR6Mo2Ym4P/wl5OANuD2bw==
 
-"@next/swc-linux-arm64-gnu@13.4.6":
-  version "13.4.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.4.6.tgz#2a67144e863d9c45fdbd13c7827370e7f2a28405"
-  integrity sha512-Ti+NMHEjTNktCVxNjeWbYgmZvA2AqMMI2AMlzkXsU7W4pXCMhrryAmAIoo+7YdJbsx01JQWYVxGe62G6DoCLaA==
+"@next/swc-linux-arm64-gnu@13.3.1":
+  version "13.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.3.1.tgz#a7353265839f8b8569a346a444dc3ab3770d297e"
+  integrity sha512-wRb76nLWJhonH8s3kxC/1tFguEkeOPayIwe9mkaz1G/yeS3OrjeyKMJsb4+Kdg0zbTo53bNCOl59NNtDM7yyyw==
 
-"@next/swc-linux-arm64-musl@13.4.6":
-  version "13.4.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.4.6.tgz#5a191ac3575a70598e9e9c6e7264fc0b8a90b2db"
-  integrity sha512-OHoC6gO7XfjstgwR+z6UHKlvhqJfyMtNaJidjx3sEcfaDwS7R2lqR5AABi8PuilGgi0BO0O0sCXqLlpp3a0emQ==
+"@next/swc-linux-arm64-musl@13.3.1":
+  version "13.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.3.1.tgz#24552e6102c350e372f83f505a1d93c880551a50"
+  integrity sha512-qz3BzjJRZ16Iq/jrp+pjiYOc0jTjHlfmxQmZk9x/+5uhRP6/eWQSTAPVJ33BMo6oK5O5N4644OgTAbzXzorecg==
 
-"@next/swc-linux-x64-gnu@13.4.6":
-  version "13.4.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.4.6.tgz#d38adf842a8b8f9de492454328fd32a2c53350f3"
-  integrity sha512-zHZxPGkUlpfNJCboUrFqwlwEX5vI9LSN70b8XEb0DYzzlrZyCyOi7hwDp/+3Urm9AB7YCAJkgR5Sp1XBVjHdfQ==
+"@next/swc-linux-x64-gnu@13.3.1":
+  version "13.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.3.1.tgz#5f335a683b6eafa52307b12af97782993b6c45ff"
+  integrity sha512-6mgkLmwlyWlomQmpl21I3hxgqE5INoW4owTlcLpNsd1V4wP+J46BlI/5zV5KWWbzjfncIqzXoeGs5Eg+1GHODA==
 
-"@next/swc-linux-x64-musl@13.4.6":
-  version "13.4.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.4.6.tgz#74c745774358b78be7f958e7a8b7d93936cd6ebc"
-  integrity sha512-K/Y8lYGTwTpv5ME8PSJxwxLolaDRdVy+lOd9yMRMiQE0BLUhtxtCWC9ypV42uh9WpLjoaD0joOsB9Q6mbrSGJg==
+"@next/swc-linux-x64-musl@13.3.1":
+  version "13.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.3.1.tgz#58e5aad6f97203a0788783f66324456c8f9cdb50"
+  integrity sha512-uqm5sielhQmKJM+qayIhgZv1KlS5pqTdQ99b+Z7hMWryXS96qE0DftTmMZowBcUL6x7s2vSXyH5wPtO1ON7LBg==
 
-"@next/swc-win32-arm64-msvc@13.4.6":
-  version "13.4.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.4.6.tgz#1e1e02c175573e64808fc1a7e8650e3e217f1edc"
-  integrity sha512-U6LtxEUrjBL2tpW+Kr1nHCSJWNeIed7U7l5o7FiKGGwGgIlFi4UHDiLI6TQ2lxi20fAU33CsruV3U0GuzMlXIw==
+"@next/swc-win32-arm64-msvc@13.3.1":
+  version "13.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.3.1.tgz#f8ed1badab57ed4503969758754e6fb0cf326753"
+  integrity sha512-WomIiTj/v3LevltlibNQKmvrOymNRYL+a0dp5R73IwPWN5FvXWwSELN/kiNALig/+T3luc4qHNTyvMCp9L6U5Q==
 
-"@next/swc-win32-ia32-msvc@13.4.6":
-  version "13.4.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.4.6.tgz#2b528ae3ec7f6e727f4f0d81a1015f63da55c7a6"
-  integrity sha512-eEBeAqpCfhdPSlCZCayjCiyIllVqy4tcqvm1xmg3BgJG0G5ITiMM4Cw2WVeRSgWDJqQGRyyb+q8Y2ltzhXOWsQ==
+"@next/swc-win32-ia32-msvc@13.3.1":
+  version "13.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.3.1.tgz#7f599c8975b09ee5527cc49b9e5a4d13be50635a"
+  integrity sha512-M+PoH+0+q658wRUbs285RIaSTYnGBSTdweH/0CdzDgA6Q4rBM0sQs4DHmO3BPP0ltCO/vViIoyG7ks66XmCA5g==
 
-"@next/swc-win32-x64-msvc@13.4.6":
-  version "13.4.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.4.6.tgz#38620bd68267ff13e50ecd432f1822eac51382a8"
-  integrity sha512-OrZs94AuO3ZS5tnqlyPRNgfWvboXaDQCi5aXGve3o3C+Sj0ctMUV9+Do+0zMvvLRumR8E0PTWKvtz9n5vzIsWw==
+"@next/swc-win32-x64-msvc@13.3.1":
+  version "13.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.3.1.tgz#192d43ab44ebb98bd4f5865d0e1d7ce62703182f"
+  integrity sha512-Sl1F4Vp5Z1rNXWZYqJwMuWRRol4bqOB6+/d7KqkgQ4AcafKPN1PZmpkCoxv4UFHtFNIB7EotnuIhtXu3zScicQ==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
+  resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"
   integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
   dependencies:
     "@nodelib/fs.stat" "2.0.5"
@@ -2382,12 +1791,12 @@
 
 "@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
   version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
+  resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
 "@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
   version "1.2.8"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
+  resolved "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"
   integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
   dependencies:
     "@nodelib/fs.scandir" "2.1.5"
@@ -2395,50 +1804,32 @@
 
 "@prisma/client@4.15.0":
   version "4.15.0"
-  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-4.15.0.tgz#f52ec6ca6fbde37395a54b0a9e5da603a9de15f3"
+  resolved "https://registry.npmjs.org/@prisma/client/-/client-4.15.0.tgz"
   integrity sha512-xnROvyABcGiwqRNdrObHVZkD9EjkJYHOmVdlKy1yGgI+XOzvMzJ4tRg3dz1pUlsyhKxXGCnjIQjWW+2ur+YXuw==
   dependencies:
     "@prisma/engines-version" "4.15.0-28.8fbc245156db7124f997f4cecdd8d1219e360944"
 
 "@prisma/engines-version@4.15.0-28.8fbc245156db7124f997f4cecdd8d1219e360944":
   version "4.15.0-28.8fbc245156db7124f997f4cecdd8d1219e360944"
-  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-4.15.0-28.8fbc245156db7124f997f4cecdd8d1219e360944.tgz#8d880becf996cffe08c78ad5afab6bc06090c990"
+  resolved "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-4.15.0-28.8fbc245156db7124f997f4cecdd8d1219e360944.tgz"
   integrity sha512-sVOig4tjGxxlYaFcXgE71f/rtFhzyYrfyfNFUsxCIEJyVKU9rdOWIlIwQ2NQ7PntvGnn+x0XuFo4OC1jvPJKzg==
 
 "@prisma/engines@4.15.0":
   version "4.15.0"
-  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-4.15.0.tgz#d8687a9fda615fab88b75b466931280289de9e26"
+  resolved "https://registry.npmjs.org/@prisma/engines/-/engines-4.15.0.tgz"
   integrity sha512-FTaOCGs0LL0OW68juZlGxFtYviZa4xdQj/rQEdat2txw0s3Vu/saAPKjNVXfIgUsGXmQ72HPgNr6935/P8FNAA==
 
-"@react-spring/animated@~9.5.5":
-  version "9.5.5"
-  resolved "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.5.5.tgz#d3bfd0f62ed13a337463a55d2c93bb23c15bbf3e"
-  integrity sha512-glzViz7syQ3CE6BQOwAyr75cgh0qsihm5lkaf24I0DfU63cMm/3+br299UEYkuaHNmfDfM414uktiPlZCNJbQA==
-  dependencies:
-    "@react-spring/shared" "~9.5.5"
-    "@react-spring/types" "~9.5.5"
-
 "@react-spring/animated@~9.7.1":
   version "9.7.1"
-  resolved "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.7.1.tgz#0f2d78184ee0cce703acd41abb87ea56765b5713"
+  resolved "https://registry.npmjs.org/@react-spring/animated/-/animated-9.7.1.tgz"
   integrity sha512-EX5KAD9y7sD43TnLeTNG1MgUVpuRO1YaSJRPawHNRgUWYfILge3s85anny4S4eTJGpdp5OoFV2kx9fsfeo0qsw==
   dependencies:
     "@react-spring/shared" "~9.7.1"
     "@react-spring/types" "~9.7.1"
 
-"@react-spring/core@~9.5.5":
-  version "9.5.5"
-  resolved "https://registry.yarnpkg.com/@react-spring/core/-/core-9.5.5.tgz#1d8a4c64630ee26b2295361e1eedfd716a85b4ae"
-  integrity sha512-shaJYb3iX18Au6gkk8ahaF0qx0LpS0Yd+ajb4asBaAQf6WPGuEdJsbsNSgei1/O13JyEATsJl20lkjeslJPMYA==
-  dependencies:
-    "@react-spring/animated" "~9.5.5"
-    "@react-spring/rafz" "~9.5.5"
-    "@react-spring/shared" "~9.5.5"
-    "@react-spring/types" "~9.5.5"
-
 "@react-spring/core@~9.7.1":
   version "9.7.1"
-  resolved "https://registry.yarnpkg.com/@react-spring/core/-/core-9.7.1.tgz#cfe176a48ee0a05545b1af5f2fbae718b50e9a99"
+  resolved "https://registry.npmjs.org/@react-spring/core/-/core-9.7.1.tgz"
   integrity sha512-8K9/FaRn5VvMa24mbwYxwkALnAAyMRdmQXrARZLcBW2vxLJ6uw9Cy3d06Z8M12kEqF2bDlccaCSDsn2bSz+Q4A==
   dependencies:
     "@react-spring/animated" "~9.7.1"
@@ -2446,19 +1837,9 @@
     "@react-spring/shared" "~9.7.1"
     "@react-spring/types" "~9.7.1"
 
-"@react-spring/konva@~9.5.5":
-  version "9.5.5"
-  resolved "https://registry.yarnpkg.com/@react-spring/konva/-/konva-9.5.5.tgz#ddbb30cfa268219d69552aa71188832ca8ab4905"
-  integrity sha512-0CNh+1vCIjNUklTFwMvxg+H83Jo2OWykBrdEA28ccmnpZgkQ8Kq5xyvaPFLzcDKV67OXHnaWiCYKpRbhLy2wng==
-  dependencies:
-    "@react-spring/animated" "~9.5.5"
-    "@react-spring/core" "~9.5.5"
-    "@react-spring/shared" "~9.5.5"
-    "@react-spring/types" "~9.5.5"
-
 "@react-spring/konva@~9.7.1":
   version "9.7.1"
-  resolved "https://registry.yarnpkg.com/@react-spring/konva/-/konva-9.7.1.tgz#25640892f88bde06c3ab96c875e5f7408abbce43"
+  resolved "https://registry.npmjs.org/@react-spring/konva/-/konva-9.7.1.tgz"
   integrity sha512-74svXHtUJi6Tvk9mNLUV1/1WfU8MdWsTK6JUpvmJr/rUr8r3FdOokk22icbgEg6AjxCkIf5e2WFovCCHUSyS0w==
   dependencies:
     "@react-spring/animated" "~9.7.1"
@@ -2466,19 +1847,9 @@
     "@react-spring/shared" "~9.7.1"
     "@react-spring/types" "~9.7.1"
 
-"@react-spring/native@~9.5.5":
-  version "9.5.5"
-  resolved "https://registry.yarnpkg.com/@react-spring/native/-/native-9.5.5.tgz#4ecc420c7b4c3fefeebd55d852640d36c29ec9c8"
-  integrity sha512-kauqmyJ8u7aVy2bBs22vl1SdB2i5uYIL4rP53k1KDWrFSqJh4j3efWkbTt9uzR5cMXuNVbkNo9OYVFUcQBz50A==
-  dependencies:
-    "@react-spring/animated" "~9.5.5"
-    "@react-spring/core" "~9.5.5"
-    "@react-spring/shared" "~9.5.5"
-    "@react-spring/types" "~9.5.5"
-
 "@react-spring/native@~9.7.1":
   version "9.7.1"
-  resolved "https://registry.yarnpkg.com/@react-spring/native/-/native-9.7.1.tgz#3f397f946fc9a7dd4d7d432f8c0a4726d7723751"
+  resolved "https://registry.npmjs.org/@react-spring/native/-/native-9.7.1.tgz"
   integrity sha512-dHWeH0UuE+Rxc3YZFLp8Aq0RBP07sdOgI7pLVG46OzkMRs2RtJeWJxB6UXIWAgcYDqWDk2REAPhLD3ItDl0tDQ==
   dependencies:
     "@react-spring/animated" "~9.7.1"
@@ -2486,45 +1857,22 @@
     "@react-spring/shared" "~9.7.1"
     "@react-spring/types" "~9.7.1"
 
-"@react-spring/rafz@~9.5.5":
-  version "9.5.5"
-  resolved "https://registry.yarnpkg.com/@react-spring/rafz/-/rafz-9.5.5.tgz#62a49c5e294104b79db2a8afdf4f3a274c7f44ca"
-  integrity sha512-F/CLwB0d10jL6My5vgzRQxCNY2RNyDJZedRBK7FsngdCmzoq3V4OqqNc/9voJb9qRC2wd55oGXUeXv2eIaFmsw==
-
 "@react-spring/rafz@~9.7.1":
   version "9.7.1"
-  resolved "https://registry.yarnpkg.com/@react-spring/rafz/-/rafz-9.7.1.tgz#bdfea463fcb5ddc4e7253a8fa3870dd52ebbc59a"
+  resolved "https://registry.npmjs.org/@react-spring/rafz/-/rafz-9.7.1.tgz"
   integrity sha512-JSsrRfbEJvuE3w/uvU3mCTuWwpQcBXkwoW14lBgzK9XJhuxmscGo59AgJUpFkGOiGAVXFBGB+nEXtSinFsopgw==
 
-"@react-spring/shared@~9.5.5":
-  version "9.5.5"
-  resolved "https://registry.yarnpkg.com/@react-spring/shared/-/shared-9.5.5.tgz#9be0b391d546e3e184a24ecbaf40acbaeab7fc73"
-  integrity sha512-YwW70Pa/YXPOwTutExHZmMQSHcNC90kJOnNR4G4mCDNV99hE98jWkIPDOsgqbYx3amIglcFPiYKMaQuGdr8dyQ==
-  dependencies:
-    "@react-spring/rafz" "~9.5.5"
-    "@react-spring/types" "~9.5.5"
-
 "@react-spring/shared@~9.7.1":
   version "9.7.1"
-  resolved "https://registry.yarnpkg.com/@react-spring/shared/-/shared-9.7.1.tgz#29611bb63d0c9e1ac18b6ced7aa4db1d48d136f3"
+  resolved "https://registry.npmjs.org/@react-spring/shared/-/shared-9.7.1.tgz"
   integrity sha512-R2kZ+VOO6IBeIAYTIA3C1XZ0ZVg/dDP5FKtWaY8k5akMer9iqf5H9BU0jyt3Qtxn0qQY7whQdf6MTcWtKeaawg==
   dependencies:
     "@react-spring/rafz" "~9.7.1"
     "@react-spring/types" "~9.7.1"
 
-"@react-spring/three@~9.5.5":
-  version "9.5.5"
-  resolved "https://registry.yarnpkg.com/@react-spring/three/-/three-9.5.5.tgz#c6fbee977007d1980406db20a28ac3f5dc2ce153"
-  integrity sha512-9kTIaSceqFIl5EIrdwM7Z53o5I+9BGNVzbp4oZZYMao+GMAWOosnlQdDG5GeqNsIqfW9fZCEquGqagfKAxftcA==
-  dependencies:
-    "@react-spring/animated" "~9.5.5"
-    "@react-spring/core" "~9.5.5"
-    "@react-spring/shared" "~9.5.5"
-    "@react-spring/types" "~9.5.5"
-
 "@react-spring/three@~9.7.1":
   version "9.7.1"
-  resolved "https://registry.yarnpkg.com/@react-spring/three/-/three-9.7.1.tgz#0dab3b5e96bb6e10db0a1363938e46fc68a861e4"
+  resolved "https://registry.npmjs.org/@react-spring/three/-/three-9.7.1.tgz"
   integrity sha512-5leUe0PDwIIw1M3GN3788zwTY4Ykyy+kNvQmg9+Hqs1DN3T8J1ovRTGwqWfGAu4ApTta9p5BH7SWNxxt3NO59Q==
   dependencies:
     "@react-spring/animated" "~9.7.1"
@@ -2532,29 +1880,14 @@
     "@react-spring/shared" "~9.7.1"
     "@react-spring/types" "~9.7.1"
 
-"@react-spring/types@~9.5.5":
-  version "9.5.5"
-  resolved "https://registry.yarnpkg.com/@react-spring/types/-/types-9.5.5.tgz#c8e94f1b9232ca7cb9d860ea67762ec401b1de14"
-  integrity sha512-7I/qY8H7Enwasxr4jU6WmtNK+RZ4Z/XvSlDvjXFVe7ii1x0MoSlkw6pD7xuac8qrHQRm9BTcbZNyeeKApYsvCg==
-
 "@react-spring/types@~9.7.1":
   version "9.7.1"
-  resolved "https://registry.yarnpkg.com/@react-spring/types/-/types-9.7.1.tgz#b540752a479d210c6fb68d2b1d5ff35556df4308"
+  resolved "https://registry.npmjs.org/@react-spring/types/-/types-9.7.1.tgz"
   integrity sha512-yBcyfKUeZv9wf/ZFrQszvhSPuDx6Py6yMJzpMnS+zxcZmhXPeOCKZSHwqrUz1WxvuRckUhlgb7eNI/x5e1e8CA==
 
-"@react-spring/web@~9.5.5":
-  version "9.5.5"
-  resolved "https://registry.yarnpkg.com/@react-spring/web/-/web-9.5.5.tgz#d416abc591aaed930401f0c98a991a8c5b90c382"
-  integrity sha512-+moT8aDX/ho/XAhU+HRY9m0LVV9y9CK6NjSRaI+30Re150pB3iEip6QfnF4qnhSCQ5drpMF0XRXHgOTY/xbtFw==
-  dependencies:
-    "@react-spring/animated" "~9.5.5"
-    "@react-spring/core" "~9.5.5"
-    "@react-spring/shared" "~9.5.5"
-    "@react-spring/types" "~9.5.5"
-
 "@react-spring/web@~9.7.1":
   version "9.7.1"
-  resolved "https://registry.yarnpkg.com/@react-spring/web/-/web-9.7.1.tgz#a9ee730d06c686b8432cd20f41683b1acb9b6300"
+  resolved "https://registry.npmjs.org/@react-spring/web/-/web-9.7.1.tgz"
   integrity sha512-6uUE5MyKqdrJnIJqlDN/AXf3i8PjOQzUuT26nkpsYxUGOk7c+vZVPcfrExLSoKzTb9kF0i66DcqzO5fXz/Z1AA==
   dependencies:
     "@react-spring/animated" "~9.7.1"
@@ -2562,19 +1895,9 @@
     "@react-spring/shared" "~9.7.1"
     "@react-spring/types" "~9.7.1"
 
-"@react-spring/zdog@~9.5.5":
-  version "9.5.5"
-  resolved "https://registry.yarnpkg.com/@react-spring/zdog/-/zdog-9.5.5.tgz#916dba337637d1151c3c2bc829b5105d15adacb5"
-  integrity sha512-LZgjo2kLlGmUqfE2fdVnvLXz+4eYyQARRvB9KQ4PTEynaETTG89Xgn9YxLrh1p57DzH7gEmTGDZ5hEw3pWqu8g==
-  dependencies:
-    "@react-spring/animated" "~9.5.5"
-    "@react-spring/core" "~9.5.5"
-    "@react-spring/shared" "~9.5.5"
-    "@react-spring/types" "~9.5.5"
-
 "@react-spring/zdog@~9.7.1":
   version "9.7.1"
-  resolved "https://registry.yarnpkg.com/@react-spring/zdog/-/zdog-9.7.1.tgz#474a1366d7b71d623e0dff0e37a243b505e8c1a6"
+  resolved "https://registry.npmjs.org/@react-spring/zdog/-/zdog-9.7.1.tgz"
   integrity sha512-FeDws+7ZSoi91TUjxKnq3xmdOW6fthmqky6zSPIZq1NomeyO7+xwbxjtu15IqoWG4DJ9pouVZDijvBQXUNl0Mw==
   dependencies:
     "@react-spring/animated" "~9.7.1"
@@ -2584,12 +1907,12 @@
 
 "@redis/bloom@1.1.0":
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@redis/bloom/-/bloom-1.1.0.tgz#64e310ddee72010676e14296076329e594a1f6c7"
+  resolved "https://registry.npmjs.org/@redis/bloom/-/bloom-1.1.0.tgz"
   integrity sha512-9QovlxmpRtvxVbN0UBcv8WfdSMudNZZTFqCsnBszcQXqaZb/TVe30ScgGEO7u1EAIacTPAo7/oCYjYAxiHLanQ==
 
 "@redis/client@1.4.2":
   version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@redis/client/-/client-1.4.2.tgz#2a3f5e98bc33b7b979390442e6e08f96e57fabdd"
+  resolved "https://registry.npmjs.org/@redis/client/-/client-1.4.2.tgz"
   integrity sha512-oUdEjE0I7JS5AyaAjkD3aOXn9NhO7XKyPyXEyrgFDu++VrVBHUPnV6dgEya9TcMuj5nIJRuCzCm8ZP+c9zCHPw==
   dependencies:
     cluster-key-slot "1.1.1"
@@ -2598,27 +1921,27 @@
 
 "@redis/graph@1.1.0":
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@redis/graph/-/graph-1.1.0.tgz#cc2b82e5141a29ada2cce7d267a6b74baa6dd519"
+  resolved "https://registry.npmjs.org/@redis/graph/-/graph-1.1.0.tgz"
   integrity sha512-16yZWngxyXPd+MJxeSr0dqh2AIOi8j9yXKcKCwVaKDbH3HTuETpDVPcLujhFYVPtYrngSco31BUcSa9TH31Gqg==
 
 "@redis/json@1.0.4":
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@redis/json/-/json-1.0.4.tgz#f372b5f93324e6ffb7f16aadcbcb4e5c3d39bda1"
+  resolved "https://registry.npmjs.org/@redis/json/-/json-1.0.4.tgz"
   integrity sha512-LUZE2Gdrhg0Rx7AN+cZkb1e6HjoSKaeeW8rYnt89Tly13GBI5eP4CwDVr+MY8BAYfCg4/N15OUrtLoona9uSgw==
 
 "@redis/search@1.1.0":
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@redis/search/-/search-1.1.0.tgz#7abb18d431f27ceafe6bcb4dd83a3fa67e9ab4df"
+  resolved "https://registry.npmjs.org/@redis/search/-/search-1.1.0.tgz"
   integrity sha512-NyFZEVnxIJEybpy+YskjgOJRNsfTYqaPbK/Buv6W2kmFNaRk85JiqjJZA5QkRmWvGbyQYwoO5QfDi2wHskKrQQ==
 
 "@redis/time-series@1.0.4":
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@redis/time-series/-/time-series-1.0.4.tgz#af85eb080f6934580e4d3b58046026b6c2b18717"
+  resolved "https://registry.npmjs.org/@redis/time-series/-/time-series-1.0.4.tgz"
   integrity sha512-ThUIgo2U/g7cCuZavucQTQzA9g9JbDDY2f64u3AbAoz/8vE2lt2U37LamDUVChhaDA3IRT9R6VvJwqnUfTJzng==
 
 "@rollup/plugin-alias@^5.0.0":
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-alias/-/plugin-alias-5.0.0.tgz#70f3d504bd17d8922e35c6b61c08b40a6ec25af2"
+  resolved "https://registry.npmjs.org/@rollup/plugin-alias/-/plugin-alias-5.0.0.tgz"
   integrity sha512-l9hY5chSCjuFRPsnRm16twWBiSApl2uYFLsepQYwtBuAxNMQ/1dJqADld40P0Jkqm65GRTLy/AC6hnpVebtLsA==
   dependencies:
     slash "^4.0.0"
@@ -2634,7 +1957,7 @@
 
 "@rollup/plugin-commonjs@^24.1.0":
   version "24.1.0"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-24.1.0.tgz#79e54bd83bb64396761431eee6c44152ef322100"
+  resolved "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-24.1.0.tgz"
   integrity sha512-eSL45hjhCWI0jCCXcNtLVqM5N1JlBGvlFfY0m6oOYnLCJ6N0qEXoZql4sY2MOUArzhH4SA/qBpTxvvZp2Sc+DQ==
   dependencies:
     "@rollup/pluginutils" "^5.0.1"
@@ -2646,14 +1969,14 @@
 
 "@rollup/plugin-json@^6.0.0":
   version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-6.0.0.tgz#199fea6670fd4dfb1f4932250569b14719db234a"
+  resolved "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-6.0.0.tgz"
   integrity sha512-i/4C5Jrdr1XUarRhVu27EEwjt4GObltD7c+MkCIpO2QIbojw8MUs+CCTqOphQi3Qtg1FLmYt+l+6YeoIf51J7w==
   dependencies:
     "@rollup/pluginutils" "^5.0.1"
 
 "@rollup/plugin-node-resolve@^15.0.2":
   version "15.1.0"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.1.0.tgz#9ffcd8e8c457080dba89bb9fcb583a6778dc757e"
+  resolved "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.1.0.tgz"
   integrity sha512-xeZHCgsiZ9pzYVgAo9580eCGqwh/XCEUM9q6iQfGNocjgkufHAqC3exA+45URvhiYV8sBF9RlBai650eNs7AsA==
   dependencies:
     "@rollup/pluginutils" "^5.0.1"
@@ -2682,7 +2005,7 @@
 
 "@rollup/pluginutils@^5.0.1", "@rollup/pluginutils@^5.0.2":
   version "5.0.2"
-  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.0.2.tgz#012b8f53c71e4f6f9cb317e311df1404f56e7a33"
+  resolved "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.2.tgz"
   integrity sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==
   dependencies:
     "@types/estree" "^1.0.0"
@@ -2691,92 +2014,82 @@
 
 "@rushstack/eslint-patch@^1.1.3":
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz#8be36a1f66f3265389e90b5f9c9962146758f728"
+  resolved "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz"
   integrity sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg==
 
 "@svgr/babel-plugin-add-jsx-attribute@^6.5.1":
   version "6.5.1"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-6.5.1.tgz#74a5d648bd0347bda99d82409d87b8ca80b9a1ba"
+  resolved "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-6.5.1.tgz"
   integrity sha512-9PYGcXrAxitycIjRmZB+Q0JaN07GZIWaTBIGQzfaZv+qr1n8X1XUEJ5rZ/vx6OVD9RRYlrNnXWExQXcmZeD/BQ==
 
 "@svgr/babel-plugin-add-jsx-attribute@^7.0.0":
   version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-7.0.0.tgz#80856c1b7a3b7422d232f6e079f0beb90c4a13e9"
+  resolved "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-7.0.0.tgz"
   integrity sha512-khWbXesWIP9v8HuKCl2NU2HNAyqpSQ/vkIl36Nbn4HIwEYSRWL0H7Gs6idJdha2DkpFDWlsqMELvoCE8lfFY6Q==
 
-"@svgr/babel-plugin-remove-jsx-attribute@*":
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-6.5.0.tgz#652bfd4ed0a0699843585cda96faeb09d6e1306e"
-  integrity sha512-8zYdkym7qNyfXpWvu4yq46k41pyNM9SOstoWhKlm+IfdCE1DdnRKeMUPsWIEO/DEkaWxJ8T9esNdG3QwQ93jBA==
-
-"@svgr/babel-plugin-remove-jsx-attribute@^7.0.0":
+"@svgr/babel-plugin-remove-jsx-attribute@*", "@svgr/babel-plugin-remove-jsx-attribute@^7.0.0":
   version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-7.0.0.tgz#91da77a009dc38e8d30da45d9b62ef8736f2d90a"
+  resolved "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-7.0.0.tgz"
   integrity sha512-iiZaIvb3H/c7d3TH2HBeK91uI2rMhZNwnsIrvd7ZwGLkFw6mmunOCoVnjdYua662MqGFxlN9xTq4fv9hgR4VXQ==
 
-"@svgr/babel-plugin-remove-jsx-empty-expression@*":
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-6.5.0.tgz#4b78994ab7d39032c729903fc2dd5c0fa4565cb8"
-  integrity sha512-NFdxMq3xA42Kb1UbzCVxplUc0iqSyM9X8kopImvFnB+uSDdzIHOdbs1op8ofAvVRtbg4oZiyRl3fTYeKcOe9Iw==
-
-"@svgr/babel-plugin-remove-jsx-empty-expression@^7.0.0":
+"@svgr/babel-plugin-remove-jsx-empty-expression@*", "@svgr/babel-plugin-remove-jsx-empty-expression@^7.0.0":
   version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-7.0.0.tgz#5154ff1213509e36ab315974c8c2fd48dafb827b"
+  resolved "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-7.0.0.tgz"
   integrity sha512-sQQmyo+qegBx8DfFc04PFmIO1FP1MHI1/QEpzcIcclo5OAISsOJPW76ZIs0bDyO/DBSJEa/tDa1W26pVtt0FRw==
 
 "@svgr/babel-plugin-replace-jsx-attribute-value@^6.5.1":
   version "6.5.1"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-6.5.1.tgz#fb9d22ea26d2bc5e0a44b763d4c46d5d3f596c60"
+  resolved "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-6.5.1.tgz"
   integrity sha512-8DPaVVE3fd5JKuIC29dqyMB54sA6mfgki2H2+swh+zNJoynC8pMPzOkidqHOSc6Wj032fhl8Z0TVn1GiPpAiJg==
 
 "@svgr/babel-plugin-replace-jsx-attribute-value@^7.0.0":
   version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-7.0.0.tgz#7e72f44ee57fdbcb02fb0d4a7629466c5242725e"
+  resolved "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-7.0.0.tgz"
   integrity sha512-i6MaAqIZXDOJeikJuzocByBf8zO+meLwfQ/qMHIjCcvpnfvWf82PFvredEZElErB5glQFJa2KVKk8N2xV6tRRA==
 
 "@svgr/babel-plugin-svg-dynamic-title@^6.5.1":
   version "6.5.1"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-6.5.1.tgz#01b2024a2b53ffaa5efceaa0bf3e1d5a4c520ce4"
+  resolved "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-6.5.1.tgz"
   integrity sha512-FwOEi0Il72iAzlkaHrlemVurgSQRDFbk0OC8dSvD5fSBPHltNh7JtLsxmZUhjYBZo2PpcU/RJvvi6Q0l7O7ogw==
 
 "@svgr/babel-plugin-svg-dynamic-title@^7.0.0":
   version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-7.0.0.tgz#8caf0449c678ea29be756b89960b2b16c9f33f00"
+  resolved "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-7.0.0.tgz"
   integrity sha512-BoVSh6ge3SLLpKC0pmmN9DFlqgFy4NxNgdZNLPNJWBUU7TQpDWeBuyVuDW88iXydb5Cv0ReC+ffa5h3VrKfk1w==
 
 "@svgr/babel-plugin-svg-em-dimensions@^6.5.1":
   version "6.5.1"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-6.5.1.tgz#dd3fa9f5b24eb4f93bcf121c3d40ff5facecb217"
+  resolved "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-6.5.1.tgz"
   integrity sha512-gWGsiwjb4tw+ITOJ86ndY/DZZ6cuXMNE/SjcDRg+HLuCmwpcjOktwRF9WgAiycTqJD/QXqL2f8IzE2Rzh7aVXA==
 
 "@svgr/babel-plugin-svg-em-dimensions@^7.0.0":
   version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-7.0.0.tgz#4db6b5af6d29e93db236b1a013fa953754071d41"
+  resolved "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-7.0.0.tgz"
   integrity sha512-tNDcBa+hYn0gO+GkP/AuNKdVtMufVhU9fdzu+vUQsR18RIJ9RWe7h/pSBY338RO08wArntwbDk5WhQBmhf2PaA==
 
 "@svgr/babel-plugin-transform-react-native-svg@^6.5.1":
   version "6.5.1"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-6.5.1.tgz#1d8e945a03df65b601551097d8f5e34351d3d305"
+  resolved "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-6.5.1.tgz"
   integrity sha512-2jT3nTayyYP7kI6aGutkyfJ7UMGtuguD72OjeGLwVNyfPRBD8zQthlvL+fAbAKk5n9ZNcvFkp/b1lZ7VsYqVJg==
 
 "@svgr/babel-plugin-transform-react-native-svg@^7.0.0":
   version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-7.0.0.tgz#236995e58b5e36ff06365d5310509ce5391aeec9"
+  resolved "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-7.0.0.tgz"
   integrity sha512-qw54u8ljCJYL2KtBOjI5z7Nzg8LnSvQOP5hPKj77H4VQL4+HdKbAT5pnkkZLmHKYwzsIHSYKXxHouD8zZamCFQ==
 
 "@svgr/babel-plugin-transform-svg-component@^6.5.1":
   version "6.5.1"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-6.5.1.tgz#48620b9e590e25ff95a80f811544218d27f8a250"
+  resolved "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-6.5.1.tgz"
   integrity sha512-a1p6LF5Jt33O3rZoVRBqdxL350oge54iZWHNI6LJB5tQ7EelvD/Mb1mfBiZNAan0dt4i3VArkFRjA4iObuNykQ==
 
 "@svgr/babel-plugin-transform-svg-component@^7.0.0":
   version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-7.0.0.tgz#a9b62730acf10d22a2aa57e0f701c0ecbc270430"
+  resolved "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-7.0.0.tgz"
   integrity sha512-CcFECkDj98daOg9jE3Bh3uyD9kzevCAnZ+UtzG6+BQG/jOQ2OA3jHnX6iG4G1MCJkUQFnUvEv33NvQfqrb/F3A==
 
 "@svgr/babel-preset@^6.5.1":
   version "6.5.1"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-6.5.1.tgz#b90de7979c8843c5c580c7e2ec71f024b49eb828"
+  resolved "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-6.5.1.tgz"
   integrity sha512-6127fvO/FF2oi5EzSQOAjo1LE3OtNVh11R+/8FXa+mHx1ptAaS4cknIjnUA7e6j6fwGGJ17NzaTJFUwOV2zwCw==
   dependencies:
     "@svgr/babel-plugin-add-jsx-attribute" "^6.5.1"
@@ -2790,7 +2103,7 @@
 
 "@svgr/babel-preset@^7.0.0":
   version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-7.0.0.tgz#55aaca4cec2ff6515a571715b6b6fa98675b66d9"
+  resolved "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-7.0.0.tgz"
   integrity sha512-EX/NHeFa30j5UjldQGVQikuuQNHUdGmbh9kEpBKofGUtF0GUPJ4T4rhoYiqDAOmBOxojyot36JIFiDUHUK1ilQ==
   dependencies:
     "@svgr/babel-plugin-add-jsx-attribute" "^7.0.0"
@@ -2804,7 +2117,7 @@
 
 "@svgr/core@^6.5.1":
   version "6.5.1"
-  resolved "https://registry.yarnpkg.com/@svgr/core/-/core-6.5.1.tgz#d3e8aa9dbe3fbd747f9ee4282c1c77a27410488a"
+  resolved "https://registry.npmjs.org/@svgr/core/-/core-6.5.1.tgz"
   integrity sha512-/xdLSWxK5QkqG524ONSjvg3V/FkNyCv538OIBdQqPNaAta3AsXj/Bd2FbvR87yMbXO2hFSWiAe/Q6IkVPDw+mw==
   dependencies:
     "@babel/core" "^7.19.6"
@@ -2815,7 +2128,7 @@
 
 "@svgr/core@^7.0.0":
   version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@svgr/core/-/core-7.0.0.tgz#def863d2670c682615583c80b408e83c095c2233"
+  resolved "https://registry.npmjs.org/@svgr/core/-/core-7.0.0.tgz"
   integrity sha512-ztAoxkaKhRVloa3XydohgQQCb0/8x9T63yXovpmHzKMkHO6pkjdsIAWKOS4bE95P/2quVh1NtjSKlMRNzSBffw==
   dependencies:
     "@babel/core" "^7.21.3"
@@ -2825,7 +2138,7 @@
 
 "@svgr/hast-util-to-babel-ast@^6.5.1":
   version "6.5.1"
-  resolved "https://registry.yarnpkg.com/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-6.5.1.tgz#81800bd09b5bcdb968bf6ee7c863d2288fdb80d2"
+  resolved "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-6.5.1.tgz"
   integrity sha512-1hnUxxjd83EAxbL4a0JDJoD3Dao3hmjvyvyEV8PzWmLK3B9m9NPlW7GKjFyoWE8nM7HnXzPcmmSyOW8yOddSXw==
   dependencies:
     "@babel/types" "^7.20.0"
@@ -2833,7 +2146,7 @@
 
 "@svgr/hast-util-to-babel-ast@^7.0.0":
   version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-7.0.0.tgz#d457dfbe74ebc1e5a6daf97ded49e9576a3a00cf"
+  resolved "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-7.0.0.tgz"
   integrity sha512-42Ej9sDDEmsJKjrfQ1PHmiDiHagh/u9AHO9QWbeNx4KmD9yS5d1XHmXUNINfUcykAU+4431Cn+k6Vn5mWBYimQ==
   dependencies:
     "@babel/types" "^7.21.3"
@@ -2841,7 +2154,7 @@
 
 "@svgr/plugin-jsx@^6.5.1":
   version "6.5.1"
-  resolved "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-6.5.1.tgz#0e30d1878e771ca753c94e69581c7971542a7072"
+  resolved "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-6.5.1.tgz"
   integrity sha512-+UdQxI3jgtSjCykNSlEMuy1jSRQlGC7pqBCPvkG/2dATdWo082zHTTK3uhnAju2/6XpE6B5mZ3z4Z8Ns01S8Gw==
   dependencies:
     "@babel/core" "^7.19.6"
@@ -2851,7 +2164,7 @@
 
 "@svgr/plugin-jsx@^7.0.0":
   version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-7.0.0.tgz#b9e0c7d05bc890d70163ac0490ba8c41f1afab90"
+  resolved "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-7.0.0.tgz"
   integrity sha512-SWlTpPQmBUtLKxXWgpv8syzqIU8XgFRvyhfkam2So8b3BE0OS0HPe5UfmlJ2KIC+a7dpuuYovPR2WAQuSyMoPw==
   dependencies:
     "@babel/core" "^7.21.3"
@@ -2861,7 +2174,7 @@
 
 "@svgr/plugin-svgo@^6.5.1":
   version "6.5.1"
-  resolved "https://registry.yarnpkg.com/@svgr/plugin-svgo/-/plugin-svgo-6.5.1.tgz#0f91910e988fc0b842f88e0960c2862e022abe84"
+  resolved "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-6.5.1.tgz"
   integrity sha512-omvZKf8ixP9z6GWgwbtmP9qQMPX4ODXi+wzbVZgomNFsUIlHA1sf4fThdwTWSsZGgvGAG6yE+b/F5gWUkcZ/iQ==
   dependencies:
     cosmiconfig "^7.0.1"
@@ -2870,7 +2183,7 @@
 
 "@svgr/plugin-svgo@^7.0.0":
   version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@svgr/plugin-svgo/-/plugin-svgo-7.0.0.tgz#325e87cede7bf7106a8099ceaeaa5906176c4bca"
+  resolved "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-7.0.0.tgz"
   integrity sha512-263znzlu3qTKj71/ot5G9l2vpL4CW+pr2IexBFIwwB+fRAXE9Xnw2rUFgE6P4+37N9siOuC4lKkgBfUCOLFRKQ==
   dependencies:
     cosmiconfig "^8.1.3"
@@ -2879,7 +2192,7 @@
 
 "@svgr/rollup@^7.0.0":
   version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@svgr/rollup/-/rollup-7.0.0.tgz#709185ede1d2d78b5c9dc98c109fc7bc0fcad0ee"
+  resolved "https://registry.npmjs.org/@svgr/rollup/-/rollup-7.0.0.tgz"
   integrity sha512-zlx0lxtxTnrXFF+ISuff+hht2XcWXa6uXEliwQbz+o0/qRIrcqyB9ShalO9ekVWB5icgxCWQ5lDaULJTt/pTlA==
   dependencies:
     "@babel/core" "^7.21.3"
@@ -2894,7 +2207,7 @@
 
 "@svgr/webpack@^6.2.1":
   version "6.5.1"
-  resolved "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-6.5.1.tgz#ecf027814fc1cb2decc29dc92f39c3cf691e40e8"
+  resolved "https://registry.npmjs.org/@svgr/webpack/-/webpack-6.5.1.tgz"
   integrity sha512-cQ/AsnBkXPkEK8cLbv4Dm7JGXq2XrumKnL1dRpJD9rIO2fTIlJI9a1uCciYG1F2aUsox/hJQyNGbt3soDxSRkA==
   dependencies:
     "@babel/core" "^7.19.6"
@@ -2906,21 +2219,21 @@
     "@svgr/plugin-jsx" "^6.5.1"
     "@svgr/plugin-svgo" "^6.5.1"
 
-"@swc/helpers@0.5.1":
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.1.tgz#e9031491aa3f26bfcc974a67f48bd456c8a5357a"
-  integrity sha512-sJ902EfIzn1Fa+qYmjdQqh8tPsoxyBz+8yBKC2HKUxyezKJFwPGOn7pv4WY6QuQW//ySQi5lJjA/ZT9sNWWNTg==
+"@swc/helpers@0.5.0":
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.0.tgz#bf1d807b60f7290d0ec763feea7ccdeda06e85f1"
+  integrity sha512-SjY/p4MmECVVEWspzSRpQEM3sjR17sP8PbGxELWrT+YZMBfiUyt1MRUNjMV23zohwlG2HYtCQOsCwsTHguXkyg==
   dependencies:
     tslib "^2.4.0"
 
 "@tanstack/query-core@4.29.5":
   version "4.29.5"
-  resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-4.29.5.tgz#a0273e88bf2fc102c4c893dc7c034127b67fd5d9"
+  resolved "https://registry.npmjs.org/@tanstack/query-core/-/query-core-4.29.5.tgz"
   integrity sha512-xXIiyQ/4r9KfaJ3k6kejqcaqFXXBTzN2aOJ5H1J6aTJE9hl/nbgAdfF6oiIu0CD5xowejJEJ6bBg8TO7BN4NuQ==
 
 "@tanstack/react-query@^4.16.1":
   version "4.29.5"
-  resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-4.29.5.tgz#3890741291f9f925933243d78bd74dfc59d64208"
+  resolved "https://registry.npmjs.org/@tanstack/react-query/-/react-query-4.29.5.tgz"
   integrity sha512-F87cibC3s3eG0Q90g2O+hqntpCrudKFnR8P24qkH9uccEhXErnJxBC/AAI4cJRV2bfMO8IeGZQYf3WyYgmSg0w==
   dependencies:
     "@tanstack/query-core" "4.29.5"
@@ -2928,27 +2241,27 @@
 
 "@trysound/sax@0.2.0":
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad"
+  resolved "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz"
   integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
 
 "@tsconfig/node10@^1.0.7":
   version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
+  resolved "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz"
   integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==
 
 "@tsconfig/node12@^1.0.7":
   version "1.0.11"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
+  resolved "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz"
   integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
 
 "@tsconfig/node14@^1.0.0":
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
+  resolved "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz"
   integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
 
 "@tsconfig/node16@^1.0.2":
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e"
+  resolved "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz"
   integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==
 
 "@types/babel__core@^7.1.7":
@@ -2993,7 +2306,7 @@
 
 "@types/estree@*", "@types/estree@^1.0.0":
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194"
+  resolved "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz"
   integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==
 
 "@types/estree@0.0.39":
@@ -3015,7 +2328,7 @@
 
 "@types/glob@^7.1.1":
   version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
+  resolved "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz"
   integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
   dependencies:
     "@types/minimatch" "*"
@@ -3023,20 +2336,15 @@
 
 "@types/hoist-non-react-statics@^3.3.0", "@types/hoist-non-react-statics@^3.3.1":
   version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f"
+  resolved "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz"
   integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==
   dependencies:
     "@types/react" "*"
     hoist-non-react-statics "^3.3.0"
 
-"@types/json-schema@^7.0.5":
-  version "7.0.9"
-  resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz"
-  integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
-
-"@types/json-schema@^7.0.9":
+"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.9":
   version "7.0.12"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
+  resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz"
   integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
 
 "@types/json-stable-stringify@^1.0.32":
@@ -3046,27 +2354,27 @@
 
 "@types/json5@^0.0.29":
   version "0.0.29"
-  resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
+  resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
 "@types/lodash@^4.14.175":
   version "4.14.191"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.191.tgz#09511e7f7cba275acd8b419ddac8da9a6a79e2fa"
+  resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.191.tgz"
   integrity sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==
 
 "@types/minimatch@*":
   version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
+  resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz"
   integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
 
 "@types/minimist@^1.2.0":
   version "1.2.2"
-  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
+  resolved "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz"
   integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
 
 "@types/node@*":
   version "18.15.10"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.10.tgz#4ee2171c3306a185d1208dad5f44dae3dee4cfe3"
+  resolved "https://registry.npmjs.org/@types/node/-/node-18.15.10.tgz"
   integrity sha512-9avDaQJczATcXgfmMAW3MIWArOO7A+m90vuCFLr8AotWf8igO/mRoYukrk2cqZVtv38tHs33retzHEilM7FpeQ==
 
 "@types/node@14":
@@ -3081,22 +2389,22 @@
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
+  resolved "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz"
   integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
 
 "@types/parse-json@^4.0.0":
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
+  resolved "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz"
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
 "@types/prop-types@*":
   version "15.7.5"
-  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf"
+  resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz"
   integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==
 
 "@types/react-redux@^7.1.20":
   version "7.1.24"
-  resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.24.tgz#6caaff1603aba17b27d20f8ad073e4c077e975c0"
+  resolved "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.24.tgz"
   integrity sha512-7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ==
   dependencies:
     "@types/hoist-non-react-statics" "^3.3.0"
@@ -3104,32 +2412,23 @@
     hoist-non-react-statics "^3.3.0"
     redux "^4.0.0"
 
-"@types/react@*":
+"@types/react@*", "@types/react@16 || 17 || 18":
   version "18.0.25"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.25.tgz#8b1dcd7e56fe7315535a4af25435e0bb55c8ae44"
+  resolved "https://registry.npmjs.org/@types/react/-/react-18.0.25.tgz"
   integrity sha512-xD6c0KDT4m7n9uD4ZHi02lzskaiqcBxf4zi+tXZY98a04wvc0hi/TcCPC2FOESZi51Nd7tlUeOJY8RofL799/g==
   dependencies:
     "@types/prop-types" "*"
     "@types/scheduler" "*"
     csstype "^3.0.2"
 
-"@types/react@16 || 17 || 18":
-  version "18.0.10"
-  resolved "https://registry.npmjs.org/@types/react/-/react-18.0.10.tgz"
-  integrity sha512-dIugadZuIPrRzvIEevIu7A1smqOAjkSMv8qOfwPt9Ve6i6JT/FQcCHyk2qIAxwsQNKZt5/oGR0T4z9h2dXRAkg==
-  dependencies:
-    "@types/prop-types" "*"
-    "@types/scheduler" "*"
-    csstype "^3.0.2"
-
 "@types/resolve@1.20.2":
   version "1.20.2"
-  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.20.2.tgz#97d26e00cd4a0423b4af620abecf3e6f442b7975"
+  resolved "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz"
   integrity sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==
 
 "@types/scheduler@*":
   version "0.16.2"
-  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
+  resolved "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz"
   integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
 
 "@types/schema-utils@^2.4.0":
@@ -3141,12 +2440,12 @@
 
 "@types/semver@^7.3.12":
   version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.0.tgz#591c1ce3a702c45ee15f47a42ade72c2fd78978a"
+  resolved "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz"
   integrity sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==
 
 "@typescript-eslint/eslint-plugin@^5.50.0":
   version "5.59.11"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.11.tgz#8d466aa21abea4c3f37129997b198d141f09e76f"
+  resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.11.tgz"
   integrity sha512-XxuOfTkCUiOSyBWIvHlUraLw/JT/6Io1365RO6ZuI88STKMavJZPNMU0lFcUTeQXEhHiv64CbxYxBNoDVSmghg==
   dependencies:
     "@eslint-community/regexpp" "^4.4.0"
@@ -3160,19 +2459,9 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/parser@^5.21.0":
-  version "5.45.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.45.0.tgz#b18a5f6b3cf1c2b3e399e9d2df4be40d6b0ddd0e"
-  integrity sha512-brvs/WSM4fKUmF5Ot/gEve6qYiCMjm6w4HkHPfS6ZNmxTS0m0iNN4yOChImaCkqc1hRwFGqUyanMXuGal6oyyQ==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.45.0"
-    "@typescript-eslint/types" "5.45.0"
-    "@typescript-eslint/typescript-estree" "5.45.0"
-    debug "^4.3.4"
-
-"@typescript-eslint/parser@^5.50.0":
+"@typescript-eslint/parser@^5.21.0", "@typescript-eslint/parser@^5.50.0":
   version "5.59.11"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.59.11.tgz#af7d4b7110e3068ce0b97550736de455e4250103"
+  resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.11.tgz"
   integrity sha512-s9ZF3M+Nym6CAZEkJJeO2TFHHDsKAM3ecNkLuH4i4s8/RCPnF5JRip2GyviYkeEAcwGMJxkqG9h2dAsnA1nZpA==
   dependencies:
     "@typescript-eslint/scope-manager" "5.59.11"
@@ -3180,17 +2469,9 @@
     "@typescript-eslint/typescript-estree" "5.59.11"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.45.0":
-  version "5.45.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.45.0.tgz#7a4ac1bfa9544bff3f620ab85947945938319a96"
-  integrity sha512-noDMjr87Arp/PuVrtvN3dXiJstQR1+XlQ4R1EvzG+NMgXi8CuMCXpb8JqNtFHKceVSQ985BZhfRdowJzbv4yKw==
-  dependencies:
-    "@typescript-eslint/types" "5.45.0"
-    "@typescript-eslint/visitor-keys" "5.45.0"
-
 "@typescript-eslint/scope-manager@5.59.11":
   version "5.59.11"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.11.tgz#5d131a67a19189c42598af9fb2ea1165252001ce"
+  resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.11.tgz"
   integrity sha512-dHFOsxoLFtrIcSj5h0QoBT/89hxQONwmn3FOQ0GOQcLOOXm+MIrS8zEAhs4tWl5MraxCY3ZJpaXQQdFMc2Tu+Q==
   dependencies:
     "@typescript-eslint/types" "5.59.11"
@@ -3198,7 +2479,7 @@
 
 "@typescript-eslint/type-utils@5.59.11":
   version "5.59.11"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.59.11.tgz#5eb67121808a84cb57d65a15f48f5bdda25f2346"
+  resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.11.tgz"
   integrity sha512-LZqVY8hMiVRF2a7/swmkStMYSoXMFlzL6sXV6U/2gL5cwnLWQgLEG8tjWPpaE4rMIdZ6VKWwcffPlo1jPfk43g==
   dependencies:
     "@typescript-eslint/typescript-estree" "5.59.11"
@@ -3206,32 +2487,14 @@
     debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.45.0":
-  version "5.45.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.45.0.tgz#794760b9037ee4154c09549ef5a96599621109c5"
-  integrity sha512-QQij+u/vgskA66azc9dCmx+rev79PzX8uDHpsqSjEFtfF2gBUTRCpvYMh2gw2ghkJabNkPlSUCimsyBEQZd1DA==
-
 "@typescript-eslint/types@5.59.11":
   version "5.59.11"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.11.tgz#1a9018fe3c565ba6969561f2a49f330cf1fe8db1"
+  resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.11.tgz"
   integrity sha512-epoN6R6tkvBYSc+cllrz+c2sOFWkbisJZWkOE+y3xHtvYaOE6Wk6B8e114McRJwFRjGvYdJwLXQH5c9osME/AA==
 
-"@typescript-eslint/typescript-estree@5.45.0":
-  version "5.45.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.45.0.tgz#f70a0d646d7f38c0dfd6936a5e171a77f1e5291d"
-  integrity sha512-maRhLGSzqUpFcZgXxg1qc/+H0bT36lHK4APhp0AEUVrpSwXiRAomm/JGjSG+kNUio5kAa3uekCYu/47cnGn5EQ==
-  dependencies:
-    "@typescript-eslint/types" "5.45.0"
-    "@typescript-eslint/visitor-keys" "5.45.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
-
 "@typescript-eslint/typescript-estree@5.59.11":
   version "5.59.11"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.11.tgz#b2caaa31725e17c33970c1197bcd54e3c5f42b9f"
+  resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.11.tgz"
   integrity sha512-YupOpot5hJO0maupJXixi6l5ETdrITxeo5eBOeuV7RSKgYdU3G5cxO49/9WRnJq9EMrB7AuTSLH/bqOsXi7wPA==
   dependencies:
     "@typescript-eslint/types" "5.59.11"
@@ -3244,7 +2507,7 @@
 
 "@typescript-eslint/utils@5.59.11":
   version "5.59.11"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.11.tgz#9dbff49dc80bfdd9289f9f33548f2e8db3c59ba1"
+  resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.11.tgz"
   integrity sha512-didu2rHSOMUdJThLk4aZ1Or8IcO3HzCw/ZvEjTTIfjIrcdd5cvSIwwDy2AOlE7htSNp7QIZ10fLMyRCveesMLg==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
@@ -3256,17 +2519,9 @@
     eslint-scope "^5.1.1"
     semver "^7.3.7"
 
-"@typescript-eslint/visitor-keys@5.45.0":
-  version "5.45.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.45.0.tgz#e0d160e9e7fdb7f8da697a5b78e7a14a22a70528"
-  integrity sha512-jc6Eccbn2RtQPr1s7th6jJWQHBHI6GBVQkCHoJFQ5UreaKm59Vxw+ynQUPPY2u2Amquc+7tmEoC2G52ApsGNNg==
-  dependencies:
-    "@typescript-eslint/types" "5.45.0"
-    eslint-visitor-keys "^3.3.0"
-
 "@typescript-eslint/visitor-keys@5.59.11":
   version "5.59.11"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.11.tgz#dca561ddad169dc27d62396d64f45b2d2c3ecc56"
+  resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.11.tgz"
   integrity sha512-KGYniTGG3AMTuKF9QBD7EIrvufkB6O6uX3knP73xbKLMpH+QRPcgnCxjWXSHjMRuOxFLovljqQgQpR0c7GvjoA==
   dependencies:
     "@typescript-eslint/types" "5.59.11"
@@ -3274,14 +2529,14 @@
 
 "@umami/prisma-client@^0.2.0":
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/@umami/prisma-client/-/prisma-client-0.2.0.tgz#b9de1f28be67ccfb9e2544f23c69c392c5b26ea7"
+  resolved "https://registry.npmjs.org/@umami/prisma-client/-/prisma-client-0.2.0.tgz"
   integrity sha512-+27dd4DLl8SvbbIYG1mdm6pIZd+UzQI7eZGNjQ9ONeWO0jr+/wiVnPIXUzd8w4R/OoM4ChpI3mBZPqcWa5MAOw==
   dependencies:
     debug "^4.3.4"
 
 "@umami/redis-client@^0.5.0":
   version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@umami/redis-client/-/redis-client-0.5.0.tgz#09b15458001bc172fc856d65316efbe5ff749461"
+  resolved "https://registry.npmjs.org/@umami/redis-client/-/redis-client-0.5.0.tgz"
   integrity sha512-x7wx/pMjyg3AAYzgjGOw031bNhyZ81h6tRMAl60RQQI9xlJaJEA1r0TEUrWfFi21gHAvdBLJGYCsvHzpix4LKQ==
   dependencies:
     debug "^4.3.4"
@@ -3289,7 +2544,7 @@
 
 "@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"
+  resolved "https://registry.npmjs.org/@vercel/node-bridge/-/node-bridge-2.2.2.tgz"
   integrity sha512-haGBC8noyA5BfjCRXRH+VIkHCDVW5iD5UX24P2nOdilwUxI4qWsattS/co8QBGq64XsNLRAMdM5pQUE3zxkF9Q==
 
 "@vue/compiler-core@3.2.36", "@vue/compiler-core@^3.2.23":
@@ -3402,7 +2657,7 @@ acorn-jsx@^5.2.0, acorn-jsx@^5.3.2:
 
 acorn-walk@^8.1.1:
   version "8.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
+  resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
 
 acorn@^6.4.1:
@@ -3412,13 +2667,13 @@ acorn@^6.4.1:
 
 acorn@^8.4.1, acorn@^8.8.0:
   version "8.8.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
+  resolved "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz"
   integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
 
-acorn@^8.5.0:
-  version "8.7.1"
-  resolved "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz"
-  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
+acorn@^8.8.2:
+  version "8.9.0"
+  resolved "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz"
+  integrity sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==
 
 aggregate-error@^3.0.0:
   version "3.1.0"
@@ -3469,7 +2724,7 @@ ajv@^8.0.0, ajv@^8.8.0:
 
 ajv@^8.0.1:
   version "8.11.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.2.tgz#aecb20b50607acf2569b6382167b65a96008bb78"
+  resolved "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz"
   integrity sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==
   dependencies:
     fast-deep-equal "^3.1.1"
@@ -3491,26 +2746,26 @@ ansi-escapes@^4.3.0:
 
 ansi-regex@^5.0.1:
   version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
 ansi-styles@^3.2.1:
   version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"
   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
     color-convert "^1.9.0"
 
 ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
   dependencies:
     color-convert "^2.0.1"
 
 anymatch@^3.1.3, anymatch@~3.1.2:
   version "3.1.3"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
+  resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz"
   integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
   dependencies:
     normalize-path "^3.0.0"
@@ -3518,12 +2773,12 @@ anymatch@^3.1.3, anymatch@~3.1.2:
 
 arch@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11"
+  resolved "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz"
   integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==
 
 arg@^4.1.0:
   version "4.1.3"
-  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
+  resolved "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz"
   integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
 
 argparse@^1.0.7:
@@ -3535,12 +2790,12 @@ argparse@^1.0.7:
 
 argparse@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
 aria-query@^4.2.2:
   version "4.2.2"
-  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b"
+  resolved "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz"
   integrity sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==
   dependencies:
     "@babel/runtime" "^7.10.2"
@@ -3553,7 +2808,7 @@ array-find-index@^1.0.1:
 
 array-includes@^3.1.5, array-includes@^3.1.6:
   version "3.1.6"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f"
+  resolved "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz"
   integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==
   dependencies:
     call-bind "^1.0.2"
@@ -3564,12 +2819,12 @@ array-includes@^3.1.5, array-includes@^3.1.6:
 
 array-union@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
 array.prototype.flat@^1.3.1:
   version "1.3.1"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2"
+  resolved "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz"
   integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==
   dependencies:
     call-bind "^1.0.2"
@@ -3579,7 +2834,7 @@ array.prototype.flat@^1.3.1:
 
 array.prototype.flatmap@^1.3.1:
   version "1.3.1"
-  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183"
+  resolved "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz"
   integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==
   dependencies:
     call-bind "^1.0.2"
@@ -3589,7 +2844,7 @@ array.prototype.flatmap@^1.3.1:
 
 array.prototype.tosorted@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz#ccf44738aa2b5ac56578ffda97c03fd3e23dd532"
+  resolved "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz"
   integrity sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==
   dependencies:
     call-bind "^1.0.2"
@@ -3600,7 +2855,7 @@ array.prototype.tosorted@^1.1.1:
 
 arrify@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  resolved "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"
   integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==
 
 asn1@~0.2.3:
@@ -3617,17 +2872,17 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
 
 ast-types-flow@^0.0.7:
   version "0.0.7"
-  resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
+  resolved "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz"
   integrity sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==
 
 astral-regex@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
+  resolved "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz"
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
 asynckit@^0.4.0:
   version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
   integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
 at-least-node@^1.0.0:
@@ -3637,7 +2892,7 @@ at-least-node@^1.0.0:
 
 autoprefixer@^10.4.13:
   version "10.4.13"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.13.tgz#b5136b59930209a321e9fa3dca2e7c4d223e83a8"
+  resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz"
   integrity sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==
   dependencies:
     browserslist "^4.21.4"
@@ -3649,7 +2904,7 @@ autoprefixer@^10.4.13:
 
 available-typed-arrays@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
+  resolved "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz"
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
 aws-sign2@~0.7.0:
@@ -3664,17 +2919,17 @@ aws4@^1.8.0:
 
 axe-core@^4.4.3:
   version "4.5.2"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.5.2.tgz#823fdf491ff717ac3c58a52631d4206930c1d9f7"
+  resolved "https://registry.npmjs.org/axe-core/-/axe-core-4.5.2.tgz"
   integrity sha512-u2MVsXfew5HBvjsczCv+xlwdNnB1oQR9HlAcsejZttNjKKSkeDNVwB1vMThIUIFI9GoT57Vtk8iQLwqOfAkboA==
 
 axobject-query@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be"
+  resolved "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz"
   integrity sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==
 
 babel-plugin-polyfill-corejs2@^0.3.3:
   version "0.3.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122"
+  resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz"
   integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==
   dependencies:
     "@babel/compat-data" "^7.17.7"
@@ -3683,7 +2938,7 @@ babel-plugin-polyfill-corejs2@^0.3.3:
 
 babel-plugin-polyfill-corejs3@^0.6.0:
   version "0.6.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a"
+  resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz"
   integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==
   dependencies:
     "@babel/helper-define-polyfill-provider" "^0.3.3"
@@ -3691,7 +2946,7 @@ babel-plugin-polyfill-corejs3@^0.6.0:
 
 babel-plugin-polyfill-regenerator@^0.4.1:
   version "0.4.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747"
+  resolved "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz"
   integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==
   dependencies:
     "@babel/helper-define-polyfill-provider" "^0.3.3"
@@ -3714,17 +2969,17 @@ babel-plugin-react-intl@^7.0.0:
 
 balanced-match@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 balanced-match@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz#dc70f920d78db8b858535795867bf48f820633d9"
+  resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz"
   integrity sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==
 
 base64-js@^1.3.1:
   version "1.5.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
 bcrypt-pbkdf@^1.0.0:
@@ -3736,17 +2991,17 @@ bcrypt-pbkdf@^1.0.0:
 
 bcryptjs@^2.4.3:
   version "2.4.3"
-  resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb"
+  resolved "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz"
   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"
+  resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
 bl@^4.0.3:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
+  resolved "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"
   integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
   dependencies:
     buffer "^5.5.0"
@@ -3755,12 +3010,12 @@ bl@^4.0.3:
 
 boolbase@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
+  resolved "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"
   integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
 
 brace-expansion@^1.1.7:
   version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
   integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
@@ -3768,37 +3023,27 @@ brace-expansion@^1.1.7:
 
 brace-expansion@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz"
   integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
   dependencies:
     balanced-match "^1.0.0"
 
 braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
   dependencies:
     fill-range "^7.0.1"
 
-browserslist@^4.0.0:
-  version "4.21.5"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7"
-  integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==
+browserslist@^4.0.0, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.21.5:
+  version "4.21.9"
+  resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.21.9.tgz"
+  integrity sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==
   dependencies:
-    caniuse-lite "^1.0.30001449"
-    electron-to-chromium "^1.4.284"
-    node-releases "^2.0.8"
-    update-browserslist-db "^1.0.10"
-
-browserslist@^4.20.2, browserslist@^4.21.3, browserslist@^4.21.4:
-  version "4.21.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987"
-  integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==
-  dependencies:
-    caniuse-lite "^1.0.30001400"
-    electron-to-chromium "^1.4.251"
-    node-releases "^2.0.6"
-    update-browserslist-db "^1.0.9"
+    caniuse-lite "^1.0.30001503"
+    electron-to-chromium "^1.4.431"
+    node-releases "^2.0.12"
+    update-browserslist-db "^1.0.11"
 
 buble@^0.20.0:
   version "0.20.0"
@@ -3815,7 +3060,7 @@ buble@^0.20.0:
 
 buffer-equal-constant-time@1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
+  resolved "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz"
   integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==
 
 buffer-from@^1.0.0:
@@ -3825,7 +3070,7 @@ buffer-from@^1.0.0:
 
 buffer@^5.5.0:
   version "5.7.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  resolved "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"
   integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
   dependencies:
     base64-js "^1.3.1"
@@ -3833,19 +3078,19 @@ buffer@^5.5.0:
 
 builtin-modules@^3.3.0:
   version "3.3.0"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6"
+  resolved "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz"
   integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==
 
 busboy@1.6.0, busboy@^1.6.0:
   version "1.6.0"
-  resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893"
+  resolved "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz"
   integrity sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==
   dependencies:
     streamsearch "^1.1.0"
 
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"
   integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
   dependencies:
     function-bind "^1.1.1"
@@ -3853,12 +3098,12 @@ call-bind@^1.0.0, call-bind@^1.0.2:
 
 callsites@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
 camelcase-keys@^6.2.2:
   version "6.2.2"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
+  resolved "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz"
   integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==
   dependencies:
     camelcase "^5.3.1"
@@ -3872,12 +3117,12 @@ camelcase@^5.0.0, camelcase@^5.3.1:
 
 camelcase@^6.2.0:
   version "6.3.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
+  resolved "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
 caniuse-api@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
+  resolved "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz"
   integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==
   dependencies:
     browserslist "^4.0.0"
@@ -3885,10 +3130,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.30001400, caniuse-lite@^1.0.30001406, caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001449:
-  version "1.0.30001481"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001481.tgz"
-  integrity sha512-KCqHwRnaa1InZBtqXzP98LPg0ajCVujMKjqKDhZEthIpAsJl/YEIa3YvXjGXPVqzZVguccuu7ga9KOE1J9rKPQ==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001406, caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001503:
+  version "1.0.30001506"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001506.tgz"
+  integrity sha512-6XNEcpygZMCKaufIcgpQNZNf00GEqc7VQON+9Rd0K1bMYo8xhMZRAo5zpbnbMNizi4YNgIDAFrdykWsvY3H4Hw==
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -3914,19 +3159,19 @@ chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
 
 chart.js@^4.2.1:
   version "4.2.1"
-  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-4.2.1.tgz#d2bd5c98e9a0ae35408975b638f40513b067ba1d"
+  resolved "https://registry.npmjs.org/chart.js/-/chart.js-4.2.1.tgz"
   integrity sha512-6YbpQ0nt3NovAgOzbkSSeeAQu/3za1319dPUQTXn9WcOpywM8rGKxJHrhS8V8xEkAlk8YhEfjbuAPfUyp6jIsw==
   dependencies:
     "@kurkle/color" "^0.3.0"
 
 chartjs-adapter-date-fns@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/chartjs-adapter-date-fns/-/chartjs-adapter-date-fns-3.0.0.tgz#c25f63c7f317c1f96f9a7c44bd45eeedb8a478e5"
+  resolved "https://registry.npmjs.org/chartjs-adapter-date-fns/-/chartjs-adapter-date-fns-3.0.0.tgz"
   integrity sha512-Rs3iEB3Q5pJ973J93OBTpnP7qoGwvq3nUnoMdtxO+9aoJof7UFcRbWcIDteXuYd1fgAvct/32T9qaLyLuZVwCg==
 
 chokidar@^3.5.3:
   version "3.5.3"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
+  resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz"
   integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
   dependencies:
     anymatch "~3.1.2"
@@ -3941,12 +3186,12 @@ chokidar@^3.5.3:
 
 chownr@^1.1.1:
   version "1.1.4"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
+  resolved "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"
   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"
+  resolved "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz"
   integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
 
 ci-info@^3.2.0:
@@ -3956,7 +3201,7 @@ ci-info@^3.2.0:
 
 classnames@^2.3.1:
   version "2.3.2"
-  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924"
+  resolved "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz"
   integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==
 
 clean-stack@^2.0.0:
@@ -3995,12 +3240,12 @@ clickhouse@^2.5.0:
 
 client-only@0.0.1:
   version "0.0.1"
-  resolved "https://registry.yarnpkg.com/client-only/-/client-only-0.0.1.tgz#38bba5d403c41ab150bff64a95c85013cf73bca1"
+  resolved "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz"
   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"
+  resolved "https://registry.npmjs.org/clipboardy/-/clipboardy-3.0.0.tgz"
   integrity sha512-Su+uU5sr1jkUy1sGRpLKjKrvEOVXgSgiSInwa/qeID6aJ07yh+5NWc3h2QfjHjBnfX4LhtFcuAWKUsJ3r+fjbg==
   dependencies:
     arch "^2.2.0"
@@ -4009,12 +3254,12 @@ clipboardy@^3.0.0:
 
 cluster-key-slot@1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.1.tgz#10ccb9ded0729464b6d2e7d714b100a2d1259d43"
+  resolved "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.1.tgz"
   integrity sha512-rwHwUfXL40Chm1r08yrhU3qpUvdVlgkKNeyeGPOxnW8/SyVDvgRaed/Uz54AqWNaTCAThlj6QAs3TZcKI0xDEw==
 
 cluster-key-slot@^1.1.0:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz#88ddaa46906e303b5de30d3153b7d9fe0a0c19ac"
+  resolved "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz"
   integrity sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==
 
 color-convert@^1.9.0:
@@ -4026,24 +3271,24 @@ color-convert@^1.9.0:
 
 color-convert@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  resolved "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
   integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
   dependencies:
     color-name "~1.1.4"
 
 color-name@1.1.3:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
   integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
 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"
+  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
   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"
+  resolved "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz"
   integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==
   dependencies:
     color-name "^1.0.0"
@@ -4051,7 +3296,7 @@ color-string@^1.9.0:
 
 color@^4.2.3:
   version "4.2.3"
-  resolved "https://registry.yarnpkg.com/color/-/color-4.2.3.tgz#d781ecb5e57224ee43ea9627560107c0e0c6463a"
+  resolved "https://registry.npmjs.org/color/-/color-4.2.3.tgz"
   integrity sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==
   dependencies:
     color-convert "^2.0.1"
@@ -4067,14 +3312,9 @@ colorette@^1.4.0:
   resolved "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz"
   integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==
 
-colorette@^2.0.16:
-  version "2.0.16"
-  resolved "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz"
-  integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==
-
-colorette@^2.0.19:
+colorette@^2.0.16, colorette@^2.0.19:
   version "2.0.20"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
+  resolved "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz"
   integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
 
 combined-stream@^1.0.6, combined-stream@~1.0.6:
@@ -4091,7 +3331,7 @@ commander@2, commander@^2.20.0, commander@^2.20.3:
 
 commander@2.20.0:
   version "2.20.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
+  resolved "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz"
   integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
 
 commander@8, commander@^8.2.0:
@@ -4101,51 +3341,51 @@ commander@8, commander@^8.2.0:
 
 commander@^7.2.0:
   version "7.2.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
+  resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
 
 commondir@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+  resolved "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"
   integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
 
 concat-map@0.0.1:
   version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
 concat-with-sourcemaps@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e"
+  resolved "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz"
   integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==
   dependencies:
     source-map "^0.6.1"
 
 consola@^2.15.3:
   version "2.15.3"
-  resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550"
+  resolved "https://registry.npmjs.org/consola/-/consola-2.15.3.tgz"
   integrity sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==
 
 convert-source-map@^1.7.0:
   version "1.9.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
+  resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz"
   integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
 
 cookie-es@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/cookie-es/-/cookie-es-1.0.0.tgz#4759684af168dfc54365b2c2dda0a8d7ee1e4865"
+  resolved "https://registry.npmjs.org/cookie-es/-/cookie-es-1.0.0.tgz"
   integrity sha512-mWYvfOLrfEc996hlKcdABeIiPHUPC6DM2QYZdGGOvhOTbA3tjm2eBwqlJpoFdjC89NI4Qt6h0Pu06Mp+1Pj5OQ==
 
 core-js-compat@^3.25.1:
-  version "3.26.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.26.0.tgz#94e2cf8ba3e63800c4956ea298a6473bc9d62b44"
-  integrity sha512-piOX9Go+Z4f9ZiBFLnZ5VrOpBl0h7IGCkiFUN11QTe6LjAvOT3ifL/5TdoizMh99hcGy5SoLyWbapIY/PIb/3A==
+  version "3.31.0"
+  resolved "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.31.0.tgz"
+  integrity sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==
   dependencies:
-    browserslist "^4.21.4"
+    browserslist "^4.21.5"
 
 core-js-pure@^3.25.1:
   version "3.26.1"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.26.1.tgz#653f4d7130c427820dcecd3168b594e8bb095a33"
+  resolved "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.26.1.tgz"
   integrity sha512-VVXcDpp/xJ21KdULRq/lXdLzQAtX7+37LzpyfFM973il0tWSsDEoyzG38G14AjTpK9VTfiNM9jnFauq/CpaWGQ==
 
 core-util-is@1.0.2:
@@ -4163,7 +3403,7 @@ cors@^2.8.5:
 
 cosmiconfig@^7.0.1, cosmiconfig@^7.1.0:
   version "7.1.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6"
+  resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz"
   integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==
   dependencies:
     "@types/parse-json" "^4.0.0"
@@ -4174,7 +3414,7 @@ cosmiconfig@^7.0.1, cosmiconfig@^7.1.0:
 
 cosmiconfig@^8.1.3:
   version "8.1.3"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.1.3.tgz#0e614a118fcc2d9e5afc2f87d53cd09931015689"
+  resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz"
   integrity sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==
   dependencies:
     import-fresh "^3.2.1"
@@ -4184,7 +3424,7 @@ cosmiconfig@^8.1.3:
 
 create-require@^1.1.0:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
+  resolved "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz"
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
 cross-env@^7.0.3:
@@ -4223,19 +3463,19 @@ css-blank-pseudo@^3.0.3:
 
 css-box-model@^1.2.0:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/css-box-model/-/css-box-model-1.2.1.tgz#59951d3b81fd6b2074a62d49444415b0d2b4d7c1"
+  resolved "https://registry.npmjs.org/css-box-model/-/css-box-model-1.2.1.tgz"
   integrity sha512-a7Vr4Q/kd/aw96bnJG332W9V9LkJO69JRcaCYDUqjp6/z0w6VcZjgAcTbgFxEPfBgdnAwlh3iwu+hLopa+flJw==
   dependencies:
     tiny-invariant "^1.0.6"
 
 css-declaration-sorter@^6.3.1:
   version "6.4.0"
-  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz#630618adc21724484b3e9505bce812def44000ad"
+  resolved "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz"
   integrity sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew==
 
 css-functions-list@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.1.0.tgz#cf5b09f835ad91a00e5959bcfc627cd498e1321b"
+  resolved "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.1.0.tgz"
   integrity sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w==
 
 css-has-pseudo@^3.0.4:
@@ -4252,7 +3492,7 @@ css-prefers-color-scheme@^6.0.3:
 
 css-select@^4.1.3:
   version "4.3.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b"
+  resolved "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz"
   integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==
   dependencies:
     boolbase "^1.0.0"
@@ -4263,7 +3503,7 @@ css-select@^4.1.3:
 
 css-select@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-5.1.0.tgz#b8ebd6554c3637ccc76688804ad3f6a6fdaea8a6"
+  resolved "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz"
   integrity sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==
   dependencies:
     boolbase "^1.0.0"
@@ -4274,7 +3514,7 @@ css-select@^5.1.0:
 
 css-tree@^1.1.2, css-tree@^1.1.3:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d"
+  resolved "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz"
   integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==
   dependencies:
     mdn-data "2.0.14"
@@ -4282,7 +3522,7 @@ css-tree@^1.1.2, css-tree@^1.1.3:
 
 css-tree@^2.2.1:
   version "2.3.1"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20"
+  resolved "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz"
   integrity sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==
   dependencies:
     mdn-data "2.0.30"
@@ -4290,7 +3530,7 @@ css-tree@^2.2.1:
 
 css-tree@~2.2.0:
   version "2.2.1"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.2.1.tgz#36115d382d60afd271e377f9c5f67d02bd48c032"
+  resolved "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz"
   integrity sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==
   dependencies:
     mdn-data "2.0.28"
@@ -4298,27 +3538,27 @@ css-tree@~2.2.0:
 
 css-what@^6.0.1, css-what@^6.1.0:
   version "6.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
+  resolved "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz"
   integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
 
 cssdb@^7.1.0:
   version "7.2.1"
-  resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-7.2.1.tgz#f6f59e2c4249bcb5ca5606fc4ab6f9a808d55486"
+  resolved "https://registry.npmjs.org/cssdb/-/cssdb-7.2.1.tgz"
   integrity sha512-btohrCpVaLqOoMt90aumHe6HU4c06duiYA8ymwtpGfwuZAhWKDBve/c2k+E85Jeq5iojPkeonqiKV+aLeY8QlA==
 
 cssesc@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
+  resolved "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz"
   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"
+  resolved "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz"
   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"
+  resolved "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz"
   integrity sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==
   dependencies:
     css-declaration-sorter "^6.3.1"
@@ -4353,12 +3593,12 @@ cssnano-preset-default@^5.2.14:
 
 cssnano-utils@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861"
+  resolved "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz"
   integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==
 
 cssnano@^5.0.1:
   version "5.1.15"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.15.tgz#ded66b5480d5127fcb44dac12ea5a983755136bf"
+  resolved "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz"
   integrity sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==
   dependencies:
     cssnano-preset-default "^5.2.14"
@@ -4367,14 +3607,14 @@ cssnano@^5.0.1:
 
 csso@^4.2.0:
   version "4.2.0"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529"
+  resolved "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz"
   integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==
   dependencies:
     css-tree "^1.1.2"
 
 csso@^5.0.5:
   version "5.0.5"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-5.0.5.tgz#f9b7fe6cc6ac0b7d90781bb16d5e9874303e2ca6"
+  resolved "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz"
   integrity sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==
   dependencies:
     css-tree "~2.2.0"
@@ -4386,7 +3626,7 @@ csstype@^2.6.8:
 
 csstype@^3.0.2:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.1.tgz#841b532c45c758ee546a11d5bd7b7b473c8c30b9"
+  resolved "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz"
   integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==
 
 currently-unhandled@^0.4.1:
@@ -4474,7 +3714,7 @@ d3-zoom@^2.0.0:
 
 damerau-levenshtein@^1.0.8:
   version "1.0.8"
-  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"
+  resolved "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz"
   integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==
 
 dashdash@^1.12.0:
@@ -4486,26 +3726,21 @@ dashdash@^1.12.0:
 
 data-uri-to-buffer@^4.0.0:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz#d8feb2b2881e6a4f58c2e08acfd0e2834e26222e"
+  resolved "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz"
   integrity sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==
 
 date-fns-tz@^1.1.4:
   version "1.3.8"
-  resolved "https://registry.yarnpkg.com/date-fns-tz/-/date-fns-tz-1.3.8.tgz#083e3a4e1f19b7857fa0c18deea6c2bc46ded7b9"
+  resolved "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.8.tgz"
   integrity sha512-qwNXUFtMHTTU6CFSFjoJ80W8Fzzp24LntbjFFBgL/faqds4e5mo9mftoRLgr3Vi1trISsg4awSpYVsOQCRnapQ==
 
-date-fns@^2.23.0:
+date-fns@^2.23.0, date-fns@^2.29.3:
   version "2.30.0"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0"
+  resolved "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz"
   integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==
   dependencies:
     "@babel/runtime" "^7.21.0"
 
-date-fns@^2.29.3:
-  version "2.29.3"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
-  integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==
-
 dateformat@^5.0.3:
   version "5.0.3"
   resolved "https://registry.npmjs.org/dateformat/-/dateformat-5.0.3.tgz"
@@ -4518,7 +3753,7 @@ debounce@^1.2.1:
 
 debug@^3.2.7:
   version "3.2.7"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
   dependencies:
     ms "^2.1.1"
@@ -4532,7 +3767,7 @@ debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
 
 decamelize-keys@^1.1.0:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8"
+  resolved "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz"
   integrity sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==
   dependencies:
     decamelize "^1.1.0"
@@ -4540,24 +3775,24 @@ decamelize-keys@^1.1.0:
 
 decamelize@^1.1.0, decamelize@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
   integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
 decompress-response@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
+  resolved "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz"
   integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==
   dependencies:
     mimic-response "^3.1.0"
 
 deep-extend@^0.6.0:
   version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  resolved "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"
   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"
+  resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
 deepmerge@^2.1.1:
@@ -4567,12 +3802,12 @@ deepmerge@^2.1.1:
 
 deepmerge@^4.2.2, deepmerge@^4.3.1:
   version "4.3.1"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
+  resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz"
   integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
 
 define-properties@^1.1.3, define-properties@^1.1.4:
   version "1.1.4"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"
+  resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz"
   integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==
   dependencies:
     has-property-descriptors "^1.0.0"
@@ -4580,12 +3815,12 @@ define-properties@^1.1.3, define-properties@^1.1.4:
 
 defu@^6.0.0, defu@^6.1.0, defu@^6.1.2:
   version "6.1.2"
-  resolved "https://registry.yarnpkg.com/defu/-/defu-6.1.2.tgz#1217cba167410a1765ba93893c6dbac9ed9d9e5c"
+  resolved "https://registry.npmjs.org/defu/-/defu-6.1.2.tgz"
   integrity sha512-+uO4+qr7msjNNWKYPHqN/3+Dx3NFkmIzayk2L1MyZQlvgZb/J1A0fo410dpKrN2SnqFjt8n4JL8fDJE0wIgjFQ==
 
 del@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/del/-/del-5.1.0.tgz#d9487c94e367410e6eff2925ee58c0c84a75b3a7"
+  resolved "https://registry.npmjs.org/del/-/del-5.1.0.tgz"
   integrity sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==
   dependencies:
     globby "^10.0.1"
@@ -4613,17 +3848,17 @@ del@^6.0.0:
 
 delayed-stream@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
   integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
 denque@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/denque/-/denque-2.1.0.tgz#e93e1a6569fb5e66f16a3c2a2964617d349d6ab1"
+  resolved "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz"
   integrity sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==
 
 destr@^1.1.1, destr@^1.2.0, destr@^1.2.2:
   version "1.2.2"
-  resolved "https://registry.yarnpkg.com/destr/-/destr-1.2.2.tgz#7ba9befcafb645a50e76b260449c63927b51e22f"
+  resolved "https://registry.npmjs.org/destr/-/destr-1.2.2.tgz"
   integrity sha512-lrbCJwD9saUQrqUfXvl6qoM+QN3W7tLV5pAOs+OqOmopCCz/JkE05MHedJR1xfk4IAnZuJXPVuN5+7jNA2ZCiA==
 
 detect-browser@^5.2.0:
@@ -4638,38 +3873,38 @@ detect-indent@^6.0.0:
 
 detect-libc@^2.0.0, detect-libc@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd"
+  resolved "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz"
   integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==
 
 diff@^4.0.1:
   version "4.0.2"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
+  resolved "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz"
   integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
 
 dir-glob@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"
   integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
   dependencies:
     path-type "^4.0.0"
 
 doctrine@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+  resolved "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz"
   integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
   dependencies:
     esutils "^2.0.2"
 
 doctrine@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
+  resolved "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"
   integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
   dependencies:
     esutils "^2.0.2"
 
 dom-serializer@^1.0.1:
   version "1.4.1"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30"
+  resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz"
   integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==
   dependencies:
     domelementtype "^2.0.1"
@@ -4678,7 +3913,7 @@ dom-serializer@^1.0.1:
 
 dom-serializer@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53"
+  resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz"
   integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==
   dependencies:
     domelementtype "^2.3.0"
@@ -4687,26 +3922,26 @@ dom-serializer@^2.0.0:
 
 domelementtype@^2.0.1, domelementtype@^2.2.0, domelementtype@^2.3.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
+  resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz"
   integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
 
 domhandler@^4.2.0, domhandler@^4.3.1:
   version "4.3.1"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c"
+  resolved "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz"
   integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==
   dependencies:
     domelementtype "^2.2.0"
 
 domhandler@^5.0.1, domhandler@^5.0.2:
   version "5.0.3"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31"
+  resolved "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz"
   integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==
   dependencies:
     domelementtype "^2.3.0"
 
 domutils@^2.8.0:
   version "2.8.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
+  resolved "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz"
   integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
   dependencies:
     dom-serializer "^1.0.1"
@@ -4715,7 +3950,7 @@ domutils@^2.8.0:
 
 domutils@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c"
+  resolved "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz"
   integrity sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==
   dependencies:
     dom-serializer "^2.0.0"
@@ -4737,34 +3972,29 @@ ecc-jsbn@~0.1.1:
 
 ecdsa-sig-formatter@1.0.11:
   version "1.0.11"
-  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"
+  resolved "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz"
   integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==
   dependencies:
     safe-buffer "^5.0.1"
 
-electron-to-chromium@^1.4.251:
-  version "1.4.284"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592"
-  integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
-
-electron-to-chromium@^1.4.284:
-  version "1.4.368"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.368.tgz#75901f97d3e23da2e66feb1e61fbb8e70ac96430"
-  integrity sha512-e2aeCAixCj9M7nJxdB/wDjO6mbYX+lJJxSJCXDzlr5YPGYVofuJwGN9nKg2o6wWInjX6XmxRinn3AeJMK81ltw==
+electron-to-chromium@^1.4.431:
+  version "1.4.436"
+  resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.436.tgz"
+  integrity sha512-aktOxo8fnrMC8vOIBMVS3PXbT1nrPQ+SouUuN7Y0a+Rw3pOMrvIV92Ybnax7x4tugA+ZpYA5fOHTby7ama8OQQ==
 
 emoji-regex@^8.0.0:
   version "8.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
 emoji-regex@^9.2.2:
   version "9.2.2"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
+  resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz"
   integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
 
 end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"
   integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
   dependencies:
     once "^1.4.0"
@@ -4778,29 +4008,29 @@ enquirer@^2.3.6:
 
 entities@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
+  resolved "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"
   integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
 entities@^4.2.0:
   version "4.5.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
+  resolved "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz"
   integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
 
 entities@^4.4.0:
   version "4.4.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174"
+  resolved "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz"
   integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
 
 error-ex@^1.3.1:
   version "1.3.2"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.19.0, es-abstract@^1.20.4:
+es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.20.4:
   version "1.21.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.1.tgz#e6105a099967c08377830a0c9cb589d570dd86c6"
+  resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz"
   integrity sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==
   dependencies:
     available-typed-arrays "^1.0.5"
@@ -4837,44 +4067,14 @@ es-abstract@^1.19.0, es-abstract@^1.20.4:
     unbox-primitive "^1.0.2"
     which-typed-array "^1.1.9"
 
-es-abstract@^1.19.1:
-  version "1.20.4"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.4.tgz#1d103f9f8d78d4cf0713edcd6d0ed1a46eed5861"
-  integrity sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==
-  dependencies:
-    call-bind "^1.0.2"
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    function.prototype.name "^1.1.5"
-    get-intrinsic "^1.1.3"
-    get-symbol-description "^1.0.0"
-    has "^1.0.3"
-    has-property-descriptors "^1.0.0"
-    has-symbols "^1.0.3"
-    internal-slot "^1.0.3"
-    is-callable "^1.2.7"
-    is-negative-zero "^2.0.2"
-    is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.2"
-    is-string "^1.0.7"
-    is-weakref "^1.0.2"
-    object-inspect "^1.12.2"
-    object-keys "^1.1.1"
-    object.assign "^4.1.4"
-    regexp.prototype.flags "^1.4.3"
-    safe-regex-test "^1.0.0"
-    string.prototype.trimend "^1.0.5"
-    string.prototype.trimstart "^1.0.5"
-    unbox-primitive "^1.0.2"
-
 es-module-lexer@^1.0.5:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.2.1.tgz#ba303831f63e6a394983fde2f97ad77b22324527"
+  resolved "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.2.1.tgz"
   integrity sha512-9978wrXM50Y4rTMmW5kXIC09ZdXQZqkE4mxhwkd8VbzsGkXGPgV4zWuqQJgCEzYngdo2dYDa0l8xhX4fkSwJSg==
 
 es-set-tostringtag@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8"
+  resolved "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz"
   integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==
   dependencies:
     get-intrinsic "^1.1.3"
@@ -4883,14 +4083,14 @@ es-set-tostringtag@^2.0.1:
 
 es-shim-unscopables@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241"
+  resolved "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz"
   integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==
   dependencies:
     has "^1.0.3"
 
 es-to-primitive@^1.2.1:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+  resolved "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"
   integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
   dependencies:
     is-callable "^1.1.4"
@@ -4899,7 +4099,7 @@ es-to-primitive@^1.2.1:
 
 esbuild@^0.17.17:
   version "0.17.19"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.19.tgz#087a727e98299f0462a3d0bcdd9cd7ff100bd955"
+  resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.17.19.tgz"
   integrity sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==
   optionalDependencies:
     "@esbuild/android-arm" "0.17.19"
@@ -4927,22 +4127,22 @@ esbuild@^0.17.17:
 
 escalade@^3.1.1:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"
   integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
 escape-string-regexp@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
   integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
 escape-string-regexp@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
 eslint-config-next@^12.2.4:
   version "12.3.4"
-  resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-12.3.4.tgz#3d4d9e74b919b879c4cc79c61bdc388fb2b964ee"
+  resolved "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-12.3.4.tgz"
   integrity sha512-WuT3gvgi7Bwz00AOmKGhOeqnyA5P29Cdyr0iVjLyfDbk+FANQKcOjFUTZIdyYfe5Tq1x4TGcmoe4CwctGvFjHQ==
   dependencies:
     "@next/eslint-plugin-next" "12.3.4"
@@ -4957,7 +4157,7 @@ eslint-config-next@^12.2.4:
 
 eslint-config-prettier@^8.5.0:
   version "8.8.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz#bfda738d412adc917fd7b038857110efe98c9348"
+  resolved "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz"
   integrity sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==
 
 eslint-import-resolver-alias@^1.1.2:
@@ -4967,7 +4167,7 @@ eslint-import-resolver-alias@^1.1.2:
 
 eslint-import-resolver-node@^0.3.6, eslint-import-resolver-node@^0.3.7:
   version "0.3.7"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz#83b375187d412324a1963d84fa664377a23eb4d7"
+  resolved "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz"
   integrity sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==
   dependencies:
     debug "^3.2.7"
@@ -4976,7 +4176,7 @@ eslint-import-resolver-node@^0.3.6, eslint-import-resolver-node@^0.3.7:
 
 eslint-import-resolver-typescript@^2.7.1:
   version "2.7.1"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.7.1.tgz#a90a4a1c80da8d632df25994c4c5fdcdd02b8751"
+  resolved "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.7.1.tgz"
   integrity sha512-00UbgGwV8bSgUv34igBDbTOtKhqoRMy9bFjNehT40bXg6585PNIct8HhXZ0SybqB9rWtXj9crcku8ndDn/gIqQ==
   dependencies:
     debug "^4.3.4"
@@ -4987,14 +4187,14 @@ eslint-import-resolver-typescript@^2.7.1:
 
 eslint-module-utils@^2.7.4:
   version "2.7.4"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz#4f3e41116aaf13a20792261e61d3a2e7e0583974"
+  resolved "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz"
   integrity sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==
   dependencies:
     debug "^3.2.7"
 
 eslint-plugin-import@^2.26.0:
   version "2.27.5"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz#876a6d03f52608a3e5bb439c2550588e51dd6c65"
+  resolved "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz"
   integrity sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==
   dependencies:
     array-includes "^3.1.6"
@@ -5015,7 +4215,7 @@ eslint-plugin-import@^2.26.0:
 
 eslint-plugin-jsx-a11y@^6.5.1:
   version "6.6.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.6.1.tgz#93736fc91b83fdc38cc8d115deedfc3091aef1ff"
+  resolved "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.6.1.tgz"
   integrity sha512-sXgFVNHiWffBq23uiS/JaP6eVR622DqwB4yTzKvGZGcPq6/yZ3WmOZfuBks/vHWo9GaFOqC2ZK4i6+C35knx7Q==
   dependencies:
     "@babel/runtime" "^7.18.9"
@@ -5041,12 +4241,12 @@ eslint-plugin-prettier@^4.0.0:
 
 eslint-plugin-react-hooks@^4.5.0:
   version "4.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3"
+  resolved "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz"
   integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==
 
 eslint-plugin-react@^7.31.7:
   version "7.31.11"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.31.11.tgz#011521d2b16dcf95795df688a4770b4eaab364c8"
+  resolved "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.31.11.tgz"
   integrity sha512-TTvq5JsT5v56wPa9OYHzsrOlHzKZKjV+aLgS+55NJP/cuzdiQPC7PfYoUjMoxlffKtvijpk7vA/jmuqRb9nohw==
   dependencies:
     array-includes "^3.1.6"
@@ -5067,7 +4267,7 @@ eslint-plugin-react@^7.31.7:
 
 eslint-scope@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+  resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"
   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
   dependencies:
     esrecurse "^4.3.0"
@@ -5075,7 +4275,7 @@ eslint-scope@^5.1.1:
 
 eslint-scope@^7.2.0:
   version "7.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.0.tgz#f21ebdafda02352f103634b96dd47d9f81ca117b"
+  resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz"
   integrity sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==
   dependencies:
     esrecurse "^4.3.0"
@@ -5083,12 +4283,12 @@ eslint-scope@^7.2.0:
 
 eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
   version "3.4.1"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994"
+  resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz"
   integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
 
 eslint@^8.33.0:
   version "8.42.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.42.0.tgz#7bebdc3a55f9ed7167251fe7259f75219cade291"
+  resolved "https://registry.npmjs.org/eslint/-/eslint-8.42.0.tgz"
   integrity sha512-ulg9Ms6E1WPf67PHaEY4/6E2tEn5/f7FXGzr3t9cBMugOmf1INYvuUwwh1aXQN4MfJ6a5K2iNwP3w4AColvI9A==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
@@ -5133,7 +4333,7 @@ eslint@^8.33.0:
 
 espree@^9.5.2:
   version "9.5.2"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.2.tgz#e994e7dc33a082a7a82dceaf12883a829353215b"
+  resolved "https://registry.npmjs.org/espree/-/espree-9.5.2.tgz"
   integrity sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==
   dependencies:
     acorn "^8.8.0"
@@ -5147,21 +4347,21 @@ esprima@^4.0.0:
 
 esquery@^1.4.2:
   version "1.5.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
+  resolved "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz"
   integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
   dependencies:
     estraverse "^5.1.0"
 
 esrecurse@^4.3.0:
   version "4.3.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  resolved "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"
   integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
   dependencies:
     estraverse "^5.2.0"
 
 estraverse@^4.1.1:
   version "4.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  resolved "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
 estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
@@ -5171,7 +4371,7 @@ estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
 
 estree-walker@^0.6.1:
   version "0.6.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
+  resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz"
   integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==
 
 estree-walker@^1.0.1:
@@ -5181,27 +4381,27 @@ estree-walker@^1.0.1:
 
 estree-walker@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
+  resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz"
   integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
 
 esutils@^2.0.2:
   version "2.0.3"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"
   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"
+  resolved "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"
   integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
 
 eventemitter3@^4.0.4:
   version "4.0.7"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+  resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"
   integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
 
 execa@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
+  resolved "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz"
   integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
   dependencies:
     cross-spawn "^7.0.3"
@@ -5216,7 +4416,7 @@ execa@^5.1.1:
 
 expand-template@^2.0.3:
   version "2.0.3"
-  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
+  resolved "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz"
   integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
 
 extend@~3.0.2:
@@ -5257,7 +4457,7 @@ extsprintf@^1.2.0:
 
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-diff@^1.1.2:
@@ -5267,12 +4467,12 @@ fast-diff@^1.1.2:
 
 fast-equals@^3.0.1:
   version "3.0.3"
-  resolved "https://registry.yarnpkg.com/fast-equals/-/fast-equals-3.0.3.tgz#8e6cb4e51ca1018d87dd41982ef92758b3e4197f"
+  resolved "https://registry.npmjs.org/fast-equals/-/fast-equals-3.0.3.tgz"
   integrity sha512-NCe8qxnZFARSHGztGMZOO/PC1qa5MIFB5Hp66WdzbCRAz8U8US3bx1UTgLS49efBQPcUtO9gf5oVEY8o7y/7Kg==
 
-fast-glob@^3.0.3, fast-glob@^3.2.12, fast-glob@^3.2.9:
+fast-glob@^3.0.3, fast-glob@^3.2.12, fast-glob@^3.2.7, fast-glob@^3.2.9:
   version "3.2.12"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
+  resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz"
   integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
@@ -5281,42 +4481,31 @@ fast-glob@^3.0.3, fast-glob@^3.2.12, fast-glob@^3.2.9:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
-fast-glob@^3.2.7:
-  version "3.2.11"
-  resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz"
-  integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
-  dependencies:
-    "@nodelib/fs.stat" "^2.0.2"
-    "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.2"
-    merge2 "^1.3.0"
-    micromatch "^4.0.4"
-
 fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
 fast-levenshtein@^2.0.6:
   version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
 fastest-levenshtein@^1.0.16:
   version "1.0.16"
-  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
+  resolved "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz"
   integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
 
 fastq@^1.6.0:
   version "1.15.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a"
+  resolved "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz"
   integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==
   dependencies:
     reusify "^1.0.4"
 
 fetch-blob@^3.1.2, fetch-blob@^3.1.4:
   version "3.2.0"
-  resolved "https://registry.yarnpkg.com/fetch-blob/-/fetch-blob-3.2.0.tgz#f09b8d4bbd45adc6f0c20b7e787e793e309dcce9"
+  resolved "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz"
   integrity sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==
   dependencies:
     node-domexception "^1.0.0"
@@ -5324,21 +4513,21 @@ fetch-blob@^3.1.2, fetch-blob@^3.1.4:
 
 file-entry-cache@^6.0.1:
   version "6.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
+  resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"
   integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
   dependencies:
     flat-cache "^3.0.4"
 
 fill-range@^7.0.1:
   version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"
   integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
   dependencies:
     to-regex-range "^5.0.1"
 
 find-up@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  resolved "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"
   integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
   dependencies:
     locate-path "^5.0.0"
@@ -5346,7 +4535,7 @@ find-up@^4.1.0:
 
 find-up@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  resolved "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz"
   integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
   dependencies:
     locate-path "^6.0.0"
@@ -5354,7 +4543,7 @@ find-up@^5.0.0:
 
 flat-cache@^3.0.4:
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
+  resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"
   integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
   dependencies:
     flatted "^3.1.0"
@@ -5367,17 +4556,17 @@ flat@^5.0.0:
 
 flatted@^3.1.0:
   version "3.2.7"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
+  resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz"
   integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
 
 follow-redirects@^1.15.2:
   version "1.15.2"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
+  resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"
   integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
 
 for-each@^0.3.3:
   version "0.3.3"
-  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
+  resolved "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz"
   integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
   dependencies:
     is-callable "^1.1.3"
@@ -5398,7 +4587,7 @@ form-data@~2.3.2:
 
 formdata-polyfill@^4.0.10:
   version "4.0.10"
-  resolved "https://registry.yarnpkg.com/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz#24807c31c9d402e002ab3d8c720144ceb8848423"
+  resolved "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz"
   integrity sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==
   dependencies:
     fetch-blob "^3.1.2"
@@ -5423,7 +4612,7 @@ fraction.js@^4.2.0:
 
 fs-constants@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+  resolved "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz"
   integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
 
 fs-extra@10, fs-extra@^10.0.0, fs-extra@^10.0.1:
@@ -5437,7 +4626,7 @@ fs-extra@10, fs-extra@^10.0.0, fs-extra@^10.0.1:
 
 fs-extra@^11.0.0:
   version "11.1.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d"
+  resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz"
   integrity sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==
   dependencies:
     graceful-fs "^4.2.0"
@@ -5456,19 +4645,19 @@ fs-extra@^9.0.0:
 
 fs-memo@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/fs-memo/-/fs-memo-1.2.0.tgz#a2ec3be606b902077adbb37ec529c5ec5fb2e037"
+  resolved "https://registry.npmjs.org/fs-memo/-/fs-memo-1.2.0.tgz"
   integrity sha512-YEexkCpL4j03jn5SxaMHqcO6IuWuqm8JFUYhyCep7Ao89JIYmB8xoKhK7zXXJ9cCaNXpyNH5L3QtAmoxjoHW2w==
 
 fs-minipass@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
+  resolved "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz"
   integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
   dependencies:
     minipass "^3.0.0"
 
 fs.realpath@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
 fsevents@~2.3.2:
@@ -5478,12 +4667,12 @@ fsevents@~2.3.2:
 
 function-bind@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
 function.prototype.name@^1.1.5:
   version "1.1.5"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
+  resolved "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz"
   integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
   dependencies:
     call-bind "^1.0.2"
@@ -5493,29 +4682,29 @@ function.prototype.name@^1.1.5:
 
 functions-have-names@^1.2.2:
   version "1.2.3"
-  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
+  resolved "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
 generic-names@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/generic-names/-/generic-names-4.0.0.tgz#0bd8a2fd23fe8ea16cbd0a279acd69c06933d9a3"
+  resolved "https://registry.npmjs.org/generic-names/-/generic-names-4.0.0.tgz"
   integrity sha512-ySFolZQfw9FoDb3ed9d80Cm9f0+r7qj+HJkWjeD9RBfpxEVTlVhol+gvaQB/78WbwYfbnNh8nWHHBSlg072y6A==
   dependencies:
     loader-utils "^3.2.0"
 
 generic-pool@3.9.0:
   version "3.9.0"
-  resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-3.9.0.tgz#36f4a678e963f4fdb8707eab050823abc4e8f5e4"
+  resolved "https://registry.npmjs.org/generic-pool/-/generic-pool-3.9.0.tgz"
   integrity sha512-hymDOu5B53XvN4QT9dBmZxPX4CWhBPPLguTZ9MMFeFa/Kg0xWVfylOVNlJji/E7yTZWFd/q9GO5TxDLq156D7g==
 
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  resolved "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
 get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385"
+  resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz"
   integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==
   dependencies:
     function-bind "^1.1.1"
@@ -5529,24 +4718,24 @@ get-own-enumerable-property-symbols@^3.0.0:
 
 get-port-please@^2.6.1:
   version "2.6.1"
-  resolved "https://registry.yarnpkg.com/get-port-please/-/get-port-please-2.6.1.tgz#80143de24fcaab39b01df977f66ad967e06b17d1"
+  resolved "https://registry.npmjs.org/get-port-please/-/get-port-please-2.6.1.tgz"
   integrity sha512-4PDSrL6+cuMM1xs6w36ZIkaKzzE0xzfVBCfebHIJ3FE8iB9oic/ECwPw3iNiD4h1AoJ5XLLBhEviFAVrZsDC5A==
   dependencies:
     fs-memo "^1.2.0"
 
 get-port-please@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/get-port-please/-/get-port-please-3.0.1.tgz#a24953a41dc249f76869ac25e81d6623e61ab010"
+  resolved "https://registry.npmjs.org/get-port-please/-/get-port-please-3.0.1.tgz"
   integrity sha512-R5pcVO8Z1+pVDu8Ml3xaJCEkBiiy1VQN9za0YqH8GIi1nIqD4IzQhzY6dDzMRtdS1lyiGlucRzm8IN8wtLIXng==
 
 get-stream@^6.0.0:
   version "6.0.1"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
+  resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
 get-symbol-description@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
+  resolved "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz"
   integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
   dependencies:
     call-bind "^1.0.2"
@@ -5561,31 +4750,26 @@ getpass@^0.1.1:
 
 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"
+  resolved "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz"
   integrity sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==
 
 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"
+  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
     is-glob "^4.0.1"
 
 glob-parent@^6.0.2:
   version "6.0.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz"
   integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
   dependencies:
     is-glob "^4.0.3"
 
-glob-to-regexp@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
-  integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
-
 glob@7.1.7:
   version "7.1.7"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
+  resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"
   integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
   dependencies:
     fs.realpath "^1.0.0"
@@ -5597,7 +4781,7 @@ glob@7.1.7:
 
 glob@^7.1.3, glob@^7.1.6, glob@^7.2.0:
   version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
   dependencies:
     fs.realpath "^1.0.0"
@@ -5609,7 +4793,7 @@ glob@^7.1.3, glob@^7.1.6, glob@^7.2.0:
 
 glob@^8.0.3:
   version "8.1.0"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
+  resolved "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz"
   integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
   dependencies:
     fs.realpath "^1.0.0"
@@ -5620,14 +4804,14 @@ glob@^8.0.3:
 
 global-modules@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
+  resolved "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz"
   integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
   dependencies:
     global-prefix "^3.0.0"
 
 global-prefix@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97"
+  resolved "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz"
   integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==
   dependencies:
     ini "^1.3.5"
@@ -5636,31 +4820,31 @@ global-prefix@^3.0.0:
 
 globals@^11.1.0:
   version "11.12.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
 globals@^13.19.0:
   version "13.20.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82"
+  resolved "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz"
   integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==
   dependencies:
     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"
+  resolved "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz"
   integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
   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"
+  resolved "https://registry.npmjs.org/globalyzer/-/globalyzer-0.1.0.tgz"
   integrity sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==
 
 globby@^10.0.1:
   version "10.0.2"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543"
+  resolved "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz"
   integrity sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==
   dependencies:
     "@types/glob" "^7.1.1"
@@ -5686,49 +4870,39 @@ globby@^11.0.1, globby@^11.0.4, globby@^11.1.0:
 
 globjoin@^0.1.4:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43"
+  resolved "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz"
   integrity sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==
 
 globrex@^0.1.2:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098"
+  resolved "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz"
   integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==
 
 gopd@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
+  resolved "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz"
   integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
   dependencies:
     get-intrinsic "^1.1.3"
 
-graceful-fs@^4.1.15:
-  version "4.2.9"
-  resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz"
-  integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
-
-graceful-fs@^4.1.2, graceful-fs@^4.2.4:
-  version "4.2.10"
-  resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"
-  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
-
-graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2:
+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:
   version "4.2.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
 grapheme-splitter@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
+  resolved "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz"
   integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
 
 graphemer@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+  resolved "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz"
   integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
 
 h3@^1.6.6:
   version "1.6.6"
-  resolved "https://registry.yarnpkg.com/h3/-/h3-1.6.6.tgz#f7da8517ae3bf906716975e38f2d3c24ab79a239"
+  resolved "https://registry.npmjs.org/h3/-/h3-1.6.6.tgz"
   integrity sha512-DWu2s11OuuO9suEkX99dXaJoxd1RgPXiM4iDmLdrhGV63GLoav13f3Kdd5/Rw7xNKzhzn2+F2dleQjG66SnMPQ==
   dependencies:
     cookie-es "^1.0.0"
@@ -5754,82 +4928,82 @@ har-validator@~5.1.0:
 
 hard-rejection@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
+  resolved "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz"
   integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
 
 has-bigints@^1.0.1, has-bigints@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
+  resolved "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz"
   integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
 
 has-flag@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"
   integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
 
 has-flag@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
 has-property-descriptors@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
+  resolved "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"
   integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
   dependencies:
     get-intrinsic "^1.1.1"
 
 has-proto@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
+  resolved "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz"
   integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
 
 has-symbols@^1.0.2, has-symbols@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
+  resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"
   integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
 
 has-tostringtag@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
+  resolved "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz"
   integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
   dependencies:
     has-symbols "^1.0.2"
 
 has@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz"
   integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
   dependencies:
     function-bind "^1.1.1"
 
 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"
+  resolved "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz"
   integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
   dependencies:
     react-is "^16.7.0"
 
 hosted-git-info@^2.1.4:
   version "2.8.9"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz"
   integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
 hosted-git-info@^4.0.1:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
+  resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz"
   integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
   dependencies:
     lru-cache "^6.0.0"
 
 html-tags@^3.2.0:
   version "3.2.0"
-  resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.2.0.tgz#dbb3518d20b726524e4dd43de397eb0a95726961"
+  resolved "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz"
   integrity sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==
 
 http-shutdown@^1.2.2:
   version "1.2.2"
-  resolved "https://registry.yarnpkg.com/http-shutdown/-/http-shutdown-1.2.2.tgz#41bc78fc767637c4c95179bc492f312c0ae64c5f"
+  resolved "https://registry.npmjs.org/http-shutdown/-/http-shutdown-1.2.2.tgz"
   integrity sha512-S9wWkJ/VSY9/k4qcjG318bqJNruzE4HySUhFYknwmu6LBP97KLLfwNf+n4V1BHurvFNkSKLFnK/RsuUnRTf9Vw==
 
 http-signature@~1.2.0:
@@ -5843,7 +5017,7 @@ http-signature@~1.2.0:
 
 human-signals@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
+  resolved "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
 husky@^7.0.0:
@@ -5853,44 +5027,44 @@ husky@^7.0.0:
 
 icss-replace-symbols@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
+  resolved "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz"
   integrity sha512-chIaY3Vh2mh2Q3RGXttaDIzeiPvaVXJ+C4DAh/w3c37SKZ/U6PGMmuicR2EQQp9bKG8zLMCl7I+PtIoOOPp8Gg==
 
 icss-utils@^5.0.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
+  resolved "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz"
   integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
 
 ieee754@^1.1.13:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
 ignore@^5.1.1, ignore@^5.2.0, ignore@^5.2.1:
   version "5.2.4"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
+  resolved "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz"
   integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
 
 image-meta@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/image-meta/-/image-meta-0.1.1.tgz#a84dc7d5f61c7d60e85ec0c3ac81beee8646039b"
+  resolved "https://registry.npmjs.org/image-meta/-/image-meta-0.1.1.tgz"
   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"
+  resolved "https://registry.npmjs.org/immer/-/immer-9.0.21.tgz"
   integrity sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==
 
 import-cwd@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-3.0.0.tgz#20845547718015126ea9b3676b7592fb8bd4cf92"
+  resolved "https://registry.npmjs.org/import-cwd/-/import-cwd-3.0.0.tgz"
   integrity sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==
   dependencies:
     import-from "^3.0.0"
 
 import-fresh@^3.0.0, import-fresh@^3.2.1:
   version "3.3.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
+  resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
   dependencies:
     parent-module "^1.0.0"
@@ -5898,29 +5072,29 @@ import-fresh@^3.0.0, import-fresh@^3.2.1:
 
 import-from@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/import-from/-/import-from-3.0.0.tgz#055cfec38cd5a27d8057ca51376d7d3bf0891966"
+  resolved "https://registry.npmjs.org/import-from/-/import-from-3.0.0.tgz"
   integrity sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==
   dependencies:
     resolve-from "^5.0.0"
 
 import-lazy@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153"
+  resolved "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz"
   integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==
 
 imurmurhash@^0.1.4:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"
   integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
 
 indent-string@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+  resolved "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
 inflight@^1.0.4:
   version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
   integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
   dependencies:
     once "^1.3.0"
@@ -5928,17 +5102,17 @@ inflight@^1.0.4:
 
 inherits@2, inherits@^2.0.3, inherits@^2.0.4:
   version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
 ini@^1.3.5, ini@~1.3.0:
   version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  resolved "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
 internal-slot@^1.0.3, internal-slot@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.4.tgz#8551e7baf74a7a6ba5f749cfb16aa60722f0d6f3"
+  resolved "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz"
   integrity sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==
   dependencies:
     get-intrinsic "^1.1.3"
@@ -5977,7 +5151,7 @@ intl-messageformat@9.13.0:
 
 ioredis@^5.3.2:
   version "5.3.2"
-  resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-5.3.2.tgz#9139f596f62fc9c72d873353ac5395bcf05709f7"
+  resolved "https://registry.npmjs.org/ioredis/-/ioredis-5.3.2.tgz"
   integrity sha512-1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA==
   dependencies:
     "@ioredis/commands" "^1.1.1"
@@ -5992,7 +5166,7 @@ ioredis@^5.3.2:
 
 ip-regex@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-5.0.0.tgz#cd313b2ae9c80c07bd3851e12bf4fa4dc5480632"
+  resolved "https://registry.npmjs.org/ip-regex/-/ip-regex-5.0.0.tgz"
   integrity sha512-fOCG6lhoKKakwv+C6KdsOnGvgXnmgfmp0myi3bcNwj3qfwPAxRKWEuFhvEFF7ceYIz6+1jRZ+yguLFAmUNPEfw==
 
 ipaddr.js@^2.0.1:
@@ -6002,7 +5176,7 @@ ipaddr.js@^2.0.1:
 
 ipx@^0.9.11:
   version "0.9.11"
-  resolved "https://registry.yarnpkg.com/ipx/-/ipx-0.9.11.tgz#89bbeffc6f62df80dfd0f8fe1e68c6638d09251c"
+  resolved "https://registry.npmjs.org/ipx/-/ipx-0.9.11.tgz"
   integrity sha512-/wsBt7hV8rvNR6O4kwgOUAhtm0F/M/mXaolXot/Bz7fdOD+W7i9OtWuoASWv1PFwwtOunhZGaoCx8BOpSdG2VQ==
   dependencies:
     consola "^2.15.3"
@@ -6019,12 +5193,12 @@ ipx@^0.9.11:
 
 iron-webcrypto@^0.7.0:
   version "0.7.0"
-  resolved "https://registry.yarnpkg.com/iron-webcrypto/-/iron-webcrypto-0.7.0.tgz#781262e56127404c4e49e5e150a49408d3dec30f"
+  resolved "https://registry.npmjs.org/iron-webcrypto/-/iron-webcrypto-0.7.0.tgz"
   integrity sha512-WkX32iTcwd79ZsWRPP5wq1Jq6XXfPwO783ZiUBY8uMw4/AByx5WvBmxvYGnpVt6AOVJ0F41Qo420r8lIneT9Wg==
 
 is-array-buffer@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.1.tgz#deb1db4fcae48308d54ef2442706c0393997052a"
+  resolved "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz"
   integrity sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==
   dependencies:
     call-bind "^1.0.2"
@@ -6033,31 +5207,31 @@ is-array-buffer@^3.0.1:
 
 is-arrayish@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
   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"
+  resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz"
   integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
 
 is-bigint@^1.0.1:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
+  resolved "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz"
   integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
   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"
+  resolved "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"
   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"
+  resolved "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz"
   integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==
   dependencies:
     call-bind "^1.0.2"
@@ -6065,14 +5239,14 @@ is-boolean-object@^1.1.0:
 
 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"
+  resolved "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz"
   integrity sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==
   dependencies:
     builtin-modules "^3.3.0"
 
 is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
   version "1.2.7"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
+  resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
 is-ci@^3.0.1:
@@ -6082,30 +5256,30 @@ is-ci@^3.0.1:
   dependencies:
     ci-info "^3.2.0"
 
-is-core-module@^2.11.0, is-core-module@^2.5.0, is-core-module@^2.8.1:
+is-core-module@^2.11.0, is-core-module@^2.5.0:
   version "2.11.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
+  resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz"
   integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
   dependencies:
     has "^1.0.3"
 
 is-core-module@^2.9.0:
   version "2.12.1"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd"
+  resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz"
   integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==
   dependencies:
     has "^1.0.3"
 
 is-date-object@^1.0.1:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
+  resolved "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz"
   integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
   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"
+  resolved "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz"
   integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
 
 is-docker@^3.0.0:
@@ -6115,17 +5289,17 @@ is-docker@^3.0.0:
 
 is-extglob@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"
   integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
 is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   version "4.0.3"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"
   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
   dependencies:
     is-extglob "^2.1.1"
@@ -6137,24 +5311,24 @@ is-localhost-ip@^1.4.0:
 
 is-module@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
+  resolved "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz"
   integrity sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==
 
 is-negative-zero@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
+  resolved "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz"
   integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
 
 is-number-object@^1.0.4:
   version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"
+  resolved "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz"
   integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==
   dependencies:
     has-tostringtag "^1.0.0"
 
 is-number@^7.0.0:
   version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
 is-obj@^1.0.1:
@@ -6174,7 +5348,7 @@ is-path-inside@^3.0.1, is-path-inside@^3.0.2, is-path-inside@^3.0.3:
 
 is-plain-obj@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"
   integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==
 
 is-plain-obj@^2.0.0:
@@ -6184,24 +5358,24 @@ is-plain-obj@^2.0.0:
 
 is-plain-object@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
+  resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz"
   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"
+  resolved "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz"
   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"
+  resolved "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz"
   integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==
   dependencies:
     "@types/estree" "*"
 
 is-regex@^1.1.4:
   version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
+  resolved "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz"
   integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
   dependencies:
     call-bind "^1.0.2"
@@ -6214,33 +5388,33 @@ is-regexp@^1.0.0:
 
 is-shared-array-buffer@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
+  resolved "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz"
   integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
   dependencies:
     call-bind "^1.0.2"
 
 is-stream@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
+  resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"
   integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
 
 is-string@^1.0.5, is-string@^1.0.7:
   version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
+  resolved "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz"
   integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
   dependencies:
     has-tostringtag "^1.0.0"
 
 is-symbol@^1.0.2, is-symbol@^1.0.3:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
+  resolved "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz"
   integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
   dependencies:
     has-symbols "^1.0.2"
 
 is-typed-array@^1.1.10, is-typed-array@^1.1.9:
   version "1.1.10"
-  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f"
+  resolved "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz"
   integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==
   dependencies:
     available-typed-arrays "^1.0.5"
@@ -6256,26 +5430,26 @@ is-typedarray@^1.0.0, is-typedarray@~1.0.0:
 
 is-weakref@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
+  resolved "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz"
   integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
   dependencies:
     call-bind "^1.0.2"
 
 is-wsl@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
+  resolved "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz"
   integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
   dependencies:
     is-docker "^2.0.0"
 
 isbot@^3.4.5:
   version "3.6.10"
-  resolved "https://registry.yarnpkg.com/isbot/-/isbot-3.6.10.tgz#7b66334e81794f0461794debb567975cf08eaf2b"
+  resolved "https://registry.npmjs.org/isbot/-/isbot-3.6.10.tgz"
   integrity sha512-+I+2998oyP4oW9+OTQD8TS1r9P6wv10yejukj+Ksj3+UR5pUhsZN3f8W7ysq0p1qxpOVNbl5mCuv0bCaF8y5iQ==
 
 isexe@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
 isstream@~0.1.2:
@@ -6294,12 +5468,12 @@ jest-worker@^26.2.1:
 
 joycon@^3.1.1:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/joycon/-/joycon-3.1.1.tgz#bce8596d6ae808f8b68168f5fc69280996894f03"
+  resolved "https://registry.npmjs.org/joycon/-/joycon-3.1.1.tgz"
   integrity sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==
 
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 js-yaml@^3.13.1:
@@ -6312,7 +5486,7 @@ js-yaml@^3.13.1:
 
 js-yaml@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz"
   integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
   dependencies:
     argparse "^2.0.1"
@@ -6324,12 +5498,12 @@ jsbn@~0.1.0:
 
 jsesc@^2.5.1:
   version "2.5.2"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
 jsesc@~0.5.0:
   version "0.5.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+  resolved "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"
   integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
 
 json-parse-better-errors@^1.0.1:
@@ -6339,17 +5513,17 @@ json-parse-better-errors@^1.0.1:
 
 json-parse-even-better-errors@^2.3.0:
   version "2.3.1"
-  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+  resolved "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
 
 json-schema-traverse@^0.4.1:
   version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"
   integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
 json-schema-traverse@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
+  resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"
   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
 json-schema@0.4.0:
@@ -6359,7 +5533,7 @@ json-schema@0.4.0:
 
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+  resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
   integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
 json-stable-stringify@^1.0.1:
@@ -6376,29 +5550,29 @@ json-stringify-safe@~5.0.1:
 
 json5@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
+  resolved "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz"
   integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2, json5@^2.2.1:
+json5@^2.1.2:
   version "2.2.1"
   resolved "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz"
   integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
 
 json5@^2.2.2:
   version "2.2.3"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
 jsonc-parser@^3.2.0:
   version "3.2.0"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
+  resolved "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz"
   integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
 
 jsonfile@^6.0.1:
   version "6.1.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+  resolved "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz"
   integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
   dependencies:
     universalify "^2.0.0"
@@ -6417,7 +5591,7 @@ jsonparse@^1.2.0:
 
 jsonwebtoken@^9.0.0:
   version "9.0.0"
-  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz#d0faf9ba1cc3a56255fe49c0961a67e520c1926d"
+  resolved "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz"
   integrity sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==
   dependencies:
     jws "^3.2.2"
@@ -6437,7 +5611,7 @@ jsprim@^1.2.2:
 
 "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.2:
   version "3.3.3"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz#76b3e6e6cece5c69d49a5792c3d01bd1a0cdc7ea"
+  resolved "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz"
   integrity sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==
   dependencies:
     array-includes "^3.1.5"
@@ -6445,7 +5619,7 @@ jsprim@^1.2.2:
 
 jwa@^1.4.1:
   version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
+  resolved "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz"
   integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==
   dependencies:
     buffer-equal-constant-time "1.0.1"
@@ -6454,7 +5628,7 @@ jwa@^1.4.1:
 
 jws@^3.2.2:
   version "3.2.2"
-  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
+  resolved "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz"
   integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==
   dependencies:
     jwa "^1.4.1"
@@ -6462,12 +5636,12 @@ jws@^3.2.2:
 
 kafkajs@^2.1.0:
   version "2.2.4"
-  resolved "https://registry.yarnpkg.com/kafkajs/-/kafkajs-2.2.4.tgz#59e6e16459d87fdf8b64be73970ed5aa42370a5b"
+  resolved "https://registry.npmjs.org/kafkajs/-/kafkajs-2.2.4.tgz"
   integrity sha512-j/YeapB1vfPT2iOIUn/vxdyKEuhuY2PxMBvf5JWux6iSaukAccrMtXEY/Lb7OvavDhOWME589bpLrEdnVHjfjA==
 
 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"
+  resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
 kleur@^3.0.3:
@@ -6477,24 +5651,24 @@ kleur@^3.0.3:
 
 known-css-properties@^0.26.0:
   version "0.26.0"
-  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.26.0.tgz#008295115abddc045a9f4ed7e2a84dc8b3a77649"
+  resolved "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.26.0.tgz"
   integrity sha512-5FZRzrZzNTBruuurWpvZnvP9pum+fe0HcK8z/ooo+U+Hmp4vtbyp1/QDsqmufirXy4egGzbaH/y2uCZf+6W5Kg==
 
 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"
+  resolved "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz"
   integrity sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==
 
 language-tags@^1.0.5:
   version "1.0.6"
-  resolved "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.6.tgz#c087cc42cd92eb71f0925e9e271d4f8be5a93430"
+  resolved "https://registry.npmjs.org/language-tags/-/language-tags-1.0.6.tgz"
   integrity sha512-HNkaCgM8wZgE/BZACeotAAgpL9FUjEnhgF0FVQMIgH//zqTPreLYMb3rWYkYAqPoF75Jwuycp1da7uz66cfFQg==
   dependencies:
     language-subtag-registry "^0.3.20"
 
 levn@^0.4.1:
   version "0.4.1"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+  resolved "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz"
   integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
   dependencies:
     prelude-ls "^1.2.1"
@@ -6502,12 +5676,12 @@ levn@^0.4.1:
 
 lilconfig@^2.0.3, lilconfig@^2.0.5:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52"
+  resolved "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz"
   integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==
 
 lines-and-columns@^1.1.6:
   version "1.2.4"
-  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
+  resolved "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
 lint-staged@^11.0.0:
@@ -6532,7 +5706,7 @@ lint-staged@^11.0.0:
 
 listhen@^0.2.15:
   version "0.2.15"
-  resolved "https://registry.yarnpkg.com/listhen/-/listhen-0.2.15.tgz#1af0f47f94a09d5f3ba4efa5a4b07df65198bb59"
+  resolved "https://registry.npmjs.org/listhen/-/listhen-0.2.15.tgz"
   integrity sha512-F/IWj/aJLeokHAIVY+l3JoWRUnbRaf2F0cr+Ybc1YyozMA/yP0C2nf3c0Oi7vAbFvtfiwfWWfP7bIrQc/u5L1A==
   dependencies:
     clipboardy "^3.0.0"
@@ -6545,7 +5719,7 @@ listhen@^0.2.15:
 
 listhen@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/listhen/-/listhen-1.0.4.tgz#29a177da59322a7ebdf88768d13d2e555e8fc43e"
+  resolved "https://registry.npmjs.org/listhen/-/listhen-1.0.4.tgz"
   integrity sha512-r94k7kmXHb8e8wpv7+UP/qqhhD+j/9TgX19QKim2cEJuWCLwlTw+5BkCFmYyjhQ7Bt8KdVun/2DcD7MF2Fe3+g==
   dependencies:
     clipboardy "^3.0.0"
@@ -6593,19 +5767,19 @@ load-json-file@^6.2.0:
 
 loader-utils@^3.2.0:
   version "3.2.1"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.2.1.tgz#4fb104b599daafd82ef3e1a41fb9265f87e1f576"
+  resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz"
   integrity sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==
 
 locate-path@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  resolved "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"
   integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
   dependencies:
     p-locate "^4.1.0"
 
 locate-path@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  resolved "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz"
   integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
   dependencies:
     p-locate "^5.0.0"
@@ -6617,32 +5791,32 @@ lodash-es@^4.17.21:
 
 lodash.camelcase@^4.3.0:
   version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+  resolved "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz"
   integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==
 
 lodash.debounce@^4.0.8:
   version "4.0.8"
-  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  resolved "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"
   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"
+  resolved "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz"
   integrity sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==
 
 lodash.isarguments@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
+  resolved "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz"
   integrity sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==
 
 lodash.memoize@^4.1.2:
   version "4.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
+  resolved "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz"
   integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==
 
 lodash.merge@^4.6.2:
   version "4.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
 lodash.mergewith@^4.6.2:
@@ -6657,12 +5831,12 @@ lodash.pick@^4.4.0:
 
 lodash.truncate@^4.4.2:
   version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
+  resolved "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz"
   integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==
 
 lodash.uniq@^4.5.0:
   version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+  resolved "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"
   integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==
 
 lodash@4.17.21, lodash@^4.17.21:
@@ -6682,7 +5856,7 @@ log-update@^4.0.0:
 
 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"
+  resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"
   integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
@@ -6697,21 +5871,21 @@ loud-rejection@^2.2.0:
 
 lru-cache@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"
   integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
   dependencies:
     yallist "^3.0.2"
 
 lru-cache@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"
   integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
   dependencies:
     yallist "^4.0.0"
 
 lru-cache@^9.1.1:
   version "9.1.2"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-9.1.2.tgz#255fdbc14b75589d6d0e73644ca167a8db506835"
+  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-9.1.2.tgz"
   integrity sha512-ERJq3FOzJTxBbFjZ7iDs+NiK4VI9Wz+RdrrAB8dio1oV+YvdPzUEE4QNiT2VD51DkIbCYRUUzCRkssXCHqSnKQ==
 
 magic-string@^0.25.0, magic-string@^0.25.7:
@@ -6723,14 +5897,14 @@ magic-string@^0.25.0, magic-string@^0.25.7:
 
 magic-string@^0.27.0:
   version "0.27.0"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.27.0.tgz#e4a3413b4bab6d98d2becffd48b4a257effdbbf3"
+  resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz"
   integrity sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==
   dependencies:
     "@jridgewell/sourcemap-codec" "^1.4.13"
 
 magic-string@^0.30.0:
   version "0.30.0"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.0.tgz#fd58a4748c5c4547338a424e90fa5dd17f4de529"
+  resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz"
   integrity sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==
   dependencies:
     "@jridgewell/sourcemap-codec" "^1.4.13"
@@ -6744,27 +5918,27 @@ make-dir@^3.0.0:
 
 make-error@^1.1.1:
   version "1.3.6"
-  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
+  resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
 map-obj@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+  resolved "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
   integrity sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==
 
 map-obj@^4.0.0:
   version "4.3.0"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
+  resolved "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz"
   integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
 
 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"
+  resolved "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
 maxmind@^4.3.6:
   version "4.3.11"
-  resolved "https://registry.yarnpkg.com/maxmind/-/maxmind-4.3.11.tgz#9ea22675b9068a4c98cbc3493ba298485915b440"
+  resolved "https://registry.npmjs.org/maxmind/-/maxmind-4.3.11.tgz"
   integrity sha512-tJDrKbUzN6PSA88tWgg0L2R4Ln00XwecYQJPFI+RvlF2k1sx6VQYtuQ1SVxm8+bw5tF7GWV4xyb+3/KyzEpPUw==
   dependencies:
     mmdb-lib "2.0.2"
@@ -6772,22 +5946,22 @@ maxmind@^4.3.6:
 
 mdn-data@2.0.14:
   version "2.0.14"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
+  resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz"
   integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
 
 mdn-data@2.0.28:
   version "2.0.28"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.28.tgz#5ec48e7bef120654539069e1ae4ddc81ca490eba"
+  resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz"
   integrity sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==
 
 mdn-data@2.0.30:
   version "2.0.30"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc"
+  resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz"
   integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==
 
 "memoize-one@>=3.1.1 <6", memoize-one@^5.1.1:
   version "5.2.1"
-  resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e"
+  resolved "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz"
   integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==
 
 memorystream@^0.3.1:
@@ -6814,7 +5988,7 @@ meow@^6.1.0:
 
 meow@^9.0.0:
   version "9.0.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364"
+  resolved "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz"
   integrity sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==
   dependencies:
     "@types/minimist" "^1.2.0"
@@ -6832,22 +6006,22 @@ meow@^9.0.0:
 
 merge-stream@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  resolved "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
 merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1:
   version "1.4.1"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  resolved "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"
   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"
+  resolved "https://registry.npmjs.org/micro-memoize/-/micro-memoize-4.1.2.tgz"
   integrity sha512-+HzcV2H+rbSJzApgkj0NdTakkC+bnyeiUxgT6/m7mjcz1CmM22KYFKp+EVj1sWe4UYcnriJr5uqHQD/gMHLD+g==
 
 micromatch@^4.0.4, micromatch@^4.0.5:
   version "4.0.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
+  resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
   dependencies:
     braces "^3.0.2"
@@ -6855,7 +6029,7 @@ micromatch@^4.0.4, micromatch@^4.0.5:
 
 mime-db@1.52.0:
   version "1.52.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
 mime-types@^2.1.12, mime-types@~2.1.19:
@@ -6867,29 +6041,29 @@ mime-types@^2.1.12, mime-types@~2.1.19:
 
 mimic-fn@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
 mimic-response@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
+  resolved "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz"
   integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
 
 min-indent@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
+  resolved "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
 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"
+  resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"
   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"
+  resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz"
   integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
   dependencies:
     brace-expansion "^2.0.1"
@@ -6903,36 +6077,26 @@ 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.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6:
   version "1.2.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
-minimist@^1.2.5:
-  version "1.2.6"
-  resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz"
-  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
-
-minimist@^1.2.6:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
-  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
-
 minipass@^3.0.0:
   version "3.3.6"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
+  resolved "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz"
   integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
   dependencies:
     yallist "^4.0.0"
 
 minipass@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
+  resolved "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz"
   integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
 
 minizlib@^2.1.1:
   version "2.1.2"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
+  resolved "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz"
   integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
   dependencies:
     minipass "^3.0.0"
@@ -6940,22 +6104,22 @@ minizlib@^2.1.1:
 
 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"
+  resolved "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"
   integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
 
 mkdirp@^1.0.3, mkdirp@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
 mmdb-lib@2.0.2:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/mmdb-lib/-/mmdb-lib-2.0.2.tgz#fe60404142c0456c19607c72caa15821731ae957"
+  resolved "https://registry.npmjs.org/mmdb-lib/-/mmdb-lib-2.0.2.tgz"
   integrity sha512-shi1I+fCPQonhTi7qyb6hr7hi87R7YS69FlfJiMFuJ12+grx0JyL56gLNzGTYXPU7EhAPkMLliGeyHer0K+AVA==
 
 moize@^6.1.0:
   version "6.1.6"
-  resolved "https://registry.yarnpkg.com/moize/-/moize-6.1.6.tgz#ac2e723e74b951875fe2c0c3433405c2b098c3e6"
+  resolved "https://registry.npmjs.org/moize/-/moize-6.1.6.tgz"
   integrity sha512-vSKdIUO61iCmTqhdoIDrqyrtp87nWZUmBPniNjO0fX49wEYmyDO4lvlnFXiGcaH1JLE/s/9HbiK4LSHsbiUY6Q==
   dependencies:
     fast-equals "^3.0.1"
@@ -6963,100 +6127,98 @@ moize@^6.1.0:
 
 moment-timezone@0.5.26:
   version "0.5.26"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.26.tgz#c0267ca09ae84631aa3dc33f65bedbe6e8e0d772"
+  resolved "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.26.tgz"
   integrity sha512-sFP4cgEKTCymBBKgoxZjYzlSovC20Y6J7y3nanDc5RoBIXKlZhoYwBoZGe3flwU6A372AcRwScH8KiwV6zjy1g==
   dependencies:
     moment ">= 2.9.0"
 
 moment-timezone@^0.5.35:
   version "0.5.43"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.43.tgz#3dd7f3d0c67f78c23cd1906b9b2137a09b3c4790"
+  resolved "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz"
   integrity sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==
   dependencies:
     moment "^2.29.4"
 
 "moment@>= 2.9.0", moment@^2.29.4:
   version "2.29.4"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
+  resolved "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz"
   integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
 
 mri@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b"
+  resolved "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz"
   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"
+  resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
 ms@^2.1.1:
   version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
   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"
+  resolved "https://registry.npmjs.org/murmurhash/-/murmurhash-2.0.1.tgz"
   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"
+  resolved "https://registry.npmjs.org/nanoclone/-/nanoclone-0.2.1.tgz"
   integrity sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==
 
 nanoid@^3.3.4, nanoid@^3.3.6:
   version "3.3.6"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
+  resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz"
   integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
 
 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"
+  resolved "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz"
   integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
 
 natural-compare-lite@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"
+  resolved "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz"
   integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==
 
 natural-compare@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
-next-basics@^0.30.0:
-  version "0.30.0"
-  resolved "https://registry.yarnpkg.com/next-basics/-/next-basics-0.30.0.tgz#1d5f1b3bd3cd66218f00ab0390659a819ed274fa"
-  integrity sha512-IWNrBsxM8watkvWHWkUp5PC0WypqeHMEaj5rCufjEfwuIe++ePtDrYgUKY6Se6y6QJWbyHliozCpa1KpVyZHnQ==
+next-basics@^0.31.0:
+  version "0.31.0"
+  resolved "https://registry.npmjs.org/next-basics/-/next-basics-0.31.0.tgz"
+  integrity sha512-uAum7v4DQ37IdqKdmLTFLMyN+ir7FNMeMHQcTd1RQ14sm/fO/tntadlsXulwj/A5xs3gmnW/gfGkLX7VnNjreg==
   dependencies:
     bcryptjs "^2.4.3"
     jsonwebtoken "^9.0.0"
     pure-rand "^6.0.2"
 
-next@13.4.6:
-  version "13.4.6"
-  resolved "https://registry.yarnpkg.com/next/-/next-13.4.6.tgz#ebe52f5c74d60176d45b45e73f25a51103713ea4"
-  integrity sha512-sjVqjxU+U2aXZnYt4Ud6CTLNNwWjdSfMgemGpIQJcN3Z7Jni9xRWbR0ie5fQzCg87aLqQVhKA2ud2gPoqJ9lGw==
+next@13.3.1:
+  version "13.3.1"
+  resolved "https://registry.yarnpkg.com/next/-/next-13.3.1.tgz#17625f7423db2e059d71b41bd9031756cf2b33bc"
+  integrity sha512-eByWRxPzKHs2oQz1yE41LX35umhz86ZSZ+mYyXBqn2IBi2hyUqxBA88avywdr4uyH+hCJczegGsDGWbzQA5Rqw==
   dependencies:
-    "@next/env" "13.4.6"
-    "@swc/helpers" "0.5.1"
+    "@next/env" "13.3.1"
+    "@swc/helpers" "0.5.0"
     busboy "1.6.0"
     caniuse-lite "^1.0.30001406"
     postcss "8.4.14"
     styled-jsx "5.1.1"
-    watchpack "2.4.0"
-    zod "3.21.4"
   optionalDependencies:
-    "@next/swc-darwin-arm64" "13.4.6"
-    "@next/swc-darwin-x64" "13.4.6"
-    "@next/swc-linux-arm64-gnu" "13.4.6"
-    "@next/swc-linux-arm64-musl" "13.4.6"
-    "@next/swc-linux-x64-gnu" "13.4.6"
-    "@next/swc-linux-x64-musl" "13.4.6"
-    "@next/swc-win32-arm64-msvc" "13.4.6"
-    "@next/swc-win32-ia32-msvc" "13.4.6"
-    "@next/swc-win32-x64-msvc" "13.4.6"
+    "@next/swc-darwin-arm64" "13.3.1"
+    "@next/swc-darwin-x64" "13.3.1"
+    "@next/swc-linux-arm64-gnu" "13.3.1"
+    "@next/swc-linux-arm64-musl" "13.3.1"
+    "@next/swc-linux-x64-gnu" "13.3.1"
+    "@next/swc-linux-x64-musl" "13.3.1"
+    "@next/swc-win32-arm64-msvc" "13.3.1"
+    "@next/swc-win32-ia32-msvc" "13.3.1"
+    "@next/swc-win32-x64-msvc" "13.3.1"
 
 nice-try@^1.0.4:
   version "1.0.5"
@@ -7065,41 +6227,41 @@ nice-try@^1.0.4:
 
 node-abi@^3.3.0:
   version "3.45.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.45.0.tgz#f568f163a3bfca5aacfce1fbeee1fa2cc98441f5"
+  resolved "https://registry.npmjs.org/node-abi/-/node-abi-3.45.0.tgz"
   integrity sha512-iwXuFrMAcFVi/ZoZiqq8BzAdsLw9kxDfTC0HMyjXfSL/6CSDAGD5UmR7azrAgWV1zKYq7dUUMj4owusBWKLsiQ==
   dependencies:
     semver "^7.3.5"
 
 node-addon-api@^5.0.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.1.0.tgz#49da1ca055e109a23d537e9de43c09cca21eb762"
+  resolved "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz"
   integrity sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==
 
 node-domexception@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5"
+  resolved "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz"
   integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==
 
 node-fetch-native@^0.1.8:
   version "0.1.8"
-  resolved "https://registry.yarnpkg.com/node-fetch-native/-/node-fetch-native-0.1.8.tgz#19e2eaf6d86ac14e711ebd2612f40517c3468f2a"
+  resolved "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-0.1.8.tgz"
   integrity sha512-ZNaury9r0NxaT2oL65GvdGDy+5PlSaHTovT6JV5tOW07k1TQmgC0olZETa4C9KZg0+6zBr99ctTYa3Utqj9P/Q==
 
 node-fetch-native@^1.1.1, node-fetch-native@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/node-fetch-native/-/node-fetch-native-1.2.0.tgz#13ec6df98f33168958dbfb6945f10aedf42e7ea8"
+  resolved "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.2.0.tgz"
   integrity sha512-5IAMBTl9p6PaAjYCnMv5FmqIF6GcZnawAVnzaCG0rX2aYZJ4CxEkZNtVPuTRug7fL7wyM5BQYTlAzcyMPi6oTQ==
 
 node-fetch@^2.0.0, node-fetch@^2.6.6:
   version "2.6.11"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.11.tgz#cde7fc71deef3131ef80a738919f999e6edfff25"
+  resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz"
   integrity sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==
   dependencies:
     whatwg-url "^5.0.0"
 
 node-fetch@^3.2.8:
   version "3.3.1"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.3.1.tgz#b3eea7b54b3a48020e46f4f88b9c5a7430d20b2e"
+  resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.1.tgz"
   integrity sha512-cRVc/kyto/7E5shrWca1Wsea4y6tL9iYJE5FBCius3JQfb/4P4I295PfhgbJQBLTx6lATE4z+wK0rPM4VS2uow==
   dependencies:
     data-uri-to-buffer "^4.0.0"
@@ -7108,22 +6270,17 @@ node-fetch@^3.2.8:
 
 node-forge@^1, node-forge@^1.3.1:
   version "1.3.1"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
+  resolved "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz"
   integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
 
-node-releases@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
-  integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
-
-node-releases@^2.0.8:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f"
-  integrity sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==
+node-releases@^2.0.12:
+  version "2.0.12"
+  resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.12.tgz"
+  integrity sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==
 
 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"
+  resolved "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.15.0.tgz"
   integrity sha512-LN4fydt9TqhZhThkZIVQnF9cwjU3qmUH9h78Mx/K7d3VvfRqqwthLwJEUOEL0QPZ0XQmNN7be5Ggit5+4dq3Bw==
 
 normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
@@ -7138,7 +6295,7 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
 
 normalize-package-data@^3.0.0:
   version "3.0.3"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
+  resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz"
   integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
   dependencies:
     hosted-git-info "^4.0.1"
@@ -7148,7 +6305,7 @@ normalize-package-data@^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"
+  resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
 normalize-range@^0.1.2:
@@ -7158,7 +6315,7 @@ normalize-range@^0.1.2:
 
 normalize-url@^6.0.1:
   version "6.1.0"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
+  resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz"
   integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
 
 npm-run-all@^4.1.5:
@@ -7178,14 +6335,14 @@ npm-run-all@^4.1.5:
 
 npm-run-path@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
+  resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz"
   integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
   dependencies:
     path-key "^3.0.0"
 
 nth-check@^2.0.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
+  resolved "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz"
   integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==
   dependencies:
     boolbase "^1.0.0"
@@ -7202,17 +6359,17 @@ object-assign@^4, object-assign@^4.1.1:
 
 object-inspect@^1.12.2, object-inspect@^1.9.0:
   version "1.12.3"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
+  resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz"
   integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
 
 object-keys@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
 object.assign@^4.1.3, object.assign@^4.1.4:
   version "4.1.4"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
+  resolved "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz"
   integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
   dependencies:
     call-bind "^1.0.2"
@@ -7222,7 +6379,7 @@ object.assign@^4.1.3, object.assign@^4.1.4:
 
 object.entries@^1.1.6:
   version "1.1.6"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.6.tgz#9737d0e5b8291edd340a3e3264bb8a3b00d5fa23"
+  resolved "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz"
   integrity sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==
   dependencies:
     call-bind "^1.0.2"
@@ -7231,7 +6388,7 @@ object.entries@^1.1.6:
 
 object.fromentries@^2.0.6:
   version "2.0.6"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.6.tgz#cdb04da08c539cffa912dcd368b886e0904bfa73"
+  resolved "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz"
   integrity sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==
   dependencies:
     call-bind "^1.0.2"
@@ -7240,7 +6397,7 @@ object.fromentries@^2.0.6:
 
 object.hasown@^1.1.2:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.2.tgz#f919e21fad4eb38a57bc6345b3afd496515c3f92"
+  resolved "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz"
   integrity sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==
   dependencies:
     define-properties "^1.1.4"
@@ -7248,7 +6405,7 @@ object.hasown@^1.1.2:
 
 object.values@^1.1.6:
   version "1.1.6"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d"
+  resolved "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz"
   integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==
   dependencies:
     call-bind "^1.0.2"
@@ -7257,7 +6414,7 @@ object.values@^1.1.6:
 
 ofetch@^1.0.1:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/ofetch/-/ofetch-1.1.0.tgz#f97ce927b3eb1384ce50fab0f81d039ad452c587"
+  resolved "https://registry.npmjs.org/ofetch/-/ofetch-1.1.0.tgz"
   integrity sha512-yjq2ZUUMto1ITpge2J5vNlUfteLzxfHn9aJC55WtVGD3okKwSfPoLaKpcHXmmKd2kZZUGo+jdkFuuj09Blyeig==
   dependencies:
     destr "^1.2.2"
@@ -7266,7 +6423,7 @@ ofetch@^1.0.1:
 
 ohmyfetch@^0.4.18:
   version "0.4.21"
-  resolved "https://registry.yarnpkg.com/ohmyfetch/-/ohmyfetch-0.4.21.tgz#6850db751fc7bbf08153aa8b11ff1ef45fcfd963"
+  resolved "https://registry.npmjs.org/ohmyfetch/-/ohmyfetch-0.4.21.tgz"
   integrity sha512-VG7f/JRvqvBOYvL0tHyEIEG7XHWm7OqIfAs6/HqwWwDfjiJ1g0huIpe5sFEmyb+7hpFa1EGNH2aERWR72tlClw==
   dependencies:
     destr "^1.2.0"
@@ -7276,7 +6433,7 @@ ohmyfetch@^0.4.18:
 
 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"
+  resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
   integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
   dependencies:
     wrappy "1"
@@ -7290,7 +6447,7 @@ onetime@^5.1.0, onetime@^5.1.2:
 
 optionator@^0.9.1:
   version "0.9.1"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
+  resolved "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz"
   integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
   dependencies:
     deep-is "^0.1.3"
@@ -7302,45 +6459,45 @@ optionator@^0.9.1:
 
 outdent@^0.8.0:
   version "0.8.0"
-  resolved "https://registry.yarnpkg.com/outdent/-/outdent-0.8.0.tgz#2ebc3e77bf49912543f1008100ff8e7f44428eb0"
+  resolved "https://registry.npmjs.org/outdent/-/outdent-0.8.0.tgz"
   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"
+  resolved "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"
   integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
 
 p-limit@^2.2.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"
   integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
   dependencies:
     p-try "^2.0.0"
 
 p-limit@^3.0.2, p-limit@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  resolved "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz"
   integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
   dependencies:
     yocto-queue "^0.1.0"
 
 p-locate@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  resolved "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"
   integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
   dependencies:
     p-limit "^2.2.0"
 
 p-locate@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  resolved "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz"
   integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
   dependencies:
     p-limit "^3.0.2"
 
 p-map@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d"
+  resolved "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz"
   integrity sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==
   dependencies:
     aggregate-error "^3.0.0"
@@ -7354,7 +6511,7 @@ p-map@^4.0.0:
 
 p-queue@^6.6.2:
   version "6.6.2"
-  resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-6.6.2.tgz#2068a9dcf8e67dd0ec3e7a2bcb76810faa85e426"
+  resolved "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz"
   integrity sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==
   dependencies:
     eventemitter3 "^4.0.4"
@@ -7362,19 +6519,19 @@ p-queue@^6.6.2:
 
 p-timeout@^3.2.0:
   version "3.2.0"
-  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe"
+  resolved "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz"
   integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==
   dependencies:
     p-finally "^1.0.0"
 
 p-try@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
 parent-module@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+  resolved "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"
   integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
   dependencies:
     callsites "^3.0.0"
@@ -7389,7 +6546,7 @@ parse-json@^4.0.0:
 
 parse-json@^5.0.0:
   version "5.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
+  resolved "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz"
   integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
@@ -7399,12 +6556,12 @@ parse-json@^5.0.0:
 
 path-exists@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"
   integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
   integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
 path-key@^2.0.1:
@@ -7414,12 +6571,12 @@ path-key@^2.0.1:
 
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
 path-parse@^1.0.7:
   version "1.0.7"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-type@^3.0.0:
@@ -7431,17 +6588,17 @@ path-type@^3.0.0:
 
 path-type@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
 pathe@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/pathe/-/pathe-0.2.0.tgz#30fd7bbe0a0d91f0e60bae621f5d19e9e225c339"
+  resolved "https://registry.npmjs.org/pathe/-/pathe-0.2.0.tgz"
   integrity sha512-sTitTPYnn23esFR3RlqYBWn4c45WGeLcsKzQiUpXJAyfcWkolvlYpV8FLo7JishK946oQwMFUCHXQ9AjGPKExw==
 
 pathe@^0.3.5:
   version "0.3.9"
-  resolved "https://registry.yarnpkg.com/pathe/-/pathe-0.3.9.tgz#4baff768f37f03e3d9341502865fb93116f65191"
+  resolved "https://registry.npmjs.org/pathe/-/pathe-0.3.9.tgz"
   integrity sha512-6Y6s0vT112P3jD8dGfuS6r+lpa0qqNrLyHPOwvXMnyNTQaYiwgau2DP3aNDsR13xqtGj7rrPo+jFUATpU6/s+g==
 
 performance-now@^2.1.0:
@@ -7451,12 +6608,12 @@ performance-now@^2.1.0:
 
 picocolors@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+  resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
 picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.3.1:
   version "2.3.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+  resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
 pidtree@^0.3.0:
@@ -7488,14 +6645,14 @@ please-upgrade-node@^3.2.0:
 
 postcss-attribute-case-insensitive@^5.0.2:
   version "5.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz#03d761b24afc04c09e757e92ff53716ae8ea2741"
+  resolved "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz"
   integrity sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==
   dependencies:
     postcss-selector-parser "^6.0.10"
 
 postcss-calc@^8.2.3:
   version "8.2.4"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.4.tgz#77b9c29bfcbe8a07ff6693dc87050828889739a5"
+  resolved "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz"
   integrity sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==
   dependencies:
     postcss-selector-parser "^6.0.9"
@@ -7510,28 +6667,28 @@ postcss-clamp@^4.1.0:
 
 postcss-color-functional-notation@^4.2.4:
   version "4.2.4"
-  resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz#21a909e8d7454d3612d1659e471ce4696f28caec"
+  resolved "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz"
   integrity sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-color-hex-alpha@^8.0.4:
   version "8.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz#c66e2980f2fbc1a63f5b079663340ce8b55f25a5"
+  resolved "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz"
   integrity sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-color-rebeccapurple@^7.1.1:
   version "7.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz#63fdab91d878ebc4dd4b7c02619a0c3d6a56ced0"
+  resolved "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz"
   integrity sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-colormin@^5.3.1:
   version "5.3.1"
-  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.3.1.tgz#86c27c26ed6ba00d96c79e08f3ffb418d1d1988f"
+  resolved "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz"
   integrity sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==
   dependencies:
     browserslist "^4.21.4"
@@ -7541,7 +6698,7 @@ postcss-colormin@^5.3.1:
 
 postcss-convert-values@^5.1.3:
   version "5.1.3"
-  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz#04998bb9ba6b65aa31035d669a6af342c5f9d393"
+  resolved "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz"
   integrity sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==
   dependencies:
     browserslist "^4.21.4"
@@ -7549,55 +6706,55 @@ postcss-convert-values@^5.1.3:
 
 postcss-custom-media@^8.0.2:
   version "8.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz#c8f9637edf45fef761b014c024cee013f80529ea"
+  resolved "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz"
   integrity sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-custom-properties@^12.1.10:
   version "12.1.11"
-  resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz#d14bb9b3989ac4d40aaa0e110b43be67ac7845cf"
+  resolved "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz"
   integrity sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-custom-selectors@^6.0.3:
   version "6.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz#1ab4684d65f30fed175520f82d223db0337239d9"
+  resolved "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz"
   integrity sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==
   dependencies:
     postcss-selector-parser "^6.0.4"
 
 postcss-dir-pseudo-class@^6.0.5:
   version "6.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz#2bf31de5de76added44e0a25ecf60ae9f7c7c26c"
+  resolved "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz"
   integrity sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==
   dependencies:
     postcss-selector-parser "^6.0.10"
 
 postcss-discard-comments@^5.1.2:
   version "5.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz#8df5e81d2925af2780075840c1526f0660e53696"
+  resolved "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz"
   integrity sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==
 
 postcss-discard-duplicates@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz#9eb4fe8456706a4eebd6d3b7b777d07bad03e848"
+  resolved "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz"
   integrity sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==
 
 postcss-discard-empty@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz#e57762343ff7f503fe53fca553d18d7f0c369c6c"
+  resolved "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz"
   integrity sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==
 
 postcss-discard-overridden@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz#7e8c5b53325747e9d90131bb88635282fb4a276e"
+  resolved "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz"
   integrity sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==
 
 postcss-double-position-gradients@^3.1.2:
   version "3.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz#b96318fdb477be95997e86edd29c6e3557a49b91"
+  resolved "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz"
   integrity sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==
   dependencies:
     "@csstools/postcss-progressive-custom-properties" "^1.1.0"
@@ -7636,19 +6793,19 @@ postcss-font-variant@^5.0.0:
 
 postcss-gap-properties@^3.0.5:
   version "3.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz#f7e3cddcf73ee19e94ccf7cb77773f9560aa2fff"
+  resolved "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz"
   integrity sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==
 
 postcss-image-set-function@^4.0.7:
   version "4.0.7"
-  resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz#08353bd756f1cbfb3b6e93182c7829879114481f"
+  resolved "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz"
   integrity sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-import@^15.1.0:
   version "15.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-15.1.0.tgz#41c64ed8cc0e23735a9698b3249ffdbf704adc70"
+  resolved "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz"
   integrity sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==
   dependencies:
     postcss-value-parser "^4.0.0"
@@ -7662,7 +6819,7 @@ postcss-initial@^4.0.1:
 
 postcss-lab-function@^4.2.1:
   version "4.2.1"
-  resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz#6fe4c015102ff7cd27d1bd5385582f67ebdbdc98"
+  resolved "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz"
   integrity sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==
   dependencies:
     "@csstools/postcss-progressive-custom-properties" "^1.1.0"
@@ -7670,7 +6827,7 @@ postcss-lab-function@^4.2.1:
 
 postcss-load-config@^3.0.0:
   version "3.1.4"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.4.tgz#1ab2571faf84bb078877e1d07905eabe9ebda855"
+  resolved "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz"
   integrity sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==
   dependencies:
     lilconfig "^2.0.5"
@@ -7688,12 +6845,12 @@ postcss-media-minmax@^5.0.0:
 
 postcss-media-query-parser@^0.2.3:
   version "0.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244"
+  resolved "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz"
   integrity sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==
 
 postcss-merge-longhand@^5.1.7:
   version "5.1.7"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz#24a1bdf402d9ef0e70f568f39bdc0344d568fb16"
+  resolved "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz"
   integrity sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==
   dependencies:
     postcss-value-parser "^4.2.0"
@@ -7701,7 +6858,7 @@ postcss-merge-longhand@^5.1.7:
 
 postcss-merge-rules@^5.1.4:
   version "5.1.4"
-  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz#2f26fa5cacb75b1402e213789f6766ae5e40313c"
+  resolved "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz"
   integrity sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==
   dependencies:
     browserslist "^4.21.4"
@@ -7711,14 +6868,14 @@ postcss-merge-rules@^5.1.4:
 
 postcss-minify-font-values@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz#f1df0014a726083d260d3bd85d7385fb89d1f01b"
+  resolved "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz"
   integrity sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-minify-gradients@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz#f1fe1b4f498134a5068240c2f25d46fcd236ba2c"
+  resolved "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz"
   integrity sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==
   dependencies:
     colord "^2.9.1"
@@ -7727,7 +6884,7 @@ postcss-minify-gradients@^5.1.1:
 
 postcss-minify-params@^5.1.4:
   version "5.1.4"
-  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz#c06a6c787128b3208b38c9364cfc40c8aa5d7352"
+  resolved "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz"
   integrity sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==
   dependencies:
     browserslist "^4.21.4"
@@ -7736,19 +6893,19 @@ postcss-minify-params@^5.1.4:
 
 postcss-minify-selectors@^5.2.1:
   version "5.2.1"
-  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz#d4e7e6b46147b8117ea9325a915a801d5fe656c6"
+  resolved "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz"
   integrity sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==
   dependencies:
     postcss-selector-parser "^6.0.5"
 
 postcss-modules-extract-imports@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
+  resolved "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz"
   integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
 
 postcss-modules-local-by-default@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"
+  resolved "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz"
   integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==
   dependencies:
     icss-utils "^5.0.0"
@@ -7757,21 +6914,21 @@ postcss-modules-local-by-default@^4.0.0:
 
 postcss-modules-scope@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06"
+  resolved "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz"
   integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==
   dependencies:
     postcss-selector-parser "^6.0.4"
 
 postcss-modules-values@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c"
+  resolved "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz"
   integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==
   dependencies:
     icss-utils "^5.0.0"
 
 postcss-modules@^4.0.0:
   version "4.3.1"
-  resolved "https://registry.yarnpkg.com/postcss-modules/-/postcss-modules-4.3.1.tgz#517c06c09eab07d133ae0effca2c510abba18048"
+  resolved "https://registry.npmjs.org/postcss-modules/-/postcss-modules-4.3.1.tgz"
   integrity sha512-ItUhSUxBBdNamkT3KzIZwYNNRFKmkJrofvC2nWab3CPKhYBQ1f27XXh1PAPE27Psx58jeelPsxWB/+og+KEH0Q==
   dependencies:
     generic-names "^4.0.0"
@@ -7785,7 +6942,7 @@ postcss-modules@^4.0.0:
 
 postcss-nesting@^10.2.0:
   version "10.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-10.2.0.tgz#0b12ce0db8edfd2d8ae0aaf86427370b898890be"
+  resolved "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.2.0.tgz"
   integrity sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==
   dependencies:
     "@csstools/selector-specificity" "^2.0.0"
@@ -7793,47 +6950,47 @@ postcss-nesting@^10.2.0:
 
 postcss-normalize-charset@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz#9302de0b29094b52c259e9b2cf8dc0879879f0ed"
+  resolved "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz"
   integrity sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==
 
 postcss-normalize-display-values@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz#72abbae58081960e9edd7200fcf21ab8325c3da8"
+  resolved "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz"
   integrity sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-normalize-positions@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz#ef97279d894087b59325b45c47f1e863daefbb92"
+  resolved "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz"
   integrity sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-normalize-repeat-style@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz#e9eb96805204f4766df66fd09ed2e13545420fb2"
+  resolved "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz"
   integrity sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-normalize-string@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz#411961169e07308c82c1f8c55f3e8a337757e228"
+  resolved "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz"
   integrity sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-normalize-timing-functions@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz#d5614410f8f0b2388e9f240aa6011ba6f52dafbb"
+  resolved "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz"
   integrity sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-normalize-unicode@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz#f67297fca3fea7f17e0d2caa40769afc487aa030"
+  resolved "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz"
   integrity sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==
   dependencies:
     browserslist "^4.21.4"
@@ -7841,7 +6998,7 @@ postcss-normalize-unicode@^5.1.1:
 
 postcss-normalize-url@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz#ed9d88ca82e21abef99f743457d3729a042adcdc"
+  resolved "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz"
   integrity sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==
   dependencies:
     normalize-url "^6.0.1"
@@ -7849,7 +7006,7 @@ postcss-normalize-url@^5.1.0:
 
 postcss-normalize-whitespace@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz#08a1a0d1ffa17a7cc6efe1e6c9da969cc4493cfa"
+  resolved "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz"
   integrity sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==
   dependencies:
     postcss-value-parser "^4.2.0"
@@ -7861,7 +7018,7 @@ postcss-opacity-percentage@^1.1.2:
 
 postcss-ordered-values@^5.1.3:
   version "5.1.3"
-  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz#b6fd2bd10f937b23d86bc829c69e7732ce76ea38"
+  resolved "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz"
   integrity sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==
   dependencies:
     cssnano-utils "^3.1.0"
@@ -7869,7 +7026,7 @@ postcss-ordered-values@^5.1.3:
 
 postcss-overflow-shorthand@^3.0.4:
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz#7ed6486fec44b76f0eab15aa4866cda5d55d893e"
+  resolved "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz"
   integrity sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==
   dependencies:
     postcss-value-parser "^4.2.0"
@@ -7881,14 +7038,14 @@ postcss-page-break@^3.0.4:
 
 postcss-place@^7.0.5:
   version "7.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-7.0.5.tgz#95dbf85fd9656a3a6e60e832b5809914236986c4"
+  resolved "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.5.tgz"
   integrity sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-preset-env@7.8.3:
   version "7.8.3"
-  resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-7.8.3.tgz#2a50f5e612c3149cc7af75634e202a5b2ad4f1e2"
+  resolved "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.3.tgz"
   integrity sha512-T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag==
   dependencies:
     "@csstools/postcss-cascade-layers" "^1.1.1"
@@ -7943,14 +7100,14 @@ postcss-preset-env@7.8.3:
 
 postcss-pseudo-class-any-link@^7.1.6:
   version "7.1.6"
-  resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz#2693b221902da772c278def85a4d9a64b6e617ab"
+  resolved "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz"
   integrity sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==
   dependencies:
     postcss-selector-parser "^6.0.10"
 
 postcss-reduce-initial@^5.1.2:
   version "5.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz#798cd77b3e033eae7105c18c9d371d989e1382d6"
+  resolved "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz"
   integrity sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==
   dependencies:
     browserslist "^4.21.4"
@@ -7958,7 +7115,7 @@ postcss-reduce-initial@^5.1.2:
 
 postcss-reduce-transforms@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz#333b70e7758b802f3dd0ddfe98bb1ccfef96b6e9"
+  resolved "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz"
   integrity sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==
   dependencies:
     postcss-value-parser "^4.2.0"
@@ -7970,47 +7127,39 @@ postcss-replace-overflow-wrap@^4.0.0:
 
 postcss-resolve-nested-selector@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e"
+  resolved "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz"
   integrity sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==
 
 postcss-rtlcss@^4.0.1:
   version "4.0.6"
-  resolved "https://registry.yarnpkg.com/postcss-rtlcss/-/postcss-rtlcss-4.0.6.tgz#86b58d2b4aa95396eb85065c14a679f0602a95d6"
+  resolved "https://registry.npmjs.org/postcss-rtlcss/-/postcss-rtlcss-4.0.6.tgz"
   integrity sha512-YNm6g2Y7Gngqtrpq3GC7cUkzH5Gq7aB+Lw9MSgF9s2ro1BDY7W4zqnd15g2ueatUUpSTg2/F5KDjQoTdjhbAKg==
   dependencies:
     rtlcss "4.1.0"
 
 postcss-safe-parser@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz#bb4c29894171a94bc5c996b9a30317ef402adaa1"
+  resolved "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz"
   integrity sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==
 
 postcss-selector-not@^6.0.1:
   version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz#8f0a709bf7d4b45222793fc34409be407537556d"
+  resolved "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz"
   integrity sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==
   dependencies:
     postcss-selector-parser "^6.0.10"
 
-postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.6:
+postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.6, postcss-selector-parser@^6.0.9:
   version "6.0.11"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc"
+  resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz"
   integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==
   dependencies:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
-postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.9:
-  version "6.0.10"
-  resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz"
-  integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==
-  dependencies:
-    cssesc "^3.0.0"
-    util-deprecate "^1.0.2"
-
 postcss-svgo@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.1.0.tgz#0a317400ced789f233a28826e77523f15857d80d"
+  resolved "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz"
   integrity sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==
   dependencies:
     postcss-value-parser "^4.2.0"
@@ -8018,7 +7167,7 @@ postcss-svgo@^5.1.0:
 
 postcss-unique-selectors@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz#a9f273d1eacd09e9aa6088f4b0507b18b1b541b6"
+  resolved "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz"
   integrity sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==
   dependencies:
     postcss-selector-parser "^6.0.5"
@@ -8028,27 +7177,18 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^
   resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@8.4.14, postcss@^8.1.10:
+postcss@8.4.14:
   version "8.4.14"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf"
+  resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz"
   integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==
   dependencies:
     nanoid "^3.3.4"
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-postcss@^8.4.19:
-  version "8.4.20"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.20.tgz#64c52f509644cecad8567e949f4081d98349dc56"
-  integrity sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==
-  dependencies:
-    nanoid "^3.3.4"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
-
-postcss@^8.4.21:
+postcss@^8.1.10, postcss@^8.4.19, postcss@^8.4.21:
   version "8.4.24"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.24.tgz#f714dba9b2284be3cc07dbd2fc57ee4dc972d2df"
+  resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz"
   integrity sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==
   dependencies:
     nanoid "^3.3.6"
@@ -8057,7 +7197,7 @@ postcss@^8.4.21:
 
 prebuild-install@^7.1.1:
   version "7.1.1"
-  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.1.tgz#de97d5b34a70a0c81334fd24641f2a1702352e45"
+  resolved "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz"
   integrity sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==
   dependencies:
     detect-libc "^2.0.0"
@@ -8075,7 +7215,7 @@ prebuild-install@^7.1.1:
 
 prelude-ls@^1.2.1:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+  resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
 prettier-linter-helpers@^1.0.0:
@@ -8087,24 +7227,24 @@ prettier-linter-helpers@^1.0.0:
 
 prettier@^2.6.2:
   version "2.8.8"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
+  resolved "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz"
   integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
 
 pretty-bytes@^5.6.0:
   version "5.6.0"
-  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
+  resolved "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz"
   integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
 
 prisma@4.15.0:
   version "4.15.0"
-  resolved "https://registry.yarnpkg.com/prisma/-/prisma-4.15.0.tgz#4faa94f0d584828b68468953ff0bc88f37912c8c"
+  resolved "https://registry.npmjs.org/prisma/-/prisma-4.15.0.tgz"
   integrity sha512-iKZZpobPl48gTcSZVawLMQ3lEy6BnXwtoMj7hluoGFYu2kQ6F9LBuBrUyF95zRVnNo8/3KzLXJXJ5TEnLSJFiA==
   dependencies:
     "@prisma/engines" "4.15.0"
 
 promise.series@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/promise.series/-/promise.series-0.2.0.tgz#2cc7ebe959fc3a6619c04ab4dbdc9e452d864bbd"
+  resolved "https://registry.npmjs.org/promise.series/-/promise.series-0.2.0.tgz"
   integrity sha512-VWQJyU2bcDTgZw8kpfBpB/ejZASlCrzwz5f2hjb/zlujOEB4oeiAhHygAWq8ubsX2GVkD4kCU5V2dwOTaCY5EQ==
 
 prompts@2.4.2:
@@ -8126,7 +7266,7 @@ prop-types@^15.7.2, prop-types@^15.8.1:
 
 property-expr@^2.0.4:
   version "2.0.5"
-  resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.5.tgz#278bdb15308ae16af3e3b9640024524f4dc02cb4"
+  resolved "https://registry.npmjs.org/property-expr/-/property-expr-2.0.5.tgz"
   integrity sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA==
 
 psl@^1.1.24:
@@ -8136,7 +7276,7 @@ psl@^1.1.24:
 
 pump@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  resolved "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"
   integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
   dependencies:
     end-of-stream "^1.1.0"
@@ -8149,12 +7289,12 @@ punycode@^1.4.1:
 
 punycode@^2.1.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
+  resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz"
   integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
 
 pure-rand@^6.0.2:
   version "6.0.2"
-  resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.0.2.tgz#a9c2ddcae9b68d736a8163036f088a2781c8b306"
+  resolved "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.2.tgz"
   integrity sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ==
 
 qs@~6.5.2:
@@ -8169,22 +7309,22 @@ querystring@0.2.0:
 
 queue-microtask@^1.2.2:
   version "1.2.3"
-  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
 quick-lru@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
+  resolved "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz"
   integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
 
 radix3@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/radix3/-/radix3-1.0.1.tgz#de0ac16234f8a63288645854a54fc26e45a4a8eb"
+  resolved "https://registry.npmjs.org/radix3/-/radix3-1.0.1.tgz"
   integrity sha512-y+AcwZ3HcUIGc9zGsNVf5+BY/LxL+z+4h4J3/pp8jxSmy1STaCocPS3qrj4tA5ehUSzqtqK+0Aygvz/r/8vy4g==
 
 raf-schd@^4.0.2:
   version "4.0.3"
-  resolved "https://registry.yarnpkg.com/raf-schd/-/raf-schd-4.0.3.tgz#5d6c34ef46f8b2a0e880a8fcdb743efc5bfdbc1a"
+  resolved "https://registry.npmjs.org/raf-schd/-/raf-schd-4.0.3.tgz"
   integrity sha512-tQkJl2GRWh83ui2DiPTJz9wEiMN20syf+5oKfB03yYP7ioZcJwsIK8FjrtLwH1m7C7e+Tt2yYBlrOpdT+dyeIQ==
 
 randombytes@^2.1.0:
@@ -8196,7 +7336,7 @@ randombytes@^2.1.0:
 
 rc@^1.2.7:
   version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  resolved "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
   dependencies:
     deep-extend "^0.6.0"
@@ -8204,22 +7344,20 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-basics@^0.85.0:
-  version "0.85.0"
-  resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.85.0.tgz#407c413e56b004120b5e11074a7d9f17a697c6b7"
-  integrity sha512-RPxYiMdOmlWZXh2tKbUay97lsOFWtNYTzx5Jpcd9IUxBrNzYWgTCgtSHJLHAuycUCDNVepX+do+HdRG3uMkE0Q==
+react-basics@^0.89.0:
+  version "0.89.0"
+  resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.89.0.tgz#672a14448818fc7f20a3f7d73d0340d2165f94f2"
+  integrity sha512-nsYZCCfAjEy/fVt+5te3kQEyqA+4dEFutI9n7ol36eWmWbBJjZXCF1NgSHsosMYN2wlrpsrI7HoMTgL68FQnUg==
   dependencies:
     classnames "^2.3.1"
     date-fns "^2.29.3"
-    react "^18.2.0"
-    react-dom "^18.2.0"
     react-hook-form "^7.34.2"
     react-spring "^9.5.5"
     react-window "^1.8.6"
 
 react-beautiful-dnd@^13.1.0:
   version "13.1.1"
-  resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-13.1.1.tgz#b0f3087a5840920abf8bb2325f1ffa46d8c4d0a2"
+  resolved "https://registry.npmjs.org/react-beautiful-dnd/-/react-beautiful-dnd-13.1.1.tgz"
   integrity sha512-0Lvs4tq2VcrEjEgDXHjT98r+63drkKEgqyxdA7qD3mvKwga6a5SscbdLPO2IExotU1jW8L0Ksdl0Cj2AF67nPQ==
   dependencies:
     "@babel/runtime" "^7.9.2"
@@ -8232,7 +7370,7 @@ react-beautiful-dnd@^13.1.0:
 
 react-dom@^18.2.0:
   version "18.2.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d"
+  resolved "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz"
   integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==
   dependencies:
     loose-envify "^1.1.0"
@@ -8240,7 +7378,7 @@ react-dom@^18.2.0:
 
 react-error-boundary@^4.0.4:
   version "4.0.10"
-  resolved "https://registry.yarnpkg.com/react-error-boundary/-/react-error-boundary-4.0.10.tgz#975cc298e93ab7760d1460b7ea5a7855621e355a"
+  resolved "https://registry.npmjs.org/react-error-boundary/-/react-error-boundary-4.0.10.tgz"
   integrity sha512-pvVKdi77j2OoPHo+p3rorgE43OjDWiqFkaqkJz8sJKK6uf/u8xtzuaVfj5qJ2JnDLIgF1De3zY5AJDijp+LVPA==
   dependencies:
     "@babel/runtime" "^7.12.5"
@@ -8251,9 +7389,9 @@ react-fast-compare@^2.0.1:
   integrity sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==
 
 react-hook-form@^7.34.2:
-  version "7.39.5"
-  resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.39.5.tgz#a4272b60288ef5e1bb42bbb6ba3b36d243ab2879"
-  integrity sha512-OE0HKyz5IPc6svN2wd+e+evidZrw4O4WZWAWYzQVZuHi+hYnHFSLnxOq0ddjbdmaLIsLHut/ab7j72y2QT3+KA==
+  version "7.45.0"
+  resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.45.0.tgz#df2bbc8cee598855a63ba446e0bb06f7c8120ccf"
+  integrity sha512-AbHeZ4ad+0dEIknSW9dBgIwcvRDfZ1O97sgj75WaMdOX0eg8TBiUf9wxzVkIjZbk76BBIE9lmFOzyD4PN80ZQg==
 
 react-intl@^5.24.7:
   version "5.25.1"
@@ -8273,17 +7411,17 @@ react-intl@^5.24.7:
 
 react-is@^16.13.1, react-is@^16.7.0:
   version "16.13.1"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
+  resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
 react-is@^17.0.2:
   version "17.0.2"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
+  resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
 react-redux@^7.2.0:
   version "7.2.9"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.9.tgz#09488fbb9416a4efe3735b7235055442b042481d"
+  resolved "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz"
   integrity sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==
   dependencies:
     "@babel/runtime" "^7.15.4"
@@ -8303,7 +7441,7 @@ react-simple-maps@^2.3.0:
     d3-zoom "^2.0.0"
     topojson-client "^3.1.0"
 
-react-spring@^9.4.4:
+react-spring@^9.4.4, react-spring@^9.5.5:
   version "9.7.1"
   resolved "https://registry.yarnpkg.com/react-spring/-/react-spring-9.7.1.tgz#8acfed700823490a4d9d4cf131c5fea12d1aaa93"
   integrity sha512-o2+r2DNQDVEuefiz33ZF76DPd/gLq3kbdObJmllGF2IUfv2W6x+ZP0gR97QYCSR4QLbmOl1mPKUBbI+FJdys2Q==
@@ -8315,18 +7453,6 @@ react-spring@^9.4.4:
     "@react-spring/web" "~9.7.1"
     "@react-spring/zdog" "~9.7.1"
 
-react-spring@^9.5.5:
-  version "9.5.5"
-  resolved "https://registry.yarnpkg.com/react-spring/-/react-spring-9.5.5.tgz#314009a65efc04d0ef157d3d60590dbb9de65f3c"
-  integrity sha512-vMGVd2yjgxWcRCzoLn9AD1d24+WpunHBRg5DoehcRdiBocaOH6qgle0xN9C5LPplXfv4yIpS5QWGN5MKrWxSZg==
-  dependencies:
-    "@react-spring/core" "~9.5.5"
-    "@react-spring/konva" "~9.5.5"
-    "@react-spring/native" "~9.5.5"
-    "@react-spring/three" "~9.5.5"
-    "@react-spring/web" "~9.5.5"
-    "@react-spring/zdog" "~9.5.5"
-
 react-use-measure@^2.0.4:
   version "2.1.1"
   resolved "https://registry.npmjs.org/react-use-measure/-/react-use-measure-2.1.1.tgz"
@@ -8336,7 +7462,7 @@ react-use-measure@^2.0.4:
 
 react-window@^1.8.6:
   version "1.8.9"
-  resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.9.tgz#24bc346be73d0468cdf91998aac94e32bc7fa6a8"
+  resolved "https://registry.npmjs.org/react-window/-/react-window-1.8.9.tgz"
   integrity sha512-+Eqx/fj1Aa5WnhRfj9dJg4VYATGwIUP2ItwItiJ6zboKWA6EX3lYDAXfGF2hyNqplEprhbtjbipiADEcwQ823Q==
   dependencies:
     "@babel/runtime" "^7.0.0"
@@ -8344,7 +7470,7 @@ react-window@^1.8.6:
 
 react@^18.2.0:
   version "18.2.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"
+  resolved "https://registry.npmjs.org/react/-/react-18.2.0.tgz"
   integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==
   dependencies:
     loose-envify "^1.1.0"
@@ -8366,7 +7492,7 @@ read-cache@^1.0.0:
 
 read-pkg-up@^7.0.1:
   version "7.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
+  resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz"
   integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
   dependencies:
     find-up "^4.1.0"
@@ -8384,7 +7510,7 @@ read-pkg@^3.0.0:
 
 read-pkg@^5.2.0:
   version "5.2.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
+  resolved "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz"
   integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
   dependencies:
     "@types/normalize-package-data" "^2.4.0"
@@ -8394,7 +7520,7 @@ read-pkg@^5.2.0:
 
 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"
+  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz"
   integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
   dependencies:
     inherits "^2.0.3"
@@ -8403,14 +7529,14 @@ readable-stream@^3.1.1, readable-stream@^3.4.0:
 
 readdirp@~3.6.0:
   version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+  resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"
   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"
+  resolved "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz"
   integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==
   dependencies:
     indent-string "^4.0.0"
@@ -8418,19 +7544,19 @@ redent@^3.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"
+  resolved "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz"
   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"
+  resolved "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz"
   integrity sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==
   dependencies:
     redis-errors "^1.0.0"
 
 redis@^4.5.1:
   version "4.5.1"
-  resolved "https://registry.yarnpkg.com/redis/-/redis-4.5.1.tgz#f5a818970bb2dc5d60540bab41308640604c7d33"
+  resolved "https://registry.npmjs.org/redis/-/redis-4.5.1.tgz"
   integrity sha512-oxXSoIqMJCQVBTfxP6BNTCtDMyh9G6Vi5wjdPdV/sRKkufyZslDqCScSGcOr6XGR/reAWZefz7E4leM31RgdBA==
   dependencies:
     "@redis/bloom" "1.1.0"
@@ -8442,14 +7568,14 @@ redis@^4.5.1:
 
 redux@^4.0.0, redux@^4.0.4:
   version "4.2.0"
-  resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.0.tgz#46f10d6e29b6666df758780437651eeb2b969f13"
+  resolved "https://registry.npmjs.org/redux/-/redux-4.2.0.tgz"
   integrity sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==
   dependencies:
     "@babel/runtime" "^7.9.2"
 
 regenerate-unicode-properties@^10.1.0:
   version "10.1.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c"
+  resolved "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz"
   integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==
   dependencies:
     regenerate "^1.4.2"
@@ -8468,31 +7594,24 @@ regenerate@^1.4.0, regenerate@^1.4.2:
 
 regenerator-runtime@^0.13.10, regenerator-runtime@^0.13.11:
   version "0.13.11"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
+  resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz"
   integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
 
-regenerator-transform@^0.15.0:
-  version "0.15.0"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz#cbd9ead5d77fae1a48d957cf889ad0586adb6537"
-  integrity sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==
-  dependencies:
-    "@babel/runtime" "^7.8.4"
-
 regenerator-transform@^0.15.1:
   version "0.15.1"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.1.tgz#f6c4e99fc1b4591f780db2586328e4d9a9d8dc56"
+  resolved "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz"
   integrity sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==
   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"
+  resolved "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.27.tgz"
   integrity sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==
 
 regexp.prototype.flags@^1.4.3:
   version "1.4.3"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
+  resolved "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz"
   integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
   dependencies:
     call-bind "^1.0.2"
@@ -8513,7 +7632,7 @@ regexpu-core@4.5.4:
 
 regexpu-core@^5.1.0:
   version "5.2.1"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.2.1.tgz#a69c26f324c1e962e9ffd0b88b055caba8089139"
+  resolved "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz"
   integrity sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==
   dependencies:
     regenerate "^1.4.2"
@@ -8525,7 +7644,7 @@ regexpu-core@^5.1.0:
 
 regexpu-core@^5.3.1:
   version "5.3.2"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b"
+  resolved "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz"
   integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==
   dependencies:
     "@babel/regjsgen" "^0.8.0"
@@ -8542,7 +7661,7 @@ regjsgen@^0.5.0:
 
 regjsgen@^0.7.1:
   version "0.7.1"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.7.1.tgz#ee5ef30e18d3f09b7c369b76e7c2373ed25546f6"
+  resolved "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz"
   integrity sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==
 
 regjsparser@^0.6.0:
@@ -8554,7 +7673,7 @@ regjsparser@^0.6.0:
 
 regjsparser@^0.9.1:
   version "0.9.1"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
+  resolved "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz"
   integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
   dependencies:
     jsesc "~0.5.0"
@@ -8592,40 +7711,22 @@ request@2.88.0:
 
 require-from-string@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+  resolved "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz"
   integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
 
 resolve-from@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+  resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
 resolve-from@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
-resolve@^1.1.7:
-  version "1.22.0"
-  resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz"
-  integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
-  dependencies:
-    is-core-module "^2.8.1"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-resolve@^1.10.0, resolve@^1.14.2, resolve@^1.22.0:
-  version "1.22.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
-  integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
-  dependencies:
-    is-core-module "^2.9.0"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-resolve@^1.19.0, resolve@^1.22.1:
+resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.22.0, resolve@^1.22.1:
   version "1.22.2"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
+  resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz"
   integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
   dependencies:
     is-core-module "^2.11.0"
@@ -8634,7 +7735,7 @@ resolve@^1.19.0, resolve@^1.22.1:
 
 resolve@^2.0.0-next.3:
   version "2.0.0-next.4"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.4.tgz#3d37a113d6429f496ec4752d2a2e58efb1fd4660"
+  resolved "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz"
   integrity sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==
   dependencies:
     is-core-module "^2.9.0"
@@ -8651,7 +7752,7 @@ restore-cursor@^3.1.0:
 
 reusify@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
 rfdc@^1.3.0:
@@ -8661,21 +7762,21 @@ rfdc@^1.3.0:
 
 rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
   dependencies:
     glob "^7.1.3"
 
 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"
+  resolved "https://registry.npmjs.org/rollup-plugin-delete/-/rollup-plugin-delete-2.0.0.tgz"
   integrity sha512-/VpLMtDy+8wwRlDANuYmDa9ss/knGsAgrDhM+tEwB1npHwNu4DYNmDfUL55csse/GHs9Q+SMT/rw9uiaZ3pnzA==
   dependencies:
     del "^5.1.0"
 
 rollup-plugin-dts@^5.3.0:
   version "5.3.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-dts/-/rollup-plugin-dts-5.3.0.tgz#80a95988002f188e376f6db3b7e2f53679168957"
+  resolved "https://registry.npmjs.org/rollup-plugin-dts/-/rollup-plugin-dts-5.3.0.tgz"
   integrity sha512-8FXp0ZkyZj1iU5klkIJYLjIq/YZSwBoERu33QBDxm/1yw5UU4txrEtcmMkrq+ZiKu3Q4qvPCNqc3ovX6rjqzbQ==
   dependencies:
     magic-string "^0.30.0"
@@ -8684,7 +7785,7 @@ rollup-plugin-dts@^5.3.0:
 
 rollup-plugin-esbuild@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-esbuild/-/rollup-plugin-esbuild-5.0.0.tgz#6cce358f4abe164d65a0028e900b8501a15f72ef"
+  resolved "https://registry.npmjs.org/rollup-plugin-esbuild/-/rollup-plugin-esbuild-5.0.0.tgz"
   integrity sha512-1cRIOHAPh8WQgdQQyyvFdeOdxuiyk+zB5zJ5+YOwrZP4cJ0MT3Fs48pQxrZeyZHcn+klFherytILVfE4aYrneg==
   dependencies:
     "@rollup/pluginutils" "^5.0.1"
@@ -8695,12 +7796,12 @@ rollup-plugin-esbuild@^5.0.0:
 
 rollup-plugin-node-externals@^5.1.2:
   version "5.1.3"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-node-externals/-/rollup-plugin-node-externals-5.1.3.tgz#56dc316081187afbf943d81750c75d735f80c970"
+  resolved "https://registry.npmjs.org/rollup-plugin-node-externals/-/rollup-plugin-node-externals-5.1.3.tgz"
   integrity sha512-Q3VMjsn39r0/mjKrX++rFlC7kwL7YZdScdyU7BEo+PrEremal3mnol/1X+wQUU++7NeqC1ZNAeRYnHGtsTu9GQ==
 
 rollup-plugin-postcss@^4.0.2:
   version "4.0.2"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-postcss/-/rollup-plugin-postcss-4.0.2.tgz#15e9462f39475059b368ce0e49c800fa4b1f7050"
+  resolved "https://registry.npmjs.org/rollup-plugin-postcss/-/rollup-plugin-postcss-4.0.2.tgz"
   integrity sha512-05EaY6zvZdmvPUDi3uCcAQoESDcYnv8ogJJQRp6V5kZ6J6P7uAVJlrTZcaaA20wTH527YTnKfkAoPxWI/jPp4w==
   dependencies:
     chalk "^4.1.0"
@@ -8729,21 +7830,21 @@ rollup-plugin-terser@^7.0.2:
 
 rollup-pluginutils@^2.8.2:
   version "2.8.2"
-  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
+  resolved "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz"
   integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
   dependencies:
     estree-walker "^0.6.1"
 
 rollup@^2.70.1:
   version "2.79.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7"
+  resolved "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz"
   integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==
   optionalDependencies:
     fsevents "~2.3.2"
 
 rtlcss@4.1.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/rtlcss/-/rtlcss-4.1.0.tgz#f69b78d9752c970ddfe2aa590896f44353ab1c98"
+  resolved "https://registry.npmjs.org/rtlcss/-/rtlcss-4.1.0.tgz"
   integrity sha512-W+N4hh0nVqVrrn3mRkHakxpB+c9cQ4CRT67O39kgA+1DjyhrdsqyCqIuHXyvWaXn4/835n+oX3fYJCi4+G/06A==
   dependencies:
     escalade "^3.1.1"
@@ -8753,7 +7854,7 @@ rtlcss@4.1.0:
 
 run-parallel@^1.1.9:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
+  resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"
   integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
   dependencies:
     queue-microtask "^1.2.2"
@@ -8772,12 +7873,12 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
 
 safe-identifier@^0.4.2:
   version "0.4.2"
-  resolved "https://registry.yarnpkg.com/safe-identifier/-/safe-identifier-0.4.2.tgz#cf6bfca31c2897c588092d1750d30ef501d59fcb"
+  resolved "https://registry.npmjs.org/safe-identifier/-/safe-identifier-0.4.2.tgz"
   integrity sha512-6pNbSMW6OhAi9j+N8V+U715yBQsaWJ7eyEUaOrawX+isg5ZxhUlV1NipNtgaKHmFGiABwt+ZF04Ii+3Xjkg+8w==
 
 safe-regex-test@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"
+  resolved "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz"
   integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==
   dependencies:
     call-bind "^1.0.2"
@@ -8791,7 +7892,7 @@ safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
 
 scheduler@^0.23.0:
   version "0.23.0"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe"
+  resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz"
   integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==
   dependencies:
     loose-envify "^1.1.0"
@@ -8817,7 +7918,7 @@ schema-utils@^2.6.6:
 
 selfsigned@^2.0.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.1.1.tgz#18a7613d714c0cd3385c48af0075abf3f266af61"
+  resolved "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz"
   integrity sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==
   dependencies:
     node-forge "^1"
@@ -8834,19 +7935,12 @@ semver-compare@^1.0.0:
 
 semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.3.4, semver@^7.3.8:
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
-  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@^7.3.5, semver@^7.3.6, semver@^7.3.7:
+semver@^7.3.4, semver@^7.3.5, semver@^7.3.6, semver@^7.3.7, semver@^7.3.8:
   version "7.5.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.2.tgz#5b851e66d1be07c1cdaf37dfc856f543325a2beb"
+  resolved "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz"
   integrity sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==
   dependencies:
     lru-cache "^6.0.0"
@@ -8860,7 +7954,7 @@ serialize-javascript@^4.0.0:
 
 sharp@^0.30.7:
   version "0.30.7"
-  resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.30.7.tgz#7862bda98804fdd1f0d5659c85e3324b90d94c7c"
+  resolved "https://registry.npmjs.org/sharp/-/sharp-0.30.7.tgz"
   integrity sha512-G+MY2YW33jgflKPTXXptVO28HvNOo9G3j0MybYAHeEmby+QuD2U98dT6ueht9cv/XDqZspSpIhoSW+BAKJ7Hig==
   dependencies:
     color "^4.2.3"
@@ -8881,7 +7975,7 @@ shebang-command@^1.2.0:
 
 shebang-command@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"
   integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
   dependencies:
     shebang-regex "^3.0.0"
@@ -8893,7 +7987,7 @@ shebang-regex@^1.0.0:
 
 shebang-regex@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
 shell-quote@^1.6.1:
@@ -8903,7 +7997,7 @@ shell-quote@^1.6.1:
 
 side-channel@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
+  resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"
   integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
   dependencies:
     call-bind "^1.0.0"
@@ -8917,12 +8011,12 @@ signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
 
 simple-concat@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f"
+  resolved "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz"
   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"
+  resolved "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz"
   integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==
   dependencies:
     decompress-response "^6.0.0"
@@ -8931,7 +8025,7 @@ simple-get@^4.0.0, simple-get@^4.0.1:
 
 simple-swizzle@^0.2.2:
   version "0.2.2"
-  resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
+  resolved "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz"
   integrity sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==
   dependencies:
     is-arrayish "^0.3.1"
@@ -8943,12 +8037,12 @@ sisteransi@^1.0.5:
 
 slash@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
 slash@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
+  resolved "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz"
   integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
 
 slice-ansi@^3.0.0:
@@ -8962,7 +8056,7 @@ slice-ansi@^3.0.0:
 
 slice-ansi@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
+  resolved "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz"
   integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
   dependencies:
     ansi-styles "^4.0.0"
@@ -8978,7 +8072,7 @@ sort-keys@^4.0.0:
 
 source-map-js@^1.0.1, source-map-js@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
+  resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"
   integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
 
 source-map-support@~0.5.20:
@@ -8991,7 +8085,7 @@ source-map-support@~0.5.20:
 
 source-map@^0.6.0, source-map@^0.6.1:
   version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
 sourcemap-codec@^1.4.8:
@@ -9001,7 +8095,7 @@ sourcemap-codec@^1.4.8:
 
 spdx-correct@^3.0.0:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
+  resolved "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz"
   integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
   dependencies:
     spdx-expression-parse "^3.0.0"
@@ -9009,12 +8103,12 @@ spdx-correct@^3.0.0:
 
 spdx-exceptions@^2.1.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
+  resolved "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"
   integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
 
 spdx-expression-parse@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  resolved "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"
   integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
   dependencies:
     spdx-exceptions "^2.1.0"
@@ -9022,7 +8116,7 @@ spdx-expression-parse@^3.0.0:
 
 spdx-license-ids@^3.0.0:
   version "3.0.12"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz#69077835abe2710b65f03969898b6637b505a779"
+  resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz"
   integrity sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==
 
 sprintf-js@~1.0.2:
@@ -9047,12 +8141,12 @@ sshpk@^1.7.0:
 
 stable@^0.1.8:
   version "0.1.8"
-  resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
+  resolved "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz"
   integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
 
 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"
+  resolved "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz"
   integrity sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==
 
 stream2asynciter@1.0.3:
@@ -9062,7 +8156,7 @@ stream2asynciter@1.0.3:
 
 streamsearch@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764"
+  resolved "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz"
   integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==
 
 string-argv@0.3.1:
@@ -9072,12 +8166,12 @@ string-argv@0.3.1:
 
 string-hash@^1.1.1:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b"
+  resolved "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz"
   integrity sha512-kJUvRUFK49aub+a7T1nNE66EJbZBMnBgoC1UbCZ5n6bsZKBRga4KgBRTMn/pFkeCZSYtNeSyMxPDM0AXWELk2A==
 
 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"
+  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
   dependencies:
     emoji-regex "^8.0.0"
@@ -9086,7 +8180,7 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
 
 string.prototype.matchall@^4.0.8:
   version "4.0.8"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz#3bf85722021816dcd1bf38bb714915887ca79fd3"
+  resolved "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz"
   integrity sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==
   dependencies:
     call-bind "^1.0.2"
@@ -9107,18 +8201,18 @@ string.prototype.padend@^3.0.0:
     define-properties "^1.1.3"
     es-abstract "^1.19.1"
 
-string.prototype.trimend@^1.0.5, string.prototype.trimend@^1.0.6:
+string.prototype.trimend@^1.0.6:
   version "1.0.6"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533"
+  resolved "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz"
   integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
-string.prototype.trimstart@^1.0.5, string.prototype.trimstart@^1.0.6:
+string.prototype.trimstart@^1.0.6:
   version "1.0.6"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4"
+  resolved "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz"
   integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==
   dependencies:
     call-bind "^1.0.2"
@@ -9127,7 +8221,7 @@ string.prototype.trimstart@^1.0.5, string.prototype.trimstart@^1.0.6:
 
 string_decoder@^1.1.1:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
   integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
   dependencies:
     safe-buffer "~5.2.0"
@@ -9150,7 +8244,7 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
 
 strip-bom@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"
   integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
 
 strip-bom@^4.0.0:
@@ -9160,46 +8254,46 @@ strip-bom@^4.0.0:
 
 strip-final-newline@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
+  resolved "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
 strip-indent@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
+  resolved "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz"
   integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==
   dependencies:
     min-indent "^1.0.0"
 
 strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"
   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"
+  resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"
   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"
+  resolved "https://registry.npmjs.org/style-inject/-/style-inject-0.3.0.tgz"
   integrity sha512-IezA2qp+vcdlhJaVm5SOdPPTUu0FCEqfNSli2vRuSIBbu5Nq5UvygTk/VzeCqfLz2Atj3dVII5QBKGZRZ0edzw==
 
 style-search@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
+  resolved "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz"
   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"
+  resolved "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.1.tgz"
   integrity sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==
   dependencies:
     client-only "0.0.1"
 
 stylehacks@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.1.tgz#7934a34eb59d7152149fa69d6e9e56f2fc34bcc9"
+  resolved "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz"
   integrity sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==
   dependencies:
     browserslist "^4.21.4"
@@ -9207,24 +8301,24 @@ stylehacks@^5.1.1:
 
 stylelint-config-css-modules@^4.1.0:
   version "4.2.0"
-  resolved "https://registry.yarnpkg.com/stylelint-config-css-modules/-/stylelint-config-css-modules-4.2.0.tgz#0196347d5c143eff9e2a3e97b1ba980253b6b8bf"
+  resolved "https://registry.npmjs.org/stylelint-config-css-modules/-/stylelint-config-css-modules-4.2.0.tgz"
   integrity sha512-5x7lzPNCc42puQEAFdr7dSzQ00aIg1vCVyV+QPUiSp2oZILpAt8HTgveXaDttazxcwWPBNJrxrLpa556xUP7Bw==
   optionalDependencies:
     stylelint-scss "^4.3.0"
 
 stylelint-config-prettier@^9.0.3:
   version "9.0.5"
-  resolved "https://registry.yarnpkg.com/stylelint-config-prettier/-/stylelint-config-prettier-9.0.5.tgz#9f78bbf31c7307ca2df2dd60f42c7014ee9da56e"
+  resolved "https://registry.npmjs.org/stylelint-config-prettier/-/stylelint-config-prettier-9.0.5.tgz"
   integrity sha512-U44lELgLZhbAD/xy/vncZ2Pq8sh2TnpiPvo38Ifg9+zeioR+LAkHu0i6YORIOxFafZoVg0xqQwex6e6F25S5XA==
 
 stylelint-config-recommended@^9.0.0:
   version "9.0.0"
-  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-9.0.0.tgz#1c9e07536a8cd875405f8ecef7314916d94e7e40"
+  resolved "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-9.0.0.tgz"
   integrity sha512-9YQSrJq4NvvRuTbzDsWX3rrFOzOlYBmZP+o513BJN/yfEmGSr0AxdvrWs0P/ilSpVV/wisamAHu5XSk8Rcf4CQ==
 
 stylelint-scss@^4.3.0:
   version "4.4.0"
-  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-4.4.0.tgz#87ce9d049eff1ce67cce788780fbfda63099017e"
+  resolved "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.4.0.tgz"
   integrity sha512-Qy66a+/30aylFhPmUArHhVsHOun1qrO93LGT15uzLuLjWS7hKDfpFm34mYo1ndR4MCo8W4bEZM1+AlJRJORaaw==
   dependencies:
     lodash "^4.17.21"
@@ -9235,7 +8329,7 @@ stylelint-scss@^4.3.0:
 
 stylelint@^14.16.1:
   version "14.16.1"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.16.1.tgz#b911063530619a1bbe44c2b875fd8181ebdc742d"
+  resolved "https://registry.npmjs.org/stylelint/-/stylelint-14.16.1.tgz"
   integrity sha512-ErlzR/T3hhbV+a925/gbfc3f3Fep9/bnspMiJPorfGEmcBbXdS+oo6LrVtoUZ/w9fqD6o6k7PtUlCOsCRdjX/A==
   dependencies:
     "@csstools/selector-specificity" "^2.0.2"
@@ -9286,21 +8380,21 @@ supports-color@8.1.1:
 
 supports-color@^5.3.0:
   version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
 supports-color@^7.0.0, supports-color@^7.1.0:
   version "7.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
   integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
   dependencies:
     has-flag "^4.0.0"
 
 supports-hyperlinks@^2.3.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624"
+  resolved "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz"
   integrity sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==
   dependencies:
     has-flag "^4.0.0"
@@ -9308,22 +8402,22 @@ supports-hyperlinks@^2.3.0:
 
 supports-preserve-symlinks-flag@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
+  resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
 svg-parser@^2.0.4:
   version "2.0.4"
-  resolved "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5"
+  resolved "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz"
   integrity sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==
 
 svg-tags@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
+  resolved "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz"
   integrity sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==
 
 svgo@^2.7.0, svgo@^2.8.0:
   version "2.8.0"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24"
+  resolved "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz"
   integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==
   dependencies:
     "@trysound/sax" "0.2.0"
@@ -9336,7 +8430,7 @@ svgo@^2.7.0, svgo@^2.8.0:
 
 svgo@^3.0.2:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-3.0.2.tgz#5e99eeea42c68ee0dc46aa16da093838c262fe0a"
+  resolved "https://registry.npmjs.org/svgo/-/svgo-3.0.2.tgz"
   integrity sha512-Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ==
   dependencies:
     "@trysound/sax" "0.2.0"
@@ -9348,7 +8442,7 @@ svgo@^3.0.2:
 
 table@^6.8.1:
   version "6.8.1"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.8.1.tgz#ea2b71359fe03b017a5fbc296204471158080bdf"
+  resolved "https://registry.npmjs.org/table/-/table-6.8.1.tgz"
   integrity sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==
   dependencies:
     ajv "^8.0.1"
@@ -9359,7 +8453,7 @@ table@^6.8.1:
 
 tar-fs@^2.0.0, tar-fs@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
+  resolved "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz"
   integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
   dependencies:
     chownr "^1.1.1"
@@ -9369,7 +8463,7 @@ tar-fs@^2.0.0, tar-fs@^2.1.1:
 
 tar-stream@^2.1.4:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
+  resolved "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz"
   integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
   dependencies:
     bl "^4.0.3"
@@ -9380,7 +8474,7 @@ tar-stream@^2.1.4:
 
 tar@^6.1.2:
   version "6.1.15"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.15.tgz#c9738b0b98845a3b344d334b8fa3041aaba53a69"
+  resolved "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz"
   integrity sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==
   dependencies:
     chownr "^2.0.0"
@@ -9391,18 +8485,18 @@ tar@^6.1.2:
     yallist "^4.0.0"
 
 terser@^5.0.0:
-  version "5.14.2"
-  resolved "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz"
-  integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==
+  version "5.18.1"
+  resolved "https://registry.npmjs.org/terser/-/terser-5.18.1.tgz"
+  integrity sha512-j1n0Ao919h/Ai5r43VAnfV/7azUYW43GPxK7qSATzrsERfW7+y2QW9Cp9ufnRF5CQUWbnLSo7UJokSWCqg4tsQ==
   dependencies:
-    "@jridgewell/source-map" "^0.3.2"
-    acorn "^8.5.0"
+    "@jridgewell/source-map" "^0.3.3"
+    acorn "^8.8.2"
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
 text-table@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+  resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
   integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
 thenby@^1.3.4:
@@ -9417,7 +8511,7 @@ through@2.3.8, "through@>=2.2.7 <3", through@^2.3.8:
 
 timezone-support@^2.0.2:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/timezone-support/-/timezone-support-2.2.0.tgz#b3146cb99bf188a92b5348591202e8e3aa013135"
+  resolved "https://registry.npmjs.org/timezone-support/-/timezone-support-2.2.0.tgz"
   integrity sha512-4TmVraC9vxQVLMGeV5OaC12QWbYMhzFWTyAcBO64UB53kbLRIuDdQlr/ZvmatdOv8z5pWw/uK0kZ1DBm4uoUhw==
   dependencies:
     commander "2.20.0"
@@ -9425,7 +8519,7 @@ timezone-support@^2.0.2:
 
 tiny-glob@^0.2.9:
   version "0.2.9"
-  resolved "https://registry.yarnpkg.com/tiny-glob/-/tiny-glob-0.2.9.tgz#2212d441ac17928033b110f8b3640683129d31e2"
+  resolved "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.9.tgz"
   integrity sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==
   dependencies:
     globalyzer "0.1.0"
@@ -9433,12 +8527,12 @@ tiny-glob@^0.2.9:
 
 tiny-invariant@^1.0.6:
   version "1.3.1"
-  resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.1.tgz#8560808c916ef02ecfd55e66090df23a4b7aa642"
+  resolved "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz"
   integrity sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==
 
 tiny-lru@11.0.1:
   version "11.0.1"
-  resolved "https://registry.yarnpkg.com/tiny-lru/-/tiny-lru-11.0.1.tgz#629d6ddd88bd03c0929722680167f1feadf576f2"
+  resolved "https://registry.npmjs.org/tiny-lru/-/tiny-lru-11.0.1.tgz"
   integrity sha512-iNgFugVuQgBKrqeO/mpiTTgmBsTP0WL6yeuLfLs/Ctf0pI/ixGqIRm8sDCwMcXGe9WWvt2sGXI5mNqZbValmJg==
 
 tiny-warning@^1.0.2:
@@ -9448,12 +8542,12 @@ tiny-warning@^1.0.2:
 
 to-fast-properties@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
   integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
 
 to-regex-range@^5.0.1:
   version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"
   integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
   dependencies:
     is-number "^7.0.0"
@@ -9467,7 +8561,7 @@ topojson-client@^3.1.0:
 
 toposort@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
+  resolved "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz"
   integrity sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==
 
 tough-cookie@~2.4.3:
@@ -9480,17 +8574,17 @@ tough-cookie@~2.4.3:
 
 tr46@~0.0.3:
   version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  resolved "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"
   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"
+  resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz"
   integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
 
 ts-node@^10.9.1:
   version "10.9.1"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
+  resolved "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz"
   integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
   dependencies:
     "@cspotcode/source-map-support" "^0.8.0"
@@ -9509,7 +8603,7 @@ ts-node@^10.9.1:
 
 tsconfig-paths@^3.14.1:
   version "3.14.1"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
+  resolved "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz"
   integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==
   dependencies:
     "@types/json5" "^0.0.29"
@@ -9529,12 +8623,12 @@ tslib@^2.0.1, tslib@^2.1.0:
 
 tslib@^2.4.0:
   version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
+  resolved "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz"
   integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
 
 tsutils@^3.21.0:
   version "3.21.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
+  resolved "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz"
   integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
   dependencies:
     tslib "^1.8.1"
@@ -9546,7 +8640,7 @@ tsv@0.2.0:
 
 tunnel-agent@^0.6.0:
   version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  resolved "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"
   integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==
   dependencies:
     safe-buffer "^5.0.1"
@@ -9558,7 +8652,7 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
 
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+  resolved "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"
   integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
   dependencies:
     prelude-ls "^1.2.1"
@@ -9570,12 +8664,12 @@ type-fest@^0.13.1:
 
 type-fest@^0.18.0:
   version "0.18.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
+  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz"
   integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
 
 type-fest@^0.20.2:
   version "0.20.2"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
+  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
 type-fest@^0.21.3:
@@ -9585,17 +8679,17 @@ type-fest@^0.21.3:
 
 type-fest@^0.6.0:
   version "0.6.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
+  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz"
   integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
 
 type-fest@^0.8.1:
   version "0.8.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
+  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
 typed-array-length@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb"
+  resolved "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz"
   integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==
   dependencies:
     call-bind "^1.0.2"
@@ -9609,34 +8703,24 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typescript@^4.0:
-  version "4.6.2"
-  resolved "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz"
-  integrity sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==
-
-typescript@^4.5:
-  version "4.7.2"
-  resolved "https://registry.npmjs.org/typescript/-/typescript-4.7.2.tgz"
-  integrity sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A==
-
-typescript@^4.9.5:
+typescript@^4.0, typescript@^4.5, typescript@^4.9.5:
   version "4.9.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
+  resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz"
   integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
 ufo@^0.8.5, ufo@^0.8.6:
   version "0.8.6"
-  resolved "https://registry.yarnpkg.com/ufo/-/ufo-0.8.6.tgz#c0ec89bc0e0c9fa59a683680feb0f28b55ec323b"
+  resolved "https://registry.npmjs.org/ufo/-/ufo-0.8.6.tgz"
   integrity sha512-fk6CmUgwKCfX79EzcDQQpSCMxrHstvbLswFChHS0Vump+kFkw7nJBfTZoC1j0bOGoY9I7R3n2DGek5ajbcYnOw==
 
 ufo@^1.0.0, ufo@^1.1.1, ufo@^1.1.2:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.1.2.tgz#d0d9e0fa09dece0c31ffd57bd363f030a35cfe76"
+  resolved "https://registry.npmjs.org/ufo/-/ufo-1.1.2.tgz"
   integrity sha512-TrY6DsjTQQgyS3E3dBaOXf0TpPD8u9FVrVYmKVegJuFw51n/YB9XPt+U6ydzFG5ZIN7+DIjPbNmXoBj9esYhgQ==
 
 unbox-primitive@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
+  resolved "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz"
   integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
   dependencies:
     call-bind "^1.0.2"
@@ -9646,12 +8730,12 @@ unbox-primitive@^1.0.2:
 
 uncrypto@^0.1.2:
   version "0.1.3"
-  resolved "https://registry.yarnpkg.com/uncrypto/-/uncrypto-0.1.3.tgz#e1288d609226f2d02d8d69ee861fa20d8348ef2b"
+  resolved "https://registry.npmjs.org/uncrypto/-/uncrypto-0.1.3.tgz"
   integrity sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==
 
 undici@^5.12.0:
   version "5.22.1"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-5.22.1.tgz#877d512effef2ac8be65e695f3586922e1a57d7b"
+  resolved "https://registry.npmjs.org/undici/-/undici-5.22.1.tgz"
   integrity sha512-Ji2IJhFXZY0x/0tVBXeQwgPlLWw13GVzpsWPQ3rV50IFMMof2I55PZZxtm4P6iNq+L5znYN9nSTAq0ZyE6lSJw==
   dependencies:
     busboy "^1.6.0"
@@ -9663,7 +8747,7 @@ unicode-canonical-property-names-ecmascript@^1.0.4:
 
 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"
+  resolved "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz"
   integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
 
 unicode-match-property-ecmascript@^1.0.4:
@@ -9676,7 +8760,7 @@ unicode-match-property-ecmascript@^1.0.4:
 
 unicode-match-property-ecmascript@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
+  resolved "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz"
   integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==
   dependencies:
     unicode-canonical-property-names-ecmascript "^2.0.0"
@@ -9689,12 +8773,12 @@ unicode-match-property-value-ecmascript@^1.1.0:
 
 unicode-match-property-value-ecmascript@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714"
+  resolved "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz"
   integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==
 
 unicode-match-property-value-ecmascript@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0"
+  resolved "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz"
   integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==
 
 unicode-property-aliases-ecmascript@^1.0.4:
@@ -9704,17 +8788,17 @@ unicode-property-aliases-ecmascript@^1.0.4:
 
 unicode-property-aliases-ecmascript@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
+  resolved "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz"
   integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
 
 universalify@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
+  resolved "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"
   integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
 
 unstorage@^1.0.0:
   version "1.6.1"
-  resolved "https://registry.yarnpkg.com/unstorage/-/unstorage-1.6.1.tgz#144ea7d36852b69b74009e3bafa947154f6ac2c0"
+  resolved "https://registry.npmjs.org/unstorage/-/unstorage-1.6.1.tgz"
   integrity sha512-GUJzwbP5IStEGZy9/0peRqef5CY9icqApsSu8vxj13admjISyz1g5eYk2wPRBjmZhQ3DUMQ36q+zwTbe68khew==
   dependencies:
     anymatch "^3.1.3"
@@ -9729,42 +8813,34 @@ unstorage@^1.0.0:
     ofetch "^1.0.1"
     ufo "^1.1.2"
 
-update-browserslist-db@^1.0.10:
+update-browserslist-db@^1.0.11:
   version "1.0.11"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940"
+  resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz"
   integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==
   dependencies:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
-update-browserslist-db@^1.0.9:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3"
-  integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==
-  dependencies:
-    escalade "^3.1.1"
-    picocolors "^1.0.0"
-
 uri-js@^4.2.2:
   version "4.4.1"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"
   integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
   dependencies:
     punycode "^2.1.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"
+  resolved "https://registry.npmjs.org/use-memo-one/-/use-memo-one-1.1.3.tgz"
   integrity sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==
 
 use-sync-external-store@1.2.0, 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"
+  resolved "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz"
   integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==
 
 util-deprecate@^1.0.1, util-deprecate@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
 uuid@3.4.0, uuid@^3.3.2:
@@ -9779,7 +8855,7 @@ uuid@^8.3.2:
 
 v8-compile-cache-lib@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
+  resolved "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz"
   integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
 
 v8-compile-cache@^2.3.0:
@@ -9789,7 +8865,7 @@ v8-compile-cache@^2.3.0:
 
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  resolved "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"
   integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
   dependencies:
     spdx-correct "^3.0.0"
@@ -9820,27 +8896,19 @@ vue@^3.2.23:
     "@vue/server-renderer" "3.2.36"
     "@vue/shared" "3.2.36"
 
-watchpack@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
-  integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
-  dependencies:
-    glob-to-regexp "^0.4.1"
-    graceful-fs "^4.1.2"
-
 web-streams-polyfill@^3.0.3:
   version "3.2.1"
-  resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz#71c2718c52b45fd49dbeee88634b3a60ceab42a6"
+  resolved "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz"
   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"
+  resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"
   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"
+  resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"
   integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
   dependencies:
     tr46 "~0.0.3"
@@ -9848,7 +8916,7 @@ whatwg-url@^5.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"
+  resolved "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"
   integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
   dependencies:
     is-bigint "^1.0.1"
@@ -9859,7 +8927,7 @@ which-boxed-primitive@^1.0.2:
 
 which-typed-array@^1.1.9:
   version "1.1.9"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6"
+  resolved "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz"
   integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==
   dependencies:
     available-typed-arrays "^1.0.5"
@@ -9878,14 +8946,14 @@ which@^1.2.9, which@^1.3.1:
 
 which@^2.0.1:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz"
   integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
   dependencies:
     isexe "^2.0.0"
 
 word-wrap@^1.2.3:
   version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+  resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
 wrap-ansi@^6.2.0:
@@ -9908,7 +8976,7 @@ wrap-ansi@^7.0.0:
 
 wrappy@1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
 write-file-atomic@^3.0.0:
@@ -9923,7 +8991,7 @@ write-file-atomic@^3.0.0:
 
 write-file-atomic@^4.0.2:
   version "4.0.2"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
+  resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz"
   integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
   dependencies:
     imurmurhash "^0.1.4"
@@ -9943,7 +9011,7 @@ write-json-file@^4.3.0:
 
 xss@^1.0.14:
   version "1.0.14"
-  resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.14.tgz#4f3efbde75ad0d82e9921cc3c95e6590dd336694"
+  resolved "https://registry.npmjs.org/xss/-/xss-1.0.14.tgz"
   integrity sha512-og7TEJhXvn1a7kzZGQ7ETjdQVS2UfZyTlsEdDOqvQF7GoxNfY+0YLCzBy1kPdsDDx4QuNAonQPddpsn6Xl/7sw==
   dependencies:
     commander "^2.20.3"
@@ -9951,17 +9019,17 @@ xss@^1.0.14:
 
 yallist@4.0.0, yallist@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
 yallist@^3.0.2:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
 yaml@^1.10.0, yaml@^1.10.2:
   version "1.10.2"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
+  resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
 yargs-parser@^18.1.3:
@@ -9974,22 +9042,22 @@ yargs-parser@^18.1.3:
 
 yargs-parser@^20.2.3:
   version "20.2.9"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
 yn@3.1.1:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
+  resolved "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz"
   integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
 
 yocto-queue@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
 yup@^0.32.11:
   version "0.32.11"
-  resolved "https://registry.yarnpkg.com/yup/-/yup-0.32.11.tgz#d67fb83eefa4698607982e63f7ca4c5ed3cf18c5"
+  resolved "https://registry.npmjs.org/yup/-/yup-0.32.11.tgz"
   integrity sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==
   dependencies:
     "@babel/runtime" "^7.15.4"
@@ -10000,14 +9068,9 @@ yup@^0.32.11:
     property-expr "^2.0.4"
     toposort "^2.0.2"
 
-zod@3.21.4:
-  version "3.21.4"
-  resolved "https://registry.yarnpkg.com/zod/-/zod-3.21.4.tgz#10882231d992519f0a10b5dd58a38c9dabbb64db"
-  integrity sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==
-
 zustand@^4.3.8:
   version "4.3.8"
-  resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.3.8.tgz#37113df8e9e1421b0be1b2dca02b49b76210e7c4"
+  resolved "https://registry.npmjs.org/zustand/-/zustand-4.3.8.tgz"
   integrity sha512-4h28KCkHg5ii/wcFFJ5Fp+k1J3gJoasaIbppdgZFO4BPJnsNxL0mQXBSFgOgAdCdBj35aDTPvdAJReTMntFPGg==
   dependencies:
     use-sync-external-store "1.2.0"

From 87a62fb614969481eaf8588b35cd84bed06ae4a5 Mon Sep 17 00:00:00 2001
From: Sukhpal Saini <bdcorps@users.noreply.github.com>
Date: Fri, 23 Jun 2023 09:54:41 -0400
Subject: [PATCH 82/88] Add EMBED_HOSTED_URL

---
 next.config.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/next.config.js b/next.config.js
index 8efb45bc..061a48aa 100644
--- a/next.config.js
+++ b/next.config.js
@@ -4,13 +4,15 @@ const pkg = require('./package.json');
 
 const CLOUD_URL = 'https://cloud.umami.is';
 
+const EMBED_HOSTED_URL = process.env.EMBED_HOSTED_URL
+
 const contentSecurityPolicy = `
   default-src 'self';
   img-src *;
   script-src 'self' 'unsafe-eval';
   style-src 'self' 'unsafe-inline';
   connect-src 'self' api.umami.is;
-  frame-ancestors 'self';
+  frame-ancestors `self ${EMBED_HOSTED_URL}`;
 `;
 
 const headers = [

From b4a26314ef5b6a5d45faa1cd38b19c915724a2e6 Mon Sep 17 00:00:00 2001
From: Sukhpal Saini <bdcorps@users.noreply.github.com>
Date: Fri, 23 Jun 2023 09:57:07 -0400
Subject: [PATCH 83/88] Add a comment for EMBED_HOSTED_URL

---
 next.config.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/next.config.js b/next.config.js
index 061a48aa..e004566a 100644
--- a/next.config.js
+++ b/next.config.js
@@ -4,7 +4,8 @@ const pkg = require('./package.json');
 
 const CLOUD_URL = 'https://cloud.umami.is';
 
-const EMBED_HOSTED_URL = process.env.EMBED_HOSTED_URL
+// Space-separated list of URLs that can load the "Share" dashboard, i.e. http://app.localhost:7000 https://*.vercel.app
+const EMBED_HOSTED_URL = process.env.EMBED_HOSTED_URL;
 
 const contentSecurityPolicy = `
   default-src 'self';

From a5582416b3d7fce58420bfa74a6a58e972e5d5f2 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 26 Jun 2023 08:19:52 -0700
Subject: [PATCH 84/88] update CH schema with upload_id

---
 db/clickhouse/migrations/02_add_upload_id.sql | 2 ++
 db/clickhouse/schema.sql                      | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 db/clickhouse/migrations/02_add_upload_id.sql

diff --git a/db/clickhouse/migrations/02_add_upload_id.sql b/db/clickhouse/migrations/02_add_upload_id.sql
new file mode 100644
index 00000000..c14f5622
--- /dev/null
+++ b/db/clickhouse/migrations/02_add_upload_id.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "website_event" ADD COLUMN "upload_id" UUID AFTER "created_at";
+ALTER TABLE "event_data" ADD COLUMN "upload_id" UUID AFTER "created_at";
\ No newline at end of file
diff --git a/db/clickhouse/schema.sql b/db/clickhouse/schema.sql
index de1082ec..88d72db2 100644
--- a/db/clickhouse/schema.sql
+++ b/db/clickhouse/schema.sql
@@ -27,7 +27,8 @@ CREATE TABLE umami.website_event
     --event
     event_type UInt32,
     event_name String,
-    created_at DateTime('UTC')
+    created_at DateTime('UTC'),
+    upload_id UUID
 )
     engine = MergeTree
         ORDER BY (website_id, session_id, created_at)
@@ -121,7 +122,8 @@ CREATE TABLE umami.event_data
     numeric_value Nullable(Decimal64(4)), --922337203685477.5625
     date_value Nullable(DateTime('UTC')),
     data_type UInt32,
-    created_at DateTime('UTC')
+    created_at DateTime('UTC'),
+    upload_id UUID
 )
     engine = MergeTree
         ORDER BY (website_id, event_id, event_key, created_at)

From c9013582227046a0685b8920c959f03e2ecdd670 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 26 Jun 2023 10:32:23 -0700
Subject: [PATCH 85/88] rename to job_id

---
 db/clickhouse/migrations/02_add_upload_id.sql | 4 ++--
 db/clickhouse/schema.sql                      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/db/clickhouse/migrations/02_add_upload_id.sql b/db/clickhouse/migrations/02_add_upload_id.sql
index c14f5622..44b5906e 100644
--- a/db/clickhouse/migrations/02_add_upload_id.sql
+++ b/db/clickhouse/migrations/02_add_upload_id.sql
@@ -1,2 +1,2 @@
-ALTER TABLE "website_event" ADD COLUMN "upload_id" UUID AFTER "created_at";
-ALTER TABLE "event_data" ADD COLUMN "upload_id" UUID AFTER "created_at";
\ No newline at end of file
+ALTER TABLE "website_event" ADD COLUMN "job_id" UUID AFTER "created_at";
+ALTER TABLE "event_data" ADD COLUMN "job_id" UUID AFTER "created_at";
\ No newline at end of file
diff --git a/db/clickhouse/schema.sql b/db/clickhouse/schema.sql
index 88d72db2..8ee02af8 100644
--- a/db/clickhouse/schema.sql
+++ b/db/clickhouse/schema.sql
@@ -28,7 +28,7 @@ CREATE TABLE umami.website_event
     event_type UInt32,
     event_name String,
     created_at DateTime('UTC'),
-    upload_id UUID
+    job_id UUID
 )
     engine = MergeTree
         ORDER BY (website_id, session_id, created_at)
@@ -123,7 +123,7 @@ CREATE TABLE umami.event_data
     date_value Nullable(DateTime('UTC')),
     data_type UInt32,
     created_at DateTime('UTC'),
-    upload_id UUID
+    job_id UUID
 )
     engine = MergeTree
         ORDER BY (website_id, event_id, event_key, created_at)

From ac42515e31a7f612998ac3cedda473a22c82eb03 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Wed, 28 Jun 2023 18:50:47 -0700
Subject: [PATCH 86/88] remove enhancement label from github issues

---
 .github/ISSUE_TEMPLATE/2.feature_request.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/2.feature_request.yml b/.github/ISSUE_TEMPLATE/2.feature_request.yml
index 3034767b..529a6c73 100644
--- a/.github/ISSUE_TEMPLATE/2.feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/2.feature_request.yml
@@ -1,10 +1,9 @@
-name: "✨ Feature Request"
+name: '✨ Feature Request'
 description: Create a feature or enhancement request for Umami.
-labels: ['enhancement']
 body:
   - type: textarea
     attributes:
       label: Describe the feature or enhancement
       description: A clear and concise description of what the feature or enhancement is.
     validations:
-      required: true
\ No newline at end of file
+      required: true

From 6316a0b917c8135c97e46593d6dac36b9d0a9fcc Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Thu, 29 Jun 2023 19:38:35 -0700
Subject: [PATCH 87/88] Fixed CSP issue, renamed var to ALLOWED_FRAME_URLS.

---
 next.config.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/next.config.js b/next.config.js
index e004566a..0778f979 100644
--- a/next.config.js
+++ b/next.config.js
@@ -2,18 +2,13 @@
 require('dotenv').config();
 const pkg = require('./package.json');
 
-const CLOUD_URL = 'https://cloud.umami.is';
-
-// Space-separated list of URLs that can load the "Share" dashboard, i.e. http://app.localhost:7000 https://*.vercel.app
-const EMBED_HOSTED_URL = process.env.EMBED_HOSTED_URL;
-
 const contentSecurityPolicy = `
   default-src 'self';
   img-src *;
   script-src 'self' 'unsafe-eval';
   style-src 'self' 'unsafe-inline';
   connect-src 'self' api.umami.is;
-  frame-ancestors `self ${EMBED_HOSTED_URL}`;
+  frame-ancestors 'self' ${process.env.ALLOWED_FRAME_URLS};
 `;
 
 const headers = [
@@ -68,7 +63,7 @@ const redirects = [
   },
 ];
 
-if (process.env.CLOUD_MODE && process.env.DISABLE_LOGIN && process.env.CLOUD_URL) {
+if (process.env.CLOUD_MODE && process.env.CLOUD_URL && process.env.DISABLE_LOGIN) {
   redirects.push({
     source: '/login',
     destination: process.env.CLOUD_URL,

From 9d7862cbd6ac06307ce8500da50f12de681a8693 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Sat, 1 Jul 2023 22:02:49 -0700
Subject: [PATCH 88/88] Event data report UI.

---
 components/common/{NoData.js => Empty.js}     |   8 +-
 .../{NoData.module.css => Empty.module.css}   |   0
 components/messages.js                        |  19 ++-
 components/metrics/DataTable.js               |   4 +-
 components/pages/realtime/RealtimeLog.js      |   4 +-
 .../pages/reports/FieldAggregateForm.js       |  38 ++++++
 components/pages/reports/FieldFilterForm.js   |  57 ++++++++
 .../pages/reports/FieldFilterForm.module.css  |  17 +++
 components/pages/reports/FieldSelectForm.js   |  24 ++++
 .../pages/reports/FieldSelectForm.module.css  |  20 +++
 components/pages/reports/ParameterList.js     |  33 +++++
 ...rs.module.css => ParameterList.module.css} |   4 +-
 components/pages/reports/PopupForm.js         |  30 +++++
 components/pages/reports/PopupForm.module.css |  10 ++
 components/pages/reports/Report.js            |   2 +
 components/pages/reports/ReportDetails.js     |  13 ++
 .../reports/event-data/EventDataParameters.js | 126 +++++++++++++++---
 .../event-data/EventDataParameters.module.css |  27 +---
 .../reports/event-data/EventDataReport.js     |   7 +-
 .../reports/event-data/EventDataTable.js      |  20 +++
 .../pages/reports/event-data/FieldAddForm.js  |  46 ++++---
 .../event-data/FieldAddForm.module.css        |  38 ++++++
 .../pages/reports/funnel/FunnelParameters.js  |  67 +++-------
 components/pages/reports/funnel/UrlAddForm.js |  55 ++++----
 hooks/index.js                                |   1 +
 hooks/useFilters.js                           |  32 +++++
 hooks/useReport.js                            |   8 ++
 lib/constants.ts                              |  12 +-
 lib/dynamicData.ts                            |  14 +-
 lib/types.ts                                  |   4 +-
 pages/reports/[id].js                         |  12 +-
 public/intl/messages/ru-RU.json               |  22 +--
 public/intl/messages/sv-SE.json               | 100 +++++++-------
 .../analytics/eventData/getEventDataFields.ts |   6 +-
 queries/analytics/eventData/saveEventData.ts  |  22 +--
 queries/analytics/session/saveSessionData.ts  |  12 +-
 36 files changed, 660 insertions(+), 254 deletions(-)
 rename components/common/{NoData.js => Empty.js} (57%)
 rename components/common/{NoData.module.css => Empty.module.css} (100%)
 create mode 100644 components/pages/reports/FieldAggregateForm.js
 create mode 100644 components/pages/reports/FieldFilterForm.js
 create mode 100644 components/pages/reports/FieldFilterForm.module.css
 create mode 100644 components/pages/reports/FieldSelectForm.js
 create mode 100644 components/pages/reports/FieldSelectForm.module.css
 create mode 100644 components/pages/reports/ParameterList.js
 rename components/pages/reports/{funnel/FunnelParameters.module.css => ParameterList.module.css} (95%)
 create mode 100644 components/pages/reports/PopupForm.js
 create mode 100644 components/pages/reports/PopupForm.module.css
 create mode 100644 components/pages/reports/ReportDetails.js
 create mode 100644 components/pages/reports/event-data/EventDataTable.js
 create mode 100644 components/pages/reports/event-data/FieldAddForm.module.css
 create mode 100644 hooks/useFilters.js

diff --git a/components/common/NoData.js b/components/common/Empty.js
similarity index 57%
rename from components/common/NoData.js
rename to components/common/Empty.js
index e9c95754..95681b16 100644
--- a/components/common/NoData.js
+++ b/components/common/Empty.js
@@ -1,15 +1,15 @@
 import classNames from 'classnames';
-import styles from './NoData.module.css';
+import styles from './Empty.module.css';
 import useMessages from 'hooks/useMessages';
 
-export function NoData({ className }) {
+export function Empty({ message, className }) {
   const { formatMessage, messages } = useMessages();
 
   return (
     <div className={classNames(styles.container, className)}>
-      {formatMessage(messages.noDataAvailable)}
+      {message || formatMessage(messages.noDataAvailable)}
     </div>
   );
 }
 
-export default NoData;
+export default Empty;
diff --git a/components/common/NoData.module.css b/components/common/Empty.module.css
similarity index 100%
rename from components/common/NoData.module.css
rename to components/common/Empty.module.css
diff --git a/components/messages.js b/components/messages.js
index 9499e2a6..016d3c4c 100644
--- a/components/messages.js
+++ b/components/messages.js
@@ -129,7 +129,6 @@ export const labels = defineMessages({
   urls: { id: 'label.urls', defaultMessage: 'URLs' },
   add: { id: 'label.add', defaultMessage: 'Add' },
   window: { id: 'label.window', defaultMessage: 'Window' },
-  addUrl: { id: 'label.add-url', defaultMessage: 'Add URL' },
   runQuery: { id: 'label.run-query', defaultMessage: 'Run query' },
   field: { id: 'label.field', defaultMessage: 'Field' },
   fields: { id: 'label.fields', defaultMessage: 'Fields' },
@@ -137,6 +136,20 @@ export const labels = defineMessages({
   description: { id: 'labels.description', defaultMessage: 'Description' },
   untitled: { id: 'labels.untitled', defaultMessage: 'Untitled' },
   type: { id: 'labels.type', defaultMessage: 'Type' },
+  filters: { id: 'labels.filters', defaultMessage: 'Filters' },
+  groupBy: { id: 'labels.group-by', defaultMessage: 'Group by' },
+  true: { id: 'labels.true', defaultMessage: 'True' },
+  false: { id: 'labels.false', defaultMessage: 'False' },
+  equals: { id: 'labels.equals', defaultMessage: 'Equals' },
+  doesNotEqual: { id: 'labels.does-not-equal', defaultMessage: 'Does not equal' },
+  greaterThan: { id: 'labels.greater-than', defaultMessage: 'Greater than' },
+  lessThan: { id: 'labels.less-than', defaultMessage: 'Less than' },
+  greaterThanEquals: { id: 'labels.greater-than-equals', defaultMessage: 'Greater than or equals' },
+  lessThanEquals: { id: 'labels.less-than-equals', defaultMessage: 'Less than or equals' },
+  contains: { id: 'labels.contains', defaultMessage: 'Contains' },
+  doesNotContain: { id: 'labels.does-not-contain', defaultMessage: 'Does not contain' },
+  before: { id: 'labels.before', defaultMessage: 'Before' },
+  after: { id: 'labels.after', defaultMessage: 'After' },
 });
 
 export const messages = defineMessages({
@@ -244,4 +257,8 @@ export const messages = defineMessages({
     id: 'message.incorrect-username-password',
     defaultMessage: 'Incorrect username and/or password.',
   },
+  noEventData: {
+    id: 'message.no-event-data',
+    defaultMessage: 'No event data is available.',
+  },
 });
diff --git a/components/metrics/DataTable.js b/components/metrics/DataTable.js
index a2c1a568..e2e9462d 100644
--- a/components/metrics/DataTable.js
+++ b/components/metrics/DataTable.js
@@ -3,7 +3,7 @@ import useMeasure from 'react-use-measure';
 import { FixedSizeList } from 'react-window';
 import { useSpring, animated, config } from 'react-spring';
 import classNames from 'classnames';
-import NoData from 'components/common/NoData';
+import Empty from 'components/common/Empty';
 import { formatNumber, formatLongNumber } from 'lib/format';
 import useMessages from 'hooks/useMessages';
 import styles from './DataTable.module.css';
@@ -55,7 +55,7 @@ export function DataTable({
         </div>
       </div>
       <div ref={ref} className={styles.body}>
-        {data?.length === 0 && <NoData />}
+        {data?.length === 0 && <Empty />}
         {virtualize && data.length > 0 ? (
           <FixedSizeList height={bounds.height} itemCount={data.length} itemSize={30}>
             {Row}
diff --git a/components/pages/realtime/RealtimeLog.js b/components/pages/realtime/RealtimeLog.js
index ddd35751..fe12963c 100644
--- a/components/pages/realtime/RealtimeLog.js
+++ b/components/pages/realtime/RealtimeLog.js
@@ -3,7 +3,7 @@ import { StatusLight, Icon, Text } from 'react-basics';
 import { FixedSizeList } from 'react-window';
 import firstBy from 'thenby';
 import FilterButtons from 'components/common/FilterButtons';
-import NoData from 'components/common/NoData';
+import Empty from 'components/common/Empty';
 import useLocale from 'hooks/useLocale';
 import useCountryNames from 'hooks/useCountryNames';
 import { BROWSERS } from 'lib/constants';
@@ -144,7 +144,7 @@ export function RealtimeLog({ data, websiteDomain }) {
       <FilterButtons items={buttons} selectedKey={filter} onSelect={setFilter} />
       <div className={styles.header}>{formatMessage(labels.activityLog)}</div>
       <div className={styles.body}>
-        {logs?.length === 0 && <NoData />}
+        {logs?.length === 0 && <Empty />}
         {logs?.length > 0 && (
           <FixedSizeList height={500} itemCount={logs.length} itemSize={50}>
             {Row}
diff --git a/components/pages/reports/FieldAggregateForm.js b/components/pages/reports/FieldAggregateForm.js
new file mode 100644
index 00000000..f4298c16
--- /dev/null
+++ b/components/pages/reports/FieldAggregateForm.js
@@ -0,0 +1,38 @@
+import { Form, FormRow, Menu, Item } from 'react-basics';
+
+const options = {
+  number: [
+    { label: 'SUM', value: 'sum' },
+    { label: 'AVERAGE', value: 'average' },
+    { label: 'MIN', value: 'min' },
+    { label: 'MAX', value: 'max' },
+  ],
+  date: [
+    { label: 'MIN', value: 'min' },
+    { label: 'MAX', value: 'max' },
+  ],
+  string: [
+    { label: 'COUNT', value: 'count' },
+    { label: 'DISTINCT', value: 'distinct' },
+  ],
+};
+
+export default function FieldAggregateForm({ name, type, onSelect }) {
+  const items = options[type];
+
+  const handleSelect = value => {
+    onSelect({ name, value });
+  };
+
+  return (
+    <Form>
+      <FormRow label={name}>
+        <Menu onSelect={handleSelect}>
+          {items.map(({ label, value }) => {
+            return <Item key={value}>{label}</Item>;
+          })}
+        </Menu>
+      </FormRow>
+    </Form>
+  );
+}
diff --git a/components/pages/reports/FieldFilterForm.js b/components/pages/reports/FieldFilterForm.js
new file mode 100644
index 00000000..e4272c69
--- /dev/null
+++ b/components/pages/reports/FieldFilterForm.js
@@ -0,0 +1,57 @@
+import { useState } from 'react';
+import { Form, FormRow, Menu, Item, Flexbox, Dropdown, TextField, Button } from 'react-basics';
+import { useFilters } from 'hooks';
+import styles from './FieldFilterForm.module.css';
+
+export default function FieldFilterForm({ name, type, onSelect }) {
+  const [filter, setFilter] = useState('');
+  const [value, setValue] = useState('');
+  const { filters, types } = useFilters();
+  const items = types[type];
+
+  const renderValue = value => {
+    return filters[value];
+  };
+
+  if (type === 'boolean') {
+    return (
+      <Form>
+        <FormRow label={name}>
+          <Menu onSelect={value => onSelect({ name, value: ['eq', value] })}>
+            {items.map(value => {
+              return <Item key={value}>{filters[value]}</Item>;
+            })}
+          </Menu>
+        </FormRow>
+      </Form>
+    );
+  }
+
+  return (
+    <Form>
+      <FormRow label={name} className={styles.filter}>
+        <Flexbox gap={10}>
+          <Dropdown
+            className={styles.dropdown}
+            items={items}
+            value={filter}
+            renderValue={renderValue}
+            onChange={setFilter}
+          >
+            {value => {
+              return <Item key={value}>{filters[value]}</Item>;
+            }}
+          </Dropdown>
+          <TextField value={value} onChange={e => setValue(e.target.value)} autoFocus={true} />
+        </Flexbox>
+        <Button
+          variant="primary"
+          onClick={() => onSelect({ name, value: [filter, value] })}
+          disabled={!filter || !value}
+        >
+          Add
+        </Button>
+      </FormRow>
+    </Form>
+  );
+}
diff --git a/components/pages/reports/FieldFilterForm.module.css b/components/pages/reports/FieldFilterForm.module.css
new file mode 100644
index 00000000..f0cc46f3
--- /dev/null
+++ b/components/pages/reports/FieldFilterForm.module.css
@@ -0,0 +1,17 @@
+.selected {
+  font-weight: bold;
+}
+
+.popup {
+  display: flex;
+}
+
+.filter {
+  display: flex;
+  flex-direction: column;
+  gap: 20px;
+}
+
+.dropdown {
+  min-width: 60px;
+}
diff --git a/components/pages/reports/FieldSelectForm.js b/components/pages/reports/FieldSelectForm.js
new file mode 100644
index 00000000..1ff6412a
--- /dev/null
+++ b/components/pages/reports/FieldSelectForm.js
@@ -0,0 +1,24 @@
+import { Menu, Item, Form, FormRow } from 'react-basics';
+import { useMessages } from 'hooks';
+import styles from './FieldSelectForm.module.css';
+
+export default function FieldSelectForm({ fields, onSelect }) {
+  const { formatMessage, labels } = useMessages();
+
+  return (
+    <Form>
+      <FormRow label={formatMessage(labels.fields)}>
+        <Menu className={styles.menu} onSelect={key => onSelect(fields[key])}>
+          {fields.map(({ name, type }, index) => {
+            return (
+              <Item key={index} className={styles.item}>
+                <div>{name}</div>
+                <div className={styles.type}>{type}</div>
+              </Item>
+            );
+          })}
+        </Menu>
+      </FormRow>
+    </Form>
+  );
+}
diff --git a/components/pages/reports/FieldSelectForm.module.css b/components/pages/reports/FieldSelectForm.module.css
new file mode 100644
index 00000000..3a5ed9b8
--- /dev/null
+++ b/components/pages/reports/FieldSelectForm.module.css
@@ -0,0 +1,20 @@
+.menu {
+  width: 360px;
+  max-height: 300px;
+  overflow: auto;
+}
+
+.item {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  border-radius: var(--border-radius);
+}
+
+.item:hover {
+  background: var(--base75);
+}
+
+.type {
+  color: var(--font-color300);
+}
diff --git a/components/pages/reports/ParameterList.js b/components/pages/reports/ParameterList.js
new file mode 100644
index 00000000..604f6223
--- /dev/null
+++ b/components/pages/reports/ParameterList.js
@@ -0,0 +1,33 @@
+import { Icon, Text, TooltipPopup } from 'react-basics';
+import Icons from 'components/icons';
+import Empty from 'components/common/Empty';
+import { useMessages } from 'hooks';
+import styles from './ParameterList.module.css';
+
+export function ParameterList({ items = [], children, onRemove }) {
+  const { formatMessage, labels } = useMessages();
+
+  return (
+    <div className={styles.list}>
+      {!items.length && <Empty message={formatMessage(labels.none)} />}
+      {items.map((item, index) => {
+        return (
+          <div key={index} className={styles.item}>
+            <Text>{typeof children === 'function' ? children(item) : item}</Text>
+            <TooltipPopup
+              className={styles.icon}
+              label={formatMessage(labels.remove)}
+              position="right"
+            >
+              <Icon onClick={onRemove.bind(null, index)}>
+                <Icons.Close />
+              </Icon>
+            </TooltipPopup>
+          </div>
+        );
+      })}
+    </div>
+  );
+}
+
+export default ParameterList;
diff --git a/components/pages/reports/funnel/FunnelParameters.module.css b/components/pages/reports/ParameterList.module.css
similarity index 95%
rename from components/pages/reports/funnel/FunnelParameters.module.css
rename to components/pages/reports/ParameterList.module.css
index 98ae0831..601b37e5 100644
--- a/components/pages/reports/funnel/FunnelParameters.module.css
+++ b/components/pages/reports/ParameterList.module.css
@@ -1,10 +1,10 @@
-.urls {
+.list {
   display: flex;
   flex-direction: column;
   gap: 16px;
 }
 
-.url {
+.item {
   display: flex;
   flex-direction: row;
   align-items: center;
diff --git a/components/pages/reports/PopupForm.js b/components/pages/reports/PopupForm.js
new file mode 100644
index 00000000..0f0ead36
--- /dev/null
+++ b/components/pages/reports/PopupForm.js
@@ -0,0 +1,30 @@
+import { createPortal } from 'react-dom';
+import { useDocumentClick, useKeyDown } from 'react-basics';
+import classNames from 'classnames';
+import styles from './PopupForm.module.css';
+
+export function PopupForm({ element, className, children, onClose }) {
+  const { right, top } = element.getBoundingClientRect();
+  const style = { position: 'absolute', left: right, top };
+
+  useKeyDown('Escape', onClose);
+
+  useDocumentClick(e => {
+    if (e.target !== element && !element?.parentElement?.contains(e.target)) {
+      onClose();
+    }
+  });
+
+  const handleClick = e => {
+    e.stopPropagation();
+  };
+
+  return createPortal(
+    <div className={classNames(styles.form, className)} style={style} onClick={handleClick}>
+      {children}
+    </div>,
+    document.body,
+  );
+}
+
+export default PopupForm;
diff --git a/components/pages/reports/PopupForm.module.css b/components/pages/reports/PopupForm.module.css
new file mode 100644
index 00000000..4daf199a
--- /dev/null
+++ b/components/pages/reports/PopupForm.module.css
@@ -0,0 +1,10 @@
+.form {
+  position: absolute;
+  background: var(--base50);
+  min-width: 300px;
+  padding: 20px;
+  margin-left: 30px;
+  border: 1px solid var(--base400);
+  border-radius: var(--border-radius);
+  box-shadow: 0 0 0 5px rgba(0, 0, 0, 0.1);
+}
diff --git a/components/pages/reports/Report.js b/components/pages/reports/Report.js
index 0a98ef75..685ebb9f 100644
--- a/components/pages/reports/Report.js
+++ b/components/pages/reports/Report.js
@@ -8,6 +8,8 @@ export const ReportContext = createContext(null);
 export function Report({ reportId, defaultParameters, children, ...props }) {
   const report = useReport(reportId, defaultParameters);
 
+  //console.log({ report });
+
   return (
     <ReportContext.Provider value={{ ...report }}>
       <Page {...props} className={styles.container}>
diff --git a/components/pages/reports/ReportDetails.js b/components/pages/reports/ReportDetails.js
new file mode 100644
index 00000000..c41d12f6
--- /dev/null
+++ b/components/pages/reports/ReportDetails.js
@@ -0,0 +1,13 @@
+import FunnelReport from './funnel/FunnelReport';
+import EventDataReport from './event-data/EventDataReport';
+
+const reports = {
+  funnel: FunnelReport,
+  'event-data': EventDataReport,
+};
+
+export default function ReportDetails({ reportId, reportType }) {
+  const Report = reports[reportType];
+
+  return <Report reportId={reportId} />;
+}
diff --git a/components/pages/reports/event-data/EventDataParameters.js b/components/pages/reports/event-data/EventDataParameters.js
index 8255ae92..c703f9bf 100644
--- a/components/pages/reports/event-data/EventDataParameters.js
+++ b/components/pages/reports/event-data/EventDataParameters.js
@@ -1,17 +1,25 @@
 import { useContext, useRef } from 'react';
 import { useApi, useMessages } from 'hooks';
-import { Form, FormRow, FormButtons, SubmitButton, Loading } from 'react-basics';
+import { Form, FormRow, FormButtons, SubmitButton, PopupTrigger, Icon, Popup } from 'react-basics';
 import { ReportContext } from 'components/pages/reports/Report';
-import NoData from 'components/common/NoData';
-import styles from './EventDataParameters.module.css';
+import Empty from 'components/common/Empty';
 import { DATA_TYPES } from 'lib/constants';
 import BaseParameters from '../BaseParameters';
+import FieldAddForm from './FieldAddForm';
+import ParameterList from '../ParameterList';
+import Icons from 'components/icons';
+import styles from './EventDataParameters.module.css';
 
 function useFields(websiteId, startDate, endDate) {
   const { get, useQuery } = useApi();
   const { data, error, isLoading } = useQuery(
     ['fields', websiteId, startDate, endDate],
-    () => get('/reports/event-data', { websiteId, startAt: +startDate, endAt: +endDate }),
+    () =>
+      get('/reports/event-data', {
+        websiteId,
+        startAt: +startDate,
+        endAt: +endDate,
+      }),
     { enabled: !!(websiteId && startDate && endDate) },
   );
 
@@ -19,35 +27,111 @@ function useFields(websiteId, startDate, endDate) {
 }
 
 export function EventDataParameters() {
-  const { report, runReport, isRunning } = useContext(ReportContext);
-  const { formatMessage, labels } = useMessages();
+  const { report, runReport, updateReport, isRunning } = useContext(ReportContext);
+  const { formatMessage, labels, messages } = useMessages();
   const ref = useRef(null);
   const { parameters } = report || {};
-  const { websiteId, dateRange } = parameters || {};
+  const { websiteId, dateRange, fields, filters, groups } = parameters || {};
   const { startDate, endDate } = dateRange || {};
   const queryDisabled = !websiteId || !dateRange;
-  const { data, error, isLoading } = useFields(websiteId, startDate, endDate);
+  const { data, error } = useFields(websiteId, startDate, endDate);
+  const parametersSelected = websiteId && startDate && endDate;
+  const hasData = data?.length !== 0;
+
+  const parameterGroups = [
+    { label: formatMessage(labels.fields), type: 'fields' },
+    { label: formatMessage(labels.filters), type: 'filters' },
+    { label: formatMessage(labels.groupBy), type: 'groups' },
+  ];
+
+  const parameterData = {
+    fields,
+    filters,
+    groups,
+  };
 
   const handleSubmit = values => {
     runReport(values);
   };
 
+  const handleAdd = (type, value) => {
+    const data = parameterData[type];
+    updateReport({ parameters: { [type]: data.concat(value) } });
+  };
+
+  const handleRemove = (type, index) => {
+    const data = [...parameterData[type]];
+    data.splice(index, 1);
+    updateReport({ parameters: { [type]: data } });
+  };
+
+  const AddButton = ({ type }) => {
+    return (
+      <PopupTrigger>
+        <Icon>
+          <Icons.Plus />
+        </Icon>
+        <Popup position="bottom" alignment="start">
+          {(close, element) => {
+            return (
+              <FieldAddForm
+                type={type}
+                fields={data.map(({ eventKey, eventDataType }) => ({
+                  name: eventKey,
+                  type: DATA_TYPES[eventDataType],
+                }))}
+                element={element}
+                onAdd={handleAdd}
+                onClose={close}
+              />
+            );
+          }}
+        </Popup>
+      </PopupTrigger>
+    );
+  };
+
   return (
     <Form ref={ref} values={parameters} error={error} onSubmit={handleSubmit}>
       <BaseParameters />
-      <FormRow label={formatMessage(labels.fields)}>
-        <div className={styles.fields}>
-          {!data?.length && <NoData />}
-          {data?.map?.(({ eventKey, eventDataType }) => {
-            return (
-              <div className={styles.field} key={eventKey}>
-                <div className={styles.key}>{eventKey}</div>
-                <div className={styles.type}>{DATA_TYPES[eventDataType]}</div>
-              </div>
-            );
-          })}
-        </div>
-      </FormRow>
+      {!hasData && <Empty message={formatMessage(messages.noEventData)} />}
+      {parametersSelected &&
+        hasData &&
+        parameterGroups.map(({ label, type }) => {
+          return (
+            <FormRow key={label} label={label} action={<AddButton type={type} onAdd={handleAdd} />}>
+              <ParameterList
+                items={parameterData[type]}
+                onRemove={index => handleRemove(type, index)}
+              >
+                {({ name, value }) => {
+                  return (
+                    <div className={styles.parameter}>
+                      {type === 'fields' && (
+                        <>
+                          <div className={styles.op}>{value}</div>
+                          <div>{name}</div>
+                        </>
+                      )}
+                      {type === 'filters' && (
+                        <>
+                          <div>{name}</div>
+                          <div className={styles.op}>{value[0]}</div>
+                          <div>{value[1]}</div>
+                        </>
+                      )}
+                      {type === 'groups' && (
+                        <>
+                          <div>{name}</div>
+                        </>
+                      )}
+                    </div>
+                  );
+                }}
+              </ParameterList>
+            </FormRow>
+          );
+        })}
       <FormButtons>
         <SubmitButton variant="primary" disabled={queryDisabled} loading={isRunning}>
           {formatMessage(labels.runQuery)}
diff --git a/components/pages/reports/event-data/EventDataParameters.module.css b/components/pages/reports/event-data/EventDataParameters.module.css
index 66c82842..435cb1f6 100644
--- a/components/pages/reports/event-data/EventDataParameters.module.css
+++ b/components/pages/reports/event-data/EventDataParameters.module.css
@@ -1,27 +1,8 @@
-.fields {
-  max-height: 300px;
-  overflow: auto;
-}
-
-.field {
+.parameter {
   display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-  height: 30px;
-  cursor: pointer;
-  padding: 4px;
-  border-radius: var(--border-radius);
+  gap: 10px;
 }
 
-.field:hover {
-  background: var(--base75);
-}
-
-.key {
-  font-weight: 400;
-}
-
-.type {
-  color: var(--font-color300);
+.op {
+  font-weight: bold;
 }
diff --git a/components/pages/reports/event-data/EventDataReport.js b/components/pages/reports/event-data/EventDataReport.js
index 16382982..b3358ecf 100644
--- a/components/pages/reports/event-data/EventDataReport.js
+++ b/components/pages/reports/event-data/EventDataReport.js
@@ -4,10 +4,11 @@ import ReportMenu from '../ReportMenu';
 import ReportBody from '../ReportBody';
 import EventDataParameters from './EventDataParameters';
 import Nodes from 'assets/nodes.svg';
+import EventDataTable from './EventDataTable';
 
 const defaultParameters = {
   type: 'event-data',
-  parameters: { fields: [], filters: [] },
+  parameters: { fields: [], filters: [], groups: [] },
 };
 
 export default function EventDataReport({ reportId }) {
@@ -17,7 +18,9 @@ export default function EventDataReport({ reportId }) {
       <ReportMenu>
         <EventDataParameters />
       </ReportMenu>
-      <ReportBody>hi.</ReportBody>
+      <ReportBody>
+        <EventDataTable />
+      </ReportBody>
     </Report>
   );
 }
diff --git a/components/pages/reports/event-data/EventDataTable.js b/components/pages/reports/event-data/EventDataTable.js
new file mode 100644
index 00000000..ffe9fb3a
--- /dev/null
+++ b/components/pages/reports/event-data/EventDataTable.js
@@ -0,0 +1,20 @@
+import { useContext } from 'react';
+import DataTable from 'components/metrics/DataTable';
+import { useMessages } from 'hooks';
+import { ReportContext } from '../Report';
+
+export function EventDataTable() {
+  const { report } = useContext(ReportContext);
+  const { formatMessage, labels } = useMessages();
+
+  return (
+    <DataTable
+      data={report?.data}
+      title={formatMessage(labels.eventData)}
+      metric="#"
+      showPercentage={true}
+    />
+  );
+}
+
+export default EventDataTable;
diff --git a/components/pages/reports/event-data/FieldAddForm.js b/components/pages/reports/event-data/FieldAddForm.js
index b0258608..df71b370 100644
--- a/components/pages/reports/event-data/FieldAddForm.js
+++ b/components/pages/reports/event-data/FieldAddForm.js
@@ -1,27 +1,35 @@
-import { useMessages } from 'hooks';
-import { Button, Form, FormButtons, FormRow } from 'react-basics';
+import { useState } from 'react';
+import { createPortal } from 'react-dom';
+import PopupForm from '../PopupForm';
+import FieldSelectForm from '../FieldSelectForm';
+import FieldAggregateForm from '../FieldAggregateForm';
+import FieldFilterForm from '../FieldFilterForm';
+import styles from './FieldAddForm.module.css';
 
-export function FieldAddForm({ onClose }) {
-  const { formatMessage, labels } = useMessages();
+export function FieldAddForm({ fields = [], type, element, onAdd, onClose }) {
+  const [selected, setSelected] = useState();
 
-  const handleSave = () => {
+  const handleSelect = value => {
+    if (type === 'groups') {
+      handleSave(value);
+      return;
+    }
+
+    setSelected(value);
+  };
+
+  const handleSave = value => {
+    onAdd(type, value);
     onClose();
   };
 
-  const handleClose = () => {
-    onClose();
-  };
-
-  return (
-    <Form>
-      <FormRow label={formatMessage(labels.url)}></FormRow>
-      <FormButtons align="center" flex>
-        <Button variant="primary" onClick={handleSave}>
-          {formatMessage(labels.save)}
-        </Button>
-        <Button onClick={handleClose}>{formatMessage(labels.cancel)}</Button>
-      </FormButtons>
-    </Form>
+  return createPortal(
+    <PopupForm className={styles.popup} element={element} onClose={onClose}>
+      {!selected && <FieldSelectForm fields={fields} type={type} onSelect={handleSelect} />}
+      {selected && type === 'fields' && <FieldAggregateForm {...selected} onSelect={handleSave} />}
+      {selected && type === 'filters' && <FieldFilterForm {...selected} onSelect={handleSave} />}
+    </PopupForm>,
+    document.body,
   );
 }
 
diff --git a/components/pages/reports/event-data/FieldAddForm.module.css b/components/pages/reports/event-data/FieldAddForm.module.css
new file mode 100644
index 00000000..5c5aaa4f
--- /dev/null
+++ b/components/pages/reports/event-data/FieldAddForm.module.css
@@ -0,0 +1,38 @@
+.menu {
+  width: 360px;
+  max-height: 300px;
+  overflow: auto;
+}
+
+.item {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  border-radius: var(--border-radius);
+}
+
+.item:hover {
+  background: var(--base75);
+}
+
+.type {
+  color: var(--font-color300);
+}
+
+.selected {
+  font-weight: bold;
+}
+
+.popup {
+  display: flex;
+}
+
+.filter {
+  display: flex;
+  flex-direction: column;
+  gap: 20px;
+}
+
+.dropdown {
+  min-width: 60px;
+}
diff --git a/components/pages/reports/funnel/FunnelParameters.js b/components/pages/reports/funnel/FunnelParameters.js
index 5ce671a8..ae498176 100644
--- a/components/pages/reports/funnel/FunnelParameters.js
+++ b/components/pages/reports/funnel/FunnelParameters.js
@@ -9,15 +9,13 @@ import {
   PopupTrigger,
   Popup,
   SubmitButton,
-  Text,
   TextField,
-  TooltipPopup,
 } from 'react-basics';
 import Icons from 'components/icons';
 import UrlAddForm from './UrlAddForm';
 import { ReportContext } from 'components/pages/reports/Report';
-import styles from './FunnelParameters.module.css';
 import BaseParameters from '../BaseParameters';
+import ParameterList from '../ParameterList';
 
 export function FunnelParameters() {
   const { report, runReport, updateReport, isRunning } = useContext(ReportContext);
@@ -28,7 +26,9 @@ export function FunnelParameters() {
   const { websiteId, dateRange, urls } = parameters || {};
   const queryDisabled = !websiteId || !dateRange || urls?.length < 2;
 
-  const handleSubmit = data => {
+  const handleSubmit = (data, e) => {
+    e.stopPropagation();
+    e.preventDefault();
     if (!queryDisabled) {
       runReport(data);
     }
@@ -45,8 +45,23 @@ export function FunnelParameters() {
     updateReport({ parameters: { urls } });
   };
 
+  const AddUrlButton = () => {
+    return (
+      <PopupTrigger>
+        <Icon>
+          <Icons.Plus />
+        </Icon>
+        <Popup position="bottom" alignment="start">
+          {(close, element) => {
+            return <UrlAddForm element={element} onAdd={handleAddUrl} onClose={close} />;
+          }}
+        </Popup>
+      </PopupTrigger>
+    );
+  };
+
   return (
-    <Form ref={ref} values={parameters} onSubmit={handleSubmit}>
+    <Form ref={ref} values={parameters} onSubmit={handleSubmit} preventSubmit={true}>
       <BaseParameters />
       <FormRow label={formatMessage(labels.window)}>
         <FormInput
@@ -56,25 +71,8 @@ export function FunnelParameters() {
           <TextField autoComplete="off" />
         </FormInput>
       </FormRow>
-      <FormRow label={formatMessage(labels.urls)} action={<AddUrlButton onAdd={handleAddUrl} />}>
-        <div className={styles.urls}>
-          {parameters?.urls?.map((url, index) => {
-            return (
-              <div key={index} className={styles.url}>
-                <Text>{url}</Text>
-                <TooltipPopup
-                  className={styles.icon}
-                  label={formatMessage(labels.remove)}
-                  position="right"
-                >
-                  <Icon onClick={handleRemoveUrl.bind(null, index)}>
-                    <Icons.Close />
-                  </Icon>
-                </TooltipPopup>
-              </div>
-            );
-          })}
-        </div>
+      <FormRow label={formatMessage(labels.urls)} action={<AddUrlButton />}>
+        <ParameterList items={urls} onRemove={handleRemoveUrl} />
       </FormRow>
       <FormButtons>
         <SubmitButton variant="primary" disabled={queryDisabled} loading={isRunning}>
@@ -85,25 +83,4 @@ export function FunnelParameters() {
   );
 }
 
-function AddUrlButton({ onAdd }) {
-  const { formatMessage, labels } = useMessages();
-
-  return (
-    <PopupTrigger>
-      <TooltipPopup label={formatMessage(labels.addUrl)}>
-        <Icon>
-          <Icons.Plus />
-        </Icon>
-      </TooltipPopup>
-      <Popup position="bottom" alignment="start">
-        {(close, element) => {
-          const { right, bottom } = element.getBoundingClientRect();
-
-          return <UrlAddForm onSave={onAdd} onClose={close} style={{ left: right, top: bottom }} />;
-        }}
-      </Popup>
-    </PopupTrigger>
-  );
-}
-
 export default FunnelParameters;
diff --git a/components/pages/reports/funnel/UrlAddForm.js b/components/pages/reports/funnel/UrlAddForm.js
index b1ee37f0..0fb78b3d 100644
--- a/components/pages/reports/funnel/UrlAddForm.js
+++ b/components/pages/reports/funnel/UrlAddForm.js
@@ -1,16 +1,15 @@
 import { useState } from 'react';
-import { createPortal } from 'react-dom';
 import { useMessages } from 'hooks';
 import { Button, Form, FormRow, TextField, Flexbox } from 'react-basics';
 import styles from './UrlAddForm.module.css';
+import PopupForm from '../PopupForm';
 
-export function UrlAddForm({ defaultValue = '', style, onSave, onClose }) {
+export function UrlAddForm({ defaultValue = '', element, onAdd, onClose }) {
   const [url, setUrl] = useState(defaultValue);
   const { formatMessage, labels } = useMessages();
 
-  const handleSave = e => {
-    e?.stopPropagation?.();
-    onSave?.(url);
+  const handleSave = () => {
+    onAdd(url);
     setUrl('');
     onClose();
   };
@@ -19,29 +18,33 @@ export function UrlAddForm({ defaultValue = '', style, onSave, onClose }) {
     setUrl(e.target.value);
   };
 
-  const handleClick = e => {
-    e.stopPropagation();
+  const handleKeyDown = e => {
+    if (e.key === 'Enter') {
+      e.stopPropagation();
+      handleSave();
+    }
   };
 
-  return createPortal(
-    <Form className={styles.form} onSubmit={handleSave} style={style} onClick={handleClick}>
-      <FormRow label={formatMessage(labels.url)}>
-        <Flexbox gap={10}>
-          <TextField
-            className={styles.input}
-            name="url"
-            value={url}
-            onChange={handleChange}
-            autoFocus={true}
-            autoComplete="off"
-          />
-          <Button variant="primary" onClick={handleSave}>
-            {formatMessage(labels.add)}
-          </Button>
-        </Flexbox>
-      </FormRow>
-    </Form>,
-    document.body,
+  return (
+    <PopupForm element={element}>
+      <Form>
+        <FormRow label={formatMessage(labels.url)}>
+          <Flexbox gap={10}>
+            <TextField
+              className={styles.input}
+              value={url}
+              onChange={handleChange}
+              autoFocus={true}
+              autoComplete="off"
+              onKeyDown={handleKeyDown}
+            />
+            <Button variant="primary" onClick={handleSave}>
+              {formatMessage(labels.add)}
+            </Button>
+          </Flexbox>
+        </FormRow>
+      </Form>
+    </PopupForm>
   );
 }
 
diff --git a/hooks/index.js b/hooks/index.js
index cca6ca29..892d52e4 100644
--- a/hooks/index.js
+++ b/hooks/index.js
@@ -4,6 +4,7 @@ export * from './useCountryNames';
 export * from './useDateRange';
 export * from './useDocumentClick';
 export * from './useEscapeKey';
+export * from './useFilters';
 export * from './useForceUpdate';
 export * from './useLanguageNames';
 export * from './useLocale';
diff --git a/hooks/useFilters.js b/hooks/useFilters.js
new file mode 100644
index 00000000..ae01aadb
--- /dev/null
+++ b/hooks/useFilters.js
@@ -0,0 +1,32 @@
+import { useMessages } from 'hooks';
+
+export function useFilters() {
+  const { formatMessage, labels } = useMessages();
+
+  const filters = {
+    eq: formatMessage(labels.equals),
+    neq: formatMessage(labels.doesNotEqual),
+    c: formatMessage(labels.contains),
+    dnc: formatMessage(labels.doesNotContain),
+    t: formatMessage(labels.true),
+    f: formatMessage(labels.false),
+    gt: formatMessage(labels.greaterThan),
+    lt: formatMessage(labels.lessThan),
+    gte: formatMessage(labels.greaterThanEquals),
+    lte: formatMessage(labels.lessThanEquals),
+    be: formatMessage(labels.before),
+    af: formatMessage(labels.after),
+  };
+
+  const types = {
+    string: ['eq', 'neq'],
+    array: ['c', 'dnc'],
+    boolean: ['t', 'f'],
+    number: ['eq', 'neq', 'gt', 'lt', 'gte', 'lte'],
+    date: ['be', 'af'],
+  };
+
+  return { filters, types };
+}
+
+export default useFilters;
diff --git a/hooks/useReport.js b/hooks/useReport.js
index 5bd5624f..e036fc3a 100644
--- a/hooks/useReport.js
+++ b/hooks/useReport.js
@@ -16,6 +16,14 @@ export function useReport(reportId, defaultParameters) {
   const loadReport = async id => {
     const data = await get(`/reports/${id}`);
 
+    const { dateRange } = data?.parameters || {};
+    const { startDate, endDate } = dateRange || {};
+
+    if (startDate && endDate) {
+      dateRange.startDate = new Date(startDate);
+      dateRange.endDate = new Date(endDate);
+    }
+
     setReport(data);
   };
 
diff --git a/lib/constants.ts b/lib/constants.ts
index 15b2444d..16f119fb 100644
--- a/lib/constants.ts
+++ b/lib/constants.ts
@@ -62,7 +62,7 @@ export const EVENT_TYPE = {
   customEvent: 2,
 } as const;
 
-export const DYNAMIC_DATA_TYPE = {
+export const DATA_TYPE = {
   string: 1,
   number: 2,
   boolean: 3,
@@ -71,11 +71,11 @@ export const DYNAMIC_DATA_TYPE = {
 } as const;
 
 export const DATA_TYPES = {
-  [DYNAMIC_DATA_TYPE.string]: 'string',
-  [DYNAMIC_DATA_TYPE.number]: 'number',
-  [DYNAMIC_DATA_TYPE.boolean]: 'boolean',
-  [DYNAMIC_DATA_TYPE.date]: 'date',
-  [DYNAMIC_DATA_TYPE.array]: 'array',
+  [DATA_TYPE.string]: 'string',
+  [DATA_TYPE.number]: 'number',
+  [DATA_TYPE.boolean]: 'boolean',
+  [DATA_TYPE.date]: 'date',
+  [DATA_TYPE.array]: 'array',
 };
 
 export const KAFKA_TOPIC = {
diff --git a/lib/dynamicData.ts b/lib/dynamicData.ts
index da8eb8b2..c2c53de3 100644
--- a/lib/dynamicData.ts
+++ b/lib/dynamicData.ts
@@ -1,5 +1,5 @@
 import { isValid, parseISO } from 'date-fns';
-import { DYNAMIC_DATA_TYPE } from './constants';
+import { DATA_TYPE } from './constants';
 import { DynamicDataType } from './types';
 
 export function flattenJSON(
@@ -42,24 +42,24 @@ function createKey(key, value, acc: { keyValues: any[]; parentKey: string }) {
 
   switch (type) {
     case 'number':
-      dynamicDataType = DYNAMIC_DATA_TYPE.number;
+      dynamicDataType = DATA_TYPE.number;
       break;
     case 'string':
-      dynamicDataType = DYNAMIC_DATA_TYPE.string;
+      dynamicDataType = DATA_TYPE.string;
       break;
     case 'boolean':
-      dynamicDataType = DYNAMIC_DATA_TYPE.boolean;
+      dynamicDataType = DATA_TYPE.boolean;
       value = value ? 'true' : 'false';
       break;
     case 'date':
-      dynamicDataType = DYNAMIC_DATA_TYPE.date;
+      dynamicDataType = DATA_TYPE.date;
       break;
     case 'object':
-      dynamicDataType = DYNAMIC_DATA_TYPE.array;
+      dynamicDataType = DATA_TYPE.array;
       value = JSON.stringify(value);
       break;
     default:
-      dynamicDataType = DYNAMIC_DATA_TYPE.string;
+      dynamicDataType = DATA_TYPE.string;
       break;
   }
 
diff --git a/lib/types.ts b/lib/types.ts
index 05c09120..5841ac35 100644
--- a/lib/types.ts
+++ b/lib/types.ts
@@ -1,5 +1,5 @@
 import { NextApiRequest } from 'next';
-import { COLLECTION_TYPE, DYNAMIC_DATA_TYPE, EVENT_TYPE, KAFKA_TOPIC, ROLES } from './constants';
+import { COLLECTION_TYPE, DATA_TYPE, EVENT_TYPE, KAFKA_TOPIC, ROLES } from './constants';
 
 type ObjectValues<T> = T[keyof T];
 
@@ -9,7 +9,7 @@ export type Role = ObjectValues<typeof ROLES>;
 
 export type EventType = ObjectValues<typeof EVENT_TYPE>;
 
-export type DynamicDataType = ObjectValues<typeof DYNAMIC_DATA_TYPE>;
+export type DynamicDataType = ObjectValues<typeof DATA_TYPE>;
 
 export type KafkaTopic = ObjectValues<typeof KAFKA_TOPIC>;
 
diff --git a/pages/reports/[id].js b/pages/reports/[id].js
index 95f20a78..36a84a2e 100644
--- a/pages/reports/[id].js
+++ b/pages/reports/[id].js
@@ -1,20 +1,24 @@
 import { useRouter } from 'next/router';
 import AppLayout from 'components/layout/AppLayout';
-import FunnelReport from 'components/pages/reports/funnel/FunnelReport';
-import useMessages from 'hooks/useMessages';
+import ReportDetails from 'components/pages/reports/ReportDetails';
+import { useApi, useMessages } from 'hooks';
 
 export default function ReportsPage() {
   const { formatMessage, labels } = useMessages();
   const router = useRouter();
   const { id } = router.query;
+  const { get, useQuery } = useApi();
+  const { data: report } = useQuery(['reports', id], () => get(`/reports/${id}`), {
+    enabled: !!id,
+  });
 
-  if (!id) {
+  if (!id || !report) {
     return null;
   }
 
   return (
     <AppLayout title={formatMessage(labels.websites)}>
-      <FunnelReport reportId={id} />
+      <ReportDetails reportId={report.id} reportType={report.type} />
     </AppLayout>
   );
 }
diff --git a/public/intl/messages/ru-RU.json b/public/intl/messages/ru-RU.json
index 6048d7e9..d15b9fac 100644
--- a/public/intl/messages/ru-RU.json
+++ b/public/intl/messages/ru-RU.json
@@ -230,7 +230,7 @@
   "label.edit": [
     {
       "type": 0,
-      "value": "Редактировать"
+      "value": "Изменить"
     }
   ],
   "label.edit-dashboard": [
@@ -820,15 +820,7 @@
   "message.delete-website": [
     {
       "type": 0,
-      "value": "To delete this website, type "
-    },
-    {
-      "type": 1,
-      "value": "confirmation"
-    },
-    {
-      "type": 0,
-      "value": " in the box below to confirm."
+      "value": "Для удаления введите DELETE"
     }
   ],
   "message.delete-website-warning": [
@@ -922,15 +914,7 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "To reset this website, type "
-    },
-    {
-      "type": 1,
-      "value": "confirmation"
-    },
-    {
-      "type": 0,
-      "value": " in the box below to confirm."
+      "value": "Для сброса введите RESET"
     }
   ],
   "message.reset-website-warning": [
diff --git a/public/intl/messages/sv-SE.json b/public/intl/messages/sv-SE.json
index 59e9721a..dc9ee53c 100644
--- a/public/intl/messages/sv-SE.json
+++ b/public/intl/messages/sv-SE.json
@@ -14,7 +14,7 @@
   "label.activity-log": [
     {
       "type": 0,
-      "value": "Activity log"
+      "value": "Aktivitetslogg"
     }
   ],
   "label.add-website": [
@@ -44,7 +44,7 @@
   "label.analytics": [
     {
       "type": 0,
-      "value": "Analytics"
+      "value": "Analys"
     }
   ],
   "label.average-visit-time": [
@@ -86,19 +86,19 @@
   "label.cities": [
     {
       "type": 0,
-      "value": "Cities"
+      "value": "Städer"
     }
   ],
   "label.clear-all": [
     {
       "type": 0,
-      "value": "Clear all"
+      "value": "Rensa alla"
     }
   ],
   "label.confirm": [
     {
       "type": 0,
-      "value": "Confirm"
+      "value": "Bekräfta"
     }
   ],
   "label.confirm-password": [
@@ -110,7 +110,7 @@
   "label.continue": [
     {
       "type": 0,
-      "value": "Continue"
+      "value": "Fortsätt"
     }
   ],
   "label.countries": [
@@ -122,19 +122,19 @@
   "label.create-team": [
     {
       "type": 0,
-      "value": "Create team"
+      "value": "Skapa team"
     }
   ],
   "label.create-user": [
     {
       "type": 0,
-      "value": "Create user"
+      "value": "Skapa användare"
     }
   ],
   "label.created": [
     {
       "type": 0,
-      "value": "Created"
+      "value": "Skapad"
     }
   ],
   "label.current-password": [
@@ -182,13 +182,13 @@
   "label.delete-team": [
     {
       "type": 0,
-      "value": "Delete team"
+      "value": "Radera team"
     }
   ],
   "label.delete-user": [
     {
       "type": 0,
-      "value": "Delete user"
+      "value": "Radera användare"
     }
   ],
   "label.delete-website": [
@@ -206,7 +206,7 @@
   "label.details": [
     {
       "type": 0,
-      "value": "Details"
+      "value": "Detailjer"
     }
   ],
   "label.devices": [
@@ -236,7 +236,7 @@
   "label.edit-dashboard": [
     {
       "type": 0,
-      "value": "Edit dashboard"
+      "value": "Redigera översikt"
     }
   ],
   "label.enable-share-url": [
@@ -278,13 +278,13 @@
   "label.join": [
     {
       "type": 0,
-      "value": "Join"
+      "value": "Gå med"
     }
   ],
   "label.join-team": [
     {
       "type": 0,
-      "value": "Join team"
+      "value": "gå med i team"
     }
   ],
   "label.language": [
@@ -336,13 +336,13 @@
   "label.leave": [
     {
       "type": 0,
-      "value": "Leave"
+      "value": "Lämna"
     }
   ],
   "label.leave-team": [
     {
       "type": 0,
-      "value": "Leave team"
+      "value": "Lämna team"
     }
   ],
   "label.login": [
@@ -360,7 +360,7 @@
   "label.members": [
     {
       "type": 0,
-      "value": "Members"
+      "value": "Medlemmar"
     }
   ],
   "label.mobile": [
@@ -390,7 +390,7 @@
   "label.none": [
     {
       "type": 0,
-      "value": "None"
+      "value": "Inga"
     }
   ],
   "label.operating-systems": [
@@ -442,19 +442,19 @@
   "label.queries": [
     {
       "type": 0,
-      "value": "Queries"
+      "value": "Frågor"
     }
   ],
   "label.query": [
     {
       "type": 0,
-      "value": "Query"
+      "value": "Frågor"
     }
   ],
   "label.query-parameters": [
     {
       "type": 0,
-      "value": "Query parameters"
+      "value": "Fråge-parametrar"
     }
   ],
   "label.realtime": [
@@ -478,19 +478,19 @@
   "label.regenerate": [
     {
       "type": 0,
-      "value": "Regenerate"
+      "value": "Regenerera"
     }
   ],
   "label.regions": [
     {
       "type": 0,
-      "value": "Regions"
+      "value": "Regioner"
     }
   ],
   "label.remove": [
     {
       "type": 0,
-      "value": "Remove"
+      "value": "Ta bort"
     }
   ],
   "label.reports": [
@@ -520,7 +520,7 @@
   "label.role": [
     {
       "type": 0,
-      "value": "Role"
+      "value": "Roll"
     }
   ],
   "label.save": [
@@ -532,7 +532,7 @@
   "label.screens": [
     {
       "type": 0,
-      "value": "Screens"
+      "value": "Upplösning"
     }
   ],
   "label.select-date": [
@@ -544,7 +544,7 @@
   "label.select-website": [
     {
       "type": 0,
-      "value": "Select website"
+      "value": "Välj webbsajt"
     }
   ],
   "label.sessions": [
@@ -586,7 +586,7 @@
   "label.team-guest": [
     {
       "type": 0,
-      "value": "Team guest"
+      "value": "Team-gäst"
     }
   ],
   "label.team-id": [
@@ -598,19 +598,19 @@
   "label.team-member": [
     {
       "type": 0,
-      "value": "Team member"
+      "value": "Team-medlem"
     }
   ],
   "label.team-owner": [
     {
       "type": 0,
-      "value": "Team owner"
+      "value": "Team-ägare"
     }
   ],
   "label.teams": [
     {
       "type": 0,
-      "value": "Teams"
+      "value": "Team"
     }
   ],
   "label.theme": [
@@ -646,7 +646,7 @@
   "label.title": [
     {
       "type": 0,
-      "value": "Title"
+      "value": "Titel"
     }
   ],
   "label.today": [
@@ -688,7 +688,7 @@
   "label.user": [
     {
       "type": 0,
-      "value": "User"
+      "value": "Användare"
     }
   ],
   "label.username": [
@@ -706,7 +706,7 @@
   "label.view": [
     {
       "type": 0,
-      "value": "View"
+      "value": "Visa"
     }
   ],
   "label.view-details": [
@@ -736,7 +736,7 @@
   "label.website-id": [
     {
       "type": 0,
-      "value": "Website ID"
+      "value": "Webbsajt-ID"
     }
   ],
   "label.websites": [
@@ -748,7 +748,7 @@
   "label.yesterday": [
     {
       "type": 0,
-      "value": "Yesterday"
+      "value": "Igår"
     }
   ],
   "message.active-users": [
@@ -806,7 +806,7 @@
   "message.confirm-leave": [
     {
       "type": 0,
-      "value": "Are you sure you want to leave "
+      "value": "Är du säker på att du vill lämna "
     },
     {
       "type": 1,
@@ -878,7 +878,7 @@
     },
     {
       "type": 0,
-      "value": " on "
+      "value": " på "
     },
     {
       "type": 1,
@@ -906,7 +906,7 @@
   "message.min-password-length": [
     {
       "type": 0,
-      "value": "Minimum length of "
+      "value": "Minst "
     },
     {
       "type": 1,
@@ -914,7 +914,7 @@
     },
     {
       "type": 0,
-      "value": " characters"
+      "value": " tecken"
     }
   ],
   "message.no-data-available": [
@@ -932,13 +932,13 @@
   "message.no-teams": [
     {
       "type": 0,
-      "value": "You have not created any teams."
+      "value": "Du har inte skapat några team."
     }
   ],
   "message.no-users": [
     {
       "type": 0,
-      "value": "There are no users."
+      "value": "Det finns inga användare."
     }
   ],
   "message.page-not-found": [
@@ -950,7 +950,7 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "To reset this website, type "
+      "value": "För att återställa statistiken skriv "
     },
     {
       "type": 1,
@@ -958,7 +958,7 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " i rutan nedan."
     }
   ],
   "message.reset-website-warning": [
@@ -990,13 +990,13 @@
   "message.team-already-member": [
     {
       "type": 0,
-      "value": "You are already a member of the team."
+      "value": "Du är redan medlem i teamet."
     }
   ],
   "message.team-not-found": [
     {
       "type": 0,
-      "value": "Team not found."
+      "value": "Team kan inte hittas."
     }
   ],
   "message.tracking-code": [
@@ -1008,7 +1008,7 @@
   "message.user-deleted": [
     {
       "type": 0,
-      "value": "User deleted."
+      "value": "Användare raderad."
     }
   ],
   "message.visitor-log": [
@@ -1054,7 +1054,7 @@
   "messages.no-team-websites": [
     {
       "type": 0,
-      "value": "This team does not have any websites."
+      "value": "Det här teamet har inga webbsajter."
     }
   ],
   "messages.no-websites-configured": [
@@ -1066,7 +1066,7 @@
   "messages.team-websites-info": [
     {
       "type": 0,
-      "value": "Websites can be viewed by anyone on the team."
+      "value": "Websajter kan ses av alla i teamet."
     }
   ]
 }
diff --git a/queries/analytics/eventData/getEventDataFields.ts b/queries/analytics/eventData/getEventDataFields.ts
index 43c3363a..dc7f20c2 100644
--- a/queries/analytics/eventData/getEventDataFields.ts
+++ b/queries/analytics/eventData/getEventDataFields.ts
@@ -26,7 +26,8 @@ async function relationalQuery(websiteId: string, startDate: Date, endDate: Date
     from event_data
     where website_id = $1${toUuid()}
       and created_at >= $2
-      and created_at between $3 and $4`,
+      and created_at between $3 and $4
+    order by event_key asc`,
     params,
   );
 }
@@ -43,7 +44,8 @@ async function clickhouseQuery(websiteId: string, startDate: Date, endDate: Date
     from event_data
     where website_id = {websiteId:UUID}
       and created_at >= ${getDateFormat(resetDate)}
-      and ${getBetweenDates('created_at', startDate, endDate)}`,
+      and ${getBetweenDates('created_at', startDate, endDate)}
+    order by event_key asc`,
     params,
   );
 }
diff --git a/queries/analytics/eventData/saveEventData.ts b/queries/analytics/eventData/saveEventData.ts
index 96ea8831..e9f8d21e 100644
--- a/queries/analytics/eventData/saveEventData.ts
+++ b/queries/analytics/eventData/saveEventData.ts
@@ -1,5 +1,5 @@
 import { Prisma } from '@prisma/client';
-import { DYNAMIC_DATA_TYPE } from 'lib/constants';
+import { DATA_TYPE } from 'lib/constants';
 import { uuid } from 'lib/crypto';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import { flattenJSON } from 'lib/dynamicData';
@@ -38,13 +38,13 @@ async function relationalQuery(data: {
     websiteId,
     key: a.key,
     stringValue:
-      a.dynamicDataType === DYNAMIC_DATA_TYPE.string ||
-      a.dynamicDataType === DYNAMIC_DATA_TYPE.boolean ||
-      a.dynamicDataType === DYNAMIC_DATA_TYPE.array
+      a.dynamicDataType === DATA_TYPE.string ||
+      a.dynamicDataType === DATA_TYPE.boolean ||
+      a.dynamicDataType === DATA_TYPE.array
         ? a.value
         : null,
-    numericValue: a.dynamicDataType === DYNAMIC_DATA_TYPE.number ? a.value : null,
-    dateValue: a.dynamicDataType === DYNAMIC_DATA_TYPE.date ? new Date(a.value) : null,
+    numericValue: a.dynamicDataType === DATA_TYPE.number ? a.value : null,
+    dateValue: a.dynamicDataType === DATA_TYPE.date ? new Date(a.value) : null,
     dataType: a.dynamicDataType,
   }));
 
@@ -76,13 +76,13 @@ async function clickhouseQuery(data: {
     event_name: eventName,
     event_key: a.key,
     string_value:
-      a.dynamicDataType === DYNAMIC_DATA_TYPE.string ||
-      a.dynamicDataType === DYNAMIC_DATA_TYPE.boolean ||
-      a.dynamicDataType === DYNAMIC_DATA_TYPE.array
+      a.dynamicDataType === DATA_TYPE.string ||
+      a.dynamicDataType === DATA_TYPE.boolean ||
+      a.dynamicDataType === DATA_TYPE.array
         ? a.value
         : null,
-    numeric_value: a.dynamicDataType === DYNAMIC_DATA_TYPE.number ? a.value : null,
-    date_value: a.dynamicDataType === DYNAMIC_DATA_TYPE.date ? getDateFormat(a.value) : null,
+    numeric_value: a.dynamicDataType === DATA_TYPE.number ? a.value : null,
+    date_value: a.dynamicDataType === DATA_TYPE.date ? getDateFormat(a.value) : null,
     data_type: a.dynamicDataType,
     created_at: createdAt,
   }));
diff --git a/queries/analytics/session/saveSessionData.ts b/queries/analytics/session/saveSessionData.ts
index beec27f7..79104270 100644
--- a/queries/analytics/session/saveSessionData.ts
+++ b/queries/analytics/session/saveSessionData.ts
@@ -1,4 +1,4 @@
-import { DYNAMIC_DATA_TYPE } from 'lib/constants';
+import { DATA_TYPE } from 'lib/constants';
 import { uuid } from 'lib/crypto';
 import { flattenJSON } from 'lib/dynamicData';
 import prisma from 'lib/prisma';
@@ -20,13 +20,13 @@ export async function saveSessionData(data: {
     sessionId,
     key: a.key,
     stringValue:
-      a.dynamicDataType === DYNAMIC_DATA_TYPE.string ||
-      a.dynamicDataType === DYNAMIC_DATA_TYPE.boolean ||
-      a.dynamicDataType === DYNAMIC_DATA_TYPE.array
+      a.dynamicDataType === DATA_TYPE.string ||
+      a.dynamicDataType === DATA_TYPE.boolean ||
+      a.dynamicDataType === DATA_TYPE.array
         ? a.value
         : null,
-    numericValue: a.dynamicDataType === DYNAMIC_DATA_TYPE.number ? a.value : null,
-    dateValue: a.dynamicDataType === DYNAMIC_DATA_TYPE.date ? new Date(a.value) : null,
+    numericValue: a.dynamicDataType === DATA_TYPE.number ? a.value : null,
+    dateValue: a.dynamicDataType === DATA_TYPE.date ? new Date(a.value) : null,
     dataType: a.dynamicDataType,
   }));