Updated error handling

jaaimino · Oct 30, 2024 · bf777c1 · bf777c1
1 parent 01e5787
commit bf777c1
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 18 deletions.
diff --git a/src/hooks/use-api/index.js b/src/hooks/use-api/index.js
@@ -3,26 +3,58 @@ import React from "react";
 
 export const API_PATH = "https://ktdash.app/api";
 
-export const request = (endpoint, content) => {
-    return fetch(`${API_PATH}${endpoint}`, {
-        credentials: "include",
-        method: "GET",
-        ...content
-    }).then(response => response.json()).catch(e => console.log(e));
+export const request = async (endpoint, content) => {
+    let response = null;
+    try {
+        response = await fetch(`${API_PATH}${endpoint}`, {
+            credentials: "include",
+            method: "GET",
+            ...content
+        });
+        if (response.status !== 200) {
+            return response.statusText;
+        }
+        response = await response.json();
+    } catch (error) {
+        return error;
+    }
+    return response;
 }
-export const requestJson = (endpoint, content) => {
-    return fetch(`${API_PATH}${endpoint}`, {
-        credentials: "include",
-        method: "GET",
-        ...content
-    }).then(response => response.json()).catch(e => console.log(e));
+
+export const requestJSON = async (endpoint, content) => {
+    let response = null;
+    try {
+        response = await fetch(`${API_PATH}${endpoint}`, {
+            credentials: "include",
+            method: "GET",
+            ...content
+        });
+        if (response.status !== 200) {
+            return response.statusText;
+        }
+        response = await response.json();
+    } catch (error) {
+        return error;
+    }
+    return response;
 }
-export const requestText = (endpoint, content) => {
-    return fetch(`${API_PATH}${endpoint}`, {
-        credentials: "include",
-        method: "GET",
-        ...content
-    }).then(response => response.text()).catch(e => console.log(e));
+
+export const requestText = async (endpoint, content) => {
+    let response = null;
+    try {
+        response = await fetch(`${API_PATH}${endpoint}`, {
+            credentials: "include",
+            method: "GET",
+            ...content
+        });
+        if (response.status !== 200) {
+            return response.statusText;
+        }
+        response = await response.text();
+    } catch (error) {
+        return error;
+    }
+    return response;
 }
 
 export function useRequest(endpoint, content, fetchCondition) {

diff --git a/src/pages/roster/modals/index.js b/src/pages/roster/modals/index.js
@@ -9,6 +9,7 @@ import useAuth from '../../../hooks/use-auth';
 import { useForm } from '@mantine/form';
 import { useLocalStorage } from '@mantine/hooks';
 import { DEFAULT_SETTINGS } from '../../settings';
+import { notifications } from '@mantine/notifications';
 
 export function UpdateRosterPotraitModal(props) {
     const { onClose, roster } = props;
@@ -32,9 +33,19 @@ export function UpdateRosterPotraitModal(props) {
             method: "POST",
             body: formData
         }).then((data) => {
+            console.log(data);
             if (data?.success) {
+                notifications.show({
+                    title: 'Upload Succeeded',
+                    message: `Successfully uploaded roster portrait.`,
+                })
                 modals.close("update-portrait");
                 onClose(Date.now())
+            } else {
+                notifications.show({
+                    title: 'Upload Failed',
+                    message: `${data}`,
+                })
             }
         })
     };