Merge branch 'dev' of http://git.wdipl.com/Siddhesh.More/tanami-admin-panel into dev

src/Components/Banner/AddBanner.jsx

@@ -64,9 +64,6 @@ const AddBanner = ({ createApi, navigateLink, title, center }) => {
       // Trigger the mutation
       createApi(formData)
         .then((response) => {
-          // Handle the response here
-          // // console.log("Mutation response:", response?.data?.statusCode);
-          // // console.log("Mutation response:", response?.data?.message);
 
           if (response?.data?.statusCode === 200) {
             setIsLoading(false);

src/Components/Banner/BannerEdit.jsx

@@ -109,15 +109,8 @@ const BannerEdit = ({isLoading, data, updateBanner, navigateTo, refetch, center}
     if (formData?.banner_image === data?.data?.banner_image) {
       form.delete("banner_image");
     }
-        // Log the FormData entries
-        // for (const [key, value] of form.entries()) {
-        //   // console.log(`${key}: ${value}`);
-        // }
     const mutationResult = await updateBanner({ id: id, data: form })
       .then((response) => {
-        // Handle the response here
-        // // console.log("Mutation response:", response?.data?.statusCode);
-        // // console.log("Mutation response:", response?.data?.message);
 
         if (response?.data?.statusCode === 200) {
           setIsLoadingEdit(false);

src/Components/Banner/BannerTable.jsx

@@ -116,7 +116,6 @@ const BannerCommunity = ({
             }
           })
           .catch((error) => {
-            // // console.log(error);
           });
       } catch (error) {
         // Handle errors

src/Components/CreateIOld.jsx

@@ -227,7 +227,6 @@ const CreateIO = () => {
     Action: <Box display={"flex"} justifyContent={"space-between"}></Box>,
   }));
 
-  console.log(extractedArray);
 
   const destributedAmount = Number(watch().destributedAmount) || 0;
 
@@ -256,7 +255,6 @@ const CreateIO = () => {
     // setValue("banner_image", selectedBannerImageData);
     data.banner_image = selectedBannerImageData;
     const updatedData = { ...data, status: "Available" };
-    console.log(selectedBannerImageData);
     setInvestment([...investment, updatedData]);
     navigate("/view-io");
     reset();

src/Components/CutomBreadcrumb.jsx

@@ -51,7 +51,6 @@ const CustomBreadcrumb = () => {
   };
 
   const breadcrumbs = generateBreadcrumbs(pathParts);
-  // console.log(breadcrumbs);
 
   return (
     <Box

src/Components/DataTable/DataTable.jsx

@@ -9,6 +9,7 @@ import {
   Tr,
   Skeleton,
   TableCaption,
+  Box,
 } from "@chakra-ui/react";
 import { DragDropContext, Droppable, Draggable } from "react-beautiful-dnd";
 import EmptySearchList from "../EmptySearchList";
@@ -26,18 +27,29 @@ const DataTable = ({
   setMouseEntered,
   setMouseEnteredId,
   caption,
+  isDraggable
 }) => {
   const navigate = useNavigate();
   const { slideFromRight } = useContext(GlobalStateContext);
+  if (isLoading) {
+    return (
+      <Box>
+        {Array.from({ length: 10 }).map((_, index) => (
+          <Skeleton height="32px" my="10px" key={index} />
+        ))}
+      </Box>
+    );
+  }
+
+
 
   const handleDragEnd = (result) => {
     if (!result.destination) return;
-
     const reorderedItems = Array.from(data);
     const [removed] = reorderedItems.splice(result.source.index, 1);
     reorderedItems.splice(result.destination.index, 0, removed);
-
     setData(reorderedItems)
+    console.log("New Order:", reorderedItems.map((item, index) => ({ index, item })));  
   };
 
   return (
@@ -70,7 +82,7 @@ const DataTable = ({
                 </Thead>
                 <Tbody className="web-text-small">
                   {data?.map((item, index) => (
-                    item.id ? (
+                    item.id && isDraggable ? (
                       <Draggable key={item.id.toString()} draggableId={item.id.toString()} index={index}>
                         {(provided, snapshot) => (
                           <Tr

src/Components/FormFieldMainReference.jsx

@@ -129,7 +129,6 @@ const AddSponser = () => {
     setSelectedOtherImageData(newSelectedImageData);
   };
 
-console.log(selectedBannerImageData);
   
   const formFields = [
     {

src/Components/FormInputMain.jsx

@@ -1,4 +1,4 @@
-import { Box, Button, Divider, Heading } from "@chakra-ui/react";
+import { Box, Button, Divider, Heading, Spinner } from "@chakra-ui/react";
 import React from "react";
 import FormField from "./FormField";
 import { OPACITY_ON_LOAD } from "../Layout/animations";
@@ -15,6 +15,7 @@ const FormInputMain = ({
   submitTitle,
   p,
   w,
+  btnLoading
 }) => {
   return (
     <Box mt={0} as="form" onSubmit={onSubmit}>
@@ -99,9 +100,11 @@ const FormInputMain = ({
             </Button>
           )}
           <Button
+          isLoading={btnLoading}
             size={"sm"}
             width={w ? w : "44.5%"}
             rounded={"sm"}
+            spinner={<Spinner size='sm' color='white' />}
             type="submit"
                 colorScheme={"forestGreen"}
           >

src/Components/FormInputView.jsx

@@ -9,14 +9,12 @@ const FormInputView = ({
   onSubmit,
   children,
 }) => {
-  console.log(groupedFields);
 
   return (
     <form>
       {Object?.entries(groupedFields, groupedFieldsTwo).map(
         ([section, fields], index) => (
           <Box key={section}>
-            {console.log(fields)}
             <Heading as="h6" size="xs" mt={index === 0 ? 3 : 4}>
               {section}
             </Heading>

src/Components/NavBreadCrumbs.jsx

@@ -33,7 +33,6 @@ const NavBreadcrumbs = ({ nav }) => {
   // Flatten nav array into breadcrumbs
   const flattenedNav = flattenNav(nav);
 
-  console.log(nav);
 
   return <CustomBreadcrumb items={flattenedNav} />;
 };

src/Components/ToastBox.jsx

@@ -6,7 +6,7 @@ const ToastBox = ({ message, status }) => {
   return (
     <Box
       color="white"
-      rounded={"md"}
+      rounded={"sm"}
       className="web-text-large d-flex gap-2 align-items-center"
       p={3}
       bg={status === "error" ? "red.500" : status === "warn" ?  "blue.500" : "green.500"}