From 315eaccf508e6cabc1e63017e197afc74b6c9ef8 Mon Sep 17 00:00:00 2001
From: AnsariTufail <168163201+AnsariTufail@users.noreply.github.com>
Date: Fri, 7 Feb 2025 16:38:38 +0530
Subject: [PATCH 1/6] Working on the Master Module

---
 dev-dist/sw.js                                |   2 +-
 package-lock.json                             |   2 +-
 src/Pages/ManageCMS/AboutUs/AboutUs.tsx       |   2 +-
 .../ManageCMS/AboutUs}/AboutUsAddModel.tsx    |  28 ++---
 .../ManageCMS/FAQ}/EditDetails.tsx            |  30 ++---
 src/Pages/ManageCMS/FAQ/FAQ.tsx               |   8 +-
 .../ManageCMS/FAQ}/FaqAddModel.tsx            |  34 +++---
 .../ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx |   2 +-
 .../PrivacyPolicy}/PrivacyPolicyAddModel.tsx  |  28 ++---
 .../TermsAndConditions/TermsAndConditions.tsx |   2 +-
 .../TermsAndConditionsAddModel.tsx            |  28 ++---
 src/Pages/ManageContact/ManageContact.tsx     |   2 +-
 .../ManageContact}/PendingRequests.tsx        |  44 ++++----
 src/Pages/ManageGroups/AddGroup.tsx           |  23 ++--
 src/Pages/ManageGroups/EditDetailGroup.tsx    |  12 +-
 src/Pages/ManageGroups/ManageGroups.tsx       |   4 +-
 src/Pages/ManageGroups/ViewManageGroup.tsx    |  17 +--
 src/Pages/ManageJobs/ManageJobsAdd.tsx        |  12 +-
 src/Pages/ManageJobs/ViewManageJob.tsx        |  12 +-
 src/Pages/ManagePost/ViewDailog.tsx           |   8 +-
 .../RegisterUsers/AddRegisterUsers.tsx        |  78 +++++--------
 .../RegisterUsers/EditRegisterUsers.tsx       |  68 ++++--------
 .../RegisterUsers/ViewRegisterUsers.tsx       |  78 ++++---------
 .../AgencyMaster/AgencyMaster.tsx             | 103 ++++++++++++++++--
 .../AgencyMaster/EditAgencyMaster.tsx         |  75 +++++++++++++
 .../AgencyMaster/ViewAgencyAddModel.tsx       |  76 +++++++++++++
 .../AgencyMaster/ViewAgencyMaster.tsx         |  75 +++++++++++++
 src/Pages/MasterModule/Country/Country.tsx    |  90 +++++++++++++--
 .../MasterModule/Country/CountryAddModel.tsx  |  58 ++++++++++
 .../MasterModule/Country/EditCountryModel.tsx |  61 +++++++++++
 .../JobStatus/EditJobStatusModel.tsx          |  61 +++++++++++
 .../MasterModule/JobStatus/JobStatus.tsx      |  90 +++++++++++++--
 .../JobStatus/JobStatusAddModel.tsx           |  58 ++++++++++
 .../MasterModule/JobType/EditJobModel.tsx     |  62 +++++++++++
 .../MasterModule/JobType/JobAddModel.tsx      |  58 ++++++++++
 src/Pages/MasterModule/JobType/JobType.tsx    |  90 +++++++++++++--
 .../TemplateMaster/EditTemplateModel.tsx      | 100 +++++++++++++++++
 .../TemplateMaster/TemplateAddModel.tsx       | 100 +++++++++++++++++
 .../TemplateMaster/TemplateMaster.tsx         | 103 ++++++++++++++++--
 .../WorkspaceMode/EditWorkModel.tsx           |  61 +++++++++++
 .../WorkspaceMode/WorkAddModel.tsx            |  58 ++++++++++
 .../WorkspaceMode/WorkspaceMode.tsx           |  90 +++++++++++++--
 src/Pages/SubAdmin/AddModel.tsx               |  12 +-
 src/Pages/SubAdmin/SubAdmin.tsx               |   4 +-
 src/Pages/SubAdmin/ViewSubAdmin.tsx           |  16 ++-
 src/assets/Template_img.png                   | Bin 0 -> 17947 bytes
 src/components/EditSubAdmin.tsx               |  13 ++-
 47 files changed, 1656 insertions(+), 382 deletions(-)
 rename src/{components => Pages/ManageCMS/AboutUs}/AboutUsAddModel.tsx (60%)
 rename src/{components => Pages/ManageCMS/FAQ}/EditDetails.tsx (63%)
 rename src/{components => Pages/ManageCMS/FAQ}/FaqAddModel.tsx (56%)
 rename src/{components => Pages/ManageCMS/PrivacyPolicy}/PrivacyPolicyAddModel.tsx (60%)
 rename src/{components => Pages/ManageCMS/TermsAndConditions}/TermsAndConditionsAddModel.tsx (60%)
 rename src/{components => Pages/ManageContact}/PendingRequests.tsx (63%)
 create mode 100644 src/Pages/MasterModule/AgencyMaster/EditAgencyMaster.tsx
 create mode 100644 src/Pages/MasterModule/AgencyMaster/ViewAgencyAddModel.tsx
 create mode 100644 src/Pages/MasterModule/AgencyMaster/ViewAgencyMaster.tsx
 create mode 100644 src/Pages/MasterModule/Country/CountryAddModel.tsx
 create mode 100644 src/Pages/MasterModule/Country/EditCountryModel.tsx
 create mode 100644 src/Pages/MasterModule/JobStatus/EditJobStatusModel.tsx
 create mode 100644 src/Pages/MasterModule/JobStatus/JobStatusAddModel.tsx
 create mode 100644 src/Pages/MasterModule/JobType/EditJobModel.tsx
 create mode 100644 src/Pages/MasterModule/JobType/JobAddModel.tsx
 create mode 100644 src/Pages/MasterModule/TemplateMaster/EditTemplateModel.tsx
 create mode 100644 src/Pages/MasterModule/TemplateMaster/TemplateAddModel.tsx
 create mode 100644 src/Pages/MasterModule/WorkspaceMode/EditWorkModel.tsx
 create mode 100644 src/Pages/MasterModule/WorkspaceMode/WorkAddModel.tsx
 create mode 100644 src/assets/Template_img.png

