Commit con #3

README.md

@@ -1,6 +1,6 @@
 # umami
 
-Umami is a simple, fast, privacy-focused alternative to Google Analytics.
+Umami MAMI is a simple, fast, privacy-focused alternative to Google Analytics.
 
 ## Getting started
 

components/layout/NavBar.module.css

@@ -27,6 +27,7 @@
   gap: 10px;
   font-size: 16px;
   font-weight: 700;
+  cursor: pointer;
   min-width: 0;
 }
 

components/messages.js

@@ -158,10 +158,6 @@ 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.',

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, title, os, browser, device, country, region, city },
+    query: { url, referrer, os, browser, device, country, region, city },
   } = usePageQuery();
 
   const { data, error, isLoading, isFetched } = useQuery(
     [
       'websites:stats',
-      { websiteId, modified, url, referrer, title, os, browser, device, country, region, city },
+      { websiteId, modified, url, referrer, os, browser, device, country, region, city },
     ],
     () =>
       get(`/websites/${websiteId}/stats`, {
@@ -30,7 +30,6 @@ export function MetricsBar({ websiteId }) {
         endAt: +endDate,
         url,
         referrer,
-        title,
         os,
         browser,
         device,

components/metrics/MetricsTable.js

@@ -30,7 +30,7 @@ export function MetricsTable({
   const {
     resolveUrl,
     router,
-    query: { url, referrer, title, os, browser, device, country, region, city },
+    query: { url, referrer, os, browser, device, country, region, city },
   } = usePageQuery();
   const { formatMessage, labels } = useMessages();
   const { get, useQuery } = useApi();
@@ -38,20 +38,7 @@ 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`, {
@@ -59,7 +46,6 @@ export function MetricsTable({
         startAt: +startDate,
         endAt: +endDate,
         url,
-        title,
         referrer,
         os,
         browser,
@@ -73,10 +59,7 @@ export function MetricsTable({
 
   const filteredData = useMemo(() => {
     if (data) {
-      const dataWithoutNullValues = data.filter(val => val.x !== null);
+      let items = percentFilter(dataFilter ? dataFilter(data, filterOptions) : data);
-      let items = percentFilter(
-        dataFilter ? dataFilter(dataWithoutNullValues, filterOptions) : dataWithoutNullValues,
-      );
       if (limit) {
         items = items.filter((e, i) => i < limit);
       }

components/pages/console/TestConsole.js

@@ -30,8 +30,6 @@ 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(),

components/pages/realtime/RealtimeUrls.js

@@ -10,7 +10,6 @@ export function RealtimeUrls({ websiteDomain, data = {} }) {
   const { formatMessage, labels } = useMessages();
   const { pageviews } = data;
   const [filter, setFilter] = useState(FILTER_REFERRERS);
-  const limit = 15;
 
   const buttons = [
     {
@@ -48,8 +47,7 @@ export function RealtimeUrls({ websiteDomain, data = {} }) {
             }
             return arr;
           }, [])
-          .sort(firstBy('y', -1))
+          .sort(firstBy('y', -1)),
-          .slice(0, limit),
       );
 
       const pages = percentFilter(
@@ -64,8 +62,7 @@ export function RealtimeUrls({ websiteDomain, data = {} }) {
             }
             return arr;
           }, [])
-          .sort(firstBy('y', -1))
+          .sort(firstBy('y', -1)),
-          .slice(0, limit),
       );
 
       return [referrers, pages];

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, FormattedMessage } = useMessages();
+  const { formatMessage, labels, messages } = useMessages();
   const { post, useMutation } = useApi();
   const { mutate, error } = useMutation(data => post(`/websites/${websiteId}/reset`, data));
 
@@ -28,12 +28,7 @@ export function WebsiteResetForm({ websiteId, onSave, onClose }) {
 
   return (
     <Form onSubmit={handleSubmit} error={error}>
-      <p>
+      <p>{formatMessage(messages.resetWebsite, { confirmation: CONFIRM_VALUE })}</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" />

db/clickhouse/schema.sql

@@ -58,10 +58,7 @@ 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
@@ -69,7 +66,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_handle_error_mode = 'stream'
+       kafka_skip_broken_messages = 100;
 
 CREATE MATERIALIZED VIEW umami.website_event_queue_mv TO umami.website_event AS
 SELECT website_id,
@@ -96,19 +93,6 @@ 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,
@@ -138,10 +122,7 @@ 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
@@ -149,7 +130,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_handle_error_mode = 'stream'
+       kafka_skip_broken_messages = 100;
 
 CREATE MATERIALIZED VIEW umami.event_data_queue_mv TO umami.event_data AS
 SELECT website_id,
@@ -163,17 +144,4 @@ SELECT website_id,
     event_date_value,
     event_data_type,
     created_at
-FROM umami.event_data_queue;
+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

docker-compose.yml

@@ -10,8 +10,7 @@ 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
@@ -20,12 +19,8 @@ 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
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
-      interval: 5s
-      timeout: 5s
-      retries: 5
 volumes:
   umami-db-data:

lang-ignore.json

@@ -1,32 +1,16 @@
 {
   "cs-CZ": ["label.reset", "metrics.device.tablet"],
-  "de-CH": [
-    "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"
-  ],
   "de-DE": [
-    "label.admin",
+    "label.administrator",
-    "label.analytics",
-    "label.desktop",
-    "label.details",
-    "label.domain",
-    "label.laptop",
-    "label.tablet",
     "label.name",
-    "label.sessions",
+    "label.domain",
-    "label.team",
+    "label.theme",
-    "label.team-id",
+    "metrics.device.desktop",
-    "label.teams"
+    "metrics.device.laptop",
+    "metrics.device.tablet",
+    "metrics.referrers",
+    "metrics.utm",
+    "metrics.utm_medium"
   ],
   "en-GB": "*",
   "fr-FR": ["metrics.actions", "metrics.pages"],
@@ -38,15 +22,12 @@
   ],
   "nb-NO": ["label.administrator", "label.dashboard"],
   "nl-NL": [
-    "label.analytics",
+    "label.administrator",
-    "label.browsers",
+    "label.websites",
-    "label.laptop",
+    "metrics.browsers",
-    "label.tablet",
+    "metrics.device.desktop",
-    "label.team",
+    "metrics.device.laptop",
-    "label.team-id",
+    "metrics.device.tablet"
-    "label.teams",
-    "label.website-id",
-    "label.websites"
   ],
   "it-IT": [
     "label.password",
@@ -56,5 +37,9 @@
     "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"
+  ]
 }

lang/de-CH.json

@@ -1,7 +1,7 @@
 {
-  "label.access-code": "Zuegangscode",
+  "label.access-code": "Access code",
   "label.actions": "Aktione",
-  "label.activity-log": "Aktivitätsverlauf",
+  "label.activity-log": "Activity log",
   "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": "Städt",
+  "label.cities": "Cities",
-  "label.clear-all": "Alles lösche",
+  "label.clear-all": "Clear all",
-  "label.confirm": "Bestätige",
+  "label.confirm": "Confirm",
   "label.confirm-password": "Passwort widerhole",
-  "label.continue": "Wiiter",
+  "label.continue": "Continue",
   "label.countries": "Länder",
-  "label.create-team": "Team erstelle",
+  "label.create-team": "Create team",
-  "label.create-user": "Benutzer erstelle",
+  "label.create-user": "Create user",
-  "label.created": "Erstellt",
+  "label.created": "Created",
   "label.current-password": "Jetzigs Passwort",
   "label.custom-range": "Benutzerdefinierte Bereich",
   "label.dashboard": "Übersicht",
-  "label.data": "Datä",
+  "label.data": "Data",
   "label.date-range": "Datumsbereich",
   "label.default-date-range": "Vorigstellte Datumsbereich",
   "label.delete": "Lösche",
-  "label.delete-team": "Team lösche",
+  "label.delete-team": "Delete team",
-  "label.delete-user": "Benutzer lösche",
+  "label.delete-user": "Delete user",
   "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": "Biträte",
+  "label.join": "Join",
-  "label.join-team": "Team biträte",
+  "label.join-team": "Join team",
   "label.language": "Sprach",
   "label.languages": "Sprache",
   "label.laptop": "Laptop",
   "label.last-days": "Letzti {x} Täg",
   "label.last-hours": "Letzti {x} Stunde",
-  "label.leave": "Verlah",
+  "label.leave": "Leave",
-  "label.leave-team": "Team verlah",
+  "label.leave-team": "Leave team",
-  "label.login": "Aamelde",
+  "label.login": "Login",
   "label.logout": "Abmelde",
-  "label.members": "Mitglieder",
+  "label.members": "Members",
   "label.mobile": "Handy",
   "label.more": "Meh",
   "label.name": "Name",
   "label.new-password": "Neus Passwort",
   "label.none": "Keis",
-  "label.operating-systems": "Betriibssystem",
+  "label.operating-systems": "Betriebssystem",
   "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": "Abfrage",
+  "label.queries": "Queries",
   "label.query-parameters": "Abfragparameter",
   "label.realtime": "Echtzit",
   "label.referrers": "Referrer",
   "label.refresh": "Aktualisiere",
-  "label.regenerate": "Erneuere",
+  "label.regenerate": "Regenerate",
-  "label.regions": "Regionä",
+  "label.regions": "Regions",
-  "label.remove": "Entferne",
+  "label.remove": "Remove",
   "label.required": "Erforderlich",
   "label.reset": "Zruggsetze",
   "label.reset-website": "Statistik zruggsetze",
-  "label.role": "Rollä",
+  "label.role": "Role",
   "label.save": "Speichere",
   "label.screens": "Bildschirmuflösige",
-  "label.select-website": "Websiite uuswähle",
+  "label.select-website": "Select website",
   "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 Gast",
+  "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
-  "label.team-member": "Team Mitglied",
+  "label.team-member": "Team member",
-  "label.team-owner": "Team Bsitzer",
+  "label.team-owner": "Team owner",
   "label.teams": "Teams",
   "label.theme": "Thema",
   "label.this-month": "De Monet",
   "label.this-week": "Die Wuche",
   "label.this-year": "Das Jahr",
-  "label.timezone": "Ziitzone",
+  "label.timezone": "Zitzone",
-  "label.title": "Titel",
+  "label.title": "Title",
   "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": "Benutzer",
+  "label.user": "User",
   "label.username": "Benutzername",
-  "label.users": "Benutzer",
+  "label.users": "Users",
-  "label.view": "Azeige",
+  "label.view": "View",
   "label.view-details": "Details azeige",
   "label.views": "Ufrüef",
   "label.visitors": "Bsuecher",
-  "label.website-id": "Websiite ID",
+  "label.website-id": "Website 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": "Sind Sie sich sicher, {target} zverlah?",
+  "message.confirm-leave": "Are you sure you want to leave {target}?",
   "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} uf {url}",
+  "message.event-log": "{event} on {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": "Miminamli längi vo {n} Zeiche",
+  "message.min-password-length": "Minimum length of {n} characters",
   "message.no-data-available": "Kei Date vorhande.",
   "message.no-match-password": "Passwörter stimmed ned überi",
-  "message.no-teams": "Bisher sind no kei Teams erstellt worde.",
+  "message.no-teams": "You have not created any teams.",
-  "message.no-users": "Da gits kei Benutzer",
+  "message.no-users": "There are no users.",
   "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": "Ihri Websiitestatistik isch under de folgende URL öffentlich zuegänglich:",
+  "message.share-url": "Das isch die öffentlichi URL zum Teile für {target}.",
-  "message.team-already-member": "Sie sind bereits es Mitglied vo dem Team.",
+  "message.team-already-member": "You are already a member of the team.",
-  "message.team-not-found": "Team nöd gfunde.",
+  "message.team-not-found": "Team not found.",
   "message.tracking-code": "Tracking Code",
-  "message.user-deleted": "Benutzer glöscht.",
+  "message.user-deleted": "User deleted.",
   "message.visitor-log": "Bsuecher us {country} benutzt {browser} uf {os} {device}",
-  "messages.no-team-websites": "Dem Team sind kei Websiite zuegordnet.",
+  "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "Es isch kei Websiite vorhande.",
-  "messages.team-websites-info": "Websiite chönd vo jedem im Team agluegt werde"
+  "messages.team-websites-info": "Websites can be viewed by anyone on the team."
 }

lang/de-DE.json

@@ -19,8 +19,8 @@
   "label.confirm-password": "Passwort wiederholen",
   "label.continue": "Weiter",
   "label.countries": "Länder",
-  "label.create-team": "Team erstellen",
+  "label.create-team": "Erstelle Team",
-  "label.create-user": "Benutzer erstellen",
+  "label.create-user": "Erstelle Nutzer",
   "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": "Team löschen",
+  "label.delete-team": "Lösche Team",
-  "label.delete-user": "Benutzer löschen",
+  "label.delete-user": "Lösche Nutzer",
   "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": "Letzte {x} Tage",
+  "label.last-days": "Letzten {x} Tage",
-  "label.last-hours": "Letzte {x} Stunden",
+  "label.last-hours": "Letzten {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": "Regionen",
+  "label.regions": "Regions",
   "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 Code",
+  "label.tracking-code": "Tracking Kennung",
   "label.unique-visitors": "Eindeutige Besucher",
   "label.unknown": "Unbekannt",
-  "label.user": "Benutzer",
+  "label.user": "User",
   "label.username": "Benutzername",
-  "label.users": "Benutzer",
+  "label.users": "Users",
-  "label.view": "Anzeigen",
+  "label.view": "View",
   "label.view-details": "Details anzeigen",
   "label.views": "Aufrufe",
   "label.visitors": "Besucher",
-  "label.website-id": "Webseite ID",
+  "label.website-id": "Website 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} auf {url}",
+  "message.event-log": "{event} on {url}",
   "message.go-to-settings": "Zu den Einstellungen",
   "message.incorrect-username-password": "Falsches Passwort oder Benutzername.",
   "message.invalid-domain": "Ungültige Domain",
@@ -129,16 +129,16 @@
   "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 Benutzer.",
+  "message.no-users": "Hier gibt es keine Nutzer.",
   "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.",
   "message.saved": "Erfolgreich gespeichert.",
-  "message.share-url": "Ihre Webseitenstatistik ist unter der folgenden URL öffentlich zugänglich:",
+  "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 Code",
+  "message.tracking-code": "Tracking Kennung",
-  "message.user-deleted": "Benutzer gelöscht.",
+  "message.user-deleted": "Nutzer 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.",

lang/mn-MN.json

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

lang/nl-NL.json

@@ -1,9 +1,9 @@
 {
-  "label.access-code": "Toegangscode",
+  "label.access-code": "Access code",
   "label.actions": "Acties",
-  "label.activity-log": "Activiteiten logboek",
+  "label.activity-log": "Activity log",
-  "label.add-website": "Website koppelen",
+  "label.add-website": "Website toevoegen",
-  "label.admin": "Beheerder",
+  "label.admin": "Administrator",
   "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": "Steden",
+  "label.cities": "Cities",
-  "label.clear-all": "Filters wissen",
+  "label.clear-all": "Clear all",
-  "label.confirm": "Bevestigen",
+  "label.confirm": "Confirm",
   "label.confirm-password": "Wachtwoord bevestigen",
-  "label.continue": "Doorgaan",
+  "label.continue": "Continue",
   "label.countries": "Landen",
-  "label.create-team": "Team aanmaken",
+  "label.create-team": "Create team",
-  "label.create-user": "Gebruiker maken",
+  "label.create-user": "Create user",
-  "label.created": "Gemaakt",
+  "label.created": "Created",
   "label.current-password": "Huidig wachtwoord",
   "label.custom-range": "Aangepast bereik",
   "label.dashboard": "Overzicht",
-  "label.data": "Gegevens",
+  "label.data": "Data",
   "label.date-range": "Datumbereik",
   "label.default-date-range": "Standaard bereik",
   "label.delete": "Verwijderen",
-  "label.delete-team": "Team verwijderen",
+  "label.delete-team": "Delete team",
-  "label.delete-user": "Verwijder gebruiker",
+  "label.delete-user": "Delete user",
   "label.delete-website": "Website verwijderen",
-  "label.desktop": "Computer",
+  "label.desktop": "Desktop",
-  "label.details": "Informatie",
+  "label.details": "Details",
   "label.devices": "Apparaten",
   "label.dismiss": "Negeren",
   "label.domain": "Domein",
   "label.edit": "Bewerken",
-  "label.edit-dashboard": "Dashboard aanpassen",
+  "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "Sta delen via openbare URL toe",
   "label.events": "Gebeurtenissen",
   "label.filter-combined": "Gecombineerd",
   "label.filter-raw": "Ruw",
-  "label.join": "Lid worden",
+  "label.join": "Join",
-  "label.join-team": "Word lid van een team",
+  "label.join-team": "Join team",
   "label.language": "Taal",
-  "label.languages": "Talen",
+  "label.languages": "Languages",
   "label.laptop": "Laptop",
   "label.last-days": "Laatste {x} dagen",
   "label.last-hours": "Laatste {x} uur",
-  "label.leave": "Verlaten",
+  "label.leave": "Leave",
-  "label.leave-team": "Verlaat team",
+  "label.leave-team": "Leave team",
   "label.login": "Inloggen",
   "label.logout": "Uitloggen",
-  "label.members": "Gebruikers",
+  "label.members": "Members",
   "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": "Parameters",
+  "label.queries": "Queries",
-  "label.query-parameters": "URL-parameters",
+  "label.query-parameters": "Query parameters",
   "label.realtime": "Actueel",
   "label.referrers": "Verwijzers",
   "label.refresh": "Vernieuwen",
-  "label.regenerate": "Opnieuw genereren",
+  "label.regenerate": "Regenerate",
-  "label.regions": "Regio's",
+  "label.regions": "Regions",
-  "label.remove": "Verwijderen",
+  "label.remove": "Remove",
   "label.required": "Verplicht",
-  "label.reset": "Opnieuw instellen",
+  "label.reset": "Resetten",
   "label.reset-website": "Statistieken opnieuw instellen",
-  "label.role": "Gebruikersrol",
+  "label.role": "Role",
   "label.save": "Opslaan",
   "label.screens": "Schermen",
-  "label.select-website": "Website selecteren",
+  "label.select-website": "Select website",
-  "label.sessions": "Sessies",
+  "label.sessions": "Sessions",
   "label.settings": "Instellingen",
   "label.share-url": "URL delen",
   "label.single-day": "Enkele dag",
   "label.tablet": "Tablet",
   "label.team": "Team",
-  "label.team-guest": "Team gast",
+  "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
-  "label.team-member": "Teamlid",
+  "label.team-member": "Team member",
-  "label.team-owner": "Teameigenaar",
+  "label.team-owner": "Team owner",
   "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": "Titel",
+  "label.title": "Title",
   "label.today": "Vandaag",
   "label.toggle-charts": "Grafieken tonen/verbergen",
   "label.tracking-code": "Volgcode",
   "label.unique-visitors": "Unieke bezoekers",
   "label.unknown": "Onbekend",
-  "label.user": "Gebruiker",
+  "label.user": "User",
   "label.username": "Gebruikersnaam",
-  "label.users": "Gebruikers",
+  "label.users": "Users",
-  "label.view": "Weergave",
+  "label.view": "View",
   "label.view-details": "Meer details",
   "label.views": "Weergaven",
   "label.visitors": "Bezoekers",
   "label.website-id": "Website ID",
   "label.websites": "Websites",
-  "label.yesterday": "Gisteren",
+  "label.yesterday": "Yesterday",
   "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": "Weet je zeker dat je {target} wilt verlaten?",
+  "message.confirm-leave": "Are you sure you want to leave {target}?",
   "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} op {url}",
+  "message.event-log": "{event} on {url}",
   "message.go-to-settings": "Naar instellingen",
   "message.incorrect-username-password": "Incorrecte gebruikersnaam/wachtwoord.",
   "message.invalid-domain": "Ongeldig domein",
-  "message.min-password-length": "Minimale lengte van {n} tekens",
+  "message.min-password-length": "Minimum length of {n} characters",
   "message.no-data-available": "Geen gegevens beschikbaar.",
   "message.no-match-password": "Wachtwoorden komen niet overeen",
-  "message.no-teams": "Er zijn nog geen teams aangemaakt.",
+  "message.no-teams": "You have not created any teams.",
-  "message.no-users": "Er zijn geen gebruikers.",
+  "message.no-users": "There are no users.",
   "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": "Je bent al lid van het team.",
+  "message.team-already-member": "You are already a member of the team.",
-  "message.team-not-found": "Team niet gevonden.",
+  "message.team-not-found": "Team not found.",
   "message.tracking-code": "Volgcode",
-  "message.user-deleted": "Gebruiker verwijderd.",
+  "message.user-deleted": "User deleted.",
   "message.visitor-log": "Bezoeker uit {country} met {browser} op een {os} {device}",
-  "messages.no-team-websites": "Er zijn geen websites gekoppeld aan dit team.",
+  "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "Je hebt geen websites ingesteld.",
-  "messages.team-websites-info": "Websites kunnen door iedereen in het team worden bekeken."
+  "messages.team-websites-info": "Websites can be viewed by anyone on the team."
 }

lang/pt-BR.json

@@ -1,27 +1,27 @@
 {
-  "label.access-code": "Código de acesso",
+  "label.access-code": "Access code",
   "label.actions": "Ações",
-  "label.activity-log": "Log de atividade",
+  "label.activity-log": "Activity log",
   "label.add-website": "Adicionar site",
   "label.admin": "Administrador",
   "label.all": "Todos",
   "label.all-time": "Todo o período",
-  "label.analytics": "Estatísticas",
+  "label.analytics": "Analytics",
   "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": "Cidades",
+  "label.cities": "Cities",
-  "label.clear-all": "Limpar tudo",
+  "label.clear-all": "Clear all",
-  "label.confirm": "Confirmar",
+  "label.confirm": "Confirm",
   "label.confirm-password": "Confirme a nova senha",
-  "label.continue": "Continuar",
+  "label.continue": "Continue",
   "label.countries": "Países",
-  "label.create-team": "Criar time",
+  "label.create-team": "Create team",
-  "label.create-user": "Criar usuário",
+  "label.create-user": "Create user",
-  "label.created": "Criado",
+  "label.created": "Created",
   "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": "Remover time",
+  "label.delete-team": "Delete team",
-  "label.delete-user": "Remover usuário",
+  "label.delete-user": "Delete user",
   "label.delete-website": "Remover site",
   "label.desktop": "Computador",
-  "label.details": "Detalhes",
+  "label.details": "Details",
   "label.devices": "Dispositivos",
   "label.dismiss": "Dispensar",
   "label.domain": "Domínio",
   "label.edit": "Editar",
-  "label.edit-dashboard": "Editar painel",
+  "label.edit-dashboard": "Edit dashboard",
   "label.enable-share-url": "Ativar link de compartilhamento",
   "label.events": "Eventos",
   "label.filter-combined": "Combinado",
   "label.filter-raw": "Dados brutos",
-  "label.join": "Entrar",
+  "label.join": "Join",
-  "label.join-team": "Entrar no time",
+  "label.join-team": "Join team",
   "label.language": "Idioma",
   "label.languages": "Idiomas",
   "label.laptop": "Notebook",
   "label.last-days": "Últimos {x} dias",
   "label.last-hours": "Últimas {x} horas",
-  "label.leave": "Sair",
+  "label.leave": "Leave",
-  "label.leave-team": "Sair do time",
+  "label.leave-team": "Leave team",
   "label.login": "Iniciar sessão",
   "label.logout": "Sair",
-  "label.members": "Membros",
+  "label.members": "Members",
   "label.mobile": "Celular",
   "label.more": "Mais",
   "label.name": "Nome",
   "label.new-password": "Nova senha",
-  "label.none": "Nenhum",
+  "label.none": "None",
   "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": "Parâmetros",
+  "label.queries": "Queries",
   "label.query-parameters": "Parâmetros de Consulta",
   "label.realtime": "Tempo real",
   "label.referrers": "Referências",
   "label.refresh": "Atualizar",
-  "label.regenerate": "Regerar",
+  "label.regenerate": "Regenerate",
-  "label.regions": "Regiões",
+  "label.regions": "Regions",
-  "label.remove": "Remover",
+  "label.remove": "Remove",
   "label.required": "Obrigatório",
   "label.reset": "Redefinir",
   "label.reset-website": "Redefinir estatísticas",
-  "label.role": "Papel",
+  "label.role": "Role",
   "label.save": "Salvar",
   "label.screens": "Telas",
-  "label.select-website": "Selecionar site",
+  "label.select-website": "Select website",
-  "label.sessions": "Sessões",
+  "label.sessions": "Sessions",
   "label.settings": "Configurações",
   "label.share-url": "Link de compartilhamento",
   "label.single-day": "Dia específico",
   "label.tablet": "Tablet",
-  "label.team": "Time",
+  "label.team": "Team",
-  "label.team-guest": "Convidado",
+  "label.team-guest": "Team guest",
-  "label.team-id": "ID do Time",
+  "label.team-id": "Team ID",
-  "label.team-member": "Membro",
+  "label.team-member": "Team member",
-  "label.team-owner": "Proprietário",
+  "label.team-owner": "Team owner",
-  "label.teams": "Times",
+  "label.teams": "Teams",
   "label.theme": "Tema",
   "label.this-month": "Este mês",
   "label.this-week": "Esta semana",
   "label.this-year": "Este ano",
   "label.timezone": "Fuso horário",
-  "label.title": "Título",
+  "label.title": "Title",
   "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": "Usuário",
+  "label.user": "User",
   "label.username": "Nome de usuário",
-  "label.users": "Usuários",
+  "label.users": "Users",
-  "label.view": "Ver",
+  "label.view": "View",
   "label.view-details": "Ver detalhes",
   "label.views": "Visualizações",
   "label.visitors": "Visitantes",
-  "label.website-id": "ID do Site",
+  "label.website-id": "Website ID",
   "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": "Você tem certeza que deseja sair de {target}?",
+  "message.confirm-leave": "Are you sure you want to leave {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} em {url}",
+  "message.event-log": "{event} on {url}",
   "message.go-to-settings": "Ir para as configurações",
   "message.incorrect-username-password": "O nome de usuário e/ou senha está incorreto.",
   "message.invalid-domain": "Domínio inválido",
-  "message.min-password-length": "Quantidade mínima de {n} caracteres",
+  "message.min-password-length": "Minimum length of {n} characters",
   "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-teams": "You have not created any teams.",
-  "message.no-users": "Não há nenhum usuário.",
+  "message.no-users": "There are no users.",
   "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": "Você já um membro do time.",
+  "message.team-already-member": "You are already a member of the team.",
-  "message.team-not-found": "Time não encontrado.",
+  "message.team-not-found": "Team not found.",
   "message.tracking-code": "Código de rastreamento",
-  "message.user-deleted": "Usuário removido.",
+  "message.user-deleted": "User deleted.",
   "message.visitor-log": "Visitante de {country} usando {browser} no {device} {os}",
-  "messages.no-team-websites": "Este time não possui nenhum site.",
+  "messages.no-team-websites": "This team does not have any websites.",
   "messages.no-websites-configured": "Nenhum site foi configurado ainda.",
-  "messages.team-websites-info": "Os sites podem ser visualizados por qualquer membro da equipe."
+  "messages.team-websites-info": "Websites can be viewed by anyone on the team."
 }

lib/cache.ts

@@ -2,7 +2,35 @@ import { User, Website } from '@prisma/client';
 import redis from '@umami/redis-client';
 import { getSession, getUser, getWebsite } from '../queries';
 
-const { fetchObject, storeObject, deleteObject } = redis;
+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);
+}
 
 async function fetchWebsite(id): Promise<Website> {
   return fetchObject(`website:${id}`, () => getWebsite({ id }));
@@ -49,16 +77,6 @@ async function deleteSession(id) {
   return deleteObject(`session:${id}`);
 }
 
-async function fetchUserBlock(userId: string) {
-  const key = `user:block:${userId}`;
-  return redis.get(key);
-}
-
-async function incrementUserBlock(userId: string) {
-  const key = `user:block:${userId}`;
-  return redis.incr(key);
-}
-
 export default {
   fetchWebsite,
   storeWebsite,
@@ -69,7 +87,5 @@ export default {
   fetchSession,
   storeSession,
   deleteSession,
-  fetchUserBlock,
-  incrementUserBlock,
   enabled: redis.enabled,
 };

lib/eventData.ts

@@ -49,7 +49,6 @@ 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;

lib/middleware.ts

@@ -1,10 +1,4 @@
-import {
+import { createMiddleware, unauthorized, badRequest, parseSecureToken } from 'next-basics';
-  createMiddleware,
-  unauthorized,
-  badRequest,
-  parseSecureToken,
-  tooManyRequest,
-} from 'next-basics';
 import debug from 'debug';
 import cors from 'cors';
 import { validate } from 'uuid';
@@ -36,9 +30,6 @@ 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);
   }
 

lib/session.ts

@@ -6,7 +6,6 @@ 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);
@@ -22,8 +21,6 @@ export async function findSession(req: NextApiRequestCollect) {
     const result = await parseToken(cacheToken, secret());
 
     if (result) {
-      await checkUserBlock(result?.ownerId);
-
       return result;
     }
   }
@@ -42,8 +39,6 @@ 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);
@@ -63,7 +58,6 @@ export async function findSession(req: NextApiRequestCollect) {
       subdivision1,
       subdivision2,
       city,
-      ownerId: website.userId,
     };
   }
 
@@ -94,13 +88,5 @@ export async function findSession(req: NextApiRequestCollect) {
     }
   }
 
-  return { ...session, ownerId: website.userId };
+  return session;
-}
-
-async function checkUserBlock(userId: string) {
-  if (process.env.ENABLE_BLOCKER && (await cache.fetchUserBlock(userId))) {
-    await cache.incrementUserBlock(userId);
-
-    throw new Error('Usage Limit.');
-  }
 }

next.config.js

@@ -2,6 +2,8 @@
 require('dotenv').config();
 const pkg = require('./package.json');
 
+const CLOUD_URL = 'https://cloud.umami.is';
+
 const contentSecurityPolicy = `
   default-src 'self';
   img-src *;

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.5.0",
+    "@umami/redis-client": "^0.2.0",
     "chalk": "^4.1.1",
     "chart.js": "^4.2.1",
     "chartjs-adapter-date-fns": "^3.0.0",
@@ -89,7 +89,7 @@
     "kafkajs": "^2.1.0",
     "maxmind": "^4.3.6",
     "moment-timezone": "^0.5.35",
-    "next": "13.3.1",
+    "next": "13.2.4",
     "next-basics": "^0.27.0",
     "node-fetch": "^3.2.8",
     "npm-run-all": "^4.1.5",

pages/api/send.ts

@@ -28,7 +28,6 @@ export interface NextApiRequestCollect extends NextApiRequest {
   session: {
     id: string;
     websiteId: string;
-    ownerId: string;
     hostname: string;
     browser: string;
     os: string;

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;
     }

pages/api/users/[id]/usage.ts

@@ -1,74 +0,0 @@
-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);
-};

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 UserWebsitesRequestBody {
+export interface WebsitesRequestBody {
   name: string;
   domain: string;
   shareId: string;
 }
 
 export default async (
-  req: NextApiRequestQueryBody<any, UserWebsitesRequestBody>,
+  req: NextApiRequestQueryBody<any, WebsitesRequestBody>,
   res: NextApiResponse,
 ) => {
   await useCors(req, res);

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 {

pages/api/websites/[id]/pageviews.ts

@@ -16,7 +16,7 @@ export interface WebsitePageviewRequestQuery {
   timezone: string;
   url?: string;
   referrer?: string;
-  title?: string;
+  pageTitle?: string;
   os?: string;
   browser?: string;
   device?: string;
@@ -40,7 +40,7 @@ export default async (
     timezone,
     url,
     referrer,
-    title,
+    pageTitle,
     os,
     browser,
     device,
@@ -71,7 +71,7 @@ export default async (
         filters: {
           url,
           referrer,
-          title,
+          pageTitle,
           os,
           browser,
           device,
@@ -88,7 +88,7 @@ export default async (
         count: 'distinct website_event.',
         filters: {
           url,
-          title,
+          pageTitle,
           os,
           browser,
           device,

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], () =>
-    websiteId ? get(`/websites/${websiteId}`, { enabled: !!websiteId }) : null,
+    get(`/websites/${websiteId}`, { enabled: !!websiteId }),
   );
   const title = `${formatMessage(labels.realtime)}${website?.name ? ` - ${website.name}` : ''}`;
 

public/intl/messages/de-CH.json

@@ -2,7 +2,7 @@
   "label.access-code": [
     {
       "type": 0,
-      "value": "Zuegangscode"
+      "value": "Access code"
     }
   ],
   "label.actions": [
@@ -14,7 +14,7 @@
   "label.activity-log": [
     {
       "type": 0,
-      "value": "Aktivitätsverlauf"
+      "value": "Activity log"
     }
   ],
   "label.add-website": [
@@ -86,19 +86,19 @@
   "label.cities": [
     {
       "type": 0,
-      "value": "Städt"
+      "value": "Cities"
     }
   ],
   "label.clear-all": [
     {
       "type": 0,
-      "value": "Alles lösche"
+      "value": "Clear all"
     }
   ],
   "label.confirm": [
     {
       "type": 0,
-      "value": "Bestätige"
+      "value": "Confirm"
     }
   ],
   "label.confirm-password": [
@@ -110,7 +110,7 @@
   "label.continue": [
     {
       "type": 0,
-      "value": "Wiiter"
+      "value": "Continue"
     }
   ],
   "label.countries": [
@@ -122,19 +122,19 @@
   "label.create-team": [
     {
       "type": 0,
-      "value": "Team erstelle"
+      "value": "Create team"
     }
   ],
   "label.create-user": [
     {
       "type": 0,
-      "value": "Benutzer erstelle"
+      "value": "Create user"
     }
   ],
   "label.created": [
     {
       "type": 0,
-      "value": "Erstellt"
+      "value": "Created"
     }
   ],
   "label.current-password": [
@@ -158,7 +158,7 @@
   "label.data": [
     {
       "type": 0,
-      "value": "Datä"
+      "value": "Data"
     }
   ],
   "label.date-range": [
@@ -182,13 +182,13 @@
   "label.delete-team": [
     {
       "type": 0,
-      "value": "Team lösche"
+      "value": "Delete team"
     }
   ],
   "label.delete-user": [
     {
       "type": 0,
-      "value": "Benutzer lösche"
+      "value": "Delete user"
     }
   ],
   "label.delete-website": [
@@ -266,13 +266,13 @@
   "label.join": [
     {
       "type": 0,
-      "value": "Biträte"
+      "value": "Join"
     }
   ],
   "label.join-team": [
     {
       "type": 0,
-      "value": "Team biträte"
+      "value": "Join team"
     }
   ],
   "label.language": [
@@ -324,19 +324,19 @@
   "label.leave": [
     {
       "type": 0,
-      "value": "Verlah"
+      "value": "Leave"
     }
   ],
   "label.leave-team": [
     {
       "type": 0,
-      "value": "Team verlah"
+      "value": "Leave team"
     }
   ],
   "label.login": [
     {
       "type": 0,
-      "value": "Aamelde"
+      "value": "Login"
     }
   ],
   "label.logout": [
@@ -348,7 +348,7 @@
   "label.members": [
     {
       "type": 0,
-      "value": "Mitglieder"
+      "value": "Members"
     }
   ],
   "label.mobile": [
@@ -384,7 +384,7 @@
   "label.operating-systems": [
     {
       "type": 0,
-      "value": "Betriibssystem"
+      "value": "Betriebssystem"
     }
   ],
   "label.owner": [
@@ -430,7 +430,7 @@
   "label.queries": [
     {
       "type": 0,
-      "value": "Abfrage"
+      "value": "Queries"
     }
   ],
   "label.query-parameters": [
@@ -460,19 +460,19 @@
   "label.regenerate": [
     {
       "type": 0,
-      "value": "Erneuere"
+      "value": "Regenerate"
     }
   ],
   "label.regions": [
     {
       "type": 0,
-      "value": "Regionä"
+      "value": "Regions"
     }
   ],
   "label.remove": [
     {
       "type": 0,
-      "value": "Entferne"
+      "value": "Remove"
     }
   ],
   "label.required": [
@@ -496,7 +496,7 @@
   "label.role": [
     {
       "type": 0,
-      "value": "Rollä"
+      "value": "Role"
     }
   ],
   "label.save": [
@@ -514,7 +514,7 @@
   "label.select-website": [
     {
       "type": 0,
-      "value": "Websiite uuswähle"
+      "value": "Select website"
     }
   ],
   "label.sessions": [
@@ -556,7 +556,7 @@
   "label.team-guest": [
     {
       "type": 0,
-      "value": "Team Gast"
+      "value": "Team guest"
     }
   ],
   "label.team-id": [
@@ -568,13 +568,13 @@
   "label.team-member": [
     {
       "type": 0,
-      "value": "Team Mitglied"
+      "value": "Team member"
     }
   ],
   "label.team-owner": [
     {
       "type": 0,
-      "value": "Team Bsitzer"
+      "value": "Team owner"
     }
   ],
   "label.teams": [
@@ -610,13 +610,13 @@
   "label.timezone": [
     {
       "type": 0,
-      "value": "Ziitzone"
+      "value": "Zitzone"
     }
   ],
   "label.title": [
     {
       "type": 0,
-      "value": "Titel"
+      "value": "Title"
     }
   ],
   "label.today": [
@@ -652,7 +652,7 @@
   "label.user": [
     {
       "type": 0,
-      "value": "Benutzer"
+      "value": "User"
     }
   ],
   "label.username": [
@@ -664,13 +664,13 @@
   "label.users": [
     {
       "type": 0,
-      "value": "Benutzer"
+      "value": "Users"
     }
   ],
   "label.view": [
     {
       "type": 0,
-      "value": "Azeige"
+      "value": "View"
     }
   ],
   "label.view-details": [
@@ -694,7 +694,7 @@
   "label.website-id": [
     {
       "type": 0,
-      "value": "Websiite ID"
+      "value": "Website ID"
     }
   ],
   "label.websites": [
@@ -760,7 +760,7 @@
   "message.confirm-leave": [
     {
       "type": 0,
-      "value": "Sind Sie sich sicher, "
+      "value": "Are you sure you want to leave "
     },
     {
       "type": 1,
@@ -768,7 +768,7 @@
     },
     {
       "type": 0,
-      "value": " zverlah?"
+      "value": "?"
     }
   ],
   "message.confirm-reset": [
@@ -810,7 +810,7 @@
     },
     {
       "type": 0,
-      "value": " uf "
+      "value": " on "
     },
     {
       "type": 1,
@@ -838,7 +838,7 @@
   "message.min-password-length": [
     {
       "type": 0,
-      "value": "Miminamli längi vo "
+      "value": "Minimum length of "
     },
     {
       "type": 1,
@@ -846,7 +846,7 @@
     },
     {
       "type": 0,
-      "value": " Zeiche"
+      "value": " characters"
     }
   ],
   "message.no-data-available": [
@@ -864,13 +864,13 @@
   "message.no-teams": [
     {
       "type": 0,
-      "value": "Bisher sind no kei Teams erstellt worde."
+      "value": "You have not created any teams."
     }
   ],
   "message.no-users": [
     {
       "type": 0,
-      "value": "Da gits kei Benutzer"
+      "value": "There are no users."
     }
   ],
   "message.page-not-found": [
@@ -900,19 +900,27 @@
   "message.share-url": [
     {
       "type": 0,
-      "value": "Ihri Websiitestatistik isch under de folgende URL öffentlich zuegänglich:"
+      "value": "Das isch die öffentlichi URL zum Teile für "
+    },
+    {
+      "type": 1,
+      "value": "target"
+    },
+    {
+      "type": 0,
+      "value": "."
     }
   ],
   "message.team-already-member": [
     {
       "type": 0,
-      "value": "Sie sind bereits es Mitglied vo dem Team."
+      "value": "You are already a member of the team."
     }
   ],
   "message.team-not-found": [
     {
       "type": 0,
-      "value": "Team nöd gfunde."
+      "value": "Team not found."
     }
   ],
   "message.tracking-code": [
@@ -924,7 +932,7 @@
   "message.user-deleted": [
     {
       "type": 0,
-      "value": "Benutzer glöscht."
+      "value": "User deleted."
     }
   ],
   "message.visitor-log": [
@@ -964,7 +972,7 @@
   "messages.no-team-websites": [
     {
       "type": 0,
-      "value": "Dem Team sind kei Websiite zuegordnet."
+      "value": "This team does not have any websites."
     }
   ],
   "messages.no-websites-configured": [
@@ -976,7 +984,7 @@
   "messages.team-websites-info": [
     {
       "type": 0,
-      "value": "Websiite chönd vo jedem im Team agluegt werde"
+      "value": "Websites can be viewed by anyone on the team."
     }
   ]
 }

public/intl/messages/de-DE.json

@@ -122,13 +122,13 @@
   "label.create-team": [
     {
       "type": 0,
-      "value": "Team erstellen"
+      "value": "Erstelle Team"
     }
   ],
   "label.create-user": [
     {
       "type": 0,
-      "value": "Benutzer erstellen"
+      "value": "Erstelle Nutzer"
     }
   ],
   "label.created": [
@@ -182,13 +182,13 @@
   "label.delete-team": [
     {
       "type": 0,
-      "value": "Team löschen"
+      "value": "Lösche Team"
     }
   ],
   "label.delete-user": [
     {
       "type": 0,
-      "value": "Benutzer löschen"
+      "value": "Lösche Nutzer"
     }
   ],
   "label.delete-website": [
@@ -296,7 +296,7 @@
   "label.last-days": [
     {
       "type": 0,
-      "value": "Letzte "
+      "value": "Letzten "
     },
     {
       "type": 1,
@@ -310,7 +310,7 @@
   "label.last-hours": [
     {
       "type": 0,
-      "value": "Letzte "
+      "value": "Letzten "
     },
     {
       "type": 1,
@@ -466,7 +466,7 @@
   "label.regions": [
     {
       "type": 0,
-      "value": "Regionen"
+      "value": "Regions"
     }
   ],
   "label.remove": [
@@ -634,7 +634,7 @@
   "label.tracking-code": [
     {
       "type": 0,
-      "value": "Tracking Code"
+      "value": "Tracking Kennung"
     }
   ],
   "label.unique-visitors": [
@@ -652,7 +652,7 @@
   "label.user": [
     {
       "type": 0,
-      "value": "Benutzer"
+      "value": "User"
     }
   ],
   "label.username": [
@@ -664,13 +664,13 @@
   "label.users": [
     {
       "type": 0,
-      "value": "Benutzer"
+      "value": "Users"
     }
   ],
   "label.view": [
     {
       "type": 0,
-      "value": "Anzeigen"
+      "value": "View"
     }
   ],
   "label.view-details": [
@@ -694,7 +694,7 @@
   "label.website-id": [
     {
       "type": 0,
-      "value": "Webseite ID"
+      "value": "Website ID"
     }
   ],
   "label.websites": [
@@ -810,7 +810,7 @@
     },
     {
       "type": 0,
-      "value": " auf "
+      "value": " on "
     },
     {
       "type": 1,
@@ -870,7 +870,7 @@
   "message.no-users": [
     {
       "type": 0,
-      "value": "Hier gibt es keine Benutzer."
+      "value": "Hier gibt es keine Nutzer."
     }
   ],
   "message.page-not-found": [
@@ -900,7 +900,15 @@
   "message.share-url": [
     {
       "type": 0,
-      "value": "Ihre Webseitenstatistik ist unter der folgenden URL öffentlich zugänglich:"
+      "value": "Dies ist die öffentliche URL zum Teilen für "
+    },
+    {
+      "type": 1,
+      "value": "target"
+    },
+    {
+      "type": 0,
+      "value": "."
     }
   ],
   "message.team-already-member": [
@@ -918,13 +926,13 @@
   "message.tracking-code": [
     {
       "type": 0,
-      "value": "Tracking Code"
+      "value": "Tracking Kennung"
     }
   ],
   "message.user-deleted": [
     {
       "type": 0,
-      "value": "Benutzer gelöscht."
+      "value": "Nutzer gelöscht."
     }
   ],
   "message.visitor-log": [

public/intl/messages/mn-MN.json

@@ -2,7 +2,7 @@
   "label.access-code": [
     {
       "type": 0,
-      "value": "Хандалтын код"
+      "value": "Access code"
     }
   ],
   "label.actions": [
@@ -14,7 +14,7 @@
   "label.activity-log": [
     {
       "type": 0,
-      "value": "Үйл ажиллагааны бүртгэл"
+      "value": "Activity log"
     }
   ],
   "label.add-website": [
@@ -86,19 +86,19 @@
   "label.cities": [
     {
       "type": 0,
-      "value": "Хотууд"
+      "value": "Cities"
     }
   ],
   "label.clear-all": [
     {
       "type": 0,
-      "value": "Бүгдийг арилгах"
+      "value": "Clear all"
     }
   ],
   "label.confirm": [
     {
       "type": 0,
-      "value": "Батлах"
+      "value": "Confirm"
     }
   ],
   "label.confirm-password": [
@@ -110,7 +110,7 @@
   "label.continue": [
     {
       "type": 0,
-      "value": "Үргэлжлүүлэх"
+      "value": "Continue"
     }
   ],
   "label.countries": [
@@ -122,19 +122,19 @@
   "label.create-team": [
     {
       "type": 0,
-      "value": "Баг үүсгэх"
+      "value": "Create team"
     }
   ],
   "label.create-user": [
     {
       "type": 0,
-      "value": "Хэрэглэгч үүсгэх"
+      "value": "Create user"
     }
   ],
   "label.created": [
     {
       "type": 0,
-      "value": "Үүсгэсэн"
+      "value": "Created"
     }
   ],
   "label.current-password": [
@@ -158,13 +158,13 @@
   "label.data": [
     {
       "type": 0,
-      "value": "Өгөгдөл"
+      "value": "Data"
     }
   ],
   "label.date-range": [
     {
       "type": 0,
-      "value": "Хугацааны муж"
+      "value": "Хугацааны мужид"
     }
   ],
   "label.default-date-range": [
@@ -182,13 +182,13 @@
   "label.delete-team": [
     {
       "type": 0,
-      "value": "Баг устгах"
+      "value": "Delete team"
     }
   ],
   "label.delete-user": [
     {
       "type": 0,
-      "value": "Хэрэглэгч устгах"
+      "value": "Delete user"
     }
   ],
   "label.delete-website": [
@@ -206,7 +206,7 @@
   "label.details": [
     {
       "type": 0,
-      "value": "Мэдээлэл"
+      "value": "Details"
     }
   ],
   "label.devices": [
@@ -266,13 +266,13 @@
   "label.join": [
     {
       "type": 0,
-      "value": "Нэгдэх"
+      "value": "Join"
     }
   ],
   "label.join-team": [
     {
       "type": 0,
-      "value": "Багт нэгдэх"
+      "value": "Join team"
     }
   ],
   "label.language": [
@@ -324,13 +324,13 @@
   "label.leave": [
     {
       "type": 0,
-      "value": "Гарах"
+      "value": "Leave"
     }
   ],
   "label.leave-team": [
     {
       "type": 0,
-      "value": "Багаас гарах"
+      "value": "Leave team"
     }
   ],
   "label.login": [
@@ -348,7 +348,7 @@
   "label.members": [
     {
       "type": 0,
-      "value": "Гишүүд"
+      "value": "Members"
     }
   ],
   "label.mobile": [
@@ -430,7 +430,7 @@
   "label.queries": [
     {
       "type": 0,
-      "value": "Query-нүүд"
+      "value": "Queries"
     }
   ],
   "label.query-parameters": [
@@ -460,19 +460,19 @@
   "label.regenerate": [
     {
       "type": 0,
-      "value": "Дахин үүсгэх"
+      "value": "Regenerate"
     }
   ],
   "label.regions": [
     {
       "type": 0,
-      "value": "Бүсүүд"
+      "value": "Regions"
     }
   ],
   "label.remove": [
     {
       "type": 0,
-      "value": "Устгах"
+      "value": "Remove"
     }
   ],
   "label.required": [
@@ -484,7 +484,7 @@
   "label.reset": [
     {
       "type": 0,
-      "value": "Дахин эхлүүлэх"
+      "value": "Хуучин хэвд нь оруулах"
     }
   ],
   "label.reset-website": [
@@ -496,7 +496,7 @@
   "label.role": [
     {
       "type": 0,
-      "value": "Эрх"
+      "value": "Role"
     }
   ],
   "label.save": [
@@ -514,7 +514,7 @@
   "label.select-website": [
     {
       "type": 0,
-      "value": "Веб сонгох"
+      "value": "Select website"
     }
   ],
   "label.sessions": [
@@ -550,37 +550,37 @@
   "label.team": [
     {
       "type": 0,
-      "value": "Баг"
+      "value": "Team"
     }
   ],
   "label.team-guest": [
     {
       "type": 0,
-      "value": "Багийн зочин"
+      "value": "Team guest"
     }
   ],
   "label.team-id": [
     {
       "type": 0,
-      "value": "Багийн ID"
+      "value": "Team ID"
     }
   ],
   "label.team-member": [
     {
       "type": 0,
-      "value": "Багийн гишүүн"
+      "value": "Team member"
     }
   ],
   "label.team-owner": [
     {
       "type": 0,
-      "value": "Багийн эзэмшигч"
+      "value": "Team owner"
     }
   ],
   "label.teams": [
     {
       "type": 0,
-      "value": "Багууд"
+      "value": "Teams"
     }
   ],
   "label.theme": [
@@ -616,7 +616,7 @@
   "label.title": [
     {
       "type": 0,
-      "value": "Гарчиг"
+      "value": "Title"
     }
   ],
   "label.today": [
@@ -652,7 +652,7 @@
   "label.user": [
     {
       "type": 0,
-      "value": "Хэрэглэгч"
+      "value": "User"
     }
   ],
   "label.username": [
@@ -664,13 +664,13 @@
   "label.users": [
     {
       "type": 0,
-      "value": "Хэрэглэгчид"
+      "value": "Users"
     }
   ],
   "label.view": [
     {
       "type": 0,
-      "value": "Харах"
+      "value": "View"
     }
   ],
   "label.view-details": [
@@ -694,7 +694,7 @@
   "label.website-id": [
     {
       "type": 0,
-      "value": "Вебийн ID"
+      "value": "Website ID"
     }
   ],
   "label.websites": [
@@ -768,7 +768,7 @@
   "message.confirm-leave": [
     {
       "type": 0,
-      "value": "Та "
+      "value": "Are you sure you want to leave "
     },
     {
       "type": 1,
@@ -776,7 +776,7 @@
     },
     {
       "type": 0,
-      "value": "-с гарахдаа итгэлтэй байна уу?"
+      "value": "?"
     }
   ],
   "message.confirm-reset": [
@@ -796,21 +796,13 @@
   "message.delete-website": [
     {
       "type": 0,
-      "value": "Веб устгахын тулд доорх хэсэгт "
+      "value": "Веб устгах"
-    },
-    {
-      "type": 1,
-      "value": "confirmation"
-    },
-    {
-      "type": 0,
-      "value": " гэж бичиж, баталгаажуулна уу."
     }
   ],
   "message.delete-website-warning": [
     {
       "type": 0,
-      "value": "Энэ вебтэй холбоотой бүх өгөгдөл устах болно."
+      "value": "Үүнтэй холбоотой бүх өгөгдөл устах болно."
     }
   ],
   "message.error": [
@@ -822,15 +814,15 @@
   "message.event-log": [
     {
       "type": 1,
-      "value": "url"
+      "value": "event"
     },
     {
       "type": 0,
-      "value": "-д "
+      "value": " on "
     },
     {
       "type": 1,
-      "value": "event"
+      "value": "url"
     }
   ],
   "message.go-to-settings": [
@@ -854,7 +846,7 @@
   "message.min-password-length": [
     {
       "type": 0,
-      "value": "Хамгийн багадаа "
+      "value": "Minimum length of "
     },
     {
       "type": 1,
@@ -862,7 +854,7 @@
     },
     {
       "type": 0,
-      "value": " тэмдэгт"
+      "value": " characters"
     }
   ],
   "message.no-data-available": [
@@ -874,19 +866,19 @@
   "message.no-match-password": [
     {
       "type": 0,
-      "value": "Нууц үг тохирохгүй байна."
+      "value": "Нууц үг тохирохгүй байна"
     }
   ],
   "message.no-teams": [
     {
       "type": 0,
-      "value": "Та ямар ч баг үүсгээгүй байна."
+      "value": "You have not created any teams."
     }
   ],
   "message.no-users": [
     {
       "type": 0,
-      "value": "Хэрэглэгч байхгүй байна."
+      "value": "There are no users."
     }
   ],
   "message.page-not-found": [
@@ -898,15 +890,7 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "Тоон үзүүлэлийг дахин эхлүүлэхийн тулд доорх хэсэгт "
+      "value": "Тоон үзүүлэлтийг дахин эхлүүлэх"
-    },
-    {
-      "type": 1,
-      "value": "confirmation"
-    },
-    {
-      "type": 0,
-      "value": " гэж бичиж, баталгаажуулна уу."
     }
   ],
   "message.reset-website-warning": [
@@ -918,51 +902,41 @@
   "message.saved": [
     {
       "type": 0,
-      "value": "Хадгалсан."
+      "value": "Амжилттай хадгаллаа."
     }
   ],
   "message.share-url": [
+    {
+      "type": 1,
+      "value": "target"
+    },
     {
       "type": 0,
-      "value": "Таны вебийн тоон үзүүлэлтүүд доорх URL дээр нийтэд харагдах болно:"
+      "value": "-г нийтэд хуваалцах холбоос."
     }
   ],
   "message.team-already-member": [
     {
       "type": 0,
-      "value": "Та аль хэдийн энэ багийн гишүүн болсон байна."
+      "value": "You are already a member of the team."
     }
   ],
   "message.team-not-found": [
     {
       "type": 0,
-      "value": "Баг олдсонгүй."
+      "value": "Team not found."
     }
   ],
   "message.tracking-code": [
     {
       "type": 0,
-      "value": "Энэ вебийн хандалтуудыг мөрдөхийн тулд доорх кодыг HTML-нхээ "
+      "value": "Мөрдөх код"
-    },
-    {
-      "children": [
-        {
-          "type": 0,
-          "value": "..."
-        }
-      ],
-      "type": 8,
-      "value": "head"
-    },
-    {
-      "type": 0,
-      "value": " хэсэгт байрлуулна уу."
     }
   ],
   "message.user-deleted": [
     {
       "type": 0,
-      "value": "Хэрэглэгч устсан."
+      "value": "User deleted."
     }
   ],
   "message.visitor-log": [
@@ -1002,7 +976,7 @@
   "messages.no-team-websites": [
     {
       "type": 0,
-      "value": "Энэ багт ямар ч веб алга."
+      "value": "This team does not have any websites."
     }
   ],
   "messages.no-websites-configured": [
@@ -1014,7 +988,7 @@
   "messages.team-websites-info": [
     {
       "type": 0,
-      "value": "Вебийг багийн бүх гишүүд үзэж болно."
+      "value": "Websites can be viewed by anyone on the team."
     }
   ]
 }

public/intl/messages/nl-NL.json

@@ -2,7 +2,7 @@
   "label.access-code": [
     {
       "type": 0,
-      "value": "Toegangscode"
+      "value": "Access code"
     }
   ],
   "label.actions": [
@@ -14,19 +14,19 @@
   "label.activity-log": [
     {
       "type": 0,
-      "value": "Activiteiten logboek"
+      "value": "Activity log"
     }
   ],
   "label.add-website": [
     {
       "type": 0,
-      "value": "Website koppelen"
+      "value": "Website toevoegen"
     }
   ],
   "label.admin": [
     {
       "type": 0,
-      "value": "Beheerder"
+      "value": "Administrator"
     }
   ],
   "label.all": [
@@ -86,19 +86,19 @@
   "label.cities": [
     {
       "type": 0,
-      "value": "Steden"
+      "value": "Cities"
     }
   ],
   "label.clear-all": [
     {
       "type": 0,
-      "value": "Filters wissen"
+      "value": "Clear all"
     }
   ],
   "label.confirm": [
     {
       "type": 0,
-      "value": "Bevestigen"
+      "value": "Confirm"
     }
   ],
   "label.confirm-password": [
@@ -110,7 +110,7 @@
   "label.continue": [
     {
       "type": 0,
-      "value": "Doorgaan"
+      "value": "Continue"
     }
   ],
   "label.countries": [
@@ -122,19 +122,19 @@
   "label.create-team": [
     {
       "type": 0,
-      "value": "Team aanmaken"
+      "value": "Create team"
     }
   ],
   "label.create-user": [
     {
       "type": 0,
-      "value": "Gebruiker maken"
+      "value": "Create user"
     }
   ],
   "label.created": [
     {
       "type": 0,
-      "value": "Gemaakt"
+      "value": "Created"
     }
   ],
   "label.current-password": [
@@ -158,7 +158,7 @@
   "label.data": [
     {
       "type": 0,
-      "value": "Gegevens"
+      "value": "Data"
     }
   ],
   "label.date-range": [
@@ -182,13 +182,13 @@
   "label.delete-team": [
     {
       "type": 0,
-      "value": "Team verwijderen"
+      "value": "Delete team"
     }
   ],
   "label.delete-user": [
     {
       "type": 0,
-      "value": "Verwijder gebruiker"
+      "value": "Delete user"
     }
   ],
   "label.delete-website": [
@@ -200,13 +200,13 @@
   "label.desktop": [
     {
       "type": 0,
-      "value": "Computer"
+      "value": "Desktop"
     }
   ],
   "label.details": [
     {
       "type": 0,
-      "value": "Informatie"
+      "value": "Details"
     }
   ],
   "label.devices": [
@@ -236,7 +236,7 @@
   "label.edit-dashboard": [
     {
       "type": 0,
-      "value": "Dashboard aanpassen"
+      "value": "Edit dashboard"
     }
   ],
   "label.enable-share-url": [
@@ -266,13 +266,13 @@
   "label.join": [
     {
       "type": 0,
-      "value": "Lid worden"
+      "value": "Join"
     }
   ],
   "label.join-team": [
     {
       "type": 0,
-      "value": "Word lid van een team"
+      "value": "Join team"
     }
   ],
   "label.language": [
@@ -284,7 +284,7 @@
   "label.languages": [
     {
       "type": 0,
-      "value": "Talen"
+      "value": "Languages"
     }
   ],
   "label.laptop": [
@@ -324,13 +324,13 @@
   "label.leave": [
     {
       "type": 0,
-      "value": "Verlaten"
+      "value": "Leave"
     }
   ],
   "label.leave-team": [
     {
       "type": 0,
-      "value": "Verlaat team"
+      "value": "Leave team"
     }
   ],
   "label.login": [
@@ -348,7 +348,7 @@
   "label.members": [
     {
       "type": 0,
-      "value": "Gebruikers"
+      "value": "Members"
     }
   ],
   "label.mobile": [
@@ -430,13 +430,13 @@
   "label.queries": [
     {
       "type": 0,
-      "value": "Parameters"
+      "value": "Queries"
     }
   ],
   "label.query-parameters": [
     {
       "type": 0,
-      "value": "URL-parameters"
+      "value": "Query parameters"
     }
   ],
   "label.realtime": [
@@ -460,19 +460,19 @@
   "label.regenerate": [
     {
       "type": 0,
-      "value": "Opnieuw genereren"
+      "value": "Regenerate"
     }
   ],
   "label.regions": [
     {
       "type": 0,
-      "value": "Regio's"
+      "value": "Regions"
     }
   ],
   "label.remove": [
     {
       "type": 0,
-      "value": "Verwijderen"
+      "value": "Remove"
     }
   ],
   "label.required": [
@@ -484,7 +484,7 @@
   "label.reset": [
     {
       "type": 0,
-      "value": "Opnieuw instellen"
+      "value": "Resetten"
     }
   ],
   "label.reset-website": [
@@ -496,7 +496,7 @@
   "label.role": [
     {
       "type": 0,
-      "value": "Gebruikersrol"
+      "value": "Role"
     }
   ],
   "label.save": [
@@ -514,13 +514,13 @@
   "label.select-website": [
     {
       "type": 0,
-      "value": "Website selecteren"
+      "value": "Select website"
     }
   ],
   "label.sessions": [
     {
       "type": 0,
-      "value": "Sessies"
+      "value": "Sessions"
     }
   ],
   "label.settings": [
@@ -556,7 +556,7 @@
   "label.team-guest": [
     {
       "type": 0,
-      "value": "Team gast"
+      "value": "Team guest"
     }
   ],
   "label.team-id": [
@@ -568,13 +568,13 @@
   "label.team-member": [
     {
       "type": 0,
-      "value": "Teamlid"
+      "value": "Team member"
     }
   ],
   "label.team-owner": [
     {
       "type": 0,
-      "value": "Teameigenaar"
+      "value": "Team owner"
     }
   ],
   "label.teams": [
@@ -616,7 +616,7 @@
   "label.title": [
     {
       "type": 0,
-      "value": "Titel"
+      "value": "Title"
     }
   ],
   "label.today": [
@@ -652,7 +652,7 @@
   "label.user": [
     {
       "type": 0,
-      "value": "Gebruiker"
+      "value": "User"
     }
   ],
   "label.username": [
@@ -664,13 +664,13 @@
   "label.users": [
     {
       "type": 0,
-      "value": "Gebruikers"
+      "value": "Users"
     }
   ],
   "label.view": [
     {
       "type": 0,
-      "value": "Weergave"
+      "value": "View"
     }
   ],
   "label.view-details": [
@@ -706,7 +706,7 @@
   "label.yesterday": [
     {
       "type": 0,
-      "value": "Gisteren"
+      "value": "Yesterday"
     }
   ],
   "message.active-users": [
@@ -760,7 +760,7 @@
   "message.confirm-leave": [
     {
       "type": 0,
-      "value": "Weet je zeker dat je "
+      "value": "Are you sure you want to leave "
     },
     {
       "type": 1,
@@ -768,7 +768,7 @@
     },
     {
       "type": 0,
-      "value": " wilt verlaten?"
+      "value": "?"
     }
   ],
   "message.confirm-reset": [
@@ -810,7 +810,7 @@
     },
     {
       "type": 0,
-      "value": " op "
+      "value": " on "
     },
     {
       "type": 1,
@@ -838,7 +838,7 @@
   "message.min-password-length": [
     {
       "type": 0,
-      "value": "Minimale lengte van "
+      "value": "Minimum length of "
     },
     {
       "type": 1,
@@ -846,7 +846,7 @@
     },
     {
       "type": 0,
-      "value": " tekens"
+      "value": " characters"
     }
   ],
   "message.no-data-available": [
@@ -864,13 +864,13 @@
   "message.no-teams": [
     {
       "type": 0,
-      "value": "Er zijn nog geen teams aangemaakt."
+      "value": "You have not created any teams."
     }
   ],
   "message.no-users": [
     {
       "type": 0,
-      "value": "Er zijn geen gebruikers."
+      "value": "There are no users."
     }
   ],
   "message.page-not-found": [
@@ -914,13 +914,13 @@
   "message.team-already-member": [
     {
       "type": 0,
-      "value": "Je bent al lid van het team."
+      "value": "You are already a member of the team."
     }
   ],
   "message.team-not-found": [
     {
       "type": 0,
-      "value": "Team niet gevonden."
+      "value": "Team not found."
     }
   ],
   "message.tracking-code": [
@@ -932,7 +932,7 @@
   "message.user-deleted": [
     {
       "type": 0,
-      "value": "Gebruiker verwijderd."
+      "value": "User deleted."
     }
   ],
   "message.visitor-log": [
@@ -972,7 +972,7 @@
   "messages.no-team-websites": [
     {
       "type": 0,
-      "value": "Er zijn geen websites gekoppeld aan dit team."
+      "value": "This team does not have any websites."
     }
   ],
   "messages.no-websites-configured": [
@@ -984,7 +984,7 @@
   "messages.team-websites-info": [
     {
       "type": 0,
-      "value": "Websites kunnen door iedereen in het team worden bekeken."
+      "value": "Websites can be viewed by anyone on the team."
     }
   ]
 }

public/intl/messages/pt-BR.json

@@ -2,7 +2,7 @@
   "label.access-code": [
     {
       "type": 0,
-      "value": "Código de acesso"
+      "value": "Access code"
     }
   ],
   "label.actions": [
@@ -14,7 +14,7 @@
   "label.activity-log": [
     {
       "type": 0,
-      "value": "Log de atividade"
+      "value": "Activity log"
     }
   ],
   "label.add-website": [
@@ -44,7 +44,7 @@
   "label.analytics": [
     {
       "type": 0,
-      "value": "Estatísticas"
+      "value": "Analytics"
     }
   ],
   "label.average-visit-time": [
@@ -86,19 +86,19 @@
   "label.cities": [
     {
       "type": 0,
-      "value": "Cidades"
+      "value": "Cities"
     }
   ],
   "label.clear-all": [
     {
       "type": 0,
-      "value": "Limpar tudo"
+      "value": "Clear all"
     }
   ],
   "label.confirm": [
     {
       "type": 0,
-      "value": "Confirmar"
+      "value": "Confirm"
     }
   ],
   "label.confirm-password": [
@@ -110,7 +110,7 @@
   "label.continue": [
     {
       "type": 0,
-      "value": "Continuar"
+      "value": "Continue"
     }
   ],
   "label.countries": [
@@ -122,19 +122,19 @@
   "label.create-team": [
     {
       "type": 0,
-      "value": "Criar time"
+      "value": "Create team"
     }
   ],
   "label.create-user": [
     {
       "type": 0,
-      "value": "Criar usuário"
+      "value": "Create user"
     }
   ],
   "label.created": [
     {
       "type": 0,
-      "value": "Criado"
+      "value": "Created"
     }
   ],
   "label.current-password": [
@@ -182,13 +182,13 @@
   "label.delete-team": [
     {
       "type": 0,
-      "value": "Remover time"
+      "value": "Delete team"
     }
   ],
   "label.delete-user": [
     {
       "type": 0,
-      "value": "Remover usuário"
+      "value": "Delete user"
     }
   ],
   "label.delete-website": [
@@ -206,7 +206,7 @@
   "label.details": [
     {
       "type": 0,
-      "value": "Detalhes"
+      "value": "Details"
     }
   ],
   "label.devices": [
@@ -236,7 +236,7 @@
   "label.edit-dashboard": [
     {
       "type": 0,
-      "value": "Editar painel"
+      "value": "Edit dashboard"
     }
   ],
   "label.enable-share-url": [
@@ -266,13 +266,13 @@
   "label.join": [
     {
       "type": 0,
-      "value": "Entrar"
+      "value": "Join"
     }
   ],
   "label.join-team": [
     {
       "type": 0,
-      "value": "Entrar no time"
+      "value": "Join team"
     }
   ],
   "label.language": [
@@ -324,13 +324,13 @@
   "label.leave": [
     {
       "type": 0,
-      "value": "Sair"
+      "value": "Leave"
     }
   ],
   "label.leave-team": [
     {
       "type": 0,
-      "value": "Sair do time"
+      "value": "Leave team"
     }
   ],
   "label.login": [
@@ -348,7 +348,7 @@
   "label.members": [
     {
       "type": 0,
-      "value": "Membros"
+      "value": "Members"
     }
   ],
   "label.mobile": [
@@ -378,7 +378,7 @@
   "label.none": [
     {
       "type": 0,
-      "value": "Nenhum"
+      "value": "None"
     }
   ],
   "label.operating-systems": [
@@ -430,7 +430,7 @@
   "label.queries": [
     {
       "type": 0,
-      "value": "Parâmetros"
+      "value": "Queries"
     }
   ],
   "label.query-parameters": [
@@ -460,19 +460,19 @@
   "label.regenerate": [
     {
       "type": 0,
-      "value": "Regerar"
+      "value": "Regenerate"
     }
   ],
   "label.regions": [
     {
       "type": 0,
-      "value": "Regiões"
+      "value": "Regions"
     }
   ],
   "label.remove": [
     {
       "type": 0,
-      "value": "Remover"
+      "value": "Remove"
     }
   ],
   "label.required": [
@@ -496,7 +496,7 @@
   "label.role": [
     {
       "type": 0,
-      "value": "Papel"
+      "value": "Role"
     }
   ],
   "label.save": [
@@ -514,13 +514,13 @@
   "label.select-website": [
     {
       "type": 0,
-      "value": "Selecionar site"
+      "value": "Select website"
     }
   ],
   "label.sessions": [
     {
       "type": 0,
-      "value": "Sessões"
+      "value": "Sessions"
     }
   ],
   "label.settings": [
@@ -550,37 +550,37 @@
   "label.team": [
     {
       "type": 0,
-      "value": "Time"
+      "value": "Team"
     }
   ],
   "label.team-guest": [
     {
       "type": 0,
-      "value": "Convidado"
+      "value": "Team guest"
     }
   ],
   "label.team-id": [
     {
       "type": 0,
-      "value": "ID do Time"
+      "value": "Team ID"
     }
   ],
   "label.team-member": [
     {
       "type": 0,
-      "value": "Membro"
+      "value": "Team member"
     }
   ],
   "label.team-owner": [
     {
       "type": 0,
-      "value": "Proprietário"
+      "value": "Team owner"
     }
   ],
   "label.teams": [
     {
       "type": 0,
-      "value": "Times"
+      "value": "Teams"
     }
   ],
   "label.theme": [
@@ -616,7 +616,7 @@
   "label.title": [
     {
       "type": 0,
-      "value": "Título"
+      "value": "Title"
     }
   ],
   "label.today": [
@@ -652,7 +652,7 @@
   "label.user": [
     {
       "type": 0,
-      "value": "Usuário"
+      "value": "User"
     }
   ],
   "label.username": [
@@ -664,13 +664,13 @@
   "label.users": [
     {
       "type": 0,
-      "value": "Usuários"
+      "value": "Users"
     }
   ],
   "label.view": [
     {
       "type": 0,
-      "value": "Ver"
+      "value": "View"
     }
   ],
   "label.view-details": [
@@ -694,7 +694,7 @@
   "label.website-id": [
     {
       "type": 0,
-      "value": "ID do Site"
+      "value": "Website ID"
     }
   ],
   "label.websites": [
@@ -764,7 +764,7 @@
   "message.confirm-leave": [
     {
       "type": 0,
-      "value": "Você tem certeza que deseja sair de "
+      "value": "Are you sure you want to leave "
     },
     {
       "type": 1,
@@ -814,7 +814,7 @@
     },
     {
       "type": 0,
-      "value": " em "
+      "value": " on "
     },
     {
       "type": 1,
@@ -842,7 +842,7 @@
   "message.min-password-length": [
     {
       "type": 0,
-      "value": "Quantidade mínima de "
+      "value": "Minimum length of "
     },
     {
       "type": 1,
@@ -850,7 +850,7 @@
     },
     {
       "type": 0,
-      "value": " caracteres"
+      "value": " characters"
     }
   ],
   "message.no-data-available": [
@@ -868,13 +868,13 @@
   "message.no-teams": [
     {
       "type": 0,
-      "value": "Você não criou nenhum time."
+      "value": "You have not created any teams."
     }
   ],
   "message.no-users": [
     {
       "type": 0,
-      "value": "Não há nenhum usuário."
+      "value": "There are no users."
     }
   ],
   "message.page-not-found": [
@@ -918,13 +918,13 @@
   "message.team-already-member": [
     {
       "type": 0,
-      "value": "Você já um membro do time."
+      "value": "You are already a member of the team."
     }
   ],
   "message.team-not-found": [
     {
       "type": 0,
-      "value": "Time não encontrado."
+      "value": "Team not found."
     }
   ],
   "message.tracking-code": [
@@ -936,7 +936,7 @@
   "message.user-deleted": [
     {
       "type": 0,
-      "value": "Usuário removido."
+      "value": "User deleted."
     }
   ],
   "message.visitor-log": [
@@ -976,7 +976,7 @@
   "messages.no-team-websites": [
     {
       "type": 0,
-      "value": "Este time não possui nenhum site."
+      "value": "This team does not have any websites."
     }
   ],
   "messages.no-websites-configured": [
@@ -988,7 +988,7 @@
   "messages.team-websites-info": [
     {
       "type": 0,
-      "value": "Os sites podem ser visualizados por qualquer membro da equipe."
+      "value": "Websites can be viewed by anyone on the team."
     }
   ]
 }

queries/admin/user.ts

@@ -1,5 +1,4 @@
 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';
@@ -223,7 +222,6 @@ export async function deleteUser(
       cloudMode
         ? client.user.update({
             data: {
-              username: getRandomChars(32),
               deletedAt: new Date(),
             },
             where: {

queries/analytics/event/getEventUsage.ts

@@ -1,32 +0,0 @@
-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,
-    },
-  );
-}

queries/analytics/event/getEvents.ts

@@ -1,6 +1,7 @@
-import clickhouse from 'lib/clickhouse';
-import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import prisma from 'lib/prisma';
+import clickhouse from 'lib/clickhouse';
+import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
+import { EVENT_TYPE } from 'lib/constants';
 
 export function getEvents(...args: [websiteId: string, startAt: Date, eventType: number]) {
   return runQuery({

queries/analytics/eventData/getEventDataUsage.ts

@@ -1,32 +0,0 @@
-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,
-    },
-  );
-}

queries/index.js

@@ -3,10 +3,8 @@ 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';

scripts/check-db.js

@@ -11,7 +11,7 @@ if (process.env.SKIP_DB_CHECK) {
 }
 
 function getDatabaseType(url = process.env.DATABASE_URL) {
-  const type = url && url.split(':')[0];
+  const type = process.env.DATABASE_TYPE || (url && url.split(':')[0]);
 
   if (type === 'postgres') {
     return 'postgresql';
@@ -20,6 +20,7 @@ function getDatabaseType(url = process.env.DATABASE_URL) {
   return type;
 }
 
+const databaseType = getDatabaseType();
 const prisma = new PrismaClient();
 
 function success(msg) {
@@ -48,11 +49,10 @@ async function checkConnection() {
   }
 }
 
-async function checkDatabaseVersion() {
+async function checkDatabaseVersion(databaseType) {
   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 {
-      await fn();
+      fn.name === 'checkDatabaseVersion' ? await fn(databaseType) : await fn();
     } catch (e) {
       error(e.message);
       err = true;

tracker/index.d.ts

@@ -1,138 +0,0 @@
-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>;
-    };
-  };
-}

yarn.lock

@@ -1518,13 +1518,6 @@
   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"
@@ -1869,9 +1862,9 @@
     eslint-visitor-keys "^3.3.0"
 
 "@eslint-community/regexpp@^4.4.0":
-  version "4.5.1"
+  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.1.tgz#cdd35dce4fa1a89a4fd42b1599eb35b3af408884"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.0.tgz#f6f729b02feee2c749f57e334b7a1b5f40a81724"
-  integrity sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==
+  integrity sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ==
 
 "@eslint/eslintrc@^2.0.2":
   version "2.0.2"
@@ -2308,10 +2301,10 @@
     slash "^3.0.0"
     tiny-glob "^0.2.9"
 
-"@next/env@13.3.1":
+"@next/env@13.2.4":
-  version "13.3.1"
+  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-13.3.1.tgz#589707043065f6b71d411ed9b8f1ffd057c0fd4a"
+  resolved "https://registry.yarnpkg.com/@next/env/-/env-13.2.4.tgz#8b763700262b2445140a44a8c8d088cef676dbae"
-  integrity sha512-EDtCoedIZC7JlUQ3uaQpSc4aVmyhbLHmQVALg7pFfQgOTjgSnn7mKtA0DiCMkYvvsx6aFb5octGMtWrOtGXW9A==
+  integrity sha512-+Mq3TtpkeeKFZanPturjcXt+KHfKYnLlX6jMLyCrmpq6OOs4i1GqBOAauSkii9QeKCMTYzGppar21JU57b/GEA==
 
 "@next/eslint-plugin-next@12.3.4":
   version "12.3.4"
@@ -2320,50 +2313,70 @@
   dependencies:
     glob "7.1.7"
 
-"@next/swc-darwin-arm64@13.3.1":
+"@next/swc-android-arm-eabi@13.2.4":
-  version "13.3.1"
+  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.3.1.tgz#2c9719dd10a9cdf63bf50a7576b05dcf78999fe8"
+  resolved "https://registry.yarnpkg.com/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-13.2.4.tgz#758d0403771e549f9cee71cbabc0cb16a6c947c0"
-  integrity sha512-UXPtriEc/pBP8luSLSCZBcbzPeVv+SSjs9cH/KygTbhmACye8/OOXRZO13Z2Wq1G0gLmEAIHQAOuF+vafPd2lw==
+  integrity sha512-DWlalTSkLjDU11MY11jg17O1gGQzpRccM9Oes2yTqj2DpHndajrXHGxj9HGtJ+idq2k7ImUdJVWS2h2l/EDJOw==
 
-"@next/swc-darwin-x64@13.3.1":
+"@next/swc-android-arm64@13.2.4":
-  version "13.3.1"
+  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-13.3.1.tgz#0be90342c89e53a390ccd9bece15f7f5cd480049"
+  resolved "https://registry.yarnpkg.com/@next/swc-android-arm64/-/swc-android-arm64-13.2.4.tgz#834d586523045110d5602e0c8aae9028835ac427"
-  integrity sha512-lT36yYxosCfLtplFzJWgo0hrPu6/do8+msgM7oQkPeohDNdhjtjFUgOOwdSnPublLR6Mo2Ym4P/wl5OANuD2bw==
+  integrity sha512-sRavmUImUCf332Gy+PjIfLkMhiRX1Ez4SI+3vFDRs1N5eXp+uNzjFUK/oLMMOzk6KFSkbiK/3Wt8+dHQR/flNg==
 
-"@next/swc-linux-arm64-gnu@13.3.1":
+"@next/swc-darwin-arm64@13.2.4":
-  version "13.3.1"
+  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.3.1.tgz#a7353265839f8b8569a346a444dc3ab3770d297e"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.2.4.tgz#5006fca179a36ef3a24d293abadec7438dbb48c6"
-  integrity sha512-wRb76nLWJhonH8s3kxC/1tFguEkeOPayIwe9mkaz1G/yeS3OrjeyKMJsb4+Kdg0zbTo53bNCOl59NNtDM7yyyw==
+  integrity sha512-S6vBl+OrInP47TM3LlYx65betocKUUlTZDDKzTiRDbsRESeyIkBtZ6Qi5uT2zQs4imqllJznVjFd1bXLx3Aa6A==
 
-"@next/swc-linux-arm64-musl@13.3.1":
+"@next/swc-darwin-x64@13.2.4":
-  version "13.3.1"
+  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.3.1.tgz#24552e6102c350e372f83f505a1d93c880551a50"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-13.2.4.tgz#6549c7c04322766acc3264ccdb3e1b43fcaf7946"
-  integrity sha512-qz3BzjJRZ16Iq/jrp+pjiYOc0jTjHlfmxQmZk9x/+5uhRP6/eWQSTAPVJ33BMo6oK5O5N4644OgTAbzXzorecg==
+  integrity sha512-a6LBuoYGcFOPGd4o8TPo7wmv5FnMr+Prz+vYHopEDuhDoMSHOnC+v+Ab4D7F0NMZkvQjEJQdJS3rqgFhlZmKlw==
 
-"@next/swc-linux-x64-gnu@13.3.1":
+"@next/swc-freebsd-x64@13.2.4":
-  version "13.3.1"
+  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.3.1.tgz#5f335a683b6eafa52307b12af97782993b6c45ff"
+  resolved "https://registry.yarnpkg.com/@next/swc-freebsd-x64/-/swc-freebsd-x64-13.2.4.tgz#0bbe28979e3e868debc2cc06e45e186ce195b7f4"
-  integrity sha512-6mgkLmwlyWlomQmpl21I3hxgqE5INoW4owTlcLpNsd1V4wP+J46BlI/5zV5KWWbzjfncIqzXoeGs5Eg+1GHODA==
+  integrity sha512-kkbzKVZGPaXRBPisoAQkh3xh22r+TD+5HwoC5bOkALraJ0dsOQgSMAvzMXKsN3tMzJUPS0tjtRf1cTzrQ0I5vQ==
 
-"@next/swc-linux-x64-musl@13.3.1":
+"@next/swc-linux-arm-gnueabihf@13.2.4":
-  version "13.3.1"
+  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.3.1.tgz#58e5aad6f97203a0788783f66324456c8f9cdb50"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-13.2.4.tgz#1d28d2203f5a7427d6e7119d7bcb5fc40959fb3e"
-  integrity sha512-uqm5sielhQmKJM+qayIhgZv1KlS5pqTdQ99b+Z7hMWryXS96qE0DftTmMZowBcUL6x7s2vSXyH5wPtO1ON7LBg==
+  integrity sha512-7qA1++UY0fjprqtjBZaOA6cas/7GekpjVsZn/0uHvquuITFCdKGFCsKNBx3S0Rpxmx6WYo0GcmhNRM9ru08BGg==
 
-"@next/swc-win32-arm64-msvc@13.3.1":
+"@next/swc-linux-arm64-gnu@13.2.4":
-  version "13.3.1"
+  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.3.1.tgz#f8ed1badab57ed4503969758754e6fb0cf326753"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.2.4.tgz#eb26448190948cdf4c44b8f34110a3ecea32f1d0"
-  integrity sha512-WomIiTj/v3LevltlibNQKmvrOymNRYL+a0dp5R73IwPWN5FvXWwSELN/kiNALig/+T3luc4qHNTyvMCp9L6U5Q==
+  integrity sha512-xzYZdAeq883MwXgcwc72hqo/F/dwUxCukpDOkx/j1HTq/J0wJthMGjinN9wH5bPR98Mfeh1MZJ91WWPnZOedOg==
 
-"@next/swc-win32-ia32-msvc@13.3.1":
+"@next/swc-linux-arm64-musl@13.2.4":
-  version "13.3.1"
+  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.3.1.tgz#7f599c8975b09ee5527cc49b9e5a4d13be50635a"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.2.4.tgz#c4227c0acd94a420bb14924820710e6284d234d3"
-  integrity sha512-M+PoH+0+q658wRUbs285RIaSTYnGBSTdweH/0CdzDgA6Q4rBM0sQs4DHmO3BPP0ltCO/vViIoyG7ks66XmCA5g==
+  integrity sha512-8rXr3WfmqSiYkb71qzuDP6I6R2T2tpkmf83elDN8z783N9nvTJf2E7eLx86wu2OJCi4T05nuxCsh4IOU3LQ5xw==
 
-"@next/swc-win32-x64-msvc@13.3.1":
+"@next/swc-linux-x64-gnu@13.2.4":
-  version "13.3.1"
+  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.3.1.tgz#192d43ab44ebb98bd4f5865d0e1d7ce62703182f"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.2.4.tgz#6bcb540944ee9b0209b33bfc23b240c2044dfc3e"
-  integrity sha512-Sl1F4Vp5Z1rNXWZYqJwMuWRRol4bqOB6+/d7KqkgQ4AcafKPN1PZmpkCoxv4UFHtFNIB7EotnuIhtXu3zScicQ==
+  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==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
@@ -2899,10 +2912,10 @@
     "@svgr/plugin-jsx" "^6.5.1"
     "@svgr/plugin-svgo" "^6.5.1"
 
-"@swc/helpers@0.5.0":
+"@swc/helpers@0.4.14":
-  version "0.5.0"
+  version "0.4.14"
-  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.0.tgz#bf1d807b60f7290d0ec763feea7ccdeda06e85f1"
+  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.4.14.tgz#1352ac6d95e3617ccb7c1498ff019654f1e12a74"
-  integrity sha512-SjY/p4MmECVVEWspzSRpQEM3sjR17sP8PbGxELWrT+YZMBfiUyt1MRUNjMV23zohwlG2HYtCQOsCwsTHguXkyg==
+  integrity sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==
   dependencies:
     tslib "^2.4.0"
 
@@ -3138,14 +3151,14 @@
   integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
 
 "@typescript-eslint/eslint-plugin@^5.50.0":
-  version "5.59.2"
+  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.2.tgz#684a2ce7182f3b4dac342eef7caa1c2bae476abd"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.1.tgz#9b09ee1541bff1d2cebdcb87e7ce4a4003acde08"
-  integrity sha512-yVrXupeHjRxLDcPKL10sGQ/QlVrA8J5IYOEWVqk0lJaSZP7X5DfnP7Ns3cc74/blmbipQ1htFNVGsHX6wsYm0A==
+  integrity sha512-AVi0uazY5quFB9hlp2Xv+ogpfpk77xzsgsIEWyVS7uK/c7MZ5tw7ZPbapa0SbfkqE0fsAMkz5UwtgMLVk2BQAg==
   dependencies:
     "@eslint-community/regexpp" "^4.4.0"
-    "@typescript-eslint/scope-manager" "5.59.2"
+    "@typescript-eslint/scope-manager" "5.59.1"
-    "@typescript-eslint/type-utils" "5.59.2"
+    "@typescript-eslint/type-utils" "5.59.1"
-    "@typescript-eslint/utils" "5.59.2"
+    "@typescript-eslint/utils" "5.59.1"
     debug "^4.3.4"
     grapheme-splitter "^1.0.4"
     ignore "^5.2.0"
@@ -3164,13 +3177,13 @@
     debug "^4.3.4"
 
 "@typescript-eslint/parser@^5.50.0":
-  version "5.59.2"
+  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.59.2.tgz#c2c443247901d95865b9f77332d9eee7c55655e8"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.59.1.tgz#73c2c12127c5c1182d2e5b71a8fa2a85d215cbb4"
-  integrity sha512-uq0sKyw6ao1iFOZZGk9F8Nro/8+gfB5ezl1cA06SrqbgJAt0SRoFhb9pXaHvkrxUpZaoLxt8KlovHNk8Gp6/HQ==
+  integrity sha512-nzjFAN8WEu6yPRDizIFyzAfgK7nybPodMNFGNH0M9tei2gYnYszRDqVA0xlnRjkl7Hkx2vYrEdb6fP2a21cG1g==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.59.2"
+    "@typescript-eslint/scope-manager" "5.59.1"
-    "@typescript-eslint/types" "5.59.2"
+    "@typescript-eslint/types" "5.59.1"
-    "@typescript-eslint/typescript-estree" "5.59.2"
+    "@typescript-eslint/typescript-estree" "5.59.1"
     debug "^4.3.4"
 
 "@typescript-eslint/scope-manager@5.45.0":
@@ -3181,21 +3194,21 @@
     "@typescript-eslint/types" "5.45.0"
     "@typescript-eslint/visitor-keys" "5.45.0"
 
-"@typescript-eslint/scope-manager@5.59.2":
+"@typescript-eslint/scope-manager@5.59.1":
-  version "5.59.2"
+  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.2.tgz#f699fe936ee4e2c996d14f0fdd3a7da5ba7b9a4c"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.1.tgz#8a20222719cebc5198618a5d44113705b51fd7fe"
-  integrity sha512-dB1v7ROySwQWKqQ8rEWcdbTsFjh2G0vn8KUyvTXdPoyzSL6lLGkiXEV5CvpJsEe9xIdKV+8Zqb7wif2issoOFA==
+  integrity sha512-mau0waO5frJctPuAzcxiNWqJR5Z8V0190FTSqRw1Q4Euop6+zTwHAf8YIXNwDOT29tyUDrQ65jSg9aTU/H0omA==
   dependencies:
-    "@typescript-eslint/types" "5.59.2"
+    "@typescript-eslint/types" "5.59.1"
-    "@typescript-eslint/visitor-keys" "5.59.2"
+    "@typescript-eslint/visitor-keys" "5.59.1"
 
-"@typescript-eslint/type-utils@5.59.2":
+"@typescript-eslint/type-utils@5.59.1":
-  version "5.59.2"
+  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.59.2.tgz#0729c237503604cd9a7084b5af04c496c9a4cdcf"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.59.1.tgz#63981d61684fd24eda2f9f08c0a47ecb000a2111"
-  integrity sha512-b1LS2phBOsEy/T381bxkkywfQXkV1dWda/z0PhnIy3bC5+rQWQDS7fk9CSpcXBccPY27Z6vBEuaPBCKCgYezyQ==
+  integrity sha512-ZMWQ+Oh82jWqWzvM3xU+9y5U7MEMVv6GLioM3R5NJk6uvP47kZ7YvlgSHJ7ERD6bOY7Q4uxWm25c76HKEwIjZw==
   dependencies:
-    "@typescript-eslint/typescript-estree" "5.59.2"
+    "@typescript-eslint/typescript-estree" "5.59.1"
-    "@typescript-eslint/utils" "5.59.2"
+    "@typescript-eslint/utils" "5.59.1"
     debug "^4.3.4"
     tsutils "^3.21.0"
 
@@ -3204,10 +3217,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":
+"@typescript-eslint/types@5.59.1":
-  version "5.59.2"
+  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.2.tgz#b511d2b9847fe277c5cb002a2318bd329ef4f655"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.1.tgz#03f3fedd1c044cb336ebc34cc7855f121991f41d"
-  integrity sha512-LbJ/HqoVs2XTGq5shkiKaNTuVv5tTejdHgfdjqRUGdYhjW1crm/M7og2jhVskMt8/4wS3T1+PfFvL1K3wqYj4w==
+  integrity sha512-dg0ICB+RZwHlysIy/Dh1SP+gnXNzwd/KS0JprD3Lmgmdq+dJAJnUPe1gNG34p0U19HvRlGX733d/KqscrGC1Pg==
 
 "@typescript-eslint/typescript-estree@5.45.0":
   version "5.45.0"
@@ -3222,30 +3235,30 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/typescript-estree@5.59.2":
+"@typescript-eslint/typescript-estree@5.59.1":
-  version "5.59.2"
+  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.2.tgz#6e2fabd3ba01db5d69df44e0b654c0b051fe9936"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.1.tgz#4aa546d27fd0d477c618f0ca00b483f0ec84c43c"
-  integrity sha512-+j4SmbwVmZsQ9jEyBMgpuBD0rKwi9RxRpjX71Brr73RsYnEr3Lt5QZ624Bxphp8HUkSKfqGnPJp1kA5nl0Sh7Q==
+  integrity sha512-lYLBBOCsFltFy7XVqzX0Ju+Lh3WPIAWxYpmH/Q7ZoqzbscLiCW00LeYCdsUnnfnj29/s1WovXKh2gwCoinHNGA==
   dependencies:
-    "@typescript-eslint/types" "5.59.2"
+    "@typescript-eslint/types" "5.59.1"
-    "@typescript-eslint/visitor-keys" "5.59.2"
+    "@typescript-eslint/visitor-keys" "5.59.1"
     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":
+"@typescript-eslint/utils@5.59.1":
-  version "5.59.2"
+  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.2.tgz#0c45178124d10cc986115885688db6abc37939f4"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.1.tgz#d89fc758ad23d2157cfae53f0b429bdf15db9473"
-  integrity sha512-kSuF6/77TZzyGPhGO4uVp+f0SBoYxCDf+lW3GKhtKru/L8k/Hd7NFQxyWUeY7Z/KGB2C6Fe3yf2vVi4V9TsCSQ==
+  integrity sha512-MkTe7FE+K1/GxZkP5gRj3rCztg45bEhsd8HYjczBuYm+qFHP5vtZmjx3B0yUCDotceQ4sHgTyz60Ycl225njmA==
   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/scope-manager" "5.59.1"
-    "@typescript-eslint/types" "5.59.2"
+    "@typescript-eslint/types" "5.59.1"
-    "@typescript-eslint/typescript-estree" "5.59.2"
+    "@typescript-eslint/typescript-estree" "5.59.1"
     eslint-scope "^5.1.1"
     semver "^7.3.7"
 
@@ -3257,12 +3270,12 @@
     "@typescript-eslint/types" "5.45.0"
     eslint-visitor-keys "^3.3.0"
 
-"@typescript-eslint/visitor-keys@5.59.2":
+"@typescript-eslint/visitor-keys@5.59.1":
-  version "5.59.2"
+  version "5.59.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.2.tgz#37a419dc2723a3eacbf722512b86d6caf7d3b750"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.1.tgz#0d96c36efb6560d7fb8eb85de10442c10d8f6058"
-  integrity sha512-EEpsO8m3RASrKAHI9jpavNv9NlEUebV4qmF1OWxSTtKSFBpC1NCmWazDQHFivRf0O1DV11BA645yrLEVQ0/Lig==
+  integrity sha512-6waEYwBTCWryx0VJmP7JaM4FpipLsFl9CvYf2foAE8Qh/Y0s+bxWysciwOs0LTBED4JCaNxTZ5rGadB14M6dwA==
   dependencies:
-    "@typescript-eslint/types" "5.59.2"
+    "@typescript-eslint/types" "5.59.1"
     eslint-visitor-keys "^3.3.0"
 
 "@umami/prisma-client@^0.2.0":
@@ -3272,10 +3285,10 @@
   dependencies:
     debug "^4.3.4"
 
-"@umami/redis-client@^0.5.0":
+"@umami/redis-client@^0.2.0":
-  version "0.5.0"
+  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/@umami/redis-client/-/redis-client-0.5.0.tgz#09b15458001bc172fc856d65316efbe5ff749461"
+  resolved "https://registry.yarnpkg.com/@umami/redis-client/-/redis-client-0.2.0.tgz#bdb1cd8b5c99afc5230621f19296c6d3559d68af"
-  integrity sha512-x7wx/pMjyg3AAYzgjGOw031bNhyZ81h6tRMAl60RQQI9xlJaJEA1r0TEUrWfFi21gHAvdBLJGYCsvHzpix4LKQ==
+  integrity sha512-TONWhkuC//K2hRo3Psk7FHsuvu3XkQIYMY62/CERPtlIJz4Ac7DqsmYw4jO9/RkljA9XLl/5u+OggD4ARhMV8A==
   dependencies:
     debug "^4.3.4"
     redis "^4.5.1"
@@ -3834,7 +3847,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==
@@ -4492,14 +4505,7 @@ 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.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"
-  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==
@@ -7028,27 +7034,30 @@ next-basics@^0.27.0:
     bcryptjs "^2.4.3"
     jsonwebtoken "^9.0.0"
 
-next@13.3.1:
+next@13.2.4:
-  version "13.3.1"
+  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/next/-/next-13.3.1.tgz#17625f7423db2e059d71b41bd9031756cf2b33bc"
+  resolved "https://registry.yarnpkg.com/next/-/next-13.2.4.tgz#2363330392b0f7da02ab41301f60857ffa7f67d6"
-  integrity sha512-eByWRxPzKHs2oQz1yE41LX35umhz86ZSZ+mYyXBqn2IBi2hyUqxBA88avywdr4uyH+hCJczegGsDGWbzQA5Rqw==
+  integrity sha512-g1I30317cThkEpvzfXujf0O4wtaQHtDCLhlivwlTJ885Ld+eOgcz7r3TGQzeU+cSRoNHtD8tsJgzxVdYojFssw==
   dependencies:
-    "@next/env" "13.3.1"
+    "@next/env" "13.2.4"
-    "@swc/helpers" "0.5.0"
+    "@swc/helpers" "0.4.14"
-    busboy "1.6.0"
     caniuse-lite "^1.0.30001406"
     postcss "8.4.14"
     styled-jsx "5.1.1"
   optionalDependencies:
-    "@next/swc-darwin-arm64" "13.3.1"
+    "@next/swc-android-arm-eabi" "13.2.4"
-    "@next/swc-darwin-x64" "13.3.1"
+    "@next/swc-android-arm64" "13.2.4"
-    "@next/swc-linux-arm64-gnu" "13.3.1"
+    "@next/swc-darwin-arm64" "13.2.4"
-    "@next/swc-linux-arm64-musl" "13.3.1"
+    "@next/swc-darwin-x64" "13.2.4"
-    "@next/swc-linux-x64-gnu" "13.3.1"
+    "@next/swc-freebsd-x64" "13.2.4"
-    "@next/swc-linux-x64-musl" "13.3.1"
+    "@next/swc-linux-arm-gnueabihf" "13.2.4"
-    "@next/swc-win32-arm64-msvc" "13.3.1"
+    "@next/swc-linux-arm64-gnu" "13.2.4"
-    "@next/swc-win32-ia32-msvc" "13.3.1"
+    "@next/swc-linux-arm64-musl" "13.2.4"
-    "@next/swc-win32-x64-msvc" "13.3.1"
+    "@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"
 
 nice-try@^1.0.4:
   version "1.0.5"