From 45c162583b25324bc54a7672cfafbb9e650fb98c Mon Sep 17 00:00:00 2001
From: Ponkhy <xtheponkhx@gmail.com>
Date: Wed, 11 Aug 2021 11:16:53 +0200
Subject: [PATCH 1/7] Added more space over the badge on mobile screens

---
 src/pages/Details.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/pages/Details.vue b/src/pages/Details.vue
index 58ee68a22..f0be0d3d0 100644
--- a/src/pages/Details.vue
+++ b/src/pages/Details.vue
@@ -306,6 +306,12 @@ export default {
 <style lang="scss" scoped>
 @import "../assets/vars.scss";
 
+@media (max-width: 767px) { 
+    .badge {
+        margin-top: 14px;
+    }
+}
+
 @media (max-width: 550px) { 
     .functions {
         text-align: center;

From 233c5661afcd60dd13919a5b16ab8a71ab8865d2 Mon Sep 17 00:00:00 2001
From: Ponkhy <xtheponkhx@gmail.com>
Date: Sun, 15 Aug 2021 20:46:21 +0200
Subject: [PATCH 2/7] Added user choice heartbeat bar

---
 src/mixins/theme.js     | 15 +++++++++++++++
 src/pages/Dashboard.vue | 19 +++++++++++++++++--
 src/pages/Settings.vue  | 16 ++++++++++++++++
 3 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/src/mixins/theme.js b/src/mixins/theme.js
index 98b605a7a..8f4d96804 100644
--- a/src/mixins/theme.js
+++ b/src/mixins/theme.js
@@ -4,6 +4,7 @@ export default {
         return {
             system: (window.matchMedia("(prefers-color-scheme: dark)").matches) ? "dark" : "light",
             userTheme: localStorage.theme,
+            userHeartbeatBar: localStorage.heartbeatBarTheme
         };
     },
 
@@ -13,6 +14,11 @@ export default {
             this.userTheme = "light";
         }
 
+        //Default Heartbeat Bar
+        if (! this.userHeartbeatBar) {
+            this.userHeartbeatBar = "normal";
+        }
+
         document.body.classList.add(this.theme);
         this.updateThemeColorMeta();
     },
@@ -35,6 +41,15 @@ export default {
             document.body.classList.remove(from);
             document.body.classList.add(this.theme);
             this.updateThemeColorMeta();
+        },
+
+        userHeartbeatBar(to, from) {
+            localStorage.heartbeatBarTheme = to;
+        },
+
+        heartbeatBarTheme(to, from) {
+            document.body.classList.remove(from);
+            document.body.classList.add(this.heartbeatBarTheme);
         }
     },
 
diff --git a/src/pages/Dashboard.vue b/src/pages/Dashboard.vue
index bb673db85..89ceae304 100644
--- a/src/pages/Dashboard.vue
+++ b/src/pages/Dashboard.vue
@@ -13,17 +13,24 @@
 
                     <router-link v-for="(item, index) in sortedMonitorList" :key="index" :to="monitorURL(item.id)" class="item" :class="{ 'disabled': ! item.active }" @click="$root.cancelActiveList">
                         <div class="row">
-                            <div class="col-6 col-md-8 small-padding">
+                            <div class="col-6 col-md-8 small-padding" v-bind:class="{ 'monitorItem': $root.userHeartbeatBar == 'bottom' || $root.userHeartbeatBar == 'none' }">
                                 <div class="info">
                                     <Uptime :monitor="item" type="24" :pill="true" />
                                     {{ item.name }}
                                 </div>
                             </div>
-                            <div class="col-6 col-md-4">
+                            <div class="col-6 col-md-4" v-bind:class="{ 'hideHeartbeatBar': $root.userHeartbeatBar == 'bottom' || $root.userHeartbeatBar == 'none' }">
+                                <HeartbeatBar size="small" :monitor-id="item.id" />
+                            </div>
+                        </div>
+
+                        <div class="row" v-if="$root.userHeartbeatBar == 'bottom'">
+                            <div class="col-12">
                                 <HeartbeatBar size="small" :monitor-id="item.id" />
                             </div>
                         </div>
                     </router-link>
+                    
                 </div>
             </div>
             <div class="col-12 col-md-7 col-xl-8">
@@ -146,4 +153,12 @@ export default {
     }
 }
 
+.hideHeartbeatBar {
+    display: none;
+}
+
+.monitorItem {
+    width: 100%;
+}
+
 </style>
diff --git a/src/pages/Settings.vue b/src/pages/Settings.vue
index 73e71172b..0ffd72d33 100644
--- a/src/pages/Settings.vue
+++ b/src/pages/Settings.vue
@@ -26,6 +26,22 @@
                         </div>
                     </div>
 
+                    <div class="mb-3">
+                        <label class="form-label">Theme - Heartbeat Bar</label>
+                        <div>
+                            <div class="btn-group" role="group" aria-label="Basic checkbox toggle button group">
+                                <input id="btncheck4" v-model="$root.userHeartbeatBar" type="radio" class="btn-check" name="heartbeatBarTheme" autocomplete="off" value="normal">
+                                <label class="btn btn-outline-primary" for="btncheck4">Normal</label>
+
+                                <input id="btncheck5" v-model="$root.userHeartbeatBar" type="radio" class="btn-check" name="heartbeatBarTheme" autocomplete="off" value="bottom">
+                                <label class="btn btn-outline-primary" for="btncheck5">Bottom</label>
+
+                                <input id="btncheck6" v-model="$root.userHeartbeatBar" type="radio" class="btn-check" name="heartbeatBarTheme" autocomplete="off" value="none">
+                                <label class="btn btn-outline-primary" for="btncheck6">None</label>
+                            </div>
+                        </div>
+                    </div>
+
                     <div class="mb-3">
                         <label for="timezone" class="form-label">Timezone</label>
                         <select id="timezone" v-model="$root.userTimezone" class="form-select">

