From de66dfe3a4fbe21022128197b1ab2bbc08d07ae4 Mon Sep 17 00:00:00 2001 From: Yoonkyoungme Date: Fri, 23 Aug 2024 08:18:41 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix(MeetingTimeOptions):=20key=20=EA=B0=92?= =?UTF-8?q?=20rank=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/apis/meetingRecommend.ts | 1 + .../MeetingConfirmPage/components/MeetingTimeOptions.tsx | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/apis/meetingRecommend.ts b/frontend/src/apis/meetingRecommend.ts index ed528365..def4078c 100644 --- a/frontend/src/apis/meetingRecommend.ts +++ b/frontend/src/apis/meetingRecommend.ts @@ -14,6 +14,7 @@ export interface MeetingRecommend { endDayOfWeek: string; endTime: string; attendeeNames: string[]; + rank: string; } export const getMeetingTimeRecommends = async ({ uuid, diff --git a/frontend/src/pages/MeetingConfirmPage/components/MeetingTimeOptions.tsx b/frontend/src/pages/MeetingConfirmPage/components/MeetingTimeOptions.tsx index 057fd28f..f69ccbe3 100644 --- a/frontend/src/pages/MeetingConfirmPage/components/MeetingTimeOptions.tsx +++ b/frontend/src/pages/MeetingConfirmPage/components/MeetingTimeOptions.tsx @@ -113,9 +113,9 @@ export default function MeetingTimeOptions({ uuid, attendeeNames }: MeetingTimeO ]} /> {meetingTimeRecommends && - meetingTimeRecommends.map((recommendInfo, index) => ( + meetingTimeRecommends.map((recommendInfo) => ( handleMeetingSelect(recommendInfo)} attendeeCount={attendeeNames.length} From 8b5f6c9a1bb56fc2b6b392d26b82dc5cb699bee9 Mon Sep 17 00:00:00 2001 From: Yoonkyoungme Date: Fri, 23 Aug 2024 08:23:05 +0900 Subject: [PATCH 2/2] =?UTF-8?q?rename:=20=ED=8C=8C=EC=9D=BC=20=EA=B5=AC?= =?UTF-8?q?=EC=A1=B0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - pages/MeetingConfirmPage/components/MeetingTimeOptions.tsx → pages/MeetingConfirmPage/components/MeetingTimeOptions/index.tsx --- .../{ => MeetingTimeOptions}/MeetingTimeOptions.styles.ts | 0 .../index.tsx} | 8 ++++++-- 2 files changed, 6 insertions(+), 2 deletions(-) rename frontend/src/pages/MeetingConfirmPage/components/{ => MeetingTimeOptions}/MeetingTimeOptions.styles.ts (100%) rename frontend/src/pages/MeetingConfirmPage/components/{MeetingTimeOptions.tsx => MeetingTimeOptions/index.tsx} (96%) diff --git a/frontend/src/pages/MeetingConfirmPage/components/MeetingTimeOptions.styles.ts b/frontend/src/pages/MeetingConfirmPage/components/MeetingTimeOptions/MeetingTimeOptions.styles.ts similarity index 100% rename from frontend/src/pages/MeetingConfirmPage/components/MeetingTimeOptions.styles.ts rename to frontend/src/pages/MeetingConfirmPage/components/MeetingTimeOptions/MeetingTimeOptions.styles.ts diff --git a/frontend/src/pages/MeetingConfirmPage/components/MeetingTimeOptions.tsx b/frontend/src/pages/MeetingConfirmPage/components/MeetingTimeOptions/index.tsx similarity index 96% rename from frontend/src/pages/MeetingConfirmPage/components/MeetingTimeOptions.tsx rename to frontend/src/pages/MeetingConfirmPage/components/MeetingTimeOptions/index.tsx index f69ccbe3..9c4bdbbf 100644 --- a/frontend/src/pages/MeetingConfirmPage/components/MeetingTimeOptions.tsx +++ b/frontend/src/pages/MeetingConfirmPage/components/MeetingTimeOptions/index.tsx @@ -1,7 +1,12 @@ import { useMutation } from '@tanstack/react-query'; -import React, { useState } from 'react'; +import { useState } from 'react'; import { useNavigate } from 'react-router-dom'; +import { + s_attendeesContainer, + s_tipInfo, +} from '@pages/MeetingConfirmPage/MeetingTimeConfirmPage.styles'; + import MeetingTimeOptionCard from '@components/MeetingTimeCard/MeetingTimeOptionCard'; import { Button } from '@components/_common/Buttons/Button'; import TabButton from '@components/_common/Buttons/TabButton'; @@ -12,7 +17,6 @@ import useMeetingTimeRecommendFilter from '@hooks/useMeetingTimeRecommendFilter/ import { postMeetingConfirm } from '@apis/meetingConfirm'; import type { MeetingRecommend } from '@apis/meetingRecommend'; -import { s_attendeesContainer, s_tipInfo } from '../MeetingTimeConfirmPage.styles'; import { s_container } from './MeetingTimeOptions.styles'; interface MeetingTimeOptionsProps {