diff --git a/src/components/infiniteScroll.js b/src/components/infiniteScroll.js index 21430736affca45e99f18d375585b9899d389553..611e991a049abfbcaa26409b47b39c8c18ea343f 100644 --- a/src/components/infiniteScroll.js +++ b/src/components/infiniteScroll.js @@ -14,7 +14,6 @@ function InfiniteScroll(props){ const initialFetchData = async ()=>{ try{ const response = await fetch(`/api/${page}${queryString1}`); - console.log(`/api/${page}${queryString1}`); const jsonData = await response.json(); const newData = jsonData[page]; @@ -39,6 +38,7 @@ function InfiniteScroll(props){ setItems((prevItem) => [...prevItem, ...components]); } }else { + if(newData.length > 0) { const components = newData.map((item) => ( <PageItem data={item}/> @@ -46,6 +46,7 @@ function InfiniteScroll(props){ setItems(prevItem => [...prevItem, ...components]); } + console.log(`/api/${page}${queryString1}`); } } catch(error){ @@ -55,6 +56,7 @@ function InfiniteScroll(props){ useEffect(() => { initialFetchData(); // 최초 렌더링 시에 데이터 가져오기 + console.log(`/api/${page}${queryString1}`); }, [page, queryString1, queryString2]); const fetchData = async ()=>{ @@ -71,6 +73,7 @@ function InfiniteScroll(props){ setMinId(jsonData['minId']); if(page==='channels'){ + if (newData.length > 0) { const components = []; for (let i = 0; i < newData.length; i += 2) { @@ -89,6 +92,7 @@ function InfiniteScroll(props){ setItems((prevItem) => [...prevItem, ...components]); } }else { + if(newData.length > 0) { const components = newData.map((item) => ( <PageItem data={item}/> diff --git a/src/components/recruit/createRecruit.js b/src/components/recruit/createRecruit.js index 1621f6a8bfb26a307c4e1e3ed9ee50aa8f54509f..1d5e6aca6f1751c80d1b36a5b6f523ef6aaa5efd 100644 --- a/src/components/recruit/createRecruit.js +++ b/src/components/recruit/createRecruit.js @@ -20,10 +20,10 @@ function CreateRecruit({ isOpen, onClose }){ }); const [timeData, setTimeData] = useState({ - startHour: '', - startMinute: '', - endHour: '', - endMinute: '' + startHour: null, + startMinute: null, + endHour: null, + endMinute: null }); const handleInputChange = (e) => { @@ -54,18 +54,21 @@ function CreateRecruit({ isOpen, onClose }){ }; const handleSave = () => { - handleSubmit({ - ...formData, - data: { - ...formData.data, - startTime: `${timeData.startHour|| '00'}:${timeData.startMinute || '00'}`, - endTime: `${timeData.endHour|| '00'}:${timeData.endMinute || '00'}`, - } - }); + if(formData.data.timeCategory === "D"){ + handleSubmit({ + ...formData, + data: { + ...formData.data, + startTime: `${timeData.startHour}:${timeData.startMinute}`, + endTime: `${timeData.endHour}:${timeData.endMinute}`, + } + }); + }else{ + handleSubmit(formData); + } }; const handleSubmit = async (formData) => { - if(formData.data.title === ''){ alert('제목을 입력해주세요.'); diff --git a/src/components/recruit/modifyRecruit.js b/src/components/recruit/modifyRecruit.js index d4a44eefecd7455953f896bbd55feb403cdfc21e..ffdcc1f74ef4dc19a8de249037708ad5f7c8e842 100644 --- a/src/components/recruit/modifyRecruit.js +++ b/src/components/recruit/modifyRecruit.js @@ -52,14 +52,18 @@ const ModifyRecruit=({isOpen, onClose, data})=>{ }; const handleSave = () => { - modifyInfo({ - ...formData, - info: { - ...formData.info, - startTime: `${timeData.startHour|| '00'}:${timeData.startMinute || '00'}`, - endTime: `${timeData.endHour|| '00'}:${timeData.endMinute || '00'}`, - } - }); + if(formData.info.timeCategory === "D"){ + modifyInfo({ + ...formData, + info: { + ...formData.info, + startTime: `${timeData.startHour|| '00'}:${timeData.startMinute || '00'}`, + endTime: `${timeData.endHour|| '00'}:${timeData.endMinute || '00'}`, + } + }); + }else{ + modifyInfo(formData); + } }; const modifyInfo = async (formData)=>{ diff --git a/src/components/recruit/recruitList.js b/src/components/recruit/recruitList.js index be230474c259d154207a3c735c7fbf5020ae045b..ab87b296f88b47c38137d97ba7fb2c945de16920 100644 --- a/src/components/recruit/recruitList.js +++ b/src/components/recruit/recruitList.js @@ -162,6 +162,7 @@ function RecruitList(){ useEffect(() => { setForceRender((prev) => !prev); + console.log('Component has been re-rendered'); }, [generatedUrl, firstQueryString, secondQueryString]) return( diff --git a/src/pages/join.module.css b/src/pages/join.module.css index 0346349e1d6387fd14594fef456f51074dd49cb1..4f1f6e12ad7798958e2134b8cd477c1609ce8f0a 100644 --- a/src/pages/join.module.css +++ b/src/pages/join.module.css @@ -80,8 +80,7 @@ margin-left: 15px; margin-top:-20px; - margin-bottom: -30px - + margin-bottom: -30px; } .input_with_img img{