topaLE
/
uptime-kuma
1
0
Fork 0
Code Issues 185 Pull Requests 26 Projects Releases 28 Wiki Activity
Browse Source

Merge branch 'master' into patch-1

remotes/Mikhail5555/master
LouisLam 4 years ago
parent
662c97dcde 50b868e751
commit
9a9fd41f62
22 changed files with 54 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      package-lock.json
  2. 2
      src/languages/da-DK.js
  3. 2
      src/languages/de-DE.js
  4. 2
      src/languages/en.js
  5. 2
      src/languages/es-ES.js
  6. 2
      src/languages/et-EE.js
  7. 2
      src/languages/fr-FR.js
  8. 2
      src/languages/it-IT.js
  9. 2
      src/languages/ja.js
  10. 2
      src/languages/ko-KR.js
  11. 2
      src/languages/nl-NL.js
  12. 2
      src/languages/pl.js
  13. 2
      src/languages/pt-BR.js
  14. 2
      src/languages/ru-RU.js
  15. 2
      src/languages/sr-latn.js
  16. 2
      src/languages/sr.js
  17. 2
      src/languages/sv-SE.js
  18. 2
      src/languages/tr-TR.js
  19. 2
      src/languages/zh-CN.js
  20. 2
      src/languages/zh-HK.js
  21. 4
      src/pages/StatusPage.vue
  22. 7
      src/router.js

28
package-lock.json
View File

@ -61,6 +61,7 @@
"@vitejs/plugin-vue": "^1.6.2",
"@vue/compiler-sfc": "^3.2.11",
"core-js": "^3.17.3",
"cross-env": "^7.0.3",
"dns2": "^2.0.1",
"eslint": "^7.32.0",
"eslint-plugin-vue": "^7.17.0",
@ -2230,6 +2231,24 @@
"node": ">=10"
}
},
"node_modules/cross-env": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
"integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
"dev": true,
"dependencies": {
"cross-spawn": "^7.0.1"
},
"bin": {
"cross-env": "src/bin/cross-env.js",
"cross-env-shell": "src/bin/cross-env-shell.js"
},
"engines": {
"node": ">=10.14",
"npm": ">=6",
"yarn": ">=1"
}
},
"node_modules/cross-spawn": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@ -9780,6 +9799,15 @@
"yaml": "^1.10.0"
}
},
"cross-env": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
"integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
"dev": true,
"requires": {
"cross-spawn": "^7.0.1"
}
},
"cross-spawn": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",

2
src/languages/da-DK.js
View File

