From 4dc6df435768df1cbb3f61f092c1756b032f80e8 Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Wed, 6 Nov 2024 16:15:44 +0530 Subject: [PATCH] update --- package-lock.json | 20 +++++++++++ package.json | 1 + src/Layout/DefaultLayout.jsx | 15 ++++---- src/Services/api.service.js | 10 +++--- src/assets/images/rubixLoader.json | 1 + src/assets/images/rubixLoader3.json | 1 + src/components/DataTable/NormalTable.jsx | 2 +- .../FullScreenLoaader/FullScreenLoaader.jsx | 8 ++--- src/pages/Home.jsx | 3 +- src/pages/SplashScreen.jsx | 34 ++++++++++++------- 10 files changed, 64 insertions(+), 31 deletions(-) create mode 100644 src/assets/images/rubixLoader.json create mode 100644 src/assets/images/rubixLoader3.json diff --git a/package-lock.json b/package-lock.json index d449ea9..408c218 100644 --- a/package-lock.json +++ b/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", diff --git a/package.json b/package.json index a39e7ed..3274f06 100644 --- a/package.json +++ b/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", diff --git a/src/Layout/DefaultLayout.jsx b/src/Layout/DefaultLayout.jsx index f7ced1e..7f80170 100644 --- a/src/Layout/DefaultLayout.jsx +++ b/src/Layout/DefaultLayout.jsx @@ -15,9 +15,9 @@ const DefaultLayout = ({ children }) => { localStorage.setItem("light", true) }); - const { - isLoading, - } = useGetKPIDetailsQuery() + // const { + // isLoading, + // } = useGetKPIDetailsQuery() const { isLoading: dateDataLoading, @@ -37,9 +37,10 @@ const DefaultLayout = ({ children }) => { return ( - isLoading || dateDataLoading || dailyDataLoading || isTransAllLoading ?: + dateDataLoading || dailyDataLoading || isTransAllLoading ?: + - { delay: 0.1, }, }} - > + > */} {children} - + {/* */}