MERMS/MermsPanelReactJS
1
0
Fork 0
Code Issues Pull Requests 1 Releases Activity

Merge branch 'master' of https://gitlab.chiefsoft.net/MERMS/MermsPanelReactJS

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2026-02-15 17:33:56 -05:00
parent 615acff0b7 aea161ccaf
commit 7628a561f8
3 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/component/home/Products.jsx
+20 -15
View File
@@ -41,22 +41,27 @@ export default function Products() {
</div>
:
<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`}>
<Link to={productPath(product?.product_id)} >
<div className={`d-flex align-items-center extraProductCard ${product?.icon_style}`} style={{borderColor:'black', borderWidth: '2px'}} >
<div className="icon-container img-icon m-r-20 bg-light-gray rounded">
<i className={`fa ${product?.product_icon} text-primary`}></i>
{products && products.map((product, index) =>
{
// let productName = product?.name?.length > 14 ? product?.name?.substring(0, 14) + '...' : product?.name
return (
<div key={product.uid+index} className={`col-12 col-lg-6 mb-2 mb-xxl-0`}>
<Link to={productPath(product?.product_id)} >
<div className={`d-flex align-items-center extraProductCard ${product?.icon_style}`} style={{borderColor:'black', borderWidth: '2px'}} >
<div className="icon-container img-icon m-r-20 bg-light-gray rounded">
<i className={`fa ${product?.product_icon} text-primary`}></i>
</div>
<div className="report-details overflow-hidden">
<p><span style={{fontWeight: 'bolder', color: '#00557A'}}>{product?.status_text}</span></p>
<h4><span className='w-100 d-inline-block text-truncate' style={{paddingLeft: '10px'}}>{product?.name}</span></h4>
</div>
</div>
<div className="report-details">
<p><span style={{fontWeight: 'bolder', color: '#00557A'}}>{product?.status_text}</span></p>
<h4><span className='text-truncate' style={{paddingLeft: '10px'}}>{product?.name}</span></h4>
</div>
</div>
</Link>
</div>
))}
</Link>
</div>
)
}
)}
</div>
}
<div className="apexchart-wrapper">
src/component/settings/ProfileImage.jsx
+6 -6
View File
@@ -26,15 +26,15 @@ const ProfileImage = memo(({intialData}) => {
const uploadProfileMutation = useMutation({
mutationFn: (fields) => {
if(!fields.img){
if(!fields.file){
throw new Error('Please, select an image')
}
return uploadProfileImg(fields)
},
onSuccess: (res) => {
if(res.data.resultCode != '0'){
throw({message: res?.data?.resultDescription ? res?.data?.resultDescription : 'An error occured'})
}
// if(res.data.resultCode != '0'){
// throw({message: res?.data?.resultDescription ? res?.data?.resultDescription : 'An error occured'})
// }
// const account_name = res?.data?.personal_data?.account_name
// dispatch(updateUserDetails({ account_name }));
},
@@ -51,8 +51,8 @@ const ProfileImage = memo(({intialData}) => {
const proceedToUpload = () => {
let reqData = {
token: localStorage.getItem('token'), // USER TOKEN
uid: localStorage.getItem('uid'), // USER UID
img: selectedImg
member_uid: localStorage.getItem('uid'), // USER UID
file: selectedImg
}
// console.log('reqData', reqData)
uploadProfileMutation.mutate(reqData)
src/services/services.js
+2 -2
View File
@@ -358,8 +358,8 @@ export const uploadProfileImg = (reqData) => {
let postData = {
...reqData,
}
throw new Error('Opps')
// return postAuxEnd(`/panel/account/profile-update`, postData, true)
return postAuxEnd(`/upload/profile-picture`, postData, true)
// throw new Error('Opps')
}