From 4c8fdd07d998a7af7764e6d61886854e61cf5b6c Mon Sep 17 00:00:00 2001
From: Adam Stachowicz <adam.stachowicz@fingo.info>
Date: Tue, 27 Jul 2021 19:53:59 +0200
Subject: [PATCH] Manual fixes

---
 server/model/heartbeat.js             | 1 +
 server/model/monitor.js               | 3 ++-
 src/App.vue                           | 4 ----
 src/components/Confirm.vue            | 4 ----
 src/components/CountUp.vue            | 8 ++------
 src/components/Datetime.vue           | 4 ----
 src/components/HeartbeatBar.vue       | 2 +-
 src/components/NotificationDialog.vue | 4 ----
 src/components/Status.vue             | 4 ++--
 src/components/Uptime.vue             | 6 +-----
 src/layouts/EmptyLayout.vue           | 4 ----
 src/main.js                           | 1 -
 src/mixins/socket.js                  | 3 +--
 src/pages/DashboardHome.vue           | 4 +++-
 src/pages/Details.vue                 | 4 ++--
 15 files changed, 15 insertions(+), 41 deletions(-)

diff --git a/server/model/heartbeat.js b/server/model/heartbeat.js
index 0e492ada1..546794140 100644
--- a/server/model/heartbeat.js
+++ b/server/model/heartbeat.js
@@ -9,6 +9,7 @@ const { BeanModel } = require("redbean-node/dist/bean-model");
  * status:
  *      0 = DOWN
  *      1 = UP
