From 021eb6e4dbc7e65c3a7a89f7b540b384b242211b Mon Sep 17 00:00:00 2001
From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com>
Date: Fri, 6 Jun 2025 20:10:40 +0530
Subject: [PATCH 1/2] [ update  ]

---
 src/Pages/SubAdmin/AddModel.tsx              | 342 +++++++++++++++----
 src/Redux/Service/faqs.service.ts            |   1 +
 src/Redux/Service/manage.subadmin.service.ts |  38 ++-
 3 files changed, 309 insertions(+), 72 deletions(-)

diff --git a/src/Pages/SubAdmin/AddModel.tsx b/src/Pages/SubAdmin/AddModel.tsx
index 03472cb..ce5b260 100644
--- a/src/Pages/SubAdmin/AddModel.tsx
+++ b/src/Pages/SubAdmin/AddModel.tsx
@@ -1,80 +1,288 @@
-import { Button } from "../../components/ui/button"
-import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../components/ui/dialog"
-import { Field, Grid, Heading, Input, Stack, Text } from "@chakra-ui/react"
-import { IoMdAdd } from "react-icons/io"
-import { Checkbox } from "../../components/ui/checkbox"
+import { useState } from "react";
+import { Button } from "../../components/ui/button";
+import {
+  DialogBody,
+  DialogCloseTrigger,
+  DialogContent,
+  DialogFooter,
+  DialogHeader,
+  DialogRoot,
+  DialogTitle,
+  DialogTrigger,
+} from "../../components/ui/dialog";
+import {
+  Field,
+  Grid,
+  Heading,
+  Input,
+  Stack,
+  Text,
+} from "@chakra-ui/react";
+import { IoMdAdd } from "react-icons/io";
+import { Checkbox } from "../../components/ui/checkbox";
+import { useCreateSubAdminPostMutation } from "../../Redux/Service/manage.subadmin.service";
+import { toaster } from "../../components/ui/toaster";
 
-function AddModel() {
-    return (
+function AddModel({ refetch }: { refetch: VoidFunction }) {
+  const [createSubAdminPost, { isLoading }] = useCreateSubAdminPostMutation();
 
-        <DialogRoot placement="center">
-            <DialogTrigger asChild>
-                {/* <Button bg={"transparent"} size="sm">
-                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
-                </Button> */}
-                <Button rounded={'md'} px={4} py={2} size={"xs"} bg={"#02A0A0"}><IoMdAdd /> Add</Button>
+  const [formData, setFormData] = useState({
+    firstName: "",
+    lastName: "",
+    dob: "",
+    gender: "",
+    email: "",
+    phone: ""
+  });
 
-            </DialogTrigger>
+  const [isOpen, setIsOpen] = useState(false);
 
-            <DialogContent
-                bg={"#fff"}
-                // w={{ lg: "60%", md: "230px" }}
-                w={{ base: '90%', md: '400px' }}
-                height={'80vh'}
-                overflow={'scroll'}
-                overflowX="hidden" 
-                p={3} // Reduced padding
-                bgSize={'md'}
-            >
-                <DialogHeader bg="white"  >
-                    <DialogTitle alignSelf="center" color="black" fontSize="14px"
-                    >Add Sub Admin Account</DialogTitle>
-                </DialogHeader>
+  const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const { name, value } = e.target;
+    setFormData(prev => ({
+      ...prev,
+      [name]: value
+    }));
+  };
 
-                <DialogBody bg="white">
-                    <Stack py={3} >
+  const handleSubmit = async () => {
+    const { firstName, lastName, dob, gender, email, phone } = formData;
+    
+    if (!firstName || !lastName || !dob || !gender || !email || !phone) {
+      toaster.create({
+        title: "Error",
+        description: "Please fill in all required fields",
+        type: "error",
+      });
+      return;
+    }
 
-                        <Field.Root>
-                            <Field.Label color="black" pt={1} fontSize="12px">First Name</Field.Label>
-                            <Input placeholder="Enter the First Name" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
+    const payload = {
+    //   principal_type_xid: 4,
+    //   principal_source_xid: 1,
+    //   user_name: `${firstName} ${lastName}`,
+      first_name: firstName,
+      last_name: lastName,
+      date_of_birth: dob,
+      gender,
+      email_address: email,   
+      phone_number: phone,
+      created_by: 1,
+    };
 
-                            <Field.Label color="black" pt={1} fontSize="12px">Last Name</Field.Label>
-                            <Input placeholder="Enter the Last Name" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
+    try {
+      const response = await createSubAdminPost(payload).unwrap();
+      
+      if (response.status === "success") {
+        toaster.create({
+          title: "Success",
+          description: response.message || "Sub-admin added successfully",
+          type: "success",
+        });
+        refetch();
+        setIsOpen(false);
+      }
+    } catch (error: any) {
+      toaster.create({
+        title: "Error",
+        description: error?.data?.message || "Failed to create sub-admin",
+        type: "error",
+      });
+    }
+  };
 
-                            <Field.Label color="black" pt={1} fontSize="12px">DOB</Field.Label>
-                            <Input placeholder="Enter the DOB" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
+  return (
+    <DialogRoot
+      open={isOpen}
+      onOpenChange={(details) => setIsOpen(details.open)}
+      placement="center"
+    >
+      <DialogTrigger asChild>
+        <Button rounded={"md"} px={4} py={2} size={"xs"} bg={"#02A0A0"}>
+          <IoMdAdd /> Add
+        </Button>
+      </DialogTrigger>
 
-                            <Field.Label color="black" pt={1} fontSize="12px">Gender</Field.Label>
-                            <Input placeholder="Enter the Gender" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
-                            <Heading mt={5} color={'#000'} fontSize={'sm'}>Permissions</Heading>
-                        </Field.Root>
-                        <Grid templateColumns="repeat(2, 1fr)" gap={4}>
-                            <Checkbox size={'sm'} color={"black"} ><Text fontSize={12}>Dashboard</Text></Checkbox>
-                            <Checkbox size={'sm'} color={"black"} ><Text fontSize={12}>Manage contact us</Text></Checkbox>
-                            <Checkbox size={'sm'} color={"black"} ><Text fontSize={12}>manage User</Text></Checkbox>
-                            <Checkbox size={'sm'} color={"black"} ><Text fontSize={12}>Manage CMS</Text></Checkbox>
-                            <Checkbox size={'sm'} color={"black"} ><Text fontSize={12}>Manage Post</Text></Checkbox>
-                            <Checkbox size={'sm'} color={"black"} ><Text fontSize={12}>Manage Reports</Text></Checkbox>
-                            <Checkbox size={'sm'} color={"black"} ><Text fontSize={12}>manage Sub-Admin</Text></Checkbox>
-                            <Checkbox size={'sm'} color={"black"} ><Text fontSize={12}>My profile</Text></Checkbox>
-                            <Checkbox size={'sm'} color={"black"} ><Text fontSize={12}>Manage Jobs</Text> </Checkbox>
-                            <Checkbox size={'sm'} color={"black"} ><Text fontSize={12}> manage feedbacks</Text></Checkbox>
-                            <Checkbox size={'sm'} color={"black"} ><Text fontSize={12}>Manage community</Text> </Checkbox>
-                            <Checkbox size={'sm'} color={"black"} ><Text fontSize={12}> Notification</Text></Checkbox>
-                        </Grid>
-                    </Stack>
-                </DialogBody>
-                <DialogFooter display="flex" justifyContent="center" pt={"2"}>
-                    <Button size={'xs'} w="100%" bg="#02A0A0" color={"#fff"}>
-                        Save
-                    </Button>
-                </DialogFooter>
+      <DialogContent
+        bg={"#fff"}
+        w={{ base: "90%", md: "400px" }}
+        height={"80vh"}
+        overflow={"scroll"}
+        overflowX="hidden"
+        p={3}
+      >
+        <DialogHeader bg="white">
+          <DialogTitle alignSelf="center" color="black" fontSize="14px">
+            Add Sub Admin Account
+          </DialogTitle>
+        </DialogHeader>
 
-                <DialogCloseTrigger color="black" />
-            </DialogContent>
-        </DialogRoot >
+        <DialogBody bg="white">
+          <Stack py={3}>
+            <Field.Root>
+              <Field.Label color="black" pt={1} fontSize="12px">
+                First Name
+              </Field.Label>
+              <Input
+                name="firstName"
+                placeholder="Enter the First Name"
+                value={formData.firstName}
+                onChange={handleChange}
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
+              />
 
-    )
+              <Field.Label color="black" pt={1} fontSize="12px">
+                Last Name
+              </Field.Label>
+              <Input
+                name="lastName"
+                placeholder="Enter the Last Name"
+                value={formData.lastName}
+                onChange={handleChange}
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
+              />
+
+              <Field.Label color="black" pt={1} fontSize="12px">
+                DOB
+              </Field.Label>
+              <Input
+                name="dob"
+                placeholder="YYYY-MM-DD"
+                value={formData.dob}
+                onChange={handleChange}
+                type="date"
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
+              />
+
+              <Field.Label color="black" pt={1} fontSize="12px">
+                Gender
+              </Field.Label>
+              <Input
+                name="gender"
+                placeholder="Enter the Gender"
+                value={formData.gender}
+                onChange={handleChange}
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
+              />
+
+              <Field.Label color="black" pt={1} fontSize="12px">
+                Email
+              </Field.Label>
+              <Input
+                name="email"
+                placeholder="Enter the Email"
+                value={formData.email}
+                onChange={handleChange}
+                type="email"
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
+              />
+
+              <Field.Label color="black" pt={1} fontSize="12px">
+                Phone Number
+              </Field.Label>
+              <Input
+                name="phone"
+                placeholder="Enter the Phone Number"
+                value={formData.phone}
+                onChange={handleChange}
+                type="tel"
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
+              />
+
+              <Heading mt={5} color={"#000"} fontSize={"sm"}>
+                Permissions
+              </Heading>
+            </Field.Root>
+
+            <Grid templateColumns="repeat(2, 1fr)" gap={4}>
+              <Checkbox size={"sm"} color={"black"}>
+                <Text fontSize={12}>Dashboard</Text>
+              </Checkbox>
+              <Checkbox size={"sm"} color={"black"}>
+                <Text fontSize={12}>Manage contact us</Text>
+              </Checkbox>
+              <Checkbox size={"sm"} color={"black"}>
+                <Text fontSize={12}>Manage User</Text>
+              </Checkbox>
+              <Checkbox size={"sm"} color={"black"}>
+                <Text fontSize={12}>Manage CMS</Text>
+              </Checkbox>
+              <Checkbox size={"sm"} color={"black"}>
+                <Text fontSize={12}>Manage Post</Text>
+              </Checkbox>
+              <Checkbox size={"sm"} color={"black"}>
+                <Text fontSize={12}>Manage Reports</Text>
+              </Checkbox>
+              <Checkbox size={"sm"} color={"black"}>
+                <Text fontSize={12}>Manage Sub-Admin</Text>
+              </Checkbox>
+              <Checkbox size={"sm"} color={"black"}>
+                <Text fontSize={12}>My Profile</Text>
+              </Checkbox>
+              <Checkbox size={"sm"} color={"black"}>
+                <Text fontSize={12}>Manage Jobs</Text>
+              </Checkbox>
+              <Checkbox size={"sm"} color={"black"}>
+                <Text fontSize={12}>Manage Feedbacks</Text>
+              </Checkbox>
+              <Checkbox size={"sm"} color={"black"}>
+                <Text fontSize={12}>Manage Community</Text>
+              </Checkbox>
+              <Checkbox size={"sm"} color={"black"}>
+                <Text fontSize={12}>Notification</Text>
+              </Checkbox>
+            </Grid>
+          </Stack>
+        </DialogBody>
+
+        <DialogFooter display="flex" justifyContent="center" pt={"2"}>
+          <Button
+            size={"xs"}
+            w="100%"
+            bg="#02A0A0"
+            color={"#fff"}
+            onClick={handleSubmit}
+            // isLoading={isLoading}
+            disabled={isLoading}
+          >
+            Save
+          </Button>
+        </DialogFooter>
+
+        <DialogCloseTrigger color="black" />
+      </DialogContent>
+    </DialogRoot>
+  );
 }
 
