Skip to content

develop에서 main #301

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
haegu97 merged 2 commits into from
Jan 5, 2025
Merged

develop에서 main #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb968ec
refactor: 취소된 모임 채팅 목록에서 삭제
haegu97 Jan 5, 2025
f345c2c
Merge pull request #300 from codeit-team3/299-refactor-취소된-모임-채팅-목록에서-삭제
haegu97 Jan 5, 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
1 change: 1 addition & 0 deletions src/features/chat/components/chat-card/types/variantChatCard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export interface BookClubProps extends CommonProps {
lastMessageTime?: string;
unreadCount?: number;
hostId?: number;
isInactive?: boolean;
}

export interface ChatRoomHeaderProps extends CommonProps {
Expand Down
46 changes: 24 additions & 22 deletions src/features/chat/container/BookClubChatContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,33 +51,35 @@ export default function BookClubChatContainer() {
if (error) return <div>에러가 발생했습니다</div>;

return (
<section className="flex flex-1 items-center justify-center bg-gray-light-02 px-6 py-5">
<section className="flex flex-1 justify-center bg-gray-light-02 px-6 py-5">
{isLoading ? (
<Loading fullHeight={false} />
) : (
<div className="mx-auto flex w-full max-w-[996px] flex-col gap-5">
{bookClubChats.map((bookClub: BookClubProps, id: number) => {
const recentMessage = findRecentMessage(
recentMessages,
Number(bookClub.id),
);
{bookClubChats
.filter((bookClub: BookClubProps) => !bookClub.isInactive)
.map((bookClub: BookClubProps, id: number) => {
const recentMessage = findRecentMessage(
recentMessages,
Number(bookClub.id),
);

return (
<Link key={id} href={`/chat/${bookClub.id}`}>
<ChatCard
variant="bookClub"
props={{
...bookClub,
isHost: user?.id === bookClub.hostId,
lastMessage: recentMessage?.content || '',
lastMessageTime: recentMessage?.date
? formatDateForUI(recentMessage.date, 'CHAT_ROOM')
: '',
}}
/>
</Link>
);
})}
return (
<Link key={id} href={`/chat/${bookClub.id}`}>
<ChatCard
variant="bookClub"
props={{
...bookClub,
isHost: user?.id === bookClub.hostId,
lastMessage: recentMessage?.content || '',
lastMessageTime: recentMessage?.date
? formatDateForUI(recentMessage.date, 'CHAT_ROOM')
: '',
}}
/>
</Link>
);
})}
</div>
)}
</section>
Expand Down
Loading