diff --git a/src/app/meetup/[groupId]/layout.tsx b/src/app/group/[groupId]/layout.tsx similarity index 86% rename from src/app/meetup/[groupId]/layout.tsx rename to src/app/group/[groupId]/layout.tsx index 1ff53271..2f17fe37 100644 --- a/src/app/meetup/[groupId]/layout.tsx +++ b/src/app/group/[groupId]/layout.tsx @@ -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(); @@ -24,4 +24,4 @@ const MeetupDetailLayout = async ({ children, params }: Props) => { return {children}; }; -export default MeetupDetailLayout; +export default GroupDetailLayout; diff --git a/src/app/meetup/[groupId]/page.tsx b/src/app/group/[groupId]/page.tsx similarity index 68% rename from src/app/meetup/[groupId]/page.tsx rename to src/app/group/[groupId]/page.tsx index 3820414f..3155e37e 100644 --- a/src/app/meetup/[groupId]/page.tsx +++ b/src/app/group/[groupId]/page.tsx @@ -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 }); @@ -26,10 +26,10 @@ const MeetupDetailPage = ({ params }: Props) => { return (
- - - - + + + { ); }; -export default MeetupDetailPage; +export default GroupDetailPage; diff --git a/src/app/schedule/(components)/meeting-list.tsx b/src/app/schedule/(components)/meeting-list.tsx index e4d69011..1fcf668c 100644 --- a/src/app/schedule/(components)/meeting-list.tsx +++ b/src/app/schedule/(components)/meeting-list.tsx @@ -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}`)} /> ))} diff --git a/src/app/schedule/(components)/my.tsx b/src/app/schedule/(components)/my.tsx index cf1677ec..ac671f9a 100644 --- a/src/app/schedule/(components)/my.tsx +++ b/src/app/schedule/(components)/my.tsx @@ -33,7 +33,7 @@ export default function My() { return ( router.push(`/meetup/${meeting.id}`)} + onClick={() => router.push(`/group/${meeting.id}`)} /> )) )} diff --git a/src/components/pages/meetup/meetup-banner-images/index.css b/src/components/pages/group/group-banner-images/index.css similarity index 100% rename from src/components/pages/meetup/meetup-banner-images/index.css rename to src/components/pages/group/group-banner-images/index.css diff --git a/src/components/pages/meetup/meetup-banner-images/index.tsx b/src/components/pages/group/group-banner-images/index.tsx similarity index 95% rename from src/components/pages/meetup/meetup-banner-images/index.tsx rename to src/components/pages/group/group-banner-images/index.tsx index 119286aa..9cdc8e49 100644 --- a/src/components/pages/meetup/meetup-banner-images/index.tsx +++ b/src/components/pages/group/group-banner-images/index.tsx @@ -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 ( diff --git a/src/components/pages/meetup/meetup-buttons/index.tsx b/src/components/pages/group/group-buttons/index.tsx similarity index 82% rename from src/components/pages/meetup/meetup-buttons/index.tsx rename to src/components/pages/group/group-buttons/index.tsx index de576bb9..0f29766e 100644 --- a/src/components/pages/meetup/meetup-buttons/index.tsx +++ b/src/components/pages/group/group-buttons/index.tsx @@ -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'; @@ -16,7 +16,7 @@ interface Props { groupId: string; } -export const MeetupButtons = ({ +export const GroupButtons = ({ conditions: { isJoined, isHost, isPast, isAttendDisabled }, groupId, }: Props) => { @@ -37,7 +37,7 @@ export const MeetupButtons = ({ className='flex-[1.2]' variant='tertiary' onClick={() => - open() + open() } > {isHost ? '모임 취소' : '모임 탈퇴'} @@ -49,7 +49,7 @@ export const MeetupButtons = ({ ) : ( diff --git a/src/components/pages/meetup/meetup-descriptions/description-sections/description-detail/index.tsx b/src/components/pages/group/group-descriptions/description-sections/description-detail/index.tsx similarity index 100% rename from src/components/pages/meetup/meetup-descriptions/description-sections/description-detail/index.tsx rename to src/components/pages/group/group-descriptions/description-sections/description-detail/index.tsx diff --git a/src/components/pages/meetup/meetup-descriptions/description-sections/description-profile/index.tsx b/src/components/pages/group/group-descriptions/description-sections/description-profile/index.tsx similarity index 90% rename from src/components/pages/meetup/meetup-descriptions/description-sections/description-profile/index.tsx rename to src/components/pages/group/group-descriptions/description-sections/description-profile/index.tsx index 103503ec..e8023f23 100644 --- a/src/components/pages/meetup/meetup-descriptions/description-sections/description-profile/index.tsx +++ b/src/components/pages/group/group-descriptions/description-sections/description-profile/index.tsx @@ -36,7 +36,10 @@ export const DescriptionProfile = ({ {isPast &&

모임 마감

} {isHost && !isPast && ( - + 모임 수정하기 )} diff --git a/src/components/pages/meetup/meetup-descriptions/description-sections/description-progress/index.tsx b/src/components/pages/group/group-descriptions/description-sections/description-progress/index.tsx similarity index 100% rename from src/components/pages/meetup/meetup-descriptions/description-sections/description-progress/index.tsx rename to src/components/pages/group/group-descriptions/description-sections/description-progress/index.tsx diff --git a/src/components/pages/meetup/meetup-descriptions/description-sections/description-setting/index.tsx b/src/components/pages/group/group-descriptions/description-sections/description-setting/index.tsx similarity index 100% rename from src/components/pages/meetup/meetup-descriptions/description-sections/description-setting/index.tsx rename to src/components/pages/group/group-descriptions/description-sections/description-setting/index.tsx diff --git a/src/components/pages/meetup/meetup-descriptions/description-sections/description-tags/index.tsx b/src/components/pages/group/group-descriptions/description-sections/description-tags/index.tsx similarity index 100% rename from src/components/pages/meetup/meetup-descriptions/description-sections/description-tags/index.tsx rename to src/components/pages/group/group-descriptions/description-sections/description-tags/index.tsx diff --git a/src/components/pages/meetup/meetup-descriptions/description-sections/description-title/index.tsx b/src/components/pages/group/group-descriptions/description-sections/description-title/index.tsx similarity index 100% rename from src/components/pages/meetup/meetup-descriptions/description-sections/description-title/index.tsx rename to src/components/pages/group/group-descriptions/description-sections/description-title/index.tsx diff --git a/src/components/pages/meetup/meetup-descriptions/description-sections/index.ts b/src/components/pages/group/group-descriptions/description-sections/index.ts similarity index 100% rename from src/components/pages/meetup/meetup-descriptions/description-sections/index.ts rename to src/components/pages/group/group-descriptions/description-sections/index.ts diff --git a/src/components/pages/meetup/meetup-descriptions/index.tsx b/src/components/pages/group/group-descriptions/index.tsx similarity index 91% rename from src/components/pages/meetup/meetup-descriptions/index.tsx rename to src/components/pages/group/group-descriptions/index.tsx index 8df2757b..33a7c3dd 100644 --- a/src/components/pages/meetup/meetup-descriptions/index.tsx +++ b/src/components/pages/group/group-descriptions/index.tsx @@ -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 { @@ -26,7 +26,7 @@ interface Props { >; } -export const MeetupDescriptions = ({ +export const GroupDescriptions = ({ descriptions: { id, status, diff --git a/src/components/pages/meetup/meetup-members/index.tsx b/src/components/pages/group/group-members/index.tsx similarity index 98% rename from src/components/pages/meetup/meetup-members/index.tsx rename to src/components/pages/group/group-members/index.tsx index 7e21d0f1..3f91000b 100644 --- a/src/components/pages/meetup/meetup-members/index.tsx +++ b/src/components/pages/group/group-members/index.tsx @@ -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)); diff --git a/src/components/pages/meetup/meetup-modal/index.tsx b/src/components/pages/group/group-modal/index.tsx similarity index 97% rename from src/components/pages/meetup/meetup-modal/index.tsx rename to src/components/pages/group/group-modal/index.tsx index a055fb31..a9126229 100644 --- a/src/components/pages/meetup/meetup-modal/index.tsx +++ b/src/components/pages/group/group-modal/index.tsx @@ -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); diff --git a/src/components/pages/group/index.ts b/src/components/pages/group/index.ts new file mode 100644 index 00000000..94287ece --- /dev/null +++ b/src/components/pages/group/index.ts @@ -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'; diff --git a/src/components/pages/meetup/index.ts b/src/components/pages/meetup/index.ts deleted file mode 100644 index f6b285da..00000000 --- a/src/components/pages/meetup/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export { MeetupBannerImages } from './meetup-banner-images'; -export { MeetupButtons } from './meetup-buttons'; -export { MeetupDescriptions } from './meetup-descriptions'; -export { MeetupMembers } from './meetup-members';