diff --git a/.env b/.env index 639fb0b..fcdc42c 100644 --- a/.env +++ b/.env @@ -124,7 +124,4 @@ REACT_APP_MEDIA_LINK='https://dev-media.wrenchboard.com' REACT_APP_FAM_GAME_LINK='https://games.wrenchboard.com' # REACT APP CUSTOMTIMER -REACT_APP_CUSTOMTIMER=90 - -# MEDIA_SERVER_URL -MEDIA_SERVER_URL='' \ No newline at end of file +REACT_APP_CUSTOMTIMER=90 \ No newline at end of file diff --git a/.env.development b/.env.development index b52c693..5f2d549 100644 --- a/.env.development +++ b/.env.development @@ -92,7 +92,4 @@ REACT_APP_MEDIA_LINK='https://dev-media.wrenchboard.com' REACT_APP_FAM_GAME_LINK='https://games.wrenchboard.com' # REACT APP CUSTOMTIMER -REACT_APP_CUSTOMTIMER=90 - -# MEDIA_SERVER_URL -MEDIA_SERVER_URL='' \ No newline at end of file +REACT_APP_CUSTOMTIMER=90 \ No newline at end of file diff --git a/.env.production b/.env.production index 9b16333..cfa2c24 100644 --- a/.env.production +++ b/.env.production @@ -98,7 +98,4 @@ REACT_APP_MEDIA_LINK='https://media.wrenchboard.com' REACT_APP_FAM_GAME_LINK='https://games.wrenchboard.com' # REACT APP CUSTOMTIMER -REACT_APP_CUSTOMTIMER=90 - -# MEDIA_SERVER_URL -MEDIA_SERVER_URL='' \ No newline at end of file +REACT_APP_CUSTOMTIMER=90 \ No newline at end of file diff --git a/src/components/FamilyAcc/FamilyPopout/AssignPrevNewTask.jsx b/src/components/FamilyAcc/FamilyPopout/AssignPrevNewTask.jsx index 19de55e..7c957c1 100644 --- a/src/components/FamilyAcc/FamilyPopout/AssignPrevNewTask.jsx +++ b/src/components/FamilyAcc/FamilyPopout/AssignPrevNewTask.jsx @@ -164,7 +164,7 @@ export default function AssignPrevNewTask({ {/* ATTACHMENT SECTION*/} -
+
diff --git a/src/components/attachmentCom/AttachFile.jsx b/src/components/attachmentCom/AttachFile.jsx index 948d8e5..1230ecd 100644 --- a/src/components/attachmentCom/AttachFile.jsx +++ b/src/components/attachmentCom/AttachFile.jsx @@ -13,7 +13,7 @@ export default function AttachFile({data}) { file: event.target.files[0], job_uid: data?.job_uid, uid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), + // member_id: localStorage.getItem("member_id"), sessionid: localStorage.getItem("session_token"), }; setRequestStatus({loading: true, status:false, message:''}) @@ -30,49 +30,46 @@ export default function AttachFile({data}) { } console.log('data', formData, inputs) - // axios.post(`${process.env.MEDIA_SERVER_URL}/upload/task`,formData).then(res => { - // if(res.data.status < 1){ - // inputFile.current.value = null - // setRequestStatus({loading: false, status:false, message:'upload failed'}) - // setTimeout(()=>{ - // setRequestStatus({loading: false, status:false, message:''}) - // }, 3000) - // return - // } - // setRequestStatus({loading: false, status:true, message:'uploaded'}) - // inputFile.current.value = null - // setTimeout(()=>{ - // setRequestStatus({loading: false, status:false, message:''}) - // }, 3000) - // }).catch(err => { - // inputFile.current.value = null - // setRequestStatus({loading: false, status:false, message:'upload failed'}) - // setTimeout(()=>{ - // setRequestStatus({loading: false, status:false, message:''}) - // }, 3000) - // return - // }) - - setTimeout(()=>{ - setRequestStatus({loading: false, status:false, message:''}) - }, 3000) + axios.post(`${process.env.REACT_APP_MEDIA_LINK}/upload/task`,formData).then(res => { + if(res.data.status < 1){ + inputFile.current.value = null + setRequestStatus({loading: false, status:false, message:'upload failed'}) + setTimeout(()=>{ + setRequestStatus({loading: false, status:false, message:''}) + }, 3000) + return + } + // console.log('RESPONSE', res.data) + setRequestStatus({loading: false, status:true, message:'uploaded'}) + inputFile.current.value = null + setTimeout(()=>{ + setRequestStatus({loading: false, status:false, message:''}) + }, 3000) + }).catch(err => { + inputFile.current.value = null + setRequestStatus({loading: false, status:false, message:'upload failed'}) + setTimeout(()=>{ + setRequestStatus({loading: false, status:false, message:''}) + }, 3000) + return + }) } return ( -
+
-
-

+

+
Files { requestStatus.loading ? : -

{requestStatus.message}

+ {requestStatus.message} } -

- +
+
-
+
list shows here
{/* FOR TASK IMAGE */}
-