From 4bbf220296765a20c3ba03c5351b21618a835424 Mon Sep 17 00:00:00 2001
From: HampusM <hampus@hampusmat.com>
Date: Sun, 25 Jul 2021 22:34:22 +0200
Subject: Reformated the client code a bit

---
 packages/client/src/util/fetch.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'packages/client/src/util/fetch.ts')

diff --git a/packages/client/src/util/fetch.ts b/packages/client/src/util/fetch.ts
index 54f5afd..a67014a 100644
--- a/packages/client/src/util/fetch.ts
+++ b/packages/client/src/util/fetch.ts
@@ -1,6 +1,6 @@
 import { Ref } from "vue";
 
-export default async function(endpoint: string, fetch_failed: Ref<string | null>, is_loading: Ref<boolean>, data_name: string) {
+export default async function(endpoint: string, fetch_failed: Ref<string | null>, is_loading: Ref<boolean>, data_name: string): Promise<unknown | null> {
 	const fetch_timeout = setTimeout(() => {
 		if(!fetch_failed.value) {
 			fetch_failed.value = `Failed to fetch ${data_name} data.`;
@@ -8,7 +8,7 @@ export default async function(endpoint: string, fetch_failed: Ref<string | null>
 		}
 	}, 5000);
 
-	const data_req = await fetch(`${window.location.protocol}//${window.location.host}/api/v1/${endpoint}`).catch(() => {
+	const res = await fetch(`${window.location.protocol}//${window.location.host}/api/v1/${endpoint}`).catch(() => {
 		if(!fetch_failed.value) {
 			fetch_failed.value = `Failed to fetch ${data_name} data.`;
 			is_loading.value = false;
@@ -17,21 +17,21 @@ export default async function(endpoint: string, fetch_failed: Ref<string | null>
 		return null;
 	});
 
-	if(data_req !== null) {
-		const data = await data_req.json().catch(() => {
+	if(res !== null && res.ok) {
+		const data: Record<string, unknown> | null = await res.json().catch(() => {
 			fetch_failed.value = "Failed to parse server response.";
 		});
 
-		if(data_req.ok) {
+		if(data) {
 			clearTimeout(fetch_timeout);
 			is_loading.value = false;
 			return data.data;
-		} else {
-			fetch_failed.value = `Failed to fetch ${data_name} data.`;
 		}
 	}
 
+	fetch_failed.value = `Failed to fetch ${data_name} data.`;
+
 	clearTimeout(fetch_timeout);
 	is_loading.value = false;
 	return null;
-};
+}
\ No newline at end of file
-- 
cgit v1.2.3-18-g5258