From c8ccf9b3522910012261dda88eb0734a03112f03 Mon Sep 17 00:00:00 2001 From: TwinProduction Date: Sat, 30 Jan 2021 21:17:17 -0500 Subject: [PATCH] Minor improvements --- web/app/src/components/Service.vue | 10 +++---- web/app/src/components/ServiceGroup.vue | 5 ++-- web/app/src/views/Details.vue | 39 ++++++++++++------------- web/app/src/views/Home.vue | 3 +- web/static/css/app.css | 2 +- web/static/js/app.js | 2 +- 6 files changed, 30 insertions(+), 31 deletions(-) diff --git a/web/app/src/components/Service.vue b/web/app/src/components/Service.vue index 5d10f0e9..17c81d18 100644 --- a/web/app/src/components/Service.vue +++ b/web/app/src/components/Service.vue @@ -2,14 +2,14 @@
- + {{ data.name }} | {{ data.results[data.results.length - 1].hostname }}
- {{ (minResponseTime === maxResponseTime ? minResponseTime : (minResponseTime + "-" + maxResponseTime)) }}ms + {{ (minResponseTime === maxResponseTime ? minResponseTime : (minResponseTime + '-' + maxResponseTime)) }}ms
@@ -70,9 +70,9 @@ export default { }, generatePath() { if (!this.data) { - return "/"; + return '/'; } - return "/services/" + this.data.key; + return '/services/' + this.data.key; }, showTooltip(result, event) { this.$emit('showTooltip', result, event); @@ -105,7 +105,7 @@ export default { .service:last-child { border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; - border-bottom-width: 1px; + border-bottom-width: 3px; border-color: #dee2e6; border-style: solid; } diff --git a/web/app/src/components/ServiceGroup.vue b/web/app/src/components/ServiceGroup.vue index ff4a2960..a76a7b54 100644 --- a/web/app/src/components/ServiceGroup.vue +++ b/web/app/src/components/ServiceGroup.vue @@ -14,7 +14,7 @@
- +
@@ -56,6 +56,7 @@ export default { }, toggleGroup() { this.collapsed = !this.collapsed; + sessionStorage.setItem(`service-group:${this.name}:collapsed`, this.collapsed); }, showTooltip(result, event) { this.$emit('showTooltip', result, event); @@ -72,7 +73,7 @@ export default { data() { return { healthy: true, - collapsed: false + collapsed: sessionStorage.getItem(`service-group:${this.name}:collapsed`) === "true" } } } diff --git a/web/app/src/views/Details.vue b/web/app/src/views/Details.vue index a4b22d55..9a139fc5 100644 --- a/web/app/src/views/Details.vue +++ b/web/app/src/views/Details.vue @@ -84,7 +84,7 @@ export default { mixins: [helper], methods: { fetchData() { - console.log("[Details][fetchData] Fetching data"); + //console.log("[Details][fetchData] Fetching data"); fetch(`${this.serverUrl}/api/v1/statuses/${this.$route.params.key}`) .then(response => response.json()) .then(data => { @@ -94,25 +94,25 @@ export default { for (let i = data.events.length-1; i >= 0; i--) { let event = data.events[i]; if (i === data.events.length-1) { - if (event.type === "UNHEALTHY") { - event.fancyText = "Service is unhealthy"; - } else if (event.type === "HEALTHY") { - event.fancyText = "Service is healthy"; - } else if (event.type === "START") { - event.fancyText = "Monitoring started"; + if (event.type === 'UNHEALTHY') { + event.fancyText = 'Service is unhealthy'; + } else if (event.type === 'HEALTHY') { + event.fancyText = 'Service is healthy'; + } else if (event.type === 'START') { + event.fancyText = 'Monitoring started'; } } else { let nextEvent = data.events[i+1]; - if (event.type === "HEALTHY") { - event.fancyText = "Service became healthy again"; - } else if (event.type === "UNHEALTHY") { + if (event.type === 'HEALTHY') { + event.fancyText = 'Service became healthy again'; + } else if (event.type === 'UNHEALTHY') { if (nextEvent) { - event.fancyText = "Service was unhealthy for " + this.prettifyTimeDifference(nextEvent.timestamp, event.timestamp); + event.fancyText = 'Service was unhealthy for ' + this.prettifyTimeDifference(nextEvent.timestamp, event.timestamp); } else { - event.fancyText = "Service became unhealthy"; + event.fancyText = 'Service became unhealthy'; } - } else if (event.type === "START") { - event.fancyText = "Monitoring started"; + } else if (event.type === 'START') { + event.fancyText = 'Monitoring started'; } } event.fancyTimeAgo = this.generatePrettyTimeAgo(event.timestamp); @@ -127,13 +127,13 @@ export default { }, prettifyUptime(uptime) { if (!uptime) { - return "0%"; + return '0%'; } - return (uptime * 100).toFixed(2) + "%" + return (uptime * 100).toFixed(2) + '%' }, prettifyTimeDifference(start, end) { let minutes = Math.ceil((new Date(start) - new Date(end))/1000/60); - return minutes + (minutes === 1 ? " minute" : " minutes"); + return minutes + (minutes === 1 ? ' minute' : ' minutes'); }, showTooltip(result, event) { this.$emit('showTooltip', result, event); @@ -155,9 +155,8 @@ export default {