From 0c5b0651cd6447f0c5386fc6edbfd4330b77b3ac Mon Sep 17 00:00:00 2001 From: quothraven1122 <102286920+quothraven1122@users.noreply.github.com> Date: Mon, 20 Jan 2025 16:54:13 +0900 Subject: [PATCH 1/3] =?UTF-8?q?#789=20[FIX]=20=EC=9D=BC=EB=9F=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=EB=A5=BC=20=EC=82=AC=EB=9E=8C=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EB=B3=84=20=EB=AA=A8=EC=96=91=20=EC=9D=BC=EB=9F=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icon.svg | 2 +- .../LoginPage/FoundIdPage/FoundIdPage.jsx | 11 +++----- .../FoundIdPage/FoundIdPage.module.css | 11 ++++---- .../LoginPage/FoundPwPage/FoundPwPage.jsx | 12 +++------ .../FoundPwPage/FoundPwPage.module.css | 20 +++++++------- .../NotFoundIdPage/NotFoundIdPage.jsx | 26 ++++++++++++------- .../NotFoundIdPage/NotFoundIdPage.module.css | 24 +++++++++++------ .../NotFoundPwPage/NotFoundPwPage.jsx | 9 +++---- .../NotFoundPwPage/NotFoundPwPage.module.css | 8 +++++- .../SignUpFailure/SignUpFailurePage.jsx | 9 +++---- .../SignUpFailurePage.module.css | 8 +++++- .../SignUpSuccessPage/SignUpSuccessPage.jsx | 10 +++---- .../SignUpSuccessPage.module.css | 5 ++-- 13 files changed, 85 insertions(+), 70 deletions(-) diff --git a/src/assets/icon.svg b/src/assets/icon.svg index 5b5ebfdb..752053bf 100644 --- a/src/assets/icon.svg +++ b/src/assets/icon.svg @@ -409,7 +409,7 @@ - + diff --git a/src/pages/LoginPage/FoundIdPage/FoundIdPage.jsx b/src/pages/LoginPage/FoundIdPage/FoundIdPage.jsx index 9fd338ff..2f25e2da 100644 --- a/src/pages/LoginPage/FoundIdPage/FoundIdPage.jsx +++ b/src/pages/LoginPage/FoundIdPage/FoundIdPage.jsx @@ -36,15 +36,10 @@ export default function FoundIdPage() { +
+ +
-
- frustrated woman image -
-
diff --git a/src/pages/LoginPage/FoundIdPage/FoundIdPage.module.css b/src/pages/LoginPage/FoundIdPage/FoundIdPage.module.css index 53f991b6..78902f54 100644 --- a/src/pages/LoginPage/FoundIdPage/FoundIdPage.module.css +++ b/src/pages/LoginPage/FoundIdPage/FoundIdPage.module.css @@ -14,7 +14,7 @@ .pageTitle { font-size: 1.25rem; font-weight: 700; - margin-top: 0.875rem; + margin-top: 3.2rem; } .pageExplanation { @@ -70,11 +70,10 @@ background-color: var(--blue-4); } -.img { - width: 13.25rem; - height: 14.5rem; - margin-bottom: 1.875rem; - margin-left: auto; +.pageMiddleFrame { + display: flex; + justify-content: center; + align-items: center; } .loginButton { diff --git a/src/pages/LoginPage/FoundPwPage/FoundPwPage.jsx b/src/pages/LoginPage/FoundPwPage/FoundPwPage.jsx index 13e7ce20..d6b11526 100644 --- a/src/pages/LoginPage/FoundPwPage/FoundPwPage.jsx +++ b/src/pages/LoginPage/FoundPwPage/FoundPwPage.jsx @@ -24,7 +24,7 @@ export default function FoundPwPage() { return (
-
+

비밀번호 찾기

비밀번호 초기화 이메일이 발송되었어요 @@ -49,14 +49,10 @@ export default function FoundPwPage() {

+
+ +
-
- frustrated woman image -
diff --git a/src/pages/LoginPage/FoundPwPage/FoundPwPage.module.css b/src/pages/LoginPage/FoundPwPage/FoundPwPage.module.css index dba1d0f9..a699c3a2 100644 --- a/src/pages/LoginPage/FoundPwPage/FoundPwPage.module.css +++ b/src/pages/LoginPage/FoundPwPage/FoundPwPage.module.css @@ -7,14 +7,17 @@ margin: 0 auto; } -.pageBottomFrame { +.pageTopFrame { padding: 0 1.25rem; + display: flex; + flex-direction: column; } .pageTitle { font-size: 1.25rem; font-weight: 700; - margin: 0.875rem 0; + margin-top: 3.2rem; + margin-bottom: 0.813rem; } .pageSubtitle { @@ -30,17 +33,16 @@ margin-bottom: 1rem; } -.pageBottomFrame { - padding: 0 1.25rem; +.pageMiddleFrame { display: flex; - flex-direction: column; + justify-content: center; + align-items: center; } -.bodyFrame { +.pageBottomFrame { + padding: 0 1.25rem; display: flex; - flex-direction: row; - justify-content: space-between; - position: relative; + flex-direction: column; } .resultFrame { diff --git a/src/pages/LoginPage/NotFoundIdPage/NotFoundIdPage.jsx b/src/pages/LoginPage/NotFoundIdPage/NotFoundIdPage.jsx index a74336e1..9914c846 100644 --- a/src/pages/LoginPage/NotFoundIdPage/NotFoundIdPage.jsx +++ b/src/pages/LoginPage/NotFoundIdPage/NotFoundIdPage.jsx @@ -2,6 +2,7 @@ import { useEffect } from 'react'; import { Link, useLocation, useNavigate } from 'react-router-dom'; import { Submit } from '@/components/Submit'; +import { Icon } from '@/components/Icon'; import frustratedWoman from '@/assets/images/frustratedWoman.svg'; @@ -21,19 +22,24 @@ export default function NotFoundIdPage() { return (
- +
-

아이디 찾기

-

- 입력하신 정보와 일치하는 정보가 없어요 -

+
+

아이디 찾기

+

+ 입력하신 정보와 일치하는 정보가 없어요 +

+
-
- frustrated woman image + +
+
diff --git a/src/pages/LoginPage/NotFoundIdPage/NotFoundIdPage.module.css b/src/pages/LoginPage/NotFoundIdPage/NotFoundIdPage.module.css index 495f32d5..2dd61ea1 100644 --- a/src/pages/LoginPage/NotFoundIdPage/NotFoundIdPage.module.css +++ b/src/pages/LoginPage/NotFoundIdPage/NotFoundIdPage.module.css @@ -7,14 +7,29 @@ margin: 0 auto; } +.backAppBar { + display: block; +} + .pageTopFrame { +} + +.pageMiddleFrame { + height: fit-content; + display: flex; + justify-content: center; + align-items: center; +} + +.explanation { + height: fit-content; padding: 0 1.25rem; } .pageTitle { font-size: 1.25rem; font-weight: 700; - margin-top: 0.875rem; + margin-top: 3.2rem; } .pageExplanation { @@ -30,13 +45,6 @@ flex-direction: column; } -.img { - width: 13.25rem; - height: 14.5rem; - margin-bottom: 1.875rem; - margin-left: auto; -} - .goBackButton { display: block; margin-bottom: 0.5rem; diff --git a/src/pages/LoginPage/NotFoundPwPage/NotFoundPwPage.jsx b/src/pages/LoginPage/NotFoundPwPage/NotFoundPwPage.jsx index cbd4f8f5..9175834b 100644 --- a/src/pages/LoginPage/NotFoundPwPage/NotFoundPwPage.jsx +++ b/src/pages/LoginPage/NotFoundPwPage/NotFoundPwPage.jsx @@ -2,6 +2,7 @@ import { useEffect } from 'react'; import { Link, useLocation, useNavigate } from 'react-router-dom'; import { Submit } from '@/components/Submit'; +import { Icon } from '@/components/Icon'; import frustratedWoman from '@/assets/images/frustratedWoman.svg'; @@ -29,12 +30,10 @@ export default function NotFoundPwPage() { 입력하신 정보와 일치하는 정보가 없어요

+
+ +
- frustrated woman image
diff --git a/src/pages/LoginPage/NotFoundPwPage/NotFoundPwPage.module.css b/src/pages/LoginPage/NotFoundPwPage/NotFoundPwPage.module.css index c6f85c3c..9e9b5111 100644 --- a/src/pages/LoginPage/NotFoundPwPage/NotFoundPwPage.module.css +++ b/src/pages/LoginPage/NotFoundPwPage/NotFoundPwPage.module.css @@ -8,6 +8,12 @@ margin: 0 auto; } +.pageMiddleFrame { + display: flex; + justify-content: center; + align-items: center; +} + .pageTopFrame { padding: 0 1.25rem; } @@ -15,7 +21,7 @@ .pageTitle { font-size: 1.25rem; font-weight: 700; - margin-top: 0.875rem; + margin-top: 3.2rem; } .pageExplanation { diff --git a/src/pages/LoginPage/SignUpPage/SignUpPageStages/SignUpFailure/SignUpFailurePage.jsx b/src/pages/LoginPage/SignUpPage/SignUpPageStages/SignUpFailure/SignUpFailurePage.jsx index d74b0b3e..8e1154e4 100644 --- a/src/pages/LoginPage/SignUpPage/SignUpPageStages/SignUpFailure/SignUpFailurePage.jsx +++ b/src/pages/LoginPage/SignUpPage/SignUpPageStages/SignUpFailure/SignUpFailurePage.jsx @@ -2,6 +2,7 @@ import { useEffect } from 'react'; import { Link, useLocation, useNavigate } from 'react-router-dom'; import { Submit } from '@/components/Submit'; +import { Icon } from '@/components/Icon'; import frustratedWoman from '@/assets/images/frustratedWoman.svg'; @@ -26,12 +27,10 @@ export default function SignUpFailurePage() {

회원가입 실패

{state?.message}

+
+ +
- frustrated woman image
diff --git a/src/pages/LoginPage/SignUpPage/SignUpPageStages/SignUpFailure/SignUpFailurePage.module.css b/src/pages/LoginPage/SignUpPage/SignUpPageStages/SignUpFailure/SignUpFailurePage.module.css index 650099eb..3ca8185f 100644 --- a/src/pages/LoginPage/SignUpPage/SignUpPageStages/SignUpFailure/SignUpFailurePage.module.css +++ b/src/pages/LoginPage/SignUpPage/SignUpPageStages/SignUpFailure/SignUpFailurePage.module.css @@ -15,7 +15,7 @@ .pageTitle { font-size: 1.25rem; font-weight: 700; - margin-top: 0.875rem; + margin-top: 3.2rem; } .pageExplanation { @@ -25,6 +25,12 @@ margin-top: 0.875rem; } +.pageMiddleFrame { + display: flex; + justify-content: center; + align-items: center; +} + .pageBottomFrame { padding: 0 1.25rem; display: flex; diff --git a/src/pages/LoginPage/SignUpPage/SignUpSuccessPage/SignUpSuccessPage.jsx b/src/pages/LoginPage/SignUpPage/SignUpSuccessPage/SignUpSuccessPage.jsx index cb082e74..8a3b85a0 100644 --- a/src/pages/LoginPage/SignUpPage/SignUpSuccessPage/SignUpSuccessPage.jsx +++ b/src/pages/LoginPage/SignUpPage/SignUpSuccessPage/SignUpSuccessPage.jsx @@ -4,8 +4,6 @@ import { useNavigate, useLocation } from 'react-router-dom'; import { Icon } from '@/components/Icon'; import { Submit } from '@/components/Submit'; -import excitedWoman from '@/assets/images/excitedWoman.svg'; - import styles from './SignUpSuccessPage.module.css'; export default function SignUpSuccessPage() { @@ -30,11 +28,11 @@ export default function SignUpSuccessPage() { 스노로즈 전체 서비스를 이용하실 수 있어요

-
-
- excitedWoman -
+
+ +
+
Date: Mon, 20 Jan 2025 17:46:39 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[FIX]=20=EC=95=84=EC=9D=B4=EB=94=94=20?= =?UTF-8?q?=EC=B0=BE=EA=B8=B0=20=ED=8E=98=EC=9D=B4=EC=A7=80=20css=20?= =?UTF-8?q?=EA=B3=A0=EC=B9=98=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/LoginPage/FindIdPage/FindIdPage.module.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pages/LoginPage/FindIdPage/FindIdPage.module.css b/src/pages/LoginPage/FindIdPage/FindIdPage.module.css index c953293d..9e237fc1 100644 --- a/src/pages/LoginPage/FindIdPage/FindIdPage.module.css +++ b/src/pages/LoginPage/FindIdPage/FindIdPage.module.css @@ -11,11 +11,9 @@ .pageFrame form { width: 100%; height: 100%; - display: flex; - flex-direction: column; - justify-content: center; } .back { + margin-top: 0.875rem; margin-bottom: 0.875rem; } .back:hover { @@ -24,6 +22,7 @@ .findIdFrame { width: 100%; + height: 100%; display: flex; flex-direction: column; justify-content: space-between; From 86071885de6c40fe1cc6690300c1bff639f12f69 Mon Sep 17 00:00:00 2001 From: quothraven1122 <102286920+quothraven1122@users.noreply.github.com> Date: Thu, 23 Jan 2025 15:06:05 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[FIX]=20=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20asset=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/LoginPage/FoundIdPage/FoundIdPage.jsx | 2 -- src/pages/LoginPage/FoundPwPage/FoundPwPage.jsx | 2 -- src/pages/LoginPage/NotFoundIdPage/NotFoundIdPage.jsx | 2 -- src/pages/LoginPage/NotFoundPwPage/NotFoundPwPage.jsx | 2 -- .../SignUpPageStages/SignUpFailure/SignUpFailurePage.jsx | 2 -- 5 files changed, 10 deletions(-) diff --git a/src/pages/LoginPage/FoundIdPage/FoundIdPage.jsx b/src/pages/LoginPage/FoundIdPage/FoundIdPage.jsx index 2f25e2da..92c9efea 100644 --- a/src/pages/LoginPage/FoundIdPage/FoundIdPage.jsx +++ b/src/pages/LoginPage/FoundIdPage/FoundIdPage.jsx @@ -4,8 +4,6 @@ import { useLocation, Link, useNavigate } from 'react-router-dom'; import { Icon } from '@/components/Icon'; import { Submit } from '@/components/Submit'; -import excitedWoman from '@/assets/images/excitedWoman.svg'; - import styles from './FoundIdPage.module.css'; import { BackAppBar } from '@/components/index.js'; diff --git a/src/pages/LoginPage/FoundPwPage/FoundPwPage.jsx b/src/pages/LoginPage/FoundPwPage/FoundPwPage.jsx index d6b11526..57542292 100644 --- a/src/pages/LoginPage/FoundPwPage/FoundPwPage.jsx +++ b/src/pages/LoginPage/FoundPwPage/FoundPwPage.jsx @@ -4,8 +4,6 @@ import { useLocation, Link, useNavigate } from 'react-router-dom'; import { Icon } from '@/components/Icon'; import { Submit } from '@/components/Submit'; -import EnlightenedWoman from '@/assets/images/EnlightenedWoman.svg'; - import styles from './FoundPwPage.module.css'; import { BackAppBar } from '@/components/index.js'; diff --git a/src/pages/LoginPage/NotFoundIdPage/NotFoundIdPage.jsx b/src/pages/LoginPage/NotFoundIdPage/NotFoundIdPage.jsx index 9914c846..be84bccb 100644 --- a/src/pages/LoginPage/NotFoundIdPage/NotFoundIdPage.jsx +++ b/src/pages/LoginPage/NotFoundIdPage/NotFoundIdPage.jsx @@ -4,8 +4,6 @@ import { Link, useLocation, useNavigate } from 'react-router-dom'; import { Submit } from '@/components/Submit'; import { Icon } from '@/components/Icon'; -import frustratedWoman from '@/assets/images/frustratedWoman.svg'; - import styles from './NotFoundIdPage.module.css'; import { BackAppBar } from '@/components/index.js'; diff --git a/src/pages/LoginPage/NotFoundPwPage/NotFoundPwPage.jsx b/src/pages/LoginPage/NotFoundPwPage/NotFoundPwPage.jsx index 9175834b..b72521d4 100644 --- a/src/pages/LoginPage/NotFoundPwPage/NotFoundPwPage.jsx +++ b/src/pages/LoginPage/NotFoundPwPage/NotFoundPwPage.jsx @@ -4,8 +4,6 @@ import { Link, useLocation, useNavigate } from 'react-router-dom'; import { Submit } from '@/components/Submit'; import { Icon } from '@/components/Icon'; -import frustratedWoman from '@/assets/images/frustratedWoman.svg'; - import styles from './NotFoundPwPage.module.css'; import { BackAppBar } from '@/components/index.js'; diff --git a/src/pages/LoginPage/SignUpPage/SignUpPageStages/SignUpFailure/SignUpFailurePage.jsx b/src/pages/LoginPage/SignUpPage/SignUpPageStages/SignUpFailure/SignUpFailurePage.jsx index 8e1154e4..391eb4ad 100644 --- a/src/pages/LoginPage/SignUpPage/SignUpPageStages/SignUpFailure/SignUpFailurePage.jsx +++ b/src/pages/LoginPage/SignUpPage/SignUpPageStages/SignUpFailure/SignUpFailurePage.jsx @@ -4,8 +4,6 @@ import { Link, useLocation, useNavigate } from 'react-router-dom'; import { Submit } from '@/components/Submit'; import { Icon } from '@/components/Icon'; -import frustratedWoman from '@/assets/images/frustratedWoman.svg'; - import styles from './SignUpFailurePage.module.css'; import { BackAppBar } from '@/components/index.js';