From 26363e2b0c9b18be373b68a785132ffcf73874ef Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Thu, 8 Aug 2024 19:38:17 +0530 Subject: [PATCH] updatw --- src/App.jsx | 2 +- src/Components/Loaders/FullscreenLoaders.css | 105 ++++++++++++++++++ src/Components/Loaders/FullscreenLoaders.jsx | 20 ++-- src/Layout/DefaultLayout.jsx | 2 +- src/Pages/Dashbaord.jsx | 47 ++++++++ .../DepositViewHistory/DepositHistory.jsx | 19 +--- .../IO_Management/CreateIO/IODetails.jsx | 11 +- .../IO_Management/CreateIO/IONAVDetails.jsx | 4 +- .../IO_Management/CreateIO/Investors.jsx | 4 +- .../ViewIO/HeaderModal/UpdateIOStatus.jsx | 13 ++- .../IO_Management/ViewIO/ViewIOdetails.jsx | 2 +- .../InvestmentType/AddInvestmentType.jsx | 73 ++++++------ src/Pages/Master/Sponser/AddSponser.jsx | 1 + src/Pages/SplashScreen.jsx | 12 +- src/Routes/Routes.js | 3 +- src/Services/token.serivce.js | 76 +++++++++++-- 16 files changed, 311 insertions(+), 83 deletions(-) create mode 100644 src/Components/Loaders/FullscreenLoaders.css create mode 100644 src/Pages/Dashbaord.jsx diff --git a/src/App.jsx b/src/App.jsx index aaf188e..e163d62 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -57,7 +57,7 @@ const App = () => { element={ // isOnline ? ( // isAuthenticate || isAuthenticatedInCookie === "true" ? ( - localStorage.getItem('accessToken') && localStorage.getItem('refreshToken') ? ( + localStorage.getItem('accessToken') && localStorage.getItem('refreshToken') ? ( ) : ( diff --git a/src/Components/Loaders/FullscreenLoaders.css b/src/Components/Loaders/FullscreenLoaders.css new file mode 100644 index 0000000..e5c1769 --- /dev/null +++ b/src/Components/Loaders/FullscreenLoaders.css @@ -0,0 +1,105 @@ +/* From Uiverse.io by abrahamcalsin */ +.dot-spinner { + --uib-size: 2.8rem; + --uib-speed: .9s; + --uib-color: #004717; + position: relative; + display: flex; + align-items: center; + justify-content: flex-start; + height: var(--uib-size); + width: var(--uib-size); + } + + .dot-spinner__dot { + position: absolute; + top: 0; + left: 0; + display: flex; + align-items: center; + justify-content: flex-start; + height: 100%; + width: 100%; + } + + .dot-spinner__dot::before { + content: ''; + height: 20%; + width: 20%; + border-radius: 50%; + background-color: var(--uib-color); + transform: scale(0); + opacity: 0.5; + animation: pulse0112 calc(var(--uib-speed) * 1.111) ease-in-out infinite; + box-shadow: 0 0 20px rgba(18, 31, 53, 0.3); + } + + .dot-spinner__dot:nth-child(2) { + transform: rotate(45deg); + } + + .dot-spinner__dot:nth-child(2)::before { + animation-delay: calc(var(--uib-speed) * -0.875); + } + + .dot-spinner__dot:nth-child(3) { + transform: rotate(90deg); + } + + .dot-spinner__dot:nth-child(3)::before { + animation-delay: calc(var(--uib-speed) * -0.75); + } + + .dot-spinner__dot:nth-child(4) { + transform: rotate(135deg); + } + + .dot-spinner__dot:nth-child(4)::before { + animation-delay: calc(var(--uib-speed) * -0.625); + } + + .dot-spinner__dot:nth-child(5) { + transform: rotate(180deg); + } + + .dot-spinner__dot:nth-child(5)::before { + animation-delay: calc(var(--uib-speed) * -0.5); + } + + .dot-spinner__dot:nth-child(6) { + transform: rotate(225deg); + } + + .dot-spinner__dot:nth-child(6)::before { + animation-delay: calc(var(--uib-speed) * -0.375); + } + + .dot-spinner__dot:nth-child(7) { + transform: rotate(270deg); + } + + .dot-spinner__dot:nth-child(7)::before { + animation-delay: calc(var(--uib-speed) * -0.25); + } + + .dot-spinner__dot:nth-child(8) { + transform: rotate(315deg); + } + + .dot-spinner__dot:nth-child(8)::before { + animation-delay: calc(var(--uib-speed) * -0.125); + } + + @keyframes pulse0112 { + 0%, + 100% { + transform: scale(0); + opacity: 0.5; + } + + 50% { + transform: scale(1); + opacity: 1; + } + } + \ No newline at end of file diff --git a/src/Components/Loaders/FullscreenLoaders.jsx b/src/Components/Loaders/FullscreenLoaders.jsx index e7ff6ac..a821ce3 100644 --- a/src/Components/Loaders/FullscreenLoaders.jsx +++ b/src/Components/Loaders/FullscreenLoaders.jsx @@ -1,5 +1,6 @@ import { Box, Spinner, Text } from "@chakra-ui/react"; import React from "react"; +import './FullscreenLoaders.css' const FullscreenLoaders = ({height}) => { return ( @@ -11,14 +12,17 @@ const FullscreenLoaders = ({height}) => { w={"100%"} h={height ? height: "100vh"} gap={4} - > - Loading... + >
+
+
+
+
+
+
+
+
+
+ {/* Loading... */} ); }; diff --git a/src/Layout/DefaultLayout.jsx b/src/Layout/DefaultLayout.jsx index ae25dfe..52dd95a 100644 --- a/src/Layout/DefaultLayout.jsx +++ b/src/Layout/DefaultLayout.jsx @@ -107,7 +107,7 @@ const DashboardLayout = ({ isOnline }) => { // Set a timer to hide the splash screen after 3 seconds const timer = setTimeout(() => { setSplashVisible(false); - },300); // 3000ms = 3 seconds + },1000); // 3000ms = 3 seconds // Cleanup the timer return () => clearTimeout(timer); diff --git a/src/Pages/Dashbaord.jsx b/src/Pages/Dashbaord.jsx new file mode 100644 index 0000000..fef6eb1 --- /dev/null +++ b/src/Pages/Dashbaord.jsx @@ -0,0 +1,47 @@ +import { Box, Icon, Text } from '@chakra-ui/react' +import React from 'react' +import { RiMoneyDollarBoxLine } from 'react-icons/ri' + +const Dashbaord = () => { + return ( + + + + + + + Total Investors + 243 + + + + + + Total IO + 243 + + + + + + + Total sponors + 243 + + + + + + + Total Investment Type + 243 + + + + + + + ) +} + +export default Dashbaord \ No newline at end of file diff --git a/src/Pages/Deposit/DepositViewHistory/DepositHistory.jsx b/src/Pages/Deposit/DepositViewHistory/DepositHistory.jsx index 1a5305d..fcac326 100644 --- a/src/Pages/Deposit/DepositViewHistory/DepositHistory.jsx +++ b/src/Pages/Deposit/DepositViewHistory/DepositHistory.jsx @@ -9,10 +9,11 @@ import { Tooltip, useToast, useDisclosure, + Link, } from "@chakra-ui/react"; import React, { useContext, useEffect, useState } from "react"; import { HiDotsVertical } from "react-icons/hi"; -import { Link, Link as RouterLink, useNavigate } from "react-router-dom"; +import { useNavigate } from "react-router-dom"; import { debounce } from "../../Master/Sponser/AddSponser"; import { OPACITY_ON_LOAD } from "../../../Layout/animations"; import Pagination from "../../../Components/Pagination"; @@ -194,20 +195,10 @@ const DepositHistory = () => { Status: ( { - // setActionId(item.id); - // onConfirmOpen(); - // }} - onClick={() => { - setActionId(item.id); - if (item.status === "Approved") { - onConfirmOpen(); - } else { - onRejectOpen(); - } - }} + as={"span"} - color={item.transactionStatus === "Approved" ? "green" : "red"} + color={item.transactionStatus === "Approved" ? "green.500" : "red.500"} + fontWeight={700} > {item.transactionStatus} diff --git a/src/Pages/IO_Management/CreateIO/IODetails.jsx b/src/Pages/IO_Management/CreateIO/IODetails.jsx index 1d09e6e..7bad221 100644 --- a/src/Pages/IO_Management/CreateIO/IODetails.jsx +++ b/src/Pages/IO_Management/CreateIO/IODetails.jsx @@ -94,6 +94,9 @@ const schema = yup.object().shape({ const IODetails = ({ enableNextTab, index, data }) => { + + + const params = useParams(); @@ -171,6 +174,11 @@ const IODetails = ({ enableNextTab, index, data }) => { const [values, setValues] = useState(id?minInvestmentById:miniValue); + const formatNumber = (num) => { + // Remove non-numeric characters and format with commas + return num.replace(/\D/g, '') + .replace(/\B(?=(\d{3})+(?!\d))/g, ','); + }; // console.log(values); // ======================[ Validator filter ] @@ -593,8 +601,9 @@ const IODetails = ({ enableNextTab, index, data }) => { }; return IObyIDisLoading ? ( - + ) : ( + { onChange={(e) => setSearchTerm(e.target.value)} /> - + {/* - + */} diff --git a/src/Pages/IO_Management/CreateIO/Investors.jsx b/src/Pages/IO_Management/CreateIO/Investors.jsx index 7d3d6ea..e7a5767 100644 --- a/src/Pages/IO_Management/CreateIO/Investors.jsx +++ b/src/Pages/IO_Management/CreateIO/Investors.jsx @@ -377,9 +377,9 @@ const Investors = () => { onChange={(e) => setSearchTerm(e.target.value)} /> - + {/* - + */} diff --git a/src/Pages/IO_Management/ViewIO/HeaderModal/UpdateIOStatus.jsx b/src/Pages/IO_Management/ViewIO/HeaderModal/UpdateIOStatus.jsx index 3259c6c..2e29606 100644 --- a/src/Pages/IO_Management/ViewIO/HeaderModal/UpdateIOStatus.jsx +++ b/src/Pages/IO_Management/ViewIO/HeaderModal/UpdateIOStatus.jsx @@ -77,7 +77,7 @@ const UpdateIOStatus = ({ isOpen, onClose }) => { > { > {