Merge branch 'Dev' into Dev

Author: Avinashshiyani

src/hooks/Mutations/shop/useCartSwagg.jsx

@@ -7,8 +7,8 @@ const useAddSwagToCart = () => {
   const { auth, logout } = useAuth();
   const queryClient = useQueryClient();
 
-  return useMutation(
-    async (cartItems) => {
+  return useMutation({
+    mutationFn: async (cartItems) => {
       const response = await publicAxios.post("/cart/swaggs/", cartItems, {
         headers: {
           "Content-Type": "application/json",
@@ -17,28 +17,26 @@ const useAddSwagToCart = () => {
       });
       return response.data;
     },
-    {
-      onSuccess: (data) => {
-        console.log("Added to cart: ", data);
-        queryClient.invalidateQueries(["productsInCart"]);
-      },
-      onError: (error) => {
-        // eslint-disable-next-line no-console
-        console.error("Unable to add availability");
-        if (error.response.status === 401) {
-          logout();
-        }
-      },
-    }
-  );
+    onSuccess: (data) => {
+      console.log("Added to cart: ", data);
+      queryClient.invalidateQueries({ queryKey: ["productsInCart"] });
+    },
+    onError: (error) => {
+      // eslint-disable-next-line no-console
+      console.error("Unable to add availability");
+      if (error.response.status === 401) {
+        logout();
+      }
+    },
+  });
 };
 
 const useDeleteSwag = () => {
   const { auth, logout } = useAuth();
   const queryClient = useQueryClient();
 
-  return useMutation(
-    async (id) => {
+  return useMutation({
+    mutationFn: async (id) => {
       const response = await publicAxios.delete(`/cart/swaggs/${id}/`, {
         headers: {
           "Content-Type": "application/json",
@@ -48,20 +46,18 @@ const useDeleteSwag = () => {
       console.log("response ", response.data);
       return response.data;
     },
-    {
-      onSuccess: (data) => {
-        console.log("Successfully deleted ", data);
-        queryClient.invalidateQueries(["productsInCart"]);
-      },
-      onError: (error) => {
-        // eslint-disable-next-line no-console
-        console.error("Unable to delete swag");
-        if (error.response.status === 401) {
-          logout();
-        }
-      },
-    }
-  );
+    onSuccess: (data) => {
+      console.log("Successfully deleted ", data);
+      queryClient.invalidateQueries({ queryKey: ["productsInCart"] });
+    },
+    onError: (error) => {
+      // eslint-disable-next-line no-console
+      console.error("Unable to delete swag");
+      if (error.response.status === 401) {
+        logout();
+      }
+    },
+  });
 };
 
 export { useAddSwagToCart, useDeleteSwag };

src/hooks/Mutations/shop/useMakeOrder.jsx

@@ -7,8 +7,8 @@ const useMakeOrder = () => {
   const { auth, logout } = useAuth();
   const queryClient = useQueryClient();
 
-  return useMutation(
-    async (customerInfo) => {
+  return useMutation({
+    mutationFn: async (customerInfo) => {
       const response = await privateAxios.post("/orders/", customerInfo, {
         headers: {
           "Content-Type": "application/json",
@@ -17,20 +17,19 @@ const useMakeOrder = () => {
       });
       return response.data;
     },
-    {
-      onSuccess: (data) => {
-        console.log("Added to cart: ", data);
-        queryClient.invalidateQueries(["productsInCart"]);
-      },
-      onError: (error) => {
-        // eslint-disable-next-line no-console
-        console.error("Unable to add availability");
-        if (error.response.status === 401) {
-          logout();
-        }
-      },
-    }
-  );
+
+    onSuccess: (data) => {
+      console.log("Added to cart: ", data);
+      queryClient.invalidateQueries({ queryKey: ["productsInCart"] });
+    },
+    onError: (error) => {
+      // eslint-disable-next-line no-console
+      console.error("Unable to add availability");
+      if (error.response.status === 401) {
+        logout();
+      }
+    },
+  });
 };
 
 export default useMakeOrder;

src/hooks/Queries/shop/useOrdersList.jsx

@@ -44,7 +44,7 @@ const fetchSingleOrder = async (id) => {
 
 const useSingleOrder = (id) =>
   useQuery({
-    queryKey: ["singleOrder"],
+    queryKey: ["singleOrder", id],
     queryFn: () => fetchSingleOrder(id),
     refetchOnWindowFocus: true,
     staleTime: 5 * 60 * 60,

src/hooks/Queries/shop/useSwagList.jsx

@@ -33,7 +33,7 @@ const fetchSingleSwag = async (id) => {
 
 const useSingleSwag = (id) =>
   useQuery({
-    queryKey: ["single swag"],
+    queryKey: ["singleSwag", id],
     queryFn: () => fetchSingleSwag(id),
     refetchOnWindowFocus: false,
   });