mirror of
https://github.com/louislam/uptime-kuma.git
synced 2024-11-27 16:54:04 +00:00
[Favicon] Code refactoring
This commit is contained in:
parent
04d93c2747
commit
b9dfcd1291
3 changed files with 57 additions and 52 deletions
15
package-lock.json
generated
15
package-lock.json
generated
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
"name": "uptime-kuma",
|
"name": "uptime-kuma",
|
||||||
"version": "1.11.4",
|
"version": "1.12.1",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "uptime-kuma",
|
"name": "uptime-kuma",
|
||||||
"version": "1.11.4",
|
"version": "1.12.1",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@fortawesome/fontawesome-svg-core": "~1.2.36",
|
"@fortawesome/fontawesome-svg-core": "~1.2.36",
|
||||||
|
@ -29,6 +29,7 @@
|
||||||
"dayjs": "~1.10.7",
|
"dayjs": "~1.10.7",
|
||||||
"express": "~4.17.1",
|
"express": "~4.17.1",
|
||||||
"express-basic-auth": "~1.2.0",
|
"express-basic-auth": "~1.2.0",
|
||||||
|
"favico.js": "^0.3.10",
|
||||||
"form-data": "~4.0.0",
|
"form-data": "~4.0.0",
|
||||||
"http-graceful-shutdown": "~3.1.5",
|
"http-graceful-shutdown": "~3.1.5",
|
||||||
"iconv-lite": "^0.6.3",
|
"iconv-lite": "^0.6.3",
|
||||||
|
@ -6140,6 +6141,11 @@
|
||||||
"reusify": "^1.0.4"
|
"reusify": "^1.0.4"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/favico.js": {
|
||||||
|
"version": "0.3.10",
|
||||||
|
"resolved": "https://registry.npmjs.org/favico.js/-/favico.js-0.3.10.tgz",
|
||||||
|
"integrity": "sha1-gFhuJ6EX8kqNUcGKmb3HFNQzkwE="
|
||||||
|
},
|
||||||
"node_modules/fb-watchman": {
|
"node_modules/fb-watchman": {
|
||||||
"version": "2.0.1",
|
"version": "2.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
|
||||||
|
@ -18240,6 +18246,11 @@
|
||||||
"reusify": "^1.0.4"
|
"reusify": "^1.0.4"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"favico.js": {
|
||||||
|
"version": "0.3.10",
|
||||||
|
"resolved": "https://registry.npmjs.org/favico.js/-/favico.js-0.3.10.tgz",
|
||||||
|
"integrity": "sha1-gFhuJ6EX8kqNUcGKmb3HFNQzkwE="
|
||||||
|
},
|
||||||
"fb-watchman": {
|
"fb-watchman": {
|
||||||
"version": "2.0.1",
|
"version": "2.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
|
||||||
|
|
|
@ -16,8 +16,6 @@ const favicon = new Favico({
|
||||||
animation: "none"
|
animation: "none"
|
||||||
});
|
});
|
||||||
|
|
||||||
let downMonitors = [];
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
|
||||||
data() {
|
data() {
|
||||||
|
@ -126,14 +124,10 @@ export default {
|
||||||
if (data.important) {
|
if (data.important) {
|
||||||
|
|
||||||
if (data.status === 0) {
|
if (data.status === 0) {
|
||||||
downMonitors.push(data.monitorID);
|
|
||||||
favicon.badge(downMonitors.length);
|
|
||||||
toast.error(`[${this.monitorList[data.monitorID].name}] [DOWN] ${data.msg}`, {
|
toast.error(`[${this.monitorList[data.monitorID].name}] [DOWN] ${data.msg}`, {
|
||||||
timeout: false,
|
timeout: false,
|
||||||
});
|
});
|
||||||
} else if (data.status === 1) {
|
} else if (data.status === 1) {
|
||||||
downMonitors = downMonitors.filter(monitor => monitor !== data.monitorID);
|
|
||||||
favicon.badge(downMonitors.length);
|
|
||||||
toast.success(`[${this.monitorList[data.monitorID].name}] [Up] ${data.msg}`, {
|
toast.success(`[${this.monitorList[data.monitorID].name}] [Up] ${data.msg}`, {
|
||||||
timeout: 20000,
|
timeout: 20000,
|
||||||
});
|
});
|
||||||
|
@ -150,11 +144,6 @@ export default {
|
||||||
});
|
});
|
||||||
|
|
||||||
socket.on("heartbeatList", (monitorID, data, overwrite = false) => {
|
socket.on("heartbeatList", (monitorID, data, overwrite = false) => {
|
||||||
const lastElement = data.at(-1);
|
|
||||||
if (lastElement.status === 0) {
|
|
||||||
downMonitors.push(monitorID);
|
|
||||||
favicon.badge(downMonitors.length);
|
|
||||||
}
|
|
||||||
if (! (monitorID in this.heartbeatList) || overwrite) {
|
if (! (monitorID in this.heartbeatList) || overwrite) {
|
||||||
this.heartbeatList[monitorID] = data;
|
this.heartbeatList[monitorID] = data;
|
||||||
} else {
|
} else {
|
||||||
|
@ -330,15 +319,11 @@ export default {
|
||||||
},
|
},
|
||||||
|
|
||||||
deleteMonitor(monitorID, callback) {
|
deleteMonitor(monitorID, callback) {
|
||||||
downMonitors = downMonitors.filter(monitor => monitor !== monitorID);
|
|
||||||
favicon.badge(downMonitors.length);
|
|
||||||
socket.emit("deleteMonitor", monitorID, callback);
|
socket.emit("deleteMonitor", monitorID, callback);
|
||||||
},
|
},
|
||||||
|
|
||||||
clearData() {
|
clearData() {
|
||||||
console.log("reset heartbeat list");
|
console.log("reset heartbeat list");
|
||||||
downMonitors = [];
|
|
||||||
favicon.badge(0);
|
|
||||||
this.heartbeatList = {};
|
this.heartbeatList = {};
|
||||||
this.importantHeartbeatList = {};
|
this.importantHeartbeatList = {};
|
||||||
},
|
},
|
||||||
|
@ -412,10 +397,50 @@ export default {
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
stats() {
|
||||||
|
let result = {
|
||||||
|
up: 0,
|
||||||
|
down: 0,
|
||||||
|
unknown: 0,
|
||||||
|
pause: 0,
|
||||||
|
};
|
||||||
|
|
||||||
|
for (let monitorID in this.$root.monitorList) {
|
||||||
|
let beat = this.$root.lastHeartbeatList[monitorID];
|
||||||
|
let monitor = this.$root.monitorList[monitorID];
|
||||||
|
|
||||||
|
if (monitor && ! monitor.active) {
|
||||||
|
result.pause++;
|
||||||
|
} else if (beat) {
|
||||||
|
if (beat.status === 1) {
|
||||||
|
result.up++;
|
||||||
|
} else if (beat.status === 0) {
|
||||||
|
result.down++;
|
||||||
|
} else if (beat.status === 2) {
|
||||||
|
result.up++;
|
||||||
|
} else {
|
||||||
|
result.unknown++;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
result.unknown++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
watch: {
|
watch: {
|
||||||
|
|
||||||
|
// Update Badge
|
||||||
|
"stats.down"(to, from) {
|
||||||
|
if (to !== from) {
|
||||||
|
favicon.badge(to);
|
||||||
|
console.log(to);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
// Reload the SPA if the server version is changed.
|
// Reload the SPA if the server version is changed.
|
||||||
"info.version"(to, from) {
|
"info.version"(to, from) {
|
||||||
if (from && from !== to) {
|
if (from && from !== to) {
|
||||||
|
|
|
@ -9,19 +9,19 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<h3>{{ $t("Up") }}</h3>
|
<h3>{{ $t("Up") }}</h3>
|
||||||
<span class="num">{{ stats.up }}</span>
|
<span class="num">{{ $root.stats.up }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<h3>{{ $t("Down") }}</h3>
|
<h3>{{ $t("Down") }}</h3>
|
||||||
<span class="num text-danger">{{ stats.down }}</span>
|
<span class="num text-danger">{{ $root.stats.down }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<h3>{{ $t("Unknown") }}</h3>
|
<h3>{{ $t("Unknown") }}</h3>
|
||||||
<span class="num text-secondary">{{ stats.unknown }}</span>
|
<span class="num text-secondary">{{ $root.stats.unknown }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<h3>{{ $t("pauseDashboardHome") }}</h3>
|
<h3>{{ $t("pauseDashboardHome") }}</h3>
|
||||||
<span class="num text-secondary">{{ stats.pause }}</span>
|
<span class="num text-secondary">{{ $root.stats.pause }}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -89,37 +89,6 @@ export default {
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
stats() {
|
|
||||||
let result = {
|
|
||||||
up: 0,
|
|
||||||
down: 0,
|
|
||||||
unknown: 0,
|
|
||||||
pause: 0,
|
|
||||||
};
|
|
||||||
|
|
||||||
for (let monitorID in this.$root.monitorList) {
|
|
||||||
let beat = this.$root.lastHeartbeatList[monitorID];
|
|
||||||
let monitor = this.$root.monitorList[monitorID];
|
|
||||||
|
|
||||||
if (monitor && ! monitor.active) {
|
|
||||||
result.pause++;
|
|
||||||
} else if (beat) {
|
|
||||||
if (beat.status === 1) {
|
|
||||||
result.up++;
|
|
||||||
} else if (beat.status === 0) {
|
|
||||||
result.down++;
|
|
||||||
} else if (beat.status === 2) {
|
|
||||||
result.up++;
|
|
||||||
} else {
|
|
||||||
result.unknown++;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
result.unknown++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
|
||||||
},
|
|
||||||
|
|
||||||
importantHeartBeatList() {
|
importantHeartBeatList() {
|
||||||
let result = [];
|
let result = [];
|
||||||
|
|
Loading…
Reference in a new issue