Skip to content

Commit 30ebf7b

Browse files
mikecaomikecao
authored
Merge pull request #459 from mikecao/dev
v1.12.0
2 parents 0b8336f + 88452ad commit 30ebf7b

14 files changed

Lines changed: 443 additions & 1807 deletions

File tree

‎components/common/DropDown.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export default function DropDown({
2929
}
3030

3131
useDocumentClick(e => {
32-
if (!ref.current.contains(e.target)) {
32+
if (!ref.current?.contains(e.target)) {
3333
setShowMenu(false);
3434
}
3535
});

‎components/common/MenuButton.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export default function MenuButton({
3030
}
3131

3232
useDocumentClick(e => {
33-
if (!ref.current.contains(e.target)) {
33+
if (!ref.current?.contains(e.target)) {
3434
setShowMenu(false);
3535
}
3636
});

‎components/metrics/WebsiteHeader.js‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,23 @@ import Arrow from 'assets/arrow-right.svg';
1010
import styles from './WebsiteHeader.module.css';
1111

1212
export default function WebsiteHeader({ websiteId, title, domain, showLink = false }) {
13+
const header = showLink ? (
14+
<>
15+
<Favicon domain={domain} />
16+
<Link href="/website/[...id]" as={`/website/${websiteId}/${title}`}>
17+
{title}
18+
</Link>
19+
</>
20+
) : (
21+
<div>
22+
<Favicon domain={domain} />
23+
{title}
24+
</div>
25+
);
26+
1327
return (
1428
<PageHeader>
15-
<div className={styles.title}>
16-
<Favicon domain={domain} />
17-
{title}
18-
</div>
29+
<div className={styles.title}>{header}</div>
1930
<ActiveUsers className={styles.active} websiteId={websiteId} />
2031
<ButtonLayout align="right">
2132
<RefreshButton websiteId={websiteId} />

‎components/settings/AccountSettings.js‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,13 @@ export default function AccountSettings() {
2929

3030
const Checkmark = ({ is_admin }) => (is_admin ? <Icon icon={<Check />} size="medium" /> : null);
3131

32-
const DashboardLink = row =>
33-
row.is_admin ? null : (
34-
<Link href={`/dashboard/${row.user_id}/${row.username}`}>
35-
<a>
36-
<Icon icon={<LinkIcon />} />
37-
</a>
38-
</Link>
39-
);
32+
const DashboardLink = row => (
33+
<Link href={`/dashboard/${row.user_id}/${row.username}`}>
34+
<a>
35+
<Icon icon={<LinkIcon />} />
36+
</a>
37+
</Link>
38+
);
4039

4140
const Buttons = row =>
4241
row.username !== 'admin' ? (

‎components/settings/LanguageButton.module.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.menu {
22
display: flex;
33
flex-flow: row wrap;
4-
min-width: 500px;
4+
min-width: 560px;
55
max-width: 100vw;
66
padding: 10px;
77
}

‎lang/pl-PL.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"label.login": "Zaloguj sie",
3333
"label.logout": "Wyloguj",
3434
"label.more": "Więcej",
35-
"label.name": "Name",
35+
"label.name": "Nazwa",
3636
"label.new-password": "Nowe hasło",
3737
"label.password": "Hasło",
3838
"label.passwords-dont-match": "Hasła się nie zgadzają",

‎lang/pt-BR.json‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
{
2+
"label.accounts": "Contas",
3+
"label.add-account": "Adicionar conta",
4+
"label.add-website": "Adicionar site",
5+
"label.administrator": "Administrador",
6+
"label.all": "Todos",
7+
"label.all-websites": "Todos os sites",
8+
"label.back": "Voltar",
9+
"label.cancel": "Cancelar",
10+
"label.change-password": "Alterar a senha",
11+
"label.confirm-password": "Confirme a nova senha",
12+
"label.copy-to-clipboard": "Copiar para a área de transferência",
13+
"label.current-password": "Senha atual",
14+
"label.custom-range": "Intervalo personalizado",
15+
"label.dashboard": "Painel",
16+
"label.date-range": "Intervalo de datas",
17+
"label.default-date-range": "Intervalo de datas predefinido",
18+
"label.delete": "Remover",
19+
"label.delete-account": "Remover conta",
20+
"label.delete-website": "Remover site",
21+
"label.dismiss": "Dispensar",
22+
"label.domain": "Domínio",
23+
"label.edit": "Editar",
24+
"label.edit-account": "Editar conta",
25+
"label.edit-website": "Editar site",
26+
"label.enable-share-url": "Ativar link de compartilhamento",
27+
"label.invalid": "Inválido",
28+
"label.invalid-domain": "Domínio inválido",
29+
"label.last-days": "Últimos {x} dias",
30+
"label.last-hours": "Últimas {x} horas",
31+
"label.logged-in-as": "Sessão iniciada como {username}",
32+
"label.login": "Iniciar sessão",
33+
"label.logout": "Sair",
34+
"label.more": "Mais",
35+
"label.name": "Nome",
36+
"label.new-password": "Nova senha",
37+
"label.password": "Senha",
38+
"label.passwords-dont-match": "As senhas não correspondem",
39+
"label.profile": "Perfil",
40+
"label.realtime": "Tempo real",
41+
"label.realtime-logs": "Relatório em tempo real",
42+
"label.refresh": "Atualizar",
43+
"label.required": "Obrigatório",
44+
"label.reset": "Redefinir",
45+
"label.save": "Salvar",
46+
"label.settings": "Configurações",
47+
"label.share-url": "Link de compartilhamento",
48+
"label.single-day": "Dia específico",
49+
"label.this-month": "Este mês",
50+
"label.this-week": "Esta semana",
51+
"label.this-year": "Este ano",
52+
"label.timezone": "Fuso horário",
53+
"label.today": "Hoje",
54+
"label.tracking-code": "Código de rastreamento",
55+
"label.unknown": "Desconhecido",
56+
"label.username": "Nome de usuário",
57+
"label.view-details": "Ver detalhes",
58+
"label.websites": "Sites",
59+
"message.active-users": "{x} {x, plural, one {visitante} other {visitantes}} neste momento",
60+
"message.confirm-delete": "Deseja realmente remover {target}?",
61+
"message.copied": "Copiado!",
62+
"message.delete-warning": "Todos os dados associados também serão eliminados.",
63+
"message.failure": "Ocorreu um erro.",
64+
"message.get-share-url": "Obter link de compartilhamento",
65+
"message.get-tracking-code": "Obter código de rastreamento",
66+
"message.go-to-settings": "Ir para as configurações",
67+
"message.incorrect-username-password": "O nome de usuário e/ou senha está incorreto.",
68+
"message.log.visitor": "Visitante de {country} usando {browser} no {device} {os}",
69+
"message.new-version-available": "Uma nova versão de umami {version} está disponível!",
70+
"message.no-data-available": "Sem dados disponíveis.",
71+
"message.no-websites-configured": "Nenhum site foi configurado ainda.",
72+
"message.page-not-found": "Página não encontrada.",
73+
"message.powered-by": "Distribuído por {name}",
74+
"message.save-success": "Salvo com sucesso.",
75+
"message.share-url": "Este é o link público de compartilhamento para {target}.",
76+
"message.track-stats": "Para gerar estatística para {target}, coloque o seguinte código no {head} do html do seu site.",
77+
"message.type-delete": "Escreva {delete} abaixo para continuar.",
78+
"metrics.actions": "Ações",
79+
"metrics.average-visit-time": "Tempo médio da visita",
80+
"metrics.bounce-rate": "Taxa de rejeição",
81+
"metrics.browsers": "Navegadores",
82+
"metrics.countries": "Países",
83+
"metrics.device.desktop": "Computador",
84+
"metrics.device.laptop": "Notebook",
85+
"metrics.device.mobile": "Celular",
86+
"metrics.device.tablet": "Tablet",
87+
"metrics.devices": "Dispositivos",
88+
"metrics.events": "Eventos",
89+
"metrics.filter.combined": "Combinado",
90+
"metrics.filter.domain-only": "Apenas domínio",
91+
"metrics.filter.raw": "Dados brutos",
92+
"metrics.operating-systems": "Sistemas operacionais",
93+
"metrics.page-views": "Visualizações de página",
94+
"metrics.pages": "Páginas",
95+
"metrics.referrers": "Referências",
96+
"metrics.unique-visitors": "Visitantes únicos",
97+
"metrics.views": "Visualizações",
98+
"metrics.visitors": "Visitantes"
99+
}

‎lib/constants.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ export const BROWSERS = {
116116
edge: 'Edge',
117117
'edge-ios': 'Edge (iOS)',
118118
yandexbrowser: 'Yandex',
119-
kakaotalk: 'KKaoTalk',
119+
kakaotalk: 'KaKaoTalk',
120120
samsung: 'Samsung',
121121
silk: 'Silk',
122122
miui: 'MIUI',

‎lib/lang.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import {
1717
nl,
1818
pl,
1919
pt,
20+
ptBR,
2021
ro,
2122
ru,
2223
sv,
@@ -42,6 +43,7 @@ import svMessages from 'lang-compiled/sv-SE.json';
4243
import grMessages from 'lang-compiled/el-GR.json';
4344
import foMessages from 'lang-compiled/fo-FO.json';
4445
import ptMessages from 'lang-compiled/pt-PT.json';
46+
import ptBRMessages from 'lang-compiled/pt-BR.json';
4547
import roMessages from 'lang-compiled/ro-RO.json';
4648
import nbNOMessages from 'lang-compiled/nb-NO.json';
4749
import idMessages from 'lang-compiled/id-ID.json';
@@ -71,6 +73,7 @@ export const messages = {
7173
'el-GR': grMessages,
7274
'fo-FO': foMessages,
7375
'pt-PT': ptMessages,
76+
'pt-BR': ptBRMessages,
7477
'ro-RO': roMessages,
7578
'nb-NO': nbNOMessages,
7679
'id-ID': idMessages,
@@ -101,6 +104,7 @@ export const dateLocales = {
101104
'el-GR': el,
102105
'fo-FO': da,
103106
'pt-PT': pt,
107+
'pt-BR': ptBR,
104108
'ro-RO': ro,
105109
'nb-NO': nb,
106110
'id-ID': id,
@@ -135,6 +139,7 @@ export const menuOptions = [
135139
{ label: 'Norsk Bokmål', value: 'nb-NO', display: 'nb' },
136140
{ label: 'Polski', value: 'pl-PL', display: 'pl' },
137141
{ label: 'Português', value: 'pt-PT', display: 'pt' },
142+
{ label: 'Português do Brasil', value: 'pt-BR', display: 'pt-BR' },
138143
{ label: 'Русский', value: 'ru-RU', display: 'ru' },
139144
{ label: 'Română', value: 'ro-RO', display: 'ro' },
140145
{ label: 'Suomi', value: 'fi-FI', display: 'fi' },

‎package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "umami",
3-
"version": "1.11.0",
3+
"version": "1.12.0",
44
"description": "A simple, fast, website analytics alternative to Google Analytics. ",
55
"author": "Mike Cao <mike@mikecao.com>",
66
"license": "MIT",
@@ -56,7 +56,7 @@
5656
}
5757
},
5858
"dependencies": {
59-
"@prisma/client": "2.14.0",
59+
"@prisma/client": "2.15.0",
6060
"@reduxjs/toolkit": "^1.5.0",
6161
"bcrypt": "^5.0.0",
6262
"chalk": "^4.1.0",
@@ -69,17 +69,17 @@
6969
"detect-browser": "^5.2.0",
7070
"dotenv": "^8.2.0",
7171
"formik": "^2.2.6",
72-
"immer": "^8.0.0",
72+
"immer": "^8.0.1",
7373
"is-localhost-ip": "^1.4.0",
7474
"isbot-fast": "^1.2.0",
7575
"jose": "2.0.3",
7676
"maxmind": "^4.3.1",
7777
"moment-timezone": "^0.5.32",
78-
"next": "^10.0.5",
78+
"next": "^10.0.6",
7979
"prompts": "2.4.0",
8080
"react": "^17.0.1",
8181
"react-dom": "^17.0.1",
82-
"react-intl": "^5.10.16",
82+
"react-intl": "^5.12.0",
8383
"react-redux": "^7.2.2",
8484
"react-simple-maps": "^2.3.0",
8585
"react-spring": "^8.0.27",
@@ -97,21 +97,21 @@
9797
},
9898
"devDependencies": {
9999
"@formatjs/cli": "^2.13.16",
100-
"@prisma/cli": "2.14.0",
100+
"@prisma/cli": "2.15.0",
101101
"@rollup/plugin-buble": "^0.21.3",
102-
"@rollup/plugin-node-resolve": "^11.0.1",
102+
"@rollup/plugin-node-resolve": "^11.1.1",
103103
"@rollup/plugin-replace": "^2.3.4",
104104
"@svgr/webpack": "^5.5.0",
105105
"cross-env": "^7.0.3",
106106
"del": "^6.0.0",
107107
"dotenv-cli": "^4.0.0",
108-
"eslint": "^7.17.0",
109-
"eslint-config-prettier": "^7.1.0",
108+
"eslint": "^7.19.0",
109+
"eslint-config-prettier": "^7.2.0",
110110
"eslint-plugin-prettier": "^3.3.1",
111111
"eslint-plugin-react": "^7.22.0",
112112
"eslint-plugin-react-hooks": "^4.2.0",
113113
"extract-react-intl-messages": "^4.1.1",
114-
"husky": "^4.3.7",
114+
"husky": "^4.3.8",
115115
"lint-staged": "^10.5.3",
116116
"loadtest": "5.1.2",
117117
"npm-run-all": "^4.1.5",
@@ -120,10 +120,10 @@
120120
"postcss-preset-env": "^6.7.0",
121121
"prettier": "^2.2.1",
122122
"prettier-eslint": "^12.0.0",
123-
"rollup": "^2.36.1",
123+
"rollup": "^2.38.3",
124124
"rollup-plugin-hashbang": "^2.2.2",
125125
"rollup-plugin-terser": "^7.0.2",
126-
"stylelint": "^13.8.0",
126+
"stylelint": "^13.9.0",
127127
"stylelint-config-css-modules": "^2.2.0",
128128
"stylelint-config-prettier": "^8.0.1",
129129
"stylelint-config-recommended": "^3.0.0",

0 commit comments

Comments
 (0)