From 1ff79f67babe1ae5b528a2e2cd2ab0dc8c84bf2e Mon Sep 17 00:00:00 2001 From: cys4585 Date: Sun, 20 Oct 2024 12:29:50 +0900 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=EB=AC=B8=EC=84=9C=20=ED=95=9C?= =?UTF-8?q?=EA=B5=AD=EC=96=B4=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20?= =?UTF-8?q?og=20description=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/index.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/frontend/src/index.html b/frontend/src/index.html index 549fa1389..25f155d64 100644 --- a/frontend/src/index.html +++ b/frontend/src/index.html @@ -1,5 +1,5 @@ - + @@ -12,7 +12,7 @@ - + @@ -25,7 +25,5 @@
- - From 1b28aaba5def211c353608b7213fae0c9f10ac5e Mon Sep 17 00:00:00 2001 From: cys4585 Date: Sun, 20 Oct 2024 13:00:33 +0900 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=EB=8B=A4=EB=9D=BD=EB=B0=A9=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EB=B0=8F=20=EC=B0=B8=EC=97=AC=20=ED=94=8C?= =?UTF-8?q?=EB=A1=9C=EC=9A=B0=20=EC=A0=91=EA=B7=BC=EC=84=B1=20=EA=B0=9C?= =?UTF-8?q?=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Button/BackArrowButton/BackArrowButton.tsx | 2 +- .../src/components/HighlightSpan/HighlightSpan.tsx | 7 ++++++- .../DarakbangCreationModalContent.tsx | 7 +++++-- .../DarakbangCreationPage.tsx | 14 ++++++-------- .../DarakbangEntrancePage.tsx | 5 ++--- .../DarakbangLandingPage/DarakbangLandingPage.tsx | 7 +++++-- .../DarakbangSelectOptionPage.tsx | 2 +- .../DarakbangSelectPage/DarakbangSelectPage.tsx | 10 ++++------ 8 files changed, 30 insertions(+), 24 deletions(-) diff --git a/frontend/src/components/Button/BackArrowButton/BackArrowButton.tsx b/frontend/src/components/Button/BackArrowButton/BackArrowButton.tsx index 20dc47f98..01eae5844 100644 --- a/frontend/src/components/Button/BackArrowButton/BackArrowButton.tsx +++ b/frontend/src/components/Button/BackArrowButton/BackArrowButton.tsx @@ -9,7 +9,7 @@ export default function BackArrowButton(props: BackArrowButtonProps) { const { ...rest } = props; return ( - ); diff --git a/frontend/src/components/HighlightSpan/HighlightSpan.tsx b/frontend/src/components/HighlightSpan/HighlightSpan.tsx index 25aae6d3e..48b7f5a16 100644 --- a/frontend/src/components/HighlightSpan/HighlightSpan.tsx +++ b/frontend/src/components/HighlightSpan/HighlightSpan.tsx @@ -8,6 +8,7 @@ interface HighlightSpanProps extends PropsWithChildren { normalColor?: SerializedStyles | string; font?: SerializedStyles | string; isCenterAlign?: boolean; + ariaLabel?: string; } interface HighlightSpanContext { @@ -24,6 +25,7 @@ function HighlightSpan(props: HighlightSpanProps) { normalColor = theme.colorPalette.black[100], font = theme.typography.h5, isCenterAlign = false, + ariaLabel, children, } = props; @@ -31,7 +33,10 @@ function HighlightSpan(props: HighlightSpanProps) { - + {children} diff --git a/frontend/src/pages/Darakbang/DarakbangCreationPage/DarakbangCreationModalContent/DarakbangCreationModalContent.tsx b/frontend/src/pages/Darakbang/DarakbangCreationPage/DarakbangCreationModalContent/DarakbangCreationModalContent.tsx index 7d3868505..aae5367f0 100644 --- a/frontend/src/pages/Darakbang/DarakbangCreationPage/DarakbangCreationModalContent/DarakbangCreationModalContent.tsx +++ b/frontend/src/pages/Darakbang/DarakbangCreationPage/DarakbangCreationModalContent/DarakbangCreationModalContent.tsx @@ -19,13 +19,16 @@ export default function DarakbangCreationModalContent( const theme = useTheme(); return (
- + {'다락방 이름으로 '} {darakbangName} {',\n닉네임으로 '} {nickname} { - '을(를) 선택하셨습니다.\n\n한 번 선택한 다락방 이름과 닉네임은 바꿀 수 없습니다.\n진행하시겠습니까?' + '을(를) 선택하셨습니다.\n\n한 번 선택한 다락방 이름은 바꿀 수 없습니다. 진행하시겠습니까?' }
diff --git a/frontend/src/pages/Darakbang/DarakbangCreationPage/DarakbangCreationPage.tsx b/frontend/src/pages/Darakbang/DarakbangCreationPage/DarakbangCreationPage.tsx index 71d87d66f..ab358a873 100644 --- a/frontend/src/pages/Darakbang/DarakbangCreationPage/DarakbangCreationPage.tsx +++ b/frontend/src/pages/Darakbang/DarakbangCreationPage/DarakbangCreationPage.tsx @@ -10,11 +10,11 @@ import HighlightSpan from '@_components/HighlightSpan/HighlightSpan'; import Modal from '@_components/Modal/Modal'; import POLICES from '@_constants/poclies'; import SelectLayout from '@_layouts/SelectLayout/SelectLayout'; -import SolidArrow from '@_components/Icons/SolidArrow'; import { setLastDarakbangId } from '@_common/lastDarakbangManager'; import useCreateDarakbang from '@_hooks/mutaions/useCreateDarakbang'; import { useNavigate } from 'react-router-dom'; import { useTheme } from '@emotion/react'; +import BackArrowButton from '@_components/Button/BackArrowButton/BackArrowButton'; export default function DarakbangCreationPage() { const theme = useTheme(); @@ -34,8 +34,7 @@ export default function DarakbangCreationPage() { - { navigate(-1); }} @@ -47,15 +46,14 @@ export default function DarakbangCreationPage() {
- - {'다락방의 '} - 이름은 + + 다락방의 이름은 무엇인가요? ) => { setDarakbangName(e.target.value); }} @@ -63,7 +61,7 @@ export default function DarakbangCreationPage() { />
- + 닉네임을 입력해주세요{'\n최대 '} {`${POLICES.maxNicknameLength}글자`} diff --git a/frontend/src/pages/Darakbang/DarakbangEntrancePage/DarakbangEntrancePage.tsx b/frontend/src/pages/Darakbang/DarakbangEntrancePage/DarakbangEntrancePage.tsx index 7da481172..5a1748965 100644 --- a/frontend/src/pages/Darakbang/DarakbangEntrancePage/DarakbangEntrancePage.tsx +++ b/frontend/src/pages/Darakbang/DarakbangEntrancePage/DarakbangEntrancePage.tsx @@ -5,9 +5,9 @@ import ErrorControlledInput from '@_components/ErrorControlledInput/ErrorControl import POLICES from '@_constants/poclies'; import ROUTES from '@_constants/routes'; import SelectLayout from '@_layouts/SelectLayout/SelectLayout'; -import SolidArrow from '@_components/Icons/SolidArrow'; import { useNavigate } from 'react-router-dom'; import { useTheme } from '@emotion/react'; +import BackArrowButton from '@_components/Button/BackArrowButton/BackArrowButton'; export default function DarakbangEntrancePage() { const theme = useTheme(); @@ -17,8 +17,7 @@ export default function DarakbangEntrancePage() { - { navigate(-1); }} diff --git a/frontend/src/pages/Darakbang/DarakbangLandingPage/DarakbangLandingPage.tsx b/frontend/src/pages/Darakbang/DarakbangLandingPage/DarakbangLandingPage.tsx index d46f0b297..8aaa33416 100644 --- a/frontend/src/pages/Darakbang/DarakbangLandingPage/DarakbangLandingPage.tsx +++ b/frontend/src/pages/Darakbang/DarakbangLandingPage/DarakbangLandingPage.tsx @@ -24,12 +24,15 @@ export default function DarakbangLandingPage() { - + {myInfo?.nickname} {`님 반가워요~!\n이제 `} 모임을 확인해볼까요? - {' '} +