update

package-lock.json

@@ -16,6 +16,7 @@
         "dayjs": "^1.11.13",
         "framer-motion": "^11.5.6",
         "js-cookie": "^3.0.5",
+        "lottie-react": "^2.4.0",
         "react": "^18.3.1",
         "react-chartjs-2": "^5.2.0",
         "react-dom": "^18.3.1",
@@ -6894,6 +6895,25 @@
         "loose-envify": "cli.js"
       }
     },
+    "node_modules/lottie-react": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/lottie-react/-/lottie-react-2.4.0.tgz",
+      "integrity": "sha512-pDJGj+AQlnlyHvOHFK7vLdsDcvbuqvwPZdMlJ360wrzGFurXeKPr8SiRCjLf3LrNYKANQtSsh5dz9UYQHuqx4w==",
+      "license": "MIT",
+      "dependencies": {
+        "lottie-web": "^5.10.2"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/lottie-web": {
+      "version": "5.12.2",
+      "resolved": "https://registry.npmjs.org/lottie-web/-/lottie-web-5.12.2.tgz",
+      "integrity": "sha512-uvhvYPC8kGPjXT3MyKMrL3JitEAmDMp30lVkuq/590Mw9ok6pWcFCwXJveo0t5uqYw1UREQHofD+jVpdjBv8wg==",
+      "license": "MIT"
+    },
     "node_modules/lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",

package.json

@@ -18,6 +18,7 @@
     "dayjs": "^1.11.13",
     "framer-motion": "^11.5.6",
     "js-cookie": "^3.0.5",
+    "lottie-react": "^2.4.0",
     "react": "^18.3.1",
     "react-chartjs-2": "^5.2.0",
     "react-dom": "^18.3.1",

src/Layout/DefaultLayout.jsx

@@ -15,9 +15,9 @@ const DefaultLayout = ({ children }) => {
     localStorage.setItem("light", true)
   });
 
