Compare commits

...

7 Commits

Author SHA1 Message Date
victorAnumudu 59c90ea175 reset password payload fix 2025-08-05 18:16:40 +01:00
ameye 9838fc948e Merge branch 'refresh-icon' of MERMS/MermsPanelReactJS into master 2025-08-05 16:54:21 +00:00
victorAnumudu cb4c741a90 refresh icon fixed 2025-08-05 17:50:34 +01:00
CHIEFSOFT\ameye bba38affae Icon fix 2025-08-03 07:42:55 -04:00
CHIEFSOFT\ameye 9468793d91 Merge branch 'master' of https://gitlab.chiefsoft.net/MERMS/MermsPanelReactJS 2025-08-03 07:20:14 -04:00
CHIEFSOFT\ameye 44224e23ff style update 2025-08-03 07:20:08 -04:00
ameye 5b926300ae Merge branch 'reset-pwd-bug-fix' of MERMS/MermsPanelReactJS into master 2025-08-02 17:02:23 +00:00
5 changed files with 17 additions and 9 deletions
Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

+3 -4
View File
@@ -38,8 +38,8 @@ export default function AccPWDReset() {
return verifyResetToken(fields)
},
onSuccess: (res) => {
// console.log('res', res)
if(res.data.resultCode != '0'){
// console.log('res', res.data)
if(res.data.resultCode != '0' || !res?.data?.pending_uid){
throw({message: res?.data?.resultDescription})
}
// setUser({user:'testaccount', ...res.data})
@@ -76,8 +76,7 @@ export default function AccPWDReset() {
const handleCompletePWDReset = (values) => {
let reqData = {
reset_token: token,
// reset_uid: "4733e96b-7031-4684-bec3-f63da4417707",
reset_uid: "",
reset_uid: user?.pending_uid,
new_password: values.password,
}
resetPWD.mutate(reqData)
+3 -3
View File
@@ -42,11 +42,11 @@ export default function Products() {
:
<div className="row m-b-20">
{products && products.map((product, index) => (
<div key={product.uid+index} className="col-xxs-6 col-xl-4 col-xxl-6 mb-2 mb-xxl-0 ">
<div key={product.uid+index} className={`col-xxs-6 col-xl-4 col-xxl-6 mb-2 mb-xxl-0`}>
<Link to={productPath(product?.product_id)} >
<div className="d-flex align-items-center extraProductCard">
<div className={`d-flex align-items-center extraProductCard ${product?.icon_style}`} >
<div className="icon-container img-icon m-r-20 bg-light-gray rounded">
<i className="fa fa-cart-plus text-primary"></i>
<i className={`fa ${product?.product_icon} text-primary`}></i>
</div>
<div className="report-details">
<p>{product?.status_text}</p>
+3 -1
View File
@@ -97,7 +97,9 @@ export default function ProductActive({productData}){
<div className="card-header">
<div className="card-heading d-flex justify-content-between">
<h4 className="card-title">{externalUrl}</h4>
<button type="button" onClick={()=>iframe.current.src += ''} className="btn btn-primary">IC</button>
<button type="button" onClick={()=>iframe.current.src += ''} className="btn">
<img src={getImage('refresh.png')} style={{width: '30px', height: 'auto'}} alt='refresh page' />
</button>
</div>
</div>
<div className="card-body">
+8 -1
View File
@@ -90,7 +90,14 @@ $today-highlight-bg: #fcf8e3;
$btn-bg: #8e54e9;
$btn-border: #8e54e9;
$event-padding: 10px;
.manage{
background-color:lightgreen !important;
border-radius: 5px !important;
}
.creating{
background-color: lightyellow !important;
border-radius: 5px !important;
}
.billing{
background-color: darkgoldenrod;
color: white;