diff --git a/src/assets/images/icons/download-arrow.svg b/src/assets/images/icons/download-arrow.svg
new file mode 100644
index 0000000..897664d
--- /dev/null
+++ b/src/assets/images/icons/download-arrow.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/components/Resources/index.jsx b/src/components/Resources/index.jsx
index 4da8fa6..b398817 100644
--- a/src/components/Resources/index.jsx
+++ b/src/components/Resources/index.jsx
@@ -63,6 +63,7 @@ export default function Resources(props) {
loading: false,
msg: "success",
data: res?.result_list,
+ image:res?.session_image_server
}));
} catch (error) {
setUploadedFiles((prev) => ({
diff --git a/src/components/Resources/tabs/MyUploadedFiles.jsx b/src/components/Resources/tabs/MyUploadedFiles.jsx
index f6d3fc5..d1d93aa 100644
--- a/src/components/Resources/tabs/MyUploadedFiles.jsx
+++ b/src/components/Resources/tabs/MyUploadedFiles.jsx
@@ -13,7 +13,6 @@ export default function MyUploadedFiles({ uploadedFiles }) {
indexOfFirstItem,
indexOfLastItem
);
-
const handlePagination = (e) => {
handlePagingFunc(e, setCurrentPage);
};
@@ -45,10 +44,11 @@ export default function MyUploadedFiles({ uploadedFiles }) {
currentFiles.map((value, idx) => {
let addedDate = value?.added?.split(" ")[0];
let formattedSize = formatFileSize(value?.file_size);
+ let imageLink = `${uploadedFiles?.image}${localStorage.getItem('session_token')}/myfile/${value.file_uid}`
return (
|
@@ -102,17 +102,17 @@ export default function MyUploadedFiles({ uploadedFiles }) {
|
-
+ })
+
|
diff --git a/src/components/UploadProduct/index.jsx b/src/components/UploadProduct/index.jsx
index f0d194b..6f59b9d 100644
--- a/src/components/UploadProduct/index.jsx
+++ b/src/components/UploadProduct/index.jsx
@@ -147,7 +147,7 @@ export default function UploadProduct({uploadTypes}) {
file_name: selectedFile.substring(0,21).replace(/ /gi, ""),//selectedFile.replace(/[ -]/gi, ""),
file_size: imgDetails.size,
file_type: imgDetails.type,
- file_data: img.file,
+ file_data: img.file?.split(",")[1],
title: itemName,
description: description,
msg_type: 'FILE',
@@ -602,7 +602,10 @@ export default function UploadProduct({uploadTypes}) {
//FUNCTIONS to check if file upload type is valid
const isValidFile = (file, supportedFile=[]) => {
- let fileType = file.type.split("/")[1];
+ let fileType = file.type.split("/")[1].toLowerCase();
+ if(fileType=='jpg' || fileType=='jpeg'){ //forcing both JPG and JPEG TO RETURN JPG AS FILE TYPE
+ fileType = 'jpg'
+ }
let valid = supportedFile.filter(item => (
item.name.toLowerCase() == fileType.toLowerCase()
))
@@ -615,7 +618,10 @@ const isValidFile = (file, supportedFile=[]) => {
//FUNCTIONS TO CHECK IF FILE SIZE IS VALID
const isValidFileSize = (file, supportedFile=[]) => {
- let fileType = file.type.split("/")[1];
+ let fileType = file.type.split("/")[1].toLowerCase();
+ if(fileType=='jpg' || fileType=='jpeg'){ //forcing both JPG and JPEG TO RETURN JPG AS FILE TYPE
+ fileType = 'jpg'
+ }
let fileSize = file.size;
let valid = supportedFile.filter(item => (
item.name.toLowerCase() == fileType.toLowerCase()
@@ -627,6 +633,6 @@ const isValidFileSize = (file, supportedFile=[]) => {
return {status: false, message: `File must not exceed ${valid[0].max_size_mb}MB`}
}
}else{
- return false
+ return {status: false, message: `Cannot read file size, try again`}
}
}