From bea98702008588700c448f63c3e78c9e00bc7841 Mon Sep 17 00:00:00 2001 From: RikoDEV <18230443+RikoDEV@users.noreply.github.com> Date: Thu, 27 Oct 2022 19:01:36 +0200 Subject: [PATCH 1/5] Update pl-PL.json --- lang/pl-PL.json | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lang/pl-PL.json b/lang/pl-PL.json index 00dc9753..d5377774 100644 --- a/lang/pl-PL.json +++ b/lang/pl-PL.json @@ -1,6 +1,8 @@ { "label.accounts": "Konta", "label.add-account": "Dodaj konto", + "label.add-column": "Dodaj kolumnę", + "label.add-filter": "Dodaj filtr", "label.add-website": "Dodaj witrynę", "label.administrator": "Administrator", "label.all": "Wszystkie", @@ -25,6 +27,8 @@ "label.edit-account": "Edytuj konto", "label.edit-website": "Edytuj witrynę", "label.enable-share-url": "Włącz udostępnianie adresu URL", + "label.event-data": "Dane zdarzenia", + "label.field-name": "Nazwa pola", "label.invalid": "Nieprawidłowy", "label.invalid-domain": "Nieprawidłowa witryna", "label.language": "Język", @@ -36,7 +40,7 @@ "label.more": "Więcej", "label.name": "Nazwa", "label.new-password": "Nowe hasło", - "label.none": "None", + "label.none": "Brak", "label.owner": "Właściciel", "label.password": "Hasło", "label.passwords-dont-match": "Hasła się nie zgadzają", @@ -48,6 +52,7 @@ "label.reset": "Zresetuj", "label.reset-website": "Zresetuj statystyki", "label.save": "Zapisz", + "label.search": "Szukaj", "label.settings": "Ustawienia", "label.share-url": "Udostępnij adres URL", "label.single-day": "W tym dniu", @@ -58,16 +63,19 @@ "label.timezone": "Strefa czasowa", "label.today": "Dzisiaj", "label.tracking-code": "Kod śledzenia", + "label.type": "Typ", "label.unknown": "Nieznany", "label.username": "Nazwa użytkownika", + "label.value": "Wartość", "label.view-details": "Pokaż szczegóły", "label.websites": "Witryny", + "label.yesterday": "Wczoraj", "message.active-users": "{x} aktualnie {x, plural, one {odwiedzający} other {odwiedzających}}", "message.confirm-delete": "Czy na pewno chcesz usunąć {target}?", "message.confirm-reset": "Czy na pewno chcesz zresetować statystyki {target}?", "message.copied": "Skopiowano!", "message.delete-warning": "Wszystkie powiązane dane również zostaną usunięte.", - "message.edit-dashboard": "Edit dashboard", + "message.edit-dashboard": "Edytuj panel", "message.failure": "Coś poszło nie tak.", "message.get-share-url": "Uzyskaj adres URL udostępniania", "message.get-tracking-code": "Pobierz kod śledzenia", @@ -103,7 +111,7 @@ "metrics.operating-systems": "System operacyjny", "metrics.page-views": "Wyświetlenia strony", "metrics.pages": "Strony", - "metrics.query-parameters": "Query parameters", + "metrics.query-parameters": "Parametry query", "metrics.referrers": "Źródła odsyłające", "metrics.screens": "Ekrany", "metrics.unique-visitors": "Unikalni odwiedzający", From 5d07681ab949b321f91b889e74e8c48005d86a47 Mon Sep 17 00:00:00 2001 From: enricopaulini Date: Thu, 27 Oct 2022 20:18:16 -0300 Subject: [PATCH 2/5] Update pt-BR Update the messages/pt-BR.json file --- public/intl/messages/pt-BR.json | 54 +++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/public/intl/messages/pt-BR.json b/public/intl/messages/pt-BR.json index b797c50b..9680d1ab 100644 --- a/public/intl/messages/pt-BR.json +++ b/public/intl/messages/pt-BR.json @@ -367,6 +367,12 @@ "value": "Hoje" } ], + "label.yesterday": [ + { + "type": 0, + "value": "Ontem" + } + ], "label.tracking-code": [ { "type": 0, @@ -397,6 +403,42 @@ "value": "Sites" } ], + "label.event-data": [ + { + "type": 0, + "value": "Consultar dados do evento" + } + ], + "label.field-name": [ + { + "type": 0, + "value": "Nome do campo" + } + ], + "label.type": [ + { + "type": 0, + "value": "Tipo" + } + ], + "label.add-column": [ + { + "type": 0, + "value": "Adicionar columna" + } + ], + "label.value": [ + { + "type": 0, + "value": "Valor" + } + ], + "label.add-filter": [ + { + "type": 0, + "value": "Adicionar filtro" + } + ], "message.active-users": [ { "type": 1, @@ -478,7 +520,7 @@ "message.edit-dashboard": [ { "type": 0, - "value": "Edit dashboard" + "value": "Editar painel" } ], "message.failure": [ @@ -587,6 +629,12 @@ "value": "name" } ], + "label.search": [ + { + "type": 0, + "value": "Procurar" + } + ], "message.reset-warning": [ { "type": 0, @@ -774,7 +822,7 @@ "metrics.query-parameters": [ { "type": 0, - "value": "Query parameters" + "value": "Parâmetros da URL" } ], "metrics.referrers": [ @@ -786,7 +834,7 @@ "metrics.screens": [ { "type": 0, - "value": "Screens" + "value": "Telas" } ], "metrics.unique-visitors": [ From d32d5e75e9e4b7e11891bd477aeaef61d1833dab Mon Sep 17 00:00:00 2001 From: Brian Cao Date: Sat, 29 Oct 2022 15:50:29 -0700 Subject: [PATCH 3/5] change owner by id --- pages/api/websites/[id]/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pages/api/websites/[id]/index.js b/pages/api/websites/[id]/index.js index 539a3288..5a4f9c75 100644 --- a/pages/api/websites/[id]/index.js +++ b/pages/api/websites/[id]/index.js @@ -23,6 +23,7 @@ export default async (req, res) => { if (req.method === 'POST') { const { name, domain, owner, enableShareUrl, shareId } = req.body; const { accountUuid } = req.auth; + let account; if (accountUuid) { @@ -43,7 +44,7 @@ export default async (req, res) => { name, domain, shareId: shareId ? shareId : newShareId, - userId: account ? account.id : +owner || undefined, + userId: +owner, }, { websiteUuid }, ); From 572df48667135807863d24706fcd05790527c578 Mon Sep 17 00:00:00 2001 From: Brian Cao Date: Mon, 31 Oct 2022 10:38:37 -0700 Subject: [PATCH 4/5] assign backup --- pages/api/websites/[id]/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/api/websites/[id]/index.js b/pages/api/websites/[id]/index.js index 5a4f9c75..a3771427 100644 --- a/pages/api/websites/[id]/index.js +++ b/pages/api/websites/[id]/index.js @@ -44,7 +44,7 @@ export default async (req, res) => { name, domain, shareId: shareId ? shareId : newShareId, - userId: +owner, + userId: +owner || account.id, }, { websiteUuid }, ); From 3a617b7bfaa45667618d4f83ac305dc410b55b16 Mon Sep 17 00:00:00 2001 From: Brian Cao Date: Mon, 31 Oct 2022 18:50:05 -0700 Subject: [PATCH 5/5] fix account delete bug --- pages/api/accounts/[id]/index.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pages/api/accounts/[id]/index.js b/pages/api/accounts/[id]/index.js index ae5fc434..c5f16d4e 100644 --- a/pages/api/accounts/[id]/index.js +++ b/pages/api/accounts/[id]/index.js @@ -43,7 +43,7 @@ export default async (req, res) => { const accountByUsername = await getAccount({ username }); if (accountByUsername) { - return badRequest(res, 'Account already exists'); + return badRequest(res, 'Account already exists.'); } } @@ -53,11 +53,15 @@ export default async (req, res) => { } if (req.method === 'DELETE') { + if (id === userId) { + return badRequest(res, 'You cannot delete your own account.'); + } + if (!isAdmin) { return unauthorized(res); } - await deleteAccount(userId); + await deleteAccount(+id); return ok(res); }