diff --git a/src/app/group/[groupId]/page.tsx b/src/app/group/[groupId]/page.tsx index 91cf7c5e..265b573d 100644 --- a/src/app/group/[groupId]/page.tsx +++ b/src/app/group/[groupId]/page.tsx @@ -22,14 +22,14 @@ const GroupDetailPage = ({ params }: Props) => { if (!data) return null; - const { images, status, joinPolicy, myMembership, joinedMembers } = data; + const { chatRoomId, images, status, joinPolicy, myMembership, joinedMembers } = data; return (
- +
); }; diff --git a/src/components/pages/group/group-buttons/index.tsx b/src/components/pages/group/group-buttons/index.tsx index c9cb18c0..b5a04f2d 100644 --- a/src/components/pages/group/group-buttons/index.tsx +++ b/src/components/pages/group/group-buttons/index.tsx @@ -8,9 +8,13 @@ import { GetGroupDetailsResponse } from '@/types/service/group'; interface Props { statuses: Pick; + chatRoomId: GetGroupDetailsResponse['chatRoomId']; } -export const GroupButtons = ({ statuses: { status, myMembership, joinPolicy } }: Props) => { +export const GroupButtons = ({ + statuses: { status, myMembership, joinPolicy }, + chatRoomId, +}: Props) => { const isMember = myMembership?.status === 'ATTEND' && status !== 'FINISHED'; const isPending = myMembership?.status === 'PENDING' && status !== 'FINISHED'; @@ -27,7 +31,12 @@ export const GroupButtons = ({ statuses: { status, myMembership, joinPolicy } }: /> )} {isPending && } - {isMember && } + {isMember && ( + + )} {isFinished && } ); diff --git a/src/components/pages/group/group-buttons/members-button/index.tsx b/src/components/pages/group/group-buttons/members-button/index.tsx index 2ea55283..9ea2a349 100644 --- a/src/components/pages/group/group-buttons/members-button/index.tsx +++ b/src/components/pages/group/group-buttons/members-button/index.tsx @@ -1,22 +1,22 @@ -// import { useRouter } from 'next/navigation'; +import { useRouter } from 'next/navigation'; import { GroupModal } from '@/components/pages/group/group-modal'; import { Button, useModal } from '@/components/ui'; +import { GetGroupDetailsResponse } from '@/types/service/group'; interface Props { conditions: { isHost: boolean; }; + chatRoomId: GetGroupDetailsResponse['chatRoomId']; } -export const MembersButton = ({ conditions: { isHost } }: Props) => { +export const MembersButton = ({ conditions: { isHost }, chatRoomId }: Props) => { const { open } = useModal(); - // const { push } = useRouter(); + const { push } = useRouter(); - // 그룹 채팅방 아이디 추가해야됨 const onEnterChatClick = () => { - alert('채팅 파업'); - // push('/message/id'); + push(`/message/chat/${chatRoomId}`); }; return ( diff --git a/src/types/service/group.ts b/src/types/service/group.ts index 1c07ef3c..267c4e5e 100644 --- a/src/types/service/group.ts +++ b/src/types/service/group.ts @@ -155,6 +155,7 @@ export interface CreateGroupResponse { export interface GetGroupDetailsResponse { id: number; + chatRoomId: number; title: string; joinPolicy: GroupV2JoinPolicy; status: GroupV2Status;