diff --git a/components/Button/Button.module.scss b/components/Button/Button.module.scss index 01e3e34..6898921 100644 --- a/components/Button/Button.module.scss +++ b/components/Button/Button.module.scss @@ -1,5 +1,5 @@ .button { - @apply rounded-[2px] font-pretendard text-[18px] font-semibold; + @apply rounded-[2px] font-pretendard text-[18px]; &.lg { @apply w-full px-[13px]; @@ -11,10 +11,10 @@ @apply w-small px-[11px]; } &.reset { - @apply h-[54px] w-[110px] rounded-[2px] font-pretendard bg-transparent border border-solid border-r1 text-r1 font-semibold text-[18px]; + @apply h-[54px] w-[110px] rounded-[2px] font-pretendard bg-transparent border border-solid border-r1 text-r1 text-[18px]; } &.apply { - @apply bg-r1 w-[217px] text-g0 font-semibold h-[54px] rounded-[2px] border-r1 font-pretendard border-solid; + @apply bg-r1 w-[217px] text-g0 h-[54px] rounded-[2px] border-r1 font-pretendard border-solid; } &.r1 { @apply bg-r1 text-g0; @@ -33,7 +33,7 @@ } &.noBg { - @apply bg-g0 border border-solid border-r1 rounded-[2px] text-r1 font-semibold; + @apply bg-g0 border border-solid border-r1 rounded-[2px] text-r1; } &.none { @@ -41,15 +41,15 @@ } &.outlined { - @apply bg-g0 border border-solid border-g4 rounded-[2px] font-semibold text-g5; + @apply bg-g0 border border-solid border-g4 rounded-[2px] text-g5; } } .reset { - @apply h-[54px] w-[110px] rounded-[2px] font-pretendard bg-transparent border border-solid border-r1 text-r1 font-semibold text-[18px]; + @apply h-[54px] w-[110px] rounded-[2px] font-pretendard bg-transparent border border-solid border-r1 text-r1 text-[18px]; } .submit { - @apply bg-r1 w-[233px] text-g0 font-semibold h-[54px] rounded-[2px] border-r1 font-pretendard border-solid; + @apply bg-r1 w-[233px] text-g0 h-[54px] rounded-[2px] border-r1 font-pretendard border-solid; } .button-wrapper { diff --git a/components/Button/Button.tsx b/components/Button/Button.tsx index 960c58e..63546e0 100644 --- a/components/Button/Button.tsx +++ b/components/Button/Button.tsx @@ -10,20 +10,34 @@ interface ButtonProps { color?: 'r1' | 'r4' | 'g2' | 'none' | 'noBg' | 'outlined'; height?: string; _className?: string; + fontWeight?: 'normal' | 'light'; } /** * @param * @returns Button Component! */ -function Button({ type = 'button', size, children, onClick, disabled, color, height, _className }: ButtonProps) { +function Button({ + type = 'button', + size, + children, + onClick, + disabled, + color, + height, + _className, + fontWeight = 'normal', +}: ButtonProps) { const disabledCss = disabled ? styles.disabled : ''; const styleSize = (size || '').indexOf('px') > -1 ? `w-[${size}]` : styles[`${size}`]; const heightStyle = height ? `h-[${height}]` : 'h-[54px]'; + const fontWeightStyle = fontWeight === 'light' ? 'font-normal' : 'font-semibold'; return ( + ))} + +
+ +
+ + + ); +}; + const ContactModal = ({ closeModal }: { closeModal: () => void }) => { const { register, @@ -195,24 +198,6 @@ export default function RoomDetail() { const { openModal, closeModal } = useModal(); - const showReporting = () => { - openModal({ - props: { - title: 'Why are you reporting?', - content: "This wan't be shared with the reported user", - buttonName: 'Report', - buttonNames: ['Not a real place', 'Inappropriate content', 'Incorrect information', 'Suspected scammer'], - handleClose: () => { - closeModal(); - }, - }, - }); - }; - - const handleReport = () => { - setShowReport(false); - }; - const includeServices = useMemo(() => { return ( room?.maintenance && @@ -277,7 +262,6 @@ export default function RoomDetail() { const handleContactPopup = () => { openModal({ props: { - title: 'Add room', custom: true, customHeader: true, hasCloseButton: true, @@ -287,12 +271,16 @@ export default function RoomDetail() { }); }; - /** Contact Click Event */ - const handleContact = () => { - // Email 발송 기능 추가 필요 - setShowContact(false); - setValue('email', ''); - setValue('description', ''); + const showReporting = () => { + openModal({ + props: { + custom: true, + customHeader: true, + hasCloseButton: true, + hasButton: false, + }, + children: , + }); }; useEffect(() => { @@ -441,25 +429,7 @@ export default function RoomDetail() { )} - {showReport && ( - - )} ); } - -// export default function RoomDetail() { -// return ( -// -// -// -// ); -// }