diff --git a/ipi-survey-platform/src/assets/images/BackVector.svg b/ipi-survey-platform/public/assets/images/BackVector.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/BackVector.svg rename to ipi-survey-platform/public/assets/images/BackVector.svg diff --git a/ipi-survey-platform/src/assets/images/Bell.svg b/ipi-survey-platform/public/assets/images/Bell.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/Bell.svg rename to ipi-survey-platform/public/assets/images/Bell.svg diff --git a/ipi-survey-platform/src/assets/images/CaretDoubleLeft.svg b/ipi-survey-platform/public/assets/images/CaretDoubleLeft.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/CaretDoubleLeft.svg rename to ipi-survey-platform/public/assets/images/CaretDoubleLeft.svg diff --git a/ipi-survey-platform/src/assets/images/CaretDoubleRight.svg b/ipi-survey-platform/public/assets/images/CaretDoubleRight.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/CaretDoubleRight.svg rename to ipi-survey-platform/public/assets/images/CaretDoubleRight.svg diff --git a/ipi-survey-platform/src/assets/images/CaretDown-black.svg b/ipi-survey-platform/public/assets/images/CaretDown-black.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/CaretDown-black.svg rename to ipi-survey-platform/public/assets/images/CaretDown-black.svg diff --git a/ipi-survey-platform/src/assets/images/CaretDown.svg b/ipi-survey-platform/public/assets/images/CaretDown.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/CaretDown.svg rename to ipi-survey-platform/public/assets/images/CaretDown.svg diff --git a/ipi-survey-platform/src/assets/images/CaretLeft.svg b/ipi-survey-platform/public/assets/images/CaretLeft.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/CaretLeft.svg rename to ipi-survey-platform/public/assets/images/CaretLeft.svg diff --git a/ipi-survey-platform/src/assets/images/CaretRight.svg b/ipi-survey-platform/public/assets/images/CaretRight.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/CaretRight.svg rename to ipi-survey-platform/public/assets/images/CaretRight.svg diff --git a/ipi-survey-platform/src/assets/images/CheckCircle-active.svg b/ipi-survey-platform/public/assets/images/CheckCircle-active.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/CheckCircle-active.svg rename to ipi-survey-platform/public/assets/images/CheckCircle-active.svg diff --git a/ipi-survey-platform/src/assets/images/CheckCircle-inactive.svg b/ipi-survey-platform/public/assets/images/CheckCircle-inactive.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/CheckCircle-inactive.svg rename to ipi-survey-platform/public/assets/images/CheckCircle-inactive.svg diff --git a/ipi-survey-platform/src/assets/images/CircleFrame.svg b/ipi-survey-platform/public/assets/images/CircleFrame.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/CircleFrame.svg rename to ipi-survey-platform/public/assets/images/CircleFrame.svg diff --git a/ipi-survey-platform/src/assets/images/DownloadSimple.svg b/ipi-survey-platform/public/assets/images/DownloadSimple.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/DownloadSimple.svg rename to ipi-survey-platform/public/assets/images/DownloadSimple.svg diff --git a/ipi-survey-platform/src/assets/images/Establishment.svg b/ipi-survey-platform/public/assets/images/Establishment.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/Establishment.svg rename to ipi-survey-platform/public/assets/images/Establishment.svg diff --git a/ipi-survey-platform/src/assets/images/Establishmentid.svg b/ipi-survey-platform/public/assets/images/Establishmentid.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/Establishmentid.svg rename to ipi-survey-platform/public/assets/images/Establishmentid.svg diff --git a/ipi-survey-platform/src/assets/images/FCSCLogo.svg b/ipi-survey-platform/public/assets/images/FCSCLogo.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/FCSCLogo.svg rename to ipi-survey-platform/public/assets/images/FCSCLogo.svg diff --git a/ipi-survey-platform/src/assets/images/PencilSimple.svg b/ipi-survey-platform/public/assets/images/PencilSimple.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/PencilSimple.svg rename to ipi-survey-platform/public/assets/images/PencilSimple.svg diff --git a/ipi-survey-platform/src/assets/images/PrimaryButton.svg b/ipi-survey-platform/public/assets/images/PrimaryButton.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/PrimaryButton.svg rename to ipi-survey-platform/public/assets/images/PrimaryButton.svg diff --git a/ipi-survey-platform/src/assets/images/Rectangle.svg b/ipi-survey-platform/public/assets/images/Rectangle.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/Rectangle.svg rename to ipi-survey-platform/public/assets/images/Rectangle.svg diff --git a/ipi-survey-platform/src/assets/images/Trash - Inactive.svg b/ipi-survey-platform/public/assets/images/Trash - Inactive.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/Trash - Inactive.svg rename to ipi-survey-platform/public/assets/images/Trash - Inactive.svg diff --git a/ipi-survey-platform/src/assets/images/Trash - active.svg b/ipi-survey-platform/public/assets/images/Trash - active.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/Trash - active.svg rename to ipi-survey-platform/public/assets/images/Trash - active.svg diff --git a/ipi-survey-platform/src/assets/images/Upload-import.svg b/ipi-survey-platform/public/assets/images/Upload-import.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/Upload-import.svg rename to ipi-survey-platform/public/assets/images/Upload-import.svg diff --git a/ipi-survey-platform/src/assets/images/UploadSimple.svg b/ipi-survey-platform/public/assets/images/UploadSimple.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/UploadSimple.svg rename to ipi-survey-platform/public/assets/images/UploadSimple.svg diff --git a/ipi-survey-platform/src/assets/images/User-active.svg b/ipi-survey-platform/public/assets/images/User-active.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/User-active.svg rename to ipi-survey-platform/public/assets/images/User-active.svg diff --git a/ipi-survey-platform/src/assets/images/User-inactive.svg b/ipi-survey-platform/public/assets/images/User-inactive.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/User-inactive.svg rename to ipi-survey-platform/public/assets/images/User-inactive.svg diff --git a/ipi-survey-platform/src/assets/images/UserGear.svg b/ipi-survey-platform/public/assets/images/UserGear.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/UserGear.svg rename to ipi-survey-platform/public/assets/images/UserGear.svg diff --git a/ipi-survey-platform/src/assets/images/Vector.svg b/ipi-survey-platform/public/assets/images/Vector.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/Vector.svg rename to ipi-survey-platform/public/assets/images/Vector.svg diff --git a/ipi-survey-platform/src/assets/images/Vectorblack.svg b/ipi-survey-platform/public/assets/images/Vectorblack.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/Vectorblack.svg rename to ipi-survey-platform/public/assets/images/Vectorblack.svg diff --git a/ipi-survey-platform/src/assets/images/active-user.svg b/ipi-survey-platform/public/assets/images/active-user.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/active-user.svg rename to ipi-survey-platform/public/assets/images/active-user.svg diff --git a/ipi-survey-platform/src/assets/images/caret-up.svg b/ipi-survey-platform/public/assets/images/caret-up.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/caret-up.svg rename to ipi-survey-platform/public/assets/images/caret-up.svg diff --git a/ipi-survey-platform/src/assets/images/caretdown-active.svg b/ipi-survey-platform/public/assets/images/caretdown-active.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/caretdown-active.svg rename to ipi-survey-platform/public/assets/images/caretdown-active.svg diff --git a/ipi-survey-platform/src/assets/images/check-circle-fill 1-approved.svg b/ipi-survey-platform/public/assets/images/check-circle-fill 1-approved.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/check-circle-fill 1-approved.svg rename to ipi-survey-platform/public/assets/images/check-circle-fill 1-approved.svg diff --git a/ipi-survey-platform/src/assets/images/check-circle-fill 1.svg b/ipi-survey-platform/public/assets/images/check-circle-fill 1.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/check-circle-fill 1.svg rename to ipi-survey-platform/public/assets/images/check-circle-fill 1.svg diff --git a/ipi-survey-platform/src/assets/images/checkbox.svg b/ipi-survey-platform/public/assets/images/checkbox.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/checkbox.svg rename to ipi-survey-platform/public/assets/images/checkbox.svg diff --git a/ipi-survey-platform/src/assets/images/configrationicon-active.svg b/ipi-survey-platform/public/assets/images/configrationicon-active.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/configrationicon-active.svg rename to ipi-survey-platform/public/assets/images/configrationicon-active.svg diff --git a/ipi-survey-platform/src/assets/images/configrationicon-inactive.svg b/ipi-survey-platform/public/assets/images/configrationicon-inactive.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/configrationicon-inactive.svg rename to ipi-survey-platform/public/assets/images/configrationicon-inactive.svg diff --git a/ipi-survey-platform/src/assets/images/cuida_dashboard-outline-inactive.svg b/ipi-survey-platform/public/assets/images/cuida_dashboard-outline-inactive.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/cuida_dashboard-outline-inactive.svg rename to ipi-survey-platform/public/assets/images/cuida_dashboard-outline-inactive.svg diff --git a/ipi-survey-platform/src/assets/images/cuida_dashboard-outline.svg b/ipi-survey-platform/public/assets/images/cuida_dashboard-outline.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/cuida_dashboard-outline.svg rename to ipi-survey-platform/public/assets/images/cuida_dashboard-outline.svg diff --git a/ipi-survey-platform/src/assets/images/delete.svg b/ipi-survey-platform/public/assets/images/delete.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/delete.svg rename to ipi-survey-platform/public/assets/images/delete.svg diff --git a/ipi-survey-platform/src/assets/images/emailid.svg b/ipi-survey-platform/public/assets/images/emailid.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/emailid.svg rename to ipi-survey-platform/public/assets/images/emailid.svg diff --git a/ipi-survey-platform/src/assets/images/emirates.svg b/ipi-survey-platform/public/assets/images/emirates.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/emirates.svg rename to ipi-survey-platform/public/assets/images/emirates.svg diff --git a/ipi-survey-platform/src/assets/images/femaleemployess.svg b/ipi-survey-platform/public/assets/images/femaleemployess.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/femaleemployess.svg rename to ipi-survey-platform/public/assets/images/femaleemployess.svg diff --git a/ipi-survey-platform/src/assets/images/history.svg b/ipi-survey-platform/public/assets/images/history.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/history.svg rename to ipi-survey-platform/public/assets/images/history.svg diff --git a/ipi-survey-platform/src/assets/images/hugeicons_reset-password-inactive.svg b/ipi-survey-platform/public/assets/images/hugeicons_reset-password-inactive.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/hugeicons_reset-password-inactive.svg rename to ipi-survey-platform/public/assets/images/hugeicons_reset-password-inactive.svg diff --git a/ipi-survey-platform/src/assets/images/hugeicons_reset-password.svg b/ipi-survey-platform/public/assets/images/hugeicons_reset-password.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/hugeicons_reset-password.svg rename to ipi-survey-platform/public/assets/images/hugeicons_reset-password.svg diff --git a/ipi-survey-platform/src/assets/images/ic_baseline-plus.svg b/ipi-survey-platform/public/assets/images/ic_baseline-plus.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/ic_baseline-plus.svg rename to ipi-survey-platform/public/assets/images/ic_baseline-plus.svg diff --git a/ipi-survey-platform/src/assets/images/inactive-user.svg b/ipi-survey-platform/public/assets/images/inactive-user.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/inactive-user.svg rename to ipi-survey-platform/public/assets/images/inactive-user.svg diff --git a/ipi-survey-platform/src/assets/images/info-fill 1.svg b/ipi-survey-platform/public/assets/images/info-fill 1.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/info-fill 1.svg rename to ipi-survey-platform/public/assets/images/info-fill 1.svg diff --git a/ipi-survey-platform/public/assets/images/line-md_phone.svg b/ipi-survey-platform/public/assets/images/line-md_phone.svg new file mode 100644 index 0000000..948fcca --- /dev/null +++ b/ipi-survey-platform/public/assets/images/line-md_phone.svg @@ -0,0 +1,3 @@ + + + diff --git a/ipi-survey-platform/src/assets/images/maleemployes.svg b/ipi-survey-platform/public/assets/images/maleemployes.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/maleemployes.svg rename to ipi-survey-platform/public/assets/images/maleemployes.svg diff --git a/ipi-survey-platform/src/assets/images/managesubmission - inactive.svg b/ipi-survey-platform/public/assets/images/managesubmission - inactive.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/managesubmission - inactive.svg rename to ipi-survey-platform/public/assets/images/managesubmission - inactive.svg diff --git a/ipi-survey-platform/public/assets/images/material-symbols_mail-outline.svg b/ipi-survey-platform/public/assets/images/material-symbols_mail-outline.svg new file mode 100644 index 0000000..66a99fe --- /dev/null +++ b/ipi-survey-platform/public/assets/images/material-symbols_mail-outline.svg @@ -0,0 +1,3 @@ + + + diff --git a/ipi-survey-platform/src/assets/images/material-symbols_search-rounded.svg b/ipi-survey-platform/public/assets/images/material-symbols_search-rounded.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/material-symbols_search-rounded.svg rename to ipi-survey-platform/public/assets/images/material-symbols_search-rounded.svg diff --git a/ipi-survey-platform/src/assets/images/mdi_history.svg b/ipi-survey-platform/public/assets/images/mdi_history.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/mdi_history.svg rename to ipi-survey-platform/public/assets/images/mdi_history.svg diff --git a/ipi-survey-platform/src/assets/images/nonuae.svg b/ipi-survey-platform/public/assets/images/nonuae.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/nonuae.svg rename to ipi-survey-platform/public/assets/images/nonuae.svg diff --git a/ipi-survey-platform/src/assets/images/pencilsimple-inactive.svg b/ipi-survey-platform/public/assets/images/pencilsimple-inactive.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/pencilsimple-inactive.svg rename to ipi-survey-platform/public/assets/images/pencilsimple-inactive.svg diff --git a/ipi-survey-platform/src/assets/images/qlementine-icons_preview-16.svg b/ipi-survey-platform/public/assets/images/qlementine-icons_preview-16.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/qlementine-icons_preview-16.svg rename to ipi-survey-platform/public/assets/images/qlementine-icons_preview-16.svg diff --git a/ipi-survey-platform/src/assets/images/resetpassword.svg b/ipi-survey-platform/public/assets/images/resetpassword.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/resetpassword.svg rename to ipi-survey-platform/public/assets/images/resetpassword.svg diff --git a/ipi-survey-platform/src/assets/images/totalemployess.svg b/ipi-survey-platform/public/assets/images/totalemployess.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/totalemployess.svg rename to ipi-survey-platform/public/assets/images/totalemployess.svg diff --git a/ipi-survey-platform/src/assets/images/uae.svg b/ipi-survey-platform/public/assets/images/uae.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/uae.svg rename to ipi-survey-platform/public/assets/images/uae.svg diff --git a/ipi-survey-platform/src/assets/images/uil_calender.svg b/ipi-survey-platform/public/assets/images/uil_calender.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/uil_calender.svg rename to ipi-survey-platform/public/assets/images/uil_calender.svg diff --git a/ipi-survey-platform/src/assets/images/warning-circle-fill 1.svg b/ipi-survey-platform/public/assets/images/warning-circle-fill 1.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/warning-circle-fill 1.svg rename to ipi-survey-platform/public/assets/images/warning-circle-fill 1.svg diff --git a/ipi-survey-platform/src/assets/images/warning-fill 1.svg b/ipi-survey-platform/public/assets/images/warning-fill 1.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/warning-fill 1.svg rename to ipi-survey-platform/public/assets/images/warning-fill 1.svg diff --git a/ipi-survey-platform/src/assets/images/wpf_survey.svg b/ipi-survey-platform/public/assets/images/wpf_survey.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/wpf_survey.svg rename to ipi-survey-platform/public/assets/images/wpf_survey.svg diff --git a/ipi-survey-platform/src/components/admin/AdminHeader.jsx b/ipi-survey-platform/src/components/admin/AdminHeader.jsx index c9e2bb6..4b27f34 100644 --- a/ipi-survey-platform/src/components/admin/AdminHeader.jsx +++ b/ipi-survey-platform/src/components/admin/AdminHeader.jsx @@ -1,15 +1,16 @@ import React from 'react'; import { NavLink, useNavigate } from 'react-router-dom'; -import Logo from '@/assets/images/fcsclogo.svg'; -import DashboardIconActive from '@/assets/images/cuida_dashboard-outline.svg'; -import DashboardIconInactive from '@/assets/images/cuida_dashboard-outline-inactive.svg'; -import CheckCircleActive from '@/assets/images/checkcircle-active.svg'; -import ConfigActive from '@/assets/images/configrationicon-active.svg'; -import ConfigInactive from '@/assets/images/configrationicon-inactive.svg'; -import UserActive from '@/assets/images/user-active.svg'; -import UserInactive from '@/assets/images/user-inactive.svg'; -import ManageSubmissionInactive from '@/assets/images/managesubmission - inactive.svg'; -import BellIconAsset from '@/assets/images/bell.svg'; + +const logoSrc = '/assets/images/FCSCLogo.svg'; +const dashboardIconActiveSrc = '/assets/images/cuida_dashboard-outline.svg'; +const dashboardIconInactiveSrc = '/assets/images/cuida_dashboard-outline-inactive.svg'; +const checkCircleActiveSrc = '/assets/images/CheckCircle-active.svg'; +const configActiveSrc = '/assets/images/configrationicon-active.svg'; +const configInactiveSrc = '/assets/images/configrationicon-inactive.svg'; +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 }) => ( {
- FCSC + FCSC
{rangeStart} @@ -226,7 +227,7 @@ const Table = ({ disabled={!hasNext} aria-label="Next page" > - Next + Next
@@ -254,7 +255,7 @@ const Table = ({ onClick={() => goToPage(1)} disabled={!hasPrevious} > - First + First First @@ -299,7 +300,7 @@ const Table = ({ disabled={!hasNext} > Next - Next + Next
diff --git a/ipi-survey-platform/src/components/dashboard/SubmissionHistory.jsx b/ipi-survey-platform/src/components/dashboard/SubmissionHistory.jsx index 11ebb94..f759eb0 100644 --- a/ipi-survey-platform/src/components/dashboard/SubmissionHistory.jsx +++ b/ipi-survey-platform/src/components/dashboard/SubmissionHistory.jsx @@ -1,8 +1,9 @@ import React from 'react'; import { useNavigate } from 'react-router-dom'; import Table from '@/components/common/Table'; -import SearchIcon from '@/assets/images/material-symbols_search-rounded.svg'; -import CaretDown from '@/assets/images/caretdown.svg'; + +const searchIconSrc = '/assets/images/material-symbols_search-rounded.svg'; +const caretDownSrc = '/assets/images/CaretDown.svg'; const getStatusClass = (status) => { const normalized = String(status || '').toLowerCase(); @@ -115,7 +116,7 @@ export const SubmissionHistory = ({ history = [], loading = false, error = '' }) className="w-full h-10 rounded-md border border-[#E5E7EB] pl-10 pr-3 text-sm focus:outline-none" /> Search @@ -133,7 +134,7 @@ export const SubmissionHistory = ({ history = [], loading = false, error = '' }) ))} Open diff --git a/ipi-survey-platform/src/components/dashboard/SurveyStatus.jsx b/ipi-survey-platform/src/components/dashboard/SurveyStatus.jsx index 89e65ae..2b79a09 100644 --- a/ipi-survey-platform/src/components/dashboard/SurveyStatus.jsx +++ b/ipi-survey-platform/src/components/dashboard/SurveyStatus.jsx @@ -29,7 +29,12 @@ const formatRelativeDays = (value) => { export const SurveyStatus = ({ data = null, loading = false, error = '' }) => { const navigate = useNavigate(); const handleStartSurvey = () => { - navigate('/survey'); + navigate('/survey', { + state: { + currentQuarter: data?.current_quarter, + currentYear: data?.current_quarter_year + } + }); }; const submissionStatus = data?.submission_status || '—'; diff --git a/ipi-survey-platform/src/components/layout/HeaderBar.jsx b/ipi-survey-platform/src/components/layout/HeaderBar.jsx index 52d5eca..94bc91d 100644 --- a/ipi-survey-platform/src/components/layout/HeaderBar.jsx +++ b/ipi-survey-platform/src/components/layout/HeaderBar.jsx @@ -1,12 +1,13 @@ import React from 'react'; import { NavLink, useNavigate } from 'react-router-dom'; -import Logo from '@/assets/images/fcsclogo.svg'; -import SurveyIconActive from '@/assets/images/vector.svg'; -import SurveyIconInactive from '@/assets/images/vectorblack.svg'; -import DashboardIconActive from '@/assets/images/cuida_dashboard-outline.svg'; -import DashboardIconInactive from '@/assets/images/cuida_dashboard-outline-inactive.svg'; -import HistoryIconActive from '@/assets/images/mdi_history.svg'; -import HistoryIconInactive from '@/assets/images/history.svg'; + +const logoSrc = '/assets/images/FCSCLogo.svg'; +const surveyIconActiveSrc = '/assets/images/Vector.svg'; +const surveyIconInactiveSrc = '/assets/images/Vectorblack.svg'; +const dashboardIconActiveSrc = '/assets/images/cuida_dashboard-outline.svg'; +const dashboardIconInactiveSrc = '/assets/images/cuida_dashboard-outline-inactive.svg'; +const historyIconActiveSrc = '/assets/images/mdi_history.svg'; +const historyIconInactiveSrc = '/assets/images/history.svg'; const HeaderBar = () => { const [open, setOpen] = React.useState(false); @@ -62,7 +63,7 @@ const HeaderBar = () => {
- FCSC + FCSC
); }; diff --git a/ipi-survey-platform/src/components/survey/ProductData/ProductData.jsx b/ipi-survey-platform/src/components/survey/ProductData/ProductData.jsx index 80acd60..3f97db7 100644 --- a/ipi-survey-platform/src/components/survey/ProductData/ProductData.jsx +++ b/ipi-survey-platform/src/components/survey/ProductData/ProductData.jsx @@ -5,25 +5,41 @@ import { fetchProducts, fetchUnits, } from '@/services/masters/masterService.js'; -import CaretDown from '@/assets/images/caretdown-black.svg'; -const Input = ({ placeholder = '', type = 'text', value = '', onChange = () => {} }) => ( - -); +const caretDownSrc = '/assets/images/CaretDown-black.svg'; -const Select = ({ placeholder = '', options = [], value = '', onChange }) => ( -
- setIsFocused(true)} + onBlur={() => setIsFocused(false)} + required={required} + className={`block w-full h-10 rounded-md border-2 ${borderColor} focus:ring-0 px-4 text-sm bg-white transition-colors`} + /> +
+ ); +}; + +const Select = ({ placeholder = '', options = [], value = '', onChange }) => { + const [isFocused, setIsFocused] = React.useState(false); + + return ( +
+ - open + open
-); + ); +}; -const Textarea = ({ placeholder = '', value = '', onChange = () => {} }) => ( -