aboutsummaryrefslogtreecommitdiff
path: root/packages/client/src/util
diff options
context:
space:
mode:
Diffstat (limited to 'packages/client/src/util')
-rw-r--r--packages/client/src/util/fetch.ts16
-rw-r--r--packages/client/src/util/hljs-languages.ts2
-rw-r--r--packages/client/src/util/util.ts2
3 files changed, 10 insertions, 10 deletions
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
diff --git a/packages/client/src/util/hljs-languages.ts b/packages/client/src/util/hljs-languages.ts
index 2f50461..1ba036a 100644
--- a/packages/client/src/util/hljs-languages.ts
+++ b/packages/client/src/util/hljs-languages.ts
@@ -42,4 +42,4 @@ const languages = [
{ name: "yml", extensions: [ ".yml" ] }
];
-export default languages;
+export default languages; \ No newline at end of file
diff --git a/packages/client/src/util/util.ts b/packages/client/src/util/util.ts
index 5f72c27..58ff064 100644
--- a/packages/client/src/util/util.ts
+++ b/packages/client/src/util/util.ts
@@ -4,4 +4,4 @@ type Params = {
export function getParam(params: Params, param: string): string {
return params[param].toString();
-}
+} \ No newline at end of file