diff --git a/src/assets/svgs/index.ts b/src/assets/svgs/index.ts deleted file mode 100644 index bd1bb637..00000000 --- a/src/assets/svgs/index.ts +++ /dev/null @@ -1,66 +0,0 @@ -export { default as BannerBasic } from "./BannerBasic"; -export { default as BtnFilter } from "./BtnFilter"; -export { default as BtnFloating } from "./BtnFloating"; -export { default as BtnModalDelete } from "./BtnModalDelete"; -export { default as ButtonDelete24 } from "./ButtonDelete24"; -export { default as CarouselPartInactive } from "./CarouselPartInactive"; -export { default as Empty } from "./Empty"; -export { default as IcomCopy } from "./IcomCopy"; -export { default as IconArrowLeft } from "./IconArrowLeft"; -export { default as IconArrowRight } from "./IconArrowRight"; -export { default as IconArrowDown } from "./IconArrowDown"; -export { default as IconArrowUp } from "./IconArrowUp"; -export { default as IconBnk } from "./IconBnk"; -export { default as IconCalendar } from "./IconCalendar"; -export { default as IconCamera } from "./IconCamera"; -export { default as IconCheckboxDisabledOn } from "./IconCheckboxDisabledOn"; -export { default as IconCheckboxSelectedOn } from "./IconCheckboxSelectedOn"; -export { default as IconCheckboxUnselectedOn } from "./IconCheckboxUnselectedOn"; -export { default as IconCheck } from "./IconCheck"; -export { default as IconChevronBack } from "./IconChevronBack"; -export { default as IconEmpty } from "./IconEmpty"; -export { default as IconEyeOff } from "./IconEyeOff"; -export { default as IconEyeOn } from "./IconEyeOn"; -export { default as IconFooterLogo } from "./IconFooterLogo"; -export { default as IconHanna } from "./IconHanna"; -export { default as IconIbk } from "./IconIbk"; -export { default as IconIm } from "./IconIm"; -export { default as IconImg } from "./IconImg"; -export { default as IconKabank } from "./IconKabank"; -export { default as IconKb } from "./IconKb"; -export { default as IconLargeBand } from "./IconLargeBand"; -export { default as IconLargeDance } from "./IconLargeDance"; -export { default as IconLargeEtc } from "./IconLargeEtc"; -export { default as IconLargeMusical } from "./IconLargeMusical"; -export { default as IconLogo } from "./IconLogo"; -export { default as IconMinus } from "./IconMinus"; -export { default as IconNonghyup } from "./IconNonghyup"; -export { default as IconPhotoDelete } from "./IconPhotoDelete"; -export { default as IconPlus } from "./IconPlus"; -export { default as IconProfile } from "./IconProfile"; -export { default as IconRoleAdd } from "./IconRoleAdd"; -export { default as IconSaemauel } from "./IconSaemauel"; -export { default as IconSc } from "./IconSc"; -export { default as IconShinhan } from "./IconShinhan"; -export { default as IconShinhyup } from "./IconShinhyup"; -export { default as IconSmallBand } from "./IconSmallBand"; -export { default as IconSmallDance } from "./IconSmallDance"; -export { default as IconSmallEtc } from "./IconSmallEtc"; -export { default as IconSmallMusical } from "./IconSmallMusical"; -export { default as IconSoohyup } from "./IconSoohyup"; -export { default as IconTextfiedlDelete } from "./IconTextfiedlDelete"; -export { default as IconTime } from "./IconTime"; -export { default as IconToggleOff } from "./IconToggleOff"; -export { default as IconToggleOn } from "./IconToggleOn"; -export { default as IconToss } from "./IconToss"; -export { default as IconWoochaegook } from "./IconWoochaegook"; -export { default as IconWoori } from "./IconWoori"; -export { default as IconXButton } from "./IconXButton"; -export { default as IcDelete } from "./IcDelete"; -export { default as IcHamburgar } from "./IcHamburgar"; -export { default as IcOutlinePlace } from "./IcOutlinePlace"; -export { default as IcRefresh } from "./IcRefresh"; -export { default as NotFoundAsset } from "./NotFoundAsset"; -export { default as Subtract } from "./Subtract"; -export { default as Switch } from "./Switch"; -export { default as Union } from "./Union"; diff --git a/src/assets/svgs/index.tsx b/src/assets/svgs/index.tsx index 61cf89c3..c29ceb05 100644 --- a/src/assets/svgs/index.tsx +++ b/src/assets/svgs/index.tsx @@ -65,4 +65,4 @@ export { default as NotFoundAsset } from "./NotFoundAsset"; export { default as SelectionControlCheckboxSelectedOff } from "./SelectionControlCheckboxSelectedOff"; export { default as Subtract } from "./Subtract"; export { default as Switch } from "./Switch"; -export { default as Union } from "./Union"; \ No newline at end of file +export { default as Union } from "./Union"; diff --git a/src/pages/ticketholderlist/components/FilterBottomSheet/FilterBottomSheet.styled.ts b/src/pages/ticketholderlist/components/FilterBottomSheet/FilterBottomSheet.styled.ts index e34530e7..0c94eca0 100644 --- a/src/pages/ticketholderlist/components/FilterBottomSheet/FilterBottomSheet.styled.ts +++ b/src/pages/ticketholderlist/components/FilterBottomSheet/FilterBottomSheet.styled.ts @@ -58,14 +58,9 @@ export const BoxDivider = styled.div` `; export const CheckBoxContainer = styled.section` - display: flex; - flex-direction: column; - gap: 1.2rem; -`; - -export const CheckBoxRow = styled.section` - display: flex; - gap: 8.1rem; + display: grid; + grid-gap: 1.4rem 8.1rem; + grid-template-columns: repeat(2, 9rem); `; export const CheckBoxLabel = styled.label` diff --git a/src/pages/ticketholderlist/components/FilterBottomSheet/FilterBottomSheet.tsx b/src/pages/ticketholderlist/components/FilterBottomSheet/FilterBottomSheet.tsx index 9afccb77..0225e30d 100644 --- a/src/pages/ticketholderlist/components/FilterBottomSheet/FilterBottomSheet.tsx +++ b/src/pages/ticketholderlist/components/FilterBottomSheet/FilterBottomSheet.tsx @@ -24,18 +24,13 @@ const FilterBottomSheet = ({ onClickOutside(); }; - const splitArray = (arrayLength: number): number[][] => { + const scheduleNumberArray = (arrayLength: number): number[] => { const array = Array.from({ length: arrayLength }, (_, idx) => idx + 1); - const result: number[][] = []; - for (let i = 0; i < array.length; i += 2) { - result.push(array.slice(i, i + 2)); - } - - return result; + return array; }; - const scheduleArray = splitArray(totalScheduleCount); + const scheduleArray = scheduleNumberArray(totalScheduleCount); // 선택된 회차 확인 const handleScheduleCheck = (schedule: number) => { @@ -71,24 +66,16 @@ const FilterBottomSheet = ({ - {scheduleArray.map((row, rowIndex) => ( - - {row.map((scheduleNumber) => ( - - handleScheduleCheck(scheduleNumber)} - /> - {checkedScheduleList.includes(scheduleNumber) ? ( - - ) : ( - - )} - {scheduleNumber}회차 - - ))} - + {scheduleArray.map((scheduleNumber) => ( + + handleScheduleCheck(scheduleNumber)} + /> + {checkedScheduleList.includes(scheduleNumber) ? : } + {scheduleNumber}회차 + ))} @@ -96,32 +83,17 @@ const FilterBottomSheet = ({ 입금 상태 - - {bookingStatusList.slice(0, 2).map((status, idx) => ( - - handleStatusCheck(status)} - /> - {checkedStatusList.includes(status) ? : } - {status} - - ))} - - - {bookingStatusList.slice(2, 4).map((status, idx) => ( - - handleStatusCheck(status)} - /> - {checkedStatusList.includes(status) ? : } - {status} - - ))} - + {bookingStatusList.map((status) => ( + + handleStatusCheck(status)} + /> + {checkedStatusList.includes(status) ? : } + {status} + + ))} {/* TODO : 선택된 내역 없을 때 버튼 비활성화 하기 */}