Skip to content
Snippets Groups Projects
Commit d39ffa40 authored by 유 채린's avatar 유 채린
Browse files

fix: modify createRecruit and modifyRecruit

parent d7addbf2
Branches
No related tags found
No related merge requests found
...@@ -14,7 +14,6 @@ function InfiniteScroll(props){ ...@@ -14,7 +14,6 @@ function InfiniteScroll(props){
const initialFetchData = async ()=>{ const initialFetchData = async ()=>{
try{ try{
const response = await fetch(`/api/${page}${queryString1}`); const response = await fetch(`/api/${page}${queryString1}`);
console.log(`/api/${page}${queryString1}`);
const jsonData = await response.json(); const jsonData = await response.json();
const newData = jsonData[page]; const newData = jsonData[page];
...@@ -22,10 +21,21 @@ function InfiniteScroll(props){ ...@@ -22,10 +21,21 @@ function InfiniteScroll(props){
if(page==='channels'){ if(page==='channels'){
if (newData.length > 0) { if (newData.length > 0) {
const components=newData.map((item)=>( const components = [];
<ChannelItem data={item}/> for (let i = 0; i < newData.length; i += 2) {
)); const component = (
setItems(prevItem => [...prevItem, ...components]);
<div className={InfiniteScrollStyles.itemContainer}>
<div className={InfiniteScrollStyles.firstitem}>
<ChannelItem props={newData[i]} /></div>
<div className={InfiniteScrollStyles.seconditem}>{i + 1 < newData.length && <ChannelItem props={newData[i + 1]} />}</div>
</div>
);
components.push(component);
console.log('ne', newData[i]);
}
setItems((prevItem) => [...prevItem, ...components]);
} }
}else { }else {
if(newData.length > 0) { if(newData.length > 0) {
...@@ -35,6 +45,7 @@ function InfiniteScroll(props){ ...@@ -35,6 +45,7 @@ function InfiniteScroll(props){
setItems(prevItem => [...prevItem, ...components]); setItems(prevItem => [...prevItem, ...components]);
} }
console.log(`/api/${page}${queryString1}`);
} }
} catch(error){ } catch(error){
...@@ -44,6 +55,7 @@ function InfiniteScroll(props){ ...@@ -44,6 +55,7 @@ function InfiniteScroll(props){
useEffect(() => { useEffect(() => {
initialFetchData(); // 최초 렌더링 시에 데이터 가져오기 initialFetchData(); // 최초 렌더링 시에 데이터 가져오기
console.log(`/api/${page}${queryString1}`);
}, [page, queryString1, queryString2]); }, [page, queryString1, queryString2]);
const fetchData = async ()=>{ const fetchData = async ()=>{
...@@ -61,15 +73,21 @@ function InfiniteScroll(props){ ...@@ -61,15 +73,21 @@ function InfiniteScroll(props){
if(page==='channels'){ if(page==='channels'){
if (newData.length > 0) { if (newData.length > 0) {
const components = [];
for (let i = 0; i < newData.length; i += 2) { for (let i = 0; i < newData.length; i += 2) {
const component = ( const component = (
<div key={i} className="channelItemRow">
<ChannelItem data={newData[i]} /> <div className={InfiniteScrollStyles.itemContainer}>
{i + 1 < newData.length && <ChannelItem data={newData[i + 1]} />} <div className={InfiniteScrollStyles.firstitem}>
<ChannelItem props={newData[i]} /></div>
<div className={InfiniteScrollStyles.seconditem}>{i + 1 < newData.length && <ChannelItem props={newData[i + 1]} />}</div>
</div> </div>
); );
setItems((prevItem) => [...prevItem, component]); components.push(component);
console.log('ne', newData[i]);
} }
setItems((prevItem) => [...prevItem, ...components]);
} }
}else { }else {
if(newData.length > 0) { if(newData.length > 0) {
......
...@@ -20,10 +20,10 @@ function CreateRecruit({ isOpen, onClose }){ ...@@ -20,10 +20,10 @@ function CreateRecruit({ isOpen, onClose }){
}); });
const [timeData, setTimeData] = useState({ const [timeData, setTimeData] = useState({
startHour: '', startHour: null,
startMinute: '', startMinute: null,
endHour: '', endHour: null,
endMinute: '' endMinute: null
}); });
const handleInputChange = (e) => { const handleInputChange = (e) => {
...@@ -54,19 +54,22 @@ function CreateRecruit({ isOpen, onClose }){ ...@@ -54,19 +54,22 @@ function CreateRecruit({ isOpen, onClose }){
}; };
const handleSave = () => { const handleSave = () => {
if(formData.data.timeCategory === "D"){
handleSubmit({ handleSubmit({
...formData, ...formData,
data: { data: {
...formData.data, ...formData.data,
startTime: `${timeData.startHour|| '00'}:${timeData.startMinute || '00'}`, startTime: `${timeData.startHour}:${timeData.startMinute}`,
endTime: `${timeData.endHour|| '00'}:${timeData.endMinute || '00'}`, endTime: `${timeData.endHour}:${timeData.endMinute}`,
} }
}); });
}else{
handleSubmit(formData);
}
}; };
const handleSubmit = async (formData) => { const handleSubmit = async (formData) => {
if(formData.data.title === ''){ if(formData.data.title === ''){
alert('제목을 입력해주세요.'); alert('제목을 입력해주세요.');
return; return;
......
...@@ -52,6 +52,7 @@ const ModifyRecruit=({isOpen, onClose, data})=>{ ...@@ -52,6 +52,7 @@ const ModifyRecruit=({isOpen, onClose, data})=>{
}; };
const handleSave = () => { const handleSave = () => {
if(formData.info.timeCategory === "D"){
modifyInfo({ modifyInfo({
...formData, ...formData,
info: { info: {
...@@ -60,6 +61,9 @@ const ModifyRecruit=({isOpen, onClose, data})=>{ ...@@ -60,6 +61,9 @@ const ModifyRecruit=({isOpen, onClose, data})=>{
endTime: `${timeData.endHour|| '00'}:${timeData.endMinute || '00'}`, endTime: `${timeData.endHour|| '00'}:${timeData.endMinute || '00'}`,
} }
}); });
}else{
modifyInfo(formData);
}
}; };
const modifyInfo = async (formData)=>{ const modifyInfo = async (formData)=>{
......
...@@ -162,6 +162,7 @@ function RecruitList(){ ...@@ -162,6 +162,7 @@ function RecruitList(){
useEffect(() => { useEffect(() => {
setForceRender((prev) => !prev); setForceRender((prev) => !prev);
console.log('Component has been re-rendered');
}, [generatedUrl, firstQueryString, secondQueryString]) }, [generatedUrl, firstQueryString, secondQueryString])
return( return(
......
...@@ -80,8 +80,7 @@ ...@@ -80,8 +80,7 @@
margin-left: 15px; margin-left: 15px;
margin-top:-20px; margin-top:-20px;
margin-bottom: -30px margin-bottom: -30px;
} }
.input_with_img img{ .input_with_img img{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment