diff --git a/.env b/.env index fcdc42c..639fb0b 100644 --- a/.env +++ b/.env @@ -124,4 +124,7 @@ 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 \ No newline at end of file +REACT_APP_CUSTOMTIMER=90 + +# MEDIA_SERVER_URL +MEDIA_SERVER_URL='' \ No newline at end of file diff --git a/.env.development b/.env.development index 5f2d549..b52c693 100644 --- a/.env.development +++ b/.env.development @@ -92,4 +92,7 @@ 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 \ No newline at end of file +REACT_APP_CUSTOMTIMER=90 + +# MEDIA_SERVER_URL +MEDIA_SERVER_URL='' \ No newline at end of file diff --git a/.env.production b/.env.production index cfa2c24..9b16333 100644 --- a/.env.production +++ b/.env.production @@ -98,4 +98,7 @@ REACT_APP_MEDIA_LINK='https://media.wrenchboard.com' REACT_APP_FAM_GAME_LINK='https://games.wrenchboard.com' # REACT APP CUSTOMTIMER -REACT_APP_CUSTOMTIMER=90 \ No newline at end of file +REACT_APP_CUSTOMTIMER=90 + +# MEDIA_SERVER_URL +MEDIA_SERVER_URL='' \ No newline at end of file diff --git a/src/components/FamilyAcc/FamilyPopout/AssignPrevNewTask.jsx b/src/components/FamilyAcc/FamilyPopout/AssignPrevNewTask.jsx index 0de3e7c..19de55e 100644 --- a/src/components/FamilyAcc/FamilyPopout/AssignPrevNewTask.jsx +++ b/src/components/FamilyAcc/FamilyPopout/AssignPrevNewTask.jsx @@ -152,7 +152,7 @@ export default function AssignPrevNewTask({
-
+
{ + const upload = (event) => { + let inputs = { + file: event.target.files[0], + job_uid: data?.job_uid, + uid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + }; setRequestStatus({loading: true, status:false, message:''}) - if(!file){ + if(!inputs.file){ setRequestStatus({loading: false, status:false, message:'Please select a file'}) setTimeout(()=>{ setRequestStatus({loading: false, status:false, message:''}) @@ -32,19 +30,58 @@ export default function AttachFile({data}) { } console.log('data', formData, inputs) - inputFile.current.value = [] - inputFile.current.value = null - setFile('') + // 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) } return ( -
+
- setFile(e.target.files[0])}/> -
- - {requestStatus.message &&

{requestStatus.message}

} +
+

+ Files { + requestStatus.loading ? + + : +

{requestStatus.message}

+ } +

+
+
+ list shows here +
+
) diff --git a/src/components/jobPopout/EditJobPopoutNew.jsx b/src/components/jobPopout/EditJobPopoutNew.jsx index b87ed40..f3ea880 100644 --- a/src/components/jobPopout/EditJobPopoutNew.jsx +++ b/src/components/jobPopout/EditJobPopoutNew.jsx @@ -302,7 +302,7 @@ const EditJobPopoutNew = ({ - {uploadStatus.message && !uploadStatus.loading && ( -

- {uploadStatus.message} -

- )} - {uploadStatus.loading && ( -

{uploadStatus.message}

- )} -
-