From d94894b7e0b57f345203918f1af3665cca2be00a Mon Sep 17 00:00:00 2001
From: Adam Stachowicz <adam.stachowicz@fingo.info>
Date: Sun, 18 Jul 2021 03:10:15 +0200
Subject: [PATCH] Fix `require-v-for-key`, remove unused declarations and
 double spaces

---
 server/model/heartbeat.js             |  2 --
 server/notification.js                | 15 ++++++++-------
 server/server.js                      |  4 ----
 src/components/Datetime.vue           |  6 +++---
 src/components/NotificationDialog.vue | 10 +++++-----
 src/pages/Dashboard.vue               |  2 +-
 src/pages/Details.vue                 |  2 +-
 src/pages/EditMonitor.vue             |  2 +-
 src/pages/Settings.vue                |  8 ++++----
 src/util-frontend.js                  |  6 +++---
 10 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/server/model/heartbeat.js b/server/model/heartbeat.js
index 74e329811..01fb71ff9 100644
--- a/server/model/heartbeat.js
+++ b/server/model/heartbeat.js
@@ -3,8 +3,6 @@ const utc = require('dayjs/plugin/utc')
 var timezone = require('dayjs/plugin/timezone')
 dayjs.extend(utc)
 dayjs.extend(timezone)
-const axios = require("axios");
-const {R} = require("redbean-node");
 const {BeanModel} = require("redbean-node/dist/bean-model");
 
 
diff --git a/server/notification.js b/server/notification.js
index 99cc1568c..9e6c5e065 100644
--- a/server/notification.js
+++ b/server/notification.js
@@ -58,7 +58,7 @@ class Notification {
                     finalData = data;
                 }
 
-                let res = await axios.post(notification.webhookURL, finalData, config)
+                await axios.post(notification.webhookURL, finalData, config)
                 return true;
             } catch (error) {
                 console.log(error)
@@ -102,7 +102,8 @@ class Notification {
                   ]
                 }]
               }
-              let res = await axios.post(notification.discordWebhookUrl, data)
+
+              await axios.post(notification.discordWebhookUrl, data)
               return true;
             } catch(error) {
               console.log(error)
@@ -118,18 +119,18 @@ class Notification {
             };
             let config = {};
 
-            let res = await axios.post(notification.signalURL, data, config)
+            await axios.post(notification.signalURL, data, config)
             return true;
         } catch (error) {
             console.log(error)
             return false;
         }
-            
+
         } else if (notification.type === "slack") {
             try {
                 if (heartbeatJSON == null) {
                     let data = {'text': "Uptime Kuma Slack testing successful."}
-                    let res = await axios.post(notification.slackwebhookURL, data)
+                    await axios.post(notification.slackwebhookURL, data)
                     return true;
                 }
 
@@ -170,7 +171,7 @@ class Notification {
                             }
                         ]
                     }
-                let res = await axios.post(notification.slackwebhookURL, data)
+                await axios.post(notification.slackwebhookURL, data)
                 return true;
             } catch (error) {
                 console.log(error)
@@ -231,7 +232,7 @@ class Notification {
         });
 
         // send mail with defined transport object
-        let info = await transporter.sendMail({
+        await transporter.sendMail({
             from: `"Uptime Kuma" <${notification.smtpFrom}>`,
             to: notification.smtpTo,
             subject: msg,
diff --git a/server/server.js b/server/server.js
index 93e43cd6e..a64ff512e 100644
--- a/server/server.js
+++ b/server/server.js
@@ -162,10 +162,6 @@ let needSetup = false;
                     msg: e.message
                 });
             }
-
-
-
-
         });
 
         // Auth Only API
diff --git a/src/components/Datetime.vue b/src/components/Datetime.vue
index 47702236a..e84c877bc 100644
--- a/src/components/Datetime.vue
+++ b/src/components/Datetime.vue
@@ -4,9 +4,9 @@
 
 <script>
 import dayjs from "dayjs";
-import relativeTime  from "dayjs/plugin/relativeTime"
-import utc  from 'dayjs/plugin/utc'
-import timezone  from 'dayjs/plugin/timezone' // dependent on utc plugin
+import relativeTime from "dayjs/plugin/relativeTime"
+import utc from 'dayjs/plugin/utc'
+import timezone from 'dayjs/plugin/timezone' // dependent on utc plugin
 dayjs.extend(utc)
 dayjs.extend(timezone)
 dayjs.extend(relativeTime)
diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index 159915177..114042b16 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -12,7 +12,7 @@
 
                             <div class="mb-3">
                                 <label for="type" class="form-label">Notification Type</label>
-                                <select class="form-select"  id="type" v-model="notification.type">
+                                <select class="form-select" id="type" v-model="notification.type">
                                     <option value="telegram">Telegram</option>
                                     <option value="webhook">Webhook</option>
                                     <option value="smtp">Email (SMTP)</option>
@@ -67,13 +67,13 @@
                         <template v-if="notification.type === 'webhook'">
                             <div class="mb-3">
                                 <label for="webhook-url" class="form-label">Post URL</label>
-                                <input type="url" pattern="https?://.+"  class="form-control" id="webhook-url" required v-model="notification.webhookURL">
+                                <input type="url" pattern="https?://.+" class="form-control" id="webhook-url" required v-model="notification.webhookURL">
 
                             </div>
 
                             <div class="mb-3">
                                 <label for="webhook-content-type" class="form-label">Content Type</label>
-                                <select class="form-select"  id="webhook-content-type" v-model="notification.webhookContentType" required>
+                                <select class="form-select" id="webhook-content-type" v-model="notification.webhookContentType" required>
                                     <option value="json">application/json</option>
                                     <option value="form-data">multipart/form-data</option>
                                 </select>
