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

update
[ update action ]
2025-02-12 20:05:52 +05:30 · 2025-02-12 20:04:40 +05:30 · 2025-02-12 20:03:47 +05:30
23 changed files with 120 additions and 109 deletions
--- a/src/Layouts/DefaultLayout.tsx
+++ b/src/Layouts/DefaultLayout.tsx
@@ -57,10 +57,10 @@ const DefaultLayout: FC<{ children: React.ReactNode }> = ({ children }) => {
        </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> :
+            <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>
+                <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>)}
--- a/src/Pages/Dashboard/Dashboard.tsx
+++ b/src/Pages/Dashboard/Dashboard.tsx
@@ -26,7 +26,6 @@ import {
  SelectValueText
 } from "../../components/ui/select";
 import AgencyName from "./AgencyName";
-import { Spinner } from "../../components/Sipnner/Spinner";

 const Dashboard = () => {
  const frameworks = createListCollection({
--- a/src/Pages/ManageCMS/FAQ/EditDetails.tsx
+++ b/src/Pages/ManageCMS/FAQ/EditDetails.tsx
@@ -9,13 +9,13 @@ import {
  DialogTitle,
  DialogTrigger,
 } from "../../../components/ui/dialog";
-import { Field, Input, Stack, Textarea } from "@chakra-ui/react";
+import { Field, Input, Span, Stack, Textarea } from "@chakra-ui/react";
 import Edit from "../../../components/ActionIcons/Edit";
 function EditDetails() {
  return (
    <DialogRoot placement="center">
      <DialogTrigger asChild>
-        <Edit />
+        <Span><Edit /></Span>
      </DialogTrigger>

      <DialogContent
@@ -56,10 +56,11 @@ function EditDetails() {
                bgColor="#EEEEEE"
                color="black"
                border="none"
-                pl={1}
+                p={2}
                fontSize="12px"
-                height="30px"
-                pt={1.5}
+                height="120px"
+                resize={'none'}
+                _focusVisible={{outline:'none'}}
              />
            </Field.Root>
          </Stack>
--- 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, Stack } from "@chakra-ui/react";
+import { Avatar, Box, Field, Heading, Input, Span, 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>
-        <Edit />
+        <Span><Edit /></Span>
      </DialogTrigger>

      <DialogContent
--- 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, Stack } from "@chakra-ui/react";
+import { Avatar, Box, Field, Heading, Input, Span, 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>
-        <View />
+        <Span><View /></Span>
      </DialogTrigger>

      <DialogContent
--- a/src/Pages/ManageJobs/ManageJobsAdd.tsx
+++ b/src/Pages/ManageJobs/ManageJobsAdd.tsx
@@ -3,6 +3,7 @@ import {
  Icon,
  Input,
  SelectValueText,
+  Span,
  Stack,
  createListCollection,
 } from "@chakra-ui/react";
@@ -40,7 +41,7 @@ function ManageJobsAdd() {
  return (
    <DialogRoot placement="center">
      <DialogTrigger asChild>
-        <Edit />
+        <Span><Edit /></Span>
      </DialogTrigger>

      <DialogContent
--- a/src/Pages/ManageJobs/ViewManageJob.tsx
+++ b/src/Pages/ManageJobs/ViewManageJob.tsx
@@ -3,6 +3,7 @@ import {
  Icon,
  Input,
  SelectValueText,
+  Span,
  Stack,
  createListCollection,
 } from "@chakra-ui/react";
@@ -40,7 +41,7 @@ function ViewManageJob() {
  return (
    <DialogRoot placement="center">
      <DialogTrigger asChild>
-        <View />
+        <Span><View /></Span>
      </DialogTrigger>

      <DialogContent
--- a/src/Pages/ManagePost/ManagePost.tsx
+++ b/src/Pages/ManagePost/ManagePost.tsx
@@ -1,4 +1,4 @@
-import { Box, HStack, Image, Input, Text } from "@chakra-ui/react";
+import { Box, HStack, Image, Input, Span, Text } from "@chakra-ui/react";
 import MainFrame from "../../components/MainFrame";
 import { InputGroup } from "../../components/ui/input-group";
 import { LuSearch } from "react-icons/lu";
@@ -47,7 +47,7 @@ const managepost: any[] = [
      <HStack justifyContent="center">
        <ViewDailog />
        <AlertDailog
-          AltertTiggerIcon={() => <Delete />} 
+          AltertTiggerIcon={() => <Span><Delete /> </Span>} 
          alertText="Delete Users"
          alertIcon={<Image src={"DeleteIcon"} h={"39px"} />}
          alertCaption="are you sure you want to delete ?"
--- a/src/Pages/ManagePost/ViewDailog.tsx
+++ b/src/Pages/ManagePost/ViewDailog.tsx
@@ -1,4 +1,4 @@
-import { Field, Icon, Image, Input, Stack } from "@chakra-ui/react"
+import { Field, Icon, Image, Input, Span, 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"
@@ -9,7 +9,7 @@ function ViewDailog() {

        <DialogRoot placement="center">
            <DialogTrigger asChild>
-                <Edit />
+                <Span><Edit /></Span>
            </DialogTrigger>

            <DialogContent
--- 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, Icon, Input, Stack } from "@chakra-ui/react";
+import { Field, Icon, Input, Span, Stack } from "@chakra-ui/react";
 import {
  DialogActionTrigger,
  DialogBody,
@@ -20,17 +20,19 @@ function EditRegisterUsers() {
  return (
    <DialogRoot placement="center">
      <DialogTrigger asChild>
-            <Edit/>
+        <Span>
+          <Edit />
+        </Span>
      </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">
@@ -45,49 +47,81 @@ 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,4 +1,4 @@
-import { Box, HStack, Image, Input, Text } from "@chakra-ui/react";
+import { Box, HStack, Image, Input, Span, Text } from "@chakra-ui/react";
 import MainFrame from "../../../components/MainFrame";
 import AlertDailog from "../../../components/AlertDailog";
 import { RiDeleteBin5Line } from "react-icons/ri";
@@ -43,7 +43,7 @@ const registerUser: any[] = [
        <EditRegisterUsers />
        {/* <RiDeleteBin5Line style={{ cursor: "pointer" }} /> */}
        <AlertDailog
-          AltertTiggerIcon={() => <Delete />} // Pass as function
+          AltertTiggerIcon={() =><Delete /> } // Pass as function
          alertText="Delete Users"
          alertIcon={<Image src={"DeleteIcon"} h={"39px"} />}
          alertCaption="Are You Sure You Want To Delete This User ?"
--- a/src/Pages/ManageUsers/RegisterUsers/ViewRegisterUsers.tsx
+++ b/src/Pages/ManageUsers/RegisterUsers/ViewRegisterUsers.tsx
@@ -1,4 +1,4 @@
-import { Field, Input, Stack } from "@chakra-ui/react";
+import { Field, Input, Span, Stack } from "@chakra-ui/react";
 import View from "../../../components/ActionIcons/View";
 import {
  DialogBody,
@@ -14,17 +14,17 @@ function ViewRegisterUsers() {
  return (
    <DialogRoot placement="center">
      <DialogTrigger asChild>
-        <View />
+        <Span><View /></Span>
      </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,72 +39,42 @@ 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/EditAgencyMaster.tsx
+++ b/src/Pages/MasterModule/AgencyMaster/EditAgencyMaster.tsx
@@ -9,14 +9,14 @@ import {
  DialogTitle,
  DialogTrigger,
 } from "../../../components/ui/dialog";
-import { Field, Icon, Input, Stack } from "@chakra-ui/react";
+import { Field, Icon, Input, Span, Stack } from "@chakra-ui/react";
 import Edit from "../../../components/ActionIcons/Edit";

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

      <DialogContent
--- a/src/Pages/MasterModule/AgencyMaster/ViewAgencyMaster.tsx
+++ b/src/Pages/MasterModule/AgencyMaster/ViewAgencyMaster.tsx
@@ -8,7 +8,7 @@ import {
  DialogTitle,
  DialogTrigger,
 } from "../../../components/ui/dialog";
-import { Field, Icon, Input, Stack } from "@chakra-ui/react";
+import { Field, Icon, Input, Span, Stack } from "@chakra-ui/react";
 import { MdOutlineRemoveRedEye } from "react-icons/md";
 import { Button } from "../../../components/ui/button";
 import View from "../../../components/ActionIcons/View";
@@ -17,7 +17,7 @@ function ViewAgencyMaster() {
  return (
    <DialogRoot placement="center">
      <DialogTrigger asChild>
-        <View />
+        <Span><View /></Span>
      </DialogTrigger>

      <DialogContent
--- a/src/Pages/MasterModule/Country/EditCountryModel.tsx
+++ b/src/Pages/MasterModule/Country/EditCountryModel.tsx
@@ -8,7 +8,7 @@ import {
  DialogTitle,
  DialogTrigger,
 } from "../../../components/ui/dialog";
-import { Field, Input, Stack } from "@chakra-ui/react";
+import { Field, Input, Span, Stack } from "@chakra-ui/react";
 import { Button } from "../../../components/ui/button";
 import Edit from "../../../components/ActionIcons/Edit";

@@ -16,7 +16,7 @@ function EditCountryModel() {
  return (
    <DialogRoot placement="center">
      <DialogTrigger asChild>
-        <Edit />
+        <Span><Edit /></Span>
      </DialogTrigger>

      <DialogContent
--- a/src/Pages/MasterModule/JobStatus/EditJobStatusModel.tsx
+++ b/src/Pages/MasterModule/JobStatus/EditJobStatusModel.tsx
@@ -1,5 +1,5 @@
 import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
-import { Box, Field, IconButton, Input, Stack, Text, Textarea } from "@chakra-ui/react"
+import { Box, Field, IconButton, Input, Span, Stack, Text, Textarea } from "@chakra-ui/react"
 import { Button } from "../../../components/ui/button"
 import { FaRegEdit } from "react-icons/fa";
 import Edit from "../../../components/ActionIcons/Edit";
@@ -13,7 +13,7 @@ function EditJobStatusModel() {

        <DialogRoot placement="center">
            <DialogTrigger asChild>
-               <Edit />
+               <Span><Edit /></Span>
            </DialogTrigger>

            <DialogContent
--- a/src/Pages/MasterModule/JobType/EditJobModel.tsx
+++ b/src/Pages/MasterModule/JobType/EditJobModel.tsx
@@ -8,7 +8,7 @@ import {
  DialogTitle,
  DialogTrigger,
 } from "../../../components/ui/dialog";
-import { Field, Input, Stack } from "@chakra-ui/react";
+import { Field, Input, Span, Stack } from "@chakra-ui/react";
 import { Button } from "../../../components/ui/button";
 import Edit from "../../../components/ActionIcons/Edit";

@@ -16,7 +16,7 @@ function EditJobeModel() {
  return (
    <DialogRoot placement="center">
      <DialogTrigger asChild>
-        <Edit />
+        <Span><Edit /></Span>
      </DialogTrigger>

      <DialogContent
--- a/src/Pages/MasterModule/TemplateMaster/EditTemplateModel.tsx
+++ b/src/Pages/MasterModule/TemplateMaster/EditTemplateModel.tsx
@@ -13,6 +13,7 @@ import {
  Field,
  IconButton,
  Input,
+  Span,
  Stack,
  Text,
  Textarea,
@@ -41,7 +42,7 @@ function EditTemplateModel() {
  return (
    <DialogRoot placement="center">
      <DialogTrigger asChild>
-        <Edit />
+        <Span><Edit /></Span>
      </DialogTrigger>

      <DialogContent
--- a/src/Pages/MasterModule/WorkspaceMode/EditWorkModel.tsx
+++ b/src/Pages/MasterModule/WorkspaceMode/EditWorkModel.tsx
@@ -13,6 +13,7 @@ import {
  Field,
  IconButton,
  Input,
+  Span,
  Stack,
  Text,
  Textarea,
@@ -25,7 +26,7 @@ function EditWorkModel() {
  return (
    <DialogRoot placement="center">
      <DialogTrigger asChild>
-        <Edit />
+        <Span><Edit /></Span>
      </DialogTrigger>

      <DialogContent
--- a/src/Pages/SubAdmin/ViewSubAdmin.tsx
+++ b/src/Pages/SubAdmin/ViewSubAdmin.tsx
@@ -15,6 +15,7 @@ import {
  Heading,
  Icon,
  Input,
+  Span,
  Stack,
  Text,
 } from "@chakra-ui/react";
@@ -26,7 +27,7 @@ function ViewSubAdmin() {
  return (
    <DialogRoot placement="center">
      <DialogTrigger asChild>
-        <View />
+        <Span><View /></Span>
      </DialogTrigger>

      <DialogContent
--- a/src/components/AlertDailog.tsx
+++ b/src/components/AlertDailog.tsx
@@ -1,6 +1,6 @@
 import React from "react";

-import { DialogBody, HStack, Icon, Image, Text } from "@chakra-ui/react";
+import { DialogBody, HStack, Icon, Image, Span, Text } from "@chakra-ui/react";
 import { Button } from "./ui/button";
 import {
  DialogActionTrigger,
@@ -9,7 +9,7 @@ import {
  DialogRoot,
  DialogTrigger,
 } from "./ui/dialog";
-import DeleteICN from '../assets/deleteIcon.png'
+import DeleteICN from "../assets/deleteIcon.png";

 interface DeleteConfirmationDialogProps {
  onConfirm?: () => void;
@@ -40,16 +40,18 @@ const AlertDailog: React.FC<DeleteConfirmationDialogProps> = ({
        {button ? (
          button
        ) : (
-          <Icon
-            cursor={"pointer"}
-            p={0.5}
-            _hover={{ bg: "#00000015" }}
-            rounded={"md"}
-            boxSize={5}
-            color={iconColor && iconColor}
-          >
-            <AltertTiggerIcon />
-          </Icon>
+          <Span>
+            <Icon
+              cursor={"pointer"}
+              p={0.5}
+              _hover={{ bg: "#00000015" }}
+              rounded={"md"}
+              boxSize={5}
+              color={iconColor && iconColor}
+            >
+              <AltertTiggerIcon />
+            </Icon>
+          </Span>
        )}
      </DialogTrigger>
      <DialogContent bgColor="#fff">
@@ -66,7 +68,7 @@ const AlertDailog: React.FC<DeleteConfirmationDialogProps> = ({
          gap={2}
        >
          {/* {alertIcon && alertIcon} */}
-          <Image  w={'40px'} src={DeleteICN} />
+          <Image w={"40px"} src={DeleteICN} />
          <Text
            mt={3}
            fontWeight={600}
@@ -103,7 +105,7 @@ const AlertDailog: React.FC<DeleteConfirmationDialogProps> = ({
              borderRadius="sm"
              width="50%"
              // bgColor="#007F33"
-              bgColor={'#02A0A0'}
+              bgColor={"#02A0A0"}
              color="white"
              // colorPalette="#007F33"
              onClick={onConfirm}
--- a/src/components/EditSubAdmin.tsx
+++ b/src/components/EditSubAdmin.tsx
@@ -1,4 +1,4 @@
-import { Field, Grid, Heading, Icon, Input, Stack, Text } from "@chakra-ui/react";
+import { Field, Grid, Heading, Icon, Input, Span, Stack, Text } from "@chakra-ui/react";
 import { TbEdit } from "react-icons/tb";
 import { Button } from "./ui/button";
 import { Checkbox } from "./ui/checkbox";
@@ -19,7 +19,7 @@ function EditSubAdmin() {
      <DialogTrigger asChild>
          {/* <FaRegEdit style={{ cursor: "pointer" }} color="#000" /> */}

-          <Edit />
+          <Span><Edit /></Span>
        {/* <Button><FaRegEdit /></Button> */}
      </DialogTrigger>

--- a/src/components/ui/tooltip.tsx
+++ b/src/components/ui/tooltip.tsx
@@ -29,7 +29,7 @@ export const Tooltip = React.forwardRef<HTMLDivElement, TooltipProps>(
      <ChakraTooltip.Root {...rest}>
        <ChakraTooltip.Trigger asChild>{children}</ChakraTooltip.Trigger>
        <Portal disabled={!portalled} container={portalRef}>
-          <ChakraTooltip.Positioner>
+          <ChakraTooltip.Positioner>  
            <ChakraTooltip.Content ref={ref} {...contentProps}>
              {showArrow && (
                <ChakraTooltip.Arrow>
Author	SHA1	Message	Date
Siddhesh.More	dc1aa2250f	Merge branch 'yasin' of http://git.wdipl.com/Siddhesh.More/SSA-Admin-Panel	2025-02-12 20:05:52 +05:30
Siddhesh.More	a554803603	update	2025-02-12 20:04:40 +05:30
YasinShaikh123	0f11dd0019	[ update action ]	2025-02-12 20:03:47 +05:30