update locker table

CVHS-student-sites · Apr 14, 2024 · fd0657c · fd0657c
1 parent 0abc0c8
commit fd0657c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/lib/services/admin/mainApi.js b/src/lib/services/admin/mainApi.js
@@ -29,7 +29,9 @@ export async function fetchUserData(){
 
 export async function fetchLockerData() {
     try {
-        const response = await axios.get('https://locker-api.cvapps.net/admin/data/locker-data?page=1&pageSize=3');
+        const response = await axios.get('https://locker-api.cvapps.net/admin/data/locker-data?page=1&pageSize=3', {
+            withCredentials: true
+        });
         return response.data;
     } catch (error) {
         throw error; // Rethrow the error to handle it elsewhere if needed

diff --git a/src/routes/(admin)/admin/edit/views/LockerEdit.svelte b/src/routes/(admin)/admin/edit/views/LockerEdit.svelte
@@ -91,9 +91,11 @@
         }
     ];
 
-    let promise = Promise.resolve([]);
+
+    let showData = false;
     onMount(async () => {
-        promise = await fetchLockerData();
+        data = await fetchLockerData();
+        showData = true;
     });
 </script>
 
@@ -109,17 +111,13 @@
     <div class="modal-cont">
         <Modal bind:showModal/>
     </div>
-    {#await promise}
-        <p>...waiting</p>
-    {:then data}
+    {#if showData}
         <Grid
                 {columns}
                 pagination={{ enabled: true, limit: 11 }}
                 search
                 {data}
                 {style}
         />
-    {:catch error}
-        <p style="color: red">{error.message}</p>
-    {/await}
+    {/if}
 </div>