From 3832025b0c404498c798148f1e7c52f34dce372a Mon Sep 17 00:00:00 2001
From: Andreas Waschinski <25221082+waschinski@users.noreply.github.com>
Date: Sat, 10 Jul 2021 02:02:57 +0200
Subject: Improving Adguard Home service

Showing "x.x% blocked" similar to how the PiHole service is doing it.
The status text will no longer be `true/false` but `enabled/disabled`.
Endpoints require to be logged in so fetch does now send cookies to prevent 403s.
---
 src/components/services/AdGuardHome.vue | 40 +++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)

(limited to 'src/components/services/AdGuardHome.vue')

diff --git a/src/components/services/AdGuardHome.vue b/src/components/services/AdGuardHome.vue
index 6ef5302..0c689b9 100644
--- a/src/components/services/AdGuardHome.vue
+++ b/src/components/services/AdGuardHome.vue
@@ -16,14 +16,21 @@
             </div>
             <div class="media-content">
               <p class="title is-4">{{ item.name }}</p>
-              <p class="subtitle is-6">{{ item.subtitle }}</p>
+              <p class="subtitle is-6">
+                <template v-if="item.subtitle">
+                  {{ item.subtitle }}
+                </template>
+                <template v-else-if="stats">
+                  {{ percentage }}&percnt; blocked
+                </template>
+              </p>
             </div>
             <div
               v-if="status"
               class="status"
               v-bind:class="status.protection_enabled ? 'enabled' : 'disabled'"
             >
-              {{ status.protection_enabled }}
+              {{ status.protection_enabled ? 'enabled' : 'disabled' }}
             </div>
           </div>
           <div class="tag" :class="item.tagstyle" v-if="item.tag">
@@ -44,16 +51,41 @@ export default {
   data: () => {
     return {
       status: null,
+      stats: null,
     };
   },
+  computed: {
+    percentage: function () {
+      if (this.stats) {
+        return (this.stats.num_blocked_filtering * 100 / this.stats.num_dns_queries).toFixed(2);
+      }
+      return "";
+    },
+  },
   created: function () {
     this.fetchStatus();
+    if (!this.item.subtitle) {
+      this.fetchStats();
+    }
   },
   methods: {
     fetchStatus: async function () {
       this.status = await fetch(
-        `${this.item.url}/control/status`
-      ).then((response) => response.json());
+        `${this.item.url}/control/status`,
+        {
+          credentials: 'include'
+        }
+      ).then((response) => response.json())
+      .catch((e) => console.log(e));
+    },
+    fetchStats: async function () {
+      this.stats = await fetch(
+        `${this.item.url}/control/stats`,
+        {
+          credentials: 'include'
+        }
+      ).then((response) => response.json())
+      .catch((e) => console.log(e));
     },
   },
 };
-- 
cgit v1.2.3


From bebb6953cb1e5b61be000b3f2d76a27256bff3d9 Mon Sep 17 00:00:00 2001
From: Andreas Waschinski <25221082+waschinski@users.noreply.github.com>
Date: Sat, 10 Jul 2021 09:58:17 +0200
Subject: Adding status "unknown"

Changing code as per linter
---
 src/components/services/AdGuardHome.vue | 48 ++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 21 deletions(-)

(limited to 'src/components/services/AdGuardHome.vue')

diff --git a/src/components/services/AdGuardHome.vue b/src/components/services/AdGuardHome.vue
index 0c689b9..9aeaf39 100644
--- a/src/components/services/AdGuardHome.vue
+++ b/src/components/services/AdGuardHome.vue
@@ -25,12 +25,8 @@
                 </template>
               </p>
             </div>
-            <div
-              v-if="status"
-              class="status"
-              v-bind:class="status.protection_enabled ? 'enabled' : 'disabled'"
-            >
-              {{ status.protection_enabled ? 'enabled' : 'disabled' }}
+            <div v-if="!item.subtitle" class="status" :class="protection">
+              {{ protection }}
             </div>
           </div>
           <div class="tag" :class="item.tagstyle" v-if="item.tag">