From 8e883c9c6ac87d623aeb138ebe7e8522cea861a1 Mon Sep 17 00:00:00 2001
From: Ponkhy <43121732+Ponkhy@users.noreply.github.com>
Date: Mon, 16 Aug 2021 17:14:05 +0200
Subject: [PATCH 3/7] Update src/mixins/theme.js

Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
---
 src/mixins/theme.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mixins/theme.js b/src/mixins/theme.js
index 8f4d96804..75d6b06da 100644
--- a/src/mixins/theme.js
+++ b/src/mixins/theme.js
@@ -4,7 +4,7 @@ export default {
         return {
             system: (window.matchMedia("(prefers-color-scheme: dark)").matches) ? "dark" : "light",
             userTheme: localStorage.theme,
-            userHeartbeatBar: localStorage.heartbeatBarTheme
+            userHeartbeatBar: localStorage.heartbeatBarTheme,
         };
     },
 

From 35176a614f7c3439081f9e240807aa40e685744b Mon Sep 17 00:00:00 2001
From: Ponkhy <43121732+Ponkhy@users.noreply.github.com>
Date: Mon, 16 Aug 2021 17:14:13 +0200
Subject: [PATCH 4/7] Update src/mixins/theme.js

Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
---
 src/mixins/theme.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mixins/theme.js b/src/mixins/theme.js
index 75d6b06da..79b91c2a4 100644
--- a/src/mixins/theme.js
+++ b/src/mixins/theme.js
@@ -14,7 +14,7 @@ export default {
             this.userTheme = "light";
         }
 
-        //Default Heartbeat Bar
+        // Default Heartbeat Bar
         if (! this.userHeartbeatBar) {
             this.userHeartbeatBar = "normal";
         }

From 72f0724b9a9bc33a9ac18b3793a04f961f1b7353 Mon Sep 17 00:00:00 2001
From: Ponkhy <43121732+Ponkhy@users.noreply.github.com>
Date: Mon, 16 Aug 2021 17:14:21 +0200
Subject: [PATCH 5/7] Update src/mixins/theme.js

Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
---
 src/mixins/theme.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mixins/theme.js b/src/mixins/theme.js
index 79b91c2a4..44e375327 100644
--- a/src/mixins/theme.js
+++ b/src/mixins/theme.js
@@ -15,7 +15,7 @@ export default {
         }
 
         // Default Heartbeat Bar
-        if (! this.userHeartbeatBar) {
+        if (!this.userHeartbeatBar) {
             this.userHeartbeatBar = "normal";
         }
 

From 8d57df72564a9b2af43a859e5b70328748861b1c Mon Sep 17 00:00:00 2001
From: LouisLam <louislam@users.noreply.github.com>
Date: Tue, 17 Aug 2021 19:58:09 +0800
Subject: [PATCH 6/7] fix #226 a workaround fix similar to
 https://github.com/jvandemo/generator-angular2-library/issues/221#issuecomment-355945207

---
 src/util.js | 3 ++-
 src/util.ts | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/util.js b/src/util.js
index b1b7f7739..44eaebc69 100644
--- a/src/util.js
+++ b/src/util.js
@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TimeLogger = exports.polyfill = exports.debug = exports.ucfirst = exports.sleep = exports.flipStatus = exports.PENDING = exports.UP = exports.DOWN = exports.appName = exports.isDev = void 0;
-const dayjs = require("dayjs");
+const _dayjs = require("dayjs");
+const dayjs = _dayjs;
 exports.isDev = process.env.NODE_ENV === "development";
 exports.appName = "Uptime Kuma";
 exports.DOWN = 0;
diff --git a/src/util.ts b/src/util.ts
index bb55ee08b..add9f1935 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -4,7 +4,8 @@
 // Frontend uses util.ts
 // Need to run "tsc" to compile if there are any changes.
 
-import * as dayjs from "dayjs";
+import * as _dayjs from "dayjs";
+const dayjs = _dayjs;
 
 export const isDev = process.env.NODE_ENV === "development";
 export const appName = "Uptime Kuma";

From 77369bd00242adfb074466a0e48b2c88c969221f Mon Sep 17 00:00:00 2001
From: Ponkhy <xtheponkhx@gmail.com>
Date: Tue, 17 Aug 2021 15:40:22 +0200
Subject: [PATCH 7/7] Fixed invisible heartbeat bar after page switch

---
 src/pages/Dashboard.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/pages/Dashboard.vue b/src/pages/Dashboard.vue
index 89ceae304..5db704085 100644
--- a/src/pages/Dashboard.vue
+++ b/src/pages/Dashboard.vue
@@ -19,7 +19,7 @@
                                     {{ item.name }}
                                 </div>
                             </div>
-                            <div class="col-6 col-md-4" v-bind:class="{ 'hideHeartbeatBar': $root.userHeartbeatBar == 'bottom' || $root.userHeartbeatBar == 'none' }">
+                            <div class="col-6 col-md-4" v-show="$root.userHeartbeatBar == 'normal'" :key="$root.userHeartbeatBar">
                                 <HeartbeatBar size="small" :monitor-id="item.id" />
                             </div>
                         </div>
@@ -153,10 +153,6 @@ export default {
     }
 }
 
-.hideHeartbeatBar {
-    display: none;
-}
-
 .monitorItem {
     width: 100%;
 }