From 179b035c005c62b915cda4eb37e2cba98419610d Mon Sep 17 00:00:00 2001 From: Eunseo Sim <55528304+simeunseo@users.noreply.github.com> Date: Wed, 21 Aug 2024 02:22:39 +0900 Subject: [PATCH 01/12] =?UTF-8?q?fix:=20bottomsheet=20border-radius=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/BottomSheet/BottomSheet.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/common/BottomSheet/BottomSheet.tsx b/src/components/common/BottomSheet/BottomSheet.tsx index da0295c4..3ce530f3 100644 --- a/src/components/common/BottomSheet/BottomSheet.tsx +++ b/src/components/common/BottomSheet/BottomSheet.tsx @@ -28,8 +28,8 @@ const BottomSheetModal = styled.div<{ $isModalOpen: boolean }>` gap: 0.8rem; transition: transform 600ms cubic-bezier(0.86, 0, 0.07, 1); z-index: 1; - border-top-left-radius: 1.2rem; - border-top-right-radius: 1.2rem; + border-top-left-radius: 1.8rem; + border-top-right-radius: 1.8rem; background-color: ${({ theme }) => theme.colors.grey8}; padding: 4.4rem 2rem 4rem; From 3984e6484b833a55746729ddc2cb8621978bb6ab Mon Sep 17 00:00:00 2001 From: Eunseo Sim <55528304+simeunseo@users.noreply.github.com> Date: Wed, 21 Aug 2024 02:23:12 +0900 Subject: [PATCH 02/12] =?UTF-8?q?fix:=20=ED=9A=8C=EC=9D=98=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=EC=9E=85=EB=A0=A5=20->=20=ED=9A=8C=EC=9D=98=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=9E=85=EB=A0=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/moleculesComponents/Header.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/common/moleculesComponents/Header.tsx b/src/components/common/moleculesComponents/Header.tsx index 5068f5ef..e62043b9 100644 --- a/src/components/common/moleculesComponents/Header.tsx +++ b/src/components/common/moleculesComponents/Header.tsx @@ -90,7 +90,7 @@ function Header({ position, setFunnelStep }: HeaderProps) { ) : undefined} {position === 'createMeeting' ? ( - 회의정보입력 + 회의 정보 입력 ) : position === 'confirmMeet' ? ( From 2bdced433545aaba45b092a6123c52a366ae115a Mon Sep 17 00:00:00 2001 From: Eunseo Sim <55528304+simeunseo@users.noreply.github.com> Date: Wed, 21 Aug 2024 02:33:24 +0900 Subject: [PATCH 03/12] =?UTF-8?q?fix:=20=EC=83=81=EB=8B=A8=20=ED=9A=8C?= =?UTF-8?q?=EC=9D=98=20=EC=A0=95=EB=B3=B4=20=EC=95=88=EB=82=B4=20=EB=AC=B8?= =?UTF-8?q?=EA=B5=AC=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Icon/icon.ts | 5 ----- src/pages/selectSchedule/components/Description.tsx | 7 +++---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/components/Icon/icon.ts b/src/components/Icon/icon.ts index 4462adad..0d3a4800 100644 --- a/src/components/Icon/icon.ts +++ b/src/components/Icon/icon.ts @@ -59,12 +59,7 @@ export { RadioCheckIc, SpeechBubbleIc, TimeIc, - TooltipArrowIc, Wave, - Circle1Ic, - Circle2Ic, - Circle3Ic, - CloseIc, DropUp, DropDown, Member, diff --git a/src/pages/selectSchedule/components/Description.tsx b/src/pages/selectSchedule/components/Description.tsx index a396278a..06fd80f4 100644 --- a/src/pages/selectSchedule/components/Description.tsx +++ b/src/pages/selectSchedule/components/Description.tsx @@ -65,17 +65,16 @@ export default Description; const DescriptionWrapper = styled.div` display: flex; - position: relative; - margin: 2rem 0; + margin: 0.6rem 0 2.4rem; + width: 100%; `; const Texts = styled.div` display: flex; flex-direction: column; - border-radius: 0.8rem; background-color: ${theme.colors.grey9}; padding: 1.5rem 2.4rem; - width: 33.5rem; + width: 100%; `; const OneLine = styled.div` display: flex; From d960a1a47c35e581bb3a13d64778dfeadbdec987 Mon Sep 17 00:00:00 2001 From: Eunseo Sim <55528304+simeunseo@users.noreply.github.com> Date: Wed, 21 Aug 2024 02:37:45 +0900 Subject: [PATCH 04/12] =?UTF-8?q?fix:=20=ED=83=AD=ED=88=AC=ED=83=AD=20?= =?UTF-8?q?=EA=B7=B8=EB=9D=BC=EB=8D=B0=EC=9D=B4=EC=85=98=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/selectTimeSlot/SelectionColumn.tsx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/pages/selectSchedule/components/selectTimeSlot/SelectionColumn.tsx b/src/pages/selectSchedule/components/selectTimeSlot/SelectionColumn.tsx index 7d63b3da..eb1fe6a3 100644 --- a/src/pages/selectSchedule/components/selectTimeSlot/SelectionColumn.tsx +++ b/src/pages/selectSchedule/components/selectTimeSlot/SelectionColumn.tsx @@ -26,16 +26,12 @@ function SelectionColumn({ date, timeSlots }: ColumnStructure) { * 가능시간 입력 시간표 스타일링 * 1. border-top: 30분 단위는 dashed, 1시간 단위는 solid * 2. border: 탭투탭 시 startSlot에 dashed - * 3. background-color: 선택된 시간이면서 맨 첫번째 Slot이라면 그라디언트, 그 외는 main1, 선택된 시간이 아니면 transparent; + * 3. background-color: 선택된 시간이라면 main1, 선택된 시간이 아니면 transparent; */ const borderStyle = slotId.endsWith(':30') ? 'dashed' : 'solid'; const border = isStartSlot && `1px dashed ${theme.colors.main5}`; const borderTop = `1px ${borderStyle} ${theme.colors.grey7}`; - const background = isSelectedSlot - ? isFirstSlot - ? 'linear-gradient(180deg, #496AFF 0%, #3253FF 75%)' - : theme.colors.main1 - : 'transparent'; + const background = isSelectedSlot ? theme.colors.main1 : 'transparent'; return ` cursor:pointer; From fb0d406bbe2d361fea85c4800a2e8b5e7130b1b2 Mon Sep 17 00:00:00 2001 From: Eunseo Sim <55528304+simeunseo@users.noreply.github.com> Date: Wed, 21 Aug 2024 02:52:32 +0900 Subject: [PATCH 05/12] =?UTF-8?q?fix:=20=EB=93=9C=EB=A1=AD=EB=8B=A4?= =?UTF-8?q?=EC=9A=B4=20=EB=AA=A9=EB=A1=9D=20=EB=86=92=EC=9D=B4=20=EC=A1=B0?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/selectPriority/PriorityDropdown.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/selectSchedule/components/selectPriority/PriorityDropdown.tsx b/src/pages/selectSchedule/components/selectPriority/PriorityDropdown.tsx index 3c12cb23..caf2ed67 100644 --- a/src/pages/selectSchedule/components/selectPriority/PriorityDropdown.tsx +++ b/src/pages/selectSchedule/components/selectPriority/PriorityDropdown.tsx @@ -226,7 +226,7 @@ const DropdownWrapper = styled.div` background-color: ${({ theme }) => theme.colors.grey6}; width: 27.4rem; height: fit-content; - max-height: 15.6rem; + max-height: 18.3rem; overflow-x: hidden; overflow-y: auto; From 2c99b83d3c47d08377a5a50cf64d2d1e137ef0e7 Mon Sep 17 00:00:00 2001 From: Eunseo Sim <55528304+simeunseo@users.noreply.github.com> Date: Sat, 24 Aug 2024 01:35:13 +0900 Subject: [PATCH 06/12] =?UTF-8?q?fix:=20=EA=B4=80=EB=A6=AC=EC=9E=90=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20->=20=EB=B0=A9=EC=9E=A5=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=EB=A1=9C=20=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=ED=8C=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/createMeeting/components/ReturnTitleComponent.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/createMeeting/components/ReturnTitleComponent.tsx b/src/pages/createMeeting/components/ReturnTitleComponent.tsx index c7340c69..bcdcbeb7 100644 --- a/src/pages/createMeeting/components/ReturnTitleComponent.tsx +++ b/src/pages/createMeeting/components/ReturnTitleComponent.tsx @@ -25,7 +25,7 @@ const funnelSteps: FunnelSteps = { }, hostInfo: { main: '방장 정보를 입력해주세요', - sub: '관리자 페이지에 접속할 때 필요해요', + sub: '방장 페이지에 접속할 때 필요해요', }, additionalInfo: { main: '더 알리고 싶은 내용이 있나요?', From 4b3a631f14ce190d0554441df1e1edf23664409f Mon Sep 17 00:00:00 2001 From: Eunseo Sim <55528304+simeunseo@users.noreply.github.com> Date: Sat, 24 Aug 2024 01:37:30 +0900 Subject: [PATCH 07/12] =?UTF-8?q?fix:=20=EB=B0=94=ED=85=80=EC=8B=9C?= =?UTF-8?q?=ED=8A=B8=20=EB=A7=88=EC=A7=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/BottomSheet/BottomSheet.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/common/BottomSheet/BottomSheet.tsx b/src/components/common/BottomSheet/BottomSheet.tsx index 3ce530f3..53dd9e68 100644 --- a/src/components/common/BottomSheet/BottomSheet.tsx +++ b/src/components/common/BottomSheet/BottomSheet.tsx @@ -32,7 +32,7 @@ const BottomSheetModal = styled.div<{ $isModalOpen: boolean }>` border-top-right-radius: 1.8rem; background-color: ${({ theme }) => theme.colors.grey8}; - padding: 4.4rem 2rem 4rem; + padding: 3.6rem 2rem 4.8rem; width: 37.5rem; & button { From 8634388b7314e8608652cf6cd7bc0d742fec97a8 Mon Sep 17 00:00:00 2001 From: Eunseo Sim <55528304+simeunseo@users.noreply.github.com> Date: Sat, 24 Aug 2024 01:38:57 +0900 Subject: [PATCH 08/12] =?UTF-8?q?fix:=20=EC=95=BD=EC=86=8D=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=ED=95=98=EA=B8=B0=20->=20=ED=9A=8C=EC=9D=98=20?= =?UTF-8?q?=EC=9D=BC=EC=A0=95=20=EC=A0=95=ED=95=98=EA=B8=B0=EB=A1=9C=20?= =?UTF-8?q?=EB=9D=BC=EC=9D=B4=ED=8C=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/moleculesComponents/Header.tsx | 2 +- src/pages/onBoarding/OnBoarding.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/common/moleculesComponents/Header.tsx b/src/components/common/moleculesComponents/Header.tsx index e62043b9..2da0954d 100644 --- a/src/components/common/moleculesComponents/Header.tsx +++ b/src/components/common/moleculesComponents/Header.tsx @@ -25,7 +25,7 @@ function Header({ position, setFunnelStep }: HeaderProps) { const { scheduleStep, setScheduleStep } = useScheduleStepContext(); const navigationOptions = [ { - title: '약속 생성하기', + title: '회의 일정 정하기', url: '/meet/create', }, { diff --git a/src/pages/onBoarding/OnBoarding.tsx b/src/pages/onBoarding/OnBoarding.tsx index 81f520fd..d93ac8c4 100644 --- a/src/pages/onBoarding/OnBoarding.tsx +++ b/src/pages/onBoarding/OnBoarding.tsx @@ -80,7 +80,7 @@ function OnBoarding() { From bcf53973fec0358d77f61cc81f119a8a1aba4b9f Mon Sep 17 00:00:00 2001 From: Eunseo Sim <55528304+simeunseo@users.noreply.github.com> Date: Sat, 24 Aug 2024 01:59:42 +0900 Subject: [PATCH 09/12] =?UTF-8?q?fix:=20=ED=9A=8C=EC=9D=98=20=EC=9E=A5?= =?UTF-8?q?=EC=86=8C=20=EC=9C=A0=EB=AC=B4=EC=97=90=20=EB=94=B0=EB=9D=BC=20?= =?UTF-8?q?=EC=98=A8=EB=B3=B4=EB=94=A9=20=EB=A1=9C=EB=9D=A0=20=EC=9C=84?= =?UTF-8?q?=EC=B9=98=20=EB=8B=AC=EB=9D=BC=EC=A7=80=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=A1=B0=EA=B1=B4=EB=B6=80=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/selectSchedule/SelectSchedule.tsx | 7 ++++++- .../components/selectTimeSlot/OnboardingLottie.tsx | 9 +++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/pages/selectSchedule/SelectSchedule.tsx b/src/pages/selectSchedule/SelectSchedule.tsx index 151a0695..cc774d57 100644 --- a/src/pages/selectSchedule/SelectSchedule.tsx +++ b/src/pages/selectSchedule/SelectSchedule.tsx @@ -66,7 +66,12 @@ function SelectSchedule() { sub={TITLES[scheduleStep].sub} padding={scheduleStep === 'selectTimeSlot' ? `0 0 2.6rem` : `4.4rem 0 3.2rem 0`} /> - {isLottieOpen && } + {isLottieOpen && ( + + )} void; + top: number; } -function OnboardingLottie({ onClose }: OnboardingLottieProps) { +function OnboardingLottie({ onClose, top }: OnboardingLottieProps) { const defaultOptions = { loop: true, autoplay: true, @@ -18,7 +19,7 @@ function OnboardingLottie({ onClose }: OnboardingLottieProps) { }; return ( <> - + @@ -29,9 +30,9 @@ function OnboardingLottie({ onClose }: OnboardingLottieProps) { export default OnboardingLottie; -const OnboardingLottieWrapper = styled.aside` +const OnboardingLottieWrapper = styled.aside<{ $top: number }>` position: absolute; - top: 29.4rem; + top: ${({ $top }) => $top}rem; z-index: 1; `; From 6b8c73c9c43dbee5a323ef107d6559703142d755 Mon Sep 17 00:00:00 2001 From: Eunseo Sim <55528304+simeunseo@users.noreply.github.com> Date: Sat, 24 Aug 2024 02:03:42 +0900 Subject: [PATCH 10/12] =?UTF-8?q?fix:=20=EC=98=A8=EB=B3=B4=EB=94=A9=20?= =?UTF-8?q?=EB=A1=9C=EB=9D=A0=20top=20=EA=B0=92=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/selectSchedule/SelectSchedule.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/selectSchedule/SelectSchedule.tsx b/src/pages/selectSchedule/SelectSchedule.tsx index cc774d57..1e3c75b1 100644 --- a/src/pages/selectSchedule/SelectSchedule.tsx +++ b/src/pages/selectSchedule/SelectSchedule.tsx @@ -69,7 +69,7 @@ function SelectSchedule() { {isLottieOpen && ( )} Date: Sat, 24 Aug 2024 02:04:57 +0900 Subject: [PATCH 11/12] =?UTF-8?q?fix:=20=EC=98=A8=EB=B3=B4=EB=94=A9=20?= =?UTF-8?q?=EB=A1=9C=EB=9D=A0=20top=20=EA=B0=92=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/selectSchedule/SelectSchedule.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/selectSchedule/SelectSchedule.tsx b/src/pages/selectSchedule/SelectSchedule.tsx index 1e3c75b1..e6ab6ccc 100644 --- a/src/pages/selectSchedule/SelectSchedule.tsx +++ b/src/pages/selectSchedule/SelectSchedule.tsx @@ -69,7 +69,7 @@ function SelectSchedule() { {isLottieOpen && ( )} Date: Sat, 24 Aug 2024 02:27:21 +0900 Subject: [PATCH 12/12] =?UTF-8?q?fix:=20=EB=B0=A9=EC=9E=A5=20=EB=B9=84?= =?UTF-8?q?=EB=B0=80=EB=B2=88=ED=98=B8=208=EC=9E=90=20=EC=B4=88=EA=B3=BC?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EC=BC=80=EC=9D=B4=EC=8A=A4=20=EC=97=90?= =?UTF-8?q?=EB=9F=AC=EB=A1=9C=20=EB=B6=84=EB=A5=98=ED=95=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EA=B3=A0=20=ED=97=88=EC=9A=A9=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../createMeeting/components/useFunnel/SetHostInfo.tsx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/pages/createMeeting/components/useFunnel/SetHostInfo.tsx b/src/pages/createMeeting/components/useFunnel/SetHostInfo.tsx index 3a5af13a..c1804951 100644 --- a/src/pages/createMeeting/components/useFunnel/SetHostInfo.tsx +++ b/src/pages/createMeeting/components/useFunnel/SetHostInfo.tsx @@ -22,11 +22,7 @@ function SetHostInfo({ meetingInfo, setMeetingInfo, setStep }: FunnelProps) { const passWordOnChange = (e: React.ChangeEvent) => { setMeetingInfo((prev: MeetingInfo) => { - if (e.target.value.length < 9) { - return { ...prev, password: e.target.value }; - } - alert('비밀번호는 8자리 이하로 말해주세요'); - return { ...prev }; + return { ...prev, password: e.target.value }; }); }; @@ -44,6 +40,7 @@ function SetHostInfo({ meetingInfo, setMeetingInfo, setStep }: FunnelProps) { } }; + console.log(meetingInfo.password.length); return (