Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
e11b542
Merge branch 'dev' of https://github.com/MoimService/Moim-FE into fea…
clyde-yoonjae Mar 11, 2025
2281c2a
chore(DEVING-74): meetings.ts url 변경 및 packeage.json수정
clyde-yoonjae Mar 11, 2025
7ab5112
feat(DEVING-74): myMeeting.ts 타입추가
clyde-yoonjae Mar 11, 2025
c05a1c0
feat(DEVING-74): myMeetingLikes API 추가
clyde-yoonjae Mar 11, 2025
e36cfeb
feat(DEVING-74): likes미팅 인피니티쿼리 추가
clyde-yoonjae Mar 11, 2025
87dfd0a
feat(DEVING-74): 임시 NameToEng 유틸함수 추가 추후 통합예정
clyde-yoonjae Mar 11, 2025
886c37a
feat(DEVING-74): 찜한모임 서버컴포넌트 구현
clyde-yoonjae Mar 11, 2025
e1958ee
feat(DEVING-74): 찜한모임 클라이언트 컴포넌트 구현
clyde-yoonjae Mar 11, 2025
01cf60b
chore(DEVING-74): server.js파일 commonJS작성
clyde-yoonjae Mar 11, 2025
c256048
Merge branch 'feat/markup/my-likes-meeting/DEVING-74' of https://gith…
clyde-yoonjae Mar 12, 2025
3164ab7
Merge branch 'feat/refactor/all-modal/DEVING-76' of https://github.co…
clyde-yoonjae Mar 12, 2025
9eba5c7
Merge branch 'feat/refactor/all-modal/DEVING-76' of https://github.co…
clyde-yoonjae Mar 12, 2025
b466ee2
chore(DEVING-79): 기존 join더미 파일 삭제
clyde-yoonjae Mar 12, 2025
7a39443
chore(DEVING-79): 내가 참여하고있는 모임변수명 join 및 all 명칭 전부 participated로 교체
clyde-yoonjae Mar 12, 2025
9ebe7f0
chore(DEVING-79): 참여중인 모임에 카테고리타이틀 추가
clyde-yoonjae Mar 13, 2025
a343f34
style(DEVING-79): 거절 및 강퇴시, 카드리스트 레이아웃 처리
clyde-yoonjae Mar 13, 2025
32c731c
feat(DEVING-79): 참가중인 모임 탈퇴 및 승인대기 취소하기 api 추가
clyde-yoonjae Mar 13, 2025
f72d7e7
feat(DEVING-79): 승인대기 애니메이션 위한 테일윈드 config추가
clyde-yoonjae Mar 13, 2025
e10693a
feat(DEVING-79): mymeeting 뮤테이션 추가
clyde-yoonjae Mar 13, 2025
3047fe8
feat(DEVING-79): 승인대기 컴포넌트 구현
clyde-yoonjae Mar 13, 2025
5ae6b66
feat(DEVING-79): 모임탈퇴 기능 및 컴포넌트 구현
clyde-yoonjae Mar 13, 2025
6b9542d
chore(DEVING-79): 참여중인 모임 리펙토링
clyde-yoonjae Mar 13, 2025
4546f4a
chore(DEVING-79): 내가참여하고있는 모임 좋아요버튼 삭제
clyde-yoonjae Mar 14, 2025
6aef01e
chore(DEVING-79): isPublic 연산자 깔끔하게 수정
clyde-yoonjae Mar 14, 2025
fb9c041
chore(DEVING-79): 참여모임 없을시, 문구 시안맞게 수정
clyde-yoonjae Mar 14, 2025
f4c9334
chore(DEVING-79): url생성 함수 재활용
clyde-yoonjae Mar 14, 2025
b6f4df6
chore(DEVING-79): 추가데이터 스켈레톤 적용
clyde-yoonjae Mar 14, 2025
d4683f0
chore(DEVING-79): 주최자 판별하여 탈퇴버튼 선택렌더링
clyde-yoonjae Mar 14, 2025
fffc3a9
chore(DEVING-79): 찜한모임 스타일 수정
clyde-yoonjae Mar 14, 2025
881c983
chore(DEVING-79): 중복코드 제거 및 컨벤션 맞게 수정
clyde-yoonjae Mar 14, 2025
b2eeb44
chore(DEVING-79): 애니메이션 수정
clyde-yoonjae Mar 14, 2025
838989a
chore(DEVING-79): 중복NameToEng 제거
clyde-yoonjae Mar 15, 2025
44a536e
Merge branch 'dev' of https://github.com/MoimService/Moim-FE into fea…
clyde-yoonjae Mar 15, 2025
af329d3
chore(DEVING-79): 충돌해결
clyde-yoonjae Mar 15, 2025
d9f467d
chore(DEVING-79): 빌드오류 해결
clyde-yoonjae Mar 15, 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
6 changes: 3 additions & 3 deletions src/app/(user-page)/my-meeting/_features/CardRightSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ import PublicSelect from './PublicDropdown';

