Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
189f4f4
feat(DEVING-50): ๋‚ด๊ฐ€ ๋งŒ๋“  ๋ชจ์ž„ ๊ธฐ์ดˆ ๋งˆํฌ์—…
dbswl701 Feb 27, 2025
daac6d9
feat(DEVING-50): ๋‚ด๊ฐ€ ๋งŒ๋“  ๋ชจ์ž„ ๋ฐ˜์‘ํ˜• ๋ฐ ๋ชจ๋‹ฌ ์—ฐ๊ฒฐ
dbswl701 Feb 27, 2025
3d04654
feat(DEVING-50): ๋‚˜์˜ ๋ชจ์ž„์˜ ํƒญ ์ถ”๊ฐ€
dbswl701 Feb 28, 2025
133b7f0
Merge branch 'dev' of https://github.com/MoimService/Moim-FE into feaโ€ฆ
dbswl701 Mar 3, 2025
4bfc218
feat(DEVING-50): ๋‚ด๊ฐ€ ๋งŒ๋“  ๋ชจ์ž„ ๋ฆฌ์ŠคํŠธ get api ์—ฐ๊ฒฐ
dbswl701 Mar 3, 2025
0c37fb0
feat(DEVING-50): ๋งด๋ฒ„ ํ”„๋กœํ•„ api ์—ฐ๋™
dbswl701 Mar 3, 2025
f6b56da
feat(DEVING-50): ๋ณธ์ธ์˜ ๊ฒฝ์šฐ ํ”„๋กœํ•„ ๋ณด๊ธฐ ์ˆจ๊น€ ์ฒ˜๋ฆฌ
dbswl701 Mar 3, 2025
a5d56ee
feat(DEVING-50): ๊ฐ€์ž… ์Šน๋‚™ / ๊ฑฐ์ ˆ api ์—ฐ๋™
dbswl701 Mar 3, 2025
1b1e0a7
feat(DEVING-50): ๋งด๋ฒ„ ๋‚ด๋ณด๋‚ด๊ธฐ ์ถ”๊ฐ€
dbswl701 Mar 3, 2025
f5ec60e
feat(DEVING-50): ์นด๋“œ ํด๋ฆญ ์‹œ ์ƒ์„ธ ํŽ˜์ด์ง€๋กœ ์ด๋™
dbswl701 Mar 3, 2025
1423fad
feat(DEVING-50): ๋‚˜์˜ ๋ชจ์ž„ ์ƒ๋‹จ ํƒญ ๊ตฌํ˜„ ๋ฐ ์ค€๋น„์ค‘์ด๋ผ๋Š” ๋‚ด์šฉ ํ‘œ์‹œ
dbswl701 Mar 3, 2025
a453699
feat(DEVING-50): ๋ฏธ๋“ค์›จ์–ด ์ ์šฉ - ๋งˆ์ดํŽ˜์ด์ง€, ๋‚ด ๋ชจ์ž„ ๋กœ๊ทธ์ธ ํ™•์ธ
dbswl701 Mar 3, 2025
b2b0b2e
feat(DEVING-50): ๋ชจ๋ฐ”์ผ ๋ทฐ์˜ ํ—ค๋” ๋กœ๊ทธ์•„์›ƒ ์ถ”๊ฐ€
dbswl701 Mar 3, 2025
67cfe4e
fix(DEVING-50): ๋นŒ๋“œ ์—๋Ÿฌ ์ˆ˜์ •
dbswl701 Mar 3, 2025
d4366da
refactor(DEVING-50): ๋‚˜์˜ ๋ชจ์ž„ ๋ฆฌํŽ™ํ† ๋ง
dbswl701 Mar 4, 2025
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
5 changes: 5 additions & 0 deletions next.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ const nextConfig = {
destination: '/meeting/mogakco',
permanent: true,
},
{
source: '/my-meeting',
destination: '/my-meeting/my?type=created',
permanent: true,
},
];
},

Expand Down
175 changes: 175 additions & 0 deletions src/app/(user-page)/components/CardRightSection.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
'use client';

import Dropdown from '@/components/common/Dropdown';
import { Button } from '@/components/ui/Button';
import { Tag } from '@/components/ui/Tag';
import Modal from '@/components/ui/modal/Modal';
import {
useExpelMutation,
useMemberStatusMutation,
} from '@/hooks/mutations/useMyMeetingMutation';
import Image from 'next/image';
import { useState } from 'react';
import type { Member } from 'types/myMeeting';

import ModalProfile from './ModalProfile';
import ModalUserList from './ModalUserList';