-  const {
+  // const {
-    isLoading,
+  //   isLoading,
-  } = useGetKPIDetailsQuery()
+  // } = useGetKPIDetailsQuery()
 
   const {
     isLoading: dateDataLoading,
@@ -37,9 +37,10 @@ const DefaultLayout = ({ children }) => {
 
 
   return (
-    isLoading || dateDataLoading || dailyDataLoading || isTransAllLoading ?<SplashScreen/>: <Box>
+    dateDataLoading || dailyDataLoading || isTransAllLoading ?<SplashScreen/>: <Box>
+    
       <NavBar />
-      <SlideFade
+      {/* <SlideFade
         key={location.pathname}
         initialScale={0.9}
         finalScale={1.2}
@@ -50,9 +51,9 @@ const DefaultLayout = ({ children }) => {
             delay: 0.1,
           },
         }}
-      >
+      > */}
         {children}
-      </SlideFade>
+      {/* </SlideFade> */}
       <Footer />
     </Box> 
   );

src/Services/api.service.js

@@ -79,10 +79,10 @@ export const rubix = createApi({
     }),
 
 
-    getSubnetAll: builder.query({
+    // getSubnetAll: builder.query({
-      query: ({ pageNumber = 1, pageSize = 10 }) => `Analytics/Transactions/GetAll?pageNumber=${pageNumber}&pageSize=${pageSize}`,
+    //   query: ({ pageNumber = 1, pageSize = 10 }) => `Analytics/Transactions/GetAll?pageNumber=${pageNumber}&pageSize=${pageSize}`,
-      providesTags: ["getTransAll"],
+    //   providesTags: ["getTransAll"],
-    }),
+    // }),
 
     getSubnetById: builder.query({
       query: ({id,pageNumber = 1, pageSize = 10  }) => `SubNet/Transactions/GetAll/${id}?pageNumber=${pageNumber}&pageSize=${pageSize}`,
@@ -92,7 +92,7 @@ export const rubix = createApi({
 
     getSubnetAll: builder.query({
       query: ({ pageNumber = 1, pageSize = 10, searchTerm }) => `SubNet/GetAllSubnetworks?pageNumber=${pageNumber}&pageSize=${pageSize}&searchFilter=${searchTerm || ""}`,
-      providesTags: ["getTransAll"],
+      providesTags: ["getSubnetTransAll"],
     }),
 
     // getSubnetAll: builder.query({

src/components/DataTable/NormalTable.jsx

@@ -145,7 +145,7 @@ const NormalTable = ({
               )
             : data?.map((item, index) => (
                 <Tr
-                  cursor={"pointer"}
+                  // cursor={"pointer"}
                   transition={"0.2s all"}
                   maxH={8}
                   bg={index % 2 === 0 ? "" : "forestGreen.50"}

src/components/FullScreenLoaader/FullScreenLoaader.jsx

@@ -7,11 +7,11 @@ const FullScreenLoaader = ({half}) => {
   return (
     <Box
       backgroundImage={colorMode  !== "light" ? !half&& `url(${bannerImage})` : "none"}
-      position={"relative"}
+      // position={"relative"}
-      backgroundSize="contain"
+      // backgroundSize="contain"
-      backgroundRepeat="no-repeat"
+      // backgroundRepeat="no-repeat"
       h={half ? "50vh":"100vh"}
-      w={"100vw"}
+      // w={"100%"}
       display={"flex"}
       justifyContent={"center"}
       alignItems={"center"}

src/pages/Home.jsx

@@ -34,6 +34,7 @@ import { RiFileCopyFill } from "react-icons/ri";
 import { motion, AnimatePresence } from "framer-motion"; // Import AnimatePresence and motion
 import { useGnerateShortUrlMutation } from "../Services/api.service";
 import ToastBox from "../components/ToastBox";
+import { OPACITY_ON_LOAD } from "../Layout/animations";
 
 const AnimatedBox = motion(HStack); // Create an animated HStack
 
@@ -155,7 +156,7 @@ const toast = useToast()
 
   return (
     <Box 
-      
+      {...OPACITY_ON_LOAD}
       minH={"100vh"}
       bg={colorMode === "light" ? "#f5f5f7" : "none"}
       backgroundImage={{base:colorMode !== "light" ? `url(${bannerImageMobile})` : "none",md:colorMode !== "light" ? `url(${bannerImage})` : "none"}}

src/pages/SplashScreen.jsx

@@ -1,21 +1,29 @@
 import React from "react";
 import { OPACITY_ON_LOAD } from "../Layout/animations";
-import { Box, Image, useColorMode } from "@chakra-ui/react";
+import { Box, useColorMode } from "@chakra-ui/react";
-import logo from "../assets/images/rubix.png";
+import Lottie from "lottie-react";
-import logoLight from "../assets/images/rubixlogo.svg";
+import rubixAnimation from "../assets/images/rubixLoader.json"; // Replace with your JSON animation path
-import rubixLoaders from "../assets/images/rubixLoader.gif";
 
 const SplashScreen = () => {
-    const { colorMode } = useColorMode();
+  const { colorMode } = useColorMode();
 
-  return <Box zIndex={1000} bg={'#fff'} h={'100vh'} display={'flex'} justifyContent={'center'} alignItems={'center'}  {...OPACITY_ON_LOAD}>
+  return (
-
+    <Box
-<Image
+      zIndex={1000}
-                src={colorMode === "light" ? rubixLoaders : rubixLoaders}
+      // bg={"#fff"}
-                // width={"120px"}
+      h={"100vh"}
-                width={{base:"50%",md : "25%"}}
+      display={"flex"}
-              />
+      justifyContent={"center"}
-  </Box>;
+      alignItems={"center"}
+      {...OPACITY_ON_LOAD}
+    >
+      <Lottie
+        animationData={rubixAnimation}
+        loop={true} // Add any additional Lottie configurations here
+        style={{ width: colorMode === "light" ? "25%" : "25%" }}
+      />
+    </Box>
+  );
 };
 
 export default SplashScreen;