aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/components
diff options
context:
space:
mode:
authorAndreas Waschinski <25221082+waschinski@users.noreply.github.com>2021-07-28 16:13:50 +0200
committerAndreas Waschinski <25221082+waschinski@users.noreply.github.com>2021-07-28 16:13:50 +0200
commitb2062fb60ad2845bcba8a517220ca3637e1a885b (patch)
treed0dce6450034f697618c117383a67af0ac03075d /src/components
parent4386cd094b4e7869a7fa5aad3a9df9cd1d282021 (diff)
parent35926e1e6e4669e881b8f69003f97752172eb922 (diff)
downloadhomer-b2062fb60ad2845bcba8a517220ca3637e1a885b.tar.gz
homer-b2062fb60ad2845bcba8a517220ca3637e1a885b.tar.zst
homer-b2062fb60ad2845bcba8a517220ca3637e1a885b.zip
Merge remote-tracking branch 'upstream/main' into mealie-service
Diffstat (limited to 'src/components')
-rw-r--r--src/components/ConnectivityChecker.vue4
-rw-r--r--src/components/services/AdGuardHome.vue6
-rw-r--r--src/components/services/PaperlessNG.vue18
-rw-r--r--src/components/services/PiHole.vue4
-rw-r--r--src/components/services/Ping.vue29
5 files changed, 34 insertions, 27 deletions
diff --git a/src/components/ConnectivityChecker.vue b/src/components/ConnectivityChecker.vue
index d41c443..02cbd7f 100644
--- a/src/components/ConnectivityChecker.vue
+++ b/src/components/ConnectivityChecker.vue
@@ -37,8 +37,8 @@ export default {
37 method: "HEAD", 37 method: "HEAD",
38 cache: "no-store", 38 cache: "no-store",
39 }) 39 })
40 .then(function () { 40 .then(function (response) {
41 that.offline = false; 41 that.offline = !response.ok;
42 }) 42 })
43 .catch(function () { 43 .catch(function () {
44 that.offline = true; 44 that.offline = true;
diff --git a/src/components/services/AdGuardHome.vue b/src/components/services/AdGuardHome.vue
index 6ef5302..d4a2b89 100644
--- a/src/components/services/AdGuardHome.vue
+++ b/src/components/services/AdGuardHome.vue
@@ -51,9 +51,9 @@ export default {
51 }, 51 },
52 methods: { 52 methods: {
53 fetchStatus: async function () { 53 fetchStatus: async function () {
54 this.status = await fetch( 54 this.status = await fetch(`${this.item.url}/control/status`).then(
55 `${this.item.url}/control/status` 55 (response) => response.json()
56 ).then((response) => response.json()); 56 );
57 }, 57 },
58 }, 58 },
59}; 59};
diff --git a/src/components/services/PaperlessNG.vue b/src/components/services/PaperlessNG.vue
index c4f50eb..4fb31f8 100644
--- a/src/components/services/PaperlessNG.vue
+++ b/src/components/services/PaperlessNG.vue
@@ -52,20 +52,22 @@ export default {
52 if (this.item.subtitle != null) return; // omitting unnecessary ajax call as the subtitle is showing 52 if (this.item.subtitle != null) return; // omitting unnecessary ajax call as the subtitle is showing
53 var apikey = this.item.apikey; 53 var apikey = this.item.apikey;
54 if (!apikey) { 54 if (!apikey) {
55 console.error("apikey is not present in config.yml for the paperless entry!"); 55 console.error(
56 "apikey is not present in config.yml for the paperless entry!"
57 );
56 return; 58 return;
57 } 59 }
58 const url = `${this.item.url}/api/documents/`; 60 const url = `${this.item.url}/api/documents/`;
59 this.api = await fetch(url, { 61 this.api = await fetch(url, {
60 headers: { 62 headers: {
61 "Authorization": "Token " + this.item.apikey 63 Authorization: "Token " + this.item.apikey,
62 } 64 },
63 }) 65 })
64 .then(function(response) { 66 .then(function (response) {
65 if (!response.ok) { 67 if (!response.ok) {
66 throw new Error("Not 2xx response") 68 throw new Error("Not 2xx response");
67 } else { 69 } else {
68 return response.json() 70 return response.json();
69 } 71 }
70 }) 72 })
71 .catch((e) => console.log(e)); 73 .catch((e) => console.log(e));
diff --git a/src/components/services/PiHole.vue b/src/components/services/PiHole.vue
index a9fd369..7042a7b 100644
--- a/src/components/services/PiHole.vue
+++ b/src/components/services/PiHole.vue
@@ -83,13 +83,13 @@ export default {
83 &.enabled:before { 83 &.enabled:before {
84 background-color: #94e185; 84 background-color: #94e185;
85 border-color: #78d965; 85 border-color: #78d965;
86 box-shadow: 0 0 4px 1px #94e185; 86 box-shadow: 0 0 5px 1px #94e185;
87 } 87 }
88 88
89 &.disabled:before { 89 &.disabled:before {
90 background-color: #c9404d; 90 background-color: #c9404d;
91 border-color: #c42c3b; 91 border-color: #c42c3b;
92 box-shadow: 0 0 4px 1px #c9404d; 92 box-shadow: 0 0 5px 1px #c9404d;
93 } 93 }
94 94
95 &:before { 95 &:before {
diff --git a/src/components/services/Ping.vue b/src/components/services/Ping.vue
index a9114a8..8a9b7a4 100644
--- a/src/components/services/Ping.vue
+++ b/src/components/services/Ping.vue
@@ -22,8 +22,8 @@
22 </template> 22 </template>
23 </p> 23 </p>
24 </div> 24 </div>
25 <div v-if="api" class="status" :class="api.status"> 25 <div v-if="status" class="status" :class="status">
26 {{ api.status }} 26 {{ status }}
27 </div> 27 </div>
28 </div> 28 </div>
29 <div class="tag" :class="item.tagstyle" v-if="item.tag"> 29 <div class="tag" :class="item.tagstyle" v-if="item.tag">
@@ -42,9 +42,7 @@ export default {
42 item: Object, 42 item: Object,
43 }, 43 },
44 data: () => ({ 44 data: () => ({
45 api: { 45 status: null,
46 status: "",
47 },
48 }), 46 }),
49 created() { 47 created() {
50 this.fetchStatus(); 48 this.fetchStatus();
@@ -52,9 +50,16 @@ export default {
52 methods: { 50 methods: {
53 fetchStatus: async function () { 51 fetchStatus: async function () {
54 const url = `${this.item.url}`; 52 const url = `${this.item.url}`;
55 this.api.status = await fetch(url) 53 fetch(url, { method: "HEAD", cache: "no-cache" })
56 .then((response) => "enabled") 54 .then((response) => {
57 .catch((e) => "disabled"); 55 if (!response.ok) {
56 throw Error(response.statusText);
57 }
58 this.status = "online";
59 })
60 .catch(() => {
61 this.status = "offline";
62 });
58 }, 63 },
59 }, 64 },
60}; 65};
@@ -68,16 +73,16 @@ export default {
68 font-size: 0.8rem; 73 font-size: 0.8rem;
69 color: var(--text-title); 74 color: var(--text-title);
70 75
71 &.enabled:before { 76 &.online:before {
72 background-color: #94e185; 77 background-color: #94e185;
73 border-color: #78d965; 78 border-color: #78d965;
74 box-shadow: 0 0 4px 1px #94e185; 79 box-shadow: 0 0 5px 1px #94e185;
75 } 80 }
76 81
77 &.disabled:before { 82 &.offline:before {
78 background-color: #c9404d; 83 background-color: #c9404d;
79 border-color: #c42c3b; 84 border-color: #c42c3b;
80 box-shadow: 0 0 4px 1px #c9404d; 85 box-shadow: 0 0 5px 1px #c9404d;
81 } 86 }
82 87
83 &:before { 88 &:before {