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
1 change: 1 addition & 0 deletions src/app/chat/[id]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ function ChatRoomPage() {
userId: msg.userId,
userNickname: msg.userNickname,
content: msg.content,
image: msg.image,
} as ChatMessageType;
} else {
return {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ interface ChatMessageProps {
isConsecutive: boolean;
hostId: string | number;
time: string;
image?: string;
onProfileClick?: (userId: string | number) => void;
}

Expand All @@ -21,7 +22,7 @@ function ChatMessage({
time,
// onProfileClick,
}: ChatMessageProps) {
const { userId, content, userNickname } = message;
const { userId, content, userNickname, image } = message;
const [isPopUpOpen, setIsPopUpOpen] = useState(false);
const router = useRouter();

Expand All @@ -36,6 +37,7 @@ function ChatMessage({
content,
time,
name: userNickname,
image: image,
isHost: userId === hostId,
onProfileClick: () => setIsPopUpOpen(true),
isConsecutive,
Expand Down
54 changes: 31 additions & 23 deletions src/features/chat/container/BookClubChatContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { findRecentMessage } from '@/features/chat/utils/chatRoom';
import { formatDateForUI } from '@/lib/utils/formatDateForUI';
import { useAuthStore } from '@/store/authStore';
import Loading from '@/components/loading/Loading';
import EmptyState from '@/components/common-layout/EmptyState';

export default function BookClubChatContainer() {
const [recentMessages, setRecentMessages] = useState<
Expand Down Expand Up @@ -56,30 +57,37 @@ export default function BookClubChatContainer() {
<Loading fullHeight={false} />
) : (
<div className="mx-auto flex w-full max-w-[996px] flex-col gap-5">
{bookClubChats
.filter((bookClub: BookClubProps) => !bookClub.isInactive)
.map((bookClub: BookClubProps, id: number) => {
const recentMessage = findRecentMessage(
recentMessages,
Number(bookClub.id),
);
{bookClubChats.length === 0 ? (
<EmptyState
title="진행중인 채팅방이 없어요."
subtitle="모임에 참여해보세요!"
/>
) : (
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