@@ -57,10 +53,18 @@ export default {
   computed: {
     percentage: function () {
       if (this.stats) {
-        return (this.stats.num_blocked_filtering * 100 / this.stats.num_dns_queries).toFixed(2);
+        return (
+          (this.stats.num_blocked_filtering * 100) /
+          this.stats.num_dns_queries
+        ).toFixed(2);
       }
       return "";
     },
+    protection: function () {
+      if (this.status) {
+        return this.status.protection_enabled ? "enabled" : "disabled";
+      } else return "unknown";
+    },
   },
   created: function () {
     this.fetchStatus();
@@ -70,22 +74,18 @@ export default {
   },
   methods: {
     fetchStatus: async function () {
-      this.status = await fetch(
-        `${this.item.url}/control/status`,
-        {
-          credentials: 'include'
-        }
-      ).then((response) => response.json())
-      .catch((e) => console.log(e));
+      this.status = await fetch(`${this.item.url}/control/status`, {
+        credentials: "include",
+      })
+        .then((response) => response.json())
+        .catch((e) => console.log(e));
     },
     fetchStats: async function () {
-      this.stats = await fetch(
-        `${this.item.url}/control/stats`,
-        {
-          credentials: 'include'
-        }
-      ).then((response) => response.json())
-      .catch((e) => console.log(e));
+      this.stats = await fetch(`${this.item.url}/control/stats`, {
+        credentials: "include",
+      })
+        .then((response) => response.json())
+        .catch((e) => console.log(e));
     },
   },
 };
@@ -111,6 +111,12 @@ export default {
     box-shadow: 0px 0px 4px 1px #c9404d;
   }
 
+  &.unknown:before {
+    background-color: #c9c740;
+    border-color: #ccc935;
+    box-shadow: 0px 0px 4px 1px #c9c740;
+  }
+
   &:before {
     content: " ";
     display: inline-block;
-- 
cgit v1.2.3


From b63add2f9573ba62db76972274fbb30ef4577610 Mon Sep 17 00:00:00 2001
From: Andreas Waschinski <25221082+waschinski@users.noreply.github.com>
Date: Tue, 14 Sep 2021 22:44:42 +0200
Subject: Status visibility no longer depending on subtitle

---
 src/components/services/AdGuardHome.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/components/services/AdGuardHome.vue')

diff --git a/src/components/services/AdGuardHome.vue b/src/components/services/AdGuardHome.vue
index 9aeaf39..61d4bed 100644
--- a/src/components/services/AdGuardHome.vue
+++ b/src/components/services/AdGuardHome.vue
@@ -25,7 +25,7 @@
                 </template>
               </p>
             </div>
-            <div v-if="!item.subtitle" class="status" :class="protection">
+            <div class="status" :class="protection">
               {{ protection }}
             </div>
           </div>
-- 
cgit v1.2.3


From 2ca4faad9cb336ac8904bbc775fdcc2a12731b90 Mon Sep 17 00:00:00 2001
From: Bastien Wirtz <bastien.wirtz@gmail.com>
Date: Wed, 6 Oct 2021 22:55:09 +0200
Subject: Extendable base service for easier development.

---
 src/components/services/AdGuardHome.vue | 60 +++++++++++++--------------------
 1 file changed, 23 insertions(+), 37 deletions(-)

(limited to 'src/components/services/AdGuardHome.vue')

diff --git a/src/components/services/AdGuardHome.vue b/src/components/services/AdGuardHome.vue
index 61d4bed..16881fa 100644
--- a/src/components/services/AdGuardHome.vue
+++ b/src/components/services/AdGuardHome.vue
@@ -1,49 +1,35 @@
 <template>
-  <div>
-    <div class="card" :class="item.class">
-      <a :href="item.url" :target="item.target" rel="noreferrer">
-        <div class="card-content">
-          <div class="media">
-            <div v-if="item.logo" class="media-left">
-              <figure class="image is-48x48">
-                <img :src="item.logo" :alt="`${item.name} logo`" />
-              </figure>
-            </div>
-            <div v-if="item.icon" class="media-left">
-              <figure class="image is-48x48">
-                <i style="font-size: 35px" :class="['fa-fw', item.icon]"></i>
-              </figure>
-            </div>
-            <div class="media-content">
-              <p class="title is-4">{{ item.name }}</p>
-              <p class="subtitle is-6">
-                <template v-if="item.subtitle">
-                  {{ item.subtitle }}
-                </template>
-                <template v-else-if="stats">
-                  {{ percentage }}&percnt; blocked
-                </template>
-              </p>
-            </div>
-            <div class="status" :class="protection">
-              {{ protection }}
-            </div>
-          </div>
-          <div class="tag" :class="item.tagstyle" v-if="item.tag">
-            <strong class="tag-text">#{{ item.tag }}</strong>
-          </div>
-        </div>
-      </a>
-    </div>
-  </div>
+  <Generic :item="item">
+    <template #content>
+      <p class="title is-4">{{ item.name }}</p>
+      <p class="subtitle is-6">
+        <template v-if="item.subtitle">
+          {{ item.subtitle }}
+        </template>
+        <template v-else-if="stats">
+          {{ percentage }}&percnt; blocked
+        </template>
+      </p>
+    </template>
+    <template #indicator>
+      <div class="status" :class="protection">
+        {{ protection }}
+      </div>
+    </template>
+  </Generic>
 </template>
 
 <script>
+import Generic from "./Generic.vue";
+
 export default {
   name: "AdGuardHome",
   props: {
     item: Object,
   },
+  components: {
+    Generic,
+  },
   data: () => {
     return {
       status: null,
-- 
cgit v1.2.3

