Merge pull request #32 from CMP26Projects/hotfix-restfulapi-updates

CMP26Projects · Dec 26, 2023 · 01a8baf · 01a8baf
2 parents a72b474 + c7f230d
commit 01a8baf
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/client/src/components/common/InfoSection.jsx b/client/src/components/common/InfoSection.jsx
@@ -17,7 +17,7 @@ export default function InfoSection() {
     const { data: absenceRate, isFetching: isFetchingAbsence } =
       useGetAbsenceRateQuery();
 
-    const { data: scoutsCount, isFetching: isFetchingScoutsCount } =
+    const { data: scouts, isFetching: isFetchingScoutsCount } =
       useGetAllScoutsCountQuery();
 
     const { data: budget, isFetching: isFetchingBudget } = useGetBudgetQuery();
@@ -51,9 +51,9 @@ export default function InfoSection() {
           value={
             isFetchingScoutsCount
               ? "جاري التحميل"
-              : !scoutsCount
+              : !scouts
               ? "لا يوجد بيانات"
-              : scoutsCount?.body
+              : scouts?.body?.length
           }
           color="dark"
         />
@@ -77,7 +77,7 @@ export default function InfoSection() {
     const { data: absenceRate, isFetching: isFetchingAbsence } =
       useGetAbsenceRateQuery();
 
-    const { data: scoutsCount, isFetching: isFetchingScoutsCount } =
+    const { data: scouts, isFetching: isFetchingScoutsCount } =
       useGetAllScoutsCountQuery();
 
     return (
@@ -98,9 +98,9 @@ export default function InfoSection() {
           value={
             isFetchingScoutsCount
               ? "جاري التحميل"
-              : !scoutsCount
+              : !scouts
               ? "لا يوجد بيانات"
-              : scoutsCount?.body
+              : scouts?.body?.length
           }
           color="dark"
         />
@@ -116,7 +116,7 @@ export default function InfoSection() {
     const { data: absenceRate, isFetching: isFetchingAbsence } =
       useGetAbsenceRateQuery();
 
-    const { data: scoutsCount, isFetching: isFetchingScoutsCount } =
+    const { data: scouts, isFetching: isFetchingScoutsCount } =
       useGetAllScoutsCountQuery();
 
     return (
@@ -149,9 +149,9 @@ export default function InfoSection() {
           value={
             isFetchingScoutsCount
               ? "جاري التحميل"
-              : !scoutsCount
+              : !scouts
               ? "لا يوجد بيانات"
-              : scoutsCount?.body
+              : scouts?.body?.length
           }
           color="dark"
         />

diff --git a/client/src/redux/slices/captainsApiSlice.js b/client/src/redux/slices/captainsApiSlice.js
@@ -6,11 +6,10 @@ export const captainsApi = apiSlice.injectEndpoints({
   endpoints: (builder) => ({
     GetCaptains: builder.query({
       query: () => ({
-        url: `${CAPTAINS_URL}/allCaptains/info`,
+        url: `${CAPTAINS_URL}/`,
         method: "GET",
       }),
     }),
-
   }),
 });
 

diff --git a/client/src/redux/slices/financeApiSlice.js b/client/src/redux/slices/financeApiSlice.js
@@ -6,7 +6,7 @@ export const financeApi = apiSlice.injectEndpoints({
   endpoints: (builder) => ({
     GetBudget: builder.query({
       query: () => ({
-        url: `${FINANCE_URL}/budget`,
+        url: `${FINANCE_URL}`,
         method: "GET",
       }),
     }),

diff --git a/client/src/redux/slices/scoutApiSlice.js b/client/src/redux/slices/scoutApiSlice.js
@@ -6,7 +6,7 @@ export const scoutsApi = apiSlice.injectEndpoints({
   endpoints: (builder) => ({
     GetAllScoutsCount: builder.query({
       query: () => ({
-        url: `${SCOUT_URL}/allScouts/count`,
+        url: `${SCOUT_URL}/`,
         method: "GET",
       }),
     }),