diff --git a/src/components/infiniteScroll.js b/src/components/infiniteScroll.js index bbedfeefeefdc8acb6c2c2373ad1a89c8e3d576b..eadc30b665026abd85907dad89d455889045afbd 100644 --- a/src/components/infiniteScroll.js +++ b/src/components/infiniteScroll.js @@ -2,7 +2,6 @@ import React, { useState, useEffect } from 'react'; import {PageItem} from "./recruit/recruitList"; import InfiniteScrollStyles from './infiniteScroll.module.css' import {ChannelItem} from "./channel/channelList"; -import { json } from 'react-router-dom'; function InfiniteScroll(props){ const [items, setItems] = useState([]); @@ -77,18 +76,11 @@ function InfiniteScroll(props){ setIsLoading(true); - try{ - const response = ''; - if(page === 'channels'){ - response = await fetch(`/api/${page}?${min}=${minDate}${queryString2}`); - }else{ - response = await fetch(`/api/${page}?${min}=${minId}${queryString2}`); - } - - const jsonData = await response.json(); - + try{ if(page==='channels'){ - setMinId(jsonData['minDate']); + const response = await fetch(`/api/${page}?${min}=${minDate}${queryString2}`); + const jsonData = await response.json(); + setMinDate(jsonData['minDate']); const newData = jsonData[page]; if (newData.length > 0) { const components = []; @@ -107,7 +99,9 @@ function InfiniteScroll(props){ } setItems((prevItem) => [...prevItem, ...components]); } - }else if(page==='recruits'){ + }else if(page==='recruits'){ + const response = await fetch(`/api/${page}?${min}=${minId}${queryString2}`); + const jsonData = await response.json(); setMinId(jsonData['minId']); const newData = jsonData[page]; if(newData.length > 0) { @@ -118,6 +112,8 @@ function InfiniteScroll(props){ setItems(prevItem => [...prevItem, ...components]); } } else{ + const response = await fetch(`/api/${page}?${min}=${minId}${queryString2}`); + const jsonData = await response.json(); setMinId(jsonData['minId']); const newData = jsonData["recruits"]; if(newData.length > 0) { diff --git a/src/components/mainAside.js b/src/components/mainAside.js index 07826b1e568962fa20cfc4ffae25660550866de5..d029df0c3382a44560cecf1c576b163ff6449fb8 100644 --- a/src/components/mainAside.js +++ b/src/components/mainAside.js @@ -36,9 +36,9 @@ function Notice(props){ const sortedNotice = subscribeNotices.sort((a, b) => a.date - b.date); const noticeComponents = sortedNotice.map((notice) => ( <p className={styles.noticeContent}> - <span className={styles.channel}>{notice.channel}</span> - <span className={styles.date}>{notice.date}</span> - <span className={styles.content}>{notice.title}</span> + <span className={styles.channel}>{notice.channelNickname}</span> + <span className={styles.noticeTitle}>{notice.title}</span> + <span className={styles.content}>{notice.content}</span> </p> )); diff --git a/src/components/mainAside.module.css b/src/components/mainAside.module.css index 8a7f79dc1d897e40f71a1b7a6d3182304556124a..6f87b7740dbf92d6004dca234af4f594adbf86f6 100644 --- a/src/components/mainAside.module.css +++ b/src/components/mainAside.module.css @@ -63,15 +63,11 @@ float: left; } -.time{ - -} - .channel{ } -.date{ +.noticeTitle{ } diff --git a/src/components/recruit/createVote.js b/src/components/recruit/createVote.js index b0f55067c55eb83d8ae0d2b10b9fa8e48406bdc7..36d2d286d95d32a5b3f56587b3810eb2fe6695ad 100644 --- a/src/components/recruit/createVote.js +++ b/src/components/recruit/createVote.js @@ -1,15 +1,15 @@ import React from 'react'; import createVoteStyles from './createVote.module.css'; -function CreateVote({ id, data }){ +function CreateVote({ data, time }){ const createVote = async ()=>{ try{ - const response = await fetch(`/api/recruits/${id}/times/save`,{ + const response = await fetch(`/api/recruits/${data.id}/times/save`,{ method: 'POST', headers: { 'Content-Type': 'application/json', }, - body: JSON.stringify(data), + body: JSON.stringify(time), }); if (response.ok){ @@ -26,7 +26,11 @@ function CreateVote({ id, data }){ return ( <div> <div> - <button type='button' className={createVoteStyles.createVote} onClick={createVote}>투표 생성</button> + {data.vote === 'Before' ?( + <button type='button' className={createVoteStyles.createVote} onClick={createVote}>투표 생성</button> + ):( + <button type='button' className={createVoteStyles.endCreateVote} onClick={createVote} disabled>투표 생성</button> + )} </div> </div> diff --git a/src/components/recruit/createVote.module.css b/src/components/recruit/createVote.module.css index dc33432f0320548e100b45bd3b02e9492bbc5824..9a46b5d63c587983e8736cbfe9a37c1e0dda60ce 100644 --- a/src/components/recruit/createVote.module.css +++ b/src/components/recruit/createVote.module.css @@ -9,4 +9,17 @@ background-color:#8393BE; box-shadow: 2px 2px 5px rgba(0, 0, 0, 0.2); /* 그림자 추가 */ transition: background-color 0.3s, color 0.3s, transform 0.3s; +} + +.endCreateVote{ + width: 90px; + height:35px; + border:none; + border-radius: 5px; + cursor: pointer; + + color: white; + background-color:#b5b9c5; + box-shadow: 2px 2px 5px rgba(0, 0, 0, 0.2); /* 그림자 추가 */ + transition: background-color 0.3s, color 0.3s, transform 0.3s; } \ No newline at end of file diff --git a/src/components/recruit/timeInquiry.js b/src/components/recruit/timeInquiry.js index 5a4fcd8acfa9b5e7c51629e8bdad5c144d865073..4cf39e3e32c6330b4ca0783fc1183b77a51ab501 100644 --- a/src/components/recruit/timeInquiry.js +++ b/src/components/recruit/timeInquiry.js @@ -231,7 +231,7 @@ function TimeInquiry({ isOpen, onClose, data }){ <div className={timeInquiryStyles.voteButton}> <div className={timeInquiryStyles.createVote}> - <CreateVote id={data.id} data={selectedTimes}/> + <CreateVote data={data} time={selectedTimes}/> </div> </div>