const CardRightSection = ({
memberList,
isPublic,
isPublic = false,
className,
meetingId,
showPublicSelect = false,
}: {
memberList: Member[];
isPublic: boolean;
isPublic?: boolean;
className?: string;
meetingId: number;
showPublicSelect?: boolean;
Expand Down Expand Up @@ -61,7 +61,7 @@ const CardRightSection = ({
memberList,
);
router.push(
`/my-meeting/my/user-list?meetingId=${meetingId}&type=${showPublicSelect ? 'created' : 'joined'}`,
`/my-meeting/my/user-list?meetingId=${meetingId}&type=${showPublicSelect ? 'created' : 'participated'}`,
);
};

Expand Down
191 changes: 0 additions & 191 deletions src/app/(user-page)/my-meeting/_features/Joined.tsx

This file was deleted.

44 changes: 44 additions & 0 deletions src/app/(user-page)/my-meeting/_features/LeaveMeetingButton.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
'use client';

import { useQuitMeetingMutation } from '@/hooks/mutations/useMyMeetingMutation';
import { LogOut } from 'lucide-react';

interface LeaveMeetingButtonProps {
meetingId: number;
className?: string;
}

const LeaveMeetingButton = ({
meetingId,
className = '',
}: LeaveMeetingButtonProps) => {
const { mutate: quitMeeting, isPending: isLoading } =
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isLoading을 사용하지 않으시고 isPending을 isLoading으로 바꿔사용하시는 이유가 있으실까요?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

저희 프로젝트에선 전부 isLoading을 사용하고 있더라구요. 어제 문득 isPending과 isLoading중 어떤 거 사용해야할지 좀 고민이 있었다가 TanStack/query#6297 요고보구 v5에선 isPending을 사용한다기에, 통일성을 위해서 일단은 isPending 쓰고 isLoading으로 맞춰넣었슴니다. isLoading으로 일단 통일하겠슴니다

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

윤지님 해당 부분 리엑트쿼리 v5에서 useMutation의 반환값에서 isLoading이 삭제되고 isPending으로 대체되엇다고합니다. 따라 isPending이 isLoading 대신 사용된다고 합니다. 그래서 기존 코드 보았을 때 isLoading을 사용하는 부분이 인피니티 쿼리와 useQuery부분임니당 해당 부분에서의 isLoading은 첫 페이지 데이터를 로딩 중일때만 true가 되는 상태라고 합니다!

useQuitMeetingMutation();

const handleClick = (e: React.MouseEvent<HTMLButtonElement>) => {
e.stopPropagation();
quitMeeting(meetingId);
};

return (
<button
type="button"
onClick={handleClick}
className={`absolute bottom-2 right-2 z-10 flex items-center rounded-md px-3 py-1.5 ${
isLoading ? 'opacity-70' : ''
} ${className}`}
aria-label="모임 탈퇴하기"
disabled={isLoading}
>
Comment on lines +24 to +32
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

className이 여기에만 적용이 되어있는데, 상세 조회에서는 이 컴포넌트 커스텀을 어떻게 하면 될까요? 아이콘이나 글씨 크기 등도 고려가 필요할 것 같습니다.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

요부분 prop추가하겠슴니다

<LogOut
size={16}
className={`mr-1.5 ${isLoading ? 'animate-pulse' : ''}`}
/>
<span className="typo-button2">
{isLoading ? '처리 중...' : '모임 탈퇴하기'}
</span>
</button>
);
};

export default LeaveMeetingButton;
Loading
Loading