diff --git a/app/frontend/src/components/MogacoItem/index.tsx b/app/frontend/src/components/MogacoItem/index.tsx index 97db1268..7e2f0c2c 100644 --- a/app/frontend/src/components/MogacoItem/index.tsx +++ b/app/frontend/src/components/MogacoItem/index.tsx @@ -1,15 +1,18 @@ import { NavLink } from 'react-router-dom'; +import { ResponseMogacoDto } from '@morak/apitype'; import dayjs from 'dayjs'; import { ReactComponent as Calendar } from '@/assets/icons/calendar.svg'; import { ReactComponent as Map } from '@/assets/icons/map.svg'; import { Label } from '@/components'; -import { Mogaco } from '@/types'; import * as styles from './index.css'; -type MogacoProps = Mogaco; +type MogacoProps = Omit< + ResponseMogacoDto, + 'createdAt' | 'deletedAt' | 'updatedAt' +>; export function MogacoItem({ id, diff --git a/app/frontend/src/components/Sidebar/Contents/Mogaco/GroupWrapper.tsx b/app/frontend/src/components/Sidebar/Contents/Mogaco/GroupWrapper.tsx index f594cc1f..9f78c7b6 100644 --- a/app/frontend/src/components/Sidebar/Contents/Mogaco/GroupWrapper.tsx +++ b/app/frontend/src/components/Sidebar/Contents/Mogaco/GroupWrapper.tsx @@ -1,13 +1,14 @@ +import { ResponseParticipant } from '@morak/apitype'; + import { UserChip } from '@/components'; import { sansBold14 } from '@/styles/font.css'; -import { Member } from '@/types'; import * as styles from './index.css'; export function GroupWrapper({ nickname, profilePicture, -}: Pick) { +}: Pick) { return (
diff --git a/app/frontend/src/components/Sidebar/Contents/Mogaco/InfoWrapper.tsx b/app/frontend/src/components/Sidebar/Contents/Mogaco/InfoWrapper.tsx index d3bd05f8..da9df50b 100644 --- a/app/frontend/src/components/Sidebar/Contents/Mogaco/InfoWrapper.tsx +++ b/app/frontend/src/components/Sidebar/Contents/Mogaco/InfoWrapper.tsx @@ -1,14 +1,14 @@ +import { ResponseMogacoDto } from '@morak/apitype'; import dayjs from 'dayjs'; import { ReactComponent as Calendar } from '@/assets/icons/calendar.svg'; import { ReactComponent as Map } from '@/assets/icons/map.svg'; import { ReactComponent as People } from '@/assets/icons/people.svg'; -import { MogacoTypes } from '@/types'; import * as styles from './index.css'; type InfoWrapperProps = Pick< - MogacoTypes, + ResponseMogacoDto, 'date' | 'maxHumanCount' | 'address' > & { participantCount: number; diff --git a/app/frontend/src/components/Sidebar/Contents/Mogaco/MogacoInfo.tsx b/app/frontend/src/components/Sidebar/Contents/Mogaco/MogacoInfo.tsx index 79cf8af2..f254ce68 100644 --- a/app/frontend/src/components/Sidebar/Contents/Mogaco/MogacoInfo.tsx +++ b/app/frontend/src/components/Sidebar/Contents/Mogaco/MogacoInfo.tsx @@ -1,6 +1,7 @@ +import { ResponseMogacoWithMemberDto } from '@morak/apitype'; + import { Button } from '@/components'; import { sansRegular16 } from '@/styles/font.css'; -import { Mogaco } from '@/types'; import { GroupWrapper } from './GroupWrapper'; import * as styles from './index.css'; @@ -11,7 +12,7 @@ export function MogacoInfo({ mogaco, onClickDetailPage, }: { - mogaco: Mogaco; + mogaco: ResponseMogacoWithMemberDto; onClickDetailPage: () => void; }) { const { diff --git a/app/frontend/src/components/Sidebar/Contents/Mogaco/TitleWrapper.tsx b/app/frontend/src/components/Sidebar/Contents/Mogaco/TitleWrapper.tsx index b7745b6b..8e076149 100644 --- a/app/frontend/src/components/Sidebar/Contents/Mogaco/TitleWrapper.tsx +++ b/app/frontend/src/components/Sidebar/Contents/Mogaco/TitleWrapper.tsx @@ -1,13 +1,14 @@ +import { ResponseMogacoDto } from '@morak/apitype'; + import { Label } from '@/components'; import { sansBold24 } from '@/styles/font.css'; -import { MogacoTypes } from '@/types'; import * as styles from './index.css'; export function TitleWrapper({ status, title, -}: Pick) { +}: Pick) { return (