+ *      2 = PENDING
  */
 class Heartbeat extends BeanModel {
 
diff --git a/server/model/monitor.js b/server/model/monitor.js
index 27f3f9bab..b725f43c6 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -22,6 +22,7 @@ const customAgent = new https.Agent({
  * status:
  *      0 = DOWN
  *      1 = UP
+ *      2 = PENDING
  */
 class Monitor extends BeanModel {
     async toJSON() {
@@ -197,7 +198,7 @@ class Monitor extends BeanModel {
             if (bean.status === UP) {
                 console.info(`Monitor #${this.id} '${this.name}': Successful Response: ${bean.ping} ms | Interval: ${this.interval} seconds | Type: ${this.type}`)
             } else if (bean.status === PENDING) {
-                console.warn(`Monitor #${this.id} '${this.name}': Pending: ${bean.msg} | Type: ${this.type}`)
+                console.warn(`Monitor #${this.id} '${this.name}': Pending: ${bean.msg} | Max retries: ${this.maxretries} | Type: ${this.type}`)
             } else {
                 console.warn(`Monitor #${this.id} '${this.name}': Failing: ${bean.msg} | Type: ${this.type}`)
             }
diff --git a/src/App.vue b/src/App.vue
index 974757a63..a16d42085 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,7 +5,3 @@
 <script>
 export default {}
 </script>
-
-<style lang="scss">
-
-</style>
diff --git a/src/components/Confirm.vue b/src/components/Confirm.vue
index ecf165a00..36d3781a6 100644
--- a/src/components/Confirm.vue
+++ b/src/components/Confirm.vue
@@ -50,7 +50,3 @@ export default {
     },
 }
 </script>
-
-<style scoped>
-
-</style>
diff --git a/src/components/CountUp.vue b/src/components/CountUp.vue
index 1d2a4c556..c63aea14b 100644
--- a/src/components/CountUp.vue
+++ b/src/components/CountUp.vue
@@ -12,11 +12,11 @@ export default {
     props: {
         value: [String, Number],
         time: {
-            Number,
+            type: Number,
             default: 0.3,
         },
         unit: {
-            String,
+            type: String,
             default: "ms",
         },
     },
@@ -61,7 +61,3 @@ export default {
 
 }
 </script>
-
-<style scoped>
-
-</style>
diff --git a/src/components/Datetime.vue b/src/components/Datetime.vue
index 365e9fca3..84093afb1 100644
--- a/src/components/Datetime.vue
+++ b/src/components/Datetime.vue
@@ -35,7 +35,3 @@ export default {
     },
 }
 </script>
-
-<style scoped>
-
-</style>
diff --git a/src/components/HeartbeatBar.vue b/src/components/HeartbeatBar.vue
index 7ee94317d..bfcb90850 100644
--- a/src/components/HeartbeatBar.vue
+++ b/src/components/HeartbeatBar.vue
@@ -69,7 +69,7 @@ export default {
             let width
             if (this.maxBeat > 0) {
                 width = (this.beatWidth + this.beatMargin * 2) * this.maxBeat + (leftRight * 2) + "px"
-            } {
+            } else {
                 width = "100%"
             }
 
diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index 3adbe4af1..83a0d1800 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -496,7 +496,3 @@ export default {
     },
 }
 </script>
-
-<style scoped>
-
-</style>
diff --git a/src/components/Status.vue b/src/components/Status.vue
index c0549821b..a8f2ea596 100644
--- a/src/components/Status.vue
+++ b/src/components/Status.vue
@@ -17,8 +17,8 @@ export default {
             } if (this.status === 2) {
                 return "warning"
             }
-            return "secondary"
 
+            return "secondary"
         },
 
         text() {
@@ -29,8 +29,8 @@ export default {
             } if (this.status === 2) {
                 return "Pending"
             }
-            return "Unknown"
 
+            return "Unknown"
         },
     },
 }
diff --git a/src/components/Uptime.vue b/src/components/Uptime.vue
index e9c6f5830..411ff95d5 100644
--- a/src/components/Uptime.vue
+++ b/src/components/Uptime.vue
@@ -8,7 +8,7 @@ export default {
         monitor: Object,
         type: String,
         pill: {
-            Boolean,
+            type: Boolean,
             default: false,
         },
     },
@@ -57,7 +57,3 @@ export default {
     },
 }
 </script>
-
-<style scoped>
-
-</style>
diff --git a/src/layouts/EmptyLayout.vue b/src/layouts/EmptyLayout.vue
index 6f9965873..a16d42085 100644
--- a/src/layouts/EmptyLayout.vue
+++ b/src/layouts/EmptyLayout.vue
@@ -5,7 +5,3 @@
 <script>
 export default {}
 </script>
-
-<style scoped>
-
-</style>
diff --git a/src/main.js b/src/main.js
index e76db1edf..6eb296dc2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -91,4 +91,3 @@ app.use(Toast, options);
 app.component("FontAwesomeIcon", FontAwesomeIcon)
 
 app.mount("#app")
-
diff --git a/src/mixins/socket.js b/src/mixins/socket.js
index 85cb4e2c3..585b929ea 100644
--- a/src/mixins/socket.js
+++ b/src/mixins/socket.js
@@ -254,8 +254,8 @@ export default {
             if (this.userTimezone === "auto") {
                 return dayjs.tz.guess()
             }
-            return this.userTimezone
 
+            return this.userTimezone
         },
 
         lastHeartbeatList() {
@@ -322,4 +322,3 @@ export default {
     },
 
 }
-
diff --git a/src/pages/DashboardHome.vue b/src/pages/DashboardHome.vue
index 657a3a490..1fd4f6028 100644
--- a/src/pages/DashboardHome.vue
+++ b/src/pages/DashboardHome.vue
@@ -146,7 +146,9 @@ export default {
             result.sort((a, b) => {
                 if (a.time > b.time) {
                     return -1;
-                } if (a.time < b.time) {
+                }
+
+                if (a.time < b.time) {
                     return 1;
                 }
 
diff --git a/src/pages/Details.vue b/src/pages/Details.vue
index a83e238fc..20ce046df 100644
--- a/src/pages/Details.vue
+++ b/src/pages/Details.vue
@@ -45,7 +45,7 @@
                 <span class="num"><CountUp :value="ping" /></span>
             </div>
             <div class="col">
-                <h4>Avg.{{ pingTitle }}</h4>
+                <h4>Avg. {{ pingTitle }}</h4>
                 <p>(24-hour)</p>
                 <span class="num"><CountUp :value="avgPing" /></span>
             </div>
@@ -61,7 +61,7 @@
             </div>
 
             <div v-if="certInfo" class="col">
-                <h4>CertExp.</h4>
+                <h4>Cert Exp.</h4>
                 <p>(<Datetime :value="certInfo.validTo" date-only />)</p>
                 <span class="num">
                     <a href="#" @click.prevent="toggleCertInfoBox = !toggleCertInfoBox">{{ certInfo.daysRemaining }} days</a>