const CardRightSection = ({
memberList,
isPublic,
className,
meetingId,
}: {
memberList: Member[];
isPublic: boolean;
className?: string;
meetingId: number;
}) => {
const [selectedFilter, setSelectedFilter] = useState(
isPublic ? '๊ณต๊ฐœ' : '๋น„๊ณต๊ฐœ',
);
const [isUserListModalOpen, setIsUserListModalOpen] = useState(false);
const handleConfirm = () => {
setIsUserListModalOpen(false);
};
const filterAreaOptions = [
{ value: 'true', label: '๊ณต๊ฐœ' },
{ value: 'false', label: '๋น„๊ณต๊ฐœ' },
];

const [isUserProfileModalOpen, setIsUserProfileModalOpen] = useState(false);

// ๊ฐ€์ž… ์Šน์ธ / ๊ฑฐ์ ˆ
const { mutate: statusMutate } = useMemberStatusMutation(meetingId);

// ๋‚ด๋ณด๋‚ด๊ธฐ
const { mutate: expelMutate } = useExpelMutation(meetingId);

const handleSecondModalConfirm = () => {
// ๊ฐ€์ž… ํ™•์ธ api ์—ฐ๋™
// ๋งŒ์•ฝ, status๊ฐ€ approved๋ผ๋ฉด -> ๋‚ด๋ณด๋‚ด๊ธฐ ํ™œ์„ฑํ™”
// ๋งŒ์•ฝ, status๊ฐ€ pending์ด ์•„๋‹ˆ๋ผ๋ฉด -> ๋‹ซ๊ธฐ๋งŒ ํ™œ์„ฑํ™”

if (selectedUser && selectedUser.memberStatus === 'PENDING') {
statusMutate({
setMemberStatus: 'APPROVED',
userId: selectedUser?.userId,
});
}

setIsUserProfileModalOpen(false);
};

const handleSecondModalCancel = () => {
// ๊ฐ€์ž… ๊ฑฐ์ ˆ api ์—ฐ๋™
if (selectedUser && selectedUser.memberStatus === 'PENDING') {
statusMutate({
setMemberStatus: 'REJECTED',
userId: selectedUser?.userId,
});
} else if (selectedUser && selectedUser.memberStatus === 'APPROVED') {
expelMutate({
setMemberStatus: 'EXPEL',
userId: selectedUser?.userId,
});
}

setIsUserProfileModalOpen(false);
};

// ํ”„๋กœํ•„ ๋ณด๊ธฐ ํ•  ์œ ์ €
const [selectedUser, setSelectedUser] = useState<Member | null>(null);

return (
<div className={`flex w-full gap-[24px] px-4 lg:w-[518px] ${className}`}>
<div className="hidden flex-col justify-center gap-[16px] lg:flex">
<h3 className="typo-head3 text-main">์ฐธ๊ฐ€ ์ค‘์ธ ๋ฉค๋ฒ„</h3>
<div className="h-[172px] overflow-y-auto">
{memberList.map((member: Member) => (
<div key={member.userId} className="flex items-center py-[8px]">
<Image
src={member.profilePic}
alt="๋งด๋ฒ„ ํ”„๋กœํ•„"
width={40}
height={40}
className="rounded-[9.92px] "
/>
<p className="typo-head3 w-[114px] p-[6px] text-Cgray700">
{member.name}
</p>
<div className="flex h-[40px] gap-[6px]">
<Tag variant={member.memberStatus} className="w-[49px]" />
<Button
variant={'outline'}
className="h-[40px] w-[93px]"
onClick={() => setIsUserProfileModalOpen(true)}
>
ํ”„๋กœํ•„๋ณด๊ธฐ
</Button>
</div>
</div>
))}
</div>
</div>
<Button
variant="outline"
className="flex h-[40px] flex-1 md:h-[46px] lg:hidden"
onClick={() => setIsUserListModalOpen(true)}
>
๋งด๋ฒ„ ๋ช…๋‹จ ๋ณด๊ธฐ
</Button>
<div className="flex w-[120px] items-center">
<Dropdown
options={filterAreaOptions}
trigger={selectedFilter}
onChange={setSelectedFilter}
className="h-[40px] md:h-[46px]"
contentClassName=""
variant="icon"
/>
</div>
<Modal
isOpen={isUserProfileModalOpen}
onClose={handleSecondModalCancel}
onConfirm={handleSecondModalConfirm}
confirmText={
selectedUser?.memberStatus === 'PENDING' ? '๊ฐ€์ž…์Šน์ธ' : '๋‹ซ๊ธฐ'
}
cancelText={
selectedUser?.memberStatus === 'PENDING'
? '๊ฐ€์ž…๊ฑฐ์ ˆ'
: selectedUser?.memberStatus === 'APPROVED'
? '๋‚ด๋ณด๋‚ด๊ธฐ'
: '๋‹ซ๊ธฐ'
}
closeOnly={
!(
selectedUser?.memberStatus === 'PENDING' ||
selectedUser?.memberStatus === 'APPROVED'
)
}
modalClassName="w-[450px] overflow-hidden bg-BG_2"
buttonClassName="w-full"
>
<ModalProfile userId={selectedUser?.userId} meetingId={meetingId} />
</Modal>
<Modal
isOpen={isUserListModalOpen}
onClose={() => setIsUserListModalOpen(false)}
onConfirm={handleConfirm}
showOnly
modalClassName="h-[590px] w-[520px] overflow-y-auto"
>
<ModalUserList
memberList={memberList}
setSelectedUser={setSelectedUser}
setIsUserProfileModalOpen={setIsUserProfileModalOpen}
setIsUserListModalOpen={setIsUserListModalOpen}
/>
</Modal>
</div>
);
};