@ -170,7 +170,7 @@ export default {
"Avg. Ping": "Avg. Ping",
"Avg. Response": "Avg. Response",
"Entry Page": "Entry Page",
"Status Page Nothing": "Nothing here, please add a group or a monitor.",
"statusPageNothing": "Nothing here, please add a group or a monitor.",
"No Services": "No Services",
"All Systems Operational": "All Systems Operational",
"Partially Degraded Service": "Partially Degraded Service",

2
src/languages/de-DE.js
View File

@ -169,7 +169,7 @@ export default {
"Avg. Ping": "Avg. Ping",
"Avg. Response": "Avg. Response",
"Entry Page": "Entry Page",
"Status Page Nothing": "Nothing here, please add a group or a monitor.",
"statusPageNothing": "Nothing here, please add a group or a monitor.",
"No Services": "No Services",
"All Systems Operational": "All Systems Operational",
"Partially Degraded Service": "Partially Degraded Service",

2
src/languages/en.js
View File

@ -169,7 +169,7 @@ export default {
"Avg. Ping": "Avg. Ping",
"Avg. Response": "Avg. Response",
"Entry Page": "Entry Page",
"Status Page Nothing": "Nothing here, please add a group or a monitor.",
"statusPageNothing": "Nothing here, please add a group or a monitor.",
"No Services": "No Services",
"All Systems Operational": "All Systems Operational",
"Partially Degraded Service": "Partially Degraded Service",

2
src/languages/es-ES.js
View File

@ -170,7 +170,7 @@ export default {
"Avg. Ping": "Avg. Ping",
"Avg. Response": "Avg. Response",
"Entry Page": "Entry Page",
"Status Page Nothing": "Nothing here, please add a group or a monitor.",
"statusPageNothing": "Nothing here, please add a group or a monitor.",
"No Services": "No Services",
"All Systems Operational": "All Systems Operational",
"Partially Degraded Service": "Partially Degraded Service",

2
src/languages/et-EE.js
View File

@ -170,7 +170,7 @@ export default {
"Avg. Ping": "Avg. Ping",
"Avg. Response": "Avg. Response",
"Entry Page": "Entry Page",
"Status Page Nothing": "Nothing here, please add a group or a monitor.",
"statusPageNothing": "Nothing here, please add a group or a monitor.",
"No Services": "No Services",
"All Systems Operational": "All Systems Operational",
"Partially Degraded Service": "Partially Degraded Service",

2
src/languages/fr-FR.js
View File

@ -170,7 +170,7 @@ export default {
"Avg. Ping": "Avg. Ping",
"Avg. Response": "Avg. Response",
"Entry Page": "Entry Page",
"Status Page Nothing": "Nothing here, please add a group or a monitor.",
"statusPageNothing": "Nothing here, please add a group or a monitor.",
"No Services": "No Services",
"All Systems Operational": "All Systems Operational",
"Partially Degraded Service": "Partially Degraded Service",

2
src/languages/it-IT.js
View File

@ -169,7 +169,7 @@ export default {
"Avg. Ping": "Avg. Ping",
"Avg. Response": "Avg. Response",
"Entry Page": "Entry Page",
"Status Page Nothing": "Nothing here, please add a group or a monitor.",
"statusPageNothing": "Nothing here, please add a group or a monitor.",
"No Services": "No Services",
"All Systems Operational": "All Systems Operational",
"Partially Degraded Service": "Partially Degraded Service",

2
src/languages/ja.js
View File

@ -170,7 +170,7 @@ export default {
"Avg. Ping": "Avg. Ping",
"Avg. Response": "Avg. Response",
"Entry Page": "Entry Page",
"Status Page Nothing": "Nothing here, please add a group or a monitor.",
"statusPageNothing": "Nothing here, please add a group or a monitor.",
"No Services": "No Services",
"All Systems Operational": "All Systems Operational",
"Partially Degraded Service": "Partially Degraded Service",

2
src/languages/ko-KR.js
View File

@ -170,7 +170,7 @@ export default {
"Avg. Ping": "Avg. Ping",
"Avg. Response": "Avg. Response",
"Entry Page": "Entry Page",
"Status Page Nothing": "Nothing here, please add a group or a monitor.",
"statusPageNothing": "Nothing here, please add a group or a monitor.",
"No Services": "No Services",
"All Systems Operational": "All Systems Operational",
"Partially Degraded Service": "Partially Degraded Service",

2
src/languages/nl-NL.js
View File

@ -170,7 +170,7 @@ export default {
"Avg. Ping": "Avg. Ping",
"Avg. Response": "Avg. Response",
"Entry Page": "Entry Page",
"Status Page Nothing": "Nothing here, please add a group or a monitor.",
"statusPageNothing": "Nothing here, please add a group or a monitor.",
"No Services": "No Services",
"All Systems Operational": "All Systems Operational",
"Partially Degraded Service": "Partially Degraded Service",

2
src/languages/pl.js
View File

@ -170,7 +170,7 @@ export default {
"Avg. Ping": "Średni ping",
"Avg. Response": "Średnia odpowiedź",
"Entry Page": "Entry Page",
"Status Page Nothing": "Nothing here, please add a group or a monitor.",
"statusPageNothing": "Nothing here, please add a group or a monitor.",
"No Services": "No Services",
"All Systems Operational": "All Systems Operational",
"Partially Degraded Service": "Partially Degraded Service",

2
src/languages/pt-BR.js
View File

@ -170,7 +170,7 @@ export default {
"Avg. Response": "Resposta Média. ",
"Status Page": "Página de Status",
"Entry Page": "Página de entrada",
"Status Page Nothing": "Nada aqui, por favor, adicione um grupo ou monitor.",
"statusPageNothing": "Nada aqui, por favor, adicione um grupo ou monitor.",
"No Services": "Nenhum Serviço",
"All Systems Operational": "Todos os Serviços Operacionais",
"Partially Degraded Service": "Serviço parcialmente degradado",

2
src/languages/ru-RU.js
View File

@ -170,7 +170,7 @@ export default {
"Avg. Ping": "Avg. Ping",
"Avg. Response": "Avg. Response",
"Entry Page": "Entry Page",
"Status Page Nothing": "Nothing here, please add a group or a monitor.",
"statusPageNothing": "Nothing here, please add a group or a monitor.",
"No Services": "No Services",
"All Systems Operational": "All Systems Operational",
"Partially Degraded Service": "Partially Degraded Service",

2
src/languages/sr-latn.js
View File

@ -170,7 +170,7 @@ export default {
"Avg. Ping": "Avg. Ping",
"Avg. Response": "Avg. Response",
"Entry Page": "Entry Page",
"Status Page Nothing": "Nothing here, please add a group or a monitor.",
"statusPageNothing": "Nothing here, please add a group or a monitor.",
"No Services": "No Services",
"All Systems Operational": "All Systems Operational",
"Partially Degraded Service": "Partially Degraded Service",

2
src/languages/sr.js
View File

@ -170,7 +170,7 @@ export default {
"Avg. Ping": "Avg. Ping",
"Avg. Response": "Avg. Response",
"Entry Page": "Entry Page",
"Status Page Nothing": "Nothing here, please add a group or a monitor.",
"statusPageNothing": "Nothing here, please add a group or a monitor.",
"No Services": "No Services",
"All Systems Operational": "All Systems Operational",
"Partially Degraded Service": "Partially Degraded Service",

2
src/languages/sv-SE.js
View File

@ -170,7 +170,7 @@ export default {
"Avg. Ping": "Avg. Ping",
"Avg. Response": "Avg. Response",
"Entry Page": "Entry Page",
"Status Page Nothing": "Nothing here, please add a group or a monitor.",
"statusPageNothing": "Nothing here, please add a group or a monitor.",
"No Services": "No Services",
"All Systems Operational": "All Systems Operational",
"Partially Degraded Service": "Partially Degraded Service",

2
src/languages/tr-TR.js
View File

@ -169,7 +169,7 @@ export default {
"Avg. Ping": "Avg. Ping",
"Avg. Response": "Avg. Response",
"Entry Page": "Entry Page",
"Status Page Nothing": "Nothing here, please add a group or a monitor.",
"statusPageNothing": "Nothing here, please add a group or a monitor.",
"No Services": "No Services",
"All Systems Operational": "All Systems Operational",
"Partially Degraded Service": "Partially Degraded Service",

2
src/languages/zh-CN.js
View File

@ -170,7 +170,7 @@ export default {
"Avg. Ping": "Avg. Ping",
"Avg. Response": "Avg. Response",
"Entry Page": "Entry Page",
"Status Page Nothing": "Nothing here, please add a group or a monitor.",
"statusPageNothing": "Nothing here, please add a group or a monitor.",
"No Services": "No Services",
"All Systems Operational": "All Systems Operational",
"Partially Degraded Service": "Partially Degraded Service",

2
src/languages/zh-HK.js
View File

@ -170,7 +170,7 @@ export default {
"Avg. Ping": "Avg. Ping",
"Avg. Response": "Avg. Response",
"Entry Page": "Entry Page",
"Status Page Nothing": "Nothing here, please add a group or a monitor.",
"statusPageNothing": "Nothing here, please add a group or a monitor.",
"No Services": "No Services",
"All Systems Operational": "All Systems Operational",
"Partially Degraded Service": "Partially Degraded Service",

4
src/pages/StatusPage.vue
View File

@ -185,7 +185,7 @@
<div class="mb-4">
<div v-if="$root.publicGroupList.length === 0 && loadedData" class="text-center">
<!-- 👀 Nothing here, please add a group or a monitor. -->
👀 {{ $t("Status Page Nothing") }}
👀 {{ $t("statusPageNothing") }}
</div>
<PublicGroupList :edit-mode="enableEditMode" />
@ -377,7 +377,7 @@ export default {
},
async created() {
this.hasToken = ("token" in localStorage);
this.hasToken = ("token" in this.$root.storage());
// Browser change page
// https://stackoverflow.com/questions/7317273/warn-user-before-leaving-web-page-with-unsaved-changes

7
src/router.js
View File

@ -17,7 +17,10 @@ const routes = [
component: Entry,
},
{
path: "/dashboard",
// If it is "/dashboard", the active link is not working
// If it is "", it overrides the "/" unexpectedly
// Give a random name to solve the problem.
path: "/empty",
component: Layout,
children: [
{
@ -26,7 +29,7 @@ const routes = [
children: [
{
name: "DashboardHome",
path: "",
path: "/dashboard",
component: DashboardHome,
children: [
{

Write Preview
Loading…
Cancel
Save