diff --git a/ipi-survey-platform/src/components/admin/AdminHeader.jsx b/ipi-survey-platform/src/components/admin/AdminHeader.jsx index 2f3c5d4..b67af1a 100644 --- a/ipi-survey-platform/src/components/admin/AdminHeader.jsx +++ b/ipi-survey-platform/src/components/admin/AdminHeader.jsx @@ -1,6 +1,7 @@ import React, { useRef, useEffect } from 'react'; import { NavLink, useNavigate } from 'react-router-dom'; import { logout as logoutApi } from '@/services/auth/authService'; +import { TbReport } from "react-icons/tb"; const logoSrc = '/assets/images/FCSCLogo.svg'; const dashboardIconActiveSrc = '/assets/images/cuida_dashboard-outline.svg'; @@ -8,42 +9,58 @@ const dashboardIconInactiveSrc = '/assets/images/cuida_dashboard-outline-inactiv const checkCircleActiveSrc = '/assets/images/CheckCircle-active.svg'; const configActiveSrc = '/assets/images/configrationicon-active.svg'; const configInactiveSrc = '/assets/images/configrationicon-inactive.svg'; +const manufacturingIndexActive = ; +const manufacturingIndexInactive = ; const userActiveSrc = '/assets/images/User-active.svg'; const userInactiveSrc = '/assets/images/User-inactive.svg'; const manageSubmissionInactiveSrc = '/assets/images/managesubmission - inactive.svg'; const bellIconSrc = '/assets/images/Bell.svg'; -const NavItem = ({ label, to, iconActive, iconInactive, end = false }) => ( - - `inline-flex items-center gap-2 pb-1 border-b-2 text-[14px] leading-5 ` + - (isActive - ? 'text-[#92722A] font-medium border-[#92722A]' - : 'text-[#232528] border-transparent hover:text-gray-900') - } - > - {({ isActive }) => ( - <> - {iconActive && iconInactive ? ( - {label} - ) : ( - - )} - {label} - - )} - -); +const NavItem = ({ label, to, iconActive, iconInactive, end = false }) => { + const isReactElement = React.isValidElement(iconActive) || React.isValidElement(iconInactive); + + return ( + + `inline-flex items-center gap-2 pb-1 border-b-2 text-[14px] leading-5 ` + + (isActive + ? 'text-[#92722A] font-medium border-[#92722A]' + : 'text-[#232528] border-transparent hover:text-gray-900') + } + > + {({ isActive }) => { + const icon = isActive ? iconActive : iconInactive; + + return ( + <> + {isReactElement ? ( + + {React.cloneElement(icon, { style: { fontSize: 18 } })} + + ) : icon ? ( + {label} + ) : ( + + )} + {label} + + ); + }} + + ); +}; const AdminHeader = () => { const [open, setOpen] = React.useState(false); @@ -149,8 +166,8 @@ const AdminHeader = () => { diff --git a/ipi-survey-platform/src/pages/ManufacturingIndex/ManufacturingIndex.jsx b/ipi-survey-platform/src/pages/ManufacturingIndex/ManufacturingIndex.jsx index 6071878..5c990fc 100644 --- a/ipi-survey-platform/src/pages/ManufacturingIndex/ManufacturingIndex.jsx +++ b/ipi-survey-platform/src/pages/ManufacturingIndex/ManufacturingIndex.jsx @@ -14,7 +14,8 @@ import { InfoOutlined as InfoOutlinedIcon, NavigateNext as NavigateNextIcon } from '@mui/icons-material'; -import { Breadcrumbs, Link } from '@mui/material'; +import { Breadcrumbs } from '@mui/material'; +import { Link } from 'react-router-dom'; import Card from '@/components/common/Card'; import { getManufacturingIndex, getManufacturingMonthlyOverview } from '@/services/manufacturingIndex/ManufacturingIndex'; @@ -453,7 +454,7 @@ const ManufacturingIndex = () => {