Skip to content

merge to main #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
heeeeyong merged 3 commits into from
Aug 21, 2025
Merged

merge to main #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e04f0d4
fix: 댓글 작성 시, 갯수 반영
heeeeyong Aug 21, 2025
57b4c91
fix: 진행중인 모임방 제목 넘치는현상 수정
heeeeyong Aug 21, 2025
c70e9e8
Merge pull request #203 from THIP-TextHip/chore/minor-updates
heeeeyong Aug 21, 2025
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
2 changes: 2 additions & 0 deletions src/components/group/GroupCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ const Info = styled.div`
flex-direction: column;
justify-content: space-between;
flex: 1;
min-width: 0; /* flex 아이템이 부모 너비를 넘지 않도록 */
`;

const Title = styled.h3<{ isRecommend: boolean }>`
Expand All @@ -123,6 +124,7 @@ const Title = styled.h3<{ isRecommend: boolean }>`
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 100%; /* 부모 컨테이너의 전체 너비 사용 */
`;

const Bottom = styled.div`
Expand Down
14 changes: 13 additions & 1 deletion src/pages/feed/FeedDetailPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,22 @@ const FeedDetailPage = () => {
try {
const commentsResponse = await getComments(Number(feedId), { postType: 'FEED' });
setCommentList(commentsResponse.data.commentList);

// 피드 데이터의 댓글 수를 실제 댓글 목록 길이로 업데이트
if (feedData) {
setFeedData(prev =>
prev
? {
...prev,
commentCount: commentsResponse.data.commentList.length,
}
: null,
);
}
} catch (err) {
console.error('댓글 목록 다시 로드 실패:', err);
}
}, [feedId]);
}, [feedId, feedData]);

// 페이지를 떠날 때 답글 상태 초기화
useEffect(() => {
Expand Down