From af7b3306582a2cb34666e739645e73485c88d8d1 Mon Sep 17 00:00:00 2001 From: ovoxiix Date: Sun, 28 Jan 2024 02:58:37 +0900 Subject: [PATCH 1/6] =?UTF-8?q?delete:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EC=A3=BC=EC=84=9D=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/lib/showValidationMessage.ts | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/utils/lib/showValidationMessage.ts b/src/utils/lib/showValidationMessage.ts index 58962fc9..974696d5 100644 --- a/src/utils/lib/showValidationMessage.ts +++ b/src/utils/lib/showValidationMessage.ts @@ -57,20 +57,3 @@ export const showFourthStepValidationMessage = ( setIsValid(prev => ({ ...prev, endDateAfterStartDate: false })); } }; - -// export const handleStepLessThan3 = ( -// currentStep, -// input, -// isFilled, -// onButtonClick -// ) => { -// if ( -// currentStep === 0 && -// input.discountType === '정액 할인' && -// Number(input.discountFlat) % 1000 -// ) { -// return; -// } else if (currentStep === 2 || isFilled) { -// onButtonClick(prev => prev + 1); -// } -// }; From 4b7976082f6f04643b49bf192689813693739400 Mon Sep 17 00:00:00 2001 From: ovoxiix Date: Sun, 28 Jan 2024 03:00:22 +0900 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20InputCheckBox=20=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EB=84=8C=ED=8A=B8=20=EC=95=84=EC=9D=B4=EC=BD=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Register/common/InputCheckBox/index.tsx | 15 ++++++--------- src/types/register.ts | 4 ---- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/components/Register/common/InputCheckBox/index.tsx b/src/components/Register/common/InputCheckBox/index.tsx index eb0b01f9..0f7f0107 100644 --- a/src/components/Register/common/InputCheckBox/index.tsx +++ b/src/components/Register/common/InputCheckBox/index.tsx @@ -1,11 +1,7 @@ import styled from '@emotion/styled'; import theme from '@styles/theme'; -import { - InputCheckBoxProps, - LabelStyleProps, - CheckIconStyleProps -} from '@/types/register'; +import { InputCheckBoxProps, LabelStyleProps } from '@/types/register'; import checked from '@assets/icons/ic-register-checked.svg'; import unchecked from '@assets/icons/ic-register-unchecked.svg'; @@ -33,7 +29,10 @@ const InputCheckBox = ({ htmlFor={id} $isChecked={isChecked} > - + {text} @@ -59,11 +58,9 @@ const Label = styled.label` font-size: 15px; `; -const CheckIcon = styled.div` +const CheckIcon = styled.img` width: 20px; height: 20px; margin-right: 5px; - - background: url(${props => props.$src}) no-repeat; `; diff --git a/src/types/register.ts b/src/types/register.ts index 87d86a7a..1e01396a 100644 --- a/src/types/register.ts +++ b/src/types/register.ts @@ -65,10 +65,6 @@ export type LabelStyleProps = { $isChecked: boolean; }; -export type CheckIconStyleProps = { - $src: string; -}; - // InputRadio export type InputRadioProps = { id: string; From f22c4b001a7996da4782ab96f40913af0554773d Mon Sep 17 00:00:00 2001 From: ovoxiix Date: Sun, 28 Jan 2024 04:43:53 +0900 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20RoomSelectModal=20=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EB=84=8C=ED=8A=B8=20=EC=95=84=EC=9D=B4=EC=BD=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SecondStep/RoomSelectModal/index.tsx | 65 ++++++++++--------- src/types/register.ts | 4 -- 2 files changed, 34 insertions(+), 35 deletions(-) diff --git a/src/components/Register/Steps/SecondStep/RoomSelectModal/index.tsx b/src/components/Register/Steps/SecondStep/RoomSelectModal/index.tsx index e357c91f..c719fb50 100644 --- a/src/components/Register/Steps/SecondStep/RoomSelectModal/index.tsx +++ b/src/components/Register/Steps/SecondStep/RoomSelectModal/index.tsx @@ -3,11 +3,7 @@ import { useRecoilState } from 'recoil'; import styled from '@emotion/styled'; import { Backdrop } from '@components/common'; -import { - RoomType, - RoomSelectModalProps, - RoomSelectModalStyleProps -} from '@/types/register'; +import { RoomType, RoomSelectModalProps } from '@/types/register'; import close from '@assets/icons/ic-register-close.svg'; import sort from '@assets/icons/ic-register-sort.svg'; import filterChecked from '@assets/icons/ic-register-filter-checked.svg'; @@ -96,10 +92,12 @@ const RoomSelectModal = ({ setIsOpen }: RoomSelectModalProps) => {
적용 객실 설정 - + + +
@@ -109,10 +107,16 @@ const RoomSelectModal = ({ setIsOpen }: RoomSelectModalProps) => { checked={ selectedRooms.length === sortedRooms.length ? true : false } - $src={filterChecked} onChange={handleSelectAll} /> - + @@ -137,10 +141,16 @@ const RoomSelectModal = ({ setIsOpen }: RoomSelectModalProps) => { handleSelectOne(e, room)} /> - + {sliceName(room.roomNumber)} @@ -190,18 +200,23 @@ const Header = styled.div` font-size: 18px; `; -const CloseButton = styled.button` +const CloseButton = styled.button` width: 35px; height: 35px; padding: 0px; border: none; - background: url(${props => props.$src}) center / contain; + background: #fff; cursor: pointer; `; +const CloseIcon = styled.img` + width: 35px; + height: 35px; +`; + const Filter = styled.div` height: 63px; @@ -224,19 +239,13 @@ const FilterCell = styled.div` align-items: center; `; -const SelectAll = styled.input` +const SelectAll = styled.input` display: none; - - &:checked + div { - background: url(${props => props.$src}) no-repeat; - } `; -const FilterCheckIcon = styled.div` +const FilterCheckIcon = styled.img` width: 21px; height: 21px; - - background: url(${props => props.$src}) no-repeat; `; const SortButton = styled.button` @@ -289,19 +298,13 @@ const ListCell = styled.div` align-items: center; `; -const SelectOne = styled.input` +const SelectOne = styled.input` display: none; - - &:checked + div { - background: url(${props => props.$src}) no-repeat; - } `; -const ListCheckIcon = styled.div` +const ListCheckIcon = styled.img` width: 21px; height: 21px; - - background: url(${props => props.$src}) no-repeat; `; const Footer = styled.div` diff --git a/src/types/register.ts b/src/types/register.ts index 1e01396a..6f470f72 100644 --- a/src/types/register.ts +++ b/src/types/register.ts @@ -155,10 +155,6 @@ export type RoomSelectModalProps = { setIsOpen: React.Dispatch>; }; -export type RoomSelectModalStyleProps = { - $src: string; -}; - // RoomSelectButton export type RoomSelectButtonProps = { type: string; From 6bb03338e5be1a32cd370dfd0d53a745be237b0e Mon Sep 17 00:00:00 2001 From: ovoxiix Date: Sun, 28 Jan 2024 04:46:51 +0900 Subject: [PATCH 4/6] =?UTF-8?q?fix:=20InputAccordion=20=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EB=84=8C=ED=8A=B8=20=EC=95=84=EC=9D=B4=EC=BD=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Register/common/InputAccordion/index.tsx | 10 +++++++--- src/types/register.ts | 1 - 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/components/Register/common/InputAccordion/index.tsx b/src/components/Register/common/InputAccordion/index.tsx index d6eaf6a4..523b8276 100644 --- a/src/components/Register/common/InputAccordion/index.tsx +++ b/src/components/Register/common/InputAccordion/index.tsx @@ -34,9 +34,13 @@ const InputAccordion = ({ title, value, children }: InputAccordionProps) => { {title} {children} @@ -77,7 +81,7 @@ const Button = styled.button` padding: 0px; border: none; - background: url(${props => props.src}); + background: #fff; transform: rotate( ${props => { diff --git a/src/types/register.ts b/src/types/register.ts index 6f470f72..2ef028a8 100644 --- a/src/types/register.ts +++ b/src/types/register.ts @@ -38,7 +38,6 @@ export type InputAccordionProps = { export type ButtonStyleProps = { $isOpen: boolean; - src: string; }; // InputField From 3dc910c2f00a0f519926e3e526ace8a858b3acb8 Mon Sep 17 00:00:00 2001 From: ovoxiix Date: Sun, 28 Jan 2024 04:50:12 +0900 Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=EC=BF=A0=ED=8F=B0=20=ED=95=A0?= =?UTF-8?q?=EC=9D=B8=20=EC=84=A4=EC=A0=95=20=EC=9C=A0=ED=9A=A8=EC=84=B1=20?= =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Register/Steps/FirstStep/index.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/components/Register/Steps/FirstStep/index.tsx b/src/components/Register/Steps/FirstStep/index.tsx index e4d3a4f6..ea12cf6e 100644 --- a/src/components/Register/Steps/FirstStep/index.tsx +++ b/src/components/Register/Steps/FirstStep/index.tsx @@ -193,12 +193,11 @@ const FirstStep = () => { /> - {!isValid.isDiscountTypeValid && ( + {(!isValid.isDiscountTypeValid || + !isValid.isDiscountFlatValid || + !isValid.isDiscountFlatRateValid) && ( 쿠폰 할인 설정은 필수입니다. )} - {(!isValid.isDiscountFlatValid || !isValid.isDiscountFlatRateValid) && ( - 숫자로 입력해주세요. - )} {!isValid.isThousands && ( 1,000 원 단위로 입력 가능합니다. )} From e1973ff0c6c5d9c67b78ead4bb170278aab204ba Mon Sep 17 00:00:00 2001 From: ovoxiix Date: Sun, 28 Jan 2024 04:53:37 +0900 Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=EC=84=A0=ED=83=9D=20=EA=B0=9D?= =?UTF-8?q?=EC=8B=A4=20=EC=84=A0=ED=83=9D=20=EC=8B=9C=20=EB=AF=B8=EB=A6=AC?= =?UTF-8?q?=EB=B3=B4=EA=B8=B0=20=EB=8B=A8=EC=96=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Register/Steps/SecondStep/index.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/Register/Steps/SecondStep/index.tsx b/src/components/Register/Steps/SecondStep/index.tsx index f80c4385..2c65abe4 100644 --- a/src/components/Register/Steps/SecondStep/index.tsx +++ b/src/components/Register/Steps/SecondStep/index.tsx @@ -97,7 +97,10 @@ const SecondStep = () => { const handleToAllRoomsChange = (e: React.ChangeEvent) => { setInput({ ...input, toAllRooms: e.target.value }); - setPreview({ ...preview, toAllRooms: e.target.value }); + setPreview({ + ...preview, + toAllRooms: e.target.value === 'true' ? '모든 객실' : '일부 객실' + }); setIsValid(prev => ({ ...prev, isToAllRoomsValid: true