From fa648f0fb49c00135902fce07a0c1b61c05ace59 Mon Sep 17 00:00:00 2001 From: ChoiWonBeen Date: Fri, 23 Jun 2023 10:57:44 +0900 Subject: [PATCH 01/11] =?UTF-8?q?fix:=20=EA=B2=80=EC=83=89=EC=B0=BD=20?= =?UTF-8?q?=EC=A4=84=EB=B0=94=EA=BF=88=20=EB=AC=B8=EC=A0=9C=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 --- src/pages/Search/components/SearchBar/SearchBar.module.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/Search/components/SearchBar/SearchBar.module.scss b/src/pages/Search/components/SearchBar/SearchBar.module.scss index 6d25f98d..ecb36de0 100644 --- a/src/pages/Search/components/SearchBar/SearchBar.module.scss +++ b/src/pages/Search/components/SearchBar/SearchBar.module.scss @@ -9,7 +9,6 @@ word-break: keep-all; height: 80px; padding-top: 168px; - padding-right: 60px; padding-left: 30px; font-size: 32px; font-weight: 300; From 371cab57ab5b54db3904c62425f10dbecd8abdd4 Mon Sep 17 00:00:00 2001 From: ChoiWonBeen Date: Fri, 23 Jun 2023 10:57:59 +0900 Subject: [PATCH 02/11] =?UTF-8?q?fix:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=B2=B4=ED=81=AC=EB=B0=95?= =?UTF-8?q?=EC=8A=A4=20=EA=B9=A8=EC=A7=80=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Setting/Withdrawal/Withdrawal.module.scss | 32 +++++++++---------- src/pages/Setting/Withdrawal/index.tsx | 10 +++--- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/pages/Setting/Withdrawal/Withdrawal.module.scss b/src/pages/Setting/Withdrawal/Withdrawal.module.scss index 5cbb67bb..47971575 100644 --- a/src/pages/Setting/Withdrawal/Withdrawal.module.scss +++ b/src/pages/Setting/Withdrawal/Withdrawal.module.scss @@ -90,6 +90,22 @@ $passive: #c4c4c4; position: relative; } } + + &__checkbox { + width: 12px; + height: 12px; + border-radius: 50%; + border: 1px solid $default; + appearance: none; + cursor: pointer; + transition: 0.2s; + margin: 0 5px; + + &:checked { + background: $active; + border: none; + } + } } .checkbox { @@ -166,19 +182,3 @@ $passive: #c4c4c4; line-height: 20px; } } - -input[type="checkbox"] { - width: 12px; - height: 12px; - border-radius: 50%; - border: 1px solid $default; - appearance: none; - cursor: pointer; - transition: background 0.2s; - margin: 0 5px; -} - -input[type="checkbox"]:checked { - background: $active; - border: none; -} diff --git a/src/pages/Setting/Withdrawal/index.tsx b/src/pages/Setting/Withdrawal/index.tsx index 4097b250..ff22f084 100644 --- a/src/pages/Setting/Withdrawal/index.tsx +++ b/src/pages/Setting/Withdrawal/index.tsx @@ -38,23 +38,23 @@ export default function Withdrawal() {
계정을 삭제하시려는 이유가 궁금해요.
From 8a4d3037d944953e81f337c34613cc31957c8b9e Mon Sep 17 00:00:00 2001 From: ChoiWonBeen Date: Fri, 23 Jun 2023 11:07:46 +0900 Subject: [PATCH 03/11] =?UTF-8?q?fix:=20=EC=95=84=EC=9D=B4=EB=94=94?= =?UTF-8?q?=EC=B0=BE=EA=B8=B0=20api=20=EA=B2=BD=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/user/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/user/index.ts b/src/api/user/index.ts index 8a03aefd..8be871fe 100644 --- a/src/api/user/index.ts +++ b/src/api/user/index.ts @@ -31,7 +31,7 @@ export const modify = (param: ModifyParams) => userApi.patch('/modify', pa export const sendRegisterEmail = (param: SendRegisterEmailParams) => userApi.post(`/authenticate?email=${param.email}`); -export const sendFindEmail = (param: SendFindEmailParams) => userApi.post(`/email?email=${param.email}`); +export const sendFindEmail = (param: SendFindEmailParams) => userApi.post(`/email/account?email=${param.email}`); export const getAccount = (param: GetAccountParams) => userApi.get(`/account?email=${param.email}&code=${param.code}`); From 342253fc4f32921fbbeadc9ad44fd1c8688f01e3 Mon Sep 17 00:00:00 2001 From: ChoiWonBeen Date: Fri, 23 Jun 2023 11:42:08 +0900 Subject: [PATCH 04/11] =?UTF-8?q?fix:=20=EC=95=84=EC=9D=B4=EB=94=94-?= =?UTF-8?q?=EB=B9=84=EB=B0=80=EB=B2=88=ED=98=B8=20=EC=B0=BE=EA=B8=B0=20?= =?UTF-8?q?=EB=B0=98=EC=9D=91=ED=98=95=20UI=20=EC=9E=91=EC=9D=80=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=EC=97=90=EC=84=9C=20=EA=B9=A8=EC=A7=80?= =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Auth/FindIDPassword/component/Modal.tsx | 4 +-- .../Auth/FindIDPassword/index.module.scss | 33 +++++++++---------- src/pages/Auth/FindIDPassword/index.tsx | 10 +++--- 3 files changed, 21 insertions(+), 26 deletions(-) diff --git a/src/pages/Auth/FindIDPassword/component/Modal.tsx b/src/pages/Auth/FindIDPassword/component/Modal.tsx index 1d8736a5..1483fd49 100644 --- a/src/pages/Auth/FindIDPassword/component/Modal.tsx +++ b/src/pages/Auth/FindIDPassword/component/Modal.tsx @@ -14,9 +14,7 @@ export default function Modal({ children, type }: ModalProp): JSX.Element {
- {type} - {' '} - 찾기 완료 + {`${type} 찾기 완료`}
{children}
diff --git a/src/pages/Auth/FindIDPassword/index.module.scss b/src/pages/Auth/FindIDPassword/index.module.scss index 6e06751b..eb5da6a3 100644 --- a/src/pages/Auth/FindIDPassword/index.module.scss +++ b/src/pages/Auth/FindIDPassword/index.module.scss @@ -6,13 +6,14 @@ justify-content: center; align-items: center; width: 100vw; - height: 100vh; + min-height: 100vh; } .back { grid-column-start: 2; width: 270px; padding-bottom: 30px; + padding-top: 16px; } .page { @@ -49,6 +50,7 @@ display: flex; flex-direction: column; gap: 230px; + margin-bottom: 12px; &__space { gap: 190px !important; @@ -82,23 +84,18 @@ margin-bottom: 10px; background-color: #eeeeee; } -} -.inactive { - border: none; - border-radius: 100px; - width: 250px; - height: 40px; - color: white; - background-color: #c4c4c4; -} + &__submit { + border: none; + border-radius: 100px; + width: 250px; + height: 40px; + color: white; + background-color: #c4c4c4; -.active { - border: none; - border-radius: 100px; - width: 250px; - height: 40px; - color: white; - background-color: #ff7f23; - cursor: pointer; + &--active { + background-color: #ff7f23; + cursor: pointer; + } + } } diff --git a/src/pages/Auth/FindIDPassword/index.tsx b/src/pages/Auth/FindIDPassword/index.tsx index ae1cf977..1d602943 100644 --- a/src/pages/Auth/FindIDPassword/index.tsx +++ b/src/pages/Auth/FindIDPassword/index.tsx @@ -59,14 +59,14 @@ export default function FindIdPassword({ type }: FindProp): JSX.Element {

아이디를 찾을 때
- 사용할 이메일을 입력해주세요. + 사용할 이메일을 입력해 주세요.

)} {type === 'password' && (

- 비밀번호를 찾을 때 + 비밀번호를 찾을 때 사용할
- 사용할 이메일과 아이디를 입력해주세요. + 이메일과 아이디를 입력해 주세요.

)}
@@ -112,8 +112,8 @@ export default function FindIdPassword({ type }: FindProp): JSX.Element { type="submit" disabled={isSubmitting || !isValid} className={cn({ - [style.active]: isValid, - [style.inactive]: true, + [style['form__submit--active']]: isValid, + [style.form__submit]: true, })} > 인증번호 보내기 From 87680ca83f9618b314c6916d8a8174cc80b1a18c Mon Sep 17 00:00:00 2001 From: ChoiWonBeen Date: Fri, 23 Jun 2023 12:04:04 +0900 Subject: [PATCH 05/11] =?UTF-8?q?feat:=20=EC=83=81=EB=8B=A8=EB=B0=94=20?= =?UTF-8?q?=EC=95=84=EC=9D=B4=EC=BD=98=20=EC=B6=94=EA=B0=80,=20=EB=94=94?= =?UTF-8?q?=EC=9E=90=EC=9D=B8=20=EB=B3=80=EA=B2=BD=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/svg/common/my-page.svg | 4 +-- src/assets/svg/common/setting.svg | 4 +++ src/assets/svg/common/write.svg | 2 +- .../TopNavigation/TopNavigation.module.scss | 11 ++++-- src/components/common/TopNavigation/index.tsx | 34 ++++++++++++++++--- 5 files changed, 44 insertions(+), 11 deletions(-) create mode 100644 src/assets/svg/common/setting.svg diff --git a/src/assets/svg/common/my-page.svg b/src/assets/svg/common/my-page.svg index 58d93196..7bf32308 100644 --- a/src/assets/svg/common/my-page.svg +++ b/src/assets/svg/common/my-page.svg @@ -1,4 +1,4 @@ - - + + diff --git a/src/assets/svg/common/setting.svg b/src/assets/svg/common/setting.svg new file mode 100644 index 00000000..ea7f7e4d --- /dev/null +++ b/src/assets/svg/common/setting.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/svg/common/write.svg b/src/assets/svg/common/write.svg index 6e358a09..4e079dde 100644 --- a/src/assets/svg/common/write.svg +++ b/src/assets/svg/common/write.svg @@ -1,3 +1,3 @@ - + diff --git a/src/components/common/TopNavigation/TopNavigation.module.scss b/src/components/common/TopNavigation/TopNavigation.module.scss index fd57a9c5..a86f4972 100644 --- a/src/components/common/TopNavigation/TopNavigation.module.scss +++ b/src/components/common/TopNavigation/TopNavigation.module.scss @@ -7,7 +7,7 @@ display: grid; grid-template-columns: 1fr 1fr 1fr; align-items: center; - font-size: 20px; + font-size: 18px; &__logo { display: flex; @@ -45,14 +45,19 @@ display: flex; align-items: center; justify-content: flex-end; - gap: 56px; + gap: 48px; margin-right: 72px; list-style: none; + opacity: 0.8; } &__link { text-decoration: none; font-weight: 500; - color: #000000; + color: #222222; + display: flex; + align-items: center; + justify-content: center; + gap: 8px; } } diff --git a/src/components/common/TopNavigation/index.tsx b/src/components/common/TopNavigation/index.tsx index 7ef8941e..46a80ebe 100644 --- a/src/components/common/TopNavigation/index.tsx +++ b/src/components/common/TopNavigation/index.tsx @@ -1,12 +1,33 @@ import { Link } from 'react-router-dom'; import { ReactComponent as LogoIcon } from 'assets/svg/common/favicon.svg'; import { ReactComponent as ArrowIcon } from 'assets/svg/common/arrow.svg'; +import { ReactComponent as SettingIcon } from 'assets/svg/common/setting.svg'; +import { ReactComponent as WriteIcon } from 'assets/svg/common/write.svg'; +import { ReactComponent as MyPageIcon } from 'assets/svg/common/my-page.svg'; import { useAuth } from 'store/auth'; import styles from './TopNavigation.module.scss'; export default function TopNavigation(): JSX.Element { const auth = useAuth(); + const tabs = [ + { + name: '설정', + icon: , + link: '/setting', + }, + { + name: '글쓰기', + icon: , + link: '/post', + }, + { + name: auth ? '마이페이지' : '로그인', + icon: , + link: auth ? '/profile' : '/login', + }, + ]; + return ( ); From 58397c13b8acfe406b8ff615c06bd047ff2a7849 Mon Sep 17 00:00:00 2001 From: ChoiWonBeen Date: Sat, 8 Jul 2023 01:44:48 +0900 Subject: [PATCH 06/11] =?UTF-8?q?fix:=20=EC=83=81=EB=8B=A8=20=EB=B0=94=20?= =?UTF-8?q?=EC=A4=84=EC=98=80=EC=9D=84=20=EB=95=8C=20=EC=A4=84=EB=B0=94?= =?UTF-8?q?=EA=BF=88=20=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=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 --- src/components/common/TopNavigation/TopNavigation.module.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/common/TopNavigation/TopNavigation.module.scss b/src/components/common/TopNavigation/TopNavigation.module.scss index a86f4972..d429a660 100644 --- a/src/components/common/TopNavigation/TopNavigation.module.scss +++ b/src/components/common/TopNavigation/TopNavigation.module.scss @@ -5,7 +5,7 @@ height: 80px; box-shadow: 0 0 5px rgb(0 0 0 / 15%); display: grid; - grid-template-columns: 1fr 1fr 1fr; + grid-template-columns: 1fr 0.7fr 1fr; align-items: center; font-size: 18px; From f20f5ac4e8c5ba9203116ca441045be5d8a0550c Mon Sep 17 00:00:00 2001 From: ChoiWonBeen Date: Sat, 8 Jul 2023 01:52:31 +0900 Subject: [PATCH 07/11] =?UTF-8?q?fix:=20=EA=B8=80=EC=93=B0=EA=B8=B0=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=9D=BC=EC=9A=B0=ED=8C=85?= =?UTF-8?q?=EC=9D=84=20=EA=B2=80=EC=83=89=EC=9C=BC=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/BottomNavigation/index.tsx | 2 +- src/components/common/TopNavigation/index.tsx | 2 +- .../Map/components/OptionButtons/index.tsx | 19 +++++-------------- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/src/components/common/BottomNavigation/index.tsx b/src/components/common/BottomNavigation/index.tsx index e9042de8..8ad972d1 100644 --- a/src/components/common/BottomNavigation/index.tsx +++ b/src/components/common/BottomNavigation/index.tsx @@ -12,7 +12,7 @@ const NAV_TABS = [ text: '홈', }, { - pathname: '/post', + pathname: '/search', icon: WriteIcon, text: '글쓰기', }, diff --git a/src/components/common/TopNavigation/index.tsx b/src/components/common/TopNavigation/index.tsx index 46a80ebe..6409ae8a 100644 --- a/src/components/common/TopNavigation/index.tsx +++ b/src/components/common/TopNavigation/index.tsx @@ -19,7 +19,7 @@ export default function TopNavigation(): JSX.Element { { name: '글쓰기', icon: , - link: '/post', + link: '/search', }, { name: auth ? '마이페이지' : '로그인', diff --git a/src/pages/Home/components/Map/components/OptionButtons/index.tsx b/src/pages/Home/components/Map/components/OptionButtons/index.tsx index 45bbc559..ca4f6b53 100644 --- a/src/pages/Home/components/Map/components/OptionButtons/index.tsx +++ b/src/pages/Home/components/Map/components/OptionButtons/index.tsx @@ -6,7 +6,7 @@ import useBooleanState from 'utils/hooks/useBooleanState'; import styles from './OptionButtons.module.scss'; export default function OptionButtons() { - const [visible,,, toggle] = useBooleanState(false); + const [visible, , , toggle] = useBooleanState(false); return (
필터 - + 글쓰기
- - -
From d94e7718a8db3ac5b24009e6709ac356cc1bf338 Mon Sep 17 00:00:00 2001 From: ChoiWonBeen Date: Tue, 11 Jul 2023 23:03:00 +0900 Subject: [PATCH 08/11] =?UTF-8?q?fix:=20=EB=B9=84=EB=B0=80=EB=B2=88?= =?UTF-8?q?=ED=98=B8=20=EB=B3=80=EA=B2=BD=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EA=B9=A8?= =?UTF-8?q?=EC=A7=84=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Auth/FindIDPassword/ChangePassword.tsx | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/pages/Auth/FindIDPassword/ChangePassword.tsx b/src/pages/Auth/FindIDPassword/ChangePassword.tsx index 0db82ca2..1ffbbf1b 100644 --- a/src/pages/Auth/FindIDPassword/ChangePassword.tsx +++ b/src/pages/Auth/FindIDPassword/ChangePassword.tsx @@ -4,7 +4,7 @@ import useBooleanState from 'utils/hooks/useBooleanState'; import cn from 'utils/ts/classNames'; import PreviousButton from 'components/PreviousButton/PreviousButton'; import error from 'assets/svg/auth/error.svg'; -import style from 'pages/Auth/FindIDPassword/index.module.scss'; +import styles from 'pages/Auth/FindIDPassword/index.module.scss'; import { PasswordInfo } from './entity'; import Modal from './component/Modal'; @@ -31,37 +31,37 @@ export default function ChangePassword(): JSX.Element { }; return ( -
-
+
+
-
+
-

+

새 비밀번호를 설정해 주세요.

-
+
{(errors.password || errors.passwordCheck) && ( - - warning + + warning {errors.password?.message || errors.passwordCheck?.message} )}
-
-
새 비밀번호
+
+
새 비밀번호
-
비밀번호 확인
+
비밀번호 확인
values === getValues('password') || '비밀번호가 일치하지 않습니다.', @@ -84,8 +84,8 @@ export default function ChangePassword(): JSX.Element {