From 42038de75e8365dc57fe97dab86e5a01b134c5e1 Mon Sep 17 00:00:00 2001 From: Malini Date: Wed, 29 Oct 2025 15:39:30 +0530 Subject: [PATCH] rearrange the icons name --- .../{Active - User.svg => active-user.svg} | 0 ...Down - active.svg => caretdown-active.svg} | 0 ...{Inactive - user.svg => inactive-user.svg} | 0 ...inactive.svg => pencilsimple-inactive.svg} | 0 .../src/components/admin/AdminHeader.jsx | 10 ++++---- .../src/components/common/FormControls.jsx | 24 +++++++++++++------ .../src/components/common/Table.jsx | 8 +++---- .../dashboard/SubmissionHistory.jsx | 2 +- .../src/components/layout/HeaderBar.jsx | 4 ++-- .../EstablishmentInfo/EstablishmentInfo.jsx | 1 - .../survey/ProductData/ProductData.jsx | 2 +- .../src/pages/Admin/ValidationReview.jsx | 4 ++-- .../src/pages/Admin/Validations.jsx | 2 +- .../pages/Admin/configuration/AdminUsers.jsx | 14 +++++------ .../Admin/configuration/CompanyProfile.jsx | 17 +++++++++---- .../Admin/configuration/Establishment.jsx | 10 ++++---- .../pages/Admin/configuration/IsicHsCodes.jsx | 12 +++++----- .../Admin/configuration/QuarterlyWindows.jsx | 14 +++++------ .../pages/Admin/configuration/UnitMaster.jsx | 14 +++++------ .../pages/ChangePassword/ChangePassword.jsx | 2 +- .../pages/ForgotPassword/ForgotPassword.jsx | 2 +- .../src/pages/History/History.jsx | 2 +- ipi-survey-platform/src/pages/Login/Login.jsx | 2 +- .../src/pages/PublicContactForm.jsx | 2 +- .../src/pages/Survey/Survey.jsx | 2 +- 25 files changed, 83 insertions(+), 67 deletions(-) rename ipi-survey-platform/src/assets/images/{Active - User.svg => active-user.svg} (100%) rename ipi-survey-platform/src/assets/images/{CaretDown - active.svg => caretdown-active.svg} (100%) rename ipi-survey-platform/src/assets/images/{Inactive - user.svg => inactive-user.svg} (100%) rename ipi-survey-platform/src/assets/images/{PencilSimple - inactive.svg => pencilsimple-inactive.svg} (100%) diff --git a/ipi-survey-platform/src/assets/images/Active - User.svg b/ipi-survey-platform/src/assets/images/active-user.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/Active - User.svg rename to ipi-survey-platform/src/assets/images/active-user.svg diff --git a/ipi-survey-platform/src/assets/images/CaretDown - active.svg b/ipi-survey-platform/src/assets/images/caretdown-active.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/CaretDown - active.svg rename to ipi-survey-platform/src/assets/images/caretdown-active.svg diff --git a/ipi-survey-platform/src/assets/images/Inactive - user.svg b/ipi-survey-platform/src/assets/images/inactive-user.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/Inactive - user.svg rename to ipi-survey-platform/src/assets/images/inactive-user.svg diff --git a/ipi-survey-platform/src/assets/images/PencilSimple - inactive.svg b/ipi-survey-platform/src/assets/images/pencilsimple-inactive.svg similarity index 100% rename from ipi-survey-platform/src/assets/images/PencilSimple - inactive.svg rename to ipi-survey-platform/src/assets/images/pencilsimple-inactive.svg diff --git a/ipi-survey-platform/src/components/admin/AdminHeader.jsx b/ipi-survey-platform/src/components/admin/AdminHeader.jsx index bc3c62a..379eddd 100644 --- a/ipi-survey-platform/src/components/admin/AdminHeader.jsx +++ b/ipi-survey-platform/src/components/admin/AdminHeader.jsx @@ -1,15 +1,15 @@ import React from 'react'; import { NavLink, useNavigate } from 'react-router-dom'; -import Logo from '../../assets/images/FCSCLogo.svg'; +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 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 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'; +import BellIconAsset from '../../assets/images/bell.svg'; const NavItem = ({ label, to, iconActive, iconInactive, end = false }) => ( @@ -196,7 +203,10 @@ export const SelectField = ({ : focused ? focusBorderColors[variant] : idleBorderColors[variant] || idleBorderColors.default; - if (variant === 'toolbar') { + if (hasError) { + inputStyle.backgroundColor = '#FEF2F2'; + inputStyle.color = '#B91C1C'; + } else if (variant === 'toolbar') { inputStyle.color = hasValue && value !== 'All' && value !== 'Status' && value !== 'Year' && value !== 'Quarter' && value !== 'Emirates' ? '#232528' : '#5F646D'; } else { inputStyle.color = hasValue ? '#232528' : '#232528'; @@ -307,7 +317,7 @@ export const PhoneField = ({ alignItems: 'center', border: `2px solid ${borderColor}`, borderRadius: '4px', - backgroundColor: readOnly ? '#F9FAFB' : '#FFFFFF', + backgroundColor: readOnly ? '#F9FAFB' : hasError ? '#FEF2F2' : '#FFFFFF', transition: 'border-color 0.2s ease', height: '40px', paddingRight: '8px', @@ -319,7 +329,7 @@ export const PhoneField = ({ paddingLeft: '12px', paddingRight: '24px', fontSize: '14px', - color: '#232528', + color: hasError ? '#B91C1C' : '#232528', appearance: 'none', WebkitAppearance: 'none', MozAppearance: 'none', @@ -332,7 +342,7 @@ export const PhoneField = ({ outline: 'none', background: 'transparent', fontSize: '14px', - color: '#232528', + color: hasError ? '#B91C1C' : '#232528', padding: '0 0 0 8px', }; const arrowStyle = { diff --git a/ipi-survey-platform/src/components/common/Table.jsx b/ipi-survey-platform/src/components/common/Table.jsx index 0b0ea8f..2752f2f 100644 --- a/ipi-survey-platform/src/components/common/Table.jsx +++ b/ipi-survey-platform/src/components/common/Table.jsx @@ -1,8 +1,8 @@ import React from 'react'; -import CaretLeftIcon from '../../assets/images/CaretLeft.svg'; -import CaretRightIcon from '../../assets/images/CaretRight.svg'; -import CaretDoubleLeftIcon from '../../assets/images/CaretDoubleLeft.svg'; -import CaretDoubleRightIcon from '../../assets/images/CaretDoubleRight.svg'; +import CaretLeftIcon from '../../assets/images/caretleft.svg'; +import CaretRightIcon from '../../assets/images/caretright.svg'; +import CaretDoubleLeftIcon from '../../assets/images/caretdoubleleft.svg'; +import CaretDoubleRightIcon from '../../assets/images/caretdoubleright.svg'; // Generic, reusable table // Props: diff --git a/ipi-survey-platform/src/components/dashboard/SubmissionHistory.jsx b/ipi-survey-platform/src/components/dashboard/SubmissionHistory.jsx index 6f22162..127c0f1 100644 --- a/ipi-survey-platform/src/components/dashboard/SubmissionHistory.jsx +++ b/ipi-survey-platform/src/components/dashboard/SubmissionHistory.jsx @@ -2,7 +2,7 @@ import React from 'react'; import { useNavigate } from 'react-router-dom'; import Table from '../common/Table'; import SearchIcon from '../../assets/images/material-symbols_search-rounded.svg'; -import CaretDown from '../../assets/images/CaretDown.svg'; +import CaretDown from '../../assets/images/caretdown.svg'; const getStatusClass = (status) => { const normalized = String(status || '').toLowerCase(); diff --git a/ipi-survey-platform/src/components/layout/HeaderBar.jsx b/ipi-survey-platform/src/components/layout/HeaderBar.jsx index 33c0d9b..95bea4e 100644 --- a/ipi-survey-platform/src/components/layout/HeaderBar.jsx +++ b/ipi-survey-platform/src/components/layout/HeaderBar.jsx @@ -1,7 +1,7 @@ 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 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'; diff --git a/ipi-survey-platform/src/components/survey/EstablishmentInfo/EstablishmentInfo.jsx b/ipi-survey-platform/src/components/survey/EstablishmentInfo/EstablishmentInfo.jsx index e731de5..51c6545 100644 --- a/ipi-survey-platform/src/components/survey/EstablishmentInfo/EstablishmentInfo.jsx +++ b/ipi-survey-platform/src/components/survey/EstablishmentInfo/EstablishmentInfo.jsx @@ -1,6 +1,5 @@ import React from 'react'; import CaretDown from '../../../assets/images/CaretDown.svg'; -import PrimaryButton from '../../../assets/images/primarybutton.svg'; import BackVendor from '../../../assets/images/backvector.svg'; const Field = ({ label, placeholder = '', type = 'text', value = '', onChange = () => {}, disabled = false }) => ( diff --git a/ipi-survey-platform/src/components/survey/ProductData/ProductData.jsx b/ipi-survey-platform/src/components/survey/ProductData/ProductData.jsx index b8aaa57..250c489 100644 --- a/ipi-survey-platform/src/components/survey/ProductData/ProductData.jsx +++ b/ipi-survey-platform/src/components/survey/ProductData/ProductData.jsx @@ -5,7 +5,7 @@ import { fetchProducts, fetchUnits, } from '../../../services/masters/masterService.js'; -import CaretDown from '../../../assets/images/CaretDown-black.svg'; +import CaretDown from '../../../assets/images/caretdown-black.svg'; const Input = ({ placeholder = '', type = 'text', value = '', onChange = () => {} }) => ( { required error={fieldErrors.contactCityTown} /> + ({ diff --git a/ipi-survey-platform/src/pages/ChangePassword/ChangePassword.jsx b/ipi-survey-platform/src/pages/ChangePassword/ChangePassword.jsx index 4d2d294..93c1ed6 100644 --- a/ipi-survey-platform/src/pages/ChangePassword/ChangePassword.jsx +++ b/ipi-survey-platform/src/pages/ChangePassword/ChangePassword.jsx @@ -1,5 +1,5 @@ import React from "react"; -import Logo from "../../assets/images/FCSCLogo.svg"; +import Logo from "../../assets/images/fcsclogo.svg"; import { useNavigate, useLocation } from "react-router-dom"; import apiClient from "../../services/api/apiClient.js"; diff --git a/ipi-survey-platform/src/pages/ForgotPassword/ForgotPassword.jsx b/ipi-survey-platform/src/pages/ForgotPassword/ForgotPassword.jsx index 99a912b..c90930a 100644 --- a/ipi-survey-platform/src/pages/ForgotPassword/ForgotPassword.jsx +++ b/ipi-survey-platform/src/pages/ForgotPassword/ForgotPassword.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import Logo from '../../assets/images/FCSCLogo.svg'; +import Logo from '../../assets/images/fcsclogo.svg'; import { useNavigate } from 'react-router-dom'; import { requestPasswordReset } from '../../services/auth/authService.js'; diff --git a/ipi-survey-platform/src/pages/History/History.jsx b/ipi-survey-platform/src/pages/History/History.jsx index 7c1b854..0bddc6e 100644 --- a/ipi-survey-platform/src/pages/History/History.jsx +++ b/ipi-survey-platform/src/pages/History/History.jsx @@ -4,7 +4,7 @@ import Table from '../../components/common/Table'; import HeaderBar from '../../components/layout/HeaderBar'; import { fetchSubmissionHistory } from '../../services/submissions/submissionService.js'; import SearchIcon from '../../assets/images/material-symbols_search-rounded.svg'; -import CaretDown from '../../assets/images/CaretDown.svg'; +import CaretDown from '../../assets/images/caretdown.svg'; const Badge = ({ variant = 'default', children }) => { const styles = { diff --git a/ipi-survey-platform/src/pages/Login/Login.jsx b/ipi-survey-platform/src/pages/Login/Login.jsx index e131bf0..36cdb51 100644 --- a/ipi-survey-platform/src/pages/Login/Login.jsx +++ b/ipi-survey-platform/src/pages/Login/Login.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import Logo from '../../assets/images/FCSCLogo.svg'; +import Logo from '../../assets/images/fcsclogo.svg'; import { useNavigate } from 'react-router-dom'; import { login } from '../../services/auth/authService.js'; diff --git a/ipi-survey-platform/src/pages/PublicContactForm.jsx b/ipi-survey-platform/src/pages/PublicContactForm.jsx index 2aadab5..ef8425e 100644 --- a/ipi-survey-platform/src/pages/PublicContactForm.jsx +++ b/ipi-survey-platform/src/pages/PublicContactForm.jsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from "react"; -import Logo from "../assets/images/FCSCLogo.svg"; +import Logo from "../assets/images/fcsclogo.svg"; import { useNavigate } from "react-router-dom"; import apiClient from "../services/api/apiClient.js"; diff --git a/ipi-survey-platform/src/pages/Survey/Survey.jsx b/ipi-survey-platform/src/pages/Survey/Survey.jsx index 28c5480..86b75b8 100644 --- a/ipi-survey-platform/src/pages/Survey/Survey.jsx +++ b/ipi-survey-platform/src/pages/Survey/Survey.jsx @@ -6,7 +6,7 @@ import EstablishmentInfo from '../../components/survey/EstablishmentInfo/Establi import HeaderBar from '../../components/layout/HeaderBar'; import ProductData from '../../components/survey/ProductData/ProductData'; import ReviewSubmit from '../../components/survey/ReviewSubmit/ReviewSubmit'; -import CheckCircleActive from '../../assets/images/CircleFrame.svg'; +import CheckCircleActive from '../../assets/images/circleframe.svg'; const createEmptyProduct = (id) => ({ id,