Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 victorAnumudu
|
ad49489377 | ||
 ameye
|
386fc8cb0c |
@@ -124,7 +124,4 @@ REACT_APP_MEDIA_LINK='https://dev-media.wrenchboard.com'
|
|||||||
REACT_APP_FAM_GAME_LINK='https://games.wrenchboard.com'
|
REACT_APP_FAM_GAME_LINK='https://games.wrenchboard.com'
|
||||||
|
|
||||||
# REACT APP CUSTOMTIMER
|
# REACT APP CUSTOMTIMER
|
||||||
REACT_APP_CUSTOMTIMER=90
|
REACT_APP_CUSTOMTIMER=90
|
||||||
|
|
||||||
# MEDIA_SERVER_URL
|
|
||||||
MEDIA_SERVER_URL=''
|
|
||||||
+1
-4
@@ -92,7 +92,4 @@ REACT_APP_MEDIA_LINK='https://dev-media.wrenchboard.com'
|
|||||||
REACT_APP_FAM_GAME_LINK='https://games.wrenchboard.com'
|
REACT_APP_FAM_GAME_LINK='https://games.wrenchboard.com'
|
||||||
|
|
||||||
# REACT APP CUSTOMTIMER
|
# REACT APP CUSTOMTIMER
|
||||||
REACT_APP_CUSTOMTIMER=90
|
REACT_APP_CUSTOMTIMER=90
|
||||||
|
|
||||||
# MEDIA_SERVER_URL
|
|
||||||
MEDIA_SERVER_URL=''
|
|
||||||
+1
-4
@@ -98,7 +98,4 @@ REACT_APP_MEDIA_LINK='https://media.wrenchboard.com'
|
|||||||
REACT_APP_FAM_GAME_LINK='https://games.wrenchboard.com'
|
REACT_APP_FAM_GAME_LINK='https://games.wrenchboard.com'
|
||||||
|
|
||||||
# REACT APP CUSTOMTIMER
|
# REACT APP CUSTOMTIMER
|
||||||
REACT_APP_CUSTOMTIMER=90
|
REACT_APP_CUSTOMTIMER=90
|
||||||
|
|
||||||
# MEDIA_SERVER_URL
|
|
||||||
MEDIA_SERVER_URL=''
|
|
||||||
@@ -164,7 +164,7 @@ export default function AssignPrevNewTask({
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* ATTACHMENT SECTION*/}
|
{/* ATTACHMENT SECTION*/}
|
||||||
<div className="w-full max-h-32">
|
<div className="w-full max-h-28">
|
||||||
<AttachFile data={activeTask.data} />
|
<AttachFile data={activeTask.data} />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ export default function AttachFile({data}) {
|
|||||||
file: event.target.files[0],
|
file: event.target.files[0],
|
||||||
job_uid: data?.job_uid,
|
job_uid: data?.job_uid,
|
||||||
uid: localStorage.getItem("uid"),
|
uid: localStorage.getItem("uid"),
|
||||||
member_id: localStorage.getItem("member_id"),
|
// member_id: localStorage.getItem("member_id"),
|
||||||
sessionid: localStorage.getItem("session_token"),
|
sessionid: localStorage.getItem("session_token"),
|
||||||
};
|
};
|
||||||
setRequestStatus({loading: true, status:false, message:''})
|
setRequestStatus({loading: true, status:false, message:''})
|
||||||
@@ -30,49 +30,46 @@ export default function AttachFile({data}) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
console.log('data', formData, inputs)
|
console.log('data', formData, inputs)
|
||||||
// axios.post(`${process.env.MEDIA_SERVER_URL}/upload/task`,formData).then(res => {
|
axios.post(`${process.env.REACT_APP_MEDIA_LINK}/upload/task`,formData).then(res => {
|
||||||
// if(res.data.status < 1){
|
if(res.data.status < 1){
|
||||||
// inputFile.current.value = null
|
inputFile.current.value = null
|
||||||
// setRequestStatus({loading: false, status:false, message:'upload failed'})
|
setRequestStatus({loading: false, status:false, message:'upload failed'})
|
||||||
// setTimeout(()=>{
|
setTimeout(()=>{
|
||||||
// setRequestStatus({loading: false, status:false, message:''})
|
setRequestStatus({loading: false, status:false, message:''})
|
||||||
// }, 3000)
|
}, 3000)
|
||||||
// return
|
return
|
||||||
// }
|
}
|
||||||
// setRequestStatus({loading: false, status:true, message:'uploaded'})
|
// console.log('RESPONSE', res.data)
|
||||||
// inputFile.current.value = null
|
setRequestStatus({loading: false, status:true, message:'uploaded'})
|
||||||
// setTimeout(()=>{
|
inputFile.current.value = null
|
||||||
// setRequestStatus({loading: false, status:false, message:''})
|
setTimeout(()=>{
|
||||||
// }, 3000)
|
setRequestStatus({loading: false, status:false, message:''})
|
||||||
// }).catch(err => {
|
}, 3000)
|
||||||
// inputFile.current.value = null
|
}).catch(err => {
|
||||||
// setRequestStatus({loading: false, status:false, message:'upload failed'})
|
inputFile.current.value = null
|
||||||
// setTimeout(()=>{
|
setRequestStatus({loading: false, status:false, message:'upload failed'})
|
||||||
// setRequestStatus({loading: false, status:false, message:''})
|
setTimeout(()=>{
|
||||||
// }, 3000)
|
setRequestStatus({loading: false, status:false, message:''})
|
||||||
// return
|
}, 3000)
|
||||||
// })
|
return
|
||||||
|
})
|
||||||
setTimeout(()=>{
|
|
||||||
setRequestStatus({loading: false, status:false, message:''})
|
|
||||||
}, 3000)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='w-full h-full flex flex-col justify-center items-center rounded-md border'>
|
<div className='w-full h-full flex flex-col justify-center items-center rounded-md'>
|
||||||
<div className='w-full flex flex-col items-start gap-1 overflow-hidden'>
|
<div className='w-full flex flex-col items-start gap-1 overflow-hidden'>
|
||||||
<div className='p-2 w-full flex justify-between items-center gap-1 border-b shadow-sm'>
|
<div className='w-full flex justify-between items-center gap-1'>
|
||||||
<p className='job-label job-label-flex'>
|
<div className='job-label job-label-flex'>
|
||||||
Files {
|
Files {
|
||||||
requestStatus.loading ?
|
requestStatus.loading ?
|
||||||
<LoadingSpinner size='6' />
|
<LoadingSpinner size='6' />
|
||||||
:
|
:
|
||||||
<p className={`text-[10px] ${requestStatus.status ? 'text-emerald-600' : 'text-red-500'}`}>{requestStatus.message}</p>
|
<span className={`text-[10px] ${requestStatus.status ? 'text-emerald-600' : 'text-red-500'}`}>{requestStatus.message}</span>
|
||||||
}
|
}
|
||||||
</p>
|
</div>
|
||||||
<label htmlFor='file' className={`cursor-pointer job-label py-1 px-2 rounded-full border ${ requestStatus.loading && 'pointer-events-none'}`}>+ Add</label>
|
<label htmlFor='file' className={`cursor-pointer text-[12px] py-1 px-2 rounded-full border ${ requestStatus.loading && 'pointer-events-none'}`}>+ Add</label>
|
||||||
</div>
|
</div>
|
||||||
<div className='job-label w-full px-2 py-1 h-20 overflow-y-auto flex justify-center items-center'>
|
<div className='text-[12px] w-full px-2 py-1 h-20 overflow-y-auto flex justify-center items-center border'>
|
||||||
list shows here
|
list shows here
|
||||||
</div>
|
</div>
|
||||||
<input
|
<input
|
||||||
|
|||||||
@@ -423,17 +423,19 @@ const EditJobPopoutNew = ({
|
|||||||
<div className="w-full flex items-center justify-center gap-2 mb-2">
|
<div className="w-full flex items-center justify-center gap-2 mb-2">
|
||||||
{/* FOR TASK IMAGE */}
|
{/* FOR TASK IMAGE */}
|
||||||
<div className="w-1/3 relative flex flex-col max-h-[130px] min-h-[130px]">
|
<div className="w-1/3 relative flex flex-col max-h-[130px] min-h-[130px]">
|
||||||
<label
|
<div className="w-full flex gap-2">
|
||||||
className={`w-full job-label job-label-flex cursor-pointer ${uploadStatus.loading && 'pointer-events-none'}`}
|
<label
|
||||||
htmlFor="task_image"
|
className={`w-full job-label cursor-pointer ${uploadStatus.loading && 'pointer-events-none'}`}
|
||||||
>
|
htmlFor="task_image"
|
||||||
Banner
|
>
|
||||||
|
Banner
|
||||||
|
</label>
|
||||||
{uploadStatus.loading ?
|
{uploadStatus.loading ?
|
||||||
<LoadingSpinner size='6' />
|
<LoadingSpinner size='6' />
|
||||||
:
|
:
|
||||||
<p className={`text-[10px] ${uploadStatus.status ? 'text-emerald-600' : 'text-red-500'}`}>{uploadStatus.message}</p>
|
<span className={`text-[10px] ${uploadStatus.status ? 'text-emerald-600' : 'text-red-500'}`}>{uploadStatus.message}</span>
|
||||||
}
|
}
|
||||||
</label>
|
</div>
|
||||||
<input
|
<input
|
||||||
id="task_image"
|
id="task_image"
|
||||||
className="hidden"
|
className="hidden"
|
||||||
|
|||||||
Reference in New Issue
Block a user