-export default AddModel
\ No newline at end of file
+export default AddModel;
diff --git a/src/Redux/Service/faqs.service.ts b/src/Redux/Service/faqs.service.ts
index 332b87c..2d72f23 100644
--- a/src/Redux/Service/faqs.service.ts
+++ b/src/Redux/Service/faqs.service.ts
@@ -69,6 +69,7 @@ export const faqs = createApi({
         body: { id, is_active },
       }),
     }),
+    
 
     deleteFaqPost: builder.mutation<{ status: string; message: string }, { id: number }>({
       query: ({ id }) => ({
diff --git a/src/Redux/Service/manage.subadmin.service.ts b/src/Redux/Service/manage.subadmin.service.ts
index d10fbe6..a975d62 100644
--- a/src/Redux/Service/manage.subadmin.service.ts
+++ b/src/Redux/Service/manage.subadmin.service.ts
@@ -40,7 +40,6 @@ interface ApiResponse {
   data: PaginatedData;
 }
 
-
 // export type SubAdminPost = {
 //   id: number;
 //   first_name: string,
@@ -80,11 +79,30 @@ interface SubAdminView {
   data: SubAdmin[];
 }
 
+interface CreateSubAdminPayload {
+  principal_type_xid: number;
+  principal_source_xid: number;
+  user_name: string;
+  first_name: string;
+  last_name: string;
+  date_of_birth: string;
+  gender: string;
+  email_address: string;
+  phone_number: string;
+  created_by: number;
+}
+
+interface CreateSubAdminResponse {
+  status: string;
+  status_code: number;
+  message: string;
+  data: UserData;
+}
 
 export const manageSubAdmin = createApi({
   reducerPath: "manageSubAdmin",
   baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
-  tagTypes: ['SubAdmin'],
+  tagTypes: ["SubAdmin"],
   endpoints: (builder) => ({
     createFaqPost: builder.mutation<Post, Partial<Post>>({
       query: (data) => ({
@@ -94,11 +112,11 @@ export const manageSubAdmin = createApi({
       }),
     }),
     getSubAdmin: builder.query<ApiResponse, void>({
-      query: () => `/sub-admin`
+      query: () => `/sub-admin`,
     }),
 
     viewSubAdmin: builder.query<SubAdminView, number>({
-      query: (id) => `/sub-admin-view/${id}`
+      query: (id) => `/sub-admin-view/${id}`,
     }),
 
     updateSubAdmin: builder.mutation({
@@ -109,6 +127,15 @@ export const manageSubAdmin = createApi({
       }),
     }),
 
+   createSubAdminPost: builder.mutation<CreateSubAdminResponse, CreateSubAdminPayload>({
+    query: (data) => ({
+      url: "/sub-admin-create",
+      method: "POST",
+      body: data,
+    }),
+    invalidatesTags: ["SubAdmin"], // Add this to invalidate cache
+  }),
+
     faqToggle: builder.mutation({
       query: ({ id, is_active }) => ({
         url: `/faq-status`,
@@ -131,10 +158,11 @@ export const {
   useLazyViewSubAdminQuery,
   useUpdateSubAdminMutation,
   useDeleteSubAdminPostMutation,
+  useCreateSubAdminPostMutation
 } = manageSubAdmin;
 
 export type Post = {
   id: number;
   title: string;
   body: string;
-};
\ No newline at end of file
+};

From 0531684c73f0ec11886cdc327adb6153d1b3a004 Mon Sep 17 00:00:00 2001
From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com>
Date: Wed, 18 Jun 2025 15:34:32 +0530
Subject: [PATCH 2/2] [ update changes ]

---
 .env                                          |   4 +-
 index.html                                    |   3 +-
 src/Pages/ManageCMS/FAQ/FAQ.tsx               |   2 +-
 src/Pages/ManageCMS/FAQ/FaqAddModel.tsx       |   2 +-
 .../ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx |  89 ++--
 .../TermsAndConditions/TermsAndConditions.tsx | 108 ++--
 src/Pages/ManageContact/ManageContact.tsx     | 106 ++--
 src/Pages/ManageGroups/ManageGroups.tsx       |   3 +
 src/Pages/ManageJobs/ManageJobs.tsx           | 113 ++++-
 src/Pages/ManageJobs/ViewManageJob.tsx        | 467 +++++++++---------
 .../DeactivatedAccounts.tsx                   |  81 ++-
 .../RegisterUsers/RegisterUsers.tsx           |   2 +-
 .../AgencyMaster/AgencyMaster.tsx             |   2 +-
 .../AgencyMaster/ViewAgencyAddModel.tsx       |   2 +-
 src/Pages/SetNewPassword.tsx                  | 321 ++++++------
 src/Pages/SubAdmin/AddModel.tsx               | 213 +++-----
 src/Pages/SubAdmin/ViewSubAdmin.tsx           |   2 +-
 .../Service/agency.master.module.service.ts   |   1 +
 .../Service/deactivated.account.service.ts    |  48 +-
 src/Redux/Service/faqs.service.ts             |   2 +-
 src/Redux/Service/manage.contactus.service.ts |  51 +-
 src/Redux/Service/manage.jobs.service.ts      |  16 +-
 src/Redux/Service/manage.subadmin.service.ts  |  21 +-
 src/components/AlertDailog.tsx                |  16 +-
 24 files changed, 952 insertions(+), 723 deletions(-)

diff --git a/.env b/.env
index 5f21366..7328291 100644
--- a/.env
+++ b/.env
@@ -4,8 +4,8 @@
 # VITE_PASSWORD="71%@L%es^bUX94`J9XT*@bh,._WWM{$%^^&&"
 # VITE_APP_NAME=MyViteApp
 # VITE_IMG_TEMPLATES='https://ssa.betadelivery.com/storage/app/public/uploads/post_templates/'
-# VITE_API_URL='https://ssa.betadelivery.com/testing/apia/v1'
-VITE_API_URL='https://ssa.betadelivery.com/apia/v1'
+VITE_API_URL='https://ssa.betadelivery.com/testing/apia/v1'
+# VITE_API_URL='https://ssa.betadelivery.com/apia/v1'
 VITE_USER_NAME="Admin"
 VITE_PASSWORD="71%@L%es^bUX94`J9XT*@bh,._WWM{$%^^&&"
 # VITE_PASSWORD="71%@L%es^bUX94`J9XT*%4&^%tUU^%Q^ffgt"
diff --git a/index.html b/index.html
index 58b50b9..cd3d9f3 100644
--- a/index.html
+++ b/index.html
@@ -3,7 +3,8 @@
 
 <head>
   <meta charset="UTF-8" name="referrer" content="strict-origin-when-cross-origin" />
-  <link rel="icon" type="image/png+xml" href="/src/assets/favicon.png" />
+  <!-- <link rel="icon" type="image/png+xml" href="/src/assets/favicon.png" /> -->
+   <link rel="icon" type="image/png" href="/favicon.png" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>SEO Admin</title>
 </head>
diff --git a/src/Pages/ManageCMS/FAQ/FAQ.tsx b/src/Pages/ManageCMS/FAQ/FAQ.tsx
index c1def1d..c146c8a 100644
--- a/src/Pages/ManageCMS/FAQ/FAQ.tsx
+++ b/src/Pages/ManageCMS/FAQ/FAQ.tsx
@@ -160,7 +160,7 @@ const FAQ = () => {
                 handleDeleteFaq(selectedFaqId);
               }
             }}
-          />
+          /> 
           <Box>
             <Switch
               colorPalette={'teal'}
diff --git a/src/Pages/ManageCMS/FAQ/FaqAddModel.tsx b/src/Pages/ManageCMS/FAQ/FaqAddModel.tsx
index 51a7f99..6da5bfe 100644
--- a/src/Pages/ManageCMS/FAQ/FaqAddModel.tsx
+++ b/src/Pages/ManageCMS/FAQ/FaqAddModel.tsx
@@ -95,7 +95,7 @@ function FaqAddModel({ refetch }: { refetch: VoidFunction }) {
           <DialogTitle alignSelf="center" color="black" fontSize="14px">
             Add
           </DialogTitle>
-        </DialogHeader>
+        </DialogHeader> 
 
         <DialogBody bg="white">
           <Stack py={3}>
diff --git a/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx
index 5d0e1eb..ea303e5 100644
--- a/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx
+++ b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx
@@ -1,4 +1,4 @@
-import { Badge, HStack, Text, VStack } from "@chakra-ui/react";
+import { Badge, HStack, Stack, Text, VStack } from "@chakra-ui/react";
 import { useGetPrivacyPolicyQuery } from "../../../Redux/Service/privacy.policy.service";
 import MainFrame from "../../../components/MainFrame";
 import { Spinner } from "../../../components/Sipnner/Spinner";
@@ -6,54 +6,77 @@ import PrivacyPolicyAddModel from "./PrivacyPolicyAddModel";
 import GlobalStateContext from "../../../Contexts/GlobalStateContext";
 import { useContext, useEffect } from "react";
 
-
 const PrivacyPolicy = () => {
   const { data, isLoading, isFetching, refetch } = useGetPrivacyPolicyQuery();
 
-  console.log('PRIVACY', data?.data);
-
+  console.log("PRIVACY", data?.data);
 
   const context = useContext(GlobalStateContext);
-  if (!context) throw new Error('App must be used within a GlobalStateProvider');
+  if (!context)
+    throw new Error("App must be used within a GlobalStateProvider");
 
   const { setIsBarLoading } = context;
   useEffect(() => {
-    setIsBarLoading(isFetching)
-  }, [data])
+    setIsBarLoading(isFetching);
+  }, [data]);
 
-console.log('Privacy Policy Data:', data?.data);
+  console.log("Privacy Policy Data:", data?.data);
 
   return (
     <MainFrame transperant={true}>
-      <VStack gap={4} pb={4} pt={0}>
-        {isLoading || isFetching ?
-          <Spinner /> : data?.data?.map(({ id, content, privacy_language }) => <VStack bg={'#fff'}
-            boxShadow={'rgba(99, 99, 99, 0.2) 0px 2px 8px 0px'} rounded={'lg'} p={3} key={id}>
-            <HStack
-              w={"100%"}
-              justifyContent={"space-between"}
-
-              py={0}
-              px={0}
+      <Stack bg={"#fff"} w={"100%"} p={4} borderRadius={4} mb={4}>
+        <Text color={"black"} textAlign={"left"} fontWeight={"600"}>
+          Privacy Policy
+        </Text>
+      </Stack>
+      <VStack gap={4} pb={4} pt={0}> 
+        {isLoading || isFetching ? (
+          <Spinner />
+        ) : (
+          data?.data?.map(({ id, content, privacy_language }) => (
+            <VStack
+              bg={"#fff"}
+              boxShadow={"rgba(99, 99, 99, 0.2) 0px 2px 8px 0px"}
+              rounded={"lg"}
+              p={3}
+              key={id}
             >
-              <Text as={"span"} fontSize={"sm"} fontWeight={500} color={"#000"}>
-                Privacy Policy <Badge variant={'surface'} colorPalette="cyan" ms={2} size={'sm'} fontSize={'xs'} px={2}>🎓 {privacy_language?.language_name}</Badge>
-              </Text>
+              <HStack w={"100%"} justifyContent={"space-between"} py={0} px={0}>
+                <Text
+                  as={"span"}
+                  fontSize={"sm"}
+                  fontWeight={500}
+                  color={"#000"}
+                >
+                  <Badge
+                    variant={"surface"}
+                    colorPalette="cyan"
+                    size={"sm"}
+                    fontSize={"xs"}
+                    px={2}
+                  >
+                    🎓 {privacy_language?.language_name}
+                  </Badge>
+                </Text>
 
-              <PrivacyPolicyAddModel policyData={{ id, content, privacy_language }} refetch={refetch} />
-            </HStack>
-            <Text
-              as="p"
-              fontSize="sm"
-              fontWeight={400}
-              color="#1D1D1D"
-              dangerouslySetInnerHTML={{ __html: content }}
-            />
-
-          </VStack>)}
+                <PrivacyPolicyAddModel
+                  policyData={{ id, content, privacy_language }}
+                  refetch={refetch}
+                />
+              </HStack>
+              <Text
+                as="p"
+                fontSize="sm"
+                fontWeight={400}
+                color="#1D1D1D"
+                dangerouslySetInnerHTML={{ __html: content }}
+              />
+            </VStack>
+          ))
+        )}
       </VStack>
     </MainFrame>
   );
 };
 
-export default PrivacyPolicy;
\ No newline at end of file
+export default PrivacyPolicy;
diff --git a/src/Pages/ManageCMS/TermsAndConditions/TermsAndConditions.tsx b/src/Pages/ManageCMS/TermsAndConditions/TermsAndConditions.tsx
index cff201b..16b796a 100644
--- a/src/Pages/ManageCMS/TermsAndConditions/TermsAndConditions.tsx
+++ b/src/Pages/ManageCMS/TermsAndConditions/TermsAndConditions.tsx
@@ -1,59 +1,67 @@
 import { Badge, HStack, Spinner, Stack, Text, VStack } from "@chakra-ui/react";
-import MainFrame from "../../../components/MainFrame"
+import MainFrame from "../../../components/MainFrame";
 import TermsAndConditionsAddModel from "./TermsAndConditionsAddModel";
 import { useGetTermsQuery } from "../../../Redux/Service/terms.and.condition.service";
 
-
 const TermsAndConditions = () => {
-  const { data, refetch, isLoading, isFetching } = useGetTermsQuery()
+  const { data, refetch, isLoading, isFetching } = useGetTermsQuery();
+
+  console.log(data);
 
   return (
+    <MainFrame transperant={true}>
+      <VStack gap={4} pb={4} pt={0}>
+        <Stack bg={"#fff"} w={"100%"} mt={2} p={4} borderRadius={4}>
+          <Text color={"black"} textAlign={"left"} fontWeight={"600"}>
+            Terms and Conditions
+          </Text>
+        </Stack>
 
-    <MainFrame>
-      <MainFrame transperant={true}>
-        <VStack gap={4} pb={4} pt={0}>
-          <Stack bg={"#fff"} w={"100%"} mt={2} p={4} borderRadius={4}><Text color={"black"} textAlign={"left"} fontWeight={"600"} >Terms and Conditions
-          </Text></Stack>
-
-          {isLoading || isFetching ? (
-            <Spinner />
-          ) : (
-            data?.data?.map(({ id, content, terms_cond_language }) => (
-              <VStack
-                bg={"#fff"}
-                boxShadow={"rgba(99, 99, 99, 0.2) 0px 2px 8px 0px"}
-                rounded={"lg"}
-                p={3}
-                key={id}
-              >
-
-                <HStack w={"100%"} justifyContent={"space-between"} py={0} px={0}>
-                  <Text as={"span"} fontSize={"sm"} fontWeight={500} color={"#000"}>
-                    <Badge
-                      variant={"surface"}
-                      colorPalette="cyan"
-                      ms={2}
-                      size={"sm"}
-                      fontSize={"xs"}
-                      px={2}
-                    >
-                      🎓 {terms_cond_language?.language_name}
-                    </Badge>
-                  </Text>
-
-                  {/* Pass Data to AboutUsAddModel */}
-                  <TermsAndConditionsAddModel termsData={{ id, content, terms_cond_language }} refetch={refetch} />
-                </HStack>
-                <Text as="p" fontSize="sm" fontWeight={400} color="#1D1D1D">
-                  {/* {content} */}
-                  <div dangerouslySetInnerHTML={{ __html: content }} />
+        {isLoading || isFetching ? (
+          <Spinner />
+        ) : (
+          data?.data?.map(({ id, content, terms_cond_language }) => (
+            <VStack
+              bg={"#fff"}
+              boxShadow={"rgba(99, 99, 99, 0.2) 0px 2px 8px 0px"}
+              rounded={"lg"}
+              p={3}
+              key={id}
+            >
+              <HStack w={"100%"} justifyContent={"space-between"} py={0} px={0}>
+                <Text
+                  as={"span"}
+                  fontSize={"sm"}
+                  fontWeight={500}
+                  color={"#000"}
+                >
+                  <Badge
+                    variant={"surface"}
+                    colorPalette="cyan"
+                    ms={2}
+                    size={"sm"}
+                    fontSize={"xs"}
+                    px={2}
+                  >
+                    🎓 {terms_cond_language?.language_name}
+                  </Badge>
                 </Text>
-              </VStack>
-            ))
-          )}
-        </VStack>
-      </MainFrame>
-    </MainFrame >
-  )
-}
-export default TermsAndConditions
\ No newline at end of file
+
+                {/* Pass Data to AboutUsAddModel */}
+                <TermsAndConditionsAddModel
+                  termsData={{ id, content, terms_cond_language }}
+                  refetch={refetch}
+                />
+              </HStack>
+              <Text as="p" fontSize="sm" fontWeight={400} color="#1D1D1D">
+                {/* {content} */}
+                <div dangerouslySetInnerHTML={{ __html: content }} />
+              </Text>
+            </VStack>
+          ))
+        )}
+      </VStack>
+    </MainFrame>
+  );
+};
+export default TermsAndConditions;
diff --git a/src/Pages/ManageContact/ManageContact.tsx b/src/Pages/ManageContact/ManageContact.tsx
index 9861955..259e6c7 100644
--- a/src/Pages/ManageContact/ManageContact.tsx
+++ b/src/Pages/ManageContact/ManageContact.tsx
@@ -1,38 +1,77 @@
 import { Box, HStack, Input, Text } from "@chakra-ui/react";
-import MainFrame from "../../components/MainFrame"
-import PendingRequests from "../../Pages/ManageContact/PendingRequests"
+import MainFrame from "../../components/MainFrame";
+import PendingRequests from "../../Pages/ManageContact/PendingRequests";
 import { InputGroup } from "../../components/ui/input-group";
 import { LuSearch } from "react-icons/lu";
 import DataTable from "../../components/DataTable";
-
+import { useGetContactQuery } from "../../Redux/Service/manage.contactus.service";
+import { useEffect, useState } from "react";
+import { Spinner } from "../../components/Sipnner/Spinner";
 
 // table data
+const tableHeadRow = ["Sr. No", "Email id", "Name", "Date", "Action"];
 
-const tableHeadRow = [
-  "Sr. No",
-  "Email id",
-  "Name",
-  "Date",
-  "Action",
-];
+const ManageContact = () => {
+  const { data, isLoading, isError } = useGetContactQuery();
+  const [localData, setLocalData] = useState([]);
 
-const managepost: any[] = [
-  ...Array.from({ length: 12 }, (_, i) => ({
-    "Sr. No": i + 1,
-    "Email id": "ABC@gmail.com",
-    "Name": "Pooja",
-    "Date": "11/02/1989",
-    "Action": (
+  useEffect(() => {
+    if (data) {
+      setLocalData((data as any)?.data?.data || []);
+    }
+  }, [data]);
+
+  const formatDateOfBirth = (dob: string): string => {
+    return new Date(dob).toLocaleDateString("en-GB", {
+      day: "2-digit",
+      month: "2-digit",
+      year: "numeric",
+    });
+  };
+
+  const managepost = localData?.map((agency: any, index: number) => ({
+    "Sr. No": index + 1, // Typically Sr. No starts from 1, not using id which might not be sequential
+    "Email id": agency?.email || "-",
+    Name: agency?.first_name || "-",
+    Date: formatDateOfBirth(agency?.created_at) || "-",
+    Action: (     
       <HStack justifyContent="center">
         <PendingRequests />
       </HStack>
     ),
-  })),
-];
+  }));
+
+  if (isLoading) {
+    return (
+      <MainFrame>
+        <Box
+          display="flex"
+          justifyContent="center"
+          alignItems="center"
+          height="100%"
+        >
+          <Spinner />
+        </Box>
+      </MainFrame>
+    );
+  }
+
+  if (isError) {
+    return (
+      <MainFrame>
+        <Box
+          display="flex"
+          justifyContent="center"
+          alignItems="center"
+          height="100%"
+        >
+          <Text>Error loading data</Text>
+        </Box>
+      </MainFrame>
+    );
+  }
 
-const ManageContact = () => {
   return (
-
     <MainFrame>
       <Box>
         <HStack
@@ -43,13 +82,16 @@ const ManageContact = () => {
           px={3}
         >
           <Text as={"span"} fontSize={"sm"} fontWeight={500} color={"#000"}>
-          Contact Requests
+            Contact Requests
           </Text>
 
-          <HStack >
-            <InputGroup 
+          <HStack>
+            <InputGroup
               startElement={
-                <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
+                <LuSearch
+                  fontSize={"xs"}
+                  style={{ position: "relative", left: "10px" }}
+                />
               }
               color={"#000"}
             >
@@ -63,20 +105,20 @@ const ManageContact = () => {
                 size={"xs"}
                 fontSize={"sm"}
                 placeholder="Search..."
-                bgColor={'#EEEEEE'}
+                bgColor={"#EEEEEE"}
                 ps={8}
               />
             </InputGroup>
-            {/* <Button bgColor={'#EEEEEE'} pl={3} pr={3}><IoMdAdd /> <Text>Add</Text></Button> */}
           </HStack>
         </HStack>
         <DataTable
           sortableColumns={["Name", "Registration Date "]}
           tableHeadRow={tableHeadRow}
-          data={managepost}
+          data={managepost || []} // Ensure an empty array is passed if managepost is undefined
         />
-      </Box>       
+      </Box>
     </MainFrame>
-  )
-}
-export default ManageContact
\ No newline at end of file
+  );
+};
+
+export default ManageContact;
diff --git a/src/Pages/ManageGroups/ManageGroups.tsx b/src/Pages/ManageGroups/ManageGroups.tsx
index 86f0570..fc57d8b 100644
--- a/src/Pages/ManageGroups/ManageGroups.tsx
+++ b/src/Pages/ManageGroups/ManageGroups.tsx
@@ -48,6 +48,9 @@ const managepost: any[] = [
     ),
   })),
 ];
+
+
+
 const ManageGroups = () => {
   return (
     <MainFrame>
diff --git a/src/Pages/ManageJobs/ManageJobs.tsx b/src/Pages/ManageJobs/ManageJobs.tsx
index 744fd6e..ce55ef5 100644
--- a/src/Pages/ManageJobs/ManageJobs.tsx
+++ b/src/Pages/ManageJobs/ManageJobs.tsx
@@ -1,7 +1,10 @@
 import {
-  Box, HStack,
-  //  Image, 
-  Input, Text
+  Box,
+  HStack,
+  Image,
+  //  Image,
+  Input,
+  Text,
 } from "@chakra-ui/react";
 import { LuSearch } from "react-icons/lu";
 // import { RiDeleteBin5Line } from "react-icons/ri";
@@ -11,6 +14,15 @@ import MainFrame from "../../components/MainFrame";
 import { InputGroup } from "../../components/ui/input-group";
 import ManageJobsAdd from "./ManageJobsAdd";
 import ViewManageJob from "./ViewManageJob";
+import {
+  useDeleteJobsPostMutation,
+  useGetManageJobsQuery,
+} from "../../Redux/Service/manage.jobs.service";
+import { useEffect, useState } from "react";
+import { Spinner } from "../../components/Sipnner/Spinner";
+import Delete from "../../components/ActionIcons/Delete";
+import { toaster } from "../../components/ui/toaster";
+import AlertDailog from "../../components/AlertDailog";
 // import { useState } from "react";
 // import { useGetManageJobsQuery } from "../../Redux/Service/manage.jobs.service";
 // import Delete from "../../components/ActionIcons/Delete";
@@ -27,36 +39,93 @@ const tableHeadRow = [
   "Action",
 ];
 
-const managepost: any[] = [
-  ...Array.from({ length: 12 }, (_, i) => ({
-    "Sr. No": i + 1,
-    "Job Title": "Freelance content writer",
-    "Workspace mode": "Onsite",
-    Category: "IT",
-    "Sub-category": "Flutter dev",
-    Salary: "3.5 LPA",
+const ManageJobs = () => {
+  const [currentPage] = useState(1);
+  const [localData, setLocalData] = useState([]);
+  const { data, refetch, isLoading } = useGetManageJobsQuery(currentPage);
+  const [deleteJobsPost] = useDeleteJobsPostMutation();
+  const [deleteModal, setDeleteModal] = useState(false);
+  const [selectedJobsId, setSelectedJobsId] = useState<number | null>(null);
+
+  useEffect(() => {
+    if (data) {
+      setLocalData((data as any)?.data?.data || []);
+    }
+  }, [data]);
+  console.log(data?.data.data);
+
+  const handleDeleteJobs = async (jobsId: number) => {
+    try {
+      const response = await deleteJobsPost({ id: jobsId }).unwrap();
+      if (response?.status === "success") {
+        toaster.create({
+          title: "Success",
+          description: "Jobs deleted successfully",
+          type: "Success",
+        });
+        refetch();
+      }
+    } catch (error) {
+      console.error("Error deleting FAQ:", error);
+      toaster.create({
+        title: "Error",
+        description: "Something went wrong",
+        type: "error",
+      });
+    }
+  };
+
+  const managepost = localData?.map((agency: any, index: number) => ({
+    "Sr. No": index + 1,
+    "Job Title": agency?.job_title,
+    "Workspace mode": agency?.workspace?.en_name,
+    Category: agency?.industry?.en_name,
+    "Sub-category": agency?.department?.en_name,
+    Salary: agency?.ctc_amount,
     Action: (
       <HStack justifyContent="center">
         <ViewManageJob />
         <ManageJobsAdd />
-        {/* <AlertDailog
-          AltertTiggerIcon={() => <Delete />}
-          alertText="Delete Users"
+        <AlertDailog
+          isOpen={deleteModal}
+          AltertTiggerIcon={() => (
+            <Delete
+              onClick={() => {
+                setSelectedJobsId(agency.id);
+                setDeleteModal(true);
+              }}
+            />
+          )}
+          alertText="Delete FAQ"
           alertIcon={<Image src={"DeleteIcon"} h={"39px"} />}
           alertCaption="are you sure you want to delete ?"
+          onClose={() => setDeleteModal(false)}
           onConfirm={() => {
-            console.log("User deleted:", i + 1);
+            // console.log("Deleting FAQ with ID:", selectedFaqId); // Correct ID
+            if (selectedJobsId) {
+              setDeleteModal(false);
+              handleDeleteJobs(selectedJobsId);
+            }
           }}
-        /> */}
+        />
       </HStack>
     ),
-  })),
-];
+  }));
 
-const ManageJobs = () => {
-  // const [currentPage, setCurrentPage] = useState(1);
-  // const { data, refetch } = useGetManageJobsQuery(currentPage)
-  // console.log(data?.data.data);
+  if (isLoading) {
+    return (
+      <MainFrame>
+        <Box
+          display="flex"
+          justifyContent="center"
+          alignItems="center"
+          height="100%"
+        >
+          <Spinner />
+        </Box>
+      </MainFrame>
+    );
+  }
 
   return (
     <MainFrame>
diff --git a/src/Pages/ManageJobs/ViewManageJob.tsx b/src/Pages/ManageJobs/ViewManageJob.tsx
index bb3edc4..951f1ed 100644
--- a/src/Pages/ManageJobs/ViewManageJob.tsx
+++ b/src/Pages/ManageJobs/ViewManageJob.tsx
@@ -27,6 +27,7 @@ import {
   SelectTrigger,
 } from "../../components/ui/select";
 import View from "../../components/ActionIcons/View";
+import { useLazyViewJobsQuery } from "../../Redux/Service/manage.jobs.service";
 
 const frameworks = createListCollection({
   items: [
@@ -37,238 +38,258 @@ const frameworks = createListCollection({
   ],
 });
 function ViewManageJob() {
+  const [trigger, { data }] = useLazyViewJobsQuery();
+
+  console.log(data);
+
+  // const handleView = () => {
+  //   trigger(id);
+  // };
+
+  const viewJobs = data;
+
+  console.log();
+
   return (
     <DialogRoot placement="center">
       <DialogTrigger asChild>
-        <Span><View /></Span>
+        <Span>
+          <View />
+        </Span>
       </DialogTrigger>
 
-      <DialogContent
-        bg={"#fff"}
-        // w={{ lg: "60%", md: "230px" }}
-        w={{ base: "90%", md: "400px" }}
-        height={"80vh"}
-        overflow={"scroll"}
-        overflowX="hidden"
-        p={3} // Reduced padding
-        bgSize={"md"}
-      >
-        <DialogHeader bg="white">
-          <DialogTitle alignSelf="center" color="black" fontSize="14px">
-            Add Details
-          </DialogTitle>
-        </DialogHeader>
+      {/* {viewJobs?.map((data: any) => ( */}
+        <DialogContent
+          bg={"#fff"}
+          // w={{ lg: "60%", md: "230px" }}
+          w={{ base: "90%", md: "400px" }}
+          height={"80vh"}
+          overflow={"scroll"}
+          overflowX="hidden"
+          p={3} // Reduced padding
+          bgSize={"md"}
+        >
+          <DialogHeader bg="white">
+            <DialogTitle alignSelf="center" color="black" fontSize="14px">
+              Add Details
+            </DialogTitle>
+          </DialogHeader>
 
-        <DialogBody bg="white">
-          <Stack py={3}>
-            <Field.Root>
-              <Field.Label color="black" pt={1} fontSize="12px">
-                Job title
-              </Field.Label>
-              <Input
-                placeholder="Enter the Job Title"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={1}
-                fontSize="12px"
-                height="30px"
-              />
-            </Field.Root>
-            <Field.Root>
-              <Field.Label color="black" pt={1} fontSize="12px">
-                Workspace mode
-              </Field.Label>
-              <Input
-                placeholder="Enter the Workspace Mode"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={1}
-                fontSize="12px"
-                height="30px"
-              />
-            </Field.Root>
-            <Field.Root>
-              <Field.Label pt={1} color="black" fontSize="12px">
-                Category
-              </Field.Label>
-              <Input
-                placeholder="Enter the Category"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={1}
-                fontSize="12px"
-                height="30px"
-              />
-            </Field.Root>
-            <Field.Root>
-              <Field.Label pt={1} color="black" fontSize="12px">
-                Sub-Category
-              </Field.Label>
-              <Input
-                placeholder="Enter the Sub-Category"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={1}
-                fontSize="12px"
-                height="30px"
-              />
-            </Field.Root>
-            <Field.Root>
-              <Field.Label pt={1} color="black" fontSize="12px">
-                Salary
-              </Field.Label>
-              <Input
-                placeholder="Enter the Salary"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={1}
-                fontSize="12px"
-                height="30px"
-              />
-            </Field.Root>
-            <Field.Root>
-              <Field.Label pt={1} color="black" fontSize="12px">
-                Experience
-              </Field.Label>
-              <Input
-                placeholder="Enter the Experience"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={1}
-                fontSize="12px"
-                height="30px"
-              />
-            </Field.Root>
-            <Field.Root>
-              <Field.Label pt={1} color="black" fontSize="12px">
-                Job Location
-              </Field.Label>
-              <Input
-                placeholder="Enter the Job Location"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={1}
-                fontSize="12px"
-                height="30px"
-              />
-            </Field.Root>
-            {/* <Field.Label pt={1} color="black" fontSize="12px">Country Selection</Field.Label>
-                            <Input placeholder="Enter the Country Selection"   /> */}
-            <SelectRoot collection={frameworks} size="sm" w={"100%"}>
-              <SelectLabel pt={1} color="black" fontSize="12px">
-                Country Selection
-              </SelectLabel>
-              <SelectTrigger
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={1}
-                fontSize="12px"
-                height="30px"
-                borderRadius={"5px"}
-              >
-                <SelectValueText
-                  placeholder="Enter the Country Selection"
-                  pb={"6px"}
-                  fontSize={"12px"}
+          <DialogBody bg="white">
+            <Stack py={3}>
+              <Field.Root>
+                <Field.Label color="black" pt={1} fontSize="12px">
+                  Job title
+                </Field.Label>
+                <Input
+                  placeholder="Enter the Job Title"
+                  bgColor="#EEEEEE"
+                  color="black"
+                  border="none"
+                  pl={1}
+                  fontSize="12px"
+                  height="30px"
                 />
-              </SelectTrigger>
-              <SelectContent position={"relative"} zIndex={"9999"} bg={"#fff"}>
-                {frameworks.items.map((movie) => (
-                  <SelectItem
-                    item={movie}
-                    key={movie.value}
-                    color={"black"}
-                    pl={2}
-                    p={1}
-                    _hover={{ bg: "#F0F0F0" }} // Light grey background on hover
-                    fontSize="12px"
-                  >
-                    {movie.label}
-                  </SelectItem>
-                ))}
-              </SelectContent>
-            </SelectRoot>
+              </Field.Root>
+              <Field.Root>
+                <Field.Label color="black" pt={1} fontSize="12px">
+                  Workspace mode
+                </Field.Label>
+                <Input
+                  placeholder="Enter the Workspace Mode"
+                  bgColor="#EEEEEE"
+                  color="black"
+                  border="none"
+                  pl={1}
+                  fontSize="12px"
+                  height="30px"
+                />
+              </Field.Root>
+              <Field.Root>
+                <Field.Label pt={1} color="black" fontSize="12px">
+                  Category
+                </Field.Label>
+                <Input
+                  placeholder="Enter the Category"
+                  bgColor="#EEEEEE"
+                  color="black"
+                  border="none"
+                  pl={1}
+                  fontSize="12px"
+                  height="30px"
+                />
+              </Field.Root>
+              <Field.Root>
+                <Field.Label pt={1} color="black" fontSize="12px">
+                  Sub-Category
+                </Field.Label>
+                <Input
+                  placeholder="Enter the Sub-Category"
+                  bgColor="#EEEEEE"
+                  color="black"
+                  border="none"
+                  pl={1}
+                  fontSize="12px"
+                  height="30px"
+                />
+              </Field.Root>
+              <Field.Root>
+                <Field.Label pt={1} color="black" fontSize="12px">
+                  Salary
+                </Field.Label>
+                <Input
+                  placeholder="Enter the Salary"
+                  bgColor="#EEEEEE"
+                  color="black"
+                  border="none"
+                  pl={1}
+                  fontSize="12px"
+                  height="30px"
+                />
+              </Field.Root>
+              <Field.Root>
+                <Field.Label pt={1} color="black" fontSize="12px">
+                  Experience
+                </Field.Label>
+                <Input
+                  placeholder="Enter the Experience"
+                  bgColor="#EEEEEE"
+                  color="black"
+                  border="none"
+                  pl={1}
+                  fontSize="12px"
+                  height="30px"
+                />
+              </Field.Root>
+              <Field.Root>
+                <Field.Label pt={1} color="black" fontSize="12px">
+                  Job Location
+                </Field.Label>
+                <Input
+                  placeholder="Enter the Job Location"
+                  bgColor="#EEEEEE"
+                  color="black"
+                  border="none"
+                  pl={1}
+                  fontSize="12px"
+                  height="30px"
+                />
+              </Field.Root>
+              {/* <Field.Label pt={1} color="black" fontSize="12px">Country Selection</Field.Label>
+                            <Input placeholder="Enter the Country Selection"   /> */}
+              <SelectRoot collection={frameworks} size="sm" w={"100%"}>
+                <SelectLabel pt={1} color="black" fontSize="12px">
+                  Country Selection
+                </SelectLabel>
+                <SelectTrigger
+                  bgColor="#EEEEEE"
+                  color="black"
+                  border="none"
+                  pl={1}
+                  fontSize="12px"
+                  height="30px"
+                  borderRadius={"5px"}
+                >
+                  <SelectValueText
+                    placeholder="Enter the Country Selection"
+                    pb={"6px"}
+                    fontSize={"12px"}
+                  />
+                </SelectTrigger>
+                <SelectContent
+                  position={"relative"}
+                  zIndex={"9999"}
+                  bg={"#fff"}
+                >
+                  {frameworks.items.map((movie) => (
+                    <SelectItem
+                      item={movie}
+                      key={movie.value}
+                      color={"black"}
+                      pl={2}
+                      p={1}
+                      _hover={{ bg: "#F0F0F0" }} // Light grey background on hover
+                      fontSize="12px"
+                    >
+                      {movie.label}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </SelectRoot>
 
-            <Field.Root>
-              <Field.Label pt={1} color="black" fontSize="12px">
-                Job type
-              </Field.Label>
-              <Input
-                placeholder="Enter the Job Type"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={1}
-                fontSize="12px"
-                height="30px"
-              />
-            </Field.Root>
-            <Field.Root>
-              <Field.Label pt={1} color="black" fontSize="12px">
-                Skills required
-              </Field.Label>
-              <Input
-                placeholder="Enter the Skills Required"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={1}
-                fontSize="12px"
-                height="30px"
-              />
-            </Field.Root>
-            <Field.Root>
-              <Field.Label pt={1} color="black" fontSize="12px">
-                Job Description*
-              </Field.Label>
-              <Input
-                placeholder="Enter the Job Description"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={1}
-                fontSize="12px"
-                height="30px"
-              />
-            </Field.Root>
-            <Field.Root>
-              <Field.Label pt={1} color="black" fontSize="12px">
-                Upload Image
-              </Field.Label>
-              <Input
-                placeholder="Upload Image"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={1}
-                fontSize="12px"
-                height="30px"
-              />
-            </Field.Root>
-          </Stack>
-        </DialogBody>
-        <DialogFooter display="flex" justifyContent="center" pt={"2"}>
-          <Button
-            w="100%"
-            bg="#02A0A0"
-            color={"#fff"}
-            fontSize="12px"
-            height="30px"
-          >
-            Save
-          </Button>
-        </DialogFooter>
+              <Field.Root>
+                <Field.Label pt={1} color="black" fontSize="12px">
+                  Job type
+                </Field.Label>
+                <Input
+                  placeholder="Enter the Job Type"
+                  bgColor="#EEEEEE"
+                  color="black"
+                  border="none"
+                  pl={1}
+                  fontSize="12px"
+                  height="30px"
+                />
+              </Field.Root>
+              <Field.Root>
+                <Field.Label pt={1} color="black" fontSize="12px">
+                  Skills required
+                </Field.Label>
+                <Input
+                  placeholder="Enter the Skills Required"
+                  bgColor="#EEEEEE"
+                  color="black"
+                  border="none"
+                  pl={1}
+                  fontSize="12px"
+                  height="30px"
+                />
+              </Field.Root>
+              <Field.Root>
+                <Field.Label pt={1} color="black" fontSize="12px">
+                  Job Description*
+                </Field.Label>
+                <Input
+                  placeholder="Enter the Job Description"
+                  bgColor="#EEEEEE"
+                  color="black"
+                  border="none"
+                  pl={1}
+                  fontSize="12px"
+                  height="30px"
+                />
+              </Field.Root>
+              <Field.Root>
+                <Field.Label pt={1} color="black" fontSize="12px">
+                  Upload Image
+                </Field.Label>
+                <Input
+                  placeholder="Upload Image"
+                  bgColor="#EEEEEE"
+                  color="black"
+                  border="none"
+                  pl={1}
+                  fontSize="12px"
+                  height="30px"
+                />
+              </Field.Root>
+            </Stack>
+          </DialogBody>
+          <DialogFooter display="flex" justifyContent="center" pt={"2"}>
+            <Button
+              w="100%"
+              bg="#02A0A0"
+              color={"#fff"}
+              fontSize="12px"
+              height="30px"
+            >
+              Save
+            </Button>
+          </DialogFooter>
 
-        <DialogCloseTrigger color="black" />
-      </DialogContent>
+          <DialogCloseTrigger color="black" />
+        </DialogContent>
+      {/* ))} */}
     </DialogRoot>
   );
 }
diff --git a/src/Pages/ManageUsers/DeactivatedAccounts/DeactivatedAccounts.tsx b/src/Pages/ManageUsers/DeactivatedAccounts/DeactivatedAccounts.tsx
index 93c5727..2548e24 100644
--- a/src/Pages/ManageUsers/DeactivatedAccounts/DeactivatedAccounts.tsx
+++ b/src/Pages/ManageUsers/DeactivatedAccounts/DeactivatedAccounts.tsx
@@ -4,34 +4,80 @@ import DataTable from "../../../components/DataTable";
 import { Switch } from "../../../components/ui/switch";
 import { InputGroup } from "../../../components/ui/input-group";
 import { LuSearch } from "react-icons/lu";
+import { useGetContactQuery } from "../../../Redux/Service/deactivated.account.service";
+import { useEffect, useState } from "react";
+import { Spinner } from "../../../components/Sipnner/Spinner";
 
 const tableHeadRow = [
   "Sr. No",
   "First Name",
   "Last Name",
-  "Company name",
+  "User Type",
   "Activate/Deactivate",
 ];
 
-const manageUser: any[] = [
-  ...Array.from({ length: 12 }, (_, i) => ({
-    "Sr. No": i + 1,
-    "First Name": "Ritesh",
-    "Last Name": "akanksha@gmail.com",
-    "Company name": "9876543210",
+const DeactivatedAccounts = () => {
+  const { data ,isLoading} = useGetContactQuery();
+  const [localData, setLocalData] = useState([]);
+
+  useEffect(() => {
+    if (data) {
+      setLocalData((data as any)?.data?.data || []);
+    }
+  }, [data]);
+
+
+  const manageUser = localData?.map((agency: any, index: number) => ({
+    "Sr. No": index + 1,
+    "First Name": agency?.first_name,
+    "Last Name": agency?.last_name,
+    "User Type": agency?.principal_type_xid === 3 ? "JobSeeker" : "Recruiter",
     "Activate/Deactivate": (
-      <Box display={'flex'} justifyContent={'center'}>
-        <Switch size={'sm'} colorPalette={'teal'} />
+      <Box display={"flex"} justifyContent={"center"}>
+        <Switch
+          size={"sm"}
+          colorPalette={"teal"}
+          checked={agency.is_active === true}
+          // onChange={() => handleToggle(agency.id, agency.is_active ? "1" : "0")}
+        />
       </Box>
     ),
-  })),
-];
+  }));
+
+   if (isLoading) {
+    return (
+      <MainFrame>
+        <Box
+          display="flex"
+          justifyContent="center"
+          alignItems="center"
+          height="100%"
+        >
+          <Spinner />
+        </Box>
+      </MainFrame>
+    );
+  }
+
+  // if (isError) {
+  //   return (
+  //     <MainFrame>
+  //       <Box
+  //         display="flex"
+  //         justifyContent="center"
+  //         alignItems="center"
+  //         height="100%"
+  //       >
+  //         <Text>Error loading data</Text>
+  //       </Box>
+  //     </MainFrame>
+  //   );
+  // }
 
-const DeactivatedAccounts = () => {
   return (
     <MainFrame>
       <Box>
-      <HStack
+        <HStack
           w={"100%"}
           justifyContent={"space-between"}
           mb={4}
@@ -39,13 +85,16 @@ const DeactivatedAccounts = () => {
           px={3}
         >
           <Text as={"span"} fontSize={"sm"} fontWeight={500} color={"#000"}>
-             Deactivated User Accounts
+            Deactivated User Accounts
           </Text>
 
           <HStack>
             <InputGroup
               startElement={
-                <LuSearch fontSize={"xs"}  style={{position:'relative',left:'10px'}} />
+                <LuSearch
+                  fontSize={"xs"}
+                  style={{ position: "relative", left: "10px" }}
+                />
               }
               color={"#000"}
             >
@@ -59,7 +108,7 @@ const DeactivatedAccounts = () => {
                 size={"2xs"}
                 fontSize={"sm"}
                 placeholder="Search..."
-                bgColor={'#EEEEEE'}
+                bgColor={"#EEEEEE"}
                 ps={8}
               />
             </InputGroup>
diff --git a/src/Pages/ManageUsers/RegisterUsers/RegisterUsers.tsx b/src/Pages/ManageUsers/RegisterUsers/RegisterUsers.tsx
index 484953f..f21de9e 100644
--- a/src/Pages/ManageUsers/RegisterUsers/RegisterUsers.tsx
+++ b/src/Pages/ManageUsers/RegisterUsers/RegisterUsers.tsx
@@ -116,7 +116,7 @@ const RegisterUsers = () => {
     "DOB": agency.date_of_birth ? new Date(agency.date_of_birth).toLocaleDateString('en-GB').replace(/\//g, '-') : 'N/A',
     "Type Of User": agency.principal_type?.principal_type_title || 'N/A',
     // "Language": agency.principle_language_links.map(lang => lang.language_name).join(', ') || 'N/A',
-    "Action": (
+    "Action": (   
       <HStack justifyContent="center">
         <EditRegisterUsers
         // rowData={{ id: agency.id, en_name: agency.en_name, country_code: agency.country_code, phonecode: agency.phonecode, capital: agency.capital, currency: agency.currency, currency_name: agency.currency_name, currency_symbol: agency.currency_symbol }} 
diff --git a/src/Pages/MasterModule/AgencyMaster/AgencyMaster.tsx b/src/Pages/MasterModule/AgencyMaster/AgencyMaster.tsx
index b2e8025..c0a82ce 100644
--- a/src/Pages/MasterModule/AgencyMaster/AgencyMaster.tsx
+++ b/src/Pages/MasterModule/AgencyMaster/AgencyMaster.tsx
@@ -175,7 +175,7 @@ const AgencyMaster = () => {
           }}
           onPageChange={handlePageChange}
         />
-      </Box>
+      </Box> 
     </MainFrame>
   )
 }
diff --git a/src/Pages/MasterModule/AgencyMaster/ViewAgencyAddModel.tsx b/src/Pages/MasterModule/AgencyMaster/ViewAgencyAddModel.tsx
index ccb782f..5658426 100644
--- a/src/Pages/MasterModule/AgencyMaster/ViewAgencyAddModel.tsx
+++ b/src/Pages/MasterModule/AgencyMaster/ViewAgencyAddModel.tsx
@@ -28,7 +28,7 @@ function ViewAgencyAddModel({ refetch }: { refetch: VoidFunction }) {
             ...prev,
             [name]: value,
         }));
-    }
+    }             
 
     const handleSubmit = async () => {
         console.log("New Data:", formData);
diff --git a/src/Pages/SetNewPassword.tsx b/src/Pages/SetNewPassword.tsx
index 46f66e8..cb2d940 100644
--- a/src/Pages/SetNewPassword.tsx
+++ b/src/Pages/SetNewPassword.tsx
@@ -1,13 +1,13 @@
 import {
-    Box,
-    Center,
-    HStack,
-    IconButton,
-    Image,
-    Input,
-    Stack,
-    Text,
-    VStack,
+  Box,
+  Center,
+  HStack,
+  IconButton,
+  Image,
+  Input,
+  Stack,
+  Text,
+  VStack,
 } from "@chakra-ui/react";
 import axios from "axios";
 import { useState } from "react";
@@ -19,154 +19,179 @@ import { InputGroup } from "../components/ui/input-group";
 import { LuEye, LuEyeOff } from "react-icons/lu";
 
 const SetNewPassword = () => {
-    const [password, setPassword] = useState("");
-    const [confirmPassword, setConfirmPassword] = useState("");
-    const [isLoading, setIsLoading] = useState(false);
-    const navigate = useNavigate();
-    const queryParams = new URLSearchParams(window.location.search);
-    const id = queryParams.get("id");
-    const [showOldPassword, setShowOldPassword] = useState(false);
-    const [showNewPassword, setShowNewPassword] = useState(false);
+  const [password, setPassword] = useState("");
+  const [confirmPassword, setConfirmPassword] = useState("");
+  const [isLoading, setIsLoading] = useState(false);
+  const navigate = useNavigate();
+  const queryParams = new URLSearchParams(window.location.search);
+  const id = queryParams.get("id");
+  const [showOldPassword, setShowOldPassword] = useState(false);
+  const [showNewPassword, setShowNewPassword] = useState(false);
 
-    const handlePasswordSubmit = async () => {
-        // Validation
-        if (password.length < 8) {
-            toaster.create({
-                title: "Password must be at least 8 characters long",
-                type: "error",
-            });
-            return;
+  const handlePasswordSubmit = async () => {
+    // Validation
+    if (password.length < 8) {
+      toaster.create({
+        title: "Password must be at least 8 characters long",
+        type: "error",
+      });
+      return;
+    }
+
+    if (password !== confirmPassword) {
+      toaster.create({
+        title: "Passwords do not match",
+        type: "error",
+      });
+      return;
+    }
+
+    setIsLoading(true);
+
+    try {
+      const res = await axios.post(
+        `${import.meta.env.VITE_API_URL}/update-password`,
+        {
+          password: password,
+          confirm_password: confirmPassword,
+          id: Number(id),
         }
+      );
 
-        if (password !== confirmPassword) {
-            toaster.create({
-                title: "Passwords do not match",
-                type: "error",
-            });
-            return;
-        }
+      if (res.data.status === "success") {
+        toaster.create({
+          title: "Password updated successfully",
+          type: "success",
+        });
+        navigate("/login"); // Redirect to login page
+      } else {
+        toaster.create({
+          title: res.data.message || "Failed to update password",
+          type: "error",
+        });
+      }
+    } catch (error: any) {
+      toaster.create({
+        title: error.response?.data?.message || "Something went wrong",
+        type: "error",
+      });
+    } finally {
+      setIsLoading(false);
+    }
+  };
 
-        setIsLoading(true);
+  return (
+    <VStack w="100%" h="100vh" bg="#ffffff">
+      <HStack
+        boxShadow="rgba(99, 99, 99, 0.2) 0px 2px 8px 0px"
+        w="100%"
+        ps={8}
+        h="7%"
+        justifyContent="flex-start"
+      >
+        <Image w={50} src={logo} />
+      </HStack>
 
-        try {
-            const res = await axios.post(`${import.meta.env.VITE_API_URL}/update-password`, {
-                password: password,
-                confirm_password: confirmPassword,
-                id: Number(id)
-            });
+      <Center w="100%" h="93%" p={8}>
+        <Box p={8} borderWidth={1} borderRadius="lg" boxShadow="lg" w={"400px"}>
+          <Text
+            fontSize="20px"
+            fontWeight="bold"  
+            color="#313039"
+            marginBottom={"20px"}
+          >
+            Create a Password
+          </Text>
 
-            if (res.data.status === 'success') {
-                toaster.create({
-                    title: "Password updated successfully",
-                    type: "success",
-                });
-                navigate("/login"); // Redirect to login page
-            } else {
-                toaster.create({
-                    title: res.data.message || "Failed to update password",
-                    type: "error",
-                });
-            }
-        } catch (error: any) {
-            toaster.create({
-                title: error.response?.data?.message || "Something went wrong",
-                type: "error",
-            });
-        } finally {
-            setIsLoading(false);
-        }
-    };
+          <Stack>
+            <Box mb={3}>
+              <Text color="black" fontSize="12px" mb={2}>
+                New password
+              </Text>
+              <InputGroup
+                width={"100%"}
+                endElement={
+                  <IconButton
+                    aria-label={
+                      showOldPassword ? "Hide password" : "Show password"
+                    }
+                    size="sm"
+                    onClick={() => setShowOldPassword(!showOldPassword)}
+                    //   _hover={{ bg: "transparent" }}
+                    bg={"transparent"}
+                    color={"#000"}
+                    height={"fit-content"}
+                    mr={2}
+                  >
+                    {showOldPassword ? <LuEye /> : <LuEyeOff />}
+                  </IconButton>
+                }
+              >
+                <Input
+                  color="black"
+                  pl={1}
+                  fontSize="12px"
+                  type={showOldPassword ? "password" : "text"}
+                  border="1px solid grey"
+                  value={password}
+                  onChange={(e) => setPassword(e.target.value)}
+                  size={"sm"}
+                />
+              </InputGroup>
+            </Box>
 
-    return (
-        <VStack w="100%" h="100vh" bg="#ffffff">
-            <HStack
-                boxShadow="rgba(99, 99, 99, 0.2) 0px 2px 8px 0px"
-                w="100%"
-                ps={8}
-                h="7%"
-                justifyContent="flex-start"
-            >
-                <Image w={50} src={logo} />
-            </HStack>
+            <Box>
+              <Text color="black" mb={2} fontSize="12px">
+                Confirm password
+              </Text>
+              <InputGroup
+                width={"100%"}
+                endElement={
+                  <IconButton
+                    aria-label={
+                      showNewPassword ? "Hide password" : "Show password"
+                    }
+                    size="sm"
+                    // variant="outline"
+                    onClick={() => setShowNewPassword(!showNewPassword)}
+                    bg={"transparent"}
+                    color={"#000"}
+                    mr={2}
+                  >
+                    {showNewPassword ? <LuEye /> : <LuEyeOff />}
+                  </IconButton>
+                }
+              >
+                <Input
+                  color="black"
+                  pl={1}
+                  fontSize="12px"
+                  type={showNewPassword ? "password" : "text"}
+                  border="1px solid grey"
+                  value={confirmPassword}
+                  onChange={(e) => setConfirmPassword(e.target.value)}
+                  size={"sm"}
+                />
+              </InputGroup>
+            </Box>
+          </Stack>
 
-            <Center w="100%" h="93%" p={8}>
-                <Box p={8} borderWidth={1} borderRadius="lg" boxShadow="lg">
-                    <Text fontSize="24px" fontWeight="bold" color="#313039" textAlign="center">
-                        Create a Password
-                    </Text>
+          <Button
+            loading={isLoading}
+            mt={6}
+            w="100%"
+            bg="#02A0A0"
+            color="white"
+            onClick={handlePasswordSubmit}
+          >
+            Confirm Password
+          </Button>
+        </Box>
+      </Center>
 
-                    <Stack p={2}>
-                        <Text color="black" pt={1} fontSize="12px">New password</Text>
-                        <InputGroup
-                            width={'100%'}
-                            endElement={
-                                <IconButton
-                                    aria-label={showOldPassword ? "Hide password" : "Show password"}
-                                    size="sm"
-                                    // variant="outline"
-                                    onClick={() => setShowOldPassword(!showOldPassword)}
-                                    _hover={{ bg: "transparent" }}
-                                    height={'fit-content'}
-                                    mr={2}
-                                >
-                                    {showOldPassword ? <LuEye /> : <LuEyeOff />}
-                                </IconButton>
-                            }>
-                            <Input
-                                color="black"
-                                pl={1}
-                                fontSize="12px"
-                                type={showOldPassword ? "password" : "text"}
-                                border="1px solid grey"
-                                value={password}
-                                onChange={(e) => setPassword(e.target.value)}
-                            />
-                        </InputGroup>
-
-                        <Text color="black" pt={1} fontSize="12px">Confirm password</Text>
-                        <InputGroup
-                            width={'100%'}
-                            endElement={
-                                <IconButton
-                                    aria-label={showNewPassword ? "Hide password" : "Show password"}
-                                    size="sm"
-                                    // variant="outline"
-                                    onClick={() => setShowNewPassword(!showNewPassword)}
-                                    _hover={{ bg: "transparent" }}
-                                    height={'fit-content'}
-                                    mr={2}
-                                >
-                                    {showNewPassword ? <LuEye /> : <LuEyeOff />}
-                                </IconButton>
-                            }>
-                            <Input
-                                color="black"
-                                pl={1}
-                                fontSize="12px"
-                                type={showNewPassword ? "password" : "text"}
-                                border="1px solid grey"
-                                value={confirmPassword}
-                                onChange={(e) => setConfirmPassword(e.target.value)}
-                            />
-                        </InputGroup>
-                    </Stack>
-
-                    <Button
-                        loading={isLoading}
-                        mt={6}
-                        w="100%"
-                        bg="#02A0A0"
-                        color="white"
-                        onClick={handlePasswordSubmit}
-                    >
-                        Confirm Password
-                    </Button>
-                </Box>
-            </Center>
-
-            <Toaster />
-        </VStack>
-    );
+      <Toaster />
+    </VStack>
+  );
 };
 
 export default SetNewPassword;
diff --git a/src/Pages/SubAdmin/AddModel.tsx b/src/Pages/SubAdmin/AddModel.tsx
index ce5b260..d644cac 100644
--- a/src/Pages/SubAdmin/AddModel.tsx
+++ b/src/Pages/SubAdmin/AddModel.tsx
@@ -1,4 +1,3 @@
-import { useState } from "react";
 import { Button } from "../../components/ui/button";
 import {
   DialogBody,
@@ -10,45 +9,32 @@ import {
   DialogTitle,
   DialogTrigger,
 } from "../../components/ui/dialog";
-import {
-  Field,
-  Grid,
-  Heading,
-  Input,
-  Stack,
-  Text,
-} from "@chakra-ui/react";
+import { Field, Grid, Heading, Input, Stack, Text } from "@chakra-ui/react";
 import { IoMdAdd } from "react-icons/io";
 import { Checkbox } from "../../components/ui/checkbox";
 import { useCreateSubAdminPostMutation } from "../../Redux/Service/manage.subadmin.service";
 import { toaster } from "../../components/ui/toaster";
+import { useState } from "react";
 
 function AddModel({ refetch }: { refetch: VoidFunction }) {
-  const [createSubAdminPost, { isLoading }] = useCreateSubAdminPostMutation();
+  const [createSubAdminPost] = useCreateSubAdminPostMutation();
 
-  const [formData, setFormData] = useState({
-    firstName: "",
-    lastName: "",
-    dob: "",
-    gender: "",
-    email: "",
-    phone: ""
-  });
-
-  const [isOpen, setIsOpen] = useState(false);
-
-  const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const { name, value } = e.target;
-    setFormData(prev => ({
-      ...prev,
-      [name]: value
-    }));
-  };
+  // State fields
+  const [firstName, setFirstName] = useState("");
+  const [lastName, setLastName] = useState("");
+  const [userName, setUserName] = useState("");
+  const [dateOfBirth, setDateOfBirth] = useState("");
+  const [gender, setGender] = useState("");
+  const [ setIsOpen] = useState(false);
 
   const handleSubmit = async () => {
-    const { firstName, lastName, dob, gender, email, phone } = formData;
-    
-    if (!firstName || !lastName || !dob || !gender || !email || !phone) {
+    if (
+      !firstName.trim() ||
+      !lastName.trim() ||
+      !userName.trim() ||
+      !dateOfBirth.trim() ||
+      !gender.trim()
+    ) {
       toaster.create({
         title: "Error",
         description: "Please fill in all required fields",
@@ -58,45 +44,46 @@ function AddModel({ refetch }: { refetch: VoidFunction }) {
     }
 
     const payload = {
-    //   principal_type_xid: 4,
-    //   principal_source_xid: 1,
-    //   user_name: `${firstName} ${lastName}`,
+      principal_type_xid: 4,
+      principal_source_xid: 1,
+      user_name: userName,
       first_name: firstName,
       last_name: lastName,
-      date_of_birth: dob,
-      gender,
-      email_address: email,   
-      phone_number: phone,
+      date_of_birth: dateOfBirth,
+      gender: gender,
+      email_address: "example@yopmail.com", // Hardcoded
+      phone_number: "9876543210", // Hardcoded
       created_by: 1,
     };
 
     try {
       const response = await createSubAdminPost(payload).unwrap();
-      
-      if (response.status === "success") {
+      if (response) {
         toaster.create({
           title: "Success",
-          description: response.message || "Sub-admin added successfully",
+          description: "Sub-admin created successfully",
           type: "success",
         });
         refetch();
         setIsOpen(false);
+        setFirstName("");
+        setLastName("");
+        setUserName("");
+        setDateOfBirth("");
+        setGender("");
       }
-    } catch (error: any) {
+    } catch (error) {
+      console.error("Error creating sub-admin:", error);
       toaster.create({
         title: "Error",
-        description: error?.data?.message || "Failed to create sub-admin",
+        description: "Failed to create sub-admin",
         type: "error",
       });
     }
   };
 
   return (
-    <DialogRoot
-      open={isOpen}
-      onOpenChange={(details) => setIsOpen(details.open)}
-      placement="center"
-    >
+    <DialogRoot placement="center">
       <DialogTrigger asChild>
         <Button rounded={"md"} px={4} py={2} size={"xs"} bg={"#02A0A0"}>
           <IoMdAdd /> Add
@@ -110,6 +97,7 @@ function AddModel({ refetch }: { refetch: VoidFunction }) {
         overflow={"scroll"}
         overflowX="hidden"
         p={3}
+        bgSize={"md"}
       >
         <DialogHeader bg="white">
           <DialogTitle alignSelf="center" color="black" fontSize="14px">
@@ -124,99 +112,76 @@ function AddModel({ refetch }: { refetch: VoidFunction }) {
                 First Name
               </Field.Label>
               <Input
-                name="firstName"
                 placeholder="Enter the First Name"
-                value={formData.firstName}
-                onChange={handleChange}
                 bgColor="#EEEEEE"
                 color="black"
                 border="none"
                 pl={1}
                 fontSize="12px"
                 height="30px"
+                value={firstName}
+                onChange={(e) => setFirstName(e.target.value)}
               />
 
               <Field.Label color="black" pt={1} fontSize="12px">
                 Last Name
               </Field.Label>
               <Input
-                name="lastName"
                 placeholder="Enter the Last Name"
-                value={formData.lastName}
-                onChange={handleChange}
                 bgColor="#EEEEEE"
                 color="black"
                 border="none"
                 pl={1}
                 fontSize="12px"
                 height="30px"
+                value={lastName}
+                onChange={(e) => setLastName(e.target.value)}
+              />
+
+              <Field.Label color="black" pt={1} fontSize="12px">
+                Username
+              </Field.Label>
+              <Input
+                placeholder="Enter the Username"
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
+                value={userName}
+                onChange={(e) => setUserName(e.target.value)}
               />
 
               <Field.Label color="black" pt={1} fontSize="12px">
                 DOB
               </Field.Label>
               <Input
-                name="dob"
-                placeholder="YYYY-MM-DD"
-                value={formData.dob}
-                onChange={handleChange}
-                type="date"
+                placeholder="Enter the DOB"
                 bgColor="#EEEEEE"
                 color="black"
                 border="none"
                 pl={1}
                 fontSize="12px"
                 height="30px"
+                type="date"
+                value={dateOfBirth}
+                onChange={(e) => setDateOfBirth(e.target.value)}
               />
 
               <Field.Label color="black" pt={1} fontSize="12px">
                 Gender
               </Field.Label>
               <Input
-                name="gender"
                 placeholder="Enter the Gender"
-                value={formData.gender}
-                onChange={handleChange}
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={1}
-                fontSize="12px"
-                height="30px"
-              />
-
-              <Field.Label color="black" pt={1} fontSize="12px">
-                Email
-              </Field.Label>
-              <Input
-                name="email"
-                placeholder="Enter the Email"
-                value={formData.email}
-                onChange={handleChange}
-                type="email"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={1}
-                fontSize="12px"
-                height="30px"
-              />
-
-              <Field.Label color="black" pt={1} fontSize="12px">
-                Phone Number
-              </Field.Label>
-              <Input
-                name="phone"
-                placeholder="Enter the Phone Number"
-                value={formData.phone}
-                onChange={handleChange}
-                type="tel"
                 bgColor="#EEEEEE"
                 color="black"
                 border="none"
                 pl={1}
                 fontSize="12px"
                 height="30px"
+                value={gender}
+                onChange={(e) => setGender(e.target.value)}
               />
 
               <Heading mt={5} color={"#000"} fontSize={"sm"}>
@@ -225,42 +190,24 @@ function AddModel({ refetch }: { refetch: VoidFunction }) {
             </Field.Root>
 
             <Grid templateColumns="repeat(2, 1fr)" gap={4}>
-              <Checkbox size={"sm"} color={"black"}>
-                <Text fontSize={12}>Dashboard</Text>
-              </Checkbox>
-              <Checkbox size={"sm"} color={"black"}>
-                <Text fontSize={12}>Manage contact us</Text>
-              </Checkbox>
-              <Checkbox size={"sm"} color={"black"}>
-                <Text fontSize={12}>Manage User</Text>
-              </Checkbox>
-              <Checkbox size={"sm"} color={"black"}>
-                <Text fontSize={12}>Manage CMS</Text>
-              </Checkbox>
-              <Checkbox size={"sm"} color={"black"}>
-                <Text fontSize={12}>Manage Post</Text>
-              </Checkbox>
-              <Checkbox size={"sm"} color={"black"}>
-                <Text fontSize={12}>Manage Reports</Text>
-              </Checkbox>
-              <Checkbox size={"sm"} color={"black"}>
-                <Text fontSize={12}>Manage Sub-Admin</Text>
-              </Checkbox>
-              <Checkbox size={"sm"} color={"black"}>
-                <Text fontSize={12}>My Profile</Text>
-              </Checkbox>
-              <Checkbox size={"sm"} color={"black"}>
-                <Text fontSize={12}>Manage Jobs</Text>
-              </Checkbox>
-              <Checkbox size={"sm"} color={"black"}>
-                <Text fontSize={12}>Manage Feedbacks</Text>
-              </Checkbox>
-              <Checkbox size={"sm"} color={"black"}>
-                <Text fontSize={12}>Manage Community</Text>
-              </Checkbox>
-              <Checkbox size={"sm"} color={"black"}>
-                <Text fontSize={12}>Notification</Text>
-              </Checkbox>
+              {[
+                "Dashboard",
+                "Manage contact us",
+                "manage User",
+                "Manage CMS",
+                "Manage Post",
+                "Manage Reports",
+                "manage Sub-Admin",
+                "My profile",
+                "Manage Jobs",
+                "manage feedbacks",
+                "Manage community",
+                "Notification",
+              ].map((permission) => (
+                <Checkbox size="sm" color="black" key={permission}>
+                  <Text fontSize={12}>{permission}</Text>
+                </Checkbox>
+              ))}
             </Grid>
           </Stack>
         </DialogBody>
@@ -272,8 +219,6 @@ function AddModel({ refetch }: { refetch: VoidFunction }) {
             bg="#02A0A0"
             color={"#fff"}
             onClick={handleSubmit}
-            // isLoading={isLoading}
-            disabled={isLoading}
           >
             Save
           </Button>
diff --git a/src/Pages/SubAdmin/ViewSubAdmin.tsx b/src/Pages/SubAdmin/ViewSubAdmin.tsx
index 55840a7..63ab141 100644
--- a/src/Pages/SubAdmin/ViewSubAdmin.tsx
+++ b/src/Pages/SubAdmin/ViewSubAdmin.tsx
@@ -30,7 +30,7 @@ function ViewSubAdmin({ id }: { id: number }) {
   const handleView = () => {
     trigger(id)
   }
-
+ 
   const viewSubAdmin = data?.data
 
   const formatDateOfBirth = (dob: string): string => {
diff --git a/src/Redux/Service/agency.master.module.service.ts b/src/Redux/Service/agency.master.module.service.ts
index f96d017..65fa22f 100644
--- a/src/Redux/Service/agency.master.module.service.ts
+++ b/src/Redux/Service/agency.master.module.service.ts
@@ -99,3 +99,4 @@ export const {
   useAgencyMasterToggleMutation,
   useUpdateAgencyMasterMutation,
 } = agencyMasterModule;
+                                                                                                                                                                     
\ No newline at end of file
diff --git a/src/Redux/Service/deactivated.account.service.ts b/src/Redux/Service/deactivated.account.service.ts
index da76c97..b355471 100644
--- a/src/Redux/Service/deactivated.account.service.ts
+++ b/src/Redux/Service/deactivated.account.service.ts
@@ -1,26 +1,30 @@
-import { createApi } from "@reduxjs/toolkit/query";
+import { createApi } from "@reduxjs/toolkit/query/react"; // add /react for auto-generated hooks
 import { baseQueryWithReauth } from "./apiSlice";
 
+interface DeactivatedData {
+  id: number;
+  email: string;
+  first_name: string;
+  created_at: string;
+}
+
+interface ApiResponse {
+  data: {
+    data: DeactivatedData[];
+  };
+}
+
 export const deactivatedAccounts = createApi({
-    reducerPath: "deactivatedAccounts",
-    baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
-    endpoints: (builder) => ({
-  
-  
-  
-      getPosts: builder.query<Post[], void>({ query: () => "/posts" }),
-  
-  
-  
-  
-  
+  reducerPath: "deactivatedAccounts",
+  baseQuery: baseQueryWithReauth,
+  tagTypes: ["Deactivated"],
+  endpoints: (builder) => ({
+    getContact: builder.query<ApiResponse, void>({
+      query: () => "/manage-user-deactivate-list",
+      providesTags: ["Deactivated"],
     }),
-  });
-  
-  export const {  } = deactivatedAccounts;
-  
-  export type Post = {
-    id: number;
-    title: string;
-    body: string;
-  };
\ No newline at end of file
+  }),
+});
+
+// ✅ Export the auto-generated hook
+export const { useGetContactQuery } = deactivatedAccounts;
diff --git a/src/Redux/Service/faqs.service.ts b/src/Redux/Service/faqs.service.ts
index 2d72f23..239089f 100644
--- a/src/Redux/Service/faqs.service.ts
+++ b/src/Redux/Service/faqs.service.ts
@@ -69,7 +69,7 @@ export const faqs = createApi({
         body: { id, is_active },
       }),
     }),
-    
+     
 
     deleteFaqPost: builder.mutation<{ status: string; message: string }, { id: number }>({
       query: ({ id }) => ({
diff --git a/src/Redux/Service/manage.contactus.service.ts b/src/Redux/Service/manage.contactus.service.ts
index 20b3890..546d4a8 100644
--- a/src/Redux/Service/manage.contactus.service.ts
+++ b/src/Redux/Service/manage.contactus.service.ts
@@ -1,26 +1,33 @@
-import { createApi } from "@reduxjs/toolkit/query";
+import { createApi } from "@reduxjs/toolkit/query/react";
 import { baseQueryWithReauth } from "./apiSlice";
 
+interface ContactData {
+  id: number;
+  email: string;
+  first_name: string;
+  created_at: string;
+}
+
+interface ApiResponse {
+  data: {
+    data: ContactData[];
+  };
+}
+
 export const manageContactUs = createApi({
-    reducerPath: "manageContactUs",
-    baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
-    endpoints: (builder) => ({
-  
-  
-  
-      getPosts: builder.query<Post[], void>({ query: () => "/posts" }),
-  
-  
-  
-  
-  
+  reducerPath: "manageContactUs",
+  baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
+  tagTypes: ["Contact"],
+  endpoints: (builder) => ({
+
+    
+    getContact: builder.query<ApiResponse, void>({
+      query: () => "/contact-us",
+      providesTags: ["Contact"],
     }),
-  });
-  
-  export const {  } = manageContactUs;
-  
-  export type Post = {
-    id: number;
-    title: string;
-    body: string;
-  };
\ No newline at end of file
+
+
+  }),
+});
+
+export const { useGetContactQuery } = manageContactUs;
diff --git a/src/Redux/Service/manage.jobs.service.ts b/src/Redux/Service/manage.jobs.service.ts
index 0ce6b24..728b3a1 100644
--- a/src/Redux/Service/manage.jobs.service.ts
+++ b/src/Redux/Service/manage.jobs.service.ts
@@ -62,7 +62,7 @@ export interface CountryEdit {
 }
 
 
-export type PostJobStatus = {
+export type PostJobStatus = { 
   title: string
 };
 
@@ -70,15 +70,27 @@ export const manageJobs = createApi({
   reducerPath: "manageJobs",
   baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
   endpoints: (builder) => ({
+
     getManageJobs: builder.query<ApiResponse, number>({
       query: (page = 1) => `/manage-jobs-list?page=${page}`,
     }),
 
+    viewJobs: builder.query<ApiResponse, number>({
+      query: (id) => `/manage-jobs-list/${id}`,
+    }),
 
+    deleteJobsPost: builder.mutation<{ status: string; message: string }, { id: number }>({
+      query: ({ id }) => ({
+        url: `/manage-jobs-delete`,
+        method: "POST",
+        body: { id },
+      }),
+    }),
 
+   
 
 
   }),
 });
 
-export const { useGetManageJobsQuery } = manageJobs;
+export const { useGetManageJobsQuery,useLazyViewJobsQuery,useDeleteJobsPostMutation } = manageJobs;
diff --git a/src/Redux/Service/manage.subadmin.service.ts b/src/Redux/Service/manage.subadmin.service.ts
index a975d62..082a66b 100644
--- a/src/Redux/Service/manage.subadmin.service.ts
+++ b/src/Redux/Service/manage.subadmin.service.ts
@@ -104,6 +104,7 @@ export const manageSubAdmin = createApi({
   baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
   tagTypes: ["SubAdmin"],
   endpoints: (builder) => ({
+
     createFaqPost: builder.mutation<Post, Partial<Post>>({
       query: (data) => ({
         url: "/faq-store",
@@ -111,6 +112,7 @@ export const manageSubAdmin = createApi({
         body: data,
       }),
     }),
+    
     getSubAdmin: builder.query<ApiResponse, void>({
       query: () => `/sub-admin`,
     }),
@@ -127,14 +129,17 @@ export const manageSubAdmin = createApi({
       }),
     }),
 
-   createSubAdminPost: builder.mutation<CreateSubAdminResponse, CreateSubAdminPayload>({
-    query: (data) => ({
-      url: "/sub-admin-create",
-      method: "POST",
-      body: data,
+    createSubAdminPost: builder.mutation<
+      CreateSubAdminResponse,
+      CreateSubAdminPayload
+    >({
+      query: (data) => ({
+        url: "/sub-admin-create",
+        method: "POST",
+        body: data,
+      }),
+      invalidatesTags: ["SubAdmin"], // Add this to invalidate cache
     }),
-    invalidatesTags: ["SubAdmin"], // Add this to invalidate cache
-  }),
 
     faqToggle: builder.mutation({
       query: ({ id, is_active }) => ({
@@ -158,7 +163,7 @@ export const {
   useLazyViewSubAdminQuery,
   useUpdateSubAdminMutation,
   useDeleteSubAdminPostMutation,
-  useCreateSubAdminPostMutation
+  useCreateSubAdminPostMutation,
 } = manageSubAdmin;
 
 export type Post = {
diff --git a/src/components/AlertDailog.tsx b/src/components/AlertDailog.tsx
index 916cf99..3b536dd 100644
--- a/src/components/AlertDailog.tsx
+++ b/src/components/AlertDailog.tsx
@@ -40,8 +40,9 @@ const AlertDailog: React.FC<DeleteConfirmationDialogProps> = ({
       size={"xs"}
       role="alertdialog"
       open={isOpen}
+      
     >
-      <DialogTrigger asChild>
+      <DialogTrigger asChild >
         {button ? (
           button
         ) : (
@@ -134,3 +135,16 @@ const AlertDailog: React.FC<DeleteConfirmationDialogProps> = ({
 };
 
 export default AlertDailog;
+
+
+// import React from 'react'
+
+// const AlertDailog = () => {
+//   return (
+//     <div>
+      
+//     </div>
+//   )
+// }
+
+// export default AlertDailog