diff --git a/hooks/useDateRange.js b/hooks/useDateRange.js
index 99e49dfd..77f892de 100644
--- a/hooks/useDateRange.js
+++ b/hooks/useDateRange.js
@@ -1,8 +1,41 @@
-import { useSelector } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
+import { parseISO } from 'date-fns';
import { getDateRange } from 'lib/date';
+import { getItem, setItem } from 'lib/web';
+import { setDateRange } from '../redux/actions/websites';
+import { DATE_RANGE_CONFIG, DEFAULT_DATE_RANGE } from 'lib/constants';
+import useForceUpdate from './useForceUpdate';
-export function useDateRange(websiteId, defaultDateRange = '7day') {
- return useSelector(
- state => state.websites[websiteId]?.dateRange || getDateRange(defaultDateRange),
- );
+export default function useDateRange(websiteId, defaultDateRange = DEFAULT_DATE_RANGE) {
+ const dispatch = useDispatch();
+ const dateRange = useSelector(state => state.websites[websiteId]?.dateRange);
+ const forceUpdate = useForceUpdate();
+
+ const globalDefault = getItem(DATE_RANGE_CONFIG);
+ let globalDateRange;
+
+ if (globalDefault) {
+ if (typeof globalDefault === 'string') {
+ globalDateRange = getDateRange(globalDefault);
+ } else if (typeof globalDefault === 'object') {
+ globalDateRange = {
+ ...globalDefault,
+ startDate: parseISO(globalDefault.startDate),
+ endDate: parseISO(globalDefault.endDate),
+ };
+ }
+ }
+
+ function saveDateRange(values) {
+ const { value } = values;
+
+ if (websiteId) {
+ dispatch(setDateRange(websiteId, values));
+ } else {
+ setItem(DATE_RANGE_CONFIG, value === 'custom' ? values : value);
+ forceUpdate();
+ }
+ }
+
+ return [dateRange || globalDateRange || getDateRange(defaultDateRange), saveDateRange];
}
diff --git a/hooks/useFetch.js b/hooks/useFetch.js
index 98ee912a..a99778ae 100644
--- a/hooks/useFetch.js
+++ b/hooks/useFetch.js
@@ -7,6 +7,7 @@ export default function useFetch(url, params = {}, options = {}) {
const dispatch = useDispatch();
const [data, setData] = useState();
const [error, setError] = useState();
+ const [loading, setLoadiing] = useState(false);
const keys = Object.keys(params)
.sort()
.map(key => params[key]);
@@ -14,6 +15,7 @@ export default function useFetch(url, params = {}, options = {}) {
async function loadData() {
try {
+ setLoadiing(true);
setError(null);
const time = performance.now();
const data = await get(url, params);
@@ -25,6 +27,8 @@ export default function useFetch(url, params = {}, options = {}) {
} catch (e) {
console.error(e);
setError(e);
+ } finally {
+ setLoadiing(false);
}
}
@@ -42,5 +46,5 @@ export default function useFetch(url, params = {}, options = {}) {
}
}, [url, ...keys, ...update]);
- return { data, error, loadData };
+ return { data, error, loading, loadData };
}
diff --git a/hooks/useForceUpdate.js b/hooks/useForceUpdate.js
new file mode 100644
index 00000000..2b8d6101
--- /dev/null
+++ b/hooks/useForceUpdate.js
@@ -0,0 +1,9 @@
+import { useCallback, useState } from 'react';
+
+export default function useForceUpdate() {
+ const [, update] = useState(Object.create(null));
+
+ return useCallback(() => {
+ update(Object.create(null));
+ }, [update]);
+}
diff --git a/hooks/useLocale.js b/hooks/useLocale.js
index 185c1f19..6c7ed2a3 100644
--- a/hooks/useLocale.js
+++ b/hooks/useLocale.js
@@ -1,13 +1,16 @@
import { useDispatch, useSelector } from 'react-redux';
-import { updateApp } from 'redux/actions/app';
+import { setLocale } from 'redux/actions/app';
+import { setItem } from 'lib/web';
+import { LOCALE_CONFIG } from 'lib/constants';
export default function useLocale() {
const locale = useSelector(state => state.app.locale);
const dispatch = useDispatch();
- function setLocale(value) {
- dispatch(updateApp({ locale: value }));
+ function saveLocale(value) {
+ setItem(LOCALE_CONFIG, value);
+ dispatch(setLocale(value));
}
- return [locale, setLocale];
+ return [locale, saveLocale];
}
diff --git a/hooks/useTheme.js b/hooks/useTheme.js
new file mode 100644
index 00000000..7ce158b7
--- /dev/null
+++ b/hooks/useTheme.js
@@ -0,0 +1,21 @@
+import { useDispatch, useSelector } from 'react-redux';
+import { setTheme } from 'redux/actions/app';
+import { getItem, setItem } from 'lib/web';
+import { THEME_CONFIG } from 'lib/constants';
+import { useEffect } from 'react';
+
+export default function useLocale() {
+ const theme = useSelector(state => state.app.theme || getItem(THEME_CONFIG) || 'light');
+ const dispatch = useDispatch();
+
+ function saveTheme(value) {
+ setItem(THEME_CONFIG, value);
+ dispatch(setTheme(value));
+ }
+
+ useEffect(() => {
+ document.body.setAttribute('data-theme', theme);
+ }, [theme]);
+
+ return [theme, saveTheme];
+}
diff --git a/hooks/useTimezone.js b/hooks/useTimezone.js
new file mode 100644
index 00000000..5de39f9a
--- /dev/null
+++ b/hooks/useTimezone.js
@@ -0,0 +1,17 @@
+import { useState, useCallback } from 'react';
+import { getTimezone } from 'lib/date';
+import { getItem, setItem } from 'lib/web';
+
+export default function useTimezone() {
+ const [timezone, setTimezone] = useState(getItem('umami.timezone') || getTimezone());
+
+ const saveTimezone = useCallback(
+ value => {
+ setItem('umami.timezone', value);
+ setTimezone(value);
+ },
+ [setTimezone],
+ );
+
+ return [timezone, saveTimezone];
+}
diff --git a/lang/da-DK.json b/lang/da-DK.json
new file mode 100644
index 00000000..0061f7ff
--- /dev/null
+++ b/lang/da-DK.json
@@ -0,0 +1,95 @@
+{
+ "button.add-account": "Tilføj konto",
+ "button.add-website": "Tilføj hjemmeside",
+ "button.back": "Tilbage",
+ "button.cancel": "Afvis",
+ "button.change-password": "Skift adgangskode",
+ "button.copy-to-clipboard": "Kopier til udklipsholder",
+ "button.date-range": "Datointerval",
+ "button.delete": "Slet",
+ "button.edit": "Rediger",
+ "button.login": "Log ind",
+ "button.more": "Mere",
+ "button.refresh": "Opdater",
+ "button.reset": "Reset",
+ "button.save": "Gem",
+ "button.single-day": "Enkelt dag",
+ "button.view-details": "Vis detajler",
+ "label.accounts": "Kontoer",
+ "label.administrator": "Administrator",
+ "label.confirm-password": "Godkendt adgangskode",
+ "label.current-password": "Nuværende adgangskode",
+ "label.custom-range": "Tilpasset interval",
+ "label.dashboard": "Betjeningspanel",
+ "label.default-date-range": "Default date range",
+ "label.domain": "Domæne",
+ "label.enable-share-url": "Aktivér delings-URL",
+ "label.invalid": "Ugyldig",
+ "label.invalid-domain": "Ugyldigt domæne",
+ "label.last-days": "Sidste {x} dage",
+ "label.last-hours": "Sidste {x} timer",
+ "label.logged-in-as": "Loggede ind som {username}",
+ "label.logout": "Log ud",
+ "label.name": "Navn",
+ "label.new-password": "Ny adgangskode",
+ "label.password": "Adgangskode",
+ "label.passwords-dont-match": "Adgangskoder matcher ikke",
+ "label.profile": "Profil",
+ "label.required": "Påkrævet",
+ "label.settings": "Indstillinger",
+ "label.this-month": "Denne måned",
+ "label.this-week": "Denne uge",
+ "label.this-year": "Dette år",
+ "label.timezone": "Timezone",
+ "label.today": "Idag",
+ "label.unknown": "Ukendt",
+ "label.username": "Brugernavn",
+ "label.websites": "Hjemmesider",
+ "message.active-users": "{x} Nuværende brugere {x, plural, one {visitor} other {visitors}}",
+ "message.confirm-delete": "Er du sikker på at du vil slette {target}?",
+ "message.copied": "Kopieret!",
+ "message.delete-warning": "Alle tilknyttede data slettes også.",
+ "message.failure": "Noget gik galt.",
+ "message.get-share-url": "Få delings-URL",
+ "message.get-tracking-code": "Få sporingskode",
+ "message.go-to-settings": "Gå til betjeningspanel",
+ "message.incorrect-username-password": "Ugyldigt brugernavn/adgangskode.",
+ "message.no-data-available": "Ingen data tilgængelig.",
+ "message.no-websites-configured": "Du har ikke konfigureret nogen websteder.",
+ "message.page-not-found": "Side ikke fundet.",
+ "message.powered-by": "Drevet af {name}",
+ "message.save-success": "Gemt.",
+ "message.share-url": "Dette er den offentligt delings-URL til {target}.",
+ "message.track-stats": "For at spore statistik for {target} skal du placere følgende kode i {head} sektionen på dit websted.",
+ "message.type-delete": "Skriv {delete} i boksen nedenfor, for at bekræfte.",
+ "metrics.actions": "Handlinger",
+ "metrics.average-visit-time": "Gennemsnitlig besøgstid",
+ "metrics.bounce-rate": "Afvisningsprocent",
+ "metrics.browsers": "Browsere",
+ "metrics.countries": "Lande",
+ "metrics.device.desktop": "Desktop",
+ "metrics.device.laptop": "Laptop",
+ "metrics.device.mobile": "Mobil",
+ "metrics.device.tablet": "Tablet",
+ "metrics.devices": "Enheder",
+ "metrics.events": "Hændelser",
+ "metrics.filter.combined": "Kombineret",
+ "metrics.filter.domain-only": "Kun domæne",
+ "metrics.filter.raw": "Rå",
+ "metrics.operating-systems": "Operativsystemer",
+ "metrics.page-views": "Sidevisninger",
+ "metrics.pages": "Sider",
+ "metrics.referrers": "Henvisninger",
+ "metrics.unique-visitors": "Unikke besøgende",
+ "metrics.views": "Visninger",
+ "metrics.visitors": "Besøgende",
+ "title.add-account": "Tilføj konto",
+ "title.add-website": "Tilføj hjemmeside",
+ "title.change-password": "Skift adgangskode",
+ "title.delete-account": "Slet konto",
+ "title.delete-website": "Slet hjemmeside",
+ "title.edit-account": "Rediger konto",
+ "title.edit-website": "Rediger hjemmeside",
+ "title.share-url": "Del URL",
+ "title.tracking-code": "Sporingskode"
+}
diff --git a/lang/de-DE.json b/lang/de-DE.json
index df6adaa1..f960d1eb 100644
--- a/lang/de-DE.json
+++ b/lang/de-DE.json
@@ -1,25 +1,27 @@
{
- "active-users.message": "{x} {x, plural, one {aktiver Besucher} other {aktive Besucher}}",
"button.add-account": "Konto hinzufügen",
"button.add-website": "Webseite hinzufügen",
"button.back": "Zurück",
"button.cancel": "Abbrechen",
"button.change-password": "Passwort ändern",
"button.copy-to-clipboard": "In die Zwischenablage kopieren",
+ "button.date-range": "Datumsbereich",
"button.delete": "Löschen",
"button.edit": "Bearbeiten",
"button.login": "Anmelden",
"button.more": "Mehr",
+ "button.refresh": "Aktualisieren",
+ "button.reset": "Zurücksetzen",
"button.save": "Speichern",
+ "button.single-day": "Ein Tag",
"button.view-details": "Details anzeigen",
- "button.websites": "Webseiten",
- "footer.powered-by": "Powered by",
- "header.nav.dashboard": "Übersicht",
- "header.nav.settings": "Einstellungen",
+ "label.accounts": "Konten",
"label.administrator": "Administrator",
"label.confirm-password": "Passwort wiederholen",
"label.current-password": "Derzeitiges Passwort",
- "label.custom-range": "Custom range",
+ "label.custom-range": "Benutzerdefinierter Bereich",
+ "label.dashboard": "Übersicht",
+ "label.default-date-range": "Voreingestellter Datumsbereich",
"label.domain": "Domain",
"label.enable-share-url": "Freigabe-URL aktivieren",
"label.invalid": "Ungültig",
@@ -32,19 +34,30 @@
"label.new-password": "Neues Passwort",
"label.password": "Passwort",
"label.passwords-dont-match": "Passwörter stimmen nicht überein",
+ "label.profile": "Profil",
"label.required": "Erforderlich",
+ "label.settings": "Einstellungen",
"label.this-month": "Diesen Monat",
"label.this-week": "Diese Woche",
"label.this-year": "Dieses Jahr",
+ "label.timezone": "Zeitzone",
"label.today": "Heute",
+ "label.unknown": "Unbekannt",
"label.username": "Benutzername",
+ "label.websites": "Webseiten",
+ "message.active-users": "{x} {x, plural, one {aktiver Besucher} other {aktive Besucher}}",
"message.confirm-delete": "Sind sie sich sicher {target} zu löschen?",
"message.copied": "In Zwischenablage kopiert!",
"message.delete-warning": "Alle zugehörigen Daten werden auch gelöscht.",
"message.failure": "Es it ein Fehler aufgetreten.",
+ "message.get-share-url": "Freigabe-URL abrufen",
+ "message.get-tracking-code": "Erstelle Tracking Kennung",
+ "message.go-to-settings": "Zu den Einstellungen",
"message.incorrect-username-password": "Falsches Passwort oder Benutzername.",
"message.no-data-available": "Keine Daten vorhanden.",
+ "message.no-websites-configured": "Es ist keine Webseite vorhanden.",
"message.page-not-found": "Seite nicht gefunden.",
+ "message.powered-by": "Ermöglicht durch {name}",
"message.save-success": "Erfolgreich gespeichert.",
"message.share-url": "Dies ist der öffentliche URL zum Teilen für {target}.",
"message.track-stats": "Um die Statistiken für {target} zu übermitteln, platzieren Sie bitte den folgenden Quelltext im {head} ihrer Homepage.",
@@ -54,8 +67,12 @@
"metrics.bounce-rate": "Absprungrate",
"metrics.browsers": "Browsers",
"metrics.countries": "Länder",
+ "metrics.device.desktop": "Desktop",
+ "metrics.device.laptop": "Laptop",
+ "metrics.device.mobile": "Mobiltelefon",
+ "metrics.device.tablet": "Tablet",
"metrics.devices": "Geräte",
- "metrics.events": "Events",
+ "metrics.events": "Ereignisse",
"metrics.filter.combined": "Kombiniert",
"metrics.filter.domain-only": "Nur diese Domain",
"metrics.filter.raw": "Rohdaten",
@@ -66,11 +83,6 @@
"metrics.unique-visitors": "Eindeutige Besucher",
"metrics.views": "Aufrufe",
"metrics.visitors": "Besucher",
- "placeholder.message.go-to-settings": "Zu den Einstellungen",
- "placeholder.message.no-websites-configured": "Es ist keine Webseite vorhanden.",
- "settings.accounts": "Konten",
- "settings.profile": "Profil",
- "settings.websites": "Webseiten",
"title.add-account": "Konto hinzugfügen",
"title.add-website": "Webseite hinzufügen",
"title.change-password": "Passwort ändern",
@@ -79,7 +91,5 @@
"title.edit-account": "Konto bearbeiten",
"title.edit-website": "Webseite bearbeiten",
"title.share-url": "Freigabe-URL",
- "title.tracking-code": "Tracking Kennung",
- "tooltip.get-share-url": "Freigabe-URL abrufen",
- "tooltip.get-tracking-code": "Erstelle Tracking Kennung"
+ "title.tracking-code": "Tracking Kennung"
}
diff --git a/lang/el-GR.json b/lang/el-GR.json
new file mode 100644
index 00000000..4b1405e5
--- /dev/null
+++ b/lang/el-GR.json
@@ -0,0 +1,95 @@
+{
+ "button.add-account": "Προσθήκη λογαριασμού",
+ "button.add-website": "Προσθήκη ιστότοπου",
+ "button.back": "Πίσω",
+ "button.cancel": "Ακύρωση",
+ "button.change-password": "Αλλαγή κωδικού",
+ "button.copy-to-clipboard": "Αντιγραφή στο πρόχειρο",
+ "button.date-range": "Εύρος ημερομηνιών",
+ "button.delete": "Διαγραφή",
+ "button.edit": "Επεξεργασία",
+ "button.login": "Είσοδος",
+ "button.more": "Περισσότερα",
+ "button.refresh": "Ανανέωση",
+ "button.reset": "Επαναφορά",
+ "button.save": "Αποθήκευση",
+ "button.single-day": "Ημερήσια",
+ "button.view-details": "Λεπτομέρειες",
+ "label.accounts": "Λογαριασμοί",
+ "label.administrator": "Διαχειριστής",
+ "label.confirm-password": "Επιβεβαίωση κωδικού",
+ "label.current-password": "Τωρινός κωδικός πρόσβασης",
+ "label.custom-range": "Προσαρμοσμένο εύρος",
+ "label.dashboard": "Πίνακας",
+ "label.default-date-range": "Προεπιλεγμένο εύρος ημερομηνιών",
+ "label.domain": "Τομέας",
+ "label.enable-share-url": "Ενεργοποίηση κοινής χρήσης URL",
+ "label.invalid": "Μη έγκυρο",
+ "label.invalid-domain": "Μη έγκυρος τομέας",
+ "label.last-days": "Τελευταίες {x} ημέρες",
+ "label.last-hours": "Τελευταίες {x} ώρες",
+ "label.logged-in-as": "Συνδεθήκατε ως {username}",
+ "label.logout": "Αποσύνδεση",
+ "label.name": "Όνομα",
+ "label.new-password": "Νέος κωδικός",
+ "label.password": "Κωδικός",
+ "label.passwords-dont-match": "Οι κωδικοί πρόσβασης δεν ταιριάζουν",
+ "label.profile": "Προφίλ",
+ "label.required": "Απαιτείται",
+ "label.settings": "Ρυθμίσεις",
+ "label.this-month": "Αυτο το μήνα",
+ "label.this-week": "Αυτή την εβδομάδα",
+ "label.this-year": "Αυτή την χρονιά",
+ "label.timezone": "Ζώνη ώρας",
+ "label.today": "Σήμερα",
+ "label.unknown": "Άγνωστο",
+ "label.username": "Όνομα χρήστη",
+ "label.websites": "Ιστότοποι",
+ "message.active-users": "{x} ενεργοί {x, plural, one {επισκέπτης} other {επισκέπτες}}",
+ "message.confirm-delete": "Είστε βέβαιοι ότι θέλετε να διαγράψετε το {target};",
+ "message.copied": "Αντιγράφηκε!",
+ "message.delete-warning": "Όλα τα σχετικά δεδομένα θα διαγραφούν επίσης.",
+ "message.failure": "Κάτι πήγε στραβά.",
+ "message.get-share-url": "Λήψη URL κοινής χρήσης",
+ "message.get-tracking-code": "Λήψη κώδικα παρακολούθησης",
+ "message.go-to-settings": "Μεταβείτε στις ρυθμίσεις",
+ "message.incorrect-username-password": "Εσφαλμένο όνομα χρήστη / κωδικός πρόσβασης.",
+ "message.no-data-available": "Δεν υπάρχουν διαθέσιμα δεδομένα.",
+ "message.no-websites-configured": "Δεν έχετε ρυθμίσει κανένα ιστότοπο.",
+ "message.page-not-found": "Η σελίδα δεν βρέθηκε.",
+ "message.powered-by": "Με την υποστήριξη του {name}",
+ "message.save-success": "Αποθηκεύτηκε επιτυχώς.",
+ "message.share-url": "Αυτό είναι το κοινόχρηστο URL για το {target}.",
+ "message.track-stats": "Για να παρακολουθείτε στατιστικά στοιχεία για {target}, τοποθετήστε τον ακόλουθο κώδικα στην ενότητα {head} του ιστότοπού σας.",
+ "message.type-delete": "Πληκτρολογήστε {delete} στο παρακάτω πλαίσιο για επιβεβαίωση.",
+ "metrics.actions": "Ενέργειες",
+ "metrics.average-visit-time": "Μέσος χρόνος επίσκεψης",
+ "metrics.bounce-rate": "Ποσοστό αναπήδησης",
+ "metrics.browsers": "Προγράμματα περιήγησης",
+ "metrics.countries": "Χώρες",
+ "metrics.device.desktop": "Σταθερός υπολογιστής",
+ "metrics.device.laptop": "Λάπτοπ",
+ "metrics.device.mobile": "Κινητό",
+ "metrics.device.tablet": "Τάμπλετ",
+ "metrics.devices": "Συσκευές",
+ "metrics.events": "Γεγονότα",
+ "metrics.filter.combined": "Σε συνδυασμό",
+ "metrics.filter.domain-only": "Μόνο τομέας",
+ "metrics.filter.raw": "Ακατέργαστο",
+ "metrics.operating-systems": "Λειτουργικά συστήματα",
+ "metrics.page-views": "Προβολές σελίδας",
+ "metrics.pages": "Σελίδες",
+ "metrics.referrers": "Παραπομπές",
+ "metrics.unique-visitors": "Μοναδικοί επισκέπτες",
+ "metrics.views": "Προβολές",
+ "metrics.visitors": "Επισκέπτες",
+ "title.add-account": "Προσθήκη λογαριασμού",
+ "title.add-website": "Προσθήκη ιστότοπου",
+ "title.change-password": "Αλλαγή κωδικού",
+ "title.delete-account": "Διαγραφή λογαριασμού",
+ "title.delete-website": "Διαγραφή ιστότοπου",
+ "title.edit-account": "Επεξεργασία λογαριασμού",
+ "title.edit-website": "Επεξεργασία ιστότοπου",
+ "title.share-url": "Κοινοποίηση διεύθυνσης URL",
+ "title.tracking-code": "Κωδικός παρακολούθησης"
+}
diff --git a/lang/en-US.json b/lang/en-US.json
index e24b9347..54ee8cad 100644
--- a/lang/en-US.json
+++ b/lang/en-US.json
@@ -1,25 +1,27 @@
{
- "active-users.message": "{x} current {x, plural, one {visitor} other {visitors}}",
"button.add-account": "Add account",
"button.add-website": "Add website",
"button.back": "Back",
"button.cancel": "Cancel",
"button.change-password": "Change password",
"button.copy-to-clipboard": "Copy to clipboard",
+ "button.date-range": "Date range",
"button.delete": "Delete",
"button.edit": "Edit",
"button.login": "Login",
"button.more": "More",
+ "button.refresh": "Refresh",
+ "button.reset": "Reset",
"button.save": "Save",
+ "button.single-day": "Single day",
"button.view-details": "View details",
- "button.websites": "Websites",
- "footer.powered-by": "Powered by",
- "header.nav.dashboard": "Dashboard",
- "header.nav.settings": "Settings",
+ "label.accounts": "Accounts",
"label.administrator": "Administrator",
"label.confirm-password": "Confirm password",
"label.current-password": "Current password",
"label.custom-range": "Custom range",
+ "label.dashboard": "Dashboard",
+ "label.default-date-range": "Default date range",
"label.domain": "Domain",
"label.enable-share-url": "Enable share URL",
"label.invalid": "Invalid",
@@ -32,19 +34,30 @@
"label.new-password": "New password",
"label.password": "Password",
"label.passwords-dont-match": "Passwords don't match",
+ "label.profile": "Profile",
"label.required": "Required",
+ "label.settings": "Settings",
"label.this-month": "This month",
"label.this-week": "This week",
"label.this-year": "This year",
+ "label.timezone": "Timezone",
"label.today": "Today",
+ "label.unknown": "Unknown",
"label.username": "Username",
+ "label.websites": "Websites",
+ "message.active-users": "{x} current {x, plural, one {visitor} other {visitors}}",
"message.confirm-delete": "Are your sure you want to delete {target}?",
"message.copied": "Copied!",
"message.delete-warning": "All associated data will be deleted as well.",
"message.failure": "Something went wrong.",
+ "message.get-share-url": "Get share URL",
+ "message.get-tracking-code": "Get tracking code",
+ "message.go-to-settings": "Go to settings",
"message.incorrect-username-password": "Incorrect username/password.",
"message.no-data-available": "No data available.",
+ "message.no-websites-configured": "You don't have any websites configured.",
"message.page-not-found": "Page not found.",
+ "message.powered-by": "Powered by {name}",
"message.save-success": "Saved successfully.",
"message.share-url": "This is the publicly shared URL for {target}.",
"message.track-stats": "To track stats for {target}, place the following code in the {head} section of your website.",
@@ -54,6 +67,10 @@
"metrics.bounce-rate": "Bounce rate",
"metrics.browsers": "Browsers",
"metrics.countries": "Countries",
+ "metrics.device.desktop": "Desktop",
+ "metrics.device.laptop": "Laptop",
+ "metrics.device.mobile": "Mobile",
+ "metrics.device.tablet": "Tablet",
"metrics.devices": "Devices",
"metrics.events": "Events",
"metrics.filter.combined": "Combined",
@@ -66,11 +83,6 @@
"metrics.unique-visitors": "Unique visitors",
"metrics.views": "Views",
"metrics.visitors": "Visitors",
- "placeholder.message.go-to-settings": "Go to settings",
- "placeholder.message.no-websites-configured": "You don't have any websites configured.",
- "settings.accounts": "Accounts",
- "settings.profile": "Profile",
- "settings.websites": "Websites",
"title.add-account": "Add account",
"title.add-website": "Add website",
"title.change-password": "Change password",
@@ -79,7 +91,5 @@
"title.edit-account": "Edit account",
"title.edit-website": "Edit website",
"title.share-url": "Share URL",
- "title.tracking-code": "Tracking code",
- "tooltip.get-share-url": "Get share URL",
- "tooltip.get-tracking-code": "Get tracking code"
+ "title.tracking-code": "Tracking code"
}
diff --git a/lang/es-MX.json b/lang/es-MX.json
index e089ef7f..ed8cf1a2 100644
--- a/lang/es-MX.json
+++ b/lang/es-MX.json
@@ -1,25 +1,27 @@
{
- "active-users.message": "{x} {x, plural, one {activo} other {activos}}",
"button.add-account": "Agregar usuario",
"button.add-website": "Agregar sitio",
"button.back": "Atrás",
"button.cancel": "Cancelar",
"button.change-password": "Cambiar contraseña",
"button.copy-to-clipboard": "Copiar al portapapeles",
+ "button.date-range": "Date range",
"button.delete": "Eliminar",
"button.edit": "Editar",
"button.login": "Iniciar sesión",
"button.more": "Más",
+ "button.refresh": "Refresh",
+ "button.reset": "Reset",
"button.save": "Guardar",
+ "button.single-day": "Single day",
"button.view-details": "Ver detalles",
- "button.websites": "Sitios",
- "footer.powered-by": "Desarrollado con",
- "header.nav.dashboard": "Panel de control",
- "header.nav.settings": "Configuraciones",
+ "label.accounts": "Usuarios",
"label.administrator": "Administrador",
"label.confirm-password": "Confirmar contraseña",
"label.current-password": "Contraseña actual",
"label.custom-range": "Custom range",
+ "label.dashboard": "Panel de control",
+ "label.default-date-range": "Default date range",
"label.domain": "Dominio",
"label.enable-share-url": "Habilitar compartir URL",
"label.invalid": "Inválido",
@@ -32,19 +34,30 @@
"label.new-password": "Nueva contraseña",
"label.password": "Contraseña",
"label.passwords-dont-match": "Las contraseñas no coinciden",
+ "label.profile": "Perfil",
"label.required": "Requerido",
+ "label.settings": "Configuraciones",
"label.this-month": "Este mes",
"label.this-week": "Esta semana",
"label.this-year": "Este año",
+ "label.timezone": "Timezone",
"label.today": "Hoy",
+ "label.unknown": "Unknown",
"label.username": "Nombre de usuario",
+ "label.websites": "Sitios",
+ "message.active-users": "{x} {x, plural, one {activo} other {activos}}",
"message.confirm-delete": "¿Estás seguro(a) de querer eliminar {target}?",
"message.copied": "Copiado!",
"message.delete-warning": "Toda la información relacionada será eliminada.",
"message.failure": "Algo falló.",
+ "message.get-share-url": "Obtener URL para compartir",
+ "message.get-tracking-code": "Obtener código de rastreo",
+ "message.go-to-settings": "Ir a la configuración",
"message.incorrect-username-password": "Nombre de usuario o contraseña incorrectos.",
"message.no-data-available": "Sin información disponible.",
+ "message.no-websites-configured": "No tienes ningún sitio configurado.",
"message.page-not-found": "Page not found",
+ "message.powered-by": "Desarrollado con {name}",
"message.save-success": "Guardado exitosamente.",
"message.share-url": "Esta es la URL compartida públicamente para {target}.",
"message.track-stats": "Para registrar estadísticas para {target}, copia el siguiente código dentro de la etiqueta {head} de tu sitio.",
@@ -54,6 +67,10 @@
"metrics.bounce-rate": "Porcentaje de rebote",
"metrics.browsers": "Navegadores",
"metrics.countries": "Países",
+ "metrics.device.desktop": "Desktop",
+ "metrics.device.laptop": "Laptop",
+ "metrics.device.mobile": "Mobile",
+ "metrics.device.tablet": "Tablet",
"metrics.devices": "Dispositivos",
"metrics.events": "Eventos",
"metrics.filter.combined": "Combinado",
@@ -66,11 +83,6 @@
"metrics.unique-visitors": "Visitantes únicos",
"metrics.views": "Vistas",
"metrics.visitors": "Visitantes",
- "placeholder.message.go-to-settings": "Ir a la configuración",
- "placeholder.message.no-websites-configured": "No tienes ningún sitio configurado.",
- "settings.accounts": "Usuarios",
- "settings.profile": "Perfil",
- "settings.websites": "Sitios",
"title.add-account": "Agregar usuario",
"title.add-website": "Agregar sitio",
"title.change-password": "Cambiar contraseña",
@@ -79,7 +91,5 @@
"title.edit-account": "Editar usuario",
"title.edit-website": "Editar sitio",
"title.share-url": "Compartir URL",
- "title.tracking-code": "Código de rastreo",
- "tooltip.get-share-url": "Obtener URL para compartir",
- "tooltip.get-tracking-code": "Obtener código de rastreo"
+ "title.tracking-code": "Código de rastreo"
}
diff --git a/lang/fr-FR.json b/lang/fr-FR.json
new file mode 100644
index 00000000..8cfedb33
--- /dev/null
+++ b/lang/fr-FR.json
@@ -0,0 +1,95 @@
+{
+ "button.add-account": "Ajouter un compte",
+ "button.add-website": "Ajouter un site",
+ "button.back": "Retour",
+ "button.cancel": "Annuler",
+ "button.change-password": "Changer de mot de passse",
+ "button.copy-to-clipboard": "Copier dans le presse papier",
+ "button.date-range": "Date range",
+ "button.delete": "Supprimer",
+ "button.edit": "Modifier",
+ "button.login": "Connexion",
+ "button.more": "Plus",
+ "button.refresh": "Refresh",
+ "button.reset": "Reset",
+ "button.save": "Sauvegarder",
+ "button.single-day": "Single day",
+ "button.view-details": "Voir les details",
+ "label.accounts": "Comptes",
+ "label.administrator": "Administrateur",
+ "label.confirm-password": "Confirmation du mot de passe",
+ "label.current-password": "Mot de passe actuel",
+ "label.custom-range": "Plage personnalisée",
+ "label.dashboard": "Tableau de bord",
+ "label.default-date-range": "Default date range",
+ "label.domain": "Domaine",
+ "label.enable-share-url": "Activer le partage d'URL",
+ "label.invalid": "Invalide",
+ "label.invalid-domain": "Domaine invalide",
+ "label.last-days": "{x} derniers jours",
+ "label.last-hours": "{x} dernières heures",
+ "label.logged-in-as": "Connecté en tant que {username}",
+ "label.logout": "Déconnexion",
+ "label.name": "Nom",
+ "label.new-password": "Nouveau mot de passe",
+ "label.password": "Mot de passe",
+ "label.passwords-dont-match": "Les mots de passe ne correspondent pas",
+ "label.profile": "Profile",
+ "label.required": "Requis",
+ "label.settings": "Paramètres",
+ "label.this-month": "Ce mois ci",
+ "label.this-week": "Cette semaine",
+ "label.this-year": "Cette année",
+ "label.timezone": "Timezone",
+ "label.today": "Aujourd'hui",
+ "label.unknown": "Unknown",
+ "label.username": "Nom d'utilisateur",
+ "label.websites": "Sites",
+ "message.active-users": "{x} {x, plural, one {visiteur} other {visiteurs}} actuellement",
+ "message.confirm-delete": "Êtes-vous sur de vouloir supprimer {target}?",
+ "message.copied": "Copié !",
+ "message.delete-warning": "Toutes les données associées seront également supprimées.",
+ "message.failure": "Un problème est survenu.",
+ "message.get-share-url": "Obtenez l'URL de partage",
+ "message.get-tracking-code": "Obtenez le code de suivi",
+ "message.go-to-settings": "Aller aux paramètres",
+ "message.incorrect-username-password": "nom d'utilisateurs/mot de passe incorrect.",
+ "message.no-data-available": "Pas de données disponibles.",
+ "message.no-websites-configured": "Vous n'avez configuré aucun site Web.",
+ "message.page-not-found": "Page non trouvée.",
+ "message.powered-by": "Propulsé par {name}",
+ "message.save-success": "Enregistré avec succès.",
+ "message.share-url": "Ceci est l'URL partagée pour {target}.",
+ "message.track-stats": "Pour suivre les statistiques de {target}, placez le code suivant dans la section {head} de votre site Web.",
+ "message.type-delete": "Tapez {delete} dans la case ci-dessous pour confirmer.",
+ "metrics.actions": "Actions",
+ "metrics.average-visit-time": "Temps de visite moyen",
+ "metrics.bounce-rate": "Taux de rebond",
+ "metrics.browsers": "Navigateurs",
+ "metrics.countries": "Pays",
+ "metrics.device.desktop": "Desktop",
+ "metrics.device.laptop": "Laptop",
+ "metrics.device.mobile": "Mobile",
+ "metrics.device.tablet": "Tablet",
+ "metrics.devices": "Appareils",
+ "metrics.events": "Événements",
+ "metrics.filter.combined": "Combiné",
+ "metrics.filter.domain-only": "Domaine uniquement",
+ "metrics.filter.raw": "Brute",
+ "metrics.operating-systems": "Systèmes d'exploitation",
+ "metrics.page-views": "Pages vues",
+ "metrics.pages": "Pages",
+ "metrics.referrers": "URL Référentes",
+ "metrics.unique-visitors": "Visiteurs uniques",
+ "metrics.views": "Vues",
+ "metrics.visitors": "Visiteurs",
+ "title.add-account": "Ajouter un compte",
+ "title.add-website": "Ajouter un site",
+ "title.change-password": "Changer le mot de passe",
+ "title.delete-account": "Supprimer le compte",
+ "title.delete-website": "Suprimer le site",
+ "title.edit-account": "Modifier le compte",
+ "title.edit-website": "Modifier le site",
+ "title.share-url": "Partager l'URL",
+ "title.tracking-code": "Code de suivi"
+}
diff --git a/lang/ja-JP.json b/lang/ja-JP.json
index cdeec4c8..b15e0c92 100644
--- a/lang/ja-JP.json
+++ b/lang/ja-JP.json
@@ -1,25 +1,27 @@
{
- "active-users.message": "{x}人が閲覧中です。",
"button.add-account": "アカウントを追加する",
"button.add-website": "Webサイトを追加する",
"button.back": "戻る",
"button.cancel": "キャンセル",
"button.change-password": "パスワード変更",
"button.copy-to-clipboard": "クリップボードにコピー",
+ "button.date-range": "期間",
"button.delete": "削除",
"button.edit": "編集",
"button.login": "ログイン",
"button.more": "さらに表示",
+ "button.refresh": "更新",
+ "button.reset": "リセット",
"button.save": "保存",
+ "button.single-day": "一日のみ",
"button.view-details": "詳細表示",
- "button.websites": "Webサイト",
- "footer.powered-by": "Powered by",
- "header.nav.dashboard": "ダッシュボード",
- "header.nav.settings": "設定",
+ "label.accounts": "アカウント",
"label.administrator": "管理者",
"label.confirm-password": "パスワード（確認）",
"label.current-password": "現在のパスワード",
- "label.custom-range": "Custom range",
+ "label.custom-range": "期間を指定する",
+ "label.dashboard": "ダッシュボード",
+ "label.default-date-range": "最初に表示する期間",
"label.domain": "ドメイン",
"label.enable-share-url": "共有リンクを有効にする",
"label.invalid": "無効",
@@ -32,19 +34,30 @@
"label.new-password": "新しいパスワード",
"label.password": "パスワード",
"label.passwords-dont-match": "パスワードが一致しません",
+ "label.profile": "プロファイル",
"label.required": "必須",
+ "label.settings": "設定",
"label.this-month": "今月",
"label.this-week": "今週",
"label.this-year": "今年",
+ "label.timezone": "タイムゾーン",
"label.today": "今日",
+ "label.unknown": "不明",
"label.username": "ユーザー名",
+ "label.websites": "Webサイト",
+ "message.active-users": "{x}人が閲覧中です。",
"message.confirm-delete": "{target}を削除してもよろしいですか？",
"message.copied": "コピーしました！",
"message.delete-warning": "関連するすべてのデータも削除されます。",
"message.failure": "問題が発生しました。",
+ "message.get-share-url": "共有リンクを取得",
+ "message.get-tracking-code": "トラッキングコードを取得",
+ "message.go-to-settings": "設定する",
"message.incorrect-username-password": "ユーザー名/パスワードが正しくありません。",
"message.no-data-available": "データがありません。",
+ "message.no-websites-configured": "Webサイトが設定されていません。",
"message.page-not-found": "ページが見つかりません。",
+ "message.powered-by": "Powered by {name}",
"message.save-success": "正常に保存されました。",
"message.share-url": "これは {target} の共有リンクです。",
"message.track-stats": "{target}のアクセス解析を開始するには、次のコードをWebサイトの{head}セクションへ追加してください。",
@@ -54,6 +67,10 @@
"metrics.bounce-rate": "直帰率",
"metrics.browsers": "ブラウザ",
"metrics.countries": "国",
+ "metrics.device.desktop": "デスクトップ",
+ "metrics.device.laptop": "ノートPC",
+ "metrics.device.mobile": "携帯電話",
+ "metrics.device.tablet": "タブレット",
"metrics.devices": "デバイス",
"metrics.events": "イベント",
"metrics.filter.combined": "パスまで",
@@ -66,11 +83,6 @@
"metrics.unique-visitors": "ユニーク訪問者数",
"metrics.views": "閲覧数",
"metrics.visitors": "訪問者数",
- "placeholder.message.go-to-settings": "設定する",
- "placeholder.message.no-websites-configured": "Webサイトが設定されていません。",
- "settings.accounts": "アカウント",
- "settings.profile": "プロファイル",
- "settings.websites": "Webサイト",
"title.add-account": "アカウントの追加",
"title.add-website": "Webサイトの追加",
"title.change-password": "パスワード変更",
@@ -79,7 +91,5 @@
"title.edit-account": "アカウントの編集",
"title.edit-website": "Webサイトの編集",
"title.share-url": "共有リンク",
- "title.tracking-code": "トラッキングコード",
- "tooltip.get-share-url": "共有リンクを取得",
- "tooltip.get-tracking-code": "トラッキングコードを取得"
+ "title.tracking-code": "トラッキングコード"
}
diff --git a/lang/mn-MN.json b/lang/mn-MN.json
index 2b4d7743..0dd543bf 100644
--- a/lang/mn-MN.json
+++ b/lang/mn-MN.json
@@ -1,25 +1,27 @@
{
- "active-users.message": "одоо {x} {x, plural, one {зочин} other {зочин}} байна",
"button.add-account": "Хэрэглэгч нэмэх",
"button.add-website": "Веб нэмэх",
"button.back": "Буцах",
"button.cancel": "Цуцлах",
"button.change-password": "Нууц үг солих",
"button.copy-to-clipboard": "Хуулах",
+ "button.date-range": "Date range",
"button.delete": "Устгах",
"button.edit": "Засах",
"button.login": "Нэвтрэх",
"button.more": "Цааш",
+ "button.refresh": "Refresh",
+ "button.reset": "Reset",
"button.save": "Хадгалах",
+ "button.single-day": "Single day",
"button.view-details": "Дэлгэрүүлж харах",
- "button.websites": "Вебүүд",
- "footer.powered-by": "Powered by",
- "header.nav.dashboard": "Хянах самбар",
- "header.nav.settings": "Тохиргоо",
+ "label.accounts": "Хэрэглэгчид",
"label.administrator": "Админ",
"label.confirm-password": "Шинэ нууц үгээ давтах",
"label.current-password": "Ашиглаж буй нууц үг",
"label.custom-range": "Дурын хугацаа",
+ "label.dashboard": "Хянах самбар",
+ "label.default-date-range": "Default date range",
"label.domain": "Домэйн",
"label.enable-share-url": "Хуваалцах холбоос идэвхжүүлэх",
"label.invalid": "Буруу",
@@ -32,19 +34,30 @@
"label.new-password": "Шинэ нууц үг",
"label.password": "Нууц үг",
"label.passwords-dont-match": "Нууц үг тохирохгүй байна",
+ "label.profile": "Бүртгэл",
"label.required": "Шаардлагатай",
+ "label.settings": "Тохиргоо",
"label.this-month": "Энэ сар",
"label.this-week": "Энэ долоо хоног",
"label.this-year": "Энэ жил",
+ "label.timezone": "Timezone",
"label.today": "Өнөөдөр",
+ "label.unknown": "Unknown",
"label.username": "Хэрэглэгчийн нэр",
+ "label.websites": "Вебүүд",
+ "message.active-users": "одоо {x} {x, plural, one {зочин} other {зочин}} байна",
"message.confirm-delete": "Та {target}-г устгахдаа итгэлтэй байна уу?",
"message.copied": "Хуулсан!",
"message.delete-warning": "Үүнтэй холбоотой бүх өгөгдөл устах болно.",
"message.failure": "Ямар нэг зүйл буруу боллоо.",
+ "message.get-share-url": "Хуваалцах холбоос авах",
+ "message.get-tracking-code": "Мөрдөх код авах",
+ "message.go-to-settings": "Тохиргоо руу очих",
"message.incorrect-username-password": "Буруу хэрэглэгчийн нэр/нууц үг.",
"message.no-data-available": "Өгөгдөл алга.",
+ "message.no-websites-configured": "Та ямар нэгэн веб тохируулаагүй байна.",
"message.page-not-found": "Хуудас олдсонгүй.",
+ "message.powered-by": "Powered by {name}",
"message.save-success": "Амжилттай хадгаллаа.",
"message.share-url": "{target}-г нийтэд хуваалцах холбоос.",
"message.track-stats": "{target} вебийн статистикийг бүртгэхийн тулд доорх кодыг вебийнхээ {head} хэсэгт байрлуулна уу.",
@@ -54,6 +67,10 @@
"metrics.bounce-rate": "Нэг хуудас үзээд гарсан",
"metrics.browsers": "Хөтөч",
"metrics.countries": "Улс",
+ "metrics.device.desktop": "Desktop",
+ "metrics.device.laptop": "Laptop",
+ "metrics.device.mobile": "Mobile",
+ "metrics.device.tablet": "Tablet",
"metrics.devices": "Төхөөрөмж",
"metrics.events": "Үйлдэл",
"metrics.filter.combined": "Нэгтгэсэн",
@@ -66,11 +83,6 @@
"metrics.unique-visitors": "Зочид",
"metrics.views": "Үзсэн",
"metrics.visitors": "Зочид",
- "placeholder.message.go-to-settings": "Тохиргоо руу очих",
- "placeholder.message.no-websites-configured": "Та ямар нэгэн веб тохируулаагүй байна.",
- "settings.accounts": "Хэрэглэгчид",
- "settings.profile": "Бүртгэл",
- "settings.websites": "Вебүүд",
"title.add-account": "Хэрэглэгч нэмэх",
"title.add-website": "Веб нэмэх",
"title.change-password": "Нууц үг солих",
@@ -79,7 +91,5 @@
"title.edit-account": "Хэрэглэгч засах",
"title.edit-website": "Веб засах",
"title.share-url": "Хуваалцах холбоос",
- "title.tracking-code": "Мөрдөх код",
- "tooltip.get-share-url": "Хуваалцах холбоос авах",
- "tooltip.get-tracking-code": "Мөрдөх код авах"
+ "title.tracking-code": "Мөрдөх код"
}
diff --git a/lang/nl-NL.json b/lang/nl-NL.json
index 8d97ca43..3ebfcd14 100644
--- a/lang/nl-NL.json
+++ b/lang/nl-NL.json
@@ -1,25 +1,27 @@
{
- "active-users.message": "{x} actieve {x, plural, one {bezoeker} other {bezoekers}}",
"button.add-account": "Account toevoegen",
"button.add-website": "Website toevoegen",
"button.back": "Terug",
"button.cancel": "Annuleren",
"button.change-password": "Wachtwoord wijzigen",
"button.copy-to-clipboard": "Kopiëer naar klembord",
+ "button.date-range": "Datumbereik",
"button.delete": "Verwijderen",
"button.edit": "Bewerken",
"button.login": "Inloggen",
"button.more": "Toon meer",
+ "button.refresh": "Vernieuwen",
+ "button.reset": "Reset",
"button.save": "Opslaan",
+ "button.single-day": "Enkele dag",
"button.view-details": "Meer details",
- "button.websites": "Websites",
- "footer.powered-by": "mogelijk gemaakt door",
- "header.nav.dashboard": "Dashboard",
- "header.nav.settings": "Instellingen",
+ "label.accounts": "Accounts",
"label.administrator": "Administrator",
"label.confirm-password": "Wachtwoord bevestigen",
"label.current-password": "Huidig wachtwoord",
- "label.custom-range": "Custom range",
+ "label.custom-range": "Aangepast bereik",
+ "label.dashboard": "Dashboard",
+ "label.default-date-range": "Default date range",
"label.domain": "Domein",
"label.enable-share-url": "Sta delen via openbare URL toe",
"label.invalid": "Ongeldig",
@@ -32,19 +34,30 @@
"label.new-password": "Nieuw wachtwoord",
"label.password": "Wachtwoord",
"label.passwords-dont-match": "Wachtwoorden komen niet overeen",
+ "label.profile": "Profiel",
"label.required": "Verplicht",
+ "label.settings": "Instellingen",
"label.this-month": "Deze maand",
"label.this-week": "Deze week",
"label.this-year": "Dit jaar",
+ "label.timezone": "Timezone",
"label.today": "Vandaag",
+ "label.unknown": "Onbekend",
"label.username": "Gebruikersnaam",
+ "label.websites": "Websites",
+ "message.active-users": "{x} actieve {x, plural, one {bezoeker} other {bezoekers}}",
"message.confirm-delete": "Weet je zeker dat je {target} wilt verwijderen?",
"message.copied": "Gekopiëerd!",
"message.delete-warning": "Alle verwante gegezens zullen ook verwijderd worden.",
"message.failure": "Er is iets misgegaan.",
+ "message.get-share-url": "Openbare URL",
+ "message.get-tracking-code": "Tracking code",
+ "message.go-to-settings": "Naar instellingen",
"message.incorrect-username-password": "Incorrecte gebruikersnaam/wachtwoord.",
"message.no-data-available": "Geen gegevens beschikbaar.",
+ "message.no-websites-configured": "Je hebt geen websites ingesteld.",
"message.page-not-found": "Pagina niet gevonden.",
+ "message.powered-by": "mogelijk gemaakt door {name}",
"message.save-success": "Opslaan succesvol.",
"message.share-url": "Met deze URL kan {target} openbaar gedeeld worden.",
"message.track-stats": "Om statistieken voor {target} bij te houden, plaats je de volgende code in het {head} gedeelte van je website.",
@@ -54,6 +67,10 @@
"metrics.bounce-rate": "Bouncepercentage",
"metrics.browsers": "Browsers",
"metrics.countries": "Landen",
+ "metrics.device.desktop": "Desktop",
+ "metrics.device.laptop": "Laptop",
+ "metrics.device.mobile": "Mobiel",
+ "metrics.device.tablet": "Tablet",
"metrics.devices": "Apparaten",
"metrics.events": "Gebeurtenissen",
"metrics.filter.combined": "Gecombineerd",
@@ -66,11 +83,6 @@
"metrics.unique-visitors": "Unieke bezoekers",
"metrics.views": "Weergaven",
"metrics.visitors": "Bezoekers",
- "placeholder.message.go-to-settings": "Naar instellingen",
- "placeholder.message.no-websites-configured": "Je hebt geen websites ingesteld.",
- "settings.accounts": "Accounts",
- "settings.profile": "Profiel",
- "settings.websites": "Websites",
"title.add-account": "Account toevoegen",
"title.add-website": "Website toevoegen",
"title.change-password": "Wachtwoord wijzigen",
@@ -79,7 +91,5 @@
"title.edit-account": "Account bewerken",
"title.edit-website": "Website bewerken",
"title.share-url": "URL delen",
- "title.tracking-code": "Tracking code",
- "tooltip.get-share-url": "Openbare URL",
- "tooltip.get-tracking-code": "Tracking code"
+ "title.tracking-code": "Tracking code"
}
diff --git a/lang/ru-RU.json b/lang/ru-RU.json
index 5c6e9df7..b9e19336 100644
--- a/lang/ru-RU.json
+++ b/lang/ru-RU.json
@@ -1,25 +1,27 @@
{
- "active-users.message": "{x} текущих посетителей",
"button.add-account": "Добавить аккаунт",
"button.add-website": "Добавить сайт",
"button.back": "Назад",
"button.cancel": "Отменить",
"button.change-password": "Изменить пароль",
"button.copy-to-clipboard": "Скопировать в буфер обмена",
+ "button.date-range": "Диапазон дат",
"button.delete": "Удалить",
"button.edit": "Редактировать",
"button.login": "Войти",
"button.more": "Больше",
+ "button.refresh": "Обновить",
+ "button.reset": "Сбросить",
"button.save": "Сохранить",
+ "button.single-day": "Один день",
"button.view-details": "Посмотреть детали",
- "button.websites": "Сайты",
- "footer.powered-by": "на движке",
- "header.nav.dashboard": "Информационная панель",
- "header.nav.settings": "Настройки",
+ "label.accounts": "Аккаунты",
"label.administrator": "Администратор",
"label.confirm-password": "Подтвердить пароль",
"label.current-password": "Текущий пароль",
- "label.custom-range": "Custom range",
+ "label.custom-range": "Другой период",
+ "label.dashboard": "Информационная панель",
+ "label.default-date-range": "Диапазон дат по-умолчанию",
"label.domain": "Домен",
"label.enable-share-url": "Разрешить делиться ссылкой",
"label.invalid": "Некорректный",
@@ -32,19 +34,30 @@
"label.new-password": "Новый пароль",
"label.password": "Пароль",
"label.passwords-dont-match": "Пароли не совпадают",
+ "label.profile": "Профиль",
"label.required": "Обязательное",
+ "label.settings": "Настройки",
"label.this-month": "Этот месяц",
"label.this-week": "Эта неделя",
"label.this-year": "Этот год",
+ "label.timezone": "Часовой пояс",
"label.today": "Сегодня",
+ "label.unknown": "Неизвестно",
"label.username": "Имя пользователя",
+ "label.websites": "Сайты",
+ "message.active-users": "{x} текущих посетителей",
"message.confirm-delete": "Вы уверены, что хотите удалить {target}?",
"message.copied": "Скопировано!",
"message.delete-warning": "Все связанные данные будут также удалены.",
"message.failure": "Что-то пошло не так.",
+ "message.get-share-url": "Получить публичную ссылку",
+ "message.get-tracking-code": "Получить код отслеживания",
+ "message.go-to-settings": "Перейти к настройкам",
"message.incorrect-username-password": "Неверное имя пользователя/пароль.",
"message.no-data-available": "Нет данных.",
+ "message.no-websites-configured": "У вас нет настроенных сайтов.",
"message.page-not-found": "Страница не найдена.",
+ "message.powered-by": "На движке {name}",
"message.save-success": "Успешно сохранено.",
"message.share-url": "Это публичная ссылка для {target}.",
"message.track-stats": "Чтобы отслеживать статистику для {target}, поместите следующий код в раздел {head} вашего сайта.",
@@ -54,6 +67,10 @@
"metrics.bounce-rate": "Отказы",
"metrics.browsers": "Браузеры",
"metrics.countries": "Страны",
+ "metrics.device.desktop": "Настольный компьютер",
+ "metrics.device.laptop": "Ноутбук",
+ "metrics.device.mobile": "Смартфон",
+ "metrics.device.tablet": "Планшет",
"metrics.devices": "Устройства",
"metrics.events": "События",
"metrics.filter.combined": "Объединенные",
@@ -66,11 +83,6 @@
"metrics.unique-visitors": "Уникальные посетители",
"metrics.views": "Просмотры",
"metrics.visitors": "Посетители",
- "placeholder.message.go-to-settings": "Перейти к настройкам",
- "placeholder.message.no-websites-configured": "У вас нет настроенных сайтов.",
- "settings.accounts": "Аккаунты",
- "settings.profile": "Профиль",
- "settings.websites": "Сайты",
"title.add-account": "Добавить аккаунт",
"title.add-website": "Добавить сайт",
"title.change-password": "Изменить пароль",
@@ -79,7 +91,5 @@
"title.edit-account": "Редактировать аккаунт",
"title.edit-website": "Редактировать сайт",
"title.share-url": "Поделиться ссылкой",
- "title.tracking-code": "Код отслеживания",
- "tooltip.get-share-url": "Получить публичную ссылку",
- "tooltip.get-tracking-code": "Получить код отслеживания"
+ "title.tracking-code": "Код отслеживания"
}
diff --git a/lang/sv-SE.json b/lang/sv-SE.json
new file mode 100644
index 00000000..0a5b8a1d
--- /dev/null
+++ b/lang/sv-SE.json
@@ -0,0 +1,95 @@
+{
+ "button.add-account": "Lägg till konto",
+ "button.add-website": "Lägg till webbsajt",
+ "button.back": "Tillbaka",
+ "button.cancel": "Avbryt",
+ "button.change-password": "Byt lösenord",
+ "button.copy-to-clipboard": "Kopiera till urklipp",
+ "button.date-range": "Datumomfång",
+ "button.delete": "Radera",
+ "button.edit": "Redigera",
+ "button.login": "Logga in",
+ "button.more": "Mer",
+ "button.refresh": "Uppdatera",
+ "button.reset": "Återställ",
+ "button.save": "Spara",
+ "button.single-day": "En dag",
+ "button.view-details": "Visa detaljer",
+ "label.accounts": "Konton",
+ "label.administrator": "Administratör",
+ "label.confirm-password": "Bekräfta lösenord",
+ "label.current-password": "Nuvarande lösenord",
+ "label.custom-range": "Anpassat urval",
+ "label.dashboard": "Instrumentpanel",
+ "label.default-date-range": "Standard datum-urval",
+ "label.domain": "Domän",
+ "label.enable-share-url": "Aktivera delnings-URL",
+ "label.invalid": "Ogiltig",
+ "label.invalid-domain": "Ogiltig domän",
+ "label.last-days": "Senaste {x} dagarna",
+ "label.last-hours": "Senaste {x} timmarna",
+ "label.logged-in-as": "Inloggad som {username}",
+ "label.logout": "Logga ut",
+ "label.name": "Namn",
+ "label.new-password": "Nytt lösenord",
+ "label.password": "Lösenord",
+ "label.passwords-dont-match": "Lösenorden är inte samma",
+ "label.profile": "Profil",
+ "label.required": "Krävs",
+ "label.settings": "Inställningar",
+ "label.this-month": "Denna månad",
+ "label.this-week": "Denna vecka",
+ "label.this-year": "Detta år",
+ "label.timezone": "Tidszon",
+ "label.today": "Idag",
+ "label.unknown": "Okänd",
+ "label.username": "Användarnamn",
+ "label.websites": "Webbsajt",
+ "message.active-users": "{x} {x, plural, one {besökare} other {besökare}} just nu",
+ "message.confirm-delete": "Är du säker på att du vill radera {target}?",
+ "message.copied": "Kopierad!",
+ "message.delete-warning": "All tillhörande data kommer också raderas.",
+ "message.failure": "Något gick fel.",
+ "message.get-share-url": "Visa delnings-URL",
+ "message.get-tracking-code": "Visa spårningskod",
+ "message.go-to-settings": "Gå till inställningar",
+ "message.incorrect-username-password": "Felaktikt användarnamn/lösenord.",
+ "message.no-data-available": "Ingen data tillgänglig.",
+ "message.no-websites-configured": "Du har inga webbsajter.",
+ "message.page-not-found": "Sidan kan inte hittas.",
+ "message.powered-by": "Drivs av {name}",
+ "message.save-success": "Sparades!",
+ "message.share-url": "Det här är den offentliga delnings-URL:en {target}.",
+ "message.track-stats": "För att spåra statistik för {target}, placera följande kod i {head}-avsnittet på din webbsajt.",
+ "message.type-delete": "Skriv {delete} i rutan nedan för att radera.",
+ "metrics.actions": "Händelser",
+ "metrics.average-visit-time": "Medelbesökstid",
+ "metrics.bounce-rate": "Avvisningfrekvens",
+ "metrics.browsers": "Webbläsare",
+ "metrics.countries": "Länder",
+ "metrics.device.desktop": "Desktop",
+ "metrics.device.laptop": "Laptop",
+ "metrics.device.mobile": "Mobil",
+ "metrics.device.tablet": "Platta",
+ "metrics.devices": "Enheter",
+ "metrics.events": "Händelser",
+ "metrics.filter.combined": "Kombinerade",
+ "metrics.filter.domain-only": "Endast domän",
+ "metrics.filter.raw": "Rå",
+ "metrics.operating-systems": "Operativsystem",
+ "metrics.page-views": "Sidvisningar",
+ "metrics.pages": "Sido",
+ "metrics.referrers": "Hänvisare",
+ "metrics.unique-visitors": "Unika besökare",
+ "metrics.views": "Visningar",
+ "metrics.visitors": "Besökare",
+ "title.add-account": "Lägg till konto",
+ "title.add-website": "Lägg till webbsajt",
+ "title.change-password": "Byt lösenord",
+ "title.delete-account": "Radera konto",
+ "title.delete-website": "Radera webbsajt",
+ "title.edit-account": "Redigera konto",
+ "title.edit-website": "Redigera webbsajt",
+ "title.share-url": "Delnings-URL",
+ "title.tracking-code": "Spårningskod"
+}
diff --git a/lang/tr-TR.json b/lang/tr-TR.json
index 8e9f100c..d8748359 100644
--- a/lang/tr-TR.json
+++ b/lang/tr-TR.json
@@ -1,25 +1,27 @@
{
- "active-users.message": "{x} aktif ziyaretçi",
"button.add-account": "Yeni Hesap Ekle",
"button.add-website": "Web sitesi ekle",
"button.back": "Geri",
"button.cancel": "İptal",
"button.change-password": "Şifre değiştir",
"button.copy-to-clipboard": "Panoya kopyala",
+ "button.date-range": "Tarih aralığı",
"button.delete": "Sil",
"button.edit": "Düzenle",
"button.login": "Giriş Yap",
"button.more": "Detaylı göster",
+ "button.refresh": "Yenile",
+ "button.reset": "Sıfırla",
"button.save": "Kaydet",
+ "button.single-day": "Tekil gün",
"button.view-details": "Detayı incele",
- "button.websites": "Web siteleri",
- "footer.powered-by": "Sağlayıcı:",
- "header.nav.dashboard": "Kontrol Paneli",
- "header.nav.settings": "Ayarlar",
+ "label.accounts": "Hesaplar",
"label.administrator": "Yönetici",
"label.confirm-password": "Parolayı onayla",
"label.current-password": "Mevcut parola",
- "label.custom-range": "Custom range",
+ "label.custom-range": "Özelleştirilmiş aralık",
+ "label.dashboard": "Kontrol Paneli",
+ "label.default-date-range": "Varsayılan tarih aralığı",
"label.domain": "Alan adı",
"label.enable-share-url": "Anonim paylaşım URL'i aktif",
"label.invalid": "Geçeriz",
@@ -32,28 +34,43 @@
"label.new-password": "Yeni parola",
"label.password": "Parola",
"label.passwords-dont-match": "Parolalar uyuşmuyor",
+ "label.profile": "Profil",
"label.required": "Zorunlu alan",
+ "label.settings": "Ayarlar",
"label.this-month": "Bu ay",
"label.this-week": "Bu hafta",
"label.this-year": "Bu yıl",
+ "label.timezone": "Zaman dilimi",
"label.today": "Bugün",
+ "label.unknown": "Bilinmeyen",
"label.username": "Kullanıcı adı",
+ "label.websites": "Web siteleri",
+ "message.active-users": "{x} aktif ziyaretçi",
"message.confirm-delete": "{target} kaydını silmek istediğinizden emin misiniz?",
"message.copied": "Panoya kopyalandı!",
"message.delete-warning": "İlişkili tüm veriler de silinecektir.",
"message.failure": "Bir şeyler ters gitti!",
+ "message.get-share-url": "Paylaşım adresini al",
+ "message.get-tracking-code": "İzleme kodunu al",
+ "message.go-to-settings": "Ayarlara git",
"message.incorrect-username-password": "Hatalı kullanıcı adı ya da parola.",
"message.no-data-available": "Henüz hiç veri yok.",
+ "message.no-websites-configured": "Henüz hiç web sitesi tanımlamadınız",
"message.page-not-found": "Sayfa bulunamadı.",
+ "message.powered-by": "Sağlayıcı: {name}",
"message.save-success": "Başarıyla kaydedildi.",
"message.share-url": "{target} için kullanılabilir anonim paylaşım adresidir.",
"message.track-stats": "{target} alanı adı istatistiklerini takip etmek için, aşağıdaki kodu web sitenizin {head} bloğuna yerleştirin.",
"message.type-delete": "Onaylamak için kutuya {delete} yazın.",
- "metrics.actions": "Actions",
+ "metrics.actions": "Hareketler",
"metrics.average-visit-time": "Ortalama ziyaret süresi",
"metrics.bounce-rate": "Çıkma oranı",
"metrics.browsers": "Tarayıcılar",
"metrics.countries": "Ülkeler",
+ "metrics.device.desktop": "Masaüstü",
+ "metrics.device.laptop": "Dizüstü",
+ "metrics.device.mobile": "Mobil Cihaz",
+ "metrics.device.tablet": "Tablet",
"metrics.devices": "Cihazlar",
"metrics.events": "Olaylar",
"metrics.filter.combined": "Birleşik",
@@ -66,11 +83,6 @@
"metrics.unique-visitors": "Tekil kullanıcı",
"metrics.views": "Görüntüleme",
"metrics.visitors": "Ziyaretçi",
- "placeholder.message.go-to-settings": "Ayarlara git",
- "placeholder.message.no-websites-configured": "Henüz hiç web sitesi tanımlamadınız",
- "settings.accounts": "Hesaplar",
- "settings.profile": "Profil",
- "settings.websites": "Web siteleri",
"title.add-account": "Hesap ekle",
"title.add-website": "Web sitesi ekle",
"title.change-password": "Şifre değiştir",
@@ -79,7 +91,5 @@
"title.edit-account": "Hesabı düzenle",
"title.edit-website": "Web sitesini düzenle",
"title.share-url": "Paylaşım adresi",
- "title.tracking-code": "İzleme kodu",
- "tooltip.get-share-url": "Paylaşım adresini al",
- "tooltip.get-tracking-code": "İzleme kodunu al"
-}
+ "title.tracking-code": "İzleme kodu"
+}
\ No newline at end of file
diff --git a/lang/zh-CN.json b/lang/zh-CN.json
index 1f21eb0f..a51a42be 100644
--- a/lang/zh-CN.json
+++ b/lang/zh-CN.json
@@ -1,25 +1,27 @@
{
- "active-users.message": "当前在线 {x} 人",
"button.add-account": "添加账户",
"button.add-website": "添加网站",
"button.back": "返回",
"button.cancel": "取消",
"button.change-password": "更新密码",
"button.copy-to-clipboard": "复制",
+ "button.date-range": "多日",
"button.delete": "删除",
"button.edit": "编辑",
"button.login": "登录",
"button.more": "更多",
+ "button.refresh": "刷新",
+ "button.reset": "重置",
"button.save": "保存",
+ "button.single-day": "单日",
"button.view-details": "查看更多",
- "button.websites": "网站",
- "footer.powered-by": "运行",
- "header.nav.dashboard": "仪表板",
- "header.nav.settings": "设置",
+ "label.accounts": "账户",
"label.administrator": "管理员",
"label.confirm-password": "确认密码",
"label.current-password": "目前密码",
- "label.custom-range": "Custom range",
+ "label.custom-range": "自定义时间段",
+ "label.dashboard": "仪表板",
+ "label.default-date-range": "默认日期范围",
"label.domain": "域名",
"label.enable-share-url": "激活共享链接",
"label.invalid": "输入无效",
@@ -32,19 +34,30 @@
"label.new-password": "新密码",
"label.password": "密码",
"label.passwords-dont-match": "密码不一致",
+ "label.profile": "个人资料",
"label.required": "必填",
+ "label.settings": "设置",
"label.this-month": "本月",
"label.this-week": "本周",
"label.this-year": "今年",
+ "label.timezone": "时区",
"label.today": "今天",
+ "label.unknown": "未知",
"label.username": "用户名",
+ "label.websites": "网站",
+ "message.active-users": "当前在线 {x} 人",
"message.confirm-delete": "你确定要删除{target}吗?",
"message.copied": "复制成功!",
"message.delete-warning": "所有相关数据将会被删除.",
"message.failure": "出现错误.",
+ "message.get-share-url": "获得共享链接",
+ "message.get-tracking-code": "获得跟踪代码",
+ "message.go-to-settings": "去设置",
"message.incorrect-username-password": "用户名密码不正确.",
"message.no-data-available": "无可用数据.",
+ "message.no-websites-configured": "你还没有设置任何网站.",
"message.page-not-found": "网页未找到.",
+ "message.powered-by": "运行 {name}",
"message.save-success": "成功保存.",
"message.share-url": "这是 {target} 的共享链接.",
"message.track-stats": "把以下代码放到你的网站的{head}部分来收集{target}的数据.",
@@ -54,6 +67,10 @@
"metrics.bounce-rate": "跳出率",
"metrics.browsers": "浏览器",
"metrics.countries": "国家",
+ "metrics.device.desktop": "台式机",
+ "metrics.device.laptop": "笔记本",
+ "metrics.device.mobile": "手机",
+ "metrics.device.tablet": "平板",
"metrics.devices": "设备",
"metrics.events": "行为类别",
"metrics.filter.combined": "总和",
@@ -66,11 +83,6 @@
"metrics.unique-visitors": "独立访客",
"metrics.views": "页面流量",
"metrics.visitors": "独立访客",
- "placeholder.message.go-to-settings": "去设置",
- "placeholder.message.no-websites-configured": "你还没有设置任何网站.",
- "settings.accounts": "账户",
- "settings.profile": "个人资料",
- "settings.websites": "网站",
"title.add-account": "添加账户",
"title.add-website": "添加网站",
"title.change-password": "更新密码",
@@ -79,7 +91,5 @@
"title.edit-account": "编辑账户",
"title.edit-website": "编辑网站",
"title.share-url": "共享链接",
- "title.tracking-code": "跟踪代码",
- "tooltip.get-share-url": "获得共享链接",
- "tooltip.get-tracking-code": "获得跟踪代码"
+ "title.tracking-code": "跟踪代码"
}
diff --git a/lib/auth.js b/lib/auth.js
index b9344448..370db1c4 100644
--- a/lib/auth.js
+++ b/lib/auth.js
@@ -1,9 +1,49 @@
import { parse } from 'cookie';
-import { parseSecureToken } from './crypto';
+import { parseSecureToken, parseToken } from './crypto';
import { AUTH_COOKIE_NAME } from './constants';
+import { getWebsiteById } from './queries';
-export async function verifyAuthToken(req) {
+export async function getAuthToken(req) {
const token = parse(req.headers.cookie || '')[AUTH_COOKIE_NAME];
return parseSecureToken(token);
}
+
+export async function isValidToken(token, validation) {
+ try {
+ const result = await parseToken(token);
+
+ if (typeof validation === 'object') {
+ return !Object.keys(validation).find(key => result[key] !== validation[key]);
+ } else if (typeof validation === 'function') {
+ return validation(result);
+ }
+ } catch (e) {
+ return false;
+ }
+
+ return false;
+}
+
+export async function allowQuery(req, skipToken) {
+ const { id, token } = req.query;
+ const websiteId = +id;
+
+ const website = await getWebsiteById(websiteId);
+
+ if (website) {
+ if (token && !skipToken) {
+ return isValidToken(token, { website_id: websiteId });
+ }
+
+ const authToken = await getAuthToken(req);
+
+ if (authToken) {
+ const { user_id, is_admin } = authToken;
+
+ return is_admin || website.user_id === user_id;
+ }
+ }
+
+ return false;
+}
diff --git a/lib/constants.js b/lib/constants.js
index 4f5c6e4c..8acbf0b6 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -1,4 +1,52 @@
export const AUTH_COOKIE_NAME = 'umami.auth';
+export const LOCALE_CONFIG = 'umami.locale';
+export const TIMEZONE_CONFIG = 'umami.timezone';
+export const DATE_RANGE_CONFIG = 'umami.date-range';
+export const THEME_CONFIG = 'umami.theme';
+
+export const THEME_COLORS = {
+ light: {
+ primary: '#2680eb',
+ gray50: '#ffffff',
+ gray75: '#fafafa',
+ gray100: '#f5f5f5',
+ gray200: '#eaeaea',
+ gray300: '#e1e1e1',
+ gray400: '#cacaca',
+ gray500: '#b3b3b3',
+ gray600: '#8e8e8e',
+ gray700: '#6e6e6e',
+ gray800: '#4b4b4b',
+ gray900: '#2c2c2c',
+ },
+ dark: {
+ primary: '#2680eb',
+ gray50: '#252525',
+ gray75: '#2f2f2f',
+ gray100: '#323232',
+ gray200: '#3e3e3e',
+ gray300: '#4a4a4a',
+ gray400: '#5a5a5a',
+ gray500: '#6e6e6e',
+ gray600: '#909090',
+ gray700: '#b9b9b9',
+ gray800: '#e3e3e3',
+ gray900: '#ffffff',
+ },
+};
+
+export const EVENT_COLORS = [
+ '#2680eb',
+ '#9256d9',
+ '#44b556',
+ '#e68619',
+ '#e34850',
+ '#1b959a',
+ '#d83790',
+ '#85d044',
+];
+
+export const DEFAULT_DATE_RANGE = '24hour';
export const POSTGRESQL = 'postgresql';
export const MYSQL = 'mysql';
@@ -23,7 +71,7 @@ export const FILTER_DOMAIN_ONLY = 0;
export const FILTER_COMBINED = 1;
export const FILTER_RAW = 2;
-export const DOMAIN_REGEX = /((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,63}/;
+export const DOMAIN_REGEX = /localhost(:\d{1,5})?|((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,63}/;
export const DESKTOP_SCREEN_WIDTH = 1920;
export const LAPTOP_SCREEN_WIDTH = 1024;
@@ -54,13 +102,6 @@ export const DESKTOP_OS = [
export const MOBILE_OS = ['iOS', 'Android OS', 'BlackBerry OS', 'Windows Mobile', 'Amazon OS'];
-export const DEVICES = {
- desktop: 'Desktop',
- laptop: 'Laptop',
- tablet: 'Tablet',
- mobile: 'Mobile',
-};
-
export const BROWSERS = {
aol: 'AOL',
edge: 'Edge',
diff --git a/lib/crypto.js b/lib/crypto.js
index 8a96e785..37279daf 100644
--- a/lib/crypto.js
+++ b/lib/crypto.js
@@ -27,7 +27,7 @@ export function uuid(...args) {
return v5(args.join(''), salt());
}
-export function isValidId(s) {
+export function isValidUuid(s) {
return validate(s);
}
diff --git a/lib/date.js b/lib/date.js
index 363e68dd..63bad45e 100644
--- a/lib/date.js
+++ b/lib/date.js
@@ -89,7 +89,7 @@ export function getDateRange(value) {
export function getDateRangeValues(startDate, endDate) {
let unit = 'year';
- if (differenceInHours(endDate, startDate) <= 72) {
+ if (differenceInHours(endDate, startDate) <= 48) {
unit = 'hour';
} else if (differenceInCalendarDays(endDate, startDate) <= 90) {
unit = 'day';
diff --git a/lib/filters.js b/lib/filters.js
index 0430e437..ee0a1759 100644
--- a/lib/filters.js
+++ b/lib/filters.js
@@ -1,6 +1,6 @@
import firstBy from 'thenby';
-import { BROWSERS, ISO_COUNTRIES, DEVICES } from './constants';
-import { removeTrailingSlash, getDomainName } from './url';
+import { BROWSERS, ISO_COUNTRIES } from './constants';
+import { removeTrailingSlash, removeWWW, getDomainName } from './url';
export const urlFilter = (data, { raw }) => {
const isValidUrl = url => {
@@ -55,6 +55,7 @@ export const urlFilter = (data, { raw }) => {
export const refFilter = (data, { domain, domainOnly, raw }) => {
const domainName = getDomainName(domain);
const regex = new RegExp(`http[s]?://${domainName}`);
+ const links = {};
const isValidRef = ref => {
return ref !== '' && !ref.startsWith('/') && !ref.startsWith('#');
@@ -85,7 +86,7 @@ export const refFilter = (data, { domain, domainOnly, raw }) => {
const ref = searchParams.get('ref');
const query = ref ? `?ref=${ref}` : '';
- return `${origin}${path}${query}`;
+ return removeTrailingSlash(`${removeWWW(hostname)}${path}`) + query;
}
return null;
@@ -101,6 +102,10 @@ export const refFilter = (data, { domain, domainOnly, raw }) => {
const url = cleanUrl(x);
+ if (!domainOnly && !raw) {
+ links[url] = x;
+ }
+
if (url) {
if (!obj[url]) {
obj[url] = y;
@@ -113,20 +118,19 @@ export const refFilter = (data, { domain, domainOnly, raw }) => {
}, {});
return Object.keys(map)
- .map(key => ({ x: key, y: map[key] }))
+ .map(key => ({ x: key, y: map[key], w: links[key] }))
.sort(firstBy('y', -1).thenBy('x'));
};
export const browserFilter = data =>
- data.map(({ x, y }) => ({ x: BROWSERS[x], y })).filter(({ x }) => x);
+ data.map(({ x, y }) => ({ x: BROWSERS[x] || x, y })).filter(({ x }) => x);
export const osFilter = data => data.filter(({ x }) => x);
-export const deviceFilter = data =>
- data.map(({ x, y }) => ({ x: DEVICES[x], y })).filter(({ x }) => x);
+export const deviceFilter = data => data.filter(({ x }) => x);
export const countryFilter = data =>
- data.map(({ x, y }) => ({ x: ISO_COUNTRIES[x], y })).filter(({ x }) => x);
+ data.map(({ x, y }) => ({ x: ISO_COUNTRIES[x] || x, y })).filter(({ x }) => x);
export const percentFilter = data => {
const total = data.reduce((n, { y }) => n + y, 0);
diff --git a/lib/lang.js b/lib/lang.js
index 5132362a..066df152 100644
--- a/lib/lang.js
+++ b/lib/lang.js
@@ -1,5 +1,5 @@
import { format } from 'date-fns';
-import { enUS, nl, zhCN, tr, ru, de, ja, es } from 'date-fns/locale';
+import { enUS, nl, zhCN, tr, ru, de, ja, es, fr, da, sv, el } from 'date-fns/locale';
import enMessages from 'lang-compiled/en-US.json';
import nlMessages from 'lang-compiled/nl-NL.json';
import zhCNMessages from 'lang-compiled/zh-CN.json';
@@ -8,7 +8,11 @@ import ruRUMessages from 'lang-compiled/ru-RU.json';
import deDEMessages from 'lang-compiled/de-DE.json';
import jaMessages from 'lang-compiled/ja-JP.json';
import esMXMessages from 'lang-compiled/es-MX.json';
+import frMessages from 'lang-compiled/fr-FR.json';
import mnMNMessages from 'lang-compiled/mn-MN.json';
+import daMessages from 'lang-compiled/da-DK.json';
+import svMessages from 'lang-compiled/sv-SE.json';
+import grMessages from 'lang-compiled/el-GR.json';
export const messages = {
'en-US': enMessages,
@@ -19,7 +23,11 @@ export const messages = {
'tr-TR': trTRMessages,
'ja-JP': jaMessages,
'es-MX': esMXMessages,
+ 'fr-FR': frMessages,
'mn-MN': mnMNMessages,
+ 'da-DK': daMessages,
+ 'sv-SE': svMessages,
+ 'el-GR': grMessages,
};
export const dateLocales = {
@@ -27,23 +35,31 @@ export const dateLocales = {
'nl-NL': nl,
'zh-CN': zhCN,
'de-DE': de,
+ 'da-DK': da,
'ru-RU': ru,
+ 'sv-SE': sv,
'tr-TR': tr,
'ja-JP': ja,
'es-MX': es,
+ 'fr-FR': fr,
'mn-MN': enUS,
+ 'el-GR': el,
};
export const menuOptions = [
- { label: 'English', value: 'en', display: 'EN' },
- { label: '中文', value: 'zh-CN', display: 'CN' },
- { label: 'Deutsch', value: 'de-DE', display: 'DE' },
- { label: 'Español', value: 'es-MX', display: 'ES' },
- { label: '日本語', value: 'ja-JP', display: 'JP' },
- { label: 'Монгол', value: 'mn-MN', display: 'MN' },
- { label: 'Nederlands', value: 'nl-NL', display: 'NL' },
- { label: 'Русский', value: 'ru-RU', display: 'RU' },
- { label: 'Turkish', value: 'tr-TR', display: 'TR' },
+ { label: 'English', value: 'en-US', display: 'en' },
+ { label: '中文', value: 'zh-CN', display: 'cn' },
+ { label: 'Dansk', value: 'da-DK', display: 'da' },
+ { label: 'Deutsch', value: 'de-DE', display: 'de' },
+ { label: 'Español', value: 'es-MX', display: 'es' },
+ { label: 'Français', value: 'fr-FR', display: 'fr' },
+ { label: 'Ελληνικά', value: 'el-GR', display: 'el' },
+ { label: '日本語', value: 'ja-JP', display: 'ja' },
+ { label: 'Монгол', value: 'mn-MN', display: 'mn' },
+ { label: 'Nederlands', value: 'nl-NL', display: 'nl' },
+ { label: 'Русский', value: 'ru-RU', display: 'ru' },
+ { label: 'Svenska', value: 'sv-SE', display: 'sv' },
+ { label: 'Turkish', value: 'tr-TR', display: 'tr' },
];
export function dateFormat(date, str, locale) {
diff --git a/lib/middleware.js b/lib/middleware.js
index 5cbe9c2c..c41e75d0 100644
--- a/lib/middleware.js
+++ b/lib/middleware.js
@@ -1,6 +1,6 @@
import cors from 'cors';
-import { verifySession } from './session';
-import { verifyAuthToken } from './auth';
+import { getSession } from './session';
+import { getAuthToken } from './auth';
import { unauthorized, badRequest, serverError } from './response';
export function use(middleware) {
@@ -21,8 +21,9 @@ export const useSession = use(async (req, res, next) => {
let session;
try {
- session = await verifySession(req);
+ session = await getSession(req);
} catch (e) {
+ console.error(e);
return serverError(res, e.message);
}
@@ -35,13 +36,7 @@ export const useSession = use(async (req, res, next) => {
});
export const useAuth = use(async (req, res, next) => {
- let token;
-
- try {
- token = await verifyAuthToken(req);
- } catch (e) {
- return serverError(res, e.message);
- }
+ const token = await getAuthToken(req);
if (!token) {
return unauthorized(res);
diff --git a/lib/session.js b/lib/session.js
index ef9f403f..0488b730 100644
--- a/lib/session.js
+++ b/lib/session.js
@@ -1,8 +1,8 @@
import { getWebsiteByUuid, getSessionByUuid, createSession } from 'lib/queries';
import { getClientInfo } from 'lib/request';
-import { uuid, isValidId } from 'lib/crypto';
+import { uuid, isValidUuid } from 'lib/crypto';
-export async function verifySession(req) {
+export async function getSession(req) {
const { payload } = req.body;
if (!payload) {
@@ -11,7 +11,7 @@ export async function verifySession(req) {
const { website: website_uuid, hostname, screen, language } = payload;
- if (!isValidId(website_uuid)) {
+ if (!isValidUuid(website_uuid)) {
throw new Error(`Invalid website: ${website_uuid}`);
}
diff --git a/lib/url.js b/lib/url.js
index 0eb4a04a..d90c390e 100644
--- a/lib/url.js
+++ b/lib/url.js
@@ -2,6 +2,10 @@ export function removeTrailingSlash(url) {
return url && url.length > 1 && url.endsWith('/') ? url.slice(0, -1) : url;
}
+export function removeWWW(url) {
+ return url && url.length > 1 && url.startsWith('www.') ? url.slice(4) : url;
+}
+
export function getDomainName(str) {
try {
return new URL(str).hostname;
diff --git a/lib/web.js b/lib/web.js
index 4a8578f1..4081b3ab 100644
--- a/lib/web.js
+++ b/lib/web.js
@@ -19,7 +19,7 @@ export const apiRequest = (method, url, body) =>
return null;
});
-function parseQuery(url, params = {}) {
+const parseQuery = (url, params = {}) => {
const query = Object.keys(params).reduce((values, key) => {
if (params[key] !== undefined) {
return values.concat(`${key}=${encodeURIComponent(params[key])}`);
@@ -27,7 +27,7 @@ function parseQuery(url, params = {}) {
return values;
}, []);
return query.length ? `${url}?${query.join('&')}` : url;
-}
+};
export const get = (url, params) => apiRequest('get', parseQuery(url, params));
@@ -62,3 +62,14 @@ export const doNotTrack = () => {
return dnt === true || dnt === 1 || dnt === 'yes' || dnt === '1';
};
+
+export const setItem = (key, data, session) => {
+ if (typeof window !== 'undefined') {
+ (session ? sessionStorage : localStorage).setItem(key, JSON.stringify(data));
+ }
+};
+
+export const getItem = (key, session) =>
+ typeof window !== 'undefined'
+ ? JSON.parse((session ? sessionStorage : localStorage).getItem(key))
+ : null;
diff --git a/package.json b/package.json
index 25c50c7d..bc78dc07 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "umami",
- "version": "0.32.0",
+ "version": "0.48.0",
"description": "A simple, fast, website analytics alternative to Google Analytics. ",
"author": "Mike Cao
",
"license": "MIT",
@@ -11,10 +11,12 @@
},
"scripts": {
"dev": "next dev",
- "build": "npm-run-all build-tracker build-lang copy-db-schema build-db-client build-app",
+ "build": "npm-run-all build-tracker build-lang build-db build-app",
"start": "next start",
"build-app": "next build",
"build-tracker": "rollup -c rollup.tracker.config.js",
+ "build-db": "npm-run-all copy-db-schema build-db-client",
+ "build-lang": "npm-run-all format-lang compile-lang",
"copy-db-schema": "node scripts/copy-db-schema.js",
"build-db-schema": "dotenv prisma introspect",
"build-db-client": "dotenv prisma generate",
@@ -22,7 +24,7 @@
"build-mysql-client": "dotenv prisma generate -- --schema=./prisma/schema.mysql.prisma",
"build-postgresql-schema": "dotenv prisma introspect -- --schema=./prisma/schema.postgresql.prisma",
"build-postgresql-client": "dotenv prisma generate -- --schema=./prisma/schema.postgresql.prisma",
- "build-lang": "npm-run-all format-lang compile-lang",
+ "generate-lang": "npm-run-all extract-lang merge-lang",
"extract-lang": "formatjs extract {pages,components}/**/*.js --out-file build/messages.json",
"merge-lang": "node scripts/merge-lang.js",
"format-lang": "node scripts/format-lang.js",
@@ -47,9 +49,10 @@
}
},
"dependencies": {
- "@prisma/client": "2.6.2",
+ "@prisma/client": "2.7.1",
"@reduxjs/toolkit": "^1.4.0",
"bcrypt": "^5.0.0",
+ "chalk": "^4.1.0",
"chart.js": "^2.9.3",
"classnames": "^2.2.6",
"cookie": "^0.4.1",
@@ -60,57 +63,57 @@
"dotenv": "^8.2.0",
"formik": "^2.1.5",
"geolite2-redist": "^1.0.7",
- "immer": "^7.0.8",
+ "immer": "^7.0.9",
"is-localhost-ip": "^1.4.0",
"isbot-fast": "^1.2.0",
- "jose": "^1.28.0",
+ "jose": "^2.0.2",
"maxmind": "^4.1.4",
"moment-timezone": "^0.5.31",
"next": "^9.5.3",
- "promise-polyfill": "^8.1.3",
"react": "^16.13.1",
"react-dom": "^16.13.1",
- "react-intl": "^5.8.0",
+ "react-intl": "^5.8.2",
"react-redux": "^7.2.1",
"react-simple-maps": "^2.1.2",
"react-spring": "^8.0.27",
- "react-tooltip": "^4.2.9",
+ "react-tooltip": "^4.2.10",
"react-window": "^1.8.5",
"redux": "^4.0.5",
"redux-thunk": "^2.3.0",
"request-ip": "^2.1.3",
"thenby": "^1.3.4",
+ "timezone-support": "^2.0.2",
"tinycolor2": "^1.4.1",
- "unfetch": "^4.1.0",
"uuid": "^8.3.0"
},
"devDependencies": {
- "@formatjs/cli": "^2.9.0",
- "@prisma/cli": "2.6.2",
+ "@formatjs/cli": "^2.11.3",
+ "@prisma/cli": "2.7.1",
"@rollup/plugin-buble": "^0.21.3",
"@rollup/plugin-node-resolve": "^9.0.0",
"@rollup/plugin-replace": "^2.3.3",
"@svgr/webpack": "^5.4.0",
"cross-env": "^7.0.2",
- "dotenv-cli": "^3.2.0",
- "eslint": "^7.8.1",
+ "del": "^5.1.0",
+ "dotenv-cli": "^4.0.0",
+ "eslint": "^7.9.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-prettier": "^3.1.3",
"eslint-plugin-react": "^7.20.6",
- "eslint-plugin-react-hooks": "^4.1.0",
+ "eslint-plugin-react-hooks": "^4.1.2",
"extract-react-intl-messages": "^4.1.1",
- "husky": "^4.2.5",
- "lint-staged": "^10.3.0",
+ "husky": "^4.3.0",
+ "lint-staged": "^10.4.0",
"npm-run-all": "^4.1.5",
"postcss-flexbugs-fixes": "^4.2.1",
"postcss-import": "^12.0.1",
"postcss-preset-env": "^6.7.0",
- "prettier": "^2.1.1",
+ "prettier": "^2.1.2",
"prettier-eslint": "^11.0.0",
- "rollup": "^2.26.10",
+ "rollup": "^2.28.1",
"rollup-plugin-hashbang": "^2.2.2",
- "rollup-plugin-terser": "^7.0.1",
- "stylelint": "^13.7.0",
+ "rollup-plugin-terser": "^7.0.2",
+ "stylelint": "^13.7.1",
"stylelint-config-css-modules": "^2.2.0",
"stylelint-config-prettier": "^8.0.1",
"stylelint-config-recommended": "^3.0.0"
diff --git a/pages/_app.js b/pages/_app.js
index 694049d4..9aad4339 100644
--- a/pages/_app.js
+++ b/pages/_app.js
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React from 'react';
import { IntlProvider } from 'react-intl';
import { Provider } from 'react-redux';
import { useStore } from 'redux/store';
@@ -9,17 +9,10 @@ import 'styles/bootstrap-grid.css';
import 'styles/index.css';
const Intl = ({ children }) => {
- const [locale, setLocale] = useLocale();
+ const [locale] = useLocale();
const Wrapper = ({ children }) => {children} ;
- useEffect(() => {
- const saved = localStorage.getItem('locale');
- if (saved) {
- setLocale(saved);
- }
- });
-
return (
{children}
diff --git a/pages/api/account/[id].js b/pages/api/account/[id].js
index c87f948b..6f9beac1 100644
--- a/pages/api/account/[id].js
+++ b/pages/api/account/[id].js
@@ -9,7 +9,7 @@ export default async (req, res) => {
const { id } = req.query;
const user_id = +id;
- if (is_admin) {
+ if (!is_admin) {
return unauthorized(res);
}
diff --git a/pages/api/account/password.js b/pages/api/account/password.js
index c9c955fa..1b364d7b 100644
--- a/pages/api/account/password.js
+++ b/pages/api/account/password.js
@@ -6,10 +6,10 @@ import { checkPassword, hashPassword } from 'lib/crypto';
export default async (req, res) => {
await useAuth(req, res);
- const { user_id, is_admin } = req.auth;
- const { current_password, new_password } = req.body;
+ const { user_id: auth_user_id, is_admin } = req.auth;
+ const { user_id, current_password, new_password } = req.body;
- if (is_admin) {
+ if (!is_admin || user_id !== auth_user_id) {
return unauthorized(res);
}
diff --git a/pages/api/accounts.js b/pages/api/accounts.js
index c5a41dff..3d651601 100644
--- a/pages/api/accounts.js
+++ b/pages/api/accounts.js
@@ -5,16 +5,16 @@ import { ok, unauthorized, methodNotAllowed } from 'lib/response';
export default async (req, res) => {
await useAuth(req, res);
- const { is_admin: current_user_is_admin } = req.auth;
+ const { is_admin } = req.auth;
+
+ if (!is_admin) {
+ return unauthorized(res);
+ }
if (req.method === 'GET') {
- if (current_user_is_admin) {
- const accounts = await getAccounts();
+ const accounts = await getAccounts();
- return ok(res, accounts);
- }
-
- return unauthorized(res);
+ return ok(res, accounts);
}
return methodNotAllowed(res);
diff --git a/pages/api/share/[id].js b/pages/api/share/[id].js
index edce6cfd..461e008e 100644
--- a/pages/api/share/[id].js
+++ b/pages/api/share/[id].js
@@ -1,5 +1,6 @@
import { getWebsiteByShareId } from 'lib/queries';
import { ok, notFound, methodNotAllowed } from 'lib/response';
+import { createToken } from 'lib/crypto';
export default async (req, res) => {
const { id } = req.query;
@@ -8,7 +9,10 @@ export default async (req, res) => {
const website = await getWebsiteByShareId(id);
if (website) {
- return ok(res, website);
+ const websiteId = website.website_id;
+ const token = await createToken({ website_id: websiteId });
+
+ return ok(res, { websiteId, token });
}
return notFound(res);
diff --git a/pages/api/website/[id].js b/pages/api/website/[id].js
deleted file mode 100644
index 40e9995f..00000000
--- a/pages/api/website/[id].js
+++ /dev/null
@@ -1,31 +0,0 @@
-import { deleteWebsite, getWebsiteById } from 'lib/queries';
-import { useAuth } from 'lib/middleware';
-import { methodNotAllowed, ok, unauthorized } from 'lib/response';
-
-export default async (req, res) => {
- const { id } = req.query;
- const website_id = +id;
-
- if (req.method === 'GET') {
- const website = await getWebsiteById(website_id);
-
- return ok(res, website);
- }
-
- if (req.method === 'DELETE') {
- await useAuth(req, res);
- const { user_id, is_admin } = req.auth;
-
- const website = await getWebsiteById(website_id);
-
- if (website.user_id === user_id || is_admin) {
- await deleteWebsite(website_id);
-
- return ok(res);
- }
-
- return unauthorized(res);
- }
-
- return methodNotAllowed(res);
-};
diff --git a/pages/api/website/[id]/active.js b/pages/api/website/[id]/active.js
index 492074a9..280bc06e 100644
--- a/pages/api/website/[id]/active.js
+++ b/pages/api/website/[id]/active.js
@@ -1,15 +1,18 @@
import { getActiveVisitors } from 'lib/queries';
-import { methodNotAllowed, ok } from 'lib/response';
-import { useAuth } from 'lib/middleware';
+import { methodNotAllowed, ok, unauthorized } from 'lib/response';
+import { allowQuery } from 'lib/auth';
export default async (req, res) => {
- await useAuth(req, res);
-
if (req.method === 'GET') {
- const { id } = req.query;
- const website_id = +id;
+ if (!(await allowQuery(req))) {
+ return unauthorized(res);
+ }
- const result = await getActiveVisitors(website_id);
+ const { id } = req.query;
+
+ const websiteId = +id;
+
+ const result = await getActiveVisitors(websiteId);
return ok(res, result);
}
diff --git a/pages/api/website/[id]/events.js b/pages/api/website/[id]/events.js
index 143c745a..4b9a656d 100644
--- a/pages/api/website/[id]/events.js
+++ b/pages/api/website/[id]/events.js
@@ -1,14 +1,16 @@
import moment from 'moment-timezone';
import { getEvents } from 'lib/queries';
-import { ok, badRequest, methodNotAllowed } from 'lib/response';
-import { useAuth } from 'lib/middleware';
+import { ok, badRequest, methodNotAllowed, unauthorized } from 'lib/response';
+import { allowQuery } from 'lib/auth';
const unitTypes = ['year', 'month', 'hour', 'day'];
export default async (req, res) => {
- await useAuth(req, res);
-
if (req.method === 'GET') {
+ if (!(await allowQuery(req))) {
+ return unauthorized(res);
+ }
+
const { id, start_at, end_at, unit, tz } = req.query;
if (!moment.tz.zone(tz) || !unitTypes.includes(unit)) {
diff --git a/pages/api/website/[id]/index.js b/pages/api/website/[id]/index.js
new file mode 100644
index 00000000..74ce0f33
--- /dev/null
+++ b/pages/api/website/[id]/index.js
@@ -0,0 +1,31 @@
+import { deleteWebsite, getWebsiteById } from 'lib/queries';
+import { methodNotAllowed, ok, unauthorized } from 'lib/response';
+import { allowQuery } from 'lib/auth';
+
+export default async (req, res) => {
+ const { id } = req.query;
+
+ const websiteId = +id;
+
+ if (req.method === 'GET') {
+ if (!(await allowQuery(req))) {
+ return unauthorized(res);
+ }
+
+ const website = await getWebsiteById(websiteId);
+
+ return ok(res, website);
+ }
+
+ if (req.method === 'DELETE') {
+ if (!(await allowQuery(req, true))) {
+ return unauthorized(res);
+ }
+
+ await deleteWebsite(websiteId);
+
+ return ok(res);
+ }
+
+ return methodNotAllowed(res);
+};
diff --git a/pages/api/website/[id]/metrics.js b/pages/api/website/[id]/metrics.js
index 70a9d1e6..bb5c977b 100644
--- a/pages/api/website/[id]/metrics.js
+++ b/pages/api/website/[id]/metrics.js
@@ -1,12 +1,15 @@
import { getMetrics } from 'lib/queries';
-import { methodNotAllowed, ok } from 'lib/response';
-import { useAuth } from 'lib/middleware';
+import { methodNotAllowed, ok, unauthorized } from 'lib/response';
+import { allowQuery } from 'lib/auth';
export default async (req, res) => {
- await useAuth(req, res);
-
if (req.method === 'GET') {
+ if (!(await allowQuery(req))) {
+ return unauthorized(res);
+ }
+
const { id, start_at, end_at } = req.query;
+
const websiteId = +id;
const startDate = new Date(+start_at);
const endDate = new Date(+end_at);
diff --git a/pages/api/website/[id]/pageviews.js b/pages/api/website/[id]/pageviews.js
index 398e52e4..016c6646 100644
--- a/pages/api/website/[id]/pageviews.js
+++ b/pages/api/website/[id]/pageviews.js
@@ -1,24 +1,26 @@
import moment from 'moment-timezone';
import { getPageviews } from 'lib/queries';
-import { ok, badRequest, methodNotAllowed } from 'lib/response';
-import { useAuth } from 'lib/middleware';
+import { ok, badRequest, methodNotAllowed, unauthorized } from 'lib/response';
+import { allowQuery } from 'lib/auth';
const unitTypes = ['year', 'month', 'hour', 'day'];
export default async (req, res) => {
- await useAuth(req, res);
-
if (req.method === 'GET') {
- const { id, start_at, end_at, unit, tz } = req.query;
-
- if (!moment.tz.zone(tz) || !unitTypes.includes(unit)) {
- return badRequest(res);
+ if (!(await allowQuery(req))) {
+ return unauthorized(res);
}
+ const { id, start_at, end_at, unit, tz } = req.query;
+
const websiteId = +id;
const startDate = new Date(+start_at);
const endDate = new Date(+end_at);
+ if (!moment.tz.zone(tz) || !unitTypes.includes(unit)) {
+ return badRequest(res);
+ }
+
const [pageviews, uniques] = await Promise.all([
getPageviews(websiteId, startDate, endDate, tz, unit, '*'),
getPageviews(websiteId, startDate, endDate, tz, unit, 'distinct session_id'),
diff --git a/pages/api/website/[id]/rankings.js b/pages/api/website/[id]/rankings.js
index 158a4bc2..90a0cd9f 100644
--- a/pages/api/website/[id]/rankings.js
+++ b/pages/api/website/[id]/rankings.js
@@ -1,7 +1,7 @@
import { getRankings } from 'lib/queries';
-import { ok, badRequest, methodNotAllowed } from 'lib/response';
+import { ok, badRequest, methodNotAllowed, unauthorized } from 'lib/response';
import { DOMAIN_REGEX } from 'lib/constants';
-import { useAuth } from 'lib/middleware';
+import { allowQuery } from 'lib/auth';
const sessionColumns = ['browser', 'os', 'device', 'country'];
const pageviewColumns = ['url', 'referrer'];
@@ -26,10 +26,13 @@ function getColumn(type) {
}
export default async (req, res) => {
- await useAuth(req, res);
-
if (req.method === 'GET') {
+ if (!(await allowQuery(req))) {
+ return unauthorized(res);
+ }
+
const { id, type, start_at, end_at, domain } = req.query;
+
const websiteId = +id;
const startDate = new Date(+start_at);
const endDate = new Date(+end_at);
diff --git a/pages/api/website/index.js b/pages/api/website/index.js
index c3db0521..dab9a94d 100644
--- a/pages/api/website/index.js
+++ b/pages/api/website/index.js
@@ -15,22 +15,21 @@ export default async (req, res) => {
if (website_id) {
const website = await getWebsiteById(website_id);
- if (website.user_id === user_id || is_admin) {
- let { share_id } = website;
- console.log('exising id', share_id, website);
-
- if (enable_share_url) {
- share_id = share_id ? share_id : getRandomChars(8);
- } else {
- share_id = null;
- }
-
- await updateWebsite(website_id, { name, domain, share_id });
-
- return ok(res);
+ if (website.user_id !== user_id && !is_admin) {
+ return unauthorized(res);
}
- return unauthorized(res);
+ let { share_id } = website;
+
+ if (enable_share_url) {
+ share_id = share_id ? share_id : getRandomChars(8);
+ } else {
+ share_id = null;
+ }
+
+ await updateWebsite(website_id, { name, domain, share_id });
+
+ return ok(res);
} else {
const website_uuid = uuid();
const share_id = enable_share_url ? getRandomChars(8) : null;
diff --git a/pages/api/websites.js b/pages/api/websites.js
index b4633950..6f51754f 100644
--- a/pages/api/websites.js
+++ b/pages/api/websites.js
@@ -5,15 +5,16 @@ import { ok, methodNotAllowed, unauthorized } from 'lib/response';
export default async (req, res) => {
await useAuth(req, res);
- const { user_id, is_admin } = req.auth;
- const { userId } = req.query;
+ const { user_id: current_user_id, is_admin } = req.auth;
+ const { user_id } = req.query;
+ const userId = +user_id;
if (req.method === 'GET') {
- if (userId && !is_admin) {
+ if (userId && userId !== current_user_id && !is_admin) {
return unauthorized(res);
}
- const websites = await getUserWebsites(+userId || user_id);
+ const websites = await getUserWebsites(userId || current_user_id);
return ok(res, websites);
}
diff --git a/pages/settings/accounts.js b/pages/settings/accounts.js
new file mode 100644
index 00000000..3426f4b8
--- /dev/null
+++ b/pages/settings/accounts.js
@@ -0,0 +1,3 @@
+import Index from './index';
+
+export default Index;
diff --git a/pages/settings.js b/pages/settings/index.js
similarity index 100%
rename from pages/settings.js
rename to pages/settings/index.js
diff --git a/pages/settings/profile.js b/pages/settings/profile.js
new file mode 100644
index 00000000..3426f4b8
--- /dev/null
+++ b/pages/settings/profile.js
@@ -0,0 +1,3 @@
+import Index from './index';
+
+export default Index;
diff --git a/pages/share/[...id].js b/pages/share/[...id].js
index 1e0897a9..c4fa9a63 100644
--- a/pages/share/[...id].js
+++ b/pages/share/[...id].js
@@ -14,9 +14,11 @@ export default function SharePage() {
return null;
}
+ const { websiteId, token } = data;
+
return (
-
);
}
diff --git a/pages/test.js b/pages/test.js
index 30c00e70..820a3187 100644
--- a/pages/test.js
+++ b/pages/test.js
@@ -11,6 +11,12 @@ export default function Test() {
return No id query specified. ;
}
+ function handleClick() {
+ window.umami('Custom event');
+ window.umami.pageView('/fake', 'https://www.google.com');
+ window.umami.pageEvent('pageEvent', 'custom-type');
+ }
+
return (
<>
@@ -20,7 +26,7 @@ export default function Test() {
- Here you can test if your umami installation works. Open the network tab in your browser's
+ Here you can test if your umami installation works. Open the network tab in your browser
developer console and watch for requests to the url collect . The links below should
trigger page views. Clicking on the button should trigger an event.
@@ -40,6 +46,10 @@ export default function Test() {
>
Button
+ Manual trigger
+
+ Button
+
);
diff --git a/redux/actions/app.js b/redux/actions/app.js
index a74272a5..6bcba2f0 100644
--- a/redux/actions/app.js
+++ b/redux/actions/app.js
@@ -1,16 +1,25 @@
import { createSlice } from '@reduxjs/toolkit';
+import { getItem } from 'lib/web';
+import { LOCALE_CONFIG, THEME_CONFIG } from 'lib/constants';
const app = createSlice({
name: 'app',
- initialState: { locale: 'en-US' },
+ initialState: {
+ locale: getItem(LOCALE_CONFIG) || 'en-US',
+ theme: getItem(THEME_CONFIG) || 'light',
+ },
reducers: {
- updateApp(state, action) {
- state = action.payload;
+ setLocale(state, action) {
+ state.locale = action.payload;
+ return state;
+ },
+ setTheme(state, action) {
+ state.theme = action.payload;
return state;
},
},
});
-export const { updateApp } = app.actions;
+export const { setLocale, setTheme } = app.actions;
export default app.reducer;
diff --git a/rollup.tracker.config.js b/rollup.tracker.config.js
index ea5f709f..e836955f 100644
--- a/rollup.tracker.config.js
+++ b/rollup.tracker.config.js
@@ -1,6 +1,5 @@
import 'dotenv/config';
import buble from '@rollup/plugin-buble';
-import replace from '@rollup/plugin-replace';
import resolve from '@rollup/plugin-node-resolve';
import { terser } from 'rollup-plugin-terser';
@@ -10,10 +9,5 @@ export default {
file: 'public/umami.js',
format: 'iife',
},
- plugins: [
- replace({ __DNT__: !!process.env.ENABLE_DNT }),
- resolve(),
- buble(),
- terser({ compress: { evaluate: false } }),
- ],
+ plugins: [resolve(), buble(), terser({ compress: { evaluate: false } })],
};
diff --git a/scripts/format-lang.js b/scripts/format-lang.js
index 5b03239e..f5766ced 100644
--- a/scripts/format-lang.js
+++ b/scripts/format-lang.js
@@ -1,11 +1,19 @@
const fs = require('fs');
const path = require('path');
+const del = require('del');
const prettier = require('prettier');
+const chalk = require('chalk');
const src = path.resolve(__dirname, '../lang');
const dest = path.resolve(__dirname, '../build');
const files = fs.readdirSync(src);
+const removed = del.sync([path.join(dest, '*.json')]);
+
+if (removed.length) {
+ console.log(removed.map(n => `${n} ${chalk.redBright('✗')}`).join('\n'));
+}
+
if (!fs.existsSync(dest)) {
fs.mkdirSync(dest);
}
@@ -23,5 +31,5 @@ files.forEach(file => {
fs.writeFileSync(path.resolve(dest, file), json);
- console.log(path.resolve(src, file), '->', path.resolve(dest, file));
+ console.log(path.resolve(src, file), chalk.greenBright('->'), path.resolve(dest, file));
});
diff --git a/styles/index.css b/styles/index.css
index 5435364f..c0e2ae6d 100644
--- a/styles/index.css
+++ b/styles/index.css
@@ -1,14 +1,17 @@
html,
body {
font-family: Inter, -apple-system, BlinkMacSystemFont, sans-serif;
- font-size: var(--font-size-normal);
font-weight: 400;
line-height: 1.8;
padding: 0;
margin: 0;
- width: 100%;
- height: 100%;
box-sizing: border-box;
+ min-height: 100%;
+ display: flex;
+ flex-direction: column;
+ flex: 1;
+
+ font-size: var(--font-size-normal);
color: var(--gray900);
background: var(--gray75);
}
@@ -36,17 +39,6 @@ h6 {
font-weight: 400;
}
-#__next {
- display: flex;
- flex-direction: column;
- width: 100%;
- height: 100%;
-}
-
-#__modals {
- z-index: 10;
-}
-
button,
input,
select {
@@ -62,6 +54,8 @@ a:visited {
input[type='text'],
input[type='password'],
textarea {
+ color: var(--gray900);
+ background: var(--gray50);
padding: 4px 8px;
font-size: var(--font-size-normal);
line-height: 1.8;
@@ -87,14 +81,33 @@ label:empty {
dt {
font-weight: 600;
+ margin: 0 0 5px 0;
}
dd {
- margin: 0 0 10px 0;
+ margin: 0 0 30px 0;
}
main {
flex: 1;
+ display: flex;
+ flex-direction: column;
+}
+
+svg {
+ shape-rendering: geometricPrecision;
+}
+
+#__next {
+ display: flex;
+ flex-direction: column;
+ width: 100%;
+ height: 100%;
+ flex: 1;
+}
+
+#__modals {
+ z-index: 10;
}
.container {
diff --git a/styles/variables.css b/styles/variables.css
index ba504a19..02e5392f 100644
--- a/styles/variables.css
+++ b/styles/variables.css
@@ -36,4 +36,33 @@
--green500: #268e6c;
--green600: #12805c;
--green700: #107154;
+
+ --msgColor: #ffffff;
+}
+
+[data-theme='dark'] {
+ /*
+ --gray50: #080808;
+ --gray75: #1a1a1a;
+ --gray100: #1e1e1e;
+ --gray200: #2c2c2c;
+ --gray300: #393939;
+ --gray400: #494949;
+ --gray500: #5c5c5c;
+ --gray600: #7c7c7c;
+ --gray700: #6e6e6e;
+ --gray800: #a2a2a2;
+ --gray900: #efefef;
+ */
+ --gray50: #252525;
+ --gray75: #2f2f2f;
+ --gray100: #323232;
+ --gray200: #3e3e3e;
+ --gray300: #4a4a4a;
+ --gray400: #5a5a5a;
+ --gray500: #6e6e6e;
+ --gray600: #909090;
+ --gray700: #b9b9b9;
+ --gray800: #e3e3e3;
+ --gray900: #ffffff;
}
diff --git a/tracker/index.js b/tracker/index.js
index f7f00927..12119298 100644
--- a/tracker/index.js
+++ b/tracker/index.js
@@ -1,6 +1,4 @@
-import 'promise-polyfill/src/polyfill';
-import 'unfetch/polyfill';
-import { post, hook, doNotTrack } from '../lib/web';
+import { doNotTrack, hook } from '../lib/web';
import { removeTrailingSlash } from '../lib/url';
(window => {
@@ -13,28 +11,42 @@ import { removeTrailingSlash } from '../lib/url';
} = window;
const script = document.querySelector('script[data-website-id]');
+ const attr = key => script && script.getAttribute(key);
- // eslint-disable-next-line no-undef
- if (!script || (__DNT__ && doNotTrack())) return;
+ const website = attr('data-website-id');
+ const hostUrl = attr('data-host-url');
+ const autoTrack = attr('data-auto-track') !== 'false';
+ const dnt = attr('data-do-not-track') === 'true';
+
+ if (!script || (dnt && doNotTrack())) return;
- const website = script.getAttribute('data-website-id');
- const hostUrl = script.getAttribute('data-host-url');
const root = hostUrl
? removeTrailingSlash(hostUrl)
: new URL(script.src).href.split('/').slice(0, -1).join('/');
const screen = `${width}x${height}`;
const listeners = [];
-
let currentUrl = `${pathname}${search}`;
let currentRef = document.referrer;
/* Collect metrics */
- const collect = (type, params) => {
+ const post = (url, data, callback) => {
+ const req = new XMLHttpRequest();
+ req.open('POST', url, true);
+ req.setRequestHeader('Content-Type', 'application/json');
+
+ req.onreadystatechange = () => {
+ if (req.readyState === 4) {
+ callback && callback();
+ }
+ };
+
+ req.send(JSON.stringify(data));
+ };
+
+ const collect = (type, params, uuid) => {
const payload = {
- url: currentUrl,
- referrer: currentRef,
- website,
+ website: uuid,
hostname,
screen,
language,
@@ -52,14 +64,55 @@ import { removeTrailingSlash } from '../lib/url';
});
};
- const pageView = () => collect('pageview').then(() => setTimeout(loadEvents, 300));
+ const trackView = (url = currentUrl, referrer = currentRef, uuid = website) =>
+ collect(
+ 'pageview',
+ {
+ url,
+ referrer,
+ },
+ uuid,
+ );
- const pageEvent = (event_type, event_value) => collect('event', { event_type, event_value });
+ const trackEvent = (event_value, event_type = 'custom', url = currentUrl, uuid = website) =>
+ collect(
+ 'event',
+ {
+ event_type,
+ event_value,
+ url,
+ },
+ uuid,
+ );
- /* Handle history */
+ /* Handle events */
+
+ const addEvents = () => {
+ document.querySelectorAll("[class*='umami--']").forEach(element => {
+ element.className.split(' ').forEach(className => {
+ if (/^umami--([a-z]+)--([a-z0-9_]+[a-z0-9-_]+)$/.test(className)) {
+ const [, type, value] = className.split('--');
+ const listener = () => trackEvent(value, type);
+
+ listeners.push([element, type, listener]);
+ element.addEventListener(type, listener, true);
+ }
+ });
+ });
+ };
+
+ const removeEvents = () => {
+ listeners.forEach(([element, type, listener]) => {
+ element && element.removeEventListener(type, listener, true);
+ });
+ listeners.length = 0;
+ };
+
+ /* Handle history changes */
const handlePush = (state, title, url) => {
removeEvents();
+
currentRef = currentUrl;
const newUrl = url.toString();
@@ -70,40 +123,29 @@ import { removeTrailingSlash } from '../lib/url';
currentUrl = newUrl;
}
- pageView();
+ trackView(currentUrl, currentRef);
+
+ setTimeout(addEvents, 300);
};
- history.pushState = hook(history, 'pushState', handlePush);
- history.replaceState = hook(history, 'replaceState', handlePush);
+ /* Global */
- /* Handle events */
+ if (!window.umami) {
+ const umami = event_value => trackEvent(event_value);
+ umami.trackView = trackView;
+ umami.trackEvent = trackEvent;
- const removeEvents = () => {
- listeners.forEach(([element, type, listener]) => {
- element && element.removeEventListener(type, listener, true);
- });
- listeners.length = 0;
- };
-
- const loadEvents = () => {
- document.querySelectorAll("[class*='umami--']").forEach(element => {
- element.className.split(' ').forEach(className => {
- if (/^umami--([a-z]+)--([a-z0-9_]+[a-z0-9-_]+)$/.test(className)) {
- const [, type, value] = className.split('--');
- const listener = () => pageEvent(type, value);
-
- listeners.push([element, type, listener]);
- element.addEventListener(type, listener, true);
- }
- });
- });
- };
+ window.umami = umami;
+ }
/* Start */
- pageView();
+ if (autoTrack) {
+ history.pushState = hook(history, 'pushState', handlePush);
+ history.replaceState = hook(history, 'replaceState', handlePush);
- if (!window.umami) {
- window.umami = event_value => collect('event', { event_type: 'custom', event_value });
+ trackView(currentUrl, currentRef);
+
+ addEvents();
}
})(window);
diff --git a/yarn.lock b/yarn.lock
index 7e0a5f74..136b534d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1064,78 +1064,78 @@
minimatch "^3.0.4"
strip-json-comments "^3.1.1"
-"@formatjs/cli@^2.9.0":
- version "2.9.0"
- resolved "https://registry.yarnpkg.com/@formatjs/cli/-/cli-2.9.0.tgz#52cceffb133cd1307650af26e878785aa4370a0c"
- integrity sha512-HSpu0qrpPGaja+V7bHc61ZyzHfV+OzGVmB2DmamjZSaI0S5o7gs0skY40o4chIVNsYT/X9RD9G77pOIEHDWmUA==
+"@formatjs/cli@^2.11.3":
+ version "2.11.3"
+ resolved "https://registry.yarnpkg.com/@formatjs/cli/-/cli-2.11.3.tgz#b06a740520aa0d5345adb2330d13447b4292840c"
+ integrity sha512-7aV3B/16GkHX5Stna9GoKU2o6/At0zxW7PYATRZujf6gbSsIUMHpUZWnMNk0qaJtXeU+3HLsSquRflCaQruoJw==
dependencies:
- "@formatjs/ts-transformer" "^2.9.0"
+ "@formatjs/ts-transformer" "^2.10.1"
"@types/json-stable-stringify" "^1.0.32"
"@types/lodash" "^4.14.150"
"@types/loud-rejection" "^2.0.0"
"@types/node" "14"
chalk "^4.0.0"
- commander "5.1.0"
+ commander "^6.1.0"
fast-glob "^3.2.4"
fs-extra "^9.0.0"
- intl-messageformat-parser "^6.0.5"
+ intl-messageformat-parser "^6.0.7"
json-stable-stringify "^1.0.1"
lodash "^4.17.15"
loud-rejection "^2.2.0"
typescript "^4.0"
-"@formatjs/ecma402-abstract@^1.2.0":
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.2.0.tgz#5b03ba4931436070ad926d1b2e89bf07edc5ea5b"
- integrity sha512-jc1bZHhIE1YI0HnZIZcdlKpF4wle2pkgQpzXHDoyy4bUqzBSvDqktnF26hOkyA04KD4wqd61gkuTvRrHMmroAg==
+"@formatjs/ecma402-abstract@^1.2.2":
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.2.2.tgz#4810bdbd696d3805c535fd0620b7c8f45ab3164f"
+ integrity sha512-mLCoAPGlXCVskb/ojBO6iurGqwo6sZvAl8pRC4N25bz4LPWExAM9LsOo057zN3Br1JxUM3RZHG4YGnVt+nSRYQ==
-"@formatjs/intl-displaynames@^3.3.6":
- version "3.3.6"
- resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-3.3.6.tgz#2b5c938ea1cd38e859f2d716ea317feccbbd8896"
- integrity sha512-yrTDL3U0MR10vp17noLI2JuNiHq/Fp1P8/mW/t1gCMOpw38FY4bFTOV68FWxSZwzsy/yETqXHjPUTUbpLtEO/Q==
+"@formatjs/intl-displaynames@^3.3.8":
+ version "3.3.8"
+ resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-3.3.8.tgz#37a3698e135e00908c4314c1085a90d4b9381f61"
+ integrity sha512-HLoiQFCkwjq1ix7xmLC9DAp0sSXBmD2JuzfHiGKrWU8RIbNcHVzbIL4NgkuXkxvnkADXsK67OtfpuQs8kMZ0qw==
dependencies:
- "@formatjs/ecma402-abstract" "^1.2.0"
+ "@formatjs/ecma402-abstract" "^1.2.2"
-"@formatjs/intl-listformat@^4.2.5":
- version "4.2.5"
- resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-4.2.5.tgz#2a39223c5fda3f865d56cea80d7459f5bd9828a8"
- integrity sha512-mcH/CdRH58ao3caZzIdAA32vZM5woxTszIieRjhY2qHxCorVzBPXFYCGTVCO9rtKVFlkMR/pyzaqH3Y1gNiRmw==
+"@formatjs/intl-listformat@^4.2.7":
+ version "4.2.7"
+ resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-4.2.7.tgz#bcccfee92c69e661d4da51567540aa39fef9ceae"
+ integrity sha512-7sYy7pBGzClvSZI98FhVeNt6N/ELdvrj8pvLOfcR0+FQyhv0ixanog7bRo9kT8ECin9+RwEpTmX7jGCh8Bcgjw==
dependencies:
- "@formatjs/ecma402-abstract" "^1.2.0"
+ "@formatjs/ecma402-abstract" "^1.2.2"
"@formatjs/intl-numberformat@^5.5.2":
- version "5.6.0"
- resolved "https://registry.yarnpkg.com/@formatjs/intl-numberformat/-/intl-numberformat-5.6.0.tgz#87bd1e56246fba2c7af58f73930cbe379dd0aef8"
- integrity sha512-MfYcqX1LE2N4P9eVtQXI/L6APlXgjexCj0b7GxJfK+icrwbA0XINSPGTt96kUxO5hf/tDu0MxJXnt9gwMKm/EA==
+ version "5.6.2"
+ resolved "https://registry.yarnpkg.com/@formatjs/intl-numberformat/-/intl-numberformat-5.6.2.tgz#2e96c0bf944f3b70fa30d3c21c2b76f57a101899"
+ integrity sha512-+0dXoe8D/7Ci+8/NI4VF0JxDz4GaK5bCNYMEBOYFM+VFAGGWrwyOuEycR+b1so3MNqePou4cb7lLVr+vQfAOcg==
dependencies:
- "@formatjs/ecma402-abstract" "^1.2.0"
+ "@formatjs/ecma402-abstract" "^1.2.2"
-"@formatjs/intl-relativetimeformat@^7.2.5":
- version "7.2.5"
- resolved "https://registry.yarnpkg.com/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-7.2.5.tgz#3101a8262bd7fb329d7bd555135f67a36c5e58df"
- integrity sha512-KTf0zTP7YbrVAPPJMnZNYRrNvEwuNwqOVNcfz0cQwewjE2ImxPW+03zdRHkwDt92WbRv6T0EDRBpgC2Dxaip6Q==
+"@formatjs/intl-relativetimeformat@^7.2.7":
+ version "7.2.7"
+ resolved "https://registry.yarnpkg.com/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-7.2.7.tgz#dce72ebafb1ca0bf14673fab3b1aad145e1abac6"
+ integrity sha512-R6rxX4PfPQ/EuDRALLSIEDCDW/FAmmu6xpRXIPdZ33bEP7SXEksJB039Bw//I0VIm2fBeIlxe9oqvRGfuqpwVg==
dependencies:
- "@formatjs/ecma402-abstract" "^1.2.0"
+ "@formatjs/ecma402-abstract" "^1.2.2"
-"@formatjs/intl@^1.3.0":
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-1.3.0.tgz#843d79ced6908c2ca25abf65ccee52bc72da6b85"
- integrity sha512-wjzzA7CALsYDjDOdpmGGsMYUblp9LcPtxdjjdZyd8s4xQ5lZZUWrJxqzInkax89TWeGTprHGYh31qPpYbjsRRQ==
+"@formatjs/intl@^1.3.2":
+ version "1.3.2"
+ resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-1.3.2.tgz#95240177ef9a66614ae28193d346c1d65036cefd"
+ integrity sha512-Z5z9BwUU9M/a46VUhKfKYnEAE+5/2NkISAstwxgtMJmh/tDHYkPF1A4F4bD+YVNusvLXeot1NDH9bQ072XaMsQ==
dependencies:
- "@formatjs/ecma402-abstract" "^1.2.0"
- "@formatjs/intl-displaynames" "^3.3.6"
- "@formatjs/intl-listformat" "^4.2.5"
- "@formatjs/intl-relativetimeformat" "^7.2.5"
+ "@formatjs/ecma402-abstract" "^1.2.2"
+ "@formatjs/intl-displaynames" "^3.3.8"
+ "@formatjs/intl-listformat" "^4.2.7"
+ "@formatjs/intl-relativetimeformat" "^7.2.7"
fast-memoize "^2.5.2"
- intl-messageformat "^9.3.6"
- intl-messageformat-parser "^6.0.5"
+ intl-messageformat "^9.3.8"
+ intl-messageformat-parser "^6.0.7"
-"@formatjs/ts-transformer@^2.6.0", "@formatjs/ts-transformer@^2.9.0":
- version "2.9.0"
- resolved "https://registry.yarnpkg.com/@formatjs/ts-transformer/-/ts-transformer-2.9.0.tgz#582f8c54bc5888044f3e848163411dabca130aff"
- integrity sha512-H6skH+McG2OoUL3nc6Eas/5IunM8hk7uDU5Ak/qtNtvsehOH8g030LaFaMxw28BWq2vBipGAPlyyz/KTvO8fPw==
+"@formatjs/ts-transformer@^2.10.1", "@formatjs/ts-transformer@^2.6.0":
+ version "2.10.1"
+ resolved "https://registry.yarnpkg.com/@formatjs/ts-transformer/-/ts-transformer-2.10.1.tgz#883d77c37a6752e3491be3ffdd705beb85cfd6f8"
+ integrity sha512-d5zpKWnk52bgA7Xf3KteiJ4r5RnDnIGUoUXD32yFiJVZRpPyUeEcuuyBS/1mxb7UDRpFB2gDqimYlqhjeURozA==
dependencies:
- intl-messageformat-parser "^6.0.5"
+ intl-messageformat-parser "^6.0.7"
typescript "^4.0"
"@next/react-dev-overlay@9.5.3":
@@ -1185,15 +1185,15 @@
resolved "https://registry.yarnpkg.com/@panva/asn1.js/-/asn1.js-1.0.0.tgz#dd55ae7b8129e02049f009408b97c61ccf9032f6"
integrity sha512-UdkG3mLEqXgnlKsWanWcgb6dOjUzJ+XC5f+aWw30qrtjxeNUSfKX1cd5FBzOaXQumoe9nIqeZUvrRJS03HCCtw==
-"@prisma/cli@2.6.2":
- version "2.6.2"
- resolved "https://registry.yarnpkg.com/@prisma/cli/-/cli-2.6.2.tgz#52fb447f702f159c9a218f720b0b809581815a0b"
- integrity sha512-aDzA1kWwmfyt1FeTzayZ6fDc9uXRo+gt+KFsR9bNqHtdge2aZLA9N/ft9+1627HOADIQgfTFw41K0GOMBJQ48w==
+"@prisma/cli@2.7.1":
+ version "2.7.1"
+ resolved "https://registry.yarnpkg.com/@prisma/cli/-/cli-2.7.1.tgz#98f2cb434bb931341e6c6292c7bab601e5f842f8"
+ integrity sha512-0uA+gWkNQ35DveVHDPltiTCTr4wcXtEhnPs463IEM+Xn8dTv9x0gtZiYHSuQM3t7uwlOxj1rurBsqSbiljynfQ==
-"@prisma/client@2.6.2":
- version "2.6.2"
- resolved "https://registry.yarnpkg.com/@prisma/client/-/client-2.6.2.tgz#842c8640a0cd5b7542522ac0645f7c8c9bd87254"
- integrity sha512-SYbW6+Lcd/OcY6p9vjI845ERl77Z+rOcB0zh6RKQdxr8R6yZHc7aDUnjcp8fZr245HnLLRnCpfkAfqQ3lvLP8g==
+"@prisma/client@2.7.1":
+ version "2.7.1"
+ resolved "https://registry.yarnpkg.com/@prisma/client/-/client-2.7.1.tgz#0a37ddff7fe80ae3a86dfa620c1141c8607be6c2"
+ integrity sha512-IEWDCuvIaQTira8/jAyf+uY+AuPPUFDIXMSN4zEA/gvoJv2woq7RmkaubS+NQVgDbbyOR6F3UcXLiFTYQDzZkQ==
dependencies:
pkg-up "^3.1.0"
@@ -1390,9 +1390,9 @@
"@babel/types" "^7.0.0"
"@types/babel__traverse@*":
- version "7.0.13"
- resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.13.tgz#1874914be974a492e1b4cb00585cabb274e8ba18"
- integrity sha512-i+zS7t6/s9cdQvbqKDARrcbrPvtJGlbYsMkazo03nTAK3RX9FNrLllXys22uiTGJapPOTZTQ35nHh4ISph4SLQ==
+ version "7.0.14"
+ resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.14.tgz#e99da8c075d4fb098c774ba65dabf7dc9954bd13"
+ integrity sha512-8w9szzKs14ZtBVuP6Wn7nMLRJ0D6dfB0VEBEyRgxrZ/Ln49aNMykrghM2FaNn4FJRzNppCSa0Rv9pBRM5Xc3wg==
dependencies:
"@babel/types" "^7.3.0"
@@ -1425,6 +1425,14 @@
dependencies:
"@types/node" "*"
+"@types/glob@^7.1.1":
+ version "7.1.3"
+ resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
+ integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==
+ dependencies:
+ "@types/minimatch" "*"
+ "@types/node" "*"
+
"@types/hoist-non-react-statics@^3.3.1":
version "3.3.1"
resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f"
@@ -1455,15 +1463,20 @@
dependencies:
loud-rejection "*"
+"@types/minimatch@*":
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+ integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
+
"@types/minimist@^1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6"
integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
"@types/node@*", "@types/node@14":
- version "14.6.4"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-14.6.4.tgz#a145cc0bb14ef9c4777361b7bbafa5cf8e3acb5a"
- integrity sha512-Wk7nG1JSaMfMpoMJDKUsWYugliB2Vy55pdjLpmLixeyMi7HizW2I/9QoxsPCkXl3dO+ZOVqPumKaDUv5zJu2uQ==
+ version "14.11.2"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.11.2.tgz#2de1ed6670439387da1c9f549a2ade2b0a799256"
+ integrity sha512-jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA==
"@types/normalize-package-data@^2.4.0":
version "2.4.0"
@@ -1733,9 +1746,9 @@ acorn-dynamic-import@^4.0.0:
integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
acorn-jsx@^5.2.0:
- version "5.2.0"
- resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe"
- integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==
+ version "5.3.1"
+ resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
+ integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
acorn@^6.4.1:
version "6.4.1"
@@ -1784,9 +1797,9 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.12.4:
- version "6.12.4"
- resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234"
- integrity sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==
+ version "6.12.5"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz#19b0e8bae8f476e5ba666300387775fb1a00a4da"
+ integrity sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==
dependencies:
fast-deep-equal "^3.1.1"
fast-json-stable-stringify "^2.0.0"
@@ -2252,14 +2265,14 @@ browserslist@4.13.0:
node-releases "^1.1.58"
browserslist@^4.12.0, browserslist@^4.6.4, browserslist@^4.8.5:
- version "4.14.0"
- resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.0.tgz#2908951abfe4ec98737b72f34c3bcedc8d43b000"
- integrity sha512-pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ==
+ version "4.14.3"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.3.tgz#381f9e7f13794b2eb17e1761b4f118e8ae665a53"
+ integrity sha512-GcZPC5+YqyPO4SFnz48/B0YaCwS47Q9iPChRGi6t7HhflKBcINzFrJvRfC+jp30sRMKxF+d4EHGs27Z0XP1NaQ==
dependencies:
- caniuse-lite "^1.0.30001111"
- electron-to-chromium "^1.3.523"
- escalade "^3.0.2"
- node-releases "^1.1.60"
+ caniuse-lite "^1.0.30001131"
+ electron-to-chromium "^1.3.570"
+ escalade "^3.1.0"
+ node-releases "^1.1.61"
buble@^0.20.0:
version "0.20.0"
@@ -2400,10 +2413,10 @@ camelcase@^6.0.0:
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.0.0.tgz#5259f7c30e35e278f1bdc2a4d91230b37cad981e"
integrity sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==
-caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001093, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001111, caniuse-lite@^1.0.30001113:
- version "1.0.30001124"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001124.tgz#5d9998190258e11630d674fc50ea8e579ae0ced2"
- integrity sha512-zQW8V3CdND7GHRH6rxm6s59Ww4g/qGWTheoboW9nfeMg7sUoopIfKCcNZUjwYRCOrvereh3kwDpZj4VLQ7zGtA==
+caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001093, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001113, caniuse-lite@^1.0.30001131:
+ version "1.0.30001133"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001133.tgz#ec564c5495311299eb05245e252d589a84acd95e"
+ integrity sha512-s3XAUFaC/ntDb1O3lcw9K8MPeOW7KO3z9+GzAoBxfz1B0VdacXPMKgFUtG4KIsgmnbexmi013s9miVu4h+qMHw==
ccount@^1.0.0:
version "1.0.5"
@@ -2686,12 +2699,12 @@ commander@2, commander@^2.20.0:
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-commander@5.1.0:
- version "5.1.0"
- resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
- integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
+commander@2.20.0:
+ version "2.20.0"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
+ integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
-commander@^6.0.0:
+commander@^6.0.0, commander@^6.1.0:
version "6.1.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-6.1.0.tgz#f8d722b78103141006b66f4c7ba1e97315ba75bc"
integrity sha512-wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA==
@@ -3175,11 +3188,11 @@ date-fns@^2.16.1:
integrity sha512-sAJVKx/FqrLYHAQeN7VpJrPhagZc9R4ImZIWYRFZaaohR3KzmuK88touwsSwSVT8Qcbd4zoDsnGfX4GFB4imyQ==
debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
- integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1"
+ integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==
dependencies:
- ms "^2.1.1"
+ ms "2.1.2"
debug@^2.2.0, debug@^2.3.3:
version "2.6.9"
@@ -3238,7 +3251,7 @@ deepmerge@^4.2.2:
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
-define-properties@^1.1.2, define-properties@^1.1.3:
+define-properties@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
@@ -3267,6 +3280,20 @@ define-property@^2.0.2:
is-descriptor "^1.0.2"
isobject "^3.0.1"
+del@^5.1.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/del/-/del-5.1.0.tgz#d9487c94e367410e6eff2925ee58c0c84a75b3a7"
+ integrity sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==
+ dependencies:
+ globby "^10.0.1"
+ graceful-fs "^4.2.2"
+ is-glob "^4.0.1"
+ is-path-cwd "^2.2.0"
+ is-path-inside "^3.0.1"
+ p-map "^3.0.0"
+ rimraf "^3.0.0"
+ slash "^3.0.0"
+
delegates@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
@@ -3338,7 +3365,7 @@ dom-serializer@0, dom-serializer@^0.2.1:
domelementtype "^2.0.1"
entities "^2.0.0"
-dom-serializer@1.0.1, dom-serializer@^1.0.1:
+dom-serializer@1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.0.1.tgz#79695eb49af3cd8abc8d93a73da382deb1ca0795"
integrity sha512-1Aj1Qy3YLbdslkI75QEOfdp9TkQ3o8LRISAzxOibjBs/xWwr1WxZFOQphFkZuepHFGo+kB8e5FVJSS0faAJ4Rw==
@@ -3347,6 +3374,15 @@ dom-serializer@1.0.1, dom-serializer@^1.0.1:
domhandler "^3.0.0"
entities "^2.0.0"
+dom-serializer@^1.0.1:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.1.0.tgz#5f7c828f1bfc44887dc2a315ab5c45691d544b58"
+ integrity sha512-ox7bvGXt2n+uLWtCRLybYx60IrOlWL/aCebWJk1T0d4m3y2tzf4U3ij9wBMUb6YJZpz06HCCYuyCDveE2xXmzQ==
+ dependencies:
+ domelementtype "^2.0.1"
+ domhandler "^3.0.0"
+ entities "^2.0.0"
+
domain-browser@^1.1.1:
version "1.2.0"
resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
@@ -3358,9 +3394,9 @@ domelementtype@1, domelementtype@^1.3.1:
integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
domelementtype@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz#1f8bdfe91f5a78063274e803b4bdcedf6e94f94d"
- integrity sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.2.tgz#f3b6e549201e46f588b59463dd77187131fe6971"
+ integrity sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==
domhandler@3.0.0, domhandler@^3.0.0:
version "3.0.0"
@@ -3394,18 +3430,18 @@ domutils@^1.5.1, domutils@^1.7.0:
domelementtype "1"
domutils@^2.0.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.2.0.tgz#f3ce1610af5c30280bde1b71f84b018b958f32cf"
- integrity sha512-0haAxVr1PR0SqYwCH7mxMpHZUwjih9oPPedqpR/KufsnxPyZ9dyVw1R5093qnJF3WXSbjBkdzRWLw/knJV/fAg==
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.3.0.tgz#6469c63a3da2de0c3016f3a59e6a969e10705bce"
+ integrity sha512-xWC75PM3QF6MjE5e58OzwTX0B/rPQnlqH0YyXB/c056RtVJA+eu60da2I/bdnEHzEYC00g8QaZUlAbqOZVbOsw==
dependencies:
dom-serializer "^1.0.1"
domelementtype "^2.0.1"
domhandler "^3.0.0"
-dotenv-cli@^3.2.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/dotenv-cli/-/dotenv-cli-3.2.0.tgz#002367c30992acb0b218b20fc01a8e18f13f85cf"
- integrity sha512-zg/dfXISo7ntL3JKC+oj7eXEMg8LbOsARWTeypfVsmYtazDYOptmKLqA9u3LTee9x/sIPiLqmI6wskRP+89ohQ==
+dotenv-cli@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/dotenv-cli/-/dotenv-cli-4.0.0.tgz#3cdd68b87ccd63c78dbfa72aab2f639bbeba5f4b"
+ integrity sha512-ByKEec+ashePEXthZaA1fif9XDtcaRnkN7eGdBDx3HHRjwZ/rA1go83Cbs4yRrx3JshsCf96FjAyIA2M672+CQ==
dependencies:
cross-spawn "^7.0.1"
dotenv "^8.1.0"
@@ -3432,10 +3468,10 @@ duplexify@^3.4.2, duplexify@^3.6.0:
readable-stream "^2.0.0"
stream-shift "^1.0.0"
-electron-to-chromium@^1.3.488, electron-to-chromium@^1.3.523:
- version "1.3.562"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.562.tgz#79c20277ee1c8d0173a22af00e38433b752bc70f"
- integrity sha512-WhRe6liQ2q/w1MZc8mD8INkenHivuHdrr4r5EQHNomy3NJux+incP6M6lDMd0paShP3MD0WGe5R1TWmEClf+Bg==
+electron-to-chromium@^1.3.488, electron-to-chromium@^1.3.570:
+ version "1.3.570"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.570.tgz#3f5141cc39b4e3892a276b4889980dabf1d29c7f"
+ integrity sha512-Y6OCoVQgFQBP5py6A/06+yWxUZHDlNr/gNDGatjH8AZqXl8X0tE4LfjLJsXGz/JmWJz8a6K7bR1k+QzZ+k//fg==
elliptic@^6.5.3:
version "6.5.3"
@@ -3587,10 +3623,10 @@ es6-symbol@^3.1.1, es6-symbol@~3.1.3:
d "^1.0.1"
ext "^1.1.2"
-escalade@^3.0.1, escalade@^3.0.2:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.0.2.tgz#6a580d70edb87880f22b4c91d0d56078df6962c4"
- integrity sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==
+escalade@^3.0.1, escalade@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.0.tgz#e8e2d7c7a8b76f6ee64c2181d6b8151441602d4e"
+ integrity sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig==
escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
version "1.0.5"
@@ -3611,10 +3647,10 @@ eslint-plugin-prettier@^3.1.3:
dependencies:
prettier-linter-helpers "^1.0.0"
-eslint-plugin-react-hooks@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.1.0.tgz#6323fbd5e650e84b2987ba76370523a60f4e7925"
- integrity sha512-36zilUcDwDReiORXmcmTc6rRumu9JIM3WjSvV0nclHoUQ0CNrX866EwONvLR/UqaeqFutbAnVu8PEmctdo2SRQ==
+eslint-plugin-react-hooks@^4.1.2:
+ version "4.1.2"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.1.2.tgz#2eb53731d11c95826ef7a7272303eabb5c9a271e"
+ integrity sha512-ykUeqkGyUGgwTtk78C0o8UG2fzwmgJ0qxBGPp2WqRKsTwcLuVf01kTDRAtOsd4u6whX2XOC8749n2vPydP82fg==
eslint-plugin-react@^7.20.6:
version "7.20.6"
@@ -3642,11 +3678,11 @@ eslint-scope@^4.0.3:
estraverse "^4.1.1"
eslint-scope@^5.0.0, eslint-scope@^5.1.0:
- version "5.1.0"
- resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5"
- integrity sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+ integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
dependencies:
- esrecurse "^4.1.0"
+ esrecurse "^4.3.0"
estraverse "^4.1.1"
eslint-utils@^1.4.3:
@@ -3711,10 +3747,10 @@ eslint@^6.8.0:
text-table "^0.2.0"
v8-compile-cache "^2.0.3"
-eslint@^7.8.1:
- version "7.8.1"
- resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.8.1.tgz#e59de3573fb6a5be8ff526c791571646d124a8fa"
- integrity sha512-/2rX2pfhyUG0y+A123d0ccXtMm7DV7sH1m3lk9nk2DZ2LReq39FXHueR9xZwshE5MdfSf0xunSaMWRqyIA6M1w==
+eslint@^7.9.0:
+ version "7.9.0"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.9.0.tgz#522aeccc5c3a19017cf0cb46ebfd660a79acf337"
+ integrity sha512-V6QyhX21+uXp4T+3nrNfI3hQNBDa/P8ga7LoQOenwrlEFXrEnUEE+ok1dMtaS3b6rmLXhT1TkTIsG75HMLbknA==
dependencies:
"@babel/code-frame" "^7.0.0"
"@eslint/eslintrc" "^0.1.3"
@@ -3784,7 +3820,7 @@ esquery@^1.0.1, esquery@^1.2.0:
dependencies:
estraverse "^5.1.0"
-esrecurse@^4.1.0:
+esrecurse@^4.1.0, esrecurse@^4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
@@ -3945,7 +3981,7 @@ fast-diff@^1.1.2:
resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
-fast-glob@^3.1.1, fast-glob@^3.2.4:
+fast-glob@^3.0.3, fast-glob@^3.1.1, fast-glob@^3.2.4:
version "3.2.4"
resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3"
integrity sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==
@@ -4319,6 +4355,20 @@ globals@^12.1.0:
dependencies:
type-fest "^0.8.1"
+globby@^10.0.1:
+ version "10.0.2"
+ resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543"
+ integrity sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==
+ dependencies:
+ "@types/glob" "^7.1.1"
+ array-union "^2.1.0"
+ dir-glob "^3.0.1"
+ fast-glob "^3.0.3"
+ glob "^7.1.3"
+ ignore "^5.1.1"
+ merge2 "^1.2.3"
+ slash "^3.0.0"
+
globby@^11.0.1:
version "11.0.1"
resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357"
@@ -4370,7 +4420,7 @@ has-flag@^4.0.0:
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-has-symbols@^1.0.0, has-symbols@^1.0.1:
+has-symbols@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
@@ -4506,15 +4556,15 @@ human-signals@^1.1.1:
resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
-husky@^4.2.5:
- version "4.2.5"
- resolved "https://registry.yarnpkg.com/husky/-/husky-4.2.5.tgz#2b4f7622673a71579f901d9885ed448394b5fa36"
- integrity sha512-SYZ95AjKcX7goYVZtVZF2i6XiZcHknw50iXvY7b0MiGoj5RwdgRQNEHdb+gPDPCXKlzwrybjFjkL6FOj8uRhZQ==
+husky@^4.3.0:
+ version "4.3.0"
+ resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.0.tgz#0b2ec1d66424e9219d359e26a51c58ec5278f0de"
+ integrity sha512-tTMeLCLqSBqnflBZnlVDhpaIMucSGaYyX6855jM4AguGeWCeSzNdb1mfyWduTZ3pe3SJVvVWGL0jO1iKZVPfTA==
dependencies:
chalk "^4.0.0"
ci-info "^2.0.0"
compare-versions "^3.6.0"
- cosmiconfig "^6.0.0"
+ cosmiconfig "^7.0.0"
find-versions "^3.2.0"
opencollective-postinstall "^2.0.2"
pkg-dir "^4.2.0"
@@ -4558,15 +4608,15 @@ ignore@^4.0.6:
resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-ignore@^5.1.4, ignore@^5.1.8:
+ignore@^5.1.1, ignore@^5.1.4, ignore@^5.1.8:
version "5.1.8"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
-immer@^7.0.3, immer@^7.0.8:
- version "7.0.8"
- resolved "https://registry.yarnpkg.com/immer/-/immer-7.0.8.tgz#41dcbc5669a76500d017bef3ad0d03ce0a1d7c1e"
- integrity sha512-XnpIN8PXBBaOD43U8Z17qg6RQiKQYGDGGCIbz1ixmLGwBkSWwmrmx5X7d+hTtXDM8ur7m5OdLE0PiO+y5RB3pw==
+immer@^7.0.3, immer@^7.0.9:
+ version "7.0.9"
+ resolved "https://registry.yarnpkg.com/immer/-/immer-7.0.9.tgz#28e7552c21d39dd76feccd2b800b7bc86ee4a62e"
+ integrity sha512-Vs/gxoM4DqNAYR7pugIxi0Xc8XAun/uy7AQu4fLLqaTBHxjOP9pJ266Q9MWA/ly4z6rAFZbvViOtihxUZ7O28A==
import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
version "3.2.1"
@@ -4664,20 +4714,20 @@ intl-messageformat-parser@^5.3.7:
dependencies:
"@formatjs/intl-numberformat" "^5.5.2"
-intl-messageformat-parser@^6.0.5:
- version "6.0.5"
- resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-6.0.5.tgz#098b052ac2714101b4da06fd45d68199d3abd131"
- integrity sha512-4aO/RTUtzWiV/naqif4ubwz8P7THOxhraN6XmQpgXj4mdGjtPNO2j3vKlEDgAvv4BEi12R/JCHfLf7SUyfPKog==
+intl-messageformat-parser@^6.0.7:
+ version "6.0.7"
+ resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-6.0.7.tgz#de57a03466e1441b7cbfd99a02ace108745ef133"
+ integrity sha512-3T/S9OPqBR2PibpfX/Go+sjaQrHf7p37/eOikvR+M4uaxdJT+Yi3u+ayKURA8fvOmmfkimDSYIRrkoRoHIezfA==
dependencies:
- "@formatjs/ecma402-abstract" "^1.2.0"
+ "@formatjs/ecma402-abstract" "^1.2.2"
-intl-messageformat@^9.3.6:
- version "9.3.6"
- resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-9.3.6.tgz#6b15bca5ebbd81808cf703423c34fb789cf1da8e"
- integrity sha512-ZmaPVtB1i0Ao64sI+kCl+uAqlHGn1KyHHPYw2W/cd4q00ACDBpdeqeD3y4tQnMXMGZriwbSn90dJ+bvSkQr1dA==
+intl-messageformat@^9.3.8:
+ version "9.3.8"
+ resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-9.3.8.tgz#561f31800cc3ced5dada6c991a0dd0233931850f"
+ integrity sha512-XuFoC6kvsgL1qtzro9ubOaJ2zVgeJWb5X0mTYvG7p1OinbOZYPscP8eYyVJf9g++tDy/fwx9TfeaFlunmhC+Vw==
dependencies:
fast-memoize "^2.5.2"
- intl-messageformat-parser "^6.0.5"
+ intl-messageformat-parser "^6.0.7"
invariant@^2.2.2, invariant@^2.2.4:
version "2.2.4"
@@ -4748,9 +4798,9 @@ is-buffer@^2.0.0:
integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
is-callable@^1.1.4, is-callable@^1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb"
- integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
+ integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==
is-data-descriptor@^0.1.4:
version "0.1.4"
@@ -4879,6 +4929,16 @@ is-obj@^1.0.1:
resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
+is-path-cwd@^2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
+ integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
+
+is-path-inside@^3.0.1:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz#f5220fc82a3e233757291dddc9c5877f2a1f3017"
+ integrity sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==
+
is-plain-obj@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
@@ -5004,10 +5064,10 @@ jest-worker@^26.2.1:
merge-stream "^2.0.0"
supports-color "^7.0.0"
-jose@^1.28.0:
- version "1.28.0"
- resolved "https://registry.yarnpkg.com/jose/-/jose-1.28.0.tgz#0803f8c71f43cd293a9d931c555c30531f5ca5dc"
- integrity sha512-JmfDRzt/HSj8ipd9TsDtEHoLUnLYavG+7e8F6s1mx2jfVSfXOTaFQsJUydbjJpTnTDHP1+yKL9Ke7ktS/a0Eiw==
+jose@^2.0.2:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/jose/-/jose-2.0.2.tgz#fb22385b80c658cc7a0cae05b7086c04c6be49f4"
+ integrity sha512-yD93lsiMA1go/qxSY/vXWBodmIZJIxeB7QhFi8z1yQ3KUwKENqI9UA8VCHlQ5h3x1zWuWZjoY87ByQzkQbIrQg==
dependencies:
"@panva/asn1.js" "^1.0.0"
@@ -5176,10 +5236,10 @@ lines-and-columns@^1.1.6:
resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
-lint-staged@^10.3.0:
- version "10.3.0"
- resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.3.0.tgz#388c3d440590c45c339e7163f669ea69ae90b1e0"
- integrity sha512-an3VgjHqmJk0TORB/sdQl0CTkRg4E5ybYCXTTCSJ5h9jFwZbcgKIx5oVma5e7wp/uKt17s1QYFmYqT9MGVosGw==
+lint-staged@^10.4.0:
+ version "10.4.0"
+ resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.4.0.tgz#d18628f737328e0bbbf87d183f4020930e9a984e"
+ integrity sha512-uaiX4U5yERUSiIEQc329vhCTDDwUcSvKdRLsNomkYLRzijk3v8V9GWm2Nz0RMVB87VcuzLvtgy6OsjoH++QHIg==
dependencies:
chalk "^4.1.0"
cli-truncate "^2.1.0"
@@ -5567,7 +5627,7 @@ merge-stream@^2.0.0:
resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
-merge2@^1.3.0:
+merge2@^1.2.3, merge2@^1.3.0:
version "1.4.1"
resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
@@ -5758,9 +5818,9 @@ moment-timezone@^0.5.31:
moment ">= 2.9.0"
"moment@>= 2.9.0", moment@^2.10.2:
- version "2.27.0"
- resolved "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d"
- integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==
+ version "2.28.0"
+ resolved "https://registry.yarnpkg.com/moment/-/moment-2.28.0.tgz#cdfe73ce01327cee6537b0fafac2e0f21a237d75"
+ integrity sha512-Z5KOjYmnHyd/ukynmFd/WwyXHd7L4J9vTI/nn5Ap9AVUgaAE15VvQ9MOGmJJygEUklupqIrFnor/tjTwRU+tQw==
move-concurrently@^1.0.1:
version "1.0.1"
@@ -5779,7 +5839,7 @@ ms@2.0.0:
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-ms@^2.1.1:
+ms@2.1.2, ms@^2.1.1:
version "2.1.2"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
@@ -5918,9 +5978,9 @@ nice-try@^1.0.4:
integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
node-addon-api@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.0.0.tgz#812446a1001a54f71663bed188314bba07e09247"
- integrity sha512-sSHCgWfJ+Lui/u+0msF3oyCgvdkhxDbkCS6Q8uiJquzOimkJBvX6hl5aSSA7DR1XbMpdM8r7phjcF63sF4rkKg==
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.0.2.tgz#04bc7b83fd845ba785bb6eae25bc857e1ef75681"
+ integrity sha512-+D4s2HCnxPd5PjjI0STKwncjXTUKKqm74MDMz9OPXavjsGmjkvwgLtA5yoxJUdmpj52+2u+RrXgPipahKczMKg==
node-fetch@2.6.0:
version "2.6.0"
@@ -5979,10 +6039,10 @@ node-pre-gyp@0.15.0:
semver "^5.3.0"
tar "^4.4.2"
-node-releases@^1.1.58, node-releases@^1.1.60:
- version "1.1.60"
- resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.60.tgz#6948bdfce8286f0b5d0e5a88e8384e954dfe7084"
- integrity sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA==
+node-releases@^1.1.58, node-releases@^1.1.61:
+ version "1.1.61"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.61.tgz#707b0fca9ce4e11783612ba4a2fcba09047af16e"
+ integrity sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==
nopt@^4.0.1:
version "4.0.3"
@@ -6118,7 +6178,7 @@ object-inspect@^1.7.0, object-inspect@^1.8.0:
resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
-object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
+object-keys@^1.0.12, object-keys@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -6136,14 +6196,14 @@ object-visit@^1.0.0:
isobject "^3.0.0"
object.assign@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
- integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz#303867a666cdd41936ecdedfb1f8f3e32a478cdd"
+ integrity sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==
dependencies:
- define-properties "^1.1.2"
- function-bind "^1.1.1"
- has-symbols "^1.0.0"
- object-keys "^1.0.11"
+ define-properties "^1.1.3"
+ es-abstract "^1.18.0-next.0"
+ has-symbols "^1.0.1"
+ object-keys "^1.1.1"
object.entries@^1.1.2:
version "1.1.2"
@@ -6878,13 +6938,14 @@ postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4:
uniq "^1.0.1"
postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2:
- version "6.0.2"
- resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c"
- integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==
+ version "6.0.3"
+ resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.3.tgz#766d77728728817cc140fa1ac6da5e77f9fada98"
+ integrity sha512-0ClFaY4X1ra21LRqbW6y3rUbWcxnSVkDFG57R7Nxus9J9myPFlv+jYDMohzpkBx0RrjjiqjtycpchQ+PLGmZ9w==
dependencies:
cssesc "^3.0.0"
indexes-of "^1.0.1"
uniq "^1.0.1"
+ util-deprecate "^1.0.2"
postcss-syntax@^0.36.2:
version "0.36.2"
@@ -6919,7 +6980,7 @@ postcss@7.0.21:
source-map "^0.6.1"
supports-color "^6.1.0"
-postcss@7.0.32, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
+postcss@7.0.32:
version "7.0.32"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
@@ -6928,6 +6989,15 @@ postcss@7.0.32, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2
source-map "^0.6.1"
supports-color "^6.1.0"
+postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
+ version "7.0.34"
+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.34.tgz#f2baf57c36010df7de4009940f21532c16d65c20"
+ integrity sha512-H/7V2VeNScX9KE83GDrDZNiGT1m2H+UTnlinIzhjlLX9hfMUn1mHNnGeX81a1c8JSBdBvqk7c2ZOG6ZPn5itGw==
+ dependencies:
+ chalk "^2.4.2"
+ source-map "^0.6.1"
+ supports-color "^6.1.0"
+
prelude-ls@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@@ -6963,10 +7033,10 @@ prettier-linter-helpers@^1.0.0:
dependencies:
fast-diff "^1.1.2"
-prettier@^2.0.0, prettier@^2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.1.tgz#d9485dd5e499daa6cb547023b87a6cf51bee37d6"
- integrity sha512-9bY+5ZWCfqj3ghYBLxApy2zf6m+NJo5GzmLTpr9FsApsfjriNnS2dahWReHMi7qNPhhHl9SYHJs2cHZLgexNIw==
+prettier@^2.0.0, prettier@^2.1.2:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.2.tgz#3050700dae2e4c8b67c4c3f666cdb8af405e1ce5"
+ integrity sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==
pretty-format@^23.0.1:
version "23.6.0"
@@ -6996,11 +7066,6 @@ promise-inflight@^1.0.1:
resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
-promise-polyfill@^8.1.3:
- version "8.1.3"
- resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-8.1.3.tgz#8c99b3cf53f3a91c68226ffde7bde81d7f904116"
- integrity sha512-MG5r82wBzh7pSKDRa9y+vllNHz3e3d4CNj1PQE4BQYxLme0gKYYBm9YENq+UkEikyZ0XbiGWxYlVw3Rl9O/U8g==
-
prop-types@15.7.2, prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2:
version "15.7.2"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
@@ -7127,21 +7192,21 @@ react-fast-compare@^2.0.1:
resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-2.0.4.tgz#e84b4d455b0fec113e0402c329352715196f81f9"
integrity sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==
-react-intl@^5.8.0:
- version "5.8.0"
- resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-5.8.0.tgz#4d365ee992b35cdb81576abd2fb06e4d78a8e461"
- integrity sha512-03FHg9u9gW+fc9zyVQS0WwZc3AkIzwRVE73O6FJx10ZCJ5XDDHWzgNCK6H65rX0Hq9+Hw9m7IJiU6YIvV3xLFw==
+react-intl@^5.8.2:
+ version "5.8.2"
+ resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-5.8.2.tgz#6be0f31a6438bf12989f7c8f7f4b5610f36e862f"
+ integrity sha512-WiZqh4xTSmc+HlCzJ1b0imIPr7OFx0g7kl6RGAazb7WCtUNhsdX5jBmwk5CplwVPXiBCdytuKmyfX4XTrrvA9A==
dependencies:
- "@formatjs/ecma402-abstract" "^1.2.0"
- "@formatjs/intl" "^1.3.0"
- "@formatjs/intl-displaynames" "^3.3.6"
- "@formatjs/intl-listformat" "^4.2.5"
- "@formatjs/intl-relativetimeformat" "^7.2.5"
+ "@formatjs/ecma402-abstract" "^1.2.2"
+ "@formatjs/intl" "^1.3.2"
+ "@formatjs/intl-displaynames" "^3.3.8"
+ "@formatjs/intl-listformat" "^4.2.7"
+ "@formatjs/intl-relativetimeformat" "^7.2.7"
"@types/hoist-non-react-statics" "^3.3.1"
fast-memoize "^2.5.2"
hoist-non-react-statics "^3.3.2"
- intl-messageformat "^9.3.6"
- intl-messageformat-parser "^6.0.5"
+ intl-messageformat "^9.3.8"
+ intl-messageformat-parser "^6.0.7"
shallow-equal "^1.2.1"
react-is@16.13.1, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.9.0:
@@ -7183,10 +7248,10 @@ react-spring@^8.0.27:
"@babel/runtime" "^7.3.1"
prop-types "^15.5.8"
-react-tooltip@^4.2.9:
- version "4.2.9"
- resolved "https://registry.yarnpkg.com/react-tooltip/-/react-tooltip-4.2.9.tgz#0dd08d14191f5d0e56b51c822fa20c2d81a24272"
- integrity sha512-DgZyg5oxk9/orgePDLLeuDtlwwYv7CalJRahk9nNsoEJDzIO58GC6zSAet4bKTm6c01hg1z3EocP9H0nmMHTMA==
+react-tooltip@^4.2.10:
+ version "4.2.10"
+ resolved "https://registry.yarnpkg.com/react-tooltip/-/react-tooltip-4.2.10.tgz#ed1a1acd388940c96f4b6309f4fd4dcce5e01bdc"
+ integrity sha512-D7ZLx6/QwpUl0SZRek3IZy/HWpsEEp0v3562tcT8IwZgu8IgV7hY5ZzniTkHyRcuL+IQnljpjj7A7zCgl2+T3w==
dependencies:
prop-types "^15.7.2"
uuid "^7.0.3"
@@ -7378,9 +7443,9 @@ regexpu-core@4.5.4:
unicode-match-property-value-ecmascript "^1.1.0"
regexpu-core@^4.7.0:
- version "4.7.0"
- resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938"
- integrity sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==
+ version "4.7.1"
+ resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
+ integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==
dependencies:
regenerate "^1.4.0"
regenerate-unicode-properties "^8.2.0"
@@ -7572,7 +7637,7 @@ rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3, rimraf@^2.7.1:
dependencies:
glob "^7.1.3"
-rimraf@^3.0.2:
+rimraf@^3.0.0, rimraf@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -7594,20 +7659,20 @@ rollup-plugin-hashbang@^2.2.2:
dependencies:
magic-string "^0.22.4"
-rollup-plugin-terser@^7.0.1:
- version "7.0.1"
- resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.1.tgz#df72d8272e03fcb504a76f414b9509c63c5eaf54"
- integrity sha512-HL0dgzSxBYG/Ly9i/E5Sc+PuKKZ0zBzk11VmLCfdUtpqH4yYqkLclPkTqRy85FU9246yetImOClaQ/ufnj08vg==
+rollup-plugin-terser@^7.0.2:
+ version "7.0.2"
+ resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d"
+ integrity sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==
dependencies:
"@babel/code-frame" "^7.10.4"
jest-worker "^26.2.1"
serialize-javascript "^4.0.0"
terser "^5.0.0"
-rollup@^2.26.10:
- version "2.26.10"
- resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.26.10.tgz#0ffe0390d35f07af850382f22f1b8525c7f57f07"
- integrity sha512-dUnjCWOA0h9qNX6qtcHidyatz8FAFZxVxt1dbcGtKdlJkpSxGK3G9+DLCYvtZr9v94D129ij9zUhG+xbRoqepw==
+rollup@^2.28.1:
+ version "2.28.1"
+ resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.28.1.tgz#ceedca3cdb013c2fa8f22f958a29c203368159ea"
+ integrity sha512-DOtVoqOZt3+FjPJWLU8hDIvBjUylc9s6IZvy76XklxzcLvAQLtVAG/bbhsMhcWnYxC0TKKcf1QQ/tg29zeID0Q==
optionalDependencies:
fsevents "~2.1.2"
@@ -7629,9 +7694,9 @@ run-queue@^1.0.0, run-queue@^1.0.3:
aproba "^1.1.1"
rxjs@^6.6.0, rxjs@^6.6.2:
- version "6.6.2"
- resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.2.tgz#8096a7ac03f2cc4fe5860ef6e572810d9e01c0d2"
- integrity sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==
+ version "6.6.3"
+ resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552"
+ integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==
dependencies:
tslib "^1.9.0"
@@ -7991,9 +8056,9 @@ spdx-expression-parse@^3.0.0:
spdx-license-ids "^3.0.0"
spdx-license-ids@^3.0.0:
- version "3.0.5"
- resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
- integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==
+ version "3.0.6"
+ resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz#c80757383c28abf7296744998cbc106ae8b854ce"
+ integrity sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==
specificity@^0.4.1:
version "0.4.1"
@@ -8309,10 +8374,10 @@ stylelint-config-recommended@^3.0.0:
resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-3.0.0.tgz#e0e547434016c5539fe2650afd58049a2fd1d657"
integrity sha512-F6yTRuc06xr1h5Qw/ykb2LuFynJ2IxkKfCMf+1xqPffkxh0S09Zc902XCffcsw/XMFq/OzQ1w54fLIDtmRNHnQ==
-stylelint@^13.7.0:
- version "13.7.0"
- resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-13.7.0.tgz#8d7a4233063b2f06e9f28b3405ff189e334547b5"
- integrity sha512-1wStd4zVetnlHO98VjcHQbjSDmvcA39smkZQMct2cf+hom40H0xlQNdzzbswoG/jGBh61/Ue9m7Lu99PY51O6A==
+stylelint@^13.7.1:
+ version "13.7.1"
+ resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-13.7.1.tgz#bee97ee78d778a3f1dbe3f7397b76414973e263e"
+ integrity sha512-qzqazcyRxrSRdmFuO0/SZOJ+LyCxYy0pwcvaOBBnl8/2VfHSMrtNIE+AnyJoyq6uKb+mt+hlgmVrvVi6G6XHfQ==
dependencies:
"@stylelint/postcss-css-in-js" "^0.37.2"
"@stylelint/postcss-markdown" "^0.36.1"
@@ -8515,9 +8580,9 @@ terser@4.8.0, terser@^4.1.2:
source-map-support "~0.5.12"
terser@^5.0.0:
- version "5.3.0"
- resolved "https://registry.yarnpkg.com/terser/-/terser-5.3.0.tgz#c481f4afecdcc182d5e2bdd2ff2dc61555161e81"
- integrity sha512-XTT3D3AwxC54KywJijmY2mxZ8nJiEjBHVYzq8l9OaYuRFWeQNBwvipuzzYEP4e+/AVcd1hqG/CqgsdIRyT45Fg==
+ version "5.3.2"
+ resolved "https://registry.yarnpkg.com/terser/-/terser-5.3.2.tgz#f4bea90eb92945b2a028ceef79181b9bb586e7af"
+ integrity sha512-H67sydwBz5jCUA32ZRL319ULu+Su1cAoZnnc+lXnenGRYWyLE3Scgkt8mNoAsMx0h5kdo758zdoS0LG9rYZXDQ==
dependencies:
commander "^2.20.0"
source-map "~0.6.1"
@@ -8553,6 +8618,13 @@ timers-browserify@^2.0.4:
dependencies:
setimmediate "^1.0.4"
+timezone-support@^2.0.2:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/timezone-support/-/timezone-support-2.0.2.tgz#801d6924478b1b60f09b90699ce1127a6044cbe7"
+ integrity sha512-J/1PyHCX76vOPuJzCyHMQMH2wTjXCJ30R5EXaS/QTi+xYsL0thS0pubDrHCWnfG4zU1jpPJtctnBBRCOpcJZeQ==
+ dependencies:
+ commander "2.20.0"
+
tiny-lru@7.0.6:
version "7.0.6"
resolved "https://registry.yarnpkg.com/tiny-lru/-/tiny-lru-7.0.6.tgz#b0c3cdede1e5882aa2d1ae21cb2ceccf2a331f24"
@@ -8745,14 +8817,9 @@ typescript@^3.9.3:
integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==
typescript@^4.0:
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.2.tgz#7ea7c88777c723c681e33bf7988be5d008d05ac2"
- integrity sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ==
-
-unfetch@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.1.0.tgz#6ec2dd0de887e58a4dee83a050ded80ffc4137db"
- integrity sha512-crP/n3eAPUJxZXM9T80/yv0YhkTEx2K1D3h7D1AJM6fzsWZrxdyRuLN0JH/dkZh1LNH8LxCnBzoPFCPbb2iGpg==
+ version "4.0.3"
+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.3.tgz#153bbd468ef07725c1df9c77e8b453f8d36abba5"
+ integrity sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==
unherit@^1.0.4:
version "1.1.3"
@@ -8924,7 +8991,7 @@ use@^3.1.0:
resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
-util-deprecate@^1.0.1, util-deprecate@~1.0.1:
+util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=