@@ -98,7 +98,7 @@
 
                             <div class="mb-3">
                                 <div class="form-check">
-                                    <input class="form-check-input" type="checkbox" value="" id="secure"  v-model="notification.smtpSecure">
+                                    <input class="form-check-input" type="checkbox" value="" id="secure" v-model="notification.smtpSecure">
                                     <label class="form-check-label" for="secure">
                                         Secure
                                     </label>
@@ -139,7 +139,7 @@
                         <template v-if="notification.type === 'signal'">
                             <div class="mb-3">
                                 <label for="signal-url" class="form-label">Post URL</label>
-                                <input type="url" pattern="https?://.+"  class="form-control" id="signal-url" required v-model="notification.signalURL">
+                                <input type="url" pattern="https?://.+" class="form-control" id="signal-url" required v-model="notification.signalURL">
 
                             </div>
 
diff --git a/src/pages/Dashboard.vue b/src/pages/Dashboard.vue
index c42f27656..7084c467a 100644
--- a/src/pages/Dashboard.vue
+++ b/src/pages/Dashboard.vue
@@ -13,7 +13,7 @@
                         No Monitors, please <router-link to="/add">add one</router-link>.
                     </div>
 
-                    <router-link :to="monitorURL(item.id)" class="item" :class="{ 'disabled': ! item.active }" v-for="item in sortedMonitorList" @click="$root.cancelActiveList">
+                    <router-link :to="monitorURL(item.id)" class="item" :class="{ 'disabled': ! item.active }" v-for="(item, index) in sortedMonitorList" @click="$root.cancelActiveList" :key="index">
 
                         <div class="row">
                         	<div class="col-6 col-md-8 small-padding">
diff --git a/src/pages/Details.vue b/src/pages/Details.vue
index f925c2849..ba4f9478a 100644
--- a/src/pages/Details.vue
+++ b/src/pages/Details.vue
@@ -12,7 +12,7 @@
 
     <div class="functions">
         <button class="btn btn-light" @click="pauseDialog" v-if="monitor.active">Pause</button>
-        <button class="btn btn-primary" @click="resumeMonitor"  v-if="! monitor.active">Resume</button>
+        <button class="btn btn-primary" @click="resumeMonitor" v-if="! monitor.active">Resume</button>
         <router-link :to=" '/edit/' + monitor.id " class="btn btn-secondary">Edit</router-link>
         <button class="btn btn-danger" @click="deleteDialog">Delete</button>
     </div>
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 01af50610..7a72cd139 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -61,7 +61,7 @@
                 <h2>Notifications</h2>
                 <p v-if="$root.notificationList.length === 0">Not available, please setup.</p>
 
-                <div class="form-check form-switch mb-3" v-for="notification in $root.notificationList">
+                <div class="form-check form-switch mb-3" v-for="(notification, index) in $root.notificationList" :key="index">
                     <input class="form-check-input" type="checkbox" :id=" 'notification' + notification.id" v-model="monitor.notificationIDList[notification.id]">
 
                     <label class="form-check-label" :for=" 'notification' + notification.id">
diff --git a/src/pages/Settings.vue b/src/pages/Settings.vue
index e5670f507..daa521981 100644
--- a/src/pages/Settings.vue
+++ b/src/pages/Settings.vue
@@ -11,7 +11,7 @@
                         <label for="timezone" class="form-label">Timezone</label>
                         <select class="form-select" id="timezone" v-model="$root.userTimezone">
                             <option value="auto">Auto: {{ guessTimezone }}</option>
-                            <option v-for="timezone in timezoneList" :value="timezone.value">{{ timezone.name }}</option>
+                            <option v-for="(timezone, index) in timezoneList" :value="timezone.value" :key="index">{{ timezone.name }}</option>
                         </select>
                     </div>
 
@@ -59,7 +59,7 @@
                 <p v-else>Please assign the notification to monitor(s) to get it works.</p>
 
                 <ul class="list-group mb-3" style="border-radius: 1rem;">
-                    <li  class="list-group-item"  v-for="notification in $root.notificationList">
+                    <li class="list-group-item" v-for="(notification, index) in $root.notificationList" :key="index">
                         {{ notification.name }}<br />
                         <a href="#" @click="$refs.notificationDialog.show(notification.id)">Edit</a>
                     </li>
@@ -77,8 +77,8 @@
 
 <script>
 import dayjs from "dayjs";
-import utc  from 'dayjs/plugin/utc'
-import timezone  from 'dayjs/plugin/timezone'
+import utc from 'dayjs/plugin/utc'
+import timezone from 'dayjs/plugin/timezone'
 import NotificationDialog from "../components/NotificationDialog.vue";
 dayjs.extend(utc)
 dayjs.extend(timezone)
diff --git a/src/util-frontend.js b/src/util-frontend.js
index 7094c159b..a2c31f45e 100644
--- a/src/util-frontend.js
+++ b/src/util-frontend.js
@@ -1,6 +1,6 @@
 import dayjs from "dayjs";
-import utc  from 'dayjs/plugin/utc'
-import timezone  from 'dayjs/plugin/timezone'
+import utc from 'dayjs/plugin/utc'
+import timezone from 'dayjs/plugin/timezone'
 
 dayjs.extend(utc)
 dayjs.extend(timezone)
@@ -29,6 +29,7 @@ function getTimezoneOffset(timeZone) {
 }
 
 // From: https://stackoverflow.com/questions/38399465/how-to-get-list-of-all-timezones-in-javascript
+// TODO: Move to separate file
 const aryIannaTimeZones = [
     'Europe/Andorra',
     'Asia/Dubai',
@@ -412,4 +413,3 @@ export function timezoneList() {
 
     return result;
 };
-