Data input polish

app/client/Dockerfile.base

@@ -2,7 +2,7 @@ FROM oven/bun:1.3.9-slim
 
 WORKDIR /app
 
-COPY package.json bun.lockb .
+COPY package.json bun.lockb ./
 RUN --mount=type=cache,target=/root/.bun/install/cache \
     bun install
 

app/client/src/App.tsx

@@ -199,7 +199,6 @@ function App() {
             }
           />
 
-
           {session && (
             <Route element={<AppLayout onLogout={handleLogout} />}>
               <Route
@@ -221,7 +220,7 @@ function App() {
               />
             </Route>
           )}
-          
+
           <Route path="*" element={<Navigate to="/" replace />} />
 
           {/**Code below is only used for dashboard development purposes */}

app/client/src/api/Account.ts

@@ -1,129 +1,83 @@
 import type { updateResponse } from "../types/responseTypes";
 import type { Account } from "../types/AccountType";
-import type { AuthSession } from "@/types/authTypes";
-import { BASE_URL } from "@/utils/constants";
 
-const requestUrl = `${BASE_URL}/api/accounts`;
+import { instance } from "./config";
+// import { data } from "react-router-dom";
 
 //Sends a request to get different accounts the user has
-export async function getUserAccounts(
-  session: AuthSession,
-  type?: string,
-): Promise<Account[]> {
-  let url = requestUrl;
-
-  //Determine if we're targetting a specific type
-  if (type) {
-    url = `${requestUrl}/?type=${type}`;
-  }
-
+export async function getUserAccounts(type?: string): Promise<Account[]> {
   try {
-    //Sends a http request and waits for a response
-    const response = await fetch(url, {
-      method: "GET",
-      headers: { Authorization: `Bearer ${session.token}` },
-    });
+    const response = await instance.get(
+      `/api/accounts${type ? `?type=${type}` : ""}`,
+    );
 
-    //Determine if we were able to retrieve user's data
-    if (!response.ok) {
-      //Failed to retrieve user data, return empty array
-      console.error(
-        "Error: Failed to retrieve users accounts ",
-        response.status,
-      );
-      return [];
+    //determine if we were able to retrieve user's data
+    if (response.status === 200 || response.status === 201) {
+      // console.log("Account created:", response.data);
+      return response.data;
+    } else {
+      console.error("Failed to create account", response.status);
+      throw new Error(`Failed to create account: ${response.statusText}`);
     }
-
-    return response.json();
   } catch (error) {
-    console.error(error);
+    console.error("Error creating account:", error);
     throw error;
   }
 }
 
 //Sends a post request to create a user account
 export async function postUserAccount(
-  session: AuthSession,
   newAccount: Account,
 ): Promise<updateResponse> {
   try {
-    //Create post request and wait for response
-    const response = await fetch(requestUrl, {
-      method: "POST",
-      headers: {
-        "content-type": "application/json",
-        Authorization: `Bearer ${session.token}`,
-      },
-      body: JSON.stringify(newAccount),
-    });
-
-    //Determine if our post was a success
-    if (response.ok) {
-      alert("Account " + newAccount.name + " has been created");
+    const response = await instance.post(`/api/accounts`, newAccount);
+    if (response.status === 200 || response.status === 201) {
+      console.log("Account created:", response.data);
+      return newAccount;
     } else {
-      alert("Failed to create account " + newAccount.name);
-      console.error(response.status);
+      console.error("Failed to create account", response.status);
+      throw new Error(`Failed to create account: ${response.statusText}`);
     }
-
-    return response.json();
   } catch (error) {
-    console.error(error);
+    console.error("Error creating account:", error);
     throw error;
   }
 }
 
 //Updates the users account
 export async function putUserAccount(
-  session: AuthSession,
   newAccount: Account,
 ): Promise<updateResponse> {
   try {
-    //Create post request and wait for response
-    const response = await fetch(requestUrl, {
-      method: "PUT",
-      headers: {
-        "content-type": "application/json",
-        Authorization: `Bearer ${session.token}`,
-      },
-      body: JSON.stringify(newAccount),
-    });
+    const response = await instance.put(`/api/accounts`, newAccount);
 
-    //Determine if our post was a success
-    if (response.ok) {
-      alert("Account " + newAccount.name + " has been updated");
+    if (response.status === 200) {
+      console.log("Account updated:", response.data);
+      return response.data;
     } else {
-      alert("Failed to update account " + newAccount.name);
-      console.error(response.status);
+      console.error("Failed to update account", response.status);
+      throw new Error(`Failed to update account: ${response.statusText}`);
     }
-
-    return response.json();
   } catch (error) {
-    console.error(error);
+    console.error("Error updating account:", error);
     throw error;
   }
 }
 
-export async function deleteUserAccount(
-  session: AuthSession,
-  userAccount: Account,
-) {
-  const content = JSON.stringify({ id: userAccount.id });
-  //Create delete request to delete the account
-  const response = await fetch(requestUrl, {
-    method: "DELETE",
-    headers: {
-      "content-type": "application/json",
-      Authorization: `Bearer ${session.token}`,
-    },
-    body: content,
-  });
+export async function deleteUserAccount(accountId: number): Promise<boolean> {
+  try {
+    const id = Number(accountId);
+    const response = await instance.delete(`/api/accounts?id=${id}`);
 
-  if (response.ok) {
-    alert("Account " + userAccount.name + " has been deleted");
-  } else {
-    alert("Failed to delete account " + userAccount.name);
-    console.error(response.status);
+    if (response.status === 200) {
+      console.log("Account deleted successfully");
+      return true;
+    } else {
+      console.error("Failed to delete account", response.status);
+      return false;
+    }
+  } catch (error) {
+    console.error("Error deleting account:", error);
+    return false;
   }
-
-  return response.ok;
 }