export default CardRightSection;
155 changes: 155 additions & 0 deletions src/app/(user-page)/components/Created.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
'use client';

import HorizonCard from '@/components/ui/HorizonCard';
import useInfiniteScroll from '@/hooks/common/useInfiniteScroll';
import { useInfiniteMyMeetingManageQueries } from '@/hooks/queries/useMyMeetingQueries';
import { useRouter } from 'next/navigation';
import { useState } from 'react';

Check warning on line 7 in src/app/(user-page)/components/Created.tsx

View workflow job for this annotation

GitHub Actions / check

'useState' is defined but never used. Allowed unused vars must match /^_/u

import CardRightSection from './CardRightSection';

const Created = () => {
const router = useRouter();

const {
data: meetingData,
fetchNextPage,
hasNextPage,
isFetchingNextPage,
isLoading,
error,

Check warning on line 20 in src/app/(user-page)/components/Created.tsx

View workflow job for this annotation

GitHub Actions / check

'error' is assigned a value but never used. Allowed unused vars must match /^_/u
} = useInfiniteMyMeetingManageQueries();

const lastMeetingRef = useInfiniteScroll({
fetchNextPage,
isFetchingNextPage,
hasNextPage,
});

if (isLoading || !meetingData) {
return <p>loading...</p>;
}

const handleMoveDetailPage = (meetingId: number) => {
/**
* TODO
* ์ถ”ํ›„ category ์ˆ˜์ •
*/
router.push(`/meeting/study/${meetingId}`);
};

return (
<div>
{meetingData.pages.map((page, pageIdx) => (
<div key={pageIdx}>
{page.content.map((meeting) => {
{
console.log(

Check warning on line 47 in src/app/(user-page)/components/Created.tsx

View workflow job for this annotation

GitHub Actions / check

Unexpected console statement
'page.nextCursor: ',
page.nextCursor,
'meeting.meetingId: ',
meeting.meetingId,
);
}
return (
<div key={meeting.meetingId}>
{/* ๋ฐ์Šคํฌํƒ‘ */}
<div
className="hidden border-b border-Cgray300 py-[42px] lg:flex"
ref={
page.nextCursor === meeting.meetingId
? lastMeetingRef
: null
}
>
<HorizonCard
onClick={handleMoveDetailPage}
key={meeting.meetingId}
title={meeting.title}
thumbnailUrl={meeting.thumbnail}
location={meeting.location}
total={meeting.maxMember}
value={meeting.memberCount}
className="flex-row"
meetingId={meeting.meetingId}
category={''}
>
<CardRightSection
memberList={meeting.memberList}
isPublic={meeting.isPublic}
className="hidden lg:flex"
meetingId={meeting.meetingId}
/>
</HorizonCard>
</div>

{/* ํƒœ๋ธ”๋ฆฟ */}
<div
className="hidden flex-col border-b border-Cgray300 py-[42px] md:flex lg:hidden"
ref={
page.nextCursor === meeting.meetingId
? lastMeetingRef
: null
}
>
<HorizonCard
onClick={handleMoveDetailPage}
key={meeting.meetingId}
title={meeting.title}
thumbnailUrl={meeting.thumbnail}
location={meeting.location}
total={meeting.maxMember}
value={meeting.memberCount}
thumbnailHeight={160}
thumbnailWidth={160}
className=""
meetingId={meeting.meetingId}
category={''}
/>
<CardRightSection
memberList={meeting.memberList}
isPublic={meeting.isPublic}
className="flex lg:hidden"
meetingId={meeting.meetingId}
/>
</div>

{/* ๋ชจ๋ฐ”์ผ */}
<div
className="flex flex-col border-b border-Cgray300 py-[42px] md:hidden"
ref={
page.nextCursor === meeting.meetingId
? lastMeetingRef
: null
}
>
<HorizonCard
onClick={handleMoveDetailPage}
key={meeting.meetingId}
title={meeting.title}
thumbnailUrl={meeting.thumbnail}
location={meeting.location}
total={meeting.maxMember}
value={meeting.memberCount}
thumbnailHeight={80}
thumbnailWidth={80}
className=""
meetingId={meeting.meetingId}
category={''}
/>
<CardRightSection
memberList={meeting.memberList}
isPublic={meeting.isPublic}
className="flex lg:hidden"
meetingId={meeting.meetingId}
/>
</div>
</div>
);
})}
</div>
))}
</div>
);
};
export default Created;
Loading
Loading