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
4 changes: 2 additions & 2 deletions src/app/group/[groupId]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<div>
<GroupBannerImages images={images} />
<GroupDescriptions descriptions={data} />
<GroupMembers isHost={myMembership?.role === 'HOST'} members={joinedMembers} />
<GroupButtons statuses={{ status, myMembership, joinPolicy }} />
<GroupButtons chatRoomId={chatRoomId} statuses={{ status, myMembership, joinPolicy }} />
</div>
);
};
Expand Down
13 changes: 11 additions & 2 deletions src/components/pages/group/group-buttons/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,13 @@ import { GetGroupDetailsResponse } from '@/types/service/group';

interface Props {
statuses: Pick<GetGroupDetailsResponse, 'status' | 'myMembership' | 'joinPolicy'>;
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';
Expand All @@ -27,7 +31,12 @@ export const GroupButtons = ({ statuses: { status, myMembership, joinPolicy } }:
/>
)}
{isPending && <PendingButton />}
{isMember && <MembersButton conditions={{ isHost: myMembership.role === 'HOST' }} />}
{isMember && (
<MembersButton
chatRoomId={chatRoomId}
conditions={{ isHost: myMembership.role === 'HOST' }}
/>
)}
{isFinished && <FinishedButton />}
</div>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
1 change: 1 addition & 0 deletions src/types/service/group.ts
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ export interface CreateGroupResponse {

export interface GetGroupDetailsResponse {
id: number;
chatRoomId: number;
title: string;
joinPolicy: GroupV2JoinPolicy;
status: GroupV2Status;
Expand Down