From ac6925282a9b86b00853bd65a15dab377417487f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=84=9D=EC=B0=AC=20=EC=9C=A4?= <ysc0731@ajou.ac.kr> Date: Tue, 10 Dec 2024 03:08:50 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=EC=B9=9C=EA=B5=AC=EC=88=98=EB=9D=BD?= =?UTF-8?q?=EC=8B=9C=20=EC=B9=9C=EA=B5=AC=EB=AA=A9=EB=A1=9D=20=EB=8F=99?= =?UTF-8?q?=EA=B8=B0=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Mypage.jsx | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/pages/Mypage.jsx b/src/pages/Mypage.jsx index 865abd4..4dc2439 100644 --- a/src/pages/Mypage.jsx +++ b/src/pages/Mypage.jsx @@ -120,13 +120,23 @@ const MyPage = () => { // 친구 요청 수락 const handleAcceptRequest = async (requesterId) => { try { - const response = await acceptFriendRequest(requesterId); + await acceptFriendRequest(requesterId); setReceivedRequests((prev) => prev.filter((request) => request.requester.id !== requesterId) ); - setFriends((prev) => [response, ...prev]); // 친구 목록에 추가 + setIsLoading(true); + const response = await getAllFriends(page, 10); + + const content = Array.isArray(response?.content) ? response.content : []; + const nextPage = response?.hasNext ?? false; + + setFriends((prev) => [...prev, ...content]); + setHasNext(nextPage); + setPage((prev) => prev + 1); } catch (error) { console.error("Failed to accept request:", error); + } finally { + setIsLoading(false); } }; -- GitLab From a9c5635f0b4763bc2888489a488123e5d2fb7088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=84=9D=EC=B0=AC=20=EC=9C=A4?= <ysc0731@ajou.ac.kr> Date: Tue, 10 Dec 2024 03:12:58 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20div=20=ED=81=B4=EB=A6=AD=EC=9D=B4?= =?UTF-8?q?=EB=B2=A4=ED=8A=B8=20=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Card.jsx | 29 ++++++++++++++++------------- src/pages/MeetingPage.jsx | 8 ++++---- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/components/Card.jsx b/src/components/Card.jsx index 6a0e284..63a2311 100644 --- a/src/components/Card.jsx +++ b/src/components/Card.jsx @@ -4,19 +4,22 @@ import React from "react"; import Button from "./Button"; import Label from "./Label"; import { convertIndexToTime } from "../utils/time"; -const cardVariants = cva("w-full rounded-xl shadow-lg p-4 overflow-hidden", { - variants: { - theme: { - black: "bg-black text-white", - white: "bg-white text-black", - pink: "bg-gradient-pink text-white", - purple: "bg-gradient-purple text-white", - indigo: "bg-gradient-indigo text-white", - mix: "bg-gradient-mix text-white", - gray: "bg-gray-300 text-gray-500", +const cardVariants = cva( + "w-full rounded-xl shadow-lg p-4 overflow-hidden cursor-pointer", + { + variants: { + theme: { + black: "bg-black text-white", + white: "bg-white text-black", + pink: "bg-gradient-pink text-white", + purple: "bg-gradient-purple text-white", + indigo: "bg-gradient-indigo text-white", + mix: "bg-gradient-mix text-white", + gray: "bg-gray-300 text-gray-500", + }, }, - }, -}); + } +); export default function Card({ meeting, @@ -52,7 +55,7 @@ export default function Card({ const deadlineTime = convertIndexToTime(time_idx_deadline); return ( - <div className={cn(variantClass)} onClick={onClick}> + <div className={cn(variantClass)} onClick={onClick} role="button"> <h3 className="mb-2 text-xl font-bold">{title}</h3> <Label size="sm" theme="black"> 장소: {location} diff --git a/src/pages/MeetingPage.jsx b/src/pages/MeetingPage.jsx index 98211da..2ec5b9a 100644 --- a/src/pages/MeetingPage.jsx +++ b/src/pages/MeetingPage.jsx @@ -106,7 +106,7 @@ const MeetingPage = () => { }; const handleJoinButtonClick = async (e, meetingId) => { - // e.stopPropagation(); + e.stopPropagation(); try { await joinMeeting(meetingId); alert("번개 모임에 성공적으로 참가했습니다!"); @@ -137,7 +137,7 @@ const MeetingPage = () => { }; const handleDeleteButtonClick = async (e, meetingId) => { - // e.stopPropagation(); + e.stopPropagation(); try { await deleteMeeting(meetingId); alert("번개 모임을 삭제했습니다!"); @@ -157,7 +157,7 @@ const MeetingPage = () => { }; const handleLeaveButtonClick = async (e, meetingId) => { - // e.stopPropagation(); + e.stopPropagation(); try { await leaveMeeting(meetingId); alert("번개 모임을 나갔습니다!"); @@ -177,7 +177,7 @@ const MeetingPage = () => { }; const handleCloseButtonClick = async (e, meetingId) => { - // e.stopPropagation(); + e.stopPropagation(); try { await closeMeeting(meetingId); alert("번개 모임을 마감했습니다!"); -- GitLab