From f17209ef43a39c0f691020cee21eb169d169d786 Mon Sep 17 00:00:00 2001 From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com> Date: Fri, 27 Sep 2024 20:53:28 +0530 Subject: [PATCH] Registered Corp --- src/Components/EmptySearchList.jsx | 2 +- src/Components/HeaderMain.jsx | 4 +- .../RegisteredCorporate.jsx | 7 +- src/Pages/ViewCorporates/ViewCorporates.jsx | 307 ++++++++++++------ src/Routes/Routes.js | 2 +- src/Services/register.corporate.service.js | 46 ++- 6 files changed, 252 insertions(+), 116 deletions(-) diff --git a/src/Components/EmptySearchList.jsx b/src/Components/EmptySearchList.jsx index f78ab51..c941fd5 100644 --- a/src/Components/EmptySearchList.jsx +++ b/src/Components/EmptySearchList.jsx @@ -11,7 +11,7 @@ const EmptySearchList = ({message}) => { flexDirection={'column'} w={"100%"} h={"40vh"} > - empty list + {/* empty list */} {/* {message} */} We do not have any records {/* Posts of tanami will appear here. */} diff --git a/src/Components/HeaderMain.jsx b/src/Components/HeaderMain.jsx index 4b14397..da77bb6 100644 --- a/src/Components/HeaderMain.jsx +++ b/src/Components/HeaderMain.jsx @@ -45,12 +45,12 @@ const HeaderMain = ({ w={"100%"} h={{ base: "8%", xl: "6%" }} position={"relative"} - className={`pt-2 pb-2 fw-400 d-flex ${ + className={`pt-4 pb-4 fw-400 d-flex ${ slideDirecttion ? "ps-2" : "" } justify-content-between align-items-center`} zIndex={999} // bgGradient="linear(to-r, #1A0436, #6311CB)" // Linear gradient - bgGradient="linear(to-r, #1A0436, #5E0FCD)" + bgGradient="linear(to-r, #1A0436, #5E0FCD)" color={"#fff"} sha > diff --git a/src/Pages/RegisteredCorporate/RegisteredCorporate.jsx b/src/Pages/RegisteredCorporate/RegisteredCorporate.jsx index 48c4e7d..bc3e5db 100644 --- a/src/Pages/RegisteredCorporate/RegisteredCorporate.jsx +++ b/src/Pages/RegisteredCorporate/RegisteredCorporate.jsx @@ -72,7 +72,7 @@ const RegisteredCorporate = () => { console.log(data?.data?.rows); - // Table headers + // Table headers const tableHeadRow = [ "Select", "Corp Id", @@ -94,7 +94,10 @@ const RegisteredCorporate = () => { gap={2} alignItems={"center"} cursor={"pointer"} - onClick={() => navigate("/register-corporates/view-corporates")} + // onClick={() => navigate(`/register-corporates/view-corporates/${item.id}`)} + onClick={() => { + navigate(`/register-corporates/view-corporates/${item.id}`); + }} > {item?.corporate_code} diff --git a/src/Pages/ViewCorporates/ViewCorporates.jsx b/src/Pages/ViewCorporates/ViewCorporates.jsx index 8a600b2..47fafd1 100644 --- a/src/Pages/ViewCorporates/ViewCorporates.jsx +++ b/src/Pages/ViewCorporates/ViewCorporates.jsx @@ -1,4 +1,27 @@ -import { Accordion, AccordionButton, AccordionIcon, AccordionItem, AccordionPanel, Badge, Box, Button, Divider, HStack, Icon, Image, Input, InputGroup, InputLeftElement, List, ListIcon, ListItem, Tag, Text, useDisclosure, VStack } from "@chakra-ui/react"; +import { + Accordion, + AccordionButton, + AccordionIcon, + AccordionItem, + AccordionPanel, + Badge, + Box, + Button, + Divider, + HStack, + Icon, + Image, + Input, + InputGroup, + InputLeftElement, + List, + ListIcon, + ListItem, + Tag, + Text, + useDisclosure, + VStack, +} from "@chakra-ui/react"; import { OPACITY_ON_LOAD } from "../../Layout/animations"; import MiniHeader from "../../Components/MiniHeader"; import GlobalStateContext from "../../Contexts/GlobalStateContext"; @@ -16,16 +39,34 @@ import { FaRegFile } from "react-icons/fa"; import { LuEye } from "react-icons/lu"; import { MdCheckCircle, MdOutlineModeEdit } from "react-icons/md"; import SecondaryButton from "../../Components/Buttons/SecondaryButton"; -import pancard from "../../assets/pancard.svg" -import gift from "../../assets/gift.svg" -import { useNavigate } from "react-router-dom"; - +import pancard from "../../assets/pancard.svg"; +import gift from "../../assets/gift.svg"; +import { useNavigate, useParams } from "react-router-dom"; +import { useGetViewIdQuery } from "../../Services/register.corporate.service"; const ViewCorporates = () => { - const navigate = useNavigate() + const navigate = useNavigate(); + const params = useParams(); + const id = params?.id; const { empData } = useContext(GlobalStateContext); const [isLoading, setIsLoading] = useState(false); const [selectedRadio, setSelectedRadio] = useState(""); + const [getByIdData, setGetByIdData] = useState(); + + // const { data, isLoading } = useGetViewIdQuery(debouncedSearchTerm, { + // skip: debouncedSearchTerm === "" && searchTerm !== "", // Skip only if searchTerm has been cleared after a previous search + // }); + + // console.log(data?.data?.rows); + + const { + data, + isLoading: corporateLoading, + error, + } = useGetViewIdQuery({ id }); + + console.log(data?.data); + const panCardData = [ { id: 1, src: pancard, title: "Wdipl PAN. pdf", size: "201 kb" }, @@ -53,7 +94,7 @@ const ViewCorporates = () => { "Department", "Role", "Status", - "Action" + "Action", ]; // Extracted data for table const extractedArray = empData?.map((item, index) => ({ @@ -62,13 +103,13 @@ const ViewCorporates = () => { {item.EmpId} ), - "Name": ( + Name: ( Dan Abramov { {item.EmailAddress} ), - "Mobile number": - ( { alignItems={"center"} > {item.MobileNumber} - ), - "Grade": ( + + ), + Grade: ( {item.Grade} ), - "Department": ( + Department: ( {item.Department} ), - "Role": ( + Role: ( {item.Role} ), - "Status": ( + Status: ( - {" "} + { ), - "Action": ( - navigate('/register-corporates/view-corporates-employee-details')}> + Action: ( + + navigate("/register-corporates/view-corporates-employee-details") + } + > {item.Action} ), - })); return ( - + (data && - + @@ -152,7 +198,9 @@ const ViewCorporates = () => { Website developers India - Limited Liability Partnership (LLP) + + Limited Liability Partnership (LLP) + {/* { */} - - - Registered - - + + {" "} + + Registered + + } /> } /> @@ -210,14 +259,14 @@ const ViewCorporates = () => { - + Full Name - Jenny Wilson + {data?.data?.entity_name} @@ -225,7 +274,7 @@ const ViewCorporates = () => { Email address - jennywilson@gmail.com + {data?.data?.emailAddress} @@ -233,7 +282,7 @@ const ViewCorporates = () => { Phone number - +91 4578451245 + {data?.data?.mobileNumber} @@ -247,14 +296,14 @@ const ViewCorporates = () => { - + Company Name - WDIPL + {data?.data?.corporate_name} @@ -262,7 +311,7 @@ const ViewCorporates = () => { Industry - Fintech + {data?.data?.industry_xid} @@ -270,7 +319,7 @@ const ViewCorporates = () => { type - LLP + {data?.data?.corporate_type_xid} @@ -284,7 +333,7 @@ const ViewCorporates = () => { - + @@ -311,14 +360,29 @@ const ViewCorporates = () => { - {item.title} + {item.title} - + {item.title} - + {item.size} @@ -328,7 +392,6 @@ const ViewCorporates = () => { ))} - {/* for pink bg */} @@ -339,7 +402,7 @@ const ViewCorporates = () => { - + Director 1 @@ -377,14 +440,29 @@ const ViewCorporates = () => { - {item.title} + {item.title} - + {item.title} - + {item.size} @@ -433,14 +511,29 @@ const ViewCorporates = () => { - {item.title} + {item.title} - + {item.title} - + {item.size} @@ -461,7 +554,7 @@ const ViewCorporates = () => { - + @@ -477,22 +570,30 @@ const ViewCorporates = () => { Renewal in 30 days - - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut et massa mi. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut et + massa mi. - + Lorem ipsum dolor sit amet, consectetur adipisicing elit - + Lorem ipsum dolor sit amet, consectetur adipisicing elit @@ -500,13 +601,21 @@ const ViewCorporates = () => { - + Lorem ipsum dolor sit amet, consectetur adipisicing elit - + Lorem ipsum dolor sit amet, consectetur adipisicing elit @@ -528,22 +637,30 @@ const ViewCorporates = () => { Renewal in 30 days - - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut et massa mi. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut et + massa mi. - + Lorem ipsum dolor sit amet, consectetur adipisicing elit - + Lorem ipsum dolor sit amet, consectetur adipisicing elit @@ -551,13 +668,21 @@ const ViewCorporates = () => { - + Lorem ipsum dolor sit amet, consectetur adipisicing elit - + Lorem ipsum dolor sit amet, consectetur adipisicing elit @@ -568,16 +693,14 @@ const ViewCorporates = () => { - - - + - + @@ -585,14 +708,20 @@ const ViewCorporates = () => { - + {/* table knvfidem */} - - - Corporates + + + + Corporates + @@ -602,13 +731,12 @@ const ViewCorporates = () => { type="search" placeholder="Search..." rounded="md" - bg={'gray.100'} - border={'none'} - // value={searchTerm} - // onChange={(e) => setSearchTerm(e.target.value)} + bg={"gray.100"} + border={"none"} + // value={searchTerm} + // onChange={(e) => setSearchTerm(e.target.value)} /> - { - - - - - - + ) ); }; diff --git a/src/Routes/Routes.js b/src/Routes/Routes.js index 8c490ad..3b31d91 100644 --- a/src/Routes/Routes.js +++ b/src/Routes/Routes.js @@ -7,6 +7,6 @@ import ViewCorporatesEmployeeDetails from "../Pages/ViewCorporates/ViewCorporate export const RouteLink = [ { path: "/", Component: NotFound }, { path: "/register-corporates", Component: RegisteredCorporate }, - { path: "/register-corporates/view-corporates", Component: ViewCorporates }, + { path: "/register-corporates/view-corporates/:id", Component: ViewCorporates }, { path: "/register-corporates/view-corporates-employee-details", Component: ViewCorporatesEmployeeDetails }, ]; diff --git a/src/Services/register.corporate.service.js b/src/Services/register.corporate.service.js index fb4ec6a..e021f40 100644 --- a/src/Services/register.corporate.service.js +++ b/src/Services/register.corporate.service.js @@ -10,29 +10,39 @@ export const registerCorporate = createApi({ reducerPath: "registerCorporate", baseQuery: baseQuery, tagTypes: ["getAllCorp"], - + endpoints: (builder) => ({ - - getAllCorp: builder.query({ - // query: (searchData) => `/corporate/admin`, - query: (searchData) => `/corporate/admin/?search_data=${searchData}?page=${1}&size=${100}`, - providesTags: ["getAllCorp"], - }), - + // query: (searchData) => `/corporate/admin`, + query: (searchData) => + `/corporate/admin/?search_data=${searchData}?page=${1}&size=${100}`, + providesTags: ["getAllCorp"], + }), - // =====[create] - corporateQuickAdd: builder.mutation({ - query: (data) => ({ - url: `/corporate/admin/quick-add`, - method: "POST", - body: data, - }), - invalidatesTags: ["getAllCorp"], + // =====[create] + corporateQuickAdd: builder.mutation({ + query: (data) => ({ + url: `/corporate/admin/quick-add`, + method: "POST", + body: data, }), - + invalidatesTags: ["getAllCorp"], + }), + + getViewId: builder.query({ + query: ({ data, id }) => ({ + url: `/corporate/admin/${id}`, + method: "GET", + body: data, + }), + invalidatesTags: ["getAllCorp"], + }), }), }); // Export hooks for usage in functional components -export const { useCorporateQuickAddMutation, useGetAllCorpQuery } = registerCorporate; +export const { + useCorporateQuickAddMutation, + useGetAllCorpQuery, + useGetViewIdQuery, +} = registerCorporate;