From fdfb3a8e959f6179b14d15966890f8ef981d363a Mon Sep 17 00:00:00 2001 From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com> Date: Mon, 22 Jul 2024 14:56:29 +0530 Subject: [PATCH] switch btn --- src/Components/CutomBreadcrumb.jsx | 2 +- src/Components/SwitchButton.jsx | 49 +++++++++++++------ .../InvestmentType/AddInvestmentType.jsx | 3 ++ .../Master/InvestmentType/InvestmentType.jsx | 12 ++++- src/Pages/Master/Sponser/Sponsers.jsx | 21 ++++---- src/Routes/Routes.js | 3 +- src/Services/investment.type.service.js | 29 +++++++++-- src/Services/investor.details.service.js | 5 +- src/Services/sponser.service.js | 8 +++ 9 files changed, 96 insertions(+), 36 deletions(-) diff --git a/src/Components/CutomBreadcrumb.jsx b/src/Components/CutomBreadcrumb.jsx index df06b62..8099830 100644 --- a/src/Components/CutomBreadcrumb.jsx +++ b/src/Components/CutomBreadcrumb.jsx @@ -51,7 +51,7 @@ const CustomBreadcrumb = () => { }; const breadcrumbs = generateBreadcrumbs(pathParts); - console.log(breadcrumbs); + // console.log(breadcrumbs); return ( { @@ -9,19 +8,41 @@ const SwitchButton = ({ isSwitchOn, setIsSwitchOn }) => { return ( - - - {isSwitchOn ? 'Active' : 'Inactive'} - + > + + {isSwitchOn ? 'Active' : 'Inactive'} + + ); }; diff --git a/src/Pages/Master/InvestmentType/AddInvestmentType.jsx b/src/Pages/Master/InvestmentType/AddInvestmentType.jsx index dff87e7..83878d6 100644 --- a/src/Pages/Master/InvestmentType/AddInvestmentType.jsx +++ b/src/Pages/Master/InvestmentType/AddInvestmentType.jsx @@ -11,6 +11,7 @@ import { useNavigate } from "react-router-dom"; import FormField from "../../../Components/FormField"; import { v4 as uuidv4 } from "uuid"; import FormInputMain from "../../../Components/FormInputMain"; +import SwitchButton from "../../../Components/SwitchButton"; export const addInvestmentType = yup.object().shape({ investmentName: yup.string().required("Investment name is required"), @@ -32,6 +33,7 @@ const AddInvestmentType = () => { const [bannerImageData, setBannerImageData] = useState(null); const { investmentType, setInvestmentType } = useContext(GlobalStateContext); const [selectedBannerImageData, setSelectedBannerImageData] = useState(null); + const [isSwitchOn, setIsSwitchOn] = useState(false); const [otherImageData, setOtherImageData] = useState(null); const [selectedOtherImageData, setSelectedOtherImageData] = useState(null); @@ -157,6 +159,7 @@ const AddInvestmentType = () => { return ( + new Date(date).toLocaleDateString(); // Simple date formatter @@ -53,6 +54,15 @@ const InvestmentType = () => { const [mouseEnteredId, setMouseEnteredId] = useState(""); const [isSwitchOn, setIsSwitchOn] = useState(false); + + const { + data, + error, + isLoading: isInvsmentTypeLoading, + } = useGetInvestmentTypeMasterQuery({ page: 1, size: 10 }); + + console.log(data); + useEffect(() => { // Simulate loading const timer = setTimeout(() => { @@ -72,7 +82,7 @@ const InvestmentType = () => { "Action", ]; - const handleUpdateStatus = debounce((id) => { + const handleUpdateStatus = debounce((id) => { setInvestmentType((prevInvestmentType) => prevInvestmentType.map((investmentType) => investmentType.id === id diff --git a/src/Pages/Master/Sponser/Sponsers.jsx b/src/Pages/Master/Sponser/Sponsers.jsx index d17fd8f..4e9f613 100644 --- a/src/Pages/Master/Sponser/Sponsers.jsx +++ b/src/Pages/Master/Sponser/Sponsers.jsx @@ -44,6 +44,7 @@ const Sponser = () => { const [pageSize, setPageSize] = useState(TABLE_PAGINATION?.size); const [currentPage, setCurrentPage] = useState(1); + const { data: sponsors, error, @@ -261,18 +262,15 @@ const Sponser = () => { ), })); - const handleDelete = async() => { + const handleDelete = async () => { console.log(actionId); setIsLoading(true); try { - const response = await deleteSponser(actionId) + const response = await deleteSponser(actionId); console.log(response); - setIsLoading(false); - setDeleteAlert(false) - } catch (error) { - - } - + setIsLoading(false); + setDeleteAlert(false); + } catch (error) {} }; return ( @@ -304,12 +302,11 @@ const Sponser = () => { @@ -332,7 +329,7 @@ const Sponser = () => { setDeleteAlert(false)} isOpen={deleteAlert} - message={"Are you sure you want o delete sponers?"} + message={"Are you sure you want to delete sponers?"} alertHandler={handleDelete} isLoading={isLoading} /> diff --git a/src/Routes/Routes.js b/src/Routes/Routes.js index 7f03347..198f23a 100644 --- a/src/Routes/Routes.js +++ b/src/Routes/Routes.js @@ -24,7 +24,7 @@ import ViewInvestorDetails from "../Pages/Investor_Management/InvestorDetails/Vi import ExchangeRate from "../Pages/Master/ExchangeRate/ExchangeRate"; import AddInvestmentType from "../Pages/Master/InvestmentType/AddInvestmentType"; import EditInvestmentType from "../Pages/Master/InvestmentType/EditInvestmentType"; -import InvestmentType from "../Pages/Master/InvestmentType/InvestmentType"; +// import InvestmentType from "../Pages/Master/InvestmentType/InvestmentTypeOld"; import ViewInvestmentType from "../Pages/Master/InvestmentType/ViewInvestmentType"; import AddSponser from "../Pages/Master/Sponser/AddSponser"; import EditSponser from "../Pages/Master/Sponser/EditSponser"; @@ -35,6 +35,7 @@ import ViewHistory from "../Pages/WithDrawal/DrawalView/ViewHistory"; import DepositRequest from "../Pages/Deposit/DepositRequest"; import DepositHistory from "../Pages/Deposit/DepositViewHistory/DepositHistory"; import Academy from "../Pages/Admin/ManageAcademy/Academy"; +import InvestmentType from "../Pages/Master/InvestmentType/InvestmentType"; export const RouteLink = [ // =============[ Tanami ]================ diff --git a/src/Services/investment.type.service.js b/src/Services/investment.type.service.js index 845960d..0d7cd34 100644 --- a/src/Services/investment.type.service.js +++ b/src/Services/investment.type.service.js @@ -7,16 +7,35 @@ const baseUrl = import.meta.env.VITE_API_BASE_URL + "/api"; export const investmentType = createApi({ reducerPath: "investmentType", baseQuery: fetchBaseQuery({ baseUrl }), - tagTypes: [], + tagTypes: ["getInvestmentType"], endpoints: (builder) => ({ - getInvestmentTypes: builder.query({ - query: () => '/getInvestmentTypes', + + + + getInvestmentTypeMaster: builder.query({ + query: ({ page, size }) => + `/investmentType/admin/?page=${page}&size=${size}`, + providesTags: ["getInvestmentType"], }), + + + + + + getInvestmentTypeMasterActive: builder.query({ + query: () => "/investmentType/admin/active", + }), + getInvestmentTypeById: builder.query({ - query: (id) => `/getInvestmentType/${id}`, + query: (id) => ({ url: `/investmentType/admin/${id}` }), + providesTags: ["getInvestmentType"], }), }), }); // Export hooks for usage in functional components -export const { useGetInvestmentTypesQuery, useGetInvestmentTypeByIdQuery } = investmentType; +export const { + useGetInvestmentTypeMasterQuery, + useGetInvestmentTypeByIdQuery, + useGetInvestmentTypeMasterActiveQuery, +} = investmentType; diff --git a/src/Services/investor.details.service.js b/src/Services/investor.details.service.js index fa23807..034b44d 100644 --- a/src/Services/investor.details.service.js +++ b/src/Services/investor.details.service.js @@ -10,7 +10,7 @@ export const investorDetails = createApi({ tagTypes: [], endpoints: (builder) => ({ getInvestors: builder.query({ - query: () => '/getInvestors', + query: () => "/getInvestors", }), getInvestorById: builder.query({ query: (id) => `/getInvestor/${id}`, @@ -19,4 +19,5 @@ export const investorDetails = createApi({ }); // Export hooks for usage in functional components -export const { useGetInvestorsQuery, useGetInvestorByIdQuery } = investorDetails; +export const { useGetInvestorsQuery, useGetInvestorByIdQuery } = + investorDetails; diff --git a/src/Services/sponser.service.js b/src/Services/sponser.service.js index add100c..7553c7f 100644 --- a/src/Services/sponser.service.js +++ b/src/Services/sponser.service.js @@ -14,14 +14,22 @@ export const sponserMaster = createApi({ baseQuery: fetchBaseQuery({ baseUrl: baseUrl }), tagTypes: ["getSponser"], endpoints: (builder) => ({ + + + + getSponserMaster: builder.query({ query: ({ page, size }) => `/sponsor/admin?page=${page}&size=${size}`, providesTags: ["getSponser"], }), + + + getSponserMasterActive: builder.query({ query: () => "/sponsor/admin/active", }), + getSponserById: builder.query({ query: (id) => ({ url: `/sponsor/admin/${id}` }), providesTags: ["getSponser"],