From 014ac929c5c1f22dec5a294169a4dba55a1e7eff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=84=8C=E1=85=A2=E1=84=92=E1=85=A1?= Date: Sun, 12 Nov 2023 20:08:28 +0900 Subject: [PATCH] =?UTF-8?q?style:=20=EB=8B=AB=EA=B8=B0=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=EC=BD=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/jurumarble/src/app/agreement/page.tsx | 5 +-- apps/jurumarble/src/app/help/page.tsx | 5 +-- .../app/map/components/RegionBottomsheet.tsx | 4 +- .../my/edit/components/WithdrawalModal.tsx | 4 +- .../src/app/onboarding/page.module.css | 5 --- apps/jurumarble/src/app/onboarding/page.tsx | 5 +-- apps/jurumarble/src/app/policy/page.tsx | 5 +-- .../app/vote/[id]/components/SearchInput.tsx | 2 +- .../[id]/components/SearchRestaurantModal.tsx | 4 +- .../vote/components/OnboardingBottomsheet.tsx | 4 +- .../vote/post/components/DrinkSearchModal.tsx | 4 +- .../post/components/PostVoteContainer.tsx | 4 +- .../post/components/SelectedDrinkChip.tsx | 4 +- .../src/assets/icons/components/IcClose.tsx | 39 +++++++++++++++++++ .../src/assets/icons/components/IcX.tsx | 21 ---------- .../src/assets/icons/components/index.ts | 2 +- .../jurumarble/src/components/SearchInput.tsx | 2 +- .../SideButtonHeader/SideButtonHeader.tsx | 7 ++-- .../SideButtonHeader/styles.module.css | 1 + 19 files changed, 69 insertions(+), 58 deletions(-) create mode 100644 apps/jurumarble/src/assets/icons/components/IcClose.tsx delete mode 100644 apps/jurumarble/src/assets/icons/components/IcX.tsx diff --git a/apps/jurumarble/src/app/agreement/page.tsx b/apps/jurumarble/src/app/agreement/page.tsx index e5e6b021..c992f39e 100644 --- a/apps/jurumarble/src/app/agreement/page.tsx +++ b/apps/jurumarble/src/app/agreement/page.tsx @@ -3,7 +3,7 @@ import { SideButtonHeader } from 'components/SideButtonHeader'; import { getClassNames } from 'lib/styles/getClassNames'; import { useRouter } from 'next/navigation'; -import { SvgIcX } from 'src/assets/icons/components'; +import { SvgIcClose } from 'src/assets/icons/components'; import styles from './page.module.css'; @@ -19,12 +19,11 @@ function AgreementPage() { { router.back(); }} > - + } > diff --git a/apps/jurumarble/src/app/help/page.tsx b/apps/jurumarble/src/app/help/page.tsx index 063ca47e..e46731be 100644 --- a/apps/jurumarble/src/app/help/page.tsx +++ b/apps/jurumarble/src/app/help/page.tsx @@ -5,7 +5,7 @@ import { getClassNames } from 'lib/styles/getClassNames'; import Image from 'next/image'; import { useRouter } from 'next/navigation'; import { howToReportImage } from 'public/images'; -import { SvgIcX } from 'src/assets/icons/components'; +import { SvgIcClose } from 'src/assets/icons/components'; import styles from './page.module.css'; @@ -21,12 +21,11 @@ function HelpPage() { { router.back(); }} > - + } > diff --git a/apps/jurumarble/src/app/map/components/RegionBottomsheet.tsx b/apps/jurumarble/src/app/map/components/RegionBottomsheet.tsx index 81b4228a..987cd065 100644 --- a/apps/jurumarble/src/app/map/components/RegionBottomsheet.tsx +++ b/apps/jurumarble/src/app/map/components/RegionBottomsheet.tsx @@ -1,7 +1,7 @@ import { Button, Portal } from 'components/index'; import { REGION_LIST } from 'lib/constants'; import { transitions } from 'lib/styles'; -import { SvgIcPrev, SvgIcX } from 'src/assets/icons/components'; +import { SvgIcClose, SvgIcPrev } from 'src/assets/icons/components'; import styled, { css } from 'styled-components'; interface Props { @@ -27,7 +27,7 @@ const RegionBottomSheet = ({ 지역 설정 - + diff --git a/apps/jurumarble/src/app/my/edit/components/WithdrawalModal.tsx b/apps/jurumarble/src/app/my/edit/components/WithdrawalModal.tsx index be863ce7..a57a8417 100644 --- a/apps/jurumarble/src/app/my/edit/components/WithdrawalModal.tsx +++ b/apps/jurumarble/src/app/my/edit/components/WithdrawalModal.tsx @@ -1,7 +1,7 @@ import { useToggle } from '@monorepo/hooks'; import VoteHeader from 'components/VoteHeader'; import { Button, ModalTemplate } from 'components/index'; -import { SvgIcX } from 'src/assets/icons/components'; +import { SvgIcClose } from 'src/assets/icons/components'; import styled, { css } from 'styled-components'; interface Props { @@ -20,7 +20,7 @@ function WithdrawalModal({ onToggleWithdrawalModal, deleteUser }: Props) { - + } > diff --git a/apps/jurumarble/src/app/onboarding/page.module.css b/apps/jurumarble/src/app/onboarding/page.module.css index eb1fec0c..1cde20c6 100644 --- a/apps/jurumarble/src/app/onboarding/page.module.css +++ b/apps/jurumarble/src/app/onboarding/page.module.css @@ -27,8 +27,3 @@ max-width: 720px; background-color: var(--white); } - -.close-button { - margin-right: 20px; - display: flex; -} diff --git a/apps/jurumarble/src/app/onboarding/page.tsx b/apps/jurumarble/src/app/onboarding/page.tsx index bc90f6c4..3904d098 100644 --- a/apps/jurumarble/src/app/onboarding/page.tsx +++ b/apps/jurumarble/src/app/onboarding/page.tsx @@ -5,7 +5,7 @@ import { getClassNames } from 'lib/styles/getClassNames'; import Image from 'next/image'; import { useRouter } from 'next/navigation'; import { Onboarding } from 'public/images'; -import { SvgIcX } from 'src/assets/icons/components'; +import { SvgIcClose } from 'src/assets/icons/components'; import BottomButton from './components/BottomButton'; import styles from './page.module.css'; @@ -23,12 +23,11 @@ const OnboardingPage = () => { { router.back(); }} > - + } /> diff --git a/apps/jurumarble/src/app/policy/page.tsx b/apps/jurumarble/src/app/policy/page.tsx index 9e0b9020..08bdff81 100644 --- a/apps/jurumarble/src/app/policy/page.tsx +++ b/apps/jurumarble/src/app/policy/page.tsx @@ -4,7 +4,7 @@ import { SideButtonHeader } from 'components/SideButtonHeader'; import { getClassNames } from 'lib/styles/getClassNames'; import { useRouter } from 'next/navigation'; -import { SvgIcX } from 'src/assets/icons/components'; +import { SvgIcClose } from 'src/assets/icons/components'; import styles from './page.module.css'; @@ -20,12 +20,11 @@ function AgreementPage() { { router.back(); }} > - + } > diff --git a/apps/jurumarble/src/app/vote/[id]/components/SearchInput.tsx b/apps/jurumarble/src/app/vote/[id]/components/SearchInput.tsx index a6cb6e36..a47e18e3 100644 --- a/apps/jurumarble/src/app/vote/[id]/components/SearchInput.tsx +++ b/apps/jurumarble/src/app/vote/[id]/components/SearchInput.tsx @@ -38,7 +38,7 @@ const SearchInput = forwardRef( /> - {/* - + } > diff --git a/apps/jurumarble/src/app/vote/components/OnboardingBottomsheet.tsx b/apps/jurumarble/src/app/vote/components/OnboardingBottomsheet.tsx index 14b9fdb4..05f81c32 100644 --- a/apps/jurumarble/src/app/vote/components/OnboardingBottomsheet.tsx +++ b/apps/jurumarble/src/app/vote/components/OnboardingBottomsheet.tsx @@ -13,7 +13,7 @@ import { mobileMoveOnboarding, mobileSelectOnboarding, } from 'public/images'; -import { SvgIcX } from 'src/assets/icons/components'; +import { SvgIcClose } from 'src/assets/icons/components'; import styled, { css } from 'styled-components'; interface CardProps { @@ -97,7 +97,7 @@ const OnboardingBottomsheet = ({ onToggleOnboarding }: Props) => { - + 투표를 좀 더 재밌게 참여해 볼까요? diff --git a/apps/jurumarble/src/app/vote/post/components/DrinkSearchModal.tsx b/apps/jurumarble/src/app/vote/post/components/DrinkSearchModal.tsx index bd27f4c9..9b4fd02d 100644 --- a/apps/jurumarble/src/app/vote/post/components/DrinkSearchModal.tsx +++ b/apps/jurumarble/src/app/vote/post/components/DrinkSearchModal.tsx @@ -7,7 +7,7 @@ import SearchInput from 'components/SearchInput'; import VoteHeader from 'components/VoteHeader'; import { Button, ModalTemplate } from 'components/index'; import useInput from 'hooks/useInput'; -import SvgIcX from 'src/assets/icons/components/IcX'; +import { SvgIcClose } from 'src/assets/icons/components'; import { DrinkInfoType } from 'src/types/drink'; import styled, { css } from 'styled-components'; @@ -59,7 +59,7 @@ function DrinkSearchModal({ - + } > diff --git a/apps/jurumarble/src/app/vote/post/components/PostVoteContainer.tsx b/apps/jurumarble/src/app/vote/post/components/PostVoteContainer.tsx index b344ea61..d8650b6c 100644 --- a/apps/jurumarble/src/app/vote/post/components/PostVoteContainer.tsx +++ b/apps/jurumarble/src/app/vote/post/components/PostVoteContainer.tsx @@ -9,7 +9,7 @@ import { Button, Input } from 'components/index'; import { media } from 'lib/styles'; import depths from 'lib/styles/depths'; import Image from 'next/image'; -import { SvgIcX, SvgInfo } from 'src/assets/icons/components'; +import { SvgIcClose, SvgInfo } from 'src/assets/icons/components'; import { DrinkInfoType } from 'src/types/drink'; import styled, { css } from 'styled-components'; @@ -62,7 +62,7 @@ function PostVoteContainer() { 술 검색하기 버튼을 클릭하면
우리술을 편하게 등록할 수 있어요. diff --git a/apps/jurumarble/src/app/vote/post/components/SelectedDrinkChip.tsx b/apps/jurumarble/src/app/vote/post/components/SelectedDrinkChip.tsx index 5e34a40c..1a019d68 100644 --- a/apps/jurumarble/src/app/vote/post/components/SelectedDrinkChip.tsx +++ b/apps/jurumarble/src/app/vote/post/components/SelectedDrinkChip.tsx @@ -1,4 +1,4 @@ -import SvgIcX from 'src/assets/icons/components/IcX'; +import { SvgIcClose } from 'src/assets/icons/components'; import styled, { css } from 'styled-components'; interface Props { @@ -11,7 +11,7 @@ function SelectedDrinkChip({ children, onClickDeleteItem }: Props) { {children} - + ); diff --git a/apps/jurumarble/src/assets/icons/components/IcClose.tsx b/apps/jurumarble/src/assets/icons/components/IcClose.tsx new file mode 100644 index 00000000..d3980860 --- /dev/null +++ b/apps/jurumarble/src/assets/icons/components/IcClose.tsx @@ -0,0 +1,39 @@ +import type { SVGProps } from 'react'; + +const SvgIcClose = (props: SVGProps) => ( + + + + + + + + +); +export default SvgIcClose; diff --git a/apps/jurumarble/src/assets/icons/components/IcX.tsx b/apps/jurumarble/src/assets/icons/components/IcX.tsx deleted file mode 100644 index 89d7fe6c..00000000 --- a/apps/jurumarble/src/assets/icons/components/IcX.tsx +++ /dev/null @@ -1,21 +0,0 @@ -import type { SVGProps } from 'react'; - -const SvgIcX = (props: SVGProps) => ( - - - -); -export default SvgIcX; diff --git a/apps/jurumarble/src/assets/icons/components/index.ts b/apps/jurumarble/src/assets/icons/components/index.ts index c55be13a..6e5a575d 100644 --- a/apps/jurumarble/src/assets/icons/components/index.ts +++ b/apps/jurumarble/src/assets/icons/components/index.ts @@ -3,6 +3,7 @@ export { default as SvgIcBookmark } from './IcBookmark'; export { default as SvgIcCamera } from './IcCamera'; export { default as SvgIcChat } from './IcChat'; export { default as SvgIcCheck } from './IcCheck'; +export { default as SvgIcClose } from './IcClose'; export { default as SvgIcDetail } from './IcDetail'; export { default as SvgIcHome } from './IcHome'; export { default as SvgKakaoIcon } from './IcKakaoIcon'; @@ -17,7 +18,6 @@ export { default as SvgIcPrevious } from './IcPrevious'; export { default as SvgIcSearch } from './IcSearch'; export { default as SvgStamp } from './IcStamp'; export { default as SvgIcUser } from './IcUser'; -export { default as SvgIcX } from './IcX'; export { default as SvgIcBookmarkActive } from './IcBookmarkActive'; export { default as SvgLogo } from './IcLogo'; export { default as SvgNotification } from './IcNotification'; diff --git a/apps/jurumarble/src/components/SearchInput.tsx b/apps/jurumarble/src/components/SearchInput.tsx index 831c2208..2f29adb8 100644 --- a/apps/jurumarble/src/components/SearchInput.tsx +++ b/apps/jurumarble/src/components/SearchInput.tsx @@ -43,7 +43,7 @@ const SearchInput = forwardRef( /> - {/* +
{leftButton ? leftButton :
} - {children} + {children} {rightButton ? rightButton :
}
); diff --git a/apps/jurumarble/src/components/SideButtonHeader/styles.module.css b/apps/jurumarble/src/components/SideButtonHeader/styles.module.css index 8ce71001..47a3c0d5 100644 --- a/apps/jurumarble/src/components/SideButtonHeader/styles.module.css +++ b/apps/jurumarble/src/components/SideButtonHeader/styles.module.css @@ -4,6 +4,7 @@ align-items: center; justify-content: space-between; height: 48px; + padding: 0 20px; } .empty-space {