diff --git a/src/Components/CurrencyInput.jsx b/src/Components/CurrencyInput.jsx index 573c341..c961c18 100644 --- a/src/Components/CurrencyInput.jsx +++ b/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} /> diff --git a/src/Components/HeaderMain.jsx b/src/Components/HeaderMain.jsx index c0eef63..63b24d3 100644 --- a/src/Components/HeaderMain.jsx +++ b/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 ( - {/* navigate(-1)} /> */} - - {/* */} - {title} - + {/* navigate(-1)} /> */} + + {/* */} + {title} + - @@ -91,7 +89,7 @@ const HeaderMain = ({ boxSize={37} name="Tanami M" src={logoMini} - bg={'green.100'} + bg={"green.100"} // p={1} /> { - 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} @@ -741,7 +734,7 @@ const DashboardLayout = ({ isOnline }) => { */} { export default DashboardLayout; -const AppContent = ({data}) => { - +const AppContent = ({ data }) => { return ( {RouteLink.map(({ path, Component }, index) => ( @@ -769,11 +761,7 @@ const AppContent = ({data}) => { - ) : ( - - ) + data?.data?.role === "Maker" ? : } /> { element={ data?.data?.role === "Maker" ? ( - ) : ( + ) : ( ) }