From 6f2b141bf7002810c5caa39331b1927722d42172 Mon Sep 17 00:00:00 2001 From: Georgi Gardev Date: Wed, 23 Dec 2020 16:11:47 +0200 Subject: Fix #167: align item name when subtitle is empty --- src/components/services/Generic.vue | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) (limited to 'src/components/services') diff --git a/src/components/services/Generic.vue b/src/components/services/Generic.vue index 3238ead..08bd3f6 100644 --- a/src/components/services/Generic.vue +++ b/src/components/services/Generic.vue @@ -1,16 +1,3 @@ - - - -*/ - - - - -

-
- {{ api.status }} +
+ {{ status }}
@@ -42,9 +42,7 @@ export default { item: Object, }, data: () => ({ - api: { - status: "", - }, + status: null, }), created() { this.fetchStatus(); @@ -52,9 +50,16 @@ export default { methods: { fetchStatus: async function () { const url = `${this.item.url}`; - this.api.status = await fetch(url) - .then(() => "enabled") - .catch(() => "disabled"); + fetch(url, { method: "HEAD", cache: "no-cache" }) + .then((response) => { + if (!response.ok) { + throw Error(response.statusText); + } + this.status = "online"; + }) + .catch(() => { + this.status = "offline"; + }); }, }, }; @@ -68,16 +73,16 @@ export default { font-size: 0.8rem; color: var(--text-title); - &.enabled:before { + &.online:before { background-color: #94e185; border-color: #78d965; - box-shadow: 0 0 4px 1px #94e185; + box-shadow: 0 0 5px 1px #94e185; } - &.disabled:before { + &.offline:before { background-color: #c9404d; border-color: #c42c3b; - box-shadow: 0 0 4px 1px #c9404d; + box-shadow: 0 0 5px 1px #c9404d; } &:before { -- cgit v1.2.3 From 25f99adc6c854f27dc1df4a88bf8da5b01812f46 Mon Sep 17 00:00:00 2001 From: rvk <329491+rvankraaij@users.noreply.github.com> Date: Wed, 4 Aug 2021 21:19:28 +0200 Subject: Fix CORS issue for Radarr and Sonarr services --- src/components/services/Radarr.vue | 10 ++-------- src/components/services/Sonarr.vue | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) (limited to 'src/components/services') diff --git a/src/components/services/Radarr.vue b/src/components/services/Radarr.vue index 93831a7..3b88083 100644 --- a/src/components/services/Radarr.vue +++ b/src/components/services/Radarr.vue @@ -70,10 +70,7 @@ export default { }, methods: { fetchConfig: function () { - fetch(`${this.item.url}/api/health`, { - credentials: "include", - headers: { "X-Api-Key": `${this.item.apikey}` }, - }) + fetch(`${this.item.url}/api/health?apiKey=${this.item.apikey}`) .then((response) => { if (response.status != 200) { throw new Error(response.statusText); @@ -95,10 +92,7 @@ export default { console.error(e); this.serverError = true; }); - fetch(`${this.item.url}/api/queue`, { - credentials: "include", - headers: { "X-Api-Key": `${this.item.apikey}` }, - }) + fetch(`${this.item.url}/api/queue?apiKey=${this.item.apikey}`) .then((response) => { if (response.status != 200) { throw new Error(response.statusText); diff --git a/src/components/services/Sonarr.vue b/src/components/services/Sonarr.vue index 8cebac4..3460067 100644 --- a/src/components/services/Sonarr.vue +++ b/src/components/services/Sonarr.vue @@ -70,10 +70,7 @@ export default { }, methods: { fetchConfig: function () { - fetch(`${this.item.url}/api/health`, { - credentials: "include", - headers: { "X-Api-Key": `${this.item.apikey}` }, - }) + fetch(`${this.item.url}/api/health?apiKey=${this.item.apikey}`) .then((response) => { if (response.status != 200) { throw new Error(response.statusText); @@ -95,10 +92,7 @@ export default { console.error(e); this.serverError = true; }); - fetch(`${this.item.url}/api/queue`, { - credentials: "include", - headers: { "X-Api-Key": `${this.item.apikey}` }, - }) + fetch(`${this.item.url}/api/queue?apiKey=${this.item.apikey}`) .then((response) => { if (response.status != 200) { throw new Error(response.statusText); -- cgit v1.2.3 From 304362adfd5fe06d7b55fe99087543e09f1ef3d8 Mon Sep 17 00:00:00 2001 From: rvk <329491+rvankraaij@users.noreply.github.com> Date: Wed, 4 Aug 2021 21:26:15 +0200 Subject: Fix CORS issue for Radarr and Sonarr services --- src/components/services/Radarr.vue | 4 ++-- src/components/services/Sonarr.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/components/services') diff --git a/src/components/services/Radarr.vue b/src/components/services/Radarr.vue index 3b88083..9d38292 100644 --- a/src/components/services/Radarr.vue +++ b/src/components/services/Radarr.vue @@ -70,7 +70,7 @@ export default { }, methods: { fetchConfig: function () { - fetch(`${this.item.url}/api/health?apiKey=${this.item.apikey}`) + fetch(`${this.item.url}/api/health?apikey=${this.item.apikey}`) .then((response) => { if (response.status != 200) { throw new Error(response.statusText); @@ -92,7 +92,7 @@ export default { console.error(e); this.serverError = true; }); - fetch(`${this.item.url}/api/queue?apiKey=${this.item.apikey}`) + fetch(`${this.item.url}/api/queue?apikey=${this.item.apikey}`) .then((response) => { if (response.status != 200) { throw new Error(response.statusText); diff --git a/src/components/services/Sonarr.vue b/src/components/services/Sonarr.vue index 3460067..7851b6b 100644 --- a/src/components/services/Sonarr.vue +++ b/src/components/services/Sonarr.vue @@ -70,7 +70,7 @@ export default { }, methods: { fetchConfig: function () { - fetch(`${this.item.url}/api/health?apiKey=${this.item.apikey}`) + fetch(`${this.item.url}/api/health?apikey=${this.item.apikey}`) .then((response) => { if (response.status != 200) { throw new Error(response.statusText); @@ -92,7 +92,7 @@ export default { console.error(e); this.serverError = true; }); - fetch(`${this.item.url}/api/queue?apiKey=${this.item.apikey}`) + fetch(`${this.item.url}/api/queue?apikey=${this.item.apikey}`) .then((response) => { if (response.status != 200) { throw new Error(response.statusText); -- cgit v1.2.3 From ecec695272f3e41d66401affea7f6fe5a93d3c28 Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 11 Aug 2021 15:25:51 -0700 Subject: include credentials while making fetch calls --- src/components/services/PiHole.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/components/services') diff --git a/src/components/services/PiHole.vue b/src/components/services/PiHole.vue index 7042a7b..ce0b689 100644 --- a/src/components/services/PiHole.vue +++ b/src/components/services/PiHole.vue @@ -64,7 +64,9 @@ export default { methods: { fetchStatus: async function () { const url = `${this.item.url}/api.php`; - this.api = await fetch(url) + this.api = await fetch(url{ + credentials: 'include' + }) .then((response) => response.json()) .catch((e) => console.log(e)); }, -- cgit v1.2.3 From 077be43473ebdb241c6a70e4d06795ca80a591fb Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 11 Aug 2021 15:35:41 -0700 Subject: Update AdGuardHome.vue --- src/components/services/AdGuardHome.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/components/services') diff --git a/src/components/services/AdGuardHome.vue b/src/components/services/AdGuardHome.vue index d4a2b89..bf5caa9 100644 --- a/src/components/services/AdGuardHome.vue +++ b/src/components/services/AdGuardHome.vue @@ -51,7 +51,9 @@ export default { }, methods: { fetchStatus: async function () { - this.status = await fetch(`${this.item.url}/control/status`).then( + this.status = await fetch(`${this.item.url}/control/status`{ + credentials: 'include', + }).then( (response) => response.json() ); }, -- cgit v1.2.3 From cf2fb08dc72cee1add0e6e9b3d4ba19b38da88d3 Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 11 Aug 2021 15:37:17 -0700 Subject: Update PaperlessNG.vue --- src/components/services/PaperlessNG.vue | 1 + 1 file changed, 1 insertion(+) (limited to 'src/components/services') diff --git a/src/components/services/PaperlessNG.vue b/src/components/services/PaperlessNG.vue index 4fb31f8..63a49a9 100644 --- a/src/components/services/PaperlessNG.vue +++ b/src/components/services/PaperlessNG.vue @@ -59,6 +59,7 @@ export default { } const url = `${this.item.url}/api/documents/`; this.api = await fetch(url, { + credentials: 'include', headers: { Authorization: "Token " + this.item.apikey, }, -- cgit v1.2.3 From 76a46c3507b5c0daef7edcb165e949dea4968e2f Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 11 Aug 2021 15:38:24 -0700 Subject: Update Ping.vue --- src/components/services/Ping.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/components/services') diff --git a/src/components/services/Ping.vue b/src/components/services/Ping.vue index 8a9b7a4..e693af4 100644 --- a/src/components/services/Ping.vue +++ b/src/components/services/Ping.vue @@ -50,7 +50,11 @@ export default { methods: { fetchStatus: async function () { const url = `${this.item.url}`; - fetch(url, { method: "HEAD", cache: "no-cache" }) + fetch(url, { + method: "HEAD", + cache: "no-cache", + credentials: "include", + }) .then((response) => { if (!response.ok) { throw Error(response.statusText); -- cgit v1.2.3 From 0dc3cea15ed9d24d35e6383c89036e8a5e2eb83a Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 11 Aug 2021 15:40:22 -0700 Subject: Update PiHole.vue --- src/components/services/PiHole.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/components/services') diff --git a/src/components/services/PiHole.vue b/src/components/services/PiHole.vue index ce0b689..ca87f9d 100644 --- a/src/components/services/PiHole.vue +++ b/src/components/services/PiHole.vue @@ -65,7 +65,7 @@ export default { fetchStatus: async function () { const url = `${this.item.url}/api.php`; this.api = await fetch(url{ - credentials: 'include' + credentials: "include", }) .then((response) => response.json()) .catch((e) => console.log(e)); -- cgit v1.2.3 From 2f6d9e1b0910b5fb219ebd5078dbf940ed16f619 Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 11 Aug 2021 15:41:11 -0700 Subject: Update PaperlessNG.vue --- src/components/services/PaperlessNG.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/components/services') diff --git a/src/components/services/PaperlessNG.vue b/src/components/services/PaperlessNG.vue index 63a49a9..af13317 100644 --- a/src/components/services/PaperlessNG.vue +++ b/src/components/services/PaperlessNG.vue @@ -59,7 +59,7 @@ export default { } const url = `${this.item.url}/api/documents/`; this.api = await fetch(url, { - credentials: 'include', + credentials: "include", headers: { Authorization: "Token " + this.item.apikey, }, -- cgit v1.2.3 From 4852ae6b85d5a35dc0c94711cdae8f804d32f762 Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 11 Aug 2021 15:41:33 -0700 Subject: Update AdGuardHome.vue --- src/components/services/AdGuardHome.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/components/services') diff --git a/src/components/services/AdGuardHome.vue b/src/components/services/AdGuardHome.vue index bf5caa9..9a3350d 100644 --- a/src/components/services/AdGuardHome.vue +++ b/src/components/services/AdGuardHome.vue @@ -52,7 +52,7 @@ export default { methods: { fetchStatus: async function () { this.status = await fetch(`${this.item.url}/control/status`{ - credentials: 'include', + credentials: "include", }).then( (response) => response.json() ); -- cgit v1.2.3 From 7efcd282bb82463968a03f0f5c4a756a0d95c09c Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 16 Aug 2021 14:16:29 -0700 Subject: Update AdGuardHome.vue --- src/components/services/AdGuardHome.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/components/services') diff --git a/src/components/services/AdGuardHome.vue b/src/components/services/AdGuardHome.vue index 9a3350d..9238060 100644 --- a/src/components/services/AdGuardHome.vue +++ b/src/components/services/AdGuardHome.vue @@ -51,7 +51,7 @@ export default { }, methods: { fetchStatus: async function () { - this.status = await fetch(`${this.item.url}/control/status`{ + this.status = await fetch(`${this.item.url}/control/status`, { credentials: "include", }).then( (response) => response.json() -- cgit v1.2.3 From bbe7149d5814efc1d97613af107b12ba8f8a1c22 Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 16 Aug 2021 14:17:15 -0700 Subject: Update PiHole.vue --- src/components/services/PiHole.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/components/services') diff --git a/src/components/services/PiHole.vue b/src/components/services/PiHole.vue index ca87f9d..87f7090 100644 --- a/src/components/services/PiHole.vue +++ b/src/components/services/PiHole.vue @@ -64,7 +64,7 @@ export default { methods: { fetchStatus: async function () { const url = `${this.item.url}/api.php`; - this.api = await fetch(url{ + this.api = await fetch(url, { credentials: "include", }) .then((response) => response.json()) -- cgit v1.2.3 From 55c3ea4d92b0c5628ead4475ae7359bbf2cc59c4 Mon Sep 17 00:00:00 2001 From: Bastien Wirtz Date: Mon, 13 Sep 2021 22:03:13 +0200 Subject: Deps updates & lint --- src/components/services/AdGuardHome.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/components/services') diff --git a/src/components/services/AdGuardHome.vue b/src/components/services/AdGuardHome.vue index 9238060..19a2f7d 100644 --- a/src/components/services/AdGuardHome.vue +++ b/src/components/services/AdGuardHome.vue @@ -53,9 +53,7 @@ export default { fetchStatus: async function () { this.status = await fetch(`${this.item.url}/control/status`, { credentials: "include", - }).then( - (response) => response.json() - ); + }).then((response) => response.json()); }, }, }; -- cgit v1.2.3