updated

Worked on the termandcondition
2025-02-14 15:02:44 +05:30 · 2025-02-13 10:54:53 +05:30 · 2025-02-12 16:44:14 +05:30 · 2025-02-12 16:35:35 +05:30 · 2025-02-12 12:51:13 +05:30 · 2025-02-12 12:51:00 +05:30
118 changed files with 4588 additions and 11475 deletions
--- a/.env
+++ b/.env
@@ -1,15 +1,5 @@
-# VITE_API_URL='https://ssa.betadelivery.com/apia/v1'
-# # VITE_API_URL='http://192.16.50.44/seo-backend/apia/v1'
-# VITE_USER_NAME="Admin"
-# VITE_PASSWORD="71%@L%es^bUX94`J9XT*@bh,._WWM{$%^^&&"
-# VITE_APP_NAME=MyViteApp
-# VITE_IMG_TEMPLATES='https://ssa.betadelivery.com/storage/app/public/uploads/post_templates/'
-VITE_API_URL='https://ssa.betadelivery.com/testing/apia/v1'
-# VITE_API_URL='https://ssa.betadelivery.com/apia/v1'
+VITE_API_URL='https://ssa.betadelivery.com/apia/v1'
+# VITE_API_URL='http://192.16.50.44/seo-backend/apia/v1'
 VITE_USER_NAME="Admin"
 VITE_PASSWORD="71%@L%es^bUX94`J9XT*@bh,._WWM{$%^^&&"
-# VITE_PASSWORD="71%@L%es^bUX94`J9XT*%4&^%tUU^%Q^ffgt"
-VITE_APP_NAME=MyViteApp
-VITE_IMG_TEMPLATES='https://ssa.betadelivery.com/testing/storage/app/public/uploads/post_templates/'
-VITE_MAIN_URL='https://ssa.betadelivery.com/testing'
-VITE_POST_IMG=`${VITE_MAIN_URL}/storage/app/public/uploads/post/`
+VITE_APP_NAME=MyViteApp
--- a/.env.testing
+++ b/.env.testing
@@ -1,5 +0,0 @@
-# VITE_API_URL='https://ssa.betadelivery.com/testing/apia/'
-# VITE_USER_NAME="Admin"
-# VITE_PASSWORD="71%@L%es^bUX94`J9XT*@bh,._WWM{$%^^&&"
-# VITE_APP_NAME=MyViteApp
-# VITE_IMG_TEMPLATES='https://ssa.betadelivery.com/storage/app/public/uploads/post_templates/'
--- a/.gitignore
+++ b/.gitignore
@@ -22,4 +22,3 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
-.env
--- 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.p75md0vraj"
+    "revision": "0.ahcfbbr0fl8"
  }], {});
  workbox.cleanupOutdatedCaches();
  workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {
--- a/index.html
+++ b/index.html
@@ -1,17 +1,13 @@
 <!doctype html>
 <html lang="en">
-
-<head>
-  <meta charset="UTF-8" name="referrer" content="strict-origin-when-cross-origin" />
-  <!-- <link rel="icon" type="image/png+xml" href="/src/assets/favicon.png" /> -->
-   <link rel="icon" type="image/png" href="/favicon.png" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>SEO Admin</title>
-</head>
-
-<body>
-  <div id="root"></div>
-  <script type="module" src="/src/main.tsx"></script>
-</body>
-
-</html>
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/src/assets/favicon.png" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>SEO Admin</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/main.tsx"></script>
+  </body>
+</html>
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
    "vite-plugin-pwa": "^0.21.1"
  },
  "devDependencies": {
-    "@chakra-ui/cli": "^2.4.1",
+    "@chakra-ui/cli": "^3.2.3",
    "@eslint/js": "^9.17.0",
    "@types/js-cookie": "^3.0.6",
    "@types/react": "^18.3.18",
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -4,15 +4,12 @@ import GlobalStateContext from "./Contexts/GlobalStateContext";
 import DefaultLayout from "./Layouts/DefaultLayout";
 import Login from "./Pages/Login";
 import { RouteLink } from "./Routes/Routes";
-import ForgotPassword from "./Pages/ForgotPassword";
-import VerifyEnterOTP from "./Pages/VerifyEnterOTP";
-import SetNewPassword from "./Pages/SetNewPassword";

-function App() {
-  const context = useContext(GlobalStateContext);
-  if (!context) throw new Error("App must be used within a GlobalStateProvider");
-
-  const { isAuthenticate, setIsAuthenticate } = context;
+function App() {   
+  const context = useContext(GlobalStateContext); 
+  if (!context) throw new Error("App must be used within a GlobalStateProvider"); 
+  
+  const { isAuthenticate, setIsAuthenticate } = context; 

  useEffect(() => {
    const token = localStorage.getItem("token");
@@ -21,19 +18,16 @@ function App() {

  console.log("Auth Status:", isAuthenticate);

-  return (
-    <Router>
-      <Routes>
+  return ( 
+    <Router> 
+      <Routes> 
        {/* Redirect logged-in users away from login */}
-        <Route path="/login" element={isAuthenticate && localStorage.getItem("token") ? <Navigate to="/" /> : <Login />} />
-        <Route path="/forgot-password" element={<ForgotPassword />} />
-        <Route path="/forgot-password/verify-otp" element={<VerifyEnterOTP />} />
-        <Route path="/forgot-password/reset-password" element={<SetNewPassword />} />
+        <Route path="/login" element={isAuthenticate && localStorage.getItem("token") ? <Navigate to="/" /> : <Login />} /> 

        {/* Protected Routes */}
-        <Route
-          path="/*"
-          element={isAuthenticate && localStorage.getItem("token") ? (
+        <Route 
+          path="/*" 
+          element={isAuthenticate && localStorage.getItem("token")  ? (
            <DefaultLayout>
              <Routes>
                {RouteLink.map(({ path, Component }, index) => (
@@ -42,24 +36,15 @@ function App() {
              </Routes>
            </DefaultLayout>
          ) : (
-            <Routes>
-              {/* Allow only forgot password flows */}
-              <Route path="/forgot-password" element={<ForgotPassword />} />
-              <Route path="/forgot-password/verify" element={<VerifyEnterOTP />} />  {/* ✅ Add this line */}
-              <Route path="/forgot-password/verify-otp" element={<VerifyEnterOTP />} />
-              <Route path="/forgot-password/reset-password" element={<SetNewPassword />} />
-
-              {/* Default to login */}
-              <Route path="*" element={<Navigate to="/login" />} />
-            </Routes>
-          )}
-        />
+            <Navigate to="/login" />
+          )} 
+        /> 

        {/* Catch-all route to prevent unauthorized access */}
-        <Route path="*" element={<Navigate to="/login" />} />
-      </Routes>
-    </Router>
-  );
-}
+        <Route path="*" element={<Navigate to="/login" />} /> 
+      </Routes> 
+    </Router> 
+  ); 
+} 

 export default App;
--- a/src/Layouts/DefaultLayout.tsx
+++ b/src/Layouts/DefaultLayout.tsx
@@ -12,10 +12,9 @@ import { useDispatch } from "react-redux";
 import GlobalStateContext from "../Contexts/GlobalStateContext";
 import { useLogOutMutation } from "../Redux/Service/apiSlice";
 import ProgressBar from "../components/ProgressBar/ProgressBar";
-import { useGetProfileQuery } from "../Redux/Service/profile.password";

 const DefaultLayout: FC<{ children: React.ReactNode }> = ({ children }) => {
-  const { data } = useGetProfileQuery()
+
  const dispatch = useDispatch()
  const navigate = useNavigate()
  const location = useLocation()
@@ -26,20 +25,20 @@ const DefaultLayout: FC<{ children: React.ReactNode }> = ({ children }) => {
    throw new Error('App must be used within a GlobalStateProvider');
  }
  const { setIsAuthenticate, isBarLoading } = context;
-  const [logOutAdmin] = useLogOutMutation()
+  const [ logOutAdmin ] = useLogOutMutation()


  // Logout function
  const handleLogout = async () => {
    try {
      // ✅ Call mutation and wait for the response
-      const res = await logOutAdmin().unwrap();
+      const res = await logOutAdmin().unwrap(); 
      console.log("Logout Success:", res);
-
+  
      // ✅ Clear local storage & update authentication state
      dispatch(logout());
-      localStorage.removeItem("token");
-      setIsAuthenticate(false);
+      localStorage.removeItem("token"); 
+      setIsAuthenticate(false); 
      // ✅ Redirect to login page
      navigate("/login");
    } catch (error) {
@@ -49,43 +48,43 @@ const DefaultLayout: FC<{ children: React.ReactNode }> = ({ children }) => {

  return (
    <VStack gap={0} w="100%" h="100vh" bg="#F2F2F2">
-      <ProgressBar isLoading={isBarLoading} />
-      <HStack overflow={'hidden'} position={'relative'} bg="#F2F2F2" backgroundPosition="center" backgroundRepeat="repeat" backgroundSize="cover" gap={0} w="100%" h="calc(100% - 4px)" p={0}>
-
-        <VStack pt={0} zIndex={1} gap={0} rounded={'lg'} h="100%" w="15%" overflow={'auto'} >
-          <HStack w={'100%'} p={3} h={'7%'} justifyContent={'center'}>
-            <Image w={55} src={logo} />
-          </HStack>
-          <VStack w={'100%'} p={2} pt={0}>
-            {nav?.map(({ title, path, Icon, type, children, initPath }, index) => type === 'single' ?
-              <NavLink className="link" key={index} to={path || ''} style={{ cursor: 'pointer', borderRadius: '8px', padding: '6px', width: '100%', display: 'flex', alignItems: 'center', gap: 6, border: '1px solid #ffffff', backgroundColor: '#fff', color: '#000', boxShadow: 'rgba(99, 99, 99, 0.2) 0px 2px 8px 0px' }} ><Icon style={{ fontSize: '20px' }} /> <Text fontSize={'xs'} w={'100%'}>{title}</Text></NavLink> :
-              <AccordionRoot border={location?.pathname.startsWith(initPath ?? path) ? "1px solid #02A0A0" : '1px'} key={index} bg={'#fff'} rounded={'lg'} collapsible>
-                <AccordionItem rounded={'lg'} bg={'#fff'} boxShadow={'rgba(99, 99, 99, 0.2) 0px 2px 8px 0px'} borderBottom={'none'} p={0} key={index} value={title}>
-                  <AccordionItemTrigger className="Oxygen" color={'#fff'} onClick={() => navigate(path || '')} gap={0} style={{ cursor: 'pointer', borderRadius: '8px', padding: '5px', width: '100%', display: 'flex', alignItems: 'center', border: '1px solid #ffffff', backgroundColor: '#fff', color: '#000', fontSize: '14px', }}> <Text fontSize={'xs'} gap={1} display={'flex'} alignItems={'center'} ><Icon style={{ fontSize: '20px' }} />{title}</Text></AccordionItemTrigger>
-                  {children?.map(({ title, path, Icon }, index) => <AccordionItemContent className={`linkChild Oxygen ${location?.pathname === path && 'activeChild'}`} key={index} onClick={() => navigate(path)} style={{ marginTop: 6, cursor: 'pointer', borderRadius: '8px', padding: '6px', width: '100%', display: 'flex', alignItems: 'center', gap: 6, border: '1px solid #ffffff', backgroundColor: '#fff', color: '#919198' }} ><Icon style={{ fontSize: '20px' }} /> <Text fontSize={'xs'} w={'100%'}>{title}</Text></AccordionItemContent>)}
-                </AccordionItem>
-              </AccordionRoot>)}
-          </VStack>
-          <VStack w={'100%'} p={3} pt={0}>
-            <HStack onClick={handleLogout} className="link" style={{ cursor: 'pointer', borderRadius: '8px', padding: '6px', width: '100%', display: 'flex', alignItems: 'center', gap: 6, border: '1px solid #ffffff', backgroundColor: '#fff', color: '#000', boxShadow: 'rgba(99, 99, 99, 0.2) 0px 2px 8px 0px' }} ><LuLogOut style={{ fontSize: '20px' }} /> <Text fontSize={'xs'} w={'100%'}>Logout</Text></HStack>
-          </VStack>
+    <ProgressBar isLoading={isBarLoading}  />
+    <HStack overflow={'hidden'} position={'relative'} bg="#F2F2F2" backgroundPosition="center" backgroundRepeat="repeat" backgroundSize="cover" gap={0} w="100%" h="calc(100% - 4px)"  p={0}>
+      
+      <VStack pt={0} zIndex={1} gap={0} rounded={'lg'} h="100%" w="15%" overflow={'auto'} >
+        <HStack w={'100%'} p={3} h={'7%'} justifyContent={'center'}>
+          <Image w={55} src={logo} />
+        </HStack>
+        <VStack  w={'100%'} p={2} pt={0}>
+          {nav?.map(({ title, path, Icon, type, children, initPath }, index) => type === 'single' ?
+            <NavLink  className="link" key={index} to={path} style={{ cursor: 'pointer', borderRadius: '8px', padding: '6px', width: '100%', display: 'flex', alignItems: 'center', gap: 6, border: '1px solid #ffffff', backgroundColor:'#fff', color:'#000', boxShadow:'rgba(99, 99, 99, 0.2) 0px 2px 8px 0px'}} ><Icon style={{ fontSize: '20px' }} /> <Text fontSize={'xs'} w={'100%'}>{title}</Text></NavLink> :
+            <AccordionRoot border={location?.pathname.startsWith(initPath ?? path) ? "1px solid #02A0A0" : '1px' } key={index} bg={'#fff'} rounded={'lg'} collapsible>
+              <AccordionItem rounded={'lg'} bg={'#fff'} boxShadow={'rgba(99, 99, 99, 0.2) 0px 2px 8px 0px'} borderBottom={'none'} p={0} key={index} value={title}>
+                <AccordionItemTrigger className="Oxygen" color={'#fff'}   onClick={() => navigate(path)} gap={0} style={{ cursor: 'pointer', borderRadius: '8px', padding: '5px', width: '100%', display: 'flex', alignItems: 'center', border: '1px solid #ffffff', backgroundColor:'#fff',color:'#000',  fontSize: '14px',  }}> <Text fontSize={'xs'} gap={1} display={'flex'} alignItems={'center'} ><Icon style={{ fontSize: '20px' }} />{title}</Text></AccordionItemTrigger>
+                {children?.map(({ title, path, Icon }, index) => <AccordionItemContent className={`linkChild Oxygen ${location?.pathname === path && 'activeChild'}`} key={index} onClick={()=>navigate(path)} style={{ marginTop: 6, cursor: 'pointer', borderRadius: '8px', padding: '6px', width: '100%', display: 'flex', alignItems: 'center', gap: 6, border: '1px solid #ffffff', backgroundColor:'#fff',color:'#919198' }} ><Icon style={{ fontSize: '20px' }} /> <Text fontSize={'xs'} w={'100%'}>{title}</Text></AccordionItemContent>)}
+              </AccordionItem>
+            </AccordionRoot>)}
        </VStack>
-        <VStack gap={0} h="100%" w="85%" >
-
-          <HStack h={'11%'} w={'100%'} justifyContent={'flex-end'} pe={3} gap={6}>
-
-            <NavLink to={'/manage-notification'}><RiNotificationLine color="#013e3e" cursor={'pointer'} style={{ fontSize: '22px' }} /></NavLink>
-            <HStack cursor={'pointer'} onClick={() => navigate('/profile')} >
-              <Avatar size={'sm'} src="https://i.pinimg.com/736x/d6/cd/0f/d6cd0ffd4634b0763d3958a7325ce26e.jpg" />
-              <VStack color={'#013e3e'} gap={0} alignItems={'flex-start'}>
-                <Text fontSize={'sm'} fontWeight={'bold'}>{`${data?.data?.first_name.charAt(0).toUpperCase()}${data?.data.first_name.slice(1)}`}</Text>
-                <Text fontSize={'xs'} >{data?.data?.phone_number}</Text>
-              </VStack>
-            </HStack>
-          </HStack>
-          {children}
+        <VStack w={'100%'} p={3} pt={0}>
+        <HStack onClick={handleLogout} className="link"  style={{ cursor: 'pointer', borderRadius: '8px', padding: '6px', width: '100%', display: 'flex', alignItems: 'center', gap: 6, border: '1px solid #ffffff', backgroundColor:'#fff', color:'#000', boxShadow:'rgba(99, 99, 99, 0.2) 0px 2px 8px 0px'}} ><LuLogOut style={{ fontSize: '20px' }} /> <Text fontSize={'xs'} w={'100%'}>Logout</Text></HStack>
        </VStack>
-      </HStack>
+      </VStack>
+      <VStack  gap={0} h="100%" w="85%" >
+     
+        <HStack h={'11%'} w={'100%'} justifyContent={'flex-end'} pe={3} gap={6}>
+        
+          <NavLink to={'/manage-notification'}><RiNotificationLine color="#013e3e" cursor={'pointer'} style={{ fontSize: '22px' }} /></NavLink>
+          <HStack cursor={'pointer'} onClick={() => navigate('/profile')} >
+            <Avatar size={'sm'} src="https://i.pinimg.com/736x/d6/cd/0f/d6cd0ffd4634b0763d3958a7325ce26e.jpg" />
+            <VStack color={'#013e3e'} gap={0} alignItems={'flex-start'}>
+              <Text fontSize={'sm'} fontWeight={'bold'}>Ritesh Pandey</Text>
+              <Text fontSize={'xs'} >ritesh.pandey@wdimails.com</Text>
+            </VStack>
+          </HStack>
+        </HStack>
+        {children}
+      </VStack>
+    </HStack>
    </VStack>
  );
 };
--- a/src/Pages/Dashboard/Dashboard.tsx
+++ b/src/Pages/Dashboard/Dashboard.tsx
@@ -26,6 +26,7 @@ import {
  SelectValueText
 } from "../../components/ui/select";
 import AgencyName from "./AgencyName";
+import { Spinner } from "../../components/Sipnner/Spinner";

 const Dashboard = () => {
  const frameworks = createListCollection({
@@ -58,11 +59,16 @@ const Dashboard = () => {
      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"} pe={'20px'}  gap={5}>
+      <Box display={"flex"} p={"20px"} pt={'8px'} gap={5}>
        <Box rounded={'lg'} w={"30%"} boxShadow={"rgba(99, 99, 99, 0.2) 0px 2px 8px 0px"}>
          <Heading fontSize={"sm"} p={2}>
            Total Users
@@ -111,7 +117,7 @@ const Dashboard = () => {
        </Box>
        <Box
          p={"20px"}
-          w={"49%"}
+          w={"50%"}
          rounded={'lg'}
          boxShadow={"rgba(99, 99, 99, 0.2) 0px 2px 8px 0px"}
        >
@@ -142,8 +148,8 @@ const Dashboard = () => {
          <CircularApp />
        </Box>
      </Box>
-      <Box  p={"20px"} pt={0} display={"flex"} gap={5}>
-        <Box  w={"50%"} rounded={'lg'} bg={"#f2f2f2"} h={'100%'} p={"10px"} overflow={'auto'}>
+      <Box p={"20px"} pt={0} display={"flex"} gap={5}>
+        <Box  w={"50%"} rounded={'lg'} bg={"#f2f2f2"} h={400} p={"10px"} overflow={'auto'}>
          <HStack justifyContent={"space-between"} mb={5}>
            <Text fontSize={"xs"} fontWeight={500}>Faqs</Text>
            <Button
@@ -159,7 +165,6 @@ const Dashboard = () => {
          <AccordionRoot collapsible defaultValue={["b"]}>
            {accItems.map((item, index) => (
              <AccordionItem
-              boxShadow={'rgba(99, 99, 99, 0.2) 0px 2px 8px 0px'} 
                key={index}
                value={item.value}
                bg={"#fff"}
@@ -178,10 +183,11 @@ const Dashboard = () => {
            ))}
          </AccordionRoot>
        </Box>
-        <Box w={"50%"} rounded={'lg'} bg={"#f2f2f2"} h={'100%'} overflow={'auto'}>
+        <Box w={"50%"} rounded={'lg'} bg={"#f2f2f2"} h={400} overflow={'auto'}>
          <AgencyName />
        </Box>
      </Box>
+     
    </MainFrame>
  );
 };
--- a/src/Pages/ForgotPassword.tsx
+++ b/src/Pages/ForgotPassword.tsx
@@ -1,171 +0,0 @@
-import {
-    Box,
-    Center,
-    HStack,
-    Image,
-    Input,
-    Text,
-    VStack,
-} from "@chakra-ui/react";
-import axios from "axios";
-import { useState } from "react";
-import { useForm } from "react-hook-form";
-// import { useDispatch } from "react-redux";
-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 { useNavigate } from "react-router-dom";
-
-interface FormValues {
-    mobileNumber: number;
-}
-
-const ForgotPassword = () => {
-    const navigate = useNavigate();
-    const [isLoading, setIsLoading] = useState<boolean>(false);
-    const {
-        register,
-        handleSubmit,
-        formState: { errors },
-    } = useForm<FormValues>();
-
-    const onSubmit = handleSubmit(async (data) => {
-        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 = `${username}:${password}`; // Encode to Base64
-        
-        setIsLoading(true);
-        try {
-            const res = await axios.post(
-                `${import.meta.env.VITE_API_URL}/send-otp`,
-                {
-                    mobile_number: Number(data.mobileNumber),
-                },
-                {
-                    headers: {
-                        Authorization: `Basic ${basicAuth}`,
-                        "Content-Type": "application/json",
-                    },
-                }
-            );
-
-            if (res.status === 200) {
-                navigate(`/forgot-password/verify?phone=${data.mobileNumber}`)
-            } else {
-                // alert(res.data.message || "Something went wrong");
-                toaster.create({
-                    // title: error?.response?.data?.message,
-                    title: res.data.message || "Something went wrong",
-                    type: "error",
-                })
-                setIsLoading(false);
-            }
-            console.log("============", res);
-
-        } catch (error) {
-            console.log('error', error);
-
-            if (error) {
-                toaster.create({
-                    // title: error?.response?.data?.message,
-                    title: "Something Went Wrong",
-                    type: "info",
-                })
-                // console.log("Login failed", error?.response?.data?.message);
-                setIsLoading(false);
-            }
-        }
-    });
-
-    return (
-
-        <VStack appearance={'light'} w={"100%"} h={"100vh"} bg={"#ffffff"}>
-            <HStack
-                boxShadow={"rgba(99, 99, 99, 0.2) 0px 2px 8px 0px"}
-                w={"100%"}
-                ps={8}
-                h={"7%"}
-                justifyContent={"flex-start"}
-            >
-                <Image w={50} src={logo} />
-            </HStack>
-
-            <HStack w={"100%"} h={"93%"} p={8} gap={8}>
-                <Center
-                    display={{ base: "none", md: "flex" }}
-                    bg={"#02A0A033"}
-                    w={"50%"}
-                    h={"100%"}
-                    rounded={"3xl"}
-                >
-                    <Image w={250} src={logo} />
-                </Center>
-
-                <Box
-                    as={"form"}
-                    onSubmit={onSubmit}
-                    p={{ base: 4, md: 16 }}
-                    w={{ base: "100%", md: "50%" }}
-                    h={"100%"}
-                >
-                    <VStack gap={2} w={"100%"}>
-                        <Text
-                            w={"100%"}
-                            textAlign={"center"}
-                            fontSize={"24px"}
-                            fontWeight={"normal"}
-                            color={"#313039"}
-                        >
-                            Forgot Password
-                        </Text>
-
-                        <Box mt={6} gap={4} w={"full"}>
-                            <Field
-                                color={"#313039"}
-                                label={"Enter Mobile Number"}
-                                w={"100%"}
-                                invalid={!!errors.mobileNumber}
-                                errorText={errors.mobileNumber?.message}
-                                mb={4}
-                            >
-                                <Input
-                                    type="number"
-                                    ps={3}
-                                    maxLength={10}
-                                    {...register("mobileNumber", {
-                                        required: "Please enter a 10 digit mobile number",
-                                        pattern: {
-                                            value: /^[0-9]{10}$/,
-                                            message: "Mobile number must be exactly 10 digits"
-                                        }
-                                    })}
-                                    placeholder="Enter Mobile Number"
-                                    onInput={(e) => {
-                                        const target = e.target as HTMLInputElement;
-                                        target.value = target.value.replace(/\D/g, "").slice(0, 10);
-                                    }}
-                                />
-                            </Field>
-                            <Button
-                                loading={isLoading}
-                                mt={4}
-                                size={"sm"}
-                                bg={"#02A0A0"}
-                                rounded={"md"}
-                                w={"100%"}
-                                color={"#ffffff"}
-                                type="submit"
-                            >
-                                Send OTP
-                            </Button>
-                        </Box>
-                    </VStack>
-                </Box>
-                <Toaster />
-            </HStack>
-        </VStack>
-    );
-};
-
-export default ForgotPassword;
--- a/src/Pages/Login.tsx
+++ b/src/Pages/Login.tsx
@@ -18,8 +18,8 @@ import { Button } from "../components/ui/button";
 import { Field } from "../components/ui/field";
 import { toaster, Toaster } from "../components/ui/toaster";
 import { PasswordInput } from "../components/ui/password-input";
-import { Link, useNavigate } from "react-router-dom";
-// import ForgetPassword from "./ForgetPassword";
+import { useNavigate } from "react-router-dom";
+import ForgetPassword from "./ForgetPassword";

 interface FormValues {
  mobileNumber: number;
@@ -46,7 +46,7 @@ const Login = () => {
    // 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 = `${username}:${password}`; // Encode to Base64
+    const basicAuth = `${username} : ${password}`; // Encode to Base64

    try {
      const res = await axios.post(
@@ -62,8 +62,8 @@ const Login = () => {
          },
        }
      );
-      console.log("============", res);
-
+      console.log("============",res);
+      

      if (res.data) {
        setIsAuthenticate(true);
@@ -77,13 +77,13 @@ const Login = () => {
        console.log(res);
        console.log("====================================");
      }
-    } catch (error: any) {
-      console.log('error', error.response.data.message);
-
+    } catch (error) {
+      console.log('error', error);
+      
      if (error) {
        toaster.create({
-          title: error?.response?.data?.message,
-          // title: "Something Went Wrong",
+          // title: error?.response?.data?.message,
+          title: "Something Went Wrong",
          type: "info",
        })
        // console.log("Login failed", error?.response?.data?.message);
@@ -181,15 +181,7 @@ const Login = () => {
                Login
              </Button>

-              {/* <ForgetPassword /> */}
-              <Box textAlign={"center"} mt={4}>
-                <Link
-                  to={'/forgot-password'}
-                  style={{ color: "black", fontSize: "16px" }}
-                >
-                  Forgot Password
-                </Link>
-              </Box>
+              <ForgetPassword />
            </Box>
          </VStack>
        </Box>
--- a/src/Pages/ManageCMS/AboutUs/AboutUs.tsx
+++ b/src/Pages/ManageCMS/AboutUs/AboutUs.tsx
@@ -1,132 +1,68 @@
-// import { Badge, HStack, Text, VStack } from "@chakra-ui/react";
-// import MainFrame from "../../../components/MainFrame"
-// import { useGetAboutUsQuery } from "../../../Redux/Service/manage.aboutus.service";
-// import { Spinner } from "../../../components/Sipnner/Spinner";
-// import GlobalStateContext from "../../../Contexts/GlobalStateContext";
-// import { useContext, useEffect } from "react";
-// import AboutUsAddModel from "./AboutUsAddModel";
-
-
-
-// const AboutUs = () => {
-
-//   const { data, isLoading, isFetching } = useGetAboutUsQuery();
-
-//   // const content = data?.data
-//   console.log('====================================');
-//   console.log(data);
-//   console.log('====================================');
-
-//   const context = useContext(GlobalStateContext);
-//   if (!context) throw new Error('App must be used within a GlobalStateProvider');
-
-//   const { setIsBarLoading } = context;
-//   useEffect(() => {
-//     setIsBarLoading(isFetching)
-//   }, [data])
-
-//   return (
-//     <MainFrame transperant={true}>
-//       <VStack gap={4} pb={4} pt={0}>
-//         {isLoading || isFetching ?
-//           <Spinner /> : data?.data?.map(({ id, content, about_language }) => <VStack bg={'#fff'}
-//             boxShadow={'rgba(99, 99, 99, 0.2) 0px 2px 8px 0px'} rounded={'lg'} p={3} key={id}>
-//             <HStack
-//               w={"100%"}
-//               justifyContent={"space-between"}
-
-//               py={0}
-//               px={0}
-//             >
-//               <Text as={"span"} fontSize={"sm"} fontWeight={500} color={"#000"}>
-//                 About Us <Badge variant={'surface'} colorPalette="cyan" ms={2} size={'sm'} fontSize={'xs'} px={2}>🎓 {about_language?.language_name}</Badge>
-//               </Text>
-
-//               {/* <AboutUsAddModel /> */}
-//               <AboutUsAddModel/>
-//             </HStack>
-//             <Text
-//               as="p"
-//               fontSize="sm"
-//               fontWeight={400}
-//               color="#1D1D1D"
-//             >
-//               {content}
-//             </Text>
-
-//           </VStack>)}
-//       </VStack>
-//     </MainFrame>
-//   )
-// }
-// export default AboutUs
-
-import { Badge, HStack, Stack, Text, VStack } from "@chakra-ui/react";
-import MainFrame from "../../../components/MainFrame";
+import { Box, HStack, Skeleton, Text } from "@chakra-ui/react";
+import MainFrame from "../../../components/MainFrame"
+import AboutUsAddModel from "../../ManageCMS/AboutUs/AboutUsAddModel";
 import { useGetAboutUsQuery } from "../../../Redux/Service/manage.aboutus.service";
-import { Spinner } from "../../../components/Sipnner/Spinner";
-import GlobalStateContext from "../../../Contexts/GlobalStateContext";
-import { useContext, useEffect } from "react";
-import AboutUsAddModel from "./AboutUsAddModel";
+
+

 const AboutUs = () => {
-  const { data, isLoading, isFetching } = useGetAboutUsQuery();

-  console.log("Fetched About Us Data:", data);
+  const { data, isLoading } = useGetAboutUsQuery();

-  const context = useContext(GlobalStateContext);
-  if (!context) throw new Error("App must be used within a GlobalStateProvider");
+  const content = data?.data?.[0]?.content
+  console.log('====================================');
+  // console.log(response);
+  console.log('====================================');

-  const { setIsBarLoading } = context;
-  useEffect(() => {
-    setIsBarLoading(isFetching);
-  }, [isFetching, setIsBarLoading]);

  return (
-    <MainFrame transperant={true}>
-      <VStack gap={4} pb={4} pt={0}>
-        <Stack bg={"#fff"} w={"100%"} mt={2} p={4} borderRadius={4}><Text color={"black"} textAlign={"left"} fontWeight={"600"} >             About Us
-        </Text></Stack>

-        {isLoading || isFetching ? (
-          <Spinner />
+    <MainFrame>
+      <Box pb={4}>
+        <HStack
+          w={"100%"}
+          justifyContent={"space-between"}
+          mb={4}
+          py={0}
+          px={3}
+        >
+          <Text as={"span"} fontSize={"sm"} fontWeight={500} color={"#000"}>
+            AboutUs
+          </Text>
+
+          <HStack>
+
+            <AboutUsAddModel />
+          </HStack>
+        </HStack>
+        {/* Show Skeleton until content is available */}
+        {isLoading || !content ? (
+          <Box px={3} w="85%">
+            <Skeleton height="20px" mb="10px" />
+            <Skeleton height="20px" mb="10px" />
+            <Skeleton height="20px" mb="10px" />
+            <Skeleton height="20px" mb="10px" width="75%" />
+            <Skeleton height="20px" mb="15px" width="90%" />
+            <Skeleton height="20px" mb="10px" />
+            <Skeleton height="20px" mb="10px" width="85%" />
+            <Skeleton height="20px" mb="10px" />
+            <Skeleton height="20px" width="70%" />
+          </Box>
        ) : (
-          data?.data?.map(({ id, content, about_language }) => (
-            <VStack
-              bg={"#fff"}
-              boxShadow={"rgba(99, 99, 99, 0.2) 0px 2px 8px 0px"}
-              rounded={"lg"}
-              p={3}
-              key={id}
-            >
-
-              <HStack w={"100%"} justifyContent={"space-between"} py={0} px={0}>
-                <Text as={"span"} fontSize={"sm"} fontWeight={500} color={"#000"}>
-                  <Badge
-                    variant={"surface"}
-                    colorPalette="cyan"
-                    ms={2}
-                    size={"sm"}
-                    fontSize={"xs"}
-                    px={2}
-                  >
-                    🎓 {about_language?.language_name}
-                  </Badge>
-                </Text>
-
-                {/* Pass Data to AboutUsAddModel */}
-                <AboutUsAddModel aboutUsData={{ id, content, about_language }} />
-              </HStack>
-              <Text as="p" fontSize="sm" fontWeight={400} color="#1D1D1D">
-                {/* {content} */}
-                <div dangerouslySetInnerHTML={{ __html: content }} />
-              </Text>
-            </VStack>
-          ))
+          <Text
+            as="p"
+            fontSize="sm"
+            fontWeight={400}
+            color="#1D1D1D"
+            px={3}
+            w="85%"
+            mb="15px"
+          >
+            {content}
+          </Text>
        )}
-      </VStack>
+      </Box>
    </MainFrame>
-  );
-};
-
-export default AboutUs;
+  )
+}
+export default AboutUs
--- a/src/Pages/ManageCMS/AboutUs/AboutUsAddModel.tsx
+++ b/src/Pages/ManageCMS/AboutUs/AboutUsAddModel.tsx
@@ -1,142 +1,119 @@
+import React, { useState } from "react";
 import { FaRegEdit } from "react-icons/fa";
 import {
-    DialogBody,
-    DialogCloseTrigger,
-    DialogContent,
-    DialogFooter,
-    DialogHeader,
-    DialogRoot,
-    DialogTitle,
-    DialogTrigger,
+  DialogBody,
+  DialogCloseTrigger,
+  DialogContent,
+  DialogFooter,
+  DialogHeader,
+  DialogRoot,
+  DialogTitle,
+  DialogTrigger,
 } from "../../../components/ui/dialog";
-import { Field, Stack, Text } from "@chakra-ui/react";
+import { Field, Stack, Text, Textarea } from "@chakra-ui/react";
 import { Button } from "../../../components/ui/button";
-import ReactQuill from "react-quill";
-import "react-quill/dist/quill.snow.css"; // Import the styles
-import { useState } from "react";
 import { useUpdateAboutUsMutation } from "../../../Redux/Service/manage.aboutus.service";
-import { useForm, Controller } from "react-hook-form"; // Import React Hook Form

-function AboutUsAddModel({ aboutUsData }: { aboutUsData: any }) {
-    const [isOpen, setIsOpen] = useState(false);
+function AboutUsAddModel() {
+  const [content, setContent] = useState(""); // State for the textarea input
+  const [updateAboutUs, { isLoading }] = useUpdateAboutUsMutation(); // Mutation for updating About Us
+  //   const toast = useToast(); // Toast for feedback

-    // RTK Query Mutation Hook
-    const [updateAboutUs] = useUpdateAboutUsMutation();
+  // Handle form submission
+  const handleSubmit = async (e: any) => {
+    e.preventDefault(); // Prevent default form submission

-    // React Hook Form
-    const {
-        control,
-        handleSubmit,
-        reset,
-        setValue,
-    } = useForm({
-        defaultValues: {
-            content: "",
-            languageCode: "",
-        },
-    });
+    try {
+      // Call the updateAboutUs mutation
+      const res = await updateAboutUs({ id: 2, updatedData: content }).unwrap();
+      console.log(res);

-    // Function to handle edit click (pre-fill the editor)
-    const handleEditClick = (data: any) => {
-        setValue("content", data.content); // Pre-fill the content field
-        setValue("languageCode", data.about_language.language_code); // Pre-fill the language code
-        setIsOpen(true); // Open dialog
-    };
+      // Show success toast
+      //   toast({
+      //     title: "Success",
+      //     description: "About Us content updated successfully",
+      //     status: "success",
+      //     duration: 5000,
+      //     isClosable: true,
+      //   });

-    // Function to handle update submission
-    const onSubmit = async (formData: any) => {
-        if (!formData.content.trim()) return; // Prevent empty updates
+      // Clear the input field after successful submission
+      setContent("");
+    } catch (error) {
+      // Show error toast
+      //   toast({
+      //     title: "Error",
+      //     description: "Failed to update About Us content",
+      //     status: "error",
+      //     duration: 5000,
+      //     isClosable: true,
+      //   });
+    }
+  };

-        try {
-            await updateAboutUs({
-                id: aboutUsData.id,
-                content: formData.content,
-                language_code: formData.languageCode,
-            }).unwrap();
-            setIsOpen(false); // Close dialog on success
-            reset(); // Reset the form
-        } catch (error) {
-            console.error("Update failed:", error);
-        }
-    };
+  return (
+    <DialogRoot placement="center">
+      <DialogTrigger asChild>
+        <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>

-    return (
-        <DialogRoot placement="center" open={isOpen}>
-            <DialogTrigger asChild>
-                <Button
-                    bgColor="#EEEEEE"
-                    pl={3}
-                    pr={3}
-                    size="xs"
-                    color="#000"
-                    onClick={() => handleEditClick(aboutUsData)} // Set content before opening modal
-                >
-                    <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" }}
+        height="auto"
+        p={3}
+      >
+        <DialogHeader bg="white">
+          <DialogTitle alignSelf="center" color="black" fontSize="14px">
+            Edit
+          </DialogTitle>
+        </DialogHeader>

-            <DialogContent bg="#fff" w={{ base: "90%", md: "1200px" }} height="auto" p={3}>
-                <DialogHeader bg="white">
-                    <DialogTitle alignSelf="center" color="black" fontSize="14px">
-                        Edit About Us
-                    </DialogTitle>
-                </DialogHeader>
+        <DialogBody bg="white">
+          <Stack py={3}>
+            <Field.Root>
+              <Field.Label color="black" pt={1} fontSize="12px">
+                AboutUs
+              </Field.Label>
+              <Textarea
+                placeholder="Enter About Us content"
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                p={2}
+                fontSize="12px"
+                height="140px" // Increased height for better usability
+                pt={1.5}
+                value={content} // Bind the state to the textarea
+                onChange={(e) => setContent(e.target.value)} 
+                resize={'none'}
+                _focusVisible={{outline:'none'}}
+              />
+            </Field.Root>
+          </Stack>
+        </DialogBody>

-                <DialogBody bg="white">
-                    <Stack py={3} mb={8}>
-                        <Field.Root>
-                            <Field.Label color="black" pt={1} fontSize="12px">
-                                About Us Content
-                            </Field.Label>
-                            {/* Use Controller to integrate ReactQuill with React Hook Form */}
-                            <Controller
-                                name="content"
-                                control={control}
-                                render={({ field }) => (
-                                    <ReactQuill
-                                        value={field.value}
-                                        onChange={field.onChange}
-                                        placeholder="Enter About Us content"
-                                        modules={{
-                                            toolbar: [
-                                                [{ 'header': [1, 2, false] }],
-                                                ['bold', 'italic', 'underline', 'strike'],
-                                                ['link', 'image'],
-                                                [{ 'list': 'ordered' }, { 'list': 'bullet' }],
-                                                ['clean']
-                                            ],
-                                        }}
-                                        formats={[
-                                            'header',
-                                            'bold', 'italic', 'underline', 'strike',
-                                            'list', 'bullet',
-                                            'link', 'image'
-                                        ]}
-                                        style={{ color: "black", border: "none", fontSize: "12px", height: "170px", width: "100%" }}
-                                    />
-                                )}
-                            />
-                        </Field.Root>
-                    </Stack>
-                </DialogBody>
+        <DialogFooter display="flex" justifyContent="center" pt="2">
+          <Button
+            w="100%"
+            bg="#02A0A0"
+            color="#fff"
+            onClick={handleSubmit} // Trigger handleSubmit on button click
+            // isLoading={isLoading} // Show loading state while the mutation is in progress
+          >
+            Save
+          </Button>
+        </DialogFooter>

-                <DialogFooter display="flex" justifyContent="center" pt="2">
-                    <Button
-                        w="100%"
-                        bg="#02A0A0"
-                        color="#fff"
-                        // isLoading={isLoading}
-                        onClick={handleSubmit(onSubmit)} // Use handleSubmit to trigger form submission
-                    >
-                        Save
-                    </Button>
-                </DialogFooter>
-
-                <DialogCloseTrigger color="black" onClick={() => setIsOpen(false)} />
-            </DialogContent>
-        </DialogRoot>
-    );
+        <DialogCloseTrigger color="black" />
+      </DialogContent>
+    </DialogRoot>
+  );
 }

-export default AboutUsAddModel;
+export default AboutUsAddModel;
--- a/src/Pages/ManageCMS/FAQ/EditDetails.tsx
+++ b/src/Pages/ManageCMS/FAQ/EditDetails.tsx
@@ -11,100 +11,24 @@ import {
 } from "../../../components/ui/dialog";
 import { Field, Input, Stack, Textarea } from "@chakra-ui/react";
 import Edit from "../../../components/ActionIcons/Edit";
-import { useUpdateFaqMutation } from "../../../Redux/Service/faqs.service";
-import { useEffect, useState } from "react";
-import { Toaster, toaster } from "../../../components/ui/toaster";
-
-interface RowData {
-  id: number;
-  principal_type_xid: number;
-  question: string;
-  answer: string;
-}
-
-function EditDetails({ rowData, refetch }: {rowData: RowData, refetch: VoidFunction}) {
-  const [faqQuestion, setFaqQuestion] = useState(rowData?.question);
-  const [faqAnswer, setFaqAnswer] = useState(rowData?.answer);
-  const [isOpen, setIsOpen] = useState(false);
-  const [updateFaq] = useUpdateFaqMutation()
-
-  // console.log('ROWDATA', rowData);
-  
-
-  useEffect(() => {
-    if (rowData) {
-      setFaqQuestion(rowData.question);
-      setFaqAnswer(rowData.answer);
-    }
-  }, [rowData]);
-
-
-  const handleOpenModal = () => {
-    setIsOpen(true);
-  };
-
-
-  const handleSubmit = async () => {
-    if (!faqQuestion.trim() || !faqAnswer.trim()) {
-      toaster.create({
-        title: "Error",
-        description: "Input fields cannot be empty",
-        type: "error",
-      });
-      return;
-    }
-
-    const payload = {
-      id: rowData?.id,
-      question: faqQuestion,
-      answer: faqAnswer,
-      principal_type_xid: rowData?.principal_type_xid,
-    };
-
-    try {
-      const response = await updateFaq(payload).unwrap();
-      if (response?.status === "success") {
-        toaster.create({
-          title: "Success",
-          description: "FAQ updated successfully",
-          type: "success",
-        });
-        refetch()
-        setIsOpen(false);
-      } else {
-        toaster.create({
-          title: "Error",
-          description: "Failed to update FAQ",
-          type: "error",
-        });
-      }
-    } catch (error) {
-      console.error("Error updating template:", error);
-      // alert("Failed to update template");
-      toaster.create({
-        title: "Error",
-        description: "Something went wrong",
-        type: "error",
-      });
-    }
-  };
-
+function EditDetails() {
  return (
-    <DialogRoot placement="center" open={isOpen} onOpenChange={({ open }) => setIsOpen(open)}>
+    <DialogRoot placement="center">
      <DialogTrigger asChild>
-
-        <Button bg="transparent" color={"black"} h={"18px"} onClick={handleOpenModal}><Edit /></Button>
+        <Edit />
      </DialogTrigger>

      <DialogContent
        bg={"#fff"}
+        // w={{ lg: "60%", md: "230px" }}
        w={{ base: "90%", md: "400px" }}
        height={"auto"}
-        p={3}
+        p={3} // Reduced padding
+        bgSize={"md"}
      >
        <DialogHeader bg="white">
          <DialogTitle alignSelf="center" color="black" fontSize="14px">
-            Edit Details (ID: {rowData?.id})
+            Edit Details
          </DialogTitle>
        </DialogHeader>

@@ -112,18 +36,16 @@ function EditDetails({ rowData, refetch }: {rowData: RowData, refetch: VoidFunct
          <Stack py={3}>
            <Field.Root>
              <Field.Label color="black" pt={1} fontSize="12px">
-                Question
+                Questions
              </Field.Label>
              <Input
-                placeholder="Question"
+                placeholder="Questions"
                bgColor="#EEEEEE"
                color="black"
                border="none"
                pl={1}
                fontSize="12px"
                height="30px"
-                value={faqQuestion}
-                onChange={(e) => setFaqQuestion(e.target.value)}
              />

              <Field.Label color="black" pt={1} fontSize="12px">
@@ -134,26 +56,22 @@ function EditDetails({ rowData, refetch }: {rowData: RowData, refetch: VoidFunct
                bgColor="#EEEEEE"
                color="black"
                border="none"
-                p={2}
+                pl={1}
                fontSize="12px"
-                height="auto"
+                height="30px"
                pt={1.5}
-                value={faqAnswer}
-                onChange={(e) => setFaqAnswer(e.target.value)}
              />
            </Field.Root>
          </Stack>
        </DialogBody>
-
        <DialogFooter display="flex" justifyContent="center" pt={"2"}>
-          <Button w="100%" bg="#02A0A0" color={"#fff"} onClick={handleSubmit}>
+          <Button w="100%" bg="#02A0A0" color={"#fff"}>
            Save
          </Button>
        </DialogFooter>

-        <DialogCloseTrigger color="black" onClick={() => setIsOpen(false)} />
+        <DialogCloseTrigger color="black" />
      </DialogContent>
-      <Toaster />
    </DialogRoot>
  );
 }
--- a/src/Pages/ManageCMS/FAQ/FAQ.tsx
+++ b/src/Pages/ManageCMS/FAQ/FAQ.tsx
@@ -1,194 +1,53 @@
-import { Box, HStack, Image, Spinner, 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";
-// import { LuSearch } from "react-icons/lu";
+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 "./FaqAddModel";
 import Delete from "../../../components/ActionIcons/Delete";
-import { useEffect, useState } from "react";
-import { FaqData, useDeleteFaqPostMutation, useFaqToggleMutation, useGetFaqQuery } from "../../../Redux/Service/faqs.service";
-import SearchComponent from "../../../components/SearchComponent";
-import NoData from "../../../components/NoData";
-import { Toaster, toaster } from "../../../components/ui/toaster";


 // table data

 const tableHeadRow = [
  "Sr. No",
-  'Category',
  "Question",
  "Answer",
  "Action",
 ];

-// const managepost: any[] = [
-//   ...Array.from({ length: 12 }, (_, i) => ({
-//     "Sr. No": i + 1,
-//     "Question": "Lorem Ipsum",
-//     "Answer": "Lorem Ipsum",
-//     "Action": (
-//       <HStack justifyContent="center">
-//         <Box>
-//           <Switch colorPalette={'teal'} size={"xs"} />
-//         </Box>
-//         {/* <EditDetails /> */}
-//         <EditDetails id={(i + 1).toString()} question="Lorem Ipsum" answer="Lorem Ipsum" />
-
-//         <AlertDailog
-//           AltertTiggerIcon={() => <Delete />}
-//           alertText="Delete Users"
-//           alertIcon={<Image src={"DeleteIcon"} h={"39px"} />}
-//           alertCaption="are you sure you want to delete ?"
-//           onConfirm={() => {
-//             console.log("User deleted:", i + 1);
-//           }}
-//         />
-//       </HStack>
-//     ),
-//   })),
-// ];
+const managepost: any[] = [
+  ...Array.from({ length: 12 }, (_, i) => ({
+    "Sr. No": i + 1,
+    "Question": "Lorem Ipsum",
+    "Answer": "Lorem Ipsum",
+    "Action": (
+      <HStack justifyContent="center">
+        <Box>
+          <Switch colorPalette={'teal'} size={"xs"}/>
+        </Box>
+        <EditDetails />
+        <AlertDailog
+          AltertTiggerIcon={() => <Delete />} 
+          alertText="Delete Users"
+          alertIcon={<Image src={"DeleteIcon"} h={"39px"} />}
+          alertCaption="are you sure you want to delete ?"
+          onConfirm={() => {
+            console.log("User deleted:", i + 1);
+          }}
+        />
+      </HStack>
+    ),
+  })),
+];

 const FAQ = () => {
-  const [currentPage, setCurrentPage] = useState(1);
-  const { data, refetch, isLoading, isFetching } = useGetFaqQuery(currentPage)
-  const [localData, setLocalData] = useState<any[]>([]);
-  const [faqToggle] = useFaqToggleMutation()
-  const [deleteFaqPost] = useDeleteFaqPostMutation()
-  const [searchTerm, setSearchTerm] = useState("");
-  const [deleteModal, setDeleteModal] = useState(false)
-  const [selectedFaqId, setSelectedFaqId] = useState<number | null>(null);
-
-  console.log('DATA', data?.data.data);
-
-  useEffect(() => {
-    if (data) {
-      setLocalData(data?.data.data);
-    }
-  }, [data]);
-
-  const handlePageChange = (page: number) => {
-    setCurrentPage(page);
-  };
-
-
-  const handleToggle = async (agencyId: number, currentStatus: string) => {
-    const newStatus = currentStatus === '1' ? '0' : '1';
-    setLocalData((prevData) =>
-      prevData.map((agency) =>
-        agency.id === agencyId ? { ...agency, is_active: newStatus } : agency
-      )
-    );
-
-    try {
-      await faqToggle({ id: agencyId, is_active: newStatus }).unwrap();
-      refetch()
-    } catch (error) {
-      console.error("Error updating privacy policy:", error);
-      setLocalData((prevData) =>
-        prevData.map((agency) =>
-          agency.id === agencyId ? { ...agency, is_active: currentStatus } : agency
-        )
-      );
-    }
-  };
-
-  const handleDeleteFaq = async (faqId: number) => {
-    try {
-      const response = await deleteFaqPost({ id: faqId }).unwrap();
-      if (response?.status === "success") {
-        toaster.create({
-          title: "Success",
-          description: "FAQ deleted successfully",
-          type: "success",
-        });
-        refetch()
-        console.log("FAQ deleted successfully:", response);
-      }
-      // Optionally, refetch data or update state after deletion
-    } catch (error) {
-      console.error("Error deleting FAQ:", error);
-      toaster.create({
-        title: "Error",
-        description: "Something went wrong",
-        type: "error",
-      });
-    }
-  };
-
-  const filteredData = localData?.filter((agency) =>
-    agency.translations.some((translation: any) => {
-      const searchLower = searchTerm.toLowerCase();
-      const questionMatch = translation.question?.toLowerCase().includes(searchLower);
-      const answerMatch = translation.answer?.toLowerCase().includes(searchLower);
-      return questionMatch || answerMatch;
-    })
-  );
-
-  console.log("filteredData", filteredData);
-
-
-  const managepost = filteredData?.flatMap((agency: FaqData, index: number) =>
-    agency.translations.map((translation: any) => ({
-      'id': translation.id,
-      "Sr. No": (currentPage - 1) * (data?.data.per_page ?? 0) + index + 1,
-      "Question": translation.question,
-      "Answer": translation.answer,
-      'Category': agency.principal_type_xid === 2 ? "Recruiter" : "Job Seeker",
-
-      "Action": (
-        <HStack justifyContent="center">
-          <EditDetails rowData={{ id: agency.id, question: translation.question, answer: translation.answer, principal_type_xid: agency.principal_type_xid }} refetch={refetch} />
-
-          <AlertDailog
-            isOpen={deleteModal}
-            AltertTiggerIcon={() => <Delete onClick={() => {
-              setSelectedFaqId(agency.id);
-              setDeleteModal(true)
-            }} />}
-            alertText="Delete FAQ"
-            alertIcon={<Image src={"DeleteIcon"} h={"39px"} />}
-            alertCaption="are you sure you want to delete ?"
-            onClose={() => setDeleteModal(false)}
-            onConfirm={() => {
-              // console.log("Deleting FAQ with ID:", selectedFaqId); // Correct ID
-              if (selectedFaqId) {
-                setDeleteModal(false);
-                handleDeleteFaq(selectedFaqId);
-              }
-            }}
-          /> 
-          <Box>
-            <Switch
-              colorPalette={'teal'}
-              size={"xs"}
-              onChange={() => handleToggle(Number(agency.id), agency.is_active.toString())}
-              checked={Boolean(Number(agency.is_active))}
-              key={`switch-${agency.id}`}
-            />
-          </Box>
-        </HStack>
-      ),
-    })))
-
-  if (isFetching) {
-    return (
-      <HStack
-        w={"100%"}
-        justifyContent={"center"}
-        mb={4}
-        py={0}
-        px={3}
-      >
-        <Spinner color={'teal'} />
-      </HStack>
-    )
-  }
-
  return (
+
    <MainFrame>
      <Box>
        <HStack
@@ -199,35 +58,40 @@ const FAQ = () => {
          px={3}
        >
          <Text as={"span"} fontSize={"sm"} fontWeight={500} color={"#000"}>
-            FAQs
+           FAQs
          </Text>

          <HStack >
-            <SearchComponent
-              value={searchTerm}
-              onChange={setSearchTerm}
-            />
+            <InputGroup 
+              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={"xs"}
+                fontSize={"2sm"}
+                placeholder="Search..."
+                bgColor={'#EEEEEE'}
+                ps={8}
+              />
+            </InputGroup>
            {/* <Button bgColor={'#EEEEEE'} pl={3} pr={3}><IoMdAdd /> <Text>Add</Text></Button> */}
-            <FaqAddModel refetch={refetch} />
+            <FaqAddModel />
          </HStack>
        </HStack>
-        {isFetching && <Spinner />}
-        {!isLoading && !data?.data ? (
-          <NoData message={'No data found'} text={'Please add new data'} />
-        ) : (<DataTable
-          sortableColumns={["Name"]}
+        <DataTable
+          sortableColumns={["Name", "Registration Date "]}
          tableHeadRow={tableHeadRow}
          data={managepost}
-          paginationData={{
-            current_page: data?.data.current_page || 1,
-            last_page: data?.data.last_page || 1,
-            per_page: data?.data.per_page || 10,
-            total: data?.data.total || 0
-          }}
-          onPageChange={handlePageChange}
-        />)}
-      </Box>
-      <Toaster />
+        />
+      </Box>       
    </MainFrame>
  )
 }
--- a/src/Pages/ManageCMS/FAQ/FaqAddModel.tsx
+++ b/src/Pages/ManageCMS/FAQ/FaqAddModel.tsx
@@ -8,77 +8,15 @@ import {
  DialogTitle,
  DialogTrigger,
 } from "../../../components/ui/dialog";
-import { Box, Field, Input, Stack, Text, Textarea } from "@chakra-ui/react";
+import { Field, Input, Stack, Text, Textarea } from "@chakra-ui/react";
 import { IoMdAdd } from "react-icons/io";
 import { Button } from "../../../components/ui/button";
-import { useState } from "react";
-import { Toaster, toaster } from "../../../components/ui/toaster";
-import { useCreateFaqPostMutation } from "../../../Redux/Service/faqs.service";
-
-function FaqAddModel({ refetch }: { refetch: VoidFunction }) {
-  const [faqQuestion, setFaqQuestion] = useState('');
-  const [faqAnswer, setFaqAnswer] = useState('');
-  const [userType, setUserType] = useState("");
-  const [isOpen, setIsOpen] = useState(false);
-  const [createFaqPost] = useCreateFaqPostMutation()
-
-  const handleOpenModal = () => {
-    setIsOpen(true);  // Open modal when clicking "Add"
-  };
-
-  const handleSubmit = async () => {
-    if (userType === "" || isNaN(Number(userType))) {
-      toaster.create({
-        title: "Error",
-        description: "Please select a valid user type.",
-        type: "error",
-      });
-      return;
-    }
-
-    if (!faqQuestion.trim() || !faqAnswer.trim()) {
-      toaster.create({
-        title: "Error",
-        description: "Please fill in all required fields",
-        type: "error",
-      });
-      return;
-    }
-
-    const payload = {
-      principal_type_xid: Number(userType),
-      language_code: 'en',
-      question: faqQuestion,
-      answer: faqAnswer
-    };
-
-    try {
-      const response = await createFaqPost(payload).unwrap();
-      if (response) {
-        toaster.create({
-          title: "Success",
-          description: "FAQ updated successfully",
-          type: "success",
-        });
-        refetch()
-        setIsOpen(false);
-      } else {
-        toaster.create({
-          title: "Error",
-          description: "Failed to update FAQ",
-          type: "error",
-        });
-      }
-    } catch (error) {
-      console.error("Error updating template:", error);
-      // alert("Failed to update template");
-    }
-  };

+function FaqAddModel() {
  return (
-    <DialogRoot placement="center" open={isOpen} onOpenChange={({ open }) => setIsOpen(open)}>
+    <DialogRoot placement="center">
      <DialogTrigger asChild>
-        <Button px={5} size={"xs"} bg={"#02A0A0"} onClick={handleOpenModal}>
+        <Button px={5} size={"xs"} bg={"#02A0A0"}>
          <IoMdAdd /> <Text>Add</Text>
        </Button>
      </DialogTrigger>
@@ -95,33 +33,10 @@ function FaqAddModel({ refetch }: { refetch: VoidFunction }) {
          <DialogTitle alignSelf="center" color="black" fontSize="14px">
            Add
          </DialogTitle>
-        </DialogHeader> 
+        </DialogHeader>

        <DialogBody bg="white">
          <Stack py={3}>
-            <Field.Root>
-              <Field.Label color="black" pt={1} fontSize="12px">Select User Type</Field.Label>
-              <Box bgColor="#EEEEEE" borderRadius="md" p={1} w={'100%'}>
-                <select
-                  style={{
-                    width: "100%",
-                    background: "transparent",
-                    color: "black",
-                    border: "none",
-                    fontSize: "12px",
-                    height: "30px",
-                    outline: "none",
-                  }}
-                  value={userType}
-                  onChange={(e) => setUserType(e.target.value)}
-                >
-                  <option value="" disabled>Select User Type</option>
-                  <option value="2">Recruiter</option>
-                  <option value="3">Jobseeker</option>
-                </select>
-              </Box>
-            </Field.Root>
-
            <Field.Root>
              <Field.Label color="black" pt={1} fontSize="12px">
                Questions
@@ -133,10 +48,8 @@ function FaqAddModel({ refetch }: { refetch: VoidFunction }) {
                border="none"
                pl={1}
                fontSize="12px"
-                _focusVisible={{ outline: 'none' }}
+                _focusVisible={{outline:'none'}}
                size={'sm'}
-                value={faqQuestion}
-                onChange={(e) => setFaqQuestion(e.target.value)}
              />

              <Field.Label color="black" pt={1} fontSize="12px">
@@ -151,22 +64,19 @@ function FaqAddModel({ refetch }: { refetch: VoidFunction }) {
                fontSize="12px"
                height="120px"
                resize={'none'}
-                _focusVisible={{ outline: 'none' }}
-                value={faqAnswer}
-                onChange={(e) => setFaqAnswer(e.target.value)}
+                _focusVisible={{outline:'none'}}
              />
            </Field.Root>
          </Stack>
        </DialogBody>
        <DialogFooter display="flex" justifyContent="center" pt={"2"}>
-          <Button w="100%" bg="#02A0A0" color={"#fff"} onClick={handleSubmit}>
+          <Button w="100%" bg="#02A0A0" color={"#fff"}>
            Save
          </Button>
        </DialogFooter>

-        <DialogCloseTrigger color="black" onClick={() => setIsOpen(false)} />
+        <DialogCloseTrigger color="black" />
      </DialogContent>
-      <Toaster />
    </DialogRoot>
  );
 }
--- a/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx
+++ b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx
@@ -1,4 +1,4 @@
-import { Badge, HStack, Stack, Text, VStack } from "@chakra-ui/react";
+import { Badge, HStack, Text, VStack } from "@chakra-ui/react";
 import { useGetPrivacyPolicyQuery } from "../../../Redux/Service/privacy.policy.service";
 import MainFrame from "../../../components/MainFrame";
 import { Spinner } from "../../../components/Sipnner/Spinner";
@@ -6,77 +6,50 @@ import PrivacyPolicyAddModel from "./PrivacyPolicyAddModel";
 import GlobalStateContext from "../../../Contexts/GlobalStateContext";
 import { useContext, useEffect } from "react";

-const PrivacyPolicy = () => {
-  const { data, isLoading, isFetching, refetch } = useGetPrivacyPolicyQuery();

-  console.log("PRIVACY", data?.data);
+const PrivacyPolicy = () => {
+  const { data, isLoading, isFetching } = useGetPrivacyPolicyQuery();

  const context = useContext(GlobalStateContext);
-  if (!context)
-    throw new Error("App must be used within a GlobalStateProvider");
-
+  if (!context) throw new Error('App must be used within a GlobalStateProvider');
+  
  const { setIsBarLoading } = context;
  useEffect(() => {
-    setIsBarLoading(isFetching);
-  }, [data]);
-
-  console.log("Privacy Policy Data:", data?.data);
-
+    setIsBarLoading(isFetching)
+  }, [data])
+  
  return (
    <MainFrame transperant={true}>
-      <Stack bg={"#fff"} w={"100%"} p={4} borderRadius={4} mb={4}>
-        <Text color={"black"} textAlign={"left"} fontWeight={"600"}>
-          Privacy Policy
-        </Text>
-      </Stack>
-      <VStack gap={4} pb={4} pt={0}> 
-        {isLoading || isFetching ? (
-          <Spinner />
-        ) : (
-          data?.data?.map(({ id, content, privacy_language }) => (
-            <VStack
-              bg={"#fff"}
-              boxShadow={"rgba(99, 99, 99, 0.2) 0px 2px 8px 0px"}
-              rounded={"lg"}
-              p={3}
-              key={id}
-            >
-              <HStack w={"100%"} justifyContent={"space-between"} py={0} px={0}>
-                <Text
-                  as={"span"}
-                  fontSize={"sm"}
-                  fontWeight={500}
-                  color={"#000"}
-                >
-                  <Badge
-                    variant={"surface"}
-                    colorPalette="cyan"
-                    size={"sm"}
-                    fontSize={"xs"}
-                    px={2}
-                  >
-                    🎓 {privacy_language?.language_name}
-                  </Badge>
-                </Text>
+      <VStack gap={4} pb={4} pt={0}>
+        {isLoading || isFetching ?
+          <Spinner /> : data?.data?.map(({ id, content, privacy_language }) => <VStack bg={'#fff'}
+            boxShadow={'rgba(99, 99, 99, 0.2) 0px 2px 8px 0px'} rounded={'lg'} p={3} key={id}>
+            <HStack
+              w={"100%"}
+              justifyContent={"space-between"}

-                <PrivacyPolicyAddModel
-                  policyData={{ id, content, privacy_language }}
-                  refetch={refetch}
-                />
-              </HStack>
-              <Text
-                as="p"
-                fontSize="sm"
-                fontWeight={400}
-                color="#1D1D1D"
-                dangerouslySetInnerHTML={{ __html: content }}
-              />
-            </VStack>
-          ))
-        )}
+              py={0}
+              px={0}
+            >
+              <Text as={"span"} fontSize={"sm"} fontWeight={500} color={"#000"}>
+                Privacy Policy <Badge variant={'surface'}  colorPalette="cyan" ms={2} size={'sm'} fontSize={'xs'} px={2}>🎓 {privacy_language?.language_name}</Badge>
+              </Text>
+
+              <PrivacyPolicyAddModel />
+            </HStack>
+            <Text
+              as="p"
+              fontSize="sm"
+              fontWeight={400}
+              color="#1D1D1D"
+            >
+              {content}
+            </Text>
+
+          </VStack>)}
      </VStack>
    </MainFrame>
  );
 };

-export default PrivacyPolicy;
+export default PrivacyPolicy;
--- a/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicyAddModel.tsx
+++ b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicyAddModel.tsx
@@ -4,92 +4,46 @@ import {
  DialogCloseTrigger,
  DialogContent,
  DialogFooter,
+  DialogHeader,
  DialogRoot,
+  DialogTitle,
  DialogTrigger,
 } from "../../../components/ui/dialog";
-import { Box, Field, Stack, Text } from "@chakra-ui/react";
+import { Field, Stack, Text, Textarea } from "@chakra-ui/react";
 import { Button } from "../../../components/ui/button";
-import { useUpdatePrivacyPolicyMutation } from "../../../Redux/Service/privacy.policy.service";
-import { Controller, useForm } from "react-hook-form";
-import { useState } from "react";
-import ReactQuill from "react-quill";
-
-function PrivacyPolicyAddModel({ policyData, refetch }: { policyData: any, refetch: VoidFunction }) {
-  const [isOpen, setIsOpen] = useState(false);
-  const [updatePrivacyPolicy] = useUpdatePrivacyPolicyMutation()
-  const {
-    control,
-    handleSubmit,
-    reset,
-    setValue,
-  } = useForm({
-    defaultValues: {
-      content: "",
-      languageCode: "",
-    },
-  });
-
-  console.log('POLICY', policyData);
-
-  const handleEditClick = (data: any) => {
-    setValue("content", data.content); // Pre-fill the content field
-    setValue("languageCode", data.privacy_language.language_code); // Pre-fill the language code
-    setIsOpen(true); // Open dialog
-  };
-
-  const onSubmit = async (formData: any) => {
-    if (!formData.content.trim()) return; // Prevent empty updates
-
-    try {
-      await updatePrivacyPolicy({
-        id: policyData.id,
-        content: formData.content,
-        language_code: formData.languageCode,
-      }).unwrap();
-      setIsOpen(false); // Close dialog on success
-      reset(); // Reset the form
-      refetch()
-    } catch (error) {
-      console.error("Update failed:", error);
-    }
-  };

+function PrivacyPolicyAddModel() {
  return (
-    <DialogRoot placement="center" open={isOpen}>
-      <Box key={policyData.id}>
-        <DialogTrigger asChild>
-          <Button
-            bgColor={"#EEEEEE"}
-            pl={3} pr={3}
-            size={"xs"}
-            color={"#000"}
-            onClick={() => handleEditClick(policyData)}
-          >
-            {" "}
-            <FaRegEdit
-              color="#000"
-              style={{ height: "14px", width: "14px" }}
-            />{" "}
-            <Text color={"#000"} mt={1}>
-              Edit
-            </Text>
-          </Button>
-        </DialogTrigger>
-      </Box>
+    <DialogRoot placement="center">
+      <DialogTrigger asChild>
+        {/* <Button bg={"transparent"} size="sm">
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
+                </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"}
-        minW={'600px'}
-        // w={{ base: "90%", md: "400px" }}
+        // w={{ lg: "60%", md: "230px" }}
+        w={{ base: "90%", md: "400px" }}
        height={"auto"}
        p={3} // Reduced padding
        bgSize={"md"}
      >
-        {/* <DialogHeader bg="white">
+        <DialogHeader bg="white">
          <DialogTitle alignSelf="center" color="black" fontSize="14px">
            Edit
          </DialogTitle>
-        </DialogHeader> */}
+        </DialogHeader>

        <DialogBody bg="white">
          <Stack py={3}>
@@ -97,7 +51,7 @@ function PrivacyPolicyAddModel({ policyData, refetch }: { policyData: any, refet
              <Field.Label color="black" pt={1} fontSize="12px">
                PrivacyPolicy
              </Field.Label>
-              {/* <Textarea
+              <Textarea
                placeholder=""
                bgColor="#EEEEEE"
                color="black"
@@ -105,46 +59,19 @@ function PrivacyPolicyAddModel({ policyData, refetch }: { policyData: any, refet
                p={2}
                fontSize="12px"
                height={'140px'}
-                _focusVisible={{ outline: 'none' }}
+                _focusVisible={{outline:'none'}}
                resize={'none'}
-              /> */}
-              <Controller
-                name="content"
-                control={control}
-                render={({ field }) => (
-                  <ReactQuill
-                    value={field.value}
-                    onChange={field.onChange}
-                    placeholder="Enter About Us content"
-                    modules={{
-                      toolbar: [
-                        [{ 'header': [1, 2, false] }],
-                        ['bold', 'italic', 'underline', 'strike'],
-                        ['link', 'image'],
-                        [{ 'list': 'ordered' }, { 'list': 'bullet' }],
-                        ['clean']
-                      ],
-                    }}
-                    formats={[
-                      'header',
-                      'bold', 'italic', 'underline', 'strike',
-                      'list', 'bullet',
-                      'link', 'image'
-                    ]}
-                    style={{ color: "black", border: "none", fontSize: "12px", height: "220px", width: "100%",marginBottom:'20px' }}
-                  />
-                )}
              />
            </Field.Root>
          </Stack>
        </DialogBody>
        <DialogFooter display="flex" justifyContent="center" pt={"2"}>
-          <Button w="100%" bg="#02A0A0" color={"#fff"} mt={'4'} onClick={handleSubmit(onSubmit)}>
+          <Button w="100%" bg="#02A0A0" color={"#fff"}>
            Save
          </Button>
        </DialogFooter>

-        <DialogCloseTrigger color="black" onClick={() => setIsOpen(false)} />
+        <DialogCloseTrigger color="black" />
      </DialogContent>
    </DialogRoot>
  );
--- a/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicySkeleton.tsx
+++ b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicySkeleton.tsx
@@ -1,14 +1,15 @@
 import { Box, Skeleton } from '@chakra-ui/react'
+import React from 'react'

 const PrivacyPolicySkeleton = () => {
  return (
    <Box px={3} pb={3} w="90%">
-      <Skeleton height="20px" mb="10px" width="90%" />
-      <Skeleton height="20px" mb="15px" width="90%" />
-      <Skeleton height="20px" mb="10px" width="90%" />
-      <Skeleton height="20px" mb="10px" width="80%" />
-      <Skeleton height="20px" width="60%" />
-    </Box>
+            <Skeleton height="20px" mb="10px" width="90%" />
+            <Skeleton height="20px" mb="15px" width="90%" />
+            <Skeleton height="20px" mb="10px" width="90%" />
+            <Skeleton height="20px" mb="10px" width="80%" />
+            <Skeleton height="20px" width="60%" />
+          </Box>
  )
 }

--- a/src/Pages/ManageCMS/TermsAndConditions/TermAndConditionSkeleton.tsx
+++ b/src/Pages/ManageCMS/TermsAndConditions/TermAndConditionSkeleton.tsx
@@ -0,0 +1,16 @@
+import { Box, Skeleton } from '@chakra-ui/react'
+import React from 'react'
+
+const TermAndConditionSkeleton = () => {
+  return (
+    <Box px={3} pb={3} w="90%">
+            <Skeleton height="20px" mb="10px" width="90%" />
+            <Skeleton height="20px" mb="15px" width="90%" />
+            <Skeleton height="20px" mb="10px" width="90%" />
+            <Skeleton height="20px" mb="10px" width="80%" />
+            <Skeleton height="20px" width="60%" />
+          </Box>
+  )
+}
+
+export default TermAndConditionSkeleton
--- a/src/Pages/ManageCMS/TermsAndConditions/TermsAndConditions.tsx
+++ b/src/Pages/ManageCMS/TermsAndConditions/TermsAndConditions.tsx
@@ -1,67 +1,58 @@
-import { Badge, HStack, Spinner, Stack, Text, VStack } from "@chakra-ui/react";
-import MainFrame from "../../../components/MainFrame";
+import { Badge, HStack, Text, VStack } from "@chakra-ui/react";
+import MainFrame from "../../../components/MainFrame"
 import TermsAndConditionsAddModel from "./TermsAndConditionsAddModel";
-import { useGetTermsQuery } from "../../../Redux/Service/terms.and.condition.service";
+import {useGetTermsAndConditionQuery} from "../../../Redux/Service/terms.and.condition.service"
+import { useContext, useEffect } from "react";
+import GlobalStateContext from "../../../Contexts/GlobalStateContext";
+import { Spinner } from "../../../components/Sipnner/Spinner";
+

 const TermsAndConditions = () => {
-  const { data, refetch, isLoading, isFetching } = useGetTermsQuery();
+  
+  // Fetch data using RTK Query with type annotations
+    const { data, isLoading, isFetching } = useGetTermsAndConditionQuery();

-  console.log(data);
+    const context = useContext(GlobalStateContext);
+    if (!context) throw new Error('App must be used within a GlobalStateProvider');
+    
+    const { setIsBarLoading } = context;
+    useEffect(() => {
+      setIsBarLoading(isFetching)
+    }, [data])

  return (
-    <MainFrame transperant={true}>
-      <VStack gap={4} pb={4} pt={0}>
-        <Stack bg={"#fff"} w={"100%"} mt={2} p={4} borderRadius={4}>
-          <Text color={"black"} textAlign={"left"} fontWeight={"600"}>
-            Terms and Conditions
-          </Text>
-        </Stack>

-        {isLoading || isFetching ? (
-          <Spinner />
-        ) : (
-          data?.data?.map(({ id, content, terms_cond_language }) => (
-            <VStack
-              bg={"#fff"}
-              boxShadow={"rgba(99, 99, 99, 0.2) 0px 2px 8px 0px"}
-              rounded={"lg"}
-              p={3}
-              key={id}
+    <MainFrame  transperant={true}>
+     
+     <VStack gap={4} pb={4} pt={0}>
+        {isLoading || isFetching ?
+          <Spinner /> : data?.data?.map(({ id, content, terms_cond_language }) => <VStack bg={'#fff'}
+            boxShadow={'rgba(99, 99, 99, 0.2) 0px 2px 8px 0px'} rounded={'lg'} p={3} key={id}>
+            <HStack
+              w={"100%"}
+              justifyContent={"space-between"}
+
+              py={0}
+              px={0}
            >
-              <HStack w={"100%"} justifyContent={"space-between"} py={0} px={0}>
-                <Text
-                  as={"span"}
-                  fontSize={"sm"}
-                  fontWeight={500}
-                  color={"#000"}
-                >
-                  <Badge
-                    variant={"surface"}
-                    colorPalette="cyan"
-                    ms={2}
-                    size={"sm"}
-                    fontSize={"xs"}
-                    px={2}
-                  >
-                    🎓 {terms_cond_language?.language_name}
-                  </Badge>
-                </Text>
-
-                {/* Pass Data to AboutUsAddModel */}
-                <TermsAndConditionsAddModel
-                  termsData={{ id, content, terms_cond_language }}
-                  refetch={refetch}
-                />
-              </HStack>
-              <Text as="p" fontSize="sm" fontWeight={400} color="#1D1D1D">
-                {/* {content} */}
-                <div dangerouslySetInnerHTML={{ __html: content }} />
+              <Text as={"span"} fontSize={"sm"} fontWeight={500} color={"#000"}>
+              Terms And Conditions<Badge variant={'surface'}  colorPalette="cyan" ms={2} size={'sm'} fontSize={'xs'} px={2}>🎓 {terms_cond_language?.language_name}</Badge>
              </Text>
-            </VStack>
-          ))
-        )}
+
+              <TermsAndConditionsAddModel />
+            </HStack>
+            <Text
+              as="p"
+              fontSize="sm"
+              fontWeight={400}
+              color="#1D1D1D"
+            >
+              {content}
+            </Text>
+
+          </VStack>)}
      </VStack>
    </MainFrame>
-  );
-};
-export default TermsAndConditions;
+  )
+}
+export default TermsAndConditions
--- a/src/Pages/ManageCMS/TermsAndConditions/TermsAndConditionsAddModel.tsx
+++ b/src/Pages/ManageCMS/TermsAndConditions/TermsAndConditionsAddModel.tsx
@@ -1,3 +1,4 @@
+import React, { useState } from "react";
 import { FaRegEdit } from "react-icons/fa";
 import {
  DialogBody,
@@ -11,59 +12,40 @@ import {
 } from "../../../components/ui/dialog";
 import { Field, Stack, Text } from "@chakra-ui/react";
 import { Button } from "../../../components/ui/button";
-import { Controller, useForm } from "react-hook-form";
 import ReactQuill from "react-quill";
-import { useState } from "react";
-import { useUpdateTermsMutation } from "../../../Redux/Service/terms.and.condition.service";
+import "react-quill/dist/quill.snow.css"; // Import the styles

-function TermsAndConditionsAddModel({ termsData, refetch }: { termsData: any, refetch: VoidFunction }) {
-  const [isOpen, setIsOpen] = useState(false);
-  const [updateTerms] = useUpdateTermsMutation()
-  const {
-    control,
-    handleSubmit,
-    reset,
-    setValue,
-  } = useForm({
-    defaultValues: {
-      content: "",
-      languageCode: "",
-    },
-  });
+function TermsAndConditionsAddModel() {
+  const [value, setValue] = useState(""); // State to manage the rich text content

-  const handleEditClick = (data: any) => {
-    setValue("content", data.content); // Pre-fill the content field
-    setValue("languageCode", data.terms_cond_language.language_code); // Pre-fill the language code
-    setIsOpen(true); // Open dialog
+  // Configuration for the Quill editor toolbar
+  const modules = {
+    toolbar: [
+      [{ header: [1, 2, 3, 4, 5, 6, false] }],
+      ["bold", "italic", "underline", "strike"],
+      [{ list: "ordered" }, { list: "bullet" }],
+      ["link", "image"],
+      ["clean"],
+    ],
  };

-  const onSubmit = async (formData: any) => {
-    if (!formData.content.trim()) return; // Prevent empty updates
-
-    try {
-      await updateTerms({
-        id: termsData.id,
-        content: formData.content,
-        language_code: formData.languageCode,
-      }).unwrap();
-      setIsOpen(false); // Close dialog on success
-      reset(); // Reset the form
-      refetch()
-    } catch (error) {
-      console.error("Update failed:", error);
-    }
-  };
+  // Formats allowed in the Quill editor
+  const formats = [
+    "header",
+    "bold",
+    "italic",
+    "underline",
+    "strike",
+    "list",
+    "bullet",
+    "link",
+    "image",
+  ];

  return (
-    <DialogRoot placement="center" open={isOpen}>
+    <DialogRoot placement="center">
      <DialogTrigger asChild>
-        <Button
-          bgColor={"#EEEEEE"}
-          pl={3} pr={3}
-          size={"xs"}
-          color={"#000"}
-          onClick={() => handleEditClick(termsData)}
-        >
+        <Button bgColor={"#EEEEEE"} pl={3} pr={3} size={"xs"} color={"#000"}>
          {" "}
          <FaRegEdit
            color="#000"
@@ -74,12 +56,12 @@ function TermsAndConditionsAddModel({ termsData, refetch }: { termsData: any, re
          </Text>
        </Button>
      </DialogTrigger>
+
      <DialogContent
        bg={"#fff"}
-        maxW={'600px'}
-        // w={{ base: "90%", md: "600px" }}
+        w={{ base: "90%", md: "800px" }}
        height={"auto"}
-        p={3} // Reduced padding
+        p={3}
        bgSize={"md"}
      >
        <DialogHeader bg="white">
@@ -94,57 +76,35 @@ function TermsAndConditionsAddModel({ termsData, refetch }: { termsData: any, re
              <Field.Label color="black" pt={1} fontSize="12px">
                TermsAndConditions
              </Field.Label>
-              {/* <Textarea
-                placeholder=""
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                p={2}
-                fontSize="12px"
-                height={'140px'}
-                _focusVisible={{outline:'none'}}
-                resize={'none'}
-              /> */}
-              <Controller
-                name="content"
-                control={control}
-                render={({ field }) => (
-                  <ReactQuill
-                    value={field.value}
-                    onChange={field.onChange}
-                    placeholder="Enter About Us content"
-                    modules={{
-                      toolbar: [
-                        [{ 'header': [1, 2, false] }],
-                        ['bold', 'italic', 'underline', 'strike'],
-                        ['link', 'image'],
-                        [{ 'list': 'ordered' }, { 'list': 'bullet' }],
-                        ['clean']
-                      ],
-                    }}
-                    formats={[
-                      'header',
-                      'bold', 'italic', 'underline', 'strike',
-                      'list', 'bullet',
-                      'link', 'image'
-                    ]}
-                    style={{ color: "black", border: "none", fontSize: "12px", height: "220px", width: "100%",marginBottom:'20px'  }}
-                  />
-                )}
+              {/* Replace Textarea with ReactQuill */}
+              <ReactQuill
+                theme="snow" // Theme style
+                value={value}
+                onChange={setValue}
+                modules={modules}
+                formats={formats}
+                style={{
+                  width:"100%",
+                  color: "black",
+                  border: "none",
+                  fontSize: "12px",
+                  height: "140px",
+                  
+                }}
              />
            </Field.Root>
          </Stack>
        </DialogBody>
-        <DialogFooter display="flex" justifyContent="center"  pt={"2"}>
-          <Button w="100%" bg="#02A0A0" color={"#fff"}  mt={'4'} onClick={handleSubmit(onSubmit)}>
+        <DialogFooter display="flex" justifyContent="center" pt={"2"}>
+          <Button w="100%" bg="#02A0A0" color={"#fff"}>
            Save
          </Button>
        </DialogFooter>

-        <DialogCloseTrigger color="black" onClick={() => setIsOpen(false)} />
+        <DialogCloseTrigger color="black" />
      </DialogContent>
    </DialogRoot>
  );
 }

-export default TermsAndConditionsAddModel;
+export default TermsAndConditionsAddModel;
--- a/src/Pages/ManageContact/ManageContact.tsx
+++ b/src/Pages/ManageContact/ManageContact.tsx
@@ -1,77 +1,38 @@
 import { Box, HStack, Input, Text } from "@chakra-ui/react";
-import MainFrame from "../../components/MainFrame";
-import PendingRequests from "../../Pages/ManageContact/PendingRequests";
+import MainFrame from "../../components/MainFrame"
+import PendingRequests from "../../Pages/ManageContact/PendingRequests"
 import { InputGroup } from "../../components/ui/input-group";
 import { LuSearch } from "react-icons/lu";
 import DataTable from "../../components/DataTable";
-import { useGetContactQuery } from "../../Redux/Service/manage.contactus.service";
-import { useEffect, useState } from "react";
-import { Spinner } from "../../components/Sipnner/Spinner";
+

 // table data
-const tableHeadRow = ["Sr. No", "Email id", "Name", "Date", "Action"];

-const ManageContact = () => {
-  const { data, isLoading, isError } = useGetContactQuery();
-  const [localData, setLocalData] = useState([]);
+const tableHeadRow = [
+  "Sr. No",
+  "Email id",
+  "Name",
+  "Date",
+  "Action",
+];

-  useEffect(() => {
-    if (data) {
-      setLocalData((data as any)?.data?.data || []);
-    }
-  }, [data]);
-
-  const formatDateOfBirth = (dob: string): string => {
-    return new Date(dob).toLocaleDateString("en-GB", {
-      day: "2-digit",
-      month: "2-digit",
-      year: "numeric",
-    });
-  };
-
-  const managepost = localData?.map((agency: any, index: number) => ({
-    "Sr. No": index + 1, // Typically Sr. No starts from 1, not using id which might not be sequential
-    "Email id": agency?.email || "-",
-    Name: agency?.first_name || "-",
-    Date: formatDateOfBirth(agency?.created_at) || "-",
-    Action: (     
+const managepost: any[] = [
+  ...Array.from({ length: 12 }, (_, i) => ({
+    "Sr. No": i + 1,
+    "Email id": "ABC@gmail.com",
+    "Name": "Pooja",
+    "Date": "11/02/1989",
+    "Action": (
      <HStack justifyContent="center">
        <PendingRequests />
      </HStack>
    ),
-  }));
-
-  if (isLoading) {
-    return (
-      <MainFrame>
-        <Box
-          display="flex"
-          justifyContent="center"
-          alignItems="center"
-          height="100%"
-        >
-          <Spinner />
-        </Box>
-      </MainFrame>
-    );
-  }
-
-  if (isError) {
-    return (
-      <MainFrame>
-        <Box
-          display="flex"
-          justifyContent="center"
-          alignItems="center"
-          height="100%"
-        >
-          <Text>Error loading data</Text>
-        </Box>
-      </MainFrame>
-    );
-  }
+  })),
+];

+const ManageContact = () => {
  return (
+
    <MainFrame>
      <Box>
        <HStack
@@ -82,16 +43,13 @@ const ManageContact = () => {
          px={3}
        >
          <Text as={"span"} fontSize={"sm"} fontWeight={500} color={"#000"}>
-            Contact Requests
+          Contact Requests
          </Text>

-          <HStack>
-            <InputGroup
+          <HStack >
+            <InputGroup 
              startElement={
-                <LuSearch
-                  fontSize={"xs"}
-                  style={{ position: "relative", left: "10px" }}
-                />
+                <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
              }
              color={"#000"}
            >
@@ -105,20 +63,20 @@ const ManageContact = () => {
                size={"xs"}
                fontSize={"sm"}
                placeholder="Search..."
-                bgColor={"#EEEEEE"}
+                bgColor={'#EEEEEE'}
                ps={8}
              />
            </InputGroup>
+            {/* <Button bgColor={'#EEEEEE'} pl={3} pr={3}><IoMdAdd /> <Text>Add</Text></Button> */}
          </HStack>
        </HStack>
        <DataTable
          sortableColumns={["Name", "Registration Date "]}
          tableHeadRow={tableHeadRow}
-          data={managepost || []} // Ensure an empty array is passed if managepost is undefined
+          data={managepost}
        />
-      </Box>
+      </Box>       
    </MainFrame>
-  );
-};
-
-export default ManageContact;
+  )
+}
+export default ManageContact
--- a/src/Pages/ManageGroups/AddGroup.tsx
+++ b/src/Pages/ManageGroups/AddGroup.tsx
@@ -1,6 +1,6 @@
 import { Button } from "../../components/ui/button"
 import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../components/ui/dialog"
-import { Field, Heading, Input, Stack, Text } from "@chakra-ui/react"
+import { Avatar, Box, Field, Heading, Input, Stack, Text } from "@chakra-ui/react"
 import { Switch } from "../../components/ui/switch";
 import { IoMdAdd } from "react-icons/io";
 function AddGroup() {
--- a/src/Pages/ManageGroups/EditDetailGroup.tsx
+++ b/src/Pages/ManageGroups/EditDetailGroup.tsx
@@ -9,7 +9,7 @@ import {
  DialogTitle,
  DialogTrigger,
 } from "../../components/ui/dialog";
-import { Avatar, Box, Field, Heading, Input, Span, Stack } from "@chakra-ui/react";
+import { Avatar, Box, Field, Heading, Input, Stack } from "@chakra-ui/react";
 import { Switch } from "../../components/ui/switch";
 import { AvatarGroup } from "../../components/ui/avatar";
 import Edit from "../../components/ActionIcons/Edit";
@@ -17,7 +17,7 @@ function EditDetailGroups() {
  return (
    <DialogRoot placement="center">
      <DialogTrigger asChild>
-        <Span><Edit /></Span>
+        <Edit />
      </DialogTrigger>

      <DialogContent
--- a/src/Pages/ManageGroups/ManageGroups.tsx
+++ b/src/Pages/ManageGroups/ManageGroups.tsx
@@ -1,16 +1,14 @@
-import { Box, HStack, 
-  // Image, 
-  Input, Text } from "@chakra-ui/react";
+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 AlertDailog from "../../components/AlertDailog";
-// import { RiDeleteBin5Line } from "react-icons/ri";
+import AlertDailog from "../../components/AlertDailog";
+import { RiDeleteBin5Line } from "react-icons/ri";
 import ViewManageGroup from "./ViewManageGroup";
 import EditDetailGroups from "./EditDetailGroup";
 import AddGroup from "./AddGroup";
-// import Delete from "../../components/ActionIcons/Delete";
+import Delete from "../../components/ActionIcons/Delete";
 // import ViewSubAdmin from "./ViewSubAdmin"

 // table data
@@ -35,7 +33,7 @@ const managepost: any[] = [
      <HStack justifyContent="center">
        <ViewManageGroup />
        <EditDetailGroups />
-        {/* <AlertDailog
+        <AlertDailog
          AltertTiggerIcon={() => <Delete />} 
          alertText="Delete Users"
          alertIcon={<Image src={"DeleteIcon"} h={"39px"} />}
@@ -43,14 +41,11 @@ const managepost: any[] = [
          onConfirm={() => {
            console.log("User deleted:", i + 1);
          }}
-        /> */}
+        />
      </HStack>
    ),
  })),
 ];
-
-
-
 const ManageGroups = () => {
  return (
    <MainFrame>
--- a/src/Pages/ManageGroups/ViewManageGroup.tsx
+++ b/src/Pages/ManageGroups/ViewManageGroup.tsx
@@ -7,7 +7,7 @@ import {
  DialogTitle,
  DialogTrigger,
 } from "../../components/ui/dialog";
-import { Avatar, Box, Field, Heading, Input, Span, Stack } from "@chakra-ui/react";
+import { Avatar, Box, Field, Heading, Input, Stack } from "@chakra-ui/react";
 import { Switch } from "../../components/ui/switch";
 import { AvatarGroup } from "../../components/ui/avatar";
 import View from "../../components/ActionIcons/View";
@@ -15,7 +15,7 @@ function ViewManageGroup() {
  return (
    <DialogRoot placement="center">
      <DialogTrigger asChild>
-        <Span><View /></Span>
+        <View />
      </DialogTrigger>

      <DialogContent
--- a/src/Pages/ManageJobs/ManageJobs.tsx
+++ b/src/Pages/ManageJobs/ManageJobs.tsx
@@ -1,31 +1,13 @@
-import {
-  Box,
-  HStack,
-  Image,
-  //  Image,
-  Input,
-  Text,
-} from "@chakra-ui/react";
+import { Box, HStack, Image, Input, Text } from "@chakra-ui/react";
 import { LuSearch } from "react-icons/lu";
-// import { RiDeleteBin5Line } from "react-icons/ri";
-// import AlertDailog from "../../components/AlertDailog";
+import { RiDeleteBin5Line } from "react-icons/ri";
+import AlertDailog from "../../components/AlertDailog";
 import DataTable from "../../components/DataTable";
 import MainFrame from "../../components/MainFrame";
 import { InputGroup } from "../../components/ui/input-group";
 import ManageJobsAdd from "./ManageJobsAdd";
 import ViewManageJob from "./ViewManageJob";
-import {
-  useDeleteJobsPostMutation,
-  useGetManageJobsQuery,
-} from "../../Redux/Service/manage.jobs.service";
-import { useEffect, useState } from "react";
-import { Spinner } from "../../components/Sipnner/Spinner";
 import Delete from "../../components/ActionIcons/Delete";
-import { toaster } from "../../components/ui/toaster";
-import AlertDailog from "../../components/AlertDailog";
-// import { useState } from "react";
-// import { useGetManageJobsQuery } from "../../Redux/Service/manage.jobs.service";
-// import Delete from "../../components/ActionIcons/Delete";

 // table data

@@ -39,94 +21,33 @@ const tableHeadRow = [
  "Action",
 ];

-const ManageJobs = () => {
-  const [currentPage] = useState(1);
-  const [localData, setLocalData] = useState([]);
-  const { data, refetch, isLoading } = useGetManageJobsQuery(currentPage);
-  const [deleteJobsPost] = useDeleteJobsPostMutation();
-  const [deleteModal, setDeleteModal] = useState(false);
-  const [selectedJobsId, setSelectedJobsId] = useState<number | null>(null);
-
-  useEffect(() => {
-    if (data) {
-      setLocalData((data as any)?.data?.data || []);
-    }
-  }, [data]);
-  console.log(data?.data.data);
-
-  const handleDeleteJobs = async (jobsId: number) => {
-    try {
-      const response = await deleteJobsPost({ id: jobsId }).unwrap();
-      if (response?.status === "success") {
-        toaster.create({
-          title: "Success",
-          description: "Jobs deleted successfully",
-          type: "Success",
-        });
-        refetch();
-      }
-    } catch (error) {
-      console.error("Error deleting FAQ:", error);
-      toaster.create({
-        title: "Error",
-        description: "Something went wrong",
-        type: "error",
-      });
-    }
-  };
-
-  const managepost = localData?.map((agency: any, index: number) => ({
-    "Sr. No": index + 1,
-    "Job Title": agency?.job_title,
-    "Workspace mode": agency?.workspace?.en_name,
-    Category: agency?.industry?.en_name,
-    "Sub-category": agency?.department?.en_name,
-    Salary: agency?.ctc_amount,
+const managepost: any[] = [
+  ...Array.from({ length: 12 }, (_, i) => ({
+    "Sr. No": i + 1,
+    "Job Title": "Freelance content writer",
+    "Workspace mode": "Onsite",
+    Category: "IT",
+    "Sub-category": "Flutter dev",
+    Salary: "3.5 LPA",
    Action: (
      <HStack justifyContent="center">
        <ViewManageJob />
        <ManageJobsAdd />
        <AlertDailog
-          isOpen={deleteModal}
-          AltertTiggerIcon={() => (
-            <Delete
-              onClick={() => {
-                setSelectedJobsId(agency.id);
-                setDeleteModal(true);
-              }}
-            />
-          )}
-          alertText="Delete FAQ"
+          AltertTiggerIcon={() => <Delete />}
+          alertText="Delete Users"
          alertIcon={<Image src={"DeleteIcon"} h={"39px"} />}
          alertCaption="are you sure you want to delete ?"
-          onClose={() => setDeleteModal(false)}
          onConfirm={() => {
-            // console.log("Deleting FAQ with ID:", selectedFaqId); // Correct ID
-            if (selectedJobsId) {
-              setDeleteModal(false);
-              handleDeleteJobs(selectedJobsId);
-            }
+            console.log("User deleted:", i + 1);
          }}
        />
      </HStack>
    ),
-  }));
-
-  if (isLoading) {
-    return (
-      <MainFrame>
-        <Box
-          display="flex"
-          justifyContent="center"
-          alignItems="center"
-          height="100%"
-        >
-          <Spinner />
-        </Box>
-      </MainFrame>
-    );
-  }
+  })),
+];

+const ManageJobs = () => {
  return (
    <MainFrame>
      <Box>
--- a/src/Pages/ManageJobs/ManageJobsAdd.tsx
+++ b/src/Pages/ManageJobs/ManageJobsAdd.tsx
@@ -1,8 +1,8 @@
 import {
  Field,
+  Icon,
  Input,
  SelectValueText,
-  Span,
  Stack,
  createListCollection,
 } from "@chakra-ui/react";
@@ -18,7 +18,7 @@ import {
  DialogTrigger,
 } from "../../components/ui/dialog";

-// import { TbEdit } from "react-icons/tb";
+import { TbEdit } from "react-icons/tb";
 import {
  SelectContent,
  SelectItem,
@@ -40,7 +40,7 @@ function ManageJobsAdd() {
  return (
    <DialogRoot placement="center">
      <DialogTrigger asChild>
-        <Span><Edit /></Span>
+        <Edit />
      </DialogTrigger>

      <DialogContent
--- a/src/Pages/ManageJobs/ViewManageJob.tsx
+++ b/src/Pages/ManageJobs/ViewManageJob.tsx
@@ -1,8 +1,8 @@
 import {
  Field,
+  Icon,
  Input,
  SelectValueText,
-  Span,
  Stack,
  createListCollection,
 } from "@chakra-ui/react";
@@ -18,7 +18,7 @@ import {
  DialogTrigger,
 } from "../../components/ui/dialog";

-// import { MdOutlineRemoveRedEye } from "react-icons/md";
+import { MdOutlineRemoveRedEye } from "react-icons/md";
 import {
  SelectContent,
  SelectItem,
@@ -27,7 +27,6 @@ import {
  SelectTrigger,
 } from "../../components/ui/select";
 import View from "../../components/ActionIcons/View";
-import { useLazyViewJobsQuery } from "../../Redux/Service/manage.jobs.service";

 const frameworks = createListCollection({
  items: [
@@ -38,258 +37,238 @@ const frameworks = createListCollection({
  ],
 });
 function ViewManageJob() {
-  const [trigger, { data }] = useLazyViewJobsQuery();
-
-  console.log(data);
-
-  // const handleView = () => {
-  //   trigger(id);
-  // };
-
-  const viewJobs = data;
-
-  console.log();
-
  return (
    <DialogRoot placement="center">
      <DialogTrigger asChild>
-        <Span>
-          <View />
-        </Span>
+        <View />
      </DialogTrigger>

-      {/* {viewJobs?.map((data: any) => ( */}
-        <DialogContent
-          bg={"#fff"}
-          // w={{ lg: "60%", md: "230px" }}
-          w={{ base: "90%", md: "400px" }}
-          height={"80vh"}
-          overflow={"scroll"}
-          overflowX="hidden"
-          p={3} // Reduced padding
-          bgSize={"md"}
-        >
-          <DialogHeader bg="white">
-            <DialogTitle alignSelf="center" color="black" fontSize="14px">
-              Add Details
-            </DialogTitle>
-          </DialogHeader>
+      <DialogContent
+        bg={"#fff"}
+        // w={{ lg: "60%", md: "230px" }}
+        w={{ base: "90%", md: "400px" }}
+        height={"80vh"}
+        overflow={"scroll"}
+        overflowX="hidden"
+        p={3} // Reduced padding
+        bgSize={"md"}
+      >
+        <DialogHeader bg="white">
+          <DialogTitle alignSelf="center" color="black" fontSize="14px">
+            Add Details
+          </DialogTitle>
+        </DialogHeader>

-          <DialogBody bg="white">
-            <Stack py={3}>
-              <Field.Root>
-                <Field.Label color="black" pt={1} fontSize="12px">
-                  Job title
-                </Field.Label>
-                <Input
-                  placeholder="Enter the Job Title"
-                  bgColor="#EEEEEE"
-                  color="black"
-                  border="none"
-                  pl={1}
-                  fontSize="12px"
-                  height="30px"
-                />
-              </Field.Root>
-              <Field.Root>
-                <Field.Label color="black" pt={1} fontSize="12px">
-                  Workspace mode
-                </Field.Label>
-                <Input
-                  placeholder="Enter the Workspace Mode"
-                  bgColor="#EEEEEE"
-                  color="black"
-                  border="none"
-                  pl={1}
-                  fontSize="12px"
-                  height="30px"
-                />
-              </Field.Root>
-              <Field.Root>
-                <Field.Label pt={1} color="black" fontSize="12px">
-                  Category
-                </Field.Label>
-                <Input
-                  placeholder="Enter the Category"
-                  bgColor="#EEEEEE"
-                  color="black"
-                  border="none"
-                  pl={1}
-                  fontSize="12px"
-                  height="30px"
-                />
-              </Field.Root>
-              <Field.Root>
-                <Field.Label pt={1} color="black" fontSize="12px">
-                  Sub-Category
-                </Field.Label>
-                <Input
-                  placeholder="Enter the Sub-Category"
-                  bgColor="#EEEEEE"
-                  color="black"
-                  border="none"
-                  pl={1}
-                  fontSize="12px"
-                  height="30px"
-                />
-              </Field.Root>
-              <Field.Root>
-                <Field.Label pt={1} color="black" fontSize="12px">
-                  Salary
-                </Field.Label>
-                <Input
-                  placeholder="Enter the Salary"
-                  bgColor="#EEEEEE"
-                  color="black"
-                  border="none"
-                  pl={1}
-                  fontSize="12px"
-                  height="30px"
-                />
-              </Field.Root>
-              <Field.Root>
-                <Field.Label pt={1} color="black" fontSize="12px">
-                  Experience
-                </Field.Label>
-                <Input
-                  placeholder="Enter the Experience"
-                  bgColor="#EEEEEE"
-                  color="black"
-                  border="none"
-                  pl={1}
-                  fontSize="12px"
-                  height="30px"
-                />
-              </Field.Root>
-              <Field.Root>
-                <Field.Label pt={1} color="black" fontSize="12px">
-                  Job Location
-                </Field.Label>
-                <Input
-                  placeholder="Enter the Job Location"
-                  bgColor="#EEEEEE"
-                  color="black"
-                  border="none"
-                  pl={1}
-                  fontSize="12px"
-                  height="30px"
-                />
-              </Field.Root>
-              {/* <Field.Label pt={1} color="black" fontSize="12px">Country Selection</Field.Label>
+        <DialogBody bg="white">
+          <Stack py={3}>
+            <Field.Root>
+              <Field.Label color="black" pt={1} fontSize="12px">
+                Job title
+              </Field.Label>
+              <Input
+                placeholder="Enter the Job Title"
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
+              />
+            </Field.Root>
+            <Field.Root>
+              <Field.Label color="black" pt={1} fontSize="12px">
+                Workspace mode
+              </Field.Label>
+              <Input
+                placeholder="Enter the Workspace Mode"
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
+              />
+            </Field.Root>
+            <Field.Root>
+              <Field.Label pt={1} color="black" fontSize="12px">
+                Category
+              </Field.Label>
+              <Input
+                placeholder="Enter the Category"
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
+              />
+            </Field.Root>
+            <Field.Root>
+              <Field.Label pt={1} color="black" fontSize="12px">
+                Sub-Category
+              </Field.Label>
+              <Input
+                placeholder="Enter the Sub-Category"
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
+              />
+            </Field.Root>
+            <Field.Root>
+              <Field.Label pt={1} color="black" fontSize="12px">
+                Salary
+              </Field.Label>
+              <Input
+                placeholder="Enter the Salary"
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
+              />
+            </Field.Root>
+            <Field.Root>
+              <Field.Label pt={1} color="black" fontSize="12px">
+                Experience
+              </Field.Label>
+              <Input
+                placeholder="Enter the Experience"
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
+              />
+            </Field.Root>
+            <Field.Root>
+              <Field.Label pt={1} color="black" fontSize="12px">
+                Job Location
+              </Field.Label>
+              <Input
+                placeholder="Enter the Job Location"
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
+              />
+            </Field.Root>
+            {/* <Field.Label pt={1} color="black" fontSize="12px">Country Selection</Field.Label>
                            <Input placeholder="Enter the Country Selection"   /> */}
-              <SelectRoot collection={frameworks} size="sm" w={"100%"}>
-                <SelectLabel pt={1} color="black" fontSize="12px">
-                  Country Selection
-                </SelectLabel>
-                <SelectTrigger
-                  bgColor="#EEEEEE"
-                  color="black"
-                  border="none"
-                  pl={1}
-                  fontSize="12px"
-                  height="30px"
-                  borderRadius={"5px"}
-                >
-                  <SelectValueText
-                    placeholder="Enter the Country Selection"
-                    pb={"6px"}
-                    fontSize={"12px"}
-                  />
-                </SelectTrigger>
-                <SelectContent
-                  position={"relative"}
-                  zIndex={"9999"}
-                  bg={"#fff"}
-                >
-                  {frameworks.items.map((movie) => (
-                    <SelectItem
-                      item={movie}
-                      key={movie.value}
-                      color={"black"}
-                      pl={2}
-                      p={1}
-                      _hover={{ bg: "#F0F0F0" }} // Light grey background on hover
-                      fontSize="12px"
-                    >
-                      {movie.label}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </SelectRoot>
+            <SelectRoot collection={frameworks} size="sm" w={"100%"}>
+              <SelectLabel pt={1} color="black" fontSize="12px">
+                Country Selection
+              </SelectLabel>
+              <SelectTrigger
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
+                borderRadius={"5px"}
+              >
+                <SelectValueText
+                  placeholder="Enter the Country Selection"
+                  pb={"6px"}
+                  fontSize={"12px"}
+                />
+              </SelectTrigger>
+              <SelectContent position={"relative"} zIndex={"9999"} bg={"#fff"}>
+                {frameworks.items.map((movie) => (
+                  <SelectItem
+                    item={movie}
+                    key={movie.value}
+                    color={"black"}
+                    pl={2}
+                    p={1}
+                    _hover={{ bg: "#F0F0F0" }} // Light grey background on hover
+                    fontSize="12px"
+                  >
+                    {movie.label}
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </SelectRoot>

-              <Field.Root>
-                <Field.Label pt={1} color="black" fontSize="12px">
-                  Job type
-                </Field.Label>
-                <Input
-                  placeholder="Enter the Job Type"
-                  bgColor="#EEEEEE"
-                  color="black"
-                  border="none"
-                  pl={1}
-                  fontSize="12px"
-                  height="30px"
-                />
-              </Field.Root>
-              <Field.Root>
-                <Field.Label pt={1} color="black" fontSize="12px">
-                  Skills required
-                </Field.Label>
-                <Input
-                  placeholder="Enter the Skills Required"
-                  bgColor="#EEEEEE"
-                  color="black"
-                  border="none"
-                  pl={1}
-                  fontSize="12px"
-                  height="30px"
-                />
-              </Field.Root>
-              <Field.Root>
-                <Field.Label pt={1} color="black" fontSize="12px">
-                  Job Description*
-                </Field.Label>
-                <Input
-                  placeholder="Enter the Job Description"
-                  bgColor="#EEEEEE"
-                  color="black"
-                  border="none"
-                  pl={1}
-                  fontSize="12px"
-                  height="30px"
-                />
-              </Field.Root>
-              <Field.Root>
-                <Field.Label pt={1} color="black" fontSize="12px">
-                  Upload Image
-                </Field.Label>
-                <Input
-                  placeholder="Upload Image"
-                  bgColor="#EEEEEE"
-                  color="black"
-                  border="none"
-                  pl={1}
-                  fontSize="12px"
-                  height="30px"
-                />
-              </Field.Root>
-            </Stack>
-          </DialogBody>
-          <DialogFooter display="flex" justifyContent="center" pt={"2"}>
-            <Button
-              w="100%"
-              bg="#02A0A0"
-              color={"#fff"}
-              fontSize="12px"
-              height="30px"
-            >
-              Save
-            </Button>
-          </DialogFooter>
+            <Field.Root>
+              <Field.Label pt={1} color="black" fontSize="12px">
+                Job type
+              </Field.Label>
+              <Input
+                placeholder="Enter the Job Type"
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
+              />
+            </Field.Root>
+            <Field.Root>
+              <Field.Label pt={1} color="black" fontSize="12px">
+                Skills required
+              </Field.Label>
+              <Input
+                placeholder="Enter the Skills Required"
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
+              />
+            </Field.Root>
+            <Field.Root>
+              <Field.Label pt={1} color="black" fontSize="12px">
+                Job Description*
+              </Field.Label>
+              <Input
+                placeholder="Enter the Job Description"
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
+              />
+            </Field.Root>
+            <Field.Root>
+              <Field.Label pt={1} color="black" fontSize="12px">
+                Upload Image
+              </Field.Label>
+              <Input
+                placeholder="Upload Image"
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
+              />
+            </Field.Root>
+          </Stack>
+        </DialogBody>
+        <DialogFooter display="flex" justifyContent="center" pt={"2"}>
+          <Button
+            w="100%"
+            bg="#02A0A0"
+            color={"#fff"}
+            fontSize="12px"
+            height="30px"
+          >
+            Save
+          </Button>
+        </DialogFooter>

-          <DialogCloseTrigger color="black" />
-        </DialogContent>
-      {/* ))} */}
+        <DialogCloseTrigger color="black" />
+      </DialogContent>
    </DialogRoot>
  );
 }
--- a/src/Pages/ManagePost/ManagePost.tsx
+++ b/src/Pages/ManagePost/ManagePost.tsx
@@ -1,205 +1,65 @@
-import {
-  Box, HStack, Icon, Image,
-  // Span, 
-  Text
-} from "@chakra-ui/react";
+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 { InputGroup } from "../../components/ui/input-group";
+import { LuSearch } from "react-icons/lu";
 import DataTable from "../../components/DataTable";
-// import AlertDailog from "../../components/AlertDailog";
+import AlertDailog from "../../components/AlertDailog";
 import { Switch } from "../../components/ui/switch";
-// import img from "../../assets/waterfall.jpg";
-// import { RiDeleteBin5Line } from "react-icons/ri";
+import img from "../../assets/waterfall.jpg";
+import { RiDeleteBin5Line } from "react-icons/ri";
 import ViewDailog from "./ViewDailog";
-import { useGetManagePostsQuery, usePostStatusToggleMutation } from "../../Redux/Service/manage.post.service";
-import { useEffect, useState } from "react";
-import { toaster } from "../../components/ui/toaster";
-import { FaVideo } from "react-icons/fa";
-import SearchComponent from "../../components/SearchComponent";
-// import Delete from "../../components/ActionIcons/Delete";
+import Delete from "../../components/ActionIcons/Delete";
 // import ViewDailog from './ViewDailog'

-const APIURL = import.meta.env.VITE_POST_IMG
+// table data

 const tableHeadRow = [
  "Sr. No",
  "Images",
  "Description",
  "Publish Data",
-  // "Activate/Deactivate",
+  "Activate/Deactivate",
  "Action",
 ];

-// const managepost: any[] = [
-//   ...Array.from({ length: 12 }, (_, i) => ({
-//     "Sr. No": i + 1,
-//     Images: (
-//       // <Image w={50} src={img} />
-//       <Image rounded={"lg"} w={100} h={50} src={img} />
-//     ),
-//     Description: (
-//       <Text>
-//         {`Lorem ipsum dolor, sit amet consectetur adipisicing elit.}`.slice(
-//           0,
-//           30
-//         ) + "..."}
-//       </Text>
-//     ),
-//     "Publish Data": "12/01/2025",
-//     "Activate/Deactivate": (
-//       <Box w={"100%"}>
-//         <Switch size={"sm"} colorPalette={"teal"} />
-//       </Box>
-//     ),
-//     Action: (
-//       <HStack justifyContent="center">
-//         <ViewDailog />
-//         {/* <AlertDailog
-//           AltertTiggerIcon={() => <Span><Delete /> </Span>} 
-//           alertText="Delete Users"
-//           alertIcon={<Image src={"DeleteIcon"} h={"39px"} />}
-//           alertCaption="are you sure you want to delete ?"
-//           onConfirm={() => {
-//             console.log("User deleted:", i + 1);
-//           }}
-//         /> */}
-//       </HStack>
-//     ),
-//   })),
-// ];
-
-const ManagePost = () => {
-  const [currentPage, setCurrentPage] = useState(1);
-  const { data, refetch } = useGetManagePostsQuery(currentPage)
-  const [localData, setLocalData] = useState<any[]>([]);
-  const [searchTerm, setSearchTerm] = useState("");
-  const [postStatusToggle] = usePostStatusToggleMutation()
-  console.log('POSTS', data?.data.data);
-
-  useEffect(() => {
-    if (data?.data?.data) {
-      setLocalData(data?.data.data);
-    }
-  }, [data]);
-
-  const handlePageChange = (page: number) => {
-    setCurrentPage(page);
-  };
-
-  const handleToggle = async (agencyId: string, currentStatus: number) => {
-    const newStatus = currentStatus ? 0 : 1;
-    setLocalData((prevData) =>
-      prevData.map((agency) =>
-        agency.id === agencyId ? { ...agency, is_active: newStatus } : agency
-      )
-    );
-    try {
-      await postStatusToggle({ id: agencyId, is_active: newStatus }).unwrap();
-      refetch()
-    } catch (error) {
-      console.error("Error updating:", error);
-      toaster.create({
-        title: "Error",
-        description: "Someting went wrong.",
-        type: "error",
-      });
-      setLocalData((prevData) =>
-        prevData.map((agency) =>
-          agency.id === agencyId ? { ...agency, is_active: currentStatus } : agency
-        )
-      );
-    }
-  };
-
-
-  function formatAPIDate(apiDateString: any) {
-    const date = new Date(apiDateString);
-
-    // Get month, day, and year
-    const month = date.getMonth() + 1; // Months are 0-indexed
-    const day = date.getDate();
-    const year = date.getFullYear();
-
-    // Pad with leading zeros if needed
-    const formattedMonth = month.toString().padStart(2, '0');
-    const formattedDay = day.toString().padStart(2, '0');
-
-    return `${formattedMonth}/${formattedDay}/${year}`;
-  }
-
-  const filteredData = localData?.filter((agency) => {
-    return (agency.post_content_translation.some((item: any) => {
-      const searchLower = searchTerm.toLowerCase();
-      const title = item.content?.toLowerCase().includes(searchLower);
-      return title;
-    }))
-  });
-
-  const managepost = filteredData?.flatMap((agency: any, index: number) => (agency.post_content_translation.map((translation: any) => ({
-    'id': agency.id,
-    "Sr. No": (currentPage - 1) * (data?.data.per_page ?? 0) + index + 1,
+const managepost: any[] = [
+  ...Array.from({ length: 12 }, (_, i) => ({
+    "Sr. No": i + 1,
    Images: (
-      agency.images.length > 0 ?
-        agency.images[0].type === "image" ? (
-          <HStack>
-            <Image
-              rounded={"lg"}
-              w={100}
-              h={50}
-              src={`${APIURL}${agency.images[0].image_name}`}
-            />
-           <Text fontSize="xs" color={'lightgray'}>
-              {`${Number(agency.images.length) > 1 ? '+' + (Number(agency.images.length) - 1) : ''}`}
-          </Text>
-          </HStack>
-        ) : (
-        <HStack>
-              <Box
-                rounded={"lg"}
-                w={100}
-                h={50}
-                bg="gray.200"
-                display="flex"
-                alignItems="center"
-                justifyContent="center"
-              >
-                <Icon as={FaVideo} color="gray.500" />
-              </Box>
-              <Text fontSize="xs" color={'lightgray'}>
-                {`${Number(agency.images.length) > 1 ? '+' + (Number(agency.images.length) - 1) : ''}`}
-              </Text>
-        </HStack>
-        ) : ''
-      // <Image rounded={"lg"} w={100} h={50} src={img} />
+      // <Image w={50} src={img} />
+      <Image rounded={"lg"} w={100} h={50} src={img} />
    ),
    Description: (
      <Text>
-        {`${translation?.content}`.slice(
+        {`Lorem ipsum dolor, sit amet consectetur adipisicing elit.}`.slice(
          0,
          30
        ) + "..."}
      </Text>
    ),
-    "Publish Data": formatAPIDate(agency.created_at),
-    "is_active": agency.is_active,
-    "Action": (
+    "Publish Data": "12/01/2025",
+    "Activate/Deactivate": (
+      <Box w={"100%"}>
+        <Switch size={"sm"} colorPalette={"teal"} />
+      </Box>
+    ),
+    Action: (
      <HStack justifyContent="center">
-        {/* <ViewAgencyMaster agency={localData} id={agency.id} /> */}
-        <ViewDailog localData={{ ...agency, translation }} refetch={refetch} />
-        <Box>
-          <Switch
-            colorPalette={"teal"}
-            size={"xs"}
-            onChange={() => handleToggle(agency.id, Number(agency.is_active))}
-            checked={Boolean(Number(agency.is_active))}
-          />
-        </Box>
+        <ViewDailog />
+        <AlertDailog
+          AltertTiggerIcon={() => <Delete />} 
+          alertText="Delete Users"
+          alertIcon={<Image src={"DeleteIcon"} h={"39px"} />}
+          alertCaption="are you sure you want to delete ?"
+          onConfirm={() => {
+            console.log("User deleted:", i + 1);
+          }}
+        />
      </HStack>
    ),
-  }))));
-
-
+  })),
+];
+const ManagePost = () => {
  return (
    <MainFrame>
      <Box>
@@ -215,27 +75,35 @@ const ManagePost = () => {
          </Text>

          <HStack>
-            <SearchComponent
-              value={searchTerm}
-              onChange={(value) => {
-                setSearchTerm(value);
-                // setCurrentPage(1);
-                refetch()
-              }}
-            />
+            <InputGroup
+              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={"xs"}
+                fontSize={"sm"}
+                placeholder="Search..."
+                bgColor={"#EEEEEE"}
+                ps={8}
+              />
+            </InputGroup>
          </HStack>
        </HStack>
        <DataTable
          sortableColumns={["Name", "Registration Date "]}
          tableHeadRow={tableHeadRow}
          data={managepost}
-          paginationData={{
-            current_page: data?.data.current_page || 1,
-            last_page: data?.data.last_page || 1,
-            per_page: data?.data.per_page || 10,
-            total: data?.data.total || 0
-          }}
-          onPageChange={handlePageChange}
        />
      </Box>
    </MainFrame>
--- a/src/Pages/ManagePost/ViewDailog.tsx
+++ b/src/Pages/ManagePost/ViewDailog.tsx
@@ -1,18 +1,15 @@
-import { Field, HStack, Image, Input, Stack } from "@chakra-ui/react"
-// import { TbEdit } from "react-icons/tb"
-// import img from "../../assets/waterfall.jpg"
+import { Field, Icon, Image, Input, Stack } from "@chakra-ui/react"
+import { TbEdit } from "react-icons/tb"
+import img from "../../assets/waterfall.jpg"
 import { DialogBody, DialogCloseTrigger, DialogContent, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../components/ui/dialog"
-// import Edit from "../../components/ActionIcons/Edit"
-import { LuEye } from "react-icons/lu"
+import Edit from "../../components/ActionIcons/Edit"

-const APIURL = import.meta.env.VITE_POST_IMG
-
-function ViewDailog({ localData }: { localData: any, refetch: VoidFunction }) {
+function ViewDailog() {
    return (
+
        <DialogRoot placement="center">
            <DialogTrigger asChild>
-                {/* <Span><Edit /></Span> */}
-                <LuEye fontSize={"xm"} cursor={'pointer'} />
+                <Edit />
            </DialogTrigger>

            <DialogContent
@@ -28,49 +25,17 @@ function ViewDailog({ localData }: { localData: any, refetch: VoidFunction }) {
                <DialogBody bg="white">
                    <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 />
+
+                            <Field.Label color="black" pt={1} fontSize="12px">Subtitle</Field.Label>
+                            <Input placeholder="Enter the Subtitle" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" readOnly />
+
                            <Field.Label color="black" pt={1} fontSize="12px">Description</Field.Label>
-                            <Input
-                                // placeholder="Enter the Title"
-                                value={localData.translation.content}
-                                bgColor="#EEEEEE"
-                                color="black"
-                                border="none"
-                                pl={1}
-                                fontSize="12px"
-                                height="30px"
-                                readOnly
-                            />
+                            <Input placeholder="Enter the Description" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" readOnly />

-                            {/* <Field.Label color="black" pt={1} fontSize="12px">Subtitle</Field.Label>
-                            <Input placeholder="Enter the Subtitle" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" readOnly /> */}
-
-                            {/* <Field.Label color="black" pt={1} fontSize="12px">Description</Field.Label>
-                            <Input placeholder="Enter the Description" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" readOnly /> */}
                            <Field.Label color="black" pt={1} fontSize="12px">Image</Field.Label>
-                            <HStack w="fit-content" flexWrap={'wrap'}>
-                                {localData.images.map((img: any) => (
-                                    img.type === 'image' ? (
-                                        <Image
-                                            key={img.id}
-                                            src={`${APIURL}${img.image_name}`}
-                                            w="30%"
-                                            maxH="150px"
-                                            objectFit="contain"
-                                        />
-                                    ) : (
-                                        <video
-                                            key={img.id}
-                                            width="45%"
-                                            height="50"
-                                            controls
-                                        >
-                                            <source src={`${APIURL}${img.image_name}`} type="video/mp4" />
-                                        </video>
-                                    )
-                                ))}
-                            </HStack>
-
-                            {/* <Image src={img} w="100%" maxH="150px" objectFit="contain" /> */}
+                            <Image src={img} w="100%" maxH="150px" objectFit="contain" />
                        </Field.Root>
                    </Stack>
                </DialogBody>
--- a/src/Pages/ManageUsers/DeactivatedAccounts/DeactivatedAccounts.tsx
+++ b/src/Pages/ManageUsers/DeactivatedAccounts/DeactivatedAccounts.tsx
@@ -4,80 +4,34 @@ import DataTable from "../../../components/DataTable";
 import { Switch } from "../../../components/ui/switch";
 import { InputGroup } from "../../../components/ui/input-group";
 import { LuSearch } from "react-icons/lu";
-import { useGetContactQuery } from "../../../Redux/Service/deactivated.account.service";
-import { useEffect, useState } from "react";
-import { Spinner } from "../../../components/Sipnner/Spinner";

 const tableHeadRow = [
  "Sr. No",
  "First Name",
  "Last Name",
-  "User Type",
+  "Company name",
  "Activate/Deactivate",
 ];

-const DeactivatedAccounts = () => {
-  const { data ,isLoading} = useGetContactQuery();
-  const [localData, setLocalData] = useState([]);
-
-  useEffect(() => {
-    if (data) {
-      setLocalData((data as any)?.data?.data || []);
-    }
-  }, [data]);
-
-
-  const manageUser = localData?.map((agency: any, index: number) => ({
-    "Sr. No": index + 1,
-    "First Name": agency?.first_name,
-    "Last Name": agency?.last_name,
-    "User Type": agency?.principal_type_xid === 3 ? "JobSeeker" : "Recruiter",
+const manageUser: any[] = [
+  ...Array.from({ length: 12 }, (_, i) => ({
+    "Sr. No": i + 1,
+    "First Name": "Ritesh",
+    "Last Name": "akanksha@gmail.com",
+    "Company name": "9876543210",
    "Activate/Deactivate": (
-      <Box display={"flex"} justifyContent={"center"}>
-        <Switch
-          size={"sm"}
-          colorPalette={"teal"}
-          checked={agency.is_active === true}
-          // onChange={() => handleToggle(agency.id, agency.is_active ? "1" : "0")}
-        />
+      <Box display={'flex'} justifyContent={'center'}>
+        <Switch size={'sm'} colorPalette={'teal'} />
      </Box>
    ),
-  }));
-
-   if (isLoading) {
-    return (
-      <MainFrame>
-        <Box
-          display="flex"
-          justifyContent="center"
-          alignItems="center"
-          height="100%"
-        >
-          <Spinner />
-        </Box>
-      </MainFrame>
-    );
-  }
-
-  // if (isError) {
-  //   return (
-  //     <MainFrame>
-  //       <Box
-  //         display="flex"
-  //         justifyContent="center"
-  //         alignItems="center"
-  //         height="100%"
-  //       >
-  //         <Text>Error loading data</Text>
-  //       </Box>
-  //     </MainFrame>
-  //   );
-  // }
+  })),
+];

+const DeactivatedAccounts = () => {
  return (
    <MainFrame>
      <Box>
-        <HStack
+      <HStack
          w={"100%"}
          justifyContent={"space-between"}
          mb={4}
@@ -85,16 +39,13 @@ const DeactivatedAccounts = () => {
          px={3}
        >
          <Text as={"span"} fontSize={"sm"} fontWeight={500} color={"#000"}>
-            Deactivated User Accounts
+             Deactivated User Accounts
          </Text>

          <HStack>
            <InputGroup
              startElement={
-                <LuSearch
-                  fontSize={"xs"}
-                  style={{ position: "relative", left: "10px" }}
-                />
+                <LuSearch fontSize={"xs"}  style={{position:'relative',left:'10px'}} />
              }
              color={"#000"}
            >
@@ -108,7 +59,7 @@ const DeactivatedAccounts = () => {
                size={"2xs"}
                fontSize={"sm"}
                placeholder="Search..."
-                bgColor={"#EEEEEE"}
+                bgColor={'#EEEEEE'}
                ps={8}
              />
            </InputGroup>
--- a/src/Pages/ManageUsers/RegisterUsers/EditRegisterUsers.tsx
+++ b/src/Pages/ManageUsers/RegisterUsers/EditRegisterUsers.tsx
@@ -1,5 +1,5 @@
-// import { MdOutlineRemoveRedEye } from "react-icons/md";
-import { Field, Input, Span, Stack } from "@chakra-ui/react";
+import { MdOutlineRemoveRedEye } from "react-icons/md";
+import { Field, Icon, Input, Stack } from "@chakra-ui/react";
 import {
  DialogActionTrigger,
  DialogBody,
@@ -11,28 +11,26 @@ import {
  DialogTitle,
  DialogTrigger,
 } from "../../../components/ui/dialog";
-// import { BiEdit } from "react-icons/bi";
+import { BiEdit } from "react-icons/bi";
 import { Button } from "../../../components/ui/button";
-// import { TbEdit } from "react-icons/tb";
+import { TbEdit } from "react-icons/tb";
 import Edit from "../../../components/ActionIcons/Edit";

 function EditRegisterUsers() {
  return (
    <DialogRoot placement="center">
      <DialogTrigger asChild>
-        <Span>
-          <Edit />
-        </Span>
+            <Edit/>
      </DialogTrigger>

      <DialogContent
        bg={"#fff"}
-        w={{ base: "90%", md: "400px" }}
-        height={"80vh"}
-        overflow={"scroll"}
-        overflowX="hidden"
+        w={{ base: '90%', md: '400px' }}
+        height={'80vh'}
+        overflow={'scroll'}
+        overflowX="hidden" 
        p={3} // Reduced padding
-        bgSize={"md"}
+        bgSize={'md'}
      >
        <DialogHeader bg="white" p={0}>
          <DialogTitle alignSelf="center" color="black" fontSize="14px">
@@ -47,81 +45,49 @@ function EditRegisterUsers() {
                First Name
              </Field.Label>
              <Input
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={1}
-                fontSize="12px"
-                height="30px"
+                 bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
              />

              <Field.Label color="black" pt={1} fontSize="12px">
                Last Name
              </Field.Label>
              <Input
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={1}
-                fontSize="12px"
-                height="30px"
+                 bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
              />

              <Field.Label color="black" pt={1} fontSize="12px">
                Gender
              </Field.Label>
              <Input
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={1}
-                fontSize="12px"
-                height="30px"
+                 bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
              />

              <Field.Label color="black" pt={1} fontSize="12px">
                DOB
              </Field.Label>
              <Input
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={1}
-                fontSize="12px"
-                height="30px"
+                 bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
              />

              <Field.Label color="black" pt={1} fontSize="12px">
                OTP Verified
              </Field.Label>
              <Input
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={1}
-                fontSize="12px"
-                height="30px"
+                 bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
              />

              <Field.Label color="black" pt={1} fontSize="12px">
                Language
              </Field.Label>
              <Input
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={1}
-                fontSize="12px"
-                height="30px"
+                 bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
              />
            </Field.Root>
          </Stack>
        </DialogBody>
        <DialogFooter mt={5}>
          <DialogActionTrigger asChild>
-            <Button rounded={"md"} w={"100%"} size={"sm"} bg={"#02A0A0"}>
-              Save
-            </Button>
+            <Button rounded={'md'} w={"100%"} size={'sm'} bg={'#02A0A0'}>Save</Button>
          </DialogActionTrigger>
        </DialogFooter>
        <DialogCloseTrigger color="black" />
--- a/src/Pages/ManageUsers/RegisterUsers/RegisterUsers.tsx
+++ b/src/Pages/ManageUsers/RegisterUsers/RegisterUsers.tsx
@@ -1,20 +1,15 @@
-import {
-  Box, HStack,
-  // Image, 
-  Text
-} from "@chakra-ui/react";
+import { Box, HStack, Image, Input, Text } from "@chakra-ui/react";
 import MainFrame from "../../../components/MainFrame";
-// import AlertDailog from "../../../components/AlertDailog";
-// import { RiDeleteBin5Line } from "react-icons/ri";
+import AlertDailog from "../../../components/AlertDailog";
+import { RiDeleteBin5Line } from "react-icons/ri";
 import DataTable from "../../../components/DataTable";
 import { Switch } from "../../../components/ui/switch";
+import { InputGroup } from "../../../components/ui/input-group";
+import { LuSearch } from "react-icons/lu";
 import ViewRegisterUsers from "./ViewRegisterUsers";
 import EditRegisterUsers from "./EditRegisterUsers";
 import AddRegisterUsers from "./AddRegisterUsers";
-import { useEffect, useState } from "react";
-import { useGetManageUserQuery, UserData, useUserToggleMutation } from "../../../Redux/Service/manage.user";
-import SearchComponent from "../../../components/SearchComponent";
-// import Delete from "../../../components/ActionIcons/Delete";
+import Delete from "../../../components/ActionIcons/Delete";

 const tableHeadRow = [
  "Sr. No",
@@ -28,113 +23,40 @@ const tableHeadRow = [
  "Action",
 ];

-// const registerUser: any[] = [
-//   ...Array.from({ length: 12 }, (_, i) => ({
-//     "Sr. No": i + 1,
-//     "First Name": "Ritesh",
-//     "Mobile Number": "akanksha@gmail.com",
-//     "Gender": "9876543210",
-//     "DOB": "Female",
-//     "Type Of User": "15-01-1990",
-//     "Language": "Mumbai",
-//     "Activate/Deactivate": (
-//       <Box>
-//         <Switch size={'sm'} colorPalette={'teal'} />
-//       </Box>
-//     ),
-//     "Action": (
-//       <HStack justifyContent="center">
-//         <ViewRegisterUsers />
-//         <EditRegisterUsers />
-//         {/* <RiDeleteBin5Line style={{ cursor: "pointer" }} /> */}
-//         {/* <AlertDailog
-//           AltertTiggerIcon={() =><Delete /> } // Pass as function
-//           alertText="Delete Users"
-//           alertIcon={<Image src={"DeleteIcon"} h={"39px"} />}
-//           alertCaption="Are You Sure You Want To Delete This User ?"
-//           onConfirm={() => {
-//             console.log("User deleted:", i + 1);
-//           }}
-//         /> */}
-//       </HStack>
-//     ),
-//   })),
-// ];
-
-const RegisterUsers = () => {
-  const [currentPage, setCurrentPage] = useState(1);
-  const { data, refetch } = useGetManageUserQuery(currentPage)
-  const [localData, setLocalData] = useState<any[]>([]);
-  const [searchTerm, setSearchTerm] = useState("");
-  const [userToggle] = useUserToggleMutation()
-  console.log("Register Users Data", data?.data.data);
-
-  useEffect(() => {
-    if (data) {
-      setLocalData(data?.data.data);
-    }
-  }, [data]);
-
-  const handlePageChange = (page: number) => {
-    setCurrentPage(page);
-  }
-
-  const filteredData = localData?.filter((agency) => {
-    const searchLower = searchTerm.toLowerCase();
-    const firstName = agency.first_name?.toLowerCase().includes(searchLower);
-    // const email = agency.capital?.toLowerCase().includes(searchLower);
-    return firstName;
-  });
-
-  const handleToggle = async (agencyId: number, currentStatus: string) => {
-    const newStatus = currentStatus === '1' ? '0' : '1';
-
-    setLocalData((prevData) =>
-      prevData.map((agency) =>
-        agency.id === agencyId ? { ...agency, is_active: newStatus } : agency
-      )
-    );
-
-    try {
-      await userToggle({ id: agencyId, is_active: newStatus }).unwrap();
-      refetch()
-    } catch (error) {
-      console.error("Error updating privacy policy:", error);
-      setLocalData((prevData) =>
-        prevData.map((agency) =>
-          agency.id === agencyId ? { ...agency, is_active: currentStatus } : agency
-        )
-      );
-    }
-  }
-
-  const managepost = filteredData?.flatMap((agency: UserData, index: number) => ({
-    "Sr. No": (currentPage - 1) * (data?.data.per_page ?? 0) + index + 1,
-    "First Name": agency.first_name,
-    "Mobile Number": agency.phone_number,
-    "Gender": agency.gender,
-    "DOB": agency.date_of_birth ? new Date(agency.date_of_birth).toLocaleDateString('en-GB').replace(/\//g, '-') : 'N/A',
-    "Type Of User": agency.principal_type?.principal_type_title || 'N/A',
-    // "Language": agency.principle_language_links.map(lang => lang.language_name).join(', ') || 'N/A',
-    "Action": (   
+const registerUser: any[] = [
+  ...Array.from({ length: 12 }, (_, i) => ({
+    "Sr. No": i + 1,
+    "First Name": "Ritesh",
+    "Mobile Number": "akanksha@gmail.com",
+    "Gender": "9876543210",
+    "DOB": "Female",
+    "Type Of User": "15-01-1990",
+    "Language": "Mumbai",
+    "Activate/Deactivate": (
+      <Box>
+        <Switch size={'sm'} colorPalette={'teal'} />
+      </Box>
+    ),
+    "Action": (
      <HStack justifyContent="center">
-        <EditRegisterUsers
-        // rowData={{ id: agency.id, en_name: agency.en_name, country_code: agency.country_code, phonecode: agency.phonecode, capital: agency.capital, currency: agency.currency, currency_name: agency.currency_name, currency_symbol: agency.currency_symbol }} 
-        // refetch={refetch} 
-        />
        <ViewRegisterUsers />
-        <Box>
-          <Switch
-            colorPalette={'teal'}
-            size={"xs"}
-            checked={agency.is_active === true}
-            onChange={() => handleToggle(agency.id, agency.is_active ? '1' : '0')}
-          />
-        </Box>
+        <EditRegisterUsers />
+        {/* <RiDeleteBin5Line style={{ cursor: "pointer" }} /> */}
+        <AlertDailog
+          AltertTiggerIcon={() => <Delete />} // Pass as function
+          alertText="Delete Users"
+          alertIcon={<Image src={"DeleteIcon"} h={"39px"} />}
+          alertCaption="Are You Sure You Want To Delete This User ?"
+          onConfirm={() => {
+            console.log("User deleted:", i + 1);
+          }}
+        />
      </HStack>
    ),
-  }))
+  })),
+];

+const RegisterUsers = () => {
  return (
    <MainFrame>
      <Box>
@@ -149,29 +71,34 @@ const RegisterUsers = () => {
            Register Users
          </Text>

-          <HStack>
-            <SearchComponent
-              value={searchTerm}
-              onChange={(value) => {
-                setSearchTerm(value);
-                // setCurrentPage(1);
-                refetch()
-              }}
-            />
+          <HStack> 
+            <InputGroup
+              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={"xs"}
+                fontSize={"sm"}
+                placeholder="Search..."
+                bgColor={'#EEEEEE'}
+                ps={8}
+              />
+            </InputGroup>
            <AddRegisterUsers />
          </HStack>
        </HStack>
        <DataTable
          sortableColumns={["Name", "Registration Date "]}
          tableHeadRow={tableHeadRow}
-          data={managepost}
-          paginationData={{
-            current_page: data?.data.current_page || 1,
-            last_page: data?.data.last_page || 1,
-            per_page: data?.data.per_page || 10,
-            total: data?.data.total || 0
-          }}
-          onPageChange={handlePageChange}
+          data={registerUser}
        />
      </Box>
    </MainFrame>
--- a/src/Pages/ManageUsers/RegisterUsers/ViewRegisterUsers.tsx
+++ b/src/Pages/ManageUsers/RegisterUsers/ViewRegisterUsers.tsx
@@ -1,5 +1,5 @@
-import { Field, Input, Span, Stack } from "@chakra-ui/react";
-import View from "../../../components/ActionIcons/View";
+import { MdOutlineRemoveRedEye } from "react-icons/md";
+import { Field, Icon, Input, Stack } from "@chakra-ui/react";
 import {
  DialogBody,
  DialogCloseTrigger,
@@ -9,22 +9,23 @@ import {
  DialogTitle,
  DialogTrigger,
 } from "../../../components/ui/dialog";
+import View from "../../../components/ActionIcons/View";

 function ViewRegisterUsers() {
  return (
    <DialogRoot placement="center">
      <DialogTrigger asChild>
-        <Span><View /></Span>
+        <View />
      </DialogTrigger>

      <DialogContent
-         bg={"#fff"}
-         w={{ base: '90%', md: '400px' }}
-         height={'80vh'}
-         overflow={'scroll'}
-         overflowX="hidden" 
-         p={3} // Reduced padding
-         bgSize={'md'}
+        bg={"#fff"}
+        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">
@@ -39,42 +40,72 @@ function ViewRegisterUsers() {
                First Name
              </Field.Label>
              <Input
-                bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
              />

              <Field.Label color="black" pt={1} fontSize="12px">
                Last Name
              </Field.Label>
              <Input
-                bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
              />

              <Field.Label color="black" pt={1} fontSize="12px">
                Gender
              </Field.Label>
              <Input
-                bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
              />

              <Field.Label color="black" pt={1} fontSize="12px">
                DOB
              </Field.Label>
              <Input
-                bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
              />

              <Field.Label color="black" pt={1} fontSize="12px">
                OTP Verified
              </Field.Label>
              <Input
-                bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
              />

              <Field.Label color="black" pt={1} fontSize="12px">
                Language
              </Field.Label>
              <Input
-                bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px"
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
              />
            </Field.Root>
          </Stack>
--- a/src/Pages/MasterModule/AgencyMaster/AgencyMaster.tsx
+++ b/src/Pages/MasterModule/AgencyMaster/AgencyMaster.tsx
@@ -1,13 +1,13 @@
-import { Box, HStack, 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";
 import DataTable from "../../../components/DataTable";
 import { Switch } from "../../../components/ui/switch";
-// import EditAgencyMaster from "./EditAgencyMaster";
-// import ViewAgencyAddModel from "./ViewAgencyAddModel";
+import EditAgencyMaster from "./EditAgencyMaster";
+import ViewAgencyAddModel from "./ViewAgencyAddModel";
 import ViewAgencyMaster from "./ViewAgencyMaster";
-import { useAgencyMasterToggleMutation, useGetAgencyMasterQuery } from "../../../Redux/Service/agency.master.module.service";
-import { useEffect, useState } from "react";
-import SearchComponent from "../../../components/SearchComponent";
+

 // table data

@@ -21,105 +21,32 @@ const tableHeadRow = [
  "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 = () => {
-  const [currentPage, setCurrentPage] = useState(1);
-  const { data, refetch } = useGetAgencyMasterQuery(currentPage)
-  const [agencyMasterToggle] = useAgencyMasterToggleMutation()
-  const [localData, setLocalData] = useState<any[]>([]);
-  const [searchTerm, setSearchTerm] = useState("");
-
-  const handleToggle = async (agencyId: string, currentStatus: number) => {
-    const newStatus = currentStatus ? 0 : 1;
-    setLocalData((prevData) =>
-      prevData.map((agency) =>
-        agency.id === agencyId ? { ...agency, is_active: newStatus } : agency
-      )
-    );
-    try {
-      await agencyMasterToggle({ id: agencyId, is_active: newStatus }).unwrap();
-      refetch()
-    } catch (error) {
-      console.error("Error updating privacy policy:", error);
-      setLocalData((prevData) =>
-        prevData.map((agency) =>
-          agency.id === agencyId ? { ...agency, is_active: currentStatus } : agency
-        )
-      );
-    }
-  };
-
-  const handlePageChange = (page: number) => {
-    setCurrentPage(page);
-  };
-
-  const filteredData = localData?.filter((agency) =>
-    agency?.name.toLowerCase().includes(searchTerm.toLowerCase())
-  );
-
-  const managepost = filteredData?.map((agency: any, index: number) => ({
-    'id': agency.id,
-    "Sr. No": (currentPage - 1) * (data?.data.per_page ?? 0) + index + 1,
-    "Agency Name": agency.name,
-    "RC no.": agency.rc_number,
-    "State": agency.state,
-    "RC Status": agency.rc_status,
-    "Registered Office Address": agency.registered_office,
-    "Website/Domain": agency.domain_name,
-    "GST no.": agency.gst_number,
-    "is_active": agency.is_active,
+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 agency={localData} id={agency.id} />
-        {/* <EditAgencyMaster editData={{ id: agency.id, name: agency.name, domain_name: agency.domain_name, gst_number: agency.gst_number, rc_number: agency.rc_number, rc_status: agency.rc_status, registered_office: agency.registered_office, state: agency.state }} refetch={refetch} /> */}
+        <ViewAgencyMaster/>
+        <EditAgencyMaster />
        <Box>
-          <Switch
-            colorPalette={"teal"}
-            size={"xs"}
-            onChange={() => handleToggle(agency.id.toString(), Number(agency.is_active))}
-            checked={Boolean(Number(agency.is_active))}
-          />
+          <Switch colorPalette={'teal'} size={"xs"}/>
        </Box>
      </HStack>
    ),
-  }));
-
-  useEffect(() => {
-    if (data?.data?.data) {
-      setLocalData(data?.data?.data);
-    }
-  }, [data, localData, managepost]);
-
-  // useEffect(() => {
-  //   console.log("Fetched data:", data);
-  //   console.log("Local data:", localData);
-  //   console.log("Managepost data:", managepost);
-  // }, [data, localData, managepost]);
+  })),
+];

+const AgencyMaster = () => {
  return (

    <MainFrame>
@@ -132,11 +59,11 @@ const AgencyMaster = () => {
          px={3}
        >
          <Text as={"span"} fontSize={"sm"} fontWeight={500} color={"#000"}>
-            Agency Master
+          Agency Master
          </Text>

          <HStack >
-            {/* <InputGroup
+            <InputGroup 
              startElement={
                <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
              }
@@ -155,27 +82,17 @@ const AgencyMaster = () => {
                bgColor={'#EEEEEE'}
                ps={8}
              />
-            </InputGroup> */}
-            <SearchComponent
-              value={searchTerm}
-              onChange={setSearchTerm}
-            />
-            {/* <ViewAgencyAddModel refetch={refetch} /> */}
+            </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 || []}
-          paginationData={{
-            current_page: data?.data.current_page || 1,
-            last_page: data?.data.last_page || 1,
-            per_page: data?.data.per_page || 10,
-            total: data?.data.total || 0
-          }}
-          onPageChange={handlePageChange}
+          data={managepost}
        />
-      </Box> 
+      </Box>       
    </MainFrame>
  )
 }
--- a/src/Pages/MasterModule/AgencyMaster/EditAgencyMaster.tsx
+++ b/src/Pages/MasterModule/AgencyMaster/EditAgencyMaster.tsx
@@ -9,116 +9,14 @@ import {
  DialogTitle,
  DialogTrigger,
 } from "../../../components/ui/dialog";
-import { Field, Input, Stack } from "@chakra-ui/react";
+import { Field, Icon, Input, Stack } from "@chakra-ui/react";
 import Edit from "../../../components/ActionIcons/Edit";
-import { useEffect, useState } from "react";
-import { useUpdateAgencyMasterMutation } from "../../../Redux/Service/agency.master.module.service";
-import { Toaster, toaster } from "../../../components/ui/toaster";
-
-interface Organization {
-  id: number;
-  raid?: string;
-  name: string;
-  auth_signatory?: string;
-  state: string;
-  district?: string;
-  rc_number: number;
-  contact_details?: string;
-  registered_office: string;
-  branch_office?: string;
-  registered_email?: string;
-  other_email?: string;
-  registered_contact?: string;
-  website?: string;
-  domain_name: string;
-  staff_domain_name?: string;
-  gst_number: string;
-  rc_status?: "Active" | "Inactive"; // Assuming it's a status with limited values
-}
-
-
-function EditAgencyMaster({ editData, refetch }: { editData: Organization, refetch: VoidFunction }) {
-
-  const [formData, setFormData] = useState(editData);
-  const [isOpen, setIsOpen] = useState(false);
-  const [updateAgencyMaster] = useUpdateAgencyMasterMutation()
-
-  useEffect(() => {
-    setFormData(editData);
-  }, [editData]);
-
-  const handleOpenModal = () => {
-    setIsOpen(true);
-  };
-
-  const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const { name, value } = e.target;
-    setFormData((prev: any) => ({
-      ...prev,
-      [name]: value,
-    }));
-  }
-
-  const handleSubmit = async () => {
-    // console.log("Updated Data:", formData);
-    if (!formData.name.trim() ||
-      !formData.rc_number ||
-      !formData.state.trim() ||
-      !formData.registered_office.trim() ||
-      !formData.domain_name.trim() ||
-      !formData.gst_number.trim()) {
-      // console.log("Validation failed: Some fields are empty.");
-      toaster.create({
-        title: "Error",
-        description: "Input fields cannot be empty",
-        type: "error",
-      });
-      return;
-    }
-    setIsOpen(false);
-    // Handle API call or further processing here
-    const payload = {
-      id: formData?.id,
-      name: formData?.name,
-      state: formData?.state,
-      rc_number: formData?.rc_number,
-      registered_office: formData?.registered_office,
-      domain_name: formData?.domain_name,
-      gst_number:formData?.gst_number,
-    };
-
-    try {
-      const response = await updateAgencyMaster(payload).unwrap();
-      if (response?.status === "success") {
-        toaster.create({
-          title: "Success",
-          description: "Data updated successfully",
-          type: "success",
-        });
-        refetch()
-        setIsOpen(false);
-      } else {
-        toaster.create({
-          title: "Error",
-          description: "Failed to update",
-          type: "error",
-        });
-      }
-    } catch (error) {
-      console.error("Error updating template:", error);
-      toaster.create({
-        title: "Error",
-        description: "Something went wrong.",
-        type: "error",
-      });
-      // alert("Failed to update template");
-    }
-  };

+function EditAgencyMaster() {
  return (
-    <DialogRoot placement="center" open={isOpen} onOpenChange={({ open }) => setIsOpen(open)}>
+    <DialogRoot placement="center">
      <DialogTrigger asChild>
-        <Button bg="transparent" color={"black"} h={"18px"} onClick={handleOpenModal}><Edit /></Button>
+        <Edit />
      </DialogTrigger>

      <DialogContent
@@ -144,105 +42,92 @@ function EditAgencyMaster({ editData, refetch }: { editData: Organization, refet
                Agency name
              </Field.Label>
              <Input
-                name="name"
-                value={formData?.name}
+                value="Lorem Ipsum"
                bgColor="#EEEEEE"
                color="black"
                border="none"
                pl={1}
                fontSize="12px"
                height="30px"
-                onChange={handleChange}
              />

              <Field.Label color="black" pt={1} fontSize="12px">
                RC No.
              </Field.Label>
              <Input
-                name='rc_number'
-                value={formData.rc_number}
+                value="Lorem Ipsum"
                bgColor="#EEEEEE"
                color="black"
                border="none"
                pl={1}
                fontSize="12px"
                height="30px"
-                onChange={handleChange}
              />

              <Field.Label color="black" pt={1} fontSize="12px">
                State
              </Field.Label>
              <Input
-                name="state"
-                value={formData.state}
+                value="Lorem Ipsum"
                bgColor="#EEEEEE"
                color="black"
                border="none"
                pl={1}
                fontSize="12px"
                height="30px"
-                onChange={handleChange}
              />

              <Field.Label color="black" pt={1} fontSize="12px">
                Registered Office Address
              </Field.Label>
              <Input
-                name="registered_office"
-                value={formData.registered_office}
+                value="Active"
                bgColor="#EEEEEE"
                color="black"
                border="none"
                pl={1}
                fontSize="12px"
                height="30px"
-                onChange={handleChange}
              />

              <Field.Label color="black" pt={1} fontSize="12px">
                Website/Domain
              </Field.Label>
              <Input
-                name="domain_name"
-                value={formData.domain_name}
+                value="Lorem Ipsum"
                bgColor="#EEEEEE"
                color="black"
                border="none"
                pl={1}
                fontSize="12px"
                height="30px"
-                onChange={handleChange}
              />

              <Field.Label color="black" pt={1} fontSize="12px">
                GST no.
              </Field.Label>
              <Input
-                name="gst_number"
-                value={formData.gst_number}
+                value="Lorem Ipsum"
                bgColor="#EEEEEE"
                color="black"
                border="none"
                pl={1}
                fontSize="12px"
                height="30px"
-                onChange={handleChange}
              />

-              {/* <Field.Label color="black" pt={1} fontSize="12px">
-                RC Status
+              <Field.Label color="black" pt={1} fontSize="12px">
+                Action
              </Field.Label>
              <Input
-                value={formData.rc_status}
+                value="Lorem Ipsum"
                bgColor="#EEEEEE"
                color="black"
                border="none"
                pl={1}
                fontSize="12px"
                height="30px"
-                onChange={handleChange}
-              /> */}
+              />
            </Field.Root>
          </Stack>
        </DialogBody>
@@ -253,15 +138,13 @@ function EditAgencyMaster({ editData, refetch }: { editData: Organization, refet
            color={"#fff"}
            fontSize="12px"
            height="30px"
-            onClick={handleSubmit}
          >
            Save
          </Button>
        </DialogFooter>

-        <DialogCloseTrigger color="black" onClick={() => setIsOpen(false)} />
+        <DialogCloseTrigger color="black" />
      </DialogContent>
-      <Toaster />
    </DialogRoot>
  );
 }
--- a/src/Pages/MasterModule/AgencyMaster/ViewAgencyAddModel.tsx
+++ b/src/Pages/MasterModule/AgencyMaster/ViewAgencyAddModel.tsx
@@ -2,99 +2,30 @@ import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHead
 import { Field, Input, Stack, Text } from "@chakra-ui/react"
 import { IoMdAdd } from "react-icons/io"
 import { Button } from "../../../components/ui/button"
-import { AgencyPost, useCreateAgencyMasterPostMutation } from "../../../Redux/Service/agency.master.module.service"
-import { useState } from "react"
-import { Toaster, toaster } from "../../../components/ui/toaster"
-
-function ViewAgencyAddModel({ refetch }: { refetch: VoidFunction }) {
-    const [formData, setFormData] = useState<AgencyPost>({
-        name: "",
-        rc_number: "",
-        state: "",
-        registered_office: "",
-        domain_name: "",
-        gst_number: "",
-    });
-    const [isOpen, setIsOpen] = useState(false);
-    const [createAgencyMasterPost] = useCreateAgencyMasterPostMutation()
-
-    const handleOpenModal = () => {
-        setIsOpen(true);  // Open modal when clicking "Add"
-    };
-
-    const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-        const { name, value } = e.target;
-        setFormData((prev: any) => ({
-            ...prev,
-            [name]: value,
-        }));
-    }             
-
-    const handleSubmit = async () => {
-        console.log("New Data:", formData);
-        const requiredFields: (keyof AgencyPost)[] = ["name", "rc_number", "state", "registered_office", "domain_name", "gst_number"];
-        const isEmptyField = requiredFields.some(field => !formData[field]?.trim());
-
-        if (isEmptyField) {
-            console.log("Validation failed: Some fields are empty.");
-            toaster.create({
-                title: "Error",
-                description: "All required fields must be filled.",
-                type: "error",
-            });
-            return;
-        }
-
-        const payload = {
-            name: formData.name
-        };
-
-        try {
-            const response = await createAgencyMasterPost(payload).unwrap();
-            if (response) {
-                toaster.create({
-                    title: "Success",
-                    description: "Added successfully",
-                    type: "success",
-                });
-                refetch()
-                setIsOpen(false);
-            } else {
-                toaster.create({
-                    title: "Error",
-                    description: "Failed to add data.",
-                    type: "error",
-                });
-            }
-        } catch (error) {
-            console.error("Error updating template:", error);
-            toaster.create({
-                title: "Error",
-                description: "Something went wrong",
-                type: "error",
-            });
-
-        }
-    };

+function ViewAgencyAddModel() {
    return (

-        <DialogRoot placement="center" open={isOpen} onOpenChange={({ open }) => setIsOpen(open)}>
+        <DialogRoot placement="center">
            <DialogTrigger asChild>
-                <Button px={5} size={"xs"} bg={"#02A0A0"} onClick={handleOpenModal}>
-                    <IoMdAdd /> <Text >Add</Text>
+                {/* <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'}
+                 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>
@@ -105,97 +36,38 @@ function ViewAgencyAddModel({ refetch }: { refetch: VoidFunction }) {

                        <Field.Root>
                            <Field.Label color="black" pt={1} fontSize="12px">Agency Name</Field.Label>
-                            <Input
-                                name="name"
-                                value={formData.name}
-                                bgColor="#EEEEEE"
-                                color="black"
-                                border="none"
-                                pl={1}
-                                fontSize="12px"
-                                height="30px"
-                                onChange={handleChange}
-                            />
+                            <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
-                                name='rc_number'
-                                value={formData.rc_number}
-                                bgColor="#EEEEEE"
-                                color="black"
-                                border="none"
-                                pl={1}
-                                fontSize="12px"
-                                height="30px"
-                                onChange={handleChange}
-                            />
+                            <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
-                                name="state"
-                                value={formData.state}
-                                bgColor="#EEEEEE"
-                                color="black"
-                                border="none"
-                                pl={1}
-                                fontSize="12px"
-                                height="30px"
-                                onChange={handleChange}
-                            />
+                            <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
-                                name="registered_office"
-                                value={formData.registered_office}
-                                bgColor="#EEEEEE"
-                                color="black"
-                                border="none"
-                                pl={1}
-                                fontSize="12px"
-                                height="30px"
-                                onChange={handleChange}
-                            />
-
+                            <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
-                                name="domain_name"
-                                value={formData.domain_name}
-                                bgColor="#EEEEEE"
-                                color="black"
-                                border="none"
-                                pl={1}
-                                fontSize="12px"
-                                height="30px"
-                                onChange={handleChange}
-                            />
+                            <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
-                                name="gst_number"
-                                value={formData.gst_number}
-                                bgColor="#EEEEEE"
-                                color="black"
-                                border="none"
-                                pl={1}
-                                fontSize="12px"
-                                height="30px"
-                                onChange={handleChange}
-                            />
+                            <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.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"} onClick={handleSubmit}>
+                    <Button w="100%" bg="#02A0A0" color={"#fff"}>
                        Save
                    </Button>
                </DialogFooter>

-                <DialogCloseTrigger color="black" onClick={() => setIsOpen(false)} />
+                <DialogCloseTrigger color="black" />
            </DialogContent>
-            <Toaster />
        </DialogRoot >

    )
--- a/src/Pages/MasterModule/AgencyMaster/ViewAgencyMaster.tsx
+++ b/src/Pages/MasterModule/AgencyMaster/ViewAgencyMaster.tsx
@@ -2,24 +2,22 @@ import {
  DialogBody,
  DialogCloseTrigger,
  DialogContent,
-  // DialogFooter,
+  DialogFooter,
  DialogHeader,
  DialogRoot,
  DialogTitle,
  DialogTrigger,
 } from "../../../components/ui/dialog";
-import { Field, Input, Span, Stack } from "@chakra-ui/react";
-// import { MdOutlineRemoveRedEye } from "react-icons/md";
-// import { Button } from "../../../components/ui/button";
+import { Field, Icon, Input, Stack } from "@chakra-ui/react";
+import { MdOutlineRemoveRedEye } from "react-icons/md";
+import { Button } from "../../../components/ui/button";
 import View from "../../../components/ActionIcons/View";
-import { Agency } from "../../../Redux/Service/agency.master.module.service";
-
-function ViewAgencyMaster({ agency, id }: { agency: Agency[], id:number }) {

+function ViewAgencyMaster() {
  return (
    <DialogRoot placement="center">
      <DialogTrigger asChild>
-        <Span><View /></Span>
+        <View />
      </DialogTrigger>

      <DialogContent
@@ -34,130 +32,107 @@ function ViewAgencyMaster({ agency, id }: { agency: Agency[], id:number }) {
      >
        <DialogHeader bg="white">
          <DialogTitle alignSelf="center" color="black" fontSize="14px">
-            View
+            Add
          </DialogTitle>
        </DialogHeader>
-        {agency.map((data) => (
-          <DialogBody bg="white">
-            {data.id === id && <Stack py={3}>
-              <Field.Root>
-                <Field.Label color="black" pt={1} fontSize="12px">
-                  Agency name
-                </Field.Label>
-                <Input
-                  value={data.name}
-                  bgColor="#EEEEEE"
-                  color="black"
-                  border="none"
-                  pl={1}
-                  fontSize="12px"
-                  height="30px"
-                  disabled
-                />

-                <Field.Label color="black" pt={1} fontSize="12px">
-                  RC No.
-                </Field.Label>
-                <Input
-                  value={data.rc_number}
-                  bgColor="#EEEEEE"
-                  color="black"
-                  border="none"
-                  pl={1}
-                  fontSize="12px"
-                  height="30px"
-                  disabled
-                />
+        <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">
-                  State
-                </Field.Label>
-                <Input
-                  value={data.state}
-                  bgColor="#EEEEEE"
-                  color="black"
-                  border="none"
-                  pl={1}
-                  fontSize="12px"
-                  height="30px"
-                  disabled
-                />
+              <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">
-                  RC Status
-                </Field.Label>
-                <Input
-                  value={data.rc_status}
-                  bgColor="#EEEEEE"
-                  color="black"
-                  border="none"
-                  pl={1}
-                  fontSize="12px"
-                  height="30px"
-                  disabled
-                />
+              <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={data.registered_office}
-                  bgColor="#EEEEEE"
-                  color="black"
-                  border="none"
-                  pl={1}
-                  fontSize="12px"
-                  height="30px"
-                  disabled
-                />
+              <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={data.domain_name}
-                  bgColor="#EEEEEE"
-                  color="black"
-                  border="none"
-                  pl={1}
-                  fontSize="12px"
-                  height="30px"
-                  disabled
-                />
+              <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={data.gst_number}
-                  bgColor="#EEEEEE"
-                  color="black"
-                  border="none"
-                  pl={1}
-                  fontSize="12px"
-                  height="30px"
-                  disabled
-                />
+              <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={data}
-                  bgColor="#EEEEEE"
-                  color="black"
-                  border="none"
-                  pl={1}
-                  fontSize="12px"
-                  height="30px"
-                  disabled
-                /> */}
-              </Field.Root>
-            </Stack>}
-          </DialogBody>
-        ))}
-
-        {/* <DialogFooter display="flex" justifyContent="center" pt={"2"}>
+              <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"
@@ -167,7 +142,7 @@ function ViewAgencyMaster({ agency, id }: { agency: Agency[], id:number }) {
          >
            Save
          </Button>
-        </DialogFooter> */}
+        </DialogFooter>

        <DialogCloseTrigger color="black" />
      </DialogContent>
--- a/src/Pages/MasterModule/Country/Country.tsx
+++ b/src/Pages/MasterModule/Country/Country.tsx
@@ -1,12 +1,11 @@
-import { Box, HStack, 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";
 import DataTable from "../../../components/DataTable";
 import { Switch } from "../../../components/ui/switch";
 import CountryAddModel from "./CountryAddModel";
 import EditCountryModel from "./EditCountryModel";
-import { CountryData, useCountryToggleMutation, useGetCountryMasterQuery } from "../../../Redux/Service/country.master";
-import { useEffect, useState } from "react";
-import SearchComponent from "../../../components/SearchComponent";



@@ -16,89 +15,25 @@ 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 = () => {
-  const [currentPage, setCurrentPage] = useState(1);
-  const { data, refetch } = useGetCountryMasterQuery(currentPage)
-  const [countryToggle] = useCountryToggleMutation()
-  const [localData, setLocalData] = useState<any[]>([]);
-  const [searchTerm, setSearchTerm] = useState("");
-  console.log("Country Data", data?.data.data)
-
-  useEffect(() => {
-    if (data) {
-      setLocalData(data?.data.data);
-    }
-  }, [data]);
-
-  const handlePageChange = (page: number) => {
-    setCurrentPage(page);
-  };
-
-  const filteredData = localData?.filter((agency) => {
-    const searchLower = searchTerm.toLowerCase();
-    const countryName = agency.en_name?.toLowerCase().includes(searchLower);
-    const capitalName = agency.capital?.toLowerCase().includes(searchLower);
-    return countryName || capitalName;
-  });
-
-  const handleToggle = async (agencyId: number, currentStatus: string) => {
-    const newStatus = currentStatus === '1' ? '0' : '1';
-
-    setLocalData((prevData) =>
-      prevData.map((agency) =>
-        agency.id === agencyId ? { ...agency, is_active: newStatus } : agency
-      )
-    );
-
-    try {
-      await countryToggle({ id: agencyId, is_active: newStatus }).unwrap();
-      refetch()
-    } catch (error) {
-      console.error("Error updating privacy policy:", error);
-      setLocalData((prevData) =>
-        prevData.map((agency) =>
-          agency.id === agencyId ? { ...agency, is_active: currentStatus } : agency
-        )
-      );
-    }
-  }
-
-  const managepost = filteredData?.flatMap((agency: CountryData, index: number) => ({
-    "Sr. No": (currentPage - 1) * (data?.data.per_page ?? 0) + index + 1,
-    "Title": agency.en_name,
+const managepost: any[] = [
+  ...Array.from({ length: 12 }, (_, i) => ({
+    "Sr. No": i + 1,
+    "Title": "Lorem Ipsum",
    "Action": (
      <HStack justifyContent="center">
-        <EditCountryModel rowData={{ id: agency.id, en_name: agency.en_name, country_code: agency.country_code, phonecode: agency.phonecode, capital: agency.capital, currency: agency.currency, currency_name: agency.currency_name, currency_symbol: agency.currency_symbol }} refetch={refetch} />
+        <EditCountryModel />
        <Box>
-          <Switch
-            colorPalette={'teal'}
-            size={"xs"}
-            checked={agency.is_active === '1'}
-            onChange={() => handleToggle(agency.id, agency.is_active)}
-          />
+          <Switch colorPalette={'teal'} size={"xs"}/>
        </Box>
      </HStack>
    ),
-  }))
+  })),
+];

+const Country = () => {
  return (

    <MainFrame>
@@ -111,11 +46,11 @@ const Country = () => {
          px={3}
        >
          <Text as={"span"} fontSize={"sm"} fontWeight={500} color={"#000"}>
-            Country
+          Country
          </Text>

          <HStack >
-            {/* <InputGroup
+            <InputGroup 
              startElement={
                <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
              }
@@ -134,15 +69,7 @@ const Country = () => {
                bgColor={'#EEEEEE'}
                ps={8}
              />
-            </InputGroup> */}
-            <SearchComponent
-              value={searchTerm}
-              onChange={(value) => {
-                setSearchTerm(value);
-                // setCurrentPage(1);
-                refetch()
-              }}
-            />
+            </InputGroup>
            {/* <Button bgColor={'#EEEEEE'} pl={3} pr={3}><IoMdAdd /> <Text>Add</Text></Button> */}
            <CountryAddModel />
          </HStack>
@@ -151,15 +78,8 @@ const Country = () => {
          sortableColumns={["Name", "Registration Date "]}
          tableHeadRow={tableHeadRow}
          data={managepost}
-          paginationData={{
-            current_page: data?.data.current_page || 1,
-            last_page: data?.data.last_page || 1,
-            per_page: data?.data.per_page || 10,
-            total: data?.data.total || 0
-          }}
-          onPageChange={handlePageChange}
        />
-      </Box>
+      </Box>       
    </MainFrame>
  )
 }
--- a/src/Pages/MasterModule/Country/CountryAddModel.tsx
+++ b/src/Pages/MasterModule/Country/CountryAddModel.tsx
@@ -1,202 +1,56 @@
 import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
-import { Field, Input, Stack, Text } from "@chakra-ui/react"
+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 { useState } from "react";
-import { PostCountry, useCreateCountryPostMutation } from "../../../Redux/Service/country.master";
-import { Toaster, toaster } from "../../../components/ui/toaster";

 function CountryAddModel() {
-    const [createCountryPost] = useCreateCountryPostMutation()
-    const [isOpen, setIsOpen] = useState(false);
-    const [countryName, setCountryName] = useState<PostCountry>({
-        en_name: '',
-        country_code: '',
-        phonecode: '',
-        capital: '',
-        currency: '',
-        currency_name: '',
-        currency_symbol: '',
-    });
-
-    const handleOpenModal = () => {
-        setIsOpen(true);  // Open modal when clicking "Add"
-    };
-
-    const handleSubmit = async () => {
-        if (countryName.en_name === "") {
-            toaster.create({
-                title: "Error",
-                description: "Input fields cannot be empty",
-                type: "error",
-            });
-            return;
-        }
-
-        const payload: PostCountry = {
-            en_name: countryName.en_name,
-            country_code: countryName.country_code,
-            phonecode: countryName.phonecode,
-            capital: countryName.capital,
-            currency: countryName.currency,
-            currency_name: countryName.currency_name,
-            currency_symbol: countryName.currency_symbol,
-        };
-
-        try {
-            const response = await createCountryPost(payload).unwrap();
-            if (response) {
-                toaster.create({
-                    title: "Success",
-                    description: "Country added successfully",
-                    type: "success",
-                });
-                setIsOpen(false);
-            } else {
-                toaster.create({
-                    title: "Error",
-                    description: "Failed to add Country",
-                    type: "error",
-                });
-            }
-        } catch (error) {
-            console.error("Error updating template:", error);
-            // alert("Failed to update template");
-        }
-    };
-
+   
    return (
-        <>
-            <DialogRoot placement="center" open={isOpen} onOpenChange={({ open }) => setIsOpen(open)}>
-                <DialogTrigger asChild>
-                    {/* <Button bg={"transparent"} size="sm">
+
+        <DialogRoot placement="center">
+            <DialogTrigger asChild>
+                {/* <Button bg={"transparent"} size="sm">
                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
                </Button> */}
-                    <Button px={5} size={"xs"} bg={"#02A0A0"} onClick={handleOpenModal}>
-                        <IoMdAdd /> <Text>Add</Text>
+                <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>

-                </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"
-                                    value={countryName.en_name}
-                                    onChange={(e) => setCountryName({ ...countryName, en_name: e.target.value })}
-                                />
-
-                                <Field.Label color="black" pt={1} fontSize="12px">Country Code</Field.Label>
-                                <Input
-                                    placeholder=""
-                                    bgColor="#EEEEEE"
-                                    color="black"
-                                    border="none"
-                                    pl={1}
-                                    fontSize="12px"
-                                    height="30px"
-                                    value={countryName.country_code}
-                                    onChange={(e) => setCountryName({ ...countryName, country_code: e.target.value })}
-                                />
-
-                                <Field.Label color="black" pt={1} fontSize="12px">Phone Code</Field.Label>
-                                <Input
-                                    placeholder=""
-                                    bgColor="#EEEEEE"
-                                    color="black"
-                                    border="none"
-                                    pl={1}
-                                    fontSize="12px"
-                                    height="30px"
-                                    value={countryName.phonecode}
-                                    onChange={(e) => setCountryName({ ...countryName, phonecode: e.target.value })}
-                                />
-                                <Field.Label color="black" pt={1} fontSize="12px">Capital</Field.Label>
-                                <Input
-                                    placeholder=""
-                                    bgColor="#EEEEEE"
-                                    color="black"
-                                    border="none"
-                                    pl={1}
-                                    fontSize="12px"
-                                    height="30px"
-                                    value={countryName.capital}
-                                    onChange={(e) => setCountryName({ ...countryName, capital: e.target.value })}
-                                />
-                                <Field.Label color="black" pt={1} fontSize="12px">Currency</Field.Label>
-                                <Input
-                                    placeholder=""
-                                    bgColor="#EEEEEE"
-                                    color="black"
-                                    border="none"
-                                    pl={1}
-                                    fontSize="12px"
-                                    height="30px"
-                                    value={countryName.currency}
-                                    onChange={(e) => setCountryName({ ...countryName, currency: e.target.value })}
-                                />
-                                <Field.Label color="black" pt={1} fontSize="12px">Currency name</Field.Label>
-                                <Input
-                                    placeholder=""
-                                    bgColor="#EEEEEE"
-                                    color="black"
-                                    border="none"
-                                    pl={1}
-                                    fontSize="12px"
-                                    height="30px"
-                                    value={countryName.currency_name}
-                                    onChange={(e) => setCountryName({ ...countryName, currency_name: e.target.value })}
-                                />
-                                <Field.Label color="black" pt={1} fontSize="12px">Currency Symbol</Field.Label>
-                                <Input
-                                    placeholder=""
-                                    bgColor="#EEEEEE"
-                                    color="black"
-                                    border="none"
-                                    pl={1}
-                                    fontSize="12px"
-                                    height="30px"
-                                    value={countryName.currency_symbol}
-                                    onChange={(e) => setCountryName({ ...countryName, currency_symbol: e.target.value })}
-                                />
-                            </Field.Root>
-                        </Stack>
-
-                    </DialogBody>
-                    <DialogFooter display="flex" justifyContent="center" pt={"2"}>
-                        <Button w="100%" bg="#02A0A0" color={"#fff"} onClick={handleSubmit}>
-                            Save
-                        </Button>
-                    </DialogFooter>
-
-                    <DialogCloseTrigger color="black" />
-                </DialogContent>
-            </DialogRoot >
-            <Toaster />
-        </>
+                <DialogCloseTrigger color="black" />
+            </DialogContent>
+        </DialogRoot >

    )
 }
--- a/src/Pages/MasterModule/Country/EditCountryModel.tsx
+++ b/src/Pages/MasterModule/Country/EditCountryModel.tsx
@@ -11,150 +11,56 @@ import {
 import { Field, Input, Stack } from "@chakra-ui/react";
 import { Button } from "../../../components/ui/button";
 import Edit from "../../../components/ActionIcons/Edit";
-import { useUpdateCountryMutation } from "../../../Redux/Service/country.master";
-import { Toaster, toaster } from "../../../components/ui/toaster";
-import { useEffect, useState } from "react";
-
-export interface EditCountryModelProps {
-  id?: number;
-  en_name?: string;
-  hi_name?: string;
-  mr_name?: string;
-  te_name?: string;
-  ta_name?: string;
-  bn_name?: string;
-  or_name?: string;
-  country_code?: string;
-  phonecode?: string;
-  capital?: string;
-  currency?: string;
-  currency_name?: string;
-  currency_symbol?: string;
-}
-
-
-
-
-function EditCountryModel({ rowData, refetch }: { rowData: EditCountryModelProps, refetch: VoidFunction }) {
-  const [updateCountry] = useUpdateCountryMutation()
-  const [editData, setEditData] = useState(rowData)
-   const [isOpen, setIsOpen] = useState(false);
-
-   useEffect(() => {
-   if(rowData){
-     setEditData(rowData)
-   }
-   }, [rowData])
-   
-
-  const handleOpenModal = () => {
-    setIsOpen(true);
-  };
-
-  const handleSubmit = async () => {
-    if (editData?.en_name === '') {
-      toaster.create({
-        title: "Error",
-        description: "Input fields cannot be empty",
-        type: "error",
-      });
-      return;
-    }
-
-    // Only en_name is editable, so we only need to send that in the payload.
-    const payload = {
-      id: rowData?.id,
-      en_name: editData?.en_name,
-      country_code: rowData?.country_code,
-      phonecode: rowData?.phonecode,
-      capital: rowData?.capital,
-      currency: rowData?.currency,
-      currency_name: rowData?.currency_name,
-      currency_symbol: rowData?.currency_symbol,
-    };
-
-    // console.log('payload', payload)
-
-    try {
-      const response = await updateCountry(payload).unwrap();
-      if (response?.status === "success") {
-        toaster.create({
-          title: "Success",
-          description: "Country updated successfully",
-          type: "success",
-        });
-        setIsOpen(false);
-        refetch()
-      } else {
-        toaster.create({
-          title: "Error",
-          description: "Failed to update Country",
-          type: "error",
-        });
-      }
-    } catch (error) {
-      console.error("Error updating template:", error);
-      // alert("Failed to update template");
-      toaster.create({
-        title: "Error",
-        description: "Something went wrong",
-        type: "error",
-      });
-    }
-  };
-

+function EditCountryModel() {
  return (
-    <>
-      <DialogRoot placement="center" key={editData.id} open={isOpen} onOpenChange={({ open }) => setIsOpen(open)}>
-        <DialogTrigger asChild>
-          <Button bg="transparent" color={"black"} h={"18px"} onClick={handleOpenModal}><Edit /></Button>
-        </DialogTrigger>
+    <DialogRoot placement="center">
+      <DialogTrigger asChild>
+        <Edit />
+      </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={editData.en_name}
-                  onChange={(e) => setEditData({ ...editData, en_name: e.target.value })}
-                  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"} onClick={handleSubmit}>
-              Save
-            </Button>
-          </DialogFooter>
+      <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>

-          <DialogCloseTrigger color="black" />
-        </DialogContent>
-      </DialogRoot>
-      <Toaster />
-    </>
+        <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>
  );
 }

--- a/src/Pages/MasterModule/DepartmentMaster/AddDepartmentMaster.tsx
+++ b/src/Pages/MasterModule/DepartmentMaster/AddDepartmentMaster.tsx
@@ -1,155 +0,0 @@
-import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
-import { Field, Input, Stack, Text } from "@chakra-ui/react"
-import { IoMdAdd } from "react-icons/io"
-import { Button } from "../../../components/ui/button"
-import { useState } from "react";
-import { toaster } from "../../../components/ui/toaster";
-import { useCreateDepartmentPostMutation, useGetDepartmentMasterDropDownQuery } from "../../../Redux/Service/department.master";
-
-function AddDepartmentMaster({ refetch }: { refetch: VoidFunction }) {
-    const [jobType, setJobType] = useState("");
-    const [isOpen, setIsOpen] = useState(false);
-    const [createDepartmentPost] = useCreateDepartmentPostMutation()
-    const { data } = useGetDepartmentMasterDropDownQuery()
-    const [selectdDep, setSelectdDep] = useState<any>({
-        id: '',
-        en_name: '',
-    });
-
-
-    const handleOpenModal = () => {
-        setIsOpen(true);  // Open modal when clicking "Add"
-    };
-
-    const handleSubmit = async () => {
-        if (!jobType.trim() || !selectdDep.id) {
-            toaster.create({
-                title: "Error",
-                description: "Title and Subtitle cannot be empty.",
-                type: "error",
-            });
-            return;
-        }
-
-        const payload = {
-            en_name: jobType,
-            industry_masters_xid: selectdDep.id,
-        };
-
-        try {
-            await createDepartmentPost(payload);
-            refetch()
-            setIsOpen(false);
-            setJobType("");
-            setSelectdDep({
-                id: '',
-                en_name: '',
-            })
-        } catch (error) {
-            console.error("Error updating template:", error);
-            alert("Failed to update template");
-        }
-    };
-
-    console.log("Selected Department", selectdDep);
-
-
-    return (
-
-        <DialogRoot placement="center" open={isOpen}>
-            <DialogTrigger asChild>
-                {/* <Button bg={"transparent"} size="sm">
-                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
-                </Button> */}
-                <Button px={5} size={"xs"} bg={"#02A0A0"} onClick={handleOpenModal}>
-                    <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">
-                                Select Industry
-                            </Field.Label>
-                            <select
-                                value={selectdDep.id}
-                                onChange={(e) => {
-                                    const selectedId = e.target.value;
-                                    const selectedIndustry = data?.data.find((item: any) => item.id.toString() === selectedId);
-                                    if (selectedIndustry) {
-                                        setSelectdDep({
-                                            id: selectedIndustry.id,
-                                            en_name: selectedIndustry.en_name,
-                                        });
-                                    }
-                                }}
-                                style={{
-                                    backgroundColor: "#EEEEEE",
-                                    color: "black",
-                                    border: "none",
-                                    height: "30px",
-                                    fontSize: "12px",
-                                    padding: "4px",
-                                    borderRadius: "4px",
-                                    width: "100%",
-                                }}
-                            >
-                                <option value="" disabled>
-                                    Select department
-                                </option>
-                                {data?.data.map((item: any) => (
-                                    <option value={item.id} key={item.id}>
-                                        {item.en_name}
-                                    </option>
-                                ))}
-                            </select>
-                        </Field.Root>
-
-                        <Field.Root>
-                            <Field.Label color="black" pt={1} fontSize="12px">Department</Field.Label>
-                            <Input
-                                placeholder=""
-                                bgColor="#EEEEEE"
-                                color="black"
-                                border="none"
-                                pl={1}
-                                fontSize="12px"
-                                height="30px"
-                                value={jobType}
-                                onChange={(e) => setJobType(e.target.value)}
-                            />
-                        </Field.Root>
-                    </Stack>
-
-                </DialogBody>
-                <DialogFooter display="flex" justifyContent="center" pt={"2"}>
-                    <Button w="100%" bg="#02A0A0" color={"#fff"} onClick={handleSubmit}>
-                        Save
-                    </Button>
-                </DialogFooter>
-
-                <DialogCloseTrigger color="black" onClick={() => setIsOpen(false)} />
-            </DialogContent>
-        </DialogRoot >
-
-    )
-}
-
-export default AddDepartmentMaster
--- a/src/Pages/MasterModule/DepartmentMaster/DepartmentMasterList.tsx
+++ b/src/Pages/MasterModule/DepartmentMaster/DepartmentMasterList.tsx
@@ -1,142 +0,0 @@
-import { Box, HStack, 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 { useEffect, useState } from "react";
-import SearchComponent from "../../../components/SearchComponent";
-import { useDepartmentToggleMutation, useGetDepartmentMasterQuery } from "../../../Redux/Service/department.master";
-import AddDepartmentMaster from "./AddDepartmentMaster";
-import EditDepartmentMaster from "./EditDepartmentMaster";
-
-
-// table data
-
-const tableHeadRow = [
-    "Sr. No",
-    "Title",
-    "Action"
-
-];
-
-
-
-const DepartmentMasterList = () => {
-    const [currentPage, setCurrentPage] = useState(1);
-    const { data, refetch } = useGetDepartmentMasterQuery(currentPage)
-    const [departmentToggle] = useDepartmentToggleMutation()
-    const [localData, setLocalData] = useState<any[]>([]);
-     const [searchTerm, setSearchTerm] = useState("");
-
-     console.log("Department Data", data?.data.data)
-
-    useEffect(() => {
-        if (data?.data?.data) {
-            setLocalData(data?.data.data);
-        }
-    }, [data]);
-
-    const handlePageChange = (page: number) => {
-        setCurrentPage(page);
-    };
-
-    const handleToggle = async (agencyId: string, currentStatus: number) => {
-        const newStatus = currentStatus ? 0 : 1;
-        setLocalData((prevData) =>
-            prevData.map((agency) =>
-                agency.id === agencyId ? { ...agency, is_active: newStatus } : agency
-            )
-        );
-        try {
-            await departmentToggle({ id: agencyId, is_active: newStatus }).unwrap();
-            refetch()
-        } catch (error) {
-            console.error("Error updating privacy policy:", error);
-            setLocalData((prevData) =>
-                prevData.map((agency) =>
-                    agency.id === agencyId ? { ...agency, is_active: currentStatus } : agency
-                )
-            );
-        }
-    };
-
-    const filteredData = localData?.filter((agency) => {
-        const searchLower = searchTerm.toLowerCase();
-        const title = agency.en_name?.toLowerCase().includes(searchLower);
-        return title;
-    });
-
-    const managepost = filteredData?.map((agency: any, index: number) => ({
-        'id': agency.id,
-        "Sr. No": (currentPage - 1) * (data?.data.per_page ?? 0) + index + 1,
-        "Title": agency.en_name,
-        "is_active": agency.is_active,
-        "Action": (
-            <HStack justifyContent="center">
-                {/* <ViewAgencyMaster agency={localData} id={agency.id} /> */}
-                <EditDepartmentMaster localData={agency} refetch={refetch} />
-                <Box>
-                    <Switch
-                        colorPalette={"teal"}
-                        size={"xs"}
-                        onChange={() => handleToggle(agency.id, Number(agency.is_active))}
-                        checked={Boolean(Number(agency.is_active))}
-                    />
-                </Box>
-            </HStack>
-        ),
-    }));
-
-    // useEffect(() => {
-    //     console.log("Fetched data:", data);
-    //     console.log("Local data:", localData);
-    //     console.log("Managepost data:", managepost);
-    // }, [data, localData, managepost]);
-
-    return (
-
-        <MainFrame>
-            <Box>
-                <HStack
-                    w={"100%"}
-                    justifyContent={"space-between"}
-                    mb={4}
-                    py={0}
-                    px={3}
-                >
-                    <Text as={"span"} fontSize={"sm"} fontWeight={500} color={"#000"}>
-                        Department Master
-                    </Text>
-
-                    <HStack >
-                        <SearchComponent
-                            value={searchTerm}
-                            onChange={(value) => {
-                                setSearchTerm(value);
-                                // setCurrentPage(1);
-                                refetch()
-                            }}
-                        />
-                        {/* <Button bgColor={'#EEEEEE'} pl={3} pr={3}><IoMdAdd /> <Text>Add</Text></Button> */}
-                        {/* <ViewAgencyAddModel /> */}
-                        <AddDepartmentMaster refetch={refetch} />
-                    </HStack>
-                </HStack>
-                <DataTable
-                    sortableColumns={["Name"]}
-                    tableHeadRow={tableHeadRow}
-                    data={managepost || []}
-                    paginationData={{
-                        current_page: data?.data.current_page || 1,
-                        last_page: data?.data.last_page || 1,
-                        per_page: data?.data.per_page || 10,
-                        total: data?.data.total || 0
-                    }}
-                    onPageChange={handlePageChange}
-                />
-            </Box>
-        </MainFrame>
-    )
-}
-export default DepartmentMasterList
--- a/src/Pages/MasterModule/DepartmentMaster/EditDepartmentMaster.tsx
+++ b/src/Pages/MasterModule/DepartmentMaster/EditDepartmentMaster.tsx
@@ -1,160 +0,0 @@
-import {
-    DialogBody,
-    DialogCloseTrigger,
-    DialogContent,
-    DialogFooter,
-    DialogHeader,
-    DialogRoot,
-    DialogTitle,
-    DialogTrigger,
-} from "../../../components/ui/dialog";
-import { Box, Field, Input, Stack } from "@chakra-ui/react";
-import { Button } from "../../../components/ui/button";
-import Edit from "../../../components/ActionIcons/Edit";
-import { useState } from "react";
-import { Toaster, toaster } from "../../../components/ui/toaster";
-import { useGetDepartmentMasterDropDownQuery, useUpdateDepartmentMutation } from "../../../Redux/Service/department.master";
-
-function EditDepartmentMaster({ localData, refetch }: { localData: any, refetch: VoidFunction }) {
-    const [jobtype, setJobType] = useState("");
-    const [updateDepartment] = useUpdateDepartmentMutation()
-    const { data } = useGetDepartmentMasterDropDownQuery()
-    const [isOpen, setIsOpen] = useState(false);
-    const [selectdDep, setSelectdDep] = useState<any>({
-        id: localData.industry_master.id,
-        en_name: localData.industry_master.en_name,
-    });
-
-    const handleOpenModal = () => {
-        // const template = localData?.find((item: any) => item.id === id);
-        if (localData) {
-            setJobType(localData.en_name);
-            setSelectdDep({
-                id: localData.industry_master.id,
-                en_name: localData.industry_master.en_name,
-            })
-            setIsOpen(true);
-        }
-    };
-
-
-    const handleSubmit = async () => {
-        if (!jobtype.trim()) {
-            toaster.create({
-                title: "Error",
-                description: "Title and Subtitle cannot be empty.",
-                type: "error",
-            });
-            return;
-        }
-
-        const payload = {
-            id: localData.id,
-            industry_masters_xid: selectdDep.id != null ? selectdDep.id : localData.industry_master.id,
-            en_name: jobtype
-        };
-
-        try {
-            await updateDepartment(payload).unwrap();
-            refetch()
-            setIsOpen(false);
-        } catch (error) {
-            console.error("Error updating template:", error);
-            alert("Failed to update template");
-        }
-    };
-
-    console.log("Dropdown Data", selectdDep);
-    console.log("Dep Data", localData)
-
-
-    return (
-        <DialogRoot placement="center" open={isOpen} onOpenChange={({ open }) => setIsOpen(open)}>
-            <DialogTrigger asChild>
-                <Box bg={"transparent"} onClick={handleOpenModal}>
-                    <Edit />
-                </Box>
-            </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 Title
-                    </DialogTitle>
-                </DialogHeader>
-
-                <DialogBody bg="white">
-                    <Stack py={3}>
-                        <Field.Root>
-                            <Field.Label color="black" pt={1} fontSize="12px">
-                                Select Industry
-                            </Field.Label>
-                            <select
-                                value={selectdDep.id}
-                                onChange={(e) => {
-                                    const selected = data?.data.find((item: any) => item.id === Number(e.target.value));
-                                    if (selected) {
-                                        setSelectdDep({ id: selected.id, en_name: selected.en_name });
-                                    }
-                                }}
-                                style={{
-                                    backgroundColor: "#EEEEEE",
-                                    color: "black",
-                                    border: "none",
-                                    height: "30px",
-                                    fontSize: "12px",
-                                    padding: "4px",
-                                    borderRadius: "4px",
-                                    width: "100%",
-                                }}
-                            >
-                                <option value="" disabled>
-                                    Select department
-                                </option>
-                                {data?.data.map((item: any) => (
-                                    <option value={item.id} key={item.id}>
-                                        {item.en_name}
-                                    </option>
-                                ))}
-                            </select>
-                        </Field.Root>
-
-                        <Field.Root>
-                            <Field.Label color="black" pt={1} fontSize="12px">
-                                Department
-                            </Field.Label>
-                            <Input
-                                value={jobtype}
-                                bgColor="#EEEEEE"
-                                color="black"
-                                border="none"
-                                pl={1}
-                                fontSize="12px"
-                                height="30px"
-                                onChange={(e) => setJobType(e.target.value)}
-                            />
-                        </Field.Root>
-                    </Stack>
-                </DialogBody>
-                <DialogFooter display="flex" justifyContent="center" pt={"2"}>
-                    <Button w="100%" bg="#02A0A0" color={"#fff"} onClick={handleSubmit}>
-                        Save
-                    </Button>
-                </DialogFooter>
-
-                <DialogCloseTrigger color="black" onClick={() => setIsOpen(false)} />
-            </DialogContent>
-            <Toaster />
-        </DialogRoot>
-    );
-}
-
-export default EditDepartmentMaster;
--- a/src/Pages/MasterModule/IndustryMaster/AddIndustryMaster.tsx
+++ b/src/Pages/MasterModule/IndustryMaster/AddIndustryMaster.tsx
@@ -1,103 +0,0 @@
-import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
-import { Field, Input, Stack, Text } from "@chakra-ui/react"
-import { IoMdAdd } from "react-icons/io"
-import { Button } from "../../../components/ui/button"
-import { useState } from "react";
-import { toaster } from "../../../components/ui/toaster";
-import { useCreateIndustryMasterPostMutation } from "../../../Redux/Service/industry.master.service";
-
-function AddIndustryMaster({ refetch }: { refetch: VoidFunction }) {
-    const [jobType, setJobType] = useState("");
-    const [isOpen, setIsOpen] = useState(false);
-    const [createIndustryMasterPost] = useCreateIndustryMasterPostMutation()
-
-    const handleOpenModal = () => {
-        setIsOpen(true);  // Open modal when clicking "Add"
-    };
-
-    const handleSubmit = async () => {
-        if (!jobType.trim()) {
-            toaster.create({
-                title: "Error",
-                description: "Title and Subtitle cannot be empty.",
-                type: "error",
-            });
-            return;
-        }
-
-        const payload = {
-            en_name: jobType,
-            categories_masters_xid:4
-        };
-
-        try {
-            await createIndustryMasterPost(payload);
-            refetch()
-            setIsOpen(false);
-        } catch (error) {
-            console.error("Error updating template:", error);
-            alert("Failed to update template");
-        }
-    };
-
-    return (
-
-        <DialogRoot placement="center" open={isOpen}>
-            <DialogTrigger asChild>
-                {/* <Button bg={"transparent"} size="sm">
-                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
-                </Button> */}
-                <Button px={5} size={"xs"} bg={"#02A0A0"} onClick={handleOpenModal}>
-                    <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"
-                                value={jobType}
-                                onChange={(e) => setJobType(e.target.value)}
-                            />
-                        </Field.Root>
-                    </Stack>
-
-                </DialogBody>
-                <DialogFooter display="flex" justifyContent="center" pt={"2"}>
-                    <Button w="100%" bg="#02A0A0" color={"#fff"} onClick={handleSubmit}>
-                        Save
-                    </Button>
-                </DialogFooter>
-
-                <DialogCloseTrigger color="black" onClick={() => setIsOpen(false)} />
-            </DialogContent>
-        </DialogRoot >
-
-    )
-}
-
-export default AddIndustryMaster
--- a/src/Pages/MasterModule/IndustryMaster/EditIndustryMaster.tsx
+++ b/src/Pages/MasterModule/IndustryMaster/EditIndustryMaster.tsx
@@ -1,112 +0,0 @@
-import {
-    DialogBody,
-    DialogCloseTrigger,
-    DialogContent,
-    DialogFooter,
-    DialogHeader,
-    DialogRoot,
-    DialogTitle,
-    DialogTrigger,
-} from "../../../components/ui/dialog";
-import { Box, Field, Input, Stack } from "@chakra-ui/react";
-import { Button } from "../../../components/ui/button";
-import Edit from "../../../components/ActionIcons/Edit";
-import { useState } from "react";
-import { toaster } from "../../../components/ui/toaster";
-import { useUpdateIndustryMasterMutation } from "../../../Redux/Service/industry.master.service";
-
-function EditIndustryMaster({ id, localData, refetch, categories }: { id: number, localData: any, refetch: VoidFunction, categories: any }) {
-    const [jobtype, setJobType] = useState("");
-    const [updateIndustryMaster] = useUpdateIndustryMasterMutation()
-    const [isOpen, setIsOpen] = useState(false);
-
-    const handleOpenModal = () => {
-        const template = localData?.find((item: any) => item.id === id);
-        if (template) {
-            setJobType(template.en_name);
-            setIsOpen(true);
-        }
-    };
-
-
-    const handleSubmit = async () => {
-        if (!jobtype.trim()) {
-            toaster.create({
-                title: "Error",
-                description: "Title and Subtitle cannot be empty.",
-                type: "error",
-            });
-            return;
-        }
-
-        const payload = {
-            id: id,
-            en_name: jobtype,
-            categories_masters_xid: categories
-        };
-
-        try {
-            await updateIndustryMaster(payload);
-            refetch()
-            setIsOpen(false);
-        } catch (error) {
-            console.error("Error updating template:", error);
-            alert("Failed to update template");
-        }
-    };
-
-    return (
-        <DialogRoot placement="center" open={isOpen} onOpenChange={({ open }) => setIsOpen(open)}>
-            <DialogTrigger asChild>
-                <Box bg={"transparent"} onClick={handleOpenModal}>
-                    <Edit />
-                </Box>
-            </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={jobtype}
-                                bgColor="#EEEEEE"
-                                color="black"
-                                border="none"
-                                pl={1}
-                                fontSize="12px"
-                                height="30px"
-                                onChange={(e) => setJobType(e.target.value)}
-                            />
-                        </Field.Root>
-                    </Stack>
-                </DialogBody>
-                <DialogFooter display="flex" justifyContent="center" pt={"2"}>
-                    <Button w="100%" bg="#02A0A0" color={"#fff"} onClick={handleSubmit}>
-                        Save
-                    </Button>
-                </DialogFooter>
-
-                <DialogCloseTrigger color="black" onClick={() => setIsOpen(false)} />
-            </DialogContent>
-        </DialogRoot>
-    );
-}
-
-export default EditIndustryMaster;
--- a/src/Pages/MasterModule/IndustryMaster/IndustryMasterList.tsx
+++ b/src/Pages/MasterModule/IndustryMaster/IndustryMasterList.tsx
@@ -1,160 +0,0 @@
-import { Box, HStack, 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 { useEffect, useState } from "react";
-import { useGetIndustryMasterQuery, useIndustryMasterToggleMutation } from "../../../Redux/Service/industry.master.service";
-import EditIndustryMaster from "./EditIndustryMaster";
-import AddIndustryMaster from "./AddIndustryMaster";
-import SearchComponent from "../../../components/SearchComponent";
-
-
-// table data
-
-const tableHeadRow = [
-    "Sr. No",
-    "Title",
-    "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 IndustryMasterList = () => {
-    const [currentPage, setCurrentPage] = useState(1);
-    const { data, refetch } = useGetIndustryMasterQuery(currentPage)
-    const [industryMasterToggle] = useIndustryMasterToggleMutation()
-    const [localData, setLocalData] = useState<any[]>([]);
-     const [searchTerm, setSearchTerm] = useState("");
-
-    useEffect(() => {
-        if (data?.data?.data) {
-            setLocalData(data?.data.data);
-        }
-    }, [data]);
-
-    const handlePageChange = (page: number) => {
-        setCurrentPage(page);
-    };
-
-    const handleToggle = async (agencyId: string, currentStatus: number) => {
-        const newStatus = currentStatus ? 0 : 1;
-        setLocalData((prevData) =>
-            prevData.map((agency) =>
-                agency.id === agencyId ? { ...agency, is_active: newStatus } : agency
-            )
-        );
-        try {
-            await industryMasterToggle({ id: agencyId, is_active: newStatus }).unwrap();
-            refetch()
-        } catch (error) {
-            console.error("Error updating privacy policy:", error);
-            setLocalData((prevData) =>
-                prevData.map((agency) =>
-                    agency.id === agencyId ? { ...agency, is_active: currentStatus } : agency
-                )
-            );
-        }
-    };
-
-    const filteredData = localData?.filter((agency) => {
-        const searchLower = searchTerm.toLowerCase();
-        const title = agency.en_name?.toLowerCase().includes(searchLower);
-        return title;
-    });
-
-    const managepost = filteredData?.map((agency: any, index: number) => ({
-        'id': agency.id,
-        "Sr. No": (currentPage - 1) * (data?.data.per_page ?? 0) + index + 1,
-        "Title": agency.en_name,
-        "is_active": agency.is_active,
-        "Action": (
-            <HStack justifyContent="center">
-                {/* <ViewAgencyMaster agency={localData} id={agency.id} /> */}
-                <EditIndustryMaster id={agency.id} localData={localData} refetch={refetch} categories={agency.categories_masters_xid} />
-                <Box>
-                    <Switch
-                        colorPalette={"teal"}
-                        size={"xs"}
-                        onChange={() => handleToggle(agency.id, Number(agency.is_active))}
-                        checked={Boolean(Number(agency.is_active))}
-                    />
-                </Box>
-            </HStack>
-        ),
-    }));
-
-    // useEffect(() => {
-    //     console.log("Fetched data:", data);
-    //     console.log("Local data:", localData);
-    //     console.log("Managepost data:", managepost);
-    // }, [data, localData, managepost]);
-
-    return (
-
-        <MainFrame>
-            <Box>
-                <HStack
-                    w={"100%"}
-                    justifyContent={"space-between"}
-                    mb={4}
-                    py={0}
-                    px={3}
-                >
-                    <Text as={"span"} fontSize={"sm"} fontWeight={500} color={"#000"}>
-                        Industry Master
-                    </Text>
-
-                    <HStack >
-                        <SearchComponent
-                            value={searchTerm}
-                            onChange={(value) => {
-                                setSearchTerm(value);
-                                // setCurrentPage(1);
-                                refetch()
-                            }}
-                        />
-                        {/* <Button bgColor={'#EEEEEE'} pl={3} pr={3}><IoMdAdd /> <Text>Add</Text></Button> */}
-                        {/* <ViewAgencyAddModel /> */}
-                        <AddIndustryMaster refetch={refetch} />
-                    </HStack>
-                </HStack>
-                <DataTable
-                    sortableColumns={["Name"]}
-                    tableHeadRow={tableHeadRow}
-                    data={managepost || []}
-                    paginationData={{
-                        current_page: data?.data.current_page || 1,
-                        last_page: data?.data.last_page || 1,
-                        per_page: data?.data.per_page || 10,
-                        total: data?.data.total || 0
-                    }}
-                    onPageChange={handlePageChange}
-                />
-            </Box>
-        </MainFrame>
-    )
-}
-export default IndustryMasterList
--- a/src/Pages/MasterModule/JobStatus/EditJobStatusModel.tsx
+++ b/src/Pages/MasterModule/JobStatus/EditJobStatusModel.tsx
@@ -1,69 +1,30 @@
 import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
-import { Box, Field, Input, Stack } from "@chakra-ui/react"
+import { Box, Field, IconButton, Input, Stack, Text, Textarea } from "@chakra-ui/react"
 import { Button } from "../../../components/ui/button"
-// import { FaRegEdit } from "react-icons/fa";
+import { FaRegEdit } from "react-icons/fa";
 import Edit from "../../../components/ActionIcons/Edit";
-import { useState } from "react";
-import { useUpdateJobStatusMutation } from "../../../Redux/Service/job.status";
-import { Toaster, toaster } from "../../../components/ui/toaster";


-function EditJobStatusModel({ localData, refetch }: { localData: any, refetch: VoidFunction }) {
-    const [updateJobStatus] = useUpdateJobStatusMutation()
-    const [title, setTitle] = useState(localData.translation.title);
-    const [isOpen, setIsOpen] = useState(false);
+function EditJobStatusModel() {

-    console.log(localData);
-    
-    const handleOpenModal = () => {
-        if (localData) {
-            setIsOpen(true);
-        }
-    };
-
-    const handleSubmit = async () => {
-        if (!title.trim()) {
-            toaster.create({
-                title: "Error",
-                description: "Title field cannot be empty.",
-                type: "error",
-            });
-            return;
-        }
-
-        const payload = {
-            id: localData?.id,
-            title: title
-        };
-
-        try {
-            await updateJobStatus(payload).unwrap();
-            refetch()
-            setIsOpen(false);
-        } catch (error) {
-            console.error("Error updating template:", error);
-            alert("Failed to update template");
-        }
-    };

+   
    return (

-        <DialogRoot placement="center" open={isOpen} onOpenChange={({ open }) => setIsOpen(open)}>
+        <DialogRoot placement="center">
            <DialogTrigger asChild>
-                <Box bg={"transparent"} onClick={handleOpenModal}>
-                    <Edit />
-                </Box>
+               <Edit />
            </DialogTrigger>

            <DialogContent
-                bg={"#fff"}
-                // w={{ lg: "60%", md: "230px" }}
-                w={{ base: '90%', md: '400px' }}
+                 bg={"#fff"}
+                 // w={{ lg: "60%", md: "230px" }}
+                 w={{ base: '90%', md: '400px' }}
                height={'auto'}
-
-                overflowX="hidden"
-                p={3} // Reduced padding
-                bgSize={'md'}
+                 
+                 overflowX="hidden" 
+                 p={3} // Reduced padding
+                 bgSize={'md'}
            >
                <DialogHeader bg="white" >
                    <DialogTitle alignSelf="center" color="black" fontSize="14px">Edit</DialogTitle>
@@ -74,30 +35,21 @@ function EditJobStatusModel({ localData, refetch }: { localData: any, refetch: V

                        <Field.Root>
                            <Field.Label color="black" pt={1} fontSize="12px">Job Status</Field.Label>
-                            <Input
-                                value={title}
-                                bgColor="#EEEEEE"
-                                color="black"
-                                border="none"
-                                pl={1}
-                                fontSize="12px"
-                                height="30px"
-                                onChange={(e) => setTitle(e.target.value)}
-                            />
+                            <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"} onClick={handleSubmit}>
+                    <Button w="100%" bg="#02A0A0" color={"#fff"}>
                        Save
                    </Button>
                </DialogFooter>

                <DialogCloseTrigger color="black" />
            </DialogContent>
-            <Toaster />
        </DialogRoot >
+
    )
 }

--- a/src/Pages/MasterModule/JobStatus/JobStatus.tsx
+++ b/src/Pages/MasterModule/JobStatus/JobStatus.tsx
@@ -1,13 +1,11 @@
-import { Box, HStack, Text } from "@chakra-ui/react";
+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";
-import { useGetJobStatusQuery, useJobStatusToggleMutation } from "../../../Redux/Service/job.status";
-import { useEffect, useState } from "react";
-import SearchComponent from "../../../components/SearchComponent";
-import { toaster } from "../../../components/ui/toaster";



@@ -17,96 +15,25 @@ 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 = () => {
-  const [currentPage, setCurrentPage] = useState(1);
-  const { data, refetch } = useGetJobStatusQuery(currentPage)
-  const [localData, setLocalData] = useState<any[]>([]);
-  const [searchTerm, setSearchTerm] = useState("");
-  const [jobStatusToggle] = useJobStatusToggleMutation()
-  console.log(data?.data.data)
-
-  useEffect(() => {
-    if (data?.data?.data) {
-      setLocalData(data?.data.data);
-    }
-  }, [data]);
-
-  const handlePageChange = (page: number) => {
-    setCurrentPage(page);
-  };
-
-  const handleToggle = async (agencyId: string, currentStatus: number) => {
-    const newStatus = currentStatus ? 0 : 1;
-    setLocalData((prevData) =>
-      prevData.map((agency) =>
-        agency.id === agencyId ? { ...agency, is_active: newStatus } : agency
-      )
-    );
-    try {
-      await jobStatusToggle({ id: agencyId, is_active: newStatus }).unwrap();
-      refetch()
-    } catch (error) {
-      console.error("Error updating:", error);
-      toaster.create({
-        title: "Error",
-        description: "Someting went wrong.",
-        type: "error",
-      });
-      setLocalData((prevData) =>
-        prevData.map((agency) =>
-          agency.id === agencyId ? { ...agency, is_active: currentStatus } : agency
-        )
-      );
-    }
-  };
-
-  const filteredData = localData?.filter((agency) => {
-    return (agency.job_status_translation.map((item: any) => {
-      const searchLower = searchTerm.toLowerCase();
-      const title = item.title?.toLowerCase().includes(searchLower);
-      return title;
-    }))
-  });
-
-  const managepost = filteredData?.flatMap((agency: any, index: number) => (agency.job_status_translation.map((translation: any) => ({
-    'id': agency.id,
-    "Sr. No": (currentPage - 1) * (data?.data.per_page ?? 0) + index + 1,
-    "Title": translation.title,
-    "is_active": agency.is_active,
+const managepost: any[] = [
+  ...Array.from({ length: 12 }, (_, i) => ({
+    "Sr. No": i + 1,
+    "Title": "Lorem Ipsum",
    "Action": (
      <HStack justifyContent="center">
-        {/* <ViewAgencyMaster agency={localData} id={agency.id} /> */}
-        <EditJobStatusModel localData={{ ...agency, translation }} refetch={refetch} />
+        <EditJobStatusModel />
        <Box>
-          <Switch
-            colorPalette={"teal"}
-            size={"xs"}
-            onChange={() => handleToggle(agency.id, Number(agency.is_active))}
-            checked={Boolean(Number(agency.is_active))}
-          />
+          <Switch colorPalette={'teal'} size={"xs"}/>
        </Box>
      </HStack>
    ),
-  }))));
+  })),
+];

+const JobStatus = () => {
  return (

    <MainFrame>
@@ -119,35 +46,40 @@ const JobStatus = () => {
          px={3}
        >
          <Text as={"span"} fontSize={"sm"} fontWeight={500} color={"#000"}>
-            Job Status
+          Job Status
          </Text>

          <HStack >
-            <SearchComponent
-              value={searchTerm}
-              onChange={(value) => {
-                setSearchTerm(value);
-                // setCurrentPage(1);
-                refetch()
-              }}
-            />
+            <InputGroup 
+              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={"xs"}
+                fontSize={"sm"}
+                placeholder="Search..."
+                bgColor={'#EEEEEE'}
+                ps={8}
+              />
+            </InputGroup>
            {/* <Button bgColor={'#EEEEEE'} pl={3} pr={3}><IoMdAdd /> <Text>Add</Text></Button> */}
-            <JobStatusAddModel refetch={refetch} />
+            <JobStatusAddModel />
          </HStack>
        </HStack>
        <DataTable
          sortableColumns={["Name", "Registration Date "]}
          tableHeadRow={tableHeadRow}
          data={managepost}
-          paginationData={{
-            current_page: data?.data.current_page || 1,
-            last_page: data?.data.last_page || 1,
-            per_page: data?.data.per_page || 10,
-            total: data?.data.total || 0
-          }}
-          onPageChange={handlePageChange}
        />
-      </Box>
+      </Box>       
    </MainFrame>
  )
 }
--- a/src/Pages/MasterModule/JobStatus/JobStatusAddModel.tsx
+++ b/src/Pages/MasterModule/JobStatus/JobStatusAddModel.tsx
@@ -1,67 +1,32 @@
 import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
-import { Field, Input, Stack, Text } from "@chakra-ui/react"
+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 { useCreateJobStatusPostMutation } from "../../../Redux/Service/job.status"
-import { toaster } from "../../../components/ui/toaster"
-import { useState } from "react"
-
-function JobStatusAddModel({ refetch }: { refetch: VoidFunction }) {
-    const [title, setTitle] = useState('')
-    const [isOpen, setIsOpen] = useState(false);
-    const [createJobStatusPost] = useCreateJobStatusPostMutation()
-
-    const handleOpenModal = () => {
-        setIsOpen(true);
-    };
-
-    const handleSubmit = async () => {
-        if (!title.trim()) {
-            toaster.create({
-                title: "Error",
-                description: "Title field cannot be empty.",
-                type: "error",
-            });
-            return;
-        }
-
-        const payload = {
-            title: title,
-        };
-
-        try {
-            await createJobStatusPost(payload).unwrap();
-            refetch()
-            setIsOpen(false);
-            setTitle('')
-        } catch (error) {
-            console.error("Error updating template:", error);
-            alert("Failed to update template");
-        }
-    };

+function JobStatusAddModel() {
+   
    return (

-        <DialogRoot placement="center" open={isOpen}>
+        <DialogRoot placement="center">
            <DialogTrigger asChild>
                {/* <Button bg={"transparent"} size="sm">
                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
                </Button> */}
-                <Button px={5} size={"xs"} bg={"#02A0A0"} onClick={handleOpenModal}>
+                <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' }}
+                 bg={"#fff"}
+                 // w={{ lg: "60%", md: "230px" }}
+                 w={{ base: '90%', md: '400px' }}
                height={'auto'}
-
-                overflowX="hidden"
-                p={3} // Reduced padding
-                bgSize={'md'}
+                 
+                 overflowX="hidden" 
+                 p={3} // Reduced padding
+                 bgSize={'md'}
            >
                <DialogHeader bg="white" >
                    <DialogTitle alignSelf="center" color="black" fontSize="14px">Add</DialogTitle>
@@ -72,28 +37,18 @@ function JobStatusAddModel({ refetch }: { refetch: VoidFunction }) {

                        <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"
-                                value={title}
-                                onChange={(e) => setTitle(e.target.value)}
-                            />
+                            <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"} onClick={handleSubmit}>
+                    <Button w="100%" bg="#02A0A0" color={"#fff"}>
                        Save
                    </Button>
                </DialogFooter>

-                <DialogCloseTrigger color="black" onClick={() => setIsOpen(false)} />
+                <DialogCloseTrigger color="black" />
            </DialogContent>
        </DialogRoot >

--- a/src/Pages/MasterModule/JobType/EditJobModel.tsx
+++ b/src/Pages/MasterModule/JobType/EditJobModel.tsx
@@ -8,58 +8,15 @@ import {
  DialogTitle,
  DialogTrigger,
 } from "../../../components/ui/dialog";
-import { Box, Field, Input, Stack } from "@chakra-ui/react";
+import { Field, Input, Stack } from "@chakra-ui/react";
 import { Button } from "../../../components/ui/button";
 import Edit from "../../../components/ActionIcons/Edit";
-import { useState } from "react";
-import { useUpdateJobTypeMutation } from "../../../Redux/Service/job.type.service";
-import { toaster } from "../../../components/ui/toaster";
-
-function EditJobeModel({ id, localData, refetch }: { id: number, localData: any, refetch: VoidFunction }) {
-  const [jobtype, setJobType] = useState("");
-  const [updateJobType] = useUpdateJobTypeMutation()
-  const [isOpen, setIsOpen] = useState(false);
-
-  const handleOpenModal = () => {
-    const template = localData?.find((item: any) => item.id === id);
-    if (template) {
-      setJobType(template.en_name);
-      setIsOpen(true);
-    }
-  };
-
-
-  const handleSubmit = async () => {
-    if (!jobtype.trim()) {
-      toaster.create({
-        title: "Error",
-        description: "Title and Subtitle cannot be empty.",
-        type: "error",
-      });
-      return;
-    }
-
-    const payload = {
-      id: id,
-      en_name: jobtype,
-    };
-
-    try {
-      await updateJobType(payload);
-      refetch()
-      setIsOpen(false);
-    } catch (error) {
-      console.error("Error updating template:", error);
-      alert("Failed to update template");
-    }
-  };

+function EditJobeModel() {
  return (
-    <DialogRoot placement="center" open={isOpen} onOpenChange={({ open }) => setIsOpen(open)}>
+    <DialogRoot placement="center">
      <DialogTrigger asChild>
-        <Box bg={"transparent"} onClick={handleOpenModal}>
-          <Edit />
-        </Box>
+        <Edit />
      </DialogTrigger>

      <DialogContent
@@ -84,25 +41,24 @@ function EditJobeModel({ id, localData, refetch }: { id: number, localData: any,
                Job Type
              </Field.Label>
              <Input
-                value={jobtype}
+                value="Lorem Ipsum"
                bgColor="#EEEEEE"
                color="black"
                border="none"
                pl={1}
                fontSize="12px"
                height="30px"
-                onChange={(e) => setJobType(e.target.value)}
              />
            </Field.Root>
          </Stack>
        </DialogBody>
        <DialogFooter display="flex" justifyContent="center" pt={"2"}>
-          <Button w="100%" bg="#02A0A0" color={"#fff"} onClick={handleSubmit}>
+          <Button w="100%" bg="#02A0A0" color={"#fff"}>
            Save
          </Button>
        </DialogFooter>

-        <DialogCloseTrigger color="black" onClick={() => setIsOpen(false)} />
+        <DialogCloseTrigger color="black" />
      </DialogContent>
    </DialogRoot>
  );
--- a/src/Pages/MasterModule/JobType/JobAddModel.tsx
+++ b/src/Pages/MasterModule/JobType/JobAddModel.tsx
@@ -1,66 +1,32 @@
 import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
-import { Field, Input, Stack, Text } from "@chakra-ui/react"
+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 { useState } from "react";
-import { useCreateJobTypePostMutation } from "../../../Redux/Service/job.type.service";
-import { toaster } from "../../../components/ui/toaster";
-
-function JobAddModel({ refetch }: { refetch: VoidFunction }) {
-    const [jobType, setJobType] = useState("");
-    const [isOpen, setIsOpen] = useState(false);
-    const [createJobTypePost] = useCreateJobTypePostMutation()
-
-    const handleOpenModal = () => {
-        setIsOpen(true);  // Open modal when clicking "Add"
-    };
-
-    const handleSubmit = async () => {
-        if (!jobType.trim()) {
-            toaster.create({
-                title: "Error",
-                description: "Title and Subtitle cannot be empty.",
-                type: "error",
-            });
-            return;
-        }
-
-        const payload = {
-            en_name: jobType,
-        };
-
-        try {
-            await createJobTypePost(payload);
-            refetch()
-            setIsOpen(false);
-        } catch (error) {
-            console.error("Error updating template:", error);
-            alert("Failed to update template");
-        }
-    };

+function JobAddModel() {
+   
    return (

-        <DialogRoot placement="center" open={isOpen}>
+        <DialogRoot placement="center">
            <DialogTrigger asChild>
                {/* <Button bg={"transparent"} size="sm">
                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
                </Button> */}
-                <Button px={5} size={"xs"} bg={"#02A0A0"} onClick={handleOpenModal}>
+                <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' }}
+                 bg={"#fff"}
+                 // w={{ lg: "60%", md: "230px" }}
+                 w={{ base: '90%', md: '400px' }}
                height={'auto'}
-
-                overflowX="hidden"
-                p={3} // Reduced padding
-                bgSize={'md'}
+                 
+                 overflowX="hidden" 
+                 p={3} // Reduced padding
+                 bgSize={'md'}
            >
                <DialogHeader bg="white" >
                    <DialogTitle alignSelf="center" color="black" fontSize="14px">Add</DialogTitle>
@@ -71,28 +37,18 @@ function JobAddModel({ refetch }: { refetch: VoidFunction }) {

                        <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"
-                                value={jobType}
-                                onChange={(e) => setJobType(e.target.value)}
-                            />
+                            <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"} onClick={handleSubmit}>
+                    <Button w="100%" bg="#02A0A0" color={"#fff"}>
                        Save
                    </Button>
                </DialogFooter>

-                <DialogCloseTrigger color="black" onClick={() => setIsOpen(false)} />
+                <DialogCloseTrigger color="black" />
            </DialogContent>
        </DialogRoot >

--- a/src/Pages/MasterModule/JobType/JobType.tsx
+++ b/src/Pages/MasterModule/JobType/JobType.tsx
@@ -1,14 +1,11 @@
-import { Box, HStack, Text } from "@chakra-ui/react";
+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 { 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";
-import { JobTypeData, useGetJobTypeQuery } from "../../../Redux/Service/job.type.service";
-import { useEffect, useState } from "react";
-import SearchComponent from "../../../components/SearchComponent";



@@ -18,91 +15,25 @@ 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 = () => {
-  const [currentPage, setCurrentPage] = useState(1);
-  const { data, refetch } = useGetJobTypeQuery(currentPage)
-  const [localData, setLocalData] = useState<any[]>([]);
-  const [searchTerm, setSearchTerm] = useState("");
-  // const [templateMasterToggle] = useTemplateMasterToggleMutation()
-  console.log('DATA', data?.data.data);
-
-
-  useEffect(() => {
-    if (data?.data?.data) {
-      setLocalData(data?.data.data);
-    }
-  }, [data]);
-
-  const handlePageChange = (page: number) => {
-    setCurrentPage(page);
-  };
-
-  const filteredData = localData?.filter((agency) => {
-    const searchLower = searchTerm.toLowerCase();
-    const title = agency.en_name?.toLowerCase().includes(searchLower);
-    return title;
-  });
-
-  // const handleToggle = async (agencyId: string, currentStatus: number) => {
-  //   const newStatus = currentStatus ? 0 : 1;
-  //   setLocalData((prevData) =>
-  //     prevData.map((agency) =>
-  //       agency.id === agencyId ? { ...agency, is_active: newStatus } : agency
-  //     )
-  //   );
-  //   try {
-  //     await templateMasterToggle({ id: agencyId, is_active: newStatus }).unwrap();
-  //     refetch()
-  //   } catch (error) {
-  //     console.error("Error updating privacy policy:", error);
-  //     setLocalData((prevData) =>
-  //       prevData.map((agency) =>
-  //         agency.id === agencyId ? { ...agency, is_active: currentStatus } : agency
-  //       )
-  //     );
-  //   }
-  // };
-
-
-  const managepost = filteredData?.map((agency: JobTypeData, index: number) => ({
-    'id': (currentPage - 1) * (data?.data.per_page ?? 0) + index + 1,
-    "Sr. No": index + 1,
-    "Title": agency.en_name,
-
+const managepost: any[] = [
+  ...Array.from({ length: 12 }, (_, i) => ({
+    "Sr. No": i + 1,
+    "Title": "Lorem Ipsum",
    "Action": (
      <HStack justifyContent="center">
-        <EditJobeModel id={agency.id} localData={localData} refetch={refetch} />
+        <EditJobeModel />
        <Box>
-          <Switch
-            colorPalette={'teal'}
-            size={"xs"}
-            // onChange={() => handleToggle(agency.id, Number(agency.is_active))}
-            checked={Boolean(Number(agency.is_active))}
-          />
+          <Switch colorPalette={'teal'} size={"xs"}/>
        </Box>
      </HStack>
    ),
-  }));
-
+  })),
+];

+const JobType = () => {
  return (

    <MainFrame>
@@ -115,35 +46,40 @@ const JobType = () => {
          px={3}
        >
          <Text as={"span"} fontSize={"sm"} fontWeight={500} color={"#000"}>
-            Job Type
+          Job Type
          </Text>

          <HStack >
-            <SearchComponent
-              value={searchTerm}
-              onChange={(value) => {
-                setSearchTerm(value);
-                // setCurrentPage(1);
-                refetch()
-              }}
-            />
+            <InputGroup 
+              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={"xs"}
+                fontSize={"sm"}
+                placeholder="Search..."
+                bgColor={'#EEEEEE'}
+                ps={8}
+              />
+            </InputGroup>
            {/* <Button bgColor={'#EEEEEE'} pl={3} pr={3}><IoMdAdd /> <Text>Add</Text></Button> */}
-            <JobAddModel refetch={refetch} />
+            <JobAddModel />
          </HStack>
        </HStack>
        <DataTable
          sortableColumns={["Name", "Registration Date "]}
          tableHeadRow={tableHeadRow}
          data={managepost}
-          paginationData={{
-            current_page: data?.data.current_page || 1,
-            last_page: data?.data.last_page || 1,
-            per_page: data?.data.per_page || 10,
-            total: data?.data.total || 0
-          }}
-          onPageChange={handlePageChange}
        />
-      </Box>
+      </Box>       
    </MainFrame>
  )
 }
--- a/src/Pages/MasterModule/TemplateMaster/EditTemplateModel.tsx
+++ b/src/Pages/MasterModule/TemplateMaster/EditTemplateModel.tsx
@@ -6,275 +6,115 @@ import {
  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";
+import { FaRegEdit } from "react-icons/fa";
 import Edit from "../../../components/ActionIcons/Edit";
-import { Toaster, toaster } from "../../../components/ui/toaster";
-import { Template } from "../../../Redux/Service/template.master.service";
-import axios from "axios";

-const IMGURL = import.meta.env.VITE_IMG_TEMPLATES
-const APIURL = import.meta.env.VITE_API_URL
+function EditTemplateModel() {
+  const [images, setImages] = useState<string[]>([]);

-function EditTemplateModel({ id, localData, refetch }: { id: number, localData: any, refetch: VoidFunction }) {
-  const [title, setTitle] = useState("");
-  const [subTitle, setSubTitle] = useState("");
-  const [userType, setUserType] = useState<number | "">("");
-  const [images, setImages] = useState<(File | string)[]>([]);
-  // const [objectURLs, setObjectURLs] = useState<string[]>([]); // Store object URLs separately
-  // const [updateTemplateMaster] = useUpdateTemplateMasterMutation()
-  const [isOpen, setIsOpen] = useState(false);
-  const [selectedTemplate, setSelectedTemplate] = useState<Template | null>(null);
-  const token = localStorage.getItem("token");
-
-  console.log(selectedTemplate);
-
-  const handleImageChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
+  const handleImageChange = (event: React.ChangeEvent<HTMLInputElement>) => {
    if (event.target.files) {
-      const file = event.target.files[0];
-      if (!["image/jpeg", "image/jpg", "image/png"].includes(file.type)) {
-        toaster.create({
-          title: "Error",
-          description: "Only JPEG, JPG, and PNG files are allowed.",
-          type: "error",
-        });
-        return;
-      }
+      const selectedFiles = Array.from(event.target.files);

-      setImages((prevImages) => [...prevImages, file]);
+      const newImages = selectedFiles.map((file) => {
+        return URL.createObjectURL(file); // Convert to preview URL
+      });
+
+      setImages((prevImages) => [...prevImages, ...newImages]); // Append new images
    }
  };

-  const handleOpenModal = () => {
-    const template = localData?.find((item: any) => item.id === id);
-    if (template) {
-      setSelectedTemplate(template);
-      setTitle(template.post_template_translate.length > 0 ? template.post_template_translate[0].title : "");
-      setSubTitle(template.post_template_translate.length > 0 ? template.post_template_translate[0].sub_title : "");
-      setUserType(template.principle_type_xid?.toString() || "");
-
-      // Convert image URLs to File objects if needed
-      const templateImages = template.post_template_image.map((img: any) => `${IMGURL}${img.image_name}`);
-      setImages(templateImages);
-
-      setIsOpen(true);
-    }
-  };
-
-
-  const handleSubmit = async () => {
-    if (!title.trim() || !subTitle.trim()) {
-      toaster.create({
-        title: "Error",
-        description: "Title and Subtitle cannot be empty.",
-        type: "error",
-      });
-      return;
-    }
-
-    if (userType === "" || isNaN(Number(userType))) {
-      toaster.create({
-        title: "Error",
-        description: "Please select a valid user type.",
-        type: "error",
-      });
-      return;
-    }
-
-    const newImages = images.filter((image) => image instanceof File);
-
-    if (newImages.length === 0) {
-      toaster.create({
-        title: "Error",
-        description: "Please upload at least one image.",
-        type: "error",
-      });
-      return;
-    }
-
-    const formData = new FormData();
-    formData.append("id", `${id}`);
-    formData.append("principle_type_xid", `${userType}`);
-    formData.append("title", title);
-    formData.append("sub_title", subTitle);
-
-    newImages.forEach((image, index) => {
-      formData.append(`image_name[${index}]`, image, image.name);
-    });
-
-    try {
-      // await updateTemplateMaster(formData);
-      if (token) {
-        await axios.post(`${APIURL}/template-update`, formData, {
-          headers: {
-            'Content-Type': 'multipart/form-data',
-            'access-token': `${token}`,
-          },
-          // withCredentials: true,
-        });
-      }
-      setIsOpen(false);
-      refetch()
-    } catch (error) {
-      console.error("Error updating template:", error);
-      toaster.create({
-        title: "Error",
-        description: "Failed to update template. Please try again.",
-        type: "error",
-      });
-    }
-  };
-
-
-  // const handleSubmit = async () => {
-  //   if (!title.trim() || !subTitle.trim()) {
-  //     toaster.create({
-  //       title: "Error",
-  //       description: "Title and Subtitle cannot be empty.",
-  //       type: "error",
-  //     });
-  //     return;
-  //   }
-
-  //   if (userType === "" || isNaN(Number(userType))) {
-  //     toaster.create({
-  //       title: "Error",
-  //       description: "Please select a valid user type.",
-  //       type: "error",
-  //     });
-  //     return;
-  //   }
-
-  //   if (images.length === 0) {
-  //     toaster.create({
-  //       title: "Error",
-  //       description: "Please upload at least one image.",
-  //       type: "error",
-  //     });
-  //     return;
-  //   }
-
-  //   const existingImageUrls = images.filter((img) => typeof img === "string") as string[];
-  //   const newBase64Images = images.filter((img) => typeof img === "string" && img.startsWith("data:image")) as string[];
-
-  //   const payload = {
-  //     id: id,
-  //     principle_type_xid: userType,
-  //     title,
-  //     sub_title: subTitle,
-  //     image_name: [...existingImageUrls, ...newBase64Images], // Send only Base64 strings
-  //   };
-
-  //   try {
-  //     await updateTemplateMaster(payload)
-  //     setIsOpen(false)
-  //   } catch (error) {
-  //     console.error("Error creating template:", error);
-  //     alert("Failed to create template");
-  //   }
-  // };
-
  return (
-    <DialogRoot placement="center" open={isOpen} onOpenChange={({ open }) => setIsOpen(open)}>
-      {/* <Button bg={"transparent"} size="sm">
-                        <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
-                    </Button> */}
-      <Box bg={"transparent"} onClick={handleOpenModal}>
+    <DialogRoot placement="center">
+      <DialogTrigger asChild>
        <Edit />
-      </Box>
-
+      </DialogTrigger>

      <DialogContent
        bg={"#fff"}
        // w={{ lg: "60%", md: "230px" }}
-        w={{ base: '90%', md: '400px' }}
-        height={'auto'}
-
+        w={{ base: "90%", md: "400px" }}
+        height={"auto"}
        overflowX="hidden"
        p={3} // Reduced padding
-        bgSize={'md'}
+        bgSize={"md"}
      >
-        <DialogHeader bg="white" >
-          <DialogTitle alignSelf="center" color="black" fontSize="14px">Edit</DialogTitle>
+        <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">Title</Field.Label>
+              <Field.Label color="black" pt={1} fontSize="12px">
+                Template Name
+              </Field.Label>
              <Input
-                placeholder="Enter Title"
+                placeholder=""
                bgColor="#EEEEEE"
                color="black"
                border="none"
                pl={1}
                fontSize="12px"
                height="30px"
-                value={title}
-                onChange={(e) => setTitle(e.target.value)}
              />
-            </Field.Root>

-            <Field.Root>
-              <Field.Label color="black" pt={1} fontSize="12px">Subtitle</Field.Label>
-              <Input
-                placeholder="Enter subtitle"
+              <Field.Label color="black" pt={1} fontSize="12px">
+                Images
+              </Field.Label>
+              <Box
+                display="flex"
+                alignItems="center"
+                justifyContent="space-between"
+                px={3}
                bgColor="#EEEEEE"
-                color="black"
                border="none"
-                pl={1}
-                fontSize="12px"
-                height="30px"
-                value={subTitle}
-                onChange={(e) => setSubTitle(e.target.value)}
-              />
-            </Field.Root>
-
-            <Field.Root>
-              <Field.Label color="black" pt={1} fontSize="12px">Select User Type</Field.Label>
-              <Box bgColor="#EEEEEE" borderRadius="md" p={1}>
-                <select
-                  style={{
-                    width: "100%",
-                    background: "transparent",
-                    color: "black",
-                    border: "none",
-                    fontSize: "12px",
-                    height: "30px",
-                    outline: "none",
-                  }}
-                  value={userType}
-                  onChange={(e) => setUserType(Number(e.target.value))}
-                >
-                  <option value="">Select User Type</option>
-                  <option value="2">Recruiter</option>
-                  <option value="3">Jobseeker</option>
-                </select>
-              </Box>
-            </Field.Root>
-
-            <Field.Root>
-              <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} />
+                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 instanceof File ? URL.createObjectURL(img) : img}
+                        src={img}
                        alt={`Uploaded ${index}`}
-                        style={{ maxHeight: "40px", maxWidth: "70px", objectFit: "contain" }}
+                        style={{
+                          maxHeight: "40px",
+                          maxWidth: "70px",
+                          objectFit: "contain",
+                        }}
                      />
                    ))
                  ) : (
@@ -283,26 +123,20 @@ function EditTemplateModel({ id, localData, refetch }: { id: number, localData:
                </Box>
                <FiUpload color="#000" />
              </Box>
-              <Box>
-
-              </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"} onClick={handleSubmit}>
+          <Button w="100%" bg="#02A0A0" color={"#fff"}>
            Save
          </Button>
        </DialogFooter>

-        <DialogCloseTrigger color="black" onClick={() => setIsOpen(false)} />
+        <DialogCloseTrigger color="black" />
      </DialogContent>
-      <Toaster />
-    </DialogRoot >
+    </DialogRoot>
  );
 }

--- a/src/Pages/MasterModule/TemplateMaster/TemplateAddModel.tsx
+++ b/src/Pages/MasterModule/TemplateMaster/TemplateAddModel.tsx
@@ -1,142 +1,50 @@
 import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
-import { Box, Field, Input, Stack, Text } from "@chakra-ui/react"
+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";
-// import { useCreateTemplatePostMutation } from "../../../Redux/Service/template.master.service";
-import { Toaster, toaster } from "../../../components/ui/toaster"
-import axios from "axios";
-
-const APIURL = import.meta.env.VITE_API_URL
-
-function TemplateAddModel({ refetch }: { refetch: VoidFunction }) {
-    const [title, setTitle] = useState("");
-    const [subTitle, setSubTitle] = useState("");
-    const [userType, setUserType] = useState<number | "">("");
-    const [images, setImages] = useState<(File | string)[]>([]);
-    // const [createTemplatePost] = useCreateTemplatePostMutation()
-    const [isOpen, setIsOpen] = useState(false);
-    const token = localStorage.getItem("token");
-    if (!token) {
-        console.error("No token found in localStorage!");
-        return;
-    }
-
-    const handleOpenModal = () => {
-        setIsOpen(true);  // Open modal when clicking "Add"
-    };


-    const handleImageChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
-        if (event.target.files) {
-            const file = event.target.files[0];
-            if (!["image/jpeg", "image/jpg", "image/png"].includes(file.type)) {
-                toaster.create({
-                    title: "Error",
-                    description: "Only JPEG, JPG, and PNG files are allowed.",
-                    type: "error",
-                });
-                return;
-            }
+function TemplateAddModel() {

-            setImages((prevImages) => [...prevImages, file]);
-        }
-    };
+    const [images, setImages] = useState<string[]>([]);

-
-    const handleSubmit = async () => {
-        if (!title || !subTitle || images.length === 0) {
-            toaster.create({
-                title: "Error",
-                description: "Please fill in all required fields and upload at least one image.",
-                type: "error",
-            });
-            return;
-        }
-
-        if (userType === "" || isNaN(Number(userType))) {
-            toaster.create({
-                title: "Error",
-                description: "Please select a valid user type.",
-                type: "error",
-            });
-            return;
-        }
-
-        // const payload = {
-        //     id: id,
-        //     principle_type_xid: userType,
-        //     title,
-        //     sub_title: subTitle,
-        //     image_name: images.filter((img) => typeof img === "string"), // Send only Base64 strings
-        // };
-
-
-        const formData = new FormData();
-        formData.append("principle_type_xid", `${userType}`);
-        formData.append("title", title);
-        formData.append("sub_title", subTitle);
-
-        images.forEach((image, index) => {
-            if (image instanceof File) {
-                formData.append(`image_name[${index}]`, image, image.name);  // Ensure indexed naming
-            }
+    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
        });
-
-        if (token) {
-            const payload = JSON.parse(atob(token.split(".")[1]));
-            console.log("Token Payload:", payload);
-        }
-
-        try {
-            // await createTemplatePost(formData)
-            if (token) {
-                await axios.post(`${APIURL}/template-store`, formData, {
-                    headers: {
-                        'Content-Type': 'multipart/form-data',
-                        'access-token': `${token}`,
-                    },
-                    // withCredentials: true,
-                });
-            }
-            refetch();
-            setTitle("");
-            setSubTitle("");
-            setUserType("");
-            setImages([]);
-            setIsOpen(false)
-        } catch (error) {
-            console.error("Error creating template:", error);
-            // alert("Failed to create template");
-        }
+  
+        setImages((prevImages) => [...prevImages, ...newImages]); // Append new images
+      }
    };

-    // console.log("Token stored:", window.localStorage.getItem("token"));
-
-
+   
    return (

-        <DialogRoot placement="center" open={isOpen}>
+        <DialogRoot placement="center">
            <DialogTrigger asChild>
                {/* <Button bg={"transparent"} size="sm">
                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
                </Button> */}
-                <Button px={5} size={"xs"} bg={"#02A0A0"} onClick={handleOpenModal}>
+                <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' }}
+                 bg={"#fff"}
+                 // w={{ lg: "60%", md: "230px" }}
+                 w={{ base: '90%', md: '400px' }}
                height={'auto'}
-
-                overflowX="hidden"
-                p={3} // Reduced padding
-                bgSize={'md'}
+                 
+                 overflowX="hidden" 
+                 p={3} // Reduced padding
+                 bgSize={'md'}
            >
                <DialogHeader bg="white" >
                    <DialogTitle alignSelf="center" color="black" fontSize="14px">Add</DialogTitle>
@@ -146,79 +54,30 @@ function TemplateAddModel({ refetch }: { refetch: VoidFunction }) {
                    <Stack py={3}>

                        <Field.Root>
-                            <Field.Label color="black" pt={1} fontSize="12px">Title</Field.Label>
-                            <Input
-                                placeholder="Enter Title"
-                                bgColor="#EEEEEE"
-                                color="black"
-                                border="none"
-                                pl={1}
-                                fontSize="12px"
-                                height="30px"
-                                value={title}
-                                onChange={(e) => setTitle(e.target.value)}
-                            />
-                        </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.Root>
-                            <Field.Label color="black" pt={1} fontSize="12px">Subtitle</Field.Label>
-                            <Input
-                                placeholder="Enter subtitle"
-                                bgColor="#EEEEEE"
-                                color="black"
-                                border="none"
-                                pl={1}
-                                fontSize="12px"
-                                height="30px"
-                                value={subTitle}
-                                onChange={(e) => setSubTitle(e.target.value)}
-                            />
-                        </Field.Root>
-
-                        <Field.Root>
-                            <Field.Label color="black" pt={1} fontSize="12px">Select User Type</Field.Label>
-                            <Box bgColor="#EEEEEE" borderRadius="md" p={1}>
-                                <select
-                                    style={{
-                                        width: "100%",
-                                        background: "transparent",
-                                        color: "black",
-                                        border: "none",
-                                        fontSize: "12px",
-                                        height: "30px",
-                                        outline: "none",
-                                    }}
-                                    value={userType}
-                                    onChange={(e) => setUserType(Number(e.target.value))}
-                                >
-                                    <option value="">Select User Type</option>
-                                    <option value="2">Recruiter</option>
-                                    <option value="3">Jobseeker</option>
-                                </select>
-                            </Box>
-                        </Field.Root>
-
-                        <Field.Root>
+                            
                            <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 instanceof File ? URL.createObjectURL(img) : 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 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>
@@ -226,14 +85,13 @@ function TemplateAddModel({ refetch }: { refetch: VoidFunction }) {

                </DialogBody>
                <DialogFooter display="flex" justifyContent="center" pt={"2"}>
-                    <Button w="100%" bg="#02A0A0" color={"#fff"} onClick={handleSubmit}>
+                    <Button w="100%" bg="#02A0A0" color={"#fff"}>
                        Save
                    </Button>
                </DialogFooter>

-                <DialogCloseTrigger color="black" onClick={() => setIsOpen(false)} />
+                <DialogCloseTrigger color="black" />
            </DialogContent>
-            <Toaster />
        </DialogRoot >

    )
--- a/src/Pages/MasterModule/TemplateMaster/TemplateMaster.tsx
+++ b/src/Pages/MasterModule/TemplateMaster/TemplateMaster.tsx
@@ -1,16 +1,15 @@
-import { Box, HStack, Image, Text } from "@chakra-ui/react";
+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 img from "../../../assets/waterfall.jpg"
+import Templateimg from "../../../assets/Template_img.png"
 import TemplateAddModel from "./TemplateAddModel";
 import EditTemplateModel from "./EditTemplateModel";
-import { Template, useGetTemplateMasterQuery, useTemplateMasterToggleMutation } from "../../../Redux/Service/template.master.service";
-import { useEffect, useState } from "react";
-import SearchComponent from "../../../components/SearchComponent";

-const APIURL = import.meta.env.VITE_IMG_TEMPLATES
+

 // table data

@@ -19,105 +18,35 @@ const tableHeadRow = [
  "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 rounded={'lg'} w={100} h={50} src={img} />
-//         <Image rounded={'lg'} w={100} h={50} src={Templateimg} />
-//       </HStack>
-//     ),
-
-//     "Action": (
-//       <HStack justifyContent="center">
-//         <EditTemplateModel />
-//         <Box>
-//           <Switch colorPalette={'teal'} size={"xs"} />
-//         </Box>
-//       </HStack>
-//     ),
-//   })),
-// ];
-
-const TemplateMaster = () => {
-  const [currentPage, setCurrentPage] = useState(1);
-  const { data, refetch } = useGetTemplateMasterQuery(currentPage)
-  const [localData, setLocalData] = useState<any[]>([]);
-  const [templateMasterToggle] = useTemplateMasterToggleMutation();
-  const [searchTerm, setSearchTerm] = useState("");
-  console.log('DATA', data?.data.data);
-
-  useEffect(() => {
-    if (data?.data?.data) {
-      setLocalData(data?.data.data);
-    }
-  }, [data]);
-
-  const handlePageChange = (page: number) => {
-    setCurrentPage(page);
-  };
-
-  const handleToggle = async (agencyId: string, currentStatus: number) => {
-    const newStatus = currentStatus ? 0 : 1;
-    setLocalData((prevData) =>
-      prevData.map((agency) =>
-        agency.id === agencyId ? { ...agency, is_active: newStatus } : agency
-      )
-    );
-    try {
-      await templateMasterToggle({ id: agencyId, is_active: newStatus }).unwrap();
-      refetch()
-    } catch (error) {
-      console.error("Error updating privacy policy:", error);
-      setLocalData((prevData) =>
-        prevData.map((agency) =>
-          agency.id === agencyId ? { ...agency, is_active: currentStatus } : agency
-        )
-      );
-    }
-  };
-
-  const filteredData = localData?.filter((agency) =>
-    agency.post_template_translate[0].title.toLowerCase().includes(searchTerm.toLowerCase())
-  );
-
-  const managepost = filteredData?.map((agency: Template, index: number) => ({
-    'id': agency.id,
-    "Sr. No": (currentPage - 1) * (data?.data.per_page ?? 0) + index + 1,
-    "Title": agency.post_template_translate.length > 0
-      ? agency.post_template_translate[0].title
-      : "N/A",
+const managepost: any[] = [
+  ...Array.from({ length: 12 }, (_, i) => ({
+    "Sr. No": i + 1,
+    "Title": "Lorem Ipsum",
    "Images": (
      // <Image w={50} src={img} />
-      <HStack key={agency.id}>
-        {agency.post_template_image.map((img) => (
-          <Image rounded={'lg'} w={100} h={50} src={`${APIURL}${img.image_name}`} />
-        ))}
-
-        {/* <Image rounded={'lg'} w={100} h={50} src={Templateimg} /> */}
+      <HStack >
+      <Image rounded={'lg'} w={100} h={50} src={img} />
+      <Image rounded={'lg'} w={100} h={50} src={Templateimg} />
      </HStack>
-    ),

+
+    ),
+    
    "Action": (
      <HStack justifyContent="center">
-        <EditTemplateModel id={agency.id} localData={localData} refetch={refetch} />
+        <EditTemplateModel />
        <Box>
-          <Switch
-            colorPalette={'teal'}
-            size={"xs"}
-            onChange={() => handleToggle(agency.id.toString(), Number(agency.is_active ?? 0))}
-            checked={Boolean(Number(agency.is_active))}
-          />
+          <Switch colorPalette={'teal'} size={"xs"}/>
        </Box>
      </HStack>
    ),
-  }));
+  })),
+];

+const TemplateMaster = () => {
  return (

    <MainFrame>
@@ -130,11 +59,11 @@ const TemplateMaster = () => {
          px={3}
        >
          <Text as={"span"} fontSize={"sm"} fontWeight={500} color={"#000"}>
-            Template Master
+          Template Master
          </Text>

          <HStack >
-            {/* <InputGroup
+            <InputGroup 
              startElement={
                <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
              }
@@ -153,27 +82,17 @@ const TemplateMaster = () => {
                bgColor={'#EEEEEE'}
                ps={8}
              />
-            </InputGroup> */}
-            <SearchComponent
-              value={searchTerm}
-              onChange={setSearchTerm}
-            />
-            <TemplateAddModel refetch={refetch} />
+            </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}
-          paginationData={{
-            current_page: data?.data.current_page || 1,
-            last_page: data?.data.last_page || 1,
-            per_page: data?.data.per_page || 10,
-            total: data?.data.total || 0
-          }}
-          onPageChange={handlePageChange}
        />
-      </Box>
+      </Box>       
    </MainFrame>
  )
 }
--- a/src/Pages/MasterModule/WorkspaceMode/EditWorkModel.tsx
+++ b/src/Pages/MasterModule/WorkspaceMode/EditWorkModel.tsx
@@ -11,62 +11,21 @@ import {
 import {
  Box,
  Field,
+  IconButton,
  Input,
  Stack,
+  Text,
+  Textarea,
 } from "@chakra-ui/react";
 import { Button } from "../../../components/ui/button";
-// import { FaRegEdit } from "react-icons/fa";
+import { FaRegEdit } from "react-icons/fa";
 import Edit from "../../../components/ActionIcons/Edit";
-import { useState } from "react";
-import { toaster } from "../../../components/ui/toaster";
-import { useUpdateWorkSpaceMutation } from "../../../Redux/Service/workspace.mode";
-
-function EditWorkModel({ localData, refetch }: {localData: any, refetch: VoidFunction}) {
-  const [title, setTitle] = useState(localData?.en_name);
-  const [isOpen, setIsOpen] = useState(false);
-  const [updateWorkSpace] = useUpdateWorkSpaceMutation()
-  console.log("localData", localData)
-
-  const handleOpenModal = () => {
-    // const template = localData?.find((item: any) => item.id === id);
-    if (localData) {
-      setIsOpen(true);
-      // setTitle(localData?.localData.en_name);
-    }
-  };
-
-
-  const handleSubmit = async () => {
-    if (!title.trim()) {
-      toaster.create({
-        title: "Error",
-        description: "Title field cannot be empty.",
-        type: "error",
-      });
-      return;
-    }
-
-    const payload = {
-      id: localData?.id,
-      en_name: title
-    };
-
-    try {
-      await updateWorkSpace(payload).unwrap();
-      refetch()
-      setIsOpen(false);
-    } catch (error) {
-      console.error("Error updating template:", error);
-      alert("Failed to update template");
-    }
-  };

+function EditWorkModel() {
  return (
-    <DialogRoot placement="center" open={isOpen} onOpenChange={({ open }) => setIsOpen(open)}>
+    <DialogRoot placement="center">
      <DialogTrigger asChild>
-        <Box bg={"transparent"} onClick={handleOpenModal}>
-          <Edit />
-        </Box>
+        <Edit />
      </DialogTrigger>

      <DialogContent
@@ -91,20 +50,19 @@ function EditWorkModel({ localData, refetch }: {localData: any, refetch: VoidFun
                Workspace Mode
              </Field.Label>
              <Input
-                value={title}
+                value="Lorem Ipsum"
                bgColor="#EEEEEE"
                color="black"
                border="none"
                pl={1}
                fontSize="12px"
                height="30px"
-                onChange={(e) => setTitle(e.target.value)}
              />
            </Field.Root>
          </Stack>
        </DialogBody>
        <DialogFooter display="flex" justifyContent="center" pt={"2"}>
-          <Button w="100%" bg="#02A0A0" color={"#fff"} onClick={handleSubmit}>
+          <Button w="100%" bg="#02A0A0" color={"#fff"}>
            Save
          </Button>
        </DialogFooter>
--- a/src/Pages/MasterModule/WorkspaceMode/WorkAddModel.tsx
+++ b/src/Pages/MasterModule/WorkspaceMode/WorkAddModel.tsx
@@ -1,67 +1,32 @@
 import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
-import { Field, Input, Stack, Text } from "@chakra-ui/react"
+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 { useState } from "react";
-import { useCreateWorkspacePostMutation } from "../../../Redux/Service/workspace.mode";
-import { Toaster, toaster } from "../../../components/ui/toaster";
-
-function WorkAddModel({ refetch }: { refetch: VoidFunction }) {
-    const [title, setTitle] = useState('')
-    const [isOpen, setIsOpen] = useState(false);
-    const [createWorkspacePost] = useCreateWorkspacePostMutation()
-
-    const handleOpenModal = () => {
-        setIsOpen(true);
-    };
-
-    const handleSubmit = async () => {
-        if (!title.trim()) {
-            toaster.create({
-                title: "Error",
-                description: "Title field cannot be empty.",
-                type: "error",
-            });
-            return;
-        }
-
-        const payload = {
-            en_name: title,
-        };
-
-        try {
-            await createWorkspacePost(payload);
-            refetch()
-            setIsOpen(false);
-            setTitle('')
-        } catch (error) {
-            console.error("Error updating template:", error);
-            alert("Failed to update template");
-        }
-    };

+function WorkAddModel() {
+   
    return (

-        <DialogRoot placement="center" open={isOpen}>
+        <DialogRoot placement="center">
            <DialogTrigger asChild>
                {/* <Button bg={"transparent"} size="sm">
                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
                </Button> */}
-                <Button px={5} size={"xs"} bg={"#02A0A0"} onClick={handleOpenModal}>
+                <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' }}
+                 bg={"#fff"}
+                 // w={{ lg: "60%", md: "230px" }}
+                 w={{ base: '90%', md: '400px' }}
                height={'auto'}
-
-                overflowX="hidden"
-                p={3} // Reduced padding
-                bgSize={'md'}
+                 
+                 overflowX="hidden" 
+                 p={3} // Reduced padding
+                 bgSize={'md'}
            >
                <DialogHeader bg="white" >
                    <DialogTitle alignSelf="center" color="black" fontSize="14px">Add</DialogTitle>
@@ -72,30 +37,19 @@ function WorkAddModel({ refetch }: { refetch: VoidFunction }) {

                        <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"
-                                value={title}
-                                onChange={(e) => setTitle(e.target.value)}
-                            />
+                            <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"} onClick={handleSubmit}>
+                    <Button w="100%" bg="#02A0A0" color={"#fff"}>
                        Save
                    </Button>
                </DialogFooter>

-                <DialogCloseTrigger color="black" onClick={() => setIsOpen(false)} />
+                <DialogCloseTrigger color="black" />
            </DialogContent>
-            <Toaster />
        </DialogRoot >

    )
--- a/src/Pages/MasterModule/WorkspaceMode/WorkspaceMode.tsx
+++ b/src/Pages/MasterModule/WorkspaceMode/WorkspaceMode.tsx
@@ -1,13 +1,11 @@
-import { Box, HStack, Text } from "@chakra-ui/react";
+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";
-import { useEffect, useState } from "react";
-import { useGetWorkSpaceModeQuery, useWorkspaceToggleMutation } from "../../../Redux/Service/workspace.mode";
-import SearchComponent from "../../../components/SearchComponent";
-import { Toaster, toaster } from "../../../components/ui/toaster";



@@ -17,95 +15,25 @@ 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 = () => {
-  const [currentPage, setCurrentPage] = useState(1);
-  const { data, refetch } = useGetWorkSpaceModeQuery(currentPage)
-  const [localData, setLocalData] = useState<any[]>([]);
-  const [searchTerm, setSearchTerm] = useState("");
-  const [workspaceToggle] = useWorkspaceToggleMutation()
-
-  console.log("Workspace Data", data?.data.data)
-
-  useEffect(() => {
-    if (data?.data?.data) {
-      setLocalData(data?.data.data);
-    }
-  }, [data]);
-
-  const handlePageChange = (page: number) => {
-    setCurrentPage(page);
-  };
-
-  const handleToggle = async (agencyId: string, currentStatus: number) => {
-    const newStatus = currentStatus ? 0 : 1;
-    setLocalData((prevData) =>
-      prevData.map((agency) =>
-        agency.id === agencyId ? { ...agency, is_active: newStatus } : agency
-      )
-    );
-    try {
-      await workspaceToggle({ id: agencyId, is_active: newStatus }).unwrap();
-      refetch()
-    } catch (error) {
-      console.error("Error updating privacy policy:", error);
-      toaster.create({
-        title: "Error",
-        description: "Someting went wrong.",
-        type: "error",
-      });
-      setLocalData((prevData) =>
-        prevData.map((agency) =>
-          agency.id === agencyId ? { ...agency, is_active: currentStatus } : agency
-        )
-      );
-    }
-  };
-
-  const filteredData = localData?.filter((agency) => {
-    const searchLower = searchTerm.toLowerCase();
-    const title = agency.en_name?.toLowerCase().includes(searchLower);
-    return title;
-  });
-
-  const managepost = filteredData?.map((agency: any, index: number) => ({
-    'id': agency.id,
-    "Sr. No": (currentPage - 1) * (data?.data.per_page ?? 0) + index + 1,
-    "Title": agency.en_name,
-    "is_active": agency.is_active,
+const managepost: any[] = [
+  ...Array.from({ length: 12 }, (_, i) => ({
+    "Sr. No": i + 1,
+    "Title": "Lorem Ipsum",
    "Action": (
      <HStack justifyContent="center">
-        {/* <ViewAgencyMaster agency={localData} id={agency.id} /> */}
-        <EditWorkModel localData={agency} refetch={refetch} />
+        <EditWorkModel />
        <Box>
-          <Switch
-            colorPalette={"teal"}
-            size={"xs"}
-            onChange={() => handleToggle(agency.id, Number(agency.is_active))}
-            checked={Boolean(Number(agency.is_active))}
-          />
+          <Switch colorPalette={'teal'} size={"xs"}/>
        </Box>
      </HStack>
    ),
-  }));
+  })),
+];

+const WorkspaceMode = () => {
  return (

    <MainFrame>
@@ -118,36 +46,40 @@ const WorkspaceMode = () => {
          px={3}
        >
          <Text as={"span"} fontSize={"sm"} fontWeight={500} color={"#000"}>
-            Workspace Mode
+          Workspace Mode
          </Text>

          <HStack >
-            <SearchComponent
-              value={searchTerm}
-              onChange={(value) => {
-                setSearchTerm(value);
-                // setCurrentPage(1);
-                refetch()
-              }}
-            />
+            <InputGroup 
+              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={"xs"}
+                fontSize={"sm"}
+                placeholder="Search..."
+                bgColor={'#EEEEEE'}
+                ps={8}
+              />
+            </InputGroup>
            {/* <Button bgColor={'#EEEEEE'} pl={3} pr={3}><IoMdAdd /> <Text>Add</Text></Button> */}
-            <WorkAddModel refetch={refetch}/>
+            <WorkAddModel />
          </HStack>
        </HStack>
        <DataTable
          sortableColumns={["Name", "Registration Date "]}
          tableHeadRow={tableHeadRow}
          data={managepost}
-          paginationData={{
-            current_page: data?.data.current_page || 1,
-            last_page: data?.data.last_page || 1,
-            per_page: data?.data.per_page || 10,
-            total: data?.data.total || 0
-          }}
-          onPageChange={handlePageChange}
        />
-      </Box>
-      <Toaster />
+      </Box>       
    </MainFrame>
  )
 }
--- a/src/Pages/Profile/ChangePassword.tsx
+++ b/src/Pages/Profile/ChangePassword.tsx
@@ -1,246 +1,57 @@

-import { DialogCloseTrigger, Field, IconButton, Input, Stack, Text } from "@chakra-ui/react";
+import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../components/ui/dialog"
+import { Field, Grid, Heading, Input, Stack, Text } from "@chakra-ui/react"
+import { FaRegEdit } from "react-icons/fa";
 import { Button } from "../../components/ui/button";
-import { DialogBody, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../components/ui/dialog";
-// import EnterPassword from "./EnterPassword";
-import { useForm } from "react-hook-form";
-import { useEffect, useState } from "react";
-import { toaster } from "../../components/ui/toaster";
-import { useNewPasswordSetMutation } from "../../Redux/Service/profile.password";
-import { LuEye, LuEyeOff } from "react-icons/lu";
-import { InputGroup } from "../../components/ui/input-group";
-
-type EnterPasswordProps = {
-    onClose: () => void;
-    isOpen: boolean;
-};
-
-type FormData = {
-    new_password: string;
-    confirm_password: string;
-};
-
-function Changepassword({ onClose, isOpen }: EnterPasswordProps) {
-    const [showOldPassword, setShowOldPassword] = useState(false);
-    const [showNewPassword, setShowNewPassword] = useState(false);
-    const [newPasswordSet] = useNewPasswordSetMutation()
-    const [isLoading, setIsLoading] = useState(false);
-    const {
-        register,
-        handleSubmit,
-        formState: { errors },
-        setError,
-        clearErrors,
-        watch,
-        reset,
-    } = useForm<FormData>({
-        defaultValues: {
-            new_password: '',
-            confirm_password: ''
-        }
-    });
-
-    const newPassword = watch("new_password");
-    const confirmPassword = watch("confirm_password");
-
-    useEffect(() => {
-        if (newPassword && confirmPassword && newPassword !== confirmPassword) {
-            setError("confirm_password", {
-                type: "manual",
-                message: "Passwords do not match"
-            });
-        } else if (confirmPassword) {
-            clearErrors("confirm_password");
-        }
-    }, [newPassword, confirmPassword, setError, clearErrors]);
-
-
-    const onSubmit = async (data: FormData) => {
-
-        if (data.new_password === '' || data.confirm_password === '') {
-            return
-        }
-
-        if (data.new_password !== data.confirm_password) {
-            setError("confirm_password", {
-                type: "manual",
-                message: "Passwords do not match"
-            });
-            return;
-        }
-
-        console.log('ERROR', errors)
-        console.log('Change submitted:', data);
-
-        clearErrors("confirm_password");
-
-        setIsLoading(true);
-        const payload = {
-            new_password: data.new_password,
-            confirm_password: data.confirm_password
-        }
-
-        try {
-            const res = await newPasswordSet(payload).unwrap()
-
-            if (res.status === 'success') {
-                toaster.create({
-                    title: "Password changed Successfully",
-                    type: "success",
-                });
-                onClose()
-            } else {
-                toaster.create({
-                    title: res.data.message || "Invalid password",
-                    type: "error",
-                });
-
-            }
-            reset()
-        } catch (error: any) {
-            toaster.create({
-                title: error.data.message || "Something went wrong",
-                type: "error",
-            });
-        } finally {
-            setIsLoading(false);
-        }
-    };
+import EnterPassword from "./EnterPassword";
+function Changepassword() {
    return (
-        <>
-            <DialogRoot
-                placement="center"
-                open={isOpen}
-                onOpenChange={(open) => !open && onClose()}
+
+        <DialogRoot placement="center">
+            <DialogTrigger asChild>
+                <Button bg="#02A0A0" color={"#fff"} p={4} fontSize={"12px"} mt={2}>
+                    Change Password
+                </Button>
+
+            </DialogTrigger>
+
+            <DialogContent
+                bg={"#fff"}
+                // w={{ lg: "60%", md: "230px" }}
+                w={{ base: '90%', md: '400px' }}
+
+                // height={'80vh'}
+                // overflow={'scroll'}
+                p={2} // Reduced padding
+                bgSize={'md'}
            >
+                <DialogHeader bg="white" pt={3} pb={2} >
+                    <DialogTitle alignSelf="center" color="black" fontSize="18px" textAlign={"center"}>CHANGE PASSWORD</DialogTitle>
+                </DialogHeader>

-                <DialogTrigger asChild>
-                    <Button bg="#02A0A0" size={'2xs'} color={"#fff"} px={2}  >
-                        Change Password
-                    </Button>
-                </DialogTrigger>
+                <DialogBody bg="white" pt={5}>
+                    <Stack p={2} >
+                        <Field.Root>
+                            <Field.Label color="black" pt={1} fontSize="12px">New password</Field.Label>
+                            <Input color="black" pl={1} fontSize="12px" height="30px" type="password" border="1px solid grey" /></Field.Root>
+                        <Field.Root>
+                            <Field.Label color="black" pt={1} fontSize="12px">Confirm password</Field.Label>
+                            <Input color="black" pl={1} fontSize="12px" height="30px" type="password" border="1px solid grey" /></Field.Root>

-                <DialogContent
-                    bg={"#fff"}
-                    w={{ base: '90%', md: '400px' }}
-                    p={2}
-                    bgSize={'md'}
+                    </Stack>
+                </DialogBody>
+                <DialogFooter display="flex" justifyContent="center" mt={2} p={2}
                >
-                    <DialogHeader bg="white" pt={3} pb={2} >
-                        <DialogTitle alignSelf="center" color="black" fontSize="18px" textAlign={"center"}>CHANGE PASSWORD</DialogTitle>
-                    </DialogHeader>
-                    <form onSubmit={handleSubmit(onSubmit)}>
-                        <DialogBody bg="white" pt={5}>
-                            <Stack p={2} >
-                                <Field.Root>
-                                    <Field.Label color="black" pt={1} fontSize="12px">New password</Field.Label>
-                                    <InputGroup
-                                        width={'100%'}
-                                        endElement={
-                                            <IconButton
-                                                aria-label={showOldPassword ? "Hide password" : "Show password"}
-                                                size="sm"
-                                                // variant="outline"
-                                                onClick={() => setShowOldPassword(!showOldPassword)}
-                                                _hover={{ bg: "transparent" }}
-                                                height={'fit-content'}
-                                                mr={2}
-                                            >
-                                                {showOldPassword ? <LuEye /> : <LuEyeOff />}
-                                            </IconButton>
-                                        }>
-                                        <Input
-                                            color="black"
-                                            pl={1}
-                                            fontSize="12px"
-                                            height="30px"
-                                            type={showOldPassword ? "text" : "password"}
-                                            border={errors.new_password ? "1px solid red" : "1px solid grey"}
-                                            {...register("new_password", {
-                                                required: "Password is required",
-                                                minLength: {
-                                                    value: 8,
-                                                    message: "Password must be at least 8 characters",
-                                                },
-                                            })}
-                                        />
-                                    </InputGroup>
-                                    {/* <IconButton
-                                        aria-label={showPassword ? "Hide password" : "Show password"}
-                                        size="sm"
-                                        variant="ghost"
-                                        onClick={() => setShowPassword(!showPassword)}
-                                    >
-                                        {showPassword ? <LuEye /> : <LuEyeOff />}
-                                    </IconButton> */}
+                    {/* <Button w="100%" bg="#02A0A0" color={"#fff"}>
+                        Save
+                    </Button> */}
+                    <EnterPassword />
+                </DialogFooter>

-                                    {errors.new_password && (
-                                        <Text color="red.500" fontSize="xs" mt={1}>
-                                            {errors.new_password.message}
-                                        </Text>
-                                    )}
+                {/* <DialogCloseTrigger color="black" /> */}
+            </DialogContent>
+        </DialogRoot >

-                                </Field.Root>
-                                <Field.Root>
-                                    <Field.Label color="black" pt={1} fontSize="12px">Confirm password</Field.Label>
-                                    <InputGroup
-                                        width={'100%'}
-                                        endElement={
-                                            <IconButton
-                                                aria-label={showNewPassword ? "Hide password" : "Show password"}
-                                                size="sm"
-                                                // variant="outline"
-                                                onClick={() => setShowNewPassword(!showNewPassword)}
-                                                _hover={{ bg: "transparent" }}
-                                                height={'fit-content'}
-                                                mr={2}
-                                            >
-                                                {showNewPassword ? <LuEye /> : <LuEyeOff />}
-                                            </IconButton>
-                                        }>
-                                        <Input
-                                            color="black"
-                                            pl={1}
-                                            fontSize="12px"
-                                            height="30px"
-                                            type= {showNewPassword ? "password" : "Text"}
-                                            border={errors.confirm_password ? "1px solid red" : "1px solid grey"}
-                                            {...register("confirm_password", {
-                                                required: "Please confirm your password",
-                                                validate: (value) =>
-                                                    value === newPassword || "Passwords do not match",
-                                            })}
-                                        />
-                                    </InputGroup>
-
-                                    {errors.confirm_password && (
-                                        <Text color="red.500" fontSize="xs" mt={1}>
-                                            {errors.confirm_password.message}
-                                        </Text>
-                                    )}
-                                </Field.Root>
-
-                            </Stack>
-                        </DialogBody>
-                        <DialogFooter display="flex" justifyContent="center" mt={2} p={2}
-                        >
-                            {/* <EnterPassword /> */}
-                            <Button
-                                loading={isLoading}
-                                mt={6}
-                                w="100%"
-                                bg="#02A0A0"
-                                color="white"
-                                type="submit"
-                            >
-                                Submit
-                            </Button>
-                        </DialogFooter>
-                    </form>
-                    <DialogCloseTrigger color="black" />
-                </DialogContent>
-            </DialogRoot >
-        </>
    )
 }

--- a/src/Pages/Profile/EnterOTP.tsx
+++ b/src/Pages/Profile/EnterOTP.tsx
@@ -1,87 +1,11 @@
-import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle } from "../../components/ui/dialog"
+import { DialogBody, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../components/ui/dialog"
 import { Box, Input, Stack, Text } from "@chakra-ui/react"
 import { Button } from "../../components/ui/button";
-import { useEffect, useState } from "react";
-// import { BiSolidEdit } from "react-icons/bi";
-import { Toaster, toaster } from "../../components/ui/toaster";
-import { useGetProfileQuery, useResendOtpMutation, useVerifyOTPMutation } from "../../Redux/Service/profile.password";
-import { useForm } from "react-hook-form";
-import Changepassword from "./ChangePassword";
+import { useState } from "react";
+import { BiSolidEdit } from "react-icons/bi";

-type EnterOTPProps = {
-    onClose: () => void;
-    isOpen: boolean;
-};
-
-type FormData = {
-    otp: string[];
-};
-
-
-function EnterOTP({ onClose, isOpen }: EnterOTPProps) {
-    const [isLoading, setIsLoading] = useState(false);
-    const [timer, setTimer] = useState(60);
-    const [isResendDisabled, setIsResendDisabled] = useState(true);
-    const [verifyOTP] = useVerifyOTPMutation()
-    const [otpSuccess, setOtpSuccess] = useState(false);
-    const [resendOtp] = useResendOtpMutation()
-    const { data } = useGetProfileQuery()
-    const id = data?.data.id
-
-
-    const {
-        register,
-        handleSubmit,
-        formState: { errors },
-        reset,
-    } = useForm<FormData>({
-        defaultValues: {
-            otp: ["", "", "", ""] // Initialize with empty strings for each digit
-        }
-    });
-
-    useEffect(() => {
-        let interval: NodeJS.Timeout;
-
-        if (timer > 0 && isResendDisabled) {
-            interval = setInterval(() => {
-                setTimer((prevTimer) => prevTimer - 1);
-            }, 1000);
-        } else if (timer === 0) {
-            setIsResendDisabled(false);
-        }
-
-        return () => clearInterval(interval);
-    }, [timer, isResendDisabled]);
-
-    const handleResendOTP = async () => {
-        setIsResendDisabled(true);
-        setTimer(60); // Reset timer to 1 minute
-
-        try {
-
-            const res = await resendOtp({ mobile_number: Number(id) }).unwrap()
-
-            if (res.status === 200) {
-                toaster.create({
-                    title: "OTP resent successfully",
-                    type: "success",
-                });
-            } else {
-                toaster.create({
-                    title: res.data.message || "Failed to resend OTP",
-                    type: "error",
-                });
-                setIsResendDisabled(false); // Enable button if failed
-            }
-        } catch (error: any) {
-            toaster.create({
-                title: error.response?.data?.message || "Failed to resend OTP",
-                type: "error",
-            });
-            setIsResendDisabled(false); // Enable button if error
-        }
-    };
+function EnterOTP() {
+    const [otp, setOtp] = useState<string[]>(["", "", "", ""]);

    // Handle change for OTP inputs
    const handleChange = (e: React.ChangeEvent<HTMLInputElement>, index: number): void => {
@@ -91,174 +15,94 @@ function EnterOTP({ onClose, isOpen }: EnterOTPProps) {
        if (/[^0-9]/.test(value)) return;

        // Update the OTP state with the new value
-        // const newOtp = [...otp];
-        // newOtp[index] = value;
-        // setOtp(newOtp);
-
-        if (value && index < 3) {
-            const nextInput = document.getElementById(`otp-input-${index + 1}`) as HTMLInputElement;
-            if (nextInput) nextInput.focus();
-        }
+        const newOtp = [...otp];
+        newOtp[index] = value;
+        setOtp(newOtp);

        // Move focus to the next input automatically
-        // if (value && index < otp.length - 1) {
-        //     const nextInput = document.getElementById(`otp-input-${index + 1}`) as HTMLInputElement;
-        //     if (nextInput) nextInput.focus();
-        // }
-
-        if (value === "" && index > 0) {
-            const prevInput = document.getElementById(`otp-input-${index - 1}`) as HTMLInputElement;
-            if (prevInput) prevInput.focus();
-        }
-    };
-
-
-    const onSubmit = async (data: FormData) => {
-        console.log('ERROR', errors)
-        if (data.otp.length !== 4) {
-            toaster.create({
-                title: "OTP must be 4 digits",
-                type: "error",
-            });
-            return;
-        }
-
-        const fullOtp = data.otp.join('');
-        console.log('OTP submitted:', fullOtp);
-
-        setIsLoading(true);
-        try {
-            const res = await verifyOTP({ otp: fullOtp }).unwrap()
-
-            if (res.status === 'success') {
-                toaster.create({
-                    title: "OTP Verified Successfully",
-                    type: "success",
-                });
-                setOtpSuccess(true);
-                reset();
-            } else {
-                toaster.create({
-                    title: res.data.message || "Invalid OTP",
-                    type: "error",
-                });
-            }
-            reset()
-        } catch (error: any) {
-            toaster.create({
-                title: error.data?.message || "Something went wrong",
-                type: "error",
-            });
-            setOtpSuccess(false);
-        } finally {
-            setIsLoading(false);
+        if (value && index < otp.length - 1) {
+            const nextInput = document.getElementById(`otp-input-${index + 1}`) as HTMLInputElement;
+            if (nextInput) nextInput.focus();
        }
    };

    return (
-        <>
-            <DialogRoot placement="center"
-                open={isOpen}
-                onOpenChange={(open) => !open && onClose()}>
-                {/* <DialogTrigger asChild>
-                    <Button w="100%" bg="#02A0A0" color={"#fff"}>
-                        Submit
-                    </Button>

-                </DialogTrigger> */}
+        <DialogRoot placement="center">
+            <DialogTrigger asChild>
+                <Button w="100%" bg="#02A0A0" color={"#fff"}>
+                    Save
+                </Button>

-                <DialogContent
-                    bg={"#fff"}
-                    // w={{ lg: "60%", md: "230px" }}
-                    w={{ base: '90%', md: '400px' }}
+            </DialogTrigger>

-                    // height={'80vh'}
-                    // overflow={'scroll'}
-                    p={2} // Reduced padding
-                    bgSize={'md'}
-                >
-                    <DialogHeader bg="white" pt={3} alignSelf="center">
-                        <DialogTitle alignSelf="center" color="black" fontSize="18px" textAlign={"center"}>ENTER OTP</DialogTitle>
-                    </DialogHeader>
-                    <form onSubmit={handleSubmit(onSubmit)}>
-                        <DialogBody bg="white" pt={2}>
-                            <Text color={"black"} textAlign={"center"}>OTP has been sent successfully</Text>
-                            {/* <Box display="flex" flexDirection="row" alignItems="center" justifyContent="center" p={3}>
-                            <BiSolidEdit color="black" />
-                            <Text color="black" textAlign="center" ml={2}>9619565889</Text>
-                        </Box> */}
+            <DialogContent
+                bg={"#fff"}
+                // w={{ lg: "60%", md: "230px" }}
+                w={{ base: '90%', md: '400px' }}
+
+                // height={'80vh'}
+                // overflow={'scroll'}
+                p={2} // Reduced padding
+                bgSize={'md'}
+            >
+                <DialogHeader bg="white" pt={3}>
+                    <DialogTitle alignSelf="center" color="black" fontSize="18px" textAlign={"center"}>ENTER OTP</DialogTitle>
+                </DialogHeader>
+
+                <DialogBody bg="white" pt={2}>
+                    <Text color={"black"} textAlign={"center"}>OTP has been send to your E-mail Address</Text>
+                    <Box display="flex" flexDirection="row" alignItems="center" justifyContent="center" p={3}>
+                        <BiSolidEdit color="black" />
+                        <Text color="black" textAlign="center" ml={2}>9619565889</Text>
+                    </Box>


-                            <Stack direction="row" justify="center" pt={2}>
+                    <Stack direction="row" justify="center" pt={2}>

-                                {/* 4 OTP Inputs */}
-                                {Array.from({ length: 4 }).map((_, index) => (
-                                    <Input
-                                        key={index}
-                                        id={`otp-input-${index}`}
-                                        maxW="50px"
-                                        color="black"
-                                        textAlign="center"
-                                        fontSize="20px"
-                                        placeholder="0"
-                                        border={errors.otp?.[index] ? "1px solid red" : "1px solid grey"}
-                                        maxLength={1}
-                                        {...register(`otp.${index}`, {
-                                            required: "Digit required",
-                                            pattern: {
-                                                value: /^[0-9]$/,
-                                                message: "Must be a single digit"
-                                            },
-                                            onChange: (e) => handleChange(e, index)
-                                        })}
-                                    />
-                                ))}
-                            </Stack>
-                            <Box textAlign="center" mt={4}>
-                                {isResendDisabled ? (
-                                    <Text color="gray.500">
-                                        Resend OTP in {timer} seconds
-                                    </Text>
-                                ) : (
-                                    <Text
-                                        color="#4746F4"
-                                        textDecoration="underline"
-                                        fontWeight="bold"
-                                        cursor="pointer"
-                                        onClick={handleResendOTP}
-                                    >
-                                        Resend OTP
-                                    </Text>
-                                )}
-                            </Box>
-
-                        </DialogBody>
-                        <DialogFooter display="flex" justifyContent="center" mt={2} p={2}
+                        {/* 4 OTP Inputs */}
+                        {otp.map((digit, index) => (
+                            <Input
+                                key={index}
+                                id={`otp-input-${index}`}
+                                value={digit}
+                                maxW="50px"
+                                color={"black"}
+                                textAlign="center"
+                                fontSize="20px"
+                                placeholder="0"
+                                border="1px solid grey"
+                                onChange={(e) => handleChange(e, index)}
+                                maxLength={1} // Only allows 1 character per input
+                            />
+                        ))}
+                    </Stack>
+                    <Box textAlign="center">
+                        <Text
+                            color="#4746F4"
+                            textDecoration="underline"
+                            fontWeight="bold"
+                            mt={3}
+                            cursor="pointer"
+                            display="inline-block"
+                            px={2} // Adds padding for better appearance
                        >
-                            <Button
-                                loading={isLoading}
-                                mt={6}
-                                w="100%"
-                                bg="#02A0A0"
-                                color="white"
-                                type="submit"
-                            >
-                                Verify OTP
-                            </Button>
-                        </DialogFooter>
-                    </form>
-                    <DialogCloseTrigger color="black" />
-                </DialogContent>
-            </DialogRoot >
-            {otpSuccess && (<Changepassword
-                onClose={() => {
-                    setOtpSuccess(false);
-                    onClose()
-                }}
-                isOpen={otpSuccess}
-            />)}
-            <Toaster />
-        </>
+                            Resend OTP
+                        </Text>
+                    </Box>
+
+                </DialogBody>
+                <DialogFooter display="flex" justifyContent="center" mt={2} p={2}
+                >
+                    <Button w="100%" bg="#02A0A0" color={"#fff"}>
+                        Save
+                    </Button>
+                </DialogFooter>
+
+                {/* <DialogCloseTrigger color="black" /> */}
+            </DialogContent>
+        </DialogRoot >
+
    )
 }

--- a/src/Pages/Profile/EnterPassword.tsx
+++ b/src/Pages/Profile/EnterPassword.tsx
@@ -1,127 +1,53 @@

-import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../components/ui/dialog"
-import { Field, Input, Stack, Text } from "@chakra-ui/react"
-import { useForm } from "react-hook-form";
+import { DialogBody, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../components/ui/dialog"
+import { Field, Input, Stack } from "@chakra-ui/react"
 import { Button } from "../../components/ui/button";
 import EnterOTP from "./EnterOTP";
-import { useProfilePasswordMutation } from "../../Redux/Service/profile.password";
-import { useState } from "react";
-import { Toaster, toaster } from "../../components/ui/toaster";
-
-type FormData = {
-    password: string;
-};
-
 function EnterPassword() {
-    const [profilePassword] = useProfilePasswordMutation();
-    const [isSuccess, setIsSuccess] = useState(false);
-    const [isDialogOpen, setIsDialogOpen] = useState(false);
-
-    const {
-        register,
-        handleSubmit,
-        formState: { errors },
-        reset,
-    } = useForm<FormData>();
-
-    const onSubmit = async (data: FormData) => {
-        if (!data.password) {
-            return
-        }
-        try {
-            await profilePassword({ password: data.password }).unwrap();
-            setIsSuccess(true);
-            reset();
-            setIsDialogOpen(false);
-            // Handle success (e.g., show a success message or redirect)
-        } catch (error: any) {
-            // Handle error (e.g., show an error message)
-            toaster.create({
-                title: error?.data.message || "Invalid password",
-                type: "error",
-            });
-            console.error("Password change failed:", error.data.message);
-            setIsSuccess(false);
-        }
-    };
    return (
-        <>

-            <DialogRoot placement="center"
-                open={isDialogOpen}
-                onOpenChange={(details) => setIsDialogOpen(details.open)}
+        <DialogRoot placement="center">
+            <DialogTrigger asChild>
+                <Button w="100%" bg="#02A0A0" color={"#fff"}>
+                    Save
+                </Button>
+
+            </DialogTrigger>
+
+            <DialogContent
+                bg={"#fff"}
+                // w={{ lg: "60%", md: "230px" }}
+                w={{ base: '90%', md: '400px' }}
+
+                // height={'80vh'}
+                // overflow={'scroll'}
+                p={2} // Reduced padding
+                bgSize={'md'}
            >
-                <DialogTrigger asChild>
-                    <Button bg="#02A0A0" size={'2xs'} color={"#fff"} px={2} >
-                        Change Password
-                    </Button>
+                <DialogHeader bg="white" pt={3} pb={2} >
+                    <DialogTitle alignSelf="center" color="black" fontSize="18px" textAlign={"center"}>ENTER PASSWORD</DialogTitle>
+                </DialogHeader>

-                </DialogTrigger>
-                <DialogContent
-                    bg={"#fff"}
-                    // w={{ lg: "60%", md: "230px" }}
-                    w={{ base: '90%', md: '400px' }}
+                <DialogBody bg="white" pt={5}>
+                    <Stack p={2} >
+                        <Field.Root>
+                            <Field.Label color="black" pt={1} fontSize="12px">Password</Field.Label>
+                            <Input color="black" pl={1} fontSize="12px" height="30px" type="password" border="1px solid grey" /></Field.Root>

-                    // height={'80vh'}
-                    // overflow={'scroll'}
-                    p={2} // Reduced padding
-                    bgSize={'md'}
+
+                    </Stack>
+                </DialogBody>
+                <DialogFooter display="flex" justifyContent="center" mt={2} p={2}
                >
-                    <DialogHeader bg="white" pt={3} pb={2} >
-                        <DialogTitle alignSelf="center" color="black" fontSize="18px" textAlign={"center"}>ENTER PASSWORD</DialogTitle>
-                    </DialogHeader>
-                    <form onSubmit={handleSubmit(onSubmit)}>
-                        <DialogBody bg="white" pt={5}>
-                            <Stack p={2} >
-                                <Field.Root>
-                                    <Field.Label color="black" pt={1} fontSize="12px">Password</Field.Label>
-                                    <Input
-                                        color="black"
-                                        pl={1}
-                                        fontSize="12px"
-                                        height="30px"
-                                        type="password"
-                                        border={errors.password ? "1px solid red" : "1px solid grey"}
-                                        {...register("password", {
-                                            required: "Password is required",
-                                            minLength: {
-                                                value: 8,
-                                                message: "Password must be at least 8 characters",
-                                            },
-                                        })}
-                                    />
-                                    {errors.password && (
-                                        <Text color="red.500" fontSize="xs" mt={1}>
-                                            {errors.password.message}
-                                        </Text>
-                                    )}
-                                </Field.Root>
-                            </Stack>
-                        </DialogBody>
-                        <DialogFooter display="flex" justifyContent="center" mt={2} p={2}
-                        >
-                            {/* <Button w="100%" bg="#02A0A0" color={"#fff"}>
+                    {/* <Button w="100%" bg="#02A0A0" color={"#fff"}>
                        Save
                    </Button> */}
-                            <Button type="submit" w="100%" bg="#02A0A0" color={"#fff"}>
-                                Submit
-                            </Button>
-                        </DialogFooter>
+                    <EnterOTP />
+                </DialogFooter>

-                        <DialogCloseTrigger color="black" />
-                    </form>
-                </DialogContent>
-            </DialogRoot >
-            {isSuccess && (<EnterOTP
-                onClose={() => {
-                    setIsSuccess(false);
-                    setIsDialogOpen(false);
-                }}
-                isOpen={isSuccess}
-            />)
-            }
-            <Toaster />
-        </>
+                {/* <DialogCloseTrigger color="black" /> */}
+            </DialogContent>
+        </DialogRoot >

    )
 }
--- a/src/Pages/Profile/Profile.tsx
+++ b/src/Pages/Profile/Profile.tsx
@@ -1,68 +1,56 @@
-import { Avatar, Box, HStack, Text, VStack } from "@chakra-ui/react";
+import { Avatar, Box, Field, Input, SimpleGrid, Stack, Text } from "@chakra-ui/react";
 import { FaCamera } from "react-icons/fa";
-import EditableInput from "../../components/EditableInput";
 import MainFrame from "../../components/MainFrame";
-import { Field } from "../../components/ui/field";
-// import Changepassword from "./ChangePassword";
-import EnterPassword from "./EnterPassword";
-import { useGetProfileQuery } from "../../Redux/Service/profile.password";
+import Changepassword from "./ChangePassword";

 const Profile = () => {
-  const { data } = useGetProfileQuery()
-  console.log('PROFILE DATA:', data?.data);
-
  return (
    <MainFrame >
-      <HStack alignItems={'flex-start'} justifyContent={'center'} pt={0} h={'89vh'} w={'100%'} >
+      <Stack p={5}>
+        <Box position="relative" width="fit-content"
+          display="inline-block"
+          cursor="pointer" onClick={() => alert("Avatar clicked!")}>
+          <Avatar.Root size={"2xl"} style={{ display: "inline-block", width: "auto" }}>
+            <Avatar.Fallback />
+            <Avatar.Image src="https://bit.ly/sage-adebayo" />
+          </Avatar.Root>
+          <Box
+            position="absolute"
+            bottom="-2px"
+            left={"39px"}
+            p="2px"
+          >
+            <FaCamera color="black" size={16} />
+          </Box>
+        </Box>
+        <Text color={"black"} fontWeight={"bold"}>{`Jackson Da`.slice(0, 10) + '...'}</Text>
+        <Text color="black" fontSize="12px">
+          Employee ID: <span>#1245679</span>
+        </Text>
+        <Box w={"70%"} mt={5}>
+          <SimpleGrid columns={{ base: 1, md: 2 }} columnGap={9} rowGap={4}>
+            <Field.Root>
+              <Field.Label color="black" pt={1} fontSize="12px">First Name</Field.Label>
+              <Input placeholder="Enter the First Name" color="black" border="1px solid grey" pl={1} fontSize="12px" height="30px" />
+            </Field.Root>
+            <Field.Root>
+              <Field.Label color="black" pt={1} fontSize="12px">last Name</Field.Label>
+              <Input placeholder="Enter the last Name" color="black" border="1px solid grey" pl={1} fontSize="12px" height="30px" />
+            </Field.Root>
+            <Field.Root>
+              <Field.Label color="black" pt={1} fontSize="12px" >Phone Number</Field.Label>
+              <Input placeholder="Enter the Phone Number" color="black" border="1px solid grey" pl={1} fontSize="12px" height="30px" />
+            </Field.Root>
+          </SimpleGrid>
+          <Text color={"black"} fontWeight={"bold"} fontSize={"14px"} mt={5}>Update password</Text>
+          {/* <Button bg="#02A0A0" color={"#fff"} p={4} fontSize={"12px"} mt={2}>
+            Change Password
+          </Button> */}
+          <Changepassword />

-        <VStack w={'50%'} p={3} rounded={'lg'} mb={3}>
+        </Box>

-          <HStack shadow={'md'} rounded={'lg'} justifyContent={'space-between'} alignItems={'flex-end'} w={'100%'} px={3} py={3} >
-            <VStack w={'100%'} alignItems={'flex-start'} gap={0}>
-              <Box mb={2} position="relative" width="fit-content"
-                cursor="pointer" onClick={() => alert("Avatar clicked!")}>
-                <Avatar.Root size={"2xl"} style={{ display: "inline-block", width: "auto" }}>
-                  <Avatar.Fallback />
-                  <Avatar.Image src="https://i.pinimg.com/736x/d6/cd/0f/d6cd0ffd4634b0763d3958a7325ce26e.jpg" />
-                </Avatar.Root>
-                <Box
-                  position="absolute"
-                  bottom="-2px"
-                  left={"39px"}
-                  p="2px"
-                >
-                  <FaCamera color="#ccc" size={16} />
-                </Box>
-              </Box>
-              <Text color={"black"} as={'span'} fontSize={'sm'} fontWeight={"bold"}>{`${data?.data?.first_name.charAt(0).toUpperCase()}${data?.data.first_name.slice(1)}`}
-              </Text>
-              {/* <Text color="black" as={'span'} fontSize={'xs'}>
-                Employee ID: <span>#1245679</span>
-              </Text> */}
-            </VStack>
-
-            <EnterPassword />
-            {/* <Changepassword /> */}
-          </HStack>
-
-
-          <VStack w={"100%"} >
-            <Field mt={4} label="First Name" fontSize="xs" required>
-              <EditableInput value={`${data?.data.first_name}`} placeholder="Enter first name" isDisabled />
-            </Field>
-
-            <Field mt={4} label="Last Name" fontSize="xs" required>
-              <EditableInput value={`${data?.data.last_name}`} placeholder="Enter last name" isDisabled />
-            </Field>
-
-            <Field mt={4} label="Mobile Number" fontSize="xs" required>
-              <EditableInput value={`${data?.data.phone_number}`} placeholder="Mobile Number" type='number' isDisabled />
-            </Field>
-
-          </VStack>
-        </VStack>
-
-      </HStack>
+      </Stack>

    </MainFrame >
  )
--- a/src/Pages/SetNewPassword.tsx
+++ b/src/Pages/SetNewPassword.tsx
@@ -1,197 +0,0 @@
-import {
-  Box,
-  Center,
-  HStack,
-  IconButton,
-  Image,
-  Input,
-  Stack,
-  Text,
-  VStack,
-} from "@chakra-ui/react";
-import axios from "axios";
-import { useState } from "react";
-import { useNavigate } from "react-router-dom";
-import logo from "../assets/logo.svg";
-import { Button } from "../components/ui/button";
-import { toaster, Toaster } from "../components/ui/toaster";
-import { InputGroup } from "../components/ui/input-group";
-import { LuEye, LuEyeOff } from "react-icons/lu";
-
-const SetNewPassword = () => {
-  const [password, setPassword] = useState("");
-  const [confirmPassword, setConfirmPassword] = useState("");
-  const [isLoading, setIsLoading] = useState(false);
-  const navigate = useNavigate();
-  const queryParams = new URLSearchParams(window.location.search);
-  const id = queryParams.get("id");
-  const [showOldPassword, setShowOldPassword] = useState(false);
-  const [showNewPassword, setShowNewPassword] = useState(false);
-
-  const handlePasswordSubmit = async () => {
-    // Validation
-    if (password.length < 8) {
-      toaster.create({
-        title: "Password must be at least 8 characters long",
-        type: "error",
-      });
-      return;
-    }
-
-    if (password !== confirmPassword) {
-      toaster.create({
-        title: "Passwords do not match",
-        type: "error",
-      });
-      return;
-    }
-
-    setIsLoading(true);
-
-    try {
-      const res = await axios.post(
-        `${import.meta.env.VITE_API_URL}/update-password`,
-        {
-          password: password,
-          confirm_password: confirmPassword,
-          id: Number(id),
-        }
-      );
-
-      if (res.data.status === "success") {
-        toaster.create({
-          title: "Password updated successfully",
-          type: "success",
-        });
-        navigate("/login"); // Redirect to login page
-      } else {
-        toaster.create({
-          title: res.data.message || "Failed to update password",
-          type: "error",
-        });
-      }
-    } catch (error: any) {
-      toaster.create({
-        title: error.response?.data?.message || "Something went wrong",
-        type: "error",
-      });
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  return (
-    <VStack w="100%" h="100vh" bg="#ffffff">
-      <HStack
-        boxShadow="rgba(99, 99, 99, 0.2) 0px 2px 8px 0px"
-        w="100%"
-        ps={8}
-        h="7%"
-        justifyContent="flex-start"
-      >
-        <Image w={50} src={logo} />
-      </HStack>
-
-      <Center w="100%" h="93%" p={8}>
-        <Box p={8} borderWidth={1} borderRadius="lg" boxShadow="lg" w={"400px"}>
-          <Text
-            fontSize="20px"
-            fontWeight="bold"  
-            color="#313039"
-            marginBottom={"20px"}
-          >
-            Create a Password
-          </Text>
-
-          <Stack>
-            <Box mb={3}>
-              <Text color="black" fontSize="12px" mb={2}>
-                New password
-              </Text>
-              <InputGroup
-                width={"100%"}
-                endElement={
-                  <IconButton
-                    aria-label={
-                      showOldPassword ? "Hide password" : "Show password"
-                    }
-                    size="sm"
-                    onClick={() => setShowOldPassword(!showOldPassword)}
-                    //   _hover={{ bg: "transparent" }}
-                    bg={"transparent"}
-                    color={"#000"}
-                    height={"fit-content"}
-                    mr={2}
-                  >
-                    {showOldPassword ? <LuEye /> : <LuEyeOff />}
-                  </IconButton>
-                }
-              >
-                <Input
-                  color="black"
-                  pl={1}
-                  fontSize="12px"
-                  type={showOldPassword ? "password" : "text"}
-                  border="1px solid grey"
-                  value={password}
-                  onChange={(e) => setPassword(e.target.value)}
-                  size={"sm"}
-                />
-              </InputGroup>
-            </Box>
-
-            <Box>
-              <Text color="black" mb={2} fontSize="12px">
-                Confirm password
-              </Text>
-              <InputGroup
-                width={"100%"}
-                endElement={
-                  <IconButton
-                    aria-label={
-                      showNewPassword ? "Hide password" : "Show password"
-                    }
-                    size="sm"
-                    // variant="outline"
-                    onClick={() => setShowNewPassword(!showNewPassword)}
-                    bg={"transparent"}
-                    color={"#000"}
-                    mr={2}
-                  >
-                    {showNewPassword ? <LuEye /> : <LuEyeOff />}
-                  </IconButton>
-                }
-              >
-                <Input
-                  color="black"
-                  pl={1}
-                  fontSize="12px"
-                  type={showNewPassword ? "password" : "text"}
-                  border="1px solid grey"
-                  value={confirmPassword}
-                  onChange={(e) => setConfirmPassword(e.target.value)}
-                  size={"sm"}
-                />
-              </InputGroup>
-            </Box>
-          </Stack>
-
-          <Button
-            loading={isLoading}
-            mt={6}
-            w="100%"
-            bg="#02A0A0"
-            color="white"
-            onClick={handlePasswordSubmit}
-          >
-            Confirm Password
-          </Button>
-        </Box>
-      </Center>
-
-      <Toaster />
-    </VStack>
-  );
-};
-
-export default SetNewPassword;
--- a/src/Pages/SubAdmin/AddModel.tsx
+++ b/src/Pages/SubAdmin/AddModel.tsx
@@ -1,233 +1,80 @@
-import { Button } from "../../components/ui/button";
-import {
-  DialogBody,
-  DialogCloseTrigger,
-  DialogContent,
-  DialogFooter,
-  DialogHeader,
-  DialogRoot,
-  DialogTitle,
-  DialogTrigger,
-} from "../../components/ui/dialog";
-import { Field, Grid, Heading, Input, Stack, Text } from "@chakra-ui/react";
-import { IoMdAdd } from "react-icons/io";
-import { Checkbox } from "../../components/ui/checkbox";
-import { useCreateSubAdminPostMutation } from "../../Redux/Service/manage.subadmin.service";
-import { toaster } from "../../components/ui/toaster";
-import { useState } from "react";
+import { Button } from "../../components/ui/button"
+import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../components/ui/dialog"
+import { Field, Grid, Heading, Input, Stack, Text } from "@chakra-ui/react"
+import { IoMdAdd } from "react-icons/io"
+import { Checkbox } from "../../components/ui/checkbox"

-function AddModel({ refetch }: { refetch: VoidFunction }) {
-  const [createSubAdminPost] = useCreateSubAdminPostMutation();
+function AddModel() {
+    return (

-  // State fields
-  const [firstName, setFirstName] = useState("");
-  const [lastName, setLastName] = useState("");
-  const [userName, setUserName] = useState("");
-  const [dateOfBirth, setDateOfBirth] = useState("");
-  const [gender, setGender] = useState("");
-  const [ setIsOpen] = useState(false);
+        <DialogRoot placement="center">
+            <DialogTrigger asChild>
+                {/* <Button bg={"transparent"} size="sm">
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
+                </Button> */}
+                <Button rounded={'md'} px={4} py={2} size={"xs"} bg={"#02A0A0"}><IoMdAdd /> Add</Button>

-  const handleSubmit = async () => {
-    if (
-      !firstName.trim() ||
-      !lastName.trim() ||
-      !userName.trim() ||
-      !dateOfBirth.trim() ||
-      !gender.trim()
-    ) {
-      toaster.create({
-        title: "Error",
-        description: "Please fill in all required fields",
-        type: "error",
-      });
-      return;
-    }
+            </DialogTrigger>

-    const payload = {
-      principal_type_xid: 4,
-      principal_source_xid: 1,
-      user_name: userName,
-      first_name: firstName,
-      last_name: lastName,
-      date_of_birth: dateOfBirth,
-      gender: gender,
-      email_address: "example@yopmail.com", // Hardcoded
-      phone_number: "9876543210", // Hardcoded
-      created_by: 1,
-    };
+            <DialogContent
+                bg={"#fff"}
+                // w={{ lg: "60%", md: "230px" }}
+                w={{ base: '90%', md: '400px' }}
+                height={'80vh'}
+                overflow={'scroll'}
+                overflowX="hidden" 
+                p={3} // Reduced padding
+                bgSize={'md'}
+            >
+                <DialogHeader bg="white"  >
+                    <DialogTitle alignSelf="center" color="black" fontSize="14px"
+                    >Add Sub Admin Account</DialogTitle>
+                </DialogHeader>

-    try {
-      const response = await createSubAdminPost(payload).unwrap();
-      if (response) {
-        toaster.create({
-          title: "Success",
-          description: "Sub-admin created successfully",
-          type: "success",
-        });
-        refetch();
-        setIsOpen(false);
-        setFirstName("");
-        setLastName("");
-        setUserName("");
-        setDateOfBirth("");
-        setGender("");
-      }
-    } catch (error) {
-      console.error("Error creating sub-admin:", error);
-      toaster.create({
-        title: "Error",
-        description: "Failed to create sub-admin",
-        type: "error",
-      });
-    }
-  };
+                <DialogBody bg="white">
+                    <Stack py={3} >

-  return (
-    <DialogRoot placement="center">
-      <DialogTrigger asChild>
-        <Button rounded={"md"} px={4} py={2} size={"xs"} bg={"#02A0A0"}>
-          <IoMdAdd /> Add
-        </Button>
-      </DialogTrigger>
+                        <Field.Root>
+                            <Field.Label color="black" pt={1} fontSize="12px">First Name</Field.Label>
+                            <Input placeholder="Enter the First Name" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />

-      <DialogContent
-        bg={"#fff"}
-        w={{ base: "90%", md: "400px" }}
-        height={"80vh"}
-        overflow={"scroll"}
-        overflowX="hidden"
-        p={3}
-        bgSize={"md"}
-      >
-        <DialogHeader bg="white">
-          <DialogTitle alignSelf="center" color="black" fontSize="14px">
-            Add Sub Admin Account
-          </DialogTitle>
-        </DialogHeader>
+                            <Field.Label color="black" pt={1} fontSize="12px">Last Name</Field.Label>
+                            <Input placeholder="Enter the Last Name" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />

-        <DialogBody bg="white">
-          <Stack py={3}>
-            <Field.Root>
-              <Field.Label color="black" pt={1} fontSize="12px">
-                First Name
-              </Field.Label>
-              <Input
-                placeholder="Enter the First Name"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={1}
-                fontSize="12px"
-                height="30px"
-                value={firstName}
-                onChange={(e) => setFirstName(e.target.value)}
-              />
+                            <Field.Label color="black" pt={1} fontSize="12px">DOB</Field.Label>
+                            <Input placeholder="Enter the DOB" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />

-              <Field.Label color="black" pt={1} fontSize="12px">
-                Last Name
-              </Field.Label>
-              <Input
-                placeholder="Enter the Last Name"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={1}
-                fontSize="12px"
-                height="30px"
-                value={lastName}
-                onChange={(e) => setLastName(e.target.value)}
-              />
+                            <Field.Label color="black" pt={1} fontSize="12px">Gender</Field.Label>
+                            <Input placeholder="Enter the Gender" bgColor="#EEEEEE" color="black" border="none" pl={1} fontSize="12px" height="30px" />
+                            <Heading mt={5} color={'#000'} fontSize={'sm'}>Permissions</Heading>
+                        </Field.Root>
+                        <Grid templateColumns="repeat(2, 1fr)" gap={4}>
+                            <Checkbox size={'sm'} color={"black"} ><Text fontSize={12}>Dashboard</Text></Checkbox>
+                            <Checkbox size={'sm'} color={"black"} ><Text fontSize={12}>Manage contact us</Text></Checkbox>
+                            <Checkbox size={'sm'} color={"black"} ><Text fontSize={12}>manage User</Text></Checkbox>
+                            <Checkbox size={'sm'} color={"black"} ><Text fontSize={12}>Manage CMS</Text></Checkbox>
+                            <Checkbox size={'sm'} color={"black"} ><Text fontSize={12}>Manage Post</Text></Checkbox>
+                            <Checkbox size={'sm'} color={"black"} ><Text fontSize={12}>Manage Reports</Text></Checkbox>
+                            <Checkbox size={'sm'} color={"black"} ><Text fontSize={12}>manage Sub-Admin</Text></Checkbox>
+                            <Checkbox size={'sm'} color={"black"} ><Text fontSize={12}>My profile</Text></Checkbox>
+                            <Checkbox size={'sm'} color={"black"} ><Text fontSize={12}>Manage Jobs</Text> </Checkbox>
+                            <Checkbox size={'sm'} color={"black"} ><Text fontSize={12}> manage feedbacks</Text></Checkbox>
+                            <Checkbox size={'sm'} color={"black"} ><Text fontSize={12}>Manage community</Text> </Checkbox>
+                            <Checkbox size={'sm'} color={"black"} ><Text fontSize={12}> Notification</Text></Checkbox>
+                        </Grid>
+                    </Stack>
+                </DialogBody>
+                <DialogFooter display="flex" justifyContent="center" pt={"2"}>
+                    <Button size={'xs'} w="100%" bg="#02A0A0" color={"#fff"}>
+                        Save
+                    </Button>
+                </DialogFooter>

-              <Field.Label color="black" pt={1} fontSize="12px">
-                Username
-              </Field.Label>
-              <Input
-                placeholder="Enter the Username"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={1}
-                fontSize="12px"
-                height="30px"
-                value={userName}
-                onChange={(e) => setUserName(e.target.value)}
-              />
+                <DialogCloseTrigger color="black" />
+            </DialogContent>
+        </DialogRoot >

-              <Field.Label color="black" pt={1} fontSize="12px">
-                DOB
-              </Field.Label>
-              <Input
-                placeholder="Enter the DOB"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={1}
-                fontSize="12px"
-                height="30px"
-                type="date"
-                value={dateOfBirth}
-                onChange={(e) => setDateOfBirth(e.target.value)}
-              />
-
-              <Field.Label color="black" pt={1} fontSize="12px">
-                Gender
-              </Field.Label>
-              <Input
-                placeholder="Enter the Gender"
-                bgColor="#EEEEEE"
-                color="black"
-                border="none"
-                pl={1}
-                fontSize="12px"
-                height="30px"
-                value={gender}
-                onChange={(e) => setGender(e.target.value)}
-              />
-
-              <Heading mt={5} color={"#000"} fontSize={"sm"}>
-                Permissions
-              </Heading>
-            </Field.Root>
-
-            <Grid templateColumns="repeat(2, 1fr)" gap={4}>
-              {[
-                "Dashboard",
-                "Manage contact us",
-                "manage User",
-                "Manage CMS",
-                "Manage Post",
-                "Manage Reports",
-                "manage Sub-Admin",
-                "My profile",
-                "Manage Jobs",
-                "manage feedbacks",
-                "Manage community",
-                "Notification",
-              ].map((permission) => (
-                <Checkbox size="sm" color="black" key={permission}>
-                  <Text fontSize={12}>{permission}</Text>
-                </Checkbox>
-              ))}
-            </Grid>
-          </Stack>
-        </DialogBody>
-
-        <DialogFooter display="flex" justifyContent="center" pt={"2"}>
-          <Button
-            size={"xs"}
-            w="100%"
-            bg="#02A0A0"
-            color={"#fff"}
-            onClick={handleSubmit}
-          >
-            Save
-          </Button>
-        </DialogFooter>
-
-        <DialogCloseTrigger color="black" />
-      </DialogContent>
-    </DialogRoot>
-  );
+    )
 }

-export default AddModel;
+export default AddModel
--- a/src/Pages/SubAdmin/SubAdmin.tsx
+++ b/src/Pages/SubAdmin/SubAdmin.tsx
@@ -3,15 +3,12 @@ import MainFrame from "../../components/MainFrame"
 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 AlertDailog from "../../components/AlertDailog"
+import { RiDeleteBin5Line } from "react-icons/ri";
 import AddModel from "./AddModel"
 import EditSubAdmin from "../../components/EditSubAdmin"
 import ViewSubAdmin from "./ViewSubAdmin"
 import Delete from "../../components/ActionIcons/Delete"
-import { useDeleteSubAdminPostMutation, useGetSubAdminQuery } from "../../Redux/Service/manage.subadmin.service"
-import { useEffect, useState } from "react"
-import { toaster } from "../../components/ui/toaster"


 // table data
@@ -26,114 +23,34 @@ const tableHeadRow = [
  "Action",
 ];

-// const managepost: any[] = [
-//   ...Array.from({ length: 12 }, (_, i) => ({
-//     "Sr. No": i + 1,
-//     "Id": 12565,
-//     "First Name": "Kamlesh",
-//     "last Name": "Pandey",
-//     "DOB": "12/01/1987",
-//     "Gender": "Male",
-//     "Action": (
-//       <HStack justifyContent="center">
-
-//         <ViewSubAdmin />
-//         <EditSubAdmin />
-
-//         <AlertDailog
-//           AltertTiggerIcon={() => <Delete />}
-//           alertText="Delete Users"
-//           alertIcon={<Image src={"DeleteIcon"} h={"39px"} />}
-//           alertCaption="are you sure you want to delete ?"
-//           onConfirm={() => {
-//             console.log("User deleted:", i + 1);
-//           }}
-//         />
-//       </HStack>
-//     ),
-//   })),
-// ];
-
-const SubAdmin = () => {
-  const { data, refetch } = useGetSubAdminQuery()
-  const [localData, setLocalData] = useState<any[]>([]);
-  const [deleteModal, setDeleteModal] = useState(false)
-  const [deleteSubAdminPost] = useDeleteSubAdminPostMutation()
-
-  console.log("============================",data);
-  
-
-  useEffect(() => {
-    if (data?.data.data) {
-      setLocalData(data?.data.data);
-    }
-  }, [data]);
-
-  console.log('localData', localData);
-
- const handleDeleteFaq = async (faqId: number) => {
-    try {
-      const response = await deleteSubAdminPost(faqId).unwrap();
-      if (response.success) {
-        toaster.create({
-          title: "Success",
-          description: "FAQ deleted successfully",
-          type: "success",
-        });
-        refetch()
-        console.log("FAQ deleted successfully:", response);
-      }
-      // Optionally, refetch data or update state after deletion
-    } catch (error) {
-      console.error("Error deleting FAQ:", error);
-      toaster.create({
-        title: "Error",
-        description: "Something went wrong",
-        type: "error",
-      });
-    }
-  };
-
-  const formatDateOfBirth = (dob: string): string => {
-    return new Date(dob).toLocaleDateString("en-GB", {
-      day: "2-digit",
-      month: "2-digit",
-      year: "numeric",
-    });
-  };
-
-  const managepost = localData?.map((agency: any, index: number) => ({
-    'id': agency.id,
-    "Sr. No": index + 1,
-    "Id": agency.unique_id,
-    "First Name": agency.first_name,
-    "last Name": agency.last_name,
-    "DOB": formatDateOfBirth(agency.date_of_birth),
-    "Gender": agency.gender,
-
+const managepost: any[] = [
+  ...Array.from({ length: 12 }, (_, i) => ({
+    "Sr. No": i + 1,
+    "Id": 12565,
+    "First Name": "Kamlesh",
+    "last Name": "Pandey",
+    "DOB": "12/01/1987",
+    "Gender": "Male",
    "Action": (
      <HStack justifyContent="center">
-        {/* <EditDetails rowData={{ id: agency.id, question: agency.question, answer: agency.answer }} refetch={refetch} /> */}
-        <ViewSubAdmin id={agency.id}/>
-        <EditSubAdmin id={agency.id} refetch={refetch} />
+
+        <ViewSubAdmin />
+        <EditSubAdmin />

        <AlertDailog
-          isOpen={deleteModal}
-          AltertTiggerIcon={() => <Delete onClick={() => setDeleteModal(prev => !prev)} />}
-          alertText="Delete FAQ"
+          AltertTiggerIcon={() => <Delete />} 
+          alertText="Delete Users"
          alertIcon={<Image src={"DeleteIcon"} h={"39px"} />}
          alertCaption="are you sure you want to delete ?"
-          onClose={() => setDeleteModal(false)}
          onConfirm={() => {
-            // console.log("User deleted:", index + 1);
-            setDeleteModal(false);
-            handleDeleteFaq(agency.id)
+            console.log("User deleted:", i + 1);
          }}
        />
      </HStack>
    ),
-  }));
-
+  })),
+];
+const SubAdmin = () => {
  return (

    <MainFrame >
@@ -150,7 +67,7 @@ const SubAdmin = () => {
          </Text>

          <HStack>
-            <InputGroup
+            <InputGroup 
              startElement={
                <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
              }
@@ -178,8 +95,6 @@ const SubAdmin = () => {
          sortableColumns={["Name", "Registration Date "]}
          tableHeadRow={tableHeadRow}
          data={managepost}
-        // paginationData={data?.data}
-        // refetch={refetch}
        />
      </Box>    </MainFrame>
  )
--- a/src/Pages/SubAdmin/ViewSubAdmin.tsx
+++ b/src/Pages/SubAdmin/ViewSubAdmin.tsx
@@ -1,4 +1,4 @@
-// import { Button } from "../../components/ui/button";
+import { Button } from "../../components/ui/button";
 import {
  DialogBody,
  DialogCloseTrigger,
@@ -13,203 +13,169 @@ import {
  Field,
  Grid,
  Heading,
+  Icon,
  Input,
  Stack,
  Text,
 } from "@chakra-ui/react";
 import { Checkbox } from "../../components/ui/checkbox";
-// import { MdOutlineRemoveRedEye } from "react-icons/md";
-// import { FaRegEdit } from "react-icons/fa";
+import { MdOutlineRemoveRedEye } from "react-icons/md";
+import { FaRegEdit } from "react-icons/fa";
 import View from "../../components/ActionIcons/View";
-import { Button } from "../../components/ui/button";
-import { useLazyViewSubAdminQuery } from "../../Redux/Service/manage.subadmin.service";
-
-function ViewSubAdmin({ id }: { id: number }) {
-  const [trigger, { data }] = useLazyViewSubAdminQuery();
-
-  const handleView = () => {
-    trigger(id)
-  }
- 
-  const viewSubAdmin = data?.data
-
-  const formatDateOfBirth = (dob: string): string => {
-    return new Date(dob).toLocaleDateString("en-GB", {
-      day: "2-digit",
-      month: "2-digit",
-      year: "numeric",
-    });
-  };
-
-  console.log('data', data?.data);
+function ViewSubAdmin() {
  return (
    <DialogRoot placement="center">
      <DialogTrigger asChild>
-        <Button
-          onClick={handleView}
-          bg={'transparent'}
-          color={"black"}
-        >
-          <View />
-        </Button>
+        <View />
      </DialogTrigger>

-      {viewSubAdmin?.map((data: any) => (
-        <DialogContent
-          bg={"#fff"}
-          // w={{ lg: "60%", md: "230px" }}
-          w={{ base: "90%", md: "400px" }}
-          height={"80vh"}
-          overflow={"scroll"}
-          overflowX="hidden"
-          p={3} // Reduced padding
-          bgSize={"md"}
-        >
-          <DialogHeader bg="white">
-            <DialogTitle alignSelf="center" color="black" fontSize="14px">
-              View Sub Admin Account
-            </DialogTitle>
-          </DialogHeader>
+      <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">
+            View Sub Admin Account
+          </DialogTitle>
+        </DialogHeader>

-          <DialogBody bg="white">
-            <Stack py={3}>
-              <Field.Root>
-                <Field.Label color="black" pt={1} fontSize="12px">
-                  First Name
-                </Field.Label>
-                <Input
-                  value={data.first_name}
-                  bgColor="#EEEEEE"
-                  color="black"
-                  border="none"
-                  pl={1}
-                  fontSize="12px"
-                  height="30px"
-                  readOnly
-                />
+        <DialogBody bg="white">
+          <Stack py={3}>
+            <Field.Root>
+              <Field.Label color="black" pt={1} fontSize="12px">
+                First Name
+              </Field.Label>
+              <Input
+                value="Priyanka"
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
+                readOnly
+              />

-                <Field.Label color="black" pt={1} fontSize="12px">
-                  Last Name
-                </Field.Label>
-                <Input
-                  value={data.last_name}
-                  bgColor="#EEEEEE"
-                  color="black"
-                  border="none"
-                  pl={1}
-                  fontSize="12px"
-                  height="30px"
-                  readOnly
-                />
+              <Field.Label color="black" pt={1} fontSize="12px">
+                Last Name
+              </Field.Label>
+              <Input
+                value="Joshi"
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
+                readOnly
+              />

-                <Field.Label color="black" pt={1} fontSize="12px">
-                  ID
-                </Field.Label>
-                <Input
-                  value={data.unique_id}
-                  bgColor="#EEEEEE"
-                  color="black"
-                  border="none"
-                  pl={1}
-                  fontSize="12px"
-                  height="30px"
-                  readOnly
-                />
+              <Field.Label color="black" pt={1} fontSize="12px">
+                ID
+              </Field.Label>
+              <Input
+                value="ID"
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
+                readOnly
+              />

-                <Field.Label color="black" pt={1} fontSize="12px">
-                  DOB
-                </Field.Label>
-                <Input
-                  value={formatDateOfBirth(data.date_of_birth)}
-                  bgColor="#EEEEEE"
-                  color="black"
-                  border="none"
-                  pl={1}
-                  fontSize="12px"
-                  height="30px"
-                  readOnly
-                />
+              <Field.Label color="black" pt={1} fontSize="12px">
+                DOB
+              </Field.Label>
+              <Input
+                value="11/02/1989"
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
+                readOnly
+              />

-                <Field.Label color="black" pt={1} fontSize="12px">
-                  Gender
-                </Field.Label>
-                <Input
-                  value={data.gender}
-                  bgColor="#EEEEEE"
-                  color="black"
-                  border="none"
-                  pl={1}
-                  fontSize="12px"
-                  height="30px"
-                  readOnly
-                />
-                <Heading mt={5} color={"#000"} fontSize={"sm"}>
-                  Permissions
-                </Heading>
-              </Field.Root>
-              <Grid templateColumns="repeat(2, 1fr)" gap={4}>
-                {data.get_resource_action_link.map((check: any) => (
-                  <Checkbox size={"sm"} color={"black"} checked={check.is_active}>
-                    <Text fontSize={12}>{check.app_resource_xid}</Text>
-                  </Checkbox>
-                  // <>
-                  //   <Checkbox size={"sm"} color={"black"}>
-                  //     <Text fontSize={12}>Dashboard</Text>
-                  //   </Checkbox>
-                  //   <Checkbox size={"sm"} color={"black"}>
-                  //     {" "}
-                  //     <Text fontSize={12}>Manage contact us</Text>
-                  //   </Checkbox>
-                  //   <Checkbox size={"sm"} color={"black"}>
-                  //     {" "}
-                  //     <Text fontSize={12}>manage User</Text>
-                  //   </Checkbox>
-                  //   <Checkbox size={"sm"} color={"black"}>
-                  //     {" "}
-                  //     <Text fontSize={12}>Manage CMS</Text>
-                  //   </Checkbox>
-                  //   <Checkbox size={"sm"} color={"black"}>
-                  //     {" "}
-                  //     <Text fontSize={12}>Manage Post</Text>
-                  //   </Checkbox>
-                  //   <Checkbox size={"sm"} color={"black"}>
-                  //     {" "}
-                  //     <Text fontSize={12}>Manage Reports</Text>
-                  //   </Checkbox>
-                  //   <Checkbox size={"sm"} color={"black"}>
-                  //     {" "}
-                  //     <Text fontSize={12}>manage Sub-Admin</Text>
-                  //   </Checkbox>
-                  //   <Checkbox size={"sm"} color={"black"}>
-                  //     {" "}
-                  //     <Text fontSize={12}>My profile</Text>
-                  //   </Checkbox>
-                  //   <Checkbox size={"sm"} color={"black"}>
-                  //     <Text fontSize={12}>Manage Jobs</Text>{" "}
-                  //   </Checkbox>
-                  //   <Checkbox size={"sm"} color={"black"}>
-                  //     <Text fontSize={12}> manage feedbacks</Text>
-                  //   </Checkbox>
-                  //   <Checkbox size={"sm"} color={"black"}>
-                  //     <Text fontSize={12}>Manage community</Text>{" "}
-                  //   </Checkbox>
-                  //   <Checkbox size={"sm"} color={"black"}>
-                  //     <Text fontSize={12}> Notification</Text>
-                  //   </Checkbox>
-                  // </>
-                ))}
-              </Grid>
-            </Stack>
-          </DialogBody>
-          <DialogFooter display="flex" justifyContent="center" pt={"2"}>
-            {/* <Button w="100%" bg="#02A0A0" color={"#fff"}>
+              <Field.Label color="black" pt={1} fontSize="12px">
+                Gender
+              </Field.Label>
+              <Input
+                value="Male"
+                bgColor="#EEEEEE"
+                color="black"
+                border="none"
+                pl={1}
+                fontSize="12px"
+                height="30px"
+                readOnly
+              />
+              <Heading mt={5} color={"#000"} fontSize={"sm"}>
+                Permissions
+              </Heading>
+            </Field.Root>
+            <Grid templateColumns="repeat(2, 1fr)" gap={4}>
+              <Checkbox size={"sm"} color={"black"}>
+                <Text fontSize={12}>Dashboard</Text>
+              </Checkbox>
+              <Checkbox size={"sm"} color={"black"}>
+                {" "}
+                <Text fontSize={12}>Manage contact us</Text>
+              </Checkbox>
+              <Checkbox size={"sm"} color={"black"}>
+                {" "}
+                <Text fontSize={12}>manage User</Text>
+              </Checkbox>
+              <Checkbox size={"sm"} color={"black"}>
+                {" "}
+                <Text fontSize={12}>Manage CMS</Text>
+              </Checkbox>
+              <Checkbox size={"sm"} color={"black"}>
+                {" "}
+                <Text fontSize={12}>Manage Post</Text>
+              </Checkbox>
+              <Checkbox size={"sm"} color={"black"}>
+                {" "}
+                <Text fontSize={12}>Manage Reports</Text>
+              </Checkbox>
+              <Checkbox size={"sm"} color={"black"}>
+                {" "}
+                <Text fontSize={12}>manage Sub-Admin</Text>
+              </Checkbox>
+              <Checkbox size={"sm"} color={"black"}>
+                {" "}
+                <Text fontSize={12}>My profile</Text>
+              </Checkbox>
+              <Checkbox size={"sm"} color={"black"}>
+                <Text fontSize={12}>Manage Jobs</Text>{" "}
+              </Checkbox>
+              <Checkbox size={"sm"} color={"black"}>
+                <Text fontSize={12}> manage feedbacks</Text>
+              </Checkbox>
+              <Checkbox size={"sm"} color={"black"}>
+                <Text fontSize={12}>Manage community</Text>{" "}
+              </Checkbox>
+              <Checkbox size={"sm"} color={"black"}>
+                <Text fontSize={12}> Notification</Text>
+              </Checkbox>
+            </Grid>
+          </Stack>
+        </DialogBody>
+        <DialogFooter display="flex" justifyContent="center" pt={"2"}>
+          {/* <Button w="100%" bg="#02A0A0" color={"#fff"}>
                        Save
                    </Button> */}
-          </DialogFooter>
+        </DialogFooter>

-          <DialogCloseTrigger color="black" />
-        </DialogContent>
-      ))}
+        <DialogCloseTrigger color="black" />
+      </DialogContent>
    </DialogRoot>
  );
 }
--- a/src/Pages/VerifyEnterOTP.tsx
+++ b/src/Pages/VerifyEnterOTP.tsx
@@ -1,219 +0,0 @@
-import {
-    Box,
-    Center,
-    HStack,
-    Image,
-    Input,
-    Text,
-    VStack,
-} from "@chakra-ui/react";
-import axios from "axios";
-import { useEffect, useState } from "react";
-import { useNavigate, useLocation } from "react-router-dom";
-import logo from "../assets/logo.svg";
-import { Button } from "../components/ui/button";
-import { toaster, Toaster } from "../components/ui/toaster";
-
-const VerifyOTP = () => {
-    const [otp, setOtp] = useState<string[]>(["", "", "", ""]);
-    const [isLoading, setIsLoading] = useState(false);
-    const [timer, setTimer] = useState(60);
-    const [isResendDisabled, setIsResendDisabled] = useState(true);
-    const navigate = useNavigate();
-    const location = useLocation();
-    const queryParams = new URLSearchParams(location.search);
-    const phoneNumber = queryParams.get("phone");
-
-    useEffect(() => {
-        let interval: NodeJS.Timeout;
-
-        if (timer > 0 && isResendDisabled) {
-            interval = setInterval(() => {
-                setTimer((prevTimer) => prevTimer - 1);
-            }, 1000);
-        } else if (timer === 0) {
-            setIsResendDisabled(false);
-        }
-
-        return () => clearInterval(interval);
-    }, [timer, isResendDisabled]);
-
-
-    const handleResendOTP = async () => {
-        setIsResendDisabled(true);
-        setTimer(60); // Reset timer to 1 minute
-
-        try {
-            const res = await axios.post(`${import.meta.env.VITE_API_URL}/send-otp`, {
-                mobile_number: phoneNumber,
-            });
-
-            if (res.status === 200) {
-                toaster.create({
-                    title: "OTP resent successfully",
-                    type: "success",
-                });
-            } else {
-                toaster.create({
-                    title: res.data.message || "Failed to resend OTP",
-                    type: "error",
-                });
-                setIsResendDisabled(false); // Enable button if failed
-            }
-        } catch (error: any) {
-            toaster.create({
-                title: error.response?.data?.message || "Failed to resend OTP",
-                type: "error",
-            });
-            setIsResendDisabled(false); // Enable button if error
-        }
-    };
-
-    const handleChange = (e: React.ChangeEvent<HTMLInputElement>, index: number): void => {
-        const value = e.target.value;
-
-        // Prevent non-numeric input
-        if (/[^0-9]/.test(value)) return;
-
-        // Update the OTP state with the new value
-        const newOtp = [...otp];
-        newOtp[index] = value;
-        setOtp(newOtp);
-
-        // Move focus to the next input automatically
-        if (value && index < otp.length - 1) {
-            const nextInput = document.getElementById(`otp-input-${index + 1}`) as HTMLInputElement;
-            if (nextInput) nextInput.focus();
-        }
-    };
-
-    const handleOtpSubmit = async () => {
-        if (otp.length !== 4) {
-            toaster.create({
-                title: "OTP must be 4 digits",
-                type: "error",
-            });
-            return;
-        }
-
-        const fullOtp = otp.join('');
-
-        setIsLoading(true);
-        try {
-            const res = await axios.post(`${import.meta.env.VITE_API_URL}/verify-otp`, {
-                mobile_number: phoneNumber,
-                otp: fullOtp,
-            });
-
-            if (res.status === 200) {
-                toaster.create({
-                    title: "OTP Verified Successfully",
-                    type: "success",
-                });
-                const userid = res.data.data.id;
-                navigate(`/forgot-password/reset-password?id=${userid}`);
-            } else {
-                toaster.create({
-                    title: res.data.message || "Invalid OTP",
-                    type: "error",
-                });
-            }
-        } catch (error: any) {
-            toaster.create({
-                title: error.response?.data?.message || "Something went wrong",
-                type: "error",
-            });
-        } finally {
-            setIsLoading(false);
-        }
-    };
-
-    return (
-        <VStack w="100%" h="100vh" bg="#ffffff">
-            <HStack
-                boxShadow="rgba(99, 99, 99, 0.2) 0px 2px 8px 0px"
-                w="100%"
-                ps={8}
-                h="7%"
-                justifyContent="flex-start"
-            >
-                <Image w={50} src={logo} />
-            </HStack>
-
-            <Center w="100%" h="93%" p={8}>
-                <Box p={8} borderWidth={1} borderRadius="lg" boxShadow="lg">
-                    <Text fontSize="24px" fontWeight="bold" color="#313039" textAlign="center">
-                        Enter OTP
-                    </Text>
-
-                    <Text fontSize="14px" color="gray.600" textAlign="center" mt={2}>
-                        OTP sent to {phoneNumber}
-                    </Text>
-
-                    <HStack gap={4} mt={6} justify="center">
-                        {otp.map((digit, index) => (
-                            <Input
-                                key={index}
-                                id={`otp-input-${index}`}
-                                value={digit}
-                                maxW="50px"
-                                color={"black"}
-                                textAlign="center"
-                                fontSize="20px"
-                                placeholder="0"
-                                border="1px solid grey"
-                                onChange={(e) => handleChange(e, index)}
-                                maxLength={1} // Only allows 1 character per input
-                            />
-                        ))}
-                    </HStack>
-                    {/* <Box textAlign="center">
-                        <Text
-                            color="#4746F4"
-                            textDecoration="underline"
-                            fontWeight="bold"
-                            mt={3}
-                            cursor="pointer"
-                            display="inline-block"
-                            px={2}
-                        >
-                            Resend OTP
-                        </Text>
-                    </Box> */}
-                    <Box textAlign="center" mt={4}>
-                        {isResendDisabled ? (
-                            <Text color="gray.500">
-                                Resend OTP in {timer} seconds
-                            </Text>
-                        ) : (
-                            <Text
-                                color="#4746F4"
-                                textDecoration="underline"
-                                fontWeight="bold"
-                                cursor="pointer"
-                                onClick={handleResendOTP}
-                            >
-                                Resend OTP
-                            </Text>
-                        )}
-                    </Box>
-
-                    <Button
-                        loading={isLoading}
-                        mt={6}
-                        w="100%"
-                        bg="#02A0A0"
-                        color="white"
-                        onClick={handleOtpSubmit}
-                    >
-                        Verify OTP
-                    </Button>
-                </Box>
-            </Center>
-
-            <Toaster />
-        </VStack>
-    );
-};
-
-export default VerifyOTP;
--- a/src/Redux/Service/agency.master.module.service.ts
+++ b/src/Redux/Service/agency.master.module.service.ts
@@ -1,102 +0,0 @@
-import { createApi } from "@reduxjs/toolkit/query/react";
-import { baseQueryWithReauth } from "./apiSlice";
-
-export interface Agency {
-  id: number;
-  name: string;
-  state: string;
-  rc_status: string;
-  rc_number: string;
-  domain_name: string;
-  gst_number: string;
-  is_active: boolean,
-  registered_office: string,
-}
-
-export interface AgencyData {
-  current_page: number;
-  data: Agency[];
-  first_page_url: string;
-  from: number;
-  last_page: number;
-  last_page_url: string;
-  per_page: number;
-  total: number;
-}
-
-export interface AgencyResponse {
-  status: "success" | "error";
-  status_code: number;
-  message: string;
-  data: AgencyData;
-}
-
-export interface UpdatePrivacyPolicyPayload {
-  id: number,
-  is_active: boolean,
-}
-
-export interface AgencyPost {
-  raid?: string;
-  name: string;
-  auth_signatory?: string;
-  state: string;
-  district?: string;
-  rc_number: string;
-  contact_details?: string;
-  registered_office: string;
-  branch_office?: string;
-  registered_email?: string;
-  other_email?: string;
-  registered_contact?: string;
-  website?: string;
-  domain_name: string;
-  staff_domain_name?: string;
-  gst_number: string;
-  rc_status?: "Active" | "Inactive"; // Assuming it's a status with limited values
-}
-
-
-export const agencyMasterModule = createApi({
-  reducerPath: "agencyMasterModule",
-  baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
-  endpoints: (builder) => ({
-
-    createAgencyMasterPost: builder.mutation<AgencyPost, Partial<AgencyPost>>({
-      query: (data) => ({
-        url: "/agency-store",
-        method: "POST",
-        body: data,
-      }),
-    }),
-
-    getAgencyMaster: builder.query<AgencyResponse, number>({
-      query: (page = 1) => `/agency-master?page=${page}`
-    }),
-
-    agencyMasterToggle: builder.mutation({
-      query: ({ id, is_active }) => ({
-        url: `/agency-status`,
-        method: "POST",
-        body: { id, is_active },
-      }),
-    }),
-
-    updateAgencyMaster: builder.mutation({
-      query: (updatedData) => ({
-        url: "/agency-update",
-        method: "POST",
-        body: updatedData,
-      }),
-    }),
-
-  }),
-});
-
-export const {
-  useCreateAgencyMasterPostMutation,
-  useGetAgencyMasterQuery,
-  useAgencyMasterToggleMutation,
-  useUpdateAgencyMasterMutation,
-} = agencyMasterModule;
-                                                                                                                                                                     
--- a/src/Redux/Service/country.master.ts
+++ b/src/Redux/Service/country.master.ts
@@ -1,110 +0,0 @@
-import { createApi } from "@reduxjs/toolkit/query/react";
-import { baseQueryWithReauth } from "./apiSlice";
-
-export interface CountryData {
-    id: number;
-    en_name: string;
-    hi_name: string;
-    mr_name: string;
-    te_name: string;
-    ta_name: string;
-    bn_name: string;
-    or_name: string;
-    country_code: string;
-    phonecode: string;
-    capital: string;
-    currency: string;
-    currency_name: string;
-    currency_symbol: string;
-    is_active: string;
-}
-
-interface ApiResponse {
-    status: string;
-    status_code: number;
-    message: string;
-    data: {
-        current_page: number,
-        last_page: number,
-        total: number,
-        from: number,
-        per_page: number,
-        to: number,
-        data: CountryData[];
-    };
-}
-
-export interface CountryEdit {
-    status: string;
-    status_code: number;
-    message: string;
-    data: CountryData[];
-}
-
-
-export type PostCountry = {
-    en_name: string;
-    country_code: string;
-    phonecode: string;
-    capital: string;
-    currency: string;
-    currency_name: string;
-    currency_symbol: string;
-};
-
-
-export const countryMaster = createApi({
-    reducerPath: "countryMaster",
-    baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
-    endpoints: (builder) => ({
-        createCountryPost: builder.mutation<PostCountry, Partial<PostCountry>>({
-            query: (data) => ({
-                url: "/country-add",
-                method: "POST",
-                body: data,
-            }),
-        }),
-        // 🔹 GET: Fetch all posts
-        getCountryMaster: builder.query<ApiResponse, number>({
-            query: (page = 1) => `/country-list?page=${page}`,
-        }),
-
-        getCountryMasterEdit: builder.query<CountryEdit, number>({
-            query: (id) => `/country-edit/${id}`,
-        }),
-
-        updateCountry: builder.mutation({
-            query: (updatedData) => ({
-                url: "/country-update",
-                method: "POST",
-                body: updatedData,
-            }),
-        }),
-
-        countryToggle: builder.mutation({
-            query: ({ id, is_active }) => ({
-                url: `/country-status`,
-                method: "POST",
-                body: { id, is_active },
-            }),
-        }),
-
-        // deleteFaqPost: builder.mutation<{ status: string; message: string }, { id: number }>({
-        //     query: ({ id }) => ({
-        //         url: `/faq-delete`,
-        //         method: "POST",
-        //         body: { id },
-        //     }),
-        // }),
-
-    }),
-});
-
-export const {
-    useGetCountryMasterQuery,
-    useGetCountryMasterEditQuery,
-    useCreateCountryPostMutation,
-    useUpdateCountryMutation,
-    useCountryToggleMutation,
-    // useDeleteFaqPostMutation
-} = countryMaster;
--- a/src/Redux/Service/deactivated.account.service.ts
+++ b/src/Redux/Service/deactivated.account.service.ts
@@ -1,30 +1,26 @@
-import { createApi } from "@reduxjs/toolkit/query/react"; // add /react for auto-generated hooks
+import { createApi } from "@reduxjs/toolkit/query";
 import { baseQueryWithReauth } from "./apiSlice";

-interface DeactivatedData {
-  id: number;
-  email: string;
-  first_name: string;
-  created_at: string;
-}
-
-interface ApiResponse {
-  data: {
-    data: DeactivatedData[];
-  };
-}
-
 export const deactivatedAccounts = createApi({
-  reducerPath: "deactivatedAccounts",
-  baseQuery: baseQueryWithReauth,
-  tagTypes: ["Deactivated"],
-  endpoints: (builder) => ({
-    getContact: builder.query<ApiResponse, void>({
-      query: () => "/manage-user-deactivate-list",
-      providesTags: ["Deactivated"],
+    reducerPath: "deactivatedAccounts",
+    baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
+    endpoints: (builder) => ({
+  
+  
+  
+      getPosts: builder.query<Post[], void>({ query: () => "/posts" }),
+  
+  
+  
+  
+  
    }),
-  }),
-});
-
-// ✅ Export the auto-generated hook
-export const { useGetContactQuery } = deactivatedAccounts;
+  });
+  
+  export const {  } = deactivatedAccounts;
+  
+  export type Post = {
+    id: number;
+    title: string;
+    body: string;
+  };
--- a/src/Redux/Service/department.master.ts
+++ b/src/Redux/Service/department.master.ts
@@ -1,109 +0,0 @@
-import { createApi } from "@reduxjs/toolkit/query/react";
-import { baseQueryWithReauth } from "./apiSlice";
-
-export interface DepartmentData {
-    id: number;
-    industry_masters_xid: number;
-    en_name: string;
-    hi_name: string;
-    mr_name: string;
-    te_name: string;
-    ta_name: string;
-    bn_name: string;
-    or_name: string;
-    is_active: string;
-}
-
-interface ApiResponse {
-    status: string;
-    status_code: number;
-    message: string;
-    data: {
-        current_page: number,
-        last_page: number,
-        total: number,
-        from: number,
-        per_page: number,
-        to: number,
-        data: DepartmentData[];
-    };
-}
-
-export interface CountryEdit {
-    status: string;
-    status_code: number;
-    message: string;
-    data: DepartmentData[];
-}
-
-export interface DropDown{
-    status: string;
-    status_code: number;
-    message: string;
-    data: {
-        id: number;
-        en_name: string;
-    }[]
-}
-
-export type PostDepartment = {
-    en_name: string;
-    industry_masters_xid: number;
-};
-
-
-export const departmentMaster = createApi({
-    reducerPath: "departmentMaster",
-    baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
-    endpoints: (builder) => ({
-        createDepartmentPost: builder.mutation<PostDepartment, Partial<PostDepartment>>({
-            query: (data) => ({
-                url: "/department-master-store",
-                method: "POST",
-                body: data,
-            }),
-        }),
-        // 🔹 GET: Fetch all posts
-        getDepartmentMaster: builder.query<ApiResponse, number>({
-            query: (page = 1) => `/department-master-list?page=${page}`,
-        }),
-
-        getDepartmentMasterDropDown: builder.query<DropDown, void>({
-            query: () => `/industry-master-get-category`,
-        }),
-
-        updateDepartment: builder.mutation({
-            query: (updatedData) => ({
-                url: "/department-master-update",
-                method: "POST",
-                body: updatedData,
-            }),
-        }),
-
-        departmentToggle: builder.mutation({
-            query: ({ id, is_active }) => ({
-                url: `/department-master-status`,
-                method: "POST",
-                body: { id, is_active },
-            }),
-        }),
-
-        // deleteFaqPost: builder.mutation<{ status: string; message: string }, { id: number }>({
-        //     query: ({ id }) => ({
-        //         url: `/faq-delete`,
-        //         method: "POST",
-        //         body: { id },
-        //     }),
-        // }),
-
-    }),
-});
-
-export const {
-    useGetDepartmentMasterQuery,
-    useGetDepartmentMasterDropDownQuery,
-    useCreateDepartmentPostMutation,
-    useUpdateDepartmentMutation,
-    useDepartmentToggleMutation,
-    // useDeleteFaqPostMutation
-} = departmentMaster;
--- a/src/Redux/Service/faqs.service.ts
+++ b/src/Redux/Service/faqs.service.ts
@@ -1,91 +1,26 @@
-import { createApi } from "@reduxjs/toolkit/query/react";
+import { createApi } from "@reduxjs/toolkit/query";
 import { baseQueryWithReauth } from "./apiSlice";

-export interface FaqData {
-  id: number;
-  principal_type_xid: number;
-  is_active: number;
-  translations:{
-    id: string,
-    faqs_xid: number,
-    language_master_xid: number,
-    question: string,
-    answer: string,
-  }[]
-}
-
-interface ApiResponse {
-  status: string;
-  status_code: number;
-  message: string;
-  data: { 
-    current_page: number,
-    last_page: number,
-    total: number,
-    from: number,
-    per_page: number,
-    to: number,
-    data: FaqData[];
-  };
-}
-
-
-export type Post = {
-  principal_type_xid: number;
-  language_code: string;
-  question: string;
-  answer: string;
-};
-
-
 export const faqs = createApi({
-  reducerPath: "faqs",
-  baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
-  endpoints: (builder) => ({
-    createFaqPost: builder.mutation<Post, Partial<Post>>({
-      query: (data) => ({
-        url: "/faq-store",
-        method: "POST",
-        body: data,
-      }),
+    reducerPath: "faqs",
+    baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
+    endpoints: (builder) => ({
+  
+  
+  
+      getPosts: builder.query<Post[], void>({ query: () => "/posts" }),
+  
+  
+  
+  
+  
    }),
-    // 🔹 GET: Fetch all posts
-    getFaq: builder.query<ApiResponse, number>({
-      query: (page = 1) => `/faq-list?page=${page}`,
-    }),
-
-    updateFaq: builder.mutation({
-      query: (updatedData) => ({
-        url: "/faq-update",
-        method: "POST",
-        body: updatedData,
-      }),
-    }),
-
-    faqToggle: builder.mutation({
-      query: ({ id, is_active }) => ({
-        url: `/faq-status`,
-        method: "POST",
-        body: { id, is_active },
-      }),
-    }),
-     
-
-    deleteFaqPost: builder.mutation<{ status: string; message: string }, { id: number }>({
-      query: ({ id }) => ({
-        url: `/faq-delete`,
-        method: "POST",
-        body: { id },
-      }),
-    }),
-
-  }),
-});
-
-export const {
-  useGetFaqQuery,
-  useCreateFaqPostMutation,
-  useUpdateFaqMutation,
-  useFaqToggleMutation,
-  useDeleteFaqPostMutation
-} = faqs;
+  });
+  
+  export const {  } = faqs;
+  
+  export type Post = {
+    id: number;
+    title: string;
+    body: string;
+  };
--- a/src/Redux/Service/forget.password.service.ts
+++ b/src/Redux/Service/forget.password.service.ts
@@ -0,0 +1,36 @@
+import { createApi } from "@reduxjs/toolkit/query/react";
+import { baseQueryWithReauth } from "./apiSlice";
+
+export const forgetPassword = createApi({
+  reducerPath: "aboutUs",
+  baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
+  endpoints: (builder) => ({
+
+
+
+    // 🔹 GET: Fetch all posts
+    getAboutUs: builder.query<AboutUs[], void>({
+      query: () => "/send-otp",
+    }),
+
+  }),
+});
+
+export const { 
+  useGetAboutUsQuery,  
+} = forgetPassword;
+
+// Define Post type
+export type Post = {
+  id: number;
+  title: string;
+  body: string;
+};
+
+
+export type AboutUs = {
+  id: number;
+  language_master_xid: number;
+  content: string;
+  is_active: boolean;
+};
--- a/src/Redux/Service/industry.master.service.ts
+++ b/src/Redux/Service/industry.master.service.ts
@@ -1,92 +0,0 @@
-import { createApi } from "@reduxjs/toolkit/query/react";
-import { baseQueryWithReauth } from "./apiSlice";
-
-interface IndustryMasterResponse {
-    status: string;
-    status_code: number;
-    message: string;
-    data: PaginationData;
-}
-
-interface PaginationData {
-    current_page: number;
-    data: IndustryMaster[];
-    first_page_url: string;
-    from: number;
-    last_page: number;
-    last_page_url: string;
-    links: PaginationLink[];
-    next_page_url: string | null;
-    path: string;
-    per_page: number;
-    prev_page_url: string | null;
-    to: number;
-    total: number;
-}
-
-export interface IndustryMaster {
-    id: number;
-    categories_masters_xid: number,
-    is_active: boolean;
-    en_name: string;
-    hi_name: string;
-    mr_name: string,
-    te_name: string,
-    ta_name: string,
-    bn_name: string,
-    or_name: string,
-}
-
-
-interface PaginationLink {
-    url: string | null;
-    label: string;
-    active: boolean;
-}
-
-export interface Post {
-    en_name: string,
-    categories_masters_xid: number
-}
-
-export const industryMaster = createApi({
-    reducerPath: "industryMaster",
-    baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
-    endpoints: (builder) => ({
-        createIndustryMasterPost: builder.mutation<Post, Partial<Post>>({
-            query: (data) => ({
-                url: "/industry-master-store",
-                method: "POST",
-                body: data,
-            }),
-        }),
-        // 🔹 GET: Fetch all posts
-        getIndustryMaster: builder.query<IndustryMasterResponse, number>({
-            query: (page = 1) => `/industry-master-list?page=${page}`,
-        }),
-
-        updateIndustryMaster: builder.mutation({
-            query: (updatedData) => ({
-                url: "industry-master-update",
-                method: "POST",
-                body: updatedData,
-            }),
-        }),
-
-        industryMasterToggle: builder.mutation({
-            query: ({ id, is_active }) => ({
-                url: `/industry-master-status`,
-                method: "POST",
-                body: { id, is_active },
-            }),
-        }),
-
-    }),
-});
-
-export const {
-    useGetIndustryMasterQuery,
-    useCreateIndustryMasterPostMutation,
-    useUpdateIndustryMasterMutation,
-    useIndustryMasterToggleMutation,
-} = industryMaster;
--- a/src/Redux/Service/job.status.ts
+++ b/src/Redux/Service/job.status.ts
@@ -1,91 +0,0 @@
-import { createApi } from "@reduxjs/toolkit/query/react";
-import { baseQueryWithReauth } from "./apiSlice";
-
-export interface JobStatusData {
-    id: number;
-    is_active: string;
-    job_status_translation:{
-        job_status_xid: number,
-        title:string,
-        language_xid:number
-    }[],
-}
-
-interface ApiResponse {
-    status: string;
-    status_code: number;
-    message: string;
-    data: {
-        current_page: number,
-        last_page: number,
-        total: number,
-        from: number,
-        per_page: number,
-        to: number,
-        data: JobStatusData[];
-    };
-}
-
-export interface CountryEdit {
-    status: string;
-    status_code: number;
-    message: string;
-    data: JobStatusData[];
-}
-
-
-export type PostJobStatus = {
- title: string
-};
-
-
-export const jobStatus = createApi({
-    reducerPath: "jobStatus",
-    baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
-    endpoints: (builder) => ({
-        createJobStatusPost: builder.mutation<PostJobStatus, Partial<PostJobStatus>>({
-            query: (data) => ({
-                url: "/job-status-store",
-                method: "POST",
-                body: data,
-            }),
-        }),
-        // 🔹 GET: Fetch all posts
-        getJobStatus: builder.query<ApiResponse, number>({
-            query: (page = 1) => `/job-status-list?page=${page}`,
-        }),
-
-        updateJobStatus: builder.mutation({
-            query: (updatedData) => ({
-                url: "/job-status-update",
-                method: "POST",
-                body: updatedData,
-            }),
-        }),
-
-        jobStatusToggle: builder.mutation({
-            query: ({ id, is_active }) => ({
-                url: `/job-status-status`,
-                method: "POST",
-                body: { id, is_active },
-            }),
-        }),
-
-        // deleteFaqPost: builder.mutation<{ status: string; message: string }, { id: number }>({
-        //     query: ({ id }) => ({
-        //         url: `/faq-delete`,
-        //         method: "POST",
-        //         body: { id },
-        //     }),
-        // }),
-
-    }),
-});
-
-export const {
-    useGetJobStatusQuery,
-    useCreateJobStatusPostMutation,
-    useUpdateJobStatusMutation,
-    useJobStatusToggleMutation,
-    // useDeleteFaqPostMutation
-} = jobStatus;
--- a/src/Redux/Service/job.type.service.ts
+++ b/src/Redux/Service/job.type.service.ts
@@ -1,90 +0,0 @@
-import { createApi } from "@reduxjs/toolkit/query/react";
-import { baseQueryWithReauth } from "./apiSlice";
-
-interface JobTypeResponse {
-    status: string;
-    status_code: number;
-    message: string;
-    data: PaginationData;
-}
-
-interface PaginationData {
-    current_page: number;
-    data: JobTypeData[];
-    first_page_url: string;
-    from: number;
-    last_page: number;
-    last_page_url: string;
-    links: PaginationLink[];
-    next_page_url: string | null;
-    path: string;
-    per_page: number;
-    prev_page_url: string | null;
-    to: number;
-    total: number;
-}
-
-export interface JobTypeData {
-    id: number;
-    is_active: boolean;
-    en_name: string;
-    hi_name: string;
-    mr_name:string,
-    te_name:string,
-    ta_name:string,
-    bn_name:string,
-    or_name:string,
-}
-
-
-interface PaginationLink {
-    url: string | null;
-    label: string;
-    active: boolean;
-}
-
-export interface Post {
-    en_name: string
-}
-
-export const jobType = createApi({
-    reducerPath: "jobType",
-    baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
-    endpoints: (builder) => ({
-        createJobTypePost: builder.mutation<Post, Partial<Post>>({
-            query: (data) => ({
-                url: "/job-type-add",
-                method: "POST",
-                body: data,
-            }),
-        }),
-        // 🔹 GET: Fetch all posts
-        getJobType: builder.query<JobTypeResponse, number>({
-            query: (page = 1) => `/job-type?page=${page}`,
-        }),
-
-        updateJobType: builder.mutation({
-            query: (updatedData) => ({
-                url: "job-type-update",
-                method: "POST",
-                body: updatedData,
-            }),
-        }),
-
-        templateMasterToggle: builder.mutation({
-            query: ({ id, is_active }) => ({
-                url: `/template-status`,
-                method: "POST",
-                body: { id, is_active },
-            }),
-        }),
-
-    }),
-});
-
-export const {
-    useGetJobTypeQuery,
-    useCreateJobTypePostMutation,
-    useUpdateJobTypeMutation,
-    useTemplateMasterToggleMutation,
-} = jobType;
--- a/src/Redux/Service/manage.aboutus.service.ts
+++ b/src/Redux/Service/manage.aboutus.service.ts
@@ -1,6 +1,6 @@
 import { createApi } from "@reduxjs/toolkit/query/react";
 import { baseQueryWithReauth } from "./apiSlice";
-import { AboutUsResponse } from "../../Types/aboutUsType";
+
 export const aboutUs = createApi({
  reducerPath: "aboutUs",
  baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
@@ -14,6 +14,9 @@ export const aboutUs = createApi({
    }),


+
+
+
    // 🔹 GET: Fetch a single post by ID
    getPostById: builder.query<Post, number>({
      query: (id) => `/posts/${id}`,
@@ -27,22 +30,16 @@ export const aboutUs = createApi({
        body: data,
      }),
    }),
+
    // 🔹 PUT: Update an existing post
-    // updateAboutUs: builder.mutation<UpdateAboutUsResponse, UpdateAboutUsRequest>({
-    //   query: ({ id, updatedData }) => ({
-    //     url: `/posts/${id}`,
-    //     method: "POST",
-    //     body: updatedData,
-    //   }),
-    // }),
-       // 🔹 PUT: Update an About Us entry
-       updateAboutUs: builder.mutation({
-        query: (updatedData) => ({
-          url: "/about-us/update", // ✅ Updated URL
-          method: "POST",
-          body: updatedData,
-        }),
+    updateAboutUs: builder.mutation<UpdateAboutUsResponse, UpdateAboutUsRequest>({
+      query: ({ id, updatedData }) => ({
+        url: `/posts/${id}`,
+        method: "POST",
+        body: updatedData,
      }),
+    }),
+
    // 🔹 DELETE: Remove a post by ID
    deletePost: builder.mutation<{ success: boolean }, number>({
      query: (id) => ({
@@ -56,6 +53,17 @@ export const aboutUs = createApi({
 export const { 
  useGetAboutUsQuery, 
  useUpdateAboutUsMutation,
+
+
+
+
+
+
+
+
+
+
+  
  useGetPostByIdQuery, 
  useCreatePostMutation,  
  useDeletePostMutation 
@@ -70,12 +78,12 @@ export type Post = {


 export type UpdateAboutUsRequest={
-  id: number; updatedData: string,language_code:string
+  id: number; updatedData: string
 }


 export type UpdateAboutUsResponse={
-  id: number; updatedData: string,language_code:string
+  id: number; updatedData: string
 }


@@ -86,3 +94,10 @@ export type AboutUs = {
  is_active: boolean;
 };

+// First define your interface
+interface AboutUsResponse {
+  data: {
+    content: string;
+    // other fields...
+  }[];
+}
--- a/src/Redux/Service/manage.contactus.service.ts
+++ b/src/Redux/Service/manage.contactus.service.ts
@@ -1,33 +1,26 @@
-import { createApi } from "@reduxjs/toolkit/query/react";
+import { createApi } from "@reduxjs/toolkit/query";
 import { baseQueryWithReauth } from "./apiSlice";

-interface ContactData {
-  id: number;
-  email: string;
-  first_name: string;
-  created_at: string;
-}
-
-interface ApiResponse {
-  data: {
-    data: ContactData[];
-  };
-}
-
 export const manageContactUs = createApi({
-  reducerPath: "manageContactUs",
-  baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
-  tagTypes: ["Contact"],
-  endpoints: (builder) => ({
-
-    
-    getContact: builder.query<ApiResponse, void>({
-      query: () => "/contact-us",
-      providesTags: ["Contact"],
+    reducerPath: "manageContactUs",
+    baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
+    endpoints: (builder) => ({
+  
+  
+  
+      getPosts: builder.query<Post[], void>({ query: () => "/posts" }),
+  
+  
+  
+  
+  
    }),
-
-
-  }),
-});
-
-export const { useGetContactQuery } = manageContactUs;
+  });
+  
+  export const {  } = manageContactUs;
+  
+  export type Post = {
+    id: number;
+    title: string;
+    body: string;
+  };
--- a/src/Redux/Service/manage.jobs.service.ts
+++ b/src/Redux/Service/manage.jobs.service.ts
@@ -1,96 +1,26 @@
-import { createApi } from "@reduxjs/toolkit/query/react";
+import { createApi } from "@reduxjs/toolkit/query";
 import { baseQueryWithReauth } from "./apiSlice";

-export interface JobStatusData {
-  id: number;
-  job_title: string;
-  workspace_mode_xid: number;
-  industry_xid: number;
-  department_xid: number;
-  company_name: string;
-  ctc_currency_symbol: string;
-  ctc_amount: string;
-  experience: string;
-  job_location: string;
-  country_xid: number;
-  job_type_xid: number;
-  skill_description: string;
-  job_description: string;
-  job_image: string | null;
-  industry: {
-    id: number;
-    en_name: string;
-  };
-  department: {
-    id: number;
-    en_name: string;
-  };
-  workspace: {
-    id: number;
-    en_name: string;
-  };
-  country: {
-    id: number;
-    en_name: string;
-  };
-  job_type: {
-    id: number;
-    en_name: string;
-  };
-}
-
-interface ApiResponse {
-  status: string;
-  status_code: number;
-  message: string;
-  data: {
-    current_page: number,
-    last_page: number,
-    total: number,
-    from: number,
-    per_page: number,
-    to: number,
-    data: JobStatusData[];
-  };
-}
-
-export interface CountryEdit {
-  status: string;
-  status_code: number;
-  message: string;
-  data: JobStatusData[];
-}
-
-
-export type PostJobStatus = { 
-  title: string
-};
-
 export const manageJobs = createApi({
-  reducerPath: "manageJobs",
-  baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
-  endpoints: (builder) => ({
-
-    getManageJobs: builder.query<ApiResponse, number>({
-      query: (page = 1) => `/manage-jobs-list?page=${page}`,
+    reducerPath: "manageJobs",
+    baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
+    endpoints: (builder) => ({
+  
+  
+  
+      getPosts: builder.query<Post[], void>({ query: () => "/posts" }),
+  
+  
+  
+  
+  
    }),
-
-    viewJobs: builder.query<ApiResponse, number>({
-      query: (id) => `/manage-jobs-list/${id}`,
-    }),
-
-    deleteJobsPost: builder.mutation<{ status: string; message: string }, { id: number }>({
-      query: ({ id }) => ({
-        url: `/manage-jobs-delete`,
-        method: "POST",
-        body: { id },
-      }),
-    }),
-
-   
-
-
-  }),
-});
-
-export const { useGetManageJobsQuery,useLazyViewJobsQuery,useDeleteJobsPostMutation } = manageJobs;
+  });
+  
+  export const {  } = manageJobs;
+  
+  export type Post = {
+    id: number;
+    title: string;
+    body: string;
+  };
--- a/src/Redux/Service/manage.post.service.ts
+++ b/src/Redux/Service/manage.post.service.ts
@@ -1,82 +0,0 @@
-import { createApi } from "@reduxjs/toolkit/query/react";
-import { baseQueryWithReauth } from "./apiSlice";
-
-export interface JobStatusData {
-    id: number;
-    is_active: string;
-    created_at:string,
-    job_status_translation:{
-        job_status_xid: number,
-        title:string,
-        language_xid:number
-    }[],
-}
-
-interface ApiResponse {
-    status: string;
-    status_code: number;
-    message: string;
-    data: {
-        current_page: number,
-        last_page: number,
-        total: number,
-        from: number,
-        per_page: number,
-        to: number,
-        data: JobStatusData[];
-    };
-}
-
-export interface CountryEdit {
-    status: string;
-    status_code: number;
-    message: string;
-    data: JobStatusData[];
-}
-
-
-export type PostJobStatus = {
- title: string
-};
-
-
-export const managePosts = createApi({
-    reducerPath: "managePosts",
-    baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
-    endpoints: (builder) => ({
-        // createJobStatusPost: builder.mutation<PostJobStatus, Partial<PostJobStatus>>({
-        //     query: (data) => ({
-        //         url: "/job-status-store",
-        //         method: "POST",
-        //         body: data,
-        //     }),
-        // }),
-        // 🔹 GET: Fetch all posts
-        getManagePosts: builder.query<ApiResponse, number>({
-            query: (page = 1) => `/manage-post-list?page=${page}`,
-        }),
-
-        postStatusToggle: builder.mutation({
-            query: ({ id, is_active }) => ({
-                url: `/manage-post-status`,
-                method: "POST",
-                body: { id, is_active },
-            }),
-        }),
-
-        // deleteFaqPost: builder.mutation<{ status: string; message: string }, { id: number }>({
-        //     query: ({ id }) => ({
-        //         url: `/faq-delete`,
-        //         method: "POST",
-        //         body: { id },
-        //     }),
-        // }),
-
-    }),
-});
-
-export const {
-    useGetManagePostsQuery,
-    usePostStatusToggleMutation,
-    // useDeleteFaqPostMutation
-} = managePosts;
--- a/src/Redux/Service/manage.posts.service.ts
+++ b/src/Redux/Service/manage.posts.service.ts
@@ -0,0 +1,26 @@
+import { createApi } from "@reduxjs/toolkit/query";
+import { baseQueryWithReauth } from "./apiSlice";
+
+export const managePosts = createApi({
+    reducerPath: "managePosts",
+    baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
+    endpoints: (builder) => ({
+  
+  
+  
+      getPosts: builder.query<Post[], void>({ query: () => "/posts" }),
+  
+  
+  
+  
+  
+    }),
+  });
+  
+  export const {  } = managePosts;
+  
+  export type Post = {
+    id: number;
+    title: string;
+    body: string;
+  };
--- a/src/Redux/Service/manage.subadmin.service.ts
+++ b/src/Redux/Service/manage.subadmin.service.ts
@@ -1,173 +1,26 @@
-import { createApi } from "@reduxjs/toolkit/query/react";
+import { createApi } from "@reduxjs/toolkit/query";
 import { baseQueryWithReauth } from "./apiSlice";

-interface PaginationLink {
-  url: string | null;
-  label: string;
-  active: boolean;
-}
-
-interface UserData {
-  id: number;
-  unique_id: string;
-  user_name: string;
-  first_name: string;
-  last_name: string;
-  date_of_birth: string;
-  gender: string;
-}
-
-interface PaginatedData {
-  current_page: number;
-  data: UserData[];
-  first_page_url: string;
-  from: number;
-  last_page: number;
-  last_page_url: string;
-  links: PaginationLink[];
-  next_page_url: string | null;
-  path: string;
-  per_page: number;
-  prev_page_url: string | null;
-  to: number;
-  total: number;
-}
-
-interface ApiResponse {
-  status: string;
-  status_code: number;
-  message: string;
-  data: PaginatedData;
-}
-
-// export type SubAdminPost = {
-//   id: number;
-//   first_name: string,
-//   last_name: string,
-//   unique_id: string,
-//   date_of_birth: string,
-//   gender: string,
-// }
-
-interface ResourceActionLink {
-  id: number;
-  principal_xid: number;
-  role_xid: number;
-  app_resource_xid: number;
-  is_active: boolean;
-  created_by: number | null;
-  modified_by: number | null;
-  deleted_at: string | null;
-  created_at: string;
-  updated_at: string;
-}
-
-interface SubAdmin {
-  id: number;
-  first_name: string;
-  last_name: string;
-  unique_id: string;
-  date_of_birth: string;
-  gender: string;
-  get_resource_action_link: ResourceActionLink[];
-}
-
-interface SubAdminView {
-  status: string;
-  status_code: number;
-  message: string;
-  data: SubAdmin[];
-}
-
-interface CreateSubAdminPayload {
-  principal_type_xid: number;
-  principal_source_xid: number;
-  user_name: string;
-  first_name: string;
-  last_name: string;
-  date_of_birth: string;
-  gender: string;
-  email_address: string;
-  phone_number: string;
-  created_by: number;
-}
-
-interface CreateSubAdminResponse {
-  status: string;
-  status_code: number;
-  message: string;
-  data: UserData;
-}
-
 export const manageSubAdmin = createApi({
-  reducerPath: "manageSubAdmin",
-  baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
-  tagTypes: ["SubAdmin"],
-  endpoints: (builder) => ({
-
-    createFaqPost: builder.mutation<Post, Partial<Post>>({
-      query: (data) => ({
-        url: "/faq-store",
-        method: "POST",
-        body: data,
-      }),
+    reducerPath: "manageSubAdmin",
+    baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
+    endpoints: (builder) => ({
+  
+  
+  
+      getPosts: builder.query<Post[], void>({ query: () => "/posts" }),
+  
+  
+  
+  
+  
    }),
-    
-    getSubAdmin: builder.query<ApiResponse, void>({
-      query: () => `/sub-admin`,
-    }),
-
-    viewSubAdmin: builder.query<SubAdminView, number>({
-      query: (id) => `/sub-admin-view/${id}`,
-    }),
-
-    updateSubAdmin: builder.mutation({
-      query: (updatedData) => ({
-        url: "/sub-admin-update",
-        method: "POST",
-        body: updatedData,
-      }),
-    }),
-
-    createSubAdminPost: builder.mutation<
-      CreateSubAdminResponse,
-      CreateSubAdminPayload
-    >({
-      query: (data) => ({
-        url: "/sub-admin-create",
-        method: "POST",
-        body: data,
-      }),
-      invalidatesTags: ["SubAdmin"], // Add this to invalidate cache
-    }),
-
-    faqToggle: builder.mutation({
-      query: ({ id, is_active }) => ({
-        url: `/faq-status`,
-        method: "POST",
-        body: { id, is_active },
-      }),
-    }),
-
-    deleteSubAdminPost: builder.mutation<{ success: boolean }, number>({
-      query: (id) => ({
-        url: `/faq-delete/${id}`,
-        method: "DELETE",
-      }),
-    }),
-  }),
-});
-
-export const {
-  useGetSubAdminQuery,
-  useLazyViewSubAdminQuery,
-  useUpdateSubAdminMutation,
-  useDeleteSubAdminPostMutation,
-  useCreateSubAdminPostMutation,
-} = manageSubAdmin;
-
-export type Post = {
-  id: number;
-  title: string;
-  body: string;
-};
+  });
+  
+  export const {  } = manageSubAdmin;
+  
+  export type Post = {
+    id: number;
+    title: string;
+    body: string;
+  };
--- a/src/Redux/Service/manage.user.ts
+++ b/src/Redux/Service/manage.user.ts
@@ -1,108 +0,0 @@
-import { createApi } from "@reduxjs/toolkit/query/react";
-import { baseQueryWithReauth } from "./apiSlice";
-
-export interface UserData {
-    id: number;
-    principal_type_xid: number
-    first_name: string;
-    last_name: string;
-    phone_number: string;
-    gender: string;
-    date_of_birth: string;
-    is_active: boolean;
-    principal_type:{
-        id: number;
-        principal_type_title: string;
-    },
-    principle_language_links:[]
-}
-
-interface ApiResponse {
-    status: string;
-    status_code: number;
-    message: string;
-    data: {
-        current_page: number,
-        last_page: number,
-        total: number,
-        from: number,
-        per_page: number,
-        to: number,
-        data: UserData[];
-    };
-}
-
-export interface CountryEdit {
-    status: string;
-    status_code: number;
-    message: string;
-    data: UserData[];
-}
-
-
-export type PostCountry = {
-    en_name: string;
-    country_code: string;
-    phonecode: string;
-    capital: string;
-    currency: string;
-    currency_name: string;
-    currency_symbol: string;
-};
-
-
-export const registerUser = createApi({
-    reducerPath: "registerUser",
-    baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
-    endpoints: (builder) => ({
-        createCountryPost: builder.mutation<PostCountry, Partial<PostCountry>>({
-            query: (data) => ({
-                url: "/country-add",
-                method: "POST",
-                body: data,
-            }),
-        }),
-        // 🔹 GET: Fetch all posts
-        getManageUser: builder.query<ApiResponse, number>({
-            query: (page = 1) => `/manage-user-list?page=${page}`,
-        }),
-
-        getCountryMasterEdit: builder.query<CountryEdit, number>({
-            query: (id) => `/country-edit/${id}`,
-        }),
-
-        updateCountry: builder.mutation({
-            query: (updatedData) => ({
-                url: "/country-update",
-                method: "POST",
-                body: updatedData,
-            }),
-        }),
-
-        userToggle: builder.mutation({
-            query: ({ id, is_active }) => ({
-                url: `/manage-user-status`,
-                method: "POST",
-                body: { id, is_active },
-            }),
-        }),
-
-        // deleteFaqPost: builder.mutation<{ status: string; message: string }, { id: number }>({
-        //     query: ({ id }) => ({
-        //         url: `/faq-delete`,
-        //         method: "POST",
-        //         body: { id },
-        //     }),
-        // }),
-
-    }),
-});
-
-export const {
-    useGetManageUserQuery,
-    useGetCountryMasterEditQuery,
-    useCreateCountryPostMutation,
-    useUpdateCountryMutation,
-    useUserToggleMutation,
-    // useDeleteFaqPostMutation
-} = registerUser;
--- a/src/Redux/Service/master.module.service.ts
+++ b/src/Redux/Service/master.module.service.ts
@@ -0,0 +1,26 @@
+import { createApi } from "@reduxjs/toolkit/query";
+import { baseQueryWithReauth } from "./apiSlice";
+
+export const masterModule = createApi({
+    reducerPath: "masterModule",
+    baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
+    endpoints: (builder) => ({
+  
+  
+  
+      getPosts: builder.query<Post[], void>({ query: () => "/posts" }),
+  
+  
+  
+  
+  
+    }),
+  });
+  
+  export const {  } = masterModule;
+  
+  export type Post = {
+    id: number;
+    title: string;
+    body: string;
+  };
--- a/src/Redux/Service/privacy.policy.service.ts
+++ b/src/Redux/Service/privacy.policy.service.ts
@@ -9,16 +9,8 @@ export const privacyPolicy = createApi({
    getPrivacyPolicy: builder.query<PrivacyPolicyResponse, void>({ // Fix types here
      query: () => "/privacy-policy",
    }),
-
-    updatePrivacyPolicy: builder.mutation({
-      query: (updatedData) => ({
-        url: "/privacy-policy/update", // ✅ Updated URL
-        method: "POST",
-        body: updatedData,
-      }),
-    }),
  }),
 });

 // Export hook
-export const { useGetPrivacyPolicyQuery, useUpdatePrivacyPolicyMutation } = privacyPolicy;
+export const { useGetPrivacyPolicyQuery } = privacyPolicy;
--- a/src/Redux/Service/profile.password.ts
+++ b/src/Redux/Service/profile.password.ts
@@ -1,69 +0,0 @@
-import { createApi } from "@reduxjs/toolkit/query/react";
-import { baseQueryWithReauth } from "./apiSlice";
-
-interface profileGet {
-    data: {
-        id: number,
-        first_name: string,
-        last_name: string,
-        phone_number: string,
-        profile_photo: string,
-    }
-}
-
-
-export type ProfilePass = {
-    password: string;
-};
-
-
-export const profile = createApi({
-    reducerPath: "profile",
-    baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
-    endpoints: (builder) => ({
-        profilePassword: builder.mutation<ProfilePass, Partial<ProfilePass>>({
-            query: (data) => ({
-                url: "/profile-password",
-                method: "POST",
-                body: data,
-            }),
-        }),
-        // 🔹 GET: Fetch all posts
-        getProfile: builder.query<profileGet, void>({
-            query: () => "/profile-view",
-        }),
-
-        verifyOTP: builder.mutation({
-            query: (updatedData) => ({
-                url: "/profile-otp",
-                method: "POST",
-                body: updatedData,
-            }),
-        }),
-
-        newPasswordSet: builder.mutation({
-            query: (updatedData) => ({
-                url: "/profile-change-password",
-                method: "POST",
-                body: updatedData,
-            }),
-        }),
-
-        resendOtp: builder.mutation({
-            query: ({ data }) => ({
-                url: `/profile-resend-otp`,
-                method: "POST",
-                body: data,
-            }),
-        }),
-
-    }),
-});
-
-export const {
-    useGetProfileQuery,
-    useProfilePasswordMutation,
-    useVerifyOTPMutation,
-    useNewPasswordSetMutation,
-    useResendOtpMutation
-} = profile;
--- a/src/Redux/Service/register.user.service.ts
+++ b/src/Redux/Service/register.user.service.ts
@@ -0,0 +1,26 @@
+import { createApi } from "@reduxjs/toolkit/query";
+import { baseQueryWithReauth } from "./apiSlice";
+
+export const registerUser = createApi({
+    reducerPath: "registerUser",
+    baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
+    endpoints: (builder) => ({
+  
+  
+  
+      getPosts: builder.query<Post[], void>({ query: () => "/posts" }),
+  
+  
+  
+  
+  
+    }),
+  });
+  
+  export const {  } = registerUser;
+  
+  export type Post = {
+    id: number;
+    title: string;
+    body: string;
+  };
--- a/src/Redux/Service/template.master.service.ts
+++ b/src/Redux/Service/template.master.service.ts
@@ -1,110 +0,0 @@
-import { createApi } from "@reduxjs/toolkit/query/react";
-import { baseQueryWithReauth } from "./apiSlice";
-
-interface TemplateResponse {
-  status: string;
-  status_code: number;
-  message: string;
-  data: PaginationData;
-}
-
-interface PaginationData {
-  current_page: number;
-  data: Template[];
-  first_page_url: string;
-  from: number;
-  last_page: number;
-  last_page_url: string;
-  links: PaginationLink[];
-  next_page_url: string | null;
-  path: string;
-  per_page: number;
-  prev_page_url: string | null;
-  to: number;
-  total: number;
-}
-
-export interface Template {
-  id: number;
-  is_active: boolean;
-  post_template_translate: PostTemplateTranslate[];
-  post_template_image: PostTemplateImage[];
-}
-
-export interface PostTemplateTranslate {
-  id: number;
-  title: string;
-  sub_title: string;
-  post_template_xid: number;
-}
-
-interface PostTemplateImage {
-  id: number;
-  post_template_xid: number;
-  image_name: string;
-}
-
-interface PaginationLink {
-  url: string | null;
-  label: string;
-  active: boolean;
-}
-
-export interface Post {
-  id: number,
-  principle_type_xid: number,
-  title: string,
-  sub_title: string,
-  image_name: string[]
-}
-
-export const templateMaster = createApi({
-  reducerPath: "templateMaster",
-  baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
-  endpoints: (builder) => ({
-    createTemplatePost: builder.mutation<Post, FormData>({
-      query: (data) => ({
-        url: "/template-store",
-        method: "POST",
-        body: data,
-        headers: {
-          Authorization: `Bearer ${localStorage.getItem("token")}`,
-        },
-      }),
-    }),
-    // 🔹 GET: Fetch all posts
-    getTemplateMaster: builder.query<TemplateResponse, number>({
-      query: (page = 1) => `/template-master?page=${page}`,
-    }),
-
-    updateTemplateMaster: builder.mutation<Post, FormData>({
-      query: (updatedData) => {
-        const token = localStorage.getItem("token");
-        return {
-          url: "/template-update",
-          method: "POST",
-          body: updatedData,
-          headers: {
-            'access-token': `${token}`,
-          },
-        };
-      },
-    }),
-
-    templateMasterToggle: builder.mutation({
-      query: ({ id, is_active }) => ({
-        url: `/template-status`,
-        method: "POST",
-        body: { id, is_active },
-      }),
-    }),
-
-  }),
-});
-
-export const {
-  useGetTemplateMasterQuery,
-  useCreateTemplatePostMutation,
-  useUpdateTemplateMasterMutation,
-  useTemplateMasterToggleMutation,
-} = templateMaster;
--- a/src/Redux/Service/terms.and.condition.service.ts
+++ b/src/Redux/Service/terms.and.condition.service.ts
@@ -1,40 +1,16 @@
 import { createApi } from "@reduxjs/toolkit/query/react";
 import { baseQueryWithReauth } from "./apiSlice";
+import { TermsAndConditionsResponse } from "../../Types/termsAndConditionTypes";

-
-export interface Terms {
-  id: number,
-  language_master_xid: number,
-  content: string,
-  is_active: boolean,
-  terms_cond_language: {
-    id: number,
-    language_name: string,
-    language_code: string,
-  }
-}
-
-export const termsAndCondition = createApi({
-  reducerPath: "termsAndCondition",
-  baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
-  endpoints: (builder) => ({
-    getTerms: builder.query<{ data: Terms[] }, void>({ query: () => "/term-and-condition" }),
-
-    updateTerms: builder.mutation({
-      query: (updatedData) => ({
-        url: "/term-and-condition/update", // ✅ Updated URL
-        method: "POST",
-        body: updatedData,
+export const TermsAndCondition = createApi({
+    reducerPath: "TermsAndCondition",
+    baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
+    endpoints: (builder) => ({
+      getTermsAndCondition: builder.query<TermsAndConditionsResponse, void>({
+        query: () => "/term-and-condition",
      }),
    }),
-
-
-
-
-  }),
 });

-export const {
-  useGetTermsQuery,
-  useUpdateTermsMutation,
-} = termsAndCondition;
+// Correctly export the hook
+export const { useGetTermsAndConditionQuery } = TermsAndCondition;
--- a/src/Redux/Service/workspace.mode.ts
+++ b/src/Redux/Service/workspace.mode.ts
@@ -1,96 +0,0 @@
-import { createApi } from "@reduxjs/toolkit/query/react";
-import { baseQueryWithReauth } from "./apiSlice";
-
-export interface WorkspaceData {
-    id: number;
-    en_name: string;
-    is_active: string;
-}
-
-interface ApiResponse {
-    status: string;
-    status_code: number;
-    message: string;
-    data: {
-        current_page: number,
-        last_page: number,
-        total: number,
-        from: number,
-        per_page: number,
-        to: number,
-        data: WorkspaceData[];
-    };
-}
-
-export interface CountryEdit {
-    status: string;
-    status_code: number;
-    message: string;
-    data: WorkspaceData[];
-}
-
-export interface DropDown {
-    status: string;
-    status_code: number;
-    message: string;
-    data: {
-        id: number;
-        en_name: string;
-    }[]
-}
-
-export type PostDepartment = {
-    en_name: string;
-};
-
-
-export const workspaceMode = createApi({
-    reducerPath: "workspaceMode",
-    baseQuery: baseQueryWithReauth, // Use enhanced baseQuery with error handling
-    endpoints: (builder) => ({
-        createWorkspacePost: builder.mutation<PostDepartment, Partial<PostDepartment>>({
-            query: (data) => ({
-                url: "/department-master-store",
-                method: "POST",
-                body: data,
-            }),
-        }),
-        // 🔹 GET: Fetch all posts
-        getWorkSpaceMode: builder.query<ApiResponse, number>({
-            query: (page = 1) => `/workspace-mode?page=${page}`,
-        }),
-
-        updateWorkSpace: builder.mutation({
-            query: (updatedData) => ({
-                url: "/workspace-update",
-                method: "POST",
-                body: updatedData,
-            }),
-        }),
-
-        workspaceToggle: builder.mutation({
-            query: ({ id, is_active }) => ({
-                url: `/workspace-status`,
-                method: "POST",
-                body: { id, is_active },
-            }),
-        }),
-
-        // deleteFaqPost: builder.mutation<{ status: string; message: string }, { id: number }>({
-        //     query: ({ id }) => ({
-        //         url: `/faq-delete`,
-        //         method: "POST",
-        //         body: { id },
-        //     }),
-        // }),
-
-    }),
-});
-
-export const {
-    useGetWorkSpaceModeQuery,
-    useCreateWorkspacePostMutation,
-    useUpdateWorkSpaceMutation,
-    useWorkspaceToggleMutation,
-    // useDeleteFaqPostMutation
-} = workspaceMode;
--- a/src/Redux/Store.tsx
+++ b/src/Redux/Store.tsx
@@ -1,8 +1,10 @@
 import { configureStore } from "@reduxjs/toolkit";
 import { dashboard } from "./Service/apiSlice";
 import authReducer from "./Service/authSlice";
+import { registerUser } from "./Service/register.user.service";
 import { deactivatedAccounts } from "./Service/deactivated.account.service";
 import { faqs } from "./Service/faqs.service";
+import { managePosts } from "./Service/manage.posts.service";
 import { manageSubAdmin } from "./Service/manage.subadmin.service";
 import { manageJobs } from "./Service/manage.jobs.service";
 import { manageGroups } from "./Service/manage.groups.service";
@@ -11,24 +13,17 @@ import { aboutUs } from "./Service/manage.aboutus.service";
 import { privacyPolicy } from "./Service/privacy.policy.service";
 import { privacy } from "./Service/privacy.service";
 import { myProfile } from "./Service/myprofie.service";
-import { agencyMasterModule } from "./Service/agency.master.module.service";
-import { termsAndCondition } from "./Service/terms.and.condition.service";
-import { templateMaster } from "./Service/template.master.service";
-import { jobType } from "./Service/job.type.service";
-import { industryMaster } from "./Service/industry.master.service";
-import { profile } from "./Service/profile.password";
-import { countryMaster } from "./Service/country.master";
-import { departmentMaster } from "./Service/department.master";
-import { workspaceMode } from "./Service/workspace.mode";
-import { jobStatus } from "./Service/job.status";
-import { managePosts } from "./Service/manage.post.service";
-import { registerUser } from "./Service/manage.user";
+import { masterModule } from "./Service/master.module.service";
+import { TermsAndCondition } from "./Service/terms.and.condition.service";

 export const store = configureStore({
  reducer: {
    [dashboard.reducerPath]: dashboard.reducer,
+    [registerUser.reducerPath]: registerUser.reducer,
    [deactivatedAccounts.reducerPath]: deactivatedAccounts.reducer,
    [faqs.reducerPath]: faqs.reducer,
+    [TermsAndCondition.reducerPath]: TermsAndCondition.reducer,
+    [managePosts.reducerPath]: managePosts.reducer,
    [manageSubAdmin.reducerPath]: manageSubAdmin.reducer,
    [manageJobs.reducerPath]: manageJobs.reducer,
    [manageGroups.reducerPath]: manageGroups.reducer,
@@ -37,26 +32,17 @@ export const store = configureStore({
    [privacyPolicy.reducerPath]: privacyPolicy.reducer,
    [privacy.reducerPath]: privacy.reducer,
    [myProfile.reducerPath]: myProfile.reducer,
-    [agencyMasterModule.reducerPath]: agencyMasterModule.reducer,
-    [termsAndCondition.reducerPath]: termsAndCondition.reducer,
-    [templateMaster.reducerPath]: templateMaster.reducer,
-    [jobType.reducerPath]: jobType.reducer,
-    [industryMaster.reducerPath]: industryMaster.reducer,
-    [profile.reducerPath]: profile.reducer,
-    [countryMaster.reducerPath]: countryMaster.reducer,
-    [departmentMaster.reducerPath]: departmentMaster.reducer,
-    [workspaceMode.reducerPath]: workspaceMode.reducer,
-    [jobStatus.reducerPath]: jobStatus.reducer,
-    [managePosts.reducerPath]: managePosts.reducer,
-    [registerUser.reducerPath]: registerUser.reducer,
+    [masterModule.reducerPath]: masterModule.reducer,
    auth: authReducer,
  },
  middleware: (getDefaultMiddleware) =>
    getDefaultMiddleware().concat(
-      dashboard.middleware,
+      dashboard.middleware, 
      deactivatedAccounts.middleware,
+      managePosts.middleware,
      faqs.middleware,
      manageSubAdmin.middleware,
+      TermsAndCondition.middleware,
      manageJobs.middleware,
      manageGroups.middleware,
      manageContactUs.middleware,
@@ -64,19 +50,8 @@ export const store = configureStore({
      privacyPolicy.middleware,
      privacy.middleware,
      myProfile.middleware,
-      agencyMasterModule.middleware,
-      termsAndCondition.middleware,
-      templateMaster.middleware,
-      jobType.middleware,
-      industryMaster.middleware,
-      profile.middleware,
-      countryMaster.middleware,
-      departmentMaster.middleware,
-      workspaceMode.middleware,
-      jobStatus.middleware,
-      managePosts.middleware,
-      registerUser.middleware,
-    ),
+      masterModule.middleware,
+      ),
 });

 export type RootState = ReturnType<typeof store.getState>;
--- a/src/Routes/Nav.ts
+++ b/src/Routes/Nav.ts
@@ -89,11 +89,11 @@ export const nav = [
              path: "/manage-cms/terms-conditions",
              Icon: GoDotFill,
            },
-            // {
-            //   title: "Privacy",
-            //   path: "/manage-cms/privacy",
-            //   Icon: GoDotFill,
-            // },
+            {
+              title: "Privacy",
+              path: "/manage-cms/privacy",
+              Icon: GoDotFill,
+            },
          ],
        },
        {
@@ -138,16 +138,6 @@ export const nav = [
              path: "/master-module/job-status",
              Icon: GoDotFill,
            },
-            {
-              title: "Industry Master",
-              path: "/master-module/industry-master",
-              Icon: GoDotFill,
-            },
-            {
-              title: "Department Master",
-              path: "/master-module/department-master",
-              Icon: GoDotFill,
-            },
          ],
        },
  ];
--- a/src/Routes/Routes.ts
+++ b/src/Routes/Routes.ts
@@ -11,7 +11,7 @@ import FAQ from "../Pages/ManageCMS/FAQ/FAQ";
 import AboutUs from "../Pages/ManageCMS/AboutUs/AboutUs";
 import PrivacyPolicy from "../Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy";
 import TermsAndConditions from "../Pages/ManageCMS/TermsAndConditions/TermsAndConditions";
-// import Privacy from "../Pages/ManageCMS/Privacy/Privacy";
+import Privacy from "../Pages/ManageCMS/Privacy/Privacy";
 import MyProfile from "../Pages/MyProfile/MyProfile";
 import Notification from "../Pages/Notification/Notification";
 import AgencyMaster from "../Pages/MasterModule/AgencyMaster/AgencyMaster";
@@ -23,8 +23,6 @@ import JobStatus from "../Pages/MasterModule/JobStatus/JobStatus";
 import RegisterUsers from "../Pages/ManageUsers/RegisterUsers/RegisterUsers";
 import DeactivatedAccounts from "../Pages/ManageUsers/DeactivatedAccounts/DeactivatedAccounts";
 import { Spinner } from "../components/Sipnner/Spinner";
-import IndustryMasterList from "../Pages/MasterModule/IndustryMaster/IndustryMasterList";
-import DepartmentMasterList from "../Pages/MasterModule/DepartmentMaster/DepartmentMasterList";

 export const RouteLink = [
    { path: "/", Component: Dashboard },
@@ -63,8 +61,6 @@ export const RouteLink = [
    { path: "/master-module/workspace-mode", Component: WorkspaceMode},
    { path: "/master-module/country", Component: Country},
    { path: "/master-module/job-status", Component: JobStatus},
-    { path: "/master-module/industry-master", Component: IndustryMasterList},
-    { path: "/master-module/department-master", Component: DepartmentMasterList},
    // { path: "/job-status", Component: Spinner},

 ]
--- a/src/Types/aboutUsType.tsx
+++ b/src/Types/aboutUsType.tsx
@@ -1,27 +0,0 @@
-// First define your interface
-// export interface AboutUsResponse {
-//     data: {
-//         content: string;
-//         // other fields...
-//     }[];
-// }
-
-
-export interface AboutUsContent {
-    id: number;
-    language_master_xid: number;
-    content: string;
-    is_active: boolean;
-    about_language: {
-        id: number;
-        language_code: string;
-        language_name: string;
-    }
-}
-
-export interface AboutUsResponse {
-    status: "success" | "error"; // Assuming it can be "success" or "error"
-    status_code: number;
-    message: string;
-    data: AboutUsContent[];
-}
--- a/src/Types/termsAndConditionTypes.tsx
+++ b/src/Types/termsAndConditionTypes.tsx
@@ -0,0 +1,18 @@
+export interface TermsAndConditionsContent {
+    id: number;
+    language_master_xid: number;
+    content: string;
+    is_active: boolean;
+    terms_cond_language:{
+      id:number;
+      language_code:string;
+      language_name:string;
+    }
+  }
+  
+  export interface TermsAndConditionsResponse {
+    status: "success" | "error"; // Assuming it can be "success" or "error"
+    status_code: number;
+    message: string;
+    data: TermsAndConditionsContent[];
+  }
--- a/src/assets/empty-file.png
+++ b/src/assets/empty-file.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
AnsariTufail	22e609194d	updated	2025-02-14 15:02:44 +05:30
AnsariTufail	900bf48de2	Worked on the termandcondition	2025-02-13 10:54:53 +05:30
AnsariTufail	9f07032251	Worked on the termandcondition	2025-02-12 16:44:14 +05:30
AnsariTufail	d81e55d51c	Worked on the termandcondition	2025-02-12 16:35:35 +05:30
AnsariTufail	c37c799b79	Merge branch 'main' of http://git.wdipl.com/Siddhesh.More/SSA-Admin-Panel into tufail	2025-02-12 12:51:13 +05:30
AnsariTufail	e8342aed66	update	2025-02-12 12:51:00 +05:30