Merge branch 'tufail' of http://git.wdipl.com/Siddhesh.More/SSA-Admin-Panel

src/Pages/ManageCMS/AboutUs/AboutUs.tsx

@@ -20,7 +20,7 @@ const AboutUs = () => {
            AboutUs
           </Text>
 
-          <HStack mr={5}>
+          <HStack>
             
             <AboutUsAddModel />
           </HStack>

src/Pages/ManageCMS/FAQ/EditDetails.tsx

@@ -7,9 +7,9 @@ function EditDetails() {
 
         <DialogRoot placement="center">
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
+               
-                    <FaRegEdit style={{ cursor: "pointer", }} color="#000" />
+                    <FaRegEdit style={{ cursor: "pointer", fontSize:'16px' }} color="#000" />
-                </Button>
+               
                 {/* <Button><FaRegEdit /></Button> */}
 
             </DialogTrigger>

src/Pages/ManageCMS/FAQ/FAQ.tsx

@@ -1,4 +1,4 @@
-import { Box, Button, HStack, Image, Input, Text } from "@chakra-ui/react";
+import { Box, HStack, Image, Input, Text } from "@chakra-ui/react";
 import MainFrame from "../../../components/MainFrame"
 import EditDetails from "./EditDetails";
 import { InputGroup } from "../../../components/ui/input-group";

src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx

@@ -20,7 +20,7 @@ const PrivacyPolicy = () => {
           Privacy Policy
           </Text>
 
-          <HStack mr={5}>
+          <HStack >
             
             <PrivacyPolicyAddModel />
           </HStack>

src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicyAddModel.tsx

@@ -1,6 +1,6 @@
 import { FaRegEdit } from "react-icons/fa"
 import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
-import { Field, Input, Stack, Text, Textarea } from "@chakra-ui/react"
+import { Field, Stack, Text, Textarea } from "@chakra-ui/react"
 import { Button } from "../../../components/ui/button"
 
 function PrivacyPolicyAddModel() {

src/Pages/ManageCMS/TermsAndConditions/TermsAndConditions.tsx

@@ -20,7 +20,7 @@ const TermsAndConditions = () => {
            Terms And Conditions
           </Text>
 
-          <HStack mr={5}>
+          <HStack >
             
             <TermsAndConditionsAddModel />
           </HStack>

src/Pages/ManageContact/ManageContact.tsx

@@ -1,4 +1,4 @@
-import { Box, HStack, Image, Input, Text } from "@chakra-ui/react";
+import { Box, HStack, Input, Text } from "@chakra-ui/react";
 import MainFrame from "../../components/MainFrame"
 import PendingRequests from "../../Pages/ManageContact/PendingRequests"
 import { InputGroup } from "../../components/ui/input-group";
@@ -47,8 +47,8 @@ const ManageContact = () => {
           Contact Requests
           </Text>
 
-          <HStack mr={5}>
+          <HStack >
-            <InputGroup marginRight={"1rem"}
+            <InputGroup 
               startElement={
                 <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
               }

src/Pages/ManageGroups/EditDetailGroup.tsx

@@ -9,9 +9,9 @@ function EditDetailGroups() {
 
         <DialogRoot placement="center" >
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
+                
-                    <FaRegEdit style={{ cursor: "pointer", }}  color="#000"/>
+                    <FaRegEdit style={{ cursor: "pointer", fontSize:'16px'}}  color="#000"/>
-                </Button>
+                
                 {/* <Button><FaRegEdit /></Button> */}
 
             </DialogTrigger>

src/Pages/ManageGroups/ViewManageGroup.tsx

@@ -10,9 +10,9 @@ function ViewManageGroup() {
 
         <DialogRoot placement="center" >
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
+                
-                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", }}  color="#000"/>
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize:'16px'}}  color="#000"/>
-                </Button>
+               
                 {/* <Button><FaRegEdit /></Button> */}
 
             </DialogTrigger>

src/Pages/ManageJobs/ManageJobs.tsx

@@ -73,8 +73,8 @@ const ManageJobs = () => {
             View job Posting
           </Text>
 
-          <HStack mr={5}>
+          <HStack >
-            <InputGroup marginRight={"1rem"}
+            <InputGroup 
               startElement={
                 <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
               }

src/Pages/ManageJobs/ManageJobsAdd.tsx

@@ -19,9 +19,9 @@ function ManageJobsAdd() {
 
         <DialogRoot placement="center">
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
+                
-                    <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }} color="#000" />
+                    <FaRegEdit style={{ cursor: "pointer", fontSize: "16px" }} color="#000" />
-                </Button>
+                
             </DialogTrigger>
 
             <DialogContent

src/Pages/ManageJobs/ViewManageJob.tsx

@@ -20,9 +20,9 @@ function ViewManageJob() {
 
         <DialogRoot placement="center">
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
+               
-                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }}  color="#000"/>
-                </Button>
+               
             </DialogTrigger>
 
             <DialogContent

src/Pages/ManagePost/ViewDailog.tsx

@@ -8,9 +8,9 @@ function ViewDailog() {
 
         <DialogRoot placement="center">
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
+                
                     <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} color="#000" />
-                </Button>
+                
             </DialogTrigger>
 
             <DialogContent

src/Pages/MasterModule/AgencyMaster/AgencyMaster.tsx

@@ -1,4 +1,4 @@
-import { Box, HStack, Image, Input, Text } from "@chakra-ui/react";
+import { Box, HStack, Input, Text } from "@chakra-ui/react";
 import MainFrame from "../../../components/MainFrame"
 import { InputGroup } from "../../../components/ui/input-group";
 import { LuSearch } from "react-icons/lu";
@@ -62,8 +62,8 @@ const AgencyMaster = () => {
           Agency Master
           </Text>
 
-          <HStack mr={5}>
+          <HStack >
-            <InputGroup marginRight={"1rem"}
+            <InputGroup 
               startElement={
                 <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
               }

src/Pages/MasterModule/AgencyMaster/EditAgencyMaster.tsx

@@ -10,9 +10,9 @@ function EditAgencyMaster() {
 
         <DialogRoot placement="center">
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
+                
-                    <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
+                    <FaRegEdit style={{ cursor: "pointer", fontSize: "16px" }}  color="#000"/>
-                </Button>
+               
             </DialogTrigger>
 
             <DialogContent

src/Pages/MasterModule/AgencyMaster/ViewAgencyAddModel.tsx

@@ -1,5 +1,5 @@
 import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
-import { Field, Input, Stack, Text, Textarea } from "@chakra-ui/react"
+import { Field, Input, Stack, Text } from "@chakra-ui/react"
 import { IoMdAdd } from "react-icons/io"
 import { Button } from "../../../components/ui/button"
 

src/Pages/MasterModule/AgencyMaster/ViewAgencyMaster.tsx

@@ -10,9 +10,9 @@ function ViewAgencyMaster() {
 
         <DialogRoot placement="center">
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
+                
-                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }}  color="#000"/>
-                </Button>
+            
             </DialogTrigger>
 
             <DialogContent

src/Pages/MasterModule/Country/Country.tsx

@@ -1,4 +1,4 @@
-import { Box, HStack, Image, Input, Text } from "@chakra-ui/react";
+import { Box, HStack, Input, Text } from "@chakra-ui/react";
 import MainFrame from "../../../components/MainFrame"
 import { InputGroup } from "../../../components/ui/input-group";
 import { LuSearch } from "react-icons/lu";
@@ -49,8 +49,8 @@ const Country = () => {
           Country
           </Text>
 
-          <HStack mr={5}>
+          <HStack >
-            <InputGroup marginRight={"1rem"}
+            <InputGroup 
               startElement={
                 <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
               }

src/Pages/MasterModule/Country/EditCountryModel.tsx

@@ -15,9 +15,9 @@ function EditCountryModel() {
                 {/* <Button bg={"transparent"} size="sm">
                     <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
                 </Button> */}
-                <Button bg={"transparent"} size="sm">
+                
-                 <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
+                 <FaRegEdit style={{ cursor: "pointer", fontSize: "16px" }}  color="#000"/>
-                </Button>
+                
 
             </DialogTrigger>
 

src/Pages/MasterModule/JobStatus/EditJobStatusModel.tsx

@@ -15,9 +15,9 @@ function EditJobStatusModel() {
                 {/* <Button bg={"transparent"} size="sm">
                     <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
                 </Button> */}
-                <Button bg={"transparent"} size="sm">
+                
-                 <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
+                 <FaRegEdit style={{ cursor: "pointer", fontSize: "16px" }}  color="#000"/>
-                </Button>
+                
 
             </DialogTrigger>
 

src/Pages/MasterModule/JobStatus/JobStatus.tsx

@@ -49,8 +49,8 @@ const JobStatus = () => {
           Job Status
           </Text>
 
-          <HStack mr={5}>
+          <HStack >
-            <InputGroup marginRight={"1rem"}
+            <InputGroup 
               startElement={
                 <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
               }

src/Pages/MasterModule/JobType/EditJobModel.tsx

@@ -16,9 +16,9 @@ function EditJobeModel() {
                 {/* <Button bg={"transparent"} size="sm">
                     <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
                 </Button> */}
-                <Button bg={"transparent"} size="sm">
+                
-                 <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
+                 <FaRegEdit style={{ cursor: "pointer", fontSize: "16px" }}  color="#000"/>
-                </Button>
+                
 
             </DialogTrigger>
 

src/Pages/MasterModule/JobType/JobType.tsx

@@ -49,8 +49,8 @@ const JobType = () => {
           Job Type
           </Text>
 
-          <HStack mr={5}>
+          <HStack >
-            <InputGroup marginRight={"1rem"}
+            <InputGroup 
               startElement={
                 <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
               }

src/Pages/MasterModule/TemplateMaster/EditTemplateModel.tsx

@@ -30,9 +30,9 @@ function EditTemplateModel() {
                 {/* <Button bg={"transparent"} size="sm">
                     <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
                 </Button> */}
-                <Button bg={"transparent"} size="sm">
+                
-                 <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
+                 <FaRegEdit style={{ cursor: "pointer", fontSize: "16px" }}  color="#000"/>
-                </Button>
+               
 
             </DialogTrigger>
 

src/Pages/MasterModule/TemplateMaster/TemplateMaster.tsx

@@ -62,8 +62,8 @@ const TemplateMaster = () => {
           Template Master
           </Text>
 
-          <HStack mr={5}>
+          <HStack >
-            <InputGroup marginRight={"1rem"}
+            <InputGroup 
               startElement={
                 <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
               }

src/Pages/MasterModule/WorkspaceMode/EditWorkModel.tsx

@@ -15,9 +15,9 @@ function EditWorkModel() {
                 {/* <Button bg={"transparent"} size="sm">
                     <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
                 </Button> */}
-                <Button bg={"transparent"} size="sm">
+                
-                 <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
+                 <FaRegEdit style={{ cursor: "pointer", fontSize: "16px" }}  color="#000"/>
-                </Button>
+                
 
             </DialogTrigger>
 

src/Pages/MasterModule/WorkspaceMode/WorkspaceMode.tsx

@@ -49,8 +49,8 @@ const WorkspaceMode = () => {
           Workspace Mode
           </Text>
 
-          <HStack mr={5}>
+          <HStack >
-            <InputGroup marginRight={"1rem"}
+            <InputGroup 
               startElement={
                 <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
               }

src/Pages/SubAdmin/ViewSubAdmin.tsx

@@ -8,9 +8,9 @@ function ViewSubAdmin() {
 
         <DialogRoot placement="center" >
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
+               
-                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", }} color="#000"/>
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize:'16px'}} color="#000"/>
-                </Button>
+               
                 {/* <Button><FaRegEdit /></Button> */}
 
             </DialogTrigger>

src/components/AlertDailog.tsx

@@ -25,7 +25,6 @@ const AlertDailog: React.FC<DeleteConfirmationDialogProps> = ({
   onConfirm,
   alertText,
   alertCaption,
-  alertIcon,
   AltertTiggerIcon,
   button,
   iconColor,

src/components/EditSubAdmin.tsx

@@ -8,9 +8,9 @@ function EditSubAdmin() {
 
         <DialogRoot placement="center">
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
+                
-                    <FaRegEdit style={{ cursor: "pointer", }} color="#000" />
+                    <FaRegEdit style={{ cursor: "pointer", fontSize:'16px' }} color="#000" />
-                </Button>
+               
                 {/* <Button><FaRegEdit /></Button> */}
 
             </DialogTrigger>