diff --git a/pmp-reactjs-ui/src/menuItems/MenuItemDeviceDetails.js b/pmp-reactjs-ui/src/menuItems/MenuItemDeviceDetails.js index 5c2764415..52a1415eb 100644 --- a/pmp-reactjs-ui/src/menuItems/MenuItemDeviceDetails.js +++ b/pmp-reactjs-ui/src/menuItems/MenuItemDeviceDetails.js @@ -20,7 +20,7 @@ export const MenuItemDeviceDetails = (props) => { + fill={activeIcon ? "#1447b2" : "#7a7e82"} stroke={activeIcon ? "#1447b2" : "#7a7e82"} strokeWidth="0.5" /> diff --git a/pmp-reactjs-ui/src/menuItems/MenuItemPartnerCertificate.js b/pmp-reactjs-ui/src/menuItems/MenuItemPartnerCertificate.js index ae75fed6f..ae7679ace 100644 --- a/pmp-reactjs-ui/src/menuItems/MenuItemPartnerCertificate.js +++ b/pmp-reactjs-ui/src/menuItems/MenuItemPartnerCertificate.js @@ -18,7 +18,7 @@ export const MenuItemPartnerCertificate = (props) => { + fill={activeIcon ? "#1447b2" : "#7a7e82"} stroke={activeIcon ? "#1447b2" : "#7a7e82"} strokeWidth="0.5" />

diff --git a/pmp-reactjs-ui/src/menuItems/MenuItemPartnerProfile.js b/pmp-reactjs-ui/src/menuItems/MenuItemPartnerProfile.js index 6ebba5af3..4c0f34def 100644 --- a/pmp-reactjs-ui/src/menuItems/MenuItemPartnerProfile.js +++ b/pmp-reactjs-ui/src/menuItems/MenuItemPartnerProfile.js @@ -18,7 +18,7 @@ export const MenuItemPartnerProfile = (props) => { + fill={activeIcon ? "#1447b2" : "#7a7e82"} stroke={activeIcon ? "#1447b2" : "#7a7e82"} strokeWidth="0.5" /> diff --git a/pmp-reactjs-ui/src/menuItems/MenuItemSBIInformation.js b/pmp-reactjs-ui/src/menuItems/MenuItemSBIInformation.js index b9081aa3b..b07b2ae43 100644 --- a/pmp-reactjs-ui/src/menuItems/MenuItemSBIInformation.js +++ b/pmp-reactjs-ui/src/menuItems/MenuItemSBIInformation.js @@ -27,7 +27,7 @@ export const MenuItemSBIInformation = (props) => { data-name="quick_reference_FILL0_wght200_GRAD0_opsz24" d="M161.119-838.881v0Zm2.8,10.631h3.66q.179-.3.38-.579t.425-.54h-4.465Zm0,4.476h2.752a3.791,3.791,0,0,1-.041-.549q0-.269.019-.57h-2.731Zm-2.109,3.917a1.751,1.751,0,0,1-1.29-.518,1.751,1.751,0,0,1-.518-1.29v-16.527a1.751,1.751,0,0,1,.518-1.29,1.751,1.751,0,0,1,1.29-.518h8.823l5.036,5.036v3.413q-.295-.082-.564-.133a4.872,4.872,0,0,0-.555-.073V-834.4h-4.476v-4.476h-8.263a.658.658,0,0,0-.473.215.658.658,0,0,0-.215.473v16.527a.658.658,0,0,0,.215.473.658.658,0,0,0,.473.215h5.855a6.164,6.164,0,0,0,.38.6,3.9,3.9,0,0,0,.447.519Z" transform="translate(-145 853.628)" - fill={activeIcon ? "#1447b2" : "#7a7e82"} stroke={activeIcon ? "#1447b2" : "#7a7e82"} stroke-width="0.5" /> + fill={activeIcon ? "#1447b2" : "#7a7e82"} stroke={activeIcon ? "#1447b2" : "#7a7e82"} strokeWidth="0.5" /> diff --git a/pmp-reactjs-ui/src/pages/Dashboard.js b/pmp-reactjs-ui/src/pages/Dashboard.js index 1b9c54e45..624b6c11f 100644 --- a/pmp-reactjs-ui/src/pages/Dashboard.js +++ b/pmp-reactjs-ui/src/pages/Dashboard.js @@ -143,15 +143,15 @@ function Dashboard() { -


-
+
+

2024 © MOSIP - All rights reserved.

-
-

Documentation

-

MOSIP Community

-

Contact Us

+
+

Documentation

+

MOSIP Community

+

Contact Us

diff --git a/pmp-reactjs-ui/src/pages/PartnerCertificatesList.js b/pmp-reactjs-ui/src/pages/PartnerCertificatesList.js index 4c4b09e5c..8f5d79a3d 100644 --- a/pmp-reactjs-ui/src/pages/PartnerCertificatesList.js +++ b/pmp-reactjs-ui/src/pages/PartnerCertificatesList.js @@ -2,6 +2,7 @@ import { useEffect, useState } from "react"; import { useNavigate } from "react-router-dom"; import UploadCertificate from "./UploadCertificate"; import HttpService from "../services/HttpService"; +import {formatDate} from "../utils/AppUtils" function PartnerCertificatesList() { @@ -61,25 +62,13 @@ function PartnerCertificatesList() { setErrorMsg(""); }; - const formatDate = (dateString, format) => { - if (!dateString) return '-'; - const date = new Date(dateString); - if (format === 'dateTime') { - return date.toLocaleString(); - } else if (format === 'date') { - return date.toLocaleDateString(); - } else { - return '-'; - } - }; - return (
{!dataLoaded && (
-
@@ -154,7 +143,7 @@ function PartnerCertificatesList() { - + diff --git a/pmp-reactjs-ui/src/pages/UploadCertificate.js b/pmp-reactjs-ui/src/pages/UploadCertificate.js index 9ab2a6fe8..ba86b2424 100644 --- a/pmp-reactjs-ui/src/pages/UploadCertificate.js +++ b/pmp-reactjs-ui/src/pages/UploadCertificate.js @@ -1,5 +1,6 @@ import { useState, useEffect } from 'react'; import HttpService from '../services/HttpService'; +import { formatDate } from '../utils/AppUtils'; function UploadCertificate({ closePopup, partnerData }) { const [isDropdownOpen, setIsDropdownOpen] = useState(false); @@ -109,18 +110,6 @@ function UploadCertificate({ closePopup, partnerData }) { } }, [partnerData.uploadDt]); - const formatDate = (dateString, format) => { - if (!dateString) return '-'; - const date = new Date(dateString); - if (format === 'dateTime') { - return date.toLocaleString(); - } else if (format === 'date') { - return date.toLocaleDateString(); - } else { - return '-'; - } - }; - return (
@@ -128,7 +117,7 @@ function UploadCertificate({ closePopup, partnerData }) {
-
- diff --git a/pmp-reactjs-ui/src/utils/AppUtils.js b/pmp-reactjs-ui/src/utils/AppUtils.js new file mode 100644 index 000000000..42ea3eaa1 --- /dev/null +++ b/pmp-reactjs-ui/src/utils/AppUtils.js @@ -0,0 +1,11 @@ +export const formatDate = (dateString, format) => { + if (!dateString) return '-'; + const date = new Date(dateString); + if (format === 'dateTime') { + return date.toLocaleString(); + } else if (format === 'date') { + return date.toLocaleDateString(); + } else { + return '-'; + } +}; \ No newline at end of file