Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/app/home/home.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,11 @@ export default function Home() {
setHasMore(false);
} else {
// ๊ธฐ์กด ๋ชฉ๋ก + ์ƒˆ๋กœ ๊ฐ€์ ธ์˜จ ๋ชฉ๋ก
setCards((prev) => [...prev, ...newContent]);

setCards((prev) => {
const existingIds = new Set(prev.map((team) => team.teamId));
const uniqueNewContent = newContent.filter((team) => !existingIds.has(team.teamId));
return [...prev, ...uniqueNewContent];
});
// ๋งˆ์ง€๋ง‰ ์•„์ดํ…œ์˜ teamId๋ฅผ nextLastId๋กœ
const nextLastId = newContent[newContent.length - 1].teamId;
setLastTeamId(nextLastId);
Expand Down
12 changes: 5 additions & 7 deletions src/app/mypage/approve_modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,6 @@ const RejectButton = styled.button`
cursor: pointer;
`;


// <--------------------์—ฌ๊ธฐ๋ถ€ํ„ฐ ๋”๋ฏธ๋ฐ์ดํ„ฐ ------------------------>



// <--------------------์—ฌ๊ธฐ๊นŒ์ง€ ๋”๋ฏธ๋ฐ์ดํ„ฐ ------------------------>
export default function ApproveModal({ isOpen, onClose, projectId }) {
const [projectInfo, setProjectInfo] = useState(null);
const [requestList, setRequestList] = useState([]);
Expand Down Expand Up @@ -166,7 +160,11 @@ export default function ApproveModal({ isOpen, onClose, projectId }) {
setHasMore(false);
} else {
//๊ธฐ์กด ๋ชฉ๋ก + ์ƒˆ๋กœ ๊ฐ€์ ธ์˜จ ๋ชฉ๋ก
setRequestList((prev) => [...prev, ...newContent]);
setRequestList((prev) => {
const existingIds = new Set(prev.map((r) => r.registrationId));
const uniqueNew = newContent.filter((r) => !existingIds.has(r.registrationId));
return [...prev, ...uniqueNew];
});

const nextLastId = newContent[newContent.length - 1].registrationId;
setLastTeamId(nextLastId);
Expand Down
6 changes: 5 additions & 1 deletion src/app/mypage/leader_modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,11 @@ export default function LeaderModal({ isOpen, onClose, projectId, currentMemberI
// ์‘๋‹ต ๊ตฌ์กฐ: { data: { content: [...], last: true/false, ... } }
const newParticipants = res.data.data.content || [];
// ๊ธฐ์กด ๋ชฉ๋ก์— ํ•ฉ์น˜๊ธฐ
setParticipants((prev) => [...prev, ...newParticipants]);
setParticipants((prev) => {
const existingIds = new Set(prev.map((p) => p.projectParticipantId));
const uniqueNew = newParticipants.filter((p) => !existingIds.has(p.projectParticipantId));
return [...prev, ...uniqueNew];
});
if (newParticipants.length > 0) {
const nextLastId = newParticipants[newParticipants.length - 1].projectParticipantId;
setLastParticipantId(nextLastId);
Expand Down
14 changes: 12 additions & 2 deletions src/app/task/task.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,13 @@ export default function Task({ projectId }) {
if (content.length === 0) {
setHasMore(false);
} else {
setTasks((prev) => [...prev, ...content]);
setLastTaskId(content[content.length - 1].taskId);
setTasks((prev) => {
const existingIds = new Set(prev.map((t) => t.taskId));
const uniqueNew = content.filter((t) => !existingIds.has(t.taskId));
return [...prev, ...uniqueNew];
});

setLastTaskId(content[content.length - 1].taskId);
}

if (data.last || content.length < TASK_PAGE_SIZE) {
Expand Down Expand Up @@ -258,6 +263,11 @@ export default function Task({ projectId }) {
)}
</T.TaskRight>
</T.TaskBox>
{isCompleted && (
<T.CompletedDate>
{task.dueDt}
</T.CompletedDate>
)}
{isNotStarted && (
<T.TaskStatusButton
onClick={() => {
Expand Down
8 changes: 8 additions & 0 deletions src/app/task/task_s.js
Original file line number Diff line number Diff line change
Expand Up @@ -286,5 +286,13 @@ export const SButton = styled.button`
}
`;

export const CompletedDate = styled.p`
font-size: 13px;
color: #666;
text-align: right;
margin-right: 10px;
margin-top: 4px;
`;



26 changes: 22 additions & 4 deletions src/app/team/team.js
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,17 @@ export default function Team({ teamId }) {
role: "member",
}));

setTeamMembers((prev) => [...prev, ...formattedMembers]);
setDisplayedMembers((prev) => [...prev, ...formattedMembers]);
setTeamMembers((prev) => {
const existingIds = new Set(prev.map((m) => m.id));
const uniqueNew = formattedMembers.filter((m) => !existingIds.has(m.id));
return [...prev, ...uniqueNew];
});

setDisplayedMembers((prev) => {
const existingIds = new Set(prev.map((m) => m.id));
const uniqueNew = formattedMembers.filter((m) => !existingIds.has(m.id));
return [...prev, ...uniqueNew];
});

if (formattedMembers.length > 0) {
const nextLastId = formattedMembers[formattedMembers.length - 1].id;
Expand Down Expand Up @@ -264,8 +273,17 @@ export default function Team({ teamId }) {
}
});

setMyProjects(prev => [...prev, ...newMyProjects]);
setOtherProjects(prev => [...prev, ...newOtherProjects]);
setMyProjects((prev) => {
const existingIds = new Set(prev.map(p => p.projectInfo.projectId));
const uniqueNew = newMyProjects.filter(p => !existingIds.has(p.projectInfo.projectId));
return [...prev, ...uniqueNew];
});

setOtherProjects((prev) => {
const existingIds = new Set(prev.map(p => p.projectInfo.projectId));
const uniqueNew = newOtherProjects.filter(p => !existingIds.has(p.projectInfo.projectId));
return [...prev, ...uniqueNew];
});

const last = content[content.length - 1];
setLastProjectId(last.projectInfo.projectId);
Expand Down