diff --git a/dev-dist/sw.js b/dev-dist/sw.js
index 6e232b1..8ae0392 100644
--- a/dev-dist/sw.js
+++ b/dev-dist/sw.js
@@ -82,7 +82,7 @@ define(['./workbox-54d0af47'], (function (workbox) { 'use strict';
     "revision": "3ca0b8505b4bec776b69afdba2768812"
   }, {
     "url": "index.html",
-    "revision": "0.57smkc9q598"
+    "revision": "0.tm0o9v27ue"
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {
diff --git a/package-lock.json b/package-lock.json
index 0d62def..f18c84e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1670,7 +1670,7 @@
     },
     "node_modules/@clack/prompts/node_modules/is-unicode-supported": {
       "version": "1.3.0",
-      "dev": true,
+      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
       "engines": {
diff --git a/src/Pages/ManageCMS/AboutUs/AboutUs.tsx b/src/Pages/ManageCMS/AboutUs/AboutUs.tsx
index 51377a3..a86544c 100644
--- a/src/Pages/ManageCMS/AboutUs/AboutUs.tsx
+++ b/src/Pages/ManageCMS/AboutUs/AboutUs.tsx
@@ -1,7 +1,7 @@
 import { Box, HStack, Text } from "@chakra-ui/react";
 import MainFrame from "../../../components/MainFrame"
 import { p } from "framer-motion/client";
-import AboutUsAddModel from "../../../components/AboutUsAddModel";
+import AboutUsAddModel from "../../ManageCMS/AboutUs/AboutUsAddModel";
 
 
 const AboutUs = () => {
diff --git a/src/components/AboutUsAddModel.tsx b/src/Pages/ManageCMS/AboutUs/AboutUsAddModel.tsx
similarity index 60%
rename from src/components/AboutUsAddModel.tsx
rename to src/Pages/ManageCMS/AboutUs/AboutUsAddModel.tsx
index 6643c16..75b9c73 100644
--- a/src/components/AboutUsAddModel.tsx
+++ b/src/Pages/ManageCMS/AboutUs/AboutUsAddModel.tsx
@@ -1,7 +1,7 @@
 import { FaRegEdit } from "react-icons/fa"
-import { Button } from "./ui/button"
-import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "./ui/dialog"
+import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
 import { Field, Stack, Text, Textarea } from "@chakra-ui/react"
+import { Button } from "../../../components/ui/button"
 
 function AboutUsAddModel() {
     return (
@@ -11,31 +11,33 @@ function AboutUsAddModel() {
                 {/* <Button bg={"transparent"} size="sm">
                     <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
                 </Button> */}
-                <Button bgColor={'#EEEEEE'} pl={3} pr={3}> <FaRegEdit color="#000" style={{height:'14px', width:'14px'}}/> <Text color={"#000"} mt={1}>Edit</Text></Button>
+                <Button bgColor={'#EEEEEE'} pl={3} pr={3} size={'xs'} color={'#000'}> <FaRegEdit color="#000" style={{ height: '14px', width: '14px' }} /> <Text color={"#000"} mt={1}>Edit</Text></Button>
 
             </DialogTrigger>
 
             <DialogContent
                 bg={"#fff"}
-                w={{ base: "90%", md: "400px" }}
-                maxW="90vw"
-                h="auto"
-                p={4}
+                // w={{ lg: "60%", md: "230px" }}
+                w={{ base: '90%', md: '400px' }}
+                height={"auto"}
+
+                p={3} // Reduced padding
+                bgSize={'md'}
             >
-                <DialogHeader bg="white" py={3} >
-                    <DialogTitle alignSelf="center" color="black">Edit</DialogTitle>
+                <DialogHeader bg="white" >
+                    <DialogTitle alignSelf="center" color="black" fontSize="14px">Edit</DialogTitle>
                 </DialogHeader>
 
                 <DialogBody bg="white">
-                    <Stack  >
+                    <Stack py={3} >
 
                         <Field.Root>
-                            <Field.Label color="black" pt={2}>AboutUs</Field.Label>
-                            <Textarea placeholder="" bgColor="#EEEEEE" color="black" border="none" pl={2} pt={2}/>
+                            <Field.Label color="black" pt={1} fontSize="12px">AboutUs</Field.Label>
+                            <Textarea placeholder="" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" pt={1.5} />
                         </Field.Root>
                     </Stack>
                 </DialogBody>
-                <DialogFooter display="flex" justifyContent="center" pt={"5"}>
+                <DialogFooter display="flex" justifyContent="center" pt={"2"}>
                     <Button w="100%" bg="#02A0A0" color={"#fff"}>
                         Save
                     </Button>
diff --git a/src/components/EditDetails.tsx b/src/Pages/ManageCMS/FAQ/EditDetails.tsx
similarity index 63%
rename from src/components/EditDetails.tsx
rename to src/Pages/ManageCMS/FAQ/EditDetails.tsx
index 4c7b8af..a8759e9 100644
--- a/src/components/EditDetails.tsx
+++ b/src/Pages/ManageCMS/FAQ/EditDetails.tsx
@@ -1,5 +1,5 @@
-import { Button } from "./ui/button"
-import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "./ui/dialog"
+import { Button } from "../../../components/ui/button"
+import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
 import { Field, Grid, Input, Stack, Text, Textarea } from "@chakra-ui/react"
 import { FaRegEdit } from "react-icons/fa";
 function EditDetails() {
@@ -16,29 +16,31 @@ function EditDetails() {
 
             <DialogContent
                 bg={"#fff"}
-                w={{ base: "90%", md: "400px" }}
-                maxW="90vw"
-                h="auto"
-                p={4}
+                // w={{ lg: "60%", md: "230px" }}
+                w={{ base: '90%', md: '400px' }}
+                height={"auto"}
+
+                p={3} // Reduced padding
+                bgSize={'md'}
             >
-                <DialogHeader bg="white" py={3}>
-                    <DialogTitle alignSelf="center" color="black">Edit Details</DialogTitle>
+                <DialogHeader bg="white" >
+                    <DialogTitle alignSelf="center" color="black" fontSize="14px">Edit Details</DialogTitle>
                 </DialogHeader>
 
                 <DialogBody bg="white">
-                    <Stack  >
+                    <Stack py={3} >
 
                         <Field.Root>
-                            <Field.Label color="black" pt={2}>Questions</Field.Label>
-                            <Input placeholder="Questions" bgColor="#EEEEEE" color="black" border="none" pl={2} />
+                            <Field.Label color="black" pt={1} fontSize="12px">Questions</Field.Label>
+                            <Input placeholder="Questions" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
 
-                            <Field.Label color="black" pt={2}>Answer</Field.Label>
-                            <Textarea placeholder="Answer" bgColor="#EEEEEE" color="black" border="none" pl={2} pt={2} />
+                            <Field.Label color="black" pt={1} fontSize="12px">Answer</Field.Label>
+                            <Textarea placeholder="Answer" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" pt={1.5} />
 
                         </Field.Root>
                     </Stack>
                 </DialogBody>
-                <DialogFooter display="flex" justifyContent="center" pt={"5"}>
+                <DialogFooter display="flex" justifyContent="center" pt={"2"}>
                     <Button w="100%" bg="#02A0A0" color={"#fff"}>
                         Save
                     </Button>
diff --git a/src/Pages/ManageCMS/FAQ/FAQ.tsx b/src/Pages/ManageCMS/FAQ/FAQ.tsx
index cff2e78..44bd58d 100644
--- a/src/Pages/ManageCMS/FAQ/FAQ.tsx
+++ b/src/Pages/ManageCMS/FAQ/FAQ.tsx
@@ -1,13 +1,13 @@
 import { Box, Button, HStack, Image, Input, Text } from "@chakra-ui/react";
 import MainFrame from "../../../components/MainFrame"
-import EditDetails from "../../../components/EditDetails";
+import EditDetails from "./EditDetails";
 import { InputGroup } from "../../../components/ui/input-group";
 import { LuSearch } from "react-icons/lu";
 import DataTable from "../../../components/DataTable";
 import AlertDailog from "../../../components/AlertDailog";
 import { RiDeleteBin5Line } from "react-icons/ri";
 import { Switch } from "../../../components/ui/switch";
-import FaqAddModel from "../../../components/FaqAddModel";
+import FaqAddModel from "./FaqAddModel";
 
 
 // table data
@@ -60,8 +60,8 @@ const FAQ = () => {
            FAQs
           </Text>
 
-          <HStack mr={5}>
-            <InputGroup marginRight={"1rem"}
+          <HStack >
+            <InputGroup 
               startElement={
                 <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
               }
diff --git a/src/components/FaqAddModel.tsx b/src/Pages/ManageCMS/FAQ/FaqAddModel.tsx
similarity index 56%
rename from src/components/FaqAddModel.tsx
rename to src/Pages/ManageCMS/FAQ/FaqAddModel.tsx
index 563b2ef..40b1f60 100644
--- a/src/components/FaqAddModel.tsx
+++ b/src/Pages/ManageCMS/FAQ/FaqAddModel.tsx
@@ -1,7 +1,7 @@
-import { Button } from "./ui/button"
-import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "./ui/dialog"
-import { Field, Grid, Input, Stack, Text, Textarea } from "@chakra-ui/react"
+import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
+import { Field, Input, Stack, Text, Textarea } from "@chakra-ui/react"
 import { IoMdAdd } from "react-icons/io"
+import { Button } from "../../../components/ui/button"
 
 function FaqAddModel() {
     return (
@@ -11,35 +11,37 @@ function FaqAddModel() {
                 {/* <Button bg={"transparent"} size="sm">
                     <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
                 </Button> */}
-                <Button bgColor={'#EEEEEE'} pl={3} pr={3}><IoMdAdd color="#000"  /> <Text color={"#00000099"}>Add</Text></Button>
+                <Button px={5} size={"xs"} bg={"#02A0A0"}><IoMdAdd /> <Text>Add</Text></Button>
 
             </DialogTrigger>
 
             <DialogContent
                 bg={"#fff"}
-                w={{ base: "90%", md: "400px" }}
-                maxW="90vw"
-                h="auto"
-                p={4}
+                // w={{ lg: "60%", md: "230px" }}
+                w={{ base: '90%', md: '400px' }}
+                height={"auto"}
+
+                p={3} // Reduced padding
+                bgSize={'md'}
             >
-                <DialogHeader bg="white" py={3}>
-                    <DialogTitle alignSelf="center" color="black">Add</DialogTitle>
+                <DialogHeader bg="white" >
+                    <DialogTitle alignSelf="center" color="black" fontSize="14px">Add</DialogTitle>
                 </DialogHeader>
 
                 <DialogBody bg="white">
-                    <Stack  >
+                    <Stack py={3} >
 
                         <Field.Root>
-                            <Field.Label color="black" pt={2}>Questions</Field.Label>
-                            <Input placeholder="Questions" bgColor="#EEEEEE" color="black" border="none" pl={2} />
+                            <Field.Label color="black" pt={1} fontSize="12px">Questions</Field.Label>
+                            <Input placeholder="Questions" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
 
-                            <Field.Label color="black" pt={2}>Answer</Field.Label>
-                            <Textarea placeholder="Answer" bgColor="#EEEEEE" color="black" border="none" pl={2} pt={2} />
+                            <Field.Label color="black" pt={1} fontSize="12px">Answer</Field.Label>
+                            <Textarea placeholder="Answer" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" pt={1.5} />
 
                         </Field.Root>
                     </Stack>
                 </DialogBody>
-                <DialogFooter display="flex" justifyContent="center" pt={"5"}>
+                <DialogFooter display="flex" justifyContent="center" pt={"2"}>
                     <Button w="100%" bg="#02A0A0" color={"#fff"}>
                         Save
                     </Button>
diff --git a/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx
index e427996..26e9126 100644
--- a/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx
+++ b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx
@@ -1,7 +1,7 @@
 import { Box, HStack, Text } from "@chakra-ui/react";
 import MainFrame from "../../../components/MainFrame"
 import { p } from "framer-motion/client";
-import PrivacyPolicyAddModel from "../../../components/PrivacyPolicyAddModel";
+import PrivacyPolicyAddModel from "./PrivacyPolicyAddModel";
 
 
 const PrivacyPolicy = () => {
diff --git a/src/components/PrivacyPolicyAddModel.tsx b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicyAddModel.tsx
similarity index 60%
rename from src/components/PrivacyPolicyAddModel.tsx
rename to src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicyAddModel.tsx
index 64b6db9..566a00e 100644
--- a/src/components/PrivacyPolicyAddModel.tsx
+++ b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicyAddModel.tsx
@@ -1,7 +1,7 @@
 import { FaRegEdit } from "react-icons/fa"
-import { Button } from "./ui/button"
-import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "./ui/dialog"
+import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
 import { Field, Input, Stack, Text, Textarea } from "@chakra-ui/react"
+import { Button } from "../../../components/ui/button"
 
 function PrivacyPolicyAddModel() {
     return (
@@ -11,31 +11,33 @@ function PrivacyPolicyAddModel() {
                 {/* <Button bg={"transparent"} size="sm">
                     <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
                 </Button> */}
-                <Button bgColor={'#EEEEEE'} pl={3} pr={3}> <FaRegEdit color="#000" style={{height:'14px', width:'14px'}}/> <Text color={"#000"} mt={1}>Edit</Text></Button>
+                <Button bgColor={'#EEEEEE'} pl={3} pr={3} size={'xs'} color={'#000'}> <FaRegEdit color="#000" style={{ height: '14px', width: '14px' }} /> <Text color={"#000"} mt={1}>Edit</Text></Button>
 
             </DialogTrigger>
 
             <DialogContent
                 bg={"#fff"}
-                w={{ base: "90%", md: "400px" }}
-                maxW="90vw"
-                h="auto"
-                p={4}
+                // w={{ lg: "60%", md: "230px" }}
+                w={{ base: '90%', md: '400px' }}
+                height={"auto"}
+
+                p={3} // Reduced padding
+                bgSize={'md'}
             >
-                <DialogHeader bg="white" py={3} >
-                    <DialogTitle alignSelf="center" color="black">Edit</DialogTitle>
+                <DialogHeader bg="white"  >
+                    <DialogTitle alignSelf="center" color="black" fontSize="14px">Edit</DialogTitle>
                 </DialogHeader>
 
                 <DialogBody bg="white">
-                    <Stack  >
+                    <Stack py={3} >
 
                         <Field.Root>
-                            <Field.Label color="black" pt={2}>PrivacyPolicy</Field.Label>
-                            <Textarea placeholder="" bgColor="#EEEEEE" color="black" border="none" pl={2} pt={2}/>
+                            <Field.Label color="black" pt={1} fontSize="12px">PrivacyPolicy</Field.Label>
+                            <Textarea placeholder="" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" pt={1.5} />
                         </Field.Root>
                     </Stack>
                 </DialogBody>
-                <DialogFooter display="flex" justifyContent="center" pt={"5"}>
+                <DialogFooter display="flex" justifyContent="center" pt={"2"}>
                     <Button w="100%" bg="#02A0A0" color={"#fff"}>
                         Save
                     </Button>
diff --git a/src/Pages/ManageCMS/TermsAndConditions/TermsAndConditions.tsx b/src/Pages/ManageCMS/TermsAndConditions/TermsAndConditions.tsx
index 8c42617..35f1e5a 100644
--- a/src/Pages/ManageCMS/TermsAndConditions/TermsAndConditions.tsx
+++ b/src/Pages/ManageCMS/TermsAndConditions/TermsAndConditions.tsx
@@ -1,7 +1,7 @@
 import { Box, HStack, Text } from "@chakra-ui/react";
 import MainFrame from "../../../components/MainFrame"
 import { p } from "framer-motion/client";
-import TermsAndConditionsAddModel from "../../../components/TermsAndConditionsAddModel";
+import TermsAndConditionsAddModel from "./TermsAndConditionsAddModel";
 
 
 const TermsAndConditions = () => {
diff --git a/src/components/TermsAndConditionsAddModel.tsx b/src/Pages/ManageCMS/TermsAndConditions/TermsAndConditionsAddModel.tsx
similarity index 60%
rename from src/components/TermsAndConditionsAddModel.tsx
rename to src/Pages/ManageCMS/TermsAndConditions/TermsAndConditionsAddModel.tsx
index d0033cc..17a97fa 100644
--- a/src/components/TermsAndConditionsAddModel.tsx
+++ b/src/Pages/ManageCMS/TermsAndConditions/TermsAndConditionsAddModel.tsx
@@ -1,7 +1,7 @@
 import { FaRegEdit } from "react-icons/fa"
-import { Button } from "./ui/button"
-import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "./ui/dialog"
+import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
 import { Field, Stack, Text, Textarea } from "@chakra-ui/react"
+import { Button } from "../../../components/ui/button"
 
 function TermsAndConditionsAddModel() {
     return (
@@ -11,31 +11,33 @@ function TermsAndConditionsAddModel() {
                 {/* <Button bg={"transparent"} size="sm">
                     <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
                 </Button> */}
-                <Button bgColor={'#EEEEEE'} pl={3} pr={3}> <FaRegEdit color="#000" style={{height:'14px', width:'14px'}}/> <Text color={"#000"} mt={1}>Edit</Text></Button>
+                <Button bgColor={'#EEEEEE'} pl={3} pr={3} size={'xs'} color={'#000'}> <FaRegEdit color="#000" style={{ height: '14px', width: '14px' }} /> <Text color={"#000"} mt={1}>Edit</Text></Button>
 
             </DialogTrigger>
 
             <DialogContent
                 bg={"#fff"}
-                w={{ base: "90%", md: "400px" }}
-                maxW="90vw"
-                h="auto"
-                p={4}
+                // w={{ lg: "60%", md: "230px" }}
+                w={{ base: '90%', md: '400px' }}
+                height={"auto"}
+
+                p={3} // Reduced padding
+                bgSize={'md'}
             >
-                <DialogHeader bg="white" py={3} >
-                    <DialogTitle alignSelf="center" color="black">Edit</DialogTitle>
+                <DialogHeader bg="white">
+                    <DialogTitle alignSelf="center" color="black" fontSize="14px">Edit</DialogTitle>
                 </DialogHeader>
 
                 <DialogBody bg="white">
-                    <Stack  >
+                    <Stack py={3}>
 
                         <Field.Root>
-                            <Field.Label color="black" pt={2}>TermsAndConditions</Field.Label>
-                            <Textarea placeholder="" bgColor="#EEEEEE" color="black" border="none" pl={2} pt={2}/>
+                            <Field.Label color="black" pt={1} fontSize="12px">TermsAndConditions</Field.Label>
+                            <Textarea placeholder="" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" pt={1.5} />
                         </Field.Root>
                     </Stack>
                 </DialogBody>
-                <DialogFooter display="flex" justifyContent="center" pt={"5"}>
+                <DialogFooter display="flex" justifyContent="center" pt={"2"}>
                     <Button w="100%" bg="#02A0A0" color={"#fff"}>
                         Save
                     </Button>
diff --git a/src/Pages/ManageContact/ManageContact.tsx b/src/Pages/ManageContact/ManageContact.tsx
index cc1e9c8..1207bf7 100644
--- a/src/Pages/ManageContact/ManageContact.tsx
+++ b/src/Pages/ManageContact/ManageContact.tsx
@@ -1,6 +1,6 @@
 import { Box, HStack, Image, Input, Text } from "@chakra-ui/react";
 import MainFrame from "../../components/MainFrame"
-import PendingRequests from "../../components/PendingRequests";
+import PendingRequests from "../../Pages/ManageContact/PendingRequests"
 import { InputGroup } from "../../components/ui/input-group";
 import { LuSearch } from "react-icons/lu";
 import DataTable from "../../components/DataTable";
diff --git a/src/components/PendingRequests.tsx b/src/Pages/ManageContact/PendingRequests.tsx
similarity index 63%
rename from src/components/PendingRequests.tsx
rename to src/Pages/ManageContact/PendingRequests.tsx
index 996bc45..23d566b 100644
--- a/src/components/PendingRequests.tsx
+++ b/src/Pages/ManageContact/PendingRequests.tsx
@@ -1,6 +1,6 @@
-import { Button } from "./ui/button"
-import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "./ui/dialog"
-import { Field, HStack, Input, Stack, Textarea,  } from "@chakra-ui/react"
+import { Button } from "../../components/ui/button"
+import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../components/ui/dialog"
+import { Field, HStack, Input, Stack, Textarea, } from "@chakra-ui/react"
 function PendingRequests() {
     return (
 
@@ -16,33 +16,33 @@ function PendingRequests() {
 
             <DialogContent
                 bg={"#fff"}
-                w={{ base: "90%", md: "400px" }}
-                maxW="90vw"
-                h="auto"
-                p={4}
+                w={{ base: '90%', md: '400px' }}
+                height={"auto"}
+                p={3} // Reduced padding
+                bgSize={'md'}
             >
-                <DialogHeader bg="white" py={3}>
-                    <DialogTitle alignSelf="center" color="black">Pending Requests</DialogTitle>
+                <DialogHeader bg="white">
+                    <DialogTitle alignSelf="center" color="black" fontSize="14px">Pending Requests</DialogTitle>
                 </DialogHeader>
 
                 <DialogBody bg="white">
-                    <Stack  >
-
+                    <Stack py={3}>
                         <Field.Root>
-                            <Field.Label color="black" pt={2}>Request Type</Field.Label>
-                            <Input placeholder="Message" bgColor="#EEEEEE" color="black" border="none" pl={2} />
+                            <Field.Label color="black" pt={1} fontSize="12px">Request Type</Field.Label>
+                            <Input placeholder="Message" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
 
-                            <Field.Label color="black" pt={2}>Solution</Field.Label>
-                            <Textarea placeholder="" bgColor="#EEEEEE" height={"80px"} color="black" border="none" pl={2}  pt={2}/>
+                            <Field.Label color="black" pt={1} fontSize="12px">Solution</Field.Label>
+                            <Textarea placeholder="" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="80px" pt={1.5} />
                         </Field.Root>
-                        
+
                     </Stack>
                 </DialogBody>
-                <DialogFooter display={{base:'block', md:'flex'}} justifyContent="center" gap={1} pt={5}>
-                     
-                    <HStack mt={2} w={"100%"}>
+                <DialogFooter display={{ base: 'block', md: 'flex' }} justifyContent="center" gap={1} pt={2}>
+
+                    <HStack mt={2} width={"100%"}
+                        justifyContent={"space-between"}>
                         <Button
-                            width="50%"
+                            width={"48%"}
                             color="black"
                             _hover={{ bgColor: "white" }}
                             variant="outline"
@@ -53,14 +53,14 @@ function PendingRequests() {
                             Unresolved
                         </Button>
                         <Button
+                            width={"48%"}
                             borderRadius="sm"
-                            width="50%"
                             // bgColor="#007F33"
                             bgColor={'#02A0A0'}
                             color="white"
                             // colorPalette="#007F33"
                             size={"xs"}
-                            >
+                        >
                             Resolved{" "}
                         </Button>
                     </HStack>
diff --git a/src/Pages/ManageGroups/AddGroup.tsx b/src/Pages/ManageGroups/AddGroup.tsx
index fa2f5f4..d5cc33a 100644
--- a/src/Pages/ManageGroups/AddGroup.tsx
+++ b/src/Pages/ManageGroups/AddGroup.tsx
@@ -8,7 +8,7 @@ function AddGroup() {
 
         <DialogRoot placement="center" >
             <DialogTrigger asChild>
-                <Button bgColor={'#EEEEEE'} pl={3} pr={3} size={'xs'} color={'#000'}><IoMdAdd /> <Text>Add</Text></Button>
+                <Button px={5} size={"xs"} bg={"#02A0A0"}><IoMdAdd /> <Text>Add</Text></Button>
 
             </DialogTrigger>
 
@@ -16,19 +16,17 @@ function AddGroup() {
                 bg={"#fff"}
                 // w={{ lg: "60%", md: "230px" }}
                 w={{ base: '90%', md: '400px' }}
-
-
-                // height={'80vh'}
-                overflow={'scroll'}
-                p={2} // Reduced padding
+                height={"auto"}
+                // overflow={'scroll'}
+                p={3} // Reduced padding
                 bgSize={'md'}
             >
-                <DialogHeader bg="white" pt={1} pb={2}>
+                <DialogHeader bg="white">
                     <DialogTitle alignSelf="center" color="black" fontSize="14px">Add</DialogTitle>
                 </DialogHeader>
 
                 <DialogBody bg="white">
-                    <Stack p={2} >
+                    <Stack py={3} >
 
                         <Field.Root>
                             <Field.Label color="black" pt={1} fontSize="xs">Group Name</Field.Label>
@@ -41,18 +39,11 @@ function AddGroup() {
                         <Button w="30%" size={'xs'} bg="#02A0A0" mt={3} color={"#fff"}>
                             Add Member
                         </Button>
-
-
-
-
-
-
-
                         <Heading color="black" pt={1} fontSize="12px">public/Private</Heading>
                         <Switch />
                     </Stack>
                 </DialogBody>
-                <DialogFooter display="flex" justifyContent="center">
+                <DialogFooter display="flex" justifyContent="center" pt={"2"}>
                     <Button w="100%" bg="#02A0A0" color={"#fff"}>
                         Save
                     </Button>
diff --git a/src/Pages/ManageGroups/EditDetailGroup.tsx b/src/Pages/ManageGroups/EditDetailGroup.tsx
index e81f7b2..64d8c8f 100644
--- a/src/Pages/ManageGroups/EditDetailGroup.tsx
+++ b/src/Pages/ManageGroups/EditDetailGroup.tsx
@@ -10,7 +10,7 @@ function EditDetailGroups() {
         <DialogRoot placement="center" >
             <DialogTrigger asChild>
                 <Button bg={"transparent"} size="sm">
-                    <FaRegEdit style={{ cursor: "pointer", }} />
+                    <FaRegEdit style={{ cursor: "pointer", }}  color="#000"/>
                 </Button>
                 {/* <Button><FaRegEdit /></Button> */}
 
@@ -19,15 +19,15 @@ function EditDetailGroups() {
             <DialogContent
                 bg={"#fff"}
                 w={{ base: '90%', md: '400px' }}
-                overflow={'scroll'}
-                p={2} // Reduced padding
+                height={"auto"}
+                p={3} // Reduced padding
             >
-                <DialogHeader bg="white" pt={1} pb={2}>
+                <DialogHeader bg="white">
                     <DialogTitle alignSelf="center" color="black" fontSize="14px">Edit details</DialogTitle>
                 </DialogHeader>
 
                 <DialogBody bg="white">
-                    <Stack p={2} >
+                    <Stack py={3} >
 
                         <Field.Root>
                             <Field.Label color="black" pt={1} fontSize="12px">Group Name</Field.Label>
@@ -71,7 +71,7 @@ function EditDetailGroups() {
                         <Switch />
                     </Stack>
                 </DialogBody>
-                <DialogFooter display="flex" justifyContent="center">
+                <DialogFooter display="flex" justifyContent="center" pt={"2"}>
                     <Button size={'xs'} w="100%" bg="#02A0A0" color={"#fff"}>
                         Save
                     </Button>
diff --git a/src/Pages/ManageGroups/ManageGroups.tsx b/src/Pages/ManageGroups/ManageGroups.tsx
index f055d68..7cb4b8f 100644
--- a/src/Pages/ManageGroups/ManageGroups.tsx
+++ b/src/Pages/ManageGroups/ManageGroups.tsx
@@ -5,8 +5,6 @@ import { LuSearch } from "react-icons/lu"
 import DataTable from "../../components/DataTable"
 import AlertDailog from "../../components/AlertDailog"
 import { RiDeleteBin5Line } from "react-icons/ri";
-import AddModel from "../SubAdmin/AddModel"
-import EditSubAdmin from "../../components/EditSubAdmin"
 import ViewManageGroup from "./ViewManageGroup"
 import EditDetailGroups from "./EditDetailGroup"
 import AddGroup from "./AddGroup"
@@ -70,7 +68,7 @@ const ManageGroups = () => {
             Manage Groups
           </Text>
 
-          <HStack gap={4}>
+          <HStack >
             <InputGroup
               startElement={
                 <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
diff --git a/src/Pages/ManageGroups/ViewManageGroup.tsx b/src/Pages/ManageGroups/ViewManageGroup.tsx
index 61c6971..d479bc0 100644
--- a/src/Pages/ManageGroups/ViewManageGroup.tsx
+++ b/src/Pages/ManageGroups/ViewManageGroup.tsx
@@ -11,7 +11,7 @@ function ViewManageGroup() {
         <DialogRoot placement="center" >
             <DialogTrigger asChild>
                 <Button bg={"transparent"} size="sm">
-                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", }} />
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", }}  color="#000"/>
                 </Button>
                 {/* <Button><FaRegEdit /></Button> */}
 
@@ -21,19 +21,16 @@ function ViewManageGroup() {
                 bg={"#fff"}
                 // w={{ lg: "60%", md: "230px" }}
                 w={{ base: '90%', md: '400px' }}
-
-
-                // height={'80vh'}
-                overflow={'scroll'}
-                p={2} // Reduced padding
+                height={"auto"}
+                p={3} // Reduced padding
                 bgSize={'md'}
             >
-                <DialogHeader bg="white" pt={1} pb={2}>
+                <DialogHeader bg="white" >
                     <DialogTitle alignSelf="center" color="black" fontSize="14px">View details</DialogTitle>
                 </DialogHeader>
 
                 <DialogBody bg="white">
-                    <Stack p={2} >
+                    <Stack py={3} >
 
                         <Field.Root>
                             <Field.Label color="black" pt={1} fontSize="12px">Group Name</Field.Label>
@@ -73,10 +70,6 @@ function ViewManageGroup() {
                                 </AvatarGroup>
                             </Box>
 
-
-
-
-
                         </Field.Root>
                         <Heading color="black" pt={1} fontSize="12px">public/Private</Heading>
                         <Switch />
diff --git a/src/Pages/ManageJobs/ManageJobsAdd.tsx b/src/Pages/ManageJobs/ManageJobsAdd.tsx
index d69907f..6e19bbc 100644
--- a/src/Pages/ManageJobs/ManageJobsAdd.tsx
+++ b/src/Pages/ManageJobs/ManageJobsAdd.tsx
@@ -20,7 +20,7 @@ function ManageJobsAdd() {
         <DialogRoot placement="center">
             <DialogTrigger asChild>
                 <Button bg={"transparent"} size="sm">
-                    <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }} />
+                    <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }} color="#000" />
                 </Button>
             </DialogTrigger>
 
@@ -28,18 +28,18 @@ function ManageJobsAdd() {
                 bg={"#fff"}
                 // w={{ lg: "60%", md: "230px" }}
                 w={{ base: '90%', md: '400px' }}
-
                 height={'80vh'}
                 overflow={'scroll'}
-                p={2} // Reduced padding
+                overflowX="hidden" 
+                p={3} // Reduced padding
                 bgSize={'md'}
             >
-                <DialogHeader bg="white" p={2}>
+                <DialogHeader bg="white">
                     <DialogTitle alignSelf="center" color="black" fontSize="14px">Add Details</DialogTitle>
                 </DialogHeader>
 
                 <DialogBody bg="white">
-                    <Stack p={2}>
+                    <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" />
@@ -92,7 +92,7 @@ function ManageJobsAdd() {
                         </Field.Root>
                     </Stack>
                 </DialogBody>
-                <DialogFooter display="flex" justifyContent="center">
+                <DialogFooter display="flex" justifyContent="center" pt={"2"}>
                     <Button w="100%" bg="#02A0A0" color={"#fff"} fontSize="12px" height="30px">
                         Save
                     </Button>
diff --git a/src/Pages/ManageJobs/ViewManageJob.tsx b/src/Pages/ManageJobs/ViewManageJob.tsx
index c8b574b..fca4cd6 100644
--- a/src/Pages/ManageJobs/ViewManageJob.tsx
+++ b/src/Pages/ManageJobs/ViewManageJob.tsx
@@ -21,7 +21,7 @@ function ViewManageJob() {
         <DialogRoot placement="center">
             <DialogTrigger asChild>
                 <Button bg={"transparent"} size="sm">
-                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "14px" }} />
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
                 </Button>
             </DialogTrigger>
 
@@ -29,18 +29,18 @@ function ViewManageJob() {
                 bg={"#fff"}
                 // w={{ lg: "60%", md: "230px" }}
                 w={{ base: '90%', md: '400px' }}
-
                 height={'80vh'}
                 overflow={'scroll'}
-                p={2} // Reduced padding
+                overflowX="hidden" 
+                p={3} // Reduced padding
                 bgSize={'md'}
             >
-                <DialogHeader bg="white" p={2}>
+                <DialogHeader bg="white" >
                     <DialogTitle alignSelf="center" color="black" fontSize="14px">Add Details</DialogTitle>
                 </DialogHeader>
 
                 <DialogBody bg="white">
-                    <Stack p={2}>
+                    <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" />
@@ -95,7 +95,7 @@ function ViewManageJob() {
                         </Field.Root>
                     </Stack>
                 </DialogBody>
-                <DialogFooter display="flex" justifyContent="center">
+                <DialogFooter display="flex" justifyContent="center" pt={"2"}>
                     <Button w="100%" bg="#02A0A0" color={"#fff"} fontSize="12px" height="30px">
                         Save
                     </Button>
diff --git a/src/Pages/ManagePost/ViewDailog.tsx b/src/Pages/ManagePost/ViewDailog.tsx
index 446b26a..f835014 100644
--- a/src/Pages/ManagePost/ViewDailog.tsx
+++ b/src/Pages/ManagePost/ViewDailog.tsx
@@ -9,7 +9,7 @@ function ViewDailog() {
         <DialogRoot placement="center">
             <DialogTrigger asChild>
                 <Button bg={"transparent"} size="sm">
-                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} color="#000" />
                 </Button>
             </DialogTrigger>
 
@@ -17,14 +17,14 @@ function ViewDailog() {
                 w={{ base: '90%', md: '400px' }}
                 bg={"#fff"}
                 h="auto"
-                p={2} // Reduced padding
+                p={3} // Reduced padding
             >
-                <DialogHeader bg="white" p={2}>
+                <DialogHeader bg="white" >
                     <DialogTitle alignSelf="center" color="black" fontSize="14px">View Details</DialogTitle>
                 </DialogHeader>
 
                 <DialogBody bg="white">
-                    <Stack p={2} >
+                    <Stack py={3} >
                         <Field.Root>
                             <Field.Label color="black" pt={1} fontSize="12px">Title</Field.Label>
                             <Input placeholder="Enter the Title" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" readOnly />
diff --git a/src/Pages/ManageUsers/RegisterUsers/AddRegisterUsers.tsx b/src/Pages/ManageUsers/RegisterUsers/AddRegisterUsers.tsx
index 8fa5979..bbb4ea1 100644
--- a/src/Pages/ManageUsers/RegisterUsers/AddRegisterUsers.tsx
+++ b/src/Pages/ManageUsers/RegisterUsers/AddRegisterUsers.tsx
@@ -17,104 +17,76 @@ function AddRegisterUsers() {
   return (
     <DialogRoot placement="center">
       <DialogTrigger asChild>
-        <Button px={5} size={"xs"} bg={"#02A0A0"}>
+        <Button px={4} size={"xs"} bg={"#02A0A0"}>
           <IoMdAdd /> Add
         </Button>
       </DialogTrigger>
 
       <DialogContent
-        bg={"#fff"}
-        w={{ base: "90%", md: "400px" }}
-        maxW="90vw"
-        h="auto"
-        p={4}
+         bg={"#fff"}
+         w={{ base: '90%', md: '400px' }}
+         height={'80vh'}
+         overflow={'scroll'}
+         overflowX="hidden" 
+         p={3} // Reduced padding
+         bgSize={'md'}
       >
-        <DialogHeader bg="white" p={0}>
-          <DialogTitle fontSize={"sm"} alignSelf="center" color="black">
+        <DialogHeader bg="white" >
+          <DialogTitle alignSelf="center" color="black" fontSize="14px">
             Add User Accounts
           </DialogTitle>
         </DialogHeader>
 
         <DialogBody bg="white">
-          <Stack pt={3} pb={3}>
+          <Stack py={3}>
             <Field.Root>
-              <Field.Label color="black" pt={2} fontSize={"xs"}>
+              <Field.Label color="black" pt={1} fontSize="12px">
                 First Name
               </Field.Label>
               <Input
-                name="Priyanka"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={2}
-                size={"xs"}
+               bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
               />
 
-              <Field.Label color="black" pt={2} fontSize={"xs"}>
+              <Field.Label color="black" pt={1} fontSize="12px">
                 Last Name
               </Field.Label>
               <Input
-                name="Joshi"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={2}
-                size={"xs"}
+               bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
               />
 
-              <Field.Label pt={2} color="black" fontSize={"xs"}>
+              <Field.Label color="black" pt={1} fontSize="12px">
                 Gender
               </Field.Label>
               <Input
-                name="Female"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={2}
-                size={"xs"}
+                bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
               />
 
-              <Field.Label pt={2} color="black" fontSize={"xs"}>
+              <Field.Label color="black" pt={1} fontSize="12px">
                 DOB
               </Field.Label>
               <Input
-                name="11/02/1989"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={2}
-                size={"xs"}
+               bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
               />
 
-              <Field.Label pt={2} color="black" fontSize={"xs"}>
+              <Field.Label color="black" pt={1} fontSize="12px">
                 OTP Verified
               </Field.Label>
               <Input
-                name="Yes"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={2}
-                size={"xs"}
+               bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
               />
 
-              <Field.Label pt={2} color="black" fontSize={"xs"}>
+              <Field.Label color="black" pt={1} fontSize="12px">
                 Language
               </Field.Label>
               <Input
-                name="English, Hindi, Marathi"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={2}
-                size={"xs"}
+               bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
               />
             </Field.Root>
           </Stack>
         </DialogBody>
-        <DialogFooter mt={5}>
+        <DialogFooter mt={2}>
           <DialogActionTrigger asChild>
-            <Button rounded={"md"} w={"100%"} size={"sm"} bg={"#02A0A0"}>
+            <Button w="100%" bg="#02A0A0" color={"#fff"}>
               Save
             </Button>
           </DialogActionTrigger>
diff --git a/src/Pages/ManageUsers/RegisterUsers/EditRegisterUsers.tsx b/src/Pages/ManageUsers/RegisterUsers/EditRegisterUsers.tsx
index 4604103..30b934f 100644
--- a/src/Pages/ManageUsers/RegisterUsers/EditRegisterUsers.tsx
+++ b/src/Pages/ManageUsers/RegisterUsers/EditRegisterUsers.tsx
@@ -23,90 +23,62 @@ function EditRegisterUsers() {
 
       <DialogContent
         bg={"#fff"}
-        w={{ base: "90%", md: "400px" }}
-        maxW="90vw"
-        h="auto"
-        p={4}
+        w={{ base: '90%', md: '400px' }}
+        height={'80vh'}
+        overflow={'scroll'}
+        overflowX="hidden" 
+        p={3} // Reduced padding
+        bgSize={'md'}
       >
         <DialogHeader bg="white" p={0}>
-          <DialogTitle fontSize={"sm"} alignSelf="center" color="black">
+          <DialogTitle alignSelf="center" color="black" fontSize="14px">
             Edit user Accounts
           </DialogTitle>
         </DialogHeader>
 
         <DialogBody bg="white">
-          <Stack pt={3} pb={3}>
+          <Stack py={3}>
             <Field.Root>
-              <Field.Label color="black" pt={2} fontSize={"xs"}>
+              <Field.Label color="black" pt={1} fontSize="12px">
                 First Name
               </Field.Label>
               <Input
-                name="Priyanka"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={2}
-                size={"xs"}
+                 bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
               />
 
-              <Field.Label color="black" pt={2} fontSize={"xs"}>
+              <Field.Label color="black" pt={1} fontSize="12px">
                 Last Name
               </Field.Label>
               <Input
-                name="Joshi"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={2}
-                size={"xs"}
+                 bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
               />
 
-              <Field.Label pt={2} color="black" fontSize={"xs"}>
+              <Field.Label color="black" pt={1} fontSize="12px">
                 Gender
               </Field.Label>
               <Input
-                name="Female"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={2}
-                size={"xs"}
+                 bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
               />
 
-              <Field.Label pt={2} color="black" fontSize={"xs"}>
+              <Field.Label color="black" pt={1} fontSize="12px">
                 DOB
               </Field.Label>
               <Input
-                name="11/02/1989"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={2}
-                size={"xs"}
+                 bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
               />
 
-              <Field.Label pt={2} color="black" fontSize={"xs"}>
+              <Field.Label color="black" pt={1} fontSize="12px">
                 OTP Verified
               </Field.Label>
               <Input
-                name="Yes"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={2}
-                size={"xs"}
+                 bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
               />
 
-              <Field.Label pt={2} color="black" fontSize={"xs"}>
+              <Field.Label color="black" pt={1} fontSize="12px">
                 Language
               </Field.Label>
               <Input
-                name="English, Hindi, Marathi"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={2}
-                size={"xs"}
+                 bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
               />
             </Field.Root>
           </Stack>
diff --git a/src/Pages/ManageUsers/RegisterUsers/ViewRegisterUsers.tsx b/src/Pages/ManageUsers/RegisterUsers/ViewRegisterUsers.tsx
index 95717cd..7826ee4 100644
--- a/src/Pages/ManageUsers/RegisterUsers/ViewRegisterUsers.tsx
+++ b/src/Pages/ManageUsers/RegisterUsers/ViewRegisterUsers.tsx
@@ -21,97 +21,63 @@ function ViewRegisterUsers() {
       </DialogTrigger>
 
       <DialogContent
-        bg={"#fff"}
-        w={{ base: "90%", md: "400px" }}
-        maxW="90vw"
-        h="auto"
-        p={4}
+         bg={"#fff"}
+         w={{ base: '90%', md: '400px' }}
+         height={'80vh'}
+         overflow={'scroll'}
+         overflowX="hidden" 
+         p={3} // Reduced padding
+         bgSize={'md'}
       >
-        <DialogHeader bg="white" p={0}>
-          <DialogTitle fontSize={"sm"} alignSelf="center" color="black">
+        <DialogHeader bg="white">
+          <DialogTitle alignSelf="center" color="black" fontSize="14px">
             View Details
           </DialogTitle>
         </DialogHeader>
 
         <DialogBody bg="white">
-          <Stack pt={3} pb={3}>
+          <Stack py={3}>
             <Field.Root>
-              <Field.Label color="black" pt={2} fontSize={"xs"}>
+              <Field.Label color="black" pt={1} fontSize="12px">
                 First Name
               </Field.Label>
               <Input
-                value="Priyanka"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={2}
-                readOnly
-                size={"xs"}
+                bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
               />
 
-              <Field.Label color="black" pt={2} fontSize={"xs"}>
+              <Field.Label color="black" pt={1} fontSize="12px">
                 Last Name
               </Field.Label>
               <Input
-                value="Joshi"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={2}
-                readOnly
-                size={"xs"}
+                bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
               />
 
-              <Field.Label pt={2} color="black" fontSize={"xs"}>
+              <Field.Label color="black" pt={1} fontSize="12px">
                 Gender
               </Field.Label>
               <Input
-                value="Female"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={2}
-                readOnly
-                size={"xs"}
+                bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
               />
 
-              <Field.Label pt={2} color="black" fontSize={"xs"}>
+              <Field.Label color="black" pt={1} fontSize="12px">
                 DOB
               </Field.Label>
               <Input
-                value="11/02/1989"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={2}
-                readOnly
-                size={"xs"}
+                bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
               />
 
-              <Field.Label pt={2} color="black" fontSize={"xs"}>
+              <Field.Label color="black" pt={1} fontSize="12px">
                 OTP Verified
               </Field.Label>
               <Input
-                value="Yes"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={2}
-                readOnly
-                size={"xs"}
+                bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
               />
 
-              <Field.Label pt={2} color="black" fontSize={"xs"}>
+              <Field.Label color="black" pt={1} fontSize="12px">
                 Language
               </Field.Label>
               <Input
-                value="English, Hindi, Marathi"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={2}
-                readOnly
-                size={"xs"}
+                bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
               />
             </Field.Root>
           </Stack>
diff --git a/src/Pages/MasterModule/AgencyMaster/AgencyMaster.tsx b/src/Pages/MasterModule/AgencyMaster/AgencyMaster.tsx
index 052c2de..360b868 100644
--- a/src/Pages/MasterModule/AgencyMaster/AgencyMaster.tsx
+++ b/src/Pages/MasterModule/AgencyMaster/AgencyMaster.tsx
@@ -1,12 +1,99 @@
+import { Box, HStack, Image, Input, Text } from "@chakra-ui/react";
 import MainFrame from "../../../components/MainFrame"
+import { InputGroup } from "../../../components/ui/input-group";
+import { LuSearch } from "react-icons/lu";
+import DataTable from "../../../components/DataTable";
+import { Switch } from "../../../components/ui/switch";
+import EditAgencyMaster from "./EditAgencyMaster";
+import ViewAgencyAddModel from "./ViewAgencyAddModel";
+import ViewAgencyMaster from "./ViewAgencyMaster";
 
 
+// table data
+
+const tableHeadRow = [
+  "Sr. No",
+  "Agency Name",
+  "RC no.",
+  "State",
+  "RC Status",
+  "Registered Office Address",
+  "Website/Domain",
+  "GST no.",
+  "Action"
+  
+];
+
+const managepost: any[] = [
+  ...Array.from({ length: 12 }, (_, i) => ({
+    "Sr. No": i + 1,
+    "Agency Name": "Lorem Ipsum",
+    "RC no.": "Lorem Ipsum",
+    "State": "Lorem Ipsum",
+    "RC Status": "Active",
+    "Registered Office Address": "Lorem Ipsum",
+    "Website/Domain": "Lorem Ipsum",
+    "GST no.": "Lorem Ipsum",
+    "Action": (
+      <HStack justifyContent="center">
+        <ViewAgencyMaster/>
+        <EditAgencyMaster />
+        <Box>
+          <Switch colorPalette={'teal'} size={"xs"}/>
+        </Box>
+      </HStack>
+    ),
+  })),
+];
+
 const AgencyMaster = () => {
-    return (
-      
-      <MainFrame>
-         AgencyMaster
-      </MainFrame>
-    )
-  }
-  export default AgencyMaster
\ No newline at end of file
+  return (
+
+    <MainFrame>
+      <Box>
+        <HStack
+          w={"100%"}
+          justifyContent={"space-between"}
+          mb={4}
+          py={0}
+          px={3}
+        >
+          <Text as={"span"} fontSize={"sm"} fontWeight={500} color={"#000"}>
+          Agency Master
+          </Text>
+
+          <HStack mr={5}>
+            <InputGroup marginRight={"1rem"}
+              startElement={
+                <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
+              }
+              color={"#000"}
+            >
+              <Input
+                p={3}
+                w={300}
+                bg={"#fff"}
+                colorPalette={"blue"}
+                _focus={{ border: "1px solid #02A0A0" }}
+                rounded={"md"}
+                size={"2xs"}
+                fontSize={"2sm"}
+                placeholder="Search..."
+                bgColor={'#EEEEEE'}
+                ps={8}
+              />
+            </InputGroup>
+            {/* <Button bgColor={'#EEEEEE'} pl={3} pr={3}><IoMdAdd /> <Text>Add</Text></Button> */}
+            <ViewAgencyAddModel />
+          </HStack>
+        </HStack>
+        <DataTable
+          sortableColumns={["Name", "Registration Date "]}
+          tableHeadRow={tableHeadRow}
+          data={managepost}
+        />
+      </Box>       
+    </MainFrame>
+  )
+}
+export default AgencyMaster
\ No newline at end of file
diff --git a/src/Pages/MasterModule/AgencyMaster/EditAgencyMaster.tsx b/src/Pages/MasterModule/AgencyMaster/EditAgencyMaster.tsx
new file mode 100644
index 0000000..841a1ed
--- /dev/null
+++ b/src/Pages/MasterModule/AgencyMaster/EditAgencyMaster.tsx
@@ -0,0 +1,75 @@
+import { FaRegEdit } from "react-icons/fa"
+import { Button } from "../../../components/ui/button"
+import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
+import { Field, Input, Stack, } from "@chakra-ui/react"
+
+
+function EditAgencyMaster() {
+    return (
+
+
+        <DialogRoot placement="center">
+            <DialogTrigger asChild>
+                <Button bg={"transparent"} size="sm">
+                    <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
+                </Button>
+            </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">Edit</DialogTitle>
+                </DialogHeader>
+
+                <DialogBody bg="white">
+                    <Stack py={3}>
+                    <Field.Root>
+                            <Field.Label color="black" pt={1} fontSize="12px">Agency name</Field.Label>
+                            <Input value="Lorem Ipsum" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
+
+                            <Field.Label color="black" pt={1} fontSize="12px">RC No.</Field.Label>
+                            <Input value="Lorem Ipsum" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
+
+                            <Field.Label color="black" pt={1} fontSize="12px">State</Field.Label>
+                            <Input value="Lorem Ipsum" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
+
+                            <Field.Label color="black" pt={1} fontSize="12px">Registered Office Address</Field.Label>
+                            <Input value="Active" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
+                            
+                            <Field.Label color="black" pt={1} fontSize="12px">Website/Domain</Field.Label>
+                            <Input value="Lorem Ipsum" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
+
+                            <Field.Label color="black" pt={1} fontSize="12px">GST no.</Field.Label>
+                            <Input value="Lorem Ipsum" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
+                            
+                            <Field.Label color="black" pt={1} fontSize="12px">Action</Field.Label>
+                            <Input value="Lorem Ipsum" 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>
+        </DialogRoot>
+
+
+    )
+}
+
+export default EditAgencyMaster
\ No newline at end of file
diff --git a/src/Pages/MasterModule/AgencyMaster/ViewAgencyAddModel.tsx b/src/Pages/MasterModule/AgencyMaster/ViewAgencyAddModel.tsx
new file mode 100644
index 0000000..d17c6ef
--- /dev/null
+++ b/src/Pages/MasterModule/AgencyMaster/ViewAgencyAddModel.tsx
@@ -0,0 +1,76 @@
+import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
+import { Field, Input, Stack, Text, Textarea } from "@chakra-ui/react"
+import { IoMdAdd } from "react-icons/io"
+import { Button } from "../../../components/ui/button"
+
+function ViewAgencyAddModel() {
+    return (
+
+        <DialogRoot placement="center">
+            <DialogTrigger asChild>
+                {/* <Button bg={"transparent"} size="sm">
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
+                </Button> */}
+                <Button  px={5} size={"xs"} bg={"#02A0A0"}>
+                    <IoMdAdd   /> <Text >Add</Text>
+                </Button>
+
+            </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</DialogTitle>
+                </DialogHeader>
+
+                <DialogBody bg="white">
+                    <Stack py={3}>
+
+                        <Field.Root>
+                            <Field.Label color="black" pt={1} fontSize="12px">Agency Name</Field.Label>
+                            <Input placeholder="" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
+
+                            <Field.Label color="black" pt={1} fontSize="12px">RC No.</Field.Label>
+                            <Input placeholder="" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
+
+                            <Field.Label color="black" pt={1} fontSize="12px">State</Field.Label>
+                            <Input placeholder="" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
+
+                            <Field.Label color="black" pt={1} fontSize="12px">Registered Office Address</Field.Label>
+                            <Input placeholder="" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
+                            
+                            <Field.Label color="black" pt={1} fontSize="12px">Website/Domain</Field.Label>
+                            <Input placeholder="" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
+
+                            <Field.Label color="black" pt={1} fontSize="12px">GST no.</Field.Label>
+                            <Input placeholder="" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
+                            
+                            <Field.Label color="black" pt={1} fontSize="12px">Action</Field.Label>
+                            <Input placeholder="" 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"}>
+                        Save
+                    </Button>
+                </DialogFooter>
+
+                <DialogCloseTrigger color="black" />
+            </DialogContent>
+        </DialogRoot >
+
+    )
+}
+
+export default ViewAgencyAddModel
\ No newline at end of file
diff --git a/src/Pages/MasterModule/AgencyMaster/ViewAgencyMaster.tsx b/src/Pages/MasterModule/AgencyMaster/ViewAgencyMaster.tsx
new file mode 100644
index 0000000..2c5a6f0
--- /dev/null
+++ b/src/Pages/MasterModule/AgencyMaster/ViewAgencyMaster.tsx
@@ -0,0 +1,75 @@
+import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
+import { Field, Input, Stack, } from "@chakra-ui/react"
+import { MdOutlineRemoveRedEye } from "react-icons/md"
+import { Button } from "../../../components/ui/button"
+
+
+function ViewAgencyMaster() {
+    return (
+
+
+        <DialogRoot placement="center">
+            <DialogTrigger asChild>
+                <Button bg={"transparent"} size="sm">
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
+                </Button>
+            </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</DialogTitle>
+                </DialogHeader>
+
+                <DialogBody bg="white">
+                    <Stack py={3}>
+                    <Field.Root>
+                            <Field.Label color="black" pt={1} fontSize="12px">Agency name</Field.Label>
+                            <Input value="Lorem Ipsum" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
+
+                            <Field.Label color="black" pt={1} fontSize="12px">RC No.</Field.Label>
+                            <Input value="Lorem Ipsum" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
+
+                            <Field.Label color="black" pt={1} fontSize="12px">State</Field.Label>
+                            <Input value="Lorem Ipsum" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
+
+                            <Field.Label color="black" pt={1} fontSize="12px">Registered Office Address</Field.Label>
+                            <Input value="Active" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
+                            
+                            <Field.Label color="black" pt={1} fontSize="12px">Website/Domain</Field.Label>
+                            <Input value="Lorem Ipsum" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
+
+                            <Field.Label color="black" pt={1} fontSize="12px">GST no.</Field.Label>
+                            <Input value="Lorem Ipsum" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
+                            
+                            <Field.Label color="black" pt={1} fontSize="12px">Action</Field.Label>
+                            <Input value="Lorem Ipsum" 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>
+        </DialogRoot>
+
+
+    )
+}
+
+export default ViewAgencyMaster
\ No newline at end of file
diff --git a/src/Pages/MasterModule/Country/Country.tsx b/src/Pages/MasterModule/Country/Country.tsx
index 71676e1..d1b3d00 100644
--- a/src/Pages/MasterModule/Country/Country.tsx
+++ b/src/Pages/MasterModule/Country/Country.tsx
@@ -1,12 +1,86 @@
+import { Box, HStack, Image, Input, Text } from "@chakra-ui/react";
 import MainFrame from "../../../components/MainFrame"
+import { InputGroup } from "../../../components/ui/input-group";
+import { LuSearch } from "react-icons/lu";
+import DataTable from "../../../components/DataTable";
+import { Switch } from "../../../components/ui/switch";
+import CountryAddModel from "./CountryAddModel";
+import EditCountryModel from "./EditCountryModel";
 
 
+
+// table data
+
+const tableHeadRow = [
+  "Sr. No",
+  "Title",
+  "Action"
+  
+];
+
+const managepost: any[] = [
+  ...Array.from({ length: 12 }, (_, i) => ({
+    "Sr. No": i + 1,
+    "Title": "Lorem Ipsum",
+    "Action": (
+      <HStack justifyContent="center">
+        <EditCountryModel />
+        <Box>
+          <Switch colorPalette={'teal'} size={"xs"}/>
+        </Box>
+      </HStack>
+    ),
+  })),
+];
+
 const Country = () => {
-    return (
-      
-      <MainFrame>
-         Country
-      </MainFrame>
-    )
-  }
-  export default Country
\ No newline at end of file
+  return (
+
+    <MainFrame>
+      <Box>
+        <HStack
+          w={"100%"}
+          justifyContent={"space-between"}
+          mb={4}
+          py={0}
+          px={3}
+        >
+          <Text as={"span"} fontSize={"sm"} fontWeight={500} color={"#000"}>
+          Country
+          </Text>
+
+          <HStack mr={5}>
+            <InputGroup marginRight={"1rem"}
+              startElement={
+                <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
+              }
+              color={"#000"}
+            >
+              <Input
+                p={3}
+                w={300}
+                bg={"#fff"}
+                colorPalette={"blue"}
+                _focus={{ border: "1px solid #02A0A0" }}
+                rounded={"md"}
+                size={"2xs"}
+                fontSize={"2sm"}
+                placeholder="Search..."
+                bgColor={'#EEEEEE'}
+                ps={8}
+              />
+            </InputGroup>
+            {/* <Button bgColor={'#EEEEEE'} pl={3} pr={3}><IoMdAdd /> <Text>Add</Text></Button> */}
+            <CountryAddModel />
+          </HStack>
+        </HStack>
+        <DataTable
+          sortableColumns={["Name", "Registration Date "]}
+          tableHeadRow={tableHeadRow}
+          data={managepost}
+        />
+      </Box>       
+    </MainFrame>
+  )
+}
+export default Country
\ No newline at end of file
diff --git a/src/Pages/MasterModule/Country/CountryAddModel.tsx b/src/Pages/MasterModule/Country/CountryAddModel.tsx
new file mode 100644
index 0000000..f2e2ec9
--- /dev/null
+++ b/src/Pages/MasterModule/Country/CountryAddModel.tsx
@@ -0,0 +1,58 @@
+import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
+import { Box, Field, IconButton, Input, Stack, Text, Textarea } from "@chakra-ui/react"
+import { IoMdAdd } from "react-icons/io"
+import { Button } from "../../../components/ui/button"
+
+function CountryAddModel() {
+   
+    return (
+
+        <DialogRoot placement="center">
+            <DialogTrigger asChild>
+                {/* <Button bg={"transparent"} size="sm">
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
+                </Button> */}
+                <Button  px={5} size={"xs"} bg={"#02A0A0"}>
+                    <IoMdAdd /> <Text>Add</Text>
+                </Button>
+
+            </DialogTrigger>
+
+            <DialogContent
+                 bg={"#fff"}
+                 // w={{ lg: "60%", md: "230px" }}
+                 w={{ base: '90%', md: '400px' }}
+                height={'auto'}
+                 
+                 overflowX="hidden" 
+                 p={3} // Reduced padding
+                 bgSize={'md'}
+            >
+                <DialogHeader bg="white" >
+                    <DialogTitle alignSelf="center" color="black" fontSize="14px">Add</DialogTitle>
+                </DialogHeader>
+
+                <DialogBody bg="white">
+                    <Stack py={3}>
+
+                        <Field.Root>
+                            <Field.Label color="black" pt={1} fontSize="12px">Country</Field.Label>
+                            <Input placeholder="" 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"}>
+                        Save
+                    </Button>
+                </DialogFooter>
+
+                <DialogCloseTrigger color="black" />
+            </DialogContent>
+        </DialogRoot >
+
+    )
+}
+
+export default CountryAddModel
\ No newline at end of file
diff --git a/src/Pages/MasterModule/Country/EditCountryModel.tsx b/src/Pages/MasterModule/Country/EditCountryModel.tsx
new file mode 100644
index 0000000..c9da0c4
--- /dev/null
+++ b/src/Pages/MasterModule/Country/EditCountryModel.tsx
@@ -0,0 +1,61 @@
+import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
+import { Box, Field, IconButton, Input, Stack, Text, Textarea } from "@chakra-ui/react"
+import { Button } from "../../../components/ui/button"
+import { FaRegEdit } from "react-icons/fa";
+
+
+function EditCountryModel() {
+
+
+   
+    return (
+
+        <DialogRoot placement="center">
+            <DialogTrigger asChild>
+                {/* <Button bg={"transparent"} size="sm">
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
+                </Button> */}
+                <Button bg={"transparent"} size="sm">
+                 <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
+                </Button>
+
+            </DialogTrigger>
+
+            <DialogContent
+                 bg={"#fff"}
+                 // w={{ lg: "60%", md: "230px" }}
+                 w={{ base: '90%', md: '400px' }}
+                height={'auto'}
+                 
+                 overflowX="hidden" 
+                 p={3} // Reduced padding
+                 bgSize={'md'}
+            >
+                <DialogHeader bg="white" >
+                    <DialogTitle alignSelf="center" color="black" fontSize="14px">Edit</DialogTitle>
+                </DialogHeader>
+
+                <DialogBody bg="white">
+                    <Stack py={3}>
+
+                        <Field.Root>
+                            <Field.Label color="black" pt={1} fontSize="12px">Country</Field.Label>
+                            <Input value="Lorem Ipsum" 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"}>
+                        Save
+                    </Button>
+                </DialogFooter>
+
+                <DialogCloseTrigger color="black" />
+            </DialogContent>
+        </DialogRoot >
+
+    )
+}
+
+export default EditCountryModel
\ No newline at end of file
diff --git a/src/Pages/MasterModule/JobStatus/EditJobStatusModel.tsx b/src/Pages/MasterModule/JobStatus/EditJobStatusModel.tsx
new file mode 100644
index 0000000..5b0e081
--- /dev/null
+++ b/src/Pages/MasterModule/JobStatus/EditJobStatusModel.tsx
@@ -0,0 +1,61 @@
+import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
+import { Box, Field, IconButton, Input, Stack, Text, Textarea } from "@chakra-ui/react"
+import { Button } from "../../../components/ui/button"
+import { FaRegEdit } from "react-icons/fa";
+
+
+function EditJobStatusModel() {
+
+
+   
+    return (
+
+        <DialogRoot placement="center">
+            <DialogTrigger asChild>
+                {/* <Button bg={"transparent"} size="sm">
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
+                </Button> */}
+                <Button bg={"transparent"} size="sm">
+                 <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
+                </Button>
+
+            </DialogTrigger>
+
+            <DialogContent
+                 bg={"#fff"}
+                 // w={{ lg: "60%", md: "230px" }}
+                 w={{ base: '90%', md: '400px' }}
+                height={'auto'}
+                 
+                 overflowX="hidden" 
+                 p={3} // Reduced padding
+                 bgSize={'md'}
+            >
+                <DialogHeader bg="white" >
+                    <DialogTitle alignSelf="center" color="black" fontSize="14px">Edit</DialogTitle>
+                </DialogHeader>
+
+                <DialogBody bg="white">
+                    <Stack py={3}>
+
+                        <Field.Root>
+                            <Field.Label color="black" pt={1} fontSize="12px">Job Status</Field.Label>
+                            <Input value="Lorem Ipsum" 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"}>
+                        Save
+                    </Button>
+                </DialogFooter>
+
+                <DialogCloseTrigger color="black" />
+            </DialogContent>
+        </DialogRoot >
+
+    )
+}
+
+export default EditJobStatusModel
\ No newline at end of file
diff --git a/src/Pages/MasterModule/JobStatus/JobStatus.tsx b/src/Pages/MasterModule/JobStatus/JobStatus.tsx
index 8a7e6ed..95d83ff 100644
--- a/src/Pages/MasterModule/JobStatus/JobStatus.tsx
+++ b/src/Pages/MasterModule/JobStatus/JobStatus.tsx
@@ -1,12 +1,86 @@
+import { Box, HStack, Image, Input, Text } from "@chakra-ui/react";
 import MainFrame from "../../../components/MainFrame"
+import { InputGroup } from "../../../components/ui/input-group";
+import { LuSearch } from "react-icons/lu";
+import DataTable from "../../../components/DataTable";
+import { Switch } from "../../../components/ui/switch";
+import JobStatusAddModel from "./JobStatusAddModel";
+import EditJobStatusModel from "./EditJobStatusModel";
 
 
+
+// table data
+
+const tableHeadRow = [
+  "Sr. No",
+  "Title",
+  "Action"
+  
+];
+
+const managepost: any[] = [
+  ...Array.from({ length: 12 }, (_, i) => ({
+    "Sr. No": i + 1,
+    "Title": "Lorem Ipsum",
+    "Action": (
+      <HStack justifyContent="center">
+        <EditJobStatusModel />
+        <Box>
+          <Switch colorPalette={'teal'} size={"xs"}/>
+        </Box>
+      </HStack>
+    ),
+  })),
+];
+
 const JobStatus = () => {
-    return (
-      
-      <MainFrame>
-         JobStatus
-      </MainFrame>
-    )
-  }
-  export default JobStatus
\ No newline at end of file
+  return (
+
+    <MainFrame>
+      <Box>
+        <HStack
+          w={"100%"}
+          justifyContent={"space-between"}
+          mb={4}
+          py={0}
+          px={3}
+        >
+          <Text as={"span"} fontSize={"sm"} fontWeight={500} color={"#000"}>
+          Job Status
+          </Text>
+
+          <HStack mr={5}>
+            <InputGroup marginRight={"1rem"}
+              startElement={
+                <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
+              }
+              color={"#000"}
+            >
+              <Input
+                p={3}
+                w={300}
+                bg={"#fff"}
+                colorPalette={"blue"}
+                _focus={{ border: "1px solid #02A0A0" }}
+                rounded={"md"}
+                size={"2xs"}
+                fontSize={"2sm"}
+                placeholder="Search..."
+                bgColor={'#EEEEEE'}
+                ps={8}
+              />
+            </InputGroup>
+            {/* <Button bgColor={'#EEEEEE'} pl={3} pr={3}><IoMdAdd /> <Text>Add</Text></Button> */}
+            <JobStatusAddModel />
+          </HStack>
+        </HStack>
+        <DataTable
+          sortableColumns={["Name", "Registration Date "]}
+          tableHeadRow={tableHeadRow}
+          data={managepost}
+        />
+      </Box>       
+    </MainFrame>
+  )
+}
+export default JobStatus
\ No newline at end of file
diff --git a/src/Pages/MasterModule/JobStatus/JobStatusAddModel.tsx b/src/Pages/MasterModule/JobStatus/JobStatusAddModel.tsx
new file mode 100644
index 0000000..801e297
--- /dev/null
+++ b/src/Pages/MasterModule/JobStatus/JobStatusAddModel.tsx
@@ -0,0 +1,58 @@
+import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
+import { Box, Field, IconButton, Input, Stack, Text, Textarea } from "@chakra-ui/react"
+import { IoMdAdd } from "react-icons/io"
+import { Button } from "../../../components/ui/button"
+
+function JobStatusAddModel() {
+   
+    return (
+
+        <DialogRoot placement="center">
+            <DialogTrigger asChild>
+                {/* <Button bg={"transparent"} size="sm">
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
+                </Button> */}
+                <Button  px={5} size={"xs"} bg={"#02A0A0"}>
+                    <IoMdAdd /> <Text>Add</Text>
+                </Button>
+
+            </DialogTrigger>
+
+            <DialogContent
+                 bg={"#fff"}
+                 // w={{ lg: "60%", md: "230px" }}
+                 w={{ base: '90%', md: '400px' }}
+                height={'auto'}
+                 
+                 overflowX="hidden" 
+                 p={3} // Reduced padding
+                 bgSize={'md'}
+            >
+                <DialogHeader bg="white" >
+                    <DialogTitle alignSelf="center" color="black" fontSize="14px">Add</DialogTitle>
+                </DialogHeader>
+
+                <DialogBody bg="white">
+                    <Stack py={3}>
+
+                        <Field.Root>
+                            <Field.Label color="black" pt={1} fontSize="12px">Job Status</Field.Label>
+                            <Input placeholder="" 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"}>
+                        Save
+                    </Button>
+                </DialogFooter>
+
+                <DialogCloseTrigger color="black" />
+            </DialogContent>
+        </DialogRoot >
+
+    )
+}
+
+export default JobStatusAddModel
\ No newline at end of file
diff --git a/src/Pages/MasterModule/JobType/EditJobModel.tsx b/src/Pages/MasterModule/JobType/EditJobModel.tsx
new file mode 100644
index 0000000..6a8021c
--- /dev/null
+++ b/src/Pages/MasterModule/JobType/EditJobModel.tsx
@@ -0,0 +1,62 @@
+import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
+import { Box, Field, IconButton, Input, Stack, Text, Textarea } from "@chakra-ui/react"
+import { Button } from "../../../components/ui/button"
+import { FiUpload } from "react-icons/fi";
+import { FaRegEdit } from "react-icons/fa";
+
+
+function EditJobeModel() {
+
+
+   
+    return (
+
+        <DialogRoot placement="center">
+            <DialogTrigger asChild>
+                {/* <Button bg={"transparent"} size="sm">
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
+                </Button> */}
+                <Button bg={"transparent"} size="sm">
+                 <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
+                </Button>
+
+            </DialogTrigger>
+
+            <DialogContent
+                 bg={"#fff"}
+                 // w={{ lg: "60%", md: "230px" }}
+                 w={{ base: '90%', md: '400px' }}
+                height={'auto'}
+                 
+                 overflowX="hidden" 
+                 p={3} // Reduced padding
+                 bgSize={'md'}
+            >
+                <DialogHeader bg="white" >
+                    <DialogTitle alignSelf="center" color="black" fontSize="14px">Edit</DialogTitle>
+                </DialogHeader>
+
+                <DialogBody bg="white">
+                    <Stack py={3}>
+
+                        <Field.Root>
+                            <Field.Label color="black" pt={1} fontSize="12px">Job Type</Field.Label>
+                            <Input value="Lorem Ipsum" 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"}>
+                        Save
+                    </Button>
+                </DialogFooter>
+
+                <DialogCloseTrigger color="black" />
+            </DialogContent>
+        </DialogRoot >
+
+    )
+}
+
+export default EditJobeModel
\ No newline at end of file
diff --git a/src/Pages/MasterModule/JobType/JobAddModel.tsx b/src/Pages/MasterModule/JobType/JobAddModel.tsx
new file mode 100644
index 0000000..15c9477
--- /dev/null
+++ b/src/Pages/MasterModule/JobType/JobAddModel.tsx
@@ -0,0 +1,58 @@
+import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
+import { Box, Field, IconButton, Input, Stack, Text, Textarea } from "@chakra-ui/react"
+import { IoMdAdd } from "react-icons/io"
+import { Button } from "../../../components/ui/button"
+
+function JobAddModel() {
+   
+    return (
+
+        <DialogRoot placement="center">
+            <DialogTrigger asChild>
+                {/* <Button bg={"transparent"} size="sm">
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
+                </Button> */}
+                <Button  px={5} size={"xs"} bg={"#02A0A0"}>
+                    <IoMdAdd /> <Text>Add</Text>
+                </Button>
+
+            </DialogTrigger>
+
+            <DialogContent
+                 bg={"#fff"}
+                 // w={{ lg: "60%", md: "230px" }}
+                 w={{ base: '90%', md: '400px' }}
+                height={'auto'}
+                 
+                 overflowX="hidden" 
+                 p={3} // Reduced padding
+                 bgSize={'md'}
+            >
+                <DialogHeader bg="white" >
+                    <DialogTitle alignSelf="center" color="black" fontSize="14px">Add</DialogTitle>
+                </DialogHeader>
+
+                <DialogBody bg="white">
+                    <Stack py={3}>
+
+                        <Field.Root>
+                            <Field.Label color="black" pt={1} fontSize="12px">Job Type</Field.Label>
+                            <Input placeholder="" 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"}>
+                        Save
+                    </Button>
+                </DialogFooter>
+
+                <DialogCloseTrigger color="black" />
+            </DialogContent>
+        </DialogRoot >
+
+    )
+}
+
+export default JobAddModel
\ No newline at end of file
diff --git a/src/Pages/MasterModule/JobType/JobType.tsx b/src/Pages/MasterModule/JobType/JobType.tsx
index d134f83..ba43fba 100644
--- a/src/Pages/MasterModule/JobType/JobType.tsx
+++ b/src/Pages/MasterModule/JobType/JobType.tsx
@@ -1,12 +1,86 @@
+import { Box, HStack, Image, Input, Text } from "@chakra-ui/react";
 import MainFrame from "../../../components/MainFrame"
+import { InputGroup } from "../../../components/ui/input-group";
+import { LuSearch } from "react-icons/lu";
+import DataTable from "../../../components/DataTable";
+import { Switch } from "../../../components/ui/switch";
+import JobAddModel from "./JobAddModel";
+import EditJobeModel from "./EditJobModel";
 
 
+
+// table data
+
+const tableHeadRow = [
+  "Sr. No",
+  "Title",
+  "Action"
+  
+];
+
+const managepost: any[] = [
+  ...Array.from({ length: 12 }, (_, i) => ({
+    "Sr. No": i + 1,
+    "Title": "Lorem Ipsum",
+    "Action": (
+      <HStack justifyContent="center">
+        <EditJobeModel />
+        <Box>
+          <Switch colorPalette={'teal'} size={"xs"}/>
+        </Box>
+      </HStack>
+    ),
+  })),
+];
+
 const JobType = () => {
-    return (
-      
-      <MainFrame>
-         JobType
-      </MainFrame>
-    )
-  }
-  export default JobType
\ No newline at end of file
+  return (
+
+    <MainFrame>
+      <Box>
+        <HStack
+          w={"100%"}
+          justifyContent={"space-between"}
+          mb={4}
+          py={0}
+          px={3}
+        >
+          <Text as={"span"} fontSize={"sm"} fontWeight={500} color={"#000"}>
+          Job Type
+          </Text>
+
+          <HStack mr={5}>
+            <InputGroup marginRight={"1rem"}
+              startElement={
+                <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
+              }
+              color={"#000"}
+            >
+              <Input
+                p={3}
+                w={300}
+                bg={"#fff"}
+                colorPalette={"blue"}
+                _focus={{ border: "1px solid #02A0A0" }}
+                rounded={"md"}
+                size={"2xs"}
+                fontSize={"2sm"}
+                placeholder="Search..."
+                bgColor={'#EEEEEE'}
+                ps={8}
+              />
+            </InputGroup>
+            {/* <Button bgColor={'#EEEEEE'} pl={3} pr={3}><IoMdAdd /> <Text>Add</Text></Button> */}
+            <JobAddModel />
+          </HStack>
+        </HStack>
+        <DataTable
+          sortableColumns={["Name", "Registration Date "]}
+          tableHeadRow={tableHeadRow}
+          data={managepost}
+        />
+      </Box>       
+    </MainFrame>
+  )
+}
+export default JobType
\ No newline at end of file
diff --git a/src/Pages/MasterModule/TemplateMaster/EditTemplateModel.tsx b/src/Pages/MasterModule/TemplateMaster/EditTemplateModel.tsx
new file mode 100644
index 0000000..7e508c3
--- /dev/null
+++ b/src/Pages/MasterModule/TemplateMaster/EditTemplateModel.tsx
@@ -0,0 +1,100 @@
+import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
+import { Box, Field, IconButton, Input, Stack, Text, Textarea } from "@chakra-ui/react"
+import { Button } from "../../../components/ui/button"
+import { FiUpload } from "react-icons/fi";
+import { useState } from "react";
+import { FaRegEdit } from "react-icons/fa";
+
+
+function EditTemplateModel() {
+
+    const [images, setImages] = useState<string[]>([]);
+
+    const handleImageChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+      if (event.target.files) {
+        const selectedFiles = Array.from(event.target.files);
+  
+        const newImages = selectedFiles.map((file) => {
+          return URL.createObjectURL(file); // Convert to preview URL
+        });
+  
+        setImages((prevImages) => [...prevImages, ...newImages]); // Append new images
+      }
+    };
+
+   
+    return (
+
+        <DialogRoot placement="center">
+            <DialogTrigger asChild>
+                {/* <Button bg={"transparent"} size="sm">
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
+                </Button> */}
+                <Button bg={"transparent"} size="sm">
+                 <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
+                </Button>
+
+            </DialogTrigger>
+
+            <DialogContent
+                 bg={"#fff"}
+                 // w={{ lg: "60%", md: "230px" }}
+                 w={{ base: '90%', md: '400px' }}
+                height={'auto'}
+                 
+                 overflowX="hidden" 
+                 p={3} // Reduced padding
+                 bgSize={'md'}
+            >
+                <DialogHeader bg="white" >
+                    <DialogTitle alignSelf="center" color="black" fontSize="14px">Add</DialogTitle>
+                </DialogHeader>
+
+                <DialogBody bg="white">
+                    <Stack py={3}>
+
+                        <Field.Root>
+                            <Field.Label color="black" pt={1} fontSize="12px">Template Name</Field.Label>
+                            <Input placeholder="" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
+
+                            
+                            <Field.Label color="black" pt={1} fontSize="12px">Images</Field.Label>
+                            <Box display="flex" alignItems="center" justifyContent="space-between" px={3} bgColor="#EEEEEE" border="none" width="100%"  height="50px" cursor="pointer"  position="relative">
+                            <Input type="file" accept="image/*" opacity={0} position="absolute" bgColor="#EEEEEE" border="none" pl={1} width="100%" height="100%"  cursor="pointer" onChange={handleImageChange}/>
+                            <Box display="flex" gap={2} overflow="hidden">
+                                {images.length > 0 ? (
+                                images.map((img, index) => (
+                                    <img
+                                    key={index}
+                                    src={img}
+                                    alt={`Uploaded ${index}`}
+                                    style={{ maxHeight: "40px", maxWidth: "70px", objectFit: "contain" }}
+                                    />
+                                ))
+                                ) : (
+                                <Box width="70px" height="40px" /> // Placeholder to maintain layout
+                                )}
+                            </Box>
+                              <FiUpload color="#000" />
+                            </Box>
+                           
+                            {/* <Input placeholder="" 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"}>
+                        Save
+                    </Button>
+                </DialogFooter>
+
+                <DialogCloseTrigger color="black" />
+            </DialogContent>
+        </DialogRoot >
+
+    )
+}
+
+export default EditTemplateModel
\ No newline at end of file
diff --git a/src/Pages/MasterModule/TemplateMaster/TemplateAddModel.tsx b/src/Pages/MasterModule/TemplateMaster/TemplateAddModel.tsx
new file mode 100644
index 0000000..4dbc121
--- /dev/null
+++ b/src/Pages/MasterModule/TemplateMaster/TemplateAddModel.tsx
@@ -0,0 +1,100 @@
+import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
+import { Box, Field, IconButton, Input, Stack, Text, Textarea } from "@chakra-ui/react"
+import { IoMdAdd } from "react-icons/io"
+import { Button } from "../../../components/ui/button"
+import { FiUpload } from "react-icons/fi";
+import { useState } from "react";
+
+
+function TemplateAddModel() {
+
+    const [images, setImages] = useState<string[]>([]);
+
+    const handleImageChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+      if (event.target.files) {
+        const selectedFiles = Array.from(event.target.files);
+  
+        const newImages = selectedFiles.map((file) => {
+          return URL.createObjectURL(file); // Convert to preview URL
+        });
+  
+        setImages((prevImages) => [...prevImages, ...newImages]); // Append new images
+      }
+    };
+
+   
+    return (
+
+        <DialogRoot placement="center">
+            <DialogTrigger asChild>
+                {/* <Button bg={"transparent"} size="sm">
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
+                </Button> */}
+                <Button  px={5} size={"xs"} bg={"#02A0A0"}>
+                    <IoMdAdd /> <Text>Add</Text>
+                </Button>
+
+            </DialogTrigger>
+
+            <DialogContent
+                 bg={"#fff"}
+                 // w={{ lg: "60%", md: "230px" }}
+                 w={{ base: '90%', md: '400px' }}
+                height={'auto'}
+                 
+                 overflowX="hidden" 
+                 p={3} // Reduced padding
+                 bgSize={'md'}
+            >
+                <DialogHeader bg="white" >
+                    <DialogTitle alignSelf="center" color="black" fontSize="14px">Add</DialogTitle>
+                </DialogHeader>
+
+                <DialogBody bg="white">
+                    <Stack py={3}>
+
+                        <Field.Root>
+                            <Field.Label color="black" pt={1} fontSize="12px">Template Name</Field.Label>
+                            <Input placeholder="" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
+
+                            
+                            <Field.Label color="black" pt={1} fontSize="12px">Images</Field.Label>
+                            <Box display="flex" alignItems="center" justifyContent="space-between" px={3} bgColor="#EEEEEE" border="none" width="100%"  height="50px" cursor="pointer"  position="relative">
+                            <Input type="file" accept="image/*" opacity={0} position="absolute" bgColor="#EEEEEE" border="none" pl={1} width="100%" height="100%"  cursor="pointer" onChange={handleImageChange}/>
+                            <Box display="flex" gap={2} overflow="hidden">
+                                {images.length > 0 ? (
+                                images.map((img, index) => (
+                                    <img
+                                    key={index}
+                                    src={img}
+                                    alt={`Uploaded ${index}`}
+                                    style={{ maxHeight: "40px", maxWidth: "70px", objectFit: "contain" }}
+                                    />
+                                ))
+                                ) : (
+                                <Box width="70px" height="40px" /> // Placeholder to maintain layout
+                                )}
+                            </Box>
+                              <FiUpload color="#000" />
+                            </Box>
+                           
+                            {/* <Input placeholder="" 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"}>
+                        Save
+                    </Button>
+                </DialogFooter>
+
+                <DialogCloseTrigger color="black" />
+            </DialogContent>
+        </DialogRoot >
+
+    )
+}
+
+export default TemplateAddModel
\ No newline at end of file
diff --git a/src/Pages/MasterModule/TemplateMaster/TemplateMaster.tsx b/src/Pages/MasterModule/TemplateMaster/TemplateMaster.tsx
index a10c785..7764629 100644
--- a/src/Pages/MasterModule/TemplateMaster/TemplateMaster.tsx
+++ b/src/Pages/MasterModule/TemplateMaster/TemplateMaster.tsx
@@ -1,12 +1,99 @@
+import { Box, HStack, Image, Input, Text } from "@chakra-ui/react";
 import MainFrame from "../../../components/MainFrame"
+import { InputGroup } from "../../../components/ui/input-group";
+import { LuSearch } from "react-icons/lu";
+import DataTable from "../../../components/DataTable";
+import { Switch } from "../../../components/ui/switch";
+import img from "../../../assets/waterfall.jpg"
+import Templateimg from "../../../assets/Template_img.png"
+import TemplateAddModel from "./TemplateAddModel";
+import EditTemplateModel from "./EditTemplateModel";
 
 
+
+// table data
+
+const tableHeadRow = [
+  "Sr. No",
+  "Title",
+  "Images",
+  "Action"
+  
+];
+
+const managepost: any[] = [
+  ...Array.from({ length: 12 }, (_, i) => ({
+    "Sr. No": i + 1,
+    "Title": "Lorem Ipsum",
+    "Images": (
+      // <Image w={50} src={img} />
+      <HStack >
+      <Image w={100} h={50} src={img} />
+      <Image w={100} h={50} src={Templateimg} />
+      </HStack>
+
+
+    ),
+    
+    "Action": (
+      <HStack justifyContent="center">
+        <EditTemplateModel />
+        <Box>
+          <Switch colorPalette={'teal'} size={"xs"}/>
+        </Box>
+      </HStack>
+    ),
+  })),
+];
+
 const TemplateMaster = () => {
-    return (
-      
-      <MainFrame>
-         TemplateMaster
-      </MainFrame>
-    )
-  }
-  export default TemplateMaster
\ No newline at end of file
+  return (
+
+    <MainFrame>
+      <Box>
+        <HStack
+          w={"100%"}
+          justifyContent={"space-between"}
+          mb={4}
+          py={0}
+          px={3}
+        >
+          <Text as={"span"} fontSize={"sm"} fontWeight={500} color={"#000"}>
+          Template Master
+          </Text>
+
+          <HStack mr={5}>
+            <InputGroup marginRight={"1rem"}
+              startElement={
+                <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
+              }
+              color={"#000"}
+            >
+              <Input
+                p={3}
+                w={300}
+                bg={"#fff"}
+                colorPalette={"blue"}
+                _focus={{ border: "1px solid #02A0A0" }}
+                rounded={"md"}
+                size={"2xs"}
+                fontSize={"2sm"}
+                placeholder="Search..."
+                bgColor={'#EEEEEE'}
+                ps={8}
+              />
+            </InputGroup>
+            {/* <Button bgColor={'#EEEEEE'} pl={3} pr={3}><IoMdAdd /> <Text>Add</Text></Button> */}
+            <TemplateAddModel />
+          </HStack>
+        </HStack>
+        <DataTable
+          sortableColumns={["Name", "Registration Date "]}
+          tableHeadRow={tableHeadRow}
+          data={managepost}
+        />
+      </Box>       
+    </MainFrame>
+  )
+}
+export default TemplateMaster
\ No newline at end of file
diff --git a/src/Pages/MasterModule/WorkspaceMode/EditWorkModel.tsx b/src/Pages/MasterModule/WorkspaceMode/EditWorkModel.tsx
new file mode 100644
index 0000000..b4fcde9
--- /dev/null
+++ b/src/Pages/MasterModule/WorkspaceMode/EditWorkModel.tsx
@@ -0,0 +1,61 @@
+import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
+import { Box, Field, IconButton, Input, Stack, Text, Textarea } from "@chakra-ui/react"
+import { Button } from "../../../components/ui/button"
+import { FaRegEdit } from "react-icons/fa";
+
+
+function EditWorkModel() {
+
+
+   
+    return (
+
+        <DialogRoot placement="center">
+            <DialogTrigger asChild>
+                {/* <Button bg={"transparent"} size="sm">
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
+                </Button> */}
+                <Button bg={"transparent"} size="sm">
+                 <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
+                </Button>
+
+            </DialogTrigger>
+
+            <DialogContent
+                 bg={"#fff"}
+                 // w={{ lg: "60%", md: "230px" }}
+                 w={{ base: '90%', md: '400px' }}
+                height={'auto'}
+                 
+                 overflowX="hidden" 
+                 p={3} // Reduced padding
+                 bgSize={'md'}
+            >
+                <DialogHeader bg="white" >
+                    <DialogTitle alignSelf="center" color="black" fontSize="14px">Edit</DialogTitle>
+                </DialogHeader>
+
+                <DialogBody bg="white">
+                    <Stack py={3}>
+
+                        <Field.Root>
+                            <Field.Label color="black" pt={1} fontSize="12px">Workspace Mode</Field.Label>
+                            <Input value="Lorem Ipsum" 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"}>
+                        Save
+                    </Button>
+                </DialogFooter>
+
+                <DialogCloseTrigger color="black" />
+            </DialogContent>
+        </DialogRoot >
+
+    )
+}
+
+export default EditWorkModel
\ No newline at end of file
diff --git a/src/Pages/MasterModule/WorkspaceMode/WorkAddModel.tsx b/src/Pages/MasterModule/WorkspaceMode/WorkAddModel.tsx
new file mode 100644
index 0000000..22287a1
--- /dev/null
+++ b/src/Pages/MasterModule/WorkspaceMode/WorkAddModel.tsx
@@ -0,0 +1,58 @@
+import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
+import { Box, Field, IconButton, Input, Stack, Text, Textarea } from "@chakra-ui/react"
+import { IoMdAdd } from "react-icons/io"
+import { Button } from "../../../components/ui/button"
+
+function WorkAddModel() {
+   
+    return (
+
+        <DialogRoot placement="center">
+            <DialogTrigger asChild>
+                {/* <Button bg={"transparent"} size="sm">
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
+                </Button> */}
+                <Button  px={5} size={"xs"} bg={"#02A0A0"}>
+                    <IoMdAdd /> <Text>Add</Text>
+                </Button>
+
+            </DialogTrigger>
+
+            <DialogContent
+                 bg={"#fff"}
+                 // w={{ lg: "60%", md: "230px" }}
+                 w={{ base: '90%', md: '400px' }}
+                height={'auto'}
+                 
+                 overflowX="hidden" 
+                 p={3} // Reduced padding
+                 bgSize={'md'}
+            >
+                <DialogHeader bg="white" >
+                    <DialogTitle alignSelf="center" color="black" fontSize="14px">Add</DialogTitle>
+                </DialogHeader>
+
+                <DialogBody bg="white">
+                    <Stack py={3}>
+
+                        <Field.Root>
+                            <Field.Label color="black" pt={1} fontSize="12px">Workspace Mode</Field.Label>
+                            <Input placeholder="" 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"}>
+                        Save
+                    </Button>
+                </DialogFooter>
+
+                <DialogCloseTrigger color="black" />
+            </DialogContent>
+        </DialogRoot >
+
+    )
+}
+
+export default WorkAddModel
\ No newline at end of file
diff --git a/src/Pages/MasterModule/WorkspaceMode/WorkspaceMode.tsx b/src/Pages/MasterModule/WorkspaceMode/WorkspaceMode.tsx
index b6e8985..a236b90 100644
--- a/src/Pages/MasterModule/WorkspaceMode/WorkspaceMode.tsx
+++ b/src/Pages/MasterModule/WorkspaceMode/WorkspaceMode.tsx
@@ -1,12 +1,86 @@
+import { Box, HStack, Image, Input, Text } from "@chakra-ui/react";
 import MainFrame from "../../../components/MainFrame"
+import { InputGroup } from "../../../components/ui/input-group";
+import { LuSearch } from "react-icons/lu";
+import DataTable from "../../../components/DataTable";
+import { Switch } from "../../../components/ui/switch";
+import WorkAddModel from "./WorkAddModel";
+import EditWorkModel from "./EditWorkModel";
 
 
+
+// table data
+
+const tableHeadRow = [
+  "Sr. No",
+  "Title",
+  "Action"
+  
+];
+
+const managepost: any[] = [
+  ...Array.from({ length: 12 }, (_, i) => ({
+    "Sr. No": i + 1,
+    "Title": "Lorem Ipsum",
+    "Action": (
+      <HStack justifyContent="center">
+        <EditWorkModel />
+        <Box>
+          <Switch colorPalette={'teal'} size={"xs"}/>
+        </Box>
+      </HStack>
+    ),
+  })),
+];
+
 const WorkspaceMode = () => {
-    return (
-      
-      <MainFrame >
-         WorkspaceMode
-      </MainFrame>
-    )
-  }
-  export default WorkspaceMode
\ No newline at end of file
+  return (
+
+    <MainFrame>
+      <Box>
+        <HStack
+          w={"100%"}
+          justifyContent={"space-between"}
+          mb={4}
+          py={0}
+          px={3}
+        >
+          <Text as={"span"} fontSize={"sm"} fontWeight={500} color={"#000"}>
+          Workspace Mode
+          </Text>
+
+          <HStack mr={5}>
+            <InputGroup marginRight={"1rem"}
+              startElement={
+                <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
+              }
+              color={"#000"}
+            >
+              <Input
+                p={3}
+                w={300}
+                bg={"#fff"}
+                colorPalette={"blue"}
+                _focus={{ border: "1px solid #02A0A0" }}
+                rounded={"md"}
+                size={"2xs"}
+                fontSize={"2sm"}
+                placeholder="Search..."
+                bgColor={'#EEEEEE'}
+                ps={8}
+              />
+            </InputGroup>
+            {/* <Button bgColor={'#EEEEEE'} pl={3} pr={3}><IoMdAdd /> <Text>Add</Text></Button> */}
+            <WorkAddModel />
+          </HStack>
+        </HStack>
+        <DataTable
+          sortableColumns={["Name", "Registration Date "]}
+          tableHeadRow={tableHeadRow}
+          data={managepost}
+        />
+      </Box>       
+    </MainFrame>
+  )
+}
+export default WorkspaceMode
\ No newline at end of file
diff --git a/src/Pages/SubAdmin/AddModel.tsx b/src/Pages/SubAdmin/AddModel.tsx
index 6395eeb..403549b 100644
--- a/src/Pages/SubAdmin/AddModel.tsx
+++ b/src/Pages/SubAdmin/AddModel.tsx
@@ -12,7 +12,7 @@ function AddModel() {
                 {/* <Button bg={"transparent"} size="sm">
                     <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
                 </Button> */}
-                <Button bgColor={'#EEEEEE'} pl={3} pr={3}><IoMdAdd /> <Text>Add</Text></Button>
+                <Button px={4} size={"xs"} bg={"#02A0A0"}><IoMdAdd /> <Text>Add</Text></Button>
 
             </DialogTrigger>
 
@@ -20,19 +20,19 @@ function AddModel() {
                 bg={"#fff"}
                 // w={{ lg: "60%", md: "230px" }}
                 w={{ base: '90%', md: '400px' }}
-
                 height={'80vh'}
                 overflow={'scroll'}
-                p={2} // Reduced padding
+                overflowX="hidden" 
+                p={3} // Reduced padding
                 bgSize={'md'}
             >
-                <DialogHeader bg="white" pt={1} pb={2}>
+                <DialogHeader bg="white"  >
                     <DialogTitle alignSelf="center" color="black" fontSize="14px"
                     >Add Sub Admin Account</DialogTitle>
                 </DialogHeader>
 
                 <DialogBody bg="white">
-                    <Stack p={2} >
+                    <Stack py={3} >
 
                         <Field.Root>
                             <Field.Label color="black" pt={1} fontSize="12px">First Name</Field.Label>
@@ -64,7 +64,7 @@ function AddModel() {
                         </Grid>
                     </Stack>
                 </DialogBody>
-                <DialogFooter display="flex" justifyContent="center">
+                <DialogFooter display="flex" justifyContent="center" pt={"2"}>
                     <Button w="100%" bg="#02A0A0" color={"#fff"}>
                         Save
                     </Button>
diff --git a/src/Pages/SubAdmin/SubAdmin.tsx b/src/Pages/SubAdmin/SubAdmin.tsx
index 28c943d..4fa4c0e 100644
--- a/src/Pages/SubAdmin/SubAdmin.tsx
+++ b/src/Pages/SubAdmin/SubAdmin.tsx
@@ -70,8 +70,8 @@ const SubAdmin = () => {
             {/* Manage Post */}
           </Text>
 
-          <HStack mr={5}>
-            <InputGroup marginRight={"1rem"}
+          <HStack>
+            <InputGroup 
               startElement={
                 <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
               }
diff --git a/src/Pages/SubAdmin/ViewSubAdmin.tsx b/src/Pages/SubAdmin/ViewSubAdmin.tsx
index dbe4f88..d3f45b8 100644
--- a/src/Pages/SubAdmin/ViewSubAdmin.tsx
+++ b/src/Pages/SubAdmin/ViewSubAdmin.tsx
@@ -9,7 +9,7 @@ function ViewSubAdmin() {
         <DialogRoot placement="center" >
             <DialogTrigger asChild>
                 <Button bg={"transparent"} size="sm">
-                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", }} />
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", }} color="#000"/>
                 </Button>
                 {/* <Button><FaRegEdit /></Button> */}
 
@@ -19,20 +19,18 @@ function ViewSubAdmin() {
                 bg={"#fff"}
                 // w={{ lg: "60%", md: "230px" }}
                 w={{ base: '90%', md: '400px' }}
-
-
-
                 height={'80vh'}
                 overflow={'scroll'}
-                p={2} // Reduced padding
+                overflowX="hidden" 
+                p={3} // Reduced padding
                 bgSize={'md'}
             >
-                <DialogHeader bg="white" pt={1} pb={2}>
+                <DialogHeader bg="white">
                     <DialogTitle alignSelf="center" color="black" fontSize="14px">View Sub Admin Account</DialogTitle>
                 </DialogHeader>
 
                 <DialogBody bg="white">
-                    <Stack p={2} >
+                    <Stack py={3} >
 
                         <Field.Root>
                             <Field.Label color="black" pt={1} fontSize="12px">First Name</Field.Label>
@@ -68,11 +66,11 @@ function ViewSubAdmin() {
                         </Grid>
                     </Stack>
                 </DialogBody>
-                {/* <DialogFooter display="flex" justifyContent="center">
+                <DialogFooter display="flex" justifyContent="center" pt={"2"} >
                     <Button w="100%" bg="#02A0A0" color={"#fff"}>
                         Save
                     </Button>
-                </DialogFooter> */}
+                </DialogFooter>
 
                 <DialogCloseTrigger color="black" />
             </DialogContent>
diff --git a/src/assets/Template_img.png b/src/assets/Template_img.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ea7aabf36190bbe5b62923d928877680dc08173
GIT binary patch
literal 17947
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
Wvn$;ePD_OV0000<MNUMnLSTYAg+1>8

literal 0
HcmV?d00001

diff --git a/src/components/EditSubAdmin.tsx b/src/components/EditSubAdmin.tsx
index 1640f05..60f92a7 100644
--- a/src/components/EditSubAdmin.tsx
+++ b/src/components/EditSubAdmin.tsx
@@ -9,7 +9,7 @@ function EditSubAdmin() {
         <DialogRoot placement="center">
             <DialogTrigger asChild>
                 <Button bg={"transparent"} size="sm">
-                    <FaRegEdit style={{ cursor: "pointer", }} />
+                    <FaRegEdit style={{ cursor: "pointer", }} color="#000" />
                 </Button>
                 {/* <Button><FaRegEdit /></Button> */}
 
@@ -17,18 +17,19 @@ function EditSubAdmin() {
 
             <DialogContent
                 bg={"#fff"}
-                w={{ lg: "60%", md: "230px" }}
+                w={{ base: '90%', md: '400px' }}
                 height={'80vh'}
                 overflow={'scroll'}
-                p={2} // Reduced padding
+                overflowX="hidden" 
+                p={3} // Reduced padding
                 bgSize={'md'}
             >
-                <DialogHeader bg="white" pt={1} pb={2}>
+                <DialogHeader bg="white">
                     <DialogTitle alignSelf="center" color="black" fontSize="14px">Edit Sub Admin Account</DialogTitle>
                 </DialogHeader>
 
                 <DialogBody bg="white">
-                    <Stack p={2} >
+                    <Stack py={3} >
 
                         <Field.Root>
                             <Field.Label color="black" pt={1} fontSize="12px">First Name</Field.Label>
@@ -61,7 +62,7 @@ function EditSubAdmin() {
                         </Grid>
                     </Stack>
                 </DialogBody>
-                <DialogFooter display="flex" justifyContent="center">
+                <DialogFooter display="flex" justifyContent="center" pt={"2"}>
                     <Button w="100%" bg="#02A0A0" color={"#fff"}>
                         Save
                     </Button>

From 7fdcab72152f70920966d90205dd3e9414391c6b Mon Sep 17 00:00:00 2001
From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com>
Date: Fri, 7 Feb 2025 17:24:33 +0530
Subject: [PATCH 2/6] [ update ]

---
 src/Pages/Dashboard/AgencyName.tsx         | 103 +++++++++++++++++++
 src/Pages/Dashboard/Dashboard.tsx          | 111 +++++++++++++++++++--
 src/components/Charts/CircularProgress.tsx |  51 ++++++++++
 3 files changed, 254 insertions(+), 11 deletions(-)
 create mode 100644 src/Pages/Dashboard/AgencyName.tsx
 create mode 100644 src/components/Charts/CircularProgress.tsx

diff --git a/src/Pages/Dashboard/AgencyName.tsx b/src/Pages/Dashboard/AgencyName.tsx
new file mode 100644
index 0000000..9941623
--- /dev/null
+++ b/src/Pages/Dashboard/AgencyName.tsx
@@ -0,0 +1,103 @@
+import { Box, HStack, Image, Input, Stack, Text } from "@chakra-ui/react";
+import React, { useState, useEffect } from "react";
+import { Button } from "../../components/ui/button";
+import { IoAddSharp } from "react-icons/io5";
+import delateIcon from "../../assets/deleteIcon.png";
+import { FaClockRotateLeft } from "react-icons/fa6";
+
+interface Todo {
+  id: number;
+  text: string;
+  completed: boolean;
+  timestamp: string;
+}
+
+const AgencyName: React.FC = () => {
+  const [todos, setTodos] = useState<Todo[]>([]);
+  const [input, setInput] = useState<string>("");
+
+  
+  const getCurrentTime = () => {
+    const now = new Date();
+    return now.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" });
+  };
+
+
+  const addTodo = () => {
+    if (input.trim() === "") return;
+    setTodos([...todos, { id: Date.now(), text: input, completed: false, timestamp: getCurrentTime() }]);
+    setInput(""); 
+  };
+
+  // Delete a task
+  const deleteTodo = (id: number) => {
+    setTodos(todos.filter((todo) => todo.id !== id));
+  };
+
+  useEffect(() => {
+    const savedTodos = localStorage.getItem("todos");
+    if (savedTodos) {
+      setTodos(JSON.parse(savedTodos));
+    }
+  }, []); // Runs only on mount
+
+  // 🔹 Save todos to localStorage whenever they change
+  useEffect(() => {
+    if (todos.length > 0) {
+      localStorage.setItem("todos", JSON.stringify(todos));
+    }
+  }, [todos]); // Runs when `todos` changes
+
+
+  return (
+    <Box p={"10px"}>
+      <HStack justifyContent={"space-between"} mb={5}>
+        <Text fontSize={"xs"} fontWeight={500}>
+          Add Agency Name
+        </Text>
+        <Button
+          bg={"#fff"}
+          color={"#222222CC"}
+          px={3}
+          fontSize={"12px"}
+          h={"28px"}
+          onClick={addTodo}
+        >
+          <IoAddSharp /> Add
+        </Button>
+      </HStack>
+      <Input
+        type="text"
+        value={input}
+        onChange={(e) => setInput(e.target.value)}
+        placeholder="Add a task..."
+        backgroundColor={"#fff"}
+        size={"sm"}
+        w={"100%"}
+        p={2}
+        mb={4}
+      />
+      {todos.map((todo) => (
+        <HStack key={todo.id} backgroundColor={"#fff"} rounded={5} mb={3} p={4} justifyContent={'space-between'} alignItems={'inherit'}>
+          <Text fontSize={'sm'} color={'#222222bd'} fontWeight={400}>{todo.text}</Text>
+          <Stack display={'flex'} alignItems={'end'} w={'130px'}>
+            <Box display={'flex'} alignItems={'center'} gap={2}>
+                <FaClockRotateLeft fontSize={'10px'} style={{fontSize:'13px',color:'#222222bd'}} /> 
+                <Text fontSize={"xs"} color={"#222222bd"}>{todo.timestamp}</Text>
+            </Box>
+            <Box
+              onClick={() => deleteTodo(todo.id)}
+              bg={"none"}
+              color={"#22222299"}
+              cursor={'pointer'}
+            >
+              <Image w={"16px"} src={delateIcon} />
+            </Box>
+          </Stack>
+        </HStack>
+      ))}
+    </Box>
+  );
+};
+
+export default AgencyName;
diff --git a/src/Pages/Dashboard/Dashboard.tsx b/src/Pages/Dashboard/Dashboard.tsx
index 5a0e63e..e60e41c 100644
--- a/src/Pages/Dashboard/Dashboard.tsx
+++ b/src/Pages/Dashboard/Dashboard.tsx
@@ -19,17 +19,55 @@ import {
   SelectValueText,
 } from "../../components/ui/select";
 import SemiDoughnutChart from "../../components/Charts/SemiDoughnutChart";
+import { Button } from "../../components/ui/button";
+import {
+  AccordionItem,
+  AccordionItemContent,
+  AccordionItemTrigger,
+  AccordionRoot,
+} from "../../components/ui/accordion";
+import AgencyName from "./AgencyName";
+import CircularProgress from "../../components/Charts/CircularProgress";
+import CircularApp from "../../components/Charts/CircularProgress";
 
 const Dashboard = () => {
   const frameworks = createListCollection({
     items: [
-      { label: "React.js", value: "react" },
-      { label: "Vue.js", value: "vue" },
-      { label: "Angular", value: "angular" },
-      { label: "Svelte", value: "svelte" },
+      { label: "Today", value: "Today" },
+      { label: "Week", value: "Week" },
+      { label: "Month", value: "Month" },
+      { label: "Year", value: "Year" },
     ],
   });
 
+  const accItems = [
+    {
+      value: "1",
+      title: "How to create new account?",
+      text: "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since. Lorem Ipsum has been the industry's standard dummy text ever since.",
+    },
+    {
+      value: "2",
+      title: "How to create new account?",
+      text: "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since. Lorem Ipsum has been the industry's standard dummy text ever since.",
+    },
+    {
+      value: "3",
+      title: "How to create new account?",
+      text: "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since. Lorem Ipsum has been the industry's standard dummy text ever since.",
+    },
+    {
+      value: "4",
+      title: "How to create new account?",
+      text: "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since. Lorem Ipsum has been the industry's standard dummy text ever since.",
+    },
+    {
+      value: "5",
+      title: "How to create new account?",
+      text: "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since. Lorem Ipsum has been the industry's standard dummy text ever since.",
+    },
+  ];
+
   return (
     <MainFrame>
       <Box display={"flex"} p={"20px"} gap={5}>
@@ -47,16 +85,28 @@ const Dashboard = () => {
             mb={6}
           >
             <Tabs.List>
-              <Tabs.Trigger value="tab-1">Tab 1</Tabs.Trigger>
-              <Tabs.Trigger value="tab-2">Tab 2</Tabs.Trigger>
-              <Tabs.Trigger value="tab-3">Tab 3</Tabs.Trigger>
+              <Tabs.Trigger fontSize={"xs"} value="tab-1">
+                Past 24 hrs
+              </Tabs.Trigger>
+              <Tabs.Trigger fontSize={"xs"} value="tab-2">
+                Total Users
+              </Tabs.Trigger>
+              <Tabs.Trigger fontSize={"xs"} value="tab-3">
+                New Signups
+              </Tabs.Trigger>
             </Tabs.List>
           </Tabs.Root>
           <Box>
             <SemiDoughnutChart />
           </Box>
 
-          <Box w={'80%'} m={'auto'} display={'flex'} justifyContent={'space-between'} mt={8}>
+          <Box
+            w={"80%"}
+            m={"auto"}
+            display={"flex"}
+            justifyContent={"space-between"}
+            mt={8}
+          >
             <Status.Root colorPalette="blue">
               <Status.Indicator />
               Recruiter <Text fontWeight={500}>2554</Text>
@@ -92,11 +142,50 @@ const Dashboard = () => {
         <Box
           w={"20%"}
           boxShadow={"rgba(99, 99, 99, 0.2) 0px 2px 8px 0px"}
-        ></Box>
+          p={'10px'}
+        >
+          <Text fontSize={"sm"} fontWeight={500} pt={3}>Number Of Groups created</Text>
+          <CircularApp />
+        </Box>
       </Box>
       <Box p={"20px"} display={"flex"} gap={5}>
-        <Box w={"50%"} bg={"#f2f2f2"} h={400}></Box>
-        <Box w={"50%"} bg={"#f2f2f2"} h={400}></Box>
+        <Box w={"50%"} bg={"#f2f2f2"} h={400} p={"10px"} overflow={'scroll'}>
+          <HStack justifyContent={"space-between"} mb={5}>
+            <Text fontSize={"xs"} fontWeight={500}>Faqs</Text>
+            <Button
+              bg={"#fff"}
+              color={"#222222CC"}
+              px={3}
+              fontSize={"12px"}
+              h={"28px"}
+            >
+              View ALL
+            </Button>
+          </HStack>
+          <AccordionRoot collapsible defaultValue={["b"]}>
+            {accItems.map((item, index) => (
+              <AccordionItem
+                key={index}
+                value={item.value}
+                bg={"#fff"}
+                mb={2}
+                p={"12px"}
+                rounded={5}
+                borderBottom={0}
+              >
+                <AccordionItemTrigger fontSize={"sm"} >
+                  {item.title}
+                </AccordionItemTrigger>
+                <AccordionItemContent fontSize={"xs"} color={'#222222CC'} pt={2}>
+                  {item.text}
+                </AccordionItemContent>
+              </AccordionItem>
+            ))}
+          </AccordionRoot>
+        </Box>
+        <Box w={"50%"} bg={"#f2f2f2"} h={400} overflow={'scroll'}>
+          <AgencyName />
+        </Box>
       </Box>
     </MainFrame>
   );
diff --git a/src/components/Charts/CircularProgress.tsx b/src/components/Charts/CircularProgress.tsx
new file mode 100644
index 0000000..95fb47c
--- /dev/null
+++ b/src/components/Charts/CircularProgress.tsx
@@ -0,0 +1,51 @@
+import { Box, Text } from "@chakra-ui/react";
+import React, { useEffect, useState } from "react";
+
+const CircularProgress: React.FC<{ value: number; max: number }> = ({ value, max }) => {
+  const totalDots = 60; // Total number of dots in the circle
+  const filledDots = Math.round((value / max) * totalDots); // Number of filled dots
+
+  return (
+    <Box position={'relative'}>
+      <svg width="200" height="100%" viewBox="0 0 100 100">
+        {Array.from({ length: totalDots }).map((_, i) => {
+          const angle = (i / totalDots) * 360;
+          const x = 50 + 40 * Math.cos((angle * Math.PI) / 180);
+          const y = 50 + 40 * Math.sin((angle * Math.PI) / 180);
+
+          return (
+            <circle
+              key={i}
+              cx={x}
+              cy={y}
+              r="1"
+              fill={i < filledDots ? "#2563eb" : ""} // Blue for filled, Gray for empty
+              opacity={i < filledDots ? 1 : 0.1}
+            />
+          );
+        })}
+      </svg>
+      <Text position={'absolute'} left={'42%'} top={'44%'} fontSize={'md'} fontWeight={500}>{value}</Text>
+    </Box>
+  );
+};
+
+// Usage Example with Animation
+const CircularApp: React.FC = () => {
+  const [progress, setProgress] = useState(0);
+
+  useEffect(() => {
+    const interval = setInterval(() => {
+      setProgress((prev) => (prev < 350 ? prev + 20 : 350));
+    }, 300);
+    return () => clearInterval(interval);
+  }, []);
+
+  return (
+    <Box display={'flex'} justifyContent={'center'} alignItems={'center'} h={'90%'}>
+      <CircularProgress value={progress} max={450} />
+    </Box>
+  );
+};
+
+export default CircularApp;

From d37c8ed196893cc5507209c5e9038a6d95244b28 Mon Sep 17 00:00:00 2001
From: "Siddhesh.More" <siddhesh.more@wdimails.com>
Date: Mon, 10 Feb 2025 12:04:43 +0530
Subject: [PATCH 3/6] update

---
 .env                                 |   2 +
 dev-dist/sw.js                       |   2 +-
 package-lock.json                    | 268 +++++++++++++++++++++++++--
 package.json                         |   3 +
 src/Contexts/GlobalStateProvider.tsx |   2 +-
 src/Pages/Login.tsx                  |  39 ++--
 src/Redux/Service/apiSlice.tsx       |  55 ++++++
 src/Redux/Service/authSlice.tsx      |  27 +++
 src/Redux/Store.tsx                  |  15 ++
 src/main.tsx                         |  22 ++-
 10 files changed, 392 insertions(+), 43 deletions(-)
 create mode 100644 .env
 create mode 100644 src/Redux/Service/apiSlice.tsx
 create mode 100644 src/Redux/Service/authSlice.tsx
 create mode 100644 src/Redux/Store.tsx

diff --git a/.env b/.env
new file mode 100644
index 0000000..905ee5e
--- /dev/null
+++ b/.env
@@ -0,0 +1,2 @@
+VITE_API_URL=https://ssa.betadelivery.com/apia
+VITE_APP_NAME=MyViteApp
\ No newline at end of file
diff --git a/dev-dist/sw.js b/dev-dist/sw.js
index 8ae0392..9c5feb8 100644
--- a/dev-dist/sw.js
+++ b/dev-dist/sw.js
@@ -82,7 +82,7 @@ define(['./workbox-54d0af47'], (function (workbox) { 'use strict';
     "revision": "3ca0b8505b4bec776b69afdba2768812"
   }, {
     "url": "index.html",
-    "revision": "0.tm0o9v27ue"
+    "revision": "0.tg13lftuk78"
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {
diff --git a/package-lock.json b/package-lock.json
index f18c84e..1d95b8a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,6 +11,8 @@
         "@chakra-ui/react": "^3.2.3",
         "@emotion/react": "^11.14.0",
         "@emotion/styled": "^11.14.0",
+        "@reduxjs/toolkit": "^2.5.1",
+        "axios": "^1.7.9",
         "chart.js": "^4.4.7",
         "framer-motion": "^11.18.0",
         "next-themes": "^0.4.4",
@@ -19,6 +21,7 @@
         "react-dom": "^18.3.1",
         "react-hook-form": "^7.54.2",
         "react-icons": "^5.4.0",
+        "react-redux": "^9.2.0",
         "react-router-dom": "^7.1.1",
         "vite-plugin-pwa": "^0.21.1"
       },
@@ -1670,7 +1673,6 @@
     },
     "node_modules/@clack/prompts/node_modules/is-unicode-supported": {
       "version": "1.3.0",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
       "engines": {
@@ -1920,6 +1922,7 @@
       "cpu": [
         "ppc64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1936,6 +1939,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1952,6 +1956,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1968,6 +1973,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1984,6 +1990,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2000,6 +2007,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2016,6 +2024,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2032,6 +2041,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2048,6 +2058,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2064,6 +2075,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2080,6 +2092,7 @@
       "cpu": [
         "ia32"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2096,6 +2109,7 @@
       "cpu": [
         "loong64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2112,6 +2126,7 @@
       "cpu": [
         "mips64el"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2128,6 +2143,7 @@
       "cpu": [
         "ppc64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2144,6 +2160,7 @@
       "cpu": [
         "riscv64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2160,6 +2177,7 @@
       "cpu": [
         "s390x"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2176,6 +2194,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2192,6 +2211,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2208,6 +2228,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2224,6 +2245,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2240,6 +2262,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2256,6 +2279,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2272,6 +2296,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2288,6 +2313,7 @@
       "cpu": [
         "ia32"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2304,6 +2330,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2722,6 +2749,30 @@
         "node": ">=14"
       }
     },
+    "node_modules/@reduxjs/toolkit": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.5.1.tgz",
+      "integrity": "sha512-UHhy3p0oUpdhnSxyDjaRDYaw8Xra75UiLbCiRozVPHjfDwNYkh0TsVm/1OmTW8Md+iDAJmYPWUKMvsMc2GtpNg==",
+      "license": "MIT",
+      "dependencies": {
+        "immer": "^10.0.3",
+        "redux": "^5.0.1",
+        "redux-thunk": "^3.1.0",
+        "reselect": "^5.1.0"
+      },
+      "peerDependencies": {
+        "react": "^16.9.0 || ^17.0.0 || ^18 || ^19",
+        "react-redux": "^7.2.1 || ^8.1.3 || ^9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "react": {
+          "optional": true
+        },
+        "react-redux": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@rollup/plugin-babel": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
@@ -2874,6 +2925,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2887,6 +2939,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2900,6 +2953,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2913,6 +2967,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2926,6 +2981,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2939,6 +2995,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2952,6 +3009,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2965,6 +3023,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2978,6 +3037,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2991,6 +3051,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3004,6 +3065,7 @@
       "cpu": [
         "loong64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3017,6 +3079,7 @@
       "cpu": [
         "ppc64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3030,6 +3093,7 @@
       "cpu": [
         "riscv64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3043,6 +3107,7 @@
       "cpu": [
         "s390x"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3056,6 +3121,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3069,6 +3135,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3082,6 +3149,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3095,6 +3163,7 @@
       "cpu": [
         "ia32"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3108,6 +3177,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3152,7 +3222,7 @@
       "version": "7.20.5",
       "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
       "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.20.7",
@@ -3166,7 +3236,7 @@
       "version": "7.6.8",
       "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
       "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.0.0"
@@ -3176,7 +3246,7 @@
       "version": "7.4.4",
       "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
       "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.1.0",
@@ -3187,7 +3257,7 @@
       "version": "7.20.6",
       "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
       "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.20.7"
@@ -3282,6 +3352,12 @@
       "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
       "license": "MIT"
     },
+    "node_modules/@types/use-sync-external-store": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.6.tgz",
+      "integrity": "sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg==",
+      "license": "MIT"
+    },
     "node_modules/@typescript-eslint/eslint-plugin": {
       "version": "8.18.2",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.18.2.tgz",
@@ -4537,6 +4613,12 @@
       "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
       "license": "MIT"
     },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "license": "MIT"
+    },
     "node_modules/at-least-node": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
@@ -4561,6 +4643,17 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/axios": {
+      "version": "1.7.9",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
+      "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
+      "license": "MIT",
+      "dependencies": {
+        "follow-redirects": "^1.15.6",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
+      }
+    },
     "node_modules/babel-plugin-macros": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
@@ -5318,6 +5411,18 @@
         "node": ">=0.1.90"
       }
     },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "license": "MIT",
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/commander": {
       "version": "12.1.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
@@ -5554,6 +5659,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/dunder-proto": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
@@ -5743,6 +5857,7 @@
       "version": "0.24.2",
       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.2.tgz",
       "integrity": "sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==",
+      "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "bin": {
@@ -6228,6 +6343,26 @@
         "tabbable": "^6.2.0"
       }
     },
+    "node_modules/follow-redirects": {
+      "version": "1.15.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/for-each": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
@@ -6254,6 +6389,20 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/form-data": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz",
+      "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
+      "license": "MIT",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/formdata-polyfill": {
       "version": "4.0.10",
       "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
@@ -6710,6 +6859,16 @@
         "node": ">= 4"
       }
     },
+    "node_modules/immer": {
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-10.1.1.tgz",
+      "integrity": "sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==",
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/immer"
+      }
+    },
     "node_modules/import-fresh": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -7496,6 +7655,27 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -7555,6 +7735,7 @@
       "version": "3.3.8",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
       "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -7940,6 +8121,7 @@
       "version": "8.4.49",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
       "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -8008,6 +8190,12 @@
       "integrity": "sha512-y44MCkgtZUCT9tZGuE278fB7PWVf7fRYy0vbRXAts2o5F0EfC4fIQrvQQGBJo1WJbFcVLXzApOscyJuZqHQc1w==",
       "license": "MIT"
     },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "license": "MIT"
+    },
     "node_modules/proxy-memoize": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/proxy-memoize/-/proxy-memoize-3.0.1.tgz",
@@ -8122,6 +8310,29 @@
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
       "license": "MIT"
     },
+    "node_modules/react-redux": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-9.2.0.tgz",
+      "integrity": "sha512-ROY9fvHhwOD9ySfrF0wmvu//bKCQ6AeZZq1nJNtbDC+kk5DuSuNX/n6YWYF/SYy7bSba4D4FSz8DJeKY/S/r+g==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/use-sync-external-store": "^0.0.6",
+        "use-sync-external-store": "^1.4.0"
+      },
+      "peerDependencies": {
+        "@types/react": "^18.2.25 || ^19",
+        "react": "^18.0 || ^19",
+        "redux": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "redux": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/react-refresh": {
       "version": "0.14.2",
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz",
@@ -8198,6 +8409,21 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/redux": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
+      "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==",
+      "license": "MIT"
+    },
+    "node_modules/redux-thunk": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-3.1.0.tgz",
+      "integrity": "sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw==",
+      "license": "MIT",
+      "peerDependencies": {
+        "redux": "^5.0.0"
+      }
+    },
     "node_modules/reflect.getprototypeof": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
@@ -8329,6 +8555,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/reselect": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/reselect/-/reselect-5.1.1.tgz",
+      "integrity": "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==",
+      "license": "MIT"
+    },
     "node_modules/resolve": {
       "version": "1.22.10",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
@@ -8713,6 +8945,7 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
       "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
@@ -9461,10 +9694,20 @@
         "punycode": "^2.1.0"
       }
     },
+    "node_modules/use-sync-external-store": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.4.0.tgz",
+      "integrity": "sha512-9WXSPC5fMv61vaupRkCKCxsPxBocVnwakBEkMIHHpkTTg6icbJtg6jzgtLDm4bl3cSHAca52rYWih0k4K3PfHw==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
     "node_modules/vite": {
       "version": "6.0.6",
       "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.6.tgz",
       "integrity": "sha512-NSjmUuckPmDU18bHz7QZ+bTYhRR0iA72cs2QAxCqDpafJ0S6qetco0LB3WW2OxlMHS0JmAv+yZ/R3uPmMyGTjQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "esbuild": "^0.24.2",
@@ -9566,6 +9809,7 @@
       "version": "4.34.1",
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.34.1.tgz",
       "integrity": "sha512-iYZ/+PcdLYSGfH3S+dGahlW/RWmsqDhLgj1BT9DH/xXJ0ggZN7xkdP9wipPNjjNLczI+fmMLmTB9pye+d2r4GQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/estree": "1.0.6"
@@ -10080,20 +10324,6 @@
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
       "license": "ISC"
     },
-    "node_modules/yaml": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.0.tgz",
-      "integrity": "sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==",
-      "license": "ISC",
-      "optional": true,
-      "peer": true,
-      "bin": {
-        "yaml": "bin.mjs"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
diff --git a/package.json b/package.json
index ca92e73..aef7be3 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,8 @@
     "@chakra-ui/react": "^3.2.3",
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.0",
+    "@reduxjs/toolkit": "^2.5.1",
+    "axios": "^1.7.9",
     "chart.js": "^4.4.7",
     "framer-motion": "^11.18.0",
     "next-themes": "^0.4.4",
@@ -21,6 +23,7 @@
     "react-dom": "^18.3.1",
     "react-hook-form": "^7.54.2",
     "react-icons": "^5.4.0",
+    "react-redux": "^9.2.0",
     "react-router-dom": "^7.1.1",
     "vite-plugin-pwa": "^0.21.1"
   },
diff --git a/src/Contexts/GlobalStateProvider.tsx b/src/Contexts/GlobalStateProvider.tsx
index 1f2c713..9a839de 100644
--- a/src/Contexts/GlobalStateProvider.tsx
+++ b/src/Contexts/GlobalStateProvider.tsx
@@ -5,7 +5,7 @@ import GlobalStateContext from './GlobalStateContext';
 
 
 const GlobalStateProvider = ({ children }:{children:ReactNode}) => {
-  const [isAuthenticate, setIsAuthenticate] = useState<boolean>(true);
+  const [isAuthenticate, setIsAuthenticate] = useState<boolean>(false);
 
   return (
     <GlobalStateContext.Provider value={{ isAuthenticate, setIsAuthenticate }}>
diff --git a/src/Pages/Login.tsx b/src/Pages/Login.tsx
index c479a26..4e0daa4 100644
--- a/src/Pages/Login.tsx
+++ b/src/Pages/Login.tsx
@@ -6,13 +6,17 @@ import logo from '../assets/logo.svg'
 import { Button } from "../components/ui/button"
 import { Field } from "../components/ui/field"
 import { Toaster, toaster } from "../components/ui/toaster"
+import { useDispatch } from "react-redux"
+import { setToken } from "../Redux/Service/authSlice"
+import axios from "axios";
 
 interface FormValues {
   mobileNumber: number
+  password: string
 }
 
 const Login = () => {
-
+  const dispatch = useDispatch()
   const [isLoading, setIsLoading] = useState<boolean>(false)
   const context = useContext(GlobalStateContext);
   if (!context) {
@@ -26,24 +30,27 @@ const Login = () => {
   } = useForm<FormValues>()
 
 
-  const onSubmit = handleSubmit((data) => {
+  const onSubmit = handleSubmit(async (data) => {
     setIsLoading(true)
-    if (data?.mobileNumber === 1234567890) {
-      setTimeout(() => {
-        setIsAuthenticate(true);
-        setIsLoading(false)
-      }, 3000); // 3-second delay
+    try {
+      const response = await axios.post(`${import.meta.env.VITE_API_URL}/v1/login`, {
+        mobile_number: data.mobileNumber,
+        password: data.password,
+      });
+      console.log('====================================');
+      console.log(response);
+      console.log('====================================');
+      dispatch(setToken(String(response.data["access-token"])));
 
-    } else {
-      toaster.create({
-        title: `Invalid Credentials`,
-        type: "error",
-      })
-      setIsLoading(false)
+    } catch (error) {
+      console.error("Login failed", error);
     }
   });
 
 
+
+  
+
   return (
 
 
@@ -79,7 +86,11 @@ const Login = () => {
                 <Input ps={3} {...register("mobileNumber", { required: "Mobile Number address is required" })} placeholder="Mobile Number Address" />
                 {/* <Text as={'span'} w={'100%'} fontSize={'xs'} fontWeight={'normal'} color={'#686677'}>Forget password</Text> */}
               </Field>
-              <Button loading={isLoading} mt={4} size={'sm'} bg={'#02A0A0'} rounded={'md'} w={'100%'} color={'#ffffff'} type="submit">Send OTP</Button>
+              <Field color={'#313039'} label={'Enter Mobile Number'} w={'100%'} invalid={!!errors.password} errorText={errors.password?.message} >
+                <Input ps={3} {...register("password", { required: "Pasword is required" })} type="password" placeholder="Enter password" />
+                {/* <Text as={'span'} w={'100%'} fontSize={'xs'} fontWeight={'normal'} color={'#686677'}>Forget password</Text> */}
+              </Field>
+              <Button loading={isLoading} mt={4} size={'sm'} bg={'#02A0A0'} rounded={'md'} w={'100%'} color={'#ffffff'} type="submit">Login</Button>
 
               <Text>Forgot password</Text>
             </VStack>
diff --git a/src/Redux/Service/apiSlice.tsx b/src/Redux/Service/apiSlice.tsx
new file mode 100644
index 0000000..af6c96a
--- /dev/null
+++ b/src/Redux/Service/apiSlice.tsx
@@ -0,0 +1,55 @@
+import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query/react";
+import { BaseQueryFn, FetchArgs, FetchBaseQueryError } from "@reduxjs/toolkit/query";
+import { logout } from "./authSlice"; // Import logout action from authSlice
+import { RootState } from "../Store";
+
+const baseQuery = fetchBaseQuery({
+  baseUrl: "https://api.example.com",
+  prepareHeaders: (headers, { getState }) => {
+    const token = (getState() as RootState).auth.token; // Get token from Redux store
+    if (token) {
+      headers.set("Authorization", `Bearer ${token}`);
+    }
+    headers.set("Content-Type", "application/json");
+    return headers;
+  },
+});
+
+// ✅ Handle 401 Errors (Auto Logout)
+const baseQueryWithReauth: BaseQueryFn<
+  string | FetchArgs,
+  unknown,
+  FetchBaseQueryError
+> = async (args, api, extraOptions) => {
+  const result = await baseQuery(args, api, extraOptions);
+
+  if (result.error && result.error.status === 401) {
+    api.dispatch(logout()); // Logout user on 401 error
+  }
+
+  return result;
+};
+
+export const apiSlice = createApi({
+  reducerPath: "api",
+  baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
+  endpoints: (builder) => ({
+
+
+
+    getPosts: builder.query<Post[], void>({ query: () => "/posts" }),
+
+
+
+
+    
+  }),
+});
+
+export const { useGetPostsQuery } = apiSlice;
+
+export type Post = {
+  id: number;
+  title: string;
+  body: string;
+};
diff --git a/src/Redux/Service/authSlice.tsx b/src/Redux/Service/authSlice.tsx
new file mode 100644
index 0000000..f94a531
--- /dev/null
+++ b/src/Redux/Service/authSlice.tsx
@@ -0,0 +1,27 @@
+import { createSlice, PayloadAction } from "@reduxjs/toolkit";
+
+type AuthState = {
+  token: string | null;
+};
+
+const initialState: AuthState = {
+  token: localStorage.getItem("token"), // Load token from localStorage
+};
+
+const authSlice = createSlice({
+  name: "auth",
+  initialState,
+  reducers: {
+    setToken: (state, action: PayloadAction<string>) => {
+      state.token = action.payload;
+      localStorage.setItem("token", action.payload);
+    },
+    logout: (state) => {
+      state.token = null;
+      localStorage.removeItem("token");
+    },
+  },
+});
+
+export const { setToken, logout } = authSlice.actions;
+export default authSlice.reducer;
diff --git a/src/Redux/Store.tsx b/src/Redux/Store.tsx
new file mode 100644
index 0000000..f2d8548
--- /dev/null
+++ b/src/Redux/Store.tsx
@@ -0,0 +1,15 @@
+import { configureStore } from "@reduxjs/toolkit";
+import { apiSlice } from "./Service/apiSlice";
+import authReducer from "./Service/authSlice"
+
+export const store = configureStore({
+  reducer: {
+    [apiSlice.reducerPath]: apiSlice.reducer,
+    auth: authReducer,
+  },
+  middleware: (getDefaultMiddleware) =>
+    getDefaultMiddleware().concat(apiSlice.middleware),
+});
+
+export type RootState = ReturnType<typeof store.getState>;
+export type AppDispatch = typeof store.dispatch;
diff --git a/src/main.tsx b/src/main.tsx
index d66c166..5bc746e 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -1,17 +1,23 @@
 import React from 'react'
 import ReactDOM from 'react-dom/client'
 import App from './App'
+import { Provider as ReduxProvider } from "react-redux";
 import { Provider } from './components/ui/provider'
 import GlobalStateProvider from './Contexts/GlobalStateProvider'
 import './index.css'
+import { Theme } from '@chakra-ui/react'
+import { store } from './Redux/Store'
 
 ReactDOM.createRoot(document.getElementById('root')!).render(
-  <React.StrictMode>
-
-<GlobalStateProvider>
-    <Provider>
-      <App />
-    </Provider>
-    </GlobalStateProvider>
-  </React.StrictMode>,
+ <React.StrictMode>
+    <ReduxProvider store={store}> {/* ✅ Wrap with Redux Provider */}
+      <GlobalStateProvider>
+        <Provider> {/* ✅ Wrap with Provider */}
+        <Theme appearance='light'>
+          <App />
+          </Theme>
+        </Provider>
+      </GlobalStateProvider>
+    </ReduxProvider>
+  </React.StrictMode>
 )
\ No newline at end of file

From b9a902507ec979345a465c8bf6ed0d08d09da2bd Mon Sep 17 00:00:00 2001
From: "Siddhesh.More" <siddhesh.more@wdimails.com>
Date: Mon, 10 Feb 2025 12:06:34 +0530
Subject: [PATCH 4/6] update warnings

---
 src/Pages/Dashboard/Dashboard.tsx | 23 ++++++++++-------------
 src/Pages/Login.tsx               |  8 ++++----
 src/components/MainFrame.tsx      |  4 ++--
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/Pages/Dashboard/Dashboard.tsx b/src/Pages/Dashboard/Dashboard.tsx
index e60e41c..056fa6c 100644
--- a/src/Pages/Dashboard/Dashboard.tsx
+++ b/src/Pages/Dashboard/Dashboard.tsx
@@ -3,32 +3,29 @@ import {
   createListCollection,
   Heading,
   HStack,
-  Stack,
   Status,
   Tabs,
   Text,
 } from "@chakra-ui/react";
-import MainFrame from "../../components/MainFrame";
 import BarChart from "../../components/Charts/BarChart";
-import {
-  SelectContent,
-  SelectItem,
-  SelectLabel,
-  SelectRoot,
-  SelectTrigger,
-  SelectValueText,
-} from "../../components/ui/select";
+import CircularApp from "../../components/Charts/CircularProgress";
 import SemiDoughnutChart from "../../components/Charts/SemiDoughnutChart";
-import { Button } from "../../components/ui/button";
+import MainFrame from "../../components/MainFrame";
 import {
   AccordionItem,
   AccordionItemContent,
   AccordionItemTrigger,
   AccordionRoot,
 } from "../../components/ui/accordion";
+import { Button } from "../../components/ui/button";
+import {
+  SelectContent,
+  SelectItem,
+  SelectRoot,
+  SelectTrigger,
+  SelectValueText
+} from "../../components/ui/select";
 import AgencyName from "./AgencyName";
-import CircularProgress from "../../components/Charts/CircularProgress";
-import CircularApp from "../../components/Charts/CircularProgress";
 
 const Dashboard = () => {
   const frameworks = createListCollection({
diff --git a/src/Pages/Login.tsx b/src/Pages/Login.tsx
index 4e0daa4..d71bcfe 100644
--- a/src/Pages/Login.tsx
+++ b/src/Pages/Login.tsx
@@ -1,14 +1,14 @@
 import { Center, HStack, Image, Input, Text, VStack } from "@chakra-ui/react"
+import axios from "axios"
 import { useContext, useState } from "react"
 import { useForm } from "react-hook-form"
+import { useDispatch } from "react-redux"
 import GlobalStateContext from "../Contexts/GlobalStateContext"
+import { setToken } from "../Redux/Service/authSlice"
 import logo from '../assets/logo.svg'
 import { Button } from "../components/ui/button"
 import { Field } from "../components/ui/field"
-import { Toaster, toaster } from "../components/ui/toaster"
-import { useDispatch } from "react-redux"
-import { setToken } from "../Redux/Service/authSlice"
-import axios from "axios";
+import { Toaster } from "../components/ui/toaster"
 
 interface FormValues {
   mobileNumber: number
diff --git a/src/components/MainFrame.tsx b/src/components/MainFrame.tsx
index 95160b2..575830b 100644
--- a/src/components/MainFrame.tsx
+++ b/src/components/MainFrame.tsx
@@ -1,4 +1,4 @@
-import { Box, Text, VStack } from "@chakra-ui/react"
+import { Box, VStack } from "@chakra-ui/react"
 import { motion } from "framer-motion"
 import React, { FC } from "react"
 import { OPACITY_ON_LOAD } from "../Layouts/animations"
@@ -11,7 +11,7 @@ interface MainFrameProps {
   title?: string
 }
 
-const MainFrame: FC<MainFrameProps> = ({ children, title }) => {
+const MainFrame: FC<MainFrameProps> = ({ children }) => {
   return (
     <MotionVStack {...OPACITY_ON_LOAD} w="100%" h="90%" p={0}  pb={0}>
       <Box

From 0c219ba1a997044a573e835e627a77f9aa5880ed Mon Sep 17 00:00:00 2001
From: AnsariTufail <168163201+AnsariTufail@users.noreply.github.com>
Date: Mon, 10 Feb 2025 12:09:15 +0530
Subject: [PATCH 5/6] Working on that Fixed alingment

---
 dev-dist/sw.js                                              | 2 +-
 src/Pages/ManageCMS/AboutUs/AboutUs.tsx                     | 2 +-
 src/Pages/ManageCMS/FAQ/EditDetails.tsx                     | 6 +++---
 src/Pages/ManageCMS/FAQ/FAQ.tsx                             | 2 +-
 src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx         | 2 +-
 src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicyAddModel.tsx | 2 +-
 .../ManageCMS/TermsAndConditions/TermsAndConditions.tsx     | 2 +-
 src/Pages/ManageContact/ManageContact.tsx                   | 6 +++---
 src/Pages/ManageGroups/EditDetailGroup.tsx                  | 6 +++---
 src/Pages/ManageGroups/ViewManageGroup.tsx                  | 6 +++---
 src/Pages/ManageJobs/ManageJobs.tsx                         | 4 ++--
 src/Pages/ManageJobs/ManageJobsAdd.tsx                      | 6 +++---
 src/Pages/ManageJobs/ViewManageJob.tsx                      | 6 +++---
 src/Pages/ManagePost/ViewDailog.tsx                         | 4 ++--
 src/Pages/MasterModule/AgencyMaster/AgencyMaster.tsx        | 6 +++---
 src/Pages/MasterModule/AgencyMaster/EditAgencyMaster.tsx    | 6 +++---
 src/Pages/MasterModule/AgencyMaster/ViewAgencyAddModel.tsx  | 2 +-
 src/Pages/MasterModule/AgencyMaster/ViewAgencyMaster.tsx    | 6 +++---
 src/Pages/MasterModule/Country/Country.tsx                  | 6 +++---
 src/Pages/MasterModule/Country/EditCountryModel.tsx         | 6 +++---
 src/Pages/MasterModule/JobStatus/EditJobStatusModel.tsx     | 6 +++---
 src/Pages/MasterModule/JobStatus/JobStatus.tsx              | 4 ++--
 src/Pages/MasterModule/JobType/EditJobModel.tsx             | 6 +++---
 src/Pages/MasterModule/JobType/JobType.tsx                  | 4 ++--
 src/Pages/MasterModule/TemplateMaster/EditTemplateModel.tsx | 6 +++---
 src/Pages/MasterModule/TemplateMaster/TemplateMaster.tsx    | 4 ++--
 src/Pages/MasterModule/WorkspaceMode/EditWorkModel.tsx      | 6 +++---
 src/Pages/MasterModule/WorkspaceMode/WorkspaceMode.tsx      | 4 ++--
 src/Pages/SubAdmin/ViewSubAdmin.tsx                         | 6 +++---
 src/components/AlertDailog.tsx                              | 1 -
 src/components/EditSubAdmin.tsx                             | 6 +++---
 31 files changed, 70 insertions(+), 71 deletions(-)

diff --git a/dev-dist/sw.js b/dev-dist/sw.js
index 8ae0392..9e48fdb 100644
--- a/dev-dist/sw.js
+++ b/dev-dist/sw.js
@@ -82,7 +82,7 @@ define(['./workbox-54d0af47'], (function (workbox) { 'use strict';
     "revision": "3ca0b8505b4bec776b69afdba2768812"
   }, {
     "url": "index.html",
-    "revision": "0.tm0o9v27ue"
+    "revision": "0.nq13s8vv818"
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {
diff --git a/src/Pages/ManageCMS/AboutUs/AboutUs.tsx b/src/Pages/ManageCMS/AboutUs/AboutUs.tsx
index a86544c..a080942 100644
--- a/src/Pages/ManageCMS/AboutUs/AboutUs.tsx
+++ b/src/Pages/ManageCMS/AboutUs/AboutUs.tsx
@@ -20,7 +20,7 @@ const AboutUs = () => {
            AboutUs
           </Text>
 
-          <HStack mr={5}>
+          <HStack>
             
             <AboutUsAddModel />
           </HStack>
diff --git a/src/Pages/ManageCMS/FAQ/EditDetails.tsx b/src/Pages/ManageCMS/FAQ/EditDetails.tsx
index a8759e9..2ea1b8d 100644
--- a/src/Pages/ManageCMS/FAQ/EditDetails.tsx
+++ b/src/Pages/ManageCMS/FAQ/EditDetails.tsx
@@ -7,9 +7,9 @@ function EditDetails() {
 
         <DialogRoot placement="center">
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
-                    <FaRegEdit style={{ cursor: "pointer", }} color="#000" />
-                </Button>
+               
+                    <FaRegEdit style={{ cursor: "pointer", fontSize:'16px' }} color="#000" />
+               
                 {/* <Button><FaRegEdit /></Button> */}
 
             </DialogTrigger>
diff --git a/src/Pages/ManageCMS/FAQ/FAQ.tsx b/src/Pages/ManageCMS/FAQ/FAQ.tsx
index 44bd58d..4b833de 100644
--- a/src/Pages/ManageCMS/FAQ/FAQ.tsx
+++ b/src/Pages/ManageCMS/FAQ/FAQ.tsx
@@ -1,4 +1,4 @@
-import { Box, Button, HStack, Image, Input, Text } from "@chakra-ui/react";
+import { Box, HStack, Image, Input, Text } from "@chakra-ui/react";
 import MainFrame from "../../../components/MainFrame"
 import EditDetails from "./EditDetails";
 import { InputGroup } from "../../../components/ui/input-group";
diff --git a/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx
index 26e9126..d6fa126 100644
--- a/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx
+++ b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx
@@ -20,7 +20,7 @@ const PrivacyPolicy = () => {
           Privacy Policy
           </Text>
 
-          <HStack mr={5}>
+          <HStack >
             
             <PrivacyPolicyAddModel />
           </HStack>
diff --git a/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicyAddModel.tsx b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicyAddModel.tsx
index 566a00e..05eacd1 100644
--- a/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicyAddModel.tsx
+++ b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicyAddModel.tsx
@@ -1,6 +1,6 @@
 import { FaRegEdit } from "react-icons/fa"
 import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
-import { Field, Input, Stack, Text, Textarea } from "@chakra-ui/react"
+import { Field, Stack, Text, Textarea } from "@chakra-ui/react"
 import { Button } from "../../../components/ui/button"
 
 function PrivacyPolicyAddModel() {
diff --git a/src/Pages/ManageCMS/TermsAndConditions/TermsAndConditions.tsx b/src/Pages/ManageCMS/TermsAndConditions/TermsAndConditions.tsx
index 35f1e5a..0fe385e 100644
--- a/src/Pages/ManageCMS/TermsAndConditions/TermsAndConditions.tsx
+++ b/src/Pages/ManageCMS/TermsAndConditions/TermsAndConditions.tsx
@@ -20,7 +20,7 @@ const TermsAndConditions = () => {
            Terms And Conditions
           </Text>
 
-          <HStack mr={5}>
+          <HStack >
             
             <TermsAndConditionsAddModel />
           </HStack>
diff --git a/src/Pages/ManageContact/ManageContact.tsx b/src/Pages/ManageContact/ManageContact.tsx
index 1207bf7..e3bd9d6 100644
--- a/src/Pages/ManageContact/ManageContact.tsx
+++ b/src/Pages/ManageContact/ManageContact.tsx
@@ -1,4 +1,4 @@
-import { Box, HStack, Image, Input, Text } from "@chakra-ui/react";
+import { Box, HStack, Input, Text } from "@chakra-ui/react";
 import MainFrame from "../../components/MainFrame"
 import PendingRequests from "../../Pages/ManageContact/PendingRequests"
 import { InputGroup } from "../../components/ui/input-group";
@@ -47,8 +47,8 @@ const ManageContact = () => {
           Contact Requests
           </Text>
 
-          <HStack mr={5}>
-            <InputGroup marginRight={"1rem"}
+          <HStack >
+            <InputGroup 
               startElement={
                 <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
               }
diff --git a/src/Pages/ManageGroups/EditDetailGroup.tsx b/src/Pages/ManageGroups/EditDetailGroup.tsx
index 64d8c8f..31ad9ba 100644
--- a/src/Pages/ManageGroups/EditDetailGroup.tsx
+++ b/src/Pages/ManageGroups/EditDetailGroup.tsx
@@ -9,9 +9,9 @@ function EditDetailGroups() {
 
         <DialogRoot placement="center" >
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
-                    <FaRegEdit style={{ cursor: "pointer", }}  color="#000"/>
-                </Button>
+                
+                    <FaRegEdit style={{ cursor: "pointer", fontSize:'16px'}}  color="#000"/>
+                
                 {/* <Button><FaRegEdit /></Button> */}
 
             </DialogTrigger>
diff --git a/src/Pages/ManageGroups/ViewManageGroup.tsx b/src/Pages/ManageGroups/ViewManageGroup.tsx
index d479bc0..720e799 100644
--- a/src/Pages/ManageGroups/ViewManageGroup.tsx
+++ b/src/Pages/ManageGroups/ViewManageGroup.tsx
@@ -10,9 +10,9 @@ function ViewManageGroup() {
 
         <DialogRoot placement="center" >
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
-                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", }}  color="#000"/>
-                </Button>
+                
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize:'16px'}}  color="#000"/>
+               
                 {/* <Button><FaRegEdit /></Button> */}
 
             </DialogTrigger>
diff --git a/src/Pages/ManageJobs/ManageJobs.tsx b/src/Pages/ManageJobs/ManageJobs.tsx
index 6de9a5c..0e2beaa 100644
--- a/src/Pages/ManageJobs/ManageJobs.tsx
+++ b/src/Pages/ManageJobs/ManageJobs.tsx
@@ -73,8 +73,8 @@ const ManageJobs = () => {
             View job Posting
           </Text>
 
-          <HStack mr={5}>
-            <InputGroup marginRight={"1rem"}
+          <HStack >
+            <InputGroup 
               startElement={
                 <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
               }
diff --git a/src/Pages/ManageJobs/ManageJobsAdd.tsx b/src/Pages/ManageJobs/ManageJobsAdd.tsx
index 018b2e8..4d90998 100644
--- a/src/Pages/ManageJobs/ManageJobsAdd.tsx
+++ b/src/Pages/ManageJobs/ManageJobsAdd.tsx
@@ -19,9 +19,9 @@ function ManageJobsAdd() {
 
         <DialogRoot placement="center">
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
-                    <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }} color="#000" />
-                </Button>
+                
+                    <FaRegEdit style={{ cursor: "pointer", fontSize: "16px" }} color="#000" />
+                
             </DialogTrigger>
 
             <DialogContent
diff --git a/src/Pages/ManageJobs/ViewManageJob.tsx b/src/Pages/ManageJobs/ViewManageJob.tsx
index 3dcf57c..7dbcc0e 100644
--- a/src/Pages/ManageJobs/ViewManageJob.tsx
+++ b/src/Pages/ManageJobs/ViewManageJob.tsx
@@ -20,9 +20,9 @@ function ViewManageJob() {
 
         <DialogRoot placement="center">
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
-                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
-                </Button>
+               
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }}  color="#000"/>
+               
             </DialogTrigger>
 
             <DialogContent
diff --git a/src/Pages/ManagePost/ViewDailog.tsx b/src/Pages/ManagePost/ViewDailog.tsx
index f835014..dcd0c94 100644
--- a/src/Pages/ManagePost/ViewDailog.tsx
+++ b/src/Pages/ManagePost/ViewDailog.tsx
@@ -8,9 +8,9 @@ function ViewDailog() {
 
         <DialogRoot placement="center">
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
+                
                     <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} color="#000" />
-                </Button>
+                
             </DialogTrigger>
 
             <DialogContent
diff --git a/src/Pages/MasterModule/AgencyMaster/AgencyMaster.tsx b/src/Pages/MasterModule/AgencyMaster/AgencyMaster.tsx
index 360b868..76213a1 100644
--- a/src/Pages/MasterModule/AgencyMaster/AgencyMaster.tsx
+++ b/src/Pages/MasterModule/AgencyMaster/AgencyMaster.tsx
@@ -1,4 +1,4 @@
-import { Box, HStack, Image, Input, Text } from "@chakra-ui/react";
+import { Box, HStack, Input, Text } from "@chakra-ui/react";
 import MainFrame from "../../../components/MainFrame"
 import { InputGroup } from "../../../components/ui/input-group";
 import { LuSearch } from "react-icons/lu";
@@ -62,8 +62,8 @@ const AgencyMaster = () => {
           Agency Master
           </Text>
 
-          <HStack mr={5}>
-            <InputGroup marginRight={"1rem"}
+          <HStack >
+            <InputGroup 
               startElement={
                 <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
               }
diff --git a/src/Pages/MasterModule/AgencyMaster/EditAgencyMaster.tsx b/src/Pages/MasterModule/AgencyMaster/EditAgencyMaster.tsx
index 841a1ed..c075e91 100644
--- a/src/Pages/MasterModule/AgencyMaster/EditAgencyMaster.tsx
+++ b/src/Pages/MasterModule/AgencyMaster/EditAgencyMaster.tsx
@@ -10,9 +10,9 @@ function EditAgencyMaster() {
 
         <DialogRoot placement="center">
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
-                    <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
-                </Button>
+                
+                    <FaRegEdit style={{ cursor: "pointer", fontSize: "16px" }}  color="#000"/>
+               
             </DialogTrigger>
 
             <DialogContent
diff --git a/src/Pages/MasterModule/AgencyMaster/ViewAgencyAddModel.tsx b/src/Pages/MasterModule/AgencyMaster/ViewAgencyAddModel.tsx
index d17c6ef..73c309c 100644
--- a/src/Pages/MasterModule/AgencyMaster/ViewAgencyAddModel.tsx
+++ b/src/Pages/MasterModule/AgencyMaster/ViewAgencyAddModel.tsx
@@ -1,5 +1,5 @@
 import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
-import { Field, Input, Stack, Text, Textarea } from "@chakra-ui/react"
+import { Field, Input, Stack, Text } from "@chakra-ui/react"
 import { IoMdAdd } from "react-icons/io"
 import { Button } from "../../../components/ui/button"
 
diff --git a/src/Pages/MasterModule/AgencyMaster/ViewAgencyMaster.tsx b/src/Pages/MasterModule/AgencyMaster/ViewAgencyMaster.tsx
index 2c5a6f0..63bab62 100644
--- a/src/Pages/MasterModule/AgencyMaster/ViewAgencyMaster.tsx
+++ b/src/Pages/MasterModule/AgencyMaster/ViewAgencyMaster.tsx
@@ -10,9 +10,9 @@ function ViewAgencyMaster() {
 
         <DialogRoot placement="center">
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
-                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
-                </Button>
+                
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }}  color="#000"/>
+            
             </DialogTrigger>
 
             <DialogContent
diff --git a/src/Pages/MasterModule/Country/Country.tsx b/src/Pages/MasterModule/Country/Country.tsx
index d1b3d00..063eb7d 100644
--- a/src/Pages/MasterModule/Country/Country.tsx
+++ b/src/Pages/MasterModule/Country/Country.tsx
@@ -1,4 +1,4 @@
-import { Box, HStack, Image, Input, Text } from "@chakra-ui/react";
+import { Box, HStack, Input, Text } from "@chakra-ui/react";
 import MainFrame from "../../../components/MainFrame"
 import { InputGroup } from "../../../components/ui/input-group";
 import { LuSearch } from "react-icons/lu";
@@ -49,8 +49,8 @@ const Country = () => {
           Country
           </Text>
 
-          <HStack mr={5}>
-            <InputGroup marginRight={"1rem"}
+          <HStack >
+            <InputGroup 
               startElement={
                 <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
               }
diff --git a/src/Pages/MasterModule/Country/EditCountryModel.tsx b/src/Pages/MasterModule/Country/EditCountryModel.tsx
index c9da0c4..a26501e 100644
--- a/src/Pages/MasterModule/Country/EditCountryModel.tsx
+++ b/src/Pages/MasterModule/Country/EditCountryModel.tsx
@@ -15,9 +15,9 @@ function EditCountryModel() {
                 {/* <Button bg={"transparent"} size="sm">
                     <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
                 </Button> */}
-                <Button bg={"transparent"} size="sm">
-                 <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
-                </Button>
+                
+                 <FaRegEdit style={{ cursor: "pointer", fontSize: "16px" }}  color="#000"/>
+                
 
             </DialogTrigger>
 
diff --git a/src/Pages/MasterModule/JobStatus/EditJobStatusModel.tsx b/src/Pages/MasterModule/JobStatus/EditJobStatusModel.tsx
index 5b0e081..7efe0a1 100644
--- a/src/Pages/MasterModule/JobStatus/EditJobStatusModel.tsx
+++ b/src/Pages/MasterModule/JobStatus/EditJobStatusModel.tsx
@@ -15,9 +15,9 @@ function EditJobStatusModel() {
                 {/* <Button bg={"transparent"} size="sm">
                     <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
                 </Button> */}
-                <Button bg={"transparent"} size="sm">
-                 <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
-                </Button>
+                
+                 <FaRegEdit style={{ cursor: "pointer", fontSize: "16px" }}  color="#000"/>
+                
 
             </DialogTrigger>
 
diff --git a/src/Pages/MasterModule/JobStatus/JobStatus.tsx b/src/Pages/MasterModule/JobStatus/JobStatus.tsx
index 95d83ff..409dfc1 100644
--- a/src/Pages/MasterModule/JobStatus/JobStatus.tsx
+++ b/src/Pages/MasterModule/JobStatus/JobStatus.tsx
@@ -49,8 +49,8 @@ const JobStatus = () => {
           Job Status
           </Text>
 
-          <HStack mr={5}>
-            <InputGroup marginRight={"1rem"}
+          <HStack >
+            <InputGroup 
               startElement={
                 <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
               }
diff --git a/src/Pages/MasterModule/JobType/EditJobModel.tsx b/src/Pages/MasterModule/JobType/EditJobModel.tsx
index 6a8021c..86938b0 100644
--- a/src/Pages/MasterModule/JobType/EditJobModel.tsx
+++ b/src/Pages/MasterModule/JobType/EditJobModel.tsx
@@ -16,9 +16,9 @@ function EditJobeModel() {
                 {/* <Button bg={"transparent"} size="sm">
                     <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
                 </Button> */}
-                <Button bg={"transparent"} size="sm">
-                 <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
-                </Button>
+                
+                 <FaRegEdit style={{ cursor: "pointer", fontSize: "16px" }}  color="#000"/>
+                
 
             </DialogTrigger>
 
diff --git a/src/Pages/MasterModule/JobType/JobType.tsx b/src/Pages/MasterModule/JobType/JobType.tsx
index ba43fba..353387f 100644
--- a/src/Pages/MasterModule/JobType/JobType.tsx
+++ b/src/Pages/MasterModule/JobType/JobType.tsx
@@ -49,8 +49,8 @@ const JobType = () => {
           Job Type
           </Text>
 
-          <HStack mr={5}>
-            <InputGroup marginRight={"1rem"}
+          <HStack >
+            <InputGroup 
               startElement={
                 <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
               }
diff --git a/src/Pages/MasterModule/TemplateMaster/EditTemplateModel.tsx b/src/Pages/MasterModule/TemplateMaster/EditTemplateModel.tsx
index 7e508c3..a96fffd 100644
--- a/src/Pages/MasterModule/TemplateMaster/EditTemplateModel.tsx
+++ b/src/Pages/MasterModule/TemplateMaster/EditTemplateModel.tsx
@@ -30,9 +30,9 @@ function EditTemplateModel() {
                 {/* <Button bg={"transparent"} size="sm">
                     <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
                 </Button> */}
-                <Button bg={"transparent"} size="sm">
-                 <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
-                </Button>
+                
+                 <FaRegEdit style={{ cursor: "pointer", fontSize: "16px" }}  color="#000"/>
+               
 
             </DialogTrigger>
 
diff --git a/src/Pages/MasterModule/TemplateMaster/TemplateMaster.tsx b/src/Pages/MasterModule/TemplateMaster/TemplateMaster.tsx
index 7764629..de0a4d3 100644
--- a/src/Pages/MasterModule/TemplateMaster/TemplateMaster.tsx
+++ b/src/Pages/MasterModule/TemplateMaster/TemplateMaster.tsx
@@ -62,8 +62,8 @@ const TemplateMaster = () => {
           Template Master
           </Text>
 
-          <HStack mr={5}>
-            <InputGroup marginRight={"1rem"}
+          <HStack >
+            <InputGroup 
               startElement={
                 <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
               }
diff --git a/src/Pages/MasterModule/WorkspaceMode/EditWorkModel.tsx b/src/Pages/MasterModule/WorkspaceMode/EditWorkModel.tsx
index b4fcde9..ec0defb 100644
--- a/src/Pages/MasterModule/WorkspaceMode/EditWorkModel.tsx
+++ b/src/Pages/MasterModule/WorkspaceMode/EditWorkModel.tsx
@@ -15,9 +15,9 @@ function EditWorkModel() {
                 {/* <Button bg={"transparent"} size="sm">
                     <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
                 </Button> */}
-                <Button bg={"transparent"} size="sm">
-                 <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
-                </Button>
+                
+                 <FaRegEdit style={{ cursor: "pointer", fontSize: "16px" }}  color="#000"/>
+                
 
             </DialogTrigger>
 
diff --git a/src/Pages/MasterModule/WorkspaceMode/WorkspaceMode.tsx b/src/Pages/MasterModule/WorkspaceMode/WorkspaceMode.tsx
index a236b90..c5a2a21 100644
--- a/src/Pages/MasterModule/WorkspaceMode/WorkspaceMode.tsx
+++ b/src/Pages/MasterModule/WorkspaceMode/WorkspaceMode.tsx
@@ -49,8 +49,8 @@ const WorkspaceMode = () => {
           Workspace Mode
           </Text>
 
-          <HStack mr={5}>
-            <InputGroup marginRight={"1rem"}
+          <HStack >
+            <InputGroup 
               startElement={
                 <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
               }
diff --git a/src/Pages/SubAdmin/ViewSubAdmin.tsx b/src/Pages/SubAdmin/ViewSubAdmin.tsx
index d3f45b8..87f49a4 100644
--- a/src/Pages/SubAdmin/ViewSubAdmin.tsx
+++ b/src/Pages/SubAdmin/ViewSubAdmin.tsx
@@ -8,9 +8,9 @@ function ViewSubAdmin() {
 
         <DialogRoot placement="center" >
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
-                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", }} color="#000"/>
-                </Button>
+               
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize:'16px'}} color="#000"/>
+               
                 {/* <Button><FaRegEdit /></Button> */}
 
             </DialogTrigger>
diff --git a/src/components/AlertDailog.tsx b/src/components/AlertDailog.tsx
index 0202dd6..afbad58 100644
--- a/src/components/AlertDailog.tsx
+++ b/src/components/AlertDailog.tsx
@@ -25,7 +25,6 @@ const AlertDailog: React.FC<DeleteConfirmationDialogProps> = ({
   onConfirm,
   alertText,
   alertCaption,
-  alertIcon,
   AltertTiggerIcon,
   button,
   iconColor,
diff --git a/src/components/EditSubAdmin.tsx b/src/components/EditSubAdmin.tsx
index 767022d..73ad646 100644
--- a/src/components/EditSubAdmin.tsx
+++ b/src/components/EditSubAdmin.tsx
@@ -8,9 +8,9 @@ function EditSubAdmin() {
 
         <DialogRoot placement="center">
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
-                    <FaRegEdit style={{ cursor: "pointer", }} color="#000" />
-                </Button>
+                
+                    <FaRegEdit style={{ cursor: "pointer", fontSize:'16px' }} color="#000" />
+               
                 {/* <Button><FaRegEdit /></Button> */}
 
             </DialogTrigger>

From d56678786b6b996532030c1869d723726e83e2ce Mon Sep 17 00:00:00 2001
From: "Siddhesh.More" <siddhesh.more@wdimails.com>
Date: Mon, 10 Feb 2025 12:27:51 +0530
Subject: [PATCH 6/6] update api

---
 .env                           |  4 +++-
 src/Pages/Login.tsx            | 42 ++++++++++++++++++++++++----------
 src/Redux/Service/apiSlice.tsx |  4 ++--
 3 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/.env b/.env
index 905ee5e..90e2eef 100644
--- a/.env
+++ b/.env
@@ -1,2 +1,4 @@
-VITE_API_URL=https://ssa.betadelivery.com/apia
+VITE_API_URL=https://ssa.betadelivery.com/apia/v1
+VITE_USER_NAME="Admin"
+VITE_PASSWORD="71%@L%es^bUX94`J9XT*%4&^%tUU^%Q^ffgt"
 VITE_APP_NAME=MyViteApp
\ No newline at end of file
diff --git a/src/Pages/Login.tsx b/src/Pages/Login.tsx
index d71bcfe..b8d4a68 100644
--- a/src/Pages/Login.tsx
+++ b/src/Pages/Login.tsx
@@ -29,25 +29,43 @@ const Login = () => {
     formState: { errors },
   } = useForm<FormValues>()
 
-
   const onSubmit = handleSubmit(async (data) => {
-    setIsLoading(true)
+    setIsLoading(true);
+  
+    // Encode Basic Auth Credentials
+    const username = import.meta.env.VITE_USER_NAME||''; // Replace with actual username
+    const password = import.meta.env.VITE_PASSWORD||''; // Replace with actual password
+    const basicAuth = btoa(`${username}:${password}`); // Encode to Base64
+  
     try {
-      const response = await axios.post(`${import.meta.env.VITE_API_URL}/v1/login`, {
-        mobile_number: data.mobileNumber,
-        password: data.password,
-      });
-      console.log('====================================');
+      const response = await axios.post(
+        `${import.meta.env.VITE_API_URL}/v1/login`,
+        {
+          mobile_number: data.mobileNumber,
+          password: data.password,
+        },
+        {
+          headers: {
+            Authorization: `Basic ${basicAuth}`,
+            "Content-Type": "application/json",
+          },
+        }
+      );
+  
+      console.log("====================================");
       console.log(response);
-      console.log('====================================');
+      console.log("====================================");
       dispatch(setToken(String(response.data["access-token"])));
-
     } catch (error) {
-      console.error("Login failed", error);
+      if (error) {
+
+        console.error("Login failed", error);
+        setIsLoading(false)
+        
+      }
     }
   });
-
-
+  
 
   
 
diff --git a/src/Redux/Service/apiSlice.tsx b/src/Redux/Service/apiSlice.tsx
index af6c96a..cc8ae3a 100644
--- a/src/Redux/Service/apiSlice.tsx
+++ b/src/Redux/Service/apiSlice.tsx
@@ -4,7 +4,7 @@ import { logout } from "./authSlice"; // Import logout action from authSlice
 import { RootState } from "../Store";
 
 const baseQuery = fetchBaseQuery({
-  baseUrl: "https://api.example.com",
+  baseUrl: `${import.meta.env.VITE_API_URL}`,
   prepareHeaders: (headers, { getState }) => {
     const token = (getState() as RootState).auth.token; // Get token from Redux store
     if (token) {
@@ -42,7 +42,7 @@ export const apiSlice = createApi({
 
 
 
-    
+
   }),
 });