Merge branch 'dev' of http://git.wdipl.com/Siddhesh.More/tanami-admin-panel into dev

src/Components/CurrencyInput.jsx

@@ -34,6 +34,7 @@ const CurrencyInput = forwardRef(({ value, onChange, ...props }, ref) => {
       {...props}
       ref={ref}  // Forward ref here
       type="text"
+      focusBorderColor="forestGreen.300"
       value={formatCurrency(value)}
       onChange={handleChange}
     />

src/Components/HeaderMain.jsx

@@ -21,7 +21,7 @@ import * as XLSX from "xlsx";
 import profile from "../assets/proavatar.webp";
 import GlobalStateContext from "../Contexts/GlobalStateContext";
 import { MdOutlineDarkMode, MdOutlineLightMode } from "react-icons/md";
-import logoMini from "../assets/propic.png"
+import logoMini from "../assets/propic.png";
 import { BsBack } from "react-icons/bs";
 
 const HeaderMain = ({
@@ -31,12 +31,11 @@ const HeaderMain = ({
   icon,
   logOutHandler,
   slideDirecttion,
-  data
+  data,
 }) => {
-  const navigate = useNavigate()
+  const navigate = useNavigate();
   const { colorMode, toggleColorMode } = useContext(GlobalStateContext);
 
-
   return (
     <Box
       className={` pt-2 pb-2   fw-400 border-bottom d-flex ${
@@ -47,19 +46,18 @@ const HeaderMain = ({
       zIndex={999}
     >
       <HStack>
-      {/* <ArrowBackIcon onClick={()=>navigate(-1)} /> */}
-      <Text
-        as={"span"}
-        fontWeight={"500"}
-        // color={"forestGreen.500"}
-        className="fs-6 "
-      >
-        {/* <icon /> */}
-        {title}
-      </Text>
+        {/* <ArrowBackIcon onClick={()=>navigate(-1)} /> */}
+        <Text
+          as={"span"}
+          fontWeight={"500"}
+          // color={"forestGreen.500"}
+          className="fs-6 "
+        >
+          {/* <icon /> */}
+          {title}
+        </Text>
       </HStack>
 
-      
       <Box me={4} gap={2} className="d-flex justify-content-center ">
         <Popover placement="bottom">
           <Portal>
@@ -91,7 +89,7 @@ const HeaderMain = ({
                 boxSize={37}
                 name="Tanami M"
                 src={logoMini}
-                bg={'green.100'}
+                bg={"green.100"}
                 // p={1}
               />
               <Box

src/Layout/DefaultLayout.jsx

@@ -82,10 +82,7 @@ import ApproveHistoryMaker from "../Pages/FawateerChecker/ApproveHistory/Approve
 import ApproveHistory from "../Pages/FawateerChecker/ApproveHistory/ApproveHistoryChecker";
 import { useProfileQuery } from "../Services/io.service";
 
-
-
 const DashboardLayout = ({ isOnline }) => {
-
   const userRole = localStorage.getItem("role");
   const navigate = useNavigate();
   const dispach = useDispatch();
@@ -103,12 +100,7 @@ const DashboardLayout = ({ isOnline }) => {
   const [isSplashVisible, setSplashVisible] = useState(true);
   const [openIndex, setOpenIndex] = useState(null);
 
-
-  const {
-    data,
-    refetch
-  } = useProfileQuery()
-
+  const { data, refetch } = useProfileQuery();
 
   useEffect(() => {
     if (
@@ -138,14 +130,11 @@ const DashboardLayout = ({ isOnline }) => {
     const timer = setTimeout(() => {
       setSplashVisible(false);
     }, 1000); // 3000ms = 3 seconds
-    refetch()
+    refetch();
     // Cleanup the timer
     return () => clearTimeout(timer);
   }, []);
 
-  
-
-
   const openDrawerOnClick = () => {
     setOpenDrawerClick(!openDrawerClick);
   };
@@ -641,7 +630,11 @@ const DashboardLayout = ({ isOnline }) => {
                                     alignItems="center"
                                     overflow="hidden"
                                   >
-                                    {subMenuTitle === "Aprover Request"? data?.data?.role === "Maker"?"Create Request" : "Aprover Request":subMenuTitle}
+                                    {subMenuTitle === "Aprover Request"
+                                      ? data?.data?.role === "Maker"
+                                        ? "Create Request"
+                                        : "Aprover Request"
+                                      : subMenuTitle}
                                   </Text>
                                 </NavLink>
                               </Box>
@@ -741,7 +734,7 @@ const DashboardLayout = ({ isOnline }) => {
         </header> */}
 
         <HeaderMain
-        data={data}
+          data={data}
           slideDirecttion={slideFromRight}
           logOutHandler={logOutHandler}
           icon
@@ -758,8 +751,7 @@ const DashboardLayout = ({ isOnline }) => {
 
 export default DashboardLayout;
 
-const AppContent = ({data}) => {
-  
+const AppContent = ({ data }) => {
   return (
     <Routes>
       {RouteLink.map(({ path, Component }, index) => (
@@ -769,11 +761,7 @@ const AppContent = ({data}) => {
       <Route
         path="/fawateer"
         element={
-          data?.data?.role === "Maker" ? (
-            <CreateRequest />
-          ) : (
-            <ApproveRequest />
-          )
+          data?.data?.role === "Maker" ? <CreateRequest /> : <ApproveRequest />
         }
       />
       <Route
@@ -781,7 +769,7 @@ const AppContent = ({data}) => {
         element={
           data?.data?.role === "Maker" ? (
             <ApproveHistoryMaker />
-          ) :  (
+          ) : (
             <ApproveHistory />
           )
         }