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
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ interface Props {
params: Promise<{ groupId: string }>;
}

const MeetupDetailLayout = async ({ children, params }: Props) => {
const GroupDetailLayout = async ({ children, params }: Props) => {
const { groupId } = await params;

const queryClient = new QueryClient();
Expand All @@ -24,4 +24,4 @@ const MeetupDetailLayout = async ({ children, params }: Props) => {
return <HydrationBoundary state={dehydratedState}>{children}</HydrationBoundary>;
};

export default MeetupDetailLayout;
export default GroupDetailLayout;
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
import { use } from 'react';

import {
MeetupBannerImages,
MeetupButtons,
MeetupDescriptions,
MeetupMembers,
} from '@/components/pages/meetup';
GroupBannerImages,
GroupButtons,
GroupDescriptions,
GroupMembers,
} from '@/components/pages/group';
import { useGetGroupDetails } from '@/hooks/use-group/use-group-get-details';

interface Props {
params: Promise<{ groupId: string }>;
}

const MeetupDetailPage = ({ params }: Props) => {
const GroupDetailPage = ({ params }: Props) => {
const { groupId } = use(params);
const { data } = useGetGroupDetails({ groupId });

Expand All @@ -26,10 +26,10 @@ const MeetupDetailPage = ({ params }: Props) => {

return (
<div>
<MeetupBannerImages images={images} />
<MeetupDescriptions descriptions={data} />
<MeetupMembers members={joinedMembers} />
<MeetupButtons
<GroupBannerImages images={images} />
<GroupDescriptions descriptions={data} />
<GroupMembers members={joinedMembers} />
<GroupButtons
conditions={{
isHost: myMembership?.role === 'HOST',
isJoined: myMembership?.status === 'ATTEND',
Expand All @@ -42,4 +42,4 @@ const MeetupDetailPage = ({ params }: Props) => {
);
};

export default MeetupDetailPage;
export default GroupDetailPage;
2 changes: 1 addition & 1 deletion src/app/schedule/(components)/meeting-list.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export const MeetingList = ({
tabType={tabType}
tags={meeting.tags}
title={meeting.title}
onClick={() => router.push(`/meetup/${meeting.id}`)}
onClick={() => router.push(`/group/${meeting.id}`)}
/>
))}

Expand Down
2 changes: 1 addition & 1 deletion src/app/schedule/(components)/my.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default function My() {
return (
<MeetingList
completedMessage={completedMessage}
emptyStatePath='/post-meetup'
emptyStatePath='/create-group'
emptyStateType='myPost'
error={error}
hasNextPage={hasNextPage}
Expand Down
2 changes: 1 addition & 1 deletion src/components/pages/group-list/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export default function GroupList({ initialData, initialKeyword }: GroupListProp
profileImage={meeting.createdBy.profileImage}
tags={meeting.tags}
title={meeting.title}
onClick={() => router.push(`/meetup/${meeting.id}`)}
onClick={() => router.push(`/group/${meeting.id}`)}
/>
))
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ interface Props {
images: GetGroupDetailsResponse['images'];
}

export const MeetupBannerImages = ({ images }: Props) => {
export const GroupBannerImages = ({ images }: Props) => {
const hasImages = Boolean(images.length);

return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// import { useRouter } from 'next/navigation';

import { MeetupModal } from '@/components/pages/meetup/meetup-modal';
import { GroupModal } from '@/components/pages/group/group-modal';
import { Button } from '@/components/ui/button';
import { useModal } from '@/components/ui/modal';

Expand All @@ -16,7 +16,7 @@ interface Props {
groupId: string;
}

export const MeetupButtons = ({
export const GroupButtons = ({
conditions: { isJoined, isHost, isPast, isAttendDisabled },
groupId,
}: Props) => {
Expand All @@ -37,7 +37,7 @@ export const MeetupButtons = ({
className='flex-[1.2]'
variant='tertiary'
onClick={() =>
open(<MeetupModal groupId={groupId} type={isHost ? 'delete' : 'leave'} />)
open(<GroupModal groupId={groupId} type={isHost ? 'delete' : 'leave'} />)
}
>
{isHost ? '모임 취소' : '모임 탈퇴'}
Expand All @@ -49,7 +49,7 @@ export const MeetupButtons = ({
) : (
<Button
disabled={isAttendDisabled}
onClick={() => open(<MeetupModal groupId={groupId} type='attend' />)}
onClick={() => open(<GroupModal groupId={groupId} type='attend' />)}
>
참여하기
</Button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ export const DescriptionProfile = ({
</Link>
{isPast && <p className='text-text-xs-semibold pr-1 text-gray-500'>모임 마감</p>}
{isHost && !isPast && (
<Link href={`/post-meetup/${groupId}`} className='text-text-xs-semibold text-mint-500 pr-1'>
<Link
href={`/create-group/${groupId}`}
className='text-text-xs-semibold text-mint-500 pr-1'
>
모임 수정하기
</Link>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
DescriptionSetting,
DescriptionTags,
DescriptionTitle,
} from '@/components/pages/meetup/meetup-descriptions/description-sections';
} from '@/components/pages/group/group-descriptions/description-sections';
import { GetGroupDetailsResponse } from '@/types/service/group';

interface Props {
Expand All @@ -26,7 +26,7 @@ interface Props {
>;
}

export const MeetupDescriptions = ({
export const GroupDescriptions = ({
descriptions: {
id,
status,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ interface Props {
members: GetGroupDetailsResponse['joinedMembers'];
}

export const MeetupMembers = ({ members }: Props) => {
export const GroupMembers = ({ members }: Props) => {
const [expand, setExpand] = useState(false);
const [coverMember, setCoverMember] = useState(2 < Math.ceil(members.length / 3));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ interface Props {
groupId: string;
}

export const MeetupModal = ({ type, groupId }: Props) => {
export const GroupModal = ({ type, groupId }: Props) => {
const { replace } = useRouter();
const { close } = useModal();
const { mutate: attendMutate, isPending: isAttending } = useAttendGroup({ groupId }, close);
Expand Down
4 changes: 4 additions & 0 deletions src/components/pages/group/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export { GroupBannerImages } from './group-banner-images';
export { GroupButtons } from './group-buttons';
export { GroupDescriptions } from './group-descriptions';
export { GroupMembers } from './group-members';
4 changes: 0 additions & 4 deletions src/components/pages/meetup/index.ts

This file was deleted.