Compare commits
16 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 victorAnumudu
|
5ad75e412b | ||
 ameye
|
e9d6689418 | ||
|
victorAnumudu
|
ed38e0db98 | ||
|
ameye
|
351f027a6f | ||
|
victorAnumudu
|
20d56ee307 | ||
|
ameye
|
f5c798c6c1 | ||
|
victorAnumudu
|
a11f5100ba | ||
|
CHIEFSOFT\ameye
|
7628a561f8 | ||
|
CHIEFSOFT\ameye
|
615acff0b7 | ||
|
ameye
|
aea161ccaf | ||
|
victorAnumudu
|
66a2bcacd5 | ||
|
ameye
|
ec9d84b779 | ||
|
victorAnumudu
|
8ee793d11e | ||
|
ameye
|
46f17cbdfe | ||
|
victorAnumudu
|
283994e43a | ||
|
ameye
|
b7d242ff0a |
@@ -41,22 +41,27 @@ export default function Products() {
|
|||||||
</div>
|
</div>
|
||||||
:
|
:
|
||||||
<div className="row m-b-20">
|
<div className="row m-b-20">
|
||||||
{products && products.map((product, index) => (
|
{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`}>
|
{
|
||||||
|
// 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)} >
|
<Link to={productPath(product?.product_id)} >
|
||||||
<div className={`d-flex align-items-center extraProductCard ${product?.icon_style}`} style={{borderColor:'black', borderWidth: '2px'}} >
|
<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">
|
<div className="icon-container img-icon m-r-20 bg-light-gray rounded">
|
||||||
<i className={`fa ${product?.product_icon} text-primary`}></i>
|
<i className={`fa ${product?.product_icon} text-primary`}></i>
|
||||||
</div>
|
</div>
|
||||||
<div className="report-details">
|
<div className="report-details overflow-hidden">
|
||||||
<p><span style={{fontWeight: 'bolder', color: '#00557A'}}>{product?.status_text}</span></p>
|
<p><span style={{fontWeight: 'bolder', color: '#00557A'}}>{product?.status_text}</span></p>
|
||||||
<h4><span className='text-truncate' style={{paddingLeft: '10px'}}>{product?.name}</span></h4>
|
<h4><span className='w-100 d-inline-block text-truncate' style={{paddingLeft: '10px'}}>{product?.name}</span></h4>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</Link>
|
</Link>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
))}
|
)
|
||||||
|
}
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
<div className="apexchart-wrapper">
|
<div className="apexchart-wrapper">
|
||||||
|
|||||||
@@ -141,7 +141,8 @@ console.log('imageLink', imageLink)
|
|||||||
<div style={{width: '100%', textAlign: 'right'}}>
|
<div style={{width: '100%', textAlign: 'right'}}>
|
||||||
<button
|
<button
|
||||||
className="btn btn-square btn-inverse-light btn-xs d-inline-block mt-2 mb-0"
|
className="btn btn-square btn-inverse-light btn-xs d-inline-block mt-2 mb-0"
|
||||||
onClick={handleUpload} disabled={!selectedFile || uploadFileMutation.isPending || uploadFileMutation.isSuccess}>
|
onClick={handleUpload}
|
||||||
|
disabled={!selectedFile || uploadFileMutation.isPending || uploadFileMutation.isSuccess}>
|
||||||
Upload
|
Upload
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -180,15 +181,18 @@ console.log('imageLink', imageLink)
|
|||||||
<p className='text-danger'>{error?.message}</p>
|
<p className='text-danger'>{error?.message}</p>
|
||||||
</div>
|
</div>
|
||||||
:
|
:
|
||||||
<div className="card-body scrollbar scroll_dark" style={{minHeight: '400px', maxHeight: '500px', overflowY: 'auto'}}>
|
<div className="card-body scrollbar scroll_dark"
|
||||||
|
style={{minHeight: '400px', maxHeight: '500px', overflowY: 'auto'}}>
|
||||||
{mediaFileList && mediaFileList?.file_list && mediaFileList?.file_list.map((item, index) => {
|
{mediaFileList && mediaFileList?.file_list && mediaFileList?.file_list.map((item, index) => {
|
||||||
const file_url = (mediaFileList?.media_server + "/" + item?.file_group + "/" + item?.file_uid + "/" + item.filename).toLowerCase();
|
const file_url = (mediaFileList?.media_server + "/" + item?.file_group + "/" + item?.file_uid + "/" + item.filename).toLowerCase();
|
||||||
const avtarImage =
|
const avtarImage =
|
||||||
item?.file_type === undefined
|
item?.file_type === undefined
|
||||||
? "icons/01.png"
|
? "icons/01.png"
|
||||||
: "icons/" + item.file_type + ".png";
|
: "icons/" + item.file_type + ".png";
|
||||||
return (<div key={index} className={`widget-text ${imageLink == file_url && 'bg-light'}`}>
|
return (<div key={index}
|
||||||
<div className={`media align-items-center`} onClick={()=>setImageLink(file_url)} style={{cursor: 'pointer'}}>
|
className={`widget-text ${imageLink == file_url && 'bg-light'}`}>
|
||||||
|
<div className={`media align-items-center`}
|
||||||
|
onClick={() => setImageLink(file_url)} style={{cursor: 'pointer'}}>
|
||||||
<img src={getImage(avtarImage)}
|
<img src={getImage(avtarImage)}
|
||||||
// src={`assets/img/file-icon/${item.file_type}.png`}
|
// src={`assets/img/file-icon/${item.file_type}.png`}
|
||||||
className="img-fluid"
|
className="img-fluid"
|
||||||
@@ -202,7 +206,8 @@ console.log('imageLink', imageLink)
|
|||||||
className="btn btn-icon btn-round btn-outline-success">
|
className="btn btn-icon btn-round btn-outline-success">
|
||||||
<i className="ti ti-download"></i>
|
<i className="ti ti-download"></i>
|
||||||
</a>
|
</a>
|
||||||
<a href="" className="btn btn-icon btn-round btn-outline-danger ml-2">
|
<a href=""
|
||||||
|
className="btn btn-icon btn-round btn-outline-danger ml-2">
|
||||||
<i className="ti ti-close"></i>
|
<i className="ti ti-close"></i>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
@@ -221,7 +226,8 @@ console.log('imageLink', imageLink)
|
|||||||
<h4 className="card-title">Preview</h4>
|
<h4 className="card-title">Preview</h4>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="card-body d-flex justify-content-center align-items-center pl-0 pr-0 scrollbar scroll_dark">
|
<div
|
||||||
|
className="card-body d-flex justify-content-center align-items-center pl-0 pr-0 scrollbar scroll_dark">
|
||||||
{imageLink &&
|
{imageLink &&
|
||||||
<img className="w-100 h-auto" src={imageLink} alt='file-image'/>
|
<img className="w-100 h-auto" src={imageLink} alt='file-image'/>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ export default function UploadModal({productId, selectedSectionDetails}) {
|
|||||||
const handleUpload = () => {
|
const handleUpload = () => {
|
||||||
let reqData = {
|
let reqData = {
|
||||||
token: localStorage.getItem("token"), // USER TOKEN
|
token: localStorage.getItem("token"), // USER TOKEN
|
||||||
member_uid: localStorage.getItem("uid"), // USER UID
|
uid: localStorage.getItem("uid"), // USER UID
|
||||||
product_id: productId,
|
product_id: productId,
|
||||||
file_uid: selectedFile,
|
file_uid: selectedFile,
|
||||||
image_id: selectedSectionDetails?.id
|
image_id: selectedSectionDetails?.id
|
||||||
@@ -125,7 +125,7 @@ export default function UploadModal({productId, selectedSectionDetails}) {
|
|||||||
return(
|
return(
|
||||||
<div onClick={()=>handleSelectedFile(item?.file_uid)} className={`p-3 text-center col-4`} style={{cursor: 'pointer'}}>
|
<div onClick={()=>handleSelectedFile(item?.file_uid)} className={`p-3 text-center col-4`} style={{cursor: 'pointer'}}>
|
||||||
<div className={`p-3 ${(selectedFile == item?.file_uid) && 'bg-light'}`} style={{Height: '250px'}}>
|
<div className={`p-3 ${(selectedFile == item?.file_uid) && 'bg-light'}`} style={{Height: '250px'}}>
|
||||||
<img key={item?.file_uid} className="" style={{height: '250px', width: '250px'}} src={file_url} alt='file-image' />
|
<img key={item?.file_uid} className="img-fluid" style={{}} src={file_url} alt='file-image' />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -16,10 +16,13 @@ export default function PaymentReportTable() {
|
|||||||
page
|
page
|
||||||
}
|
}
|
||||||
return getPaymentReports(reqData)
|
return getPaymentReports(reqData)
|
||||||
}
|
},
|
||||||
|
staleTime: 0
|
||||||
})
|
})
|
||||||
|
|
||||||
console.log('DATA', data?.data)
|
// console.log('DATA', data?.data)
|
||||||
|
const paymentReportData = data?.data?.payment || []
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<div className="row">
|
<div className="row">
|
||||||
@@ -50,144 +53,28 @@ export default function PaymentReportTable() {
|
|||||||
<table id="export-table" className="table table-bordered">
|
<table id="export-table" className="table table-bordered">
|
||||||
<thead className="thead-light">
|
<thead className="thead-light">
|
||||||
<tr>
|
<tr>
|
||||||
|
<th>Added</th>
|
||||||
<th>Name</th>
|
<th>Name</th>
|
||||||
<th>Position</th>
|
<th>Amount</th>
|
||||||
<th>Office</th>
|
<th>Status</th>
|
||||||
<th>Age</th>
|
|
||||||
<th>Start date</th>
|
|
||||||
<th>Salary</th>
|
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
{paymentReportData.length > 0 ? paymentReportData.map((item, index) => {
|
||||||
<td>Tiger Nixon</td>
|
return (
|
||||||
<td>System Architect</td>
|
<tr key={index}>
|
||||||
<td>Edinburgh</td>
|
<td>{item?.added}</td>
|
||||||
<td>61</td>
|
<td>{item?.option_name}</td>
|
||||||
<td>2011/04/25</td>
|
<td>{item?.currency}{item?.amount}</td>
|
||||||
<td>$320,800</td>
|
<td>{item?.status}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
)
|
||||||
|
})
|
||||||
|
:
|
||||||
<tr>
|
<tr>
|
||||||
<td>Garrett Winters</td>
|
<td colSpan={4} className='text-center'>No data found</td>
|
||||||
<td>Accountant</td>
|
|
||||||
<td>Tokyo</td>
|
|
||||||
<td>63</td>
|
|
||||||
<td>2011/07/25</td>
|
|
||||||
<td>$170,750</td>
|
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
}
|
||||||
<td>Ashton Cox</td>
|
|
||||||
<td>Junior Technical Author</td>
|
|
||||||
<td>San Francisco</td>
|
|
||||||
<td>66</td>
|
|
||||||
<td>2009/01/12</td>
|
|
||||||
<td>$86,000</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Cedric Kelly</td>
|
|
||||||
<td>Senior Javascript Developer</td>
|
|
||||||
<td>Edinburgh</td>
|
|
||||||
<td>22</td>
|
|
||||||
<td>2012/03/29</td>
|
|
||||||
<td>$433,060</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Airi Satou</td>
|
|
||||||
<td>Accountant</td>
|
|
||||||
<td>Tokyo</td>
|
|
||||||
<td>33</td>
|
|
||||||
<td>2008/11/28</td>
|
|
||||||
<td>$162,700</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Brielle Williamson</td>
|
|
||||||
<td>Integration Specialist</td>
|
|
||||||
<td>New York</td>
|
|
||||||
<td>61</td>
|
|
||||||
<td>2012/12/02</td>
|
|
||||||
<td>$372,000</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Herrod Chandler</td>
|
|
||||||
<td>Sales Assistant</td>
|
|
||||||
<td>San Francisco</td>
|
|
||||||
<td>59</td>
|
|
||||||
<td>2012/08/06</td>
|
|
||||||
<td>$137,500</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Rhona Davidson</td>
|
|
||||||
<td>Integration Specialist</td>
|
|
||||||
<td>Tokyo</td>
|
|
||||||
<td>55</td>
|
|
||||||
<td>2010/10/14</td>
|
|
||||||
<td>$327,900</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Colleen Hurst</td>
|
|
||||||
<td>Javascript Developer</td>
|
|
||||||
<td>San Francisco</td>
|
|
||||||
<td>39</td>
|
|
||||||
<td>2009/09/15</td>
|
|
||||||
<td>$205,500</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Sonya Frost</td>
|
|
||||||
<td>Software Engineer</td>
|
|
||||||
<td>Edinburgh</td>
|
|
||||||
<td>23</td>
|
|
||||||
<td>2008/12/13</td>
|
|
||||||
<td>$103,600</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Jena Gaines</td>
|
|
||||||
<td>Office Manager</td>
|
|
||||||
<td>London</td>
|
|
||||||
<td>30</td>
|
|
||||||
<td>2008/12/19</td>
|
|
||||||
<td>$90,560</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Quinn Flynn</td>
|
|
||||||
<td>Support Lead</td>
|
|
||||||
<td>Edinburgh</td>
|
|
||||||
<td>22</td>
|
|
||||||
<td>2013/03/03</td>
|
|
||||||
<td>$342,000</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Charde Marshall</td>
|
|
||||||
<td>Regional Director</td>
|
|
||||||
<td>San Francisco</td>
|
|
||||||
<td>36</td>
|
|
||||||
<td>2008/10/16</td>
|
|
||||||
<td>$470,600</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Haley Kennedy</td>
|
|
||||||
<td>Senior Marketing Designer</td>
|
|
||||||
<td>London</td>
|
|
||||||
<td>43</td>
|
|
||||||
<td>2012/12/18</td>
|
|
||||||
<td>$313,500</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Tatyana Fitzpatrick</td>
|
|
||||||
<td>Regional Director</td>
|
|
||||||
<td>London</td>
|
|
||||||
<td>19</td>
|
|
||||||
<td>2010/03/17</td>
|
|
||||||
<td>$385,750</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Michael Silva</td>
|
|
||||||
<td>Marketing Designer</td>
|
|
||||||
<td>London</td>
|
|
||||||
<td>66</td>
|
|
||||||
<td>2012/11/27</td>
|
|
||||||
<td>$198,500</td>
|
|
||||||
</tr>
|
|
||||||
|
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|
||||||
</table>
|
</table>
|
||||||
|
|||||||
@@ -16,10 +16,12 @@ export default function ProductReportTable() {
|
|||||||
page
|
page
|
||||||
}
|
}
|
||||||
return getProductReports(reqData)
|
return getProductReports(reqData)
|
||||||
}
|
},
|
||||||
|
staleTime: 0
|
||||||
})
|
})
|
||||||
|
|
||||||
console.log('DATA', data?.data)
|
// console.log('DATA', data?.data)
|
||||||
|
const productReportData = data?.data?.product || []
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
@@ -53,146 +55,29 @@ export default function ProductReportTable() {
|
|||||||
<table id="export-table" className="table table-bordered">
|
<table id="export-table" className="table table-bordered">
|
||||||
<thead className="thead-light">
|
<thead className="thead-light">
|
||||||
<tr>
|
<tr>
|
||||||
|
<th>ID</th>
|
||||||
|
<th>Added</th>
|
||||||
<th>Name</th>
|
<th>Name</th>
|
||||||
<th>Position</th>
|
<th>Status</th>
|
||||||
<th>Office</th>
|
|
||||||
<th>Age</th>
|
|
||||||
<th>Start date</th>
|
|
||||||
<th>Salary</th>
|
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
{productReportData.length > 0 ? productReportData.map((item, index) => {
|
||||||
<td>Tiger Nixon</td>
|
return (
|
||||||
<td>System Architect</td>
|
<tr key={index}>
|
||||||
<td>Edinburgh</td>
|
<td>{item?.product_id}</td>
|
||||||
<td>61</td>
|
<td>{item?.added}</td>
|
||||||
<td>2011/04/25</td>
|
<td>{item?.product_name}</td>
|
||||||
<td>$320,800</td>
|
<td>{item?.status}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
)
|
||||||
|
})
|
||||||
|
:
|
||||||
<tr>
|
<tr>
|
||||||
<td>Garrett Winters</td>
|
<td colSpan={4} className='text-center'>No data found</td>
|
||||||
<td>Accountant</td>
|
|
||||||
<td>Tokyo</td>
|
|
||||||
<td>63</td>
|
|
||||||
<td>2011/07/25</td>
|
|
||||||
<td>$170,750</td>
|
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
}
|
||||||
<td>Ashton Cox</td>
|
|
||||||
<td>Junior Technical Author</td>
|
|
||||||
<td>San Francisco</td>
|
|
||||||
<td>66</td>
|
|
||||||
<td>2009/01/12</td>
|
|
||||||
<td>$86,000</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Cedric Kelly</td>
|
|
||||||
<td>Senior Javascript Developer</td>
|
|
||||||
<td>Edinburgh</td>
|
|
||||||
<td>22</td>
|
|
||||||
<td>2012/03/29</td>
|
|
||||||
<td>$433,060</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Airi Satou</td>
|
|
||||||
<td>Accountant</td>
|
|
||||||
<td>Tokyo</td>
|
|
||||||
<td>33</td>
|
|
||||||
<td>2008/11/28</td>
|
|
||||||
<td>$162,700</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Brielle Williamson</td>
|
|
||||||
<td>Integration Specialist</td>
|
|
||||||
<td>New York</td>
|
|
||||||
<td>61</td>
|
|
||||||
<td>2012/12/02</td>
|
|
||||||
<td>$372,000</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Herrod Chandler</td>
|
|
||||||
<td>Sales Assistant</td>
|
|
||||||
<td>San Francisco</td>
|
|
||||||
<td>59</td>
|
|
||||||
<td>2012/08/06</td>
|
|
||||||
<td>$137,500</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Rhona Davidson</td>
|
|
||||||
<td>Integration Specialist</td>
|
|
||||||
<td>Tokyo</td>
|
|
||||||
<td>55</td>
|
|
||||||
<td>2010/10/14</td>
|
|
||||||
<td>$327,900</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Colleen Hurst</td>
|
|
||||||
<td>Javascript Developer</td>
|
|
||||||
<td>San Francisco</td>
|
|
||||||
<td>39</td>
|
|
||||||
<td>2009/09/15</td>
|
|
||||||
<td>$205,500</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Sonya Frost</td>
|
|
||||||
<td>Software Engineer</td>
|
|
||||||
<td>Edinburgh</td>
|
|
||||||
<td>23</td>
|
|
||||||
<td>2008/12/13</td>
|
|
||||||
<td>$103,600</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Jena Gaines</td>
|
|
||||||
<td>Office Manager</td>
|
|
||||||
<td>London</td>
|
|
||||||
<td>30</td>
|
|
||||||
<td>2008/12/19</td>
|
|
||||||
<td>$90,560</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Quinn Flynn</td>
|
|
||||||
<td>Support Lead</td>
|
|
||||||
<td>Edinburgh</td>
|
|
||||||
<td>22</td>
|
|
||||||
<td>2013/03/03</td>
|
|
||||||
<td>$342,000</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Charde Marshall</td>
|
|
||||||
<td>Regional Director</td>
|
|
||||||
<td>San Francisco</td>
|
|
||||||
<td>36</td>
|
|
||||||
<td>2008/10/16</td>
|
|
||||||
<td>$470,600</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Haley Kennedy</td>
|
|
||||||
<td>Senior Marketing Designer</td>
|
|
||||||
<td>London</td>
|
|
||||||
<td>43</td>
|
|
||||||
<td>2012/12/18</td>
|
|
||||||
<td>$313,500</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Tatyana Fitzpatrick</td>
|
|
||||||
<td>Regional Director</td>
|
|
||||||
<td>London</td>
|
|
||||||
<td>19</td>
|
|
||||||
<td>2010/03/17</td>
|
|
||||||
<td>$385,750</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Michael Silva</td>
|
|
||||||
<td>Marketing Designer</td>
|
|
||||||
<td>London</td>
|
|
||||||
<td>66</td>
|
|
||||||
<td>2012/11/27</td>
|
|
||||||
<td>$198,500</td>
|
|
||||||
</tr>
|
|
||||||
|
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React from "react";
|
import React, { useState } from "react";
|
||||||
import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
|
import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
|
||||||
import {useQuery} from "@tanstack/react-query";
|
import {useQuery} from "@tanstack/react-query";
|
||||||
import queryKeys from "../../services/queryKeys";
|
import queryKeys from "../../services/queryKeys";
|
||||||
@@ -11,6 +11,8 @@ import SystemReportTable from "./SystemReportTable";
|
|||||||
|
|
||||||
export default function Reports() {
|
export default function Reports() {
|
||||||
|
|
||||||
|
const [activeTab, setActiveTab] = useState('payment')
|
||||||
|
|
||||||
const {data, isFetching, isError, error} = useQuery({
|
const {data, isFetching, isError, error} = useQuery({
|
||||||
queryKey: queryKeys.topics,
|
queryKey: queryKeys.topics,
|
||||||
queryFn: () => {
|
queryFn: () => {
|
||||||
@@ -49,7 +51,7 @@ export default function Reports() {
|
|||||||
:
|
:
|
||||||
<div>
|
<div>
|
||||||
<div>
|
<div>
|
||||||
<div className="card card-statistics" style={{minHeight: '550px'}}>
|
<div className="card card-statistics" style={{minHeight: '500px'}}>
|
||||||
{/*<div className="card-header">*/}
|
{/*<div className="card-header">*/}
|
||||||
{/* <div className="card-heading">*/}
|
{/* <div className="card-heading">*/}
|
||||||
{/* <h4 className="card-title"> Tab vertical </h4>*/}
|
{/* <h4 className="card-title"> Tab vertical </h4>*/}
|
||||||
@@ -62,7 +64,7 @@ export default function Reports() {
|
|||||||
<ul className="nav nav-tabs" id="myTab" role="tablist">
|
<ul className="nav nav-tabs" id="myTab" role="tablist">
|
||||||
{sortedReportTopicList && sortedReportTopicList.map((item, index) => {
|
{sortedReportTopicList && sortedReportTopicList.map((item, index) => {
|
||||||
return (
|
return (
|
||||||
<li key={index} className="nav-item" role="presentation">
|
<li key={index} className="nav-item" role="presentation" onClick={() => setActiveTab(item?.url)}>
|
||||||
<a className={`nav-link ${index == 0 && 'active'}`} id={`tab-${item?.url}`} href="#" data-bs-toggle="tab" data-bs-target={`#content-${item?.url}`} type="button" role="tab">
|
<a className={`nav-link ${index == 0 && 'active'}`} id={`tab-${item?.url}`} href="#" data-bs-toggle="tab" data-bs-target={`#content-${item?.url}`} type="button" role="tab">
|
||||||
{item?.name}
|
{item?.name}
|
||||||
</a>
|
</a>
|
||||||
@@ -72,14 +74,19 @@ export default function Reports() {
|
|||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
{/* <!-- Tab Content --> */}
|
{/* <!-- Tab Content --> */}
|
||||||
<div className="tab-content">
|
{/* <div className="tab-content">
|
||||||
{sortedReportTopicList && sortedReportTopicList.map((item, index) => {
|
{sortedReportTopicList && sortedReportTopicList.map((item, index) => {
|
||||||
return (
|
return (
|
||||||
<div key={index} className={`tab-pane fade show ${index == 0 && 'active'}`} id={`content-${item?.url}`} role="tabpanel">
|
<div key={index} className={`tab-pane fade show ${index == 0 && 'active'}`} id={`content-${item?.url}`} role="tabpanel" style={{minHeight: '400px'}}>
|
||||||
{renderedTable[item?.url]}
|
{renderedTable[item?.url]}
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
})}
|
})}
|
||||||
|
</div> */}
|
||||||
|
<div className="tab-content">
|
||||||
|
<div className={`tab-pane fade show active`} style={{minHeight: '400px'}}>
|
||||||
|
{renderedTable[activeTab]}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -17,9 +17,11 @@ export default function SystemReportTable() {
|
|||||||
}
|
}
|
||||||
return getSystemReports(reqData)
|
return getSystemReports(reqData)
|
||||||
},
|
},
|
||||||
|
staleTime: 0
|
||||||
})
|
})
|
||||||
|
|
||||||
console.log('DATA', data?.data)
|
// console.log('DATA', data?.data)
|
||||||
|
const systemReportData = data?.data?.system || []
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
@@ -53,146 +55,29 @@ export default function SystemReportTable() {
|
|||||||
<table id="export-table" className="table table-bordered">
|
<table id="export-table" className="table table-bordered">
|
||||||
<thead className="thead-light">
|
<thead className="thead-light">
|
||||||
<tr>
|
<tr>
|
||||||
<th>Name</th>
|
<th>Added</th>
|
||||||
<th>Position</th>
|
<th>Action Name</th>
|
||||||
<th>Office</th>
|
<th>Description</th>
|
||||||
<th>Age</th>
|
<th>Updated</th>
|
||||||
<th>Start date</th>
|
|
||||||
<th>Salary</th>
|
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
{systemReportData.length > 0 ? systemReportData.map((item, index) => {
|
||||||
<td>Tiger Nixon</td>
|
return (
|
||||||
<td>System Architect</td>
|
<tr key={index}>
|
||||||
<td>Edinburgh</td>
|
<td>{item?.added}</td>
|
||||||
<td>61</td>
|
<td>{item?.action_name}</td>
|
||||||
<td>2011/04/25</td>
|
<td>{item?.status_description}</td>
|
||||||
<td>$320,800</td>
|
<td>{item?.updated}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
)
|
||||||
|
})
|
||||||
|
:
|
||||||
<tr>
|
<tr>
|
||||||
<td>Garrett Winters</td>
|
<td colSpan={4} className='text-center'>No data found</td>
|
||||||
<td>Accountant</td>
|
|
||||||
<td>Tokyo</td>
|
|
||||||
<td>63</td>
|
|
||||||
<td>2011/07/25</td>
|
|
||||||
<td>$170,750</td>
|
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
}
|
||||||
<td>Ashton Cox</td>
|
|
||||||
<td>Junior Technical Author</td>
|
|
||||||
<td>San Francisco</td>
|
|
||||||
<td>66</td>
|
|
||||||
<td>2009/01/12</td>
|
|
||||||
<td>$86,000</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Cedric Kelly</td>
|
|
||||||
<td>Senior Javascript Developer</td>
|
|
||||||
<td>Edinburgh</td>
|
|
||||||
<td>22</td>
|
|
||||||
<td>2012/03/29</td>
|
|
||||||
<td>$433,060</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Airi Satou</td>
|
|
||||||
<td>Accountant</td>
|
|
||||||
<td>Tokyo</td>
|
|
||||||
<td>33</td>
|
|
||||||
<td>2008/11/28</td>
|
|
||||||
<td>$162,700</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Brielle Williamson</td>
|
|
||||||
<td>Integration Specialist</td>
|
|
||||||
<td>New York</td>
|
|
||||||
<td>61</td>
|
|
||||||
<td>2012/12/02</td>
|
|
||||||
<td>$372,000</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Herrod Chandler</td>
|
|
||||||
<td>Sales Assistant</td>
|
|
||||||
<td>San Francisco</td>
|
|
||||||
<td>59</td>
|
|
||||||
<td>2012/08/06</td>
|
|
||||||
<td>$137,500</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Rhona Davidson</td>
|
|
||||||
<td>Integration Specialist</td>
|
|
||||||
<td>Tokyo</td>
|
|
||||||
<td>55</td>
|
|
||||||
<td>2010/10/14</td>
|
|
||||||
<td>$327,900</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Colleen Hurst</td>
|
|
||||||
<td>Javascript Developer</td>
|
|
||||||
<td>San Francisco</td>
|
|
||||||
<td>39</td>
|
|
||||||
<td>2009/09/15</td>
|
|
||||||
<td>$205,500</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Sonya Frost</td>
|
|
||||||
<td>Software Engineer</td>
|
|
||||||
<td>Edinburgh</td>
|
|
||||||
<td>23</td>
|
|
||||||
<td>2008/12/13</td>
|
|
||||||
<td>$103,600</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Jena Gaines</td>
|
|
||||||
<td>Office Manager</td>
|
|
||||||
<td>London</td>
|
|
||||||
<td>30</td>
|
|
||||||
<td>2008/12/19</td>
|
|
||||||
<td>$90,560</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Quinn Flynn</td>
|
|
||||||
<td>Support Lead</td>
|
|
||||||
<td>Edinburgh</td>
|
|
||||||
<td>22</td>
|
|
||||||
<td>2013/03/03</td>
|
|
||||||
<td>$342,000</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Charde Marshall</td>
|
|
||||||
<td>Regional Director</td>
|
|
||||||
<td>San Francisco</td>
|
|
||||||
<td>36</td>
|
|
||||||
<td>2008/10/16</td>
|
|
||||||
<td>$470,600</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Haley Kennedy</td>
|
|
||||||
<td>Senior Marketing Designer</td>
|
|
||||||
<td>London</td>
|
|
||||||
<td>43</td>
|
|
||||||
<td>2012/12/18</td>
|
|
||||||
<td>$313,500</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Tatyana Fitzpatrick</td>
|
|
||||||
<td>Regional Director</td>
|
|
||||||
<td>London</td>
|
|
||||||
<td>19</td>
|
|
||||||
<td>2010/03/17</td>
|
|
||||||
<td>$385,750</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>Michael Silva</td>
|
|
||||||
<td>Marketing Designer</td>
|
|
||||||
<td>London</td>
|
|
||||||
<td>66</td>
|
|
||||||
<td>2012/11/27</td>
|
|
||||||
<td>$198,500</td>
|
|
||||||
</tr>
|
|
||||||
|
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -8,12 +8,12 @@ import queryKeys from '../../services/queryKeys';
|
|||||||
|
|
||||||
|
|
||||||
const linksValidationSchema = Yup.object().shape({
|
const linksValidationSchema = Yup.object().shape({
|
||||||
// facebook_url: Yup.string().required("facebook is required"),
|
facebook_url: Yup.string().matches(/^https:\/\/.+/,"URL must start with https://"),
|
||||||
// twitter_url: Yup.string().required("twitter is required"),
|
twitter_url: Yup.string().matches(/^https:\/\/.+/,"URL must start with https://"),
|
||||||
// blogger_url: Yup.string().required("blog is required"),
|
blogger_url: Yup.string().matches(/^https:\/\/.+/,"URL must start with https://"),
|
||||||
// google_url: Yup.string().required("google is required"),
|
google_url: Yup.string().matches(/^https:\/\/.+/,"URL must start with https://"),
|
||||||
// linked_url: Yup.string().required("linkedin is required"),
|
linked_url: Yup.string().matches(/^https:\/\/.+/,"URL must start with https://"),
|
||||||
// website_url: Yup.string().required("website is required"),
|
website_url: Yup.string().matches(/^https:\/\/.+/,"URL must start with https://"),
|
||||||
})
|
})
|
||||||
|
|
||||||
export default function LinksForm({data}) {
|
export default function LinksForm({data}) {
|
||||||
@@ -73,10 +73,10 @@ export default function LinksForm({data}) {
|
|||||||
let reqData = {
|
let reqData = {
|
||||||
token: localStorage.getItem('token'), // USER TOKEN
|
token: localStorage.getItem('token'), // USER TOKEN
|
||||||
uid: localStorage.getItem('uid'), // USER UID
|
uid: localStorage.getItem('uid'), // USER UID
|
||||||
...infoToUpdate
|
url_list: {...infoToUpdate}
|
||||||
}
|
}
|
||||||
console.log(reqData)
|
// console.log(reqData)
|
||||||
// updateLinksMutation.mutate(reqData)
|
updateLinksMutation.mutate(reqData)
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -90,31 +90,31 @@ export default function LinksForm({data}) {
|
|||||||
return (
|
return (
|
||||||
<Form className=''>
|
<Form className=''>
|
||||||
<div className="form-group">
|
<div className="form-group">
|
||||||
<label htmlFor="fb">Facebook URL: {(props.errors.facebook_url && props.touched.facebook_url) && <span className="text-danger">*</span>}</label>
|
<label htmlFor="fb">Facebook URL: {(props.errors.facebook_url && props.touched.facebook_url) && <span className="text-danger">{props.errors.facebook_url}</span>}</label>
|
||||||
<input type="text" className="form-control" name="facebook_url" value={props.values?.facebook_url} onChange={props.handleChange} />
|
<input type="text" className="form-control" name="facebook_url" value={props.values?.facebook_url} onChange={props.handleChange} />
|
||||||
</div>
|
</div>
|
||||||
<div className="form-group">
|
<div className="form-group">
|
||||||
<label htmlFor="tr">Twitter URL: {(props.errors.twitter_url && props.touched.twitter_url) && <span className="text-danger">*</span>}</label>
|
<label htmlFor="tr">Twitter URL: {(props.errors.twitter_url && props.touched.twitter_url) && <span className="text-danger">{props.errors.twitter_url}</span>}</label>
|
||||||
<input type="text" className="form-control" name="twitter_url" value={props.values?.twitter_url} onChange={props.handleChange} />
|
<input type="text" className="form-control" name="twitter_url" value={props.values?.twitter_url} onChange={props.handleChange} />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="form-group">
|
<div className="form-group">
|
||||||
<label htmlFor="br">Blogger URL: {(props.errors.blogger_url && props.touched.blogger_url) && <span className="text-danger">*</span>}</label>
|
<label htmlFor="br">Blogger URL: {(props.errors.blogger_url && props.touched.blogger_url) && <span className="text-danger">{props.errors.blogger_url}</span>}</label>
|
||||||
<input type="text" className="form-control" name="blogger_url" value={props.values?.blogger_url} onChange={props.handleChange} />
|
<input type="text" className="form-control" name="blogger_url" value={props.values?.blogger_url} onChange={props.handleChange} />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="form-group">
|
<div className="form-group">
|
||||||
<label htmlFor="go">Google+ URL: {(props.errors.google_url && props.touched.google_url) && <span className="text-danger">*</span>}</label>
|
<label htmlFor="go">Google+ URL: {(props.errors.google_url && props.touched.google_url) && <span className="text-danger">{props.errors.google_url}</span>}</label>
|
||||||
<input type="text" className="form-control" name="google_url" value={props.values?.google_url} onChange={props.handleChange} />
|
<input type="text" className="form-control" name="google_url" value={props.values?.google_url} onChange={props.handleChange} />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="form-group">
|
<div className="form-group">
|
||||||
<label htmlFor="li">LinkedIn URL: {(props.errors.linked_url && props.touched.linked_url) && <span className="text-danger">*</span>}</label>
|
<label htmlFor="li">LinkedIn URL: {(props.errors.linked_url && props.touched.linked_url) && <span className="text-danger">{props.errors.linked_url}</span>}</label>
|
||||||
<input type="text" className="form-control" name="linked_url" value={props.values?.linked_url} onChange={props.handleChange} />
|
<input type="text" className="form-control" name="linked_url" value={props.values?.linked_url} onChange={props.handleChange} />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="form-group">
|
<div className="form-group">
|
||||||
<label htmlFor="we">Website URL: {(props.errors.website_url && props.touched.website_url) && <span className="text-danger">*</span>}</label>
|
<label htmlFor="we">Website URL: {(props.errors.website_url && props.touched.website_url) && <span className="text-danger">{props.errors.website_url}</span>}</label>
|
||||||
<input type="text" className="form-control" name="website_url" value={props.values?.website_url} onChange={props.handleChange} />
|
<input type="text" className="form-control" name="website_url" value={props.values?.website_url} onChange={props.handleChange} />
|
||||||
</div>
|
</div>
|
||||||
<div style={{textAlign: "right"}}>
|
<div style={{textAlign: "right"}}>
|
||||||
@@ -137,7 +137,7 @@ export default function LinksForm({data}) {
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div className="modal-body">
|
<div className="modal-body">
|
||||||
<h5 className="text-center" style={{fontSize: '18px'}}>Are you sure, you want to update? gg</h5>
|
<h5 className="text-center" style={{fontSize: '18px'}}>Are you sure, you want to update?</h5>
|
||||||
{(updateLinksMutation.error || updateLinksMutation.isSuccess) && (
|
{(updateLinksMutation.error || updateLinksMutation.isSuccess) && (
|
||||||
<div className="col-12">
|
<div className="col-12">
|
||||||
<p className={`p-2 text-center ${updateLinksMutation.isSuccess ? 'text-success' : 'text-danger'}`}>
|
<p className={`p-2 text-center ${updateLinksMutation.isSuccess ? 'text-success' : 'text-danger'}`}>
|
||||||
|
|||||||
@@ -1,17 +1,21 @@
|
|||||||
import React, { memo, useRef, useState } from 'react'
|
import React, { memo, useRef, useState } from 'react'
|
||||||
// import { useSelector } from 'react-redux';
|
import { useSelector, useDispatch } from 'react-redux';
|
||||||
import getImage from '../../utils/getImage';
|
import getImage from '../../utils/getImage';
|
||||||
import { useMutation, useQueryClient } from '@tanstack/react-query';
|
import { useMutation, useQueryClient } from '@tanstack/react-query';
|
||||||
import { uploadProfileImg } from '../../services/services';
|
import { uploadProfileImg } from '../../services/services';
|
||||||
import queryKeys from '../../services/queryKeys';
|
import queryKeys from '../../services/queryKeys';
|
||||||
|
import { updateUserDetails } from '../../store/UserDetails'
|
||||||
|
|
||||||
const ProfileImage = memo(({intialData}) => {
|
const ProfileImage = memo(({intialData}) => {
|
||||||
|
|
||||||
|
const dispatch = useDispatch()
|
||||||
|
|
||||||
const queryClient = useQueryClient()
|
const queryClient = useQueryClient()
|
||||||
|
|
||||||
const [selectedImg, setSelectedImg] = useState(null)
|
const [selectedImg, setSelectedImg] = useState(null)
|
||||||
|
|
||||||
// const {userDetails} = useSelector((state) => state?.userDetails); // CHECKS FOR ACTIVE USER DETAILS
|
// const {userDetails} = useSelector((state) => state?.userDetails); // CHECKS FOR ACTIVE USER DETAILS
|
||||||
|
|
||||||
const avtarImage = "avtar/merms-user.png";
|
const avtarImage = "avtar/merms-user.png";
|
||||||
|
|
||||||
// browser profile img
|
// browser profile img
|
||||||
@@ -26,23 +30,26 @@ const ProfileImage = memo(({intialData}) => {
|
|||||||
|
|
||||||
const uploadProfileMutation = useMutation({
|
const uploadProfileMutation = useMutation({
|
||||||
mutationFn: (fields) => {
|
mutationFn: (fields) => {
|
||||||
if(!fields.img){
|
if(!fields.file){
|
||||||
throw new Error('Please, select an image')
|
throw new Error('Please, select an image')
|
||||||
}
|
}
|
||||||
return uploadProfileImg(fields)
|
return uploadProfileImg(fields)
|
||||||
},
|
},
|
||||||
onSuccess: (res) => {
|
onSuccess: (res) => {
|
||||||
if(res.data.resultCode != '0'){
|
console.log('res', res)
|
||||||
throw({message: res?.data?.resultDescription ? res?.data?.resultDescription : 'An error occured'})
|
if(res?.data?.picture){
|
||||||
|
dispatch(updateUserDetails({ picture: res?.data?.picture }));
|
||||||
}
|
}
|
||||||
|
// 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
|
// const account_name = res?.data?.personal_data?.account_name
|
||||||
// dispatch(updateUserDetails({ account_name }));
|
|
||||||
},
|
},
|
||||||
onSettled: ()=>{
|
onSettled: ()=>{
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
queryClient.refetchQueries({
|
// queryClient.refetchQueries({
|
||||||
queryKey: [...queryKeys.profile_data], // type: 'active', // exact: true,
|
// queryKey: [...queryKeys.profile_data], // type: 'active', // exact: true,
|
||||||
})
|
// })
|
||||||
uploadProfileMutation.reset()
|
uploadProfileMutation.reset()
|
||||||
}, 3000);
|
}, 3000);
|
||||||
}
|
}
|
||||||
@@ -51,8 +58,8 @@ const ProfileImage = memo(({intialData}) => {
|
|||||||
const proceedToUpload = () => {
|
const proceedToUpload = () => {
|
||||||
let reqData = {
|
let reqData = {
|
||||||
token: localStorage.getItem('token'), // USER TOKEN
|
token: localStorage.getItem('token'), // USER TOKEN
|
||||||
uid: localStorage.getItem('uid'), // USER UID
|
member_uid: localStorage.getItem('uid'), // USER UID
|
||||||
img: selectedImg
|
file: selectedImg
|
||||||
}
|
}
|
||||||
// console.log('reqData', reqData)
|
// console.log('reqData', reqData)
|
||||||
uploadProfileMutation.mutate(reqData)
|
uploadProfileMutation.mutate(reqData)
|
||||||
@@ -95,7 +102,7 @@ const ProfileImage = memo(({intialData}) => {
|
|||||||
{selectedImg &&
|
{selectedImg &&
|
||||||
<div>
|
<div>
|
||||||
<button onClick={proceedToUpload} disabled={uploadProfileMutation.isSuccess || uploadProfileMutation.isPending} className="btn btn-light text-primary mb-2">
|
<button onClick={proceedToUpload} disabled={uploadProfileMutation.isSuccess || uploadProfileMutation.isPending} className="btn btn-light text-primary mb-2">
|
||||||
{uploadProfileMutation.isPaused ? 'Upload...' : 'Upload New Avatar'}
|
{uploadProfileMutation.isPending ? 'Upload...' : 'Upload New Avatar'}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ export const updateLinks = (reqData) => {
|
|||||||
let postData = {
|
let postData = {
|
||||||
...reqData,
|
...reqData,
|
||||||
}
|
}
|
||||||
return null //postAuxEnd(`/panel/account/links-update`, postData, false)
|
return postAuxEnd(`/panel/account/profilelinks-update`, postData, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
// FUNCTION TO GET PRODUCT BY ID
|
// FUNCTION TO GET PRODUCT BY ID
|
||||||
@@ -358,8 +358,8 @@ export const uploadProfileImg = (reqData) => {
|
|||||||
let postData = {
|
let postData = {
|
||||||
...reqData,
|
...reqData,
|
||||||
}
|
}
|
||||||
throw new Error('Opps')
|
return postAuxEnd(`/upload/profile-picture`, postData, true)
|
||||||
// return postAuxEnd(`/panel/account/profile-update`, postData, true)
|
// throw new Error('Opps')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ export const userSlice = createSlice({
|
|||||||
initialState,
|
initialState,
|
||||||
reducers: {
|
reducers: {
|
||||||
updateUserDetails: (state, action) => {
|
updateUserDetails: (state, action) => {
|
||||||
state.userDetails = { ...action.payload };
|
state.userDetails = { ...state.userDetails, ...action.payload };
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user